2104 files changed, 225149 insertions, 77524 deletions

diff --git a/.gitignore b/.gitignore
index 0e9d07757f..789d08fdb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,9 @@ TAGS
 # vim
 .*.sw[a-z]
 
+# vscode
+.vscode
+
 autom4te.cache
 *.beam
 *.asn1db
@@ -34,9 +37,12 @@ i686-pc-linux-gnu
 x86_64-unknown-linux-gnu
 i386-apple-darwin[0-9]*.[0-9]*.[0-9]*
 x86_64-apple-darwin[0-9]*.[0-9]*.[0-9]*
+x86_64-unknown-freebsd[0-9]*.[0-9]*
 sparc-sun-solaris[0-9]*.[0-9]*
 i386-pc-solaris[0-9]*.[0-9]*
 i386-unknown-freebsd[0-9]*.[0-9]*
+x86_64-unknown-freebsd[0-9]*.[0-9]*
+x86_64-unknown-openbsd[0-9]*.[0-9]*
 tile-tilera-linux-gnu
 powerpc-unknown-linux-gnu
 aarch64-unknown-linux-gnu
@@ -139,6 +145,7 @@ JAVADOC-GENERATED
 /make/output.mk
 /make/emd2exml
 /make/make_emakefile
+/make/install_dir_data.sh
 
 # Created by "out_build update_primary"
 /bootstrap/primary_compiler/
@@ -171,9 +178,10 @@ JAVADOC-GENERATED
 /lib/*/doc/pdf/*.pdf
 /lib/*/doc/xml/*.xml
 
-/lib/configure
 /lib/config.log
 /lib/config.status
+/make/config.log
+/make/config.status
 
 #
 # Files generated by configure.
@@ -186,10 +194,12 @@ JAVADOC-GENERATED
 # Files generated by "./otp_build autoconf"
 #
 
+/lib/configure
 /lib/*/configure
 /lib/common_test/test_server/configure
 /lib/configure.in
-/aclocal.m4
+/make/aclocal.m4
+/make/configure
 /lib/common_test/priv/auxdir/config.guess
 /lib/common_test/priv/auxdir/config.sub
 /lib/common_test/priv/auxdir/install-sh
@@ -207,6 +217,7 @@ JAVADOC-GENERATED
 /lib/wx/autoconf/config.guess
 /lib/wx/autoconf/config.sub
 /lib/wx/autoconf/install-sh
+/lib/crypto/aclocal.m4
 
 #
 # Files generated when building/running tests (especially if
@@ -222,12 +233,6 @@ JAVADOC-GENERATED
 /erts/test/install_SUITE_data/install_bin
 /erts/test/autoimport_SUITE_data/erlang.xml
 
-# asn1
-
-/lib/asn1/test/asn1_SUITE.erl
-/lib/asn1/test/asn1_bin_SUITE.erl
-/lib/asn1/test/asn1_bin_v2_SUITE.erl
-
 # common_test
 
 /lib/common_test/priv/install.sh
@@ -239,8 +244,11 @@ JAVADOC-GENERATED
 /lib/compiler/src/core_parse.erl
 
 /lib/compiler/test/*_no_opt_SUITE.erl
+/lib/compiler/test/*_no_ssa_opt_SUITE.erl
 /lib/compiler/test/*_post_opt_SUITE.erl
 /lib/compiler/test/*_inline_SUITE.erl
+/lib/compiler/test/*_r21_SUITE.erl
+/lib/compiler/test/*_no_module_opt_SUITE.erl
 
 # crypto
 /lib/crypto/test/crypto_SUITE_data/*.rsp
@@ -307,10 +315,12 @@ JAVADOC-GENERATED
 /lib/jinterface/doc/html/java
 /lib/jinterface/pom.xml
 /lib/jinterface/target
+/lib/jinterface/doc/src/jdoc
 
 # kernel
 
 /lib/kernel/src/inet_dns_record_adts.hrl
+/lib/kernel/test/gen_tcp_dist.erl
 
 # kernel
 
@@ -361,7 +371,6 @@ JAVADOC-GENERATED
 /system/doc/html
 /system/doc/xml
 /system/doc/top/PR.template
-/system/doc/top/erlresolvelinks.js
 
 # test_server
 
diff --git a/.travis.yml b/.travis.yml
index ee724f8947..51453639b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,8 @@ sudo: false
 os:
   - linux
 
+dist: xenial
+
 addons:
   apt:
     packages:
@@ -12,10 +14,8 @@ addons:
       - libncurses-dev
       - build-essential
       - libssl-dev
-      - libwxgtk2.8-dev
-      - libgl1-mesa-dev
+      - libwxgtk3.0-dev
       - libglu1-mesa-dev
-      - libpng3
       - default-jdk
       - g++
       - xsltproc
@@ -36,16 +36,40 @@ matrix:
       script:
         - ./scripts/build-otp
         - ./scripts/run-dialyzer
+
     - env: Linux32
       services:
         - docker
       script:
         - ./scripts/build-docker-otp 32 sh -c "scripts/build-otp release && ./otp_build tests && scripts/run-smoke-tests && bin/dialyzer --build_plt --apps erts kernel stdlib"
+
     - env: Linux64SmokeTest
       script:
+        - ERL_COMPILER_OPTIONS=ssalint ./scripts/build-otp
+        - ERL_COMPILER_OPTIONS=ssalint ./otp_build tests
+        - ./scripts/run-smoke-tests
+
+    - env: Linux-ppc64le-SmokeTest
+      os: linux-ppc64le
+      script:
         - ./scripts/build-otp
         - ./otp_build tests
         - ./scripts/run-smoke-tests
+      addons:
+        apt:
+          update: true
+          packages:
+            - autoconf
+            - libncurses-dev
+            - build-essential
+            - libssl-dev
+            - libwxgtk3.0-dev
+            - libglu1-mesa-dev
+            - default-jdk
+            - g++
+            - xsltproc
+            - libxml2-utils
+
     - env: Linux64Docbuild
       script:
         - ./scripts/build-otp docs
@@ -54,7 +78,7 @@ matrix:
         repo: erlang/cd
         target-branch: master
         skip-cleanup: true
-        keep-history: true
+        keep-history: false
         verbose: true
         github-token: $ERLANG_CD_GITHUB_TOKEN
         on:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 96db464b52..8814e506f9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,6 +3,7 @@
 ## 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
diff --git a/HOWTO/INSTALL-RASPBERRYPI3.md b/HOWTO/INSTALL-RASPBERRYPI3.md
index 536d095cb4..b9cffbe0c5 100644
--- a/HOWTO/INSTALL-RASPBERRYPI3.md
+++ b/HOWTO/INSTALL-RASPBERRYPI3.md
@@ -4,7 +4,7 @@
 ## Introduction
 
 This document describes how to build a toolchain and cross compile Erlang/OTP
-to Raspberry Pi 3 on macOS High Sierra. It is recommended to consult
+to Raspberry Pi 3 on macOS Mojave. It is recommended to consult
 [Building and Installing Erlang/OTP](https://github.com/erlang/otp/blob/master/HOWTO/INSTALL.md) and [Cross Compiling Erlang/OTP](https://github.com/erlang/otp/blob/master/HOWTO/INSTALL-CROSS.md) before attempting to follow the instructions in this guide.
 
 The whole process takes several hours and depending on the package versions different problems may arise that require additional
@@ -18,9 +18,15 @@ toolchain and sysroot.
 
 #### Tested Configuration
 
-macOS High Sierra 10.13.2<br>
+macOS Mojave 10.14.3<br>
 Raspberry Pi Model B Rev 1.2<br>
-Crosstools-NG 1.23.0_1
+Crosstools-NG 1.23.0_3
+
+```
+build  = x86_64-apple-darwin18.2.0
+host   = x86_64-apple-darwin18.2.0
+target = armv8-rpi3-linux-gnueabihf
+```
 
 > Note: /proc/device/tree/model contains model information of your
 > Raspberry Pi.
@@ -34,10 +40,13 @@ Crosstools-NG 1.23.0_1
     $ brew install grep --default-names # needed by crosstools-ng scripts
     $ brew install md5sha1sum           # needed by crosstools-ng populate script
 
+  (2)
+
+    $ chmod 744 /usr/local/Cellar/crosstool-ng/1.23.0_3/lib/crosstool-ng-1.23.0/scripts/crosstool-NG.sh
 
 #### Create case-sensitive disk images
 
-  (2)
+  (3)
 
 Create two case-sensitive disk images using Disk Utility:
 
@@ -47,47 +56,106 @@ Format: `Mac OS Extended (Case-sensitive, Journaled)`
 
 ```
 /Volumes/xtools-build-env  15 GB
-/Volumes/xtools           500 MB
+/Volumes/xtools            500 MB
 ```
 
-The first image holds all source and object files while building the toolchain. The second image houses the compiled
+> The first image holds all source and object files while building the toolchain. The second image houses the compiled
 toolchain.
 
-## Building the Toolchain
 
+## Building the Toolchain
 
-#### Configure crosstool-ng
+### Environment settings
 
   (4)
 
+    $ ulimit -n 1024
+
+### Inspect target system
+
+  (5)
+
+    $ uname -a
+    Linux raspberrypi 4.9.35-v7+ #1014 SMP Fri Jun 30 14:47:43 BST 2017 armv7l GNU/Linux
+    $ ld -v
+    GNU ld (GNU Binutils for Raspbian) 2.25
+    $ ldd --version
+    ldd (Debian GLIBC 2.19-18+deb8u10) 2.19
+    Copyright (C) 2014 Free Software Foundation, Inc.
+    This is free software; see the source for copying conditions.  There is NO
+    warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+    Written by Roland McGrath and Ulrich Drepper.
+
+> Use the versions available on your target system!
+
+> See https://wiki.osdev.org/Cross-Compiler_Successful_Builds
+
+### Configure crosstool-ng
+
+  (6)
+
+    $ cd /Volumes/xtools-build-env
     $ ct-ng armv8-rpi3-linux-gnueabihf
     $ ct-ng menuconfig
 
-#### Modify *path* section
+#### Path and misc options
+
+##### crosstool-NG behavior
+
+  (7)
+
+```
+[*] Use obsolete features
+
+[*] Debug crosstool-NG
+[ ]   Pause between every steps
+[*]   Save intermediate steps
+[*]     gzip saved states
+[*]   Interactive shell on failed commands
+```
+
+> Should the build break at a particular build step, you can fix the problem and continue the build from where it broke.
+
+##### Paths
+
+  (8)
 
 * Local tarballs directory: `/Volumes/xtools-build-env/src`
 * Working directory: `/Volumes/xtools-build-env/.build`
 * Prefix directory: `/Volumes/xtools/${CT_TARGET}`
 
-#### Modify *Extracting* section
+##### Extracting
+
+  (9)
+
+`[*] Stop after extracting tarballs`
 
-* Check option: _Stop after extracting tarballs_.
+> Stop the build process right after the tarballs have been extracted. This can be handy to fix known source code problems before the actual build process is started.
 
-> Note: The build shall stop after the tarballs have been extracted to give us time to fix source code problems.
+#### Operating System
 
-#### Enable STOP / RESTART
+  (10)
 
-Edit  /Volumes/xtools-build-env/.config
-  `CT_DEBUG_CT_SAVE_STEPS=y`
+`Linux kernel version (4.9.20)`
 
-Should the build break at a particular build step, you can fix the problem and continue the build from where it broke.
+#### Binary utilities
 
-Short summary of the most common `ct-ng` commands:
+  (11)
 
-* Listing all build steps
+`bintutils version (2.28)`
+
+#### C-library
+
+  (12)
+
+`glibc version (2.19 (OBSOLETE))`
+
+#### Sample `ct-ng` commands:
+
+* List all build steps
 
 ```
-    $ ct-ng list-steps
+    $ ct-ng list-steps
 
     Available build steps, in order:
     - companion_tools_for_build
@@ -108,216 +176,153 @@ Short summary of the most common `ct-ng` commands:
     - binutils_for_target
     - debug
     - test_suite
-    - finish
+    - finish
 ```
 
-* Re-run step
-```
-    $ ct-ng step
-```
+* Re-run step `companion_libs_for_host`
 
-* Restart from step
 ```
-    $ ct-ng step+
+    $ ct-ng companion_libs_for_host
 ```
 
-* Run until step
+* Restart from `companion_libs_for_host`
+
 ```
-    $ ct-ng +step
+    $ ct-ng companion_libs_for_host+
 ```
 
-#### Fix file permissions on crosstool-NG.sh
-
-  (5)
-
-    $ chmod 744 /usr/local/Cellar/crosstool-ng/1.23.0_1/lib/crosstool-ng-1.23.0/scripts/crosstool-NG.sh
+* Run until step `companion_libs_for_host`
 
-#### Run build command
+```
+    $ ct-ng +companion_libs_for_host
+```
 
-Build process stops just after the tarballs have been extracted.
+### Build
 
-  (6)
+  (13)
 
     $ ct-ng build
 
-    Retrieving needed toolchain components' tarballs
-    [EXTRA]    Retrieving 'make-4.2.1'
-    [EXTRA]    Retrieving 'm4-1.4.18'
-    [EXTRA]    Retrieving 'linux-4.10.8'
-    [EXTRA]    Retrieving 'gmp-6.1.2'
-    [EXTRA]    Retrieving 'mpfr-3.1.5'
-    [EXTRA]    Retrieving 'isl-0.16.1'
-    [EXTRA]    Retrieving 'mpc-1.0.3'
-    [EXTRA]    Retrieving 'expat-2.2.0'
-    [EXTRA]    Retrieving 'ncurses-6.0'
-    [EXTRA]    Retrieving 'libiconv-1.15'
-    [EXTRA]    Retrieving 'gettext-0.19.8.1'
-    [EXTRA]    Retrieving 'binutils-2.28'
-    [EXTRA]    Retrieving 'gcc-6.3.0'
-    [EXTRA]    Retrieving 'glibc-2.25'
-    [EXTRA]    Retrieving 'gdb-7.12.1'
+> Build process stops just after the tarballs have been extracted.
 
 #### Fix source files
 
-  (7)
-
-Add macro to /Volumes/xtools-build-env/.build/src/gdb-7.12.1/gdb/doublest.c:
-```C
-#define min(a,b) \
-  ({ typeof (a) _a = (a); \
-      typeof (b) _b = (b); \
-    _a < _b ? _a : _b; })
-```
-
-  (8) Update ulimit
+  (14)
 
-    $ ulimit -n 1024
+    $ pushd .build/src/gettext-0.19.8.1/
+    $ autoreconf
+    $ popd
 
-#### Modify *extract* section
+#### Update configuration
 
-  (8)
+  (15)
 
     $ ct-ng menuconfig
 
- Uncheck option: _Stop after extracting tarballs_
+Uncheck option:
 
-#### Re-run build command
+`[ ] Stop after extracting tarballs`
 
-Restarts build process from where it previously stopped.
+#### Continue build
 
-  (9)
+  (16)
 
     $ ct-ng build
 
-#### Fix gettext
+> Restart build process from where it previously stopped.
 
-Build will fail at step `companion_tools_for_build` but it can be fixed by running autoreconf:
+  (17)
 
-  (10)
+    $ export PATH=/Volumes/xtools/armv8-rpi3-linux-gnueabihf/bin:$PATH
 
-    $ cd .build/src/gettext-0.19.8.1/
-    $ ./autoreconf
-    $ ct-ng companion_tools_for_build+
+### Test
 
-#### Test the toolchain
-
-  (11)
+  (18)
 
     $ cat > test.c
     $ int main() { printf("Hello, world!\n"); return 0; }
-    $ /Volumes/xtools/arm-unknown-linux-gnueabi-gcc -o test test.c
-
-  (12) OPTIONAL
-
-    “Render the toolchain read-only” from crosstool-NG’s “Paths and misc options” configuration page.
+    <CTRL+D>
+    $ armv8-rpi3-linux-gnueabihf-gcc -o test test.c
 
 
 ## Cross compiling dependencies
 
-  (13)
+  (19)
 
-    $ export PATH=/Volumes/xtools/armv8-rpi3-linux-gnueabihf/bin:$PATH
+    $ mkdir local # prefix directory
+    $ mkdir 3pps  # OTP dependencies
+    $ cd 3pps
 
-#### Cross compiling zlib
+#### zlib
 
-  (14)
+  (20)
 
     $ wget http://zlib.net/zlib-1.2.11.tar.gz
     $ tar xf zlib-1.2.11.tar.gz
-    $ cd zlib-1.2.11
-    $ CHOST=armv8-rpi3-linux-gnueabihf ./configure --prefix=/Users/<username>/git/raspberrypi/arm
+    $ pushd zlib-1.2.11
+    $ CHOST=armv8-rpi3-linux-gnueabihf ./configure --prefix=/Volumes/xtools-build-env/local
     $ make
     $ make install
+    $ popd
 
-#### Cross compiling openssl
+#### openssl
 
-  (15)
+  (21)
 
-    $ wget http://openssl.org/source/openssl-1.1.0g.tar.gz
-    $ tar xf openssl-1.1.0g.tar.gz
-    $ cd openssl-1.1.0g
-    $ ./Configure linux-generic32 --prefix=/Users/<username>/git/raspberrypi/arm --openssldir=/Users/<username>/git/raspberrypi/arm/openssl --cross-compile-prefix=armv8-rpi3-linux-gnueabihf
+    $ wget http://openssl.org/source/openssl-1.1.1b.tar.gz
+    $ tar xf openssl-1.1.1b.tar.gz
+    $ pushd  openssl-1.1.1b
+    $ ./Configure linux-generic32 --prefix=/Volumes/xtools-build-env/local \
+    --openssldir=/Volumes/xtools-build-env/local/openssl \
+    --cross-compile-prefix=armv8-rpi3-linux-gnueabihf-
     $ make
     $ make install
+    $ popd
 
-#### Cross compiling ncurses
-
-  (16)
-
-    $ wget http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz
+> A compatible openssl library shall be available on the target system!
 
+#### ncurses
 
-  (17)
-
-Apply patch:
-
-```patch
---- a/ncurses/base/MKlib_gen.sh
-+++ b/ncurses/base/MKlib_gen.sh
-@@ -474,11 +474,22 @@ sed -n -f $ED1 \
-    -e 's/gen_$//' \
-    -e 's/  / /g' >>$TMP
-
-+cat >$ED1 <<EOF
-+s/  / /g
-+s/^ //
-+s/ $//
-+s/P_NCURSES_BOOL/NCURSES_BOOL/g
-+EOF
-+
-+# A patch discussed here:
-+#  https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
-+# introduces spurious #line markers.  Work around that by ignoring the system's
-+# attempt to define "bool" and using our own symbol here.
-+sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2
-+cat $ED2 >$TMP
-+
- $preprocessor $TMP 2>/dev/null \
--| sed \
--   -e 's/  / /g' \
--   -e 's/^ //' \
--   -e 's/_Bool/NCURSES_BOOL/g' \
-+| sed -f $ED1 \
- | $AWK -f $AW2 \
- | sed -f $ED3 \
- | sed \
-```
+  (22)
 
-  (18)
-
-    $ ./configure --build=x86_64-apple-darwin17.3.0 --host=armv8-rpi3-linux-gnueabihf --without-ada --without-cxx --without-cxx-binding --without-manpages --without-progs --without-tests --prefix=/usr --libdir=/lib --with-build-cc="gcc -D_GNU_SOURCE" --with-shared
+    $ wget http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz
+    $ tar xf ncurses-5.9.tar.gz
+    $ pushd ncurses-5.9
+    $ wget https://gist.githubusercontent.com/peterdmv/1068b2f9e1fec6e1330ad62ed87461ad/\
+    raw/065597b63654ed6a9f28d02fdfbca844413847ad/ncurses-5.9.patch
+    $ patch -p0 < ncurses-5.9.patch
+    $ ./configure --build=x86_64-apple-darwin18.2.0 --host=armv8-rpi3-linux-gnueabihf \
+    --without-ada --without-cxx --without-cxx-binding --without-manpages \
+    --without-progs --without-tests --prefix=/usr --libdir=/lib \
+    --with-build-cc="gcc -D_GNU_SOURCE" --with-shared
     $ make
-    $ make DESTDIR=/Users/<username>/git/raspberrypi/arm install
-
-  (19)
-
-Compile ncurses test program:
-
-    $ cd test
-    $ armv8-rpi3-linux-gnueabihf-gcc -o nctest ncurses.c -I${RPI_SYSROOT}/usr/include -L${RPI_SYSROOT}/lib -lncursesw
+    $ make DESTDIR=/Volumes/xtools-build-env/local install
+    $ popd
 
 
 ## Populating sysroot
 
-  (19)
-
-    Edit /Volumes/xtools/armv8-rpi3-linux-gnueabihf/bin/armv8-rpi3-linux-gnueabihf-populate:
+  (23)
 
-    sed="gsed"
+    $ chmod 755 /Volumes/xtools/armv8-rpi3-linux-gnueabihf/bin
+    $ chmod 755 /Volumes/xtools/armv8-rpi3-linux-gnueabihf/bin/armv8-rpi3-linux-gnueabihf-populate
+    $ gsed -i 's/"sed"/"gsed"/g' \
+    /Volumes/xtools/armv8-rpi3-linux-gnueabihf/bin/armv8-rpi3-linux-gnueabihf-populate
+    $ chmod 555 /Volumes/xtools/armv8-rpi3-linux-gnueabihf/bin
+    $ chmod 555 /Volumes/xtools/armv8-rpi3-linux-gnueabihf/bin/armv8-rpi3-linux-gnueabihf-populate
 
-  (20)
+  (24)
 
-    $ armv8-rpi3-linux-gnueabihf-populate -s /Users/<username>/git/raspberrypi/arm -d /Users/<username>/git/raspberrypi/sysroot
-    $ export RPI_SYSROOT=/Users/<username>/git/raspberrypi/sysroot
+    $ armv8-rpi3-linux-gnueabihf-populate -s /Volumes/xtools-build-env/local \
+    -d /Volumes/xtools-build-env/sysroot
+    $ export RPI_SYSROOT=/Volumes/xtools-build-env/sysroot
 
 
 ## Cross compiling Erlang/OTP
 
-  (21)
+  (25)
 
     $ LC_CTYPE=C && LANG=C && ./otp_build autoconf
-    $ ./otp_build configure --disable-dynamic-ssl-lib --xcomp-conf=./xcomp/erl-xcomp-armv8-rpi3-linux-gnueabihf.conf
+    $ ./otp_build configure --xcomp-conf=./xcomp/erl-xcomp-armv8-rpi3-linux-gnueabihf.conf
     $ ./otp_build boot -a
-    $ ./otp_build release -a /Users/<username>/git/raspberrypi/erlang
-    $ tar czf erlang.tgz ./erlang
-
+    $ ./otp_build release -a /Volumes/xtools-build-env/otp_22.0
diff --git a/HOWTO/INSTALL.md b/HOWTO/INSTALL.md
index 456dafeba5..674454bc8e 100644
--- a/HOWTO/INSTALL.md
+++ b/HOWTO/INSTALL.md
@@ -338,6 +338,8 @@ use the `--prefix` argument like this: `./configure --prefix=<Dir>`.
 Some of the available `configure` options are:
 
 *   `--prefix=PATH` - Specify installation prefix.
+*   `--disable-parallel-configure` - Disable parallel execution of
+    `configure` scripts (parallel execution is enabled by default)
 *   `--{enable,disable}-kernel-poll` - Kernel poll support (enabled by
     default if possible)
 *   `--{enable,disable}-hipe` - HiPE support (enabled by default on supported
diff --git a/Makefile.in b/Makefile.in
index fa7c128379..25003f47a9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -434,7 +434,7 @@ endif
 	  PATH=$(BOOT_PREFIX)"$${PATH}" \
 	  ERL_TOP=$(ERL_TOP) $(MAKE) TESTROOT="$(RELEASE_ROOT)" DOCGEN=$(BOOTSTRAP_ROOT)/bootstrap/lib/erl_docgen $@
 ifneq  ($(OTP_SMALL_BUILD),true)
-	echo "OTP doc built" > $(ERL_TOP)/make/otp_doc_built
+	test -f $(ERL_TOP)/make/otp_doc_built || echo "OTP doc built" > $(ERL_TOP)/make/otp_doc_built
 endif
 
 xmllint: docs
@@ -450,7 +450,9 @@ else
 	$(MAKE) -C system/doc $@
 endif
 
-mod2app: 
+mod2app: $(ERL_TOP)/make/$(TARGET)/mod2app.xml
+
+$(ERL_TOP)/make/$(TARGET)/mod2app.xml: erts/doc/src/Makefile lib/*/doc/src/Makefile 
 	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
 
 # ----------------------------------------------------------------------
@@ -483,37 +485,20 @@ libs:
 ifeq ($(OTP_SMALL_BUILD),true)
 	$(make_verbose)cd lib && \
 	  ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \
-		$(MAKE) opt
+		$(MAKE) $(TYPE)
 else
 	$(make_verbose)cd lib && \
 	  ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \
-		$(MAKE) opt BUILD_ALL=true
-	$(V_at)echo "OTP built" > $(ERL_TOP)/make/otp_built
+		$(MAKE) $(TYPE) BUILD_ALL=true
+	$(V_at)test -f $(ERL_TOP)/make/otp_built || echo "OTP built" > $(ERL_TOP)/make/otp_built
 endif
-kernel:
-	$(make_verbose)cd lib/kernel && \
-	  ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \
-		$(MAKE) opt BUILD_ALL=true
 
-stdlib:
-	$(make_verbose)cd lib/stdlib && \
-	  ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \
-		$(MAKE) opt BUILD_ALL=true
+APPS=$(patsubst $(ERL_TOP)/lib/%/doc,%,$(wildcard $(ERL_TOP)/lib/*/doc))
 
-compiler:
-	$(make_verbose)cd lib/compiler && \
+$(APPS):
+	$(make_verbose)cd lib/$@ && \
 	  ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \
-		$(MAKE) opt BUILD_ALL=true
-
-hipe:
-	$(make_verbose)cd lib/hipe && \
-	  ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \
-		$(MAKE) opt BUILD_ALL=true
-
-syntax_tools:
-	$(make_verbose)cd lib/syntax_tools && \
-	ERL_TOP=$(ERL_TOP) PATH=$(BOOT_PREFIX)"$${PATH}" \
-	    $(MAKE) opt BUILD_ALL=true
+		$(MAKE) $(TYPE) BUILD_ALL=true
 
 preloaded:
 	$(make_verbose)cd erts/preloaded/src && \
@@ -767,7 +752,7 @@ tertiary_bootstrap_copy:
 		true; \
 	done
 #	copy erl_interface includes
-	$(V_at)for x in lib/erl_interface/include/*; do \
+	$(V_at)for x in lib/erl_interface/include/*.h; do \
 		BN=`basename $$x`; \
 		TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/erl_interface/include/$$BN; \
 		test -f  $$TF && \
@@ -988,7 +973,7 @@ primary_bootstrap_copy:
 
 # To remove modules left by the bootstrap building, but leave (restore)
 # the modules in kernel which are needed for an emulator build
-KERNEL_PRELOAD    = otp_ring0 init erl_prim_loader prim_inet prim_file zlib prim_zip erlang erts_code_purger
+KERNEL_PRELOAD    = erl_init init erl_prim_loader prim_inet prim_file zlib prim_zip erlang erts_code_purger
 KERNEL_PRELOAD_BEAMS=$(KERNEL_PRELOAD:%=$(BOOTSTRAP_TOP)/lib/kernel/ebin/%.beam)
 
 start_scripts:
diff --git a/OTP_VERSION b/OTP_VERSION
index c598172d8d..84a941394a 100644
--- a/OTP_VERSION
+++ b/OTP_VERSION
@@ -1 +1 @@
-21.2
+22.0.7
diff --git a/README.md b/README.md
index 5e051388d1..4cf018901c 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,8 @@
 
 **OTP** is a set of Erlang libraries, which consists of the Erlang runtime system, a number of ready-to-use components mainly written in Erlang, and a set of design principles for Erlang programs. [Learn more about Erlang and OTP](http://erlang.org/doc/system_architecture_intro/sys_arch_intro.html).
 
+[Release notes](http://erlang.org/download/otp_versions_tree.html) for all OTP versions.
+
 [Learn how to program in Erlang](http://learnyousomeerlang.com/content).
 
 ## Examples
diff --git a/bootstrap/bin/no_dot_erlang.boot b/bootstrap/bin/no_dot_erlang.boot
index db76df8e3c..26cd9e4d5e 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 db76df8e3c..26cd9e4d5e 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 db76df8e3c..26cd9e4d5e 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 248c6dc0e4..ceb83ba48b 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 03eb4986e4..78b75359a6 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 dc941da6ae..1db56cb5f1 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
deleted file mode 100644
index 1fc68940ac..0000000000
--- a/bootstrap/lib/compiler/ebin/beam_bs.beam
+++ /dev/null
diff --git a/bootstrap/lib/compiler/ebin/beam_bsm.beam b/bootstrap/lib/compiler/ebin/beam_bsm.beam
deleted file mode 100644
index 6bf3b576b2..0000000000
--- a/bootstrap/lib/compiler/ebin/beam_bsm.beam
+++ /dev/null
diff --git a/bootstrap/lib/compiler/ebin/beam_clean.beam b/bootstrap/lib/compiler/ebin/beam_clean.beam
index bc49326e74..4d567eca88 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
deleted file mode 100644
index 534eb65372..0000000000
--- a/bootstrap/lib/compiler/ebin/beam_dead.beam
+++ /dev/null
diff --git a/bootstrap/lib/compiler/ebin/beam_dict.beam b/bootstrap/lib/compiler/ebin/beam_dict.beam
index 1e2068b5cb..b9317a55ee 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 2d9bc49992..eb2a13d620 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 6eed82587a..1894483f71 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 e039f3c12b..d7780861c2 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 a77c5caf36..289c08630a 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_kernel_to_ssa.beam b/bootstrap/lib/compiler/ebin/beam_kernel_to_ssa.beam
new file mode 100644
index 0000000000..96362c8cdd
--- /dev/null
+++ b/bootstrap/lib/compiler/ebin/beam_kernel_to_ssa.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_listing.beam b/bootstrap/lib/compiler/ebin/beam_listing.beam
index 87a8791bc4..097ba5e7ff 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 98b2c19b48..52a23f7f6c 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 5f33584fe4..9246bd1c27 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
deleted file mode 100644
index 909e5403d1..0000000000
--- a/bootstrap/lib/compiler/ebin/beam_receive.beam
+++ /dev/null
diff --git a/bootstrap/lib/compiler/ebin/beam_record.beam b/bootstrap/lib/compiler/ebin/beam_record.beam
deleted file mode 100644
index 188bd82412..0000000000
--- a/bootstrap/lib/compiler/ebin/beam_record.beam
+++ /dev/null
diff --git a/bootstrap/lib/compiler/ebin/beam_reorder.beam b/bootstrap/lib/compiler/ebin/beam_reorder.beam
deleted file mode 100644
index 05562e19ea..0000000000
--- a/bootstrap/lib/compiler/ebin/beam_reorder.beam
+++ /dev/null
diff --git a/bootstrap/lib/compiler/ebin/beam_split.beam b/bootstrap/lib/compiler/ebin/beam_split.beam
deleted file mode 100644
index 476dd53ee6..0000000000
--- a/bootstrap/lib/compiler/ebin/beam_split.beam
+++ /dev/null
diff --git a/bootstrap/lib/compiler/ebin/beam_ssa.beam b/bootstrap/lib/compiler/ebin/beam_ssa.beam
new file mode 100644
index 0000000000..0327230a58
--- /dev/null
+++ b/bootstrap/lib/compiler/ebin/beam_ssa.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_ssa_bsm.beam b/bootstrap/lib/compiler/ebin/beam_ssa_bsm.beam
new file mode 100644
index 0000000000..b9bb997cc7
--- /dev/null
+++ b/bootstrap/lib/compiler/ebin/beam_ssa_bsm.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_ssa_codegen.beam b/bootstrap/lib/compiler/ebin/beam_ssa_codegen.beam
new file mode 100644
index 0000000000..cb06630012
--- /dev/null
+++ b/bootstrap/lib/compiler/ebin/beam_ssa_codegen.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_ssa_dead.beam b/bootstrap/lib/compiler/ebin/beam_ssa_dead.beam
new file mode 100644
index 0000000000..782073698e
--- /dev/null
+++ b/bootstrap/lib/compiler/ebin/beam_ssa_dead.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_ssa_funs.beam b/bootstrap/lib/compiler/ebin/beam_ssa_funs.beam
new file mode 100644
index 0000000000..6370e1eb78
--- /dev/null
+++ b/bootstrap/lib/compiler/ebin/beam_ssa_funs.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_ssa_lint.beam b/bootstrap/lib/compiler/ebin/beam_ssa_lint.beam
new file mode 100644
index 0000000000..e0a43057fc
--- /dev/null
+++ b/bootstrap/lib/compiler/ebin/beam_ssa_lint.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_ssa_opt.beam b/bootstrap/lib/compiler/ebin/beam_ssa_opt.beam
new file mode 100644
index 0000000000..b8588725b4
--- /dev/null
+++ b/bootstrap/lib/compiler/ebin/beam_ssa_opt.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_ssa_pp.beam b/bootstrap/lib/compiler/ebin/beam_ssa_pp.beam
new file mode 100644
index 0000000000..f76f15aa70
--- /dev/null
+++ b/bootstrap/lib/compiler/ebin/beam_ssa_pp.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_ssa_pre_codegen.beam b/bootstrap/lib/compiler/ebin/beam_ssa_pre_codegen.beam
new file mode 100644
index 0000000000..e22cb5c846
--- /dev/null
+++ b/bootstrap/lib/compiler/ebin/beam_ssa_pre_codegen.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_ssa_recv.beam b/bootstrap/lib/compiler/ebin/beam_ssa_recv.beam
new file mode 100644
index 0000000000..578e8db0eb
--- /dev/null
+++ b/bootstrap/lib/compiler/ebin/beam_ssa_recv.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_ssa_share.beam b/bootstrap/lib/compiler/ebin/beam_ssa_share.beam
new file mode 100644
index 0000000000..d975cebf48
--- /dev/null
+++ b/bootstrap/lib/compiler/ebin/beam_ssa_share.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_ssa_type.beam b/bootstrap/lib/compiler/ebin/beam_ssa_type.beam
new file mode 100644
index 0000000000..0403230604
--- /dev/null
+++ b/bootstrap/lib/compiler/ebin/beam_ssa_type.beam
diff --git a/bootstrap/lib/compiler/ebin/beam_trim.beam b/bootstrap/lib/compiler/ebin/beam_trim.beam
index 32cc6efe88..00f3224106 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
deleted file mode 100644
index fe2824b20e..0000000000
--- a/bootstrap/lib/compiler/ebin/beam_type.beam
+++ /dev/null
diff --git a/bootstrap/lib/compiler/ebin/beam_utils.beam b/bootstrap/lib/compiler/ebin/beam_utils.beam
index 7c65d7b6e4..996525efc9 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 6d2c9eb69d..050789f481 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 57698dbb3b..21ca7bcf46 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 4f8ae7ca43..948c4759b0 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 fdd67aebde..a20a4ca43b 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 f0d6063f19..7bf92a0dd7 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_sets.beam b/bootstrap/lib/compiler/ebin/cerl_sets.beam
index 6905c648c2..bda70130a6 100644
--- a/bootstrap/lib/compiler/ebin/cerl_sets.beam
+++ b/bootstrap/lib/compiler/ebin/cerl_sets.beam
diff --git a/bootstrap/lib/compiler/ebin/cerl_trees.beam b/bootstrap/lib/compiler/ebin/cerl_trees.beam
index 4304437799..831eddc405 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 3f52b9463d..ebe42547ee 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 f53cc32c12..e086da1b68 100644
--- a/bootstrap/lib/compiler/ebin/compiler.app
+++ b/bootstrap/lib/compiler/ebin/compiler.app
@@ -19,29 +19,34 @@
 
 {application, compiler,
  [{description, "ERTS  CXC 138 10"},
-  {vsn, "7.2.7"},
+  {vsn, "7.4.4"},
   {modules, [
 	     beam_a,
 	     beam_asm,
 	     beam_block,
-	     beam_bs,
-	     beam_bsm,
 	     beam_clean,
-	     beam_dead,
 	     beam_dict,
 	     beam_disasm,
 	     beam_except,
 	     beam_flatten,
 	     beam_jump,
+             beam_kernel_to_ssa,
 	     beam_listing,
 	     beam_opcodes,
 	     beam_peep,
-	     beam_receive,
-	     beam_reorder,
-	     beam_record,
-	     beam_split,
+             beam_ssa,
+             beam_ssa_bsm,
+             beam_ssa_codegen,
+             beam_ssa_dead,
+             beam_ssa_funs,
+             beam_ssa_lint,
+             beam_ssa_opt,
+             beam_ssa_pp,
+             beam_ssa_pre_codegen,
+             beam_ssa_recv,
+             beam_ssa_share,
+             beam_ssa_type,
 	     beam_trim,
-	     beam_type,
 	     beam_utils,
 	     beam_validator,
 	     beam_z,
@@ -60,12 +65,10 @@
 	     rec_env,
 	     sys_core_alias,
 	     sys_core_bsm,
-	     sys_core_dsetel,
 	     sys_core_fold,
 	     sys_core_fold_lists,
 	     sys_core_inline,
 	     sys_pre_attributes,
-	     v3_codegen,
 	     v3_core,
 	     v3_kernel,
 	     v3_kernel_pp
diff --git a/bootstrap/lib/compiler/ebin/compiler.appup b/bootstrap/lib/compiler/ebin/compiler.appup
index 350a3924e7..3d4fe9c021 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.5",
+{"7.3.2",
  [{<<".*">>,[{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 f3737ecc26..19b0c3dfcb 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 567e381ee8..ecad4f33e0 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 618668e92e..f14357cf02 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 6518f3a4ce..a2b3167e10 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 bc0190fdb1..8e44464cd7 100644
--- a/bootstrap/lib/compiler/ebin/core_scan.beam
+++ b/bootstrap/lib/compiler/ebin/core_scan.beam
diff --git a/bootstrap/lib/compiler/ebin/erl_bifs.beam b/bootstrap/lib/compiler/ebin/erl_bifs.beam
index 37bd743796..e626e91f4f 100644
--- a/bootstrap/lib/compiler/ebin/erl_bifs.beam
+++ b/bootstrap/lib/compiler/ebin/erl_bifs.beam
diff --git a/bootstrap/lib/compiler/ebin/rec_env.beam b/bootstrap/lib/compiler/ebin/rec_env.beam
index b0ef249e15..6d0c5baa04 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 52e46da7ad..b769b6be41 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 0bc7588ab3..6f4204e0a1 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
deleted file mode 100644
index c189549b16..0000000000
--- a/bootstrap/lib/compiler/ebin/sys_core_dsetel.beam
+++ /dev/null
diff --git a/bootstrap/lib/compiler/ebin/sys_core_fold.beam b/bootstrap/lib/compiler/ebin/sys_core_fold.beam
index 9def7c8d2c..d4746e3664 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 0ad7ab7f9c..f4aac9ac13 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 ebe35883b5..5647c8fcb5 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 d96bc1913a..002b4f2914 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
deleted file mode 100644
index 4700b80b93..0000000000
--- a/bootstrap/lib/compiler/ebin/v3_codegen.beam
+++ /dev/null
diff --git a/bootstrap/lib/compiler/ebin/v3_core.beam b/bootstrap/lib/compiler/ebin/v3_core.beam
index 6a76fba69a..3cbbdfd88b 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 7a155ec05c..6ce6777e55 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 4aef1389be..5177b65198 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 58f1681fba..84c5b7636e 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 4f52e506c2..b5d6545ca7 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 55adf9849c..77bb9544e2 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 ca7b77abcb..0daab463ab 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 200a996f96..c77178bf7c 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 669efdc50f..204b15fcf2 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 93c354bf40..637e40f5d8 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 4f0eae4984..25142ee575 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 10c7275240..0a781001dc 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 0f0418a911..3b961dcefa 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 517fa7dfdb..e82fc7dc75 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 3956e595f8..8fa128dd23 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 6559fc04c1..801e3d8b88 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 de9b1cb638..c04bc43872 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 8c8cba9068..4490f9c81f 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 449fd8dff1..6ed9862a0e 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 25b4b6c55e..7658a35642 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 1a1d9d28ee..da03769e2e 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 1ce96ca432..19739b0043 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 08ec3e0e1a..10b13c35b6 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 82641f173a..e0b759eee3 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 07a4f410e1..a7a82a1f12 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 d9ca62a82b..b8f1272be4 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 4f1d53cb39..cc2face79c 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 dcd81b1c6f..9fc5800f0c 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 0e492978d5..736b28c68f 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 323b6cd4bb..0d6541ee53 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 e138217d25..aadb5bf080 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 b072f96e5d..83885cdeb5 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 653d2a8699..a94d9da454 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 03abd10d20..dcec55421c 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 97f98ebe2f..b9df7cfc14 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 0c3caaf969..1b63142893 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 7f205de75f..de7d9c2e57 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 cece8e6e85..f64311e166 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 bea47a3591..a6220a9d69 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 b2dc48d794..7cacde3399 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 abc4b650ae..ac4be100e8 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 5b50b553d7..c44b389b75 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 513a7dc03d..a835fa1a74 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 f483acd96c..d88fa2185d 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 610d9a2205..8166eca5de 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 63fadee640..6797eecb29 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 175649cd81..e8935134b5 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 463f90fae8..c964152d79 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 5107eb63b8..0e659bd738 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 5e3d9b307b..c273d47012 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 fdfe042445..d09aa250c8 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 d358ee15dc..5853bde54f 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 898ed0a048..cb13db1a89 100644
--- a/bootstrap/lib/kernel/ebin/kernel.app
+++ b/bootstrap/lib/kernel/ebin/kernel.app
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 {application, kernel,
  [
   {description, "ERTS  CXC 138 10"},
-  {vsn, "6.1"},
+  {vsn, "6.4.1"},
   {modules, [application,
 	     application_controller,
 	     application_master,
@@ -68,6 +68,8 @@
              logger_formatter,
              logger_h_common,
              logger_handler_watcher,
+             logger_olp,
+             logger_proxy,
              logger_server,
              logger_simple_h,
              logger_std_h,
@@ -146,6 +148,6 @@
          {logger_sasl_compatible, false}
         ]},
   {mod, {kernel, []}},
-  {runtime_dependencies, ["erts-10.1", "stdlib-3.5", "sasl-3.0"]}
+  {runtime_dependencies, ["erts-10.2.5", "stdlib-3.5", "sasl-3.0"]}
  ]
 }.
diff --git a/bootstrap/lib/kernel/ebin/kernel.appup b/bootstrap/lib/kernel/ebin/kernel.appup
index ac114f0354..5f6d9d3988 100644
--- a/bootstrap/lib/kernel/ebin/kernel.appup
+++ b/bootstrap/lib/kernel/ebin/kernel.appup
@@ -16,13 +16,52 @@
 %% limitations under the License.
 %%
 %% %CopyrightEnd%
-{"5.4.3",
- %% Up from - max one major revision back
- [{<<"5\\.3(\\.[0-9]+)*">>,[restart_new_emulator]},  % OTP-20.0
-  {<<"5\\.4(\\.[0-9]+)*">>,[restart_new_emulator]},  % OTP-20.1+
-  {<<"6\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-21
- %% Down to - max one major revision back
- [{<<"5\\.3(\\.[0-9]+)*">>,[restart_new_emulator]},  % OTP-20.0
-  {<<"5\\.4(\\.[0-9]+)*">>,[restart_new_emulator]},  % OTP-20.1+
-  {<<"6\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}]  % OTP-21
-}.
+%%
+%% We allow upgrade from, and downgrade to all previous
+%% versions from the following OTP releases:
+%% - OTP 20
+%% - OTP 21
+%%
+%% We also allow upgrade from, and downgrade to all
+%% versions that have branched off from the above
+%% stated previous versions.
+%%
+{"6.3.1",
+ [{<<"^5\\.3$">>,[restart_new_emulator]},
+  {<<"^5\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^5\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^5\\.4$">>,[restart_new_emulator]},
+  {<<"^5\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^5\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^5\\.4\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^5\\.4\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^6\\.0$">>,[restart_new_emulator]},
+  {<<"^6\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^6\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^6\\.1$">>,[restart_new_emulator]},
+  {<<"^6\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^6\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^6\\.2$">>,[restart_new_emulator]},
+  {<<"^6\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^6\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^6\\.3$">>,[restart_new_emulator]},
+  {<<"^6\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
+ [{<<"^5\\.3$">>,[restart_new_emulator]},
+  {<<"^5\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^5\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^5\\.4$">>,[restart_new_emulator]},
+  {<<"^5\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^5\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^5\\.4\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^5\\.4\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^6\\.0$">>,[restart_new_emulator]},
+  {<<"^6\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^6\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^6\\.1$">>,[restart_new_emulator]},
+  {<<"^6\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^6\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^6\\.2$">>,[restart_new_emulator]},
+  {<<"^6\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^6\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^6\\.3$">>,[restart_new_emulator]},
+  {<<"^6\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
diff --git a/bootstrap/lib/kernel/ebin/kernel.beam b/bootstrap/lib/kernel/ebin/kernel.beam
index b3f0783d25..2832938d95 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 85b517fe0f..e749cc6c96 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
index 2fca33154c..04306c6e2c 100644
--- a/bootstrap/lib/kernel/ebin/kernel_refc.beam
+++ 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 02c5848f11..2958d19524 100644
--- a/bootstrap/lib/kernel/ebin/local_tcp.beam
+++ b/bootstrap/lib/kernel/ebin/local_tcp.beam
diff --git a/bootstrap/lib/kernel/ebin/local_udp.beam b/bootstrap/lib/kernel/ebin/local_udp.beam
index 400c9ca23b..33ed76e5cd 100644
--- a/bootstrap/lib/kernel/ebin/local_udp.beam
+++ b/bootstrap/lib/kernel/ebin/local_udp.beam
diff --git a/bootstrap/lib/kernel/ebin/logger.beam b/bootstrap/lib/kernel/ebin/logger.beam
index 26e0d3b0f1..1dc1c4fef4 100644
--- a/bootstrap/lib/kernel/ebin/logger.beam
+++ b/bootstrap/lib/kernel/ebin/logger.beam
diff --git a/bootstrap/lib/kernel/ebin/logger_backend.beam b/bootstrap/lib/kernel/ebin/logger_backend.beam
index b2e7854689..40a3c4d80a 100644
--- a/bootstrap/lib/kernel/ebin/logger_backend.beam
+++ b/bootstrap/lib/kernel/ebin/logger_backend.beam
diff --git a/bootstrap/lib/kernel/ebin/logger_config.beam b/bootstrap/lib/kernel/ebin/logger_config.beam
index 7eb426852b..51c7f78237 100644
--- a/bootstrap/lib/kernel/ebin/logger_config.beam
+++ b/bootstrap/lib/kernel/ebin/logger_config.beam
diff --git a/bootstrap/lib/kernel/ebin/logger_disk_log_h.beam b/bootstrap/lib/kernel/ebin/logger_disk_log_h.beam
index 7105ce9003..dd0ca5f204 100644
--- a/bootstrap/lib/kernel/ebin/logger_disk_log_h.beam
+++ b/bootstrap/lib/kernel/ebin/logger_disk_log_h.beam
diff --git a/bootstrap/lib/kernel/ebin/logger_filters.beam b/bootstrap/lib/kernel/ebin/logger_filters.beam
index 57197e137c..2d8035278d 100644
--- a/bootstrap/lib/kernel/ebin/logger_filters.beam
+++ b/bootstrap/lib/kernel/ebin/logger_filters.beam
diff --git a/bootstrap/lib/kernel/ebin/logger_formatter.beam b/bootstrap/lib/kernel/ebin/logger_formatter.beam
index 3e99f7e1fa..e3e40460f0 100644
--- a/bootstrap/lib/kernel/ebin/logger_formatter.beam
+++ b/bootstrap/lib/kernel/ebin/logger_formatter.beam
diff --git a/bootstrap/lib/kernel/ebin/logger_h_common.beam b/bootstrap/lib/kernel/ebin/logger_h_common.beam
index c09eaaba65..9e8c25b6b9 100644
--- a/bootstrap/lib/kernel/ebin/logger_h_common.beam
+++ b/bootstrap/lib/kernel/ebin/logger_h_common.beam
diff --git a/bootstrap/lib/kernel/ebin/logger_handler_watcher.beam b/bootstrap/lib/kernel/ebin/logger_handler_watcher.beam
index 44bc104ff9..fb20fd1818 100644
--- a/bootstrap/lib/kernel/ebin/logger_handler_watcher.beam
+++ b/bootstrap/lib/kernel/ebin/logger_handler_watcher.beam
diff --git a/bootstrap/lib/kernel/ebin/logger_olp.beam b/bootstrap/lib/kernel/ebin/logger_olp.beam
new file mode 100644
index 0000000000..ed06b6ae5e
--- /dev/null
+++ b/bootstrap/lib/kernel/ebin/logger_olp.beam
diff --git a/bootstrap/lib/kernel/ebin/logger_proxy.beam b/bootstrap/lib/kernel/ebin/logger_proxy.beam
new file mode 100644
index 0000000000..ed0ed0f56b
--- /dev/null
+++ b/bootstrap/lib/kernel/ebin/logger_proxy.beam
diff --git a/bootstrap/lib/kernel/ebin/logger_server.beam b/bootstrap/lib/kernel/ebin/logger_server.beam
index c7c9b11962..dcff9beac7 100644
--- a/bootstrap/lib/kernel/ebin/logger_server.beam
+++ b/bootstrap/lib/kernel/ebin/logger_server.beam
diff --git a/bootstrap/lib/kernel/ebin/logger_simple_h.beam b/bootstrap/lib/kernel/ebin/logger_simple_h.beam
index fca659598d..583c77b290 100644
--- a/bootstrap/lib/kernel/ebin/logger_simple_h.beam
+++ b/bootstrap/lib/kernel/ebin/logger_simple_h.beam
diff --git a/bootstrap/lib/kernel/ebin/logger_std_h.beam b/bootstrap/lib/kernel/ebin/logger_std_h.beam
index 60618d56c9..c8eb73a076 100644
--- a/bootstrap/lib/kernel/ebin/logger_std_h.beam
+++ b/bootstrap/lib/kernel/ebin/logger_std_h.beam
diff --git a/bootstrap/lib/kernel/ebin/logger_sup.beam b/bootstrap/lib/kernel/ebin/logger_sup.beam
index 32eb526a09..60192ef4a1 100644
--- a/bootstrap/lib/kernel/ebin/logger_sup.beam
+++ b/bootstrap/lib/kernel/ebin/logger_sup.beam
diff --git a/bootstrap/lib/kernel/ebin/net.beam b/bootstrap/lib/kernel/ebin/net.beam
index 29c8bc5dde..44b1f10603 100644
--- a/bootstrap/lib/kernel/ebin/net.beam
+++ b/bootstrap/lib/kernel/ebin/net.beam
diff --git a/bootstrap/lib/kernel/ebin/net_adm.beam b/bootstrap/lib/kernel/ebin/net_adm.beam
index 05aa46dcb8..5810577c6a 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 a62690e27a..4c57f5f6c8 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 f2a003d44f..f05007041b 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 a106700e44..d293ea18f3 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 c2f265ede4..02c4c6454a 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
index 734a051882..16dc314ba5 100644
--- a/bootstrap/lib/kernel/ebin/raw_file_io.beam
+++ 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
index 6f07a3c5c3..3c41f8528e 100644
--- a/bootstrap/lib/kernel/ebin/raw_file_io_compressed.beam
+++ 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
index 222817d912..11b8f4a6db 100644
--- a/bootstrap/lib/kernel/ebin/raw_file_io_deflate.beam
+++ 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
index 2c20a06fd1..b3381cc397 100644
--- a/bootstrap/lib/kernel/ebin/raw_file_io_delayed.beam
+++ 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
index 228a8f28a5..7c47f2cf10 100644
--- a/bootstrap/lib/kernel/ebin/raw_file_io_inflate.beam
+++ 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
index 4c69c890cd..b544fd394e 100644
--- a/bootstrap/lib/kernel/ebin/raw_file_io_list.beam
+++ b/bootstrap/lib/kernel/ebin/raw_file_io_list.beam
diff --git a/bootstrap/lib/kernel/ebin/rpc.beam b/bootstrap/lib/kernel/ebin/rpc.beam
index 7a1c9e0b31..b53525e2ca 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 1d1e277bf3..f81a39ddc0 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 c01106ef11..18582d22f2 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 4cbf2174a2..8214d9d6aa 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 c5a3330ee1..43df5afa36 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 6aa34138c8..c82fca70da 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 a0f24625b4..ceb8dd9a78 100644
--- a/bootstrap/lib/kernel/ebin/wrap_log_reader.beam
+++ b/bootstrap/lib/kernel/ebin/wrap_log_reader.beam
diff --git a/bootstrap/lib/kernel/include/dist.hrl b/bootstrap/lib/kernel/include/dist.hrl
index 003852f1b0..f06fc328d7 100644
--- a/bootstrap/lib/kernel/include/dist.hrl
+++ b/bootstrap/lib/kernel/include/dist.hrl
@@ -42,6 +42,9 @@
 -define(DFLAG_BIG_CREATION, 16#40000).
 -define(DFLAG_SEND_SENDER, 16#80000).
 -define(DFLAG_BIG_SEQTRACE_LABELS, 16#100000).
+%% -define(DFLAG_NO_MAGIC, 16#200000). %% Used internally only
+-define(DFLAG_EXIT_PAYLOAD, 16#400000).
+-define(DFLAG_FRAGMENTS, 16#800000).
 
 %% Also update dflag2str() in ../src/dist_util.erl
 %% when adding flags...
diff --git a/bootstrap/lib/stdlib/ebin/array.beam b/bootstrap/lib/stdlib/ebin/array.beam
index e352b65951..9e783452f5 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 902d8edc6c..5872970da7 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 ee20aced6b..a96ccb6f8c 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 e712319947..fc1bbe163a 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 6c8d14bac1..17e061b1d0 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 1dc653109d..89102adda8 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 a7500207db..2eadde21ff 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 31f0f2701a..8cd247e3be 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 2b56a46eb1..e38eb384a1 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 2fda3ba53f..f73509ae3f 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 345df4c87f..dc390024a4 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 1faf374588..60abe020fd 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 fa41a7af26..fabe782d90 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 c8d4cac351..b6a7ecc9a5 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 62e209dcc7..865066c3ac 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 dba73e824b..e3d8c21edf 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 e6042b9715..973ad9fb80 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 7a0a4c08d8..a40fcb3f92 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 b9b75ecaef..1beb0d5ebb 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 a317ae28a1..fa223657bf 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_error.beam b/bootstrap/lib/stdlib/ebin/erl_error.beam
index dc9d0a8d39..5d1b91aeef 100644
--- a/bootstrap/lib/stdlib/ebin/erl_error.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_error.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_eval.beam b/bootstrap/lib/stdlib/ebin/erl_eval.beam
index 4d96a82267..5ef1521371 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 9a3daef51e..e527f98776 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 0b56862c57..9015ad8936 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 ce99e04342..c73ecdf942 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 86876cda96..41369ca147 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_posix_msg.beam b/bootstrap/lib/stdlib/ebin/erl_posix_msg.beam
index a5d30afed2..5f6c03bcae 100644
--- a/bootstrap/lib/stdlib/ebin/erl_posix_msg.beam
+++ b/bootstrap/lib/stdlib/ebin/erl_posix_msg.beam
diff --git a/bootstrap/lib/stdlib/ebin/erl_pp.beam b/bootstrap/lib/stdlib/ebin/erl_pp.beam
index f645aea910..1965b9e656 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 a7a2910e1b..18538620b7 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 b72e4ebf6a..871ccd82d4 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 2f2e54de1a..64de26f7a4 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 a6e46e72b4..e7ee41cc2e 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 781484fe0b..e846ca420e 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 ab4996ef4e..350316dfcc 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 0a3c0b47fb..08f86f86ff 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 9fb87f4a68..0a42a40d7e 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 d1ec5357fc..62b8c3588e 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 85d568a8e1..d353a11f3e 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 43ba8674b7..8d1e2c11e0 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 4476889671..0aae509cb6 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 b0e38024c5..85a9c25618 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 ef8d0cd929..f3376d2ee2 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 3a4df3499c..5c4a0aa3d5 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 1752276cc8..06c3d6de19 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 1c1b93a036..0aab776d07 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 197d9b7f9c..631863b587 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 05894640cb..45692978e4 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 9b8d7d8a9e..66047b5070 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 b33a6bbd72..22690ce685 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 bd65ecfc30..b0f4177d71 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/lists.beam b/bootstrap/lib/stdlib/ebin/lists.beam
index a711637e0c..5a330bece0 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 b27db50f62..b812621c0a 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 ec0ebce58a..193a06241d 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 ae3550872f..bb98ae56b3 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 57a23fbe98..d6f267ad8f 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 eac57f960a..44f9e5d8b5 100644
--- a/bootstrap/lib/stdlib/ebin/ordsets.beam
+++ b/bootstrap/lib/stdlib/ebin/ordsets.beam
diff --git a/bootstrap/lib/stdlib/ebin/otp_internal.beam b/bootstrap/lib/stdlib/ebin/otp_internal.beam
index c42b18f6cf..26d495af72 100644
--- a/bootstrap/lib/stdlib/ebin/otp_internal.beam
+++ b/bootstrap/lib/stdlib/ebin/otp_internal.beam
diff --git a/bootstrap/lib/stdlib/ebin/pool.beam b/bootstrap/lib/stdlib/ebin/pool.beam
index b056cf44ec..408ee3a0c9 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 45f25d7820..b51898901d 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 cb2e3ddb11..a8ddeb2d57 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 c1cd50f143..cca174e3cd 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 4153598cc7..4d86fdfec2 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 8c6b611247..94728e30cc 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 55f8db7445..7f1e6140bf 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 37f12f8a36..a4bc2b6128 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 4334fa8dc4..e16327b906 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 c1b7414741..e3609ea527 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 65ffc775ad..319bb9aebf 100644
--- a/bootstrap/lib/stdlib/ebin/shell.beam
+++ b/bootstrap/lib/stdlib/ebin/shell.beam
diff --git a/bootstrap/lib/stdlib/ebin/shell_default.beam b/bootstrap/lib/stdlib/ebin/shell_default.beam
index b2b955de04..afd0c65921 100644
--- a/bootstrap/lib/stdlib/ebin/shell_default.beam
+++ b/bootstrap/lib/stdlib/ebin/shell_default.beam
diff --git a/bootstrap/lib/stdlib/ebin/slave.beam b/bootstrap/lib/stdlib/ebin/slave.beam
index e832637c7c..259d300155 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 0acc6b92ba..3a90a07add 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 d660046c77..41c1f14bbc 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.6"},
+  {vsn, "3.9.2"},
   {modules, [array,
 	     base64,
 	     beam_lib,
@@ -108,7 +108,7 @@
                dets]},
   {applications, [kernel]},
   {env, []},
-  {runtime_dependencies, ["sasl-3.0","kernel-6.0","erts-10.0","crypto-3.3",
+  {runtime_dependencies, ["sasl-3.0","kernel-6.0","erts-@OTP-15831:OTP-15836:OTP-15889@","crypto-3.3",
 			  "compiler-5.0"]}
 ]}.
 
diff --git a/bootstrap/lib/stdlib/ebin/stdlib.appup b/bootstrap/lib/stdlib/ebin/stdlib.appup
index 381b33c833..cf693f332c 100644
--- a/bootstrap/lib/stdlib/ebin/stdlib.appup
+++ b/bootstrap/lib/stdlib/ebin/stdlib.appup
@@ -16,11 +16,48 @@
 %% limitations under the License.
 %%
 %% %CopyrightEnd%
-{"3.4.5",
- %% Up from - max one major revision back
- [{<<"3\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-20.*
-  {<<"3\\.5(\\.[0-9]+)*">>,[restart_new_emulator]}],% OTP-21.*
- %% Down to - max one major revision back
- [{<<"3\\.4(\\.[0-9]+)*">>,[restart_new_emulator]},  % OTP-20.*
-  {<<"3\\.5(\\.[0-9]+)*">>,[restart_new_emulator]}]  % OTP-20.*
-}.
+%%
+%% We allow upgrade from, and downgrade to all previous
+%% versions from the following OTP releases:
+%% - OTP 20
+%% - OTP 21
+%%
+%% We also allow upgrade from, and downgrade to all
+%% versions that have branched off from the above
+%% stated previous versions.
+%%
+{"3.8.1",
+ [{<<"^3\\.4$">>,[restart_new_emulator]},
+  {<<"^3\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.4\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.4\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.4\\.4(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.4\\.5(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.5$">>,[restart_new_emulator]},
+  {<<"^3\\.5\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.5\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.6$">>,[restart_new_emulator]},
+  {<<"^3\\.6\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.7$">>,[restart_new_emulator]},
+  {<<"^3\\.7\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.7\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.8$">>,[restart_new_emulator]},
+  {<<"^3\\.8\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
+ [{<<"^3\\.4$">>,[restart_new_emulator]},
+  {<<"^3\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.4\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.4\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.4\\.4(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.4\\.5(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.5$">>,[restart_new_emulator]},
+  {<<"^3\\.5\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.5\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.6$">>,[restart_new_emulator]},
+  {<<"^3\\.6\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.7$">>,[restart_new_emulator]},
+  {<<"^3\\.7\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.7\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.8$">>,[restart_new_emulator]},
+  {<<"^3\\.8\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
diff --git a/bootstrap/lib/stdlib/ebin/string.beam b/bootstrap/lib/stdlib/ebin/string.beam
index 57142f539a..ee19fb41a4 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 939f385c93..1816fe6c41 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 6cfaa984df..761907b40c 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 599cc20df4..a3f46b5983 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 7baece7eb2..2953299e8b 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 bdd4374aef..d61ed589aa 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 fe2f9c24dc..c0523f2e52 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
index 36aec511d8..7255fdca63 100644
--- a/bootstrap/lib/stdlib/ebin/uri_string.beam
+++ 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 3194d09463..136b65f9fb 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 ef7ea86791..75c2289f47 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 2ec89e7d8a..28d25c6589 100644
--- a/bootstrap/lib/stdlib/include/assert.hrl
+++ b/bootstrap/lib/stdlib/include/assert.hrl
@@ -140,7 +140,7 @@
 -endif.
 
 %% This is mostly a convenience which gives more detailed reports.
-%% Note: Guard is a guarded pattern, and can not be used for value.
+%% Note: Guard is a guarded pattern, and cannot be used for value.
 -ifdef(NOASSERT).
 -define(assertMatch(Guard, Expr), ok).
 -define(assertMatch(Guard, Expr, Comment), ok).
@@ -289,7 +289,7 @@
         end).
 -endif.
 
-%% Note: Class and Term are patterns, and can not be used for value.
+%% Note: Class and Term are patterns, and cannot be used for value.
 %% Term can be a guarded pattern, but Class cannot.
 -ifdef(NOASSERT).
 -define(assertException(Class, Term, Expr), ok).
@@ -364,7 +364,7 @@
         ?assertException(throw, Term, Expr, Comment)).
 
 %% This is the inverse case of assertException, for convenience.
-%% Note: Class and Term are patterns, and can not be used for value.
+%% Note: Class and Term are patterns, and cannot be used for value.
 %% Both Class and Term can be guarded patterns.
 -ifdef(NOASSERT).
 -define(assertNotException(Class, Term, Expr), ok).
diff --git a/configure.src b/configure.src
new file mode 100644
index 0000000000..4b748f2545
--- /dev/null
+++ b/configure.src
@@ -0,0 +1,437 @@
+#!/bin/sh
+#
+# %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%
+#
+#
+# This is a handcrafted wrapper script which runs the actual (autoconf)
+# 'configure' scripts in different parts of OTP.
+#
+# The true (autoconf) configure scripts are run in parallel unless
+# --disable-parallel-configure is passed as argument to this script.
+#
+# The config cache feature is disabled since it mostly causes problems
+# and especially when executing multiple configure scripts in parallel.
+# On windows a static cache for each configure is used since it
+# otherwise takes forever to run configure...
+#
+
+OTP_VERSION=@OTP_VERSION@
+
+unset CDPATH
+
+default_cflags="-g -O2"
+
+mXY_build=
+static_cache=
+
+bootstrap_only=no
+parallel_otp_configure=yes
+help=no
+user_srcdir=
+config_arguments=
+skip_applications=
+while test $# != 0; do
+    case $1 in
+	-srcdir=* | --srcdir=*)
+	    user_srcdir=`expr "$1" : '[^=]*=\(.*\)'`
+	    if test "$ERL_TOP" != ""; then
+		echo "WARNING: Overriding ERL_TOP with $user_srcdir" 1>&2
+		echo "" 1>&2
+	    fi
+	    ERL_TOP="$user_srcdir"
+	    ;;
+	-srcdir | --srcdir)
+	    shift
+	    test $# != 0 || {
+		echo "ERROR: Missing source dir" 1>&2
+		exit 1
+	    }
+	    user_srcdir="$1"
+	    if test "$ERL_TOP" != ""; then
+		echo "WARNING: Overriding ERL_TOP with $user_srcdir" 1>&2
+		echo "" 1>&2
+	    fi
+	    ERL_TOP="$user_srcdir"
+	    ;;
+	--enable-bootstrap-only)
+            config_arguments="$config_arguments --enable-bootstrap-only"
+	    bootstrap_only=yes;;
+	--disable-bootstrap-only)
+            config_arguments="$config_arguments --disable-bootstrap-only"
+	    bootstrap_only=no;;
+	--enable-option-checking)
+	    echo "ERROR: Cannot enable option checking" 1>&2
+	    exit 1;;
+	--disable-option-checking)
+	    # Got it...
+	    ;;
+	--disable-parallel-configure)
+	    parallel_otp_configure=no
+	    ;;
+	--config-cache | -C)
+	    echo "WARNING: Ignoring config cache file since it will mess up the configuration" 1>&2
+	    echo "" 1>&2
+	    ;;
+	-cache-file=* | --cache-file=* )
+	    static_cache=`expr "$1" : '[^=]*=\(.*\)'`
+	    if test "$static_cache" != "/dev/null"; then
+		echo "WARNING: Only using config cache file '$static_cache' as static cache" 1>&2
+		echo "" 1>&2
+	    else
+		static_cache=
+	    fi
+	    ;;
+        -cache-file | --cache-file)
+	    shift
+	    test $# != 0 || {
+		echo "ERROR: Missing cache file" 1>&2
+		exit 1
+	    }
+	    static_cache=$1
+	    if test "$static_cache" != "/dev/null"; then
+		echo "WARNING: Only using config cache file '$static_cache' as static cache" 1>&2
+		echo "" 1>&2
+	    else
+		static_cache=
+	    fi
+	    ;;
+	--enable-m64-build)
+	    mXY_build="-m64"
+	    ;;
+	--enable-m32-build)
+	    mXY_build="-m32"
+	    ;;
+	--disable-m64-build)
+	    if test "$mXY_build" = "-m64"; then
+		mXY_build=
+	    fi;;
+	--disable-m32-build)
+	    if test "$mXY_build" = "-m32"; then
+		mXY_build=
+	    fi;;
+	CFLAGS=* | LDFLAGS=*)
+	    flgs_var=`expr "$1" : '\([^=]*\)=.*'`
+	    flgs_val=`expr "$1" : '[^=]*=\(.*\)'`
+	    eval $flgs_var=\$flgs_val
+	    ;;
+	--help=r* | -help=r*)
+	    help=all;;
+        --help* | -help* | -h)
+	    help=$1;;
+        *)
+	    case $1 in
+		--without-*)
+		    skip_app=`expr "$1" : '--without-\(.*\)'`
+		    if test -d "lib/$skip_app"; then
+			skip_applications="$skip_applications $skip_app"
+		    fi;;
+		*)
+		    ;;
+	    esac
+            case $1 in
+		*\'*)
+                    1=`echo "$1" | sed "s/'/'\\\\\\\\''/g"` ;;
+		*)
+                ;;
+            esac
+            config_arguments="$config_arguments '$1'";;
+    esac
+    shift
+done
+
+if test $parallel_otp_configure = yes; then
+    case `uname -s` in
+	MSYS* | msys* | CYGWIN* | cygwin )
+            ;;
+	*)
+	    trap 'kill -KILL -$$' 1 2 3 6 15
+	    ;;
+    esac
+fi
+
+#
+# Figure ERL_TOP out...
+#
+
+root_dir=
+dir_chk_data="$OTP_VERSION"
+
+if root_dir=`dirname "$0" 2>/dev/null` \
+	&& test "$root_dir" != "" \
+	&& cd "$root_dir" 2>/dev/null; then
+    root_dir=`pwd 2>/dev/null`
+    if test $? -ne 0; then
+	root_dir=
+    else
+	case "$root_dir" in
+	    /*)
+		echo $dir_chk_data > "$root_dir"/config.dir.check.$$ 2>/dev/null
+		;;
+	    *)
+		root_dir=
+	esac
+    fi
+else
+    root_dir=
+fi
+
+if test "$root_dir" = ""; then
+    case X"$ERL_TOP" in
+	X)
+	    echo "ERROR: Cannot figure out the root directory of" 1>&2
+	    echo "       the OTP source. Please set the ERL_TOP" 1>&2
+	    echo "       environment variable." 1>&2
+	    exit 1
+	    ;;
+	X/*)
+	    cd "$ERL_TOP" 2>/dev/null || {
+		echo "ERROR: Cannot change directory to ERL_TOP " 1>&2
+		echo "       '$ERL_TOP'" 1>&2
+		exit 1
+	    }
+	    ;;
+	X*)
+	    echo "ERROR: ERL_TOP '$ERL_TOP' is not an absolute path" 1>&2
+	    exit 1
+	    ;;
+    esac
+else
+    case X"$ERL_TOP" in
+	X)
+	    ERL_TOP="$root_dir"
+	    rm -f "$root_dir"/config.dir.check.$$
+	    ;;
+	X/*)
+	    cd "$ERL_TOP" 2>/dev/null || {
+		rm -f "$root_dir"/config.dir.check.$$
+		echo "ERROR: Cannot change directory into ERL_TOP " 1>&2
+		echo "       '$ERL_TOP'" 1>&2
+		exit 1
+	    }
+	    dir_chk=`cat ./config.dir.check.$$ 2>/dev/null` || dir_chk=error
+	    rm -f "$root_dir"/config.dir.check.$$
+	    test "$dir_chk" = "$dir_chk_data" || {
+		echo "ERROR: ERL_TOP '$ERL_TOP' is not the same" 1>&2
+		echo "       as 'configure' location '$root_dir'" 1>&2
+		exit 1
+	    }
+	    ;;
+	X*)
+	    rm -f "$root_dir"/config.dir.check.$$
+	    echo "ERROR: ERL_TOP '$ERL_TOP' is not an absolute path" 1>&2
+	    exit 1
+	    ;;
+    esac
+fi
+
+export ERL_TOP
+
+rm -f "$ERL_TOP/lib/SKIP-APPLICATIONS"
+
+case "$help" in
+    no)
+        ;;
+    all)
+	(cd "$ERL_TOP/make" && ./configure --help)
+	app_dirs=
+	for app_dir in erts lib/*; do
+	    if test -f "$app_dir/configure"; then
+		echo ""
+		echo "=== $app_dir ==="
+		(cd "$ERL_TOP/$app_dir" && ./configure --help=short)
+	    fi
+	done
+	exit 0;;
+    *)
+	(cd "$ERL_TOP/make" && ./configure "$help")
+	exit 0;;
+esac
+
+if test "$mXY_build" = ""; then
+    if test "$CFLAGS" != ""; then
+	config_arguments="$config_arguments CFLAGS='$CFLAGS'"
+	unset CFLAGS
+    fi
+
+    if test "$LDFLAGS" != ""; then
+	config_arguments="$config_arguments LDFLAGS='$LDFLAGS'"
+	unset LDFLAGS
+    fi
+else
+    if test "$CFLAGS" = ""; then
+	CFLAGS=$default_cflags
+    fi
+    config_arguments="$config_arguments CFLAGS='$mXY_build $CFLAGS'"
+    unset CFLAGS
+    config_arguments="$config_arguments LDFLAGS='$mXY_build $LDFLAGS'"
+    unset LDFLAGS
+    case $mXY_build in
+	-m32)
+            config_arguments="$config_arguments --enable-m32-build"
+	    ;;
+	-m64)
+            config_arguments="$config_arguments --enable-m64-build"
+	    ;;
+    esac
+fi
+
+config_arguments="$config_arguments --disable-option-checking"
+
+if test $bootstrap_only = no; then
+    check_conf_dirs=`echo lib/*`
+else
+    check_conf_dirs="@BOOTSTRAP_LIB_APP_DIRS@"
+fi
+
+# 'erts' *needs* to be last in app_dirs! Any apps
+# after it wont be able to run in parallel with
+# erts...
+
+app_dirs=
+for app_dir in make $check_conf_dirs erts; do
+    if test -f "$app_dir/configure"; then
+       if test "$static_cache" != ""; then
+          cp -f "$static_cache" "$ERL_TOP/$app_dir/local.static.config.cache"
+       fi
+       rm -f $app_dir/configure.result.failed
+       rm -f $app_dir/configure.result.command
+       rm -f $app_dir/configure.result.stdout
+       rm -f $app_dir/configure.result.stderr
+       app_dirs="$app_dirs $app_dir"
+    fi
+done
+
+if test "$static_cache" = ""; then
+   local_cache_file=/dev/null
+else
+   local_cache_file=./local.static.config.cache
+fi
+
+for app_dir in $app_dirs; do
+    cd "$ERL_TOP/$app_dir"
+    cmd_str="./configure $config_arguments --cache-file=$local_cache_file --srcdir=\"$ERL_TOP/$app_dir\""
+    if test $parallel_otp_configure = no; then
+	echo "=== Running configure in $ERL_TOP/$app_dir ==="
+	eval $cmd_str
+	echo ""
+    elif test $app_dir != erts; then
+	echo $cmd_str >./configure.result.command
+	eval $cmd_str 1>./configure.result.stdout 2>./configure.result.stderr || echo "fatal" > "./configure.result.failed" &
+    else
+	# ERTS configure gets to use stdout/stderr; the others are printed when done...
+	echo "=== Running configure in $ERL_TOP/erts ==="
+	echo $cmd_str
+	eval $cmd_str || {
+	    rm -f erts/configure.result.* lib/*/configure.result.*
+	    echo "ERROR: $ERL_TOP/$app_dir/configure failed!" 1>&2
+	    kill -KILL -$$
+	    exit 1
+	}
+    fi
+done
+
+cd "$ERL_TOP"
+
+if test $parallel_otp_configure = yes; then
+    # Wait for all sub-configures to finish...
+    wait
+
+    for app_dir in $app_dirs; do
+	if test -f "$app_dir/configure.result.command"; then
+	    echo ""
+	    echo "=== Running configure in $ERL_TOP/$app_dir ==="
+	    cat "$app_dir/configure.result.command"
+	    rm -f "$app_dir/configure.result.command"
+	fi
+	if test -f "$app_dir/configure.result.stdout"; then
+	    cat "$app_dir/configure.result.stdout"
+	    rm -f "$app_dir/configure.result.stdout"
+	fi
+	if test -f "$app_dir/configure.result.stderr"; then
+	    cat "$app_dir/configure.result.stderr" 1>&2
+	    rm -f "$app_dir/configure.result.stderr"
+	fi
+	if test -f "$app_dir/configure.result.failed"; then
+	    rm -f erts/configure.result.* lib/*/configure.result.*
+	    echo "ERROR: $ERL_TOP/$app_dir/configure failed!" 1>&2
+	    exit 1
+	fi
+    done
+fi
+
+
+echo ""
+
+pattern="lib/*/SKIP"
+files=`echo $pattern`
+if test "$files" != "$pattern" || test "$skip_applications" != ""; then
+  echo '*********************************************************************'
+  echo '**********************  APPLICATIONS DISABLED  **********************'
+  echo '*********************************************************************'
+  echo
+  if test "$files" != "$pattern"; then
+    for skipfile in $files; do
+      app=`dirname $skipfile`; app=`basename $app`
+      printf "%-15s: " $app; cat $skipfile
+    done
+  fi
+  for skipapp in $skip_applications; do
+    printf "%-15s: User gave --without-%s option\n" $skipapp $skipapp
+    echo "$skipapp" >> "$ERL_TOP/lib/SKIP-APPLICATIONS"
+  done
+  echo
+  echo '*********************************************************************'
+fi
+pattern="lib/*/CONF_INFO"
+files=`echo $pattern`
+if test "$files" != "$pattern" || test -f erts/CONF_INFO; then
+  echo '*********************************************************************'
+  echo '**********************  APPLICATIONS INFORMATION  *******************'
+  echo '*********************************************************************'
+  echo
+  test "$files" != "$pattern" || files=""
+  test ! -f erts/CONF_INFO || files="$files erts/CONF_INFO"
+  for infofile in $files; do
+    app=`dirname $infofile`; app=`basename $app`
+    printf "%-15s: " $app; cat $infofile
+  done
+  echo
+  echo '*********************************************************************'
+fi
+if test -f "erts/doc/CONF_INFO"; then
+  echo '*********************************************************************'
+  echo '**********************  DOCUMENTATION INFORMATION  ******************'
+  echo '*********************************************************************'
+  echo
+  printf "%-15s: \n" documentation;
+  havexsltproc="yes"
+  for cmd in `cat erts/doc/CONF_INFO`; do
+	echo "                 $cmd is missing."
+  if test $cmd = "xsltproc"; then
+    havexsltproc="no"
+  fi
+  done
+  if test $havexsltproc = "no"; then
+    echo '                 The documentation cannot be built.'
+  else
+    echo '                 Using fakefop to generate placeholder PDF files.'
+  fi
+  echo
+  echo '*********************************************************************'
+fi
diff --git a/erts/Makefile b/erts/Makefile
index 60c70b6a2c..e62c896170 100644
--- a/erts/Makefile
+++ b/erts/Makefile
@@ -129,9 +129,13 @@ makefiles:
 
 .PHONY: release
 release:
+ifeq ($(TYPE),)
 	for t in $(TYPES); do \
 	  ( cd emulator && $(MAKE) release TYPE=$$t ) || exit $$?; \
 	done
+else
+	( cd emulator && $(MAKE) release TYPE=$(TYPE) ) || exit $$?;
+endif
 	$(V_at)for d in $(ERTSDIRS) $(XINSTDIRS); do \
 		if test -d $$d; then \
 			( cd $$d && $(MAKE) $@ ) || exit $$? ; \
diff --git a/erts/aclocal.m4 b/erts/aclocal.m4
index 3d227e462c..0ca2755802 100644
--- a/erts/aclocal.m4
+++ b/erts/aclocal.m4
@@ -122,6 +122,9 @@ dnl
 
 AC_DEFUN(LM_WINDOWS_ENVIRONMENT,
 [
+
+if test "X$windows_environment_" != "Xchecked"; then
+windows_environment_=checked
 MIXED_CYGWIN=no
 MIXED_MSYS=no
 
@@ -197,6 +200,8 @@ else
 fi
 
 AC_SUBST(MIXED_MSYS)
+
+fi
 ])		
 	
 dnl ----------------------------------------------------------------------
@@ -2856,3 +2861,248 @@ AC_DEFUN([LM_HARDWARE_ARCH], [
 
     AC_SUBST(ARCH)
 ])
+
+dnl
+dnl--------------------------------------------------------------------
+dnl Dynamic Erlang Drivers
+dnl
+dnl Linking to produce dynamic Erlang drivers to be loaded by Erlang's
+dnl Dynamic Driver Loader and Linker (DDLL). Below the prefix DED is an
+dnl abbreviation for `Dynamic Erlang Driver'.
+dnl
+dnl For DED we need something quite sloppy, which allows undefined references 
+dnl (notably driver functions) in the resulting shared library. 
+dnl Example of Makefile rule (and settings of macros):
+dnl
+dnl LIBS = @LIBS@
+dnl LD = @DED_LD@
+dnl LDFLAGS = @DED_LDFLAGS@
+dnl soname = @ldsoname@
+dnl
+dnl my_drv.so:   my_drv.o my_utils.o
+dnl              $(LD) $(LDFLAGS) $(soname) $@ -o $@ $^ -lc $(LIBS)
+dnl
+dnl--------------------------------------------------------------------
+dnl
+
+AC_DEFUN(ERL_DED,
+	[
+
+USER_LD=$LD
+USER_LDFLAGS="$LDFLAGS"
+
+LM_CHECK_THR_LIB
+
+DED_CC=$CC
+DED_GCC=$GCC
+
+DED_CFLAGS=
+DED_OSTYPE=unix
+case $host_os in
+     linux*)
+	DED_CFLAGS="-D_GNU_SOURCE" ;;
+     win32)
+	DED_CFLAGS="-D_WIN32_WINNT=0x0600 -DWINVER=0x0600"
+        DED_OSTYPE=win32 ;;
+     *)
+        ;;
+esac
+
+
+DED_WARN_FLAGS="-Wall -Wstrict-prototypes"
+case "$host_cpu" in
+  tile*)
+    # tile-gcc is a bit stricter with -Wmissing-prototypes than other gccs,
+    # and too strict for our taste.
+    ;;
+  *)
+    DED_WARN_FLAGS="$DED_WARN_FLAGS -Wmissing-prototypes";;
+esac
+  
+LM_TRY_ENABLE_CFLAG([-Wdeclaration-after-statement], [DED_WARN_FLAGS])
+
+LM_TRY_ENABLE_CFLAG([-Werror=return-type], [DED_WERRORFLAGS])
+LM_TRY_ENABLE_CFLAG([-Werror=implicit], [DED_WERRORFLAGS])
+LM_TRY_ENABLE_CFLAG([-Werror=undef], [DED_WERRORFLAGS])
+
+DED_SYS_INCLUDE="-I${ERL_TOP}/erts/emulator/beam -I${ERL_TOP}/erts/include -I${ERL_TOP}/erts/include/$host -I${ERL_TOP}/erts/include/internal -I${ERL_TOP}/erts/include/internal/$host -I${ERL_TOP}/erts/emulator/sys/$DED_OSTYPE -I${ERL_TOP}/erts/emulator/sys/common"
+DED_INCLUDE=$DED_SYS_INCLUDE
+
+if test "$THR_DEFS" = ""; then
+    DED_THR_DEFS="-D_THREAD_SAFE -D_REENTRANT"
+else
+    DED_THR_DEFS="$THR_DEFS"
+fi
+# DED_EMU_THR_DEFS=$EMU_THR_DEFS
+DED_CFLAGS="$CFLAGS $CPPFLAGS $DED_CFLAGS"
+if test "x$GCC" = xyes; then
+    DED_STATIC_CFLAGS="$DED_CFLAGS"
+    DED_CFLAGS="$DED_CFLAGS -fPIC"
+fi
+
+DED_EXT=so
+case $host_os in
+    win32) DED_EXT=dll;;
+    darwin*)
+	DED_CFLAGS="$DED_CFLAGS -fno-common"
+	DED_STATIC_CFLAGS="$DED_STATIC_CFLAGS -fno-common";;
+    *)
+	;;
+esac
+
+DED_STATIC_CFLAGS="$DED_STATIC_CFLAGS -DSTATIC_ERLANG_NIF -DSTATIC_ERLANG_DRIVER"
+
+if test "$CFLAG_RUNTIME_LIBRARY_PATH" = ""; then
+
+  CFLAG_RUNTIME_LIBRARY_PATH="-Wl,-R"
+  case $host_os in
+    darwin*)
+	CFLAG_RUNTIME_LIBRARY_PATH=
+	;;
+    win32)
+	CFLAG_RUNTIME_LIBRARY_PATH=
+	;;
+    osf*)
+	CFLAG_RUNTIME_LIBRARY_PATH="-Wl,-rpath,"
+	;;
+    *)
+	;;
+  esac
+
+fi
+
+# If DED_LD is set in environment, we expect all DED_LD* variables
+# to be specified (cross compiling)
+if test "x$DED_LD" = "x"; then
+
+DED_LD_FLAG_RUNTIME_LIBRARY_PATH="-R"
+case $host_os in
+	win32)
+		DED_LD="ld.sh"
+		DED_LDFLAGS="-dll"
+		DED_LD_FLAG_RUNTIME_LIBRARY_PATH=
+	;;
+	solaris2*|sysv4*)
+		DED_LDFLAGS="-G"
+		if test X${enable_m64_build} = Xyes; then
+			DED_LDFLAGS="-64 $DED_LDFLAGS"
+		fi
+	;;
+	aix4*)
+		DED_LDFLAGS="-G -bnoentry -bexpall"
+	;;
+	freebsd2*)
+		# Non-ELF GNU linker
+		DED_LDFLAGS="-Bshareable"
+	;;
+	darwin*)
+		# Mach-O linker: a shared lib and a loadable
+		# object file is not the same thing.
+		DED_LDFLAGS="-bundle -bundle_loader ${ERL_TOP}/bin/$host/beam.smp"
+		if test X${enable_m64_build} = Xyes; then
+		  DED_LDFLAGS="-m64 $DED_LDFLAGS"
+		else
+		  if test X${enable_m32_build} = Xyes; then
+		    DED_LDFLAGS="-m32 $DED_LDFLAGS"
+		  else
+		    AC_CHECK_SIZEOF(void *)
+		    case "$ac_cv_sizeof_void_p" in
+		      8)
+			DED_LDFLAGS="-m64 $DED_LDFLAGS";;
+		      *)
+		        ;;
+		    esac
+		  fi
+		fi
+		DED_LD="$CC"
+		DED_LD_FLAG_RUNTIME_LIBRARY_PATH="$CFLAG_RUNTIME_LIBRARY_PATH"
+	;;
+	linux*)
+		DED_LD="$CC"
+		DED_LD_FLAG_RUNTIME_LIBRARY_PATH="$CFLAG_RUNTIME_LIBRARY_PATH"
+		DED_LDFLAGS="-shared -Wl,-Bsymbolic"
+		if test X${enable_m64_build} = Xyes; then
+			DED_LDFLAGS="-m64 $DED_LDFLAGS"
+		fi;
+		if test X${enable_m32_build} = Xyes; then
+			DED_LDFLAGS="-m32 $DED_LDFLAGS"
+		fi
+	;;	
+	freebsd*)
+		DED_LD="$CC"
+		DED_LD_FLAG_RUNTIME_LIBRARY_PATH="$CFLAG_RUNTIME_LIBRARY_PATH"
+		DED_LDFLAGS="-shared"
+		if test X${enable_m64_build} = Xyes; then
+			DED_LDFLAGS="-m64 $DED_LDFLAGS"
+		fi;
+		if test X${enable_m32_build} = Xyes; then
+			DED_LDFLAGS="-m32 $DED_LDFLAGS"
+		fi
+	;;	
+	openbsd*)
+		DED_LD="$CC"
+		DED_LD_FLAG_RUNTIME_LIBRARY_PATH="$CFLAG_RUNTIME_LIBRARY_PATH"
+		DED_LDFLAGS="-shared"
+	;;
+	osf*)
+		# NOTE! Whitespace after -rpath is important.
+		DED_LD_FLAG_RUNTIME_LIBRARY_PATH="-rpath "
+		DED_LDFLAGS="-shared -expect_unresolved '*'"
+	;;
+	*)
+		# assume GNU linker and ELF
+		DED_LDFLAGS="-shared"
+		# GNU linker has no option for 64bit build, should not propagate -m64
+	;;
+esac
+
+if test "$DED_LD" = "" && test "$USER_LD" != ""; then
+    DED_LD="$USER_LD"
+    DED_LDFLAGS="$USER_LDFLAGS $DED_LDFLAGS"
+fi
+
+DED_LIBS=$LIBS
+
+fi # "x$DED_LD" = "x"
+
+AC_CHECK_TOOL(DED_LD, ld, false)
+test "$DED_LD" != "false" || AC_MSG_ERROR([No linker found])
+
+AC_MSG_CHECKING(for static compiler flags)
+DED_STATIC_CFLAGS="$DED_WERRORFLAGS $DED_WFLAGS $DED_THR_DEFS $DED_STATIC_CFLAGS"
+AC_MSG_RESULT([$DED_STATIC_CFLAGS])
+AC_MSG_CHECKING(for basic compiler flags for loadable drivers)
+DED_BASIC_CFLAGS=$DED_CFLAGS
+AC_MSG_RESULT([$DED_CFLAGS])
+AC_MSG_CHECKING(for compiler flags for loadable drivers)
+DED_CFLAGS="$DED_WERRORFLAGS $DED_WARN_FLAGS $DED_THR_DEFS $DED_CFLAGS"
+AC_MSG_RESULT([$DED_CFLAGS])
+AC_MSG_CHECKING(for linker for loadable drivers)
+AC_MSG_RESULT([$DED_LD])
+AC_MSG_CHECKING(for linker flags for loadable drivers)
+AC_MSG_RESULT([$DED_LDFLAGS])
+AC_MSG_CHECKING(for 'runtime library path' linker flag)
+if test "x$DED_LD_FLAG_RUNTIME_LIBRARY_PATH" != "x"; then
+	AC_MSG_RESULT([$DED_LD_FLAG_RUNTIME_LIBRARY_PATH])
+else
+	AC_MSG_RESULT([not found])
+fi
+
+AC_SUBST(DED_CC)
+AC_SUBST(DED_GCC)
+AC_SUBST(DED_EXT)
+AC_SUBST(DED_SYS_INCLUDE)
+AC_SUBST(DED_INCLUDE)
+AC_SUBST(DED_BASIC_CFLAGS)
+AC_SUBST(DED_CFLAGS)
+AC_SUBST(DED_STATIC_CFLAGS)
+AC_SUBST(DED_WARN_FLAGS)
+AC_SUBST(DED_WERRORFLAGS)
+AC_SUBST(DED_LD)
+AC_SUBST(DED_LDFLAGS)
+AC_SUBST(DED_LD_FLAG_RUNTIME_LIBRARY_PATH)
+AC_SUBST(DED_LIBS)
+AC_SUBST(DED_THR_DEFS)
+AC_SUBST(DED_OSTYPE)
+
+])
diff --git a/erts/autoconf/configure.vxworks b/erts/autoconf/configure.vxworks
index a253848403..c3bdfd0095 100755
--- a/erts/autoconf/configure.vxworks
+++ b/erts/autoconf/configure.vxworks
@@ -93,6 +93,7 @@ erts_lib_src=${ERL_TOP}/erts/lib_src
 erts_incl=${ERL_TOP}/erts/include
 erts_incl_intrnl=${ERL_TOP}/erts/include/internal
 etcdir=${ERL_TOP}/erts/etc/common
+erlint_incl_dir=${ERL_TOP}/lib/erl_interface/include
 erlint_dir=${ERL_TOP}/lib/erl_interface/src
 epmd_dir=${ERL_TOP}/erts/epmd/src
 os_mon_dir=${ERL_TOP}/lib/os_mon/c_src
@@ -109,6 +110,7 @@ CONFIG_FILES="${ERL_TOP}/erts/emulator/$host/Makefile
 	    $erts_incl_intrnl/$host/ethread.mk
 	    $erts_incl_intrnl/$host/ethread_header_config.h
 	    $etcdir/$host/Makefile
+	    $erlint_incl_dir/$host/ei_config.h
 	    $erlint_dir/$host/Makefile
 	    $erlint_dir/$host/eidefs.mk
 	    $epmd_dir/$host/Makefile
@@ -133,6 +135,7 @@ for file in $CONFIG_FILES; do
 	-e "s,@HOST_TYPE@,$HOST_TYPE,g" \
 	-e "s,@WIND_BASE@,$WIND_BASE,g" \
 	-e "s,@TARGET@,$target,g" \
+        -e "s,@ENV_CFLAGS@,$CFLAGS,g" \
 	$in_file > $new_name
 done
 
diff --git a/erts/autoconf/vxworks/sed.general b/erts/autoconf/vxworks/sed.general
index 0e99b4dba4..ffd5a8133c 100644
--- a/erts/autoconf/vxworks/sed.general
+++ b/erts/autoconf/vxworks/sed.general
@@ -103,7 +103,6 @@ s|@INSTALL_PROGRAM@|${INSTALL}|
 s|@INSTALL_SCRIPT@|${INSTALL}|
 s|@INSTALL_DATA@|${INSTALL} -m 644|
 s|@INSTALL_DIR@|$(INSTALL) -d|
-s|@RM@|/bin/rm|
 s|@MKDIR@|/bin/mkdir|
 s|@ERLANG_OSTYPE@|vxworks|
 s|@vxworks_reclaim@|reclaim.h|
@@ -112,7 +111,7 @@ s|@erlexec@|erl.exec|
 s|@EMU_LIBOBJS@||
 
 # General CFLAGS
-s|@GENERAL_CFLAGS@|-DHAVE_LOCALTIME_R -DHAVE_GMTIME_R -DENABLE_ELIB_MALLOC -DELIB_HEAP_USER -DELIB_SORTED_BLOCKS -DWORDS_BIGENDIAN -DELIB_DONT_INITIALIZE -DSIZEOF_CHAR=1 -DSIZEOF_SHORT=2 -DSIZEOF_INT=4 -DSIZEOF_LONG=4 -DSIZEOF_LONG_LONG=8 -DSIZEOF_VOID_P=4 -DERTS_USE_PORT_TASKS=1|g
+s|@GENERAL_CFLAGS@|@ENV_CFLAGS@ -DHAVE_LOCALTIME_R -DHAVE_GMTIME_R -DENABLE_ELIB_MALLOC -DELIB_HEAP_USER -DELIB_SORTED_BLOCKS -DWORDS_BIGENDIAN -DELIB_DONT_INITIALIZE -DSIZEOF_CHAR=1 -DSIZEOF_SHORT=2 -DSIZEOF_INT=4 -DSIZEOF_LONG=4 -DSIZEOF_LONG_LONG=8 -DSIZEOF_VOID_P=4 -DERTS_USE_PORT_TASKS=1|g
 s|@WFLAGS@||
 
 # Thread flags for eidefs.mk (erl_interface)
diff --git a/erts/configure.in b/erts/configure.in
index 9245e4dc90..3a043c940d 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. -*-m4-*-
 
 dnl %CopyrightBegin%
 dnl
-dnl Copyright Ericsson AB 1997-2018. All Rights Reserved.
+dnl Copyright Ericsson AB 1997-2019. All Rights Reserved.
 dnl
 dnl Licensed under the Apache License, Version 2.0 (the "License");
 dnl you may not use this file except in compliance with the License.
@@ -26,11 +26,6 @@ AC_PREREQ(2.59)
 
 LM_PRECIOUS_VARS
 
-if test "x$no_recursion" != "xyes" -a "x$OVERRIDE_CONFIG_CACHE" = "x"; then
-    # We do not want to use a common cache!
-    cache_file=/dev/null
-fi
-
 dnl How to set srcdir absolute is taken from the GNU Emacs distribution
 #### Make srcdir absolute, if it isn't already.  It's important to
 #### avoid running the path through pwd unnecessary, since pwd can
@@ -470,7 +465,10 @@ dnl
 dnl Make sure we find config.h
 dnl
 
-extra_flags="-I${ERL_TOP}/erts/$host $OTP_EXTRA_FLAGS"
+ERTS_CONFIG_H_IDIR="-I${ERL_TOP}/erts/$host"
+AC_SUBST(ERTS_CONFIG_H_IDIR)
+
+extra_flags="$ERTS_CONFIG_H_IDIR $OTP_EXTRA_FLAGS"
 CFLAGS="$CFLAGS $extra_flags"
 DEBUG_CFLAGS="-g $CPPFLAGS $extra_flags $DEBUG_CFLAGS"
 DEBUG_FLAGS=-g
@@ -502,23 +500,6 @@ case $CFLAGS in
 		;;
 esac
 
-
-
-CFLAG_RUNTIME_LIBRARY_PATH="-Wl,-R"
-case $host_os in
-  darwin*)
-	CFLAG_RUNTIME_LIBRARY_PATH=
-	;;
-  win32)
-	CFLAG_RUNTIME_LIBRARY_PATH=
-	;;
-  osf*)
-	CFLAG_RUNTIME_LIBRARY_PATH="-Wl,-rpath,"
-	;;
-  *)
-	;;
-esac
-
 lfs_conf=ok
 lfs_source=none
 if test "${LFS_CFLAGS+set}" = "set" || \
@@ -605,11 +586,26 @@ AC_SUBST(DEBUG_FLAGS)
 AC_SUBST(DEBUG_CFLAGS)
 AC_SUBST(WFLAGS)
 AC_SUBST(WERRORFLAGS)
-AC_SUBST(CFLAG_RUNTIME_LIBRARY_PATH)
 
 ## Check if we can do profile guided optimization of beam_emu
 LM_CHECK_ENABLE_CFLAG([-fprofile-generate -Werror],[PROFILE_GENERATE])
 LM_CHECK_ENABLE_CFLAG([-fprofile-use -Werror],[PROFILE_USE])
+LM_CHECK_ENABLE_CFLAG([-fprofile-use -fprofile-correction -Werror],[PROFILE_CORRECTION])
+
+if test "X$PROFILE_CORRECTION" = "Xtrue"; then
+   saved_CFLAGS=$CFLAGS
+   saved_LDFLAGS=$LDFLAGS
+   CFLAGS="-fprofile-generate $saved_CFLAGS"
+   LDFLAGS="-fprofile-generate $saved_LDFLAGS"
+   AC_MSG_CHECKING([whether $CC links with -fprofile-generate])
+   AC_LINK_IFELSE([AC_LANG_PROGRAM([],[return 0;])],
+        [AC_MSG_RESULT([yes])
+         PROFILE_GENERATE=true],
+        [AC_MSG_RESULT([no])
+         PROFILE_GENERATE=false])
+   CFLAGS=$saved_CFLAGS
+   LDFLAGS=$saved_LDFLAGS
+fi
 
 ## Check if this is clang
 LM_CHECK_ENABLE_CFLAG([-fprofile-instr-generate -Werror],[PROFILE_INSTR_GENERATE])
@@ -634,8 +630,8 @@ if test "X$PROFILE_INSTR_GENERATE" = "Xtrue"; then
       if test "X$LLVM_PROFDATA" != "X"; then
         CFLAGS="-fprofile-instr-use=default.profdata -Werror $saved_CFLAGS";
         $LLVM_PROFDATA merge -output=default.profdata *.profraw;
-        AC_MSG_CHECKING([whether gcc accepts -fprofile-instr-use=default.profdata -Werror])
-        AC_COMPILE_IFELSE([],
+        AC_MSG_CHECKING([whether $CC accepts -fprofile-instr-use=default.profdata -Werror])
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[return 0;])],
           [AC_MSG_RESULT([yes])
            PROFILE_INSTR_USE=true],
           [AC_MSG_RESULT([no])
@@ -657,8 +653,6 @@ AS_HELP_STRING([--enable-pgo],
   esac
 ],enable_pgo=default)
 
-LM_CHECK_ENABLE_CFLAG([-fprofile-use -fprofile-correction -Werror],[PROFILE_CORRECTION])
-
 USE_PGO=false
 AC_MSG_CHECKING([whether to do PGO of erts])
 if test $enable_pgo = no; then
@@ -682,7 +676,7 @@ elif test "X$PROFILE_INSTR_GENERATE" = "Xtrue" -a "X$PROFILE_INSTR_USE" = "Xtrue
   PROFILE_COMPILER=clang
   AC_MSG_RESULT([yes, using -fprofile-instr-generate])
 else
-  if $enable_pgo = yes; then
+  if test $enable_pgo = yes; then
     AC_MSG_ERROR(cannot use PGO with this compiler)
   else
     AC_MSG_RESULT([no])
@@ -792,11 +786,6 @@ AC_SUBST(LIBCARBON)
 
 _search_path=/bin:/usr/bin:/usr/local/bin:$PATH
 
-AC_PATH_PROG(RM, rm, false, $_search_path)
-if test "$ac_cv_path_RM" = false; then
-  AC_MSG_ERROR([No 'rm' command found])
-fi
-
 AC_PATH_PROG(MKDIR, mkdir, false, $_search_path)
 if test "$ac_cv_path_MKDIR" = false; then
   AC_MSG_ERROR([No 'mkdir' command found])
@@ -811,9 +800,9 @@ _search_path=
 
 
 # Remove old configuration information.
-# Next line should be placed after AC_PATH_PROG(RM, ...), but before
-# first output to CONN_INFO. So this is just the right place.
-$RM -f "$ERL_TOP/erts/CONF_INFO"
+# Next line should be before first output to CONN_INFO. So this is
+# just the right place.
+rm -f "$ERL_TOP/erts/CONF_INFO"
 
 dnl Check if we should/can build a sharing-preserving emulator
 AC_MSG_CHECKING(if we are building a sharing-preserving emulator)
@@ -851,7 +840,7 @@ fi
 
 ## Delete previous failed configure results
 if test -f doc/CONF_INFO; then
-   $RM doc/CONF_INFO
+   rm -f doc/CONF_INFO
 fi
 
 AC_CHECK_PROGS(XSLTPROC, xsltproc)
@@ -949,9 +938,6 @@ esac
 
 AC_SUBST(LD)
 
-LDFLAG_RUNTIME_LIBRARY_PATH="$CFLAG_RUNTIME_LIBRARY_PATH"
-AC_SUBST(LDFLAG_RUNTIME_LIBRARY_PATH)
-
 dnl Check for cygwin and object/exe files extension
 dnl AC_CYGWIN is deprecated
 AC_EXEEXT
@@ -1357,6 +1343,35 @@ LIBS=$zlib_save_LIBS
 fi
 AC_SUBST(Z_LIB)
 
+
+dnl -------------
+dnl esock
+dnl -------------
+
+AC_ARG_ENABLE(esock,
+AS_HELP_STRING([--enable-esock], [enable builtin experimental socket (as a nif) support (default)])
+AS_HELP_STRING([--disable-esock], [disable builtin experimental socket (as a nif) support]))
+
+dnl Default value
+USE_ESOCK=yes
+
+if test "x$enable_esock" = "xyes"; then
+    USE_ESOCK=yes
+else
+    if test "x$enable_esock" = "xno"; then
+        USE_ESOCK=no
+    fi
+fi
+
+if test "x$USE_ESOCK" = "xyes"; then
+    if test "x$USE_ESOCK" = "xyes"; then
+        AC_CHECK_FUNCS([localtime_r strftime])
+    fi
+fi
+
+AC_SUBST(USE_ESOCK)
+
+
 dnl
 dnl This test kindly borrowed from Tcl
 dnl
@@ -1523,7 +1538,7 @@ dnl Some Linuxes needs <sys/socketio.h> instead of <sys/sockio.h>
 dnl
 AC_CHECK_HEADERS(fcntl.h limits.h unistd.h syslog.h dlfcn.h ieeefp.h \
                  sys/types.h sys/stropts.h sys/sysctl.h \
-                 sys/ioctl.h sys/time.h sys/uio.h \
+                 sys/ioctl.h sys/time.h sys/uio.h sys/mman.h \
                  sys/socket.h sys/sockio.h sys/socketio.h \
                  net/errno.h malloc.h arpa/nameser.h libdlpi.h \
 		 pty.h util.h libutil.h utmp.h langinfo.h poll.h sdkddkver.h)
@@ -1678,7 +1693,9 @@ if test x"$ac_cv_header_netinet_sctp_h" = x"yes"; then
                       struct sctp_paddrparams.spp_sackdelay,
                       struct sctp_paddrparams.spp_flags,
                       struct sctp_remote_error.sre_data,
-                      struct sctp_send_failed.ssf_data], [], [],
+                      struct sctp_send_failed.ssf_data,
+                      struct sctp_event_subscribe.sctp_authentication_event,
+                      struct sctp_event_subscribe.sctp_sender_dry_event], [], [],
         [#if HAVE_SYS_SOCKET_H
          #include <sys/socket.h>
          #endif
@@ -2074,29 +2091,6 @@ esac
 
 AC_CHECK_DECLS([posix2time, time2posix],,,[#include <time.h>])
 
-disable_vfork=false
-if test "x$EMU_THR_LIB_NAME" != "x"; then
-	AC_MSG_CHECKING([if vfork is known to hang multithreaded applications])
-	case $host_os in
-		osf*)
-			AC_MSG_RESULT(yes)
-			disable_vfork=true;;
-		*)
-			AC_MSG_RESULT(no);;
-	esac
-fi
-
-if test $disable_vfork = false; then
-	AC_FUNC_VFORK
-	if test $ac_cv_func_vfork_works = no; then
-		disable_vfork=true
-	fi
-fi
-
-if test $disable_vfork = true; then
-	AC_DEFINE(DISABLE_VFORK, 1, [Define if you want to disable vfork.])
-fi
-
 AC_FUNC_VPRINTF
 
 dnl The AC_DEFINEs are necessary for autoheader to work. :-(
@@ -2832,6 +2826,32 @@ AC_SUBST(HIPE_ENABLED)
 NATIVE_LIBS_ENABLED=
 if test X${enable_native_libs} = Xyes -a X${HIPE_ENABLED} = Xyes; then
   NATIVE_LIBS_ENABLED=yes
+  cat >> $ERL_TOP/erts/CONF_INFO <<EOF
+
+                 WARNING: In OTP 22, HiPE (the native code compiler) is
+		 not fully functional. The reasons for this are:
+
+		 1. There are new BEAM instructions for binary
+		 matching that the HiPE native code compiler does not
+		 support. 
+
+		 2. The new optimizations in the Erlang compiler create
+		 new combination of instructions that HiPE currently
+		 does not handle correctly.
+
+		 If erlc is invoked like so:
+
+		     erlc +native some_file.erl
+
+                 or like so:
+
+                     erlc +native some_file.beam
+
+		 and if any of the new binary matching instructions
+		 are used, the compiler will issue a warning and
+		 produce a BEAM file without native code.
+
+EOF
 fi
 AC_SUBST(NATIVE_LIBS_ENABLED)
 
@@ -3033,165 +3053,6 @@ dnl ----------------------------------------------------------------------
 dnl Stuff that should be moved into their respective application
 dnl ----------------------------------------------------------------------
 
-dnl crypto
-#--------------------------------------------------------------------
-# Dynamic Erlang Drivers
-#
-# Linking to produce dynamic Erlang drivers to be loaded by Erlang's
-# Dynamic Driver Loader and Linker (DDLL). Below the prefix DED is an
-# abbreviation for `Dynamic Erlang Driver'.
-#
-# For DED we need something quite sloppy, which allows undefined references 
-# (notably driver functions) in the resulting shared library. 
-# Example of Makefile rule (and settings of macros):
-#
-# LIBS = @LIBS@
-# LD = @DED_LD@
-# LDFLAGS = @DED_LDFLAGS@
-# soname = @ldsoname@
-#
-# my_drv.so:   my_drv.o my_utils.o
-#              $(LD) $(LDFLAGS) $(soname) $@ -o $@ $^ -lc $(LIBS)
-#
-#--------------------------------------------------------------------
-
-DED_SYS_INCLUDE="-I${ERL_TOP}/erts/emulator/beam -I${ERL_TOP}/erts/include -I${ERL_TOP}/erts/include/$host -I${ERL_TOP}/erts/include/internal -I${ERL_TOP}/erts/include/internal/$host -I${ERL_TOP}/erts/emulator/sys/$ERLANG_OSTYPE -I${ERL_TOP}/erts/emulator/sys/common"
-
-if test "X$ETHR_DEFS" = "X"; then
-    DED_THR_DEFS="-D_THREAD_SAFE -D_REENTRANT"
-else
-    DED_THR_DEFS="$ETHR_DEFS"
-fi
-DED_EMU_THR_DEFS=$EMU_THR_DEFS
-DED_CFLAGS="$CFLAGS $CPPFLAGS"
-if test "x$GCC" = xyes; then
-    DED_STATIC_CFLAGS="$DED_CFLAGS"
-    DED_CFLAGS="$DED_CFLAGS -fPIC"
-fi
-
-DED_EXT=so
-case $host_os in
-    win32) DED_EXT=dll;;
-    darwin*)
-	DED_CFLAGS="$DED_CFLAGS -fno-common"
-	DED_STATIC_CFLAGS="$DED_STATIC_CFLAGS -fno-common";;
-    *)
-	;;
-esac
-
-DED_STATIC_CFLAGS="$DED_STATIC_CFLAGS -DSTATIC_ERLANG_NIF -DSTATIC_ERLANG_DRIVER"
-
-# If DED_LD is set in environment, we expect all DED_LD* variables
-# to be specified (cross compiling)
-if test "x$DED_LD" = "x"; then
-
-DED_LD_FLAG_RUNTIME_LIBRARY_PATH="-R"
-case $host_os in
-	win32)
-		DED_LD="ld.sh"
-		DED_LDFLAGS="-dll"
-		DED_LD_FLAG_RUNTIME_LIBRARY_PATH=
-	;;
-	solaris2*|sysv4*)
-		DED_LDFLAGS="-G"
-		if test X${enable_m64_build} = Xyes; then
-			DED_LDFLAGS="-64 $DED_LDFLAGS"
-		fi
-	;;
-	aix4*)
-		DED_LDFLAGS="-G -bnoentry -bexpall"
-	;;
-	freebsd2*)
-		# Non-ELF GNU linker
-		DED_LDFLAGS="-Bshareable"
-	;;
-	darwin*)
-		# Mach-O linker: a shared lib and a loadable
-		# object file is not the same thing.
-		DED_LDFLAGS="-bundle -bundle_loader ${ERL_TOP}/bin/$host/beam.smp"
-		case $ARCH in
-			amd64)
-				DED_LDFLAGS="-m64 $DED_LDFLAGS"
-				;;
-			*)
-				;;
-		esac
-		DED_LD="$CC"
-		DED_LD_FLAG_RUNTIME_LIBRARY_PATH="$CFLAG_RUNTIME_LIBRARY_PATH"
-	;;
-	linux*)
-		DED_LD="$CC"
-		DED_LD_FLAG_RUNTIME_LIBRARY_PATH="$CFLAG_RUNTIME_LIBRARY_PATH"
-		DED_LDFLAGS="-shared -Wl,-Bsymbolic"
-		if test X${enable_m64_build} = Xyes; then
-			DED_LDFLAGS="-m64 $DED_LDFLAGS"
-		fi;
-		if test X${enable_m32_build} = Xyes; then
-			DED_LDFLAGS="-m32 $DED_LDFLAGS"
-		fi
-	;;	
-	freebsd*)
-		DED_LD="$CC"
-		DED_LD_FLAG_RUNTIME_LIBRARY_PATH="$CFLAG_RUNTIME_LIBRARY_PATH"
-		DED_LDFLAGS="-shared"
-		if test X${enable_m64_build} = Xyes; then
-			DED_LDFLAGS="-m64 $DED_LDFLAGS"
-		fi;
-		if test X${enable_m32_build} = Xyes; then
-			DED_LDFLAGS="-m32 $DED_LDFLAGS"
-		fi
-	;;	
-	openbsd*)
-		DED_LD="$CC"
-		DED_LD_FLAG_RUNTIME_LIBRARY_PATH="$CFLAG_RUNTIME_LIBRARY_PATH"
-		DED_LDFLAGS="-shared"
-	;;
-	osf*)
-		# NOTE! Whitespace after -rpath is important.
-		DED_LD_FLAG_RUNTIME_LIBRARY_PATH="-rpath "
-		DED_LDFLAGS="-shared -expect_unresolved '*'"
-	;;
-	*)
-		# assume GNU linker and ELF
-		DED_LDFLAGS="-shared"
-		# GNU linker has no option for 64bit build, should not propagate -m64
-	;;
-esac
-
-if test "$DED_LD" = "" && test "$USER_LD" != ""; then
-    DED_LD="$USER_LD"
-    DED_LDFLAGS="$USER_LDFLAGS $DED_LDFLAGS"
-fi
-
-fi # "x$DED_LD" = "x"
-
-AC_CHECK_TOOL(DED_LD, ld, false)
-test "$DED_LD" != "false" || AC_MSG_ERROR([No linker found])
-
-AC_MSG_CHECKING(for compiler flags for loadable drivers)
-AC_MSG_RESULT([$DED_CFLAGS])
-AC_MSG_CHECKING(for linker for loadable drivers)
-AC_MSG_RESULT([$DED_LD])
-AC_MSG_CHECKING(for linker flags for loadable drivers)
-AC_MSG_RESULT([$DED_LDFLAGS])
-AC_MSG_CHECKING(for 'runtime library path' linker flag)
-if test "x$DED_LD_FLAG_RUNTIME_LIBRARY_PATH" != "x"; then
-	AC_MSG_RESULT([$DED_LD_FLAG_RUNTIME_LIBRARY_PATH])
-else
-	AC_MSG_RESULT([not found])
-fi
-
-AC_SUBST(DED_EXT)
-AC_SUBST(DED_SYS_INCLUDE)
-AC_SUBST(DED_CFLAGS)
-AC_SUBST(DED_STATIC_CFLAGS)
-AC_SUBST(DED_LD)
-AC_SUBST(DED_LDFLAGS)
-AC_SUBST(DED_LD_FLAG_RUNTIME_LIBRARY_PATH)
-AC_SUBST(DED_THR_DEFS)
-AC_SUBST(DED_EMU_THR_DEFS)
-AC_SUBST(STATIC_CFLAGS)
-
 dnl
 dnl We should look for a compiler that handles jump tables, for beam_emu 
 dnl to be optimized
@@ -3288,14 +3149,14 @@ if test "$enable_dtrace_test" = "yes" ; then
 		AC_MSG_CHECKING([for 2-stage DTrace precompilation])
                 AC_TRY_COMPILE([ #include "foo-dtrace.h" ],
                     [ERLANG_DIST_PORT_BUSY_ENABLED();],
-		    [$RM -f $DTRACE_2STEP_TEST
+		    [rm -f $DTRACE_2STEP_TEST
 		     dtrace -G $DTRACE_CPP $DTRACE_BITS_FLAG -Iemulator/beam -o $DTRACE_2STEP_TEST -s emulator/beam/erlang_dtrace.d conftest.$OBJEXT 2>&AS_MESSAGE_LOG_FD
                      if test -f $DTRACE_2STEP_TEST; then
-			$RM $DTRACE_2STEP_TEST
+			rm -f $DTRACE_2STEP_TEST
                         DTRACE_ENABLED_2STEP=yes
 		     fi],
                     [])
-		$RM -f foo-dtrace.h
+		rm -f foo-dtrace.h
 		AS_IF([test "x$DTRACE_ENABLED_2STEP" = "xyes"],
 		      [AC_MSG_RESULT([yes])],
                       [AC_MSG_RESULT([no])])
@@ -3348,733 +3209,6 @@ if test "$enable_lttng_test" = "yes" ; then
 fi
 
 
-dnl
-dnl SSL, SSH and CRYPTO need the OpenSSL libraries
-dnl
-dnl Check flags --with-ssl, --without-ssl --with-ssl=PATH.
-dnl If no option is given or --with-ssl is set without a path then we
-dnl search for OpenSSL libraries and header files in the standard locations. 
-dnl If set to --without-ssl we disable the use of SSL, SSH and CRYPTO.
-dnl If set to --with-ssl=PATH we use that path as the prefix, i.e. we
-dnl use "PATH/include" and "PATH/lib".
-
-AC_SUBST(SSL_INCLUDE)
-AC_SUBST(SSL_INCDIR)
-AC_SUBST(SSL_LIBDIR)
-AC_SUBST(SSL_FLAGS)
-AC_SUBST(SSL_CRYPTO_LIBNAME)
-AC_SUBST(SSL_SSL_LIBNAME)
-AC_SUBST(SSL_CC_RUNTIME_LIBRARY_PATH)
-AC_SUBST(SSL_LD_RUNTIME_LIBRARY_PATH)
-AC_SUBST(SSL_DED_LD_RUNTIME_LIBRARY_PATH)
-AC_SUBST(SSL_DYNAMIC_ONLY)
-AC_SUBST(SSL_LINK_WITH_KERBEROS)
-AC_SUBST(STATIC_KERBEROS_LIBS)
-AC_SUBST(SSL_LINK_WITH_ZLIB)
-AC_SUBST(STATIC_ZLIB_LIBS)
-
-std_ssl_locations="/usr/local /usr/sfw /usr /opt/local /usr/pkg /usr/local/openssl /usr/lib/openssl /usr/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl /"
-
-AC_ARG_WITH(ssl-zlib,
-AS_HELP_STRING([--with-ssl-zlib=PATH],
-               [specify location of ZLib to be used by OpenSSL])
-AS_HELP_STRING([--with-ssl-zlib],
-               [link SSL with  Zlib (default if found)])
-AS_HELP_STRING([--without-ssl-zlib],
-               [don't link SSL with ZLib]))
-
-
-if  test "x$with_ssl_zlib" = "xno"; then
-	SSL_LINK_WITH_ZLIB=no
-	STATIC_ZLIB_LIBS=
-elif test "x$with_ssl_zlib" = "xyes" || test "x$with_ssl_zlib" = "x"; then
-	if test $erl_xcomp_without_sysroot = yes; then
-		AC_MSG_WARN([Cannot search for zlib; missing cross system root (erl_xcomp_sysroot).])
-		SSL_LINK_WITH_ZLIB=no	
-		STATIC_ZLIB_LIBS=	
-	elif  test "x$MIXED_CYGWIN" = "xyes" -o "x$MIXED_MSYS" = "xyes"; then
-		SSL_LINK_WITH_ZLIB=no	
-		STATIC_ZLIB_LIBS=	
-	else
-		SSL_LINK_WITH_ZLIB=no
-		STATIC_ZLIB_LIBS=
-		AC_MSG_CHECKING(for static ZLib to be used by SSL in standard locations) 
-		for rdir in $std_ssl_locations; do
-			dir="$erl_xcomp_sysroot$rdir"
-			if test "x$ac_cv_sizeof_void_p" = "x8"; then
-				if test -f "$dir/lib64/libz.a"; then
-					SSL_LINK_WITH_ZLIB=yes
-					STATIC_ZLIB_LIBS="$dir/lib64/libz.a"
-					break
-				elif test -f "$dir/lib/64/libz.a"; then
-					SSL_LINK_WITH_ZLIB=yes
-					STATIC_ZLIB_LIBS="$dir/lib/64/libz.a"
-					break
-				fi
-			fi
-			if test -f "$dir/lib/libz.a"; then
-					SSL_LINK_WITH_ZLIB=yes
-				STATIC_ZLIB_LIBS="$dir/lib/libz.a"
-				break
-			fi
-		done
-		if test "x$SSL_LINK_WITH_ZLIB" = "xno"; then
-		       	AC_MSG_RESULT([no])
-		else
-			AC_MSG_RESULT([$STATIC_ZLIB_LIBS])
-		fi
-	fi				
-else
-	SSL_LINK_WITH_ZLIB=no
-	STATIC_ZLIB_LIBS=
-	if test -f "$with_ssl_zlib/libz.a"; then
-		SSL_LINK_WITH_ZLIB=yes
-		STATIC_ZLIB_LIBS=$with_ssl_zlib/libz.a
-	elif test -f "$with_ssl_zlib/lib/libz.a"; then
-		SSL_LINK_WITH_ZLIB=yes
-		STATIC_ZLIB_LIBS=$with_ssl_zlib/lib/libz.a
-	fi
-	if test "x$ac_cv_sizeof_void_p" = "x8"; then
-		if test -f "$with_ssl_zlib/lib64/libz.a"; then
-			SSL_LINK_WITH_ZLIB=yes
-			STATIC_ZLIB_LIBS=$with_ssl_zlib/lib64/libz.a
-		elif test -f "$with_ssl_zlib/lib/64/libz.a"; then
-			SSL_LINK_WITH_ZLIB=yes
-			STATIC_ZLIB_LIBS=$with_ssl_zlib/lib/64/libz.a
-		fi
-	fi
-	if test "x$SSL_LINK_WITH_ZLIB" = "xno"; then
-	       	AC_MSG_ERROR(Invalid path to option --with-ssl-zlib=PATH)
-	fi
-fi
-		
-			
-AC_ARG_WITH(ssl,
-AS_HELP_STRING([--with-ssl=PATH], [specify location of OpenSSL include and lib])
-AS_HELP_STRING([--with-ssl], [use SSL (default)])
-AS_HELP_STRING([--without-ssl], [don't use SSL]))
-
-AC_ARG_WITH(ssl-incl,
-AS_HELP_STRING([--with-ssl-incl=PATH], [location of OpenSSL include dir, if different than specified by --with-ssl=PATH]),
-[
-case X$with_ssl in
-    X | Xyes | Xno) AC_MSG_ERROR([--with-ssl-incl=PATH set without --with-ssl=PATH]);;
-esac
-],
-[with_ssl_incl=$with_ssl]) #default
-
-AC_ARG_WITH(ssl-rpath,
-AS_HELP_STRING([--with-ssl-rpath=yes|no|PATHS],
-               [runtime library path for OpenSSL. Default is "yes", which equates to a
-	       number of standard locations. If "no", then no runtime
-	       library paths will be used. Anything else should be a
-	       comma separated list of paths.]),
-[
-case X$with_ssl in
-    Xno) AC_MSG_ERROR([--with-ssl-rpath set without --with-ssl]);;
-esac
-],
-[with_ssl_rpath=yes]) #default
-
-
-AC_ARG_ENABLE(dynamic-ssl-lib,
-AS_HELP_STRING([--disable-dynamic-ssl-lib],
-               [disable using dynamic openssl libraries]),
-[ case "$enableval" in
-    no) enable_dynamic_ssl=no ;;
-    *)  enable_dynamic_ssl=yes ;;
-  esac ], enable_dynamic_ssl=yes)
-
-#----------------------------------------------------------------------
-# We actually might do the SSL tests twice due to late discovery of 
-# kerberos problems with static linking, in case we redo it all trying
-# dynamic SSL libraries instead.
-#----------------------------------------------------------------------
-
-ssl_done=no
-
-while test "x$ssl_done" != "xyes"; do
-
-ssl_done=yes # Default only one run
-
-# Remove all SKIP files from previous runs
-for a in ssl crypto ssh; do
-  $RM -f $ERL_TOP/lib/$a/SKIP
-done
-
-SSL_DYNAMIC_ONLY=$enable_dynamic_ssl
-SSL_STATIC_ONLY=no
-
-case "$erl_xcomp_without_sysroot-$with_ssl" in
-  yes-* | no-no)
-    SSL_APP=
-    CRYPTO_APP=
-    SSH_APP=
-    if test "$with_ssl" = "no"; then
-	skip="User gave --without-ssl option"
-    else
-	skip="Cannot search for ssl; missing cross system root (erl_xcomp_sysroot)."
-    fi
-    for a in ssl crypto ssh; do
-        echo "$skip" > $ERL_TOP/lib/$a/SKIP
-    done
-    ;;
-  no-yes | no- )
-    # On windows, we could try to find the installation
-    # of Shining Light OpenSSL, which can be found by poking in
-    # the uninstall section in the registry, it's worth a try...
-    extra_dir=""
-    if  test "x$MIXED_CYGWIN" = "xyes"; then
-    	AC_CHECK_PROG(REGTOOL, regtool, regtool, false)
-	if test "$ac_cv_prog_REGTOOL" != false; then
-		wrp="/machine/software/microsoft/windows/currentversion/"
-	   	if test "x$ARCH" = "xamd64"; then
-		   urp="uninstall/openssl (64-bit)_is1/inno setup: app path"
-		   regtool_subsystem=-w
-		else
-		   urp="uninstall/openssl (32-bit)_is1/inno setup: app path"
-		   regtool_subsystem=-W
-		fi	
-		rp="$wrp$urp"
-		if regtool -q $regtool_subsystem get "$rp" > /dev/null; then
-		   true
-		else
-		   # Fallback to unspecified wordlength
-		   urp="uninstall/openssl_is1/inno setup: app path"
-		   rp="$wrp$urp"
-		fi	
-		if regtool -q $regtool_subsystem get "$rp" > /dev/null; then
-			ssl_install_dir=`regtool -q $regtool_subsystem get "$rp"`
-			# Try hard to get rid of spaces...
-			if cygpath -d "$ssl_install_dir" > /dev/null 2>&1; then
-				ssl_install_dir=`cygpath -d "$ssl_install_dir"`
-			fi
-			extra_dir=`cygpath $ssl_install_dir`
-		fi
-	fi
-    elif test "x$MIXED_MSYS" = "xyes"; then
-    	AC_CHECK_PROG(REGTOOL, reg_query.sh, reg_query.sh, false)
-	if test "$ac_cv_prog_REGTOOL" != false; then
-	   	if test "x$ARCH" = "xamd64"; then
-		   rp="HKLM/SOFTWARE/Microsoft/Windows/CurrentVersion/Uninstall/OpenSSL (64-bit)_is1"
-		else
-		   rp="HKLM/SOFTWARE/Microsoft/Windows/CurrentVersion/Uninstall/OpenSSL_is1"
-		fi	
-		key="Inno Setup: App Path"
-		if "$ac_cv_prog_REGTOOL" "$rp" "$key" > /dev/null; then
-			ssl_install_dir=`"$ac_cv_prog_REGTOOL" "$rp" "$key"`
-			extra_dir=`win2msys_path.sh "$ssl_install_dir"`
-		fi
-	fi
-    fi
-    # We search for OpenSSL in the common OS standard locations.
-    SSL_APP=ssl
-    CRYPTO_APP=crypto
-    SSH_APP=ssh
-
-    SSL_CRYPTO_LIBNAME=crypto
-    SSL_SSL_LIBNAME=ssl
-    
-    if  test "x$MIXED_CYGWIN" = "xyes" -o "x$MIXED_MSYS" = "xyes"; then
-    	if test "x$ARCH" = "xamd64"; then
-	  std_win_ssl_locations="/cygdrive/c/OpenSSL-Win64 /c/OpenSSL-Win64 /opt/local64/pgm/OpenSSL"
-	else
-	  std_win_ssl_locations="/cygdrive/c/OpenSSL-Win32 /c/OpenSSL-Win32 /cygdrive/c/OpenSSL /c/OpenSSL /opt/local/pgm/OpenSSL"
-	fi
-    else
-        std_win_ssl_locations=""
-    fi
-
-
-    AC_MSG_CHECKING(for OpenSSL >= 0.9.8c in standard locations)
-    for rdir in $extra_dir $std_win_ssl_locations $std_ssl_locations; do
-	dir="$erl_xcomp_sysroot$rdir"
-	if test -f "$erl_xcomp_isysroot$rdir/include/openssl/opensslv.h"; then
-		is_real_ssl=yes
-		SSL_INCDIR="$dir"
-		if test "x$MIXED_CYGWIN" = "xyes" -o "x$MIXED_MSYS" = "xyes"; then
-			if test -f "$dir/lib/VC/libeay32.lib"; then
-				SSL_RUNTIME_LIBDIR="$rdir/lib/VC"
-				SSL_LIBDIR="$dir/lib/VC"
-				SSL_CRYPTO_LIBNAME=libeay32
-				SSL_SSL_LIBNAME=ssleay32
-			elif test -f "$dir/lib/VC/openssl.lib"; then 
-				SSL_RUNTIME_LIBDIR="$rdir/lib/VC"
-				SSL_LIBDIR="$dir/lib/VC"
-			elif test -f $dir/lib/VC/libeay32MD.lib; then
-		            SSL_CRYPTO_LIBNAME=libeay32MD
-		            SSL_SSL_LIBNAME=ssleay32MD
-			    if test "x$enable_dynamic_ssl" = "xno" && \
-	                       test -f  $dir/lib/VC/static/libeay32MD.lib; then
-				  SSL_RUNTIME_LIBDIR="$rdir/lib/VC/static"
-				  SSL_LIBDIR="$dir/lib/VC/static"
-		            else
-			          SSL_RUNTIME_LIBDIR="$rdir/lib/VC"
-				  SSL_LIBDIR="$dir/lib/VC"
-                            fi 
-			elif test -f "$dir/lib/libeay32.lib"; then
-				SSL_RUNTIME_LIBDIR="$rdir/lib"
-				SSL_LIBDIR="$dir/lib"
-				SSL_CRYPTO_LIBNAME=libeay32
-				SSL_SSL_LIBNAME=ssleay32
-			elif test -f "$dir/lib/openssl.lib"; then
-				SSL_RUNTIME_LIBDIR="$rdir/lib"
-				SSL_LIBDIR="$dir/lib"
-			else
-				is_real_ssl=no
-			fi
-		elif test -f "$dir/lib/powerpc/libsslcrypto.a"; then
-			SSL_CRYPTO_LIBNAME=sslcrypto
-			SSL_LIBDIR="$dir/lib/powerpc/"
-			SSL_RUNTIME_LIBDIR="$rdir/lib/powerpc/"
-		else
-			if test "x$ac_cv_sizeof_void_p" = "x8"; then
-				if test -f "$dir/lib64/libcrypto.a"; then
-					SSL_RUNTIME_LIBDIR="$rdir/lib64"
-					SSL_LIBDIR="$dir/lib64"
-				elif test -f "$dir/lib/64/libcrypto.a"; then
-					SSL_RUNTIME_LIBDIR="$rdir/lib/64"
-					SSL_LIBDIR="$dir/lib/64"
-				elif test -f "$dir/lib64/libcrypto.so"; then
-					SSL_RUNTIME_LIBDIR="$rdir/lib64"
-					SSL_LIBDIR="$dir/lib64"
-				elif test -f "$dir/lib/64/libcrypto.so"; then
-					SSL_RUNTIME_LIBDIR="$rdir/lib/64"
-					SSL_LIBDIR="$dir/lib/64"
-				else
-					SSL_RUNTIME_LIBDIR="$rdir/lib"
-					SSL_LIBDIR="$dir/lib"
-				fi
-			else	 
-				SSL_RUNTIME_LIBDIR="$rdir/lib"
-				SSL_LIBDIR="$dir/lib"
-			fi
-		fi
-		if test '!' -f "$SSL_LIBDIR/lib${SSL_CRYPTO_LIBNAME}.a"; then
-			SSL_DYNAMIC_ONLY=yes
-		elif test '!' -f "$SSL_LIBDIR/lib${SSL_CRYPTO_LIBNAME}.so" -a '!' -f "$SSL_LIBDIR/lib${SSL_CRYPTO_LIBNAME}.dylib"; then
-			SSL_STATIC_ONLY=yes
-		fi
-		SSL_BINDIR="$rdir/bin"
-		if test "x$is_real_ssl" = "xyes" ; then
-			SSL_INCLUDE="-I$dir/include"
-			old_CPPFLAGS=$CPPFLAGS
-			CPPFLAGS=$SSL_INCLUDE
-			AC_EGREP_CPP(^yes$,[
-#include <openssl/opensslv.h>
-#if OPENSSL_VERSION_NUMBER >= 0x0090803fL
-yes
-#endif
-			],[
-			ssl_found=yes
-			],[
-			SSL_APP=
-			ssl_found=no
-         		])
-         		CPPFLAGS=$old_CPPFLAGS
-			if test "x$ssl_found" = "xyes"; then
-			   	if test "x$MIXED_CYGWIN" = "xyes" -o "x$MIXED_MSYS" = "xyes"; then
-				   	ssl_linkable=yes
-				elif test "x${SSL_CRYPTO_LIBNAME}" = "xsslcrypto"; then
-				# This should only be triggered seen OSE
-					ssl_linkable=yes
-				else
-					saveCFLAGS="$CFLAGS"
- 					saveLDFLAGS="$LDFLAGS"
-					saveLIBS="$LIBS"
- 					CFLAGS="$CFLAGS $SSL_INCLUDE"
-					if test "x$SSL_STATIC_ONLY" = "xyes"; then
-						LIBS="${SSL_LIBDIR}/lib${SSL_CRYPTO_LIBNAME}.a"
-					else
-						LDFLAGS="$LDFLAGS -L$SSL_LIBDIR"
-						LIBS="$LIBS -l${SSL_CRYPTO_LIBNAME}"
-					fi
- 					AC_TRY_LINK([
-					#include <stdio.h>
- 					#include <openssl/hmac.h>],
- 					[ 
-					HMAC(0, 0, 0, 0, 0, 0, 0);
- 					],
- 					[ssl_linkable=yes],
- 					[ssl_linkable=no])
- 					CFLAGS="$saveCFLAGS"
- 					LDFLAGS="$saveLDFLAGS"
-					LIBS="$saveLIBS"
-				fi
- 			fi
-	 		if test "x$ssl_found" = "xyes" && test "x$ssl_linkable" = "xyes"; then
-			 	AC_MSG_RESULT([$dir])
-	   			break;
-         		fi
-		fi	
-       fi
-    done
-
-    if test "x$ssl_found" != "xyes" ; then
-	dnl 
-	dnl If no SSL found above, check whether we are running on OpenBSD.
-	dnl
-	case $host_os in
-	openbsd*)
-	       if test -f "$erl_xcomp_isysroot/usr/include/openssl/opensslv.h"; then
-		  # Trust OpenBSD to have everything the in the correct locations.
-		  ssl_found=yes
-		  ssl_linkable=yes
-		  SSL_INCDIR="$erl_xcomp_sysroot/usr"
-	          AC_MSG_RESULT([$SSL_INCDIR])
-		  SSL_RUNTIME_LIB="/usr/lib"
-		  SSL_LIB="$erl_xcomp_sysroot/usr/lib"
-		  SSL_BINDIR="/usr/sbin"
-		  dnl OpenBSD requires us to link with -L and -l
-		  SSL_DYNAMIC_ONLY="yes" 
-		fi
-		;;
-	esac
-    fi
-dnl		Now, certain linuxes have a 64bit libcrypto
-dnl		that cannot build shared libraries (i.e. not PIC)
-dnl		One could argue that this is wrong, but
-dnl		so it is - be adoptable
-    if test "$ssl_found" = "yes" && test "$ssl_linkable" = "yes" && test "$SSL_DYNAMIC_ONLY" != "yes"; then
-	case $host_os in
-		linux*)
-			saveCFLAGS="$CFLAGS"
- 			saveLDFLAGS="$LDFLAGS"
-			saveLIBS="$LIBS"
- 			CFLAGS="$DED_CFLAGS $SSL_INCLUDE"
- 			LDFLAGS="$DED_LDFLAGS"
-			LIBS="$SSL_LIBDIR/libcrypto.a $STATIC_ZLIB_LIBS"
- 			AC_TRY_LINK([
-			#include <stdio.h>
- 			#include <openssl/hmac.h>],
- 			[ 
-			HMAC(0, 0, 0, 0, 0, 0, 0);
- 			],
- 			[ssl_dyn_linkable=yes],
- 			[ssl_dyn_linkable=no])
- 			CFLAGS="$saveCFLAGS"
- 			LDFLAGS="$saveLDFLAGS"
-			LIBS="$saveLIBS"
-			if test "x$ssl_dyn_linkable" != "xyes"; then
-				SSL_DYNAMIC_ONLY=yes
-				AC_MSG_WARN([SSL will be linked against dynamic lib as static lib is not purely relocatable])
-			fi
-			;;
-	esac
-    fi					
-	
-				
-
-
-    if test "x$ssl_found" != "xyes" || test  "x$ssl_linkable" != "xyes"; then
-       if test "x$ssl_found" = "xyes"; then 
-       		AC_MSG_RESULT([found; but not usable])
-       else
-       		AC_MSG_RESULT([no])
-       fi
-       SSL_APP=
-       CRYPTO_APP=
-       SSH_APP=
-       AC_MSG_WARN([No (usable) OpenSSL found, skipping ssl, ssh and crypto applications])
-
-       for a in ssl crypto ssh; do
-           echo "No usable OpenSSL found" > $ERL_TOP/lib/$a/SKIP
-       done
-    fi
-    ;;
-  *)
-    # Option given with PATH to package
-    if test ! -d "$with_ssl" ; then
-       AC_MSG_ERROR(Invalid path to option --with-ssl=PATH)
-    fi
-    if test ! -d "$with_ssl_incl" ; then
-       AC_MSG_ERROR(Invalid path to option --with-ssl-incl=PATH)
-    fi
-    SSL_INCDIR="$with_ssl_incl"
-    SSL_CRYPTO_LIBNAME=crypto
-    SSL_SSL_LIBNAME=ssl
-    if test "x$MIXED_CYGWIN" = "xyes" -o "x$MIXED_MSYS" = "xyes" && test -d "$with_ssl/lib/VC"; then
-	if test -f "$with_ssl/lib/VC/libeay32.lib"; then
-	    SSL_LIBDIR="$with_ssl/lib/VC"
-	    SSL_CRYPTO_LIBNAME=libeay32
-	    SSL_SSL_LIBNAME=ssleay32
-	elif test -f "$with_ssl/lib/VC/openssl.lib"; then 
-	    SSL_LIBDIR="$with_ssl/lib/VC"
-	elif test -f $with_ssl/lib/VC/libeay32MD.lib; then
-	    SSL_CRYPTO_LIBNAME=libeay32MD
-            SSL_SSL_LIBNAME=ssleay32MD
-	    if test "x$enable_dynamic_ssl" = "xno" && \
-	       test -f  $with_ssl/lib/VC/static/libeay32MD.lib; then
-		SSL_LIBDIR="$with_ssl/lib/VC/static"
-	    else
-		SSL_LIBDIR="$with_ssl/lib/VC"
-            fi 
-	elif test -f "$with_ssl/lib/libeay32.lib"; then
-	    SSL_LIBDIR="$with_ssl/lib"
-	    SSL_CRYPTO_LIBNAME=libeay32
-	    SSL_SSL_LIBNAME=ssleay32
-	else
-	    # This probably wont work, but that's what the user said, so...
-	    SSL_LIBDIR="$with_ssl/lib"
-	fi
-    elif test -f "$dir/lib/powerpc/libsslcrypto.a"; then
-	    SSL_CRYPTO_LIBNAME=sslcrypto
-	    SSL_LIBDIR="$with_ssl/lib/powerpc/"
-    elif test "x$ac_cv_sizeof_void_p" = "x8"; then
-	if test -f "$with_ssl/lib64/libcrypto.a"; then
-		SSL_LIBDIR="$with_ssl/lib64"
-	elif test -f "$with_ssl/lib/64/libcrypto.a"; then
-		SSL_LIBDIR="$with_ssl/lib/64"
-	elif test -f "$with_ssl/lib64/libcrypto.so"; then
-		SSL_LIBDIR="$with_ssl/lib64"
-	elif test -f "$with_ssl/lib/64/libcrypto.so"; then
-		SSL_LIBDIR="$with_ssl/lib/64"
-	else
-		SSL_LIBDIR="$with_ssl/lib"
-	fi
-    else	 
-	SSL_LIBDIR="$with_ssl/lib"
-    fi
-    if test '!' -f "${SSL_LIBDIR}/lib${SSL_CRYPTO_LIBNAME}.a"; then
-	SSL_DYNAMIC_ONLY=yes
-    elif test '!' -f ${SSL_LIBDIR}/lib${SSL_CRYPTO_LIBNAME}.so -a '!' -f "$SSL_LIBDIR/lib${SSL_CRYPTO_LIBNAME}.dylib"; then
-	SSL_STATIC_ONLY=yes
-    fi
-    SSL_INCLUDE="-I$with_ssl_incl/include"
-    SSL_APP=ssl
-    CRYPTO_APP=crypto
-    SSH_APP=ssh
-    if test "$cross_compiling" = "yes"; then
-	SSL_RUNTIME_LIBDIR=`echo "$SSL_LIBDIR" | sed -n "s|^$erl_xcomp_sysroot\(/*\)\(.*\)\$|/\2|p"`
-    else
-	SSL_RUNTIME_LIBDIR="$SSL_LIBDIR"
-    fi
-esac
-
-if test "x$SSL_APP" != "x" ; then
-    dnl We found openssl, now check if we use kerberos 5 support
-    dnl FIXME: Do we still support platforms that have Kerberos?
-    AC_MSG_CHECKING(for OpenSSL kerberos 5 support)
-    old_CPPFLAGS=$CPPFLAGS
-    CPPFLAGS=$SSL_INCLUDE
-    AC_EGREP_CPP(^yes$,[
-#include <openssl/opensslv.h>
-#include <openssl/opensslconf.h>
-#if OPENSSL_VERSION_NUMBER < 0x1010000fL && !defined(OPENSSL_NO_KRB5)
-yes
-#endif
-      ],[
-      AC_MSG_RESULT([yes])
-      ssl_krb5_enabled=yes
-      if test "x$SSL_DYNAMIC_ONLY" != "xyes"; then
-          if test -f "$SSL_LIBDIR/libkrb5.a"; then
-              SSL_LINK_WITH_KERBEROS=yes
-	      STATIC_KERBEROS_LIBS="$SSL_LIBDIR/libkrb5.a"
-	      if test -f "$SSL_LIBDIR/libkrb5support.a"; then
-		  STATIC_KERBEROS_LIBS="$STATIC_KERBEROS_LIBS $SSL_LIBDIR/libkrb5support.a"
-	      fi
-	      if test -f "$SSL_LIBDIR/libk5crypto.a"; then
-		  STATIC_KERBEROS_LIBS="$STATIC_KERBEROS_LIBS $SSL_LIBDIR/libk5crypto.a"
-	      fi
-	      if test -f "$SSL_LIBDIR/libresolv.a"; then
-		  STATIC_KERBEROS_LIBS="$STATIC_KERBEROS_LIBS $SSL_LIBDIR/libresolv.a"
-	      fi
-	      if test -f "$SSL_LIBDIR/libcom_err.a"; then
-		  STATIC_KERBEROS_LIBS="$STATIC_KERBEROS_LIBS $SSL_LIBDIR/libcom_err.a"
-	      fi
-          else
-	      AC_MSG_WARN([Kerberos needed but no kerberos static libraries found])
-	      AC_MSG_WARN([Rescanning for dynamic SSL libraries])
-	      enable_dynamic_ssl=yes
-	      ssl_done=no
-	      SSL_LINK_WITH_KERBEROS=no
-	      STATIC_KERBEROS_LIBS=""
-	      ssl_krb5_enabled=no
-	      SSL_WITH_KERBEROS=no
-          fi
-      else 	
-	      SSL_LINK_WITH_KERBEROS=no
-	      STATIC_KERBEROS_LIBS=""
-      fi
-      ],[
-      AC_MSG_RESULT([no])
-      ssl_krb5_enabled=no
-      SSL_WITH_KERBEROS=no
-      ])
-    CPPFLAGS=$old_CPPFLAGS
-    SSL_KRB5_INCLUDE=
-    if test "x$ssl_krb5_enabled" = "xyes" ; then
-        AC_MSG_CHECKING(for krb5.h in standard locations)
-	for dir in $extra_dir "$SSL_INCDIR/include" "$SSL_INCDIR/include/openssl" \
-		"$SSL_INCDIR/include/kerberos" \
-		"$erl_xcomp_isysroot/cygdrive/c/kerberos/include" \
-		"$erl_xcomp_isysroot/usr/local/kerberos/include" \
-		"$erl_xcomp_isysroot/usr/kerberos/include" \
-		"$erl_xcomp_isysroot/usr/include"
-	do
-            if test -f "$dir/krb5.h" ; then
-                SSL_KRB5_INCLUDE="$dir"
-		break
-            fi
-        done
-        if test "x$SSL_KRB5_INCLUDE" = "x" ; then
-	    AC_MSG_RESULT([not found])
-	    SSL_APP=
-	    CRYPTO_APP=
-	    SSH_APP=
-	    AC_MSG_WARN([OpenSSL is configured for kerberos but no krb5.h found])
-	    for a in ssl crypto ssh ; do
-	 	echo "OpenSSL is configured for kerberos but no krb5.h found" > $ERL_TOP/lib/$a/SKIP
-	    done
-        else
-            AC_MSG_RESULT([found in $SSL_KRB5_INCLUDE])
-            SSL_INCLUDE="$SSL_INCLUDE -I$SSL_KRB5_INCLUDE"
-        fi
-    fi
-fi
-
-done # while test ssl_done != yes
-
-SSL_CC_RUNTIME_LIBRARY_PATH=
-SSL_LD_RUNTIME_LIBRARY_PATH=
-SSL_DED_LD_RUNTIME_LIBRARY_PATH=
-cc_rflg="$CFLAG_RUNTIME_LIBRARY_PATH"
-ld_rflg="$LDFLAG_RUNTIME_LIBRARY_PATH"
-ded_ld_rflg="$DED_LD_FLAG_RUNTIME_LIBRARY_PATH"
-
-
-case "$with_ssl_rpath" in
-
-yes)   # Use standard lib locations for ssl runtime library path
-
-  if test "$SSL_APP" != "" && test "$SSL_DYNAMIC_ONLY" = "yes" && \
-   { test "$cc_rflg" != "" || test "$ld_rflg" != "" || test "$ded_ld_rflg" != ""; } ; then
-
-    AC_MSG_CHECKING(for ssl runtime library path to use)
-
-    libdirs="/lib"
-
-    if test "$ac_cv_sizeof_void_p" = "8"; then
-	dir_lib64=no
-	dir_lib_64=no
-
-	case "$SSL_RUNTIME_LIBDIR" in
-	    */lib/64 | */lib/64/ ) dir_lib_64=yes;;
-	    */lib64 | */lib64/ ) dir_lib64=yes;;
-	    *) ;;
-	esac
-
-	for dir in $std_ssl_locations; do
-	    test $dir_lib_64 = no &&
-	    	test -d "$erl_xcomp_sysroot$dir/lib/64" &&
-		    dir_lib_64=yes
-	    test $dir_lib64 = no &&
-		test -d "$erl_xcomp_sysroot$dir/lib64" &&
-		    dir_lib64=yes
-	done
-
-	test $dir_lib_64 = yes && libdirs="/lib/64 $libdirs"
-	test $dir_lib64 = yes && libdirs="/lib64 $libdirs"
-    fi
-
-    for type in std x_std curr; do
-
-        cc_rpath="$cc_rflg$SSL_RUNTIME_LIBDIR"
-        ld_rpath="$ld_rflg$SSL_RUNTIME_LIBDIR"
-        ded_ld_rpath="$ded_ld_rflg$SSL_RUNTIME_LIBDIR"
-	rpath="$SSL_RUNTIME_LIBDIR"
-
-	if test $type != curr; then
-	    for ldir in $libdirs; do
-		for dir in $std_ssl_locations; do
-		    test "$SSL_LIBDIR" != "$dir$ldir" || continue
-		    test $type != x_std || test -d "$dir$ldir" || continue
-		    test "$cc_rflg" = "" ||
-			cc_rpath="$cc_rpath $cc_rflg$dir$ldir"
-		    test "$ld_rflg" = "" ||
-			ld_rpath="$ld_rpath $ld_rflg$dir$ldir"
-		    test "$ded_ld_rflg" = "" ||
-			ded_ld_rpath="$ded_ld_rpath $ded_ld_rflg$dir$ldir"
-		    rpath="$rpath:$dir$ldir"
-                done
-	    done
-	fi
-
-	saveCFLAGS="$CFLAGS"
-	saveLDFLAGS="$LDFLAGS"
-	saveLIBS="$LIBS"
-	CFLAGS="$CFLAGS $SSL_INCLUDE"
-	LDFLAGS="$LDFLAGS $ld_rpath -L$SSL_LIBDIR"
-	LIBS="-lcrypto"
-	AC_TRY_LINK([
-                         #include <stdio.h>
-                         #include <openssl/hmac.h>
-                    ],
-                    [ 
-			 HMAC(0, 0, 0, 0, 0, 0, 0);
-                    ],
-                    [rpath_success=yes],
-                    [rpath_success=no])
-	CFLAGS="$saveCFLAGS"
-	LDFLAGS="$saveLDFLAGS"
-	LIBS="$saveLIBS"
-
-	test "$rpath_success" = "yes" && break
-    done
-
-    test "$rpath_success" = "yes" || { cc_rpath=; ld_rpath=; ded_ld_rpath=; rpath=; }
-
-    SSL_CC_RUNTIME_LIBRARY_PATH="$cc_rpath"
-    SSL_LD_RUNTIME_LIBRARY_PATH="$ld_rpath"
-    SSL_DED_LD_RUNTIME_LIBRARY_PATH="$ded_ld_rpath"
-
-    AC_MSG_RESULT([$rpath])
-    test "$rpath" != "" || AC_MSG_WARN([Cannot set run path during linking])
-  fi
-  ;;
-
-no)   # Use no ssl runtime library path
-  SSL_DED_LD_RUNTIME_LIBRARY_PATH=
-  ;;
-
-*)    # Use ssl runtime library paths set by --with-ssl-rpath (without any check)
-  ded_ld_rpath=
-  delimit=
-  for dir in `echo $with_ssl_rpath | sed "s/,/ /g"`; do
-      ded_ld_rpath="$ded_ld_rpath$delimit$ded_ld_rflg$dir"
-      delimit=" "
-  done
-  SSL_DED_LD_RUNTIME_LIBRARY_PATH="$ded_ld_rpath"
-  ;;
-
-esac
-
-
-AC_ARG_ENABLE(fips,
-AS_HELP_STRING([--enable-fips], [enable OpenSSL FIPS mode support])
-AS_HELP_STRING([--disable-fips], [disable OpenSSL FIPS mode support (default)]),
-[ case "$enableval" in
-    yes) enable_fips_support=yes ;;
-    *)   enable_fips_support=no ;;
-  esac ], enable_fips_support=no)
-
-if test "x$enable_fips_support" = "xyes" && test "$CRYPTO_APP" != ""; then
-   saveCFLAGS="$CFLAGS"
-   saveLDFLAGS="$LDFLAGS"
-   saveLIBS="$LIBS"
-   CFLAGS="$CFLAGS $SSL_INCLUDE"
-   LDFLAGS="$LDFLAGS $SSL_LD_RUNTIME_LIBRARY_PATH -L$SSL_LIBDIR"
-   LIBS="-lcrypto"
-   AC_CHECK_FUNC([FIPS_mode_set],
-   [SSL_FLAGS="-DFIPS_SUPPORT"],
-   [SSL_FLAGS=])
-   CFLAGS="$saveCFLAGS"
-   LDFLAGS="$saveLDFLAGS"
-   LIBS="$saveLIBS"
-else
-   SSL_FLAGS=
-fi
-
 #--------------------------------------------------------------------
 # Os mon stuff.
 #--------------------------------------------------------------------
@@ -4120,7 +3254,7 @@ need_java="jinterface ic/java_src"
 
 # Remove all SKIP files from previous runs
 for a in $need_java ; do
-  $RM -f $ERL_TOP/lib/$a/SKIP
+  rm -f $ERL_TOP/lib/$a/SKIP
 done
 
 if test "X$with_javac" = "Xno"; then
@@ -4171,7 +3305,7 @@ dnl this deliberately does not believe that 'gcc' is a C++ compiler
 AC_CHECK_TOOLS(CXX, [$CCC c++ g++ CC cxx cc++ cl], false)
 
 # Remove SKIP file from previous run
-$RM -f $ERL_TOP/lib/orber/SKIP
+rm -f $ERL_TOP/lib/orber/SKIP
 
 if test "$CXX" = false; then
   echo "No C++ compiler found" > $ERL_TOP/lib/orber/SKIP
@@ -4215,6 +3349,8 @@ AC_DEFINE_UNQUOTED(ERTS_EMU_CMDLINE_FLAGS,
 "$STATIC_CFLAGS $CFLAGS $DEBUG_CFLAGS $EMU_THR_DEFS $DEFS $WERRORFLAGS $WFLAGS",
 [The only reason ERTS_EMU_CMDLINE_FLAGS exists is to force modification of config.h when the emulator command line flags are modified by configure])
 
+AC_SUBST(STATIC_CFLAGS)
+
 dnl ----------------------------------------------------------------------
 dnl Directories needed for the build
 dnl ----------------------------------------------------------------------
@@ -4317,7 +3453,6 @@ AC_CONFIG_FILES([
   include/internal/$host/erts_internal.mk:include/internal/erts_internal.mk.in
   lib_src/$host/Makefile:lib_src/Makefile.in
   ../make/$host/otp.mk:../make/otp.mk.in
-  ../make/$host/otp_ded.mk:../make/otp_ded.mk.in
 ])
 
 AC_CONFIG_FILES([../make/make_emakefile:../make/make_emakefile.in],
@@ -4326,12 +3461,12 @@ AC_CONFIG_FILES([../make/make_emakefile:../make/make_emakefile.in],
 dnl
 dnl The ones below should be moved to their respective lib
 dnl
-dnl  ../lib/ssl/c_src/$host/Makefile:../lib/ssl/c_src/Makefile.in
 AC_CONFIG_FILES([
   ../lib/os_mon/c_src/$host/Makefile:../lib/os_mon/c_src/Makefile.in
-  ../lib/crypto/c_src/$host/Makefile:../lib/crypto/c_src/Makefile.in
   ../lib/runtime_tools/c_src/$host/Makefile:../lib/runtime_tools/c_src/Makefile.in
   ../lib/tools/c_src/$host/Makefile:../lib/tools/c_src/Makefile.in
   ])
 
+AC_CONFIG_FILES([../make/install_dir_data.sh:../make/install_dir_data.sh.in], [chmod +x ../make/install_dir_data.sh])
+
 AC_OUTPUT
diff --git a/erts/doc/src/Makefile b/erts/doc/src/Makefile
index 40f74b78ff..bb96293947 100644
--- a/erts/doc/src/Makefile
+++ b/erts/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2018. All Rights Reserved.
+# Copyright Ericsson AB 1997-2019. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -47,6 +47,20 @@ XML_REF1_FILES = epmd.xml \
 	run_erl.xml \
 	start.xml
 
+ifeq ($(USE_ESOCK), yes)
+XML_REF3_ESOCK_EFILES = socket.xml
+XML_CHAPTER_ESOCK_EFILES = socket_usage.xml
+ESOCK_USE_SOCKET_XML=<xi:include href="socket.xml"\/>
+ESOCK_USE_SOCKET_SPECS_XML=<xi:include href="../specs/specs_socket.xml"/>
+ESOCK_USE_SOCKET_USAGE_XML=<xi:include href="socket_usage.xml"/>
+else
+XML_REF3_ESOCK_EFILES =
+XML_CHAPTER_ESOCK_EFILES =
+ESOCK_USE_SOCKET_XML =
+ESOCK_USE_SOCKET_SPECS_XML =
+ESOCK_USE_SOCKET_USAGE_XML =
+endif
+
 XML_REF3_EFILES = \
 	erl_prim_loader.xml \
 	erlang.xml \
@@ -55,7 +69,8 @@ XML_REF3_EFILES = \
 	persistent_term.xml \
 	atomics.xml \
 	counters.xml \
-	zlib.xml
+	zlib.xml \
+	$(XML_REF3_ESOCK_EFILES)
 
 XML_REF3_FILES = \
 	$(XML_REF3_EFILES) \
@@ -65,7 +80,22 @@ XML_REF3_FILES = \
 	erts_alloc.xml
 
 XML_PART_FILES = \
-	part.xml
+	part.xml internal.xml
+
+XML_INTERNAL_FILES = \
+	CarrierMigration.xml	\
+	ThreadProgress.xml	\
+	CodeLoading.xml		\
+	Tracing.xml		\
+	DelayedDealloc.xml	\
+	beam_makeops.xml	\
+	GarbageCollection.xml	\
+	PTables.xml		\
+	PortSignals.xml		\
+	ProcessManagementOptimizations.xml \
+	SuperCarrier.xml        \
+	CountingInstructions.xml
+
 
 XML_CHAPTER_FILES = \
 	introduction.xml \
@@ -77,6 +107,7 @@ XML_CHAPTER_FILES = \
 	driver.xml \
 	absform.xml \
 	inet_cfg.xml \
+	$(XML_CHAPTER_ESOCK_EFILES) \
 	erl_ext_dist.xml \
 	erl_dist_protocol.xml \
 	communication.xml \
@@ -94,6 +125,8 @@ XML_FILES = \
 	$(BOOK_FILES) $(XML_CHAPTER_FILES) \
 	$(XML_PART_FILES) $(XML_REF3_FILES) $(XML_REF1_FILES) $(XML_APPLICATION_FILES)
 
+XML_GEN_FILES = $(XML_INTERNAL_FILES:%=$(XMLDIR)/%)
+
 # ----------------------------------------------------
 
 HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
@@ -113,6 +146,12 @@ SPECS_FILES = $(XML_REF3_EFILES:%.xml=$(SPECDIR)/specs_%.xml)
 
 TOP_SPECS_FILE = specs.xml
 
+XML_FIGURE_DIR = $(XMLDIR)/figures
+
+INTERNAL_DOC_PNG_FILES = $(wildcard ../../emulator/internal_doc/figures/*.png)
+PNG_FILES = $(notdir $(INTERNAL_DOC_PNG_FILES))
+XMLDIR_PNG_FILES = $(PNG_FILES:%=$(XML_FIGURE_DIR)/%)
+
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
@@ -125,10 +164,15 @@ SPECS_FLAGS = -I$(KERNEL_SRC) -I$(KERNEL_INCLUDE)
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
+_create_dirs := $(shell mkdir -p $(XML_FIGURE_DIR))
+
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
-docs: man pdf html $(INFO_FILE)
+$(XML_FIGURE_DIR)/%.png: ../../emulator/internal_doc/figures/%.png
+	$(INSTALL_DATA) $< $@
+
+docs: part ref_man specs figures man pdf html $(INFO_FILE)
 
 $(TOP_PDF_FILE): $(XML_FILES)
 
@@ -138,14 +182,21 @@ html: gifs $(HTML_REF_MAN_FILE)
 
 man: $(MAN1_FILES) $(MAN3_FILES)
 
+ref_man: ref_man.xml
+part: part.xml
+specs: specs.xml
+
 gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
 
 $(INFO_FILE): $(INFO_FILE_SRC) $(ERL_TOP)/make/$(TARGET)/otp.mk
 	sed -e 's;%RELEASE%;$(SYSTEM_VSN);' $(INFO_FILE_SRC) > $(INFO_FILE)
 
+figures: $(XMLDIR_PNG_FILES)
 
 debug opt:
 
+ldocs: xmllint local_docs
+
 clean:
 	rm -rf $(HTMLDIR)/*
 	rm -rf $(XMLDIR)
@@ -159,6 +210,22 @@ $(SPECDIR)/specs_%.xml:
 	$(gen_verbose)escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
                 -o$(dir $@) -module $(patsubst $(SPECDIR)/specs_%.xml,%,$@)
 
+$(XMLDIR)/%.xml: ../../emulator/internal_doc/%.md $(ERL_TOP)/make/emd2exml
+	$(ERL_TOP)/make/emd2exml $< $@
+
+ref_man.xml: ref_man.xml.src
+	($(PERL) -p -e 's?%ESOCK_USE_SOCKET_XML%?$(ESOCK_USE_SOCKET_XML)?' \
+            $<) > $@
+
+part.xml: part.xml.src
+	($(PERL) -p -e 's?%ESOCK_USE_SOCKET_USAGE_XML%?$(ESOCK_USE_SOCKET_USAGE_XML)?' \
+            $<) > $@
+
+specs.xml: specs.xml.src
+	($(PERL) -p -e 's?%ESOCK_USE_SOCKET_SPECS_XML%?$(ESOCK_USE_SOCKET_SPECS_XML)?' \
+            $<) > $@
+
+
 # ----------------------------------------------------
 # Release Target
 # ----------------------------------------------------
@@ -168,8 +235,11 @@ release_docs_spec: docs
 	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
 	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
 	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
+	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html/figures"
 	$(INSTALL_DATA) $(HTMLDIR)/* \
 		"$(RELSYSDIR)/doc/html"
+	$(INSTALL_DATA) $(XMLDIR)/figures/* \
+		"$(RELSYSDIR)/doc/html/figures"
 	$(INSTALL_DATA) $(ERL_TOP)/erts/example/time_compat.erl \
 		"$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(ERL_TOP)/lib/kernel/examples/gen_tcp_dist/src/gen_tcp_dist.erl \
diff --git a/erts/doc/src/alt_disco.xml b/erts/doc/src/alt_disco.xml
index d04221b9b3..148d6f549e 100644
--- a/erts/doc/src/alt_disco.xml
+++ b/erts/doc/src/alt_disco.xml
@@ -63,7 +63,7 @@
     <seealso marker="kernel:erl_epmd">EPMD module</seealso>. However, instead of
     communicating with EPMD you can connect to any service to find out
     connection details of other nodes. A discovery module is enabled
-    by setting <seealso marker="erts:erl#epmd_module">-epmd_module</seealso>
+    by setting <seealso marker="erts:erl">-epmd_module</seealso>
     when starting erlang. The discovery module must implement the following
     callbacks:</p>
 
diff --git a/erts/doc/src/alt_dist.xml b/erts/doc/src/alt_dist.xml
index e6245130fc..f72e8acd2c 100644
--- a/erts/doc/src/alt_dist.xml
+++ b/erts/doc/src/alt_dist.xml
@@ -60,7 +60,7 @@
 	parts of the logic in Erlang code, and you perhaps do not
 	even need a new driver for the protocol. One example could
 	be Erlang distribution over UDP using <c>gen_udp</c> (your
-	Erlang code will of course have to take care of retranspissions,
+	Erlang code will of course have to take care of retransmissions,
 	etc in this example). That is, depending on what you want
 	to do you perhaps do not need to implement a driver at all
 	and can then skip the driver related sections below.
@@ -680,7 +680,10 @@
 	    of the distribution controller, <c>Received</c>
 	    is received packets, <c>Sent</c> is
 	    sent packets, and <c>PendSend</c> is
-	    amount of packets in queue to be sent
+	    amount of data in queue to be sent
+	    (typically in bytes, but <c>dist_util</c>
+	    only checks whether the value is non-zero
+	    to know there is data in queue)
 	    or a <c>boolean()</c> indicating whether
 	    there are packets in queue to be sent.
 	  </p>
diff --git a/erts/doc/src/atomics.xml b/erts/doc/src/atomics.xml
index 3fca92fb97..455973f011 100644
--- a/erts/doc/src/atomics.xml
+++ b/erts/doc/src/atomics.xml
@@ -23,14 +23,14 @@
 
     <title>atomics</title>
   </header>
-  <module>atomics</module>
+  <module since="OTP 21.2">atomics</module>
   <modulesummary>Atomic Functions</modulesummary>
   <description>
     <p>This module provides a set of functions to do atomic operations towards
     mutable atomic variables. The implementation utilizes only
     atomic hardware instructions without any software level locking, which makes
     it very efficient for concurrent access. The atomics are organized into
-    arrays with the follwing semantics:</p>
+    arrays with the following semantics:</p>
     <list type="bulleted">
       <item>
 	<p>Atomics are 64 bit integers.</p>
@@ -70,7 +70,7 @@
 
   <funcs>
     <func>
-      <name name="new" arity="2"/>
+      <name name="new" arity="2" since="OTP 21.2"/>
       <fsummary>Create atomic array</fsummary>
       <desc>
         <p>Create a new atomic array of <c><anno>Arity</anno></c> atomics.</p>
@@ -85,11 +85,13 @@
 	  bsl 64)-1</c>.</p>
 	  </item>
 	</taglist>
+        <p>Atomics are not tied to the current process and are automatically
+        garbage collected when they are no longer referenced.</p>
       </desc>
     </func>
 
     <func>
-      <name name="put" arity="3"/>
+      <name name="put" arity="3" since="OTP 21.2"/>
       <fsummary>Set atomic value</fsummary>
       <desc>
         <p>Set atomic to <c><anno>Value</anno></c>.</p>
@@ -97,7 +99,7 @@
     </func>
 
     <func>
-      <name name="get" arity="2"/>
+      <name name="get" arity="2" since="OTP 21.2"/>
       <fsummary>Read atomic value</fsummary>
       <desc>
         <p>Read atomic value.</p>
@@ -105,7 +107,7 @@
     </func>
 
     <func>
-      <name name="add" arity="3"/>
+      <name name="add" arity="3" since="OTP 21.2"/>
       <fsummary>Add to atomic</fsummary>
       <desc>
         <p>Add <c><anno>Incr</anno></c> to atomic.</p>
@@ -113,7 +115,7 @@
     </func>
 
     <func>
-      <name name="add_get" arity="3"/>
+      <name name="add_get" arity="3" since="OTP 21.2"/>
       <fsummary>Atomic add and get</fsummary>
       <desc>
         <p>Atomic addition and return of the result.</p>
@@ -121,7 +123,7 @@
     </func>
 
     <func>
-      <name name="sub" arity="3"/>
+      <name name="sub" arity="3" since="OTP 21.2"/>
       <fsummary>Subtract from atomic</fsummary>
       <desc>
         <p>Subtract <c><anno>Decr</anno></c> from atomic.</p>
@@ -129,7 +131,7 @@
     </func>
 
     <func>
-      <name name="sub_get" arity="3"/>
+      <name name="sub_get" arity="3" since="OTP 21.2"/>
       <fsummary>Atomic sub and get</fsummary>
       <desc>
         <p>Atomic subtraction and return of the result.</p>
@@ -137,7 +139,7 @@
     </func>
 
     <func>
-      <name name="exchange" arity="3"/>
+      <name name="exchange" arity="3" since="OTP 21.2"/>
       <fsummary>Atomic exchange.</fsummary>
       <desc>
         <p>Atomically replaces the value of the atomic with
@@ -147,7 +149,7 @@
     </func>
     
     <func>
-    <name name="compare_exchange" arity="4"/>
+    <name name="compare_exchange" arity="4" since="OTP 21.2"/>
        <fsummary>Atomic compare and exchange.</fsummary>
        <desc>
          <p>Atomically compares the atomic with <c><anno>Expected</anno></c>,
@@ -158,7 +160,7 @@
     </func>
     
     <func>
-      <name name="info" arity="1"/>
+      <name name="info" arity="1" since="OTP 21.2"/>
       <fsummary>Get information about atomic array.</fsummary>
       <desc>
         <p>Return information about an atomic array in a map. The map
diff --git a/erts/doc/src/book.xml b/erts/doc/src/book.xml
index a0780c91d9..d79da1e4f7 100644
--- a/erts/doc/src/book.xml
+++ b/erts/doc/src/book.xml
@@ -41,6 +41,9 @@
   <applications>
     <xi:include href="ref_man.xml"/>
   </applications>
+  <internals>
+    <xi:include href="internal.xml"/>
+  </internals>
   <releasenotes>
     <xi:include href="notes.xml"/>
   </releasenotes>
diff --git a/erts/doc/src/communication.xml b/erts/doc/src/communication.xml
index 7e18a73aa8..251b52dc65 100644
--- a/erts/doc/src/communication.xml
+++ b/erts/doc/src/communication.xml
@@ -64,7 +64,7 @@
     a synchronous communication operation consists of two asynchronous
     signals; one request signal and one reply signal. An example of
     such a synchronous communication is a call to
-    <seealso marker="erlang:process_info/2">
+    <seealso marker="erlang#process_info/2">
     <c>erlang:process_info/2</c></seealso>
     when the first argument is not <c>self()</c>. The caller sends
     an asynchronous signal requesting information, and then
diff --git a/erts/doc/src/counters.xml b/erts/doc/src/counters.xml
index ba4a22759f..36816bd68d 100644
--- a/erts/doc/src/counters.xml
+++ b/erts/doc/src/counters.xml
@@ -23,13 +23,13 @@
 
     <title>counters</title>
   </header>
-  <module>counters</module>
+  <module since="OTP 21.2">counters</module>
   <modulesummary>Counter Functions</modulesummary>
   <description>
     <p>This module provides a set of functions to do operations towards
     shared mutable counter variables. The implementation does not utilize any
     software level locking, which makes it very efficient for concurrent
-    access. The counters are organized into arrays with the follwing
+    access. The counters are organized into arrays with the following
     semantics:</p>
     <list type="bulleted">
       <item>
@@ -71,7 +71,7 @@
 
   <funcs>
     <func>
-      <name name="new" arity="2"/>
+      <name name="new" arity="2" since="OTP 21.2"/>
       <fsummary>Create counter array</fsummary>
       <desc>
         <p>Create a new counter array of <c><anno>Size</anno></c> counters.</p>
@@ -80,7 +80,7 @@
 	<taglist>
 	  <tag><c>atomics</c> (Default)</tag>
 	  <item><p>Counters will be sequentially consistent. If write
-	  operation A is done sequencially before write operation B, then a concurrent reader
+	  operation A is done sequentially before write operation B, then a concurrent reader
 	  may see none of them, only A, or both A and B. It cannot see only B.</p>
 	  </item>
 	  <tag><c>write_concurrency</c></tag>
@@ -90,7 +90,7 @@
 	  inconsistency and memory consumption per counter.</p>
 	  <p>Read operations may see sequentially inconsistent results with
 	  regard to concurrent write operations. Even if write operation A is done
-	  sequencially before write operation B, a concurrent reader may see any
+	  sequentially before write operation B, a concurrent reader may see any
 	  combination of A and B, including only B. A read operation is only
 	  guaranteed to see all writes done sequentially before the read. No writes
 	  are ever lost, but will eventually all be seen.</p>
@@ -103,11 +103,13 @@
 	  acceptable.</p>
 	  </item>
 	</taglist>
+        <p>Counters are not tied to the current process and are automatically
+        garbage collected when they are no longer referenced.</p>
       </desc>
     </func>
 
     <func>
-      <name name="get" arity="2"/>
+      <name name="get" arity="2" since="OTP 21.2"/>
       <fsummary>Read counter value</fsummary>
       <desc>
         <p>Read counter value.</p>
@@ -115,7 +117,7 @@
     </func>
 
     <func>
-      <name name="add" arity="3"/>
+      <name name="add" arity="3" since="OTP 21.2"/>
       <fsummary>Add to counter</fsummary>
       <desc>
         <p>Add <c><anno>Incr</anno></c> to counter at index
@@ -124,7 +126,7 @@
     </func>
 
     <func>
-      <name name="sub" arity="3"/>
+      <name name="sub" arity="3" since="OTP 21.2"/>
       <fsummary>Subtract from counter</fsummary>
       <desc>
         <p>Subtract <c><anno>Decr</anno></c> from counter at index
@@ -133,25 +135,25 @@
     </func>
 
     <func>
-      <name name="put" arity="3"/>
+      <name name="put" arity="3" since="OTP 21.2"/>
       <fsummary>Set counter to value</fsummary>
       <desc>
         <p>Write <c><anno>Value</anno></c> to counter at index
 	<c><anno>Ix</anno></c>.</p>
 	<note>
 	  <p>Despite its name, the <c>write_concurrency</c> optimization does not
-	  improve <c>put</c>. A call to <c>put</c> is a relative heavy
+	  improve <c>put</c>. A call to <c>put</c> is a relatively heavy
 	  operation compared to the very lightweight and scalable <seealso
 	  marker="#add/3"><c>add</c></seealso> and <seealso marker="#sub/3">
 	  <c>sub</c></seealso>. The cost for a <c>put</c> with
-	  <c>write_concurrency</c> is lika a <seealso marker="#get/2"><c>get</c>
+	  <c>write_concurrency</c> is like a <seealso marker="#get/2"><c>get</c>
 	  </seealso> plus a <c>put</c> without <c>write_concurrency</c>.</p>
 	</note>
       </desc>
     </func>
 
     <func>
-      <name name="info" arity="1"/>
+      <name name="info" arity="1" since="OTP 21.2"/>
       <fsummary>Get information about counter array.</fsummary>
       <desc>
         <p>Return information about a counter array in a map. The map
diff --git a/erts/doc/src/crash_dump.xml b/erts/doc/src/crash_dump.xml
index a9aeb1888c..876834307a 100644
--- a/erts/doc/src/crash_dump.xml
+++ b/erts/doc/src/crash_dump.xml
@@ -289,8 +289,8 @@ Slogan: &lt;reason&gt;</pre>
     <marker id="memory"></marker>
     <title>Memory Information</title>
     <p>Under the tag <em>=memory</em> is shown information similar
-      to what can be obtainted on a living node with
-      <seealso marker="erts:erlang#erlang:memory/0">
+      to what can be obtained on a living node with
+      <seealso marker="erts:erlang#memory/0">
       <c>erlang:memory()</c></seealso>.</p>
   </section>
 
diff --git a/erts/doc/src/driver.xml b/erts/doc/src/driver.xml
index 8f31df4cad..a873bf9931 100644
--- a/erts/doc/src/driver.xml
+++ b/erts/doc/src/driver.xml
@@ -391,7 +391,7 @@ void encode_result(ei_x_buff* x, PGresult* res, PGconn* conn)
     <p>Before a driver can be called from Erlang, it must be
       loaded and opened. Loading is done using the <c><![CDATA[erl_ddll]]></c>
       module (the <c><![CDATA[erl_ddll]]></c> driver that loads dynamic
-      driver is actually a driver itself). If loading is successfull,
+      driver is actually a driver itself). If loading is successful,
       the port can be opened with <c><![CDATA[open_port/2]]></c>. The port
       name must match the name of the shared library and
       the name in the driver entry structure.</p>
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index 05a9895687..ed1b0880b4 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -460,11 +460,14 @@
       <tag><c><![CDATA[-remsh Node]]></c></tag>
       <item>
         <p>Starts Erlang with a remote shell connected to
-          <c><![CDATA[Node]]></c>.</p>
+          <c><![CDATA[Node]]></c>. Requires either <c><![CDATA[-name]]></c>
+          or <c><![CDATA[-sname]]></c> to be given. If <c><![CDATA[Node]]></c>
+          does not contain a hostname, one is automatically taken from
+          <c><![CDATA[-name]]></c> or <c><![CDATA[-sname]]></c></p>
       </item>
       <tag><c><![CDATA[-rsh Program]]></c></tag>
       <item>
-        <p>Specifies an alternative to <c><![CDATA[rsh]]></c> for starting a
+        <p>Specifies an alternative to <c><![CDATA[ssh]]></c> for starting a
           slave node on a remote host; see
           <seealso marker="stdlib:slave"><c>slave(3)</c></seealso>.</p>
       </item>
@@ -636,6 +639,29 @@
           produces a crash dump. On Unix systems, sending an emulator process
           a <c>SIGUSR1</c> signal also forces a crash dump.</p>
       </item>
+      <tag><marker id="+dcg"/><c><![CDATA[+rg DecentralizedCounterGroupsLimit]]></c></tag>
+      <item>
+        <p>Limits the number of decentralized counter groups used by
+           decentralized counters optimized for update operations in the
+           Erlang runtime system. By default, the limit is 256.</p>
+        <p>When the number of schedulers is less than or equal to the
+           limit, each scheduler has its own group. When the
+           number of schedulers is larger than the groups limit,
+           schedulers share groups. Shared groups degrade
+           the performance for updating counters while many reader groups
+           degrade the performance for reading counters. So, the limit is a tradeoff
+           between performance for update operations and performance for
+           read operations. Each group consumes 64 bytes in each
+           counter.</p>
+        <p>Notice that a runtime system using decentralized
+           counter groups benefits from <seealso marker="#+sbt">binding
+           schedulers to logical processors</seealso>, as the groups are
+           distributed better between schedulers with this option.</p>
+        <p>This option only affects decentralized counters used for
+           the counters that are keeping track of the memory consumption
+           and the number of terms in ETS tables of type ordered_set with
+           the write_concurrency option activated.</p>
+      </item>
       <tag><marker id="+e"/><c><![CDATA[+e Number]]></c></tag>
       <item>
         <p>Sets the maximum number of ETS tables. This limit is
diff --git a/erts/doc/src/erl_dist_protocol.xml b/erts/doc/src/erl_dist_protocol.xml
index c90c8f9521..f924c8a70b 100644
--- a/erts/doc/src/erl_dist_protocol.xml
+++ b/erts/doc/src/erl_dist_protocol.xml
@@ -532,11 +532,7 @@ io:format("old/unused name ~ts at port ~p, fd = ~p ~n",
     <marker id="distribution_handshake"/>
     <title>Distribution Handshake</title>
     <p>This section describes the distribution handshake protocol introduced
-      in Erlang/OTP R6. This description was previously located in
-      <c>$ERL_TOP/lib/kernel/internal_doc/distribution_handshake.txt</c> and
-      has more or less been copied and "formatted" here. It has been almost
-      unchanged since 1999, but the handshake has not changed much since then
-      either.</p>
+      in Erlang/OTP R6. The handshake has remained almost the same since then.</p>
 
     <section>
       <title>General</title>
@@ -847,6 +843,23 @@ DiB == gen_digest(ChA, ICA)?
 	    of the <c>SEND_TT</c> control message.
 	  </p>
         </item>
+        <tag><c>-define(DFLAG_BIG_SEQTRACE_LABELS, 16#100000).</c></tag>
+        <item>
+          <p>The node understands any term as the seqtrace label.</p>
+        </item>
+        <tag><c>-define(DFLAG_EXIT_PAYLOAD, 16#400000).</c></tag>
+        <item>
+          <p>Use the <c>PAYLOAD_EXIT</c>, <c>PAYLOAD_EXIT_TT</c>,
+            <c>PAYLOAD_EXIT2</c>, <c>PAYLOAD_EXIT2_TT</c>
+            and <c>PAYLOAD_MONITOR_P_EXIT</c>
+            <seealso marker="#control_message">control message</seealso>s
+            instead of the non-PAYLOAD variants.</p>
+        </item>
+        <tag><c>-define(DFLAG_FRAGMENTS, 16#800000).</c></tag>
+        <item>
+          <p>Use <seealso marker="erl_ext_dist#fragments">fragmented</seealso>
+            distribution messages to send large messages.</p>
+        </item>
       </taglist>
       <p>
 	There is also function <c>dist_util:strict_order_flags/0</c>
@@ -859,7 +872,7 @@ DiB == gen_digest(ChA, ICA)?
   <section>
     <marker id="connected_nodes"/>
     <title>Protocol between Connected Nodes</title>
-    <p>As from ERTS 5.7.2 the runtime system passes a distribution flag
+    <p>Since ERTS 5.7.2 (OTP R13B) the runtime system passes a distribution flag
       in the handshake stage that enables the use of a
       <seealso marker="erl_ext_dist#distribution_header">distribution header
       </seealso> on all messages passed. Messages passed between nodes have in
@@ -878,7 +891,7 @@ DiB == gen_digest(ChA, ICA)?
         <cell align="center"><c>ControlMessage</c></cell>
         <cell align="center"><c>Message</c></cell>
       </row>
-      <tcaption>Format of Messages Passed between Nodes (as from ERTS 5.7.2)
+      <tcaption>Format of Messages Passed between Nodes (as from ERTS 5.7.2 (OTP R13B))
       </tcaption>
     </table>
 
@@ -887,15 +900,23 @@ DiB == gen_digest(ChA, ICA)?
       <item>
         <p>Equal to d + n + m.</p>
       </item>
+      <tag><c>DistributionHeader</c></tag>
+      <item>
+        <p>
+          <seealso marker="erl_ext_dist#distribution_header">Distribution header
+          describing the atom cache and fragmented distribution messages.
+          </seealso>
+        </p>
+      </item>
       <tag><c>ControlMessage</c></tag>
       <item>
         <p>A tuple passed using the external format of Erlang.</p>
       </item>
       <tag><c>Message</c></tag>
       <item>
-        <p>The message sent to another node using the '!' (in external format).
-          Notice that <c>Message</c> is only passed in combination with a
-          <c>ControlMessage</c> encoding a send ('!').</p>
+        <p>The message sent to another node using the '!'
+          or the reason for a EXIT, EXIT2 or DOWN signal using
+          the external term format.</p>
       </item>
     </taglist>
 
@@ -903,7 +924,7 @@ DiB == gen_digest(ChA, ICA)?
       number is omitted from the terms that follow a distribution header
       </seealso>.</p>
 
-    <p>Nodes with an ERTS version earlier than 5.7.2 does not pass the
+    <p>Nodes with an ERTS version earlier than 5.7.2 (OTP R13B) does not pass the
       distribution flag that enables the distribution header. Messages passed
       between nodes have in this case the following format:</p>
 
@@ -920,7 +941,7 @@ DiB == gen_digest(ChA, ICA)?
         <cell align="center"><c>ControlMessage</c></cell>
         <cell align="center"><c>Message</c></cell>
       </row>
-      <tcaption>Format of Messages Passed between Nodes (before ERTS 5.7.2)
+      <tcaption>Format of Messages Passed between Nodes (before ERTS 5.7.2 (OTP R13B))
       </tcaption>
     </table>
 
@@ -963,6 +984,7 @@ DiB == gen_digest(ChA, ICA)?
       <tag><c>EXIT</c></tag>
       <item>
         <p><c>{3, FromPid, ToPid, Reason}</c></p>
+        <p>This signal is sent when a link has been broken</p>
       </item>
       <tag><c>UNLINK</c></tag>
       <item>
@@ -985,6 +1007,7 @@ DiB == gen_digest(ChA, ICA)?
       <tag><c>EXIT2</c></tag>
       <item>
         <p><c>{8, FromPid, ToPid, Reason}</c></p>
+        <p>This signal is sent by a call to the erlang:exit/2 bif</p>
       </item>
     </taglist>
   </section>
@@ -1007,7 +1030,7 @@ DiB == gen_digest(ChA, ICA)?
         <p><c>{16, FromPid, Unused, ToName, TraceToken}</c></p>
         <p>Followed by <c>Message</c>.</p>
         <p><c>Unused</c> is kept for backward compatibility.</p>
-      </item>      
+      </item>
       <tag><c>EXIT2_TT</c></tag>
       <item>
         <p><c>{18, FromPid, ToPid, TraceToken, Reason}</c></p>
@@ -1061,7 +1084,7 @@ DiB == gen_digest(ChA, ICA)?
         <p><c>{22, FromPid, ToPid}</c></p>
         <p>Followed by <c>Message</c>.</p>
 	<p>
-	  This control messages replace the <c>SEND</c> control
+	  This control message replaces the <c>SEND</c> control
 	  message and will be sent when the distribution flag
 	  <seealso marker="erl_dist_protocol#dflags"><c>DFLAG_SEND_SENDER</c></seealso>
 	  has been negotiated in the connection setup handshake.
@@ -1080,7 +1103,7 @@ DiB == gen_digest(ChA, ICA)?
         <p><c>{23, FromPid, ToPid, TraceToken}</c></p>
         <p>Followed by <c>Message</c>.</p>
 	<p>
-	  This control messages replace the <c>SEND_TT</c> control
+	  This control message replaces the <c>SEND_TT</c> control
 	  message and will be sent when the distribution flag
 	  <seealso marker="erl_dist_protocol#dflags"><c>DFLAG_SEND_SENDER</c></seealso>
 	  has been negotiated in the connection setup handshake.
@@ -1097,4 +1120,72 @@ DiB == gen_digest(ChA, ICA)?
     </taglist>
   </section>
 
+  <section>
+    <title>New Ctrlmessages for Erlang/OTP 22</title>
+    <note><p>
+      Messages encoded before the connection has
+      been set up may still use the non-PAYLOAD variant.
+      However, once a PAYLOAD control message has been sent,
+      no more non-PAYLOAD control messages will be sent in
+      the same direction on the connection.
+    </p></note>
+    <taglist>
+      <tag><c>PAYLOAD_EXIT</c></tag>
+      <item>
+        <p><c>{24, FromPid, ToPid}</c></p>
+        <p>Followed by <c>Reason</c>.</p>
+	<p>
+	  This control message replaces the <c>EXIT</c> control
+	  message and will be sent when the distribution flag
+	  <seealso marker="erl_dist_protocol#dflags"><c>DFLAG_EXIT_PAYLOAD</c></seealso>
+	  has been negotiated in the connection setup handshake.
+	</p>
+      </item>
+      <tag><c>PAYLOAD_EXIT_TT</c></tag>
+      <item>
+        <p><c>{25, FromPid, ToPid}</c></p>
+        <p>Followed by <c>Reason</c>.</p>
+	<p>
+	  This control message replaces the <c>EXIT_TT</c> control
+	  message and will be sent when the distribution flag
+	  <seealso marker="erl_dist_protocol#dflags"><c>DFLAG_EXIT_PAYLOAD</c></seealso>
+	  has been negotiated in the connection setup handshake.
+	</p>
+      </item>
+      <tag><c>PAYLOAD_EXIT2</c></tag>
+      <item>
+        <p><c>{26, FromPid, ToPid}</c></p>
+        <p>Followed by <c>Reason</c>.</p>
+	<p>
+	  This control message replaces the <c>EXIT2</c> control
+	  message and will be sent when the distribution flag
+	  <seealso marker="erl_dist_protocol#dflags"><c>DFLAG_EXIT_PAYLOAD</c></seealso>
+	  has been negotiated in the connection setup handshake.
+	</p>
+      </item>
+      <tag><c>PAYLOAD_EXIT2_TT</c></tag>
+      <item>
+        <p><c>{27, FromPid, ToPid}</c></p>
+        <p>Followed by <c>Reason</c>.</p>
+	<p>
+	  This control message replaces the <c>EXIT2_TT</c> control
+	  message and will be sent when the distribution flag
+	  <seealso marker="erl_dist_protocol#dflags"><c>DFLAG_EXIT_PAYLOAD</c></seealso>
+	  has been negotiated in the connection setup handshake.
+	</p>
+      </item>
+      <tag><c>PAYLOAD_MONITOR_P_EXIT</c></tag>
+      <item>
+        <p><c>{28, FromPid, ToPid, Ref}</c></p>
+        <p>Followed by <c>Reason</c>.</p>
+	<p>
+	  This control message replaces the <c>MONITOR_P_EXIT</c> control
+	  message and will be sent when the distribution flag
+	  <seealso marker="erl_dist_protocol#dflags"><c>DFLAG_EXIT_PAYLOAD</c></seealso>
+	  has been negotiated in the connection setup handshake.
+	</p>
+      </item>
+    </taglist>
+  </section>
+
 </chapter>
diff --git a/erts/doc/src/erl_driver.xml b/erts/doc/src/erl_driver.xml
index 7055889e4a..3e2d3bb447 100644
--- a/erts/doc/src/erl_driver.xml
+++ b/erts/doc/src/erl_driver.xml
@@ -230,7 +230,7 @@
       <item>
         <p>With these functions, the driver sends data back to the emulator.
           The data is received as messages by the port owner process, see
-          <seealso marker="erlang:open_port/2">
+          <seealso marker="erlang#open_port/2">
           <c>erlang:open_port/2</c></seealso>. The vector function and the
           function taking a driver binary are faster, as they avoid
           copying the data buffer. There is also a fast way of sending
@@ -944,7 +944,7 @@ int suggested_stack_size;</code>
 
   <funcs>
     <func>
-      <name><ret>void</ret><nametext>add_driver_entry(ErlDrvEntry
+      <name since=""><ret>void</ret><nametext>add_driver_entry(ErlDrvEntry
         *de)</nametext></name>
       <fsummary>Add a driver entry.</fsummary>
       <desc>
@@ -968,7 +968,7 @@ int suggested_stack_size;</code>
     </func>
 
     <func>
-      <name><ret>void *</ret>
+      <name since=""><ret>void *</ret>
         <nametext>driver_alloc(ErlDrvSizeT size)</nametext></name>
       <fsummary>Allocate memory.</fsummary>
       <desc>
@@ -985,7 +985,7 @@ int suggested_stack_size;</code>
     </func>
 
     <func>
-      <name><ret>ErlDrvBinary *</ret>
+      <name since=""><ret>ErlDrvBinary *</ret>
         <nametext>driver_alloc_binary(ErlDrvSizeT size)</nametext></name>
       <fsummary>Allocate a driver binary.</fsummary>
       <desc>
@@ -1008,7 +1008,7 @@ int suggested_stack_size;</code>
     </func>
 
     <func>
-      <name><ret>long</ret><nametext>driver_async(ErlDrvPort port, unsigned
+      <name since=""><ret>long</ret><nametext>driver_async(ErlDrvPort port, unsigned
         int* key, void (*async_invoke)(void*), void* async_data, void
         (*async_free)(void*))</nametext></name>
       <fsummary>Perform an asynchronous call within a driver.</fsummary>
@@ -1076,7 +1076,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>unsigned int</ret><nametext>driver_async_port_key(ErlDrvPort
+      <name since="OTP R16B02"><ret>unsigned int</ret><nametext>driver_async_port_key(ErlDrvPort
         port)</nametext></name>
       <fsummary>Calculate an async key from an ErlDrvPort.</fsummary>
       <desc>
@@ -1096,7 +1096,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>long</ret>
+      <name since=""><ret>long</ret>
         <nametext>driver_binary_dec_refc(ErlDrvBinary *bin)</nametext></name>
       <fsummary>Decrement the reference count of a driver binary.</fsummary>
       <desc>
@@ -1117,7 +1117,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>long</ret>
+      <name since=""><ret>long</ret>
         <nametext>driver_binary_get_refc(ErlDrvBinary *bin)</nametext></name>
       <fsummary>Get the reference count of a driver binary.</fsummary>
       <desc>
@@ -1128,7 +1128,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>long</ret>
+      <name since=""><ret>long</ret>
         <nametext>driver_binary_inc_refc(ErlDrvBinary *bin)</nametext></name>
       <fsummary>Increment the reference count of a driver binary.</fsummary>
       <desc>
@@ -1140,7 +1140,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>ErlDrvTermData</ret><nametext>driver_caller(ErlDrvPort
+      <name since=""><ret>ErlDrvTermData</ret><nametext>driver_caller(ErlDrvPort
         port)</nametext></name>
       <fsummary>Return the process making the driver call.</fsummary>
       <desc>
@@ -1154,27 +1154,27 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
         <taglist>
           <tag><seealso marker="driver_entry#start">
             <c>start</c></seealso></tag>
-          <item>Called from <seealso marker="erlang:open_port/2">
+          <item>Called from <seealso marker="erlang#open_port/2">
             <c>erlang:open_port/2</c></seealso>.</item>
           <tag><seealso marker="driver_entry#output">
             <c>output</c></seealso></tag>
-          <item>Called from <seealso marker="erlang:send/2">
+          <item>Called from <seealso marker="erlang#send/2">
             <c>erlang:send/2</c></seealso> and
-            <seealso marker="erlang:port_command/2">
+            <seealso marker="erlang#port_command/2">
             <c>erlang:port_command/2</c></seealso>.</item>
           <tag><seealso marker="driver_entry#outputv">
             <c>outputv</c></seealso></tag>
-          <item>Called from <seealso marker="erlang:send/2">
+          <item>Called from <seealso marker="erlang#send/2">
             <c>erlang:send/2</c></seealso> and
-            <seealso marker="erlang:port_command/2">
+            <seealso marker="erlang#port_command/2">
             <c>erlang:port_command/2</c></seealso>.</item>
           <tag><seealso marker="driver_entry#control">
             <c>control</c></seealso></tag>
-          <item>Called from <seealso marker="erlang:port_control/3">
+          <item>Called from <seealso marker="erlang#port_control/3">
             <c>erlang:port_control/3</c></seealso>.</item>
           <tag><seealso marker="driver_entry#call">
             <c>call</c></seealso></tag>
-          <item>Called from <seealso marker="erlang:port_call/3">
+          <item>Called from <seealso marker="erlang#port_call/3">
             <c>erlang:port_call/3</c></seealso>.</item>
         </taglist>
         <p>Notice that this function is <em>not</em> thread-safe, not
@@ -1183,7 +1183,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since=""><ret>int</ret>
         <nametext>driver_cancel_timer(ErlDrvPort port)</nametext></name>
       <fsummary>Cancel a previously set timer.</fsummary>
       <desc>
@@ -1196,7 +1196,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>driver_compare_monitors(const ErlDrvMonitor
+      <name since=""><ret>int</ret><nametext>driver_compare_monitors(const ErlDrvMonitor
         *monitor1, const ErlDrvMonitor *monitor2)</nametext></name>
       <fsummary>Compare two monitors.</fsummary>
       <desc>
@@ -1211,7 +1211,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>ErlDrvTermData</ret><nametext>driver_connected(ErlDrvPort
+      <name since=""><ret>ErlDrvTermData</ret><nametext>driver_connected(ErlDrvPort
         port)</nametext></name>
       <fsummary>Return the port owner process.</fsummary>
       <desc>
@@ -1223,7 +1223,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>ErlDrvPort</ret><nametext>driver_create_port(ErlDrvPort port,
+      <name since=""><ret>ErlDrvPort</ret><nametext>driver_create_port(ErlDrvPort port,
         ErlDrvTermData owner_pid, char* name,
         ErlDrvData drv_data)</nametext></name>
       <fsummary>Create a new port (driver instance).</fsummary>
@@ -1269,7 +1269,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>driver_demonitor_process(ErlDrvPort port,
+      <name since=""><ret>int</ret><nametext>driver_demonitor_process(ErlDrvPort port,
         const ErlDrvMonitor *monitor)</nametext></name>
       <fsummary>Stop monitoring a process from a driver.</fsummary>
       <desc>
@@ -1281,7 +1281,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>ErlDrvSizeT</ret><nametext>driver_deq(ErlDrvPort port,
+      <name since=""><ret>ErlDrvSizeT</ret><nametext>driver_deq(ErlDrvPort port,
         ErlDrvSizeT size)</nametext></name>
       <fsummary>Dequeue data from the head of the driver queue.</fsummary>
       <desc>
@@ -1299,7 +1299,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>driver_enq(ErlDrvPort port, char* buf,
+      <name since=""><ret>int</ret><nametext>driver_enq(ErlDrvPort port, char* buf,
         ErlDrvSizeT len)</nametext></name>
       <fsummary>Enqueue data in the driver queue.</fsummary>
       <desc>
@@ -1325,7 +1325,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>driver_enq_bin(ErlDrvPort port,
+      <name since=""><ret>int</ret><nametext>driver_enq_bin(ErlDrvPort port,
         ErlDrvBinary *bin, ErlDrvSizeT offset, ErlDrvSizeT len)</nametext>
       </name>
       <fsummary>Enqueue binary in the driver queue.</fsummary>
@@ -1346,7 +1346,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>driver_enqv(ErlDrvPort port, ErlIOVec *ev,
+      <name since=""><ret>int</ret><nametext>driver_enqv(ErlDrvPort port, ErlIOVec *ev,
         ErlDrvSizeT skip)</nametext></name>
       <fsummary>Enqueue vector in the driver queue.</fsummary>
       <desc>
@@ -1365,11 +1365,11 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>driver_failure(ErlDrvPort port, int
+      <name since=""><ret>int</ret><nametext>driver_failure(ErlDrvPort port, int
         error)</nametext></name>
-      <name><ret>int</ret><nametext>driver_failure_atom(ErlDrvPort port, char
+      <name since=""><ret>int</ret><nametext>driver_failure_atom(ErlDrvPort port, char
         *string)</nametext></name>
-      <name><ret>int</ret><nametext>driver_failure_posix(ErlDrvPort port, int
+      <name since=""><ret>int</ret><nametext>driver_failure_posix(ErlDrvPort port, int
         error)</nametext></name>
       <fsummary>Fail with error.</fsummary>
       <desc>
@@ -1393,7 +1393,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>driver_failure_eof(ErlDrvPort
+      <name since=""><ret>int</ret><nametext>driver_failure_eof(ErlDrvPort
         port)</nametext></name>
       <fsummary>Fail with EOF.</fsummary>
       <desc>
@@ -1408,7 +1408,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>driver_free(void *ptr)</nametext></name>
+      <name since=""><ret>void</ret><nametext>driver_free(void *ptr)</nametext></name>
       <fsummary>Free an allocated memory block.</fsummary>
       <desc>
         <marker id="driver_free"></marker>
@@ -1422,7 +1422,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>void</ret>
+      <name since=""><ret>void</ret>
         <nametext>driver_free_binary(ErlDrvBinary *bin)</nametext></name>
       <fsummary>Free a driver binary.</fsummary>
       <desc>
@@ -1436,7 +1436,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>ErlDrvTermData</ret>
+      <name since=""><ret>ErlDrvTermData</ret>
         <nametext>driver_get_monitored_process(ErlDrvPort port, const
         ErlDrvMonitor *monitor)</nametext></name>
       <fsummary>Retrieve the process ID from a monitor.</fsummary>
@@ -1452,7 +1452,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since=""><ret>int</ret>
         <nametext>driver_get_now(ErlDrvNowData *now)</nametext></name>
       <fsummary>Read a system time stamp.</fsummary>
       <desc>
@@ -1473,7 +1473,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>driver_lock_driver(ErlDrvPort
+      <name since=""><ret>int</ret><nametext>driver_lock_driver(ErlDrvPort
         port)</nametext></name>
       <fsummary>Ensure the driver is never unloaded.</fsummary>
       <desc>
@@ -1486,7 +1486,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>ErlDrvTermData</ret><nametext>driver_mk_atom(char*
+      <name since=""><ret>ErlDrvTermData</ret><nametext>driver_mk_atom(char*
         string)</nametext></name>
       <fsummary>Make an atom from a name.</fsummary>
       <desc>
@@ -1501,7 +1501,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>ErlDrvTermData</ret><nametext>driver_mk_port(ErlDrvPort
+      <name since=""><ret>ErlDrvTermData</ret><nametext>driver_mk_port(ErlDrvPort
         port)</nametext></name>
       <fsummary>Make an Erlang term port from a port.</fsummary>
       <desc>
@@ -1517,7 +1517,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>driver_monitor_process(ErlDrvPort port,
+      <name since=""><ret>int</ret><nametext>driver_monitor_process(ErlDrvPort port,
         ErlDrvTermData process, ErlDrvMonitor *monitor)</nametext></name>
       <fsummary>Monitor a process from a driver.</fsummary>
       <desc>
@@ -1540,7 +1540,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>driver_output(ErlDrvPort port, char *buf,
+      <name since=""><ret>int</ret><nametext>driver_output(ErlDrvPort port, char *buf,
         ErlDrvSizeT len)</nametext></name>
       <fsummary>Send data from driver to port owner.</fsummary>
       <desc>
@@ -1560,7 +1560,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>driver_output_binary(ErlDrvPort port, char
+      <name since=""><ret>int</ret><nametext>driver_output_binary(ErlDrvPort port, char
         *hbuf, ErlDrvSizeT hlen, ErlDrvBinary* bin, ErlDrvSizeT offset,
         ErlDrvSizeT len)</nametext></name>
       <fsummary>Send data from a driver binary to port owner.</fsummary>
@@ -1589,7 +1589,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>driver_output_term(ErlDrvPort port,
+      <name since=""><ret>int</ret><nametext>driver_output_term(ErlDrvPort port,
         ErlDrvTermData* term, int n)</nametext></name>
       <fsummary>Send term data from driver to port owner.</fsummary>
       <desc>
@@ -1608,7 +1608,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>driver_output2(ErlDrvPort port, char *hbuf,
+      <name since=""><ret>int</ret><nametext>driver_output2(ErlDrvPort port, char *hbuf,
         ErlDrvSizeT hlen, char *buf, ErlDrvSizeT len)</nametext></name>
       <fsummary>Send data and binary data to port owner.</fsummary>
       <desc>
@@ -1625,7 +1625,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>driver_outputv(ErlDrvPort port, char* hbuf,
+      <name since=""><ret>int</ret><nametext>driver_outputv(ErlDrvPort port, char* hbuf,
         ErlDrvSizeT hlen, ErlIOVec *ev, ErlDrvSizeT skip)</nametext></name>
       <fsummary>Send vectorized data to port owner.</fsummary>
       <desc>
@@ -1654,7 +1654,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>ErlDrvPDL</ret>
+      <name since=""><ret>ErlDrvPDL</ret>
         <nametext>driver_pdl_create(ErlDrvPort port)</nametext></name>
       <fsummary>Create a port data lock.</fsummary>
       <desc>
@@ -1672,7 +1672,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>long</ret><nametext>driver_pdl_dec_refc(ErlDrvPDL
+      <name since=""><ret>long</ret><nametext>driver_pdl_dec_refc(ErlDrvPDL
         pdl)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -1686,7 +1686,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>long</ret>
+      <name since=""><ret>long</ret>
         <nametext>driver_pdl_get_refc(ErlDrvPDL pdl)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -1698,7 +1698,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>long</ret>
+      <name since=""><ret>long</ret>
         <nametext>driver_pdl_inc_refc(ErlDrvPDL pdl)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -1712,7 +1712,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>void</ret>
+      <name since=""><ret>void</ret>
         <nametext>driver_pdl_lock(ErlDrvPDL pdl)</nametext></name>
       <fsummary>Lock port data lock.</fsummary>
       <desc>
@@ -1723,7 +1723,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>void</ret>
+      <name since=""><ret>void</ret>
         <nametext>driver_pdl_unlock(ErlDrvPDL pdl)</nametext></name>
       <fsummary>Unlock port data lock.</fsummary>
       <desc>
@@ -1734,7 +1734,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>SysIOVec *</ret><nametext>driver_peekq(ErlDrvPort port, int
+      <name since=""><ret>SysIOVec *</ret><nametext>driver_peekq(ErlDrvPort port, int
         *vlen)</nametext></name>
       <fsummary>Get the driver queue as a vector.</fsummary>
       <desc>
@@ -1755,7 +1755,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>ErlDrvSizeT</ret><nametext>driver_peekqv(ErlDrvPort port,
+      <name since="OTP R15B"><ret>ErlDrvSizeT</ret><nametext>driver_peekqv(ErlDrvPort port,
         ErlIOVec *ev)</nametext></name>
       <fsummary>Get the driver queue as an I/O vector.</fsummary>
       <desc>
@@ -1775,7 +1775,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>driver_pushq(ErlDrvPort port, char* buf,
+      <name since=""><ret>int</ret><nametext>driver_pushq(ErlDrvPort port, char* buf,
         ErlDrvSizeT len)</nametext></name>
       <fsummary>Push data at the head of the driver queue.</fsummary>
       <desc>
@@ -1792,7 +1792,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>driver_pushq_bin(ErlDrvPort port,
+      <name since=""><ret>int</ret><nametext>driver_pushq_bin(ErlDrvPort port,
         ErlDrvBinary *bin, ErlDrvSizeT offset, ErlDrvSizeT len)</nametext>
       </name>
       <fsummary>Push binary at the head of the driver queue.</fsummary>
@@ -1812,7 +1812,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>driver_pushqv(ErlDrvPort port, ErlIOVec
+      <name since=""><ret>int</ret><nametext>driver_pushqv(ErlDrvPort port, ErlIOVec
         *ev, ErlDrvSizeT skip)</nametext></name>
       <fsummary>Push vector at the head of the driver queue.</fsummary>
       <desc>
@@ -1831,7 +1831,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>driver_read_timer(ErlDrvPort port, unsigned
+      <name since=""><ret>int</ret><nametext>driver_read_timer(ErlDrvPort port, unsigned
         long *time_left)</nametext></name>
       <fsummary>Read the time left before time-out.</fsummary>
       <desc>
@@ -1844,7 +1844,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>void *</ret>
+      <name since=""><ret>void *</ret>
         <nametext>driver_realloc(void *ptr, ErlDrvSizeT size)</nametext></name>
       <fsummary>Resize an allocated memory block.</fsummary>
       <desc>
@@ -1859,7 +1859,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>ErlDrvBinary *</ret>
+      <name since=""><ret>ErlDrvBinary *</ret>
         <nametext>driver_realloc_binary(ErlDrvBinary *bin, ErlDrvSizeT size)
         </nametext></name>
       <fsummary>Resize a driver binary.</fsummary>
@@ -1873,7 +1873,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>driver_select(ErlDrvPort port, ErlDrvEvent
+      <name since=""><ret>int</ret><nametext>driver_select(ErlDrvPort port, ErlDrvEvent
         event, int mode, int on)</nametext></name>
       <fsummary>Provides an event for having the emulator call the driver.
       </fsummary>
@@ -1932,7 +1932,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>driver_send_term(ErlDrvPort port,
+      <name since=""><ret>int</ret><nametext>driver_send_term(ErlDrvPort port,
         ErlDrvTermData receiver, ErlDrvTermData* term, int n)</nametext></name>
       <fsummary>Send term data to other process than port owner process.
       </fsummary>
@@ -1958,7 +1958,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>driver_set_timer(ErlDrvPort port, unsigned
+      <name since=""><ret>int</ret><nametext>driver_set_timer(ErlDrvPort port, unsigned
         long time)</nametext></name>
       <fsummary>Set a timer to call the driver.</fsummary>
       <desc>
@@ -1977,7 +1977,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>ErlDrvSizeT</ret>
+      <name since=""><ret>ErlDrvSizeT</ret>
         <nametext>driver_sizeq(ErlDrvPort port)</nametext></name>
       <fsummary>Return the size of the driver queue.</fsummary>
       <desc>
@@ -1991,7 +1991,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>driver_system_info(ErlDrvSysInfo
+      <name since=""><ret>void</ret><nametext>driver_system_info(ErlDrvSysInfo
         *sys_info_ptr, size_t size)</nametext></name>
       <fsummary>Get information about the Erlang runtime system.</fsummary>
       <desc>
@@ -2008,7 +2008,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>ErlDrvSizeT</ret><nametext>driver_vec_to_buf(ErlIOVec *ev,
+      <name since=""><ret>ErlDrvSizeT</ret><nametext>driver_vec_to_buf(ErlIOVec *ev,
         char *buf, ErlDrvSizeT len)</nametext></name>
       <fsummary>Collect data segments into a buffer.</fsummary>
       <desc>
@@ -2029,7 +2029,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_drv_busy_msgq_limits(ErlDrvPort port,
+      <name since="OTP R16B"><ret>void</ret><nametext>erl_drv_busy_msgq_limits(ErlDrvPort port,
         ErlDrvSizeT *low, ErlDrvSizeT *high)</nametext></name>
       <fsummary>Set and get limits for busy port message queue.</fsummary>
       <desc>
@@ -2083,7 +2083,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_drv_cond_broadcast(ErlDrvCond
+      <name since=""><ret>void</ret><nametext>erl_drv_cond_broadcast(ErlDrvCond
         *cnd)</nametext></name>
       <fsummary>Broadcast on a condition variable.</fsummary>
       <desc>
@@ -2097,7 +2097,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>ErlDrvCond *</ret><nametext>erl_drv_cond_create(char
+      <name since=""><ret>ErlDrvCond *</ret><nametext>erl_drv_cond_create(char
         *name)</nametext></name>
       <fsummary>Create a condition variable.</fsummary>
       <desc>
@@ -2114,7 +2114,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_drv_cond_destroy(ErlDrvCond
+      <name since=""><ret>void</ret><nametext>erl_drv_cond_destroy(ErlDrvCond
         *cnd)</nametext></name>
       <fsummary>Destroy a condition variable.</fsummary>
       <desc>
@@ -2128,7 +2128,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>char *</ret><nametext>erl_drv_cond_name(ErlDrvCond
+      <name since="OTP R16B02"><ret>char *</ret><nametext>erl_drv_cond_name(ErlDrvCond
         *cnd)</nametext></name>
       <fsummary>Get name of driver mutex.</fsummary>
       <desc>
@@ -2142,7 +2142,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_drv_cond_signal(ErlDrvCond
+      <name since=""><ret>void</ret><nametext>erl_drv_cond_signal(ErlDrvCond
         *cnd)</nametext></name>
       <fsummary>Signal on a condition variable.</fsummary>
       <desc>
@@ -2156,7 +2156,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_drv_cond_wait(ErlDrvCond *cnd,
+      <name since=""><ret>void</ret><nametext>erl_drv_cond_wait(ErlDrvCond *cnd,
         ErlDrvMutex *mtx)</nametext></name>
       <fsummary>Wait on a condition variable.</fsummary>
       <desc>
@@ -2185,7 +2185,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_drv_consume_timeslice(ErlDrvPort port,
+      <name since="OTP R16B"><ret>int</ret><nametext>erl_drv_consume_timeslice(ErlDrvPort port,
         int percent)</nametext></name>
       <fsummary>Give the runtime system a hint about how much CPU time the
         current driver callback call has consumed.</fsummary>
@@ -2228,7 +2228,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>ErlDrvTime</ret><nametext>erl_drv_convert_time_unit(ErlDrvTime
+      <name since="OTP 18.3"><ret>ErlDrvTime</ret><nametext>erl_drv_convert_time_unit(ErlDrvTime
         val, ErlDrvTimeUnit from, ErlDrvTimeUnit to)</nametext></name>
       <fsummary>Convert time unit of a time value.</fsummary>
       <desc>
@@ -2254,7 +2254,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_drv_equal_tids(ErlDrvTid tid1,
+      <name since=""><ret>int</ret><nametext>erl_drv_equal_tids(ErlDrvTid tid1,
         ErlDrvTid tid2)</nametext></name>
       <fsummary>Compare thread identifiers for equality.</fsummary>
       <desc>
@@ -2276,7 +2276,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_drv_getenv(const char *key, char
+      <name since=""><ret>int</ret><nametext>erl_drv_getenv(const char *key, char
         *value, size_t *value_size)</nametext></name>
       <fsummary>Get the value of an environment variable.</fsummary>
       <desc>
@@ -2305,7 +2305,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
           <c>*value_size</c> has been set to the buffer size needed.</p>
         <warning>
           <p>This function reads the emulated environment used by
-            <seealso marker="os:getenv/1"><c>os:getenv/1</c></seealso> and not
+            <seealso marker="kernel: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;
@@ -2317,7 +2317,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_drv_init_ack(ErlDrvPort port,
+      <name since="OTP 19.0"><ret>void</ret><nametext>erl_drv_init_ack(ErlDrvPort port,
         ErlDrvData res)</nametext></name>
       <fsummary>Acknowledge the start of the port.</fsummary>
       <desc>
@@ -2345,7 +2345,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>ErlDrvTime</ret>
+      <name since="OTP 18.3"><ret>ErlDrvTime</ret>
         <nametext>erl_drv_monotonic_time(ErlDrvTimeUnit time_unit)</nametext>
       </name>
       <fsummary>Get Erlang monotonic time.</fsummary>
@@ -2365,7 +2365,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>ErlDrvMutex *</ret><nametext>erl_drv_mutex_create(char
+      <name since=""><ret>ErlDrvMutex *</ret><nametext>erl_drv_mutex_create(char
         *name)</nametext></name>
       <fsummary>Create a mutex.</fsummary>
       <desc>
@@ -2380,7 +2380,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_drv_mutex_destroy(ErlDrvMutex
+      <name since=""><ret>void</ret><nametext>erl_drv_mutex_destroy(ErlDrvMutex
         *mtx)</nametext></name>
       <fsummary>Destroy a mutex.</fsummary>
       <desc>
@@ -2395,7 +2395,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_drv_mutex_lock(ErlDrvMutex
+      <name since=""><ret>void</ret><nametext>erl_drv_mutex_lock(ErlDrvMutex
         *mtx)</nametext></name>
       <fsummary>Lock a mutex.</fsummary>
       <desc>
@@ -2414,7 +2414,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>char *</ret><nametext>erl_drv_mutex_name(ErlDrvMutex
+      <name since="OTP R16B02"><ret>char *</ret><nametext>erl_drv_mutex_name(ErlDrvMutex
         *mtx)</nametext></name>
       <fsummary>Get name of driver mutex.</fsummary>
       <desc>
@@ -2428,7 +2428,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_drv_mutex_trylock(ErlDrvMutex
+      <name since=""><ret>int</ret><nametext>erl_drv_mutex_trylock(ErlDrvMutex
         *mtx)</nametext></name>
       <fsummary>Try lock a mutex.</fsummary>
       <desc>
@@ -2447,7 +2447,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_drv_mutex_unlock(ErlDrvMutex
+      <name since=""><ret>void</ret><nametext>erl_drv_mutex_unlock(ErlDrvMutex
         *mtx)</nametext></name>
       <fsummary>Unlock a mutex.</fsummary>
       <desc>
@@ -2460,7 +2460,7 @@ r = driver_async(myPort, &myKey, myData, myFunc);    ]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_drv_output_term(ErlDrvTermData port,
+      <name since="OTP R16B"><ret>int</ret><nametext>erl_drv_output_term(ErlDrvTermData port,
         ErlDrvTermData* term, int n)</nametext></name>
       <fsummary>Send term data from driver to port owner.</fsummary>
       <desc>
@@ -2637,7 +2637,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_drv_putenv(const char *key, char
+      <name since=""><ret>int</ret><nametext>erl_drv_putenv(const char *key, char
         *value)</nametext></name>
       <fsummary>Set the value of an environment variable.</fsummary>
       <desc>
@@ -2656,7 +2656,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
         </note>
         <warning>
           <p>This function modifies the emulated environment used by
-            <seealso marker="os:putenv/2"><c>os:putenv/2</c></seealso> and not
+            <seealso marker="kernel: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;
@@ -2668,7 +2668,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>ErlDrvRWLock *</ret><nametext>erl_drv_rwlock_create(char
+      <name since=""><ret>ErlDrvRWLock *</ret><nametext>erl_drv_rwlock_create(char
         *name)</nametext></name>
       <fsummary>Create an rwlock.</fsummary>
       <desc>
@@ -2684,7 +2684,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_drv_rwlock_destroy(ErlDrvRWLock
+      <name since=""><ret>void</ret><nametext>erl_drv_rwlock_destroy(ErlDrvRWLock
         *rwlck)</nametext></name>
       <fsummary>Destroy an rwlock.</fsummary>
       <desc>
@@ -2699,7 +2699,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>char *</ret><nametext>erl_drv_rwlock_name(ErlDrvRWLock
+      <name since="OTP R16B02"><ret>char *</ret><nametext>erl_drv_rwlock_name(ErlDrvRWLock
         *rwlck)</nametext></name>
       <fsummary>Get name of driver mutex.</fsummary>
       <desc>
@@ -2713,7 +2713,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_drv_rwlock_rlock(ErlDrvRWLock
+      <name since=""><ret>void</ret><nametext>erl_drv_rwlock_rlock(ErlDrvRWLock
         *rwlck)</nametext></name>
       <fsummary>Read lock an rwlock.</fsummary>
       <desc>
@@ -2733,7 +2733,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_drv_rwlock_runlock(ErlDrvRWLock
+      <name since=""><ret>void</ret><nametext>erl_drv_rwlock_runlock(ErlDrvRWLock
         *rwlck)</nametext></name>
       <fsummary>Read unlock an rwlock.</fsummary>
       <desc>
@@ -2746,7 +2746,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_drv_rwlock_rwlock(ErlDrvRWLock
+      <name since=""><ret>void</ret><nametext>erl_drv_rwlock_rwlock(ErlDrvRWLock
         *rwlck)</nametext></name>
       <fsummary>Read/write lock an rwlock.</fsummary>
       <desc>
@@ -2766,7 +2766,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_drv_rwlock_rwunlock(ErlDrvRWLock
+      <name since=""><ret>void</ret><nametext>erl_drv_rwlock_rwunlock(ErlDrvRWLock
         *rwlck)</nametext></name>
       <fsummary>Read/write unlock an rwlock.</fsummary>
       <desc>
@@ -2779,7 +2779,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_drv_rwlock_tryrlock(ErlDrvRWLock
+      <name since=""><ret>int</ret><nametext>erl_drv_rwlock_tryrlock(ErlDrvRWLock
         *rwlck)</nametext></name>
       <fsummary>Try to read lock an rwlock.</fsummary>
       <desc>
@@ -2799,7 +2799,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_drv_rwlock_tryrwlock(ErlDrvRWLock
+      <name since=""><ret>int</ret><nametext>erl_drv_rwlock_tryrwlock(ErlDrvRWLock
         *rwlck)</nametext></name>
       <fsummary>Try to read/write lock an rwlock.</fsummary>
       <desc>
@@ -2819,7 +2819,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_drv_send_term(ErlDrvTermData port,
+      <name since="OTP R16B"><ret>int</ret><nametext>erl_drv_send_term(ErlDrvTermData port,
         ErlDrvTermData receiver, ErlDrvTermData* term, int n)</nametext></name>
       <fsummary>Send term data to other process than port owner process.
       </fsummary>
@@ -2843,13 +2843,13 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_drv_set_os_pid(ErlDrvPort port,
+      <name since="OTP 19.0"><ret>void</ret><nametext>erl_drv_set_os_pid(ErlDrvPort port,
         ErlDrvSInt pid)</nametext></name>
       <fsummary>Set the os_pid for the port.</fsummary>
       <desc>
         <marker id="erl_drv_set_os_pid"></marker>
         <p>Sets the <c>os_pid</c> seen when doing
-          <seealso marker="erlang:port_info/2">
+          <seealso marker="erlang#port_info/2">
           <c>erlang:port_info/2</c></seealso> on this port.</p>
         <p><c>port</c> is the port handle of the port (driver instance) to set
           the pid on. <c>pid</c>is the pid to set.</p>
@@ -2857,7 +2857,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_drv_thread_create(char *name, ErlDrvTid
+      <name since=""><ret>int</ret><nametext>erl_drv_thread_create(char *name, ErlDrvTid
         *tid, void * (*func)(void *), void *arg, ErlDrvThreadOpts
         *opts)</nametext></name>
       <fsummary>Create a thread.</fsummary>
@@ -2920,7 +2920,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_drv_thread_exit(void
+      <name since=""><ret>void</ret><nametext>erl_drv_thread_exit(void
         *exit_value)</nametext></name>
       <fsummary>Terminate calling thread.</fsummary>
       <desc>
@@ -2939,7 +2939,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_drv_thread_join(ErlDrvTid tid, void
+      <name since=""><ret>int</ret><nametext>erl_drv_thread_join(ErlDrvTid tid, void
         **exit_value)</nametext></name>
       <fsummary>Join with another thread.</fsummary>
       <desc>
@@ -2962,7 +2962,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>char *</ret><nametext>erl_drv_thread_name(ErlDrvTid
+      <name since="OTP R16B02"><ret>char *</ret><nametext>erl_drv_thread_name(ErlDrvTid
         tid)</nametext></name>
       <fsummary>Get name of driver mutex.</fsummary>
       <desc>
@@ -2976,7 +2976,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>ErlDrvThreadOpts *</ret>
+      <name since=""><ret>ErlDrvThreadOpts *</ret>
         <nametext>erl_drv_thread_opts_create(char *name)</nametext></name>
       <fsummary>Create thread options.</fsummary>
       <desc>
@@ -3005,7 +3005,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>void</ret>
+      <name since=""><ret>void</ret>
         <nametext>erl_drv_thread_opts_destroy(ErlDrvThreadOpts *opts)</nametext>
       </name>
       <fsummary>Destroy thread options.</fsummary>
@@ -3020,7 +3020,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>ErlDrvTid</ret>
+      <name since=""><ret>ErlDrvTid</ret>
         <nametext>erl_drv_thread_self(void)</nametext></name>
       <fsummary>Get the thread identifier of the current thread.</fsummary>
       <desc>
@@ -3031,7 +3031,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>ErlDrvTime</ret><nametext>erl_drv_time_offset(ErlDrvTimeUnit
+      <name since="OTP 18.3"><ret>ErlDrvTime</ret><nametext>erl_drv_time_offset(ErlDrvTimeUnit
         time_unit)</nametext></name>
       <fsummary>Get current time offset.</fsummary>
       <desc>
@@ -3054,7 +3054,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>void *</ret><nametext>erl_drv_tsd_get(ErlDrvTSDKey
+      <name since=""><ret>void *</ret><nametext>erl_drv_tsd_get(ErlDrvTSDKey
         key)</nametext></name>
       <fsummary>Get thread-specific data.</fsummary>
       <desc>
@@ -3069,7 +3069,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_drv_tsd_key_create(char *name,
+      <name since=""><ret>int</ret><nametext>erl_drv_tsd_key_create(char *name,
         ErlDrvTSDKey *key)</nametext></name>
       <fsummary>Create a thread-specific data key.</fsummary>
       <desc>
@@ -3086,7 +3086,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_drv_tsd_key_destroy(ErlDrvTSDKey
+      <name since=""><ret>void</ret><nametext>erl_drv_tsd_key_destroy(ErlDrvTSDKey
         key)</nametext></name>
       <fsummary>Destroy a thread-specific data key.</fsummary>
       <desc>
@@ -3111,7 +3111,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_drv_tsd_set(ErlDrvTSDKey key, void
+      <name since=""><ret>void</ret><nametext>erl_drv_tsd_set(ErlDrvTSDKey key, void
         *data)</nametext></name>
       <fsummary>Set thread-specific data.</fsummary>
       <desc>
@@ -3138,7 +3138,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>char *</ret><nametext>erl_errno_id(int error)</nametext></name>
+      <name since=""><ret>char *</ret><nametext>erl_errno_id(int error)</nametext></name>
       <fsummary>Get Erlang error atom name from error number.</fsummary>
       <desc>
         <marker id="erl_errno_id"></marker>
@@ -3150,7 +3150,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>remove_driver_entry(ErlDrvEntry
+      <name since=""><ret>int</ret><nametext>remove_driver_entry(ErlDrvEntry
         *de)</nametext></name>
       <fsummary>Remove a driver entry.</fsummary>
       <desc>
@@ -3164,7 +3164,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>set_busy_port(ErlDrvPort port, int
+      <name since=""><ret>void</ret><nametext>set_busy_port(ErlDrvPort port, int
         on)</nametext></name>
       <fsummary>Signal or unsignal port as busy.</fsummary>
       <desc>
@@ -3195,7 +3195,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>set_port_control_flags(ErlDrvPort port,
+      <name since=""><ret>void</ret><nametext>set_port_control_flags(ErlDrvPort port,
         int flags)</nametext></name>
       <fsummary>Set flags on how to handle control entry function.</fsummary>
       <desc>
@@ -3204,7 +3204,7 @@ erl_drv_output_term(driver_mk_port(drvport), spec, sizeof(spec) / sizeof(spec[0]
           <c>control</c></seealso> driver entry
           function will return data to the port owner process.
           (The <c>control</c> function is called from
-          <seealso marker="erlang:port_control/3">
+          <seealso marker="erlang#port_control/3">
           <c>erlang:port_control/3</c></seealso>.)</p>
         <p>Currently there are only two meaningful values for
           <c>flags</c>: <c>0</c> means that data is returned in a list,
diff --git a/erts/doc/src/erl_ext_dist.xml b/erts/doc/src/erl_ext_dist.xml
index b7090d0472..2ba5994557 100644
--- a/erts/doc/src/erl_ext_dist.xml
+++ b/erts/doc/src/erl_ext_dist.xml
@@ -128,7 +128,7 @@
 	are deprecated and are only kept for backward
 	compatibility when decoding terms encoded by older nodes.</p>
       <p>Support for UTF-8 encoded atoms in the external format has been
-        available since ERTS 5.10 (OTP R16). This abillity allows such old nodes
+        available since ERTS 5.10 (OTP R16). This ability allows such old nodes
 	to decode, store and encode any Unicode atoms received from a new OTP 20
         node.</p>
       <p>The maximum number of allowed characters in an atom is 255. In the
@@ -136,172 +136,370 @@
     </note>
   </section>
 
-  <section>  
+  <section>
+    <marker id="distribution_header"/>
     <title>Distribution Header</title>
     <p>
-      <marker id="distribution_header"/>
-      As from ERTS 5.7.2 the old atom cache protocol was
-      dropped and a new one was introduced. This protocol
-      introduced the distribution header. Nodes with an ERTS version
-      earlier than 5.7.2 can still communicate with new nodes,
-      but no distribution header and no atom cache are used.</p>
-    <p>
-      The distribution header only contains an atom cache
-      reference section, but can in the future contain more
-      information. The distribution header precedes one or more Erlang
-      terms on the external format. For more information, see the
-      documentation of the
+      The distribution header is sent by the erlang distribution to
+      carry metadata about the coming
+      <seealso marker="erl_dist_protocol#control_message">control message</seealso>
+      and potential payload. It is primarily used to handle the atom cache
+      in the Erlang distribution. Since OTP-22 it is also used to fragment
+      large distribution messages into multiple smaller fragments.
+      For more information about how the distribution uses the distribution header,
+      see the documentation of the
       <seealso marker="erl_dist_protocol#connected_nodes">protocol between
       connected nodes</seealso> in the
       <seealso marker="erl_dist_protocol">distribution protocol</seealso>
       documentation.
     </p>
     <p>
-      <seealso marker="#ATOM_CACHE_REF">ATOM_CACHE_REF</seealso>
+      Any <seealso marker="#ATOM_CACHE_REF">ATOM_CACHE_REF</seealso>
       entries with corresponding <c>AtomCacheReferenceIndex</c> in terms
       encoded on the external format following a distribution header refer
       to the atom cache references made in the distribution header. The range
       is 0 &lt;= <c>AtomCacheReferenceIndex</c> &lt; 255, that is, at most 255
       different atom cache references from the following terms can be made.
     </p>
-    <p>
-      The distribution header format is as follows:
-    </p>
-    <table align="left">
-      <row>
-        <cell align="center">1</cell>
-        <cell align="center">1</cell>
-        <cell align="center">1</cell>
-        <cell align="center">NumberOfAtomCacheRefs/2+1 | 0</cell>
-        <cell align="center">N | 0</cell>
-      </row>
-      <row>
-        <cell align="center"><c>131</c></cell>
-        <cell align="center"><c>68</c></cell>
-        <cell align="center"><c>NumberOfAtomCacheRefs</c></cell>
-        <cell align="center"><c>Flags</c></cell>
-        <cell align="center"><c>AtomCacheRefs</c></cell>
-      </row>
-    <tcaption>Distribution Header Format</tcaption></table>
-    <p>
-      <c>Flags</c> consist of <c>NumberOfAtomCacheRefs/2+1</c> bytes,
-      unless <c>NumberOfAtomCacheRefs</c> is <c>0</c>. If
-      <c>NumberOfAtomCacheRefs</c> is <c>0</c>, <c>Flags</c> and
-      <c>AtomCacheRefs</c> are omitted. Each atom cache reference has
-      a half byte flag field. Flags corresponding to a specific
-      <c>AtomCacheReferenceIndex</c> are located in flag byte number
-      <c>AtomCacheReferenceIndex/2</c>. Flag byte 0 is the first byte
-      after the <c>NumberOfAtomCacheRefs</c> byte. Flags for an even
-      <c>AtomCacheReferenceIndex</c> are located in the least significant
-      half byte and flags for an odd <c>AtomCacheReferenceIndex</c> are
-      located in the most significant half byte.
-    </p>
-    <p>
-      The flag field of an atom cache reference has the following
-      format:
-    </p>
-    <table align="left">
-      <row>
-        <cell align="center">1 bit</cell>
-        <cell align="center">3 bits</cell>
-      </row>
-      <row>
-        <cell align="center"><c>NewCacheEntryFlag</c></cell>
-        <cell align="center"><c>SegmentIndex</c></cell>
-      </row>
-    <tcaption></tcaption></table>
-    <p>
-      The most significant bit is the <c>NewCacheEntryFlag</c>. If set,
-      the corresponding cache reference is new. The three least
-      significant bits are the <c>SegmentIndex</c> of the corresponding
-      atom cache entry. An atom cache consists of 8 segments, each of size
-      256, that is, an atom cache can contain 2048 entries.
-    </p>
-    <p>
-      After flag fields for atom cache references, another half byte flag
-      field is located with the following format:
-    </p>
-    <table align="left">
-      <row>
-        <cell align="center">3 bits</cell>
-        <cell align="center">1 bit</cell>
-      </row>
-      <row>
-        <cell align="center"><c>CurrentlyUnused</c></cell>
-        <cell align="center"><c>LongAtoms</c></cell>
-      </row>
-    <tcaption></tcaption></table>
-    <p>
-      The least significant bit in that half byte is flag <c>LongAtoms</c>.
-      If it is set, 2 bytes are used for atom lengths instead of
-      1 byte in the distribution header.
-    </p>
-    <p>
-      After the <c>Flags</c> field follow the <c>AtomCacheRefs</c>. The
-      first <c>AtomCacheRef</c> is the one corresponding to
-      <c>AtomCacheReferenceIndex</c> 0. Higher indices follow
-      in sequence up to index <c>NumberOfAtomCacheRefs - 1</c>.
-    </p>
-    <p>
-      If the <c>NewCacheEntryFlag</c> for the next <c>AtomCacheRef</c> has
-      been set, a <c>NewAtomCacheRef</c> on the following format follows:
-    </p>
-    <table align="left">
-      <row>
-        <cell align="center">1</cell>
-        <cell align="center">1 | 2</cell>
-        <cell align="center">Length</cell>
-      </row>
-      <row>
-        <cell align="center"><c>InternalSegmentIndex</c></cell>
-        <cell align="center"><c>Length</c></cell>
-        <cell align="center"><c>AtomText</c></cell>
-      </row>
-    <tcaption></tcaption></table>
-    <p>
-      <c>InternalSegmentIndex</c> together with the <c>SegmentIndex</c>
-      completely identify the location of an atom cache entry in the
-      atom cache. <c>Length</c> is the number of bytes that <c>AtomText</c>
-      consists of. Length is a 2 byte big-endian integer
-      if flag <c>LongAtoms</c> has been set, otherwise a 1 byte
-      integer. When distribution flag
-      <seealso marker="erl_dist_protocol#dflags">
-      <c>DFLAG_UTF8_ATOMS</c></seealso>
-      has been exchanged between both nodes in the
-      <seealso marker="erl_dist_protocol#distribution_handshake">
-      distribution handshake</seealso>,
-      characters in <c>AtomText</c> are encoded in UTF-8, otherwise
-      in Latin-1. The following <c>CachedAtomRef</c>s with the same
-      <c>SegmentIndex</c> and <c>InternalSegmentIndex</c> as this
-      <c>NewAtomCacheRef</c> refer to this atom until a new
-      <c>NewAtomCacheRef</c> with the same <c>SegmentIndex</c>
-      and <c>InternalSegmentIndex</c> appear.
-    </p>
-    <p>
-      For more information on encoding of atoms, see the
-      <seealso marker="#utf8_atoms">note on UTF-8 encoded atoms</seealso>
-      in the beginning of this section.
-    </p>
-    <p>
-      If the <c>NewCacheEntryFlag</c> for the next <c>AtomCacheRef</c>
-      has not been set, a <c>CachedAtomRef</c> on the following format
-      follows:
-    </p>
-    <table align="left">
-      <row>
-        <cell align="center">1</cell>
-      </row>
-      <row>
-        <cell align="center"><c>InternalSegmentIndex</c></cell>
-      </row>
-    <tcaption></tcaption></table>
-    <p>
-      <c>InternalSegmentIndex</c> together with the <c>SegmentIndex</c>
-      identify the location of the atom cache entry in the atom cache.
-      The atom corresponding to this <c>CachedAtomRef</c> is the
-      latest <c>NewAtomCacheRef</c> preceding this <c>CachedAtomRef</c>
-      in another previously passed distribution header.
-    </p>
+    <section>
+      <title>Normal Distribution Header</title>
+      <p>
+        The non-fragmented distribution header format is as follows:
+      </p>
+      <table align="left">
+        <row>
+          <cell align="center">1</cell>
+          <cell align="center">1</cell>
+          <cell align="center">1</cell>
+          <cell align="center">NumberOfAtomCacheRefs/2+1 | 0</cell>
+          <cell align="center">N | 0</cell>
+        </row>
+        <row>
+          <cell align="center"><c>131</c></cell>
+          <cell align="center"><c>68</c></cell>
+          <cell align="center"><c>NumberOfAtomCacheRefs</c></cell>
+          <cell align="center"><c>Flags</c></cell>
+          <cell align="center"><c>AtomCacheRefs</c></cell>
+        </row>
+      <tcaption>Normal Distribution Header Format</tcaption></table>
+      <p>
+        <c>Flags</c> consist of <c>NumberOfAtomCacheRefs/2+1</c> bytes,
+        unless <c>NumberOfAtomCacheRefs</c> is <c>0</c>. If
+        <c>NumberOfAtomCacheRefs</c> is <c>0</c>, <c>Flags</c> and
+        <c>AtomCacheRefs</c> are omitted. Each atom cache reference has
+        a half byte flag field. Flags corresponding to a specific
+        <c>AtomCacheReferenceIndex</c> are located in flag byte number
+        <c>AtomCacheReferenceIndex/2</c>. Flag byte 0 is the first byte
+        after the <c>NumberOfAtomCacheRefs</c> byte. Flags for an even
+        <c>AtomCacheReferenceIndex</c> are located in the least significant
+        half byte and flags for an odd <c>AtomCacheReferenceIndex</c> are
+        located in the most significant half byte.
+      </p>
+      <p>
+        The flag field of an atom cache reference has the following
+        format:
+      </p>
+      <table align="left">
+        <row>
+          <cell align="center">1 bit</cell>
+          <cell align="center">3 bits</cell>
+        </row>
+        <row>
+          <cell align="center"><c>NewCacheEntryFlag</c></cell>
+          <cell align="center"><c>SegmentIndex</c></cell>
+        </row>
+      <tcaption></tcaption></table>
+      <p>
+        The most significant bit is the <c>NewCacheEntryFlag</c>. If set,
+        the corresponding cache reference is new. The three least
+        significant bits are the <c>SegmentIndex</c> of the corresponding
+        atom cache entry. An atom cache consists of 8 segments, each of size
+        256, that is, an atom cache can contain 2048 entries.
+      </p>
+      <p>
+        After flag fields for atom cache references, another half byte flag
+        field is located with the following format:
+      </p>
+      <table align="left">
+        <row>
+          <cell align="center">3 bits</cell>
+          <cell align="center">1 bit</cell>
+        </row>
+        <row>
+          <cell align="center"><c>CurrentlyUnused</c></cell>
+          <cell align="center"><c>LongAtoms</c></cell>
+        </row>
+      <tcaption></tcaption></table>
+      <p>
+        The least significant bit in that half byte is flag <c>LongAtoms</c>.
+        If it is set, 2 bytes are used for atom lengths instead of
+        1 byte in the distribution header.
+      </p>
+      <p>
+        After the <c>Flags</c> field follow the <c>AtomCacheRefs</c>. The
+        first <c>AtomCacheRef</c> is the one corresponding to
+        <c>AtomCacheReferenceIndex</c> 0. Higher indices follow
+        in sequence up to index <c>NumberOfAtomCacheRefs - 1</c>.
+      </p>
+      <p>
+        If the <c>NewCacheEntryFlag</c> for the next <c>AtomCacheRef</c> has
+        been set, a <c>NewAtomCacheRef</c> on the following format follows:
+      </p>
+      <table align="left">
+        <row>
+          <cell align="center">1</cell>
+          <cell align="center">1 | 2</cell>
+          <cell align="center">Length</cell>
+        </row>
+        <row>
+          <cell align="center"><c>InternalSegmentIndex</c></cell>
+          <cell align="center"><c>Length</c></cell>
+          <cell align="center"><c>AtomText</c></cell>
+        </row>
+      <tcaption></tcaption></table>
+      <p>
+        <c>InternalSegmentIndex</c> together with the <c>SegmentIndex</c>
+        completely identify the location of an atom cache entry in the
+        atom cache. <c>Length</c> is the number of bytes that <c>AtomText</c>
+        consists of. Length is a 2 byte big-endian integer
+        if flag <c>LongAtoms</c> has been set, otherwise a 1 byte
+        integer. When distribution flag
+        <seealso marker="erl_dist_protocol#dflags">
+        <c>DFLAG_UTF8_ATOMS</c></seealso>
+        has been exchanged between both nodes in the
+        <seealso marker="erl_dist_protocol#distribution_handshake">
+          distribution handshake</seealso>,
+          characters in <c>AtomText</c> are encoded in UTF-8, otherwise
+          in Latin-1. The following <c>CachedAtomRef</c>s with the same
+          <c>SegmentIndex</c> and <c>InternalSegmentIndex</c> as this
+          <c>NewAtomCacheRef</c> refer to this atom until a new
+          <c>NewAtomCacheRef</c> with the same <c>SegmentIndex</c>
+          and <c>InternalSegmentIndex</c> appear.
+      </p>
+      <p>
+        For more information on encoding of atoms, see the
+        <seealso marker="#utf8_atoms">note on UTF-8 encoded atoms</seealso>
+        in the beginning of this section.
+      </p>
+      <p>
+        If the <c>NewCacheEntryFlag</c> for the next <c>AtomCacheRef</c>
+        has not been set, a <c>CachedAtomRef</c> on the following format
+        follows:
+      </p>
+      <table align="left">
+        <row>
+          <cell align="center">1</cell>
+        </row>
+        <row>
+          <cell align="center"><c>InternalSegmentIndex</c></cell>
+        </row>
+      <tcaption></tcaption></table>
+      <p>
+        <c>InternalSegmentIndex</c> together with the <c>SegmentIndex</c>
+        identify the location of the atom cache entry in the atom cache.
+        The atom corresponding to this <c>CachedAtomRef</c> is the
+        latest <c>NewAtomCacheRef</c> preceding this <c>CachedAtomRef</c>
+        in another previously passed distribution header.
+      </p>
+    </section>
+    <section>
+      <marker id="fragments"/>
+      <title>Distribution Header for fragmented messages</title>
+      <p>Messages sent between Erlang nodes can sometimes be
+      quite large. Since OTP-22 it is possible to split large messages
+      into smaller fragments in order to allow smaller messages to be interleaved
+      between larges messages. It is only the <c>message</c> part of each
+      <seealso marker="erl_dist_protocol#connected_nodes">distributed message</seealso>
+      that may be split using fragmentation. Therefore it is recommended to use the
+      <seealso marker="erl_dist_protocol#new-ctrlmessages-for-erlang-otp-22">
+        PAYLOAD control messages</seealso> introduced in OTP-22.
+      </p>
+      <p>Fragmented distribution messages are only used if the receiving node
+      signals that it supports them via the
+      <seealso marker="erl_dist_protocol#dflags">DFLAG_FRAGMENTS</seealso> distribution
+      flag.</p>
+      <p>A process must complete the sending of a fragmented message before it
+      can start sending any other message on the same distribution channel.</p>
+
+      <p>The start of a sequence of fragmented messages looks like this:</p>
+      <table align="left">
+        <row>
+          <cell align="center">1</cell>
+          <cell align="center">1</cell>
+          <cell align="center">8</cell>
+          <cell align="center">8</cell>
+          <cell align="center">1</cell>
+          <cell align="center">NumberOfAtomCacheRefs/2+1 | 0</cell>
+          <cell align="center">N | 0</cell>
+        </row>
+        <row>
+          <cell align="center"><c>131</c></cell>
+          <cell align="center"><c>69</c></cell>
+          <cell align="center"><c>SequenceId</c></cell>
+          <cell align="center"><c>FragmentId</c></cell>
+          <cell align="center"><c>NumberOfAtomCacheRefs</c></cell>
+          <cell align="center"><c>Flags</c></cell>
+          <cell align="center"><c>AtomCacheRefs</c></cell>
+        </row>
+        <tcaption>Starting Fragmented Distribution Header Format</tcaption>
+      </table>
+
+      <p>The continuation of a sequence of fragmented messages looks like this:</p>
+      <table align="left">
+        <row>
+          <cell align="center">1</cell>
+          <cell align="center">1</cell>
+          <cell align="center">8</cell>
+          <cell align="center">8</cell>
+        </row>
+        <row>
+          <cell align="center"><c>131</c></cell>
+          <cell align="center"><c>70</c></cell>
+          <cell align="center"><c>SequenceId</c></cell>
+          <cell align="center"><c>FragmentId</c></cell>
+        </row>
+        <tcaption>Continuing Fragmented Distribution Header Format</tcaption>
+      </table>
+
+      <p>
+        The starting distribution header is very similar to a non-fragmented distribution
+        header. The atom cache works the same as for normal distribution header and
+        is the same for the entire sequence. The additional fields added are the
+        sequence id and fragment id.
+      </p>
+
+      <taglist>
+        <tag>Sequence ID</tag>
+        <item>
+          <p>
+            The sequence id is used to uniquely identify a fragmented message sent
+            from one process to another on the same distributed connection. This is used
+            to identify which sequence a fragment is a part of as the same process can
+            be in the process of receiving multiple sequences at the same time.
+          </p>
+          <p>
+            As one process can only be sending one fragmented message at once,
+            it can be convenient to use the local PID as the sequence id.
+          </p>
+        </item>
+        <tag>Fragments ID</tag>
+        <item>
+          <p>
+            The Fragment ID is used to number the fragments in a sequence.
+            The id starts at the total number of fragments and then decrements to 1
+            (which is the final fragment). So if a sequence consists of 3 fragments
+            the fragment id in the starting header will be 3, and then fragments 2 and 1
+            are sent.
+          </p>
+          <p>
+            The fragments must be delivered in the correct order, so if an unordered
+            distribution carrier is used, they must be ordered before delivered to the
+            Erlang run-time.
+          </p>
+        </item>
+      </taglist>
+
+      <section>
+        <title>Example:</title>
+        <p>
+          As an example, let say that we want to send
+          <c>{call, &lt;0.245.2>, {set_get_state, &lt;&lt;0:1024>>}}</c> to
+          registered process <c>reg</c> using a fragment size of 128. To send
+          this message we need a distribution header, atom cache updates,
+          the control message (which would be <c>{6, &lt;0.245.2>, [], reg}</c> in this case)
+          and finally the actual message. This would all be encoded into:
+        </p>
+
+        <code>
+131,69,0,0,2,168,0,0,5,83,0,0,0,0,0,0,0,2,               %% Header with seq and frag id
+5,4,137,9,10,5,236,3,114,101,103,9,4,99,97,108,108,      %% Atom cache updates
+238,13,115,101,116,95,103,101,116,95,115,116,97,116,101,
+104,4,97,6,103,82,0,0,0,0,85,0,0,0,0,2,82,1,82,2,        %% Control message
+104,3,82,3,103,82,0,0,0,0,245,0,0,0,2,2,                 %% Actual message using cached atoms
+104,2,82,4,109,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+
+131,70,0,0,2,168,0,0,5,83,0,0,0,0,0,0,0,1,               %% Cont Header with seq and frag id
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,               %% Rest of payload
+0,0,0,0</code>
+
+       <p>
+         Let us break that apart into its components. First we have the
+         distribution header tags together with the sequence id and
+         a fragment id of 2.
+       </p>
+       <code>
+131,69,                   %% Start fragment header
+0,0,2,168,0,0,5,83,       %% The sequence ID
+0,0,0,0,0,0,0,2,           %% The fragment ID
+</code>
+       <p>Then we have the updates to the atom cache:</p>
+       <code>
+5,4,137,9,  %% 5 atoms and their flags
+10,5,       %% The already cached atom ids
+236,3,114,101,103,  %% The atom 'reg'
+9,4,99,97,108,108,  %% The atom 'call'
+238,13,115,101,116,95,103,101,116,95,115,116,97,116,101, %% The atom 'set_get_state'
+       </code>
+       <p>
+         The first byte says that we have 5 atoms that are part
+         of the cache. Then follows three bytes that are the
+         atom cache ref flags. Each of the flags uses 4 bits so
+         they are a bit hard to read in decimal byte form. In
+         binary half-byte form they look like this:
+       </p>
+       <code>0000, 0100, 1000, 1001, 1001</code>
+       <p>
+         As the high bit of the first two atoms in the
+         cache are not set we know that they are already in the cache,
+         so they do not have to be sent again (this is the node name of the
+         receiving and sending node). Then follows the atoms that have to be sent,
+         together with their segment ids.
+       </p>
+       <p>
+         Then the listing of the atoms comes, starting with 10 and 5
+         which are the atom refs of the already cached atoms. Then the
+         new atoms are sent.
+       </p>
+       <p>
+         When the atom cache is setup correctly the control message is sent.
+       </p>
+       <code>104,4,97,6,103,82,0,0,0,0,85,0,0,0,0,2,82,1,82,2,</code>
+       <p>
+         Note that up until here it is not allowed to fragments the message.
+         The entire atom cache and control message has to be part of the
+         starting fragment. After the control message the payload of the message
+         is sent using 128 bytes:
+       </p>
+       <code>
+104,3,82,3,103,82,0,0,0,0,245,0,0,0,2,2,
+104,2,82,4,109,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+       </code>
+       <p>
+         Since the payload is larger than 128-bytes it is split into two
+         fragments. The second fragment does not have any atom cache update
+         instructions so it is a lot simpler:
+       </p>
+       <code>
+131,70,0,0,2,168,0,0,5,83,0,0,0,0,0,0,0,1, %% Continuation dist header 70 with seq and frag id
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, %% remaining payload
+0,0,0,0
+       </code>
+       <note>
+         <p>
+           The fragment size of 128 is only used as an example.
+           Any fragments size may be used when sending fragmented messages.
+         </p>
+       </note>
+      </section>
+    </section>
   </section>
 
   <section>
@@ -373,8 +571,9 @@
       </row>
     <tcaption>FLOAT_EXT</tcaption></table>
     <p>
-      A float is stored in string format. The format used in sprintf to
-      format the float is "%.20e"
+      A finite float (i.e. not inf, -inf or NaN) is stored in
+      string format. The format used in sprintf to format the
+      float is "%.20e"
       (there are more bytes allocated than necessary).
       To unpack the float, use sscanf with format "%lf".
     </p>
@@ -386,44 +585,6 @@
   </section>
 
     <section>
-      <marker id="REFERENCE_EXT"/>
-      <title>REFERENCE_EXT</title>
-      <table align="left">
-        <row>
-          <cell align="center">1</cell>
-          <cell align="center">N</cell>
-          <cell align="center">4</cell>
-          <cell align="center">1</cell>
-        </row>
-        <row>
-          <cell align="center"><c>101</c></cell>
-          <cell align="center"><c>Node</c></cell>
-          <cell align="center"><c>ID</c></cell>
-          <cell align="center"><c>Creation</c></cell>
-        </row>
-      <tcaption>REFERENCE_EXT</tcaption></table>
-      <p>
-        Encodes a reference object (an object generated with
-        <seealso marker="erlang:make_ref/0">erlang:make_ref/0</seealso>).
-        The <c>Node</c> term is an encoded atom, that is,
-        <seealso marker="#ATOM_UTF8_EXT"><c>ATOM_UTF8_EXT</c></seealso>, 
-        <seealso marker="#SMALL_ATOM_UTF8_EXT"><c>SMALL_ATOM_UTF8_EXT</c></seealso>, or
-        <seealso marker="#ATOM_CACHE_REF"><c>ATOM_CACHE_REF</c></seealso>. 
-        The <c>ID</c> field contains a big-endian unsigned integer,
-        but <em>is to be regarded as uninterpreted data</em>,
-        as this field is node-specific.
-        <c>Creation</c> is a byte containing a node serial number, which
-        makes it possible to separate old (crashed) nodes from a new one.
-      </p>
-      <p>
-        In <c>ID</c>, only 18 bits are significant; the rest are to be 0.
-        In <c>Creation</c>, only two bits are significant; the rest are to be 0.
-        See <seealso marker="#NEW_REFERENCE_EXT">
-        <c>NEW_REFERENCE_EXT</c></seealso>.
-      </p>
-    </section>
-
-    <section>
       <marker id="PORT_EXT"/>
       <title>PORT_EXT</title>
 	<table align="left">
@@ -441,13 +602,46 @@
 	  </row>
 	<tcaption>PORT_EXT</tcaption></table>
 	<p>
-	  Encodes a port object (obtained from
-          <seealso marker="erlang:open_port/2">
-          <c>erlang:open_port/2</c></seealso>).
-	  The <c>ID</c> is a node-specific identifier for a local port.
+	  Same as <seealso marker="#NEW_PORT_EXT"><c>NEW_PORT_EXT</c></seealso>
+	  except the <c>Creation</c> field is only one byte and only two
+	  bits are significant, the rest are to be 0.
+	</p>
+    </section>
+
+    <section>
+      <marker id="NEW_PORT_EXT"/>
+      <title>NEW_PORT_EXT</title>
+	<table align="left">
+	  <row>
+	    <cell align="center">1</cell>
+	    <cell align="center">N</cell>
+	    <cell align="center">4</cell>
+	    <cell align="center">4</cell>
+	  </row>
+	  <row>
+	    <cell align="center"><c>89</c></cell>
+	    <cell align="center"><c>Node</c></cell>
+	    <cell align="center"><c>ID</c></cell>
+	    <cell align="center"><c>Creation</c></cell>
+	  </row>
+	<tcaption>NEW_PORT_EXT</tcaption></table>
+	<p>
+	  Encodes a port identifier (obtained from
+          <seealso marker="erlang#open_port/2"><c>erlang:open_port/2</c></seealso>).
+	  <c>Node</c> is an encoded atom, that is,
+	  <seealso marker="#ATOM_UTF8_EXT"><c>ATOM_UTF8_EXT</c></seealso>,
+	  <seealso marker="#SMALL_ATOM_UTF8_EXT"><c>SMALL_ATOM_UTF8_EXT</c></seealso>
+	  or <seealso marker="#ATOM_CACHE_REF"><c>ATOM_CACHE_REF</c></seealso>.
+	  <c>ID</c> is a 32-bit big endian unsigned integer. Only 28 bits are
+	  significant; the rest are to be 0. The <c>Creation</c> works just like in
+	  <seealso marker="#NEW_PID_EXT"><c>NEW_PID_EXT</c></seealso>.
 	  Port operations are not allowed across node boundaries.
-	  The <c>Creation</c> works just like in
-	  <seealso marker="#REFERENCE_EXT"><c>REFERENCE_EXT</c></seealso>.
+	</p>
+	<p>Introduced in OTP 19, but only to be decoded and echoed back. Not
+	  encoded for local ports. Planned to supersede <seealso marker="#PORT_EXT">
+	  <c>PORT_EXT</c></seealso> in OTP 23 when
+	  <seealso marker="erl_dist_protocol#dflags"><c>DFLAG_BIG_CREATON</c></seealso>
+	  becomes mandatory.
 	</p>
     </section>
 
@@ -471,12 +665,65 @@
 	  </row>
 	<tcaption>PID_EXT</tcaption></table>
 	<p>
-	  Encodes a process identifier object (obtained from
-          <seealso marker="erlang:spawn/3"><c>erlang:spawn/3</c></seealso> or
-	  friends). The <c>ID</c> and <c>Creation</c> fields works just like in
-	  <seealso marker="#REFERENCE_EXT"><c>REFERENCE_EXT</c></seealso>, while
-	  the <c>Serial</c> field is used to improve safety.	  
-	  In <c>ID</c>, only 15 bits are significant; the rest are to be 0.
+	  Same as <seealso marker="#NEW_PID_EXT"><c>NEW_PID_EXT</c></seealso>
+	  except the <c>Creation</c> field is only one byte and only two
+	  bits are significant, the rest are to be 0.
+	</p>
+    </section>
+
+    <section>
+      <marker id="NEW_PID_EXT"/>
+      <title>NEW_PID_EXT</title>
+	<table align="left">
+	  <row>
+	    <cell align="center">1</cell>
+	    <cell align="center">N</cell>
+	    <cell align="center">4</cell>
+	    <cell align="center">4</cell>
+	    <cell align="center">4</cell>
+	  </row>
+	  <row>
+	    <cell align="center"><c>88</c></cell>
+	    <cell align="center"><c>Node</c></cell>
+	    <cell align="center"><c>ID</c></cell>
+	    <cell align="center"><c>Serial</c></cell>
+	    <cell align="center"><c>Creation</c></cell>
+	  </row>
+	<tcaption>NEW_PID_EXT</tcaption></table>
+	<p>
+	  Encodes an Erlang process identifier object.
+	</p>
+	<taglist>
+	  <tag><c>Node</c></tag>
+	  <item><p>The name of the originating node, encoded using
+	    <seealso marker="#ATOM_UTF8_EXT"><c>ATOM_UTF8_EXT</c></seealso>,
+	    <seealso marker="#SMALL_ATOM_UTF8_EXT"><c>SMALL_ATOM_UTF8_EXT</c></seealso>
+	    or <seealso
+	    marker="#ATOM_CACHE_REF"><c>ATOM_CACHE_REF</c></seealso>.</p>
+	  </item>
+	  <tag><c>ID</c></tag>
+	  <item><p>A 32-bit big endian unsigned integer. Only 15 bits are
+	    significant; the rest are to be 0.</p>
+	  </item>
+	  <tag><c>Serial</c></tag>
+	  <item><p>A 32-bit big endian unsigned integer. Only 13 bits are
+	    significant; the rest are to be 0.</p>
+	  </item>
+	  <tag><c>Creation</c></tag>
+	  <item><p>A 32-bit big endian unsigned integer. All identifiers
+	    originating from the same node incarnation must have identical <c>Creation</c>
+	    values. This makes it possible to separate identifiers from old
+	    (crashed) nodes from a new one. The value zero should be avoided for
+	    normal operations as it is used as a wild card for debug purpose
+	    (like a pid returned by <seealso marker="erts:erlang#list_to_pid/1">
+	    erlang:list_to_pid/1</seealso>).</p>
+	  </item>
+	</taglist>
+	<p>Introduced in OTP 19, but only to be decoded and echoed back. Not
+	  encoded for local processes. Planned to supersede <seealso marker="#PID_EXT">
+	  <c>PID_EXT</c></seealso> in OTP 23 when
+	  <seealso marker="erl_dist_protocol#dflags"><c>DFLAG_BIG_CREATON</c></seealso>
+	  becomes mandatory.
 	</p>
     </section>
 
@@ -666,7 +913,7 @@
 	<tcaption>SMALL_BIG_EXT</tcaption></table>
 	<p>
 	  Bignums are stored in unary form with a <c>Sign</c> byte,
-	  that is, 0 if the binum is positive and 1 if it is negative. The
+	  that is, 0 if the bignum is positive and 1 if it is negative. The
 	  digits are stored with the least significant byte stored first. To
 	  calculate the integer, the following formula can be used:
 	</p>
@@ -700,6 +947,30 @@
     </section>
 
     <section>
+      <marker id="REFERENCE_EXT"/>
+      <title>REFERENCE_EXT (deprecated)</title>
+      <table align="left">
+        <row>
+          <cell align="center">1</cell>
+          <cell align="center">N</cell>
+          <cell align="center">4</cell>
+          <cell align="center">1</cell>
+        </row>
+        <row>
+          <cell align="center"><c>101</c></cell>
+          <cell align="center"><c>Node</c></cell>
+          <cell align="center"><c>ID</c></cell>
+          <cell align="center"><c>Creation</c></cell>
+        </row>
+      <tcaption>REFERENCE_EXT</tcaption></table>
+      <p>
+	The same as <seealso marker="#NEW_REFERENCE_EXT">
+	<c>NEW_REFERENCE_EXT</c></seealso> except <c>ID</c> is only one word
+	(<c>Len</c> = 1).
+      </p>
+    </section>
+
+    <section>
       <marker id="NEW_REFERENCE_EXT"/>
       <title>NEW_REFERENCE_EXT</title>
 	<table align="left">
@@ -719,29 +990,68 @@
 	  </row>
 	<tcaption>NEW_REFERENCE_EXT</tcaption></table>
 	<p>
-	  <c>Node</c> and <c>Creation</c> are as in
-	  <seealso marker="#REFERENCE_EXT"><c>REFERENCE_EXT</c></seealso>.
-	</p>
-	<p>
-	  <c>ID</c> contains a sequence of big-endian unsigned integers
-	  (4 bytes each, so <c>N'</c> is a multiple of 4),
-	  but is to be regarded as uninterpreted data.
-	</p>
-	<p>
-	  <c>N'</c> = 4 * <c>Len</c>.
-	</p>
-	<p>
-	  In the first word (4 bytes) of <c>ID</c>, only 18 bits are
-	  significant, the rest are to be 0.
-	  In <c>Creation</c>, only two bits are significant,
-	  the rest are to be 0.
+	  The same as <seealso marker="#NEWER_REFERENCE_EXT">
+	  <c>NEWER_REFERENCE_EXT</c></seealso> <em>except</em>:
 	</p>
+	<taglist>
+	  <tag><c>ID</c></tag>
+	  <item><p>In the first word (4 bytes) of <c>ID</c>, only 18 bits are
+	    significant, the rest must be 0.</p>
+	  </item>
+	  <tag><c>Creation</c></tag>
+	  <item><p>Only one byte long and only two bits are significant, the rest must be 0.</p>
+	  </item>
+	</taglist>
+    </section>
+
+    <section>
+      <marker id="NEWER_REFERENCE_EXT"/>
+      <title>NEWER_REFERENCE_EXT</title>
+	<table align="left">
+	  <row>
+	    <cell align="center">1</cell>
+	    <cell align="center">2</cell>
+	    <cell align="center">N</cell>
+	    <cell align="center">4</cell>
+	    <cell align="center">N'</cell>
+	  </row>
+	  <row>
+	    <cell align="center"><c>90</c></cell>
+	    <cell align="center"><c>Len</c></cell>
+	    <cell align="center"><c>Node</c></cell>
+	    <cell align="center"><c>Creation</c></cell>
+	    <cell align="center"><c>ID ...</c></cell>
+	  </row>
+	<tcaption>NEWER_REFERENCE_EXT</tcaption></table>
 	<p>
-	  <c>NEW_REFERENCE_EXT</c> was introduced with distribution version 4.
-	  In version 4, <c>N'</c> is to be at most 12.
+	  Encodes a reference term generated with
+	  <seealso marker="erts:erlang#make_ref/0">erlang:make_ref/0</seealso>.
 	</p>
-	<p>
-	  See <seealso marker="#REFERENCE_EXT"><c>REFERENCE_EXT</c></seealso>.
+	<taglist>
+	  <tag><c>Node</c></tag>
+	  <item><p>The name of the originating node, encoded using
+	    <seealso marker="#ATOM_UTF8_EXT"><c>ATOM_UTF8_EXT</c></seealso>,
+	    <seealso marker="#SMALL_ATOM_UTF8_EXT"><c>SMALL_ATOM_UTF8_EXT</c></seealso>
+	    or <seealso marker="#ATOM_CACHE_REF"><c>ATOM_CACHE_REF</c></seealso>.</p>
+	  </item>
+	  <tag><c>Len</c></tag>
+	  <item><p>A 16-bit big endian unsigned integer not larger than 3.</p>
+	  </item>
+	  <tag><c>ID</c></tag>
+	  <item><p>A sequence of <c>Len</c> big-endian unsigned integers
+	    (4 bytes each, so <c>N'</c>&nbsp;=&nbsp;4&nbsp;*&nbsp;<c>Len</c>),
+	    but is to be regarded as uninterpreted data.</p>
+	  </item>
+	  <tag><c>Creation</c></tag>
+	  <item><p>Works just like in
+	  <seealso marker="#NEW_PID_EXT"><c>NEW_PID_EXT</c></seealso>.</p>
+	  </item>
+	</taglist>
+	<p>Introduced in OTP 19, but only to be decoded and echoed back. Not
+	  encoded for local references. Planned to supersede <seealso marker="#NEW_REFERENCE_EXT">
+	  <c>NEW_REFERENCE_EXT</c></seealso> in OTP 23 when
+	  <seealso marker="erl_dist_protocol#dflags"><c>DFLAG_BIG_CREATON</c></seealso>
+	  becomes mandatory.
 	</p>
     </section>
 
@@ -989,7 +1299,8 @@
 	  </row>
 	<tcaption>NEW_FLOAT_EXT</tcaption></table>
 	<p>
-	  A float is stored as 8 bytes in big-endian IEEE format.
+	  A finite float (i.e. not inf, -inf or NaN) is stored as 8 bytes
+	  in big-endian IEEE format.
 	</p>
 	<p>
 	  This term is used in minor version 1 of the external format.
diff --git a/erts/doc/src/erl_nif.xml b/erts/doc/src/erl_nif.xml
index bbc12b0a56..d74ae23a93 100644
--- a/erts/doc/src/erl_nif.xml
+++ b/erts/doc/src/erl_nif.xml
@@ -546,8 +546,8 @@ int writeiovec(ErlNifEnv *env, ERL_NIF_TERM term, ERL_NIF_TERM *tail,
             <p>Many operations communicating with a process executing a
               dirty NIF can, however, complete while it executes the
               dirty NIF. For example, retrieving information about it through
-              <seealso marker="erlang:process_info/1">
-              <c>erlang:process_info</c></seealso>, setting its group leader,
+              <seealso marker="erlang#process_info/1">
+              <c>process_info</c></seealso>, setting its group leader,
               register/unregister its name, and so on.</p>
             <p>Termination of a process executing a dirty NIF can only be
               completed up to a certain point while it executes the dirty NIF.
@@ -783,14 +783,16 @@ typedef struct {
         <p>A process identifier (pid). In contrast to pid terms (instances of
           <c>ERL_NIF_TERM</c>), <c>ErlNifPid</c>s are self-contained and not
           bound to any <seealso marker="#ErlNifEnv">environment</seealso>.
-          <c>ErlNifPid</c> is an opaque type.</p>
+          <c>ErlNifPid</c> is an opaque type. It can be copied, moved
+	  in memory, forgotten, and so on.</p>
       </item>
       <tag><marker id="ErlNifPort"/><c>ErlNifPort</c></tag>
       <item>
         <p>A port identifier. In contrast to port ID terms (instances of
           <c>ERL_NIF_TERM</c>), <c>ErlNifPort</c>s are self-contained and not
           bound to any <seealso marker="#ErlNifEnv">environment</seealso>.
-          <c>ErlNifPort</c> is an opaque type.</p>
+	  <c>ErlNifPort</c> is an opaque type. It can be copied, moved
+	  in memory, forgotten, and so on.</p>
       </item>
       <tag><marker id="ErlNifResourceType"/><c>ErlNifResourceType</c></tag>
       <item>
@@ -963,7 +965,7 @@ typedef struct {
 
   <funcs>
     <func>
-      <name><ret>void *</ret><nametext>enif_alloc(size_t size)</nametext></name>
+      <name since=""><ret>void *</ret><nametext>enif_alloc(size_t size)</nametext></name>
       <fsummary>Allocate dynamic memory.</fsummary>
       <desc>
         <p>Allocates memory of <c>size</c> bytes.</p>
@@ -974,7 +976,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since=""><ret>int</ret>
         <nametext>enif_alloc_binary(size_t size, ErlNifBinary* bin)</nametext>
       </name>
       <fsummary>Create a new binary.</fsummary>
@@ -998,7 +1000,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>ErlNifEnv *</ret><nametext>enif_alloc_env()</nametext></name>
+      <name since="OTP R14B"><ret>ErlNifEnv *</ret><nametext>enif_alloc_env()</nametext></name>
       <fsummary>Create a new environment.</fsummary>
       <desc>
         <p>Allocates a new process independent environment. The environment can
@@ -1012,7 +1014,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>void *</ret><nametext>enif_alloc_resource(ErlNifResourceType*
+      <name since="OTP R13B04"><ret>void *</ret><nametext>enif_alloc_resource(ErlNifResourceType*
         type, unsigned size)</nametext></name>
       <fsummary>Allocate a memory-managed resource object.</fsummary>
       <desc>
@@ -1022,7 +1024,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>size_t</ret><nametext>enif_binary_to_term(ErlNifEnv *env,
+      <name since="OTP 19.0"><ret>size_t</ret><nametext>enif_binary_to_term(ErlNifEnv *env,
         const unsigned char* data, size_t size, ERL_NIF_TERM *term,
         ErlNifBinaryToTerm opts)</nametext></name>
       <fsummary>Create a term from the external format.</fsummary>
@@ -1047,7 +1049,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>enif_clear_env(ErlNifEnv* env)</nametext>
+      <name since="OTP R14B"><ret>void</ret><nametext>enif_clear_env(ErlNifEnv* env)</nametext>
       </name>
       <fsummary>Clear an environment for reuse.</fsummary>
       <desc>
@@ -1058,7 +1060,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP R13B04"><ret>int</ret>
         <nametext>enif_compare(ERL_NIF_TERM lhs, ERL_NIF_TERM rhs)</nametext>
       </name>
       <fsummary>Compare two terms.</fsummary>
@@ -1073,7 +1075,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_compare_monitors(const ErlNifMonitor
+      <name since="OTP 20.0"><ret>int</ret><nametext>enif_compare_monitors(const ErlNifMonitor
         *monitor1, const ErlNifMonitor *monitor2)</nametext></name>
       <fsummary>Compare two monitors.</fsummary>
       <desc>
@@ -1088,7 +1090,21 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>void</ret>
+      <name since="OTP 22.0"><ret>int</ret>
+      <nametext>enif_compare_pids(const ErlNifPid *pid1, const ErlNifPid *pid2)
+      </nametext></name>
+      <fsummary>Compare two pids.</fsummary>
+      <desc>
+        <p>Compares two <seealso marker="#ErlNifPid"><c>ErlNifPid</c>
+	  </seealso>s according to term order.</p>
+        <p>Returns <c>0</c> if <c>pid1</c> and <c>pid2</c> are equal,
+          &lt; <c>0</c> if <c>pid1</c> &lt; <c>pid2</c>, and
+          &gt; <c>0</c> if <c>pid1</c> &gt; <c>pid2</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name since="OTP R13B04"><ret>void</ret>
         <nametext>enif_cond_broadcast(ErlNifCond *cnd)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -1098,7 +1114,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>ErlNifCond *</ret>
+      <name since="OTP R13B04"><ret>ErlNifCond *</ret>
         <nametext>enif_cond_create(char *name)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -1108,7 +1124,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>void</ret>
+      <name since="OTP R13B04"><ret>void</ret>
         <nametext>enif_cond_destroy(ErlNifCond *cnd)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -1118,7 +1134,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>char*</ret>
+      <name since="OTP 21.0"><ret>char*</ret>
         <nametext>enif_cond_name(ErlNifCond* cnd)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -1128,7 +1144,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>void</ret>
+      <name since="OTP R13B04"><ret>void</ret>
         <nametext>enif_cond_signal(ErlNifCond *cnd)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -1138,7 +1154,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>void</ret>
+      <name since="OTP R13B04"><ret>void</ret>
         <nametext>enif_cond_wait(ErlNifCond *cnd, ErlNifMutex *mtx)</nametext>
       </name>
       <fsummary></fsummary>
@@ -1149,7 +1165,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP R16B"><ret>int</ret>
         <nametext>enif_consume_timeslice(ErlNifEnv *env, int percent)</nametext>
       </name>
       <fsummary></fsummary>
@@ -1184,7 +1200,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>ErlNifTime</ret><nametext>enif_convert_time_unit(ErlNifTime
+      <name since="OTP 18.3"><ret>ErlNifTime</ret><nametext>enif_convert_time_unit(ErlNifTime
         val, ErlNifTimeUnit from, ErlNifTimeUnit to)</nametext></name>
       <fsummary>Convert time unit of a time value.</fsummary>
       <desc>
@@ -1209,7 +1225,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret>
+      <name since="OTP 19.0"><ret>ERL_NIF_TERM</ret>
         <nametext>enif_cpu_time(ErlNifEnv *)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -1225,8 +1241,8 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_demonitor_process(ErlNifEnv* caller_env, void* obj,
-      const ErlNifMonitor* mon)</nametext></name>
+      <name since="OTP 20.0"><ret>int</ret><nametext>enif_demonitor_process(ErlNifEnv* caller_env,
+      void* obj, const ErlNifMonitor* mon)</nametext></name>
       <fsummary>Cancel a process monitor.</fsummary>
       <desc>
         <marker id="enif_demonitor_process"></marker>
@@ -1252,7 +1268,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP R13B04"><ret>int</ret>
         <nametext>enif_equal_tids(ErlNifTid tid1, ErlNifTid tid2)</nametext>
       </name>
       <fsummary></fsummary>
@@ -1263,7 +1279,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_fprintf(FILE *stream, const char *format, ...)</nametext></name>
+      <name since="OTP 21.0"><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
@@ -1276,7 +1292,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>enif_free(void* ptr)</nametext></name>
+      <name since=""><ret>void</ret><nametext>enif_free(void* ptr)</nametext></name>
       <fsummary>Free dynamic memory.</fsummary>
       <desc>
         <p>Frees memory allocated by
@@ -1285,7 +1301,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>void</ret>
+      <name since="OTP R14B"><ret>void</ret>
         <nametext>enif_free_env(ErlNifEnv* env)</nametext></name>
       <fsummary>Free an environment allocated with enif_alloc_env.</fsummary>
       <desc>
@@ -1296,7 +1312,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>void</ret>
+      <name since="OTP 20.1"><ret>void</ret>
         <nametext>enif_free_iovec(ErlNifIOvec* iov)</nametext></name>
       <fsummary>Free an ErlIOVec</fsummary>
       <desc>
@@ -1321,7 +1337,7 @@ enif_free_iovec(iovec);]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_get_atom(ErlNifEnv* env, ERL_NIF_TERM
+      <name since="OTP R13B04"><ret>int</ret><nametext>enif_get_atom(ErlNifEnv* env, ERL_NIF_TERM
         term, char* buf, unsigned size, ErlNifCharEncoding encode)</nametext>
       </name>
       <fsummary>Get the text representation of an atom term.</fsummary>
@@ -1337,7 +1353,7 @@ enif_free_iovec(iovec);]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_get_atom_length(ErlNifEnv* env,
+      <name since="OTP R14B"><ret>int</ret><nametext>enif_get_atom_length(ErlNifEnv* env,
         ERL_NIF_TERM term, unsigned* len, ErlNifCharEncoding encode)</nametext>
       </name>
       <fsummary>Get the length of atom <c>term</c>.</fsummary>
@@ -1351,7 +1367,7 @@ enif_free_iovec(iovec);]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_get_double(ErlNifEnv* env,
+      <name since="OTP R13B04"><ret>int</ret><nametext>enif_get_double(ErlNifEnv* env,
         ERL_NIF_TERM term, double* dp)</nametext></name>
       <fsummary>Read a floating-point number term.</fsummary>
       <desc>
@@ -1362,7 +1378,7 @@ enif_free_iovec(iovec);]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_get_int(ErlNifEnv* env, ERL_NIF_TERM
+      <name since=""><ret>int</ret><nametext>enif_get_int(ErlNifEnv* env, ERL_NIF_TERM
         term, int* ip)</nametext></name>
       <fsummary>Read an integer term.</fsummary>
       <desc>
@@ -1373,7 +1389,7 @@ enif_free_iovec(iovec);]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_get_int64(ErlNifEnv* env, ERL_NIF_TERM
+      <name since="OTP R14B"><ret>int</ret><nametext>enif_get_int64(ErlNifEnv* env, ERL_NIF_TERM
         term, ErlNifSInt64* ip)</nametext></name>
       <fsummary>Read a 64-bit integer term.</fsummary>
       <desc>
@@ -1384,7 +1400,7 @@ enif_free_iovec(iovec);]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_get_local_pid(ErlNifEnv* env,
+      <name since="OTP R14B"><ret>int</ret><nametext>enif_get_local_pid(ErlNifEnv* env,
         ERL_NIF_TERM term, ErlNifPid* pid)</nametext></name>
       <fsummary>Read a local pid term.</fsummary>
       <desc>
@@ -1392,11 +1408,14 @@ enif_free_iovec(iovec);]]></code>
           initializes the pid variable <c>*pid</c> from it and returns
           <c>true</c>. Otherwise returns <c>false</c>. No check is done to see
           if the process is alive.</p>
+	<note><p><c>enif_get_local_pid</c> will return false if argument
+	<c>term</c> is the atom <seealso marker="#enif_make_pid">
+	<c>undefined</c></seealso>.</p></note>
       </desc>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_get_local_port(ErlNifEnv* env,
+      <name since="OTP 19.0"><ret>int</ret><nametext>enif_get_local_port(ErlNifEnv* env,
         ERL_NIF_TERM term, ErlNifPort* port_id)</nametext></name>
       <fsummary>Read a local port term.</fsummary>
       <desc>
@@ -1408,7 +1427,7 @@ enif_free_iovec(iovec);]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_get_list_cell(ErlNifEnv* env,
+      <name since=""><ret>int</ret><nametext>enif_get_list_cell(ErlNifEnv* env,
         ERL_NIF_TERM list, ERL_NIF_TERM* head, ERL_NIF_TERM* tail)</nametext>
       </name>
       <fsummary>Get head and tail from a list.</fsummary>
@@ -1420,7 +1439,7 @@ enif_free_iovec(iovec);]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_get_list_length(ErlNifEnv* env,
+      <name since="OTP R14B"><ret>int</ret><nametext>enif_get_list_length(ErlNifEnv* env,
         ERL_NIF_TERM term, unsigned* len)</nametext></name>
       <fsummary>Get the length of list <c>term</c>.</fsummary>
       <desc>
@@ -1431,7 +1450,7 @@ enif_free_iovec(iovec);]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_get_long(ErlNifEnv* env, ERL_NIF_TERM
+      <name since="OTP R13B04"><ret>int</ret><nametext>enif_get_long(ErlNifEnv* env, ERL_NIF_TERM
         term, long int* ip)</nametext></name>
       <fsummary>Read a long integer term.</fsummary>
       <desc>
@@ -1442,7 +1461,7 @@ enif_free_iovec(iovec);]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_get_map_size(ErlNifEnv* env,
+      <name since="OTP 18.0"><ret>int</ret><nametext>enif_get_map_size(ErlNifEnv* env,
         ERL_NIF_TERM term, size_t *size)</nametext></name>
       <fsummary>Read the size of a map term.</fsummary>
       <desc>
@@ -1454,7 +1473,7 @@ enif_free_iovec(iovec);]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_get_map_value(ErlNifEnv* env,
+      <name since="OTP 18.0"><ret>int</ret><nametext>enif_get_map_value(ErlNifEnv* env,
         ERL_NIF_TERM map, ERL_NIF_TERM key, ERL_NIF_TERM* value)</nametext>
       </name>
       <fsummary>Get the value of a key in a map.</fsummary>
@@ -1467,7 +1486,7 @@ enif_free_iovec(iovec);]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_get_resource(ErlNifEnv* env,
+      <name since="OTP R13B04"><ret>int</ret><nametext>enif_get_resource(ErlNifEnv* env,
         ERL_NIF_TERM term, ErlNifResourceType* type, void** objp)</nametext>
       </name>
       <fsummary>Get the pointer to a resource object.</fsummary>
@@ -1476,11 +1495,14 @@ enif_free_iovec(iovec);]]></code>
           <c>term</c>.</p>
         <p>Returns <c>true</c> on success, or <c>false</c> if <c>term</c> is
           not a handle to a resource object of type <c>type</c>.</p>
+	<p><c>enif_get_resource</c> does not add a reference to the resource
+	  object. However, the pointer received in <c>*objp</c> is guaranteed to
+	  be valid at least as long as the resource handle <c>term</c> is valid.</p>
       </desc>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_get_string(ErlNifEnv* env,
+      <name since="OTP R13B04"><ret>int</ret><nametext>enif_get_string(ErlNifEnv* env,
         ERL_NIF_TERM list, char* buf, unsigned size,
         ErlNifCharEncoding encode)</nametext></name>
       <fsummary>Get a C-string from a list.</fsummary>
@@ -1504,7 +1526,7 @@ enif_free_iovec(iovec);]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_get_tuple(ErlNifEnv* env, ERL_NIF_TERM
+      <name since="OTP R13B04"><ret>int</ret><nametext>enif_get_tuple(ErlNifEnv* env, ERL_NIF_TERM
         term, int* arity, const ERL_NIF_TERM** array)</nametext></name>
       <fsummary>Inspect the elements of a tuple.</fsummary>
       <desc>
@@ -1520,7 +1542,7 @@ enif_free_iovec(iovec);]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_get_uint(ErlNifEnv* env, ERL_NIF_TERM
+      <name since="OTP R13B04"><ret>int</ret><nametext>enif_get_uint(ErlNifEnv* env, ERL_NIF_TERM
         term, unsigned int* ip)</nametext></name>
       <fsummary>Read an unsigned integer term.</fsummary>
       <desc>
@@ -1532,7 +1554,7 @@ enif_free_iovec(iovec);]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_get_uint64(ErlNifEnv* env,
+      <name since="OTP R14B"><ret>int</ret><nametext>enif_get_uint64(ErlNifEnv* env,
         ERL_NIF_TERM term, ErlNifUInt64* ip)</nametext></name>
       <fsummary>Read an unsigned 64-bit integer term.</fsummary>
       <desc>
@@ -1544,7 +1566,7 @@ enif_free_iovec(iovec);]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_get_ulong(ErlNifEnv* env, ERL_NIF_TERM
+      <name since=""><ret>int</ret><nametext>enif_get_ulong(ErlNifEnv* env, ERL_NIF_TERM
         term, unsigned long* ip)</nametext></name>
       <fsummary>Read an unsigned integer term.</fsummary>
       <desc>
@@ -1557,7 +1579,7 @@ enif_free_iovec(iovec);]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_getenv(const char* key, char* value,
+      <name since="OTP 18.2"><ret>int</ret><nametext>enif_getenv(const char* key, char* value,
         size_t *value_size)</nametext></name>
       <fsummary>Get the value of an environment variable.</fsummary>
       <desc>
@@ -1567,7 +1589,7 @@ enif_free_iovec(iovec);]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_has_pending_exception(ErlNifEnv* env,
+      <name since="OTP 18.0"><ret>int</ret><nametext>enif_has_pending_exception(ErlNifEnv* env,
         ERL_NIF_TERM* reason)</nametext></name>
       <fsummary>Check if an exception has been raised.</fsummary>
       <desc>
@@ -1588,7 +1610,7 @@ enif_free_iovec(iovec);]]></code>
     </func>
 
     <func>
-      <name>
+      <name since="OTP 20.0">
         <ret>ErlNifUInt64</ret>
         <nametext>enif_hash(ErlNifHash type, ERL_NIF_TERM term, ErlNifUInt64 salt)</nametext>
       </name>
@@ -1601,7 +1623,7 @@ enif_free_iovec(iovec);]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_inspect_binary(ErlNifEnv* env,
+      <name since=""><ret>int</ret><nametext>enif_inspect_binary(ErlNifEnv* env,
         ERL_NIF_TERM bin_term, ErlNifBinary* bin)</nametext></name>
       <fsummary>Inspect the content of a binary.</fsummary>
       <desc>
@@ -1613,7 +1635,7 @@ enif_free_iovec(iovec);]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_inspect_iolist_as_binary(ErlNifEnv*
+      <name since="OTP R13B04"><ret>int</ret><nametext>enif_inspect_iolist_as_binary(ErlNifEnv*
         env, ERL_NIF_TERM term, ErlNifBinary* bin)</nametext></name>
       <fsummary>Inspect the content of an iolist.</fsummary>
       <desc>
@@ -1627,7 +1649,7 @@ enif_free_iovec(iovec);]]></code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_inspect_iovec(ErlNifEnv*
+      <name since="OTP 20.1"><ret>int</ret><nametext>enif_inspect_iovec(ErlNifEnv*
         env, size_t max_elements, ERL_NIF_TERM iovec_term, ERL_NIF_TERM* tail,
         ErlNifIOVec** iovec)</nametext></name>
       <fsummary>Inspect a list of binaries as an ErlNifIOVec.</fsummary>
@@ -1667,7 +1689,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ErlNifIOQueue *</ret>
+      <name since="OTP 20.1"><ret>ErlNifIOQueue *</ret>
       <nametext>enif_ioq_create(ErlNifIOQueueOpts opts)</nametext></name>
       <fsummary>Create a new IO Queue</fsummary>
       <desc>
@@ -1678,7 +1700,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>void</ret>
+      <name since="OTP 20.1"><ret>void</ret>
       <nametext>enif_ioq_destroy(ErlNifIOQueue *q)</nametext></name>
       <fsummary>Destroy an IO Queue and free it's content</fsummary>
       <desc>
@@ -1687,7 +1709,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP 20.1"><ret>int</ret>
       <nametext>enif_ioq_deq(ErlNifIOQueue *q, size_t count, size_t *size)</nametext></name>
       <fsummary>Dequeue count bytes from the IO Queue</fsummary>
       <desc>
@@ -1700,7 +1722,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP 20.1"><ret>int</ret>
       <nametext>enif_ioq_enq_binary(ErlNifIOQueue *q, ErlNifBinary *bin, size_t skip)</nametext></name>
       <fsummary>Enqueue the binary into the IO Queue</fsummary>
       <desc>
@@ -1713,7 +1735,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP 20.1"><ret>int</ret>
       <nametext>enif_ioq_enqv(ErlNifIOQueue *q, ErlNifIOVec *iovec, size_t skip)</nametext></name>
       <fsummary>Enqueue the iovec into the IO Queue</fsummary>
       <desc>
@@ -1724,7 +1746,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>SysIOVec *</ret>
+      <name since="OTP 20.1"><ret>SysIOVec *</ret>
       <nametext>enif_ioq_peek(ErlNifIOQueue *q, int *iovlen)</nametext></name>
       <fsummary>Peek inside the IO Queue</fsummary>
       <desc>
@@ -1738,7 +1760,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP 21.0"><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>
@@ -1753,7 +1775,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>size_t</ret>
+      <name since="OTP 20.1"><ret>size_t</ret>
       <nametext>enif_ioq_size(ErlNifIOQueue *q)</nametext></name>
       <fsummary>Get the current size of the IO Queue</fsummary>
       <desc>
@@ -1762,7 +1784,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP R13B04"><ret>int</ret>
         <nametext>enif_is_atom(ErlNifEnv* env, ERL_NIF_TERM term)</nametext>
       </name>
       <fsummary>Determine if a term is an atom.</fsummary>
@@ -1772,7 +1794,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since=""><ret>int</ret>
         <nametext>enif_is_binary(ErlNifEnv* env, ERL_NIF_TERM term)</nametext>
       </name>
       <fsummary>Determine if a term is a binary.</fsummary>
@@ -1782,7 +1804,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP 19.0"><ret>int</ret>
         <nametext>enif_is_current_process_alive(ErlNifEnv* env)</nametext>
       </name>
       <fsummary>Determine if currently executing process is alive.</fsummary>
@@ -1795,7 +1817,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_is_empty_list(ErlNifEnv* env,
+      <name since="OTP R13B04"><ret>int</ret><nametext>enif_is_empty_list(ErlNifEnv* env,
         ERL_NIF_TERM term)</nametext></name>
       <fsummary>Determine if a term is an empty list.</fsummary>
       <desc>
@@ -1804,7 +1826,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_is_exception(ErlNifEnv* env,
+      <name since="OTP R14B03"><ret>int</ret><nametext>enif_is_exception(ErlNifEnv* env,
         ERL_NIF_TERM term)</nametext></name>
       <fsummary>Determine if a term is an exception.</fsummary>
       <desc><marker id="enif_is_exception"/>
@@ -1813,7 +1835,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_is_fun(ErlNifEnv* env, ERL_NIF_TERM
+      <name since="OTP R13B04"><ret>int</ret><nametext>enif_is_fun(ErlNifEnv* env, ERL_NIF_TERM
         term)</nametext></name>
       <fsummary>Determine if a term is a fun.</fsummary>
       <desc>
@@ -1822,7 +1844,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_is_identical(ERL_NIF_TERM lhs,
+      <name since="OTP R13B04"><ret>int</ret><nametext>enif_is_identical(ERL_NIF_TERM lhs,
         ERL_NIF_TERM rhs)</nametext></name>
       <fsummary>Erlang operator =:=.</fsummary>
       <desc>
@@ -1832,7 +1854,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP R14B"><ret>int</ret>
         <nametext>enif_is_list(ErlNifEnv* env, ERL_NIF_TERM term)</nametext>
       </name>
       <fsummary>Determine if a term is a list.</fsummary>
@@ -1842,7 +1864,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_is_map(ErlNifEnv* env, ERL_NIF_TERM
+      <name since="OTP 18.0"><ret>int</ret><nametext>enif_is_map(ErlNifEnv* env, ERL_NIF_TERM
         term)</nametext></name>
       <fsummary>Determine if a term is a map.</fsummary>
       <desc>
@@ -1852,7 +1874,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_is_number(ErlNifEnv* env, ERL_NIF_TERM
+      <name since="OTP R15B"><ret>int</ret><nametext>enif_is_number(ErlNifEnv* env, ERL_NIF_TERM
         term)</nametext></name>
       <fsummary>Determine if a term is a number (integer or float).</fsummary>
       <desc>
@@ -1861,7 +1883,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP R13B04"><ret>int</ret>
         <nametext>enif_is_pid(ErlNifEnv* env, ERL_NIF_TERM term)</nametext>
       </name>
       <fsummary>Determine if a term is a pid.</fsummary>
@@ -1871,7 +1893,18 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP 22.0"><ret>int</ret>
+        <nametext>enif_is_pid_undefined(const ErlNifPid* pid)</nametext></name>
+      <fsummary>Determine if pid is undefined.</fsummary>
+      <desc>
+        <p>Returns <c>true</c> if <c>pid</c> has been set as undefined by
+	<seealso marker="#enif_set_pid_undefined"><c>enif_set_pid_undefined</c>
+	</seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name since="OTP R13B04"><ret>int</ret>
         <nametext>enif_is_port(ErlNifEnv* env, ERL_NIF_TERM term)</nametext>
       </name>
       <fsummary>Determine if a term is a port.</fsummary>
@@ -1881,7 +1914,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_is_port_alive(ErlNifEnv* env,
+      <name since="OTP 19.0"><ret>int</ret><nametext>enif_is_port_alive(ErlNifEnv* env,
         ErlNifPort *port_id)</nametext></name>
       <fsummary>Determine if a local port is alive.</fsummary>
       <desc>
@@ -1893,7 +1926,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_is_process_alive(ErlNifEnv* env,
+      <name since="OTP 19.0"><ret>int</ret><nametext>enif_is_process_alive(ErlNifEnv* env,
         ErlNifPid *pid)</nametext></name>
       <fsummary>Determine if a local process is alive.</fsummary>
       <desc>
@@ -1905,7 +1938,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP R13B04"><ret>int</ret>
         <nametext>enif_is_ref(ErlNifEnv* env, ERL_NIF_TERM term)</nametext>
       </name>
       <fsummary>Determine if a term is a reference.</fsummary>
@@ -1915,7 +1948,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP R14B"><ret>int</ret>
         <nametext>enif_is_tuple(ErlNifEnv* env, ERL_NIF_TERM term)</nametext>
       </name>
       <fsummary>Determine if a term is a tuple.</fsummary>
@@ -1925,7 +1958,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP R14B"><ret>int</ret>
         <nametext>enif_keep_resource(void* obj)</nametext>
       </name>
       <fsummary>Add a reference to a resource object.</fsummary>
@@ -1941,7 +1974,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret>
+      <name since=""><ret>ERL_NIF_TERM</ret>
         <nametext>enif_make_atom(ErlNifEnv* env, const char* name)</nametext>
       </name>
       <fsummary>Create an atom term.</fsummary>
@@ -1955,7 +1988,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_atom_len(ErlNifEnv* env,
+      <name since="OTP R14B"><ret>ERL_NIF_TERM</ret><nametext>enif_make_atom_len(ErlNifEnv* env,
         const char* name, size_t len)</nametext></name>
       <fsummary>Create an atom term.</fsummary>
       <desc>
@@ -1969,7 +2002,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret>
+      <name since=""><ret>ERL_NIF_TERM</ret>
         <nametext>enif_make_badarg(ErlNifEnv* env)</nametext></name>
       <fsummary>Make a badarg exception.</fsummary>
       <desc>
@@ -1997,7 +2030,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret>
+      <name since=""><ret>ERL_NIF_TERM</ret>
         <nametext>enif_make_binary(ErlNifEnv* env, ErlNifBinary* bin)</nametext>
       </name>
       <fsummary>Make a binary term.</fsummary>
@@ -2010,7 +2043,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_copy(ErlNifEnv* dst_env,
+      <name since="OTP R14B"><ret>ERL_NIF_TERM</ret><nametext>enif_make_copy(ErlNifEnv* dst_env,
         ERL_NIF_TERM src_term)</nametext></name>
       <fsummary>Make a copy of a term.</fsummary>
       <desc>
@@ -2021,7 +2054,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret>
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret>
         <nametext>enif_make_double(ErlNifEnv* env, double d)</nametext></name>
       <fsummary>Create a floating-point term.</fsummary>
       <desc>
@@ -2033,7 +2066,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_make_existing_atom(ErlNifEnv* env,
+      <name since="OTP R13B04"><ret>int</ret><nametext>enif_make_existing_atom(ErlNifEnv* env,
         const char* name, ERL_NIF_TERM* atom, ErlNifCharEncoding
         encode)</nametext></name>
       <fsummary>Create an existing atom term.</fsummary>
@@ -2049,7 +2082,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_make_existing_atom_len(ErlNifEnv* env,
+      <name since="OTP R14B"><ret>int</ret><nametext>enif_make_existing_atom_len(ErlNifEnv* env,
         const char* name, size_t len, ERL_NIF_TERM* atom, ErlNifCharEncoding
         encoding)</nametext></name>
       <fsummary>Create an existing atom term.</fsummary>
@@ -2065,7 +2098,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
       </desc>
     </func>
 
-    <func><name><ret>ERL_NIF_TERM</ret>
+    <func><name since=""><ret>ERL_NIF_TERM</ret>
       <nametext>enif_make_int(ErlNifEnv* env, int i)</nametext></name>
       <fsummary>Create an integer term.</fsummary>
       <desc>
@@ -2074,7 +2107,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret>
+      <name since="OTP R14B"><ret>ERL_NIF_TERM</ret>
         <nametext>enif_make_int64(ErlNifEnv* env, ErlNifSInt64 i)</nametext>
       </name>
       <fsummary>Create an integer term.</fsummary>
@@ -2084,7 +2117,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret>
+      <name since=""><ret>ERL_NIF_TERM</ret>
         <nametext>enif_make_list(ErlNifEnv* env, unsigned cnt, ...)</nametext>
       </name>
       <fsummary>Create a list term.</fsummary>
@@ -2097,24 +2130,24 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret>
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret>
         <nametext>enif_make_list1(ErlNifEnv* env, ERL_NIF_TERM e1)</nametext>
       </name>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_list2(ErlNifEnv* env,
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret><nametext>enif_make_list2(ErlNifEnv* env,
         ERL_NIF_TERM e1, ERL_NIF_TERM e2)</nametext></name>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_list3(ErlNifEnv* env,
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret><nametext>enif_make_list3(ErlNifEnv* env,
         ERL_NIF_TERM e1, ERL_NIF_TERM e2, ERL_NIF_TERM e3)</nametext></name>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_list4(ErlNifEnv* env,
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret><nametext>enif_make_list4(ErlNifEnv* env,
         ERL_NIF_TERM e1, ..., ERL_NIF_TERM e4)</nametext></name>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_list5(ErlNifEnv* env,
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret><nametext>enif_make_list5(ErlNifEnv* env,
         ERL_NIF_TERM e1, ..., ERL_NIF_TERM e5)</nametext></name>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_list6(ErlNifEnv* env,
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret><nametext>enif_make_list6(ErlNifEnv* env,
         ERL_NIF_TERM e1, ..., ERL_NIF_TERM e6)</nametext></name>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_list7(ErlNifEnv* env,
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret><nametext>enif_make_list7(ErlNifEnv* env,
         ERL_NIF_TERM e1, ..., ERL_NIF_TERM e7)</nametext></name>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_list8(ErlNifEnv* env,
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret><nametext>enif_make_list8(ErlNifEnv* env,
         ERL_NIF_TERM e1, ..., ERL_NIF_TERM e8)</nametext></name>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_list9(ErlNifEnv* env,
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret><nametext>enif_make_list9(ErlNifEnv* env,
         ERL_NIF_TERM e1, ..., ERL_NIF_TERM e9)</nametext></name>
       <fsummary>Create a list term.</fsummary>
       <desc>
@@ -2126,7 +2159,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_list_cell(ErlNifEnv*
+      <name since=""><ret>ERL_NIF_TERM</ret><nametext>enif_make_list_cell(ErlNifEnv*
         env, ERL_NIF_TERM head, ERL_NIF_TERM tail)</nametext></name>
       <fsummary>Create a list cell.</fsummary>
       <desc>
@@ -2135,7 +2168,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret>
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret>
         <nametext>enif_make_list_from_array(ErlNifEnv* env, const ERL_NIF_TERM
           arr[], unsigned cnt)</nametext></name>
       <fsummary>Create a list term from an array.</fsummary>
@@ -2147,7 +2180,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret>
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret>
         <nametext>enif_make_long(ErlNifEnv* env, long int i)</nametext></name>
       <fsummary>Create an integer term from a long int.</fsummary>
       <desc>
@@ -2156,7 +2189,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_make_map_put(ErlNifEnv* env,
+      <name since="OTP 18.0"><ret>int</ret><nametext>enif_make_map_put(ErlNifEnv* env,
         ERL_NIF_TERM map_in, ERL_NIF_TERM key, ERL_NIF_TERM value,
         ERL_NIF_TERM* map_out)</nametext></name>
       <fsummary>Insert key-value pair in map.</fsummary>
@@ -2172,7 +2205,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_make_map_remove(ErlNifEnv* env,
+      <name since="OTP 18.0"><ret>int</ret><nametext>enif_make_map_remove(ErlNifEnv* env,
         ERL_NIF_TERM map_in, ERL_NIF_TERM key, ERL_NIF_TERM* map_out)</nametext>
       </name>
       <fsummary>Remove key from map.</fsummary>
@@ -2188,7 +2221,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_make_map_update(ErlNifEnv* env,
+      <name since="OTP 18.0"><ret>int</ret><nametext>enif_make_map_update(ErlNifEnv* env,
         ERL_NIF_TERM map_in, ERL_NIF_TERM key, ERL_NIF_TERM new_value,
         ERL_NIF_TERM* map_out)</nametext></name>
       <fsummary>Replace value for key in map.</fsummary>
@@ -2203,7 +2236,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP 21.0"><ret>int</ret>
         <nametext>enif_make_map_from_arrays(ErlNifEnv* env, ERL_NIF_TERM keys[],
         ERL_NIF_TERM values[], size_t cnt, ERL_NIF_TERM *map_out)</nametext></name>
       <fsummary>Make map term from the given keys and values.</fsummary>
@@ -2217,7 +2250,19 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>unsigned char *</ret><nametext>enif_make_new_binary(ErlNifEnv*
+      <name since="OTP 22.0"><ret>ERL_NIF_TERM</ret>
+        <nametext>enif_make_monitor_term(ErlNifEnv* env, const ErlNifMonitor* mon)</nametext></name>
+      <fsummary>Make monitor term from the given monitor identifier.</fsummary>
+      <desc>
+        <p>Creates a term identifying the given monitor received from
+	<seealso marker="#enif_monitor_process"><c>enif_monitor_process</c>
+	</seealso>.</p>
+	<p>This function is primarily intended for debugging purpose.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name since="OTP R14B"><ret>unsigned char *</ret><nametext>enif_make_new_binary(ErlNifEnv*
         env, size_t size, ERL_NIF_TERM* termp)</nametext></name>
       <fsummary>Allocate and create a new binary term.</fsummary>
       <desc>
@@ -2233,7 +2278,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret>
+      <name since="OTP 18.0"><ret>ERL_NIF_TERM</ret>
         <nametext>enif_make_new_map(ErlNifEnv* env)</nametext></name>
       <fsummary>Make an empty map term.</fsummary>
       <desc>
@@ -2242,17 +2287,18 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret>
+      <name since="OTP R14B"><ret>ERL_NIF_TERM</ret>
         <nametext>enif_make_pid(ErlNifEnv* env, const ErlNifPid* pid)</nametext>
       </name>
       <fsummary>Make a pid term.</fsummary>
       <desc>
-        <p>Makes a pid term from <c>*pid</c>.</p>
+        <p>Makes a pid term or the atom <seealso marker="#enif_set_pid_undefined">
+	<c>undefined</c></seealso> from <c>*pid</c>.</p>
       </desc>
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret>
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret>
         <nametext>enif_make_ref(ErlNifEnv* env)</nametext></name>
       <fsummary>Create a reference.</fsummary>
       <desc>
@@ -2262,7 +2308,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret>
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret>
         <nametext>enif_make_resource(ErlNifEnv* env, void* obj)</nametext>
       </name>
       <fsummary>Create an opaque handle to a resource object.</fsummary>
@@ -2310,7 +2356,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret>
+      <name since="OTP R14B"><ret>ERL_NIF_TERM</ret>
         <nametext>enif_make_resource_binary(ErlNifEnv* env, void* obj, const
         void* data, size_t size)</nametext></name>
       <fsummary>Create a custom binary term.</fsummary>
@@ -2336,7 +2382,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP R15B"><ret>int</ret>
         <nametext>enif_make_reverse_list(ErlNifEnv* env, ERL_NIF_TERM list_in,
         ERL_NIF_TERM *list_out)</nametext></name>
       <fsummary>Create the reverse of a list.</fsummary>
@@ -2352,7 +2398,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_string(ErlNifEnv* env,
+      <name since=""><ret>ERL_NIF_TERM</ret><nametext>enif_make_string(ErlNifEnv* env,
         const char* string, ErlNifCharEncoding encoding)</nametext></name>
       <fsummary>Create a string.</fsummary>
       <desc>
@@ -2363,7 +2409,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_string_len(ErlNifEnv*
+      <name since="OTP R14B"><ret>ERL_NIF_TERM</ret><nametext>enif_make_string_len(ErlNifEnv*
         env, const char* string, size_t len, ErlNifCharEncoding
         encoding)</nametext></name>
       <fsummary>Create a string.</fsummary>
@@ -2376,7 +2422,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_sub_binary(ErlNifEnv*
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret><nametext>enif_make_sub_binary(ErlNifEnv*
         env, ERL_NIF_TERM bin_term, size_t pos, size_t size)</nametext></name>
       <fsummary>Make a subbinary term.</fsummary>
       <desc>
@@ -2388,7 +2434,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_tuple(ErlNifEnv* env,
+      <name since=""><ret>ERL_NIF_TERM</ret><nametext>enif_make_tuple(ErlNifEnv* env,
         unsigned cnt, ...)</nametext></name>
       <fsummary>Creates a tuple term.</fsummary>
       <desc>
@@ -2399,23 +2445,23 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_tuple1(ErlNifEnv* env,
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret><nametext>enif_make_tuple1(ErlNifEnv* env,
         ERL_NIF_TERM e1)</nametext></name>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_tuple2(ErlNifEnv* env,
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret><nametext>enif_make_tuple2(ErlNifEnv* env,
         ERL_NIF_TERM e1, ERL_NIF_TERM e2)</nametext></name>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_tuple3(ErlNifEnv* env,
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret><nametext>enif_make_tuple3(ErlNifEnv* env,
         ERL_NIF_TERM e1, ERL_NIF_TERM e2, ERL_NIF_TERM e3)</nametext></name>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_tuple4(ErlNifEnv* env,
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret><nametext>enif_make_tuple4(ErlNifEnv* env,
         ERL_NIF_TERM e1, ..., ERL_NIF_TERM e4)</nametext></name>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_tuple5(ErlNifEnv* env,
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret><nametext>enif_make_tuple5(ErlNifEnv* env,
         ERL_NIF_TERM e1, ..., ERL_NIF_TERM e5)</nametext></name>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_tuple6(ErlNifEnv* env,
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret><nametext>enif_make_tuple6(ErlNifEnv* env,
         ERL_NIF_TERM e1, ..., ERL_NIF_TERM e6)</nametext></name>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_tuple7(ErlNifEnv* env,
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret><nametext>enif_make_tuple7(ErlNifEnv* env,
         ERL_NIF_TERM e1, ..., ERL_NIF_TERM e7)</nametext></name>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_tuple8(ErlNifEnv* env,
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret><nametext>enif_make_tuple8(ErlNifEnv* env,
         ERL_NIF_TERM e1, ..., ERL_NIF_TERM e8)</nametext></name>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_tuple9(ErlNifEnv* env,
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret><nametext>enif_make_tuple9(ErlNifEnv* env,
         ERL_NIF_TERM e1, ..., ERL_NIF_TERM e9)</nametext></name>
       <fsummary>Create a tuple term.</fsummary>
       <desc>
@@ -2427,7 +2473,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret>
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret>
         <nametext>enif_make_tuple_from_array(ErlNifEnv* env, const ERL_NIF_TERM
         arr[], unsigned cnt)</nametext></name>
       <fsummary>Create a tuple term from an array.</fsummary>
@@ -2438,7 +2484,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret>
+      <name since="OTP R13B04"><ret>ERL_NIF_TERM</ret>
         <nametext>enif_make_uint(ErlNifEnv* env, unsigned int i)</nametext>
       </name>
       <fsummary>Create an unsigned integer term.</fsummary>
@@ -2448,7 +2494,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret>
+      <name since="OTP R14B"><ret>ERL_NIF_TERM</ret>
         <nametext>enif_make_uint64(ErlNifEnv* env, ErlNifUInt64 i)</nametext>
       </name>
       <fsummary>Create an unsigned integer term.</fsummary>
@@ -2458,7 +2504,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret>
+      <name since=""><ret>ERL_NIF_TERM</ret>
         <nametext>enif_make_ulong(ErlNifEnv* env, unsigned long i)</nametext>
       </name>
       <fsummary>Create an integer term from an unsigned long int.</fsummary>
@@ -2468,7 +2514,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_make_unique_integer(ErlNifEnv
+      <name since="OTP 19.0"><ret>ERL_NIF_TERM</ret><nametext>enif_make_unique_integer(ErlNifEnv
         *env, ErlNifUniqueInteger properties)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -2486,7 +2532,7 @@ enif_inspect_iovec(env, max_elements, term, &amp;tail, &amp;iovec);
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_map_iterator_create(ErlNifEnv *env,
+      <name since="OTP 18.0"><ret>int</ret><nametext>enif_map_iterator_create(ErlNifEnv *env,
         ERL_NIF_TERM map, ErlNifMapIterator *iter, ErlNifMapIteratorEntry
         entry)</nametext></name>
       <fsummary>Create a map iterator.</fsummary>
@@ -2521,7 +2567,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>enif_map_iterator_destroy(ErlNifEnv *env,
+      <name since="OTP 18.0"><ret>void</ret><nametext>enif_map_iterator_destroy(ErlNifEnv *env,
         ErlNifMapIterator *iter)</nametext></name>
       <fsummary>Destroy a map iterator.</fsummary>
       <desc>
@@ -2532,7 +2578,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_map_iterator_get_pair(ErlNifEnv *env,
+      <name since="OTP 18.0"><ret>int</ret><nametext>enif_map_iterator_get_pair(ErlNifEnv *env,
         ErlNifMapIterator *iter, ERL_NIF_TERM *key, ERL_NIF_TERM
         *value)</nametext></name>
       <fsummary>Get key and value at current map iterator position.</fsummary>
@@ -2545,7 +2591,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_map_iterator_is_head(ErlNifEnv *env,
+      <name since="OTP 18.0"><ret>int</ret><nametext>enif_map_iterator_is_head(ErlNifEnv *env,
         ErlNifMapIterator *iter)</nametext></name>
       <fsummary>Check if map iterator is positioned before first.</fsummary>
       <desc>
@@ -2555,7 +2601,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_map_iterator_is_tail(ErlNifEnv *env,
+      <name since="OTP 18.0"><ret>int</ret><nametext>enif_map_iterator_is_tail(ErlNifEnv *env,
         ErlNifMapIterator *iter)</nametext></name>
       <fsummary>Check if map iterator is positioned after last.</fsummary>
       <desc>
@@ -2565,7 +2611,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_map_iterator_next(ErlNifEnv *env,
+      <name since="OTP 18.0"><ret>int</ret><nametext>enif_map_iterator_next(ErlNifEnv *env,
         ErlNifMapIterator *iter)</nametext></name>
       <fsummary>Increment map iterator to point to next entry.</fsummary>
       <desc>
@@ -2577,7 +2623,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_map_iterator_prev(ErlNifEnv *env,
+      <name since="OTP 18.0"><ret>int</ret><nametext>enif_map_iterator_prev(ErlNifEnv *env,
         ErlNifMapIterator *iter)</nametext></name>
       <fsummary>Decrement map iterator to point to previous entry.</fsummary>
       <desc>
@@ -2589,8 +2635,8 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_monitor_process(ErlNifEnv* caller_env, void* obj,
-      const ErlNifPid* target_pid, ErlNifMonitor* mon)</nametext></name>
+      <name since="OTP 20.0"><ret>int</ret><nametext>enif_monitor_process(ErlNifEnv* caller_env,
+      void* obj, const ErlNifPid* target_pid, ErlNifMonitor* mon)</nametext></name>
       <fsummary>Monitor a process from a resource.</fsummary>
       <desc>
         <marker id="enif_monitor_process"></marker>
@@ -2613,7 +2659,9 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
 	<p>Argument <c>caller_env</c> is the environment of the calling process
 	or callback. Must only be NULL if calling from a custom thread.</p>
         <p>Returns <c>0</c> on success, &lt; 0 if no <c>down</c> callback is
-          provided, and &gt; 0 if the process is no longer alive.</p>
+          provided, and &gt; 0 if the process is no longer alive or if
+	  <c>target_pid</c> is <seealso marker="#enif_set_pid_undefined">
+	  undefined</seealso>.</p>
         <p>This function is only thread-safe when the emulator with SMP support
           is used. It can only be used in a non-SMP emulator from a NIF-calling
           thread.</p>
@@ -2621,7 +2669,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>ErlNifTime</ret>
+      <name since="OTP 18.3"><ret>ErlNifTime</ret>
         <nametext>enif_monotonic_time(ErlNifTimeUnit time_unit)</nametext>
       </name>
       <fsummary>Get Erlang monotonic time.</fsummary>
@@ -2642,7 +2690,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>ErlNifMutex *</ret>
+      <name since="OTP R13B04"><ret>ErlNifMutex *</ret>
         <nametext>enif_mutex_create(char *name)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -2652,7 +2700,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>void</ret>
+      <name since="OTP R13B04"><ret>void</ret>
         <nametext>enif_mutex_destroy(ErlNifMutex *mtx)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -2662,7 +2710,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>void</ret>
+      <name since="OTP R13B04"><ret>void</ret>
         <nametext>enif_mutex_lock(ErlNifMutex *mtx)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -2672,7 +2720,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>char*</ret>
+      <name since="OTP 21.0"><ret>char*</ret>
         <nametext>enif_mutex_name(ErlNifMutex* mtx)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -2682,7 +2730,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP R13B04"><ret>int</ret>
       <nametext>enif_mutex_trylock(ErlNifMutex *mtx)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -2692,7 +2740,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>void</ret>
+      <name since="OTP R13B04"><ret>void</ret>
         <nametext>enif_mutex_unlock(ErlNifMutex *mtx)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -2702,7 +2750,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret>
+      <name since="OTP 19.0"><ret>ERL_NIF_TERM</ret>
         <nametext>enif_now_time(ErlNifEnv *env)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -2713,7 +2761,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>ErlNifResourceType *</ret>
+      <name since="OTP R13B04"><ret>ErlNifResourceType *</ret>
         <nametext>enif_open_resource_type(ErlNifEnv* env, const char*
         module_str, const char* name, ErlNifResourceDtor* dtor,
         ErlNifResourceFlags flags, ErlNifResourceFlags* tried)</nametext>
@@ -2752,7 +2800,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>ErlNifResourceType *</ret>
+      <name since="OTP 20.0"><ret>ErlNifResourceType *</ret>
         <nametext>enif_open_resource_type_x(ErlNifEnv* env, const char* name,
 	const ErlNifResourceTypeInit* init,
         ErlNifResourceFlags flags, ErlNifResourceFlags* tried)</nametext>
@@ -2771,7 +2819,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-     <name><ret>int</ret><nametext>enif_port_command(ErlNifEnv* env, const
+     <name since="OTP 19.0"><ret>int</ret><nametext>enif_port_command(ErlNifEnv* env, const
        ErlNifPort* to_port, ErlNifEnv *msg_env, ERL_NIF_TERM msg)</nametext>
      </name>
      <fsummary>Send a port_command to to_port.</fsummary>
@@ -2814,7 +2862,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>void *</ret>
+      <name since="OTP R13B04"><ret>void *</ret>
         <nametext>enif_priv_data(ErlNifEnv* env)</nametext></name>
       <fsummary>Get the private data of a NIF library.</fsummary>
       <desc>
@@ -2825,7 +2873,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_raise_exception(ErlNifEnv*
+      <name since="OTP 18.0"><ret>ERL_NIF_TERM</ret><nametext>enif_raise_exception(ErlNifEnv*
         env, ERL_NIF_TERM reason)</nametext></name>
       <fsummary>Raise a NIF error exception.</fsummary>
       <desc>
@@ -2848,7 +2896,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>void *</ret>
+      <name since="OTP 20.2"><ret>void *</ret>
         <nametext>enif_realloc(void* ptr, size_t size)</nametext></name>
       <fsummary>Reallocate dynamic memory.</fsummary>
       <desc>
@@ -2862,7 +2910,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP R13B04"><ret>int</ret>
         <nametext>enif_realloc_binary(ErlNifBinary* bin, size_t size)</nametext>
       </name>
       <fsummary>Change the size of a binary.</fsummary>
@@ -2876,7 +2924,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>void</ret>
+      <name since=""><ret>void</ret>
         <nametext>enif_release_binary(ErlNifBinary* bin)</nametext></name>
       <fsummary>Release a binary.</fsummary>
       <desc>
@@ -2887,7 +2935,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>void</ret>
+      <name since="OTP R13B04"><ret>void</ret>
         <nametext>enif_release_resource(void* obj)</nametext></name>
       <fsummary>Release a resource object.</fsummary>
       <desc>
@@ -2902,11 +2950,15 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
           References made by <seealso marker="#enif_make_resource">
           <c>enif_make_resource</c></seealso>
           can only be removed by the garbage collector.</p>
+	<p>There are no guarantees exactly when the destructor of an
+	  unreferenced resource is called. It could be called directly by
+	  <c>enif_release_resource</c> but it could also be scheduled to be
+	  called at a later time possibly by another thread.</p>
       </desc>
     </func>
 
     <func>
-      <name><ret>ErlNifRWLock *</ret>
+      <name since="OTP R13B04"><ret>ErlNifRWLock *</ret>
         <nametext>enif_rwlock_create(char *name)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -2916,7 +2968,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>void</ret>
+      <name since="OTP R13B04"><ret>void</ret>
         <nametext>enif_rwlock_destroy(ErlNifRWLock *rwlck)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -2926,7 +2978,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>char*</ret>
+      <name since="OTP 21.0"><ret>char*</ret>
         <nametext>enif_rwlock_name(ErlNifRWLock* rwlck)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -2936,7 +2988,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>void</ret>
+      <name since="OTP R13B04"><ret>void</ret>
         <nametext>enif_rwlock_rlock(ErlNifRWLock *rwlck)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -2946,7 +2998,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>void</ret>
+      <name since="OTP R13B04"><ret>void</ret>
         <nametext>enif_rwlock_runlock(ErlNifRWLock *rwlck)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -2956,7 +3008,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>void</ret>
+      <name since="OTP R13B04"><ret>void</ret>
         <nametext>enif_rwlock_rwlock(ErlNifRWLock *rwlck)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -2966,7 +3018,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>void</ret>
+      <name since="OTP R13B04"><ret>void</ret>
         <nametext>enif_rwlock_rwunlock(ErlNifRWLock *rwlck)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -2976,7 +3028,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP R13B04"><ret>int</ret>
         <nametext>enif_rwlock_tryrlock(ErlNifRWLock *rwlck)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -2986,7 +3038,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP R13B04"><ret>int</ret>
         <nametext>enif_rwlock_tryrwlock(ErlNifRWLock *rwlck)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -2996,7 +3048,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>ERL_NIF_TERM</ret><nametext>enif_schedule_nif(ErlNifEnv* env,
+      <name since="OTP 17.3"><ret>ERL_NIF_TERM</ret><nametext>enif_schedule_nif(ErlNifEnv* env,
         const char* fun_name, int flags, ERL_NIF_TERM (*fp)(ErlNifEnv* env, int
         argc, const ERL_NIF_TERM argv[]), int argc, const ERL_NIF_TERM
         argv[])</nametext></name>
@@ -3041,7 +3093,7 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP 20.0"><ret>int</ret>
         <nametext>enif_select(ErlNifEnv* env, ErlNifEvent event, enum ErlNifSelectFlags mode,
 	void* obj, const ErlNifPid* pid, ERL_NIF_TERM ref)</nametext>
       </name>
@@ -3056,13 +3108,21 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
 	<p>Argument <c>mode</c> describes the type of events to wait for. It can be
 	  <c>ERL_NIF_SELECT_READ</c>, <c>ERL_NIF_SELECT_WRITE</c> or a bitwise
 	  OR combination to wait for both. It can also be <c>ERL_NIF_SELECT_STOP</c>
-	  which is described further below. When a read or write event is triggered,
+	  or <c>ERL_NIF_SELECT_CANCEL</c> which are described further
+	  below. When a read or write event is triggered,
 	  a notification message like this is sent to the process identified by
 	  <c>pid</c>:</p>
 	<code type="none">{select, Obj, Ref, ready_input | ready_output}</code>
 	<p><c>ready_input</c> or <c>ready_output</c> indicates if the event object
 	  is ready for reading or writing.</p>
-	<p>Argument <c>pid</c> may be <c>NULL</c> to indicate the calling process.</p>
+	<note><p>For complete control over the message format use the newer functions
+	  <seealso marker="#enif_select_read"><c>enif_select_read</c></seealso> or
+	  <seealso marker="#enif_select_write"><c>enif_select_write</c></seealso>
+	  introduced in erts-11.0 (OTP-22.0).</p>
+	</note>
+	<p>Argument <c>pid</c> may be <c>NULL</c> to indicate the calling
+	  process. It must not be set as <seealso marker="#enif_set_pid_undefined">
+	  undefined</seealso>.</p>
 	<p>Argument <c>obj</c> is a resource object obtained from
           <seealso marker="#enif_alloc_resource"><c>enif_alloc_resource</c></seealso>.
 	  The purpose of the resource objects is as a container of the event object
@@ -3073,17 +3133,29 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
 	  or the atom <c>undefined</c>. It will be passed as <c>Ref</c> in the notifications.
 	  If a selective <c>receive</c> statement is used to wait for the notification
 	  then a reference created just before the <c>receive</c> will exploit a runtime
-	  optimization that bypasses all earlier received messages in the queue.</p>
+	  optimization that bypasses all earlier received messages in the
+	  queue.</p>
 	<p>The notifications are one-shot only. To receive further notifications of the same
 	  type (read or write), repeated calls to <c>enif_select</c> must be made
 	  after receiving each notification.</p>
+	<p><c>ERL_NIF_SELECT_CANCEL</c> can be used to cancel previously
+	  selected events. It must be used in a bitwise OR combination with
+	  <c>ERL_NIF_SELECT_READ</c> and/or <c>ERL_NIF_SELECT_WRITE</c> to
+	  indicate which type of event to cancel. Arguments <c>pid</c> and
+	  <c>ref</c> are ignored when <c>ERL_NIF_SELECT_CANCEL</c> is specified.
+	  The return value will tell if the event was actualy cancelled or if a
+	  notification may already have been sent.</p>
 	<p>Use <c>ERL_NIF_SELECT_STOP</c> as <c>mode</c> in order to safely
 	  close an event object that has been passed to <c>enif_select</c>. The
 	  <seealso marker="#ErlNifResourceStop"><c>stop</c></seealso> callback
 	  of the resource <c>obj</c> will be called when it is safe to close
 	  the event object. This safe way of closing event objects must be used
-	  even if all notifications have been received and no further calls to
-	  <c>enif_select</c> have been made.</p>
+	  even if all notifications have been received (or cancelled) and no
+	  further calls to <c>enif_select</c> have been made.
+	  <c>ERL_NIF_SELECT_STOP</c> will first cancel any selected events
+	  before it calls or schedules the <c>stop</c> callback. Arguments
+	  <c>pid</c> and <c>ref</c> are ignored when <c>ERL_NIF_SELECT_STOP</c>
+	  is specified.</p>
 	<p>The first call to <c>enif_select</c> for a specific OS <c>event</c> will establish
 	  a relation between the event object and the containing resource. All subsequent calls
 	  for an <c>event</c> must pass its containing resource as argument
@@ -3105,7 +3177,15 @@ enif_map_iterator_destroy(env, &amp;iter);</code>
           <item>The stop callback was called directly by <c>enif_select</c>.</item>
           <tag><c>ERL_NIF_SELECT_STOP_SCHEDULED</c></tag>
           <item>The stop callback was scheduled to run on some other thread
-	    or later by this thread.</item>
+	  or later by this thread.</item>
+	  <tag><c>ERL_NIF_SELECT_READ_CANCELLED</c></tag>
+          <item>A read event was cancelled by <c>ERL_NIF_SELECT_CANCEL</c> or
+	  <c>ERL_NIF_SELECT_STOP</c> and is guaranteed not to generate a
+	  <c>ready_input</c> notification message.</item>
+	  <tag><c>ERL_NIF_SELECT_WRITE_CANCELLED</c></tag>
+          <item>A write event was cancelled by <c>ERL_NIF_SELECT_CANCEL</c> or
+	  <c>ERL_NIF_SELECT_STOP</c> and is guaranteed not to generate a
+	  <c>ready_output</c> notification message.</item>
 	</taglist>
 	<p>Returns a negative value if the call failed where the following bits can be set:</p>
         <taglist>
@@ -3131,11 +3211,48 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
 }
 </code>
         </note>
+	<note><p>The mode flag <c>ERL_NIF_SELECT_CANCEL</c> and the return flags
+	  <c>ERL_NIF_SELECT_READ_CANCELLED</c> and
+	  <c>ERL_NIF_SELECT_WRITE_CANCELLED</c> were introduced in erts-11.0
+	  (OTP-22.0).</p>
+	</note>
       </desc>
     </func>
 
     <func>
-      <name><ret>ErlNifPid *</ret>
+      <name since="OTP 22.0"><ret>int</ret>
+      <nametext>enif_select_read(ErlNifEnv* env, ErlNifEvent event, void* obj,
+      const ErlNifPid* pid, ERL_NIF_TERM msg, ErlNifEnv* msg_env)</nametext>
+      </name>
+      <name since="OTP 22.0"><ret>int</ret>
+      <nametext>enif_select_write(ErlNifEnv* env, ErlNifEvent event, void* obj,
+      const ErlNifPid* pid, ERL_NIF_TERM msg, ErlNifEnv* msg_env)</nametext>
+      </name>
+      <fsummary>Manage subscription on IO event.</fsummary>
+      <desc>
+	<p>These are variants of <seealso marker="#enif_select">enif_select</seealso>
+	where you can supply your own message term <c>msg</c> that will be sent to
+	the process instead of the predefined tuple <c>{select,_,_,_}.</c></p>
+        <p>Argument <c>msg_env</c> must either be <c>NULL</c> or the environment of
+	<c>msg</c> allocated with <seealso marker="#enif_alloc_env">
+	<c>enif_alloc_env</c></seealso>. If argument <c>msg_env</c> is
+	<c>NULL</c> the term <c>msg</c> will be copied, otherwise both
+	<c>msg</c> and <c>msg_env</c> will be invalidated by a successful call
+	to <c>enif_select_read</c> or <c>enif_select_write</c>. The environment
+	is then to either be freed with <seealso marker="#enif_free_env">
+        <c>enif_free_env</c></seealso> or cleared for reuse with
+	<seealso marker="#enif_clear_env"><c>enif_clear_env</c></seealso>. An
+	unsuccessful call will leave <c>msg</c> and <c>msg_env</c> still valid.</p>
+	<p>Apart from the message format <c>enif_select_read</c> and
+	<c>enif_select_write</c> behaves exactly the same as <seealso
+	marker="#enif_select">enif_select</seealso> with argument <c>mode</c> as
+	either <c>ERL_NIF_SELECT_READ</c> or <c>ERL_NIF_SELECT_WRITE</c>. To
+	cancel or close events use <seealso marker="#enif_select">enif_select</seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name since="OTP R14B"><ret>ErlNifPid *</ret>
         <nametext>enif_self(ErlNifEnv* caller_env, ErlNifPid* pid)</nametext>
       </name>
       <fsummary>Get the pid of the calling process.</fsummary>
@@ -3148,8 +3265,8 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_send(ErlNifEnv* caller_env, ErlNifPid* to_pid,
-        ErlNifEnv* msg_env, ERL_NIF_TERM msg)</nametext></name>
+      <name since="OTP R14B"><ret>int</ret><nametext>enif_send(ErlNifEnv* caller_env,
+      ErlNifPid* to_pid, ErlNifEnv* msg_env, ERL_NIF_TERM msg)</nametext></name>
       <fsummary>Send a message to a process.</fsummary>
       <desc>
         <p>Sends a message to a process.</p>
@@ -3179,8 +3296,9 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
           <c>msg</c>) is invalidated by a successful call to <c>enif_send</c>.
           The environment is to either be freed with
           <seealso marker="#enif_free_env">
-          <c>enif_free_env</c></seealso> of cleared for reuse with
-          <seealso marker="#enif_clear_env"><c>enif_clear_env</c></seealso>.</p>
+          <c>enif_free_env</c></seealso> or cleared for reuse with
+          <seealso marker="#enif_clear_env"><c>enif_clear_env</c></seealso>. An
+	  unsuccessful call will leave <c>msg</c> and <c>msg_env</c> still valid.</p>
         <p>If <c>msg_env</c> is set to <c>NULL</c>, the <c>msg</c> term is
           copied and the original term and its environment is still valid after
           the call.</p>
@@ -3195,7 +3313,18 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
     </func>
 
     <func>
-      <name><ret>unsigned</ret>
+      <name since="OTP 22.0"><ret>void</ret>
+        <nametext>enif_set_pid_undefined(ErlNifPid* pid)</nametext></name>
+      <fsummary>Set pid as undefined.</fsummary>
+      <desc>
+        <p>Sets an <seealso marker="#ErlNifPid"><c>ErlNifPid</c></seealso>
+	variable as undefined. See <seealso marker="#enif_is_pid_undefined">
+	<c>enif_is_pid_undefined</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name since="OTP R13B04"><ret>unsigned</ret>
         <nametext>enif_sizeof_resource(void* obj)</nametext></name>
       <fsummary>Get the byte size of a resource object.</fsummary>
       <desc>
@@ -3206,7 +3335,7 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_snprintf(char *str, size_t size, const
+      <name since="OTP 19.0"><ret>int</ret><nametext>enif_snprintf(char *str, size_t size, const
         char *format, ...)</nametext></name>
       <fsummary>Format strings and Erlang terms.</fsummary>
       <desc>
@@ -3220,7 +3349,7 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>enif_system_info(ErlNifSysInfo
+      <name since="OTP R13B04"><ret>void</ret><nametext>enif_system_info(ErlNifSysInfo
         *sys_info_ptr, size_t size)</nametext></name>
       <fsummary>Get information about the Erlang runtime system.</fsummary>
       <desc>
@@ -3230,7 +3359,7 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>enif_term_to_binary(ErlNifEnv *env,
+      <name since="OTP 19.0"><ret>int</ret><nametext>enif_term_to_binary(ErlNifEnv *env,
         ERL_NIF_TERM term, ErlNifBinary *bin)</nametext></name>
       <fsummary>Convert a term to the external format.</fsummary>
       <desc>
@@ -3247,7 +3376,49 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP 22.0"><ret>ErlNifTermType</ret>
+        <nametext>enif_term_type(ErlNifEnv *env, ERL_NIF_TERM term)</nametext>
+      </name>
+      <fsummary>Determine the type of a term.</fsummary>
+      <desc>
+        <p>Determines the type of the given term. The term must be an ordinary
+          Erlang term and not one of the special terms returned by
+          <seealso marker="#enif_raise_exception">
+          <c>enif_raise_exception</c></seealso>,
+          <seealso marker="#enif_schedule_nif">
+          <c>enif_schedule_nif</c></seealso>, or similar.</p>
+        <p>The following types are defined at the moment:</p>
+        <taglist>
+          <tag><c>ERL_NIF_TERM_TYPE_ATOM</c></tag>
+          <item/>
+          <tag><c>ERL_NIF_TERM_TYPE_BITSTRING</c></tag>
+          <item><p>A bitstring or binary</p></item>
+          <tag><c>ERL_NIF_TERM_TYPE_FLOAT</c></tag>
+          <item/>
+          <tag><c>ERL_NIF_TERM_TYPE_FUN</c></tag>
+          <item/>
+          <tag><c>ERL_NIF_TERM_TYPE_INTEGER</c></tag>
+          <item/>
+          <tag><c>ERL_NIF_TERM_TYPE_LIST</c></tag>
+          <item><p>A list, empty or not</p></item>
+          <tag><c>ERL_NIF_TERM_TYPE_MAP</c></tag>
+          <item/>
+          <tag><c>ERL_NIF_TERM_TYPE_PID</c></tag>
+          <item/>
+          <tag><c>ERL_NIF_TERM_TYPE_PORT</c></tag>
+          <item/>
+          <tag><c>ERL_NIF_TERM_TYPE_REFERENCE</c></tag>
+          <item/>
+          <tag><c>ERL_NIF_TERM_TYPE_TUPLE</c></tag>
+          <item/>
+        </taglist>
+        <p>Note that new types may be added in the future, so the caller must
+          be prepared to handle unknown types.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name since="OTP R13B04"><ret>int</ret>
         <nametext>enif_thread_create(char *name,ErlNifTid
         *tid,void * (*func)(void *),void *args,ErlNifThreadOpts
         *opts)</nametext></name>
@@ -3259,7 +3430,7 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
     </func>
 
     <func>
-      <name><ret>void</ret>
+      <name since="OTP R13B04"><ret>void</ret>
         <nametext>enif_thread_exit(void *resp)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -3269,7 +3440,7 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP R13B04"><ret>int</ret>
         <nametext>enif_thread_join(ErlNifTid, void **respp)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -3279,7 +3450,7 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
     </func>
 
     <func>
-      <name><ret>char*</ret>
+      <name since="OTP 21.0"><ret>char*</ret>
         <nametext>enif_thread_name(ErlNifTid tid)</nametext></name>
       <fsummary>Thread name</fsummary>
       <desc>
@@ -3289,7 +3460,7 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
     </func>
 
     <func>
-      <name><ret>ErlNifThreadOpts *</ret>
+      <name since="OTP R13B04"><ret>ErlNifThreadOpts *</ret>
         <nametext>enif_thread_opts_create(char *name)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -3299,7 +3470,7 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
     </func>
 
     <func>
-      <name><ret>void</ret>
+      <name since="OTP R13B04"><ret>void</ret>
         <nametext>enif_thread_opts_destroy(ErlNifThreadOpts *opts)</nametext>
       </name>
       <fsummary></fsummary>
@@ -3310,7 +3481,7 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
     </func>
 
     <func>
-      <name><ret>ErlNifTid</ret>
+      <name since="OTP R13B04"><ret>ErlNifTid</ret>
         <nametext>enif_thread_self(void)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -3320,7 +3491,7 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP 19.0"><ret>int</ret>
       <nametext>enif_thread_type(void)</nametext></name>
       <fsummary>Determine type of current thread</fsummary>
       <desc>
@@ -3342,7 +3513,7 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
     </func>
 
     <func>
-      <name><ret>ErlNifTime</ret>
+      <name since="OTP 18.3"><ret>ErlNifTime</ret>
         <nametext>enif_time_offset(ErlNifTimeUnit time_unit)</nametext></name>
       <fsummary>Get current time offset.</fsummary>
       <desc>
@@ -3364,7 +3535,7 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
     </func>
 
     <func>
-      <name><ret>void *</ret>
+      <name since="OTP R13B04"><ret>void *</ret>
         <nametext>enif_tsd_get(ErlNifTSDKey key)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -3374,7 +3545,7 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP R13B04"><ret>int</ret>
         <nametext>enif_tsd_key_create(char *name, ErlNifTSDKey *key)</nametext>
       </name>
       <fsummary></fsummary>
@@ -3385,7 +3556,7 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
    </func>
 
     <func>
-      <name><ret>void</ret>
+      <name since="OTP R13B04"><ret>void</ret>
         <nametext>enif_tsd_key_destroy(ErlNifTSDKey key)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -3395,7 +3566,7 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
     </func>
 
     <func>
-      <name><ret>void</ret>
+      <name since="OTP R13B04"><ret>void</ret>
         <nametext>enif_tsd_set(ErlNifTSDKey key, void *data)</nametext></name>
       <fsummary></fsummary>
       <desc>
@@ -3405,7 +3576,7 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP 21.0"><ret>int</ret>
       <nametext>enif_vfprintf(FILE *stream, const char *format, va_list ap)
       </nametext></name>
       <fsummary>Format strings and Erlang terms.</fsummary>
@@ -3417,7 +3588,7 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP 21.0"><ret>int</ret>
       <nametext>enif_vsnprintf(char *str, size_t size, const char *format, va_list ap)
       </nametext></name>
       <fsummary>Format strings and Erlang terms.</fsummary>
@@ -3429,7 +3600,7 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP 20.0"><ret>int</ret>
         <nametext>enif_whereis_pid(ErlNifEnv *env,
           ERL_NIF_TERM name, ErlNifPid *pid)</nametext></name>
       <fsummary>Looks up a process by its registered name.</fsummary>
@@ -3457,7 +3628,7 @@ if (retval &amp; ERL_NIF_SELECT_STOP_CALLED) {
     </func>
 
     <func>
-      <name><ret>int</ret>
+      <name since="OTP 20.0"><ret>int</ret>
         <nametext>enif_whereis_port(ErlNifEnv *env,
           ERL_NIF_TERM name, ErlNifPort *port)</nametext></name>
       <fsummary>Looks up a port by its registered name.</fsummary>
diff --git a/erts/doc/src/erl_prim_loader.xml b/erts/doc/src/erl_prim_loader.xml
index 286bac6c93..043d11b7b4 100644
--- a/erts/doc/src/erl_prim_loader.xml
+++ b/erts/doc/src/erl_prim_loader.xml
@@ -29,7 +29,7 @@
     <rev></rev>
     <file>erl_prim_loader.xml</file>
   </header>
-  <module>erl_prim_loader</module>
+  <module since="">erl_prim_loader</module>
   <modulesummary>Low-level Erlang loader.</modulesummary>
   <description>
     <p>This module is used to load all Erlang modules into
@@ -47,7 +47,7 @@
 
   <funcs>
     <func>
-      <name name="get_file" arity="1"/>
+      <name name="get_file" arity="1" since=""/>
       <fsummary>Get a file.</fsummary>
       <desc>
         <p>Fetches a file using the low-level loader.
@@ -65,7 +65,7 @@
     </func>
 
     <func>
-      <name name="get_path" arity="0"/>
+      <name name="get_path" arity="0" since=""/>
       <fsummary>Get the path set in the loader.</fsummary>
       <desc>
         <p>Gets the path set in the loader. The path is
@@ -75,7 +75,7 @@
     </func>
 
     <func>
-      <name name="list_dir" arity="1"/>
+      <name name="list_dir" arity="1" since=""/>
       <fsummary>List files in a directory.</fsummary>
       <desc>
         <p>Lists all the files in a directory. Returns
@@ -92,7 +92,7 @@
     </func>
 
     <func>
-      <name name="read_file_info" arity="1"/>
+      <name name="read_file_info" arity="1" since=""/>
       <fsummary>Get information about a file.</fsummary>
       <desc>
         <p>Retrieves information about a file. Returns
@@ -114,7 +114,7 @@
     </func>
 
     <func>
-      <name name="read_link_info" arity="1"/>
+      <name name="read_link_info" arity="1" since="OTP 17.1.2"/>
       <fsummary>Get information about a link or file.</fsummary>
       <desc>
         <p>Works like
@@ -131,7 +131,7 @@
     </func>
 
     <func>
-      <name name="set_path" arity="1"/>
+      <name name="set_path" arity="1" since=""/>
       <fsummary>Set the path of the loader.</fsummary>
       <desc>
         <p>Sets the path of the loader if
diff --git a/erts/doc/src/erl_tracer.xml b/erts/doc/src/erl_tracer.xml
index fd3c17f337..fa4717bc2f 100644
--- a/erts/doc/src/erl_tracer.xml
+++ b/erts/doc/src/erl_tracer.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>erl_tracer</module>
+  <module since="OTP 19.0">erl_tracer</module>
   <modulesummary>Erlang tracer behavior.</modulesummary>
   <description>
     <p>This behavior module implements the back end of the Erlang
@@ -195,7 +195,7 @@
 
   <funcs>
     <func>
-      <name>Module:enabled(TraceTag, TracerState, Tracee) -> Result</name>
+      <name since="OTP 19.0">Module:enabled(TraceTag, TracerState, Tracee) -> Result</name>
       <fsummary>Check if a trace event is to be generated.</fsummary>
       <type>
         <v>TraceTag = <seealso marker="#type-trace_tag">
@@ -224,7 +224,7 @@
     </func>
 
     <func>
-      <name>Module:enabled_call(TraceTag, TracerState, Tracee) -> Result</name>
+      <name since="OTP 19.0">Module:enabled_call(TraceTag, TracerState, Tracee) -> Result</name>
       <fsummary>Check if a trace event is to be generated.</fsummary>
       <type>
         <v>TraceTag = <seealso marker="#type-trace_tag_call">
@@ -244,7 +244,7 @@
     </func>
 
     <func>
-      <name>Module:enabled_garbage_collection(TraceTag, TracerState, Tracee) -> Result</name>
+      <name since="OTP 19.0">Module:enabled_garbage_collection(TraceTag, TracerState, Tracee) -> Result</name>
       <fsummary>Check if a trace event is to be generated.</fsummary>
       <type>
         <v>TraceTag = <seealso marker="#type-trace_tag_gc">
@@ -264,7 +264,7 @@
     </func>
 
     <func>
-      <name>Module:enabled_ports(TraceTag, TracerState, Tracee) -> Result</name>
+      <name since="OTP 19.0">Module:enabled_ports(TraceTag, TracerState, Tracee) -> Result</name>
       <fsummary>Check if a trace event is to be generated.</fsummary>
       <type>
         <v>TraceTag = <seealso marker="#type-trace_tag_ports">
@@ -284,7 +284,7 @@
     </func>
 
     <func>
-      <name>Module:enabled_procs(TraceTag, TracerState, Tracee) -> Result</name>
+      <name since="OTP 19.0">Module:enabled_procs(TraceTag, TracerState, Tracee) -> Result</name>
       <fsummary>Check if a trace event is to be generated.</fsummary>
       <type>
         <v>TraceTag = <seealso marker="#type-trace_tag_procs">
@@ -304,7 +304,7 @@
     </func>
 
     <func>
-      <name>Module:enabled_receive(TraceTag, TracerState, Tracee) -> Result
+      <name since="OTP 19.0">Module:enabled_receive(TraceTag, TracerState, Tracee) -> Result
       </name>
       <fsummary>Check if a trace event is to be generated.</fsummary>
       <type>
@@ -325,7 +325,7 @@
     </func>
 
     <func>
-      <name>Module:enabled_running_ports(TraceTag, TracerState, Tracee) ->
+      <name since="OTP 19.0">Module:enabled_running_ports(TraceTag, TracerState, Tracee) ->
         Result</name>
       <fsummary>Check if a trace event is to be generated.</fsummary>
       <type>
@@ -346,7 +346,7 @@
     </func>
 
     <func>
-      <name>Module:enabled_running_procs(TraceTag, TracerState, Tracee) ->
+      <name since="OTP 19.0">Module:enabled_running_procs(TraceTag, TracerState, Tracee) ->
         Result</name>
       <fsummary>Check if a trace event is to be generated.</fsummary>
       <type>
@@ -368,7 +368,7 @@
     </func>
 
     <func>
-      <name>Module:enabled_send(TraceTag, TracerState, Tracee) -> Result</name>
+      <name since="OTP 19.0">Module:enabled_send(TraceTag, TracerState, Tracee) -> Result</name>
       <fsummary>Check if a trace event is to be generated.</fsummary>
       <type>
         <v>TraceTag = <seealso marker="#type-trace_tag_send">
@@ -388,7 +388,7 @@
     </func>
 
     <func>
-      <name>Module:trace(TraceTag, TracerState, Tracee, TraceTerm,
+      <name since="OTP 19.0">Module:trace(TraceTag, TracerState, Tracee, TraceTerm,
         Opts) -> Result</name>
       <fsummary>Check if a trace event is to be generated.</fsummary>
       <type>
@@ -417,7 +417,7 @@
     </func>
 
     <func>
-      <name name="trace">Module:trace(seq_trace, TracerState, Label,
+      <name name="trace" since="OTP 19.0">Module:trace(seq_trace, TracerState, Label,
         SeqTraceInfo, Opts) -> Result</name>
       <fsummary>Check if a sequence trace event is to be generated.</fsummary>
       <type>
@@ -439,7 +439,7 @@
     </func>
 
     <func>
-      <name>Module:trace_call(TraceTag, TracerState, Tracee, TraceTerm,
+      <name since="OTP 19.0">Module:trace_call(TraceTag, TracerState, Tracee, TraceTerm,
           Opts) -> Result</name>
       <fsummary>Check if a trace event is to be generated.</fsummary>
       <type>
@@ -463,7 +463,7 @@
     </func>
 
     <func>
-      <name>Module:trace_garbage_collection(TraceTag, TracerState, Tracee,
+      <name since="OTP 19.0">Module:trace_garbage_collection(TraceTag, TracerState, Tracee,
         TraceTerm, Opts) -> Result</name>
       <fsummary>Check if a trace event is to be generated.</fsummary>
       <type>
@@ -487,7 +487,7 @@
     </func>
 
     <func>
-      <name>Module:trace_ports(TraceTag, TracerState, Tracee, TraceTerm,
+      <name since="OTP 19.0">Module:trace_ports(TraceTag, TracerState, Tracee, TraceTerm,
         Opts) -> Result</name>
       <fsummary>Check if a trace event is to be generated.</fsummary>
       <type>
@@ -511,7 +511,7 @@
     </func>
 
     <func>
-      <name>Module:trace_procs(TraceTag, TracerState, Tracee, TraceTerm,
+      <name since="OTP 19.0">Module:trace_procs(TraceTag, TracerState, Tracee, TraceTerm,
         Opts) -> Result</name>
       <fsummary>Check if a trace event is to be generated.</fsummary>
       <type>
@@ -535,7 +535,7 @@
     </func>
 
     <func>
-      <name>Module:trace_receive(TraceTag, TracerState, Tracee, TraceTerm,
+      <name since="OTP 19.0">Module:trace_receive(TraceTag, TracerState, Tracee, TraceTerm,
         Opts) -> Result</name>
       <fsummary>Check if a trace event is to be generated.</fsummary>
       <type>
@@ -559,7 +559,7 @@
     </func>
 
     <func>
-      <name>Module:trace_running_ports(TraceTag, TracerState, Tracee,
+      <name since="OTP 19.0">Module:trace_running_ports(TraceTag, TracerState, Tracee,
         TraceTerm, Opts) -> Result</name>
       <fsummary>Check if a trace event is to be generated.</fsummary>
       <type>
@@ -583,7 +583,7 @@
     </func>
 
     <func>
-      <name>Module:trace_running_procs(TraceTag, TracerState, Tracee,
+      <name since="OTP 19.0">Module:trace_running_procs(TraceTag, TracerState, Tracee,
         TraceTerm, Opts) -> Result</name>
       <fsummary>Check if a trace event is to be generated.</fsummary>
       <type>
@@ -607,7 +607,7 @@
     </func>
 
     <func>
-      <name>Module:trace_send(TraceTag, TracerState, Tracee, TraceTerm,
+      <name since="OTP 19.0">Module:trace_send(TraceTag, TracerState, Tracee, TraceTerm,
         Opts) -> Result</name>
       <fsummary>Check if a trace event is to be generated.</fsummary>
       <type>
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 8e014c3010..2183f75487 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -29,7 +29,7 @@
     <rev></rev>
     <file>erlang.xml</file>
   </header>
-  <module>erlang</module>
+  <module since="">erlang</module>
   <modulesummary>The Erlang BIFs.</modulesummary>
   <description>
     <p>By convention, most Built-In Functions (BIFs) are included
@@ -126,7 +126,7 @@
               instance.</p>
             <p>One can get an approximation of the <c>native</c>
               time unit by calling
-              <seealso marker="erlang:convert_time_unit/3">
+              <seealso marker="#convert_time_unit/3">
               <c>erlang:convert_time_unit(1, second, native)</c></seealso>.
               The result equals the number
               of whole <c>native</c> time units per second. If
@@ -210,8 +210,8 @@
 
   <funcs>
     <func>
-      <name name="abs" arity="1" clause_i="1"/>
-      <name name="abs" arity="1" clause_i="2"/>
+      <name name="abs" arity="1" clause_i="1" since=""/>
+      <name name="abs" arity="1" clause_i="2" since=""/>
       <fsummary>Arithmetical absolute value.</fsummary>
       <desc>
         <p>Returns an integer or float that is the arithmetical
@@ -227,7 +227,7 @@
     </func>
 
     <func>
-      <name name="adler32" arity="1"/>
+      <name name="adler32" arity="1" since=""/>
       <fsummary>Compute adler32 checksum.</fsummary>
       <desc>
         <p>Computes and returns the adler32 checksum for
@@ -236,7 +236,7 @@
     </func>
 
     <func>
-      <name name="adler32" arity="2"/>
+      <name name="adler32" arity="2" since=""/>
       <fsummary>Compute adler32 checksum.</fsummary>
       <desc>
         <p>Continues computing the adler32 checksum by combining 
@@ -253,7 +253,7 @@ Y = erlang:adler32([Data1,Data2]).</code>
     </func>
 
     <func>
-      <name name="adler32_combine" arity="3"/>
+      <name name="adler32_combine" arity="3" since=""/>
       <fsummary>Combine two adler32 checksums.</fsummary>
       <desc>
         <p>Combines two previously computed adler32 checksums.
@@ -272,7 +272,7 @@ Z = erlang:adler32_combine(X,Y,iolist_size(Data2)).</code>
     </func>
 
     <func>
-      <name name="append_element" arity="2"/>
+      <name name="append_element" arity="2" since=""/>
       <fsummary>Append an extra element to a tuple.</fsummary>
       <desc>
         <p>Returns a new tuple that has one element more than
@@ -289,7 +289,7 @@ Z = erlang:adler32_combine(X,Y,iolist_size(Data2)).</code>
     </func>
 
     <func>
-      <name name="apply" arity="2"/>
+      <name name="apply" arity="2" since=""/>
       <fsummary>Apply a function to an argument list.</fsummary>
       <desc>
         <p>Calls a fun, passing the elements in <c><anno>Args</anno></c>
@@ -307,7 +307,7 @@ Z = erlang:adler32_combine(X,Y,iolist_size(Data2)).</code>
     </func>
 
     <func>
-      <name name="apply" arity="3"/>
+      <name name="apply" arity="3" since=""/>
       <fsummary>Apply a function to an argument list.</fsummary>
       <desc>
         <p>Returns the result of applying <c>Function</c> in
@@ -337,7 +337,7 @@ Z = erlang:adler32_combine(X,Y,iolist_size(Data2)).</code>
     </func>
 
     <func>
-      <name name="atom_to_binary" arity="2"/>
+      <name name="atom_to_binary" arity="2" since=""/>
       <fsummary>Return the binary representation of an atom.</fsummary>
       <desc>
         <p>Returns a binary corresponding to the text
@@ -362,7 +362,7 @@ Z = erlang:adler32_combine(X,Y,iolist_size(Data2)).</code>
     </func>
 
     <func>
-      <name name="atom_to_list" arity="1"/>
+      <name name="atom_to_list" arity="1" since=""/>
       <fsummary>Text representation of an atom.</fsummary>
       <desc>
         <p>Returns a string corresponding to the text
@@ -374,7 +374,7 @@ Z = erlang:adler32_combine(X,Y,iolist_size(Data2)).</code>
     </func>
 
     <func>
-      <name name="binary_part" arity="2"/>
+      <name name="binary_part" arity="2" since="OTP R14B"/>
       <fsummary>Extract a part of a binary.</fsummary>
       <desc>
       <p>Extracts the part of the binary described by
@@ -399,7 +399,7 @@ Z = erlang:adler32_combine(X,Y,iolist_size(Data2)).</code>
     </func>
 
     <func>
-      <name name="binary_part" arity="3"/>
+      <name name="binary_part" arity="3" since="OTP R14B"/>
       <fsummary>Extract a part of a binary.</fsummary>
       <desc>
       <p>The same as <c>binary_part(<anno>Subject</anno>,
@@ -409,7 +409,7 @@ Z = erlang:adler32_combine(X,Y,iolist_size(Data2)).</code>
     </func>
 
     <func>
-      <name name="binary_to_atom" arity="2"/>
+      <name name="binary_to_atom" arity="2" since=""/>
       <fsummary>Convert from text representation to an atom.</fsummary>
       <desc>
         <p>Returns the atom whose text representation is
@@ -438,7 +438,7 @@ Z = erlang:adler32_combine(X,Y,iolist_size(Data2)).</code>
     </func>
 
     <func>
-      <name name="binary_to_existing_atom" arity="2"/>
+      <name name="binary_to_existing_atom" arity="2" since=""/>
       <fsummary>Convert from text representation to an atom.</fsummary>
       <desc>
         <p>As
@@ -459,7 +459,7 @@ Z = erlang:adler32_combine(X,Y,iolist_size(Data2)).</code>
     </func>
 
     <func>
-      <name name="binary_to_float" arity="1"/>
+      <name name="binary_to_float" arity="1" since="OTP R16B"/>
       <fsummary>Convert from text representation to a float.</fsummary>
       <desc>
         <p>Returns the float whose text representation is
@@ -473,7 +473,7 @@ Z = erlang:adler32_combine(X,Y,iolist_size(Data2)).</code>
     </func>
 
     <func>
-      <name name="binary_to_integer" arity="1"/>
+      <name name="binary_to_integer" arity="1" since="OTP R16B"/>
       <fsummary>Convert from text representation to an integer.</fsummary>
       <desc>
         <p>Returns an integer whose text representation is
@@ -487,7 +487,7 @@ Z = erlang:adler32_combine(X,Y,iolist_size(Data2)).</code>
     </func>
 
     <func>
-      <name name="binary_to_integer" arity="2"/>
+      <name name="binary_to_integer" arity="2" since="OTP R16B"/>
       <fsummary>Convert from text representation to an integer.</fsummary>
       <desc>
         <p>Returns an integer whose text representation in base
@@ -502,7 +502,7 @@ Z = erlang:adler32_combine(X,Y,iolist_size(Data2)).</code>
     </func>
 
     <func>
-      <name name="binary_to_list" arity="1"/>
+      <name name="binary_to_list" arity="1" since=""/>
       <fsummary>Convert a binary to a list.</fsummary>
       <desc>
         <p>Returns a list of integers corresponding to the bytes of
@@ -511,7 +511,7 @@ Z = erlang:adler32_combine(X,Y,iolist_size(Data2)).</code>
     </func>
 
     <func>
-      <name name="binary_to_list" arity="3"/>
+      <name name="binary_to_list" arity="3" since=""/>
       <fsummary>Convert part of a binary to a list.</fsummary>
       <type_desc variable="Start">1..byte_size(<c><anno>Binary</anno></c>)
       </type_desc>
@@ -533,7 +533,7 @@ Z = erlang:adler32_combine(X,Y,iolist_size(Data2)).</code>
     </func>
 
     <func>
-      <name name="binary_to_term" arity="1"/>
+      <name name="binary_to_term" arity="1" since=""/>
       <fsummary>Decode an Erlang external term format binary.</fsummary>
       <desc>
         <p>Returns an Erlang term that is the result of decoding
@@ -559,7 +559,7 @@ hello
     </func>
 
     <func>
-      <name name="binary_to_term" arity="2"/>
+      <name name="binary_to_term" arity="2" since="OTP R13B04"/>
       <fsummary>Decode an Erlang external term format binary.</fsummary>
       <desc>
         <p>As <c>binary_to_term/1</c>, but takes these options:</p>
@@ -613,7 +613,7 @@ hello
     </func>
 
     <func>
-      <name name="bit_size" arity="1"/>
+      <name name="bit_size" arity="1" since=""/>
       <fsummary>Return the size of a bitstring.</fsummary>
       <desc>
         <p>Returns an integer that is the size in bits of
@@ -628,7 +628,7 @@ hello
     </func>
 
     <func>
-      <name name="bitstring_to_list" arity="1"/>
+      <name name="bitstring_to_list" arity="1" since=""/>
       <fsummary>Convert a bitstring to a list.</fsummary>
       <desc>
         <p>Returns a list of integers corresponding to the bytes of
@@ -639,7 +639,7 @@ hello
     </func>
 
     <func>
-      <name name="bump_reductions" arity="1"/>
+      <name name="bump_reductions" arity="1" since=""/>
       <fsummary>Increment the reduction counter.</fsummary>
       <desc>
         <p>This implementation-dependent function increments
@@ -657,7 +657,7 @@ hello
     </func>
 
     <func>
-      <name name="byte_size" arity="1"/>
+      <name name="byte_size" arity="1" since=""/>
       <fsummary>Return the size of a bitstring (or binary).</fsummary>
       <desc>
         <p>Returns an integer that is the number of bytes needed to
@@ -674,7 +674,7 @@ hello
     </func>
 
     <func>
-      <name name="cancel_timer" arity="1"/>
+      <name name="cancel_timer" arity="1" since=""/>
       <fsummary>Cancel a timer.</fsummary>
       <desc>
         <p>Cancels a timer. The same as calling
@@ -684,7 +684,7 @@ hello
     </func>
 
     <func>
-      <name name="cancel_timer" arity="2"/>
+      <name name="cancel_timer" arity="2" since="OTP 18.0"/>
       <fsummary>Cancel a timer.</fsummary>
       <desc>
         <p>Cancels a timer that has been created by
@@ -766,7 +766,7 @@ hello
     </func>
 
     <func>
-      <name name="ceil" arity="1"/>
+      <name name="ceil" arity="1" since="OTP 20.0"/>
       <fsummary>Returns the smallest integer not less than the argument</fsummary>
       <desc>
         <p>Returns the smallest integer not less than
@@ -779,7 +779,7 @@ hello
       </desc>
     </func>
     <func>
-      <name name="check_old_code" arity="1"/>
+      <name name="check_old_code" arity="1" since="OTP R14B04"/>
       <fsummary>Check if a module has old code.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Module</anno></c> has old code,
@@ -790,7 +790,7 @@ hello
     </func>
 
     <func>
-      <name name="check_process_code" arity="2"/>
+      <name name="check_process_code" arity="2" since=""/>
       <fsummary>Check if a process executes old code for a module.</fsummary>
       <desc>
         <p>The same as
@@ -801,7 +801,7 @@ hello
     </func>
 
     <func>
-      <name name="check_process_code" arity="3"/>
+      <name name="check_process_code" arity="3" since="OTP 17.0"/>
       <fsummary>Check if a process executes old code for a module.</fsummary>
       <desc>
         <p>Checks if the node local process identified by
@@ -904,7 +904,7 @@ hello
     </func>
 
     <func>
-      <name name="convert_time_unit" arity="3"/>
+      <name name="convert_time_unit" arity="3" since="OTP 18.0"/>
       <fsummary>Convert time unit of a time value.</fsummary>
       <desc>
         <p>Converts the <c><anno>Time</anno></c> value of time unit
@@ -922,7 +922,7 @@ hello
     </func>
 
     <func>
-      <name name="crc32" arity="1"/>
+      <name name="crc32" arity="1" since=""/>
       <fsummary>Compute crc32 (IEEE 802.3) checksum.</fsummary>
       <desc>
         <p>Computes and returns the crc32 (IEEE 802.3 style) checksum
@@ -931,7 +931,7 @@ hello
     </func>
 
     <func>
-      <name name="crc32" arity="2"/>
+      <name name="crc32" arity="2" since=""/>
       <fsummary>Compute crc32 (IEEE 802.3) checksum.</fsummary>
       <desc>
         <p>Continues computing the crc32 checksum by combining
@@ -948,7 +948,7 @@ Y = erlang:crc32([Data1,Data2]).</code>
     </func>
 
     <func>
-      <name name="crc32_combine" arity="3"/>
+      <name name="crc32_combine" arity="3" since=""/>
       <fsummary>Combine two crc32 (IEEE 802.3) checksums.</fsummary>
       <desc>
         <p>Combines two previously computed crc32 checksums.
@@ -967,7 +967,7 @@ Z = erlang:crc32_combine(X,Y,iolist_size(Data2)).</code>
     </func>
 
     <func>
-      <name name="date" arity="0"/>
+      <name name="date" arity="0" since=""/>
       <fsummary>Current date.</fsummary>
       <desc>
         <p>Returns the current date as <c>{Year, Month, Day}</c>.</p>
@@ -980,7 +980,7 @@ Z = erlang:crc32_combine(X,Y,iolist_size(Data2)).</code>
     </func>
 
     <func>
-      <name name="decode_packet" arity="3"/>
+      <name name="decode_packet" arity="3" since=""/>
       <fsummary>Extract a protocol packet from a binary.</fsummary>
       <desc>
         <p>Decodes the binary <c><anno>Bin</anno></c> according to the packet
@@ -1090,7 +1090,7 @@ Z = erlang:crc32_combine(X,Y,iolist_size(Data2)).</code>
     </func>
 
     <func>
-      <name name="delete_element" arity="2"/>
+      <name name="delete_element" arity="2" since="OTP R16B"/>
       <fsummary>Delete element at index in a tuple.</fsummary>
       <type_desc variable="Index">1..tuple_size(<anno>Tuple1</anno>)</type_desc>
       <desc>
@@ -1103,7 +1103,7 @@ Z = erlang:crc32_combine(X,Y,iolist_size(Data2)).</code>
     </func>
 
     <func>
-      <name name="delete_module" arity="1"/>
+      <name name="delete_module" arity="1" since=""/>
       <fsummary>Make the current code for a module old.</fsummary>
       <desc>
         <p>Makes the current code for <c><anno>Module</anno></c> become old
@@ -1121,7 +1121,7 @@ Z = erlang:crc32_combine(X,Y,iolist_size(Data2)).</code>
     </func>
 
     <func>
-      <name name="demonitor" arity="1"/>
+      <name name="demonitor" arity="1" since=""/>
       <fsummary>Stop monitoring.</fsummary>
       <desc>
         <p>If <c><anno>MonitorRef</anno></c> is a reference that the
@@ -1163,7 +1163,7 @@ Z = erlang:crc32_combine(X,Y,iolist_size(Data2)).</code>
     </func>
 
     <func>
-      <name name="demonitor" arity="2"/>
+      <name name="demonitor" arity="2" since=""/>
       <fsummary>Stop monitoring.</fsummary>
       <desc>
         <p>The returned value is <c>true</c> unless <c>info</c> is part
@@ -1231,7 +1231,7 @@ end</code>
     </func>
 
     <func>
-      <name name="disconnect_node" arity="1"/>
+      <name name="disconnect_node" arity="1" since=""/>
       <fsummary>Force the disconnection of a node.</fsummary>
       <desc>
         <p>Forces the disconnection of a node. This appears to
@@ -1245,7 +1245,7 @@ end</code>
     </func>
 
     <func>
-      <name name="display" arity="1"/>
+      <name name="display" arity="1" since=""/>
       <fsummary>Print a term on standard output.</fsummary>
       <desc>
         <p>Prints a text representation of <c><anno>Term</anno></c> on the
@@ -1257,7 +1257,7 @@ end</code>
     </func>
 
     <func>
-      <name name="dist_ctrl_get_data" arity="1"/>
+      <name name="dist_ctrl_get_data" arity="1" since="OTP 21.0"/>
       <fsummary>Get distribution channel data to pass to another node.</fsummary>
       <desc>
         <p>
@@ -1269,6 +1269,13 @@ end</code>
 	  data is available by calling
 	  <seealso marker="erlang#dist_ctrl_get_data_notification/1"><c>erlang:dist_ctrl_get_data_notification(DHandle)</c></seealso>.
 	</p>
+	<p>The returned value when there are data available depends
+	on the value of the <c>get_size</c> option configured on the
+	distribution channel identified by <c><anno>DHandle</anno></c>.
+	For more information see the documentation of the <c>get_size</c>
+	option for the
+	<seealso marker="#dist_ctrl_set_opt/3"><c>erlang:dist_ctrl_set_opt/3</c></seealso>
+	function.</p>
 	<note><p>
 	  Only the process registered as distribution
 	  controller for the distribution channel identified by
@@ -1290,7 +1297,36 @@ end</code>
     </func>
 
     <func>
-      <name name="dist_ctrl_get_data_notification" arity="1"/>
+      <name name="dist_ctrl_get_opt" arity="2" clause_i="1" since="OTP 22.0"/>
+      <fsummary>Get value of the get_size option on a distribution channel</fsummary>
+      <desc>
+	<p>Returns the value of the <c>get_size</c> option on the distribution channel
+	identified by <c><anno>DHandle</anno></c>. For more information see the
+	documentation of the <c>get_size</c> option for the
+	<seealso marker="#dist_ctrl_set_opt/3"><c>erlang:dist_ctrl_set_opt/3</c></seealso>
+	function.</p>
+	<note><p>
+	  Only the process registered as distribution
+	  controller for the distribution channel identified by
+	  <c><anno>DHandle</anno></c> is allowed to call this
+	  function.
+	</p></note>
+	<p>
+	  This function is used when implementing an alternative
+	  distribution carrier using processes as distribution
+	  controllers. <c><anno>DHandle</anno></c> is retrived
+	  via the callback
+	  <seealso marker="erts:alt_dist#hs_data_f_handshake_complete"><c>f_handshake_complete</c></seealso>.
+	  More information can be found in the documentation of
+	  <seealso marker="erts:alt_dist#distribution_module">ERTS
+	  User's Guide ➜ How to implement an Alternative Carrier
+	  for the Erlang Distribution ➜ Distribution Module</seealso>.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="dist_ctrl_get_data_notification" arity="1" since="OTP 21.0"/>
       <fsummary>Request notification about available outgoing distribution channel data.</fsummary>
       <desc>
         <p>
@@ -1326,7 +1362,7 @@ end</code>
     </func>
 
     <func>
-      <name name="dist_ctrl_input_handler" arity="2"/>
+      <name name="dist_ctrl_input_handler" arity="2" since="OTP 21.0"/>
       <fsummary>Register distribution channel input handler process.</fsummary>
       <desc>
         <p>
@@ -1359,7 +1395,7 @@ end</code>
     </func>
 
     <func>
-      <name name="dist_ctrl_put_data" arity="2"/>
+      <name name="dist_ctrl_put_data" arity="2" since="OTP 21.0"/>
       <fsummary>Pass data into the VM from a distribution channel.</fsummary>
       <desc>
         <p>
@@ -1392,7 +1428,56 @@ end</code>
     </func>
 
     <func>
-      <name name="element" arity="2"/>
+      <name name="dist_ctrl_set_opt" arity="3" clause_i="1" since="OTP 22.0"/>
+      <fsummary>Set value of the get_size option on a distribution channel</fsummary>
+      <desc>
+        <p>Sets the value of the <c>get_size</c> option on the distribution channel
+	identified by <c><anno>DHandle</anno></c>. This option controls the return
+	value of calls to
+	<seealso marker="#dist_ctrl_get_data/1">erlang:dist_ctrl_get_data(<anno>DHandle</anno>)</seealso>
+	where <c><anno>DHandle</anno></c> equals <c><anno>DHandle</anno></c> used
+	when setting this option.
+	When the <c>get_size</c> option is:</p>
+	<taglist>
+	  <tag><c>false</c></tag>
+	  <item>
+	    and there are distribution data available, a call to
+	    <c>erlang:dist_ctrl_get_data(<anno>DHandle</anno>)</c>
+	    will just return <c>Data</c> to pass over the channel.
+	    This is the default value of the <c>get_size</c> option.
+	  </item>
+	  <tag><c>true</c></tag>
+	  <item>
+	    and there are distribution data available, a call to
+	    <c>erlang:dist_ctrl_get_data(<anno>DHandle</anno>)</c>
+	    will return <c>Data</c> to pass over the channel as well as
+	    the <c>Size</c> of <c>Data</c> in bytes. This is returned as
+	    a tuple on the form <c>{Size, Data}</c>.
+	  </item>
+	</taglist>
+	<p>All options are set to default when a channel is closed.</p>
+	<note><p>
+	  Only the process registered as distribution
+	  controller for the distribution channel identified by
+	  <c><anno>DHandle</anno></c> is allowed to call this
+	  function.
+	</p></note>
+	<p>
+	  This function is used when implementing an alternative
+	  distribution carrier using processes as distribution
+	  controllers. <c><anno>DHandle</anno></c> is retrived
+	  via the callback
+	  <seealso marker="erts:alt_dist#hs_data_f_handshake_complete"><c>f_handshake_complete</c></seealso>.
+	  More information can be found in the documentation of
+	  <seealso marker="erts:alt_dist#distribution_module">ERTS
+	  User's Guide ➜ How to implement an Alternative Carrier
+	  for the Erlang Distribution ➜ Distribution Module</seealso>.
+	</p>
+      </desc>
+    </func>
+    
+    <func>
+      <name name="element" arity="2" since=""/>
       <fsummary>Return the Nth element of a tuple.</fsummary>
       <type_desc variable="N">1..tuple_size(<anno>Tuple</anno>)</type_desc>
       <desc>
@@ -1406,7 +1491,7 @@ b</pre>
     </func>
 
     <func>
-      <name name="erase" arity="0"/>
+      <name name="erase" arity="0" since=""/>
       <fsummary>Return and delete the process dictionary.</fsummary>
       <desc>
         <p>Returns the process dictionary and deletes it, for
@@ -1420,7 +1505,7 @@ b</pre>
     </func>
 
     <func>
-      <name name="erase" arity="1"/>
+      <name name="erase" arity="1" since=""/>
       <fsummary>Return and delete a value from the process dictionary.
       </fsummary>
       <desc>
@@ -1437,7 +1522,7 @@ b</pre>
     </func>
 
     <func>
-      <name name="error" arity="1"/>
+      <name name="error" arity="1" since=""/>
       <fsummary>Stop execution with a specified reason.</fsummary>
       <desc>
         <p>Stops the execution of the calling process with the reason
@@ -1461,7 +1546,7 @@ b</pre>
     </func>
 
     <func>
-      <name name="error" arity="2"/>
+      <name name="error" arity="2" since=""/>
       <fsummary>Stop execution with a specified reason.</fsummary>
       <desc>
         <p>Stops the execution of the calling process with the reason
@@ -1478,7 +1563,7 @@ b</pre>
     </func>
 
     <func>
-      <name name="exit" arity="1"/>
+      <name name="exit" arity="1" since=""/>
       <fsummary>Stop execution with a specified reason.</fsummary>
       <desc>
         <p>Stops the execution of the calling process with exit reason
@@ -1495,7 +1580,7 @@ b</pre>
     </func>
 
     <func>
-      <name name="exit" arity="2"/>
+      <name name="exit" arity="2" since=""/>
       <fsummary>Send an exit signal to a process or a port.</fsummary>
       <desc>
         <p>Sends an exit signal with exit reason <c><anno>Reason</anno></c> to
@@ -1531,7 +1616,7 @@ b</pre>
     </func>
 
     <func>
-      <name name="external_size" arity="1"/>
+      <name name="external_size" arity="1" since="OTP R14B04"/>
       <fsummary>Calculate the maximum size for a term encoded in the Erlang
         external term format.</fsummary>
       <desc>
@@ -1550,7 +1635,7 @@ erlang:external_size(<anno>Term</anno>, [])</code>
     </func>
 
     <func>
-      <name name="external_size" arity="2"/>
+      <name name="external_size" arity="2" since="OTP R14B04"/>
       <fsummary>Calculate the maximum size for a term encoded in the Erlang
         external term format.</fsummary>
       <desc>
@@ -1570,7 +1655,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="float" arity="1"/>
+      <name name="float" arity="1" since=""/>
       <fsummary>Convert a number to a float.</fsummary>
       <desc>
         <p>Returns a float by converting <c><anno>Number</anno></c> to a float,
@@ -1592,7 +1677,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="float_to_binary" arity="1"/>
+      <name name="float_to_binary" arity="1" since="OTP R16B"/>
       <fsummary>Text representation of a float.</fsummary>
       <desc>
         <p>The same as
@@ -1601,7 +1686,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="float_to_binary" arity="2"/>
+      <name name="float_to_binary" arity="2" since="OTP R16B"/>
       <fsummary>Text representation of a float formatted using specified
         options.</fsummary>
       <desc>
@@ -1619,7 +1704,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="float_to_list" arity="1"/>
+      <name name="float_to_list" arity="1" since=""/>
       <fsummary>Text representation of a float.</fsummary>
       <desc>
         <p>The same as
@@ -1628,7 +1713,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="float_to_list" arity="2"/>
+      <name name="float_to_list" arity="2" since="OTP R16B"/>
       <fsummary>Text representation of a float formatted using specified
         options.</fsummary>
       <desc>
@@ -1664,7 +1749,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="floor" arity="1"/>
+      <name name="floor" arity="1" since="OTP 20.0"/>
       <fsummary>Returns the largest integer not greater than the argument</fsummary>
       <desc>
         <p>Returns the largest integer not greater than
@@ -1678,7 +1763,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="fun_info" arity="1"/>
+      <name name="fun_info" arity="1" since=""/>
       <fsummary>Information about a fun.</fsummary>
       <desc>
         <p>Returns a list with information about the fun
@@ -1751,6 +1836,10 @@ true</pre>
           <item>
             <p><c>Pid</c> is the process identifier of the process
               that originally created the fun.</p>
+            <p>It might point to the <c>init</c> process if the
+              <c>Fun</c> was statically allocated when module was
+              loaded (this optimisation is performed for local
+              functions that do not capture the enviornment).</p>
           </item>
           <tag><c>{index, Index}</c></tag>
           <item>
@@ -1779,7 +1868,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="fun_info" arity="2"/>
+      <name name="fun_info" arity="2" since=""/>
       <fsummary>Information about a fun.</fsummary>
       <type name="fun_info_item"/>
       <desc>
@@ -1799,7 +1888,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="fun_to_list" arity="1"/>
+      <name name="fun_to_list" arity="1" since=""/>
       <fsummary>Text representation of a fun.</fsummary>
       <desc>
         <p>Returns a string corresponding to the text
@@ -1808,7 +1897,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="function_exported" arity="3"/>
+      <name name="function_exported" arity="3" since=""/>
       <fsummary>Check if a function is exported and loaded.</fsummary>
       <desc>
         <p>Returns <c>true</c> if the module <c><anno>Module</anno></c> is
@@ -1824,7 +1913,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="garbage_collect" arity="0"/>
+      <name name="garbage_collect" arity="0" since=""/>
       <fsummary>Force an immediate garbage collection of the calling process.
       </fsummary>
       <desc>
@@ -1840,7 +1929,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="garbage_collect" arity="1"/>
+      <name name="garbage_collect" arity="1" since=""/>
       <fsummary>Garbage collect a process.</fsummary>
       <desc>
         <p>The same as
@@ -1850,7 +1939,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="garbage_collect" arity="2"/>
+      <name name="garbage_collect" arity="2" since="OTP 17.0"/>
       <fsummary>Garbage collect a process.</fsummary>
       <desc>
         <p>Garbage collects the node local process identified by
@@ -1915,7 +2004,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="get" arity="0"/>
+      <name name="get" arity="0" since=""/>
       <fsummary>Return the process dictionary.</fsummary>
       <desc>
         <p>Returns the process dictionary as a list of
@@ -1930,7 +2019,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="get" arity="1"/>
+      <name name="get" arity="1" since=""/>
       <fsummary>Return a value from the process dictionary.</fsummary>
       <desc>
         <p>Returns the value <c><anno>Val</anno></c> associated with
@@ -1946,7 +2035,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="get_cookie" arity="0"/>
+      <name name="get_cookie" arity="0" since=""/>
       <fsummary>Get the magic cookie of the local node.</fsummary>
       <desc>
         <p>Returns the magic cookie of the local node if the node is
@@ -1955,7 +2044,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="get_keys" arity="0"/>
+      <name name="get_keys" arity="0" since="OTP 18.0"/>
       <fsummary>Return a list of all keys from the process dictionary.
       </fsummary>
       <desc>
@@ -1971,7 +2060,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="get_keys" arity="1"/>
+      <name name="get_keys" arity="1" since=""/>
       <fsummary>Return a list of keys from the process dictionary.</fsummary>
       <desc>
         <p>Returns a list of keys that are associated with the value
@@ -1989,7 +2078,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="get_stacktrace" arity="0"/>
+      <name name="get_stacktrace" arity="0" since=""/>
       <fsummary>Get the call stack back-trace of the last exception.</fsummary>
       <type name="stack_item"/>
       <desc>
@@ -2054,7 +2143,7 @@ end</pre>
     </func>
 
     <func>
-      <name name="group_leader" arity="0"/>
+      <name name="group_leader" arity="0" since=""/>
       <fsummary>Get the group leader for the calling process.</fsummary>
       <desc>
         <p>Returns the process identifier of the group leader for the
@@ -2069,7 +2158,7 @@ end</pre>
     </func>
 
     <func>
-      <name name="group_leader" arity="2"/>
+      <name name="group_leader" arity="2" since=""/>
       <fsummary>Set the group leader for a process.</fsummary>
       <desc>
         <p>Sets the group leader of <c><anno>Pid</anno></c>
@@ -2090,7 +2179,7 @@ end</pre>
     </func>
 
     <func>
-      <name name="halt" arity="0"/>
+      <name name="halt" arity="0" since=""/>
       <fsummary>Halt the Erlang runtime system and indicate normal exit to
         the calling environment.</fsummary>
       <desc>
@@ -2103,7 +2192,7 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="halt" arity="1"/>
+      <name name="halt" arity="1" since=""/>
       <fsummary>Halt the Erlang runtime system.</fsummary>
       <desc>
         <p>The same as <seealso marker="#halt/2">
@@ -2117,7 +2206,7 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="halt" arity="2"/>
+      <name name="halt" arity="2" since="OTP R15B01"/>
       <fsummary>Halt the Erlang runtime system.</fsummary>
       <desc>
         <p><c><anno>Status</anno></c> must be a non-negative integer, a string,
@@ -2159,7 +2248,7 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="hd" arity="1"/>
+      <name name="hd" arity="1" since=""/>
       <fsummary>Head of a list.</fsummary>
       <desc>
         <p>Returns the head of <c><anno>List</anno></c>, that is,
@@ -2174,7 +2263,7 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="hibernate" arity="3"/>
+      <name name="hibernate" arity="3" since=""/>
       <fsummary>Hibernate a process until a message is sent to it.</fsummary>
       <desc>
         <p>Puts the calling process into a wait state where its memory
@@ -2215,7 +2304,7 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="insert_element" arity="3"/>
+      <name name="insert_element" arity="3" since="OTP R16B"/>
       <fsummary>Insert an element at index in a tuple.</fsummary>
       <type_desc variable="Index">1..tuple_size(<anno>Tuple1</anno>)
         + 1</type_desc>
@@ -2233,7 +2322,7 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="integer_to_binary" arity="1"/>
+      <name name="integer_to_binary" arity="1" since="OTP R16B"/>
       <fsummary>Text representation of an integer.</fsummary>
       <desc>
         <p>Returns a binary corresponding to the text
@@ -2245,7 +2334,7 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="integer_to_binary" arity="2"/>
+      <name name="integer_to_binary" arity="2" since="OTP R16B"/>
       <fsummary>Text representation of an integer.</fsummary>
       <desc>
         <p>Returns a binary corresponding to the text
@@ -2258,7 +2347,7 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="integer_to_list" arity="1"/>
+      <name name="integer_to_list" arity="1" since=""/>
       <fsummary>Text representation of an integer.</fsummary>
       <desc>
         <p>Returns a string corresponding to the text
@@ -2270,7 +2359,7 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="integer_to_list" arity="2"/>
+      <name name="integer_to_list" arity="2" since=""/>
       <fsummary>Text representation of an integer.</fsummary>
       <desc>
         <p>Returns a string corresponding to the text
@@ -2283,7 +2372,7 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="iolist_size" arity="1"/>
+      <name name="iolist_size" arity="1" since=""/>
       <fsummary>Size of an iolist.</fsummary>
       <desc>
         <p>Returns an integer, that is the size in bytes,
@@ -2296,7 +2385,7 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="iolist_to_binary" arity="1"/>
+      <name name="iolist_to_binary" arity="1" since=""/>
       <fsummary>Convert an iolist to a binary.</fsummary>
       <desc>
         <p>Returns a binary that is made from the integers and
@@ -2314,7 +2403,7 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="iolist_to_iovec" arity="1"/>
+      <name name="iolist_to_iovec" arity="1" since="OTP 20.1"/>
       <fsummary>Converts an iolist to a iovec.</fsummary>
       <desc>
         <p>Returns an iovec that is made from the integers and binaries in
@@ -2323,7 +2412,7 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="is_alive" arity="0"/>
+      <name name="is_alive" arity="0" since=""/>
       <fsummary>Check whether the local node is alive.</fsummary>
       <desc>
         <p>Returns <c>true</c> if the local node is alive (that is, if
@@ -2333,7 +2422,7 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="is_atom" arity="1"/>
+      <name name="is_atom" arity="1" since=""/>
       <fsummary>Check whether a term is an atom.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is an atom,
@@ -2343,7 +2432,7 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="is_binary" arity="1"/>
+      <name name="is_binary" arity="1" since=""/>
       <fsummary>Check whether a term is a binary.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a binary,
@@ -2354,7 +2443,7 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="is_bitstring" arity="1"/>
+      <name name="is_bitstring" arity="1" since=""/>
       <fsummary>Check whether a term is a bitstring.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a
@@ -2364,7 +2453,7 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="is_boolean" arity="1"/>
+      <name name="is_boolean" arity="1" since=""/>
       <fsummary>Check whether a term is a boolean.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is the
@@ -2375,7 +2464,7 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="is_builtin" arity="3"/>
+      <name name="is_builtin" arity="3" since=""/>
       <fsummary>Check if a function is a BIF implemented in C.</fsummary>
       <desc>
         <p>This BIF is useful for builders of cross-reference tools.</p>
@@ -2386,7 +2475,7 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="is_float" arity="1"/>
+      <name name="is_float" arity="1" since=""/>
       <fsummary>Check whether a term is a float.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a floating point
@@ -2396,7 +2485,7 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="is_function" arity="1"/>
+      <name name="is_function" arity="1" since=""/>
       <fsummary>Check whether a term is a fun.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a fun, otherwise
@@ -2406,7 +2495,7 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="is_function" arity="2"/>
+      <name name="is_function" arity="2" since=""/>
       <fsummary>Check whether a term is a fun with a specified given arity.
       </fsummary>
       <desc>
@@ -2418,7 +2507,7 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="is_integer" arity="1"/>
+      <name name="is_integer" arity="1" since=""/>
       <fsummary>Check whether a term is an integer.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is an integer,
@@ -2428,7 +2517,7 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="is_list" arity="1"/>
+      <name name="is_list" arity="1" since=""/>
       <fsummary>Check whether a term is a list.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a list with
@@ -2438,7 +2527,7 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="is_map" arity="1"/>
+      <name name="is_map" arity="1" since="OTP 17.0"/>
       <fsummary>Check whether a term is a map.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a map,
@@ -2448,7 +2537,7 @@ os_prompt%</pre>
     </func>
 
     <func>
-      <name name="is_map_key" arity="2"/>
+      <name name="is_map_key" arity="2" since="OTP 21.0"/>
       <fsummary></fsummary>
       <desc>
         <p>Returns <c>true</c> if map <c><anno>Map</anno></c> contains
@@ -2464,11 +2553,12 @@ os_prompt%</pre>
 true
 > is_map_key(value,Map).
 false</code>
+        <p>Allowed in guard tests.</p>
       </desc>
     </func>
 
     <func>
-      <name name="is_number" arity="1"/>
+      <name name="is_number" arity="1" since=""/>
       <fsummary>Check whether a term is a number.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is an integer or a
@@ -2478,7 +2568,7 @@ false</code>
     </func>
 
     <func>
-      <name name="is_pid" arity="1"/>
+      <name name="is_pid" arity="1" since=""/>
       <fsummary>Check whether a term is a process identifier.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a process
@@ -2488,7 +2578,7 @@ false</code>
     </func>
 
     <func>
-      <name name="is_port" arity="1"/>
+      <name name="is_port" arity="1" since=""/>
       <fsummary>Check whether a term is a port.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a port identifier,
@@ -2498,7 +2588,7 @@ false</code>
     </func>
 
     <func>
-      <name name="is_process_alive" arity="1"/>
+      <name name="is_process_alive" arity="1" since=""/>
       <fsummary>Check whether a process is alive.</fsummary>
       <desc>
         <p><c><anno>Pid</anno></c> must refer to a process at the local
@@ -2510,7 +2600,7 @@ false</code>
     </func>
 
     <func>
-      <name name="is_record" arity="2"/>
+      <name name="is_record" arity="2" since=""/>
       <fsummary>Check whether a term appears to be a record.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a tuple and its
@@ -2531,7 +2621,7 @@ false</code>
     </func>
 
     <func>
-      <name name="is_record" arity="3"/>
+      <name name="is_record" arity="3" since=""/>
       <fsummary>Check whether a term appears to be a record.</fsummary>
       <desc>
         <p><c><anno>RecordTag</anno></c> must be an atom.</p>
@@ -2550,7 +2640,7 @@ false</code>
     </func>
 
     <func>
-      <name name="is_reference" arity="1"/>
+      <name name="is_reference" arity="1" since=""/>
       <fsummary>Check whether a term is a reference.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a reference,
@@ -2560,7 +2650,7 @@ false</code>
     </func>
 
     <func>
-      <name name="is_tuple" arity="1"/>
+      <name name="is_tuple" arity="1" since=""/>
       <fsummary>Check whether a term is a tuple.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a tuple,
@@ -2570,7 +2660,7 @@ false</code>
     </func>
 
     <func>
-      <name name="length" arity="1"/>
+      <name name="length" arity="1" since=""/>
       <fsummary>Length of a list.</fsummary>
       <desc>
         <p>Returns the length of <c><anno>List</anno></c>, for example:</p>
@@ -2582,7 +2672,7 @@ false</code>
     </func>
 
     <func>
-      <name name="link" arity="1"/>
+      <name name="link" arity="1" since=""/>
       <fsummary>Create a link to another process (or port).</fsummary>
       <desc>
         <p>Creates a link between the calling process and another
@@ -2609,7 +2699,7 @@ false</code>
     </func>
 
     <func>
-      <name name="list_to_atom" arity="1"/>
+      <name name="list_to_atom" arity="1" since=""/>
       <fsummary>Convert from text representation to an atom.</fsummary>
       <desc>
         <p>Returns the atom whose text representation is
@@ -2629,7 +2719,7 @@ false</code>
     </func>
 
     <func>
-      <name name="list_to_binary" arity="1"/>
+      <name name="list_to_binary" arity="1" since=""/>
       <fsummary>Convert a list to a binary.</fsummary>
       <desc>
         <p>Returns a binary that is made from the integers and
@@ -2647,7 +2737,7 @@ false</code>
     </func>
 
     <func>
-      <name name="list_to_bitstring" arity="1"/>
+      <name name="list_to_bitstring" arity="1" since=""/>
       <fsummary>Convert a list to a bitstring.</fsummary>
       <type name="bitstring_list"/>
       <desc>
@@ -2668,7 +2758,7 @@ false</code>
     </func>
 
     <func>
-      <name name="list_to_existing_atom" arity="1"/>
+      <name name="list_to_existing_atom" arity="1" since=""/>
       <fsummary>Convert from text representation to an atom.</fsummary>
       <desc>
         <p>Returns the atom whose text representation is
@@ -2689,7 +2779,7 @@ false</code>
     </func>
 
     <func>
-      <name name="list_to_float" arity="1"/>
+      <name name="list_to_float" arity="1" since=""/>
       <fsummary>Convert from text representation to a float.</fsummary>
       <desc>
         <p>Returns the float whose text representation is
@@ -2703,7 +2793,7 @@ false</code>
     </func>
 
     <func>
-      <name name="list_to_integer" arity="1"/>
+      <name name="list_to_integer" arity="1" since=""/>
       <fsummary>Convert from text representation to an integer.</fsummary>
       <desc>
         <p>Returns an integer whose text representation is
@@ -2717,7 +2807,7 @@ false</code>
     </func>
 
     <func>
-      <name name="list_to_integer" arity="2"/>
+      <name name="list_to_integer" arity="2" since=""/>
       <fsummary>Convert from text representation to an integer.</fsummary>
       <desc>
         <p>Returns an integer whose text representation in base
@@ -2732,7 +2822,7 @@ false</code>
     </func>
 
     <func>
-      <name name="list_to_pid" arity="1"/>
+      <name name="list_to_pid" arity="1" since=""/>
       <fsummary>Convert from text representation to a pid.</fsummary>
       <desc>
         <p>Returns a process identifier whose text representation is a 
@@ -2750,7 +2840,7 @@ false</code>
     </func>
 
     <func>
-      <name name="list_to_port" arity="1"/>
+      <name name="list_to_port" arity="1" since="OTP 20.0"/>
       <fsummary>Convert from text representation to a port.</fsummary>
       <desc>
         <p>Returns a port identifier whose text representation is a
@@ -2768,7 +2858,7 @@ false</code>
     </func>
 
     <func>
-      <name name="list_to_ref" arity="1"/>
+      <name name="list_to_ref" arity="1" since="OTP 20.0"/>
       <fsummary>Convert from text representation to a ref.</fsummary>
       <desc>
         <p>Returns a reference whose text representation is a
@@ -2786,7 +2876,7 @@ false</code>
     </func>
 
     <func>
-      <name name="list_to_tuple" arity="1"/>
+      <name name="list_to_tuple" arity="1" since=""/>
       <fsummary>Convert a list to a tuple.</fsummary>
       <desc>
         <p>Returns a tuple corresponding to <c><anno>List</anno></c>,
@@ -2799,7 +2889,7 @@ false</code>
     </func>
 
     <func>
-      <name name="load_module" arity="2"/>
+      <name name="load_module" arity="2" since=""/>
       <fsummary>Load object code for a module.</fsummary>
       <desc>
         <p>If <c><anno>Binary</anno></c> contains the object code for module
@@ -2832,7 +2922,7 @@ false</code>
     </func>
 
     <func>
-      <name name="load_nif" arity="2"/>
+      <name name="load_nif" arity="2" since=""/>
       <fsummary>Load NIF library.</fsummary>
       <desc>
         <p>Loads and links a dynamic library containing native
@@ -2885,7 +2975,7 @@ false</code>
     </func>
 
     <func>
-      <name name="loaded" arity="0"/>
+      <name name="loaded" arity="0" since=""/>
       <fsummary>List all loaded modules.</fsummary>
       <desc>
         <p>Returns a list of all loaded Erlang modules (current and
@@ -2896,7 +2986,7 @@ false</code>
     </func>
 
     <func>
-      <name name="localtime" arity="0"/>
+      <name name="localtime" arity="0" since=""/>
       <fsummary>Current local date and time.</fsummary>
       <desc>
         <p>Returns the current local date and time,
@@ -2911,7 +3001,7 @@ false</code>
     </func>
 
     <func>
-      <name name="localtime_to_universaltime" arity="1"/>
+      <name name="localtime_to_universaltime" arity="1" since=""/>
       <fsummary>Convert from local to Universal Time Coordinated (UTC) date
         and time.</fsummary>
       <desc>
@@ -2928,7 +3018,7 @@ false</code>
     </func>
 
     <func>
-      <name name="localtime_to_universaltime" arity="2"/>
+      <name name="localtime_to_universaltime" arity="2" since=""/>
       <fsummary>Convert from local to Universal Time Coordinated (UTC) date
         and time.</fsummary>
       <desc>
@@ -2954,7 +3044,7 @@ false</code>
     </func>
 
     <func>
-      <name name="make_ref" arity="0"/>
+      <name name="make_ref" arity="0" since=""/>
       <fsummary>Return a unique reference.</fsummary>
       <desc>
         <p>Returns a
@@ -2971,7 +3061,7 @@ false</code>
     </func>
 
     <func>
-      <name name="make_tuple" arity="2"/>
+      <name name="make_tuple" arity="2" since=""/>
       <fsummary>Create a new tuple of a specified arity.</fsummary>
       <desc>
         <p>Creates a new tuple of the specified <c><anno>Arity</anno></c>, where
@@ -2983,7 +3073,7 @@ false</code>
     </func>
 
     <func>
-      <name name="make_tuple" arity="3"/>
+      <name name="make_tuple" arity="3" since=""/>
       <fsummary>Create a new tuple with specifed arity and contents.</fsummary>
       <desc>
         <p>Creates a tuple of size <c><anno>Arity</anno></c>, where each element
@@ -3001,7 +3091,7 @@ false</code>
     </func>
 
     <func>
-      <name name="map_get" arity="2" />
+      <name name="map_get" arity="2"  since="OTP 21.0"/>
       <fsummary>Extract a value from a map</fsummary>
       <desc>
         <p>Returns value <c><anno>Value</anno></c> associated with
@@ -3016,11 +3106,12 @@ false</code>
   Map = #{42 => value_two,1337 => "value one","a" => 1},
   map_get(Key,Map).
 "value one"</code>
+        <p>Allowed in guard tests.</p>
       </desc>
     </func>
 
     <func>
-      <name name="map_size" arity="1"/>
+      <name name="map_size" arity="1" since="OTP 17.0"/>
       <fsummary>Return the size of a map.</fsummary>
       <desc>
         <p>Returns an integer, which is the number of key-value pairs
@@ -3033,7 +3124,7 @@ false</code>
     </func>
 
     <func>
-      <name name="match_spec_test" arity="3"/>
+      <name name="match_spec_test" arity="3" since="OTP 19.0"/>
       <fsummary>Test that a match specification works.</fsummary>
       <desc>
         <p>Tests a match specification used in calls to
@@ -3071,7 +3162,7 @@ false</code>
     </func>
 
     <func>
-      <name name="max" arity="2"/>
+      <name name="max" arity="2" since=""/>
       <fsummary>Return the largest of two terms.</fsummary>
       <desc>
         <p>Returns the largest of <c><anno>Term1</anno></c> and
@@ -3081,7 +3172,7 @@ false</code>
     </func>
 
     <func>
-      <name name="md5" arity="1"/>
+      <name name="md5" arity="1" since=""/>
       <fsummary>Compute an MD5 message digest.</fsummary>
       <desc>
         <p>Computes an MD5 message digest from <c><anno>Data</anno></c>, where
@@ -3099,7 +3190,7 @@ false</code>
     </func>
 
     <func>
-      <name name="md5_final" arity="1"/>
+      <name name="md5_final" arity="1" since=""/>
       <fsummary>Finish the update of an MD5 context and return the computed
         MD5 message digest.</fsummary>
       <desc>
@@ -3109,7 +3200,7 @@ false</code>
     </func>
 
     <func>
-      <name name="md5_init" arity="0"/>
+      <name name="md5_init" arity="0" since=""/>
       <fsummary>Create an MD5 context.</fsummary>
       <desc>
         <p>Creates an MD5 context, to be used in the following calls to
@@ -3118,7 +3209,7 @@ false</code>
     </func>
 
     <func>
-      <name name="md5_update" arity="2"/>
+      <name name="md5_update" arity="2" since=""/>
       <fsummary>Update an MD5 context with data and return a new context.
       </fsummary>
       <desc>
@@ -3129,7 +3220,7 @@ false</code>
     </func>
 
     <func>
-      <name name="memory" arity="0"/>
+      <name name="memory" arity="0" since=""/>
       <fsummary>Information about dynamically allocated memory.</fsummary>
       <type name="memory_type"/>
       <desc>
@@ -3273,8 +3364,8 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="memory" arity="1" clause_i="1"/>
-      <name name="memory" arity="1" clause_i="2"/>
+      <name name="memory" arity="1" clause_i="1" since=""/>
+      <name name="memory" arity="1" clause_i="2" since=""/>
       <fsummary>Information about dynamically allocated memory.</fsummary>
       <type name="memory_type"/>
       <desc>
@@ -3313,7 +3404,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="min" arity="2"/>
+      <name name="min" arity="2" since=""/>
       <fsummary>Return the smallest of two terms.</fsummary>
       <desc>
         <p>Returns the smallest of <c><anno>Term1</anno></c> and
@@ -3323,7 +3414,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="module_loaded" arity="1"/>
+      <name name="module_loaded" arity="1" since=""/>
       <fsummary>Check if a module is loaded.</fsummary>
       <desc>
         <p>Returns <c>true</c> if the module <c><anno>Module</anno></c>
@@ -3338,9 +3429,9 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="monitor" arity="2" clause_i="1"/>
-      <name name="monitor" arity="2" clause_i="2"/>
-      <name name="monitor" arity="2" clause_i="3"/>
+      <name name="monitor" arity="2" clause_i="1" since=""/>
+      <name name="monitor" arity="2" clause_i="2" since="OTP 19.0"/>
+      <name name="monitor" arity="2" clause_i="3" since="OTP 18.0"/>
       <fsummary>Start monitoring.</fsummary>
       <type name="registered_name"/>
       <type name="registered_process_identifier"/>
@@ -3512,7 +3603,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="monitor_node" arity="2"/>
+      <name name="monitor_node" arity="2" since=""/>
       <fsummary>Monitor the status of a node.</fsummary>
       <desc>
         <p>Monitor the status of the node <c><anno>Node</anno></c>.
@@ -3536,7 +3627,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="monitor_node" arity="3"/>
+      <name name="monitor_node" arity="3" since=""/>
       <fsummary>Monitor the status of a node.</fsummary>
       <desc>
         <p>Behaves as
@@ -3562,7 +3653,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="monotonic_time" arity="0"/>
+      <name name="monotonic_time" arity="0" since="OTP 18.0"/>
       <fsummary>Current Erlang monotonic time.</fsummary>
       <desc>
         <p>Returns the current
@@ -3596,7 +3687,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="monotonic_time" arity="1"/>
+      <name name="monotonic_time" arity="1" since="OTP 18.0"/>
       <fsummary>Current Erlang monotonic time.</fsummary>
       <desc>
         <p>Returns the current
@@ -3614,7 +3705,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="nif_error" arity="1"/>
+      <name name="nif_error" arity="1" since="OTP R14B"/>
       <fsummary>Stop execution with a specified reason.</fsummary>
       <desc>
         <p>Works exactly like
@@ -3627,7 +3718,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="nif_error" arity="2"/>
+      <name name="nif_error" arity="2" since="OTP R14B"/>
       <fsummary>Stop execution with a specified reason.</fsummary>
       <desc>
         <p>Works exactly like
@@ -3640,7 +3731,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="node" arity="0"/>
+      <name name="node" arity="0" since=""/>
       <fsummary>Name of the local node.</fsummary>
       <desc>
         <p>Returns the name of the local node. If the node is not alive,
@@ -3650,7 +3741,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="node" arity="1"/>
+      <name name="node" arity="1" since=""/>
       <fsummary>At which node a pid, port, or reference originates.</fsummary>
       <desc>
         <p>Returns the node where <c><anno>Arg</anno></c> originates.
@@ -3663,7 +3754,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="nodes" arity="0"/>
+      <name name="nodes" arity="0" since=""/>
       <fsummary>All visible nodes in the system.</fsummary>
       <desc>
         <p>Returns a list of all visible nodes in the system, except
@@ -3672,7 +3763,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="nodes" arity="1"/>
+      <name name="nodes" arity="1" since=""/>
       <fsummary>All nodes of a certain type in the system.</fsummary>
       <desc>
         <p>Returns a list of nodes according to the argument specified.
@@ -3715,7 +3806,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="now" arity="0"/>
+      <name name="now" arity="0" since=""/>
       <fsummary>Elapsed time since 00:00 GMT.</fsummary>
       <type name="timestamp"/>
       <desc>
@@ -3744,7 +3835,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="open_port" arity="2"/>
+      <name name="open_port" arity="2" since=""/>
       <fsummary>Open a port.</fsummary>
       <desc>
         <p>Returns a port identifier as the result of opening a
@@ -4085,7 +4176,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="phash" arity="2"/>
+      <name name="phash" arity="2" since=""/>
       <fsummary>Portable hash function.</fsummary>
       <type_desc variable="Range">Range = 1..2^32, Hash = 1..Range</type_desc>
       <desc>
@@ -4100,8 +4191,8 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="phash2" arity="1"/>
-      <name name="phash2" arity="2"/>
+      <name name="phash2" arity="1" since=""/>
+      <name name="phash2" arity="2" since=""/>
       <fsummary>Portable hash function.</fsummary>
       <type_desc variable="Range">1..2^32</type_desc>
       <type_desc variable="Hash">0..Range-1</type_desc>
@@ -4125,7 +4216,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="pid_to_list" arity="1"/>
+      <name name="pid_to_list" arity="1" since=""/>
       <fsummary>Text representation of a pid.</fsummary>
       <desc>
         <p>Returns a string corresponding to the text
@@ -4134,7 +4225,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="port_call" arity="3"/>
+      <name name="port_call" arity="3" since=""/>
       <fsummary>Perform a synchronous call to a port with term data.</fsummary>
       <desc>
         <p>Performs a synchronous call to a port. The meaning of
@@ -4170,16 +4261,23 @@ RealSystem = system + MissedSystem</code>
           </item>
           <tag><c>badarg</c></tag>
           <item>
-            If the port driver so decides for any reason (probably
+            <p>If the port driver so decides for any reason (probably
             something wrong with <c><anno>Operation</anno></c>
-            or <c><anno>Data</anno></c>).
+            or <c><anno>Data</anno></c>).</p>
+	    <warning>
+	      <p>Do not call <c>port_call</c> with an unknown
+	      <c><anno>Port</anno></c> identifier and expect <c>badarg</c>
+	      exception. Any undefined behavior is possible (including node
+	      crash) depending on how the port driver interprets the supplied
+	      arguments.</p>
+	    </warning>
           </item>
         </taglist>
       </desc>
     </func>
 
     <func>
-      <name name="port_close" arity="1"/>
+      <name name="port_close" arity="1" since=""/>
       <fsummary>Close an open port.</fsummary>
       <desc>
         <p>Closes an open port. Roughly the same as <c><anno>Port</anno> !
@@ -4219,7 +4317,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="port_command" arity="2"/>
+      <name name="port_command" arity="2" since=""/>
       <fsummary>Send data to a port.</fsummary>
       <desc>
         <p>Sends data to a port. Same as
@@ -4262,11 +4360,16 @@ RealSystem = system + MissedSystem</code>
             <p>If <c><anno>Data</anno></c> is an invalid I/O list.</p>
           </item>
         </taglist>
+	<warning>
+	  <p>Do not send data to an unknown port. Any undefined behavior is
+	  possible (including node crash) depending on how the port driver
+	  interprets the data.</p>
+	</warning>
       </desc>
     </func>
 
     <func>
-      <name name="port_command" arity="3"/>
+      <name name="port_command" arity="3" since=""/>
       <fsummary>Send data to a port.</fsummary>
       <desc>
         <p>Sends data to a port. <c>port_command(Port, Data, [])</c>
@@ -4321,11 +4424,16 @@ RealSystem = system + MissedSystem</code>
             a busy port.
           </item>
         </taglist>
+	<warning>
+	  <p>Do not send data to an unknown port. Any undefined behavior is
+	  possible (including node crash) depending on how the port driver
+	  interprets the data.</p>
+	</warning>
       </desc>
     </func>
 
     <func>
-      <name name="port_connect" arity="2"/>
+      <name name="port_connect" arity="2" since=""/>
       <fsummary>Set the owner of a port.</fsummary>
       <desc>
         <p>Sets the port owner (the connected port) to <c><anno>Pid</anno></c>.
@@ -4394,7 +4502,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="port_control" arity="3"/>
+      <name name="port_control" arity="3" since=""/>
       <fsummary>Perform a synchronous control operation on a port.</fsummary>
       <desc>
         <p>Performs a synchronous control operation on a port.
@@ -4425,13 +4533,20 @@ RealSystem = system + MissedSystem</code>
             If the port driver so decides for any reason (probably
             something wrong with <c><anno>Operation</anno></c> or
             <c><anno>Data</anno></c>).
+	    <warning>
+	      <p>Do not call <c>port_control/3</c> with an unknown
+	      <c><anno>Port</anno></c> identifier and expect <c>badarg</c>
+	      exception. Any undefined behavior is possible (including node
+	      crash) depending on how the port driver interprets the supplied
+	      arguments.</p>
+	    </warning>
           </item>
         </taglist>
       </desc>
     </func>
 
     <func>
-      <name name="port_info" arity="1"/>
+      <name name="port_info" arity="1" since=""/>
       <fsummary>Information about a port.</fsummary>
       <desc>
         <p>Returns a list containing tuples with information about
@@ -4462,7 +4577,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="port_info" arity="2" clause_i="1"/>
+      <name name="port_info" arity="2" clause_i="1" since=""/>
       <fsummary>Information about the connected process of a port.</fsummary>
       <desc>
         <p><c><anno>Pid</anno></c> is the process identifier of the process
@@ -4478,7 +4593,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="port_info" arity="2" clause_i="2"/>
+      <name name="port_info" arity="2" clause_i="2" since=""/>
       <fsummary>Information about the internal index of a port.</fsummary>
       <desc>
         <p><c><anno>Index</anno></c> is the internal index of the port. This
@@ -4494,7 +4609,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="port_info" arity="2" clause_i="3"/>
+      <name name="port_info" arity="2" clause_i="3" since=""/>
       <fsummary>Information about the input of a port.</fsummary>
       <desc>
         <p><c><anno>Bytes</anno></c> is the total number of bytes
@@ -4510,7 +4625,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="port_info" arity="2" clause_i="4"/>
+      <name name="port_info" arity="2" clause_i="4" since=""/>
       <fsummary>Information about the links of a port.</fsummary>
       <desc>
         <p><c><anno>Pids</anno></c> is a list of the process identifiers
@@ -4526,7 +4641,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="port_info" arity="2" clause_i="5"/>
+      <name name="port_info" arity="2" clause_i="5" since="OTP R16B"/>
       <fsummary>Information about the locking of a port.</fsummary>
       <desc>
         <p><c><anno>Locking</anno></c> is one of the following:</p>
@@ -4547,9 +4662,10 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="port_info" arity="2" clause_i="6"/>
+      <name name="port_info" arity="2" clause_i="6" since="OTP R16B"/>
       <fsummary>Information about the memory size of a port.</fsummary>
       <desc>
+        <marker id="port_info_memory"/>
         <p><c><anno>Bytes</anno></c> is the total number of
           bytes allocated for this port by the runtime system. The
           port itself can have allocated memory that is not
@@ -4565,7 +4681,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="port_info" arity="2" clause_i="7"/>
+      <name name="port_info" arity="2" clause_i="7" since="OTP R16B"/>
       <fsummary>Information about the monitors of a port.</fsummary>
       <desc>
         <p><c><anno>Monitors</anno></c> represent processes monitored by
@@ -4581,7 +4697,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="port_info" arity="2" clause_i="8"/>
+      <name name="port_info" arity="2" clause_i="8" since="OTP 19.0"/>
       <fsummary>Which processes are monitoring this port.</fsummary>
       <desc>
         <p>Returns list of pids that are monitoring given port at the
@@ -4597,7 +4713,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="port_info" arity="2" clause_i="9"/>
+      <name name="port_info" arity="2" clause_i="9" since=""/>
       <fsummary>Information about the name of a port.</fsummary>
       <desc>
         <p><c><anno>Name</anno></c> is the command name set by
@@ -4613,7 +4729,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="port_info" arity="2" clause_i="10"/>
+      <name name="port_info" arity="2" clause_i="10" since="OTP R16B"/>
       <fsummary>Information about the OS pid of a port.</fsummary>
       <desc>
         <p><c><anno>OsPid</anno></c> is the process identifier (or equivalent)
@@ -4632,7 +4748,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="port_info" arity="2" clause_i="11"/>
+      <name name="port_info" arity="2" clause_i="11" since=""/>
       <fsummary>Information about the output of a port.</fsummary>
       <desc>
         <p><c><anno>Bytes</anno></c> is the total number of bytes written
@@ -4651,7 +4767,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="port_info" arity="2" clause_i="12"/>
+      <name name="port_info" arity="2" clause_i="12" since="OTP R16B"/>
       <fsummary>Information about the parallelism hint of a port.</fsummary>
       <desc>
         <p><c><anno>Boolean</anno></c> corresponds to the port parallelism
@@ -4662,7 +4778,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="port_info" arity="2" clause_i="13"/>
+      <name name="port_info" arity="2" clause_i="13" since="OTP R16B"/>
       <fsummary>Information about the queue size of a port.</fsummary>
       <desc>
         <p><c><anno>Bytes</anno></c> is the total number
@@ -4679,7 +4795,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="port_info" arity="2" clause_i="14"/>
+      <name name="port_info" arity="2" clause_i="14" since=""/>
       <fsummary>Information about the registered name of a port.</fsummary>
       <desc>
         <p><c><anno>RegisteredName</anno></c> is the registered name of
@@ -4696,7 +4812,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="port_to_list" arity="1"/>
+      <name name="port_to_list" arity="1" since=""/>
       <fsummary>Text representation of a port identifier.</fsummary>
       <desc>
         <p>Returns a string corresponding to the text
@@ -4705,7 +4821,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="ports" arity="0"/>
+      <name name="ports" arity="0" since=""/>
       <fsummary>List all existing ports.</fsummary>
       <desc>
         <p>Returns a list of port identifiers corresponding to all the
@@ -4715,7 +4831,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="pre_loaded" arity="0"/>
+      <name name="pre_loaded" arity="0" since=""/>
       <fsummary>List all preloaded modules.</fsummary>
       <desc>
         <p>Returns a list of Erlang modules that are preloaded in
@@ -4726,7 +4842,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="process_display" arity="2"/>
+      <name name="process_display" arity="2" since=""/>
       <fsummary>Write information about a local process on standard error.
       </fsummary>
       <desc>
@@ -4740,7 +4856,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="process_flag" arity="2" clause_i="1"/>
+      <name name="process_flag" arity="2" clause_i="1" since=""/>
       <fsummary>Set process flag trap_exit for the calling process.</fsummary>
       <desc>
         <p>When <c>trap_exit</c> is set to <c>true</c>, exit signals
@@ -4757,7 +4873,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="process_flag" arity="2" clause_i="2"/>
+      <name name="process_flag" arity="2" clause_i="2" since=""/>
       <fsummary>Set process flag error_handler for the calling process.
       </fsummary>
       <desc>
@@ -4772,7 +4888,7 @@ RealSystem = system + MissedSystem</code>
 
     <func>
       <name name="process_flag" arity="2" clause_i="3"
-	    anchor="process_flag_min_heap_size"/>
+	    anchor="process_flag_min_heap_size" since=""/>
       <fsummary>Set process flag min_heap_size for the calling process.
       </fsummary>
       <desc>
@@ -4782,7 +4898,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="process_flag" arity="2" clause_i="4"/>
+      <name name="process_flag" arity="2" clause_i="4" since="OTP R13B04"/>
       <fsummary>Set process flag min_bin_vheap_size for the calling process.
       </fsummary>
       <desc>
@@ -4794,7 +4910,7 @@ RealSystem = system + MissedSystem</code>
 
     <func>
       <name name="process_flag" arity="2" clause_i="5"
-	    anchor="process_flag_max_heap_size"/>
+	    anchor="process_flag_max_heap_size" since="OTP 19.0"/>
       <fsummary>Set process flag max_heap_size for the calling process.
       </fsummary>
       <type name="max_heap_size"/>
@@ -4868,7 +4984,7 @@ RealSystem = system + MissedSystem</code>
 
     <func>
       <name name="process_flag" arity="2" clause_i="6"
-	    anchor="process_flag_message_queue_data"/>
+	    anchor="process_flag_message_queue_data" since="OTP 19.0"/>
       <fsummary>Set process flag message_queue_data for the calling process.
       </fsummary>
       <type name="message_queue_data"/>
@@ -4910,7 +5026,7 @@ RealSystem = system + MissedSystem</code>
 
     <func>
       <name name="process_flag" arity="2" clause_i="7"
-	    anchor="process_flag_priority"/>
+	    anchor="process_flag_priority" since=""/>
       <fsummary>Set process flag priority for the calling process.</fsummary>
       <type name="priority_level"/>
       <desc>
@@ -4982,7 +5098,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="process_flag" arity="2" clause_i="8"/>
+      <name name="process_flag" arity="2" clause_i="8" since=""/>
       <fsummary>Set process flag save_calls for the calling process.</fsummary>
       <desc>
         <p><c><anno>N</anno></c> must be an integer in the interval 0..10000.
@@ -5013,7 +5129,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="process_flag" arity="2" clause_i="9"/>
+      <name name="process_flag" arity="2" clause_i="9" since=""/>
       <fsummary>Set process flag sensitive for the calling process.</fsummary>
       <desc>
         <p>Sets or clears flag <c>sensitive</c> for the current process.
@@ -5047,7 +5163,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="process_flag" arity="3"/>
+      <name name="process_flag" arity="3" since=""/>
       <fsummary>Set process flags for a process.</fsummary>
       <desc>
         <p>Sets certain flags for the process <c><anno>Pid</anno></c>,
@@ -5062,7 +5178,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="process_info" arity="1"/>
+      <name name="process_info" arity="1" since=""/>
       <fsummary>Information about a process.</fsummary>
       <type name="process_info_result_item"/>
       <type name="priority_level"/>
@@ -5113,8 +5229,8 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="process_info" arity="2" clause_i="1"/>
-      <name name="process_info" arity="2" clause_i="2"/>
+      <name name="process_info" arity="2" clause_i="1" since=""/>
+      <name name="process_info" arity="2" clause_i="2" since=""/>
       <fsummary>Information about a process.</fsummary>
       <type name="process_info_item"/>
       <type name="process_info_result_item"/>
@@ -5182,11 +5298,13 @@ RealSystem = system + MissedSystem</code>
               changed or removed without prior notice.</p>
           </item>
           <tag><c>{current_function, {<anno>Module</anno>,
-            <anno>Function</anno>, Arity}}</c></tag>
+            <anno>Function</anno>, Arity} | undefined}</c></tag>
           <item>
             <p><c><anno>Module</anno></c>, <c><anno>Function</anno></c>,
               <c><anno>Arity</anno></c> is
-              the current function call of the process.</p>
+              the current function call of the process. The value
+              <c>undefined</c> can be returned if the process is
+              currently executing native compiled code.</p>
           </item>
           <tag><c>{current_location, {<anno>Module</anno>,
             <anno>Function</anno>, <anno>Arity</anno>,
@@ -5272,6 +5390,7 @@ RealSystem = system + MissedSystem</code>
           </item>
           <tag><c>{memory, <anno>Size</anno>}</c></tag>
           <item>
+            <marker id="process_info_memory"/>
             <p><c><anno>Size</anno></c> is the size in bytes of the process.
               This includes call stack, heap, and internal structures.</p>
           </item>
@@ -5447,7 +5566,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="processes" arity="0"/>
+      <name name="processes" arity="0" since=""/>
       <fsummary>All processes.</fsummary>
       <desc>
         <p>Returns a list of process identifiers corresponding to
@@ -5464,7 +5583,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="purge_module" arity="1"/>
+      <name name="purge_module" arity="1" since=""/>
       <fsummary>Remove old code for a module.</fsummary>
       <desc>
         <p>Removes old code for <c><anno>Module</anno></c>.
@@ -5489,7 +5608,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="put" arity="2"/>
+      <name name="put" arity="2" since=""/>
       <fsummary>Add a new value to the process dictionary.</fsummary>
       <desc>
         <p>Adds a new <c><anno>Key</anno></c> to the process dictionary,
@@ -5511,7 +5630,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="raise" arity="3"/>
+      <name name="raise" arity="3" since=""/>
       <fsummary>Stop execution with an exception of specified class, reason,
         and call stack backtrace.</fsummary>
       <type name="raise_stacktrace"/>
@@ -5550,7 +5669,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="read_timer" arity="1"/>
+      <name name="read_timer" arity="1" since=""/>
       <fsummary>Read the state of a timer.</fsummary>
       <desc>
         <p>Reads the state of a timer. The same as calling
@@ -5560,7 +5679,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="read_timer" arity="2"/>
+      <name name="read_timer" arity="2" since="OTP 18.0"/>
       <fsummary>Read the state of a timer.</fsummary>
       <desc>
         <p>Reads the state of a timer that has been created by either
@@ -5616,7 +5735,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="ref_to_list" arity="1"/>
+      <name name="ref_to_list" arity="1" since=""/>
       <fsummary>Text representation of a reference.</fsummary>
       <desc>
         <p>Returns a string corresponding to the text
@@ -5629,7 +5748,7 @@ RealSystem = system + MissedSystem</code>
     </func>
 
     <func>
-      <name name="register" arity="2"/>
+      <name name="register" arity="2" since=""/>
       <fsummary>Register a name for a pid (or port).</fsummary>
       <desc>
         <p>Associates the name <c><anno>RegName</anno></c> with a process
@@ -5658,7 +5777,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="registered" arity="0"/>
+      <name name="registered" arity="0" since=""/>
       <fsummary>All registered names.</fsummary>
       <desc>
         <p>Returns a list of names that have been registered using
@@ -5671,7 +5790,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="resume_process" arity="1"/>
+      <name name="resume_process" arity="1" since=""/>
       <fsummary>Resume a suspended process.</fsummary>
       <desc>
         <p>Decreases the suspend count on the process identified by
@@ -5712,7 +5831,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="round" arity="1"/>
+      <name name="round" arity="1" since=""/>
       <fsummary>Return an integer by rounding a number.</fsummary>
       <desc>
         <p>Returns an integer by rounding <c><anno>Number</anno></c>,
@@ -5725,7 +5844,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="self" arity="0"/>
+      <name name="self" arity="0" since=""/>
       <fsummary>Return pid of the calling process.</fsummary>
       <desc>
         <p>Returns the process identifier of the calling process, for
@@ -5738,7 +5857,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="send" arity="2"/>
+      <name name="send" arity="2" since=""/>
       <fsummary>Send a message.</fsummary>
       <type name="dst"/>
       <desc>
@@ -5758,7 +5877,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="send" arity="3"/>
+      <name name="send" arity="3" since=""/>
       <fsummary>Send a message conditionally.</fsummary>
       <type name="dst"/>
       <desc>
@@ -5790,7 +5909,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="send_after" arity="3"/>
+      <name name="send_after" arity="3" since=""/>
       <fsummary>Start a timer.</fsummary>
       <desc>
         <p>Starts a timer. The same as calling
@@ -5801,7 +5920,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="send_after" arity="4"/>
+      <name name="send_after" arity="4" since="OTP 18.0"/>
       <fsummary>Start a timer.</fsummary>
       <desc>
         <p>Starts a timer. When the timer expires, the message
@@ -5814,7 +5933,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="send_nosuspend" arity="2"/>
+      <name name="send_nosuspend" arity="2" since=""/>
       <fsummary>Try to send a message without ever blocking.</fsummary>
       <type name="dst"/>
       <desc>
@@ -5864,7 +5983,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="send_nosuspend" arity="3"/>
+      <name name="send_nosuspend" arity="3" since=""/>
       <fsummary>Try to send a message without ever blocking.</fsummary>
       <type name="dst"/>
       <desc>
@@ -5897,7 +6016,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="set_cookie" arity="2"/>
+      <name name="set_cookie" arity="2" since=""/>
       <fsummary>Set the magic cookie of a node.</fsummary>
       <desc>
         <p>Sets the magic cookie of <c><anno>Node</anno></c> to the atom
@@ -5914,7 +6033,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="setelement" arity="3"/>
+      <name name="setelement" arity="3" since=""/>
       <fsummary>Set the Nth element of a tuple.</fsummary>
       <type_desc variable="Index">1..tuple_size(<anno>Tuple1</anno></type_desc>
       <desc>
@@ -5931,7 +6050,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="size" arity="1"/>
+      <name name="size" arity="1" since=""/>
       <fsummary>Size of a tuple or binary.</fsummary>
       <desc>
         <p>Returns the number of elements in a tuple or the number of
@@ -5954,7 +6073,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="spawn" arity="1"/>
+      <name name="spawn" arity="1" since=""/>
       <fsummary>Create a new process with a fun as entry point.</fsummary>
       <desc>
         <p>Returns the process identifier of a new process started by the
@@ -5965,7 +6084,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="spawn" arity="2"/>
+      <name name="spawn" arity="2" since=""/>
       <fsummary>Create a new process with a fun as entry point on a specified
         node.</fsummary>
       <desc>
@@ -5979,7 +6098,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="spawn" arity="3"/>
+      <name name="spawn" arity="3" since=""/>
       <fsummary>Create a new process with a function as entry point.</fsummary>
       <desc>
         <p>Returns the process identifier of a new process started by
@@ -6004,7 +6123,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="spawn" arity="4"/>
+      <name name="spawn" arity="4" since=""/>
       <fsummary>Create a new process with a function as entry point on a
         specified node.</fsummary>
       <desc>
@@ -6019,7 +6138,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="spawn_link" arity="1"/>
+      <name name="spawn_link" arity="1" since=""/>
       <fsummary>Create and link to a new process with a fun as entry point.
       </fsummary>
       <desc>
@@ -6033,7 +6152,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="spawn_link" arity="2"/>
+      <name name="spawn_link" arity="2" since=""/>
       <fsummary>Create and link to a new process with a fun as entry point on
         a specified node.</fsummary>
       <desc>
@@ -6050,7 +6169,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="spawn_link" arity="3"/>
+      <name name="spawn_link" arity="3" since=""/>
       <fsummary>Create and link to a new process with a function as entry point.
       </fsummary>
       <desc>
@@ -6064,7 +6183,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="spawn_link" arity="4"/>
+      <name name="spawn_link" arity="4" since=""/>
       <fsummary>Create and link to a new process with a function as entry point
         on a specified node.</fsummary>
       <desc>
@@ -6082,7 +6201,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="spawn_monitor" arity="1"/>
+      <name name="spawn_monitor" arity="1" since=""/>
       <fsummary>Create and monitor a new process with a fun as entry point.
       </fsummary>
       <desc>
@@ -6096,7 +6215,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="spawn_monitor" arity="3"/>
+      <name name="spawn_monitor" arity="3" since=""/>
       <fsummary>Create and monitor a new process with a function as entry point.
       </fsummary>
       <desc>
@@ -6110,7 +6229,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="spawn_opt" arity="2"/>
+      <name name="spawn_opt" arity="2" since=""/>
       <fsummary>Create a new process with a fun as entry point.</fsummary>
       <type name="priority_level"/>
       <type name="max_heap_size"/>
@@ -6128,7 +6247,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="spawn_opt" arity="3"/>
+      <name name="spawn_opt" arity="3" since=""/>
       <fsummary>Create a new process with a fun as entry point on a specified
         node.</fsummary>
       <type name="priority_level"/>
@@ -6146,7 +6265,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="spawn_opt" arity="4"/>
+      <name name="spawn_opt" arity="4" since=""/>
       <fsummary>Create a new process with a function as entry point.</fsummary>
       <type name="priority_level"/>
       <type name="max_heap_size"/>
@@ -6282,7 +6401,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="spawn_opt" arity="5"/>
+      <name name="spawn_opt" arity="5" since=""/>
       <fsummary>Create a new process with a function as entry point on a
         specified node.</fsummary>
       <type name="priority_level"/>
@@ -6305,7 +6424,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="split_binary" arity="2"/>
+      <name name="split_binary" arity="2" since=""/>
       <fsummary>Split a binary into two.</fsummary>
       <type_desc variable="Pos">0..byte_size(Bin)</type_desc>
       <desc>
@@ -6329,7 +6448,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="start_timer" arity="3"/>
+      <name name="start_timer" arity="3" since=""/>
       <fsummary>Start a timer.</fsummary>
       <desc>
         <p>Starts a timer. The same as calling
@@ -6340,7 +6459,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="start_timer" arity="4"/>
+      <name name="start_timer" arity="4" since="OTP 18.0"/>
       <fsummary>Start a timer.</fsummary>
       <desc>
         <p>Starts a timer. When the timer expires, the message
@@ -6399,7 +6518,7 @@ true</pre>
 
     <func>
       <name name="statistics" arity="1" clause_i="1"
-	    anchor="statistics_active_tasks"/>
+	    anchor="statistics_active_tasks" since="OTP 18.3"/>
       <fsummary>Information about active processes and ports.</fsummary>
       <desc>
         <p>Returns the same as
@@ -6414,7 +6533,7 @@ true</pre>
 
     <func>
       <name name="statistics" arity="1" clause_i="2"
-	    anchor="statistics_active_tasks_all"/>
+	    anchor="statistics_active_tasks_all" since="OTP 20.0"/>
       <fsummary>Information about active processes and ports.</fsummary>
       <desc>
         <p>Returns a list where each element represents the amount
@@ -6455,7 +6574,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="statistics" arity="1" clause_i="3"/>
+      <name name="statistics" arity="1" clause_i="3" since=""/>
       <fsummary>Information about context switches.</fsummary>
       <desc>
         <p>Returns the total number of context switches since the
@@ -6465,7 +6584,7 @@ true</pre>
 
     <func>
       <name name="statistics" arity="1" clause_i="4"
-	    anchor="statistics_exact_reductions"/>
+	    anchor="statistics_exact_reductions" since=""/>
       <fsummary>Information about exact reductions.</fsummary>
       <desc>
         <p>Returns the number of exact reductions.</p>
@@ -6479,7 +6598,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="statistics" arity="1" clause_i="5"/>
+      <name name="statistics" arity="1" clause_i="5" since=""/>
       <fsummary>Information about garbage collection.</fsummary>
       <desc>
         <p>Returns information about garbage collection, for example:</p>
@@ -6491,7 +6610,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="statistics" arity="1" clause_i="6"/>
+      <name name="statistics" arity="1" clause_i="6" since=""/>
       <fsummary>Information about I/O.</fsummary>
       <desc>
         <p>Returns <c><anno>Input</anno></c>,
@@ -6503,7 +6622,7 @@ true</pre>
 
     <func>
       <name name="statistics" arity="1" clause_i="7"
-	    anchor="statistics_microstate_accounting"/>
+	    anchor="statistics_microstate_accounting" since="OTP 19.0"/>
       <fsummary>Information about microstate accounting.</fsummary>
       <desc>
         <p>Microstate accounting can be used to measure how much time the Erlang
@@ -6561,7 +6680,7 @@ lists:map(
           <tag><c>async</c></tag>
           <item>Async threads are used by various linked-in drivers (mainly the
             file drivers) do offload non-CPU intensive work. See
-            <seealso marker="erts:erl#+async_thread_pool_size">erl +A</seealso> for more details.</item>
+            <seealso marker="erts:erl#async_thread_pool_size">erl +A</seealso> for more details.</item>
           <tag><c>aux</c></tag>
           <item>Takes care of any work that is not
             specifically assigned to a scheduler.</item>
@@ -6646,7 +6765,7 @@ lists:map(
 
     <func>
       <name name="statistics" arity="1" clause_i="8"
-	    anchor="statistics_reductions"/>
+	    anchor="statistics_reductions" since=""/>
       <fsummary>Information about reductions.</fsummary>
       <desc>
         <p>Returns information about reductions, for example:</p>
@@ -6665,7 +6784,7 @@ lists:map(
 
     <func>
       <name name="statistics" arity="1" clause_i="9"
-	    anchor="statistics_run_queue"/>
+	    anchor="statistics_run_queue" since=""/>
       <fsummary>Information about the run-queues.</fsummary>
       <desc>
         <p>Returns the total length of all normal run-queues. That is, the number
@@ -6682,7 +6801,7 @@ lists:map(
 
     <func>
       <name name="statistics" arity="1" clause_i="10"
-	    anchor="statistics_run_queue_lengths"/>
+	    anchor="statistics_run_queue_lengths" since="OTP 18.3"/>
       <fsummary>Information about the run-queue lengths.</fsummary>
       <desc>
         <p>Returns the same as
@@ -6697,7 +6816,7 @@ lists:map(
 
     <func>
       <name name="statistics" arity="1" clause_i="11"
-	    anchor="statistics_run_queue_lengths_all"/>
+	    anchor="statistics_run_queue_lengths_all" since="OTP 20.0"/>
       <fsummary>Information about the run-queue lengths.</fsummary>
       <desc>
         <p>Returns a list where each element represents the amount
@@ -6739,7 +6858,7 @@ lists:map(
     </func>
 
     <func>
-      <name name="statistics" arity="1" clause_i="12"/>
+      <name name="statistics" arity="1" clause_i="12" since=""/>
       <fsummary>Information about runtime.</fsummary>
       <desc>
         <p>Returns information about runtime, in milliseconds.</p>
@@ -6758,7 +6877,7 @@ lists:map(
 
     <func>
       <name name="statistics" arity="1" clause_i="13"
-	    anchor="statistics_scheduler_wall_time"/>
+	    anchor="statistics_scheduler_wall_time" since="OTP R15B01"/>
       <fsummary>Information about each schedulers work time.</fsummary>
       <desc>
         <p>Returns a list of tuples with
@@ -6882,7 +7001,7 @@ ok
 
     <func>
       <name name="statistics" arity="1" clause_i="14"
-	    anchor="statistics_scheduler_wall_time_all"/>
+	    anchor="statistics_scheduler_wall_time_all" since="OTP 20.0"/>
       <fsummary>Information about each schedulers work time.</fsummary>
       <desc>
 	<p>The same as
@@ -6910,7 +7029,7 @@ ok
     </func>
     <func>
       <name name="statistics" arity="1" clause_i="15"
-	    anchor="statistics_total_active_tasks"/>
+	    anchor="statistics_total_active_tasks" since="OTP 18.3"/>
       <fsummary>Information about active processes and ports.</fsummary>
       <desc>
         <p>The same as calling
@@ -6921,7 +7040,7 @@ ok
 
     <func>
       <name name="statistics" arity="1" clause_i="16"
-	    anchor="statistics_total_active_tasks_all"/>
+	    anchor="statistics_total_active_tasks_all" since="OTP 20.0"/>
       <fsummary>Information about active processes and ports.</fsummary>
       <desc>
         <p>The same as calling
@@ -6932,7 +7051,7 @@ ok
 
     <func>
       <name name="statistics" arity="1" clause_i="17"
-	    anchor="statistics_total_run_queue_lengths"/>
+	    anchor="statistics_total_run_queue_lengths" since="OTP 18.3"/>
       <fsummary>Information about the run-queue lengths.</fsummary>
       <desc>
         <p>The same as calling
@@ -6943,7 +7062,7 @@ ok
 
     <func>
       <name name="statistics" arity="1" clause_i="18"
-	    anchor="statistics_total_run_queue_lengths_all"/>
+	    anchor="statistics_total_run_queue_lengths_all" since="OTP 20.0"/>
       <fsummary>Information about the run-queue lengths.</fsummary>
       <desc>
         <p>The same as calling
@@ -6953,7 +7072,7 @@ ok
     </func>
 
     <func>
-      <name name="statistics" arity="1" clause_i="19"/>
+      <name name="statistics" arity="1" clause_i="19" since=""/>
       <fsummary>Information about wall clock.</fsummary>
       <desc>
         <p>Returns information about wall clock. <c>wall_clock</c> can
@@ -6964,7 +7083,7 @@ ok
     </func>
 
     <func>
-      <name name="suspend_process" arity="1"/>
+      <name name="suspend_process" arity="1" since=""/>
       <fsummary>Suspend a process.</fsummary>
       <desc>
         <p>Suspends the process identified by
@@ -6979,7 +7098,7 @@ ok
     </func>
 
     <func>
-      <name name="suspend_process" arity="2"/>
+      <name name="suspend_process" arity="2" since=""/>
       <fsummary>Suspend a process.</fsummary>
       <desc>
         <p>Increases the suspend count on the process identified by
@@ -7125,7 +7244,7 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="1"/>
+      <name name="system_flag" arity="2" clause_i="1" since=""/>
       <fsummary>Set system flag <c>backtrace_depth</c>.</fsummary>
       <desc>
         <p>Sets the maximum depth of call stack back-traces in the
@@ -7138,7 +7257,7 @@ ok
 
     <func>
       <name name="system_flag" arity="2" clause_i="2"
-	    anchor="system_flag_cpu_topology"/>
+	    anchor="system_flag_cpu_topology" since=""/>
       <fsummary>Set system flag <c>cpu_topology</c>.</fsummary>
       <type name="cpu_topology"/>
       <type name="level_entry"/>
@@ -7186,7 +7305,7 @@ ok
 
     <func>
       <name name="system_flag" arity="2" clause_i="3"
-	    anchor="system_flag_dirty_cpu_schedulers_online"/>
+	    anchor="system_flag_dirty_cpu_schedulers_online" since="OTP 17.0"/>
       <fsummary>Set system_flag_dirty_cpu_schedulers_online.</fsummary>
       <desc>
         <p>
@@ -7214,7 +7333,7 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="4"/>
+      <name name="system_flag" arity="2" clause_i="4" since="OTP 20.2.3"/>
       <fsummary>Set system flag for erts_alloc.</fsummary>
       <desc>
         <p>Sets system flags for
@@ -7231,7 +7350,7 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="5"/>
+      <name name="system_flag" arity="2" clause_i="5" since=""/>
       <fsummary>Set system flag fullsweep_after.</fsummary>
       <desc>
         <p>Sets system flag <c>fullsweep_after</c>.
@@ -7251,7 +7370,7 @@ ok
 
     <func>
       <name name="system_flag" arity="2" clause_i="6"
-	    anchor="system_flag_microstate_accounting"/>
+	    anchor="system_flag_microstate_accounting" since="OTP 19.0"/>
       <fsummary>Set system flag microstate_accounting.</fsummary>
       <desc>
         <p>
@@ -7264,7 +7383,7 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="7"/>
+      <name name="system_flag" arity="2" clause_i="7" since=""/>
       <fsummary>Set system flag min_heap_size.</fsummary>
       <desc>
         <p>Sets the default minimum heap size for processes. The size
@@ -7279,7 +7398,7 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="8"/>
+      <name name="system_flag" arity="2" clause_i="8" since="OTP R13B04"/>
       <fsummary>Set system flag min_bin_vheap_size.</fsummary>
       <desc>
         <p>Sets the default minimum binary virtual heap size for
@@ -7297,7 +7416,7 @@ ok
 
     <func>
       <name name="system_flag" arity="2" clause_i="9"
-	    anchor="system_flag_max_heap_size"/>
+	    anchor="system_flag_max_heap_size" since="OTP 19.0"/>
       <fsummary>Set system flag max_heap_size.</fsummary>
       <type name="max_heap_size"/>
       <desc>
@@ -7315,7 +7434,7 @@ ok
 
     <func>
       <name name="system_flag" arity="2" clause_i="10"
-	    anchor="system_flag_multi_scheduling"/>
+	    anchor="system_flag_multi_scheduling" since=""/>
       <fsummary>Set system flag multi_scheduling.</fsummary>
       <desc>
         <p>
@@ -7371,7 +7490,7 @@ ok
 
     <func>
       <name name="system_flag" arity="2" clause_i="11"
-	    anchor="system_flag_scheduler_bind_type"/>
+	    anchor="system_flag_scheduler_bind_type" since=""/>
       <fsummary>Set system flag scheduler_bind_type.</fsummary>
       <type name="scheduler_bind_type"/>
       <desc>
@@ -7498,7 +7617,7 @@ ok
 
     <func>
       <name name="system_flag" arity="2" clause_i="12"
-	    anchor="system_flag_scheduler_wall_time"/>
+	    anchor="system_flag_scheduler_wall_time" since="OTP R15B01"/>
       <fsummary>Set system flag scheduler_wall_time.</fsummary>
       <desc>
         <p>
@@ -7511,7 +7630,7 @@ ok
 
     <func>
       <name name="system_flag" arity="2" clause_i="13"
-	    anchor="system_flag_schedulers_online"/>
+	    anchor="system_flag_schedulers_online" since=""/>
       <fsummary>Set system flag schedulers_online.</fsummary>
       <desc>
         <p>
@@ -7539,7 +7658,39 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="14"/>
+      <name name="system_flag" arity="2" clause_i="14" since="OTP 21.3"/>
+      <fsummary>Set system logger process.</fsummary>
+      <desc>
+        <p>Sets the process that will receive the logging
+        messages generated by ERTS. If set to <c>undefined</c>,
+        all logging messages generated by ERTS will be dropped.
+        The messages will be in the format:</p>
+        <code>
+{log,Level,Format,ArgList,Metadata} where
+
+Level = atom(),
+Format = string(),
+ArgList = list(term()),
+Metadata = #{ pid => pid(),
+   group_leader => pid(),
+   time := logger:timestamp(),
+   error_logger := #{ emulator := true, tag := atom() }
+        </code>
+        <p>If the <c>system_logger</c> process dies,
+        this flag will be reset to <c>logger</c>.</p>
+        <p>The default is the process named <c>logger</c>.</p>
+        <p>Returns the old value of the flag.</p>
+        <note><p>This function is designed to be used by the
+        KERNEL <seealso marker="kernel:logger"><c>logger</c></seealso>.
+        Be careful if you change it to something else as
+        log messages may be lost. If you want to intercept
+        emulator log messages, do it by adding a specialized handler
+        to the KERNEL logger.</p></note>
+      </desc>
+    </func>
+
+    <func>
+      <name name="system_flag" arity="2" clause_i="15" since=""/>
       <fsummary>Set system flag trace_control_word.</fsummary>
       <desc>
         <p>Sets the value of the node trace control word to
@@ -7553,8 +7704,8 @@ ok
     </func>
 
     <func>
-      <name name="system_flag" arity="2" clause_i="15"
-	    anchor="system_flag_time_offset"/>
+      <name name="system_flag" arity="2" clause_i="16"
+	    anchor="system_flag_time_offset" since="OTP 18.0"/>
       <fsummary>Finalize the time offset.</fsummary>
       <desc>
         <p>
@@ -7583,7 +7734,7 @@ ok
     </func>
 
     <func>
-      <name name="system_info" arity="1" clause_i="76"/>
+      <name name="system_info" arity="1" clause_i="76" since=""/>
       <fsummary>System info overview.</fsummary>
       <desc>
         <p>Returns information about the current system.
@@ -7703,8 +7854,9 @@ ok
               <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_system_logger"><c>system_logger</c></seealso>,
+              <seealso marker="#system_info_system_version"><c>system_version</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>
@@ -7716,12 +7868,12 @@ ok
 
     <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 -->
+	    anchor="system_info_allocator" since=""/>   <!-- allocated_areas -->
+      <name name="system_info" arity="1" clause_i="2" since=""/>   <!-- allocator -->
+      <name name="system_info" arity="1" clause_i="3" since=""/>   <!-- {allocator, _} -->
+      <name name="system_info" arity="1" clause_i="4" since=""/>   <!-- alloc_util_allocators -->
+      <name name="system_info" arity="1" clause_i="5" since=""/>   <!-- {allocator_sizes, _} -->
+      <name name="system_info" arity="1" clause_i="27" since=""/>  <!-- elib_malloc -->
       <fsummary>Information about the system allocators.</fsummary>
       <type variable="Allocator" name_i="2"/>
       <type variable="Version" name_i="2"/>
@@ -7873,10 +8025,10 @@ ok
 
     <func>
       <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="38"/>  <!-- logical_processors -->
-      <name name="system_info" arity="1" clause_i="73"/>  <!-- update_cpu_info -->
+	    anchor="system_info_cpu_topology" since=""/>           <!-- cpu_topology -->
+      <name name="system_info" arity="1" clause_i="13" since=""/>  <!-- {cpu_topology, _} -->
+      <name name="system_info" arity="1" clause_i="38" since=""/>  <!-- logical_processors -->
+      <name name="system_info" arity="1" clause_i="74" since="OTP R14B"/>  <!-- update_cpu_info -->
       <fsummary>Information about the CPU topology of the system.</fsummary>
       <type name="cpu_topology"/>
       <type name="level_entry"/>
@@ -8028,15 +8180,15 @@ ok
 
     <func>
       <name name="system_info" arity="1" clause_i="31"
-	    anchor="system_info_process"/>  <!-- fullsweep_after -->
-      <name name="system_info" arity="1" clause_i="32"/>  <!-- garbage_collection -->
-      <name name="system_info" arity="1" clause_i="33"/>  <!-- heap_sizes -->
-      <name name="system_info" arity="1" clause_i="34"/>  <!-- heap_type -->
-      <name name="system_info" arity="1" clause_i="40"/>  <!-- max_heap_size -->
-      <name name="system_info" arity="1" clause_i="41"/>  <!-- message_queue_data -->
-      <name name="system_info" arity="1" clause_i="42"/>  <!-- min_heap_size -->
-      <name name="system_info" arity="1" clause_i="43"/>  <!-- min_bin_vheap_size -->
-      <name name="system_info" arity="1" clause_i="57"/>  <!-- procs -->
+	    anchor="system_info_process" since=""/>  <!-- fullsweep_after -->
+      <name name="system_info" arity="1" clause_i="32" since=""/>  <!-- garbage_collection -->
+      <name name="system_info" arity="1" clause_i="33" since=""/>  <!-- heap_sizes -->
+      <name name="system_info" arity="1" clause_i="34" since=""/>  <!-- heap_type -->
+      <name name="system_info" arity="1" clause_i="40" since="OTP 19.0"/>  <!-- max_heap_size -->
+      <name name="system_info" arity="1" clause_i="41" since="OTP 19.0"/>  <!-- message_queue_data -->
+      <name name="system_info" arity="1" clause_i="42" since="OTP R13B04"/>  <!-- min_heap_size -->
+      <name name="system_info" arity="1" clause_i="43" since="OTP R13B04"/>  <!-- min_bin_vheap_size -->
+      <name name="system_info" arity="1" clause_i="57" since=""/>  <!-- procs -->
       <fsummary>Information about the default process heap settings.</fsummary>
       <type name="message_queue_data"/>
       <type name="max_heap_size"/>
@@ -8146,14 +8298,14 @@ ok
     </func>
 
     <func>
-      <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_count -->
-      <name name="system_info" arity="1" clause_i="30"/>  <!-- ets_limit -->
-      <name name="system_info" arity="1" clause_i="53"/>  <!-- port_count -->
-      <name name="system_info" arity="1" clause_i="54"/>  <!-- port_limit -->
-      <name name="system_info" arity="1" clause_i="55"/>  <!-- process_count -->
-      <name name="system_info" arity="1" clause_i="56"/>  <!-- process_limit -->
+      <name name="system_info" arity="1" clause_i="6" anchor="system_info_limits" since="OTP 20.0"/>   <!-- atom_count -->
+      <name name="system_info" arity="1" clause_i="7" since="OTP 20.0"/>   <!-- atom_limit -->
+      <name name="system_info" arity="1" clause_i="29" since="OTP 21.1"/>  <!-- ets_count -->
+      <name name="system_info" arity="1" clause_i="30" since="OTP R16B03"/>  <!-- ets_limit -->
+      <name name="system_info" arity="1" clause_i="53" since="OTP R16B"/>  <!-- port_count -->
+      <name name="system_info" arity="1" clause_i="54" since="OTP R16B"/>  <!-- port_limit -->
+      <name name="system_info" arity="1" clause_i="55" since=""/>  <!-- process_count -->
+      <name name="system_info" arity="1" clause_i="56" since=""/>  <!-- process_limit -->
       <fsummary>Information about various system limits.</fsummary>
       <desc>
         <marker id="system_info_limits"/>
@@ -8227,14 +8379,14 @@ ok
 
     <func>
       <name name="system_info" arity="1" clause_i="26"
-	    anchor="system_info_time"/>  <!-- end_time -->
-      <name name="system_info" arity="1" clause_i="50"/>  <!-- os_monotonic_time_source -->
-      <name name="system_info" arity="1" clause_i="51"/>  <!-- os_system_time_source -->
-      <name name="system_info" arity="1" clause_i="63"/>  <!-- start_time -->
-      <name name="system_info" arity="1" clause_i="68"/>  <!-- time_correction -->
-      <name name="system_info" arity="1" clause_i="69"/>  <!-- time_offset -->
-      <name name="system_info" arity="1" clause_i="70"/>  <!-- time_warp_mode -->
-      <name name="system_info" arity="1" clause_i="71"/>  <!-- tolerant_timeofday -->
+	    anchor="system_info_time" since="OTP 18.0"/>  <!-- end_time -->
+      <name name="system_info" arity="1" clause_i="50" since="OTP 18.0"/>  <!-- os_monotonic_time_source -->
+      <name name="system_info" arity="1" clause_i="51" since="OTP 18.0"/>  <!-- os_system_time_source -->
+      <name name="system_info" arity="1" clause_i="63" since="OTP 18.0"/>  <!-- start_time -->
+      <name name="system_info" arity="1" clause_i="69" since="OTP 18.0"/>  <!-- time_correction -->
+      <name name="system_info" arity="1" clause_i="70" since="OTP 18.0"/>  <!-- time_offset -->
+      <name name="system_info" arity="1" clause_i="71" since="OTP 18.0"/>  <!-- time_warp_mode -->
+      <name name="system_info" arity="1" clause_i="72" since="OTP 17.1"/>  <!-- tolerant_timeofday -->
       <fsummary>Information about system time.</fsummary>
       <desc>
         <marker id="system_info_time_tags"/>
@@ -8324,7 +8476,7 @@ ok
               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
+              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>
@@ -8455,19 +8607,19 @@ ok
 
     <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="45"/>  <!-- multi_scheduling -->
-      <name name="system_info" arity="1" clause_i="46"/>  <!-- multi_scheduling_blockers -->
-      <name name="system_info" arity="1" clause_i="49"/>  <!-- normal_multi_scheduling_blockers -->
-      <name name="system_info" arity="1" clause_i="58"/>  <!-- scheduler_bind_type -->
-      <name name="system_info" arity="1" clause_i="59"/>  <!-- scheduler_bindings -->
-      <name name="system_info" arity="1" clause_i="60"/>  <!-- scheduler_id -->
-      <name name="system_info" arity="1" clause_i="61"/>  <!-- schedulers -->
-      <name name="system_info" arity="1" clause_i="62"/>  <!-- smp_support -->
-      <name name="system_info" arity="1" clause_i="66"/>  <!-- threads -->
-      <name name="system_info" arity="1" clause_i="67"/>  <!-- thread_pool_size -->
+	    anchor="system_info_scheduler" since="OTP 17.0"/>  <!-- dirty_cpu_schedulers -->
+      <name name="system_info" arity="1" clause_i="18" since="OTP 17.0"/>  <!-- dirty_cpu_schedulers_online -->
+      <name name="system_info" arity="1" clause_i="19" since="OTP 17.0"/>  <!-- dirty_io_schedulers -->
+      <name name="system_info" arity="1" clause_i="45" since=""/>  <!-- multi_scheduling -->
+      <name name="system_info" arity="1" clause_i="46" since=""/>  <!-- multi_scheduling_blockers -->
+      <name name="system_info" arity="1" clause_i="49" since="OTP 19.0"/>  <!-- normal_multi_scheduling_blockers -->
+      <name name="system_info" arity="1" clause_i="58" since=""/>  <!-- scheduler_bind_type -->
+      <name name="system_info" arity="1" clause_i="59" since=""/>  <!-- scheduler_bindings -->
+      <name name="system_info" arity="1" clause_i="60" since=""/>  <!-- scheduler_id -->
+      <name name="system_info" arity="1" clause_i="61" since=""/>  <!-- schedulers -->
+      <name name="system_info" arity="1" clause_i="62" since=""/>  <!-- smp_support -->
+      <name name="system_info" arity="1" clause_i="67" since=""/>  <!-- threads -->
+      <name name="system_info" arity="1" clause_i="68" since=""/>  <!-- thread_pool_size -->
       <fsummary>Information about system schedulers.</fsummary>
       <desc>
         <marker id="system_info_scheduler_tags"/>
@@ -8755,11 +8907,11 @@ ok
 
     <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 -->
+	    anchor="system_info_dist" since=""/>  <!-- creation -->
+      <name name="system_info" arity="1" clause_i="16" since="OTP 18.0"/>  <!-- delayed_node_table_gc -->
+      <name name="system_info" arity="1" clause_i="20" since=""/>  <!-- dist -->
+      <name name="system_info" arity="1" clause_i="21" since="OTP R14B01"/>  <!-- dist_buf_busy_limit -->
+      <name name="system_info" arity="1" clause_i="22" since=""/>  <!-- dist_ctrl -->
       <fsummary>Information about erlang distribution.</fsummary>
       <desc>
         <marker id="system_info_dist_tags"/>
@@ -8833,14 +8985,14 @@ ok
       <!-- <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 -->
+	    anchor="system_info_misc" since="OTP R14B"/>   <!-- build_type -->
+      <name name="system_info" arity="1" clause_i="9" since=""/>   <!-- c_compiler_used -->
+      <name name="system_info" arity="1" clause_i="10" since=""/>  <!-- check_io -->
+      <name name="system_info" arity="1" clause_i="11" since=""/>  <!-- 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="15" since=""/>  <!-- 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 -->
@@ -8848,9 +9000,9 @@ ok
       <!-- <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="23" since=""/>  <!-- driver_version -->
+      <name name="system_info" arity="1" clause_i="24" since="OTP R15B01"/>  <!-- dynamic_trace -->
+      <name name="system_info" arity="1" clause_i="25" since="OTP R15B01"/>  <!-- 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 -->
@@ -8860,24 +9012,24 @@ ok
       <!-- <name name="system_info" arity="1" clause_i="32"/>  garbage_collection -->
       <!-- <name name="system_info" arity="1" clause_i="33"/>  heap_sizes -->
       <!-- <name name="system_info" arity="1" clause_i="34"/>  heap_type -->
-      <name name="system_info" arity="1" clause_i="35"/>  <!-- info -->
-      <name name="system_info" arity="1" clause_i="36"/>  <!-- kernel_poll -->
-      <name name="system_info" arity="1" clause_i="37"/>  <!-- loaded -->
+      <name name="system_info" arity="1" clause_i="35" since=""/>  <!-- info -->
+      <name name="system_info" arity="1" clause_i="36" since=""/>  <!-- kernel_poll -->
+      <name name="system_info" arity="1" clause_i="37" since=""/>  <!-- loaded -->
       <!-- <name name="system_info" arity="1" clause_i="38"/>  logical_processors -->
-      <name name="system_info" arity="1" clause_i="39"/>  <!-- machine -->
+      <name name="system_info" arity="1" clause_i="39" since=""/>  <!-- machine -->
       <!-- <name name="system_info" arity="1" clause_i="40"/>  max_heap_size -->
       <!-- <name name="system_info" arity="1" clause_i="41"/>  message_queue_data -->
       <!-- <name name="system_info" arity="1" clause_i="42"/>  min_heap_size -->
       <!-- <name name="system_info" arity="1" clause_i="43"/>  min_bin_vheap_size -->
-      <name name="system_info" arity="1" clause_i="44"/>  <!-- modified_timing_level -->
+      <name name="system_info" arity="1" clause_i="44" since=""/>  <!-- modified_timing_level -->
       <!-- <name name="system_info" arity="1" clause_i="45"/>  multi_scheduling -->
       <!-- <name name="system_info" arity="1" clause_i="46"/>  multi_scheduling_blockers -->
-      <name name="system_info" arity="1" clause_i="47"/>  <!-- nif_version -->
+      <name name="system_info" arity="1" clause_i="47" since="OTP 17.4"/>  <!-- nif_version -->
       <!-- n<name name="system_info" arity="1" clause_i="48"/>  ormal_multi_scheduling_blockers -->
-      <name name="system_info" arity="1" clause_i="49"/>  <!-- otp_release -->
+      <name name="system_info" arity="1" clause_i="49" since=""/>  <!-- otp_release -->
       <!-- <name name="system_info" arity="1" clause_i="50"/>  os_monotonic_time_source -->
       <!-- <name name="system_info" arity="1" clause_i="51"/>  os_system_time_source -->
-      <name name="system_info" arity="1" clause_i="52"/>  <!-- port_parallelism -->
+      <name name="system_info" arity="1" clause_i="52" since="OTP R16B"/>  <!-- port_parallelism -->
       <!-- <name name="system_info" arity="1" clause_i="53"/>  port_count -->
       <!-- <name name="system_info" arity="1" clause_i="54"/>  port_limit -->
       <!-- <name name="system_info" arity="1" clause_i="55"/>  process_count -->
@@ -8889,19 +9041,20 @@ ok
       <!-- <name name="system_info" arity="1" clause_i="61"/>  schedulers -->
       <!-- <name name="system_info" arity="1" clause_i="62"/>  smp_support -->
       <!-- <name name="system_info" arity="1" clause_i="63"/>  start_time -->
-      <name name="system_info" arity="1" clause_i="64"/>  <!-- system_version -->
-      <name name="system_info" arity="1" clause_i="65"/>  <!-- system_architecture -->
-      <!-- <name name="system_info" arity="1" clause_i="66"/>  threads -->
-      <!-- <name name="system_info" arity="1" clause_i="67"/>  thread_pool_size -->
-      <!-- <name name="system_info" arity="1" clause_i="68"/>  time_correction -->
-      <!-- <name name="system_info" arity="1" clause_i="69"/>  time_offset -->
-      <!-- <name name="system_info" arity="1" clause_i="70"/>  time_warp_mode -->
-      <!-- <name name="system_info" arity="1" clause_i="71"/>  tolerant_timeofday -->
-      <name name="system_info" arity="1" clause_i="72"/>  <!-- trace_control_word -->
-      <!-- <name name="system_info" arity="1" clause_i="73"/>  update_cpu_info -->
-      <name name="system_info" arity="1" clause_i="74"/>  <!-- version -->
-      <name name="system_info" arity="1" clause_i="75"/>  <!-- wordsize -->
-      <!-- <name name="system_info" arity="1" clause_i="76"/>  overview -->
+      <name name="system_info" arity="1" clause_i="64" since=""/>  <!-- system_architecture -->
+      <name name="system_info" arity="1" clause_i="65" since="OTP 21.3"/>  <!-- system_logger -->
+      <name name="system_info" arity="1" clause_i="66" since=""/>  <!-- system_version -->
+      <!-- <name name="system_info" arity="1" clause_i="67"/>  threads -->
+      <!-- <name name="system_info" arity="1" clause_i="68"/>  thread_pool_size -->
+      <!-- <name name="system_info" arity="1" clause_i="69"/>  time_correction -->
+      <!-- <name name="system_info" arity="1" clause_i="70"/>  time_offset -->
+      <!-- <name name="system_info" arity="1" clause_i="71"/>  time_warp_mode -->
+      <!-- <name name="system_info" arity="1" clause_i="72"/>  tolerant_timeofday -->
+      <name name="system_info" arity="1" clause_i="73" since=""/>  <!-- trace_control_word -->
+      <!-- <name name="system_info" arity="1" clause_i="74"/>  update_cpu_info -->
+      <name name="system_info" arity="1" clause_i="75" since=""/>  <!-- version -->
+      <name name="system_info" arity="1" clause_i="76" since=""/>  <!-- wordsize -->
+      <!-- <name name="system_info" arity="1" clause_i="77"/>  overview -->
       <fsummary>Information about the system.</fsummary>
       <desc>
         <marker id="system_info_misc_tags"/>
@@ -9057,18 +9210,24 @@ ok
               <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_system_logger"/>
+            <c>system_logger</c></tag>
+          <item>
+            <p>Returns the current <c>system_logger</c> as set by
+            <seealso marker="#system_flag/2"><c>erlang:system_flag(system_logger, _)</c></seealso>.</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_trace_control_word"/>
             <c>trace_control_word</c></tag>
           <item>
@@ -9110,7 +9269,7 @@ ok
     </func>
 
     <func>
-      <name name="system_monitor" arity="0"/>
+      <name name="system_monitor" arity="0" since=""/>
       <fsummary>Current system performance monitoring settings.</fsummary>
       <type name="system_monitor_option"/>
       <desc>
@@ -9124,7 +9283,7 @@ ok
     </func>
 
     <func>
-      <name name="system_monitor" arity="1"/>
+      <name name="system_monitor" arity="1" since=""/>
       <fsummary>Set or clear system performance monitoring options.</fsummary>
       <type name="system_monitor_option"/>
       <desc>
@@ -9142,7 +9301,7 @@ ok
     </func>
 
     <func>
-      <name name="system_monitor" arity="2"/>
+      <name name="system_monitor" arity="2" since=""/>
       <fsummary>Set system performance monitoring options.</fsummary>
       <type name="system_monitor_option"/>
       <desc>
@@ -9255,6 +9414,18 @@ ok
         <p>Returns the previous system monitor settings just like
           <seealso marker="#system_monitor/0">
           <c>erlang:system_monitor/0</c></seealso>.</p>
+	<p>The arguments to <c>system_monitor/2</c> specifies how all
+	  system monitoring on the node should be done, not how it should be
+	  changed. This means only one process at a time
+	  (<c><anno>MonitorPid</anno></c>) can be the receiver of system monitor
+	  messages. Also, the way to clear a specific monitor option
+	  is to not include it in the list <c><anno>Options</anno></c>. All
+	  system monitoring will, however, be cleared if the process identified by
+	  <c><anno>MonitorPid</anno></c> terminates.</p>
+	<p>There are no special option values (like zero) to clear an option.
+	  Some of the options have a unspecified minimum value. Lower values
+	  will be adjusted to the minimum value. For example, it is currently not
+	  possible to monitor all garbage collections with <c>{long_gc, 0}</c>.</p>
         <note>
           <p>If a monitoring process gets so large that it itself
             starts to cause system monitor messages when garbage
@@ -9274,7 +9445,7 @@ ok
     </func>
 
     <func>
-      <name name="system_profile" arity="0"/>
+      <name name="system_profile" arity="0" since=""/>
       <fsummary>Current system profiling settings.</fsummary>
       <type name="system_profile_option"/>
       <desc>
@@ -9289,7 +9460,7 @@ ok
     </func>
 
     <func>
-      <name name="system_profile" arity="2"/>
+      <name name="system_profile" arity="2" since=""/>
       <fsummary>Current system profiling settings.</fsummary>
       <type name="system_profile_option"/>
       <desc>
@@ -9363,7 +9534,7 @@ ok
     </func>
 
     <func>
-      <name name="system_time" arity="0"/>
+      <name name="system_time" arity="0" since="OTP 18.0"/>
       <fsummary>Current Erlang system time.</fsummary>
       <desc>
         <p>Returns current
@@ -9385,7 +9556,7 @@ ok
     </func>
 
     <func>
-      <name name="system_time" arity="1"/>
+      <name name="system_time" arity="1" since="OTP 18.0"/>
       <fsummary>Current Erlang system time.</fsummary>
       <desc>
         <p>Returns current
@@ -9407,7 +9578,7 @@ ok
     </func>
 
     <func>
-      <name name="term_to_binary" arity="1"/>
+      <name name="term_to_binary" arity="1" since=""/>
       <fsummary>Encode a term to an Erlang external term format binary.
       </fsummary>
       <desc>
@@ -9435,7 +9606,7 @@ hello
     </func>
 
     <func>
-      <name name="term_to_binary" arity="2"/>
+      <name name="term_to_binary" arity="2" since=""/>
       <fsummary>Encode a term to en Erlang external term format binary.
       </fsummary>
       <desc>
@@ -9500,7 +9671,7 @@ hello
     </func>
 
     <func>
-      <name name="throw" arity="1"/>
+      <name name="throw" arity="1" since=""/>
       <fsummary>Throw an exception.</fsummary>
       <desc>
         <p>A non-local return from a function. If evaluated within a
@@ -9514,7 +9685,7 @@ hello
     </func>
 
     <func>
-      <name name="time" arity="0"/>
+      <name name="time" arity="0" since=""/>
       <fsummary>Current time.</fsummary>
       <desc>
         <p>Returns the current time as <c>{Hour, Minute, Second}</c>.</p>
@@ -9527,7 +9698,7 @@ hello
     </func>
 
     <func>
-      <name name="time_offset" arity="0"/>
+      <name name="time_offset" arity="0" since="OTP 18.0"/>
       <fsummary>Current time offset.</fsummary>
       <desc>
         <p>Returns the current time offset between
@@ -9559,7 +9730,7 @@ hello
     </func>
 
     <func>
-      <name name="time_offset" arity="1"/>
+      <name name="time_offset" arity="1" since="OTP 18.0"/>
       <fsummary>Current time offset.</fsummary>
       <desc>
         <p>Returns the current time offset between
@@ -9578,7 +9749,7 @@ hello
     </func>
 
     <func>
-      <name name="timestamp" arity="0"/>
+      <name name="timestamp" arity="0" since="OTP 18.0"/>
       <fsummary>Current Erlang System time.</fsummary>
       <type name="timestamp"/>
       <desc>
@@ -9617,7 +9788,7 @@ timestamp() ->
     </func>
 
     <func>
-      <name name="tl" arity="1"/>
+      <name name="tl" arity="1" since=""/>
       <fsummary>Tail of a list.</fsummary>
       <desc>
         <p>Returns the tail of <c><anno>List</anno></c>, that is,
@@ -9632,7 +9803,7 @@ timestamp() ->
     </func>
 
     <func>
-      <name name="trace" arity="3"/>
+      <name name="trace" arity="3" since=""/>
       <fsummary>Set trace flags for a process or processes.</fsummary>
       <type name="trace_flag"/>
       <desc>
@@ -9959,6 +10130,11 @@ timestamp() ->
           time stamp flags are remembered, so if two are passed
           and the one with highest precedence later is disabled,
           the other one becomes active.</p>
+        <p>If a match specification (applicable only for <c>call</c>, <c>send</c>
+          and <c>'receive'</c> tracing) contains a <c>{message}</c> action
+          function with a non-boolean value, that value is added as an extra
+          element to the message tuple either in the last position or before
+          the timestamp (if it is present).</p>
         <p>Trace messages:</p>
         <marker id="trace_3_trace_messages"></marker>
         <taglist>
@@ -10288,7 +10464,7 @@ timestamp() ->
     </func>
 
     <func>
-      <name name="trace_delivered" arity="1"/>
+      <name name="trace_delivered" arity="1" since=""/>
       <fsummary>Notification when trace has been delivered.</fsummary>
       <desc>
         <p>The delivery of trace messages (generated by
@@ -10343,7 +10519,7 @@ timestamp() ->
     </func>
 
     <func>
-      <name name="trace_info" arity="2"/>
+      <name name="trace_info" arity="2" since=""/>
       <fsummary>Trace information about a process or function.</fsummary>
       <type name="trace_info_return"/>
       <type name="trace_info_item_result"/>
@@ -10479,7 +10655,7 @@ timestamp() ->
     </func>
 
     <func>
-      <name name="trace_pattern" arity="2" clause_i="1"/>
+      <name name="trace_pattern" arity="2" clause_i="1" since=""/>
       <fsummary>Set trace patterns for call, send, or 'receive' tracing.
       </fsummary>
       <type name="trace_pattern_mfa"/>
@@ -10497,7 +10673,7 @@ timestamp() ->
     </func>
 
     <func>
-      <name name="trace_pattern" arity="3" clause_i="1"/>
+      <name name="trace_pattern" arity="3" clause_i="1" since="OTP 19.0"/>
       <fsummary>Set trace pattern for message sending.</fsummary>
       <type name="trace_match_spec"/>
       <type name="match_variable"/>
@@ -10568,7 +10744,7 @@ timestamp() ->
     </func>
 
     <func>
-      <name name="trace_pattern" arity="3" clause_i="2"/>
+      <name name="trace_pattern" arity="3" clause_i="2" since="OTP 19.0"/>
       <fsummary>Set trace pattern for tracing of message receiving.</fsummary>
       <type name="trace_match_spec"/>
       <type name="match_variable"/>
@@ -10640,7 +10816,7 @@ timestamp() ->
     </func>
 
     <func>
-      <name name="trace_pattern" arity="3" clause_i="3"/>
+      <name name="trace_pattern" arity="3" clause_i="3" since=""/>
       <fsummary>Set trace patterns for tracing of function calls.</fsummary>
       <type name="trace_pattern_mfa"/>
       <type name="trace_match_spec"/>
@@ -10831,7 +11007,7 @@ timestamp() ->
     </func>
 
     <func>
-      <name name="trunc" arity="1"/>
+      <name name="trunc" arity="1" since=""/>
       <fsummary>Return an integer by truncating a number.</fsummary>
       <desc>
         <p>Returns an integer by truncating <c><anno>Number</anno></c>,
@@ -10844,7 +11020,7 @@ timestamp() ->
     </func>
 
     <func>
-      <name name="tuple_size" arity="1"/>
+      <name name="tuple_size" arity="1" since=""/>
       <fsummary>Return the size of a tuple.</fsummary>
       <desc>
         <p>Returns an integer that is the number of elements in
@@ -10857,7 +11033,7 @@ timestamp() ->
     </func>
 
     <func>
-      <name name="tuple_to_list" arity="1"/>
+      <name name="tuple_to_list" arity="1" since=""/>
       <fsummary>Convert a tuple to a list.</fsummary>
       <desc>
         <p>Returns a list corresponding to <c><anno>Tuple</anno></c>.
@@ -10870,7 +11046,7 @@ timestamp() ->
     </func>
 
     <func>
-      <name name="unique_integer" arity="0"/>
+      <name name="unique_integer" arity="0" since="OTP 18.0"/>
       <fsummary>Get a unique integer value.</fsummary>
       <desc>
         <p>Generates and returns an
@@ -10883,7 +11059,7 @@ timestamp() ->
     </func>
 
     <func>
-      <name name="unique_integer" arity="1"/>
+      <name name="unique_integer" arity="1" since="OTP 18.0"/>
       <fsummary>Get a unique integer value.</fsummary>
       <desc>
         <p>Generates and returns an
@@ -10965,7 +11141,7 @@ timestamp() ->
     </func>
 
     <func>
-      <name name="universaltime" arity="0"/>
+      <name name="universaltime" arity="0" since=""/>
       <fsummary>Current date and time according to Universal Time Coordinated
         (UTC).</fsummary>
       <desc>
@@ -10982,7 +11158,7 @@ timestamp() ->
     </func>
 
     <func>
-      <name name="universaltime_to_localtime" arity="1"/>
+      <name name="universaltime_to_localtime" arity="1" since=""/>
       <fsummary>Convert from Universal Time Coordinated (UTC) to local date
         and time.</fsummary>
       <desc>
@@ -11001,7 +11177,7 @@ timestamp() ->
     </func>
 
     <func>
-      <name name="unlink" arity="1"/>
+      <name name="unlink" arity="1" since=""/>
       <fsummary>Remove a link to another process or port.</fsummary>
       <desc>
         <p>Removes the link, if there is one, between the calling
@@ -11047,7 +11223,7 @@ end</code>
     </func>
 
     <func>
-      <name name="unregister" arity="1"/>
+      <name name="unregister" arity="1" since=""/>
       <fsummary>Remove the registered name for a process (or port).</fsummary>
       <desc>
         <p>Removes the registered name <c><anno>RegName</anno></c>
@@ -11063,7 +11239,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="whereis" arity="1"/>
+      <name name="whereis" arity="1" since=""/>
       <fsummary>Get the pid (or port) with a specified registered name.
       </fsummary>
       <desc>
@@ -11077,7 +11253,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="yield" arity="0"/>
+      <name name="yield" arity="0" since=""/>
       <fsummary>Let other processes get a chance to execute.</fsummary>
       <desc>
         <p>Voluntarily lets other processes (if any) get a chance to
diff --git a/erts/doc/src/erts_alloc.xml b/erts/doc/src/erts_alloc.xml
index a094217959..962bc9a244 100644
--- a/erts/doc/src/erts_alloc.xml
+++ b/erts/doc/src/erts_alloc.xml
@@ -487,11 +487,10 @@
             utilization value used. Once a carrier is abandoned, no new
             allocations are made in it. When an allocator instance gets an
             increased multiblock carrier need, it first tries to fetch an
-            abandoned carrier from an allocator instance of the same
-            allocator type. If no abandoned carrier can be fetched, it
-            creates a new empty carrier. When an abandoned carrier has been
-            fetched, it will function as an ordinary carrier. This feature has
-            special requirements on the
+            abandoned carrier from another allocator instance. If no abandoned
+            carrier can be fetched, it creates a new empty carrier. When an
+            abandoned carrier has been 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>, <c>aoffcaobf</c>,
 	    <c>ageffcaoff</c>m, <c>ageffcbf</c> and <c>ageffcaobf</c>
@@ -584,7 +583,7 @@
             carriers are decided in section
             <seealso marker="#mseg_mbc_sizes">
             The alloc_util Framework</seealso>. On
-            32-bit Unix style OS this limit cannot be set &gt; 128 MB.</p>
+            32-bit Unix style OS this limit cannot be set &gt; 64 MB.</p>
         </item>
         <tag><marker id="M_mbcgs"/><c><![CDATA[+M<S>mbcgs <ratio>]]></c></tag>
         <item>
diff --git a/erts/doc/src/init.xml b/erts/doc/src/init.xml
index c14f0a558d..c824e37976 100644
--- a/erts/doc/src/init.xml
+++ b/erts/doc/src/init.xml
@@ -29,7 +29,7 @@
     <rev></rev>
     <file>init.xml</file>
   </header>
-  <module>init</module>
+  <module since="">init</module>
   <modulesummary>Coordination of system startup.</modulesummary>
   <description>
     <p>This module is preloaded and contains the code for
@@ -50,7 +50,7 @@
 
   <funcs>
     <func>
-      <name name="boot" arity="1"/>
+      <name name="boot" arity="1" since=""/>
       <fsummary>Start the Erlang runtime system.</fsummary>
       <desc>
         <p>Starts the Erlang runtime system. This function is called
@@ -69,7 +69,7 @@
     </func>
 
     <func>
-      <name name="get_argument" arity="1"/>
+      <name name="get_argument" arity="1" since=""/>
       <fsummary>Get the values associated with a command-line user flag.
       </fsummary>
       <desc>
@@ -112,7 +112,7 @@
     </func>
 
     <func>
-      <name name="get_arguments" arity="0"/>
+      <name name="get_arguments" arity="0" since=""/>
       <fsummary>Get all command-line user flags.</fsummary>
       <desc>
         <p>Returns all command-line flags and the system-defined flags, see
@@ -121,7 +121,7 @@
     </func>
 
     <func>
-      <name name="get_plain_arguments" arity="0"/>
+      <name name="get_plain_arguments" arity="0" since=""/>
       <fsummary>Get all non-flag command-line arguments.</fsummary>
       <desc>
         <p>Returns any plain command-line arguments as a list of strings
@@ -130,7 +130,7 @@
     </func>
 
     <func>
-      <name name="get_status" arity="0"/>
+      <name name="get_status" arity="0" since=""/>
       <fsummary>Get system status information.</fsummary>
       <type name="internal_status"/>
       <desc>
@@ -146,7 +146,7 @@
     </func>
 
     <func>
-      <name name="reboot" arity="0"/>
+      <name name="reboot" arity="0" since=""/>
       <fsummary>Take down and restart an Erlang node smoothly.</fsummary>
       <desc>
         <p>All applications are taken down smoothly, all code is
@@ -162,7 +162,7 @@
     </func>
 
     <func>
-      <name name="restart" arity="0"/>
+      <name name="restart" arity="0" since=""/>
       <fsummary>Restart the running Erlang node.</fsummary>
       <desc>
         <p>The system is restarted <em>inside</em> the running Erlang
@@ -178,7 +178,7 @@
     </func>
 
     <func>
-      <name name="script_id" arity="0"/>
+      <name name="script_id" arity="0" since=""/>
       <fsummary>Get the identity of the used boot script.</fsummary>
       <desc>
         <p>Gets the identity of the boot script used to boot the system.
@@ -189,7 +189,7 @@
     </func>
 
     <func>
-      <name name="stop" arity="0"/>
+      <name name="stop" arity="0" since=""/>
       <fsummary>Take down an Erlang node smoothly.</fsummary>
       <desc>
         <p>The same as
@@ -198,7 +198,7 @@
     </func>
 
     <func>
-      <name name="stop" arity="1"/>
+      <name name="stop" arity="1" since=""/>
       <fsummary>Take down an Erlang node smoothly.</fsummary>
       <desc>
         <p>All applications are taken down smoothly, all code is
diff --git a/erts/doc/src/internal.xml b/erts/doc/src/internal.xml
new file mode 100644
index 0000000000..88609d492a
--- /dev/null
+++ b/erts/doc/src/internal.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE part SYSTEM "part.dtd">
+
+<internal xmlns:xi="http://www.w3.org/2001/XInclude">
+  <header>
+    <copyright>
+      <year>2018</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>ERTS Internal Documentation</title>
+    <prepared>Lukas Larsson</prepared>
+    <docno></docno>
+    <date>2018-07-07</date>
+    <rev>4.5.2</rev>
+    <file>internal.xml</file>
+  </header>
+  <xi:include href="CarrierMigration.xml"/>
+  <xi:include href="ThreadProgress.xml"/>
+  <xi:include href="CodeLoading.xml"/>
+  <xi:include href="Tracing.xml"/>
+  <xi:include href="DelayedDealloc.xml"/>
+  <xi:include href="beam_makeops.xml"/>
+  <xi:include href="CountingInstructions.xml"/>
+  <xi:include href="GarbageCollection.xml"/>
+  <xi:include href="PTables.xml"/>
+  <xi:include href="PortSignals.xml"/>
+  <xi:include href="ProcessManagementOptimizations.xml"/>
+  <xi:include href="SuperCarrier.xml"/>
+</internal>
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index a34b3edd7a..5ca387ffd8 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,1215 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 10.4.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    An invalid value test caused the socket:setopt(Socket,
+	    ip, add_membership, ip_mreq()) to fail with badarg. The
+	    same for drop_membership.</p>
+          <p>
+	    Own Id: OTP-15908 Aux Id: ERL-980 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed bug causing VM crash when doing textual dump of a
+	    process containing an unhandled monitor down signal.
+	    Textual process dumps can be done with
+	    <c>erlang:system_info(procs)</c>, trace feature
+	    <c>process_dump</c>, Erlang shell break menu and a
+	    crashdump. Bug exist since OTP 21.0.</p>
+          <p>
+	    Own Id: OTP-15909 Aux Id: ERL-979 </p>
+        </item>
+        <item>
+	    <p><c>lists:subtract/2</c> would produce incorrect
+	    results for some inputs on 64-bit platforms.</p>
+          <p>
+	    Own Id: OTP-15938 Aux Id: ERL-986 </p>
+        </item>
+        <item>
+	    <p>Fixed a bug in the loader that was similar to
+	    <c>OTP-15938</c>, yielding incorrect code for some inputs
+	    on 64-bit platforms.</p>
+          <p>
+	    Own Id: OTP-15939</p>
+        </item>
+        <item>
+          <p>
+	    Fixed bug causing scheduler threads in rare cases to
+	    block spinnning indefinitely. Bug exists since OTP 21.0.</p>
+          <p>
+	    Own Id: OTP-15941 Aux Id: PR-2313 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 10.4.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixed a buffer overflow when
+	    <c>binary_to_existing_atom/2</c> and
+	    <c>list_to_existing_atom/2</c> was used with the
+	    <c>latin1</c> encoding.</p>
+          <p>
+	    Own Id: OTP-15819 Aux Id: ERL-944 </p>
+        </item>
+        <item>
+          <p>
+	    The runtime system disconnected a connection if it
+	    received an <c>exit/2</c> signal where the recipient was
+	    a process on an old incarnation of the current node. That
+	    is, the receiving node had the same node name, but
+	    another "creation" number. The signal will now just be
+	    dropped since the receiving process no longer exists.</p>
+          <p>
+	    Own Id: OTP-15867 Aux Id: ERIERL-373 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 10.4.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed <c>process_info(Pid,reductions)</c> to not
+	    categorically increase reduction count of the measured
+	    process <c>Pid</c>. Repeated reduction measure of an idle
+	    process will most often (but not guaranteed) return the
+	    same value, like it behaved before OTP 21.3.8.</p>
+          <p>
+	    Own Id: OTP-15865 Aux Id: ERL-964 </p>
+        </item>
+        <item>
+	    <p>Fixed an incorrect load-time optimization that could
+	    cause a crash when extracting deeply nested tuple
+	    elements.</p>
+          <p>
+	    Own Id: OTP-15871 Aux Id: ERIERL-374 </p>
+        </item>
+        <item>
+          <p>
+	    Fix bug causing VM crash when pressing P for "proc info"
+	    in Erlang shell break menu. Bug exists since OTP 22.0.</p>
+          <p>
+	    Own Id: OTP-15873 Aux Id: ERL-965 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 10.4.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>In nested use of <c>try</c>/<c>catch</c>, rethrowing
+	    an exception using <c>erlang:raise/3</c> with a different
+	    class would not always be able to change the class of the
+	    exception.</p>
+          <p>
+	    Own Id: OTP-15834 Aux Id: ERIERL-367 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 10.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Do not allocate new bitstring/binary when an empty binary
+	    is appended.</p>
+          <p>
+	    Own Id: OTP-15535 Aux Id: PR-2055 </p>
+        </item>
+        <item>
+          <p>
+	    Document that <c>process_info(_, current_function)</c>
+	    can return <c>{current_function, undefined}</c> in case
+	    of execution of native code.</p>
+          <p>
+	    Own Id: OTP-15543 Aux Id: PR-2089 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed bug in <c>ets:select</c>, <c>ets:match</c> and
+	    friends which could cause the table to remain fixated (as
+	    if <c>ets:safe_fixtable</c> had been called) after the
+	    call returned. This could happen for <c>protected</c>
+	    tables if another concurrent running process transferred
+	    table ownership to the process during its
+	    ets:select/match call. Ownership can be transferred using
+	    either <c>ets:give_away</c> or the <c>heir</c> table
+	    option.</p>
+          <p>
+	    Own Id: OTP-15672</p>
+        </item>
+        <item>
+	    <p>Fixed a Windows-specific bug in <c>file:list_dir/1</c>
+	    that caused it to misbehave on network shares.</p>
+          <p>
+	    Own Id: OTP-15693</p>
+        </item>
+        <item>
+          <p>
+	    Fixed bug when calling <c>enif_whereis_*</c> from NIF
+	    resource destructor. Symptoms could be emulator crash or
+	    hanging scheduler threads.</p>
+          <p>
+	    Own Id: OTP-15694 Aux Id: ERL-863 </p>
+        </item>
+        <item>
+	    <p>Fixed a bug in the error case of <c>apply/3</c>, where
+	    the exception would erroneously have an empty argument
+	    list in some cases.</p>
+          <p>
+	    Own Id: OTP-15698</p>
+        </item>
+        <item>
+	    <p>A bug has been fixed in the <c>maps</c> implementation
+	    that could cause a crash or memory usage to grow until
+	    the machine ran out of memory. This could happen when
+	    inserting a new key-value pair with a key <c>K1</c>
+	    containing a binary <c>B1</c> into a map <c>M</c> having
+	    a key <c>K2</c> with a binary <c>B2</c> if the following
+	    conditions were met:</p> <list> <item><c>B1 =/=
+	    B2</c></item> <item><c>size(B1) >= 4294967296</c></item>
+	    <item><c>size(B2) >= 4294967296</c></item>
+	    <item><c>size(M) >= 32</c></item> <item><c>(size(B1) rem
+	    4294967296) == (size(B2) rem 4294967296)</c></item>
+	    <item>the first <c>(size(B1) rem 4294967296)</c> bytes
+	    are the same both in <c>B1</c> and <c>B2</c></item>
+	    <item>substituting <c>B1</c> in <c>K1</c> with <c>B2</c>
+	    would create a term with the same value as
+	    <c>K2</c></item> </list> <p>The root cause of the problem
+	    is that the <c>maps</c> implementation only hashed the
+	    first <c>(X rem 4294967296)</c> bytes of binaries so that
+	    different binaries could get the same hash value
+	    independently of the hash seed.</p>
+          <p>
+	    Own Id: OTP-15707</p>
+        </item>
+        <item>
+          <p>
+	    <c>term_to_binary()</c> and distributed sends will now
+	    throw a <c>system_limit</c> exception instead of
+	    producing erroneous results when trying to encode a
+	    binary larger than 4 GB.</p>
+          <p>
+	    Own Id: OTP-15708</p>
+        </item>
+        <item>
+          <p>
+	    The vxworks configure has been updated to respect the
+	    environment CFLAGS.</p>
+          <p>
+	    Own Id: OTP-15773</p>
+        </item>
+        <item>
+          <p>
+	    Fix configure to not enable PGO (profile guided
+	    optimizations) when linking of the PGO binary fails. For
+	    instance this happens when there is no gcov lib
+	    installed.</p>
+          <p>
+	    Own Id: OTP-15788</p>
+        </item>
+        <item>
+          <p>
+	    Fix bug on OpenBSD where sockets using <c>active,
+	    true</c> or <c>active, N</c> could cause the system to
+	    live lock. The bug was introduced in erts-10.2
+	    (OTP-21.2).</p>
+          <p>
+	    Own Id: OTP-15791</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add support for Erlang Distribution protocol to split the
+	    payload of large signals into several fragments. This
+	    allows other processes to communicate uninterrupted
+	    during the transmission of these signals.</p>
+          <p>
+	    Own Id: OTP-13397</p>
+        </item>
+        <item>
+          <p>
+	    A simple socket API is provided through the socket
+	    module. This is a low level API that does *not* replace
+	    gen_[tcp|udp|sctp]. It is intended to *eventually*
+	    replace the inet driver, but not the high level
+	    gen-modules (gen_tcp, gen_udp and gen_sctp). It also
+	    provides a basic API that facilitates the implementation
+	    of other protocols, that is TCP, UDP and SCTP. </p>
+          <p>
+	    Known issues are; No support for the Windows OS
+	    (currently).</p>
+          <p>
+	    Own Id: OTP-14831</p>
+        </item>
+        <item>
+	    <p>Added NIF functions <seealso
+	    marker="erl_nif#enif_set_pid_undefined"><c>enif_set_pid_undefined</c></seealso>,
+	    <seealso
+	    marker="erl_nif#enif_is_pid_undefined"><c>enif_is_pid_undefined</c></seealso>
+	    and <seealso
+	    marker="erl_nif#enif_compare_pids"><c>enif_compare_pids</c></seealso>.</p>
+          <p>
+	    Own Id: OTP-15011 Aux Id: PR-2147 </p>
+        </item>
+        <item>
+	    <p>Underutilized memory segments (carriers) can now move
+	    between all allocator instances, rather than just between
+	    instances of the same type, which greatly reduces memory
+	    usage in some scenarios. </p>
+          <p>
+	    Own Id: OTP-15063</p>
+        </item>
+        <item>
+	    <p>The emulator will now mark free blocks in pooled
+	    carriers with <c>madvise(2) + MADV_FREE</c> (or similar),
+	    letting the OS reclaim the associated physical memory if
+	    necessary.</p>
+          <p>
+	    Own Id: OTP-15075</p>
+        </item>
+        <item>
+          <p>
+	    New <c>ERL_NIF_SELECT_CANCEL</c> feature added to
+	    <c>enif_select</c> in order to cancel (or "deselect") a
+	    read or write event on a previously selected file
+	    descriptor.</p>
+          <p>
+	    Own Id: OTP-15095</p>
+        </item>
+        <item>
+          <p>
+	    ETS option <c>write_concurrency</c> now also affects and
+	    improves the scalability of <c>ordered_set</c> tables.
+	    The implementation is based on a data structure called
+	    contention adapting search tree, where the lock
+	    granularity adapts to the actual amount of concurrency
+	    exploited by the applications in runtime.</p>
+          <p>
+	    Own Id: OTP-15128</p>
+        </item>
+        <item>
+          <p>
+	    Build configuration of the <c>crypto</c> application has
+	    been moved from the <c>erts</c> application into the
+	    <c>crypto</c> application.</p>
+          <p>
+	    Own Id: OTP-15129</p>
+        </item>
+        <item>
+	    <p>Anonymous functions that don't capture environment are
+	    now created at load-time instead of in run-time.</p>
+          <p>
+	    Own Id: OTP-15195 Aux Id: PR-1812 </p>
+        </item>
+        <item>
+          <p>
+	    Optimize updates of maps with identical keys and values.
+	    E.g. in the example below the original Map will be reused
+	    as the return of the update.</p>
+          <p>
+	    1> Map = #{ a => b }. #{ a => b } 2> Map#{ a := b }.</p>
+          <p>
+	    Own Id: OTP-15211 Aux Id: PR-1889 </p>
+        </item>
+        <item>
+          <p>
+	    Optimize <c>binary:match/2</c> and
+	    <c>binary:matches/2</c> to use memchr internally.</p>
+          <p>
+	    Own Id: OTP-15238 Aux Id: PR-1803 </p>
+        </item>
+        <item>
+          <p>
+	    The runtime system used to terminate when a message
+	    larger than 2 Gb was passed over the distribution. The
+	    send operation will now instead throw a
+	    <c>system_limit</c> exception.</p>
+          <p>
+	    Own Id: OTP-15261</p>
+        </item>
+        <item>
+          <p>
+	    Change the first module called by erts to be named
+	    erl_init instead of otp_ring0. systools in sasl have been
+	    updated to reflect this change.</p>
+          <p>
+	    Own Id: OTP-15336 Aux Id: PR-1825 </p>
+        </item>
+        <item>
+          <p>
+	    Minor adjustments made to build system for parallel
+	    configure.</p>
+          <p>
+	    Own Id: OTP-15340 Aux Id: OTP-14625 </p>
+        </item>
+        <item>
+          <p>
+	    Two new NIF interface functions <c>enif_select_read</c>
+	    and <c>enif_select_write</c>. They are similar to
+	    existing <c>enif_select</c> but allow a custom event
+	    message as an argument.</p>
+          <p>
+	    Own Id: OTP-15349 Aux Id: PR-2084 </p>
+        </item>
+        <item>
+	    <p>The embedded copy of <c>zlib</c> has been updated from
+	    <c>1.2.8</c> to <c>1.2.11</c>.</p>
+	    <p>Note that this copy is only used as a fallback when
+	    the target platform doesn't provide any <c>zlib</c>
+	    development libraries. If your system provides
+	    <c>zlib</c> then it will be used even if it is older than
+	    <c>1.2.11</c>.</p>
+          <p>
+	    Own Id: OTP-15351 Aux Id: ERL-749 </p>
+        </item>
+        <item>
+          <p>
+	    New NIF function <c>enif_make_monitor_term</c>.</p>
+          <p>
+	    Own Id: OTP-15362 Aux Id: PR-2127 </p>
+        </item>
+        <item>
+	    <p>Appending lists (The ++ operator) will now yield
+	    properly on large inputs.</p>
+          <p>
+	    Own Id: OTP-15427</p>
+        </item>
+        <item>
+	    <p>The <c>length/1</c> BIF used to calculate the length
+	    of the list in one go without yielding, even if the list
+	    was very long. In OTP 22, <c>length/1</c> will yield when
+	    called with long lists.</p>
+          <p>
+	    Own Id: OTP-15439</p>
+        </item>
+        <item>
+          <p>
+	    Processes sending messages are now punished with a
+	    reduction cost based on message size. That is, a process
+	    sending a large message will yield earlier than before.</p>
+          <p>
+	    Own Id: OTP-15513 Aux Id: ERL-773 </p>
+        </item>
+        <item>
+	    <p>The transitory emulator option <c>+ztma true</c>
+	    (introduced in OTP 21.3) has been removed.</p>
+          <p>
+	    Own Id: OTP-15581 Aux Id: OTP-15580 </p>
+        </item>
+        <item>
+	    <p>In OTP 22, HiPE (the native code compiler) is not
+	    fully functional. The reasons for this are:</p>
+	    <p>There are new BEAM instructions for binary matching
+	    that the HiPE native code compiler does not support.</p>
+	    <p>The new optimizations in the Erlang compiler create
+	    new combination of instructions that HiPE currently does
+	    not handle correctly.</p>
+	    <p>If erlc is invoked with the <c>+native</c> option, and
+	    if any of the new binary matching instructions are used,
+	    the compiler will issue a warning and produce a BEAM file
+	    without native code.</p>
+          <p>
+	    Own Id: OTP-15596</p>
+        </item>
+        <item>
+          <p>
+	    The termination behaviour of processes has changed to
+	    allow processes to yield while sending link exit/monitor
+	    down signals.</p>
+          <p>
+	    The erl crash dump has been expanded to now also include
+	    processes that are termeinating but have not yet
+	    terminated.</p>
+          <p>
+	    Own Id: OTP-15610</p>
+        </item>
+        <item>
+          <p>
+	    The dist messages EXIT, EXIT2 and MONITOR_DOWN have been
+	    updated with new versions that send the reason term as
+	    part of the payload of the message instead of as part of
+	    the control message.</p>
+          <p>
+	    The old versions are still present and can be used when
+	    communicating with nodes that don't support the new
+	    versions.</p>
+          <p>
+	    Own Id: OTP-15611</p>
+        </item>
+        <item>
+          <p>
+	    When sending messages, exit, exit2 and monitor down
+	    distributed signals, the process sending will now yield
+	    appropriately.</p>
+          <p>
+	    This means that a terminating process will yield and
+	    possibly be suspended on busy distribution entries while
+	    they are terminating. This means that any memory held by
+	    such processes will not be released until after all
+	    exit/monitor down signals have been sent.</p>
+          <p>
+	    Own Id: OTP-15612</p>
+        </item>
+        <item>
+          <p>
+	    All external pids/ports/refs created by
+	    erlang:list_to_pid/port/ref debug functions now compare
+	    equal to any other pid/port/ref with the same number from
+	    that node.</p>
+          <p>
+	    Before this change they compared differently because the
+	    node creation of the pid/port/ref did not compare equal
+	    to any real pid/port/ref creation.</p>
+          <p>
+	    This will mostly effect pids/ports/refs typed in the
+	    shell.</p>
+          <p>
+	    Own Id: OTP-15613</p>
+        </item>
+        <item>
+          <p>
+	    The <c>persistent_term</c> functions <c>put/2</c> and
+	    <c>erase/1</c> are now yielding.</p>
+          <p>
+	    Own Id: OTP-15615</p>
+        </item>
+        <item>
+          <p>
+	    A new <seealso
+	    marker="erlang#dist_ctrl_set_opt/3"><c>erlang:dist_ctrl_set_opt(DHandle,
+	    get_size, Value)</c></seealso> option has been added.
+	    This option makes it possible to configure the
+	    distribution channel identified by <c>DHandle</c> so that
+	    <seealso
+	    marker="erlang#dist_ctrl_get_data/1"><c>erlang:dist_ctrl_get_data(DHandle)</c></seealso>
+	    also returns the size of the data to pass over the
+	    channel.</p>
+          <p>
+	    Own Id: OTP-15617</p>
+        </item>
+        <item>
+	    <p>Previously, all ETS tables used centralized counter
+	    variables to keep track of the number of items stored and
+	    the amount of memory consumed. These counters can cause
+	    scalability problems (especially on big NUMA systems).
+	    This change adds an implementation of a decentralized
+	    counter and modifies the implementation of ETS so that
+	    ETS tables of type <c>ordered_set</c> with
+	    <c>write_concurrency</c> enabled use the decentralized
+	    counter. Experiments indicate that this change
+	    substantially improves the scalability of ETS
+	    <c>ordered_set</c> tables with <c>write_concurrency</c>
+	    enabled in scenarios with frequent <c>ets:insert/2</c>
+	    and <c>ets:delete/2</c> calls.</p>
+          <p>
+	    Own Id: OTP-15623 Aux Id: PR-2190 </p>
+        </item>
+        <item>
+	    <p>The <c>iolist_size/1</c> function is now yielding
+	    which means that an Erlang/OTP system will be responsive
+	    even if the applications running on the system frequently
+	    call <c>iolist_size/1</c> with large iolists.</p>
+          <p>
+	    Own Id: OTP-15631</p>
+        </item>
+        <item>
+          <p>
+	    A simple test suite for the net module has been added.</p>
+          <p>
+	    Own Id: OTP-15635</p>
+        </item>
+        <item>
+	    <p>Added the NIF function <c>enif_term_type</c>, which
+	    helps avoid long sequences of <c>enif_is_xyz</c> by
+	    returning the type of the given term. This is especially
+	    helpful for NIFs that serialize terms, such as JSON
+	    encoders, where it can improve both performance and
+	    readability.</p>
+          <p>
+	    Own Id: OTP-15640</p>
+        </item>
+        <item>
+	    <p>The last call optimization is now applied to BIFs.
+	    When calling a BIF in the tail position of a function,
+	    the return address and stack frame will now be discarded
+	    before calling the BIF. As a consequence of this change,
+	    the immediate caller of a tail-called BIF will no longer
+	    be available in stack backtraces.</p>
+          <p>
+	    Own Id: OTP-15674 Aux Id: PR-2177 </p>
+        </item>
+        <item>
+          <p>
+	    Fix GC bug where distributed messages in a processes
+	    mailbox would cause extra GCs. This can be very expensive
+	    if there many messages in the mailbox.</p>
+          <p>
+	    Own Id: OTP-15703</p>
+        </item>
+        <item>
+	    <p>Internal documentation has now been added to the
+	    <em>Erts</em> and <em>Compiler</em> applications.</p>
+	    <p>The internal documents for <em>Erts</em> describe
+	    miscellaneous interesting implementation details. Those
+	    details can change at any time.</p>
+	    <p>The internal documentation for <em>Compiler</em>
+	    documents the API for the Core Erlang modules. While we
+	    will not change those APIs without good reason, we don't
+	    give the same guarantees about backward compatibility as
+	    for the rest of the APIs in OTP.</p>
+          <p>
+	    Own Id: OTP-15715</p>
+        </item>
+        <item>
+	    <p>The performance of non-bignum integer arithmetic has
+	    been improved.</p>
+          <p>
+	    Own Id: OTP-15740</p>
+        </item>
+        <item>
+          <p>
+	    The <c>-remsh</c> option to <c>erl</c> now automatically
+	    adds the local systems hostname to the target node if no
+	    nodename is given. e.g.</p>
+          <p>
+	    <c> erl -name foo -remsh bar </c><br/> <c> erl -sname foo
+	    -remsh bar </c></p>
+          <p>
+	    Own Id: OTP-15794 Aux Id: PR-2219 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 10.3.5.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed bug causing VM crash when doing textual dump of a
+	    process containing an unhandled monitor down signal.
+	    Textual process dumps can be done with
+	    <c>erlang:system_info(procs)</c>, trace feature
+	    <c>process_dump</c>, Erlang shell break menu and a
+	    crashdump. Bug exist since OTP 21.0.</p>
+          <p>
+	    Own Id: OTP-15909 Aux Id: ERL-979 </p>
+        </item>
+        <item>
+	    <p><c>lists:subtract/2</c> would produce incorrect
+	    results for some inputs on 64-bit platforms.</p>
+          <p>
+	    Own Id: OTP-15938 Aux Id: ERL-986 </p>
+        </item>
+        <item>
+	    <p>Fixed a bug in the loader that was similar to
+	    <c>OTP-15938</c>, yielding incorrect code for some inputs
+	    on 64-bit platforms.</p>
+          <p>
+	    Own Id: OTP-15939</p>
+        </item>
+        <item>
+          <p>
+	    Fixed bug causing scheduler threads in rare cases to
+	    block spinnning indefinitely. Bug exists since OTP 21.0.</p>
+          <p>
+	    Own Id: OTP-15941 Aux Id: PR-2313 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 10.3.5.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    If you set <c>{linger,{true,0}}</c> on a <c>gen_tcp</c>
+	    listen socket, accept a connection on that socket, and
+	    then close the accepted socket, now the linger zero
+	    setting is transferred to the accepted socket. Before
+	    this correction that information was lost and the close
+	    behaviour on the accepted socket incorrect.</p>
+          <p>
+	    Own Id: OTP-15370 Aux Id: ERIERL-353 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed <c>process_info(Pid,reductions)</c> to not
+	    categorically increase reduction count of the measured
+	    process <c>Pid</c>. Repeated reduction measure of an idle
+	    process will most often (but not guaranteed) return the
+	    same value, like it behaved before OTP 21.3.8.</p>
+          <p>
+	    Own Id: OTP-15865 Aux Id: ERL-964 </p>
+        </item>
+        <item>
+          <p>
+	    The runtime system disconnected a connection if it
+	    received an <c>exit/2</c> signal where the recipient was
+	    a process on an old incarnation of the current node. That
+	    is, the receiving node had the same node name, but
+	    another "creation" number. The signal will now just be
+	    dropped since the receiving process no longer exists.</p>
+          <p>
+	    Own Id: OTP-15867 Aux Id: ERIERL-373 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The possibility to send ancillary data, in particular the
+	    TOS field, has been added to <c>gen_udp:send/4,5</c>.</p>
+          <p>
+	    Own Id: OTP-15747 Aux Id: ERIERL-294 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 10.3.5.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>In nested use of <c>try</c>/<c>catch</c>, rethrowing
+	    an exception using <c>erlang:raise/3</c> with a different
+	    class would not always be able to change the class of the
+	    exception.</p>
+          <p>
+	    Own Id: OTP-15834 Aux Id: ERIERL-367 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed bug in <c>seq_trace:set_token(label,Term)</c> which
+	    could cause VM crash if <c>Term</c> was heap allocated
+	    (not an atom, small integer, local pid or port). Bug
+	    exists since OTP 21.0 when terms other than small
+	    integers were first allowed as labels.</p>
+          <p>
+	    Own Id: OTP-15849 Aux Id: ERL-700 </p>
+        </item>
+        <item>
+          <p>
+	    Fix <c>seq_trace:print/2</c> not to raise <c>badarg</c>
+	    exception if label is not a small integer. Bug exists
+	    since OTP 21.0.</p>
+          <p>
+	    Own Id: OTP-15859 Aux Id: ERL-700 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 10.3.5.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixed a buffer overflow when
+	    <c>binary_to_existing_atom/2</c> and
+	    <c>list_to_existing_atom/2</c> was used with the
+	    <c>latin1</c> encoding.</p>
+          <p>
+	    Own Id: OTP-15819 Aux Id: ERL-944 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 10.3.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed more bugs in <c>process_info(reductions)</c>
+	    causing it to sometimes behave non-monotonic. That is, a
+	    subsequent call toward the same process could return a
+	    lower reduction value.</p>
+          <p>
+	    Own Id: OTP-15793 Aux Id: ERIERL-337, OTP-15709 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 10.3.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Add missing documentation of new external tags
+	    <c>NEW_PID</c>, <c>NEW_PORT</c> and
+	    <c>NEWER_REFERENCE</c> introduced in OTP 19.</p> <p>These
+	    new tags are planned to be "activated" in OTP 23 when
+	    distribution capability flag <c>DFLAG_BIG_CREATION</c>
+	    becomes mandatory. Older nodes (>= 19) are able to decode
+	    these new tags and send them back to the new node. Nodes
+	    older than OTP 23 will however never encode their own
+	    local pids, ports and references using the new tags.</p>
+          <p>
+	    Own Id: OTP-15766</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 10.3.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix <c>erlang:open_port/2</c> with the <c>fd</c> option
+	    to correctly cleanup the pollset when the port is closed.
+	    Before this fix there would be error printouts sent to
+	    logger when the same fd was reused in a new port.</p>
+          <p>
+	    Own Id: OTP-15753 Aux Id: ERL-900 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 10.3.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixed a bug in <c>seq_trace:reset_trace/0</c> that
+	    could crash the emulator.</p>
+          <p>
+	    Own Id: OTP-15704</p>
+        </item>
+        <item>
+          <p>
+	    Fixed bug in <c>process_info(reductions)</c> causing it
+	    to sometimes return invalid results.</p>
+          <p>
+	    Own Id: OTP-15709 Aux Id: ERIERL-337 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 10.3.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>If a suspend/resume signal pair was sent to a process
+	    while it was executing dirty, the receiving process could
+	    later end up in a suspended state indefinitely. This bug
+	    was introduced in ERTS version 10.0 (OTP 21.0).</p>
+	    <p>Suspend/resume signals are sent from <seealso
+	    marker="erts:erlang#suspend_process/1"><c>erlang:suspend_process()</c></seealso>/<seealso
+	    marker="erts:erlang#resume_process/1"><c>erlang:resume_process()</c></seealso>.
+	    The <seealso
+	    marker="runtime_tools:dbg"><c>dbg</c></seealso> trace
+	    tool utilize this functionality and could thus trigger
+	    this bug.</p>
+          <p>
+	    Own Id: OTP-15688</p>
+        </item>
+        <item>
+          <p>
+	    Fix a possible deadlock when terminating the ERTS caused
+	    by a dirty scheduler not releasing it's run-queue lock
+	    when terminating.</p>
+          <p>
+	    Own Id: OTP-15690 Aux Id: PR-2172 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 10.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>When multiplying a number by itself, a word beyond the
+	    number on the heap could be read (and ignored). This bug
+	    was extremely unlikely to actually cause a real
+	    problem.</p>
+          <p>
+	    Own Id: OTP-15484</p>
+        </item>
+        <item>
+          <p>
+	    Fix bug where doing <c>seq_trace:reset_trace()</c> while
+	    another process was doing a garbage collection could
+	    cause the run-time system to segfault.</p>
+          <p>
+	    Own Id: OTP-15490</p>
+        </item>
+        <item>
+          <p>
+	    Fix reading of ancillary data from packet oriented
+	    sockets on old Linux kernel versions. Without this fix,
+	    getting the data would cause the port to enter an
+	    infinite loop.</p>
+          <p>
+	    Own Id: OTP-15494</p>
+        </item>
+        <item>
+          <p>
+	    Fix bug where crash dumping or doing
+	    <c>erlang:system_info(procs)</c> while another process
+	    was doing a garbage collection could cause the run-time
+	    system to segfault.</p>
+          <p>
+	    Own Id: OTP-15527</p>
+        </item>
+        <item>
+          <p>
+	    Fix <c>erlang:system_info(kernel_poll)</c> to return
+	    correct value. Before this fix, the call always returned
+	    <c>false</c>.</p>
+          <p>
+	    Own Id: OTP-15556</p>
+        </item>
+        <item>
+          <p>
+	    Fix bug in <c>enif_make_map_from_arrays</c> that would
+	    produce broken maps when number of keys were 32. Bug
+	    exists since OTP 21.0.</p>
+          <p>
+	    Own Id: OTP-15567</p>
+        </item>
+        <item>
+          <p>
+	    Fix a bug in <c>binary:encode_unsigned</c> that may cause
+	    a read of uninitialized memory.</p>
+          <p>
+	    The bug existed since the function was added (OTP
+	    R16B02).</p>
+          <p>
+	    Own Id: OTP-15583 Aux Id: PR-2118 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed a bug that could cause <c>heart</c> to kill an
+	    exiting node before it had time to flush all buffered
+	    writes. If environment variable
+	    <c>HEART_KILL_SIGNAL=SIGABRT</c> was set a superfluous
+	    core dump could also be generated.</p>
+          <p>
+	    Own Id: OTP-15599 Aux Id: ERIERL-298 </p>
+        </item>
+        <item>
+          <p>
+	    Fix <c>enif_consume_timeslice</c> to be a no-op on dirty
+	    scheduler and not crash debug compiled emulator.</p>
+          <p>
+	    Own Id: OTP-15604</p>
+        </item>
+        <item>
+          <p>
+	    Fixed macro redefinition warnings.</p>
+          <p>
+	    Own Id: OTP-15629</p>
+        </item>
+        <item>
+          <p>
+	    <c>to_erl</c> fixed to not garble terminal input beyond
+	    7-bit ASCII.</p>
+          <p>
+	    Own Id: OTP-15650 Aux Id: ERL-854, PR-2161 </p>
+        </item>
+        <item>
+          <p>
+	    Minor fixes for <c>make clean</c>.</p>
+          <p>
+	    Own Id: OTP-15657</p>
+        </item>
+        <item>
+          <p>
+	    Fixed a bug in all <c>ets:select*</c> and
+	    <c>ets:match*</c> functions that could in some rare cases
+	    lead to very poor performance.</p>
+          <p>
+	    Own Id: OTP-15660 Aux Id: ERL-869 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add <c>erlang:system_flag(system_logger, Pid)</c> and
+	    <c>erlang:system_info(system_logger)</c>. This
+	    system_flag can be used to set the process that will
+	    receive the logging messages generated by ERTS.</p>
+          <p>
+	    Own Id: OTP-15375</p>
+        </item>
+        <item>
+	    <p><c>integer_to_list/2</c> and
+	    <c>integer_to_binary/2</c> are now implemented in C,
+	    improving their performance.</p>
+          <p>
+	    Own Id: OTP-15503 Aux Id: PR-2052 </p>
+        </item>
+        <item>
+          <p>
+	    Improved <c>term_to_binary</c> to do more fair reduction
+	    count and yielding when encoding large byte lists
+	    (strings).</p>
+          <p>
+	    Own Id: OTP-15514 Aux Id: ERL-774 </p>
+        </item>
+        <item>
+          <p>
+	    Made internal port drivers more robust against
+	    <c>erlang:port_control</c> with invalid arguments and
+	    added documentation warnings about such abuse.</p>
+          <p>
+	    Own Id: OTP-15555 Aux Id: ERIERL-231 </p>
+        </item>
+        <item>
+          <p>
+	    Fix bug on NetBSD where the <c>exit_status</c> from a
+	    port program would never be sent.</p>
+          <p>
+	    Own Id: OTP-15558 Aux Id: ERL-725 </p>
+        </item>
+        <item>
+	    <p>There is a new function <c>persistent:term(Key,
+	    Default)</c> to allow specifying a default when looking
+	    up a persistent term.</p>
+          <p>
+	    Own Id: OTP-15576 Aux Id: ERL-843 </p>
+        </item>
+        <item>
+	    <p>A transitory emulator option '<c>+ztma true</c>' has
+	    been added to allow running existing BEAM code that
+	    relies on "tuple calls" (dispatch on parameterized
+	    modules) which has been compiled under OTP 20 or earlier.
+	    This option will be removed in OTP 22, so such modules
+	    should eventually be recompiled with the
+	    <c>+tuple_calls</c> option.</p>
+          <p>
+	    Own Id: OTP-15580 Aux Id: PR-2113 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 10.2.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixes of install/release phase in build system.</p>
+	    <list> <item>The source tree was modified when
+	    installing/releasing and/or applying a patch.</item>
+	    <item>Some files were installed with wrong access
+	    rights.</item> <item>If applying a patch (using
+	    <c>otp_patch_apply</c>) as another user (except root)
+	    than the user that built the source, the documentation
+	    was not properly updated.</item> </list>
+          <p>
+	    Own Id: OTP-15551</p>
+        </item>
+        <item>
+          <p>
+	    Setting the <c>recbuf</c> size of an inet socket the
+	    <c>buffer</c> is also automatically increased. Fix a bug
+	    where the auto adjustment of inet buffer size would be
+	    triggered even if an explicit inet buffer size had
+	    already been set.</p>
+          <p>
+	    Own Id: OTP-15651 Aux Id: ERIERL-304 </p>
+        </item>
+        <item>
+          <p>
+	    Reading from UDP using active <c>true</c> or active
+	    <c>N</c> mode has been optimized when more packets than
+	    specified by <c>read_packets</c> are available on the
+	    socket.</p>
+          <p>
+	    Own Id: OTP-15652 Aux Id: ERIERL-304 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 10.2.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    When using the <c>{linger,{true,T}}</c> option;
+	    <c>gen_tcp:listen/2</c> used the full linger time before
+	    returning for example <c>eaddrinuse</c>. This bug has now
+	    been corrected.</p>
+          <p>
+	    Own Id: OTP-14728 Aux Id: ERIERL-303 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 10.2.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix bug where doing a <c>gen_tcp:send</c> on a socket
+	    with <c>delay_send</c> set to true could cause a segfault
+	    if the other side closes the connection.</p>
+          <p>
+	    Bug was introduced in erts-10.2 (OTP-21.2).</p>
+          <p>
+	    Own Id: OTP-15536 Aux Id: ERL-827 </p>
+        </item>
+        <item>
+          <p>
+	    Fix a race condition when a port program closes that
+	    could result in the next started port to hang during
+	    startup.</p>
+          <p>
+	    When this fault happens the following error is normally
+	    (but not always) logged:</p>
+          <p>
+	    <c> =ERROR REPORT==== 14-Jan-2019::10:45:52.868246
+	    ===</c><br/><c> Bad input fd in erts_poll()! fd=11,
+	    port=#Port&lt;0.505>, driver=spawn, name=/bin/sh -s
+	    unix:cmd </c></p>
+          <p>
+	    Bug was introduced in erts-10.0 (OTP-21.0).</p>
+          <p>
+	    Own Id: OTP-15537</p>
+        </item>
+        <item>
+          <p>
+	    Fix a bug where polling for external events could be
+	    delayed for a very long time if all active schedulers
+	    were 100% loaded.</p>
+          <p>
+	    Bug was introduced in erts-10.2 (OTP-21.2).</p>
+          <p>
+	    Own Id: OTP-15538 Aux Id: ERIERL-229 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 10.2.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixed a crash when dangling files were closed after
+	    <c>init:restart/0</c>.</p>
+          <p>
+	    Own Id: OTP-15495 Aux Id: ERL-821 </p>
+        </item>
+        <item>
+          <p>
+	    A bug that could cause dirty schedulers to become
+	    unresponsive has been fixed.</p>
+          <p>
+	    Own Id: OTP-15509 Aux Id: PR-2027, PR-2093 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 10.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed bug on big endian architectures when changing file
+	    permissions or ownership with <c>file:change_mode</c>,
+	    <c>change_owner</c>, <c>change_group</c> or
+	    <c>write_file_info</c>. Bug exists since OTP-21.0.</p>
+          <p>
+	    Own Id: OTP-15485</p>
+        </item>
+        <item>
+          <p>
+	    Fixed bug in <c>atomics</c> with option
+	    <c>{signed,false}</c> when returned values are <c>(1 bsl
+	    63)</c> or larger. Could cause heap corruption leading to
+	    VM crash or other unpleasant symptoms. Bug exists since
+	    OTP-21.2 when module <c>atomics</c> was introduced.</p>
+          <p>
+	    Own Id: OTP-15486 Aux Id: PR-2061 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed bug in operator <c>band</c> of two negative
+	    operands causing erroneous result if the absolute value
+	    of one of the operands have the lowest <c>N*W</c> bits as
+	    zero and the other absolute value is 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-15487 Aux Id: ERL-804 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 10.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -1586,6 +2795,135 @@
 
 </section>
 
+<section><title>Erts 9.3.3.11</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixed a buffer overflow when
+	    <c>binary_to_existing_atom/2</c> and
+	    <c>list_to_existing_atom/2</c> was used with the
+	    <c>latin1</c> encoding.</p>
+          <p>
+	    Own Id: OTP-15819 Aux Id: ERL-944 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 9.3.3.10</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixes of install/release phase in build system.</p>
+	    <list> <item>The source tree was modified when
+	    installing/releasing and/or applying a patch.</item>
+	    <item>Some files were installed with wrong access
+	    rights.</item> <item>If applying a patch (using
+	    <c>otp_patch_apply</c>) as another user (except root)
+	    than the user that built the source, the documentation
+	    was not properly updated.</item> </list>
+          <p>
+	    Own Id: OTP-15551</p>
+        </item>
+        <item>
+          <p>
+	    Minor fixes for <c>make clean</c>.</p>
+          <p>
+	    Own Id: OTP-15657</p>
+        </item>
+        <item>
+          <p>
+	    Fixed a bug in all <c>ets:select*</c> and
+	    <c>ets:match*</c> functions that could in some rare cases
+	    lead to very poor performance.</p>
+          <p>
+	    Own Id: OTP-15660 Aux Id: ERL-869 </p>
+        </item>
+        <item>
+          <p>
+	    Fix a possible deadlock when terminating the ERTS caused
+	    by a dirty scheduler not releasing it's run-queue lock
+	    when terminating.</p>
+          <p>
+	    Own Id: OTP-15690 Aux Id: PR-2172 </p>
+        </item>
+        <item>
+	    <p>Add missing documentation of new external tags
+	    <c>NEW_PID</c>, <c>NEW_PORT</c> and
+	    <c>NEWER_REFERENCE</c> introduced in OTP 19.</p> <p>These
+	    new tags are planned to be "activated" in OTP 23 when
+	    distribution capability flag <c>DFLAG_BIG_CREATION</c>
+	    becomes mandatory. Older nodes (>= 19) are able to decode
+	    these new tags and send them back to the new node. Nodes
+	    older than OTP 23 will however never encode their own
+	    local pids, ports and references using the new tags.</p>
+          <p>
+	    Own Id: OTP-15766</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 9.3.3.9</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>Added an optional <c>./configure</c> flag to compile
+	    the emulator with spectre mitigation:
+	    <c>--with-spectre-mitigation</c></p>
+	    <p>Note that this requires a recent version of GCC with
+	    support for spectre mitigation and the
+	    <c>--mindirect-branch=thunk</c> flag, such as
+	    <c>8.1</c>.</p>
+          <p>
+	    Own Id: OTP-15430 Aux Id: ERIERL-237 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 9.3.3.8</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    A bug that could cause dirty schedulers to become
+	    unresponsive has been fixed.</p>
+          <p>
+	    Own Id: OTP-15509 Aux Id: PR-2027, PR-2093 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erts 9.3.3.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed bug in operator <c>band</c> of two negative
+	    operands causing erroneous result if the absolute value
+	    of one of the operands have the lowest <c>N*W</c> bits as
+	    zero and the other absolute value is 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-15487 Aux Id: ERL-804 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 9.3.3.6</title>
 
     <section><title>Improvements and New Features</title>
@@ -1947,6 +3285,22 @@
 
 </section>
 
+<section><title>Erts 9.2.0.1</title>
+
+  <section><title>Improvements and New Features</title>
+  <list>
+    <item>
+      <p>
+	Extra internal consistency checks wrt communication with
+      erl_child_setup process.</p>
+      <p>
+      Own Id: OTP-15488 Aux Id: ERIERL-231 </p>
+    </item>
+  </list>
+  </section>
+
+</section>
+  
 <section><title>Erts 9.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -3145,6 +4499,43 @@
 
 </section>
 
+<section><title>Erts 8.3.5.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed bug in operator <c>band</c> of two negative
+	    operands causing erroneous result if the absolute value
+	    of one of the operands have the lowest <c>N*W</c> bits as
+	    zero and the other absolute value is 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-15487 Aux Id: ERL-804 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>Added an optional <c>./configure</c> flag to compile
+	    the emulator with spectre mitigation:
+	    <c>--with-spectre-mitigation</c></p>
+	    <p>Note that this requires a recent version of GCC with
+	    support for spectre mitigation and the
+	    <c>--mindirect-branch=thunk</c> flag, such as
+	    <c>8.1</c>.</p>
+          <p>
+	    Own Id: OTP-15430 Aux Id: ERIERL-237 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 8.3.5.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -7858,8 +9249,7 @@
 	    Erlang/OTP has been ported to the realtime operating
 	    system OSE. The port supports both smp and non-smp
 	    emulator. For details around the port and how to started
-	    see the User's Guide in the <seealso
-	    marker="ose:ose_intro">ose</seealso> application. </p>
+	    see the User's Guide in the <em>ose</em> application.</p>
           <p>
 	    Note that not all parts of Erlang/OTP has been ported. </p>
           <p>
@@ -8965,9 +10355,9 @@
 	    <c>fix_alloc</c> allocator, a different strategy for
 	    management of fix blocks will be used.</item> <item>The
 	    information returned from <seealso
-	    marker="erlang:system_info_allocator_tuple"><c>erlang:system_info({allocator,
+	    marker="erlang#system_info_allocator_tuple"><c>erlang:system_info({allocator,
 	    A})</c></seealso>, and <seealso
-	    marker="erlang:system_info_allocator_sizes"><c>erlang:system_info({allocator_sizes,
+	    marker="erlang#system_info_allocator_sizes"><c>erlang:system_info({allocator_sizes,
 	    A})</c></seealso> will be slightly different when this
 	    feature has been enabled. An <c>mbcs_pool</c> tuple will
 	    be present giving information about abandoned carriers,
@@ -9776,8 +11166,7 @@
 	    information about signal ordering guarantees, see the
 	    chapter on <seealso
 	    marker="erts:communication">communication</seealso> in
-	    the ERTS user's guide. The <seealso
-	    marker="erts:erl#+n">+n</seealso> command line flag of
+	    the ERTS user's guide. The <c>+n</c> command line flag of
 	    <seealso marker="erts:erl">erl(1)</seealso> can be
 	    helpful when trying to find signaling order bugs in
 	    Erlang code that have been exposed by these
@@ -10756,7 +12145,7 @@
 	    you use erlang:halt/2 with an integer first argument and
 	    an option list containing {flush,false} as the second
 	    argument. Note that now is flushing not dependant of the
-	    exit code, and you can not only flush async threads
+	    exit code, and you cannot only flush async threads
 	    operations which we deemed as a strange behaviour anyway.
 	    </p>
 	    <p>Also, erlang:halt/1,2 has gotten a new feature: If the
diff --git a/erts/doc/src/part.xml b/erts/doc/src/part.xml.src
index 05e9a24af8..9b20beffad 100644
--- a/erts/doc/src/part.xml
+++ b/erts/doc/src/part.xml.src
@@ -4,7 +4,7 @@
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1996</year><year>2018</year>
+      <year>1996</year><year>2019</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -42,6 +42,7 @@
   <xi:include href="tty.xml"/>
   <xi:include href="driver.xml"/>
   <xi:include href="inet_cfg.xml"/>
+  %ESOCK_USE_SOCKET_USAGE_XML%
   <xi:include href="erl_ext_dist.xml"/>
   <xi:include href="erl_dist_protocol.xml"/>
 </part>
diff --git a/erts/doc/src/persistent_term.xml b/erts/doc/src/persistent_term.xml
index 29a6c67051..672b00a83a 100644
--- a/erts/doc/src/persistent_term.xml
+++ b/erts/doc/src/persistent_term.xml
@@ -29,7 +29,7 @@
     <rev></rev>
     <file>persistent_term.xml</file>
   </header>
-  <module>persistent_term</module>
+  <module since="OTP 21.2">persistent_term</module>
   <modulesummary>Persistent terms.</modulesummary>
   <description>
     <p>This module is similar to <seealso
@@ -121,19 +121,6 @@
   </section>
 
   <section>
-    <title>Warning For Many Persistent Terms</title>
-    <p>The runtime system will send a warning report to the
-    error logger if more than 20000 persistent terms have been
-    created. It will look like this:</p>
-
-<pre>
-More than 20000 persistent terms have been created.
-It is recommended to avoid creating an excessive number of
-persistent terms, as creation and deletion of persistent terms
-will be slower as the number of persistent terms increases.</pre>
-  </section>
-
-  <section>
     <title>Best Practices for Using Persistent Terms</title>
 
     <p>It is recommended to use keys like <c>?MODULE</c> or
@@ -213,7 +200,7 @@ will be slower as the number of persistent terms increases.</pre>
 
   <funcs>
     <func>
-      <name name="erase" arity="1"/>
+      <name name="erase" arity="1" since="OTP 21.2"/>
       <fsummary>Erase the name for a persistent term.</fsummary>
       <desc>
         <p>Erase the name for the persistent term with key
@@ -229,7 +216,7 @@ will be slower as the number of persistent terms increases.</pre>
     </func>
 
     <func>
-      <name name="get" arity="0"/>
+      <name name="get" arity="0" since="OTP 21.2"/>
       <fsummary>Get all persistent terms.</fsummary>
       <desc>
         <p>Retrieve the keys and values for all persistent terms.
@@ -239,7 +226,7 @@ will be slower as the number of persistent terms increases.</pre>
     </func>
 
     <func>
-      <name name="get" arity="1"/>
+      <name name="get" arity="1" since="OTP 21.2"/>
       <fsummary>Get the value for a persistent term.</fsummary>
       <desc>
         <p>Retrieve the value for the persistent term associated with
@@ -256,7 +243,23 @@ will be slower as the number of persistent terms increases.</pre>
     </func>
 
     <func>
-      <name name="info" arity="0"/>
+      <name name="get" arity="2" since="OTP 21.3"/>
+      <fsummary>Get the value for a persistent term.</fsummary>
+      <desc>
+        <p>Retrieve the value for the persistent term associated with
+        the key <c><anno>Key</anno></c>. The lookup will be made in
+	constant time and the value will not be copied to the heap
+	of the calling process.</p>
+	<p>This function returns <c><anno>Default</anno></c> if no
+	term has been stored with the key <c><anno>Key</anno></c>.</p>
+	<p>If the calling process holds on to the value of the
+	persistent term and the persistent term is deleted in the future,
+	the term will be copied to the process.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="info" arity="0" since="OTP 21.2"/>
       <fsummary>Get information about persistent terms.</fsummary>
       <desc>
         <p>Return information about persistent terms in a map. The map
@@ -272,7 +275,7 @@ will be slower as the number of persistent terms increases.</pre>
     </func>
 
     <func>
-      <name name="put" arity="2"/>
+      <name name="put" arity="2" since="OTP 21.2"/>
       <fsummary>Store a term.</fsummary>
       <desc>
         <p>Store the value <c><anno>Value</anno></c> as a persistent term and
diff --git a/erts/doc/src/ref_man.xml b/erts/doc/src/ref_man.xml.src
index a78aaa449e..7dd003763c 100644
--- a/erts/doc/src/ref_man.xml
+++ b/erts/doc/src/ref_man.xml.src
@@ -4,7 +4,7 @@
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1996</year><year>2016</year>
+      <year>1996</year><year>2019</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -31,26 +31,27 @@
   </header>
   <description>
   </description>
-  <xi:include href="erl_prim_loader.xml"/>
-  <xi:include href="erlang.xml"/>
-  <xi:include href="init.xml"/>
-  <xi:include href="persistent_term.xml"/>
-  <xi:include href="zlib.xml"/>
+  <xi:include href="atomics.xml"/>
+  <xi:include href="counters.xml"/>
+  <xi:include href="driver_entry.xml"/>
   <xi:include href="epmd.xml"/>
   <xi:include href="erl.xml"/>
+  <xi:include href="erlang.xml"/>
   <xi:include href="erlc.xml"/>
-  <xi:include href="werl.xml"/>
-  <xi:include href="escript.xml"/>
-  <xi:include href="erlsrv.xml"/>
-  <xi:include href="start_erl.xml"/>
-  <xi:include href="run_erl.xml"/>
-  <xi:include href="start.xml"/>
   <xi:include href="erl_driver.xml"/>
-  <xi:include href="driver_entry.xml"/>
-  <xi:include href="erts_alloc.xml"/>
   <xi:include href="erl_nif.xml"/>
+  <xi:include href="erl_prim_loader.xml"/>
+  <xi:include href="erlsrv.xml"/>
   <xi:include href="erl_tracer.xml"/>
-  <xi:include href="atomics.xml"/>
-  <xi:include href="counters.xml"/>
+  <xi:include href="erts_alloc.xml"/>
+  <xi:include href="escript.xml"/>
+  <xi:include href="init.xml"/>
+  <xi:include href="persistent_term.xml"/>
+  <xi:include href="run_erl.xml"/>
+  %ESOCK_USE_SOCKET_XML%
+  <xi:include href="start.xml"/>
+  <xi:include href="start_erl.xml"/>
+  <xi:include href="werl.xml"/>
+  <xi:include href="zlib.xml"/>
 </application>
 
diff --git a/erts/doc/src/socket.xml b/erts/doc/src/socket.xml
new file mode 100644
index 0000000000..2f7ff2fc07
--- /dev/null
+++ b/erts/doc/src/socket.xml
@@ -0,0 +1,956 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2018</year><year>2019</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>socket</title>
+    <prepared></prepared>
+    <docno></docno>
+    <date></date>
+    <rev></rev>
+    <file>socket.xml</file>
+  </header>
+  <module since="OTP 22.0">socket</module>
+  <modulesummary>Socket interface.</modulesummary>
+  <description>
+    <p>This module provides an API for the socket interface.
+    It is used to create, delete and manipulate sockets,
+    send and receive data.</p>
+    <p>The idea is that it shall be as "close as possible" to the OS
+    level socket interface. The only significant addition is that some of
+    the functions,
+    e.g. <seealso marker="#recv/3"><c>recv/3</c></seealso>, 
+    has a timeout argument. </p>
+    <note>
+      <p>Some functions allow for an <i>asynchronous</i> call.
+      This is achieved by setting the <c>Timeout</c> argument to
+      <c>nowait</c>. For instance, if calling the
+      <seealso marker="#recv_async"><c>recv/3</c></seealso>
+      function with Timeout set to <c>nowait</c> (<c>recv(Sock, 0, nowait)</c>)
+      when there is actually nothing to read, it will return with
+      <c>{select, </c>
+      <seealso marker="#type-select_info"><c>SelectInfo</c></seealso><c>}</c>
+      (<c>SelectInfo</c> contains the
+      <seealso marker="socket#type-select_ref">SelectRef</seealso>).
+      When data eventually arrives a 'select' message
+      will be sent to the caller: </p>
+      <taglist>
+	<!-- NOTE THAT THE EMPTY TAG IS INTENTIONAL -->
+	<tag></tag>
+	<item><c>{'$socket', socket(), select, SelectRef}</c></item>
+      </taglist>
+      <p>The caller can now make another
+      call to the recv function and now expect data.</p>
+      <p>Note that all other users are <em>locked out</em> until the
+      'current user' has called the function (recv in this case).</p>
+      <p>Another message the user must be prepared for (when making asynchronous
+      calls) is the <c>abort</c> message:</p>
+      <taglist>
+	<!-- NOTE THAT THE EMPTY TAG IS INTENTIONAL -->
+	<tag></tag>
+	<item><c>{'$socket', socket(), abort, Info}</c></item>
+      </taglist>
+      <p>This message indicates
+      that the (asynchronous) operation has been aborted.
+      If, for instance, the socket has been closed (by another process),
+      <c>Info</c> will be <c>{SelectRef, closed}</c>. </p>
+    </note>
+    <note>
+      <p>There is currently <em>no</em> support for Windows. </p>
+      <p>Support for IPv6 has been implemented but <em>not</em> tested. </p>
+      <p>SCTP has only been partly implemented (and not tested). </p>
+    </note>
+  </description>
+
+  <datatypes>
+    <datatype>
+      <name name="domain"/>
+    </datatype>
+    <datatype>
+      <name name="type"/>
+    </datatype>
+    <datatype>
+      <name name="protocol"/>
+    </datatype>
+    <datatype>
+      <name>socket()</name>
+      <desc><p>As returned by
+        <seealso marker="#open/2"><c>open/2,3,4</c></seealso> and
+        <seealso marker="#accept/1"><c>accept/1,2</c></seealso>.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="select_tag"/>
+      <desc>
+	<p>A tag that describes the (select) operation.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="select_ref"/>
+      <desc>
+	<p>A reference that uniquely identifies the (select) operation.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="select_info"/>
+    </datatype>
+    <datatype>
+      <name name="socket_counters"/>
+    </datatype>
+    <datatype>
+      <name name="socket_counter"/>
+    </datatype>
+    <datatype>
+      <name name="socket_info"/>
+    </datatype>
+    <datatype>
+      <name name="ip4_address"/>
+    </datatype>
+    <datatype>
+      <name name="ip6_address"/>
+    </datatype>
+    <datatype>
+      <name name="ip_address"/>
+    </datatype>
+    <datatype>
+      <name name="sockaddr"/>
+    </datatype>
+    <datatype>
+      <name name="sockaddr_in4"/>
+    </datatype>
+    <datatype>
+      <name name="sockaddr_in6"/>
+    </datatype>
+    <datatype>
+      <name name="sockaddr_un"/>
+    </datatype>
+    <datatype>
+      <name name="port_number"/>
+    </datatype>
+    <datatype>
+      <name name="in6_flow_info"/>
+    </datatype>
+    <datatype>
+      <name name="in6_scope_id"/>
+    </datatype>
+    <datatype>
+      <name name="accept_flags"/>
+    </datatype>
+    <datatype>
+      <name name="accept_flag"/>
+    </datatype>
+    <datatype>
+      <name name="send_flags"/>
+    </datatype>
+    <datatype>
+      <name name="send_flag"/>
+    </datatype>
+    <datatype>
+      <name name="recv_flags"/>
+    </datatype>
+    <datatype>
+      <name name="recv_flag"/>
+    </datatype>
+    <datatype>
+      <name name="shutdown_how"/>
+    </datatype>
+    <datatype>
+      <name name="sockopt_level"/>
+    </datatype>
+    <datatype>
+      <name name="otp_socket_option"/>
+    </datatype>
+    <datatype>
+      <name name="socket_option"/>
+    </datatype>
+    <datatype>
+      <name name="ip_socket_option"/>
+    </datatype>
+    <datatype>
+      <name name="ipv6_socket_option"/>
+    </datatype>
+    <datatype>
+      <name name="tcp_socket_option"/>
+    </datatype>
+    <datatype>
+      <name name="udp_socket_option"/>
+    </datatype>
+    <datatype>
+      <name name="sctp_socket_option"/>
+    </datatype>
+    <datatype>
+      <name name="timeval"/>
+    </datatype>
+    <datatype>
+      <name name="ip_tos"/>
+    </datatype>
+    <datatype>
+      <name name="ip_mreq"/>
+    </datatype>
+    <datatype>
+      <name name="ip_mreq_source"/>
+    </datatype>
+    <datatype>
+      <name name="ip_pmtudisc"/>
+    </datatype>
+    <datatype>
+      <name name="ip_msfilter_mode"/>
+    </datatype>
+    <datatype>
+      <name name="ip_msfilter"/>
+    </datatype>
+    <datatype>
+      <name name="ip_pktinfo"/>
+    </datatype>
+    <datatype>
+      <name name="ipv6_mreq"/>
+    </datatype>
+    <datatype>
+      <name name="ipv6_pmtudisc"/>
+    </datatype>
+    <datatype>
+      <name name="ipv6_pktinfo"/>
+    </datatype>
+    <datatype>
+      <name name="sctp_assoc_id"/>
+    </datatype>
+    <datatype>
+      <name name="sctp_sndrcvinfo"/>
+    </datatype>
+    <datatype>
+      <name name="sctp_event_subscribe"/>
+    </datatype>
+    <datatype>
+      <name name="sctp_assocparams"/>
+    </datatype>
+    <datatype>
+      <name name="sctp_initmsg"/>
+    </datatype>
+    <datatype>
+      <name name="sctp_rtoinfo"/>
+    </datatype>
+    <datatype>
+      <name name="msghdr_flag"/>
+    </datatype>
+    <datatype>
+      <name name="msghdr_flags"/>
+    </datatype>
+    <datatype>
+      <name name="msghdr"/>
+    </datatype>
+    <datatype>
+      <name name="cmsghdr_level"/>
+    </datatype>
+    <datatype>
+      <name name="cmsghdr_type"/>
+    </datatype>
+    <!--
+    <datatype>
+      <name name="cmsghdr_data"/>
+    </datatype>
+    -->
+    <datatype>
+      <name name="cmsghdr_recv"/>
+    </datatype>
+    <datatype>
+      <name name="cmsghdr_send"/>
+    </datatype>
+    <datatype>
+      <name name="uint8"/>
+    </datatype>
+    <datatype>
+      <name name="uint16"/>
+    </datatype>
+    <datatype>
+      <name name="uint20"/>
+    </datatype>
+    <datatype>
+      <name name="uint32"/>
+    </datatype>
+    <datatype>
+      <name name="int32"/>
+    </datatype>
+    <datatype>
+      <name name="supports_options_socket"/>
+    </datatype>
+    <datatype>
+      <name name="supports_options_ip"/>
+    </datatype>
+    <datatype>
+      <name name="supports_options_ipv6"/>
+    </datatype>
+    <datatype>
+      <name name="supports_options_tcp"/>
+    </datatype>
+    <datatype>
+      <name name="supports_options_udp"/>
+    </datatype>
+    <datatype>
+      <name name="supports_options_sctp"/>
+    </datatype>
+    <datatype>
+      <name name="supports_options"/>
+    </datatype>
+  </datatypes>
+
+  <funcs>
+    <func>
+      <name name="accept" arity="1" since="OTP 22.0"/>
+      <name name="accept" arity="2" clause_i="2" since="OTP 22.0"/>
+      <fsummary>Accept a connection on a socket.</fsummary>
+      <desc>
+        <p>Accept a connection on a socket.</p>
+        <p>This call is used with connection-based socket types
+	(<c>stream</c> or <c>seqpacket</c>). It extracs the first pending
+	connection request for the listen socket and returns the (newly)
+	connected socket.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="accept" arity="2" clause_i="1" anchor="accept_async" since="OTP @OTP-15731@"/>
+      <fsummary>Accept a connection on a socket.</fsummary>
+      <desc>
+        <p>Accept a connection on a socket.</p>
+
+	<p>This call is used with connection-based socket types
+	(<c>stream</c> or <c>seqpacket</c>). It extracs the first pending
+	connection request for the listen socket and returns the (newly)
+	connected socket.</p>
+
+	<p>In the case when there is no connections waiting, the function 
+	will return with the <c>SelectInfo</c>. The caller can then await a 
+	select message, <c>{'$socket', Socket, select, Info}</c> (where
+	<c>Info</c> is the
+	<seealso marker="socket#type-select_ref"><c>ref</c></seealso>
+	field from the <c>SelectInfo</c>),
+	when a client connects (a subsequent call to accept will then return 
+	the socket). </p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="bind" arity="2" since="OTP 22.0"/>
+      <fsummary>Bind a name to a socket.</fsummary>
+      <desc>
+        <p>Bind a name to a socket.</p>
+        <p>When a socket is created
+	(with <seealso marker="#open/2"><c>open</c></seealso>),
+	it has no address assigned to it. <c>bind</c> assigns the
+	address specified by the <c>Addr</c> argument.</p>
+	<p>The rules used for name binding vary between domains.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="cancel" arity="2" since="OTP @OTP-15731@"/>
+      <fsummary>Cancel an asynchronous request.</fsummary>
+      <desc>
+	<p>Cancel an asynchronous request.</p>
+
+	<p>Call this function in order to cancel a previous
+	asynchronous call to, e.g.
+	<seealso marker="#recv/3"><c>recv/3</c></seealso>. </p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="close" arity="1" since="OTP 22.0"/>
+      <fsummary>Close a socket.</fsummary>
+      <desc>
+	<p>Closes the socket.</p>
+
+	<note>
+	  <p>Note that for e.g. <c>protocol</c> = <c>tcp</c>, most implementations
+	  doing a close does not guarantee that any data sent is delivered to
+	  the recipient before the close is detected at the remote side. </p>
+	  <p>One way to handle this is to use the
+	  <seealso marker="#shutdown/2"><c>shutdown</c></seealso>
+	  function
+	  (<c>socket:shutdown(Socket, write)</c>) to signal that no more data is
+	  to be sent and then wait for the read side of the socket to be closed.</p>
+	</note>
+      </desc>
+    </func>
+
+    <func>
+      <name name="connect" arity="2" since="OTP 22.0"/>
+      <name name="connect" arity="3" clause_i="2" since="OTP 22.0"/>
+      <fsummary>Initiate a connection on a socket.</fsummary>
+      <desc>
+        <p>This function connects the socket to the address
+	specied by the <c>SockAddr</c> argument.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="connect" arity="3" clause_i="1" anchor="connect_async" since="OTP @OTP-15731@"/>
+      <fsummary>Initiate a connection on a socket.</fsummary>
+      <desc>
+        <p>This function connects the socket to the address
+	specied by the <c>SockAddr</c> argument.</p>
+
+ 	<p>In the case when its not possible to immediately establish a
+	connection, the function will return with the
+	<seealso marker="#type-select_info"><c>SelectInfo</c></seealso>.
+	The caller can then await a 
+	select message, <c>{'$socket', Socket, select, Info}</c> (where
+	<c>Info</c> is the
+	<seealso marker="socket#type-select_ref"><c>ref</c></seealso>
+	field from the <c>SelectInfo</c>,
+	a subsequent call to connect will then 
+	establish the connection). </p>
+     </desc>
+    </func>
+
+    <func>
+      <name name="getopt" arity="3" clause_i="1" since="OTP 22.0"/>
+      <name name="getopt" arity="3" clause_i="2" since="OTP 22.0"/>
+      <name name="getopt" arity="3" clause_i="3" since="OTP 22.0"/>
+      <name name="getopt" arity="3" clause_i="4" since="OTP 22.0"/>
+      <name name="getopt" arity="3" clause_i="5" since="OTP 22.0"/>
+      <name name="getopt" arity="3" clause_i="6" since="OTP 22.0"/>
+      <name name="getopt" arity="3" clause_i="7" since="OTP 22.0"/>
+      <fsummary>Get an option on a socket.</fsummary>
+      <desc>
+        <p>Get an option on a socket.</p>
+	<p>What properties are valid depend  both on <c>Level</c> and
+	on what kind of socket it is (<c>domain</c>, <c>type</c> and
+	<c>protocol</c>).</p>
+
+	<p>See the
+	<seealso marker="socket_usage#socket_options">socket options</seealso>
+	chapter of the users guide for more info. </p>
+
+	<note><p>Not all options are valid on all platforms. That is,
+	even if "we" support an option, that does not mean that the
+	underlying OS does.</p></note>
+
+      </desc>
+    </func>
+
+    <func>
+      <name name="getopt" arity="3" clause_i="8" since="OTP 22.0"/>
+      <fsummary>Get an option on a socket.</fsummary>
+      <desc>
+        <p>Get an option on a socket.</p>
+	<p>What properties are valid depend  both on <c>Level</c> and
+	on what kind of socket it is (<c>domain</c>, <c>type</c> and
+	<c>protocol</c>).</p>
+	<p>When specifying <c>Level</c> as an integer, and therefor
+	using "native mode", it is *currently* up to the caller to
+	know how to interpret the result.</p>
+
+	<p>See the
+	<seealso marker="socket_usage#socket_options">socket options</seealso>
+	chapter of the users guide for more info. </p>
+
+	<note><p>Not all options are valid on all platforms. That is,
+	even if "we" support an option, that does not mean that the
+	underlying OS does.</p></note>
+      </desc>
+    </func>
+
+    <func>
+      <name name="info" arity="1" since="OTP @OTP-15818@"/>
+      <fsummary>Get miscellaneous socket info.</fsummary>
+      <desc>
+        <p>Get miscellaneous info about the socket.</p>
+	<p>The function returns a map with each info item as a key-value
+	binding. It reflects the "current" state of the socket. </p>
+	<note>
+	  <p>In order to ensure data integrity, mutex'es are taken when
+	  needed. So, do not call this function often. </p>
+	</note>
+      </desc>
+    </func>
+
+    <func>
+      <name name="listen" arity="1" since="OTP 22.0"/>
+      <name name="listen" arity="2" since="OTP 22.0"/>
+      <fsummary>Listen for connections on a socket.</fsummary>
+      <desc>
+        <p>Listen for connections on a socket.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="open" arity="2" since="OTP 22.0"/>
+      <name name="open" arity="3" since="OTP 22.0"/>
+      <name name="open" arity="4" since="OTP 22.0"/>
+      <fsummary>Create an endpoint for communication.</fsummary>
+      <desc>
+	<p>Creates an endpoint (socket) for communication.</p>
+
+	<p>For some <c>types</c> there is a default protocol,
+	indicated by <c>default</c>, which it <em>may</em> be
+	possible to specify.
+	And for <c>Domain = local</c>, if a protocol <em>is</em> pecified,
+	it <em>must</em> be <c>default</c>. </p>
+
+	<p>The <c>Extra</c> argument is intended for "obscure" options.
+	Currently the only supported option is <c>netns</c>, which
+	is only supported on the linux platform.</p>
+
+	<note>
+	  <p>It may not be possible to specify the default protocol (except
+	  when <c>Domain = local</c>). We need to be able to retreive
+	  the resulting protocol, which is <em>not</em> possble on all
+	  platforms. </p>
+	</note>
+      </desc>
+    </func>
+
+    <func>
+      <name name="peername" arity="1" since="OTP 22.0"/>
+      <fsummary>Get name of connected socket peer.</fsummary>
+      <desc>
+        <p>Returns the address of the peer connected to the socket.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="recv" arity="1" since="OTP 22.0"/>
+      <name name="recv" arity="2" since="OTP 22.0"/>
+      <name name="recv" arity="3" clause_i="1" since="OTP 22.0"/>
+      <name name="recv" arity="3" clause_i="3" since="OTP 22.0"/>
+      <name name="recv" arity="4" clause_i="2" since="OTP 22.0"/>
+      <fsummary>Receive a message from a socket.</fsummary>
+      <desc>
+        <p>Receive a message from a socket.</p>
+	<p>There is a special case for the argument <c>Length</c>.
+	If it is set to zero (0), it means "give me everything you 
+	currently have".</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="recv" arity="3" clause_i="2" anchor="recv_async" since="OTP @OTP-15731@"/>
+      <name name="recv" arity="4" clause_i="1" since="OTP @OTP-15731@"/>
+      <fsummary>Receive a message from a socket.</fsummary>
+      <desc>
+        <p>Receive a message from a socket.</p>
+
+	<p>There is a special case for the argument <c>Length</c>.
+	If it is set to zero (0), it means "give me everything you 
+	currently have".</p>
+
+	<p>In the case when there is no data waiting, the function 
+	will return with the <c>SelectInfo</c>. The caller can then await a 
+	select message, <c>{'$socket', Socket, select, Info}</c> (where
+	<c>Info</c> is the
+	<seealso marker="socket#type-select_ref"><c>ref</c></seealso>
+	field from the <c>SelectInfo</c>),
+	when data has arrived (a subsequent call to recv will then return 
+	the data). </p>
+	<p>Note that if a length (<c>> 0</c>) is specified, and only part
+	of that amount of data is available, the function will return with
+	that data <em>and</em> the <c>SelectInfo</c> (if the caller don't 
+	want to wait for the remaining data, it must immediately call
+	the <seealso marker="#cancel/2"><c>cancel/2</c></seealso> function.)</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="recvfrom" arity="1" since="OTP 22.0"/>
+      <name name="recvfrom" arity="2" since="OTP 22.0"/>
+      <name name="recvfrom" arity="3" clause_i="2" since="OTP 22.0"/>
+      <name name="recvfrom" arity="3" clause_i="3" since="OTP 22.0"/>
+      <name name="recvfrom" arity="3" clause_i="5" since="OTP 22.0"/>
+      <name name="recvfrom" arity="4" clause_i="2" since="OTP 22.0"/>
+      <fsummary>Receive a message from a socket.</fsummary>
+      <desc>
+        <p>Receive a message from a socket.</p>
+        <p>This function reads "messages", which means that regardless of
+	how much we want to read, it returns when we get a message
+	(if the buffer size is to small, the message will be truncated).</p>
+        <p>The <c>BufSz</c> argument basically defines the size of the
+	receive buffer. By setting the value to zero (0), the configured
+	size (setopt with <c>Level</c> = <c>otp</c> and
+	<c>Key</c> = <c>rcvbuf</c>) is used.</p>
+        <p>It may be impossible to know what (buffer) size is appropriate
+	"in advance", and in those cases it may be convenient to use the
+	(recv) 'peek' flag. When this flag is provided, the message is *not*
+	"consumed" from the underlying buffers, so another recvfrom call
+	is needed, possibly with a then adjusted buffer size.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="recvfrom" arity="3" clause_i="1" anchor="recvfrom_async" since="OTP @OTP-15731@"/>
+      <name name="recvfrom" arity="3" clause_i="4" since="OTP @OTP-15731@"/>
+      <name name="recvfrom" arity="4" clause_i="1" since="OTP @OTP-15731@"/>
+      <fsummary>Receive a message from a socket.</fsummary>
+      <desc>
+        <p>Receive a message from a socket.</p>
+        <p>This function reads "messages", which means that regardless of
+	how much we want to read, it returns when we get a message
+	(if the buffer size is to small, the message will be truncated).</p>
+        <p>The <c>BufSz</c> argument basically defines the size of the
+	receive buffer. By setting the value to zero (0), the configured
+	size (setopt with <c>Level</c> = <c>otp</c> and
+	<c>Key</c> = <c>rcvbuf</c>) is used.</p>
+        <p>It may be impossible to know what (buffer) size is appropriate
+	"in advance", and in those cases it may be convenient to use the
+	(recv) 'peek' flag. When this flag is provided, the message is *not*
+	"consumed" from the underlying buffers, so another recvfrom call
+	is needed, possibly with a then adjusted buffer size.</p>
+
+	<p>In the case when there is no data waiting, the function 
+	will return with the <c>SelectInfo</c>. The caller can then await a 
+	select message, <c>{'$socket', Socket, select, Info}</c> (where
+	<c>Info</c> is the
+	<seealso marker="socket#type-select_ref"><c>ref</c></seealso>
+	field from the <c>SelectInfo</c>),
+	when data has arrived (a subsequent call to recvfrom will then return 
+	the data). </p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="recvmsg" arity="1" since="OTP 22.0"/>
+      <name name="recvmsg" arity="2" clause_i="1" since="OTP 22.0"/>
+      <name name="recvmsg" arity="2" clause_i="3" since="OTP 22.0"/>
+      <name name="recvmsg" arity="3" clause_i="2" since="OTP 22.0"/>
+      <name name="recvmsg" arity="3" clause_i="3" since="OTP 22.0"/>
+      <name name="recvmsg" arity="5" clause_i="2" since="OTP 22.0"/>
+      <fsummary>Receive a message from a socket.</fsummary>
+      <desc>
+        <p>Receive a message from a socket.</p>
+        <p>This function reads "messages", which means that regardless of
+	how much we want to read, it returns when we get a message.</p>
+	<p>The message will be delivered in the form of a <c>msghdr()</c>,
+	which may contain the source address (if socket not connected),
+	a list of <c>cmsghdr_recv()</c> (depends on what socket options have
+	been set and what the protocol and platform supports) and
+	also a set of flags, providing further info about the read. </p>
+	
+        <p>The <c>BufSz</c> argument basically defines the size of the
+	receive buffer. By setting the value to zero (0), the configured
+	size (setopt with <c>Level</c> = <c>otp</c> and
+	<c>Key</c> = <c>rcvbuf</c>) is used.</p>
+
+        <p>The <c>CtrlSz</c> argument basically defines the size of the
+	receive buffer for the control messages.
+	By setting the value to zero (0), the configured size (setopt
+	with <c>Level</c> = <c>otp</c>) is used.</p>
+
+	<p>It may be impossible to know what (buffer) size is appropriate
+	"in advance", and in those cases it may be convenient to use the
+	(recv) 'peek' flag. When this flag is provided, the message is *not*
+	"consumed" from the underlying buffers, so another recvmsg call
+	is needed, possibly with a then adjusted buffer size.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="recvmsg" arity="2" clause_i="2" anchor="recvmsg_async" since="OTP @OTP-15731@"/>
+      <name name="recvmsg" arity="3" clause_i="1" since="OTP @OTP-15731@"/>
+      <name name="recvmsg" arity="5" clause_i="1" since="OTP @OTP-15731@"/>
+      <fsummary>Receive a message from a socket.</fsummary>
+      <desc>
+        <p>Receive a message from a socket.</p>
+        <p>This function reads "messages", which means that regardless of
+	how much we want to read, it returns when we get a message.</p>
+	<p>The message will be delivered in the form of a <c>msghdr()</c>,
+	which may contain the source address (if socket not connected),
+	a list of <c>cmsghdr_recv()</c> (depends on what socket options have
+	been set and what the protocol and platform supports) and
+	also a set of flags, providing further info about the read. </p>
+	
+        <p>The <c>BufSz</c> argument basically defines the size of the
+	receive buffer. By setting the value to zero (0), the configured
+	size (setopt with <c>Level</c> = <c>otp</c> and
+	<c>Key</c> = <c>rcvbuf</c>) is used.</p>
+
+        <p>The <c>CtrlSz</c> argument basically defines the size of the
+	receive buffer for the control messages.
+	By setting the value to zero (0), the configured size (setopt
+	with <c>Level</c> = <c>otp</c>) is used.</p>
+
+	<p>It may be impossible to know what (buffer) size is appropriate
+	"in advance", and in those cases it may be convenient to use the
+	(recv) 'peek' flag. When this flag is provided, the message is *not*
+	"consumed" from the underlying buffers, so another recvmsg call
+	is needed, possibly with a then adjusted buffer size.</p>
+
+	<p>In the case when there is no data waiting, the function 
+	will return with the <c>SelectInfo</c>. The caller can then await a 
+	select message, <c>{'$socket', Socket, select, Info}</c> (where
+	<c>Info</c> is the
+	<seealso marker="socket#type-select_ref"><c>ref</c></seealso>
+	field from the <c>SelectInfo</c>),
+	when data has arrived (a subsequent call to recvmsg will then return 
+	the data). </p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="send" arity="2" since="OTP 22.0"/>
+      <name name="send" arity="3" clause_i="1" since="OTP 22.0"/>
+      <name name="send" arity="3" clause_i="3" since="OTP 22.0"/>
+      <name name="send" arity="4" clause_i="2" since="OTP 22.0"/>
+      <fsummary>Send a message on a socket.</fsummary>
+      <desc>
+        <p>Send a message on a connected socket.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="send" arity="3" clause_i="2" anchor="send_async" since="OTP @OTP-15731@"/>
+      <name name="send" arity="4" clause_i="1" since="OTP @OTP-15731@"/>
+      <fsummary>Send a message on a socket.</fsummary>
+      <desc>
+        <p>Send a message on a connected socket.</p>
+
+	<p>In the case when there is no room in the (system-) buffers,
+	the function will return with the <c>SelectInfo</c>. The caller
+	can then await a select message,
+	<c>{'$socket', Socket, select, Info}</c>
+	(where <c>Info</c> is the
+	<seealso marker="socket#type-select_ref"><c>ref</c></seealso>
+	field from the
+	<c>SelectInfo</c>), when there is room for more data (a subsequent
+	call to send will then send the data). </p>
+	<p>Note that if not all the data was sent, the function will return
+	with the remaining data <em>and</em> the <c>SelectInfo</c>
+	(if the caller don't 
+	want to wait to be able to send the rest, it should immediately call
+	the <seealso marker="#cancel/2"><c>cancel/2</c></seealso> function.)</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="sendmsg" arity="2" since="OTP 22.0"/>
+      <name name="sendmsg" arity="3" clause_i="1" since="OTP 22.0"/>
+      <name name="sendmsg" arity="3" clause_i="3" since="OTP 22.0"/>
+      <name name="sendmsg" arity="4" clause_i="2" since="OTP 22.0"/>
+      <fsummary>Send a message on a socket.</fsummary>
+      <desc>
+	<p>Send a message on a socket. The destination, if needed
+	(socket <em>not</em> connected) is provided in the <c>MsgHdr</c>,
+	which also contains the message to send,
+	The <c>MsgHdr</c> may also contain an list of optional <c>cmsghdr_send()</c>
+	(depends on what the protocol and platform supports).</p>
+
+	<p>Unlike the <seealso marker="#send/2"><c>send</c></seealso> function,
+	this one sends <em>one message</em>.
+	This means that if, for whatever reason, its not possible to send the
+	message in one go, the function will instead return with the
+	<em>remaining</em> data (<c>{ok, Remaining}</c>). Thereby leaving it
+	up to the caller to decide what to do (retry with the remaining data
+	of give up). </p>
+
+      </desc>
+    </func>
+
+    <func>
+      <name name="sendmsg" arity="3" clause_i="2" anchor="sendmsg_async" since="OTP @OTP-15731@"/>
+      <name name="sendmsg" arity="4" clause_i="1" since="OTP @OTP-15731@"/>
+      <fsummary>Send a message on a socket.</fsummary>
+      <desc>
+	<p>Send a message on a socket. The destination, if needed
+	(socket <em>not</em> connected) is provided in the <c>MsgHdr</c>,
+	which also contains the message to send,
+	The <c>MsgHdr</c> may also contain an list of optional <c>cmsghdr_send()</c>
+	(depends on what the protocol and platform supports).</p>
+
+	<p>Unlike the <seealso marker="#send/2"><c>send</c></seealso> function,
+	this one sends <em>one message</em>.
+	This means that if, for whatever reason, its not possible to send the
+	message in one go, the function will instead return with the
+	<em>remaining</em> data (<c>{ok, Remaining}</c>). Thereby leaving it
+	up to the caller to decide what to do (retry with the remaining data
+	of give up). </p>
+
+	<p>In the case when there is no room in the (system-) buffers,
+	the function will return with the <c>SelectInfo</c>. The caller
+	can then await a select message,
+	<c>{'$socket', Socket, select, Info}</c>
+	(where <c>Info</c> is the
+	<seealso marker="socket#type-select_ref"><c>ref</c></seealso>
+	field from the
+	<c>SelectInfo</c>), when there is room for more data (a subsequent
+	call to sendmsg will then send the data). </p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="sendto" arity="3" since="OTP 22.0"/>
+      <name name="sendto" arity="4" clause_i="1" since="OTP 22.0"/>
+      <name name="sendto" arity="4" clause_i="3" since="OTP 22.0"/>
+      <name name="sendto" arity="5" clause_i="2" since="OTP 22.0"/>
+      <fsummary>Send a message on a socket.</fsummary>
+      <desc>
+        <p>Send a message on a socket, to the specified destination.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="sendto" arity="4" clause_i="2" anchor="sendto_async" since="OTP @OTP-15731@"/>
+      <name name="sendto" arity="5" clause_i="1" since="OTP @OTP-15731@"/>
+      <fsummary>Send a message on a socket.</fsummary>
+      <desc>
+        <p>Send a message on a socket, to the specified destination.</p>
+
+	<p>In the case when there is no room in the (system-) buffers,
+	the function will return with the <c>SelectInfo</c>. The caller
+	can then await a select message,
+	<c>{'$socket', Socket, select, Info}</c>
+	(where <c>Info</c> is the
+	<seealso marker="socket#type-select_ref"><c>ref</c></seealso>
+	field from the
+	<c>SelectInfo</c>), when there is room for more data (a subsequent
+	call to sendto will then send the data). </p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="setopt" arity="4" clause_i="1" since="OTP 22.0"/>
+      <name name="setopt" arity="4" clause_i="2" since="OTP 22.0"/>
+      <name name="setopt" arity="4" clause_i="3" since="OTP 22.0"/>
+      <name name="setopt" arity="4" clause_i="4" since="OTP 22.0"/>
+      <name name="setopt" arity="4" clause_i="5" since="OTP 22.0"/>
+      <name name="setopt" arity="4" clause_i="6" since="OTP 22.0"/>
+      <name name="setopt" arity="4" clause_i="7" since="OTP 22.0"/>
+      <fsummary>Set options on a socket.</fsummary>
+      <desc>
+        <p>Set options on a socket.</p>
+	<p>What properties are valid depend both on <c>Level</c> and on
+	what kind of socket it is (<c>domain</c>, <c>type</c> and
+	<c>protocol</c>).</p>
+
+	<p>See the
+	<seealso marker="socket_usage#socket_options">socket options</seealso>
+	chapter of the users guide for more info. </p>
+
+	<note><p>Not all options are valid on all platforms. That is,
+	even if "we" support an option, that does not mean that the
+	underlying OS does.</p></note>
+
+	<note><p>Sockets are set 'non-blocking' when created, so this option
+	is *not* available (as it would adversely effect the Erlang VM
+	to set a socket 'blocking').</p></note>
+      </desc>
+    </func>
+
+    <func>
+      <name name="setopt" arity="4" clause_i="8" since="OTP 22.0"/>
+      <fsummary>Set options on a socket.</fsummary>
+      <desc>
+        <p>Set options on a socket.</p>
+	<p>What properties are valid depend both on <c>Level</c> and on
+	what kind of socket it is (<c>domain</c>, <c>type</c> and
+	<c>protocol</c>).</p>
+
+	<p>See the
+	<seealso marker="socket_usage#socket_options">socket options</seealso>
+	chapter of the users guide for more info. </p>
+
+	<note><p>Not all options are valid on all platforms. That is,
+	even if "we" support an option, that does not mean that the
+	underlying OS does.</p></note>
+
+	<note><p>Sockets are set 'non-blocking' when created, so this option
+	is *not* available (as it would adversely effect the Erlang VM
+	to set a socket 'blocking').</p></note>
+      </desc>
+    </func>
+
+    <func>
+      <name name="shutdown" arity="2" since="OTP 22.0"/>
+      <fsummary>Shut down part of a full-duplex connection.</fsummary>
+      <desc>
+        <p>Shut down all or part of a full-duplex connection.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="sockname" arity="1" since="OTP 22.0"/>
+      <fsummary>Get socket name.</fsummary>
+      <desc>
+        <p>Returns the current address to which the socket is bound.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="supports" arity="0" since="OTP 22.0"/>
+      <name name="supports" arity="1" clause_i="1" since="OTP 22.0"/>
+      <name name="supports" arity="1" clause_i="2" since="OTP 22.0"/>
+      <name name="supports" arity="1" clause_i="3" since="OTP 22.0"/>
+      <name name="supports" arity="1" clause_i="4" since="OTP 22.0"/>
+      <name name="supports" arity="2" clause_i="1" since="OTP 22.0"/>
+      <name name="supports" arity="2" clause_i="2" since="OTP 22.0"/>
+      <name name="supports" arity="2" clause_i="3" since="OTP 22.0"/>
+      <name name="supports" arity="2" clause_i="4" since="OTP 22.0"/>
+      <name name="supports" arity="2" clause_i="5" since="OTP 22.0"/>
+      <name name="supports" arity="2" clause_i="6" since="OTP 22.0"/>
+      <name name="supports" arity="2" clause_i="7" since="OTP 22.0"/>
+      <name name="supports" arity="3" clause_i="1" since="OTP 22.0"/>
+      <name name="supports" arity="3" clause_i="2" since="OTP 22.0"/>
+      <name name="supports" arity="3" clause_i="3" since="OTP 22.0"/>
+      <name name="supports" arity="3" clause_i="4" since="OTP 22.0"/>
+      <name name="supports" arity="3" clause_i="5" since="OTP 22.0"/>
+      <name name="supports" arity="3" clause_i="6" since="OTP 22.0"/>
+      <name name="supports" arity="3" clause_i="7" since="OTP 22.0"/>
+      <fsummary>Report info about what the platform supports.</fsummary>
+      <desc>
+	<p>This function intends to retreive information about what the
+	platform supports. Such as if SCTP is supported. Or which socket
+	options are supported. </p>
+      </desc>
+    </func>
+
+  </funcs>
+  <section>
+    <title>Examples</title>
+    <marker id="examples"></marker>
+    <code type="none">
+client(Addr, SAddr, SPort) ->
+   {ok, Sock} = socket:open(inet, stream, tcp),
+   {ok, _} = socket:bind(Sock, #{family => inet,
+                                 addr   => Addr}),
+   ok = socket:connect(Sock, #{family => inet,
+                               addr   => SAddr,
+			       port   => SPort}),
+   Msg = list_to_binary("hello"),
+   ok = socket:send(Sock, Msg),
+   ok = socket:shutdown(Sock, write),
+   {ok, Msg} = socket:recv(Sock),
+   ok = socket:close(Sock).
+
+server(Addr, Port) ->  
+   {ok, LSock} = socket:open(inet, stream, tcp),
+   {ok, _} = socket:bind(LSock, #{family => inet,
+                                  port   => Port,
+		 	          addr   => Addr}),
+   ok = socket:listen(LSock),
+   {ok, Sock} = socket:accept(LSock),
+   {ok, Msg} = socket:recv(Sock),
+   ok = socket:send(Sock, Msg),
+   ok = socket:shutdown(Sock, write),
+   ok = socket:close(Sock),
+   ok = socket:close(LSock).
+    </code>
+  </section>
+</erlref>
+
diff --git a/erts/doc/src/socket_usage.xml b/erts/doc/src/socket_usage.xml
new file mode 100644
index 0000000000..c3cda9a615
--- /dev/null
+++ b/erts/doc/src/socket_usage.xml
@@ -0,0 +1,845 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE chapter SYSTEM "chapter.dtd">
+
+<chapter>
+  <header>
+    <copyright>
+      <year>2018</year><year>2019</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>Socket Usage</title>
+    <prepared>Micael Karlberg</prepared>
+    <docno></docno>
+    <date>2018-07-17</date>
+    <rev>PA1</rev>
+    <file>socket_usage.xml</file>
+  </header>
+
+  <section>
+    <title>Introduction</title>
+    <p>The socket interface (module) is basically an "thin" layer on top of
+    the OS socket interface. It is assumed that, unless you have special needs,
+    gen_[tcp|udp|sctp] should be sufficent (when they become available). </p>
+    <p>Note that just because we have a documented and described option,
+    it does <em>not</em> mean that the OS supports it. So its recommended
+    that the user reads the platform specific documentation for the
+    option used. </p>
+    <section>
+      <title>Asynchronous calls</title>
+      <p>Some functions allow for an <i>asynchronous</i> call
+      (<seealso marker="socket#accept_async"><c>accept/2</c></seealso>,
+      <seealso marker="socket#connect_async"><c>connect/3</c></seealso>,
+      <seealso marker="socket#recv_async"><c>recv/3,4</c></seealso>,
+      <seealso marker="socket#recvfrom_async"><c>recvfrom/3,4</c></seealso>,
+      <seealso marker="socket#recvmsg_async"><c>recvmsg/2,3,5</c></seealso>,
+      <seealso marker="socket#send_async"><c>send/3,4</c></seealso>,
+      <seealso marker="socket#sendmsg_async"><c>sendmsg/3,4</c></seealso> and
+      <seealso marker="socket#sendto_async"><c>sendto/4,5</c></seealso>).
+      This is achieved by setting the <c>Timeout</c> argument to
+      <c>nowait</c>. For instance, if calling the
+      <seealso marker="socket#recv_async"><c>recv/3</c></seealso>
+      function with Timeout set to <c>nowait</c> (i.e. 
+      <c>recv(Sock, 0, nowait)</c>)
+      when there is actually nothing to read, it will return with
+      <c>{select, </c>
+      <seealso marker="socket#type-select_info"><c>SelectInfo</c></seealso><c>}</c>
+      (<c>SelectInfo</c> contains the
+      <seealso marker="socket#type-select_ref">SelectRef</seealso>).
+      When data eventually arrives a 'select message'
+      will be sent to the caller:</p>
+      <taglist>
+	<!-- NOTE THAT THE EMPTY TAG IS INTENTIONAL -->
+	<tag></tag>
+	<item><c>{'$socket', socket(), select, SelectRef}</c></item>
+      </taglist>
+      <p>The caller can then make another
+      call to the recv function and now expect data.</p>
+      <p>The user must also be prepared to receive an abort message: </p>
+      <taglist>
+	<!-- NOTE THAT THE EMPTY TAG IS INTENTIONAL -->
+	<tag></tag>
+	<item><c>{'$socket', socket(), abort, Info}</c></item>
+      </taglist>
+      <p>If the operation is aborted
+      for whatever reason (e.g. if the socket is closed "by someone else").
+      The <c>Info</c> part contains the abort reason (in this case that
+      the socket has been closed <c>Info = {SelectRef, closed}</c>). </p>
+      <p>Note that all other users are <em>locked out</em> until the
+      'current user' has called the function (recv in this case). So either
+      immediately call the function or
+      <seealso marker="socket#cancel/2"><c>cancel</c></seealso>. </p>
+
+      <p>The general form of the 'socket' message is: </p>
+      <taglist>
+	<!-- NOTE THAT THE EMPTY TAG IS INTENTIONAL -->
+	<tag></tag>
+	<item><c>{'$socket', Sock :: socket(), Tag :: atom(), Info :: term()}</c></item>
+      </taglist>
+      <p>Where the format of <c>Info</c> is a function of <c>Tag</c>:</p>
+      <table>
+	<row>
+	  <cell><em>Tag</em></cell>
+	  <cell><em>Info value type</em></cell>
+	</row>
+	<row>
+	  <cell>select</cell>
+	  <cell>select_ref()</cell>
+	</row>
+	<row>
+	  <cell>abort</cell>
+	  <cell>{select_ref(), Reason :: term()}</cell>
+	</row>
+	<tcaption>socket message info value type</tcaption>
+      </table>
+      <p>The <c>select_ref()</c> is the same as was received in the
+      <seealso marker="socket#type-select_info"><c>SelectInfo</c></seealso>. </p>
+    </section>
+  </section>
+
+  <section>
+    <marker id="socket_options"></marker>
+    <title>Socket Options</title>
+
+    <p>Options for level <c>otp</c>: </p>
+    <table>
+      <row>
+	<cell><em>Option Name</em></cell>
+	<cell><em>Value Type</em></cell>
+	<cell><em>Set</em></cell>
+	<cell><em>Get</em></cell>
+	<cell><em>Other Requirements and comments</em></cell>
+      </row>
+      <row>
+	<cell>assoc_id</cell>
+	<cell>integer()</cell>
+	<cell>no</cell>
+	<cell>yes</cell>
+	<cell>type = seqpacket, protocol = sctp, is an association</cell>
+      </row>
+      <row>
+	<cell>debug</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>iow</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>controlling_process</cell>
+	<cell>pid()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>rcvbuf</cell>
+	<cell>default | pos_integer() | {pos_integer(), pos_ineteger()}</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>'default' only valid for set.
+	The tuple form is only valid for type 'stream' and protocol 'tcp'.</cell>
+      </row>
+      <row>
+	<cell>rcvctrlbuf</cell>
+	<cell>default | pos_integer()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>default only valid for set</cell>
+      </row>
+      <row>
+	<cell>sndctrlbuf</cell>
+	<cell>default | pos_integer()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>default only valid for set</cell>
+      </row>
+      <row>
+	<cell>fd</cell>
+	<cell>integer()</cell>
+	<cell>no</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <tcaption>option levels</tcaption>
+    </table>
+    
+    <p>Options for level <c>socket</c>: </p>
+    <table>
+      <row>
+	<cell><em>Option Name</em></cell>
+	<cell><em>Value Type</em></cell>
+	<cell><em>Set</em></cell>
+	<cell><em>Get</em></cell>
+	<cell><em>Other Requirements and comments</em></cell>
+      </row>
+      <row>
+	<cell>acceptconn</cell>
+	<cell>boolean()</cell>
+	<cell>no</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>bindtodevice</cell>
+	<cell>string()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>Before Linux 3.8, this socket option could be set, but not get.
+	Only works for some socket types (e.g. <c>inet</c>).
+	If empty value is set, the binding is removed.</cell>
+      </row>
+      <row>
+	<cell>broadcast</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>type = dgram</cell>
+      </row>
+      <row>
+	<cell>debug</cell>
+	<cell>integer()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>may require admin capability</cell>
+      </row>
+      <row>
+	<cell>domain</cell>
+	<cell>domain()</cell>
+	<cell>no</cell>
+	<cell>yes</cell>
+	<cell><em>Not</em> on FreeBSD (for instance)</cell>
+      </row>
+      <row>
+	<cell>dontroute</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>keepalive</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>linger</cell>
+	<cell>abort | linger()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>oobinline</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>peek_off</cell>
+	<cell>integer()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>domain = local (unix)</cell>
+      </row>
+      <row>
+	<cell>priority</cell>
+	<cell>integer()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>protocol</cell>
+	<cell>protocol()</cell>
+	<cell>no</cell>
+	<cell>yes</cell>
+	<cell><em>Not</em> on (some) Darwin (for instance)</cell>
+      </row>
+      <row>
+	<cell>rcvbuf</cell>
+	<cell>non_neg_integer()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>rcvlowat</cell>
+	<cell>non_neg_integer()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>rcvtimeo</cell>
+	<cell>timeval()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>reuseaddr</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>reuseport</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>domain = inet | inet6</cell>
+      </row>
+      <row>
+	<cell>sndbuf</cell>
+	<cell>non_neg_integer()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>sndlowat</cell>
+	<cell>non_neg_integer()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>not changeable on Linux</cell>
+      </row>
+      <row>
+	<cell>sndtimeo</cell>
+	<cell>timeval()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>timestamp</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>type</cell>
+	<cell>type()</cell>
+	<cell>no</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <tcaption>socket options</tcaption>
+    </table>
+    
+    <p>Options for level <c>ip</c>: </p>
+    <table>
+      <row>
+	<cell><em>Option Name</em></cell>
+	<cell><em>Value Type</em></cell>
+	<cell><em>Set</em></cell>
+	<cell><em>Get</em></cell>
+	<cell><em>Other Requirements and comments</em></cell>
+      </row>
+      <row>
+	<cell>add_membership</cell>
+	<cell>ip_mreq()</cell>
+	<cell>yes</cell>
+	<cell>no</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>add_source_membership</cell>
+	<cell>ip_mreq_source()</cell>
+	<cell>yes</cell>
+	<cell>no</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>block_source</cell>
+	<cell>ip_mreq_source()</cell>
+	<cell>yes</cell>
+	<cell>no</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>drop_membership</cell>
+	<cell>ip_mreq()</cell>
+	<cell>yes</cell>
+	<cell>no</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>drop_source_membership</cell>
+	<cell>ip_mreq_source()</cell>
+	<cell>yes</cell>
+	<cell>no</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>freebind</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>hdrincl</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>type = raw</cell>
+      </row>
+      <row>
+	<cell>minttl</cell>
+	<cell>integer()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>type = raw</cell>
+      </row>
+      <row>
+	<cell>msfilter</cell>
+	<cell>null | ip_msfilter()</cell>
+	<cell>yes</cell>
+	<cell>no</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>mtu</cell>
+	<cell>integer()</cell>
+	<cell>no</cell>
+	<cell>yes</cell>
+	<cell>type = raw</cell>
+      </row>
+      <row>
+	<cell>mtu_discover</cell>
+	<cell>ip_pmtudisc()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>multicast_all</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>multicast_if</cell>
+	<cell>any | ip4_address()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>multicast_loop</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>multicast_ttl</cell>
+	<cell>uint8()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>nodefrag</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>type = raw</cell>
+      </row>
+      <row>
+	<cell>pktinfo</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>type = dgram</cell>
+      </row>
+      <row>
+	<cell>recvdstaddr</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>type = dgram</cell>
+      </row>
+      <row>
+	<cell>recverr</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>recvif</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>type = dgram | raw</cell>
+      </row>
+      <row>
+	<cell>recvopts</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>type =/= stream</cell>
+      </row>
+      <row>
+	<cell>recvorigdstaddr</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>recvttl</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>type =/= stream</cell>
+      </row>
+      <row>
+	<cell>retopts</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>type =/= stream</cell>
+      </row>
+      <row>
+	<cell>router_alert</cell>
+	<cell>integer()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>type = raw</cell>
+      </row>
+      <row>
+	<cell>sendsrcaddr</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>tos</cell>
+	<cell>ip_tos()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>some high-priority levels may require superuser capability</cell>
+      </row>
+      <row>
+	<cell>transparent</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>requires admin capability</cell>
+      </row>
+      <row>
+	<cell>ttl</cell>
+	<cell>integer()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>unblock_source</cell>
+	<cell>ip_mreq_source()</cell>
+	<cell>yes</cell>
+	<cell>no</cell>
+	<cell>none</cell>
+      </row>
+      <tcaption>ip options</tcaption>
+    </table>
+    
+    <p>Options for level <c>ipv6</c>: </p>
+    <table>
+      <row>
+	<cell><em>Option Name</em></cell>
+	<cell><em>Value Type</em></cell>
+	<cell><em>Set</em></cell>
+	<cell><em>Get</em></cell>
+	<cell><em>Other Requirements and comments</em></cell>
+      </row>
+      <row>
+	<cell>addrform</cell>
+	<cell>inet</cell>
+	<cell>yes</cell>
+	<cell>no</cell>
+	<cell>allowed only for IPv6 sockets that are connected and bound to a
+	v4-mapped-on-v6 address</cell>
+      </row>
+      <row>
+	<cell>add_membership</cell>
+	<cell>ipv6_mreq()</cell>
+	<cell>yes</cell>
+	<cell>no</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>authhdr</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>type = dgram | raw, obsolete?</cell>
+      </row>
+      <row>
+	<cell>drop_membership</cell>
+	<cell>ipv6_mreq()</cell>
+	<cell>yes</cell>
+	<cell>no</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>dstopts</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>type = dgram | raw, requires superuser privileges to update</cell>
+      </row>
+      <row>
+	<cell>flowinfo</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>type = dgram | raw, requires superuser privileges to update</cell>
+      </row>
+      <row>
+	<cell>hoplimit</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>type = dgram | raw, requires superuser privileges to update</cell>
+      </row>
+      <row>
+	<cell>hopopts</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>type = dgram | raw, requires superuser privileges to update</cell>
+      </row>
+      <row>
+	<cell>mtu</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>Get: Only after the socket has been connected</cell>
+      </row>
+      <row>
+	<cell>mtu_discover</cell>
+	<cell>ipv6_pmtudisc()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>multicast_hops</cell>
+	<cell>default | uint8()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>multicast_if</cell>
+	<cell>integer()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>type = dgram | raw</cell>
+      </row>
+      <row>
+	<cell>multicast_loop</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>recverr</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>recvpktinfo | pktinfo</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>type = dgram | raw</cell>
+      </row>
+      <row>
+	<cell>router_alert</cell>
+	<cell>integer()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>type = raw</cell>
+      </row>
+      <row>
+	<cell>rthdr</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>type = dgram | raw, requires superuser privileges to update</cell>
+      </row>
+      <row>
+	<cell>unicast_hops</cell>
+	<cell>default | uint8()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>v6only</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>no</cell>
+	<cell>none</cell>
+      </row>
+      <tcaption>ipv6 options</tcaption>
+    </table>
+    
+    <p>Options for level <c>tcp</c>: </p>
+    <table>
+      <row>
+	<cell><em>Option Name</em></cell>
+	<cell><em>Value Type</em></cell>
+	<cell><em>Set</em></cell>
+	<cell><em>Get</em></cell>
+	<cell><em>Other Requirements and comments</em></cell>
+      </row>
+      <row>
+	<cell>congestion</cell>
+	<cell>string()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>maxseg</cell>
+	<cell>integer()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>nodelay</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <tcaption>tcp options</tcaption>
+    </table>
+    
+    <p>Options for level <c>udp</c>: </p>
+    <table>
+      <row>
+	<cell><em>Option Name</em></cell>
+	<cell><em>Value Type</em></cell>
+	<cell><em>Set</em></cell>
+	<cell><em>Get</em></cell>
+	<cell><em>Other Requirements and comments</em></cell>
+      </row>
+      <row>
+	<cell>cork</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <tcaption>udp options</tcaption>
+    </table>
+    
+    <p>Options for level <c>sctp</c>: </p>
+    <table>
+      <row>
+	<cell><em>Option Name</em></cell>
+	<cell><em>Value Type</em></cell>
+	<cell><em>Set</em></cell>
+	<cell><em>Get</em></cell>
+	<cell><em>Other Requirements and comments</em></cell>
+      </row>
+      <row>
+	<cell>associnfo</cell>
+	<cell>sctp_assocparams()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>autoclose</cell>
+	<cell>non_neg_integer()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>disable_fragments</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>events</cell>
+	<cell>sctp_event_subscribe()</cell>
+	<cell>yes</cell>
+	<cell>no</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>initmsg</cell>
+	<cell>sctp_initmsg()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>maxseg</cell>
+	<cell>non_neg_integer()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>nodelay</cell>
+	<cell>boolean()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <row>
+	<cell>rtoinfo</cell>
+	<cell>sctp_rtoinfo()</cell>
+	<cell>yes</cell>
+	<cell>yes</cell>
+	<cell>none</cell>
+      </row>
+      <tcaption>sctp options</tcaption>
+    </table>
+    
+  </section>
+</chapter>
+
diff --git a/erts/doc/src/specs.xml b/erts/doc/src/specs.xml.src
index 0b943e6295..54224c15f5 100644
--- a/erts/doc/src/specs.xml
+++ b/erts/doc/src/specs.xml.src
@@ -5,6 +5,7 @@
   <xi:include href="../specs/specs_erl_tracer.xml"/>
   <xi:include href="../specs/specs_init.xml"/>
   <xi:include href="../specs/specs_persistent_term.xml"/>
+  %ESOCK_USE_SOCKET_SPECS_XML%
   <xi:include href="../specs/specs_zlib.xml"/>
   <xi:include href="../specs/specs_atomics.xml"/>
   <xi:include href="../specs/specs_counters.xml"/>
diff --git a/erts/doc/src/tty.xml b/erts/doc/src/tty.xml
index 51db1ba8e2..c33e082f4f 100644
--- a/erts/doc/src/tty.xml
+++ b/erts/doc/src/tty.xml
@@ -165,6 +165,10 @@ erl</pre>
         <cell align="left" valign="middle">C-y</cell>
         <cell align="left" valign="middle">Insert previously killed text</cell>
       </row>
+      <row>
+        <cell align="left" valign="middle">C-]</cell>
+        <cell align="left" valign="middle">Insert matching closing bracket</cell>
+      </row>
       <tcaption>tty Text Editing</tcaption>
     </table>
   </section>
diff --git a/erts/doc/src/zlib.xml b/erts/doc/src/zlib.xml
index 6f4c42da27..8a580c8d7b 100644
--- a/erts/doc/src/zlib.xml
+++ b/erts/doc/src/zlib.xml
@@ -29,7 +29,7 @@
     <rev></rev>
     <file>zlib.xml</file>
   </header>
-  <module>zlib</module>
+  <module since="">zlib</module>
   <modulesummary>zlib compression interface.</modulesummary>
   <description>
     <p>This module provides an API for the zlib library
@@ -120,7 +120,7 @@ list_to_binary([Compressed|Last])</pre>
 
   <funcs>
     <func>
-      <name name="adler32" arity="2"/>
+      <name name="adler32" arity="2" since=""/>
       <fsummary>Calculate the Adler checksum.</fsummary>
       <desc>
         <p>Calculates the Adler-32 checksum for <c><anno>Data</anno></c>.</p>
@@ -133,7 +133,7 @@ list_to_binary([Compressed|Last])</pre>
     </func>
 
     <func>
-      <name name="adler32" arity="3"/>
+      <name name="adler32" arity="3" since=""/>
       <fsummary>Calculate the Adler checksum.</fsummary>
       <desc>
         <p>Updates a running Adler-32 checksum for <c><anno>Data</anno></c>.
@@ -153,7 +153,7 @@ Crc = lists:foldl(fun(Data,Crc0) ->
     </func>
 
     <func>
-      <name name="adler32_combine" arity="4"/>
+      <name name="adler32_combine" arity="4" since=""/>
       <fsummary>Combine two Adler-32 checksums.</fsummary>
       <desc>
         <p>Combines two Adler-32 checksums into one. For two binaries or
@@ -172,7 +172,7 @@ Crc = lists:foldl(fun(Data,Crc0) ->
     </func>
 
     <func>
-      <name name="close" arity="1"/>
+      <name name="close" arity="1" since=""/>
       <fsummary>Close a stream.</fsummary>
       <desc>
         <p>Closes the stream referenced by <c><anno>Z</anno></c>.</p>
@@ -180,7 +180,7 @@ Crc = lists:foldl(fun(Data,Crc0) ->
     </func>
 
     <func>
-      <name name="compress" arity="1"/>
+      <name name="compress" arity="1" since=""/>
       <fsummary>Compress data with standard zlib functionality.</fsummary>
       <desc>
         <p>Compresses data with zlib headers and checksum.</p>
@@ -188,7 +188,7 @@ Crc = lists:foldl(fun(Data,Crc0) ->
     </func>
 
     <func>
-      <name name="crc32" arity="1"/>
+      <name name="crc32" arity="1" since=""/>
       <fsummary>Get current CRC.</fsummary>
       <desc>
         <p>Gets the current calculated CRC checksum.</p>
@@ -202,7 +202,7 @@ Crc = lists:foldl(fun(Data,Crc0) ->
     </func>
 
     <func>
-      <name name="crc32" arity="2"/>
+      <name name="crc32" arity="2" since=""/>
       <fsummary>Calculate CRC.</fsummary>
       <desc>
         <p>Calculates the CRC checksum for <c><anno>Data</anno></c>.</p>
@@ -215,7 +215,7 @@ Crc = lists:foldl(fun(Data,Crc0) ->
     </func>
 
     <func>
-      <name name="crc32" arity="3"/>
+      <name name="crc32" arity="3" since=""/>
       <fsummary>Calculate CRC.</fsummary>
       <desc>
         <p>Updates a running CRC checksum for <c><anno>Data</anno></c>.
@@ -235,7 +235,7 @@ Crc = lists:foldl(fun(Data,Crc0) ->
     </func>
 
     <func>
-      <name name="crc32_combine" arity="4"/>
+      <name name="crc32_combine" arity="4" since=""/>
       <fsummary>Combine two CRCs.</fsummary>
       <desc>
         <p>Combines two CRC checksums into one. For two binaries or iolists,
@@ -254,7 +254,7 @@ Crc = lists:foldl(fun(Data,Crc0) ->
     </func>
 
     <func>
-      <name name="deflate" arity="2"/>
+      <name name="deflate" arity="2" since=""/>
       <fsummary>Compress data.</fsummary>
       <desc>
         <p>Same as <c>deflate(<anno>Z</anno>, <anno>Data</anno>, none)</c>.</p>
@@ -262,7 +262,7 @@ Crc = lists:foldl(fun(Data,Crc0) ->
     </func>
 
     <func>
-      <name name="deflate" arity="3"/>
+      <name name="deflate" arity="3" since=""/>
       <fsummary>Compress data.</fsummary>
       <desc>
         <p>Compresses as much data as possible, and
@@ -300,7 +300,7 @@ list_to_binary([B1,B2])</pre>
     </func>
 
     <func>
-      <name name="deflateEnd" arity="1"/>
+      <name name="deflateEnd" arity="1" since=""/>
       <fsummary>End deflate session.</fsummary>
       <desc>
         <p>Ends the deflate session and cleans all data used. Notice that this
@@ -311,7 +311,7 @@ list_to_binary([B1,B2])</pre>
     </func>
 
     <func>
-      <name name="deflateInit" arity="1"/>
+      <name name="deflateInit" arity="1" since=""/>
       <fsummary>Initialize a session for compression.</fsummary>
       <desc>
         <p>Same as <c>zlib:deflateInit(<anno>Z</anno>, default)</c>.</p>
@@ -319,7 +319,7 @@ list_to_binary([B1,B2])</pre>
     </func>
 
     <func>
-      <name name="deflateInit" arity="2"/>
+      <name name="deflateInit" arity="2" since=""/>
       <fsummary>Initialize a session for compression.</fsummary>
       <desc>
         <p>Initializes a zlib stream for compression.</p>
@@ -334,7 +334,7 @@ list_to_binary([B1,B2])</pre>
     </func>
 
     <func>
-      <name name="deflateInit" arity="6"/>
+      <name name="deflateInit" arity="6" since=""/>
       <fsummary>Initialize a session for compression.</fsummary>
       <desc>
         <p>Initiates a zlib stream for compression.</p>
@@ -410,8 +410,8 @@ list_to_binary([B1,B2])</pre>
     </func>
 
     <func>
-      <name name="deflateParams" arity="3"/>
-      <fsummary>Dynamicly update deflate parameters.</fsummary>
+      <name name="deflateParams" arity="3" since=""/>
+      <fsummary>Dynamically update deflate parameters.</fsummary>
       <desc>
         <p>Dynamically updates the compression level and compression
           strategy. The interpretation of <c><anno>Level</anno></c> and
@@ -432,7 +432,7 @@ list_to_binary([B1,B2])</pre>
     </func>
 
     <func>
-      <name name="deflateReset" arity="1"/>
+      <name name="deflateReset" arity="1" since=""/>
       <fsummary>Reset the deflate session.</fsummary>
       <desc>
         <p>Equivalent to
@@ -446,7 +446,7 @@ list_to_binary([B1,B2])</pre>
     </func>
 
     <func>
-      <name name="deflateSetDictionary" arity="2"/>
+      <name name="deflateSetDictionary" arity="2" since=""/>
       <fsummary>Initialize the compression dictionary.</fsummary>
       <desc>
         <p>Initializes the compression dictionary from the specified byte
@@ -464,7 +464,7 @@ list_to_binary([B1,B2])</pre>
     </func>
 
     <func>
-      <name name="getBufSize" arity="1"/>
+      <name name="getBufSize" arity="1" since=""/>
       <fsummary>Get buffer size.</fsummary>
       <desc>
         <p>Gets the size of the intermediate buffer.</p>
@@ -476,7 +476,7 @@ list_to_binary([B1,B2])</pre>
     </func>
 
     <func>
-      <name name="gunzip" arity="1"/>
+      <name name="gunzip" arity="1" since=""/>
       <fsummary>Uncompress data with gz header.</fsummary>
       <desc>
         <p>Uncompresses data with gz headers and checksum.</p>
@@ -484,7 +484,7 @@ list_to_binary([B1,B2])</pre>
     </func>
 
     <func>
-      <name name="gzip" arity="1"/>
+      <name name="gzip" arity="1" since=""/>
       <fsummary>Compress data with gz header.</fsummary>
       <desc>
         <p>Compresses data with gz headers and checksum.</p>
@@ -492,7 +492,7 @@ list_to_binary([B1,B2])</pre>
     </func>
 
     <func>
-      <name name="inflate" arity="2"/>
+      <name name="inflate" arity="2" since=""/>
       <fsummary>Decompress data.</fsummary>
       <desc>
         <p>Equivalent to
@@ -502,7 +502,7 @@ list_to_binary([B1,B2])</pre>
     </func>
 
     <func>
-      <name name="inflate" arity="3"/>
+      <name name="inflate" arity="3" since="OTP 20.1"/>
       <fsummary>Decompress data.</fsummary>
       <desc>
         <p>Decompresses as much data as possible. It can introduce some output
@@ -524,7 +524,7 @@ list_to_binary([B1,B2])</pre>
     </func>
 
     <func>
-      <name name="inflateChunk" arity="1"/>
+      <name name="inflateChunk" arity="1" since="OTP 18.0"/>
       <fsummary>Read next uncompressed chunk.</fsummary>
       <desc>
         <warning>
@@ -540,7 +540,7 @@ list_to_binary([B1,B2])</pre>
     </func>
 
     <func>
-      <name name="inflateChunk" arity="2"/>
+      <name name="inflateChunk" arity="2" since="OTP 18.0"/>
       <fsummary>Decompress data with limited output size.</fsummary>
       <desc>
         <warning>
@@ -584,7 +584,7 @@ loop(Z, Handler, Uncompressed) ->
     </func>
 
     <func>
-      <name name="inflateEnd" arity="1"/>
+      <name name="inflateEnd" arity="1" since=""/>
       <fsummary>End inflate session.</fsummary>
       <desc>
         <p>Ends the inflate session and cleans all data used. Notice
@@ -595,7 +595,7 @@ loop(Z, Handler, Uncompressed) ->
     </func>
 
     <func>
-      <name name="inflateGetDictionary" arity="1"/>
+      <name name="inflateGetDictionary" arity="1" since="OTP 20.0"/>
       <fsummary>Return the decompression dictionary.</fsummary>
       <desc>
         <p>Returns the decompression dictionary currently in use
@@ -607,7 +607,7 @@ loop(Z, Handler, Uncompressed) ->
     </func>
 
     <func>
-      <name name="inflateInit" arity="1"/>
+      <name name="inflateInit" arity="1" since=""/>
       <fsummary>Initialize a session for decompression.</fsummary>
       <desc>
         <p>Initializes a zlib stream for decompression.</p>
@@ -615,7 +615,7 @@ loop(Z, Handler, Uncompressed) ->
     </func>
 
     <func>
-      <name name="inflateInit" arity="2"/>
+      <name name="inflateInit" arity="2" since=""/>
       <fsummary>Initialize a session for decompression.</fsummary>
       <desc>
         <p>Initializes a decompression session on zlib stream.</p>
@@ -634,7 +634,7 @@ loop(Z, Handler, Uncompressed) ->
     </func>
 
     <func>
-      <name name="inflateReset" arity="1"/>
+      <name name="inflateReset" arity="1" since=""/>
       <fsummary>>Reset the inflate session.</fsummary>
       <desc>
         <p>Equivalent to
@@ -648,7 +648,7 @@ loop(Z, Handler, Uncompressed) ->
     </func>
 
     <func>
-      <name name="inflateSetDictionary" arity="2"/>
+      <name name="inflateSetDictionary" arity="2" since=""/>
       <fsummary>Initialize the decompression dictionary.</fsummary>
       <desc>
         <p>Initializes the decompression dictionary from the specified
@@ -688,7 +688,7 @@ new_unpack(Z, Compressed, Dict) ->
     </func>
 
     <func>
-      <name name="open" arity="0"/>
+      <name name="open" arity="0" since=""/>
       <fsummary>Open a stream and return a stream reference.</fsummary>
       <desc>
         <p>Opens a zlib stream.</p>
@@ -696,7 +696,7 @@ new_unpack(Z, Compressed, Dict) ->
     </func>
 
     <func>
-      <name name="safeInflate" arity="2"/>
+      <name name="safeInflate" arity="2" since="OTP 20.1"/>
       <fsummary>Decompress data with limited output size.</fsummary>
       <desc>
         <p>Like <seealso marker="#inflate/2"><c>inflate/2</c></seealso>,
@@ -733,7 +733,7 @@ loop(Z, Handler, {finished, Output}) ->
     </func>
 
     <func>
-      <name name="setBufSize" arity="2"/>
+      <name name="setBufSize" arity="2" since=""/>
       <fsummary>Set buffer size.</fsummary>
       <desc>
         <p>Sets the intermediate buffer size.</p>
@@ -745,7 +745,7 @@ loop(Z, Handler, {finished, Output}) ->
     </func>
 
     <func>
-      <name name="set_controlling_process" arity="2"/>
+      <name name="set_controlling_process" arity="2" since="OTP 20.1.3"/>
       <fsummary>Transfers ownership of a zlib stream.</fsummary>
       <desc>
         <p>Changes the controlling process of <c><anno>Z</anno></c> to
@@ -754,7 +754,7 @@ loop(Z, Handler, {finished, Output}) ->
     </func>
 
     <func>
-      <name name="uncompress" arity="1"/>
+      <name name="uncompress" arity="1" since=""/>
       <fsummary>Uncompress data with standard zlib functionality.</fsummary>
       <desc>
         <p>Uncompresses data with zlib headers and checksum.</p>
@@ -762,7 +762,7 @@ loop(Z, Handler, {finished, Output}) ->
     </func>
 
     <func>
-      <name name="unzip" arity="1"/>
+      <name name="unzip" arity="1" since=""/>
       <fsummary>Uncompress data without the zlib headers.</fsummary>
       <desc>
         <p>Uncompresses data without zlib headers and checksum.</p>
@@ -770,7 +770,7 @@ loop(Z, Handler, {finished, Output}) ->
     </func>
 
     <func>
-      <name name="zip" arity="1"/>
+      <name name="zip" arity="1" since=""/>
       <fsummary>Compress data without the zlib headers.</fsummary>
       <desc>
         <p>Compresses data without zlib headers and checksum.</p>
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index 57a9d45887..ba5ba8abef 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -1,7 +1,8 @@
+
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1996-2018. All Rights Reserved.
+# Copyright Ericsson AB 1996-2019. 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 +267,6 @@ DEXPORT = @DEXPORT@
 RANLIB  = @RANLIB@
 STRIP   = strip
 PERL    = @PERL@
-RM	= @RM@
 MKDIR	= @MKDIR@
 
 USING_MINGW=@MIXED_CYGWIN_MINGW@
@@ -467,13 +467,13 @@ $(ERTS_LIB):
 
 .PHONY: clean
 clean:
-	$(RM) -f $(GENERATE)
-	$(RM) -rf $(TARGET)/*.c $(TARGET)/*.h $(TARGET)/*-GENERATED
-	$(RM) -rf $(TARGET)/*/*
-	$(RM) -rf obj/$(TARGET)
-	$(RM) -rf pcre/obj/$(TARGET) $(PCRE_GENINC)
-	$(RM) -rf zlib/obj/$(TARGET)
-	$(RM) -rf bin/$(TARGET)
+	$(RM) $(GENERATE)
+	$(RM) -r $(TARGET)/*.c $(TARGET)/*.h $(TARGET)/*-GENERATED
+	$(RM) -r $(TARGET)/*/*
+	$(RM) -r obj/$(TARGET)
+	$(RM) -r pcre/obj/$(TARGET) $(PCRE_GENINC)
+	$(RM) -r zlib/obj/$(TARGET)
+	$(RM) -r bin/$(TARGET)
 	cd $(ERTS_LIB_DIR) && $(MAKE) clean
 
 .PHONY: docs
@@ -633,14 +633,23 @@ GENERATE += $(TTF_DIR)/driver_tab.c
 # This list must be consistent with PRE_LOADED_MODULES in
 # erts/preloaded/src/Makefile.
 
-PRELOAD_BEAM =	$(ERL_TOP)/erts/preloaded/ebin/otp_ring0.beam \
-		$(ERL_TOP)/erts/preloaded/ebin/erts_code_purger.beam \
+ifeq ($(USE_ESOCK), yes)
+ESOCK_PRELOAD_BEAM = \
+	$(ERL_TOP)/erts/preloaded/ebin/socket.beam \
+	$(ERL_TOP)/erts/preloaded/ebin/prim_net.beam
+else
+ESOCK_PRELOAD_BEAM =
+endif
+
+PRELOAD_BEAM =	$(ERL_TOP)/erts/preloaded/ebin/erts_code_purger.beam \
+		$(ERL_TOP)/erts/preloaded/ebin/erl_init.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 \
 		$(ERL_TOP)/erts/preloaded/ebin/zlib.beam \
+		$(ESOCK_PRELOAD_BEAM) \
 		$(ERL_TOP)/erts/preloaded/ebin/prim_zip.beam \
 		$(ERL_TOP)/erts/preloaded/ebin/erl_prim_loader.beam \
 		$(ERL_TOP)/erts/preloaded/ebin/erlang.beam \
@@ -833,6 +842,37 @@ EMU_OBJS = \
 	$(OBJDIR)/beam_catches.o 	$(OBJDIR)/code_ix.o \
 	$(OBJDIR)/beam_ranges.o
 
+
+ifeq ($(USE_ESOCK), yes)
+
+# WE ARE USING ESOCK
+
+ESOCK_NIF_OBJS = \
+	$(OBJDIR)/socket_nif.o \
+	$(OBJDIR)/prim_net_nif.o
+
+ifneq ($(TARGET), win32)
+# These are *currently* only needed for non-win32,
+# since the nif-functions for socket and net are basically
+# stubbed with notsup in the win32 case.
+ESOCK_RUN_OBJS = \
+	$(OBJDIR)/socket_dbg.o \
+	$(OBJDIR)/socket_tarray.o \
+	$(OBJDIR)/socket_util.o
+else
+ESOCK_RUN_OBJS =
+endif
+
+else
+
+# WE ARE *NOT* USING ESOCK
+
+ESOCK_NIF_OBJS =
+ESOCK_RUN_OBJS =
+
+endif
+
+
 RUN_OBJS += \
 	$(OBJDIR)/erl_alloc.o		$(OBJDIR)/erl_mtrace.o \
 	$(OBJDIR)/erl_alloc_util.o	$(OBJDIR)/erl_goodfit_alloc.o \
@@ -865,7 +905,7 @@ RUN_OBJS += \
 	$(OBJDIR)/register.o		$(OBJDIR)/break.o \
 	$(OBJDIR)/erl_async.o		$(OBJDIR)/erl_lock_check.o \
 	$(OBJDIR)/erl_gc.o 		$(OBJDIR)/erl_lock_count.o \
-	$(OBJDIR)/erl_posix_str.o	 \
+	$(OBJDIR)/erl_posix_str.o	\
 	$(OBJDIR)/erl_bits.o 		$(OBJDIR)/erl_math.o \
 	$(OBJDIR)/erl_fun.o             $(OBJDIR)/erl_bif_port.o \
 	$(OBJDIR)/erl_term.o 		$(OBJDIR)/erl_node_tables.o \
@@ -879,14 +919,17 @@ RUN_OBJS += \
 	$(OBJDIR)/erl_thr_queue.o	$(OBJDIR)/erl_sched_spec_pre_alloc.o \
 	$(OBJDIR)/erl_ptab.o		$(OBJDIR)/erl_map.o \
 	$(OBJDIR)/erl_msacc.o		$(OBJDIR)/erl_lock_flags.o \
-	$(OBJDIR)/erl_io_queue.o
+	$(OBJDIR)/erl_io_queue.o	$(OBJDIR)/erl_db_catree.o \
+	$(ESOCK_RUN_OBJS)		$(OBJDIR)/erl_flxctr.o
 
 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
+	$(OBJDIR)/erl_tracer_nif.o \
+	$(OBJDIR)/prim_buffer_nif.o \
+	$(OBJDIR)/prim_file_nif.o \
+	$(OBJDIR)/zlib_nif.o \
+	$(ESOCK_NIF_OBJS)
 
 ifeq ($(TARGET),win32)
 DRV_OBJS = \
@@ -1147,7 +1190,15 @@ endif
 BEAM_SRC=$(wildcard beam/*.c)
 DRV_COMMON_SRC=$(wildcard drivers/common/*.c)
 DRV_OSTYPE_SRC=$(wildcard drivers/$(ERLANG_OSTYPE)/*.c)
+ifeq ($(TARGET), win32)
+# These are *currently* only needed for non-win32,
+# since the nif-functions for socket and net are basically
+# stubbed with badarg in the win32 case.
+NIF_SOCKET_UTILS_SRC=$(filter-out nifs/common/socket_nif.c, $(wildcard nifs/common/socket_*.c))
+NIF_COMMON_SRC=$(filter-out $(NIF_SOCKET_UTILS_SRC), $(wildcard nifs/common/*.c))
+else
 NIF_COMMON_SRC=$(wildcard nifs/common/*.c)
+endif
 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
diff --git a/erts/emulator/beam/arith_instrs.tab b/erts/emulator/beam/arith_instrs.tab
index b828e86788..f14b376419 100644
--- a/erts/emulator/beam/arith_instrs.tab
+++ b/erts/emulator/beam/arith_instrs.tab
@@ -19,21 +19,22 @@
 // %CopyrightEnd%
 //
 
-OUTLINED_ARITH_2(Fail, Live, Name, BIF, Op1, Op2, Dst) {
+OUTLINED_ARITH_2(Fail, Name, BIF, Op1, Op2, Dst) {
     Eterm result;
-    Uint live = $Live;
-    HEAVY_SWAPOUT;
-    reg[live] = $Op1;
-    reg[live+1] = $Op2;
-    result = erts_gc_$Name (c_p, reg, live);
-    HEAVY_SWAPIN;
+#ifdef DEBUG
+    Eterm* orig_htop = HTOP;
+    Eterm* orig_stop = E;
+#endif
+    DEBUG_SWAPOUT;
+    result = erts_$Name (c_p, $Op1, $Op2);
+    DEBUG_SWAPIN;
+    ASSERT(orig_htop == HTOP && orig_stop == E);
     ERTS_HOLE_CHECK(c_p);
     if (ERTS_LIKELY(is_value(result))) {
-        $REFRESH_GEN_DEST();
         $Dst = result;
         $NEXT0();
     }
-    $BIF_ERROR_ARITY_2($Fail, $BIF, reg[live], reg[live+1]);
+    $BIF_ERROR_ARITY_2($Fail, $BIF, $Op1, $Op2);
 }
 
 
@@ -48,15 +49,54 @@ plus.fetch(Op1, Op2) {
     PlusOp2 = $Op2;
 }
 
-plus.execute(Fail, Live, Dst) {
+plus.execute(Fail, Dst) {
     if (ERTS_LIKELY(is_both_small(PlusOp1, PlusOp2))) {
+#ifdef HAVE_OVERFLOW_CHECK_BUILTINS
+        Sint lhs_tagged, rhs_untagged, res;
+
+        /* The value part of immediate integers start right after the tag and
+         * occupy the rest of the word, so if you squint a bit they look like
+         * fixed-point integers; as long as you mask the tag away you will get
+         * correct results from addition/subtraction since they share the same
+         * notion of zero. It's fairly easy to see that the following holds
+         * when (a + b) is in range:
+         *
+         *     (a >> s) + (b >> s) == ((a & ~m) + (b & ~m)) >> s
+         *
+         * Where 's' is the tag size and 'm' is the tag mask.
+         *
+         * The left-hand side is our fallback in the #else clause and is the
+         * fastest way to do this safely in plain C. The actual addition will
+         * never overflow since `Sint` has a much greater range than our
+         * smalls, so we can use the IS_SSMALL macro to see if the result is
+         * within range.
+         *
+         * What we're doing below is an extension of the right-hand side. By
+         * treating `a` and `b` as fixed-point integers, all additions whose
+         * result is out of range will also overflow `Sint` and we can use the
+         * compiler's overflow intrinsics to check for this condition.
+         *
+         * In addition, since the tag lives in the lowest bits we can further
+         * optimize this by only stripping the tag from either side. The higher
+         * bits can't influence the tag bits since we bail on overflow, so the
+         * tag bits from the tagged side will simply appear in the result. */
+        lhs_tagged = PlusOp1;
+        rhs_untagged = PlusOp2 & ~_TAG_IMMED1_MASK;
+
+        if (ERTS_LIKELY(!__builtin_add_overflow(lhs_tagged, rhs_untagged, &res))) {
+            ASSERT(is_small(res));
+            $Dst = res;
+            $NEXT0();
+        }
+#else
         Sint i = signed_val(PlusOp1) + signed_val(PlusOp2);
         if (ERTS_LIKELY(IS_SSMALL(i))) {
             $Dst = make_small(i);
             $NEXT0();
         }
+#endif
     }
-    $OUTLINED_ARITH_2($Fail, $Live, mixed_plus, BIF_splus_2, PlusOp1, PlusOp2, $Dst);
+    $OUTLINED_ARITH_2($Fail, mixed_plus, BIF_splus_2, PlusOp1, PlusOp2, $Dst);
 }
 
 i_minus := minus.fetch.execute;
@@ -70,15 +110,30 @@ minus.fetch(Op1, Op2) {
     MinusOp2 = $Op2;
 }
 
-minus.execute(Fail, Live, Dst) {
+minus.execute(Fail, Dst) {
     if (ERTS_LIKELY(is_both_small(MinusOp1, MinusOp2))) {
+#ifdef HAVE_OVERFLOW_CHECK_BUILTINS
+        Sint lhs_tagged, rhs_untagged, res;
+
+        /* See plus.execute */
+        lhs_tagged = MinusOp1;
+        rhs_untagged = MinusOp2 & ~_TAG_IMMED1_MASK;
+
+        if (ERTS_LIKELY(!__builtin_sub_overflow(lhs_tagged, rhs_untagged, &res))) {
+            ASSERT(is_small(res));
+            $Dst = res;
+            $NEXT0();
+        }
+#else
         Sint i = signed_val(MinusOp1) - signed_val(MinusOp2);
+
         if (ERTS_LIKELY(IS_SSMALL(i))) {
             $Dst = make_small(i);
             $NEXT0();
         }
+#endif
     }
-    $OUTLINED_ARITH_2($Fail, $Live, mixed_minus, BIF_sminus_2, MinusOp1, MinusOp2, $Dst);
+    $OUTLINED_ARITH_2($Fail, mixed_minus, BIF_sminus_2, MinusOp1, MinusOp2, $Dst);
 }
 
 i_increment := increment.fetch.execute;
@@ -91,27 +146,35 @@ increment.fetch(Src) {
     increment_reg_val = $Src;
 }
 
-increment.execute(IncrementVal, Live, Dst) {
+increment.execute(IncrementVal, Dst) {
     Eterm increment_val = $IncrementVal;
-    Uint live;
     Eterm result;
 
     if (ERTS_LIKELY(is_small(increment_reg_val))) {
+#ifdef HAVE_OVERFLOW_CHECK_BUILTINS
+        Sint lhs_tagged, rhs_untagged, res;
+
+        /* See plus.execute */
+        lhs_tagged = increment_reg_val;
+        rhs_untagged = (Sint)increment_val << _TAG_IMMED1_SIZE;
+
+        if (ERTS_LIKELY(!__builtin_add_overflow(lhs_tagged, rhs_untagged, &res))) {
+            ASSERT(is_small(res));
+            $Dst = res;
+            $NEXT0();
+        }
+#else
         Sint i = signed_val(increment_reg_val) + increment_val;
         if (ERTS_LIKELY(IS_SSMALL(i))) {
             $Dst = make_small(i);
             $NEXT0();
         }
+#endif
     }
-    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;
+
+    result = erts_mixed_plus(c_p, increment_reg_val, make_small(increment_val));
     ERTS_HOLE_CHECK(c_p);
     if (ERTS_LIKELY(is_value(result))) {
-        $REFRESH_GEN_DEST();
         $Dst = result;
         $NEXT0();
     }
@@ -119,19 +182,34 @@ increment.execute(IncrementVal, Live, Dst) {
     goto find_func_info;
 }
 
-i_times(Fail, Live, Op1, Op2, Dst) {
+i_times(Fail, Op1, Op2, Dst) {
     Eterm op1 = $Op1;
     Eterm op2 = $Op2;
-    $OUTLINED_ARITH_2($Fail, $Live, mixed_times, BIF_stimes_2, op1, op2, $Dst);
+#ifdef HAVE_OVERFLOW_CHECK_BUILTINS
+    if (ERTS_LIKELY(is_both_small(op1, op2))) {
+        /* See plus.execute */
+        Sint lhs_untagged, rhs_actual, res;
+
+        lhs_untagged = op1 & ~_TAG_IMMED1_MASK;
+        rhs_actual = signed_val(op2);
+
+        if (ERTS_LIKELY(!__builtin_mul_overflow(lhs_untagged, rhs_actual, &res))) {
+            ASSERT(!(res & _TAG_IMMED1_MASK));
+            $Dst = res | _TAG_IMMED1_SMALL;
+            $NEXT0();
+        }
+    }
+#endif
+    $OUTLINED_ARITH_2($Fail, mixed_times, BIF_stimes_2, op1, op2, $Dst);
 }
 
-i_m_div(Fail, Live, Op1, Op2, Dst) {
+i_m_div(Fail, Op1, Op2, Dst) {
     Eterm op1 = $Op1;
     Eterm op2 = $Op2;
-    $OUTLINED_ARITH_2($Fail, $Live, mixed_div, BIF_div_2, op1, op2, $Dst);
+    $OUTLINED_ARITH_2($Fail, mixed_div, BIF_div_2, op1, op2, $Dst);
 }
 
-i_int_div(Fail, Live, Op1, Op2, Dst) {
+i_int_div(Fail, Op1, Op2, Dst) {
     Eterm op1 = $Op1;
     Eterm op2 = $Op2;
     if (ERTS_UNLIKELY(op2 == SMALL_ZERO)) {
@@ -144,7 +222,7 @@ i_int_div(Fail, Live, Op1, Op2, Dst) {
             $NEXT0();
         }
     }
-    $OUTLINED_ARITH_2($Fail, $Live, int_div, BIF_intdiv_2, op1, op2, $Dst);
+    $OUTLINED_ARITH_2($Fail, int_div, BIF_intdiv_2, op1, op2, $Dst);
 }
 
 i_rem := rem.fetch.execute;
@@ -158,7 +236,7 @@ rem.fetch(Src1, Src2) {
     RemOp2 = $Src2;
 }
 
-rem.execute(Fail, Live, Dst) {
+rem.execute(Fail, Dst) {
     if (ERTS_UNLIKELY(RemOp2 == SMALL_ZERO)) {
         c_p->freason = BADARITH;
         $BIF_ERROR_ARITY_2($Fail, BIF_rem_2, RemOp1, RemOp2);
@@ -166,7 +244,7 @@ rem.execute(Fail, Live, Dst) {
         $Dst = make_small(signed_val(RemOp1) % signed_val(RemOp2));
         $NEXT0();
     } else {
-        $OUTLINED_ARITH_2($Fail, $Live, int_rem, BIF_rem_2, RemOp1, RemOp2, $Dst);
+        $OUTLINED_ARITH_2($Fail, int_rem, BIF_rem_2, RemOp1, RemOp2, $Dst);
     }
 }
 
@@ -181,7 +259,7 @@ band.fetch(Src1, Src2) {
     BandOp2 = $Src2;
 }
 
-band.execute(Fail, Live, Dst) {
+band.execute(Fail, Dst) {
     if (ERTS_LIKELY(is_both_small(BandOp1, BandOp2))) {
         /*
          * No need to untag -- TAG & TAG == TAG.
@@ -189,10 +267,10 @@ band.execute(Fail, Live, Dst) {
         $Dst = BandOp1 & BandOp2;
         $NEXT0();
     }
-    $OUTLINED_ARITH_2($Fail, $Live, band, BIF_band_2, BandOp1, BandOp2, $Dst);
+    $OUTLINED_ARITH_2($Fail, band, BIF_band_2, BandOp1, BandOp2, $Dst);
 }
 
-i_bor(Fail, Live, Src1, Src2, Dst) {
+i_bor(Fail, Src1, Src2, Dst) {
     if (ERTS_LIKELY(is_both_small($Src1, $Src2))) {
         /*
          * No need to untag -- TAG | TAG == TAG.
@@ -200,10 +278,10 @@ i_bor(Fail, Live, Src1, Src2, Dst) {
         $Dst = $Src1 | $Src2;
         $NEXT0();
     }
-    $OUTLINED_ARITH_2($Fail, $Live, bor, BIF_bor_2, $Src1, $Src2, $Dst);
+    $OUTLINED_ARITH_2($Fail, bor, BIF_bor_2, $Src1, $Src2, $Dst);
 }
 
-i_bxor(Fail, Live, Src1, Src2, Dst) {
+i_bxor(Fail, Src1, Src2, Dst) {
     if (ERTS_LIKELY(is_both_small($Src1, $Src2))) {
         /*
          * TAG ^ TAG == 0.
@@ -214,7 +292,7 @@ i_bxor(Fail, Live, Src1, Src2, Dst) {
         $Dst = ($Src1 ^ $Src2) | make_small(0);
         $NEXT0();
     }
-    $OUTLINED_ARITH_2($Fail, $Live, bxor, BIF_bxor_2, $Src1, $Src2, $Dst);
+    $OUTLINED_ARITH_2($Fail, bxor, BIF_bxor_2, $Src1, $Src2, $Dst);
 }
 
 i_bsl := shift.setup_bsl.execute;
@@ -265,7 +343,7 @@ shift.setup_bsl(Src1, Src2) {
     }
 }
 
-shift.execute(Fail, Live, Dst) {
+shift.execute(Fail, Dst) {
     Uint big_words_needed;
 
     if (ERTS_LIKELY(is_small(Op1))) {
@@ -320,7 +398,9 @@ shift.execute(Fail, Live, Dst) {
         }
         {
             Eterm tmp_big[2];
-            Sint big_need_size = BIG_NEED_SIZE(big_words_needed+1);
+            Sint big_need_size = 1 + BIG_NEED_SIZE(big_words_needed+1);
+            Eterm* hp;
+            Eterm* hp_end;
 
             /*
              * Slightly conservative check the size to avoid
@@ -331,15 +411,16 @@ shift.execute(Fail, Live, Dst) {
             if (big_need_size-8 > BIG_ARITY_MAX) {
                 $SYSTEM_LIMIT($Fail);
             }
-            $GC_TEST_PRESERVE(big_need_size+1, $Live, Op1);
+            hp = HeapFragOnlyAlloc(c_p, big_need_size);
             if (is_small(Op1)) {
                 Op1 = small_to_big(signed_val(Op1), tmp_big);
             }
-            Op1 = big_lshift(Op1, shift_left_count, HTOP);
+            Op1 = big_lshift(Op1, shift_left_count, hp);
+            hp_end = hp + big_need_size;
             if (is_big(Op1)) {
-                HTOP += bignum_header_arity(*HTOP) + 1;
+                hp += bignum_header_arity(*hp) + 1;
             }
-            HEAP_SPACE_VERIFIED(0);
+            HRelease(c_p, hp_end, hp);
             if (ERTS_UNLIKELY(is_nil(Op1))) {
                 /*
                  * This result must have been only slighty larger
@@ -349,7 +430,6 @@ shift.execute(Fail, Live, Dst) {
                 $SYSTEM_LIMIT($Fail);
             }
             ERTS_HOLE_CHECK(c_p);
-            $REFRESH_GEN_DEST();
             $Dst = Op1;
             $NEXT0();
         }
@@ -366,31 +446,28 @@ shift.execute(Fail, Live, Dst) {
         reg[0] = Op1;
         reg[1] = Op2;
         SWAPOUT;
-        if (IsOpCode(I[0], i_bsl_ssjtd)) {
+        if (IsOpCode(I[0], i_bsl_ssjd)) {
             I = handle_error(c_p, I, reg, &bif_export[BIF_bsl_2]->info.mfa);
         } else {
-            ASSERT(IsOpCode(I[0], i_bsr_ssjtd));
+            ASSERT(IsOpCode(I[0], i_bsr_ssjd));
             I = handle_error(c_p, I, reg, &bif_export[BIF_bsr_2]->info.mfa);
         }
         goto post_error_handling;
     }
 }
 
-i_int_bnot(Fail, Src, Live, Dst) {
+i_int_bnot(Fail, Src, Dst) {
     Eterm bnot_val = $Src;
+    Eterm result;
+
     if (ERTS_LIKELY(is_small(bnot_val))) {
-        bnot_val = make_small(~signed_val(bnot_val));
+        result = make_small(~signed_val(bnot_val));
     } else {
-        Uint live = $Live;
-        HEAVY_SWAPOUT;
-        reg[live] = bnot_val;
-        bnot_val = erts_gc_bnot(c_p, reg, live);
-        HEAVY_SWAPIN;
+        result = erts_bnot(c_p, bnot_val);
         ERTS_HOLE_CHECK(c_p);
-        if (ERTS_UNLIKELY(is_nil(bnot_val))) {
-            $BIF_ERROR_ARITY_1($Fail, BIF_bnot_1, reg[live]);
+        if (ERTS_UNLIKELY(is_nil(result))) {
+            $BIF_ERROR_ARITY_1($Fail, BIF_bnot_1, bnot_val);
         }
-        $REFRESH_GEN_DEST();
     }
-    $Dst = bnot_val;
+    $Dst = result;
 }
diff --git a/erts/emulator/beam/atom.c b/erts/emulator/beam/atom.c
index 59b51fd15e..5a70509ffd 100644
--- a/erts/emulator/beam/atom.c
+++ b/erts/emulator/beam/atom.c
@@ -200,11 +200,15 @@ atom_free(Atom* obj)
     ASSERT(obj->slot.index == atom_val(am_ErtsSecretAtom));
 }
 
-static void latin1_to_utf8(byte* conv_buf, const byte** srcp, int* lenp)
+static void latin1_to_utf8(byte* conv_buf, Uint buf_sz,
+                           const byte** srcp, Uint* lenp)
 {
     byte* dst;
     const byte* src = *srcp;
-    int i, len = *lenp;
+    Uint i, len = *lenp;
+
+    ASSERT(len <= MAX_ATOM_CHARACTERS);
+    ASSERT(buf_sz >= MAX_ATOM_SZ_FROM_LATIN1);
 
     for (i=0 ; i < len; ++i) {
 	if (src[i] & 0x80) {
@@ -234,11 +238,11 @@ need_convertion:
  * erts_atom_put_index() may fail. Returns negative indexes for errors.
  */
 int
-erts_atom_put_index(const byte *name, int len, ErtsAtomEncoding enc, int trunc)
+erts_atom_put_index(const byte *name, Sint len, ErtsAtomEncoding enc, int trunc)
 {
     byte utf8_copy[MAX_ATOM_SZ_FROM_LATIN1];
     const byte *text = name;
-    int tlen = len;
+    Uint tlen;
     Sint no_latin1_chars;
     Atom a;
     int aix;
@@ -247,13 +251,16 @@ erts_atom_put_index(const byte *name, int len, ErtsAtomEncoding enc, int trunc)
     erts_atomic_inc_nob(&atom_put_ops);
 #endif
 
-    if (tlen < 0) {
-	if (trunc)
-	    tlen = 0;
-	else
-	    return ATOM_MAX_CHARS_ERROR;
+    if (len < 0) {
+        if (trunc) {
+            len = 0;
+        } else {
+            return ATOM_MAX_CHARS_ERROR;
+        }
     }
 
+    tlen = len;
+
     switch (enc) {
     case ERTS_ATOM_ENC_7BIT_ASCII:
 	if (tlen > MAX_ATOM_CHARACTERS) {
@@ -277,7 +284,7 @@ erts_atom_put_index(const byte *name, int len, ErtsAtomEncoding enc, int trunc)
 		return ATOM_MAX_CHARS_ERROR;
 	}
 	no_latin1_chars = tlen;
-	latin1_to_utf8(utf8_copy, &text, &tlen);
+	latin1_to_utf8(utf8_copy, sizeof(utf8_copy), &text, &tlen);
 	break;
     case ERTS_ATOM_ENC_UTF8:
 	/* First sanity check; need to verify later */
@@ -338,7 +345,7 @@ erts_atom_put_index(const byte *name, int len, ErtsAtomEncoding enc, int trunc)
  * erts_atom_put() may fail. If it fails THE_NON_VALUE is returned!
  */
 Eterm
-erts_atom_put(const byte *name, int len, ErtsAtomEncoding enc, int trunc)
+erts_atom_put(const byte *name, Sint len, ErtsAtomEncoding enc, int trunc)
 {
     int aix = erts_atom_put_index(name, len, enc, trunc);
     if (aix >= 0)
@@ -348,7 +355,7 @@ erts_atom_put(const byte *name, int len, ErtsAtomEncoding enc, int trunc)
 }
 
 Eterm
-am_atom_put(const char* name, int len)
+am_atom_put(const char* name, Sint len)
 {
     /* Assumes 7-bit ascii; use erts_atom_put() for other encodings... */
     return erts_atom_put((byte *) name, len, ERTS_ATOM_ENC_7BIT_ASCII, 1);
@@ -379,23 +386,57 @@ int atom_table_sz(void)
 }
 
 int
-erts_atom_get(const char *name, int len, Eterm* ap, ErtsAtomEncoding enc)
+erts_atom_get(const char *name, Uint len, Eterm* ap, ErtsAtomEncoding enc)
 {
     byte utf8_copy[MAX_ATOM_SZ_FROM_LATIN1];
     Atom a;
     int i;
     int res;
 
-    a.len = (Sint16) len;
-    a.name = (byte *)name;
-    if (enc == ERTS_ATOM_ENC_LATIN1) {
-	latin1_to_utf8(utf8_copy, (const byte**)&a.name, &len);
-	a.len = (Sint16) len;
+    switch (enc) {
+    case ERTS_ATOM_ENC_LATIN1:
+        if (len > MAX_ATOM_CHARACTERS) {
+            return 0;
+        }
+
+        latin1_to_utf8(utf8_copy, sizeof(utf8_copy), (const byte**)&name, &len);
+
+        a.name = (byte*)name;
+        a.len = (Sint16)len;
+        break;
+    case ERTS_ATOM_ENC_7BIT_ASCII:
+        if (len > MAX_ATOM_CHARACTERS) {
+            return 0;
+        }
+
+        for (i = 0; i < len; i++) {
+            if (name[i] & 0x80) {
+                return 0;
+            }
+        }
+
+        a.len = (Sint16)len;
+        a.name = (byte*)name;
+        break;
+    case ERTS_ATOM_ENC_UTF8:
+        if (len > MAX_ATOM_SZ_LIMIT) {
+            return 0;
+        }
+
+        /* We don't need to check whether the encoding is legal as all atom
+         * names are stored as UTF-8 and we know a lookup with a badly encoded
+         * name will fail. */
+
+        a.len = (Sint16)len;
+        a.name = (byte*)name;
+        break;
     }
+
     atom_read_lock();
     i = index_get(&erts_atom_table, (void*) &a);
     res = i < 0 ? 0 : (*ap = make_atom(i), 1);
     atom_read_unlock();
+
     return res;
 }
 
diff --git a/erts/emulator/beam/atom.h b/erts/emulator/beam/atom.h
index ca920679c6..f51c5a8c62 100644
--- a/erts/emulator/beam/atom.h
+++ b/erts/emulator/beam/atom.h
@@ -133,14 +133,14 @@ typedef enum {
 int atom_table_size(void);	/* number of elements */
 int atom_table_sz(void);	/* table size in bytes, excluding stored objects */
 
-Eterm am_atom_put(const char*, int); /* ONLY 7-bit ascii! */
-Eterm erts_atom_put(const byte *name, int len, ErtsAtomEncoding enc, int trunc);
-int erts_atom_put_index(const byte *name, int len, ErtsAtomEncoding enc, int trunc);
+Eterm am_atom_put(const char*, Sint); /* ONLY 7-bit ascii! */
+Eterm erts_atom_put(const byte *name, Sint len, ErtsAtomEncoding enc, int trunc);
+int erts_atom_put_index(const byte *name, Sint len, ErtsAtomEncoding enc, int trunc);
 void init_atom_table(void);
 void atom_info(fmtfn_t, void *);
 void dump_atoms(fmtfn_t, void *);
 Uint erts_get_atom_limit(void);
-int erts_atom_get(const char* name, int len, Eterm* ap, ErtsAtomEncoding enc);
+int erts_atom_get(const char* name, Uint len, Eterm* ap, ErtsAtomEncoding enc);
 void erts_atom_get_text_space_sizes(Uint *reserved, Uint *used);
 #endif
 
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names
index a14f22b19e..412d689246 100644
--- a/erts/emulator/beam/atom.names
+++ b/erts/emulator/beam/atom.names
@@ -209,7 +209,6 @@ atom dirty_nif_finalizer
 atom disable_trace
 atom disabled
 atom discard
-atom display_items
 atom dist
 atom dist_cmd
 atom dist_ctrl_put_data
@@ -238,6 +237,7 @@ atom eof
 atom eol
 atom Eq='=:='
 atom Eqeq='=='
+atom erl_init
 atom erl_tracer
 atom erlang
 atom erl_signal_server
@@ -290,6 +290,7 @@ atom Ge='>='
 atom generational
 atom get_all_trap
 atom get_seq_token
+atom get_size
 atom get_tcw
 atom gather_gc_info_result
 atom gather_io_bytes
@@ -546,6 +547,7 @@ atom reload
 atom rem
 atom report_errors
 atom reset
+atom reset_seq_trace
 atom restart
 atom return_from
 atom return_to
diff --git a/erts/emulator/beam/beam_bif_load.c b/erts/emulator/beam/beam_bif_load.c
index bb1b2e5b27..4c8ee5178a 100644
--- a/erts/emulator/beam/beam_bif_load.c
+++ b/erts/emulator/beam/beam_bif_load.c
@@ -1799,6 +1799,78 @@ erts_queue_release_literals(Process* c_p, ErtsLiteralArea* literals)
     }
 }
 
+struct debug_la_oh {
+    void (*func)(ErlOffHeap *, void *);
+    void *arg;
+};
+
+static void debug_later_cleanup_literal_area_off_heap(void *vfap,
+                                                      ErtsThrPrgrVal val,
+                                                      void *vlrlap)
+{
+    struct debug_la_oh *fap = vfap;
+    ErtsLaterReleasLiteralArea *lrlap = vlrlap;
+    ErtsLiteralArea *lap = lrlap->la;
+    if (!erts_debug_have_accessed_literal_area(lap)) {
+        ErlOffHeap oh;
+        ERTS_INIT_OFF_HEAP(&oh);
+        oh.first = lap->off_heap;
+        (*fap->func)(&oh, fap->arg);
+        erts_debug_save_accessed_literal_area(lap);
+    }
+}
+
+static void debug_later_complete_literal_area_switch_off_heap(void *vfap,
+                                                              ErtsThrPrgrVal val,
+                                                              void *vlap)
+{
+    struct debug_la_oh *fap = vfap;
+    ErtsLiteralArea *lap = vlap;
+    if (lap && !erts_debug_have_accessed_literal_area(lap)) {
+        ErlOffHeap oh;
+        ERTS_INIT_OFF_HEAP(&oh);
+        oh.first = lap->off_heap;
+        (*fap->func)(&oh, fap->arg);
+        erts_debug_save_accessed_literal_area(lap);
+    }
+}
+
+
+void
+erts_debug_foreach_release_literal_area_off_heap(void (*func)(ErlOffHeap *, void *), void *arg)
+{
+    ErtsLiteralArea *lap;
+    ErlOffHeap oh;
+    ErtsLiteralAreaRef *ref;
+    struct debug_la_oh fa;
+    erts_mtx_lock(&release_literal_areas.mtx);
+    for (ref = release_literal_areas.first; ref; ref = ref->next) {
+        lap = ref->literal_area;
+        if (!erts_debug_have_accessed_literal_area(lap)) {
+            ERTS_INIT_OFF_HEAP(&oh);
+            oh.first = lap->off_heap;
+            (*func)(&oh, arg);
+            erts_debug_save_accessed_literal_area(lap);
+        }
+    }
+    erts_mtx_unlock(&release_literal_areas.mtx);
+    lap = ERTS_COPY_LITERAL_AREA();
+    if (lap && !erts_debug_have_accessed_literal_area(lap)) {
+        ERTS_INIT_OFF_HEAP(&oh);
+        oh.first = lap->off_heap;
+        (*func)(&oh, arg);
+        erts_debug_save_accessed_literal_area(lap);
+    }
+    fa.func = func;
+    fa.arg = arg;
+    erts_debug_later_op_foreach(later_release_literal_area,
+                                debug_later_cleanup_literal_area_off_heap,
+                                (void *) &fa);
+    erts_debug_later_op_foreach(complete_literal_area_switch,
+                                debug_later_complete_literal_area_switch_off_heap,
+                                (void *) &fa);
+}
+
 /*
  * Move code from current to old and null all export entries for the module
  */
diff --git a/erts/emulator/beam/beam_debug.c b/erts/emulator/beam/beam_debug.c
index 9633de2021..4d52435139 100644
--- a/erts/emulator/beam/beam_debug.c
+++ b/erts/emulator/beam/beam_debug.c
@@ -332,6 +332,13 @@ erts_debug_disassemble_1(BIF_ALIST_1)
 		   "unknown " HEXF "\n", instr);
 	code_ptr++;
     }
+    if (i == op_call_nif) {
+        /*
+         * The rest of the code will not be executed. Don't disassemble any
+         * more code in this function.
+         */
+        code_ptr = 0;
+    }
     bin = new_binary(p, (byte *) dsbufp->str, dsbufp->str_len);
     erts_destroy_tmp_dsbuf(dsbufp);
     hsz = 4+4;
@@ -346,6 +353,22 @@ erts_debug_disassemble_1(BIF_ALIST_1)
     return TUPLE3(hp, addr, bin, mfa);
 }
 
+BIF_RETTYPE
+erts_debug_interpreter_size_0(BIF_ALIST_0)
+{
+    int i;
+    BeamInstr low, high;
+
+    low = high = (BeamInstr) process_main;
+    for (i = 0; i < NUM_SPECIFIC_OPS; i++) {
+        BeamInstr a = BeamOpCodeAddr(i);
+        if (a > high) {
+            high = a;
+        }
+    }
+    return erts_make_integer(high - low, BIF_P);
+}
+
 void
 dbg_bt(Process* p, Eterm* sp)
 {
@@ -558,23 +581,6 @@ print_op(fmtfn_t to, void *to_arg, int op, int size, BeamInstr* addr)
 	case 'I':
         case 'W':
 	    switch (op) {
-	    case op_i_gc_bif1_jWstd:
-	    case op_i_gc_bif2_jWtssd:
-	    case op_i_gc_bif3_jWtssd:
-		{
-		    const ErtsGcBif* p;
-		    BifFunction gcf = (BifFunction) *ap;
-		    for (p = erts_gc_bifs; p->bif != 0; p++) {
-			if (p->gc_bif == gcf) {
-			    print_bif_name(to, to_arg, p->bif);
-			    break;
-			}
-		    }
-		    if (p->bif == 0) {
-			erts_print(to, to_arg, "%d", (Uint)gcf);
-		    }
-		    break;
-		}
 	    case op_i_make_fun_Wt:
                 if (*sign == 'W') {
                     ErlFunEntry* fe = (ErlFunEntry *) *ap;
@@ -586,6 +592,7 @@ print_op(fmtfn_t to, void *to_arg, int op, int size, BeamInstr* addr)
                 }
                 break;
 	    case op_i_bs_match_string_xfWW:
+	    case op_i_bs_match_string_yfWW:
                 if (ap - first_arg < 3) {
                     erts_print(to, to_arg, "%d", *ap);
                 } else {
@@ -786,11 +793,14 @@ print_op(fmtfn_t to, void *to_arg, int op, int size, BeamInstr* addr)
 	    }
 	}
 	break;
-    case op_i_put_tuple_xI:
-    case op_i_put_tuple_yI:
+    case op_put_tuple2_xI:
+    case op_put_tuple2_yI:
     case op_new_map_dtI:
-    case op_update_map_assoc_sdtI:
-    case op_update_map_exact_jsdtI:
+    case op_update_map_assoc_xdtI:
+    case op_update_map_assoc_ydtI:
+    case op_update_map_assoc_cdtI:
+    case op_update_map_exact_xjdtI:
+    case op_update_map_exact_yjdtI:
 	{
 	    int n = unpacked[-1];
 
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index e909a0b4da..07c16e3415 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -206,8 +206,12 @@ void** beam_ops;
 #ifdef DEBUG
 #  /* The stack pointer is used in an assertion. */
 #  define LIGHT_SWAPOUT SWAPOUT
+#  define DEBUG_SWAPOUT SWAPOUT
+#  define DEBUG_SWAPIN  SWAPIN
 #else
 #  define LIGHT_SWAPOUT HEAP_TOP(c_p) = HTOP
+#  define DEBUG_SWAPOUT
+#  define DEBUG_SWAPIN
 #endif
 
 /*
@@ -318,19 +322,19 @@ void** beam_ops;
 
 #define Arg(N)       I[(N)+1]
 
-#define GetR(pos, tr)				\
+#define GetSource(raw, dst)			\
    do {						\
-     tr = Arg(pos);				\
-     switch (loader_tag(tr)) {			\
+     dst = raw;                                 \
+     switch (loader_tag(dst)) {			\
      case LOADER_X_REG:				\
-        tr = x(loader_x_reg_index(tr));		\
+        dst = x(loader_x_reg_index(dst));       \
         break;					\
      case LOADER_Y_REG:				\
-        ASSERT(loader_y_reg_index(tr) >= 1);	\
-        tr = y(loader_y_reg_index(tr));		\
+        ASSERT(loader_y_reg_index(dst) >= 1);	\
+        dst = y(loader_y_reg_index(dst));       \
         break;					\
      }						\
-     CHECK_TERM(tr);				\
+     CHECK_TERM(dst);				\
    } while (0)
 
 #define PUT_TERM_REG(term, desc)		\
@@ -371,44 +375,33 @@ do {                                            \
 
 /*
  * process_main() is already huge, so we want to avoid inlining
- * into it. Especially functions that are seldom used.
+ * seldom used functions into it.
  */
-#ifdef __GNUC__
-#  define NOINLINE __attribute__((__noinline__))
-#else
-#  define NOINLINE
-#endif
-
-
-/*
- * The following functions are called directly by process_main().
- * Don't inline them.
- */
-static void init_emulator_finish(void) NOINLINE;
-static ErtsCodeMFA *ubif2mfa(void* uf) NOINLINE;
-static ErtsCodeMFA *gcbif2mfa(void* gcf) NOINLINE;
+static void init_emulator_finish(void) ERTS_NOINLINE;
+static ErtsCodeMFA *ubif2mfa(void* uf) ERTS_NOINLINE;
 static BeamInstr* handle_error(Process* c_p, BeamInstr* pc,
-			       Eterm* reg, ErtsCodeMFA* bif_mfa) NOINLINE;
+			       Eterm* reg, ErtsCodeMFA* bif_mfa) ERTS_NOINLINE;
 static BeamInstr* call_error_handler(Process* p, ErtsCodeMFA* mfa,
-				     Eterm* reg, Eterm func) NOINLINE;
+				     Eterm* reg, Eterm func) ERTS_NOINLINE;
 static BeamInstr* fixed_apply(Process* p, Eterm* reg, Uint arity,
-			      BeamInstr *I, Uint offs) NOINLINE;
+			      BeamInstr *I, Uint offs) ERTS_NOINLINE;
 static BeamInstr* apply(Process* p, Eterm* reg,
-                        BeamInstr *I, Uint offs) NOINLINE;
+                        BeamInstr *I, Uint offs) ERTS_NOINLINE;
 static BeamInstr* call_fun(Process* p, int arity,
-			   Eterm* reg, Eterm args) NOINLINE;
+			   Eterm* reg, Eterm args) ERTS_NOINLINE;
 static BeamInstr* apply_fun(Process* p, Eterm fun,
-			    Eterm args, Eterm* reg) NOINLINE;
+			    Eterm args, Eterm* reg) ERTS_NOINLINE;
 static Eterm new_fun(Process* p, Eterm* reg,
-		     ErlFunEntry* fe, int num_free) NOINLINE;
+		     ErlFunEntry* fe, int num_free) ERTS_NOINLINE;
+static int is_function2(Eterm Term, Uint arity);
 static Eterm erts_gc_new_map(Process* p, Eterm* reg, Uint live,
-                             Uint n, BeamInstr* ptr) NOINLINE;
+                             Uint n, BeamInstr* ptr) ERTS_NOINLINE;
 static Eterm erts_gc_new_small_map_lit(Process* p, Eterm* reg, Eterm keys_literal,
-                               Uint live, BeamInstr* ptr) NOINLINE;
+                               Uint live, BeamInstr* ptr) ERTS_NOINLINE;
 static Eterm erts_gc_update_map_assoc(Process* p, Eterm* reg, Uint live,
-                              Uint n, BeamInstr* new_p) NOINLINE;
+                              Uint n, BeamInstr* new_p) ERTS_NOINLINE;
 static Eterm erts_gc_update_map_exact(Process* p, Eterm* reg, Uint live,
-                              Uint n, Eterm* new_p) NOINLINE;
+                              Uint n, Eterm* new_p) ERTS_NOINLINE;
 static Eterm get_map_element(Eterm map, Eterm key);
 static Eterm get_map_element_hash(Eterm map, Eterm key, Uint32 hx);
 
@@ -421,6 +414,7 @@ static Eterm add_stacktrace(Process* c_p, Eterm Value, Eterm exc);
 static void save_stacktrace(Process* c_p, BeamInstr* pc, Eterm* reg,
 			    ErtsCodeMFA *bif_mfa, Eterm args);
 static struct StackTrace * get_trace_from_exc(Eterm exc);
+static Eterm *get_freason_ptr_from_exc(Eterm exc);
 static Eterm make_arglist(Process* c_p, Eterm* reg, int a);
 
 void
@@ -881,19 +875,22 @@ void process_main(Eterm * x_reg_array, FloatDef* f_reg_array)
 #include "beam_warm.h"
 
  OpCase(normal_exit): {
-     SWAPOUT;
+     HEAVY_SWAPOUT;
      c_p->freason = EXC_NORMAL;
      c_p->arity = 0; /* In case this process will ever be garbed again. */
      ERTS_UNREQ_PROC_MAIN_LOCK(c_p);
      erts_do_exit_process(c_p, am_normal);
      ERTS_REQ_PROC_MAIN_LOCK(c_p);
+     HEAVY_SWAPIN;
      goto do_schedule;
  }
 
  OpCase(continue_exit): {
+     HEAVY_SWAPOUT;
      ERTS_UNREQ_PROC_MAIN_LOCK(c_p);
      erts_continue_exit_process(c_p);
      ERTS_REQ_PROC_MAIN_LOCK(c_p);
+     HEAVY_SWAPIN;
      goto do_schedule;
  }
 
@@ -1301,18 +1298,6 @@ void erts_dirty_process_main(ErtsSchedulerData *esdp)
 }
 
 static ErtsCodeMFA *
-gcbif2mfa(void* gcf)
-{
-    int i;
-    for (i = 0; erts_gc_bifs[i].bif; i++) {
-	if (erts_gc_bifs[i].gc_bif == gcf)
-	    return &bif_export[erts_gc_bifs[i].exp_ix]->info.mfa;
-    }
-    erts_exit(ERTS_ERROR_EXIT, "bad gc bif");
-    return NULL;
-}
-
-static ErtsCodeMFA *
 ubif2mfa(void* uf)
 {
     int i;
@@ -1320,7 +1305,7 @@ ubif2mfa(void* uf)
 	if (erts_u_bifs[i].bif == uf)
 	    return &bif_export[erts_u_bifs[i].exp_ix]->info.mfa;
     }
-    erts_exit(ERTS_ERROR_EXIT, "bad u bif");
+    erts_exit(ERTS_ERROR_EXIT, "bad u bif: %p\n", uf);
     return NULL;
 }
 
@@ -1484,9 +1469,24 @@ next_catch(Process* c_p, Eterm *reg) {
     BeamInstr i_return_time_trace = beam_return_time_trace[0];
 
     ptr = prev = c_p->stop;
-    ASSERT(is_CP(*ptr));
     ASSERT(ptr <= STACK_START(c_p));
-    if (ptr == STACK_START(c_p)) return NULL;
+
+    /* This function is only called if we have active catch tags or have
+     * previously called a function that was exception-traced. As the exception
+     * trace flag isn't cleared after the traced function returns (and the
+     * catch tag inserted by it is gone), it's possible to land here with an
+     * empty stack, and the process should simply die when that happens. */
+    if (ptr == STACK_START(c_p)) {
+        ASSERT(!active_catches && IS_TRACED_FL(c_p, F_EXCEPTION_TRACE));
+        return NULL;
+    }
+
+    /*
+     * Better safe than sorry here. In debug builds, produce a core
+     * dump if the top of the stack doesn't point to a continuation
+     * pointer. In other builds, ignore a non-CP at the top of stack.
+     */
+    ASSERT(is_CP(*ptr));
     if ((is_not_CP(*ptr) || (*cp_val(*ptr) != i_return_trace &&
 			     *cp_val(*ptr) != i_return_to_trace &&
 			     *cp_val(*ptr) != i_return_time_trace ))
@@ -1903,6 +1903,25 @@ static int is_raised_exc(Eterm exc) {
     }
 }
 
+static Eterm *get_freason_ptr_from_exc(Eterm exc) {
+    static Eterm dummy_freason;
+    struct StackTrace* s;
+
+    if (exc == NIL) {
+        /*
+         * Is is not exactly clear when exc can be NIL. Probably only
+         * when the exception has been generated from native code.
+         * Return a pointer to an Eterm that can be safely written and
+         * ignored.
+         */
+	return &dummy_freason;
+    } else {
+	ASSERT(is_list(exc));
+        s = (struct StackTrace *) big_val(CDR(list_val(exc)));
+        return &s->freason;
+    }
+}
+
 /*
  * Creating a list with the argument registers
  */
@@ -2315,12 +2334,16 @@ fixed_apply(Process* p, Eterm* reg, Uint arity,
     function = reg[arity+1];
 
     if (is_not_atom(function)) {
+        Eterm bad_args;
     error:
-	p->freason = BADARG;
-	reg[0] = module;
-	reg[1] = function;
-	reg[2] = NIL;
-	return 0;
+        bad_args = make_arglist(p, reg, arity);
+
+        p->freason = BADARG;
+        reg[0] = module;
+        reg[1] = function;
+        reg[2] = bad_args;
+
+        return 0;
     }
 
     if (is_not_atom(module)) goto error;
@@ -2671,6 +2694,19 @@ new_fun(Process* p, Eterm* reg, ErlFunEntry* fe, int num_free)
     return make_fun(funp);
 }
 
+static int
+is_function2(Eterm Term, Uint arity)
+{
+    if (is_fun(Term)) {
+	ErlFunThing* funp = (ErlFunThing *) fun_val(Term);
+	return funp->arity == arity;
+    } else if (is_export(Term)) {
+	Export* exp = (Export *) (export_val(Term)[1]);
+	return exp->info.mfa.arity == arity;
+    }
+    return 0;
+}
+
 static Eterm get_map_element(Eterm map, Eterm key)
 {
     Uint32 hx;
@@ -3062,12 +3098,14 @@ erts_gc_update_map_exact(Process* p, Eterm* reg, Uint live, Uint n, Eterm* new_p
     Uint need;
     flatmap_t *old_mp, *mp;
     Eterm res;
+    Eterm* old_hp;
     Eterm* hp;
     Eterm* E;
     Eterm* old_keys;
     Eterm* old_vals;
     Eterm new_key;
     Eterm map;
+    int changed = 0;
 
     n /= 2;		/* Number of values to be updated */
     ASSERT(n > 0);
@@ -3134,6 +3172,7 @@ erts_gc_update_map_exact(Process* p, Eterm* reg, Uint live, Uint n, Eterm* new_p
      * Update map, keeping the old key tuple.
      */
 
+    old_hp = p->htop;
     hp = p->htop;
     E = p->stop;
 
@@ -3156,20 +3195,26 @@ erts_gc_update_map_exact(Process* p, Eterm* reg, Uint live, Uint n, Eterm* new_p
 	    /* Not same keys */
 	    *hp++ = *old_vals;
 	} else {
-	    GET_TERM(new_p[1], *hp);
-	    hp++;
-	    n--;
+            GET_TERM(new_p[1], *hp);
+            if(*hp != *old_vals) changed = 1;
+            hp++;
+            n--;
 	    if (n == 0) {
-		/*
-		 * All updates done. Copy remaining values
-		 * and return the result.
-		 */
-		for (i++, old_vals++; i < num_old; i++) {
-		    *hp++ = *old_vals++;
-		}
-		ASSERT(hp == p->htop + need);
-		p->htop = hp;
-		return res;
+                /*
+                * All updates done. Copy remaining values
+                * if any changed or return the original one.
+                */
+                if(changed) {
+		    for (i++, old_vals++; i < num_old; i++) {
+		        *hp++ = *old_vals++;
+		    }
+		    ASSERT(hp == p->htop + need);
+		    p->htop = hp;
+		    return res;
+                } else {
+                    p->htop = old_hp;
+                    return map;
+                }
 	    } else {
 		new_p += 2;
 		GET_TERM(*new_p, new_key);
@@ -3231,20 +3276,23 @@ erts_is_builtin(Eterm Mod, Eterm Name, int arity)
 
 
 /*
- * Return the current number of reductions for the given process.
+ * Return the current number of reductions consumed by the given process.
  * To get the total number of reductions, p->reds must be added.
  */
 
 Uint
-erts_current_reductions(Process *current, Process *p)
+erts_current_reductions(Process *c_p, Process *p)
 {
-    if (current != p) {
+    Sint reds_left;
+    if (c_p != p || !(erts_atomic32_read_nob(&c_p->state)
+                      & ERTS_PSFLG_RUNNING)) {
 	return 0;
-    } else if (current->fcalls < 0 && ERTS_PROC_GET_SAVED_CALLS_BUF(current)) {
-	return current->fcalls + CONTEXT_REDS;
+    } else if (c_p->fcalls < 0 && ERTS_PROC_GET_SAVED_CALLS_BUF(c_p)) {
+	reds_left = c_p->fcalls + CONTEXT_REDS;
     } else {
-	return REDS_IN(current) - current->fcalls;
+        reds_left = c_p->fcalls;
     }
+    return REDS_IN(c_p) - reds_left - erts_proc_sched_data(p)->virtual_reds;
 }
 
 int
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c
index e61199a8fd..35f2ea6688 100644
--- a/erts/emulator/beam/beam_load.c
+++ b/erts/emulator/beam/beam_load.c
@@ -492,6 +492,11 @@ typedef struct LoaderState {
 			   (Genop)->arity * sizeof(GenOpArg)); \
   } while (0)
 
+#define GENOP_NAME_ARITY(Genop, Name, Arity)    \
+  do {                                          \
+    (Genop)->op = genop_##Name##_##Arity;       \
+    (Genop)->arity = Arity;                     \
+  } while (0)
 
 static void free_loader_state(Binary* magic);
 static ErlHeapFragment* new_literal_fragment(Uint size);
@@ -1425,7 +1430,7 @@ load_atom_table(LoaderState* stp, ErtsAtomEncoding enc)
 	ap = atom_tab(atom_val(stp->atom[1]));
 	sys_memcpy(sbuf, ap->name, ap->len);
 	sbuf[ap->len] = '\0';
-	LoadError1(stp, "module name in object code is %s", sbuf);
+	LoadError1(stp, "BEAM file exists but it defines a module named %s", sbuf);
     }
 
     return 1;
@@ -2868,6 +2873,7 @@ load_code(LoaderState* stp)
 	    break;
 	case op_bs_put_string_WW:
 	case op_i_bs_match_string_xfWW:
+	case op_i_bs_match_string_yfWW:
 	    new_string_patch(stp, ci-1);
 	    break;
 
@@ -2969,6 +2975,8 @@ load_code(LoaderState* stp)
 #define succ(St, X, Y) ((X).type == (Y).type && (X).val + 1 == (Y).val)
 #define succ2(St, X, Y) ((X).type == (Y).type && (X).val + 2 == (Y).val)
 #define succ3(St, X, Y) ((X).type == (Y).type && (X).val + 3 == (Y).val)
+#define succ4(St, X, Y) ((X).type == (Y).type && (X).val + 4 == (Y).val)
+
 
 #ifdef NO_FPE_SIGNALS 
 #define no_fpe_signals(St) 1
@@ -2985,6 +2993,35 @@ compiled_with_otp_20_or_higher(LoaderState* stp)
 }
 
 /*
+ * Predicate that tests whether the following two moves are independent:
+ *
+ *    move Src1 Dst1
+ *    move Src2 Dst2
+ *
+ */
+static int
+independent_moves(LoaderState* stp, GenOpArg Src1, GenOpArg Dst1,
+                  GenOpArg Src2, GenOpArg Dst2)
+{
+    return (Src1.type != Dst2.type || Src1.val != Dst2.val) &&
+        (Src2.type != Dst1.type || Src2.val != Dst1.val) &&
+        (Dst1.type != Dst2.type ||Dst1.val != Dst2.val);
+}
+
+/*
+ * Predicate that tests that two registers are distinct.
+ *
+ *    move Src1 Dst1
+ *    move Src2 Dst2
+ *
+ */
+static int
+distinct(LoaderState* stp, GenOpArg Reg1, GenOpArg Reg2)
+{
+    return Reg1.type != Reg2.type || Reg1.val != Reg2.val;
+}
+
+/*
  * Predicate that tests whether a jump table can be used.
  */
 
@@ -3108,6 +3145,42 @@ is_killed(LoaderState* stp, GenOpArg Reg, GenOpArg Live)
 	Live.val <= Reg.val;
 }
 
+static int
+is_killed_by_call_fun(LoaderState* stp, GenOpArg Reg, GenOpArg Live)
+{
+    return Reg.type == TAG_x && Live.type == TAG_u &&
+	Live.val+1 <= Reg.val;
+}
+
+/*
+ * Test whether register Reg is killed by make_fun instruction that
+ * creates the fun given by index idx.
+ */
+
+static int
+is_killed_by_make_fun(LoaderState* stp, GenOpArg Reg, GenOpArg idx)
+{
+    Uint num_free;
+
+    if (idx.val >= stp->num_lambdas) {
+        /* Invalid index. Ignore the error for now. */
+        return 0;
+    } else {
+        num_free = stp->lambdas[idx.val].num_free;
+        return Reg.type == TAG_x && num_free <= Reg.val;
+    }
+}
+
+/*
+ * Test whether register Reg is killed by the send instruction that follows.
+ */
+
+static int
+is_killed_by_send(LoaderState* stp, GenOpArg Reg)
+{
+    return Reg.type == TAG_x && 2 <= Reg.val;
+}
+
 /*
  * Generate an instruction for element/2.
  */
@@ -3119,20 +3192,19 @@ gen_element(LoaderState* stp, GenOpArg Fail, GenOpArg Index,
     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;
+	GENOP_NAME_ARITY(op, 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;
+        GENOP_NAME_ARITY(op, i_element, 4);
 	op->a[0] = Tuple;
 	op->a[1] = Fail;
 	op->a[2] = Index;
@@ -3148,8 +3220,7 @@ gen_bs_save(LoaderState* stp, GenOpArg Reg, GenOpArg Index)
     GenOp* op;
 
     NEW_GENOP(stp, op);
-    op->op = genop_i_bs_save2_2;
-    op->arity = 2;
+    GENOP_NAME_ARITY(op, i_bs_save2, 2);
     op->a[0] = Reg;
     op->a[1] = Index;
     if (Index.type == TAG_u) {
@@ -3168,8 +3239,7 @@ gen_bs_restore(LoaderState* stp, GenOpArg Reg, GenOpArg Index)
     GenOp* op;
 
     NEW_GENOP(stp, op);
-    op->op = genop_i_bs_restore2_2;
-    op->arity = 2;
+    GENOP_NAME_ARITY(op, i_bs_restore2, 2);
     op->a[0] = Reg;
     op->a[1] = Index;
     if (Index.type == TAG_u) {
@@ -3203,21 +3273,18 @@ gen_get_integer2(LoaderState* stp, GenOpArg Fail, GenOpArg Ms, GenOpArg Live,
 	} else if ((Flags.val & BSF_SIGNED) != 0) {
 	    goto generic;
 	} else if (bits == 8) {
-	    op->op = genop_i_bs_get_integer_8_3;
-	    op->arity = 3;
-	    op->a[0] = Ms;
+	    GENOP_NAME_ARITY(op, i_bs_get_integer_8, 3);
+            op->a[0] = Ms;
 	    op->a[1] = Fail;
 	    op->a[2] = Dst;
 	} else if (bits == 16 && (Flags.val & BSF_LITTLE) == 0) {
-	    op->op = genop_i_bs_get_integer_16_3;
-	    op->arity = 3;
+	    GENOP_NAME_ARITY(op, i_bs_get_integer_16, 3);
 	    op->a[0] = Ms;
 	    op->a[1] = Fail;
 	    op->a[2] = Dst;
 #ifdef ARCH_64
 	} else if (bits == 32 && (Flags.val & BSF_LITTLE) == 0) {
-	    op->op = genop_i_bs_get_integer_32_3;
-	    op->arity = 3;
+	    GENOP_NAME_ARITY(op, i_bs_get_integer_32, 3);
 	    op->a[0] = Ms;
 	    op->a[1] = Fail;
 	    op->a[2] = Dst;
@@ -3225,8 +3292,7 @@ gen_get_integer2(LoaderState* stp, GenOpArg Fail, GenOpArg Ms, GenOpArg Live,
 	} else {
 	generic:
 	    if (bits < SMALL_BITS) {
-		op->op = genop_i_bs_get_integer_small_imm_5;
-		op->arity = 5;
+		GENOP_NAME_ARITY(op, i_bs_get_integer_small_imm, 5);
 		op->a[0] = Ms;
 		op->a[1].type = TAG_u;
 		op->a[1].val = bits;
@@ -3234,8 +3300,7 @@ gen_get_integer2(LoaderState* stp, GenOpArg Fail, GenOpArg Ms, GenOpArg Live,
 		op->a[3] = Flags;
 		op->a[4] = Dst;
 	    } else {
-		op->op = genop_i_bs_get_integer_imm_6;
-		op->arity = 6;
+		GENOP_NAME_ARITY(op, i_bs_get_integer_imm, 6);
 		op->a[0] = Ms;
 		op->a[1].type = TAG_u;
 		op->a[1].val = bits;
@@ -3251,8 +3316,7 @@ gen_get_integer2(LoaderState* stp, GenOpArg Fail, GenOpArg Ms, GenOpArg Live,
 
 	if (!term_to_Uint(big, &bigval)) {
 	error:
-	    op->op = genop_jump_1;
-	    op->arity = 1;
+	    GENOP_NAME_ARITY(op, jump, 1);
 	    op->a[0] = Fail;
 	} else {
 	    if (!safe_mul(bigval, Unit.val, &bits)) {
@@ -3261,13 +3325,12 @@ gen_get_integer2(LoaderState* stp, GenOpArg Fail, GenOpArg Ms, GenOpArg Live,
 	    goto generic;
 	}
     } else {
-	op->op = genop_i_bs_get_integer_6;
-	op->arity = 6;
-	op->a[0] = Fail;
-	op->a[1] = Live;
-	op->a[2].type = TAG_u;
-	op->a[2].val = (Unit.val << 3) | Flags.val;
-	op->a[3] = Ms;
+	GENOP_NAME_ARITY(op, i_bs_get_integer, 6);
+	op->a[0] = Ms;
+	op->a[1] = Fail;
+	op->a[2] = Live;
+	op->a[3].type = TAG_u;
+	op->a[3].val = (Unit.val << 3) | Flags.val;
 	op->a[4] = Size;
 	op->a[5] = Dst;
 	op->next = NULL;
@@ -3291,26 +3354,16 @@ gen_get_binary2(LoaderState* stp, GenOpArg Fail, GenOpArg Ms, GenOpArg Live,
 
     NATIVE_ENDIAN(Flags);
     if (Size.type == TAG_a && Size.val == am_all) {
-	if (Ms.type == Dst.type && Ms.val == Dst.val) {
-	    op->op = genop_i_bs_get_binary_all_reuse_3;
-	    op->arity = 3;
-	    op->a[0] = Ms;
-	    op->a[1] = Fail;
-	    op->a[2] = Unit;
-	} else {
-	    op->op = genop_i_bs_get_binary_all2_5;
-	    op->arity = 5;
-	    op->a[0] = Fail;
-	    op->a[1] = Ms;
-	    op->a[2] = Live;	
-	    op->a[3] = Unit;
-	    op->a[4] = Dst;
-	}
+	GENOP_NAME_ARITY(op, i_bs_get_binary_all2, 5);
+	op->a[0] = Ms;
+	op->a[1] = Fail;
+	op->a[2] = Live;
+	op->a[3] = Unit;
+	op->a[4] = Dst;
     } else if (Size.type == TAG_i) {
-	op->op = genop_i_bs_get_binary_imm2_6;
-	op->arity = 6;
-	op->a[0] = Fail;
-	op->a[1] = Ms;
+	GENOP_NAME_ARITY(op, i_bs_get_binary_imm2, 6);
+	op->a[0] = Ms;
+	op->a[1] = Fail;
 	op->a[2] = Live;
 	op->a[3].type = TAG_u;
 	if (!safe_mul(Size.val, Unit.val, &op->a[3].val)) {
@@ -3324,14 +3377,12 @@ gen_get_binary2(LoaderState* stp, GenOpArg Fail, GenOpArg Ms, GenOpArg Live,
 
 	if (!term_to_Uint(big, &bigval)) {
 	error:
-	    op->op = genop_jump_1;
-	    op->arity = 1;
+	    GENOP_NAME_ARITY(op, jump, 1);
 	    op->a[0] = Fail;
 	} else {
-	    op->op = genop_i_bs_get_binary_imm2_6;
-	    op->arity = 6;
-	    op->a[0] = Fail;
-	    op->a[1] = Ms;
+	    GENOP_NAME_ARITY(op, i_bs_get_binary_imm2, 6);
+	    op->a[0] = Ms;
+	    op->a[1] = Fail;
 	    op->a[2] = Live;
 	    op->a[3].type = TAG_u;
 	    if (!safe_mul(bigval, Unit.val, &op->a[3].val)) {
@@ -3341,10 +3392,9 @@ gen_get_binary2(LoaderState* stp, GenOpArg Fail, GenOpArg Ms, GenOpArg Live,
 	    op->a[5] = Dst;
 	}
     } else {
-	op->op = genop_i_bs_get_binary2_6;
-	op->arity = 6;
-	op->a[0] = Fail;
-	op->a[1] = Ms;
+	GENOP_NAME_ARITY(op, i_bs_get_binary2, 6);
+	op->a[0] = Ms;
+	op->a[1] = Fail;
 	op->a[2] = Live;
 	op->a[3] = Size;
 	op->a[4].type = TAG_u;
@@ -3375,26 +3425,44 @@ gen_put_binary(LoaderState* stp, GenOpArg Fail,GenOpArg Size,
 
     NATIVE_ENDIAN(Flags);
     if (Size.type == TAG_a && Size.val == am_all) {
-	op->op = genop_i_new_bs_put_binary_all_3;
-	op->arity = 3;
-	op->a[0] = Fail;
-	op->a[1] = Src;
+	GENOP_NAME_ARITY(op, i_new_bs_put_binary_all, 3);
+	op->a[0] = Src;
+	op->a[1] = Fail;
 	op->a[2] = Unit;
     } else if (Size.type == TAG_i) {
-	op->op = genop_i_new_bs_put_binary_imm_3;
-	op->arity = 3;
+	GENOP_NAME_ARITY(op, i_new_bs_put_binary_imm, 3);
 	op->a[0] = Fail;
 	op->a[1].type = TAG_u;
 	if (safe_mul(Size.val, Unit.val, &op->a[1].val)) {
 	    op->a[2] = Src;
 	} else {
-	    op->op = genop_badarg_1;
-	    op->arity = 1;
+        error:
+            GENOP_NAME_ARITY(op, badarg, 1);
 	    op->a[0] = Fail;
 	}
+    } else if (Size.type == TAG_q) {
+#ifdef ARCH_64
+        /*
+         * There is no way that this binary would fit in memory.
+         */
+        goto error;
+#else
+	Eterm big = stp->literals[Size.val].term;
+	Uint bigval;
+        Uint size;
+
+	if (!term_to_Uint(big, &bigval) ||
+            !safe_mul(bigval, Unit.val, &size)) {
+	    goto error;
+	}
+        GENOP_NAME_ARITY(op, i_new_bs_put_binary_imm, 3);
+        op->a[0] = Fail;
+        op->a[1].type = TAG_u;
+        op->a[1].val = size;
+        op->a[2] = Src;
+#endif
     } else {
-	op->op = genop_i_new_bs_put_binary_4;
-	op->arity = 4;
+	GENOP_NAME_ARITY(op, i_new_bs_put_binary, 4);
 	op->a[0] = Fail;
 	op->a[1] = Size;
 	op->a[2].type = TAG_u;
@@ -3416,41 +3484,39 @@ gen_put_integer(LoaderState* stp, GenOpArg Fail, GenOpArg Size,
     NATIVE_ENDIAN(Flags);
 	/* Negative size must fail */
     if (Size.type == TAG_i) {
-	op->op = genop_i_new_bs_put_integer_imm_4;
-	op->arity = 4;
-	op->a[0] = Fail;
-	op->a[1].type = TAG_u;
-	if (!safe_mul(Size.val, Unit.val, &op->a[1].val)) {
+        Uint size;
+	if (!safe_mul(Size.val, Unit.val, &size)) {
         error:
-            op->op = genop_badarg_1;
-            op->arity = 1;
+            GENOP_NAME_ARITY(op, badarg, 1);
             op->a[0] = Fail;
             op->next = NULL;
             return op;
 	}
-	op->a[1].val = Size.val * Unit.val;
-	op->a[2].type = Flags.type;
-	op->a[2].val = (Flags.val & 7);
-	op->a[3] = Src;
+	GENOP_NAME_ARITY(op, i_new_bs_put_integer_imm, 4);
+	op->a[0] = Src;
+	op->a[1] = Fail;
+	op->a[2].type = TAG_u;
+	op->a[2].val = size;
+	op->a[3].type = Flags.type;
+	op->a[3].val = (Flags.val & 7);
     } else if (Size.type == TAG_q) {
 	Eterm big = stp->literals[Size.val].term;
 	Uint bigval;
+        Uint size;
 
-	if (!term_to_Uint(big, &bigval)) {
+	if (!term_to_Uint(big, &bigval) ||
+            !safe_mul(bigval, Unit.val, &size)) {
 	    goto error;
-	} else {
-	    op->op = genop_i_new_bs_put_integer_imm_4;
-	    op->arity = 4;
-	    op->a[0] = Fail;
-	    op->a[1].type = TAG_u;
-	    op->a[1].val = bigval * Unit.val;
-	    op->a[2].type = Flags.type;
-	    op->a[2].val = (Flags.val & 7);
-	    op->a[3] = Src;
 	}
+	GENOP_NAME_ARITY(op, i_new_bs_put_integer_imm, 4);
+	op->a[0] = Src;
+	op->a[1] = Fail;
+	op->a[2].type = TAG_u;
+	op->a[2].val = size;
+	op->a[3].type = Flags.type;
+	op->a[3].val = (Flags.val & 7);
     } else {
-	op->op = genop_i_new_bs_put_integer_4;
-	op->arity = 4;
+	GENOP_NAME_ARITY(op, i_new_bs_put_integer, 4);
 	op->a[0] = Fail;
 	op->a[1] = Size;
 	op->a[2].type = TAG_u;
@@ -3470,21 +3536,18 @@ gen_put_float(LoaderState* stp, GenOpArg Fail, GenOpArg Size,
 
     NATIVE_ENDIAN(Flags);
     if (Size.type == TAG_i) {
-	op->op = genop_i_new_bs_put_float_imm_4;
-	op->arity = 4;
+	GENOP_NAME_ARITY(op, i_new_bs_put_float_imm, 4);
 	op->a[0] = Fail;
 	op->a[1].type = TAG_u;
 	if (!safe_mul(Size.val, Unit.val, &op->a[1].val)) {
-	    op->op = genop_badarg_1;
-	    op->arity = 1;
+	    GENOP_NAME_ARITY(op, badarg, 1);
 	    op->a[0] = Fail;
 	} else {
 	    op->a[2] = Flags;
 	    op->a[3] = Src;
 	}
     } else {
-	op->op = genop_i_new_bs_put_float_4;
-	op->arity = 4;
+	GENOP_NAME_ARITY(op, i_new_bs_put_float, 4);
 	op->a[0] = Fail;
 	op->a[1] = Size;
 	op->a[2].type = TAG_u;
@@ -3507,10 +3570,9 @@ gen_get_float2(LoaderState* stp, GenOpArg Fail, GenOpArg Ms, GenOpArg Live,
     NEW_GENOP(stp, op);
 
     NATIVE_ENDIAN(Flags);
-    op->op = genop_i_bs_get_float2_6;
-    op->arity = 6;
-    op->a[0] = Fail;
-    op->a[1] = Ms;
+    GENOP_NAME_ARITY(op, i_bs_get_float2, 6);
+    op->a[0] = Ms;
+    op->a[1] = Fail;
     op->a[2] = Live;
     op->a[3] = Size;
     op->a[4].type = TAG_u;
@@ -3525,7 +3587,7 @@ gen_get_float2(LoaderState* stp, GenOpArg Fail, GenOpArg Ms, GenOpArg Live,
  */
 
 static GenOp*
-gen_skip_bits2(LoaderState* stp, GenOpArg Fail, GenOpArg Ms, 
+gen_skip_bits2(LoaderState* stp, GenOpArg Fail, GenOpArg Ms,
 	       GenOpArg Size, GenOpArg Unit, GenOpArg Flags)
 {
     GenOp* op;
@@ -3533,16 +3595,26 @@ gen_skip_bits2(LoaderState* stp, GenOpArg Fail, GenOpArg Ms,
     NATIVE_ENDIAN(Flags);
     NEW_GENOP(stp, op);
     if (Size.type == TAG_a && Size.val == am_all) {
-	op->op = genop_i_bs_skip_bits_all2_3;
-	op->arity = 3;
+        /*
+         * This kind of skip instruction will only be found in modules
+         * compiled before OTP 19. From OTP 19, the compiler generates
+         * a test_unit instruction of a bs_skip at the end of a
+         * binary.
+         *
+         * It is safe to replace the skip instruction with a test_unit
+         * instruction, because the position will never be used again.
+         * If the match context itself is used again, it will be used by
+         * a bs_restore2 instruction which will overwrite the position
+         * by one of the stored positions.
+         */
+	GENOP_NAME_ARITY(op, bs_test_unit, 3);
 	op->a[0] = Fail;
-	op->a[1] = Ms; 
+	op->a[1] = Ms;
 	op->a[2] = Unit;
     } else if (Size.type == TAG_i) {
-	op->op = genop_i_bs_skip_bits_imm2_3;
-	op->arity = 3;
+	GENOP_NAME_ARITY(op, i_bs_skip_bits_imm2, 3);
 	op->a[0] = Fail;
-	op->a[1] = Ms; 
+	op->a[1] = Ms;
 	op->a[2].type = TAG_u;
 	if (!safe_mul(Size.val, Unit.val, &op->a[2].val)) {
 	    goto error;
@@ -3553,25 +3625,22 @@ gen_skip_bits2(LoaderState* stp, GenOpArg Fail, GenOpArg Ms,
 
 	if (!term_to_Uint(big, &bigval)) {
 	error:
-	    op->op = genop_jump_1;
-	    op->arity = 1;
+	    GENOP_NAME_ARITY(op, jump, 1);
 	    op->a[0] = Fail;
 	} else {
-	    op->op = genop_i_bs_skip_bits_imm2_3;
-	    op->arity = 3;
+	    GENOP_NAME_ARITY(op, i_bs_skip_bits_imm2, 3);
 	    op->a[0] = Fail;
-	    op->a[1] = Ms; 
+	    op->a[1] = Ms;
 	    op->a[2].type = TAG_u;
 	    if (!safe_mul(bigval, Unit.val, &op->a[2].val)) {
 		goto error;
 	    }
 	}
     } else {
-	op->op = genop_i_bs_skip_bits2_4;
-	op->arity = 4;
-	op->a[0] = Fail;
-	op->a[1] = Ms; 
-	op->a[2] = Size;
+	GENOP_NAME_ARITY(op, i_bs_skip_bits2, 4);
+	op->a[0] = Ms;
+	op->a[1] = Size;
+	op->a[2] = Fail;
 	op->a[3] = Unit;
     }
     op->next = NULL;
@@ -3579,38 +3648,52 @@ gen_skip_bits2(LoaderState* stp, GenOpArg Fail, GenOpArg Ms,
 }
 
 static GenOp*
-gen_increment(LoaderState* stp, GenOpArg Reg, GenOpArg Integer,
-	      GenOpArg Live, GenOpArg Dst)
+gen_increment(LoaderState* stp, GenOpArg Reg,
+              GenOpArg Integer, GenOpArg Dst)
 {
     GenOp* op;
 
     NEW_GENOP(stp, op);
-    op->op = genop_i_increment_4;
-    op->arity = 4;
+    GENOP_NAME_ARITY(op, i_increment, 3);
     op->next = NULL;
     op->a[0] = Reg;
     op->a[1].type = TAG_u;
     op->a[1].val = Integer.val;
-    op->a[2] = Live;
-    op->a[3] = Dst;
+    op->a[2] = Dst;
     return op;
 }
 
 static GenOp*
-gen_increment_from_minus(LoaderState* stp, GenOpArg Reg, GenOpArg Integer,
-			 GenOpArg Live, GenOpArg Dst)
+gen_increment_from_minus(LoaderState* stp, GenOpArg Reg,
+                         GenOpArg Integer, GenOpArg Dst)
 {
     GenOp* op;
 
     NEW_GENOP(stp, op);
-    op->op = genop_i_increment_4;
-    op->arity = 4;
+    GENOP_NAME_ARITY(op, i_increment, 3);
     op->next = NULL;
     op->a[0] = Reg;
     op->a[1].type = TAG_u;
     op->a[1].val = -Integer.val;
-    op->a[2] = Live;
-    op->a[3] = Dst;
+    op->a[2] = Dst;
+    return op;
+}
+
+static GenOp*
+gen_plus_from_minus(LoaderState* stp, GenOpArg Fail, GenOpArg Live,
+                    GenOpArg Src, GenOpArg Integer, GenOpArg Dst)
+{
+    GenOp* op;
+
+    NEW_GENOP(stp, op);
+    GENOP_NAME_ARITY(op, gen_plus, 5);
+    op->next = NULL;
+    op->a[0] = Fail;
+    op->a[1] = Live;
+    op->a[2] = Src;
+    op->a[3].type = TAG_i;
+    op->a[3].val = -Integer.val;
+    op->a[4] = Dst;
     return op;
 }
 
@@ -3660,12 +3743,11 @@ gen_literal_timeout(LoaderState* stp, GenOpArg Fail, GenOpArg Time)
     Sint timeout;
 
     NEW_GENOP(stp, op);
-    op->op = genop_wait_timeout_unlocked_int_2;
+    GENOP_NAME_ARITY(op, wait_timeout_unlocked_int, 2);
     op->next = NULL;
-    op->arity = 2;
     op->a[0].type = TAG_u;
     op->a[1] = Fail;
-    
+
     if (Time.type == TAG_i && (timeout = Time.val) >= 0 &&
 #if defined(ARCH_64)
 	(timeout >> 32) == 0
@@ -3694,8 +3776,7 @@ gen_literal_timeout(LoaderState* stp, GenOpArg Fail, GenOpArg Time)
 #if !defined(ARCH_64)
     error:
 #endif
-	op->op = genop_i_wait_error_0;
-	op->arity = 0;
+	GENOP_NAME_ARITY(op, i_wait_error, 0);
     }
     return op;
 }
@@ -3707,9 +3788,8 @@ gen_literal_timeout_locked(LoaderState* stp, GenOpArg Fail, GenOpArg Time)
     Sint timeout;
 
     NEW_GENOP(stp, op);
-    op->op = genop_wait_timeout_locked_int_2;
+    GENOP_NAME_ARITY(op, wait_timeout_locked_int, 2);
     op->next = NULL;
-    op->arity = 2;
     op->a[0].type = TAG_u;
     op->a[1] = Fail;
 
@@ -3741,8 +3821,7 @@ gen_literal_timeout_locked(LoaderState* stp, GenOpArg Fail, GenOpArg Time)
 #if !defined(ARCH_64)
     error:
 #endif
-	op->op = genop_i_wait_error_locked_0;
-	op->arity = 0;
+        GENOP_NAME_ARITY(op, i_wait_error_locked, 0);
     }
     return op;
 }
@@ -3779,9 +3858,9 @@ gen_select_tuple_arity(LoaderState* stp, GenOpArg S, GenOpArg Fail,
      */
     if (size == 2) {
 	NEW_GENOP(stp, op);
-	op->next = NULL;
-	op->op = genop_i_select_tuple_arity2_4;
+	GENOP_NAME_ARITY(op, i_select_tuple_arity2, 4);
 	GENOP_ARITY(op, arity - 1);
+	op->next = NULL;
 	op->a[0] = S;
 	op->a[1] = Fail;
 	op->a[2].type = TAG_u;
@@ -3807,9 +3886,9 @@ gen_select_tuple_arity(LoaderState* stp, GenOpArg S, GenOpArg Fail,
     size  += align;
 
     NEW_GENOP(stp, op);
-    op->next = NULL;
-    op->op = genop_i_select_tuple_arity_3;
+    GENOP_NAME_ARITY(op, i_select_tuple_arity, 3);
     GENOP_ARITY(op, arity);
+    op->next = NULL;
     op->a[0] = S;
     op->a[1] = Fail;
     op->a[2].type = TAG_u;
@@ -3865,21 +3944,18 @@ gen_split_values(LoaderState* stp, GenOpArg S, GenOpArg TypeFail,
     ASSERT(Size.val >= 2 && Size.val % 2 == 0);
 
     NEW_GENOP(stp, is_integer);
-    is_integer->op = genop_is_integer_2;
-    is_integer->arity = 2;
+    GENOP_NAME_ARITY(is_integer, is_integer, 2);
     is_integer->a[0] = TypeFail;
     is_integer->a[1] = S;
 
     NEW_GENOP(stp, label);
-    label->op = genop_label_1;
-    label->arity = 1;
+    GENOP_NAME_ARITY(label, label, 1);
     label->a[0].type = TAG_u;
     label->a[0].val = new_label(stp);
 
     NEW_GENOP(stp, op1);
-    op1->op = genop_select_val_3;
+    GENOP_NAME_ARITY(op1, select_val, 3);
     GENOP_ARITY(op1, 3 + Size.val);
-    op1->arity = 3;
     op1->a[0] = S;
     op1->a[1].type = TAG_f;
     op1->a[1].val = label->a[0].val;
@@ -3887,9 +3963,8 @@ gen_split_values(LoaderState* stp, GenOpArg S, GenOpArg TypeFail,
     op1->a[2].val = 0;
 
     NEW_GENOP(stp, op2);
-    op2->op = genop_select_val_3;
+    GENOP_NAME_ARITY(op2, select_val, 3);
     GENOP_ARITY(op2, 3 + Size.val);
-    op2->arity = 3;
     op2->a[0] = S;
     op2->a[1] = Fail;
     op2->a[2].type = TAG_u;
@@ -3967,19 +4042,17 @@ gen_jump_tab(LoaderState* stp, GenOpArg S, GenOpArg Fail, GenOpArg Size, GenOpAr
 	GenOp* jump;
 
 	NEW_GENOP(stp, op);
-	op->arity = 3;
-	op->op = genop_is_ne_exact_3;
+	GENOP_NAME_ARITY(op, is_ne_exact, 3);
 	op->a[0] = Rest[1];
 	op->a[1] = S;
 	op->a[2] = Rest[0];
 
 	NEW_GENOP(stp, jump);
-	jump->next = NULL;
-	jump->arity = 1;
-	jump->op = genop_jump_1;
+        GENOP_NAME_ARITY(jump, jump, 1);
 	jump->a[0] = Fail;
 
 	op->next = jump;
+	jump->next = NULL;
 	return op;
     }
 
@@ -4006,12 +4079,11 @@ gen_jump_tab(LoaderState* stp, GenOpArg S, GenOpArg Fail, GenOpArg Size, GenOpAr
     NEW_GENOP(stp, op);
     op->next = NULL;
     if (min == 0) {
-	op->op = genop_i_jump_on_val_zero_3;
-	fixed_args = 3;
+	GENOP_NAME_ARITY(op, i_jump_on_val_zero, 3);
     } else {
-	op->op = genop_i_jump_on_val_4;
-	fixed_args = 4;
+	GENOP_NAME_ARITY(op, i_jump_on_val, 4);
     }
+    fixed_args = op->arity;
     arity = fixed_args + size;
     GENOP_ARITY(op, arity);
     op->a[0] = S;
@@ -4076,7 +4148,7 @@ gen_select_val(LoaderState* stp, GenOpArg S, GenOpArg Fail,
 
 	NEW_GENOP(stp, op);
 	op->next = NULL;
-	op->op = genop_i_select_val2_4;
+        GENOP_NAME_ARITY(op, i_select_val2, 4);
 	GENOP_ARITY(op, arity - 1);
 	op->a[0] = S;
 	op->a[1] = Fail;
@@ -4098,7 +4170,11 @@ gen_select_val(LoaderState* stp, GenOpArg S, GenOpArg Fail,
 
     NEW_GENOP(stp, op);
     op->next = NULL;
-    op->op = (align == 0) ? genop_i_select_val_bins_3 : genop_i_select_val_lins_3;
+    if (align == 0) {
+        GENOP_NAME_ARITY(op, i_select_val_bins, 3);
+    } else {
+        GENOP_NAME_ARITY(op, i_select_val_lins, 3);
+    }
     GENOP_ARITY(op, arity);
     op->a[0] = S;
     op->a[1] = Fail;
@@ -4162,8 +4238,7 @@ gen_select_literals(LoaderState* stp, GenOpArg S, GenOpArg Fail,
 	ASSERT(Rest[i].type == TAG_q);
 
 	NEW_GENOP(stp, op);
-	op->op = genop_is_ne_exact_3;
-	op->arity = 3;
+	GENOP_NAME_ARITY(op, is_ne_exact, 3);
 	op->a[0] = Rest[i+1];
 	op->a[1] = S;
 	op->a[2] = Rest[i];
@@ -4172,9 +4247,8 @@ gen_select_literals(LoaderState* stp, GenOpArg S, GenOpArg Fail,
     }
 
     NEW_GENOP(stp, jump);
+    GENOP_NAME_ARITY(jump, jump, 1);
     jump->next = NULL;
-    jump->op = genop_jump_1;
-    jump->arity = 1;
     jump->a[0] = Fail;
     *prev_next = jump;
     return op;
@@ -4196,9 +4270,8 @@ const_select_val(LoaderState* stp, GenOpArg S, GenOpArg Fail,
     ASSERT(Size.type == TAG_u);
 
     NEW_GENOP(stp, op);
+    GENOP_NAME_ARITY(op, jump, 1);
     op->next = NULL;
-    op->op = genop_jump_1;
-    op->arity = 1;
 
     /*
      * Search for a literal matching the controlling expression.
@@ -4245,115 +4318,120 @@ gen_make_fun2(LoaderState* stp, GenOpArg idx)
 {
     ErlFunEntry* fe;
     GenOp* op;
+    Uint arity, num_free;
 
     if (idx.val >= stp->num_lambdas) {
-	stp->lambda_error = "missing or short chunk 'FunT'";
-	fe = 0;
+        stp->lambda_error = "missing or short chunk 'FunT'";
+        fe = 0;
+        num_free = 0;
+        arity = 0;
     } else {
-	fe = stp->lambdas[idx.val].fe;
+        fe = stp->lambdas[idx.val].fe;
+        num_free = stp->lambdas[idx.val].num_free;
+        arity = fe->arity;
     }
 
     NEW_GENOP(stp, op);
-    op->op = genop_i_make_fun_2;
-    op->arity = 2;
-    op->a[0].type = TAG_u;
-    op->a[0].val = (BeamInstr) fe;
-    op->a[1].type = TAG_u;
-    op->a[1].val = stp->lambdas[idx.val].num_free;
-    op->next = NULL;
-    return op;
-}
 
-static GenOp*
-translate_gc_bif(LoaderState* stp, GenOp* op, GenOpArg Bif)
-{
-    const ErtsGcBif* p;
-    BifFunction bf;
-
-    bf = stp->import[Bif.val].bf;
-    for (p = erts_gc_bifs; p->bif != 0; p++) {
-	if (p->bif == bf) {
-	    op->a[1].type = TAG_u;
-	    op->a[1].val = (BeamInstr) p->gc_bif;
-	    return op;
-	}
+    /*
+     * It's possible this is called before init process is started,
+     * skip the optimisation in such case.
+     */
+    if (num_free == 0 && erts_init_process_id != ERTS_INVALID_PID) {
+        Uint lit;
+        Eterm* hp;
+        ErlFunThing* funp;
+
+        lit = new_literal(stp, &hp, ERL_FUN_SIZE);
+        funp = (ErlFunThing *) hp;
+        erts_refc_inc(&fe->refc, 2);
+        funp->thing_word = HEADER_FUN;
+        funp->next = NULL;
+        funp->fe = fe;
+        funp->num_free = 0;
+        funp->creator = erts_init_process_id;
+        funp->arity = arity;
+
+        /*
+         * Use a move_fun/2 instruction to load the fun to enable
+         * further optimizations.
+         */
+        GENOP_NAME_ARITY(op, move_fun, 2);
+        op->a[0].type = TAG_q;
+        op->a[0].val = lit;
+        op->a[1].type = TAG_x;
+        op->a[1].val = 0;
+    } else {
+        GENOP_NAME_ARITY(op, i_make_fun, 2);
+        op->a[0].type = TAG_u;
+        op->a[0].val = (BeamInstr) fe;
+        op->a[1].type = TAG_u;
+        op->a[1].val = num_free;
     }
 
-    op->op = genop_unsupported_guard_bif_3;
-    op->arity = 3;
-    op->a[0].type = TAG_a;
-    op->a[0].val = stp->import[Bif.val].module;
-    op->a[1].type = TAG_a;
-    op->a[1].val = stp->import[Bif.val].function;
-    op->a[2].type = TAG_u;
-    op->a[2].val = stp->import[Bif.val].arity;
+    op->next = NULL;
     return op;
 }
 
-/*
- * Rewrite gc_bifs with one parameter (the common case).
- */
 static GenOp*
-gen_guard_bif1(LoaderState* stp, GenOpArg Fail, GenOpArg Live, GenOpArg Bif,
-	      GenOpArg Src, GenOpArg Dst)
+gen_is_function2(LoaderState* stp, GenOpArg Fail, GenOpArg Fun, GenOpArg Arity)
 {
     GenOp* op;
+    int literal_arity =  Arity.type == TAG_i;
+    int fun_is_reg = Fun.type == TAG_x || Fun.type == TAG_y;
 
     NEW_GENOP(stp, op);
     op->next = NULL;
-    op->op = genop_i_gc_bif1_5;
-    op->arity = 5;
-    op->a[0] = Fail;
-    /* op->a[1] is set by translate_gc_bif() */
-    op->a[2] = Src;
-    op->a[3] = Live;
-    op->a[4] = Dst;
-    return translate_gc_bif(stp, op, Bif);
-}
 
-/*
- * This is used by the ops.tab rule that rewrites gc_bifs with two parameters.
- */
-static GenOp*
-gen_guard_bif2(LoaderState* stp, GenOpArg Fail, GenOpArg Live, GenOpArg Bif,
-	      GenOpArg S1, GenOpArg S2, GenOpArg Dst)
-{
-    GenOp* op;
+    if (fun_is_reg &&literal_arity) {
+        /*
+         * Most common case. Fun in a register and arity
+         * is an integer literal.
+         */
+        if (Arity.val > MAX_ARG) {
+            /* Arity is negative or too big. */
+            GENOP_NAME_ARITY(op, jump, 1);
+            op->a[0] = Fail;
+            return op;
+        } else {
+            GENOP_NAME_ARITY(op, hot_is_function2, 3);
+            op->a[0] = Fail;
+            op->a[1] = Fun;
+            op->a[2].type = TAG_u;
+            op->a[2].val = Arity.val;
+            return op;
+        }
+    } else {
+        /*
+         * Handle extremely uncommon cases by a slower sequence.
+         */
+        GenOp* move_fun;
+        GenOp* move_arity;
 
-    NEW_GENOP(stp, op);
-    op->next = NULL;
-    op->op = genop_i_gc_bif2_6;
-    op->arity = 6;
-    op->a[0] = Fail;
-    /* op->a[1] is set by translate_gc_bif() */
-    op->a[2] = Live;
-    op->a[3] = S1;
-    op->a[4] = S2;
-    op->a[5] = Dst;
-    return translate_gc_bif(stp, op, Bif);
-}
+        NEW_GENOP(stp, move_fun);
+        NEW_GENOP(stp, move_arity);
 
-/*
- * This is used by the ops.tab rule that rewrites gc_bifs with three parameters.
- */
-static GenOp*
-gen_guard_bif3(LoaderState* stp, GenOpArg Fail, GenOpArg Live, GenOpArg Bif,
-	      GenOpArg S1, GenOpArg S2, GenOpArg S3, GenOpArg Dst)
-{
-    GenOp* op;
+        move_fun->next = move_arity;
+        move_arity->next = op;
 
-    NEW_GENOP(stp, op);
-    op->next = NULL;
-    op->op = genop_ii_gc_bif3_7;
-    op->arity = 7;
-    op->a[0] = Fail;
-    /* op->a[1] is set by translate_gc_bif() */
-    op->a[2] = Live;
-    op->a[3] = S1;
-    op->a[4] = S2;
-    op->a[5] = S3;
-    op->a[6] = Dst;
-    return translate_gc_bif(stp, op, Bif);
+        GENOP_NAME_ARITY(move_fun, move, 2);
+        move_fun->a[0] = Fun;
+        move_fun->a[1].type = TAG_x;
+        move_fun->a[1].val = 1022;
+
+        GENOP_NAME_ARITY(move_arity, move, 2);
+        move_arity->a[0] = Arity;
+        move_arity->a[1].type = TAG_x;
+        move_arity->a[1].val = 1023;
+
+        GENOP_NAME_ARITY(op, cold_is_function2, 3);
+        op->a[0] = Fail;
+        op->a[1].type = TAG_x;
+        op->a[1].val = 1022;
+        op->a[2].type = TAG_x;
+        op->a[2].val = 1023;
+        return move_fun;
+    }
 }
 
 static GenOp*
@@ -4367,8 +4445,8 @@ tuple_append_put5(LoaderState* stp, GenOpArg Arity, GenOpArg Dst,
 
     NEW_GENOP(stp, op);
     op->next = NULL;
+    GENOP_NAME_ARITY(op, i_put_tuple, 2);
     GENOP_ARITY(op, arity+2+5);
-    op->op = genop_i_put_tuple_2;
     op->a[0] = Dst;
     op->a[1].type = TAG_u;
     op->a[1].val = arity + 5;
@@ -4393,8 +4471,8 @@ tuple_append_put(LoaderState* stp, GenOpArg Arity, GenOpArg Dst,
 
     NEW_GENOP(stp, op);
     op->next = NULL;
+    GENOP_NAME_ARITY(op, i_put_tuple, 2);
     GENOP_ARITY(op, arity+2+1);
-    op->op = genop_i_put_tuple_2;
     op->a[0] = Dst;
     op->a[1].type = TAG_u;
     op->a[1].val = arity + 1;
@@ -4462,9 +4540,9 @@ gen_new_small_map_lit(LoaderState* stp, GenOpArg Dst, GenOpArg Live,
     Eterm keys;
 
     NEW_GENOP(stp, op);
+    GENOP_NAME_ARITY(op, i_new_small_map_lit, 3);
     GENOP_ARITY(op, 3 + size/2);
     op->next = NULL;
-    op->op = genop_i_new_small_map_lit_3;
 
     tmp = thp = erts_alloc(ERTS_ALC_T_LOADER_TMP, (1 + size/2) * sizeof(*tmp));
     keys = make_tuple(thp);
@@ -4522,19 +4600,6 @@ is_empty_map(LoaderState* stp, GenOpArg Lit)
 }
 
 /*
- * Predicate to test whether the given literal is an export.
- */
-static int
-literal_is_export(LoaderState* stp, GenOpArg Lit)
-{
-    Eterm term;
-
-    ASSERT(Lit.type == TAG_q);
-    term = stp->literals[Lit.val].term;
-    return is_export(term);
-}
-
-/*
  * Pseudo predicate map_key_sort that will sort the Rest operand for
  * map instructions as a side effect.
  */
@@ -4547,7 +4612,15 @@ typedef struct SortGenOpArg {
 static int
 genopargtermcompare(SortGenOpArg* a, SortGenOpArg* b)
 {
-    return CMP_TERM(a->term, b->term);
+    Sint res = CMP_TERM(a->term, b->term);
+
+    if (res < 0) {
+        return -1;
+    } else if (res > 0) {
+        return 1;
+    }
+
+    return 0;
 }
 
 static int
@@ -4658,14 +4731,12 @@ gen_get_map_element(LoaderState* stp, GenOpArg Fail, GenOpArg Src,
 
     Key = Rest[0];
     if (hash_genop_arg(stp, Key, &hx)) {
-	op->arity = 5;
-	op->op = genop_i_get_map_element_hash_5;
+	GENOP_NAME_ARITY(op, i_get_map_element_hash, 5);
 	op->a[3].type = TAG_u;
 	op->a[3].val = (BeamInstr) hx;
 	op->a[4] = Rest[1];
     } else {
-	op->arity = 4;
-	op->op = genop_i_get_map_element_4;
+	GENOP_NAME_ARITY(op, i_get_map_element, 4);
 	op->a[3] = Rest[1];
     }
     return op;
@@ -4705,15 +4776,13 @@ gen_get(LoaderState* stp, GenOpArg Src, GenOpArg Dst)
     NEW_GENOP(stp, op);
     op->next = NULL;
     if (hash_internal_genop_arg(stp, Src, &hx)) {
-	op->arity = 3;
-	op->op = genop_i_get_hash_3;
+	GENOP_NAME_ARITY(op, i_get_hash, 3);
         op->a[0] = Src;
 	op->a[1].type = TAG_u;
 	op->a[1].val = (BeamInstr) hx;
 	op->a[2] = Dst;
     } else {
-	op->arity = 2;
-	op->op = genop_i_get_2;
+	GENOP_NAME_ARITY(op, i_get, 2);
         op->a[0] = Src;
 	op->a[1] = Dst;
     }
@@ -4737,7 +4806,7 @@ gen_get_map_elements(LoaderState* stp, GenOpArg Fail, GenOpArg Src,
     ASSERT(Size.type == TAG_u);
 
     NEW_GENOP(stp, op);
-    op->op = genop_i_get_map_elements_3;
+    GENOP_NAME_ARITY(op, i_get_map_elements, 3);
     GENOP_ARITY(op, 3 + 3*(Size.val/2));
     op->next = NULL;
     op->a[0] = Fail;
@@ -4775,9 +4844,9 @@ gen_has_map_fields(LoaderState* stp, GenOpArg Fail, GenOpArg Src,
     n = Size.val;
 
     NEW_GENOP(stp, op);
+    GENOP_NAME_ARITY(op, get_map_elements, 3);
     GENOP_ARITY(op, 3 + 2*n);
     op->next = NULL;
-    op->op = genop_get_map_elements_3;
 
     op->a[0] = Fail;
     op->a[1] = Src;
@@ -6114,7 +6183,8 @@ erts_release_literal_area(ErtsLiteralArea* literal_area)
             }
         default:
             ASSERT(is_external_header(oh->thing_word));
-            erts_deref_node_entry(((ExternalThing*)oh)->node);
+            erts_deref_node_entry(((ExternalThing*)oh)->node,
+                                  make_boxed(&oh->thing_word));
         }
         oh = oh->next;
     }
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 015c051cc1..b81056c774 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -184,7 +184,7 @@ BIF_RETTYPE link_1(BIF_ALIST_1)
         DistEntry *dep;
         ErtsLink *lnk;
         int code;
-        ErtsDSigData dsd;
+        ErtsDSigSendContext ctx;
 
         dep = external_pid_dist_entry(BIF_ARG_1);
         if (dep == erts_this_dist_entry)
@@ -201,9 +201,9 @@ BIF_RETTYPE link_1(BIF_ALIST_1)
 
         ldp = erts_link_to_data(lnk);
 
-        code = erts_dsig_prepare(&dsd, dep, BIF_P,
+        code = erts_dsig_prepare(&ctx, dep, BIF_P,
                                  ERTS_PROC_LOCK_MAIN,
-                                 ERTS_DSP_RLOCK, 0, 1);
+                                 ERTS_DSP_RLOCK, 0, 1, 1);
         switch (code) {
         case ERTS_DSIG_PREP_NOT_ALIVE:
         case ERTS_DSIG_PREP_NOT_CONNECTED:
@@ -218,16 +218,14 @@ BIF_RETTYPE link_1(BIF_ALIST_1)
              * We have (pending) connection.
              * Setup link and enqueue link signal.
              */
-#ifdef DEBUG
-            int inserted =
-#endif
-                erts_link_dist_insert(&ldp->b, dep->mld);
-            ASSERT(inserted);
+            int inserted = erts_link_dist_insert(&ldp->b, dep->mld);
+            ASSERT(inserted); (void)inserted;
             erts_de_runlock(dep);
 
-            code = erts_dsig_send_link(&dsd, BIF_P->common.id, BIF_ARG_1);
+            code = erts_dsig_send_link(&ctx, BIF_P->common.id, BIF_ARG_1);
             if (code == ERTS_DSIG_SEND_YIELD)
                 ERTS_BIF_YIELD_RETURN(BIF_P, am_true);
+            ASSERT(code == ERTS_DSIG_SEND_OK);
             BIF_RET(am_true);
             break;
         }
@@ -309,7 +307,7 @@ demonitor(Process *c_p, Eterm ref, Eterm *multip)
        DistEntry *dep;
        int code = ERTS_DSIG_SEND_OK;
        int deleted;
-       ErtsDSigData dsd;
+       ErtsDSigSendContext ctx;
 
        ASSERT(is_external_pid(to) || is_node_name_atom(to));
 
@@ -325,8 +323,8 @@ demonitor(Process *c_p, Eterm ref, Eterm *multip)
            }
        }
 
-       code = erts_dsig_prepare(&dsd, dep, c_p, ERTS_PROC_LOCK_MAIN,
-                                ERTS_DSP_RLOCK, 0, 0);
+       code = erts_dsig_prepare(&ctx, dep, c_p, ERTS_PROC_LOCK_MAIN,
+                                ERTS_DSP_RLOCK, 0, 1, 0);
 
        deleted = erts_monitor_dist_delete(&mdp->target);
 
@@ -355,8 +353,8 @@ demonitor(Process *c_p, Eterm ref, Eterm *multip)
             * monitor list since in case of monitor name 
             * the atom is stored there. Yield if necessary.
             */
-           code = erts_dsig_send_demonitor(&dsd, c_p->common.id,
-                                           watched, mdp->ref, 0);
+           code = erts_dsig_send_demonitor(&ctx, c_p->common.id,
+                                           watched, mdp->ref);
            break;
        }
 
@@ -536,7 +534,7 @@ BIF_RETTYPE monitor_2(BIF_ALIST_2)
         }
 
         if (is_external_pid(target)) {
-            ErtsDSigData dsd;
+            ErtsDSigSendContext ctx;
             int code;
 
             dep = external_pid_dist_entry(target);
@@ -554,9 +552,9 @@ BIF_RETTYPE monitor_2(BIF_ALIST_2)
                                       BIF_P->common.id, id, name);
             erts_monitor_tree_insert(&ERTS_P_MONITORS(BIF_P), &mdp->origin);
 
-            code = erts_dsig_prepare(&dsd, dep,
+            code = erts_dsig_prepare(&ctx, dep,
                                      BIF_P, ERTS_PROC_LOCK_MAIN,
-                                     ERTS_DSP_RLOCK, 0, 1);
+                                     ERTS_DSP_RLOCK, 0, 1, 1);
             switch (code) {
             case ERTS_DSIG_PREP_NOT_ALIVE:
             case ERTS_DSIG_PREP_NOT_CONNECTED:
@@ -567,15 +565,11 @@ BIF_RETTYPE monitor_2(BIF_ALIST_2)
 
             case ERTS_DSIG_PREP_PENDING:
             case ERTS_DSIG_PREP_CONNECTED: {
-#ifdef DEBUG
-                int inserted =
-#endif
-
-                erts_monitor_dist_insert(&mdp->target, dep->mld);
-                ASSERT(inserted);
+                int inserted = erts_monitor_dist_insert(&mdp->target, dep->mld);
+                ASSERT(inserted); (void)inserted;
                 erts_de_runlock(dep);
 
-                code = erts_dsig_send_monitor(&dsd, BIF_P->common.id, target, ref);
+                code = erts_dsig_send_monitor(&ctx, BIF_P->common.id, target, ref);
                 break;
             }
 
@@ -921,7 +915,7 @@ BIF_RETTYPE unlink_1(BIF_ALIST_1)
         ErtsLinkData *ldp;
         DistEntry *dep;
 	int code;
-	ErtsDSigData dsd;
+	ErtsDSigSendContext ctx;
 
 	dep = external_pid_dist_entry(BIF_ARG_1);
 	if (dep == erts_this_dist_entry)
@@ -939,15 +933,15 @@ BIF_RETTYPE unlink_1(BIF_ALIST_1)
         else
             erts_link_release(lnk);
 
-	code = erts_dsig_prepare(&dsd, dep, BIF_P, ERTS_PROC_LOCK_MAIN,
-				 ERTS_DSP_NO_LOCK, 0, 0);
+	code = erts_dsig_prepare(&ctx, dep, BIF_P, ERTS_PROC_LOCK_MAIN,
+				 ERTS_DSP_NO_LOCK, 0, 1, 0);
 	switch (code) {
 	case ERTS_DSIG_PREP_NOT_ALIVE:
 	case ERTS_DSIG_PREP_NOT_CONNECTED:
 	    BIF_RET(am_true);
 	case ERTS_DSIG_PREP_PENDING:
 	case ERTS_DSIG_PREP_CONNECTED:
-	    code = erts_dsig_send_unlink(&dsd, BIF_P->common.id, BIF_ARG_1);
+	    code = erts_dsig_send_unlink(&ctx, BIF_P->common.id, BIF_ARG_1);
 	    if (code == ERTS_DSIG_SEND_YIELD)
 		ERTS_BIF_YIELD_RETURN(BIF_P, am_true);
             break;
@@ -1308,10 +1302,11 @@ static BIF_RETTYPE send_exit_signal_bif(Process *c_p, Eterm id, Eterm reason, in
              ERTS_BIF_PREP_RET(ret_val, am_true); /* Old incarnation of this node... */
          else {
              int code;
-             ErtsDSigData dsd;
+             ErtsDSigSendContext ctx;
+
+             code = erts_dsig_prepare(&ctx, dep, c_p, ERTS_PROC_LOCK_MAIN,
+                                      ERTS_DSP_NO_LOCK, 0, 0, 1);
 
-             code = erts_dsig_prepare(&dsd, dep, c_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:
@@ -1319,11 +1314,29 @@ static BIF_RETTYPE send_exit_signal_bif(Process *c_p, Eterm id, Eterm reason, in
                  break;
              case ERTS_DSIG_PREP_PENDING:
              case ERTS_DSIG_PREP_CONNECTED:
-                 code = erts_dsig_send_exit2(&dsd, c_p->common.id, id, reason);
-                 if (code == ERTS_DSIG_SEND_YIELD)
+                 code = erts_dsig_send_exit2(&ctx, c_p->common.id, id, reason);
+                 switch (code) {
+                 case ERTS_DSIG_SEND_YIELD:
                      ERTS_BIF_PREP_YIELD_RETURN(ret_val, c_p, am_true);
-                 else
+                     break;
+                 case ERTS_DSIG_SEND_CONTINUE:
+                     BUMP_ALL_REDS(c_p);
+                     erts_set_gc_state(c_p, 0);
+                     ERTS_BIF_PREP_TRAP1(ret_val, &dsend_continue_trap_export, c_p,
+                                         erts_dsend_export_trap_context(c_p, &ctx));
+                     break;
+                 case ERTS_DSIG_SEND_OK:
                      ERTS_BIF_PREP_RET(ret_val, am_true);
+                     break;
+                 case ERTS_DSIG_SEND_TOO_LRG:
+                     erts_set_gc_state(c_p, 1);
+                     ERTS_BIF_PREP_ERROR(ret_val, c_p, SYSTEM_LIMIT);
+                     break;
+                 default:
+                     ASSERT(! "Invalid dsig send exit2 result");
+                     ERTS_BIF_PREP_ERROR(ret_val, c_p, EXC_INTERNAL_ERROR);
+                     break;
+                 }
                  break;
              default:
                  ASSERT(! "Invalid dsig prepare result");
@@ -1803,36 +1816,40 @@ ebif_bang_2(BIF_ALIST_2)
 #define SEND_INTERNAL_ERROR	(-6)
 #define SEND_AWAIT_RESULT	(-7)
 #define SEND_YIELD_CONTINUE     (-8)
+#define SEND_SYSTEM_LIMIT		(-9)
 
 
 static Sint remote_send(Process *p, DistEntry *dep,
-			Eterm to, Eterm full_to, Eterm msg,
-			ErtsSendContext* ctx)
+			Eterm to, Eterm node, Eterm full_to, Eterm msg,
+                        Eterm return_term, Eterm *ctxpp,
+                        int connect, int suspend)
 {
     Sint res;
     int code;
+    ErtsDSigSendContext ctx;
     ASSERT(is_atom(to) || is_external_pid(to));
 
-    ctx->dep = dep;
-    code = erts_dsig_prepare(&ctx->dsd, dep, p, ERTS_PROC_LOCK_MAIN,
+    code = erts_dsig_prepare(&ctx, dep, p, ERTS_PROC_LOCK_MAIN,
 			     ERTS_DSP_NO_LOCK,
-			     !ctx->suspend, ctx->connect);
+			     !suspend, 0, connect);
+    ctx.return_term = return_term;
+    ctx.node = node;
     switch (code) {
     case ERTS_DSIG_PREP_NOT_ALIVE:
     case ERTS_DSIG_PREP_NOT_CONNECTED:
 	res = SEND_NOCONNECT;
 	break;
     case ERTS_DSIG_PREP_WOULD_SUSPEND:
-	ASSERT(!ctx->suspend);
+	ASSERT(!suspend);
 	res = SEND_YIELD;
 	break;
     case ERTS_DSIG_PREP_PENDING:
     case ERTS_DSIG_PREP_CONNECTED: {
 
 	if (is_atom(to))
-	    code = erts_dsig_send_reg_msg(to, msg, ctx);
+	    code = erts_dsig_send_reg_msg(&ctx, to, msg);
 	else
-	    code = erts_dsig_send_msg(to, msg, ctx);
+	    code = erts_dsig_send_msg(&ctx, to, msg);
 	/*
 	 * Note that reductions have been bumped on calling
 	 * process by erts_dsig_send_reg_msg() or
@@ -1840,8 +1857,20 @@ static Sint remote_send(Process *p, DistEntry *dep,
 	 */
 	if (code == ERTS_DSIG_SEND_YIELD)
 	    res = SEND_YIELD_RETURN;
-	else if (code == ERTS_DSIG_SEND_CONTINUE)
+	else if (code == ERTS_DSIG_SEND_CONTINUE) {
+            erts_set_gc_state(p, 0);
+
+            /* Keep a reference to the dist entry if the
+               name is an not a pid. */
+            if (is_atom(to)) {
+                erts_ref_dist_entry(ctx.dep);
+                ctx.deref_dep = 1;
+            }
+
+            *ctxpp = erts_dsend_export_trap_context(p, &ctx);
 	    res = SEND_YIELD_CONTINUE;
+	} else if (code == ERTS_DSIG_SEND_TOO_LRG)
+	    res = SEND_SYSTEM_LIMIT;
 	else
 	    res = 0;
 	break;
@@ -1862,7 +1891,8 @@ static Sint remote_send(Process *p, DistEntry *dep,
 }
 
 static Sint
-do_send(Process *p, Eterm to, Eterm msg, Eterm *refp, ErtsSendContext *ctx)
+do_send(Process *p, Eterm to, Eterm msg, Eterm return_term, Eterm *refp,
+        Eterm *dist_ctx, int connect, int suspend)
 {
     Eterm portid;
     Port *pt;
@@ -1894,7 +1924,8 @@ do_send(Process *p, Eterm to, Eterm msg, Eterm *refp, ErtsSendContext *ctx)
 	    erts_send_error_to_logger(p->group_leader, dsbufp);
 	    return 0;
 	}
-	return remote_send(p, dep, to, to, msg, ctx);
+	return remote_send(p, dep, to, dep->sysname, to, msg, return_term,
+                           dist_ctx, connect, suspend);
     } else if (is_atom(to)) {
 	Eterm id = erts_whereis_name_to_id(p, to);
 
@@ -1949,7 +1980,7 @@ do_send(Process *p, Eterm to, Eterm msg, Eterm *refp, ErtsSendContext *ctx)
 	ret_val = 0;
 
 	if (pt) {
-	    int ps_flags = ctx->suspend ? 0 : ERTS_PORT_SIG_FLG_NOSUSPEND;
+	    int ps_flags = suspend ? 0 : ERTS_PORT_SIG_FLG_NOSUSPEND;
 	    *refp = NIL;
 
             if (IS_TRACED_FL(p, F_TRACE_SEND)) 	/* trace once only !! */
@@ -1964,12 +1995,12 @@ do_send(Process *p, Eterm to, Eterm msg, Eterm *refp, ErtsSendContext *ctx)
 	    switch (erts_port_command(p, ps_flags, pt, msg, refp)) {
 	    case ERTS_PORT_OP_BUSY:
 		/* Nothing has been sent */
-		if (ctx->suspend)
+		if (suspend)
 		    erts_suspend(p, ERTS_PROC_LOCK_MAIN, pt);
 		return SEND_YIELD;
 	    case ERTS_PORT_OP_BUSY_SCHEDULED:
 		/* Message was sent */
-		if (ctx->suspend) {
+		if (suspend) {
 		    erts_suspend(p, ERTS_PROC_LOCK_MAIN, pt);
 		    ret_val = SEND_YIELD_RETURN;
 		    break;
@@ -2040,13 +2071,10 @@ do_send(Process *p, Eterm to, Eterm msg, Eterm *refp, ErtsSendContext *ctx)
             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) {
-            erts_ref_dist_entry(ctx->dep);
-            ctx->deref_dep = 1;
-	}
+	ret = remote_send(p, dep, tp[1], tp[2], to, msg, return_term,
+                          dist_ctx, connect, suspend);
+
         if (deref_dep)
             erts_deref_dist_entry(dep);
 	return ret;
@@ -2085,25 +2113,16 @@ BIF_RETTYPE send_3(BIF_ALIST_3)
 
     Eterm l = opts;
     Sint result;
-
-    DeclareTypedTmpHeap(ErtsSendContext, ctx, BIF_P);
+    int connect = 1, suspend = 1;
+    Eterm ctx;
 
     ERTS_MSACC_PUSH_STATE_M_X();
 
-    UseTmpHeap(sizeof(ErtsSendContext)/sizeof(Eterm), BIF_P);
-
-    ctx->suspend = !0;
-    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) {
-	    ctx->connect = 0;
+	    connect = 0;
 	} else if (CAR(list_val(l)) == am_nosuspend) {
-	    ctx->suspend = 0;
+	    suspend = 0;
 	} else {
 	    ERTS_BIF_PREP_ERROR(retval, p, BADARG);
 	    goto done;
@@ -2120,7 +2139,7 @@ BIF_RETTYPE send_3(BIF_ALIST_3)
 #endif
 
     ERTS_MSACC_SET_STATE_CACHED_M_X(ERTS_MSACC_STATE_SEND);
-    result = do_send(p, to, msg, &ref, ctx);
+    result = do_send(p, to, msg, am_ok, &ref, &ctx, connect, suspend);
     ERTS_MSACC_POP_STATE_M_X();
 
     if (result >= 0) {
@@ -2133,22 +2152,21 @@ BIF_RETTYPE send_3(BIF_ALIST_3)
 
     switch (result) {
     case SEND_NOCONNECT:
-	if (ctx->connect) {
+	if (connect) {
 	    ERTS_BIF_PREP_RET(retval, am_ok);
 	} else {
 	    ERTS_BIF_PREP_RET(retval, am_noconnect);
 	}
 	break;
     case SEND_YIELD:
-	if (ctx->suspend) {
-	    ERTS_BIF_PREP_YIELD3(retval,
-				 bif_export[BIF_send_3], p, to, msg, opts);
+	if (suspend) {
+	    ERTS_BIF_PREP_YIELD3(retval, bif_export[BIF_send_3], p, to, msg, opts);
 	} else {
 	    ERTS_BIF_PREP_RET(retval, am_nosuspend);
 	}
 	break;
     case SEND_YIELD_RETURN:
-	if (!ctx->suspend) {
+	if (!suspend) {
 	    ERTS_BIF_PREP_RET(retval, am_nosuspend);
 	    break;
 	}
@@ -2162,6 +2180,9 @@ BIF_RETTYPE send_3(BIF_ALIST_3)
     case SEND_BADARG:
 	ERTS_BIF_PREP_ERROR(retval, p, BADARG);
 	break;
+    case SEND_SYSTEM_LIMIT:
+	ERTS_BIF_PREP_ERROR(retval, p, SYSTEM_LIMIT);
+	break;
     case SEND_USER_ERROR:
 	ERTS_BIF_PREP_ERROR(retval, p, EXC_ERROR);
 	break;
@@ -2170,9 +2191,7 @@ BIF_RETTYPE send_3(BIF_ALIST_3)
 	break;
     case SEND_YIELD_CONTINUE:
 	BUMP_ALL_REDS(p);
-	erts_set_gc_state(p, 0);
-	ERTS_BIF_PREP_TRAP1(retval, &dsend_continue_trap_export, p,
-			    erts_dsend_export_trap_context(p, ctx));
+	ERTS_BIF_PREP_TRAP1(retval, &dsend_continue_trap_export, p, ctx);
 	break;
     default:
 	erts_exit(ERTS_ABORT_EXIT, "send_3 invalid result %d\n", (int)result);
@@ -2180,7 +2199,6 @@ BIF_RETTYPE send_3(BIF_ALIST_3)
     }
 
 done:
-    UnUseTmpHeap(sizeof(ErtsSendContext)/sizeof(Eterm), BIF_P);
     return retval;
 }
 
@@ -2194,14 +2212,14 @@ BIF_RETTYPE send_2(BIF_ALIST_2)
 static BIF_RETTYPE dsend_continue_trap_1(BIF_ALIST_1)
 {
     Binary* bin = erts_magic_ref2bin(BIF_ARG_1);
-    ErtsSendContext* ctx = (ErtsSendContext*) ERTS_MAGIC_BIN_DATA(bin);
+    ErtsDSigSendContext *ctx = (ErtsDSigSendContext*) ERTS_MAGIC_BIN_DATA(bin);
     Sint initial_reds = (Sint) (ERTS_BIF_REDS_LEFT(BIF_P) * TERM_TO_BINARY_LOOP_FACTOR);
     int result;
 
     ASSERT(ERTS_MAGIC_BIN_DESTRUCTOR(bin) == erts_dsend_context_dtor);
 
-    ctx->dss.reds = initial_reds;
-    result = erts_dsig_send(&ctx->dsd, &ctx->dss);
+    ctx->reds = initial_reds;
+    result = erts_dsig_send(ctx);
 
     switch (result) {
     case ERTS_DSIG_SEND_OK:
@@ -2210,7 +2228,7 @@ static BIF_RETTYPE dsend_continue_trap_1(BIF_ALIST_1)
 	break;
     case ERTS_DSIG_SEND_YIELD: /*SEND_YIELD_RETURN*/
 	erts_set_gc_state(BIF_P, 1);
-	if (!ctx->suspend)
+	if (ctx->no_suspend)
 	    BIF_RET(am_nosuspend);
 	ERTS_BIF_YIELD_RETURN(BIF_P, ctx->return_term);
 
@@ -2218,6 +2236,10 @@ static BIF_RETTYPE dsend_continue_trap_1(BIF_ALIST_1)
 	BUMP_ALL_REDS(BIF_P);
 	BIF_TRAP1(&dsend_continue_trap_export, BIF_P, BIF_ARG_1);
     }
+    case ERTS_DSIG_SEND_TOO_LRG: { /*SEND_SYSTEM_LIMIT*/
+	erts_set_gc_state(BIF_P, 1);
+	BIF_ERROR(BIF_P, SYSTEM_LIMIT);
+    }
     default:
 	erts_exit(ERTS_ABORT_EXIT, "dsend_continue_trap invalid result %d\n", (int)result);
 	break;
@@ -2231,20 +2253,14 @@ Eterm erl_send(Process *p, Eterm to, Eterm msg)
     Eterm retval;
     Eterm ref;
     Sint result;
-    DeclareTypedTmpHeap(ErtsSendContext, ctx, p);
+    Eterm ctx;
     ERTS_MSACC_PUSH_AND_SET_STATE_M_X(ERTS_MSACC_STATE_SEND);
-    UseTmpHeap(sizeof(ErtsSendContext)/sizeof(Eterm), p);
+
 #ifdef DEBUG
     ref = NIL;
 #endif
-    ctx->suspend = !0;
-    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;
 
-    result = do_send(p, to, msg, &ref, ctx);
+    result = do_send(p, to, msg, msg, &ref, &ctx, 1, 1);
 
     ERTS_MSACC_POP_STATE_M_X();
 
@@ -2275,6 +2291,9 @@ Eterm erl_send(Process *p, Eterm to, Eterm msg)
     case SEND_BADARG:
 	ERTS_BIF_PREP_ERROR(retval, p, BADARG);
 	break;
+    case SEND_SYSTEM_LIMIT:
+	ERTS_BIF_PREP_ERROR(retval, p, SYSTEM_LIMIT);
+	break;
     case SEND_USER_ERROR:
 	ERTS_BIF_PREP_ERROR(retval, p, EXC_ERROR);
 	break;
@@ -2283,9 +2302,7 @@ Eterm erl_send(Process *p, Eterm to, Eterm msg)
 	break;
     case SEND_YIELD_CONTINUE:
 	BUMP_ALL_REDS(p);
-	erts_set_gc_state(p, 0);
-	ERTS_BIF_PREP_TRAP1(retval, &dsend_continue_trap_export, p,
-			    erts_dsend_export_trap_context(p, ctx));
+	ERTS_BIF_PREP_TRAP1(retval, &dsend_continue_trap_export, p, ctx);
 	break;
     default:
 	erts_exit(ERTS_ABORT_EXIT, "invalid send result %d\n", (int)result);
@@ -2293,7 +2310,6 @@ Eterm erl_send(Process *p, Eterm to, Eterm msg)
     }
 
 done:
-    UnUseTmpHeap(sizeof(ErtsSendContext)/sizeof(Eterm), p);
     return retval;
 }
 
@@ -2359,7 +2375,7 @@ accumulate(Eterm acc, Uint size)
 	 * bignum buffer with one extra word to be used if
 	 * the bignum grows in the future.
 	 */
-	Eterm* hp = (Eterm *) erts_alloc(ERTS_ALC_T_TEMP_TERM,
+	Eterm* hp = (Eterm *) erts_alloc(ERTS_ALC_T_SHORT_LIVED_TERM,
 					 (BIG_UINT_HEAP_SIZE+1) *
 					 sizeof(Eterm));
 	return uint_to_big(size, hp);
@@ -2379,7 +2395,7 @@ accumulate(Eterm acc, Uint size)
 	     * The extra word has been consumed. Grow the
 	     * allocation by one word.
 	     */
-	    big = (Eterm *) erts_realloc(ERTS_ALC_T_TEMP_TERM,
+	    big = (Eterm *) erts_realloc(ERTS_ALC_T_SHORT_LIVED_TERM,
 					 big_val(acc),
 					 (need_heap+1) * sizeof(Eterm));
 	    acc = make_big(big);
@@ -2408,29 +2424,86 @@ consolidate(Process* p, Eterm acc, Uint size)
 	while (sz--) {
 	    *hp++ = *big++;
 	}
-	erts_free(ERTS_ALC_T_TEMP_TERM, (void *) big_val(acc));
+	erts_free(ERTS_ALC_T_SHORT_LIVED_TERM, (void *) big_val(acc));
 	return res;
     }
 }
 
+typedef struct {
+    Eterm obj;
+    Uint size;
+    Eterm acc;
+    Eterm input_list;
+    ErtsEStack stack;
+    int is_trap_at_L_iter_list;
+} ErtsIOListSizeContext;
+
+static int iolist_size_ctx_bin_dtor(Binary *context_bin) {
+    ErtsIOListSizeContext* context = ERTS_MAGIC_BIN_DATA(context_bin);
+    DESTROY_SAVED_ESTACK(&context->stack);
+    if (context->acc != THE_NON_VALUE) {
+        erts_free(ERTS_ALC_T_SHORT_LIVED_TERM, (void *) big_val(context->acc));
+    }
+    return 1;
+}
+
 BIF_RETTYPE iolist_size_1(BIF_ALIST_1)
 {
-    Eterm obj, hd;
+    static const Uint ITERATIONS_PER_RED = 64;
+    Eterm input_list, obj, hd;
     Eterm* objp;
     Uint size = 0;
     Uint cur_size;
     Uint new_size;
     Eterm acc = THE_NON_VALUE;
     DECLARE_ESTACK(s);
-
-    obj = BIF_ARG_1;
+    Uint max_iterations;
+    Uint iterations_until_trap = max_iterations =
+        ITERATIONS_PER_RED * ERTS_BIF_REDS_LEFT(BIF_P);
+    ErtsIOListSizeContext* context = NULL;
+    Eterm state_mref;
+    int is_trap_at_L_iter_list;
+    ERTS_UNDEF(state_mref, THE_NON_VALUE);
+    ESTACK_CHANGE_ALLOCATOR(s, ERTS_ALC_T_SAVED_ESTACK);
+#ifdef DEBUG
+    iterations_until_trap = iterations_until_trap / 10;
+#endif
+    input_list = obj = BIF_ARG_1;
+    if (is_internal_magic_ref(obj)) {
+        /* Restore state after a trap */
+        Binary* state_bin;
+        state_mref = obj;
+        state_bin = erts_magic_ref2bin(state_mref);
+        if (ERTS_MAGIC_BIN_DESTRUCTOR(state_bin) != iolist_size_ctx_bin_dtor) {
+            BIF_ERROR(BIF_P, BADARG);
+        }
+        context = ERTS_MAGIC_BIN_DATA(state_bin);
+        obj = context->obj;
+        size = context->size;
+        acc = context->acc;
+        input_list = context->input_list;
+        ESTACK_RESTORE(s, &context->stack);
+        ASSERT(BIF_P->flags & F_DISABLE_GC);
+        erts_set_gc_state(BIF_P, 1);
+        if (context->is_trap_at_L_iter_list) {
+            goto L_iter_list;
+        }
+    }
     goto L_again;
 
     while (!ESTACK_ISEMPTY(s)) {
 	obj = ESTACK_POP(s);
+        if (iterations_until_trap == 0) {
+            is_trap_at_L_iter_list = 0;
+            goto L_save_state_and_trap;
+        }
     L_again:
 	if (is_list(obj)) {
 	L_iter_list:
+            if (iterations_until_trap == 0) {
+                is_trap_at_L_iter_list = 1;
+                goto L_save_state_and_trap;
+            }
 	    objp = list_val(obj);
 	    hd = CAR(objp);
 	    obj = CDR(objp);
@@ -2452,12 +2525,14 @@ BIF_RETTYPE iolist_size_1(BIF_ALIST_1)
 	    } else if (is_list(hd)) {
 		ESTACK_PUSH(s, obj);
 		obj = hd;
+                iterations_until_trap--;
 		goto L_iter_list;
 	    } else if (is_not_nil(hd)) {
 		goto L_type_error;
 	    }
 	    /* Tail */
 	    if (is_list(obj)) {
+                iterations_until_trap--;
 		goto L_iter_list;
 	    } else if (is_binary(obj) && binary_bitsize(obj) == 0) {
 		cur_size = binary_size(obj);
@@ -2481,14 +2556,55 @@ BIF_RETTYPE iolist_size_1(BIF_ALIST_1)
 	} else if (is_not_nil(obj)) {
 	    goto L_type_error;
 	}
+        iterations_until_trap--;
     }
 
     DESTROY_ESTACK(s);
+    BUMP_REDS(BIF_P, (max_iterations - iterations_until_trap) / ITERATIONS_PER_RED);
+    ASSERT(!(BIF_P->flags & F_DISABLE_GC));
+    if (context != NULL) {
+        /* context->acc needs to be reset so that
+           iolist_size_ctx_bin_dtor does not deallocate twice */
+        context->acc = THE_NON_VALUE;
+    }
     BIF_RET(consolidate(BIF_P, acc, size));
 
  L_type_error:
     DESTROY_ESTACK(s);
-    BIF_ERROR(BIF_P, BADARG);
+    if (acc != THE_NON_VALUE) {
+	erts_free(ERTS_ALC_T_SHORT_LIVED_TERM, (void *) big_val(acc));
+        if (context != NULL) {
+            context->acc = THE_NON_VALUE;
+        }
+    }
+    BUMP_REDS(BIF_P, (max_iterations - iterations_until_trap) / ITERATIONS_PER_RED);
+    ASSERT(!(BIF_P->flags & F_DISABLE_GC));
+    if (context == NULL) {
+        BIF_ERROR(BIF_P, BADARG);
+    } else {
+        ERTS_BIF_ERROR_TRAPPED1(BIF_P,
+                                BADARG,
+                                bif_export[BIF_iolist_size_1],
+                                input_list);
+    }
+
+ L_save_state_and_trap:
+    if (context == NULL) {
+        Binary *state_bin = erts_create_magic_binary(sizeof(ErtsIOListSizeContext),
+                                                     iolist_size_ctx_bin_dtor);
+        Eterm* hp = HAlloc(BIF_P, ERTS_MAGIC_REF_THING_SIZE);
+        state_mref = erts_mk_magic_ref(&hp, &MSO(BIF_P), state_bin);
+        context = ERTS_MAGIC_BIN_DATA(state_bin);
+    }
+    context->obj = obj;
+    context->size = size;
+    context->acc = acc;
+    context->is_trap_at_L_iter_list = is_trap_at_L_iter_list;
+    context->input_list = input_list;
+    ESTACK_SAVE(s, &context->stack);
+    erts_set_gc_state(BIF_P, 0);
+    BUMP_ALL_REDS(BIF_P);
+    BIF_TRAP1(bif_export[BIF_iolist_size_1], BIF_P, state_mref);
 }
 
 /**********************************************************************/
@@ -2732,9 +2848,7 @@ BIF_RETTYPE atom_to_list_1(BIF_ALIST_1)
     Uint num_chars, num_built, num_eaten;
     byte* err_pos;
     Eterm res;
-#ifdef DEBUG
     int ares;
-#endif
 
     if (is_not_atom(BIF_ARG_1))
 	BIF_ERROR(BIF_P, BADARG);
@@ -2744,11 +2858,9 @@ BIF_RETTYPE atom_to_list_1(BIF_ALIST_1)
     if (ap->len == 0)
 	BIF_RET(NIL);	/* the empty atom */
 
-#ifdef DEBUG
     ares =
-#endif
 	erts_analyze_utf8(ap->name, ap->len, &err_pos, &num_chars, NULL);
-    ASSERT(ares == ERTS_UTF8_OK);
+    ASSERT(ares == ERTS_UTF8_OK); (void)ares;
     
     res = erts_utf8_to_list(BIF_P, num_chars, ap->name, ap->len, ap->len,
 			    &num_built, &num_eaten, NIL);
@@ -2810,38 +2922,110 @@ BIF_RETTYPE list_to_existing_atom_1(BIF_ALIST_1)
 
 /* convert an integer to a list of ascii integers */
 
-BIF_RETTYPE integer_to_list_1(BIF_ALIST_1)
+static Eterm integer_to_list(Process *c_p, Eterm num, int base)
 {
-    Eterm* hp;
+    Eterm *hp;
+    Eterm res;
     Uint need;
 
+    if (is_small(num)) {
+        char s[128];
+        char *c = s;
+        Uint digits;
+
+        digits = Sint_to_buf(signed_val(num), base, &c, sizeof(s));
+        need = 2 * digits;
+
+        hp = HAlloc(c_p, need);
+        res = buf_to_intlist(&hp, c, digits, NIL);
+    } else {
+        const int DIGITS_PER_RED = 16;
+        Eterm *hp_end;
+        Uint digits;
+
+        digits = big_integer_estimate(num, base);
+
+        if ((digits / DIGITS_PER_RED) > ERTS_BIF_REDS_LEFT(c_p)) {
+            ErtsSchedulerData *esdp = erts_get_scheduler_data();
+
+            /* This could take a very long time, tell the caller to reschedule
+             * us to a dirty CPU scheduler if we aren't already on one. */
+            if (esdp->type == ERTS_SCHED_NORMAL) {
+                return THE_NON_VALUE;
+            }
+        } else {
+            BUMP_REDS(c_p, digits / DIGITS_PER_RED);
+        }
+
+        need = 2 * digits;
+
+        hp = HAlloc(c_p, need);
+        hp_end = hp + need;
+
+        res = erts_big_to_list(num, base, &hp);
+        HRelease(c_p, hp_end, hp);
+    }
+
+    return res;
+}
+
+BIF_RETTYPE integer_to_list_1(BIF_ALIST_1)
+{
+    Eterm res;
+
     if (is_not_integer(BIF_ARG_1)) {
-	BIF_ERROR(BIF_P, BADARG);
+        BIF_ERROR(BIF_P, BADARG);
     }
 
-    if (is_small(BIF_ARG_1)) {
-	char *c;
-	int n;
-	struct Sint_buf ibuf;
+    res = integer_to_list(BIF_P, BIF_ARG_1, 10);
 
-	c = Sint_to_buf(signed_val(BIF_ARG_1), &ibuf);
-	n = sys_strlen(c);
-	need = 2*n;
-	hp = HAlloc(BIF_P, need);
-	BIF_RET(buf_to_intlist(&hp, c, n, NIL));
+    if (is_non_value(res)) {
+        Eterm args[1];
+        args[0] = BIF_ARG_1;
+        return erts_schedule_bif(BIF_P,
+                                 args,
+                                 BIF_I,
+                                 integer_to_list_1,
+                                 ERTS_SCHED_DIRTY_CPU,
+                                 am_erlang,
+                                 am_integer_to_list,
+                                 1);
     }
-    else {
-	int n = big_decimal_estimate(BIF_ARG_1);
-	Eterm res;
-        Eterm* hp_end;
 
-	need = 2*n;
-	hp = HAlloc(BIF_P, need);
-        hp_end = hp + need;
-	res = erts_big_to_list(BIF_ARG_1, &hp);
-        HRelease(BIF_P,hp_end,hp);
-	BIF_RET(res);
+    return res;
+}
+
+BIF_RETTYPE integer_to_list_2(BIF_ALIST_2)
+{
+    Eterm res;
+    SWord base;
+
+    if (is_not_integer(BIF_ARG_1) || is_not_small(BIF_ARG_2)) {
+        BIF_ERROR(BIF_P, BADARG);
     }
+
+    base = signed_val(BIF_ARG_2);
+    if (base < 2 || base > 36) {
+        BIF_ERROR(BIF_P, BADARG);
+    }
+
+    res = integer_to_list(BIF_P, BIF_ARG_1, base);
+
+    if (is_non_value(res)) {
+        Eterm args[2];
+        args[0] = BIF_ARG_1;
+        args[1] = BIF_ARG_2;
+        return erts_schedule_bif(BIF_P,
+                                 args,
+                                 BIF_I,
+                                 integer_to_list_2,
+                                 ERTS_SCHED_DIRTY_CPU,
+                                 am_erlang,
+                                 am_integer_to_list,
+                                 2);
+    }
+
+    return res;
 }
 
 /**********************************************************************/
@@ -3979,10 +4163,12 @@ BIF_RETTYPE list_to_pid_1(BIF_ALIST_1)
       if (is_nil(dep->cid))
 	  goto bad;
       
-      enp = erts_find_or_insert_node(dep->sysname, dep->creation);
+      etp = (ExternalThing *) HAlloc(BIF_P, EXTERNAL_THING_HEAD_SIZE + 1);
+      
+      enp = erts_find_or_insert_node(dep->sysname, dep->creation,
+                                     make_boxed(&etp->header));
       ASSERT(enp != erts_this_node);
 
-      etp = (ExternalThing *) HAlloc(BIF_P, EXTERNAL_THING_HEAD_SIZE + 1);
       etp->header = make_external_pid_header(1);
       etp->next = MSO(BIF_P).first;
       etp->node = enp;
@@ -4046,10 +4232,11 @@ BIF_RETTYPE list_to_port_1(BIF_ALIST_1)
       if (is_nil(dep->cid))
 	  goto bad;
 
-      enp = erts_find_or_insert_node(dep->sysname, dep->creation);
+      etp = (ExternalThing *) HAlloc(BIF_P, EXTERNAL_THING_HEAD_SIZE + 1);
+      enp = erts_find_or_insert_node(dep->sysname, dep->creation,
+                                     make_boxed(&etp->header));
       ASSERT(enp != erts_this_node);
 
-      etp = (ExternalThing *) HAlloc(BIF_P, EXTERNAL_THING_HEAD_SIZE + 1);
       etp->header = make_external_port_header(1);
       etp->next = MSO(BIF_P).first;
       etp->node = enp;
@@ -4127,7 +4314,7 @@ BIF_RETTYPE list_to_ref_1(BIF_ALIST_1)
     if(dep == erts_this_dist_entry) {
         ErtsMagicBinary *mb;
         Uint32 sid;
-        if (refn[0] > MAX_REFERENCE) goto bad;
+        if (refn[0] >= MAX_REFERENCE) goto bad;
         if (n != ERTS_REF_NUMBERS) goto bad;
         sid = erts_get_ref_numbers_thr_id(refn);
         if (sid > erts_no_schedulers) goto bad;
@@ -4152,9 +4339,6 @@ BIF_RETTYPE list_to_ref_1(BIF_ALIST_1)
       if (is_nil(dep->cid))
 	  goto bad;
       
-      enp = erts_find_or_insert_node(dep->sysname, dep->creation);
-      ASSERT(enp != erts_this_node);
-
       hsz = EXTERNAL_THING_HEAD_SIZE;
 #if defined(ARCH_64)
       hsz += n/2 + 1;
@@ -4163,6 +4347,11 @@ BIF_RETTYPE list_to_ref_1(BIF_ALIST_1)
 #endif
 
       etp = (ExternalThing *) HAlloc(BIF_P, hsz);
+
+      enp = erts_find_or_insert_node(dep->sysname, dep->creation,
+                                     make_boxed(&etp->header));
+      ASSERT(enp != erts_this_node);
+
       etp->header = make_external_ref_header(n/2);
       etp->next = BIF_P->off_heap.first;
       etp->node = enp;
@@ -4282,21 +4471,21 @@ BIF_RETTYPE erts_internal_group_leader_2(BIF_ALIST_2)
     if (is_external_pid(BIF_ARG_2)) {
 	DistEntry *dep;
 	int code;
-	ErtsDSigData dsd;
+	ErtsDSigSendContext ctx;
 	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_PROC_LOCK_MAIN,
-				 ERTS_DSP_NO_LOCK, 0, 1);
+	code = erts_dsig_prepare(&ctx, dep, BIF_P, ERTS_PROC_LOCK_MAIN,
+				 ERTS_DSP_NO_LOCK, 0, 1, 1);
 	switch (code) {
 	case ERTS_DSIG_PREP_NOT_ALIVE:
 	case ERTS_DSIG_PREP_NOT_CONNECTED:
 	    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);
+	    code = erts_dsig_send_group_leader(&ctx, BIF_ARG_1, BIF_ARG_2);
 	    if (code == ERTS_DSIG_SEND_YIELD)
 		ERTS_BIF_YIELD_RETURN(BIF_P, am_true);
 	    BIF_RET(am_true);
@@ -4442,13 +4631,6 @@ BIF_RETTYPE system_flag_2(BIF_ALIST_2)
         erts_proc_lock(BIF_P, ERTS_PROC_LOCK_MAIN);
 
         BIF_RET(old_value);
-    } else if (BIF_ARG_1 == am_display_items) {
-	int oval = display_items;
-	if (!is_small(BIF_ARG_2) || (n = signed_val(BIF_ARG_2)) < 0) {
-	    goto error;
-	}
-	display_items = n < 32 ? 32 : n;
-	BIF_RET(make_small(oval));
     } else if (BIF_ARG_1 == am_debug_flags) {
 	BIF_RET(am_true);
     } else if (BIF_ARG_1 == am_backtrace_depth) {
@@ -4490,11 +4672,12 @@ BIF_RETTYPE system_flag_2(BIF_ALIST_2)
         ERTS_TRACER_CLEAR(&old_seq_tracer);
 
         BIF_RET(ret);
-    } else if (BIF_ARG_1 == make_small(1)) {
+    } else if (BIF_ARG_1 == am_reset_seq_trace) {
 	int i, max;
-	erts_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN);
-	erts_thr_progress_block();
 
+        erts_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN);
+        erts_thr_progress_block();
+        
 	max = erts_ptab_max(&erts_proc);
 	for (i = 0; i < max; i++) {
 	    Process *p = erts_pix2proc(i);
@@ -4506,13 +4689,14 @@ BIF_RETTYPE system_flag_2(BIF_ALIST_2)
 #endif
 		p->seq_trace_clock = 0;
 		p->seq_trace_lastcnt = 0;
-
+                erts_proc_lock(p, ERTS_PROC_LOCK_MAIN|ERTS_PROC_LOCK_MSGQ);
                 erts_proc_sig_clear_seq_trace_tokens(p);
+                erts_proc_unlock(p, ERTS_PROC_LOCK_MAIN|ERTS_PROC_LOCK_MSGQ);
 	    }
 	}
 
-	erts_thr_progress_unblock();
-	erts_proc_lock(BIF_P, ERTS_PROC_LOCK_MAIN);
+        erts_thr_progress_unblock();
+        erts_proc_lock(BIF_P, ERTS_PROC_LOCK_MAIN);
 
 	BIF_RET(am_true);
     } else if (BIF_ARG_1 == am_scheduler_wall_time) {
@@ -4627,6 +4811,9 @@ BIF_RETTYPE system_flag_2(BIF_ALIST_2)
 	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);
+    } else if (ERTS_IS_ATOM_STR("system_logger", BIF_ARG_1)) {
+        Eterm res = erts_set_system_logger(BIF_ARG_2);
+        if (is_value(res)) BIF_RET(res);
     }
     error:
     BIF_ERROR(BIF_P, BADARG);
@@ -4979,6 +5166,12 @@ erts_schedule_bif(Process *proc,
 	    pc = i;
 	    mfa = &exp->info.mfa;
 	}
+	else if (BeamIsOpCode(*i, op_call_bif_only_e)) {
+	    /* Pointer to bif export in i+1 */
+	    exp = (Export *) i[1];
+	    pc = i;
+	    mfa = &exp->info.mfa;
+	}
 	else if (BeamIsOpCode(*i, op_apply_bif)) {
 	    /* Pointer to bif in i+1, and mfa in i-3 */	    
 	    pc = c_p->cp;
@@ -5129,61 +5322,6 @@ erts_call_dirty_bif(ErtsSchedulerData *esdp, Process *c_p, BeamInstr *I, Eterm *
     return exiting;
 }
 
-
-
-#ifdef HARDDEBUG
-/*
-You'll need this line in bif.tab to be able to use this debug bif
-
-bif erlang:send_to_logger/2
-
-*/
-BIF_RETTYPE send_to_logger_2(BIF_ALIST_2)
-{
-    byte *buf;
-    ErlDrvSizeT len;
-    if (!is_atom(BIF_ARG_1) || !(is_list(BIF_ARG_2) ||
-				 is_nil(BIF_ARG_1))) {
-	BIF_ERROR(BIF_P,BADARG);
-    }
-    if (erts_iolist_size(BIF_ARG_2, &len) != 0)
-	BIF_ERROR(BIF_P,BADARG);
-    else if (len == 0)
-	buf = "";
-    else {
-#ifdef DEBUG
-	ErlDrvSizeT len2;
-#endif
-	buf = (byte *) erts_alloc(ERTS_ALC_T_TMP, len+1);
-#ifdef DEBUG
-	len2 =
-#else
-	(void)
-#endif
-	    erts_iolist_to_buf(BIF_ARG_2, buf, len);
-	ASSERT(len2 == len);
-	buf[len] = '\0';
-	switch (BIF_ARG_1) {
-	case am_info:
-	    erts_send_info_to_logger(BIF_P->group_leader, buf, len);
-	    break;
-	case am_warning:
-	    erts_send_warning_to_logger(BIF_P->group_leader, buf, len);
-	    break;
-	case am_error:
-	    erts_send_error_to_logger(BIF_P->group_leader, buf, len);
-	    break;
-	default:
-	{
-	    BIF_ERROR(BIF_P,BADARG);
-	}
-	}
-	erts_free(ERTS_ALC_T_TMP, (void *) buf);
-    }
-    BIF_RET(am_true);
-}
-#endif /* HARDDEBUG */
-
 BIF_RETTYPE get_module_info_1(BIF_ALIST_1)
 {
     Eterm ret = erts_module_info_0(BIF_P, BIF_ARG_1);
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab
index d4ba90a61a..602db106b1 100644
--- a/erts/emulator/beam/bif.tab
+++ b/erts/emulator/beam/bif.tab
@@ -41,7 +41,7 @@
 #
 
 
-gcbif erlang:abs/1
+ubif erlang:abs/1
 bif erlang:adler32/1
 bif erlang:adler32/2
 bif erlang:adler32_combine/3
@@ -66,7 +66,7 @@ bif erlang:exit/2
 bif erlang:exit_signal/2
 bif erlang:external_size/1
 bif erlang:external_size/2
-gcbif erlang:float/1
+ubif erlang:float/1
 bif erlang:float_to_list/1
 bif erlang:float_to_list/2
 bif erlang:fun_info/2
@@ -84,7 +84,7 @@ bif erlang:phash2/2
 ubif erlang:hd/1
 bif erlang:integer_to_list/1
 bif erlang:is_alive/0
-gcbif erlang:length/1
+ubif erlang:length/1
 bif erlang:link/1
 bif erlang:list_to_atom/1
 bif erlang:list_to_binary/1
@@ -133,10 +133,10 @@ bif erlang:processes/0
 bif erlang:put/2
 bif erlang:register/2
 bif erlang:registered/0
-gcbif erlang:round/1
+ubif erlang:round/1
 ubif erlang:self/0
 bif erlang:setelement/3
-gcbif erlang:size/1
+ubif erlang:size/1
 bif erlang:spawn/3
 bif erlang:spawn_link/3
 bif erlang:split_binary/2
@@ -146,7 +146,7 @@ bif erlang:term_to_binary/2
 bif erlang:throw/1
 bif erlang:time/0
 ubif erlang:tl/1
-gcbif erlang:trunc/1
+ubif erlang:trunc/1
 bif erlang:tuple_to_list/1
 bif erlang:universaltime/0
 bif erlang:universaltime_to_localtime/1
@@ -160,6 +160,8 @@ 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
+bif erlang:dist_ctrl_get_opt/2
+bif erlang:dist_ctrl_set_opt/3
 
 # Static native functions in erts_internal
 bif erts_internal:port_info/1
@@ -411,6 +413,7 @@ bif re:compile/1
 bif re:compile/2
 bif re:run/2
 bif re:run/3
+bif re:internal_run/4
 
 #
 # Bifs in lists module.
@@ -435,6 +438,7 @@ bif erts_debug:set_internal_state/2
 bif erts_debug:display/1
 bif erts_debug:dist_ext_to_term/2
 bif erts_debug:instructions/0
+bif erts_debug:interpreter_size/0
 bif erts_debug:dirty_cpu/2
 bif erts_debug:dirty_io/2
 bif erts_debug:dirty/3
@@ -481,8 +485,8 @@ bif erlang:list_to_existing_atom/1
 #
 ubif erlang:is_bitstring/1
 ubif erlang:tuple_size/1
-gcbif erlang:byte_size/1
-gcbif erlang:bit_size/1
+ubif erlang:byte_size/1
+ubif erlang:bit_size/1
 bif erlang:list_to_bitstring/1
 bif erlang:bitstring_to_list/1
 
@@ -534,8 +538,8 @@ bif erlang:binary_to_term/2
 #
 # The searching/splitting/substituting thingies
 #
-gcbif erlang:binary_part/2
-gcbif erlang:binary_part/3
+ubif erlang:binary_part/2
+ubif erlang:binary_part/3
 
 bif binary:compile_pattern/1
 bif binary:match/2
@@ -623,14 +627,13 @@ bif io:printable_range/0
 bif re:inspect/2
 
 ubif erlang:is_map/1
-gcbif erlang:map_size/1
+ubif erlang:map_size/1
 bif maps:find/2
 bif maps:get/2
 bif maps:from_list/1
 bif maps:is_key/2
 bif maps:keys/1
 bif maps:merge/2
-bif maps:new/0
 bif maps:put/3
 bif maps:remove/2
 bif maps:update/3
@@ -672,8 +675,8 @@ bif maps:take/2
 # New in 20.0
 #
 
-gcbif erlang:floor/1
-gcbif erlang:ceil/1
+ubif erlang:floor/1
+ubif erlang:ceil/1
 bif math:floor/1
 bif math:ceil/1
 bif math:fmod/2
@@ -725,3 +728,17 @@ bif erts_internal:counters_get/2
 bif erts_internal:counters_add/3
 bif erts_internal:counters_put/3
 bif erts_internal:counters_info/1
+
+#
+# New in 21.2.3
+#
+
+bif erts_internal:spawn_system_process/3
+
+#
+# New in 21.3
+#
+
+bif erlang:integer_to_list/2
+bif erlang:integer_to_binary/2
+bif persistent_term:get/2
diff --git a/erts/emulator/beam/bif_instrs.tab b/erts/emulator/beam/bif_instrs.tab
index 00854471a9..8e0caa38a3 100644
--- a/erts/emulator/beam/bif_instrs.tab
+++ b/erts/emulator/beam/bif_instrs.tab
@@ -31,13 +31,20 @@
 
 CALL_GUARD_BIF(BF, TmpReg, Dst) {
     Eterm result;
+#ifdef DEBUG
+    Eterm* orig_htop = HTOP;
+    Eterm* orig_stop = E;
+#endif
 
     ERTS_DBG_CHK_REDS(c_p, FCALLS);
     c_p->fcalls = FCALLS;
     PROCESS_MAIN_CHK_LOCKS(c_p);
     ASSERT(!ERTS_PROC_IS_EXITING(c_p));
     ERTS_CHK_MBUF_SZ(c_p);
+    DEBUG_SWAPOUT;
     result = (*$BF)(c_p, $TmpReg, I);
+    DEBUG_SWAPIN;
+    ASSERT(orig_htop == HTOP && orig_stop == E);
     ERTS_CHK_MBUF_SZ(c_p);
     ASSERT(!ERTS_PROC_IS_EXITING(c_p) || is_non_value(result));
     ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
@@ -51,237 +58,259 @@ CALL_GUARD_BIF(BF, TmpReg, Dst) {
     }
 }
 
-// Guard BIF in head.  On failure, ignore the error and jump
-// to the code for the next clause.  We don't support tracing
+// Guard BIF in head. On failure, ignore the error and jump
+// to the code for the next clause. We don't support tracing
 // of guard BIFs.
 
-bif1(Fail, Bif, Src, Dst) {
+i_bif1 := i_bif.fetch0.call;
+i_bif2 := i_bif.fetch1.fetch0.call;
+i_bif3 := i_bif.fetch2.fetch1.fetch0.call;
+
+i_bif.head() {
     ErtsBifFunc bf;
-    Eterm tmp_reg[1];
+    Eterm tmp_reg[3];
+}
 
+i_bif.fetch0(Src) {
     tmp_reg[0] = $Src;
-    bf = (BifFunction) $Bif;
-    $CALL_GUARD_BIF(bf, tmp_reg, $Dst);
-
-    $FAIL($Fail);
 }
 
-//
-// Guard BIF in body.  It can fail like any BIF.  No trace support.
-//
+i_bif.fetch1(Src) {
+    tmp_reg[1] = $Src;
+}
 
-bif1_body(Bif, Src, Dst) {
-    ErtsBifFunc bf;
-    Eterm tmp_reg[1];
+i_bif.fetch2(Src) {
+    tmp_reg[2] = $Src;
+}
 
-    tmp_reg[0] = $Src;
+i_bif.call(Fail, Bif, Dst) {
     bf = (BifFunction) $Bif;
     $CALL_GUARD_BIF(bf, tmp_reg, $Dst);
 
-    reg[0] = tmp_reg[0];
-    SWAPOUT;
-    I = handle_error(c_p, I, reg, ubif2mfa((void *) bf));
-    goto post_error_handling;
+    $FAIL($Fail);
 }
 
 //
-// Guard bif in guard with two arguments ('and'/2, 'or'/2, 'xor'/2).
+// Guard BIF in body. It can fail like any BIF. No trace support.
 //
 
-i_bif2(Fail, Bif, Src1, Src2, Dst) {
-    Eterm tmp_reg[2];
+i_bif1_body := i_bif_body.fetch0.call;
+i_bif2_body := i_bif_body.fetch1.fetch0.call;
+i_bif3_body := i_bif_body.fetch2.fetch1.fetch0.call;
+
+i_bif_body.head() {
     ErtsBifFunc bf;
+    Eterm tmp_reg[3];
+}
 
-    tmp_reg[0] = $Src1;
-    tmp_reg[1] = $Src2;
-    bf = (ErtsBifFunc) $Bif;
-    $CALL_GUARD_BIF(bf, tmp_reg, $Dst);
-    $FAIL($Fail);
+i_bif_body.fetch0(Src) {
+    tmp_reg[0] = $Src;
 }
 
-//
-// Guard bif in body with two arguments ('and'/2, 'or'/2, 'xor'/2).
-//
+i_bif_body.fetch1(Src) {
+    tmp_reg[1] = $Src;
+}
 
-i_bif2_body(Bif, Src1, Src2, Dst) {
-    Eterm tmp_reg[2];
-    ErtsBifFunc bf;
+i_bif_body.fetch2(Src) {
+    tmp_reg[2] = $Src;
+}
 
-    tmp_reg[0] = $Src1;
-    tmp_reg[1] = $Src2;
-    bf = (ErtsBifFunc) $Bif;
+i_bif_body.call(Bif, Dst) {
+    bf = (BifFunction) $Bif;
     $CALL_GUARD_BIF(bf, tmp_reg, $Dst);
+
     reg[0] = tmp_reg[0];
     reg[1] = tmp_reg[1];
+    reg[2] = tmp_reg[2];
     SWAPOUT;
     I = handle_error(c_p, I, reg, ubif2mfa((void *) bf));
     goto post_error_handling;
 }
 
 //
-// Garbage-collecting BIF with one argument in either guard or body.
+// length/1 is the only guard BIF that does not execute in constant
+// time. Here follows special instructions to allow the calculation of
+// the list length to be broken in several chunks to avoid hogging
+// the scheduler for a long time.
 //
 
-i_gc_bif1(Fail, Bif, Src, Live, Dst) {
-    typedef Eterm (*GcBifFunction)(Process*, Eterm*, Uint);
-    GcBifFunction bf;
-    Eterm result;
-    Uint live = (Uint) $Live;
+i_length_setup(Live, Src) {
+    Uint live = $Live;
+    Eterm src = $Src;
 
-    x(live) = $Src;
-    bf = (GcBifFunction) $Bif;
-    ERTS_DBG_CHK_REDS(c_p, FCALLS);
-    c_p->fcalls = FCALLS;
-    SWAPOUT;
-    PROCESS_MAIN_CHK_LOCKS(c_p);
-    ERTS_UNREQ_PROC_MAIN_LOCK(c_p);
-    ERTS_CHK_MBUF_SZ(c_p);
-    result = (*bf)(c_p, reg, live);
-    ERTS_CHK_MBUF_SZ(c_p);
-    ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
-    ERTS_REQ_PROC_MAIN_LOCK(c_p);
-    PROCESS_MAIN_CHK_LOCKS(c_p);
-    SWAPIN;
-    ERTS_HOLE_CHECK(c_p);
-    FCALLS = c_p->fcalls;
-    ERTS_DBG_CHK_REDS(c_p, FCALLS);
-    if (ERTS_LIKELY(is_value(result))) {
-        $REFRESH_GEN_DEST();
-        $Dst = result;
-        $NEXT0();
-    }
-    if (ERTS_LIKELY($Fail != 0)) { /* Handle error in guard. */
-        $JUMP($Fail);
-    }
+    reg[live] = src;
+    reg[live+1] = make_small(0);
+    reg[live+2] = src;
 
-    /* Handle error in body. */
-    x(0) = x(live);
-    I = handle_error(c_p, I, reg, gcbif2mfa((void *) bf));
-    goto post_error_handling;
+    /* This instruction is always followed by i_length */
+    SET_I($NEXT_INSTRUCTION);
+    goto i_length_start__;
+    //| -no_next
 }
 
 //
-// Garbage-collecting BIF with two arguments in either guard or body.
+// This instruction can be executed one or more times. When entering
+// this instruction, the X registers have the following contents:
+//
+// reg[live+0] The remainder of the list.
+// reg[live+1] The length so far (tagged integer).
+// reg[live+2] The original list. Only used if an error is generated
+//             (if the final tail of the list is not []).
 //
 
-i_gc_bif2(Fail, Bif, Live, Src1, Src2, Dst) {
-    typedef Eterm (*GcBifFunction)(Process*, Eterm*, Uint);
-    GcBifFunction bf;
-    Eterm result;
-    Uint live = (Uint) $Live;
+i_length := i_length.start.execute;
 
-    /*
-     * XXX This calling convention does not make sense. 'live'
-     * should point out the first argument, not the second
-     * (i.e. 'live' should not be incremented below).
-     */
-    x(live) = $Src1;
-    x(live+1) = $Src2;
-    live++;
+i_length.start() {
+ i_length_start__:
+    ;
+}
+
+i_length.execute(Fail, Live, Dst) {
+    Eterm result;
+    Uint live;
 
-    bf = (GcBifFunction) $Bif;
     ERTS_DBG_CHK_REDS(c_p, FCALLS);
     c_p->fcalls = FCALLS;
-    SWAPOUT;
     PROCESS_MAIN_CHK_LOCKS(c_p);
-    ERTS_UNREQ_PROC_MAIN_LOCK(c_p);
+    ASSERT(!ERTS_PROC_IS_EXITING(c_p));
     ERTS_CHK_MBUF_SZ(c_p);
-    result = (*bf)(c_p, reg, live);
+    DEBUG_SWAPOUT;
+
+    live = $Live;
+    result = erts_trapping_length_1(c_p, reg+live);
+
+    DEBUG_SWAPIN;
     ERTS_CHK_MBUF_SZ(c_p);
+    ASSERT(!ERTS_PROC_IS_EXITING(c_p) || is_non_value(result));
     ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
-    ERTS_REQ_PROC_MAIN_LOCK(c_p);
     PROCESS_MAIN_CHK_LOCKS(c_p);
-    SWAPIN;
     ERTS_HOLE_CHECK(c_p);
     FCALLS = c_p->fcalls;
     ERTS_DBG_CHK_REDS(c_p, FCALLS);
     if (ERTS_LIKELY(is_value(result))) {
+        /* Successful calculation of the list length. */
         $REFRESH_GEN_DEST();
         $Dst = result;
         $NEXT0();
+    } else if (c_p->freason == TRAP) {
+        /*
+         * Good so far, but there is more work to do. Yield.
+         */
+        $SET_CP_I_ABS(I);
+        SWAPOUT;
+        c_p->arity = live + 3;
+        c_p->current = NULL;
+        goto context_switch3;
+    } else {
+        /* Error. */
+        $BIF_ERROR_ARITY_1($Fail, BIF_length_1, reg[live+2]);
     }
-
-    if (ERTS_LIKELY($Fail != 0)) { /* Handle error in guard. */
-        $JUMP($Fail);
-    }
-
-    /* Handle error in body. */
-    live--;
-    x(0) = x(live);
-    x(1) = x(live+1);
-    I = handle_error(c_p, I, reg, gcbif2mfa((void *) bf));
-    goto post_error_handling;
+    //| -no_next
 }
 
 //
-// Garbage-collecting BIF with three arguments in either guard or body.
+// Call a BIF, store the result in x(0) and transfer control to the
+// next instruction.
 //
-
-i_gc_bif3(Fail, Bif, Live, Src2, Src3, Dst) {
-    typedef Eterm (*GcBifFunction)(Process*, Eterm*, Uint);
-    GcBifFunction bf;
+call_bif(Exp) {
+    ErtsBifFunc bf;
     Eterm result;
-    Uint live = (Uint) $Live;
+    ErlHeapFragment *live_hf_end;
+    Export *export = (Export*) $Exp;
 
-    /*
-     * XXX This calling convention does not make sense. 'live'
-     * should point out the first argument, not the third
-     * (i.e. 'live' should not be incremented below).
-     */
-    x(live) = x(SCRATCH_X_REG);
-    x(live+1) = $Src2;
-    x(live+2) = $Src3;
-    live += 2;
+    if (!((FCALLS - 1) > 0 || (FCALLS-1) > neg_o_reds)) {
+        /*
+         * If we have run out of reductions, do a context
+         * switch before calling the BIF.
+         */
+        c_p->arity = GET_BIF_ARITY(export);
+        c_p->current = &export->info.mfa;
+        goto context_switch3;
+    }
+
+    ERTS_MSACC_SET_BIF_STATE_CACHED_X(GET_BIF_MODULE(export),
+                                      GET_BIF_ADDRESS(export));
 
-    bf = (GcBifFunction) $Bif;
+    bf = GET_BIF_ADDRESS(export);
+
+    PRE_BIF_SWAPOUT(c_p);
     ERTS_DBG_CHK_REDS(c_p, FCALLS);
-    c_p->fcalls = FCALLS;
-    SWAPOUT;
-    PROCESS_MAIN_CHK_LOCKS(c_p);
-    ERTS_UNREQ_PROC_MAIN_LOCK(c_p);
+    c_p->fcalls = FCALLS - 1;
+    if (FCALLS <= 0) {
+        save_calls(c_p, export);
+    }
+    ASSERT(!ERTS_PROC_IS_EXITING(c_p));
+    ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
+    live_hf_end = c_p->mbuf;
     ERTS_CHK_MBUF_SZ(c_p);
-    result = (*bf)(c_p, reg, live);
+    result = (*bf)(c_p, reg, I);
     ERTS_CHK_MBUF_SZ(c_p);
+    ASSERT(!ERTS_PROC_IS_EXITING(c_p) || is_non_value(result));
     ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
+    ERTS_HOLE_CHECK(c_p);
     ERTS_REQ_PROC_MAIN_LOCK(c_p);
+    if (ERTS_IS_GC_DESIRED(c_p)) {
+        Uint arity = GET_BIF_ARITY(export);
+        result = erts_gc_after_bif_call_lhf(c_p, live_hf_end, result,
+                                            reg, arity);
+        E = c_p->stop;
+    }
     PROCESS_MAIN_CHK_LOCKS(c_p);
-    SWAPIN;
-    ERTS_HOLE_CHECK(c_p);
+    HTOP = HEAP_TOP(c_p);
     FCALLS = c_p->fcalls;
     ERTS_DBG_CHK_REDS(c_p, FCALLS);
+
+    /*
+     * We have to update the cache if we are enabled in order
+     * to make sure no bookkeeping is done after we disabled
+     * msacc. We don't always do this as it is quite expensive.
+     */
+    if (ERTS_MSACC_IS_ENABLED_CACHED_X()) {
+        ERTS_MSACC_UPDATE_CACHE_X();
+    }
+    ERTS_MSACC_SET_STATE_CACHED_M_X(ERTS_MSACC_STATE_EMULATOR);
     if (ERTS_LIKELY(is_value(result))) {
-        $REFRESH_GEN_DEST();
-        $Dst = result;
+        r(0) = result;
+        CHECK_TERM(r(0));
         $NEXT0();
+    } else if (c_p->freason == TRAP) {
+        /*
+         * Set the continuation pointer to return to next
+         * instruction after the trap (either by a return from
+         * erlang code or by nif_bif.epilogue() when the BIF
+         * is done).
+         */
+        SET_CP(c_p, $NEXT_INSTRUCTION);
+        SET_I(c_p->i);
+        SWAPIN;
+        Dispatch();
     }
 
-    /* Handle error in guard. */
-    if (ERTS_LIKELY($Fail != 0)) {
-        $JUMP($Fail);
-    }
-
-    /* Handle error in body. */
-    live -= 2;
-    x(0) = x(live);
-    x(1) = x(live+1);
-    x(2) = x(live+2);
-    I = handle_error(c_p, I, reg, gcbif2mfa((void *) bf));
+    /*
+     * Error handling.  SWAPOUT is not needed because it was done above.
+     */
+    ASSERT(c_p->stop == E);
+    I = handle_error(c_p, I, reg, &export->info.mfa);
     goto post_error_handling;
+    //| -no_next
 }
 
 //
-// The most general BIF call.  The BIF may build any amount of data
-// on the heap.  The result is always returned in r(0).
+// Call a BIF tail-recursively, storing the result in x(0) and doing
+// a return to the continuation poiner (c_p->cp).
 //
-call_bif(Exp) {
+
+call_bif_only(Exp) {
     ErtsBifFunc bf;
     Eterm result;
     ErlHeapFragment *live_hf_end;
     Export *export = (Export*) $Exp;
 
     if (!((FCALLS - 1) > 0 || (FCALLS-1) > neg_o_reds)) {
-        /* If we have run out of reductions, we do a context
-           switch before calling the bif */
+        /*
+         * If we have run out of reductions, do a context
+         * switch before calling the BIF.
+         */
         c_p->arity = GET_BIF_ARITY(export);
         c_p->current = &export->info.mfa;
         goto context_switch3;
@@ -318,19 +347,28 @@ call_bif(Exp) {
     HTOP = HEAP_TOP(c_p);
     FCALLS = c_p->fcalls;
     ERTS_DBG_CHK_REDS(c_p, FCALLS);
-    /* We have to update the cache if we are enabled in order
-       to make sure no book keeping is done after we disabled
-       msacc. We don't always do this as it is quite expensive. */
+
+    /*
+     * We have to update the cache if we are enabled in order
+     * to make sure no bookkeeping is done after we disabled
+     * msacc. We don't always do this as it is quite expensive.
+     */
     if (ERTS_MSACC_IS_ENABLED_CACHED_X()) {
         ERTS_MSACC_UPDATE_CACHE_X();
     }
     ERTS_MSACC_SET_STATE_CACHED_M_X(ERTS_MSACC_STATE_EMULATOR);
     if (ERTS_LIKELY(is_value(result))) {
+        /*
+         * Success. Store the result and return to the caller.
+         */
         r(0) = result;
         CHECK_TERM(r(0));
-        $NEXT0();
+        $return();
     } else if (c_p->freason == TRAP) {
-        SET_CP(c_p, I+2);
+        /*
+         * Dispatch to a trap. When the trap is done, a jump
+         * to the continuation pointer (c_p->cp) will be done.
+         */
         SET_I(c_p->i);
         SWAPIN;
         Dispatch();
@@ -342,6 +380,7 @@ call_bif(Exp) {
     ASSERT(c_p->stop == E);
     I = handle_error(c_p, I, reg, &export->info.mfa);
     goto post_error_handling;
+    //| -no_next
 }
 
 //
@@ -374,7 +413,7 @@ send() {
         r(0) = result;
         CHECK_TERM(r(0));
     } else if (c_p->freason == TRAP) {
-        SET_CP(c_p, I+1);
+        SET_CP(c_p, $NEXT_INSTRUCTION);
         SET_I(c_p->i);
         SWAPIN;
         Dispatch();
diff --git a/erts/emulator/beam/big.c b/erts/emulator/beam/big.c
index 84338769e0..522f50287a 100644
--- a/erts/emulator/beam/big.c
+++ b/erts/emulator/beam/big.c
@@ -429,6 +429,7 @@
 static const byte digits_per_sint_lookup[36-1];
 static const byte digits_per_small_lookup[36-1];
 static const Sint largest_power_of_base_lookup[36-1];
+static const double lg2_lookup[36-1];
 
 static ERTS_INLINE byte get_digits_per_signed_int(Uint base) {
     return digits_per_sint_lookup[base-2];
@@ -442,6 +443,10 @@ static ERTS_INLINE Sint get_largest_power_of_base(Uint base) {
     return largest_power_of_base_lookup[base-2];
 }
 
+static ERTS_INLINE double lookup_log2(Uint base) {
+    return lg2_lookup[base - 2];
+}
+
 /*
 ** compare two number vectors
 */
@@ -668,27 +673,25 @@ static dsize_t I_mul(ErtsDigit* x, dsize_t xl, ErtsDigit* y, dsize_t yl, ErtsDig
 
 static dsize_t I_sqr(ErtsDigit* x, dsize_t xl, ErtsDigit* r)
 {
-    ErtsDigit d_next = *x;
     ErtsDigit d;
     ErtsDigit* r0 = r;
     ErtsDigit* s = r;
 
     if ((r + xl) == x)	/* "Inline" operation */
 	*x = 0;
-    x++;
 	
     while(xl--) {
-	ErtsDigit* y = x;
+	ErtsDigit* y;
 	ErtsDigit y_0 = 0, y_1 = 0, y_2 = 0, y_3 = 0;
 	ErtsDigit b0, b1;
 	ErtsDigit z0, z1, z2;
 	ErtsDigit t;
 	dsize_t y_l = xl;
-		
+
+        d = *x;
+        x++;
+        y = x;
 	s = r;
-	d = d_next;
-	d_next = *x; 
-	x++;
 
 	DMUL(d, d, b1, b0);
 	DSUMc(*s, b0, y_3, t);
@@ -1159,8 +1162,11 @@ static dsize_t I_band(ErtsDigit* x, dsize_t xl, short xsgn,
 		*r++ = ~c1 & ~c2;
 		x++; y++;
 	    }
-	    while(xl--)
-		*r++ = ~*x++;
+	    while(xl--) {
+                DSUBb(*x,0,b1,c1);
+                *r++ = ~c1;
+		x++;
+            }
 	}
     }
     return I_btrail(r0, r, sign);
@@ -1719,23 +1725,23 @@ double_to_big(double x, Eterm *heap, Uint hsz)
 
 
 /*
- ** Estimate the number of decimal digits (include sign)
+ ** Estimate the number of digits in given base (include sign)
  */
-int big_decimal_estimate(Wterm x)
+int big_integer_estimate(Wterm x, Uint base)
 {
     Eterm* xp = big_val(x);
     int lg = I_lg(BIG_V(xp), BIG_SIZE(xp));
-    int lg10 = ((lg+1)*28/93)+1;
+    int lgBase = ((lg + 1) / lookup_log2(base)) + 1;
 
-    if (BIG_SIGN(xp)) lg10++;	/* add sign */
-    return lg10+1;		/* add null */
+    if (BIG_SIGN(xp)) lgBase++;	/* add sign */
+    return lgBase + 1;		/* add null */
 }
 
 /*
-** Convert a bignum into a string of decimal numbers
+** Convert a bignum into a string of numbers in given base
 */
-
-static Uint write_big(Wterm x, void (*write_func)(void *, char), void *arg)
+static Uint write_big(Wterm x, int base, void (*write_func)(void *, char),
+                      void *arg)
 {
     Eterm* xp = big_val(x);
     ErtsDigit* dx = BIG_V(xp);
@@ -1743,48 +1749,72 @@ static Uint write_big(Wterm x, void (*write_func)(void *, char), void *arg)
     short sign = BIG_SIGN(xp);
     ErtsDigit rem;
     Uint n = 0;
-    const Uint digits_per_Sint = get_digits_per_signed_int(10);
-    const Sint largest_pow_of_base = get_largest_power_of_base(10);
+    const Uint digits_per_Sint = get_digits_per_signed_int(base);
+    const Sint largest_pow_of_base = get_largest_power_of_base(base);
 
     if (xl == 1 && *dx < largest_pow_of_base) {
-	rem = *dx;
-	if (rem == 0) {
-	    (*write_func)(arg, '0'); n++;
-	} else {
-	    while(rem) {
-		(*write_func)(arg, (rem % 10) + '0'); n++;
-		rem /= 10;
-	    }
-	}
+        rem = *dx;
+        if (rem == 0) {
+            (*write_func)(arg, '0'); n++;
+        } else {
+            while(rem) {
+                int digit = rem % base;
+
+                if (digit < 10) {
+                    (*write_func)(arg, digit + '0'); n++;
+                } else {
+                    (*write_func)(arg, 'A' + (digit - 10)); n++;
+                }
+
+                rem /= base;
+            }
+        }
     } else {
-	ErtsDigit* tmp  = (ErtsDigit*) erts_alloc(ERTS_ALC_T_TMP,
-					      sizeof(ErtsDigit)*xl);
-	dsize_t tmpl = xl;
+        ErtsDigit* tmp = (ErtsDigit*) erts_alloc(ERTS_ALC_T_TMP,
+                                                 sizeof(ErtsDigit) * xl);
+        dsize_t tmpl = xl;
 
-	MOVE_DIGITS(tmp, dx, xl);
+        MOVE_DIGITS(tmp, dx, xl);
 
-	while(1) {
+        while(1) {
             tmpl = D_div(tmp, tmpl, largest_pow_of_base, tmp, &rem);
-	    if (tmpl == 1 && *tmp == 0) {
-		while(rem) {
-		    (*write_func)(arg, (rem % 10)+'0'); n++;
-		    rem /= 10;
-		}
-		break;
-	    } else {
+
+            if (tmpl == 1 && *tmp == 0) {
+                while(rem) {
+                    int digit = rem % base;
+
+                    if (digit < 10) {
+                        (*write_func)(arg, digit + '0'); n++;
+                    } else {
+                        (*write_func)(arg, 'A' + (digit - 10)); n++;
+                    }
+
+                    rem /= base;
+                }
+                break;
+            } else {
                 Uint i = digits_per_Sint;
-		while(i--) {
-		    (*write_func)(arg, (rem % 10)+'0'); n++;
-		    rem /= 10;
-		}
-	    }
-	}
-	erts_free(ERTS_ALC_T_TMP, (void *) tmp);
+
+                while(i--) {
+                    int digit = rem % base;
+
+                    if (digit < 10) {
+                        (*write_func)(arg, digit + '0'); n++;
+                    } else {
+                        (*write_func)(arg, 'A' + (digit - 10)); n++;
+                    }
+
+                    rem /= base;
+                }
+            }
+        }
+        erts_free(ERTS_ALC_T_TMP, (void *) tmp);
     }
 
     if (sign) {
-	(*write_func)(arg, '-'); n++;
+        (*write_func)(arg, '-'); n++;
     }
+
     return n;
 }
 
@@ -1801,12 +1831,12 @@ write_list(void *arg, char c)
     blp->hp += 2;
 }
 
-Eterm erts_big_to_list(Eterm x, Eterm **hpp)
+Eterm erts_big_to_list(Eterm x, int base, Eterm **hpp)
 {
     struct big_list__ bl;
     bl.hp = *hpp;
     bl.res = NIL;
-    write_big(x, write_list, (void *) &bl);
+    write_big(x, base, write_list, (void *) &bl);
     *hpp = bl.hp;
     return bl.res;
 }
@@ -1817,11 +1847,11 @@ write_string(void *arg, char c)
     *(--(*((char **) arg))) = c;
 }
 
-char *erts_big_to_string(Wterm x, char *buf, Uint buf_sz)
+char *erts_big_to_string(Wterm x, int base, char *buf, Uint buf_sz)
 {
     char *big_str = buf + buf_sz - 1;
     *big_str = '\0';
-    write_big(x, write_string, (void *) &big_str);
+    write_big(x, base, write_string, (void*)&big_str);
     ASSERT(buf <= big_str && big_str <= buf + buf_sz - 1);
     return big_str;
 }
@@ -1830,11 +1860,11 @@ char *erts_big_to_string(Wterm x, char *buf, Uint buf_sz)
  * e.g. 1 bsl 64 -> "18446744073709551616"
  */
 
-Uint erts_big_to_binary_bytes(Eterm x, char *buf, Uint buf_sz)
+Uint erts_big_to_binary_bytes(Eterm x, int base, char *buf, Uint buf_sz)
 {
     char *big_str = buf + buf_sz;
     Uint n;
-    n = write_big(x, write_string, (void *) &big_str);
+    n = write_big(x, base, write_string, (void *) &big_str);
     ASSERT(buf <= big_str && big_str <= buf + buf_sz);
     return n;
 }
@@ -2577,9 +2607,6 @@ static const double lg2_lookup[36-1] = {
     4.32193, 4.39232, 4.45943, 4.52356, 4.58496, 4.64386, 4.70044, 4.75489,
     4.80735, 4.85798, 4.90689, 4.9542, 5.0, 5.04439, 5.08746, 5.12928, 5.16993
 };
-static ERTS_INLINE double lookup_log2(Uint base) {
-    return lg2_lookup[base - 2];
-}
 
 /*
  * How many digits can fit into a signed int (Sint) for given base, we take
diff --git a/erts/emulator/beam/big.h b/erts/emulator/beam/big.h
index 7556205063..ad19cce395 100644
--- a/erts/emulator/beam/big.h
+++ b/erts/emulator/beam/big.h
@@ -42,7 +42,7 @@ typedef Uint16   ErtsHalfDigit;
 #undef  BIG_HAVE_DOUBLE_DIGIT
 typedef Uint32   ErtsHalfDigit;
 #else
-#error "can not determine machine size"
+#error "cannot determine machine size"
 #endif
 
 typedef Uint  dsize_t;	 /* Vector size type */
@@ -81,7 +81,11 @@ typedef Uint  dsize_t;	 /* Vector size type */
  * a Uint64 argument. Therefore, we must test the size of the argument
  * to ensure that the cast does not discard the high-order 32 bits.
  */
-#define _IS_SSMALL32(x) (((Uint32) ((((x)) >> (SMALL_BITS-1)) + 1)) < 2)
+#if defined(ARCH_32)
+#  define _IS_SSMALL32(x) (((Uint32) ((((x)) >> (SMALL_BITS-1)) + 1)) < 2)
+#else
+#  define _IS_SSMALL32(x) (1)
+#endif
 #define _IS_SSMALL64(x) (((Uint64) ((((x)) >> (SMALL_BITS-1)) + 1)) < 2)
 #define IS_SSMALL(x) (sizeof(x) == sizeof(Uint32) ? _IS_SSMALL32(x) : _IS_SSMALL64(x))
 
@@ -119,10 +123,10 @@ typedef Uint  dsize_t;	 /* Vector size type */
 
 #endif
 
-int big_decimal_estimate(Wterm);
-Eterm erts_big_to_list(Eterm, Eterm**);
-char *erts_big_to_string(Wterm x, char *buf, Uint buf_sz);
-Uint erts_big_to_binary_bytes(Eterm x, char *buf, Uint buf_sz);
+int big_integer_estimate(Wterm, Uint base);
+Eterm erts_big_to_list(Eterm, int base, Eterm**);
+char *erts_big_to_string(Wterm x, int base, char *buf, Uint buf_sz);
+Uint erts_big_to_binary_bytes(Eterm x, int base, char *buf, Uint buf_sz);
 
 Eterm small_times(Sint, Sint, Eterm*);
 
diff --git a/erts/emulator/beam/binary.c b/erts/emulator/beam/binary.c
index 6a349764b2..4ddf59092a 100644
--- a/erts/emulator/beam/binary.c
+++ b/erts/emulator/beam/binary.c
@@ -322,40 +322,102 @@ BIF_RETTYPE binary_to_integer_2(BIF_ALIST_2)
 
 }
 
+static Eterm integer_to_binary(Process *c_p, Eterm num, int base)
+{
+    Eterm res;
+
+    if (is_small(num)) {
+        char s[128];
+        char *c = s;
+        Uint digits;
+
+        digits = Sint_to_buf(signed_val(num), base, &c, sizeof(s));
+        res = new_binary(c_p, (byte*)c, digits);
+    } else {
+        const int DIGITS_PER_RED = 16;
+        Uint digits, n;
+        byte *bytes;
+
+        digits = big_integer_estimate(num, base);
+
+        if ((digits / DIGITS_PER_RED) > ERTS_BIF_REDS_LEFT(c_p)) {
+            ErtsSchedulerData *esdp = erts_get_scheduler_data();
+
+            /* This could take a very long time, tell the caller to reschedule
+             * us to a dirty CPU scheduler if we aren't already on one. */
+            if (esdp->type == ERTS_SCHED_NORMAL) {
+                return THE_NON_VALUE;
+            }
+        } else {
+            BUMP_REDS(c_p, digits / DIGITS_PER_RED);
+        }
+
+        bytes = (byte*)erts_alloc(ERTS_ALC_T_TMP, sizeof(byte) * digits);
+        n = erts_big_to_binary_bytes(num, base, (char*)bytes, digits);
+        res = new_binary(c_p, bytes + digits - n, n);
+        erts_free(ERTS_ALC_T_TMP, (void*)bytes);
+    }
+
+    return res;
+}
+
 BIF_RETTYPE integer_to_binary_1(BIF_ALIST_1)
-{   
-    Uint size;
+{
     Eterm res;
 
     if (is_not_integer(BIF_ARG_1)) {
-	BIF_ERROR(BIF_P, BADARG);
+        BIF_ERROR(BIF_P, BADARG);
     }
 
-    if (is_small(BIF_ARG_1)) {
-	char *c;
-	struct Sint_buf ibuf;
+    res = integer_to_binary(BIF_P, BIF_ARG_1, 10);
+
+    if (is_non_value(res)) {
+        Eterm args[1];
+        args[0] = BIF_ARG_1;
+        return erts_schedule_bif(BIF_P,
+                                 args,
+                                 BIF_I,
+                                 integer_to_binary_1,
+                                 ERTS_SCHED_DIRTY_CPU,
+                                 am_erlang,
+                                 am_integer_to_binary,
+                                 1);
+    }
 
-	/* Enhancement: If we can calculate the buffer size exactly
-	 * we could avoid an unnecessary copy of buffers.
-	 * Useful if size determination is faster than a copy.
-	 */
-	c = Sint_to_buf(signed_val(BIF_ARG_1), &ibuf);
-	size = sys_strlen(c);
-	res = new_binary(BIF_P, (byte *)c, size);
-    } else {
-	byte* bytes;
-	Uint n = 0;
+    return res;
+}
 
-	/* Here we also have multiple copies of buffers
-	 * due to new_binary interface
-	 */
-	size = big_decimal_estimate(BIF_ARG_1) - 1; /* remove null */
-	bytes = (byte*) erts_alloc(ERTS_ALC_T_TMP, sizeof(byte)*size);
-	n = erts_big_to_binary_bytes(BIF_ARG_1, (char *)bytes, size);
-	res = new_binary(BIF_P, bytes + size - n, n);
-	erts_free(ERTS_ALC_T_TMP, (void *) bytes);
+BIF_RETTYPE integer_to_binary_2(BIF_ALIST_2)
+{
+    Eterm res;
+    SWord base;
+
+    if (is_not_integer(BIF_ARG_1) || is_not_small(BIF_ARG_2)) {
+        BIF_ERROR(BIF_P, BADARG);
+    }
+
+    base = signed_val(BIF_ARG_2);
+    if (base < 2 || base > 36) {
+        BIF_ERROR(BIF_P, BADARG);
+    }
+
+    res = integer_to_binary(BIF_P, BIF_ARG_1, base);
+
+    if (is_non_value(res)) {
+        Eterm args[2];
+        args[0] = BIF_ARG_1;
+        args[1] = BIF_ARG_2;
+        return erts_schedule_bif(BIF_P,
+                                 args,
+                                 BIF_I,
+                                 integer_to_binary_2,
+                                 ERTS_SCHED_DIRTY_CPU,
+                                 am_erlang,
+                                 am_integer_to_binary,
+                                 2);
     }
-    BIF_RET(res);
+
+    return res;
 }
 
 #define ERTS_B2L_BYTES_PER_REDUCTION 256
@@ -1091,51 +1153,47 @@ BIF_RETTYPE list_to_bitstring_1(BIF_ALIST_1)
 
 BIF_RETTYPE split_binary_2(BIF_ALIST_2)
 {
-    Uint pos;
-    ErlSubBin* sb1;
-    ErlSubBin* sb2;
-    size_t orig_size;
-    Eterm orig;
-    Uint offset;
-    Uint bit_offset;
-    Uint bit_size;
-    Eterm* hp;
+    size_t orig_size, left_size, right_size;
+    Uint byte_offset, bit_offset, bit_size;
+    Uint split_at;
+
+    Eterm *hp, *hp_end;
+    Eterm left, right;
+    Eterm real_bin;
+    Eterm result;
+    byte *bptr;
 
     if (is_not_binary(BIF_ARG_1)) {
-	goto error;
-    }
-    if (!term_to_Uint(BIF_ARG_2, &pos)) {
-	goto error;
-    }
-    if ((orig_size = binary_size(BIF_ARG_1)) < pos) {
-	goto error;
+        BIF_ERROR(BIF_P, BADARG);
+    } else if (!term_to_Uint(BIF_ARG_2, &split_at)) {
+        BIF_ERROR(BIF_P, BADARG);
+    } else if ((orig_size = binary_size(BIF_ARG_1)) < split_at) {
+        BIF_ERROR(BIF_P, BADARG);
     }
-    hp = HAlloc(BIF_P, 2*ERL_SUB_BIN_SIZE+3);
-    ERTS_GET_REAL_BIN(BIF_ARG_1, orig, offset, bit_offset, bit_size);
-    sb1 = (ErlSubBin *) hp;
-    sb1->thing_word = HEADER_SUB_BIN;
-    sb1->size = pos;
-    sb1->offs = offset;
-    sb1->orig = orig;
-    sb1->bitoffs = bit_offset;
-    sb1->bitsize = 0;
-    sb1->is_writable = 0;
-    hp += ERL_SUB_BIN_SIZE;
-
-    sb2 = (ErlSubBin *) hp;
-    sb2->thing_word = HEADER_SUB_BIN;
-    sb2->size = orig_size - pos;
-    sb2->offs = offset + pos;
-    sb2->orig = orig;
-    sb2->bitoffs = bit_offset;
-    sb2->bitsize = bit_size;	/* The extra bits go into the second binary. */
-    sb2->is_writable = 0;
-    hp += ERL_SUB_BIN_SIZE;
-
-    return TUPLE2(hp, make_binary(sb1), make_binary(sb2));
-    
-    error:
-	BIF_ERROR(BIF_P, BADARG);
+
+    left_size = split_at;
+    right_size = orig_size - split_at;
+
+    ERTS_GET_REAL_BIN(BIF_ARG_1, real_bin, byte_offset, bit_offset, bit_size);
+    bptr = binary_bytes(real_bin);
+
+    hp = HAlloc(BIF_P, EXTRACT_SUB_BIN_HEAP_NEED * 2 + 3);
+    hp_end = hp + (EXTRACT_SUB_BIN_HEAP_NEED * 2 + 3);
+
+    left = erts_extract_sub_binary(&hp, real_bin, bptr,
+                                   byte_offset * 8 + bit_offset,
+                                   left_size * 8);
+
+    right = erts_extract_sub_binary(&hp, real_bin, bptr,
+                                    (byte_offset + split_at) * 8 + bit_offset,
+                                    right_size * 8 + bit_size);
+
+    result = TUPLE2(hp, left, right);
+    hp += 3;
+
+    HRelease(BIF_P, hp_end, hp);
+
+    return result;
 }
 
 
diff --git a/erts/emulator/beam/break.c b/erts/emulator/beam/break.c
index 9ff52c92b8..6379e4e04d 100644
--- a/erts/emulator/beam/break.c
+++ b/erts/emulator/beam/break.c
@@ -39,6 +39,7 @@
 #include "erl_hl_timer.h"
 #include "erl_thr_progress.h"
 #include "erl_proc_sig_queue.h"
+#include "dist.h"
 
 /* Forward declarations -- should really appear somewhere else */
 static void process_killer(void);
@@ -74,6 +75,7 @@ port_info(fmtfn_t to, void *to_arg)
 void
 process_info(fmtfn_t to, void *to_arg)
 {
+    ErtsSchedulerData *esdp = erts_get_scheduler_data();
     int i, max = erts_ptab_max(&erts_proc);
     for (i = 0; i < max; i++) {
 	Process *p = erts_pix2proc(i);
@@ -81,11 +83,36 @@ process_info(fmtfn_t to, void *to_arg)
 	    /* Do not include processes with no heap,
 	     * they are most likely just created and has invalid data
 	     */
-	    if (!ERTS_PROC_IS_EXITING(p) && p->heap != NULL)
-		print_process_info(to, to_arg, p);
+	    if (p->heap != NULL) {
+                ErtsProcLocks locks = ((esdp && (p == esdp->current_process ||
+                                                 p == esdp->free_process))
+                                       ? ERTS_PROC_LOCK_MAIN : 0);
+		print_process_info(to, to_arg, p, locks);
+            }
 	}
     }
 
+    /* Look for FREE processes in the run-queues and dist entries.
+       These have been removed from the ptab but we still want them
+       in the crash dump for debugging. */
+
+    /* First loop through all run-queues */
+    for (i = 0; i < erts_no_schedulers + ERTS_NUM_DIRTY_RUNQS; i++) {
+        ErtsRunQueue *rq = ERTS_RUNQ_IX(i);
+        int j;
+        for (j = 0; j < ERTS_NO_PROC_PRIO_QUEUES; j++) {
+            Process *p = rq->procs.prio[j].first;
+            while (p) {
+                if (ERTS_PSFLG_FREE & erts_atomic32_read_acqb(&p->state))
+                    print_process_info(to, to_arg, p, 0);
+                p = p->next;
+            }
+        }
+    }
+
+    /* Then check all dist entries */
+    erts_dist_print_procs_suspended_on_de(to, to_arg);
+
     port_info(to, to_arg);
 }
 
@@ -101,13 +128,14 @@ process_killer(void)
 	rp = erts_pix2proc(i);
 	if (rp && rp->i != ENULL) {
 	    int br;
-	    print_process_info(ERTS_PRINT_STDOUT, NULL, rp);
+	    print_process_info(ERTS_PRINT_STDOUT, NULL, rp, 0);
 	    erts_printf("(k)ill (n)ext (r)eturn:\n");
 	    while(1) {
 		if ((j = sys_get_key(0)) <= 0)
 		    erts_exit(0, "");
 		switch(j) {
 		case 'k':
+                    ASSERT(erts_init_process_id != ERTS_INVALID_PID);
                     /* Send a 'kill' exit signal from init process */
                     erts_proc_sig_send_exit(NULL, erts_init_process_id,
                                             rp->common.id, am_kill, NIL,
@@ -128,7 +156,7 @@ typedef struct {
     void *to_arg;
 } PrintMonitorContext;
 
-static void doit_print_link(ErtsLink *lnk, void *vpcontext)
+static int doit_print_link(ErtsLink *lnk, void *vpcontext, Sint reds)
 {
     PrintMonitorContext *pcontext = vpcontext;
     fmtfn_t to = pcontext->to;
@@ -140,10 +168,11 @@ static void doit_print_link(ErtsLink *lnk, void *vpcontext)
     } else {
 	erts_print(to, to_arg, ", %T", lnk->other.item);
     }
+    return 1;
 }
     
 
-static void doit_print_monitor(ErtsMonitor *mon, void *vpcontext)
+static int doit_print_monitor(ErtsMonitor *mon, void *vpcontext, Sint reds)
 {
     ErtsMonitorData *mdp;
     PrintMonitorContext *pcontext = vpcontext;
@@ -195,17 +224,20 @@ static void doit_print_monitor(ErtsMonitor *mon, void *vpcontext)
         /* ignore other monitors... */
         break;
     }
+    return 1;
 }
-			       
+
 /* Display info about an individual Erlang process */
 void
-print_process_info(fmtfn_t to, void *to_arg, Process *p)
+print_process_info(fmtfn_t to, void *to_arg, Process *p, ErtsProcLocks orig_locks)
 {
     int garbing = 0;
     int running = 0;
+    int exiting = 0;
     Sint len;
     struct saved_calls *scb;
     erts_aint32_t state;
+    ErtsProcLocks locks = orig_locks;
 
     /* display the PID */
     erts_print(to, to_arg, "=proc:%T\n", p->common.id);
@@ -222,11 +254,30 @@ print_process_info(fmtfn_t to, void *to_arg, Process *p)
 			| ERTS_PSFLG_DIRTY_RUNNING))
         running = 1;
 
+    if (state & ERTS_PSFLG_EXITING)
+        exiting = 1;
+
+    if (!(locks & ERTS_PROC_LOCK_MAIN)) {
+        locks |= ERTS_PROC_LOCK_MAIN;
+        if (ERTS_IS_CRASH_DUMPING) {
+            if (erts_proc_trylock(p, locks)) {
+                /* crash dumping and main lock taken, this probably means that
+                   the process is doing a GC on a dirty-scheduler... so we cannot
+                   do erts_proc_sig_fetch as that would potentially cause a segfault */
+                locks = 0;
+            }
+        } else {
+            erts_proc_lock(p, locks);
+        }
+    } else {
+        ERTS_ASSERT(locks == ERTS_PROC_LOCK_MAIN && "Only main lock should be held");
+    }
+
     /*
      * If the process is registered as a global process, display the
      * registered name
      */
-    if (p->common.u.alive.reg)
+    if (!ERTS_PROC_IS_EXITING(p) && p->common.u.alive.reg)
 	erts_print(to, to_arg, "Name: %T\n", p->common.u.alive.reg->name);
 
     /*
@@ -251,13 +302,19 @@ print_process_info(fmtfn_t to, void *to_arg, Process *p)
 
     erts_print(to, to_arg, "Spawned by: %T\n", p->parent);
 
-    erts_proc_lock(p, ERTS_PROC_LOCK_MSGQ);
-    len = erts_proc_sig_fetch(p);
-    erts_proc_unlock(p, ERTS_PROC_LOCK_MSGQ);
+    if (locks & ERTS_PROC_LOCK_MAIN) {
+        erts_proc_lock(p, ERTS_PROC_LOCK_MSGQ);
+        len = erts_proc_sig_fetch(p);
+        erts_proc_unlock(p, ERTS_PROC_LOCK_MSGQ);
+    } else {
+        len = p->sig_qs.len;
+    }
     erts_print(to, to_arg, "Message queue length: %d\n", len);
 
-    /* display the message queue only if there is anything in it */
-    if (!ERTS_IS_CRASH_DUMPING && p->sig_qs.first != NULL && !garbing) {
+    /* display the message queue only if there is anything in it
+       and we can do it safely */
+    if (!ERTS_IS_CRASH_DUMPING && p->sig_qs.first != NULL && !garbing
+        && (locks & ERTS_PROC_LOCK_MAIN)) {
 	erts_print(to, to_arg, "Message queue: [");
         ERTS_FOREACH_SIG_PRIVQS(
             p, mp,
@@ -306,7 +363,7 @@ print_process_info(fmtfn_t to, void *to_arg, Process *p)
     }
 
     /* display the links only if there are any*/
-    if (ERTS_P_LINKS(p) || ERTS_P_MONITORS(p) || ERTS_P_LT_MONITORS(p)) {
+    if (!exiting && (ERTS_P_LINKS(p) || ERTS_P_MONITORS(p) || ERTS_P_LT_MONITORS(p))) {
 	PrintMonitorContext context = {1, to, to_arg};
 	erts_print(to, to_arg,"Link list: [");
 	erts_link_tree_foreach(ERTS_P_LINKS(p), doit_print_link, &context);	
@@ -338,8 +395,12 @@ print_process_info(fmtfn_t to, void *to_arg, Process *p)
     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));
+    if (BIN_OLD_VHEAP_SZ(p) >= BIN_OLD_VHEAP(p)) {
+        erts_print(to, to_arg, "OldBinVHeap unused: %b64u\n",
+                   BIN_OLD_VHEAP_SZ(p) - BIN_OLD_VHEAP(p));
+    } else {
+        erts_print(to, to_arg, "OldBinVHeap unused: overflow\n");
+    }
     erts_print(to, to_arg, "Memory: %beu\n", erts_process_memory(p, !0));
 
     if (garbing) {
@@ -357,6 +418,8 @@ print_process_info(fmtfn_t to, void *to_arg, Process *p)
     /* Display all states */
     erts_print(to, to_arg, "Internal State: ");
     erts_dump_extended_process_state(to, to_arg, state);
+
+    erts_proc_unlock(p, locks & ~orig_locks);
 }
 
 static void
diff --git a/erts/emulator/beam/bs_instrs.tab b/erts/emulator/beam/bs_instrs.tab
index 61eb02a7a2..5f25bc2ad3 100644
--- a/erts/emulator/beam/bs_instrs.tab
+++ b/erts/emulator/beam/bs_instrs.tab
@@ -21,12 +21,57 @@
 
 %if ARCH_64
 BS_SAFE_MUL(A, B, Fail, Dst) {
-    Uint64 res = ($A) * ($B);
-    if (res / $B != $A) {
+    Uint a = $A;
+    Uint b = $B;
+    Uint res;
+#ifdef HAVE_OVERFLOW_CHECK_BUILTINS
+    if (__builtin_mul_overflow(a, b, &res)) {
+        $Fail;
+    }
+#else
+    res = a * b;
+    if (res / b != a) {
         $Fail;
     }
+#endif
     $Dst = res;
 }
+
+BS_GET_FIELD_SIZE(Bits, Unit, Fail, Dst) {
+    if (is_small($Bits)) {
+        Uint uint_size;
+        Sint signed_size = signed_val($Bits);
+        if (signed_size < 0) {
+            $Fail;
+        }
+        uint_size = (Uint) signed_size;
+        $BS_SAFE_MUL(uint_size, $Unit, $Fail, $Dst);
+    } else {
+        /*
+         * On a 64-bit architecture, the size of any binary
+         * that would fit in the memory fits in a small.
+         */
+        $Fail;
+    }
+}
+
+BS_GET_UNCHECKED_FIELD_SIZE(Bits, Unit, Fail, Dst) {
+    if (is_small($Bits)) {
+        Uint uint_size;
+        Sint signed_size = signed_val($Bits);
+        if (signed_size < 0) {
+            $Fail;
+        }
+        uint_size = (Uint) signed_size;
+        $Dst = uint_size * $Unit;
+    } else {
+        /*
+         * On a 64-bit architecture, the size of any binary
+         * that would fit in the memory fits in a small.
+         */
+        $Fail;
+    }
+}
 %else
 BS_SAFE_MUL(A, B, Fail, Dst) {
     Uint64 res = (Uint64)($A) * (Uint64)($B);
@@ -35,7 +80,6 @@ BS_SAFE_MUL(A, B, Fail, Dst) {
     }
     $Dst = res;
 }
-%endif
 
 BS_GET_FIELD_SIZE(Bits, Unit, Fail, Dst) {
     Sint signed_size;
@@ -76,11 +120,12 @@ BS_GET_UNCHECKED_FIELD_SIZE(Bits, Unit, Fail, Dst) {
     }
     $Dst = uint_size * $Unit;
 }
+%endif
 
 TEST_BIN_VHEAP(VNh, Nh, Live) {
     Uint need = $Nh;
     if (E - HTOP < need || MSO(c_p).overhead + $VNh >= BIN_VHEAP_SZ(c_p)) {
-        SWAPOUT;
+        $GC_SWAPOUT();
         PROCESS_MAIN_CHK_LOCKS(c_p);
         FCALLS -= erts_garbage_collect_nobump(c_p, need, reg, $Live, FCALLS);
         ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
@@ -90,32 +135,52 @@ TEST_BIN_VHEAP(VNh, Nh, Live) {
     HEAP_SPACE_VERIFIED(need);
 }
 
-i_bs_get_binary_all2(Fail, Ms, Live, Unit, Dst) {
+i_bs_get_binary_all2 := i_bs_get_binary_all2.fetch.execute;
+
+i_bs_get_binary_all2.head() {
+    Eterm context;
+}
+
+i_bs_get_binary_all2.fetch(Ctx) {
+    context = $Ctx;
+}
+
+i_bs_get_binary_all2.execute(Fail, Live, Unit, Dst) {
     ErlBinMatchBuffer *_mb;
     Eterm _result;
 
-    $GC_TEST(0, ERL_SUB_BIN_SIZE, $Live);
-    _mb = ms_matchbuffer($Ms);
+    $GC_TEST_PRESERVE(EXTRACT_SUB_BIN_HEAP_NEED, $Live, context);
+    _mb = ms_matchbuffer(context);
     if (((_mb->size - _mb->offset) % $Unit) == 0) {
         LIGHT_SWAPOUT;
         _result = erts_bs_get_binary_all_2(c_p, _mb);
         LIGHT_SWAPIN;
         HEAP_SPACE_VERIFIED(0);
         ASSERT(is_value(_result));
+        $REFRESH_GEN_DEST();
         $Dst = _result;
     } else {
 	HEAP_SPACE_VERIFIED(0);
 	$FAIL($Fail);
     }
 }
+i_bs_get_binary2 := i_bs_get_binary2.fetch.execute;
+
+i_bs_get_binary2.head() {
+    Eterm context;
+}
 
-i_bs_get_binary2(Fail, Ms, Live, Sz, Flags, Dst) {
+i_bs_get_binary2.fetch(Ctx) {
+    context = $Ctx;
+}
+
+i_bs_get_binary2.execute(Fail, Live, Sz, Flags, Dst) {
     ErlBinMatchBuffer *_mb;
     Eterm _result;
     Uint _size;
     $BS_GET_FIELD_SIZE($Sz, (($Flags) >> 3), $FAIL($Fail), _size);
-    $GC_TEST(0, ERL_SUB_BIN_SIZE, $Live);
-    _mb = ms_matchbuffer($Ms);
+    $GC_TEST_PRESERVE(EXTRACT_SUB_BIN_HEAP_NEED, $Live, context);
+    _mb = ms_matchbuffer(context);
     LIGHT_SWAPOUT;
     _result = erts_bs_get_binary_2(c_p, _size, $Flags, _mb);
     LIGHT_SWAPIN;
@@ -123,15 +188,26 @@ i_bs_get_binary2(Fail, Ms, Live, Sz, Flags, Dst) {
     if (is_non_value(_result)) {
         $FAIL($Fail);
     } else {
+        $REFRESH_GEN_DEST();
         $Dst = _result;
     }
 }
 
-i_bs_get_binary_imm2(Fail, Ms, Live, Sz, Flags, Dst) {
+i_bs_get_binary_imm2 := i_bs_get_binary_imm2.fetch.execute;
+
+i_bs_get_binary_imm2.head() {
+    Eterm context;
+}
+
+i_bs_get_binary_imm2.fetch(Ctx) {
+    context = $Ctx;
+}
+
+i_bs_get_binary_imm2.execute(Fail, Live, Sz, Flags, Dst) {
     ErlBinMatchBuffer *_mb;
     Eterm _result;
-    $GC_TEST(0, heap_bin_size(ERL_ONHEAP_BIN_LIMIT), $Live);
-    _mb = ms_matchbuffer($Ms);
+    $GC_TEST_PRESERVE(EXTRACT_SUB_BIN_HEAP_NEED, $Live, context);
+    _mb = ms_matchbuffer(context);
     LIGHT_SWAPOUT;
     _result = erts_bs_get_binary_2(c_p, $Sz, $Flags, _mb);
     LIGHT_SWAPIN;
@@ -139,11 +215,21 @@ i_bs_get_binary_imm2(Fail, Ms, Live, Sz, Flags, Dst) {
     if (is_non_value(_result)) {
         $FAIL($Fail);
     } else {
+        $REFRESH_GEN_DEST();
         $Dst = _result;
     }
 }
+i_bs_get_float2 := i_bs_get_float2.fetch.execute;
 
-i_bs_get_float2(Fail, Ms, Live, Sz, Flags, Dst) {
+i_bs_get_float2.head() {
+    Eterm context;
+}
+
+i_bs_get_float2.fetch(Ctx) {
+    context = $Ctx;
+}
+
+i_bs_get_float2.execute(Fail, Live, Sz, Flags, Dst) {
     ErlBinMatchBuffer *_mb;
     Eterm _result;
     Sint _size;
@@ -152,8 +238,8 @@ i_bs_get_float2(Fail, Ms, Live, Sz, Flags, Dst) {
         $FAIL($Fail);
     }
     _size *= (($Flags) >> 3);
-    $GC_TEST(0, FLOAT_SIZE_OBJECT, $Live);
-    _mb = ms_matchbuffer($Ms);
+    $GC_TEST_PRESERVE(FLOAT_SIZE_OBJECT, $Live, context);
+    _mb = ms_matchbuffer(context);
     LIGHT_SWAPOUT;
     _result = erts_bs_get_float_2(c_p, _size, ($Flags), _mb);
     LIGHT_SWAPIN;
@@ -161,17 +247,29 @@ i_bs_get_float2(Fail, Ms, Live, Sz, Flags, Dst) {
     if (is_non_value(_result)) {
         $FAIL($Fail);
     } else {
+        $REFRESH_GEN_DEST();
         $Dst = _result;
     }
 }
 
-i_bs_skip_bits2(Fail, Ms, Bits, Unit) {
+i_bs_skip_bits2 := i_bs_skip_bits2.fetch.execute;
+
+i_bs_skip_bits2.head() {
+    Eterm context, bits;
+}
+
+i_bs_skip_bits2.fetch(Ctx, Bits) {
+    context = $Ctx;
+    bits = $Bits;
+}
+
+i_bs_skip_bits2.execute(Fail, Unit) {
     ErlBinMatchBuffer *_mb;
     size_t new_offset;
     Uint _size;
 
-    _mb = ms_matchbuffer($Ms);
-    $BS_GET_FIELD_SIZE($Bits, $Unit, $FAIL($Fail), _size);
+    _mb = ms_matchbuffer(context);
+    $BS_GET_FIELD_SIZE(bits, $Unit, $FAIL($Fail), _size);
     new_offset = _mb->offset + _size;
     if (new_offset <= _mb->size) {
         _mb->offset = new_offset;
@@ -180,16 +278,6 @@ i_bs_skip_bits2(Fail, Ms, Bits, Unit) {
     }
 }
 
-i_bs_skip_bits_all2(Fail, Ms, Unit) {
-    ErlBinMatchBuffer *_mb;
-    _mb = ms_matchbuffer($Ms);
-    if (((_mb->size - _mb->offset) % $Unit) == 0) {
-        _mb->offset = _mb->size;
-    } else {
-        $FAIL($Fail);
-    }
-}
-
 i_bs_skip_bits_imm2(Fail, Ms, Bits) {
     ErlBinMatchBuffer *_mb;
     size_t new_offset;
@@ -203,15 +291,25 @@ i_bs_skip_bits_imm2(Fail, Ms, Bits) {
 }
 
 i_new_bs_put_binary(Fail, Sz, Flags, Src) {
+    Eterm sz = $Sz;
     Sint _size;
-    $BS_GET_UNCHECKED_FIELD_SIZE($Sz, (($Flags) >> 3), $BADARG($Fail), _size);
+    $BS_GET_UNCHECKED_FIELD_SIZE(sz, (($Flags) >> 3), $BADARG($Fail), _size);
     if (!erts_new_bs_put_binary(ERL_BITS_ARGS_2(($Src), _size))) {
         $BADARG($Fail);
     }
 }
+i_new_bs_put_binary_all := i_new_bs_put_binary_all.fetch.execute;
+
+i_new_bs_put_binary_all.head() {
+    Eterm src;
+}
+
+i_new_bs_put_binary_all.fetch(Src) {
+    src = $Src;
+}
 
-i_new_bs_put_binary_all(Fail, Src, Unit) {
-    if (!erts_new_bs_put_binary_all(ERL_BITS_ARGS_2(($Src), ($Unit)))) {
+i_new_bs_put_binary_all.execute(Fail, Unit) {
+    if (!erts_new_bs_put_binary_all(ERL_BITS_ARGS_2(src, ($Unit)))) {
         $BADARG($Fail);
     }
 }
@@ -223,9 +321,11 @@ i_new_bs_put_binary_imm(Fail, Sz, Src) {
 }
 
 i_new_bs_put_float(Fail, Sz, Flags, Src) {
+    Eterm sz = $Sz;
+    Eterm flags = $Flags;
     Sint _size;
-    $BS_GET_UNCHECKED_FIELD_SIZE($Sz, (($Flags) >> 3), $BADARG($Fail), _size);
-    if (!erts_new_bs_put_float(c_p, ($Src), _size, ($Flags))) {
+    $BS_GET_UNCHECKED_FIELD_SIZE(sz, (flags >> 3), $BADARG($Fail), _size);
+    if (!erts_new_bs_put_float(c_p, ($Src), _size, flags)) {
         $BADARG($Fail);
     }
 }
@@ -237,15 +337,27 @@ i_new_bs_put_float_imm(Fail, Sz, Flags, Src) {
 }
 
 i_new_bs_put_integer(Fail, Sz, Flags, Src) {
-   Sint _size;
-   $BS_GET_UNCHECKED_FIELD_SIZE($Sz, (($Flags) >> 3), $BADARG($Fail), _size);
-   if (!erts_new_bs_put_integer(ERL_BITS_ARGS_3(($Src), _size, ($Flags)))) {
-       $BADARG($Fail);
-   }
+    Eterm sz = $Sz;
+    Eterm flags = $Flags;
+    Sint _size;
+    $BS_GET_UNCHECKED_FIELD_SIZE(sz, (flags >> 3), $BADARG($Fail), _size);
+    if (!erts_new_bs_put_integer(ERL_BITS_ARGS_3(($Src), _size, flags))) {
+        $BADARG($Fail);
+    }
+}
+
+i_new_bs_put_integer_imm := i_new_bs_put_integer_imm.fetch.execute;
+
+i_new_bs_put_integer_imm.head() {
+    Eterm src;
+}
+
+i_new_bs_put_integer_imm.fetch(Src) {
+    src = $Src;
 }
 
-i_new_bs_put_integer_imm(Fail, Sz, Flags, Src) {
-    if (!erts_new_bs_put_integer(ERL_BITS_ARGS_3(($Src), ($Sz), ($Flags)))) {
+i_new_bs_put_integer_imm.execute(Fail, Sz, Flags) {
+    if (!erts_new_bs_put_integer(ERL_BITS_ARGS_3(src, ($Sz), ($Flags)))) {
         $BADARG($Fail);
     }
 }
@@ -724,26 +836,34 @@ bs_start_match.execute(Fail, Live, Slots, Dst) {
         $FAIL($Fail);
     }
     header = *boxed_val(context);
-    slots = $Slots;
+
+    /* Reserve a slot for the start position. */
+    slots = $Slots + 1;
     live = $Live;
+
     if (header_is_bin_matchstate(header)) {
         ErlBinMatchState* ms = (ErlBinMatchState *) boxed_val(context);
         Uint actual_slots = HEADER_NUM_SLOTS(header);
+
+        /* We're not compatible with contexts created by bs_start_match3. */
+        ASSERT(actual_slots >= 1);
+
         ms->save_offset[0] = ms->mb.offset;
-        if (actual_slots < slots) {
-            ErlBinMatchState* dst;
+        if (ERTS_UNLIKELY(actual_slots < slots)) {
+            ErlBinMatchState* expanded;
             Uint live = $Live;
             Uint wordsneeded = ERL_BIN_MATCHSTATE_SIZE(slots);
-
             $GC_TEST_PRESERVE(wordsneeded, live, context);
             ms = (ErlBinMatchState *) boxed_val(context);
-            dst = (ErlBinMatchState *) HTOP;
-            *dst = *ms;
+            expanded = (ErlBinMatchState *) HTOP;
+            *expanded = *ms;
             *HTOP = HEADER_BIN_MATCHSTATE(slots);
             HTOP += wordsneeded;
             HEAP_SPACE_VERIFIED(0);
-            $Dst = make_matchstate(dst);
+            context = make_matchstate(expanded);
+            $REFRESH_GEN_DEST();
         }
+        $Dst = context;
     } else if (is_binary_header(header)) {
         Eterm result;
         Uint wordsneeded = ERL_BIN_MATCHSTATE_SIZE(slots);
@@ -755,9 +875,8 @@ bs_start_match.execute(Fail, Live, Slots, Dst) {
         result = erts_bs_start_match_2(c_p, context, slots);
         HTOP = HEAP_TOP(c_p);
         HEAP_SPACE_VERIFIED(0);
-        if (is_non_value(result)) {
-            $FAIL($Fail);
-        }
+
+        $REFRESH_GEN_DEST();
         $Dst = result;
     } else {
         $FAIL($Fail);
@@ -796,9 +915,19 @@ bs_test_unit8(Fail, Ctx) {
     }
 }
 
-i_bs_get_integer_8(Ctx, Fail, Dst) {
+i_bs_get_integer_8 := i_bs_get_integer_8.fetch.execute;
+
+i_bs_get_integer_8.head() {
+    Eterm context;
+}
+
+i_bs_get_integer_8.fetch(Ctx) {
+    context = $Ctx;
+}
+
+i_bs_get_integer_8.execute(Fail, Dst) {
     Eterm _result;
-    ErlBinMatchBuffer* _mb = ms_matchbuffer($Ctx);
+    ErlBinMatchBuffer* _mb = ms_matchbuffer(context);
 
     if (_mb->size - _mb->offset < 8) {
         $FAIL($Fail);
@@ -812,9 +941,19 @@ i_bs_get_integer_8(Ctx, Fail, Dst) {
     $Dst = _result;
 }
 
-i_bs_get_integer_16(Ctx, Fail, Dst) {
+i_bs_get_integer_16 := i_bs_get_integer_16.fetch.execute;
+
+i_bs_get_integer_16.head() {
+    Eterm context;
+}
+
+i_bs_get_integer_16.fetch(Ctx) {
+    context = $Ctx;
+}
+
+i_bs_get_integer_16.execute(Fail, Dst) {
     Eterm _result;
-    ErlBinMatchBuffer* _mb = ms_matchbuffer($Ctx);
+    ErlBinMatchBuffer* _mb = ms_matchbuffer(context);
 
     if (_mb->size - _mb->offset < 16) {
         $FAIL($Fail);
@@ -829,9 +968,19 @@ i_bs_get_integer_16(Ctx, Fail, Dst) {
 }
 
 %if ARCH_64
-i_bs_get_integer_32(Ctx, Fail, Dst) {
+i_bs_get_integer_32 := i_bs_get_integer_32.fetch.execute;
+
+i_bs_get_integer_32.head() {
+    Eterm context;
+}
+
+i_bs_get_integer_32.fetch(Ctx) {
+    context = $Ctx;
+}
+
+i_bs_get_integer_32.execute(Fail, Dst) {
     Uint32 _integer;
-    ErlBinMatchBuffer* _mb = ms_matchbuffer($Ctx);
+    ErlBinMatchBuffer* _mb = ms_matchbuffer(context);
 
     if (_mb->size - _mb->offset < 32) {
         $FAIL($Fail);
@@ -881,15 +1030,23 @@ bs_get_integer.execute(Fail, Flags, Dst) {
     $Dst = result;
 }
 
-i_bs_get_integer(Fail, Live, FlagsAndUnit, Ms, Sz, Dst) {
+i_bs_get_integer := i_bs_get_integer.fetch.execute;
+
+i_bs_get_integer.head() {
+    Eterm context;
+}
+
+i_bs_get_integer.fetch(Ctx) {
+    context = $Ctx;
+}
+
+i_bs_get_integer.execute(Fail, Live, FlagsAndUnit, Sz, Dst) {
     Uint flags;
     Uint size;
-    Eterm ms;
     ErlBinMatchBuffer* mb;
     Eterm result;
 
     flags = $FlagsAndUnit;
-    ms = $Ms;
     $BS_GET_FIELD_SIZE($Sz, (flags >> 3), $FAIL($Fail), size);
     if (size >= SMALL_BITS) {
         Uint wordsneeded;
@@ -900,14 +1057,15 @@ i_bs_get_integer(Fail, Live, FlagsAndUnit, Ms, Sz, Dst) {
          * Remember to re-acquire the matchbuffer after gc.
          */
 
-        mb = ms_matchbuffer(ms);
+        mb = ms_matchbuffer(context);
         if (mb->size - mb->offset < size) {
             $FAIL($Fail);
         }
         wordsneeded = 1+WSIZE(NBYTES((Uint) size));
-        $GC_TEST_PRESERVE(wordsneeded, $Live, ms);
+        $GC_TEST_PRESERVE(wordsneeded, $Live, context);
+        $REFRESH_GEN_DEST();
     }
-    mb = ms_matchbuffer(ms);
+    mb = ms_matchbuffer(context);
     LIGHT_SWAPOUT;
     result = erts_bs_get_integer_2(c_p, size, flags, mb);
     LIGHT_SWAPIN;
@@ -918,9 +1076,19 @@ i_bs_get_integer(Fail, Live, FlagsAndUnit, Ms, Sz, Dst) {
     $Dst = result;
 }
 
-i_bs_get_utf8(Ctx, Fail, Dst) {
+i_bs_get_utf8 := i_bs_get_utf8.fetch.execute;
+
+i_bs_get_utf8.head() {
+    Eterm context;
+}
+
+i_bs_get_utf8.fetch(Ctx) {
+    context = $Ctx;
+}
+
+i_bs_get_utf8.execute(Fail, Dst) {
     Eterm result;
-    ErlBinMatchBuffer* mb = ms_matchbuffer($Ctx);
+    ErlBinMatchBuffer* mb = ms_matchbuffer(context);
 
     if (mb->size - mb->offset < 8) {
         $FAIL($Fail);
@@ -939,21 +1107,32 @@ i_bs_get_utf8(Ctx, Fail, Dst) {
     if (is_non_value(result)) {
         $FAIL($Fail);
     }
+    $REFRESH_GEN_DEST();
     $Dst = result;
 }
 
-i_bs_get_utf16(Ctx, Fail, Flags, Dst) {
-    ErlBinMatchBuffer* mb = ms_matchbuffer($Ctx);
+i_bs_get_utf16 := i_bs_get_utf16.fetch.execute;
+
+i_bs_get_utf16.head() {
+    Eterm context;
+}
+
+i_bs_get_utf16.fetch(Ctx) {
+    context = $Ctx;
+}
+
+i_bs_get_utf16.execute(Fail, Flags, Dst) {
+    ErlBinMatchBuffer* mb = ms_matchbuffer(context);
     Eterm result = erts_bs_get_utf16(mb, $Flags);
 
     if (is_non_value(result)) {
         $FAIL($Fail);
     }
+    $REFRESH_GEN_DEST();
     $Dst = result;
 }
 
 bs_context_to_binary := ctx_to_bin.fetch.execute;
-i_bs_get_binary_all_reuse := ctx_to_bin.fetch_bin.execute;
 
 ctx_to_bin.head() {
     Eterm context;
@@ -976,16 +1155,6 @@ ctx_to_bin.fetch(Src) {
     }
 }
 
-ctx_to_bin.fetch_bin(Src, Fail, Unit) {
-    context = $Src;
-    mb = ms_matchbuffer(context);
-    size = mb->size - mb->offset;
-    if (size % $Unit != 0) {
-        $FAIL($Fail);
-    }
-    offs = mb->offset;
-}
-
 ctx_to_bin.execute() {
     Uint hole_size;
     Uint orig = mb->orig;
@@ -1029,10 +1198,325 @@ i_bs_match_string(Ctx, Fail, Bits, Ptr) {
 
 i_bs_save2(Src, Slot) {
     ErlBinMatchState* _ms = (ErlBinMatchState*) boxed_val((Eterm) $Src);
+    ASSERT(HEADER_NUM_SLOTS(_ms->thing_word) > $Slot);
     _ms->save_offset[$Slot] = _ms->mb.offset;
 }
 
 i_bs_restore2(Src, Slot) {
     ErlBinMatchState* _ms = (ErlBinMatchState*) boxed_val((Eterm) $Src);
+    ASSERT(HEADER_NUM_SLOTS(_ms->thing_word) > $Slot);
     _ms->mb.offset = _ms->save_offset[$Slot];
 }
+
+bs_get_tail := bs_get_tail.fetch.execute;
+
+bs_get_tail.head() {
+    Eterm context;
+}
+
+bs_get_tail.fetch(Src) {
+    context = $Src;
+}
+
+bs_get_tail.execute(Dst, Live) {
+    ErlBinMatchBuffer* mb;
+    Uint size, offs;
+    ErlSubBin* sb;
+
+    ASSERT(header_is_bin_matchstate(*boxed_val(context)));
+
+    $GC_TEST_PRESERVE(ERL_SUB_BIN_SIZE, $Live, context);
+
+    mb = ms_matchbuffer(context);
+
+    offs = mb->offset;
+    size = mb->size - offs;
+
+    sb = (ErlSubBin *) HTOP;
+    HTOP += ERL_SUB_BIN_SIZE;
+
+    sb->thing_word = HEADER_SUB_BIN;
+    sb->size = BYTE_OFFSET(size);
+    sb->bitsize = BIT_OFFSET(size);
+    sb->offs = BYTE_OFFSET(offs);
+    sb->bitoffs = BIT_OFFSET(offs);
+    sb->is_writable = 0;
+    sb->orig = mb->orig;
+
+    $REFRESH_GEN_DEST();
+    $Dst = make_binary(sb);
+}
+
+
+%if ARCH_64
+
+i_bs_start_match3_gp := i_bs_start_match3_gp.fetch.execute;
+
+i_bs_start_match3_gp.head() {
+    Eterm context;
+}
+
+i_bs_start_match3_gp.fetch(Src) {
+    context = $Src;
+}
+
+i_bs_start_match3_gp.execute(Live, Fail, Dst, Pos) {
+    Eterm header;
+    Uint position, live;
+
+    live = $Live;
+
+    if (!is_boxed(context)) {
+        $FAIL($Fail);
+    }
+
+    header = *boxed_val(context);
+
+    if (header_is_bin_matchstate(header)) {
+        ErlBinMatchBuffer *mb;
+
+        ASSERT(HEADER_NUM_SLOTS(header) == 0);
+
+        mb = ms_matchbuffer(context);
+        position = mb->offset;
+
+        $Dst = context;
+    } else if (is_binary_header(header)) {
+        ErlBinMatchState *ms;
+
+        $GC_TEST_PRESERVE(ERL_BIN_MATCHSTATE_SIZE(0), live, context);
+        HEAP_TOP(c_p) = HTOP;
+#ifdef DEBUG
+        c_p->stop = E;	/* Needed for checking in HeapOnlyAlloc(). */
+#endif
+        ms = erts_bs_start_match_3(c_p, context);
+        HTOP = HEAP_TOP(c_p);
+        HEAP_SPACE_VERIFIED(0);
+
+        $REFRESH_GEN_DEST();
+        $Dst = make_matchstate(ms);
+        position = ms->mb.offset;
+    } else {
+        $FAIL($Fail);
+    }
+
+    ASSERT(IS_USMALL(0, position));
+    $Pos = make_small(position);
+}
+
+i_bs_start_match3 := i_bs_start_match3.fetch.execute;
+
+i_bs_start_match3.head() {
+    Eterm context;
+}
+
+i_bs_start_match3.fetch(Src) {
+    context = $Src;
+}
+
+i_bs_start_match3.execute(Live, Fail, Dst) {
+    Eterm header;
+    Uint live;
+
+    live = $Live;
+
+    if (!is_boxed(context)) {
+        $FAIL($Fail);
+    }
+
+    header = *boxed_val(context);
+
+    if (header_is_bin_matchstate(header)) {
+        ASSERT(HEADER_NUM_SLOTS(header) == 0);
+        $Dst = context;
+    } else if (is_binary_header(header)) {
+        ErlBinMatchState *ms;
+
+        $GC_TEST_PRESERVE(ERL_BIN_MATCHSTATE_SIZE(0), live, context);
+        HEAP_TOP(c_p) = HTOP;
+#ifdef DEBUG
+        c_p->stop = E;	/* Needed for checking in HeapOnlyAlloc(). */
+#endif
+        ms = erts_bs_start_match_3(c_p, context);
+        HTOP = HEAP_TOP(c_p);
+        HEAP_SPACE_VERIFIED(0);
+
+        $REFRESH_GEN_DEST();
+        $Dst = make_matchstate(ms);
+    } else {
+        $FAIL($Fail);
+    }
+}
+
+bs_set_position(Ctx, Pos) {
+    ErlBinMatchBuffer* mb;
+    Eterm context;
+
+    context = $Ctx;
+    ASSERT(header_is_bin_matchstate(*boxed_val(context)));
+
+    mb = ms_matchbuffer(context);
+    mb->offset = unsigned_val($Pos);
+}
+
+i_bs_get_position(Ctx, Dst) {
+    ErlBinMatchBuffer* mb;
+    Eterm context;
+
+    context = $Ctx;
+    ASSERT(header_is_bin_matchstate(*boxed_val(context)));
+
+    mb = ms_matchbuffer(context);
+    $Dst = make_small(mb->offset);
+}
+
+%else
+
+#
+# Unlike their 64-bit counterparts, the 32-bit position instructions operate on
+# an offset from the "base position" of the context because storing raw
+# positions would lead to the creation of far too many bigints.
+#
+# When a match context is reused we check whether its position fits into an
+# immediate, and create a new match context if it does not. This means we only
+# have to allocate stuff roughly once every 16MB rather than every time we
+# match at a position beyond 16MB.
+#
+
+bs_set_position := bs_set_position.fetch.execute;
+
+bs_set_position.head() {
+    Eterm context, position;
+}
+
+bs_set_position.fetch(Ctx, Pos) {
+    context = $Ctx;
+    position = $Pos;
+}
+
+bs_set_position.execute() {
+    ErlBinMatchState *ms;
+
+    ASSERT(header_is_bin_matchstate(*boxed_val(context)));
+    ms = (ErlBinMatchState*)boxed_val(context);
+
+    if (ERTS_LIKELY(is_small(position))) {
+        ms->mb.offset = ms->save_offset[0] + unsigned_val(position);
+    } else {
+        ASSERT(is_big(position));
+        ms->mb.offset = ms->save_offset[0] + *BIG_V(big_val(position));
+    }
+}
+
+bs_get_position := bs_get_position.fetch.execute;
+
+bs_get_position.head() {
+    Eterm context;
+}
+
+bs_get_position.fetch(Ctx) {
+    context = $Ctx;
+}
+
+bs_get_position.execute(Dst, Live) {
+    ErlBinMatchState *ms;
+    Uint position;
+
+    ASSERT(header_is_bin_matchstate(*boxed_val(context)));
+    ms = (ErlBinMatchState*)boxed_val(context);
+
+    position = ms->mb.offset - ms->save_offset[0];
+
+    if (ERTS_LIKELY(IS_USMALL(0, position))) {
+        $Dst = make_small(position);
+    } else {
+        Eterm *hp;
+
+        $GC_TEST_PRESERVE(BIG_UINT_HEAP_SIZE, $Live, context);
+
+        hp = HTOP;
+        HTOP += BIG_UINT_HEAP_SIZE;
+
+        *hp = make_pos_bignum_header(1);
+        BIG_DIGIT(hp, 0) = position;
+
+        $REFRESH_GEN_DEST();
+        $Dst = make_big(hp);
+    }
+}
+
+i_bs_start_match3 := i_bs_start_match3.fetch.execute;
+
+i_bs_start_match3.head() {
+    Eterm context;
+}
+
+i_bs_start_match3.fetch(Src) {
+    context = $Src;
+}
+
+i_bs_start_match3.execute(Live, Fail, Dst) {
+    Eterm header;
+    Uint live;
+
+    live = $Live;
+
+    if (!is_boxed(context)) {
+        $FAIL($Fail);
+    }
+
+    header = *boxed_val(context);
+
+    if (header_is_bin_matchstate(header)) {
+        ErlBinMatchState *current_ms;
+        Uint position;
+
+        ASSERT(HEADER_NUM_SLOTS(header) == 1);
+
+        current_ms = (ErlBinMatchState*)boxed_val(context);
+        position = current_ms->mb.offset - current_ms->save_offset[0];
+
+        if (ERTS_LIKELY(IS_USMALL(0, position))) {
+            $Dst = context;
+        } else {
+            ErlBinMatchState *new_ms;
+
+            $GC_TEST_PRESERVE(ERL_BIN_MATCHSTATE_SIZE(1), live, context);
+            current_ms = (ErlBinMatchState*)boxed_val(context);
+
+            new_ms = (ErlBinMatchState*)HTOP;
+            HTOP += ERL_BIN_MATCHSTATE_SIZE(1);
+
+            new_ms->thing_word = HEADER_BIN_MATCHSTATE(1);
+            new_ms->save_offset[0] = current_ms->mb.offset;
+            new_ms->mb = current_ms->mb;
+
+            $REFRESH_GEN_DEST();
+            $Dst = make_matchstate(new_ms);
+        }
+    } else if (is_binary_header(header)) {
+        Eterm result;
+
+        $GC_TEST_PRESERVE(ERL_BIN_MATCHSTATE_SIZE(1), live, context);
+        HEAP_TOP(c_p) = HTOP;
+
+#ifdef DEBUG
+        c_p->stop = E;	/* Needed for checking in HeapOnlyAlloc(). */
+#endif
+
+        /* We intentionally use erts_bs_start_match_2 so that we can use
+         * save_offset as a base for all saved positions on this context,
+         * allowing us to avoid bigints for much longer. */
+        result = erts_bs_start_match_2(c_p, context, 1);
+
+        HTOP = HEAP_TOP(c_p);
+        HEAP_SPACE_VERIFIED(0);
+
+        $REFRESH_GEN_DEST();
+        $Dst = result;
+    } else {
+        $FAIL($Fail);
+    }
+}
+
+%endif
diff --git a/erts/emulator/beam/copy.c b/erts/emulator/beam/copy.c
index e7bd046e18..9bbcba6f3b 100644
--- a/erts/emulator/beam/copy.c
+++ b/erts/emulator/beam/copy.c
@@ -604,7 +604,12 @@ cleanup:
 /*
  *  Copy a structure to a heap.
  */
-Eterm copy_struct_x(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap, Uint *bsz, erts_literal_area_t *litopt)
+Eterm copy_struct_x(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap,
+                    Uint *bsz, erts_literal_area_t *litopt
+#ifdef ERTS_COPY_REGISTER_LOCATION
+                    , char *file, int line
+#endif
+    )
 {
     char* hstart;
     Uint hsize;
@@ -854,7 +859,11 @@ Eterm copy_struct_x(Eterm obj, Uint sz, Eterm** hpp, ErlOffHeap* off_heap, Uint
 	    case EXTERNAL_REF_SUBTAG:
 		{
 		  ExternalThing *etp = (ExternalThing *) objp;
-		  erts_refc_inc(&etp->node->refc, 2);
+#if defined(ERTS_COPY_REGISTER_LOCATION) && defined(ERL_NODE_BOOKKEEP)
+		  erts_ref_node_entry__(etp->node, 2, make_boxed(htop), file, line);
+#else
+		  erts_ref_node_entry(etp->node, 2, make_boxed(htop));
+#endif
 		}
 	    L_off_heap_node_container_common:
 		{
@@ -1326,8 +1335,13 @@ Uint copy_shared_calculate(Eterm obj, erts_shcopy_t *info)
  *  Copy object "obj" preserving sharing.
  *  Second half: copy and restore the object.
  */
-Uint copy_shared_perform(Eterm obj, Uint size, erts_shcopy_t *info,
-                         Eterm** hpp, ErlOffHeap* off_heap) {
+Uint copy_shared_perform_x(Eterm obj, Uint size, erts_shcopy_t *info,
+                           Eterm** hpp, ErlOffHeap* off_heap
+#ifdef ERTS_COPY_REGISTER_LOCATION
+                           , char *file, int line
+#endif
+    )
+{
     Uint e;
     unsigned sz;
     Eterm* ptr;
@@ -1393,7 +1407,11 @@ Uint copy_shared_perform(Eterm obj, Uint size, erts_shcopy_t *info,
                     *resp = obj;
                 } else {
                     Uint bsz = 0;
-                    *resp = copy_struct_x(obj, hbot - hp, &hp, off_heap, &bsz, NULL); /* copy literal */
+                    *resp = copy_struct_x(obj, hbot - hp, &hp, off_heap, &bsz, NULL
+#ifdef ERTS_COPY_REGISTER_LOCATION
+                                          , file, line
+#endif
+                        ); /* copy literal */
                     hbot -= bsz;
                 }
 		goto cleanup_next;
@@ -1461,7 +1479,11 @@ Uint copy_shared_perform(Eterm obj, Uint size, erts_shcopy_t *info,
                     *resp = obj;
                 } else {
                     Uint bsz = 0;
-                    *resp = copy_struct_x(obj, hbot - hp, &hp, off_heap, &bsz, NULL); /* copy literal */
+                    *resp = copy_struct_x(obj, hbot - hp, &hp, off_heap, &bsz, NULL
+#ifdef ERTS_COPY_REGISTER_LOCATION
+                                          , file, line
+#endif
+                        ); /* copy literal */
                     hbot -= bsz;
                 }
 		goto cleanup_next;
@@ -1660,7 +1682,12 @@ Uint copy_shared_perform(Eterm obj, Uint size, erts_shcopy_t *info,
 	    case EXTERNAL_REF_SUBTAG:
 	    {
 		ExternalThing *etp = (ExternalThing *) ptr;
-		erts_refc_inc(&etp->node->refc, 2);
+                
+#if defined(ERTS_COPY_REGISTER_LOCATION) && defined(ERL_NODE_BOOKKEEP)
+                erts_ref_node_entry__(etp->node, 2, make_boxed(hp), file, line);
+#else
+                erts_ref_node_entry(etp->node, 2, make_boxed(hp));
+#endif
 	    }
 	  off_heap_node_container_common:
 	    {
@@ -1823,8 +1850,12 @@ all_clean:
  *
  * NOTE: Assumes that term is a tuple (ptr is an untagged tuple ptr).
  */
-Eterm copy_shallow(Eterm* ERTS_RESTRICT ptr, Uint sz, Eterm** hpp,
-                   ErlOffHeap* off_heap)
+Eterm
+copy_shallow_x(Eterm* ERTS_RESTRICT ptr, Uint sz, Eterm** hpp, ErlOffHeap* off_heap
+#ifdef ERTS_COPY_REGISTER_LOCATION
+               , char *file, int line
+#endif
+    )
 {
     Eterm* tp = ptr;
     Eterm* hp = *hpp;
@@ -1866,7 +1897,11 @@ Eterm copy_shallow(Eterm* ERTS_RESTRICT ptr, Uint sz, Eterm** hpp,
 	    case EXTERNAL_REF_SUBTAG:
 		{
 		    ExternalThing* etp = (ExternalThing *) (tp-1);
-		    erts_refc_inc(&etp->node->refc, 2);
+#if defined(ERTS_COPY_REGISTER_LOCATION) && defined(ERL_NODE_BOOKKEEP)
+                    erts_ref_node_entry__(etp->node, 2, make_boxed(hp-1), file, line);
+#else
+                    erts_ref_node_entry(etp->node, 2, make_boxed(hp-1));
+#endif
 		}
 	    off_heap_common:
 		{
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
index 0633bff3c2..eb9e749a08 100644
--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
@@ -50,19 +50,26 @@
 #define DIST_CTL_DEFAULT_SIZE 64
 
 /* Turn this on to get printouts of all distribution messages
- * which go on the line
+ * which go on the line. Enabling this may make some testcases
+ * fail. Especially the broken dist testcases in distribution_SUITE.
  */
 #if 0
 #define ERTS_DIST_MSG_DBG
 #endif
 #if 0
+/* Enable this to print the dist debug messages to a file instead */
+#define ERTS_DIST_MSG_DBG_FILE "/tmp/dist_dbg.%d"
+#endif
+#if 0
+/* Enable this to print the raw bytes sent and received */
 #define ERTS_RAW_DIST_MSG_DBG
 #endif
 
 #if defined(ERTS_DIST_MSG_DBG) || defined(ERTS_RAW_DIST_MSG_DBG)
+FILE *dbg_file;
 static void bw(byte *buf, ErlDrvSizeT sz)
 {
-    bin_write(ERTS_PRINT_STDERR, NULL, buf, sz);
+    bin_write(ERTS_PRINT_FILE, dbg_file, buf, sz);
 }
 #endif
 
@@ -70,39 +77,93 @@ static void bw(byte *buf, ErlDrvSizeT sz)
 static void
 dist_msg_dbg(ErtsDistExternal *edep, char *what, byte *buf, int sz)
 {
-    ErtsHeapFactory factory;
-    DeclareTmpHeapNoproc(ctl_default,DIST_CTL_DEFAULT_SIZE);
-    Eterm* ctl = ctl_default;
-    byte *extp = edep->extp;
+    byte *extp = edep->data->extp;
     Eterm msg;
     Sint ctl_len;
-    Sint size = ctl_len = erts_decode_dist_ext_size(edep);
+    Sint size = ctl_len = erts_decode_dist_ext_size(edep, 0, 0);
     if (size < 0) {
-	erts_fprintf(stderr,
+	erts_fprintf(dbg_file,
 		     "DIST MSG DEBUG: erts_decode_dist_ext_size(%s) failed:\n",
 		     what);
 	bw(buf, sz);
     }
     else {
-	ErlHeapFragment *mbuf = new_message_buffer(size);
-	erts_factory_static_init(&factory, ctl, ctl_len, &mbuf->off_heap);
-	msg = erts_decode_dist_ext(&factory, edep);
+        ErtsHeapFactory factory;
+	ErtsMessage *mbuf = erts_factory_message_create(&factory, NULL, 0, ctl_len);
+        /* Set mbuf msg to NIL as erts_factory_undo will fail otherwise */
+        ERL_MESSAGE_TERM(mbuf) = NIL;
+        msg = erts_decode_dist_ext(&factory, edep, 0);
 	if (is_value(msg))
-	    erts_fprintf(stderr, "    %s: %T\n", what, msg);
+	    erts_fprintf(dbg_file, "    %s: %.80T\n", what, msg);
 	else {
-	    erts_fprintf(stderr,
+	    erts_fprintf(dbg_file,
 			 "DIST MSG DEBUG: erts_decode_dist_ext(%s) failed:\n",
 			 what);
 	    bw(buf, sz);
 	}
-	free_message_buffer(mbuf);
-	edep->extp = extp;
+        erts_factory_undo(&factory);
+	edep->data->extp = extp;
     }
 }
 
+static char *erts_dop_to_string(enum dop dop) {
+    if (dop == DOP_LINK)
+        return "LINK";
+    if (dop == DOP_SEND)
+        return "SEND";
+    if (dop == DOP_EXIT)
+        return "EXIT";
+    if (dop == DOP_UNLINK)
+        return "UNLINK";
+    if (dop == DOP_REG_SEND)
+        return "REG_SEND";
+    if (dop == DOP_GROUP_LEADER)
+        return "GROUP_LEADER";
+    if (dop == DOP_EXIT2)
+        return "EXIT2";
+    if (dop == DOP_SEND_TT)
+        return "SEND_TT";
+    if (dop == DOP_EXIT_TT)
+        return "EXIT_TT";
+    if (dop == DOP_REG_SEND_TT)
+        return "REG_SEND_TT";
+    if (dop == DOP_EXIT2_TT)
+        return "EXIT2_TT";
+    if (dop == DOP_MONITOR_P)
+        return "MONITOR_P";
+    if (dop == DOP_DEMONITOR_P)
+        return "DEMONITOR_P";
+    if (dop == DOP_MONITOR_P_EXIT)
+        return "MONITOR_P_EXIT";
+    if (dop == DOP_SEND_SENDER)
+        return "SEND_SENDER";
+    if (dop == DOP_SEND_SENDER_TT)
+        return "SEND_SENDER_TT";
+    if (dop == DOP_PAYLOAD_EXIT)
+        return "PAYLOAD_EXIT";
+    if (dop == DOP_PAYLOAD_EXIT_TT)
+        return "PAYLOAD_EXIT_TT";
+    if (dop == DOP_PAYLOAD_EXIT2)
+        return "PAYLOAD_EXIT2";
+    if (dop == DOP_PAYLOAD_EXIT2_TT)
+        return "PAYLOAD_EXIT2_TT";
+    if (dop == DOP_PAYLOAD_MONITOR_P_EXIT)
+        return "PAYLOAD_MONITOR_P_EXIT";
+    ASSERT(0);
+    return "UNKNOWN";
+}
+
 #endif
 
+#if defined(VALGRIND)
+#include <valgrind/valgrind.h>
+#include <valgrind/memcheck.h>
 
+#  define PURIFY_MSG(msg)                                                    \
+    VALGRIND_PRINTF("%s, line %d: %s", __FILE__, __LINE__, msg)
+#else
+#  define PURIFY_MSG(msg)
+#endif
 
 int erts_is_alive; /* System must be blocked on change */
 int erts_dist_buf_busy_limit;
@@ -116,12 +177,17 @@ static Export *dist_ctrl_put_data_trap;
 
 /* forward declarations */
 
-static int dsig_send_ctl(ErtsDSigData* dsdp, Eterm ctl, int force_busy);
+static void erts_schedule_dist_command(Port *, DistEntry *);
+static int dsig_send_exit(ErtsDSigSendContext *ctx, Eterm ctl, Eterm msg);
+static int dsig_send_ctl(ErtsDSigSendContext *ctx, Eterm ctl);
 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 ErtsDistOutputBuf* clear_de_out_queues(DistEntry*);
 static void free_de_out_queues(DistEntry*, ErtsDistOutputBuf*);
+int erts_dist_seq_tree_foreach_delete_yielding(DistSeqNode **root,
+                                               void **vyspp,
+                                               Sint limit);
 
 static erts_atomic_t no_caches;
 static erts_atomic_t no_nodes;
@@ -142,7 +208,6 @@ delete_cache(ErtsAtomCache *cache)
     }
 }
 
-
 static void
 create_cache(DistEntry *dep)
 {
@@ -185,32 +250,36 @@ get_suspended_on_de(DistEntry *dep, erts_aint32_t unset_qflgs)
     }
 }
 
-#define ERTS_MON_LNK_FIRE_LIMIT 100
+#define ERTS_MON_LNK_FIRE_REDS 40
 
-static void monitor_connection_down(ErtsMonitor *mon, void *unused)
+static int monitor_connection_down(ErtsMonitor *mon, void *unused, Sint reds)
 {
     if (erts_monitor_is_origin(mon))
         erts_proc_sig_send_demonitor(mon);
     else
         erts_proc_sig_send_monitor_down(mon, am_noconnection);
+    return ERTS_MON_LNK_FIRE_REDS;
 }
 
-static void link_connection_down(ErtsLink *lnk, void *vdist)
+static int link_connection_down(ErtsLink *lnk, void *vdist, Sint reds)
 {
     erts_proc_sig_send_link_exit(NULL, THE_NON_VALUE, lnk,
                                  am_noconnection, NIL);
+    return ERTS_MON_LNK_FIRE_REDS;
 }
 
 typedef enum {
     ERTS_CML_CLEANUP_STATE_LINKS,
     ERTS_CML_CLEANUP_STATE_MONITORS,
     ERTS_CML_CLEANUP_STATE_ONAME_MONITORS,
+    ERTS_CML_CLEANUP_STATE_SEQUENCES,
     ERTS_CML_CLEANUP_STATE_NODE_MONITORS
-} ErtsConMonLnkCleaupState;
+} ErtsConMonLnkSeqCleanupState;
 
 typedef struct {
-    ErtsConMonLnkCleaupState state;
+    ErtsConMonLnkSeqCleanupState state;
     ErtsMonLnkDist *dist;
+    DistSeqNode *seq;
     void *yield_state;
     int trigger_node_monitors;
     Eterm nodename;
@@ -218,49 +287,58 @@ typedef struct {
     Eterm reason;
     ErlOffHeap oh;
     Eterm heap[1];
-} ErtsConMonLnkCleanup;
+} ErtsConMonLnkSeqCleanup;
 
 static void
-con_monitor_link_cleanup(void *vcmlcp)
+con_monitor_link_seq_cleanup(void *vcmlcp)
 {
-    ErtsConMonLnkCleanup *cmlcp = vcmlcp;
+    ErtsConMonLnkSeqCleanup *cmlcp = vcmlcp;
     ErtsMonLnkDist *dist = cmlcp->dist;
     ErtsSchedulerData *esdp;
-    int yield;
+    int reds = CONTEXT_REDS;
 
     switch (cmlcp->state) {
     case ERTS_CML_CLEANUP_STATE_LINKS:
-        yield = erts_link_list_foreach_delete_yielding(&dist->links,
-                                                       link_connection_down,
-                                                       NULL, &cmlcp->yield_state,
-                                                       ERTS_MON_LNK_FIRE_LIMIT);
-        if (yield)
+        reds = erts_link_list_foreach_delete_yielding(&dist->links,
+                                                      link_connection_down,
+                                                      NULL, &cmlcp->yield_state,
+                                                      reds);
+        if (reds <= 0)
             break;
 
         ASSERT(!cmlcp->yield_state);
         cmlcp->state = ERTS_CML_CLEANUP_STATE_MONITORS;
     case ERTS_CML_CLEANUP_STATE_MONITORS:
-        yield = erts_monitor_list_foreach_delete_yielding(&dist->monitors,
-                                                          monitor_connection_down,
-                                                          NULL, &cmlcp->yield_state,
-                                                          ERTS_MON_LNK_FIRE_LIMIT);
-        if (yield)
+        reds = erts_monitor_list_foreach_delete_yielding(&dist->monitors,
+                                                         monitor_connection_down,
+                                                         NULL, &cmlcp->yield_state,
+                                                         reds);
+        if (reds <= 0)
             break;
 
         ASSERT(!cmlcp->yield_state);
         cmlcp->state = ERTS_CML_CLEANUP_STATE_ONAME_MONITORS;
     case ERTS_CML_CLEANUP_STATE_ONAME_MONITORS:
-        yield = erts_monitor_tree_foreach_delete_yielding(&dist->orig_name_monitors,
-                                                          monitor_connection_down,
-                                                          NULL, &cmlcp->yield_state,
-                                                          ERTS_MON_LNK_FIRE_LIMIT/2);
-        if (yield)
+        reds = erts_monitor_tree_foreach_delete_yielding(&dist->orig_name_monitors,
+                                                         monitor_connection_down,
+                                                         NULL, &cmlcp->yield_state,
+                                                         reds);
+        if (reds <= 0)
             break;
 
         cmlcp->dist = NULL;
         erts_mon_link_dist_dec_refc(dist);
 
         ASSERT(!cmlcp->yield_state);
+        cmlcp->state = ERTS_CML_CLEANUP_STATE_SEQUENCES;
+    case ERTS_CML_CLEANUP_STATE_SEQUENCES:
+        reds = erts_dist_seq_tree_foreach_delete_yielding(&cmlcp->seq,
+                                                          &cmlcp->yield_state,
+                                                          reds);
+        if (reds <= 0)
+            break;
+
+        ASSERT(!cmlcp->yield_state);
         cmlcp->state = ERTS_CML_CLEANUP_STATE_NODE_MONITORS;
     case ERTS_CML_CLEANUP_STATE_NODE_MONITORS:
         if (cmlcp->trigger_node_monitors) {
@@ -280,22 +358,23 @@ con_monitor_link_cleanup(void *vcmlcp)
     esdp = erts_get_scheduler_data();
     ASSERT(esdp && esdp->type == ERTS_SCHED_NORMAL);
     erts_schedule_misc_aux_work((int) esdp->no,
-                                con_monitor_link_cleanup,
+                                con_monitor_link_seq_cleanup,
                                 (void *) cmlcp);
 }
 
 static void
-schedule_con_monitor_link_cleanup(ErtsMonLnkDist *dist,
-                                  Eterm nodename,
-                                  Eterm visability,
-                                  Eterm reason)
+schedule_con_monitor_link_seq_cleanup(ErtsMonLnkDist *dist,
+                                      DistSeqNode *seq,
+                                      Eterm nodename,
+                                      Eterm visability,
+                                      Eterm reason)
 {
-    if (dist || is_value(nodename)) {
+    if (dist || is_value(nodename) || seq) {
         ErtsSchedulerData *esdp;
-        ErtsConMonLnkCleanup *cmlcp;
+        ErtsConMonLnkSeqCleanup *cmlcp;
         Uint rsz, size;
 
-        size = sizeof(ErtsConMonLnkCleanup);
+        size = sizeof(ErtsConMonLnkSeqCleanup);
 
         if (is_non_value(reason) || is_immed(reason)) {
             rsz = 0;
@@ -322,6 +401,8 @@ schedule_con_monitor_link_cleanup(ErtsMonLnkDist *dist,
             erts_mtx_unlock(&dist->mtx);
         }
 
+        cmlcp->seq = seq;
+
         cmlcp->trigger_node_monitors = is_value(nodename);
         cmlcp->nodename = nodename;
         cmlcp->visability = visability;
@@ -335,13 +416,13 @@ schedule_con_monitor_link_cleanup(ErtsMonLnkDist *dist,
         esdp = erts_get_scheduler_data();
         ASSERT(esdp && esdp->type == ERTS_SCHED_NORMAL);
         erts_schedule_misc_aux_work((int) esdp->no,
-                                    con_monitor_link_cleanup,
+                                    con_monitor_link_seq_cleanup,
                                     (void *) cmlcp);
     }
 }
 
 /*
-** A full node name constists of a "n@h"
+** A full node name consists of a "n@h"
 **
 ** n must be a valid node name: string of ([a-z][A-Z][0-9]_-)+
 ** 
@@ -558,6 +639,7 @@ int erts_do_net_exits(DistEntry *dep, Eterm reason)
     }
     else { /* Call from distribution controller (port/process) */
         ErtsMonLnkDist *mld;
+        DistSeqNode *sequences;
         ErtsAtomCache *cache;
         ErtsProcList *suspendees;
         ErtsDistOutputBuf *obuf;
@@ -574,9 +656,7 @@ int erts_do_net_exits(DistEntry *dep, Eterm reason)
         }
 
 	if (dep->state == ERTS_DE_STATE_EXITING) {
-#ifdef DEBUG
 	    ASSERT(erts_atomic32_read_nob(&dep->qflgs) & ERTS_DE_QFLG_EXIT);
-#endif
 	}
 	else {
 	    dep->state = ERTS_DE_STATE_EXITING;
@@ -589,6 +669,9 @@ int erts_do_net_exits(DistEntry *dep, Eterm reason)
         mld = dep->mld;
         dep->mld = NULL;
 
+        sequences = dep->sequences;
+        dep->sequences = NULL;
+
 	nodename = dep->sysname;
 	flags = dep->flags;
 
@@ -612,14 +695,15 @@ int erts_do_net_exits(DistEntry *dep, Eterm reason)
 
 	erts_de_rwunlock(dep);
 
-        schedule_con_monitor_link_cleanup(mld,
-                                          nodename,
-                                          (flags & DFLAG_PUBLISHED
-                                           ? am_visible
-                                           : am_hidden),
-                                          (reason == am_normal
-                                           ? am_connection_closed
-                                           : reason));
+        schedule_con_monitor_link_seq_cleanup(mld,
+                                              sequences,
+                                              nodename,
+                                              (flags & DFLAG_PUBLISHED
+                                               ? am_visible
+                                               : am_hidden),
+                                              (reason == am_normal
+                                               ? am_connection_closed
+                                               : reason));
 
         erts_resume_processes(suspendees);
 
@@ -653,6 +737,16 @@ void init_dist(void)
 {
     init_nodes_monitors();
 
+#ifdef ERTS_DIST_MSG_DBG_FILE
+    {
+        char buff[255];
+        sprintf(buff, ERTS_DIST_MSG_DBG_FILE, getpid());
+        dbg_file = fopen(buff,"w+");
+    }
+#elif defined(ERTS_DIST_MSG_DBG) || defined(ERTS_RAW_DIST_MSG_DBG)
+    dbg_file = stderr;
+#endif
+
     nodedown.reason = NIL;
     nodedown.bp = NULL;
 
@@ -676,21 +770,33 @@ void init_dist(void)
     }
 }
 
-#define ErtsDistOutputBuf2Binary(OB) \
-  ((Binary *) (((char *) (OB)) - offsetof(Binary, orig_bytes)))
+#define ErtsDistOutputBuf2Binary(OB) OB->bin
 
 static ERTS_INLINE ErtsDistOutputBuf *
-alloc_dist_obuf(Uint size)
+alloc_dist_obuf(Uint size, Uint headers)
 {
+    Uint obuf_size = sizeof(ErtsDistOutputBuf)*(headers);
     ErtsDistOutputBuf *obuf;
-    Uint obuf_size = sizeof(ErtsDistOutputBuf)+sizeof(byte)*(size-1);
-    Binary *bin = erts_bin_drv_alloc(obuf_size);
-    obuf = (ErtsDistOutputBuf *) &bin->orig_bytes[0];
+    Binary *bin;
+    byte *extp;
+    int i;
+
+    bin = erts_bin_drv_alloc(obuf_size + size);
+    erts_refc_add(&bin->intern.refc, headers - 1, 1);
+
+    obuf = (ErtsDistOutputBuf *)&bin->orig_bytes[0];
+    extp = (byte *)&bin->orig_bytes[obuf_size];
+
+    for (i = 0; i < headers; i++) {
+        obuf[i].bin = bin;
+        obuf[i].extp = extp;
 #ifdef DEBUG
-    obuf->dbg_pattern = ERTS_DIST_OUTPUT_BUF_DBG_PATTERN;
-    obuf->alloc_endp = obuf->data + size;
-    ASSERT(bin == ErtsDistOutputBuf2Binary(obuf));
+        obuf[i].dbg_pattern = ERTS_DIST_OUTPUT_BUF_DBG_PATTERN;
+        obuf[i].ext_startp = extp;
+        obuf[i].alloc_endp = &extp[size];
+        ASSERT(bin == ErtsDistOutputBuf2Binary(obuf));
 #endif
+    }
     return obuf;
 }
 
@@ -705,8 +811,8 @@ free_dist_obuf(ErtsDistOutputBuf *obuf)
 static ERTS_INLINE Sint
 size_obuf(ErtsDistOutputBuf *obuf)
 {
-    Binary *bin = ErtsDistOutputBuf2Binary(obuf);
-    return bin->orig_size;
+    return sizeof(ErtsDistOutputBuf) + (obuf->ext_endp - obuf->ext_start)
+        + (obuf->hdr_endp - obuf->hdrp);
 }
 
 static ErtsDistOutputBuf* clear_de_out_queues(DistEntry* dep)
@@ -760,18 +866,20 @@ static void free_de_out_queues(DistEntry* dep, ErtsDistOutputBuf *obuf)
 
 int erts_dsend_context_dtor(Binary* ctx_bin)
 {
-    ErtsSendContext* ctx = ERTS_MAGIC_BIN_DATA(ctx_bin);
-    switch (ctx->dss.phase) {
+    ErtsDSigSendContext* ctx = ERTS_MAGIC_BIN_DATA(ctx_bin);
+    switch (ctx->phase) {
     case ERTS_DSIG_SEND_PHASE_MSG_SIZE:
-	DESTROY_SAVED_WSTACK(&ctx->dss.u.sc.wstack);
+	DESTROY_SAVED_WSTACK(&ctx->u.sc.wstack);
 	break;
     case ERTS_DSIG_SEND_PHASE_MSG_ENCODE:
-	DESTROY_SAVED_WSTACK(&ctx->dss.u.ec.wstack);
+	DESTROY_SAVED_WSTACK(&ctx->u.ec.wstack);
 	break;
     default:;
     }
-    if (ctx->dss.phase >= ERTS_DSIG_SEND_PHASE_ALLOC && ctx->dss.obuf) {
-	free_dist_obuf(ctx->dss.obuf);
+    if (ctx->phase >= ERTS_DSIG_SEND_PHASE_ALLOC && ctx->obuf) {
+        int i;
+        for (i = 0; i < ctx->fragments; i++)
+            free_dist_obuf(&ctx->obuf[i]);
     }
     if (ctx->deref_dep)
 	erts_deref_dist_entry(ctx->dep);
@@ -779,10 +887,10 @@ int erts_dsend_context_dtor(Binary* ctx_bin)
     return 1;
 }
 
-Eterm erts_dsend_export_trap_context(Process* p, ErtsSendContext* ctx)
+Eterm erts_dsend_export_trap_context(Process* p, ErtsDSigSendContext* ctx)
 {
     struct exported_ctx {
-	ErtsSendContext ctx;
+	ErtsDSigSendContext ctx;
 	ErtsAtomCacheMap acm;
     };
     Binary* ctx_bin = erts_create_magic_binary(sizeof(struct exported_ctx),
@@ -790,12 +898,12 @@ Eterm erts_dsend_export_trap_context(Process* p, ErtsSendContext* ctx)
     struct exported_ctx* dst = ERTS_MAGIC_BIN_DATA(ctx_bin);
     Eterm* hp = HAlloc(p, ERTS_MAGIC_REF_THING_SIZE);
 
-    sys_memcpy(&dst->ctx, ctx, sizeof(ErtsSendContext));
-    ASSERT(ctx->dss.ctl == make_tuple(ctx->ctl_heap));
-    dst->ctx.dss.ctl = make_tuple(dst->ctx.ctl_heap);
-    if (ctx->dss.acmp) {
-	sys_memcpy(&dst->acm, ctx->dss.acmp, sizeof(ErtsAtomCacheMap));
-	dst->ctx.dss.acmp = &dst->acm;
+    sys_memcpy(&dst->ctx, ctx, sizeof(ErtsDSigSendContext));
+    ASSERT(ctx->ctl == make_tuple(ctx->ctl_heap));
+    dst->ctx.ctl = make_tuple(dst->ctx.ctl_heap);
+    if (ctx->acmp) {
+	sys_memcpy(&dst->acm, ctx->acmp, sizeof(ErtsAtomCacheMap));
+	dst->ctx.acmp = &dst->acm;
     }
     return erts_mk_magic_ref(&hp, &MSO(p), ctx_bin);
 }
@@ -816,71 +924,58 @@ Eterm erts_dsend_export_trap_context(Process* p, ErtsSendContext* ctx)
 ** Send a DOP_LINK link message
 */
 int
-erts_dsig_send_link(ErtsDSigData *dsdp, Eterm local, Eterm remote)
+erts_dsig_send_link(ErtsDSigSendContext *ctx, Eterm local, Eterm remote)
 {
-    DeclareTmpHeapNoproc(ctl_heap,4);
-    Eterm ctl = TUPLE3(&ctl_heap[0], make_small(DOP_LINK), local, remote);
-    int res;
-    UseTmpHeapNoproc(4);
-
-    res = dsig_send_ctl(dsdp, ctl, 0);
-    UnUseTmpHeapNoproc(4);
-    return res;
+    Eterm ctl = TUPLE3(&ctx->ctl_heap[0], make_small(DOP_LINK), local, remote);
+    return dsig_send_ctl(ctx, ctl);
 }
 
 int
-erts_dsig_send_unlink(ErtsDSigData *dsdp, Eterm local, Eterm remote)
+erts_dsig_send_unlink(ErtsDSigSendContext *ctx, Eterm local, Eterm remote)
 {
-    DeclareTmpHeapNoproc(ctl_heap,4);
-    Eterm ctl = TUPLE3(&ctl_heap[0], make_small(DOP_UNLINK), local, remote);
-    int res;
-
-    UseTmpHeapNoproc(4);
-    res = dsig_send_ctl(dsdp, ctl, 0);
-    UnUseTmpHeapNoproc(4);
-    return res;
+    Eterm ctl = TUPLE3(&ctx->ctl_heap[0], make_small(DOP_UNLINK), local, remote);
+    return dsig_send_ctl(ctx, ctl);
 }
 
 
 /* A local process that's being monitored by a remote one exits. We send:
    {DOP_MONITOR_P_EXIT, Local pid or name, Remote pid, ref, reason} */
 int
-erts_dsig_send_m_exit(ErtsDSigData *dsdp, Eterm watcher, Eterm watched, 
-			  Eterm ref, Eterm reason)
+erts_dsig_send_m_exit(ErtsDSigSendContext *ctx, Eterm watcher, Eterm watched,
+                      Eterm ref, Eterm reason)
 {
-    Eterm ctl;
-    DeclareTmpHeapNoproc(ctl_heap,6);
-    int res;
+    Eterm ctl, msg;
 
-    if (~dsdp->flags & (DFLAG_DIST_MONITOR | DFLAG_DIST_MONITOR_NAME)) {
+    if (~ctx->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),
-		 watched, watcher, ref, reason);
+    if (ctx->dep->flags & DFLAG_EXIT_PAYLOAD) {
+        ctl = TUPLE4(&ctx->ctl_heap[0], make_small(DOP_PAYLOAD_MONITOR_P_EXIT),
+                     watched, watcher, ref);
+        msg = reason;
+    } else {
+        ctl = TUPLE5(&ctx->ctl_heap[0], make_small(DOP_MONITOR_P_EXIT),
+                     watched, watcher, ref, reason);
+        msg = THE_NON_VALUE;
+    }
 
-    res = dsig_send_ctl(dsdp, ctl, 1);
-    UnUseTmpHeapNoproc(6);
-    return res;
+    return dsig_send_exit(ctx, ctl, msg);
 }
 
 /* We want to monitor a process (named or unnamed) on another node, we send:
    {DOP_MONITOR_P, Local pid, Remote pid or name, Ref}, which is exactly what's
    needed on the other side... */
 int
-erts_dsig_send_monitor(ErtsDSigData *dsdp, Eterm watcher, Eterm watched,
+erts_dsig_send_monitor(ErtsDSigSendContext *ctx, Eterm watcher, Eterm watched,
 		       Eterm ref)
 {
     Eterm ctl;
-    DeclareTmpHeapNoproc(ctl_heap,5);
-    int res;
 
-    if (~dsdp->flags & (DFLAG_DIST_MONITOR | DFLAG_DIST_MONITOR_NAME)) {
+    if (~ctx->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
@@ -890,48 +985,40 @@ erts_dsig_send_monitor(ErtsDSigData *dsdp, Eterm watcher, Eterm watched,
         return ERTS_DSIG_SEND_OK;
     }
 
-    UseTmpHeapNoproc(5);
-    ctl = TUPLE4(&ctl_heap[0],
+    ctl = TUPLE4(&ctx->ctl_heap[0],
 		 make_small(DOP_MONITOR_P),
 		 watcher, watched, ref);
 
-    res = dsig_send_ctl(dsdp, ctl, 0);
-    UnUseTmpHeapNoproc(5);
-    return res;
+    return dsig_send_ctl(ctx, ctl);
 }
 
 /* A local process monitoring a remote one wants to stop monitoring, either 
    because of a demonitor bif call or because the local process died. We send
    {DOP_DEMONITOR_P, Local pid, Remote pid or name, ref} */
 int
-erts_dsig_send_demonitor(ErtsDSigData *dsdp, Eterm watcher,
-			 Eterm watched, Eterm ref, int force)
+erts_dsig_send_demonitor(ErtsDSigSendContext *ctx, Eterm watcher,
+			 Eterm watched, Eterm ref)
 {
     Eterm ctl;
-    DeclareTmpHeapNoproc(ctl_heap,5);
-    int res;
 
-    if (~dsdp->flags & (DFLAG_DIST_MONITOR | DFLAG_DIST_MONITOR_NAME)) {
+    if (~ctx->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],
+    ctl = TUPLE4(&ctx->ctl_heap[0],
 		 make_small(DOP_DEMONITOR_P),
 		 watcher, watched, ref);
 
-    res = dsig_send_ctl(dsdp, ctl, force);
-    UnUseTmpHeapNoproc(5);
-    return res;
+    return dsig_send_ctl(ctx, ctl);
 }
 
-static int can_send_seqtrace_token(ErtsSendContext* ctx, Eterm token) {
+static int can_send_seqtrace_token(ErtsDSigSendContext* ctx, Eterm token) {
     Eterm label;
 
-    if (ctx->dsd.flags & DFLAG_BIG_SEQTRACE_LABELS) {
+    if (ctx->flags & DFLAG_BIG_SEQTRACE_LABELS) {
         /* The other end is capable of handling arbitrary seq_trace labels. */
         return 1;
     }
@@ -947,11 +1034,11 @@ static int can_send_seqtrace_token(ErtsSendContext* ctx, Eterm token) {
 }
 
 int
-erts_dsig_send_msg(Eterm remote, Eterm message, ErtsSendContext* ctx)
+erts_dsig_send_msg(ErtsDSigSendContext* ctx, Eterm remote, Eterm message)
 {
     Eterm ctl;
     Eterm token = NIL;
-    Process *sender = ctx->dsd.proc;
+    Process *sender = ctx->c_p;
     int res;
 #ifdef USE_VM_PROBES
     Sint tok_label = 0;
@@ -972,7 +1059,7 @@ erts_dsig_send_msg(Eterm remote, Eterm message, ErtsSendContext* ctx)
     *node_name = *sender_name = *receiver_name = '\0';
     if (DTRACE_ENABLED(message_send) || DTRACE_ENABLED(message_send_remote)) {
         erts_snprintf(node_name, sizeof(DTRACE_CHARBUF_NAME(node_name)),
-                      "%T", ctx->dsd.dep->sysname);
+                      "%T", ctx->dep->sysname);
         erts_snprintf(sender_name, sizeof(DTRACE_CHARBUF_NAME(sender_name)),
                       "%T", sender->common.id);
         erts_snprintf(receiver_name, sizeof(DTRACE_CHARBUF_NAME(receiver_name)),
@@ -992,7 +1079,7 @@ erts_dsig_send_msg(Eterm remote, Eterm message, ErtsSendContext* ctx)
 
         send_token = (token != NIL && can_send_seqtrace_token(ctx, token));
 
-        if (ctx->dsd.flags & DFLAG_SEND_SENDER) {
+        if (ctx->flags & DFLAG_SEND_SENDER) {
             dist_op = make_small(send_token ?
                                  DOP_SEND_SENDER_TT :
                                  DOP_SEND_SENDER);
@@ -1015,21 +1102,18 @@ erts_dsig_send_msg(Eterm remote, Eterm message, ErtsSendContext* ctx)
             msize, tok_label, tok_lastcnt, tok_serial);
     DTRACE7(message_send_remote, sender_name, node_name, receiver_name,
             msize, tok_label, tok_lastcnt, tok_serial);
-    ctx->dss.ctl = ctl;
-    ctx->dss.msg = message;
-    ctx->dss.force_busy = 0;
-    res = erts_dsig_send(&ctx->dsd, &ctx->dss);
+    ctx->ctl = ctl;
+    ctx->msg = message;
+    res = erts_dsig_send(ctx);
     return res;
 }
 
 int
-erts_dsig_send_reg_msg(Eterm remote_name, Eterm message,
-		       ErtsSendContext* ctx)
+erts_dsig_send_reg_msg(ErtsDSigSendContext* ctx, Eterm remote_name, Eterm message)
 {
     Eterm ctl;
     Eterm token = NIL;
-    Process *sender = ctx->dsd.proc;
-    int res;
+    Process *sender = ctx->c_p;
 #ifdef USE_VM_PROBES
     Sint tok_label = 0;
     Sint tok_lastcnt = 0;
@@ -1049,7 +1133,7 @@ erts_dsig_send_reg_msg(Eterm remote_name, Eterm message,
     *node_name = *sender_name = *receiver_name = '\0';
     if (DTRACE_ENABLED(message_send) || DTRACE_ENABLED(message_send_remote)) {
         erts_snprintf(node_name, sizeof(DTRACE_CHARBUF_NAME(node_name)),
-                      "%T", ctx->dsd.dep->sysname);
+                      "%T", ctx->dep->sysname);
         erts_snprintf(sender_name, sizeof(DTRACE_CHARBUF_NAME(sender_name)),
                       "%T", sender->common.id);
         erts_snprintf(receiver_name, sizeof(DTRACE_CHARBUF_NAME(receiver_name)),
@@ -1074,23 +1158,19 @@ erts_dsig_send_reg_msg(Eterm remote_name, Eterm message,
             msize, tok_label, tok_lastcnt, tok_serial);
     DTRACE7(message_send_remote, sender_name, node_name, receiver_name,
             msize, tok_label, tok_lastcnt, tok_serial);
-    ctx->dss.ctl = ctl;
-    ctx->dss.msg = message;
-    ctx->dss.force_busy = 0;
-    res = erts_dsig_send(&ctx->dsd, &ctx->dss);
-    return res;
+    ctx->ctl = ctl;
+    ctx->msg = message;
+    return erts_dsig_send(ctx);
 }
 
 /* local has died, deliver the exit signal to remote */
 int
-erts_dsig_send_exit_tt(ErtsDSigData *dsdp, Eterm local, Eterm remote, 
+erts_dsig_send_exit_tt(ErtsDSigSendContext *ctx, Eterm local, Eterm remote, 
 		       Eterm reason, Eterm token)
 {
-    Eterm ctl;
-    DeclareTmpHeapNoproc(ctl_heap,6);
-    int res;
+    Eterm ctl, msg = THE_NON_VALUE;
 #ifdef USE_VM_PROBES
-    Process *sender = dsdp->proc;
+    Process *sender = ctx->c_p;
     Sint tok_label = 0;
     Sint tok_lastcnt = 0;
     Sint tok_serial = 0;
@@ -1100,20 +1180,29 @@ erts_dsig_send_exit_tt(ErtsDSigData *dsdp, Eterm local, Eterm remote,
     DTRACE_CHARBUF(reason_str, 128);
 #endif
 
-    UseTmpHeapNoproc(6);
+    if (ctx->dep->flags & DFLAG_EXIT_PAYLOAD)
+        msg = reason;
+
     if (have_seqtrace(token)) {
-	seq_trace_update_send(dsdp->proc);
+	seq_trace_update_send(ctx->c_p);
 	seq_trace_output_exit(token, reason, SEQ_TRACE_SEND, remote, local);
-	ctl = TUPLE5(&ctl_heap[0],
-		     make_small(DOP_EXIT_TT), local, remote, token, reason);
+        if (ctx->dep->flags & DFLAG_EXIT_PAYLOAD) {
+            ctl = TUPLE4(&ctx->ctl_heap[0],
+                         make_small(DOP_PAYLOAD_EXIT_TT), local, remote, token);
+        } else
+            ctl = TUPLE5(&ctx->ctl_heap[0],
+                         make_small(DOP_EXIT_TT), local, remote, token, reason);
     } else {
-	ctl = TUPLE4(&ctl_heap[0], make_small(DOP_EXIT), local, remote, reason);
+        if (ctx->dep->flags & DFLAG_EXIT_PAYLOAD)
+            ctl = TUPLE3(&ctx->ctl_heap[0], make_small(DOP_PAYLOAD_EXIT), local, remote);
+        else
+            ctl = TUPLE4(&ctx->ctl_heap[0], make_small(DOP_EXIT), local, remote, reason);
     }
 #ifdef USE_VM_PROBES
     *node_name = *sender_name = *remote_name = '\0';
     if (DTRACE_ENABLED(process_exit_signal_remote)) {
         erts_snprintf(node_name, sizeof(DTRACE_CHARBUF_NAME(node_name)),
-                      "%T", dsdp->dep->sysname);
+                      "%T", ctx->dep->sysname);
         erts_snprintf(sender_name, sizeof(DTRACE_CHARBUF_NAME(sender_name)),
                       "%T", sender->common.id);
         erts_snprintf(remote_name, sizeof(DTRACE_CHARBUF_NAME(remote_name)),
@@ -1129,73 +1218,159 @@ erts_dsig_send_exit_tt(ErtsDSigData *dsdp, Eterm local, Eterm remote,
 #endif
     DTRACE7(process_exit_signal_remote, sender_name, node_name,
             remote_name, reason_str, tok_label, tok_lastcnt, tok_serial);
-    /* forced, i.e ignore busy */
-    res = dsig_send_ctl(dsdp, ctl, 1);
-    UnUseTmpHeapNoproc(6);
-    return res;
+    return dsig_send_exit(ctx, ctl, msg);
 }
 
 int
-erts_dsig_send_exit(ErtsDSigData *dsdp, Eterm local, Eterm remote, Eterm reason)
+erts_dsig_send_exit(ErtsDSigSendContext *ctx, Eterm local, Eterm remote, Eterm reason)
 {
-    DeclareTmpHeapNoproc(ctl_heap,5);
-    int res;
-    Eterm ctl;
+    Eterm ctl, msg = ctx->dep->flags & DFLAG_EXIT_PAYLOAD ? reason : THE_NON_VALUE;
 
-    UseTmpHeapNoproc(5);
-    ctl = TUPLE4(&ctl_heap[0],
-		 make_small(DOP_EXIT), local, remote, reason);
-    /* forced, i.e ignore busy */
-    res =  dsig_send_ctl(dsdp, ctl, 1);
-    UnUseTmpHeapNoproc(5);
-    return res;
+    if (ctx->dep->flags & DFLAG_EXIT_PAYLOAD) {
+        ctl = TUPLE3(&ctx->ctl_heap[0], make_small(DOP_PAYLOAD_EXIT), local, remote);
+        msg = reason;
+    } else {
+        ctl = TUPLE4(&ctx->ctl_heap[0], make_small(DOP_EXIT), local, remote, reason);
+        msg = THE_NON_VALUE;
+    }
+    return dsig_send_exit(ctx, ctl, msg);
 }
 
 int
-erts_dsig_send_exit2(ErtsDSigData *dsdp, Eterm local, Eterm remote, Eterm reason)
+erts_dsig_send_exit2(ErtsDSigSendContext *ctx, Eterm local, Eterm remote, Eterm reason)
 {
-    DeclareTmpHeapNoproc(ctl_heap,5);
-    int res;
-    Eterm ctl;
+    Eterm ctl, msg;
 
-    UseTmpHeapNoproc(5);
-    ctl = TUPLE4(&ctl_heap[0],
-		 make_small(DOP_EXIT2), local, remote, reason);
+    if (ctx->dep->flags & DFLAG_EXIT_PAYLOAD) {
+        ctl = TUPLE3(&ctx->ctl_heap[0],
+                     make_small(DOP_PAYLOAD_EXIT2), local, remote);
+        msg = reason;
+    } else {
+        ctl = TUPLE4(&ctx->ctl_heap[0],
+                     make_small(DOP_EXIT2), local, remote, reason);
+        msg = THE_NON_VALUE;
+    }
 
-    res = dsig_send_ctl(dsdp, ctl, 0);
-    UnUseTmpHeapNoproc(5);
-    return res;
+    return dsig_send_exit(ctx, ctl, msg);
 }
 
 
 int
-erts_dsig_send_group_leader(ErtsDSigData *dsdp, Eterm leader, Eterm remote)
+erts_dsig_send_group_leader(ErtsDSigSendContext *ctx, Eterm leader, Eterm remote)
 {
-    DeclareTmpHeapNoproc(ctl_heap,4);
-    int res;
     Eterm ctl;
 
-    UseTmpHeapNoproc(4);
-    ctl = TUPLE3(&ctl_heap[0],
+    ctl = TUPLE3(&ctx->ctl_heap[0],
 		 make_small(DOP_GROUP_LEADER), leader, remote);
 
-    res = dsig_send_ctl(dsdp, ctl, 0);
-    UnUseTmpHeapNoproc(4);
-    return res;
+    return dsig_send_ctl(ctx, ctl);
 }
 
-#if defined(PURIFY)
-#  define PURIFY_MSG(msg) \
-    purify_printf("%s, line %d: %s", __FILE__, __LINE__, msg)
-#elif defined(VALGRIND)
-#include <valgrind/valgrind.h>
-#include <valgrind/memcheck.h>
+#define ERTS_RBT_PREFIX dist_seq
+#define ERTS_RBT_T DistSeqNode
+#define ERTS_RBT_KEY_T Uint
+#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)->seq_id)
+#define ERTS_RBT_IS_LT(KX, KY) (KX < KY)
+#define ERTS_RBT_IS_EQ(KX, KY) (KX == KY)
+#define ERTS_RBT_WANT_DELETE
+#define ERTS_RBT_WANT_LOOKUP_INSERT
+#define ERTS_RBT_WANT_LOOKUP
+#define ERTS_RBT_WANT_FOREACH
+#define ERTS_RBT_WANT_FOREACH_DESTROY_YIELDING
+
+#include "erl_rbtree.h"
+
+struct erts_debug_dist_seq_tree_foreach_iter_arg {
+    int (*func)(DistSeqNode *, void *, Sint);
+    void *arg;
+};
 
-#  define PURIFY_MSG(msg)                                                    \
-    VALGRIND_PRINTF("%s, line %d: %s", __FILE__, __LINE__, msg)
-#else
-#  define PURIFY_MSG(msg)
-#endif
+static int
+erts_debug_dist_seq_tree_foreach_iter(DistSeqNode *seq, void *arg, Sint reds)
+{
+    struct erts_debug_dist_seq_tree_foreach_iter_arg *state = arg;
+    return state->func(seq, state->arg, reds);
+}
+
+void
+erts_debug_dist_seq_tree_foreach(DistEntry *dep, int (*func)(DistSeqNode *, void *, Sint), void *arg)
+{
+    struct erts_debug_dist_seq_tree_foreach_iter_arg state;
+    state.func = func;
+    state.arg = arg;
+    dist_seq_rbt_foreach(dep->sequences, erts_debug_dist_seq_tree_foreach_iter, &state);
+}
+
+static int dist_seq_cleanup(DistSeqNode *seq, void *unused, Sint reds)
+{
+    erts_free_dist_ext_copy(erts_get_dist_ext(&seq->hfrag));
+    free_message_buffer(&seq->hfrag);
+    return 1;
+}
+
+typedef struct {
+    DistSeqNode *root;
+    dist_seq_rbt_yield_state_t rbt_ystate;
+} DistSeqNodeYieldState;
+
+int
+erts_dist_seq_tree_foreach_delete_yielding(DistSeqNode **root,
+                                           void **vyspp,
+                                           Sint limit)
+{
+    DistSeqNodeYieldState ys = {*root, ERTS_RBT_YIELD_STAT_INITER};
+    DistSeqNodeYieldState *ysp;
+    int res;
+
+    ysp = (DistSeqNodeYieldState *) *vyspp;
+    if (!ysp) {
+        *root = NULL;
+	ysp = &ys;
+    }
+    res = dist_seq_rbt_foreach_destroy_yielding(&ysp->root,
+                                               dist_seq_cleanup,
+                                               NULL,
+                                               &ysp->rbt_ystate,
+                                               limit);
+    if (res > 0) {
+	if (ysp != &ys)
+	    erts_free(ERTS_ALC_T_SEQ_YIELD_STATE, ysp);
+	*vyspp = NULL;
+    }
+    else {
+
+	if (ysp == &ys) {
+	    ysp = erts_alloc(ERTS_ALC_T_SEQ_YIELD_STATE,
+			     sizeof(DistSeqNodeYieldState));
+	    sys_memcpy((void *) ysp, (void *) &ys,
+		       sizeof(DistSeqNodeYieldState));
+	}
+
+	*vyspp = (void *) ysp;
+    }
+
+    return res;
+}
 
 /*
 ** Input from distribution port.
@@ -1212,10 +1387,13 @@ int erts_net_message(Port *prt,
                      Uint32 conn_id,
 		     byte *hbuf,
 		     ErlDrvSizeT hlen,
+                     Binary *bin,
 		     byte *buf,
 		     ErlDrvSizeT len)
 {
-    ErtsDistExternal ede;
+    ErtsDistExternal ede, *edep = &ede;
+    ErtsDistExternalData ede_data;
+    ErlHeapFragment *ede_hfrag = NULL;
     Sint ctl_len;
     Eterm arg;
     Eterm from, to;
@@ -1227,10 +1405,8 @@ int erts_net_message(Port *prt,
     DeclareTmpHeapNoproc(ctl_default,DIST_CTL_DEFAULT_SIZE);
     Eterm* ctl = ctl_default;
     ErtsHeapFactory factory;
-    Eterm* hp;
     Sint type;
     Eterm token;
-    Eterm token_size;
     Uint tuple_arity;
     int res;
 #ifdef ERTS_DIST_MSG_DBG
@@ -1256,69 +1432,149 @@ int erts_net_message(Port *prt,
     }
 
 #ifdef ERTS_RAW_DIST_MSG_DBG
-    erts_fprintf(stderr, "<< ");
+    erts_fprintf(dbg_file, "RECV: ");
     bw(buf, len);
 #endif
 
-    res = erts_prepare_dist_ext(&ede, buf, len, dep, conn_id, dep->cache);
+    ede.data = &ede_data;
+
+    res = erts_prepare_dist_ext(&ede, buf, len, bin, dep, conn_id, dep->cache);
 
     switch (res) {
     case ERTS_PREP_DIST_EXT_CLOSED:
         return 0; /* Connection not alive; ignore signal... */
     case ERTS_PREP_DIST_EXT_FAILED:
 #ifdef ERTS_DIST_MSG_DBG
-	erts_fprintf(stderr, "DIST MSG DEBUG: erts_prepare_dist_ext() failed:\n");
+	erts_fprintf(dbg_file, "DIST MSG DEBUG: erts_prepare_dist_ext() failed:\n");
 	bw(buf, orig_len);
 #endif
         goto data_error;
     case ERTS_PREP_DIST_EXT_SUCCESS:
-	ctl_len = erts_decode_dist_ext_size(&ede);
+	ctl_len = erts_decode_dist_ext_size(&ede, 1, 0);
         if (ctl_len < 0) {
 #ifdef ERTS_DIST_MSG_DBG
-            erts_fprintf(stderr, "DIST MSG DEBUG: erts_decode_dist_ext_size(CTL) failed:\n");
+            erts_fprintf(dbg_file, "DIST MSG DEBUG: erts_decode_dist_ext_size(CTL) failed:\n");
             bw(buf, orig_len);
 #endif
             PURIFY_MSG("data error");
             goto data_error;
         }
+
+        /* A non-fragmented message */
+        if (!ede.data->seq_id) {
+            if (ctl_len > DIST_CTL_DEFAULT_SIZE) {
+                ctl = erts_alloc(ERTS_ALC_T_DCTRL_BUF, ctl_len * sizeof(Eterm));
+            }
+
+            erts_factory_tmp_init(&factory, ctl, ctl_len, ERTS_ALC_T_DCTRL_BUF);
+            break;
+        } else {
+            DistSeqNode *seq;
+            Uint sz = erts_dist_ext_size(&ede);
+            Uint used_sz = ctl_len * sizeof(Eterm);
+
+            /* We calculate the size of the heap fragment to be allocated.
+               The used_size part has to be larger that the ctl data and the
+               DistSeqNode. */
+            if (used_sz + (sizeof(ErlHeapFragment) - sizeof(Eterm)) < sizeof(DistSeqNode))
+                used_sz = sizeof(DistSeqNode) - (sizeof(ErlHeapFragment) - sizeof(Eterm));
+
+            seq = (DistSeqNode *)new_message_buffer((sz + used_sz) / sizeof(Eterm));
+            seq->hfrag.used_size = used_sz / sizeof(Eterm);
+
+            seq->ctl_len = ctl_len;
+            seq->seq_id = ede.data->seq_id;
+            seq->cnt = ede.data->frag_id;
+            if (dist_seq_rbt_lookup_insert(&dep->sequences, seq) != NULL) {
+                free_message_buffer(&seq->hfrag);
+                goto data_error;
+            }
+
+            erts_make_dist_ext_copy(&ede, erts_get_dist_ext(&seq->hfrag));
+
+            if (ede.data->frag_id > 1) {
+                seq->cnt--;
+                return 0;
+            }
+        }
+
+        /* fall through, the first fragment in the sequence was the last fragment */
+    case ERTS_PREP_DIST_EXT_FRAG_CONT: {
+        DistSeqNode *seq = dist_seq_rbt_lookup(dep->sequences, ede.data->seq_id);
+
+        if (!seq)
+            goto data_error;
+
+        /* If we did a fall-though we already did this */
+        if (res == ERTS_PREP_DIST_EXT_FRAG_CONT)
+            erts_dist_ext_frag(&ede_data, erts_get_dist_ext(&seq->hfrag));
+
+        /* Verify that the fragments have arrived in the correct order */
+        if (seq->cnt != ede.data->frag_id)
+            goto data_error;
+
+        seq->cnt--;
+
+        /* Check if this was the last fragment */
+        if (ede.data->frag_id > 1)
+            return 0;
+
+        /* Last fragment arrived, time to dispatch the signal */
+        dist_seq_rbt_delete(&dep->sequences, seq);
+        ctl_len = seq->ctl_len;
+
+        /* Now that we no longer need the DistSeqNode we re-use the heapfragment
+           to decode the ctl msg into. We don't need the ctl message to be in
+           the heapfragment, but we decode into the heapfragment speculatively
+           in case there is a trace token that we need. */
+        erts_factory_heap_frag_init(&factory, &seq->hfrag);
+        edep = erts_get_dist_ext(&seq->hfrag);
+        ede_hfrag = &seq->hfrag;
+
         break;
+    }
     default:
         ERTS_INTERNAL_ERROR("Unexpected result from erts_prepare_dist_ext()");
         break;
     }
 
-    if (ctl_len > DIST_CTL_DEFAULT_SIZE) {
-	ctl = erts_alloc(ERTS_ALC_T_DCTRL_BUF, ctl_len * sizeof(Eterm));
-    }
-    hp = ctl;
-
-    erts_factory_tmp_init(&factory, ctl, ctl_len, ERTS_ALC_T_DCTRL_BUF);
-    arg = erts_decode_dist_ext(&factory, &ede);
+    arg = erts_decode_dist_ext(&factory, edep, 1);
     if (is_non_value(arg)) {
 #ifdef ERTS_DIST_MSG_DBG
-	erts_fprintf(stderr, "DIST MSG DEBUG: erts_decode_dist_ext(CTL) failed:\n");
+	erts_fprintf(dbg_file, "DIST MSG DEBUG: erts_decode_dist_ext(CTL) failed:\n");
 	bw(buf, orig_len);
 #endif
 	PURIFY_MSG("data error");
 	goto decode_error;
     }
 
-#ifdef ERTS_DIST_MSG_DBG
-    erts_fprintf(stderr, "<< CTL: %T\n", arg);
-#endif
+    /* Fill the unused part of the hfrag with a bignum header */
+    if (ede_hfrag && ede_hfrag->mem + ede_hfrag->used_size > factory.hp) {
+        Uint slot = factory.hp - ede_hfrag->mem;
+        ede_hfrag->mem[slot] = make_pos_bignum_header(ede_hfrag->used_size - slot - 1);
+    }
 
     if (is_not_tuple(arg) || 
 	(tuple = tuple_val(arg), (tuple_arity = arityval(*tuple)) < 1) ||
 	is_not_small(tuple[1])) {
+#ifdef ERTS_DIST_MSG_DBG
+        if (is_tuple(arg) && arityval(*tuple) > 1)
+            erts_fprintf(dbg_file, "RECV: CTL: %s: %.80T\n",
+                         erts_dop_to_string(unsigned_val(tuple[1])), arg);
+#endif
  	goto invalid_message;
     }
 
-    token_size = 0;
+#ifdef ERTS_DIST_MSG_DBG
+    erts_fprintf(dbg_file, "RECV: CTL: %s: %.80T\n",
+                 erts_dop_to_string(unsigned_val(tuple[1])), arg);
+#endif
+
     token = NIL;
 
     switch (type = unsigned_val(tuple[1])) {
     case DOP_LINK: {
-        ErtsDSigData dsd;
+        ErtsDSigSendContext ctx;
         int code;
 
 	if (tuple_arity != 3) {
@@ -1343,10 +1599,7 @@ int erts_net_message(Port *prt,
                                                  from, to);
             ASSERT(ldp->a.other.item == to);
             ASSERT(eq(ldp->b.other.item, from));
-#ifdef DEBUG
-            code =
-#endif
-                erts_link_dist_insert(&ldp->a, dep->mld);
+            code = erts_link_dist_insert(&ldp->a, dep->mld);
             ASSERT(code);
 
             if (erts_proc_sig_send_link(NULL, to, &ldp->b))
@@ -1354,17 +1607,14 @@ int erts_net_message(Port *prt,
 
             /* Failed to send signal; cleanup and reply noproc... */
 
-#ifdef DEBUG
-            code =
-#endif
-                erts_link_dist_delete(&ldp->a);
+            code = erts_link_dist_delete(&ldp->a);
             ASSERT(code);
             erts_link_release_both(ldp);
         }
 
-        code = erts_dsig_prepare(&dsd, dep, NULL, 0, ERTS_DSP_NO_LOCK, 0, 0);
+        code = erts_dsig_prepare(&ctx, dep, NULL, 0, ERTS_DSP_NO_LOCK, 1, 1, 0);
         if (code == ERTS_DSIG_PREP_CONNECTED) {
-            code = erts_dsig_send_exit(&dsd, to, from, am_noproc);
+            code = erts_dsig_send_exit(&ctx, to, from, am_noproc);
             ASSERT(code == ERTS_DSIG_SEND_OK);
         }
 
@@ -1397,7 +1647,7 @@ int erts_net_message(Port *prt,
 	/* A remote process wants to monitor us, we get:
 	   {DOP_MONITOR_P, Remote pid, local pid or name, ref} */
 	Eterm pid, name;
-        ErtsDSigData dsd;
+        ErtsDSigSendContext ctx;
         int code;
 
 	if (tuple_arity != 4) {
@@ -1452,10 +1702,9 @@ int erts_net_message(Port *prt,
 
         }
 
-        code = erts_dsig_prepare(&dsd, dep, NULL, 0, ERTS_DSP_NO_LOCK, 0, 0);
+        code = erts_dsig_prepare(&ctx, dep, NULL, 0, ERTS_DSP_NO_LOCK, 1, 1, 0);
         if (code == ERTS_DSIG_PREP_CONNECTED) {
-            code = erts_dsig_send_m_exit(&dsd, watcher, watched, ref,
-                                         am_noproc);
+            code = erts_dsig_send_m_exit(&ctx, watcher, watched, ref, am_noproc);
             ASSERT(code == ERTS_DSIG_SEND_OK);
         }
 
@@ -1514,7 +1763,6 @@ int erts_net_message(Port *prt,
 	    goto invalid_message;
 	}
 
-	token_size = size_object(tuple[5]);
 	/* Fall through ... */
     case DOP_REG_SEND:
 	/* {DOP_REG_SEND, From, Cookie, ToName} -- Message */
@@ -1529,7 +1777,7 @@ int erts_net_message(Port *prt,
 	}
 
 #ifdef ERTS_DIST_MSG_DBG
-	dist_msg_dbg(&ede, "MSG", buf, orig_len);
+	dist_msg_dbg(edep, "MSG", buf, orig_len);
 #endif
 
 	from = tuple[2];
@@ -1539,35 +1787,25 @@ int erts_net_message(Port *prt,
 	}
 	rp = erts_whereis_process(NULL, 0, to, 0, 0);
 	if (rp) {
-	    Uint xsize = (type == DOP_REG_SEND
-			  ? 0
-			  : ERTS_HEAP_FRAG_SIZE(token_size));
 	    ErtsProcLocks locks = 0;
-	    ErtsDistExternal *ede_copy;
 
-	    ede_copy = erts_make_dist_ext_copy(&ede, xsize);
 	    if (type == DOP_REG_SEND) {
 		token = NIL;
 	    } else {
-		ErlHeapFragment *heap_frag;
-		ErlOffHeap *ohp;
-		ASSERT(xsize);
-		heap_frag = erts_dist_ext_trailer(ede_copy);
-		ERTS_INIT_HEAP_FRAG(heap_frag, token_size, token_size);
-		hp = heap_frag->mem;
-		ohp = &heap_frag->off_heap;
 		token = tuple[5];
-		token = copy_struct(token, token_size, &hp, ohp);
 	    }
 
-	    erts_queue_dist_message(rp, locks, ede_copy, token, from);
+            erts_queue_dist_message(rp, locks, edep, ede_hfrag, token, from);
+
 	    if (locks)
 		erts_proc_unlock(rp, locks);
-	}
+	} else if (ede_hfrag != NULL) {
+            erts_free_dist_ext_copy(erts_get_dist_ext(ede_hfrag));
+            free_message_buffer(ede_hfrag);
+        }
 	break;
 
     case DOP_SEND_SENDER_TT: {
-        Uint xsize;
     case DOP_SEND_TT:
 
 	if (tuple_arity != 4) {
@@ -1575,15 +1813,12 @@ int erts_net_message(Port *prt,
 	}
 
 	token = tuple[4];
-	token_size = size_object(token);
-        xsize = ERTS_HEAP_FRAG_SIZE(token_size);
         goto send_common;
 
     case DOP_SEND_SENDER:
     case DOP_SEND:
 
         token = NIL;
-        xsize = 0;
 	if (tuple_arity != 3)
 	    goto invalid_message;
 
@@ -1599,48 +1834,50 @@ int erts_net_message(Port *prt,
                : tuple[2] == am_Empty);
 
 #ifdef ERTS_DIST_MSG_DBG
-	dist_msg_dbg(&ede, "MSG", buf, orig_len);
+	dist_msg_dbg(edep, "MSG", buf, orig_len);
 #endif
 	to = tuple[3];
 	if (is_not_pid(to)) {
 	    goto invalid_message;
 	}
 	rp = erts_proc_lookup(to);
+
 	if (rp) {
 	    ErtsProcLocks locks = 0;
-	    ErtsDistExternal *ede_copy;
-
-	    ede_copy = erts_make_dist_ext_copy(&ede, xsize);
-	    if (is_not_nil(token)) {
-		ErlHeapFragment *heap_frag;
-		ErlOffHeap *ohp;
-		ASSERT(xsize);
-		heap_frag = erts_dist_ext_trailer(ede_copy);
-		ERTS_INIT_HEAP_FRAG(heap_frag, token_size, token_size);
-		hp = heap_frag->mem;
-		ohp = &heap_frag->off_heap;
-		token = copy_struct(token, token_size, &hp, ohp);
-	    }
 
-	    erts_queue_dist_message(rp, locks, ede_copy, token, am_Empty);
+	    erts_queue_dist_message(rp, locks, edep, ede_hfrag, token, am_Empty);
 	    if (locks)
 		erts_proc_unlock(rp, locks);
-	}
+        } else if (ede_hfrag != NULL) {
+            erts_free_dist_ext_copy(erts_get_dist_ext(ede_hfrag));
+            free_message_buffer(ede_hfrag);
+        }
+	
 	break;
     }
 
+    case DOP_PAYLOAD_MONITOR_P_EXIT:
     case DOP_MONITOR_P_EXIT: {
+
 	/* We are monitoring a process on the remote node which dies, we get
 	   {DOP_MONITOR_P_EXIT, Remote pid or name, Local pid, ref, reason} */
-	   
-	if (tuple_arity != 5) {
-	    goto invalid_message;
-	}
 
-	watched = tuple[2];  /* remote proc or name which died */
-	watcher = tuple[3];
+        watched = tuple[2];  /* remote proc or name which died */
+        watcher = tuple[3];
 	ref     = tuple[4];
-	reason  = tuple[5];
+
+        if (type == DOP_PAYLOAD_MONITOR_P_EXIT) {
+            if (tuple_arity != 4) {
+                goto invalid_message;
+            }
+            reason = THE_NON_VALUE;
+        } else {
+            if (tuple_arity != 5) {
+                goto invalid_message;
+            }
+            reason = tuple[5];
+            edep = NULL;
+        }
 
 	if (is_not_ref(ref))
 	    goto invalid_message;
@@ -1656,70 +1893,152 @@ int erts_net_message(Port *prt,
             goto invalid_message;
         }
 
-        erts_proc_sig_send_dist_monitor_down(dep, ref, watched,
-                                             watcher, reason);
+        if (!erts_proc_lookup(watcher)) {
+            if (ede_hfrag != NULL) {
+                erts_free_dist_ext_copy(erts_get_dist_ext(ede_hfrag));
+                free_message_buffer(ede_hfrag);
+            }
+            break; /* Process not alive */
+        }
+
+#ifdef ERTS_DIST_MSG_DBG
+        if (reason == THE_NON_VALUE) {
+            dist_msg_dbg(edep, "MSG", buf, orig_len);
+        }
+#endif
+
+        erts_proc_sig_send_dist_monitor_down(
+            dep, ref, watched, watcher, edep, ede_hfrag, reason);
 	break;
     }
 
+    case DOP_PAYLOAD_EXIT:
+    case DOP_PAYLOAD_EXIT_TT:
     case DOP_EXIT_TT:
     case DOP_EXIT: {
+
 	/* 'from', which 'to' is linked to, died */
+        from = tuple[2];
+        to = tuple[3];
+
 	if (type == DOP_EXIT) {
 	    if (tuple_arity != 4) {
 		goto invalid_message;
 	    }
-	    
-	    from = tuple[2];
-	    to = tuple[3];
-	    reason = tuple[4];
 	    token = NIL;
-	} else {
+	    reason = tuple[4];
+            edep = NULL;
+	} else if (type == DOP_EXIT_TT){
 	    if (tuple_arity != 5) {
 		goto invalid_message;
 	    }
-	    from = tuple[2];
-	    to = tuple[3];
 	    token = tuple[4];
 	    reason = tuple[5];
-	}
+            edep = NULL;
+	} else if (type == DOP_PAYLOAD_EXIT) {
+            if (tuple_arity != 3) {
+		goto invalid_message;
+	    }
+            token = NIL;
+            reason = THE_NON_VALUE;
+        } else {
+            if (tuple_arity != 4) {
+		goto invalid_message;
+	    }
+            token = tuple[4];
+            reason = THE_NON_VALUE;
+        }
 	if (is_not_external_pid(from)
             || dep != external_pid_dist_entry(from)
             || is_not_internal_pid(to)) {
 	    goto invalid_message;
 	}
 
+        if (!erts_proc_lookup(to)) {
+            if (ede_hfrag != NULL) {
+                erts_free_dist_ext_copy(erts_get_dist_ext(ede_hfrag));
+                free_message_buffer(ede_hfrag);
+            }
+            break; /* Process not alive */
+        }
+
+#ifdef ERTS_DIST_MSG_DBG
+        if (reason == THE_NON_VALUE) {
+            dist_msg_dbg(edep, "MSG", buf, orig_len);
+        }
+#endif
+
         erts_proc_sig_send_dist_link_exit(dep,
-                                          from, to,
+                                          from, to, edep, ede_hfrag,
                                           reason, token);
 	break;
     }
+    case DOP_PAYLOAD_EXIT2_TT:
+    case DOP_PAYLOAD_EXIT2:
     case DOP_EXIT2_TT:
-    case DOP_EXIT2:
+    case DOP_EXIT2: {
+
 	/* 'from' is send an exit signal to 'to' */
+        from = tuple[2];
+        to = tuple[3];
+
 	if (type == DOP_EXIT2) {
 	    if (tuple_arity != 4) {
 		goto invalid_message;
 	    }
-	    from = tuple[2];
-	    to = tuple[3];
 	    reason = tuple[4];
 	    token = NIL;
-	} else {
+            edep = NULL;
+	} else if (type == DOP_EXIT2_TT) {
 	    if (tuple_arity != 5) {
 		goto invalid_message;
 	    }
-	    from = tuple[2];
-	    to = tuple[3];
 	    token = tuple[4];
 	    reason = tuple[5];
-	}
-	if (is_not_pid(from) || is_not_internal_pid(to)) {
+            edep = NULL;
+	} else if (type == DOP_PAYLOAD_EXIT2) {
+            if (tuple_arity != 3) {
+		goto invalid_message;
+	    }
+            reason = THE_NON_VALUE;
+            token = NIL;
+        } else {
+            if (tuple_arity != 4) {
+		goto invalid_message;
+	    }
+            reason = THE_NON_VALUE;
+            token = tuple[4];
+        }
+	if (is_not_pid(from)
+            || dep != external_pid_dist_entry(from)) {
 	    goto invalid_message;
 	}
+        if (is_not_internal_pid(to)) {
+            if (is_external_pid(to)) {
+		DistEntry *dep = external_pid_dist_entry(to);
+		if (dep == erts_this_dist_entry)
+                    break; /* Old incarnation of this node... */
+            }
+            goto invalid_message;
+        }
 
-        erts_proc_sig_send_exit(NULL, from, to, reason, token, 0);
-	break;
+        if (!erts_proc_lookup(to)) {
+            if (ede_hfrag != NULL) {
+                erts_free_dist_ext_copy(erts_get_dist_ext(ede_hfrag));
+                free_message_buffer(ede_hfrag);
+            }
+            break; /* Process not alive */
+        }
 
+#ifdef ERTS_DIST_MSG_DBG
+        if (reason == THE_NON_VALUE) {
+            dist_msg_dbg(edep, "MSG", buf, orig_len);
+        }
+#endif
+
+        erts_proc_sig_send_dist_exit(dep, from, to, edep, ede_hfrag, reason, token);
+	break;
+    }
     case DOP_GROUP_LEADER:
 	if (tuple_arity != 3) {
 	    goto invalid_message;
@@ -1733,13 +2052,15 @@ int erts_net_message(Port *prt,
         (void) erts_proc_sig_send_group_leader(NULL, to, from, NIL);
 	break;
 
-    default: 
+    default:
 	goto invalid_message;
     }
 
-    erts_factory_close(&factory);
-    if (ctl != ctl_default) {
-	erts_free(ERTS_ALC_T_DCTRL_BUF, (void *) ctl);
+    if (ede_hfrag == NULL) {
+        erts_factory_close(&factory);
+        if (ctl != ctl_default) {
+            erts_free(ERTS_ALC_T_DCTRL_BUF, (void *) ctl);
+        }
     }
     UnUseTmpHeapNoproc(DIST_CTL_DEFAULT_SIZE);
     ERTS_CHK_NO_PROC_LOCKS;
@@ -1752,9 +2073,14 @@ int erts_net_message(Port *prt,
     }
 decode_error:
     PURIFY_MSG("data error");
-    erts_factory_close(&factory);
-    if (ctl != ctl_default) {
-	erts_free(ERTS_ALC_T_DCTRL_BUF, (void *) ctl);
+    if (ede_hfrag == NULL) {
+        erts_factory_close(&factory);
+        if (ctl != ctl_default) {
+            erts_free(ERTS_ALC_T_DCTRL_BUF, (void *) ctl);
+        }
+    } else {
+        erts_free_dist_ext_copy(erts_get_dist_ext(ede_hfrag));
+        free_message_buffer(ede_hfrag);
     }
 data_error:
     UnUseTmpHeapNoproc(DIST_CTL_DEFAULT_SIZE);
@@ -1763,18 +2089,21 @@ data_error:
     return -1;
 }
 
-static int dsig_send_ctl(ErtsDSigData* dsdp, Eterm ctl, int force_busy)
+static int dsig_send_exit(ErtsDSigSendContext *ctx, Eterm ctl, Eterm msg)
+{
+    ctx->ctl = ctl;
+    ctx->msg = msg;
+    return erts_dsig_send(ctx);
+}
+
+static int dsig_send_ctl(ErtsDSigSendContext *ctx, Eterm ctl)
 {
-    struct erts_dsig_send_context ctx;
     int ret;
-    ctx.ctl = ctl;
-    ctx.msg = THE_NON_VALUE;
-    ctx.force_busy = force_busy;
-    ctx.phase = ERTS_DSIG_SEND_PHASE_INIT;
-#ifdef DEBUG
-    ctx.reds = 1; /* provoke assert below (no reduction count without msg) */
-#endif
-    ret = erts_dsig_send(dsdp, &ctx);
+    ctx->ctl = ctl;
+    ctx->msg = THE_NON_VALUE;
+    ctx->from = THE_NON_VALUE;
+    ctx->reds = 1; /* provoke assert below (no reduction count without msg) */
+    ret = erts_dsig_send(ctx);
     ASSERT(ret != ERTS_DSIG_SEND_CONTINUE);
     return ret;
 }
@@ -1805,7 +2134,117 @@ notify_dist_data(Process *c_p, Eterm pid)
 }
 
 int
-erts_dsig_send(ErtsDSigData *dsdp, struct erts_dsig_send_context* ctx)
+erts_dsig_prepare(ErtsDSigSendContext *ctx,
+		  DistEntry *dep,
+		  Process *proc,
+                  ErtsProcLocks proc_locks,
+		  ErtsDSigPrepLock dspl,
+		  int no_suspend,
+                  int no_trap,
+		  int connect)
+{
+    int res;
+
+    if (!erts_is_alive)
+	return ERTS_DSIG_PREP_NOT_ALIVE;
+    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) {
+	    res = ERTS_DSIG_PREP_WOULD_SUSPEND;
+	    goto fail;
+	}
+    }
+
+    ctx->c_p = proc;
+    ctx->dep = dep;
+    ctx->deref_dep = 0;
+    ctx->cid = dep->cid;
+    ctx->connection_id = dep->connection_id;
+    ctx->no_suspend = no_suspend;
+    ctx->no_trap = no_trap;
+    ctx->flags = dep->flags;
+    ctx->return_term = am_true;
+    ctx->phase = ERTS_DSIG_SEND_PHASE_INIT;
+    ctx->from = proc ? proc->common.id : am_undefined;
+    ctx->reds = no_trap ? 1 : (Sint) (ERTS_BIF_REDS_LEFT(proc) * TERM_TO_BINARY_LOOP_FACTOR);
+    if (dspl == ERTS_DSP_NO_LOCK)
+	erts_de_runlock(dep);
+    return res;
+
+ fail:
+    erts_de_runlock(dep);
+    return res;
+}
+
+static
+void erts_schedule_dist_command(Port *prt, DistEntry *dist_entry)
+{
+    DistEntry *dep;
+    Eterm id;
+
+    if (prt) {
+	ERTS_LC_ASSERT(erts_lc_is_port_locked(prt));
+	ASSERT((erts_atomic32_read_nob(&prt->state)
+		& ERTS_PORT_SFLGS_DEAD) == 0);
+
+        dep = (DistEntry*) erts_prtsd_get(prt, ERTS_PRTSD_DIST_ENTRY);
+        ASSERT(dep);
+	id = prt->common.id;
+    }
+    else {
+	ASSERT(dist_entry);
+	ERTS_LC_ASSERT(erts_lc_rwmtx_is_rlocked(&dist_entry->rwmtx)
+			   || erts_lc_rwmtx_is_rwlocked(&dist_entry->rwmtx));
+	ASSERT(is_internal_port(dist_entry->cid));
+
+ 	dep = dist_entry;
+	id = dep->cid;
+    }
+
+    if (!erts_atomic_xchg_mb(&dep->dist_cmd_scheduled, 1))
+	erts_port_task_schedule(id, &dep->dist_cmd, ERTS_PORT_TASK_DIST_CMD);
+}
+
+
+int
+erts_dsig_send(ErtsDSigSendContext *ctx)
 {
     int retval;
     Sint initial_reds = ctx->reds;
@@ -1814,11 +2253,13 @@ erts_dsig_send(ErtsDSigData *dsdp, struct erts_dsig_send_context* ctx)
     while (1) {
 	switch (ctx->phase) {
 	case ERTS_DSIG_SEND_PHASE_INIT:
-	    ctx->flags = dsdp->flags;
-	    ctx->c_p = dsdp->proc;
+	    ctx->flags = ctx->flags;
+	    ctx->c_p = ctx->c_p;
 
-	    if (!ctx->c_p || dsdp->no_suspend)
-		ctx->force_busy = 1;
+	    if (!ctx->c_p) {
+		ctx->no_trap = 1;
+		ctx->no_suspend = 1;
+            }
 
 	    ERTS_LC_ASSERT(!ctx->c_p
 			       || (ERTS_PROC_LOCK_MAIN
@@ -1837,15 +2278,27 @@ erts_dsig_send(ErtsDSigData *dsdp, struct erts_dsig_send_context* ctx)
 	    }
 
     #ifdef ERTS_DIST_MSG_DBG
-            erts_fprintf(stderr, ">> CTL: %T\n", ctx->ctl);
+            erts_fprintf(dbg_file, "SEND: CTL: %s: %.80T\n",
+                         erts_dop_to_string(unsigned_val(tuple_val(ctx->ctl)[1])),
+                         ctx->ctl);
             if (is_value(ctx->msg))
-                erts_fprintf(stderr, "    MSG: %T\n", ctx->msg);
+                erts_fprintf(dbg_file, "    MSG: %.160T\n", ctx->msg);
     #endif
 
 	    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);
 
+	    switch (erts_encode_dist_ext_size(ctx->ctl, ctx->flags,
+                                              ctx->acmp, &ctx->data_size)) {
+            case ERTS_EXT_SZ_OK:
+                break;
+            case ERTS_EXT_SZ_SYSTEM_LIMIT:
+                retval = ERTS_DSIG_SEND_TOO_LRG;
+                goto done;
+            case ERTS_EXT_SZ_YIELD:
+                ERTS_INTERNAL_ERROR("Unexpected yield result");
+                break;
+            }
 	    if (is_non_value(ctx->msg)) {
                 ctx->phase = ERTS_DSIG_SEND_PHASE_ALLOC;
                 break;
@@ -1855,26 +2308,61 @@ erts_dsig_send(ErtsDSigData *dsdp, struct erts_dsig_send_context* ctx)
             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;
-		goto done;
-	    }
+	case ERTS_DSIG_SEND_PHASE_MSG_SIZE: {
+            ErtsExtSzRes sz_res;
+            sz_res = (!ctx->no_trap
+                      ? erts_encode_dist_ext_size_ctx(ctx->msg,
+                                                      ctx,
+                                                      &ctx->data_size)
+                      : erts_encode_dist_ext_size(ctx->msg,
+                                                  ctx->flags,
+                                                  ctx->acmp,
+                                                  &ctx->data_size));
+            switch (sz_res) {
+            case ERTS_EXT_SZ_OK:
+                break;
+            case ERTS_EXT_SZ_SYSTEM_LIMIT:
+                retval = ERTS_DSIG_SEND_TOO_LRG;
+                goto done;
+            case ERTS_EXT_SZ_YIELD:
+                if (ctx->no_trap)
+                    ERTS_INTERNAL_ERROR("Unexpected yield result");
+                retval = ERTS_DSIG_SEND_CONTINUE;
+                goto done;
+            }
 
 	    ctx->phase = ERTS_DSIG_SEND_PHASE_ALLOC;
+        }
 	case ERTS_DSIG_SEND_PHASE_ALLOC:
 	    erts_finalize_atom_cache_map(ctx->acmp, ctx->flags);
 
-	    ctx->dhdr_ext_size = erts_encode_ext_dist_header_size(ctx->acmp);
-	    ctx->data_size += ctx->dhdr_ext_size;
+            if (ctx->flags & DFLAG_FRAGMENTS && is_value(ctx->msg) && is_not_immed(ctx->msg)) {
+                /* Calculate the max number of fragments that are needed */
+                ASSERT(is_pid(ctx->from) &&
+                       "from has to be a pid because it is used as sequence id");
+                ctx->fragments = ctx->data_size / ERTS_DIST_FRAGMENT_SIZE + 1;
+            } else
+                ctx->fragments = 1;
 
-	    ctx->obuf = alloc_dist_obuf(ctx->data_size);
-	    ctx->obuf->ext_endp = &ctx->obuf->data[0] + ctx->max_finalize_prepend + ctx->dhdr_ext_size;
+	    ctx->dhdr_ext_size = erts_encode_ext_dist_header_size(ctx->acmp, ctx->fragments);
+
+	    ctx->obuf = alloc_dist_obuf(
+                ctx->dhdr_ext_size + ctx->data_size +
+                (ctx->fragments-1) * ERTS_DIST_FRAGMENT_HEADER_SIZE,
+                ctx->fragments);
+            ctx->obuf->ext_start = &ctx->obuf->extp[0];
+	    ctx->obuf->ext_endp = &ctx->obuf->extp[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);
+	    ctx->obuf->extp = erts_encode_ext_dist_header_setup(
+                ctx->obuf->ext_endp, ctx->acmp, ctx->fragments, ctx->from);
 	    /* Encode control message */
 	    erts_encode_dist_ext(ctx->ctl, &ctx->obuf->ext_endp, ctx->flags, ctx->acmp, NULL, NULL);
+
+            ctx->obuf->hdrp = NULL;
+            ctx->obuf->hdr_endp = NULL;
+
 	    if (is_non_value(ctx->msg)) {
                 ctx->obuf->msg_start = NULL;
                 ctx->phase = ERTS_DSIG_SEND_PHASE_FIN;
@@ -1888,44 +2376,137 @@ erts_dsig_send(ErtsDSigData *dsdp, struct erts_dsig_send_context* ctx)
 
             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;
-	    }
+            if (!ctx->no_trap) {
+                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;
+                }
+            } else {
+                erts_encode_dist_ext(ctx->msg, &ctx->obuf->ext_endp, ctx->flags,
+                                     ctx->acmp, NULL, NULL);
+            }
 
-	    ctx->phase = ERTS_DSIG_SEND_PHASE_FIN;
+            ctx->phase = ERTS_DSIG_SEND_PHASE_FIN;
 	case ERTS_DSIG_SEND_PHASE_FIN: {
-	    DistEntry *dep = dsdp->dep;
-	    int suspended = 0;
-	    int resume = 0;
 
 	    ASSERT(ctx->obuf->extp < ctx->obuf->ext_endp);
-	    ASSERT(&ctx->obuf->data[0] <= ctx->obuf->extp - ctx->max_finalize_prepend);
-	    ASSERT(ctx->obuf->ext_endp <= &ctx->obuf->data[0] + ctx->data_size);
+	    ASSERT(ctx->obuf->ext_startp <= ctx->obuf->extp - ctx->max_finalize_prepend);
+	    ASSERT(ctx->obuf->ext_endp <= (byte*)ctx->obuf->ext_startp + ctx->data_size + ctx->dhdr_ext_size);
 
 	    ctx->data_size = ctx->obuf->ext_endp - ctx->obuf->extp;
 
             ctx->obuf->hopefull_flags = ctx->u.ec.hopefull_flags;
-	    /*
+
+            if (ctx->fragments > 1) {
+                int fin_fragments;
+                int i;
+                byte *msg = ctx->obuf->msg_start,
+                    *msg_end = ctx->obuf->ext_endp,
+                    *hdrp = msg_end;
+
+                ASSERT((ctx->obuf->hopefull_flags & ctx->flags) == ctx->obuf->hopefull_flags);
+                ASSERT(get_int64(ctx->obuf->extp + 1 + 1 + 8) == ctx->fragments);
+
+                /* Now that encoding is done we know how large the term will
+                   be so we adjust the number of fragments to send. Note that
+                   this can mean that only 1 fragment is sent. */
+                fin_fragments = (ctx->obuf->ext_endp - ctx->obuf->msg_start + ERTS_DIST_FRAGMENT_SIZE-1) /
+                    ERTS_DIST_FRAGMENT_SIZE - 1;
+
+                /* Update the frag_id in the DIST_FRAG_HEADER */
+                put_int64(fin_fragments+1, ctx->obuf->extp + 1 + 1 + 8);
+
+                if (fin_fragments > 0)
+                    msg += ERTS_DIST_FRAGMENT_SIZE;
+                else
+                    msg = msg_end;
+                ctx->obuf->next = &ctx->obuf[1];
+                ctx->obuf->ext_endp = msg;
+
+                /* Loop through all fragments, updating the output buffers
+                   to be correct and also writing the DIST_FRAG_CONT header. */
+                for (i = 1; i < fin_fragments + 1; i++) {
+                    ctx->obuf[i].hopefull_flags = 0;
+                    ctx->obuf[i].extp = msg;
+                    ctx->obuf[i].ext_start = msg;
+                    if (msg + ERTS_DIST_FRAGMENT_SIZE > msg_end)
+                        ctx->obuf[i].ext_endp = msg_end;
+                    else {
+                        msg += ERTS_DIST_FRAGMENT_SIZE;
+                        ctx->obuf[i].ext_endp = msg;
+                    }
+                    ASSERT(ctx->obuf[i].ext_endp > ctx->obuf[i].extp);
+                    ctx->obuf[i].hdrp = erts_encode_ext_dist_header_fragment(
+                        &hdrp, fin_fragments - i + 1, ctx->from);
+                    ctx->obuf[i].hdr_endp = hdrp;
+                    ctx->obuf[i].next = &ctx->obuf[i+1];
+                }
+                /* If the initial fragment calculation was incorrect we free the
+                   remaining output buffers. */
+                for (; i < ctx->fragments; i++) {
+                    free_dist_obuf(&ctx->obuf[i]);
+                }
+                if (!ctx->no_trap && !ctx->no_suspend)
+                    ctx->reds -= ctx->fragments;
+                ctx->fragments = fin_fragments + 1;
+            }
+
+            ctx->phase = ERTS_DSIG_SEND_PHASE_SEND;
+
+            if (ctx->reds <= 0) {
+                retval = ERTS_DSIG_SEND_CONTINUE;
+                goto done;
+            }
+        }
+        case ERTS_DSIG_SEND_PHASE_SEND: {
+            /*
 	     * Signal encoded; now verify that the connection still exists,
 	     * and if so enqueue the signal and schedule it for send.
 	     */
-	    ctx->obuf->next = NULL;
+            DistEntry *dep = ctx->dep;
+	    int suspended = 0;
+	    int resume = 0;
+            int i;
 	    erts_de_rlock(dep);
 	    cid = dep->cid;
 	    if (dep->state == ERTS_DE_STATE_EXITING
                 || dep->state == ERTS_DE_STATE_IDLE
-                || dep->connection_id != dsdp->connection_id) {
+                || dep->connection_id != ctx->connection_id) {
 		/* Not the same connection as when we started; drop message... */
 		erts_de_runlock(dep);
-		free_dist_obuf(ctx->obuf);
+                for (i = 0; i < ctx->fragments; i++)
+                    free_dist_obuf(&ctx->obuf[i]);
+                ctx->fragments = 0;
 	    }
 	    else {
-                Sint qsize;
+                Sint qsize = erts_atomic_read_nob(&dep->qsize);
                 erts_aint32_t qflgs;
 		ErtsProcList *plp = NULL;
                 Eterm notify_proc = NIL;
-                Sint obsz = size_obuf(ctx->obuf);
+                Sint obsz;
+                int fragments;
+
+                /* Calculate how many fragments to send. This depends on
+                   the available space in the distr queue and the amount
+                   of remaining reductions. */
+                for (fragments = 0, obsz = 0;
+                     fragments < ctx->fragments &&
+                         ((ctx->reds > 0 && (qsize + obsz) < erts_dist_buf_busy_limit) ||
+                          ctx->no_trap || ctx->no_suspend);
+                     fragments++) {
+#ifdef DEBUG
+                    int reds = 100;
+#else
+                    int reds = 10;
+#endif
+                    if (!ctx->no_trap && !ctx->no_suspend)
+                        ctx->reds -= reds;
+                    obsz += size_obuf(&ctx->obuf[fragments]);
+                }
+
+                ASSERT(fragments == ctx->fragments ||
+                       (!ctx->no_trap && !ctx->no_suspend));
 
 		erts_mtx_lock(&dep->qlock);
 		qsize = erts_atomic_add_read_nob(&dep->qsize, (erts_aint_t) obsz);
@@ -1946,7 +2527,7 @@ erts_dsig_send(ErtsDSigData *dsdp, struct erts_dsig_send_context* ctx)
                     /* else: requester will send itself the message... */
                     qflgs &= ~ERTS_DE_QFLG_REQ_INFO;
                 }
-		if (!ctx->force_busy && (qflgs & ERTS_DE_QFLG_BUSY)) {
+		if (!ctx->no_suspend && (qflgs & ERTS_DE_QFLG_BUSY)) {
 		    erts_mtx_unlock(&dep->qlock);
 
 		    plp = erts_proclist_create(ctx->c_p);
@@ -1955,14 +2536,27 @@ erts_dsig_send(ErtsDSigData *dsdp, struct erts_dsig_send_context* ctx)
 		    erts_mtx_lock(&dep->qlock);
 		}
 
-		/* Enqueue obuf on dist entry */
-		if (dep->out_queue.last)
-		    dep->out_queue.last->next = ctx->obuf;
-		else
-		    dep->out_queue.first = ctx->obuf;
-		dep->out_queue.last = ctx->obuf;
+                if (fragments > 1) {
+                    if (!ctx->obuf->hdrp) {
+                        ASSERT(get_int64(ctx->obuf->extp + 10) == ctx->fragments);
+                    } else {
+                        ASSERT(get_int64(ctx->obuf->hdrp + 10) == ctx->fragments);
+                    }
+                }
+
+                if (fragments) {
+                    ctx->obuf[fragments-1].next = NULL;
+                    if (dep->out_queue.last)
+                        dep->out_queue.last->next = ctx->obuf;
+                    else
+                        dep->out_queue.first = ctx->obuf;
+                    dep->out_queue.last = &ctx->obuf[fragments-1];
 
-		if (!ctx->force_busy) {
+                    ctx->fragments -= fragments;
+                    ctx->obuf = &ctx->obuf[fragments];
+                }
+
+		if (!ctx->no_suspend) {
                     qflgs = erts_atomic32_read_nob(&dep->qflgs);
 		    if (!(qflgs & ERTS_DE_QFLG_BUSY)) {
 			if (suspended)
@@ -2009,6 +2603,13 @@ erts_dsig_send(ErtsDSigData *dsdp, struct erts_dsig_send_context* ctx)
 		     * erroneously scheduled when it shouldn't be.
 		     */
 		}
+                /* More fragments left to be sent, yield and re-schedule */
+                if (ctx->fragments) {
+                    retval = ERTS_DSIG_SEND_CONTINUE;
+                    if (!resume && erts_system_monitor_flags.busy_dist_port)
+                        monitor_generic(ctx->c_p, am_busy_dist_port, cid);
+                    goto done;
+                }
 	    }
 	    ctx->obuf = NULL;
 
@@ -2093,9 +2694,9 @@ static Uint
 dist_port_commandv(Port *prt, ErtsDistOutputBuf *obuf)
 {
     int fpe_was_unmasked;
-    ErlDrvSizeT size;
-    SysIOVec iov[2];
-    ErlDrvBinary* bv[2];
+    ErlDrvSizeT size = 0;
+    SysIOVec iov[3];
+    ErlDrvBinary* bv[3];
     ErlIOVec eiov;
 
     ERTS_CHK_NO_PROC_LOCKS;
@@ -2110,12 +2711,31 @@ dist_port_commandv(Port *prt, ErtsDistOutputBuf *obuf)
         eiov.vsize = 1;
     }
     else {
-        size = obuf->ext_endp - obuf->extp;
+        int i = 1;
         eiov.vsize = 2;
 
-        iov[1].iov_base = obuf->extp;
-        iov[1].iov_len = size;
-        bv[1] = Binary2ErlDrvBinary(ErtsDistOutputBuf2Binary(obuf));
+        if (obuf->hdrp) {
+            eiov.vsize = 3;
+            iov[i].iov_base = obuf->hdrp;
+            iov[i].iov_len = obuf->hdr_endp - obuf->hdrp;
+            size += iov[i].iov_len;
+            bv[i] = Binary2ErlDrvBinary(ErtsDistOutputBuf2Binary(obuf));
+#ifdef ERTS_RAW_DIST_MSG_DBG
+            erts_fprintf(dbg_file, "SEND: ");
+            bw(iov[i].iov_base, iov[i].iov_len);
+#endif
+            i++;
+
+        }
+
+        iov[i].iov_base = obuf->extp;
+        iov[i].iov_len = obuf->ext_endp - obuf->extp;
+#ifdef ERTS_RAW_DIST_MSG_DBG
+            erts_fprintf(dbg_file, "SEND: ");
+            bw(iov[i].iov_base, iov[i].iov_len);
+#endif
+        size += iov[i].iov_len;
+        bv[i] = Binary2ErlDrvBinary(ErtsDistOutputBuf2Binary(obuf));
     }
 
     eiov.size = size;
@@ -2222,6 +2842,23 @@ erts_dist_command(Port *prt, int initial_reds)
     dep->finalized_out_queue.first = NULL;
     dep->finalized_out_queue.last = NULL;
 
+#ifdef DEBUG
+    {
+        Uint sz = 0;
+        ErtsDistOutputBuf *curr = oq.first;
+        while (curr) {
+            sz += size_obuf(curr);
+            curr = curr->next;
+        }
+        curr = foq.first;
+        while (curr) {
+            sz += size_obuf(curr);
+            curr = curr->next;
+        }
+        ASSERT(sz <= erts_atomic_read_nob(&dep->qsize));
+    }
+#endif
+
     sched_flags = erts_atomic32_read_nob(&prt->sched.flags);
 
     if (reds < 0)
@@ -2235,10 +2872,6 @@ erts_dist_command(Port *prt, int initial_reds)
             size = (*send)(prt, foq.first);
             erts_atomic64_inc_nob(&dep->out);
             esdp->io.out += (Uint64) size;
-#ifdef ERTS_RAW_DIST_MSG_DBG
-            erts_fprintf(stderr, ">> ");
-            bw(foq.first->extp, size);
-#endif
 	    reds -= ERTS_PORT_REDS_DIST_CMD_DATA(size);
 	    fob = foq.first;
 	    obufsize += size_obuf(fob);
@@ -2263,7 +2896,9 @@ erts_dist_command(Port *prt, int initial_reds)
 	    ob = oq.first;
 	    ASSERT(ob);
 	    do {
+                obufsize += size_obuf(ob);
 		reds = erts_encode_ext_dist_header_finalize(ob, dep, flags, reds);
+                obufsize -= size_obuf(ob);
                 if (reds < 0)
                     break;
                 last_finalized  = ob;
@@ -2302,20 +2937,18 @@ erts_dist_command(Port *prt, int initial_reds)
 	while (oq.first && !preempt) {
 	    ErtsDistOutputBuf *fob;
 	    Uint size;
+            obufsize += size_obuf(oq.first);
             reds = erts_encode_ext_dist_header_finalize(oq.first, dep, flags, reds);
+            obufsize -= size_obuf(oq.first);
             if (reds < 0) {
                 preempt = 1;
                 break;
             }
-	    ASSERT(&oq.first->data[0] <= oq.first->extp
-		   && oq.first->extp <= oq.first->ext_endp);
+	    ASSERT(oq.first->bin->orig_bytes <= (char*)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;
-#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);
@@ -2452,100 +3085,6 @@ erts_dist_command(Port *prt, int initial_reds)
     goto done;
 }
 
-#if 0
-
-int
-dist_data_finalize(Process *c_p, int reds_limit)
-{
-    int reds = 5;
-    DistEntry *dep = ;
-    ErtsDistOutputQueue oq, foq;
-    ErtsDistOutputBuf *ob;
-    int preempt;
-
-
-    erts_mtx_lock(&dep->qlock);
-    flags = dep->flags;
-    oq.first = dep->out_queue.first;
-    oq.last = dep->out_queue.last;
-    dep->out_queue.first = NULL;
-    dep->out_queue.last = NULL;
-    erts_mtx_unlock(&dep->qlock);
-
-    if (!oq.first) {
-        ASSERT(!oq.last);
-        oq.first = dep->tmp_out_queue.first;
-        oq.last = dep->tmp_out_queue.last;
-    }
-    else {
-        ErtsDistOutputBuf *f, *l;
-        ASSERT(oq.last);
-        if (dep->tmp_out_queue.last) {
-            dep->tmp_out_queue.last->next = oq.first;
-            oq.first = dep->tmp_out_queue.first;
-        }
-    }
-
-    if (!oq.first) {
-        /* Nothing to do... */
-        ASSERT(!oq.last);
-        return reds;
-    }
-
-    foq.first = dep->finalized_out_queue.first;
-    foq.last = dep->finalized_out_queue.last;
-
-    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;
-    } 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;
-    }
-
-    dep->finalized_out_queue.first = foq.first;
-    dep->finalized_out_queue.last = foq.last;
-    dep->tmp_out_queue.first = oq.first;
-    dep->tmp_out_queue.last = oq.last;
-
-    return reds;
-}
-
-#endif
-
 BIF_RETTYPE
 dist_ctrl_get_data_notification_1(BIF_ALIST_1)
 {
@@ -2614,6 +3153,7 @@ dist_ctrl_put_data_2(BIF_ALIST_2)
     ErlDrvSizeT size;
     Eterm input_handler;
     Uint32 conn_id;
+    Binary *bin = NULL;
 
     if (is_binary(BIF_ARG_2))
         size = binary_size(BIF_ARG_2);
@@ -2639,13 +3179,27 @@ dist_ctrl_put_data_2(BIF_ALIST_2)
     if (size != 0) {
         byte *data, *temp_alloc = NULL;
 
-        data = (byte *) erts_get_aligned_binary_bytes(BIF_ARG_2, &temp_alloc);
+        if (binary_bitoffset(BIF_ARG_2))
+            data = (byte *) erts_get_aligned_binary_bytes(BIF_ARG_2, &temp_alloc);
+        else {
+            Eterm real_bin;
+            ProcBin *proc_bin;
+            Uint offset, bitoffs, bitsize;
+
+            ERTS_GET_REAL_BIN(BIF_ARG_2, real_bin, offset, bitoffs, bitsize);
+            ASSERT(bitoffs == 0);
+            data = binary_bytes(real_bin) + offset;
+            proc_bin = (ProcBin *)binary_val(real_bin);
+            if (proc_bin->thing_word == HEADER_PROC_BIN)
+                bin = proc_bin->val;
+        }
+
         if (!data)
             BIF_ERROR(BIF_P, BADARG);
 
         erts_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN);
 
-        (void) erts_net_message(NULL, dep, conn_id, NULL, 0, data, size);
+        (void) erts_net_message(NULL, dep, conn_id, NULL, 0, bin, data, size);
         /*
          * We ignore any decode failures. On fatal failures the
          * connection will be taken down by killing the
@@ -2664,6 +3218,86 @@ dist_ctrl_put_data_2(BIF_ALIST_2)
 }
 
 BIF_RETTYPE
+dist_ctrl_set_opt_3(BIF_ALIST_3)
+{
+    DistEntry *dep = ERTS_PROC_GET_DIST_ENTRY(BIF_P);
+    Uint32 conn_id;
+    BIF_RETTYPE ret;
+
+    if (!dep)
+        BIF_ERROR(BIF_P, EXC_NOTSUP);
+
+    if (erts_dhandle_to_dist_entry(BIF_ARG_1, &conn_id) != dep)
+        BIF_ERROR(BIF_P, BADARG);
+
+    erts_de_rlock(dep);
+
+    if (dep->connection_id != conn_id)
+        ERTS_BIF_PREP_ERROR(ret, BIF_P, BADARG);
+    else {
+
+        switch (BIF_ARG_2) {
+        case am_get_size:
+            ERTS_BIF_PREP_RET(ret, (dep->opts & ERTS_DIST_CTRL_OPT_GET_SIZE
+                                    ? am_true
+                                    : am_false));
+            if (BIF_ARG_3 == am_true) 
+                dep->opts |= ERTS_DIST_CTRL_OPT_GET_SIZE;
+            else if (BIF_ARG_3 == am_false)
+                dep->opts &= ~ERTS_DIST_CTRL_OPT_GET_SIZE;
+            else
+                ERTS_BIF_PREP_ERROR(ret, BIF_P, BADARG);
+            break;
+        default:
+            ERTS_BIF_PREP_ERROR(ret, BIF_P, BADARG);
+            break;
+        }
+
+    }
+
+    erts_de_runlock(dep);
+
+    return ret;
+}
+
+BIF_RETTYPE
+dist_ctrl_get_opt_2(BIF_ALIST_2)
+{
+    DistEntry *dep = ERTS_PROC_GET_DIST_ENTRY(BIF_P);
+    Uint32 conn_id;
+    BIF_RETTYPE ret;
+
+    if (!dep)
+        BIF_ERROR(BIF_P, EXC_NOTSUP);
+
+    if (erts_dhandle_to_dist_entry(BIF_ARG_1, &conn_id) != dep)
+        BIF_ERROR(BIF_P, BADARG);
+
+    erts_de_rlock(dep);
+
+    if (dep->connection_id != conn_id)
+        ERTS_BIF_PREP_ERROR(ret, BIF_P, BADARG);
+    else {
+
+        switch (BIF_ARG_2) {
+        case am_get_size:
+            ERTS_BIF_PREP_RET(ret, (dep->opts & ERTS_DIST_CTRL_OPT_GET_SIZE
+                                    ? am_true
+                                    : am_false));
+            break;
+        default:
+            ERTS_BIF_PREP_ERROR(ret, BIF_P, BADARG);
+            break;
+        }
+
+    }
+
+    erts_de_runlock(dep);
+
+    return ret;
+}
+    
+BIF_RETTYPE
 dist_get_stat_1(BIF_ALIST_1)
 {
     Sint64 read, write, pend;
@@ -2696,7 +3330,7 @@ dist_get_stat_1(BIF_ALIST_1)
                              am_ok,
                              erts_bld_sint64(hpp, szp, read),
                              erts_bld_sint64(hpp, szp, write),
-                             pend ? am_true : am_false);
+                             erts_bld_sint64(hpp, szp, pend));
         if (hpp)
             break;
         hp = HAlloc(BIF_P, sz);
@@ -2738,12 +3372,13 @@ dist_ctrl_get_data_1(BIF_ALIST_1)
 {
     DistEntry *dep = ERTS_PROC_GET_DIST_ENTRY(BIF_P);
     const Sint initial_reds = ERTS_BIF_REDS_LEFT(BIF_P);
-    Sint reds = initial_reds;
+    Sint reds = initial_reds, obufsize = 0;
     ErtsDistOutputBuf *obuf;
-    Eterm *hp;
+    Eterm *hp, res;
     ProcBin *pb;
     erts_aint_t qsize;
-    Uint32 conn_id;
+    Uint32 conn_id, get_size;
+    Uint hsz = 0, bin_sz;
 
     if (!dep)
         BIF_ERROR(BIF_P, EXC_NOTSUP);
@@ -2795,9 +3430,13 @@ dist_ctrl_get_data_1(BIF_ALIST_1)
         }
 
         obuf = dep->tmp_out_queue.first;
+        obufsize += size_obuf(obuf);
         reds = erts_encode_ext_dist_header_finalize(obuf, dep, dep->flags, reds);
+        obufsize -= size_obuf(obuf);
         if (reds < 0) {
             erts_de_runlock(dep);
+            if (obufsize)
+                erts_atomic_add_nob(&dep->qsize, (erts_aint_t) -obufsize);
             ERTS_BIF_YIELD1(bif_export[BIF_dist_ctrl_get_data_1],
                             BIF_P, BIF_ARG_1);
         }
@@ -2811,17 +3450,60 @@ dist_ctrl_get_data_1(BIF_ALIST_1)
 
     erts_de_runlock(dep);
 
-    hp =  HAlloc(BIF_P, PROC_BIN_SIZE);
-    pb = (ProcBin *) (char *) hp;
-    pb->thing_word = HEADER_PROC_BIN;
-    pb->size = obuf->ext_endp - obuf->extp;
-    pb->next = MSO(BIF_P).first;
-    MSO(BIF_P).first = (struct erl_off_heap_header*) pb;
-    pb->val = ErtsDistOutputBuf2Binary(obuf);
-    pb->bytes = (byte*) obuf->extp;
-    pb->flags = 0;
-
-    qsize = erts_atomic_add_read_nob(&dep->qsize, -size_obuf(obuf));
+    bin_sz = obuf->ext_endp - obuf->extp + obuf->hdr_endp - obuf->hdrp;
+
+    get_size = dep->opts & ERTS_DIST_CTRL_OPT_GET_SIZE;
+    if (get_size) {
+        hsz += 3; /* 2 tuple */
+        if (!IS_USMALL(0, bin_sz))
+            hsz += BIG_UINT_HEAP_SIZE;
+    }
+
+    if (!obuf->hdrp) {
+        hp =  HAlloc(BIF_P, PROC_BIN_SIZE + hsz);
+        pb = (ProcBin *) (char *) hp;
+        pb->thing_word = HEADER_PROC_BIN;
+        pb->size = obuf->ext_endp - obuf->extp;
+        pb->next = MSO(BIF_P).first;
+        MSO(BIF_P).first = (struct erl_off_heap_header*) pb;
+        pb->val = ErtsDistOutputBuf2Binary(obuf);
+        pb->bytes = (byte*) obuf->extp;
+        pb->flags = 0;
+        res = make_binary(pb);
+        hp += PROC_BIN_SIZE;
+    } else {
+        hp =  HAlloc(BIF_P, PROC_BIN_SIZE * 2 + 4 + hsz);
+        pb = (ProcBin *) (char *) hp;
+        pb->thing_word = HEADER_PROC_BIN;
+        pb->size = obuf->ext_endp - obuf->extp;
+        pb->next = MSO(BIF_P).first;
+        MSO(BIF_P).first = (struct erl_off_heap_header*) pb;
+        pb->val = ErtsDistOutputBuf2Binary(obuf);
+        pb->bytes = (byte*) obuf->extp;
+        pb->flags = 0;
+        hp += PROC_BIN_SIZE;
+
+        res = CONS(hp, make_binary(pb), NIL);
+        hp += 2;
+
+        pb = (ProcBin *) (char *) hp;
+        pb->thing_word = HEADER_PROC_BIN;
+        pb->size = obuf->hdr_endp - obuf->hdrp;
+        pb->next = MSO(BIF_P).first;
+        MSO(BIF_P).first = (struct erl_off_heap_header*) pb;
+        pb->val = ErtsDistOutputBuf2Binary(obuf);
+        erts_refc_inc(&pb->val->intern.refc, 1);
+        pb->bytes = (byte*) obuf->hdrp;
+        pb->flags = 0;
+        hp += PROC_BIN_SIZE;
+        res = CONS(hp, make_binary(pb), res);
+        hp += 2;
+    }
+
+    obufsize += size_obuf(obuf);
+
+    qsize = erts_atomic_add_read_nob(&dep->qsize, (erts_aint_t) -obufsize);
+
     ASSERT(qsize >= 0);
 
     if (qsize < erts_dist_buf_busy_limit/2
@@ -2836,7 +3518,18 @@ dist_ctrl_get_data_1(BIF_ALIST_1)
         }
     }
 
-    BIF_RET2(make_binary(pb), (initial_reds - reds));
+    if (get_size) {
+        Eterm sz_term;
+        if (IS_USMALL(0, bin_sz))
+            sz_term = make_small(bin_sz);
+        else {
+            sz_term = uint_to_big(bin_sz, hp);
+            hp += BIG_UINT_HEAP_SIZE;
+        }
+        res = TUPLE2(hp, sz_term, res);
+    }
+
+    BIF_RET2(res, (initial_reds - reds));
 }
 
 void
@@ -2879,6 +3572,10 @@ static void kill_connection(DistEntry *dep)
 void
 erts_kill_dist_connection(DistEntry *dep, Uint32 conn_id)
 {
+#ifdef ERTS_DIST_MSG_DBG
+    erts_fprintf(dbg_file, "INTR: kill dist conn to %T:%u\n",
+                 dep->sysname, conn_id);
+#endif
     erts_de_rwlock(dep);
     if (conn_id == dep->connection_id
         && dep->state == ERTS_DE_STATE_CONNECTED) {
@@ -2893,7 +3590,7 @@ struct print_to_data {
     void *arg;
 };
 
-static void doit_print_monitor_info(ErtsMonitor *mon, void *vptdp)
+static int doit_print_monitor_info(ErtsMonitor *mon, void *vptdp, Sint reds)
 {
     fmtfn_t to = ((struct print_to_data *) vptdp)->to;
     void *arg = ((struct print_to_data *) vptdp)->arg;
@@ -2916,6 +3613,7 @@ static void doit_print_monitor_info(ErtsMonitor *mon, void *vptdp)
         else
 	    erts_print(to, arg, "%T\n", mdep->md.origin.other.item);
     }
+    return 1;
 }    
 
 static void print_monitor_info(fmtfn_t to, void *arg, DistEntry *dep)
@@ -2931,12 +3629,13 @@ static void print_monitor_info(fmtfn_t to, void *arg, DistEntry *dep)
     }
 }
 
-static void doit_print_link_info(ErtsLink *lnk, void *vptdp)
+static int doit_print_link_info(ErtsLink *lnk, void *vptdp, Sint reds)
 {
     struct print_to_data *ptdp = vptdp;
     ErtsLink *lnk2 = erts_link_to_other(lnk, NULL);
     erts_print(ptdp->to, ptdp->arg, "Remote link: %T %T\n",
 	       lnk2->other.item, lnk->other.item);
+    return 1;
 }
 
 static void print_link_info(fmtfn_t to, void *arg, DistEntry *dep)
@@ -3538,8 +4237,9 @@ Sint erts_abort_connection_rwunlock(DistEntry* dep)
         erts_set_dist_entry_not_connected(dep);
 	erts_de_rwunlock(dep);
 
-        schedule_con_monitor_link_cleanup(mld, THE_NON_VALUE,
-                                          THE_NON_VALUE, THE_NON_VALUE);
+        schedule_con_monitor_link_seq_cleanup(
+            mld, NULL, THE_NON_VALUE,
+            THE_NON_VALUE, THE_NON_VALUE);
 
         if (resume_procs) {
             int resumed = erts_resume_processes(resume_procs);
@@ -3845,16 +4545,16 @@ monitor_node(Process* p, Eterm Node, Eterm Bool, Eterm Options)
     }
 
     case am_true: {
-        ErtsDSigData dsd;
-        dsd.node = Node;
+        ErtsDSigSendContext ctx;
+        ctx.node = Node;
 
         dep = erts_find_or_insert_dist_entry(Node);
         if (dep == erts_this_dist_entry)
             break;
 
-        switch (erts_dsig_prepare(&dsd, dep, p,
+        switch (erts_dsig_prepare(&ctx, dep, p,
                                   ERTS_PROC_LOCK_MAIN,
-                                  ERTS_DSP_RLOCK, 0, async_connect)) {
+                                  ERTS_DSP_RLOCK, 0, 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 */
@@ -3881,28 +4581,22 @@ monitor_node(Process* p, Eterm Node, Eterm Bool, Eterm Options)
                                                   Node);
             mdep = (ErtsMonitorDataExtended *) erts_monitor_to_data(mon);
             if (created) {
-#ifdef DEBUG
                 int inserted =
-#endif
                     erts_monitor_dist_insert(&mdep->md.target, dep->mld);
-                ASSERT(inserted);
+                ASSERT(inserted); (void)inserted;
                 ASSERT(mdep->dist->connection_id == dep->connection_id);
             }
             else if (mdep->dist->connection_id != dep->connection_id) {
                 ErtsMonitorDataExtended *mdep2;
                 ErtsMonitor *mon2;
-#ifdef DEBUG
                 int inserted;
-#endif
                 mdep2 = ((ErtsMonitorDataExtended *)
                          erts_monitor_create(ERTS_MON_TYPE_NODE, NIL,
                                              p->common.id, Node, NIL));
                 mon2 = &mdep2->md.origin;
-#ifdef DEBUG
                 inserted =
-#endif
                     erts_monitor_dist_insert(&mdep->md.target, dep->mld);
-                ASSERT(inserted);
+                ASSERT(inserted); (void)inserted;
                 ASSERT(mdep2->dist->connection_id == dep->connection_id);
 
                 mdep2->uptr.node_monitors = mdep->uptr.node_monitors;
@@ -4158,8 +4852,8 @@ typedef struct {
     Uint i;
 } ErtsNodesMonitorContext;
 
-static void
-save_nodes_monitor(ErtsMonitor *mon, void *vctxt)
+static int
+save_nodes_monitor(ErtsMonitor *mon, void *vctxt, Sint reds)
 {
     ErtsNodesMonitorContext *ctxt = vctxt;
     ErtsMonitorData *mdp = erts_monitor_to_data(mon);
@@ -4171,6 +4865,7 @@ save_nodes_monitor(ErtsMonitor *mon, void *vctxt)
     ctxt->nmdp[ctxt->i].options = mdp->origin.other.item;
 
     ctxt->i++;
+    return 1;
 }
 
 static void
@@ -4303,8 +4998,8 @@ typedef struct {
 } ErtsNodesMonitorInfoContext;
 
 
-static void
-nodes_monitor_info(ErtsMonitor *mon, void *vctxt)
+static int
+nodes_monitor_info(ErtsMonitor *mon, void *vctxt, Sint reds)
 {
     ErtsMonitorDataExtended *mdep;
     ErtsNodesMonitorInfoContext *ctxt = vctxt;
@@ -4351,6 +5046,7 @@ nodes_monitor_info(ErtsMonitor *mon, void *vctxt)
     ctxt->hpp = hpp;
     ctxt->szp = szp;
     ctxt->res = res;
+    return 1;
 }
 
 Eterm
@@ -4405,3 +5101,22 @@ erts_processes_monitoring_nodes(Process *c_p)
 
     return ctxt.res;
 }
+
+static void
+print_suspended_on_de(fmtfn_t to, void *to_arg, DistEntry *dep)
+{
+    for (; dep; dep = dep->next) {
+        ErtsProcList *curr = erts_proclist_peek_first(dep->suspended);
+        while (curr) {
+            if (!is_internal_pid(curr->u.pid))
+                print_process_info(to, to_arg, curr->u.p, 0);
+            curr = erts_proclist_peek_next(dep->suspended, curr);
+        }
+    }
+}
+
+void
+erts_dist_print_procs_suspended_on_de(fmtfn_t to, void *to_arg) {
+    print_suspended_on_de(to, to_arg, erts_hidden_dist_entries);
+    print_suspended_on_de(to, to_arg, erts_visible_dist_entries);
+}
diff --git a/erts/emulator/beam/dist.h b/erts/emulator/beam/dist.h
index d4d7874a70..a33fb7efcf 100644
--- a/erts/emulator/beam/dist.h
+++ b/erts/emulator/beam/dist.h
@@ -47,6 +47,8 @@
 #define DFLAG_SEND_SENDER         0x80000
 #define DFLAG_BIG_SEQTRACE_LABELS 0x100000
 #define DFLAG_NO_MAGIC            0x200000 /* internal for pending connection */
+#define DFLAG_EXIT_PAYLOAD        0x400000
+#define DFLAG_FRAGMENTS           0x800000
 
 /* Mandatory flags for distribution */
 #define DFLAG_DIST_MANDATORY (DFLAG_EXTENDED_REFERENCES         \
@@ -75,7 +77,9 @@
                             | DFLAG_MAP_TAG                   \
                             | DFLAG_BIG_CREATION              \
                             | DFLAG_SEND_SENDER               \
-                            | DFLAG_BIG_SEQTRACE_LABELS)
+                            | DFLAG_BIG_SEQTRACE_LABELS       \
+                            | DFLAG_EXIT_PAYLOAD              \
+                            | DFLAG_FRAGMENTS)
 
 /* Flags addable by local distr implementations */
 #define DFLAG_DIST_ADDABLE    DFLAG_DIST_DEFAULT
@@ -99,26 +103,35 @@
                                | DFLAG_BIG_CREATION)
 
 /* opcodes used in distribution messages */
-#define DOP_LINK		1
-#define DOP_SEND		2
-#define DOP_EXIT		3
-#define DOP_UNLINK		4
+enum dop {
+    DOP_LINK                = 1,
+    DOP_SEND                = 2,
+    DOP_EXIT                = 3,
+    DOP_UNLINK              = 4,
 /* Ancient DOP_NODE_LINK (5) was here, can be reused */
-#define DOP_REG_SEND		6
-#define DOP_GROUP_LEADER	7
-#define DOP_EXIT2		8
-
-#define DOP_SEND_TT		12
-#define DOP_EXIT_TT		13
-#define DOP_REG_SEND_TT		16
-#define DOP_EXIT2_TT		18
-
-#define DOP_MONITOR_P		19
-#define DOP_DEMONITOR_P		20
-#define DOP_MONITOR_P_EXIT	21
-
-#define DOP_SEND_SENDER         22
-#define DOP_SEND_SENDER_TT      23
+    DOP_REG_SEND            = 6,
+    DOP_GROUP_LEADER        = 7,
+    DOP_EXIT2               = 8,
+
+    DOP_SEND_TT             = 12,
+    DOP_EXIT_TT             = 13,
+    DOP_REG_SEND_TT         = 16,
+    DOP_EXIT2_TT            = 18,
+
+    DOP_MONITOR_P           = 19,
+    DOP_DEMONITOR_P         = 20,
+    DOP_MONITOR_P_EXIT      = 21,
+
+    DOP_SEND_SENDER         = 22,
+    DOP_SEND_SENDER_TT      = 23,
+
+    /* These are used when DFLAG_EXIT_PAYLOAD is detected */
+    DOP_PAYLOAD_EXIT           = 24,
+    DOP_PAYLOAD_EXIT_TT        = 25,
+    DOP_PAYLOAD_EXIT2          = 26,
+    DOP_PAYLOAD_EXIT2_TT       = 27,
+    DOP_PAYLOAD_MONITOR_P_EXIT = 28
+};
 
 /* distribution trap functions */
 extern Export* dmonitor_node_trap;
@@ -129,15 +142,15 @@ typedef enum {
 } ErtsDSigPrepLock;
 
 
-typedef struct {
-    Process *proc;
-    DistEntry *dep;
-    Eterm node;   /* used if dep == NULL */
-    Eterm cid;
-    Eterm connection_id;
-    int no_suspend;
-    Uint32 flags;
-} ErtsDSigData;
+/* Must be larger or equal to 16 */
+#ifdef DEBUG
+#define ERTS_DIST_FRAGMENT_SIZE 16
+#else
+/* This should be made configurable */
+#define ERTS_DIST_FRAGMENT_SIZE (64 * 1024)
+#endif
+
+#define ERTS_DIST_FRAGMENT_HEADER_SIZE (1 + 1 + 8 + 8) /* magic, header, seq id, frag id*/
 
 #define ERTS_DE_BUSY_LIMIT (1024*1024)
 extern int erts_dist_buf_busy_limit;
@@ -159,123 +172,8 @@ extern int erts_is_alive;
 /* Pending connection; signals can be enqueued */
 #define ERTS_DSIG_PREP_PENDING	        4
 
-ERTS_GLB_INLINE int erts_dsig_prepare(ErtsDSigData *,
-				      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 connect)
-{
-    int res;
-
-    if (!erts_is_alive)
-	return ERTS_DSIG_PREP_NOT_ALIVE;
-    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) {
-	    res = ERTS_DSIG_PREP_WOULD_SUSPEND;
-	    goto fail;
-	}
-    }
-    dsdp->proc = proc;
-    dsdp->dep = dep;
-    dsdp->cid = dep->cid;
-    dsdp->connection_id = dep->connection_id;
-    dsdp->no_suspend = no_suspend;
-    dsdp->flags = dep->flags;
-    if (dspl == ERTS_DSP_NO_LOCK)
-	erts_de_runlock(dep);
-    return res;
-
- fail:
-    erts_de_runlock(dep);
-    return res;
-}
-
-ERTS_GLB_INLINE
-void erts_schedule_dist_command(Port *prt, DistEntry *dist_entry)
-{
-    DistEntry *dep;
-    Eterm id;
-
-    if (prt) {
-	ERTS_LC_ASSERT(erts_lc_is_port_locked(prt));
-	ASSERT((erts_atomic32_read_nob(&prt->state)
-		& ERTS_PORT_SFLGS_DEAD) == 0);
-
-        dep = (DistEntry*) erts_prtsd_get(prt, ERTS_PRTSD_DIST_ENTRY);
-        ASSERT(dep);
-	id = prt->common.id;
-    }
-    else {
-	ASSERT(dist_entry);
-	ERTS_LC_ASSERT(erts_lc_rwmtx_is_rlocked(&dist_entry->rwmtx)
-			   || erts_lc_rwmtx_is_rwlocked(&dist_entry->rwmtx));
-	ASSERT(is_internal_port(dist_entry->cid));
-
- 	dep = dist_entry;
-	id = dep->cid;
-    }
-
-    if (!erts_atomic_xchg_mb(&dep->dist_cmd_scheduled, 1))
-	erts_port_task_schedule(id, &dep->dist_cmd, ERTS_PORT_TASK_DIST_CMD);
-}
-
-#endif
+/* dist_ctrl_{g,s}et_option/2 */
+#define ERTS_DIST_CTRL_OPT_GET_SIZE     ((Uint32) (1 << 0))
 
 #ifdef DEBUG
 #define ERTS_DBG_CHK_NO_DIST_LNK(D, R, L) \
@@ -336,41 +234,57 @@ enum erts_dsig_send_phase {
     ERTS_DSIG_SEND_PHASE_MSG_SIZE,
     ERTS_DSIG_SEND_PHASE_ALLOC,
     ERTS_DSIG_SEND_PHASE_MSG_ENCODE,
-    ERTS_DSIG_SEND_PHASE_FIN
+    ERTS_DSIG_SEND_PHASE_FIN,
+    ERTS_DSIG_SEND_PHASE_SEND
 };
 
-struct erts_dsig_send_context {
-    enum erts_dsig_send_phase phase;
-    Sint reds;
+typedef struct erts_dsig_send_context {
+    int connect;
+    int no_suspend;
+    int no_trap;
 
     Eterm ctl;
     Eterm msg;
-    int force_busy;
+    Eterm from;
+    Eterm ctl_heap[6];
+    Eterm return_term;
+
+    DistEntry *dep;
+    Eterm node;   /* used if dep == NULL */
+    Eterm cid;
+    Eterm connection_id;
+    int deref_dep;
+
+    enum erts_dsig_send_phase phase;
+    Sint reds;
+
     Uint32 max_finalize_prepend;
     Uint data_size, dhdr_ext_size;
     ErtsAtomCacheMap *acmp;
     ErtsDistOutputBuf *obuf;
+    Uint fragments;
     Uint32 flags;
     Process *c_p;
     union {
 	TTBSizeContext sc;
 	TTBEncodeContext ec;
     }u;
-};
 
-typedef struct {
-    int suspend;
-    int connect;
+} ErtsDSigSendContext;
 
-    Eterm ctl_heap[6];
-    ErtsDSigData dsd;
-    DistEntry *dep;
-    int deref_dep;
-    struct erts_dsig_send_context dss;
+typedef struct dist_sequences DistSeqNode;
 
-    Eterm return_term;
-}ErtsSendContext;
+struct dist_sequences {
+    ErlHeapFragment hfrag;
+    struct dist_sequences *parent;
+    struct dist_sequences *left;
+    struct dist_sequences *right;
+    char is_red;
 
+    Uint64 seq_id;
+    int cnt;
+    Sint ctl_len;
+};
 
 /*
  * erts_dsig_send_* return values.
@@ -378,22 +292,23 @@ typedef struct {
 #define ERTS_DSIG_SEND_OK	0
 #define ERTS_DSIG_SEND_YIELD	1
 #define ERTS_DSIG_SEND_CONTINUE 2
-
-extern int erts_dsig_send_link(ErtsDSigData *, Eterm, Eterm);
-extern int erts_dsig_send_msg(Eterm, Eterm, ErtsSendContext*);
-extern int erts_dsig_send_exit_tt(ErtsDSigData *, Eterm, Eterm, Eterm, Eterm);
-extern int erts_dsig_send_unlink(ErtsDSigData *, Eterm, Eterm);
-extern int erts_dsig_send_reg_msg(Eterm, Eterm, ErtsSendContext*);
-extern int erts_dsig_send_group_leader(ErtsDSigData *, Eterm, Eterm);
-extern int erts_dsig_send_exit(ErtsDSigData *, Eterm, Eterm, Eterm);
-extern int erts_dsig_send_exit2(ErtsDSigData *, Eterm, Eterm, Eterm);
-extern int erts_dsig_send_demonitor(ErtsDSigData *, Eterm, Eterm, Eterm, int);
-extern int erts_dsig_send_monitor(ErtsDSigData *, Eterm, Eterm, Eterm);
-extern int erts_dsig_send_m_exit(ErtsDSigData *, Eterm, Eterm, Eterm, Eterm);
-
-extern int erts_dsig_send(ErtsDSigData *dsdp, struct erts_dsig_send_context* ctx);
+#define ERTS_DSIG_SEND_TOO_LRG  3
+
+extern int erts_dsig_send_msg(ErtsDSigSendContext*, Eterm, Eterm);
+extern int erts_dsig_send_reg_msg(ErtsDSigSendContext*, Eterm, Eterm);
+extern int erts_dsig_send_link(ErtsDSigSendContext *, Eterm, Eterm);
+extern int erts_dsig_send_exit_tt(ErtsDSigSendContext *, Eterm, Eterm, Eterm, Eterm);
+extern int erts_dsig_send_unlink(ErtsDSigSendContext *, Eterm, Eterm);
+extern int erts_dsig_send_group_leader(ErtsDSigSendContext *, Eterm, Eterm);
+extern int erts_dsig_send_exit(ErtsDSigSendContext *, Eterm, Eterm, Eterm);
+extern int erts_dsig_send_exit2(ErtsDSigSendContext *, Eterm, Eterm, Eterm);
+extern int erts_dsig_send_demonitor(ErtsDSigSendContext *, Eterm, Eterm, Eterm);
+extern int erts_dsig_send_monitor(ErtsDSigSendContext *, Eterm, Eterm, Eterm);
+extern int erts_dsig_send_m_exit(ErtsDSigSendContext *, Eterm, Eterm, Eterm, Eterm);
+
+extern int erts_dsig_send(ErtsDSigSendContext *dsdp);
 extern int erts_dsend_context_dtor(Binary*);
-extern Eterm erts_dsend_export_trap_context(Process* p, ErtsSendContext* ctx);
+extern Eterm erts_dsend_export_trap_context(Process* p, ErtsDSigSendContext* ctx);
 
 extern int erts_dist_command(Port *prt, int reds);
 extern void erts_dist_port_not_busy(Port *prt);
@@ -403,5 +318,19 @@ extern Uint erts_dist_cache_size(void);
 
 extern Sint erts_abort_connection_rwunlock(DistEntry *dep);
 
+extern void erts_debug_dist_seq_tree_foreach(
+    DistEntry *dep,
+    int (*func)(DistSeqNode *, void*, Sint), void *args);
+
+extern int erts_dsig_prepare(ErtsDSigSendContext *,
+                             DistEntry*,
+                             Process *,
+                             ErtsProcLocks,
+                             ErtsDSigPrepLock,
+                             int,
+                             int,
+                             int);
 
+void erts_dist_print_procs_suspended_on_de(fmtfn_t to, void *to_arg);
+int erts_auto_connect(DistEntry* dep, Process *proc, ErtsProcLocks proc_locks);
 #endif
diff --git a/erts/emulator/beam/erl_afit_alloc.c b/erts/emulator/beam/erl_afit_alloc.c
index 38289ea78a..f07137c883 100644
--- a/erts/emulator/beam/erl_afit_alloc.c
+++ b/erts/emulator/beam/erl_afit_alloc.c
@@ -102,6 +102,8 @@ erts_afalc_start(AFAllctr_t *afallctr,
     allctr->add_mbc                     = NULL;
     allctr->remove_mbc                  = NULL;
     allctr->largest_fblk_in_mbc         = NULL;
+    allctr->first_fblk_in_mbc           = NULL;
+    allctr->next_fblk_in_mbc            = NULL;
     allctr->init_atoms			= init_atoms;
 
 #ifdef ERTS_ALLOC_UTIL_HARD_DEBUG
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c
index 9e36d5e0d1..b9f0334172 100644
--- a/erts/emulator/beam/erl_alloc.c
+++ b/erts/emulator/beam/erl_alloc.c
@@ -64,9 +64,6 @@
 #  error "Too many schedulers; cannot create that many pref alloc instances"
 #endif
 
-#define ERTS_ALC_FIX_TYPE_IX(T) \
-  (ERTS_ALC_T2N((T)) - ERTS_ALC_N_MIN_A_FIXED_SIZE)
-
 #define ERTS_ALC_DEFAULT_MAX_THR_PREF ERTS_MAX_NO_OF_SCHEDULERS
 
 #if defined(SMALL_MEMORY) || defined(PURIFY) || defined(VALGRIND)
@@ -156,20 +153,13 @@ ERTS_SCHED_PREF_QUICK_ALLOC_IMPL(aireq,
 
 ErtsAlcType_t erts_fix_core_allocator_ix;
 
-enum allctr_type {
-    GOODFIT,
-    BESTFIT,
-    AFIT,
-    FIRSTFIT
-};
-
 struct au_init {
     int enable;
     int thr_spec;
     int disable_allowed;
     int thr_spec_allowed;
     int carrier_migration_allowed;
-    enum allctr_type	atype;
+    ErtsAlcStrat_t	astrat;
     struct {
 	AllctrInit_t	util;
 	GFAllctrInit_t	gf;
@@ -219,7 +209,9 @@ typedef struct {
     struct au_init test_alloc;
 } erts_alc_hndl_args_init_t;
 
-#define ERTS_AU_INIT__ {0, 0, 1, 1, 1, GOODFIT, DEFAULT_ALLCTR_INIT, {1,1,1,1}}
+#define ERTS_AU_INIT__ {0, 0, 1, 1, 1, \
+                        ERTS_ALC_S_GOODFIT, DEFAULT_ALLCTR_INIT, \
+                        {1,1,1,1}}
 
 #define SET_DEFAULT_ALLOC_OPTS(IP)					\
 do {									\
@@ -233,7 +225,7 @@ set_default_sl_alloc_opts(struct au_init *ip)
     SET_DEFAULT_ALLOC_OPTS(ip);
     ip->enable			= AU_ALLOC_DEFAULT_ENABLE(1);
     ip->thr_spec		= 1;
-    ip->atype			= GOODFIT;
+    ip->astrat			= ERTS_ALC_S_GOODFIT;
     ip->init.util.name_prefix	= "sl_";
     ip->init.util.alloc_no	= ERTS_ALC_A_SHORT_LIVED;
 #ifndef SMALL_MEMORY
@@ -252,7 +244,7 @@ set_default_std_alloc_opts(struct au_init *ip)
     SET_DEFAULT_ALLOC_OPTS(ip);
     ip->enable			= AU_ALLOC_DEFAULT_ENABLE(1);
     ip->thr_spec		= 1;
-    ip->atype			= BESTFIT;
+    ip->astrat			= ERTS_ALC_S_BESTFIT;
     ip->init.util.name_prefix	= "std_";
     ip->init.util.alloc_no	= ERTS_ALC_A_STANDARD;
 #ifndef SMALL_MEMORY
@@ -270,7 +262,7 @@ set_default_ll_alloc_opts(struct au_init *ip)
     SET_DEFAULT_ALLOC_OPTS(ip);
     ip->enable			= AU_ALLOC_DEFAULT_ENABLE(1);
     ip->thr_spec		= 0;
-    ip->atype			= BESTFIT;
+    ip->astrat			= ERTS_ALC_S_BESTFIT;
     ip->init.bf.ao		= 1;
     ip->init.util.ramv		= 0;
     ip->init.util.mmsbc		= 0;
@@ -299,7 +291,7 @@ set_default_literal_alloc_opts(struct au_init *ip)
     ip->disable_allowed         = 0;
     ip->thr_spec_allowed        = 0;
     ip->carrier_migration_allowed = 0;
-    ip->atype			= BESTFIT;
+    ip->astrat			= ERTS_ALC_S_BESTFIT;
     ip->init.bf.ao		= 1;
     ip->init.util.ramv		= 0;
     ip->init.util.mmsbc		= 0;
@@ -349,7 +341,7 @@ set_default_exec_alloc_opts(struct au_init *ip)
     ip->disable_allowed         = 0;
     ip->thr_spec_allowed        = 0;
     ip->carrier_migration_allowed = 0;
-    ip->atype			= BESTFIT;
+    ip->astrat			= ERTS_ALC_S_BESTFIT;
     ip->init.bf.ao		= 1;
     ip->init.util.ramv		= 0;
     ip->init.util.mmsbc		= 0;
@@ -378,7 +370,7 @@ set_default_temp_alloc_opts(struct au_init *ip)
     ip->thr_spec		= 1;
     ip->disable_allowed         = 0;
     ip->carrier_migration_allowed = 0;
-    ip->atype			= AFIT;
+    ip->astrat			= ERTS_ALC_S_AFIT;
     ip->init.util.name_prefix	= "temp_";
     ip->init.util.alloc_no	= ERTS_ALC_A_TEMPORARY;
 #ifndef SMALL_MEMORY
@@ -397,7 +389,7 @@ set_default_eheap_alloc_opts(struct au_init *ip)
     SET_DEFAULT_ALLOC_OPTS(ip);
     ip->enable			= AU_ALLOC_DEFAULT_ENABLE(1);
     ip->thr_spec		= 1;
-    ip->atype			= GOODFIT;
+    ip->astrat			= ERTS_ALC_S_GOODFIT;
     ip->init.util.name_prefix	= "eheap_";
     ip->init.util.alloc_no	= ERTS_ALC_A_EHEAP;
 #ifndef SMALL_MEMORY
@@ -416,7 +408,7 @@ set_default_binary_alloc_opts(struct au_init *ip)
     SET_DEFAULT_ALLOC_OPTS(ip);
     ip->enable			= AU_ALLOC_DEFAULT_ENABLE(1);
     ip->thr_spec		= 1;
-    ip->atype			= BESTFIT;
+    ip->astrat			= ERTS_ALC_S_BESTFIT;
     ip->init.util.name_prefix	= "binary_";
     ip->init.util.alloc_no	= ERTS_ALC_A_BINARY;
 #ifndef SMALL_MEMORY
@@ -435,7 +427,7 @@ set_default_ets_alloc_opts(struct au_init *ip)
     SET_DEFAULT_ALLOC_OPTS(ip);
     ip->enable			= AU_ALLOC_DEFAULT_ENABLE(1);
     ip->thr_spec		= 1;
-    ip->atype			= BESTFIT;
+    ip->astrat			= ERTS_ALC_S_BESTFIT;
     ip->init.util.name_prefix	= "ets_";
     ip->init.util.alloc_no	= ERTS_ALC_A_ETS;
 #ifndef SMALL_MEMORY
@@ -453,7 +445,7 @@ set_default_driver_alloc_opts(struct au_init *ip)
     SET_DEFAULT_ALLOC_OPTS(ip);
     ip->enable			= AU_ALLOC_DEFAULT_ENABLE(1);
     ip->thr_spec		= 1;
-    ip->atype			= BESTFIT;
+    ip->astrat			= ERTS_ALC_S_BESTFIT;
     ip->init.util.name_prefix	= "driver_";
     ip->init.util.alloc_no	= ERTS_ALC_A_DRIVER;
 #ifndef SMALL_MEMORY
@@ -473,7 +465,7 @@ set_default_fix_alloc_opts(struct au_init *ip,
     SET_DEFAULT_ALLOC_OPTS(ip);
     ip->enable			= AU_ALLOC_DEFAULT_ENABLE(1);
     ip->thr_spec		= 1;
-    ip->atype			= BESTFIT;
+    ip->astrat			= ERTS_ALC_S_BESTFIT;
     ip->init.bf.ao = 1;
     ip->init.util.name_prefix	= "fix_";
     ip->init.util.fix_type_size	= fix_type_sizes;
@@ -493,7 +485,7 @@ 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			= FIRSTFIT;
+    ip->astrat			= ERTS_ALC_S_FIRSTFIT;
     ip->init.aoff.crr_order     = FF_AOFF;
     ip->init.aoff.blk_order     = FF_BF;
     ip->init.util.name_prefix	= "test_";
@@ -552,8 +544,8 @@ start_au_allocator(ErtsAlcType_t alctr_n,
 static void
 refuse_af_strategy(struct au_init *init)
 {
-    if (init->atype == AFIT)
-	init->atype = GOODFIT;
+    if (init->astrat == ERTS_ALC_S_AFIT)
+	init->astrat = ERTS_ALC_S_GOODFIT;
 }
 
 #ifdef HARD_DEBUG
@@ -576,7 +568,10 @@ static void adjust_fix_alloc_sizes(UWord extra_block_size)
 	    for (i=0; i < tspec->size; i++) {
 		Allctr_t* allctr = tspec->allctr[i];
 		for (j=0; j < ERTS_ALC_NO_FIXED_SIZES; ++j) {
-		    allctr->fix[j].type_size += extra_block_size;
+                    size_t size = allctr->fix[j].type_size;
+                    size = MAX(size + extra_block_size,
+                               sizeof(ErtsAllctrDDBlock_t));
+		    allctr->fix[j].type_size = size;
 		}
 	    }
 	}
@@ -584,8 +579,11 @@ static void adjust_fix_alloc_sizes(UWord extra_block_size)
 	{
 	    Allctr_t* allctr = erts_allctrs_info[ERTS_ALC_A_FIXED_SIZE].extra;
 	    for (j=0; j < ERTS_ALC_NO_FIXED_SIZES; ++j) {
-		allctr->fix[j].type_size += extra_block_size;
-	    }	
+                size_t size = allctr->fix[j].type_size;
+                size = MAX(size + extra_block_size,
+                           sizeof(ErtsAllctrDDBlock_t));
+                allctr->fix[j].type_size = size;
+	    }
 	}
     }
 }
@@ -597,7 +595,7 @@ strategy_support_carrier_migration(struct au_init *auip)
      * Currently only aoff* and ageff* support carrier
      * migration, i.e, type AOFIRSTFIT.
      */
-    return auip->atype == FIRSTFIT;
+    return auip->astrat == ERTS_ALC_S_FIRSTFIT;
 }
 
 static ERTS_INLINE void
@@ -612,7 +610,7 @@ adjust_carrier_migration_support(struct au_init *auip)
 	 */
 	if (!strategy_support_carrier_migration(auip)) {
 	    /* Default to aoffcbf */
-	    auip->atype = FIRSTFIT;
+	    auip->astrat = ERTS_ALC_S_FIRSTFIT;
 	    auip->init.aoff.crr_order = FF_AOFF;
 	    auip->init.aoff.blk_order = FF_BF;
 	}
@@ -1018,7 +1016,7 @@ start_au_allocator(ErtsAlcType_t alctr_n,
     int i;
     int size = 1;
     void *as0;
-    enum allctr_type atype;
+    ErtsAlcStrat_t astrat;
     ErtsAllocatorFunctions_t *af = &erts_allctrs[alctr_n];
     ErtsAllocatorInfo_t *ai = &erts_allctrs_info[alctr_n];
     ErtsAllocatorThrSpec_t *tspec = &erts_allctr_thr_spec[alctr_n];
@@ -1077,7 +1075,7 @@ start_au_allocator(ErtsAlcType_t alctr_n,
 
     for (i = 0; i < size; i++) {
 	Allctr_t *as;
-	atype = init->atype;
+	astrat = init->astrat;
 
 	if (!init->thr_spec)
 	    as0 = state;
@@ -1094,8 +1092,8 @@ start_au_allocator(ErtsAlcType_t alctr_n,
 		if (i != 0)
 		    init->init.util.ts = 0;
 		else {
-		    if (atype == AFIT)
-			atype = GOODFIT;
+		    if (astrat == ERTS_ALC_S_AFIT)
+			astrat = ERTS_ALC_S_GOODFIT;
 		    init->init.util.ts = 1;
 		}
 		init->init.util.tspec = init->thr_spec + 1;
@@ -1109,25 +1107,26 @@ start_au_allocator(ErtsAlcType_t alctr_n,
 			 (((char *) fix_lists) + fix_list_size));
 	}
 
+        init->init.util.alloc_strat = astrat;
 	init->init.util.ix = i;
 
-	switch (atype) {
-	case GOODFIT:
+	switch (astrat) {
+	case ERTS_ALC_S_GOODFIT:
 	    as = erts_gfalc_start((GFAllctr_t *) as0,
 					   &init->init.gf,
 					   &init->init.util);
 	    break;
-	case BESTFIT:
+	case ERTS_ALC_S_BESTFIT:
 	    as = erts_bfalc_start((BFAllctr_t *) as0,
 					   &init->init.bf,
 					   &init->init.util);
 	    break;
-	case AFIT:
+	case ERTS_ALC_S_AFIT:
 	    as = erts_afalc_start((AFAllctr_t *) as0,
 					   &init->init.af,
 					   &init->init.util);
 	    break;
-	case FIRSTFIT:
+	case ERTS_ALC_S_FIRSTFIT:
 	    as = erts_aoffalc_start((AOFFAllctr_t *) as0,
 					     &init->init.aoff,
 					     &init->init.util);
@@ -1363,51 +1362,59 @@ handle_au_arg(struct au_init *auip,
 	else if(has_prefix("as", sub_param)) {
 	    char *alg = get_value(sub_param + 2, argv, ip);
 	    if (sys_strcmp("bf", alg) == 0) {
-		auip->atype = BESTFIT;
+		auip->astrat = ERTS_ALC_S_BESTFIT;
 		auip->init.bf.ao = 0;
 	    }
 	    else if (sys_strcmp("aobf", alg) == 0) {
-		auip->atype = BESTFIT;
+		auip->astrat = ERTS_ALC_S_BESTFIT;
 		auip->init.bf.ao = 1;
 	    }
 	    else if (sys_strcmp("gf", alg) == 0) {
-		auip->atype = GOODFIT;
+		auip->astrat = ERTS_ALC_S_GOODFIT;
 	    }
 	    else if (sys_strcmp("af", alg) == 0) {
-		auip->atype = AFIT;
+		auip->astrat = ERTS_ALC_S_AFIT;
 	    }
 	    else if (sys_strcmp("aoff", alg) == 0) {
-		auip->atype = FIRSTFIT;
+		auip->astrat = ERTS_ALC_S_FIRSTFIT;
 		auip->init.aoff.crr_order = FF_AOFF;
 		auip->init.aoff.blk_order = FF_AOFF;
 	    }
 	    else if (sys_strcmp("aoffcbf", alg) == 0) {
-		auip->atype = FIRSTFIT;
+		auip->astrat = ERTS_ALC_S_FIRSTFIT;
 		auip->init.aoff.crr_order = FF_AOFF;
 		auip->init.aoff.blk_order = FF_BF;
 	    }
 	    else if (sys_strcmp("aoffcaobf", alg) == 0) {
-		auip->atype = FIRSTFIT;
+		auip->astrat = ERTS_ALC_S_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->astrat = ERTS_ALC_S_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->astrat = ERTS_ALC_S_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->astrat = ERTS_ALC_S_FIRSTFIT;
 		auip->init.aoff.crr_order = FF_AGEFF;
 		auip->init.aoff.blk_order = FF_AOBF;
             }
 	    else {
-		bad_value(param, sub_param + 1, alg);
+                if (auip->init.util.alloc_no == ERTS_ALC_A_TEST
+                    && sys_strcmp("chaosff", alg) == 0) {
+                    auip->astrat = ERTS_ALC_S_FIRSTFIT;
+                    auip->init.aoff.crr_order = FF_CHAOS;
+                    auip->init.aoff.blk_order = FF_CHAOS;
+                }
+                else {
+                    bad_value(param, sub_param + 1, alg);
+                }
 	    }
 	    if (!strategy_support_carrier_migration(auip))
 		auip->init.util.acul = 0;
@@ -2030,33 +2037,55 @@ erts_realloc_n_enomem(ErtsAlcType_t n, void *ptr, Uint size)
 }
 
 static ERTS_INLINE UWord
-alcu_size(ErtsAlcType_t ai, ErtsAlcUFixInfo_t *fi, int fisz)
+alcu_size(ErtsAlcType_t alloc_no, ErtsAlcUFixInfo_t *fi, int fisz)
 {
-    UWord res = 0;
+    UWord res;
+    int ai;
 
-    ASSERT(erts_allctrs_info[ai].enabled);
-    ASSERT(erts_allctrs_info[ai].alloc_util);
+    if (!erts_allctrs_info[alloc_no].thr_spec) {
+        AllctrSize_t size;
+        Allctr_t *allctr;
 
-    if (!erts_allctrs_info[ai].thr_spec) {
-	Allctr_t *allctr = erts_allctrs_info[ai].extra;
-	AllctrSize_t asize;
-	erts_alcu_current_size(allctr, &asize, fi, fisz);
-	res += asize.blocks;
+        allctr = erts_allctrs_info[alloc_no].extra;
+        erts_alcu_current_size(allctr, &size, fi, fisz);
+
+        return size.blocks;
     }
-    else {
-	ErtsAllocatorThrSpec_t *tspec = &erts_allctr_thr_spec[ai];
-	int i;
 
-	ASSERT(tspec->enabled);
+    res = 0;
 
-	for (i = tspec->size - 1; i >= 0; i--) {
-	    Allctr_t *allctr = tspec->allctr[i];
-	    AllctrSize_t asize;
-	    if (allctr) {
-		erts_alcu_current_size(allctr, &asize, fi, fisz);
-		res += asize.blocks;
-	    }
-	}
+    /* Thread-specific allocators can migrate carriers across types, so we have
+     * to visit every allocator type to gather information on blocks that were
+     * allocated by us. */
+    for (ai = ERTS_ALC_A_MIN; ai < ERTS_ALC_A_MAX; ai++) {
+        ErtsAllocatorThrSpec_t *tspec;
+        Allctr_t *allctr;
+        int i;
+
+        if (!erts_allctrs_info[ai].thr_spec) {
+            continue;
+        }
+
+        tspec = &erts_allctr_thr_spec[ai];
+        ASSERT(tspec->enabled);
+
+        for (i = tspec->size - 1; i >= 0; i--) {
+            allctr = tspec->allctr[i];
+
+            if (allctr) {
+                AllctrSize_t size;
+
+                if (ai == alloc_no) {
+                    erts_alcu_current_size(allctr, &size, fi, fisz);
+                } else {
+                    erts_alcu_foreign_size(allctr, alloc_no, &size);
+                }
+
+                ASSERT(((SWord)size.blocks) >= 0);
+
+                res += size.blocks;
+            }
+        }
     }
 
     return res;
@@ -2400,6 +2429,7 @@ erts_memory(fmtfn_t *print_to_p, void *print_to_arg, void *proc, Eterm earg)
     }
 
     if (want_tot_or_sys) {
+        ASSERT(size.total >= size.processes);
 	size.system = size.total - size.processes;
     }
 
@@ -3459,29 +3489,29 @@ UWord erts_alc_test(UWord op, UWord a1, UWord a2, UWord a3)
 	switch (op) {
 	case 0xf00:
 	    if (((Allctr_t *) a1)->thread_safe)
-		return (UWord) erts_alcu_alloc_ts(ERTS_ALC_T_UNDEF,
+		return (UWord) erts_alcu_alloc_ts(ERTS_ALC_T_TEST,
 							  (void *) a1,
 							  (Uint) a2);
 	    else
-		return (UWord) erts_alcu_alloc(ERTS_ALC_T_UNDEF,
+		return (UWord) erts_alcu_alloc(ERTS_ALC_T_TEST,
 						       (void *) a1,
 						       (Uint) a2);
 	case 0xf01:
 	    if (((Allctr_t *) a1)->thread_safe)
-		return (UWord) erts_alcu_realloc_ts(ERTS_ALC_T_UNDEF,
+		return (UWord) erts_alcu_realloc_ts(ERTS_ALC_T_TEST,
 							    (void *) a1,
 							    (void *) a2,
 							    (Uint) a3);
 	    else
-		return (UWord) erts_alcu_realloc(ERTS_ALC_T_UNDEF,
+		return (UWord) erts_alcu_realloc(ERTS_ALC_T_TEST,
 							 (void *) a1,
 							 (void *) a2,
 							 (Uint) a3);
 	case 0xf02:
 	    if (((Allctr_t *) a1)->thread_safe)
-		erts_alcu_free_ts(ERTS_ALC_T_UNDEF, (void *) a1, (void *) a2);
+		erts_alcu_free_ts(ERTS_ALC_T_TEST, (void *) a1, (void *) a2);
 	    else
-		erts_alcu_free(ERTS_ALC_T_UNDEF, (void *) a1, (void *) a2);
+		erts_alcu_free(ERTS_ALC_T_TEST, (void *) a1, (void *) a2);
 	    return 0;
 	case 0xf03: {
 	    Allctr_t *allctr;
@@ -3489,8 +3519,10 @@ UWord erts_alc_test(UWord op, UWord a1, UWord a2, UWord a3)
 
 	    SET_DEFAULT_ALLOC_OPTS(&init);
 	    init.enable = 1;
-	    init.atype = GOODFIT;
+	    init.astrat = ERTS_ALC_S_GOODFIT;
 	    init.init.util.name_prefix = (char *) a1;
+	    init.init.util.alloc_no = ERTS_ALC_A_TEST;
+	    init.init.util.alloc_strat = init.astrat;
 	    init.init.util.ts = 1;
 	    if ((char **) a3) {
 		char **argv = (char **) a3;
@@ -3504,31 +3536,31 @@ UWord erts_alc_test(UWord op, UWord a1, UWord a2, UWord a3)
 		}
 	    }
 
-	    switch (init.atype) {
-	    case GOODFIT:
+	    switch (init.astrat) {
+	    case ERTS_ALC_S_GOODFIT:
 		allctr = erts_gfalc_start((GFAllctr_t *)
-					  erts_alloc(ERTS_ALC_T_UNDEF,
+					  erts_alloc(ERTS_ALC_T_TEST,
 						     sizeof(GFAllctr_t)),
 					  &init.init.gf,
 					  &init.init.util);
 		break;
-	    case BESTFIT:
+	    case ERTS_ALC_S_BESTFIT:
 		allctr = erts_bfalc_start((BFAllctr_t *)
-					  erts_alloc(ERTS_ALC_T_UNDEF,
+					  erts_alloc(ERTS_ALC_T_TEST,
 						     sizeof(BFAllctr_t)),
 					  &init.init.bf,
 					  &init.init.util);
 		break;
-	    case AFIT:
+	    case ERTS_ALC_S_AFIT:
 		allctr = erts_afalc_start((AFAllctr_t *)
-					  erts_alloc(ERTS_ALC_T_UNDEF,
+					  erts_alloc(ERTS_ALC_T_TEST,
 							    sizeof(AFAllctr_t)),
 					  &init.init.af,
 					  &init.init.util);
 		break;
-	    case FIRSTFIT:
+	    case ERTS_ALC_S_FIRSTFIT:
 		allctr = erts_aoffalc_start((AOFFAllctr_t *)
-					  erts_alloc(ERTS_ALC_T_UNDEF,
+					  erts_alloc(ERTS_ALC_T_TEST,
 						     sizeof(AOFFAllctr_t)),
 					  &init.init.aoff,
 					  &init.init.util);
@@ -3544,7 +3576,7 @@ UWord erts_alc_test(UWord op, UWord a1, UWord a2, UWord a3)
 	}
 	case 0xf04:
 	    erts_alcu_stop((Allctr_t *) a1);
-	    erts_free(ERTS_ALC_T_UNDEF, (void *) a1);
+	    erts_free(ERTS_ALC_T_TEST, (void *) a1);
 	    break;
 	case 0xf05: return (UWord) 1;
 	case 0xf06: return (UWord) ((Allctr_t *) a1)->thread_safe;
@@ -3554,7 +3586,7 @@ UWord erts_alc_test(UWord op, UWord a1, UWord a2, UWord a3)
 	case 0xf07: return (UWord) ((Allctr_t *) a1)->thread_safe;
 #endif
 	case 0xf08: {
-	    ethr_mutex *mtx = erts_alloc(ERTS_ALC_T_UNDEF, sizeof(ethr_mutex));
+	    ethr_mutex *mtx = erts_alloc(ERTS_ALC_T_TEST, sizeof(ethr_mutex));
 	    if (ethr_mutex_init(mtx) != 0)
 		ERTS_ALC_TEST_ABORT;
 	    return (UWord) mtx;
@@ -3563,7 +3595,7 @@ UWord erts_alc_test(UWord op, UWord a1, UWord a2, UWord a3)
 	    ethr_mutex *mtx = (ethr_mutex *) a1;
 	    if (ethr_mutex_destroy(mtx) != 0)
 		ERTS_ALC_TEST_ABORT;
-	    erts_free(ERTS_ALC_T_UNDEF, (void *) mtx);
+	    erts_free(ERTS_ALC_T_TEST, (void *) mtx);
 	    break;
 	}
 	case 0xf0a:
@@ -3573,7 +3605,7 @@ UWord erts_alc_test(UWord op, UWord a1, UWord a2, UWord a3)
 	    ethr_mutex_unlock((ethr_mutex *) a1);
 	    break;
 	case 0xf0c: {
-	    ethr_cond *cnd = erts_alloc(ERTS_ALC_T_UNDEF, sizeof(ethr_cond));
+	    ethr_cond *cnd = erts_alloc(ERTS_ALC_T_TEST, sizeof(ethr_cond));
 	    if (ethr_cond_init(cnd) != 0)
 		ERTS_ALC_TEST_ABORT;
 	    return (UWord) cnd;
@@ -3582,7 +3614,7 @@ UWord erts_alc_test(UWord op, UWord a1, UWord a2, UWord a3)
 	    ethr_cond *cnd = (ethr_cond *) a1;
 	    if (ethr_cond_destroy(cnd) != 0)
 		ERTS_ALC_TEST_ABORT;
-	    erts_free(ERTS_ALC_T_UNDEF, (void *) cnd);
+	    erts_free(ERTS_ALC_T_TEST, (void *) cnd);
 	    break;
 	}
 	case 0xf0e:
@@ -3596,7 +3628,7 @@ UWord erts_alc_test(UWord op, UWord a1, UWord a2, UWord a3)
 	    break;
 	}
 	case 0xf10: {
-	    ethr_tid *tid = erts_alloc(ERTS_ALC_T_UNDEF, sizeof(ethr_tid));
+	    ethr_tid *tid = erts_alloc(ERTS_ALC_T_TEST, sizeof(ethr_tid));
 	    if (ethr_thr_create(tid,
 				(void * (*)(void *)) a1,
 				(void *) a2,
@@ -3608,7 +3640,7 @@ UWord erts_alc_test(UWord op, UWord a1, UWord a2, UWord a3)
 	    ethr_tid *tid = (ethr_tid *) a1;
 	    if (ethr_thr_join(*tid, NULL) != 0)
 		ERTS_ALC_TEST_ABORT;
-	    erts_free(ERTS_ALC_T_UNDEF, (void *) tid);
+	    erts_free(ERTS_ALC_T_TEST, (void *) tid);
 	    break;
 	}
 	case 0xf12:
@@ -3872,7 +3904,7 @@ check_memory_fence(void *ptr, Uint *size, ErtsAlcType_t n, int func)
 {
     Uint sz;
     Uint found_type;
-    UWord pre_pattern;
+    UWord pre_pattern, expected_pattern;
     UWord post_pattern;
     UWord *ui_ptr;
 #ifdef HARD_DEBUG
@@ -3882,6 +3914,8 @@ check_memory_fence(void *ptr, Uint *size, ErtsAlcType_t n, int func)
     if (!ptr)
 	return NULL;
 
+    expected_pattern = MK_PATTERN(n);
+
     ui_ptr = (UWord *) ptr;
     pre_pattern = *(--ui_ptr);
     *size = sz = *(--ui_ptr);
@@ -3890,7 +3924,13 @@ check_memory_fence(void *ptr, Uint *size, ErtsAlcType_t n, int func)
 #endif
 
     found_type = GET_TYPE_OF_PATTERN(pre_pattern);
-    if (pre_pattern != MK_PATTERN(n)) {
+
+    if (found_type != n) {
+        erts_exit(ERTS_ABORT_EXIT, "ERROR: Miss matching allocator types"
+                  " used in alloc and free\n");
+    }
+
+    if (pre_pattern != expected_pattern) {
 	if ((FIXED_FENCE_PATTERN_MASK & pre_pattern) != FIXED_FENCE_PATTERN)
 	    erts_exit(ERTS_ABORT_EXIT,
 		     "ERROR: Fence at beginning of memory block (p=0x%u) "
@@ -3900,8 +3940,7 @@ check_memory_fence(void *ptr, Uint *size, ErtsAlcType_t n, int func)
 
     sys_memcpy((void *) &post_pattern, (void *) (((char *)ptr)+sz), sizeof(UWord));
 
-    if (post_pattern != MK_PATTERN(n)
-	|| pre_pattern != post_pattern) {
+    if (post_pattern != expected_pattern || pre_pattern != post_pattern) {
 	char fbuf[10];
 	char obuf[10];
 	char *ftype;
@@ -3960,9 +3999,10 @@ check_memory_fence(void *ptr, Uint *size, ErtsAlcType_t n, int func)
 static ErtsAllocatorFunctions_t real_allctrs[ERTS_ALC_A_MAX+1];
 
 static void *
-debug_alloc(ErtsAlcType_t n, void *extra, Uint size)
+debug_alloc(ErtsAlcType_t type, void *extra, Uint size)
 {
     ErtsAllocatorFunctions_t *real_af = (ErtsAllocatorFunctions_t *) extra;
+    ErtsAlcType_t n;
     Uint dsize;
     void *res;
 
@@ -3970,9 +4010,11 @@ debug_alloc(ErtsAlcType_t n, void *extra, Uint size)
     erts_hdbg_chk_blks();
 #endif
 
+    n = ERTS_ALC_T2N(type);
+
     ASSERT(ERTS_ALC_N_MIN <= n && n <= ERTS_ALC_N_MAX);
     dsize = size + FENCE_SZ;
-    res = (*real_af->alloc)(n, real_af->extra, dsize);
+    res = (*real_af->alloc)(type, real_af->extra, dsize);
 
     res = set_memory_fence(res, size, n);
 
@@ -3986,14 +4028,17 @@ debug_alloc(ErtsAlcType_t n, void *extra, Uint size)
 
 
 static void *
-debug_realloc(ErtsAlcType_t n, void *extra, void *ptr, Uint size)
+debug_realloc(ErtsAlcType_t type, void *extra, void *ptr, Uint size)
 {
     ErtsAllocatorFunctions_t *real_af = (ErtsAllocatorFunctions_t *) extra;
+    ErtsAlcType_t n;
     Uint dsize;
     Uint old_size;
     void *dptr;
     void *res;
 
+    n = ERTS_ALC_T2N(type);
+
     ASSERT(ERTS_ALC_N_MIN <= n && n <= ERTS_ALC_N_MAX);
 
     dsize = size + FENCE_SZ;
@@ -4003,12 +4048,12 @@ debug_realloc(ErtsAlcType_t n, void *extra, void *ptr, Uint size)
     erts_hdbg_chk_blks();
 #endif
 
-    if (old_size > size)
+    if (ptr && old_size > size)
 	sys_memset((void *) (((char *) ptr) + size),
 		   0xf,
 		   sizeof(Uint) + old_size - size);
 
-    res = (*real_af->realloc)(n, real_af->extra, dptr, dsize);
+    res = (*real_af->realloc)(type, real_af->extra, dptr, dsize);
 
     res = set_memory_fence(res, size, n);
 
@@ -4021,12 +4066,16 @@ debug_realloc(ErtsAlcType_t n, void *extra, void *ptr, Uint size)
 }
 
 static void
-debug_free(ErtsAlcType_t n, void *extra, void *ptr)
+debug_free(ErtsAlcType_t type, void *extra, void *ptr)
 {
     ErtsAllocatorFunctions_t *real_af = (ErtsAllocatorFunctions_t *) extra;
+    ErtsAlcType_t n;
     void *dptr;
     Uint size;
-    int free_pattern = n;
+    int free_pattern;
+
+    n = ERTS_ALC_T2N(type);
+    free_pattern = n;
 
     ASSERT(ERTS_ALC_N_MIN <= n && n <= ERTS_ALC_N_MAX);
 
@@ -4044,7 +4093,7 @@ debug_free(ErtsAlcType_t n, void *extra, void *ptr)
 #endif
     sys_memset((void *) dptr, free_pattern, size + FENCE_SZ);
 
-    (*real_af->free)(n, real_af->extra, dptr);
+    (*real_af->free)(type, real_af->extra, dptr);
 
 #ifdef PRINT_OPS
     fprintf(stderr, "free(%s, 0x%lx)\r\n", ERTS_ALC_N2TD(n), (Uint) ptr);
diff --git a/erts/emulator/beam/erl_alloc.h b/erts/emulator/beam/erl_alloc.h
index fcb58ff58a..c13cf3f5b0 100644
--- a/erts/emulator/beam/erl_alloc.h
+++ b/erts/emulator/beam/erl_alloc.h
@@ -26,10 +26,23 @@
 #define ERL_THR_PROGRESS_TSD_TYPE_ONLY
 #include "erl_thr_progress.h"
 #undef ERL_THR_PROGRESS_TSD_TYPE_ONLY
-#include "erl_alloc_util.h"
 #include "erl_threads.h"
 #include "erl_mmap.h"
 
+typedef enum {
+    ERTS_ALC_S_INVALID = 0,
+
+    ERTS_ALC_S_GOODFIT,
+    ERTS_ALC_S_BESTFIT,
+    ERTS_ALC_S_AFIT,
+    ERTS_ALC_S_FIRSTFIT,
+
+    ERTS_ALC_S_MIN = ERTS_ALC_S_GOODFIT,
+    ERTS_ALC_S_MAX = ERTS_ALC_S_FIRSTFIT
+} ErtsAlcStrat_t;
+
+#include "erl_alloc_util.h"
+
 #ifdef DEBUG
 #  undef ERTS_ALC_WANT_INLINE
 #  define ERTS_ALC_WANT_INLINE 0
@@ -52,6 +65,14 @@
 #define ERTS_ALC_NO_FIXED_SIZES \
   (ERTS_ALC_N_MAX_A_FIXED_SIZE - ERTS_ALC_N_MIN_A_FIXED_SIZE + 1)
 
+#define ERTS_ALC_IS_FIX_TYPE(T) \
+    (ERTS_ALC_T2N(T) >= ERTS_ALC_N_MIN_A_FIXED_SIZE && \
+     ERTS_ALC_T2N(T) <= ERTS_ALC_N_MAX_A_FIXED_SIZE)
+
+#define ERTS_ALC_FIX_TYPE_IX(T) \
+  (ASSERT(ERTS_ALC_IS_FIX_TYPE(T)), \
+   ERTS_ALC_T2N((T)) - ERTS_ALC_N_MIN_A_FIXED_SIZE)
+
 void erts_sys_alloc_init(void);
 void *erts_sys_alloc(ErtsAlcType_t, void *, Uint);
 void *erts_sys_realloc(ErtsAlcType_t, void *, void *, Uint);
@@ -228,7 +249,7 @@ void *erts_alloc(ErtsAlcType_t type, Uint size)
     void *res;
     ERTS_MSACC_PUSH_AND_SET_STATE_X(ERTS_MSACC_STATE_ALLOC);
     res = (*erts_allctrs[ERTS_ALC_T2A(type)].alloc)(
-            ERTS_ALC_T2N(type),
+            type,
             erts_allctrs[ERTS_ALC_T2A(type)].extra,
             size);
     if (!res)
@@ -243,7 +264,7 @@ void *erts_realloc(ErtsAlcType_t type, void *ptr, Uint size)
     void *res;
     ERTS_MSACC_PUSH_AND_SET_STATE_X(ERTS_MSACC_STATE_ALLOC);
     res = (*erts_allctrs[ERTS_ALC_T2A(type)].realloc)(
-	ERTS_ALC_T2N(type),
+	type,
 	erts_allctrs[ERTS_ALC_T2A(type)].extra,
 	ptr,
 	size);
@@ -258,7 +279,7 @@ void erts_free(ErtsAlcType_t type, void *ptr)
 {
     ERTS_MSACC_PUSH_AND_SET_STATE_X(ERTS_MSACC_STATE_ALLOC);
     (*erts_allctrs[ERTS_ALC_T2A(type)].free)(
-	ERTS_ALC_T2N(type),
+	type,
 	erts_allctrs[ERTS_ALC_T2A(type)].extra,
 	ptr);
     ERTS_MSACC_POP_STATE_X();
@@ -271,7 +292,7 @@ void *erts_alloc_fnf(ErtsAlcType_t type, Uint size)
     void *res;
     ERTS_MSACC_PUSH_AND_SET_STATE_X(ERTS_MSACC_STATE_ALLOC);
     res = (*erts_allctrs[ERTS_ALC_T2A(type)].alloc)(
-	ERTS_ALC_T2N(type),
+	type,
 	erts_allctrs[ERTS_ALC_T2A(type)].extra,
 	size);
     ERTS_MSACC_POP_STATE_X();
@@ -285,7 +306,7 @@ void *erts_realloc_fnf(ErtsAlcType_t type, void *ptr, Uint size)
     void *res;
     ERTS_MSACC_PUSH_AND_SET_STATE_X(ERTS_MSACC_STATE_ALLOC);
     res = (*erts_allctrs[ERTS_ALC_T2A(type)].realloc)(
-	ERTS_ALC_T2N(type),
+	type,
 	erts_allctrs[ERTS_ALC_T2A(type)].extra,
 	ptr,
 	size);
diff --git a/erts/emulator/beam/erl_alloc.types b/erts/emulator/beam/erl_alloc.types
index 4f03a34390..21941ba96e 100644
--- a/erts/emulator/beam/erl_alloc.types
+++ b/erts/emulator/beam/erl_alloc.types
@@ -30,10 +30,10 @@
 #   name space).
 # * Types, allocators, classes, and descriptions have different name
 #   spaces.
-# * The type, allocator, and class names INVALID are reserved and can
-#   not be used.
+# * The type, allocator, and class names INVALID are reserved and
+#   cannot be used.
 # * The descriptions invalid_allocator, invalid_class, and invalid_type
-#   are reserved and can not be used.
+#   are reserved and cannot be used.
 # * Declarations can be done conditionally by use of a
 #     +if <boolean_variable>
 #
@@ -149,6 +149,7 @@ type	MODULE_TABLE	LONG_LIVED	CODE		module_tab
 type	TAINT		LONG_LIVED	CODE		taint_list
 type	MODULE_REFS	STANDARD	CODE		module_refs
 type	NC_TMP		TEMPORARY	SYSTEM		nc_tmp
+type	NC_STD		STANDARD	SYSTEM		nc_std
 type	TMP		TEMPORARY	SYSTEM		tmp
 type	UNDEF		SYSTEM		SYSTEM		undefined
 type	DCACHE		STANDARD	SYSTEM		dcache
@@ -275,11 +276,14 @@ type	ML_DIST		STANDARD	SYSTEM		monitor_link_dist
 type	PF3_ARGS	SHORT_LIVED	PROCESSES	process_flag_3_arguments
 type	SETUP_CONN_ARG	SHORT_LIVED	PROCESSES	setup_connection_argument
 type    LIST_TRAP       SHORT_LIVED     PROCESSES       list_bif_trap_state
+type    CONT_EXIT_TRAP  SHORT_LIVED     PROCESSES       continue_exit_trap_state
+type    SEQ_YIELD_STATE SHORT_LIVED     SYSTEM          dist_seq_yield_state
 
 type	ENVIRONMENT	SYSTEM		SYSTEM		environment
 
 type	PERSISTENT_TERM	LONG_LIVED	CODE		persisten_term
 type	PERSISTENT_LOCK_Q SHORT_LIVED	SYSTEM		persistent_lock_q
+type	PERSISTENT_TERM_TMP SHORT_LIVED	SYSTEM		persistent_term_tmp_table
 
 #
 # Types used for special emulators
@@ -345,16 +349,17 @@ type	COUNTERS	STANDARD	SYSTEM		erl_bif_counters
 # Types used by system specific code
 #
 
-type  	TEMP_TERM 	TEMPORARY	SYSTEM		temp_term
-type	DRV_TAB		LONG_LIVED	SYSTEM		drv_tab
-type	DRV_EV_STATE	LONG_LIVED	SYSTEM		driver_event_state
-type	DRV_SEL_D_STATE	FIXED_SIZE	SYSTEM		driver_select_data_state
-type	NIF_SEL_D_STATE	FIXED_SIZE	SYSTEM		enif_select_data_state
-type	POLLSET		LONG_LIVED	SYSTEM		pollset
-type	POLLSET_UPDREQ	SHORT_LIVED	SYSTEM		pollset_update_req
-type	POLL_FDS	LONG_LIVED	SYSTEM		poll_fds
-type	FD_STATUS	LONG_LIVED	SYSTEM		fd_status
-type	SELECT_FDS	LONG_LIVED	SYSTEM		select_fds
+type  	TEMP_TERM       	TEMPORARY	SYSTEM		temp_term
+type  	SHORT_LIVED_TERM 	SHORT_LIVED	SYSTEM		short_lived_term
+type	DRV_TAB		        LONG_LIVED	SYSTEM		drv_tab
+type	DRV_EV_STATE	        LONG_LIVED	SYSTEM		driver_event_state
+type	DRV_SEL_D_STATE	        FIXED_SIZE	SYSTEM		driver_select_data_state
+type	NIF_SEL_D_STATE	        FIXED_SIZE	SYSTEM		enif_select_data_state
+type	POLLSET		        LONG_LIVED	SYSTEM		pollset
+type	POLLSET_UPDREQ	        SHORT_LIVED	SYSTEM		pollset_update_req
+type	POLL_FDS	        LONG_LIVED	SYSTEM		poll_fds
+type	FD_STATUS	        LONG_LIVED	SYSTEM		fd_status
+type	SELECT_FDS	        LONG_LIVED	SYSTEM		select_fds
 
 +if unix
 
diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c
index 0be4562785..bfc2f5992c 100644
--- a/erts/emulator/beam/erl_alloc_util.c
+++ b/erts/emulator/beam/erl_alloc_util.c
@@ -42,6 +42,7 @@
 
 #include "global.h"
 #include "big.h"
+#include "erl_mmap.h"
 #include "erl_mtrace.h"
 #define GET_ERL_ALLOC_UTIL_IMPL
 #include "erl_alloc_util.h"
@@ -90,15 +91,18 @@ static int initialized = 0;
 #define SYS_ALLOC_CARRIER_FLOOR(X)	((X) & SYS_ALLOC_CARRIER_MASK)
 #define SYS_ALLOC_CARRIER_CEILING(X) \
   SYS_ALLOC_CARRIER_FLOOR((X) + INV_SYS_ALLOC_CARRIER_MASK)
+#define SYS_PAGE_SIZE                   (sys_page_size)
+#define SYS_PAGE_SZ_MASK                ((UWord)(SYS_PAGE_SIZE - 1))
 
 #if 0
 /* Can be useful for debugging */
 #define MBC_REALLOC_ALWAYS_MOVES
 #endif
 
-
 /* alloc_util global parameters */
 static Uint sys_alloc_carrier_size;
+static Uint sys_page_size;
+
 #if HAVE_ERTS_MSEG
 static Uint max_mseg_carriers;
 #endif
@@ -113,32 +117,38 @@ static int allow_sys_alloc_carriers;
 
 #define DEC_CC(CC) ((CC)--)
 
-/* Multi block carrier (MBC) memory layout in R16: 
+/* Multi block carrier (MBC) memory layout in OTP 22:
 
 Empty MBC:
-[Carrier_t|pad|Block_t L0T|fhdr| free... ]
+[Carrier_t|pad|Block_t L0T0|fhdr| free... ]
 
 MBC after allocating first block:
-[Carrier_t|pad|Block_t 000|        udata        |pad|Block_t L0T|fhdr| free... ]
+[Carrier_t|pad|Block_t 0000|        udata        |pad|Block_t L0T0|fhdr| free... ]
 
 MBC after allocating second block:
-[Carrier_t|pad|Block_t 000|        udata        |pad|Block_t 000|   udata   |pad|Block_t L0T|fhdr| free... ]
+[Carrier_t|pad|Block_t 0000|        udata        |pad|Block_t 0000|   udata   |pad|Block_t L0T0|fhdr| free... ]
 
 MBC after deallocating first block:
-[Carrier_t|pad|Block_t 00T|fhdr| free  |FreeBlkFtr_t|Block_t 0P0|   udata   |pad|Block_t L0T|fhdr| free... ]
+[Carrier_t|pad|Block_t 00T0|fhdr| free  |FreeBlkFtr_t|Block_t 0P00|   udata   |pad|Block_t L0T0|fhdr| free... ]
 
+MBC after allocating first block, with allocation tagging enabled:
+[Carrier_t|pad|Block_t 000A|        udata        |atag|pad|Block_t L0T0|fhdr| free... ]
 
     udata = Allocated user data
+    atag  = A tag with basic metadata about this allocation
     pad   = Padding to ensure correct alignment for user data
     fhdr  = Allocator specific header to keep track of free block
     free  = Unused free memory
     T     = This block is free (THIS_FREE_BLK_HDR_FLG)
     P     = Previous block is free (PREV_FREE_BLK_HDR_FLG)
     L     = Last block in carrier (LAST_BLK_HDR_FLG)
+    A     = Block has an allocation tag footer, only valid for allocated blocks
+            (ATAG_BLK_HDR_FLG)
 */
 
 /* Single block carrier (SBC):
-[Carrier_t|pad|Block_t 111| udata... ]
+[Carrier_t|pad|Block_t 1110| udata... ]
+[Carrier_t|pad|Block_t 111A| udata | atag]
 */
 
 /* Allocation tags ...
@@ -154,20 +164,20 @@ MBC after deallocating first block:
 
 typedef UWord alcu_atag_t;
 
-#define MAKE_ATAG(IdAtom, Type) \
-    (ASSERT((Type) >= ERTS_ALC_N_MIN && (Type) <= ERTS_ALC_N_MAX), \
+#define MAKE_ATAG(IdAtom, TypeNum) \
+    (ASSERT((TypeNum) >= ERTS_ALC_N_MIN && (TypeNum) <= ERTS_ALC_N_MAX), \
      ASSERT(atom_val(IdAtom) <= MAX_ATAG_ATOM_ID), \
-     (atom_val(IdAtom) << ERTS_ALC_N_BITS) | (Type))
+     (atom_val(IdAtom) << ERTS_ALC_N_BITS) | (TypeNum))
 
 #define ATAG_ID(AT) (make_atom((AT) >> ERTS_ALC_N_BITS))
 #define ATAG_TYPE(AT) ((AT) & ERTS_ALC_N_MASK)
 
 #define MAX_ATAG_ATOM_ID (ERTS_UWORD_MAX >> ERTS_ALC_N_BITS)
 
-#define DBG_IS_VALID_ATAG(Allocator, AT) \
+#define DBG_IS_VALID_ATAG(AT) \
     (ATAG_TYPE(AT) >= ERTS_ALC_N_MIN && \
      ATAG_TYPE(AT) <= ERTS_ALC_N_MAX && \
-     (Allocator)->alloc_no == ERTS_ALC_T2A(ERTS_ALC_N2T(ATAG_TYPE(AT))))
+     ATAG_ID(AT) <= MAX_ATAG_ATOM_ID)
 
 /* Blocks ... */
 
@@ -182,10 +192,15 @@ typedef UWord alcu_atag_t;
 #endif
 #define FBLK_FTR_SZ (sizeof(FreeBlkFtr_t))
 
+#define BLK_HAS_ATAG(B) \
+    (!!((B)->bhdr & ATAG_BLK_HDR_FLG))
+
 #define GET_BLK_ATAG(B) \
-    (((alcu_atag_t *) (((char *) (B)) + (BLK_SZ(B))))[-1])
+    (ASSERT(BLK_HAS_ATAG(B)), \
+     ((alcu_atag_t *) (((char *) (B)) + (BLK_SZ(B))))[-1])
 #define SET_BLK_ATAG(B, T) \
-    (((alcu_atag_t *) (((char *) (B)) + (BLK_SZ(B))))[-1] = (T))
+    ((B)->bhdr |= ATAG_BLK_HDR_FLG, \
+     ((alcu_atag_t *) (((char *) (B)) + (BLK_SZ(B))))[-1] = (T))
 
 #define BLK_ATAG_SZ(AP) ((AP)->atags ? sizeof(alcu_atag_t) : 0)
 
@@ -203,13 +218,13 @@ typedef UWord alcu_atag_t;
   (((FreeBlkFtr_t *) (((char *) (B)) + (SZ)))[-1] = (SZ))
 
 #define SET_MBC_ABLK_SZ(B, SZ) \
-  (ASSERT(((SZ) & FLG_MASK) == 0), \
+  (ASSERT(((SZ) & BLK_FLG_MASK) == 0), \
    (B)->bhdr = (((B)->bhdr) & ~MBC_ABLK_SZ_MASK) | (SZ))
 #define SET_MBC_FBLK_SZ(B, SZ) \
-  (ASSERT(((SZ) & FLG_MASK) == 0), \
+  (ASSERT(((SZ) & BLK_FLG_MASK) == 0), \
    (B)->bhdr = (((B)->bhdr) & ~MBC_FBLK_SZ_MASK) | (SZ))
 #define SET_SBC_BLK_SZ(B, SZ) \
-  (ASSERT(((SZ) & FLG_MASK) == 0), \
+  (ASSERT(((SZ) & BLK_FLG_MASK) == 0), \
    (B)->bhdr = (((B)->bhdr) & ~SBC_BLK_SZ_MASK) | (SZ))
 #define SET_PREV_BLK_FREE(AP,B) \
   (ASSERT(!IS_MBC_FIRST_BLK(AP,B)), \
@@ -235,12 +250,12 @@ typedef UWord alcu_atag_t;
 
 #  define SET_MBC_ABLK_HDR(B, Sz, F, C) \
     (ASSERT(((Sz) & ~MBC_ABLK_SZ_MASK) == 0), \
-     ASSERT(!((UWord)(F) & (~FLG_MASK|THIS_FREE_BLK_HDR_FLG))), \
+     ASSERT(!((UWord)(F) & (~BLK_FLG_MASK|THIS_FREE_BLK_HDR_FLG))), \
      (B)->bhdr = ((Sz) | (F) | (BLK_CARRIER_OFFSET(B,C) << MBC_ABLK_OFFSET_SHIFT)))
 
 #  define SET_MBC_FBLK_HDR(B, Sz, F, C) \
     (ASSERT(((Sz) & ~MBC_FBLK_SZ_MASK) == 0), \
-     ASSERT(((UWord)(F) & (~FLG_MASK|THIS_FREE_BLK_HDR_FLG|PREV_FREE_BLK_HDR_FLG)) == THIS_FREE_BLK_HDR_FLG), \
+     ASSERT(((UWord)(F) & (~BLK_FLG_MASK|THIS_FREE_BLK_HDR_FLG|PREV_FREE_BLK_HDR_FLG)) == THIS_FREE_BLK_HDR_FLG), \
      (B)->bhdr = ((Sz) | (F)), \
      (B)->u.carrier = (C))
 
@@ -257,8 +272,8 @@ typedef UWord alcu_atag_t;
 #  define SET_BLK_FREE(B) \
   (ASSERT(!IS_PREV_BLK_FREE(B)), \
    (B)->u.carrier = ABLK_TO_MBC(B), \
-   (B)->bhdr |= THIS_FREE_BLK_HDR_FLG, \
-   (B)->bhdr &= (MBC_ABLK_SZ_MASK|FLG_MASK))
+   (B)->bhdr &= (MBC_ABLK_SZ_MASK|LAST_BLK_HDR_FLG), \
+   (B)->bhdr |= THIS_FREE_BLK_HDR_FLG)
 
 #  define SET_BLK_ALLOCED(B) \
   (ASSERT(((B)->bhdr & (MBC_ABLK_OFFSET_MASK|THIS_FREE_BLK_HDR_FLG)) == THIS_FREE_BLK_HDR_FLG), \
@@ -270,15 +285,16 @@ typedef UWord alcu_atag_t;
 #  define MBC_SZ_MAX_LIMIT ((UWord)~0)
 
 #  define SET_MBC_ABLK_HDR(B, Sz, F, C) \
-    (ASSERT(((Sz) & FLG_MASK) == 0), \
-     ASSERT(!((UWord)(F) & (~FLG_MASK|THIS_FREE_BLK_HDR_FLG))), \
-     ASSERT((UWord)(F) < SBC_BLK_HDR_FLG), \
+    (ASSERT(((Sz) & BLK_FLG_MASK) == 0), \
+     ASSERT(((F) & ~BLK_FLG_MASK) == 0), \
+     ASSERT(!((UWord)(F) & (~BLK_FLG_MASK|THIS_FREE_BLK_HDR_FLG))), \
      (B)->bhdr = ((Sz) | (F)), \
      (B)->carrier = (C))
 
 #  define SET_MBC_FBLK_HDR(B, Sz, F, C) \
-    (ASSERT(((Sz) & FLG_MASK) == 0), \
-     ASSERT(((UWord)(F) & (~FLG_MASK|THIS_FREE_BLK_HDR_FLG|PREV_FREE_BLK_HDR_FLG)) == THIS_FREE_BLK_HDR_FLG), \
+    (ASSERT(((Sz) & BLK_FLG_MASK) == 0), \
+     ASSERT(((F) & ~BLK_FLG_MASK) == 0), \
+     ASSERT(((UWord)(F) & (~BLK_FLG_MASK|THIS_FREE_BLK_HDR_FLG|PREV_FREE_BLK_HDR_FLG)) == THIS_FREE_BLK_HDR_FLG), \
      (B)->bhdr = ((Sz) | (F)), \
      (B)->carrier = (C))
 
@@ -297,7 +313,7 @@ typedef UWord alcu_atag_t;
 #endif /* !MBC_ABLK_OFFSET_BITS */
 
 #define SET_SBC_BLK_HDR(B, Sz) \
-  (ASSERT(((Sz) & FLG_MASK) == 0), (B)->bhdr = ((Sz) | (SBC_BLK_HDR_FLG)))
+  (ASSERT(((Sz) & BLK_FLG_MASK) == 0), (B)->bhdr = ((Sz) | (SBC_BLK_HDR_FLG)))
 
 
 #define BLK_UMEM_SZ(B) \
@@ -320,7 +336,7 @@ typedef UWord alcu_atag_t;
 #define GET_PREV_FREE_BLK_HDR_FLG(B) \
   ((B)->bhdr & PREV_FREE_BLK_HDR_FLG)
 #define GET_BLK_HDR_FLGS(B) \
-  ((B)->bhdr & FLG_MASK)
+  ((B)->bhdr & BLK_FLG_MASK)
 
 #define NXT_BLK(B) \
   (ASSERT(IS_MBC_BLK(B)), \
@@ -419,7 +435,7 @@ do {										\
 #define SCH_SBC				SBC_CARRIER_HDR_FLAG
 
 #define SET_CARRIER_HDR(C, Sz, F, AP) \
-  (ASSERT(((Sz) & FLG_MASK) == 0), (C)->chdr = ((Sz) | (F)), \
+  (ASSERT(((Sz) & CRR_FLG_MASK) == 0), (C)->chdr = ((Sz) | (F)), \
    erts_atomic_init_nob(&(C)->allctr, (erts_aint_t) (AP)))
 
 #define BLK_TO_SBC(B) \
@@ -444,8 +460,8 @@ do {										\
   (!IS_SB_CARRIER((C)))
 
 #define SET_CARRIER_SZ(C, SZ) \
-  (ASSERT(((SZ) & FLG_MASK) == 0), \
-   ((C)->chdr = ((C)->chdr & FLG_MASK) | (SZ)))
+  (ASSERT(((SZ) & CRR_FLG_MASK) == 0), \
+   ((C)->chdr = ((C)->chdr & CRR_FLG_MASK) | (SZ)))
 
 #define CFLG_SBC				(1 << 0)
 #define CFLG_MBC				(1 << 1)
@@ -575,10 +591,12 @@ do {									\
 	STAT_MSEG_MBC_ALLOC((AP), csz__);				\
     else								\
 	STAT_SYS_ALLOC_MBC_ALLOC((AP), csz__);				\
-    (AP)->mbcs.blocks.curr.no += (CRR)->cpool.blocks;			\
+    set_new_allctr_abandon_limit(AP);                                   \
+    (AP)->mbcs.blocks.curr.no += (CRR)->cpool.blocks[(AP)->alloc_no];   \
     if ((AP)->mbcs.blocks.max.no < (AP)->mbcs.blocks.curr.no)		\
 	(AP)->mbcs.blocks.max.no = (AP)->mbcs.blocks.curr.no;		\
-    (AP)->mbcs.blocks.curr.size += (CRR)->cpool.blocks_size;		\
+    (AP)->mbcs.blocks.curr.size +=                                      \
+       (CRR)->cpool.blocks_size[(AP)->alloc_no];                        \
     if ((AP)->mbcs.blocks.max.size < (AP)->mbcs.blocks.curr.size)	\
 	(AP)->mbcs.blocks.max.size = (AP)->mbcs.blocks.curr.size;	\
 } while (0)
@@ -601,25 +619,33 @@ do {									\
     DEBUG_CHECK_CARRIER_NO_SZ((AP));					\
 } while (0)
 
-#define STAT_MBC_ABANDON(AP, CRR)					\
-do {									\
-    UWord csz__ = CARRIER_SZ((CRR));					\
-    if (IS_MSEG_CARRIER((CRR)))						\
-	STAT_MSEG_MBC_FREE((AP), csz__);				\
-    else								\
-	STAT_SYS_ALLOC_MBC_FREE((AP), csz__);				\
-    ERTS_ALC_CPOOL_ASSERT((AP)->mbcs.blocks.curr.no			\
-			  >= (CRR)->cpool.blocks);			\
-    (AP)->mbcs.blocks.curr.no -= (CRR)->cpool.blocks;			\
-    ERTS_ALC_CPOOL_ASSERT((AP)->mbcs.blocks.curr.size 			\
-			  >= (CRR)->cpool.blocks_size);			\
-    (AP)->mbcs.blocks.curr.size -= (CRR)->cpool.blocks_size;		\
+#define STAT_MBC_FREE(AP, CRR)                                               \
+do {                                                                         \
+    UWord csz__ = CARRIER_SZ((CRR));                                         \
+    if (IS_MSEG_CARRIER((CRR))) {                                            \
+        STAT_MSEG_MBC_FREE((AP), csz__);                                     \
+    } else {                                                                 \
+        STAT_SYS_ALLOC_MBC_FREE((AP), csz__);                                \
+    }                                                                        \
+    set_new_allctr_abandon_limit(AP);                                        \
+} while (0)
+
+#define STAT_MBC_ABANDON(AP, CRR)                                            \
+do {                                                                         \
+    STAT_MBC_FREE(AP, CRR);                                                  \
+    ERTS_ALC_CPOOL_ASSERT((AP)->mbcs.blocks.curr.no                          \
+                          >= (CRR)->cpool.blocks[(AP)->alloc_no]);           \
+    (AP)->mbcs.blocks.curr.no -= (CRR)->cpool.blocks[(AP)->alloc_no];        \
+    ERTS_ALC_CPOOL_ASSERT((AP)->mbcs.blocks.curr.size                        \
+                          >= (CRR)->cpool.blocks_size[(AP)->alloc_no]);      \
+    (AP)->mbcs.blocks.curr.size -= (CRR)->cpool.blocks_size[(AP)->alloc_no]; \
 } while (0)
 
-#define STAT_MBC_BLK_ALLOC_CRR(CRR, BSZ)				\
+#define STAT_MBC_BLK_ALLOC_CRR(AP, CRR, BSZ)				\
 do {									\
-    (CRR)->cpool.blocks++;						\
-    (CRR)->cpool.blocks_size += (BSZ);					\
+    (CRR)->cpool.blocks[(AP)->alloc_no]++;				\
+    (CRR)->cpool.blocks_size[(AP)->alloc_no] += (BSZ);			\
+    (CRR)->cpool.total_blocks_size += (BSZ);				\
 } while (0)
 
 #define STAT_MBC_BLK_ALLOC(AP, CRR, BSZ, FLGS)	       			\
@@ -631,50 +657,67 @@ do {									\
     cstats__->blocks.curr.size += (BSZ);				\
     if (cstats__->blocks.max.size < cstats__->blocks.curr.size)		\
 	cstats__->blocks.max.size = cstats__->blocks.curr.size;		\
-    STAT_MBC_BLK_ALLOC_CRR((CRR), (BSZ));				\
+    STAT_MBC_BLK_ALLOC_CRR((AP), (CRR), (BSZ));				\
 } while (0)
 
 static ERTS_INLINE int
 stat_cpool_mbc_blk_free(Allctr_t *allctr,
+                        ErtsAlcType_t type,
 			Carrier_t *crr,
 			Carrier_t **busy_pcrr_pp,
 			UWord blksz)
 {
+    Allctr_t *orig_allctr;
+    int alloc_no;
 
-    ERTS_ALC_CPOOL_ASSERT(crr->cpool.blocks > 0);
-    crr->cpool.blocks--;
-    ERTS_ALC_CPOOL_ASSERT(crr->cpool.blocks_size >= blksz);
-    crr->cpool.blocks_size -= blksz;
+    alloc_no = ERTS_ALC_T2A(type);
 
-    if (!busy_pcrr_pp || !*busy_pcrr_pp)
-	return 0;
+    ERTS_ALC_CPOOL_ASSERT(crr->cpool.blocks[alloc_no] > 0);
+    crr->cpool.blocks[alloc_no]--;
+    ERTS_ALC_CPOOL_ASSERT(crr->cpool.blocks_size[alloc_no] >= blksz);
+    crr->cpool.blocks_size[alloc_no] -= blksz;
+    ERTS_ALC_CPOOL_ASSERT(crr->cpool.total_blocks_size >= blksz);
+    crr->cpool.total_blocks_size -= blksz;
+
+    if (allctr->alloc_no == alloc_no && (!busy_pcrr_pp || !*busy_pcrr_pp)) {
+        /* This is a local block, so we should not update the pool
+         * statistics. */
+        return 0;
+    }
+
+    /* This is either a foreign block that's been fetched from the pool, or any
+     * block that's in the pool. The carrier's owner keeps the statistics for
+     * both pooled and foreign blocks. */
+
+    orig_allctr = crr->cpool.orig_allctr;
 
-    ERTS_ALC_CPOOL_ASSERT(crr == *busy_pcrr_pp);
+    ERTS_ALC_CPOOL_ASSERT(alloc_no != allctr->alloc_no ||
+        (crr == *busy_pcrr_pp && allctr == orig_allctr));
 
 #ifdef ERTS_ALC_CPOOL_DEBUG
     ERTS_ALC_CPOOL_ASSERT(
-	erts_atomic_dec_read_nob(&allctr->cpool.stat.no_blocks) >= 0);
+	erts_atomic_dec_read_nob(&orig_allctr->cpool.stat.no_blocks[alloc_no]) >= 0);
     ERTS_ALC_CPOOL_ASSERT(
-	erts_atomic_add_read_nob(&allctr->cpool.stat.blocks_size,
+	erts_atomic_add_read_nob(&orig_allctr->cpool.stat.blocks_size[alloc_no],
 				 -((erts_aint_t) blksz)) >= 0);
 #else
-    erts_atomic_dec_nob(&allctr->cpool.stat.no_blocks);
-    erts_atomic_add_nob(&allctr->cpool.stat.blocks_size,
+    erts_atomic_dec_nob(&orig_allctr->cpool.stat.no_blocks[alloc_no]);
+    erts_atomic_add_nob(&orig_allctr->cpool.stat.blocks_size[alloc_no],
 			-((erts_aint_t) blksz));
 #endif
 
     return 1;
 }
 
-#define STAT_MBC_BLK_FREE(AP, CRR, BPCRRPP, BSZ, FLGS)			\
-do {									\
-    if (!stat_cpool_mbc_blk_free((AP), (CRR), (BPCRRPP), (BSZ))) {	\
-	CarriersStats_t *cstats__ = &(AP)->mbcs;			\
-	ASSERT(cstats__->blocks.curr.no > 0);				\
-	cstats__->blocks.curr.no--;					\
-	ASSERT(cstats__->blocks.curr.size >= (BSZ));			\
-	cstats__->blocks.curr.size -= (BSZ);				\
-    }									\
+#define STAT_MBC_BLK_FREE(AP, TYPE, CRR, BPCRRPP, BSZ, FLGS)               \
+do {                                                                       \
+    if (!stat_cpool_mbc_blk_free((AP), (TYPE), (CRR), (BPCRRPP), (BSZ))) { \
+        CarriersStats_t *cstats__ = &(AP)->mbcs;                           \
+        ASSERT(cstats__->blocks.curr.no > 0);                              \
+        cstats__->blocks.curr.no--;                                        \
+        ASSERT(cstats__->blocks.curr.size >= (BSZ));                       \
+        cstats__->blocks.curr.size -= (BSZ);                               \
+    }                                                                      \
 } while (0)
 
 /* Debug stuff... */
@@ -721,8 +764,8 @@ static void make_name_atoms(Allctr_t *allctr);
 
 static Block_t *create_carrier(Allctr_t *, Uint, UWord);
 static void destroy_carrier(Allctr_t *, Block_t *, Carrier_t **);
-static void mbc_free(Allctr_t *allctr, void *p, Carrier_t **busy_pcrr_pp);
-static void dealloc_block(Allctr_t *, void *, ErtsAlcFixList_t *, int);
+static void mbc_free(Allctr_t *allctr, ErtsAlcType_t type, void *p, Carrier_t **busy_pcrr_pp);
+static void dealloc_block(Allctr_t *, ErtsAlcType_t, Uint32, void *, ErtsAlcFixList_t *);
 
 static alcu_atag_t determine_alloc_tag(Allctr_t *allocator, ErtsAlcType_t type)
 {
@@ -764,14 +807,14 @@ static alcu_atag_t determine_alloc_tag(Allctr_t *allocator, ErtsAlcType_t type)
         }
     }
 
-    return MAKE_ATAG(id, type);
+    return MAKE_ATAG(id, ERTS_ALC_T2N(type));
 }
 
 static void set_alloc_tag(Allctr_t *allocator, void *p, alcu_atag_t tag)
 {
     Block_t *block;
 
-    ASSERT(DBG_IS_VALID_ATAG(allocator, tag));
+    ASSERT(DBG_IS_VALID_ATAG(tag));
     ASSERT(allocator->atags && p);
     (void)allocator;
 
@@ -1312,28 +1355,9 @@ chk_fix_list(Allctr_t *allctr, ErtsAlcFixList_t *fix, int ix, int before)
 #define ERTS_DBG_CHK_FIX_LIST(A, FIX, IX, B)
 #endif
 
+static ERTS_INLINE Allctr_t *get_pref_allctr(void *extra);
 static void *mbc_alloc(Allctr_t *allctr, Uint size);
 
-typedef struct {
-    ErtsAllctrDDBlock_t ddblock__; /* must be first */
-    ErtsAlcType_t fix_type;
-} ErtsAllctrFixDDBlock_t;
-
-#define ERTS_ALC_FIX_NO_UNUSE (((ErtsAlcType_t) 1) << ERTS_ALC_N_BITS)
-
-static ERTS_INLINE void
-dealloc_fix_block(Allctr_t *allctr,
-		  ErtsAlcType_t type,
-		  void *ptr,
-		  ErtsAlcFixList_t *fix,
-		  int dec_cc_on_redirect)
-{
-    /* May be redirected... */
-    ASSERT((type & ERTS_ALC_FIX_NO_UNUSE) == 0);
-    ((ErtsAllctrFixDDBlock_t *) ptr)->fix_type = type | ERTS_ALC_FIX_NO_UNUSE;
-    dealloc_block(allctr, ptr, fix, dec_cc_on_redirect);
-}
-
 static ERTS_INLINE void
 sched_fix_shrink(Allctr_t *allctr, int on)
 {
@@ -1375,7 +1399,7 @@ fix_cpool_check_shrink(Allctr_t *allctr,
 	    if (fix->u.cpool.min_list_size > fix->list_size)
 		fix->u.cpool.min_list_size = fix->list_size;
 
-	    dealloc_fix_block(allctr, type, p, fix, 0);
+	    dealloc_block(allctr, type, DEALLOC_FLG_FIX_SHRINK, p, fix);
 	}
     }
 }
@@ -1386,11 +1410,9 @@ fix_cpool_alloc(Allctr_t *allctr, ErtsAlcType_t type, Uint size)
     void *res;
     ErtsAlcFixList_t *fix;
 
-    ASSERT(ERTS_ALC_N_MIN_A_FIXED_SIZE <= type
-	   && type <= ERTS_ALC_N_MAX_A_FIXED_SIZE);
-
-    fix = &allctr->fix[type - ERTS_ALC_N_MIN_A_FIXED_SIZE];
-    ASSERT(size == fix->type_size);
+    fix = &allctr->fix[ERTS_ALC_FIX_TYPE_IX(type)];
+    ASSERT(type == fix->type && size == fix->type_size);
+    ASSERT(size >= sizeof(ErtsAllctrDDBlock_t));
 
     res = fix->list;
     if (res) {
@@ -1419,21 +1441,39 @@ fix_cpool_alloc(Allctr_t *allctr, ErtsAlcType_t type, Uint size)
 static ERTS_INLINE void
 fix_cpool_free(Allctr_t *allctr,
 	       ErtsAlcType_t type,
+               Uint32 flags,
 	       void *p,
-	       Carrier_t **busy_pcrr_pp,
-	       int unuse)
+	       Carrier_t **busy_pcrr_pp)
 {
     ErtsAlcFixList_t *fix;
+    Allctr_t *fix_allctr;
+
+    /* If this isn't a fix allocator we need to update the fix list of our
+     * neighboring fix_alloc to keep the statistics consistent. */
+    if (!allctr->fix) {
+        ErtsAllocatorThrSpec_t *tspec = &erts_allctr_thr_spec[ERTS_ALC_A_FIXED_SIZE];
+        fix_allctr = get_pref_allctr(tspec);
+        ASSERT(!fix_allctr->thread_safe);
+        ASSERT(allctr != fix_allctr);
+    }
+    else {
+        fix_allctr = allctr;
+    }
 
-    ASSERT(ERTS_ALC_N_MIN_A_FIXED_SIZE <= type
-	   && type <= ERTS_ALC_N_MAX_A_FIXED_SIZE);
+    ASSERT(ERTS_ALC_IS_CPOOL_ENABLED(fix_allctr));
+    ASSERT(ERTS_ALC_IS_CPOOL_ENABLED(allctr));
 
-    fix = &allctr->fix[type - ERTS_ALC_N_MIN_A_FIXED_SIZE];
+    fix = &fix_allctr->fix[ERTS_ALC_FIX_TYPE_IX(type)];
+    ASSERT(type == fix->type);
 
-    if (unuse)
-	fix->u.cpool.used--;
+    if (!(flags & DEALLOC_FLG_FIX_SHRINK)) {
+        fix->u.cpool.used--;
+    }
 
-    if ((!busy_pcrr_pp || !*busy_pcrr_pp)
+    /* We don't want foreign blocks to be long-lived, so we skip recycling if
+     * allctr != fix_allctr. */
+    if (allctr == fix_allctr
+        && (!busy_pcrr_pp || !*busy_pcrr_pp)
 	&& !fix->u.cpool.shrink_list
 	&& fix->list_size < ERTS_ALCU_FIX_MAX_LIST_SZ) {
 	*((void **) p) = fix->list;
@@ -1446,7 +1486,7 @@ fix_cpool_free(Allctr_t *allctr,
 	if (IS_SBC_BLK(blk))
 	    destroy_carrier(allctr, blk, NULL);
 	else
-	    mbc_free(allctr, p, busy_pcrr_pp);
+	    mbc_free(allctr, type, p, busy_pcrr_pp);
 	fix->u.cpool.allocated--;
 	fix_cpool_check_shrink(allctr, type, fix, busy_pcrr_pp);
     }
@@ -1473,7 +1513,7 @@ fix_cpool_alloc_shrink(Allctr_t *allctr, erts_aint32_t flgs)
 	    fix->u.cpool.shrink_list = fix->u.cpool.min_list_size;
 	    fix->u.cpool.min_list_size = fix->list_size;
 	}
-	type = (ErtsAlcType_t) (ix + ERTS_ALC_N_MIN_A_FIXED_SIZE);
+	type = ERTS_ALC_N2T((ErtsAlcType_t) (ix + ERTS_ALC_N_MIN_A_FIXED_SIZE));
 	for (o = 0; o < ERTS_ALC_FIX_MAX_SHRINK_OPS || flush; o++) {
 	    void *ptr;
 
@@ -1487,7 +1527,7 @@ fix_cpool_alloc_shrink(Allctr_t *allctr, erts_aint32_t flgs)
 	    fix->list = *((void **) ptr);
 	    fix->list_size--;
 	    fix->u.cpool.shrink_list--;
-	    dealloc_fix_block(allctr, type, ptr, fix, 0);
+	    dealloc_block(allctr, type, DEALLOC_FLG_FIX_SHRINK, ptr, fix);
 	}
 	if (fix->u.cpool.min_list_size > fix->list_size)
 	    fix->u.cpool.min_list_size = fix->list_size;
@@ -1513,11 +1553,9 @@ fix_nocpool_alloc(Allctr_t *allctr, ErtsAlcType_t type, Uint size)
     ErtsAlcFixList_t *fix;
     void *res;
 
-    ASSERT(ERTS_ALC_N_MIN_A_FIXED_SIZE <= type
-	   && type <= ERTS_ALC_N_MAX_A_FIXED_SIZE);
-
-    fix = &allctr->fix[type - ERTS_ALC_N_MIN_A_FIXED_SIZE];
-    ASSERT(size == fix->type_size);
+    fix = &allctr->fix[ERTS_ALC_FIX_TYPE_IX(type)];
+    ASSERT(type == fix->type && size == fix->type_size);
+    ASSERT(size >= sizeof(ErtsAllctrDDBlock_t));
 
     ERTS_DBG_CHK_FIX_LIST(allctr, fix, ix, 1);
     fix->u.nocpool.used++;
@@ -1534,7 +1572,7 @@ fix_nocpool_alloc(Allctr_t *allctr, ErtsAlcType_t type, Uint size)
 	    if (IS_SBC_BLK(blk))
 		destroy_carrier(allctr, blk, NULL);
 	    else
-		mbc_free(allctr, p, NULL);
+		mbc_free(allctr, type, p, NULL);
 	    fix->u.nocpool.allocated--;
 	}
 	ERTS_DBG_CHK_FIX_LIST(allctr, fix, ix, 0);
@@ -1569,10 +1607,8 @@ fix_nocpool_free(Allctr_t *allctr,
     Block_t *blk;
     ErtsAlcFixList_t *fix;
 
-    ASSERT(ERTS_ALC_N_MIN_A_FIXED_SIZE <= type
-	   && type <= ERTS_ALC_N_MAX_A_FIXED_SIZE);
-
-    fix = &allctr->fix[type - ERTS_ALC_N_MIN_A_FIXED_SIZE];
+    fix = &allctr->fix[ERTS_ALC_T2N(type) - ERTS_ALC_N_MIN_A_FIXED_SIZE];
+    ASSERT(fix->type == type);
 
     ERTS_DBG_CHK_FIX_LIST(allctr, fix, ix, 1);
     fix->u.nocpool.used--;
@@ -1591,7 +1627,7 @@ fix_nocpool_free(Allctr_t *allctr,
 	if (IS_SBC_BLK(blk))
 	    destroy_carrier(allctr, blk, NULL);
 	else
-	    mbc_free(allctr, p, NULL);
+	    mbc_free(allctr, type, p, NULL);
 	p = fix->list;
 	fix->list = *((void **) p);
 	fix->list_size--;
@@ -1602,7 +1638,7 @@ fix_nocpool_free(Allctr_t *allctr,
     if (IS_SBC_BLK(blk))
 	destroy_carrier(allctr, blk, NULL);
     else
-	mbc_free(allctr, p, NULL);
+	mbc_free(allctr, type, p, NULL);
     ERTS_DBG_CHK_FIX_LIST(allctr, fix, ix, 0);
 }
 
@@ -1643,7 +1679,7 @@ fix_nocpool_alloc_shrink(Allctr_t *allctr, erts_aint32_t flgs)
 	    ptr = fix->list;
 	    fix->list = *((void **) ptr);
 	    fix->list_size--;
-	    dealloc_block(allctr, ptr, NULL, 0);
+	    dealloc_block(allctr, fix->type, 0, ptr, NULL);
 	    fix->u.nocpool.allocated--;
 	}
 	if (fix->list_size != 0) {
@@ -1685,6 +1721,7 @@ dealloc_mbc(Allctr_t *allctr, Carrier_t *crr)
 }
 
 
+static UWord allctr_abandon_limit(Allctr_t *allctr);
 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*);
@@ -1806,7 +1843,7 @@ get_used_allctr(Allctr_t *pref_allctr, int pref_lock, void *p, UWord *sizep,
 static void
 init_dd_queue(ErtsAllctrDDQueue_t *ddq)
 {
-    erts_atomic_init_nob(&ddq->tail.data.marker.atmc_next, ERTS_AINT_NULL);
+    erts_atomic_init_nob(&ddq->tail.data.marker.u.atmc_next, ERTS_AINT_NULL);
     erts_atomic_init_nob(&ddq->tail.data.last,
 			 (erts_aint_t) &ddq->tail.data.marker);
     erts_atomic_init_nob(&ddq->tail.data.um_refc[0], 0);
@@ -1827,17 +1864,17 @@ ddq_managed_thread_enqueue(ErtsAllctrDDQueue_t *ddq, void *ptr, int cinit)
     erts_aint_t itmp;
     ErtsAllctrDDBlock_t *enq, *this = ptr;
 
-    erts_atomic_init_nob(&this->atmc_next, ERTS_AINT_NULL);
+    erts_atomic_init_nob(&this->u.atmc_next, ERTS_AINT_NULL);
     /* Enqueue at end of list... */
 
     enq = (ErtsAllctrDDBlock_t *) erts_atomic_read_nob(&ddq->tail.data.last);
-    itmp = erts_atomic_cmpxchg_relb(&enq->atmc_next,
+    itmp = erts_atomic_cmpxchg_relb(&enq->u.atmc_next,
 				    (erts_aint_t) this,
 				    ERTS_AINT_NULL);
     if (itmp == ERTS_AINT_NULL) {
 	/* We are required to move last pointer */
 #ifdef DEBUG
-	ASSERT(ERTS_AINT_NULL == erts_atomic_read_nob(&this->atmc_next));
+	ASSERT(ERTS_AINT_NULL == erts_atomic_read_nob(&this->u.atmc_next));
 	ASSERT(((erts_aint_t) enq)
 	       == erts_atomic_xchg_relb(&ddq->tail.data.last,
 					(erts_aint_t) this));
@@ -1855,8 +1892,8 @@ ddq_managed_thread_enqueue(ErtsAllctrDDQueue_t *ddq, void *ptr, int cinit)
 
 	while (1) {
 	    erts_aint_t itmp2;
-	    erts_atomic_set_nob(&this->atmc_next, itmp);
-	    itmp2 = erts_atomic_cmpxchg_relb(&enq->atmc_next,
+	    erts_atomic_set_nob(&this->u.atmc_next, itmp);
+	    itmp2 = erts_atomic_cmpxchg_relb(&enq->u.atmc_next,
 					     (erts_aint_t) this,
 					     itmp);
 	    if (itmp == itmp2)
@@ -1865,7 +1902,7 @@ ddq_managed_thread_enqueue(ErtsAllctrDDQueue_t *ddq, void *ptr, int cinit)
 		itmp = itmp2;
 	    else {
 		enq = (ErtsAllctrDDBlock_t *) itmp2;
-		itmp = erts_atomic_read_acqb(&enq->atmc_next);
+		itmp = erts_atomic_read_acqb(&enq->u.atmc_next);
 		ASSERT(itmp != ERTS_AINT_NULL);
 	    }
 	    i++;
@@ -1881,8 +1918,8 @@ check_insert_marker(ErtsAllctrDDQueue_t *ddq, erts_aint_t ilast)
 	erts_aint_t itmp;
 	ErtsAllctrDDBlock_t *last = (ErtsAllctrDDBlock_t *) ilast;
 
-	erts_atomic_init_nob(&ddq->tail.data.marker.atmc_next, ERTS_AINT_NULL);
-	itmp = erts_atomic_cmpxchg_relb(&last->atmc_next,
+	erts_atomic_init_nob(&ddq->tail.data.marker.u.atmc_next, ERTS_AINT_NULL);
+	itmp = erts_atomic_cmpxchg_relb(&last->u.atmc_next,
 					(erts_aint_t) &ddq->tail.data.marker,
 					ERTS_AINT_NULL);
 	if (itmp == ERTS_AINT_NULL) {
@@ -1933,7 +1970,7 @@ ddq_dequeue(ErtsAllctrDDQueue_t *ddq)
 	ASSERT(ddq->head.used_marker);
 	ddq->head.used_marker = 0;
 	blk = ((ErtsAllctrDDBlock_t *)
-	       erts_atomic_read_nob(&blk->atmc_next));
+	       erts_atomic_read_nob(&blk->u.atmc_next));
 	if (blk == ddq->head.unref_end) {
 	    ddq->head.first = blk;
 	    return NULL;
@@ -1941,7 +1978,7 @@ ddq_dequeue(ErtsAllctrDDQueue_t *ddq)
     }
 
     ddq->head.first = ((ErtsAllctrDDBlock_t *)
-		       erts_atomic_read_nob(&blk->atmc_next));
+		       erts_atomic_read_nob(&blk->u.atmc_next));
 
     ASSERT(ddq->head.first);
 
@@ -2003,19 +2040,13 @@ check_pending_dealloc_carrier(Allctr_t *allctr,
 			      int *need_more_work);
 
 static void
-handle_delayed_fix_dealloc(Allctr_t *allctr, void *ptr)
+handle_delayed_fix_dealloc(Allctr_t *allctr, ErtsAlcType_t type, Uint32 flags,
+                           void *ptr)
 {
-    ErtsAlcType_t type;
-
-    type = ((ErtsAllctrFixDDBlock_t *) ptr)->fix_type;
-
-    ASSERT(ERTS_ALC_N_MIN_A_FIXED_SIZE
-	   <= (type & ~ERTS_ALC_FIX_NO_UNUSE));
-    ASSERT((type & ~ERTS_ALC_FIX_NO_UNUSE)
-	   <= ERTS_ALC_N_MAX_A_FIXED_SIZE);
+    ASSERT(ERTS_ALC_IS_FIX_TYPE(type));
 
     if (!ERTS_ALC_IS_CPOOL_ENABLED(allctr))
-	fix_nocpool_free(allctr, (type & ~ERTS_ALC_FIX_NO_UNUSE), ptr);
+	fix_nocpool_free(allctr, type, ptr);
     else {
 	Block_t *blk = UMEM2BLK(ptr);
 	Carrier_t *busy_pcrr_p;
@@ -2030,20 +2061,24 @@ handle_delayed_fix_dealloc(Allctr_t *allctr, void *ptr)
 				      NULL, &busy_pcrr_p);
 	if (used_allctr == allctr) {
 	doit:
-	    fix_cpool_free(allctr, (type & ~ERTS_ALC_FIX_NO_UNUSE),
-			   ptr, &busy_pcrr_p,
-			   !(type & ERTS_ALC_FIX_NO_UNUSE));
+	    fix_cpool_free(allctr, type, flags, ptr, &busy_pcrr_p);
 	    clear_busy_pool_carrier(allctr, busy_pcrr_p);
 	}
 	else {
 	    /* Carrier migrated; need to redirect block to new owner... */
-	    int cinit = used_allctr->dd.ix - allctr->dd.ix;
+            ErtsAllctrDDBlock_t *dd_block;
+            int cinit;
+
+            dd_block = (ErtsAllctrDDBlock_t*)ptr;
+            dd_block->flags = flags;
+            dd_block->type = type;
 
             ERTS_ALC_CPOOL_ASSERT(!busy_pcrr_p);
 
             DEC_CC(allctr->calls.this_free);
 
-	    ((ErtsAllctrFixDDBlock_t *) ptr)->fix_type = type;
+            cinit = used_allctr->dd.ix - allctr->dd.ix;
+
 	    if (ddq_enqueue(&used_allctr->dd.q, ptr, cinit))
 		erts_alloc_notify_delayed_dealloc(used_allctr->ix);
 	}
@@ -2067,7 +2102,6 @@ handle_delayed_dealloc(Allctr_t *allctr,
     int need_mr_wrk = 0;
     int have_checked_incoming = 0;
     int ops = 0;
-    ErtsAlcFixList_t *fix;
     int res;
     ErtsAllctrDDQueue_t *ddq;
 
@@ -2076,8 +2110,6 @@ handle_delayed_dealloc(Allctr_t *allctr,
 
     ERTS_ALCU_DBG_CHK_THR_ACCESS(allctr);
 
-    fix = allctr->fix;
-
     ddq = &allctr->dd.q;
 
     res = 0;
@@ -2166,16 +2198,27 @@ handle_delayed_dealloc(Allctr_t *allctr,
             }
 	}
 	else {
+            ErtsAllctrDDBlock_t *dd_block;
+            ErtsAlcType_t type;
+            Uint32 flags;
+        
+            dd_block = (ErtsAllctrDDBlock_t*)ptr;
+            flags = dd_block->flags;
+            type = dd_block->type;
+
+            flags |= DEALLOC_FLG_REDIRECTED;
+
             ASSERT(IS_SBC_BLK(blk) || (ABLK_TO_MBC(blk) !=
                                        ErtsContainerStruct(blk, Carrier_t,
                                                            cpool.homecoming_dd.blk)));
 
 	    INC_CC(allctr->calls.this_free);
 
-	    if (fix)
-		handle_delayed_fix_dealloc(allctr, ptr);
-	    else
-		dealloc_block(allctr, ptr, NULL, 1);
+	    if (ERTS_ALC_IS_FIX_TYPE(type)) {
+		handle_delayed_fix_dealloc(allctr, type, flags, ptr);
+	    } else {
+		dealloc_block(allctr, type, flags, ptr, NULL);
+            }
 	}
     }
 
@@ -2203,8 +2246,10 @@ enqueue_dealloc_other_instance(ErtsAlcType_t type,
 			       void *ptr,
 			       int cinit)
 {
-    if (allctr->fix)
-	((ErtsAllctrFixDDBlock_t*) ptr)->fix_type = type;
+    ErtsAllctrDDBlock_t *dd_block = ((ErtsAllctrDDBlock_t*)ptr);
+
+    dd_block->type = type;
+    dd_block->flags = 0;
 
     if (ddq_enqueue(&allctr->dd.q, ptr, cinit))
 	erts_alloc_notify_delayed_dealloc(allctr->ix);
@@ -2234,10 +2279,7 @@ check_abandon_carrier(Allctr_t *allctr, Block_t *fblk, Carrier_t **busy_pcrr_pp)
     if (!ERTS_ALC_IS_CPOOL_ENABLED(allctr))
 	return;
 
-    allctr->cpool.check_limit_count--;
-    if (--allctr->cpool.check_limit_count <= 0)
-	set_new_allctr_abandon_limit(allctr);
-
+    ASSERT(allctr->cpool.abandon_limit == allctr_abandon_limit(allctr));
     ASSERT(erts_thr_progress_is_managed_thread());
 
     if (allctr->cpool.disable_abandon)
@@ -2255,7 +2297,7 @@ check_abandon_carrier(Allctr_t *allctr, Block_t *fblk, Carrier_t **busy_pcrr_pp)
     if (allctr->main_carrier == crr)
 	return;
 
-    if (crr->cpool.blocks_size > crr->cpool.abandon_limit)
+    if (crr->cpool.total_blocks_size > crr->cpool.abandon_limit)
 	return;
 
     if (crr->cpool.thr_prgr != ERTS_THR_PRGR_INVALID
@@ -2291,24 +2333,26 @@ erts_alcu_check_delayed_dealloc(Allctr_t *allctr,
 			   ERTS_ALCU_DD_OPS_LIM_LOW, NULL, NULL, NULL)
 
 static void
-dealloc_block(Allctr_t *allctr, void *ptr, ErtsAlcFixList_t *fix, int dec_cc_on_redirect)
+dealloc_block(Allctr_t *allctr, ErtsAlcType_t type, Uint32 flags, void *ptr,
+              ErtsAlcFixList_t *fix)
 {
     Block_t *blk = UMEM2BLK(ptr);
 
+    ASSERT(!fix || type == fix->type);
+
     ERTS_LC_ASSERT(!allctr->thread_safe
 		       || erts_lc_mtx_is_locked(&allctr->mutex));
 
     if (IS_SBC_BLK(blk)) {
 	destroy_carrier(allctr, blk, NULL);
 	if (fix && ERTS_ALC_IS_CPOOL_ENABLED(allctr)) {
-	    ErtsAlcType_t type = ((ErtsAllctrFixDDBlock_t *) ptr)->fix_type;
-	    if (!(type & ERTS_ALC_FIX_NO_UNUSE))
+	    if (!(flags & DEALLOC_FLG_FIX_SHRINK))
 		fix->u.cpool.used--;
 	    fix->u.cpool.allocated--;
 	}
     }
     else if (!ERTS_ALC_IS_CPOOL_ENABLED(allctr))
-	mbc_free(allctr, ptr, NULL);
+	mbc_free(allctr, type, ptr, NULL);
     else {
 	Carrier_t *busy_pcrr_p;
 	Allctr_t *used_allctr;
@@ -2317,22 +2361,29 @@ dealloc_block(Allctr_t *allctr, void *ptr, ErtsAlcFixList_t *fix, int dec_cc_on_
 				      NULL, &busy_pcrr_p);
 	if (used_allctr == allctr) {
 	    if (fix) {
-		ErtsAlcType_t type = ((ErtsAllctrFixDDBlock_t *) ptr)->fix_type;
-		if (!(type & ERTS_ALC_FIX_NO_UNUSE))
+	        if (!(flags & DEALLOC_FLG_FIX_SHRINK))
 		    fix->u.cpool.used--;
 		fix->u.cpool.allocated--;
 	    }
-	    mbc_free(allctr, ptr, &busy_pcrr_p);
+	    mbc_free(allctr, type, ptr, &busy_pcrr_p);
 	    clear_busy_pool_carrier(allctr, busy_pcrr_p);
 	}
 	else {
 	    /* Carrier migrated; need to redirect block to new owner... */
-	    int cinit = used_allctr->dd.ix - allctr->dd.ix;
+            ErtsAllctrDDBlock_t *dd_block;
+            int cinit;
+
+            dd_block = (ErtsAllctrDDBlock_t*)ptr;
+            dd_block->flags = flags;
+            dd_block->type = type;
 
             ERTS_ALC_CPOOL_ASSERT(!busy_pcrr_p);
 
-            if (dec_cc_on_redirect)
+            if (flags & DEALLOC_FLG_REDIRECTED)
                 DEC_CC(allctr->calls.this_free);
+
+            cinit = used_allctr->dd.ix - allctr->dd.ix;
+
 	    if (ddq_enqueue(&used_allctr->dd.q, ptr, cinit))
 		erts_alloc_notify_delayed_dealloc(used_allctr->ix);
 	}
@@ -2498,9 +2549,155 @@ mbc_alloc(Allctr_t *allctr, Uint size)
     return BLK2UMEM(blk);
 }
 
+typedef struct {
+    char *ptr;
+    UWord size;
+} ErtsMemDiscardRegion;
+
+/* Construct a discard region for the user memory of a free block, letting the
+ * OS reclaim its physical memory when required.
+ *
+ * Note that we're ignoring both the footer and everything that comes before
+ * the minimum block size as the allocator uses those areas to manage the
+ * block. */
+static void ERTS_INLINE
+mem_discard_start(Allctr_t *allocator, Block_t *block,
+                  ErtsMemDiscardRegion *out)
+{
+    UWord size = BLK_SZ(block);
+
+    ASSERT(size >= allocator->min_block_size);
+
+    if (size > (allocator->min_block_size + FBLK_FTR_SZ)) {
+        out->size = size - allocator->min_block_size - FBLK_FTR_SZ;
+    } else {
+        out->size = 0;
+    }
+
+    out->ptr = (char*)block + allocator->min_block_size;
+}
+
+/* Expands a discard region into a neighboring free block, allowing us to
+ * discard the block header and first page.
+ *
+ * This is very important in small-allocation scenarios where no single block
+ * is large enough to be discarded on its own. */
+static void ERTS_INLINE
+mem_discard_coalesce(Allctr_t *allocator, Block_t *neighbor,
+                     ErtsMemDiscardRegion *region)
+{
+    char *neighbor_start;
+
+    ASSERT(IS_FREE_BLK(neighbor));
+
+    neighbor_start = (char*)neighbor;
+
+    if (region->ptr >= neighbor_start) {
+        char *region_start_page;
+
+        region_start_page = region->ptr - SYS_PAGE_SIZE;
+        region_start_page = (char*)((UWord)region_start_page & ~SYS_PAGE_SZ_MASK);
+
+        /* Expand if our first page begins within the previous free block's
+         * unused data. */
+        if (region_start_page >= (neighbor_start + allocator->min_block_size)) {
+            region->size += (region->ptr - region_start_page) - FBLK_FTR_SZ;
+            region->ptr = region_start_page;
+        }
+    } else {
+        char *region_end_page;
+        UWord neighbor_size;
+
+        ASSERT(region->ptr <= neighbor_start);
+
+        region_end_page = region->ptr + region->size + SYS_PAGE_SIZE;
+        region_end_page = (char*)((UWord)region_end_page & ~SYS_PAGE_SZ_MASK);
+
+        neighbor_size = BLK_SZ(neighbor) - FBLK_FTR_SZ;
+
+        /* Expand if our last page ends anywhere within the next free block,
+         * sans the footer we'll inherit. */
+        if (region_end_page < neighbor_start + neighbor_size) {
+            region->size += region_end_page - (region->ptr + region->size);
+        }
+    }
+}
+
+static void ERTS_INLINE
+mem_discard_finish(Allctr_t *allocator, Block_t *block,
+                   ErtsMemDiscardRegion *region)
+{
+#ifdef DEBUG
+    char *block_start, *block_end;
+    UWord block_size;
+
+    block_size = BLK_SZ(block);
+
+    /* Ensure that the region is completely covered by the legal area of the
+     * free block. This must hold even when the region is too small to be
+     * discarded. */
+    if (region->size > 0) {
+        ASSERT(block_size > allocator->min_block_size + FBLK_FTR_SZ);
+
+        block_start = (char*)block + allocator->min_block_size;
+        block_end = (char*)block + block_size - FBLK_FTR_SZ;
+
+        ASSERT(region->size == 0 ||
+            (region->ptr + region->size <= block_end &&
+             region->ptr >= block_start &&
+             region->size <= block_size));
+    }
+#else
+    (void)allocator;
+    (void)block;
+#endif
+
+    if (region->size > SYS_PAGE_SIZE) {
+        UWord align_offset, size;
+        char *ptr;
+
+        align_offset = SYS_PAGE_SIZE - ((UWord)region->ptr & SYS_PAGE_SZ_MASK);
+
+        size = (region->size - align_offset) & ~SYS_PAGE_SZ_MASK;
+        ptr = region->ptr + align_offset;
+
+        if (size > 0) {
+            ASSERT(!((UWord)ptr & SYS_PAGE_SZ_MASK));
+            ASSERT(!(size & SYS_PAGE_SZ_MASK));
+
+            erts_mem_discard(ptr, size);
+        }
+    }
+}
+
 static void
-mbc_free(Allctr_t *allctr, void *p, Carrier_t **busy_pcrr_pp)
+carrier_mem_discard_free_blocks(Allctr_t *allocator, Carrier_t *carrier)
 {
+    static const int MAX_BLOCKS_TO_DISCARD = 100;
+    Block_t *block;
+    int i;
+
+    block = allocator->first_fblk_in_mbc(allocator, carrier);
+    i = 0;
+
+    while (block != NULL && i < MAX_BLOCKS_TO_DISCARD) {
+        ErtsMemDiscardRegion region;
+
+        ASSERT(IS_FREE_BLK(block));
+
+        mem_discard_start(allocator, block, &region);
+        mem_discard_finish(allocator, block, &region);
+
+        block = allocator->next_fblk_in_mbc(allocator, carrier, block);
+        i++;
+    }
+}
+
+static void
+mbc_free(Allctr_t *allctr, ErtsAlcType_t type, void *p, Carrier_t **busy_pcrr_pp)
+{
+    ErtsMemDiscardRegion discard_region = {0};
+    int discard;
     Uint is_first_blk;
     Uint is_last_blk;
     Uint blk_sz;
@@ -2516,12 +2713,28 @@ mbc_free(Allctr_t *allctr, void *p, Carrier_t **busy_pcrr_pp)
     ASSERT(IS_MBC_BLK(blk));
     ASSERT(blk_sz >= allctr->min_block_size);
 
+#ifndef DEBUG
+    /* We want to mark freed blocks as reclaimable to the OS, but it's a fairly
+     * expensive operation which doesn't do much good if we use it again soon
+     * after, so we limit it to deallocations on pooled carriers. */
+    discard = busy_pcrr_pp && *busy_pcrr_pp;
+#else
+    /* Always discard in debug mode, regardless of whether we're in the pool or
+     * not. */
+    discard = 1;
+#endif
+
+    if (discard) {
+        mem_discard_start(allctr, blk, &discard_region);
+    }
+
     HARD_CHECK_BLK_CARRIER(allctr, blk);
 
     crr = ABLK_TO_MBC(blk);
 
     ERTS_ALC_CPOOL_FREE_OP(allctr);
-    STAT_MBC_BLK_FREE(allctr, crr, busy_pcrr_pp, blk_sz, alcu_flgs);
+
+    STAT_MBC_BLK_FREE(allctr, type, crr, busy_pcrr_pp, blk_sz, alcu_flgs);
 
     is_first_blk = IS_MBC_FIRST_ABLK(allctr, blk);
     is_last_blk = IS_LAST_BLK(blk);
@@ -2532,6 +2745,10 @@ mbc_free(Allctr_t *allctr, void *p, Carrier_t **busy_pcrr_pp)
 	blk = PREV_BLK(blk);
 	(*allctr->unlink_free_block)(allctr, blk);
 
+        if (discard) {
+            mem_discard_coalesce(allctr, blk, &discard_region);
+        }
+
 	blk_sz += MBC_FBLK_SZ(blk);
 	is_first_blk = IS_MBC_FIRST_FBLK(allctr, blk);
 	SET_MBC_FBLK_SZ(blk, blk_sz);
@@ -2547,6 +2764,11 @@ mbc_free(Allctr_t *allctr, void *p, Carrier_t **busy_pcrr_pp)
 	if (IS_FREE_BLK(nxt_blk)) {
 	    /* Coalesce with next block... */
 	    (*allctr->unlink_free_block)(allctr, nxt_blk);
+
+            if (discard) {
+                mem_discard_coalesce(allctr, nxt_blk, &discard_region);
+            }
+
 	    blk_sz += MBC_FBLK_SZ(nxt_blk);
 	    SET_MBC_FBLK_SZ(blk, blk_sz);
 
@@ -2582,16 +2804,22 @@ mbc_free(Allctr_t *allctr, void *p, Carrier_t **busy_pcrr_pp)
     else {
 	(*allctr->link_free_block)(allctr, blk);
 	HARD_CHECK_BLK_CARRIER(allctr, blk);
-        if (busy_pcrr_pp && *busy_pcrr_pp)
+
+        if (discard) {
+            mem_discard_finish(allctr, blk, &discard_region);
+        }
+
+        if (busy_pcrr_pp && *busy_pcrr_pp) {
             update_pooled_tree(allctr, crr, blk_sz);
-        else
+        } else {
             check_abandon_carrier(allctr, blk, busy_pcrr_pp);
+        }
     }
 }
 
 static void *
-mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs,
-	    Carrier_t **busy_pcrr_pp)
+mbc_realloc(Allctr_t *allctr, ErtsAlcType_t type, void *p, Uint size,
+            Uint32 alcu_flgs, Carrier_t **busy_pcrr_pp)
 {
     void *new_p;
     Uint old_blk_sz;
@@ -2629,7 +2857,7 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs,
         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);
+        mbc_free(allctr, type, p, busy_pcrr_pp);
         return new_p;
     }
 
@@ -2706,7 +2934,7 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs,
 	crr = ABLK_TO_MBC(blk);
 
 	ERTS_ALC_CPOOL_REALLOC_OP(allctr);
-	STAT_MBC_BLK_FREE(allctr, crr, NULL, old_blk_sz, alcu_flgs);
+	STAT_MBC_BLK_FREE(allctr, type, crr, NULL, old_blk_sz, alcu_flgs);
 	STAT_MBC_BLK_ALLOC(allctr, crr, blk_sz, alcu_flgs);
 
 	ASSERT(MBC_BLK_SZ(blk) >= allctr->min_block_size);
@@ -2810,7 +3038,7 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs,
 	    }
 
 	    ERTS_ALC_CPOOL_REALLOC_OP(allctr);
-	    STAT_MBC_BLK_FREE(allctr, crr, NULL, old_blk_sz, alcu_flgs);
+	    STAT_MBC_BLK_FREE(allctr, type, crr, NULL, old_blk_sz, alcu_flgs);
 	    STAT_MBC_BLK_ALLOC(allctr, crr, blk_sz, alcu_flgs);
 
 	    ASSERT(IS_ALLOCED_BLK(blk));
@@ -2871,7 +3099,7 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs,
 	if (!new_p)
 	    return NULL;
 	sys_memcpy(new_p, p, MIN(size, old_blk_sz - ABLK_HDR_SZ));
-	mbc_free(allctr, p, busy_pcrr_pp);
+	mbc_free(allctr, type, p, busy_pcrr_pp);
 
 	return new_p;
 
@@ -2901,7 +3129,7 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs,
 			       1);
 	    new_p = BLK2UMEM(new_blk);
 	    sys_memcpy(new_p, p, MIN(size, old_blk_sz - ABLK_HDR_SZ));
-	    mbc_free(allctr, p, NULL);
+	    mbc_free(allctr, type, p, NULL);
 	    return new_p;
 	}
 	else {
@@ -2958,7 +3186,7 @@ mbc_realloc(Allctr_t *allctr, void *p, Uint size, Uint32 alcu_flgs,
 			       0);
 
 	    ERTS_ALC_CPOOL_FREE_OP(allctr);
-	    STAT_MBC_BLK_FREE(allctr, crr, NULL, old_blk_sz, alcu_flgs);
+	    STAT_MBC_BLK_FREE(allctr, type, crr, NULL, old_blk_sz, alcu_flgs);
 
 	    return new_p;
 	}
@@ -2969,7 +3197,6 @@ 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	100
-#define ERTS_ALC_CPOOL_CHECK_LIMIT_COUNT	100
 #define ERTS_ALC_CPOOL_MAX_FAILED_STAT_READS	3
 
 #define ERTS_ALC_CPOOL_PTR_MOD_MRK		(((erts_aint_t) 1) << 0)
@@ -2996,14 +3223,11 @@ typedef union {
 #  error "Carrier pool implementation assumes ERTS_ALC_A_MIN > ERTS_ALC_A_INVALID"
 #endif
 
-/*
- * The pool is only allowed to be manipulated by managed
- * threads except in the alloc_SUITE:cpool case. In this
- * test case carrier_pool[ERTS_ALC_A_INVALID] will be
- * used.
- */
+/* The pools are only allowed to be manipulated by managed threads except in
+ * the alloc_SUITE:cpool test, where only test_carrier_pool is used. */
 
-static ErtsAlcCrrPool_t carrier_pool[ERTS_ALC_A_MAX+1] erts_align_attribute(ERTS_CACHE_LINE_SIZE);
+static ErtsAlcCrrPool_t firstfit_carrier_pool;
+static ErtsAlcCrrPool_t test_carrier_pool;
 
 #define ERTS_ALC_CPOOL_MAX_BACKOFF (1 << 8)
 
@@ -3024,12 +3248,12 @@ backoff(int n)
 static int
 cpool_dbg_is_in_pool(Allctr_t *allctr, Carrier_t *crr)
 {
-    ErtsAlcCPoolData_t *sentinel = &carrier_pool[allctr->alloc_no].sentinel;
+    ErtsAlcCPoolData_t *sentinel = allctr->cpool.sentinel;
     ErtsAlcCPoolData_t *cpdp = sentinel;
     Carrier_t *tmp_crr;
 
     while (1) {
-	cpdp = (ErtsAlcCPoolData_t *) (erts_atomic_read_ddrb(&cpdp->next) & ~FLG_MASK);
+	cpdp = (ErtsAlcCPoolData_t *) (erts_atomic_read_ddrb(&cpdp->next) & ~CRR_FLG_MASK);
 	if (cpdp == sentinel)
 	    return 0;
 	tmp_crr = (Carrier_t *) (((char *) cpdp) - offsetof(Carrier_t, cpool));
@@ -3041,7 +3265,7 @@ cpool_dbg_is_in_pool(Allctr_t *allctr, Carrier_t *crr)
 static int
 cpool_is_empty(Allctr_t *allctr)
 {
-    ErtsAlcCPoolData_t *sentinel = &carrier_pool[allctr->alloc_no].sentinel;
+    ErtsAlcCPoolData_t *sentinel = allctr->cpool.sentinel;
     return ((erts_atomic_read_rb(&sentinel->next) == (erts_aint_t) sentinel)
 	    && (erts_atomic_read_rb(&sentinel->prev) == (erts_aint_t) sentinel));
 }
@@ -3131,16 +3355,31 @@ 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;
+    ErtsAlcCPoolData_t *sentinel = allctr->cpool.sentinel;
     Allctr_t *orig_allctr = crr->cpool.orig_allctr;
 
-    ERTS_ALC_CPOOL_ASSERT(allctr->alloc_no == ERTS_ALC_A_INVALID /* testcase */
+    ERTS_ALC_CPOOL_ASSERT(allctr->alloc_no == ERTS_ALC_A_TEST /* testcase */
 			  || erts_thr_progress_is_managed_thread());
 
-    erts_atomic_add_nob(&orig_allctr->cpool.stat.blocks_size,
-			(erts_aint_t) crr->cpool.blocks_size);
-    erts_atomic_add_nob(&orig_allctr->cpool.stat.no_blocks,
-			(erts_aint_t) crr->cpool.blocks);
+    {
+        int alloc_no = allctr->alloc_no;
+
+        ERTS_ALC_CPOOL_ASSERT(
+            erts_atomic_read_nob(&orig_allctr->cpool.stat.blocks_size[alloc_no]) >= 0 &&
+            crr->cpool.blocks_size[alloc_no] >= 0);
+
+        ERTS_ALC_CPOOL_ASSERT(
+            erts_atomic_read_nob(&orig_allctr->cpool.stat.no_blocks[alloc_no]) >= 0 &&
+            crr->cpool.blocks[alloc_no] >= 0);
+
+        /* We only modify the counter for our current type since the others are
+         * conceptually still in the pool. */
+        erts_atomic_add_nob(&orig_allctr->cpool.stat.blocks_size[alloc_no],
+                            ((erts_aint_t) crr->cpool.blocks_size[alloc_no]));
+        erts_atomic_add_nob(&orig_allctr->cpool.stat.no_blocks[alloc_no],
+                            ((erts_aint_t) crr->cpool.blocks[alloc_no]));
+    }
+
     erts_atomic_add_nob(&orig_allctr->cpool.stat.carriers_size,
 			(erts_aint_t) CARRIER_SZ(crr));
     erts_atomic_inc_nob(&orig_allctr->cpool.stat.no_carriers);
@@ -3213,10 +3452,10 @@ cpool_delete(Allctr_t *allctr, Allctr_t *prev_allctr, Carrier_t *crr)
     ErtsAlcCPoolData_t *cpd1p, *cpd2p;
     erts_aint_t val;
 #ifdef ERTS_ALC_CPOOL_DEBUG
-    ErtsAlcCPoolData_t *sentinel = &carrier_pool[allctr->alloc_no].sentinel;
+    ErtsAlcCPoolData_t *sentinel = allctr->cpool.sentinel;
 #endif
 
-    ERTS_ALC_CPOOL_ASSERT(allctr->alloc_no == ERTS_ALC_A_INVALID /* testcase */
+    ERTS_ALC_CPOOL_ASSERT(allctr->alloc_no == ERTS_ALC_A_TEST /* testcase */
 			  || erts_thr_progress_is_managed_thread());
     ERTS_ALC_CPOOL_ASSERT(sentinel != &crr->cpool);
 
@@ -3292,28 +3531,43 @@ cpool_delete(Allctr_t *allctr, Allctr_t *prev_allctr, Carrier_t *crr)
 
     crr->cpool.thr_prgr = erts_thr_progress_later(NULL);
 
-    erts_atomic_add_nob(&prev_allctr->cpool.stat.blocks_size,
-			-((erts_aint_t) crr->cpool.blocks_size));
-    erts_atomic_add_nob(&prev_allctr->cpool.stat.no_blocks,
-			-((erts_aint_t) crr->cpool.blocks));
-    erts_atomic_add_nob(&prev_allctr->cpool.stat.carriers_size,
+    {
+        Allctr_t *orig_allctr = crr->cpool.orig_allctr;
+        int alloc_no = allctr->alloc_no;
+
+        ERTS_ALC_CPOOL_ASSERT(orig_allctr == prev_allctr);
+
+        ERTS_ALC_CPOOL_ASSERT(crr->cpool.blocks_size[alloc_no] <=
+            erts_atomic_read_nob(&orig_allctr->cpool.stat.blocks_size[alloc_no]));
+
+        ERTS_ALC_CPOOL_ASSERT(crr->cpool.blocks[alloc_no] <=
+            erts_atomic_read_nob(&orig_allctr->cpool.stat.no_blocks[alloc_no]));
+
+        /* We only modify the counters for our current type since the others
+         * were, conceptually, never taken out of the pool. */
+        erts_atomic_add_nob(&orig_allctr->cpool.stat.blocks_size[alloc_no],
+                            -((erts_aint_t) crr->cpool.blocks_size[alloc_no]));
+        erts_atomic_add_nob(&orig_allctr->cpool.stat.no_blocks[alloc_no],
+                            -((erts_aint_t) crr->cpool.blocks[alloc_no]));
+
+        erts_atomic_add_nob(&orig_allctr->cpool.stat.carriers_size,
 			-((erts_aint_t) CARRIER_SZ(crr)));
-    erts_atomic_dec_wb(&prev_allctr->cpool.stat.no_carriers);
+        erts_atomic_dec_wb(&orig_allctr->cpool.stat.no_carriers);
+    }
 
 }
 
 static Carrier_t *
 cpool_fetch(Allctr_t *allctr, UWord size)
 {
-    enum { IGNORANT, HAS_SEEN_SENTINEL, THE_LAST_ONE } loop_state;
-    int i;
+    int i, seen_sentinel;
     Carrier_t *crr;
     Carrier_t *reinsert_crr = NULL;
     ErtsAlcCPoolData_t *cpdp;
     ErtsAlcCPoolData_t *cpool_entrance = NULL;
     ErtsAlcCPoolData_t *sentinel;
 
-    ERTS_ALC_CPOOL_ASSERT(allctr->alloc_no == ERTS_ALC_A_INVALID /* testcase */
+    ERTS_ALC_CPOOL_ASSERT(allctr->alloc_no == ERTS_ALC_A_TEST /* testcase */
 			  || erts_thr_progress_is_managed_thread());
 
     i = ERTS_ALC_CPOOL_MAX_FETCH_INSPECT;
@@ -3415,48 +3669,39 @@ cpool_fetch(Allctr_t *allctr, UWord size)
     /*
      * Finally search the shared pool and try employ foreign carriers
      */
-    sentinel = &carrier_pool[allctr->alloc_no].sentinel;
+    sentinel = allctr->cpool.sentinel;
     if (cpool_entrance) {
         /*
          * 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 carrier 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.
 	 */
-	cpool_entrance = sentinel;
-	cpdp = cpool_aint2cpd(cpool_read(&cpool_entrance->prev));
-	if (cpdp == sentinel)
+        cpool_entrance = cpool_aint2cpd(cpool_read(&sentinel->prev));
+	if (cpool_entrance == sentinel)
 	    goto check_dc_list;
     }
 
-    loop_state = IGNORANT;
+    cpdp = cpool_entrance;
+    seen_sentinel = 0;
     do {
 	erts_aint_t exp;
 	cpdp = cpool_aint2cpd(cpool_read(&cpdp->prev));
-	if (cpdp == cpool_entrance) {
-	    if (cpool_entrance == sentinel) {
-		cpdp = cpool_aint2cpd(cpool_read(&cpdp->prev));
-		if (cpdp == sentinel)
-		    break;
-	    }
-            loop_state = THE_LAST_ONE;
-	}
-	else if (cpdp == sentinel) {
-	    if (loop_state == HAS_SEEN_SENTINEL) {
+        if (cpdp == sentinel) {
+	    if (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;
-            loop_state = HAS_SEEN_SENTINEL;
+            seen_sentinel = 1;
+            continue;
 	}
+        ASSERT(cpdp != cpool_entrance || seen_sentinel);
+
 	crr = ErtsContainerStruct(cpdp, Carrier_t, cpool);
 	exp = erts_atomic_read_rb(&crr->allctr);
 
@@ -3489,7 +3734,7 @@ cpool_fetch(Allctr_t *allctr, UWord size)
             INC_CC(allctr->cpool.stat.fail_shared);
 	    return NULL;
         }
-    }while (loop_state != THE_LAST_ONE);
+    }while (cpdp != cpool_entrance);
 
 check_dc_list:
     /* Last; check our own pending dealloc carrier list... */
@@ -3668,8 +3913,9 @@ cpool_init_carrier_data(Allctr_t *allctr, Carrier_t *crr)
     crr->cpool.orig_allctr = allctr;
     crr->cpool.thr_prgr = ERTS_THR_PRGR_INVALID;
     erts_atomic_init_nob(&crr->cpool.max_size, 0);
-    crr->cpool.blocks = 0;
-    crr->cpool.blocks_size = 0;
+    sys_memset(&crr->cpool.blocks_size, 0, sizeof(crr->cpool.blocks_size));
+    sys_memset(&crr->cpool.blocks, 0, sizeof(crr->cpool.blocks));
+    crr->cpool.total_blocks_size = 0;
     if (!ERTS_ALC_IS_CPOOL_ENABLED(allctr))
 	crr->cpool.abandon_limit = 0;
     else {
@@ -3684,14 +3930,14 @@ cpool_init_carrier_data(Allctr_t *allctr, Carrier_t *crr)
     crr->cpool.state = ERTS_MBC_IS_HOME;
 }
 
-static void
-set_new_allctr_abandon_limit(Allctr_t *allctr)
+
+
+static UWord
+allctr_abandon_limit(Allctr_t *allctr)
 {
     UWord limit;
     UWord csz;
 
-    allctr->cpool.check_limit_count = ERTS_ALC_CPOOL_CHECK_LIMIT_COUNT;
-
     csz = allctr->mbcs.curr.norm.mseg.size;
     csz += allctr->mbcs.curr.norm.sys_alloc.size;
 
@@ -3701,7 +3947,13 @@ set_new_allctr_abandon_limit(Allctr_t *allctr)
     else
 	limit = (csz/100)*allctr->cpool.util_limit;
 
-    allctr->cpool.abandon_limit = limit;
+    return limit;
+}
+
+static void ERTS_INLINE
+set_new_allctr_abandon_limit(Allctr_t *allctr)
+{
+    allctr->cpool.abandon_limit = allctr_abandon_limit(allctr);
 }
 
 static void
@@ -3713,7 +3965,9 @@ abandon_carrier(Allctr_t *allctr, Carrier_t *crr)
 
     unlink_carrier(&allctr->mbc_list, crr);
     allctr->remove_mbc(allctr, crr);
-    set_new_allctr_abandon_limit(allctr);
+
+    /* Mark our free blocks as unused and reclaimable to the OS. */
+    carrier_mem_discard_free_blocks(allctr, crr);
 
     cpool_insert(allctr, crr);
 
@@ -3766,7 +4020,8 @@ poolify_my_carrier(Allctr_t *allctr, Carrier_t *crr)
 }
 
 static void
-cpool_read_stat(Allctr_t *allctr, UWord *nocp, UWord *cszp, UWord *nobp, UWord *bszp)
+cpool_read_stat(Allctr_t *allctr, int alloc_no,
+                UWord *nocp, UWord *cszp, UWord *nobp, UWord *bszp)
 {
     int i;
     UWord noc = 0, csz = 0, nob = 0, bsz = 0;
@@ -3786,10 +4041,10 @@ cpool_read_stat(Allctr_t *allctr, UWord *nocp, UWord *cszp, UWord *nobp, UWord *
 			? erts_atomic_read_nob(&allctr->cpool.stat.carriers_size)
 			: 0);
 	tnob = (UWord) (nobp
-			? erts_atomic_read_nob(&allctr->cpool.stat.no_blocks)
+			? erts_atomic_read_nob(&allctr->cpool.stat.no_blocks[alloc_no])
 			: 0);
 	tbsz = (UWord) (bszp
-			? erts_atomic_read_nob(&allctr->cpool.stat.blocks_size)
+			? erts_atomic_read_nob(&allctr->cpool.stat.blocks_size[alloc_no])
 			: 0);
 	if (tnoc == noc && tcsz == csz && tnob == nob && tbsz == bsz)
 	    break;
@@ -4044,6 +4299,7 @@ create_carrier(Allctr_t *allctr, Uint umem_sz, UWord flags)
 #if HAVE_ERTS_MSEG
     mbc_final_touch:
 #endif
+        set_new_allctr_abandon_limit(allctr);
 
 	blk = MBC_TO_FIRST_BLK(allctr, crr);
 
@@ -4262,7 +4518,6 @@ destroy_carrier(Allctr_t *allctr, Block_t *blk, Carrier_t **busy_pcrr_pp)
     else {
 	ASSERT(IS_MBC_FIRST_FBLK(allctr, blk));
 	crr = FIRST_BLK_TO_MBC(allctr, blk);
-	crr_sz = CARRIER_SZ(crr);
 
 #ifdef DEBUG
 	if (!allctr->stopped) {
@@ -4294,15 +4549,7 @@ destroy_carrier(Allctr_t *allctr, Block_t *blk, Carrier_t **busy_pcrr_pp)
 	else
 	{
 	    unlink_carrier(&allctr->mbc_list, crr);
-#if HAVE_ERTS_MSEG
-	    if (IS_MSEG_CARRIER(crr)) {
-		ASSERT(crr_sz % ERTS_SACRR_UNIT_SZ == 0);
-		STAT_MSEG_MBC_FREE(allctr, crr_sz);
-	    }
-	    else
-#endif
-		STAT_SYS_ALLOC_MBC_FREE(allctr, crr_sz);
-
+            STAT_MBC_FREE(allctr, crr);
             if (allctr->remove_mbc)
                 allctr->remove_mbc(allctr, crr);
 	}
@@ -4316,7 +4563,7 @@ destroy_carrier(Allctr_t *allctr, Block_t *blk, Carrier_t **busy_pcrr_pp)
             LTTNG5(carrier_destroy,
                 ERTS_ALC_A2AD(allctr->alloc_no),
                 allctr->ix,
-                crr_sz,
+                CARRIER_SZ(crr),
                 mbc_stats,
                 sbc_stats);
         }
@@ -4394,6 +4641,8 @@ static struct {
     Eterm blocks_size;
     Eterm blocks;
 
+    Eterm foreign_blocks;
+
     Eterm calls;
     Eterm sys_alloc;
     Eterm sys_free;
@@ -4494,6 +4743,7 @@ init_atoms(Allctr_t *allctr)
 	AM_INIT(carriers);
 	AM_INIT(blocks_size);
 	AM_INIT(blocks);
+	AM_INIT(foreign_blocks);
 
 	AM_INIT(calls);
 	AM_INIT(sys_alloc);
@@ -4629,7 +4879,6 @@ sz_info_fix(Allctr_t *allctr,
 		ErtsAlcFixList_t *fix = &allctr->fix[ix];
 		UWord alloced = fix->type_size * fix->u.cpool.allocated;
 		UWord used = fix->type_size * fix->u.cpool.used;
-                ErtsAlcType_t n = ERTS_ALC_N_MIN_A_FIXED_SIZE + ix;
 
 		if (print_to_p) {
 		    fmtfn_t to = *print_to_p;
@@ -4637,14 +4886,14 @@ sz_info_fix(Allctr_t *allctr,
 		    erts_print(to,
 			       arg,
 			       "fix type internal: %s %bpu %bpu\n",
-			       (char *) ERTS_ALC_N2TD(n),
+			       (char *) ERTS_ALC_T2TD(fix->type),
 			       alloced,
 			       used);
 		}
 
 		if (hpp || szp) {
 		    add_3tup(hpp, szp, &res,
-			     alloc_type_atoms[n],
+			     alloc_type_atoms[ERTS_ALC_T2N(fix->type)],
 			     bld_unstable_uint(hpp, szp, alloced),
 			     bld_unstable_uint(hpp, szp, used));
 		}
@@ -4657,7 +4906,6 @@ sz_info_fix(Allctr_t *allctr,
 	    ErtsAlcFixList_t *fix = &allctr->fix[ix];
 	    UWord alloced = fix->type_size * fix->u.nocpool.allocated;
 	    UWord used = fix->type_size*fix->u.nocpool.used;
-            ErtsAlcType_t n = ERTS_ALC_N_MIN_A_FIXED_SIZE + ix;
 
 	    if (print_to_p) {
 		fmtfn_t to = *print_to_p;
@@ -4665,14 +4913,14 @@ sz_info_fix(Allctr_t *allctr,
 		erts_print(to,
 			   arg,
 			   "fix type: %s %bpu %bpu\n",
-			   (char *) ERTS_ALC_N2TD(n),
+			   (char *) ERTS_ALC_T2TD(fix->type),
 			   alloced,
 			   used);
 	    }
 
 	    if (hpp || szp) {
 		add_3tup(hpp, szp, &res,
-			 alloc_type_atoms[n],
+			 alloc_type_atoms[ERTS_ALC_T2N(fix->type)],
 			 bld_unstable_uint(hpp, szp, alloced),
 			 bld_unstable_uint(hpp, szp, used));
 	    }
@@ -4745,9 +4993,9 @@ info_cpool(Allctr_t *allctr,
     noc = csz = nob = bsz = ~0;
     if (print_to_p || hpp) {
 	if (sz_only)
-	    cpool_read_stat(allctr, NULL, &csz, NULL, &bsz);
+	    cpool_read_stat(allctr, allctr->alloc_no, NULL, &csz, NULL, &bsz);
 	else
-	    cpool_read_stat(allctr, &noc, &csz, &nob, &bsz);
+	    cpool_read_stat(allctr, allctr->alloc_no, &noc, &csz, &nob, &bsz);
     }
 
     if (print_to_p) {
@@ -4762,6 +5010,10 @@ info_cpool(Allctr_t *allctr,
     }
 
     if (hpp || szp) {
+        Eterm foreign_blocks;
+        int i;
+
+        foreign_blocks = NIL;
 	res = NIL;
 
       if (!sz_only) {
@@ -4808,22 +5060,61 @@ info_cpool(Allctr_t *allctr,
         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,
-		     bld_unstable_uint(hpp, szp, noc));
+
+        if (!sz_only) {
+            add_2tup(hpp, szp, &res,
+                     am.carriers,
+                     bld_unstable_uint(hpp, szp, noc));
+        }
+
 	add_2tup(hpp, szp, &res,
 		 am.blocks_size,
 		 bld_unstable_uint(hpp, szp, bsz));
-	if (!sz_only)
+
+	if (!sz_only) {
 	    add_2tup(hpp, szp, &res,
 		     am.blocks,
 		     bld_unstable_uint(hpp, szp, nob));
+        }
+
+        for (i = ERTS_ALC_A_MIN; i <= ERTS_ALC_A_MAX; i++) {
+            const char *name_str;
+            Eterm name, info;
+
+            if (i == allctr->alloc_no) {
+                continue;
+            }
+
+            cpool_read_stat(allctr, i, NULL, NULL, &nob, &bsz);
+
+            if (bsz == 0 && (nob == 0 || sz_only)) {
+                continue;
+            }
+
+            name_str = ERTS_ALC_A2AD(i);
+            info = NIL;
+
+            add_2tup(hpp, szp, &info,
+                     am.blocks_size,
+                     bld_unstable_uint(hpp, szp, bsz));
+
+            if (!sz_only) {
+                add_2tup(hpp, szp, &info,
+                     am.blocks,
+                     bld_unstable_uint(hpp, szp, nob));
+            }
+
+            name = am_atom_put(name_str, sys_strlen(name_str));
+
+            add_2tup(hpp, szp, &foreign_blocks, name, info);
+        }
+
+        add_2tup(hpp, szp, &res, am.foreign_blocks, foreign_blocks);
     }
 
     return res;
@@ -5459,6 +5750,19 @@ erts_alcu_info(Allctr_t *allctr,
     return res;
 }
 
+void
+erts_alcu_foreign_size(Allctr_t *allctr, ErtsAlcType_t alloc_no, AllctrSize_t *size)
+{
+    if (ERTS_ALC_IS_CPOOL_ENABLED(allctr)) {
+        UWord csz, bsz;
+        cpool_read_stat(allctr, alloc_no, NULL, &csz, NULL, &bsz);
+        size->carriers = csz;
+        size->blocks = bsz;
+    } else {
+        size->carriers = 0;
+        size->blocks = 0;
+    }
+}
 
 void
 erts_alcu_current_size(Allctr_t *allctr, AllctrSize_t *size, ErtsAlcUFixInfo_t *fi, int fisz)
@@ -5477,7 +5781,7 @@ erts_alcu_current_size(Allctr_t *allctr, AllctrSize_t *size, ErtsAlcUFixInfo_t *
 
     if (ERTS_ALC_IS_CPOOL_ENABLED(allctr)) {
 	UWord csz, bsz;
-	cpool_read_stat(allctr, NULL, &csz, NULL, &bsz);
+	cpool_read_stat(allctr, allctr->alloc_no, NULL, &csz, NULL, &bsz);
 	size->blocks += bsz;
 	size->carriers += csz;
     }
@@ -5522,6 +5826,11 @@ do_erts_alcu_alloc(ErtsAlcType_t type, Allctr_t *allctr, Uint size)
 
     ERTS_ALCU_DBG_CHK_THR_ACCESS(allctr);
 
+    /* Reject sizes that can't fit into the header word. */
+    if (size > ~BLK_FLG_MASK) {
+        return NULL;
+    }
+
 #if ALLOC_ZERO_EQ_NULL
     if (!size)
 	return NULL;
@@ -5688,12 +5997,11 @@ do_erts_alcu_free(ErtsAlcType_t type, Allctr_t *allctr, void *p,
     ERTS_ALCU_DBG_CHK_THR_ACCESS(allctr);
 
     if (p) {
-
 	INC_CC(allctr->calls.this_free);
 
-	if (allctr->fix) {
+        if (ERTS_ALC_IS_FIX_TYPE(type)) {
 	    if (ERTS_ALC_IS_CPOOL_ENABLED(allctr))
-		fix_cpool_free(allctr, type, p, busy_pcrr_pp, 1);
+		fix_cpool_free(allctr, type, 0, p, busy_pcrr_pp);
 	    else
 		fix_nocpool_free(allctr, type, p);
 	}
@@ -5702,7 +6010,7 @@ do_erts_alcu_free(ErtsAlcType_t type, Allctr_t *allctr, void *p,
 	    if (IS_SBC_BLK(blk))
 		destroy_carrier(allctr, blk, NULL);
 	    else
-		mbc_free(allctr, p, busy_pcrr_pp);
+		mbc_free(allctr, type, p, busy_pcrr_pp);
 	}
     }
 }
@@ -5804,6 +6112,11 @@ do_erts_alcu_realloc(ErtsAlcType_t type,
 	return res;
     }
 
+    /* Reject sizes that can't fit into the header word. */
+    if (size > ~BLK_FLG_MASK) {
+        return NULL;
+    }
+
 #if ALLOC_ZERO_EQ_NULL
     if (!size) {
 	ASSERT(p);
@@ -5820,7 +6133,7 @@ do_erts_alcu_realloc(ErtsAlcType_t type,
 
     if (size < allctr->sbc_threshold) {
 	if (IS_MBC_BLK(blk))
-	    res = mbc_realloc(allctr, p, size, alcu_flgs, busy_pcrr_pp);
+	    res = mbc_realloc(allctr, type, p, size, alcu_flgs, busy_pcrr_pp);
 	else {
 	    Uint used_sz = SBC_HEADER_SIZE + ABLK_HDR_SZ + size;
 	    Uint crr_sz;
@@ -5879,7 +6192,7 @@ do_erts_alcu_realloc(ErtsAlcType_t type,
 		sys_memcpy((void *) res,
 			   (void *) p,
 			   MIN(MBC_ABLK_SZ(blk) - ABLK_HDR_SZ, size));
-		mbc_free(allctr, p, busy_pcrr_pp);
+		mbc_free(allctr, type, p, busy_pcrr_pp);
 	    }
 	    else
 		res = NULL;
@@ -6247,12 +6560,21 @@ int
 erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init)
 {
     /* erts_alcu_start assumes that allctr has been zeroed */
+    int i;
 
     if (((UWord)allctr & ERTS_CRR_ALCTR_FLG_MASK) != 0) {
         erts_exit(ERTS_ABORT_EXIT, "%s:%d:erts_alcu_start: Alignment error\n",
                  __FILE__, __LINE__);
     }
 
+    /* The various fields packed into the header word must not overlap */
+    ERTS_CT_ASSERT(!(MBC_ABLK_OFFSET_MASK & MBC_ABLK_SZ_MASK));
+    ERTS_CT_ASSERT(!(MBC_ABLK_OFFSET_MASK & BLK_FLG_MASK));
+    ERTS_CT_ASSERT(!(MBC_ABLK_SZ_MASK & BLK_FLG_MASK));
+    ERTS_CT_ASSERT(!(MBC_FBLK_SZ_MASK & BLK_FLG_MASK));
+    ERTS_CT_ASSERT(!(SBC_BLK_SZ_MASK & BLK_FLG_MASK));
+    ERTS_CT_ASSERT(!(CRR_SZ_MASK & CRR_FLG_MASK));
+
     if (!initialized)
 	goto error;
 
@@ -6270,6 +6592,11 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init)
 
     allctr->ix				= init->ix;
     allctr->alloc_no			= init->alloc_no;
+    allctr->alloc_strat			= init->alloc_strat;
+
+    ASSERT(allctr->alloc_no >= ERTS_ALC_A_MIN &&
+           allctr->alloc_no <= ERTS_ALC_A_MAX);
+
     if (allctr->alloc_no < ERTS_ALC_A_MIN
 	|| ERTS_ALC_A_MAX < allctr->alloc_no)
 	allctr->alloc_no = ERTS_ALC_A_INVALID;
@@ -6322,8 +6649,7 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init)
 						       + sizeof(FreeBlkFtr_t));
     if (init->tpref) {
 	Uint sz = ABLK_HDR_SZ;
-	sz += (init->fix ? 
-	       sizeof(ErtsAllctrFixDDBlock_t) : sizeof(ErtsAllctrDDBlock_t));
+	sz += sizeof(ErtsAllctrDDBlock_t);
 	sz = UNIT_CEILING(sz);
 	if (sz > allctr->min_block_size)
 	    allctr->min_block_size = sz;
@@ -6334,15 +6660,29 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init)
     allctr->cpool.dc_list.last = NULL;
     allctr->cpool.abandon_limit = 0;
     allctr->cpool.disable_abandon = 0;
-    erts_atomic_init_nob(&allctr->cpool.stat.blocks_size, 0);
-    erts_atomic_init_nob(&allctr->cpool.stat.no_blocks, 0);
+    for (i = ERTS_ALC_A_MIN; i <= ERTS_ALC_A_MAX; i++) {
+        erts_atomic_init_nob(&allctr->cpool.stat.blocks_size[i], 0);
+        erts_atomic_init_nob(&allctr->cpool.stat.no_blocks[i], 0);
+    }
     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;
     if (!init->ts && init->acul && init->acnl) {
+        ASSERT(allctr->add_mbc);
+        ASSERT(allctr->remove_mbc);
+        ASSERT(allctr->largest_fblk_in_mbc);
+        ASSERT(allctr->first_fblk_in_mbc);
+        ASSERT(allctr->next_fblk_in_mbc);
+
         allctr->cpool.util_limit = init->acul;
         allctr->cpool.in_pool_limit = init->acnl;
         allctr->cpool.fblk_min_limit = init->acfml;
+
+        if (allctr->alloc_strat == ERTS_ALC_S_FIRSTFIT) {
+            allctr->cpool.sentinel = &firstfit_carrier_pool.sentinel;
+        }
+        else if (allctr->alloc_no != ERTS_ALC_A_TEST) {
+            ERTS_INTERNAL_ERROR("Impossible carrier migration config.");
+        }
     }
     else {
         allctr->cpool.util_limit = 0;
@@ -6350,6 +6690,12 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init)
         allctr->cpool.fblk_min_limit = 0;
     }
 
+    /* The invasive tests don't really care whether the pool is enabled or not,
+     * so we need to set this unconditionally for this allocator type. */
+    if (allctr->alloc_no == ERTS_ALC_A_TEST) {
+        allctr->cpool.sentinel = &test_carrier_pool.sentinel;
+    }
+
     allctr->sbc_threshold = adjust_sbct(allctr, init->sbct);
 
 #if HAVE_ERTS_MSEG
@@ -6461,9 +6807,9 @@ erts_alcu_start(Allctr_t *allctr, AllctrInit_t *init)
 	allctr->fix_shrink_scheduled = 0;
 	for (i = 0; i < ERTS_ALC_NO_FIXED_SIZES; i++) {
 	    allctr->fix[i].type_size = init->fix_type_size[i];
+	    allctr->fix[i].type = ERTS_ALC_N2T(i + ERTS_ALC_N_MIN_A_FIXED_SIZE);
 	    allctr->fix[i].list_size = 0;
 	    allctr->fix[i].list = NULL;
-	    ASSERT(allctr->fix[i].type_size >= sizeof(ErtsAllctrFixDDBlock_t));
 	    if (ERTS_ALC_IS_CPOOL_ENABLED(allctr)) {
 		allctr->fix[i].u.cpool.min_list_size = 0;
 		allctr->fix[i].u.cpool.shrink_list = 0;
@@ -6512,12 +6858,16 @@ erts_alcu_stop(Allctr_t *allctr)
 void
 erts_alcu_init(AlcUInit_t *init)
 {
-    int i;
-    for (i = 0; i <= ERTS_ALC_A_MAX; i++) {
-	ErtsAlcCPoolData_t *sentinel = &carrier_pool[i].sentinel;
-	erts_atomic_init_nob(&sentinel->next, (erts_aint_t) sentinel);
-	erts_atomic_init_nob(&sentinel->prev, (erts_aint_t) sentinel);
-    }
+    ErtsAlcCPoolData_t *sentinel;
+
+    sentinel = &firstfit_carrier_pool.sentinel;
+    erts_atomic_init_nob(&sentinel->next, (erts_aint_t) sentinel);
+    erts_atomic_init_nob(&sentinel->prev, (erts_aint_t) sentinel);
+
+    sentinel = &test_carrier_pool.sentinel;
+    erts_atomic_init_nob(&sentinel->next, (erts_aint_t) sentinel);
+    erts_atomic_init_nob(&sentinel->prev, (erts_aint_t) sentinel);
+
     ERTS_CT_ASSERT(SBC_BLK_SZ_MASK == MBC_FBLK_SZ_MASK); /* see BLK_SZ */
 #if HAVE_ERTS_MSEG
     ASSERT(erts_mseg_unit_size() == ERTS_SACRR_UNIT_SZ);
@@ -6528,6 +6878,8 @@ erts_alcu_init(AlcUInit_t *init)
 #endif
     allow_sys_alloc_carriers = init->sac;
 
+    sys_page_size = erts_sys_get_page_size();
+
 #ifdef DEBUG
     carrier_alignment = sizeof(Unit_t);
 #endif
@@ -6699,7 +7051,7 @@ static int blockscan_cpool_yielding(blockscan_t *state)
 {
     ErtsAlcCPoolData_t *sentinel, *cursor;
 
-    sentinel = &carrier_pool[(state->allocator)->alloc_no].sentinel;
+    sentinel = (state->allocator)->cpool.sentinel;
     cursor = blockscan_restore_cpool_cursor(state);
 
     if (ERTS_PROC_IS_EXITING(state->process)) {
@@ -6760,12 +7112,21 @@ static int blockscan_cpool_yielding(blockscan_t *state)
     return 0;
 }
 
-static int blockscan_yield_helper(blockscan_t *state,
-                                  int (*yielding_op)(blockscan_t*))
+/* */
+
+static int blockscan_finish(blockscan_t *state)
 {
-    /* Note that we don't check whether to abort here; only yielding_op knows
-     * whether the carrier is still in the list/pool. */
+    if (ERTS_PROC_IS_EXITING(state->process)) {
+        state->abort(state->user_data);
+        return 0;
+    }
+
+    state->current_op = blockscan_finish;
 
+    return state->finish(state->user_data);
+}
+
+static void blockscan_lock_helper(blockscan_t *state) {
     if ((state->allocator)->thread_safe) {
         /* Locked scans have to be as short as possible. */
         state->reductions = 1;
@@ -6774,34 +7135,18 @@ static int blockscan_yield_helper(blockscan_t *state,
     } else {
         state->reductions = BLOCKSCAN_REDUCTIONS;
     }
+}
 
-    if (yielding_op(state)) {
-        state->next_op = state->current_op;
-    }
-
+static void blockscan_unlock_helper(blockscan_t *state) {
     if ((state->allocator)->thread_safe) {
         erts_mtx_unlock(&(state->allocator)->mutex);
     }
-
-    return 1;
-}
-
-/* */
-
-static int blockscan_finish(blockscan_t *state)
-{
-    if (ERTS_PROC_IS_EXITING(state->process)) {
-        state->abort(state->user_data);
-        return 0;
-    }
-
-    state->current_op = blockscan_finish;
-
-    return state->finish(state->user_data);
 }
 
 static int blockscan_sweep_sbcs(blockscan_t *state)
 {
+    blockscan_lock_helper(state);
+
     if (state->current_op != blockscan_sweep_sbcs) {
         SET_CARRIER_HDR(&state->dummy_carrier, 0, SCH_SBC, state->allocator);
         state->current_clist = &(state->allocator)->sbc_list;
@@ -6811,11 +7156,19 @@ static int blockscan_sweep_sbcs(blockscan_t *state)
     state->current_op = blockscan_sweep_sbcs;
     state->next_op = blockscan_finish;
 
-    return blockscan_yield_helper(state, blockscan_clist_yielding);
+    if (blockscan_clist_yielding(state)) {
+        state->next_op = state->current_op;
+    }
+    
+    blockscan_unlock_helper(state);
+
+    return 1;
 }
 
 static int blockscan_sweep_mbcs(blockscan_t *state)
 {
+    blockscan_lock_helper(state);
+
     if (state->current_op != blockscan_sweep_mbcs) {
         SET_CARRIER_HDR(&state->dummy_carrier, 0, SCH_MBC, state->allocator);
         state->current_clist = &(state->allocator)->mbc_list;
@@ -6825,23 +7178,34 @@ static int blockscan_sweep_mbcs(blockscan_t *state)
     state->current_op = blockscan_sweep_mbcs;
     state->next_op = blockscan_sweep_sbcs;
 
-    return blockscan_yield_helper(state, blockscan_clist_yielding);
+    if (blockscan_clist_yielding(state)) {
+        state->next_op = state->current_op;
+    }
+
+    blockscan_unlock_helper(state);
+
+    return 1;
 }
 
 static int blockscan_sweep_cpool(blockscan_t *state)
 {
-    if (state->current_op != blockscan_sweep_cpool) {
-        ErtsAlcCPoolData_t *sentinel;
+    blockscan_lock_helper(state);
 
+    if (state->current_op != blockscan_sweep_cpool) {
         SET_CARRIER_HDR(&state->dummy_carrier, 0, SCH_MBC, state->allocator);
-        sentinel = &carrier_pool[(state->allocator)->alloc_no].sentinel;
-        state->cpool_cursor = sentinel;
+        state->cpool_cursor = (state->allocator)->cpool.sentinel;
     }
 
     state->current_op = blockscan_sweep_cpool;
     state->next_op = blockscan_sweep_mbcs;
 
-    return blockscan_yield_helper(state, blockscan_cpool_yielding);
+    if (blockscan_cpool_yielding(state)) {
+        state->next_op = state->current_op;
+    }
+
+    blockscan_unlock_helper(state);
+
+    return 1;
 }
 
 static int blockscan_get_specific_allocator(int allocator_num,
@@ -7119,11 +7483,14 @@ static int gather_ahist_scan(Allctr_t *allocator,
         alcu_atag_t tag;
 
         block = SBC2BLK(allocator, carrier);
-        tag = GET_BLK_ATAG(block);
 
-        ASSERT(DBG_IS_VALID_ATAG(allocator, tag));
+        if (BLK_HAS_ATAG(block)) {
+            tag = GET_BLK_ATAG(block);
 
-        gather_ahist_update(state, tag, SBC_BLK_SZ(block));
+            ASSERT(DBG_IS_VALID_ATAG(tag));
+
+            gather_ahist_update(state, tag, SBC_BLK_SZ(block));
+        }
     } else {
         UWord scanned_bytes = MBC_HEADER_SIZE(allocator);
 
@@ -7134,10 +7501,10 @@ static int gather_ahist_scan(Allctr_t *allocator,
         while (1) {
             UWord block_size = MBC_BLK_SZ(block);
 
-            if (IS_ALLOCED_BLK(block)) {
+            if (IS_ALLOCED_BLK(block) && BLK_HAS_ATAG(block)) {
                 alcu_atag_t tag = GET_BLK_ATAG(block);
 
-                ASSERT(DBG_IS_VALID_ATAG(allocator, tag));
+                ASSERT(DBG_IS_VALID_ATAG(tag));
 
                 gather_ahist_update(state, tag, block_size);
             }
@@ -7159,7 +7526,7 @@ static int gather_ahist_scan(Allctr_t *allocator,
     return blocks_scanned;
 }
 
-static void gather_ahist_append_result(hist_tree_t *node, void *arg)
+static int gather_ahist_append_result(hist_tree_t *node, void *arg, Sint reds)
 {
     gather_ahist_t *state = (gather_ahist_t*)arg;
 
@@ -7193,6 +7560,7 @@ static void gather_ahist_append_result(hist_tree_t *node, void *arg)
 
     /* Plain free is intentional. */
     free(node);
+    return 1;
 }
 
 static void gather_ahist_send(gather_ahist_t *state)
@@ -7251,11 +7619,11 @@ static int gather_ahist_finish(void *arg)
         state->building_result = 1;
     }
 
-    if (hist_tree_rbt_foreach_destroy_yielding(&state->hist_tree,
-                                               &gather_ahist_append_result,
-                                               state,
-                                               &state->hist_tree_yield,
-                                               BLOCKSCAN_REDUCTIONS)) {
+    if (!hist_tree_rbt_foreach_destroy_yielding(&state->hist_tree,
+                                                &gather_ahist_append_result,
+                                                state,
+                                                &state->hist_tree_yield,
+                                                BLOCKSCAN_REDUCTIONS)) {
         return 1;
     }
 
@@ -7264,10 +7632,11 @@ static int gather_ahist_finish(void *arg)
     return 0;
 }
 
-static void gather_ahist_destroy_result(hist_tree_t *node, void *arg)
+static int gather_ahist_destroy_result(hist_tree_t *node, void *arg, Sint reds)
 {
     (void)arg;
     free(node);
+    return 1;
 }
 
 static void gather_ahist_abort(void *arg)
@@ -7297,8 +7666,6 @@ int erts_alcu_gather_alloc_histograms(Process *p, int allocator_num,
                                           sched_id,
                                           &allocator)) {
         return 0;
-    } else if (!allocator->atags) {
-        return 0;
     }
 
     ensure_atoms_initialized(allocator);
diff --git a/erts/emulator/beam/erl_alloc_util.h b/erts/emulator/beam/erl_alloc_util.h
index f26ace1534..b46b311c59 100644
--- a/erts/emulator/beam/erl_alloc_util.h
+++ b/erts/emulator/beam/erl_alloc_util.h
@@ -24,6 +24,7 @@
 #define ERTS_ALCU_VSN_STR "3.0"
 
 #include "erl_alloc_types.h"
+#include "erl_alloc.h"
 #define ERL_THREADS_EMU_INTERNAL__
 #include "erl_threads.h"
 
@@ -44,6 +45,7 @@ typedef struct {
 typedef struct {
     char *name_prefix;
     ErtsAlcType_t alloc_no;
+    ErtsAlcStrat_t alloc_strat;
     int force;
     int ix;
     int ts;
@@ -101,6 +103,7 @@ typedef struct {
 #define ERTS_DEFAULT_ALLCTR_INIT {                                         \
     NULL,                                                                  \
     ERTS_ALC_A_INVALID,	/* (number) alloc_no: allocator number           */\
+    ERTS_ALC_S_INVALID,	/* (number) alloc_strat: allocator strategy      */\
     0,			/* (bool)   force:  force enabled                */\
     0,			/* (number) ix: instance index                   */\
     1,			/* (bool)   ts:     thread safe                  */\
@@ -138,6 +141,7 @@ typedef struct {
 #define ERTS_DEFAULT_ALLCTR_INIT {                                         \
     NULL,                                                                  \
     ERTS_ALC_A_INVALID,	/* (number) alloc_no: allocator number           */\
+    ERTS_ALC_S_INVALID,	/* (number) alloc_strat: allocator strategy      */\
     0,			/* (bool)   force:  force enabled                */\
     0,			/* (number) ix: instance index                   */\
     1,			/* (bool)   ts:     thread safe                  */\
@@ -188,6 +192,7 @@ Eterm	erts_alcu_info(Allctr_t *, int, int, fmtfn_t *, void *, Uint **, Uint *);
 void	erts_alcu_init(AlcUInit_t *);
 void    erts_alcu_current_size(Allctr_t *, AllctrSize_t *,
 			       ErtsAlcUFixInfo_t *, int);
+void    erts_alcu_foreign_size(Allctr_t *, ErtsAlcType_t, AllctrSize_t *);
 void    erts_alcu_check_delayed_dealloc(Allctr_t *, int, int *, ErtsThrPrgrVal *, int *);
 erts_aint32_t erts_alcu_fix_alloc_shrink(Allctr_t *, erts_aint32_t);
 
@@ -286,10 +291,18 @@ void erts_alcu_sched_spec_data_init(struct ErtsSchedulerData_ *esdp);
 #define UNIT_FLOOR(X)	((X) & UNIT_MASK)
 #define UNIT_CEILING(X)	UNIT_FLOOR((X) + INV_UNIT_MASK)
 
-#define FLG_MASK		INV_UNIT_MASK
-#define SBC_BLK_SZ_MASK         UNIT_MASK
-#define MBC_FBLK_SZ_MASK        UNIT_MASK
-#define CARRIER_SZ_MASK         UNIT_MASK
+/* We store flags in the bits that no one will ever use. Generally these are
+ * the bits below the alignment size, but for blocks we also steal the highest
+ * bit since the header's a size and no one can expect to be able to allocate
+ * objects that large. */
+#define HIGHEST_WORD_BIT        (((UWord) 1) << (sizeof(UWord) * CHAR_BIT - 1))
+
+#define BLK_FLG_MASK            (INV_UNIT_MASK | HIGHEST_WORD_BIT)
+#define SBC_BLK_SZ_MASK         (~BLK_FLG_MASK)
+#define MBC_FBLK_SZ_MASK        (~BLK_FLG_MASK)
+
+#define CRR_FLG_MASK        INV_UNIT_MASK
+#define CRR_SZ_MASK         UNIT_MASK
 
 #if ERTS_HAVE_MSEG_SUPER_ALIGNED \
     || (!HAVE_ERTS_MSEG && ERTS_HAVE_ERTS_SYS_ALIGNED_ALLOC)
@@ -299,9 +312,9 @@ void erts_alcu_sched_spec_data_init(struct ErtsSchedulerData_ *esdp);
 #    define ERTS_SUPER_ALIGN_BITS 18
 #  endif
 #  ifdef ARCH_64 
-#    define MBC_ABLK_OFFSET_BITS   24
+#    define MBC_ABLK_OFFSET_BITS   23
 #  else
-#    define MBC_ABLK_OFFSET_BITS   9
+#    define MBC_ABLK_OFFSET_BITS   8
      /* Affects hard limits for sbct and lmbcs documented in erts_alloc.xml */
 #  endif
 #  define ERTS_SACRR_UNIT_SHIFT		ERTS_SUPER_ALIGN_BITS
@@ -321,19 +334,21 @@ void erts_alcu_sched_spec_data_init(struct ErtsSchedulerData_ *esdp);
 #endif
 
 #if MBC_ABLK_OFFSET_BITS
-#  define MBC_ABLK_OFFSET_SHIFT  (sizeof(UWord)*8 - MBC_ABLK_OFFSET_BITS)
-#  define MBC_ABLK_OFFSET_MASK   (~((UWord)0) << MBC_ABLK_OFFSET_SHIFT)
-#  define MBC_ABLK_SZ_MASK	(~MBC_ABLK_OFFSET_MASK & ~FLG_MASK)
+/* The shift is reduced by 1 since the highest bit is used for a flag. */
+#  define MBC_ABLK_OFFSET_SHIFT  (sizeof(UWord)*8 - 1 - MBC_ABLK_OFFSET_BITS)
+#  define MBC_ABLK_OFFSET_MASK \
+    (((UWORD_CONSTANT(1) << MBC_ABLK_OFFSET_BITS) - UWORD_CONSTANT(1)) \
+     << MBC_ABLK_OFFSET_SHIFT)
+#  define MBC_ABLK_SZ_MASK	(~MBC_ABLK_OFFSET_MASK & ~BLK_FLG_MASK)
 #else
-#  define MBC_ABLK_SZ_MASK	(~FLG_MASK)
+#  define MBC_ABLK_SZ_MASK	(~BLK_FLG_MASK)
 #endif
 
 #define MBC_ABLK_SZ(B) (ASSERT(!is_sbc_blk(B)), (B)->bhdr & MBC_ABLK_SZ_MASK)
 #define MBC_FBLK_SZ(B) (ASSERT(!is_sbc_blk(B)), (B)->bhdr & MBC_FBLK_SZ_MASK)
 #define SBC_BLK_SZ(B) (ASSERT(is_sbc_blk(B)), (B)->bhdr & SBC_BLK_SZ_MASK)
 
-#define CARRIER_SZ(C) \
-  ((C)->chdr & CARRIER_SZ_MASK)
+#define CARRIER_SZ(C) ((C)->chdr & CRR_SZ_MASK)
 
 typedef union {char c[ERTS_ALLOC_ALIGN_BYTES]; long l; double d;} Unit_t;
 
@@ -351,12 +366,20 @@ typedef struct {
 #endif
 } Block_t;
 
-typedef union ErtsAllctrDDBlock_t_ ErtsAllctrDDBlock_t;
+typedef struct ErtsAllctrDDBlock__ {
+    union  {
+        struct ErtsAllctrDDBlock__ *ptr_next;
+        erts_atomic_t atmc_next;
+    } u;
+    ErtsAlcType_t type;
+    Uint32 flags;
+} ErtsAllctrDDBlock_t;
 
-union ErtsAllctrDDBlock_t_ {
-    erts_atomic_t atmc_next;
-    ErtsAllctrDDBlock_t *ptr_next;
-};
+/* Deallocation was caused by shrinking a fix-list, so usage statistics has
+ * already been updated. */
+#define DEALLOC_FLG_FIX_SHRINK    (1 << 0)
+/* Deallocation was redirected to another instance. */
+#define DEALLOC_FLG_REDIRECTED    (1 << 1)
 
 typedef struct {
     Block_t blk;
@@ -365,11 +388,10 @@ typedef struct {
 #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)
+#define ATAG_BLK_HDR_FLG 	HIGHEST_WORD_BIT
 
 #define SBC_BLK_HDR_FLG /* Special flag combo for (allocated) SBC blocks */\
     (THIS_FREE_BLK_HDR_FLG | PREV_FREE_BLK_HDR_FLG | LAST_BLK_HDR_FLG)
@@ -381,9 +403,9 @@ typedef struct {
 #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) == (THIS_FREE_BLK_HDR_FLG | LAST_BLK_HDR_FLG))
+    (((B)->bhdr & BLK_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_SBC_BLK(B) (((B)->bhdr & SBC_BLK_HDR_FLG) == SBC_BLK_HDR_FLG)
 #define IS_MBC_BLK(B) (!IS_SBC_BLK((B)))
 #define IS_FREE_BLK(B) (ASSERT(IS_MBC_BLK(B)), \
 			(B)->bhdr & THIS_FREE_BLK_HDR_FLG)
@@ -394,7 +416,8 @@ typedef struct {
 #  define ABLK_TO_MBC(B) \
     (ASSERT(IS_MBC_BLK(B) && !IS_FREE_BLK(B)), \
      (Carrier_t*)((ERTS_SACRR_UNIT_FLOOR((UWord)(B)) - \
-		  (((B)->bhdr >> MBC_ABLK_OFFSET_SHIFT) << ERTS_SACRR_UNIT_SHIFT))))
+		  ((((B)->bhdr & ~BLK_FLG_MASK) >> MBC_ABLK_OFFSET_SHIFT) \
+                      << ERTS_SACRR_UNIT_SHIFT))))
 #  define BLK_TO_MBC(B) (IS_FREE_BLK(B) ? FBLK_TO_MBC(B) : ABLK_TO_MBC(B))
 #else
 #  define FBLK_TO_MBC(B) ((B)->carrier)
@@ -433,8 +456,9 @@ typedef struct {
     ErtsThrPrgrVal thr_prgr;
     erts_atomic_t max_size;
     UWord abandon_limit;
-    UWord blocks;
-    UWord blocks_size;
+    UWord blocks[ERTS_ALC_A_MAX + 1];
+    UWord blocks_size[ERTS_ALC_A_MAX + 1];
+    UWord total_blocks_size;
     enum {
         ERTS_MBC_IS_HOME,
         ERTS_MBC_WAS_POOLED,
@@ -452,7 +476,7 @@ struct Carrier_t_ {
 };
 
 #define ERTS_ALC_CARRIER_TO_ALLCTR(C) \
-  ((Allctr_t *) (erts_atomic_read_nob(&(C)->allctr) & ~FLG_MASK))
+  ((Allctr_t *) (erts_atomic_read_nob(&(C)->allctr) & ~CRR_FLG_MASK))
 
 typedef struct {
     Carrier_t *first;
@@ -530,7 +554,6 @@ typedef struct {
     } head;
 } ErtsAllctrDDQueue_t;
 
-
 typedef struct {
     size_t type_size;
     SWord list_size;
@@ -549,6 +572,7 @@ typedef struct {
 	    UWord used;
 	} cpool;
     } u;
+    ErtsAlcType_t type;
 } ErtsAlcFixList_t;
 
 struct Allctr_t_ {
@@ -569,6 +593,9 @@ struct Allctr_t_ {
     /* Allocator number */
     ErtsAlcType_t	alloc_no;
 
+    /* Allocator strategy */
+    ErtsAlcStrat_t	alloc_strat;
+
     /* Instance index */
     int			ix;
 
@@ -617,6 +644,9 @@ struct Allctr_t_ {
 	AOFF_RBTree_t*   pooled_tree;
 	CarrierList_t	 dc_list;
 
+        /* the sentinel of the cpool we're attached to */
+        ErtsAlcCPoolData_t  *sentinel;
+
 	UWord		abandon_limit;
 	int		disable_abandon;
 	int		check_limit_count;
@@ -624,8 +654,8 @@ struct Allctr_t_ {
         UWord           in_pool_limit;    /* acnl */
         UWord           fblk_min_limit;   /* acmfl */
 	struct {
-	    erts_atomic_t	blocks_size;
-	    erts_atomic_t	no_blocks;
+	    erts_atomic_t	blocks_size[ERTS_ALC_A_MAX + 1];
+	    erts_atomic_t	no_blocks[ERTS_ALC_A_MAX + 1];
 	    erts_atomic_t	carriers_size;
 	    erts_atomic_t	no_carriers;
             CallCounter_t       fail_pooled;
@@ -657,10 +687,12 @@ struct Allctr_t_ {
     void		(*creating_mbc)		(Allctr_t *, Carrier_t *);
     void		(*destroying_mbc)	(Allctr_t *, Carrier_t *);
 
-    /* The three callbacks below are needed to support carrier migration */
+    /* The five callbacks below are needed to support carrier migration. */
     void		(*add_mbc)		(Allctr_t *, Carrier_t *);
     void		(*remove_mbc)	        (Allctr_t *, Carrier_t *);
     UWord		(*largest_fblk_in_mbc)  (Allctr_t *, Carrier_t *);
+    Block_t *           (*first_fblk_in_mbc)     (Allctr_t *, Carrier_t *);
+    Block_t *           (*next_fblk_in_mbc)      (Allctr_t *, Carrier_t *, Block_t *);
 
 #if HAVE_ERTS_MSEG
     void*               (*mseg_alloc)(Allctr_t*, Uint *size_p, Uint flags);
diff --git a/erts/emulator/beam/erl_ao_firstfit_alloc.c b/erts/emulator/beam/erl_ao_firstfit_alloc.c
index 3f0ab33597..c19d6d1b1e 100644
--- a/erts/emulator/beam/erl_ao_firstfit_alloc.c
+++ b/erts/emulator/beam/erl_ao_firstfit_alloc.c
@@ -100,16 +100,18 @@
 
 #define AOFF_BLK_SZ(B) MBC_FBLK_SZ(&(B)->hdr)
 
-#define LIST_NEXT(N) (((AOFF_RBTree_t*)(N))->u.next)
-#define LIST_PREV(N) (((AOFF_RBTree_t*)(N))->parent)
+#define AOFF_LIST_NEXT(N) (((AOFF_RBTree_t*)(N))->u.next)
+#define AOFF_LIST_PREV(N) (((AOFF_RBTree_t*)(N))->parent)
 
 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 */
-    AOFF_RBTree_t* root;        /* Root of my block tree */
+    AOFF_RBTree_t rbt_node;        /* My node in the carrier tree */
+    AOFF_RBTree_t* root;           /* Root of my block tree */
+    enum AOFFSortOrder blk_order;
 };
+
 #define RBT_NODE_TO_MBC(PTR) ErtsContainerStruct((PTR), AOFF_Carrier_t, rbt_node)
 
 /* 
@@ -152,13 +154,13 @@ static ERTS_INLINE Uint node_max_size(AOFF_RBTree_t *x)
 static ERTS_INLINE void lower_max_size(AOFF_RBTree_t *node,
 				       AOFF_RBTree_t* stop_at)
 {
-    AOFF_RBTree_t* x = node;    
+    AOFF_RBTree_t* x = node;
     Uint old_max = x->max_sz;
     Uint new_max = node_max_size(x);
 
     if (new_max < old_max) {
 	x->max_sz = new_max;
-	while ((x=x->parent) != stop_at && x->max_sz == old_max) {		
+	while ((x=x->parent) != stop_at && x->max_sz == old_max) {
 	    x->max_sz = node_max_size(x);
 	}
 	ASSERT(x == stop_at || x->max_sz > old_max);
@@ -239,6 +241,9 @@ static void aoff_add_mbc(Allctr_t*, Carrier_t*);
 static void aoff_remove_mbc(Allctr_t*, Carrier_t*);
 static UWord aoff_largest_fblk_in_mbc(Allctr_t*, Carrier_t*);
 
+static Block_t *aoff_first_fblk_in_mbc(Allctr_t *, Carrier_t *);
+static Block_t *aoff_next_fblk_in_mbc(Allctr_t *, Carrier_t *, Block_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 AOFFSortOrder, AOFF_RBTree_t** root, AOFF_RBTree_t* blk);
@@ -281,15 +286,28 @@ erts_aoffalc_start(AOFFAllctr_t *alc,
 
     sys_memcpy((void *) alc, (void *) &zero.allctr, sizeof(AOFFAllctr_t));
 
+    if (aoffinit->blk_order == FF_CHAOS) {
+        const enum AOFFSortOrder orders[3] = {FF_AOFF, FF_AOBF, FF_BF};
+        int index = init->ix % (sizeof(orders) / sizeof(orders[0]));
+
+        ASSERT(init->alloc_no == ERTS_ALC_A_TEST);
+        aoffinit->blk_order = orders[index];
+    }
+
+    if (aoffinit->crr_order == FF_CHAOS) {
+        const enum AOFFSortOrder orders[2] = {FF_AGEFF, FF_AOFF};
+        int index = init->ix % (sizeof(orders) / sizeof(orders[0]));
+
+        ASSERT(init->alloc_no == ERTS_ALC_A_TEST);
+        aoffinit->crr_order = orders[index];
+    }
+
     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->blk_order == FF_BF
-                              ? (offsetof(AOFF_RBTree_t, u.next)
-                                 + ErtsSizeofMember(AOFF_RBTree_t, u.next))
-                              : offsetof(AOFF_RBTree_t, u));
+    allctr->min_block_size              = sizeof(AOFF_RBTree_t);
 
     allctr->vsn_str			= ERTS_ALC_AOFF_ALLOC_VSN_STR;
 
@@ -311,6 +329,8 @@ erts_aoffalc_start(AOFFAllctr_t *alc,
     allctr->add_mbc                     = aoff_add_mbc;
     allctr->remove_mbc                  = aoff_remove_mbc;
     allctr->largest_fblk_in_mbc         = aoff_largest_fblk_in_mbc;
+    allctr->first_fblk_in_mbc           = aoff_first_fblk_in_mbc;
+    allctr->next_fblk_in_mbc            = aoff_next_fblk_in_mbc;
     allctr->init_atoms			= init_atoms;
 
 #ifdef ERTS_ALLOC_UTIL_HARD_DEBUG
@@ -352,7 +372,7 @@ left_rotate(AOFF_RBTree_t **root, AOFF_RBTree_t *x)
     x->parent = y;
 
     y->max_sz = x->max_sz;
-    x->max_sz = node_max_size(x); 
+    x->max_sz = node_max_size(x);
     ASSERT(y->max_sz >= x->max_sz);
 }
 
@@ -377,7 +397,7 @@ right_rotate(AOFF_RBTree_t **root, AOFF_RBTree_t *x)
     y->right = x;
     x->parent = y;
     y->max_sz = x->max_sz;
-    x->max_sz = node_max_size(x);    
+    x->max_sz = node_max_size(x);
     ASSERT(y->max_sz >= x->max_sz);
 }
 
@@ -512,51 +532,52 @@ tree_insert_fixup(AOFF_RBTree_t** root, AOFF_RBTree_t *blk)
 static void
 aoff_unlink_free_block(Allctr_t *allctr, Block_t *blk)
 {
-    AOFFAllctr_t* alc = (AOFFAllctr_t*)allctr;
     AOFF_RBTree_t* del = (AOFF_RBTree_t*)blk;
     AOFF_Carrier_t *crr = (AOFF_Carrier_t*) FBLK_TO_MBC(&del->hdr);
 
+    (void)allctr;
+
     ASSERT(crr->rbt_node.hdr.bhdr == crr->root->max_sz);
-    HARD_CHECK_TREE(&crr->crr, alc->blk_order, crr->root, 0);
+    HARD_CHECK_TREE(&crr->crr, crr->blk_order, crr->root, 0);
 
-    if (alc->blk_order == FF_BF) {
+    if (crr->blk_order == FF_BF) {
 	ASSERT(del->flags & IS_BF_FLG);
 	if (IS_LIST_ELEM(del)) {
 	    /* Remove from list */
-	    ASSERT(LIST_PREV(del));
-	    ASSERT(LIST_PREV(del)->flags & IS_BF_FLG);
-	    LIST_NEXT(LIST_PREV(del)) = LIST_NEXT(del);
-	    if (LIST_NEXT(del)) {
-		ASSERT(LIST_NEXT(del)->flags & IS_BF_FLG);
-		LIST_PREV(LIST_NEXT(del)) = LIST_PREV(del);
+	    ASSERT(AOFF_LIST_PREV(del));
+	    ASSERT(AOFF_LIST_PREV(del)->flags & IS_BF_FLG);
+	    AOFF_LIST_NEXT(AOFF_LIST_PREV(del)) = AOFF_LIST_NEXT(del);
+	    if (AOFF_LIST_NEXT(del)) {
+		ASSERT(AOFF_LIST_NEXT(del)->flags & IS_BF_FLG);
+		AOFF_LIST_PREV(AOFF_LIST_NEXT(del)) = AOFF_LIST_PREV(del);
 	    }
 	    return;
 	}
-	else if (LIST_NEXT(del)) {
+	else if (AOFF_LIST_NEXT(del)) {
 	    /* Replace tree node by next element in list... */
 	    
-	    ASSERT(AOFF_BLK_SZ(LIST_NEXT(del)) == AOFF_BLK_SZ(del));
-	    ASSERT(IS_LIST_ELEM(LIST_NEXT(del)));
-	    
-	    replace(&crr->root, (AOFF_RBTree_t*)del, LIST_NEXT(del));
-	    
-	    HARD_CHECK_TREE(&crr->crr, alc->blk_order, crr->root, 0);
+	    ASSERT(AOFF_BLK_SZ(AOFF_LIST_NEXT(del)) == AOFF_BLK_SZ(del));
+	    ASSERT(IS_LIST_ELEM(AOFF_LIST_NEXT(del)));
+
+	    replace(&crr->root, (AOFF_RBTree_t*)del, AOFF_LIST_NEXT(del));
+
+	    HARD_CHECK_TREE(&crr->crr, crr->blk_order, crr->root, 0);
 	    return;
 	}
     }
 
     rbt_delete(&crr->root, (AOFF_RBTree_t*)del);
 
-    HARD_CHECK_TREE(&crr->crr, alc->blk_order, crr->root, 0);
+    HARD_CHECK_TREE(&crr->crr, crr->blk_order, crr->root, 0);
 
     /* Update the carrier tree with a potentially new (lower) max_sz
-     */    
+     */
     if (crr->root) {
 	if (crr->rbt_node.hdr.bhdr == crr->root->max_sz) {
 	    return;
 	}
 	ASSERT(crr->rbt_node.hdr.bhdr > crr->root->max_sz);
-	crr->rbt_node.hdr.bhdr = crr->root->max_sz; 
+	crr->rbt_node.hdr.bhdr = crr->root->max_sz;
     }
     else {
 	crr->rbt_node.hdr.bhdr = 0;
@@ -737,17 +758,18 @@ rbt_delete(AOFF_RBTree_t** root, AOFF_RBTree_t* del)
 static void
 aoff_link_free_block(Allctr_t *allctr, Block_t *block)
 {
-    AOFFAllctr_t* alc = (AOFFAllctr_t*) allctr;
     AOFF_RBTree_t *blk = (AOFF_RBTree_t *) block;
     AOFF_RBTree_t *crr_node;
     AOFF_Carrier_t *blk_crr = (AOFF_Carrier_t*) FBLK_TO_MBC(block);
     Uint blk_sz = AOFF_BLK_SZ(blk);
 
+    (void)allctr;
+
     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->blk_order, blk_crr->root, 0);
+    HARD_CHECK_TREE(&blk_crr->crr, blk_crr->blk_order, blk_crr->root, 0);
 
-    rbt_insert(alc->blk_order, &blk_crr->root, blk);
+    rbt_insert(blk_crr->blk_order, &blk_crr->root, blk);
 
     /*
      * Update carrier tree with a potentially new (larger) max_sz
@@ -773,7 +795,7 @@ rbt_insert(enum AOFFSortOrder order, AOFF_RBTree_t** root, AOFF_RBTree_t* blk)
 #ifdef DEBUG
     blk->flags  = (order == FF_BF) ? IS_BF_FLG : 0;
 #else
-    blk->flags  = 0; 
+    blk->flags  = 0;
 #endif
     blk->left	= NULL;
     blk->right	= NULL;
@@ -787,7 +809,7 @@ rbt_insert(enum AOFFSortOrder order, AOFF_RBTree_t** root, AOFF_RBTree_t* blk)
     else {
 	AOFF_RBTree_t *x = *root;
 	while (1) {
-	    SWord diff; 
+	    SWord diff;
 	    if (x->max_sz < blk_sz) {
 		x->max_sz = blk_sz;
 	    }
@@ -810,14 +832,14 @@ rbt_insert(enum AOFFSortOrder order, AOFF_RBTree_t** root, AOFF_RBTree_t* blk)
 	    }
 	    else {
 		ASSERT(order == FF_BF);
-		ASSERT(blk->flags & IS_BF_FLG);			    
-		ASSERT(x->flags & IS_BF_FLG);			    
+		ASSERT(blk->flags & IS_BF_FLG);
+		ASSERT(x->flags & IS_BF_FLG);
 		SET_LIST_ELEM(blk);
-		LIST_NEXT(blk) = LIST_NEXT(x);
-		LIST_PREV(blk) = x;
-		if (LIST_NEXT(x))
-		    LIST_PREV(LIST_NEXT(x)) = blk;
-		LIST_NEXT(x) = blk;
+		AOFF_LIST_NEXT(blk) = AOFF_LIST_NEXT(x);
+		AOFF_LIST_PREV(blk) = x;
+		if (AOFF_LIST_NEXT(x))
+		    AOFF_LIST_PREV(AOFF_LIST_NEXT(x)) = blk;
+		AOFF_LIST_NEXT(x) = blk;
 		return;
 	    }
 	}
@@ -831,7 +853,7 @@ rbt_insert(enum AOFFSortOrder order, AOFF_RBTree_t** root, AOFF_RBTree_t* blk)
     }
     if (order == FF_BF) {
 	SET_TREE_NODE(blk);
-	LIST_NEXT(blk) = NULL;
+	AOFF_LIST_NEXT(blk) = NULL;
     }
 }
 
@@ -878,7 +900,7 @@ aoff_get_free_block(Allctr_t *allctr, Uint size,
 #ifdef HARD_DEBUG
     AOFF_RBTree_t* dbg_blk;
 #endif
-    
+
     ASSERT(!cand_blk || cand_size >= size);
 
     /* Get first-fit carrier
@@ -891,7 +913,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->blk_order, crr->root, size);
+    dbg_blk = HARD_CHECK_TREE(&crr->crr, crr->blk_order, crr->root, size);
 #endif
 
     blk = rbt_search(crr->root, size);
@@ -904,7 +926,7 @@ aoff_get_free_block(Allctr_t *allctr, Uint size,
     if (!blk)
 	return NULL;
 
-    if (cand_blk && cmp_cand_blk(alc->blk_order, cand_blk, blk) < 0) {
+    if (cand_blk && cmp_cand_blk(crr->blk_order, cand_blk, blk) < 0) {
 	return NULL; /* cand_blk was better */
     }
 
@@ -927,21 +949,28 @@ 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;
+    Sint64 bt = get_birth_time();
 
     HARD_CHECK_TREE(NULL, alc->crr_order, *root, 0);
 
     crr->rbt_node.hdr.bhdr = 0;
-    if (alc->crr_order == FF_AGEFF || IS_DEBUG) {
-        Sint64 bt = get_birth_time();
-        crr->rbt_node.u.birth_time = bt;
-        crr->crr.cpool.pooled.u.birth_time = bt;
-    }
+
+    /* While birth time is only used for FF_AGEFF, we have to set it for all
+     * types as we can be migrated to an instance that uses it and we don't
+     * want to mess its order up. */
+    crr->rbt_node.u.birth_time = bt;
+    crr->crr.cpool.pooled.u.birth_time = bt;
+
     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, alc->crr_order, *root, 0);
+
+    /* When a carrier has been migrated, its block order may differ from that
+     * of the allocator it's been migrated to. */
+    crr->blk_order = alc->blk_order;
 }
 
 #define IS_CRR_IN_TREE(CRR,ROOT) \
@@ -964,7 +993,7 @@ 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, alc->crr_order, *root, 0);   
+    HARD_CHECK_TREE(NULL, alc->crr_order, *root, 0);
 
     rbt_insert(alc->crr_order, root, &crr->rbt_node);
 
@@ -1034,6 +1063,62 @@ static UWord aoff_largest_fblk_in_mbc(Allctr_t* allctr, Carrier_t* carrier)
     return crr->rbt_node.hdr.bhdr;
 }
 
+static Block_t *aoff_first_fblk_in_mbc(Allctr_t *allctr, Carrier_t *carrier)
+{
+    AOFF_Carrier_t *crr = (AOFF_Carrier_t*)carrier;
+
+    (void)allctr;
+
+    if (crr->root) {
+        AOFF_RBTree_t *blk;
+
+        /* Descend to the rightmost block of the tree. */
+        for (blk = crr->root; blk->right; blk = blk->right);
+
+        return (Block_t*)blk;
+    }
+
+    return NULL;
+}
+
+static Block_t *aoff_next_fblk_in_mbc(Allctr_t *allctr, Carrier_t *carrier,
+                                      Block_t *block)
+{
+    AOFF_RBTree_t *parent, *blk;
+
+    (void)allctr;
+    (void)carrier;
+
+    blk = (AOFF_RBTree_t*)block;
+
+    if (blk->left) {
+        /* Descend to the rightmost block of the left subtree. */
+        for (blk = blk->left; blk->right; blk = blk->right);
+
+        return (Block_t*)blk;
+    }
+
+    while (blk->parent) {
+        parent = blk->parent;
+
+        /* If we ascend from the right we know we haven't visited our parent
+         * yet, because we always descend as far as we can to the right when
+         * entering a subtree. */
+        if (parent->right == blk) {
+            ASSERT(parent->left != blk);
+            return (Block_t*)parent;
+        }
+
+        /* If we ascend from the left we know we've already visited our
+         * parent, and will need to keep ascending until we do so from the
+         * right or reach the end of the tree. */
+        ASSERT(parent->left == blk);
+        blk = parent;
+    }
+
+    return NULL;
+}
+
 /*
  * info_options()
  */
@@ -1105,7 +1190,7 @@ info_options(Allctr_t *allctr,
     }
 
     if (hpp || szp) {
-	
+
 	if (!atoms_initialized)
 	    erts_exit(ERTS_ERROR_EXIT, "%s:%d: Internal error: Atoms not initialized",
 		     __FILE__, __LINE__);;
@@ -1132,7 +1217,7 @@ erts_aoffalc_test(UWord op, UWord a1, UWord a2)
     switch (op) {
     case 0x500: return (UWord) ((AOFFAllctr_t *) a1)->blk_order == FF_AOBF;
     case 0x501: {
-	AOFF_RBTree_t *node = ((AOFFAllctr_t *) a1)->mbc_root; 
+	AOFF_RBTree_t *node = ((AOFFAllctr_t *) a1)->mbc_root;
 	Uint size = (Uint) a2;
 	node = node ? rbt_search(node, size) : NULL;
 	return (UWord) (node ? RBT_NODE_TO_MBC(node)->root : NULL);
@@ -1140,13 +1225,13 @@ erts_aoffalc_test(UWord op, UWord a1, UWord a2)
     case 0x502:	return (UWord) ((AOFF_RBTree_t *) a1)->parent;
     case 0x503:	return (UWord) ((AOFF_RBTree_t *) a1)->left;
     case 0x504:	return (UWord) ((AOFF_RBTree_t *) a1)->right;
-    case 0x505:	return (UWord) LIST_NEXT(a1);
+    case 0x505:	return (UWord) AOFF_LIST_NEXT(a1);
     case 0x506:	return (UWord) IS_BLACK((AOFF_RBTree_t *) a1);
     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)->blk_order == FF_BF;
-    case 0x50b:	return (UWord) LIST_PREV(a1);
+    case 0x50b:	return (UWord) AOFF_LIST_PREV(a1);
     default:	ASSERT(0); return ~((UWord) 0);
     }
 }
@@ -1166,7 +1251,7 @@ static int rbt_is_member(AOFF_RBTree_t* root, AOFF_RBTree_t* node)
             return 0;
         }
 	node = node->parent;
-    }    
+    }
     return 1;
 }
 
@@ -1279,15 +1364,15 @@ check_tree(Carrier_t* within_crr, enum AOFFSortOrder order, AOFF_RBTree_t* root,
 	}
 	if (order == FF_BF) {
 	    AOFF_RBTree_t* y = x;
-	    AOFF_RBTree_t* nxt = LIST_NEXT(y);
+	    AOFF_RBTree_t* nxt = AOFF_LIST_NEXT(y);
 	    ASSERT(IS_TREE_NODE(x));
 	    while (nxt) {
 		ASSERT(IS_LIST_ELEM(nxt));
 		ASSERT(AOFF_BLK_SZ(nxt) == AOFF_BLK_SZ(x));
 		ASSERT(FBLK_TO_MBC(&nxt->hdr) == within_crr);
-		ASSERT(LIST_PREV(nxt) == y);
+		ASSERT(AOFF_LIST_PREV(nxt) == y);
 		y = nxt;
-		nxt = LIST_NEXT(nxt);
+		nxt = AOFF_LIST_NEXT(nxt);
 	    }
 	}
 
@@ -1301,13 +1386,13 @@ check_tree(Carrier_t* within_crr, enum AOFFSortOrder order, AOFF_RBTree_t* root,
 	if (x->left) {
 	    ASSERT(x->left->parent == x);
 	    ASSERT(cmp_blocks(order, x->left, x) < 0);
-	    ASSERT(x->left->max_sz <= x->max_sz);	    
+	    ASSERT(x->left->max_sz <= x->max_sz);
 	}
 
 	if (x->right) {
 	    ASSERT(x->right->parent == x);
 	    ASSERT(cmp_blocks(order, x->right, x) > 0);
-	    ASSERT(x->right->max_sz <= x->max_sz);	    
+	    ASSERT(x->right->max_sz <= x->max_sz);
 	}
 	ASSERT(x->max_sz >= AOFF_BLK_SZ(x));
 	ASSERT(x->max_sz == AOFF_BLK_SZ(x)
@@ -1327,7 +1412,7 @@ check_tree(Carrier_t* within_crr, enum AOFFSortOrder order, AOFF_RBTree_t* root,
 	x = x->parent;
 	--depth;
     }
-    ASSERT(depth == 0 || (!root && depth==1)); 
+    ASSERT(depth == 0 || (!root && depth==1));
     ASSERT(curr_blacks == 0);
     ASSERT((1 << (max_depth/2)) <= node_cnt);
 
@@ -1373,4 +1458,3 @@ print_tree(AOFF_RBTree_t* root)
 #endif /* PRINT_TREE */
 
 #endif /* HARD_DEBUG */
-
diff --git a/erts/emulator/beam/erl_ao_firstfit_alloc.h b/erts/emulator/beam/erl_ao_firstfit_alloc.h
index 68df9e0a49..9c9b98da86 100644
--- a/erts/emulator/beam/erl_ao_firstfit_alloc.h
+++ b/erts/emulator/beam/erl_ao_firstfit_alloc.h
@@ -32,7 +32,12 @@ enum AOFFSortOrder {
     FF_AGEFF = 0,    /* carrier trees only */
     FF_AOFF  = 1,
     FF_AOBF  = 2,    /* block trees only */
-    FF_BF    = 3     /* block trees only */
+    FF_BF    = 3,    /* block trees only */
+
+    FF_CHAOS = -1    /* A test-specific sort order that picks any of the above
+                      * after instance id. Used to test that carriers created
+                      * under one order will work fine after being migrated
+                      * to another. */
 };
 
 typedef struct {
diff --git a/erts/emulator/beam/erl_arith.c b/erts/emulator/beam/erl_arith.c
index 144fb56ea5..68d1cd989e 100644
--- a/erts/emulator/beam/erl_arith.c
+++ b/erts/emulator/beam/erl_arith.c
@@ -52,19 +52,11 @@ static ERTS_INLINE void maybe_shrink(Process* p, Eterm* hp, Eterm res, Uint allo
     Uint actual;
 
     if (is_immed(res)) {
-	if (p->heap <= hp && hp < p->htop) {
-	    p->htop = hp;
-	}
-	else {
-	    erts_heap_frag_shrink(p, hp);
-	}
+        ASSERT(!(p->heap <= hp && hp < p->htop));
+        erts_heap_frag_shrink(p, hp);
     } else if ((actual = bignum_header_arity(*hp)+1) < alloc) {
-	if (p->heap <= hp && hp < p->htop) {
-	    p->htop = hp+actual;
-	}
-	else {
-	    erts_heap_frag_shrink(p, hp+actual);
-	}
+        ASSERT(!(p->heap <= hp && hp < p->htop));
+        erts_heap_frag_shrink(p, hp+actual);
     }
 }
 
@@ -246,7 +238,7 @@ shift(Process* p, Eterm arg1, Eterm arg2, int right)
 		    BIF_ERROR(p, SYSTEM_LIMIT);
 		}
 		need = BIG_NEED_SIZE(ires+1);
-		bigp = HAlloc(p, need);
+		bigp = HeapFragOnlyAlloc(p, need);
 		arg1 = big_lshift(arg1, i, bigp);
 		maybe_shrink(p, bigp, arg1, need);
 		if (is_nil(arg1)) {
@@ -298,7 +290,7 @@ BIF_RETTYPE bnot_1(BIF_ALIST_1)
 	ret = make_small(~signed_val(BIF_ARG_1));
     } else if (is_big(BIF_ARG_1)) {
 	Uint need = BIG_NEED_SIZE(big_size(BIF_ARG_1)+1);
-	Eterm* bigp = HAlloc(BIF_P, need);
+	Eterm* bigp = HeapFragOnlyAlloc(BIF_P, need);
 
 	ret = big_bnot(BIF_ARG_1, bigp);
 	maybe_shrink(BIF_P, bigp, ret, need);
@@ -343,7 +335,7 @@ erts_mixed_plus(Process* p, Eterm arg1, Eterm arg2)
 		    if (IS_SSMALL(ires)) {
 			return make_small(ires);
 		    } else {
-			hp = HAlloc(p, 2);
+			hp = HeapFragOnlyAlloc(p, 2);
 			res = small_to_big(ires, hp);
 			return res;
 		    }
@@ -400,7 +392,7 @@ erts_mixed_plus(Process* p, Eterm arg1, Eterm arg2)
 		    sz2 = big_size(arg2);
 		    sz = MAX(sz1, sz2)+1;
 		    need_heap = BIG_NEED_SIZE(sz);
-		    hp = HAlloc(p, need_heap);
+		    hp = HeapFragOnlyAlloc(p, need_heap);
 		    res = big_plus(arg1, arg2, hp);
 		    maybe_shrink(p, hp, res, need_heap);
 		    if (is_nil(res)) {
@@ -446,7 +438,7 @@ erts_mixed_plus(Process* p, Eterm arg1, Eterm arg2)
 		do_float:
 		    f1.fd = f1.fd + f2.fd;
 		    ERTS_FP_ERROR(p, f1.fd, goto badarith);
-		    hp = HAlloc(p, FLOAT_SIZE_OBJECT);
+		    hp = HeapFragOnlyAlloc(p, FLOAT_SIZE_OBJECT);
 		    res = make_float(hp);
 		    PUT_DOUBLE(f1, hp);
 		    return res;
@@ -488,7 +480,7 @@ erts_mixed_minus(Process* p, Eterm arg1, Eterm arg2)
 		    if (IS_SSMALL(ires)) {
 			return make_small(ires);
 		    } else {
-			hp = HAlloc(p, 2);
+			hp = HeapFragOnlyAlloc(p, 2);
 			res = small_to_big(ires, hp);
 			return res;
 		    }
@@ -534,7 +526,7 @@ erts_mixed_minus(Process* p, Eterm arg1, Eterm arg2)
 		    sz2 = big_size(arg2);
 		    sz = MAX(sz1, sz2)+1;
 		    need_heap = BIG_NEED_SIZE(sz);
-		    hp = HAlloc(p, need_heap);
+		    hp = HeapFragOnlyAlloc(p, need_heap);
 		    res = big_minus(arg1, arg2, hp);
                     maybe_shrink(p, hp, res, need_heap);
 		    if (is_nil(res)) {
@@ -589,7 +581,7 @@ erts_mixed_minus(Process* p, Eterm arg1, Eterm arg2)
 		do_float:
 		    f1.fd = f1.fd - f2.fd;
 		    ERTS_FP_ERROR(p, f1.fd, goto badarith);
-		    hp = HAlloc(p, FLOAT_SIZE_OBJECT);
+		    hp = HeapFragOnlyAlloc(p, FLOAT_SIZE_OBJECT);
 		    res = make_float(hp);
 		    PUT_DOUBLE(f1, hp);
 		    return res;
@@ -657,7 +649,7 @@ erts_mixed_times(Process* p, Eterm arg1, Eterm arg2)
 			    hdr = big_res[0];
 			    arity = bignum_header_arity(hdr);
 			    ASSERT(arity == 1 || arity == 2);
-			    hp = HAlloc(p, arity+1);
+			    hp = HeapFragOnlyAlloc(p, arity+1);
 			    res = make_big(hp);
 			    *hp++ = hdr;
 			    *hp++ = big_res[1];
@@ -726,7 +718,7 @@ erts_mixed_times(Process* p, Eterm arg1, Eterm arg2)
 
 		do_big:
 		    need_heap = BIG_NEED_SIZE(sz);
-                    hp = HAlloc(p, need_heap);
+                    hp = HeapFragOnlyAlloc(p, need_heap);
 		    res = big_times(arg1, arg2, hp);
 
 		    /*
@@ -779,7 +771,7 @@ erts_mixed_times(Process* p, Eterm arg1, Eterm arg2)
 		do_float:
 		    f1.fd = f1.fd * f2.fd;
 		    ERTS_FP_ERROR(p, f1.fd, goto badarith);
-		    hp = HAlloc(p, FLOAT_SIZE_OBJECT);
+		    hp = HeapFragOnlyAlloc(p, FLOAT_SIZE_OBJECT);
 		    res = make_float(hp);
 		    PUT_DOUBLE(f1, hp);
 		    return res;
@@ -905,7 +897,7 @@ erts_mixed_div(Process* p, Eterm arg1, Eterm arg2)
 		do_float:
 		    f1.fd = f1.fd / f2.fd;
 		    ERTS_FP_ERROR(p, f1.fd, goto badarith);
-		    hp = HAlloc(p, FLOAT_SIZE_OBJECT);
+		    hp = HeapFragOnlyAlloc(p, FLOAT_SIZE_OBJECT);
 		    PUT_DOUBLE(f1, hp);
 		    return make_float(hp);
 		default:
@@ -957,7 +949,7 @@ erts_int_div(Process* p, Eterm arg1, Eterm arg2)
 
 	    ires = big_size(arg2);
 	    need = BIG_NEED_SIZE(i-ires+1) + BIG_NEED_SIZE(i);
-	    hp = HAlloc(p, need);
+	    hp = HeapFragOnlyAlloc(p, need);
 	    arg1 = big_div(arg1, arg2, hp);
 	    maybe_shrink(p, hp, arg1, need);
 	    if (is_nil(arg1)) {
@@ -1004,7 +996,7 @@ erts_int_rem(Process* p, Eterm arg1, Eterm arg2)
 	    arg1 = SMALL_ZERO;
 	} else if (ires > 0) {
 	    Uint need = BIG_NEED_SIZE(big_size(arg1));
-	    Eterm* hp = HAlloc(p, need);
+	    Eterm* hp = HeapFragOnlyAlloc(p, need);
 
 	    arg1 = big_rem(arg1, arg2, hp);
 	    maybe_shrink(p, hp, arg1, need);
@@ -1041,7 +1033,7 @@ Eterm erts_band(Process* p, Eterm arg1, Eterm arg2)
 	return THE_NON_VALUE;
     }
     need = BIG_NEED_SIZE(MAX(big_size(arg1), big_size(arg2)) + 1);
-    hp = HAlloc(p, need);
+    hp = HeapFragOnlyAlloc(p, need);
     arg1 = big_band(arg1, arg2, hp);
     ASSERT(is_not_nil(arg1));
     maybe_shrink(p, hp, arg1, need);
@@ -1069,7 +1061,7 @@ Eterm erts_bor(Process* p, Eterm arg1, Eterm arg2)
 	return THE_NON_VALUE;
     }
     need = BIG_NEED_SIZE(MAX(big_size(arg1), big_size(arg2)) + 1);
-    hp = HAlloc(p, need);
+    hp = HeapFragOnlyAlloc(p, need);
     arg1 = big_bor(arg1, arg2, hp);
     ASSERT(is_not_nil(arg1));
     maybe_shrink(p, hp, arg1, need);
@@ -1097,7 +1089,7 @@ Eterm erts_bxor(Process* p, Eterm arg1, Eterm arg2)
 	return THE_NON_VALUE;
     }
     need = BIG_NEED_SIZE(MAX(big_size(arg1), big_size(arg2)) + 1);
-    hp = HAlloc(p, need);
+    hp = HeapFragOnlyAlloc(p, need);
     arg1 = big_bxor(arg1, arg2, hp);
     ASSERT(is_not_nil(arg1));
     maybe_shrink(p, hp, arg1, need);
@@ -1110,7 +1102,7 @@ Eterm erts_bnot(Process* p, Eterm arg)
 
     if (is_big(arg)) {
 	Uint need = BIG_NEED_SIZE(big_size(arg)+1);
-	Eterm* bigp = HAlloc(p, need);
+	Eterm* bigp = HeapFragOnlyAlloc(p, need);
 
 	ret = big_bnot(arg, bigp);
 	maybe_shrink(p, bigp, ret, need);
@@ -1125,924 +1117,6 @@ Eterm erts_bnot(Process* p, Eterm arg)
     return ret;
 } 
 
-#define ERTS_NEED_GC(p, need) ((HEAP_LIMIT((p)) - HEAP_TOP((p))) <= (need))
-
-static ERTS_INLINE void
-trim_heap(Process* p, Eterm* hp, Eterm res)
-{
-    if (is_immed(res)) {
-	ASSERT(p->heap <= hp && hp <= p->htop);
-	p->htop = hp;
-    } else {
-	Eterm* new_htop;
-	ASSERT(is_big(res));
-	new_htop = hp + bignum_header_arity(*hp) + 1;
-	ASSERT(p->heap <= new_htop && new_htop <= p->htop);
-	p->htop = new_htop;
-    }
-    ASSERT(p->heap <= p->htop && p->htop <= p->stop);
-}
-
-/*
- * The functions that follow are called from the emulator loop.
- * They are not allowed to allocate heap fragments, but must do
- * a garbage collection if there is insufficient heap space.
- */
-
-#define erts_heap_frag_shrink horrible error
-#define maybe_shrink horrible error
-
-Eterm
-erts_gc_mixed_plus(Process* p, Eterm* reg, Uint live)
-{
-    Eterm arg1;
-    Eterm arg2;
-    DECLARE_TMP(tmp_big1,0,p);
-    DECLARE_TMP(tmp_big2,1,p);
-    Eterm res;
-    Eterm hdr;
-    FloatDef f1, f2;
-    dsize_t sz1, sz2, sz;
-    int need_heap;
-    Eterm* hp;
-    Sint ires;
-
-    arg1 = reg[live];
-    arg2 = reg[live+1];
-    ERTS_FP_CHECK_INIT(p);
-    switch (arg1 & _TAG_PRIMARY_MASK) {
-    case TAG_PRIMARY_IMMED1:
-	switch ((arg1 & _TAG_IMMED1_MASK) >> _TAG_PRIMARY_SIZE) {
-	case (_TAG_IMMED1_SMALL >> _TAG_PRIMARY_SIZE):
-	    switch (arg2 & _TAG_PRIMARY_MASK) {
-	    case TAG_PRIMARY_IMMED1:
-		switch ((arg2 & _TAG_IMMED1_MASK) >> _TAG_PRIMARY_SIZE) {
-		case (_TAG_IMMED1_SMALL >> _TAG_PRIMARY_SIZE):
-		    ires = signed_val(arg1) + signed_val(arg2);
-		    if (IS_SSMALL(ires)) {
-			return make_small(ires);
-		    } else {
-			if (ERTS_NEED_GC(p, 2)) {
-			    erts_garbage_collect(p, 2, reg, live);
-			}
-			hp = p->htop;
-			p->htop += 2;
-			res = small_to_big(ires, hp);
-			return res;
-		    }
-		default:
-		badarith:
-		    p->freason = BADARITH;
-		    return THE_NON_VALUE;
-		}
-	    case TAG_PRIMARY_BOXED:
-		hdr = *boxed_val(arg2);
-		switch ((hdr & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE) {
-		case (_TAG_HEADER_POS_BIG >> _TAG_PRIMARY_SIZE):
-		case (_TAG_HEADER_NEG_BIG >> _TAG_PRIMARY_SIZE):
-		    if (arg1 == SMALL_ZERO) {
-			return arg2;
-		    }
-		    arg1 = small_to_big(signed_val(arg1), tmp_big1);
-		    goto do_big;
-		case (_TAG_HEADER_FLOAT >> _TAG_PRIMARY_SIZE):
-		    f1.fd = signed_val(arg1);
-		    GET_DOUBLE(arg2, f2);
-		    goto do_float;
-		default:
-		    goto badarith;
-		}
-	    }
-	default:
-	    goto badarith;
-	}
-    case TAG_PRIMARY_BOXED:
-	hdr = *boxed_val(arg1);
-	switch ((hdr & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE) {
-	case (_TAG_HEADER_POS_BIG >> _TAG_PRIMARY_SIZE):
-	case (_TAG_HEADER_NEG_BIG >> _TAG_PRIMARY_SIZE):
-	    switch (arg2 & _TAG_PRIMARY_MASK) {
-	    case (_TAG_IMMED1_SMALL >> _TAG_PRIMARY_SIZE):
-		switch ((arg2 & _TAG_IMMED1_MASK) >> _TAG_PRIMARY_SIZE) {
-		case (_TAG_IMMED1_SMALL >> _TAG_PRIMARY_SIZE):
-		    if (arg2 == SMALL_ZERO) {
-			return arg1;
-		    }
-		    arg2 = small_to_big(signed_val(arg2), tmp_big2);
-		    goto do_big;
-		default:
-		    goto badarith;
-		}
-	    case TAG_PRIMARY_BOXED:
-		hdr = *boxed_val(arg2);
-		switch ((hdr & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE) {
-		case (_TAG_HEADER_POS_BIG >> _TAG_PRIMARY_SIZE):
-		case (_TAG_HEADER_NEG_BIG >> _TAG_PRIMARY_SIZE):
-		do_big:
-		    sz1 = big_size(arg1);
-		    sz2 = big_size(arg2);
-		    sz = MAX(sz1, sz2)+1;
-		    need_heap = BIG_NEED_SIZE(sz);
-		    if (ERTS_NEED_GC(p, need_heap)) {
-			erts_garbage_collect(p, need_heap, reg, live+2);
-			if (ARG_IS_NOT_TMP(arg1,tmp_big1)) {
-			    arg1 = reg[live];
-			}
-			if (ARG_IS_NOT_TMP(arg2,tmp_big2)) {
-			    arg2 = reg[live+1];
-			}
-		    }
-		    hp = p->htop;
-		    p->htop += need_heap;
-		    res = big_plus(arg1, arg2, hp);
-		    trim_heap(p, hp, res);
-		    if (is_nil(res)) {
-			p->freason = SYSTEM_LIMIT;
-			return THE_NON_VALUE;
-		    }
-		    return res;
-		case (_TAG_HEADER_FLOAT >> _TAG_PRIMARY_SIZE):
-		    if (big_to_double(arg1, &f1.fd) < 0) {
-			goto badarith;
-		    }
-		    GET_DOUBLE(arg2, f2);
-		    goto do_float;
-		default:
-		    goto badarith;
-		}
-	    }
-	case (_TAG_HEADER_FLOAT >> _TAG_PRIMARY_SIZE):
-	    switch (arg2 & _TAG_PRIMARY_MASK) {
-	    case TAG_PRIMARY_IMMED1:
-		switch ((arg2 & _TAG_IMMED1_MASK) >> _TAG_PRIMARY_SIZE) {
-		case (_TAG_IMMED1_SMALL >> _TAG_PRIMARY_SIZE):
-		    GET_DOUBLE(arg1, f1);
-		    f2.fd = signed_val(arg2);
-		    goto do_float;
-		default:
-		    goto badarith;
-		}
-	    case TAG_PRIMARY_BOXED:
-		hdr = *boxed_val(arg2);
-		switch ((hdr & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE) {
-		case (_TAG_HEADER_POS_BIG >> _TAG_PRIMARY_SIZE):
-		case (_TAG_HEADER_NEG_BIG >> _TAG_PRIMARY_SIZE):
-		    GET_DOUBLE(arg1, f1);
-		    if (big_to_double(arg2, &f2.fd) < 0) {
-			goto badarith;
-		    }
-		    goto do_float;
-		case (_TAG_HEADER_FLOAT >> _TAG_PRIMARY_SIZE):
-		    GET_DOUBLE(arg1, f1);
-		    GET_DOUBLE(arg2, f2);
-
-		do_float:
-		    f1.fd = f1.fd + f2.fd;
-		    ERTS_FP_ERROR(p, f1.fd, goto badarith);
-		    if (ERTS_NEED_GC(p, FLOAT_SIZE_OBJECT)) {
-			erts_garbage_collect(p, FLOAT_SIZE_OBJECT, reg, live);
-		    }
-		    hp = p->htop;
-		    p->htop += FLOAT_SIZE_OBJECT;
-		    res = make_float(hp);
-		    PUT_DOUBLE(f1, hp);
-		    return res;
-		default:
-		    goto badarith;
-		}
-	    default:
-		goto badarith;
-	    }
-	}
-    default:
-	goto badarith;
-    }
-}
-
-Eterm
-erts_gc_mixed_minus(Process* p, Eterm* reg, Uint live)
-{
-    Eterm arg1;
-    Eterm arg2;
-    DECLARE_TMP(tmp_big1,0,p);
-    DECLARE_TMP(tmp_big2,1,p);
-    Eterm hdr;
-    Eterm res;
-    FloatDef f1, f2;
-    dsize_t sz1, sz2, sz;
-    int need_heap;
-    Eterm* hp;
-    Sint ires;
-
-    arg1 = reg[live];
-    arg2 = reg[live+1];
-    ERTS_FP_CHECK_INIT(p);
-    switch (arg1 & _TAG_PRIMARY_MASK) {
-    case TAG_PRIMARY_IMMED1:
-	switch ((arg1 & _TAG_IMMED1_MASK) >> _TAG_PRIMARY_SIZE) {
-	case (_TAG_IMMED1_SMALL >> _TAG_PRIMARY_SIZE):
-	    switch (arg2 & _TAG_PRIMARY_MASK) {
-	    case TAG_PRIMARY_IMMED1:
-		switch ((arg2 & _TAG_IMMED1_MASK) >> _TAG_PRIMARY_SIZE) {
-		case (_TAG_IMMED1_SMALL >> _TAG_PRIMARY_SIZE):
-		    ires = signed_val(arg1) - signed_val(arg2);
-		    if (IS_SSMALL(ires)) {
-			return make_small(ires);
-		    } else {
-			if (ERTS_NEED_GC(p, 2)) {
-			    erts_garbage_collect(p, 2, reg, live);
-			}
-			hp = p->htop;
-			p->htop += 2;
-			res = small_to_big(ires, hp);
-			return res;
-		    }
-		default:
-		badarith:
-		    p->freason = BADARITH;
-		    return THE_NON_VALUE;
-		}
-	    case TAG_PRIMARY_BOXED:
-		hdr = *boxed_val(arg2);
-		switch ((hdr & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE) {
-		case (_TAG_HEADER_POS_BIG >> _TAG_PRIMARY_SIZE):
-		case (_TAG_HEADER_NEG_BIG >> _TAG_PRIMARY_SIZE):
-		    arg1 = small_to_big(signed_val(arg1), tmp_big1);
-		    goto do_big;
-		case (_TAG_HEADER_FLOAT >> _TAG_PRIMARY_SIZE):
-		    f1.fd = signed_val(arg1);
-		    GET_DOUBLE(arg2, f2);
-		    goto do_float;
-		default:
-		    goto badarith;
-		}
-	    }
-	default:
-	    goto badarith;
-	}
-    case TAG_PRIMARY_BOXED:
-	hdr = *boxed_val(arg1);
-	switch ((hdr & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE) {
-	case (_TAG_HEADER_POS_BIG >> _TAG_PRIMARY_SIZE):
-	case (_TAG_HEADER_NEG_BIG >> _TAG_PRIMARY_SIZE):
-	    switch (arg2 & _TAG_PRIMARY_MASK) {
-	    case (_TAG_IMMED1_SMALL >> _TAG_PRIMARY_SIZE):
-		switch ((arg2 & _TAG_IMMED1_MASK) >> _TAG_PRIMARY_SIZE) {
-		case (_TAG_IMMED1_SMALL >> _TAG_PRIMARY_SIZE):
-		    if (arg2 == SMALL_ZERO) {
-			return arg1;
-		    }
-		    arg2 = small_to_big(signed_val(arg2), tmp_big2);
-
-		do_big:
-		    sz1 = big_size(arg1);
-		    sz2 = big_size(arg2);
-		    sz = MAX(sz1, sz2)+1;
-		    need_heap = BIG_NEED_SIZE(sz);
-		    if (ERTS_NEED_GC(p, need_heap)) {
-			erts_garbage_collect(p, need_heap, reg, live+2);
-			if (ARG_IS_NOT_TMP(arg1,tmp_big1)) {
-			    arg1 = reg[live];
-			}
-			if (ARG_IS_NOT_TMP(arg2,tmp_big2)) {
-			    arg2 = reg[live+1];
-			}
-		    }
-		    hp = p->htop;
-		    p->htop += need_heap;
-		    res = big_minus(arg1, arg2, hp);
-                    trim_heap(p, hp, res);
-		    if (is_nil(res)) {
-			p->freason = SYSTEM_LIMIT;
-			return THE_NON_VALUE;
-		    }
-		    return res;
-		default:
-		    goto badarith;
-		}
-	    case TAG_PRIMARY_BOXED:
-		hdr = *boxed_val(arg2);
-		switch ((hdr & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE) {
-		case (_TAG_HEADER_POS_BIG >> _TAG_PRIMARY_SIZE):
-		case (_TAG_HEADER_NEG_BIG >> _TAG_PRIMARY_SIZE):
-		    goto do_big;
-		case (_TAG_HEADER_FLOAT >> _TAG_PRIMARY_SIZE):
-		    if (big_to_double(arg1, &f1.fd) < 0) {
-			goto badarith;
-		    }
-		    GET_DOUBLE(arg2, f2);
-		    goto do_float;
-		default:
-		    goto badarith;
-		}
-	    }
-	case (_TAG_HEADER_FLOAT >> _TAG_PRIMARY_SIZE):
-	    switch (arg2 & _TAG_PRIMARY_MASK) {
-	    case TAG_PRIMARY_IMMED1:
-		switch ((arg2 & _TAG_IMMED1_MASK) >> _TAG_PRIMARY_SIZE) {
-		case (_TAG_IMMED1_SMALL >> _TAG_PRIMARY_SIZE):
-		    GET_DOUBLE(arg1, f1);
-		    f2.fd = signed_val(arg2);
-		    goto do_float;
-		default:
-		    goto badarith;
-		}
-	    case TAG_PRIMARY_BOXED:
-		hdr = *boxed_val(arg2);
-		switch ((hdr & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE) {
-		case (_TAG_HEADER_POS_BIG >> _TAG_PRIMARY_SIZE):
-		case (_TAG_HEADER_NEG_BIG >> _TAG_PRIMARY_SIZE):
-		    GET_DOUBLE(arg1, f1);
-		    if (big_to_double(arg2, &f2.fd) < 0) {
-			goto badarith;
-		    }
-		    goto do_float;
-		case (_TAG_HEADER_FLOAT >> _TAG_PRIMARY_SIZE):
-		    GET_DOUBLE(arg1, f1);
-		    GET_DOUBLE(arg2, f2);
-
-		do_float:
-		    f1.fd = f1.fd - f2.fd;
-		    ERTS_FP_ERROR(p, f1.fd, goto badarith);
-		    if (ERTS_NEED_GC(p, FLOAT_SIZE_OBJECT)) {
-			erts_garbage_collect(p, FLOAT_SIZE_OBJECT, reg, live);
-		    }
-		    hp = p->htop;
-		    p->htop += FLOAT_SIZE_OBJECT;
-		    res = make_float(hp);
-		    PUT_DOUBLE(f1, hp);
-		    return res;
-		default:
-		    goto badarith;
-		}
-	    default:
-		goto badarith;
-	    }
-	}
-    default:
-	goto badarith;
-    }
-}
-
-Eterm
-erts_gc_mixed_times(Process* p, Eterm* reg, Uint live)
-{
-    Eterm arg1;
-    Eterm arg2;
-    DECLARE_TMP(tmp_big1,0,p);
-    DECLARE_TMP(tmp_big2,1,p);
-    Eterm hdr;
-    Eterm res;
-    FloatDef f1, f2;
-    dsize_t sz1, sz2, sz;
-    int need_heap;
-    Eterm* hp;
-
-    arg1 = reg[live];
-    arg2 = reg[live+1];
-    ERTS_FP_CHECK_INIT(p);
-    switch (arg1 & _TAG_PRIMARY_MASK) {
-    case TAG_PRIMARY_IMMED1:
-	switch ((arg1 & _TAG_IMMED1_MASK) >> _TAG_PRIMARY_SIZE) {
-	case (_TAG_IMMED1_SMALL >> _TAG_PRIMARY_SIZE):
-	    switch (arg2 & _TAG_PRIMARY_MASK) {
-	    case TAG_PRIMARY_IMMED1:
-		switch ((arg2 & _TAG_IMMED1_MASK) >> _TAG_PRIMARY_SIZE) {
-		case (_TAG_IMMED1_SMALL >> _TAG_PRIMARY_SIZE):
-		    if ((arg1 == SMALL_ZERO) || (arg2 == SMALL_ZERO)) {
-			return(SMALL_ZERO);
-		    } else if (arg1 == SMALL_ONE) {
-			return(arg2);
-		    } else if (arg2 == SMALL_ONE) {
-			return(arg1);
-		    } else {
-			DeclareTmpHeap(big_res,3,p);
-			UseTmpHeap(3,p);
-
-			/*
-			 * The following code is optimized for the case that
-			 * result is small (which should be the most common case
-			 * in practice).
-			 */
-			res = small_times(signed_val(arg1), signed_val(arg2),
-					  big_res);
-			if (is_small(res)) {
-			    UnUseTmpHeap(3,p);
-			    return res;
-			} else {
-			    /*
-			     * The result is a a big number.
-			     * Allocate a heap fragment and copy the result.
-			     * Be careful to allocate exactly what we need
-			     * to not leave any holes.
-			     */
-			    Uint arity;
-			    Uint need;
-			    
-			    ASSERT(is_big(res));
-			    hdr = big_res[0];
-			    arity = bignum_header_arity(hdr);
-			    ASSERT(arity == 1 || arity == 2);
-			    need = arity + 1;
-			    if (ERTS_NEED_GC(p, need)) {
-				erts_garbage_collect(p, need, reg, live);
-			    }
-			    hp = p->htop;
-			    p->htop += need;
-			    res = make_big(hp);
-			    *hp++ = hdr;
-			    *hp++ = big_res[1];
-			    if (arity > 1) {
-				*hp = big_res[2];
-			    }
-			    UnUseTmpHeap(3,p);
-			    return res;
-			}
-		    }
-		default:
-		badarith:
-		    p->freason = BADARITH;
-		    return THE_NON_VALUE;
-		}
-	    case TAG_PRIMARY_BOXED:
-		hdr = *boxed_val(arg2);
-		switch ((hdr & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE) {
-		case (_TAG_HEADER_POS_BIG >> _TAG_PRIMARY_SIZE):
-		case (_TAG_HEADER_NEG_BIG >> _TAG_PRIMARY_SIZE):
-		    if (arg1 == SMALL_ZERO)
-			return(SMALL_ZERO);
-		    if (arg1 == SMALL_ONE)
-			return(arg2);
-		    arg1 = small_to_big(signed_val(arg1), tmp_big1);
-		    sz = 2 + big_size(arg2);
-		    goto do_big;
-		case (_TAG_HEADER_FLOAT >> _TAG_PRIMARY_SIZE):
-		    f1.fd = signed_val(arg1);
-		    GET_DOUBLE(arg2, f2);
-		    goto do_float;
-		default:
-		    goto badarith;
-		}
-	    }
-	default:
-	    goto badarith;
-	}
-    case TAG_PRIMARY_BOXED:
-	hdr = *boxed_val(arg1);
-	switch ((hdr & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE) {
-	case (_TAG_HEADER_POS_BIG >> _TAG_PRIMARY_SIZE):
-	case (_TAG_HEADER_NEG_BIG >> _TAG_PRIMARY_SIZE):
-	    switch (arg2 & _TAG_PRIMARY_MASK) {
-	    case (_TAG_IMMED1_SMALL >> _TAG_PRIMARY_SIZE):
-		switch ((arg2 & _TAG_IMMED1_MASK) >> _TAG_PRIMARY_SIZE) {
-		case (_TAG_IMMED1_SMALL >> _TAG_PRIMARY_SIZE):
-		    if (arg2 == SMALL_ZERO)
-			return(SMALL_ZERO);
-		    if (arg2 == SMALL_ONE)
-			return(arg1);
-		    arg2 = small_to_big(signed_val(arg2), tmp_big2);
-		    sz = 2 + big_size(arg1);
-		    goto do_big;
-		default:
-		    goto badarith;
-		}
-	    case TAG_PRIMARY_BOXED:
-		hdr = *boxed_val(arg2);
-		switch ((hdr & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE) {
-		case (_TAG_HEADER_POS_BIG >> _TAG_PRIMARY_SIZE):
-		case (_TAG_HEADER_NEG_BIG >> _TAG_PRIMARY_SIZE):
-		    sz1 = big_size(arg1);
-		    sz2 = big_size(arg2);
-		    sz = sz1 + sz2;
-
-		do_big:
-		    need_heap = BIG_NEED_SIZE(sz);
-		    if (ERTS_NEED_GC(p, need_heap)) {
-			erts_garbage_collect(p, need_heap, reg, live+2);
-			if (ARG_IS_NOT_TMP(arg1,tmp_big1)) {
-			    arg1 = reg[live];
-			}
-			if (ARG_IS_NOT_TMP(arg2,tmp_big2)) {
-			    arg2 = reg[live+1];
-			}
-		    }
-		    hp = p->htop;
-		    p->htop += need_heap;
-		    res = big_times(arg1, arg2, hp);
-		    trim_heap(p, hp, res);
-
-		    /*
-		     * Note that the result must be big in this case, since
-		     * at least one operand was big to begin with, and
-		     * the absolute value of the other is > 1.
-		     */
-
-		    if (is_nil(res)) {
-			p->freason = SYSTEM_LIMIT;
-			return THE_NON_VALUE;
-		    }
-		    return res;
-		case (_TAG_HEADER_FLOAT >> _TAG_PRIMARY_SIZE):
-		    if (big_to_double(arg1, &f1.fd) < 0) {
-			goto badarith;
-		    }
-		    GET_DOUBLE(arg2, f2);
-		    goto do_float;
-		default:
-		    goto badarith;
-		}
-	    }
-	case (_TAG_HEADER_FLOAT >> _TAG_PRIMARY_SIZE):
-	    switch (arg2 & _TAG_PRIMARY_MASK) {
-	    case TAG_PRIMARY_IMMED1:
-		switch ((arg2 & _TAG_IMMED1_MASK) >> _TAG_PRIMARY_SIZE) {
-		case (_TAG_IMMED1_SMALL >> _TAG_PRIMARY_SIZE):
-		    GET_DOUBLE(arg1, f1);
-		    f2.fd = signed_val(arg2);
-		    goto do_float;
-		default:
-		    goto badarith;
-		}
-	    case TAG_PRIMARY_BOXED:
-		hdr = *boxed_val(arg2);
-		switch ((hdr & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE) {
-		case (_TAG_HEADER_POS_BIG >> _TAG_PRIMARY_SIZE):
-		case (_TAG_HEADER_NEG_BIG >> _TAG_PRIMARY_SIZE):
-		    GET_DOUBLE(arg1, f1);
-		    if (big_to_double(arg2, &f2.fd) < 0) {
-			goto badarith;
-		    }
-		    goto do_float;
-		case (_TAG_HEADER_FLOAT >> _TAG_PRIMARY_SIZE):
-		    GET_DOUBLE(arg1, f1);
-		    GET_DOUBLE(arg2, f2);
-
-		do_float:
-		    f1.fd = f1.fd * f2.fd;
-		    ERTS_FP_ERROR(p, f1.fd, goto badarith);
-		    if (ERTS_NEED_GC(p, FLOAT_SIZE_OBJECT)) {
-			erts_garbage_collect(p, FLOAT_SIZE_OBJECT, reg, live);
-		    }
-		    hp = p->htop;
-		    p->htop += FLOAT_SIZE_OBJECT;
-		    res = make_float(hp);
-		    PUT_DOUBLE(f1, hp);
-		    return res;
-		default:
-		    goto badarith;
-		}
-	    default:
-		goto badarith;
-	    }
-	}
-    default:
-	goto badarith;
-    }
-}
-
-Eterm
-erts_gc_mixed_div(Process* p, Eterm* reg, Uint live)
-{
-    Eterm arg1;
-    Eterm arg2;
-    FloatDef f1, f2;
-    Eterm* hp;
-    Eterm hdr;
-
-    arg1 = reg[live];
-    arg2 = reg[live+1];
-    ERTS_FP_CHECK_INIT(p);
-    switch (arg1 & _TAG_PRIMARY_MASK) {
-    case TAG_PRIMARY_IMMED1:
-	switch ((arg1 & _TAG_IMMED1_MASK) >> _TAG_PRIMARY_SIZE) {
-	case (_TAG_IMMED1_SMALL >> _TAG_PRIMARY_SIZE):
-	    switch (arg2 & _TAG_PRIMARY_MASK) {
-	    case TAG_PRIMARY_IMMED1:
-		switch ((arg2 & _TAG_IMMED1_MASK) >> _TAG_PRIMARY_SIZE) {
-		case (_TAG_IMMED1_SMALL >> _TAG_PRIMARY_SIZE):
-		    f1.fd = signed_val(arg1);
-		    f2.fd = signed_val(arg2);
-		    goto do_float;
-		default:
-		badarith:
-		    p->freason = BADARITH;
-		    return THE_NON_VALUE;
-		}
-	    case TAG_PRIMARY_BOXED:
-		hdr = *boxed_val(arg2);
-		switch ((hdr & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE) {
-		case (_TAG_HEADER_POS_BIG >> _TAG_PRIMARY_SIZE):
-		case (_TAG_HEADER_NEG_BIG >> _TAG_PRIMARY_SIZE):
-		    f1.fd = signed_val(arg1);
-		    if (big_to_double(arg2, &f2.fd) < 0) {
-			goto badarith;
-		    }
-		    goto do_float;
-		case (_TAG_HEADER_FLOAT >> _TAG_PRIMARY_SIZE):
-		    f1.fd = signed_val(arg1);
-		    GET_DOUBLE(arg2, f2);
-		    goto do_float;
-		default:
-		    goto badarith;
-		}
-	    }
-	default:
-	    goto badarith;
-	}
-    case TAG_PRIMARY_BOXED:
-	hdr = *boxed_val(arg1);
-	switch ((hdr & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE) {
-	case (_TAG_HEADER_POS_BIG >> _TAG_PRIMARY_SIZE):
-	case (_TAG_HEADER_NEG_BIG >> _TAG_PRIMARY_SIZE):
-	    switch (arg2 & _TAG_PRIMARY_MASK) {
-	    case (_TAG_IMMED1_SMALL >> _TAG_PRIMARY_SIZE):
-		switch ((arg2 & _TAG_IMMED1_MASK) >> _TAG_PRIMARY_SIZE) {
-		case (_TAG_IMMED1_SMALL >> _TAG_PRIMARY_SIZE):
-		    if (big_to_double(arg1, &f1.fd) < 0) {
-			goto badarith;
-		    }
-		    f2.fd = signed_val(arg2);
-		    goto do_float;
-		default:
-		    goto badarith;
-		}
-	    case TAG_PRIMARY_BOXED:
-		hdr = *boxed_val(arg2);
-		switch ((hdr & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE) {
-		case (_TAG_HEADER_POS_BIG >> _TAG_PRIMARY_SIZE):
-		case (_TAG_HEADER_NEG_BIG >> _TAG_PRIMARY_SIZE):
-		    if (big_to_double(arg1, &f1.fd) < 0 ||
-			big_to_double(arg2, &f2.fd) < 0) {
-			goto badarith;
-		    }
-		    goto do_float;
-		case (_TAG_HEADER_FLOAT >> _TAG_PRIMARY_SIZE):
-		    if (big_to_double(arg1, &f1.fd) < 0) {
-			goto badarith;
-		    }
-		    GET_DOUBLE(arg2, f2);
-		    goto do_float;
-		default:
-		    goto badarith;
-		}
-	    }
-	case (_TAG_HEADER_FLOAT >> _TAG_PRIMARY_SIZE):
-	    switch (arg2 & _TAG_PRIMARY_MASK) {
-	    case TAG_PRIMARY_IMMED1:
-		switch ((arg2 & _TAG_IMMED1_MASK) >> _TAG_PRIMARY_SIZE) {
-		case (_TAG_IMMED1_SMALL >> _TAG_PRIMARY_SIZE):
-		    GET_DOUBLE(arg1, f1);
-		    f2.fd = signed_val(arg2);
-		    goto do_float;
-		default:
-		    goto badarith;
-		}
-	    case TAG_PRIMARY_BOXED:
-		hdr = *boxed_val(arg2);
-		switch ((hdr & _TAG_HEADER_MASK) >> _TAG_PRIMARY_SIZE) {
-		case (_TAG_HEADER_POS_BIG >> _TAG_PRIMARY_SIZE):
-		case (_TAG_HEADER_NEG_BIG >> _TAG_PRIMARY_SIZE):
-		    GET_DOUBLE(arg1, f1);
-		    if (big_to_double(arg2, &f2.fd) < 0) {
-			goto badarith;
-		    }
-		    goto do_float;
-		case (_TAG_HEADER_FLOAT >> _TAG_PRIMARY_SIZE):
-		    GET_DOUBLE(arg1, f1);
-		    GET_DOUBLE(arg2, f2);
-
-		do_float:
-		    f1.fd = f1.fd / f2.fd;
-		    ERTS_FP_ERROR(p, f1.fd, goto badarith);
-		    if (ERTS_NEED_GC(p, FLOAT_SIZE_OBJECT)) {
-			erts_garbage_collect(p, FLOAT_SIZE_OBJECT, reg, live);
-		    }
-		    hp = p->htop;
-		    p->htop += FLOAT_SIZE_OBJECT;
-		    PUT_DOUBLE(f1, hp);
-		    return make_float(hp);
-		default:
-		    goto badarith;
-		}
-	    default:
-		goto badarith;
-	    }
-	}
-    default:
-	goto badarith;
-    }
-}
-
-Eterm
-erts_gc_int_div(Process* p, Eterm* reg, Uint live)
-{
-    Eterm arg1;
-    Eterm arg2;
-    DECLARE_TMP(tmp_big1,0,p);
-    DECLARE_TMP(tmp_big2,1,p);
-    int ires;
-
-    arg1 = reg[live];
-    arg2 = reg[live+1];
-    switch (NUMBER_CODE(arg1, arg2)) {
-    case SMALL_SMALL:
-	/* This case occurs if the most negative fixnum is divided by -1. */
-	ASSERT(arg2 == make_small(-1));
-	arg1 = small_to_big(signed_val(arg1), tmp_big1);
-	/*FALLTHROUGH*/
-    case BIG_SMALL:
-	arg2 = small_to_big(signed_val(arg2), tmp_big2);
-	goto L_big_div;
-    case SMALL_BIG:
-	if (arg1 != make_small(MIN_SMALL)) {
-	    return SMALL_ZERO;
-	}
-	arg1 = small_to_big(signed_val(arg1), tmp_big1);
-	/*FALLTHROUGH*/
-    case BIG_BIG:
-    L_big_div:
-	ires = big_ucomp(arg1, arg2);
-	if (ires < 0) {
-	    arg1 = SMALL_ZERO;
-	} else if (ires == 0) {
-	    arg1 = (big_sign(arg1) == big_sign(arg2)) ?
-		SMALL_ONE : SMALL_MINUS_ONE;
-	} else {
-	    Eterm* hp;
-	    int i = big_size(arg1);
-	    Uint need;
-
-	    ires = big_size(arg2);
-	    need = BIG_NEED_SIZE(i-ires+1) + BIG_NEED_SIZE(i);
-	    if (ERTS_NEED_GC(p, need)) {
-		erts_garbage_collect(p, need, reg, live+2);
-		if (ARG_IS_NOT_TMP(arg1,tmp_big1)) {
-		    arg1 = reg[live];
-		}
-		if (ARG_IS_NOT_TMP(arg2,tmp_big2)) {
-		    arg2 = reg[live+1];
-		}
-	    }
-	    hp = p->htop;
-	    p->htop += need;
-	    arg1 = big_div(arg1, arg2, hp);
-	    trim_heap(p, hp, arg1);
-	    if (is_nil(arg1)) {
-		p->freason = SYSTEM_LIMIT;
-		return THE_NON_VALUE;
-	    }
-	}
-	return arg1;
-    default:
-	p->freason = BADARITH;
-	return THE_NON_VALUE;
-    }
-}
-
-Eterm
-erts_gc_int_rem(Process* p, Eterm* reg, Uint live)
-{
-    Eterm arg1;
-    Eterm arg2;
-    DECLARE_TMP(tmp_big1,0,p);
-    DECLARE_TMP(tmp_big2,1,p);
-    int ires;
-
-    arg1 = reg[live];
-    arg2 = reg[live+1];
-    switch (NUMBER_CODE(arg1, arg2)) {
-    case BIG_SMALL:
-	arg2 = small_to_big(signed_val(arg2), tmp_big2);
-	goto L_big_rem;
-    case SMALL_BIG:
-	if (arg1 != make_small(MIN_SMALL)) {
-	    return arg1;
-	} else {
-	    Eterm tmp;
-	    tmp = small_to_big(signed_val(arg1), tmp_big1);
-	    if ((ires = big_ucomp(tmp, arg2)) == 0) {
-		return SMALL_ZERO;
-	    } else {
-		ASSERT(ires < 0);
-		return arg1;
-	    }
-	}
-	/* All paths returned */
-    case BIG_BIG:
-    L_big_rem:
-	ires = big_ucomp(arg1, arg2);
-	if (ires == 0) {
-	    arg1 = SMALL_ZERO;
-	} else if (ires > 0) {
-	    Eterm* hp;
-	    Uint need = BIG_NEED_SIZE(big_size(arg1));
-
-	    if (ERTS_NEED_GC(p, need)) {
-		erts_garbage_collect(p, need, reg, live+2);
-		if (ARG_IS_NOT_TMP(arg1,tmp_big1)) {
-		    arg1 = reg[live];
-		}
-		if (ARG_IS_NOT_TMP(arg2,tmp_big2)) {
-		    arg2 = reg[live+1];
-		}
-	    }
-	    hp = p->htop;
-	    p->htop += need;
-	    arg1 = big_rem(arg1, arg2, hp);
-	    trim_heap(p, hp, arg1);
-	    if (is_nil(arg1)) {
-		p->freason = SYSTEM_LIMIT;
-		return THE_NON_VALUE;
-	    }
-	}
-	return arg1;
-    default:
-	p->freason = BADARITH;
-	return THE_NON_VALUE;
-    }
-}
-
-#define DEFINE_GC_LOGIC_FUNC(func)						\
-Eterm erts_gc_##func(Process* p, Eterm* reg, Uint live)				\
-{										\
-    Eterm arg1;									\
-    Eterm arg2;									\
-    DECLARE_TMP(tmp_big1,0,p);							\
-    DECLARE_TMP(tmp_big2,1,p);							\
-    Eterm* hp;									\
-    int need;									\
-										\
-    arg1 = reg[live];								\
-    arg2 = reg[live+1];								\
-    switch (NUMBER_CODE(arg1, arg2)) {						\
-    case SMALL_BIG:								\
-	arg1 = small_to_big(signed_val(arg1), tmp_big1);			\
-	need = BIG_NEED_SIZE(big_size(arg2) + 1);				\
-	if (ERTS_NEED_GC(p, need)) {						\
-	    erts_garbage_collect(p, need, reg, live+2);				\
-	    arg2 = reg[live+1];							\
-	}									\
-	break;									\
-    case BIG_SMALL:								\
-	arg2 = small_to_big(signed_val(arg2), tmp_big2);			\
-	need = BIG_NEED_SIZE(big_size(arg1) + 1);				\
-	if (ERTS_NEED_GC(p, need)) {						\
-	    erts_garbage_collect(p, need, reg, live+2);				\
-	    arg1 = reg[live];							\
-	}									\
-	break;									\
-    case BIG_BIG:								\
-	need = BIG_NEED_SIZE(MAX(big_size(arg1), big_size(arg2)) + 1);		\
-	if (ERTS_NEED_GC(p, need)) {						\
-	    erts_garbage_collect(p, need, reg, live+2);				\
-	    arg1 = reg[live];							\
-	    arg2 = reg[live+1];							\
-	}									\
-	break;									\
-    default:									\
-	p->freason = BADARITH;							\
-	return THE_NON_VALUE;							\
-    }										\
-    hp = p->htop;								\
-    p->htop += need;								\
-    arg1 = big_##func(arg1, arg2, hp);						\
-    trim_heap(p, hp, arg1);							\
-    return arg1;								\
-}
-
-DEFINE_GC_LOGIC_FUNC(band)
-DEFINE_GC_LOGIC_FUNC(bor)
-DEFINE_GC_LOGIC_FUNC(bxor)
-
-Eterm erts_gc_bnot(Process* p, Eterm* reg, Uint live)
-{
-    Eterm result;
-    Eterm arg;
-    Uint need;
-    Eterm* bigp;
-
-    arg = reg[live];
-    if (is_not_big(arg)) {
-	p->freason = BADARITH;
-	return NIL;
-    } else {
-	need = BIG_NEED_SIZE(big_size(arg)+1);
-	if (ERTS_NEED_GC(p, need)) {
-	    erts_garbage_collect(p, need, reg, live+1);
-	    arg = reg[live];
-	}
-	bigp = p->htop;
-	p->htop += need;
-	result = big_bnot(arg, bigp);
-	trim_heap(p, bigp, result);
-	if (is_nil(result)) {
-	    p->freason = SYSTEM_LIMIT;
-	    return NIL;
-	}
-    }
-    return result;
-} 
-
 /* Needed to remove compiler optimization */
 double erts_get_positive_zero_float() {
     return 0.0f;
diff --git a/erts/emulator/beam/erl_bestfit_alloc.c b/erts/emulator/beam/erl_bestfit_alloc.c
index 9cb1199c2a..0e7be99801 100644
--- a/erts/emulator/beam/erl_bestfit_alloc.c
+++ b/erts/emulator/beam/erl_bestfit_alloc.c
@@ -122,8 +122,8 @@ typedef struct {
     RBTree_t *next;
 } RBTreeList_t;
 
-#define LIST_NEXT(N) (((RBTreeList_t *) (N))->next)
-#define LIST_PREV(N) (((RBTreeList_t *) (N))->t.parent)
+#define BF_LIST_NEXT(N) (((RBTreeList_t *) (N))->next)
+#define BF_LIST_PREV(N) (((RBTreeList_t *) (N))->t.parent)
 
 
 #ifdef DEBUG
@@ -209,6 +209,8 @@ erts_bfalc_start(BFAllctr_t *bfallctr,
     allctr->add_mbc                     = NULL;
     allctr->remove_mbc		        = NULL;
     allctr->largest_fblk_in_mbc         = NULL;
+    allctr->first_fblk_in_mbc           = NULL;
+    allctr->next_fblk_in_mbc            = NULL;
     allctr->init_atoms			= init_atoms;
 
 #ifdef ERTS_ALLOC_UTIL_HARD_DEBUG
@@ -593,7 +595,6 @@ aobf_link_free_block(Allctr_t *allctr, Block_t *block)
     RBTree_t *blk = (RBTree_t *) block;
     Uint blk_sz = BF_BLK_SZ(blk);
 
-    
 
     blk->flags	= 0;
     blk->left	= NULL;
@@ -673,7 +674,7 @@ aobf_get_free_block(Allctr_t *allctr, Uint size,
 	    x = x->left;
 	}
     }
-    
+
     if (!blk)
 	return NULL;
 
@@ -729,11 +730,11 @@ bf_link_free_block(Allctr_t *allctr, Block_t *block)
 	    if (blk_sz == size) {
 
 		SET_LIST_ELEM(blk);
-		LIST_NEXT(blk) = LIST_NEXT(x);
-		LIST_PREV(blk) = x;
-		if (LIST_NEXT(x))
-		    LIST_PREV(LIST_NEXT(x)) = blk;
-		LIST_NEXT(x) = blk;
+		BF_LIST_NEXT(blk) = BF_LIST_NEXT(x);
+		BF_LIST_PREV(blk) = x;
+		if (BF_LIST_NEXT(x))
+		    BF_LIST_PREV(BF_LIST_NEXT(x)) = blk;
+		BF_LIST_NEXT(x) = blk;
 
 		return; /* Finnished */
 	    }
@@ -764,7 +765,7 @@ bf_link_free_block(Allctr_t *allctr, Block_t *block)
     }
 
     SET_TREE_NODE(blk);
-    LIST_NEXT(blk) = NULL;
+    BF_LIST_NEXT(blk) = NULL;
 
 #ifdef HARD_DEBUG
     check_tree(root, 0, 0);
@@ -780,22 +781,22 @@ bf_unlink_free_block(Allctr_t *allctr, Block_t *block)
 
     if (IS_LIST_ELEM(x)) {
 	/* Remove from list */
-	ASSERT(LIST_PREV(x));
-	LIST_NEXT(LIST_PREV(x)) = LIST_NEXT(x);
-	if (LIST_NEXT(x))
-	    LIST_PREV(LIST_NEXT(x)) = LIST_PREV(x);
+	ASSERT(BF_LIST_PREV(x));
+	BF_LIST_NEXT(BF_LIST_PREV(x)) = BF_LIST_NEXT(x);
+	if (BF_LIST_NEXT(x))
+	    BF_LIST_PREV(BF_LIST_NEXT(x)) = BF_LIST_PREV(x);
     }
-    else if (LIST_NEXT(x)) {
+    else if (BF_LIST_NEXT(x)) {
 	/* Replace tree node by next element in list... */
 
-	ASSERT(BF_BLK_SZ(LIST_NEXT(x)) == BF_BLK_SZ(x));
+	ASSERT(BF_BLK_SZ(BF_LIST_NEXT(x)) == BF_BLK_SZ(x));
 	ASSERT(IS_TREE_NODE(x));
-	ASSERT(IS_LIST_ELEM(LIST_NEXT(x)));
+	ASSERT(IS_LIST_ELEM(BF_LIST_NEXT(x)));
 
 #ifdef HARD_DEBUG
 	check_tree(root, 0, 0);
 #endif
-	replace(root, x, LIST_NEXT(x));
+	replace(root, x, BF_LIST_NEXT(x));
 
 #ifdef HARD_DEBUG
 	check_tree(bfallctr, 0);
@@ -834,7 +835,7 @@ bf_get_free_block(Allctr_t *allctr, Uint size,
 	    x = x->left;
 	}
     }
-    
+
     if (!blk)
 	return NULL;
 
@@ -853,7 +854,7 @@ bf_get_free_block(Allctr_t *allctr, Uint size,
 
     /* Use next block if it exist in order to avoid replacing
        the tree node */
-    blk = LIST_NEXT(blk) ? LIST_NEXT(blk) : blk;
+    blk = BF_LIST_NEXT(blk) ? BF_LIST_NEXT(blk) : blk;
 
     bf_unlink_free_block(allctr, (Block_t *) blk);
     return (Block_t *) blk;
@@ -938,7 +939,7 @@ info_options(Allctr_t *allctr,
     }
 
     if (hpp || szp) {
-	
+
 	if (!atoms_initialized)
 	    erts_exit(ERTS_ERROR_EXIT, "%s:%d: Internal error: Atoms not initialized",
 		     __FILE__, __LINE__);;
@@ -969,12 +970,12 @@ erts_bfalc_test(UWord op, UWord a1, UWord a2)
     case 0x202:	return (UWord) ((RBTree_t *) a1)->parent;
     case 0x203:	return (UWord) ((RBTree_t *) a1)->left;
     case 0x204:	return (UWord) ((RBTree_t *) a1)->right;
-    case 0x205:	return (UWord) LIST_NEXT(a1);
+    case 0x205:	return (UWord) BF_LIST_NEXT(a1);
     case 0x206:	return (UWord) IS_BLACK((RBTree_t *) a1);
     case 0x207:	return (UWord) IS_TREE_NODE((RBTree_t *) a1);
     case 0x208:	return (UWord) 1; /* IS_BF_ALGO */
     case 0x20a: return (UWord) !((BFAllctr_t *) a1)->address_order; /* IS_BF */
-    case 0x20b:	return (UWord) LIST_PREV(a1);
+    case 0x20b:	return (UWord) BF_LIST_PREV(a1);
     default:	ASSERT(0); return ~((UWord) 0);
     }
 }
diff --git a/erts/emulator/beam/erl_bif_atomics.c b/erts/emulator/beam/erl_bif_atomics.c
index 092dbb3bd3..029831bd95 100644
--- a/erts/emulator/beam/erl_bif_atomics.c
+++ b/erts/emulator/beam/erl_bif_atomics.c
@@ -133,7 +133,7 @@ static ERTS_INLINE Eterm bld_atomic(Process* proc, AtomicsRef* p,
         if ((Uint64)val <= MAX_SMALL)
             return make_small((Sint) val);
         else {
-            Uint hsz = ERTS_UINT64_HEAP_SIZE(val);
+            Uint hsz = ERTS_UINT64_HEAP_SIZE((Uint64)val);
             Eterm* hp = HAlloc(proc, hsz);
             return erts_uint64_to_big(val, &hp);
         }
diff --git a/erts/emulator/beam/erl_bif_binary.c b/erts/emulator/beam/erl_bif_binary.c
index a2610bf2e1..b8e56390c1 100644
--- a/erts/emulator/beam/erl_bif_binary.c
+++ b/erts/emulator/beam/erl_bif_binary.c
@@ -208,8 +208,8 @@ typedef struct _ac_trie {
 typedef struct _bm_data {
     byte *x;
     Sint len;
+    Sint *badshift;
     Sint *goodshift;
-    Sint badshift[ALPHABET_SIZE];
 } BMData;
 
 typedef struct _ac_find_all_state {
@@ -319,16 +319,104 @@ static void dump_ac_node(ACNode *node, int indent, int ch);
  * The needed size of binary data for a search structure - given the
  * accumulated string lengths.
  */
-#define BM_SIZE(StrLen) 	      /* StrLen: length of searchstring */ \
-((MYALIGN(sizeof(Sint) * (StrLen))) + /* goodshift array */                \
- MYALIGN(StrLen) +                    /* searchstring saved */             \
- (MYALIGN(sizeof(BMData))))           /* Structure */
+#define BM_SIZE_SINGLE()    /* Single byte search string */ \
+(MYALIGN(1) +               /* searchstring saved */        \
+ (MYALIGN(sizeof(BMData)))) /* Structure */
+
+#define BM_SIZE_MULTI(StrLen) 	           /* StrLen: length of searchstring */ \
+((MYALIGN(sizeof(Uint) * (StrLen))) +      /* goodshift array */                \
+ (MYALIGN(sizeof(Uint) * ALPHABET_SIZE)) + /* badshift array */                 \
+ MYALIGN(StrLen) +                         /* searchstring saved */             \
+ (MYALIGN(sizeof(BMData))))                /* Structure */
 
 #define AC_SIZE(StrLens)       /* StrLens: sum of all searchstring lengths */ \
 ((MYALIGN(sizeof(ACNode)) *                                                   \
 ((StrLens)+1)) + 	       /* The actual nodes (including rootnode) */    \
  MYALIGN(sizeof(ACTrie)))      /* Structure */
 
+/*
+ * Boyer Moore - most obviously implemented more or less exactly as
+ * Christian Charras and Thierry Lecroq describe it in "Handbook of
+ * Exact String-Matching Algorithms"
+ * http://www-igm.univ-mlv.fr/~lecroq/string/
+ */
+
+/*
+ * Call this to compute badshifts array
+ */
+static void compute_badshifts(BMData *bmd)
+{
+    Sint i;
+    Sint m = bmd->len;
+
+    for (i = 0; i < ALPHABET_SIZE; ++i) {
+	bmd->badshift[i] = m;
+    }
+    for (i = 0; i < m - 1; ++i) {
+	bmd->badshift[bmd->x[i]] = m - i - 1;
+    }
+}
+
+/* Helper for "compute_goodshifts" */
+static void compute_suffixes(byte *x, Sint m, Sint *suffixes)
+{
+    int f,g,i;
+
+    suffixes[m - 1] = m;
+
+    f = 0; /* To avoid use before set warning */
+
+    g = m - 1;
+
+    for (i = m - 2; i >= 0; --i) {
+	if (i > g && suffixes[i + m - 1 - f] < i - g) {
+	    suffixes[i] = suffixes[i + m - 1 - f];
+	} else {
+	    if (i < g) {
+		g = i;
+	    }
+	    f = i;
+	    while ( g >= 0 && x[g] == x[g + m - 1 - f] ) {
+		--g;
+	    }
+	    suffixes[i] = f - g;
+	}
+    }
+}
+
+/*
+ * Call this to compute goodshift array
+ */
+static void compute_goodshifts(BMData *bmd)
+{
+    Sint m = bmd->len;
+    byte *x = bmd->x;
+    Sint i, j;
+    Sint *suffixes = erts_alloc(ERTS_ALC_T_TMP, m * sizeof(Sint));
+
+    compute_suffixes(x, m, suffixes);
+
+    for (i = 0; i < m; ++i) {
+	bmd->goodshift[i] = m;
+    }
+
+    j = 0;
+
+    for (i = m - 1; i >= -1; --i) {
+	if (i == -1 || suffixes[i] == i + 1) {
+	    while (j < m - 1 - i) {
+		if (bmd->goodshift[j] == m) {
+		    bmd->goodshift[j] = m - 1 - i;
+		}
+		++j;
+	    }
+	}
+    }
+    for (i = 0; i <= m - 2; ++i) {
+	bmd->goodshift[m - 1 - suffixes[i]] = m - 1 - i;
+    }
+    erts_free(ERTS_ALC_T_TMP, suffixes);
+}
 
 /*
  * Callback for the magic binary
@@ -377,20 +465,37 @@ static ACTrie *create_acdata(MyAllocator *my, Uint len,
 
 /*
  * The same initialization of allocator and basic data for Boyer-Moore.
+ * For single byte, we don't use goodshift and badshift, only memchr.
  */
 static BMData *create_bmdata(MyAllocator *my, byte *x, Uint len,
 			     Binary **the_bin /* out */)
 {
-    Uint datasize = BM_SIZE(len);
+    Uint datasize;
     BMData *bmd;
-    Binary *mb = erts_create_magic_binary(datasize,cleanup_my_data_bm);
-    byte *data = ERTS_MAGIC_BIN_DATA(mb);
+    Binary *mb;
+    byte *data;
+
+    if(len > 1) {
+	datasize = BM_SIZE_MULTI(len);
+    } else {
+	datasize = BM_SIZE_SINGLE();
+    }
+
+    mb = erts_create_magic_binary(datasize,cleanup_my_data_bm);
+    data = ERTS_MAGIC_BIN_DATA(mb);
     init_my_allocator(my, datasize, data);
     bmd = my_alloc(my, sizeof(BMData));
     bmd->x = my_alloc(my,len);
     sys_memcpy(bmd->x,x,len);
     bmd->len = len;
-    bmd->goodshift = my_alloc(my,sizeof(Uint) * len);
+
+    if(len > 1) {
+	bmd->goodshift = my_alloc(my, sizeof(Uint) * len);
+	bmd->badshift = my_alloc(my, sizeof(Uint) * ALPHABET_SIZE);
+	compute_badshifts(bmd);
+	compute_goodshifts(bmd);
+    }
+
     *the_bin = mb;
     return bmd;
 }
@@ -711,91 +816,8 @@ static BFReturn ac_find_all_non_overlapping(BinaryFindContext *ctx, byte *haysta
     return (m == 0) ? BF_NOT_FOUND : BF_OK;
 }
 
-/*
- * Boyer Moore - most obviously implemented more or less exactly as
- * Christian Charras and Thierry Lecroq describe it in "Handbook of
- * Exact String-Matching Algorithms"
- * http://www-igm.univ-mlv.fr/~lecroq/string/
- */
-
-/*
- * Call this to compute badshifts array
- */
-static void compute_badshifts(BMData *bmd)
-{
-    Sint i;
-    Sint m = bmd->len;
-
-    for (i = 0; i < ALPHABET_SIZE; ++i) {
-	bmd->badshift[i] = m;
-    }
-    for (i = 0; i < m - 1; ++i) {
-	bmd->badshift[bmd->x[i]] = m - i - 1;
-    }
-}
-
-/* Helper for "compute_goodshifts" */
-static void compute_suffixes(byte *x, Sint m, Sint *suffixes)
-{
-    int f,g,i;
-
-    suffixes[m - 1] = m;
-
-    f = 0; /* To avoid use before set warning */
-
-    g = m - 1;
-
-    for (i = m - 2; i >= 0; --i) {
-	if (i > g && suffixes[i + m - 1 - f] < i - g) {
-	    suffixes[i] = suffixes[i + m - 1 - f];
-	} else {
-	    if (i < g) {
-		g = i;
-	    }
-	    f = i;
-	    while ( g >= 0 && x[g] == x[g + m - 1 - f] ) {
-		--g;
-	    }
-	    suffixes[i] = f - g;
-	}
-    }
-}
-
-/*
- * Call this to compute goodshift array
- */
-static void compute_goodshifts(BMData *bmd)
-{
-    Sint m = bmd->len;
-    byte *x = bmd->x;
-    Sint i, j;
-    Sint *suffixes = erts_alloc(ERTS_ALC_T_TMP, m * sizeof(Sint));
-
-    compute_suffixes(x, m, suffixes);
-
-    for (i = 0; i < m; ++i) {
-	bmd->goodshift[i] = m;
-    }
-
-    j = 0;
-
-    for (i = m - 1; i >= -1; --i) {
-	if (i == -1 || suffixes[i] == i + 1) {
-	    while (j < m - 1 - i) {
-		if (bmd->goodshift[j] == m) {
-		    bmd->goodshift[j] = m - 1 - i;
-		}
-		++j;
-	    }
-	}
-    }
-    for (i = 0; i <= m - 2; ++i) {
-	bmd->goodshift[m - 1 - suffixes[i]] = m - 1 - i;
-    }
-    erts_free(ERTS_ALC_T_TMP, suffixes);
-}
-
 #define BM_LOOP_FACTOR 10 /* Should we have a higher value? */
+#define MC_LOOP_FACTOR 8
 
 static void bm_init_find_first_match(BinaryFindContext *ctx)
 {
@@ -819,13 +841,38 @@ static BFReturn bm_find_first_match(BinaryFindContext *ctx, byte *haystack)
     Sint i;
     Sint j = state->pos;
     register Uint reds = *reductions;
+    byte *pos_pointer;
+    Sint needle_last = blen - 1;
+    Sint mem_read = len - needle_last - j;
 
-    while (j <= len - blen) {
+    if (mem_read <= 0) {
+	return BF_NOT_FOUND;
+    }
+    mem_read = MIN(mem_read, reds * MC_LOOP_FACTOR);
+    ASSERT(mem_read > 0);
+
+    pos_pointer = memchr(&haystack[j + needle_last], needle[needle_last], mem_read);
+    if (pos_pointer == NULL) {
+	reds -= mem_read / MC_LOOP_FACTOR;
+	j += mem_read;
+    } else {
+	reds -= (pos_pointer - &haystack[j]) / MC_LOOP_FACTOR;
+	j = pos_pointer - haystack - needle_last;
+    }
+
+    // Ensure we have at least one reduction before entering the loop
+    ++reds;
+
+    for(;;) {
+	if (j > len - blen) {
+	    *reductions = reds;
+	    return BF_NOT_FOUND;
+	}
 	if (--reds == 0) {
 	    state->pos = j;
 	    return BF_RESTART;
 	}
-	for (i = blen - 1; i >= 0 && needle[i] == haystack[i + j]; --i)
+	for (i = needle_last; i >= 0 && needle[i] == haystack[i + j]; --i)
 	    ;
 	if (i < 0) { /* found */
 	    *reductions = reds;
@@ -835,8 +882,6 @@ static BFReturn bm_find_first_match(BinaryFindContext *ctx, byte *haystack)
 	}
 	j += MAX(gs[i],bs[haystack[i+j]] - blen + 1 + i);
     }
-    *reductions = reds;
-    return BF_NOT_FOUND;
 }
 
 static void bm_init_find_all(BinaryFindContext *ctx)
@@ -875,14 +920,38 @@ static BFReturn bm_find_all_non_overlapping(BinaryFindContext *ctx, byte *haysta
     Sint *gs = bmd->goodshift;
     Sint *bs = bmd->badshift;
     byte *needle = bmd->x;
-    Sint i;
+    Sint i = -1; /* Use memchr on start and on every match */
     Sint j = state->pos;
     Uint m = state->m;
     Uint allocated = state->allocated;
     FindallData *out = state->out;
     register Uint reds = *reductions;
+    byte *pos_pointer;
+    Sint needle_last = blen - 1;
+    Sint mem_read;
 
-    while (j <= len - blen) {
+    for(;;) {
+	if (i < 0) {
+	    mem_read = len - needle_last - j;
+	    if(mem_read <= 0) {
+		goto done;
+	    }
+	    mem_read = MIN(mem_read, reds * MC_LOOP_FACTOR);
+	    ASSERT(mem_read > 0);
+	    pos_pointer = memchr(&haystack[j + needle_last], needle[needle_last], mem_read);
+	    if (pos_pointer == NULL) {
+		reds -= mem_read / MC_LOOP_FACTOR;
+		j += mem_read;
+	    } else {
+		reds -= (pos_pointer - &haystack[j]) / MC_LOOP_FACTOR;
+		j = pos_pointer - haystack - needle_last;
+	    }
+	    // Ensure we have at least one reduction when resuming the loop
+	    ++reds;
+	}
+	if (j > len - blen) {
+	    goto done;
+	}
 	if (--reds == 0) {
 	    state->pos = j;
 	    state->m = m;
@@ -890,7 +959,7 @@ static BFReturn bm_find_all_non_overlapping(BinaryFindContext *ctx, byte *haysta
 	    state->out = out;
 	    return BF_RESTART;
 	}
-	for (i = blen - 1; i >= 0 && needle[i] == haystack[i + j]; --i)
+	for (i = needle_last; i >= 0 && needle[i] == haystack[i + j]; --i)
 	    ;
 	if (i < 0) { /* found */
 	    if (m >= allocated) {
@@ -912,6 +981,7 @@ static BFReturn bm_find_all_non_overlapping(BinaryFindContext *ctx, byte *haysta
 	    j += MAX(gs[i],bs[haystack[i+j]] - blen + 1 + i);
 	}
     }
+ done:
     state->m = m;
     state->out = out;
     *reductions = reds;
@@ -931,6 +1001,7 @@ static int do_binary_match_compile(Eterm argument, Eterm *tag, Binary **binp)
     Eterm t, b, comp_term = NIL;
     Uint characters;
     Uint words;
+    Uint size;
 
     characters = 0;
     words = 0;
@@ -946,11 +1017,12 @@ static int do_binary_match_compile(Eterm argument, Eterm *tag, Binary **binp)
 	    if (binary_bitsize(b) != 0) {
 		goto badarg;
 	    }
-	    if (binary_size(b) == 0) {
+	    size = binary_size(b);
+	    if (size == 0) {
 		goto badarg;
 	    }
 	    ++words;
-	    characters += binary_size(b);
+	    characters += size;
 	}
 	if (is_not_nil(t)) {
 	    goto badarg;
@@ -979,16 +1051,13 @@ static int do_binary_match_compile(Eterm argument, Eterm *tag, Binary **binp)
 	Uint bitoffs, bitsize;
 	byte *temp_alloc = NULL;
 	MyAllocator my;
-	BMData *bmd;
 	Binary *bin;
 
 	ERTS_GET_BINARY_BYTES(comp_term, bytes, bitoffs, bitsize);
 	if (bitoffs != 0) {
 	    bytes = erts_get_aligned_binary_bytes(comp_term, &temp_alloc);
 	}
-	bmd = create_bmdata(&my, bytes, characters, &bin);
-	compute_badshifts(bmd);
-	compute_goodshifts(bmd);
+        create_bmdata(&my, bytes, characters, &bin);
 	erts_free_aligned_binary_bytes(temp_alloc);
 	CHECK_ALLOCATOR(my);
 	*tag = am_bm;
@@ -1681,9 +1750,8 @@ static Eterm do_split_single_result(Process *p, Eterm subject, BinaryFindContext
     Uint offset;
     Uint bit_offset;
     Uint bit_size;
-    ErlSubBin *sb1;
-    ErlSubBin *sb2;
-    Eterm *hp;
+    Uint hp_need;
+    Eterm *hp, *hp_end;
     Eterm ret;
 
     pos = ff->pos;
@@ -1696,57 +1764,58 @@ static Eterm do_split_single_result(Process *p, Eterm subject, BinaryFindContext
 	if (pos == 0) {
 	    ret = NIL;
 	} else {
-	    hp = HAlloc(p, (ERL_SUB_BIN_SIZE + 2));
+	    Eterm extracted;
+
+	    hp_need = EXTRACT_SUB_BIN_HEAP_NEED + 2;
+
+	    hp = HAlloc(p, hp_need);
+	    hp_end = hp + hp_need;
+
 	    ERTS_GET_REAL_BIN(subject, orig, offset, bit_offset, bit_size);
-	    sb1 = (ErlSubBin *) hp;
-	    sb1->thing_word = HEADER_SUB_BIN;
-	    sb1->size = pos;
-	    sb1->offs = offset;
-	    sb1->orig = orig;
-	    sb1->bitoffs = bit_offset;
-	    sb1->bitsize = bit_size;
-	    sb1->is_writable = 0;
-	    hp += ERL_SUB_BIN_SIZE;
-
-	    ret = CONS(hp, make_binary(sb1), NIL);
+	    extracted = erts_extract_sub_binary(&hp, orig, binary_bytes(orig),
+	                                        offset * 8 + bit_offset,
+	                                        pos * 8 + bit_size);
+
+	    ret = CONS(hp, extracted, NIL);
 	    hp += 2;
+
+	    HRelease(p, hp_end, hp);
+
+	    return ret;
 	}
     } else {
-	if ((ctx->flags & BF_FLAG_SPLIT_TRIM_ALL) && (pos == 0)) {
-	    hp = HAlloc(p, 1 * (ERL_SUB_BIN_SIZE + 2));
-	    ERTS_GET_REAL_BIN(subject, orig, offset, bit_offset, bit_size);
-	    sb1 = NULL;
-	} else {
-	    hp = HAlloc(p, 2 * (ERL_SUB_BIN_SIZE + 2));
-	    ERTS_GET_REAL_BIN(subject, orig, offset, bit_offset, bit_size);
-	    sb1 = (ErlSubBin *) hp;
-	    sb1->thing_word = HEADER_SUB_BIN;
-	    sb1->size = pos;
-	    sb1->offs = offset;
-	    sb1->orig = orig;
-	    sb1->bitoffs = bit_offset;
-	    sb1->bitsize = 0;
-	    sb1->is_writable = 0;
-	    hp += ERL_SUB_BIN_SIZE;
-	}
-
-	sb2 = (ErlSubBin *) hp;
-	sb2->thing_word = HEADER_SUB_BIN;
-	sb2->size = orig_size - pos - len;
-	sb2->offs = offset + pos + len;
-	sb2->orig = orig;
-	sb2->bitoffs = bit_offset;
-	sb2->bitsize = bit_size;
-	sb2->is_writable = 0;
-	hp += ERL_SUB_BIN_SIZE;
-
-	ret = CONS(hp, make_binary(sb2), NIL);
-	hp += 2;
-	if (sb1 != NULL) {
-	    ret = CONS(hp, make_binary(sb1), ret);
-	    hp += 2;
-	}
+        Eterm first, rest;
+
+        hp_need = (EXTRACT_SUB_BIN_HEAP_NEED + 2) * 2;
+
+        hp = HAlloc(p, hp_need);
+        hp_end = hp + hp_need;
+
+        ERTS_GET_REAL_BIN(subject, orig, offset, bit_offset, bit_size);
+
+        if ((ctx->flags & BF_FLAG_SPLIT_TRIM_ALL) && (pos == 0)) {
+            first = NIL;
+        } else {
+            first = erts_extract_sub_binary(&hp, orig, binary_bytes(orig),
+                                            offset * 8 + bit_offset,
+                                            pos * 8);
+        }
+
+        rest = erts_extract_sub_binary(&hp, orig, binary_bytes(orig),
+                                       (offset + pos + len) * 8 + bit_offset,
+                                       (orig_size - pos - len) * 8 + bit_size);
+
+        ret = CONS(hp, rest, NIL);
+        hp += 2;
+
+        if (first != NIL) {
+            ret = CONS(hp, first, ret);
+            hp += 2;
+        }
+
+        HRelease(p, hp_end, hp);
     }
+
     return ret;
 }
 
@@ -1760,7 +1829,9 @@ static Eterm do_split_global_result(Process *p, Eterm subject, BinaryFindContext
     Uint offset;
     Uint bit_offset;
     Uint bit_size;
-    ErlSubBin *sb;
+    Uint extracted_offset;
+    Uint extracted_size;
+    Eterm extracted;
     Uint do_trim;
     Sint i;
     register Uint reds = ctx->reds;
@@ -1783,7 +1854,8 @@ static Eterm do_split_global_result(Process *p, Eterm subject, BinaryFindContext
 	    *ctxp = ctx;
 	    fa = &(ctx->u.fa);
 	}
-	erts_factory_proc_prealloc_init(&(fa->factory), p, (fa->size + 1) * (ERL_SUB_BIN_SIZE + 2));
+	erts_factory_proc_prealloc_init(&(fa->factory), p, (fa->size + 1) *
+	                                (EXTRACT_SUB_BIN_HEAP_NEED + 2));
 	ctx->state = BFResult;
     }
 
@@ -1802,39 +1874,39 @@ static Eterm do_split_global_result(Process *p, Eterm subject, BinaryFindContext
 	    }
 	    return THE_NON_VALUE;
 	}
-	sb = (ErlSubBin *)(fa->factory.hp);
-	sb->size = fa->end_pos - (fad[i].pos + fad[i].len);
-	if (!(sb->size == 0 && do_trim)) {
-	    sb->thing_word = HEADER_SUB_BIN;
-	    sb->offs = offset + fad[i].pos + fad[i].len;
-	    sb->orig = orig;
-	    sb->bitoffs = bit_offset;
-	    sb->bitsize = 0;
-	    sb->is_writable = 0;
-	    fa->factory.hp += ERL_SUB_BIN_SIZE;
-	    fa->term = CONS(fa->factory.hp, make_binary(sb), fa->term);
-	    fa->factory.hp += 2;
-	    do_trim &= ~BF_FLAG_SPLIT_TRIM;
-	}
-	fa->end_pos = fad[i].pos;
+
+        extracted_offset = (offset + fad[i].pos + fad[i].len) * 8 + bit_offset;
+        extracted_size = (fa->end_pos - (fad[i].pos + fad[i].len)) * 8;
+
+        if (!(extracted_size == 0 && do_trim)) {
+            extracted = erts_extract_sub_binary(&fa->factory.hp, orig,
+                                                binary_bytes(orig),
+                                                extracted_offset,
+                                                extracted_size);
+            fa->term = CONS(fa->factory.hp, extracted, fa->term);
+            fa->factory.hp += 2;
+
+            do_trim &= ~BF_FLAG_SPLIT_TRIM;
+        }
+
+        fa->end_pos = fad[i].pos;
     }
 
     fa->head = i;
     ctx->reds = reds;
 
-    sb = (ErlSubBin *)(fa->factory.hp);
-    sb->size = fad[0].pos;
-    if (!(sb->size == 0 && do_trim)) {
-	sb->thing_word = HEADER_SUB_BIN;
-	sb->offs = offset;
-	sb->orig = orig;
-	sb->bitoffs = bit_offset;
-	sb->bitsize = 0;
-	sb->is_writable = 0;
-	fa->factory.hp += ERL_SUB_BIN_SIZE;
-	fa->term = CONS(fa->factory.hp, make_binary(sb), fa->term);
-	fa->factory.hp += 2;
+    extracted_offset = offset * 8 + bit_offset;
+    extracted_size = fad[0].pos * 8;
+
+    if (!(extracted_size == 0 && do_trim)) {
+        extracted = erts_extract_sub_binary(&fa->factory.hp, orig,
+                                            binary_bytes(orig),
+                                            extracted_offset,
+                                            extracted_size);
+        fa->term = CONS(fa->factory.hp, extracted, fa->term);
+        fa->factory.hp += 2;
     }
+
     erts_factory_close(&(fa->factory));
 
     return fa->term;
@@ -1868,8 +1940,8 @@ BIF_RETTYPE erts_binary_part(Process *p, Eterm binary, Eterm epos, Eterm elen)
     Uint offset;
     Uint bit_offset;
     Uint bit_size;
-    Eterm* hp;
-    ErlSubBin* sb;
+    Eterm *hp, *hp_end;
+    Eterm result;
 
     if (is_not_binary(binary)) {
 	goto badarg;
@@ -1901,120 +1973,23 @@ BIF_RETTYPE erts_binary_part(Process *p, Eterm binary, Eterm epos, Eterm elen)
 	goto badarg;
     }
 
-
-
-    hp = HAlloc(p, ERL_SUB_BIN_SIZE);
+    hp = HeapFragOnlyAlloc(p, EXTRACT_SUB_BIN_HEAP_NEED);
+    hp_end = hp + EXTRACT_SUB_BIN_HEAP_NEED;
 
     ERTS_GET_REAL_BIN(binary, orig, offset, bit_offset, bit_size);
-    sb = (ErlSubBin *) hp;
-    sb->thing_word = HEADER_SUB_BIN;
-    sb->size = len;
-    sb->offs = offset + pos;
-    sb->orig = orig;
-    sb->bitoffs = bit_offset;
-    sb->bitsize = 0;
-    sb->is_writable = 0;
-
-    BIF_RET(make_binary(sb));
-
- badarg:
-    BIF_ERROR(p, BADARG);
-}
-
-#define ERTS_NEED_GC(p, need) ((HEAP_LIMIT((p)) - HEAP_TOP((p))) <= (need))
-
-BIF_RETTYPE erts_gc_binary_part(Process *p, Eterm *reg, Eterm live, int range_is_tuple)
-{
-    Uint pos;
-    Sint len;
-    size_t orig_size;
-    Eterm orig;
-    Uint offset;
-    Uint bit_offset;
-    Uint bit_size;
-    Eterm* hp;
-    ErlSubBin* sb;
-    Eterm binary;
-    Eterm *tp;
-    Eterm epos, elen;
-    int extra_args;
-
-
-    if (range_is_tuple) {
-	Eterm tpl = reg[live];
-	extra_args = 1;
-	if (is_not_tuple(tpl)) {
-	    goto badarg;
-	}
-	tp = tuple_val(tpl);
-	if (arityval(*tp) != 2) {
-	    goto badarg;
-	}
-
-	epos = tp[1];
-	elen = tp[2];
-    } else {
-	extra_args = 2;
-	epos = reg[live-1];
-	elen = reg[live];
-    }
-    binary = reg[live-extra_args];
-
-    if (is_not_binary(binary)) {
-	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;
-    }
-    if ((orig_size = binary_size(binary)) < pos ||
-	orig_size < (pos + len)) {
-	goto badarg;
-    }
-
-    if (ERTS_NEED_GC(p, ERL_SUB_BIN_SIZE)) {
-	erts_garbage_collect(p, ERL_SUB_BIN_SIZE, reg, live+1-extra_args); /* I don't need the tuple
-									      or indices any more */
-	binary = reg[live-extra_args];
-    }
 
-    hp = p->htop;
-    p->htop += ERL_SUB_BIN_SIZE;
+    result = erts_extract_sub_binary(&hp, orig, binary_bytes(orig),
+                                     (offset + pos) * 8 + bit_offset,
+                                     len * 8);
 
-    ERTS_GET_REAL_BIN(binary, orig, offset, bit_offset, bit_size);
-
-    sb = (ErlSubBin *) hp;
-    sb->thing_word = HEADER_SUB_BIN;
-    sb->size = len;
-    sb->offs = offset + pos;
-    sb->orig = orig;
-    sb->bitoffs = bit_offset;
-    sb->bitsize = 0;
-    sb->is_writable = 0;
+    HRelease(p, hp_end, hp);
 
-    BIF_RET(make_binary(sb));
+    BIF_RET(result);
 
  badarg:
     BIF_ERROR(p, BADARG);
 }
+
 /*************************************************************
  * The actual guard BIFs are in erl_bif_guard.c
  * but the implementation of both the non-gc and the gc
@@ -2762,7 +2737,7 @@ static BIF_RETTYPE do_encode_unsigned(Process *p, Eterm uns, Eterm endianess)
 	dsize_t num_parts = BIG_SIZE(bigp);
 	Eterm res;
 	byte *b;
-	ErtsDigit d;
+	ErtsDigit d = 0;
 
 	if(BIG_SIGN(bigp)) {
 	    goto badarg;
@@ -2778,26 +2753,22 @@ static BIF_RETTYPE do_encode_unsigned(Process *p, Eterm uns, Eterm endianess)
 	if (endianess == am_big) {
 	    Sint i,j;
 	    j = 0;
-	    d = BIG_DIGIT(bigp,0);
 	    for (i=n-1;i>=0;--i) {
-		b[i] = d & 0xFF;
-		if (!((++j) % sizeof(ErtsDigit))) {
+                if (!((j++) % sizeof(ErtsDigit))) {
 		    d = BIG_DIGIT(bigp,j / sizeof(ErtsDigit));
-		} else {
-		    d >>= 8;
 		}
+                b[i] = d & 0xFF;
+                d >>= 8;
 	    }
 	} else {
 	    Sint i,j;
 	    j = 0;
-	    d = BIG_DIGIT(bigp,0);
 	    for (i=0;i<n;++i) {
-		b[i] = d & 0xFF;
-		if (!((++j) % sizeof(ErtsDigit))) {
+                if (!((j++) % sizeof(ErtsDigit))) {
 		    d = BIG_DIGIT(bigp,j / sizeof(ErtsDigit));
-		} else {
-		    d >>= 8;
 		}
+                b[i] = d & 0xFF;
+                d >>= 8;
 	    }
 
 	}
@@ -3012,17 +2983,19 @@ static void dump_bm_data(BMData *bm)
 	}
     }
     erts_printf(">>\n");
-    erts_printf("GoodShift array:\n");
-    for (i = 0; i < bm->len; ++i) {
-	erts_printf("GoodShift[%d]: %ld\n", i, bm->goodshift[i]);
-    }
-    erts_printf("BadShift array:\n");
-    j = 0;
-    for (i = 0; i < ALPHABET_SIZE; i += j) {
-	for (j = 0; i + j < ALPHABET_SIZE && j < 6; ++j) {
-	    erts_printf("BS[%03d]:%02ld, ", i+j, bm->badshift[i+j]);
+    if(bm->len > 1) {
+	erts_printf("GoodShift array:\n");
+	for (i = 0; i < bm->len; ++i) {
+	    erts_printf("GoodShift[%d]: %ld\n", i, bm->goodshift[i]);
+	}
+	erts_printf("BadShift array:\n");
+	j = 0;
+	for (i = 0; i < ALPHABET_SIZE; i += j) {
+	    for (j = 0; i + j < ALPHABET_SIZE && j < 6; ++j) {
+		erts_printf("BS[%03d]:%02ld, ", i+j, bm->badshift[i+j]);
+	    }
+	    erts_printf("\n");
 	}
-	erts_printf("\n");
     }
 }
 
diff --git a/erts/emulator/beam/erl_bif_ddll.c b/erts/emulator/beam/erl_bif_ddll.c
index 4cda0948a0..639aee29dc 100644
--- a/erts/emulator/beam/erl_bif_ddll.c
+++ b/erts/emulator/beam/erl_bif_ddll.c
@@ -829,7 +829,7 @@ BIF_RETTYPE erl_ddll_format_error_int_1(BIF_ALIST_1)
 	    "cannot be loaded/unloaded";
 	break;
     case am_permanent:
-	errstring = "DDLL driver is permanent an can not be unloaded/loaded";
+	errstring = "DDLL driver is permanent an cannot be unloaded/loaded";
 	break;
     case am_not_loaded:
 	errstring = "DDLL driver is not loaded";
diff --git a/erts/emulator/beam/erl_bif_guard.c b/erts/emulator/beam/erl_bif_guard.c
index 8a5c6ada6c..09757e473b 100644
--- a/erts/emulator/beam/erl_bif_guard.c
+++ b/erts/emulator/beam/erl_bif_guard.c
@@ -19,7 +19,12 @@
  */
 
 /*
- * Numeric guard BIFs.
+ * This file implements the former GC BIFs. They used to do a GC when
+ * they needed heap space. Because of changes to the implementation of
+ * literals, those BIFs are now allowed to allocate heap fragments
+ * (using HeapFragOnlyAlloc()). Note that they must NOT call HAlloc(),
+ * because the caller does not do any SWAPIN / SWAPOUT (that is,
+ * HEAP_TOP(p) and HEAP_LIMIT(p) contain stale values).
  */
 
 #ifdef HAVE_CONFIG_H
@@ -36,14 +41,16 @@
 #include "erl_binary.h"
 #include "erl_map.h"
 
-static Eterm gc_double_to_integer(Process* p, double x, Eterm* reg, Uint live);
-
 static Eterm double_to_integer(Process* p, double x);
+static BIF_RETTYPE erlang_length_trap(BIF_ALIST_3);
+static Export erlang_length_export;
 
-/*
- * Guard BIFs called using apply/3 and guard BIFs that never build
- * anything on the heap.
- */
+void erts_init_bif_guard(void)
+{
+    erts_init_trap_export(&erlang_length_export,
+			  am_erlang, am_length, 3,
+			  &erlang_length_trap);
+}
 
 BIF_RETTYPE abs_1(BIF_ALIST_1)
 {
@@ -56,7 +63,7 @@ BIF_RETTYPE abs_1(BIF_ALIST_1)
 	i0 = signed_val(BIF_ARG_1);
 	i = ERTS_SMALL_ABS(i0);
 	if (i0 == MIN_SMALL) {
-	    hp = HAlloc(BIF_P, BIG_UINT_HEAP_SIZE);
+	    hp = HeapFragOnlyAlloc(BIF_P, BIG_UINT_HEAP_SIZE);
 	    BIF_RET(uint_to_big(i, hp));
 	} else {
 	    BIF_RET(make_small(i));
@@ -68,7 +75,7 @@ BIF_RETTYPE abs_1(BIF_ALIST_1)
 	    int sz = big_arity(BIF_ARG_1) + 1;
 	    Uint* x;
 
-	    hp = HAlloc(BIF_P, sz);	/* See note at beginning of file */
+	    hp = HeapFragOnlyAlloc(BIF_P, sz);	/* See note at beginning of file */
 	    sz--;
 	    res = make_big(hp);
 	    x = big_val(BIF_ARG_1);
@@ -83,7 +90,7 @@ BIF_RETTYPE abs_1(BIF_ALIST_1)
 
 	GET_DOUBLE(BIF_ARG_1, f);
 	if (f.fd < 0.0) {
-	    hp = HAlloc(BIF_P, FLOAT_SIZE_OBJECT);
+	    hp = HeapFragOnlyAlloc(BIF_P, FLOAT_SIZE_OBJECT);
 	    f.fd = fabs(f.fd);
 	    res = make_float(hp);
 	    PUT_DOUBLE(f, hp);
@@ -116,7 +123,7 @@ BIF_RETTYPE float_1(BIF_ALIST_1)
     } else if (big_to_double(BIF_ARG_1, &f.fd) < 0) {
 	goto badarg;
     }
-    hp = HAlloc(BIF_P, FLOAT_SIZE_OBJECT);
+    hp = HeapFragOnlyAlloc(BIF_P, FLOAT_SIZE_OBJECT);
     res = make_float(hp);
     PUT_DOUBLE(f, hp);
     BIF_RET(res);
@@ -194,26 +201,113 @@ BIF_RETTYPE round_1(BIF_ALIST_1)
     BIF_RET(res);
 }
 
+/*
+ * This version of length/1 is called from native code and apply/3.
+ */
+
 BIF_RETTYPE length_1(BIF_ALIST_1)
 {
+    Eterm args[3];
+
+    /*
+     * Arrange argument registers the way expected by
+     * erts_trapping_length_1(). We save the original argument in
+     * args[2] in case an error should signaled.
+     */
+
+    args[0] = BIF_ARG_1;
+    args[1] = make_small(0);
+    args[2] = BIF_ARG_1;
+    return erlang_length_trap(BIF_P, args, A__I);
+}
+
+static BIF_RETTYPE erlang_length_trap(BIF_ALIST_3)
+{
+    Eterm res;
+
+    res = erts_trapping_length_1(BIF_P, BIF__ARGS);
+    if (is_value(res)) {        /* Success. */
+        BIF_RET(res);
+    } else {                    /* Trap or error. */
+        if (BIF_P->freason == TRAP) {
+            /*
+             * The available reductions were exceeded. Trap.
+             */
+            BIF_TRAP3(&erlang_length_export, BIF_P, BIF_ARG_1, BIF_ARG_2, BIF_ARG_3);
+        } else {
+            /*
+             * Signal an error. The original argument was tucked away in BIF_ARG_3.
+             */
+            ERTS_BIF_ERROR_TRAPPED1(BIF_P, BIF_P->freason,
+                                    bif_export[BIF_length_1], BIF_ARG_3);
+        }
+    }
+}
+
+/*
+ * Trappable helper function for calculating length/1.
+ *
+ * When calling this function, entries in args[] should be set up as
+ * follows:
+ *
+ *   args[0] = List to calculate length for.
+ *   args[1] = Length accumulator (tagged integer).
+ *
+ * If the return value is a tagged integer, the length was calculated
+ * successfully.
+ *
+ * Otherwise, if return value is THE_NON_VALUE and p->freason is TRAP,
+ * the available reductions were exceeded and this function must be called
+ * again after rescheduling. args[0] and args[1] have been updated to
+ * contain the next part of the list and length so far, respectively.
+ *
+ * Otherwise, if return value is THE_NON_VALUE, the list did not end
+ * in an empty list (and p->freason is BADARG).
+ */
+
+Eterm erts_trapping_length_1(Process* p, Eterm* args)
+{
     Eterm list;
     Uint i;
-     
-    if (is_nil(BIF_ARG_1)) 
-	BIF_RET(SMALL_ZERO);
-    if (is_not_list(BIF_ARG_1)) {
-	BIF_ERROR(BIF_P, BADARG);
-    }
-    list = BIF_ARG_1;
-    i = 0;
-    while (is_list(list)) {
-	i++;
+    Uint max_iter;
+    Uint saved_max_iter;
+
+#if defined(DEBUG) || defined(VALGRIND)
+    max_iter = 50;
+#else
+    max_iter = ERTS_BIF_REDS_LEFT(p) * 16;
+#endif
+    saved_max_iter = max_iter;
+    ASSERT(max_iter > 0);
+
+    list = args[0];
+    i = unsigned_val(args[1]);
+    while (is_list(list) && max_iter != 0) {
 	list = CDR(list_val(list));
+	i++, max_iter--;
+    }
+
+    if (is_list(list)) {
+        /*
+         * We have exceeded the alloted number of iterations.
+         * Save the result so far and signal a trap.
+         */
+        args[0] = list;
+        args[1] = make_small(i);
+        p->freason = TRAP;
+        BUMP_ALL_REDS(p);
+        return THE_NON_VALUE;
+    } else if (is_not_nil(list))  {
+        /* Error. Should be NIL. */
+	BIF_ERROR(p, BADARG);
     }
-    if (is_not_nil(list))  {
-	BIF_ERROR(BIF_P, BADARG);
-    }
-    BIF_RET(make_small(i));
+
+    /*
+     * We reached the end of the list successfully. Bump reductions
+     * and return result.
+     */
+    BUMP_REDS(p, (saved_max_iter - max_iter) / 16);
+    return make_small(i);
 }
 
 /* returns the size of a tuple or a binary */
@@ -229,7 +323,7 @@ BIF_RETTYPE size_1(BIF_ALIST_1)
 	if (IS_USMALL(0, sz)) {
 	    return make_small(sz);
 	} else {
-	    Eterm* hp = HAlloc(BIF_P, BIG_UINT_HEAP_SIZE);
+	    Eterm* hp = HeapFragOnlyAlloc(BIF_P, BIG_UINT_HEAP_SIZE);
 	    BIF_RET(uint_to_big(sz, hp));
 	}
     }
@@ -252,12 +346,12 @@ BIF_RETTYPE bit_size_1(BIF_ALIST_1)
 	    if (IS_USMALL(0,low_bits)) {
 		BIF_RET(make_small(low_bits));
 	    } else {
-		Eterm* hp = HAlloc(BIF_P, BIG_UINT_HEAP_SIZE);
+		Eterm* hp = HeapFragOnlyAlloc(BIF_P, BIG_UINT_HEAP_SIZE);
 		BIF_RET(uint_to_big(low_bits, hp));
 	    }
 	} else {
 	    Uint sz = BIG_UINT_HEAP_SIZE+1;
-	    Eterm* hp = HAlloc(BIF_P, sz);
+	    Eterm* hp = HeapFragOnlyAlloc(BIF_P, sz);
 	    hp[0] = make_pos_bignum_header(sz-1);
 	    BIG_DIGIT(hp,0) = low_bits;
 	    BIG_DIGIT(hp,1) = high_bits;
@@ -281,7 +375,7 @@ BIF_RETTYPE byte_size_1(BIF_ALIST_1)
 	if (IS_USMALL(0, bytesize)) {
 	    BIF_RET(make_small(bytesize));
 	} else {
-	    Eterm* hp = HAlloc(BIF_P, BIG_UINT_HEAP_SIZE);
+	    Eterm* hp = HeapFragOnlyAlloc(BIF_P, BIG_UINT_HEAP_SIZE);
 	    BIF_RET(uint_to_big(bytesize, hp));
 	}
     } else {
@@ -325,7 +419,7 @@ double_to_integer(Process* p, double x)
     }
     sz = BIG_NEED_SIZE(ds);          /* number of words including arity */
 
-    hp = HAlloc(p, sz);
+    hp = HeapFragOnlyAlloc(p, sz);
     res = make_big(hp);
     xp = (ErtsDigit*) (hp + 1);
 
@@ -371,389 +465,3 @@ BIF_RETTYPE binary_part_2(BIF_ALIST_2)
  badarg:
    BIF_ERROR(BIF_P,BADARG);
 }
-
-
-/*
- * The following code is used when a guard that may build on the
- * heap is called directly. They must not use HAlloc(), but must
- * do a garbage collection if there is insufficient heap space.
- *
- * Important note: All error checking MUST be done before doing
- * a garbage collection. The compiler assumes that all registers
- * are still valid if a guard BIF generates an exception.
- */
-
-#define ERTS_NEED_GC(p, need) ((HEAP_LIMIT((p)) - HEAP_TOP((p))) <= (need))
-
-Eterm erts_gc_length_1(Process* p, Eterm* reg, Uint live)
-{
-    Eterm list = reg[live];
-    int i;
-
-    if (is_nil(list)) 
-	return SMALL_ZERO;
-    i = 0;
-    while (is_list(list)) {
-	i++;
-	list = CDR(list_val(list));
-    }
-    if (is_not_nil(list))  {
-	BIF_ERROR(p, BADARG);
-    }
-    return make_small(i);
-}
-
-Eterm erts_gc_size_1(Process* p, Eterm* reg, Uint live)
-{
-    Eterm arg = reg[live];
-    if (is_tuple(arg)) {
-	Eterm* tupleptr = tuple_val(arg);
-	return make_small(arityval(*tupleptr));
-    } else if (is_binary(arg)) {
-	Uint sz = binary_size(arg);
-	if (IS_USMALL(0, sz)) {
-	    return make_small(sz);
-	} else {
-	    Eterm* hp;
-	    if (ERTS_NEED_GC(p, BIG_UINT_HEAP_SIZE)) {
-		erts_garbage_collect(p, BIG_UINT_HEAP_SIZE, reg, live);
-	    }
-	    hp = p->htop;
-	    p->htop += BIG_UINT_HEAP_SIZE;
-	    return uint_to_big(sz, hp);
-	}
-    }
-    BIF_ERROR(p, BADARG);
-}
-
-Eterm erts_gc_bit_size_1(Process* p, Eterm* reg, Uint live)
-{
-    Eterm arg = reg[live];
-    if (is_binary(arg)) {
-	Uint low_bits;
-	Uint bytesize;
-	Uint high_bits;
-	bytesize = binary_size(arg);
-	high_bits = bytesize >>  ((sizeof(Uint) * 8)-3);
-	low_bits = (bytesize << 3) + binary_bitsize(arg);
-	if (high_bits == 0) {
-	    if (IS_USMALL(0,low_bits)) {
-		return make_small(low_bits);
-	    } else {
-		Eterm* hp; 
-		if (ERTS_NEED_GC(p, BIG_UINT_HEAP_SIZE)) {
-		    erts_garbage_collect(p, BIG_UINT_HEAP_SIZE, reg, live);
-		}
-		hp = p->htop;
-		p->htop += BIG_UINT_HEAP_SIZE;
-		return uint_to_big(low_bits, hp);
-	    }
-	} else {
-	    Uint sz = BIG_UINT_HEAP_SIZE+1;
-	    Eterm* hp;
-	    if (ERTS_NEED_GC(p, sz)) {
-		erts_garbage_collect(p, sz, reg, live);
-	    }
-	    hp = p->htop;
-	    p->htop += sz;
-	    hp[0] = make_pos_bignum_header(sz-1);
-	    BIG_DIGIT(hp,0) = low_bits;
-	    BIG_DIGIT(hp,1) = high_bits;
-	    return make_big(hp);
-	}
-    } else {
-	BIF_ERROR(p, BADARG);
-    }
-}
-
-Eterm erts_gc_byte_size_1(Process* p, Eterm* reg, Uint live)
-{
-    Eterm arg = reg[live];
-    if (is_binary(arg)) {
-	Uint bytesize = binary_size(arg);
-	if (binary_bitsize(arg) > 0) {
-	    bytesize++;
-	}
-	if (IS_USMALL(0, bytesize)) {
-	    return make_small(bytesize);
-	} else {
-	    Eterm* hp;
-	    if (ERTS_NEED_GC(p, BIG_UINT_HEAP_SIZE)) {
-		erts_garbage_collect(p, BIG_UINT_HEAP_SIZE, reg, live);
-	    }
-	    hp = p->htop;
-	    p->htop += BIG_UINT_HEAP_SIZE;
-	    return uint_to_big(bytesize, hp);
-	}
-    } else {
-	BIF_ERROR(p, BADARG);
-    }
-}
-
-Eterm erts_gc_map_size_1(Process* p, Eterm* reg, Uint live)
-{
-    Eterm arg = reg[live];
-    if (is_flatmap(arg)) {
-	flatmap_t *mp = (flatmap_t*)flatmap_val(arg);
-        return make_small(flatmap_get_size(mp));
-    } else if (is_hashmap(arg)) {
-        Eterm* hp;
-        Uint size;
-	size = hashmap_size(arg);
-        if (IS_USMALL(0, size)) {
-            return make_small(size);
-        }
-        if (ERTS_NEED_GC(p, BIG_UINT_HEAP_SIZE)) {
-            erts_garbage_collect(p, BIG_UINT_HEAP_SIZE, reg, live);
-        }
-        hp = p->htop;
-        p->htop += BIG_UINT_HEAP_SIZE;
-        return uint_to_big(size, hp);
-    }
-    p->fvalue = arg;
-    BIF_ERROR(p, BADMAP);
-}
-
-Eterm erts_gc_abs_1(Process* p, Eterm* reg, Uint live)
-{
-    Eterm arg;
-    Eterm res;
-    Sint i0, i;
-    Eterm* hp;
-
-    arg = reg[live];
-
-    /* integer arguments */
-    if (is_small(arg)) {
-	i0 = signed_val(arg);
-	i = ERTS_SMALL_ABS(i0);
-	if (i0 == MIN_SMALL) {
-	    if (ERTS_NEED_GC(p, BIG_UINT_HEAP_SIZE)) {
-		erts_garbage_collect(p, BIG_UINT_HEAP_SIZE, reg, live+1);
-		arg = reg[live];
-	    }
-	    hp = p->htop;
-	    p->htop += BIG_UINT_HEAP_SIZE;
-	    return uint_to_big(i, hp);
-	} else {
-	    return make_small(i);
-	}
-    } else if (is_big(arg)) {
-	if (!big_sign(arg)) {
-	    return arg;
-	} else {
-	    int sz = big_arity(arg) + 1;
-	    Uint* x;
-
-	    if (ERTS_NEED_GC(p, sz)) {
-		erts_garbage_collect(p, sz, reg, live+1);
-		arg = reg[live];
-	    }
-	    hp = p->htop;
-	    p->htop += sz;
-	    sz--;
-	    res = make_big(hp);
-	    x = big_val(arg);
-	    *hp++ = make_pos_bignum_header(sz);
-	    x++;                          /* skip thing */
-	    while(sz--)
-		*hp++ = *x++;
-	    return res;
-	}
-    } else if (is_float(arg)) {
-	FloatDef f;
-
-	GET_DOUBLE(arg, f);
-	if (f.fd < 0.0) {
-	    if (ERTS_NEED_GC(p, FLOAT_SIZE_OBJECT)) {
-		erts_garbage_collect(p, FLOAT_SIZE_OBJECT, reg, live+1);
-		arg = reg[live];
-	    }
-	    hp = p->htop;
-	    p->htop += FLOAT_SIZE_OBJECT;
-	    f.fd = fabs(f.fd);
-	    res = make_float(hp);
-	    PUT_DOUBLE(f, hp);
-	    return res;
-	}
-	else
-	    return arg;
-    }
-    BIF_ERROR(p, BADARG);
-}
-
-Eterm erts_gc_float_1(Process* p, Eterm* reg, Uint live)
-{
-    Eterm arg;
-    Eterm res;
-    Eterm* hp;
-    FloatDef f;
-     
-    /* check args */
-    arg = reg[live];
-    if (is_not_integer(arg)) {
-	if (is_float(arg))  {
-	    return arg;
-	} else {
-	badarg:
-	    BIF_ERROR(p, BADARG);
-	}
-    }
-    if (is_small(arg)) {
-	Sint i = signed_val(arg);
-	f.fd = i;		/* use "C"'s auto casting */
-    } else if (big_to_double(arg, &f.fd) < 0) {
-	goto badarg;
-    }
-    if (ERTS_NEED_GC(p, FLOAT_SIZE_OBJECT)) {
-	erts_garbage_collect(p, FLOAT_SIZE_OBJECT, reg, live+1);
-	arg = reg[live];
-    }
-    hp = p->htop;
-    p->htop += FLOAT_SIZE_OBJECT;
-    res = make_float(hp);
-    PUT_DOUBLE(f, hp);
-    return res;
-}
-
-Eterm erts_gc_round_1(Process* p, Eterm* reg, Uint live)
-{
-    Eterm arg;
-    FloatDef f;
-     
-    arg = reg[live];
-    if (is_not_float(arg)) {
-	if (is_integer(arg))  {
-	    return arg;
-	}
-	BIF_ERROR(p, BADARG);
-    }
-    GET_DOUBLE(arg, f);
-
-    return gc_double_to_integer(p, round(f.fd), reg, live);
-}
-
-Eterm erts_gc_trunc_1(Process* p, Eterm* reg, Uint live)
-{
-    Eterm arg;
-    FloatDef f;
-     
-    arg = reg[live];
-    if (is_not_float(arg)) {
-	if (is_integer(arg))  {
-	    return arg;
-	}
-	BIF_ERROR(p, BADARG);
-    }
-    /* get the float */
-    GET_DOUBLE(arg, f);
-
-    /* truncate it and return the resultant integer */
-    return gc_double_to_integer(p, (f.fd >= 0.0) ? floor(f.fd) : ceil(f.fd),
-				reg, live);
-}
-
-Eterm erts_gc_floor_1(Process* p, Eterm* reg, Uint live)
-{
-    Eterm arg;
-    FloatDef f;
-
-    arg = reg[live];
-    if (is_not_float(arg)) {
-	if (is_integer(arg))  {
-	    return arg;
-	}
-	BIF_ERROR(p, BADARG);
-    }
-    GET_DOUBLE(arg, f);
-    return gc_double_to_integer(p, floor(f.fd), reg, live);
-}
-
-Eterm erts_gc_ceil_1(Process* p, Eterm* reg, Uint live)
-{
-    Eterm arg;
-    FloatDef f;
-
-    arg = reg[live];
-    if (is_not_float(arg)) {
-	if (is_integer(arg))  {
-	    return arg;
-	}
-	BIF_ERROR(p, BADARG);
-    }
-    GET_DOUBLE(arg, f);
-    return gc_double_to_integer(p, ceil(f.fd), reg, live);
-}
-
-static Eterm
-gc_double_to_integer(Process* p, double x, Eterm* reg, Uint live)
-{
-    int is_negative;
-    int ds;
-    ErtsDigit* xp;
-    int i;
-    Eterm res;
-    size_t sz;
-    Eterm* hp;
-    double dbase;
-
-    if ((x < (double) (MAX_SMALL+1)) && (x > (double) (MIN_SMALL-1))) {
-	Sint xi = x;
-	return make_small(xi);
-    }
-
-    if (x >= 0) {
-	is_negative = 0;
-    } else {
-	is_negative = 1;
-	x = -x;
-    }
-
-    /* Unscale & (calculate exponent) */
-    ds = 0;
-    dbase = ((double)(D_MASK)+1);
-    while(x >= 1.0) {
-	x /= dbase;         /* "shift" right */
-	ds++;
-    }
-    sz = BIG_NEED_SIZE(ds);          /* number of words including arity */
-    if (ERTS_NEED_GC(p, sz)) {
-	erts_garbage_collect(p, sz, reg, live);
-    }
-    hp = p->htop;
-    p->htop += sz;
-    res = make_big(hp);
-    xp = (ErtsDigit*) (hp + 1);
-
-    for (i = ds-1; i >= 0; i--) {
-	ErtsDigit d;
-
-	x *= dbase;      /* "shift" left */
-	d = x;            /* trunc */
-	xp[i] = d;        /* store digit */
-	x -= d;           /* remove integer part */
-    }
-    while ((ds & (BIG_DIGITS_PER_WORD-1)) != 0) {
-	xp[ds++] = 0;
-    }
-
-    if (is_negative) {
-	*hp = make_neg_bignum_header(sz-1);
-    } else {
-	*hp = make_pos_bignum_header(sz-1);
-    }
-    return res;
-}
-
-/********************************************************************************
- * binary_part guards. The actual implementation is in erl_bif_binary.c
- ********************************************************************************/
-Eterm erts_gc_binary_part_3(Process* p, Eterm* reg, Uint live)
-{
-    return erts_gc_binary_part(p,reg,live,0);
-}
-
-Eterm erts_gc_binary_part_2(Process* p, Eterm* reg, Uint live)
-{
-    return erts_gc_binary_part(p,reg,live,1);
-}
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index e9f170870c..4d8c3eb9dd 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -227,7 +227,7 @@ bld_magic_ref_bin_list(Uint **hpp, Uint *szp, ErlOffHeap* oh)
           }).
 */
 
-static void do_calc_mon_size(ErtsMonitor *mon, void *vpsz)
+static int do_calc_mon_size(ErtsMonitor *mon, void *vpsz, Sint reds)
 {
     ErtsMonitorData *mdp = erts_monitor_to_data(mon);
     Uint *psz = vpsz;
@@ -238,7 +238,8 @@ static void do_calc_mon_size(ErtsMonitor *mon, void *vpsz)
     else
         *psz += is_immed(mon->other.item) ? 0 : NC_HEAP_SIZE(mon->other.item);
 
-    *psz += 9; /* CONS + 6-tuple */ 
+    *psz += 9; /* CONS + 6-tuple */
+    return 1;
 }
 
 typedef struct {
@@ -248,7 +249,7 @@ typedef struct {
     Eterm tag;
 } MonListContext;
 
-static void do_make_one_mon_element(ErtsMonitor *mon, void * vpmlc)
+static int do_make_one_mon_element(ErtsMonitor *mon, void * vpmlc, Sint reds)
 {
     ErtsMonitorData *mdp = erts_monitor_to_data(mon);
     MonListContext *pmlc = vpmlc;
@@ -319,6 +320,7 @@ static void do_make_one_mon_element(ErtsMonitor *mon, void * vpmlc)
     pmlc->hp += 7;
     pmlc->res = CONS(pmlc->hp, tup, pmlc->res);
     pmlc->hp += 2;
+    return 1;
 }
 
 static Eterm 
@@ -328,7 +330,7 @@ make_monitor_list(Process *p, int tree, ErtsMonitor *root, Eterm tail)
     Uint sz = 0;
     MonListContext mlc;
     void (*foreach)(ErtsMonitor *,
-                    void (*)(ErtsMonitor *, void *),
+                    ErtsMonitorFunc,
                     void *);
 
     foreach = tree ? erts_monitor_tree_foreach : erts_monitor_list_foreach;
@@ -354,7 +356,7 @@ make_monitor_list(Process *p, int tree, ErtsMonitor *root, Eterm tail)
           }).
 */
 
-static void calc_lnk_size(ErtsLink *lnk, void *vpsz)
+static int calc_lnk_size(ErtsLink *lnk, void *vpsz, Sint reds)
 {
     Uint *psz = vpsz;
     Uint sz = 0;
@@ -364,7 +366,8 @@ static void calc_lnk_size(ErtsLink *lnk, void *vpsz)
 
     *psz += sz;
     *psz += is_immed(lnk->other.item) ? 0 : size_object(lnk->other.item);
-    *psz += 7; /* CONS + 4-tuple */ 
+    *psz += 7; /* CONS + 4-tuple */
+    return 1;
 }
 
 typedef struct {
@@ -374,7 +377,7 @@ typedef struct {
     Eterm tag;
 } LnkListContext;
 
-static void make_one_lnk_element(ErtsLink *lnk, void * vpllc)
+static int make_one_lnk_element(ErtsLink *lnk, void * vpllc, Sint reds)
 {
     LnkListContext *pllc = vpllc;
     Eterm tup, t, pid, id;
@@ -411,6 +414,7 @@ static void make_one_lnk_element(ErtsLink *lnk, void * vpllc)
     pllc->hp += 5;
     pllc->res = CONS(pllc->hp, tup, pllc->res);
     pllc->hp += 2;
+    return 1;
 }
 
 static Eterm 
@@ -420,7 +424,7 @@ make_link_list(Process *p, int tree, ErtsLink *root, Eterm tail)
     Uint sz = 0;
     LnkListContext llc;
     void (*foreach)(ErtsLink *,
-                    void (*)(ErtsLink *, void *),
+                    ErtsLinkFunc,
                     void *);
 
     foreach = tree ? erts_link_tree_foreach : erts_link_list_foreach;
@@ -519,16 +523,17 @@ do {							\
     }							\
  } while (0)
 
-static void collect_one_link(ErtsLink *lnk, void *vmicp)
+static int collect_one_link(ErtsLink *lnk, void *vmicp, Sint reds)
 {
     MonitorInfoCollection *micp = vmicp;
     EXTEND_MONITOR_INFOS(micp);
     micp->mi[micp->mi_i].entity.term = lnk->other.item;
     micp->sz += 2 + NC_HEAP_SIZE(lnk->other.item);
     micp->mi_i++;
+    return 1;
 } 
 
-static void collect_one_origin_monitor(ErtsMonitor *mon, void *vmicp)
+static int collect_one_origin_monitor(ErtsMonitor *mon, void *vmicp, Sint reds)
 {
     if (erts_monitor_is_origin(mon)) {
         MonitorInfoCollection *micp = vmicp;
@@ -573,9 +578,10 @@ static void collect_one_origin_monitor(ErtsMonitor *mon, void *vmicp)
             break;
         }
     }
+    return 1;
 }
 
-static void collect_one_target_monitor(ErtsMonitor *mon, void *vmicp)
+static int collect_one_target_monitor(ErtsMonitor *mon, void *vmicp, Sint reds)
 {
     MonitorInfoCollection *micp = vmicp;
  
@@ -612,8 +618,8 @@ static void collect_one_target_monitor(ErtsMonitor *mon, void *vmicp)
         default:
             break;
         }
-
     }
+    return 1;
 }
 
 typedef struct {
@@ -653,8 +659,8 @@ do {									\
     }									\
  } while (0)
 
-static void
-collect_one_suspend_monitor(ErtsMonitor *mon, void *vsmicp)
+static int
+collect_one_suspend_monitor(ErtsMonitor *mon, void *vsmicp, Sint reds)
 {
     if (mon->type == ERTS_MON_TYPE_SUSPEND) {
         Sint count;
@@ -678,6 +684,7 @@ collect_one_suspend_monitor(ErtsMonitor *mon, void *vsmicp)
 
 	smicp->smi_i++;
     }
+    return 1;
 }
 
 /*
@@ -2586,6 +2593,7 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
 
 	/* Need to be the only thread running... */
 	erts_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN);
+        BIF_P->scheduler_data->current_process = NULL;
 	erts_thr_progress_block();
 
 	if (BIF_ARG_1 == am_info)
@@ -2599,6 +2607,7 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
 
 	erts_thr_progress_unblock();
 	erts_proc_lock(BIF_P, ERTS_PROC_LOCK_MAIN);
+       BIF_P->scheduler_data->current_process = BIF_P;
 
 	ASSERT(dsbufp && dsbufp->str);
 	res = new_binary(BIF_P, (byte *) dsbufp->str, dsbufp->str_len);
@@ -2719,9 +2728,7 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
 	    goto bld_instruction_counts;
 	}
 
-#ifdef DEBUG
 	ASSERT(endp == hp);
-#endif
 
 	BIF_RET(res);
 #endif /* #ifndef ERTS_OPCODE_COUNTER_SUPPORT */
@@ -2981,7 +2988,7 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
     } else if (ERTS_IS_ATOM_STR("context_reductions", BIF_ARG_1)) {
 	BIF_RET(make_small(CONTEXT_REDS));
     } else if (ERTS_IS_ATOM_STR("kernel_poll", BIF_ARG_1)) {
-#ifdef ERTS_ENABLE_KERNEL_POLL
+#if ERTS_ENABLE_KERNEL_POLL
 	BIF_RET(am_true);
 #else
 	BIF_RET(am_false);
@@ -3032,6 +3039,8 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
 	BIF_RET(erts_nif_taints(BIF_P));
     } else if (ERTS_IS_ATOM_STR("reader_groups_map", BIF_ARG_1)) {
 	BIF_RET(erts_get_reader_groups_map(BIF_P));
+    } else if (ERTS_IS_ATOM_STR("decentralized_counter_groups_map", BIF_ARG_1)) {
+	BIF_RET(erts_get_decentralized_counter_groups_map(BIF_P));
     } else if (ERTS_IS_ATOM_STR("dist_buf_busy_limit", BIF_ARG_1)) {
 	Uint hsz = 0;
 
@@ -3153,19 +3162,23 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1)
 	DECL_AM(tag);
 	BIF_RET(AM_tag);
 #endif
+    } else if (ERTS_IS_ATOM_STR("system_logger", BIF_ARG_1)) {
+        BIF_RET(erts_get_system_logger());
     }
 
     BIF_ERROR(BIF_P, BADARG);
 }
 
-static void monitor_size(ErtsMonitor *mon, void *vsz)
+static int monitor_size(ErtsMonitor *mon, void *vsz, Sint reds)
 {
     *((Uint *) vsz) = erts_monitor_size(mon);
+    return 1;
 }
 
-static void link_size(ErtsMonitor *lnk, void *vsz)
+static int link_size(ErtsMonitor *lnk, void *vsz, Sint reds)
 {
     *((Uint *) vsz) = erts_link_size(lnk);
+    return 1;
 }
 
 /**********************************************************************/ 
@@ -4237,7 +4250,10 @@ BIF_RETTYPE erts_debug_get_internal_state_1(BIF_ALIST_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));
+		Eterm res = erts_term_to_binary(BIF_P, tp[2], 0, dflags);
+                if (is_value(res))
+                    BIF_RET(res);
+                BIF_ERROR(BIF_P, SYSTEM_LIMIT);
 	    }
 	    else if (ERTS_IS_ATOM_STR("dist_ctrl", tp[1])) {
 		Eterm res = am_undefined;
@@ -4444,6 +4460,7 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2)
 			BIF_P->fcalls = reds;
 		    else
 			BIF_P->fcalls = reds - CONTEXT_REDS;
+                    BIF_P->scheduler_data->virtual_reds = 0;
 		}
 		BIF_RET(am_true);
 	    }
@@ -4608,20 +4625,20 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2)
 	    }
 	}
 	else if (ERTS_IS_ATOM_STR("wait", BIF_ARG_1)) {
-	    if (ERTS_IS_ATOM_STR("deallocations", BIF_ARG_2)) {
-		int flag = ERTS_DEBUG_WAIT_COMPLETED_DEALLOCATIONS;
-		if (erts_debug_wait_completed(BIF_P, flag)) {
-		    ERTS_BIF_YIELD_RETURN(BIF_P, am_ok);
-		}
-	    }
-	    if (ERTS_IS_ATOM_STR("timer_cancellations", BIF_ARG_2)) {
-		int flag = ERTS_DEBUG_WAIT_COMPLETED_TIMER_CANCELLATIONS;
-		if (erts_debug_wait_completed(BIF_P, flag)) {
-		    ERTS_BIF_YIELD_RETURN(BIF_P, am_ok);
-		}
-	    }
+            int flag = 0;
+	    if (ERTS_IS_ATOM_STR("deallocations", BIF_ARG_2))
+                flag = ERTS_DEBUG_WAIT_COMPLETED_DEALLOCATIONS;
+            else if (ERTS_IS_ATOM_STR("timer_cancellations", BIF_ARG_2))
+		flag = ERTS_DEBUG_WAIT_COMPLETED_TIMER_CANCELLATIONS;
+            else if (ERTS_IS_ATOM_STR("aux_work", BIF_ARG_2))
+                flag = ERTS_DEBUG_WAIT_COMPLETED_AUX_WORK;
+
+            if (flag && erts_debug_wait_completed(BIF_P, flag)) {
+                ERTS_BIF_YIELD_RETURN(BIF_P, am_ok);
+            }
 	}
         else if (ERTS_IS_ATOM_STR("broken_halt", BIF_ARG_1)) {
+            erts_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN);
             broken_halt_test(BIF_ARG_2);
         }
 	else if (ERTS_IS_ATOM_STR("unique_monotonic_integer_state", BIF_ARG_1)) {
@@ -4685,6 +4702,32 @@ BIF_RETTYPE erts_debug_set_internal_state_2(BIF_ALIST_2)
             BIF_RET(am_notsup);
 #endif
         }
+        else if (ERTS_IS_ATOM_STR("ets_force_split", BIF_ARG_1)) {
+            if (is_tuple(BIF_ARG_2)) {
+                Eterm* tpl = tuple_val(BIF_ARG_2);
+
+                if (erts_ets_force_split(tpl[1], tpl[2] == am_true))
+                    BIF_RET(am_ok);
+            }
+        }
+        else if (ERTS_IS_ATOM_STR("ets_debug_random_split_join", BIF_ARG_1)) {
+            if (is_tuple(BIF_ARG_2)) {
+                Eterm* tpl = tuple_val(BIF_ARG_2);
+
+                if (erts_ets_debug_random_split_join(tpl[1], tpl[2] == am_true))
+                    BIF_RET(am_ok);
+            }
+        }
+        else if (ERTS_IS_ATOM_STR("mbuf", BIF_ARG_1)) {
+            Uint sz = size_object(BIF_ARG_2);
+            ErlHeapFragment* frag = new_message_buffer(sz);
+            Eterm *hp = frag->mem;
+            Eterm copy = copy_struct(BIF_ARG_2, sz, &hp, &frag->off_heap);
+            frag->next = BIF_P->mbuf;
+            BIF_P->mbuf = frag;
+            BIF_P->mbuf_sz += sz;
+            BIF_RET(copy);
+        }
     }
 
     BIF_ERROR(BIF_P, BADARG);
diff --git a/erts/emulator/beam/erl_bif_lists.c b/erts/emulator/beam/erl_bif_lists.c
index aaf262780f..fa2edfef1e 100644
--- a/erts/emulator/beam/erl_bif_lists.c
+++ b/erts/emulator/beam/erl_bif_lists.c
@@ -35,101 +35,270 @@
 
 static Eterm keyfind(int Bif, Process* p, Eterm Key, Eterm Pos, Eterm List);
 
+/* erlang:'++'/2
+ *
+ * Adds a list to another (LHS ++ RHS). For historical reasons this is
+ * implemented by copying LHS and setting its tail to RHS without checking
+ * that RHS is a proper list. [] ++ 'not_a_list' will therefore result in
+ * 'not_a_list', and [1,2] ++ 3 will result in [1,2|3], and this is a bug that
+ * we have to live with. */
 
-static BIF_RETTYPE append(Process* p, Eterm A, Eterm B)
-{
-    Eterm list;
-    Eterm copy;
-    Eterm last;
-    Eterm* hp = NULL;
-    Sint i;
+typedef struct {
+    Eterm lhs_original;
+    Eterm rhs_original;
 
-    list = A;
+    Eterm iterator;
 
-    if (is_nil(list)) {
-        BIF_RET(B);
-    }
+    Eterm result;
+    Eterm *result_cdr;
+} ErtsAppendContext;
+
+static int append_ctx_bin_dtor(Binary *context_bin) {
+    return 1;
+}
+
+static Eterm append_create_trap_state(Process *p,
+                                      ErtsAppendContext *from_context) {
+    ErtsAppendContext *to_context;
+    Binary *state_bin;
+    Eterm *hp;
+
+    state_bin = erts_create_magic_binary(sizeof(ErtsAppendContext),
+                                         append_ctx_bin_dtor);
 
-    if (is_not_list(list)) {
-        BIF_ERROR(p, BADARG);
+    to_context = ERTS_MAGIC_BIN_DATA(state_bin);
+    *to_context = *from_context;
+
+    if (from_context->result_cdr == &from_context->result) {
+        to_context->result_cdr = &to_context->result;
     }
 
-    /* optimistic append on heap first */
+    hp = HAlloc(p, ERTS_MAGIC_REF_THING_SIZE);
+    return erts_mk_magic_ref(&hp, &MSO(p), state_bin);
+}
+
+static BIF_RETTYPE lists_append_alloc(Process *p, ErtsAppendContext *context) {
+    static const Uint CELLS_PER_RED = 40;
+
+    Eterm *alloc_top, *alloc_end;
+    Uint cells_left, max_cells;
+    Eterm lookahead;
+
+    cells_left = max_cells = CELLS_PER_RED * ERTS_BIF_REDS_LEFT(p);
+    lookahead = context->iterator;
+
+#ifdef DEBUG
+    cells_left = max_cells = max_cells / 10 + 1;
+#endif
 
-    if ((i = HeapWordsLeft(p) / 2) < 4) {
-        goto list_tail;
+    while (cells_left != 0 && is_list(lookahead)) {
+        lookahead = CDR(list_val(lookahead));
+        cells_left--;
     }
 
-    hp   = HEAP_TOP(p);
-    copy = last = CONS(hp, CAR(list_val(list)), make_list(hp+2));
-    list = CDR(list_val(list));
-    hp  += 2;
-    i   -= 2; /* don't use the last 2 words (extra i--;) */
-
-    while(i-- && is_list(list)) {
-        Eterm* listp = list_val(list);
-        last = CONS(hp, CAR(listp), make_list(hp+2));
-        list = CDR(listp);
-        hp += 2;
+    BUMP_REDS(p, (max_cells - cells_left) / CELLS_PER_RED);
+
+    if (is_not_list(lookahead) && is_not_nil(lookahead)) {
+        /* It's possible that we're erroring out with an incomplete list, so it
+         * must be terminated or we'll leave a hole in the heap. */
+        *context->result_cdr = NIL;
+        return -1;
     }
 
-    /* A is proper and B is NIL return A as-is, don't update HTOP */
+    alloc_top = HAlloc(p, 2 * (max_cells - cells_left));
+    alloc_end = alloc_top + 2 * (max_cells - cells_left);
+
+    while (alloc_top < alloc_end) {
+        Eterm *cell = list_val(context->iterator);
+
+        ASSERT(context->iterator != lookahead);
+
+        *context->result_cdr = make_list(alloc_top);
+        context->result_cdr = &CDR(alloc_top);
+        CAR(alloc_top) = CAR(cell);
 
-    if (is_nil(list) && is_nil(B)) {
-        BIF_RET(A);
+        context->iterator = CDR(cell);
+        alloc_top += 2;
     }
 
-    if (is_nil(list)) {
-        HEAP_TOP(p) = hp;
-        CDR(list_val(last)) = B;
-        BIF_RET(copy);
+    if (is_list(context->iterator)) {
+        /* The result only has to be terminated when returning it to the user,
+         * but we're doing it when trapping as well to prevent headaches when
+         * debugging. */
+        *context->result_cdr = NIL;
+        ASSERT(cells_left == 0);
+        return 0;
+    }
+
+    *context->result_cdr = context->rhs_original;
+    ASSERT(is_nil(context->iterator));
+
+    if (is_nil(context->rhs_original)) {
+        /* The list we created was equal to the original, so we'll return that
+         * in the hopes that the garbage we created can be removed soon. */
+        context->result = context->lhs_original;
     }
 
-list_tail:
+    return 1;
+}
+
+static BIF_RETTYPE lists_append_onheap(Process *p, ErtsAppendContext *context) {
+    static const Uint CELLS_PER_RED = 60;
+
+    Eterm *alloc_start, *alloc_top, *alloc_end;
+    Uint cells_left, max_cells;
+
+    cells_left = max_cells = CELLS_PER_RED * ERTS_BIF_REDS_LEFT(p);
+
+#ifdef DEBUG
+    cells_left = max_cells = max_cells / 10 + 1;
+#endif
+
+    ASSERT(HEAP_LIMIT(p) >= HEAP_TOP(p) + 2);
+    alloc_start = HEAP_TOP(p);
+    alloc_end = HEAP_LIMIT(p) - 2;
+    alloc_top = alloc_start;
+
+    /* Don't process more cells than we have reductions for. */
+    alloc_end = MIN(alloc_top + (cells_left * 2), alloc_end);
+
+    while (alloc_top < alloc_end && is_list(context->iterator)) {
+        Eterm *cell = list_val(context->iterator);
+
+        *context->result_cdr = make_list(alloc_top);
+        context->result_cdr = &CDR(alloc_top);
+        CAR(alloc_top) = CAR(cell);
 
-    if ((i = erts_list_length(list)) < 0) {
-        BIF_ERROR(p, BADARG);
+        context->iterator = CDR(cell);
+        alloc_top += 2;
     }
 
-    /* remaining list was proper and B is NIL */
-    if (is_nil(B)) {
-        BIF_RET(A);
+    cells_left -= (alloc_top - alloc_start) / 2;
+    HEAP_TOP(p) = alloc_top;
+
+    ASSERT(cells_left >= 0 && cells_left <= max_cells);
+    BUMP_REDS(p, (max_cells - cells_left) / CELLS_PER_RED);
+
+    if (is_not_list(context->iterator) && is_not_nil(context->iterator)) {
+        *context->result_cdr = NIL;
+        return -1;
     }
 
-    if (hp) {
-        /* Note: fall through case, already written
-         * on the heap.
-         * The last 2 words of the heap is not written yet
-         */
-        Eterm *hp_save = hp;
-        ASSERT(i != 0);
-        HEAP_TOP(p) = hp + 2;
-        if (i == 1) {
-            hp[0] = CAR(list_val(list));
-            hp[1] = B;
-            BIF_RET(copy);
+    if (is_list(context->iterator)) {
+        if (cells_left > CELLS_PER_RED) {
+            return lists_append_alloc(p, context);
         }
-        hp   = HAlloc(p, 2*(i - 1));
-        last = CONS(hp_save, CAR(list_val(list)), make_list(hp));
-    } else {
-        hp   = HAlloc(p, 2*i);
-        copy = last = CONS(hp, CAR(list_val(list)), make_list(hp+2));
-        hp  += 2;
+
+        *context->result_cdr = NIL;
+        return 0;
+    }
+
+    *context->result_cdr = context->rhs_original;
+    ASSERT(is_nil(context->iterator));
+
+    if (is_nil(context->rhs_original)) {
+        context->result = context->lhs_original;
+    }
+
+    return 1;
+}
+
+static int append_continue(Process *p, ErtsAppendContext *context) {
+    /* We build the result on the unused part of the heap if possible to save
+     * us the trouble of having to figure out the list size. We fall back to
+     * lists_append_alloc when we run out of space. */
+    if (HeapWordsLeft(p) > 8) {
+        return lists_append_onheap(p, context);
     }
 
-    list = CDR(list_val(list));
-    i--;
+    return lists_append_alloc(p, context);
+}
+
+static int append_start(Process *p, Eterm lhs, Eterm rhs,
+                        ErtsAppendContext *context) {
+    context->lhs_original = lhs;
+    context->rhs_original = rhs;
+
+    context->result_cdr = &context->result;
+    context->result = NIL;
+
+    context->iterator = lhs;
+
+    return append_continue(p, context);
+}
+
+/* erlang:'++'/2 */
+static Eterm append(Export *bif_entry, BIF_ALIST_2) {
+    Eterm lhs = BIF_ARG_1, rhs = BIF_ARG_2;
+
+    if (is_nil(lhs)) {
+        /* This is buggy but expected, `[] ++ 'not_a_list'` has always resulted
+         * in 'not_a_list'. */
+        return rhs;
+    } else if (is_list(lhs)) {
+        /* We start with the context on the stack in the hopes that we won't
+         * have to trap. */
+        ErtsAppendContext context;
+        int res;
+
+        res = append_start(BIF_P, lhs, rhs, &context);
+
+        if (res == 0) {
+            Eterm state_mref;
+
+            state_mref = append_create_trap_state(BIF_P, &context);
+            erts_set_gc_state(BIF_P, 0);
+
+            BIF_TRAP2(bif_entry, BIF_P, state_mref, NIL);
+        }
+
+        if (res < 0) {
+            ASSERT(is_nil(*context.result_cdr));
+            BIF_ERROR(BIF_P, BADARG);
+        }
+
+        ASSERT(*context.result_cdr == context.rhs_original);
+        BIF_RET(context.result);
+    } else if (is_internal_magic_ref(lhs)) {
+        ErtsAppendContext *context;
+        int (*dtor)(Binary*);
+        Binary *magic_bin;
+
+        int res;
+
+        magic_bin = erts_magic_ref2bin(lhs);
+        dtor = ERTS_MAGIC_BIN_DESTRUCTOR(magic_bin);
+
+        if (dtor != append_ctx_bin_dtor) {
+            BIF_ERROR(BIF_P, BADARG);
+        }
+
+        ASSERT(BIF_P->flags & F_DISABLE_GC);
+        ASSERT(rhs == NIL);
+
+        context = ERTS_MAGIC_BIN_DATA(magic_bin);
+        res = append_continue(BIF_P, context);
+
+        if (res == 0) {
+            BIF_TRAP2(bif_entry, BIF_P, lhs, NIL);
+        }
+
+        erts_set_gc_state(BIF_P, 1);
+
+        if (res < 0) {
+            ASSERT(is_nil(*context->result_cdr));
+            ERTS_BIF_ERROR_TRAPPED2(BIF_P, BADARG, bif_entry,
+                                    context->lhs_original,
+                                    context->rhs_original);
+        }
 
-    ASSERT(i > -1);
-    while(i--) {
-        Eterm* listp = list_val(list);
-        last = CONS(hp, CAR(listp), make_list(hp+2));
-        list = CDR(listp);
-        hp  += 2;
+        ASSERT(*context->result_cdr == context->rhs_original);
+        BIF_RET(context->result);
     }
 
-    CDR(list_val(last)) = B;
-    BIF_RET(copy);
+    ASSERT(!(BIF_P->flags & F_DISABLE_GC));
+
+    BIF_ERROR(BIF_P, BADARG);
 }
 
 /*
@@ -139,12 +308,12 @@ list_tail:
 Eterm
 ebif_plusplus_2(BIF_ALIST_2)
 {
-    return append(BIF_P, BIF_ARG_1, BIF_ARG_2);
+    return append(bif_export[BIF_ebif_plusplus_2], BIF_CALL_ARGS);
 }
 
 BIF_RETTYPE append_2(BIF_ALIST_2)
 {
-    return append(BIF_P, BIF_ARG_1, BIF_ARG_2);
+    return append(bif_export[BIF_append_2], BIF_CALL_ARGS);
 }
 
 /* erlang:'--'/2
@@ -244,12 +413,25 @@ typedef struct {
 #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_CMP_KEYS(KX, KY) CMP_TERM(KX, KY)
+#define ERTS_RBT_CMP_KEYS(KX, KY) subtract_term_cmp((KX), (KY))
 #define ERTS_RBT_WANT_LOOKUP_INSERT
 #define ERTS_RBT_WANT_LOOKUP
 #define ERTS_RBT_WANT_DELETE
 #define ERTS_RBT_UNDEF
 
+/* erl_rbtree expects comparisons to return an int */
+static int subtract_term_cmp(Eterm a, Eterm b) {
+    Sint res = CMP_TERM(a, b);
+
+    if (res < 0) {
+        return -1;
+    } else if (res > 0) {
+        return 1;
+    }
+
+    return 0;
+}
+
 #include "erl_rbtree.h"
 
 static int subtract_continue(Process *p, ErtsSubtractContext *context);
@@ -915,7 +1097,7 @@ static BIF_RETTYPE lists_reverse_alloc(Process *c_p,
     list = list_in;
     tail = tail_in;
 
-    cells_left = max_cells = CELLS_PER_RED * (1 + ERTS_BIF_REDS_LEFT(c_p));
+    cells_left = max_cells = CELLS_PER_RED * ERTS_BIF_REDS_LEFT(c_p);
     lookahead = list;
 
     while (cells_left != 0 && is_list(lookahead)) {
@@ -964,7 +1146,7 @@ static BIF_RETTYPE lists_reverse_onheap(Process *c_p,
     list = list_in;
     tail = tail_in;
 
-    cells_left = max_cells = CELLS_PER_RED * (1 + ERTS_BIF_REDS_LEFT(c_p));
+    cells_left = max_cells = CELLS_PER_RED * ERTS_BIF_REDS_LEFT(c_p);
 
     ASSERT(HEAP_LIMIT(c_p) >= HEAP_TOP(c_p) + 2);
     alloc_start = HEAP_TOP(c_p);
@@ -992,8 +1174,6 @@ static BIF_RETTYPE lists_reverse_onheap(Process *c_p,
     if (is_nil(list)) {
         BIF_RET(tail);
     } else if (is_list(list)) {
-        ASSERT(is_list(tail));
-
         if (cells_left > CELLS_PER_RED) {
             return lists_reverse_alloc(c_p, list, tail);
         }
diff --git a/erts/emulator/beam/erl_bif_persistent.c b/erts/emulator/beam/erl_bif_persistent.c
index 9dca768a18..8662a9e33a 100644
--- a/erts/emulator/beam/erl_bif_persistent.c
+++ b/erts/emulator/beam/erl_bif_persistent.c
@@ -37,15 +37,6 @@
 #include "erl_binary.h"
 
 /*
- * The limit for the number of persistent terms before
- * a warning is issued.
- */
-
-#define WARNING_LIMIT 20000
-#define XSTR(s) STR(s)
-#define STR(s) #s
-
-/*
  * Parameters for the hash table.
  */
 #define INITIAL_SIZE 8
@@ -73,14 +64,69 @@ typedef struct trap_data {
     Uint memory;    /* Used by info/0 to count used memory */
 } TrapData;
 
+typedef enum {
+    ERTS_PERSISTENT_TERM_CPY_PLACE_START,
+    ERTS_PERSISTENT_TERM_CPY_PLACE_1,
+    ERTS_PERSISTENT_TERM_CPY_PLACE_2,
+    ERTS_PERSISTENT_TERM_CPY_PLACE_3
+} ErtsPersistentTermCpyTableLocation;
+
+typedef enum {
+    ERTS_PERSISTENT_TERM_CPY_NO_REHASH = 0,
+    ERTS_PERSISTENT_TERM_CPY_REHASH = 1,
+    ERTS_PERSISTENT_TERM_CPY_TEMP = 2
+} ErtsPersistentTermCpyTableType;
+
+typedef struct {
+    HashTable* old_table; /* in param */
+    Uint new_size; /* in param */
+    ErtsPersistentTermCpyTableType copy_type; /* in param */
+    Uint max_iterations; /* in param */
+    ErtsPersistentTermCpyTableLocation location; /* in/out param */
+    Uint iterations_done; /* in/out param */
+    Uint total_iterations_done; /* in/out param */
+    HashTable* new_table; /* out param */
+} ErtsPersistentTermCpyTableCtx;
+
+typedef enum {
+    PUT2_TRAP_LOCATION_NEW_KEY,
+    PUT2_TRAP_LOCATION_REPLACE_VALUE
+} ErtsPersistentTermPut2TrapLocation;
+
+typedef struct {
+    ErtsPersistentTermPut2TrapLocation trap_location;
+    Eterm key;
+    Eterm term;
+    Uint entry_index;
+    HashTable* hash_table;
+    Eterm heap[3];
+    Eterm tuple;
+    ErtsPersistentTermCpyTableCtx cpy_ctx;
+} ErtsPersistentTermPut2Context;
+
+typedef enum {
+    ERASE1_TRAP_LOCATION_TMP_COPY,
+    ERASE1_TRAP_LOCATION_FINAL_COPY
+} ErtsPersistentTermErase1TrapLocation;
+
+typedef struct {
+    ErtsPersistentTermErase1TrapLocation trap_location;
+    Eterm key;
+    HashTable* old_table;
+    HashTable* new_table;
+    Uint entry_index;
+    Eterm old_term;
+    HashTable* tmp_table;
+    ErtsPersistentTermCpyTableCtx cpy_ctx;
+} ErtsPersistentTermErase1Context;
+
 /*
  * Declarations of local functions.
  */
 
 static HashTable* create_initial_table(void);
 static Uint lookup(HashTable* hash_table, Eterm key);
-static HashTable* copy_table(HashTable* old_table, Uint new_size, int rehash);
-static HashTable* tmp_table_copy(HashTable* old_table);
+static HashTable* copy_table(ErtsPersistentTermCpyTableCtx* ctx);
 static int try_seize_update_permission(Process* c_p);
 static void release_update_permission(int release_updater);
 static void table_updater(void* table);
@@ -127,7 +173,6 @@ static Process* updater_process = NULL;
 
 /* Protected by update_table_permission_mtx */
 static ErtsThrPrgrLaterOp thr_prog_op;
-static int issued_warning = 0;
 
 /*
  * Queue of hash tables to be deleted.
@@ -139,7 +184,7 @@ static HashTable** delete_queue_tail = &delete_queue_head;
 
 /*
  * The following variables are only used during crash dumping. They
- * are intialized by erts_init_persistent_dumping().
+ * are initialized by erts_init_persistent_dumping().
  */
 
 ErtsLiteralArea** erts_persistent_areas;
@@ -188,101 +233,181 @@ void erts_init_bif_persistent_term(void)
 			  &persistent_term_info_trap);
 }
 
+/*
+ * Macro used for trapping in persistent_term_put_2 and
+ * persistent_term_erase_1
+ */
+#define TRAPPING_COPY_TABLE(TABLE_DEST, OLD_TABLE, NEW_SIZE, COPY_TYPE, LOC_NAME, TRAP_CODE) \
+    do {                                                                \
+        ctx->cpy_ctx = (ErtsPersistentTermCpyTableCtx){                 \
+            .old_table = OLD_TABLE,                                     \
+            .new_size = NEW_SIZE,                                       \
+            .copy_type = COPY_TYPE,                                     \
+            .location = ERTS_PERSISTENT_TERM_CPY_PLACE_START            \
+        };                                                              \
+        L_ ## LOC_NAME:                                                 \
+        ctx->cpy_ctx.max_iterations = MAX(1, max_iterations);           \
+        TABLE_DEST = copy_table(&ctx->cpy_ctx);                         \
+        iterations_until_trap -= ctx->cpy_ctx.total_iterations_done;    \
+        if (TABLE_DEST == NULL) {                                       \
+            ctx->trap_location = LOC_NAME;                              \
+            erts_set_gc_state(BIF_P, 0);                                \
+            BUMP_ALL_REDS(BIF_P);                                       \
+            TRAP_CODE;                                                  \
+        }                                                               \
+    } while (0)
+
+static int persistent_term_put_2_ctx_bin_dtor(Binary *context_bin)
+{
+    ErtsPersistentTermPut2Context* ctx = ERTS_MAGIC_BIN_DATA(context_bin);
+    if (ctx->cpy_ctx.new_table != NULL) {
+        erts_free(ERTS_ALC_T_PERSISTENT_TERM, ctx->cpy_ctx.new_table);
+        release_update_permission(0);
+    }
+    return 1;
+}
+/*
+ * A linear congruential generator that is used in the debug emulator
+ * to trap after a random number of iterations in
+ * persistent_term_put_2 and persistent_term_erase_1.
+ *
+ * https://en.wikipedia.org/wiki/Linear_congruential_generator
+ */
+#define GET_SMALL_RANDOM_INT(SEED)              \
+    (1103515245 * (SEED) + 12345)  % 227
+
 BIF_RETTYPE persistent_term_put_2(BIF_ALIST_2)
 {
-    Eterm key;
-    Eterm term;
-    Eterm heap[3];
-    Eterm tuple;
-    HashTable* hash_table;
-    Uint term_size;
-    Uint lit_area_size;
-    ErlOffHeap code_off_heap;
-    ErtsLiteralArea* literal_area;
-    erts_shcopy_t info;
-    Eterm* ptr;
-    Uint entry_index;
+    static const Uint ITERATIONS_PER_RED = 32;
+    ErtsPersistentTermPut2Context* ctx;
+    Eterm state_mref = THE_NON_VALUE;
+    long iterations_until_trap;
+    long max_iterations;
+#define PUT_TRAP_CODE                                                   \
+    BIF_TRAP2(bif_export[BIF_persistent_term_put_2], BIF_P, state_mref, BIF_ARG_2)
+#define TRAPPING_COPY_TABLE_PUT(TABLE_DEST, OLD_TABLE, NEW_SIZE, COPY_TYPE, LOC_NAME) \
+    TRAPPING_COPY_TABLE(TABLE_DEST, OLD_TABLE, NEW_SIZE, COPY_TYPE, LOC_NAME, PUT_TRAP_CODE)
+
+#ifdef DEBUG
+        (void)ITERATIONS_PER_RED;
+        iterations_until_trap = max_iterations =
+            GET_SMALL_RANDOM_INT(ERTS_BIF_REDS_LEFT(BIF_P) + (Uint)&ctx);
+#else
+        iterations_until_trap = max_iterations =
+            ITERATIONS_PER_RED * ERTS_BIF_REDS_LEFT(BIF_P);
+#endif
+    if (is_internal_magic_ref(BIF_ARG_1) &&
+        (ERTS_MAGIC_BIN_DESTRUCTOR(erts_magic_ref2bin(BIF_ARG_1)) ==
+         persistent_term_put_2_ctx_bin_dtor)) {
+        /* Restore state after a trap */
+        Binary* state_bin;
+        state_mref = BIF_ARG_1;
+        state_bin = erts_magic_ref2bin(state_mref);
+        ctx = ERTS_MAGIC_BIN_DATA(state_bin);
+        ASSERT(BIF_P->flags & F_DISABLE_GC);
+        erts_set_gc_state(BIF_P, 1);
+        switch (ctx->trap_location) {
+        case PUT2_TRAP_LOCATION_NEW_KEY:
+            goto L_PUT2_TRAP_LOCATION_NEW_KEY;
+        case PUT2_TRAP_LOCATION_REPLACE_VALUE:
+            goto L_PUT2_TRAP_LOCATION_REPLACE_VALUE;
+        }
+    } else {
+        /* Save state in magic bin in case trapping is necessary */
+        Eterm* hp;
+        Binary* state_bin = erts_create_magic_binary(sizeof(ErtsPersistentTermPut2Context),
+                                                     persistent_term_put_2_ctx_bin_dtor);
+        hp = HAlloc(BIF_P, ERTS_MAGIC_REF_THING_SIZE);
+        state_mref = erts_mk_magic_ref(&hp, &MSO(BIF_P), state_bin);
+        ctx = ERTS_MAGIC_BIN_DATA(state_bin);
+        /*
+         * IMPORTANT: The following field is used to detect if
+         * persistent_term_put_2_ctx_bin_dtor needs to free memory
+         */
+        ctx->cpy_ctx.new_table = NULL;
+    }
+
 
     if (!try_seize_update_permission(BIF_P)) {
 	ERTS_BIF_YIELD2(bif_export[BIF_persistent_term_put_2],
                         BIF_P, BIF_ARG_1, BIF_ARG_2);
     }
+    ctx->hash_table = (HashTable *) erts_atomic_read_nob(&the_hash_table);
 
-    hash_table = (HashTable *) erts_atomic_read_nob(&the_hash_table);
+    ctx->key = BIF_ARG_1;
+    ctx->term = BIF_ARG_2;
 
-    key = BIF_ARG_1;
-    term = BIF_ARG_2;
+    ctx->entry_index = lookup(ctx->hash_table, ctx->key);
 
-    entry_index = lookup(hash_table, key);
-
-    heap[0] = make_arityval(2);
-    heap[1] = key;
-    heap[2] = term;
-    tuple = make_tuple(heap);
+    ctx->heap[0] = make_arityval(2);
+    ctx->heap[1] = ctx->key;
+    ctx->heap[2] = ctx->term;
+    ctx->tuple = make_tuple(ctx->heap);
 
-    if (is_nil(hash_table->term[entry_index])) {
-        Uint size = hash_table->allocated;
-        if (MUST_GROW(hash_table)) {
-            size *= 2;
+    if (is_nil(ctx->hash_table->term[ctx->entry_index])) {
+        Uint new_size = ctx->hash_table->allocated;
+        if (MUST_GROW(ctx->hash_table)) {
+            new_size *= 2;
         }
-        hash_table = copy_table(hash_table, size, 0);
-        entry_index = lookup(hash_table, key);
-        hash_table->num_entries++;
+        TRAPPING_COPY_TABLE_PUT(ctx->hash_table,
+                                ctx->hash_table,
+                                new_size,
+                                ERTS_PERSISTENT_TERM_CPY_NO_REHASH,
+                                PUT2_TRAP_LOCATION_NEW_KEY);
+        ctx->entry_index = lookup(ctx->hash_table, ctx->key);
+        ctx->hash_table->num_entries++;
     } else {
-        Eterm tuple = hash_table->term[entry_index];
+        Eterm tuple = ctx->hash_table->term[ctx->entry_index];
         Eterm old_term;
 
         ASSERT(is_tuple_arity(tuple, 2));
         old_term = boxed_val(tuple)[2];
-        if (EQ(term, old_term)) {
+        if (EQ(ctx->term, old_term)) {
             /* Same value. No need to update anything. */
             release_update_permission(0);
             BIF_RET(am_ok);
         } else {
             /* Mark the old term for deletion. */
-            mark_for_deletion(hash_table, entry_index);
-            hash_table = copy_table(hash_table, hash_table->allocated, 0);
+            mark_for_deletion(ctx->hash_table, ctx->entry_index);
+            TRAPPING_COPY_TABLE_PUT(ctx->hash_table,
+                                    ctx->hash_table,
+                                    ctx->hash_table->allocated,
+                                    ERTS_PERSISTENT_TERM_CPY_NO_REHASH,
+                                    PUT2_TRAP_LOCATION_REPLACE_VALUE);
         }
     }
 
-    /*
-     * Preserve internal sharing in the term by using the
-     * sharing-preserving functions. However, literals must
-     * be copied in case the module holding them are unloaded.
-     */
-    INITIALIZE_SHCOPY(info);
-    info.copy_literals = 1;
-    term_size = copy_shared_calculate(tuple, &info);
-    ERTS_INIT_OFF_HEAP(&code_off_heap);
-    lit_area_size = ERTS_LITERAL_AREA_ALLOC_SIZE(term_size);
-    literal_area = erts_alloc(ERTS_ALC_T_LITERAL, lit_area_size);
-    ptr = &literal_area->start[0];
-    literal_area->end = ptr + term_size;
-    tuple = copy_shared_perform(tuple, term_size, &info, &ptr, &code_off_heap);
-    ASSERT(tuple_val(tuple) == literal_area->start);
-    literal_area->off_heap = code_off_heap.first;
-    DESTROY_SHCOPY(info);
-    erts_set_literal_tag(&tuple, literal_area->start, term_size);
-    hash_table->term[entry_index] = tuple;
-
-    erts_schedule_thr_prgr_later_op(table_updater, hash_table, &thr_prog_op);
-    suspend_updater(BIF_P);
-
-    /*
-     * Issue a warning once if the warning limit has been exceeded.
-     */
-
-    if (hash_table->num_entries > WARNING_LIMIT && issued_warning == 0) {
-        static char w[] =
-            "More than " XSTR(WARNING_LIMIT) " persistent terms "
-            "have been created.\n"
-            "It is recommended to avoid creating an excessive number of\n"
-            "persistent terms, as creation and deletion of persistent terms\n"
-            "will be slower as the number of persistent terms increases.\n";
-        issued_warning = 1;
-	erts_send_warning_to_logger_str(BIF_P->group_leader, w);
+    {
+        Uint term_size;
+        Uint lit_area_size;
+        ErlOffHeap code_off_heap;
+        ErtsLiteralArea* literal_area;
+        erts_shcopy_t info;
+        Eterm* ptr;
+        /*
+         * Preserve internal sharing in the term by using the
+         * sharing-preserving functions. However, literals must
+         * be copied in case the module holding them are unloaded.
+         */
+        INITIALIZE_SHCOPY(info);
+        info.copy_literals = 1;
+        term_size = copy_shared_calculate(ctx->tuple, &info);
+        ERTS_INIT_OFF_HEAP(&code_off_heap);
+        lit_area_size = ERTS_LITERAL_AREA_ALLOC_SIZE(term_size);
+        literal_area = erts_alloc(ERTS_ALC_T_LITERAL, lit_area_size);
+        ptr = &literal_area->start[0];
+        literal_area->end = ptr + term_size;
+        ctx->tuple = copy_shared_perform(ctx->tuple, term_size, &info, &ptr, &code_off_heap);
+        ASSERT(tuple_val(ctx->tuple) == literal_area->start);
+        literal_area->off_heap = code_off_heap.first;
+        DESTROY_SHCOPY(info);
+        erts_set_literal_tag(&ctx->tuple, literal_area->start, term_size);
+        ctx->hash_table->term[ctx->entry_index] = ctx->tuple;
+
+        erts_schedule_thr_prgr_later_op(table_updater, ctx->hash_table, &thr_prog_op);
+        suspend_updater(BIF_P);
     }
-
+    BUMP_REDS(BIF_P, (max_iterations - iterations_until_trap) / ITERATIONS_PER_RED);
     ERTS_BIF_YIELD_RETURN(BIF_P, am_ok);
 }
 
@@ -332,26 +457,101 @@ BIF_RETTYPE persistent_term_get_1(BIF_ALIST_1)
     BIF_ERROR(BIF_P, BADARG);
 }
 
-BIF_RETTYPE persistent_term_erase_1(BIF_ALIST_1)
+BIF_RETTYPE persistent_term_get_2(BIF_ALIST_2)
 {
     Eterm key = BIF_ARG_1;
-    HashTable* old_table;
-    HashTable* new_table;
+    Eterm result = BIF_ARG_2;
+    HashTable* hash_table = (HashTable *) erts_atomic_read_nob(&the_hash_table);
     Uint entry_index;
-    Eterm old_term;
+    Eterm term;
+
+    entry_index = lookup(hash_table, key);
+    term = hash_table->term[entry_index];
+    if (is_boxed(term)) {
+        ASSERT(is_tuple_arity(term, 2));
+        result = tuple_val(term)[2];
+    }
+    BIF_RET(result);
+}
+
+static int persistent_term_erase_1_ctx_bin_dtor(Binary *context_bin)
+{
+    ErtsPersistentTermErase1Context* ctx = ERTS_MAGIC_BIN_DATA(context_bin);
+    if (ctx->cpy_ctx.new_table != NULL) {
+        if (ctx->cpy_ctx.copy_type == ERTS_PERSISTENT_TERM_CPY_TEMP) {
+            erts_free(ERTS_ALC_T_PERSISTENT_TERM_TMP, ctx->cpy_ctx.new_table);
+        } else {
+            erts_free(ERTS_ALC_T_PERSISTENT_TERM, ctx->cpy_ctx.new_table);
+        }
+        if (ctx->tmp_table != NULL) {
+            erts_free(ERTS_ALC_T_PERSISTENT_TERM_TMP, ctx->tmp_table);
+        }
+        release_update_permission(0);
+    }
+    return 1;
+}
 
+BIF_RETTYPE persistent_term_erase_1(BIF_ALIST_1)
+{
+    static const Uint ITERATIONS_PER_RED = 32;
+    ErtsPersistentTermErase1Context* ctx;
+    Eterm state_mref = THE_NON_VALUE;
+    long iterations_until_trap;
+    long max_iterations;
+#ifdef DEBUG
+        (void)ITERATIONS_PER_RED;
+        iterations_until_trap = max_iterations =
+            GET_SMALL_RANDOM_INT(ERTS_BIF_REDS_LEFT(BIF_P) + (Uint)&ctx);
+#else
+        iterations_until_trap = max_iterations =
+            ITERATIONS_PER_RED * ERTS_BIF_REDS_LEFT(BIF_P);
+#endif
+#define ERASE_TRAP_CODE                                                 \
+        BIF_TRAP1(bif_export[BIF_persistent_term_erase_1], BIF_P, state_mref);
+#define TRAPPING_COPY_TABLE_ERASE(TABLE_DEST, OLD_TABLE, NEW_SIZE, REHASH, LOC_NAME) \
+        TRAPPING_COPY_TABLE(TABLE_DEST, OLD_TABLE, NEW_SIZE, REHASH, LOC_NAME, ERASE_TRAP_CODE)
+    if (is_internal_magic_ref(BIF_ARG_1) &&
+        (ERTS_MAGIC_BIN_DESTRUCTOR(erts_magic_ref2bin(BIF_ARG_1)) ==
+         persistent_term_erase_1_ctx_bin_dtor)) {
+        /* Restore the state after a trap */
+        Binary* state_bin;
+        state_mref = BIF_ARG_1;
+        state_bin = erts_magic_ref2bin(state_mref);
+        ctx = ERTS_MAGIC_BIN_DATA(state_bin);
+        ASSERT(BIF_P->flags & F_DISABLE_GC);
+        erts_set_gc_state(BIF_P, 1);
+        switch (ctx->trap_location) {
+        case ERASE1_TRAP_LOCATION_TMP_COPY:
+            goto L_ERASE1_TRAP_LOCATION_TMP_COPY;
+        case ERASE1_TRAP_LOCATION_FINAL_COPY:
+            goto L_ERASE1_TRAP_LOCATION_FINAL_COPY;
+        }
+    } else {
+        /* Save state in magic bin in case trapping is necessary */
+        Eterm* hp;
+        Binary* state_bin = erts_create_magic_binary(sizeof(ErtsPersistentTermErase1Context),
+                                                     persistent_term_erase_1_ctx_bin_dtor);
+        hp = HAlloc(BIF_P, ERTS_MAGIC_REF_THING_SIZE);
+        state_mref = erts_mk_magic_ref(&hp, &MSO(BIF_P), state_bin);
+        ctx = ERTS_MAGIC_BIN_DATA(state_bin);
+        /*
+         * IMPORTANT: The following two fields are used to detect if
+         * persistent_term_erase_1_ctx_bin_dtor needs to free memory
+         */
+        ctx->cpy_ctx.new_table = NULL;
+        ctx->tmp_table = NULL;
+    }
     if (!try_seize_update_permission(BIF_P)) {
 	ERTS_BIF_YIELD1(bif_export[BIF_persistent_term_erase_1],
                         BIF_P, BIF_ARG_1);
     }
 
-    old_table = (HashTable *) erts_atomic_read_nob(&the_hash_table);
-    entry_index = lookup(old_table, key);
-    old_term = old_table->term[entry_index];
-    if (is_boxed(old_term)) {
+    ctx->key = BIF_ARG_1;
+    ctx->old_table = (HashTable *) erts_atomic_read_nob(&the_hash_table);
+    ctx->entry_index = lookup(ctx->old_table, ctx->key);
+    ctx->old_term = ctx->old_table->term[ctx->entry_index];
+    if (is_boxed(ctx->old_term)) {
         Uint new_size;
-        HashTable* tmp_table;
-
         /*
          * Since we don't use any delete markers, we must rehash
          * the table when deleting terms to ensure that all terms
@@ -361,8 +561,12 @@ BIF_RETTYPE persistent_term_erase_1(BIF_ALIST_1)
          * temporary table copy of the same size as the old one.
          */
 
-        ASSERT(is_tuple_arity(old_term, 2));
-        tmp_table = tmp_table_copy(old_table);
+        ASSERT(is_tuple_arity(ctx->old_term, 2));
+        TRAPPING_COPY_TABLE_ERASE(ctx->tmp_table,
+                                  ctx->old_table,
+                                  ctx->old_table->allocated,
+                                  ERTS_PERSISTENT_TERM_CPY_TEMP,
+                                  ERASE1_TRAP_LOCATION_TMP_COPY);
 
         /*
          * Delete the term from the temporary table. Then copy the
@@ -370,18 +574,28 @@ BIF_RETTYPE persistent_term_erase_1(BIF_ALIST_1)
          * while copying.
          */
 
-        tmp_table->term[entry_index] = NIL;
-        tmp_table->num_entries--;
-        new_size = tmp_table->allocated;
-        if (MUST_SHRINK(tmp_table)) {
+        ctx->tmp_table->term[ctx->entry_index] = NIL;
+        ctx->tmp_table->num_entries--;
+        new_size = ctx->tmp_table->allocated;
+        if (MUST_SHRINK(ctx->tmp_table)) {
             new_size /= 2;
         }
-        new_table = copy_table(tmp_table, new_size, 1);
-        erts_free(ERTS_ALC_T_TMP, tmp_table);
+        TRAPPING_COPY_TABLE_ERASE(ctx->new_table,
+                                  ctx->tmp_table,
+                                  new_size,
+                                  ERTS_PERSISTENT_TERM_CPY_REHASH,
+                                  ERASE1_TRAP_LOCATION_FINAL_COPY);
+        erts_free(ERTS_ALC_T_PERSISTENT_TERM_TMP, ctx->tmp_table);
+        /*
+         * IMPORTANT: Memory management depends on that ctx->tmp_table
+         * is set to NULL on the line below
+         */
+        ctx->tmp_table = NULL;
 
-        mark_for_deletion(old_table, entry_index);
-        erts_schedule_thr_prgr_later_op(table_updater, new_table, &thr_prog_op);
+        mark_for_deletion(ctx->old_table, ctx->entry_index);
+        erts_schedule_thr_prgr_later_op(table_updater, ctx->new_table, &thr_prog_op);
         suspend_updater(BIF_P);
+        BUMP_REDS(BIF_P, (max_iterations - iterations_until_trap) / ITERATIONS_PER_RED);
         ERTS_BIF_YIELD_RETURN(BIF_P, am_true);
     }
 
@@ -389,7 +603,7 @@ BIF_RETTYPE persistent_term_erase_1(BIF_ALIST_1)
      * Key is not present. Nothing to do.
      */
 
-    ASSERT(is_nil(old_term));
+    ASSERT(is_nil(ctx->old_term));
     release_update_permission(0);
     BIF_RET(am_false);
 }
@@ -723,65 +937,104 @@ lookup(HashTable* hash_table, Eterm key)
 }
 
 static HashTable*
-tmp_table_copy(HashTable* old_table)
+copy_table(ErtsPersistentTermCpyTableCtx* ctx)
 {
-    Uint size = old_table->allocated;
-    HashTable* tmp_table;
+    Uint old_size = ctx->old_table->allocated;
     Uint i;
-
-    tmp_table = (HashTable *) erts_alloc(ERTS_ALC_T_TMP,
-                                         sizeof(HashTable) +
-                                         sizeof(Eterm) * (size-1));
-    *tmp_table = *old_table;
-    for (i = 0; i < size; i++) {
-        tmp_table->term[i] = old_table->term[i];
+    ErtsAlcType_t alloc_type;
+    ctx->total_iterations_done = 0;
+    switch(ctx->location) {
+    case ERTS_PERSISTENT_TERM_CPY_PLACE_1: goto L_copy_table_place_1;
+    case ERTS_PERSISTENT_TERM_CPY_PLACE_2: goto L_copy_table_place_2;
+    case ERTS_PERSISTENT_TERM_CPY_PLACE_3: goto L_copy_table_place_3;
+    case ERTS_PERSISTENT_TERM_CPY_PLACE_START:
+        ctx->iterations_done = 0;
     }
-    return tmp_table;
-}
-
-static HashTable*
-copy_table(HashTable* old_table, Uint new_size, int rehash)
-{
-    HashTable* new_table;
-    Uint old_size = old_table->allocated;
-    Uint i;
-
-    new_table = (HashTable *) erts_alloc(ERTS_ALC_T_PERSISTENT_TERM,
-                                         sizeof(HashTable) +
-                                         sizeof(Eterm) * (new_size-1));
-    if (old_table->allocated == new_size && !rehash) {
+    if (ctx->copy_type == ERTS_PERSISTENT_TERM_CPY_TEMP) {
+        alloc_type = ERTS_ALC_T_PERSISTENT_TERM_TMP;
+    } else {
+        alloc_type = ERTS_ALC_T_PERSISTENT_TERM;
+    }
+    ctx->new_table = (HashTable *) erts_alloc(alloc_type,
+                                              sizeof(HashTable) +
+                                              sizeof(Eterm) * (ctx->new_size-1));
+    if (ctx->old_table->allocated == ctx->new_size &&
+        (ctx->copy_type == ERTS_PERSISTENT_TERM_CPY_NO_REHASH ||
+         ctx->copy_type == ERTS_PERSISTENT_TERM_CPY_TEMP)) {
         /*
          * Same size and no key deleted. Make an exact copy of the table.
          */
-        *new_table = *old_table;
-        for (i = 0; i < new_size; i++) {
-            new_table->term[i] = old_table->term[i];
+        *ctx->new_table = *ctx->old_table;
+    L_copy_table_place_1:
+        for (i = ctx->iterations_done;
+             i < MIN(ctx->iterations_done + ctx->max_iterations,
+                     ctx->new_size);
+             i++) {
+            ctx->new_table->term[i] = ctx->old_table->term[i];
         }
+        ctx->total_iterations_done = (i - ctx->iterations_done);
+        if (i < ctx->new_size) {
+            ctx->iterations_done = i;
+            ctx->location = ERTS_PERSISTENT_TERM_CPY_PLACE_1;
+            return NULL;
+        }
+        ctx->iterations_done = 0;
     } else {
         /*
          * The size of the table has changed or an element has been
          * deleted. Must rehash, by inserting all old terms into the
          * new (empty) table.
          */
-        new_table->allocated = new_size;
-        new_table->num_entries = old_table->num_entries;
-        new_table->mask = new_size - 1;
-        for (i = 0; i < new_size; i++) {
-            new_table->term[i] = NIL;
+        ctx->new_table->allocated = ctx->new_size;
+        ctx->new_table->num_entries = ctx->old_table->num_entries;
+        ctx->new_table->mask = ctx->new_size - 1;
+    L_copy_table_place_2:
+        for (i = ctx->iterations_done;
+             i < MIN(ctx->iterations_done + ctx->max_iterations,
+                     ctx->new_size);
+             i++) {
+            ctx->new_table->term[i] = NIL;
+        }
+        ctx->total_iterations_done = (i - ctx->iterations_done);
+        ctx->max_iterations -= ctx->total_iterations_done;
+        if (i < ctx->new_size) {
+            ctx->iterations_done = i;
+            ctx->location = ERTS_PERSISTENT_TERM_CPY_PLACE_2;
+            return NULL;
         }
-        for (i = 0; i < old_size; i++) {
-            if (is_tuple(old_table->term[i])) {
-                Eterm key = tuple_val(old_table->term[i])[1];
-                Uint entry_index = lookup(new_table, key);
-                ASSERT(is_nil(new_table->term[entry_index]));
-                new_table->term[entry_index] = old_table->term[i];
+        ctx->iterations_done = 0;
+    L_copy_table_place_3:
+        for (i = ctx->iterations_done;
+             i < MIN(ctx->iterations_done + ctx->max_iterations,
+                     old_size);
+             i++) {
+            if (is_tuple(ctx->old_table->term[i])) {
+                Eterm key = tuple_val(ctx->old_table->term[i])[1];
+                Uint entry_index = lookup(ctx->new_table, key);
+                ASSERT(is_nil(ctx->new_table->term[entry_index]));
+                ctx->new_table->term[entry_index] = ctx->old_table->term[i];
             }
         }
+        ctx->total_iterations_done += (i - ctx->iterations_done);
+        if (i < old_size) {
+            ctx->iterations_done = i;
+            ctx->location = ERTS_PERSISTENT_TERM_CPY_PLACE_3;
+            return NULL;
+        }
+        ctx->iterations_done = 0;
+    }
+    ctx->new_table->first_to_delete = 0;
+    ctx->new_table->num_to_delete = 0;
+    erts_atomic_init_nob(&ctx->new_table->refc, (erts_aint_t)1);
+    {
+        HashTable* new_table = ctx->new_table;
+        /*
+         * IMPORTANT: Memory management depends on that ctx->new_table is
+         * set to NULL on the line below
+         */
+        ctx->new_table = NULL;
+        return new_table;
     }
-    new_table->first_to_delete = 0;
-    new_table->num_to_delete = 0;
-    erts_atomic_init_nob(&new_table->refc, (erts_aint_t)1);
-    return new_table;
 }
 
 static void
@@ -981,3 +1234,102 @@ next_to_delete(void)
     erts_mtx_unlock(&delete_queue_mtx);
     return table;
 }
+
+/*
+ * test/debug functionality follow...
+ */
+
+static Uint accessed_literal_areas_size;
+static Uint accessed_no_literal_areas;
+static ErtsLiteralArea **accessed_literal_areas;
+
+int
+erts_debug_have_accessed_literal_area(ErtsLiteralArea *lap)
+{
+    Uint i;
+    for (i = 0; i < accessed_no_literal_areas; i++) {
+        if (accessed_literal_areas[i] == lap)
+            return !0;
+    }
+    return 0;
+}
+
+void
+erts_debug_save_accessed_literal_area(ErtsLiteralArea *lap)
+{
+    if (accessed_no_literal_areas == accessed_literal_areas_size) {
+        accessed_literal_areas_size += 10;
+        accessed_literal_areas = erts_realloc(ERTS_ALC_T_TMP,
+                                              accessed_literal_areas,
+                                              (sizeof(ErtsLiteralArea *)
+                                               *accessed_literal_areas_size));
+    }
+    accessed_literal_areas[accessed_no_literal_areas++] = lap;
+}
+
+static void debug_foreach_off_heap(HashTable *tbl, void (*func)(ErlOffHeap *, void *), void *arg)
+{
+    int i;
+    
+    for (i = 0; i < tbl->allocated; i++) {
+        Eterm term = tbl->term[i];
+        if (is_tuple_arity(term, 2)) {
+            ErtsLiteralArea *lap = term_to_area(term);
+            ErlOffHeap oh;
+            if (!erts_debug_have_accessed_literal_area(lap)) {
+                ERTS_INIT_OFF_HEAP(&oh);
+                oh.first = lap->off_heap;
+                (*func)(&oh, arg);
+                erts_debug_save_accessed_literal_area(lap);
+            }
+        }
+    }
+}
+
+struct debug_la_oh {
+    void (*func)(ErlOffHeap *, void *);
+    void *arg;
+};
+
+static void debug_handle_table(void *vfap,
+                               ErtsThrPrgrVal val,
+                               void *vtbl)
+{
+    struct debug_la_oh *fap = vfap;
+    HashTable *tbl = vtbl;
+    debug_foreach_off_heap(tbl, fap->func, fap->arg);
+}
+
+void
+erts_debug_foreach_persistent_term_off_heap(void (*func)(ErlOffHeap *, void *), void *arg)
+{
+    HashTable *tbl;
+    struct debug_la_oh fa;
+    accessed_no_literal_areas = 0;
+    accessed_literal_areas_size = 10;
+    accessed_literal_areas = erts_alloc(ERTS_ALC_T_TMP,
+                                        (sizeof(ErtsLiteralArea *)
+                                         * accessed_literal_areas_size));
+    
+    tbl = (HashTable *) erts_atomic_read_nob(&the_hash_table);
+    debug_foreach_off_heap(tbl, func, arg);
+    erts_mtx_lock(&delete_queue_mtx);
+    for (tbl = delete_queue_head; tbl; tbl = tbl->delete_next)
+        debug_foreach_off_heap(tbl, func, arg);
+    erts_mtx_unlock(&delete_queue_mtx);
+    fa.func = func;
+    fa.arg = arg;
+    erts_debug_later_op_foreach(table_updater,
+                                debug_handle_table,
+                                (void *) &fa);
+    erts_debug_later_op_foreach(table_deleter,
+                                debug_handle_table,
+                                (void *) &fa);
+    erts_debug_foreach_release_literal_area_off_heap(func, arg);
+    
+    erts_free(ERTS_ALC_T_TMP, accessed_literal_areas);
+    accessed_no_literal_areas = 0;
+    accessed_literal_areas_size = 0;
+    accessed_literal_areas = NULL;
+}
+
diff --git a/erts/emulator/beam/erl_bif_port.c b/erts/emulator/beam/erl_bif_port.c
index 7fe4e02782..ed825d3dda 100644
--- a/erts/emulator/beam/erl_bif_port.c
+++ b/erts/emulator/beam/erl_bif_port.c
@@ -891,10 +891,6 @@ open_port(Process* p, Eterm name, Eterm settings, int *err_typep, int *err_nump)
 
 	    driver = &spawn_driver;
 	} else if (*tp == am_fd) { /* An fd port */
-	    int n;
-	    struct Sint_buf sbuf;
-	    char* p;
-
 	    if (arity != make_arityval(3)) {
 		goto badarg;
 	    }
@@ -904,15 +900,9 @@ open_port(Process* p, Eterm name, Eterm settings, int *err_typep, int *err_nump)
 	    opts.ifd = unsigned_val(tp[1]);
 	    opts.ofd = unsigned_val(tp[2]);
 
-	    /* Syntesize name from input and output descriptor. */
-	    name_buf = erts_alloc(ERTS_ALC_T_TMP,
-				  2*sizeof(struct Sint_buf) + 2); 
-	    p = Sint_to_buf(opts.ifd, &sbuf);
-	    n = sys_strlen(p);
-	    sys_strncpy(name_buf, p, n);
-	    name_buf[n] = '/';
-	    p = Sint_to_buf(opts.ofd, &sbuf);
-	    sys_strcpy(name_buf+n+1, p);
+            /* Syntesize name from input and output descriptor. */
+            name_buf = erts_alloc(ERTS_ALC_T_TMP, 256);
+            erts_snprintf(name_buf, 256, "%i/%i", opts.ifd, opts.ofd);
 
 	    driver = &fd_driver;
 	} else {
diff --git a/erts/emulator/beam/erl_bif_re.c b/erts/emulator/beam/erl_bif_re.c
index bbc64eb9aa..b3bf1c7ee3 100644
--- a/erts/emulator/beam/erl_bif_re.c
+++ b/erts/emulator/beam/erl_bif_re.c
@@ -46,7 +46,7 @@ static Export *urun_trap_exportp = NULL;
 static Export *ucompile_trap_exportp = NULL;
 
 static BIF_RETTYPE re_exec_trap(BIF_ALIST_3);
-static BIF_RETTYPE re_run(Process *p, Eterm arg1, Eterm arg2, Eterm arg3);
+static BIF_RETTYPE re_run(Process *p, Eterm arg1, Eterm arg2, Eterm arg3, int first);
 
 static void *erts_erts_pcre_malloc(size_t size) {
     return erts_alloc(ERTS_ALC_T_RE_HEAP,size);
@@ -532,10 +532,7 @@ re_compile(Process* p, Eterm arg1, Eterm arg2)
     int options = 0;
     int pflags = 0;
     int unicode = 0;
-#ifdef DEBUG
     int buffres;
-#endif
-
 
     if (parse_options(arg2,&options,NULL,&pflags,NULL,NULL,NULL,NULL)
 	< 0) {
@@ -556,12 +553,8 @@ re_compile(Process* p, Eterm arg1, Eterm arg2)
         BIF_ERROR(p,BADARG);
     }
     expr = erts_alloc(ERTS_ALC_T_RE_TMP_BUF, slen + 1);
-#ifdef DEBUG
-    buffres =
-#endif
-    erts_iolist_to_buf(arg1, expr, slen);
-
-    ASSERT(buffres >= 0);
+    buffres = erts_iolist_to_buf(arg1, expr, slen);
+    ASSERT(buffres >= 0); (void)buffres;
 
     expr[slen]='\0';
     result = erts_pcre_compile2(expr, options, &errcode, 
@@ -1052,9 +1045,7 @@ build_capture(Eterm capture_spec[CAPSPEC_SIZE], const pcre *code)
 			tmpb[ap->len] = '\0';
 		    } else {
 			ErlDrvSizeT slen;
-#ifdef DEBUG
 			int buffres;
-#endif
 
 			if (erts_iolist_size(val, &slen)) {
 			    goto error;
@@ -1068,11 +1059,8 @@ build_capture(Eterm capture_spec[CAPSPEC_SIZE], const pcre *code)
 			    }
 			}
 
-#ifdef DEBUG
-			buffres =
-#endif
-			erts_iolist_to_buf(val, tmpb, slen);
-			ASSERT(buffres >= 0);
+			buffres = erts_iolist_to_buf(val, tmpb, slen);
+			ASSERT(buffres >= 0); (void)buffres;
 			tmpb[slen] = '\0';
 		    }
 		    build_one_capture(code,&ri,&sallocated,has_dupnames,tmpb);
@@ -1106,7 +1094,7 @@ build_capture(Eterm capture_spec[CAPSPEC_SIZE], const pcre *code)
  * The actual re:run/2,3 BIFs
  */
 static BIF_RETTYPE
-re_run(Process *p, Eterm arg1, Eterm arg2, Eterm arg3)
+re_run(Process *p, Eterm arg1, Eterm arg2, Eterm arg3, int first)
 {
     const pcre *code_tmp;
     RestartContext restart;
@@ -1132,6 +1120,14 @@ re_run(Process *p, Eterm arg1, Eterm arg2, Eterm arg3)
 	< 0) {
 	BIF_ERROR(p,BADARG);
     }
+    if (!first) {
+        /*
+         * 'first' is false when re:grun() previously has called re:internal_run()
+         * with the same subject; i.e., no need to do yet another validation of
+         * the subject regarding utf8 encoding...
+         */
+        options |= PCRE_NO_UTF8_CHECK;
+    }
     is_list_cap = ((pflags & PARSE_FLAG_CAPTURE_OPT) && 
 		   (capture[CAPSPEC_TYPE] == am_list));
 
@@ -1145,9 +1141,7 @@ re_run(Process *p, Eterm arg1, Eterm arg2, Eterm arg3)
 	    const char *errstr = "";
 	    int errofset = 0;
 	    int capture_count;
-#ifdef DEBUG
 	    int buffres;
-#endif
 
 	    if (pflags & PARSE_FLAG_UNICODE && 
 		(!is_binary(arg2) || !is_binary(arg1) ||
@@ -1161,12 +1155,8 @@ re_run(Process *p, Eterm arg1, Eterm arg2, Eterm arg3)
 	    
 	    expr = erts_alloc(ERTS_ALC_T_RE_TMP_BUF, slen + 1);
 	    
-#ifdef DEBUG
-	    buffres =
-#endif
-	    erts_iolist_to_buf(arg2, expr, slen);
-
-	    ASSERT(buffres >= 0);
+	    buffres = erts_iolist_to_buf(arg2, expr, slen);
+	    ASSERT(buffres >= 0); (void)buffres;
 
 	    expr[slen]='\0';
 	    result = erts_pcre_compile2(expr, comp_options, &errcode, 
@@ -1317,9 +1307,7 @@ re_run(Process *p, Eterm arg1, Eterm arg2, Eterm arg3)
 	restart.subject = (char *) (pb->bytes+offset);
 	restart.flags |= RESTART_FLAG_SUBJECT_IN_BINARY;
     } else {
-#ifdef DEBUG
 	int buffres;
-#endif
 handle_iolist:
 	if (erts_iolist_size(arg1, &slength)) {
 	    erts_free(ERTS_ALC_T_RE_SUBJECT, restart.ovector);
@@ -1331,11 +1319,8 @@ handle_iolist:
 	}
 	restart.subject = erts_alloc(ERTS_ALC_T_RE_SUBJECT, slength);
 
-#ifdef DEBUG
-	buffres =
-#endif
-	erts_iolist_to_buf(arg1, restart.subject, slength);
-	ASSERT(buffres >= 0);
+	buffres = erts_iolist_to_buf(arg1, restart.subject, slength);
+	ASSERT(buffres >= 0); (void)buffres;
     }
 
     if (pflags & PARSE_FLAG_REPORT_ERRORS) {
@@ -1383,15 +1368,28 @@ handle_iolist:
 }
 
 BIF_RETTYPE
+re_internal_run_4(BIF_ALIST_4)
+{
+    int first;
+    if (BIF_ARG_4 == am_false)
+        first = 0;
+    else if (BIF_ARG_4 == am_true)
+        first = !0;
+    else
+        BIF_ERROR(BIF_P,BADARG);
+    return re_run(BIF_P,BIF_ARG_1, BIF_ARG_2, BIF_ARG_3, first);
+}
+
+BIF_RETTYPE
 re_run_3(BIF_ALIST_3)
 {
-    return re_run(BIF_P,BIF_ARG_1, BIF_ARG_2, BIF_ARG_3);
+    return re_run(BIF_P,BIF_ARG_1, BIF_ARG_2, BIF_ARG_3, !0);
 }
 
 BIF_RETTYPE
 re_run_2(BIF_ALIST_2) 
 {
-    return re_run(BIF_P,BIF_ARG_1, BIF_ARG_2, NIL);
+    return re_run(BIF_P,BIF_ARG_1, BIF_ARG_2, NIL, !0);
 }
 
 /*
@@ -1430,6 +1428,7 @@ static BIF_RETTYPE re_exec_trap(BIF_ALIST_3)
     loop_count = 0xFFFFFFFF;
 #endif
     rc = erts_pcre_exec(NULL, &(restartp->extra), NULL, 0, 0, 0, NULL, 0);
+
     ASSERT(loop_count != 0xFFFFFFFF);
     BUMP_REDS(BIF_P, loop_count / LOOP_FACTOR);
     if (rc == PCRE_ERROR_LOOP_LIMIT) {
@@ -1457,10 +1456,7 @@ re_inspect_2(BIF_ALIST_2)
     Eterm res;
     const pcre *code;
     byte *temp_alloc = NULL;
-#ifdef DEBUG
-    int infores;
-#endif
-    
+    int infores;    
 
     if (is_not_tuple(BIF_ARG_1) || (arityval(*tuple_val(BIF_ARG_1)) != 5)) {
 	goto error;
@@ -1484,12 +1480,8 @@ re_inspect_2(BIF_ALIST_2)
     if (erts_pcre_fullinfo(code, NULL, PCRE_INFO_OPTIONS, &options) != 0)
 	goto error;
 
-#ifdef DEBUG
-    infores =
-#endif
-    erts_pcre_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top);
-
-    ASSERT(infores == 0);
+    infores = erts_pcre_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top);
+    ASSERT(infores == 0); (void)infores;
 
     if (top <= 0) {
 	hp = HAlloc(BIF_P, 3);
@@ -1497,18 +1489,10 @@ re_inspect_2(BIF_ALIST_2)
 	erts_free_aligned_binary_bytes(temp_alloc);
 	BIF_RET(res);
     }
-#ifdef DEBUG
-    infores =
-#endif
-    erts_pcre_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize);
-
+    infores = erts_pcre_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize);
     ASSERT(infores == 0);
 
-#ifdef DEBUG
-    infores =
-#endif
-    erts_pcre_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable);
-
+    infores = erts_pcre_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable);
     ASSERT(infores == 0);
     
     has_dupnames = ((options & PCRE_DUPNAMES) != 0);
diff --git a/erts/emulator/beam/erl_bif_trace.c b/erts/emulator/beam/erl_bif_trace.c
index 711e62c795..b31d5b86cb 100644
--- a/erts/emulator/beam/erl_bif_trace.c
+++ b/erts/emulator/beam/erl_bif_trace.c
@@ -74,7 +74,7 @@ static void smp_bp_finisher(void* arg);
 static BIF_RETTYPE
 system_monitor(Process *p, Eterm monitor_pid, Eterm list);
 
-static void new_seq_trace_token(Process* p); /* help func for seq_trace_2*/
+static void new_seq_trace_token(Process* p, int); /* help func for seq_trace_2*/
 static Eterm trace_info_pid(Process* p, Eterm pid_spec, Eterm key);
 static Eterm trace_info_func(Process* p, Eterm pid_spec, Eterm key);
 static Eterm trace_info_on_load(Process* p, Eterm key);
@@ -1874,7 +1874,7 @@ Eterm erts_seq_trace(Process *p, Eterm arg1, Eterm arg2,
 
     if (current_flag && ( (arg2 == am_true) || (arg2 == am_false)) ) {
 	/* Flags */
-        new_seq_trace_token(p);
+        new_seq_trace_token(p, 0);
         flags = unsigned_val(SEQ_TRACE_TOKEN_FLAGS(p));
 	if (build_result) {
 	    old_value = flags & current_flag ? am_true : am_false;
@@ -1889,11 +1889,11 @@ Eterm erts_seq_trace(Process *p, Eterm arg1, Eterm arg2,
 	return old_value;
     }
     else if (arg1 == am_label) {
-        new_seq_trace_token(p);
+        new_seq_trace_token(p, is_not_immed(arg2));
 	if (build_result) {
 	    old_value = SEQ_TRACE_TOKEN_LABEL(p);
 	}
-	SEQ_TRACE_TOKEN_LABEL(p) = arg2;
+        SEQ_TRACE_TOKEN_LABEL(p) = arg2;
     	return old_value;
     }
     else if (arg1 == am_serial) {
@@ -1905,7 +1905,7 @@ Eterm erts_seq_trace(Process *p, Eterm arg1, Eterm arg2,
 	if ((*tp != make_arityval(2)) || is_not_small(*(tp+1)) || is_not_small(*(tp+2))) {
 	    return THE_NON_VALUE;
         }
-        new_seq_trace_token(p);
+        new_seq_trace_token(p, 0);
 	if (build_result) {
 	    hp = HAlloc(p,3);
 	    old_value = TUPLE2(hp, SEQ_TRACE_TOKEN_LASTCNT(p),
@@ -1940,8 +1940,8 @@ Eterm erts_seq_trace(Process *p, Eterm arg1, Eterm arg2,
     }
 }
 
-void
-new_seq_trace_token(Process* p)
+static void
+new_seq_trace_token(Process* p, int ensure_new_heap)
 {
     Eterm* hp;
 
@@ -1953,6 +1953,16 @@ new_seq_trace_token(Process* p)
 				    p->common.id, /* Internal pid */	/* From   */
 				    make_small(p->seq_trace_lastcnt));
     }
+    else if (ensure_new_heap) {
+        Eterm* tpl = tuple_val(SEQ_TRACE_TOKEN(p));
+        ASSERT(arityval(tpl[0]) == 5);
+        if (ErtsInArea(tpl, OLD_HEAP(p),
+                       (OLD_HEND(p) - OLD_HEAP(p))*sizeof(Eterm))) {
+            hp = HAlloc(p, 6);
+            sys_memcpy(hp, tpl, 6*sizeof(Eterm));
+            SEQ_TRACE_TOKEN(p) = make_tuple(hp);
+        }
+    }
 }
 
 BIF_RETTYPE erl_seq_trace_info(Process *p, Eterm item)
@@ -2050,10 +2060,7 @@ BIF_RETTYPE seq_trace_print_2(BIF_ALIST_2)
     if (have_no_seqtrace(SEQ_TRACE_TOKEN(BIF_P))) {
 	BIF_RET(am_false);
     }
-    if (!(is_atom(BIF_ARG_1) || is_small(BIF_ARG_1))) {
-	BIF_ERROR(BIF_P, BADARG);
-    }
-    if (SEQ_TRACE_TOKEN_LABEL(BIF_P) != BIF_ARG_1)
+    if (!EQ(BIF_ARG_1, SEQ_TRACE_TOKEN_LABEL(BIF_P)))
 	BIF_RET(am_false);
     seq_trace_update_send(BIF_P);
     seq_trace_output(SEQ_TRACE_TOKEN(BIF_P), BIF_ARG_2, 
diff --git a/erts/emulator/beam/erl_binary.h b/erts/emulator/beam/erl_binary.h
index 08edb43c49..66b59ef1a3 100644
--- a/erts/emulator/beam/erl_binary.h
+++ b/erts/emulator/beam/erl_binary.h
@@ -278,7 +278,6 @@ Eterm erts_bin_bytes_to_list(Eterm previous, Eterm* hp, byte* bytes, Uint size,
  */
 
 BIF_RETTYPE erts_list_to_binary_bif(Process *p, Eterm arg, Export *bif);
-BIF_RETTYPE erts_gc_binary_part(Process *p, Eterm *reg, Eterm live, int range_is_tuple);
 BIF_RETTYPE erts_binary_part(Process *p, Eterm binary, Eterm epos, Eterm elen);
 
 
@@ -315,6 +314,7 @@ ERTS_GLB_INLINE Binary *erts_bin_drv_alloc(Uint size);
 ERTS_GLB_INLINE Binary *erts_bin_nrml_alloc(Uint size);
 ERTS_GLB_INLINE Binary *erts_bin_realloc_fnf(Binary *bp, Uint size);
 ERTS_GLB_INLINE Binary *erts_bin_realloc(Binary *bp, Uint size);
+ERTS_GLB_INLINE void erts_magic_binary_free(Binary *bp);
 ERTS_GLB_INLINE void erts_bin_free(Binary *bp);
 ERTS_GLB_INLINE void erts_bin_release(Binary *bp);
 ERTS_GLB_INLINE Binary *erts_create_magic_binary_x(Uint size,
@@ -351,6 +351,19 @@ erts_free_aligned_binary_bytes(byte* buf)
     erts_free_aligned_binary_bytes_extra(buf,ERTS_ALC_T_TMP);
 }
 
+/* A binary's size in bits must fit into a word for matching to work. We used
+ * to allow creating larger binaries than this, but they acted really strangely
+ * in Erlang code and were pretty much only usable in drivers and NIFs.
+ *
+ * This check also ensures, indirectly, that there won't be an overflow when
+ * the size is bumped by CHICKEN_PAD and the binary struct itself. */
+#define BINARY_OVERFLOW_CHECK(BYTE_SIZE) \
+    do { \
+         if (ERTS_UNLIKELY(BYTE_SIZE > ERTS_UWORD_MAX / CHAR_BIT)) { \
+             return NULL; \
+         } \
+    } while(0)
+
 /* Explicit extra bytes allocated to counter buggy drivers.
 ** These extra bytes where earlier (< R13B04) added by an alignment-bug
 ** in this code. Do we dare remove this in some major release (R14?) maybe?
@@ -364,86 +377,114 @@ erts_free_aligned_binary_bytes(byte* buf)
 ERTS_GLB_INLINE Binary *
 erts_bin_drv_alloc_fnf(Uint size)
 {
-    Uint bsize = ERTS_SIZEOF_Binary(size) + CHICKEN_PAD;
     Binary *res;
+    Uint bsize;
+
+    BINARY_OVERFLOW_CHECK(size);
+    bsize = ERTS_SIZEOF_Binary(size) + CHICKEN_PAD;
 
-    if (bsize < size) /* overflow */
-	return NULL;
     res = erts_alloc_fnf(ERTS_ALC_T_DRV_BINARY, bsize);
     ERTS_CHK_BIN_ALIGNMENT(res);
+
     if (res) {
-	res->orig_size = size;
-	res->intern.flags = BIN_FLAG_DRV;
+        res->orig_size = size;
+        res->intern.flags = BIN_FLAG_DRV;
         erts_refc_init(&res->intern.refc, 1);
     }
+
     return res;
 }
 
 ERTS_GLB_INLINE Binary *
 erts_bin_drv_alloc(Uint size)
 {
-    Uint bsize = ERTS_SIZEOF_Binary(size) + CHICKEN_PAD;
+    Binary *res = erts_bin_drv_alloc_fnf(size);
+
+    if (res) {
+        return res;
+    }
+
+    erts_alloc_enomem(ERTS_ALC_T_DRV_BINARY, size);
+}
+
+ERTS_GLB_INLINE Binary *
+erts_bin_nrml_alloc_fnf(Uint size)
+{
     Binary *res;
+    Uint bsize;
+
+    BINARY_OVERFLOW_CHECK(size);
+    bsize = ERTS_SIZEOF_Binary(size) + CHICKEN_PAD;
 
-    if (bsize < size) /* overflow */
-	erts_alloc_enomem(ERTS_ALC_T_DRV_BINARY, size);
-    res = erts_alloc(ERTS_ALC_T_DRV_BINARY, bsize);
+    res = erts_alloc_fnf(ERTS_ALC_T_BINARY, bsize);
     ERTS_CHK_BIN_ALIGNMENT(res);
-    res->orig_size = size;
-    res->intern.flags = BIN_FLAG_DRV;
-    erts_refc_init(&res->intern.refc, 1);
+
+    if (res) {
+        res->orig_size = size;
+        res->intern.flags = 0;
+        erts_refc_init(&res->intern.refc, 1);
+    }
+
     return res;
 }
 
 ERTS_GLB_INLINE Binary *
 erts_bin_nrml_alloc(Uint size)
 {
-    Uint bsize = ERTS_SIZEOF_Binary(size) + CHICKEN_PAD;
-    Binary *res;
+    Binary *res = erts_bin_drv_alloc_fnf(size);
 
-    if (bsize < size) /* overflow */
-	erts_alloc_enomem(ERTS_ALC_T_BINARY, size);
-    res = erts_alloc(ERTS_ALC_T_BINARY, bsize);
-    ERTS_CHK_BIN_ALIGNMENT(res);
-    res->orig_size = size;
-    res->intern.flags = 0;
-    erts_refc_init(&res->intern.refc, 1);
-    return res;
+    if (res) {
+        return res;
+    }
+
+    erts_alloc_enomem(ERTS_ALC_T_BINARY, size);
 }
 
 ERTS_GLB_INLINE Binary *
 erts_bin_realloc_fnf(Binary *bp, Uint size)
 {
+    ErtsAlcType_t type;
     Binary *nbp;
-    Uint bsize = ERTS_SIZEOF_Binary(size) + CHICKEN_PAD;
-    ErtsAlcType_t type = (bp->intern.flags & BIN_FLAG_DRV) ? ERTS_ALC_T_DRV_BINARY
-	                                            : ERTS_ALC_T_BINARY;
+    Uint bsize;
+    
+    type = (bp->intern.flags & BIN_FLAG_DRV) ? ERTS_ALC_T_DRV_BINARY
+                                             : ERTS_ALC_T_BINARY;
     ASSERT((bp->intern.flags & BIN_FLAG_MAGIC) == 0);
-    if (bsize < size) /* overflow */
-	return NULL;
+
+    BINARY_OVERFLOW_CHECK(size);
+    bsize = ERTS_SIZEOF_Binary(size) + CHICKEN_PAD;
+
     nbp = erts_realloc_fnf(type, (void *) bp, bsize);
     ERTS_CHK_BIN_ALIGNMENT(nbp);
-    if (nbp)
-	nbp->orig_size = size;
+
+    if (nbp) {
+        nbp->orig_size = size;
+    }
+
     return nbp;
 }
 
 ERTS_GLB_INLINE Binary *
 erts_bin_realloc(Binary *bp, Uint size)
 {
-    Binary *nbp;
-    Uint bsize = ERTS_SIZEOF_Binary(size) + CHICKEN_PAD;
-    ErtsAlcType_t type = (bp->intern.flags & BIN_FLAG_DRV) ? ERTS_ALC_T_DRV_BINARY
-	                                            : ERTS_ALC_T_BINARY;
-    ASSERT((bp->intern.flags & BIN_FLAG_MAGIC) == 0);
-    if (bsize < size) /* overflow */
-	erts_realloc_enomem(type, bp, size);
-    nbp = erts_realloc_fnf(type, (void *) bp, bsize);
-    if (!nbp)
-	erts_realloc_enomem(type, bp, bsize);
-    ERTS_CHK_BIN_ALIGNMENT(nbp);
-    nbp->orig_size = size;
-    return nbp;
+    Binary *nbp = erts_bin_realloc_fnf(bp, size);
+
+    if (nbp) {
+        return nbp;
+    }
+
+    if (bp->intern.flags & BIN_FLAG_DRV) {
+        erts_realloc_enomem(ERTS_ALC_T_DRV_BINARY, bp, size);
+    } else {
+        erts_realloc_enomem(ERTS_ALC_T_BINARY, bp, size);
+    }
+}
+
+ERTS_GLB_INLINE void
+erts_magic_binary_free(Binary *bp)
+{
+    erts_magic_ref_remove_bin(ERTS_MAGIC_BIN_REFN(bp));
+    erts_free(ERTS_MAGIC_BIN_ATYPE(bp), (void *) bp);
 }
 
 ERTS_GLB_INLINE void
@@ -454,8 +495,7 @@ erts_bin_free(Binary *bp)
             /* Destructor took control of the deallocation */
             return;
         }
-	erts_magic_ref_remove_bin(ERTS_MAGIC_BIN_REFN(bp));
-        erts_free(ERTS_MAGIC_BIN_ATYPE(bp), (void *) bp);
+        erts_magic_binary_free(bp);
     }
     else if (bp->intern.flags & BIN_FLAG_DRV)
 	erts_free(ERTS_ALC_T_DRV_BINARY, (void *) bp);
diff --git a/erts/emulator/beam/erl_bits.c b/erts/emulator/beam/erl_bits.c
index 3a16913473..a0edbc81a4 100644
--- a/erts/emulator/beam/erl_bits.c
+++ b/erts/emulator/beam/erl_bits.c
@@ -124,10 +124,10 @@ erts_bs_start_match_2(Process *p, Eterm Binary, Uint Max)
     ProcBin* pb;
 
     ASSERT(is_binary(Binary));
+
     total_bin_size = binary_size(Binary);
-    if ((total_bin_size >> (8*sizeof(Uint)-3)) != 0) {
-	return THE_NON_VALUE;
-    }
+    ASSERT(total_bin_size <= ERTS_UWORD_MAX / CHAR_BIT);
+
     NeededSize = ERL_BIN_MATCHSTATE_SIZE(Max);
     hp = HeapOnlyAlloc(p, NeededSize);
     ms = (ErlBinMatchState *) hp;
@@ -144,6 +144,41 @@ erts_bs_start_match_2(Process *p, Eterm Binary, Uint Max)
     return make_matchstate(ms);
 }
 
+ErlBinMatchState *erts_bs_start_match_3(Process *p, Eterm Binary)
+{
+    Eterm Orig;
+    Uint offs;
+    Uint* hp;
+    Uint NeededSize;
+    ErlBinMatchState *ms;
+    Uint bitoffs;
+    Uint bitsize;
+    Uint total_bin_size;
+    ProcBin* pb;
+
+    ASSERT(is_binary(Binary));
+
+    total_bin_size = binary_size(Binary);
+    ASSERT(total_bin_size <= ERTS_UWORD_MAX / CHAR_BIT);
+
+    NeededSize = ERL_BIN_MATCHSTATE_SIZE(0);
+    hp = HeapOnlyAlloc(p, NeededSize);
+    ms = (ErlBinMatchState *) hp;
+    ERTS_GET_REAL_BIN(Binary, Orig, offs, bitoffs, bitsize);
+    pb = (ProcBin *) boxed_val(Orig);
+    if (pb->thing_word == HEADER_PROC_BIN && pb->flags != 0) {
+        erts_emasculate_writable_binary(pb);
+    }
+
+    ms->thing_word = HEADER_BIN_MATCHSTATE(0);
+    (ms->mb).orig = Orig;
+    (ms->mb).base = binary_bytes(Orig);
+    (ms->mb).offset = 8 * offs + bitoffs;
+    (ms->mb).size = total_bin_size * 8 + (ms->mb).offset + bitsize;
+
+    return ms;
+}
+
 #ifdef DEBUG
 # define CHECK_MATCH_BUFFER(MB) check_match_buffer(MB)
 
@@ -423,29 +458,25 @@ erts_bs_get_integer_2(Process *p, Uint num_bits, unsigned flags, ErlBinMatchBuff
 Eterm
 erts_bs_get_binary_2(Process *p, Uint num_bits, unsigned flags, ErlBinMatchBuffer* mb)
 {
-    ErlSubBin* sb;
+    Eterm result;
 
     CHECK_MATCH_BUFFER(mb);
-    if (mb->size - mb->offset < num_bits) {	/* Asked for too many bits.  */
-	return THE_NON_VALUE;
+    if (mb->size - mb->offset < num_bits) {
+        /* Asked for too many bits.  */
+        return THE_NON_VALUE;
     }
 
     /*
      * From now on, we can't fail.
      */
 
-    sb = (ErlSubBin *) HeapOnlyAlloc(p, ERL_SUB_BIN_SIZE);
-    
-    sb->thing_word = HEADER_SUB_BIN;
-    sb->orig = mb->orig;
-    sb->size = BYTE_OFFSET(num_bits);
-    sb->bitsize = BIT_OFFSET(num_bits);
-    sb->offs = BYTE_OFFSET(mb->offset);
-    sb->bitoffs = BIT_OFFSET(mb->offset);
-    sb->is_writable = 0;
+    result = erts_extract_sub_binary(&HEAP_TOP(p),
+                                     mb->orig, mb->base,
+                                     mb->offset, num_bits);
+
     mb->offset += num_bits;
-    
-    return make_binary(sb);
+
+    return result;
 }
 
 Eterm
@@ -509,21 +540,19 @@ erts_bs_get_float_2(Process *p, Uint num_bits, unsigned flags, ErlBinMatchBuffer
 Eterm
 erts_bs_get_binary_all_2(Process *p, ErlBinMatchBuffer* mb)
 {
-    ErlSubBin* sb;
-    Uint size;
+    Uint bit_size;
+    Eterm result;
 
     CHECK_MATCH_BUFFER(mb);
-    size =  mb->size-mb->offset;
-    sb = (ErlSubBin *) HeapOnlyAlloc(p, ERL_SUB_BIN_SIZE);
-    sb->thing_word = HEADER_SUB_BIN;
-    sb->size = BYTE_OFFSET(size);
-    sb->bitsize = BIT_OFFSET(size);
-    sb->offs = BYTE_OFFSET(mb->offset);
-    sb->bitoffs = BIT_OFFSET(mb->offset);
-    sb->is_writable = 0;
-    sb->orig = mb->orig;
-    mb->offset = mb->size;  
-    return make_binary(sb);
+    bit_size = mb->size - mb->offset;
+
+    result = erts_extract_sub_binary(&HEAP_TOP(p),
+                                     mb->orig, mb->base,
+                                     mb->offset, bit_size);
+
+    mb->offset = mb->size;
+
+    return result;
 }
 
 /****************************************************************
@@ -1295,6 +1324,14 @@ erts_bs_append(Process* c_p, Eterm* reg, Uint live, Eterm build_size_term,
 	}
     }
 
+    if (build_size_in_bits == 0) {
+        if (c_p->stop - c_p->htop < extra_words) {
+            (void) erts_garbage_collect(c_p, extra_words, reg, live+1);
+            bin = reg[live];
+        }
+	return bin;
+    }
+
     if((ERTS_UINT_MAX - build_size_in_bits) < erts_bin_offset) {
         c_p->freason = SYSTEM_LIMIT;
         return THE_NON_VALUE;
@@ -1352,13 +1389,13 @@ erts_bs_append(Process* c_p, Eterm* reg, Uint live, Eterm build_size_term,
 	Uint bitsize;
 	Eterm* hp;
 
-	/*
+        /*
 	 * Allocate heap space.
 	 */
 	heap_need = PROC_BIN_SIZE + ERL_SUB_BIN_SIZE + extra_words;
 	if (c_p->stop - c_p->htop < heap_need) {
 	    (void) erts_garbage_collect(c_p, heap_need, reg, live+1);
-	    bin = reg[live];
+            bin = reg[live];
 	}
 	hp = c_p->htop;
 
@@ -1376,6 +1413,10 @@ erts_bs_append(Process* c_p, Eterm* reg, Uint live, Eterm build_size_term,
 	    }
 	}
 
+	if (build_size_in_bits == 0) {
+            return bin;
+	}
+
         if((ERTS_UINT_MAX - build_size_in_bits) < erts_bin_offset) {
             c_p->freason = SYSTEM_LIMIT;
             return THE_NON_VALUE;
@@ -2049,3 +2090,39 @@ erts_copy_bits(byte* src,	/* Base pointer to source. */
     }
 }
 
+Eterm erts_extract_sub_binary(Eterm **hp, Eterm base_bin, byte *base_data,
+                              Uint bit_offset, Uint bit_size)
+{
+    Uint byte_offset, byte_size;
+
+    ERTS_CT_ASSERT(ERL_SUB_BIN_SIZE <= ERL_ONHEAP_BIN_LIMIT);
+
+    byte_offset = BYTE_OFFSET(bit_offset);
+    byte_size = BYTE_OFFSET(bit_size);
+
+    if (BIT_OFFSET(bit_size) == 0 && byte_size <= ERL_ONHEAP_BIN_LIMIT) {
+        ErlHeapBin *hb = (ErlHeapBin*)*hp;
+        *hp += heap_bin_size(byte_size);
+
+        hb->thing_word = header_heap_bin(byte_size);
+        hb->size = byte_size;
+
+        copy_binary_to_buffer(hb->data, 0, base_data, bit_offset, bit_size);
+
+        return make_binary(hb);
+    } else {
+        ErlSubBin *sb = (ErlSubBin*)*hp;
+        *hp += ERL_SUB_BIN_SIZE;
+
+        sb->thing_word = HEADER_SUB_BIN;
+        sb->size = byte_size;
+        sb->offs = byte_offset;
+        sb->orig = base_bin;
+        sb->bitoffs = BIT_OFFSET(bit_offset);
+        sb->bitsize = BIT_OFFSET(bit_size);
+        sb->is_writable = 0;
+
+        return make_binary(sb);
+    }
+}
+
diff --git a/erts/emulator/beam/erl_bits.h b/erts/emulator/beam/erl_bits.h
index 7beef5cfda..0b2a6f3760 100644
--- a/erts/emulator/beam/erl_bits.h
+++ b/erts/emulator/beam/erl_bits.h
@@ -73,12 +73,16 @@ struct erl_bits_state {
 typedef struct erl_bin_match_struct{
   Eterm thing_word;
   ErlBinMatchBuffer mb;		/* Present match buffer */
-  Eterm save_offset[1];		/* Saved offsets */
+  Eterm save_offset[1];         /* Saved offsets, only valid for contexts
+                                 * created through bs_start_match2. */
 } ErlBinMatchState;
 
-#define ERL_BIN_MATCHSTATE_SIZE(_Max) ((sizeof(ErlBinMatchState) + (_Max)*sizeof(Eterm))/sizeof(Eterm)) 
-#define HEADER_BIN_MATCHSTATE(_Max) _make_header(ERL_BIN_MATCHSTATE_SIZE((_Max))-1, _TAG_HEADER_BIN_MATCHSTATE)
-#define HEADER_NUM_SLOTS(hdr) (header_arity(hdr)-sizeof(ErlBinMatchState)/sizeof(Eterm)+1)
+#define ERL_BIN_MATCHSTATE_SIZE(_Max) \
+    ((offsetof(ErlBinMatchState, save_offset) + (_Max)*sizeof(Eterm))/sizeof(Eterm))
+#define HEADER_BIN_MATCHSTATE(_Max) \
+    _make_header(ERL_BIN_MATCHSTATE_SIZE((_Max)) - 1, _TAG_HEADER_BIN_MATCHSTATE)
+#define HEADER_NUM_SLOTS(hdr) \
+    (header_arity(hdr) - (offsetof(ErlBinMatchState, save_offset) / sizeof(Eterm)) + 1)
 
 #define make_matchstate(_Ms) make_boxed((Eterm*)(_Ms))  
 #define ms_matchbuffer(_Ms) &(((ErlBinMatchState*) boxed_val(_Ms))->mb)
@@ -112,7 +116,7 @@ typedef struct erl_bin_match_struct{
   do {											    \
     if (BIT_OFFSET(DstBufOffset) == 0 && (SrcBufferOffset == 0) &&			    \
         (BIT_OFFSET(NumBits)==0) && (NumBits != 0)) {					    \
-      sys_memcpy(DstBuffer+BYTE_OFFSET(DstBufOffset),					    \
+      sys_memcpy(((byte*)DstBuffer)+BYTE_OFFSET(DstBufOffset),					    \
 		 SrcBuffer, NBYTES(NumBits));						    \
     } else {										    \
       erts_copy_bits(SrcBuffer, SrcBufferOffset, 1,					    \
@@ -144,9 +148,13 @@ void erts_bits_destroy_state(ERL_BITS_PROTO_0);
  */
 
 Eterm erts_bs_start_match_2(Process *p, Eterm Bin, Uint Max);
+ErlBinMatchState *erts_bs_start_match_3(Process *p, Eterm Bin);
 Eterm erts_bs_get_integer_2(Process *p, Uint num_bits, unsigned flags, ErlBinMatchBuffer* mb);
-Eterm erts_bs_get_binary_2(Process *p, Uint num_bits, unsigned flags, ErlBinMatchBuffer* mb);
 Eterm erts_bs_get_float_2(Process *p, Uint num_bits, unsigned flags, ErlBinMatchBuffer* mb);
+
+/* These will create heap binaries when appropriate, so they require free space
+ * up to EXTRACT_SUB_BIN_HEAP_NEED. */
+Eterm erts_bs_get_binary_2(Process *p, Uint num_bits, unsigned flags, ErlBinMatchBuffer* mb);
 Eterm erts_bs_get_binary_all_2(Process *p, ErlBinMatchBuffer* mb);
 
 /*
@@ -177,6 +185,17 @@ void erts_copy_bits(byte* src, size_t soffs, int sdir,
 		    byte* dst, size_t doffs,int ddir, size_t n);        
 int erts_cmp_bits(byte* a_ptr, size_t a_offs, byte* b_ptr, size_t b_offs, size_t size); 
 
+
+/* Extracts a region from base_bin as a sub-binary or heap binary, whichever
+ * is the most appropriate.
+ *
+ * The caller must ensure that there's enough free space at *hp */
+Eterm erts_extract_sub_binary(Eterm **hp, Eterm base_bin, byte *base_data,
+                              Uint bit_offset, Uint num_bits);
+
+/* Pessimistic estimate of the words required for erts_extract_sub_binary */
+#define EXTRACT_SUB_BIN_HEAP_NEED (heap_bin_size(ERL_ONHEAP_BIN_LIMIT))
+
 /*
  * Flags for bs_get_* / bs_put_* / bs_init* instructions.
  */
diff --git a/erts/emulator/beam/erl_cpu_topology.c b/erts/emulator/beam/erl_cpu_topology.c
index 6f8d2f8c35..6a4f43297e 100644
--- a/erts/emulator/beam/erl_cpu_topology.c
+++ b/erts/emulator/beam/erl_cpu_topology.c
@@ -34,6 +34,7 @@
 #include "error.h"
 #include "bif.h"
 #include "erl_cpu_topology.h"
+#include "erl_flxctr.h"
 
 #define ERTS_MAX_READER_GROUPS 64
 
@@ -58,6 +59,7 @@ static erts_cpu_info_t *cpuinfo;
 
 static int max_main_threads;
 static int reader_groups;
+static int decentralized_counter_groups;
 
 static ErtsCpuBindData *scheduler2cpu_map;
 static erts_rwmtx_t cpuinfo_rwmtx;
@@ -127,6 +129,8 @@ static erts_cpu_groups_map_t *cpu_groups_maps;
 
 static erts_cpu_groups_map_t *reader_groups_map;
 
+static erts_cpu_groups_map_t *decentralized_counter_groups_map;
+
 #define ERTS_TOPOLOGY_CG ERTS_TOPOLOGY_MAX_DEPTH
 
 #define ERTS_MAX_CPU_TOPOLOGY_ID ((int) 0xffff)
@@ -138,6 +142,7 @@ static void cpu_bind_order_sort(erts_cpu_topology_t *cpudata,
 static void write_schedulers_bind_change(erts_cpu_topology_t *cpudata, int size);
 
 static void reader_groups_callback(int, ErtsSchedulerData *, int, void *);
+static void flxctr_groups_callback(int, ErtsSchedulerData *, int, void *);
 static erts_cpu_groups_map_t *add_cpu_groups(int groups,
 					     erts_cpu_groups_callback_t callback,
 					     void *arg);
@@ -1646,7 +1651,8 @@ erts_get_logical_processors(int *conf, int *onln, int *avail)
 }
 
 void
-erts_pre_early_init_cpu_topology(int *max_rg_p,
+erts_pre_early_init_cpu_topology(int *max_dcg_p,
+                                 int *max_rg_p,
 				 int *conf_p,
 				 int *onln_p,
 				 int *avail_p)
@@ -1654,6 +1660,7 @@ erts_pre_early_init_cpu_topology(int *max_rg_p,
     cpu_groups_maps = NULL;
     no_cpu_groups_callbacks = 0;
     *max_rg_p = ERTS_MAX_READER_GROUPS;
+    *max_dcg_p = ERTS_MAX_FLXCTR_GROUPS;
     cpuinfo = erts_cpu_info_create();
     get_logical_processors(conf_p, onln_p, avail_p);
 }
@@ -1662,7 +1669,9 @@ void
 erts_early_init_cpu_topology(int no_schedulers,
 			     int *max_main_threads_p,
 			     int max_reader_groups,
-			     int *reader_groups_p)
+			     int *reader_groups_p,
+                             int max_decentralized_counter_groups,
+                             int *decentralized_counter_groups_p)
 {
     user_cpudata = NULL;
     user_cpudata_size = 0;
@@ -1687,6 +1696,12 @@ erts_early_init_cpu_topology(int no_schedulers,
 	max_main_threads = no_schedulers;
     *max_main_threads_p = max_main_threads;
 
+    decentralized_counter_groups = max_main_threads;
+    if (decentralized_counter_groups <= 1 || max_decentralized_counter_groups <= 1)
+	decentralized_counter_groups = 1;
+    if (decentralized_counter_groups > max_decentralized_counter_groups)
+	decentralized_counter_groups = max_decentralized_counter_groups;
+    *decentralized_counter_groups_p = decentralized_counter_groups;
     reader_groups = max_main_threads;
     if (reader_groups <= 1 || max_reader_groups <= 1)
 	reader_groups = 0;
@@ -1718,6 +1733,9 @@ erts_init_cpu_topology(void)
     reader_groups_map = add_cpu_groups(reader_groups,
 				       reader_groups_callback,
 				       NULL);
+    decentralized_counter_groups_map = add_cpu_groups(decentralized_counter_groups,
+                                                      flxctr_groups_callback,
+                                                      NULL);
 
     if (cpu_bind_order == ERTS_CPU_BIND_NONE)
 	erts_rwmtx_rwunlock(&cpuinfo_rwmtx);
@@ -1789,6 +1807,15 @@ reader_groups_callback(int suspending,
 	erts_rwmtx_set_reader_group(suspending ? 0 : group+1);
 }
 
+void
+flxctr_groups_callback(int suspending,
+		       ErtsSchedulerData *esdp,
+		       int group,
+		       void *unused)
+{
+    erts_flxctr_set_slot(suspending ? 0 : group+1);
+}
+
 static Eterm get_cpu_groups_map(Process *c_p,
 				erts_cpu_groups_map_t *map,
 				int offset);
@@ -1821,6 +1848,16 @@ erts_get_reader_groups_map(Process *c_p)
     return res;
 }
 
+Eterm
+erts_get_decentralized_counter_groups_map(Process *c_p)
+{
+    Eterm res;
+    erts_rwmtx_rlock(&cpuinfo_rwmtx);
+    res = get_cpu_groups_map(c_p, decentralized_counter_groups_map, 1);
+    erts_rwmtx_runlock(&cpuinfo_rwmtx);
+    return res;
+}
+
 /*
  * CPU groups
  */
diff --git a/erts/emulator/beam/erl_cpu_topology.h b/erts/emulator/beam/erl_cpu_topology.h
index 88bcad79ab..4a428d7972 100644
--- a/erts/emulator/beam/erl_cpu_topology.h
+++ b/erts/emulator/beam/erl_cpu_topology.h
@@ -27,14 +27,19 @@
 #ifndef ERL_CPU_TOPOLOGY_H__
 #define ERL_CPU_TOPOLOGY_H__
 
-void erts_pre_early_init_cpu_topology(int *max_rg_p,
-				      int *conf_p,
-				      int *onln_p,
-				      int *avail_p);
-void erts_early_init_cpu_topology(int no_schedulers,
-				  int *max_main_threads_p,
-				  int max_reader_groups,
-				  int *reader_groups_p);
+void
+erts_pre_early_init_cpu_topology(int *max_dcg_p,
+                                 int *max_rg_p,
+				 int *conf_p,
+				 int *onln_p,
+				 int *avail_p);
+void
+erts_early_init_cpu_topology(int no_schedulers,
+			     int *max_main_threads_p,
+			     int max_reader_groups,
+			     int *reader_groups_p,
+                             int max_decentralized_counter_groups,
+                             int *decentralized_counter_groups_p);
 void erts_init_cpu_topology(void);
 
 
@@ -70,6 +75,7 @@ Eterm erts_bind_schedulers(Process *c_p, Eterm how);
 Eterm erts_get_schedulers_binds(Process *c_p);
 
 Eterm erts_get_reader_groups_map(Process *c_p);
+Eterm erts_get_decentralized_counter_groups_map(Process *c_p);
 
 Eterm erts_set_cpu_topology(Process *c_p, Eterm term);
 Eterm erts_get_cpu_topology_term(Process *c_p, Eterm which);
diff --git a/erts/emulator/beam/erl_db.c b/erts/emulator/beam/erl_db.c
index c009a3bde8..3c74ef493b 100644
--- a/erts/emulator/beam/erl_db.c
+++ b/erts/emulator/beam/erl_db.c
@@ -42,6 +42,7 @@
 #include "bif.h"
 #include "big.h"
 #include "erl_binary.h"
+#include "bif.h"
 
 
 erts_atomic_t erts_ets_misc_mem_size;
@@ -64,6 +65,11 @@ do {                                                                     \
     }                                                                    \
 }while(0)
 
+#define DB_GET_APPROX_NITEMS(DB)                                        \
+    erts_flxctr_read_approx(&(DB)->common.counters, ERTS_DB_TABLE_NITEMS_COUNTER_ID)
+#define DB_GET_APPROX_MEM_CONSUMED(DB)                                  \
+    erts_flxctr_read_approx(&(DB)->common.counters, ERTS_DB_TABLE_MEM_COUNTER_ID)
+
 static BIF_RETTYPE db_bif_fail(Process* p, Uint freason,
                                Uint bif_ix, Export* bif_exp)
 {
@@ -81,16 +87,9 @@ static BIF_RETTYPE db_bif_fail(Process* p, Uint freason,
 /* Get a key from any table structure and a tagged object */
 #define TERM_GETKEY(tb, obj) db_getkey((tb)->common.keypos, (obj)) 
 
- 
-/* How safe are we from double-hits or missed objects
-** when iterating without fixation? */ 
-enum DbIterSafety {
-    ITER_UNSAFE,      /* Must fixate to be safe */
-    ITER_SAFE_LOCKED, /* Safe while table is locked, not between trap calls */
-    ITER_SAFE         /* No need to fixate at all */
-};
 #  define ITERATION_SAFETY(Proc,Tab) \
-    ((IS_TREE_TABLE((Tab)->common.status) || ONLY_WRITER(Proc,Tab)) ? ITER_SAFE \
+    ((IS_TREE_TABLE((Tab)->common.status) || IS_CATREE_TABLE((Tab)->common.status) \
+      || ONLY_WRITER(Proc,Tab)) ? ITER_SAFE                             \
      : (((Tab)->common.status & DB_FINE_LOCKED) ? ITER_UNSAFE : ITER_SAFE_LOCKED))
 
 #define DID_TRAP(P,Ret) (!is_value(Ret) && ((P)->freason == TRAP))
@@ -194,9 +193,6 @@ static int fixed_tabs_find(DbFixation* first, DbFixation* fix)
 #define ERTS_RBT_WANT_DELETE
 #define ERTS_RBT_WANT_FOREACH
 #define ERTS_RBT_WANT_FOREACH_DESTROY
-#ifdef DEBUG
-# define ERTS_RBT_WANT_LOOKUP
-#endif
 #define ERTS_RBT_UNDEF
 
 #include "erl_rbtree.h"
@@ -359,6 +355,7 @@ typedef enum {
 
 extern DbTableMethod db_hash;
 extern DbTableMethod db_tree;
+extern DbTableMethod db_catree;
 
 int user_requested_db_max_tabs;
 int erts_ets_realloc_always_moves;
@@ -407,21 +404,19 @@ static void
 free_dbtable(void *vtb)
 {
     DbTable *tb = (DbTable *) vtb;
-#ifdef HARDDEBUG
-	if (erts_atomic_read_nob(&tb->common.memory_size) != sizeof(DbTable)) {
-	    erts_fprintf(stderr, "ets: free_dbtable memory remain=%ld fix=%x\n",
-			 erts_atomic_read_nob(&tb->common.memory_size)-sizeof(DbTable),
-			 tb->common.fixations);
-	}
-#endif
-	erts_rwmtx_destroy(&tb->common.rwlock);
-	erts_mtx_destroy(&tb->common.fixlock);
-	ASSERT(is_immed(tb->common.heir_data));
+    ASSERT(erts_flxctr_is_snapshot_ongoing(&tb->common.counters) ||
+           sizeof(DbTable) == erts_flxctr_read_approx(&tb->common.counters,
+                                                      ERTS_DB_TABLE_MEM_COUNTER_ID));
+
+    erts_rwmtx_destroy(&tb->common.rwlock);
+    erts_mtx_destroy(&tb->common.fixlock);
+    ASSERT(is_immed(tb->common.heir_data));
 
-        if (tb->common.btid)
-            erts_bin_release(tb->common.btid);
+    if (tb->common.btid)
+        erts_bin_release(tb->common.btid);
 
-	erts_db_free(ERTS_ALC_T_DB_TABLE, tb, (void *) tb, sizeof(DbTable));
+    erts_flxctr_destroy(&tb->common.counters, ERTS_ALC_T_DB_TABLE);
+    erts_free(ERTS_ALC_T_DB_TABLE, tb);
 }
 
 static void schedule_free_dbtable(DbTable* tb)
@@ -1076,7 +1071,7 @@ BIF_RETTYPE ets_update_element_3(BIF_ALIST_3)
     DB_BIF_GET_TABLE(tb, DB_WRITE, LCK_WRITE_REC, BIF_ets_update_element_3);
 
     UseTmpHeap(2,BIF_P);
-    if (!(tb->common.status & (DB_SET | DB_ORDERED_SET))) {
+    if (!(tb->common.status & (DB_SET | DB_ORDERED_SET | DB_CA_ORDERED_SET))) {
 	goto bail_out;
     }
     if (is_tuple(BIF_ARG_3)) {
@@ -1165,7 +1160,7 @@ do_update_counter(Process *p, DbTable* tb,
 
     UseTmpHeap(5, p);
 
-    if (!(tb->common.status & (DB_SET | DB_ORDERED_SET))) {
+    if (!(tb->common.status & (DB_SET | DB_ORDERED_SET | DB_CA_ORDERED_SET))) {
 	goto bail_out;
     }
     if (is_integer(arg3)) { /* Incr */
@@ -1647,15 +1642,15 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2)
 	val = CAR(list_val(list));
 	if (val == am_bag) {
 	    status |= DB_BAG;
-	    status &= ~(DB_SET | DB_DUPLICATE_BAG | DB_ORDERED_SET);
+	    status &= ~(DB_SET | DB_DUPLICATE_BAG | DB_ORDERED_SET | DB_CA_ORDERED_SET);
 	}
 	else if (val == am_duplicate_bag) {
 	    status |= DB_DUPLICATE_BAG;
-	    status &= ~(DB_SET | DB_BAG | DB_ORDERED_SET);
+	    status &= ~(DB_SET | DB_BAG | DB_ORDERED_SET | DB_CA_ORDERED_SET);
 	}
 	else if (val == am_ordered_set) {
 	    status |= DB_ORDERED_SET;
-	    status &= ~(DB_SET | DB_BAG | DB_DUPLICATE_BAG);
+	    status &= ~(DB_SET | DB_BAG | DB_DUPLICATE_BAG | DB_CA_ORDERED_SET);
 	}
 	else if (is_tuple(val)) {
 	    Eterm *tp = tuple_val(val);
@@ -1716,7 +1711,13 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2)
     if (is_not_nil(list)) { /* bad opt or not a well formed list */
 	BIF_ERROR(BIF_P, BADARG);
     }
-    if (IS_HASH_TABLE(status)) {
+    if (IS_TREE_TABLE(status) && is_fine_locked && !(status & DB_PRIVATE)) {
+        meth = &db_catree;
+        status |= DB_CA_ORDERED_SET;
+        status &= ~(DB_SET | DB_BAG | DB_DUPLICATE_BAG | DB_ORDERED_SET);
+        status |= DB_FINE_LOCKED;
+    }
+    else if (IS_HASH_TABLE(status)) {
 	meth = &db_hash;
 	if (is_fine_locked && !(status & DB_PRIVATE)) {
 	    status |= DB_FINE_LOCKED;
@@ -1738,12 +1739,16 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2)
      */
     {
         DbTable init_tb;
-
-	erts_atomic_init_nob(&init_tb.common.memory_size, 0);
+        erts_flxctr_init(&init_tb.common.counters, 0, 2, ERTS_ALC_T_DB_TABLE);
 	tb = (DbTable*) erts_db_alloc(ERTS_ALC_T_DB_TABLE,
 				      &init_tb, sizeof(DbTable));
-	erts_atomic_init_nob(&tb->common.memory_size,
-				 erts_atomic_read_nob(&init_tb.common.memory_size));
+        erts_flxctr_init(&tb->common.counters,
+                         status & DB_CA_ORDERED_SET,
+                         2,
+                         ERTS_ALC_T_DB_TABLE);
+        erts_flxctr_add(&tb->common.counters,
+                        ERTS_DB_TABLE_MEM_COUNTER_ID,
+                        DB_GET_APPROX_MEM_CONSUMED(&init_tb));
     }
 
     tb->common.meth = meth;
@@ -1757,8 +1762,6 @@ BIF_RETTYPE ets_new_2(BIF_ALIST_2)
     tb->common.owner = BIF_P->common.id;
     set_heir(BIF_P, tb, heir, heir_data);
 
-    erts_atomic_init_nob(&tb->common.nitems, 0);
-
     tb->common.fixing_procs = NULL;
     tb->common.compress = is_compressed;
 #ifdef ETS_DBG_FORCE_TRAP
@@ -2135,19 +2138,18 @@ BIF_RETTYPE ets_internal_delete_all_2(BIF_ALIST_2)
 {
     SWord initial_reds = ERTS_BIF_REDS_LEFT(BIF_P);
     SWord reds = initial_reds;
-    Eterm nitems;
+    Eterm nitems_holder = THE_NON_VALUE;
     DbTable* tb;
-
     CHECK_TABLES();
 
     DB_BIF_GET_TABLE(tb, DB_WRITE, LCK_WRITE, BIF_ets_internal_delete_all_2);
 
     if (BIF_ARG_2 == am_undefined) {
-        nitems = erts_make_integer(erts_atomic_read_nob(&tb->common.nitems),
-                                   BIF_P);
-
-        reds = tb->common.meth->db_delete_all_objects(BIF_P, tb, reds);
-
+        reds = tb->common.meth->db_delete_all_objects(BIF_P,
+                                                      tb,
+                                                      reds,
+                                                      &nitems_holder);
+        ASSERT(nitems_holder != THE_NON_VALUE);
         ASSERT(!(tb->common.status & DB_BUSY));
 
         if (reds < 0) {
@@ -2166,7 +2168,7 @@ BIF_RETTYPE ets_internal_delete_all_2(BIF_ALIST_2)
             db_unlock(tb, LCK_WRITE);
             BUMP_ALL_REDS(BIF_P);
             BIF_TRAP2(bif_export[BIF_ets_internal_delete_all_2], BIF_P,
-                      BIF_ARG_1, nitems);
+                      BIF_ARG_1, nitems_holder);
         }
         else {
             /* Done, no trapping needed */
@@ -2176,15 +2178,19 @@ BIF_RETTYPE ets_internal_delete_all_2(BIF_ALIST_2)
     }
     else {
         /*
-         * The table lookup succeeded and second argument is nitems
+         * The table lookup succeeded and second argument is nitems_holder
          * and not 'undefined', which means we have trapped at least once
          * and are now done.
          */
-        nitems = BIF_ARG_2;
+        nitems_holder = BIF_ARG_2;
     }
-
     db_unlock(tb, LCK_WRITE);
+    {
+    Eterm nitems =
+        tb->common.meth->db_delete_all_objects_get_nitems_from_holder(BIF_P,
+                                                                      nitems_holder);
     BIF_RET(nitems);
+    }
 }
 
 static void delete_all_objects_continue(Process* p, DbTable* tb)
@@ -2197,7 +2203,7 @@ static void delete_all_objects_continue(Process* p, DbTable* tb)
     if ((tb->common.status & (DB_DELETE|DB_BUSY)) != DB_BUSY)
         return;
 
-    reds = tb->common.meth->db_delete_all_objects(p, tb, reds);
+    reds = tb->common.meth->db_delete_all_objects(p, tb, reds, NULL);
     
     if (reds < 0) {
         BUMP_ALL_REDS(p);
@@ -2283,6 +2289,7 @@ static BIF_RETTYPE ets_select_delete_trap_1(BIF_ALIST_1)
     Eterm ret;
     Eterm *tptr;
     db_lock_kind_t kind = LCK_WRITE_REC;
+    enum DbIterSafety safety = ITER_SAFE;
 
     CHECK_TABLES();
     ASSERT(is_tuple(a1));
@@ -2292,10 +2299,11 @@ static BIF_RETTYPE ets_select_delete_trap_1(BIF_ALIST_1)
     DB_TRAP_GET_TABLE(tb, tptr[1], DB_WRITE, kind,
                       &ets_select_delete_continue_exp);
 
-    cret = tb->common.meth->db_select_delete_continue(p,tb,a1,&ret);
+    cret = tb->common.meth->db_select_delete_continue(p,tb,a1,&ret,&safety);
 
-    if(!DID_TRAP(p,ret) && ITERATION_SAFETY(p,tb) != ITER_SAFE) {  
-	unfix_table_locked(p, tb, &kind);
+    if(!DID_TRAP(p,ret) && safety != ITER_SAFE) {
+        ASSERT(erts_refc_read(&tb->common.fix_count,1));
+        unfix_table_locked(p, tb, &kind);
     }
 
     db_unlock(tb, kind);
@@ -2333,7 +2341,8 @@ BIF_RETTYPE ets_internal_select_delete_2(BIF_ALIST_2)
     if (safety == ITER_UNSAFE) {
 	local_fix_table(tb);
     }
-    cret = tb->common.meth->db_select_delete(BIF_P, tb, BIF_ARG_1, BIF_ARG_2, &ret);
+    cret = tb->common.meth->db_select_delete(BIF_P, tb, BIF_ARG_1, BIF_ARG_2,
+                                             &ret, safety);
 
     if (DID_TRAP(BIF_P,ret) && safety != ITER_SAFE) {
 	fix_table_locked(BIF_P,tb);
@@ -2725,7 +2734,7 @@ ets_select3(Process* p, DbTable* tb, Eterm tid, Eterm ms, Sint chunk_size)
     cret = tb->common.meth->db_select_chunk(p, tb, tid,
 					    ms, chunk_size,
 					    0 /* not reversed */,
-					    &ret);
+					    &ret, safety);
     if (DID_TRAP(p,ret) && safety != ITER_SAFE) {
 	fix_table_locked(p, tb);
     }
@@ -2752,7 +2761,8 @@ ets_select3(Process* p, DbTable* tb, Eterm tid, Eterm ms, Sint chunk_size)
 }
 
 
-/* We get here instead of in the real BIF when trapping */
+/* Trap here from: ets_select_1/2/3
+ */
 static BIF_RETTYPE ets_select_trap_1(BIF_ALIST_1)
 {
     Process *p = BIF_P;
@@ -2763,6 +2773,7 @@ static BIF_RETTYPE ets_select_trap_1(BIF_ALIST_1)
     Eterm ret;
     Eterm *tptr;
     db_lock_kind_t kind = LCK_READ;
+    enum DbIterSafety safety = ITER_SAFE;
 
     CHECK_TABLES();
 
@@ -2772,11 +2783,13 @@ static BIF_RETTYPE ets_select_trap_1(BIF_ALIST_1)
     DB_TRAP_GET_TABLE(tb, tptr[1], DB_READ, kind,
                       &ets_select_continue_exp);
 
-    cret = tb->common.meth->db_select_continue(p, tb, a1,
-					       &ret);
+    cret = tb->common.meth->db_select_continue(p, tb, a1, &ret, &safety);
 
-    if (!DID_TRAP(p,ret) && ITERATION_SAFETY(p,tb) != ITER_SAFE) {
-	unfix_table_locked(p, tb, &kind);
+    if (!DID_TRAP(p,ret)) {
+        if (safety != ITER_SAFE) {
+            ASSERT(erts_refc_read(&tb->common.fix_count,1));
+            unfix_table_locked(p, tb, &kind);
+        }
     }
     db_unlock(tb, kind);
 
@@ -2801,8 +2814,12 @@ static BIF_RETTYPE ets_select_trap_1(BIF_ALIST_1)
 BIF_RETTYPE ets_select_1(BIF_ALIST_1)
 {
     return ets_select1(BIF_P, BIF_ets_select_1, BIF_ARG_1);
+    /* TRAP: ets_select_trap_1 */
 }
 
+/*
+ * Common impl for select/1, select_reverse/1, match/1 and match_object/1
+ */
 static BIF_RETTYPE ets_select1(Process *p, int bif_ix, Eterm arg1)
 {
     BIF_RETTYPE result;
@@ -2810,7 +2827,7 @@ static BIF_RETTYPE ets_select1(Process *p, int bif_ix, Eterm arg1)
     int cret;
     Eterm ret;
     Eterm *tptr;
-    enum DbIterSafety safety;
+    enum DbIterSafety safety, safety_copy;
 
     CHECK_TABLES();
 
@@ -2835,7 +2852,8 @@ static BIF_RETTYPE ets_select1(Process *p, int bif_ix, Eterm arg1)
 	local_fix_table(tb);
     }
 
-    cret = tb->common.meth->db_select_continue(p,tb, arg1, &ret);
+    safety_copy = safety;
+    cret = tb->common.meth->db_select_continue(p,tb, arg1, &ret, &safety_copy);
 
     if (DID_TRAP(p,ret) && safety != ITER_SAFE) {
 	fix_table_locked(p, tb);
@@ -2867,6 +2885,7 @@ BIF_RETTYPE ets_select_2(BIF_ALIST_2)
     DbTable* tb;
     DB_BIF_GET_TABLE(tb, DB_READ, LCK_READ, BIF_ets_select_2);
     return ets_select2(BIF_P, tb, BIF_ARG_1, BIF_ARG_2);
+    /* TRAP: ets_select_trap_1 */
 }
 
 static BIF_RETTYPE
@@ -2884,7 +2903,7 @@ ets_select2(Process* p, DbTable* tb, Eterm tid, Eterm ms)
 	local_fix_table(tb);
     }
 
-    cret = tb->common.meth->db_select(p, tb, tid, ms, 0, &ret);
+    cret = tb->common.meth->db_select(p, tb, tid, ms, 0, &ret, safety);
 
     if (DID_TRAP(p,ret) && safety != ITER_SAFE) {
 	fix_table_locked(p, tb);
@@ -2922,6 +2941,7 @@ static BIF_RETTYPE ets_select_count_1(BIF_ALIST_1)
     Eterm ret;
     Eterm *tptr;
     db_lock_kind_t kind = LCK_READ;
+    enum DbIterSafety safety = ITER_SAFE;
 
     CHECK_TABLES();
 
@@ -2931,9 +2951,10 @@ static BIF_RETTYPE ets_select_count_1(BIF_ALIST_1)
     DB_TRAP_GET_TABLE(tb, tptr[1], DB_READ, kind,
                       &ets_select_count_continue_exp);
 
-    cret = tb->common.meth->db_select_count_continue(p, tb, a1, &ret);
+    cret = tb->common.meth->db_select_count_continue(p, tb, a1, &ret, &safety);
 
-    if (!DID_TRAP(p,ret) && ITERATION_SAFETY(p,tb) != ITER_SAFE) {
+    if (!DID_TRAP(p,ret) && safety != ITER_SAFE) {
+        ASSERT(erts_refc_read(&tb->common.fix_count,1));
 	unfix_table_locked(p, tb, &kind);
     }
     db_unlock(tb, kind);
@@ -2971,7 +2992,8 @@ BIF_RETTYPE ets_select_count_2(BIF_ALIST_2)
     if (safety == ITER_UNSAFE) {
 	local_fix_table(tb);
     }
-    cret = tb->common.meth->db_select_count(BIF_P,tb, BIF_ARG_1, BIF_ARG_2, &ret);
+    cret = tb->common.meth->db_select_count(BIF_P,tb, BIF_ARG_1, BIF_ARG_2,
+                                            &ret, safety);
 
     if (DID_TRAP(BIF_P,ret) && safety != ITER_SAFE) {
 	fix_table_locked(BIF_P, tb);
@@ -3010,6 +3032,7 @@ static BIF_RETTYPE ets_select_replace_1(BIF_ALIST_1)
     Eterm ret;
     Eterm *tptr;
     db_lock_kind_t kind = LCK_WRITE_REC;
+    enum DbIterSafety safety = ITER_SAFE;
 
     CHECK_TABLES();
     ASSERT(is_tuple(a1));
@@ -3019,9 +3042,10 @@ static BIF_RETTYPE ets_select_replace_1(BIF_ALIST_1)
     DB_TRAP_GET_TABLE(tb, tptr[1], DB_WRITE, kind,
                       &ets_select_replace_continue_exp);
 
-    cret = tb->common.meth->db_select_replace_continue(p,tb,a1,&ret);
+    cret = tb->common.meth->db_select_replace_continue(p,tb,a1,&ret,&safety);
 
-    if(!DID_TRAP(p,ret) && ITERATION_SAFETY(p,tb) != ITER_SAFE) {
+    if(!DID_TRAP(p,ret) && safety != ITER_SAFE) {
+        ASSERT(erts_refc_read(&tb->common.fix_count,1));
         unfix_table_locked(p, tb, &kind);
     }
 
@@ -3064,7 +3088,8 @@ BIF_RETTYPE ets_select_replace_2(BIF_ALIST_2)
     if (safety == ITER_UNSAFE) {
         local_fix_table(tb);
     }
-    cret = tb->common.meth->db_select_replace(BIF_P, tb, BIF_ARG_1, BIF_ARG_2, &ret);
+    cret = tb->common.meth->db_select_replace(BIF_P, tb, BIF_ARG_1, BIF_ARG_2,
+                                              &ret, safety);
 
     if (DID_TRAP(BIF_P,ret) && safety != ITER_SAFE) {
         fix_table_locked(BIF_P,tb);
@@ -3116,7 +3141,7 @@ BIF_RETTYPE ets_select_reverse_3(BIF_ALIST_3)
     }
     cret = tb->common.meth->db_select_chunk(BIF_P,tb, BIF_ARG_1,
 					    BIF_ARG_2, chunk_size, 
-					    1 /* reversed */, &ret);
+					    1 /* reversed */, &ret, safety);
     if (DID_TRAP(BIF_P,ret) && safety != ITER_SAFE) {
 	fix_table_locked(BIF_P, tb);
     }
@@ -3161,7 +3186,7 @@ BIF_RETTYPE ets_select_reverse_2(BIF_ALIST_2)
 	local_fix_table(tb);
     }
     cret = tb->common.meth->db_select(BIF_P,tb, BIF_ARG_1, BIF_ARG_2,
-				      1 /*reversed*/, &ret);
+				      1 /*reversed*/, &ret, safety);
 
     if (DID_TRAP(BIF_P,ret) && safety != ITER_SAFE) {
 	fix_table_locked(BIF_P, tb);
@@ -3265,13 +3290,29 @@ BIF_RETTYPE ets_info_1(BIF_ALIST_1)
     int i;
     Eterm* hp;
     Uint freason;
+    Sint size = -1;
+    Sint memory = -1;
+    Eterm table;
+    int is_ctrs_read_result_set = 0;
     /*Process* rp = NULL;*/
     /* If/when we implement lockless private tables:
     Eterm owner;
     */
-
-    if ((tb = db_get_table(BIF_P, BIF_ARG_1, DB_INFO, LCK_READ, &freason)) == NULL) {
-	if (freason == BADARG && (is_atom(BIF_ARG_1) || is_ref(BIF_ARG_1)))
+    if(is_tuple(BIF_ARG_1) &&
+       is_tuple_arity(BIF_ARG_1, 2) &&
+       erts_flxctr_is_snapshot_result(tuple_val(BIF_ARG_1)[1])) {
+        Eterm counter_read_result  = tuple_val(BIF_ARG_1)[1];
+        table = tuple_val(BIF_ARG_1)[2];
+        size = erts_flxctr_get_snapshot_result_after_trap(counter_read_result,
+                                                          ERTS_DB_TABLE_NITEMS_COUNTER_ID);
+        memory = erts_flxctr_get_snapshot_result_after_trap(counter_read_result,
+                                                            ERTS_DB_TABLE_MEM_COUNTER_ID);
+        is_ctrs_read_result_set = 1;
+    } else {
+        table = BIF_ARG_1;
+    }
+    if ((tb = db_get_table(BIF_P, table, DB_INFO, LCK_READ, &freason)) == NULL) {
+	if (freason == BADARG && (is_atom(table) || is_ref(table)))
 	    BIF_RET(am_undefined);
 	else
             return db_bif_fail(BIF_P, freason, BIF_ets_info_1, NULL);
@@ -3302,9 +3343,35 @@ BIF_RETTYPE ets_info_1(BIF_ALIST_1)
 	    BIF_ERROR(BIF_P, BADARG);
 	}
     }*/
+
+    if (!is_ctrs_read_result_set) {
+        ErtsFlxCtrSnapshotResult res =
+            erts_flxctr_snapshot(&tb->common.counters, ERTS_ALC_T_DB_TABLE, BIF_P);
+        if (ERTS_FLXCTR_GET_RESULT_AFTER_TRAP == res.type) {
+            Eterm tuple;
+            db_unlock(tb, LCK_READ);
+            hp = HAlloc(BIF_P, 3);
+            tuple = TUPLE2(hp, res.trap_resume_state, table);
+            BIF_TRAP1(bif_export[BIF_ets_info_1], BIF_P, tuple);
+        } else if (res.type == ERTS_FLXCTR_TRY_AGAIN_AFTER_TRAP) {
+            db_unlock(tb, LCK_READ);
+            BIF_TRAP1(bif_export[BIF_ets_info_1], BIF_P, table);
+        } else {
+            size = res.result[ERTS_DB_TABLE_NITEMS_COUNTER_ID];
+            memory = res.result[ERTS_DB_TABLE_MEM_COUNTER_ID];
+            is_ctrs_read_result_set = 1;
+        }
+    }
     for (i = 0; i < sizeof(fields)/sizeof(Eterm); i++) {
-	results[i] = table_info(BIF_P, tb, fields[i]);
-	ASSERT(is_value(results[i]));
+        if (is_ctrs_read_result_set && am_size == fields[i]) {
+            results[i] = erts_make_integer(size, BIF_P);
+        } else if (is_ctrs_read_result_set && am_memory == fields[i]) {
+            Sint words = (Sint) ((memory + sizeof(Sint) - 1) / sizeof(Sint));
+            results[i] = erts_make_integer(words, BIF_P);
+        } else {
+            results[i] = table_info(BIF_P, tb, fields[i]);
+            ASSERT(is_value(results[i]));
+        }
     }
     db_unlock(tb, LCK_READ);
 
@@ -3332,14 +3399,43 @@ BIF_RETTYPE ets_info_2(BIF_ALIST_2)
     DbTable* tb;
     Eterm ret = THE_NON_VALUE;
     Uint freason;
-
+    if (erts_flxctr_is_snapshot_result(BIF_ARG_1)) {
+        Sint res;
+        if (am_memory == BIF_ARG_2) {
+            res = erts_flxctr_get_snapshot_result_after_trap(BIF_ARG_1,
+                                                             ERTS_DB_TABLE_MEM_COUNTER_ID);
+            res = (Sint) ((res + sizeof(Sint) - 1) / sizeof(Sint));
+        } else {
+            res = erts_flxctr_get_snapshot_result_after_trap(BIF_ARG_1,
+                                                             ERTS_DB_TABLE_NITEMS_COUNTER_ID);
+        }
+        BIF_RET(erts_make_integer(res, BIF_P));
+    }
     if ((tb = db_get_table(BIF_P, BIF_ARG_1, DB_INFO, LCK_READ, &freason)) == NULL) {
 	if (freason == BADARG && (is_atom(BIF_ARG_1) || is_ref(BIF_ARG_1)))
 	    BIF_RET(am_undefined);
         else
             return db_bif_fail(BIF_P, freason, BIF_ets_info_2, NULL);
     }
-    ret = table_info(BIF_P, tb, BIF_ARG_2);
+    if (BIF_ARG_2 == am_size || BIF_ARG_2 == am_memory) {
+        ErtsFlxCtrSnapshotResult res =
+            erts_flxctr_snapshot(&tb->common.counters, ERTS_ALC_T_DB_TABLE, BIF_P);
+        if (ERTS_FLXCTR_GET_RESULT_AFTER_TRAP == res.type) {
+            db_unlock(tb, LCK_READ);
+            BIF_TRAP2(bif_export[BIF_ets_info_2], BIF_P, res.trap_resume_state, BIF_ARG_2);
+        } else if (res.type == ERTS_FLXCTR_TRY_AGAIN_AFTER_TRAP) {
+            db_unlock(tb, LCK_READ);
+            BIF_TRAP2(bif_export[BIF_ets_info_2], BIF_P, BIF_ARG_1, BIF_ARG_2);
+        } else if (BIF_ARG_2 == am_size) {
+            ret = erts_make_integer(res.result[ERTS_DB_TABLE_NITEMS_COUNTER_ID], BIF_P);
+        } else { /* BIF_ARG_2 == am_memory */
+            Sint r = res.result[ERTS_DB_TABLE_MEM_COUNTER_ID];
+            r = (Sint) ((r + sizeof(Sint) - 1) / sizeof(Sint));
+            ret = erts_make_integer(r, BIF_P);
+        }
+    } else {
+        ret = table_info(BIF_P, tb, BIF_ARG_2);
+    }
     db_unlock(tb, LCK_READ);
     if (is_non_value(ret)) {
 	BIF_ERROR(BIF_P, BADARG);
@@ -3506,6 +3602,7 @@ void init_db(ErtsDbSpinCount db_spin_count)
 
     db_initialize_hash();
     db_initialize_tree();
+    db_initialize_catree();
 
     /* Non visual BIF to trap to. */
     erts_init_trap_export(&ets_select_delete_continue_exp,
@@ -3696,7 +3793,7 @@ static SWord proc_cleanup_fixed_table(Process* p, DbFixation* fix)
 /*
  * erts_db_process_exiting() is called when a process terminates.
  * It returns 0 when completely done, and !0 when it wants to
- * yield. c_p->u.terminate can hold a pointer to a state while
+ * yield. *yield_state can hold a pointer to a state while
  * yielding.
  */
 #define ERTS_DB_INTERNAL_ERROR(LSTR) \
@@ -3704,7 +3801,7 @@ static SWord proc_cleanup_fixed_table(Process* p, DbFixation* fix)
 	   __FILE__, __LINE__)
 
 int
-erts_db_process_exiting(Process *c_p, ErtsProcLocks c_p_locks)
+erts_db_process_exiting(Process *c_p, ErtsProcLocks c_p_locks, void **yield_state)
 {
     typedef struct {
         enum {
@@ -3714,7 +3811,7 @@ erts_db_process_exiting(Process *c_p, ErtsProcLocks c_p_locks)
         }op;
         DbTable *tb;
     } CleanupState;
-    CleanupState *state = (CleanupState *) c_p->u.terminate;
+    CleanupState *state = (CleanupState *) *yield_state;
     Eterm pid = c_p->common.id;
     CleanupState default_state;
     SWord initial_reds = ERTS_BIF_REDS_LEFT(c_p);
@@ -3787,7 +3884,7 @@ erts_db_process_exiting(Process *c_p, ErtsProcLocks c_p_locks)
 
                 if (state != &default_state)
                     erts_free(ERTS_ALC_T_DB_PROC_CLEANUP, state);
-                c_p->u.terminate = NULL;
+                *yield_state = NULL;
 
                 BUMP_REDS(c_p, (initial_reds - reds));
                 return 0;
@@ -3807,12 +3904,12 @@ erts_db_process_exiting(Process *c_p, ErtsProcLocks c_p_locks)
  yield:
 
     if (state == &default_state) {
-	c_p->u.terminate = erts_alloc(ERTS_ALC_T_DB_PROC_CLEANUP,
-				      sizeof(CleanupState));
-	sys_memcpy(c_p->u.terminate, (void*) state, sizeof(CleanupState));
+	*yield_state = erts_alloc(ERTS_ALC_T_DB_PROC_CLEANUP,
+                                  sizeof(CleanupState));
+	sys_memcpy(*yield_state, (void*) state, sizeof(CleanupState));
     }
     else
-        ASSERT(state == c_p->u.terminate);
+        ASSERT(state == *yield_state);
 
     return !0;
 }
@@ -3907,7 +4004,7 @@ struct free_fixations_ctx
     SWord cnt;
 };
 
-static void free_fixations_op(DbFixation* fix, void* vctx)
+static int free_fixations_op(DbFixation* fix, void* vctx, Sint reds)
 {
     struct free_fixations_ctx* ctx = (struct free_fixations_ctx*) vctx;
     erts_aint_t diff;
@@ -3944,6 +4041,7 @@ static void free_fixations_op(DbFixation* fix, void* vctx)
         ERTS_ETS_MISC_MEM_ADD(-sizeof(DbFixation));
     }
     ctx->cnt++;
+    return 1;
 }
 
 int erts_db_execute_free_fixation(Process* p, DbFixation* fix)
@@ -4088,7 +4186,7 @@ struct fixing_procs_info_ctx
     Eterm list;
 };
 
-static void fixing_procs_info_op(DbFixation* fix, void* vctx)
+static int fixing_procs_info_op(DbFixation* fix, void* vctx, Sint reds)
 {
     struct fixing_procs_info_ctx* ctx = (struct fixing_procs_info_ctx*) vctx;
     Eterm* hp;
@@ -4098,6 +4196,7 @@ static void fixing_procs_info_op(DbFixation* fix, void* vctx)
     tpl = TUPLE2(hp, fix->procs.p->common.id, make_small(fix->counter));
     hp += 3;
     ctx->list = CONS(hp, tpl, ctx->list);
+    return 1;
 }
 
 static Eterm table_info(Process* p, DbTable* tb, Eterm What)
@@ -4106,7 +4205,8 @@ static Eterm table_info(Process* p, DbTable* tb, Eterm What)
     int use_monotonic;
 
     if (What == am_size) {
-	ret = make_small(erts_atomic_read_nob(&tb->common.nitems));
+        Uint size = (Uint) (DB_GET_APPROX_NITEMS(tb));
+        ret = erts_make_integer(size, p);
     } else if (What == am_type) {
 	if (tb->common.status & DB_SET)  {
 	    ret = am_set;
@@ -4114,12 +4214,14 @@ static Eterm table_info(Process* p, DbTable* tb, Eterm What)
 	    ret = am_duplicate_bag;
 	} else if (tb->common.status & DB_ORDERED_SET) {
 	    ret = am_ordered_set;
+	} else if (tb->common.status & DB_CA_ORDERED_SET) {
+	    ret = am_ordered_set;
 	} else { /*TT*/
 	    ASSERT(tb->common.status & DB_BAG);
 	    ret = am_bag;
 	}
     } else if (What == am_memory) {
-	Uint words = (Uint) ((erts_atomic_read_nob(&tb->common.memory_size)
+	Uint words = (Uint) ((DB_GET_APPROX_MEM_CONSUMED(tb)
 			      + sizeof(Uint)
 			      - 1)
 			     / sizeof(Uint));
@@ -4240,9 +4342,20 @@ static Eterm table_info(Process* p, DbTable* tb, Eterm What)
 			 make_small(stats.max_chain_len),
 			 make_small(stats.kept_items));
 	}
-	else {
+	else if (IS_CATREE_TABLE(tb->common.status)) {
+            DbCATreeStats stats;
+            Eterm* hp;
+
+            db_calc_stats_catree(&tb->catree, &stats);
+            hp = HAlloc(p, 4);
+            ret = TUPLE3(hp,
+                         make_small(stats.route_nodes),
+                         make_small(stats.base_nodes),
+                         make_small(stats.max_depth));
+
+        }
+        else
 	    ret = am_false;
-	}
     }
     return ret;
 }
@@ -4266,9 +4379,9 @@ static void print_table(fmtfn_t to, void *to_arg, int show,  DbTable* tb)
 
     tb->common.meth->db_print(to, to_arg, show, tb);
 
-    erts_print(to, to_arg, "Objects: %d\n", (int)erts_atomic_read_nob(&tb->common.nitems));
+    erts_print(to, to_arg, "Objects: %d\n", (int)DB_GET_APPROX_NITEMS(tb));
     erts_print(to, to_arg, "Words: %bpu\n",
-	       (Uint) ((erts_atomic_read_nob(&tb->common.memory_size)
+	       (Uint) ((DB_GET_APPROX_MEM_CONSUMED(tb)
 			+ sizeof(Uint)
 			- 1)
 		       / sizeof(Uint)));
@@ -4302,7 +4415,7 @@ void db_info(fmtfn_t to, void *to_arg, int show)    /* Called by break handler *
     pdbi.to_arg = to_arg;
     pdbi.show = show;
 
-    erts_db_foreach_table(db_info_print, &pdbi);
+    erts_db_foreach_table(db_info_print, &pdbi, !0);
 }
 
 Uint
@@ -4315,7 +4428,7 @@ erts_get_ets_misc_mem_size(void)
 
 /* SMP Note: May only be used when system is locked */
 void
-erts_db_foreach_table(void (*func)(DbTable *, void *), void *arg)
+erts_db_foreach_table(void (*func)(DbTable *, void *), void *arg, int alive_only)
 {
     int ix;
 
@@ -4327,7 +4440,7 @@ erts_db_foreach_table(void (*func)(DbTable *, void *), void *arg)
         if (first) {
             DbTable *tb = first;
             do {
-                if (is_table_alive(tb))
+                if (!alive_only || is_table_alive(tb))
                     (*func)(tb, arg);
                 tb = tb->common.all.next;
             } while (tb != first);
@@ -4344,6 +4457,15 @@ erts_db_foreach_offheap(DbTable *tb,
     tb->common.meth->db_foreach_offheap(tb, func, arg);
 }
 
+void
+erts_db_foreach_thr_prgr_offheap(void (*func)(ErlOffHeap *, void *),
+                                 void *arg)
+{
+    erts_db_foreach_thr_prgr_offheap_hash(func, arg);
+    erts_db_foreach_thr_prgr_offheap_tree(func, arg);
+    erts_db_foreach_thr_prgr_offheap_catree(func, arg);
+}
+
 /* retrieve max number of ets tables */
 Uint
 erts_db_get_max_tabs()
@@ -4409,6 +4531,12 @@ void erts_lcnt_enable_db_lock_count(DbTable *tb, int enable) {
 
     if(IS_HASH_TABLE(tb->common.status)) {
         erts_lcnt_enable_db_hash_lock_count(&tb->hash, enable);
+    } else if(IS_CATREE_TABLE(tb->common.status)) {
+        /* erts_lcnt_enable_db_catree_lock_count is not thread safe so
+           the table needs to get locked */
+        db_lock(tb, LCK_WRITE);
+        erts_lcnt_enable_db_catree_lock_count(&tb->catree, enable);
+        db_unlock(tb, LCK_WRITE);
     }
 }
 
@@ -4441,3 +4569,29 @@ void erts_lcnt_update_db_locks(int enable) {
 #ifdef ETS_DBG_FORCE_TRAP
 erts_aint_t erts_ets_dbg_force_trap = 0;
 #endif
+
+int erts_ets_force_split(Eterm tid, int on)
+{
+    DbTable* tb = tid2tab(tid);
+    if (!tb || !IS_CATREE_TABLE(tb->common.type))
+        return 0;
+
+    db_lock(tb, LCK_WRITE);
+    if (!(tb->common.status & DB_DELETE))
+        db_catree_force_split(&tb->catree, on);
+    db_unlock(tb, LCK_WRITE);
+    return 1;
+}
+
+int erts_ets_debug_random_split_join(Eterm tid, int on)
+{
+    DbTable* tb = tid2tab(tid);
+    if (!tb || !IS_CATREE_TABLE(tb->common.type))
+        return 0;
+
+    db_lock(tb, LCK_WRITE);
+    if (!(tb->common.status & DB_DELETE))
+        db_catree_debug_random_split_join(&tb->catree, on);
+    db_unlock(tb, LCK_WRITE);
+    return 1;
+}
diff --git a/erts/emulator/beam/erl_db.h b/erts/emulator/beam/erl_db.h
index 23975d208f..c604744687 100644
--- a/erts/emulator/beam/erl_db.h
+++ b/erts/emulator/beam/erl_db.h
@@ -66,6 +66,7 @@ typedef struct {
 #include "erl_db_util.h" /* Flags */
 #include "erl_db_hash.h" /* DbTableHash */
 #include "erl_db_tree.h" /* DbTableTree */
+#include "erl_db_catree.h" /* DbTableCATree */
 /*TT*/
 
 Uint erts_get_ets_misc_mem_size(void);
@@ -90,6 +91,7 @@ union db_table {
     DbTableCommon common; /* Any type of db table */
     DbTableHash hash;     /* Linear hash array specific data */
     DbTableTree tree;     /* AVL tree specific data */
+    DbTableCATree catree;     /* CA tree specific data */
     DbTableRelease release;
     /*TT*/
 };
@@ -109,13 +111,15 @@ typedef enum {
 } ErtsDbSpinCount;
 
 void init_db(ErtsDbSpinCount);
-int erts_db_process_exiting(Process *, ErtsProcLocks);
+int erts_db_process_exiting(Process *, ErtsProcLocks, void **);
 int erts_db_execute_free_fixation(Process*, DbFixation*);
 void db_info(fmtfn_t, void *, int);
-void erts_db_foreach_table(void (*)(DbTable *, void *), void *);
+void erts_db_foreach_table(void (*)(DbTable *, void *), void *, int);
 void erts_db_foreach_offheap(DbTable *,
 			     void (*func)(ErlOffHeap *, void *),
 			     void *);
+void erts_db_foreach_thr_prgr_offheap(void (*func)(ErlOffHeap *, void *),
+                                      void *);
 
 extern int erts_ets_rwmtx_spin_count;
 extern int user_requested_db_max_tabs; /* set in erl_init */
@@ -128,6 +132,8 @@ extern Export ets_select_continue_exp;
 extern erts_atomic_t erts_ets_misc_mem_size;
 
 Eterm erts_ets_colliding_names(Process*, Eterm name, Uint cnt);
+int erts_ets_force_split(Eterm tid, int on);
+int erts_ets_debug_random_split_join(Eterm tid, int on);
 Uint erts_db_get_max_tabs(void);
 Eterm erts_db_make_tid(Process *c_p, DbTableCommon *tb);
 
@@ -157,7 +163,9 @@ do {									\
     erts_aint_t sz__ = (((erts_aint_t) (ALLOC_SZ))			\
 			- ((erts_aint_t) (FREE_SZ)));			\
     ASSERT((TAB));							\
-    erts_atomic_add_nob(&(TAB)->common.memory_size, sz__);		\
+    erts_flxctr_add(&(TAB)->common.counters,                            \
+                    ERTS_DB_TABLE_MEM_COUNTER_ID,                       \
+                    sz__);                                              \
 } while (0)
 
 #define ERTS_ETS_MISC_MEM_ADD(SZ) \
@@ -284,6 +292,12 @@ ERTS_GLB_INLINE void erts_db_free(ErtsAlcType_t type,
 				  void *ptr,
 				  Uint size);
 
+ERTS_GLB_INLINE void erts_schedule_db_free(DbTableCommon* tab,
+                                           void (*free_func)(void *),
+                                           void *ptr,
+                                           ErtsThrPrgrLaterOp *lop,
+                                           Uint size);
+
 ERTS_GLB_INLINE void erts_db_free_nt(ErtsAlcType_t type,
 				     void *ptr,
 				     Uint size);
@@ -296,11 +310,31 @@ erts_db_free(ErtsAlcType_t type, DbTable *tab, void *ptr, Uint size)
     ASSERT(ptr != 0);
     ASSERT(size == ERTS_ALC_DBG_BLK_SZ(ptr));
     ERTS_DB_ALC_MEM_UPDATE_(tab, size, 0);
+    ASSERT(((void *) tab) != ptr ||
+           tab->common.counters.is_decentralized ||
+           0 == erts_flxctr_read_centralized(&tab->common.counters,
+                                             ERTS_DB_TABLE_MEM_COUNTER_ID));
+    erts_free(type, ptr);
+}
 
-    ASSERT(((void *) tab) != ptr
-	   || erts_atomic_read_nob(&tab->common.memory_size) == 0);
+ERTS_GLB_INLINE void
+erts_schedule_db_free(DbTableCommon* tab,
+                      void (*free_func)(void *),
+                      void *ptr,
+                      ErtsThrPrgrLaterOp *lop,
+                      Uint size)
+{
+    ASSERT(ptr != 0);
+    ASSERT(((void *) tab) != ptr);
+    ASSERT(size == ERTS_ALC_DBG_BLK_SZ(ptr));
 
-    erts_free(type, ptr);
+    /*
+     * We update table memory stats here as table may already be gone
+     * when 'free_func' is finally called.
+     */
+    ERTS_DB_ALC_MEM_UPDATE_((DbTable*)tab, size, 0);
+
+    erts_schedule_thr_prgr_later_cleanup_op(free_func, ptr, lop, size);
 }
 
 ERTS_GLB_INLINE void
diff --git a/erts/emulator/beam/erl_db_catree.c b/erts/emulator/beam/erl_db_catree.c
new file mode 100644
index 0000000000..8a89eb72df
--- /dev/null
+++ b/erts/emulator/beam/erl_db_catree.c
@@ -0,0 +1,2449 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB and Kjell Winblad 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.
+ * 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%
+ */
+
+/*
+ * Description: Implementation of ETS ordered_set table type with
+ *              fine-grained synchronization.
+ *
+ * Author: 	Kjell Winblad
+ *
+ * This implementation is based on the contention adapting search tree
+ * (CA tree). The CA tree is a concurrent data structure that
+ * dynamically adapts its synchronization granularity based on how
+ * much contention is detected in locks. The following publication
+ * contains a detailed description of CA trees:
+ * 
+ * A Contention Adapting Approach to Concurrent Ordered Sets
+ * Journal of Parallel and Distributed Computing, 2018
+ * Kjell Winblad and Konstantinos Sagonas
+ * https://doi.org/10.1016/j.jpdc.2017.11.007
+ *
+ * The following publication may also be interesting as it discusses
+ * how the CA tree can be used as an ETS ordered_set table type
+ * backend:
+ *
+ * More Scalable Ordered Set for ETS Using Adaptation
+ * In Thirteenth ACM SIGPLAN workshop on Erlang (2014)
+ * Kjell Winblad and Konstantinos Sagonas
+ * https://doi.org/10.1145/2633448.2633455
+ *
+ * This implementation of the ordered_set ETS table type is only
+ * activated when the options {write_concurrency, true}, public and
+ * ordered_set are passed to the ets:new/2 function. This
+ * implementation is expected to scale better than the default
+ * implementation located in "erl_db_tree.c".
+ * 
+ * The default implementation has a static stack optimization (see
+ * get_static_stack in erl_db_tree.c). This implementation does not
+ * have such an optimization as it induces bad scalability when
+ * concurrent read operations are frequent (they all try to get hold
+ * of the same stack). The default implementation may thus perform
+ * better compared to this implementation in scenarios where the
+ * static stack optimization is useful. One such scenario is when only
+ * one process is accessing the table and this process is traversing
+ * the table with a sequence of next/2 calls.
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "sys.h"
+#include "erl_vm.h"
+#include "global.h"
+#include "erl_process.h"
+#include "error.h"
+#define ERTS_WANT_DB_INTERNAL__
+#include "erl_db.h"
+#include "bif.h"
+#include "big.h"
+#include "erl_binary.h"
+
+#include "erl_db_catree.h"
+#include "erl_db_tree.h"
+#include "erl_db_tree_util.h"
+
+#ifdef DEBUG
+#  define IF_DEBUG(X) X
+#else
+#  define IF_DEBUG(X)
+#endif
+
+/*
+** Forward declarations
+*/
+
+static SWord do_free_base_node_cont(DbTableCATree *tb, SWord num_left);
+static SWord do_free_routing_nodes_catree_cont(DbTableCATree *tb, SWord num_left);
+static DbTableCATreeNode *catree_first_base_node_from_free_list(DbTableCATree *tb);
+
+/* Method interface functions */
+static int db_first_catree(Process *p, DbTable *tbl,
+                           Eterm *ret);
+static int db_next_catree(Process *p, DbTable *tbl,
+                          Eterm key, Eterm *ret);
+static int db_last_catree(Process *p, DbTable *tbl,
+                          Eterm *ret);
+static int db_prev_catree(Process *p, DbTable *tbl,
+                          Eterm key,
+                          Eterm *ret);
+static int db_put_catree(DbTable *tbl, Eterm obj, int key_clash_fail);
+static int db_get_catree(Process *p, DbTable *tbl,
+                         Eterm key,  Eterm *ret);
+static int db_member_catree(DbTable *tbl, Eterm key, Eterm *ret);
+static int db_get_element_catree(Process *p, DbTable *tbl,
+                                 Eterm key,int ndex,
+                                 Eterm *ret);
+static int db_erase_catree(DbTable *tbl, Eterm key, Eterm *ret);
+static int db_erase_object_catree(DbTable *tbl, Eterm object,Eterm *ret);
+static int db_slot_catree(Process *p, DbTable *tbl,
+                          Eterm slot_term,  Eterm *ret);
+static int db_select_catree(Process *p, DbTable *tbl, Eterm tid,
+                            Eterm pattern, int reversed, Eterm *ret,
+                            enum DbIterSafety);
+static int db_select_count_catree(Process *p, DbTable *tbl, Eterm tid,
+                                  Eterm pattern,  Eterm *ret, enum DbIterSafety);
+static int db_select_chunk_catree(Process *p, DbTable *tbl, Eterm tid,
+                                  Eterm pattern, Sint chunk_size,
+                                  int reversed, Eterm *ret, enum DbIterSafety);
+static int db_select_continue_catree(Process *p, DbTable *tbl,
+                                     Eterm continuation, Eterm *ret,
+                                     enum DbIterSafety*);
+static int db_select_count_continue_catree(Process *p, DbTable *tbl,
+                                           Eterm continuation, Eterm *ret,
+                                           enum DbIterSafety*);
+static int db_select_delete_catree(Process *p, DbTable *tbl, Eterm tid,
+                                   Eterm pattern,  Eterm *ret,
+                                   enum DbIterSafety);
+static int db_select_delete_continue_catree(Process *p, DbTable *tbl, 
+                                            Eterm continuation, Eterm *ret,
+                                            enum DbIterSafety*);
+static int db_select_replace_catree(Process *p, DbTable *tbl, Eterm tid,
+                                    Eterm pattern, Eterm *ret,
+                                    enum DbIterSafety);
+static int db_select_replace_continue_catree(Process *p, DbTable *tbl,
+                                             Eterm continuation, Eterm *ret,
+                                             enum DbIterSafety*);
+static int db_take_catree(Process *, DbTable *, Eterm, Eterm *);
+static void db_print_catree(fmtfn_t to, void *to_arg,
+                            int show, DbTable *tbl);
+static int db_free_table_catree(DbTable *tbl);
+static SWord db_free_table_continue_catree(DbTable *tbl, SWord);
+static void db_foreach_offheap_catree(DbTable *,
+                                      void (*)(ErlOffHeap *, void *),
+                                      void *);
+static SWord db_delete_all_objects_catree(Process* p,
+                                          DbTable* tbl,
+                                          SWord reds,
+                                          Eterm* nitems_holder_wb);
+static Eterm db_delete_all_objects_get_nitems_from_holder_catree(Process* p,
+                                                                 Eterm nitems_holder);
+static int
+db_lookup_dbterm_catree(Process *, DbTable *, Eterm key, Eterm obj,
+                        DbUpdateHandle*);
+static void db_finalize_dbterm_catree(int cret, DbUpdateHandle *);
+
+static void split_catree(DbTableCATree *tb,
+                         DbTableCATreeNode* ERTS_RESTRICT base,
+                         DbTableCATreeNode* ERTS_RESTRICT parent);
+static void join_catree(DbTableCATree *tb,
+                        DbTableCATreeNode *thiz,
+                        DbTableCATreeNode *parent);
+static ERTS_INLINE
+int try_wlock_base_node(DbTableCATreeBaseNode *base_node);
+static ERTS_INLINE
+void wunlock_base_node(DbTableCATreeNode *base_node);
+static ERTS_INLINE
+void wlock_base_node_no_stats(DbTableCATreeNode *base_node);
+static ERTS_INLINE
+void wunlock_adapt_base_node(DbTableCATree* tb,
+                             DbTableCATreeNode* node,
+                             DbTableCATreeNode* parent,
+                             int current_level);
+/*
+** External interface
+*/
+DbTableMethod db_catree =
+{
+    db_create_catree,
+    db_first_catree,
+    db_next_catree,
+    db_last_catree,
+    db_prev_catree,
+    db_put_catree,
+    db_get_catree,
+    db_get_element_catree,
+    db_member_catree,
+    db_erase_catree,
+    db_erase_object_catree,
+    db_slot_catree,
+    db_select_chunk_catree,
+    db_select_catree,
+    db_select_delete_catree,
+    db_select_continue_catree,
+    db_select_delete_continue_catree,
+    db_select_count_catree,
+    db_select_count_continue_catree,
+    db_select_replace_catree,
+    db_select_replace_continue_catree,
+    db_take_catree,
+    db_delete_all_objects_catree,
+    db_delete_all_objects_get_nitems_from_holder_catree,
+    db_free_table_catree,
+    db_free_table_continue_catree,
+    db_print_catree,
+    db_foreach_offheap_catree,
+    db_lookup_dbterm_catree,
+    db_finalize_dbterm_catree
+
+};
+
+/*
+ * Constants
+ */
+
+#define ERL_DB_CATREE_LOCK_FAILURE_CONTRIBUTION 250
+#define ERL_DB_CATREE_LOCK_SUCCESS_CONTRIBUTION (-1)
+#define ERL_DB_CATREE_LOCK_GRAVITY_CONTRIBUTION (-500)
+#define ERL_DB_CATREE_LOCK_GRAVITY_PATTERN (0xFF800000)
+#define ERL_DB_CATREE_LOCK_MORE_THAN_ONE_CONTRIBUTION (-10)
+#define ERL_DB_CATREE_HIGH_CONTENTION_LIMIT 1000
+#define ERL_DB_CATREE_LOW_CONTENTION_LIMIT (-1000)
+#define ERL_DB_CATREE_MAX_ROUTE_NODE_LAYER_HEIGHT 16
+#define ERL_DB_CATREE_LOCK_LOW_NO_CONTRIBUTION_LIMIT (-20000)
+#define ERL_DB_CATREE_LOCK_HIGH_NO_CONTRIBUTION_LIMIT (20000)
+
+/*
+ * Internal CA tree related helper functions and macros
+ */
+
+#define GET_ROUTE_NODE_KEY(node) (node->u.route.key.term)
+#define GET_BASE_NODE_LOCK(node) (&(node->u.base.lock))
+#define GET_ROUTE_NODE_LOCK(node) (&(node->u.route.lock))
+
+
+/* Helpers for reading and writing shared atomic variables */
+
+/* No memory barrier */
+#define GET_ROOT(tb) ((DbTableCATreeNode*)erts_atomic_read_nob(&((tb)->root)))
+#define GET_LEFT(ca_tree_route_node) ((DbTableCATreeNode*)erts_atomic_read_nob(&(ca_tree_route_node->u.route.left)))
+#define GET_RIGHT(ca_tree_route_node) ((DbTableCATreeNode*)erts_atomic_read_nob(&(ca_tree_route_node->u.route.right)))
+#define SET_ROOT(tb, v) erts_atomic_set_nob(&((tb)->root), (erts_aint_t)(v))
+#define SET_LEFT(ca_tree_route_node, v) erts_atomic_set_nob(&(ca_tree_route_node->u.route.left), (erts_aint_t)(v));
+#define SET_RIGHT(ca_tree_route_node, v) erts_atomic_set_nob(&(ca_tree_route_node->u.route.right), (erts_aint_t)(v));
+
+
+/* Release or acquire barriers */
+#define GET_ROOT_ACQB(tb) ((DbTableCATreeNode*)erts_atomic_read_acqb(&((tb)->root)))
+#define GET_LEFT_ACQB(ca_tree_route_node) ((DbTableCATreeNode*)erts_atomic_read_acqb(&(ca_tree_route_node->u.route.left)))
+#define GET_RIGHT_ACQB(ca_tree_route_node) ((DbTableCATreeNode*)erts_atomic_read_acqb(&(ca_tree_route_node->u.route.right)))
+#define SET_ROOT_RELB(tb, v) erts_atomic_set_relb(&((tb)->root), (erts_aint_t)(v))
+#define SET_LEFT_RELB(ca_tree_route_node, v) erts_atomic_set_relb(&(ca_tree_route_node->u.route.left), (erts_aint_t)(v));
+#define SET_RIGHT_RELB(ca_tree_route_node, v) erts_atomic_set_relb(&(ca_tree_route_node->u.route.right), (erts_aint_t)(v));
+
+/* Change base node lock statistics */
+#define BASE_NODE_STAT_SET(NODE, VALUE) erts_atomic_set_nob(&(NODE)->u.base.lock_statistics, VALUE)
+#define BASE_NODE_STAT_READ(NODE) erts_atomic_read_nob(&(NODE)->u.base.lock_statistics)
+#define BASE_NODE_STAT_ADD(NODE, VALUE)                                 \
+    do {                                                                \
+        Sint v = erts_atomic_read_nob(&((NODE)->u.base.lock_statistics)); \
+        ASSERT(VALUE > 0);                                              \
+        if(v < ERL_DB_CATREE_LOCK_HIGH_NO_CONTRIBUTION_LIMIT) {          \
+            erts_atomic_set_nob(&(NODE->u.base.lock_statistics), v + VALUE); \
+        }                                                               \
+    }while(0);
+#define BASE_NODE_STAT_SUB(NODE, VALUE)                                 \
+    do {                                                                \
+        Sint v = erts_atomic_read_nob(&((NODE)->u.base.lock_statistics)); \
+        ASSERT(VALUE < 0);                                              \
+        if(v > ERL_DB_CATREE_LOCK_LOW_NO_CONTRIBUTION_LIMIT) {          \
+            erts_atomic_set_nob(&(NODE->u.base.lock_statistics), v + VALUE); \
+        }                                                               \
+    }while(0);
+
+
+/* Compares a key to the key in a route node */
+static ERTS_INLINE Sint cmp_key_route(Eterm key,
+                                      DbTableCATreeNode *obj)
+{
+    return CMP(key, GET_ROUTE_NODE_KEY(obj));
+}
+
+/*
+ * Used by the split_tree function
+ */
+static ERTS_INLINE
+int less_than_two_elements(TreeDbTerm *root)
+{
+    return root == NULL || (root->left == NULL && root->right == NULL);
+}
+
+/*
+ * Inserts a TreeDbTerm into a tree. Returns the new root.
+ */
+static ERTS_INLINE
+TreeDbTerm* insert_TreeDbTerm(DbTableCATree *tb,
+                              TreeDbTerm *insert_to_root,
+                              TreeDbTerm *value_to_insert) {
+    /* Non recursive insertion in AVL tree, building our own stack */
+    TreeDbTerm **tstack[STACK_NEED];
+    int tpos = 0;
+    int dstack[STACK_NEED+1];
+    int dpos = 0;
+    int state = 0;
+    TreeDbTerm * base = insert_to_root;
+    TreeDbTerm **this = &base;
+    Sint c;
+    Eterm key;
+    int dir;
+    TreeDbTerm *p1, *p2, *p;
+
+    key = GETKEY(tb, value_to_insert->dbterm.tpl);
+
+    dstack[dpos++] = DIR_END;
+    for (;;)
+	if (!*this) { /* Found our place */
+	    state = 1;
+	    *this = value_to_insert;
+	    (*this)->balance = 0;
+	    (*this)->left = (*this)->right = NULL;
+	    break;
+	} else if ((c = cmp_key(&tb->common, key, *this)) < 0) {
+	    /* go lefts */
+	    dstack[dpos++] = DIR_LEFT;
+	    tstack[tpos++] = this;
+	    this = &((*this)->left);
+	} else { /* go right */
+	    dstack[dpos++] = DIR_RIGHT;
+	    tstack[tpos++] = this;
+	    this = &((*this)->right);
+	}
+
+    while (state && ( dir = dstack[--dpos] ) != DIR_END) {
+	this = tstack[--tpos];
+	p = *this;
+	if (dir == DIR_LEFT) {
+	    switch (p->balance) {
+	    case 1:
+		p->balance = 0;
+		state = 0;
+		break;
+	    case 0:
+		p->balance = -1;
+		break;
+	    case -1: /* The icky case */
+		p1 = p->left;
+		if (p1->balance == -1) { /* Single LL rotation */
+		    p->left = p1->right;
+		    p1->right = p;
+		    p->balance = 0;
+		    (*this) = p1;
+		} else { /* Double RR rotation */
+		    p2 = p1->right;
+		    p1->right = p2->left;
+		    p2->left = p1;
+		    p->left = p2->right;
+		    p2->right = p;
+		    p->balance = (p2->balance == -1) ? +1 : 0;
+		    p1->balance = (p2->balance == 1) ? -1 : 0;
+		    (*this) = p2;
+		}
+		(*this)->balance = 0;
+		state = 0;
+		break;
+	    }
+	} else { /* dir == DIR_RIGHT */
+	    switch (p->balance) {
+	    case -1:
+		p->balance = 0;
+		state = 0;
+		break;
+	    case 0:
+		p->balance = 1;
+		break;
+	    case 1:
+		p1 = p->right;
+		if (p1->balance == 1) { /* Single RR rotation */
+		    p->right = p1->left;
+		    p1->left = p;
+		    p->balance = 0;
+		    (*this) = p1;
+		} else { /* Double RL rotation */
+		    p2 = p1->left;
+		    p1->left = p2->right;
+		    p2->right = p1;
+		    p->right = p2->left;
+		    p2->left = p;
+		    p->balance = (p2->balance == 1) ? -1 : 0;
+		    p1->balance = (p2->balance == -1) ? 1 : 0;
+		    (*this) = p2;
+		}
+		(*this)->balance = 0;
+		state = 0;
+		break;
+	    }
+	}
+    }
+    return base;
+}
+
+/*
+ * Split an AVL tree into two trees. The function stores the node
+ * containing the "split key" in the write back parameter
+ * split_key_wb. The function stores the left tree containing the keys
+ * that are smaller than the "split key" in the write back parameter
+ * left_wb and the tree containing the rest of the keys in the write
+ * back parameter right_wb.
+ */
+static void split_tree(DbTableCATree *tb,
+                       TreeDbTerm *root,
+                       TreeDbTerm **split_key_node_wb,
+                       TreeDbTerm **left_wb,
+                       TreeDbTerm **right_wb) {
+    TreeDbTerm * split_node = NULL;
+    TreeDbTerm * left_root;
+    TreeDbTerm * right_root;
+    if (root->left == NULL) { /* To get non empty split */
+        *right_wb = root->right;
+        *split_key_node_wb = root->right;
+        root->right = NULL;
+        root->balance = 0;
+        *left_wb = root;
+        return;
+    }
+    split_node = root;
+    left_root = split_node->left;
+    split_node->left = NULL;
+    right_root = split_node->right;
+    split_node->right = NULL;
+    right_root = insert_TreeDbTerm(tb, right_root, split_node);
+    *split_key_node_wb = split_node;
+    *left_wb = left_root;
+    *right_wb = right_root;
+}
+
+/*
+ * Used by the join_trees function
+ */
+static ERTS_INLINE int compute_tree_hight(TreeDbTerm * root)
+{
+    if(root == NULL) {
+        return 0;
+    } else {
+        TreeDbTerm * current_node = root;
+        int hight_so_far = 1;
+        while (current_node->left != NULL || current_node->right != NULL) {
+            if (current_node->balance == -1) {
+                current_node = current_node->left;
+            } else {
+                current_node = current_node->right;
+            }
+            hight_so_far = hight_so_far + 1;
+        }
+        return hight_so_far;
+    }
+}
+
+/*
+ * Used by the join_trees function
+ */
+static ERTS_INLINE
+TreeDbTerm* linkout_min_or_max_tree_node(TreeDbTerm **root, int is_min)
+{
+    TreeDbTerm **tstack[STACK_NEED];
+    int tpos = 0;
+    int dstack[STACK_NEED+1];
+    int dpos = 0;
+    int state = 0;
+    TreeDbTerm **this = root;
+    int dir;
+    TreeDbTerm *q = NULL;
+
+    dstack[dpos++] = DIR_END;
+    for (;;) {
+        if (!*this) { /* Failure */
+            return NULL;
+        } else if (is_min && (*this)->left != NULL) {
+            dstack[dpos++] = DIR_LEFT;
+            tstack[tpos++] = this;
+            this = &((*this)->left);
+        } else if (!is_min && (*this)->right != NULL) {
+            dstack[dpos++] = DIR_RIGHT;
+            tstack[tpos++] = this;
+            this = &((*this)->right);
+        } else { /* Min value, found the one to splice out */
+            q = (*this);
+            if (q->right == NULL) {
+                (*this) = q->left;
+                state = 1;
+            } else if (q->left == NULL) {
+                (*this) = q->right;
+                state = 1;
+            }
+            break;
+        }
+    }
+    while (state && ( dir = dstack[--dpos] ) != DIR_END) {
+        this = tstack[--tpos];
+        if (dir == DIR_LEFT) {
+            state = tree_balance_left(this);
+        } else {
+            state = tree_balance_right(this);
+        }
+    }
+    return q;
+}
+
+#define LINKOUT_MIN_TREE_NODE(root) linkout_min_or_max_tree_node(root, 1)
+#define LINKOUT_MAX_TREE_NODE(root) linkout_min_or_max_tree_node(root, 0)
+
+/*
+ * Joins two AVL trees where all the keys in the left one are smaller
+ * then the keys in the right one and returns the resulting tree.
+ *
+ * The algorithm is described on page 474 in D. E. Knuth. The Art of
+ * Computer Programming: Sorting and Searching,
+ * vol. 3. Addison-Wesley, 2nd edition, 1998.
+ */
+static TreeDbTerm* join_trees(TreeDbTerm *left_root_param,
+                               TreeDbTerm *right_root_param)
+{
+    TreeDbTerm **tstack[STACK_NEED];
+    int tpos = 0;
+    int dstack[STACK_NEED+1];
+    int dpos = 0;
+    int state = 1;
+    TreeDbTerm **this;
+    int dir;
+    TreeDbTerm *p1, *p2, *p;
+    TreeDbTerm *left_root = left_root_param;
+    TreeDbTerm *right_root = right_root_param;
+    int left_height;
+    int right_height;
+    int current_height;
+    dstack[dpos++] = DIR_END;
+    if (left_root == NULL) {
+        return right_root;
+    } else if (right_root == NULL) {
+        return left_root;
+    }
+
+    left_height = compute_tree_hight(left_root);
+    right_height = compute_tree_hight(right_root);
+    if (left_height >= right_height) {
+        TreeDbTerm * new_root =
+            LINKOUT_MIN_TREE_NODE(&right_root);
+        int new_right_height = compute_tree_hight(right_root);
+        TreeDbTerm * current_node = left_root;
+        this = &left_root;
+        current_height = left_height;
+        while(current_height > new_right_height + 1) {
+            if (current_node->balance == -1) {
+                current_height = current_height - 2;
+            } else {
+                current_height = current_height - 1;
+            }
+            dstack[dpos++] = DIR_RIGHT;
+            tstack[tpos++] = this;
+            this = &((*this)->right);
+            current_node = current_node->right;
+        }
+        new_root->left = current_node;
+        new_root->right = right_root;
+        new_root->balance = new_right_height - current_height;
+        *this = new_root;
+    } else {
+        /* This case is symmetric to the previous case */
+        TreeDbTerm * new_root =
+            LINKOUT_MAX_TREE_NODE(&left_root);
+        int new_left_height = compute_tree_hight(left_root);
+        TreeDbTerm * current_node = right_root;
+        this = &right_root;
+        current_height = right_height;
+        while (current_height > new_left_height + 1) {
+            if (current_node->balance == 1) {
+                current_height = current_height - 2;
+            } else {
+                current_height = current_height - 1;
+            }
+            dstack[dpos++] = DIR_LEFT;
+            tstack[tpos++] = this;
+            this = &((*this)->left);
+            current_node = current_node->left;
+        }
+        new_root->right = current_node;
+        new_root->left = left_root;
+        new_root->balance = current_height - new_left_height;
+        *this = new_root;
+    }
+    /* Now we need to continue as if this was during the insert */
+    while (state && ( dir = dstack[--dpos] ) != DIR_END) {
+        this = tstack[--tpos];
+        p = *this;
+        if (dir == DIR_LEFT) {
+            switch (p->balance) {
+            case 1:
+                p->balance = 0;
+                state = 0;
+                break;
+            case 0:
+                p->balance = -1;
+                break;
+            case -1: /* The icky case */
+                p1 = p->left;
+                if (p1->balance == -1) { /* Single LL rotation */
+                    p->left = p1->right;
+                    p1->right = p;
+                    p->balance = 0;
+                    (*this) = p1;
+                } else { /* Double RR rotation */
+                    p2 = p1->right;
+                    p1->right = p2->left;
+                    p2->left = p1;
+                    p->left = p2->right;
+                    p2->right = p;
+                    p->balance = (p2->balance == -1) ? +1 : 0;
+                    p1->balance = (p2->balance == 1) ? -1 : 0;
+                    (*this) = p2;
+                }
+                (*this)->balance = 0;
+                state = 0;
+                break;
+            }
+        } else { /* dir == DIR_RIGHT */
+            switch (p->balance) {
+            case -1:
+                p->balance = 0;
+                state = 0;
+                break;
+            case 0:
+                p->balance = 1;
+                break;
+            case 1:
+                p1 = p->right;
+                if (p1->balance == 1) { /* Single RR rotation */
+                    p->right = p1->left;
+                    p1->left = p;
+                    p->balance = 0;
+                    (*this) = p1;
+                } else { /* Double RL rotation */
+                    p2 = p1->left;
+                    p1->left = p2->right;
+                    p2->right = p1;
+                    p->right = p2->left;
+                    p2->left = p;
+                    p->balance = (p2->balance == 1) ? -1 : 0;
+                    p1->balance = (p2->balance == -1) ? 1 : 0;
+                    (*this) = p2;
+                }
+                (*this)->balance = 0;
+                state = 0;
+                break;
+            }
+        }
+    }
+    /* Return the joined tree */
+    if (left_height >= right_height) {
+        return left_root;
+    } else {
+        return right_root;
+    }
+}
+
+#ifdef DEBUG
+#  define PROVOKE_RANDOM_SPLIT_JOIN
+#endif
+#ifdef PROVOKE_RANDOM_SPLIT_JOIN
+static int dbg_fastrand(void)
+{
+    static int g_seed = 648835;
+    g_seed = (214013*g_seed+2531011);
+    return (g_seed>>16)&0x7FFF;
+}
+
+static void dbg_provoke_random_splitjoin(DbTableCATree* tb,
+                                         DbTableCATreeNode* base_node)
+{
+    if (tb->common.status & DB_CATREE_FORCE_SPLIT ||
+        !(tb->common.status & DB_CATREE_DEBUG_RANDOM_SPLIT_JOIN))
+        return;
+
+    switch (dbg_fastrand() % 8) {
+    case 1:
+        BASE_NODE_STAT_ADD(base_node, 1+ERL_DB_CATREE_HIGH_CONTENTION_LIMIT);
+        break;
+    case 2:
+        BASE_NODE_STAT_SUB(base_node, -1+ERL_DB_CATREE_LOW_CONTENTION_LIMIT);
+        break;
+    }
+}
+#else
+#  define dbg_provoke_random_splitjoin(T,N)
+#endif /* PROVOKE_RANDOM_SPLIT_JOIN */
+
+static ERTS_NOINLINE
+void do_random_join(DbTableCATree* tb, Uint rand)
+{
+    DbTableCATreeNode* node = GET_ROOT_ACQB(tb);
+    DbTableCATreeNode* parent = NULL;
+    int level = 0;
+    Sint stat;
+    while (!node->is_base_node) {
+        parent = node;
+        if ((rand & (1 << level)) == 0) {
+            node = GET_LEFT_ACQB(node);
+        } else {
+            node = GET_RIGHT_ACQB(node);
+        }
+        level++;
+    }
+    BASE_NODE_STAT_SUB(node, ERL_DB_CATREE_LOCK_GRAVITY_CONTRIBUTION);
+    stat = BASE_NODE_STAT_READ(node);
+    if (stat >= ERL_DB_CATREE_LOW_CONTENTION_LIMIT &&
+        stat <= ERL_DB_CATREE_HIGH_CONTENTION_LIMIT) {
+        return; /* No adaptation */
+    }
+    if (parent != NULL && !try_wlock_base_node(&node->u.base)) {
+        if (!node->u.base.is_valid) {
+            wunlock_base_node(node);
+            return;
+        }
+        wunlock_adapt_base_node(tb, node, parent, level);
+    }
+}
+
+static ERTS_INLINE
+void do_random_join_with_low_probability(DbTableCATree* tb, Uint seed)
+{
+#ifndef ERTS_DB_CA_TREE_NO_RANDOM_JOIN_WITH_LOW_PROBABILITY
+    Uint32 rand = erts_sched_local_random(seed);
+    if (((rand & ERL_DB_CATREE_LOCK_GRAVITY_PATTERN)) == 0) {
+        do_random_join(tb, rand);
+    }
+#endif
+}
+
+static ERTS_INLINE
+int try_wlock_base_node(DbTableCATreeBaseNode *base_node)
+{
+    return EBUSY == erts_rwmtx_tryrwlock(&base_node->lock);
+}
+
+/*
+ * Locks a base node without adjusting the lock statistics
+ */
+static ERTS_INLINE
+void wlock_base_node_no_stats(DbTableCATreeNode *base_node)
+{
+    ASSERT(base_node->is_base_node);
+    erts_rwmtx_rwlock(&base_node->u.base.lock);
+}
+
+/*
+ * Locks a base node and adjusts the lock statistics according to if
+ * the lock was contended or not
+ */
+static ERTS_INLINE
+void wlock_base_node(DbTableCATreeNode *base_node)
+{
+    ASSERT(base_node->is_base_node);
+    if (try_wlock_base_node(&base_node->u.base)) {
+        /* The lock is contended */
+        wlock_base_node_no_stats(base_node);
+        BASE_NODE_STAT_ADD(base_node, ERL_DB_CATREE_LOCK_FAILURE_CONTRIBUTION);
+    } else {
+        BASE_NODE_STAT_SUB(base_node, ERL_DB_CATREE_LOCK_SUCCESS_CONTRIBUTION);
+    }
+}
+
+static ERTS_INLINE
+void wunlock_base_node(DbTableCATreeNode *base_node)
+{
+    erts_rwmtx_rwunlock(&base_node->u.base.lock);
+}
+
+static ERTS_INLINE
+void wunlock_adapt_base_node(DbTableCATree* tb,
+                             DbTableCATreeNode* node,
+                             DbTableCATreeNode* parent,
+                             int current_level)
+{
+    Sint base_node_lock_stat = BASE_NODE_STAT_READ(node);
+    dbg_provoke_random_splitjoin(tb,node);
+    if ((!node->u.base.root && parent && !(tb->common.status
+                                           & DB_CATREE_FORCE_SPLIT))
+        || base_node_lock_stat < ERL_DB_CATREE_LOW_CONTENTION_LIMIT) {
+        join_catree(tb, node, parent);
+    }
+    else if (base_node_lock_stat > ERL_DB_CATREE_HIGH_CONTENTION_LIMIT
+        && current_level < ERL_DB_CATREE_MAX_ROUTE_NODE_LAYER_HEIGHT) {
+        split_catree(tb, node, parent);
+    }
+    else {
+        wunlock_base_node(node);
+    }
+}
+
+static ERTS_INLINE
+void rlock_base_node(DbTableCATreeNode *base_node)
+{
+    ASSERT(base_node->is_base_node);
+    if (EBUSY == erts_rwmtx_tryrlock(&base_node->u.base.lock)) {
+        /* The lock is contended */
+        BASE_NODE_STAT_ADD(base_node, ERL_DB_CATREE_LOCK_FAILURE_CONTRIBUTION);
+        erts_rwmtx_rlock(&base_node->u.base.lock);
+    }
+}
+
+static ERTS_INLINE
+void runlock_base_node(DbTableCATreeNode *base_node, DbTableCATree* tb)
+{
+    ASSERT(base_node->is_base_node);
+    erts_rwmtx_runlock(&base_node->u.base.lock);
+    do_random_join_with_low_probability(tb, (Uint)base_node);
+}
+
+static ERTS_INLINE
+void runlock_base_node_no_rand(DbTableCATreeNode *base_node)
+{
+    ASSERT(base_node->is_base_node);
+    erts_rwmtx_runlock(&base_node->u.base.lock);
+}
+
+static ERTS_INLINE
+void lock_route_node(DbTableCATreeNode *route_node)
+{
+    ASSERT(!route_node->is_base_node);
+    erts_mtx_lock(&route_node->u.route.lock);
+}
+
+static ERTS_INLINE
+void unlock_route_node(DbTableCATreeNode *route_node)
+{
+    ASSERT(!route_node->is_base_node);
+    erts_mtx_unlock(&route_node->u.route.lock);
+}
+
+static ERTS_INLINE
+Eterm copy_route_key(DbRouteKey* dst, Eterm key, Uint key_size)
+{
+    dst->size = key_size;
+    if (key_size != 0) {
+        Eterm* hp = &dst->heap[0];
+        ErlOffHeap tmp_offheap;
+        tmp_offheap.first  = NULL;
+        dst->term = copy_struct(key, key_size, &hp, &tmp_offheap);
+        dst->oh = tmp_offheap.first;
+    }
+    else {
+        ASSERT(is_immed(key));
+        dst->term = key;
+        dst->oh = NULL;
+    }
+    return dst->term;
+}
+
+static ERTS_INLINE
+void destroy_route_key(DbRouteKey* key)
+{
+    if (key->oh) {
+        ErlOffHeap oh;
+        oh.first = key->oh;
+        erts_cleanup_offheap(&oh);
+    }
+}
+
+static ERTS_INLINE
+void init_root_iterator(DbTableCATree* tb, CATreeRootIterator* iter,
+                        int read_only)
+{
+    iter->tb = tb;
+    iter->read_only = read_only;
+    iter->locked_bnode = NULL;
+    iter->next_route_key = THE_NON_VALUE;
+    iter->search_key = NULL;
+}
+
+static ERTS_INLINE
+void lock_iter_base_node(CATreeRootIterator* iter,
+                         DbTableCATreeNode *base_node,
+                         DbTableCATreeNode *parent,
+                         int current_level)
+{
+    ASSERT(!iter->locked_bnode);
+    if (iter->read_only)
+        rlock_base_node(base_node);
+    else {
+        wlock_base_node(base_node);
+        iter->bnode_parent = parent;
+        iter->bnode_level = current_level;
+    }
+    iter->locked_bnode = base_node;
+}
+
+static ERTS_INLINE
+void unlock_iter_base_node(CATreeRootIterator* iter)
+{
+    ASSERT(iter->locked_bnode);
+    if (iter->read_only)
+        runlock_base_node(iter->locked_bnode, iter->tb);
+    else if (iter->locked_bnode->u.base.is_valid) {
+        wunlock_adapt_base_node(iter->tb, iter->locked_bnode,
+                                iter->bnode_parent, iter->bnode_level);
+    }
+    else
+        wunlock_base_node(iter->locked_bnode);
+    iter->locked_bnode = NULL;
+}
+
+static ERTS_INLINE
+void destroy_root_iterator(CATreeRootIterator* iter)
+{
+    if (iter->locked_bnode)
+        unlock_iter_base_node(iter);
+    if (iter->search_key) {
+        destroy_route_key(iter->search_key);
+        erts_free(ERTS_ALC_T_DB_TMP, iter->search_key);
+    }
+}
+
+typedef struct
+{
+    DbTableCATreeNode *parent;
+    int current_level;
+} FindBaseNode;
+
+static ERTS_INLINE
+DbTableCATreeNode* find_base_node(DbTableCATree* tb, Eterm key,
+                                  FindBaseNode* fbn)
+{
+    DbTableCATreeNode* ERTS_RESTRICT node = GET_ROOT_ACQB(tb);
+    if (fbn) {
+        fbn->parent = NULL;
+        fbn->current_level = 0;
+    }
+    while (!node->is_base_node) {
+        if (fbn) {
+            fbn->current_level++;
+            fbn->parent = node;
+        }
+        if (cmp_key_route(key, node) < 0) {
+            node = GET_LEFT_ACQB(node);
+        } else {
+            node = GET_RIGHT_ACQB(node);
+        }
+    }
+    return node;
+}
+
+static ERTS_INLINE
+DbTableCATreeNode* find_rlock_valid_base_node(DbTableCATree* tb, Eterm key)
+{
+    DbTableCATreeNode* base_node;
+
+    while (1) {
+        base_node = find_base_node(tb, key, NULL);
+        rlock_base_node(base_node);
+        if (base_node->u.base.is_valid)
+            break;
+        runlock_base_node_no_rand(base_node);
+    }
+    return base_node;
+}
+
+static ERTS_INLINE
+DbTableCATreeNode* find_wlock_valid_base_node(DbTableCATree* tb, Eterm key,
+                                              FindBaseNode* fbn)
+{
+    DbTableCATreeNode* base_node;
+
+    while (1) {
+        base_node = find_base_node(tb, key, fbn);
+        wlock_base_node(base_node);
+        if (base_node->u.base.is_valid)
+            break;
+        wunlock_base_node(base_node);
+    }
+    return base_node;
+}
+
+#ifdef ERTS_ENABLE_LOCK_CHECK
+#  define LC_ORDER(ORDER) ORDER
+#else
+#  define LC_ORDER(ORDER) NIL
+#endif
+
+#define sizeof_base_node() \
+          offsetof(DbTableCATreeNode, u.base.end_of_struct__)
+
+static DbTableCATreeNode *create_base_node(DbTableCATree *tb,
+                                           TreeDbTerm* root)
+{
+    DbTableCATreeNode *p;
+    erts_rwmtx_opt_t rwmtx_opt = ERTS_RWMTX_OPT_DEFAULT_INITER;
+    p = erts_db_alloc(ERTS_ALC_T_DB_TABLE, (DbTable *) tb,
+                      sizeof_base_node());
+
+    p->is_base_node = 1;
+    p->u.base.root = root;
+    if (tb->common.type & DB_FREQ_READ)
+        rwmtx_opt.type = ERTS_RWMTX_TYPE_FREQUENT_READ;
+    if (erts_ets_rwmtx_spin_count >= 0)
+        rwmtx_opt.main_spincount = erts_ets_rwmtx_spin_count;
+
+    erts_rwmtx_init_opt(&p->u.base.lock, &rwmtx_opt,
+                        "erl_db_catree_base_node",
+                        NIL,
+                        ERTS_LOCK_FLAGS_CATEGORY_DB);
+    BASE_NODE_STAT_SET(p, ((tb->common.status & DB_CATREE_FORCE_SPLIT)
+                           ? INT_MAX : 0));
+    p->u.base.is_valid = 1;
+    return p;
+}
+
+static ERTS_INLINE Uint sizeof_route_node(Uint key_size)
+{
+    return (offsetof(DbTableCATreeNode, u.route.key.heap)
+            + key_size*sizeof(Eterm));
+}
+
+static DbTableCATreeNode*
+create_route_node(DbTableCATree *tb,
+                  DbTableCATreeNode *left,
+                  DbTableCATreeNode *right,
+                  DbTerm * keyTerm,
+                  DbTableCATreeNode* lc_parent)
+{
+    Eterm key = GETKEY(tb,keyTerm->tpl);
+    int key_size = size_object(key);
+    DbTableCATreeNode* p = erts_db_alloc(ERTS_ALC_T_DB_TABLE,
+                                         (DbTable *) tb,
+                                         sizeof_route_node(key_size));
+
+    copy_route_key(&p->u.route.key, key, key_size);
+    p->is_base_node = 0;
+    p->u.route.is_valid = 1;
+    erts_atomic_init_nob(&p->u.route.left, (erts_aint_t)left);
+    erts_atomic_init_nob(&p->u.route.right, (erts_aint_t)right);
+#ifdef ERTS_ENABLE_LOCK_CHECK
+    /* Route node lock order is inverse tree depth (from leafs toward root) */
+    p->u.route.lc_order = (lc_parent == NULL ? MAX_SMALL :
+                           lc_parent->u.route.lc_order - 1);
+    /*
+     * This assert may eventually fail as we don't increase 'lc_order' in join
+     * operations when route nodes move up in the tree.
+     * Tough luck if you run a lock-checking VM for such a long time on 32-bit.
+     */
+    ERTS_LC_ASSERT(p->u.route.lc_order >= 0);
+#endif
+    erts_mtx_init(&p->u.route.lock, "erl_db_catree_route_node",
+                  LC_ORDER(make_small(p->u.route.lc_order)),
+                  ERTS_LOCK_FLAGS_CATEGORY_DB);
+    return p;
+}
+
+static void do_free_base_node(void* vptr)
+{
+    DbTableCATreeNode *p = (DbTableCATreeNode *)vptr;
+    ASSERT(p->is_base_node);
+    erts_rwmtx_destroy(&p->u.base.lock);
+    erts_free(ERTS_ALC_T_DB_TABLE, p);
+}
+
+static void free_catree_base_node(DbTableCATree* tb, DbTableCATreeNode* p)
+{
+    ASSERT(p->is_base_node);
+    ERTS_DB_ALC_MEM_UPDATE_(tb, sizeof_base_node(), 0);
+    do_free_base_node(p);
+}
+
+static void do_free_route_node(void *vptr)
+{
+    DbTableCATreeNode *p = (DbTableCATreeNode *)vptr;
+    ASSERT(!p->is_base_node);
+    erts_mtx_destroy(&p->u.route.lock);
+    destroy_route_key(&p->u.route.key);
+    erts_free(ERTS_ALC_T_DB_TABLE, p);
+}
+
+static void free_catree_route_node(DbTableCATree* tb, DbTableCATreeNode* p)
+{
+    ASSERT(!p->is_base_node);
+    ERTS_DB_ALC_MEM_UPDATE_(tb, sizeof_route_node(p->u.route.key.size), 0);
+    do_free_route_node(p);
+}
+
+
+/*
+ * Returns the parent routing node of the specified
+ * route node 'child' if such a parent exists
+ * or NULL if 'child' is attached to the root.
+ */
+static ERTS_INLINE DbTableCATreeNode *
+parent_of(DbTableCATree *tb,
+          DbTableCATreeNode *child)
+{
+    Eterm key = GET_ROUTE_NODE_KEY(child);
+    DbTableCATreeNode *current = GET_ROOT_ACQB(tb);
+    DbTableCATreeNode *prev = NULL;
+
+    while (current != child) {
+        prev = current;
+        if (cmp_key_route(key, current) < 0) {
+            current = GET_LEFT_ACQB(current);
+        } else {
+            current = GET_RIGHT_ACQB(current);
+        }
+    }
+    return prev;
+}
+
+
+static ERTS_INLINE DbTableCATreeNode *
+leftmost_base_node(DbTableCATreeNode *root)
+{
+    DbTableCATreeNode *node = root;
+    while (!node->is_base_node) {
+        node = GET_LEFT_ACQB(node);
+    }
+    return node;
+}
+
+
+static ERTS_INLINE DbTableCATreeNode *
+rightmost_base_node(DbTableCATreeNode *root)
+{
+    DbTableCATreeNode *node = root;
+    while (!node->is_base_node) {
+        node = GET_RIGHT_ACQB(node);
+    }
+    return node;
+}
+
+
+static ERTS_INLINE DbTableCATreeNode *
+leftmost_route_node(DbTableCATreeNode *root)
+{
+    DbTableCATreeNode *node = root;
+    DbTableCATreeNode *prev_node = NULL;
+    while (!node->is_base_node) {
+        prev_node = node;
+        node = GET_LEFT_ACQB(node);
+    }
+    return prev_node;
+}
+
+static ERTS_INLINE DbTableCATreeNode*
+rightmost_route_node(DbTableCATreeNode *root)
+{
+    DbTableCATreeNode * node = root;
+    DbTableCATreeNode * prev_node = NULL;
+    while (!node->is_base_node) {
+        prev_node = node;
+        node = GET_RIGHT_ACQB(node);
+    }
+    return prev_node;
+}
+
+static ERTS_INLINE
+void init_tree_stack(DbTreeStack *stack,
+                     TreeDbTerm **stack_array,
+                     Uint init_slot)
+{
+    stack->array = stack_array;
+    stack->pos = 0;
+    stack->slot = init_slot;
+}
+
+static void join_catree(DbTableCATree *tb,
+                        DbTableCATreeNode *thiz,
+                        DbTableCATreeNode *parent)
+{
+    DbTableCATreeNode *gparent;
+    DbTableCATreeNode *neighbor;
+    DbTableCATreeNode *new_neighbor;
+    DbTableCATreeNode *neighbor_parent;
+
+    ASSERT(thiz->is_base_node);
+    if (parent == NULL) {
+        BASE_NODE_STAT_SET(thiz, 0);
+        wunlock_base_node(thiz);
+        return;
+    }
+    ASSERT(!parent->is_base_node);
+    if (GET_LEFT(parent) == thiz) {
+        neighbor = leftmost_base_node(GET_RIGHT_ACQB(parent));
+        if (try_wlock_base_node(&neighbor->u.base)) {
+            /* Failed to acquire lock */
+            BASE_NODE_STAT_SET(thiz, 0);
+            wunlock_base_node(thiz);
+            return;
+        } else if (!neighbor->u.base.is_valid) {
+            BASE_NODE_STAT_SET(thiz, 0);
+            wunlock_base_node(thiz);
+            wunlock_base_node(neighbor);
+            return;
+        } else {
+            lock_route_node(parent);
+            parent->u.route.is_valid = 0;
+            neighbor->u.base.is_valid = 0;
+            thiz->u.base.is_valid = 0;
+            gparent = NULL;
+            do {
+                if (gparent != NULL) {
+                    unlock_route_node(gparent);
+                }
+                gparent = parent_of(tb, parent);
+                if (gparent != NULL)
+                    lock_route_node(gparent);
+            } while (gparent != NULL && !gparent->u.route.is_valid);
+
+            if (gparent == NULL) {
+                SET_ROOT_RELB(tb, GET_RIGHT(parent));
+            } else if (GET_LEFT(gparent) == parent) {
+                SET_LEFT_RELB(gparent, GET_RIGHT(parent));
+            } else {
+                SET_RIGHT_RELB(gparent, GET_RIGHT(parent));
+            }
+            unlock_route_node(parent);
+            if (gparent != NULL) {
+                unlock_route_node(gparent);
+            }
+            {
+                TreeDbTerm* new_root = join_trees(thiz->u.base.root,
+                                                  neighbor->u.base.root);
+                new_neighbor = create_base_node(tb, new_root);
+            }
+            if (GET_RIGHT(parent) == neighbor) {
+                neighbor_parent = gparent;
+            } else {
+                neighbor_parent = leftmost_route_node(GET_RIGHT(parent));
+            }
+        }
+    } else { /* Symetric case */
+        ASSERT(GET_RIGHT(parent) == thiz);
+        neighbor = rightmost_base_node(GET_LEFT_ACQB(parent));
+        if (try_wlock_base_node(&neighbor->u.base)) {
+            /* Failed to acquire lock */
+            BASE_NODE_STAT_SET(thiz, 0);
+            wunlock_base_node(thiz);
+            return;
+        } else if (!neighbor->u.base.is_valid) {
+            BASE_NODE_STAT_SET(thiz, 0);
+            wunlock_base_node(thiz);
+            wunlock_base_node(neighbor);
+            return;
+        } else {
+            lock_route_node(parent);
+            parent->u.route.is_valid = 0;
+            neighbor->u.base.is_valid = 0;
+            thiz->u.base.is_valid = 0;
+            gparent = NULL;
+            do {
+                if (gparent != NULL) {
+                    unlock_route_node(gparent);
+                }
+                gparent = parent_of(tb, parent);
+                if (gparent != NULL) {
+                    lock_route_node(gparent);
+                } else {
+                    gparent = NULL;
+                }
+            } while (gparent != NULL && !gparent->u.route.is_valid);
+            if (gparent == NULL) {
+                SET_ROOT_RELB(tb, GET_LEFT(parent));
+            } else if (GET_RIGHT(gparent) == parent) {
+                SET_RIGHT_RELB(gparent, GET_LEFT(parent));
+            } else {
+                SET_LEFT_RELB(gparent, GET_LEFT(parent));
+            }
+            unlock_route_node(parent);
+            if (gparent != NULL) {
+                unlock_route_node(gparent);
+            }
+            {
+                TreeDbTerm* new_root = join_trees(neighbor->u.base.root,
+                                                  thiz->u.base.root);
+                new_neighbor = create_base_node(tb, new_root);
+            }
+            if (GET_LEFT(parent) == neighbor) {
+                neighbor_parent = gparent;
+            } else {
+                neighbor_parent =
+                    rightmost_route_node(GET_LEFT(parent));
+            }
+        }
+    }
+    /* Link in new neighbor and free nodes that are no longer in the tree */
+    if (neighbor_parent == NULL) {
+        SET_ROOT_RELB(tb, new_neighbor);
+    } else if (GET_LEFT(neighbor_parent) == neighbor) {
+        SET_LEFT_RELB(neighbor_parent, new_neighbor);
+    } else {
+        SET_RIGHT_RELB(neighbor_parent, new_neighbor);
+    }
+    wunlock_base_node(thiz);
+    wunlock_base_node(neighbor);
+    /* Free the parent and base */
+    erts_schedule_db_free(&tb->common,
+                          do_free_route_node,
+                          parent,
+                          &parent->u.route.free_item,
+                          sizeof_route_node(parent->u.route.key.size));
+    erts_schedule_db_free(&tb->common,
+                          do_free_base_node,
+                          thiz,
+                          &thiz->u.base.free_item,
+                          sizeof_base_node());
+    erts_schedule_db_free(&tb->common,
+                          do_free_base_node,
+                          neighbor,
+                          &neighbor->u.base.free_item,
+                          sizeof_base_node());
+}
+
+static void split_catree(DbTableCATree *tb,
+                         DbTableCATreeNode* ERTS_RESTRICT base,
+                         DbTableCATreeNode* ERTS_RESTRICT parent)
+{
+    TreeDbTerm *splitOutWriteBack;
+    DbTableCATreeNode* ERTS_RESTRICT new_left;
+    DbTableCATreeNode* ERTS_RESTRICT new_right;
+    DbTableCATreeNode* ERTS_RESTRICT new_route;
+
+    if (less_than_two_elements(base->u.base.root)) {
+        if (!(tb->common.status & DB_CATREE_FORCE_SPLIT))
+            BASE_NODE_STAT_SET(base, 0);
+        wunlock_base_node(base);
+        return;
+    } else {
+        TreeDbTerm *left_tree;
+        TreeDbTerm *right_tree;
+
+        split_tree(tb, base->u.base.root, &splitOutWriteBack,
+                   &left_tree, &right_tree);
+
+        new_left = create_base_node(tb, left_tree);
+        new_right = create_base_node(tb, right_tree);
+        new_route = create_route_node(tb,
+                                      new_left,
+                                      new_right,
+                                      &splitOutWriteBack->dbterm,
+                                      parent);
+        if (parent == NULL) {
+            SET_ROOT_RELB(tb, new_route);
+        } else if(GET_LEFT(parent) == base) {
+            SET_LEFT_RELB(parent, new_route);
+        } else {
+            SET_RIGHT_RELB(parent, new_route);
+        }
+        base->u.base.is_valid = 0;
+        wunlock_base_node(base);
+        erts_schedule_db_free(&tb->common,
+                              do_free_base_node,
+                              base,
+                              &base->u.base.free_item,
+                              sizeof_base_node());
+    }
+}
+
+/*
+ * Helper functions for removing the table
+ */
+
+static void catree_add_base_node_to_free_list(
+        DbTableCATree *tb,
+        DbTableCATreeNode *base_node_container)
+{
+    base_node_container->u.base.next =
+        tb->base_nodes_to_free_list;
+    tb->base_nodes_to_free_list = base_node_container;
+}
+
+static void catree_deque_base_node_from_free_list(DbTableCATree *tb)
+{
+    if (tb->base_nodes_to_free_list == NULL) {
+        return; /* List empty */
+    } else {
+        DbTableCATreeNode *first = tb->base_nodes_to_free_list;
+        tb->base_nodes_to_free_list = first->u.base.next;
+    }
+}
+
+static DbTableCATreeNode *catree_first_base_node_from_free_list(
+        DbTableCATree *tb)
+{
+    return tb->base_nodes_to_free_list;
+}
+
+static SWord do_free_routing_nodes_catree_cont(DbTableCATree *tb, SWord num_left)
+{
+    DbTableCATreeNode *root;
+    DbTableCATreeNode *p;
+    for (;;) {
+        root = POP_NODE(&tb->free_stack_rnodes);
+    	if (root == NULL) break;
+        else if(root->is_base_node) {
+            catree_add_base_node_to_free_list(tb, root);
+            break;
+        }
+    	for (;;) {
+            if ((GET_LEFT(root) != NULL) &&
+                (p = GET_LEFT(root))->is_base_node) {
+                SET_LEFT(root, NULL);
+                catree_add_base_node_to_free_list(tb, p);
+            } else if ((GET_RIGHT(root) != NULL) &&
+                       (p = GET_RIGHT(root))->is_base_node) {
+                SET_RIGHT(root, NULL);
+                catree_add_base_node_to_free_list(tb, p);
+            } else if ((p = GET_LEFT(root)) != NULL) {
+                SET_LEFT(root, NULL);
+                PUSH_NODE(&tb->free_stack_rnodes, root);
+                root = p;
+            } else if ((p = GET_RIGHT(root)) != NULL) {
+                SET_RIGHT(root, NULL);
+                PUSH_NODE(&tb->free_stack_rnodes, root);
+                root = p;
+            } else {
+                free_catree_route_node(tb, root);
+                if (--num_left >= 0) {
+                    break;
+                } else {
+                    return num_left;	/* Done enough for now */
+                }
+            }
+        }
+    }
+    return num_left;
+}
+
+static SWord do_free_base_node_cont(DbTableCATree *tb, SWord num_left)
+{
+    TreeDbTerm *root;
+    TreeDbTerm *p;
+    DbTableCATreeNode *base_node_container =
+        catree_first_base_node_from_free_list(tb);
+    for (;;) {
+        root = POP_NODE(&tb->free_stack_elems);
+        if (root == NULL) break;
+        for (;;) {
+            if ((p = root->left) != NULL) {
+                root->left = NULL;
+                PUSH_NODE(&tb->free_stack_elems, root);
+                root = p;
+            } else if ((p = root->right) != NULL) {
+                root->right = NULL;
+                PUSH_NODE(&tb->free_stack_elems, root);
+                root = p;
+            } else {
+                DEC_NITEMS((DbTable*)tb);
+                tb->nr_of_deleted_items++;
+                free_term((DbTable*)tb, root);
+                if (--num_left >= 0) {
+                    break;
+                } else {
+                    return num_left;	/* Done enough for now */
+                }
+            }
+        }
+    }
+    catree_deque_base_node_from_free_list(tb);
+    free_catree_base_node(tb, base_node_container);
+    base_node_container = catree_first_base_node_from_free_list(tb);
+    if (base_node_container != NULL) {
+        PUSH_NODE(&tb->free_stack_elems, base_node_container->u.base.root);
+    }
+    return num_left;
+}
+
+
+/*
+** Initialization function
+*/
+
+void db_initialize_catree(void)
+{
+    return;
+};
+
+/*
+** Table interface routines (i.e., what's called by the bif's)
+*/
+
+int db_create_catree(Process *p, DbTable *tbl)
+{
+    DbTableCATree *tb = &tbl->catree;
+    DbTableCATreeNode *root;
+
+    root = create_base_node(tb, NULL);
+    tb->deletion = 0;
+    tb->base_nodes_to_free_list = NULL;
+    tb->nr_of_deleted_items = 0;
+#ifdef DEBUG
+    tbl->common.status |= DB_CATREE_DEBUG_RANDOM_SPLIT_JOIN;
+#endif
+    erts_atomic_init_relb(&(tb->root), (erts_aint_t)root);
+    return DB_ERROR_NONE;
+}
+
+static int db_first_catree(Process *p, DbTable *tbl, Eterm *ret)
+{
+    TreeDbTerm *root;
+    CATreeRootIterator iter;
+    int result;
+
+    init_root_iterator(&tbl->catree, &iter, 1);
+    root = *catree_find_first_root(&iter);
+    if (!root) {
+        TreeDbTerm **pp = catree_find_next_root(&iter, NULL);
+        root = pp ? *pp : NULL;
+    }
+
+    result = db_first_tree_common(p, tbl, root, ret, NULL);
+
+    destroy_root_iterator(&iter);
+    return result;
+}
+
+static int db_next_catree(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
+{
+    DbTreeStack stack;
+    TreeDbTerm * stack_array[STACK_NEED];
+    TreeDbTerm **rootp;
+    CATreeRootIterator iter;
+    int result;
+
+    init_root_iterator(&tbl->catree, &iter, 1);
+    iter.next_route_key = key;
+    rootp = catree_find_next_root(&iter, NULL);
+
+    do {
+        init_tree_stack(&stack, stack_array, 0);
+        result = db_next_tree_common(p, tbl, (rootp ? *rootp : NULL), key, ret, &stack);
+        if (result != DB_ERROR_NONE || *ret != am_EOT)
+            break;
+
+        rootp = catree_find_next_root(&iter, NULL);
+    } while (rootp);
+
+    destroy_root_iterator(&iter);
+    return result;
+}
+
+static int db_last_catree(Process *p, DbTable *tbl, Eterm *ret)
+{
+    TreeDbTerm *root;
+    CATreeRootIterator iter;
+    int result;
+
+    init_root_iterator(&tbl->catree, &iter, 1);
+    root = *catree_find_last_root(&iter);
+    if (!root) {
+        TreeDbTerm **pp = catree_find_prev_root(&iter, NULL);
+        root = pp ? *pp : NULL;
+    }
+
+    result = db_last_tree_common(p, tbl, root, ret, NULL);
+
+    destroy_root_iterator(&iter);
+    return result;
+}
+
+static int db_prev_catree(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
+{
+    DbTreeStack stack;
+    TreeDbTerm * stack_array[STACK_NEED];
+    TreeDbTerm **rootp;
+    CATreeRootIterator iter;
+    int result;
+
+    init_root_iterator(&tbl->catree, &iter, 1);
+    iter.next_route_key = key;
+    rootp = catree_find_prev_root(&iter, NULL);
+
+    do {
+        init_tree_stack(&stack, stack_array, 0);
+        result = db_prev_tree_common(p, tbl, (rootp ? *rootp : NULL), key, ret,
+                                     &stack);
+        if (result != DB_ERROR_NONE || *ret != am_EOT)
+            break;
+        rootp = catree_find_prev_root(&iter, NULL);
+    } while (rootp);
+
+    destroy_root_iterator(&iter);
+    return result;
+}
+
+static int db_put_catree(DbTable *tbl, Eterm obj, int key_clash_fail)
+{
+    DbTableCATree *tb = &tbl->catree;
+    Eterm key = GETKEY(&tb->common, tuple_val(obj));
+    FindBaseNode fbn;
+    DbTableCATreeNode* node = find_wlock_valid_base_node(tb, key, &fbn);
+    int result = db_put_tree_common(&tb->common, &node->u.base.root, obj,
+                                    key_clash_fail, NULL);
+    wunlock_adapt_base_node(tb, node, fbn.parent, fbn.current_level);
+    return result;
+}
+
+static int db_get_catree(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
+{
+    DbTableCATree *tb = &tbl->catree;
+    DbTableCATreeNode* node = find_rlock_valid_base_node(tb, key);
+    int result = db_get_tree_common(p, &tb->common,
+                                    node->u.base.root,
+                                    key, ret, NULL);
+    runlock_base_node(node, tb);
+    return result;
+}
+
+TreeDbTerm** catree_find_root(Eterm key, CATreeRootIterator* iter)
+{
+    FindBaseNode fbn;
+    DbTableCATreeNode* base_node;
+
+    while (1) {
+        base_node = find_base_node(iter->tb, key, &fbn);
+        lock_iter_base_node(iter, base_node, fbn.parent, fbn.current_level);
+        if (base_node->u.base.is_valid)
+            break;
+        unlock_iter_base_node(iter);
+    }
+    return &base_node->u.base.root;
+}
+
+static Eterm save_iter_search_key(CATreeRootIterator* iter, Eterm key)
+{
+    Uint key_size;
+
+    if (is_immed(key))
+        return key;
+
+    if (iter->search_key) {
+        if (key == iter->search_key->term)
+            return key; /* already saved */
+        destroy_route_key(iter->search_key);
+    }
+    key_size = size_object(key);
+    if (!iter->search_key || key_size > iter->search_key->size) {
+        iter->search_key = erts_realloc(ERTS_ALC_T_DB_TMP,
+                                        iter->search_key,
+                                        (offsetof(DbRouteKey, heap)
+                                         + key_size*sizeof(Eterm)));
+    }
+    return copy_route_key(iter->search_key, key, key_size);
+}
+
+TreeDbTerm** catree_find_nextprev_root(CATreeRootIterator *iter,
+                                       int forward,
+                                       Eterm *search_keyp)
+{
+#ifdef DEBUG
+    DbTableCATreeNode *rejected_invalid = NULL;
+    DbTableCATreeNode *rejected_empty = NULL;
+#endif
+    DbTableCATreeNode *node;
+    DbTableCATreeNode *parent;
+    DbTableCATreeNode* next_route_node;
+    Eterm route_key = iter->next_route_key;
+    int current_level;
+
+    if (iter->locked_bnode) {
+        if (search_keyp)
+            *search_keyp = save_iter_search_key(iter, *search_keyp);
+        unlock_iter_base_node(iter);
+    }
+
+    if (is_non_value(route_key))
+        return NULL;
+
+    while (1) {
+        node = GET_ROOT_ACQB(iter->tb);
+        current_level = 0;
+        parent = NULL;
+        next_route_node = NULL;
+        while (!node->is_base_node) {
+            current_level++;
+            parent = node;
+            if (forward) {
+                if (cmp_key_route(route_key,node) < 0) {
+                    next_route_node = node;
+                    node = GET_LEFT_ACQB(node);
+                } else {
+                    node = GET_RIGHT_ACQB(node);
+                }
+            }
+            else {
+                if (cmp_key_route(route_key,node) > 0) {
+                    next_route_node = node;
+                    node = GET_RIGHT_ACQB(node);
+                } else {
+                    node = GET_LEFT_ACQB(node);
+                }
+            }
+        }
+        ASSERT(node != rejected_invalid);
+        lock_iter_base_node(iter, node, parent, current_level);
+        if (node->u.base.is_valid) {
+            ASSERT(node != rejected_empty);
+            if (node->u.base.root) {
+                iter->next_route_key = (next_route_node ?
+                                        next_route_node->u.route.key.term :
+                                        THE_NON_VALUE);
+                iter->locked_bnode = node;
+                return &node->u.base.root;
+            }
+            if (!next_route_node) {
+                unlock_iter_base_node(iter);
+                return NULL;
+            }
+            route_key = next_route_node->u.route.key.term;
+            IF_DEBUG(rejected_empty = node);
+        }
+        else
+            IF_DEBUG(rejected_invalid = node);
+
+        /* Retry */
+        unlock_iter_base_node(iter);
+    }
+}
+
+TreeDbTerm** catree_find_next_root(CATreeRootIterator *iter, Eterm* keyp)
+{
+    return catree_find_nextprev_root(iter, 1, keyp);
+}
+
+TreeDbTerm** catree_find_prev_root(CATreeRootIterator *iter, Eterm* keyp)
+{
+    return catree_find_nextprev_root(iter, 0, keyp);
+}
+
+/* @brief Find root of tree where object with smallest key of all larger than
+ * partially bound key may reside. Can be used as a starting point for
+ * a reverse iteration with pb_key.
+ *
+ * @param pb_key The partially bound key. Example {42, '$1'}
+ * @param iter An initialized root iterator.
+ *
+ * @return Pointer to found root pointer. May not be NULL.
+ */
+TreeDbTerm** catree_find_next_from_pb_key_root(Eterm pb_key,
+                                               CATreeRootIterator* iter)
+{
+#ifdef DEBUG
+    DbTableCATreeNode *rejected_base = NULL;
+#endif
+    DbTableCATreeNode *node;
+    DbTableCATreeNode *parent;
+    DbTableCATreeNode* next_route_node;
+    int current_level;
+
+    ASSERT(!iter->locked_bnode);
+
+    while (1) {
+        node = GET_ROOT_ACQB(iter->tb);
+        current_level = 0;
+        parent = NULL;
+        next_route_node = NULL;
+        while (!node->is_base_node) {
+            current_level++;
+            parent = node;
+            if (cmp_partly_bound(pb_key, GET_ROUTE_NODE_KEY(node)) >= 0) {
+                next_route_node = node;
+                node = GET_RIGHT_ACQB(node);
+            } else {
+                node = GET_LEFT_ACQB(node);
+            }
+        }
+        ASSERT(node != rejected_base);
+        lock_iter_base_node(iter, node, parent, current_level);
+        if (node->u.base.is_valid) {
+            iter->next_route_key = (next_route_node ?
+                                    next_route_node->u.route.key.term :
+                                    THE_NON_VALUE);
+            return &node->u.base.root;
+        }
+        /* Retry */
+        unlock_iter_base_node(iter);
+#ifdef DEBUG
+        rejected_base = node;
+#endif
+    }
+}
+
+/* @brief Find root of tree where object with largest key of all smaller than
+ * partially bound key may reside. Can be used as a starting point for
+ * a forward iteration with pb_key.
+ *
+ * @param pb_key The partially bound key. Example {42, '$1'}
+ * @param iter An initialized root iterator.
+ *
+ * @return Pointer to found root pointer. May not be NULL.
+ */
+TreeDbTerm** catree_find_prev_from_pb_key_root(Eterm key,
+                                               CATreeRootIterator* iter)
+{
+#ifdef DEBUG
+    DbTableCATreeNode *rejected_base = NULL;
+#endif
+    DbTableCATreeNode *node;
+    DbTableCATreeNode *parent;
+    DbTableCATreeNode* next_route_node;
+    int current_level;
+
+    ASSERT(!iter->locked_bnode);
+
+    while (1) {
+        node = GET_ROOT_ACQB(iter->tb);
+        current_level = 0;
+        parent = NULL;
+        next_route_node = NULL;
+        while (!node->is_base_node) {
+            current_level++;
+            parent = node;
+            if (cmp_partly_bound(key, GET_ROUTE_NODE_KEY(node)) <= 0) {
+                next_route_node = node;
+                node = GET_LEFT_ACQB(node);
+            } else {
+                node = GET_RIGHT_ACQB(node);
+            }
+        }
+        ASSERT(node != rejected_base);
+        lock_iter_base_node(iter, node, parent, current_level);
+        if (node->u.base.is_valid) {
+            iter->next_route_key = (next_route_node ?
+                                    next_route_node->u.route.key.term :
+                                    THE_NON_VALUE);
+            return &node->u.base.root;
+        }
+        /* Retry */
+        unlock_iter_base_node(iter);
+#ifdef DEBUG
+        rejected_base = node;
+#endif
+    }
+}
+
+static TreeDbTerm** catree_find_firstlast_root(CATreeRootIterator* iter,
+                                               int first)
+{
+#ifdef DEBUG
+    DbTableCATreeNode *rejected_base = NULL;
+#endif
+    DbTableCATreeNode *node;
+    DbTableCATreeNode* next_route_node;
+    int current_level;
+
+    while (1) {
+        node = GET_ROOT_ACQB(iter->tb);
+        current_level = 0;
+        next_route_node = NULL;
+        while (!node->is_base_node) {
+            current_level++;
+            next_route_node = node;
+            node = first ? GET_LEFT_ACQB(node) : GET_RIGHT_ACQB(node);
+        }
+        ASSERT(node != rejected_base);
+        lock_iter_base_node(iter, node, next_route_node, current_level);
+        if (node->u.base.is_valid) {
+            iter->next_route_key = (next_route_node ?
+                                    next_route_node->u.route.key.term :
+                                    THE_NON_VALUE);
+            return &node->u.base.root;
+        }
+        /* Retry */
+        unlock_iter_base_node(iter);
+#ifdef DEBUG
+        rejected_base = node;
+#endif
+    }
+}
+
+TreeDbTerm** catree_find_first_root(CATreeRootIterator* iter)
+{
+    return catree_find_firstlast_root(iter, 1);
+}
+
+TreeDbTerm** catree_find_last_root(CATreeRootIterator* iter)
+{
+    return catree_find_firstlast_root(iter, 0);
+}
+
+static int db_member_catree(DbTable *tbl, Eterm key, Eterm *ret)
+{
+    DbTableCATree *tb = &tbl->catree;
+    DbTableCATreeNode* node = find_rlock_valid_base_node(tb, key);
+    int result = db_member_tree_common(&tb->common,
+                                       node->u.base.root,
+                                       key, ret, NULL);
+    runlock_base_node(node, tb);
+    return result;
+}
+
+static int db_get_element_catree(Process *p, DbTable *tbl,
+			       Eterm key, int ndex, Eterm *ret)
+{
+    DbTableCATree *tb = &tbl->catree;
+    DbTableCATreeNode* node = find_rlock_valid_base_node(tb, key);
+    int result = db_get_element_tree_common(p, &tb->common,
+                                            node->u.base.root,
+                                            key, ndex, ret, NULL);
+    runlock_base_node(node, tb);
+    return result;
+}
+
+static int db_erase_catree(DbTable *tbl, Eterm key, Eterm *ret)
+{
+    DbTableCATree *tb = &tbl->catree;
+    FindBaseNode fbn;
+    DbTableCATreeNode* node = find_wlock_valid_base_node(tb, key, &fbn);
+    int result = db_erase_tree_common(tbl, &node->u.base.root, key,
+                                      ret, NULL);
+    wunlock_adapt_base_node(tb, node, fbn.parent, fbn.current_level);
+    return result;
+}
+
+static int db_erase_object_catree(DbTable *tbl, Eterm object, Eterm *ret)
+{
+    DbTableCATree *tb = &tbl->catree;
+    Eterm key = GETKEY(&tb->common, tuple_val(object));
+    FindBaseNode fbn;
+    DbTableCATreeNode* node = find_wlock_valid_base_node(tb, key, &fbn);
+    int result = db_erase_object_tree_common(tbl,
+                                             &node->u.base.root,
+                                             object,
+                                             ret,
+                                             NULL);
+    wunlock_adapt_base_node(tb, node, fbn.parent, fbn.current_level);
+    return result;
+}
+
+
+static int db_slot_catree(Process *p, DbTable *tbl,
+                          Eterm slot_term, Eterm *ret)
+{
+    int result;
+    CATreeRootIterator iter;
+
+    init_root_iterator(&tbl->catree, &iter, 1);
+    result = db_slot_tree_common(p, tbl, *catree_find_first_root(&iter),
+                                 slot_term, ret, NULL, &iter);
+    destroy_root_iterator(&iter);
+    return result;
+}
+
+static int db_select_continue_catree(Process *p,
+                                     DbTable *tbl,
+                                     Eterm continuation,
+                                     Eterm *ret,
+                                     enum DbIterSafety* safety_p)
+{
+    int result;
+    CATreeRootIterator iter;
+
+    init_root_iterator(&tbl->catree, &iter, 1);
+    result = db_select_continue_tree_common(p, &tbl->common,
+                                            continuation, ret, NULL, &iter);
+    destroy_root_iterator(&iter);
+    return result;
+}
+
+static int db_select_catree(Process *p, DbTable *tbl, Eterm tid,
+                            Eterm pattern, int reverse, Eterm *ret,
+                            enum DbIterSafety safety)
+{
+    int result;
+    CATreeRootIterator iter;
+
+    init_root_iterator(&tbl->catree, &iter, 1);
+    result = db_select_tree_common(p, tbl, tid, pattern, reverse, ret,
+                                   NULL, &iter);
+    destroy_root_iterator(&iter);
+    return result;
+}
+
+static int db_select_count_continue_catree(Process *p,
+                                           DbTable *tbl,
+                                           Eterm continuation,
+                                           Eterm *ret,
+                                           enum DbIterSafety* safety_p)
+{
+    int result;
+    CATreeRootIterator iter;
+
+    init_root_iterator(&tbl->catree, &iter, 1);
+    result = db_select_count_continue_tree_common(p, tbl,
+                                                  continuation, ret, NULL,
+                                                  &iter);
+    destroy_root_iterator(&iter);
+    return result;
+}
+
+static int db_select_count_catree(Process *p, DbTable *tbl, Eterm tid,
+                                  Eterm pattern, Eterm *ret,
+                                  enum DbIterSafety safety)
+{
+    int result;
+    CATreeRootIterator iter;
+
+    init_root_iterator(&tbl->catree, &iter, 1);
+    result = db_select_count_tree_common(p, tbl,
+                                         tid, pattern, ret, NULL, &iter);
+    destroy_root_iterator(&iter);
+    return result;
+}
+
+static int db_select_chunk_catree(Process *p, DbTable *tbl, Eterm tid,
+                                  Eterm pattern, Sint chunk_size,
+                                  int reversed, Eterm *ret,
+                                  enum DbIterSafety safety)
+{
+    int result;
+    CATreeRootIterator iter;
+
+    init_root_iterator(&tbl->catree, &iter, 1);
+    result = db_select_chunk_tree_common(p, tbl,
+                                         tid, pattern, chunk_size, reversed, ret,
+                                         NULL, &iter);
+    destroy_root_iterator(&iter);
+    return result;
+}
+
+static int db_select_delete_continue_catree(Process *p,
+                                            DbTable *tbl,
+                                            Eterm continuation,
+                                            Eterm *ret,
+                                            enum DbIterSafety* safety_p)
+{
+    DbTreeStack stack;
+    TreeDbTerm * stack_array[STACK_NEED];
+    int result;
+    CATreeRootIterator iter;
+
+    init_root_iterator(&tbl->catree, &iter, 0);
+    init_tree_stack(&stack, stack_array, 0);
+    result = db_select_delete_continue_tree_common(p, tbl, continuation, ret,
+                                                   &stack, &iter);
+    destroy_root_iterator(&iter);
+    return result;
+}
+
+static int db_select_delete_catree(Process *p, DbTable *tbl, Eterm tid,
+                                   Eterm pattern, Eterm *ret,
+                                   enum DbIterSafety safety)
+{
+    DbTreeStack stack;
+    TreeDbTerm * stack_array[STACK_NEED];
+    int result;
+    CATreeRootIterator iter;
+
+    init_root_iterator(&tbl->catree, &iter, 0);
+    init_tree_stack(&stack, stack_array, 0);
+    result = db_select_delete_tree_common(p, tbl,
+                                          tid, pattern, ret, &stack,
+                                          &iter);
+    destroy_root_iterator(&iter);
+    return result;
+}
+
+static int db_select_replace_catree(Process *p, DbTable *tbl, Eterm tid,
+                                    Eterm pattern, Eterm *ret,
+                                    enum DbIterSafety safety_p)
+{
+    int result;
+    CATreeRootIterator iter;
+
+    init_root_iterator(&tbl->catree, &iter, 0);
+    result = db_select_replace_tree_common(p, tbl,
+                                           tid, pattern, ret, NULL, &iter);
+    destroy_root_iterator(&iter);
+    return result;
+}
+
+static int db_select_replace_continue_catree(Process *p, DbTable *tbl,
+                                             Eterm continuation, Eterm *ret,
+                                             enum DbIterSafety* safety_p)
+{
+    int result;
+    CATreeRootIterator iter;
+
+    init_root_iterator(&tbl->catree, &iter, 0);
+    result = db_select_replace_continue_tree_common(p, tbl, continuation, ret,
+                                                    NULL, &iter);
+    destroy_root_iterator(&iter);
+    return result;
+}
+
+static int db_take_catree(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
+{
+    DbTableCATree *tb = &tbl->catree;
+    FindBaseNode fbn;
+    DbTableCATreeNode* node = find_wlock_valid_base_node(tb, key, &fbn);
+    int result = db_take_tree_common(p, tbl, &node->u.base.root, key,
+                                     ret, NULL);
+    wunlock_adapt_base_node(tb, node, fbn.parent, fbn.current_level);
+    return result;
+}
+
+/*
+** Other interface routines (not directly coupled to one bif)
+*/
+
+
+/* Display tree contents (for dump) */
+static void db_print_catree(fmtfn_t to, void *to_arg,
+                            int show, DbTable *tbl)
+{
+    CATreeRootIterator iter;
+    TreeDbTerm** root;
+
+    init_root_iterator(&tbl->catree, &iter, 1);
+    root = catree_find_first_root(&iter);
+    do {
+        db_print_tree_common(to, to_arg, show, *root, tbl);
+        root = catree_find_next_root(&iter, NULL);
+    } while (root);
+    destroy_root_iterator(&iter);
+}
+
+/* Release all memory occupied by a single table */
+static int db_free_table_catree(DbTable *tbl)
+{
+    while (db_free_table_continue_catree(tbl, ERTS_SWORD_MAX) < 0)
+	;
+    return 1;
+}
+
+static SWord db_free_table_continue_catree(DbTable *tbl, SWord reds)
+{
+    DbTableCATreeNode *first_base_node;
+    DbTableCATree *tb = &tbl->catree;
+    if (!tb->deletion) {
+        tb->deletion = 1;
+        tb->free_stack_elems.array =
+            erts_db_alloc(ERTS_ALC_T_DB_STK,
+                          (DbTable *) tb,
+                          sizeof(TreeDbTerm *) * STACK_NEED);
+        tb->free_stack_elems.pos = 0;
+        tb->free_stack_elems.slot = 0;
+        tb->free_stack_rnodes.array =
+            erts_db_alloc(ERTS_ALC_T_DB_STK,
+                          (DbTable *) tb,
+                          sizeof(DbTableCATreeNode *) * STACK_NEED);
+        tb->free_stack_rnodes.pos = 0;
+        tb->free_stack_rnodes.size = STACK_NEED;
+        PUSH_NODE(&tb->free_stack_rnodes, GET_ROOT(tb));
+        tb->is_routing_nodes_freed = 0;
+        tb->base_nodes_to_free_list = NULL;
+        tb->nr_of_deleted_items = 0;
+    }
+    if ( ! tb->is_routing_nodes_freed ) {
+        reds = do_free_routing_nodes_catree_cont(tb, reds);
+        if (reds < 0) {
+            return reds; /* Not finished */
+        } else {
+            tb->is_routing_nodes_freed = 1; /* Ready with the routing nodes */
+            first_base_node = catree_first_base_node_from_free_list(tb);
+            PUSH_NODE(&tb->free_stack_elems, first_base_node->u.base.root);
+        }
+    }
+    while (catree_first_base_node_from_free_list(tb) != NULL) {
+        reds = do_free_base_node_cont(tb, reds);
+        if (reds < 0) {
+            return reds; /* Continue later */
+        }
+    }
+    /* Time to free the main structure*/
+    erts_db_free(ERTS_ALC_T_DB_STK,
+                 (DbTable *) tb,
+                 (void *) tb->free_stack_elems.array,
+                 sizeof(TreeDbTerm *) * STACK_NEED);
+    erts_db_free(ERTS_ALC_T_DB_STK,
+                 (DbTable *) tb,
+                 (void *) tb->free_stack_rnodes.array,
+                 sizeof(DbTableCATreeNode *) * STACK_NEED);
+    return 1;
+}
+
+static
+int db_catree_nr_of_items_deleted_wb_dtor(Binary *context_bin) {
+    (void)context_bin;
+    return 1;
+}
+
+typedef struct {
+    Uint nr_of_deleted_items;
+} DbCATreeNrOfItemsDeletedWb;
+
+static Eterm
+create_and_install_num_of_deleted_items_wb_bin(Process *p, DbTableCATree *tb)
+{
+    Binary* bin =
+        erts_create_magic_binary(sizeof(DbCATreeNrOfItemsDeletedWb),
+                                 db_catree_nr_of_items_deleted_wb_dtor);
+    DbCATreeNrOfItemsDeletedWb* data = ERTS_MAGIC_BIN_DATA(bin);
+    Eterm* hp = HAlloc(p, ERTS_MAGIC_REF_THING_SIZE);
+    Eterm mref = erts_mk_magic_ref(&hp, &MSO(p), bin);
+    data->nr_of_deleted_items = 0;
+    tb->nr_of_deleted_items_wb = bin;
+    erts_refc_inctest(&bin->intern.refc, 2);   
+    return mref;
+}
+
+static Eterm db_delete_all_objects_get_nitems_from_holder_catree(Process* p,
+                                                                 Eterm mref)
+{
+    Binary* bin = erts_magic_ref2bin(mref);
+    DbCATreeNrOfItemsDeletedWb* data = ERTS_MAGIC_BIN_DATA(bin);
+    return erts_make_integer(data->nr_of_deleted_items, p);
+}
+
+static SWord db_delete_all_objects_catree(Process* p,
+                                          DbTable* tbl,
+                                          SWord reds,
+                                          Eterm* nitems_holder_wb)
+{
+    DbTableCATree *tb = &tbl->catree;
+    DbCATreeNrOfItemsDeletedWb* data;
+    if (!tb->deletion) {
+        *nitems_holder_wb =
+            create_and_install_num_of_deleted_items_wb_bin(p, tb);
+    }
+    reds = db_free_table_continue_catree(tbl, reds);
+    if (reds < 0)
+        return reds;
+    data = ERTS_MAGIC_BIN_DATA(tb->nr_of_deleted_items_wb);
+    data->nr_of_deleted_items = tb->nr_of_deleted_items;
+    erts_bin_release(tb->nr_of_deleted_items_wb);
+    db_create_catree(p, tbl);
+    return reds;
+}
+
+
+static void do_for_route_nodes(DbTableCATreeNode* node,
+                               void (*func)(ErlOffHeap *, void *),
+                               void *arg)
+{
+    ErlOffHeap tmp_offheap;
+
+    if (!GET_LEFT(node)->is_base_node)
+        do_for_route_nodes(GET_LEFT(node), func, arg);
+
+    tmp_offheap.first = node->u.route.key.oh;
+    tmp_offheap.overhead = 0;
+    (*func)(&tmp_offheap, arg);
+
+    if (!GET_RIGHT(node)->is_base_node)
+        do_for_route_nodes(GET_RIGHT(node), func, arg);
+}
+
+static void db_foreach_offheap_catree(DbTable *tbl,
+                                      void (*func)(ErlOffHeap *, void *),
+                                      void *arg)
+{
+    CATreeRootIterator iter;
+    TreeDbTerm** root;
+
+    init_root_iterator(&tbl->catree, &iter, 1);
+    root = catree_find_first_root(&iter);
+    do {
+        db_foreach_offheap_tree_common(*root, func, arg);
+        root = catree_find_next_root(&iter, NULL);
+    } while (root);
+    destroy_root_iterator(&iter);
+
+    do_for_route_nodes(GET_ROOT(&tbl->catree), func, arg);
+}
+
+static int db_lookup_dbterm_catree(Process *p, DbTable *tbl, Eterm key, Eterm obj,
+                                   DbUpdateHandle *handle)
+{
+    DbTableCATree *tb = &tbl->catree;
+    FindBaseNode fbn;
+    DbTableCATreeNode* node = find_wlock_valid_base_node(tb, key, &fbn);
+    int res = db_lookup_dbterm_tree_common(p, tbl, &node->u.base.root, key,
+                                           obj, handle, NULL);
+    if (res == 0) {
+        wunlock_adapt_base_node(tb, node, fbn.parent, fbn.current_level);
+    } else {
+        /* db_finalize_dbterm_catree will unlock */
+        handle->u.catree.base_node = node;
+        handle->u.catree.parent = fbn.parent;
+        handle->u.catree.current_level = fbn.current_level;
+    }
+    return res;
+}
+
+static void db_finalize_dbterm_catree(int cret, DbUpdateHandle *handle)
+{
+    DbTableCATree *tb = &(handle->tb->catree);
+    db_finalize_dbterm_tree_common(cret, handle, NULL);
+    wunlock_adapt_base_node(tb, handle->u.catree.base_node,
+                            handle->u.catree.parent,
+                            handle->u.catree.current_level);
+    return;
+}
+
+#ifdef ERTS_ENABLE_LOCK_COUNT
+static void erts_lcnt_enable_db_catree_lock_count_helper(DbTableCATree *tb,
+                                                         DbTableCATreeNode *node,
+                                                         int enable)
+{
+    erts_lcnt_ref_t *lcnt_ref;
+    erts_lock_flags_t lock_type;
+    if (node->is_base_node) {
+        lcnt_ref = &GET_BASE_NODE_LOCK(node)->lcnt;
+        lock_type = ERTS_LOCK_TYPE_RWMUTEX;
+    } else {
+        erts_lcnt_enable_db_catree_lock_count_helper(tb, GET_LEFT(node), enable);
+        erts_lcnt_enable_db_catree_lock_count_helper(tb, GET_RIGHT(node), enable);
+        lcnt_ref = &GET_ROUTE_NODE_LOCK(node)->lcnt;
+        lock_type = ERTS_LOCK_TYPE_MUTEX;
+    }
+    if (enable) {
+        erts_lcnt_install_new_lock_info(lcnt_ref, "db_hash_slot", tb->common.the_name,
+                                        lock_type | ERTS_LOCK_FLAGS_CATEGORY_DB);
+    } else {
+        erts_lcnt_uninstall(lcnt_ref);
+    }
+}
+
+void erts_lcnt_enable_db_catree_lock_count(DbTableCATree *tb, int enable)
+{
+    erts_lcnt_enable_db_catree_lock_count_helper(tb, GET_ROOT(tb), enable);
+}
+#endif /* ERTS_ENABLE_LOCK_COUNT */
+
+void db_catree_force_split(DbTableCATree* tb, int on)
+{
+    CATreeRootIterator iter;
+    TreeDbTerm** root;
+
+    init_root_iterator(tb, &iter, 1);
+    root = catree_find_first_root(&iter);
+    do {
+        BASE_NODE_STAT_SET(iter.locked_bnode, (on ? INT_MAX : 0));
+        root = catree_find_next_root(&iter, NULL);
+    } while (root);
+    destroy_root_iterator(&iter);
+
+    if (on)
+        tb->common.status |= DB_CATREE_FORCE_SPLIT;
+    else
+        tb->common.status &= ~DB_CATREE_FORCE_SPLIT;
+}
+
+void db_catree_debug_random_split_join(DbTableCATree* tb, int on)
+{
+    if (on)
+        tb->common.status |= DB_CATREE_DEBUG_RANDOM_SPLIT_JOIN;
+    else
+        tb->common.status &= ~DB_CATREE_DEBUG_RANDOM_SPLIT_JOIN;
+}
+
+void db_calc_stats_catree(DbTableCATree* tb, DbCATreeStats* stats)
+{
+    DbTableCATreeNode* stack[ERL_DB_CATREE_MAX_ROUTE_NODE_LAYER_HEIGHT];
+    DbTableCATreeNode* node;
+    Uint depth = 0;
+
+    stats->route_nodes = 0;
+    stats->base_nodes = 0;
+    stats->max_depth = 0;
+
+    node = GET_ROOT(tb);
+    do {
+        while (!node->is_base_node) {
+            stats->route_nodes++;
+            ASSERT(depth < sizeof(stack)/sizeof(*stack));
+            stack[depth++] = node;  /* PUSH parent */
+            if (stats->max_depth < depth)
+                stats->max_depth = depth;
+            node = GET_LEFT(node);
+        }
+        stats->base_nodes++;
+
+        while (depth > 0) {
+            DbTableCATreeNode* parent = stack[depth-1];
+            if (node == GET_LEFT(parent)) {
+                node = GET_RIGHT(parent);
+                break;
+            }
+            else {
+                ASSERT(node == GET_RIGHT(parent));
+                node = parent;
+                depth--; /* POP parent */
+            }
+        }
+    } while (depth > 0);
+}
+
+struct debug_catree_fa {
+    void (*func)(ErlOffHeap *, void *);
+    void *arg;
+};
+
+static void debug_free_route_node(void *vfap, ErtsThrPrgrVal val, void *vnp)
+{
+    DbTableCATreeNode *np = vnp;
+    if (np->u.route.key.oh) {
+        struct debug_catree_fa *fap = vfap;
+        ErlOffHeap oh;
+        ERTS_INIT_OFF_HEAP(&oh);
+        oh.first = np->u.route.key.oh;
+        (*fap->func)(&oh, fap->arg);
+    }
+}
+
+void
+erts_db_foreach_thr_prgr_offheap_catree(void (*func)(ErlOffHeap *, void *),
+                                        void *arg)
+{
+    struct debug_catree_fa fa;
+    fa.func = func;
+    fa.arg = arg;
+    erts_debug_later_op_foreach(do_free_route_node, debug_free_route_node, &fa);
+}
+
+
+#ifdef HARDDEBUG
+
+/*
+ * Not called, but kept as it might come to use
+ */
+static inline int my_check_table_tree(TreeDbTerm *t)
+{
+    int lh, rh;
+    if (t == NULL)
+	return 0;
+    lh = my_check_table_tree(t->left);
+    rh = my_check_table_tree(t->right);
+    if ((rh - lh) != t->balance) {
+	erts_fprintf(stderr, "Invalid tree balance for this node:\n");
+	erts_fprintf(stderr,"balance = %d, left = 0x%08X, right = 0x%08X\n",
+		     t->balance, t->left, t->right);
+	erts_fprintf(stderr,"\nDump:\n---------------------------------\n");
+	erts_fprintf(stderr,"\n---------------------------------\n");
+        abort();
+    }
+    return ((rh > lh) ? rh : lh) + 1;
+}
+
+#endif
diff --git a/erts/emulator/beam/erl_db_catree.h b/erts/emulator/beam/erl_db_catree.h
new file mode 100644
index 0000000000..2ede85e04e
--- /dev/null
+++ b/erts/emulator/beam/erl_db_catree.h
@@ -0,0 +1,140 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 1998-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%
+ */
+
+/*
+ * Description: Implementation of ETS ordered_set table type with
+ *              fine-grained synchronization.
+ *
+ * Author: 	Kjell Winblad
+ *
+ * "erl_db_catree.c" contains more details about the implementation.
+ *
+ */
+
+#ifndef _DB_CATREE_H
+#define _DB_CATREE_H
+
+struct DbTableCATreeNode;
+
+typedef struct {
+    Eterm term;
+    struct erl_off_heap_header* oh;
+    Uint size;
+    Eterm heap[1];
+} DbRouteKey;
+
+typedef struct {
+    erts_rwmtx_t lock; /* The lock for this base node */
+    erts_atomic_t lock_statistics;
+    int is_valid; /* If this base node is still valid */
+    TreeDbTerm *root; /* The root of the sequential tree */
+    ErtsThrPrgrLaterOp free_item; /* Used when freeing using thread progress */
+    struct DbTableCATreeNode * next; /* Used when gradually deleting */
+
+    char end_of_struct__;
+} DbTableCATreeBaseNode;
+
+typedef struct {
+#ifdef ERTS_ENABLE_LOCK_CHECK
+    Sint lc_order;
+#endif
+    ErtsThrPrgrLaterOp free_item; /* Used when freeing using thread progress */
+    erts_mtx_t lock; /* Used when joining route nodes */
+    int is_valid; /* If this route node is still valid */
+    erts_atomic_t left;
+    erts_atomic_t right;
+    DbRouteKey key;
+} DbTableCATreeRouteNode;
+
+typedef struct DbTableCATreeNode {
+    int is_base_node;
+    union {
+        DbTableCATreeRouteNode route;
+        DbTableCATreeBaseNode base;
+    } u;
+} DbTableCATreeNode;
+
+typedef struct {
+    Uint pos;          /* Current position on stack */
+    Uint size;         /* The size of the stack array */
+    DbTableCATreeNode** array; /* The stack */
+} CATreeNodeStack;
+
+typedef struct db_table_catree {
+    DbTableCommon common;
+
+    /* CA Tree-specific fields */
+    erts_atomic_t root;         /* The tree root (DbTableCATreeNode*) */
+    Uint deletion;		/* Being deleted */
+    DbTreeStack free_stack_elems;/* Used for deletion ...*/
+    CATreeNodeStack free_stack_rnodes;
+    DbTableCATreeNode *base_nodes_to_free_list;
+    int is_routing_nodes_freed;
+    /* The fields below are used by delete_all_objects and
+       select_delete(DeleteAll)*/
+    Uint nr_of_deleted_items;
+    Binary* nr_of_deleted_items_wb;
+} DbTableCATree;
+
+typedef struct {
+    DbTableCATree* tb;
+    Eterm next_route_key;
+    DbTableCATreeNode* locked_bnode;
+    DbTableCATreeNode* bnode_parent;
+    int bnode_level;
+    int read_only;
+    DbRouteKey* search_key;
+} CATreeRootIterator;
+
+
+void db_initialize_catree(void);
+
+int db_create_catree(Process *p, DbTable *tbl);
+
+TreeDbTerm** catree_find_root(Eterm key, CATreeRootIterator*);
+
+TreeDbTerm** catree_find_next_from_pb_key_root(Eterm key, CATreeRootIterator*);
+TreeDbTerm** catree_find_prev_from_pb_key_root(Eterm key, CATreeRootIterator*);
+TreeDbTerm** catree_find_nextprev_root(CATreeRootIterator*, int next, Eterm* keyp);
+TreeDbTerm** catree_find_next_root(CATreeRootIterator*, Eterm* keyp);
+TreeDbTerm** catree_find_prev_root(CATreeRootIterator*, Eterm* keyp);
+TreeDbTerm** catree_find_first_root(CATreeRootIterator*);
+TreeDbTerm** catree_find_last_root(CATreeRootIterator*);
+
+
+#ifdef ERTS_ENABLE_LOCK_COUNT
+void erts_lcnt_enable_db_catree_lock_count(DbTableCATree *tb, int enable);
+#endif
+
+void db_catree_force_split(DbTableCATree*, int on);
+void db_catree_debug_random_split_join(DbTableCATree*, int on);
+
+typedef struct {
+    Uint route_nodes;
+    Uint base_nodes;
+    Uint max_depth;
+} DbCATreeStats;
+void db_calc_stats_catree(DbTableCATree*, DbCATreeStats*);
+void
+erts_db_foreach_thr_prgr_offheap_catree(void (*func)(ErlOffHeap *, void *),
+                                        void *arg);
+
+
+#endif /* _DB_CATREE_H */
diff --git a/erts/emulator/beam/erl_db_hash.c b/erts/emulator/beam/erl_db_hash.c
index 752d3ae3a8..4904d3fa42 100644
--- a/erts/emulator/beam/erl_db_hash.c
+++ b/erts/emulator/beam/erl_db_hash.c
@@ -85,6 +85,14 @@
 
 #include "erl_db_hash.h"
 
+#define ADD_NITEMS(DB, TO_ADD)                                          \
+    erts_flxctr_add(&(DB)->common.counters, ERTS_DB_TABLE_NITEMS_COUNTER_ID, TO_ADD)
+#define INC_NITEMS(DB)                                                  \
+    erts_flxctr_inc_read_centralized(&(DB)->common.counters, ERTS_DB_TABLE_NITEMS_COUNTER_ID)
+#define DEC_NITEMS(DB)                                                  \
+    erts_flxctr_dec_read_centralized(&(DB)->common.counters, ERTS_DB_TABLE_NITEMS_COUNTER_ID)
+#define RESET_NITEMS(DB)                                                \
+    erts_flxctr_reset(&(DB)->common.counters, ERTS_DB_TABLE_NITEMS_COUNTER_ID)
 /* 
  * The following symbols can be manipulated to "tune" the linear hash array 
  */
@@ -121,7 +129,9 @@
      : ((struct segment**) erts_atomic_read_nob(&(tb)->segtab)))
 #endif
 #define NACTIVE(tb) ((int)erts_atomic_read_nob(&(tb)->nactive))
-#define NITEMS(tb) ((int)erts_atomic_read_nob(&(tb)->common.nitems))
+#define NITEMS(tb) \
+    ((Sint)erts_flxctr_read_centralized(&(tb)->common.counters,             \
+                                        ERTS_DB_TABLE_NITEMS_COUNTER_ID))
 
 #define SLOT_IX_TO_SEG_IX(i) (((i)+(EXT_SEGSZ-FIRST_SEGSZ)) >> EXT_SEGSZ_EXP)
 
@@ -404,26 +414,31 @@ static int db_slot_hash(Process *p, DbTable *tbl,
 
 static int db_select_chunk_hash(Process *p, DbTable *tbl, Eterm tid,
 				Eterm pattern, Sint chunk_size,
-				int reverse, Eterm *ret);
+				int reverse, Eterm *ret, enum DbIterSafety);
 static int db_select_hash(Process *p, DbTable *tbl, Eterm tid,
-			  Eterm pattern, int reverse, Eterm *ret);
+			  Eterm pattern, int reverse, Eterm *ret,
+                          enum DbIterSafety);
 static int db_select_continue_hash(Process *p, DbTable *tbl,
-				   Eterm continuation, Eterm *ret);
+				   Eterm continuation, Eterm *ret,
+                                   enum DbIterSafety*);
 
 static int db_select_count_hash(Process *p, DbTable *tbl, Eterm tid,
-				Eterm pattern, Eterm *ret);
+				Eterm pattern, Eterm *ret, enum DbIterSafety);
 static int db_select_count_continue_hash(Process *p, DbTable *tbl,
-					 Eterm continuation, Eterm *ret);
-
+					 Eterm continuation, Eterm *ret,
+                                         enum DbIterSafety*);
 static int db_select_delete_hash(Process *p, DbTable *tbl, Eterm tid,
-				 Eterm pattern, Eterm *ret);
+				 Eterm pattern, Eterm *ret,
+                                 enum DbIterSafety);
 static int db_select_delete_continue_hash(Process *p, DbTable *tbl,
-					  Eterm continuation, Eterm *ret);
+					  Eterm continuation, Eterm *ret,
+                                          enum DbIterSafety*);
 
 static int db_select_replace_hash(Process *p, DbTable *tbl, Eterm tid,
-                                  Eterm pattern, Eterm *ret);
+                                  Eterm pattern, Eterm *ret, enum DbIterSafety);
 static int db_select_replace_continue_hash(Process *p, DbTable *tbl,
-                                           Eterm continuation, Eterm *ret);
+                                           Eterm continuation, Eterm *ret,
+                                           enum DbIterSafety*);
 
 static int db_take_hash(Process *, DbTable *, Eterm, Eterm *);
 static void db_print_hash(fmtfn_t to,
@@ -439,7 +454,12 @@ static void db_foreach_offheap_hash(DbTable *,
 				    void (*)(ErlOffHeap *, void *),
 				    void *);
 
-static SWord db_delete_all_objects_hash(Process* p, DbTable* tbl, SWord reds);
+static SWord db_delete_all_objects_hash(Process* p,
+                                        DbTable* tbl,
+                                        SWord reds,
+                                        Eterm* nitems_holder_wb);
+static Eterm db_delete_all_objects_get_nitems_from_holder_hash(Process* p,
+                                                               Eterm nitems_holder);
 #ifdef HARDDEBUG
 static void db_check_table_hash(DbTableHash *tb);
 #endif
@@ -535,7 +555,7 @@ DbTableMethod db_hash =
     db_select_chunk_hash,
     db_select_hash,
     db_select_delete_hash,
-    db_select_continue_hash, /* hmm continue_hash? */
+    db_select_continue_hash,
     db_select_delete_continue_hash,
     db_select_count_hash,
     db_select_count_continue_hash,
@@ -543,6 +563,7 @@ DbTableMethod db_hash =
     db_select_replace_continue_hash,
     db_take_hash,
     db_delete_all_objects_hash,
+    db_delete_all_objects_get_nitems_from_holder_hash,
     db_free_empty_table_hash,
     db_free_table_continue_hash,
     db_print_hash,
@@ -801,7 +822,7 @@ int db_put_hash(DbTable *tbl, Eterm obj, int key_clash_fail)
     if (tb->common.status & DB_SET) {
 	HashDbTerm* bnext = b->next;
 	if (is_pseudo_deleted(b)) {
-	    erts_atomic_inc_nob(&tb->common.nitems);
+            INC_NITEMS(tb);
             b->pseudo_deleted = 0;
 	}
 	else if (key_clash_fail) {
@@ -830,7 +851,7 @@ int db_put_hash(DbTable *tbl, Eterm obj, int key_clash_fail)
 	do {
 	    if (db_eq(&tb->common,obj,&q->dbterm)) {
 		if (is_pseudo_deleted(q)) {
-		    erts_atomic_inc_nob(&tb->common.nitems);
+		    INC_NITEMS(tb);
                     q->pseudo_deleted = 0;
 		    ASSERT(q->hvalue == hval);
 		    if (q != b) { /* must move to preserve key insertion order */
@@ -853,7 +874,7 @@ Lnew:
     q->pseudo_deleted = 0;
     q->next = b;
     *bp = q;
-    nitems = erts_atomic_inc_read_nob(&tb->common.nitems);
+    nitems = INC_NITEMS(tb);
     WUNLOCK_HASH(lck);
     {
 	int nactive = NACTIVE(tb);       
@@ -1051,7 +1072,7 @@ int db_erase_hash(DbTable *tbl, Eterm key, Eterm *ret)
     }
     WUNLOCK_HASH(lck);
     if (nitems_diff) {
-	erts_atomic_add_nob(&tb->common.nitems, nitems_diff);
+        ADD_NITEMS(tb, nitems_diff);
 	try_shrink(tb);
     }
     free_term_list(tb, free_us);
@@ -1112,7 +1133,7 @@ static int db_erase_object_hash(DbTable *tbl, Eterm object, Eterm *ret)
     }
     WUNLOCK_HASH(lck);
     if (nitems_diff) {
-	erts_atomic_add_nob(&tb->common.nitems, nitems_diff);
+        ADD_NITEMS(tb, nitems_diff);
 	try_shrink(tb);
     }
     free_term_list(tb, free_us);
@@ -1154,8 +1175,9 @@ static int db_slot_hash(Process *p, DbTable *tbl, Eterm slot_term, Eterm *ret)
  * Match traversal callbacks
  */
 
-typedef struct match_callbacks_t_ match_callbacks_t;
-struct match_callbacks_t_
+
+typedef struct traverse_context_t_ traverse_context_t;
+struct traverse_context_t_
 {
 /* Called when no match is possible.
  *      context_ptr: Pointer to context
@@ -1163,7 +1185,7 @@ struct match_callbacks_t_
  *
  * Both the direct return value and 'ret' are used as the traversal function return values.
  */
-    int (*on_nothing_can_match)(match_callbacks_t* ctx, Eterm* ret);
+    int (*on_nothing_can_match)(traverse_context_t* ctx, Eterm* ret);
 
 /* Called for each match result.
  *      context_ptr: Pointer to context
@@ -1174,7 +1196,7 @@ struct match_callbacks_t_
  *
  * Should return 1 for successful match, 0 otherwise.
  */
-    int (*on_match_res)(match_callbacks_t* ctx, Sint slot_ix,
+    int (*on_match_res)(traverse_context_t* ctx, Sint slot_ix,
                         HashDbTerm*** current_ptr_ptr, Eterm match_res);
 
 /* Called when either we've matched enough elements in this cycle or EOT was reached.
@@ -1188,7 +1210,7 @@ struct match_callbacks_t_
  * Both the direct return value and 'ret' are used as the traversal function return values.
  * If *mpp is set to NULL, it won't be deallocated (useful for trapping.)
  */
-    int (*on_loop_ended)(match_callbacks_t* ctx, Sint slot_ix, Sint got,
+    int (*on_loop_ended)(traverse_context_t* ctx, Sint slot_ix, Sint got,
                          Sint iterations_left, Binary** mpp, Eterm* ret);
 
 /* Called when it's time to trap
@@ -1201,16 +1223,21 @@ struct match_callbacks_t_
  * Both the direct return value and 'ret' are used as the traversal function return values.
  * If *mpp is set to NULL, it won't be deallocated (useful for trapping.)
  */
-    int (*on_trap)(match_callbacks_t* ctx, Sint slot_ix, Sint got, Binary** mpp,
+    int (*on_trap)(traverse_context_t* ctx, Sint slot_ix, Sint got, Binary** mpp,
                    Eterm* ret);
 
+    Process* p;
+    DbTableHash* tb;
+    Eterm tid;
+    Eterm* prev_continuation_tptr;
+    enum DbIterSafety safety;
 };
 
 
 /*
  * Begin hash table match traversal
  */
-static int match_traverse(Process* p, DbTableHash* tb,
+static int match_traverse(traverse_context_t* ctx,
                           Eterm pattern,
                           extra_match_validator_t extra_match_validator, /* Optional */
                           Sint chunk_size,      /* If 0, no chunking */
@@ -1218,9 +1245,9 @@ static int match_traverse(Process* p, DbTableHash* tb,
                           Eterm** hpp,          /* Heap */
                           int lock_for_write,   /* Set to 1 if we're going to delete or
                                                    modify existing terms */
-                          match_callbacks_t* ctx,
                           Eterm* ret)
 {
+    DbTableHash* tb = ctx->tb;
     Sint slot_ix;                  /* Slot index */
     HashDbTerm** current_ptr;      /* Refers to either the bucket pointer or
                                     * the 'next' pointer in the previous term
@@ -1287,7 +1314,7 @@ static int match_traverse(Process* p, DbTableHash* tb,
     for(;;) {
         if (*current_ptr != NULL) {
             if (!is_pseudo_deleted(*current_ptr)) {
-                match_res = db_match_dbterm(&tb->common, p, mpi.mp,
+                match_res = db_match_dbterm(&tb->common, ctx->p, mpi.mp,
                                             &(*current_ptr)->dbterm, hpp, 2);
                 saved_current = *current_ptr;
                 if (ctx->on_match_res(ctx, slot_ix, &current_ptr, match_res)) {
@@ -1323,11 +1350,7 @@ static int match_traverse(Process* p, DbTableHash* tb,
                 unlock_hash_function(lck);
                 break;
             }
-            if (iterations_left <= 0 || MBUF(p)) {
-                /*
-                 * We have either reached our limit, or just created some heap fragments.
-                 * Since many heap fragments will make the GC slower, trap and GC now.
-                 */
+            if (iterations_left <= 0) {
                 unlock_hash_function(lck);
                 ret_value = ctx->on_trap(ctx, slot_ix, got, &mpi.mp, ret);
                 goto done;
@@ -1356,7 +1379,7 @@ done:
 /*
  * Continue hash table match traversal
  */
-static int match_traverse_continue(Process* p, DbTableHash* tb,
+static int match_traverse_continue(traverse_context_t* ctx,
                                    Sint chunk_size,      /* If 0, no chunking */
                                    Sint iterations_left, /* Nr. of iterations left */
                                    Eterm** hpp,          /* Heap */
@@ -1365,9 +1388,9 @@ static int match_traverse_continue(Process* p, DbTableHash* tb,
                                    Binary** mpp,         /* Existing match program */
                                    int lock_for_write,   /* Set to 1 if we're going to delete or
                                                             modify existing terms */
-                                   match_callbacks_t* ctx,
                                    Eterm* ret)
 {
+    DbTableHash* tb = ctx->tb;
     HashDbTerm** current_ptr;  /* Refers to either the bucket pointer or
                                        * the 'next' pointer in the previous term
                                        */
@@ -1410,7 +1433,7 @@ static int match_traverse_continue(Process* p, DbTableHash* tb,
     for(;;) {
         if (*current_ptr != NULL) {
             if (!is_pseudo_deleted(*current_ptr)) {
-                match_res = db_match_dbterm(&tb->common, p, *mpp,
+                match_res = db_match_dbterm(&tb->common, ctx->p, *mpp,
                                             &(*current_ptr)->dbterm, hpp, 2);
                 saved_current = *current_ptr;
                 if (ctx->on_match_res(ctx, slot_ix, &current_ptr, match_res)) {
@@ -1433,11 +1456,7 @@ static int match_traverse_continue(Process* p, DbTableHash* tb,
                 unlock_hash_function(lck);
                 break;
             }
-            if (iterations_left <= 0 || MBUF(p)) {
-                /*
-                 * We have either reached our limit, or just created some heap fragments.
-                 * Since many heap fragments will make the GC slower, trap and GC now.
-                 */
+            if (iterations_left <= 0) {
                 unlock_hash_function(lck);
                 ret_value = ctx->on_trap(ctx, slot_ix, got, mpp, ret);
                 goto done;
@@ -1464,52 +1483,50 @@ done:
  */
 
 static ERTS_INLINE int on_simple_trap(Export* trap_function,
-                                                 Process* p,
-                                                 DbTableHash* tb,
-                                                 Eterm tid,
-                                                 Eterm* prev_continuation_tptr,
-                                                 Sint slot_ix,
-                                                 Sint got,
-                                                 Binary** mpp,
-                                                 Eterm* ret)
+                                      traverse_context_t* ctx,
+                                      Sint slot_ix,
+                                      Sint got,
+                                      Binary** mpp,
+                                      Eterm* ret)
 {
     Eterm* hp;
     Eterm egot;
     Eterm mpb;
     Eterm continuation;
-    int is_first_trap = (prev_continuation_tptr == NULL);
+    int is_first_trap = (ctx->prev_continuation_tptr == NULL);
     size_t base_halloc_sz = (is_first_trap ? ERTS_MAGIC_REF_THING_SIZE : 0);
 
-    BUMP_ALL_REDS(p);
+    BUMP_ALL_REDS(ctx->p);
     if (IS_USMALL(0, got)) {
-	hp = HAllocX(p,  base_halloc_sz + 5, ERTS_MAGIC_REF_THING_SIZE);
+	hp = HAllocX(ctx->p,  base_halloc_sz + 6, ERTS_MAGIC_REF_THING_SIZE);
 	egot = make_small(got);
     }
     else {
-	hp = HAllocX(p, base_halloc_sz + BIG_UINT_HEAP_SIZE + 5,
+	hp = HAllocX(ctx->p, base_halloc_sz + BIG_UINT_HEAP_SIZE + 6,
                      ERTS_MAGIC_REF_THING_SIZE);
 	egot = uint_to_big(got, hp);
 	hp += BIG_UINT_HEAP_SIZE;
     }
 
     if (is_first_trap) {
-        if (is_atom(tid))
-            tid = erts_db_make_tid(p, &tb->common);
-        mpb = erts_db_make_match_prog_ref(p, *mpp, &hp);
+        if (is_atom(ctx->tid))
+            ctx->tid = erts_db_make_tid(ctx->p, &ctx->tb->common);
+        mpb = erts_db_make_match_prog_ref(ctx->p, *mpp, &hp);
         *mpp = NULL; /* otherwise the caller will destroy it */
     }
     else {
-        ASSERT(!is_atom(tid));
-        mpb = prev_continuation_tptr[3];
+        ASSERT(!is_atom(ctx->tid));
+        mpb = ctx->prev_continuation_tptr[3];
     }
 
-    continuation = TUPLE4(
+    continuation = TUPLE5(
             hp,
-            tid,
+            ctx->tid,
             make_small(slot_ix),
             mpb,
-            egot);
-    ERTS_BIF_PREP_TRAP1(*ret, trap_function, p, continuation);
+            egot,
+            make_small(ctx->safety));
+    ERTS_BIF_PREP_TRAP1(*ret, trap_function, ctx->p, continuation);
     return DB_ERROR_NONE;
 }
 
@@ -1518,17 +1535,18 @@ static ERTS_INLINE int unpack_simple_continuation(Eterm continuation,
                                                   Eterm* tid_ptr,
                                                   Sint* slot_ix_p,
                                                   Binary** mpp,
-                                                  Sint* got_p)
+                                                  Sint* got_p,
+                                                  enum DbIterSafety* safety_p)
 {
     Eterm* tptr;
     ASSERT(is_tuple(continuation));
     tptr = tuple_val(continuation);
-    if (arityval(*tptr) != 4)
+    if (*tptr != make_arityval(5))
         return 1;
 
-    if (! is_small(tptr[2]) || !(is_big(tptr[4]) || is_small(tptr[4]))) {
+    if (!is_small(tptr[2]) || !(is_big(tptr[4]) || is_small(tptr[4]))
+        || !is_small(tptr[5]))
         return 1;
-    }
 
     *tptr_ptr = tptr;
     *tid_ptr = tptr[1];
@@ -1540,6 +1558,7 @@ static ERTS_INLINE int unpack_simple_continuation(Eterm continuation,
     else {
         *got_p = unsigned_val(tptr[4]);
     }
+    *safety_p = signed_val(tptr[5]);
     return 0;
 }
 
@@ -1553,24 +1572,20 @@ static ERTS_INLINE int unpack_simple_continuation(Eterm continuation,
 #define MAX_SELECT_CHUNK_ITERATIONS 1000
 
 typedef struct {
-    match_callbacks_t base;
-    Process* p;
-    DbTableHash* tb;
-    Eterm tid;
+    traverse_context_t base;
     Eterm* hp;
     Sint chunk_size;
     Eterm match_list;
-    Eterm* prev_continuation_tptr;
 } select_chunk_context_t;
 
-static int select_chunk_on_nothing_can_match(match_callbacks_t* ctx_base, Eterm* ret)
+static int select_chunk_on_nothing_can_match(traverse_context_t* ctx_base, Eterm* ret)
 {
     select_chunk_context_t* ctx = (select_chunk_context_t*) ctx_base;
     *ret = (ctx->chunk_size > 0 ? am_EOT : NIL);
     return DB_ERROR_NONE;
 }
 
-static int select_chunk_on_match_res(match_callbacks_t* ctx_base, Sint slot_ix,
+static int select_chunk_on_match_res(traverse_context_t* ctx_base, Sint slot_ix,
                                      HashDbTerm*** current_ptr_ptr,
                                      Eterm match_res)
 {
@@ -1582,7 +1597,7 @@ static int select_chunk_on_match_res(match_callbacks_t* ctx_base, Sint slot_ix,
     return 0;
 }
 
-static int select_chunk_on_loop_ended(match_callbacks_t* ctx_base,
+static int select_chunk_on_loop_ended(traverse_context_t* ctx_base,
                                       Sint slot_ix, Sint got,
                                       Sint iterations_left, Binary** mpp,
                                       Eterm* ret)
@@ -1598,7 +1613,7 @@ static int select_chunk_on_loop_ended(match_callbacks_t* ctx_base,
     }
     else {
         ASSERT(iterations_left < MAX_SELECT_CHUNK_ITERATIONS);
-        BUMP_REDS(ctx->p, MAX_SELECT_CHUNK_ITERATIONS - iterations_left);
+        BUMP_REDS(ctx->base.p, MAX_SELECT_CHUNK_ITERATIONS - iterations_left);
         if (ctx->chunk_size) {
             Eterm continuation;
             Eterm rest = NIL;
@@ -1617,14 +1632,14 @@ static int select_chunk_on_loop_ended(match_callbacks_t* ctx_base,
                                              been in 'user space' */
             }
             if (rest != NIL || slot_ix >= 0) { /* Need more calls */
-                Eterm tid = ctx->tid;
-                ctx->hp = HAllocX(ctx->p,
+                Eterm tid = ctx->base.tid;
+                ctx->hp = HAllocX(ctx->base.p,
                                   3 + 7 + ERTS_MAGIC_REF_THING_SIZE,
                                   ERTS_MAGIC_REF_THING_SIZE);
-                mpb = erts_db_make_match_prog_ref(ctx->p, *mpp, &ctx->hp);
+                mpb = erts_db_make_match_prog_ref(ctx->base.p, *mpp, &ctx->hp);
                 if (is_atom(tid))
-                    tid = erts_db_make_tid(ctx->p,
-                                           &ctx->tb->common);
+                    tid = erts_db_make_tid(ctx->base.p,
+                                           &ctx->base.tb->common);
                 continuation = TUPLE6(
                         ctx->hp,
                         tid,
@@ -1639,7 +1654,7 @@ static int select_chunk_on_loop_ended(match_callbacks_t* ctx_base,
             } else { /* All data is exhausted */
                 if (ctx->match_list != NIL) { /* No more data to search but still a
                                                             result to return to the caller */
-                    ctx->hp = HAlloc(ctx->p, 3);
+                    ctx->hp = HAlloc(ctx->base.p, 3);
                     *ret = TUPLE2(ctx->hp, ctx->match_list, am_EOT);
                     return DB_ERROR_NONE;
                 } else { /* Reached the end of the ttable with no data to return */
@@ -1653,7 +1668,7 @@ static int select_chunk_on_loop_ended(match_callbacks_t* ctx_base,
     }
 }
 
-static int select_chunk_on_trap(match_callbacks_t* ctx_base,
+static int select_chunk_on_trap(traverse_context_t* ctx_base,
                                 Sint slot_ix, Sint got,
                                 Binary** mpp, Eterm* ret)
 {
@@ -1662,74 +1677,77 @@ static int select_chunk_on_trap(match_callbacks_t* ctx_base,
     Eterm continuation;
     Eterm* hp;
 
-    BUMP_ALL_REDS(ctx->p);
+    BUMP_ALL_REDS(ctx->base.p);
 
-    if (ctx->prev_continuation_tptr == NULL) {
-        Eterm tid = ctx->tid;
+    if (ctx->base.prev_continuation_tptr == NULL) {
+        Eterm tid = ctx->base.tid;
         /* First time we're trapping */
-        hp = HAllocX(ctx->p, 7 + ERTS_MAGIC_REF_THING_SIZE,
+        hp = HAllocX(ctx->base.p, 8 + ERTS_MAGIC_REF_THING_SIZE,
                      ERTS_MAGIC_REF_THING_SIZE);
         if (is_atom(tid))
-            tid = erts_db_make_tid(ctx->p, &ctx->tb->common);
-        mpb = erts_db_make_match_prog_ref(ctx->p, *mpp, &hp);
-        continuation = TUPLE6(
+            tid = erts_db_make_tid(ctx->base.p, &ctx->base.tb->common);
+        mpb = erts_db_make_match_prog_ref(ctx->base.p, *mpp, &hp);
+        continuation = TUPLE7(
                 hp,
                 tid,
                 make_small(slot_ix),
                 make_small(ctx->chunk_size),
                 mpb,
                 ctx->match_list,
-                make_small(got));
+                make_small(got),
+                make_small(ctx->base.safety));
         *mpp = NULL; /* otherwise the caller will destroy it */
     }
     else {
         /* Not the first time we're trapping; reuse continuation terms */
-        hp = HAlloc(ctx->p, 7);
-        continuation = TUPLE6(
+        hp = HAlloc(ctx->base.p, 8);
+        continuation = TUPLE7(
                 hp,
-                ctx->prev_continuation_tptr[1],
+                ctx->base.prev_continuation_tptr[1],
                 make_small(slot_ix),
-                ctx->prev_continuation_tptr[3],
-                ctx->prev_continuation_tptr[4],
+                ctx->base.prev_continuation_tptr[3],
+                ctx->base.prev_continuation_tptr[4],
                 ctx->match_list,
-                make_small(got));
+                make_small(got),
+                make_small(ctx->base.safety));
     }
-    ERTS_BIF_PREP_TRAP1(*ret, &ets_select_continue_exp, ctx->p,
+    ERTS_BIF_PREP_TRAP1(*ret, &ets_select_continue_exp, ctx->base.p,
                         continuation);
     return DB_ERROR_NONE;
 }
 
 static int db_select_hash(Process *p, DbTable *tbl, Eterm tid, Eterm pattern,
-                          int reverse, Eterm *ret)
+                          int reverse, Eterm *ret, enum DbIterSafety safety)
 {
-    return db_select_chunk_hash(p, tbl, tid, pattern, 0, reverse, ret);
+    return db_select_chunk_hash(p, tbl, tid, pattern, 0, reverse, ret, safety);
 }
 
 static int db_select_chunk_hash(Process *p, DbTable *tbl, Eterm tid,
                                 Eterm pattern, Sint chunk_size,
-                                int reverse, Eterm *ret)
+                                int reverse, Eterm *ret, enum DbIterSafety safety)
 {
     select_chunk_context_t ctx;
 
     ctx.base.on_nothing_can_match = select_chunk_on_nothing_can_match;
     ctx.base.on_match_res         = select_chunk_on_match_res;
     ctx.base.on_loop_ended        = select_chunk_on_loop_ended;
-    ctx.base.on_trap              = select_chunk_on_trap,
-    ctx.p = p;
-    ctx.tb = &tbl->hash;
-    ctx.tid = tid;
+    ctx.base.on_trap              = select_chunk_on_trap;
+    ctx.base.p = p;
+    ctx.base.tb = &tbl->hash;
+    ctx.base.tid = tid;
+    ctx.base.prev_continuation_tptr = NULL;
+    ctx.base.safety = safety;
     ctx.hp = NULL;
     ctx.chunk_size = chunk_size;
     ctx.match_list = NIL;
-    ctx.prev_continuation_tptr = NULL;
 
     return match_traverse(
-            ctx.p, ctx.tb,
+            &ctx.base,
             pattern, NULL,
             ctx.chunk_size,
             MAX_SELECT_CHUNK_ITERATIONS,
             &ctx.hp, 0,
-            &ctx.base, ret);
+            ret);
 }
 
 /*
@@ -1739,7 +1757,7 @@ static int db_select_chunk_hash(Process *p, DbTable *tbl, Eterm tid,
  */
 
 static
-int select_chunk_continue_on_loop_ended(match_callbacks_t* ctx_base,
+int select_chunk_continue_on_loop_ended(traverse_context_t* ctx_base,
                                         Sint slot_ix, Sint got,
                                         Sint iterations_left, Binary** mpp,
                                         Eterm* ret)
@@ -1750,14 +1768,14 @@ int select_chunk_continue_on_loop_ended(match_callbacks_t* ctx_base,
     Eterm* hp;
 
     ASSERT(iterations_left <= MAX_SELECT_CHUNK_ITERATIONS);
-    BUMP_REDS(ctx->p, MAX_SELECT_CHUNK_ITERATIONS - iterations_left);
+    BUMP_REDS(ctx->base.p, MAX_SELECT_CHUNK_ITERATIONS - iterations_left);
     if (ctx->chunk_size) {
         Sint rest_size = 0;
         if (got > ctx->chunk_size) {
             /* Cannot write destructively here,
                the list may have
                been in user space */
-            hp = HAlloc(ctx->p, (got - ctx->chunk_size) * 2);
+            hp = HAlloc(ctx->base.p, (got - ctx->chunk_size) * 2);
             while (got-- > ctx->chunk_size) {
                 rest = CONS(hp, CAR(list_val(ctx->match_list)), rest);
                 hp += 2;
@@ -1766,13 +1784,13 @@ int select_chunk_continue_on_loop_ended(match_callbacks_t* ctx_base,
             }
         }
         if (rest != NIL || slot_ix >= 0) {
-            hp = HAlloc(ctx->p, 3 + 7);
+            hp = HAlloc(ctx->base.p, 3 + 7);
             continuation = TUPLE6(
                     hp,
-                    ctx->prev_continuation_tptr[1],
+                    ctx->base.prev_continuation_tptr[1],
                     make_small(slot_ix),
-                    ctx->prev_continuation_tptr[3],
-                    ctx->prev_continuation_tptr[4],
+                    ctx->base.prev_continuation_tptr[3],
+                    ctx->base.prev_continuation_tptr[4],
                     rest,
                     make_small(rest_size));
             hp += 7;
@@ -1780,7 +1798,7 @@ int select_chunk_continue_on_loop_ended(match_callbacks_t* ctx_base,
             return DB_ERROR_NONE;
         } else {
             if (ctx->match_list != NIL) {
-                hp = HAlloc(ctx->p, 3);
+                hp = HAlloc(ctx->base.p, 3);
                 *ret = TUPLE2(hp, ctx->match_list, am_EOT);
                 return DB_ERROR_NONE;
             } else {
@@ -1794,10 +1812,11 @@ int select_chunk_continue_on_loop_ended(match_callbacks_t* ctx_base,
 }
 
 /*
- * This is called when select traps
+ * This is called when ets:select/1/2/3 traps
+ * and for ets:select/1 with user continuation term.
  */
 static int db_select_continue_hash(Process* p, DbTable* tbl, Eterm continuation,
-                                   Eterm* ret)
+                                   Eterm* ret, enum DbIterSafety* safety_p)
 {
     select_chunk_context_t ctx;
     Eterm* tptr;
@@ -1813,7 +1832,13 @@ static int db_select_continue_hash(Process* p, DbTable* tbl, Eterm continuation,
     ASSERT(is_tuple(continuation));
     tptr = tuple_val(continuation);
 
-    if (arityval(*tptr) != 6)
+    /*
+     * 6-tuple is select/1 user continuation term
+     * 7-tuple is select trap continuation
+     */
+    if (*tptr == make_arityval(7) && is_small(tptr[7]))
+        *safety_p = signed_val(tptr[7]);
+    else if (*tptr != make_arityval(6))
         goto badparam;
 
     if (!is_small(tptr[2]) || !is_small(tptr[3]) ||
@@ -1837,18 +1862,19 @@ static int db_select_continue_hash(Process* p, DbTable* tbl, Eterm continuation,
     ctx.base.on_match_res  = select_chunk_on_match_res;
     ctx.base.on_loop_ended = select_chunk_continue_on_loop_ended;
     ctx.base.on_trap       = select_chunk_on_trap;
-    ctx.p = p;
-    ctx.tb = &tbl->hash;
-    ctx.tid = tid;
+    ctx.base.p = p;
+    ctx.base.tb = &tbl->hash;
+    ctx.base.tid = tid;
+    ctx.base.prev_continuation_tptr = tptr;
+    ctx.base.safety = *safety_p;
     ctx.hp = NULL;
     ctx.chunk_size = chunk_size;
     ctx.match_list = match_list;
-    ctx.prev_continuation_tptr = tptr;
 
     return match_traverse_continue(
-            ctx.p, ctx.tb, ctx.chunk_size,
-            iterations_left, &ctx.hp, slot_ix, got, &mp, 0,
-            &ctx.base, ret);
+        &ctx.base, ctx.chunk_size,
+        iterations_left, &ctx.hp, slot_ix, got, &mp, 0,
+        ret);
 
 badparam:
     *ret = NIL;
@@ -1866,84 +1892,73 @@ badparam:
 
 #define MAX_SELECT_COUNT_ITERATIONS 1000
 
-typedef struct {
-    match_callbacks_t base;
-    Process* p;
-    DbTableHash* tb;
-    Eterm tid;
-    Eterm* prev_continuation_tptr;
-} select_count_context_t;
-
-static int select_count_on_nothing_can_match(match_callbacks_t* ctx_base,
+static int select_count_on_nothing_can_match(traverse_context_t* ctx_base,
                                              Eterm* ret)
 {
     *ret = make_small(0);
     return DB_ERROR_NONE;
 }
 
-static int select_count_on_match_res(match_callbacks_t* ctx_base, Sint slot_ix,
+static int select_count_on_match_res(traverse_context_t* ctx_base, Sint slot_ix,
                                      HashDbTerm*** current_ptr_ptr,
                                      Eterm match_res)
 {
     return (match_res == am_true);
 }
 
-static int select_count_on_loop_ended(match_callbacks_t* ctx_base,
+static int select_count_on_loop_ended(traverse_context_t* ctx,
                                       Sint slot_ix, Sint got,
                                       Sint iterations_left, Binary** mpp,
                                       Eterm* ret)
 {
-    select_count_context_t* ctx = (select_count_context_t*) ctx_base;
     ASSERT(iterations_left <= MAX_SELECT_COUNT_ITERATIONS);
     BUMP_REDS(ctx->p, MAX_SELECT_COUNT_ITERATIONS - iterations_left);
     *ret = erts_make_integer(got, ctx->p);
     return DB_ERROR_NONE;
 }
 
-static int select_count_on_trap(match_callbacks_t* ctx_base,
+static int select_count_on_trap(traverse_context_t* ctx,
                                 Sint slot_ix, Sint got,
                                 Binary** mpp, Eterm* ret)
 {
-    select_count_context_t* ctx = (select_count_context_t*) ctx_base;
     return on_simple_trap(
-            &ets_select_count_continue_exp,
-            ctx->p,
-            ctx->tb,
-            ctx->tid,
-            ctx->prev_continuation_tptr,
+            &ets_select_count_continue_exp, ctx,
             slot_ix, got, mpp, ret);
 }
 
 static int db_select_count_hash(Process *p, DbTable *tbl, Eterm tid,
-                                Eterm pattern, Eterm *ret)
+                                Eterm pattern, Eterm *ret,
+                                enum DbIterSafety safety)
 {
-    select_count_context_t ctx;
+    traverse_context_t ctx;
     Sint iterations_left = MAX_SELECT_COUNT_ITERATIONS;
     Sint chunk_size = 0;
 
-    ctx.base.on_nothing_can_match = select_count_on_nothing_can_match;
-    ctx.base.on_match_res         = select_count_on_match_res;
-    ctx.base.on_loop_ended        = select_count_on_loop_ended;
-    ctx.base.on_trap              = select_count_on_trap;
+    ctx.on_nothing_can_match = select_count_on_nothing_can_match;
+    ctx.on_match_res         = select_count_on_match_res;
+    ctx.on_loop_ended        = select_count_on_loop_ended;
+    ctx.on_trap              = select_count_on_trap;
     ctx.p = p;
     ctx.tb = &tbl->hash;
     ctx.tid = tid;
     ctx.prev_continuation_tptr = NULL;
+    ctx.safety = safety;
 
     return match_traverse(
-            ctx.p, ctx.tb,
+            &ctx,
             pattern, NULL,
             chunk_size, iterations_left, NULL, 0,
-            &ctx.base, ret);
+            ret);
 }
 
 /*
  * This is called when select_count traps
  */
 static int db_select_count_continue_hash(Process* p, DbTable* tbl,
-                                         Eterm continuation, Eterm* ret)
+                                         Eterm continuation, Eterm* ret,
+                                         enum DbIterSafety* safety_p)
 {
-    select_count_context_t ctx;
+    traverse_context_t ctx;
     Eterm* tptr;
     Eterm tid;
     Binary* mp;
@@ -1952,24 +1967,26 @@ static int db_select_count_continue_hash(Process* p, DbTable* tbl,
     Sint chunk_size = 0;
     *ret = NIL;
 
-    if (unpack_simple_continuation(continuation, &tptr, &tid, &slot_ix, &mp, &got)) {
+    if (unpack_simple_continuation(continuation, &tptr, &tid, &slot_ix, &mp,
+                                   &got, safety_p)) {
         *ret = NIL;
         return DB_ERROR_BADPARAM;
     }
 
-    ctx.base.on_match_res  = select_count_on_match_res;
-    ctx.base.on_loop_ended = select_count_on_loop_ended;
-    ctx.base.on_trap       = select_count_on_trap;
+    ctx.on_match_res  = select_count_on_match_res;
+    ctx.on_loop_ended = select_count_on_loop_ended;
+    ctx.on_trap       = select_count_on_trap;
     ctx.p = p;
     ctx.tb = &tbl->hash;
     ctx.tid = tid;
     ctx.prev_continuation_tptr = tptr;
+    ctx.safety = *safety_p;
 
     return match_traverse_continue(
-            ctx.p, ctx.tb, chunk_size,
+            &ctx, chunk_size,
             MAX_SELECT_COUNT_ITERATIONS,
             NULL, slot_ix, got, &mp, 0,
-            &ctx.base, ret);
+            ret);
 }
 
 #undef MAX_SELECT_COUNT_ITERATIONS
@@ -1984,24 +2001,20 @@ static int db_select_count_continue_hash(Process* p, DbTable* tbl,
 #define MAX_SELECT_DELETE_ITERATIONS 1000
 
 typedef struct {
-    match_callbacks_t base;
-    Process* p;
-    DbTableHash* tb;
-    Eterm tid;
-    Eterm* prev_continuation_tptr;
+    traverse_context_t base;
     erts_aint_t fixated_by_me;
     Uint last_pseudo_delete;
     HashDbTerm* free_us;
 } select_delete_context_t;
 
-static int select_delete_on_nothing_can_match(match_callbacks_t* ctx_base,
+static int select_delete_on_nothing_can_match(traverse_context_t* ctx_base,
                                               Eterm* ret)
 {
     *ret = make_small(0);
     return DB_ERROR_NONE;
 }
 
-static int select_delete_on_match_res(match_callbacks_t* ctx_base, Sint slot_ix,
+static int select_delete_on_match_res(traverse_context_t* ctx_base, Sint slot_ix,
                                       HashDbTerm*** current_ptr_ptr,
                                       Eterm match_res)
 {
@@ -2011,9 +2024,9 @@ static int select_delete_on_match_res(match_callbacks_t* ctx_base, Sint slot_ix,
     if (match_res != am_true)
         return 0;
 
-    if (NFIXED(ctx->tb) > ctx->fixated_by_me) { /* fixated by others? */
+    if (NFIXED(ctx->base.tb) > ctx->fixated_by_me) { /* fixated by others? */
         if (slot_ix != ctx->last_pseudo_delete) {
-            if (!add_fixed_deletion(ctx->tb, slot_ix, ctx->fixated_by_me))
+            if (!add_fixed_deletion(ctx->base.tb, slot_ix, ctx->fixated_by_me))
                 goto do_erase;
             ctx->last_pseudo_delete = slot_ix;
         }
@@ -2026,46 +2039,43 @@ static int select_delete_on_match_res(match_callbacks_t* ctx_base, Sint slot_ix,
         del->next = ctx->free_us;
         ctx->free_us = del;
     }
-    erts_atomic_dec_nob(&ctx->tb->common.nitems);
+    DEC_NITEMS(ctx->base.tb);
 
     return 1;
 }
 
-static int select_delete_on_loop_ended(match_callbacks_t* ctx_base,
+static int select_delete_on_loop_ended(traverse_context_t* ctx_base,
                                        Sint slot_ix, Sint got,
                                        Sint iterations_left, Binary** mpp,
                                        Eterm* ret)
 {
     select_delete_context_t* ctx = (select_delete_context_t*) ctx_base;
-    free_term_list(ctx->tb, ctx->free_us);
+    free_term_list(ctx->base.tb, ctx->free_us);
     ctx->free_us = NULL;
     ASSERT(iterations_left <= MAX_SELECT_DELETE_ITERATIONS);
-    BUMP_REDS(ctx->p, MAX_SELECT_DELETE_ITERATIONS - iterations_left);
+    BUMP_REDS(ctx->base.p, MAX_SELECT_DELETE_ITERATIONS - iterations_left);
     if (got) {
-	try_shrink(ctx->tb);
+	try_shrink(ctx->base.tb);
     }
-    *ret = erts_make_integer(got, ctx->p);
+    *ret = erts_make_integer(got, ctx->base.p);
     return DB_ERROR_NONE;
 }
 
-static int select_delete_on_trap(match_callbacks_t* ctx_base,
+static int select_delete_on_trap(traverse_context_t* ctx_base,
                                  Sint slot_ix, Sint got,
                                  Binary** mpp, Eterm* ret)
 {
     select_delete_context_t* ctx = (select_delete_context_t*) ctx_base;
-    free_term_list(ctx->tb, ctx->free_us);
+    free_term_list(ctx->base.tb, ctx->free_us);
     ctx->free_us = NULL;
     return on_simple_trap(
-            &ets_select_delete_continue_exp,
-            ctx->p,
-            ctx->tb,
-            ctx->tid,
-            ctx->prev_continuation_tptr,
+            &ets_select_delete_continue_exp, &ctx->base,
             slot_ix, got, mpp, ret);
 }
 
 static int db_select_delete_hash(Process *p, DbTable *tbl, Eterm tid,
-                                 Eterm pattern, Eterm *ret)
+                                 Eterm pattern, Eterm *ret,
+                                 enum DbIterSafety safety)
 {
     select_delete_context_t ctx;
     Sint chunk_size = 0;
@@ -2074,27 +2084,29 @@ static int db_select_delete_hash(Process *p, DbTable *tbl, Eterm tid,
     ctx.base.on_match_res         = select_delete_on_match_res;
     ctx.base.on_loop_ended        = select_delete_on_loop_ended;
     ctx.base.on_trap              = select_delete_on_trap;
-    ctx.p = p;
-    ctx.tb = &tbl->hash;
-    ctx.tid = tid;
-    ctx.prev_continuation_tptr = NULL;
-    ctx.fixated_by_me = ctx.tb->common.is_thread_safe ? 0 : 1; /* TODO: something nicer */
+    ctx.base.p = p;
+    ctx.base.tb = &tbl->hash;
+    ctx.base.tid = tid;
+    ctx.base.prev_continuation_tptr = NULL;
+    ctx.base.safety = safety;
+    ctx.fixated_by_me = ctx.base.tb->common.is_thread_safe ? 0 : 1;
     ctx.last_pseudo_delete = (Uint) -1;
     ctx.free_us = NULL;
 
     return match_traverse(
-            ctx.p, ctx.tb,
+            &ctx.base,
             pattern, NULL,
             chunk_size,
             MAX_SELECT_DELETE_ITERATIONS, NULL, 1,
-            &ctx.base, ret);
+            ret);
 }
 
 /*
  * This is called when select_delete traps
  */
 static int db_select_delete_continue_hash(Process* p, DbTable* tbl,
-                                          Eterm continuation, Eterm* ret)
+                                          Eterm continuation, Eterm* ret,
+                                          enum DbIterSafety* safety_p)
 {
     select_delete_context_t ctx;
     Eterm* tptr;
@@ -2104,7 +2116,8 @@ static int db_select_delete_continue_hash(Process* p, DbTable* tbl,
     Sint slot_ix;
     Sint chunk_size = 0;
 
-    if (unpack_simple_continuation(continuation, &tptr, &tid, &slot_ix, &mp, &got)) {
+    if (unpack_simple_continuation(continuation, &tptr, &tid, &slot_ix, &mp,
+                                   &got, safety_p)) {
         *ret = NIL;
         return DB_ERROR_BADPARAM;
     }
@@ -2112,19 +2125,20 @@ static int db_select_delete_continue_hash(Process* p, DbTable* tbl,
     ctx.base.on_match_res  = select_delete_on_match_res;
     ctx.base.on_loop_ended = select_delete_on_loop_ended;
     ctx.base.on_trap       = select_delete_on_trap;
-    ctx.p = p;
-    ctx.tb = &tbl->hash;
-    ctx.tid = tid;
-    ctx.prev_continuation_tptr = tptr;
-    ctx.fixated_by_me = ONLY_WRITER(p, ctx.tb) ? 0 : 1; /* TODO: something nicer */
+    ctx.base.p = p;
+    ctx.base.tb = &tbl->hash;
+    ctx.base.tid = tid;
+    ctx.base.prev_continuation_tptr = tptr;
+    ctx.base.safety = *safety_p;
+    ctx.fixated_by_me = ONLY_WRITER(p, ctx.base.tb) ? 0 : 1;
     ctx.last_pseudo_delete = (Uint) -1;
     ctx.free_us = NULL;
 
     return match_traverse_continue(
-            ctx.p, ctx.tb, chunk_size,
+            &ctx.base, chunk_size,
             MAX_SELECT_DELETE_ITERATIONS,
             NULL, slot_ix, got, &mp, 1,
-            &ctx.base, ret);
+            ret);
 }
 
 #undef MAX_SELECT_DELETE_ITERATIONS
@@ -2138,26 +2152,17 @@ static int db_select_delete_continue_hash(Process* p, DbTable* tbl,
 
 #define MAX_SELECT_REPLACE_ITERATIONS 1000
 
-typedef struct {
-    match_callbacks_t base;
-    Process* p;
-    DbTableHash* tb;
-    Eterm tid;
-    Eterm* prev_continuation_tptr;
-} select_replace_context_t;
-
-static int select_replace_on_nothing_can_match(match_callbacks_t* ctx_base,
+static int select_replace_on_nothing_can_match(traverse_context_t* ctx_base,
                                                Eterm* ret)
 {
     *ret = make_small(0);
     return DB_ERROR_NONE;
 }
 
-static int select_replace_on_match_res(match_callbacks_t* ctx_base, Sint slot_ix,
+static int select_replace_on_match_res(traverse_context_t* ctx, Sint slot_ix,
                                        HashDbTerm*** current_ptr_ptr,
                                        Eterm match_res)
 {
-    select_replace_context_t* ctx = (select_replace_context_t*) ctx_base;
     DbTableHash* tb = ctx->tb;
     HashDbTerm* new;
     HashDbTerm* next;
@@ -2183,11 +2188,10 @@ static int select_replace_on_match_res(match_callbacks_t* ctx_base, Sint slot_ix
     return 0;
 }
 
-static int select_replace_on_loop_ended(match_callbacks_t* ctx_base, Sint slot_ix,
+static int select_replace_on_loop_ended(traverse_context_t* ctx, Sint slot_ix,
                                         Sint got, Sint iterations_left,
                                         Binary** mpp, Eterm* ret)
 {
-    select_replace_context_t* ctx = (select_replace_context_t*) ctx_base;
     ASSERT(iterations_left <= MAX_SELECT_REPLACE_ITERATIONS);
     /* the more objects we've replaced, the more reductions we've consumed */
     BUMP_REDS(ctx->p,
@@ -2197,23 +2201,20 @@ static int select_replace_on_loop_ended(match_callbacks_t* ctx_base, Sint slot_i
     return DB_ERROR_NONE;
 }
 
-static int select_replace_on_trap(match_callbacks_t* ctx_base,
+static int select_replace_on_trap(traverse_context_t* ctx,
                                   Sint slot_ix, Sint got,
                                   Binary** mpp, Eterm* ret)
 {
-    select_replace_context_t* ctx = (select_replace_context_t*) ctx_base;
     return on_simple_trap(
-            &ets_select_replace_continue_exp,
-            ctx->p,
-            ctx->tb,
-            ctx->tid,
-            ctx->prev_continuation_tptr,
+            &ets_select_replace_continue_exp, ctx,
             slot_ix, got, mpp, ret);
 }
 
-static int db_select_replace_hash(Process *p, DbTable *tbl, Eterm tid, Eterm pattern, Eterm *ret)
+static int db_select_replace_hash(Process *p, DbTable *tbl, Eterm tid,
+                                  Eterm pattern, Eterm *ret,
+                                  enum DbIterSafety safety)
 {
-    select_replace_context_t ctx;
+    traverse_context_t ctx;
     Sint chunk_size = 0;
 
     /* Bag implementation presented both semantic consistency and performance issues,
@@ -2221,29 +2222,32 @@ static int db_select_replace_hash(Process *p, DbTable *tbl, Eterm tid, Eterm pat
      */
     ASSERT(!(tbl->hash.common.status & DB_BAG));
 
-    ctx.base.on_nothing_can_match = select_replace_on_nothing_can_match;
-    ctx.base.on_match_res         = select_replace_on_match_res;
-    ctx.base.on_loop_ended        = select_replace_on_loop_ended;
-    ctx.base.on_trap              = select_replace_on_trap;
+    ctx.on_nothing_can_match = select_replace_on_nothing_can_match;
+    ctx.on_match_res         = select_replace_on_match_res;
+    ctx.on_loop_ended        = select_replace_on_loop_ended;
+    ctx.on_trap              = select_replace_on_trap;
     ctx.p = p;
     ctx.tb = &tbl->hash;
     ctx.tid = tid;
     ctx.prev_continuation_tptr = NULL;
+    ctx.safety = safety;
 
     return match_traverse(
-            ctx.p, ctx.tb,
+            &ctx,
             pattern, db_match_keeps_key,
             chunk_size,
             MAX_SELECT_REPLACE_ITERATIONS, NULL, 1,
-            &ctx.base, ret);
+            ret);
 }
 
 /*
  * This is called when select_replace traps
  */
-static int db_select_replace_continue_hash(Process* p, DbTable* tbl, Eterm continuation, Eterm* ret)
+static int db_select_replace_continue_hash(Process* p, DbTable* tbl,
+                                           Eterm continuation, Eterm* ret,
+                                           enum DbIterSafety* safety_p)
 {
-    select_replace_context_t ctx;
+    traverse_context_t ctx;
     Eterm* tptr;
     Eterm tid ;
     Binary* mp;
@@ -2252,25 +2256,27 @@ static int db_select_replace_continue_hash(Process* p, DbTable* tbl, Eterm conti
     Sint chunk_size = 0;
     *ret = NIL;
 
-    if (unpack_simple_continuation(continuation, &tptr, &tid, &slot_ix, &mp, &got)) {
+    if (unpack_simple_continuation(continuation, &tptr, &tid, &slot_ix, &mp,
+                                   &got, safety_p)) {
         *ret = NIL;
         return DB_ERROR_BADPARAM;
     }
 
     /* Proceed */
-    ctx.base.on_match_res  = select_replace_on_match_res;
-    ctx.base.on_loop_ended = select_replace_on_loop_ended;
-    ctx.base.on_trap       = select_replace_on_trap;
+    ctx.on_match_res  = select_replace_on_match_res;
+    ctx.on_loop_ended = select_replace_on_loop_ended;
+    ctx.on_trap       = select_replace_on_trap;
     ctx.p = p;
     ctx.tb = &tbl->hash;
     ctx.tid = tid;
     ctx.prev_continuation_tptr = tptr;
+    ctx.safety = *safety_p;
 
     return match_traverse_continue(
-            ctx.p, ctx.tb, chunk_size,
+            &ctx, chunk_size,
             MAX_SELECT_REPLACE_ITERATIONS,
             NULL, slot_ix, got, &mp, 1,
-            &ctx.base, ret);
+            ret);
 }
 
 
@@ -2310,7 +2316,7 @@ static int db_take_hash(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
     }
     WUNLOCK_HASH(lck);
     if (nitems_diff) {
-        erts_atomic_add_nob(&tb->common.nitems, nitems_diff);
+        ADD_NITEMS(tb, nitems_diff);
         try_shrink(tb);
     }
     free_term_list(tb, free_us);
@@ -2370,7 +2376,7 @@ static SWord db_mark_all_deleted_hash(DbTable *tbl, SWord reds)
     fixdel->slot = NACTIVE(tb) - 1;
     fixdel->all = 1;
     fixdel->trap = 0;
-    erts_atomic_set_nob(&tb->common.nitems, 0);
+    RESET_NITEMS(tb);
     return loops < 0 ? 0 : loops / LOOPS_PER_REDUCTION;
 }
 
@@ -2478,7 +2484,8 @@ static SWord db_free_table_continue_hash(DbTable *tbl, SWord reds)
 		     (void*)tb->locks, sizeof(DbTableHashFineLocks));
 	tb->locks = NULL;
     }
-    ASSERT(erts_atomic_read_nob(&tb->common.memory_size) == sizeof(DbTable));
+    ASSERT(sizeof(DbTable) == erts_flxctr_read_approx(&tb->common.counters,
+                                                      ERTS_DB_TABLE_MEM_COUNTER_ID));
     return reds;			/* Done */
 }
 
@@ -2731,13 +2738,9 @@ static int free_seg(DbTableHash *tb, int free_records)
                  * sure no lingering threads are still hanging in BUCKET macro
                  * with an old segtab pointer.
                  */
-                Uint sz = SIZEOF_EXT_SEGTAB(est->nsegs);
-                ASSERT(sz == ERTS_ALC_DBG_BLK_SZ(est));
-                ERTS_DB_ALC_MEM_UPDATE_(tb, sz, 0);
-                erts_schedule_thr_prgr_later_cleanup_op(dealloc_ext_segtab,
-                                                        est,
-                                                        &est->lop,
-                                                        sz);
+                erts_schedule_db_free(&tb->common, dealloc_ext_segtab,
+                                      est, &est->lop,
+                                      SIZEOF_EXT_SEGTAB(est->nsegs));
             }
             else
                 erts_db_free(ERTS_ALC_T_DB_SEG, (DbTable*)tb, est,
@@ -3094,7 +3097,7 @@ db_lookup_dbterm_hash(Process *p, DbTable *tbl, Eterm key, Eterm obj,
             ASSERT(q->hvalue == hval);
             q->pseudo_deleted = 0;
             *bp = b = q;
-            erts_atomic_inc_nob(&tb->common.nitems);
+            INC_NITEMS(tb);
         }
 
         HRelease(p, hend, htop);
@@ -3107,7 +3110,7 @@ Ldone:
     handle->dbterm = &b->dbterm;
     handle->flags = flags;
     handle->new_size = b->dbterm.size;
-    handle->lck = lck;
+    handle->u.hash.lck = lck;
     return 1;
 }
 
@@ -3120,7 +3123,7 @@ db_finalize_dbterm_hash(int cret, DbUpdateHandle* handle)
     DbTableHash *tb = &tbl->hash;
     HashDbTerm **bp = (HashDbTerm **) handle->bp;
     HashDbTerm *b = *bp;
-    erts_rwmtx_t* lck = (erts_rwmtx_t*) handle->lck;
+    erts_rwmtx_t* lck = handle->u.hash.lck;
     HashDbTerm* free_me = NULL;
 
     ERTS_LC_ASSERT(IS_HASH_WLOCKED(tb, lck));  /* locked by db_lookup_dbterm_hash */
@@ -3137,7 +3140,7 @@ db_finalize_dbterm_hash(int cret, DbUpdateHandle* handle)
         }
 
         WUNLOCK_HASH(lck);
-        erts_atomic_dec_nob(&tb->common.nitems);
+        DEC_NITEMS(tb);
         try_shrink(tb);
     } else {
         if (handle->flags & DB_MUST_RESIZE) {
@@ -3146,7 +3149,7 @@ db_finalize_dbterm_hash(int cret, DbUpdateHandle* handle)
         }
         if (handle->flags & DB_INC_TRY_GROW) {
             int nactive;
-            int nitems = erts_atomic_inc_read_nob(&tb->common.nitems);
+            int nitems = INC_NITEMS(tb);
             WUNLOCK_HASH(lck);
             nactive = NACTIVE(tb);
 
@@ -3167,8 +3170,17 @@ db_finalize_dbterm_hash(int cret, DbUpdateHandle* handle)
     return;
 }
 
-static SWord db_delete_all_objects_hash(Process* p, DbTable* tbl, SWord reds)
+static SWord db_delete_all_objects_hash(Process* p,
+                                        DbTable* tbl,
+                                        SWord reds,
+                                        Eterm* nitems_holder_wb)
 {
+    if (nitems_holder_wb != NULL) {
+        Uint nr_of_items =
+            erts_flxctr_read_centralized(&tbl->common.counters,
+                                         ERTS_DB_TABLE_NITEMS_COUNTER_ID);
+        *nitems_holder_wb = erts_make_integer(nr_of_items, p);
+    }
     if (IS_FIXED(tbl)) {
 	reds = db_mark_all_deleted_hash(tbl, reds);
     } else {
@@ -3177,11 +3189,16 @@ static SWord db_delete_all_objects_hash(Process* p, DbTable* tbl, SWord reds)
             return reds;
 
 	db_create_hash(p, tbl);
-	erts_atomic_set_nob(&tbl->hash.common.nitems, 0);
+        RESET_NITEMS(tbl);
     }
     return reds;
 }
 
+static Eterm db_delete_all_objects_get_nitems_from_holder_hash(Process* p,
+                                                               Eterm nitems_holder){
+    return nitems_holder;
+}
+
 void db_foreach_offheap_hash(DbTable *tbl,
 			     void (*func)(ErlOffHeap *, void *),
 			     void * arg)
@@ -3245,6 +3262,12 @@ Eterm erts_ets_hash_sizeof_ext_segtab(void)
     return make_small(((SIZEOF_EXT_SEGTAB(0)-1) / sizeof(UWord)) + 1);
 }
 
+void
+erts_db_foreach_thr_prgr_offheap_hash(void (*func)(ErlOffHeap *, void *),
+                                      void *arg)
+{
+}
+
 #ifdef ERTS_ENABLE_LOCK_COUNT
 void erts_lcnt_enable_db_hash_lock_count(DbTableHash *tb, int enable) {
     int i;
diff --git a/erts/emulator/beam/erl_db_hash.h b/erts/emulator/beam/erl_db_hash.h
index eae5537ba4..9759d8b466 100644
--- a/erts/emulator/beam/erl_db_hash.h
+++ b/erts/emulator/beam/erl_db_hash.h
@@ -110,6 +110,9 @@ typedef struct {
 
 void db_calc_stats_hash(DbTableHash* tb, DbHashStats*);
 Eterm erts_ets_hash_sizeof_ext_segtab(void);
+void
+erts_db_foreach_thr_prgr_offheap_hash(void (*func)(ErlOffHeap *, void *),
+                                      void *arg);
 
 #ifdef ERTS_ENABLE_LOCK_COUNT
 void erts_lcnt_enable_db_hash_lock_count(DbTableHash *tb, int enable);
diff --git a/erts/emulator/beam/erl_db_tree.c b/erts/emulator/beam/erl_db_tree.c
index 45e4be2426..19b94b0634 100644
--- a/erts/emulator/beam/erl_db_tree.c
+++ b/erts/emulator/beam/erl_db_tree.c
@@ -48,33 +48,23 @@
 #include "erl_binary.h"
 
 #include "erl_db_tree.h"
+#include "erl_db_tree_util.h"
 
 #define GETKEY_WITH_POS(Keypos, Tplp) (*((Tplp) + Keypos))
-#define NITEMS(tb) ((int)erts_atomic_read_nob(&(tb)->common.nitems))
 
-/*
-** A stack of this size is enough for an AVL tree with more than
-** 0xFFFFFFFF elements. May be subject to change if
-** the datatype of the element counter is changed to a 64 bit integer.
-** The Maximal height of an AVL tree is calculated as:
-** h(n) <= 1.4404 * log(n + 2) - 0.328
-** Where n denotes the number of nodes, h(n) the height of the tree
-** with n nodes and log is the binary logarithm.
-*/
-
-#define STACK_NEED 50
-#define TREE_MAX_ELEMENTS 0xFFFFFFFFUL
-
-#define PUSH_NODE(Dtt, Tdt)                     \
-    ((Dtt)->array[(Dtt)->pos++] = Tdt)
-
-#define POP_NODE(Dtt)			\
-     (((Dtt)->pos) ? 			\
-      (Dtt)->array[--((Dtt)->pos)] : NULL)
-
-#define TOP_NODE(Dtt)                   \
-     ((Dtt->pos) ? 			\
-      (Dtt)->array[(Dtt)->pos - 1] : NULL)
+#define NITEMS_CENTRALIZED(tb)                                          \
+    ((Sint)erts_flxctr_read_centralized(&(tb)->common.counters,          \
+                                        ERTS_DB_TABLE_NITEMS_COUNTER_ID))
+#define ADD_NITEMS(DB, TO_ADD)                                          \
+    erts_flxctr_add(&(DB)->common.counters, ERTS_DB_TABLE_NITEMS_COUNTER_ID, TO_ADD)
+#define INC_NITEMS(DB)                                                  \
+    erts_flxctr_inc(&(DB)->common.counters, ERTS_DB_TABLE_NITEMS_COUNTER_ID)
+#define INC_NITEMS_CENTRALIZED(DB)                                      \
+    erts_flxctr_inc_read_centralized(&(DB)->common.counters, ERTS_DB_TABLE_NITEMS_COUNTER_ID)
+#define RESET_NITEMS(DB)                                                \
+    erts_flxctr_reset(&(DB)->common.counters, ERTS_DB_TABLE_NITEMS_COUNTER_ID)
+#define IS_CENTRALIZED_CTR(tb) (!(tb)->common.counters.is_decentralized)
+#define APPROX_MEM_CONSUMED(tb) erts_flxctr_read_approx(&(tb)->common.counters, ERTS_DB_TABLE_MEM_COUNTER_ID)
 
 #define TOPN_NODE(Dtt, Pos)                   \
      (((Pos) < Dtt->pos) ? 			\
@@ -89,10 +79,12 @@
 /* Obtain table static stack if available. NULL if not.
 ** Must be released with release_stack()
 */
-static DbTreeStack* get_static_stack(DbTableTree* tb)
+ERTS_INLINE static DbTreeStack* get_static_stack(DbTableTree* tb)
 {
-    if (!erts_atomic_xchg_acqb(&tb->is_stack_busy, 1)) {
-	return &tb->static_stack;
+    if (tb != NULL) {
+        ASSERT(IS_TREE_TABLE(tb->common.type));
+        if (!erts_atomic_xchg_acqb(&tb->is_stack_busy, 1))
+            return &tb->static_stack;
     }
     return NULL;
 }
@@ -100,13 +92,15 @@ static DbTreeStack* get_static_stack(DbTableTree* tb)
 /* Obtain static stack if available, otherwise empty dynamic stack.
 ** Must be released with release_stack()
 */
-static DbTreeStack* get_any_stack(DbTableTree* tb)
+static DbTreeStack* get_any_stack(DbTable* tb, DbTableTree* stack_container)
 {
     DbTreeStack* stack;
-    if (!erts_atomic_xchg_acqb(&tb->is_stack_busy, 1)) {
-	return &tb->static_stack;
+    if (stack_container != NULL) {
+        ASSERT(IS_TREE_TABLE(stack_container->common.type));
+        if (!erts_atomic_xchg_acqb(&stack_container->is_stack_busy, 1))
+            return &stack_container->static_stack;
     }
-    stack = erts_db_alloc(ERTS_ALC_T_DB_STK, (DbTable *) tb,
+    stack = erts_db_alloc(ERTS_ALC_T_DB_STK, tb,
 			  sizeof(DbTreeStack) + sizeof(TreeDbTerm*) * STACK_NEED);
     stack->pos = 0;
     stack->slot = 0;
@@ -114,62 +108,62 @@ static DbTreeStack* get_any_stack(DbTableTree* tb)
     return stack;
 }
 
-static void release_stack(DbTableTree* tb, DbTreeStack* stack)
+static void release_stack(DbTable* tb, DbTableTree* stack_container, DbTreeStack* stack)
 {
-    if (stack == &tb->static_stack) {
-	ASSERT(erts_atomic_read_nob(&tb->is_stack_busy) == 1);
-	erts_atomic_set_relb(&tb->is_stack_busy, 0);
-    }
-    else {
-	erts_db_free(ERTS_ALC_T_DB_STK, (DbTable *) tb,
-		     (void *) stack, sizeof(DbTreeStack) + sizeof(TreeDbTerm*) * STACK_NEED);
+    if (stack_container != NULL) {
+        ASSERT(IS_TREE_TABLE(stack_container->common.type));
+        if (stack == &stack_container->static_stack) {
+            ASSERT(erts_atomic_read_nob(&stack_container->is_stack_busy) == 1);
+            erts_atomic_set_relb(&stack_container->is_stack_busy, 0);
+            return;
+        }
     }
+    erts_db_free(ERTS_ALC_T_DB_STK, tb,
+                 (void *) stack, sizeof(DbTreeStack) + sizeof(TreeDbTerm*) * STACK_NEED);
 }
 
-static ERTS_INLINE void reset_static_stack(DbTableTree* tb)
+static ERTS_INLINE void reset_stack(DbTreeStack* stack)
 {
-    tb->static_stack.pos = 0;
-    tb->static_stack.slot = 0;
+    if (stack != NULL) {
+        stack->pos = 0;
+        stack->slot = 0;
+    }
 }
 
-static ERTS_INLINE void free_term(DbTableTree *tb, TreeDbTerm* p)
+static ERTS_INLINE void reset_static_stack(DbTableTree* tb)
 {
-    db_free_term((DbTable*)tb, p, offsetof(TreeDbTerm, dbterm));
+    if (tb != NULL) {
+        ASSERT(IS_TREE_TABLE(tb->common.type));
+        reset_stack(&tb->static_stack);
+    }
 }
 
-static ERTS_INLINE TreeDbTerm* new_dbterm(DbTableTree *tb, Eterm obj)
+static ERTS_INLINE TreeDbTerm* new_dbterm(DbTableCommon *tb, Eterm obj)
 {
     TreeDbTerm* p;
-    if (tb->common.compress) {
-	p = db_store_term_comp(&tb->common, NULL, offsetof(TreeDbTerm,dbterm), obj);
+    if (tb->compress) {
+	p = db_store_term_comp(tb, NULL, offsetof(TreeDbTerm,dbterm), obj);
     }
     else {
-	p = db_store_term(&tb->common, NULL, offsetof(TreeDbTerm,dbterm), obj);
+	p = db_store_term(tb, NULL, offsetof(TreeDbTerm,dbterm), obj);
     }
     return p;
 }
-static ERTS_INLINE TreeDbTerm* replace_dbterm(DbTableTree *tb, TreeDbTerm* old,
+static ERTS_INLINE TreeDbTerm* replace_dbterm(DbTableCommon *tb, TreeDbTerm* old,
 					      Eterm obj)
 {
     TreeDbTerm* p;
     ASSERT(old != NULL);
-    if (tb->common.compress) {
-	p = db_store_term_comp(&tb->common, &(old->dbterm), offsetof(TreeDbTerm,dbterm), obj);
+    if (tb->compress) {
+	p = db_store_term_comp(tb, &(old->dbterm), offsetof(TreeDbTerm,dbterm), obj);
     }
     else {
-	p = db_store_term(&tb->common, &(old->dbterm), offsetof(TreeDbTerm,dbterm), obj);
+	p = db_store_term(tb, &(old->dbterm), offsetof(TreeDbTerm,dbterm), obj);
     }
     return p;
 }
 
 /*
-** Some macros for "direction stacks"
-*/
-#define DIR_LEFT 0
-#define DIR_RIGHT 1
-#define DIR_END 2 
-
-/*
  * Number of records to delete before trapping.
  */
 #define DELETE_RECORD_LIMIT 12000
@@ -208,31 +202,37 @@ static void do_dump_tree2(DbTableTree*, int to, void *to_arg, int show,
 ** Datatypes
 */
 
+enum ms_key_boundness {
+    /* Order significant, larger means more "boundness" => less iteration */
+    MS_KEY_UNBOUND           = 0,
+    MS_KEY_PARTIALLY_BOUND   = 1,
+    MS_KEY_BOUND             = 2,
+    MS_KEY_IMPOSSIBLE        = 3
+};
+
 /* 
  * This structure is filled in by analyze_pattern() for the select 
  * functions.
  */
 struct mp_info {
-    int something_can_match;	/* The match_spec is not "impossible" */
-    int some_limitation;	/* There is some limitation on the search
-				 * area, i. e. least and/or most is set.*/
-    int got_partial;		/* The limitation has a partially bound
-				 * key */
+    enum ms_key_boundness key_boundness;
     Eterm least;		/* The lowest matching key (possibly 
 				 * partially bound expression) */
     Eterm most;                 /* The highest matching key (possibly 
 				 * partially bound expression) */
-
-    TreeDbTerm **save_term;      /* If the key is completely bound, this
-	 			  * will be the Tree node we're searching
-				  * for, otherwise it will be useless */
     Binary *mp;                 /* The compiled match program */
 };
 
+struct select_common {
+    TreeDbTerm **root;
+};
+
+
 /*
  * Used by doit_select(_chunk)
  */
 struct select_context {
+    struct select_common common;
     Process *p;
     Eterm accum;
     Binary *mp;
@@ -248,6 +248,7 @@ struct select_context {
  * Used by doit_select_count
  */
 struct select_count_context {
+    struct select_common common;
     Process *p;
     Binary *mp;
     Eterm end_condition;
@@ -261,8 +262,10 @@ struct select_count_context {
  * Used by doit_select_delete
  */
 struct select_delete_context {
+    struct select_common common;
     Process *p;
-    DbTableTree *tb;
+    DbTableCommon *tb;
+    DbTreeStack *stack;
     Uint accum;
     Binary *mp;
     Eterm end_condition;
@@ -276,8 +279,9 @@ struct select_delete_context {
  * Used by doit_select_replace
  */
 struct select_replace_context {
+    struct select_common common;
     Process *p;
-    DbTableTree *tb;
+    DbTableCommon *tb;
     Binary *mp;
     Eterm end_condition;
     Eterm *lastobj;
@@ -292,75 +296,83 @@ typedef int (*extra_match_validator_t)(int keypos, Eterm match, Eterm guard, Ete
 /*
 ** Forward declarations 
 */
-static TreeDbTerm *linkout_tree(DbTableTree *tb, Eterm key);
-static TreeDbTerm *linkout_object_tree(DbTableTree *tb, 
-				       Eterm object);
+static TreeDbTerm *linkout_tree(DbTableCommon *tb, TreeDbTerm **root,
+                                Eterm key, DbTreeStack *stack);
+static TreeDbTerm *linkout_object_tree(DbTableCommon *tb,  TreeDbTerm **root,
+				       Eterm object, DbTableTree *stack);
 static SWord do_free_tree_continue(DbTableTree *tb, SWord reds);
-static void free_term(DbTableTree *tb, TreeDbTerm* p);
-static int balance_left(TreeDbTerm **this); 
-static int balance_right(TreeDbTerm **this); 
+static void free_term(DbTable *tb, TreeDbTerm* p);
+int tree_balance_left(TreeDbTerm **this); 
+int tree_balance_right(TreeDbTerm **this); 
 static int delsub(TreeDbTerm **this); 
-static TreeDbTerm *slot_search(Process *p, DbTableTree *tb, Sint slot);
-static TreeDbTerm *find_node(DbTableTree *tb, Eterm key);
-static TreeDbTerm **find_node2(DbTableTree *tb, Eterm key);
-static TreeDbTerm **find_ptr(DbTableTree *tb, DbTreeStack*, TreeDbTerm *this);
-static TreeDbTerm *find_next(DbTableTree *tb, DbTreeStack*, Eterm key);
-static TreeDbTerm *find_prev(DbTableTree *tb, DbTreeStack*, Eterm key);
-static TreeDbTerm *find_next_from_pb_key(DbTableTree *tb, DbTreeStack*,
-					 Eterm key);
-static TreeDbTerm *find_prev_from_pb_key(DbTableTree *tb, DbTreeStack*,
-					 Eterm key);
-static void traverse_backwards(DbTableTree *tb,
+static TreeDbTerm *slot_search(Process *p, TreeDbTerm *root, Sint slot,
+                               DbTable *tb, DbTableTree *stack_container,
+                               CATreeRootIterator *iter, int* is_EOT);
+static TreeDbTerm *find_node(DbTableCommon *tb, TreeDbTerm *root,
+                             Eterm key, DbTableTree *stack_container);
+static TreeDbTerm **find_node2(DbTableCommon *tb, TreeDbTerm **root, Eterm key);
+static TreeDbTerm **find_ptr(DbTableCommon *tb, TreeDbTerm **root,
+                             DbTreeStack *stack, TreeDbTerm *this);
+static TreeDbTerm *find_next(DbTableCommon *tb, TreeDbTerm *root,
+                             DbTreeStack* stack, Eterm key);
+static TreeDbTerm *find_prev(DbTableCommon *tb, TreeDbTerm *root,
+                             DbTreeStack* stack, Eterm key);
+static TreeDbTerm *find_next_from_pb_key(DbTable*, TreeDbTerm*** rootpp,
+                                         DbTreeStack* stack, Eterm key,
+                                         CATreeRootIterator*);
+static TreeDbTerm *find_prev_from_pb_key(DbTable*,  TreeDbTerm*** rootpp,
+                                         DbTreeStack* stack, Eterm key,
+                                         CATreeRootIterator*);
+typedef int traverse_doit_funcT(DbTableCommon*, TreeDbTerm*,
+                                struct select_common*, int forward);
+
+static void traverse_backwards(DbTableCommon *tb,
 			       DbTreeStack*,
 			       Eterm lastkey,
-			       int (*doit)(DbTableTree *tb,
-					   TreeDbTerm *,
-					   void *,
-					   int),
-			       void *context); 
-static void traverse_forward(DbTableTree *tb,
+			       traverse_doit_funcT*,
+			       struct select_common *context,
+                               CATreeRootIterator*);
+static void traverse_forward(DbTableCommon *tb,
 			     DbTreeStack*,
 			     Eterm lastkey,
-			     int (*doit)(DbTableTree *tb,
-					 TreeDbTerm *,
-					 void *,
-					 int),
-			     void *context);
-static void traverse_update_backwards(DbTableTree *tb,
+                             traverse_doit_funcT*,
+			     struct select_common *context,
+                             CATreeRootIterator*);
+static void traverse_update_backwards(DbTableCommon *tb,
                                       DbTreeStack*,
                                       Eterm lastkey,
-                                      int (*doit)(DbTableTree *tb,
+                                      int (*doit)(DbTableCommon *tb,
                                                   TreeDbTerm **, // out
-                                                  void *,
+                                                  struct select_common*,
                                                   int),
-                                      void *context);
-static int key_given(DbTableTree *tb, Eterm pattern, TreeDbTerm ***ret,
-		     Eterm *partly_bound_key);
-static Sint cmp_partly_bound(Eterm partly_bound_key, Eterm bound_key);
+                                      struct select_common*,
+                                      CATreeRootIterator*);
+static enum ms_key_boundness key_boundness(DbTableCommon *tb,
+                                           Eterm pattern, Eterm *keyp);
 static Sint do_cmp_partly_bound(Eterm a, Eterm b, int *done);
 
-static int analyze_pattern(DbTableTree *tb, Eterm pattern, 
+static int analyze_pattern(DbTableCommon *tb, Eterm pattern,
                            extra_match_validator_t extra_validator, /* Optional callback */
                            struct mp_info *mpi);
-static int doit_select(DbTableTree *tb,
-		       TreeDbTerm *this,
-		       void *ptr,
+static int doit_select(DbTableCommon *tb,
+                       TreeDbTerm *this,
+                       struct select_common* ptr,
 		       int forward);
-static int doit_select_count(DbTableTree *tb,
+static int doit_select_count(DbTableCommon *tb,
 			     TreeDbTerm *this,
-			     void *ptr,
+                             struct select_common*,
 			     int forward);
-static int doit_select_chunk(DbTableTree *tb,
+static int doit_select_chunk(DbTableCommon *tb,
 			     TreeDbTerm *this,
-			     void *ptr,
+                             struct select_common*,
 			     int forward);
-static int doit_select_delete(DbTableTree *tb,
+static int doit_select_delete(DbTableCommon *tb,
 			      TreeDbTerm *this,
-			      void *ptr,
+			      struct select_common*,
 			      int forward);
-static int doit_select_replace(DbTableTree *tb,
+static int doit_select_replace(DbTableCommon *tb,
                                TreeDbTerm **this_ptr,
-                               void *ptr,
+                               struct select_common*,
                                int forward);
 
 static int partly_bound_can_match_lesser(Eterm partly_bound_1, 
@@ -396,24 +408,31 @@ static int db_erase_object_tree(DbTable *tbl, Eterm object,Eterm *ret);
 static int db_slot_tree(Process *p, DbTable *tbl, 
 			Eterm slot_term,  Eterm *ret);
 static int db_select_tree(Process *p, DbTable *tbl, Eterm tid,
-			  Eterm pattern, int reversed, Eterm *ret);
+			  Eterm pattern, int reversed, Eterm *ret,
+                          enum DbIterSafety);
 static int db_select_count_tree(Process *p, DbTable *tbl, Eterm tid,
-				Eterm pattern,  Eterm *ret);
+				Eterm pattern,  Eterm *ret, enum DbIterSafety);
 static int db_select_chunk_tree(Process *p, DbTable *tbl, Eterm tid,
 				Eterm pattern, Sint chunk_size,
-				int reversed, Eterm *ret);
+				int reversed, Eterm *ret, enum DbIterSafety);
 static int db_select_continue_tree(Process *p, DbTable *tbl,
-				   Eterm continuation, Eterm *ret);
+				   Eterm continuation, Eterm *ret,
+                                   enum DbIterSafety*);
 static int db_select_count_continue_tree(Process *p, DbTable *tbl,
-					 Eterm continuation, Eterm *ret);
+					 Eterm continuation, Eterm *ret,
+                                         enum DbIterSafety*);
 static int db_select_delete_tree(Process *p, DbTable *tbl, Eterm tid,
-				 Eterm pattern,  Eterm *ret);
+				 Eterm pattern,  Eterm *ret,
+                                 enum DbIterSafety);
 static int db_select_delete_continue_tree(Process *p, DbTable *tbl, 
-					  Eterm continuation, Eterm *ret);
+					  Eterm continuation, Eterm *ret,
+                                          enum DbIterSafety*);
 static int db_select_replace_tree(Process *p, DbTable *tbl, Eterm tid,
-                                  Eterm pattern, Eterm *ret);
+                                  Eterm pattern, Eterm *ret,
+                                  enum DbIterSafety);
 static int db_select_replace_continue_tree(Process *p, DbTable *tbl,
-                                           Eterm continuation, Eterm *ret);
+                                           Eterm continuation, Eterm *ret,
+                                           enum DbIterSafety*);
 static int db_take_tree(Process *, DbTable *, Eterm, Eterm *);
 static void db_print_tree(fmtfn_t to, void *to_arg,
 			  int show, DbTable *tbl);
@@ -425,8 +444,12 @@ static void db_foreach_offheap_tree(DbTable *,
 				    void (*)(ErlOffHeap *, void *),
 				    void *);
 
-static SWord db_delete_all_objects_tree(Process* p, DbTable* tbl, SWord reds);
-
+static SWord db_delete_all_objects_tree(Process* p,
+                                        DbTable* tbl,
+                                        SWord reds,
+                                        Eterm* nitems_holder_wb);
+static Eterm db_delete_all_objects_get_nitems_from_holder_tree(Process* p,
+                                                               Eterm nitems_holder);
 #ifdef HARDDEBUG
 static void db_check_table_tree(DbTable *tbl);
 #endif
@@ -470,6 +493,7 @@ DbTableMethod db_tree =
     db_select_replace_continue_tree,
     db_take_tree,
     db_delete_all_objects_tree,
+    db_delete_all_objects_get_nitems_from_holder_tree,
     db_free_empty_table_tree,
     db_free_table_continue_tree,
     db_print_tree,
@@ -508,18 +532,18 @@ int db_create_tree(Process *p, DbTable *tbl)
     return DB_ERROR_NONE;
 }
 
-static int db_first_tree(Process *p, DbTable *tbl, Eterm *ret)
+int db_first_tree_common(Process *p, DbTable *tbl, TreeDbTerm *root,
+                         Eterm *ret, DbTableTree *stack_container)
 {
-    DbTableTree *tb = &tbl->tree;
     DbTreeStack* stack;
     TreeDbTerm *this;
 
-    if (( this = tb->root ) == NULL) {
+    if (( this = root ) == NULL) {
 	*ret = am_EOT;
 	return DB_ERROR_NONE;
     }
     /* Walk down the tree to the left */
-    if ((stack = get_static_stack(tb)) != NULL) {
+    if ((stack = get_static_stack(stack_container)) != NULL) {
 	stack->pos = stack->slot = 0;
     }
     while (this->left != NULL) {
@@ -529,23 +553,27 @@ static int db_first_tree(Process *p, DbTable *tbl, Eterm *ret)
     if (stack) {
 	PUSH_NODE(stack, this);
 	stack->slot = 1;
-	release_stack(tb,stack);
+	release_stack(tbl,stack_container,stack);
     }
     *ret = db_copy_key(p, tbl, &this->dbterm);
     return DB_ERROR_NONE;
 }
 
-static int db_next_tree(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
+static int db_first_tree(Process *p, DbTable *tbl, Eterm *ret)
 {
     DbTableTree *tb = &tbl->tree;
-    DbTreeStack* stack;
+    return db_first_tree_common(p, tbl, tb->root, ret, tb);
+}
+
+int db_next_tree_common(Process *p, DbTable *tbl,
+                        TreeDbTerm *root, Eterm key,
+                        Eterm *ret, DbTreeStack* stack)
+{
     TreeDbTerm *this;
 
-    if (is_atom(key) && key == am_EOT)
+    if (key == am_EOT)
 	return DB_ERROR_BADKEY;
-    stack = get_any_stack(tb);
-    this = find_next(tb, stack, key);
-    release_stack(tb,stack);
+    this = find_next(&tbl->common, root, stack, key);
     if (this == NULL) {
 	*ret = am_EOT;
 	return DB_ERROR_NONE;
@@ -554,18 +582,27 @@ static int db_next_tree(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
     return DB_ERROR_NONE;
 }
 
-static int db_last_tree(Process *p, DbTable *tbl, Eterm *ret)
+static int db_next_tree(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
 {
     DbTableTree *tb = &tbl->tree;
+    DbTreeStack* stack = get_any_stack(tbl, tb);
+    int ret_val = db_next_tree_common(p, tbl, tb->root, key, ret, stack);
+    release_stack(tbl,tb,stack);
+    return ret_val;
+}
+
+int db_last_tree_common(Process *p, DbTable *tbl, TreeDbTerm *root,
+                        Eterm *ret, DbTableTree *stack_container)
+{
     TreeDbTerm *this;
     DbTreeStack* stack;
 
-    if (( this = tb->root ) == NULL) {
+    if (( this = root ) == NULL) {
 	*ret = am_EOT;
 	return DB_ERROR_NONE;
     }
     /* Walk down the tree to the right */
-    if ((stack = get_static_stack(tb)) != NULL) {
+    if ((stack = get_static_stack(stack_container)) != NULL) {
 	stack->pos = stack->slot = 0;
     }    
     while (this->right != NULL) {
@@ -574,24 +611,28 @@ static int db_last_tree(Process *p, DbTable *tbl, Eterm *ret)
     }
     if (stack) {
 	PUSH_NODE(stack, this);
-	stack->slot = NITEMS(tb);
-	release_stack(tb,stack);
+        /* Always centralized counters when static stack is used */
+	stack->slot = NITEMS_CENTRALIZED(tbl);
+	release_stack(tbl,stack_container,stack);
     }
     *ret = db_copy_key(p, tbl, &this->dbterm);
     return DB_ERROR_NONE;
 }
 
-static int db_prev_tree(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
+static int db_last_tree(Process *p, DbTable *tbl, Eterm *ret)
 {
     DbTableTree *tb = &tbl->tree;
+    return db_last_tree_common(p, tbl, tb->root, ret, tb);
+}
+
+int db_prev_tree_common(Process *p, DbTable *tbl, TreeDbTerm *root, Eterm key,
+                 Eterm *ret, DbTreeStack* stack)
+{
     TreeDbTerm *this;
-    DbTreeStack* stack;
 
-    if (is_atom(key) && key == am_EOT)
+    if (key == am_EOT)
 	return DB_ERROR_BADKEY;
-    stack = get_any_stack(tb);
-    this = find_prev(tb, stack, key);
-    release_stack(tb,stack);
+    this = find_prev(&tbl->common, root, stack, key);
     if (this == NULL) {
 	*ret = am_EOT;
 	return DB_ERROR_NONE;
@@ -600,25 +641,30 @@ static int db_prev_tree(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
     return DB_ERROR_NONE;
 }
 
-static ERTS_INLINE Sint cmp_key(DbTableTree* tb, Eterm key, TreeDbTerm* obj) {
-    return CMP(key, GETKEY(tb,obj->dbterm.tpl));
+static int db_prev_tree(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
+{
+    DbTableTree *tb = &tbl->tree;
+    DbTreeStack* stack = get_any_stack(tbl, tb);
+    int res = db_prev_tree_common(p, tbl, tb->root, key, ret, stack);
+    release_stack(tbl,tb,stack);
+    return res;
 }
 
-static ERTS_INLINE int cmp_key_eq(DbTableTree* tb, Eterm key, TreeDbTerm* obj) {
+static ERTS_INLINE int cmp_key_eq(DbTableCommon* tb, Eterm key, TreeDbTerm* obj) {
     Eterm obj_key = GETKEY(tb,obj->dbterm.tpl);
     return is_same(key, obj_key) || CMP(key, obj_key) == 0;
 }
 
-static int db_put_tree(DbTable *tbl, Eterm obj, int key_clash_fail)
+int db_put_tree_common(DbTableCommon *tb, TreeDbTerm **root, Eterm obj,
+                       int key_clash_fail, DbTableTree *stack_container)
 {
-    DbTableTree *tb = &tbl->tree;
     /* Non recursive insertion in AVL tree, building our own stack */
     TreeDbTerm **tstack[STACK_NEED];
     int tpos = 0;
     int dstack[STACK_NEED+1];
     int dpos = 0;
     int state = 0;
-    TreeDbTerm **this = &tb->root;
+    TreeDbTerm **this = root;
     Sint c;
     Eterm key;
     int dir;
@@ -626,16 +672,13 @@ static int db_put_tree(DbTable *tbl, Eterm obj, int key_clash_fail)
 
     key = GETKEY(tb, tuple_val(obj));
 
-    reset_static_stack(tb);
+    reset_static_stack(stack_container);
 
     dstack[dpos++] = DIR_END;
     for (;;)
 	if (!*this) { /* Found our place */
 	    state = 1;
-	    if (erts_atomic_inc_read_nob(&tb->common.nitems) >= TREE_MAX_ELEMENTS) {
-		erts_atomic_dec_nob(&tb->common.nitems);
-		return DB_ERROR_SYSRES;
-	    }
+            INC_NITEMS(((DbTable*)tb));
 	    *this = new_dbterm(tb, obj);
 	    (*this)->balance = 0;
 	    (*this)->left = (*this)->right = NULL;
@@ -724,9 +767,15 @@ static int db_put_tree(DbTable *tbl, Eterm obj, int key_clash_fail)
     return DB_ERROR_NONE;
 }
 
-static int db_get_tree(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
+static int db_put_tree(DbTable *tbl, Eterm obj, int key_clash_fail)
 {
     DbTableTree *tb = &tbl->tree;
+    return db_put_tree_common(&tb->common, &tb->root, obj, key_clash_fail, tb);
+}
+
+int db_get_tree_common(Process *p, DbTableCommon *tb, TreeDbTerm *root, Eterm key,
+                       Eterm *ret, DbTableTree *stack_container)
+{
     Eterm copy;
     Eterm *hp, *hend;
     TreeDbTerm *this;
@@ -737,13 +786,13 @@ static int db_get_tree(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
      * The list created around it is purely for interface conformance.
      */
     
-    this = find_node(tb,key);
+    this = find_node(tb,root,key,stack_container);
     if (this == NULL) {
 	*ret = NIL;
     } else {
 	hp = HAlloc(p, this->dbterm.size + 2);
 	hend = hp + this->dbterm.size + 2;
-	copy = db_copy_object_from_ets(&tb->common, &this->dbterm, &hp, &MSO(p));
+	copy = db_copy_object_from_ets(tb, &this->dbterm, &hp, &MSO(p));
 	*ret = CONS(hp, copy, NIL);
 	hp += 2;
 	HRelease(p,hend,hp);
@@ -751,18 +800,28 @@ static int db_get_tree(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
     return DB_ERROR_NONE;
 }
 
-static int db_member_tree(DbTable *tbl, Eterm key, Eterm *ret)
+static int db_get_tree(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
 {
     DbTableTree *tb = &tbl->tree;
+    return db_get_tree_common(p, &tb->common, tb->root, key, ret, tb);
+}
 
-    *ret = (find_node(tb,key) == NULL) ? am_false : am_true;
+int db_member_tree_common(DbTableCommon *tb, TreeDbTerm *root, Eterm key, Eterm *ret,
+                          DbTableTree *stack_container)
+{
+    *ret = (find_node(tb,root,key,stack_container) == NULL) ? am_false : am_true;
     return DB_ERROR_NONE;
 }
 
-static int db_get_element_tree(Process *p, DbTable *tbl,
-			       Eterm key, int ndex, Eterm *ret)
+static int db_member_tree(DbTable *tbl, Eterm key, Eterm *ret)
 {
     DbTableTree *tb = &tbl->tree;
+    return db_member_tree_common(&tb->common, tb->root, key, ret, tb);
+}
+
+int db_get_element_tree_common(Process *p, DbTableCommon *tb, TreeDbTerm *root, Eterm key,
+                               int ndex, Eterm *ret, DbTableTree *stack_container)
+{
     /*
      * Look the node up:
      */
@@ -776,54 +835,74 @@ static int db_get_element_tree(Process *p, DbTable *tbl,
      * around the element here either.
      */
     
-    this = find_node(tb,key);
+    this = find_node(tb,root,key,stack_container);
     if (this == NULL) {
 	return DB_ERROR_BADKEY;
     } else {
 	if (ndex > arityval(this->dbterm.tpl[0])) {
 	    return DB_ERROR_BADPARAM;
 	}
-	*ret = db_copy_element_from_ets(&tb->common, p, &this->dbterm, ndex, &hp, 0);
+	*ret = db_copy_element_from_ets(tb, p, &this->dbterm, ndex, &hp, 0);
     }
     return DB_ERROR_NONE;
 }
 
-static int db_erase_tree(DbTable *tbl, Eterm key, Eterm *ret)
+static int db_get_element_tree(Process *p, DbTable *tbl,
+			       Eterm key, int ndex, Eterm *ret)
 {
     DbTableTree *tb = &tbl->tree;
+    return db_get_element_tree_common(p, &tb->common, tb->root, key,
+                                      ndex, ret, tb);
+}
+
+int db_erase_tree_common(DbTable *tbl, TreeDbTerm **root, Eterm key, Eterm *ret,
+                         DbTreeStack *stack /* NULL if no static stack */)
+{
     TreeDbTerm *res;
 
     *ret = am_true;
 
-    if ((res = linkout_tree(tb, key)) != NULL) {
-	free_term(tb, res);
+    if ((res = linkout_tree(&tbl->common, root,key, stack)) != NULL) {
+	free_term(tbl, res);
     }
     return DB_ERROR_NONE;
 }
 
-static int db_erase_object_tree(DbTable *tbl, Eterm object, Eterm *ret)
+static int db_erase_tree(DbTable *tbl, Eterm key, Eterm *ret)
 {
     DbTableTree *tb = &tbl->tree;
+    return db_erase_tree_common(tbl, &tb->root, key, ret, &tb->static_stack);
+}
+
+int db_erase_object_tree_common(DbTable *tbl, TreeDbTerm **root, Eterm object,
+                                Eterm *ret, DbTableTree *stack_container)
+{
     TreeDbTerm *res;
 
     *ret = am_true;
 
-    if ((res = linkout_object_tree(tb, object)) != NULL) {
-	free_term(tb, res);
+    if ((res = linkout_object_tree(&tbl->common, root, object, stack_container)) != NULL) {
+	free_term(tbl, res);
     }
     return DB_ERROR_NONE;
 }
 
-
-static int db_slot_tree(Process *p, DbTable *tbl, 
-			Eterm slot_term, Eterm *ret)
+static int db_erase_object_tree(DbTable *tbl, Eterm object, Eterm *ret)
 {
     DbTableTree *tb = &tbl->tree;
+    return  db_erase_object_tree_common(tbl, &tb->root, object, ret, tb);
+}
+
+int db_slot_tree_common(Process *p, DbTable *tbl, TreeDbTerm *root,
+                        Eterm slot_term, Eterm *ret,
+                        DbTableTree *stack_container,
+                        CATreeRootIterator *iter)
+{
     Sint slot;
     TreeDbTerm *st;
     Eterm *hp, *hend;
     Eterm copy;
-
+    int is_EOT = 0;
     /*
      * The notion of a "slot" is not natural in a tree, but we try to
      * simulate it by giving the n'th node in the tree instead.
@@ -834,10 +913,10 @@ static int db_slot_tree(Process *p, DbTable *tbl,
 
     if (is_not_small(slot_term) ||
 	((slot = signed_val(slot_term)) < 0) ||
-	(slot > NITEMS(tb)))
+	(IS_CENTRALIZED_CTR(tbl) && slot > NITEMS_CENTRALIZED(tbl)))
 	return DB_ERROR_BADPARAM;
 
-    if (slot == NITEMS(tb)) {
+    if (IS_CENTRALIZED_CTR(tbl) && slot == NITEMS_CENTRALIZED(tbl)) {
 	*ret = am_EOT;
 	return DB_ERROR_NONE;
     }
@@ -847,20 +926,31 @@ static int db_slot_tree(Process *p, DbTable *tbl,
      * are counted from 1 and up.
      */
     ++slot;
-    st = slot_search(p, tb, slot); 
+    st = slot_search(p, root, slot, tbl, stack_container, iter, &is_EOT);
+    if (is_EOT) {
+        *ret = am_EOT;
+	return DB_ERROR_NONE;
+    }
     if (st == NULL) {
 	*ret = am_false;
 	return DB_ERROR_UNSPEC;
     }
     hp = HAlloc(p, st->dbterm.size + 2);
     hend = hp + st->dbterm.size + 2;
-    copy = db_copy_object_from_ets(&tb->common, &st->dbterm, &hp, &MSO(p));
+    copy = db_copy_object_from_ets(&tbl->common, &st->dbterm, &hp, &MSO(p));
     *ret = CONS(hp, copy, NIL);
     hp += 2;
     HRelease(p,hend,hp);
     return DB_ERROR_NONE;
 }
 
+static int db_slot_tree(Process *p, DbTable *tbl, 
+			Eterm slot_term, Eterm *ret)
+{
+    DbTableTree *tb = &tbl->tree;
+    return db_slot_tree_common(p, tbl, tb->root, slot_term, ret, tb, NULL);
+}
+
 
 
 static BIF_RETTYPE ets_select_reverse(BIF_ALIST_3)
@@ -926,19 +1016,14 @@ static BIF_RETTYPE bif_trap3(Export *bif,
 {
     BIF_TRAP3(bif, p, p1, p2, p3);
 }
-    
-/*
-** This is called either when the select bif traps or when ets:select/1 
-** is called. It does mostly the same as db_select_tree and may in either case
-** trap to itself again (via the ets:select/1 bif).
-** Note that this is common for db_select_tree and db_select_chunk_tree.
-*/
-static int db_select_continue_tree(Process *p, 
-				   DbTable *tbl,
-				   Eterm continuation,
-				   Eterm *ret)
+
+int db_select_continue_tree_common(Process *p, 
+                                   DbTableCommon *tb,
+                                   Eterm continuation,
+                                   Eterm *ret,
+                                   DbTableTree *stack_container,
+                                   CATreeRootIterator* iter)
 {
-    DbTableTree *tb = &tbl->tree;
     DbTreeStack* stack;
     struct select_context sc;
     unsigned sz;
@@ -951,7 +1036,6 @@ static int db_select_continue_tree(Process *p,
     Sint chunk_size;
     Sint reverse;
 
-
 #define RET_TO_BIF(Term, State) do { *ret = (Term); return State; } while(0);
 
     /* Decode continuation. We know it's a tuple but not the arity or 
@@ -980,28 +1064,37 @@ static int db_select_continue_tree(Process *p,
     sc.end_condition = NIL;
     sc.lastobj = NULL;
     sc.max = 1000;
-    sc.keypos = tb->common.keypos;
+    sc.keypos = tb->keypos;
     sc.chunk_size = chunk_size;
     reverse = unsigned_val(tptr[7]);
     sc.got = signed_val(tptr[8]);
 
-    stack = get_any_stack(tb);
-    if (chunk_size) {
-	if (reverse) {
-	    traverse_backwards(tb, stack, lastkey, &doit_select_chunk, &sc);
-	} else {
-	    traverse_forward(tb, stack, lastkey, &doit_select_chunk, &sc);
-	}
-    } else {
-	if (reverse) {
-	    traverse_forward(tb, stack, lastkey, &doit_select, &sc);
-	} else {
-	    traverse_backwards(tb, stack, lastkey, &doit_select, &sc);
-	}
+    if (iter) {
+        iter->next_route_key = lastkey;
+        sc.common.root = catree_find_nextprev_root(iter, !!reverse != !!chunk_size, NULL);
     }
-    release_stack(tb,stack);
+    else
+        sc.common.root = &((DbTableTree*)tb)->root;
+
+    if (sc.common.root) {
+        stack = get_any_stack((DbTable*)tb, stack_container);
+        if (chunk_size) {
+            if (reverse) {
+                traverse_backwards(tb, stack, lastkey, &doit_select_chunk, &sc.common, iter);
+            } else {
+                traverse_forward(tb, stack, lastkey, &doit_select_chunk, &sc.common, iter);
+            }
+        } else {
+            if (reverse) {
+                traverse_forward(tb, stack, lastkey, &doit_select, &sc.common, iter);
+            } else {
+                traverse_backwards(tb, stack, lastkey, &doit_select, &sc.common, iter);
+            }
+        }
+        release_stack((DbTable*)tb,stack_container,stack);
 
-    BUMP_REDS(p, 1000 - sc.max);
+        BUMP_REDS(p, 1000 - sc.max);
+    }
 
     if (sc.max > 0 || (chunk_size && sc.got == chunk_size)) {
 	if (chunk_size) {
@@ -1082,13 +1175,30 @@ static int db_select_continue_tree(Process *p,
 
 #undef RET_TO_BIF
 }
+    
+/*
+** This is called either when the select bif traps or when ets:select/1 
+** is called. It does mostly the same as db_select_tree and may in either case
+** trap to itself again (via the ets:select/1 bif).
+** Note that this is common for db_select_tree and db_select_chunk_tree.
+*/
+static int db_select_continue_tree(Process *p, 
+				   DbTable *tbl,
+				   Eterm continuation,
+				   Eterm *ret,
+                                   enum DbIterSafety* safety_p)
+{
+    DbTableTree *tb = &tbl->tree;
+    return db_select_continue_tree_common(p, &tb->common,
+                                          continuation, ret, tb, NULL);
+}
 
-
-static int db_select_tree(Process *p, DbTable *tbl, Eterm tid,
-			  Eterm pattern, int reverse, Eterm *ret)
+int db_select_tree_common(Process *p, DbTable *tb,
+                          Eterm tid, Eterm pattern, int reverse, Eterm *ret,
+                          DbTableTree *stack_container,
+                          CATreeRootIterator* iter)
 {
     /* Strategy: Traverse backwards to build resulting list from tail to head */
-    DbTableTree *tb = &tbl->tree;
     DbTreeStack* stack;
     struct select_context sc;
     struct mp_info mpi;
@@ -1121,42 +1231,62 @@ static int db_select_tree(Process *p, DbTable *tbl, Eterm tid,
     sc.got = 0;
     sc.chunk_size = 0;
 
-    if ((errcode = analyze_pattern(tb, pattern, NULL, &mpi)) != DB_ERROR_NONE) {
+    if ((errcode = analyze_pattern(&tb->common, pattern, NULL, &mpi)) != DB_ERROR_NONE) {
 	RET_TO_BIF(NIL,errcode);
     }
 
-    if (!mpi.something_can_match) {
+    if (mpi.key_boundness == MS_KEY_IMPOSSIBLE) {
 	RET_TO_BIF(NIL,DB_ERROR_NONE);  
 	/* can't possibly match anything */
     }
 
     sc.mp = mpi.mp;
 
-    if (!mpi.got_partial && mpi.some_limitation && 
-	CMP_EQ(mpi.least,mpi.most)) {
-	doit_select(tb,*(mpi.save_term),&sc,0 /* direction doesn't matter */);
+    if (mpi.key_boundness == MS_KEY_BOUND) {
+        ASSERT(CMP_EQ(mpi.least, mpi.most));
+        if (iter)
+            sc.common.root = catree_find_root(mpi.least, iter);
+        else
+            sc.common.root = &tb->tree.root;
+        this = find_node(&tb->common, *sc.common.root, mpi.least, NULL);
+        if (this)
+            doit_select(&tb->common, this, &sc.common, 0 /* direction doesn't matter */);
 	RET_TO_BIF(sc.accum,DB_ERROR_NONE);
     }
 
-    stack = get_any_stack(tb);
+    stack = get_any_stack((DbTable*)tb,stack_container);
     if (reverse) {
-	if (mpi.some_limitation) {
-	    if ((this = find_prev_from_pb_key(tb, stack, mpi.least)) != NULL) {
+	if (mpi.key_boundness == MS_KEY_PARTIALLY_BOUND) {
+            this = find_prev_from_pb_key(tb, &sc.common.root, stack, mpi.least, iter);
+	    if (this)
 		lastkey = GETKEY(tb, this->dbterm.tpl);
-	    }
 	    sc.end_condition = mpi.most;
 	}
-	traverse_forward(tb, stack, lastkey, &doit_select, &sc);
+        else {
+            ASSERT(mpi.key_boundness == MS_KEY_UNBOUND);
+            if (iter)
+                sc.common.root = catree_find_first_root(iter);
+            else
+                sc.common.root = &tb->tree.root;
+        }
+	traverse_forward(&tb->common, stack, lastkey, &doit_select, &sc.common, iter);
     } else {
-	if (mpi.some_limitation) {
-	    if ((this = find_next_from_pb_key(tb, stack, mpi.most)) != NULL) {
-		lastkey = GETKEY(tb, this->dbterm.tpl);
-	    }
+	if (mpi.key_boundness == MS_KEY_PARTIALLY_BOUND) {
+            this = find_next_from_pb_key(tb, &sc.common.root, stack, mpi.most, iter);
+	    if (this)
+                lastkey = GETKEY(tb, this->dbterm.tpl);
 	    sc.end_condition = mpi.least;
 	}
-	traverse_backwards(tb, stack, lastkey, &doit_select, &sc);
+        else {
+            ASSERT(mpi.key_boundness == MS_KEY_UNBOUND);
+            if (iter)
+                sc.common.root = catree_find_last_root(iter);
+            else
+                sc.common.root = &tb->tree.root;
+        }
+	traverse_backwards(&tb->common, stack, lastkey, &doit_select, &sc.common, iter);
     }
-    release_stack(tb,stack);
+    release_stack((DbTable*)tb,stack_container,stack);
 #ifdef HARDDEBUG
 	erts_fprintf(stderr,"Least: %T\n", mpi.least);
 	erts_fprintf(stderr,"Most: %T\n", mpi.most);
@@ -1192,16 +1322,21 @@ static int db_select_tree(Process *p, DbTable *tbl, Eterm tid,
 
 }
 
-    
-/*
-** This is called either when the select_count bif traps.
-*/
-static int db_select_count_continue_tree(Process *p, 
-					 DbTable *tbl,
-					 Eterm continuation,
-					 Eterm *ret)
+static int db_select_tree(Process *p, DbTable *tbl, Eterm tid,
+			  Eterm pattern, int reverse, Eterm *ret,
+                          enum DbIterSafety safety)
+{
+    return db_select_tree_common(p, tbl, tid,
+                                 pattern, reverse, ret, &tbl->tree, NULL);
+}
+
+int db_select_count_continue_tree_common(Process *p, 
+                                         DbTable *tb,
+                                         Eterm continuation,
+                                         Eterm *ret,
+                                         DbTableTree *stack_container,
+                                         CATreeRootIterator* iter)
 {
-    DbTableTree *tb = &tbl->tree;
     DbTreeStack* stack;
     struct select_count_context sc;
     unsigned sz;
@@ -1213,7 +1348,6 @@ static int db_select_count_continue_tree(Process *p,
     Eterm *tptr;
     Eterm egot;
 
-
 #define RET_TO_BIF(Term, State) do { *ret = (Term); return State; } while(0);
 
     /* Decode continuation. We know it's a tuple and everything else as
@@ -1245,11 +1379,21 @@ static int db_select_count_continue_tree(Process *p,
 	sc.got = unsigned_val(tptr[5]);
     }
 
-    stack = get_any_stack(tb);
-    traverse_backwards(tb, stack, lastkey, &doit_select_count, &sc);
-    release_stack(tb,stack);
+    if (iter) {
+        iter->next_route_key = lastkey;
+        sc.common.root = catree_find_prev_root(iter, NULL);
+    }
+    else {
+        sc.common.root = &tb->tree.root;
+    }
+
+    if (sc.common.root) {
+        stack = get_any_stack(tb, stack_container);
+        traverse_backwards(&tb->common, stack, lastkey, &doit_select_count, &sc.common, iter);
+        release_stack(tb,stack_container,stack);
 
-    BUMP_REDS(p, 1000 - sc.max);
+        BUMP_REDS(p, 1000 - sc.max);
+    }
 
     if (sc.max > 0) {
 	RET_TO_BIF(erts_make_integer(sc.got,p), DB_ERROR_NONE);
@@ -1285,11 +1429,26 @@ static int db_select_count_continue_tree(Process *p,
 #undef RET_TO_BIF
 }
 
-
-static int db_select_count_tree(Process *p, DbTable *tbl, Eterm tid,
-				Eterm pattern, Eterm *ret)
+/*
+** This is called either when the select_count bif traps.
+*/
+static int db_select_count_continue_tree(Process *p, 
+                                         DbTable *tbl,
+                                         Eterm continuation,
+                                         Eterm *ret,
+                                         enum DbIterSafety* safety_p)
 {
     DbTableTree *tb = &tbl->tree;
+    return db_select_count_continue_tree_common(p, tbl,
+                                                continuation, ret, tb, NULL);
+}
+
+
+int db_select_count_tree_common(Process *p, DbTable *tb,
+                                Eterm tid, Eterm pattern, Eterm *ret,
+                                DbTableTree *stack_container,
+                                CATreeRootIterator* iter)
+{
     DbTreeStack* stack;
     struct select_count_context sc;
     struct mp_info mpi;
@@ -1303,7 +1462,6 @@ static int db_select_count_tree(Process *p, DbTable *tbl, Eterm tid,
     Eterm egot;
     Eterm mpb;
 
-
 #define RET_TO_BIF(Term,RetVal) do { 	       	\
 	if (mpi.mp != NULL) {			\
 	    erts_bin_free(mpi.mp);       	\
@@ -1321,33 +1479,46 @@ static int db_select_count_tree(Process *p, DbTable *tbl, Eterm tid,
     sc.keypos = tb->common.keypos;
     sc.got = 0;
 
-    if ((errcode = analyze_pattern(tb, pattern, NULL, &mpi)) != DB_ERROR_NONE) {
+    if ((errcode = analyze_pattern(&tb->common, pattern, NULL, &mpi)) != DB_ERROR_NONE) {
 	RET_TO_BIF(NIL,errcode);
     }
 
-    if (!mpi.something_can_match) {
+    if (mpi.key_boundness == MS_KEY_IMPOSSIBLE) {
 	RET_TO_BIF(make_small(0),DB_ERROR_NONE);  
 	/* can't possibly match anything */
     }
 
     sc.mp = mpi.mp;
 
-    if (!mpi.got_partial && mpi.some_limitation && 
-	CMP_EQ(mpi.least,mpi.most)) {
-	doit_select_count(tb,*(mpi.save_term),&sc,0 /* dummy */);
+    if (mpi.key_boundness == MS_KEY_BOUND) {
+        ASSERT(CMP_EQ(mpi.least, mpi.most));
+        if (iter)
+            sc.common.root = catree_find_root(mpi.least, iter);
+        else
+            sc.common.root = &((DbTable*)tb)->tree.root;
+        this =  find_node(&tb->common, *sc.common.root, mpi.least, NULL);
+        if (this)
+            doit_select_count(&tb->common, this, &sc.common, 0 /* dummy */);
 	RET_TO_BIF(erts_make_integer(sc.got,p),DB_ERROR_NONE);
     }
 
-    stack = get_any_stack(tb);
-    if (mpi.some_limitation) {
-	if ((this = find_next_from_pb_key(tb, stack, mpi.most)) != NULL) {
-	    lastkey = GETKEY(tb, this->dbterm.tpl);
-	}
+    stack = get_any_stack((DbTable*)tb, stack_container);
+    if (mpi.key_boundness == MS_KEY_PARTIALLY_BOUND) {
+        this = find_next_from_pb_key(tb, &sc.common.root, stack, mpi.most, iter);
+	if (this)
+            lastkey = GETKEY(tb, this->dbterm.tpl);
 	sc.end_condition = mpi.least;
     }
+    else {
+        ASSERT(mpi.key_boundness == MS_KEY_UNBOUND);
+        if (iter)
+            sc.common.root = catree_find_last_root(iter);
+        else
+            sc.common.root = &tb->tree.root;
+    }
     
-    traverse_backwards(tb, stack, lastkey, &doit_select_count, &sc);
-    release_stack(tb,stack);
+    traverse_backwards(&tb->common, stack, lastkey, &doit_select_count, &sc.common, iter);
+    release_stack((DbTable*)tb,stack_container,stack);
     BUMP_REDS(p, 1000 - sc.max);
     if (sc.max > 0) {
 	RET_TO_BIF(erts_make_integer(sc.got,p),DB_ERROR_NONE);
@@ -1383,12 +1554,22 @@ static int db_select_count_tree(Process *p, DbTable *tbl, Eterm tid,
 
 }
 
-static int db_select_chunk_tree(Process *p, DbTable *tbl, Eterm tid,
-				Eterm pattern, Sint chunk_size,
-				int reverse,
-				Eterm *ret)
+static int db_select_count_tree(Process *p, DbTable *tbl, Eterm tid,
+                                Eterm pattern, Eterm *ret,
+                                enum DbIterSafety safety)
 {
     DbTableTree *tb = &tbl->tree;
+    return db_select_count_tree_common(p, tbl,
+                                       tid, pattern, ret, tb, NULL);
+}
+
+
+int db_select_chunk_tree_common(Process *p, DbTable *tb,
+                                Eterm tid, Eterm pattern, Sint chunk_size,
+                                int reverse, Eterm *ret,
+                                DbTableTree *stack_container,
+                                CATreeRootIterator* iter)
+{
     DbTreeStack* stack;
     struct select_context sc;
     struct mp_info mpi;
@@ -1401,7 +1582,6 @@ static int db_select_chunk_tree(Process *p, DbTable *tbl, Eterm tid,
     int errcode;
     Eterm mpb;
 
-
 #define RET_TO_BIF(Term,RetVal) do { 		\
 	if (mpi.mp != NULL) {			\
 	    erts_bin_free(mpi.mp);		\
@@ -1421,20 +1601,26 @@ static int db_select_chunk_tree(Process *p, DbTable *tbl, Eterm tid,
     sc.got = 0;
     sc.chunk_size = chunk_size;
 
-    if ((errcode = analyze_pattern(tb, pattern, NULL, &mpi)) != DB_ERROR_NONE) {
+    if ((errcode = analyze_pattern(&tb->common, pattern, NULL, &mpi)) != DB_ERROR_NONE) {
 	RET_TO_BIF(NIL,errcode);
     }
 
-    if (!mpi.something_can_match) {
+    if (mpi.key_boundness == MS_KEY_IMPOSSIBLE) {
 	RET_TO_BIF(am_EOT,DB_ERROR_NONE);
 	/* can't possibly match anything */
     }
 
     sc.mp = mpi.mp;
 
-    if (!mpi.got_partial && mpi.some_limitation && 
-	CMP_EQ(mpi.least,mpi.most)) {
-	doit_select(tb,*(mpi.save_term),&sc, 0 /* direction doesn't matter */);
+    if (mpi.key_boundness == MS_KEY_BOUND) {
+        ASSERT(CMP_EQ(mpi.least, mpi.most));
+        if (iter)
+            sc.common.root = catree_find_root(mpi.least, iter);
+        else
+            sc.common.root = &tb->tree.root;
+        this =  find_node(&tb->common, *sc.common.root, mpi.least, NULL);
+        if (this)
+            doit_select(&tb->common, this, &sc.common, 0 /* direction doesn't matter */);
 	if (sc.accum != NIL) {
 	    hp=HAlloc(p, 3);
 	    RET_TO_BIF(TUPLE2(hp,sc.accum,am_EOT),DB_ERROR_NONE);
@@ -1443,25 +1629,39 @@ static int db_select_chunk_tree(Process *p, DbTable *tbl, Eterm tid,
 	}
     }
 
-    stack = get_any_stack(tb);
+    stack = get_any_stack((DbTable*)tb,stack_container);
     if (reverse) {
-	if (mpi.some_limitation) {
-	    if ((this = find_next_from_pb_key(tb, stack, mpi.most)) != NULL) {
-		lastkey = GETKEY(tb, this->dbterm.tpl);
-	    }
+	if (mpi.key_boundness == MS_KEY_PARTIALLY_BOUND) {
+            this = find_next_from_pb_key(tb, &sc.common.root, stack, mpi.most, iter);
+	    if (this)
+                lastkey = GETKEY(tb, this->dbterm.tpl);
 	    sc.end_condition = mpi.least;
 	}
-	traverse_backwards(tb, stack, lastkey, &doit_select_chunk, &sc);
+        else {
+            ASSERT(mpi.key_boundness == MS_KEY_UNBOUND);
+            if (iter)
+                sc.common.root = catree_find_last_root(iter);
+            else
+                sc.common.root = &tb->tree.root;
+        }
+	traverse_backwards(&tb->common, stack, lastkey, &doit_select_chunk, &sc.common, iter);
     } else {
-	if (mpi.some_limitation) {
-	    if ((this = find_prev_from_pb_key(tb, stack, mpi.least)) != NULL) {
-		lastkey = GETKEY(tb, this->dbterm.tpl);
-	    }
+	if (mpi.key_boundness == MS_KEY_PARTIALLY_BOUND) {
+            this = find_prev_from_pb_key(tb, &sc.common.root, stack, mpi.least, iter);
+	    if (this)
+                lastkey = GETKEY(tb, this->dbterm.tpl);
 	    sc.end_condition = mpi.most;
 	}
-	traverse_forward(tb, stack, lastkey, &doit_select_chunk, &sc);
+        else {
+            ASSERT(mpi.key_boundness == MS_KEY_UNBOUND);
+            if (iter)
+                sc.common.root = catree_find_first_root(iter);
+            else
+                sc.common.root = &tb->tree.root;
+        }
+	traverse_forward(&tb->common, stack, lastkey, &doit_select_chunk, &sc.common, iter);
     }
-    release_stack(tb,stack);
+    release_stack((DbTable*)tb,stack_container,stack);
 
     BUMP_REDS(p, 1000 - sc.max);
     if (sc.max > 0 || sc.got == chunk_size) {
@@ -1530,15 +1730,25 @@ static int db_select_chunk_tree(Process *p, DbTable *tbl, Eterm tid,
 
 }
 
-/*
-** This is called when select_delete traps
-*/
-static int db_select_delete_continue_tree(Process *p, 
-					  DbTable *tbl,
-					  Eterm continuation,
-					  Eterm *ret)
+static int db_select_chunk_tree(Process *p, DbTable *tbl, Eterm tid,
+                                Eterm pattern, Sint chunk_size,
+                                int reverse,
+                                Eterm *ret, enum DbIterSafety safety)
 {
     DbTableTree *tb = &tbl->tree;
+    return db_select_chunk_tree_common(p, tbl,
+                                       tid, pattern, chunk_size,
+                                       reverse, ret, tb, NULL);
+}
+
+
+int db_select_delete_continue_tree_common(Process *p,
+                                          DbTable *tbl,
+                                          Eterm continuation,
+                                          Eterm *ret,
+                                          DbTreeStack* stack,
+                                          CATreeRootIterator* iter)
+{
     struct select_delete_context sc;
     unsigned sz;
     Eterm *hp; 
@@ -1549,10 +1759,9 @@ static int db_select_delete_continue_tree(Process *p,
     Eterm *tptr;
     Eterm eaccsum;
 
-
 #define RET_TO_BIF(Term, State) do { 		\
 	if (sc.erase_lastterm) {		\
-	    free_term(tb, sc.lastterm);		\
+	    free_term(tbl, sc.lastterm);		\
 	}					\
 	*ret = (Term); 				\
 	return State; 				\
@@ -1571,7 +1780,8 @@ static int db_select_delete_continue_tree(Process *p,
 
     mp = erts_db_get_match_prog_binary_unchecked(tptr[4]);
     sc.p = p;
-    sc.tb = tb;
+    sc.tb = &tbl->common;
+    sc.stack = stack;
     if (is_big(tptr[5])) {
 	sc.accum = big_to_uint32(tptr[5]);
     } else {
@@ -1580,17 +1790,26 @@ static int db_select_delete_continue_tree(Process *p,
     sc.mp = mp;
     sc.end_condition = NIL;
     sc.max = 1000;
-    sc.keypos = tb->common.keypos;
+    sc.keypos = tbl->common.keypos;
 
-    ASSERT(!erts_atomic_read_nob(&tb->is_stack_busy));
-    traverse_backwards(tb, &tb->static_stack, lastkey, &doit_select_delete, &sc);
+    if (iter) {
+        iter->next_route_key = lastkey;
+        sc.common.root = catree_find_prev_root(iter, NULL);
+    }
+    else {
+        sc.common.root = &tbl->tree.root;
+    }
 
-    BUMP_REDS(p, 1000 - sc.max);
+    if (sc.common.root) {
+        traverse_backwards(&tbl->common, stack, lastkey, &doit_select_delete, &sc.common, iter);
+
+        BUMP_REDS(p, 1000 - sc.max);
+    }
 
     if (sc.max > 0) {
 	RET_TO_BIF(erts_make_integer(sc.accum, p), DB_ERROR_NONE);
     }	
-    key = GETKEY(tb, (sc.lastterm)->dbterm.tpl);
+    key = GETKEY(&tbl->common, (sc.lastterm)->dbterm.tpl);
     if (end_condition != NIL && 
 	cmp_partly_bound(end_condition,key) > 0) { /* done anyway */
 	RET_TO_BIF(erts_make_integer(sc.accum,p),DB_ERROR_NONE);
@@ -1620,10 +1839,24 @@ static int db_select_delete_continue_tree(Process *p,
 #undef RET_TO_BIF
 }
 
-static int db_select_delete_tree(Process *p, DbTable *tbl, Eterm tid,
-				 Eterm pattern, Eterm *ret)
+static int db_select_delete_continue_tree(Process *p, 
+					  DbTable *tbl,
+					  Eterm continuation,
+					  Eterm *ret,
+                                          enum DbIterSafety* safety_p)
 {
     DbTableTree *tb = &tbl->tree;
+    ASSERT(!erts_atomic_read_nob(&tb->is_stack_busy));
+    return db_select_delete_continue_tree_common(p, tbl, continuation, ret,
+                                                 &tb->static_stack, NULL);
+}
+
+int db_select_delete_tree_common(Process *p, DbTable *tbl,
+                                 Eterm tid, Eterm pattern,
+                                 Eterm *ret,
+                                 DbTreeStack* stack,
+                                 CATreeRootIterator* iter)
+{
     struct select_delete_context sc;
     struct mp_info mpi;
     Eterm lastkey = THE_NON_VALUE;
@@ -1641,7 +1874,7 @@ static int db_select_delete_tree(Process *p, DbTable *tbl, Eterm tid,
 	    erts_bin_free(mpi.mp);       	\
 	}					\
 	if (sc.erase_lastterm) {                \
-	    free_term(tb, sc.lastterm);         \
+	    free_term(tbl, sc.lastterm);         \
 	}                                       \
 	*ret = (Term); 				\
 	return RetVal; 			        \
@@ -1655,42 +1888,57 @@ static int db_select_delete_tree(Process *p, DbTable *tbl, Eterm tid,
     sc.p = p;
     sc.max = 1000; 
     sc.end_condition = NIL;
-    sc.keypos = tb->common.keypos;
-    sc.tb = tb;
+    sc.keypos = tbl->common.keypos;
+    sc.tb = &tbl->common;
+    sc.stack = stack;
     
-    if ((errcode = analyze_pattern(tb, pattern, NULL, &mpi)) != DB_ERROR_NONE) {
+    if ((errcode = analyze_pattern(&tbl->common, pattern, NULL, &mpi)) != DB_ERROR_NONE) {
 	RET_TO_BIF(0,errcode);
     }
 
-    if (!mpi.something_can_match) {
+    if (mpi.key_boundness == MS_KEY_IMPOSSIBLE) {
 	RET_TO_BIF(make_small(0),DB_ERROR_NONE);  
 	/* can't possibly match anything */
     }
 
     sc.mp = mpi.mp;
 
-    if (!mpi.got_partial && mpi.some_limitation && 
-	CMP_EQ(mpi.least,mpi.most)) {
-	doit_select_delete(tb,*(mpi.save_term),&sc, 0 /* direction doesn't
+    if (mpi.key_boundness == MS_KEY_BOUND) {
+        ASSERT(CMP_EQ(mpi.least, mpi.most));
+        if (iter)
+            sc.common.root = catree_find_root(mpi.least, iter);
+        else
+            sc.common.root = &tbl->tree.root;
+        this =  find_node(&tbl->common, *sc.common.root, mpi.least, NULL);
+        if (this)
+            doit_select_delete(&tbl->common, this, &sc.common, 0 /* direction doesn't
 						      matter */);
 	RET_TO_BIF(erts_make_integer(sc.accum,p),DB_ERROR_NONE);
     }
 
-    if (mpi.some_limitation) {
-	if ((this = find_next_from_pb_key(tb, &tb->static_stack, mpi.most)) != NULL) {
-	    lastkey = GETKEY(tb, this->dbterm.tpl);
-	}
+    if (mpi.key_boundness == MS_KEY_PARTIALLY_BOUND) {
+        this = find_next_from_pb_key(tbl, &sc.common.root, stack, mpi.most, iter);
+        if (this)
+            lastkey = GETKEY(&tbl->common, this->dbterm.tpl);
 	sc.end_condition = mpi.least;
     }
+    else {
+        ASSERT(mpi.key_boundness == MS_KEY_UNBOUND);
+        if (iter)
+            sc.common.root = catree_find_last_root(iter);
+        else
+            sc.common.root = &tbl->tree.root;
+    }
 
-    traverse_backwards(tb, &tb->static_stack, lastkey, &doit_select_delete, &sc);
+    traverse_backwards(&tbl->common, stack, lastkey,
+                       &doit_select_delete, &sc.common, iter);
     BUMP_REDS(p, 1000 - sc.max);
 
     if (sc.max > 0) {
 	RET_TO_BIF(erts_make_integer(sc.accum,p), DB_ERROR_NONE);
     }
 
-    key = GETKEY(tb, (sc.lastterm)->dbterm.tpl);
+    key = GETKEY(&tbl->common, (sc.lastterm)->dbterm.tpl);
     sz = size_object(key);
     if (IS_USMALL(0, sc.accum)) {
 	hp = HAlloc(p, sz + ERTS_MAGIC_REF_THING_SIZE + 6);
@@ -1714,7 +1962,7 @@ static int db_select_delete_tree(Process *p, DbTable *tbl, Eterm tid,
 
     /* Don't free mpi.mp, so don't use macro */
     if (sc.erase_lastterm) {
-	free_term(tb, sc.lastterm);
+	free_term(tbl, sc.lastterm);
     }
     *ret = bif_trap1(&ets_select_delete_continue_exp, p, continuation); 
     return DB_ERROR_NONE;
@@ -1723,12 +1971,22 @@ static int db_select_delete_tree(Process *p, DbTable *tbl, Eterm tid,
 
 }
 
-static int db_select_replace_continue_tree(Process *p,
+static int db_select_delete_tree(Process *p, DbTable *tbl, Eterm tid,
+				 Eterm pattern, Eterm *ret,
+                                 enum DbIterSafety safety)
+{
+    DbTableTree *tb = &tbl->tree;
+    return db_select_delete_tree_common(p, tbl, tid, pattern, ret,
+                                        &tb->static_stack, NULL);
+}
+
+int db_select_replace_continue_tree_common(Process *p,
                                            DbTable *tbl,
                                            Eterm continuation,
-                                           Eterm *ret)
+                                           Eterm *ret,
+                                           DbTableTree *stack_container,
+                                           CATreeRootIterator* iter)
 {
-    DbTableTree *tb = &tbl->tree;
     DbTreeStack* stack;
     struct select_replace_context sc;
     unsigned sz;
@@ -1764,7 +2022,7 @@ static int db_select_replace_continue_tree(Process *p,
     sc.end_condition = NIL;
     sc.lastobj = NULL;
     sc.max = 1000;
-    sc.keypos = tb->common.keypos;
+    sc.keypos = tbl->common.keypos;
     if (is_big(tptr[5])) {
         sc.replaced = big_to_uint32(tptr[5]);
     } else {
@@ -1772,9 +2030,18 @@ static int db_select_replace_continue_tree(Process *p,
     }
     prev_replaced = sc.replaced;
 
-    stack = get_any_stack(tb);
-    traverse_update_backwards(tb, stack, lastkey, &doit_select_replace, &sc);
-    release_stack(tb,stack);
+    if (iter) {
+        iter->next_route_key = lastkey;
+        sc.common.root = catree_find_prev_root(iter, NULL);
+    }
+    else {
+        sc.common.root = &tbl->tree.root;
+    }
+
+    stack = get_any_stack(tbl, stack_container);
+    traverse_update_backwards(&tbl->common, stack, lastkey, &doit_select_replace,
+                              &sc.common, iter);
+    release_stack(tbl, stack_container,stack);
 
     // the more objects we've replaced, the more reductions we've consumed
     BUMP_REDS(p, MIN(2000, (1000 - sc.max) + (sc.replaced - prev_replaced)));
@@ -1782,7 +2049,7 @@ static int db_select_replace_continue_tree(Process *p,
     if (sc.max > 0) {
         RET_TO_BIF(erts_make_integer(sc.replaced,p), DB_ERROR_NONE);
     }
-    key = GETKEY(tb, sc.lastobj);
+    key = GETKEY(tbl, sc.lastobj);
     if (end_condition != NIL &&
             (cmp_partly_bound(end_condition,key) > 0)) {
         /* done anyway */
@@ -1813,10 +2080,21 @@ static int db_select_replace_continue_tree(Process *p,
 #undef RET_TO_BIF
 }
 
-static int db_select_replace_tree(Process *p, DbTable *tbl, Eterm tid,
-                                  Eterm pattern, Eterm *ret)
+static int db_select_replace_continue_tree(Process *p,
+                                           DbTable *tbl,
+                                           Eterm continuation,
+                                           Eterm *ret,
+                                           enum DbIterSafety* safety_p)
+{
+    return db_select_replace_continue_tree_common(p, tbl, continuation, ret,
+                                                  &tbl->tree, NULL);
+}
+
+int db_select_replace_tree_common(Process *p, DbTable *tbl,
+                                  Eterm tid, Eterm pattern, Eterm *ret,
+                                  DbTableTree *stack_container,
+                                  CATreeRootIterator* iter)
 {
-    DbTableTree *tb = &tbl->tree;
     DbTreeStack* stack;
     struct select_replace_context sc;
     struct mp_info mpi;
@@ -1843,48 +2121,64 @@ static int db_select_replace_tree(Process *p, DbTable *tbl, Eterm tid,
 
     sc.lastobj = NULL;
     sc.p = p;
-    sc.tb = tb;
+    sc.tb = &tbl->common;
     sc.max = 1000;
     sc.end_condition = NIL;
-    sc.keypos = tb->common.keypos;
+    sc.keypos = tbl->common.keypos;
     sc.replaced = 0;
 
-    if ((errcode = analyze_pattern(tb, pattern, db_match_keeps_key, &mpi)) != DB_ERROR_NONE) {
+    if ((errcode = analyze_pattern(&tbl->common, pattern, db_match_keeps_key, &mpi)) != DB_ERROR_NONE) {
         RET_TO_BIF(NIL,errcode);
     }
 
-    if (!mpi.something_can_match) {
+    if (mpi.key_boundness == MS_KEY_IMPOSSIBLE) {
         RET_TO_BIF(make_small(0),DB_ERROR_NONE);
         /* can't possibly match anything */
     }
 
     sc.mp = mpi.mp;
 
-    if (!mpi.got_partial && mpi.some_limitation &&
-            CMP_EQ(mpi.least,mpi.most)) {
-        doit_select_replace(tb,mpi.save_term,&sc,0 /* dummy */);
-        reset_static_stack(tb); /* may refer replaced term */
+    if (mpi.key_boundness == MS_KEY_BOUND) {
+        TreeDbTerm** pp;
+        ASSERT(CMP_EQ(mpi.least, mpi.most));
+        if (iter)
+            sc.common.root = catree_find_root(mpi.least, iter);
+        else
+            sc.common.root = &tbl->tree.root;
+        pp = find_node2(&tbl->common, sc.common.root, mpi.least);
+        if (pp) {
+            doit_select_replace(&tbl->common, pp, &sc.common, 0 /* dummy */);
+            reset_static_stack(stack_container); /* may refer replaced term */
+        }
         RET_TO_BIF(erts_make_integer(sc.replaced,p),DB_ERROR_NONE);
     }
 
-    stack = get_any_stack(tb);
+    stack = get_any_stack(tbl,stack_container);
 
-    if (mpi.some_limitation) {
-        if ((this = find_next_from_pb_key(tb, stack, mpi.most)) != NULL) {
-            lastkey = GETKEY(tb, this->dbterm.tpl);
-        }
+    if (mpi.key_boundness == MS_KEY_PARTIALLY_BOUND) {
+        this = find_next_from_pb_key(tbl, &sc.common.root, stack, mpi.most, iter);
+        if (this)
+            lastkey = GETKEY(tbl, this->dbterm.tpl);
         sc.end_condition = mpi.least;
     }
+    else {
+        ASSERT(mpi.key_boundness == MS_KEY_UNBOUND);
+        if (iter)
+            sc.common.root = catree_find_last_root(iter);
+        else
+            sc.common.root = &tbl->tree.root;
+    }
 
-    traverse_update_backwards(tb, stack, lastkey, &doit_select_replace, &sc);
-    release_stack(tb,stack);
+    traverse_update_backwards(&tbl->common, stack, lastkey, &doit_select_replace,
+                              &sc.common, iter);
+    release_stack(tbl,stack_container,stack);
     // the more objects we've replaced, the more reductions we've consumed
     BUMP_REDS(p, MIN(2000, (1000 - sc.max) + sc.replaced));
     if (sc.max > 0) {
         RET_TO_BIF(erts_make_integer(sc.replaced,p),DB_ERROR_NONE);
     }
 
-    key = GETKEY(tb, sc.lastobj);
+    key = GETKEY(tbl, sc.lastobj);
     sz = size_object(key);
     if (IS_USMALL(0, sc.replaced)) {
         hp = HAlloc(p, sz + ERTS_MAGIC_REF_THING_SIZE + 6);
@@ -1914,52 +2208,74 @@ static int db_select_replace_tree(Process *p, DbTable *tbl, Eterm tid,
 
 }
 
-static int db_take_tree(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
+static int db_select_replace_tree(Process *p, DbTable *tbl, Eterm tid,
+                                  Eterm pattern, Eterm *ret,
+                                  enum DbIterSafety safety)
+{
+    return db_select_replace_tree_common(p, tbl, tid, pattern, ret,
+                                         &tbl->tree, NULL);
+}
+
+int db_take_tree_common(Process *p, DbTable *tbl, TreeDbTerm **root,
+                        Eterm key, Eterm *ret,
+                        DbTreeStack *stack /* NULL if no static stack */)
 {
-    DbTableTree *tb = &tbl->tree;
     TreeDbTerm *this;
 
     *ret = NIL;
-    this = linkout_tree(tb, key);
+    this = linkout_tree(&tbl->common, root, key, stack);
     if (this) {
         Eterm copy, *hp, *hend;
 
         hp = HAlloc(p, this->dbterm.size + 2);
         hend = hp + this->dbterm.size + 2;
-        copy = db_copy_object_from_ets(&tb->common,
+        copy = db_copy_object_from_ets(&tbl->common,
                                        &this->dbterm, &hp, &MSO(p));
         *ret = CONS(hp, copy, NIL);
         hp += 2;
         HRelease(p, hend, hp);
-        free_term(tb, this);
+        free_term(tbl, this);
     }
     return DB_ERROR_NONE;
 }
 
+static int db_take_tree(Process *p, DbTable *tbl, Eterm key, Eterm *ret)
+{
+    DbTableTree *tb = &tbl->tree;
+    return db_take_tree_common(p, tbl, &tb->root,
+                               key, ret, &tb->static_stack);
+}
+
 /*
 ** Other interface routines (not directly coupled to one bif)
 */
 
-
-/* Display tree contents (for dump) */
-static void db_print_tree(fmtfn_t to, void *to_arg,
-			  int show,
-			  DbTable *tbl)
+void db_print_tree_common(fmtfn_t to, void *to_arg,
+                          int show, TreeDbTerm *root, DbTable *tbl)
 {
-    DbTableTree *tb = &tbl->tree;
 #ifdef TREE_DEBUG
     if (show)
 	erts_print(to, to_arg, "\nTree data dump:\n"
 		   "------------------------------------------------\n");
-    do_dump_tree2(&tbl->tree, to, to_arg, show, tb->root, 0);
+    do_dump_tree2(&tbl->common, to, to_arg, show, root, 0);
     if (show)
 	erts_print(to, to_arg, "\n"
 		   "------------------------------------------------\n");
 #else
-    erts_print(to, to_arg, "Ordered set (AVL tree), Elements: %d\n", NITEMS(tb));
+    erts_print(to, to_arg, "Ordered set (AVL tree), Elements: %d\n",
+               erts_flxctr_read_approx(&tbl->common.counters, ERTS_DB_TABLE_NITEMS_COUNTER_ID));
 #endif
 }
 
+/* Display tree contents (for dump) */
+static void db_print_tree(fmtfn_t to, void *to_arg,
+			  int show,
+			  DbTable *tbl)
+{
+    DbTableTree *tb = &tbl->tree;
+    db_print_tree_common(to, to_arg, show, tb->root, tbl);
+}
+
 /* release all memory occupied by a single table */
 static int db_free_empty_table_tree(DbTable *tbl)
 {
@@ -1984,31 +2300,57 @@ static SWord db_free_table_continue_tree(DbTable *tbl, SWord reds)
 		     (DbTable *) tb,
 		     (void *) tb->static_stack.array,
 		     sizeof(TreeDbTerm *) * STACK_NEED);
-	ASSERT(erts_atomic_read_nob(&tb->common.memory_size)
-	       == sizeof(DbTable));
+	ASSERT(erts_flxctr_is_snapshot_ongoing(&tb->common.counters) ||
+               ((APPROX_MEM_CONSUMED(tb)
+                 == sizeof(DbTable)) ||
+                (APPROX_MEM_CONSUMED(tb)
+                 == (sizeof(DbTable) + sizeof(DbFixation)))));
     }
     return reds;
 }
 
-static SWord db_delete_all_objects_tree(Process* p, DbTable* tbl, SWord reds)
+static SWord db_delete_all_objects_tree(Process* p,
+                                        DbTable* tbl,
+                                        SWord reds,
+                                        Eterm* nitems_holder_wb)
 {
+    if (nitems_holder_wb != NULL) {
+        Uint nr_of_items =
+            erts_flxctr_read_centralized(&tbl->common.counters,
+                                         ERTS_DB_TABLE_NITEMS_COUNTER_ID);
+        *nitems_holder_wb = erts_make_integer(nr_of_items, p);
+    }
     reds = db_free_table_continue_tree(tbl, reds);
     if (reds < 0)
         return reds;
     db_create_tree(p, tbl);
-    erts_atomic_set_nob(&tbl->tree.common.nitems, 0);
+    RESET_NITEMS(tbl);
     return reds;
 }
 
+static Eterm db_delete_all_objects_get_nitems_from_holder_tree(Process* p,
+                                                               Eterm holder)
+{
+    (void)p;
+    return holder;
+}
+
 static void do_db_tree_foreach_offheap(TreeDbTerm *,
 				       void (*)(ErlOffHeap *, void *),
 				       void *);
 
+void db_foreach_offheap_tree_common(TreeDbTerm *root,
+                                    void (*func)(ErlOffHeap *, void *),
+                                    void * arg)
+{
+    do_db_tree_foreach_offheap(root, func, arg);
+}
+
 static void db_foreach_offheap_tree(DbTable *tbl,
 				    void (*func)(ErlOffHeap *, void *),
 				    void * arg)
 {
-    do_db_tree_foreach_offheap(tbl->tree.root, func, arg);
+    db_foreach_offheap_tree_common(tbl->tree.root, func, arg);
 }
 
 
@@ -2033,13 +2375,14 @@ do_db_tree_foreach_offheap(TreeDbTerm *tdbt,
     do_db_tree_foreach_offheap(tdbt->right, func, arg);
 }
 
-static TreeDbTerm *linkout_tree(DbTableTree *tb, Eterm key) {
+static TreeDbTerm *linkout_tree(DbTableCommon *tb, TreeDbTerm **root,
+                                Eterm key, DbTreeStack *stack) {
     TreeDbTerm **tstack[STACK_NEED];
     int tpos = 0;
     int dstack[STACK_NEED+1];
     int dpos = 0;
     int state = 0;
-    TreeDbTerm **this = &tb->root;
+    TreeDbTerm **this = root;
     Sint c;
     int dir;
     TreeDbTerm *q = NULL;
@@ -2050,7 +2393,7 @@ static TreeDbTerm *linkout_tree(DbTableTree *tb, Eterm key) {
      * keep the balance. As in insert, we do the stacking ourselves.
      */
 
-    reset_static_stack(tb);
+    reset_stack(stack);
     dstack[dpos++] = DIR_END;
     for (;;) {
 	if (!*this) { /* Failure */
@@ -2076,30 +2419,30 @@ static TreeDbTerm *linkout_tree(DbTableTree *tb, Eterm key) {
 		tstack[tpos++] = this;
 		state = delsub(this);
 	    }
-	    erts_atomic_dec_nob(&tb->common.nitems);
+            DEC_NITEMS(((DbTable*)tb));
 	    break;
 	}
     }
     while (state && ( dir = dstack[--dpos] ) != DIR_END) {
 	this = tstack[--tpos];
 	if (dir == DIR_LEFT) {
-	    state = balance_left(this);
+	    state = tree_balance_left(this);
 	} else {
-	    state = balance_right(this);
+	    state = tree_balance_right(this);
 	}
     }
     return q;
 }
 
-static TreeDbTerm *linkout_object_tree(DbTableTree *tb, 
-				       Eterm object)
+static TreeDbTerm *linkout_object_tree(DbTableCommon *tb,  TreeDbTerm **root,
+				       Eterm object, DbTableTree *stack)
 {
     TreeDbTerm **tstack[STACK_NEED];
     int tpos = 0;
     int dstack[STACK_NEED+1];
     int dpos = 0;
     int state = 0;
-    TreeDbTerm **this = &tb->root;
+    TreeDbTerm **this = root;
     Sint c;
     int dir;
     TreeDbTerm *q = NULL;
@@ -2114,7 +2457,7 @@ static TreeDbTerm *linkout_object_tree(DbTableTree *tb,
     
     key = GETKEY(tb, tuple_val(object));
 
-    reset_static_stack(tb);
+    reset_static_stack(stack);
     dstack[dpos++] = DIR_END;
     for (;;) {
 	if (!*this) { /* Failure */
@@ -2128,7 +2471,7 @@ static TreeDbTerm *linkout_object_tree(DbTableTree *tb,
 	    tstack[tpos++] = this;
 	    this = &((*this)->right);
 	} else { /* Equal key, found the only possible matching object*/
-	    if (!db_eq(&tb->common,object,&(*this)->dbterm)) {
+	    if (!db_eq(tb,object,&(*this)->dbterm)) {
 		return NULL;
 	    }
 	    q = (*this);
@@ -2143,16 +2486,16 @@ static TreeDbTerm *linkout_object_tree(DbTableTree *tb,
 		tstack[tpos++] = this;
 		state = delsub(this);
 	    }
-	    erts_atomic_dec_nob(&tb->common.nitems);
+            DEC_NITEMS(((DbTable*)tb));
 	    break;
 	}
     }
     while (state && ( dir = dstack[--dpos] ) != DIR_END) {
 	this = tstack[--tpos];
 	if (dir == DIR_LEFT) {
-	    state = balance_left(this);
+	    state = tree_balance_left(this);
 	} else {
-	    state = balance_right(this);
+	    state = tree_balance_right(this);
 	}
     }
     return q;
@@ -2162,7 +2505,7 @@ static TreeDbTerm *linkout_object_tree(DbTableTree *tb,
 ** For the select functions, analyzes the pattern and determines which
 ** part of the tree should be searched. Also compiles the match program
 */
-static int analyze_pattern(DbTableTree *tb, Eterm pattern,
+static int analyze_pattern(DbTableCommon *tb, Eterm pattern,
                            extra_match_validator_t extra_validator, /* Optional callback */
                            struct mp_info *mpi)
 {
@@ -2173,17 +2516,12 @@ static int analyze_pattern(DbTableTree *tb, Eterm pattern,
     Eterm *ptpl;
     int i;
     int num_heads = 0;
-    Eterm key;
-    Eterm partly_bound;
-    int res;
-    Eterm least = 0;
-    Eterm most = 0;
+    Eterm least = THE_NON_VALUE;
+    Eterm most = THE_NON_VALUE;
+    enum ms_key_boundness boundness;
 
-    mpi->some_limitation = 1;
-    mpi->got_partial = 0;
-    mpi->something_can_match = 0;
+    mpi->key_boundness = MS_KEY_IMPOSSIBLE;
     mpi->mp = NULL;
-    mpi->save_term = NULL;
 
     for (lst = pattern; is_list(lst); lst = CDR(list_val(lst)))
 	++num_heads;
@@ -2204,6 +2542,7 @@ static int analyze_pattern(DbTableTree *tb, Eterm pattern,
         Eterm match;
         Eterm guard;
         Eterm body;
+        Eterm key;
 
 	ttpl = CAR(list_val(lst));
 	if (!is_tuple(ttpl)) {
@@ -2223,7 +2562,7 @@ static int analyze_pattern(DbTableTree *tb, Eterm pattern,
 	guards[i] = guard = ptpl[2];
 	bodies[i] = body = ptpl[3];
 
-        if(extra_validator != NULL && !extra_validator(tb->common.keypos, match, guard, body)) {
+        if(extra_validator != NULL && !extra_validator(tb->keypos, match, guard, body)) {
 	    if (buff != sbuff) {
 		erts_free(ERTS_ALC_T_DB_TMP, buff);
 	    }
@@ -2235,30 +2574,29 @@ static int analyze_pattern(DbTableTree *tb, Eterm pattern,
 	}
 	++i;
 
-	partly_bound = NIL;
-	res = key_given(tb, tpl, &(mpi->save_term), &partly_bound);
-	if ( res >= 0 ) {   /* Can match something */
-	    key = 0;
-	    mpi->something_can_match = 1;
-	    if (res > 0) {
-		key = GETKEY(tb,tuple_val(tpl)); 
-	    } else if (partly_bound != NIL) {
-		mpi->got_partial = 1;
-		key = partly_bound;
-	    } else {
-		mpi->some_limitation = 0;
-	    }
-	    if (key != 0) {
-		if (least == 0 || 
-		    partly_bound_can_match_lesser(key,least)) {
-		    least = key;
-		}
-		if (most == 0 || 
-		    partly_bound_can_match_greater(key,most)) {
-		    most = key;
-		}
-	    }
-	}
+        boundness = key_boundness(tb, tpl, &key);
+	switch (boundness)
+        {
+        case MS_KEY_BOUND:
+        case MS_KEY_PARTIALLY_BOUND:
+            if (is_non_value(least) || partly_bound_can_match_lesser(key,least)) {
+                least = key;
+            }
+            if (is_non_value(most) || partly_bound_can_match_greater(key,most)) {
+                most = key;
+            }
+            break;
+        case MS_KEY_IMPOSSIBLE:
+        case MS_KEY_UNBOUND:
+            break;
+        }
+        if (mpi->key_boundness > boundness)
+            mpi->key_boundness = boundness;
+    }
+
+    if (mpi->key_boundness == MS_KEY_BOUND && !CMP_EQ(least, most)) {
+        /* Several different bound keys */
+        mpi->key_boundness = MS_KEY_PARTIALLY_BOUND;
     }
     mpi->least = least;
     mpi->most = most;
@@ -2300,7 +2638,7 @@ static SWord do_free_tree_continue(DbTableTree *tb, SWord reds)
 		PUSH_NODE(&tb->static_stack, root);
 		root = p;
 	    } else {
-		free_term(tb, root);
+		free_term((DbTable*)tb, root);
 		if (--reds < 0) {
                     return reds;   /* Done enough for now */
                 }
@@ -2314,7 +2652,7 @@ static SWord do_free_tree_continue(DbTableTree *tb, SWord reds)
 /*
  * Deletion helpers
  */
-static int balance_left(TreeDbTerm **this) 
+int tree_balance_left(TreeDbTerm **this) 
 {
     TreeDbTerm *p, *p1, *p2;
     int b1, b2, h = 1;
@@ -2359,7 +2697,7 @@ static int balance_left(TreeDbTerm **this)
     return h;
 }
 
-static int balance_right(TreeDbTerm **this) 
+int tree_balance_right(TreeDbTerm **this) 
 {
     TreeDbTerm *p, *p1, *p2;
     int b1, b2, h = 1;
@@ -2431,7 +2769,7 @@ static int delsub(TreeDbTerm **this)
     h = 1;
     while (tpos && h) {
 	r = tstack[--tpos];
-	h = balance_right(r);
+	h = tree_balance_right(r);
     }
     return h;
 }
@@ -2440,11 +2778,30 @@ static int delsub(TreeDbTerm **this)
  * Helper for db_slot
  */
 
-static TreeDbTerm *slot_search(Process *p, DbTableTree *tb, Sint slot)
+static TreeDbTerm *slot_search(Process *p, TreeDbTerm *root,
+                               Sint slot, DbTable *tb,
+                               DbTableTree *stack_container,
+                               CATreeRootIterator *iter,
+                               int* is_EOT)
 {
     TreeDbTerm *this;
     TreeDbTerm *tmp;
-    DbTreeStack* stack = get_any_stack(tb);
+    TreeDbTerm *lastobj;
+    Eterm lastkey;
+    TreeDbTerm **pp;
+    DbTreeStack* stack;
+
+    if (iter) {
+        /* Find first non-empty tree */
+        while (!root) {
+            TreeDbTerm** pp = catree_find_next_root(iter, NULL);
+            if (!pp)
+                return NULL;
+            root = *pp;
+        }
+    }
+
+    stack = get_any_stack(tb,stack_container);
     ASSERT(stack != NULL);
 
     if (slot == 1) { /* Don't search from where we are if we are 
@@ -2456,57 +2813,92 @@ static TreeDbTerm *slot_search(Process *p, DbTableTree *tb, Sint slot)
 				are not recorded */
 	stack->pos = 0;
     }
-    if (EMPTY_NODE(stack)) {
-	this = tb->root;
-	if (this == NULL)
-	    goto done;
-	while (this->left != NULL){
-	    PUSH_NODE(stack, this);
-	    this = this->left;
-	}
-	PUSH_NODE(stack, this);
-	stack->slot = 1;
-    }
-    this = TOP_NODE(stack);
-    while (stack->slot != slot && this != NULL) {
-	if (slot > stack->slot) {
-	    if (this->right != NULL) {
-		this = this->right;
-		while (this->left != NULL) {
-		    PUSH_NODE(stack, this);
-		    this = this->left;
-		}
-		PUSH_NODE(stack, this);
-	    } else {
-		for (;;) {
-		    tmp = POP_NODE(stack);
-		    this = TOP_NODE(stack);
-		    if (this == NULL || this->left == tmp)
-			break;
-		}
-	    }		
-	    ++(stack->slot);
-	} else {
-	    if (this->left != NULL) {
-		this = this->left;
-		while (this->right != NULL) {
-		    PUSH_NODE(stack, this);
-		    this = this->right;
-		}
-		PUSH_NODE(stack, this);
-	    } else {
-		for (;;) {
-		    tmp = POP_NODE(stack);
-		    this = TOP_NODE(stack);
-		    if (this == NULL || this->right == tmp)
-			break;
-		}
-	    }		
-	    --(stack->slot);
-	}
+    while (1) {
+        if (EMPTY_NODE(stack)) {
+            this = root;
+            if (this == NULL)
+                goto next_root;
+            while (this->left != NULL){
+                PUSH_NODE(stack, this);
+                this = this->left;
+            }
+            PUSH_NODE(stack, this);
+            stack->slot++;
+        }
+        this = TOP_NODE(stack);
+        while (stack->slot != slot) {
+            ASSERT(this);
+            lastobj = this;
+            if (slot > stack->slot) {
+                if (this->right != NULL) {
+                    this = this->right;
+                    while (this->left != NULL) {
+                        PUSH_NODE(stack, this);
+                        this = this->left;
+                    }
+                    PUSH_NODE(stack, this);
+                } else {
+                    for (;;) {
+                        tmp = POP_NODE(stack);
+                        this = TOP_NODE(stack);
+                        if (!this)
+                            goto next_root;
+                        if (this->left == tmp)
+                            break;
+                    }
+                }
+                ++(stack->slot);
+            } else {
+                if (this->left != NULL) {
+                    this = this->left;
+                    while (this->right != NULL) {
+                        PUSH_NODE(stack, this);
+                        this = this->right;
+                    }
+                    PUSH_NODE(stack, this);
+                } else {
+                    for (;;) {
+                        tmp = POP_NODE(stack);
+                        this = TOP_NODE(stack);
+                        if (!this)
+                            goto next_root;
+                        if (this->right == tmp)
+                            break;
+                    }
+                }
+                --(stack->slot);
+            }
+        }
+         /* Found slot */
+        ASSERT(this);
+        break;
+
+next_root:
+        if (!iter) {
+            if (stack->slot == (slot-1)) {
+                *is_EOT = 1;
+            }
+            break; /* EOT */
+        }
+
+        ASSERT(slot > stack->slot);
+        if (lastobj) {
+            lastkey = GETKEY(tb, lastobj->dbterm.tpl);
+            lastobj = NULL;
+        }
+        pp = catree_find_next_root(iter, &lastkey);
+        if (!pp) {
+            if (stack->slot == (slot-1)) {
+                *is_EOT = 1;
+            }
+            break; /* EOT */
+        }
+        root = *pp;
+        stack->pos = 0;
+        find_next(&tb->common, root, stack, lastkey);
     }
-done:
-    release_stack(tb,stack);
+
+    release_stack(tb,stack_container,stack);
     return this;
 }
 
@@ -2514,7 +2906,8 @@ done:
  * Find next and previous in sort order
  */
 
-static TreeDbTerm *find_next(DbTableTree *tb, DbTreeStack* stack, Eterm key) {
+static TreeDbTerm *find_next(DbTableCommon *tb, TreeDbTerm *root,
+                             DbTreeStack* stack, Eterm key) {
     TreeDbTerm *this;
     TreeDbTerm *tmp;
     Sint c;
@@ -2526,7 +2919,7 @@ static TreeDbTerm *find_next(DbTableTree *tb, DbTreeStack* stack, Eterm key) {
 	}
     }
     if (EMPTY_NODE(stack)) { /* Have to rebuild the stack */
-	if (( this = tb->root ) == NULL)
+	if (( this = root ) == NULL)
 	    return NULL;
 	for (;;) {
 	    PUSH_NODE(stack, this);
@@ -2539,7 +2932,7 @@ static TreeDbTerm *find_next(DbTableTree *tb, DbTreeStack* stack, Eterm key) {
 		    this = this->right;
 	    } else if (c < 0) {
 		if (this->left == NULL) /* Done */
-		    return this;
+                    goto found_next;
 		else
 		    this = this->left;
 	    } else
@@ -2554,8 +2947,6 @@ static TreeDbTerm *find_next(DbTableTree *tb, DbTreeStack* stack, Eterm key) {
 	    this = this->left;
 	    PUSH_NODE(stack, this);
 	}
-	if (stack->slot > 0) 
-	    ++(stack->slot);
     } else {
 	do {
 	    tmp = POP_NODE(stack);
@@ -2564,13 +2955,17 @@ static TreeDbTerm *find_next(DbTableTree *tb, DbTreeStack* stack, Eterm key) {
 		return NULL;
 	    }
 	} while (this->right == tmp);
-	if (stack->slot > 0) 
-	    ++(stack->slot);
     }
+
+found_next:
+    if (stack->slot > 0)
+        ++(stack->slot);
+
     return this;
 }
 
-static TreeDbTerm *find_prev(DbTableTree *tb, DbTreeStack* stack, Eterm key) {
+static TreeDbTerm *find_prev(DbTableCommon *tb, TreeDbTerm *root,
+                             DbTreeStack* stack, Eterm key) {
     TreeDbTerm *this;
     TreeDbTerm *tmp;
     Sint c;
@@ -2582,7 +2977,7 @@ static TreeDbTerm *find_prev(DbTableTree *tb, DbTreeStack* stack, Eterm key) {
 	}
     }
     if (EMPTY_NODE(stack)) { /* Have to rebuild the stack */
-	if (( this = tb->root ) == NULL)
+	if (( this = root ) == NULL)
 	    return NULL;
 	for (;;) {
 	    PUSH_NODE(stack, this);
@@ -2595,7 +2990,7 @@ static TreeDbTerm *find_prev(DbTableTree *tb, DbTreeStack* stack, Eterm key) {
 		    this = this->left;
 	    } else if (c > 0) {
 		if (this->right == NULL) /* Done */
-		    return this;
+                    goto found_prev;
 		else
 		    this = this->right;
 	    } else
@@ -2610,8 +3005,6 @@ static TreeDbTerm *find_prev(DbTableTree *tb, DbTreeStack* stack, Eterm key) {
 	    this = this->right;
 	    PUSH_NODE(stack, this);
 	}
-	if (stack->slot > 0) 
-	    --(stack->slot);
     } else {
 	do {
 	    tmp = POP_NODE(stack);
@@ -2620,74 +3013,112 @@ static TreeDbTerm *find_prev(DbTableTree *tb, DbTreeStack* stack, Eterm key) {
 		return NULL;
 	    }
 	} while (this->left == tmp);
-	if (stack->slot > 0) 
-	    --(stack->slot);
     }
+
+found_prev:
+    if (stack->slot > 0)
+        --(stack->slot);
+
     return this;
 }
 
-static TreeDbTerm *find_next_from_pb_key(DbTableTree *tb, DbTreeStack* stack,
-					 Eterm key)
+
+/* @brief Find object with smallest key of all larger than partially bound key.
+ * Can be used as a starting point for a reverse iteration with pb_key.
+ *
+ * @param pb_key The partially bound key. Example {42, '$1'}
+ * @param *rootpp Will return pointer to root pointer of tree with found object.
+ * @param iter Root iterator or NULL for plain DbTableTree.
+ * @param stack A stack to use. Will be cleared.
+ *
+ * @return found object or NULL if no such key exists.
+ */
+static TreeDbTerm *find_next_from_pb_key(DbTable *tbl,  TreeDbTerm*** rootpp,
+                                         DbTreeStack* stack, Eterm pb_key,
+                                         CATreeRootIterator* iter)
 {
+    TreeDbTerm* root;
     TreeDbTerm *this;
-    TreeDbTerm *tmp;
+    Uint candidate = 0;
     Sint c;
 
+    if (iter) {
+        *rootpp = catree_find_next_from_pb_key_root(pb_key, iter);
+        ASSERT(*rootpp);
+        root = **rootpp;
+    }
+    else {
+        *rootpp = &tbl->tree.root;
+        root = tbl->tree.root;
+    }
+
     /* spool the stack, we have to "re-search" */
     stack->pos = stack->slot = 0;
-    if (( this = tb->root ) == NULL)
+    if (( this = root ) == NULL)
 	return NULL;
     for (;;) {
 	PUSH_NODE(stack, this);
-	if (( c = cmp_partly_bound(key,GETKEY(tb, this->dbterm.tpl))) >= 0) {
+	if (( c = cmp_partly_bound(pb_key,GETKEY(tbl, this->dbterm.tpl))) >= 0) {
 	    if (this->right == NULL) {
-		do {
-		    tmp = POP_NODE(stack);
-		    if (( this = TOP_NODE(stack)) == NULL) {
-			return NULL;
-		    }
-		} while (this->right == tmp);
-		return this;
-	    } else
-		this = this->right;
+                stack->pos = candidate;
+                return TOP_NODE(stack);
+	    }
+            this = this->right;
 	} else /*if (c < 0)*/ {
 	    if (this->left == NULL) /* Done */
 		return this;
-	    else
-		this = this->left;
+            candidate = stack->pos;
+            this = this->left;
 	} 
     }
 }
 
-static TreeDbTerm *find_prev_from_pb_key(DbTableTree *tb, DbTreeStack* stack,
-					 Eterm key)
+/* @brief Find object with largest key of all smaller than partially bound key.
+ * Can be used as a starting point for a forward iteration with pb_key.
+ *
+ * @param pb_key The partially bound key. Example {42, '$1'}
+ * @param *rootpp Will return pointer to root pointer of found object.
+ * @param iter Root iterator or NULL for plain DbTableTree.
+ * @param stack A stack to use. Will be cleared.
+ *
+ * @return found object or NULL if no such key exists.
+ */
+static TreeDbTerm *find_prev_from_pb_key(DbTable *tbl, TreeDbTerm*** rootpp,
+                                         DbTreeStack* stack, Eterm pb_key,
+                                         CATreeRootIterator* iter)
 {
+    TreeDbTerm* root;
     TreeDbTerm *this;
-    TreeDbTerm *tmp;
+    Uint candidate = 0;
     Sint c;
 
+    if (iter) {
+        *rootpp = catree_find_prev_from_pb_key_root(pb_key, iter);
+        ASSERT(*rootpp);
+        root = **rootpp;
+    }
+    else {
+        *rootpp = &tbl->tree.root;
+        root = tbl->tree.root;
+    }
+
     /* spool the stack, we have to "re-search" */
     stack->pos = stack->slot = 0;
-    if (( this = tb->root ) == NULL)
+    if (( this = root ) == NULL)
 	return NULL;
     for (;;) {
 	PUSH_NODE(stack, this);
-	if (( c = cmp_partly_bound(key,GETKEY(tb, this->dbterm.tpl))) <= 0) {
+	if (( c = cmp_partly_bound(pb_key,GETKEY(tbl, this->dbterm.tpl))) <= 0) {
 	    if (this->left == NULL) {
-		do {
-		    tmp = POP_NODE(stack);
-		    if (( this = TOP_NODE(stack)) == NULL) {
-			return NULL;
-		    }
-		} while (this->left == tmp);
-		return this;
-	    } else
-		this = this->left;
-	} else /*if (c < 0)*/ {
+                stack->pos = candidate;
+                return TOP_NODE(stack);
+	    }
+            this = this->left;
+	} else /*if (c > 0)*/ {
 	    if (this->right == NULL) /* Done */
 		return this;
-	    else
-		this = this->right;
+            candidate = stack->pos;
+            this = this->right;
 	} 
     }
 }
@@ -2696,16 +3127,17 @@ static TreeDbTerm *find_prev_from_pb_key(DbTableTree *tb, DbTreeStack* stack,
 /*
  * Just lookup a node
  */
-static TreeDbTerm *find_node(DbTableTree *tb, Eterm key)
+static TreeDbTerm *find_node(DbTableCommon *tb, TreeDbTerm *root,
+                             Eterm key, DbTableTree *stack_container)
 {
     TreeDbTerm *this;
     Sint res;
-    DbTreeStack* stack = get_static_stack(tb);
+    DbTreeStack* stack = get_static_stack(stack_container);
 
     if(!stack || EMPTY_NODE(stack)
        || !cmp_key_eq(tb, key, (this=TOP_NODE(stack)))) {
 
-	this = tb->root;
+	this = root;
 	while (this != NULL && (res = cmp_key(tb,key,this)) != 0) {
 	    if (res < 0)
 		this = this->left;
@@ -2714,7 +3146,7 @@ static TreeDbTerm *find_node(DbTableTree *tb, Eterm key)
 	}
     }
     if (stack) {
-	release_stack(tb,stack);
+	release_stack((DbTable*)tb,stack_container,stack);
     }
     return this;
 }
@@ -2722,12 +3154,12 @@ static TreeDbTerm *find_node(DbTableTree *tb, Eterm key)
 /*
  * Lookup a node and return the address of the node pointer in the tree
  */
-static TreeDbTerm **find_node2(DbTableTree *tb, Eterm key)
+static TreeDbTerm **find_node2(DbTableCommon *tb, TreeDbTerm **root, Eterm key)
 {
     TreeDbTerm **this;
     Sint res;
 
-    this = &tb->root;
+    this = root;
     while ((*this) != NULL && (res = cmp_key(tb, key, *this)) != 0) {
 	if (res < 0)
 	    this = &((*this)->left);
@@ -2744,7 +3176,8 @@ static TreeDbTerm **find_node2(DbTableTree *tb, Eterm key)
  * Tries to reuse the existing stack for performance.
  */
 
-static TreeDbTerm **find_ptr(DbTableTree *tb, DbTreeStack *stack, TreeDbTerm *this) {
+static TreeDbTerm **find_ptr(DbTableCommon *tb, TreeDbTerm **root,
+                             DbTreeStack *stack, TreeDbTerm *this) {
     Eterm key = GETKEY(tb, this->dbterm.tpl);
     TreeDbTerm *tmp;
     TreeDbTerm *parent;
@@ -2757,7 +3190,7 @@ static TreeDbTerm **find_ptr(DbTableTree *tb, DbTreeStack *stack, TreeDbTerm *th
 	}
     }
     if (EMPTY_NODE(stack)) { /* Have to rebuild the stack */
-	if (( tmp = tb->root ) == NULL)
+	if (( tmp = *root ) == NULL)
 	    return NULL;
 	for (;;) {
 	    PUSH_NODE(stack, tmp);
@@ -2783,7 +3216,7 @@ static TreeDbTerm **find_ptr(DbTableTree *tb, DbTreeStack *stack, TreeDbTerm *th
 
     parent = TOPN_NODE(stack, 1);
     if (parent == NULL)
-        return ((this != tb->root) ? NULL : &(tb->root));
+        return ((this != *root) ? NULL : root);
     if (parent->left == this)
         return &(parent->left);
     if (parent->right == this)
@@ -2791,12 +3224,11 @@ static TreeDbTerm **find_ptr(DbTableTree *tb, DbTreeStack *stack, TreeDbTerm *th
     return NULL;
 }
 
-static int
-db_lookup_dbterm_tree(Process *p, DbTable *tbl, Eterm key, Eterm obj,
-                      DbUpdateHandle* handle)
+int db_lookup_dbterm_tree_common(Process *p, DbTable *tbl, TreeDbTerm **root,
+                                 Eterm key, Eterm obj, DbUpdateHandle* handle,
+                                 DbTableTree *stack_container)
 {
-    DbTableTree *tb = &tbl->tree;
-    TreeDbTerm **pp = find_node2(tb, key);
+    TreeDbTerm **pp = find_node2(&tbl->common, root, key);
     int flags = 0;
 
     if (pp == NULL) {
@@ -2807,18 +3239,19 @@ db_lookup_dbterm_tree(Process *p, DbTable *tbl, Eterm key, Eterm obj,
             int arity = arityval(*objp);
             Eterm *htop, *hend;
 
-            ASSERT(arity >= tb->common.keypos);
+            ASSERT(arity >= tbl->common.keypos);
             htop = HAlloc(p, arity + 1);
             hend = htop + arity + 1;
             sys_memcpy(htop, objp, sizeof(Eterm) * (arity + 1));
-            htop[tb->common.keypos] = key;
+            htop[tbl->common.keypos] = key;
             obj = make_tuple(htop);
 
-            if (db_put_tree(tbl, obj, 1) != DB_ERROR_NONE) {
+            if (db_put_tree_common(&tbl->common, root,
+                                   obj, 1, stack_container) != DB_ERROR_NONE) {
                 return 0;
             }
 
-            pp = find_node2(tb, key);
+            pp = find_node2(&tbl->common, root, key);
             ASSERT(pp != NULL);
             HRelease(p, hend, htop);
             flags |= DB_NEW_OBJECT;
@@ -2833,21 +3266,28 @@ db_lookup_dbterm_tree(Process *p, DbTable *tbl, Eterm key, Eterm obj,
     return 1;
 }
 
-static void
-db_finalize_dbterm_tree(int cret, DbUpdateHandle *handle)
+static int
+db_lookup_dbterm_tree(Process *p, DbTable *tbl, Eterm key, Eterm obj,
+                      DbUpdateHandle* handle)
 {
-    DbTable *tbl = handle->tb;
     DbTableTree *tb = &tbl->tree;
+    return db_lookup_dbterm_tree_common(p, tbl, &tb->root, key, obj, handle, tb);
+}
+
+void db_finalize_dbterm_tree_common(int cret, DbUpdateHandle *handle,
+                                    DbTableTree *stack_container)
+{
+    DbTable *tbl = handle->tb;
     TreeDbTerm *bp = (TreeDbTerm *) *handle->bp;
 
     if (handle->flags & DB_NEW_OBJECT && cret != DB_ERROR_NONE) {
         Eterm ret;
-        db_erase_tree(tbl, GETKEY(tb, bp->dbterm.tpl), &ret);
+        db_erase_tree(tbl, GETKEY(&tbl->common, bp->dbterm.tpl), &ret);
     } else if (handle->flags & DB_MUST_RESIZE) {
 	db_finalize_resize(handle, offsetof(TreeDbTerm,dbterm));
-        reset_static_stack(tb);
+        reset_static_stack(stack_container);
 
-        free_term(tb, bp);
+        free_term(tbl, bp);
     }
 #ifdef DEBUG
     handle->dbterm = 0;
@@ -2855,156 +3295,207 @@ db_finalize_dbterm_tree(int cret, DbUpdateHandle *handle)
     return;
 }   
 
+static void
+db_finalize_dbterm_tree(int cret, DbUpdateHandle *handle)
+{
+    DbTable *tbl = handle->tb;
+    DbTableTree *tb = &tbl->tree;
+    db_finalize_dbterm_tree_common(cret, handle, tb);
+}
+
 /*
  * Traverse the tree with a callback function, used by db_match_xxx
  */
-static void traverse_backwards(DbTableTree *tb,
+static void traverse_backwards(DbTableCommon *tb,
 			       DbTreeStack* stack,
 			       Eterm lastkey,
-			       int (*doit)(DbTableTree *,
-					   TreeDbTerm *,
-					   void *,
-					   int),
-			       void *context) 
+                               traverse_doit_funcT* doit,
+                               struct select_common *context,
+                               CATreeRootIterator* iter)
 {
     TreeDbTerm *this, *next;
+    TreeDbTerm** root = context->root;
 
     if (lastkey == THE_NON_VALUE) {
-	stack->pos = stack->slot = 0;
-	if (( this = tb->root ) == NULL) {
-	    return;
-	}
-	while (this != NULL) {
-	    PUSH_NODE(stack, this);
-	    this = this->right;
-	}
-	this = TOP_NODE(stack);
-	next = find_prev(tb, stack, GETKEY(tb, this->dbterm.tpl));
-	if (!((*doit)(tb, this, context, 0)))
-	    return;
+        if (iter) {
+            while (*root == NULL) {
+                root = catree_find_prev_root(iter, NULL);
+                if (!root)
+                    return;
+            }
+            context->root = root;
+        }
+        stack->pos = stack->slot = 0;
+        next = *root;
+        while (next != NULL) {
+            PUSH_NODE(stack, next);
+            next = next->right;
+        }
+        next = TOP_NODE(stack);
     } else {
-	next = find_prev(tb, stack, lastkey);
+        next = find_prev(tb, *root, stack, lastkey);
     }
 
-    while ((this = next) != NULL) {
-	next = find_prev(tb, stack, GETKEY(tb, this->dbterm.tpl));
-	if (!((*doit)(tb, this, context, 0)))
-	    return;
+    while (1) {
+        while (next) {
+            this = next;
+            lastkey = GETKEY(tb, this->dbterm.tpl);
+            next = find_prev(tb, *root, stack, lastkey);
+            if (!((*doit)(tb, this, context, 0)))
+                return;
+        }
+
+        if (!iter)
+            return;
+        ASSERT(is_value(lastkey));
+        root = catree_find_prev_root(iter, &lastkey);
+        if (!root)
+            return;
+        context->root = root;
+        stack->pos = stack->slot = 0;
+        next = find_prev(tb, *root, stack, lastkey);
     }
 }
 
 /*
  * Traverse the tree with a callback function, used by db_match_xxx
  */
-static void traverse_forward(DbTableTree *tb,
+static void traverse_forward(DbTableCommon *tb,
 			     DbTreeStack* stack,
 			     Eterm lastkey,
-			     int (*doit)(DbTableTree *,
-					 TreeDbTerm *,
-					 void *,
-					 int),
-			     void *context) 
+                             traverse_doit_funcT* doit,
+                             struct select_common *context,
+                             CATreeRootIterator* iter)
 {
     TreeDbTerm *this, *next;
+    TreeDbTerm **root = context->root;
 
     if (lastkey == THE_NON_VALUE) {
-	stack->pos = stack->slot = 0;
-	if (( this = tb->root ) == NULL) {
-	    return;
-	}
-	while (this != NULL) {
-	    PUSH_NODE(stack, this);
-	    this = this->left;
-	}
-	this = TOP_NODE(stack);
-	next = find_next(tb, stack, GETKEY(tb, this->dbterm.tpl));
-	if (!((*doit)(tb, this, context, 1)))
-	    return;
+        if (iter) {
+            while (*root == NULL) {
+                root = catree_find_next_root(iter, NULL);
+                if (!root)
+                    return;
+            }
+            context->root = root;
+        }
+        stack->pos = stack->slot = 0;
+        next = *root;
+        while (next != NULL) {
+            PUSH_NODE(stack, next);
+            next = next->left;
+        }
+        next = TOP_NODE(stack);
     } else {
-	next = find_next(tb, stack, lastkey);
+        next = find_next(tb, *root, stack, lastkey);
     }
 
-    while ((this = next) != NULL) {
-	next = find_next(tb, stack, GETKEY(tb, this->dbterm.tpl));
-	if (!((*doit)(tb, this, context, 1)))
-	    return;
+    while (1) {
+        while (next) {
+            this = next;
+            lastkey = GETKEY(tb, this->dbterm.tpl);
+            next = find_next(tb, *root, stack, lastkey);
+            if (!((*doit)(tb, this, context, 1)))
+                return;
+        }
+
+        if (!iter)
+            return;
+        ASSERT(is_value(lastkey));
+        root = catree_find_next_root(iter, &lastkey);
+        if (!root)
+            return;
+        context->root = root;
+        stack->pos = stack->slot = 0;
+        next = find_next(tb, *root, stack, lastkey);
     }
 }
 
 /*
  * Traverse the tree with an update callback function, used by db_select_replace
  */
-static void traverse_update_backwards(DbTableTree *tb,
+static void traverse_update_backwards(DbTableCommon *tb,
                                       DbTreeStack* stack,
                                       Eterm lastkey,
-                                      int (*doit)(DbTableTree*,
+                                      int (*doit)(DbTableCommon*,
                                                   TreeDbTerm**,
-                                                  void*,
+                                                  struct select_common*,
                                                   int),
-                                      void* context)
+                                      struct select_common* context,
+                                      CATreeRootIterator* iter)
 {
     int res;
     TreeDbTerm *this, *next, **this_ptr;
+    TreeDbTerm** root = context->root;
 
     if (lastkey == THE_NON_VALUE) {
-        stack->pos = stack->slot = 0;
-        if (( this = tb->root ) == NULL) {
-            return;
+        if (iter) {
+            while (*root == NULL) {
+                root = catree_find_prev_root(iter, NULL);
+                if (!root)
+                    return;
+                context->root = root;
+            }
         }
-        while (this != NULL) {
-            PUSH_NODE(stack, this);
-            this = this->right;
+        stack->pos = stack->slot = 0;
+        next = *root;
+        while (next) {
+            PUSH_NODE(stack, next);
+            next = next->right;
         }
-        this = TOP_NODE(stack);
-        this_ptr = find_ptr(tb, stack, this);
-        ASSERT(this_ptr != NULL);
-        res = (*doit)(tb, this_ptr, context, 0);
-        REPLACE_TOP_NODE(stack, *this_ptr);
-        next = find_prev(tb, stack, GETKEY(tb, (*this_ptr)->dbterm.tpl));
-        if (!res)
-            return;
-    } else {
-        next = find_prev(tb, stack, lastkey);
+        next = TOP_NODE(stack);
     }
+    else
+        next = find_prev(tb, *root, stack, lastkey);
+
+
+    while (1) {
+        while (next) {
+            this = next;
+            this_ptr = find_ptr(tb, root, stack, this);
+            ASSERT(this_ptr != NULL);
+            res = (*doit)(tb, this_ptr, context, 0);
+            this = *this_ptr;
+            REPLACE_TOP_NODE(stack, this);
+            if (!res)
+                return;
+            lastkey = GETKEY(tb, this->dbterm.tpl);
+            next = find_prev(tb, *root, stack, lastkey);
+        }
 
-    while ((this = next) != NULL) {
-        this_ptr = find_ptr(tb, stack, this);
-        ASSERT(this_ptr != NULL);
-        res = (*doit)(tb, this_ptr, context, 0);
-        REPLACE_TOP_NODE(stack, *this_ptr);
-        next = find_prev(tb, stack, GETKEY(tb, (*this_ptr)->dbterm.tpl));
-        if (!res)
+        if (!iter)
+            return;
+        ASSERT(is_value(lastkey));
+        root = catree_find_prev_root(iter, &lastkey);
+        if (!root)
             return;
+        context->root = root;
+        stack->pos = stack->slot = 0;
+        next = find_prev(tb, *root, stack, lastkey);
     }
 }
 
-/*
- * Returns 0 if not given 1 if given and -1 on no possible match
- * if key is given; *ret is set to point to the object concerned.
- */
-static int key_given(DbTableTree *tb, Eterm pattern, TreeDbTerm ***ret,
-		     Eterm *partly_bound)
+static enum ms_key_boundness key_boundness(DbTableCommon *tb,
+                                           Eterm pattern, Eterm *keyp)
 {
-    TreeDbTerm **this;
     Eterm key;
 
-    ASSERT(ret != NULL);
     if (pattern == am_Underscore || db_is_variable(pattern) != -1)
-	return 0;
-    key = db_getkey(tb->common.keypos, pattern);
+	return MS_KEY_UNBOUND;
+    key = db_getkey(tb->keypos, pattern);
     if (is_non_value(key))
-	return -1;  /* can't possibly match anything */
+	return MS_KEY_IMPOSSIBLE;  /* can't possibly match anything */
     if (!db_has_variable(key)) {   /* Bound key */
-	if (( this = find_node2(tb, key) ) == NULL) {
-	    return -1;
-	}
-	*ret = this;
-	return 1;
-    } else if (partly_bound != NULL && key != am_Underscore && 
-	       db_is_variable(key) < 0 && !db_has_map(key))
-	*partly_bound = key;
+        *keyp = key;
+	return MS_KEY_BOUND;
+    } else if (key != am_Underscore &&
+	       db_is_variable(key) < 0 && !db_has_map(key)) {
+
+	*keyp = key;
+        return MS_KEY_PARTIALLY_BOUND;
+    }
 	
-    return 0;
+    return MS_KEY_UNBOUND;
 }
 
 
@@ -3072,7 +3563,8 @@ static Sint do_cmp_partly_bound(Eterm a, Eterm b, int *done)
     }
 }
 
-static Sint cmp_partly_bound(Eterm partly_bound_key, Eterm bound_key) {
+Sint cmp_partly_bound(Eterm partly_bound_key, Eterm bound_key)
+{
     int done = 0;
     Sint ret = do_cmp_partly_bound(partly_bound_key, bound_key, &done);
 #ifdef HARDDEBUG
@@ -3118,7 +3610,7 @@ static int partly_bound_can_match_lesser(Eterm partly_bound_1,
     if (ret)
 	erts_fprintf(stderr," can match lesser than ");
     else
-	erts_fprintf(stderr," can not match lesser than ");
+	erts_fprintf(stderr," cannot match lesser than ");
     erts_fprintf(stderr,"%T\n",partly_bound_2);
 #endif
     return ret;
@@ -3136,7 +3628,7 @@ static int partly_bound_can_match_greater(Eterm partly_bound_1,
     if (ret)
 	erts_fprintf(stderr," can match greater than ");
     else
-	erts_fprintf(stderr," can not match greater than ");
+	erts_fprintf(stderr," cannot match greater than ");
     erts_fprintf(stderr,"%T\n",partly_bound_2);
 #endif
     return ret;
@@ -3288,7 +3780,8 @@ static int do_partly_bound_can_match_greater(Eterm a, Eterm b,
  * Callback functions for the different match functions
  */
 
-static int doit_select(DbTableTree *tb, TreeDbTerm *this, void *ptr,
+static int doit_select(DbTableCommon *tb, TreeDbTerm *this,
+                       struct select_common* ptr,
 		       int forward)
 {
     struct select_context *sc = (struct select_context *) ptr;
@@ -3306,24 +3799,18 @@ static int doit_select(DbTableTree *tb, TreeDbTerm *this, void *ptr,
 			   GETKEY_WITH_POS(sc->keypos, this->dbterm.tpl)) > 0))) {
 	return 0;
     }
-    ret = db_match_dbterm(&tb->common, sc->p, sc->mp, &this->dbterm, &hp, 2);
+    ret = db_match_dbterm(tb, sc->p,sc->mp, &this->dbterm, &hp, 2);
     if (is_value(ret)) {
 	sc->accum = CONS(hp, ret, sc->accum);
     }
-    if (MBUF(sc->p)) {
-	/*
-	 * Force a trap and GC if a heap fragment was created. Many heap fragments
-	 * make the GC slow.
-	 */
-	sc->max = 0;
-    }
     if (--(sc->max) <= 0) {
 	return 0;
     }
     return 1;
 }
 
-static int doit_select_count(DbTableTree *tb, TreeDbTerm *this, void *ptr,
+static int doit_select_count(DbTableCommon *tb, TreeDbTerm *this,
+                             struct select_common* ptr,
 			     int forward)
 {
     struct select_count_context *sc = (struct select_count_context *) ptr;
@@ -3337,7 +3824,7 @@ static int doit_select_count(DbTableTree *tb, TreeDbTerm *this, void *ptr,
 			  GETKEY_WITH_POS(sc->keypos, this->dbterm.tpl)) > 0)) {
 	return 0;
     }
-    ret = db_match_dbterm(&tb->common, sc->p, sc->mp, &this->dbterm, NULL, 0);
+    ret = db_match_dbterm(tb, sc->p, sc->mp, &this->dbterm, NULL, 0);
     if (ret == am_true) {
 	++(sc->got);
     }
@@ -3347,7 +3834,8 @@ static int doit_select_count(DbTableTree *tb, TreeDbTerm *this, void *ptr,
     return 1;
 }
 
-static int doit_select_chunk(DbTableTree *tb, TreeDbTerm *this, void *ptr,
+static int doit_select_chunk(DbTableCommon *tb, TreeDbTerm *this,
+                             struct select_common* ptr,
 			     int forward)
 {
     struct select_context *sc = (struct select_context *) ptr;
@@ -3366,18 +3854,11 @@ static int doit_select_chunk(DbTableTree *tb, TreeDbTerm *this, void *ptr,
 	return 0;
     }
 
-    ret = db_match_dbterm(&tb->common, sc->p, sc->mp, &this->dbterm, &hp, 2);
+    ret = db_match_dbterm(tb, sc->p, sc->mp, &this->dbterm, &hp, 2);
     if (is_value(ret)) {
 	++(sc->got);
 	sc->accum = CONS(hp, ret, sc->accum);
     }
-    if (MBUF(sc->p)) {
-	/*
-	 * Force a trap and GC if a heap fragment was created. Many heap fragments
-	 * make the GC slow.
-	 */
-	sc->max = 0;
-    }
     if (--(sc->max) <= 0 || sc->got == sc->chunk_size) {
 	return 0;
     }
@@ -3385,7 +3866,8 @@ static int doit_select_chunk(DbTableTree *tb, TreeDbTerm *this, void *ptr,
 }
 
 
-static int doit_select_delete(DbTableTree *tb, TreeDbTerm *this, void *ptr,
+static int doit_select_delete(DbTableCommon *tb, TreeDbTerm *this,
+                              struct select_common *ptr,
 			      int forward)
 {
     struct select_delete_context *sc = (struct select_delete_context *) ptr;
@@ -3393,7 +3875,7 @@ static int doit_select_delete(DbTableTree *tb, TreeDbTerm *this, void *ptr,
     Eterm key;
 
     if (sc->erase_lastterm)
-	free_term(tb, sc->lastterm);
+	free_term((DbTable*)tb, sc->lastterm);
     sc->erase_lastterm = 0;
     sc->lastterm = this;
     
@@ -3401,10 +3883,10 @@ static int doit_select_delete(DbTableTree *tb, TreeDbTerm *this, void *ptr,
 	cmp_partly_bound(sc->end_condition, 
 			 GETKEY_WITH_POS(sc->keypos, this->dbterm.tpl)) > 0)
 	return 0;
-    ret = db_match_dbterm(&tb->common, sc->p, sc->mp, &this->dbterm, NULL, 0);
+    ret = db_match_dbterm(tb, sc->p, sc->mp, &this->dbterm, NULL, 0);
     if (ret == am_true) {
 	key = GETKEY(sc->tb, this->dbterm.tpl);
-	linkout_tree(sc->tb, key);
+	linkout_tree(sc->tb, sc->common.root, key, sc->stack);
 	sc->erase_lastterm = 1;
 	++sc->accum;
     }
@@ -3414,7 +3896,8 @@ static int doit_select_delete(DbTableTree *tb, TreeDbTerm *this, void *ptr,
     return 1;
 }
 
-static int doit_select_replace(DbTableTree *tb, TreeDbTerm **this, void *ptr,
+static int doit_select_replace(DbTableCommon *tb, TreeDbTerm **this,
+                               struct select_common* ptr,
                                int forward)
 {
     struct select_replace_context *sc = (struct select_replace_context *) ptr;
@@ -3428,13 +3911,13 @@ static int doit_select_replace(DbTableTree *tb, TreeDbTerm **this, void *ptr,
 			  GETKEY_WITH_POS(sc->keypos, (*this)->dbterm.tpl)) > 0)) {
 	return 0;
     }
-    ret = db_match_dbterm(&tb->common, sc->p, sc->mp, &(*this)->dbterm, NULL, 0);
+    ret = db_match_dbterm(tb, sc->p, sc->mp, &(*this)->dbterm, NULL, 0);
 
     if (is_value(ret)) {
         TreeDbTerm* new;
         TreeDbTerm* old = *this;
 #ifdef DEBUG
-        Eterm key = db_getkey(tb->common.keypos, ret);
+        Eterm key = db_getkey(tb->keypos, ret);
         ASSERT(is_value(key));
         ASSERT(cmp_key(tb, key, old) == 0);
 #endif
@@ -3444,7 +3927,7 @@ static int doit_select_replace(DbTableTree *tb, TreeDbTerm **this, void *ptr,
         new->balance = old->balance;
         sc->lastobj = new->dbterm.tpl;
         *this = new;
-        free_term(tb, old);
+        free_term((DbTable*)tb, old);
         ++(sc->replaced);
     }
     if (--(sc->max) <= 0) {
@@ -3453,8 +3936,14 @@ static int doit_select_replace(DbTableTree *tb, TreeDbTerm **this, void *ptr,
     return 1;
 }
 
+void
+erts_db_foreach_thr_prgr_offheap_tree(void (*func)(ErlOffHeap *, void *),
+                                      void *arg)
+{
+}
+
 #ifdef TREE_DEBUG
-static void do_dump_tree2(DbTableTree* tb, int to, void *to_arg, int show,
+static void do_dump_tree2(DbTableCommon* tb, int to, void *to_arg, int show,
 			  TreeDbTerm *t, int offset)
 {
     if (t == NULL)
@@ -3463,7 +3952,7 @@ static void do_dump_tree2(DbTableTree* tb, int to, void *to_arg, int show,
     if (show) {
 	const char* prefix;
 	Eterm term;
-	if (tb->common.compress) {
+	if (tb->compress) {
 	    prefix = "key=";
 	    term = GETKEY(tb, t->dbterm.tpl);
 	}
@@ -3518,7 +4007,7 @@ static void check_slot_pos(DbTableTree *tb)
 		   "element position %d is really 0x%08X, when stack says "
 		   "it's 0x%08X\n", tb->stack.slot, t, 
 		   tb->stack.array[tb->stack.pos - 1]);
-	do_dump_tree2(tb, ERTS_PRINT_STDERR, NULL, 1, tb->root, 0);
+	do_dump_tree2(&tb->common, ERTS_PRINT_STDERR, NULL, 1, tb->root, 0);
     }
 }
 	
@@ -3533,14 +4022,14 @@ static void check_saved_stack(DbTableTree *tb)
      if (t != stack->array[0]) {
 	 erts_fprintf(stderr,"tb->stack[0] is 0x%08X, should be 0x%08X\n",
 		      stack->array[0], t);
-	 do_dump_tree2(tb, ERTS_PRINT_STDERR, NULL, 1, tb->root, 0);
+	 do_dump_tree2(&tb->common, ERTS_PRINT_STDERR, NULL, 1, tb->root, 0);
 	 return;
      }
      while (n < stack->pos) {
 	 if (t == NULL) {
 	     erts_fprintf(stderr, "NULL pointer in tree when stack not empty,"
 			" stack depth is %d\n", n);
-	     do_dump_tree2(tb, ERTS_PRINT_STDERR, NULL, 1, tb->root, 0);
+	     do_dump_tree2(&tb->common, ERTS_PRINT_STDERR, NULL, 1, tb->root, 0);
 	     return;
 	 }
 	 n++;
@@ -3554,7 +4043,7 @@ static void check_saved_stack(DbTableTree *tb)
 			    "represent child pointer in tree!"
 			    "(left == 0x%08X, right == 0x%08X\n", 
 			    n, tb->stack[n], t->left, t->right);
-		 do_dump_tree2(tb, ERTS_PRINT_STDERR, NULL, 1, tb->root, 0);
+		 do_dump_tree2(&tb->common, ERTS_PRINT_STDERR, NULL, 1, tb->root, 0);
 		 return;
 	     }
 	 }
@@ -3573,7 +4062,7 @@ static int check_table_tree(DbTableTree* tb, TreeDbTerm *t)
 	erts_fprintf(stderr,"balance = %d, left = 0x%08X, right = 0x%08X\n",
 		     t->balance, t->left, t->right);
 	erts_fprintf(stderr,"\nDump:\n---------------------------------\n");
-	do_dump_tree2(tb, ERTS_PRINT_STDERR, NULL, 1, t, 0);
+	do_dump_tree2(&tb->common, ERTS_PRINT_STDERR, NULL, 1, t, 0);
 	erts_fprintf(stderr,"\n---------------------------------\n");
     }
     return ((rh > lh) ? rh : lh) + 1;
diff --git a/erts/emulator/beam/erl_db_tree.h b/erts/emulator/beam/erl_db_tree.h
index 54da2a6bc1..06e0005801 100644
--- a/erts/emulator/beam/erl_db_tree.h
+++ b/erts/emulator/beam/erl_db_tree.h
@@ -53,4 +53,8 @@ void db_initialize_tree(void);
 
 int db_create_tree(Process *p, DbTable *tbl);
 
+void
+erts_db_foreach_thr_prgr_offheap_tree(void (*func)(ErlOffHeap *, void *),
+                                      void *arg);
+
 #endif /* _DB_TREE_H */
diff --git a/erts/emulator/beam/erl_db_tree_util.h b/erts/emulator/beam/erl_db_tree_util.h
new file mode 100644
index 0000000000..ba4a8f79e5
--- /dev/null
+++ b/erts/emulator/beam/erl_db_tree_util.h
@@ -0,0 +1,174 @@
+/*
+ * %CopyrightBegin%
+ * 
+ * Copyright Ericsson AB 1998-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%
+ */
+
+#ifndef _DB_TREE_UTIL_H
+#define _DB_TREE_UTIL_H
+
+/*
+** Internal functions and macros used by both the CA tree and the AVL tree
+*/
+
+
+#if defined(ARCH_32)
+/*
+** A stack of this size is enough for an AVL tree with more than
+** 0xFFFFFFFF elements. May be subject to change if
+** the datatype of the element counter is changed to a 64 bit integer.
+** The Maximal height of an AVL tree is calculated as:
+** h(n) <= 1.4404 * log(n + 2) - 0.328
+** Where n denotes the number of nodes, h(n) the height of the tree
+** with n nodes and log is the binary logarithm.
+*/
+#define STACK_NEED 50
+#elif defined(ARCH_64)
+/*
+** A stack of this size is enough for an AVL tree with more than
+** 2^61 elements. 
+** The Maximal height of an AVL tree is calculated as above.
+*/
+#define STACK_NEED 90
+#else
+#error "Unsported architecture"
+#endif
+
+
+
+#define PUSH_NODE(Dtt, Tdt)                     \
+    ((Dtt)->array[(Dtt)->pos++] = Tdt)
+
+#define POP_NODE(Dtt)			\
+     (((Dtt)->pos) ? 			\
+      (Dtt)->array[--((Dtt)->pos)] : NULL)
+
+#define TOP_NODE(Dtt)                   \
+     ((Dtt->pos) ? 			\
+      (Dtt)->array[(Dtt)->pos - 1] : NULL)
+
+#define EMPTY_NODE(Dtt) (TOP_NODE(Dtt) == NULL)
+
+#define DEC_NITEMS(DB)                                                  \
+    erts_flxctr_dec(&(DB)->common.counters, ERTS_DB_TABLE_NITEMS_COUNTER_ID)
+
+static ERTS_INLINE void free_term(DbTable *tb, TreeDbTerm* p)
+{
+    db_free_term(tb, p, offsetof(TreeDbTerm, dbterm));
+}
+
+/*
+** Some macros for "direction stacks"
+*/
+#define DIR_LEFT 0
+#define DIR_RIGHT 1
+#define DIR_END 2 
+
+static ERTS_INLINE Sint cmp_key(DbTableCommon* tb, Eterm key, TreeDbTerm* obj) {
+    return CMP(key, GETKEY(tb,obj->dbterm.tpl));
+}
+
+int tree_balance_left(TreeDbTerm **this);
+int tree_balance_right(TreeDbTerm **this);
+
+int db_first_tree_common(Process *p, DbTable *tbl, TreeDbTerm *root,
+                         Eterm *ret, DbTableTree *stack_container);
+int db_next_tree_common(Process *p, DbTable *tbl,
+                        TreeDbTerm *root, Eterm key,
+                        Eterm *ret, DbTreeStack* stack);
+int db_last_tree_common(Process *p, DbTable *tbl, TreeDbTerm *root,
+                        Eterm *ret, DbTableTree *stack_container);
+int db_prev_tree_common(Process *p, DbTable *tbl, TreeDbTerm *root, Eterm key,
+                        Eterm *ret, DbTreeStack* stack);
+int db_put_tree_common(DbTableCommon *tb, TreeDbTerm **root, Eterm obj,
+                       int key_clash_fail, DbTableTree *stack_container);
+int db_get_tree_common(Process *p, DbTableCommon *tb, TreeDbTerm *root, Eterm key,
+                       Eterm *ret, DbTableTree *stack_container);
+int db_get_element_tree_common(Process *p, DbTableCommon *tb, TreeDbTerm *root, Eterm key,
+                               int ndex, Eterm *ret, DbTableTree *stack_container);
+int db_member_tree_common(DbTableCommon *tb, TreeDbTerm *root, Eterm key, Eterm *ret,
+                          DbTableTree *stack_container);
+int db_erase_tree_common(DbTable *tbl, TreeDbTerm **root, Eterm key, Eterm *ret,
+                         DbTreeStack *stack /* NULL if no static stack */);
+int db_erase_object_tree_common(DbTable *tbl, TreeDbTerm **root, Eterm object,
+                                Eterm *ret, DbTableTree *stack_container);
+int db_slot_tree_common(Process *p, DbTable *tbl, TreeDbTerm *root,
+                        Eterm slot_term, Eterm *ret,
+                        DbTableTree *stack_container,
+                        CATreeRootIterator*);
+int db_select_chunk_tree_common(Process *p, DbTable *tb,
+                                Eterm tid, Eterm pattern, Sint chunk_size,
+                                int reverse, Eterm *ret,
+                                DbTableTree *stack_container,
+                                CATreeRootIterator*);
+int db_select_tree_common(Process *p, DbTable *tb,
+                          Eterm tid, Eterm pattern, int reverse, Eterm *ret,
+                          DbTableTree *stack_container,
+                          CATreeRootIterator*);
+int db_select_delete_tree_common(Process *p, DbTable *tbl,
+                                 Eterm tid, Eterm pattern,
+                                 Eterm *ret,
+                                 DbTreeStack* stack,
+                                 CATreeRootIterator* iter);
+int db_select_continue_tree_common(Process *p, 
+                                   DbTableCommon *tb,
+                                   Eterm continuation,
+                                   Eterm *ret,
+                                   DbTableTree *stack_container,
+                                   CATreeRootIterator* iter);
+int db_select_delete_continue_tree_common(Process *p, 
+                                          DbTable *tbl,
+                                          Eterm continuation,
+                                          Eterm *ret,
+                                          DbTreeStack* stack,
+                                          CATreeRootIterator* iter);
+int db_select_count_tree_common(Process *p, DbTable *tb,
+                                Eterm tid, Eterm pattern, Eterm *ret,
+                                DbTableTree *stack_container,
+                                CATreeRootIterator* iter);
+int db_select_count_continue_tree_common(Process *p,
+                                         DbTable *tb,
+                                         Eterm continuation,
+                                         Eterm *ret,
+                                         DbTableTree *stack_container,
+                                         CATreeRootIterator* iter);
+int db_select_replace_tree_common(Process *p, DbTable*,
+                                  Eterm tid, Eterm pattern, Eterm *ret,
+                                  DbTableTree *stack_container,
+                                  CATreeRootIterator* iter);
+int db_select_replace_continue_tree_common(Process *p,
+                                           DbTable*,
+                                           Eterm continuation,
+                                           Eterm *ret,
+                                           DbTableTree *stack_container,
+                                           CATreeRootIterator* iter);
+int db_take_tree_common(Process *p, DbTable *tbl, TreeDbTerm **root,
+                        Eterm key, Eterm *ret,
+                        DbTreeStack *stack /* NULL if no static stack */);
+void db_print_tree_common(fmtfn_t to, void *to_arg,
+                          int show, TreeDbTerm *root, DbTable *tbl);
+void db_foreach_offheap_tree_common(TreeDbTerm *root,
+                                    void (*func)(ErlOffHeap *, void *),
+                                    void * arg);
+int db_lookup_dbterm_tree_common(Process *p, DbTable *tbl, TreeDbTerm **root,
+                                 Eterm key, Eterm obj, DbUpdateHandle* handle,
+                                 DbTableTree *stack_container);
+void db_finalize_dbterm_tree_common(int cret, DbUpdateHandle *handle,
+                                    DbTableTree *stack_container);
+Sint cmp_partly_bound(Eterm partly_bound_key, Eterm bound_key);
+
+#endif /* _DB_TREE_UTIL_H */
diff --git a/erts/emulator/beam/erl_db_util.c b/erts/emulator/beam/erl_db_util.c
index f1d47326b4..1ea7074d21 100644
--- a/erts/emulator/beam/erl_db_util.c
+++ b/erts/emulator/beam/erl_db_util.c
@@ -497,6 +497,7 @@ static erts_atomic32_t trace_control_word;
 /* This needs to be here, before the bif table... */
 
 static Eterm db_set_trace_control_word_fake_1(BIF_ALIST_1);
+static Eterm db_length_1(BIF_ALIST_1);
 
 /*
 ** The table of callable bif's, i e guard bif's and 
@@ -603,7 +604,7 @@ static DMCGuardBif guard_tab[] =
     },
     {
 	am_length,
-	&length_1,
+	&db_length_1,
 	1,
 	DBIF_ALL
     },
@@ -971,6 +972,26 @@ BIF_RETTYPE db_set_trace_control_word_1(BIF_ALIST_1)
     BIF_RET(db_set_trace_control_word(BIF_P, BIF_ARG_1));
 }
 
+/*
+ * Implementation of length/1 for match specs (non-trapping).
+ */
+static Eterm db_length_1(BIF_ALIST_1)
+{
+    Eterm list;
+    Uint i;
+
+    list = BIF_ARG_1;
+    i = 0;
+    while (is_list(list)) {
+	i++;
+	list = CDR(list_val(list));
+    }
+    if (is_not_nil(list)) {
+	BIF_ERROR(BIF_P, BADARG);
+    }
+    BIF_RET(make_small(i));
+}
+
 static Eterm db_set_trace_control_word_fake_1(BIF_ALIST_1)
 {
     Process *p = BIF_P;
@@ -2470,7 +2491,7 @@ restart:
 	case matchProcessDump: {
 	    erts_dsprintf_buf_t *dsbufp = erts_create_tmp_dsbuf(0);
             ASSERT(c_p == self);
-	    print_process_info(ERTS_PRINT_DSBUF, (void *) dsbufp, c_p);
+	    print_process_info(ERTS_PRINT_DSBUF, (void *) dsbufp, c_p, ERTS_PROC_LOCK_MAIN);
 	    *esp++ = new_binary(build_proc, (byte *)dsbufp->str,
 				dsbufp->str_len);
 	    erts_destroy_tmp_dsbuf(dsbufp);
@@ -3118,9 +3139,7 @@ void* db_store_term_comp(DbTableCommon *tb, DbTerm* old, Uint offset, Eterm obj)
     Uint new_sz = offset + db_size_dbterm_comp(tb, obj);
     byte* basep;
     DbTerm* newp;
-#ifdef DEBUG
     byte* top;
-#endif
 
     ASSERT(tb->compress);
     if (old != 0) {
@@ -3142,11 +3161,8 @@ void* db_store_term_comp(DbTableCommon *tb, DbTerm* old, Uint offset, Eterm obj)
     }
 
     newp->size = size_object(obj);
-#ifdef DEBUG
-    top = 
-#endif
-	copy_to_comp(tb, obj, newp, new_sz);
-    ASSERT(top <= basep + new_sz);
+    top = copy_to_comp(tb, obj, newp, new_sz);
+    ASSERT(top <= basep + new_sz); (void)top;
 
     /* ToDo: Maybe realloc if ((basep+new_sz) - top) > WASTED_SPACE_LIMIT */
 
@@ -3296,7 +3312,7 @@ void db_cleanup_offheap_comp(DbTerm* obj)
 	default:
 	    ASSERT(is_external_header(u.hdr->thing_word));
 	    ASSERT(u.pb != &tmp);
-	    erts_deref_node_entry(u.ext->node);
+	    erts_deref_node_entry(u.ext->node, make_boxed(u.ep));
 	    break;
 	}
     }
diff --git a/erts/emulator/beam/erl_db_util.h b/erts/emulator/beam/erl_db_util.h
index 6ec3b4f98f..02d4dd6c9a 100644
--- a/erts/emulator/beam/erl_db_util.h
+++ b/erts/emulator/beam/erl_db_util.h
@@ -21,6 +21,7 @@
 #ifndef _DB_UTIL_H
 #define _DB_UTIL_H
 
+#include "erl_flxctr.h"
 #include "global.h"
 #include "erl_message.h"
 #include "erl_bif_unique.h"
@@ -89,9 +90,26 @@ typedef struct {
     void** bp;         /* {Hash|Tree}DbTerm** */
     Uint new_size;
     int flags;
-    void* lck;
+    union {
+        struct {
+            erts_rwmtx_t* lck;
+        } hash;
+        struct {
+            struct DbTableCATreeNode* base_node;
+            struct DbTableCATreeNode* parent;
+            int current_level;
+        } catree;
+    } u;
 } DbUpdateHandle;
 
+/* How safe are we from double-hits or missed objects
+ * when iterating without fixation?
+ */
+enum DbIterSafety {
+    ITER_UNSAFE,      /* Must fixate to be safe */
+    ITER_SAFE_LOCKED, /* Safe while table is locked, not between trap calls */
+    ITER_SAFE         /* No need to fixate at all */
+};
 
 typedef struct db_table_method
 {
@@ -141,48 +159,61 @@ typedef struct db_table_method
 			   Eterm pattern,
 			   Sint chunk_size,
 			   int reverse,
-			   Eterm* ret);
+			   Eterm* ret,
+                           enum DbIterSafety);
     int (*db_select)(Process* p, 
 		     DbTable* tb, /* [in out] */
                      Eterm tid,
 		     Eterm pattern,
 		     int reverse,
-		     Eterm* ret);
+		     Eterm* ret,
+                     enum DbIterSafety);
     int (*db_select_delete)(Process* p, 
 			    DbTable* tb, /* [in out] */
                             Eterm tid,
 			    Eterm pattern,
-			    Eterm* ret);
+			    Eterm* ret,
+                            enum DbIterSafety);
     int (*db_select_continue)(Process* p, 
 			      DbTable* tb, /* [in out] */
 			      Eterm continuation,
-			      Eterm* ret);
+			      Eterm* ret,
+                              enum DbIterSafety*);
     int (*db_select_delete_continue)(Process* p, 
 				     DbTable* tb, /* [in out] */
 				     Eterm continuation,
-				     Eterm* ret);
+				     Eterm* ret,
+                                     enum DbIterSafety*);
     int (*db_select_count)(Process* p, 
 			   DbTable* tb, /* [in out] */
                            Eterm tid,
 			   Eterm pattern, 
-			   Eterm* ret);
+			   Eterm* ret,
+                           enum DbIterSafety);
     int (*db_select_count_continue)(Process* p, 
 				    DbTable* tb, /* [in out] */ 
 				    Eterm continuation, 
-				    Eterm* ret);
+				    Eterm* ret,
+                                    enum DbIterSafety*);
     int (*db_select_replace)(Process* p,
             DbTable* tb, /* [in out] */
             Eterm tid,
             Eterm pattern,
-            Eterm* ret);
+            Eterm* ret,
+            enum DbIterSafety);
     int (*db_select_replace_continue)(Process* p,
             DbTable* tb, /* [in out] */
             Eterm continuation,
-            Eterm* ret);
+            Eterm* ret,
+            enum DbIterSafety*);
     int (*db_take)(Process *, DbTable *, Eterm, Eterm *);
 
-    SWord (*db_delete_all_objects)(Process* p, DbTable* db, SWord reds);
-
+    SWord (*db_delete_all_objects)(Process* p,
+                                   DbTable* db,
+                                   SWord reds,
+                                   Eterm* nitems_holder_wb);
+    Eterm (*db_delete_all_objects_get_nitems_from_holder)(Process* p,
+                                                          Eterm nitems_holder);
     int (*db_free_empty_table)(DbTable* db);
     SWord (*db_free_table_continue)(DbTable* db, SWord reds);
     
@@ -231,6 +262,9 @@ typedef struct {
     DbTable *prev;
 } DbTableList;
 
+#define ERTS_DB_TABLE_NITEMS_COUNTER_ID 0
+#define ERTS_DB_TABLE_MEM_COUNTER_ID 1
+
 /*
  * This structure contains data for all different types of database
  * tables. Note that these fields must match the same fields
@@ -255,8 +289,11 @@ typedef struct db_table_common {
     Eterm the_name;           /* an atom */
     Binary *btid;
     DbTableMethod* meth;      /* table methods */
-    erts_atomic_t nitems; /* Total number of items in table */
-    erts_atomic_t memory_size;/* Total memory size. NOTE: in bytes! */
+    /* The ErtsFlxCtr below contains:
+     * - Total number of items in table
+     * - Total memory size (NOTE: in bytes!) */
+    ErtsFlxCtr counters;
+    char extra_for_flxctr[ERTS_FLXCTR_NR_OF_EXTRA_BYTES(2)];
     struct {                  /* Last fixation time */
 	ErtsMonotonicTime monotonic;
 	ErtsMonotonicTime offset;
@@ -274,23 +311,29 @@ typedef struct db_table_common {
 } DbTableCommon;
 
 /* These are status bit patterns */
-#define DB_PRIVATE       (1 << 0)
-#define DB_PROTECTED     (1 << 1)
-#define DB_PUBLIC        (1 << 2)
-#define DB_DELETE        (1 << 3) /* table is being deleted */
-#define DB_SET           (1 << 4)
-#define DB_BAG           (1 << 5)
-#define DB_DUPLICATE_BAG (1 << 6)
-#define DB_ORDERED_SET   (1 << 7)
-#define DB_FINE_LOCKED   (1 << 8) /* write_concurrency */
-#define DB_FREQ_READ     (1 << 9) /* read_concurrency */
-#define DB_NAMED_TABLE   (1 << 10)
-#define DB_BUSY          (1 << 11)
+#define DB_PRIVATE        (1 << 0)
+#define DB_PROTECTED      (1 << 1)
+#define DB_PUBLIC         (1 << 2)
+#define DB_DELETE         (1 << 3) /* table is being deleted */
+#define DB_SET            (1 << 4)
+#define DB_BAG            (1 << 5)
+#define DB_DUPLICATE_BAG  (1 << 6)
+#define DB_ORDERED_SET    (1 << 7)
+#define DB_CA_ORDERED_SET (1 << 8)
+#define DB_FINE_LOCKED    (1 << 9)  /* write_concurrency */
+#define DB_FREQ_READ      (1 << 10) /* read_concurrency */
+#define DB_NAMED_TABLE    (1 << 11)
+#define DB_BUSY           (1 << 12)
+
+#define DB_CATREE_FORCE_SPLIT (1 << 31)  /* erts_debug */
+#define DB_CATREE_DEBUG_RANDOM_SPLIT_JOIN (1 << 30)  /* erts_debug */
 
 #define IS_HASH_TABLE(Status) (!!((Status) & \
 				  (DB_BAG | DB_SET | DB_DUPLICATE_BAG)))
 #define IS_TREE_TABLE(Status) (!!((Status) & \
 				  DB_ORDERED_SET))
+#define IS_CATREE_TABLE(Status) (!!((Status) & \
+                                    DB_CA_ORDERED_SET))
 #define NFIXED(T) (erts_refc_read(&(T)->common.fix_count,0))
 #define IS_FIXED(T) (NFIXED(T) != 0) 
 
diff --git a/erts/emulator/beam/erl_dirty_bif.tab b/erts/emulator/beam/erl_dirty_bif.tab
index 20299ff604..656acfebdb 100644
--- a/erts/emulator/beam/erl_dirty_bif.tab
+++ b/erts/emulator/beam/erl_dirty_bif.tab
@@ -57,9 +57,6 @@ dirty-cpu erts_debug:lcnt_clear/0
 #  and debug purposes only. We really do *not* want to execute these
 #  on dirty schedulers on a real system.
 
-dirty-cpu-test erlang:'++'/2
-dirty-cpu-test erlang:append/2
-dirty-cpu-test erlang:iolist_size/1
 dirty-cpu-test erlang:make_tuple/2
 dirty-cpu-test erlang:make_tuple/3
 dirty-cpu-test erlang:append_element/2
diff --git a/erts/emulator/beam/erl_drv_nif.h b/erts/emulator/beam/erl_drv_nif.h
index 31b4817fb1..a5ecbfff06 100644
--- a/erts/emulator/beam/erl_drv_nif.h
+++ b/erts/emulator/beam/erl_drv_nif.h
@@ -53,7 +53,9 @@ typedef enum {
 enum ErlNifSelectFlags {
     ERL_NIF_SELECT_READ      = (1 << 0),
     ERL_NIF_SELECT_WRITE     = (1 << 1),
-    ERL_NIF_SELECT_STOP      = (1 << 2)
+    ERL_NIF_SELECT_STOP      = (1 << 2),
+    ERL_NIF_SELECT_CANCEL    = (1 << 3),
+    ERL_NIF_SELECT_CUSTOM_MSG= (1 << 4)
 };
 
 /*
diff --git a/erts/emulator/beam/erl_flxctr.c b/erts/emulator/beam/erl_flxctr.c
new file mode 100644
index 0000000000..35f4a21508
--- /dev/null
+++ b/erts/emulator/beam/erl_flxctr.c
@@ -0,0 +1,370 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2019. 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%
+ */
+
+/*
+ * Author: Kjell Winblad
+ */
+
+#include "erl_flxctr.h"
+
+static int reader_groups_array_size = 0;
+#define ERTS_FLXCTR_DECENTRALIZED_NO_SLOTS (reader_groups_array_size)
+
+static int erts_flxctr_read_ctx_bin_dtor(Binary *context_bin);
+static int erts_flxctr_wait_dtor(Binary *context_bin);
+
+typedef struct {
+    ErtsThrPrgrLaterOp later_op;
+    Process* process;
+    ErtsFlxCtrDecentralizedCtrArray* array;
+    ErtsFlxCtrDecentralizedCtrArray* next_array;
+    ErtsAlcType_t alloc_type;
+    int nr_of_counters;
+    Sint result[ERTS_FLXCTR_ATOMICS_PER_CACHE_LINE];
+} DecentralizedReadSnapshotInfo;
+
+typedef enum {
+    ERTS_FLXCTR_SNAPSHOT_NOT_ONGOING = 0,
+    ERTS_FLXCTR_SNAPSHOT_ONGOING = 1,
+    ERTS_FLXCTR_SNAPSHOT_ONGOING_TP_THREAD_DO_FREE = 2
+} erts_flxctr_snapshot_status;
+
+static void
+thr_prg_wake_up_and_count(void* bin_p)
+{
+    Binary* bin = bin_p;
+    DecentralizedReadSnapshotInfo* info = ERTS_MAGIC_BIN_DATA(bin);
+    Process* p = info->process;
+    ErtsFlxCtrDecentralizedCtrArray* array = info->array;
+    ErtsFlxCtrDecentralizedCtrArray* next = info->next_array;
+    int i, sched;
+    /* Reset result array */
+    for (i = 0; i < info->nr_of_counters; i++) {
+        info->result[i] = 0;
+    }
+    /* Read result from snapshot */
+    for (sched = 0; sched < ERTS_FLXCTR_DECENTRALIZED_NO_SLOTS; sched++) {
+        for (i = 0; i < info->nr_of_counters; i++) {
+            info->result[i] = info->result[i] +
+                erts_atomic_read_nob(&array->array[sched].counters[i]);
+        }
+    }
+    /* Update the next decentralized counter array */
+    for (i = 0; i < info->nr_of_counters; i++) {
+        erts_atomic_add_nob(&next->array[0].counters[i], info->result[i]);
+    }
+    /* Announce that the snapshot is done */
+    {
+    Sint expected = ERTS_FLXCTR_SNAPSHOT_ONGOING;
+    if (expected != erts_atomic_cmpxchg_mb(&next->snapshot_status,
+                                           ERTS_FLXCTR_SNAPSHOT_NOT_ONGOING,
+                                           expected)) {
+        /* The CAS failed which means that this thread need to free the next array. */
+        erts_free(info->alloc_type, next->block_start);
+    }
+    }
+    /* Resume the process that requested the snapshot */
+    erts_proc_lock(p, ERTS_PROC_LOCK_STATUS);
+    if (!ERTS_PROC_IS_EXITING(p)) {
+        erts_resume(p, ERTS_PROC_LOCK_STATUS);
+    }
+    /* Free the memory that is no longer needed */
+    erts_free(info->alloc_type, array->block_start);
+    erts_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
+    erts_proc_dec_refc(p);
+    erts_bin_release(bin);
+}
+
+typedef struct {
+    ErtsThrPrgrLaterOp later_op;
+    Process* process;
+} ErtsFlxCtrWakeUpLaterInfo;
+
+static void
+thr_prg_wake_up_later(void* bin_p)
+{
+    Binary* bin = bin_p;
+    ErtsFlxCtrWakeUpLaterInfo* info = ERTS_MAGIC_BIN_DATA(bin);
+    Process* p = info->process;
+    /* Resume the requesting process */
+    erts_proc_lock(p, ERTS_PROC_LOCK_STATUS);
+    if (!ERTS_PROC_IS_EXITING(p)) {
+        erts_resume(p, ERTS_PROC_LOCK_STATUS);
+    }
+    erts_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
+    /* Free data */
+    erts_proc_dec_refc(p);
+    erts_bin_release(bin);
+}
+
+static
+int erts_flxctr_read_ctx_bin_dtor(Binary *context_bin) {
+    (void)context_bin;
+    return 1;
+}
+
+static
+int erts_flxctr_wait_dtor(Binary *context_bin) {
+    (void)context_bin;
+    return 1;
+}
+
+static void suspend_until_thr_prg(Process* p)
+{
+    Binary* state_bin;
+    ErtsFlxCtrWakeUpLaterInfo* info;
+    state_bin = erts_create_magic_binary(sizeof(ErtsFlxCtrWakeUpLaterInfo),
+                                         erts_flxctr_wait_dtor);
+    info = ERTS_MAGIC_BIN_DATA(state_bin);
+    info->process = p;
+    erts_refc_inctest(&state_bin->intern.refc, 1);
+    erts_suspend(p, ERTS_PROC_LOCK_MAIN, NULL);
+    erts_proc_inc_refc(p);
+    ERTS_VBUMP_ALL_REDS(p);
+    erts_schedule_thr_prgr_later_op(thr_prg_wake_up_later, state_bin, &info->later_op);
+}
+
+
+static ErtsFlxCtrDecentralizedCtrArray*
+create_decentralized_ctr_array(ErtsAlcType_t alloc_type, Uint nr_of_counters) {
+    /* Allocate an ErtsFlxCtrDecentralizedCtrArray and make sure that
+       the array field is located at the start of a cache line */
+    char* bytes =
+        erts_alloc(alloc_type,
+                   sizeof(ErtsFlxCtrDecentralizedCtrArray) +
+                   (sizeof(ErtsFlxCtrDecentralizedCtrArrayElem) *
+                    ERTS_FLXCTR_DECENTRALIZED_NO_SLOTS) +
+                   ERTS_CACHE_LINE_SIZE);
+    void* block_start = bytes;
+    int bytes_to_next_cacheline_border;
+    ErtsFlxCtrDecentralizedCtrArray* array;
+    int i, sched;
+    bytes = &bytes[offsetof(ErtsFlxCtrDecentralizedCtrArray, array)];
+    bytes_to_next_cacheline_border =
+        ERTS_CACHE_LINE_SIZE - (((Uint)bytes) % ERTS_CACHE_LINE_SIZE);
+    array = (ErtsFlxCtrDecentralizedCtrArray*)
+        (&bytes[bytes_to_next_cacheline_border -
+                (int)offsetof(ErtsFlxCtrDecentralizedCtrArray, array)]);
+    ASSERT(((Uint)array->array) % ERTS_CACHE_LINE_SIZE == 0);
+    ASSERT(((Uint)array - (Uint)block_start) <= ERTS_CACHE_LINE_SIZE);
+    /* Initialize fields */
+    erts_atomic_init_nob(&array->snapshot_status, ERTS_FLXCTR_SNAPSHOT_ONGOING);
+    for (sched = 0; sched < ERTS_FLXCTR_DECENTRALIZED_NO_SLOTS; sched++) {
+        for (i = 0; i < nr_of_counters; i++) {
+            erts_atomic_init_nob(&array->array[sched].counters[i], 0);
+        }
+    }
+    array->block_start = block_start;
+    return array;
+}
+
+void erts_flxctr_setup(int decentralized_counter_groups)
+{
+    reader_groups_array_size = decentralized_counter_groups+1;
+}
+
+void erts_flxctr_init(ErtsFlxCtr* c,
+                      int is_decentralized,
+                      Uint nr_of_counters,
+                      ErtsAlcType_t alloc_type)
+{
+    ASSERT(nr_of_counters <= ERTS_FLXCTR_ATOMICS_PER_CACHE_LINE);
+    c->is_decentralized = is_decentralized;
+    c->nr_of_counters = nr_of_counters;
+    if (c->is_decentralized) {
+        ErtsFlxCtrDecentralizedCtrArray* array =
+            create_decentralized_ctr_array(alloc_type, nr_of_counters);
+        erts_atomic_set_nob(&array->snapshot_status,
+                            ERTS_FLXCTR_SNAPSHOT_NOT_ONGOING);
+        erts_atomic_init_nob(&c->u.counters_ptr, (Sint)array);
+        ASSERT(((Uint)array->array) % ERTS_CACHE_LINE_SIZE == 0);
+    } else {
+        int i;
+        for (i = 0; i < nr_of_counters; i++) {
+            erts_atomic_init_nob(&c->u.counters[i], 0);
+        }
+    }
+}
+
+void erts_flxctr_destroy(ErtsFlxCtr* c, ErtsAlcType_t type)
+{
+    if (c->is_decentralized) {
+        if (erts_flxctr_is_snapshot_ongoing(c)) {
+            ErtsFlxCtrDecentralizedCtrArray* array =
+                ERTS_FLXCTR_GET_CTR_ARRAY_PTR(c);
+            /* Try to delegate the resposibilty of freeing to
+               thr_prg_wake_up_and_count */
+            Sint expected = ERTS_FLXCTR_SNAPSHOT_ONGOING;
+            if (expected !=
+                erts_atomic_cmpxchg_mb(&array->snapshot_status,
+                                       ERTS_FLXCTR_SNAPSHOT_ONGOING_TP_THREAD_DO_FREE,
+                                       expected)) {
+                /* The delegation was unsuccessful which means that no
+                   snapshot is ongoing anymore and the freeing needs
+                   to be done here */
+                ERTS_ASSERT(!erts_flxctr_is_snapshot_ongoing(c));
+                erts_free(type, array->block_start);
+            }
+        } else {
+            erts_free(type, ERTS_FLXCTR_GET_CTR_ARRAY_PTR(c)->block_start);
+        }
+    }
+}
+
+ErtsFlxCtrSnapshotResult
+erts_flxctr_snapshot(ErtsFlxCtr* c,
+                     ErtsAlcType_t alloc_type,
+                     Process* p)
+{
+    if (c->is_decentralized) {
+        ErtsFlxCtrDecentralizedCtrArray* array = ERTS_FLXCTR_GET_CTR_ARRAY_PTR(c);
+        if (erts_flxctr_is_snapshot_ongoing(c)) {
+            /* Let the caller try again later */
+            ErtsFlxCtrSnapshotResult res =
+                {.type = ERTS_FLXCTR_TRY_AGAIN_AFTER_TRAP};
+            suspend_until_thr_prg(p);
+            return res;
+        } else {
+            Eterm* hp;
+            Binary* state_bin;
+            Eterm state_mref;
+            DecentralizedReadSnapshotInfo* info;
+            ErtsFlxCtrDecentralizedCtrArray* new_array =
+                create_decentralized_ctr_array(alloc_type, c->nr_of_counters);
+            int success =
+                ((Sint)array) == erts_atomic_cmpxchg_mb(&c->u.counters_ptr,
+                                                        (Sint)new_array,
+                                                        (Sint)array);
+            if (!success) {
+                /* Let the caller try again later */
+                ErtsFlxCtrSnapshotResult res =
+                    {.type = ERTS_FLXCTR_TRY_AGAIN_AFTER_TRAP};
+                suspend_until_thr_prg(p);
+                erts_free(alloc_type, new_array->block_start);
+                return res;
+            }
+            /* Create binary with info about the operation that can be
+               sent to the caller and to a thread progress function */
+            state_bin =
+                erts_create_magic_binary(sizeof(DecentralizedReadSnapshotInfo),
+                                         erts_flxctr_read_ctx_bin_dtor);
+            hp = HAlloc(p, ERTS_MAGIC_REF_THING_SIZE);
+            state_mref = erts_mk_magic_ref(&hp, &MSO(p), state_bin);
+            info = ERTS_MAGIC_BIN_DATA(state_bin);
+            info->alloc_type = alloc_type;
+            info->array = array;
+            info->next_array = new_array;
+            info->process = p;
+            info->nr_of_counters = c->nr_of_counters;
+            erts_proc_inc_refc(p);
+            erts_refc_inctest(&state_bin->intern.refc, 2);
+            erts_suspend(p, ERTS_PROC_LOCK_MAIN, NULL);
+            ERTS_VBUMP_ALL_REDS(p);
+            erts_schedule_thr_prgr_later_op(thr_prg_wake_up_and_count,
+                                            state_bin,
+                                            &info->later_op);
+            {
+                ErtsFlxCtrSnapshotResult res = {
+                    .type = ERTS_FLXCTR_GET_RESULT_AFTER_TRAP,
+                    .trap_resume_state = state_mref};
+                return res;
+            }
+        }
+    } else {
+        ErtsFlxCtrSnapshotResult res;
+        int i;
+        res.type = ERTS_FLXCTR_DONE;
+        for (i = 0; i < c->nr_of_counters; i++){
+            res.result[i] = erts_flxctr_read_centralized(c, i);
+        }
+        return res;
+    }
+}
+
+
+Sint erts_flxctr_get_snapshot_result_after_trap(Eterm result_holder,
+                                            Uint counter_nr)
+{
+    Binary* bin = erts_magic_ref2bin(result_holder);
+    DecentralizedReadSnapshotInfo* data = ERTS_MAGIC_BIN_DATA(bin);;
+    return data->result[counter_nr];
+}
+
+int erts_flxctr_is_snapshot_result(Eterm term)
+{
+    if (is_internal_magic_ref(term)) {
+        Binary* bin = erts_magic_ref2bin(term);
+        return ERTS_MAGIC_BIN_DESTRUCTOR(bin) ==  erts_flxctr_read_ctx_bin_dtor;
+    } else return 0;
+}
+
+Sint erts_flxctr_read_approx(ErtsFlxCtr* c,
+                             Uint counter_nr)
+{
+    if (c->is_decentralized) {
+        ErtsFlxCtrDecentralizedCtrArray* counter = ERTS_FLXCTR_GET_CTR_ARRAY_PTR(c);
+        Sint sum = 0;
+        int sched;
+        for (sched = 0; sched < ERTS_FLXCTR_DECENTRALIZED_NO_SLOTS; sched++) {
+            sum = sum + erts_atomic_read_nob(&counter->array[sched].counters[counter_nr]);
+        }
+        return sum;
+    } else {
+        return erts_flxctr_read_centralized(c, counter_nr);
+    }
+}
+
+int erts_flxctr_is_snapshot_ongoing(ErtsFlxCtr* c)
+{
+    return c->is_decentralized &&
+        (ERTS_FLXCTR_SNAPSHOT_NOT_ONGOING !=
+         erts_atomic_read_acqb(&ERTS_FLXCTR_GET_CTR_ARRAY_PTR(c)->snapshot_status));
+}
+
+int erts_flxctr_suspend_until_thr_prg_if_snapshot_ongoing(ErtsFlxCtr* c, Process* p)
+{
+    if (erts_flxctr_is_snapshot_ongoing(c)) {
+        suspend_until_thr_prg(p);
+        return 1;
+    } else {
+        return 0;
+    }
+}
+
+void erts_flxctr_reset(ErtsFlxCtr* c,
+                       Uint counter_nr)
+{
+    if (c->is_decentralized) {
+        int sched;
+        ErtsFlxCtrDecentralizedCtrArray* counter =
+            ERTS_FLXCTR_GET_CTR_ARRAY_PTR(c);
+        for (sched = 0; sched < ERTS_FLXCTR_DECENTRALIZED_NO_SLOTS; sched++) {
+            erts_atomic_set_nob(&counter->array[sched].counters[counter_nr], 0);
+        }
+    } else {
+        erts_atomic_set_nob(&c->u.counters[counter_nr], 0);
+    }
+}
+
+
+void erts_flxctr_set_slot(int group) {
+    ErtsSchedulerData *esdp = erts_get_scheduler_data();
+    esdp->flxctr_slot_no = group;
+}
diff --git a/erts/emulator/beam/erl_flxctr.h b/erts/emulator/beam/erl_flxctr.h
new file mode 100644
index 0000000000..5cab02b9eb
--- /dev/null
+++ b/erts/emulator/beam/erl_flxctr.h
@@ -0,0 +1,406 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2019. 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 erl_flxctr.h
+ *
+ * @brief This file contains the API of a flexible counter. The
+ * counter can be configured during its initialization to be
+ * centralized or decentralized. The centralized configuration makes
+ * it possible to read the counter value extremely efficiently, but
+ * updates of the counter value can easily cause contention. The
+ * decentralized configuration has the reverse trade-off (i.e.,
+ * updates are efficient and scalable but reading the counter value is
+ * slow and may cause contention).
+ *
+ * @author Kjell Winblad
+ */
+
+#ifndef ERL_FLXCTR_H__
+#define ERL_FLXCTR_H__
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+#include "sys.h"
+#include "erl_vm.h"
+#include "global.h"
+#include "error.h"
+#include "bif.h"
+#include "big.h"
+#include "erl_binary.h"
+#include "bif.h"
+#include <stddef.h>
+
+/* Public Interface */
+
+#define ERTS_MAX_FLXCTR_GROUPS 256
+#define ERTS_FLXCTR_ATOMICS_PER_CACHE_LINE (ERTS_CACHE_LINE_SIZE / sizeof(erts_atomic_t))
+
+typedef struct {
+    int nr_of_counters;
+    int is_decentralized;
+    union {
+        erts_atomic_t counters_ptr;
+        erts_atomic_t counters[1];
+    } u;
+} ErtsFlxCtr;
+
+#define ERTS_FLXCTR_NR_OF_EXTRA_BYTES(NR_OF_COUNTERS)   \
+    ((NR_OF_COUNTERS-1) * sizeof(erts_atomic_t))
+
+/* Called by early_init */
+void erts_flxctr_setup(int decentralized_counter_groups);
+
+/**
+ * @brief Initializes an ErtsFlxCtr. The macro
+ * ERTS_FLXCTR_NR_OF_EXTRA_BYTES should be used to determine how much
+ * extra space that needs to be allocated directly after the
+ * ErtsFlxCtr when is_decentralized is set to zero.  Each ErtsFlxCtr
+ * instance may contain up to ERTS_FLXCTR_ATOMICS_PER_CACHE_LINE
+ * counters. These counters are numbered from zero to
+ * (ERTS_FLXCTR_ATOMICS_PER_CACHE_LINE-1). Most of the functions in
+ * this module take a parameter named counter_nr that controls which
+ * of the ERTS_FLXCTR_ATOMICS_PER_CACHE_LINE counters in the given
+ * ErtsFlxCtr that should be operated on.
+ *
+ * @param c The counter to initialize
+ * @param is_decentralized Non-zero value to make c decentralized
+ * @param nr_of_counters The number of counters included in c
+ *                       (max ERTS_FLXCTR_ATOMICS_PER_CACHE_LINE)
+ * @param alloc_type 
+ */
+void erts_flxctr_init(ErtsFlxCtr* c,
+                      int is_decentralized,
+                      Uint nr_of_counters,
+                      ErtsAlcType_t alloc_type);
+
+/**
+ * @brief Destroys an initialized counter.
+ *
+ * @param c The counter that should be destroyed
+ * @param alloc_type The allocation type (needs to be the same as the
+ *                   one passed to erts_flxctr_init when c was
+ *                   initialized)
+ */
+void erts_flxctr_destroy(ErtsFlxCtr* c, ErtsAlcType_t alloc_type);
+
+/**
+ * @brief Adds to_add to the counter with counter_nr in c
+ *
+ * @param c the ErtsFlxCtr to operate on
+ * @param counter_nr The number of the counter in c to modify
+ * @param to_add The amount that should be added to the specified counter
+ */
+ERTS_GLB_INLINE
+void erts_flxctr_add(ErtsFlxCtr* c,
+                     Uint counter_nr,
+                     int to_add);
+
+/**
+ * @brief Increases the specified counter by 1
+ *
+ * @param c The ErtsFlxCtr instance to operate on
+ * @param counter_nr The number of the counter within c to operate on
+ */
+ERTS_GLB_INLINE
+void erts_flxctr_inc(ErtsFlxCtr* c,
+                     Uint counter_nr);
+
+/**
+ * @brief Decreases the specified counter by 1
+ */
+ERTS_GLB_INLINE
+void erts_flxctr_dec(ErtsFlxCtr* c,
+                     Uint counter_nr);
+
+/**
+ * @brief This function tries to return the current value of the
+ * specified counter but may return an incorrect result if the counter
+ * is decentralized and other threads are accessing the counter
+ * concurrently.
+ *
+ * @param c The ErtsFlxCtr instance to operate on
+ * @param counter_nr The number of the counter within c to operate on
+ *
+ * @return A snapshot of the specifed counter if c is centralized or a
+ *         possibly incorrect estimate of the counter value if c is
+ *         decentralized
+ */
+Sint erts_flxctr_read_approx(ErtsFlxCtr* c,
+                             Uint counter_nr);
+
+/**
+ * @brief This function can only be used together with an ErtsFlxCtr
+ * that is configured to be centralized. The function increments the
+ * specified counter by 1 and returns the value of the counter after
+ * the increment.
+ */
+ERTS_GLB_INLINE
+Sint erts_flxctr_inc_read_centralized(ErtsFlxCtr* c,
+                                      Uint counter_nr);
+
+/**
+ * @brief This function can only be used together with a ErtsFlxCtr
+ * that is configured to be centralized. The function decrements the
+ * specified counter by 1 and returns the value of the counter after
+ * the operation.
+ */
+ERTS_GLB_INLINE
+Sint erts_flxctr_dec_read_centralized(ErtsFlxCtr* c,
+                                      Uint counter_nr);
+
+/**
+ * @brief This function can only be used together with an ErtsFlxCtr
+ * that is configured to be centralized. The function returns the
+ * current value of the specified counter.
+ */
+ERTS_GLB_INLINE
+Sint erts_flxctr_read_centralized(ErtsFlxCtr* c,
+                                  Uint counter_nr);
+
+
+typedef enum {
+    ERTS_FLXCTR_TRY_AGAIN_AFTER_TRAP,
+    ERTS_FLXCTR_DONE,
+    ERTS_FLXCTR_GET_RESULT_AFTER_TRAP
+} ErtsFlxctrSnapshotResultType;
+
+typedef struct {
+    ErtsFlxctrSnapshotResultType type;
+    Eterm trap_resume_state;
+    Sint result[ERTS_FLXCTR_ATOMICS_PER_CACHE_LINE];
+} ErtsFlxCtrSnapshotResult;
+
+/**
+ * @brief This function initiates an atomic snapshot of an ErtsFlxCtr
+ * to read out the values of one or more of the counters that are
+ * stored in the given ErtsFlxCtr. The caller needs to perform
+ * different actions after the return of this function depending on
+ * the value of the type field in the returned struct:
+ *
+ * - The caller needs to trap and try again after the trap if the
+ *   return value has the type ERTS_FLXCTR_TRY_AGAIN_AFTER_TRAP.
+ *
+ * - The caller can get the result directly from the result field of
+ *   the returned struct if the return value has the type
+ *   ERTS_FLXCTR_DONE. The value at index i in the result field
+ *   correspond to counter number i.
+ *
+ * - Finally, if the return value has the type
+ *   ERTS_FLXCTR_GET_RESULT_AFTER_TRAP, then the caller needs to save
+ *   the value of the field trap_resume_state from the returned struct
+ *   and trap. After the trap, the values of the counters can be
+ *   obtained by using the function
+ *   erts_flxctr_get_snapshot_result_after_trap. Note that the
+ *   function erts_flxctr_is_snapshot_result can be used to check if a
+ *   value is obtained from the trap_resume_state field in the
+ *   returned struct (this can be useful when the calling function
+ *   wakes up again after the trap).
+ *
+ * The snapshot operation that is initiated by this function should be
+ * considered to be ongoing from the issuing of this function until a
+ * struct with the type field set to ERTS_FLXCTR_DONE has been
+ * returned from the function or until the caller of this function has
+ * woken up after trapping.
+ *
+ * @param c The ErtsFlxCtr that the snapshot shall be taken from
+ * @param alloc_type The allocation type (needs to be the same as the
+ *                   type passed to erts_flxctr_init when c was
+ *                   initialized)
+ * @param p The Erlang process that is doing the call
+ *
+ * @return See the description above
+ *
+ */
+ErtsFlxCtrSnapshotResult
+erts_flxctr_snapshot(ErtsFlxCtr* c,
+                     ErtsAlcType_t alloc_type,
+                     Process* p);
+
+/**
+ * @brief Checks if the parameter term is a snapshot result (i.e.,
+ * something obtained from the trap_resume_state field of an
+ * ErtsFlxCtrSnapshotResult struct that has been returned from
+ * erts_flxctr_snapshot).
+ *
+ * @param term The term to check 
+ *
+ * @return A nonzero value iff the term is a snapshot result
+ */
+int erts_flxctr_is_snapshot_result(Eterm term);
+
+/**
+ * @brief Returns the result of a snapshot for a counter given a
+ * snapshot result returned by a call to erts_flxctr_snapshot (i.e.,
+ * the value stored in the trap_resume_state field of a struct
+ * returned by erts_flxctr_snapshot). The caller needs to trap between
+ * the return of erts_flxctr_snapshot and the call to this function.
+ */
+Sint erts_flxctr_get_snapshot_result_after_trap(Eterm trap_resume_state,
+                                                Uint counter_nr);
+
+/**
+ * @brief Resets the specified counter to 0. This function is unsafe
+ * to call while a snapshot operation may be active (initiated with
+ * the erts_flxctr_snapshot function).
+ */
+void erts_flxctr_reset(ErtsFlxCtr* c,
+                       Uint counter_nr);
+
+/**
+ * @brief Checks if a snapshot operation is active (snapshots are
+ * initiated with the erts_flxctr_snapshot function).
+ *
+ * @return nonzero value iff a snapshot was active at some point
+ * between the invocation and return of the function
+ */
+int erts_flxctr_is_snapshot_ongoing(ErtsFlxCtr* c);
+
+/**
+ * @brief This function checks if a snapshot operation is ongoing
+ * (snapshots are initiated with the erts_flxctr_snapshot function)
+ * and suspend the given process until thread progress has happened if
+ * it detected an ongoing snapshot operation. The caller needs to trap
+ * if a non-zero value is returned.
+ *
+ * @param c The ErtsFlxCtr to check
+ * @param p The calling process
+ *
+ * @return nonzero value if the given process has got suspended
+ */
+int erts_flxctr_suspend_until_thr_prg_if_snapshot_ongoing(ErtsFlxCtr* c, Process* p);
+
+/* End: Public Interface */
+
+/* Internal Declarations */
+
+#define ERTS_FLXCTR_GET_CTR_ARRAY_PTR(C)                                \
+    ((ErtsFlxCtrDecentralizedCtrArray*) erts_atomic_read_acqb(&(C)->u.counters_ptr))
+#define ERTS_FLXCTR_GET_CTR_PTR(C, SCHEDULER_ID, COUNTER_ID)            \
+    &(ERTS_FLXCTR_GET_CTR_ARRAY_PTR(C))->array[SCHEDULER_ID].counters[COUNTER_ID]
+
+
+typedef union {
+    erts_atomic_t counters[ERTS_FLXCTR_ATOMICS_PER_CACHE_LINE];
+    char pad[ERTS_CACHE_LINE_SIZE];
+} ErtsFlxCtrDecentralizedCtrArrayElem;
+
+typedef struct ErtsFlxCtrDecentralizedCtrArray {
+    void* block_start;
+    erts_atomic_t snapshot_status;
+    ErtsFlxCtrDecentralizedCtrArrayElem array[];
+} ErtsFlxCtrDecentralizedCtrArray;
+
+void erts_flxctr_set_slot(int group);
+
+ERTS_GLB_INLINE
+int erts_flxctr_get_slot_index(void);
+
+/* End: Internal Declarations */
+
+
+/* Implementation of inlined functions */
+
+#if ERTS_GLB_INLINE_INCL_FUNC_DEF
+
+ERTS_GLB_INLINE
+int erts_flxctr_get_slot_index(void)
+{
+    ErtsSchedulerData *esdp = erts_get_scheduler_data();
+    ASSERT(esdp && !ERTS_SCHEDULER_IS_DIRTY(esdp));
+    ASSERT(esdp->flxctr_slot_no > 0);
+    return esdp->flxctr_slot_no;
+}
+
+ERTS_GLB_INLINE
+void erts_flxctr_add(ErtsFlxCtr* c,
+                     Uint counter_nr,
+                     int to_add)
+{
+    ASSERT(counter_nr < c->nr_of_counters);
+    if (c->is_decentralized) {
+        erts_atomic_add_nob(ERTS_FLXCTR_GET_CTR_PTR(c,
+                                                    erts_flxctr_get_slot_index(),
+                                                    counter_nr),
+                            to_add);
+    } else {
+        erts_atomic_add_nob(&c->u.counters[counter_nr], to_add);
+    }
+}
+
+ERTS_GLB_INLINE
+void erts_flxctr_inc(ErtsFlxCtr* c,
+                     Uint counter_nr)
+{
+    ASSERT(counter_nr < c->nr_of_counters);
+    if (c->is_decentralized) {
+        erts_atomic_inc_nob(ERTS_FLXCTR_GET_CTR_PTR(c,
+                                                    erts_flxctr_get_slot_index(),
+                                                    counter_nr));
+    } else {
+        erts_atomic_inc_read_nob(&c->u.counters[counter_nr]);
+    }
+}
+
+ERTS_GLB_INLINE
+void erts_flxctr_dec(ErtsFlxCtr* c,
+                     Uint counter_nr)
+{
+    ASSERT(counter_nr < c->nr_of_counters);
+    if (c->is_decentralized) {
+        erts_atomic_dec_nob(ERTS_FLXCTR_GET_CTR_PTR(c,
+                                                    erts_flxctr_get_slot_index(),
+                                                    counter_nr));
+    } else {
+        erts_atomic_dec_nob(&c->u.counters[counter_nr]);
+    }
+}
+
+ERTS_GLB_INLINE
+Sint erts_flxctr_inc_read_centralized(ErtsFlxCtr* c,
+                                      Uint counter_nr)
+{
+    ASSERT(counter_nr < c->nr_of_counters);
+    ASSERT(!c->is_decentralized);
+    return erts_atomic_inc_read_nob(&c->u.counters[counter_nr]);
+}
+
+ERTS_GLB_INLINE
+Sint erts_flxctr_dec_read_centralized(ErtsFlxCtr* c,
+                                      Uint counter_nr)
+{
+    ASSERT(counter_nr < c->nr_of_counters);
+    ASSERT(!c->is_decentralized);
+    return erts_atomic_dec_read_nob(&c->u.counters[counter_nr]);
+}
+
+ERTS_GLB_INLINE
+Sint erts_flxctr_read_centralized(ErtsFlxCtr* c,
+                                  Uint counter_nr)
+{
+    ASSERT(counter_nr < c->nr_of_counters);
+    ASSERT(!c->is_decentralized);   
+    return erts_atomic_read_nob(&((erts_atomic_t*)(c->u.counters))[counter_nr]);
+}
+
+#endif /* #if ERTS_GLB_INLINE_INCL_FUNC_DEF */
+
+#endif /* ERL_FLXCTR_H__ */
diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c
index d5dfb096b1..13b1f8ab4d 100644
--- a/erts/emulator/beam/erl_gc.c
+++ b/erts/emulator/beam/erl_gc.c
@@ -151,6 +151,7 @@ static void grow_new_heap(Process *p, Uint new_sz, Eterm* objv, int nobj);
 static void sweep_off_heap(Process *p, int fullsweep);
 static void offset_heap(Eterm* hp, Uint sz, Sint offs, char* area, Uint area_size);
 static void offset_heap_ptr(Eterm* hp, Uint sz, Sint offs, char* area, Uint area_size);
+static void offset_heap_ptr_nstack(Eterm* hp, Uint sz, Sint offs, char* area, Uint area_size);
 static void offset_rootset(Process *p, Sint offs, char* area, Uint area_size,
 			   Eterm* objv, int nobj);
 static void offset_off_heap(Process* p, Sint offs, char* area, Uint area_size);
@@ -577,7 +578,7 @@ force_reschedule:
 }
 
 static ERTS_FORCE_INLINE Uint
-young_gen_usage(Process *p)
+young_gen_usage(Process *p, Uint *ext_msg_usage)
 {
     Uint hsz;
     Eterm *aheap;
@@ -604,7 +605,10 @@ young_gen_usage(Process *p)
                 if (ERTS_SIG_IS_MSG(mp)
                     && mp->data.attached
                     && mp->data.attached != ERTS_MSG_COMBINED_HFRAG) {
-                    hsz += erts_msg_attached_data_size(mp);
+                    Uint sz = erts_msg_attached_data_size(mp);
+                    if (ERTS_SIG_IS_EXTERNAL_MSG(mp))
+                        *ext_msg_usage += sz;
+                    hsz += sz;
                 }
             });
     }
@@ -676,6 +680,7 @@ garbage_collect(Process* p, ErlHeapFragment *live_hf_end,
 {
     Uint reclaimed_now = 0;
     Uint ygen_usage;
+    Uint ext_msg_usage = 0;
     Eterm gc_trace_end_tag;
     int reds;
     ErtsMonotonicTime start_time;
@@ -698,7 +703,7 @@ garbage_collect(Process* p, ErlHeapFragment *live_hf_end,
 	return delay_garbage_collection(p, live_hf_end, need, fcalls);
     }
 
-    ygen_usage = max_young_gen_usage ? max_young_gen_usage : young_gen_usage(p);
+    ygen_usage = max_young_gen_usage ? max_young_gen_usage : young_gen_usage(p, &ext_msg_usage);
 
     if (!ERTS_SCHEDULER_IS_DIRTY(esdp)) {
 	check_for_possibly_long_gc(p, ygen_usage);
@@ -739,7 +744,7 @@ garbage_collect(Process* p, ErlHeapFragment *live_hf_end,
             trace_gc(p, am_gc_minor_start, need, THE_NON_VALUE);
         }
         DTRACE2(gc_minor_start, pidbuf, need);
-        reds = minor_collection(p, live_hf_end, need, objv, nobj,
+        reds = minor_collection(p, live_hf_end, need + ext_msg_usage, objv, nobj,
 				ygen_usage, &reclaimed_now);
         DTRACE2(gc_minor_end, pidbuf, reclaimed_now);
         if (reds == -1) {
@@ -764,7 +769,7 @@ do_major_collection:
             trace_gc(p, am_gc_major_start, need, THE_NON_VALUE);
         }
         DTRACE2(gc_major_start, pidbuf, need);
-        reds = major_collection(p, live_hf_end, need, objv, nobj,
+        reds = major_collection(p, live_hf_end, need + ext_msg_usage, objv, nobj,
 				ygen_usage, &reclaimed_now);
         if (ERTS_SCHEDULER_IS_DIRTY(esdp))
             p->flags &= ~(F_DIRTY_MAJOR_GC|F_DIRTY_MINOR_GC);
@@ -1050,9 +1055,10 @@ erts_garbage_collect_hibernate(Process* p)
 		n_htop = tmp_n_htop;					\
 	} while(0)
 
+
 /*
  * offset_nstack() can ignore the descriptor-based traversal the other
- * nstack procedures use and simply call offset_heap_ptr() instead.
+ * nstack procedures use and do a simpler word by word traversal instead.
  * This relies on two facts:
  * 1. The only live non-Erlang terms on an nstack are return addresses,
  *    and they will be skipped thanks to the low/high range check.
@@ -1067,14 +1073,51 @@ static ERTS_INLINE void offset_nstack(Process* p, Sint offs,
 {
     if (p->hipe.nstack) {
 	ASSERT(p->hipe.nsp && p->hipe.nstend);
-	offset_heap_ptr(hipe_nstack_start(p), hipe_nstack_used(p),
-			offs, area, area_size);
+	offset_heap_ptr_nstack(hipe_nstack_start(p), hipe_nstack_used(p),
+                               offs, area, area_size);
     }
     else {
 	ASSERT(!p->hipe.nsp && !p->hipe.nstend);
     }
 }
 
+/*
+ * This is the same as offset_heap_ptr()
+ *
+ * Except for VALGRIND. It allows benign offsetting of undefined (dead) words
+ * on the nstack while also retaining them as undefined. This suppresses
+ * valgrinds "Conditional jump or move depends on uninitialised value(s)".
+ */
+static void
+offset_heap_ptr_nstack(Eterm* hp, Uint sz, Sint offs,
+                       char* area, Uint area_size)
+{
+    while (sz--) {
+	Eterm val = *hp;
+#ifdef VALGRIND
+        Eterm val_vbits;
+        VALGRIND_GET_VBITS(&val, &val_vbits, sizeof(val));
+        VALGRIND_MAKE_MEM_DEFINED(&val, sizeof(val));
+#endif
+	switch (primary_tag(val)) {
+	case TAG_PRIMARY_LIST:
+	case TAG_PRIMARY_BOXED:
+	    if (ErtsInArea(ptr_val(val), area, area_size)) {
+#ifdef VALGRIND
+                VALGRIND_SET_VBITS(&val, val_vbits, sizeof(val));
+#endif
+		*hp = offset_ptr(val, offs);
+	    }
+	    hp++;
+	    break;
+	default:
+	    hp++;
+	    break;
+	}
+    }
+}
+
+
 #else /* !HIPE */
 
 #define fullsweep_nstack(p,n_htop)		        	(n_htop)
@@ -1101,6 +1144,7 @@ erts_garbage_collect_literals(Process* p, Eterm* literals,
     Eterm* old_htop;
     Uint n;
     Uint ygen_usage = 0;
+    Uint ext_msg_usage = 0;
     struct erl_off_heap_header** prev = NULL;
     Sint64 reds;
     int hibernated = !!(p->flags & F_HIBERNATED);
@@ -1118,7 +1162,7 @@ erts_garbage_collect_literals(Process* p, Eterm* literals,
 	p->flags &= ~F_DIRTY_CLA;
     else {
         Uint size = byte_lit_size/sizeof(Uint);
-	ygen_usage = young_gen_usage(p);
+	ygen_usage = young_gen_usage(p, &ext_msg_usage);
         if (hibernated)
             size = size*2 + 3*ygen_usage;
         else
@@ -1130,7 +1174,7 @@ erts_garbage_collect_literals(Process* p, Eterm* literals,
 	}
     }
 
-    reds = (Sint64) garbage_collect(p, ERTS_INVALID_HFRAG_PTR, 0,
+    reds = (Sint64) garbage_collect(p, ERTS_INVALID_HFRAG_PTR, ext_msg_usage,
 				    p->arg_reg, p->arity, fcalls,
 				    ygen_usage);
     if (ERTS_PROC_IS_EXITING(p)) {
@@ -1303,7 +1347,8 @@ erts_garbage_collect_literals(Process* p, Eterm* literals,
                     ExternalThing *etp;
                     ASSERT(is_external_header(ptr->thing_word));
                     etp = (ExternalThing *) ptr;
-                    erts_refc_inc(&etp->node->refc, 1);
+                    erts_ref_node_entry(etp->node, 1,
+                                        make_boxed(&oh->thing_word));
                     break;
                 }
             }
@@ -1347,6 +1392,9 @@ minor_collection(Process* p, ErlHeapFragment *live_hf_end,
     Eterm *mature = p->abandoned_heap ? p->abandoned_heap : p->heap;
     Uint mature_size = p->high_water - mature;
     Uint size_before = ygen_usage;
+#ifdef DEBUG
+    Uint debug_tmp = 0;
+#endif
 
     /*
      * Check if we have gone past the max heap size limit
@@ -1483,7 +1531,7 @@ minor_collection(Process* p, ErlHeapFragment *live_hf_end,
            process from there */
         ASSERT(!MAX_HEAP_SIZE_GET(p) ||
                !(MAX_HEAP_SIZE_FLAGS_GET(p) & MAX_HEAP_SIZE_KILL) ||
-               MAX_HEAP_SIZE_GET(p) > (young_gen_usage(p) +
+               MAX_HEAP_SIZE_GET(p) > (young_gen_usage(p, &debug_tmp) +
                                        (OLD_HEND(p) - OLD_HEAP(p)) +
                                        (HEAP_END(p) - HEAP_TOP(p))));
 
@@ -2438,27 +2486,9 @@ erts_copy_one_frag(Eterm** hpp, ErlOffHeap* off_heap,
 	    cpy_words:
 		ASSERT(sz >= cpy_sz);
 		sz -= cpy_sz;
-		while (cpy_sz >= 8) {
-		    cpy_sz -= 8;
-		    *hp++ = *fhp++;
-		    *hp++ = *fhp++;
-		    *hp++ = *fhp++;
-		    *hp++ = *fhp++;
-		    *hp++ = *fhp++;
-		    *hp++ = *fhp++;
-		    *hp++ = *fhp++;
-		    *hp++ = *fhp++;
-		}
-		switch (cpy_sz) {
-		case 7: *hp++ = *fhp++;
-		case 6: *hp++ = *fhp++;
-		case 5: *hp++ = *fhp++;
-		case 4: *hp++ = *fhp++;
-		case 3: *hp++ = *fhp++;
-		case 2: *hp++ = *fhp++;
-		case 1: *hp++ = *fhp++;
-		default: break;
-		}
+                sys_memcpy(hp, fhp, cpy_sz * sizeof(Eterm));
+                hp += cpy_sz;
+                fhp += cpy_sz;
 		if (oh) {
 		    /* Add to offheap list */
 		    oh->next = off_heap->first;
@@ -2477,7 +2507,7 @@ erts_copy_one_frag(Eterm** hpp, ErlOffHeap* off_heap,
     *hpp = hp;
 
     for (i = 0; i < nrefs; i++) {
-	if (is_not_immed(refs[i]) && !erts_is_literal(refs[i],boxed_val(refs[i])))
+	if (is_not_immed(refs[i]) && !erts_is_literal(refs[i],ptr_val(refs[i])))
 	    refs[i] = offset_ptr(refs[i], offs);
     }
     bp->off_heap.first = NULL;
@@ -2854,7 +2884,11 @@ sweep_off_heap(Process *p, int fullsweep)
     while (ptr) {
 	if (IS_MOVED_BOXED(ptr->thing_word)) {
 	    ASSERT(!ErtsInArea(ptr, oheap, oheap_sz));
-	    *prev = ptr = (struct erl_off_heap_header*) boxed_val(ptr->thing_word);
+            if (is_external_header(((struct erl_off_heap_header*) boxed_val(ptr->thing_word))->thing_word))
+                erts_node_bookkeep(((ExternalThing*)ptr)->node,
+                                   make_boxed(&ptr->thing_word),
+                                   ERL_NODE_DEC, __FILE__, __LINE__);
+            *prev = ptr = (struct erl_off_heap_header*) boxed_val(ptr->thing_word);
 	    ASSERT(!IS_MOVED_BOXED(ptr->thing_word));
 	    switch (ptr->thing_word) {
 	    case HEADER_PROC_BIN: {
@@ -2881,6 +2915,11 @@ sweep_off_heap(Process *p, int fullsweep)
                 /* fall through... */
             }
             default:
+                if (is_external_header(ptr->thing_word)) {
+                    erts_node_bookkeep(((ExternalThing*)ptr)->node,
+                                       make_boxed(&ptr->thing_word),
+                                       ERL_NODE_INC, __FILE__, __LINE__);
+                }
 		prev = &ptr->next;
 		ptr = ptr->next;
 	    }
@@ -2914,7 +2953,8 @@ sweep_off_heap(Process *p, int fullsweep)
 		}
 	    default:
 		ASSERT(is_external_header(ptr->thing_word));
-		erts_deref_node_entry(((ExternalThing*)ptr)->node);
+		erts_deref_node_entry(((ExternalThing*)ptr)->node,
+                                      make_boxed(&ptr->thing_word));
 	    }
 	    *prev = ptr = ptr->next;
 	}
@@ -3047,6 +3087,15 @@ offset_heap(Eterm* hp, Uint sz, Sint offs, char* area, Uint area_size)
 		  {
 		      struct erl_off_heap_header* oh = (struct erl_off_heap_header*) hp;
 
+                      if (is_external_header(oh->thing_word)) {
+                          erts_node_bookkeep(((ExternalThing*)oh)->node,
+                                             make_boxed(((Eterm*)oh)-offs),
+                                             ERL_NODE_DEC, __FILE__, __LINE__);
+                          erts_node_bookkeep(((ExternalThing*)oh)->node,
+                                             make_boxed((Eterm*)oh), ERL_NODE_INC,
+                                             __FILE__, __LINE__);
+                      }
+
 		      if (ErtsInArea(oh->next, area, area_size)) {
 			  Eterm** uptr = (Eterm **) (void *) &oh->next;
 			  *uptr += offs; /* Patch the mso chain */
diff --git a/erts/emulator/beam/erl_goodfit_alloc.c b/erts/emulator/beam/erl_goodfit_alloc.c
index 01d4aa54ff..68b9579433 100644
--- a/erts/emulator/beam/erl_goodfit_alloc.c
+++ b/erts/emulator/beam/erl_goodfit_alloc.c
@@ -226,6 +226,8 @@ erts_gfalc_start(GFAllctr_t *gfallctr,
     allctr->add_mbc		        = NULL;
     allctr->remove_mbc		        = NULL;
     allctr->largest_fblk_in_mbc         = NULL;
+    allctr->first_fblk_in_mbc           = NULL;
+    allctr->next_fblk_in_mbc            = NULL;
     allctr->init_atoms			= init_atoms;
 
 #ifdef ERTS_ALLOC_UTIL_HARD_DEBUG
diff --git a/erts/emulator/beam/erl_hl_timer.c b/erts/emulator/beam/erl_hl_timer.c
index ef7a55fa38..b0eb0e85c0 100644
--- a/erts/emulator/beam/erl_hl_timer.c
+++ b/erts/emulator/beam/erl_hl_timer.c
@@ -29,8 +29,6 @@
 #  include "config.h"
 #endif
 
-/* #define ERTS_MAGIC_REF_BIF_TIMERS */
-
 #include "sys.h"
 #include "global.h"
 #include "bif.h"
@@ -39,9 +37,6 @@
 #include "erl_time.h"
 #include "erl_hl_timer.h"
 #include "erl_proc_sig_queue.h"
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-#include "erl_binary.h"
-#endif
 
 #define ERTS_TMR_CHECK_CANCEL_ON_CREATE 0
 
@@ -195,14 +190,9 @@ struct ErtsBifTimer_ {
     } type;
     struct {
         erts_atomic32_t state;
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-        ErtsMagicBinary *mbin;
-        ErtsHLTimerList proc_list;
-#else
 	Uint32 refn[ERTS_REF_NUMBERS];
 	ErtsBifTimerTree proc_tree;
 	ErtsBifTimerTree tree;
-#endif
         Eterm message;
         ErlHeapFragment *bp;
     } btm;
@@ -220,11 +210,7 @@ typedef ErtsTimer *(*ErtsCreateTimerFunc)(ErtsSchedulerData *esdp,
                                           int short_time, ErtsTmrType type,
                                           void *rcvrp, Eterm rcvr,
                                           Eterm msg,
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-                                          ErtsMagicBinary *mbin,
-#else
                                           Uint32 *refn,
-#endif
                                           void (*callback)(void *), void *arg);
 
 #ifdef SMALL_MEMORY
@@ -303,16 +289,12 @@ typedef struct {
 struct ErtsHLTimerService_ {
     ErtsHLTCncldTmrQ canceled_queue;
     ErtsHLTimer *time_tree;
-#ifndef ERTS_MAGIC_REF_BIF_TIMERS
     ErtsBifTimer *btm_tree;
-#endif
     ErtsHLTimer *next_timeout;
     ErtsYieldingTimeoutState yield;
     ErtsTWheelTimer service_timer;
 };
 
-#ifndef ERTS_MAGIC_REF_BIF_TIMERS
-
 static ERTS_INLINE int
 refn_is_lt(Uint32 *x, Uint32 *y)
 {
@@ -334,8 +316,6 @@ refn_is_eq(Uint32 *x, Uint32 *y)
     return (x[0] == y[0]) & (x[1] == y[1]) & (x[2] == y[2]);
 }
 
-#endif
-
 #define ERTS_RBT_PREFIX time
 #define ERTS_RBT_T ErtsHLTimer
 #define ERTS_RBT_KEY_T ErtsMonotonicTime
@@ -525,13 +505,7 @@ same_time_list_lookup(ErtsHLTimer *root, ErtsHLTimer *x)
 
 #endif /* ERTS_HLT_HARD_DEBUG */
 
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-#define ERTS_BTM_HLT2REFN(T) ((T)->btm.mbin->refn)
-#else
 #define ERTS_BTM_HLT2REFN(T) ((T)->btm.refn)
-#endif
-
-#ifndef ERTS_MAGIC_REF_BIF_TIMERS
 
 #define ERTS_RBT_PREFIX btm
 #define ERTS_RBT_T ErtsBifTimer
@@ -576,87 +550,12 @@ same_time_list_lookup(ErtsHLTimer *root, ErtsHLTimer *x)
 #define ERTS_RBT_IS_EQ(KX, KY) refn_is_eq((KX), (KY))
 #define ERTS_RBT_WANT_DELETE
 #define ERTS_RBT_WANT_INSERT
-#ifndef ERTS_MAGIC_REF_BIF_TIMERS
 #define ERTS_RBT_WANT_LOOKUP
-#endif
 #define ERTS_RBT_WANT_FOREACH
 #define ERTS_RBT_UNDEF
 
 #include "erl_rbtree.h"
 
-#endif /* !ERTS_MAGIC_REF_BIF_TIMERS */
-
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-
-static ERTS_INLINE void
-proc_btm_list_insert(ErtsBifTimer **list, ErtsBifTimer *x)
-{
-    ErtsBifTimer *y = *list;
-    if (!y) {
-        x->btm.proc_list.next = x;
-        x->btm.proc_list.prev = x;
-        *list = x;
-    }
-    else {
-        ERTS_HLT_ASSERT(y->btm.proc_list.prev->btm.proc_list.next == y);
-        x->btm.proc_list.next = y;
-        x->btm.proc_list.prev = y->btm.proc_list.prev;
-        y->btm.proc_list.prev->btm.proc_list.next = x;
-        y->btm.proc_list.prev = x;
-    }
-}
-
-static ERTS_INLINE void
-proc_btm_list_delete(ErtsBifTimer **list, ErtsBifTimer *x)
-{
-    ErtsBifTimer *y = *list;
-    if (y == x && x->btm.proc_list.next == x) {
-        ERTS_HLT_ASSERT(x->btm.proc_list.prev == x);
-        *list = NULL;
-    }
-    else {
-        if (y == x)
-            *list = x->btm.proc_list.next;
-        ERTS_HLT_ASSERT(x->btm.proc_list.prev->btm.proc_list.next == x);
-        ERTS_HLT_ASSERT(x->btm.proc_list.next->btm.proc_list.prev == x);
-        x->btm.proc_list.prev->btm.proc_list.next = x->btm.proc_list.next;
-        x->btm.proc_list.next->btm.proc_list.prev = x->btm.proc_list.prev;
-    }
-    x->btm.proc_list.next = NULL;
-}
-
-static ERTS_INLINE int
-proc_btm_list_foreach_destroy_yielding(ErtsBifTimer **list,
-                                       void (*destroy)(ErtsBifTimer *, void *),
-                                       void *arg,
-                                       int limit)
-{
-    int i;
-    ErtsBifTimer *first, *last;
-
-    first = *list;
-    if (!first)
-        return 0;
-
-    last = first->btm.proc_list.prev;
-    for (i = 0; i < limit; i++) {
-        ErtsBifTimer *x = last;
-        last = last->btm.proc_list.prev;
-        (*destroy)(x, arg);
-        x->btm.proc_list.next = NULL;
-        if (x == first) {
-            *list = NULL;
-            return 0;
-        }
-    }
-
-    last->btm.proc_list.next = first;
-    first->btm.proc_list.prev = last;
-    return 1;
-}
-
-#else /* !ERTS_MAGIC_REF_BIF_TIMERS */
-
 #define ERTS_RBT_PREFIX proc_btm
 #define ERTS_RBT_T ErtsBifTimer
 #define ERTS_RBT_KEY_T Uint32 *
@@ -700,16 +599,12 @@ proc_btm_list_foreach_destroy_yielding(ErtsBifTimer **list,
 #define ERTS_RBT_IS_EQ(KX, KY) refn_is_eq((KX), (KY))
 #define ERTS_RBT_WANT_DELETE
 #define ERTS_RBT_WANT_INSERT
-#ifndef ERTS_MAGIC_REF_BIF_TIMERS
 #define ERTS_RBT_WANT_LOOKUP
-#endif
 #define ERTS_RBT_WANT_FOREACH_DESTROY_YIELDING
 #define ERTS_RBT_UNDEF
 
 #include "erl_rbtree.h"
 
-#endif /* !ERTS_MAGIC_REF_BIF_TIMERS */
-
 static void init_canceled_queue(ErtsHLTCncldTmrQ *cq);
 
 void
@@ -728,9 +623,7 @@ erts_create_timer_service(void)
     srv = erts_alloc_permanent_cache_aligned(ERTS_ALC_T_TIMER_SERVICE,
 					     sizeof(ErtsHLTimerService));
     srv->time_tree = NULL;
-#ifndef ERTS_MAGIC_REF_BIF_TIMERS
     srv->btm_tree = NULL;
-#endif
     srv->next_timeout = NULL;
     srv->yield = init_yield;
     erts_twheel_init_timer(&srv->service_timer);
@@ -805,40 +698,10 @@ port_timeout_common(Port *port, void *tmr)
     return 0;
 }
 
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-
-static erts_atomic_t *
-mbin_to_btmref__(ErtsMagicBinary *mbin)
-{
-    return erts_binary_to_magic_indirection((Binary *) mbin);
-}
-
-static ERTS_INLINE void
-magic_binary_init(ErtsMagicBinary *mbin, ErtsBifTimer *tmr)
-{
-    erts_atomic_t *aptr = mbin_to_btmref__(mbin);
-    erts_atomic_init_nob(aptr, (erts_aint_t) tmr);
-}
-
-static ERTS_INLINE ErtsBifTimer *
-magic_binary_to_btm(ErtsMagicBinary *mbin)
-{
-    erts_atomic_t *aptr = mbin_to_btmref__(mbin);
-    ErtsBifTimer *tmr = (ErtsBifTimer *) erts_atomic_read_nob(aptr);
-    ERTS_HLT_ASSERT(!tmr || tmr->btm.mbin == mbin);
-    return tmr;
-}
-
-#endif /* ERTS_MAGIC_REF_BIF_TIMERS */
-
 static ERTS_INLINE erts_aint_t
 init_btm_specifics(ErtsSchedulerData *esdp,
                    ErtsBifTimer *tmr, Eterm msg,
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-                   ErtsMagicBinary *mbin
-#else
                    Uint32 *refn
-#endif
     )
 {
     Uint hsz = is_immed(msg) ? ((Uint) 0) : size_object(msg);
@@ -853,13 +716,6 @@ init_btm_specifics(ErtsSchedulerData *esdp,
         tmr->btm.message = copy_struct(msg, hsz, &hp, &bp->off_heap);
         tmr->btm.bp = bp;
     }
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-    refc = 1;
-    tmr->btm.mbin = mbin;
-    erts_refc_inc(&mbin->refc, 1);
-    magic_binary_init(mbin, tmr);
-    tmr->btm.proc_list.next = NULL;
-#else
     refc = 0;
     tmr->btm.refn[0] = refn[0];
     tmr->btm.refn[1] = refn[1];
@@ -868,7 +724,6 @@ init_btm_specifics(ErtsSchedulerData *esdp,
     tmr->btm.proc_tree.parent = ERTS_HLT_PFIELD_NOT_IN_TABLE;
 
     btm_rbt_insert(&esdp->timer_service->btm_tree, tmr);
-#endif
 
     erts_atomic32_init_nob(&tmr->btm.state, ERTS_TMR_STATE_ACTIVE);
     return refc; /* refc from magic binary... */
@@ -886,11 +741,6 @@ timer_destroy(ErtsTimer *tmr, int twt, int btm)
             erts_free(ERTS_ALC_T_HL_PTIMER, tmr);
     }
     else {
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-        Binary *bp = (Binary *) tmr->btm.btm.mbin;
-        if (erts_refc_dectest(&bp->refc, 0) == 0)
-            erts_bin_free(bp);
-#endif
 	if (tmr->head.roflgs & ERTS_TMR_ROFLG_PRE_ALC)
 	    bif_timer_pre_free(&tmr->btm);
 	else
@@ -940,9 +790,6 @@ schedule_tw_timer_destroy(ErtsTWTimer *tmr)
     else {
 	/* Message buffer already dropped... */
 	size = sizeof(ErtsBifTimer);
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-        size += sizeof(ErtsMagicIndirectionWord);
-#endif
     }
 
     erts_schedule_thr_prgr_later_cleanup_op(
@@ -1006,11 +853,7 @@ create_tw_timer(ErtsSchedulerData *esdp,
 		int short_time, ErtsTmrType type,
 		void *rcvrp, Eterm rcvr,
 		Eterm msg,
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-                ErtsMagicBinary *mbin,
-#else
                 Uint32 *refn,
-#endif
 		void (*callback)(void *), void *arg)
 {
     ErtsTWTimer *tmr;
@@ -1087,11 +930,7 @@ create_tw_timer(ErtsSchedulerData *esdp,
         refc += init_btm_specifics(esdp,
                                    (ErtsBifTimer *) tmr,
                                    msg,
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-                                   mbin
-#else
                                    refn
-#endif
             );
         break;
 
@@ -1152,9 +991,6 @@ schedule_hl_timer_destroy(ErtsHLTimer *tmr, Uint32 roflgs)
     else {
 	/* Message buffer already dropped... */
 	size = sizeof(ErtsBifTimer);
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-        size += sizeof(ErtsMagicIndirectionWord);
-#endif
     }
 
     erts_schedule_thr_prgr_later_cleanup_op(
@@ -1192,34 +1028,6 @@ check_canceled_queue(ErtsSchedulerData *esdp, ErtsHLTimerService *srv)
 #endif
 }
 
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-
-static int
-bif_timer_ref_destructor(Binary *unused)
-{
-    return 1;
-}
-
-static ERTS_INLINE void
-btm_clear_magic_binary(ErtsBifTimer *tmr)
-{
-    erts_atomic_t *aptr = mbin_to_btmref__(tmr->btm.mbin);
-    Uint32 roflgs = tmr->type.head.roflgs;
-#ifdef ERTS_HLT_DEBUG
-    erts_aint_t tval = erts_atomic_xchg_nob(aptr,
-                                                (erts_aint_t) NULL);
-    ERTS_HLT_ASSERT(tval == (erts_aint_t) tmr);
-#else
-    erts_atomic_set_nob(aptr, (erts_aint_t) NULL);
-#endif
-    if (roflgs & ERTS_TMR_ROFLG_HLT)
-        hl_timer_dec_refc(&tmr->type.hlt, roflgs);
-    else
-        tw_timer_dec_refc(&tmr->type.twt);
-}
-
-#endif /* ERTS_MAGIC_REF_BIF_TIMERS */
-
 static ERTS_INLINE void
 bif_timer_timeout(ErtsHLTimerService *srv,
                   ErtsBifTimer *tmr,
@@ -1240,10 +1048,6 @@ bif_timer_timeout(ErtsHLTimerService *srv,
     if (state == ERTS_TMR_STATE_ACTIVE) {
         Process *proc;
 
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-        btm_clear_magic_binary(tmr);
-#endif
-
         if (roflgs & ERTS_TMR_ROFLG_REG_NAME) {
             Eterm term;
             term = tmr->type.head.receiver.name;
@@ -1266,18 +1070,11 @@ bif_timer_timeout(ErtsHLTimerService *srv,
             erts_proc_lock(proc, ERTS_PROC_LOCK_BTM);
             /* If the process is exiting do not disturb the cleanup... */
             if (!ERTS_PROC_IS_EXITING(proc)) {
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-                if (tmr->btm.proc_list.next) {
-                    proc_btm_list_delete(&proc->bif_timers, tmr);
-                    dec_refc = 1;
-                }
-#else
                 if (tmr->btm.proc_tree.parent != ERTS_HLT_PFIELD_NOT_IN_TABLE) {
                     proc_btm_rbt_delete(&proc->bif_timers, tmr);
                     tmr->btm.proc_tree.parent = ERTS_HLT_PFIELD_NOT_IN_TABLE;
                     dec_refc = 1;
                 }
-#endif
             }
             erts_proc_unlock(proc, ERTS_PROC_LOCK_BTM);
             if (dec_refc)
@@ -1287,25 +1084,18 @@ bif_timer_timeout(ErtsHLTimerService *srv,
             free_message_buffer(tmr->btm.bp);
     }
 
-#ifndef ERTS_MAGIC_REF_BIF_TIMERS
     if (tmr->btm.tree.parent != ERTS_HLT_PFIELD_NOT_IN_TABLE) {
 	btm_rbt_delete(&srv->btm_tree, tmr);
 	tmr->btm.tree.parent = ERTS_HLT_PFIELD_NOT_IN_TABLE;
     }
-#endif
-
 
 }
 
 static void
 tw_bif_timer_timeout(void *vbtmp)
 {
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-    ErtsHLTimerService *srv = NULL;
-#else
     ErtsSchedulerData *esdp = erts_get_scheduler_data();
     ErtsHLTimerService *srv = esdp->timer_service;
-#endif
     ErtsBifTimer *btmp = (ErtsBifTimer *) vbtmp;
     bif_timer_timeout(srv, btmp, btmp->type.head.roflgs);
     tw_timer_dec_refc(&btmp->type.twt);
@@ -1317,11 +1107,7 @@ create_hl_timer(ErtsSchedulerData *esdp,
 		int short_time, ErtsTmrType type,
 		void *rcvrp, Eterm rcvr,
 		Eterm msg,
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-                ErtsMagicBinary *mbin,
-#else
                 Uint32 *refn,
-#endif
 		void (*callback)(void *), void *arg)
 {
     ErtsHLTimerService *srv = esdp->timer_service;
@@ -1407,11 +1193,7 @@ create_hl_timer(ErtsSchedulerData *esdp,
         refc += init_btm_specifics(esdp,
                                    (ErtsBifTimer *) tmr,
                                    msg,
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-                                   mbin
-#else
                                    refn
-#endif
             );
     }
 
@@ -1628,7 +1410,6 @@ cleanup_sched_local_canceled_timer(ErtsSchedulerData *esdp,
     ERTS_HLT_ASSERT((tmr->head.roflgs & ERTS_TMR_ROFLG_SID_MASK)
 		    == (Uint32) esdp->no);
 
-#ifndef ERTS_MAGIC_REF_BIF_TIMERS
     if (roflgs & ERTS_TMR_ROFLG_BIF_TMR) {
         ErtsBifTimer *btm = (ErtsBifTimer *) tmr;
 	if (btm->btm.tree.parent != ERTS_HLT_PFIELD_NOT_IN_TABLE) {
@@ -1636,7 +1417,6 @@ cleanup_sched_local_canceled_timer(ErtsSchedulerData *esdp,
 	    btm->btm.tree.parent = ERTS_HLT_PFIELD_NOT_IN_TABLE;
 	}
     }
-#endif
 
     if (roflgs & ERTS_TMR_ROFLG_HLT) {
 	hlt_delete_timer(esdp, &tmr->hlt);
@@ -1909,9 +1689,6 @@ setup_bif_timer(Process *c_p, int twheel, ErtsMonotonicTime timeout_pos,
     Eterm ref, tmo_msg, *hp;
     ErtsBifTimer *tmr;
     ErtsSchedulerData *esdp;
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-    Binary *mbin;
-#endif
     Eterm tmp_hp[4];
     ErtsCreateTimerFunc create_timer;
 
@@ -1920,18 +1697,10 @@ setup_bif_timer(Process *c_p, int twheel, ErtsMonotonicTime timeout_pos,
 
     esdp = erts_proc_sched_data(c_p);
 
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-    mbin = erts_create_magic_indirection(bif_timer_ref_destructor);
-    hp = HAlloc(c_p, ERTS_MAGIC_REF_THING_SIZE);
-    ref = erts_mk_magic_ref(&hp, &c_p->off_heap, mbin);
-    ASSERT(erts_get_ref_numbers_thr_id(((ErtsMagicBinary *)mbin)->refn)
-           == (Uint32) esdp->no);
-#else
     hp = HAlloc(c_p, ERTS_REF_THING_SIZE);
     ref = erts_sched_make_ref_in_buffer(esdp, hp);
     ASSERT(erts_get_ref_numbers_thr_id(internal_ordinary_ref_numbers(ref))
            == (Uint32) esdp->no);
-#endif
 
     tmo_msg = wrap ? TUPLE3(tmp_hp, am_timeout, ref, msg) : msg;
 
@@ -1939,11 +1708,7 @@ setup_bif_timer(Process *c_p, int twheel, ErtsMonotonicTime timeout_pos,
     tmr = (ErtsBifTimer *) create_timer(esdp, timeout_pos,
                                         short_time, ERTS_TMR_BIF,
                                         NULL, rcvr, tmo_msg,
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-                                        (ErtsMagicBinary *) mbin,
-#else
                                         internal_ordinary_ref_numbers(ref),
-#endif
                                         NULL, NULL);
 
     if (is_internal_pid(rcvr)) {
@@ -1951,14 +1716,10 @@ setup_bif_timer(Process *c_p, int twheel, ErtsMonotonicTime timeout_pos,
 					  rcvr, ERTS_PROC_LOCK_BTM,
 					  ERTS_P2P_FLG_INC_REFC);
 	if (!proc) {
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-            btm_clear_magic_binary(tmr);
-#else
             if (tmr->btm.tree.parent != ERTS_HLT_PFIELD_NOT_IN_TABLE) {
                 btm_rbt_delete(&esdp->timer_service->btm_tree, tmr);
                 tmr->btm.tree.parent = ERTS_HLT_PFIELD_NOT_IN_TABLE;
             }
-#endif
 	    if (tmr->btm.bp)
 		free_message_buffer(tmr->btm.bp);
             if (twheel)
@@ -1968,11 +1729,7 @@ setup_bif_timer(Process *c_p, int twheel, ErtsMonotonicTime timeout_pos,
             timer_destroy((ErtsTimer *) tmr, twheel, 1);
 	}
 	else {
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-            proc_btm_list_insert(&proc->bif_timers, tmr);
-#else
 	    proc_btm_rbt_insert(&proc->bif_timers, tmr);
-#endif
 	    erts_proc_unlock(proc, ERTS_PROC_LOCK_BTM);
             tmr->type.head.receiver.proc = proc;
 	}
@@ -2000,10 +1757,6 @@ cancel_bif_timer(ErtsBifTimer *tmr)
     if (state != ERTS_TMR_STATE_ACTIVE)
 	return 0;
 
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-    btm_clear_magic_binary(tmr);
-#endif
-
     if (tmr->btm.bp)
 	free_message_buffer(tmr->btm.bp);
 
@@ -2022,19 +1775,12 @@ cancel_bif_timer(ErtsBifTimer *tmr)
 	 * the btm tree by itself (it may be in
 	 * the middle of tree destruction).
 	 */
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-        if (!ERTS_PROC_IS_EXITING(proc) && tmr->btm.proc_list.next) {
-            proc_btm_list_delete(&proc->bif_timers, tmr);
-            res = 1;
-        }
-#else
 	if (!ERTS_PROC_IS_EXITING(proc)
 	    && tmr->btm.proc_tree.parent != ERTS_HLT_PFIELD_NOT_IN_TABLE) {
 	    proc_btm_rbt_delete(&proc->bif_timers, tmr);
 	    tmr->btm.proc_tree.parent = ERTS_HLT_PFIELD_NOT_IN_TABLE;
 	    res = 1;
 	}
-#endif
 	erts_proc_unlock(proc, ERTS_PROC_LOCK_BTM);
     }
 
@@ -2075,12 +1821,10 @@ access_btm(ErtsBifTimer *tmr, Uint32 sid, ErtsSchedulerData *esdp, int cancel)
             queue_canceled_timer(esdp, sid, (ErtsTimer *) tmr);
     }
     else {
-#ifndef ERTS_MAGIC_REF_BIF_TIMERS
         if (tmr->btm.tree.parent != ERTS_HLT_PFIELD_NOT_IN_TABLE) {
 	    btm_rbt_delete(&esdp->timer_service->btm_tree, tmr);
 	    tmr->btm.tree.parent = ERTS_HLT_PFIELD_NOT_IN_TABLE;
 	}
-#endif
         if (is_hlt) {
             if (cncl_res > 0)
                 hl_timer_dec_refc(&tmr->type.hlt, tmr->type.hlt.head.roflgs);
@@ -2157,52 +1901,6 @@ send_async_info(Process *proc, ErtsProcLocks initial_locks,
     return am_ok;
 }
 
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-
-static BIF_RETTYPE
-access_bif_timer(Process *c_p, Eterm tref, int cancel, int async, int info)
-{
-    BIF_RETTYPE ret;
-    Eterm res;
-    Sint64 time_left;
-
-    if (!is_internal_magic_ref(tref)) {
-	if (is_not_ref(tref)) {
-            ERTS_BIF_PREP_ERROR(ret, c_p, BADARG);
-            return ret;
-        }
-        time_left = -1;
-    }
-    else {
-        ErtsMagicBinary *mbin;
-        mbin = (ErtsMagicBinary *) erts_magic_ref2bin(tref);
-        if (mbin->destructor != bif_timer_ref_destructor)
-            time_left = -1;
-        else {
-            ErtsBifTimer *tmr;
-            Uint32 sid;
-            tmr = magic_binary_to_btm(mbin);
-            sid = erts_get_ref_numbers_thr_id(internal_magic_ref_numbers(tref));
-            ASSERT(1 <= sid && sid <= erts_no_schedulers);
-            time_left = access_btm(tmr, sid, erts_proc_sched_data(c_p), cancel);
-        }
-    }
-
-    if (!info)
-        res = am_ok;
-    else if (!async)
-        res = return_info(c_p, time_left);
-    else
-        res = send_async_info(c_p, ERTS_PROC_LOCK_MAIN,
-                              tref, cancel, time_left);
-
-    ERTS_BIF_PREP_RET(ret, res);
-
-    return ret;
-}
-
-#else /* !ERTS_MAGIC_REF_BIF_TIMERS */
-
 static ERTS_INLINE Eterm
 send_sync_info(Process *proc, ErtsProcLocks initial_locks,
                Uint32 *refn, int cancel, Sint64 time_left)
@@ -2505,8 +2203,6 @@ no_timer:
     return no_timer_result(c_p, tref, cancel, async, info);
 }
 
-#endif /* !ERTS_MAGIC_REF_BIF_TIMERS */
-
 static ERTS_INLINE int
 bool_arg(Eterm val, int *argp)
 {
@@ -2567,9 +2263,10 @@ parse_bif_timer_options(Eterm option_list, int *async,
     return 1;
 }
 
-static void
-exit_cancel_bif_timer(ErtsBifTimer *tmr, void *vesdp)
+static int
+exit_cancel_bif_timer(ErtsBifTimer *tmr, void *vesdp, Sint reds)
 {
+#define ERTS_BTM_CANCEL_REDS 80
     ErtsSchedulerData *esdp = (ErtsSchedulerData *) vesdp;
     Uint32 sid, roflgs;
     erts_aint_t state;
@@ -2584,32 +2281,23 @@ exit_cancel_bif_timer(ErtsBifTimer *tmr, void *vesdp)
     is_hlt = !!(roflgs & ERTS_TMR_ROFLG_HLT);
 
     ERTS_HLT_ASSERT(sid == erts_get_ref_numbers_thr_id(ERTS_BTM_HLT2REFN(tmr)));
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-    ERTS_HLT_ASSERT(tmr->btm.proc_list.next);
-#else
     ERTS_HLT_ASSERT(tmr->btm.proc_tree.parent
 		    != ERTS_HLT_PFIELD_NOT_IN_TABLE);
     tmr->btm.proc_tree.parent = ERTS_HLT_PFIELD_NOT_IN_TABLE;
-#endif
 
     if (state == ERTS_TMR_STATE_ACTIVE) {
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-        btm_clear_magic_binary(tmr);
-#endif
         if (tmr->btm.bp)
             free_message_buffer(tmr->btm.bp);
 
         if (sid != (Uint32) esdp->no) {
             queue_canceled_timer(esdp, sid, (ErtsTimer *) tmr);
-            return;
+            return ERTS_BTM_CANCEL_REDS;
         }
 
-#ifndef ERTS_MAGIC_REF_BIF_TIMERS
         if (tmr->btm.tree.parent != ERTS_HLT_PFIELD_NOT_IN_TABLE) {
 	    btm_rbt_delete(&esdp->timer_service->btm_tree, tmr);
 	    tmr->btm.tree.parent = ERTS_HLT_PFIELD_NOT_IN_TABLE;
 	}
-#endif
         if (is_hlt)
             hlt_delete_timer(esdp, &tmr->type.hlt);
         else
@@ -2619,36 +2307,19 @@ exit_cancel_bif_timer(ErtsBifTimer *tmr, void *vesdp)
         hl_timer_dec_refc(&tmr->type.hlt, roflgs);
     else
         tw_timer_dec_refc(&tmr->type.twt);
+    return ERTS_BTM_CANCEL_REDS;
 }
 
-#ifdef ERTS_HLT_DEBUG
-#  define ERTS_BTM_MAX_DESTROY_LIMIT 2
-#else
-#  define ERTS_BTM_MAX_DESTROY_LIMIT 50
-#endif
-
-#ifndef ERTS_MAGIC_REF_BIF_TIMERS
 typedef struct {
     ErtsBifTimers *bif_timers;
     union {
 	proc_btm_rbt_yield_state_t proc_btm_yield_state;
     } u;
 } ErtsBifTimerYieldState;
-#endif
 
-int erts_cancel_bif_timers(Process *p, ErtsBifTimers **btm, void **vyspp)
+int erts_cancel_bif_timers(Process *p, ErtsBifTimers **btm, void **vyspp, int reds)
 {
     ErtsSchedulerData *esdp = erts_proc_sched_data(p);
-
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-
-    return proc_btm_list_foreach_destroy_yielding(btm,
-                                                  exit_cancel_bif_timer,
-                                                  (void *) esdp,
-                                                  ERTS_BTM_MAX_DESTROY_LIMIT);
-
-#else /* !ERTS_MAGIC_REF_BIF_TIMERS */
-
     ErtsBifTimerYieldState ys = {*btm, {ERTS_RBT_YIELD_STAT_INITER}};
     ErtsBifTimerYieldState *ysp;
     int res;
@@ -2661,9 +2332,9 @@ int erts_cancel_bif_timers(Process *p, ErtsBifTimers **btm, void **vyspp)
 						exit_cancel_bif_timer,
 						(void *) esdp,
 						&ysp->u.proc_btm_yield_state,
-						ERTS_BTM_MAX_DESTROY_LIMIT);
+						reds);
 
-    if (res == 0) {
+    if (res > 0) {
 	if (ysp != &ys)
 	    erts_free(ERTS_ALC_T_BTM_YIELD_STATE, ysp);
 	*vyspp = NULL;
@@ -2682,7 +2353,6 @@ int erts_cancel_bif_timers(Process *p, ErtsBifTimers **btm, void **vyspp)
 
     return res;
 
-#endif /* !ERTS_MAGIC_REF_BIF_TIMERS */
 }
 
 static ERTS_INLINE int
@@ -3116,11 +2786,6 @@ btm_print(ErtsBifTimer *tmr, void *vbtmp, ErtsMonotonicTime tpos, int is_hlt)
     ErtsMonotonicTime left;
     Eterm receiver;
 
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-    if (!(tmr->type.head.roflgs & ERTS_TMR_ROFLG_BIF_TMR))
-        return;
-#endif
-
     if (is_hlt) {
         ERTS_HLT_ASSERT(tmr->type.head.roflgs & ERTS_TMR_ROFLG_HLT);
         if (tmr->type.hlt.timeout <= btmp->now)
@@ -3149,24 +2814,8 @@ btm_print(ErtsBifTimer *tmr, void *vbtmp, ErtsMonotonicTime tpos, int is_hlt)
 	       (Sint64) left);
 }
 
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-
-static void
-hlt_btm_print(ErtsHLTimer *tmr, void *vbtmp)
-{
-    btm_print((ErtsBifTimer *) tmr, vbtmp, 0, 1);
-}
-
-static void
-twt_btm_print(void *vbtmp, ErtsMonotonicTime tpos, void *vtwtp)
-{
-    btm_print((ErtsBifTimer *) vtwtp, vbtmp, tpos, 0);
-}
-
-#else
-
-static void
-btm_tree_print(ErtsBifTimer *tmr, void *vbtmp)
+static int
+btm_tree_print(ErtsBifTimer *tmr, void *vbtmp, Sint reds)
 {
     int is_hlt = !!(tmr->type.head.roflgs & ERTS_TMR_ROFLG_HLT);
     ErtsMonotonicTime tpos;
@@ -3175,10 +2824,9 @@ btm_tree_print(ErtsBifTimer *tmr, void *vbtmp)
     else
         tpos = erts_tweel_read_timeout(&tmr->type.twt.u.tw_tmr);
     btm_print(tmr, vbtmp, tpos, is_hlt);
+    return 1;
 }
 
-#endif
-
 void
 erts_print_bif_timer_info(fmtfn_t to, void *to_arg)
 {
@@ -3196,15 +2844,7 @@ erts_print_bif_timer_info(fmtfn_t to, void *to_arg)
     for (six = 0; six < erts_no_schedulers; six++) {
 	ErtsHLTimerService *srv =
 	    erts_aligned_scheduler_data[six].esd.timer_service;
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-	ErtsTimerWheel *twheel =
-	    erts_aligned_scheduler_data[six].esd.timer_wheel;
-	erts_twheel_debug_foreach(twheel, tw_bif_timer_timeout,
-				  twt_btm_print, (void *) &btmp);
-	time_rbt_foreach(srv->time_tree, hlt_btm_print, (void *) &btmp);
-#else
 	btm_rbt_foreach(srv->btm_tree, btm_tree_print, (void *) &btmp);
-#endif
     }
 }
 
@@ -3216,13 +2856,9 @@ typedef struct {
     void *arg;
 } ErtsBTMForeachDebug;
 
-static void
-debug_btm_foreach(ErtsBifTimer *tmr, void *vbtmfd)
+static int
+debug_btm_foreach(ErtsBifTimer *tmr, void *vbtmfd, Sint reds)
 {
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-    if (!(tmr->type.head.roflgs & ERTS_TMR_ROFLG_BIF_TMR))
-        return;
-#endif
     if (erts_atomic32_read_nob(&tmr->btm.state) == ERTS_TMR_STATE_ACTIVE) {
 	ErtsBTMForeachDebug *btmfd = (ErtsBTMForeachDebug *) vbtmfd;
         Eterm id = ((tmr->type.head.roflgs & ERTS_TMR_ROFLG_REG_NAME)
@@ -3230,24 +2866,9 @@ debug_btm_foreach(ErtsBifTimer *tmr, void *vbtmfd)
                     : tmr->type.head.receiver.proc->common.id);
 	(*btmfd->func)(id, tmr->btm.message, tmr->btm.bp, btmfd->arg);
     }
+    return 1;
 }
 
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-
-static void
-hlt_debug_btm_foreach(ErtsHLTimer *tmr, void *vbtmfd)
-{
-    debug_btm_foreach((ErtsBifTimer *) tmr, vbtmfd);
-}
-
-static void
-twt_debug_btm_foreach(void *vbtmfd, ErtsMonotonicTime tpos, void *vtwtp)
-{
-    debug_btm_foreach((ErtsBifTimer *) vtwtp, vbtmfd);
-}
-
-#endif
-
 void
 erts_debug_bif_timer_foreach(void (*func)(Eterm,
 					  Eterm,
@@ -3267,20 +2888,9 @@ erts_debug_bif_timer_foreach(void (*func)(Eterm,
     for (six = 0; six < erts_no_schedulers; six++) {
 	ErtsHLTimerService *srv =
 	    erts_aligned_scheduler_data[six].esd.timer_service;
-#ifdef ERTS_MAGIC_REF_BIF_TIMERS
-	ErtsTimerWheel *twheel =
-	    erts_aligned_scheduler_data[six].esd.timer_wheel;            
-	erts_twheel_debug_foreach(twheel, tw_bif_timer_timeout,
-				  twt_debug_btm_foreach,
-                                  (void *) &btmfd);
-        time_rbt_foreach(srv->time_tree,
-                         hlt_debug_btm_foreach,
-                         (void *) &btmfd);
-#else
 	btm_rbt_foreach(srv->btm_tree,
 			debug_btm_foreach,
 			(void *) &btmfd);
-#endif
     }
 }
 
@@ -3305,8 +2915,8 @@ debug_callback_timer_foreach_list(ErtsHLTimer *tmr, void *vdfct)
 		      tmr->head.u.arg);
 }
 
-static void
-debug_callback_timer_foreach(ErtsHLTimer *tmr, void *vdfct)
+static int
+debug_callback_timer_foreach(ErtsHLTimer *tmr, void *vdfct, Sint reds)
 {
     ErtsDebugForeachCallbackTimer *dfct
 	= (ErtsDebugForeachCallbackTimer *) vdfct;
@@ -3321,6 +2931,7 @@ debug_callback_timer_foreach(ErtsHLTimer *tmr, void *vdfct)
 	(*dfct->func)(dfct->arg,
 		      tmr->timeout,
 		      tmr->head.u.arg);
+    return 1;
 }
 
 static void
@@ -3368,7 +2979,8 @@ erts_debug_callback_timer_foreach(void (*tclbk)(void *),
 
 	if (srv->yield.root)
 	    debug_callback_timer_foreach(srv->yield.root,
-					 (void *) &dfct);
+					 (void *) &dfct,
+                                         -1);
 
 	time_rbt_foreach(srv->time_tree,
 			 debug_callback_timer_foreach,
@@ -3403,9 +3015,7 @@ st_hdbg_func(ErtsHLTimer *tmr, void *vhdbg)
     }
     ERTS_HLT_ASSERT(tmr->time.tree.u.l.next->time.tree.u.l.prev == tmr);
     ERTS_HLT_ASSERT(tmr->time.tree.u.l.prev->time.tree.u.l.next == tmr);
-#ifndef ERTS_MAGIC_REF_BIF_TIMERS
     ERTS_HLT_ASSERT(btm_rbt_lookup(hdbg->srv->btm_tree, ERTS_BTM_HLT2REFN(tmr)) == tmr);
-#endif
 }
 
 static void
@@ -3434,10 +3044,8 @@ tt_hdbg_func(ErtsHLTimer *tmr, void *vhdbg)
 				& ~ERTS_HLT_PFLGS_MASK);
 	ERTS_HLT_ASSERT(tmr == prnt);
     }
-#ifndef ERTS_MAGIC_REF_BIF_TIMERS
     if (tmr->head.roflgs & ERTS_TMR_ROFLG_BIF_TMR)
 	ERTS_HLT_ASSERT(btm_rbt_lookup(hdbg->srv->btm_tree, ERTS_BTM_HLT2REFN(tmr)) == tmr);
-#endif
     if (tmr->time.tree.same_time) {
 	ErtsHdbgHLT st_hdbg;
 	st_hdbg.srv = hdbg->srv;
@@ -3503,7 +3111,6 @@ hdbg_chk_srv(ErtsHLTimerService *srv)
 	time_rbt_foreach(srv->time_tree, tt_hdbg_func, (void *) &hdbg);
 	ERTS_HLT_ASSERT(hdbg.found_root);
     }
-#ifndef ERTS_MAGIC_REF_BIF_TIMERS
     if (srv->btm_tree) {
 	ErtsHdbgHLT hdbg;
 	hdbg.srv = srv;
@@ -3512,7 +3119,6 @@ hdbg_chk_srv(ErtsHLTimerService *srv)
 	btm_rbt_foreach(srv->btm_tree, bt_hdbg_func, (void *) &hdbg);
 	ERTS_HLT_ASSERT(hdbg.found_root);
     }
-#endif
 }
 
 #endif /* ERTS_HLT_HARD_DEBUG */
diff --git a/erts/emulator/beam/erl_hl_timer.h b/erts/emulator/beam/erl_hl_timer.h
index e6f5e8b67d..29c873868b 100644
--- a/erts/emulator/beam/erl_hl_timer.h
+++ b/erts/emulator/beam/erl_hl_timer.h
@@ -56,7 +56,7 @@ void erts_cancel_proc_timer(Process *);
 void erts_set_port_timer(Port *, Sint64);
 void erts_cancel_port_timer(Port *);
 Sint64 erts_read_port_timer(Port *);
-int erts_cancel_bif_timers(Process *, ErtsBifTimers **, void **);
+int erts_cancel_bif_timers(Process *, ErtsBifTimers **, void **, int);
 int erts_detach_accessor_bif_timers(Process *, ErtsBifTimers *, void **);
 ErtsHLTimerService *erts_create_timer_service(void);
 void erts_hl_timer_init(void);
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 99e788c718..547e4064a2 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -78,7 +78,7 @@ const char etp_erts_version[] = ERLANG_VERSION;
 const char etp_otp_release[] = ERLANG_OTP_RELEASE;
 const char etp_compile_date[] = ERLANG_COMPILE_DATE;
 const char etp_arch[] = ERLANG_ARCHITECTURE;
-#ifdef ERTS_ENABLE_KERNEL_POLL
+#if ERTS_ENABLE_KERNEL_POLL
 const int erts_use_kernel_poll = 1;
 const int etp_kernel_poll_support = 1;
 #else
@@ -128,7 +128,7 @@ const Eterm etp_hole_marker = 0;
 
 static int modified_sched_thread_suggested_stack_size = 0;
 
-Eterm erts_init_process_id;
+Eterm erts_init_process_id = ERTS_INVALID_PID;
 
 /*
  * Note about VxWorks: All variables must be initialized by executable code,
@@ -163,7 +163,6 @@ int erts_initialized = 0;
  * Configurable parameters.
  */
 
-Uint display_items;	    	/* no of items to display in traces etc */
 int H_MIN_SIZE;			/* The minimum heap grain */
 int BIN_VH_MIN_SIZE;		/* The minimum binary virtual*/
 int H_MAX_SIZE;			/* The maximum heap size */
@@ -354,6 +353,7 @@ erl_init(int ncpu,
     erts_init_bif();
     erts_init_bif_chksum();
     erts_init_bif_binary();
+    erts_init_bif_guard();
     erts_init_bif_persistent_term();
     erts_init_bif_re();
     erts_init_unicode(); /* after RE to get access to PCRE unicode */
@@ -376,22 +376,37 @@ erl_init(int ncpu,
 }
 
 static Eterm
-erl_first_process_otp(char* modname, void* code, unsigned size, int argc, char** argv)
+
+erl_spawn_system_process(Process* parent, Eterm mod, Eterm func, Eterm args,
+                         ErlSpawnOpts *so)
+{
+    Eterm res;
+    int arity;
+
+    ERTS_LC_ASSERT(ERTS_PROC_LOCK_MAIN & erts_proc_lc_my_proc_locks(parent));
+    arity = erts_list_length(args);
+
+    if (erts_find_function(mod, func, arity, erts_active_code_ix()) == NULL) {
+	erts_exit(ERTS_ERROR_EXIT, "No function %T:%T/%i\n", mod, func, arity);
+    }
+
+    so->flags |= SPO_SYSTEM_PROC;
+
+    res = erl_create_process(parent, mod, func, args, so);
+
+    return res;
+}
+
+static Eterm
+erl_first_process_otp(char* mod_name, int argc, char** argv)
 {
     int i;
-    Eterm start_mod;
     Eterm args;
     Eterm res;
     Eterm* hp;
     Process parent;
     ErlSpawnOpts so;
-    Eterm env;
-    
-    start_mod = erts_atom_put((byte *) modname, sys_strlen(modname), ERTS_ATOM_ENC_LATIN1, 1);
-    if (erts_find_function(start_mod, am_start, 2,
-			   erts_active_code_ix()) == NULL) {
-	erts_exit(ERTS_ERROR_EXIT, "No function %s:start/2\n", modname);
-    }
+    Eterm boot_mod;
 
     /*
      * We need a dummy parent process to be able to call erl_create_process().
@@ -399,6 +414,7 @@ erl_first_process_otp(char* modname, void* code, unsigned size, int argc, char**
 
     erts_init_empty_process(&parent);
     erts_proc_lock(&parent, ERTS_PROC_LOCK_MAIN);
+
     hp = HAlloc(&parent, argc*2 + 4);
     args = NIL;
     for (i = argc-1; i >= 0; i--) {
@@ -406,49 +422,76 @@ erl_first_process_otp(char* modname, void* code, unsigned size, int argc, char**
 	args = CONS(hp, new_binary(&parent, (byte*)argv[i], len), args);
 	hp += 2;
     }
-    env = new_binary(&parent, code, size);
+    boot_mod = erts_atom_put((byte *) mod_name, sys_strlen(mod_name),
+                             ERTS_ATOM_ENC_LATIN1, 1);
     args = CONS(hp, args, NIL);
     hp += 2;
-    args = CONS(hp, env, args);
+    args = CONS(hp, boot_mod, args);
+
+    so.flags = erts_default_spo_flags;
+    res = erl_spawn_system_process(&parent, am_erl_init, am_start, args, &so);
+    ASSERT(is_internal_pid(res));
 
-    so.flags = erts_default_spo_flags|SPO_SYSTEM_PROC;
-    res = erl_create_process(&parent, start_mod, am_start, args, &so);
     erts_proc_unlock(&parent, ERTS_PROC_LOCK_MAIN);
     erts_cleanup_empty_process(&parent);
+
     return res;
 }
 
 static Eterm
 erl_system_process_otp(Eterm parent_pid, char* modname, int off_heap_msgq, int prio)
-{
-    Eterm start_mod;
-    Process* parent;
+{ 
+    Process *parent;
     ErlSpawnOpts so;
-    Eterm res;
-
-    start_mod = erts_atom_put((byte *) modname, sys_strlen(modname), ERTS_ATOM_ENC_LATIN1, 1);
-    if (erts_find_function(start_mod, am_start, 0,
-			   erts_active_code_ix()) == NULL) {
-	erts_exit(ERTS_ERROR_EXIT, "No function %s:start/0\n", modname);
-    }
+    Eterm mod, res;
 
     parent = erts_pid2proc(NULL, 0, parent_pid, ERTS_PROC_LOCK_MAIN);
+    mod = erts_atom_put((byte *) modname, sys_strlen(modname),
+                        ERTS_ATOM_ENC_LATIN1, 1);
 
-    so.flags = erts_default_spo_flags|SPO_SYSTEM_PROC|SPO_USE_ARGS;
-    if (off_heap_msgq)
+    so.flags = erts_default_spo_flags|SPO_USE_ARGS;
+
+    if (off_heap_msgq) {
         so.flags |= SPO_OFF_HEAP_MSGQ;
-    so.min_heap_size    = H_MIN_SIZE;
-    so.min_vheap_size   = BIN_VH_MIN_SIZE;
-    so.max_heap_size    = H_MAX_SIZE;
-    so.max_heap_flags   = H_MAX_FLAGS;
-    so.priority         = prio;
-    so.max_gen_gcs      = (Uint16) erts_atomic32_read_nob(&erts_max_gen_gcs);
-    so.scheduler        = 0;
-    res = erl_create_process(parent, start_mod, am_start, NIL, &so);
+    }
+
+    so.min_heap_size  = H_MIN_SIZE;
+    so.min_vheap_size = BIN_VH_MIN_SIZE;
+    so.max_heap_size  = H_MAX_SIZE;
+    so.max_heap_flags = H_MAX_FLAGS;
+    so.priority       = prio;
+    so.max_gen_gcs    = (Uint16) erts_atomic32_read_nob(&erts_max_gen_gcs);
+    so.scheduler      = 0;
+
+    res = erl_spawn_system_process(parent, mod, am_start, NIL, &so);
+    ASSERT(is_internal_pid(res));
+
     erts_proc_unlock(parent, ERTS_PROC_LOCK_MAIN);
+
     return res;
 }
 
+Eterm erts_internal_spawn_system_process_3(BIF_ALIST_3) {
+    Eterm mod, func, args, res;
+    ErlSpawnOpts so;
+
+    mod = BIF_ARG_1;
+    func = BIF_ARG_2;
+    args = BIF_ARG_3;
+
+    ASSERT(is_atom(mod));
+    ASSERT(is_atom(func));
+    ASSERT(erts_list_length(args) >= 0);
+
+    so.flags = erts_default_spo_flags;
+    res = erl_spawn_system_process(BIF_P, mod, func, args, &so);
+
+    if (is_non_value(res)) {
+        BIF_ERROR(BIF_P, so.error_code);
+    }
+
+    BIF_RET(res);
+}
 
 Eterm
 erts_preloaded(Process* p)
@@ -482,7 +525,6 @@ erts_preloaded(Process* p)
 /* static variables that must not change (use same values at restart) */
 static char* program;
 static char* init = "init";
-static char* boot = "boot";
 static int    boot_argc;
 static char** boot_argv;
 
@@ -536,9 +578,6 @@ void erts_usage(void)
     int this_rel = this_rel_num();
     erts_fprintf(stderr, "Usage: %s [flags] [ -- [init_args] ]\n", progname(program));
     erts_fprintf(stderr, "The flags are:\n\n");
-
-    /*    erts_fprintf(stderr, "-# number  set the number of items to be used in traces etc\n"); */
-
     erts_fprintf(stderr, "-a size        suggested stack size in kilo words for threads\n");
     erts_fprintf(stderr, "               in the async-thread pool, valid range is [%d-%d]\n",
 		 ERTS_ASYNC_THREAD_MIN_STACK_SIZE,
@@ -546,18 +585,15 @@ void erts_usage(void)
     erts_fprintf(stderr, "-A number      set number of threads in async thread pool,\n");
     erts_fprintf(stderr, "               valid range is [0-%d]\n",
 		 ERTS_MAX_NO_OF_ASYNC_THREADS);
-
     erts_fprintf(stderr, "-B[c|d|i]      c to have Ctrl-c interrupt the Erlang shell,\n");
     erts_fprintf(stderr, "               d (or no extra option) to disable the break\n");
     erts_fprintf(stderr, "               handler, i to ignore break signals\n");
-
-    /*    erts_fprintf(stderr, "-b func    set the boot function (default boot)\n"); */
-
     erts_fprintf(stderr, "-c bool        enable or disable time correction\n");
     erts_fprintf(stderr, "-C mode        set time warp mode; valid modes are:\n");
     erts_fprintf(stderr, "               no_time_warp|single_time_warp|multi_time_warp\n");
     erts_fprintf(stderr, "-d             don't write a crash dump for internally detected errors\n");
     erts_fprintf(stderr, "               (halt(String) will still produce a crash dump)\n");
+    erts_fprintf(stderr, "-dcg           set the limit for the number of decentralized counter groups\n");
     erts_fprintf(stderr, "-fn[u|a|l]     Control how filenames are interpreted\n");
     erts_fprintf(stderr, "-hms size      set minimum heap size in words (default %d)\n",
 	       H_DEFAULT_SIZE);
@@ -571,7 +607,6 @@ void erts_usage(void)
 	       erts_pd_initial_size);
     erts_fprintf(stderr, "-hmqd  val     set default message queue data flag for processes,\n");
     erts_fprintf(stderr, "               valid values are: off_heap | on_heap\n");
-
     erts_fprintf(stderr, "-IOp number    set number of pollsets to be used to poll for I/O,\n");
     erts_fprintf(stderr, "               This value has to be equal or smaller than the\n");
     erts_fprintf(stderr, "               number of poll threads. If the current platform\n");
@@ -582,9 +617,7 @@ void erts_usage(void)
     erts_fprintf(stderr, "               number of poll threads.");
     erts_fprintf(stderr, "-IOPt number   set number of threads to be used to poll for I/O\n");
     erts_fprintf(stderr, "               as a percentage of the number of schedulers.");
-
-    /*    erts_fprintf(stderr, "-i module  set the boot module (default init)\n"); */
-
+    erts_fprintf(stderr, "-i module      set the boot module (default init)\n");
     erts_fprintf(stderr, "-n[s|a|d]      Control behavior of signals to ports\n");
     erts_fprintf(stderr, "               Note that this flag is deprecated!\n");
     erts_fprintf(stderr, "-M<X> <Y>      memory allocator switches,\n");
@@ -599,7 +632,6 @@ void erts_usage(void)
     erts_fprintf(stderr, "-R number      set compatibility release number,\n");
     erts_fprintf(stderr, "               valid range [%d-%d]\n",
 		 this_rel-2, this_rel);
-
     erts_fprintf(stderr, "-r             force ets memory block to be moved on realloc\n");
     erts_fprintf(stderr, "-rg amount     set reader groups limit\n");
     erts_fprintf(stderr, "-sbt type      set scheduler bind type, valid types are:\n");
@@ -670,9 +702,7 @@ void erts_usage(void)
     erts_fprintf(stderr, "-T number      set modified timing level, valid range is [0-%d]\n",
 		 ERTS_MODIFIED_TIMING_LEVELS-1);
     erts_fprintf(stderr, "-V             print Erlang version\n");
-
     erts_fprintf(stderr, "-v             turn on chatty mode (GCs will be reported etc)\n");
-
     erts_fprintf(stderr, "-W<i|w|e>      set error logger warnings mapping,\n");
     erts_fprintf(stderr, "               see error_logger documentation for details\n");
     erts_fprintf(stderr, "-zdbbl size    set the distribution buffer busy limit in kilobytes\n");
@@ -756,6 +786,8 @@ early_init(int *argc, char **argv) /*
     int dirty_io_scheds;
     int max_reader_groups;
     int reader_groups;
+    int max_decentralized_counter_groups;
+    int decentralized_counter_groups;
     char envbuf[21]; /* enough for any 64-bit integer */
     size_t envbufsz;
 
@@ -763,7 +795,6 @@ early_init(int *argc, char **argv) /*
 
     erts_sched_compact_load = 1;
     erts_printf_eterm_func = erts_printf_term;
-    display_items = 200;
     erts_backtrace_depth = DEFAULT_BACKTRACE_SIZE;
     erts_async_max_threads = ERTS_DEFAULT_NO_ASYNC_THREADS;
     erts_async_thread_suggested_stack_size = ERTS_ASYNC_THREAD_MIN_STACK_SIZE;
@@ -776,7 +807,8 @@ early_init(int *argc, char **argv) /*
 
     erts_initialized = 0;
 
-    erts_pre_early_init_cpu_topology(&max_reader_groups,
+    erts_pre_early_init_cpu_topology(&max_decentralized_counter_groups,
+                                     &max_reader_groups,
 				     &ncpu,
 				     &ncpuonln,
 				     &ncpuavail);
@@ -837,6 +869,24 @@ early_init(int *argc, char **argv) /*
 	    }
 	    if (argv[i][0] == '-') {
 		switch (argv[i][1]) {
+		case 'd': {
+		    char *sub_param = argv[i]+2;
+		    if (has_prefix("cg", sub_param)) {
+			char *arg = get_arg(sub_param+2, argv[i+1], &i);
+			if (sscanf(arg, "%d", &max_decentralized_counter_groups) != 1) {
+			    erts_fprintf(stderr,
+					 "bad decentralized counter groups limit: %s\n", arg);
+			    erts_usage();
+			}
+			if (max_decentralized_counter_groups < 0) {
+			    erts_fprintf(stderr,
+					 "bad decentralized counter groups limit: %d\n",
+					 max_decentralized_counter_groups);
+			    erts_usage();
+			}
+		    }
+		    break;
+		}
 		case 'r': {
 		    char *sub_param = argv[i]+2;
 		    if (has_prefix("g", sub_param)) {
@@ -1158,8 +1208,10 @@ early_init(int *argc, char **argv) /*
     erts_early_init_cpu_topology(no_schedulers,
 				 &max_main_threads,
 				 max_reader_groups,
-				 &reader_groups);
-
+				 &reader_groups,
+                                 max_decentralized_counter_groups,
+                                 &decentralized_counter_groups);
+    erts_flxctr_setup(decentralized_counter_groups);
     {
 	erts_thr_late_init_data_t elid = ERTS_THR_LATE_INIT_DATA_DEF_INITER;
 	elid.mem.std.alloc = ethr_std_alloc;
@@ -1270,25 +1322,9 @@ erl_start(int argc, char **argv)
 
 	    /*
 	     * NOTE: -M flags are handled (and removed from argv) by
-	     * erts_alloc_init(). 
-	     *
-	     * The -d, -m, -S, -t, and -T flags was removed in
-	     * Erlang 5.3/OTP R9C.
-	     *
-	     * -S, and -T has been reused in Erlang 5.5/OTP R11B.
-	     *
-	     * -d has been reused in a patch R12B-4.
+	     * erts_alloc_init().
 	     */
 
-	case '#' :
-	    arg = get_arg(argv[i]+2, argv[i+1], &i);
-	    if ((display_items = atoi(arg)) == 0) {
-		erts_fprintf(stderr, "bad display items%s\n", arg);
-		erts_usage();
-	    }
-	    VERBOSE(DEBUG_SYSTEM,
-                    ("using display items %d\n",display_items));
-	    break;
 	case 'p':
 	    if (!sys_strncmp(argv[i],"-pc",3)) {
 		int printable_chars = ERL_PRINTABLE_CHARACTERS_LATIN1;
@@ -1567,11 +1603,6 @@ erl_start(int argc, char **argv)
 	    init = get_arg(argv[i]+2, argv[i+1], &i);
 	    break;
 
-	case 'b':
-	    /* define name of initial function */
-	    boot = get_arg(argv[i]+2, argv[i+1], &i);
-	    break;
-
 	case 'B':
 	  if (argv[i][2] == 'i')          /* +Bi */
 	    ignore_break = 1;
@@ -2257,8 +2288,8 @@ erl_start(int argc, char **argv)
 
     erts_initialized = 1;
 
-    erts_init_process_id = erl_first_process_otp("otp_ring0", NULL, 0,
-                                                 boot_argc, boot_argv);
+    erts_init_process_id = erl_first_process_otp(init, boot_argc, boot_argv);
+    ASSERT(erts_init_process_id != ERTS_INVALID_PID);
 
     {
 	/*
diff --git a/erts/emulator/beam/erl_lock_check.c b/erts/emulator/beam/erl_lock_check.c
index 1416c5f96c..3aab4828cc 100644
--- a/erts/emulator/beam/erl_lock_check.c
+++ b/erts/emulator/beam/erl_lock_check.c
@@ -42,6 +42,7 @@
 #include "erl_term.h"
 #include "erl_threads.h"
 #include "erl_atom_table.h"
+#include "erl_utils.h"
 
 typedef struct {
     char *name;
@@ -91,6 +92,8 @@ static erts_lc_lock_order_t erts_lock_order[] = {
     {	"db_tab",				"address"		},
     {	"db_tab_fix",				"address"		},
     {	"db_hash_slot",				"address"		},
+    {	"erl_db_catree_base_node",		NULL		        },
+    {	"erl_db_catree_route_node",		"index"		        },
     {	"resource_monitors",			"address"	        },
     {   "driver_list",                          NULL                    },
     {	"proc_msgq",				"pid"			},
@@ -193,6 +196,12 @@ struct lc_locked_lock_t_ {
     unsigned int line;
     erts_lock_flags_t flags;
     erts_lock_options_t taken_options;
+    /*
+     * Pointer back to the lock instance if it exists or NULL for proc locks.
+     * If set, we use it to allow trylock of other lock instance
+     * but with identical lock order as an already locked lock.
+     */
+    erts_lc_lock_t *lck;
 };
 
 typedef struct {
@@ -406,6 +415,10 @@ new_locked_lock(lc_thread_t* thr,
     ll->line = line;
     ll->flags = lck->flags;
     ll->taken_options = options;
+    if ((lck->flags & ERTS_LOCK_FLAGS_MASK_TYPE) == ERTS_LOCK_FLAGS_TYPE_PROCLOCK)
+        ll->lck = NULL;
+    else
+        ll->lck = lck;
     return ll;
 }
 
@@ -709,6 +722,14 @@ erts_lc_get_lock_order_id(char *name)
     return (Sint16) -1;
 }
 
+static int
+lc_is_term_order(Sint16 id)
+{
+    return erts_lock_order[id].internal_order != NULL
+        && sys_strcmp(erts_lock_order[id].internal_order, "term") == 0;
+}
+
+
 static int compare_locked_by_id(lc_locked_lock_t *locked_lock, erts_lc_lock_t *comparand)
 {
     if(locked_lock->id < comparand->id) {
@@ -720,18 +741,23 @@ static int compare_locked_by_id(lc_locked_lock_t *locked_lock, erts_lc_lock_t *c
     return 0;
 }
 
-static int compare_locked_by_id_extra(lc_locked_lock_t *locked_lock, erts_lc_lock_t *comparand)
+static int compare_locked_by_id_extra(lc_locked_lock_t *ll, erts_lc_lock_t *comparand)
 {
-    int order = compare_locked_by_id(locked_lock, comparand);
+    int order = compare_locked_by_id(ll, comparand);
 
     if(order) {
         return order;
-    } else if(locked_lock->extra < comparand->extra) {
+    }
+    if (ll->flags & ERTS_LOCK_FLAGS_PROPERTY_TERM_ORDER) {
+        ASSERT(!is_header(ll->extra) && !is_header(comparand->extra));
+        return CMP(ll->extra, comparand->extra);
+    }
+
+    if(ll->extra < comparand->extra) {
         return -1;
-    } else if(locked_lock->extra > comparand->extra) {
+    } else if(ll->extra > comparand->extra) {
         return 1;
     }
-
     return 0;
 }
 
@@ -970,7 +996,8 @@ erts_lc_trylock_force_busy_flg(erts_lc_lock_t *lck, erts_lock_options_t options)
 	return 0;
     }
     else {
-	lc_locked_lock_t *tl_lck;
+        lc_locked_lock_t *ll;
+        int order;
 
 	ASSERT(thr->locked.last);
 
@@ -979,25 +1006,25 @@ erts_lc_trylock_force_busy_flg(erts_lc_lock_t *lck, erts_lock_options_t options)
 	    type_order_violation("trylocking ", thr, lck);
 #endif
 
-	if (thr->locked.last->id < lck->id
-	    || (thr->locked.last->id == lck->id
-		&& thr->locked.last->extra < lck->extra))
-	    return 0;
+        ll = thr->locked.last;
+        order = compare_locked_by_id_extra(ll, lck);
+
+	if (order < 0)
+            return 0;
 
 	/*
-	 * Lock order violation
+	 * TryLock order violation
 	 */
 
-
-	/* Check that we are not trying to lock this lock twice */
-	for (tl_lck = thr->locked.last; tl_lck; tl_lck = tl_lck->prev) {
-	    if (tl_lck->id < lck->id
-		|| (tl_lck->id == lck->id && tl_lck->extra <= lck->extra)) {
-		if (tl_lck->id == lck->id && tl_lck->extra == lck->extra)
-		    lock_twice("Trylocking", thr, lck, options);
-		break;
-	    }
-	}
+        /* Check that we are not trying to lock this lock twice */
+        do {
+            if (order == 0 && (ll->lck == lck || !ll->lck))
+                lock_twice("Trylocking", thr, lck, options);
+            ll = ll->prev;
+            if (!ll)
+                break;
+            order = compare_locked_by_id_extra(ll, lck);
+        } while (order >= 0);
 
 #ifndef ERTS_LC_ALLWAYS_FORCE_BUSY_TRYLOCK_ON_LOCK_ORDER_VIOLATION
 	/* We only force busy if a lock order violation would occur
@@ -1044,10 +1071,10 @@ void erts_lc_trylock_flg_x(int locked, erts_lc_lock_t *lck, erts_lock_options_t
 #endif
 
 	for (tl_lck = thr->locked.last; tl_lck; tl_lck = tl_lck->prev) {
-	    if (tl_lck->id < lck->id
-		|| (tl_lck->id == lck->id && tl_lck->extra <= lck->extra)) {
-		if (tl_lck->id == lck->id && tl_lck->extra == lck->extra)
-		    lock_twice("Trylocking", thr, lck, options);
+            int order = compare_locked_by_id_extra(tl_lck, lck);
+	    if (order <= 0) {
+                if (order == 0 && (tl_lck->lck == lck || !tl_lck->lck))
+                    lock_twice("Trylocking", thr, lck, options);
 		if (locked) {
 		    ll->next = tl_lck->next;
 		    ll->prev = tl_lck;
@@ -1089,10 +1116,10 @@ void erts_lc_require_lock_flg(erts_lc_lock_t *lck, erts_lock_options_t options,
 	for (l_lck2 = thr->required.last;
 	     l_lck2;
 	     l_lck2 = l_lck2->prev) {
-	    if (l_lck2->id < lck->id
-		|| (l_lck2->id == lck->id && l_lck2->extra < lck->extra))
+            int order = compare_locked_by_id_extra(l_lck2, lck);
+	    if (order < 0)
 		break;
-	    else if (l_lck2->id == lck->id && l_lck2->extra == lck->extra)
+	    if (order == 0)
 		require_twice(thr, lck);
 	}
 	if (!l_lck2) {
@@ -1150,6 +1177,7 @@ void erts_lc_lock_flg_x(erts_lc_lock_t *lck, erts_lock_options_t options,
 {
     lc_thread_t *thr;
     lc_locked_lock_t *new_ll;
+    int order;
 
     if (lck->inited != ERTS_LC_INITITALIZED)
 	uninitialized_lock();
@@ -1165,10 +1193,10 @@ void erts_lc_lock_flg_x(erts_lc_lock_t *lck, erts_lock_options_t options,
 	thr->locked.last = thr->locked.first = new_ll;
         ASSERT(0 < lck->id && lck->id < ERTS_LOCK_ORDER_SIZE);
         thr->matrix.m[lck->id][0] = 1;
+        return;
     }
-    else if (thr->locked.last->id < lck->id
-	     || (thr->locked.last->id == lck->id
-		 && thr->locked.last->extra < lck->extra)) {
+    order = compare_locked_by_id_extra(thr->locked.last, lck);
+    if (order < 0) {
         lc_locked_lock_t* ll;
 	if (LOCK_IS_TYPE_ORDER_VIOLATION(lck->flags, thr->locked.last->flags)) {
 	    type_order_violation("locking ", thr, lck);
@@ -1186,7 +1214,7 @@ void erts_lc_lock_flg_x(erts_lc_lock_t *lck, erts_lock_options_t options,
 	thr->locked.last->next = new_ll;
 	thr->locked.last = new_ll;
     }
-    else if (thr->locked.last->id == lck->id && thr->locked.last->extra == lck->extra)
+    else if (order == 0)
 	lock_twice("Locking", thr, lck, options);
     else
 	lock_order_violation(thr, lck);
@@ -1298,7 +1326,6 @@ void
 erts_lc_init_lock(erts_lc_lock_t *lck, char *name, erts_lock_flags_t flags)
 {
     lck->id = erts_lc_get_lock_order_id(name);
-
     lck->extra = (UWord) &lck->extra;
     ASSERT(is_not_immed(lck->extra));
     lck->flags = flags;
@@ -1311,8 +1338,13 @@ erts_lc_init_lock_x(erts_lc_lock_t *lck, char *name, erts_lock_flags_t flags, Et
 {
     lck->id = erts_lc_get_lock_order_id(name);
     lck->extra = extra;
-    ASSERT(is_immed(lck->extra));
     lck->flags = flags;
+    if (lc_is_term_order(lck->id)) {
+        lck->flags |= ERTS_LOCK_FLAGS_PROPERTY_TERM_ORDER;
+        ASSERT(!is_header(lck->extra));
+    }
+    else
+        ASSERT(is_immed(lck->extra));
     lck->taken_options = 0;
     lck->inited = ERTS_LC_INITITALIZED;
 }
diff --git a/erts/emulator/beam/erl_lock_check.h b/erts/emulator/beam/erl_lock_check.h
index d10e32985a..b32f27d9f9 100644
--- a/erts/emulator/beam/erl_lock_check.h
+++ b/erts/emulator/beam/erl_lock_check.h
@@ -104,7 +104,7 @@ Eterm erts_lc_dump_graph(void);
 
 #define erts_lc_lock(lck) erts_lc_lock_x(lck,__FILE__,__LINE__)
 #define erts_lc_trylock(res,lck) erts_lc_trylock_x(res,lck,__FILE__,__LINE__)
-#define erts_lc_lock_flg(lck) erts_lc_lock_flg_x(lck,__FILE__,__LINE__)
-#define erts_lc_trylock_flg(res,lck) erts_lc_trylock_flg_x(res,lck,__FILE__,__LINE__)
+#define erts_lc_lock_flg(lck,flg) erts_lc_lock_flg_x(lck,flg,__FILE__,__LINE__)
+#define erts_lc_trylock_flg(res,lck,flg) erts_lc_trylock_flg_x(res,lck,flg,__FILE__,__LINE__)
 
 #endif /* #ifndef ERTS_LOCK_CHECK_H__ */
diff --git a/erts/emulator/beam/erl_lock_count.h b/erts/emulator/beam/erl_lock_count.h
index 89d95a73cf..0d47b16e0b 100644
--- a/erts/emulator/beam/erl_lock_count.h
+++ b/erts/emulator/beam/erl_lock_count.h
@@ -532,7 +532,7 @@ ERTS_GLB_INLINE
 void lcnt_dec_lock_state__(ethr_atomic_t *l_state) {
     ethr_sint_t state = ethr_atomic_dec_read_acqb(l_state);
 
-    /* We can not assume that state is >= -1 here; unlock and unacquire might
+    /* We cannot assume that state is >= -1 here; unlock and unacquire might
      * bring it below -1 and race to increment it back. */
 
     if(state < 0) {
diff --git a/erts/emulator/beam/erl_lock_flags.h b/erts/emulator/beam/erl_lock_flags.h
index d711f69456..2db133b598 100644
--- a/erts/emulator/beam/erl_lock_flags.h
+++ b/erts/emulator/beam/erl_lock_flags.h
@@ -28,15 +28,17 @@
 
 /* Property/category are bitfields to simplify their use in masks. */
 #define ERTS_LOCK_FLAGS_MASK_CATEGORY (0xFFC0)
-#define ERTS_LOCK_FLAGS_MASK_PROPERTY (0x0030)
+#define ERTS_LOCK_FLAGS_MASK_PROPERTY (0x0038)
 
 /* Type is a plain number. */
-#define ERTS_LOCK_FLAGS_MASK_TYPE     (0x000F)
+#define ERTS_LOCK_FLAGS_MASK_TYPE     (0x0007)
 
 #define ERTS_LOCK_FLAGS_TYPE_SPINLOCK (1)
 #define ERTS_LOCK_FLAGS_TYPE_MUTEX    (2)
 #define ERTS_LOCK_FLAGS_TYPE_PROCLOCK (3)
 
+/* Lock checker use real term order instead of raw word compare */
+#define ERTS_LOCK_FLAGS_PROPERTY_TERM_ORDER (1 << 3)
 /* "Static" guarantees that the lock will never be destroyed once created. */
 #define ERTS_LOCK_FLAGS_PROPERTY_STATIC     (1 << 4)
 #define ERTS_LOCK_FLAGS_PROPERTY_READ_WRITE (1 << 5)
diff --git a/erts/emulator/beam/erl_map.c b/erts/emulator/beam/erl_map.c
index cba17d3e6a..62dd85e425 100644
--- a/erts/emulator/beam/erl_map.c
+++ b/erts/emulator/beam/erl_map.c
@@ -125,15 +125,20 @@ BIF_RETTYPE map_size_1(BIF_ALIST_1) {
 	flatmap_t *mp = (flatmap_t*)flatmap_val(BIF_ARG_1);
 	BIF_RET(make_small(flatmap_get_size(mp)));
     } else if (is_hashmap(BIF_ARG_1)) {
-	Eterm *head, *hp, res;
-	Uint size, hsz=0;
+	Eterm *head;
+	Uint size;
 
 	head = hashmap_val(BIF_ARG_1);
 	size = head[1];
-	(void) erts_bld_uint(NULL, &hsz, size);
-	hp = HAlloc(BIF_P, hsz);
-	res = erts_bld_uint(&hp, NULL, size);
-	BIF_RET(res);
+
+        /*
+         * As long as a small has 28 bits (on a 32-bit machine) for
+         * the integer itself, it is impossible to build a map whose
+         * size would not fit in a small. Add an assertion in case we
+         * ever decreases the number of bits in a small.
+         */
+        ASSERT(IS_USMALL(0, size));
+        BIF_RET(make_small(size));
     }
 
     BIF_P->fvalue = BIF_ARG_1;
@@ -475,7 +480,7 @@ Eterm erts_hashmap_from_array(ErtsHeapFactory* factory, Eterm *leafs, Uint n,
 
 Eterm erts_map_from_ks_and_vs(ErtsHeapFactory *factory, Eterm *ks0, Eterm *vs0, Uint n)
 {
-    if (n < MAP_SMALL_MAP_LIMIT) {
+    if (n <= MAP_SMALL_MAP_LIMIT) {
         Eterm *ks, *vs, *hp;
 	flatmap_t *mp;
 	Eterm keys;
@@ -1505,25 +1510,6 @@ int hashmap_key_hash_cmp(Eterm* ap, Eterm* bp)
     return ap ? -1 : 1;
 }
 
-/* maps:new/0 */
-
-BIF_RETTYPE maps_new_0(BIF_ALIST_0) {
-    Eterm* hp;
-    Eterm tup;
-    flatmap_t *mp;
-
-    hp    = HAlloc(BIF_P, (MAP_HEADER_FLATMAP_SZ + 1));
-    tup   = make_tuple(hp);
-    *hp++ = make_arityval(0);
-
-    mp    = (flatmap_t*)hp;
-    mp->thing_word = MAP_HEADER_FLATMAP;
-    mp->size = 0;
-    mp->keys = tup;
-
-    BIF_RET(make_flatmap(mp));
-}
-
 /* maps:put/3 */
 
 BIF_RETTYPE maps_put_3(BIF_ALIST_3) {
@@ -1707,11 +1693,16 @@ int erts_maps_update(Process *p, Eterm key, Eterm value, Eterm map, Eterm *res)
 	return 0;
 
 found_key:
-	*hp++ = value;
-	vs++;
-	if (++i < n)
-	    sys_memcpy(hp, vs, (n - i)*sizeof(Eterm));
-	*res = make_flatmap(shp);
+        if(*vs == value) {
+            HRelease(p, shp + MAP_HEADER_FLATMAP_SZ + n, shp);
+            *res = map;
+        } else {
+	    *hp++ = value;
+	    vs++;
+	    if (++i < n)
+	       sys_memcpy(hp, vs, (n - i)*sizeof(Eterm));
+	    *res = make_flatmap(shp);
+        }
 	return 1;
     }
 
@@ -1767,9 +1758,7 @@ Eterm erts_maps_put(Process *p, Eterm key, Eterm value, Eterm map) {
 	if (is_immed(key)) {
 	    for( i = 0; i < n; i ++) {
 		if (ks[i] == key) {
-		    *hp++ = value;
-		    vs++;
-		    c = 1;
+                    goto found_key;
 		} else {
 		    *hp++ = *vs++;
 		}
@@ -1777,18 +1766,13 @@ Eterm erts_maps_put(Process *p, Eterm key, Eterm value, Eterm map) {
 	} else {
 	    for( i = 0; i < n; i ++) {
 		if (EQ(ks[i], key)) {
-		    *hp++ = value;
-		    vs++;
-		    c = 1;
+		    goto found_key;
 		} else {
 		    *hp++ = *vs++;
 		}
 	    }
 	}
 
-	if (c)
-	    return res;
-
 	/* the map will grow */
 
 	if (n >= MAP_SMALL_MAP_LIMIT) {
@@ -1843,6 +1827,18 @@ Eterm erts_maps_put(Process *p, Eterm key, Eterm value, Eterm map) {
 	 */
 	*shp = make_pos_bignum_header(0);
 	return res;
+
+found_key:
+        if(*vs == value) {
+            HRelease(p, shp + MAP_HEADER_FLATMAP_SZ + n, shp);
+            return map;
+        } else {
+            *hp++ = value;
+            vs++;
+            if (++i < n)
+               sys_memcpy(hp, vs, (n - i)*sizeof(Eterm));
+            return res;
+        }
     }
     ASSERT(is_hashmap(map));
 
diff --git a/erts/emulator/beam/erl_message.c b/erts/emulator/beam/erl_message.c
index a3274d7443..1bebf6efe2 100644
--- a/erts/emulator/beam/erl_message.c
+++ b/erts/emulator/beam/erl_message.c
@@ -181,7 +181,7 @@ erts_cleanup_offheap(ErlOffHeap *offheap)
 	    break;
 	default:
 	    ASSERT(is_external_header(u.hdr->thing_word));
-	    erts_deref_node_entry(u.ext->node);
+	    erts_deref_node_entry(u.ext->node, make_boxed(u.ep));
 	    break;
 	}
     }
@@ -201,34 +201,44 @@ free_message_buffer(ErlHeapFragment* bp)
     }while (bp != NULL);
 }
 
+static void
+erts_cleanup_message(ErtsMessage *mp)
+{
+    ErlHeapFragment *bp;
+    if (ERTS_SIG_IS_EXTERNAL_MSG(mp) || ERTS_SIG_IS_NON_MSG(mp)) {
+        ErtsDistExternal *edep = erts_proc_sig_get_external(mp);
+        if (edep) {
+            erts_free_dist_ext_copy(edep);
+            if (mp->data.heap_frag == &mp->hfrag) {
+                ASSERT(ERTS_SIG_IS_EXTERNAL_MSG(mp));
+                mp->data.heap_frag = ERTS_MSG_COMBINED_HFRAG;
+            }
+        }
+    }
+
+    if (ERTS_SIG_IS_MSG(mp) && mp->data.attached != ERTS_MSG_COMBINED_HFRAG) {
+        bp = mp->data.heap_frag;
+    } else {
+        /* All non msg signals are combined HFRAG messages,
+           but we overwrite the mp->data field with the
+           nm_signal queue ptr so have to fix that here
+           before freeing it. */
+        mp->data.attached = ERTS_MSG_COMBINED_HFRAG;
+        bp = mp->hfrag.next;
+        erts_cleanup_offheap(&mp->hfrag.off_heap);
+    }
+
+    if (bp)
+        free_message_buffer(bp);
+}
+
 void
 erts_cleanup_messages(ErtsMessage *msgp)
 {
     ErtsMessage *mp = msgp;
     while (mp) {
 	ErtsMessage *fmp;
-	ErlHeapFragment *bp;
-	if (ERTS_SIG_IS_EXTERNAL_MSG(mp)) {
-	    if (is_not_immed(ERL_MESSAGE_TOKEN(mp))) {
-		bp = (ErlHeapFragment *) mp->data.dist_ext->ext_endp;
-		erts_cleanup_offheap(&bp->off_heap);
-	    }
-	    if (mp->data.dist_ext)
-		erts_free_dist_ext_copy(mp->data.dist_ext);
-	}
-        else {
-	    if (ERTS_SIG_IS_INTERNAL_MSG(mp)
-                && mp->data.attached != ERTS_MSG_COMBINED_HFRAG) {
-		bp = mp->data.heap_frag;
-            }
-	    else {
-                mp->data.attached = ERTS_MSG_COMBINED_HFRAG;
-		bp = mp->hfrag.next;
-		erts_cleanup_offheap(&mp->hfrag.off_heap);
-	    }
-	    if (bp)
-		free_message_buffer(bp);
-	}
+	erts_cleanup_message(mp);
 	fmp = mp;
 	mp = mp->next;
 	erts_free_message(fmp);
@@ -260,6 +270,7 @@ void
 erts_queue_dist_message(Process *rcvr,
 			ErtsProcLocks rcvr_locks,
 			ErtsDistExternal *dist_ext,
+                        ErlHeapFragment *hfrag,
 			Eterm token,
                         Eterm from)
 {
@@ -268,8 +279,26 @@ erts_queue_dist_message(Process *rcvr,
 
     ERTS_LC_ASSERT(rcvr_locks == erts_proc_lc_my_proc_locks(rcvr));
 
-    mp = erts_alloc_message(0, NULL);
-    mp->data.dist_ext = dist_ext;
+    if (hfrag) {
+        /* Fragmented message, allocate a message reference */
+        mp = erts_alloc_message(0, NULL);
+        mp->data.heap_frag = hfrag;
+    } else {
+        /* Un-fragmented message, allocate space for
+           token and dist_ext in message. */
+        Uint dist_ext_sz = erts_dist_ext_size(dist_ext) / sizeof(Eterm);
+        Uint token_sz = size_object(token);
+        Uint sz = token_sz + dist_ext_sz;
+        Eterm *hp;
+
+        mp = erts_alloc_message(sz, &hp);
+        mp->data.heap_frag = &mp->hfrag;
+        mp->hfrag.used_size = token_sz;
+
+        erts_make_dist_ext_copy(dist_ext, erts_get_dist_ext(mp->data.heap_frag));
+
+        token = copy_struct(token, token_sz, &hp, &mp->data.heap_frag->off_heap);
+    }
 
     ERL_MESSAGE_FROM(mp) = dist_ext->dep->sysname;
     ERL_MESSAGE_TERM(mp) = THE_NON_VALUE;
@@ -493,25 +522,27 @@ Uint
 erts_msg_attached_data_size_aux(ErtsMessage *msg)
 {
     Sint sz;
-    ASSERT(is_non_value(ERL_MESSAGE_TERM(msg)));
-    ASSERT(msg->data.dist_ext);
-    ASSERT(msg->data.dist_ext->heap_size < 0);
-
-    sz = erts_decode_dist_ext_size(msg->data.dist_ext);
-    if (sz < 0) {
-	/* Bad external
-	 * We leave the message intact in this case as it's not worth the trouble
-	 * to make all callers remove it from queue. It will be detected again
-	 * and removed from message queue later anyway.
-	 */
-	return 0;
-    }
+    ErtsDistExternal *edep = erts_get_dist_ext(msg->data.heap_frag);
+    ASSERT(ERTS_SIG_IS_EXTERNAL_MSG(msg));
 
-    msg->data.dist_ext->heap_size = sz;
-    if (is_not_nil(msg->m[1])) {
-	ErlHeapFragment *heap_frag;
-	heap_frag = erts_dist_ext_trailer(msg->data.dist_ext);
-	sz += heap_frag->used_size;
+    if (edep->heap_size < 0) {
+
+        sz = erts_decode_dist_ext_size(edep, 1, 1);
+        if (sz < 0) {
+            /* Bad external
+             * We leave the message intact in this case as it's not worth the trouble
+             * to make all callers remove it from queue. It will be detected again
+             * and removed from message queue later anyway.
+             */
+            return 0;
+        }
+
+        edep->heap_size = sz;
+    } else {
+        sz = edep->heap_size;
+    }
+    if (is_not_nil(ERL_MESSAGE_TOKEN(msg))) {
+	sz += msg->data.heap_frag->used_size;
     }
     return sz;
 }
@@ -532,9 +563,7 @@ erts_try_alloc_message_on_heap(Process *pp,
 
     if ((*psp) & ERTS_PSFLGS_VOLATILE_HEAP)
 	goto in_message_fragment;
-    else if (
-	*plp & ERTS_PROC_LOCK_MAIN
-	) {
+    else if (*plp & ERTS_PROC_LOCK_MAIN) {
     try_on_heap:
 	if (((*psp) & ERTS_PSFLGS_VOLATILE_HEAP)
 	    || (pp->flags & F_DISABLE_GC)
@@ -747,6 +776,13 @@ erts_send_message(Process* sender,
 #endif
 
     erts_queue_proc_message(sender, receiver, *receiver_locks, mp, message);
+
+    if (msize > ERTS_MSG_COPY_WORDS_PER_REDUCTION) {
+        Uint reds = msize / ERTS_MSG_COPY_WORDS_PER_REDUCTION;
+        if (reds > CONTEXT_REDS)
+            reds = CONTEXT_REDS;
+        BUMP_REDS(sender, (int) reds);
+    }
 }
 
 
@@ -1101,84 +1137,28 @@ change_to_off_heap:
     return res;
 }
 
-int
-erts_decode_dist_message(Process *proc, ErtsProcLocks proc_locks,
-			 ErtsMessage *msgp, int force_off_heap)
+void erts_factory_proc_init(ErtsHeapFactory* factory, Process* p)
 {
-    ErtsHeapFactory factory;
-    Eterm msg;
-    ErlHeapFragment *bp;
-    Sint need;
-    int decode_in_heap_frag;
-
-    decode_in_heap_frag = (force_off_heap
-			   || !(proc_locks & ERTS_PROC_LOCK_MAIN)
-			   || (proc->flags & F_OFF_HEAP_MSGQ));
-
-    if (msgp->data.dist_ext->heap_size >= 0)
-	need = msgp->data.dist_ext->heap_size;
-    else {
-	need = erts_decode_dist_ext_size(msgp->data.dist_ext);
-	if (need < 0) {
-	    /* bad msg; remove it... */
-	    if (is_not_immed(ERL_MESSAGE_TOKEN(msgp))) {
-		bp = erts_dist_ext_trailer(msgp->data.dist_ext);
-		erts_cleanup_offheap(&bp->off_heap);
-	    }
-	    erts_free_dist_ext_copy(msgp->data.dist_ext);
-	    msgp->data.dist_ext = NULL;
-	    return 0;
-	}
-
-	msgp->data.dist_ext->heap_size = need;
-    }
-
-    if (is_not_immed(ERL_MESSAGE_TOKEN(msgp))) {
-	bp = erts_dist_ext_trailer(msgp->data.dist_ext);
-	need += bp->used_size;
-    }
-
-    if (decode_in_heap_frag)
-	erts_factory_heap_frag_init(&factory, new_message_buffer(need));
-    else
-	erts_factory_proc_prealloc_init(&factory, proc, need);
-
-    ASSERT(msgp->data.dist_ext->heap_size >= 0);
-    if (is_not_immed(ERL_MESSAGE_TOKEN(msgp))) {
-	ErlHeapFragment *heap_frag;
-	heap_frag = erts_dist_ext_trailer(msgp->data.dist_ext);
-	ERL_MESSAGE_TOKEN(msgp) = copy_struct(ERL_MESSAGE_TOKEN(msgp),
-					      heap_frag->used_size,
-					      &factory.hp,
-					      factory.off_heap);
-	erts_cleanup_offheap(&heap_frag->off_heap);
-    }
-
-    msg = erts_decode_dist_ext(&factory, msgp->data.dist_ext);
-    ERL_MESSAGE_TERM(msgp) = msg;
-    erts_free_dist_ext_copy(msgp->data.dist_ext);
-    msgp->data.attached = NULL;
-
-    if (is_non_value(msg)) {
-	erts_factory_undo(&factory);
-	return 0;
-    }
-
-    erts_factory_trim_and_close(&factory, msgp->m,
-				ERL_MESSAGE_REF_ARRAY_SZ);
-
-    ASSERT(!msgp->data.heap_frag);
-
-    if (decode_in_heap_frag)
-	msgp->data.heap_frag = factory.heap_frags;
-
-    return 1;
-}
+    /* This function does not use HAlloc to allocate on the heap
+       as we do not want to use INIT_HEAP_MEM on the allocated
+       heap as that completely destroys the DEBUG emulators
+       performance. */
+    ErlHeapFragment *bp = p->mbuf;
+    factory->mode     = FACTORY_HALLOC;
+    factory->p        = p;
+    factory->hp_start = HEAP_TOP(p);
+    factory->hp       = factory->hp_start;
+    factory->hp_end   = HEAP_LIMIT(p);
+    factory->off_heap = &p->off_heap;
+    factory->message  = NULL;
+    factory->off_heap_saved.first    = p->off_heap.first;
+    factory->off_heap_saved.overhead = p->off_heap.overhead;
+    factory->heap_frags_saved = bp;
+    factory->heap_frags_saved_used = bp ? bp->used_size : 0;
+    factory->heap_frags = NULL; /* not used */
+    factory->alloc_type = 0; /* not used */
 
-void erts_factory_proc_init(ErtsHeapFactory* factory,
-			    Process* p)
-{
-    erts_factory_proc_prealloc_init(factory, p, HEAP_LIMIT(p) - HEAP_TOP(p));
+    HEAP_TOP(p) = HEAP_LIMIT(p);
 }
 
 void erts_factory_proc_prealloc_init(ErtsHeapFactory* factory,
@@ -1235,7 +1215,7 @@ erts_factory_message_create(ErtsHeapFactory* factory,
     int on_heap;
     erts_aint32_t state;
 
-    state = proc ? erts_atomic32_read_nob(&proc->state) : 0;
+    state = proc ? erts_atomic32_read_nob(&proc->state) : ERTS_PSFLG_OFF_HEAP_MSGQ;
 
     if (state & ERTS_PSFLG_OFF_HEAP_MSGQ) {
 	msgp = erts_alloc_message(sz, &hp);
@@ -1468,8 +1448,8 @@ void erts_factory_close(ErtsHeapFactory* factory)
 	    else
 		factory->message->data.heap_frag = factory->heap_frags;
 
-	    /* Fall through */
-	case FACTORY_HEAP_FRAGS:
+    /* Fall through */
+    case FACTORY_HEAP_FRAGS:
 	    bp = factory->heap_frags;
 	}
 
@@ -1610,6 +1590,9 @@ void erts_factory_undo(ErtsHeapFactory* factory)
 	    factory->message->hfrag.next = factory->heap_frags;
 	else
 	    factory->message->data.heap_frag = factory->heap_frags;
+        /* Set the message to NIL in order for this message not to be
+           treated as a distributed message by the cleanup_messages logic */
+        factory->message->m[0] = NIL;
 	erts_cleanup_messages(factory->message);
 	break;
     case FACTORY_TMP:
diff --git a/erts/emulator/beam/erl_message.h b/erts/emulator/beam/erl_message.h
index b2550814fd..5bd25737a7 100644
--- a/erts/emulator/beam/erl_message.h
+++ b/erts/emulator/beam/erl_message.h
@@ -22,10 +22,17 @@
 #define __ERL_MESSAGE_H__
 
 #include "sys.h"
+#include "erl_vm.h"
 #define ERTS_PROC_SIG_QUEUE_TYPE_ONLY
 #include "erl_proc_sig_queue.h"
 #undef ERTS_PROC_SIG_QUEUE_TYPE_ONLY
 
+#ifdef DEBUG
+#define ERTS_MSG_COPY_WORDS_PER_REDUCTION 4
+#else
+#define ERTS_MSG_COPY_WORDS_PER_REDUCTION 64
+#endif
+
 struct proc_bin;
 struct external_thing_;
 
@@ -111,6 +118,7 @@ erts_produce_heap(ErtsHeapFactory* factory, Uint need, Uint xtra)
     }
     res = factory->hp;
     factory->hp += need;
+    INIT_HEAP_MEM(res, need);
     return res;
 }
 
@@ -138,7 +146,7 @@ typedef struct erl_heap_fragment ErlHeapFragment;
 struct erl_heap_fragment {
     ErlHeapFragment* next;	/* Next heap fragment */
     ErlOffHeap off_heap;	/* Offset heap data. */
-    Uint alloc_size;		/* Size in (half)words of mem */
+    Uint alloc_size;		/* Size in words of mem */
     Uint used_size;		/* With terms to be moved to heap by GC */
     Eterm mem[1];		/* Data */
 };
@@ -167,7 +175,6 @@ struct erl_heap_fragment {
 #define ERL_MESSAGE_REF_FIELDS__			\
     ErtsMessage *next;	/* Next message */		\
     union {						\
-	ErtsDistExternal *dist_ext;			\
 	ErlHeapFragment *heap_frag;			\
 	void *attached;					\
     } data;						\
@@ -438,7 +445,8 @@ ErlHeapFragment* new_message_buffer(Uint);
 ErlHeapFragment* erts_resize_message_buffer(ErlHeapFragment *, Uint,
 					    Eterm *, Uint);
 void free_message_buffer(ErlHeapFragment *);
-void erts_queue_dist_message(Process*, ErtsProcLocks, ErtsDistExternal *, Eterm, Eterm);
+void erts_queue_dist_message(Process*, ErtsProcLocks, ErtsDistExternal *,
+                             ErlHeapFragment *, Eterm, Eterm);
 void erts_queue_message(Process*, ErtsProcLocks,ErtsMessage*, Eterm, Eterm);
 void erts_queue_proc_message(Process* from,Process* to, ErtsProcLocks,ErtsMessage*, Eterm);
 void erts_queue_proc_messages(Process* from, Process* to, ErtsProcLocks,
@@ -455,8 +463,6 @@ Sint erts_move_messages_off_heap(Process *c_p);
 Sint erts_complete_off_heap_message_queue_change(Process *c_p);
 Eterm erts_change_message_queue_management(Process *c_p, Eterm new_state);
 
-int erts_decode_dist_message(Process *, ErtsProcLocks, ErtsMessage *, int);
-
 void erts_cleanup_messages(ErtsMessage *mp);
 
 void *erts_alloc_message_ref(void);
@@ -585,22 +591,11 @@ ERTS_GLB_INLINE Uint erts_used_frag_sz(const ErlHeapFragment* bp)
 ERTS_GLB_INLINE Uint erts_msg_attached_data_size(ErtsMessage *msg)
 {
     ASSERT(msg->data.attached);
-    if (is_value(ERL_MESSAGE_TERM(msg))) {
-	ErlHeapFragment *bp;
-        bp = erts_message_to_heap_frag(msg);
-	return erts_used_frag_sz(bp);
-    }
-    else if (msg->data.dist_ext->heap_size < 0)
-	return erts_msg_attached_data_size_aux(msg);
-    else {
-	Uint sz = msg->data.dist_ext->heap_size;
-	if (is_not_nil(ERL_MESSAGE_TOKEN(msg))) {
-	    ErlHeapFragment *heap_frag;
-	    heap_frag = erts_dist_ext_trailer(msg->data.dist_ext);
-	    sz += heap_frag->used_size;
-	}
-	return sz;
-    }
+
+    if (ERTS_SIG_IS_INTERNAL_MSG(msg))
+	return erts_used_frag_sz(erts_message_to_heap_frag(msg));
+
+    return erts_msg_attached_data_size_aux(msg);
 }
 
 #endif
diff --git a/erts/emulator/beam/erl_monitor_link.c b/erts/emulator/beam/erl_monitor_link.c
index 48d9bd4ca5..43028be39d 100644
--- a/erts/emulator/beam/erl_monitor_link.c
+++ b/erts/emulator/beam/erl_monitor_link.c
@@ -191,7 +191,8 @@ ml_cmp_keys(Eterm key1, Eterm key2)
                 if (n1->sysname != n2->sysname)
                     return n1->sysname < n2->sysname ? -1 : 1;
                 ASSERT(n1->creation != n2->creation);
-                return n1->creation < n2->creation ? -1 : 1;
+                if (n1->creation != 0 && n2->creation != 0)
+                    return n1->creation < n2->creation ? -1 : 1;
             }
 
             ndw1 = external_thing_data_words(et1);
@@ -335,7 +336,7 @@ ml_rbt_delete(ErtsMonLnkNode **root, ErtsMonLnkNode *ml)
 
 static void
 ml_rbt_foreach(ErtsMonLnkNode *root,
-               void (*func)(ErtsMonLnkNode *, void *),
+               ErtsMonLnkNodeFunc func,
                void *arg)
 {
     mon_lnk_rbt_foreach(root, func, arg);
@@ -348,7 +349,7 @@ typedef struct {
 
 static int
 ml_rbt_foreach_yielding(ErtsMonLnkNode *root,
-                        void (*func)(ErtsMonLnkNode *, void *),
+                        ErtsMonLnkNodeFunc func,
                         void *arg,
                         void **vyspp,
                         Sint limit)
@@ -362,7 +363,7 @@ ml_rbt_foreach_yielding(ErtsMonLnkNode *root,
 	ysp = &ys;
     res = mon_lnk_rbt_foreach_yielding(ysp->root, func, arg,
                                        &ysp->rbt_ystate, limit);
-    if (res == 0) {
+    if (res > 0) {
 	if (ysp != &ys)
 	    erts_free(ERTS_ALC_T_ML_YIELD_STATE, ysp);
 	*vyspp = NULL;
@@ -383,22 +384,22 @@ ml_rbt_foreach_yielding(ErtsMonLnkNode *root,
 }
 
 typedef struct {
-    void (*func)(ErtsMonLnkNode *, void *);
+    ErtsMonLnkNodeFunc func;
     void *arg;
 } ErtsMonLnkForeachDeleteContext;
 
-static void
-rbt_wrap_foreach_delete(ErtsMonLnkNode *ml, void *vctxt)
+static int
+rbt_wrap_foreach_delete(ErtsMonLnkNode *ml, void *vctxt, Sint reds)
 {
     ErtsMonLnkForeachDeleteContext *ctxt = vctxt;
     ERTS_ML_ASSERT(ml->flags & ERTS_ML_FLG_IN_TABLE);
     ml->flags &= ~ERTS_ML_FLG_IN_TABLE;
-    ctxt->func(ml, ctxt->arg);
+    return ctxt->func(ml, ctxt->arg, reds);
 }
 
 static void
 ml_rbt_foreach_delete(ErtsMonLnkNode **root,
-                      void (*func)(ErtsMonLnkNode *, void *),
+                      ErtsMonLnkNodeFunc func,
                       void *arg)
 {
     ErtsMonLnkForeachDeleteContext ctxt;
@@ -411,7 +412,7 @@ ml_rbt_foreach_delete(ErtsMonLnkNode **root,
 
 static int
 ml_rbt_foreach_delete_yielding(ErtsMonLnkNode **root,
-                               void (*func)(ErtsMonLnkNode *, void *),
+                               ErtsMonLnkNodeFunc func,
                                void *arg,
                                void **vyspp,
                                Sint limit)
@@ -433,7 +434,7 @@ ml_rbt_foreach_delete_yielding(ErtsMonLnkNode **root,
                                                (void *) &ctxt,
                                                &ysp->rbt_ystate,
                                                limit);
-    if (res == 0) {
+    if (res > 0) {
 	if (ysp != &ys)
 	    erts_free(ERTS_ALC_T_ML_YIELD_STATE, ysp);
 	*vyspp = NULL;
@@ -459,12 +460,11 @@ ml_rbt_foreach_delete_yielding(ErtsMonLnkNode **root,
 
 static int
 ml_dl_list_foreach_yielding(ErtsMonLnkNode *list,
-                            void (*func)(ErtsMonLnkNode *, void *),
+                            ErtsMonLnkNodeFunc func,
                             void *arg,
                             void **vyspp,
-                            Sint limit)
+                            Sint reds)
 {
-    Sint cnt = 0;
     ErtsMonLnkNode *ml = (ErtsMonLnkNode *) *vyspp;
 
     ERTS_ML_ASSERT(!ml || list);
@@ -475,28 +475,26 @@ ml_dl_list_foreach_yielding(ErtsMonLnkNode *list,
     if (ml) {
         do {
             ERTS_ML_ASSERT(ml->flags & ERTS_ML_FLG_IN_TABLE);
-            func(ml, arg);
+            reds -= func(ml, arg, reds);
             ml = ml->node.list.next;
-            cnt++;
-        } while (ml != list && cnt < limit);
+        } while (ml != list && reds > 0);
         if (ml != list) {
             *vyspp = (void *) ml;
-            return 1; /* yield */
+            return 0; /* yield */
         }
     }
 
     *vyspp = NULL;
-    return 0; /* done */
+    return reds <= 0 ? 1 : reds; /* done */
 }
 
 static int
 ml_dl_list_foreach_delete_yielding(ErtsMonLnkNode **list,
-                                   void (*func)(ErtsMonLnkNode *, void *),
+                                   ErtsMonLnkNodeFunc func,
                                    void *arg,
                                    void **vyspp,
-                                   Sint limit)
+                                   Sint reds)
 {
-    Sint cnt = 0;
     ErtsMonLnkNode *first = *list;
     ErtsMonLnkNode *ml = (ErtsMonLnkNode *) *vyspp;
 
@@ -510,19 +508,18 @@ ml_dl_list_foreach_delete_yielding(ErtsMonLnkNode **list,
             ErtsMonLnkNode *next = ml->node.list.next;
             ERTS_ML_ASSERT(ml->flags & ERTS_ML_FLG_IN_TABLE);
             ml->flags &= ~ERTS_ML_FLG_IN_TABLE;
-            func(ml, arg);
+            reds -= func(ml, arg, reds);
             ml = next;
-            cnt++;
-        } while (ml != first && cnt < limit);
+        } while (ml != first && reds > 0);
         if (ml != first) {
             *vyspp = (void *) ml;
-            return 1; /* yield */
+            return 0; /* yield */
         }
     }
 
     *vyspp = NULL;
     *list = NULL;
-    return 0; /* done */
+    return reds <= 0 ? 1 : reds; /* done */
 }
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
@@ -666,91 +663,122 @@ erts_monitor_tree_delete(ErtsMonitor **root, ErtsMonitor *mon)
 
 void
 erts_monitor_tree_foreach(ErtsMonitor *root,
-                          void (*func)(ErtsMonitor *, void *),
+                          ErtsMonitorFunc func,
                           void *arg)
 {
     ml_rbt_foreach((ErtsMonLnkNode *) root,
-                   (void (*)(ErtsMonLnkNode*, void*)) func,
+                   (ErtsMonLnkNodeFunc) func,
                    arg);
 }
 
+void
+erts_debug_monitor_tree_destroying_foreach(ErtsMonitor *root,
+                                           ErtsMonitorFunc func,
+                                           void *arg,
+                                           void *vysp)
+{
+    void *tmp_vysp = erts_alloc(ERTS_ALC_T_ML_YIELD_STATE,
+                                sizeof(ErtsMonLnkYieldState));
+    Sint reds;
+    sys_memcpy(tmp_vysp, tmp_vysp, sizeof(ErtsMonLnkYieldState));
+    do {
+        reds = ml_rbt_foreach_yielding((ErtsMonLnkNode *) root,
+                                       (ErtsMonLnkNodeFunc) func,
+                                       arg, &tmp_vysp, (Sint) INT_MAX);
+    } while (reds <= 0);
+    ERTS_ML_ASSERT(!tmp_vysp);
+}
+
 int
 erts_monitor_tree_foreach_yielding(ErtsMonitor *root,
-                                   void (*func)(ErtsMonitor *, void *),
+                                   ErtsMonitorFunc func,
                                    void *arg,
                                    void **vyspp,
                                    Sint limit)
 {
     return ml_rbt_foreach_yielding((ErtsMonLnkNode *) root,
-                                   (void (*)(ErtsMonLnkNode*, void*)) func,
+                                   (int (*)(ErtsMonLnkNode*, void*, Sint)) func,
                                    arg, vyspp, limit);
 }
 
 void
 erts_monitor_tree_foreach_delete(ErtsMonitor **root,
-                                 void (*func)(ErtsMonitor *, void *),
+                                 ErtsMonitorFunc func,
                                  void *arg)
 {
     ml_rbt_foreach_delete((ErtsMonLnkNode **) root,
-                          (void (*)(ErtsMonLnkNode*, void*)) func,
+                          (int (*)(ErtsMonLnkNode*, void*, Sint)) func,
                           arg);
 }
 
 int
 erts_monitor_tree_foreach_delete_yielding(ErtsMonitor **root,
-                                          void (*func)(ErtsMonitor *, void *),
+                                          ErtsMonitorFunc func,
                                           void *arg,
                                           void **vyspp,
                                           Sint limit)
 {
     return ml_rbt_foreach_delete_yielding((ErtsMonLnkNode **) root,
-                                          (void (*)(ErtsMonLnkNode*, void*)) func,
+                                          (int (*)(ErtsMonLnkNode*, void*, Sint)) func,
                                           arg, vyspp, limit);
 }
 
 void
 erts_monitor_list_foreach(ErtsMonitor *list,
-                          void (*func)(ErtsMonitor *, void *),
+                          ErtsMonitorFunc func,
                           void *arg)
 {
     void *ystate = NULL;
-    while (ml_dl_list_foreach_yielding((ErtsMonLnkNode *) list,
-                                       (void (*)(ErtsMonLnkNode *, void *)) func,
-                                       arg, &ystate, (Sint) INT_MAX));
+    while (!ml_dl_list_foreach_yielding((ErtsMonLnkNode *) list,
+                                        (int (*)(ErtsMonLnkNode *, void *, Sint)) func,
+                                        arg, &ystate, (Sint) INT_MAX));
+}
+
+void
+erts_debug_monitor_list_destroying_foreach(ErtsMonitor *list,
+                                           ErtsMonitorFunc func,
+                                           void *arg,
+                                           void *vysp)
+{
+    void *tmp_vysp = vysp;
+    while (!ml_dl_list_foreach_yielding((ErtsMonLnkNode *) list,
+                                        (int (*)(ErtsMonLnkNode *, void *, Sint)) func,
+                                        arg, &tmp_vysp, (Sint) INT_MAX));
+    ERTS_ML_ASSERT(!tmp_vysp);
 }
 
 int
 erts_monitor_list_foreach_yielding(ErtsMonitor *list,
-                                   void (*func)(ErtsMonitor *, void *),
+                                   ErtsMonitorFunc func,
                                    void *arg,
                                    void **vyspp,
                                    Sint limit)
 {
     return ml_dl_list_foreach_yielding((ErtsMonLnkNode *) list,
-                                       (void (*)(ErtsMonLnkNode *, void *)) func,
+                                       (int (*)(ErtsMonLnkNode *, void *, Sint)) func,
                                        arg, vyspp, limit);
 }
 
 void
 erts_monitor_list_foreach_delete(ErtsMonitor **list,
-                                 void (*func)(ErtsMonitor *, void *),
+                                 ErtsMonitorFunc func,
                                  void *arg)
 {
     void *ystate = NULL;
-    while (ml_dl_list_foreach_delete_yielding((ErtsMonLnkNode **) list,
-                                              (void (*)(ErtsMonLnkNode*, void*)) func,
-                                              arg, &ystate, (Sint) INT_MAX));
+    while (!ml_dl_list_foreach_delete_yielding((ErtsMonLnkNode **) list,
+                                               (int (*)(ErtsMonLnkNode*, void*, Sint)) func,
+                                               arg, &ystate, (Sint) INT_MAX));
 }
 
 int
 erts_monitor_list_foreach_delete_yielding(ErtsMonitor **list,
-                                          void (*func)(ErtsMonitor *, void *),
+                                          ErtsMonitorFunc func,
                                           void *arg,
                                           void **vyspp,
                                           Sint limit)
 {
     return ml_dl_list_foreach_delete_yielding((ErtsMonLnkNode **) list,
-                                              (void (*)(ErtsMonLnkNode*, void*)) func,
+                                              (int (*)(ErtsMonLnkNode*, void*, Sint)) func,
                                               arg, vyspp, limit);
 }
 
@@ -1074,92 +1102,110 @@ erts_link_tree_delete(ErtsLink **root, ErtsLink *lnk)
 
 void
 erts_link_tree_foreach(ErtsLink *root,
-                       void (*func)(ErtsLink *, void *),
+                       ErtsLinkFunc func,
                        void *arg)
 {
     ml_rbt_foreach((ErtsMonLnkNode *) root,
-                   (void (*)(ErtsMonLnkNode*, void*)) func,
+                   (ErtsMonLnkNodeFunc) func,
                    arg);
 
 }
 
+void
+erts_debug_link_tree_destroying_foreach(ErtsLink *root,
+                                        ErtsLinkFunc func,
+                                        void *arg,
+                                        void *vysp)
+{
+    void *tmp_vysp = erts_alloc(ERTS_ALC_T_ML_YIELD_STATE,
+                                sizeof(ErtsMonLnkYieldState));
+    Sint reds;
+    sys_memcpy(tmp_vysp, vysp, sizeof(ErtsMonLnkYieldState));
+    do {
+        reds = ml_rbt_foreach_yielding((ErtsMonLnkNode *) root,
+                                       (ErtsMonLnkNodeFunc) func,
+                                       arg, &tmp_vysp, (Sint) INT_MAX);
+    } while (reds <= 0);
+    ERTS_ML_ASSERT(!tmp_vysp);
+}
+
 int
 erts_link_tree_foreach_yielding(ErtsLink *root,
-                                void (*func)(ErtsLink *, void *),
+                                ErtsLinkFunc func,
                                 void *arg,
                                 void **vyspp,
                                 Sint limit)
 {
     return ml_rbt_foreach_yielding((ErtsMonLnkNode *) root,
-                                   (void (*)(ErtsMonLnkNode*, void*)) func,
+                                   (ErtsMonLnkNodeFunc) func,
                                    arg, vyspp, limit);
 }
 
 void
 erts_link_tree_foreach_delete(ErtsLink **root,
-                              void (*func)(ErtsLink *, void *),
+                              ErtsLinkFunc func,
                               void *arg)
 {
     ml_rbt_foreach_delete((ErtsMonLnkNode **) root,
-                          (void (*)(ErtsMonLnkNode*, void*)) func,
+                          (ErtsMonLnkNodeFunc) func,
                           arg);
 }
 
 int
 erts_link_tree_foreach_delete_yielding(ErtsLink **root,
-                                       void (*func)(ErtsLink *, void *),
+                                       ErtsLinkFunc func,
                                        void *arg,
                                        void **vyspp,
                                        Sint limit)
 {
     return ml_rbt_foreach_delete_yielding((ErtsMonLnkNode **) root,
-                                          (void (*)(ErtsMonLnkNode*, void*)) func,
+                                          (ErtsMonLnkNodeFunc) func,
                                           arg, vyspp, limit);
 }
 
 void
 erts_link_list_foreach(ErtsLink *list,
-                       void (*func)(ErtsLink *, void *),
+                       ErtsLinkFunc func,
                        void *arg)
 {
     void *ystate = NULL;
-    while (ml_dl_list_foreach_yielding((ErtsMonLnkNode *) list,
-                                       (void (*)(ErtsMonLnkNode *, void *)) func,
-                                       arg, &ystate, (Sint) INT_MAX));
+    while (!ml_dl_list_foreach_yielding((ErtsMonLnkNode *) list,
+                                        (ErtsMonLnkNodeFunc) func,
+                                        arg, &ystate, (Sint) INT_MAX));
 }
 
 int
 erts_link_list_foreach_yielding(ErtsLink *list,
-                                void (*func)(ErtsLink *, void *),
+                                ErtsLinkFunc func,
                                 void *arg,
                                 void **vyspp,
                                 Sint limit)
 {
     return ml_dl_list_foreach_yielding((ErtsMonLnkNode *) list,
-                                       (void (*)(ErtsMonLnkNode *, void *)) func,
+                                       (ErtsMonLnkNodeFunc) func,
                                        arg, vyspp, limit);
 }
 
 void
 erts_link_list_foreach_delete(ErtsLink **list,
-                               void (*func)(ErtsLink *, void *),
+                               ErtsLinkFunc func,
                                void *arg)
 {
     void *ystate = NULL;
-    while (ml_dl_list_foreach_delete_yielding((ErtsMonLnkNode **) list,
-                                              (void (*)(ErtsMonLnkNode*, void*)) func,
-                                              arg, &ystate, (Sint) INT_MAX));
+    while (!ml_dl_list_foreach_delete_yielding((ErtsMonLnkNode **) list,
+                                               (ErtsMonLnkNodeFunc) func,
+                                               arg, &ystate, (Sint) INT_MAX));
 }
 
 int
 erts_link_list_foreach_delete_yielding(ErtsLink **list,
-                                       void (*func)(ErtsLink *, void *),
+                                       int (*func)(ErtsLink *, void *, Sint),
                                        void *arg,
                                        void **vyspp,
                                        Sint limit)
 {
     return ml_dl_list_foreach_delete_yielding((ErtsMonLnkNode **) list,
-                                              (void (*)(ErtsMonLnkNode*, void*)) func,
+                                              (ErtsMonLnkNodeFunc) func,
                                               arg, vyspp, limit);
 }
 
diff --git a/erts/emulator/beam/erl_monitor_link.h b/erts/emulator/beam/erl_monitor_link.h
index ed7bf7d54a..86be400c09 100644
--- a/erts/emulator/beam/erl_monitor_link.h
+++ b/erts/emulator/beam/erl_monitor_link.h
@@ -439,6 +439,7 @@
     (ERTS_ML_FLG_EXTENDED|ERTS_ML_FLG_NAME)
 
 typedef struct ErtsMonLnkNode__ ErtsMonLnkNode;
+typedef int (*ErtsMonLnkNodeFunc)(ErtsMonLnkNode *, void *, Sint);
 
 typedef struct {
     UWord parent; /* Parent ptr and flags... */
@@ -622,6 +623,7 @@ erts_ml_dl_list_last__(ErtsMonLnkNode *list)
 
 
 typedef struct ErtsMonLnkNode__ ErtsMonitor;
+typedef int (*ErtsMonitorFunc)(ErtsMonitor *, void *, Sint);
 
 typedef struct {
     ErtsMonitor origin;
@@ -653,6 +655,7 @@ struct ErtsMonitorDataExtended__ {
 
 typedef struct ErtsMonitorSuspend__ ErtsMonitorSuspend;
 
+
 struct ErtsMonitorSuspend__ {
     ErtsMonitorData md; /* origin = suspender; target = suspendee */
     ErtsMonitorSuspend *next;
@@ -685,7 +688,7 @@ ErtsMonitor *erts_monitor_tree_lookup(ErtsMonitor *root, Eterm key);
  *
  * @brief Lookup or insert a monitor in a monitor tree
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - 'mon' monitor is not part of any tree or list
  * If the above is not true, bad things will happen.
  *
@@ -711,7 +714,7 @@ ErtsMonitor *erts_monotor_tree_lookup_insert(ErtsMonitor **root,
  * If it is not found, creates a monitor and returns a pointer to the
  * origin monitor.
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - no target monitors with the key 'target' exists in the tree.
  * If the above is not true, bad things will happen.
  *
@@ -738,7 +741,7 @@ ErtsMonitor *erts_monitor_tree_lookup_create(ErtsMonitor **root, int *created,
  *
  * @brief Insert a monitor in a monitor tree
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - no monitors with the same key that 'mon' exist in the tree
  * - 'mon' is not part of any list of tree
  * If the above are not true, bad things will happen.
@@ -754,7 +757,7 @@ void erts_monitor_tree_insert(ErtsMonitor **root, ErtsMonitor *mon);
  *
  * @brief Replace a monitor in a monitor tree
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - 'old' monitor and 'new' monitor have exactly the same key
  * - 'old' monitor is part of the tree
  * - 'new' monitor is not part of any tree or list
@@ -774,7 +777,7 @@ void erts_monitor_tree_replace(ErtsMonitor **root, ErtsMonitor *old,
  *
  * @brief Delete a monitor from a monitor tree
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - 'mon' monitor is part of the tree
  * If the above is not true, bad things will happen.
  *
@@ -789,7 +792,7 @@ void erts_monitor_tree_delete(ErtsMonitor **root, ErtsMonitor *mon);
  *
  * @brief Call a function for each monitor in a monitor tree
  *
- * The funcion 'func' will be called with a pointer to a monitor
+ * The function 'func' will be called with a pointer to a monitor
  * as first argument and 'arg' as second argument for each monitor
  * in the tree referred to by 'root'.
  *
@@ -802,7 +805,7 @@ void erts_monitor_tree_delete(ErtsMonitor **root, ErtsMonitor *mon);
  *
  */
 void erts_monitor_tree_foreach(ErtsMonitor *root,
-                               void (*func)(ErtsMonitor *, void *),
+                               ErtsMonitorFunc func,
                                void *arg);
 
 /**
@@ -810,9 +813,10 @@ void erts_monitor_tree_foreach(ErtsMonitor *root,
  * @brief Call a function for each monitor in a monitor tree. Yield
  *        if lots of monitors exist.
  *
- * The funcion 'func' will be called with a pointer to a monitor
+ * The function 'func' will be called with a pointer to a monitor
  * as first argument and 'arg' as second argument for each monitor
- * in the tree referred to by 'root'.
+ * in the tree referred to by 'root'. It should return the number of
+ * reductions the operator took to perform.
  *
  * It is assumed that:
  * - *yspp equals NULL on first call
@@ -835,27 +839,28 @@ void erts_monitor_tree_foreach(ErtsMonitor *root,
  *                              *yspp should be NULL. When done *yspp
  *                              will be NULL.
  *
- * @param[in]     limit         Maximum amount of monitors to process
- *                              before yielding.
+ * @param[in]     reds          Reductions available to execute before yielding.
  *
- * @returns                     A non-zero value when all monitors has been
- *                              processed, and zero when more work is needed.
+ * @returns                     The unconsumed reductions when all monitors
+ *                              have been processed, and zero when more work
+ *                              is needed.
  *
  */
 int erts_monitor_tree_foreach_yielding(ErtsMonitor *root,
-                                       void (*func)(ErtsMonitor *, void *),
+                                       ErtsMonitorFunc func,
                                        void *arg,
                                        void **vyspp,
-                                       Sint limit);
+                                       Sint reds);
 
 /**
  *
  * @brief Delete all monitors from a monitor tree and call a function for
  *        each monitor
  *
- * The funcion 'func' will be called with a pointer to a monitor
+ * The function 'func' will be called with a pointer to a monitor
  * as first argument and 'arg' as second argument for each monitor
- * in the tree referred to by 'root'.
+ * in the tree referred to by 'root'. It should return the number of
+ * reductions the operator took to perform.
  *
  * @param[in,out] root          Pointer to pointer to root of monitor tree
  *
@@ -866,7 +871,7 @@ int erts_monitor_tree_foreach_yielding(ErtsMonitor *root,
  *
  */
 void erts_monitor_tree_foreach_delete(ErtsMonitor **root,
-                                      void (*func)(ErtsMonitor *, void *),
+                                      ErtsMonitorFunc func,
                                       void *arg);
 
 /**
@@ -874,9 +879,10 @@ void erts_monitor_tree_foreach_delete(ErtsMonitor **root,
  * @brief Delete all monitors from a monitor tree and call a function for
  *        each monitor
  *
- * The funcion 'func' will be called with a pointer to a monitor
+ * The function 'func' will be called with a pointer to a monitor
  * as first argument and 'arg' as second argument for each monitor
- * in the tree referred to by 'root'.
+ * in the tree referred to by 'root'. It should return the number of
+ * reductions the operator took to perform.
  *
  * It is assumed that:
  * - *yspp equals NULL on first call
@@ -899,18 +905,18 @@ void erts_monitor_tree_foreach_delete(ErtsMonitor **root,
  *                              *yspp should be NULL. When done *yspp
  *                              will be NULL.
  *
- * @param[in]     limit         Maximum amount of monitors to process
- *                              before yielding.
+ * @param[in]     reds          Reductions available to execute before yielding.
  *
- * @returns                     A non-zero value when all monitors has been
- *                              processed, and zero when more work is needed.
+ * @returns                     The unconsumed reductions when all monitors
+ *                              have been processed, and zero when more work
+ *                              is needed.
  *
  */
 int erts_monitor_tree_foreach_delete_yielding(ErtsMonitor **root,
-                                              void (*func)(ErtsMonitor *, void *),
+                                              ErtsMonitorFunc func,
                                               void *arg,
                                               void **vyspp,
-                                              Sint limit);
+                                              Sint reds);
 
 /*
  * --- Monitor list operations --
@@ -920,7 +926,7 @@ int erts_monitor_tree_foreach_delete_yielding(ErtsMonitor **root,
  *
  * @brief Insert a monitor in a monitor list
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - 'mon' monitor is not part of any list or tree
  * If the above is not true, bad things will happen.
  *
@@ -935,7 +941,7 @@ ERTS_GLB_INLINE void erts_monitor_list_insert(ErtsMonitor **list, ErtsMonitor *m
  *
  * @brief Delete a monitor from a monitor list
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - 'mon' monitor is part of the list
  * If the above is not true, bad things will happen.
  *
@@ -980,7 +986,7 @@ ERTS_GLB_INLINE ErtsMonitor *erts_monitor_list_last(ErtsMonitor *list);
  *
  * @brief Call a function for each monitor in a monitor list
  *
- * The funcion 'func' will be called with a pointer to a monitor
+ * The function 'func' will be called with a pointer to a monitor
  * as first argument and 'arg' as second argument for each monitor
  * in the tree referred to by 'list'.
  *
@@ -993,7 +999,7 @@ ERTS_GLB_INLINE ErtsMonitor *erts_monitor_list_last(ErtsMonitor *list);
  *
  */
 void erts_monitor_list_foreach(ErtsMonitor *list,
-                               void (*func)(ErtsMonitor *, void *),
+                               ErtsMonitorFunc func,
                                void *arg);
 
 /**
@@ -1001,9 +1007,10 @@ void erts_monitor_list_foreach(ErtsMonitor *list,
  * @brief Call a function for each monitor in a monitor list. Yield
  *        if lots of monitors exist.
  *
- * The funcion 'func' will be called with a pointer to a monitor
+ * The function 'func' will be called with a pointer to a monitor
  * as first argument and 'arg' as second argument for each monitor
- * in the tree referred to by 'root'.
+ * in the tree referred to by 'root'. It should return the number of
+ * reductions the operator took to perform.
  *
  * It is assumed that:
  * - *yspp equals NULL on first call
@@ -1026,25 +1033,25 @@ void erts_monitor_list_foreach(ErtsMonitor *list,
  *                              *yspp should be NULL. When done *yspp
  *                              will be NULL.
  *
- * @param[in]     limit         Maximum amount of monitors to process
- *                              before yielding.
+ * @param[in]     reds          Reductions available to execute before yielding.
  *
- * @returns                     A non-zero value when all monitors has been
- *                              processed, and zero when more work is needed.
+ * @returns                     The unconsumed reductions when all monitors
+ *                              have been processed, and zero when more work
+ *                              is needed.
  *
  */
 int erts_monitor_list_foreach_yielding(ErtsMonitor *list,
-                                       void (*func)(ErtsMonitor *, void *),
+                                       ErtsMonitorFunc func,
                                        void *arg,
                                        void **vyspp,
-                                       Sint limit);
+                                       Sint reds);
 
 /**
  *
  * @brief Delete all monitors from a monitor list and call a function for
  *        each monitor
  *
- * The funcion 'func' will be called with a pointer to a monitor
+ * The function 'func' will be called with a pointer to a monitor
  * as first argument and 'arg' as second argument for each monitor
  * in the tree referred to by 'root'.
  *
@@ -1057,7 +1064,7 @@ int erts_monitor_list_foreach_yielding(ErtsMonitor *list,
  *
  */
 void erts_monitor_list_foreach_delete(ErtsMonitor **list,
-                                      void (*func)(ErtsMonitor *, void *),
+                                      ErtsMonitorFunc func,
                                       void *arg);
 
 /**
@@ -1065,9 +1072,10 @@ void erts_monitor_list_foreach_delete(ErtsMonitor **list,
  * @brief Delete all monitors from a monitor list and call a function for
  *        each monitor
  *
- * The funcion 'func' will be called with a pointer to a monitor
+ * The function 'func' will be called with a pointer to a monitor
  * as first argument and 'arg' as second argument for each monitor
- * in the tree referred to by 'root'.
+ * in the tree referred to by 'root'. It should return the number of
+ * reductions the operator took to perform.
  *
  * It is assumed that:
  * - *yspp equals NULL on first call
@@ -1090,18 +1098,18 @@ void erts_monitor_list_foreach_delete(ErtsMonitor **list,
  *                              *yspp should be NULL. When done *yspp
  *                              will be NULL.
  *
- * @param[in]     limit         Maximum amount of monitors to process
- *                              before yielding.
+ * @param[in]     reds          Reductions available to execute before yielding.
  *
- * @returns                     A non-zero value when all monitors has been
- *                              processed, and zero when more work is needed.
+ * @returns                     The unconsumed reductions when all monitors
+ *                              have been processed, and zero when more work
+ *                              is needed.
  *
  */
 int erts_monitor_list_foreach_delete_yielding(ErtsMonitor **list,
-                                              void (*func)(ErtsMonitor *, void *),
+                                              ErtsMonitorFunc func,
                                               void *arg,
                                               void **vyspp,
-                                              Sint limit);
+                                              Sint reds);
 
 /*
  * --- Misc monitor operations ---
@@ -1113,7 +1121,7 @@ int erts_monitor_list_foreach_delete_yielding(ErtsMonitor **list,
  *
  * Can create all types of monitors
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - 'ref' is an internal ordinary reference if type is ERTS_MON_TYPE_PROC,
  *   ERTS_MON_TYPE_PORT, ERTS_MON_TYPE_TIME_OFFSET, or ERTS_MON_TYPE_RESOURCE
  * - 'ref' is NIL if type is ERTS_MON_TYPE_NODE, ERTS_MON_TYPE_NODES, or
@@ -1199,7 +1207,7 @@ ERTS_GLB_INLINE int erts_monitor_is_in_table(ErtsMonitor *mon);
  * When both the origin and the target part of the monitor have
  * been released the monitor structure will be deallocated.
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - 'mon' monitor is not part of any list or tree
  * - 'mon' is not referred to by any other structures
  * If the above are not true, bad things will happen.
@@ -1216,7 +1224,7 @@ ERTS_GLB_INLINE void erts_monitor_release(ErtsMonitor *mon);
  * Release both the origin and target parts of the monitor
  * simultaneously and deallocate the structure.
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - Neither the origin part nor the target part of the monitor
  *   are not part of any list or tree
  * - Neither the origin part nor the target part of the monitor
@@ -1232,7 +1240,7 @@ ERTS_GLB_INLINE void erts_monitor_release_both(ErtsMonitorData *mdp);
  *
  * @brief Insert monitor in dist monitor tree or list
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - 'mon' monitor is not part of any list or tree
  * If the above is not true, bad things will happen.
  *
@@ -1253,7 +1261,7 @@ ERTS_GLB_INLINE int erts_monitor_dist_insert(ErtsMonitor *mon, ErtsMonLnkDist *d
  *
  * @brief Delete monitor from dist monitor tree or list
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - 'mon' monitor earler has been inserted into 'dist'
  * If the above is not true, bad things will happen.
  *
@@ -1291,7 +1299,7 @@ erts_monitor_set_dead_dist(ErtsMonitor *mon, Eterm nodename);
  * whole size of the monitor data structure is returned; otherwise,
  * half of the size is returned.
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - 'mon' has not been released
  * If the above is not true, bad things will happen.
  *
@@ -1501,12 +1509,25 @@ ERTS_GLB_INLINE ErtsMonitorSuspend *erts_monitor_suspend(ErtsMonitor *mon)
 
 #endif
 
+void
+erts_debug_monitor_tree_destroying_foreach(ErtsMonitor *root,
+                                           ErtsMonitorFunc func,
+                                           void *arg,
+                                           void *vysp);
+void
+erts_debug_monitor_list_destroying_foreach(ErtsMonitor *list,
+                                           ErtsMonitorFunc func,
+                                           void *arg,
+                                           void *vysp);
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
  * Link Operations                                                           *
 \*                                                                           */
 
 typedef struct ErtsMonLnkNode__ ErtsLink;
 
+typedef int (*ErtsLinkFunc)(ErtsLink *, void *, Sint);
+
 typedef struct {
     ErtsLink a;
     ErtsLink b;
@@ -1544,7 +1565,7 @@ ErtsLink *erts_link_tree_lookup(ErtsLink *root, Eterm item);
  *
  * @brief Lookup or insert a link in a link tree
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - 'lnk' link is not part of any tree or list
  * If the above is not true, bad things will happen.
  *
@@ -1590,7 +1611,7 @@ ErtsLink *erts_link_tree_lookup_create(ErtsLink **root, int *created,
  *
  * @brief Insert a link in a link tree
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - no links with the same key that 'lnk' exist in the tree
  * - 'lnk' is not part of any list of tree
  * If the above are not true, bad things will happen.
@@ -1606,7 +1627,7 @@ void erts_link_tree_insert(ErtsLink **root, ErtsLink *lnk);
  *
  * @brief Replace a link in a link tree
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - 'old' link and 'new' link have exactly the same key
  * - 'old' link is part of the tree
  * - 'new' link is not part of any tree or list
@@ -1630,7 +1651,7 @@ void erts_link_tree_replace(ErtsLink **root, ErtsLink *old, ErtsLink *new);
  * the tree and 'lnk' has a lower address than the link in the
  * tree, the existing link in the tree is replaced by 'lnk'.
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - 'lnk' link is not part of any tree or list
  * If the above are not true, bad things will happen.
  *
@@ -1649,7 +1670,7 @@ ERTS_GLB_INLINE ErtsLink *erts_link_tree_insert_addr_replace(ErtsLink **root,
  *
  * @brief Delete a link from a link tree
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - 'lnk' link is part of the tree
  * If the above is not true, bad things will happen.
  *
@@ -1668,7 +1689,7 @@ void erts_link_tree_delete(ErtsLink **root, ErtsLink *lnk);
  * If link 'lnk' is not in the tree, another link with the same
  * key as 'lnk' is deleted from the tree if such a link exist.
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - if 'lnk' link is part of a tree or list, it is part of this tree
  * If the above is not true, bad things will happen.
  *
@@ -1687,7 +1708,7 @@ ERTS_GLB_INLINE ErtsLink *erts_link_tree_key_delete(ErtsLink **root, ErtsLink *l
  *
  * @brief Call a function for each link in a link tree
  *
- * The funcion 'func' will be called with a pointer to a link
+ * The function 'func' will be called with a pointer to a link
  * as first argument and 'arg' as second argument for each link
  * in the tree referred to by 'root'.
  *
@@ -1700,7 +1721,7 @@ ERTS_GLB_INLINE ErtsLink *erts_link_tree_key_delete(ErtsLink **root, ErtsLink *l
  *
  */
 void erts_link_tree_foreach(ErtsLink *root,
-                            void (*func)(ErtsLink *, void *),
+                            ErtsLinkFunc,
                             void *arg);
 
 /**
@@ -1708,9 +1729,10 @@ void erts_link_tree_foreach(ErtsLink *root,
  * @brief Call a function for each link in a link tree. Yield if lots
  *        of links exist.
  *
- * The funcion 'func' will be called with a pointer to a link
+ * The function 'func' will be called with a pointer to a link
  * as first argument and 'arg' as second argument for each link
- * in the tree referred to by 'root'.
+ * in the tree referred to by 'root'. It should return the number of
+ * reductions the operator took to perform.
  *
  * It is assumed that:
  * - *yspp equals NULL on first call
@@ -1733,25 +1755,25 @@ void erts_link_tree_foreach(ErtsLink *root,
  *                              *yspp should be NULL. When done *yspp
  *                              will be NULL.
  *
- * @param[in]     limit         Maximum amount of links to process
- *                              before yielding.
+ * @param[in]     reds          Reductions available to execute before yielding.
  *
- * @returns                     A non-zero value when all links has been
- *                              processed, and zero when more work is needed.
+ * @returns                     The unconsumed reductions when all links
+ *                              have been processed, and zero when more work
+ *                              is needed.
  *
  */
 int erts_link_tree_foreach_yielding(ErtsLink *root,
-                                    void (*func)(ErtsLink *, void *),
+                                    ErtsLinkFunc func,
                                     void *arg,
                                     void **vyspp,
-                                    Sint limit);
+                                    Sint reds);
 
 /**
  *
  * @brief Delete all links from a link tree and call a function for
  *        each link
  *
- * The funcion 'func' will be called with a pointer to a link
+ * The function 'func' will be called with a pointer to a link
  * as first argument and 'arg' as second argument for each link
  * in the tree referred to by 'root'.
  *
@@ -1764,7 +1786,7 @@ int erts_link_tree_foreach_yielding(ErtsLink *root,
  *
  */
 void erts_link_tree_foreach_delete(ErtsLink **root,
-                                   void (*func)(ErtsLink *, void *),
+                                   ErtsLinkFunc func,
                                    void *arg);
 
 /**
@@ -1772,9 +1794,10 @@ void erts_link_tree_foreach_delete(ErtsLink **root,
  * @brief Delete all links from a link tree and call a function for
  *        each link
  *
- * The funcion 'func' will be called with a pointer to a link
+ * The function 'func' will be called with a pointer to a link
  * as first argument and 'arg' as second argument for each link
- * in the tree referred to by 'root'.
+ * in the tree referred to by 'root'. It should return the number of
+ * reductions the operator took to perform.
  *
  * It is assumed that:
  * - *yspp equals NULL on first call
@@ -1797,18 +1820,18 @@ void erts_link_tree_foreach_delete(ErtsLink **root,
  *                              *yspp should be NULL. When done *yspp
  *                              will be NULL.
  *
- * @param[in]     limit         Maximum amount of links to process
- *                              before yielding.
+ * @param[in]     reds          Reductions available to execute before yielding.
  *
- * @returns                     A non-zero value when all links has been
- *                              processed, and zero when more work is needed.
+ * @returns                     The unconsumed reductions when all links
+ *                              have been processed, and zero when more work
+ *                              is needed.
  *
  */
 int erts_link_tree_foreach_delete_yielding(ErtsLink **root,
-                                           void (*func)(ErtsLink *, void *),
+                                           ErtsLinkFunc func,
                                            void *arg,
                                            void **vyspp,
-                                           Sint limit);
+                                           Sint reds);
 
 /* 
  * --- Link list operations ---
@@ -1818,7 +1841,7 @@ int erts_link_tree_foreach_delete_yielding(ErtsLink **root,
  *
  * @brief Insert a link in a link list
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - 'lnk' link is not part of any list or tree
  * If the above is not true, bad things will happen.
  *
@@ -1833,7 +1856,7 @@ ERTS_GLB_INLINE void erts_link_list_insert(ErtsLink **list, ErtsLink *lnk);
  *
  * @brief Delete a link from a link list
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - 'lnk' link is part of the list
  * If the above is not true, bad things will happen.
  *
@@ -1878,7 +1901,7 @@ ERTS_GLB_INLINE ErtsLink *erts_link_list_last(ErtsLink *list);
  *
  * @brief Call a function for each link in a link list
  *
- * The funcion 'func' will be called with a pointer to a link
+ * The function 'func' will be called with a pointer to a link
  * as first argument and 'arg' as second argument for each link
  * in the tree referred to by 'list'.
  *
@@ -1891,7 +1914,7 @@ ERTS_GLB_INLINE ErtsLink *erts_link_list_last(ErtsLink *list);
  *
  */
 void erts_link_list_foreach(ErtsLink *list,
-                            void (*func)(ErtsLink *, void *),
+                            ErtsLinkFunc func,
                             void *arg);
 
 /**
@@ -1899,9 +1922,10 @@ void erts_link_list_foreach(ErtsLink *list,
  * @brief Call a function for each link in a link list. Yield
  *        if lots of links exist.
  *
- * The funcion 'func' will be called with a pointer to a link
+ * The function 'func' will be called with a pointer to a link
  * as first argument and 'arg' as second argument for each link
- * in the tree referred to by 'root'.
+ * in the tree referred to by 'root'. It should return the number of
+ * reductions the operator took to perform.
  *
  * It is assumed that:
  * - *yspp equals NULL on first call
@@ -1924,25 +1948,25 @@ void erts_link_list_foreach(ErtsLink *list,
  *                              *yspp should be NULL. When done *yspp
  *                              will be NULL.
  *
- * @param[in]     limit         Maximum amount of links to process
- *                              before yielding.
+ * @param[in]     reds          Reductions available to execute before yielding.
  *
- * @returns                     A non-zero value when all links has been
- *                              processed, and zero when more work is needed.
+ * @returns                     The unconsumed reductions when all links
+ *                              have been processed, and zero when more work
+ *                              is needed.
  *
  */
 int erts_link_list_foreach_yielding(ErtsLink *list,
-                                    void (*func)(ErtsLink *, void *),
+                                    ErtsLinkFunc func,
                                     void *arg,
                                     void **vyspp,
-                                    Sint limit);
+                                    Sint reds);
 
 /**
  *
  * @brief Delete all links from a link list and call a function for
  *        each link
  *
- * The funcion 'func' will be called with a pointer to a link
+ * The function 'func' will be called with a pointer to a link
  * as first argument and 'arg' as second argument for each link
  * in the tree referred to by 'root'.
  *
@@ -1955,7 +1979,7 @@ int erts_link_list_foreach_yielding(ErtsLink *list,
  *
  */
 void erts_link_list_foreach_delete(ErtsLink **list,
-                                   void (*func)(ErtsLink *, void *),
+                                   ErtsLinkFunc func,
                                    void *arg);
 
 /**
@@ -1963,9 +1987,10 @@ void erts_link_list_foreach_delete(ErtsLink **list,
  * @brief Delete all links from a link list and call a function for
  *        each link
  *
- * The funcion 'func' will be called with a pointer to a link
+ * The function 'func' will be called with a pointer to a link
  * as first argument and 'arg' as second argument for each link
- * in the tree referred to by 'root'.
+ * in the tree referred to by 'root'. It should return the number of
+ * reductions the operator took to perform.
  *
  * It is assumed that:
  * - *yspp equals NULL on first call
@@ -1988,18 +2013,18 @@ void erts_link_list_foreach_delete(ErtsLink **list,
  *                              *yspp should be NULL. When done *yspp
  *                              will be NULL.
  *
- * @param[in]     limit         Maximum amount of links to process
- *                              before yielding.
+ * @param[in]     reds          Reductions available to execute before yielding.
  *
- * @returns                     A non-zero value when all links has been
- *                              processed, and zero when more work is needed.
+ * @returns                     The unconsumed reductions when all links
+ *                              have been processed, and zero when more work
+ *                              is needed.
  *
  */
 int erts_link_list_foreach_delete_yielding(ErtsLink **list,
-                                           void (*func)(ErtsLink *, void *),
+                                           ErtsLinkFunc func,
                                            void *arg,
                                            void **vyspp,
-                                           Sint limit);
+                                           Sint reds);
 
 /*
  * --- Misc link operations ---
@@ -2011,7 +2036,7 @@ int erts_link_list_foreach_delete_yielding(ErtsLink **list,
  *
  * Can create all types of links
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - 'ref' is an internal ordinary reference if type is ERTS_MON_TYPE_PROC,
  *   ERTS_MON_TYPE_PORT, ERTS_MON_TYPE_TIME_OFFSET, or ERTS_MON_TYPE_RESOURCE
  * - 'ref' is NIL if type is ERTS_MON_TYPE_NODE or ERTS_MON_TYPE_NODES
@@ -2081,7 +2106,7 @@ ERTS_GLB_INLINE int erts_link_is_in_table(ErtsLink *lnk);
  * When both link halves part of the link have been released the link
  * structure will be deallocated.
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - 'lnk' link is not part of any list or tree
  * - 'lnk' is not referred to by any other structures
  * If the above are not true, bad things will happen.
@@ -2098,7 +2123,7 @@ ERTS_GLB_INLINE void erts_link_release(ErtsLink *lnk);
  * Release both halves of a link simultaneously and deallocate
  * the structure.
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - Neither of the parts of the link are part of any list or tree
  * - Neither of the parts of the link or the link data structure
  *   are referred to by any other structures
@@ -2113,7 +2138,7 @@ ERTS_GLB_INLINE void erts_link_release_both(ErtsLinkData *ldp);
  *
  * @brief Insert link in dist link list
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - 'lnk' link is not part of any list or tree
  * If the above is not true, bad things will happen.
  *
@@ -2134,7 +2159,7 @@ ERTS_GLB_INLINE int erts_link_dist_insert(ErtsLink *lnk, ErtsMonLnkDist *dist);
  *
  * @brief Delete link from dist link list
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - 'lnk' link earler has been inserted into 'dist'
  * If the above is not true, bad things will happen.
  *
@@ -2172,7 +2197,7 @@ erts_link_set_dead_dist(ErtsLink *lnk, Eterm nodename);
  * whole size of the link data structure is returned; otherwise,
  * half of the size is returned.
  *
- * When the funcion is called it is assumed that:
+ * When the function is called it is assumed that:
  * - 'lnk' has not been released
  * If the above is not true, bad things will happen.
  *
@@ -2351,4 +2376,10 @@ erts_link_dist_delete(ErtsLink *lnk)
 
 #endif /* ERTS_GLB_INLINE_INCL_FUNC_DEF */
 
+void
+erts_debug_link_tree_destroying_foreach(ErtsLink *root,
+                                        ErtsLinkFunc func,
+                                        void *arg,
+                                        void *vysp);
+
 #endif /* ERL_MONITOR_LINK_H__ */
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c
index ee6e6085b6..1fbe362330 100644
--- a/erts/emulator/beam/erl_nif.c
+++ b/erts/emulator/beam/erl_nif.c
@@ -707,6 +707,46 @@ error:
     return reds;
 }
 
+/** @brief Create a message with the content of process independent \c msg_env.
+ *  Invalidates \c msg_env.
+ */
+ErtsMessage* erts_create_message_from_nif_env(ErlNifEnv* msg_env)
+{
+    struct enif_msg_environment_t* menv = (struct enif_msg_environment_t*)msg_env;
+    ErtsMessage* mp;
+
+    flush_env(msg_env);
+    mp = erts_alloc_message(0, NULL);
+    mp->data.heap_frag = menv->env.heap_frag;
+    ASSERT(mp->data.heap_frag == MBUF(&menv->phony_proc));
+    if (mp->data.heap_frag != NULL) {
+        /* Move all offheap's from phony proc to the first fragment.
+           Quick and dirty... */
+        ASSERT(!is_offheap(&mp->data.heap_frag->off_heap));
+        mp->data.heap_frag->off_heap = MSO(&menv->phony_proc);
+        clear_offheap(&MSO(&menv->phony_proc));
+        menv->env.heap_frag = NULL;
+        MBUF(&menv->phony_proc) = NULL;
+    }
+    return mp;
+}
+
+static ERTS_INLINE ERL_NIF_TERM make_copy(ErlNifEnv* dst_env,
+                                          ERL_NIF_TERM src_term,
+                                          Uint *cpy_szp)
+{
+    Uint sz;
+    Eterm* hp;
+    /*
+     * No preserved sharing allowed as long as literals are also preserved.
+     * Process independent environment can not be reached by purge.
+     */
+    sz = size_object(src_term);
+    if (cpy_szp)
+        *cpy_szp += sz;
+    hp = alloc_heap(dst_env, sz);
+    return copy_struct(src_term, sz, &hp, &MSO(dst_env->proc));
+}
 
 int enif_send(ErlNifEnv* env, const ErlNifPid* to_pid,
 	      ErlNifEnv* msg_env, ERL_NIF_TERM msg)
@@ -720,6 +760,7 @@ int enif_send(ErlNifEnv* env, const ErlNifPid* to_pid,
     Eterm from;
     Eterm receiver = to_pid->pid;
     int scheduler;
+    Uint copy_sz = 0;
 
     execution_state(env, &c_p, &scheduler);
 
@@ -783,14 +824,14 @@ int enif_send(ErlNifEnv* env, const ErlNifPid* to_pid,
                 stoken = NIL;
             }
 #endif
-            token = enif_make_copy(msg_env, stoken);
+            token = make_copy(msg_env, stoken, &copy_sz);
 
 #ifdef USE_VM_PROBES
             if (DT_UTAG_FLAGS(c_p) & DT_UTAG_SPREADING) {
                 if (is_immed(DT_UTAG(c_p)))
                     utag = DT_UTAG(c_p);
                 else
-                    utag = enif_make_copy(msg_env, DT_UTAG(c_p));
+                    utag = make_copy(msg_env, DT_UTAG(c_p), &copy_sz);
             }
             if (DTRACE_ENABLED(message_send)) {
                 if (have_seqtrace(stoken)) {
@@ -803,20 +844,8 @@ int enif_send(ErlNifEnv* env, const ErlNifPid* to_pid,
             }
 #endif
         }
-        flush_env(msg_env);
-        mp = erts_alloc_message(0, NULL);
+        mp = erts_create_message_from_nif_env(msg_env);
         ERL_MESSAGE_TOKEN(mp) = token;
-        mp->data.heap_frag = menv->env.heap_frag;
-        ASSERT(mp->data.heap_frag == MBUF(&menv->phony_proc));
-        if (mp->data.heap_frag != NULL) {
-            /* Move all offheap's from phony proc to the first fragment.
-               Quick and dirty... */
-            ASSERT(!is_offheap(&mp->data.heap_frag->off_heap));
-            mp->data.heap_frag->off_heap = MSO(&menv->phony_proc);
-            clear_offheap(&MSO(&menv->phony_proc));
-            menv->env.heap_frag = NULL;
-            MBUF(&menv->phony_proc) = NULL;
-        }
     } else {
         erts_literal_area_t litarea;
 	ErlOffHeap *ohp;
@@ -824,6 +853,7 @@ int enif_send(ErlNifEnv* env, const ErlNifPid* to_pid,
         Uint sz;
         INITIALIZE_LITERAL_PURGE_AREA(litarea);
         sz = size_object_litopt(msg, &litarea);
+        copy_sz += sz;
 	if (c_p && !env->tracee) {
 	    full_flush_env(env);
 	    mp = erts_alloc_message_heap(rp, &rp_locks, sz, &hp, &ohp);
@@ -856,6 +886,12 @@ int enif_send(ErlNifEnv* env, const ErlNifPid* to_pid,
             trace_send(c_p, receiver, msg);
 	    full_cache_env(env);
 	}
+        if (c_p && scheduler > 0 && copy_sz > ERTS_MSG_COPY_WORDS_PER_REDUCTION) {
+            Uint reds = copy_sz / ERTS_MSG_COPY_WORDS_PER_REDUCTION;
+            if (reds > CONTEXT_REDS)
+                reds = CONTEXT_REDS;
+            BUMP_REDS(c_p, (int) reds);
+        }
     }
     else {
         /* This clause is taken when the nif is called in the context
@@ -924,6 +960,7 @@ int enif_send(ErlNifEnv* env, const ErlNifPid* to_pid,
         erts_queue_message(rp, rp_locks, mp, msg, from);
 
 done:
+
     if (c_p == rp)
 	rp_locks &= ~ERTS_PROC_LOCK_MAIN;
     if (rp_locks & ~lc_locks)
@@ -987,7 +1024,7 @@ static Eterm call_whereis(ErlNifEnv *env, Eterm name)
     int scheduler;
 
     execution_state(env, &c_p, &scheduler);
-    ASSERT((c_p && scheduler) || (!c_p && !scheduler));
+    ASSERT(scheduler || !c_p);
 
     if (scheduler < 0) {
         /* dirty scheduler */
@@ -1036,18 +1073,9 @@ int enif_whereis_port(ErlNifEnv *env, ERL_NIF_TERM name, ErlNifPort *port)
 
 ERL_NIF_TERM enif_make_copy(ErlNifEnv* dst_env, ERL_NIF_TERM src_term)
 {
-    Uint sz;
-    Eterm* hp;
-    /*
-     * No preserved sharing allowed as long as literals are also preserved.
-     * Process independent environment can not be reached by purge.
-     */
-    sz = size_object(src_term);
-    hp = alloc_heap(dst_env, sz);
-    return copy_struct(src_term, sz, &hp, &MSO(dst_env->proc));
+    return make_copy(dst_env, src_term, NULL);
 }
 
-
 #ifdef DEBUG
 static int is_offheap(const ErlOffHeap* oh)
 {
@@ -1072,6 +1100,17 @@ int enif_get_local_pid(ErlNifEnv* env, ERL_NIF_TERM term, ErlNifPid* pid)
     return 0;
 }
 
+void enif_set_pid_undefined(ErlNifPid* pid)
+{
+    pid->pid = am_undefined;
+}
+
+int enif_is_pid_undefined(const ErlNifPid* pid)
+{
+    ASSERT(pid->pid == am_undefined || is_internal_pid(pid->pid));
+    return pid->pid == am_undefined;
+}
+
 int enif_get_local_port(ErlNifEnv* env, ERL_NIF_TERM term, ErlNifPort* port)
 {
     if (is_internal_port(term)) {
@@ -1136,6 +1175,47 @@ int enif_is_number(ErlNifEnv* env, ERL_NIF_TERM term)
     return is_number(term);
 }
 
+ErlNifTermType enif_term_type(ErlNifEnv* env, ERL_NIF_TERM term) {
+    (void)env;
+
+    switch (tag_val_def(term)) {
+    case ATOM_DEF:
+        return ERL_NIF_TERM_TYPE_ATOM;
+    case BINARY_DEF:
+        return ERL_NIF_TERM_TYPE_BITSTRING;
+    case FLOAT_DEF:
+        return ERL_NIF_TERM_TYPE_FLOAT;
+    case EXPORT_DEF:
+    case FUN_DEF:
+        return ERL_NIF_TERM_TYPE_FUN;
+    case BIG_DEF:
+    case SMALL_DEF:
+        return ERL_NIF_TERM_TYPE_INTEGER;
+    case LIST_DEF:
+    case NIL_DEF:
+        return ERL_NIF_TERM_TYPE_LIST;
+    case MAP_DEF:
+        return ERL_NIF_TERM_TYPE_MAP;
+    case EXTERNAL_PID_DEF:
+    case PID_DEF:
+        return ERL_NIF_TERM_TYPE_PID;
+    case EXTERNAL_PORT_DEF:
+    case PORT_DEF:
+        return ERL_NIF_TERM_TYPE_PORT;
+    case EXTERNAL_REF_DEF:
+    case REF_DEF:
+        return ERL_NIF_TERM_TYPE_REFERENCE;
+    case TUPLE_DEF:
+        return ERL_NIF_TERM_TYPE_TUPLE;
+    default:
+        /* tag_val_def() aborts on its own when passed complete garbage, but
+         * it's possible that the user has given us garbage that just happens
+         * to match something that tag_val_def() accepts but we don't, like
+         * binary match contexts. */
+        ERTS_INTERNAL_ERROR("Invalid term passed to enif_term_type");
+    }
+}
+
 static void aligned_binary_dtor(struct enif_tmp_obj_t* obj)
 {
     erts_free_aligned_binary_bytes_extra((byte*)obj, obj->allocator);
@@ -1264,11 +1344,18 @@ unsigned char* enif_make_new_binary(ErlNifEnv* env, size_t size,
 int enif_term_to_binary(ErlNifEnv *dst_env, ERL_NIF_TERM term,
                         ErlNifBinary *bin)
 {
-    Sint size;
+    Uint size;
     byte *bp;
     Binary* refbin;
 
-    size = erts_encode_ext_size(term);
+    switch (erts_encode_ext_size(term, &size)) {
+    case ERTS_EXT_SZ_SYSTEM_LIMIT:
+        return 0; /* system limit */
+    case ERTS_EXT_SZ_YIELD:
+        ERTS_INTERNAL_ERROR("Unexpected yield");
+    case ERTS_EXT_SZ_OK:
+        break;
+    }
     if (!enif_alloc_binary(size, bin))
         return 0;
 
@@ -2346,18 +2433,42 @@ rmon_refc_read(ErtsResourceMonitors *rms)
     return rms->refc & ERTS_RESOURCE_REFC_MASK;
 }
 
-static void dtor_demonitor(ErtsMonitor* mon, void* context)
+static int dtor_demonitor(ErtsMonitor* mon, void* context, Sint reds)
 {
     ASSERT(erts_monitor_is_origin(mon));
     ASSERT(is_internal_pid(mon->other.item));
 
     erts_proc_sig_send_demonitor(mon);
+    return 1;
 }
 
-#  define NIF_RESOURCE_DTOR &nif_resource_dtor
+#ifdef DEBUG
+int erts_dbg_is_resource_dying(ErtsResource* resource)
+{
+    return resource->monitors && rmon_is_dying(resource->monitors);
+}
+#endif
+
+#define NIF_RESOURCE_DTOR &nif_resource_dtor_prologue
 
-static int nif_resource_dtor(Binary* bin)
+static void run_resource_dtor(void* vbin);
+ 
+static int nif_resource_dtor_prologue(Binary* bin)
+{
+    /*
+     * Schedule user resource destructor as aux work to get a context
+     * where we know what locks we have for example.
+     */
+    Uint sched_id = erts_get_scheduler_id();
+    if (!sched_id)
+        sched_id = 1;
+    erts_schedule_misc_aux_work(sched_id, run_resource_dtor, bin);
+    return 0; /* don't free */
+}
+ 
+static void run_resource_dtor(void* vbin)
 {
+    Binary* bin = (Binary*) vbin;
     ErtsResource* resource = (ErtsResource*) ERTS_MAGIC_BIN_UNALIGNED_DATA(bin);
     ErlNifResourceType* type = resource->type;
     ASSERT(ERTS_MAGIC_BIN_DESTRUCTOR(bin) == NIF_RESOURCE_DTOR);
@@ -2389,11 +2500,11 @@ static int nif_resource_dtor(Binary* bin)
          * If resource->monitors->refc != 0 there are
          * outstanding references to the resource from
          * monitors that has not been removed yet.
-         * nif_resource_dtor() will be called again this
+         * nif_resource_dtor_prologue() will be called again when this
          * reference count reach zero.
          */
         if (refc != 0)
-            return 0; /* we'll be back... */
+            return; /* we'll be back... */
         erts_mtx_destroy(&rm->lock);
     }
 
@@ -2410,7 +2521,7 @@ static int nif_resource_dtor(Binary* bin)
 	steal_resource_type(type);
 	erts_free(ERTS_ALC_T_NIF, type);
     }
-    return 1;
+    erts_magic_binary_free((Binary*)vbin);
 }
 
 void erts_resource_stop(ErtsResource* resource, ErlNifEvent e,
@@ -2694,8 +2805,12 @@ int enif_consume_timeslice(ErlNifEnv* env, int percent)
 {
     Process *proc;
     Sint reds;
+    int sched;
 
-    execution_state(env, &proc, NULL);
+    execution_state(env, &proc, &sched);
+
+    if (sched < 0)
+        return 0; /* no-op on dirty scheduler */
 
     ASSERT(is_proc_bound(env) && percent >= 1 && percent <= 100);
     if (percent < 1) percent = 1;
@@ -3318,6 +3433,9 @@ int enif_monitor_process(ErlNifEnv* env, void* obj, const ErlNifPid* target_pid,
     }
     ASSERT(rsrc->type->down);
 
+    if (target_pid->pid == am_undefined)
+        return 1;
+
     ref = erts_make_ref_in_buffer(tmp);
 
     mdp = erts_monitor_create(ERTS_MON_TYPE_RESOURCE, ref,
@@ -3351,6 +3469,12 @@ int enif_monitor_process(ErlNifEnv* env, void* obj, const ErlNifPid* target_pid,
     return 0;
 }
 
+ERL_NIF_TERM enif_make_monitor_term(ErlNifEnv* env, const ErlNifMonitor* monitor)
+{
+    Eterm* hp = alloc_heap(env, ERTS_REF_THING_SIZE);
+    return erts_driver_monitor_to_ref(hp, monitor);
+}
+
 int enif_demonitor_process(ErlNifEnv* env, void* obj, const ErlNifMonitor* monitor)
 {
     ErtsResource* rsrc = DATA_TO_RESOURCE(obj);
diff --git a/erts/emulator/beam/erl_nif.h b/erts/emulator/beam/erl_nif.h
index 4c09496ef1..c250e8f683 100644
--- a/erts/emulator/beam/erl_nif.h
+++ b/erts/emulator/beam/erl_nif.h
@@ -54,10 +54,22 @@
 ** 2.13: 20.1 add enif_ioq
 ** 2.14: 21.0 add enif_ioq_peek_head, enif_(mutex|cond|rwlock|thread)_name
 **                enif_vfprintf, enif_vsnprintf, enif_make_map_from_arrays
+** 2.15: 22.0 ERL_NIF_SELECT_CANCEL, enif_select_(read|write)
+**            enif_term_type
 */
 #define ERL_NIF_MAJOR_VERSION 2
-#define ERL_NIF_MINOR_VERSION 14
-#define ERL_NIF_MIN_ERTS_VERSION "erts-10.0 (OTP-21)"
+#define ERL_NIF_MINOR_VERSION 15
+
+/*
+ * WHEN CHANGING INTERFACE VERSION, also replace erts version below with
+ * a ticket number e.g. "erts-@OTP-12345@". The syntax is the same as for
+ * runtime dependencies so multiple tickets should be separated with ":", e.g.
+ * "erts-@OTP-12345:OTP-54321@".
+ *
+ * If you're not on the OTP team, you should use a placeholder like
+ * erts-@MyName@ instead.
+ */
+#define ERL_NIF_MIN_ERTS_VERSION "erts-10.4"
 
 /*
  * The emulator will refuse to load a nif-lib with a major version
@@ -160,6 +172,8 @@ typedef int ErlNifEvent;
 #define ERL_NIF_SELECT_STOP_SCHEDULED (1 << 1)
 #define ERL_NIF_SELECT_INVALID_EVENT  (1 << 2)
 #define ERL_NIF_SELECT_FAILED         (1 << 3)
+#define ERL_NIF_SELECT_READ_CANCELLED (1 << 4)
+#define ERL_NIF_SELECT_WRITE_CANCELLED (1 << 5)
 
 typedef enum
 {
@@ -274,6 +288,26 @@ typedef enum {
     ERL_NIF_IOQ_NORMAL = 1
 } ErlNifIOQueueOpts;
 
+typedef enum {
+    ERL_NIF_TERM_TYPE_ATOM = 1,
+    ERL_NIF_TERM_TYPE_BITSTRING = 2,
+    ERL_NIF_TERM_TYPE_FLOAT = 3,
+    ERL_NIF_TERM_TYPE_FUN = 4,
+    ERL_NIF_TERM_TYPE_INTEGER = 5,
+    ERL_NIF_TERM_TYPE_LIST = 6,
+    ERL_NIF_TERM_TYPE_MAP = 7,
+    ERL_NIF_TERM_TYPE_PID = 8,
+    ERL_NIF_TERM_TYPE_PORT = 9,
+    ERL_NIF_TERM_TYPE_REFERENCE = 10,
+    ERL_NIF_TERM_TYPE_TUPLE = 11,
+
+    /* This is a dummy value intended to coax the compiler into warning about
+     * unhandled values in a switch even if all the above values have been
+     * handled. We can add new entries at any time so the user must always
+     * have a default case. */
+    ERL_NIF_TERM_TYPE__MISSING_DEFAULT_CASE__READ_THE_MANUAL = -1
+} ErlNifTermType;
+
 /*
  * Return values from enif_thread_type(). Negative values
  * reserved for specific types of non-scheduler threads.
diff --git a/erts/emulator/beam/erl_nif_api_funcs.h b/erts/emulator/beam/erl_nif_api_funcs.h
index 81f64f2390..d57f6ec97c 100644
--- a/erts/emulator/beam/erl_nif_api_funcs.h
+++ b/erts/emulator/beam/erl_nif_api_funcs.h
@@ -210,6 +210,13 @@ ERL_NIF_API_FUNC_DECL(int,enif_vsnprintf,(char*, size_t, const char *fmt, va_lis
 
 ERL_NIF_API_FUNC_DECL(int,enif_make_map_from_arrays,(ErlNifEnv *env, ERL_NIF_TERM keys[], ERL_NIF_TERM values[], size_t cnt, ERL_NIF_TERM *map_out));
 
+ERL_NIF_API_FUNC_DECL(int,enif_select_x,(ErlNifEnv* env, ErlNifEvent e, enum ErlNifSelectFlags flags, void* obj, const ErlNifPid* pid, ERL_NIF_TERM msg, ErlNifEnv* msg_env));
+ERL_NIF_API_FUNC_DECL(ERL_NIF_TERM,enif_make_monitor_term,(ErlNifEnv* env, const ErlNifMonitor*));
+ERL_NIF_API_FUNC_DECL(void,enif_set_pid_undefined,(ErlNifPid* pid));
+ERL_NIF_API_FUNC_DECL(int,enif_is_pid_undefined,(const ErlNifPid* pid));
+
+ERL_NIF_API_FUNC_DECL(ErlNifTermType,enif_term_type,(ErlNifEnv* env, ERL_NIF_TERM term));
+
 /*
 ** ADD NEW ENTRIES HERE (before this comment) !!!
 */
@@ -392,6 +399,11 @@ ERL_NIF_API_FUNC_DECL(int,enif_make_map_from_arrays,(ErlNifEnv *env, ERL_NIF_TER
 #  define enif_vfprintf ERL_NIF_API_FUNC_MACRO(enif_vfprintf)
 #  define enif_vsnprintf ERL_NIF_API_FUNC_MACRO(enif_vsnprintf)
 #  define enif_make_map_from_arrays ERL_NIF_API_FUNC_MACRO(enif_make_map_from_arrays)
+#  define enif_select_x ERL_NIF_API_FUNC_MACRO(enif_select_x)
+#  define enif_make_monitor_term ERL_NIF_API_FUNC_MACRO(enif_make_monitor_term)
+#  define enif_set_pid_undefined ERL_NIF_API_FUNC_MACRO(enif_set_pid_undefined)
+#  define enif_is_pid_undefined ERL_NIF_API_FUNC_MACRO(enif_is_pid_undefined)
+#  define enif_term_type ERL_NIF_API_FUNC_MACRO(enif_term_type)
 
 /*
 ** ADD NEW ENTRIES HERE (before this comment)
@@ -623,6 +635,13 @@ static ERL_NIF_INLINE ERL_NIF_TERM enif_make_list9(ErlNifEnv* env,
 #ifndef enif_make_pid
 
 #  define enif_make_pid(ENV, PID) ((void)(ENV),(const ERL_NIF_TERM)((PID)->pid))
+#  define enif_compare_pids(A, B) (enif_compare((A)->pid,(B)->pid))
+#  define enif_select_read(ENV, E, OBJ, PID, MSG, MSG_ENV) \
+    enif_select_x(ENV, E, ERL_NIF_SELECT_READ | ERL_NIF_SELECT_CUSTOM_MSG, \
+                  OBJ, PID, MSG, MSG_ENV)
+#  define enif_select_write(ENV, E, OBJ, PID, MSG, MSG_ENV) \
+    enif_select_x(ENV, E, ERL_NIF_SELECT_WRITE | ERL_NIF_SELECT_CUSTOM_MSG, \
+                  OBJ, PID, MSG, MSG_ENV)
 
 #if SIZEOF_LONG == 8
 #  define enif_get_int64 enif_get_long
diff --git a/erts/emulator/beam/erl_node_tables.c b/erts/emulator/beam/erl_node_tables.c
index 18ed782ae3..50e9812534 100644
--- a/erts/emulator/beam/erl_node_tables.c
+++ b/erts/emulator/beam/erl_node_tables.c
@@ -177,6 +177,7 @@ dist_table_alloc(void *dep_tmpl)
     dep->connection_id			= 0;
     dep->state				= ERTS_DE_STATE_IDLE;
     dep->flags				= 0;
+    dep->opts                           = 0;
     dep->version			= 0;
 
     dep->mld                            = NULL;
@@ -201,6 +202,7 @@ dist_table_alloc(void *dep_tmpl)
     dep->send				= NULL;
     dep->cache				= NULL;
     dep->transcode_ctx                  = NULL;
+    dep->sequences                      = NULL;
 
     /* Link in */
 
@@ -658,6 +660,7 @@ erts_set_dist_entry_not_connected(DistEntry *dep)
 
     dep->state = ERTS_DE_STATE_IDLE;
     dep->flags = 0;
+    dep->opts = 0;
     dep->prev = NULL;
     dep->cid = NIL;
 
@@ -801,8 +804,8 @@ node_table_hash(void *venp)
 static int
 node_table_cmp(void *venp1, void *venp2)
 {
-    return ((((ErlNode *) venp1)->sysname == ((ErlNode *) venp2)->sysname
-	     && ((ErlNode *) venp1)->creation == ((ErlNode *) venp2)->creation)
+    return ((((ErlNode *) venp1)->sysname == ((ErlNode *) venp2)->sysname) &&
+            ((((ErlNode *) venp1)->creation == ((ErlNode *) venp2)->creation))
 	    ? 0
 	    : 1);
 }
@@ -816,11 +819,16 @@ node_table_alloc(void *venp_tmpl)
 
     node_entries++;
 
-    erts_refc_init(&enp->refc, -1);
+    erts_init_node_entry(enp, -1);
     enp->creation = ((ErlNode *) venp_tmpl)->creation;
     enp->sysname = ((ErlNode *) venp_tmpl)->sysname;
     enp->dist_entry = erts_find_or_insert_dist_entry(((ErlNode *) venp_tmpl)->sysname);
 
+#ifdef ERL_NODE_BOOKKEEP
+    erts_atomic_init_nob(&enp->slot, 0);
+    sys_memzero(enp->books, sizeof(struct erl_node_bookkeeping) * 1024);
+#endif
+
     return (void *) enp;
 }
 
@@ -873,7 +881,7 @@ erts_node_table_info(fmtfn_t to, void *to_arg)
 }
 
 
-ErlNode *erts_find_or_insert_node(Eterm sysname, Uint32 creation)
+ErlNode *erts_find_or_insert_node(Eterm sysname, Uint32 creation, Eterm book)
 {
     ErlNode *res;
     ErlNode ne;
@@ -883,9 +891,9 @@ ErlNode *erts_find_or_insert_node(Eterm sysname, Uint32 creation)
     erts_rwmtx_rlock(&erts_node_table_rwmtx);
     res = hash_get(&erts_node_table, (void *) &ne);
     if (res && res != erts_this_node) {
-	erts_aint_t refc = erts_refc_inctest(&res->refc, 0);
+	erts_aint_t refc = erts_ref_node_entry(res, 0, book);
 	if (refc < 2) /* New or pending delete */
-	    erts_refc_inc(&res->refc, 1);
+            erts_ref_node_entry(res, 1, THE_NON_VALUE);
     }
     erts_rwmtx_runlock(&erts_node_table_rwmtx);
     if (res)
@@ -895,9 +903,9 @@ ErlNode *erts_find_or_insert_node(Eterm sysname, Uint32 creation)
     res = hash_put(&erts_node_table, (void *) &ne);
     ASSERT(res);
     if (res != erts_this_node) {
-	erts_aint_t refc = erts_refc_inctest(&res->refc, 0);
+	erts_aint_t refc = erts_ref_node_entry(res, 0, book);
 	if (refc < 2) /* New or pending delete */
-	    erts_refc_inc(&res->refc, 1);
+	    erts_ref_node_entry(res, 1, THE_NON_VALUE);
     }
     erts_rwmtx_rwunlock(&erts_node_table_rwmtx);
     return res;
@@ -924,6 +932,8 @@ static void try_delete_node(void *venp)
      *
      * If refc > 0, the entry is in use. Keep the entry.
      */
+    erts_node_bookkeep(enp, THE_NON_VALUE, ERL_NODE_DEC,
+                       __FILE__, __LINE__);
     refc = erts_refc_dectest(&enp->refc, -1);
     if (refc == -1)
 	(void) hash_erase(&erts_node_table, (void *) enp);
@@ -1021,7 +1031,7 @@ erts_set_this_node(Eterm sysname, Uint creation)
     erts_deref_dist_entry(erts_this_dist_entry);
 
     erts_this_node = NULL; /* to make sure refc is bumped for this node */
-    erts_this_node = erts_find_or_insert_node(sysname, creation);
+    erts_this_node = erts_find_or_insert_node(sysname, creation, THE_NON_VALUE);
     erts_this_dist_entry = erts_this_node->dist_entry;
 
     erts_ref_dist_entry(erts_this_dist_entry);
@@ -1090,7 +1100,7 @@ void erts_init_node_tables(int dd_sec)
     node_tmpl.creation = 0;
     erts_this_node = hash_put(&erts_node_table, &node_tmpl);
      /* +1 for erts_this_node */
-    erts_refc_init(&erts_this_node->refc, 1);
+    erts_init_node_entry(erts_this_node, 1);
 
     ASSERT(erts_this_node->dist_entry != NULL);
     erts_this_dist_entry = erts_this_node->dist_entry;
@@ -1155,6 +1165,12 @@ void erts_lcnt_update_distribution_locks(int enable) {
  * can damage the real-time properties of the system.                        *
 \* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
+#ifdef ERL_NODE_BOOKKEEP
+#define ERTS_DBG_NC_ALLOC_TYPE ERTS_ALC_T_NC_STD
+#else
+#define ERTS_DBG_NC_ALLOC_TYPE ERTS_ALC_T_NC_TMP
+#endif
+
 #include "erl_db.h"
 
 #undef  INIT_AM
@@ -1177,11 +1193,14 @@ static Eterm AM_system;
 static Eterm AM_timer;
 static Eterm AM_delayed_delete_timer;
 static Eterm AM_thread_progress_delete_timer;
+static Eterm AM_sequence;
 static Eterm AM_signal;
+static Eterm AM_persistent_term;
 
 static void setup_reference_table(void);
 static Eterm reference_table_term(Uint **hpp, ErlOffHeap *ohp, Uint *szp);
 static void delete_reference_table(void);
+static void clear_system(void);
 
 #undef ERTS_MAX__
 #define ERTS_MAX__(A, B) ((A) > (B) ? (A) : (B))
@@ -1218,6 +1237,7 @@ typedef struct dist_referrer_ {
     int ctrl_ref;
     int system_ref;
     int signal_ref;
+    int sequence_ref;
     Eterm id;
     Uint creation;
     Uint id_heap[ID_HEAP_SIZE];
@@ -1233,11 +1253,11 @@ typedef struct inserted_bin_ {
     Binary *bin_val;
 } InsertedBin;
 
-static ReferredNode *referred_nodes;
+static ReferredNode *referred_nodes = NULL;
 static int no_referred_nodes;
-static ReferredDist *referred_dists;
+static ReferredDist *referred_dists = NULL;
 static int no_referred_dists;
-static InsertedBin *inserted_bins;
+static InsertedBin *inserted_bins = NULL;
 
 Eterm
 erts_get_node_and_dist_references(struct process *proc)
@@ -1272,9 +1292,16 @@ erts_get_node_and_dist_references(struct process *proc)
 	INIT_AM(delayed_delete_timer);
         INIT_AM(thread_progress_delete_timer);
 	INIT_AM(signal);
+	INIT_AM(sequence);
+	INIT_AM(persistent_term);
 	references_atoms_need_init = 0;
     }
 
+#ifdef ERL_NODE_BOOKKEEP
+    if (referred_nodes || referred_dists || inserted_bins)
+        delete_reference_table();
+#endif
+    
     setup_reference_table();
 
     /* Get term size */
@@ -1292,7 +1319,11 @@ erts_get_node_and_dist_references(struct process *proc)
 
     ASSERT(endp == hp);
 
+#ifndef ERL_NODE_BOOKKEEP
     delete_reference_table();
+#endif
+    
+    clear_system();
 
     erts_thr_progress_unblock();
     erts_proc_lock(proc, ERTS_PROC_LOCK_MAIN);
@@ -1309,8 +1340,9 @@ erts_get_node_and_dist_references(struct process *proc)
 #define TIMER_REF 8
 #define SYSTEM_REF 9
 #define SIGNAL_REF 10
+#define SEQUENCE_REF 11
 
-#define INC_TAB_SZ 10
+#define INC_TAB_SZ 11
 
 static void
 insert_dist_referrer(ReferredDist *referred_dist,
@@ -1326,7 +1358,7 @@ insert_dist_referrer(ReferredDist *referred_dist,
 	    break;
 
     if(!drp) {
-	drp = (DistReferrer *) erts_alloc(ERTS_ALC_T_NC_TMP,
+	drp = (DistReferrer *) erts_alloc(ERTS_DBG_NC_ALLOC_TYPE,
 					  sizeof(DistReferrer));
 	drp->next = referred_dist->referrers;
 	referred_dist->referrers = drp;
@@ -1344,6 +1376,7 @@ insert_dist_referrer(ReferredDist *referred_dist,
 	drp->ctrl_ref = 0;
 	drp->system_ref = 0;
         drp->signal_ref = 0;
+        drp->sequence_ref = 0;
     }
 
     switch (type) {
@@ -1353,6 +1386,7 @@ insert_dist_referrer(ReferredDist *referred_dist,
     case ETS_REF:	drp->ets_ref++;	        break;
     case SYSTEM_REF:	drp->system_ref++;	break;
     case SIGNAL_REF:	drp->signal_ref++;	break;
+    case SEQUENCE_REF:	drp->sequence_ref++;	break;
     default:		ASSERT(0);
     }
 }
@@ -1387,7 +1421,7 @@ insert_node_referrer(ReferredNode *referred_node, int type, Eterm id)
 	    break;
 
     if(!nrp) {
-	nrp = (NodeReferrer *) erts_alloc(ERTS_ALC_T_NC_TMP,
+	nrp = (NodeReferrer *) erts_alloc(ERTS_DBG_NC_ALLOC_TYPE,
 					  sizeof(NodeReferrer));
 	nrp->next = referred_node->referrers;
         ERTS_INIT_OFF_HEAP(&nrp->off_heap);
@@ -1501,7 +1535,8 @@ insert_offheap(ErlOffHeap *oh, int type, Eterm id)
 		    erts_match_prog_foreach_offheap((Binary *) u.mref->mb,
 						    insert_offheap2,
 						    (void *) &a);
-		    nib = erts_alloc(ERTS_ALC_T_NC_TMP, sizeof(InsertedBin));
+		    nib = erts_alloc(ERTS_DBG_NC_ALLOC_TYPE,
+                                     sizeof(InsertedBin));
 		    nib->bin_val = (Binary *) u.mref->mb;
 		    nib->next = inserted_bins;
 		    inserted_bins = nib;
@@ -1509,7 +1544,7 @@ insert_offheap(ErlOffHeap *oh, int type, Eterm id)
 		}
 	    }
             else if (IsSendCtxBinary(u.mref->mb)) {
-                ErtsSendContext* ctx = ERTS_MAGIC_BIN_DATA(u.mref->mb);
+                ErtsDSigSendContext* ctx = ERTS_MAGIC_BIN_DATA(u.mref->mb);
                 if (ctx->deref_dep)
                     insert_dist_entry(ctx->dep, type, id, 0);
             }
@@ -1544,28 +1579,18 @@ static void insert_monitor_data(ErtsMonitor *mon, int type, Eterm id)
     mdp->origin.flags |= ERTS_ML_FLG_DBG_VISITED;
 }
 
-static void insert_monitor(ErtsMonitor *mon, void *idp)
+static int insert_monitor(ErtsMonitor *mon, void *idp, Sint reds)
 {
     Eterm id = *((Eterm *) idp);
     insert_monitor_data(mon, MONITOR_REF, id);
+    return 1;
 }
 
-static void clear_visited_monitor(ErtsMonitor *mon, void *p)
+static int clear_visited_monitor(ErtsMonitor *mon, void *p, Sint reds)
 {
     ErtsMonitorData *mdp = erts_monitor_to_data(mon);
     mdp->origin.flags &= ~ERTS_ML_FLG_DBG_VISITED;
-}
-
-static void
-insert_p_monitors(ErtsPTabElementCommon *p)
-{
-    Eterm id = p->id;
-    erts_monitor_tree_foreach(p->u.alive.monitors,
-                              insert_monitor,
-                              (void *) &id);
-    erts_monitor_list_foreach(p->u.alive.lt_monitors,
-                              insert_monitor,
-                              (void *) &id);
+    return 1;
 }
 
 static void
@@ -1581,15 +1606,20 @@ insert_dist_monitors(DistEntry *dep)
     }
 }
 
+
+static int
+insert_sequence(DistSeqNode *seq, void *arg, Sint reds)
+{
+    ErtsDistExternal *edep = erts_get_dist_ext(&seq->hfrag);
+    insert_offheap(&seq->hfrag.off_heap, SEQUENCE_REF, *(Eterm*)arg);
+    insert_dist_entry(edep->dep, SEQUENCE_REF, *(Eterm*)arg, 0);
+    return 1;
+}
+
 static void
-clear_visited_p_monitors(ErtsPTabElementCommon *p)
+insert_dist_sequences(DistEntry *dep)
 {
-    erts_monitor_tree_foreach(p->u.alive.monitors,
-                              clear_visited_monitor,
-                              NULL);
-    erts_monitor_list_foreach(p->u.alive.lt_monitors,
-                              clear_visited_monitor,
-                              NULL);
+    erts_debug_dist_seq_tree_foreach(dep, insert_sequence, (void *) &dep->sysname);
 }
 
 static void
@@ -1621,23 +1651,18 @@ static void insert_link_data(ErtsLink *lnk, int type, Eterm id)
     ldp->a.flags |= ERTS_ML_FLG_DBG_VISITED;
 }
 
-static void insert_link(ErtsLink *lnk, void *idp)
+static int insert_link(ErtsLink *lnk, void *idp, Sint reds)
 {
     Eterm id = *((Eterm *) idp);
     insert_link_data(lnk, LINK_REF, id);
+    return 1;
 }
 
-static void clear_visited_link(ErtsLink *lnk, void *p)
+static int clear_visited_link(ErtsLink *lnk, void *p, Sint reds)
 {
     ErtsLinkData *ldp = erts_link_to_data(lnk);
     ldp->a.flags &= ~ERTS_ML_FLG_DBG_VISITED;
-}
-
-static void
-insert_p_links(ErtsPTabElementCommon *p)
-{
-    Eterm id = p->id;
-    erts_link_tree_foreach(p->u.alive.links, insert_link, (void *) &id);
+    return 1;
 }
 
 static void
@@ -1650,14 +1675,6 @@ insert_dist_links(DistEntry *dep)
 }
 
 static void
-clear_visited_p_links(ErtsPTabElementCommon *p)
-{
-    erts_link_tree_foreach(p->u.alive.links,
-                           clear_visited_link,
-                           NULL);
-}
-
-static void
 clear_visited_dist_links(DistEntry *dep)
 {
     if (dep->mld)
@@ -1770,11 +1787,9 @@ insert_message(ErtsMessage *msg, int type, Process *proc)
         else if (ERTS_SIG_IS_INTERNAL_MSG(msg))
             heap_frag = msg->data.heap_frag;
         else {
-            if (msg->data.dist_ext->dep)
-                insert_dist_entry(msg->data.dist_ext->dep,
-                                  type, proc->common.id, 0);
-            if (is_not_nil(ERL_MESSAGE_TOKEN(msg)))
-                heap_frag = erts_dist_ext_trailer(msg->data.dist_ext);
+            heap_frag = msg->data.heap_frag;
+            insert_dist_entry(erts_get_dist_ext(heap_frag)->dep,
+                              type, proc->common.id, 0);
         }
     }
     while (heap_frag) {
@@ -1798,24 +1813,148 @@ insert_sig_offheap(ErlOffHeap *ohp, void *arg)
     insert_offheap(ohp, SIGNAL_REF, proc->common.id);
 }
 
-static void
-insert_sig_monitor(ErtsMonitor *mon, void *arg)
+static int
+insert_sig_monitor(ErtsMonitor *mon, void *arg, Sint reds)
 {
     Process *proc = arg;
     insert_monitor_data(mon, SIGNAL_REF, proc->common.id);
+    return 1;
 }
 
-static void
-insert_sig_link(ErtsLink *lnk, void *arg)
+static int
+insert_sig_link(ErtsLink *lnk, void *arg, Sint reds)
 {
     Process *proc = arg;
     insert_link_data(lnk, SIGNAL_REF, proc->common.id);
+    return 1;
 }
 
 static void
-setup_reference_table(void)
+insert_sig_ext(ErtsDistExternal *edep, void *arg)
+{
+    Process *proc = arg;
+    insert_dist_entry(edep->dep, SIGNAL_REF, proc->common.id, 0);
+}
+
+static void
+insert_process(Process *proc)
 {
+    int mli;
+    ErtsMessage *msg_list[] = {proc->msg_frag};
     ErlHeapFragment *hfp;
+
+    /* Insert Heap */
+    insert_offheap(&(proc->off_heap),
+                   HEAP_REF,
+                   proc->common.id);
+    /* Insert heap fragments buffers */
+    for(hfp = proc->mbuf; hfp; hfp = hfp->next)
+        insert_offheap(&(hfp->off_heap),
+                       HEAP_REF,
+                       proc->common.id);
+
+    /* Insert msg buffers */
+    for (mli = 0; mli < sizeof(msg_list)/sizeof(msg_list[0]); mli++) {
+        ErtsMessage *msg;
+        for (msg = msg_list[mli]; msg; msg = msg->next)
+            insert_message(msg, HEAP_REF, proc);
+    }
+
+    /* Insert signal queue */
+    erts_proc_sig_debug_foreach_sig(proc,
+                                    insert_sig_msg,
+                                    insert_sig_offheap,
+                                    insert_sig_monitor,
+                                    insert_sig_link,
+                                    insert_sig_ext,
+                                    (void *) proc);
+
+    /* Insert monitors and links... */
+    erts_debug_proc_monitor_link_foreach(proc,
+                                         insert_monitor,
+                                         insert_link,
+                                         (void *) &proc->common.id);
+
+    {
+        DistEntry *dep = ERTS_PROC_GET_DIST_ENTRY(proc);
+        if (dep)
+            insert_dist_entry(dep,
+                              CTRL_REF,
+                              proc->common.id,
+                              0);
+    }
+}
+
+static void
+insert_process2(Process *proc, void *arg)
+{
+    insert_process(proc);
+}
+
+static void
+insert_dist_suspended_procs(DistEntry *dep)
+{
+    ErtsProcList *plist = erts_proclist_peek_first(dep->suspended);
+    while (plist) {
+        if (is_not_immed(plist->u.pid))
+            insert_process(plist->u.p);
+        plist = erts_proclist_peek_next(dep->suspended, plist);
+    }
+}
+
+static void clear_process(Process *proc);
+
+static void
+clear_dist_suspended_procs(DistEntry *dep)
+{
+    ErtsProcList *plist = erts_proclist_peek_first(dep->suspended);
+    while (plist) {
+        if (is_not_immed(plist->u.pid))
+            clear_process(plist->u.p);
+        plist = erts_proclist_peek_next(dep->suspended, plist);
+    }
+}
+
+static void
+insert_persistent_term(ErlOffHeap *ohp, void *arg)
+{
+    Eterm heap[3];
+    insert_offheap(ohp, SYSTEM_REF,
+                   TUPLE2(&heap[0], AM_system, AM_persistent_term));
+}
+
+static void
+insert_ets_offheap_thr_prgr(ErlOffHeap *ohp, void *arg)
+{
+    Eterm heap[3];
+    insert_offheap(ohp, ETS_REF,
+                   TUPLE2(&heap[0], AM_system, AM_ets));
+}
+
+#ifdef ERL_NODE_BOOKKEEP
+void
+erts_node_bookkeep(ErlNode *np, Eterm term, int what, char *f, int l)
+{
+    erts_aint_t slot = (erts_atomic_inc_read_nob(&np->slot) - 1) % ERTS_BOOKKEEP_SIZE;
+    ErtsSchedulerData *esdp = erts_get_scheduler_data();
+    Eterm who = THE_NON_VALUE;
+    ASSERT(np);
+    np->books[slot].what = what;
+    np->books[slot].term = term;
+    np->books[slot].file = f;
+    np->books[slot].line = l;
+    if (esdp->current_process) {
+        who = esdp->current_process->common.id;
+    } else if (esdp->current_port) {
+        who = esdp->current_port->common.id;
+    }
+    np->books[slot].who = who;
+}
+#endif
+
+static void
+setup_reference_table(void)
+{
     DistEntry *dep;
     HashInfo hi;
     int i, max;
@@ -1824,14 +1963,14 @@ setup_reference_table(void)
     inserted_bins = NULL;
 
     hash_get_info(&hi, &erts_node_table);
-    referred_nodes = erts_alloc(ERTS_ALC_T_NC_TMP,
+    referred_nodes = erts_alloc(ERTS_DBG_NC_ALLOC_TYPE,
 				hi.objs*sizeof(ReferredNode));
     no_referred_nodes = 0;
     hash_foreach(&erts_node_table, init_referred_node, NULL);
     ASSERT(no_referred_nodes == hi.objs);
 
     hash_get_info(&hi, &erts_dist_table);
-    referred_dists = erts_alloc(ERTS_ALC_T_NC_TMP,
+    referred_dists = erts_alloc(ERTS_DBG_NC_ALLOC_TYPE,
 				hi.objs*sizeof(ReferredDist));
     no_referred_dists = 0;
     hash_foreach(&erts_dist_table, init_referred_dist, NULL);
@@ -1865,53 +2004,12 @@ setup_reference_table(void)
     /* Insert all processes */
     for (i = 0; i < max; i++) {
 	Process *proc = erts_pix2proc(i);
-	if (proc) {
-	    int mli;
-	    ErtsMessage *msg_list[] = {proc->msg_frag};
-
-	    /* Insert Heap */
-	    insert_offheap(&(proc->off_heap),
-			   HEAP_REF,
-			   proc->common.id);
-	    /* Insert heap fragments buffers */
-	    for(hfp = proc->mbuf; hfp; hfp = hfp->next)
-		insert_offheap(&(hfp->off_heap),
-			       HEAP_REF,
-			       proc->common.id);
-
-	    /* Insert msg buffers */
-	    for (mli = 0; mli < sizeof(msg_list)/sizeof(msg_list[0]); mli++) {
-		ErtsMessage *msg;
-		for (msg = msg_list[mli]; msg; msg = msg->next)
-                    insert_message(msg, HEAP_REF, proc);
-	    }
-
-            /* Insert signal queue */
-            erts_proc_sig_debug_foreach_sig(proc,
-                                            insert_sig_msg,
-                                            insert_sig_offheap,
-                                            insert_sig_monitor,
-                                            insert_sig_link,
-                                            (void *) proc);
-
-	    /* Insert links */
-            insert_p_links(&proc->common);
-
-            /* Insert monitors */
-            insert_p_monitors(&proc->common);
-
-            {
-                DistEntry *dep = ERTS_PROC_GET_DIST_ENTRY(proc);
-                if (dep)
-                    insert_dist_entry(dep,
-                                      CTRL_REF,
-                                      proc->common.id,
-                                      0);
-            }
-	}
+	if (proc)
+            insert_process(proc);
     }
-    
-    erts_foreach_sys_msg_in_q(insert_sys_msg);
+    erts_debug_free_process_foreach(insert_process2, NULL);
+
+    erts_debug_foreach_sys_msg_in_q(insert_sys_msg);
 
     /* Insert all ports */
     max = erts_ptab_max(&erts_port);
@@ -1928,10 +2026,18 @@ setup_reference_table(void)
 	if (state & ERTS_PORT_SFLGS_DEAD)
 	    continue;
 
-	/* Insert links */
-        insert_p_links(&prt->common);
-	/* Insert monitors */
-        insert_p_monitors(&prt->common);
+        /* Insert links */
+        erts_link_tree_foreach(ERTS_P_LINKS(prt),
+                               insert_link,
+                               (void *) &prt->common.id);
+        /* Insert monitors */
+        erts_monitor_tree_foreach(ERTS_P_MONITORS(prt),
+                                  insert_monitor,
+                                  (void *) &prt->common.id);
+        /* Insert local target monitors */
+        erts_monitor_list_foreach(ERTS_P_LT_MONITORS(prt),
+                                  insert_monitor,
+                                  (void *) &prt->common.id);
 	/* Insert port data */
 	ohp = erts_port_data_offheap(prt);
 	if (ohp)
@@ -1983,16 +2089,22 @@ setup_reference_table(void)
     for(dep = erts_visible_dist_entries; dep; dep = dep->next) {
         insert_dist_links(dep);
         insert_dist_monitors(dep);
+        insert_dist_sequences(dep);
+        insert_dist_suspended_procs(dep);
     }
 
     for(dep = erts_hidden_dist_entries; dep; dep = dep->next) {
         insert_dist_links(dep);
         insert_dist_monitors(dep);
+        insert_dist_sequences(dep);
+        insert_dist_suspended_procs(dep);
     }
 
     for(dep = erts_pending_dist_entries; dep; dep = dep->next) {
         insert_dist_links(dep);
         insert_dist_monitors(dep);
+        insert_dist_sequences(dep);
+        insert_dist_suspended_procs(dep);
     }
 
     /* Not connected dist entries should not have any links,
@@ -2000,14 +2112,21 @@ setup_reference_table(void)
     for(dep = erts_not_connected_dist_entries; dep; dep = dep->next) {
         insert_dist_links(dep);
         insert_dist_monitors(dep);
+        insert_dist_sequences(dep);
+        insert_dist_suspended_procs(dep);
     }
 
     /* Insert all ets tables */
-    erts_db_foreach_table(insert_ets_table, NULL);
+    erts_db_foreach_table(insert_ets_table, NULL, 0);
+    erts_db_foreach_thr_prgr_offheap(insert_ets_offheap_thr_prgr, NULL);
 
     /* Insert all bif timers */
     erts_debug_bif_timer_foreach(insert_bif_timer, NULL);
 
+    /* Insert persistent term storage */
+    erts_debug_foreach_persistent_term_off_heap(insert_persistent_term,
+                                                NULL);
+
     /* Insert node table (references to dist) */
     hash_foreach(&erts_node_table, insert_erl_node, NULL);
 }
@@ -2173,6 +2292,10 @@ reference_table_term(Uint **hpp, ErlOffHeap *ohp, Uint *szp)
 		tup = MK_2TUP(AM_system, MK_UINT(drp->system_ref));
 		drl = MK_CONS(tup, drl);
 	    }
+            if(drp->sequence_ref) {
+		tup = MK_2TUP(AM_sequence, MK_UINT(drp->sequence_ref));
+		drl = MK_CONS(tup, drl);
+	    }
 	    if(drp->signal_ref) {
 		tup = MK_2TUP(AM_signal, MK_UINT(drp->signal_ref));
 		drl = MK_CONS(tup, drl);
@@ -2202,7 +2325,7 @@ reference_table_term(Uint **hpp, ErlOffHeap *ohp, Uint *szp)
                 tup = MK_2TUP(AM_ets, drp->id);
             }
 	    else {
-		ASSERT(!drp->ctrl_ref && drp->node_ref && !drp->signal_ref);
+		ASSERT(!drp->ctrl_ref && (drp->node_ref || drp->sequence_ref) && !drp->signal_ref);
 		ASSERT(is_atom(drp->id));
 		tup = MK_2TUP(drp->id, MK_UINT(drp->creation));
 		tup = MK_2TUP(AM_node, tup);
@@ -2247,11 +2370,16 @@ static void noop_sig_offheap(ErlOffHeap *oh, void *arg)
 
 }
 
+static void noop_sig_ext(ErtsDistExternal *ext, void *arg)
+{
+
+}
+
+
 static void
 delete_reference_table(void)
 {
-    DistEntry *dep;
-    int i, max;
+    int i;
     for(i = 0; i < no_referred_nodes; i++) {
 	NodeReferrer *nrp;
 	NodeReferrer *tnrp;
@@ -2260,11 +2388,13 @@ delete_reference_table(void)
             erts_cleanup_offheap(&nrp->off_heap);
 	    tnrp = nrp;
 	    nrp = nrp->next;
-	    erts_free(ERTS_ALC_T_NC_TMP, (void *) tnrp);
+	    erts_free(ERTS_DBG_NC_ALLOC_TYPE, (void *) tnrp);
 	}
     }
-    if (referred_nodes)
-	erts_free(ERTS_ALC_T_NC_TMP, (void *) referred_nodes);
+    if (referred_nodes) {
+	erts_free(ERTS_DBG_NC_ALLOC_TYPE, (void *) referred_nodes);
+        referred_nodes = NULL;
+    }
 
     for(i = 0; i < no_referred_dists; i++) {
 	DistReferrer *drp;
@@ -2273,33 +2403,57 @@ delete_reference_table(void)
 	while(drp) {
 	    tdrp = drp;
 	    drp = drp->next;
-	    erts_free(ERTS_ALC_T_NC_TMP, (void *) tdrp);
+	    erts_free(ERTS_DBG_NC_ALLOC_TYPE, (void *) tdrp);
 	}
     }
-    if (referred_dists)
-	erts_free(ERTS_ALC_T_NC_TMP, (void *) referred_dists);
+    if (referred_dists) {
+	erts_free(ERTS_DBG_NC_ALLOC_TYPE, (void *) referred_dists);
+        referred_dists = NULL;
+    }
     while(inserted_bins) {
 	InsertedBin *ib = inserted_bins;
 	inserted_bins = inserted_bins->next;
-	erts_free(ERTS_ALC_T_NC_TMP, (void *)ib);
+	erts_free(ERTS_DBG_NC_ALLOC_TYPE, (void *)ib);
     }
+}
+
+static void clear_process(Process *proc)
+{
+    erts_proc_sig_debug_foreach_sig(proc,
+                                    noop_sig_msg,
+                                    noop_sig_offheap,
+                                    clear_visited_monitor,
+                                    clear_visited_link,
+                                    noop_sig_ext,
+                                    (void *) proc);
 
-    /* Cleanup... */
+
+    /* Clear monitors and links... */
+    erts_debug_proc_monitor_link_foreach(proc,
+                                         clear_visited_monitor,
+                                         clear_visited_link,
+                                         (void *) &proc->common.id);
+}
+
+static void clear_process2(Process *proc, void *arg)
+{
+    clear_process(proc);
+}
+
+static void
+clear_system(void)
+{
+    DistEntry *dep;
+    int i, max;
+    /* Clear... */
 
     max = erts_ptab_max(&erts_proc);
     for (i = 0; i < max; i++) {
 	Process *proc = erts_pix2proc(i);
-	if (proc) {
-            clear_visited_p_links(&proc->common);
-            clear_visited_p_monitors(&proc->common);
-            erts_proc_sig_debug_foreach_sig(proc,
-                                            noop_sig_msg,
-                                            noop_sig_offheap,
-                                            clear_visited_monitor,
-                                            clear_visited_link,
-                                            (void *) proc);
-        }
+	if (proc)
+            clear_process(proc);
     }
+    erts_debug_free_process_foreach(clear_process2, NULL);
 
     max = erts_ptab_max(&erts_port);
     for (i = 0; i < max; i++) {
@@ -2314,28 +2468,42 @@ delete_reference_table(void)
 	if (state & ERTS_PORT_SFLGS_DEAD)
 	    continue;
 
-        clear_visited_p_links(&prt->common);
-        clear_visited_p_monitors(&prt->common);
+        /* Clear links */
+        erts_link_tree_foreach(ERTS_P_LINKS(prt),
+                               clear_visited_link,
+                               (void *) &prt->common.id);
+        /* Clear monitors */
+        erts_monitor_tree_foreach(ERTS_P_MONITORS(prt),
+                                  clear_visited_monitor,
+                                  (void *) &prt->common.id);
+        /* Clear local target monitors */
+        erts_monitor_list_foreach(ERTS_P_LT_MONITORS(prt),
+                                  clear_visited_monitor,
+                                  (void *) &prt->common.id);
     }
 
     for(dep = erts_visible_dist_entries; dep; dep = dep->next) {
         clear_visited_dist_links(dep);
         clear_visited_dist_monitors(dep);
+        clear_dist_suspended_procs(dep);
     }
 
     for(dep = erts_hidden_dist_entries; dep; dep = dep->next) {
         clear_visited_dist_links(dep);
         clear_visited_dist_monitors(dep);
+        clear_dist_suspended_procs(dep);
     }
 
     for(dep = erts_pending_dist_entries; dep; dep = dep->next) {
         clear_visited_dist_links(dep);
         clear_visited_dist_monitors(dep);
+        clear_dist_suspended_procs(dep);
     }
 
     for(dep = erts_not_connected_dist_entries; dep; dep = dep->next) {
         clear_visited_dist_links(dep);
         clear_visited_dist_monitors(dep);
+        clear_dist_suspended_procs(dep);
     }
 }
 
diff --git a/erts/emulator/beam/erl_node_tables.h b/erts/emulator/beam/erl_node_tables.h
index c44f1f8991..ffaafbbbea 100644
--- a/erts/emulator/beam/erl_node_tables.h
+++ b/erts/emulator/beam/erl_node_tables.h
@@ -95,14 +95,26 @@ enum dist_entry_state {
 struct ErtsDistOutputBuf_ {
 #ifdef DEBUG
     Uint dbg_pattern;
+    byte *ext_startp;
     byte *alloc_endp;
 #endif
     ErtsDistOutputBuf *next;
-    Uint hopefull_flags;
+    Binary *bin;
+    /* Pointers to the distribution header,
+       if NULL the distr header is in the extp */
+    byte *hdrp;
+    byte *hdr_endp;
+    /* Pointers to the ctl + payload */
     byte *extp;
     byte *ext_endp;
+    /* Start of payload and hopefull_flags, used by transcode */
+    Uint hopefull_flags;
     byte *msg_start;
-    byte data[1];
+    /* start of the ext buffer, this is not always the same as extp
+       as the atom cache handling can use less then the allotted buffer.
+       This value is needed to calculate the size of this output buffer.*/
+    byte *ext_start;
+
 };
 
 typedef struct {
@@ -137,6 +149,7 @@ struct dist_entry_ {
     enum dist_entry_state state;
     Uint32 flags;		/* Distribution flags, like hidden, 
 				   atom cache etc. */
+    Uint32 opts;
     unsigned long version;	/* Protocol version */
 
     ErtsMonLnkDist *mld;        /* Monitors and links */
@@ -161,14 +174,62 @@ struct dist_entry_ {
     ErtsThrPrgrLaterOp later_op;
 
     struct transcode_context* transcode_ctx;
+
+    struct dist_sequences *sequences; /* Ongoing distribution sequences */
+};
+
+/*
+#define ERL_NODE_BOOKKEEP
+ * Bookkeeping of ErlNode inc and dec operations to help debug refc problems.
+ * This is best used together with cerl -rr. Type the below into gdb:
+ * gdb:
+set pagination off
+set $i = 0
+set $node = referred_nodes[$node_ix].node
+while $i < $node->slot.counter
+ printf "%s:%d ", $node->books[$i].file, $node->books[$i].line
+ printf "%p: ", $node->books[$i].term
+ etp-1 $node->books[$i].who
+ printf " "
+ p $node->books[$i].what
+ set $i++
+end
+
+  * Then save that into a file called test.txt and run the below in
+  * an erlang shell in order to get all inc/dec that do not have a
+  * match.
+
+f(), {ok, B} = file:read_file("test.txt").
+Vs = [begin [Val, _, _, _, What] = All = string:lexemes(Ln, " "),{Val,What,All} end || Ln <- string:lexemes(B,"\n")].
+Accs = lists:foldl(fun({V,<<"ERL_NODE_INC">>,_},M) -> Val = maps:get(V,M,0), M#{ V => Val + 1 }; ({V,<<"ERL_NODE_DEC">>,_},M) -> Val = maps:get(V,M,0), M#{ V => Val - 1 } end, #{}, Vs).
+lists:usort(lists:filter(fun({V,N}) -> N /= 0 end, maps:to_list(Accs))).
+
+ * There are bound to be bugs in the the instrumentation code, but
+ * atleast this is a place to start when hunting refc bugs.
+ *
+ */
+#ifdef ERL_NODE_BOOKKEEP
+struct erl_node_bookkeeping {
+    Eterm who;
+    Eterm term;
+    char *file;
+    int line;
+    enum { ERL_NODE_INC, ERL_NODE_DEC } what;
 };
 
+#define ERTS_BOOKKEEP_SIZE (1024)
+#endif
+
 typedef struct erl_node_ {
   HashBucket hash_bucket;	/* Hash bucket */
   erts_refc_t refc;		/* Reference count */
   Eterm	sysname;		/* name@host atom for efficiency */
   Uint32 creation;		/* Creation */
   DistEntry *dist_entry;	/* Corresponding dist entry */
+#ifdef ERL_NODE_BOOKKEEP
+  struct erl_node_bookkeeping books[ERTS_BOOKKEEP_SIZE];
+  erts_atomic_t slot;
+#endif
 } ErlNode;
 
 
@@ -201,7 +262,7 @@ 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);
+ErlNode *erts_find_or_insert_node(Eterm, Uint32, Eterm);
 void erts_schedule_delete_node(ErlNode *);
 void erts_set_this_node(Eterm, Uint);
 Uint erts_node_table_size(void);
@@ -219,22 +280,68 @@ DistEntry *erts_dhandle_to_dist_entry(Eterm dhandle, Uint32* connection_id);
 Eterm erts_build_dhandle(Eterm **hpp, ErlOffHeap*, DistEntry*, Uint32 conn_id);
 Eterm erts_make_dhandle(Process *c_p, DistEntry*, Uint32 conn_id);
 
-ERTS_GLB_INLINE void erts_deref_node_entry(ErlNode *np);
+ERTS_GLB_INLINE void erts_init_node_entry(ErlNode *np, erts_aint_t val);
+#ifdef ERL_NODE_BOOKKEEP
+#define erts_ref_node_entry(NP, MIN, T) erts_ref_node_entry__((NP), (MIN), (T), __FILE__, __LINE__)
+#define erts_deref_node_entry(NP, T) erts_deref_node_entry__((NP), (T), __FILE__, __LINE__)
+ERTS_GLB_INLINE erts_aint_t erts_ref_node_entry__(ErlNode *np, int min_val, Eterm term, char *file, int line);
+ERTS_GLB_INLINE void erts_deref_node_entry__(ErlNode *np, Eterm term, char *file, int line);
+#else
+ERTS_GLB_INLINE erts_aint_t erts_ref_node_entry(ErlNode *np, int min_val, Eterm term);
+ERTS_GLB_INLINE void erts_deref_node_entry(ErlNode *np, Eterm term);
+#endif
 ERTS_GLB_INLINE void erts_de_rlock(DistEntry *dep);
 ERTS_GLB_INLINE void erts_de_runlock(DistEntry *dep);
 ERTS_GLB_INLINE void erts_de_rwlock(DistEntry *dep);
 ERTS_GLB_INLINE void erts_de_rwunlock(DistEntry *dep);
+#ifdef ERL_NODE_BOOKKEEP
+void erts_node_bookkeep(ErlNode *, Eterm , int, char *file, int line);
+#else
+#define erts_node_bookkeep(...)
+#endif
 
 #if ERTS_GLB_INLINE_INCL_FUNC_DEF
 
 ERTS_GLB_INLINE void
-erts_deref_node_entry(ErlNode *np)
+erts_init_node_entry(ErlNode *np, erts_aint_t val)
+{
+    erts_refc_init(&np->refc, val);
+}
+
+#ifdef ERL_NODE_BOOKKEEP
+
+ERTS_GLB_INLINE erts_aint_t
+erts_ref_node_entry__(ErlNode *np, int min_val, Eterm term, char *file, int line)
+{
+    erts_node_bookkeep(np, term, ERL_NODE_INC, file, line);
+    return erts_refc_inctest(&np->refc, min_val);
+}
+
+ERTS_GLB_INLINE void
+erts_deref_node_entry__(ErlNode *np, Eterm term, char *file, int line)
+{
+    erts_node_bookkeep(np, term, ERL_NODE_DEC, file, line);
+    if (erts_refc_dectest(&np->refc, 0) == 0)
+	erts_schedule_delete_node(np);
+}
+
+#else
+
+ERTS_GLB_INLINE erts_aint_t
+erts_ref_node_entry(ErlNode *np, int min_val, Eterm term)
+{
+    return erts_refc_inctest(&np->refc, min_val);
+}
+
+ERTS_GLB_INLINE void
+erts_deref_node_entry(ErlNode *np, Eterm term)
 {
-    ASSERT(np);
     if (erts_refc_dectest(&np->refc, 0) == 0)
 	erts_schedule_delete_node(np);
 }
 
+#endif
+
 ERTS_GLB_INLINE void
 erts_de_rlock(DistEntry *dep)
 {
diff --git a/erts/emulator/beam/erl_port.h b/erts/emulator/beam/erl_port.h
index 25976d38cc..039d8cf67a 100644
--- a/erts/emulator/beam/erl_port.h
+++ b/erts/emulator/beam/erl_port.h
@@ -1018,6 +1018,6 @@ int erts_port_output_async(Port *, Eterm, Eterm);
 /*
  * Signals from ports to ports. Used by sys drivers.
  */
-int erl_drv_port_control(Eterm, char, char*, ErlDrvSizeT);
+int erl_drv_port_control(Eterm, unsigned int, char*, ErlDrvSizeT);
 
 #endif
diff --git a/erts/emulator/beam/erl_port_task.c b/erts/emulator/beam/erl_port_task.c
index c8f2e88127..30a7875387 100644
--- a/erts/emulator/beam/erl_port_task.c
+++ b/erts/emulator/beam/erl_port_task.c
@@ -2094,7 +2094,7 @@ begin_port_cleanup(Port *pp, ErtsPortTask **execqp, int *processing_busy_q_p)
 
 	    erts_snprintf(port_str, sizeof(DTRACE_CHARBUF_NAME(port_str)), "%T", pp->common.id);
 	    while (plp2 != NULL) {
-		erts_snprintf(pid_str, sizeof(DTRACE_CHARBUF_NAME(pid_str)), "%T", plp2->pid);
+		erts_snprintf(pid_str, sizeof(DTRACE_CHARBUF_NAME(pid_str)), "%T", plp2->u.pid);
 		DTRACE2(process_port_unblocked, pid_str, port_str);
 	    }
 	}
diff --git a/erts/emulator/beam/erl_posix_str.c b/erts/emulator/beam/erl_posix_str.c
index 7b3e640d3f..5b515d6e78 100644
--- a/erts/emulator/beam/erl_posix_str.c
+++ b/erts/emulator/beam/erl_posix_str.c
@@ -171,6 +171,9 @@ erl_errno_id(error)
 #if defined(EIDRM) && (!defined(EINPROGRESS) || (EIDRM != EINPROGRESS))
     case EIDRM: return "eidrm";
 #endif
+#ifdef EILSEQ
+    case EILSEQ: return "eilseq";
+#endif
 #ifdef EINIT
     case EINIT: return "einit";
 #endif
diff --git a/erts/emulator/beam/erl_printf_term.c b/erts/emulator/beam/erl_printf_term.c
index 990a01b96f..67c486a0db 100644
--- a/erts/emulator/beam/erl_printf_term.c
+++ b/erts/emulator/beam/erl_printf_term.c
@@ -364,13 +364,13 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount) {
 	    int print_res;
 	    char def_buf[64];
 	    char *buf, *big_str;
-	    Uint sz = (Uint) big_decimal_estimate(wobj);
+	    Uint sz = (Uint) big_integer_estimate(wobj, 10);
 	    sz++;
 	    if (sz <= 64)
 		buf = &def_buf[0];
 	    else
 		buf = erts_alloc(ERTS_ALC_T_TMP, sz);
-	    big_str = erts_big_to_string(wobj, buf, sz);
+	    big_str = erts_big_to_string(wobj, 10, buf, sz);
 	    print_res = erts_printf_string(fn, arg, big_str);
 	    if (buf != &def_buf[0])
 		erts_free(ERTS_ALC_T_TMP, (void *) buf);
@@ -487,6 +487,8 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount) {
 			PRINT_UWORD(res, fn, arg, 'u', 0, 1, octet);
 			++bytep;
 			--bytesize;
+                        if ((*dcount)-- <= 0)
+                            goto L_done;
 		    }
 		    if (bitsize) {
 			Uint bits = bitoffs + bitsize;
@@ -521,6 +523,8 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount) {
 			PRINT_CHAR(res, fn, arg, octet);
 			++bytep;
 			--bytesize;
+                        if ((*dcount)-- <= 0)
+                            goto L_done;
 		    }
 		    PRINT_STRING(res, fn, arg, "\">>");
 		}
@@ -529,13 +533,34 @@ print_term(fmtfn_t fn, void* arg, Eterm obj, long *dcount) {
 	case EXPORT_DEF:
 	    {
 		Export* ep = *((Export **) (export_val(wobj) + 1));
-		Atom* module = atom_tab(atom_val(ep->info.mfa.module));
-		Atom* name = atom_tab(atom_val(ep->info.mfa.function));
+		long tdcount;
+		int tres;
 
 		PRINT_STRING(res, fn, arg, "fun ");
-		PRINT_BUF(res, fn, arg, module->name, module->len);
+
+		/* We pass a temporary 'dcount' and adjust the real one later to ensure
+		 * that the fun doesn't get split up between the module and function
+		 * name. */
+		tdcount = MAX_ATOM_SZ_LIMIT;
+		tres = print_atom_name(fn, arg, ep->info.mfa.module, &tdcount);
+		if (tres < 0) {
+		    res = tres;
+		    goto L_done;
+		}
+		*dcount -= (MAX_ATOM_SZ_LIMIT - tdcount);
+		res += tres;
+
 		PRINT_CHAR(res, fn, arg, ':');
-		PRINT_BUF(res, fn, arg, name->name, name->len);
+
+		tdcount = MAX_ATOM_SZ_LIMIT;
+		tres = print_atom_name(fn, arg, ep->info.mfa.function, &tdcount);
+		if (tres < 0) {
+		    res = tres;
+		    goto L_done;
+		}
+		*dcount -= (MAX_ATOM_SZ_LIMIT - tdcount);
+		res += tres;
+
 		PRINT_CHAR(res, fn, arg, '/');
 		PRINT_SWORD(res, fn, arg, 'd', 0, 1,
 			    (ErlPfSWord) ep->info.mfa.arity);
diff --git a/erts/emulator/beam/erl_proc_sig_queue.c b/erts/emulator/beam/erl_proc_sig_queue.c
index f343e984f7..d5e0e3b218 100644
--- a/erts/emulator/beam/erl_proc_sig_queue.c
+++ b/erts/emulator/beam/erl_proc_sig_queue.c
@@ -36,6 +36,7 @@
 #include "erl_port_task.h"
 #include "erl_trace.h"
 #include "beam_bp.h"
+#include "erl_binary.h"
 #include "big.h"
 #include "erl_gc.h"
 #include "bif.h"
@@ -80,6 +81,11 @@
 #define ERTS_SIG_Q_TYPE_ADJUST_TRACE_INFO \
     ERTS_SIG_Q_TYPE_MAX
 
+#define ERTS_SIG_IS_GEN_EXIT(sig)                                       \
+    (ERTS_PROC_SIG_TYPE(((ErtsSignal *) sig)->common.tag) == ERTS_SIG_Q_TYPE_GEN_EXIT)
+#define ERTS_SIG_IS_GEN_EXIT_EXTERNAL(sig)                              \
+    (ASSERT(ERTS_SIG_IS_GEN_EXIT(sig)),is_non_value(get_exit_signal_data(sig)->reason))
+
 Process *ERTS_WRITE_UNLIKELY(erts_dirty_process_signal_handler);
 Process *ERTS_WRITE_UNLIKELY(erts_dirty_process_signal_handler_high);
 Process *ERTS_WRITE_UNLIKELY(erts_dirty_process_signal_handler_max);
@@ -259,7 +265,7 @@ destroy_dist_proc_demonitor(ErtsSigDistProcDemonitor *dmon)
     Eterm ref = dmon->ref;
     if (is_external(ref)) {
         ExternalThing *etp = external_thing_ptr(ref);
-        erts_deref_node_entry(etp->node);
+        erts_deref_node_entry(etp->node, ref);
     }
     erts_free(ERTS_ALC_T_DIST_DEMONITOR, dmon);
 }
@@ -294,7 +300,8 @@ destroy_sig_dist_link_op(ErtsSigDistLinkOp *sdlnk)
 {
     ASSERT(is_external_pid(sdlnk->remote));
     ASSERT(boxed_val(sdlnk->remote) == &sdlnk->heap[0]);
-    erts_deref_node_entry(((ExternalThing *) &sdlnk->heap[0])->node);
+    erts_deref_node_entry(((ExternalThing *) &sdlnk->heap[0])->node,
+                          make_boxed(&sdlnk->heap[0]));
     erts_free(ERTS_ALC_T_SIG_DATA, sdlnk);
 }
 
@@ -604,7 +611,8 @@ proc_queue_signal(Process *c_p, Eterm pid, ErtsSignal *sig, int op)
 #endif
                 return 1;
             }
-            ASSERT(esdp->pending_signal.dbg_from == esdp->current_process);
+            ASSERT(esdp->pending_signal.dbg_from == esdp->current_process ||
+                   esdp->pending_signal.dbg_from == esdp->free_process);
             if (pend_sig != sig) {
                 /* Switch them and send previously pending signal instead */
                 Eterm pend_to = esdp->pending_signal.to;
@@ -936,29 +944,54 @@ erts_proc_sig_privqs_len(Process *c_p)
     return proc_sig_privqs_len(c_p, 0);
 }
 
+ErtsDistExternal *
+erts_proc_sig_get_external(ErtsMessage *msgp)
+{
+    if (ERTS_SIG_IS_EXTERNAL_MSG(msgp)) {
+        return erts_get_dist_ext(msgp->data.heap_frag);
+    } else if (ERTS_SIG_IS_NON_MSG(msgp) &&
+               ERTS_SIG_IS_GEN_EXIT(msgp) &&
+               ERTS_SIG_IS_GEN_EXIT_EXTERNAL(msgp)) {
+        ErtsDistExternal *edep;
+        ErtsExitSignalData *xsigd = get_exit_signal_data(msgp);
+        ASSERT(ERTS_PROC_SIG_TYPE(((ErtsSignal *) msgp)->common.tag) == ERTS_SIG_Q_TYPE_GEN_EXIT);
+        ASSERT(is_non_value(xsigd->reason));
+        if (msgp->hfrag.next == NULL)
+            edep = (ErtsDistExternal*)(xsigd + 1);
+        else
+            edep = erts_get_dist_ext(msgp->hfrag.next);
+        return edep;
+    }
+    return NULL;
+}
+
 static void do_seq_trace_output(Eterm to, Eterm token, Eterm msg);
 
 static void
 send_gen_exit_signal(Process *c_p, Eterm from_tag,
                      Eterm from, Eterm to,
-                     Sint16 op, Eterm reason, Eterm ref,
-                     Eterm token, int normal_kills)
+                     Sint16 op, Eterm reason, ErtsDistExternal *dist_ext,
+                     ErlHeapFragment *dist_ext_hfrag,
+                     Eterm ref, Eterm token, int normal_kills)
 {
     ErtsExitSignalData *xsigd;
     Eterm *hp, *start_hp, s_reason, s_ref, s_message, s_token, s_from;
     ErtsMessage *mp;
     ErlHeapFragment *hfrag;
     ErlOffHeap *ohp;
-    Uint hsz, from_sz, reason_sz, ref_sz, token_sz;
+    Uint hsz, from_sz, reason_sz, ref_sz, token_sz, dist_ext_sz;
     int seq_trace;
 #ifdef USE_VM_PROBES
     Eterm s_utag, utag;
     Uint utag_sz;
 #endif
 
+    ASSERT((is_value(reason) && dist_ext == NULL) ||
+           (is_non_value(reason) && dist_ext != NULL));
+
     ASSERT(is_immed(from_tag));
 
-    hsz = sizeof(ErtsExitSignalData)/sizeof(Uint);
+    hsz = sizeof(ErtsExitSignalData)/sizeof(Eterm);
 
     seq_trace = c_p && have_seqtrace(token);
     if (seq_trace)
@@ -977,33 +1010,44 @@ send_gen_exit_signal(Process *c_p, Eterm from_tag,
     hsz += utag_sz;
 #endif
 
-    token_sz = is_immed(token) ? 0 : size_object(token);
+    token_sz = size_object(token);
     hsz += token_sz;
 
-    from_sz = is_immed(from) ? 0 : size_object(from);
+    from_sz = size_object(from);
     hsz += from_sz;
 
-    reason_sz = is_immed(reason) ? 0 : size_object(reason);
-    hsz += reason_sz;
+    ref_sz = size_object(ref);
+    hsz += ref_sz;
 
-    switch (op) {
-    case ERTS_SIG_Q_OP_EXIT:
-    case ERTS_SIG_Q_OP_EXIT_LINKED: {
-        /* {'EXIT', From, Reason} */
-        hsz += 4; /* 3-tuple */
-        ref_sz = 0;
-        break;
-    }
-    case ERTS_SIG_Q_OP_MONITOR_DOWN: {
-        /* {'DOWN', Ref, process, From, Reason} */
-        hsz += 6; /* 5-tuple */
-        ref_sz = NC_HEAP_SIZE(ref);
-        hsz += ref_sz;
-        break;
-    }
-    default:
-        ERTS_INTERNAL_ERROR("Invalid exit signal op");
-        break;
+    reason_sz = 0; /* Set to silence gcc warning */
+
+    /* The reason was part of the control message,
+       just use copy it into the xsigd */
+    if (is_value(reason)) {
+        reason_sz = size_object(reason);
+        hsz += reason_sz;
+
+        switch (op) {
+        case ERTS_SIG_Q_OP_EXIT:
+        case ERTS_SIG_Q_OP_EXIT_LINKED: {
+            /* {'EXIT', From, Reason} */
+            hsz += 4; /* 3-tuple */
+            break;
+        }
+        case ERTS_SIG_Q_OP_MONITOR_DOWN: {
+            /* {'DOWN', Ref, process, From, Reason} */
+            hsz += 6; /* 5-tuple */
+            break;
+        }
+        default:
+            ERTS_INTERNAL_ERROR("Invalid exit signal op");
+            break;
+        }
+    } else if (dist_ext != NULL && dist_ext_hfrag == NULL) {
+        /* The message was not fragmented so we need to create space
+           for a single dist_ext element */
+        dist_ext_sz = erts_dist_ext_size(dist_ext) / sizeof(Eterm);
+        hsz += dist_ext_sz;
     }
 
     /*
@@ -1015,35 +1059,33 @@ send_gen_exit_signal(Process *c_p, Eterm from_tag,
     ohp = &hfrag->off_heap;
     start_hp = hp;
 
-    s_token = (is_immed(token)
-                ? token
-                : copy_struct(token, token_sz, &hp, ohp));
-
-    s_reason = (is_immed(reason)
-                ? reason
-                : copy_struct(reason, reason_sz, &hp, ohp));
+    s_token = copy_struct(token, token_sz, &hp, ohp);
+    s_from = copy_struct(from, from_sz, &hp, ohp);
+    s_ref = copy_struct(ref, ref_sz, &hp, ohp);
 
-    s_from = (is_immed(from)
-              ? from
-              : copy_struct(from, from_sz, &hp, ohp));
-
-    if (!ref_sz)
-        s_ref = NIL;
-    else
-        s_ref = STORE_NC(&hp, ohp, ref);
+    if (is_value(reason)) {
+        s_reason = copy_struct(reason, reason_sz, &hp, ohp);
 
-    switch (op) {
-    case ERTS_SIG_Q_OP_EXIT:
-    case ERTS_SIG_Q_OP_EXIT_LINKED:
-        /* {'EXIT', From, Reason} */
-        s_message = TUPLE3(hp, am_EXIT, s_from, s_reason);
-        hp += 4;
-        break;
-    case ERTS_SIG_Q_OP_MONITOR_DOWN:
-        /* {'DOWN', Ref, process, From, Reason} */
-        s_message = TUPLE5(hp, am_DOWN, s_ref, am_process, s_from, s_reason);
-        hp += 6;
-        break;
+        switch (op) {
+        case ERTS_SIG_Q_OP_EXIT:
+        case ERTS_SIG_Q_OP_EXIT_LINKED:
+            /* {'EXIT', From, Reason} */
+            s_message = TUPLE3(hp, am_EXIT, s_from, s_reason);
+            hp += 4;
+            break;
+        case ERTS_SIG_Q_OP_MONITOR_DOWN:
+            /* {'DOWN', Ref, process, From, Reason} */
+            s_message = TUPLE5(hp, am_DOWN, s_ref, am_process, s_from, s_reason);
+            hp += 6;
+            break;
+        default:
+            /* This cannot happen, used to silence gcc warning */
+            s_message = THE_NON_VALUE;
+            break;
+        }
+    } else {
+        s_message = THE_NON_VALUE;
+        s_reason = THE_NON_VALUE;
     }
 
 #ifdef USE_VM_PROBES
@@ -1061,11 +1103,13 @@ send_gen_exit_signal(Process *c_p, Eterm from_tag,
 
     hfrag->used_size = hp - start_hp;
 
-    xsigd = (ErtsExitSignalData *) (char *) hp;
+    xsigd = (ErtsExitSignalData *) hp;
 
     xsigd->message = s_message;
     xsigd->from = s_from;
     xsigd->reason = s_reason;
+    hfrag->next = dist_ext_hfrag;
+
     if (is_nil(s_ref))
         xsigd->u.normal_kills = normal_kills;
     else {
@@ -1073,6 +1117,15 @@ send_gen_exit_signal(Process *c_p, Eterm from_tag,
         xsigd->u.ref = s_ref;
     }
 
+    hp += sizeof(ErtsExitSignalData)/sizeof(Eterm);
+
+    if (dist_ext != NULL && dist_ext_hfrag == NULL && is_non_value(reason)) {
+        erts_make_dist_ext_copy(dist_ext, (ErtsDistExternal *) hp);
+        hp += dist_ext_sz;
+    }
+
+    ASSERT(hp == mp->hfrag.mem + mp->hfrag.alloc_size);
+
     if (seq_trace)
         do_seq_trace_output(to, s_token, s_message);
 
@@ -1205,7 +1258,19 @@ erts_proc_sig_send_exit(Process *c_p, Eterm from, Eterm to,
         from_tag = dep->sysname;
     }
     send_gen_exit_signal(c_p, from_tag, from, to, ERTS_SIG_Q_OP_EXIT,
-                         reason, NIL, token, normal_kills);
+                         reason, NULL, NULL, NIL, token, normal_kills);
+}
+
+void
+erts_proc_sig_send_dist_exit(DistEntry *dep,
+                             Eterm from, Eterm to,
+                             ErtsDistExternal *dist_ext,
+                             ErlHeapFragment *hfrag,
+                             Eterm reason, Eterm token)
+{
+    send_gen_exit_signal(NULL, dep->sysname, from, to, ERTS_SIG_Q_OP_EXIT,
+                         reason, dist_ext, hfrag, NIL, token, 0);
+
 }
 
 void
@@ -1219,7 +1284,7 @@ erts_proc_sig_send_link_exit(Process *c_p, Eterm from, ErtsLink *lnk,
     if (is_not_immed(reason) || is_not_nil(token)) {
         ASSERT(is_internal_pid(from) || is_internal_port(from));
         send_gen_exit_signal(c_p, from, from, to, ERTS_SIG_Q_OP_EXIT_LINKED,
-                             reason, NIL, token, 0);
+                             reason, NULL, NULL, NIL, token, 0);
     }
     else {
         /* Pass signal using old link structure... */
@@ -1274,10 +1339,13 @@ erts_proc_sig_send_unlink(Process *c_p, ErtsLink *lnk)
 void
 erts_proc_sig_send_dist_link_exit(DistEntry *dep,
                                   Eterm from, Eterm to,
+                                  ErtsDistExternal *dist_ext,
+                                  ErlHeapFragment *hfrag,
                                   Eterm reason, Eterm token)
 {
     send_gen_exit_signal(NULL, dep->sysname, from, to, ERTS_SIG_Q_OP_EXIT_LINKED,
-                         reason, NIL, token, 0);
+                         reason, dist_ext, hfrag, NIL, token, 0);
+
 }
 
 void
@@ -1299,16 +1367,18 @@ erts_proc_sig_send_dist_unlink(DistEntry *dep, Eterm from, Eterm to)
 void
 erts_proc_sig_send_dist_monitor_down(DistEntry *dep, Eterm ref,
                                      Eterm from, Eterm to,
+                                     ErtsDistExternal *dist_ext,
+                                     ErlHeapFragment *hfrag,
                                      Eterm reason)
 {
     Eterm monitored, heap[3];
-    if (is_atom(from)) 
+    if (is_atom(from))
         monitored = TUPLE2(&heap[0], from, dep->sysname);
     else
         monitored = from;
     send_gen_exit_signal(NULL, dep->sysname, monitored,
                          to, ERTS_SIG_Q_OP_MONITOR_DOWN,
-                         reason, ref, NIL, 0);    
+                         reason, dist_ext, hfrag, ref, NIL, 0);
 }
 
 void
@@ -1376,10 +1446,10 @@ erts_proc_sig_send_monitor_down(ErtsMonitor *mon, Eterm reason)
                    || is_internal_pid(from_tag)
                    || is_atom(from_tag));
             monitored = TUPLE2(&heap[0], name, node);
-        }    
+        }
         send_gen_exit_signal(NULL, from_tag, monitored,
                              to, ERTS_SIG_Q_OP_MONITOR_DOWN,
-                             reason, mdp->ref, NIL, 0);
+                             reason, NULL, NULL, mdp->ref, NIL, 0);
     }
     erts_monitor_release(mon);
 }
@@ -2037,7 +2107,6 @@ handle_exit_signal(Process *c_p, ErtsSigRecvTracing *tracing,
     if (type == ERTS_SIG_Q_TYPE_GEN_EXIT) {
         xsigd = get_exit_signal_data(sig);
         from = xsigd->from;
-        reason = xsigd->reason;
         if (op != ERTS_SIG_Q_OP_EXIT_LINKED)
             ignore = 0;
         else {
@@ -2062,6 +2131,18 @@ handle_exit_signal(Process *c_p, ErtsSigRecvTracing *tracing,
             }
         }
 
+        /* This GEN_EXIT was received from another node, decode the exit reason */
+        if (ERTS_SIG_IS_GEN_EXIT_EXTERNAL(sig))
+            erts_proc_sig_decode_dist(c_p, ERTS_PROC_LOCK_MAIN, sig, 1);
+
+        reason = xsigd->reason;
+
+        if (is_non_value(reason)) {
+            /* Bad distribution message; remove it from queue... */
+            ignore = !0;
+            destroy = !0;
+        }
+
         if (!ignore) {
 
             if ((op != ERTS_SIG_Q_OP_EXIT || reason != am_kill)
@@ -2929,6 +3010,104 @@ handle_sync_suspend(Process *c_p, ErtsMessage *mp)
     }
 }
 
+int
+erts_proc_sig_decode_dist(Process *proc, ErtsProcLocks proc_locks,
+                          ErtsMessage *msgp, int force_off_heap)
+{
+    ErtsHeapFactory factory;
+    ErlHeapFragment *hfrag;
+    Eterm msg;
+    Sint need;
+    ErtsDistExternal *edep;
+    ErtsExitSignalData *xsigd = NULL;
+
+    edep = erts_proc_sig_get_external(msgp);
+    if (!ERTS_SIG_IS_EXTERNAL_MSG(msgp))
+        xsigd = get_exit_signal_data(msgp);
+
+    if (edep->heap_size >= 0)
+	need = edep->heap_size;
+    else {
+	need = erts_decode_dist_ext_size(edep, 1, 1);
+	if (need < 0) {
+	    /* bad signal; remove it... */
+	    return 0;
+	}
+
+	edep->heap_size = need;
+    }
+
+    if (ERTS_SIG_IS_NON_MSG(msgp)) {
+        switch (ERTS_PROC_SIG_OP(ERL_MESSAGE_TERM(msgp))) {
+        case ERTS_SIG_Q_OP_EXIT:
+        case ERTS_SIG_Q_OP_EXIT_LINKED:
+            /* {'EXIT', From, Reason} */
+            need += 4;
+            break;
+        case ERTS_SIG_Q_OP_MONITOR_DOWN:
+            /* {'DOWN', Ref, process, From, Reason} */
+            need += 6; /* 5-tuple */
+            break;
+        default:
+            ERTS_INTERNAL_ERROR("Invalid exit signal op");
+            break;
+        }
+    }
+
+    hfrag = new_message_buffer(need);
+    erts_factory_heap_frag_init(&factory, hfrag);
+
+    ASSERT(edep->heap_size >= 0);
+
+    msg = erts_decode_dist_ext(&factory, edep, 1);
+
+    if (is_non_value(msg)) {
+        erts_factory_undo(&factory);
+        return 0;
+    }
+
+    if (ERTS_SIG_IS_MSG(msgp)) {
+        ERL_MESSAGE_TERM(msgp) = msg;
+        if (msgp->data.heap_frag == &msgp->hfrag)
+            msgp->data.heap_frag = ERTS_MSG_COMBINED_HFRAG;
+    } else {
+        switch (ERTS_PROC_SIG_OP(ERL_MESSAGE_TERM(msgp))) {
+        case ERTS_SIG_Q_OP_EXIT:
+        case ERTS_SIG_Q_OP_EXIT_LINKED:
+            /* {'EXIT', From, Reason} */
+            erts_reserve_heap(&factory, 4);
+            xsigd->message = TUPLE3(factory.hp, am_EXIT, xsigd->from, msg);
+            factory.hp += 4;
+            break;
+        case ERTS_SIG_Q_OP_MONITOR_DOWN:
+            /* {'DOWN', Ref, process, From, Reason} */
+            erts_reserve_heap(&factory, 6);
+            xsigd->message = TUPLE5(factory.hp, am_DOWN, xsigd->u.ref, am_process, xsigd->from, msg);
+            factory.hp += 6;
+            break;
+        }
+        xsigd->reason = msg;
+    }
+
+    erts_free_dist_ext_copy(edep);
+
+    erts_factory_close(&factory);
+
+    hfrag = factory.heap_frags;
+    while (hfrag->next)
+        hfrag = hfrag->next;
+
+    if (ERTS_SIG_IS_MSG(msgp) && msgp->data.heap_frag != ERTS_MSG_COMBINED_HFRAG) {
+        hfrag->next = msgp->data.heap_frag;
+        msgp->data.heap_frag = factory.heap_frags;
+    } else {
+        hfrag->next = msgp->hfrag.next;
+        msgp->hfrag.next = factory.heap_frags;
+    }
+
+    return 1;
+}
+
 void
 erts_proc_sig_handle_pending_suspend(Process *c_p)
 {
@@ -3045,7 +3224,7 @@ erts_proc_sig_handle_incoming(Process *c_p, erts_aint32_t *statep,
         ASSERT(ERTS_SIG_IS_NON_MSG(sig));
 
         tag = ((ErtsSignal *) sig)->common.tag;
- 
+
         switch (ERTS_PROC_SIG_OP(tag)) {
 
         case ERTS_SIG_Q_OP_EXIT:
@@ -3091,6 +3270,12 @@ erts_proc_sig_handle_incoming(Process *c_p, erts_aint32_t *statep,
                 break;
             case ERTS_SIG_Q_TYPE_GEN_EXIT:
                 xsigd = get_exit_signal_data(sig);
+
+                /* This GEN_EXIT was received from another node, decode the exit reason */
+                if (ERTS_SIG_IS_GEN_EXIT_EXTERNAL(sig))
+                    if (!erts_proc_sig_decode_dist(c_p, ERTS_PROC_LOCK_MAIN, sig, 1))
+                        break; /* Decode failed, just remove signal */
+
                 omon = erts_monitor_tree_lookup(ERTS_P_MONITORS(c_p),
                                                 xsigd->u.ref);
                 if (omon) {
@@ -3247,9 +3432,15 @@ erts_proc_sig_handle_incoming(Process *c_p, erts_aint32_t *statep,
                             erts_nif_demonitored((ErtsResource *) tmon->other.ptr);
                             cnt++;
                             break;
-                        case ERTS_MON_TYPE_SUSPEND:
-                            erts_resume(c_p, ERTS_PROC_LOCK_MAIN);
+                        case ERTS_MON_TYPE_SUSPEND: {
+                            ErtsMonitorSuspend *msp;
+                            erts_aint_t mstate;
+                            msp = (ErtsMonitorSuspend *) erts_monitor_to_data(tmon);
+                            mstate = erts_atomic_read_acqb(&msp->state);
+                            if (mstate & ERTS_MSUSPEND_STATE_FLG_ACTIVE)
+                                erts_resume(c_p, ERTS_PROC_LOCK_MAIN);
                             break;
+                        }
                         default:
                             break;
                         }
@@ -3590,9 +3781,10 @@ stretch_limit(Process *c_p, ErtsSigRecvTracing *tp,
 
 
 int
-erts_proc_sig_handle_exit(Process *c_p, int *redsp)
+erts_proc_sig_handle_exit(Process *c_p, Sint *redsp)
 {
-    int cnt, limit;
+    int cnt;
+    Sint limit;
     ErtsMessage *sig, ***next_nm_sig;
 
     ERTS_HDBG_CHECK_SIGNAL_PRIV_QUEUE(c_p, 0);
@@ -3671,9 +3863,9 @@ erts_proc_sig_handle_exit(Process *c_p, int *redsp)
             break;
 
         case ERTS_SIG_Q_OP_MONITOR: {
-            ErtsProcExitContext pectxt = {c_p, am_noproc};
+            ErtsProcExitContext pectxt = {c_p, am_noproc, NULL, NULL, NIL};
             erts_proc_exit_handle_monitor((ErtsMonitor *) sig,
-                                          (void *) &pectxt);
+                                          (void *) &pectxt, -1);
             cnt += 4;
             break;
         }
@@ -3687,7 +3879,7 @@ erts_proc_sig_handle_exit(Process *c_p, int *redsp)
 
         case ERTS_SIG_Q_OP_LINK: {
             ErtsProcExitContext pectxt = {c_p, am_noproc};
-            erts_proc_exit_handle_link((ErtsLink *) sig, (void *) &pectxt);
+            erts_proc_exit_handle_link((ErtsLink *) sig, (void *) &pectxt, -1);
             break;
         }
 
@@ -3784,6 +3976,9 @@ clear_seq_trace_token(ErtsMessage *sig)
             case ERTS_MON_TYPE_PROC:
             case ERTS_MON_TYPE_DIST_PROC:
             case ERTS_MON_TYPE_NODE:
+            case ERTS_MON_TYPE_NODES:
+            case ERTS_MON_TYPE_SUSPEND:
+            case ERTS_MON_TYPE_TIME_OFFSET:
                 break;
             default:
                 ERTS_INTERNAL_ERROR("Unexpected sig type");
@@ -3800,6 +3995,11 @@ clear_seq_trace_token(ErtsMessage *sig)
         case ERTS_SIG_Q_OP_LINK:
         case ERTS_SIG_Q_OP_UNLINK:
         case ERTS_SIG_Q_OP_TRACE_CHANGE_STATE:
+        case ERTS_SIG_Q_OP_GROUP_LEADER:
+        case ERTS_SIG_Q_OP_IS_ALIVE:
+        case ERTS_SIG_Q_OP_PROCESS_INFO:
+        case ERTS_SIG_Q_OP_SYNC_SUSPEND:
+        case ERTS_SIG_Q_OP_RPC:
             break;
 
         default:
@@ -3812,7 +4012,6 @@ clear_seq_trace_token(ErtsMessage *sig)
 void
 erts_proc_sig_clear_seq_trace_tokens(Process *c_p)
 {
-    ASSERT(erts_thr_progress_is_blocking());
     erts_proc_sig_fetch(c_p);
     ERTS_FOREACH_SIG_PRIVQS(c_p, sig, clear_seq_trace_token(sig));
 }
@@ -3852,6 +4051,7 @@ erts_proc_sig_signal_size(ErtsSignal *sig)
         case ERTS_MON_TYPE_DIST_PROC:
         case ERTS_MON_TYPE_NODE:
             size = erts_monitor_size((ErtsMonitor *) sig);
+            break;
         default:
             ERTS_INTERNAL_ERROR("Unexpected sig type");
             break;
@@ -4189,11 +4389,13 @@ handle_msg_tracing(Process *c_p, ErtsSigRecvTracing *tracing,
             return -1; /* Yield... */
         }
         if (ERTS_SIG_IS_EXTERNAL_MSG(sig)) {
-            cnt++;
-            if (!erts_decode_dist_message(c_p, ERTS_PROC_LOCK_MAIN,
-                                          sig, 0)) {
+            cnt += 50; /* Decode is expensive... */
+            if (!erts_proc_sig_decode_dist(c_p, ERTS_PROC_LOCK_MAIN,
+                                           sig, 0)) {
                 /* Bad dist message; remove it... */
                 remove_mq_m_sig(c_p, sig, next_sig, next_nm_sig);
+                sig->next = NULL;
+                erts_cleanup_messages(sig);
                 sig = *next_sig;
                 continue;
             }
@@ -4265,18 +4467,12 @@ erts_proc_sig_prep_msgq_for_inspection(Process *c_p,
 
 	if (ERTS_SIG_IS_EXTERNAL_MSG(mp)) {
 	    /* decode it... */
-	    if (mp->data.attached)
-		erts_decode_dist_message(rp, rp_locks, mp, !0);
-
-	    msg = ERL_MESSAGE_TERM(mp);
-
-	    if (is_non_value(msg)) {
+            if (!erts_proc_sig_decode_dist(rp, rp_locks, mp, !0)) {
 		ErtsMessage *bad_mp = mp;
 		/*
 		 * Bad distribution message; remove
 		 * it from the queue...
 		 */
-		ASSERT(!mp->data.attached);
 
 		ASSERT(*mpp == bad_mp);
 
@@ -4288,6 +4484,8 @@ erts_proc_sig_prep_msgq_for_inspection(Process *c_p,
 		erts_cleanup_messages(bad_mp);
 		continue;
 	    }
+
+	    msg = ERL_MESSAGE_TERM(mp);
 	}
 
 	ASSERT(is_value(msg));
@@ -4446,12 +4644,21 @@ debug_foreach_sig_fake_oh(Eterm term,
 
 }
 
+static void
+debug_foreach_sig_external(ErtsMessage *msgp,
+                           void (*ext_func)(ErtsDistExternal *, void *),
+                           void *arg)
+{
+    ext_func(erts_proc_sig_get_external(msgp), arg);
+}
+
 void
 erts_proc_sig_debug_foreach_sig(Process *c_p,
                                 void (*msg_func)(ErtsMessage *, void *),
                                 void (*oh_func)(ErlOffHeap *, void *),
-                                void (*mon_func)(ErtsMonitor *, void *),
-                                void (*lnk_func)(ErtsLink *, void *),
+                                ErtsMonitorFunc mon_func,
+                                ErtsLinkFunc lnk_func,
+                                void (*ext_func)(ErtsDistExternal *, void *),
                                 void *arg)
 {
     ErtsMessage *queue[] = {c_p->sig_qs.first, c_p->sig_qs.cont, c_p->sig_inq.first};
@@ -4460,10 +4667,10 @@ erts_proc_sig_debug_foreach_sig(Process *c_p,
     for (qix = 0; qix < sizeof(queue)/sizeof(queue[0]); qix++) {
         ErtsMessage *sig;
         for (sig = queue[qix]; sig; sig = sig->next) {
-            
-            if (ERTS_SIG_IS_MSG(sig))
+
+            if (ERTS_SIG_IS_MSG(sig)) {
                 msg_func(sig, arg);
-            else {
+            } else {
                 Eterm tag;
                 Uint16 type;
                 int op;
@@ -4482,18 +4689,23 @@ erts_proc_sig_debug_foreach_sig(Process *c_p,
                 case ERTS_SIG_Q_OP_MONITOR_DOWN:
                     switch (type) {
                     case ERTS_SIG_Q_TYPE_GEN_EXIT:
-                        debug_foreach_sig_heap_frags(&sig->hfrag, oh_func, arg);
+                        if (!ERTS_SIG_IS_GEN_EXIT_EXTERNAL(sig))
+                            debug_foreach_sig_heap_frags(&sig->hfrag, oh_func, arg);
+                        else {
+                            oh_func(&sig->hfrag.off_heap, arg);
+                            debug_foreach_sig_external(sig, ext_func, arg);
+                        }
                         break;
                     case ERTS_LNK_TYPE_PORT:
                     case ERTS_LNK_TYPE_PROC:
                     case ERTS_LNK_TYPE_DIST_PROC:
-                        lnk_func((ErtsLink *) sig, arg);
+                        lnk_func((ErtsLink *) sig, arg, -1);
                         break;
                     case ERTS_MON_TYPE_PORT:
                     case ERTS_MON_TYPE_PROC:
                     case ERTS_MON_TYPE_DIST_PROC:
                     case ERTS_MON_TYPE_NODE:
-                        mon_func((ErtsMonitor *) sig, arg);
+                        mon_func((ErtsMonitor *) sig, arg, -1);
                         break;
                     default:
                         ERTS_INTERNAL_ERROR("Unexpected sig type");
@@ -4514,7 +4726,7 @@ erts_proc_sig_debug_foreach_sig(Process *c_p,
                     /* Fall through... */
 
                 case ERTS_SIG_Q_OP_MONITOR:
-                    mon_func((ErtsMonitor *) sig, arg);
+                    mon_func((ErtsMonitor *) sig, arg, -1);
                     break;
 
                 case ERTS_SIG_Q_OP_UNLINK:
@@ -4526,7 +4738,7 @@ erts_proc_sig_debug_foreach_sig(Process *c_p,
                     /* Fall through... */
 
                 case ERTS_SIG_Q_OP_LINK:
-                    lnk_func((ErtsLink *) sig, arg);
+                    lnk_func((ErtsLink *) sig, arg, -1);
                     break;
 
                 case ERTS_SIG_Q_OP_GROUP_LEADER: {
diff --git a/erts/emulator/beam/erl_proc_sig_queue.h b/erts/emulator/beam/erl_proc_sig_queue.h
index 3fc2d06b2d..2b055e73bc 100644
--- a/erts/emulator/beam/erl_proc_sig_queue.h
+++ b/erts/emulator/beam/erl_proc_sig_queue.h
@@ -89,6 +89,7 @@
 #endif
 
 struct erl_mesg;
+struct erl_dist_external;
 
 typedef struct {
     struct erl_mesg *next;
@@ -212,6 +213,38 @@ erts_proc_sig_send_exit(Process *c_p, Eterm from, Eterm to,
 
 /**
  *
+ * @brief Send an exit signal to a process.
+ *
+ * This function is used instead of erts_proc_sig_send_link_exit()
+ * when the signal arrives via the distribution and
+ * therefore no link structure is available.
+ *
+ * @param[in]     dep           Distribution entry of channel
+ *                              that the signal arrived on.
+ *
+ * @param[in]     from          Identifier of sender.
+ *
+ * @param[in]     to            Identifier of receiver.
+ *
+ * @param[in]     dist_ext      The exit reason in external term format
+ *
+ * @param[in]     hfrag         Heap frag with trace token and dist_ext
+ *                              iff available, otherwise NULL.
+ *
+ * @param[in]     reason        Exit reason.
+ *
+ * @param[in]     token         Seq trace token.
+ *
+ */
+void
+erts_proc_sig_send_dist_exit(DistEntry *dep,
+                             Eterm from, Eterm to,
+                             ErtsDistExternal *dist_ext,
+                             ErlHeapFragment *hfrag,
+                             Eterm reason, Eterm token);
+
+/**
+ *
  * @brief Send an exit signal due to broken link to a process.
  *
  *
@@ -282,7 +315,7 @@ erts_proc_sig_send_unlink(Process *c_p, ErtsLink *lnk);
  *
  * This function is used instead of erts_proc_sig_send_link_exit()
  * when the signal arrives via the distribution and
- * no link structure is available.
+ * therefore no link structure is available.
  *
  * @param[in]     dep           Distribution entry of channel
  *                              that the signal arrived on.
@@ -291,6 +324,11 @@ erts_proc_sig_send_unlink(Process *c_p, ErtsLink *lnk);
  *
  * @param[in]     to            Identifier of receiver.
  *
+ * @param[in]     dist_ext      The exit reason in external term format
+ *
+ * @param[in]     hfrag         Heap frag with trace token and dist_ext
+ *                              iff available, otherwise NULL.
+ *
  * @param[in]     reason        Exit reason.
  *
  * @param[in]     token         Seq trace token.
@@ -299,6 +337,8 @@ erts_proc_sig_send_unlink(Process *c_p, ErtsLink *lnk);
 void
 erts_proc_sig_send_dist_link_exit(struct dist_entry_ *dep,
                                   Eterm from, Eterm to,
+                                  ErtsDistExternal *dist_ext,
+                                  ErlHeapFragment *hfrag,
                                   Eterm reason, Eterm token);
 
 /**
@@ -307,7 +347,7 @@ erts_proc_sig_send_dist_link_exit(struct dist_entry_ *dep,
  *
  * This function is used instead of erts_proc_sig_send_unlink()
  * when the signal arrives via the distribution and
- * no link structure is available.
+ * therefore no link structure is available.
  *
  * @param[in]     dep           Distribution entry of channel
  *                              that the signal arrived on.
@@ -380,7 +420,7 @@ erts_proc_sig_send_monitor(ErtsMonitor *mon, Eterm to);
  *
  * This function is used instead of erts_proc_sig_send_monitor_down()
  * when the signal arrives via the distribution and
- * no link structure is available.
+ * therefore no monitor structure is available.
  *
  * @param[in]     dep           Pointer to distribution entry
  *                              of channel that the signal
@@ -392,12 +432,19 @@ erts_proc_sig_send_monitor(ErtsMonitor *mon, Eterm to);
  *
  * @param[in]     to            Identifier of receiver.
  *
+ * @param[in]     dist_ext      The exit reason in external term format
+ *
+ * @param[in]     hfrag         Heap frag with trace token and dist_ext
+ *                              iff available, otherwise NULL.
+ *
  * @param[in]     reason        Exit reason.
  *
  */
 void
 erts_proc_sig_send_dist_monitor_down(DistEntry *dep, Eterm ref,
                                      Eterm from, Eterm to,
+                                     ErtsDistExternal *dist_ext,
+                                     ErlHeapFragment *hfrag,
                                      Eterm reason);
 
 /**
@@ -740,7 +787,7 @@ erts_proc_sig_handle_incoming(Process *c_p, erts_aint32_t *statep,
  *                              queue.
  */
 int
-erts_proc_sig_handle_exit(Process *c_p, int *redsp);
+erts_proc_sig_handle_exit(Process *c_p, Sint *redsp);
 
 /**
  *
@@ -962,6 +1009,34 @@ void
 erts_proc_sig_handle_pending_suspend(Process *c_p);
 
 /**
+ *
+ * @brief Decode the reason term in an external signal
+ *
+ * Any distributed signal with a payload only has the control
+ * message decoded by the dist entry. The final decode of the
+ * payload is done by the process when it inspects the signal
+ * by calling this function.
+ *
+ * This functions handles both messages and link/monitor exits.
+ *
+ * Return true if the decode was successful, false otherwise.
+ *
+ * @param[in]   c_p             Pointer to executing process
+ *
+ * @param[in]   proc_lock       Locks held by process. Should always be MAIN.
+ *
+ * @param[in]   msgp            The signal to decode
+ *
+ * @param[in]   force_off_heap  If the term should be forced to be off-heap
+ */
+int
+erts_proc_sig_decode_dist(Process *proc, ErtsProcLocks proc_locks,
+                          ErtsMessage *msgp, int force_off_heap);
+
+ErtsDistExternal *
+erts_proc_sig_get_external(ErtsMessage *msgp);
+
+/**
  * @brief Initialize this functionality
  */
 void erts_proc_sig_queue_init(void);
@@ -970,8 +1045,9 @@ void
 erts_proc_sig_debug_foreach_sig(Process *c_p,
                                 void (*msg_func)(ErtsMessage *, void *),
                                 void (*oh_func)(ErlOffHeap *, void *),
-                                void (*mon_func)(ErtsMonitor *, void *),
-                                void (*lnk_func)(ErtsLink *, void *),
+                                ErtsMonitorFunc mon_func,
+                                ErtsLinkFunc lnk_func,
+                                void (*ext_func)(ErtsDistExternal *, void *),
                                 void *arg);
 
 extern Process *erts_dirty_process_signal_handler;
@@ -989,8 +1065,7 @@ erts_proc_sig_fetch(Process *proc)
     Sint res = 0;
     ErtsSignal *sig;
 
-    ERTS_LC_ASSERT(erts_thr_progress_is_blocking()
-                   || ERTS_PROC_IS_EXITING(proc)
+    ERTS_LC_ASSERT(ERTS_PROC_IS_EXITING(proc)
                    || ((erts_proc_lc_my_proc_locks(proc)
                         & (ERTS_PROC_LOCK_MAIN
                            | ERTS_PROC_LOCK_MSGQ))
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 2427d87f66..1c1ef1db84 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -92,10 +92,6 @@
 #undef HARDDEBUG
 #endif
 
-#ifdef HARDDEBUG
-#define HARDDEBUG_RUNQS
-#endif
-
 #ifdef HIPE
 #include "hipe_mode_switch.h"	/* for hipe_init_process() */
 #include "hipe_signal.h"	/* for hipe_thread_signal_init() */
@@ -344,6 +340,7 @@ erts_sched_stat_t erts_sched_stat;
 static erts_tsd_key_t ERTS_WRITE_UNLIKELY(sched_data_key);
 
 #if ERTS_POLL_USE_SCHEDULER_POLLING
+static erts_atomic32_t function_calls;
 static erts_atomic32_t doing_sys_schedule;
 #endif
 static erts_atomic32_t no_empty_run_queues;
@@ -738,12 +735,6 @@ erts_pre_init_process(void)
 #endif
 }
 
-static void
-release_process(void *vproc)
-{
-    erts_proc_dec_refc((Process *) vproc);
-}
-
 /* initialize the scheduler */
 void
 erts_init_process(int ncpu, int proc_tab_size, int legacy_proc_tab)
@@ -755,7 +746,7 @@ erts_init_process(int ncpu, int proc_tab_size, int legacy_proc_tab)
 
     erts_ptab_init_table(&erts_proc,
 			 ERTS_ALC_T_PROC_TABLE,
-			 release_process,
+			 NULL,
 			 (ErtsPTabElementCommon *) &erts_invalid_process.common,
 			 proc_tab_size,
 			 sizeof(Process),
@@ -1479,7 +1470,10 @@ proclist_create(Process *p)
 {
     ErtsProcList *plp = proclist_alloc();
     ensure_later_proc_interval(p->common.u.alive.started_interval);
-    plp->pid = p->common.id;
+    if (erts_atomic32_read_nob(&p->state) & ERTS_PSFLG_FREE)
+        plp->u.p = p;
+    else
+        plp->u.pid = p->common.id;
     plp->started_interval = p->common.u.alive.started_interval;
     return plp;
 }
@@ -1488,7 +1482,7 @@ static ERTS_INLINE ErtsProcList *
 proclist_copy(ErtsProcList *plp0)
 {
     ErtsProcList *plp1 = proclist_alloc();
-    plp1->pid = plp0->pid;
+    plp1->u.pid = plp0->u.pid;
     plp1->started_interval = plp0->started_interval;
     return plp1;
 }
@@ -1523,7 +1517,10 @@ erts_proclist_dump(fmtfn_t to, void *to_arg, ErtsProcList *plp)
     ErtsProcList *first = plp;
 
     while (plp) {
-        erts_print(to, to_arg, "%T", plp->pid);
+        if (is_pid(plp->u.pid))
+            erts_print(to, to_arg, "%T", plp->u.pid);
+        else
+            erts_print(to, to_arg, "%T", plp->u.p->common.id);
         plp = plp->next;
         if (plp == first)
             break;
@@ -2378,9 +2375,12 @@ struct debug_lop {
 static void later_thr_debug_wait_completed(void *vlop)
 {
     struct debug_lop *lop = vlop;
-    erts_aint32_t count = (erts_aint32_t) erts_no_schedulers;
-    count += 1; /* aux thread */
-    if (erts_atomic32_dec_read_mb(&debug_wait_completed_count) == count) {
+
+    if (erts_atomic32_dec_read_mb(&debug_wait_completed_count) == 1) {
+        erts_aint32_t count = (erts_aint32_t) erts_no_schedulers;
+        count += 1; /* aux thread */
+        erts_atomic32_set_nob(&debug_wait_completed_count, count);
+
         /* scheduler threads */
         erts_schedule_multi_misc_aux_work(0,
                                           erts_no_schedulers,
@@ -2398,19 +2398,28 @@ static void later_thr_debug_wait_completed(void *vlop)
 static void
 init_thr_debug_wait_completed(void *vproc)
 {
-    struct debug_lop* lop = erts_alloc(ERTS_ALC_T_DEBUG,
-                                       sizeof(struct debug_lop));
-    lop->proc = vproc;
-    erts_schedule_thr_prgr_later_op(later_thr_debug_wait_completed, lop, &lop->lop);
+    if (debug_wait_completed_flags == ERTS_DEBUG_WAIT_COMPLETED_AUX_WORK) {
+        if (erts_atomic32_dec_read_mb(&debug_wait_completed_count) == 1) {
+            erts_atomic32_set_nob(&debug_wait_completed_count, 0);
+            erts_resume((Process *) vproc, (ErtsProcLocks) 0);
+            erts_proc_dec_refc((Process *) vproc);
+        }
+    }
+    else {
+        struct debug_lop* lop = erts_alloc(ERTS_ALC_T_DEBUG,
+                                           sizeof(struct debug_lop));
+        lop->proc = vproc;
+        erts_schedule_thr_prgr_later_op(later_thr_debug_wait_completed, lop, &lop->lop);
+    }
 }
 
 
 int
 erts_debug_wait_completed(Process *c_p, int flags)
 {
-    /* Only one process at a time can do this */
-    erts_aint32_t count = (erts_aint32_t) (2*erts_no_schedulers);
-    count += 1; /* aux thread */
+    /* Only one process at a time can do this, +1 to mark as busy */
+    erts_aint32_t count = (erts_aint32_t) (erts_no_schedulers + 1);
+
     if (0 == erts_atomic32_cmpxchg_mb(&debug_wait_completed_count,
 				      count,
 				      0)) {
@@ -2465,6 +2474,13 @@ handle_reap_ports(ErtsAuxWorkData *awdp, erts_aint32_t aux_work, int waiting)
 
 	    erts_port_lock(prt);
 
+            if (prt->common.u.alive.reg &&
+                prt->common.u.alive.reg->name == am_heart_port) {
+                /* Leave heart port to not get killed before flushing is done*/
+                erts_port_release(prt);
+                continue;
+            }
+
 	    state = erts_atomic32_read_nob(&prt->state);
 	    if (!(state & (ERTS_PORT_SFLGS_INVALID_DRIVER_LOOKUP
 			   | ERTS_PORT_SFLG_HALT))) {
@@ -3251,6 +3267,7 @@ poll_thread(void *arg)
 static ERTS_INLINE void
 clear_sys_scheduling(void)
 {
+    erts_atomic32_set_relb(&function_calls, 0);
     erts_atomic32_set_mb(&doing_sys_schedule, 0);
 }
 
@@ -3273,31 +3290,49 @@ prepare_for_sys_schedule(void)
     return 0;
 }
 
-static void
-check_io_timer(void *null)
+#else
+#define clear_sys_scheduling()
+#define prepare_for_sys_schedule() 0
+#endif
+
+#ifdef HARDDEBUG
+#define ERTS_HDBG_CHK_SLEEP_LIST(SL, L, F, FN) \
+    check_sleepers_list((SL), (L), (F), (FN))
+static void check_sleepers_list(ErtsSchedulerSleepList *sl,
+                                int lock,
+                                ErtsSchedulerSleepInfo *find,
+                                ErtsSchedulerSleepInfo *find_not)
 {
-    ErtsSchedulerData *esdp = erts_get_scheduler_data();
-    if (prepare_for_sys_schedule()) {
-        erts_check_io(esdp->ssi->psi, ERTS_POLL_NO_TIMEOUT);
-        clear_sys_scheduling();
-    }
+    ErtsSchedulerSleepInfo *last_out;
+    int found = 0;
 
-    /* The timer is cleared if this schedulers run-queue became empty
-       or if the CHECKIO flag was cleared. The CHECKIO flags is cleared
-       when a check_balance assigns another scheduler to be the poller in
-       the overload scenario. */
-    if ((ERTS_RUNQ_FLGS_GET_NOB(esdp->run_queue) & (ERTS_RUNQ_FLG_OUT_OF_WORK|ERTS_RUNQ_FLG_CHECKIO))
-        == ERTS_RUNQ_FLG_CHECKIO) {
-        erts_start_timer_callback(ERTS_POLL_SCHEDULER_POLLING_TIMEOUT,
-                                  check_io_timer, NULL);
-    } else {
-        ERTS_RUNQ_FLGS_UNSET(esdp->run_queue, ERTS_RUNQ_FLG_CHECKIO);
-    }
-}
+    if (lock)
+        erts_spin_lock(&sl->lock);
 
+    ERTS_ASSERT(!find_not || (!find_not->next && !find_not->prev));
+    
+    last_out = sl->list;
+    if (last_out) {
+        ErtsSchedulerSleepInfo *tmp = last_out;
+        do {
+            ERTS_ASSERT(tmp->next);
+            ERTS_ASSERT(tmp->prev);
+            ERTS_ASSERT(tmp->next->prev == tmp);
+            ERTS_ASSERT(tmp->prev->next == tmp);
+            ERTS_ASSERT(tmp != find_not);
+            if (tmp == find)
+                found = !0;
+            tmp = tmp->next;
+            
+        } while (tmp != last_out);
+    }
+    ERTS_ASSERT(!find || found);
+
+    if (lock)
+        erts_spin_unlock(&sl->lock);
+}
 #else
-#define clear_sys_scheduling()
-#define prepare_for_sys_schedule() 0
+#define ERTS_HDBG_CHK_SLEEP_LIST(SL, L, F, FN) ((void) 0)
 #endif
 
 static void
@@ -3313,23 +3348,29 @@ scheduler_wait(int *fcalls, ErtsSchedulerData *esdp, ErtsRunQueue *rq)
 
     ERTS_LC_ASSERT(erts_lc_runq_is_locked(rq));
 
-    if (ERTS_RUNQ_IX_IS_DIRTY(rq->ix))
-	erts_spin_lock(&rq->sleepers.lock);
     flgs = sched_prep_spin_wait(ssi);
     if (flgs & ERTS_SSI_FLG_SUSPENDED) {
 	/* Go suspend instead... */
-	if (ERTS_RUNQ_IX_IS_DIRTY(rq->ix))
-	    erts_spin_unlock(&rq->sleepers.lock);
 	return;
     }
 
     if (ERTS_RUNQ_IX_IS_DIRTY(rq->ix)) {
-	ssi->prev = NULL;
-	ssi->next = rq->sleepers.list;
-	if (rq->sleepers.list)
-	    rq->sleepers.list->prev = ssi;
-	rq->sleepers.list = ssi;
-	erts_spin_unlock(&rq->sleepers.lock);
+        erts_spin_lock(&rq->sleepers.lock);
+        ERTS_HDBG_CHK_SLEEP_LIST(&rq->sleepers, 0, NULL, ssi);
+        ASSERT(!ssi->next); /* Not in sleepers list */
+        ASSERT(!ssi->prev);
+        if (!rq->sleepers.list) {
+            ssi->next = ssi->prev = ssi;
+            rq->sleepers.list = ssi;
+        }
+        else {
+            ssi->prev = rq->sleepers.list;
+            ssi->next = rq->sleepers.list->next;
+            ssi->prev->next = ssi;
+            ssi->next->prev = ssi;
+        }
+        ERTS_HDBG_CHK_SLEEP_LIST(&rq->sleepers, 0, ssi, NULL);
+        erts_spin_unlock(&rq->sleepers.lock);
         dirty_active(esdp, -1);
     }
 
@@ -3348,7 +3389,12 @@ scheduler_wait(int *fcalls, ErtsSchedulerData *esdp, ErtsRunQueue *rq)
         ErtsMonotonicTime current_time = 0;
 
         aux_work = erts_atomic32_read_acqb(&ssi->aux_work);
-        if (aux_work && !ERTS_SCHEDULER_IS_DIRTY(esdp)) {
+
+        if (aux_work && ERTS_SCHEDULER_IS_DIRTY(esdp)) {
+            ERTS_INTERNAL_ERROR("Executing aux work on a dirty scheduler.");
+        }
+
+        if (aux_work) {
             if (!thr_prgr_active) {
                 erts_thr_progress_active(erts_thr_prgr_data(esdp), thr_prgr_active = 1);
                 sched_wall_time_change(esdp, 1);
@@ -3360,16 +3406,14 @@ scheduler_wait(int *fcalls, ErtsSchedulerData *esdp, ErtsRunQueue *rq)
         }
 
         if (aux_work) {
-            if (!ERTS_SCHEDULER_IS_DIRTY(esdp)) {
-                flgs = erts_atomic32_read_acqb(&ssi->flags);
-                current_time = erts_get_monotonic_time(esdp);
-                if (current_time >= erts_next_timeout_time(esdp->next_tmo_ref)) {
-                    if (!thr_prgr_active) {
-                        erts_thr_progress_active(erts_thr_prgr_data(esdp), thr_prgr_active = 1);
-                        sched_wall_time_change(esdp, 1);
-                    }
-                    erts_bump_timers(esdp->timer_wheel, current_time);
+            flgs = erts_atomic32_read_acqb(&ssi->flags);
+            current_time = erts_get_monotonic_time(esdp);
+            if (current_time >= erts_next_timeout_time(esdp->next_tmo_ref)) {
+                if (!thr_prgr_active) {
+                    erts_thr_progress_active(erts_thr_prgr_data(esdp), thr_prgr_active = 1);
+                    sched_wall_time_change(esdp, 1);
                 }
+                erts_bump_timers(esdp->timer_wheel, current_time);
             }
         }
         else {
@@ -3406,6 +3450,7 @@ scheduler_wait(int *fcalls, ErtsSchedulerData *esdp, ErtsRunQueue *rq)
                         current_time = erts_get_monotonic_time(esdp);
                     }
                 }
+                *fcalls = 0;
                 clear_sys_scheduling();
             } else {
                 if (!ERTS_SCHEDULER_IS_DIRTY(esdp)) {
@@ -3470,8 +3515,28 @@ scheduler_wait(int *fcalls, ErtsSchedulerData *esdp, ErtsRunQueue *rq)
                                         (ERTS_SSI_FLG_SUSPENDED
                                          | ERTS_SSI_FLG_MSB_EXEC));
 
-    if (ERTS_SCHEDULER_IS_DIRTY(esdp))
+    if (ERTS_SCHEDULER_IS_DIRTY(esdp)) {
         dirty_sched_wall_time_change(esdp, working = 1);
+        erts_spin_lock(&rq->sleepers.lock);
+        ERTS_HDBG_CHK_SLEEP_LIST(&rq->sleepers, 0, ssi->next ? ssi : NULL, NULL);
+        if (ssi->next) { /* Still in list... */
+            if (ssi->next == ssi) {
+                ASSERT(rq->sleepers.list == ssi);
+                ASSERT(ssi->prev == ssi);
+                rq->sleepers.list = NULL;
+            }
+            else {
+                ASSERT(ssi->prev != ssi);
+                if (rq->sleepers.list == ssi)
+                    rq->sleepers.list = ssi->next;
+                ssi->prev->next = ssi->next;
+                ssi->next->prev = ssi->prev;
+            }
+            ssi->next = ssi->prev = NULL;
+        }
+        ERTS_HDBG_CHK_SLEEP_LIST(&rq->sleepers, 0, NULL, ssi);
+        erts_spin_unlock(&rq->sleepers.lock);
+    }
     else if (!thr_prgr_active) {
         erts_thr_progress_active(erts_thr_prgr_data(esdp), thr_prgr_active = 1);
         sched_wall_time_change(esdp, 1);
@@ -3559,56 +3624,44 @@ wake_scheduler(ErtsRunQueue *rq)
 }
 
 static void
-wake_dirty_schedulers(ErtsRunQueue *rq, int one)
+wake_dirty_scheduler(ErtsRunQueue *rq)
 {
-    ErtsSchedulerSleepInfo *ssi;
+    ErtsSchedulerSleepInfo *lo_ssi, *fo_ssi;
     ErtsSchedulerSleepList *sl;
 
     ASSERT(ERTS_RUNQ_IX_IS_DIRTY(rq->ix));
 
     sl = &rq->sleepers;
     erts_spin_lock(&sl->lock);
-    ssi = sl->list;
-    if (!ssi) {
+    ERTS_HDBG_CHK_SLEEP_LIST(&rq->sleepers, 0, NULL, NULL);
+    lo_ssi = sl->list;
+    if (!lo_ssi) {
 	erts_spin_unlock(&sl->lock);
-	if (one)
-	    wake_scheduler(rq);
-    } else if (one) {
+        wake_scheduler(rq);
+    }
+    else {
 	erts_aint32_t flgs;
-	if (ssi->prev)
-	    ssi->prev->next = ssi->next;
-	else {
-	    ASSERT(sl->list == ssi);
-	    sl->list = ssi->next;
+        fo_ssi = lo_ssi->next;
+        ASSERT(fo_ssi->prev == lo_ssi);
+        if (fo_ssi == lo_ssi) {
+	    ASSERT(lo_ssi->prev == lo_ssi);
+            sl->list = NULL;
+        }
+        else {
+            ASSERT(lo_ssi->prev != lo_ssi);
+	    lo_ssi->next = fo_ssi->next;
+	    fo_ssi->next->prev = fo_ssi->prev;
 	}
-	if (ssi->next)
-	    ssi->next->prev = ssi->prev;
-
-	erts_spin_unlock(&sl->lock);
-
-	ERTS_THR_MEMORY_BARRIER;
-	flgs = ssi_flags_set_wake(ssi);
-	erts_sched_finish_poke(ssi, flgs);
-    } else {
-	sl->list = NULL;
+        fo_ssi->next = fo_ssi->prev = NULL;
+        ERTS_HDBG_CHK_SLEEP_LIST(&rq->sleepers, 0, NULL, fo_ssi);
 	erts_spin_unlock(&sl->lock);
 
 	ERTS_THR_MEMORY_BARRIER;
-	do {
-	    ErtsSchedulerSleepInfo *wake_ssi = ssi;
-	    ssi = ssi->next;
-	    erts_sched_finish_poke(wake_ssi, ssi_flags_set_wake(wake_ssi));
-	} while (ssi);
+	flgs = ssi_flags_set_wake(fo_ssi);
+	erts_sched_finish_poke(fo_ssi, flgs);
     }
 }
 
-static void
-wake_dirty_scheduler(ErtsRunQueue *rq)
-{
-    wake_dirty_schedulers(rq, 1);
-}
-
-
 #define ERTS_NO_USED_RUNQS_SHIFT 16
 #define ERTS_NO_RUNQS_MASK 0xffffU
 
@@ -4103,9 +4156,7 @@ schedule_bound_processes(ErtsRunQueue *rq,
 static ERTS_INLINE void
 clear_proc_dirty_queue_bit(Process *p, ErtsRunQueue *rq, int prio_bit)
 {
-#ifdef DEBUG
     erts_aint32_t old;
-#endif
     erts_aint32_t qb = prio_bit;
     if (rq == ERTS_DIRTY_CPU_RUNQ)
 	qb <<= ERTS_PDSFLGS_IN_CPU_PRQ_MASK_OFFSET;
@@ -4113,13 +4164,8 @@ clear_proc_dirty_queue_bit(Process *p, ErtsRunQueue *rq, int prio_bit)
 	ASSERT(rq == ERTS_DIRTY_IO_RUNQ);
 	qb <<= ERTS_PDSFLGS_IN_IO_PRQ_MASK_OFFSET;
     }
-#ifdef DEBUG
-    old = (int)
-#else
-	(void)
-#endif
-	erts_atomic32_read_band_mb(&p->dirty_state, ~qb);
-    ASSERT(old & qb);
+    old = (int) erts_atomic32_read_band_mb(&p->dirty_state, ~qb);
+    ASSERT(old & qb); (void)old;
 }
 
 
@@ -4661,15 +4707,6 @@ check_balance(ErtsRunQueue *c_rq)
     if (blnc_no_rqs == 1) {
 	c_rq->check_balance_reds = INT_MAX;
 	erts_atomic32_set_nob(&balance_info.checking_balance, 0);
-#if ERTS_POLL_USE_SCHEDULER_POLLING
-	c_rq->check_balance_reds = ERTS_RUNQ_CALL_CHECK_BALANCE_REDS;
-        if ((ERTS_RUNQ_FLGS_GET_NOB(c_rq) & (ERTS_RUNQ_FLG_OUT_OF_WORK|ERTS_RUNQ_FLG_CHECKIO))
-             == 0) {
-            ERTS_RUNQ_FLGS_SET(c_rq, ERTS_RUNQ_FLG_CHECKIO);
-            erts_start_timer_callback(ERTS_POLL_SCHEDULER_POLLING_TIMEOUT, check_io_timer, NULL);
-        }
-        ERTS_RUNQ_FLGS_UNSET(c_rq, ERTS_RUNQ_FLGS_MIGRATION_INFO);
-#endif
 	return;
     }
 
@@ -5189,19 +5226,6 @@ erts_fprintf(stderr, "--------------------------------\n");
     /* Publish new migration paths... */
     erts_atomic_set_wb(&erts_migration_paths, (erts_aint_t) new_mpaths);
 
-#if ERTS_POLL_USE_SCHEDULER_POLLING
-    if (full_scheds == current_active) {
-        ERTS_ASSERT(full_scheds <= current_active);
-        /* All active schedulers ran for full, we need to do active polling,
-           so we setup a timer that does active polling */
-        if (!(ERTS_RUNQ_FLGS_GET_NOB(c_rq) & ERTS_RUNQ_FLG_CHECKIO)) {
-            /* Active polling is not running, start it */
-            erts_start_timer_callback(ERTS_POLL_SCHEDULER_POLLING_TIMEOUT, check_io_timer, NULL);
-        }
-        run_queue_info[c_rq->ix].flags |= ERTS_RUNQ_FLG_CHECKIO;
-    }
-#endif
-
     /* Reset balance statistics in all online queues */
     for (qix = 0; qix < blnc_no_rqs; qix++) {
 	Uint32 flags = run_queue_info[qix].flags;
@@ -5211,8 +5235,6 @@ erts_fprintf(stderr, "--------------------------------\n");
 	ASSERT(!(flags & ERTS_RUNQ_FLG_OUT_OF_WORK));
 	if (rq->waiting)
 	    flags |= ERTS_RUNQ_FLG_OUT_OF_WORK;
-        if (rq != c_rq)
-            flags &= ~ERTS_RUNQ_FLG_CHECKIO;
 
 	rq->full_reds_history_sum
 	    = run_queue_info[qix].full_reds_history_sum;
@@ -5222,7 +5244,7 @@ erts_fprintf(stderr, "--------------------------------\n");
 	ERTS_DBG_CHK_FULL_REDS_HISTORY(rq);
 
 	rq->out_of_work_count = 0;
-	(void) ERTS_RUNQ_FLGS_READ_BSET(rq, ERTS_RUNQ_FLGS_MIGRATION_INFO|ERTS_RUNQ_FLG_CHECKIO, flags);
+	(void) ERTS_RUNQ_FLGS_READ_BSET(rq, ERTS_RUNQ_FLGS_MIGRATION_INFO, flags);
 	rq->max_len = erts_atomic32_read_dirty(&rq->len);
 	for (pix = 0; pix < ERTS_NO_PRIO_LEVELS; pix++) {
 	    ErtsRunQueueInfo *rqi;
@@ -5873,6 +5895,7 @@ erts_init_scheduling(int no_schedulers, int no_schedulers_online, int no_poll_th
 	erts_alloc_permanent_cache_aligned(ERTS_ALC_T_RUNQS, size_runqs);
 #if ERTS_POLL_USE_SCHEDULER_POLLING
     erts_atomic32_init_nob(&doing_sys_schedule, 0);
+    erts_atomic32_init_nob(&function_calls, 0);
 #endif
     erts_atomic32_init_nob(&no_empty_run_queues, 0);
 
@@ -5988,6 +6011,8 @@ erts_init_scheduling(int no_schedulers, int no_schedulers_online, int no_poll_th
     for (ix = 0; ix < no_dirty_cpu_schedulers; ix++) {
 	ErtsSchedulerSleepInfo *ssi = &aligned_dirty_cpu_sched_sleep_info[ix].ssi;
 	erts_atomic32_init_nob(&ssi->flags, 0);
+        ssi->next = NULL;
+        ssi->prev = NULL;
 	ssi->event = NULL; /* initialized in sched_dirty_cpu_thread_func */
 	erts_atomic32_init_nob(&ssi->aux_work, 0);
     }
@@ -5998,6 +6023,8 @@ erts_init_scheduling(int no_schedulers, int no_schedulers_online, int no_poll_th
     for (ix = 0; ix < no_dirty_io_schedulers; ix++) {
 	ErtsSchedulerSleepInfo *ssi = &aligned_dirty_io_sched_sleep_info[ix].ssi;
 	erts_atomic32_init_nob(&ssi->flags, 0);
+        ssi->next = NULL;
+        ssi->prev = NULL;
 	ssi->event = NULL; /* initialized in sched_dirty_io_thread_func */
 	erts_atomic32_init_nob(&ssi->aux_work, 0);
     }
@@ -6511,8 +6538,7 @@ schedule_out_process(ErtsRunQueue *c_rq, erts_aint32_t state, Process *p,
 
 	n &= ~running_flgs;
 	if ((!!(a & (ERTS_PSFLG_ACTIVE_SYS|ERTS_PSFLG_DIRTY_ACTIVE_SYS))
-	    | ((a & (ERTS_PSFLG_ACTIVE|ERTS_PSFLG_SUSPENDED)) == ERTS_PSFLG_ACTIVE))
-            & !(a & ERTS_PSFLG_FREE)) {
+	    | ((a & (ERTS_PSFLG_ACTIVE|ERTS_PSFLG_SUSPENDED)) == ERTS_PSFLG_ACTIVE))) {
 	    enqueue = check_enqueue_in_prio_queue(p, &enq_prio, &n, a);
 	}
 	a = erts_atomic32_cmpxchg_mb(&p->state, n, e);
@@ -6547,7 +6573,6 @@ schedule_out_process(ErtsRunQueue *c_rq, erts_aint32_t state, Process *p,
     else {
 	Process* sched_p;
 
-        ASSERT(!(n & ERTS_PSFLG_FREE));
 	ASSERT(!(n & ERTS_PSFLG_SUSPENDED) || (n & (ERTS_PSFLG_ACTIVE_SYS
 						    | ERTS_PSFLG_DIRTY_ACTIVE_SYS)));
 
@@ -6677,8 +6702,8 @@ change_proc_schedule_state(Process *p,
 
 	enqueue = ERTS_ENQUEUE_NOT;
 
-	if (a & ERTS_PSFLG_FREE)
-	    break; /* We don't want to schedule free processes... */
+        if ((a & (ERTS_PSFLG_FREE|ERTS_PSFLG_ACTIVE)) == ERTS_PSFLG_FREE)
+            break; /* If free and not active, do not schedule */
 
 	if (clear_state_flags)
 	    n &= ~clear_state_flags;
@@ -7204,8 +7229,7 @@ schdlr_sspnd_resume_procs(ErtsSchedType sched_type,
     while (resume->msb.chngrs) {
 	ErtsProcList *plp = resume->msb.chngrs;
 	resume->msb.chngrs = plp->next;
-	schdlr_sspnd_resume_proc(sched_type,
-                                 plp->pid);
+	schdlr_sspnd_resume_proc(sched_type, plp->u.pid);
 	proclist_destroy(plp);
     }
 }
@@ -7281,9 +7305,7 @@ msb_scheduler_type_switch(ErtsSchedType sched_type,
     Uint32 nrml_prio, dcpu_prio, dio_prio;
     ErtsSchedType exec_type;
     ErtsRunQueue *exec_rq;
-#ifdef DEBUG
     erts_aint32_t dbg_val;
-#endif
 
     ASSERT(schdlr_sspnd.msb.ongoing);
 
@@ -7398,16 +7420,12 @@ msb_scheduler_type_switch(ErtsSchedType sched_type,
      * Suspend this scheduler and wake up scheduler
      * number one of another type...
      */
-#ifdef DEBUG
     dbg_val =
-#else
-    (void)
-#endif
         erts_atomic32_read_bset_mb(&esdp->ssi->flags,
                                        (ERTS_SSI_FLG_SUSPENDED
                                         | ERTS_SSI_FLG_MSB_EXEC),
                                        ERTS_SSI_FLG_SUSPENDED);
-    ASSERT(dbg_val & ERTS_SSI_FLG_MSB_EXEC);
+    ASSERT(dbg_val & ERTS_SSI_FLG_MSB_EXEC); (void)dbg_val;
 
     switch (exec_type) {
     case ERTS_SCHED_NORMAL:
@@ -7425,11 +7443,7 @@ msb_scheduler_type_switch(ErtsSchedType sched_type,
         break;
     }
 
-#ifdef DEBUG
     dbg_val =
-#else
-    (void)
-#endif
         erts_atomic32_read_bset_mb(&exec_rq->scheduler->ssi->flags,
                                        (ERTS_SSI_FLG_SUSPENDED
                                         | ERTS_SSI_FLG_MSB_EXEC),
@@ -7517,7 +7531,13 @@ suspend_scheduler(ErtsSchedulerData *esdp)
         return;
     }
 
+#ifdef HARDDEBUG
+    if (sched_type != ERTS_SCHED_NORMAL)
+        ERTS_HDBG_CHK_SLEEP_LIST(&esdp->run_queue->sleepers, !0, NULL, ssi);
+#endif
+
     if (erts_atomic32_read_nob(&ssi->flags) & ERTS_SSI_FLG_MSB_EXEC) {
+
         ASSERT(no == 1);
         if (!msb_scheduler_type_switch(sched_type, esdp, no))
             return;
@@ -7641,7 +7661,7 @@ suspend_scheduler(ErtsSchedulerData *esdp)
 			else {
 			    schdlr_sspnd.changer = am_true; /* change right in transit */
 			    /* resume process that is queued for next change... */
-			    resume.onln.nxt = plp->pid;
+			    resume.onln.nxt = plp->u.pid;
 			    ASSERT(is_internal_pid(resume.onln.nxt));
 			}
 		    }
@@ -7861,7 +7881,7 @@ abort_sched_onln_chng_waitq(Process *p)
 		proclist_destroy(plp);
 		plp = erts_proclist_peek_first(schdlr_sspnd.chngq);
 		if (plp)
-		    resume = plp->pid;
+		    resume = plp->u.pid;
 		else
 		    schdlr_sspnd.changer = am_false;
 	    }
@@ -8127,7 +8147,8 @@ done:
 ErtsSchedSuspendResult
 erts_block_multi_scheduling(Process *p, ErtsProcLocks plocks, int on, int normal, int all)
 {
-    int resume_proc, ix, res, have_unlocked_plocks = 0;
+    ErtsSchedSuspendResult res;
+    int resume_proc, ix, have_unlocked_plocks = 0;
     ErtsProcList *plp;
     ErtsMultiSchedulingBlock *msbp;
     erts_aint32_t chng_flg;
@@ -8360,10 +8381,10 @@ erts_multi_scheduling_blockers(Process *p, int normal)
 	     plp1;
 	     plp1 = erts_proclist_peek_next(msbp->blckrs, plp1)) {
 	    for (plp2 = erts_proclist_peek_first(msbp->blckrs);
-		 plp2->pid != plp1->pid;
+		 plp2->u.pid != plp1->u.pid;
 		 plp2 = erts_proclist_peek_next(msbp->blckrs, plp2));
 	    if (plp2 == plp1) {
-		res = CONS(hp, plp1->pid, res);
+		res = CONS(hp, plp1->u.pid, res);
 		hp += 2;
 	    }
 	    /* else: already in result list */
@@ -8547,9 +8568,6 @@ erts_start_schedulers(void)
 {
     ethr_tid tid;
     int res = 0;
-    Uint actual;
-    Uint wanted = erts_no_schedulers;
-    Uint wanted_no_schedulers = erts_no_schedulers;
     char name[16];
     ethr_thr_opts opts = ETHR_THR_OPTS_DEFAULT_INITER;
     int ix;
@@ -8563,40 +8581,34 @@ erts_start_schedulers(void)
         erts_snprintf(opts.name, 16, "runq_supervisor");
 	erts_atomic_init_nob(&runq_supervisor_sleeping, 0);
 	if (0 != ethr_event_init(&runq_supervision_event))
-	    erts_exit(ERTS_ERROR_EXIT, "Failed to create run-queue supervision event\n");
+	    erts_exit(ERTS_ABORT_EXIT, "Failed to create run-queue supervision event\n");
         res = ethr_thr_create(&runq_supervisor_tid,
                               runq_supervisor,
                               NULL,
                               &opts);
 	if (0 != res)
-	    erts_exit(ERTS_ERROR_EXIT, "Failed to create run-queue supervision thread, "
+	    erts_exit(ERTS_ABORT_EXIT, "Failed to create run-queue supervision thread, "
                       "error = %d\n", res);
 
     }
 
     opts.suggested_stack_size = erts_sched_thread_suggested_stack_size;
 
-    if (wanted < 1)
-	wanted = 1;
-    if (wanted > ERTS_MAX_NO_OF_SCHEDULERS) {
-	wanted = ERTS_MAX_NO_OF_SCHEDULERS;
-	res = ENOTSUP;
-    }
-
-    for (actual = 0; actual < wanted; actual++) {
-	ErtsSchedulerData *esdp = ERTS_SCHEDULER_IX(actual);
-
-	ASSERT(actual == esdp->no - 1);
-
-	erts_snprintf(opts.name, 16, "%lu_scheduler", actual + 1);
+    ASSERT(erts_no_schedulers > 0 && erts_no_schedulers <= ERTS_MAX_NO_OF_SCHEDULERS);
 
+    for (ix = 0; ix < erts_no_schedulers; ix++) {
+	ErtsSchedulerData *esdp = ERTS_SCHEDULER_IX(ix);
+	ASSERT(ix == esdp->no - 1);
+	erts_snprintf(opts.name, 16, "%lu_scheduler", ix + 1);
 	res = ethr_thr_create(&esdp->tid, sched_thread_func, (void*)esdp, &opts);
-
 	if (res != 0) {
-           break;
+           erts_exit(ERTS_ABORT_EXIT, "Failed to create scheduler thread %d, error = %d\n", ix, res);
 	}
     }
-    erts_no_schedulers = actual;
+
+    /* Probably not needed as thread create will imply a memory barrier,
+       but we do one just to be safe. */
+    ERTS_THR_MEMORY_BARRIER;
 
     {
 	for (ix = 0; ix < erts_no_dirty_cpu_schedulers; ix++) {
@@ -8605,7 +8617,7 @@ erts_start_schedulers(void)
             opts.suggested_stack_size = erts_dcpu_sched_thread_suggested_stack_size;
 	    res = ethr_thr_create(&esdp->tid,sched_dirty_cpu_thread_func,(void*)esdp,&opts);
 	    if (res != 0)
-		erts_exit(ERTS_ERROR_EXIT, "Failed to create dirty cpu scheduler thread %d, error = %d\n", ix, res);
+		erts_exit(ERTS_ABORT_EXIT, "Failed to create dirty cpu scheduler thread %d, error = %d\n", ix, res);
 	}
 	for (ix = 0; ix < erts_no_dirty_io_schedulers; ix++) {
 	    ErtsSchedulerData *esdp = ERTS_DIRTY_IO_SCHEDULER_IX(ix);
@@ -8613,40 +8625,22 @@ erts_start_schedulers(void)
             opts.suggested_stack_size = erts_dio_sched_thread_suggested_stack_size;
 	    res = ethr_thr_create(&esdp->tid,sched_dirty_io_thread_func,(void*)esdp,&opts);
 	    if (res != 0)
-		erts_exit(ERTS_ERROR_EXIT, "Failed to create dirty io scheduler thread %d, error = %d\n", ix, res);
+		erts_exit(ERTS_ABORT_EXIT, "Failed to create dirty io scheduler thread %d, error = %d\n", ix, res);
 	}
     }
 
-    ERTS_THR_MEMORY_BARRIER;
-
     erts_snprintf(opts.name, 16, "aux");
 
     res = ethr_thr_create(&tid, aux_thread, NULL, &opts);
     if (res != 0)
-	erts_exit(ERTS_ERROR_EXIT, "Failed to create aux thread, error = %d\n", res);
+	erts_exit(ERTS_ABORT_EXIT, "Failed to create aux thread, error = %d\n", res);
 
     for (ix = 0; ix < erts_no_poll_threads; ix++) {
         erts_snprintf(opts.name, 16, "%d_poller", ix);
 
         res = ethr_thr_create(&tid, poll_thread, (void*)(UWord)ix, &opts);
         if (res != 0)
-            erts_exit(ERTS_ERROR_EXIT, "Failed to create poll thread\n");
-    }
-
-    if (actual < 1)
-	erts_exit(ERTS_ERROR_EXIT,
-		 "Failed to create any scheduler-threads: %s (%d)\n",
-		 erl_errno_id(res),
-		 res);
-    if (res != 0) {
-	erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
-	ASSERT(actual != wanted_no_schedulers);
-	erts_dsprintf(dsbufp,
-		      "Failed to create %beu scheduler-threads (%s:%d); "
-		      "only %beu scheduler-thread%s created.\n",
-		      wanted_no_schedulers, erl_errno_id(res), res,
-		      actual, actual == 1 ? " was" : "s were");
-	erts_send_error_to_logger_nogl(dsbufp);
+            erts_exit(ERTS_ABORT_EXIT, "Failed to create poll thread\n");
     }
 }
 
@@ -9000,11 +8994,8 @@ erts_suspend(Process* c_p, ErtsProcLocks c_p_locks, Port *busy_port)
 	suspend = 1;
 
     if (suspend) {
-#ifdef DEBUG
-	int res =
-#endif
-	    suspend_process(c_p, c_p);
-	ASSERT(res);
+	int res = suspend_process(c_p, c_p);
+	ASSERT(res); (void)res;
     }
 
     if (!(c_p_locks & ERTS_PROC_LOCK_STATUS))
@@ -9035,8 +9026,13 @@ erts_resume_processes(ErtsProcList *list)
     while (plp) {
 	Process *proc;
 	ErtsProcList *fplp;
-	ASSERT(is_internal_pid(plp->pid));
-	proc = erts_pid2proc(NULL, 0, plp->pid, ERTS_PROC_LOCK_STATUS);
+	ASSERT(is_internal_pid(plp->u.pid) || is_CP((Eterm)plp->u.p));
+        if (is_internal_pid(plp->u.pid))
+            proc = erts_pid2proc(NULL, 0, plp->u.pid, ERTS_PROC_LOCK_STATUS);
+        else {
+            proc = plp->u.p;
+            erts_proc_lock(proc, ERTS_PROC_LOCK_STATUS);
+        }
 	if (proc) {
 	    if (erts_proclist_same(plp, proc)) {
 		resume_process(proc, ERTS_PROC_LOCK_STATUS);
@@ -9217,7 +9213,7 @@ Process *erts_schedule(ErtsSchedulerData *esdp, Process *p, int calls)
     Process *proxy_p = NULL;
     ErtsRunQueue *rq;
     int context_reds;
-    int fcalls;
+    int fcalls = 0;
     int actual_reds;
     int reds;
     Uint32 flags;
@@ -9291,6 +9287,10 @@ Process *erts_schedule(ErtsSchedulerData *esdp, Process *p, int calls)
 	    reds = ERTS_PROC_MIN_CONTEXT_SWITCH_REDS_COST;
 	esdp->virtual_reds = 0;
 
+#if ERTS_POLL_USE_SCHEDULER_POLLING
+        fcalls = (int) erts_atomic32_add_read_acqb(&function_calls, reds);
+#endif
+
 	ASSERT(esdp && esdp == erts_get_scheduler_data());
 
 	rq = erts_get_runq_current(esdp);
@@ -9445,6 +9445,7 @@ Process *erts_schedule(ErtsSchedulerData *esdp, Process *p, int calls)
 
 	if (!is_normal_sched & !!(flags & ERTS_RUNQ_FLG_HALTING)) {
 	    /* Wait for emulator to terminate... */
+	    erts_runq_unlock(rq);
 	    while (1)
 		erts_milli_sleep(1000*1000);
 	}
@@ -9507,7 +9508,33 @@ Process *erts_schedule(ErtsSchedulerData *esdp, Process *p, int calls)
 	    non_empty_runq(rq);
 
 	    goto check_activities_to_run;
-	}
+	} else if (is_normal_sched &&
+                   fcalls > (2 * context_reds) &&
+                   prepare_for_sys_schedule()) {
+            ErtsMonotonicTime current_time;
+	    /*
+	     * Schedule system-level activities.
+	     */
+
+	    ERTS_MSACC_PUSH_STATE_CACHED_M();
+
+	    erts_runq_unlock(rq);
+
+            ERTS_MSACC_SET_STATE_CACHED_M(ERTS_MSACC_STATE_CHECK_IO);
+            LTTNG2(scheduler_poll, esdp->no, 1);
+
+	    erts_check_io(esdp->ssi->psi, ERTS_POLL_NO_TIMEOUT);
+	    ERTS_MSACC_POP_STATE_M();
+
+	    current_time = erts_get_monotonic_time(esdp);
+	    if (current_time >= erts_next_timeout_time(esdp->next_tmo_ref))
+		erts_bump_timers(esdp->timer_wheel, current_time);
+
+	    erts_runq_lock(rq);
+	    fcalls = 0;
+	    clear_sys_scheduling();
+	    goto continue_check_activities_to_run;
+        }
 
         if (flags & ERTS_RUNQ_FLG_MISC_OP)
 	    exec_misc_ops(rq);
@@ -9598,7 +9625,8 @@ Process *erts_schedule(ErtsSchedulerData *esdp, Process *p, int calls)
 
 	    while (1) {
 		erts_aint32_t exp, new;
-		int run_process;
+		int run_process, not_running, exiting_on_normal_sched,
+                    not_suspended, not_exiting_on_dirty_sched;
 		new = exp = state;
 		new &= psflg_band_mask;
 		/*
@@ -9607,29 +9635,33 @@ Process *erts_schedule(ErtsSchedulerData *esdp, Process *p, int calls)
 		 * scheduler, and not suspended (and not in a
 		 * state where suspend should be ignored).
 		 */
-		run_process = (((!(state & (ERTS_PSFLG_RUNNING
-					    | ERTS_PSFLG_RUNNING_SYS
-					    | ERTS_PSFLG_DIRTY_RUNNING
-					    | ERTS_PSFLG_DIRTY_RUNNING_SYS
-					    | ERTS_PSFLG_FREE)))
-				| (((state & (ERTS_PSFLG_RUNNING
-
-					      | ERTS_PSFLG_FREE
-					      | ERTS_PSFLG_RUNNING_SYS
-					      | ERTS_PSFLG_DIRTY_RUNNING_SYS
-					      | ERTS_PSFLG_EXITING))
-				    == ERTS_PSFLG_EXITING)
-				   & (!!is_normal_sched))
-				   )
-			       & ((state & (ERTS_PSFLG_SUSPENDED
-					    | ERTS_PSFLG_EXITING
-					    | ERTS_PSFLG_FREE
-					    | ERTS_PSFLG_ACTIVE_SYS
-					    | ERTS_PSFLG_DIRTY_ACTIVE_SYS))
-				  != ERTS_PSFLG_SUSPENDED)
-                               & (!(state & ERTS_PSFLG_EXITING)
-                                  | (!!is_normal_sched))
-                    );
+                not_running = !(state & (ERTS_PSFLG_RUNNING
+                                         | ERTS_PSFLG_RUNNING_SYS
+                                         | ERTS_PSFLG_DIRTY_RUNNING
+                                         | ERTS_PSFLG_DIRTY_RUNNING_SYS
+                                         | ERTS_PSFLG_FREE));
+                exiting_on_normal_sched =
+                    ((state & (ERTS_PSFLG_RUNNING
+                               | ERTS_PSFLG_ACTIVE
+                               | ERTS_PSFLG_RUNNING_SYS
+                               | ERTS_PSFLG_DIRTY_RUNNING_SYS
+                               | ERTS_PSFLG_EXITING))
+                     == (ERTS_PSFLG_EXITING|ERTS_PSFLG_ACTIVE))
+                    & (!!is_normal_sched);
+
+
+                not_suspended = ((state & (ERTS_PSFLG_SUSPENDED
+                                           | ERTS_PSFLG_EXITING
+                                           | ERTS_PSFLG_FREE
+                                           | ERTS_PSFLG_ACTIVE_SYS
+                                           | ERTS_PSFLG_DIRTY_ACTIVE_SYS))
+                                 != ERTS_PSFLG_SUSPENDED);
+
+                not_exiting_on_dirty_sched = !(state & ERTS_PSFLG_EXITING) | (!!is_normal_sched);
+
+		run_process = (not_running | exiting_on_normal_sched)
+                    & not_suspended
+                    & not_exiting_on_dirty_sched;
 
 		if (run_process) {
 		    if (state & (ERTS_PSFLG_ACTIVE_SYS
@@ -9920,7 +9952,7 @@ trace_schedule_in(Process *p, erts_aint32_t state)
     /* Clear tracer if it has been removed */
     if (erts_is_tracer_proc_enabled(p, ERTS_PROC_LOCK_MAIN, &p->common)) {
 
-        if (state & ERTS_PSFLG_EXITING) {
+        if (state & ERTS_PSFLG_EXITING && p->u.terminate) {
             if (ARE_TRACE_FLAGS_ON(p, F_TRACE_SCHED_EXIT))
                 trace_sched(p, ERTS_PROC_LOCK_MAIN, am_in_exiting);
         }
@@ -9944,12 +9976,9 @@ trace_schedule_out(Process *p, erts_aint32_t state)
     if (IS_TRACED_FL(p, F_TRACE_CALLS) && !(state & ERTS_PSFLG_FREE))
         erts_schedule_time_break(p, ERTS_BP_CALL_TIME_SCHEDULE_OUT);
 
-    if ((state & (ERTS_PSFLG_FREE|ERTS_PSFLG_EXITING)) == ERTS_PSFLG_EXITING) {
+    if (state & ERTS_PSFLG_EXITING && p->u.terminate) {
         if (ARE_TRACE_FLAGS_ON(p, F_TRACE_SCHED_EXIT))
-            trace_sched(p, ERTS_PROC_LOCK_MAIN,
-                        ((state & ERTS_PSFLG_FREE)
-                         ? am_out_exited
-                         : am_out_exiting));
+            trace_sched(p, ERTS_PROC_LOCK_MAIN, am_out_exiting);
     }
     else {
         if (ARE_TRACE_FLAGS_ON(p, F_TRACE_SCHED) ||
@@ -12024,12 +12053,103 @@ erts_set_self_exiting(Process *c_p, Eterm reason)
         add2runq(enqueue, enq_prio, c_p, state, NULL);
 }
 
-void
-erts_proc_exit_handle_monitor(ErtsMonitor *mon, void *vctxt)
+static int
+erts_proc_exit_handle_dist_monitor(ErtsMonitor *mon, void *vctxt, Sint reds)
+{
+    ErtsProcExitContext *ctxt = (ErtsProcExitContext *) vctxt;
+    Process *c_p = ctxt->c_p;
+    Eterm reason = ctxt->reason;
+    int code;
+    ErtsDSigSendContext ctx;
+    ErtsMonLnkDist *dist;
+    DistEntry *dep;
+    Eterm watcher, ref, *hp;
+    ErtsMonitorData *mdp = NULL;
+    Eterm watched;
+    Uint watcher_sz, ref_sz;
+    ErtsHeapFactory factory;
+    Sint reds_consumed = 0;
+
+    ASSERT(c_p->flags & F_DISABLE_GC);
+    ASSERT(erts_monitor_is_target(mon) && mon->type == ERTS_MON_TYPE_DIST_PROC);
+
+    mdp = erts_monitor_to_data(mon);
+
+    if (mon->flags & ERTS_ML_FLG_NAME)
+        watched = ((ErtsMonitorDataExtended *) mdp)->u.name;
+    else
+        watched = c_p->common.id;
+    ASSERT(is_internal_pid(watched) || is_atom(watched));
+
+    watcher = mon->other.item;
+    ASSERT(is_external_pid(watcher));
+    dep = external_pid_dist_entry(watcher);
+    ASSERT(dep);
+    dist = ((ErtsMonitorDataExtended *) mdp)->dist;
+    ASSERT(dist);
+
+    code = erts_dsig_prepare(&ctx, dep, c_p, ERTS_PROC_LOCK_MAIN,
+                             ERTS_DSP_NO_LOCK, 0, 0, 1);
+
+    ctx.reds = (Sint) (reds * TERM_TO_BINARY_LOOP_FACTOR);
+
+    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:
+        if (dist->connection_id != ctx.connection_id)
+            break;
+        erts_factory_proc_init(&factory, c_p);
+        watcher_sz = size_object(watcher);
+        hp = erts_produce_heap(&factory, watcher_sz, 0);
+        watcher = copy_struct(watcher, watcher_sz, &hp, factory.off_heap);
+        ref_sz = size_object(mdp->ref);
+        hp = erts_produce_heap(&factory, ref_sz, 0);
+        ref = copy_struct(mdp->ref, ref_sz, &hp, factory.off_heap);
+        erts_factory_close(&factory);
+        code = erts_dsig_send_m_exit(&ctx,
+                                     watcher,
+                                     watched,
+                                     ref,
+                                     reason);
+        reds_consumed = reds - (ctx.reds / TERM_TO_BINARY_LOOP_FACTOR);
+        switch (code) {
+        case ERTS_DSIG_SEND_CONTINUE:
+        case ERTS_DSIG_SEND_YIELD:
+            ctxt->dist_state = erts_dsend_export_trap_context(c_p, &ctx);
+            reds_consumed = reds; /* force yield */
+            break;
+        case ERTS_DSIG_SEND_OK:
+            break;
+        case ERTS_DSIG_SEND_TOO_LRG:
+            erts_kill_dist_connection(dep, dist->connection_id);
+            break;
+        default:
+            ASSERT(! "Invalid dsig send exit monitor result");
+            break;
+        }
+        break;
+    default:
+        ASSERT(! "Invalid dsig prep exit monitor result");
+        break;
+    }
+    if (!erts_monitor_dist_delete(&mdp->origin))
+        erts_monitor_release(mon);
+    else
+        erts_monitor_release_both(mdp);
+    return reds_consumed;
+}
+
+int
+erts_proc_exit_handle_monitor(ErtsMonitor *mon, void *vctxt, Sint reds)
 {
-    Process *c_p = ((ErtsProcExitContext *) vctxt)->c_p;
-    Eterm reason = ((ErtsProcExitContext *) vctxt)->reason;
+    ErtsProcExitContext *ctxt = (ErtsProcExitContext *) vctxt;
+    Process *c_p = ctxt->c_p;
+    Eterm reason = ctxt->reason;
     ErtsMonitorData *mdp = NULL;
+    int res = 1;
 
     if (erts_monitor_is_target(mon)) {
         /* We are being watched... */
@@ -12059,43 +12179,48 @@ erts_proc_exit_handle_monitor(ErtsMonitor *mon, void *vctxt)
         case ERTS_MON_TYPE_DIST_PROC: {
             ErtsMonLnkDist *dist;
             DistEntry *dep;
-            ErtsDSigData dsd;
+            ErtsDSigSendContext ctx;
             int code;
             Eterm watcher;
             Eterm watched;
 
-            mdp = erts_monitor_to_data(mon);
-
-            if (mon->flags & ERTS_ML_FLG_NAME)
-                watched = ((ErtsMonitorDataExtended *) mdp)->u.name;
-            else
-                watched = c_p->common.id;
-            ASSERT(is_internal_pid(watched) || is_atom(watched));
+            if (is_immed(reason)) {
+                mdp = erts_monitor_to_data(mon);
 
-            watcher = mon->other.item;
-	    ASSERT(is_external_pid(watcher));    
-	    dep = external_pid_dist_entry(watcher);
-            ASSERT(dep);
-            dist = ((ErtsMonitorDataExtended *) mdp)->dist;
-            ASSERT(dist);
-            code = erts_dsig_prepare(&dsd, dep, NULL, 0,
-                                     ERTS_DSP_NO_LOCK, 0, 0);
-            switch (code) {
-            case ERTS_DSIG_PREP_CONNECTED:
-            case ERTS_DSIG_PREP_PENDING:
-                if (dist->connection_id == dsd.connection_id) {
-                    code = erts_dsig_send_m_exit(&dsd,
-                                                 watcher,
-                                                 watched,
-                                                 mdp->ref,
-                                                 reason);
-                    ASSERT(code == ERTS_DSIG_SEND_OK);
+                if (mon->flags & ERTS_ML_FLG_NAME)
+                    watched = ((ErtsMonitorDataExtended *) mdp)->u.name;
+                else
+                    watched = c_p->common.id;
+                ASSERT(is_internal_pid(watched) || is_atom(watched));
+
+                watcher = mon->other.item;
+                ASSERT(is_external_pid(watcher));
+                dep = external_pid_dist_entry(watcher);
+                ASSERT(dep);
+                dist = ((ErtsMonitorDataExtended *) mdp)->dist;
+                ASSERT(dist);
+                code = erts_dsig_prepare(&ctx, dep, NULL, 0,
+                                         ERTS_DSP_NO_LOCK, 1, 1, 0);
+                switch (code) {
+                case ERTS_DSIG_PREP_CONNECTED:
+                case ERTS_DSIG_PREP_PENDING:
+                    if (dist->connection_id == ctx.connection_id) {
+                        code = erts_dsig_send_m_exit(&ctx,
+                                                     watcher,
+                                                     watched,
+                                                     mdp->ref,
+                                                     reason);
+                        ASSERT(code == ERTS_DSIG_SEND_OK);
+                    }
+                default:
+                    break;
                 }
-            default:
-                break;
+                if (!erts_monitor_dist_delete(&mdp->origin))
+                    mdp = NULL;
+            } else {
+                erts_monitor_tree_insert(&ctxt->dist_monitors, mon);
+                return 1;
             }
-            if (!erts_monitor_dist_delete(&mdp->origin))
-                mdp = NULL;
             break;
         }
         default:
@@ -12137,7 +12262,7 @@ erts_proc_exit_handle_monitor(ErtsMonitor *mon, void *vctxt)
         case ERTS_MON_TYPE_DIST_PROC: {
             ErtsMonLnkDist *dist;
             DistEntry *dep;
-            ErtsDSigData dsd;
+            ErtsDSigSendContext ctx;
             int code;
             Eterm watched;
 
@@ -12154,17 +12279,16 @@ erts_proc_exit_handle_monitor(ErtsMonitor *mon, void *vctxt)
                 ASSERT(is_external_pid(watched));
 		dep = external_pid_dist_entry(watched);
             }
-            code = erts_dsig_prepare(&dsd, dep, NULL, 0,
-                                     ERTS_DSP_NO_LOCK, 0, 0);
+            code = erts_dsig_prepare(&ctx, dep, NULL, 0,
+                                     ERTS_DSP_NO_LOCK, 1, 1, 0);
             switch (code) {
             case ERTS_DSIG_PREP_CONNECTED:
             case ERTS_DSIG_PREP_PENDING:
-                if (dist->connection_id == dsd.connection_id) {
-                    code = erts_dsig_send_demonitor(&dsd,
+                if (dist->connection_id == ctx.connection_id) {
+                    code = erts_dsig_send_demonitor(&ctx,
                                                     c_p->common.id,
                                                     watched,
-                                                    mdp->ref,
-                                                    1);
+                                                    mdp->ref);
                     ASSERT(code == ERTS_DSIG_SEND_OK);
                 }
             default:
@@ -12172,6 +12296,7 @@ erts_proc_exit_handle_monitor(ErtsMonitor *mon, void *vctxt)
             }
             if (!erts_monitor_dist_delete(&mdp->target))
                 mdp = NULL;
+            res = 100;
             break;
         }
         default:
@@ -12184,11 +12309,93 @@ erts_proc_exit_handle_monitor(ErtsMonitor *mon, void *vctxt)
         erts_monitor_release_both(mdp);
     else if (mon)
         erts_monitor_release(mon);
+    return res;
 }
 
-void
-erts_proc_exit_handle_link(ErtsLink *lnk, void *vctxt)
+static int
+erts_proc_exit_handle_dist_link(ErtsLink *lnk, void *vctxt, Sint reds)
+{
+    ErtsProcExitContext *ctxt = (ErtsProcExitContext *) vctxt;
+    Process *c_p = ctxt->c_p;
+    Eterm reason = ctxt->reason, item, *hp;
+    Uint item_sz;
+    int code;
+    ErtsDSigSendContext ctx;
+    ErtsMonLnkDist *dist;
+    DistEntry *dep;
+    ErtsLink *dlnk;
+    ErtsLinkData *ldp = NULL;
+    ErtsHeapFactory factory;
+    Sint reds_consumed = 0;
+
+    ASSERT(c_p->flags & F_DISABLE_GC);
+    ASSERT(lnk->type == ERTS_LNK_TYPE_DIST_PROC);
+    dlnk = erts_link_to_other(lnk, &ldp);
+    dist = ((ErtsLinkDataExtended *) ldp)->dist;
+
+    ASSERT(is_external_pid(lnk->other.item));
+    dep = external_pid_dist_entry(lnk->other.item);
+
+    ASSERT(dep != erts_this_dist_entry);
+
+    if (!erts_link_dist_delete(dlnk))
+        ldp = NULL;
+
+    code = erts_dsig_prepare(&ctx, dep, c_p, ERTS_PROC_LOCK_MAIN,
+                             ERTS_DSP_NO_LOCK, 0, 0, 0);
+
+    ctx.reds = (Sint) (reds * TERM_TO_BINARY_LOOP_FACTOR);
+
+    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:
+        if (dist->connection_id != ctx.connection_id)
+            break;
+        erts_factory_proc_init(&factory, c_p);
+        item_sz = size_object(lnk->other.item);
+        hp = erts_produce_heap(&factory, item_sz, 0);
+        item = copy_struct(lnk->other.item, item_sz, &hp, factory.off_heap);
+        erts_factory_close(&factory);
+        code = erts_dsig_send_exit_tt(&ctx,
+                                      c_p->common.id,
+                                      item,
+                                      reason,
+                                      SEQ_TRACE_TOKEN(c_p));
+        reds_consumed = reds - (ctx.reds / TERM_TO_BINARY_LOOP_FACTOR);
+        switch (code) {
+        case ERTS_DSIG_SEND_YIELD:
+        case ERTS_DSIG_SEND_CONTINUE:
+            ctxt->dist_state = erts_dsend_export_trap_context(c_p, &ctx);
+            reds_consumed = reds; /* force yield */
+            break;
+        case ERTS_DSIG_SEND_OK:
+            break;
+        case ERTS_DSIG_SEND_TOO_LRG:
+            erts_kill_dist_connection(dep, dist->connection_id);
+            break;
+        default:
+            ASSERT(! "Invalid dsig send exit monitor result");
+            break;
+        }
+        break;
+    default:
+        ASSERT(! "Invalid dsig prep exit monitor result");
+        break;
+    }
+    if (ldp)
+        erts_link_release_both(ldp);
+    else if (lnk)
+        erts_link_release(lnk);
+    return reds_consumed;
+}
+
+int
+erts_proc_exit_handle_link(ErtsLink *lnk, void *vctxt, Sint reds)
 {
+    ErtsProcExitContext *ctxt = (ErtsProcExitContext *) vctxt;
     Process *c_p = ((ErtsProcExitContext *) vctxt)->c_p;
     Eterm reason = ((ErtsProcExitContext *) vctxt)->reason;
     ErtsLinkData *ldp = NULL;
@@ -12219,32 +12426,40 @@ erts_proc_exit_handle_link(ErtsLink *lnk, void *vctxt)
         DistEntry *dep;
         ErtsMonLnkDist *dist;
         ErtsLink *dlnk;
-        ErtsDSigData dsd;
+        ErtsDSigSendContext ctx;
         int code;
 
-        dlnk = erts_link_to_other(lnk, &ldp);
-        dist = ((ErtsLinkDataExtended *) ldp)->dist;
+        if (is_immed(reason)) {
+            dlnk = erts_link_to_other(lnk, &ldp);
+            dist = ((ErtsLinkDataExtended *) ldp)->dist;
 
-        ASSERT(is_external_pid(lnk->other.item));
-        dep = external_pid_dist_entry(lnk->other.item);
+            ASSERT(is_external_pid(lnk->other.item));
+            dep = external_pid_dist_entry(lnk->other.item);
 
-        ASSERT(dep != erts_this_dist_entry);
+            ASSERT(dep != erts_this_dist_entry);
 
-        if (!erts_link_dist_delete(dlnk))
-            ldp = NULL;
+            if (!erts_link_dist_delete(dlnk))
+                ldp = NULL;
 
-        code = erts_dsig_prepare(&dsd, dep, c_p, 0, ERTS_DSP_NO_LOCK, 0, 0);
-        switch (code) {
-        case ERTS_DSIG_PREP_CONNECTED:
-        case ERTS_DSIG_PREP_PENDING:
-            if (dist->connection_id == dsd.connection_id) {
-                code = erts_dsig_send_exit_tt(&dsd,
-                                              c_p->common.id,
-                                              lnk->other.item,
-                                              reason,
-                                              SEQ_TRACE_TOKEN(c_p));
-                ASSERT(code == ERTS_DSIG_SEND_OK);
+            code = erts_dsig_prepare(&ctx, dep, c_p, 0, ERTS_DSP_NO_LOCK, 1, 1, 0);
+            switch (code) {
+            case ERTS_DSIG_PREP_CONNECTED:
+            case ERTS_DSIG_PREP_PENDING:
+                if (dist->connection_id == ctx.connection_id) {
+                    code = erts_dsig_send_exit_tt(&ctx,
+                                                  c_p->common.id,
+                                                  lnk->other.item,
+                                                  reason,
+                                                  SEQ_TRACE_TOKEN(c_p));
+                    ASSERT(code == ERTS_DSIG_SEND_OK);
+                }
+                break;
+            default:
+                break;
             }
+        } else {
+            erts_link_tree_insert(&ctxt->dist_links, lnk);
+            return 1;
         }
         break;
     }
@@ -12257,6 +12472,7 @@ erts_proc_exit_handle_link(ErtsLink *lnk, void *vctxt)
         erts_link_release_both(ldp);
     else if (lnk)
         erts_link_release(lnk);
+    return 1;
 }
 
 /* this function fishishes a process and propagates exit messages - called
@@ -12290,11 +12506,8 @@ erts_do_exit_process(Process* p, Eterm reason)
 
     set_self_exiting(p, reason, NULL, NULL, NULL);
 
-    if (IS_TRACED(p)) {
-	if (IS_TRACED_FL(p, F_TRACE_CALLS))
-	    erts_schedule_time_break(p, ERTS_BP_CALL_TIME_SCHEDULE_EXITING);
-
-    }
+    if (IS_TRACED_FL(p, F_TRACE_CALLS))
+        erts_schedule_time_break(p, ERTS_BP_CALL_TIME_SCHEDULE_EXITING);
 
     erts_trace_check_exiting(p->common.id);
 
@@ -12309,288 +12522,454 @@ erts_do_exit_process(Process* p, Eterm reason)
 
     erts_proc_unlock(p, ERTS_PROC_LOCKS_ALL_MINOR);
 
-    if (IS_TRACED_FL(p,F_TRACE_PROCS))
+    if (IS_TRACED_FL(p, F_TRACE_PROCS))
         trace_proc(p, ERTS_PROC_LOCK_MAIN, p, am_exit, reason);
 
-
     /*
      * p->u.initial of this process can *not* be used anymore;
      * will be overwritten by misc termination data.
      */
     p->u.terminate = NULL;
 
+    BUMP_REDS(p, 100);
+
     erts_continue_exit_process(p);
 }
 
-void
-erts_continue_exit_process(Process *p)
-{
+enum continue_exit_phase {
+    ERTS_CONTINUE_EXIT_TIMERS,
+    ERTS_CONTINUE_EXIT_BLCKD_MSHED,
+    ERTS_CONTINUE_EXIT_BLCKD_NMSHED,
+    ERTS_CONTINUE_EXIT_USING_DB,
+    ERTS_CONTINUE_EXIT_CLEAN_SYS_TASKS,
+    ERTS_CONTINUE_EXIT_FREE,
+    ERTS_CONTINUE_EXIT_CLEAN_SYS_TASKS_AFTER,
+    ERTS_CONTINUE_EXIT_LINKS,
+    ERTS_CONTINUE_EXIT_MONITORS,
+    ERTS_CONTINUE_EXIT_LT_MONITORS,
+    ERTS_CONTINUE_EXIT_HANDLE_PROC_SIG,
+    ERTS_CONTINUE_EXIT_DIST_LINKS,
+    ERTS_CONTINUE_EXIT_DIST_MONITORS,
+    ERTS_CONTINUE_EXIT_DONE,
+};
+
+struct continue_exit_state {
+    enum continue_exit_phase phase;
     ErtsLink *links;
     ErtsMonitor *monitors;
     ErtsMonitor *lt_monitors;
+    Eterm reason;
+    ErtsProcExitContext pectxt;
+    DistEntry *dep;
+    void *yield_state;
+};
+
+void
+erts_continue_exit_process(Process *p)
+{
+    struct continue_exit_state static_state, *trap_state = &static_state;
     ErtsProcLocks curr_locks = ERTS_PROC_LOCK_MAIN;
-    Eterm reason = p->fvalue;
-    DistEntry *dep = NULL;
     erts_aint32_t state;
     int delay_del_proc = 0;
-    ErtsProcExitContext pectxt;
-
+    Sint reds = ERTS_BIF_REDS_LEFT(p);
 #ifdef DEBUG
     int yield_allowed = 1;
 #endif
 
+    if (p->u.terminate) {
+        trap_state = p->u.terminate;
+        /* Re-set the reason as it may have been gc:ed */
+        trap_state->reason = p->fvalue;
+    } else {
+        trap_state->phase = ERTS_CONTINUE_EXIT_TIMERS;
+        trap_state->reason = p->fvalue;
+        trap_state->dep = NULL;
+        trap_state->yield_state = NULL;
+    }
+
     ERTS_LC_ASSERT(ERTS_PROC_LOCK_MAIN == erts_proc_lc_my_proc_locks(p));
 
     ASSERT(ERTS_PROC_IS_EXITING(p));
 
     ASSERT(erts_proc_read_refc(p) > 0);
-    if (p->bif_timers) {
-	if (erts_cancel_bif_timers(p, &p->bif_timers, &p->u.terminate)) {
-	    ASSERT(erts_proc_read_refc(p) > 0);
-	    goto yield;
-	}
-	ASSERT(erts_proc_read_refc(p) > 0);
-	p->bif_timers = NULL;
-    }
-
-    if (p->flags & F_SCHDLR_ONLN_WAITQ)
-	abort_sched_onln_chng_waitq(p);
-
-    if (p->flags & F_HAVE_BLCKD_MSCHED) {
-	ErtsSchedSuspendResult ssr;
-	ssr = erts_block_multi_scheduling(p, ERTS_PROC_LOCK_MAIN, 0, 0, 1);
-	switch (ssr) {
-	case ERTS_SCHDLR_SSPND_YIELD_RESTART:
-	    goto yield;
-	case ERTS_SCHDLR_SSPND_DONE_MSCHED_BLOCKED:
-	case ERTS_SCHDLR_SSPND_DONE_NMSCHED_BLOCKED:
-	case ERTS_SCHDLR_SSPND_YIELD_DONE_MSCHED_BLOCKED:
-	case ERTS_SCHDLR_SSPND_YIELD_DONE_NMSCHED_BLOCKED:
-	case ERTS_SCHDLR_SSPND_DONE:
-	case ERTS_SCHDLR_SSPND_YIELD_DONE:
-	    p->flags &= ~F_HAVE_BLCKD_MSCHED;
-	    break;
-	case ERTS_SCHDLR_SSPND_EINVAL:
-	default:
-	    erts_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error: %d\n",
-		      __FILE__, __LINE__, (int) ssr);
-	}
-    }
-    if (p->flags & F_HAVE_BLCKD_NMSCHED) {
-	ErtsSchedSuspendResult ssr;
-	ssr = erts_block_multi_scheduling(p, ERTS_PROC_LOCK_MAIN, 0, 1, 1);
-	switch (ssr) {
-	case ERTS_SCHDLR_SSPND_YIELD_RESTART:
-	    goto yield;
-	case ERTS_SCHDLR_SSPND_DONE_MSCHED_BLOCKED:
-	case ERTS_SCHDLR_SSPND_DONE_NMSCHED_BLOCKED:
-	case ERTS_SCHDLR_SSPND_YIELD_DONE_MSCHED_BLOCKED:
-	case ERTS_SCHDLR_SSPND_YIELD_DONE_NMSCHED_BLOCKED:
-	case ERTS_SCHDLR_SSPND_DONE:
-	case ERTS_SCHDLR_SSPND_YIELD_DONE:
-	    p->flags &= ~F_HAVE_BLCKD_MSCHED;
-	    break;
-	case ERTS_SCHDLR_SSPND_EINVAL:
-	default:
-	    erts_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error: %d\n",
-		     __FILE__, __LINE__, (int) ssr);
-	}
-    }
+restart:
+    switch (trap_state->phase) {
+    case ERTS_CONTINUE_EXIT_TIMERS:
+        if (p->bif_timers) {
+            reds = erts_cancel_bif_timers(p, &p->bif_timers, &trap_state->yield_state, reds);
+            if (reds <= 0) goto yield;
+            p->bif_timers = NULL;
+        }
 
-    if (p->flags & F_USING_DB) {
-	if (erts_db_process_exiting(p, ERTS_PROC_LOCK_MAIN))
-	    goto yield;
-	p->flags &= ~F_USING_DB;
-    }
+        if (p->flags & F_SCHDLR_ONLN_WAITQ) {
+            abort_sched_onln_chng_waitq(p);
+            reds -= 100;
+        }
 
-    erts_set_gc_state(p, 1);
-    state = erts_atomic32_read_acqb(&p->state);
-    if ((state & ERTS_PSFLG_SYS_TASKS) || p->dirty_sys_tasks) {
-	if (cleanup_sys_tasks(p, state, CONTEXT_REDS) >= CONTEXT_REDS/2)
-	    goto yield;
-    }
+        trap_state->phase = ERTS_CONTINUE_EXIT_BLCKD_MSHED;
+        if (reds <= 0) goto yield;
+    case ERTS_CONTINUE_EXIT_BLCKD_MSHED:
+
+        if (p->flags & F_HAVE_BLCKD_MSCHED) {
+            ErtsSchedSuspendResult ssr;
+            ssr = erts_block_multi_scheduling(p, ERTS_PROC_LOCK_MAIN, 0, 0, 1);
+            switch (ssr) {
+            case ERTS_SCHDLR_SSPND_DONE:
+            case ERTS_SCHDLR_SSPND_DONE_MSCHED_BLOCKED:
+            case ERTS_SCHDLR_SSPND_DONE_NMSCHED_BLOCKED:
+                p->flags &= ~F_HAVE_BLCKD_MSCHED;
+                break;
+            default:
+                erts_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error: %d\n",
+                          __FILE__, __LINE__, (int) ssr);
+            }
+            reds -= 100;
+        }
 
-#ifdef DEBUG
-    erts_proc_lock(p, ERTS_PROC_LOCK_STATUS);
-    ASSERT(ERTS_PROC_GET_DELAYED_GC_TASK_QS(p) == NULL);
-    ASSERT(p->dirty_sys_tasks == NULL);
-    erts_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
-#endif
+        trap_state->phase = ERTS_CONTINUE_EXIT_BLCKD_NMSHED;
+        if (reds <= 0) goto yield;
+    case ERTS_CONTINUE_EXIT_BLCKD_NMSHED:
+
+        if (p->flags & F_HAVE_BLCKD_NMSCHED) {
+            ErtsSchedSuspendResult ssr;
+            ssr = erts_block_multi_scheduling(p, ERTS_PROC_LOCK_MAIN, 0, 1, 1);
+            switch (ssr) {
+            case ERTS_SCHDLR_SSPND_DONE:
+            case ERTS_SCHDLR_SSPND_DONE_MSCHED_BLOCKED:
+            case ERTS_SCHDLR_SSPND_DONE_NMSCHED_BLOCKED:
+                p->flags &= ~F_HAVE_BLCKD_MSCHED;
+                break;
+            default:
+                erts_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error: %d\n",
+                          __FILE__, __LINE__, (int) ssr);
+            }
+            reds -= 100;
+        }
 
-    if (p->flags & F_USING_DDLL) {
-	erts_ddll_proc_dead(p, ERTS_PROC_LOCK_MAIN);
-	p->flags &= ~F_USING_DDLL;
-    }
+        trap_state->yield_state = NULL;
+        trap_state->phase = ERTS_CONTINUE_EXIT_USING_DB;
+        if (reds <= 0) goto yield;
+    case ERTS_CONTINUE_EXIT_USING_DB:
 
-    /*
-     * The registered name *should* be the last "erlang resource" to
-     * cleanup.
-     */
-    if (p->common.u.alive.reg) {
-	(void) erts_unregister_name(p, ERTS_PROC_LOCK_MAIN, NULL, THE_NON_VALUE);
-	ASSERT(!p->common.u.alive.reg);
-    }
+        if (p->flags & F_USING_DB) {
+            if (erts_db_process_exiting(p, ERTS_PROC_LOCK_MAIN, &trap_state->yield_state))
+                goto yield;
+            p->flags &= ~F_USING_DB;
+        }
 
-    if (IS_TRACED_FL(p, F_TRACE_SCHED_EXIT))
-        trace_sched(p, curr_locks, am_out_exited);
+        trap_state->phase = ERTS_CONTINUE_EXIT_CLEAN_SYS_TASKS;
+    case ERTS_CONTINUE_EXIT_CLEAN_SYS_TASKS:
 
-    erts_proc_lock(p, ERTS_PROC_LOCKS_ALL_MINOR);
-    curr_locks = ERTS_PROC_LOCKS_ALL;
+        /* We enable GC again as it can produce more sys-tasks */
+        erts_set_gc_state(p, 1);
+        state = erts_atomic32_read_acqb(&p->state);
+        if ((state & ERTS_PSFLG_SYS_TASKS) || p->dirty_sys_tasks) {
+            reds -= cleanup_sys_tasks(p, state, reds);
+            if (reds <= 0) goto yield;
+        }
+
+        trap_state->phase = ERTS_CONTINUE_EXIT_FREE;
+    case ERTS_CONTINUE_EXIT_FREE:
 
-    /*
-     * From this point on we are no longer allowed to yield
-     * this process.
-     */
 #ifdef DEBUG
-    yield_allowed = 0;
+        erts_proc_lock(p, ERTS_PROC_LOCK_STATUS);
+        ASSERT(ERTS_PROC_GET_DELAYED_GC_TASK_QS(p) == NULL);
+        ASSERT(p->dirty_sys_tasks == NULL);
+        erts_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
 #endif
 
-    /*
-     * Note! The monitor and link fields will be overwritten 
-     * by erts_ptab_delete_element() below.
-     */
-    links = ERTS_P_LINKS(p);
-    monitors = ERTS_P_MONITORS(p);
-    lt_monitors = ERTS_P_LT_MONITORS(p);
+        if (p->flags & F_USING_DDLL) {
+            erts_ddll_proc_dead(p, ERTS_PROC_LOCK_MAIN);
+            p->flags &= ~F_USING_DDLL;
+        }
 
-    {
-	/* Do *not* use erts_get_runq_proc() */
-	ErtsRunQueue *rq;
-	rq = erts_get_runq_current(erts_proc_sched_data(p));
+        /*
+         * The registered name *should* be the last "erlang resource" to
+         * cleanup.
+         */
+        if (p->common.u.alive.reg) {
+            (void) erts_unregister_name(p, ERTS_PROC_LOCK_MAIN, NULL, THE_NON_VALUE);
+            ASSERT(!p->common.u.alive.reg);
+        }
 
-	erts_runq_lock(rq);
+        erts_proc_lock(p, ERTS_PROC_LOCKS_ALL_MINOR);
+        curr_locks = ERTS_PROC_LOCKS_ALL;
 
-	ASSERT(p->scheduler_data);
-	ASSERT(p->scheduler_data->current_process == p);
-	ASSERT(p->scheduler_data->free_process == NULL);
+        /*
+         * Note! The monitor and link fields will be overwritten 
+         * by erts_ptab_delete_element() below.
+         */
+        trap_state->links = ERTS_P_LINKS(p);
+        trap_state->monitors = ERTS_P_MONITORS(p);
+        trap_state->lt_monitors = ERTS_P_LT_MONITORS(p);
 
-	p->scheduler_data->current_process = NULL;
-	p->scheduler_data->free_process = p;
+        {
+            /* Do *not* use erts_get_runq_proc() */
+            ErtsRunQueue *rq;
+            rq = erts_get_runq_current(erts_proc_sched_data(p));
 
-	/* Time of death! */
-	erts_ptab_delete_element(&erts_proc, &p->common);
+            erts_runq_lock(rq);
 
-	erts_runq_unlock(rq);
-    }
+            ASSERT(p->scheduler_data);
+            ASSERT(p->scheduler_data->current_process == p);
+            ASSERT(p->scheduler_data->free_process == NULL);
 
-    /*
-     * All "erlang resources" have to be deallocated before this point,
-     * e.g. registered name, so monitoring and linked processes can
-     * be sure that all interesting resources have been deallocated
-     * when the monitors and/or links hit.
-     */
+            /* Time of death! */
+            erts_ptab_delete_element(&erts_proc, &p->common);
 
-    {
-	/* Inactivate and notify free */
-	erts_aint32_t n, e, a = erts_atomic32_read_nob(&p->state);
-	int refc_inced = 0;
-	while (1) {
-	    n = e = a;
-	    ASSERT(a & ERTS_PSFLG_EXITING);
-	    n |= ERTS_PSFLG_FREE;
-	    n &= ~(ERTS_PSFLG_ACTIVE
-                   | ERTS_PSFLG_ACTIVE_SYS
-                   | ERTS_PSFLG_DIRTY_ACTIVE_SYS);
-	    if ((n & ERTS_PSFLG_IN_RUNQ) && !refc_inced) {
-		erts_proc_inc_refc(p);
-		refc_inced = 1;
-	    }
-	    a = erts_atomic32_cmpxchg_mb(&p->state, n, e);
-	    if (a == e)
-		break;
-	}
+            erts_runq_unlock(rq);
+        }
 
-        if (a & (ERTS_PSFLG_DIRTY_RUNNING
-                 | ERTS_PSFLG_DIRTY_RUNNING_SYS)) {
-	    p->flags |= F_DELAYED_DEL_PROC;
-	    delay_del_proc = 1;
-	    /*
-	     * The dirty scheduler decrease refc
-             * when done with the process...
-	     */
-	}
+        /*
+         * All "erlang resources" have to be deallocated before this point,
+         * e.g. registered name, so monitoring and linked processes can
+         * be sure that all interesting resources have been deallocated
+         * when the monitors and/or links hit.
+         */
 
-	if (refc_inced && !(n & ERTS_PSFLG_IN_RUNQ))
-	    erts_proc_dec_refc(p);
-    }
+        {
+            /* Inactivate and notify free */
+            erts_aint32_t n, e, a = erts_atomic32_read_nob(&p->state);
+            int refc_inced = 0;
+            while (1) {
+                n = e = a;
+                ASSERT(a & ERTS_PSFLG_EXITING);
+                n |= ERTS_PSFLG_FREE;
+                if ((n & ERTS_PSFLG_IN_RUNQ) && !refc_inced) {
+                    erts_proc_inc_refc(p);
+                    refc_inced = 1;
+                }
+                a = erts_atomic32_cmpxchg_mb(&p->state, n, e);
+                if (a == e)
+                    break;
+            }
 
-    dep = ((p->flags & F_DISTRIBUTION)
-           ? ERTS_PROC_SET_DIST_ENTRY(p, NULL)
-           : NULL);
+            if (refc_inced && !(n & ERTS_PSFLG_IN_RUNQ))
+                erts_proc_dec_refc(p);
+        }
 
+        trap_state->dep = ((p->flags & F_DISTRIBUTION)
+                      ? ERTS_PROC_SET_DIST_ENTRY(p, NULL)
+                      : NULL);
+
+        reds -= 50;
 
-    /*
-     * It might show up signal prio elevation tasks until we
-     * have entered free state. Cleanup such tasks now.
-     */
-    state = erts_atomic32_read_acqb(&p->state);
-    if (!(state & ERTS_PSFLG_SYS_TASKS))
-        erts_proc_unlock(p, ERTS_PROC_LOCKS_ALL);
-    else {
         erts_proc_unlock(p, ERTS_PROC_LOCKS_ALL_MINOR);
+        curr_locks = ERTS_PROC_LOCK_MAIN;
+        trap_state->phase = ERTS_CONTINUE_EXIT_CLEAN_SYS_TASKS_AFTER;
+    case ERTS_CONTINUE_EXIT_CLEAN_SYS_TASKS_AFTER:
+        /*
+         * It might show up signal prio elevation tasks until we
+         * have entered free state. Cleanup such tasks now.
+         */
 
-        do {
-            (void) cleanup_sys_tasks(p, state, CONTEXT_REDS);
-            state = erts_atomic32_read_acqb(&p->state);
-        } while (state & ERTS_PSFLG_SYS_TASKS);
-        
-        erts_proc_unlock(p, ERTS_PROC_LOCK_MAIN);
-    }
+        state = erts_atomic32_read_acqb(&p->state);
+        if ((state & ERTS_PSFLG_SYS_TASKS) || p->dirty_sys_tasks) {
+            reds -= cleanup_sys_tasks(p, state, reds);
+            if (reds <= 0) goto yield;
+        }
+
+        /* Needs to be unlocked for erts_do_net_exits to work?!? */
+        // erts_proc_unlock(p, ERTS_PROC_LOCK_MAIN);
 
 #ifdef DEBUG
-    erts_proc_lock(p, ERTS_PROC_LOCK_STATUS);
-    ASSERT(p->sys_task_qs == NULL);
-    erts_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
+        erts_proc_lock(p, ERTS_PROC_LOCK_STATUS);
+        ASSERT(p->sys_task_qs == NULL);
+        erts_proc_unlock(p, ERTS_PROC_LOCK_STATUS);
 #endif
 
-    if (dep) {
-        erts_do_net_exits(dep, (reason == am_kill) ? am_killed : reason);
-        erts_deref_dist_entry(dep);
-    }
+        if (trap_state->dep) {
+            erts_do_net_exits(trap_state->dep,
+                              (trap_state->reason == am_kill) ? am_killed : trap_state->reason);
+            erts_deref_dist_entry(trap_state->dep);
+        }
 
-    pectxt.c_p = p;
-    pectxt.reason = reason;
+        /* Disable GC so that reason does not get moved */
+        erts_set_gc_state(p, 0);
+
+        trap_state->pectxt.c_p = p;
+        trap_state->pectxt.reason = trap_state->reason;
+        trap_state->pectxt.dist_links = NULL;
+        trap_state->pectxt.dist_monitors = NULL;
+        trap_state->pectxt.dist_state = NIL;
+
+        erts_proc_lock(p, ERTS_PROC_LOCK_MSGQ);
+
+        erts_proc_sig_fetch(p);
+
+        erts_proc_unlock(p, ERTS_PROC_LOCK_MSGQ);
+
+        trap_state->yield_state = NULL;
+        trap_state->phase = ERTS_CONTINUE_EXIT_LINKS;
+        if (reds <= 0) goto yield;
+    case ERTS_CONTINUE_EXIT_LINKS:
+
+        reds = erts_link_tree_foreach_delete_yielding(
+            &trap_state->links,
+            erts_proc_exit_handle_link,
+            (void *) &trap_state->pectxt,
+            &trap_state->yield_state,
+            reds);
+        if (reds <= 0)
+            goto yield;
+
+        ASSERT(!trap_state->links);
+        trap_state->yield_state = NULL;
+        trap_state->phase = ERTS_CONTINUE_EXIT_MONITORS;
+    case ERTS_CONTINUE_EXIT_MONITORS:
+
+    reds = erts_monitor_tree_foreach_delete_yielding(
+            &trap_state->monitors,
+            erts_proc_exit_handle_monitor,
+            (void *) &trap_state->pectxt,
+            &trap_state->yield_state,
+            reds);
+        if (reds <= 0)
+            goto yield;
+
+        ASSERT(!trap_state->monitors);
+        trap_state->yield_state = NULL;
+        trap_state->phase = ERTS_CONTINUE_EXIT_LT_MONITORS;
+    case ERTS_CONTINUE_EXIT_LT_MONITORS:
+
+        reds = erts_monitor_list_foreach_delete_yielding(
+            &trap_state->lt_monitors,
+            erts_proc_exit_handle_monitor,
+            (void *) &trap_state->pectxt,
+            &trap_state->yield_state,
+            reds);
+        if (reds <= 0)
+            goto yield;
+
+        ASSERT(!trap_state->lt_monitors);
+        trap_state->phase = ERTS_CONTINUE_EXIT_HANDLE_PROC_SIG;
+    case ERTS_CONTINUE_EXIT_HANDLE_PROC_SIG: {
+        Sint r = reds;
+
+        if (!erts_proc_sig_handle_exit(p, &r))
+            goto yield;
+
+        reds -= r;
+
+        trap_state->phase = ERTS_CONTINUE_EXIT_DIST_LINKS;
+    }
+    case ERTS_CONTINUE_EXIT_DIST_LINKS: {
+
+        continue_dist_send:
+        if (is_not_nil(trap_state->pectxt.dist_state)) {
+            Binary* bin = erts_magic_ref2bin(trap_state->pectxt.dist_state);
+            ErtsDSigSendContext* ctx = (ErtsDSigSendContext*) ERTS_MAGIC_BIN_DATA(bin);
+            Sint initial_reds = (Sint) (ERTS_BIF_REDS_LEFT(p) * TERM_TO_BINARY_LOOP_FACTOR);
+            int result;
+
+            ctx->reds = initial_reds;
+            result = erts_dsig_send(ctx);
+
+            /* erts_dsig_send bumps reductions on the process in the ctx */
+            reds = ERTS_BIF_REDS_LEFT(p);
+
+            switch (result) {
+            case ERTS_DSIG_SEND_OK:
+                break;
+            case ERTS_DSIG_SEND_TOO_LRG: /*SEND_SYSTEM_LIMIT*/
+                erts_kill_dist_connection(ctx->dep, ctx->connection_id);
+                break;
+            case ERTS_DSIG_SEND_YIELD: /*SEND_YIELD_RETURN*/
+            case ERTS_DSIG_SEND_CONTINUE: { /*SEND_YIELD_CONTINUE*/
+                goto yield;
+            }
+            }
 
-    erts_proc_lock(p, ERTS_PROC_LOCK_MAIN|ERTS_PROC_LOCK_MSGQ);
+            trap_state->pectxt.dist_state = NIL;
+            if (reds <= 0)
+                goto yield;
+            goto restart;
+        }
 
-    erts_proc_sig_fetch(p);
+        reds = erts_link_tree_foreach_delete_yielding(
+            &trap_state->pectxt.dist_links,
+            erts_proc_exit_handle_dist_link,
+            (void *) &trap_state->pectxt,
+            &trap_state->yield_state,
+            reds);
+        if (reds <= 0 || is_not_nil(trap_state->pectxt.dist_state))
+            goto yield;
+        trap_state->phase = ERTS_CONTINUE_EXIT_DIST_MONITORS;
+    }
+    case ERTS_CONTINUE_EXIT_DIST_MONITORS: {
+
+        if (is_not_nil(trap_state->pectxt.dist_state))
+            goto continue_dist_send;
+
+        reds = erts_monitor_tree_foreach_delete_yielding(
+            &trap_state->pectxt.dist_monitors,
+            erts_proc_exit_handle_dist_monitor,
+            (void *) &trap_state->pectxt,
+            &trap_state->yield_state,
+            reds);
+        if (reds <= 0 || is_not_nil(trap_state->pectxt.dist_state))
+            goto yield;
+
+        trap_state->phase = ERTS_CONTINUE_EXIT_DONE;
+    }
+    case ERTS_CONTINUE_EXIT_DONE: {
+        erts_aint_t state;
+        /*
+         * From this point on we are no longer allowed to yield
+         * this process.
+         */
+#ifdef DEBUG
+        yield_allowed = 0;
+#endif
 
-    erts_proc_unlock(p, ERTS_PROC_LOCK_MSGQ);
+        /* Enable GC again, through strictly not needed it puts
+           the process in a consistent state. */
+        erts_set_gc_state(p, 1);
 
-    if (links) {
-        erts_link_tree_foreach_delete(&links,
-                                      erts_proc_exit_handle_link,
-                                      (void *) &pectxt);
-        ASSERT(!links);
-    }
+        /* Set state to not active as we don't want this process
+           to be scheduled in again after this. */
+        state = erts_atomic32_read_band_relb(&p->state,
+                                             ~(ERTS_PSFLG_ACTIVE
+                                               | ERTS_PSFLG_ACTIVE_SYS
+                                               | ERTS_PSFLG_DIRTY_ACTIVE_SYS));
 
-    if (monitors) {
-        erts_monitor_tree_foreach_delete(&monitors,
-                                         erts_proc_exit_handle_monitor,
-                                         (void *) &pectxt);
-        ASSERT(!monitors);
-    }
+        ASSERT(p->scheduler_data);
+        ASSERT(p->scheduler_data->current_process == p);
+        ASSERT(p->scheduler_data->free_process == NULL);
+
+        p->scheduler_data->current_process = NULL;
+        p->scheduler_data->free_process = p;
+
+        if (state & (ERTS_PSFLG_DIRTY_RUNNING
+                     | ERTS_PSFLG_DIRTY_RUNNING_SYS)) {
+            p->flags |= F_DELAYED_DEL_PROC;
+            delay_del_proc = 1;
+            /*
+             * The dirty scheduler decrease refc
+             * when done with the process...
+             */
+        }
 
-    if (lt_monitors) {
-        erts_monitor_list_foreach_delete(&lt_monitors,
-                                         erts_proc_exit_handle_monitor,
-                                         (void *) &pectxt);
-        ASSERT(!lt_monitors);
+        erts_schedule_thr_prgr_later_cleanup_op(
+            (void (*)(void*))erts_proc_dec_refc,
+            (void *) &p->common,
+            &p->common.u.release,
+            sizeof(Process));
+
+        break;
+    }
     }
 
-    /*
-     * erts_proc_sig_handle_exit() implements yielding.
-     * However, this function cannot handle it yet... loop
-     * until done...
-     */
-    while (!0) {
-        int reds = CONTEXT_REDS;
-        if (erts_proc_sig_handle_exit(p, &reds))
-            break;
+    if (trap_state != &static_state) {
+        erts_free(ERTS_ALC_T_CONT_EXIT_TRAP, trap_state);
+        p->u.terminate = NULL;
     }
 
     ERTS_CHK_HAVE_ONLY_MAIN_PROC_LOCK(p);
 
+    if (IS_TRACED_FL(p, F_TRACE_SCHED_EXIT))
+        trace_sched(p, curr_locks, am_out_exited);
+
     erts_flush_trace_messages(p, ERTS_PROC_LOCK_MAIN);
 
     ERTS_TRACER_CLEAR(&ERTS_TRACER(p));
@@ -12602,15 +12981,30 @@ erts_continue_exit_process(Process *p)
 
  yield:
 
-#ifdef DEBUG
     ASSERT(yield_allowed);
-#endif
 
     ERTS_LC_ASSERT(curr_locks == erts_proc_lc_my_proc_locks(p));
     ERTS_LC_ASSERT(ERTS_PROC_LOCK_MAIN & curr_locks);
+    ASSERT(erts_proc_read_refc(p) > 0);
+
+    if (trap_state == &static_state) {
+        trap_state = erts_alloc(ERTS_ALC_T_CONT_EXIT_TRAP, sizeof(*trap_state));
+        sys_memcpy(trap_state, &static_state, sizeof(*trap_state));
+        p->u.terminate = trap_state;
+    }
+
+    ASSERT(p->scheduler_data);
+    ASSERT(p->scheduler_data->current_process == p);
+    ASSERT(p->scheduler_data->free_process == NULL);
+
+    if (trap_state->phase >= ERTS_CONTINUE_EXIT_FREE) {
+        p->scheduler_data->current_process = NULL;
+        p->scheduler_data->free_process = p;
+    }
 
     p->i = (BeamInstr *) beam_continue_exit;
 
+    /* Why is this lock take??? */
     if (!(curr_locks & ERTS_PROC_LOCK_STATUS)) {
 	erts_proc_lock(p, ERTS_PROC_LOCK_STATUS);
 	curr_locks |= ERTS_PROC_LOCK_STATUS;
@@ -13026,10 +13420,10 @@ void erts_halt(int code)
     if (-1 == erts_atomic32_cmpxchg_acqb(&erts_halt_progress,
 					     erts_no_schedulers,
 					     -1)) {
+        notify_reap_ports_relb();
         ERTS_RUNQ_FLGS_SET(ERTS_DIRTY_CPU_RUNQ, ERTS_RUNQ_FLG_HALTING);
         ERTS_RUNQ_FLGS_SET(ERTS_DIRTY_IO_RUNQ, ERTS_RUNQ_FLG_HALTING);
 	erts_halt_code = code;
-	notify_reap_ports_relb();
     }
 }
 
@@ -13074,3 +13468,79 @@ erts_debug_later_op_foreach(void (*callback)(void*),
         }
     }
 }
+
+void
+erts_debug_free_process_foreach(void (*func)(Process *, void *), void *arg)
+{
+    ErtsRunQueue *rq;
+    int ix, prio;
+    for (ix = 0; ix < erts_no_run_queues; ix++) {
+        rq = ERTS_RUNQ_IX(ix);
+        for (prio = PRIORITY_MAX; prio < PRIORITY_LOW; prio++) {
+            Process *p = rq->procs.prio[prio].first;
+            for (; p; p = p->next) {
+                if (ERTS_PSFLG_FREE & erts_atomic32_read_nob(&p->state))
+                    (*func)(p, arg);
+            }
+        }
+    }
+}
+
+void
+erts_debug_proc_monitor_link_foreach(Process *proc,
+                                     int (*monitor_func)(ErtsMonitor *, void *, Sint ),
+                                     int (*link_func)(ErtsLink *, void *, Sint ),
+                                     void *arg)
+{
+    if (!(erts_atomic32_read_nob(&proc->state) & ERTS_PSFLG_FREE)) {
+        /* For all links */
+        erts_link_tree_foreach(ERTS_P_LINKS(proc),
+                               link_func,
+                               arg);
+        /* For all monitors */
+        erts_monitor_tree_foreach(ERTS_P_MONITORS(proc),
+                                  monitor_func,
+                                  arg);
+        /* For all local target monitors */
+        erts_monitor_list_foreach(ERTS_P_LT_MONITORS(proc),
+                                  monitor_func,
+                                  arg);
+    }
+    else {
+        struct continue_exit_state *ce_state = proc->u.terminate;
+
+        /* For all links */
+        if (ce_state->phase == ERTS_CONTINUE_EXIT_LINKS)
+            erts_debug_link_tree_destroying_foreach(ce_state->links,
+                                                    link_func,
+                                                    arg,
+                                                    ce_state->yield_state);
+        else
+            erts_link_tree_foreach(ce_state->links,
+                                   link_func,
+                                   arg);
+
+        /* For all monitors */
+        if (ce_state->phase == ERTS_CONTINUE_EXIT_MONITORS)
+            erts_debug_monitor_tree_destroying_foreach(ce_state->monitors,
+                                                       monitor_func,
+                                                       arg,
+                                                       ce_state->yield_state);
+        else
+            erts_monitor_tree_foreach(ce_state->monitors,
+                                      monitor_func,
+                                      arg);
+
+        /* For all local target monitors */
+        if (ce_state->phase == ERTS_CONTINUE_EXIT_LT_MONITORS)
+            erts_debug_monitor_list_destroying_foreach(ce_state->lt_monitors,
+                                                       monitor_func,
+                                                       arg,
+                                                       ce_state->yield_state);
+        else
+            erts_monitor_list_foreach(ce_state->lt_monitors,
+                                      monitor_func,
+                                      arg);
+
+    }
+}
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h
index a1b029adbe..c0d7cfd13d 100644
--- a/erts/emulator/beam/erl_process.h
+++ b/erts/emulator/beam/erl_process.h
@@ -173,8 +173,6 @@ extern int erts_dio_sched_thread_suggested_stack_size;
   (((Uint32) 1) << (ERTS_RUNQ_FLG_BASE2 + 9))
 #define ERTS_RUNQ_FLG_HALTING \
   (((Uint32) 1) << (ERTS_RUNQ_FLG_BASE2 + 10))
-#define ERTS_RUNQ_FLG_CHECKIO \
-  (((Uint32) 1) << (ERTS_RUNQ_FLG_BASE2 + 11))
 
 #define ERTS_RUNQ_FLG_MAX (ERTS_RUNQ_FLG_BASE2 + 12)
 
@@ -359,7 +357,7 @@ typedef struct ErtsSchedulerSleepInfo_ ErtsSchedulerSleepInfo;
 
 typedef struct {
     erts_spinlock_t lock;
-    ErtsSchedulerSleepInfo *list;
+    ErtsSchedulerSleepInfo *list; /* circular lifo list; points to last out */
 } ErtsSchedulerSleepList;
 
 struct ErtsSchedulerSleepInfo_ {
@@ -383,7 +381,10 @@ struct ErtsSchedulerSleepInfo_ {
 
 typedef struct ErtsProcList_ ErtsProcList;
 struct ErtsProcList_ {
-    Eterm pid;
+    union {
+        Eterm pid;
+        Process *p;
+    } u;
     Uint64 started_interval;
     ErtsProcList* next;
     ErtsProcList* prev;
@@ -640,6 +641,7 @@ struct ErtsSchedulerData_ {
     ErtsSchedType type;
     Uint no;			/* Scheduler number for normal schedulers */
     Uint dirty_no;  /* Scheduler number for dirty schedulers */
+    int flxctr_slot_no; /* slot nr when a flxctr is used */
     struct enif_environment_t *current_nif;
     Process *dirty_shadow_process;
     Port *current_port;
@@ -699,6 +701,13 @@ void
 erts_debug_later_op_foreach(void (*callback)(void*),
                             void (*func)(void *, ErtsThrPrgrVal, void *),
                             void *arg);
+void
+erts_debug_free_process_foreach(void (*func)(Process *, void *), void *arg);
+void
+erts_debug_proc_monitor_link_foreach(Process *proc,
+                                     int (*monitor_func)(ErtsMonitor *, void *, Sint ),
+                                     int (*link_func)(ErtsLink *, void *, Sint ),
+                                     void *arg);
 
 #ifdef ERTS_INCLUDE_SCHEDULER_INTERNALS
 
@@ -1228,9 +1237,10 @@ void erts_check_for_holes(Process* p);
 
 /* The sequential tracing token is a tuple of size 5:
  *
- *    {Flags, Label, Serial, Sender}
+ *    {Flags, Label, Serial, Sender, LastCnt}
+ *
+ *  WARNING: The top 5-tuple is *MUTABLE* and thus INTERNAL ONLY.
  */
-
 #define SEQ_TRACE_TOKEN_ARITY(p)    (arityval(*(tuple_val(SEQ_TRACE_TOKEN(p)))))
 #define SEQ_TRACE_TOKEN_FLAGS(p)    (*(tuple_val(SEQ_TRACE_TOKEN(p)) + 1))
 #define SEQ_TRACE_TOKEN_LABEL(p)    (*(tuple_val(SEQ_TRACE_TOKEN(p)) + 2))
@@ -1321,9 +1331,6 @@ ERTS_GLB_INLINE void erts_heap_frag_shrink(Process* p, Eterm* hp)
 #endif /* inline */
 
 Eterm* erts_heap_alloc(Process* p, Uint need, Uint xtra);
-#ifdef CHECK_FOR_HOLES
-Eterm* erts_set_hole_marker(Eterm* ptr, Uint sz);
-#endif
 
 extern erts_rwmtx_t erts_cpu_bind_rwmtx;
 /* If any of the erts_system_monitor_* variables are set (enabled),
@@ -1582,7 +1589,7 @@ ERTS_GLB_INLINE int erts_proclist_is_last(ErtsProcList *, ErtsProcList *);
 ERTS_GLB_INLINE int
 erts_proclist_same(ErtsProcList *plp, Process *p)
 {
-    return (plp->pid == p->common.id
+    return ((plp->u.pid == p->common.id || plp->u.p == p)
 	    && (plp->started_interval
 		== p->common.u.alive.started_interval));
 }
@@ -1821,9 +1828,12 @@ Eterm erts_process_info(Process *c_p, ErtsHeapFactory *hfact,
 typedef struct {
     Process *c_p;
     Eterm reason;
+    ErtsLink *dist_links;
+    ErtsMonitor *dist_monitors;
+    Eterm dist_state;
 } ErtsProcExitContext;
-void erts_proc_exit_handle_monitor(ErtsMonitor *mon, void *vctxt);
-void erts_proc_exit_handle_link(ErtsLink *lnk, void *vctxt);
+int erts_proc_exit_handle_monitor(ErtsMonitor *mon, void *vctxt, Sint reds);
+int erts_proc_exit_handle_link(ErtsLink *lnk, void *vctxt, Sint reds);
 
 Eterm erts_get_process_priority(erts_aint32_t state);
 Eterm erts_set_process_priority(Process *p, Eterm prio);
@@ -1846,12 +1856,14 @@ int erts_resume_processes(ErtsProcList *);
 void erts_deep_process_dump(fmtfn_t, void *);
 
 Eterm erts_get_reader_groups_map(Process *c_p);
+Eterm erts_get_decentralized_counter_groups_map(Process *c_p);
 Eterm erts_debug_reader_groups_map(Process *c_p, int groups);
 
 Uint erts_debug_nbalance(void);
 
 #define ERTS_DEBUG_WAIT_COMPLETED_DEALLOCATIONS		(1 << 0)
 #define ERTS_DEBUG_WAIT_COMPLETED_TIMER_CANCELLATIONS	(1 << 1)
+#define ERTS_DEBUG_WAIT_COMPLETED_AUX_WORK		(1 << 2)
 
 int erts_debug_wait_completed(Process *c_p, int flags);
 
@@ -2348,6 +2360,8 @@ erts_try_change_runq_proc(Process *p, ErtsRunQueue *rq)
                                             old_rqint);
         if (act_rqint == old_rqint)
             return !0;
+
+        old_rqint = act_rqint;
     }
 }
 
@@ -2627,6 +2641,9 @@ void erts_notify_inc_runq(ErtsRunQueue *runq);
 void erts_sched_finish_poke(ErtsSchedulerSleepInfo *, erts_aint32_t);
 ERTS_GLB_INLINE void erts_sched_poke(ErtsSchedulerSleepInfo *ssi);
 void erts_aux_thread_poke(void);
+ERTS_GLB_INLINE Uint32 erts_sched_local_random_hash_64_to_32_shift(Uint64 key);
+ERTS_GLB_INLINE Uint32 erts_sched_local_random(Uint additional_seed);
+
 
 #if ERTS_GLB_INLINE_INCL_FUNC_DEF
 
@@ -2643,6 +2660,39 @@ erts_sched_poke(ErtsSchedulerSleepInfo *ssi)
 }
 
 
+/*
+ * Source: https://gist.github.com/badboy/6267743
+ *         http://web.archive.org/web/20071223173210/http://www.concentric.net/~Ttwang/tech/inthash.htm
+ */
+ERTS_GLB_INLINE
+Uint32 erts_sched_local_random_hash_64_to_32_shift(Uint64 key)
+{
+    key = (~key) + (key << 18); /* key = (key << 18) - key - 1; */
+    key = key ^ (key >> 31);
+    key = (key + (key << 2)) + (key << 4);
+    key = key ^ (key >> 11);
+    key = key + (key << 6);
+    key = key ^ (key >> 22);
+    return (Uint32) key;
+}
+
+/*
+ * This function attempts to return a random number based on the state
+ * of the scheduler, the current process and the additional_seed
+ * parameter.
+ */
+ERTS_GLB_INLINE
+Uint32 erts_sched_local_random(Uint additional_seed)
+{
+    ErtsSchedulerData *esdp = erts_get_scheduler_data();
+    Uint64 seed =
+        additional_seed +
+        esdp->reductions +
+        esdp->current_process->fcalls +
+        (((Uint64)esdp->no) << 32);
+    return erts_sched_local_random_hash_64_to_32_shift(seed);
+}
+
 #endif /* #if ERTS_GLB_INLINE_INCL_FUNC_DEF */
 
 
diff --git a/erts/emulator/beam/erl_process_dump.c b/erts/emulator/beam/erl_process_dump.c
index ac5054ea10..71262061dd 100644
--- a/erts/emulator/beam/erl_process_dump.c
+++ b/erts/emulator/beam/erl_process_dump.c
@@ -100,16 +100,18 @@ erts_deep_process_dump(fmtfn_t to, void *to_arg)
     dump_binaries(to, to_arg, all_binaries);
 }
 
-static void
-monitor_size(ErtsMonitor *mon, void *vsize)
+static int
+monitor_size(ErtsMonitor *mon, void *vsize, Sint reds)
 {
     *((Uint *) vsize) += erts_monitor_size(mon);
+    return 1;
 }
 
-static void
-link_size(ErtsMonitor *lnk, void *vsize)
+static int
+link_size(ErtsMonitor *lnk, void *vsize, Sint reds)
 {
     *((Uint *) vsize) += erts_link_size(lnk);
+    return 1;
 }
 
 Uint erts_process_memory(Process *p, int include_sigs_in_transit)
@@ -119,12 +121,14 @@ Uint erts_process_memory(Process *p, int include_sigs_in_transit)
 
     size += sizeof(Process);
 
-    erts_link_tree_foreach(ERTS_P_LINKS(p),
-                           link_size, (void *) &size);
-    erts_monitor_tree_foreach(ERTS_P_MONITORS(p),
-                              monitor_size, (void *) &size);
-    erts_monitor_list_foreach(ERTS_P_LT_MONITORS(p),
-                              monitor_size, (void *) &size);
+    if ((erts_atomic32_read_nob(&p->state) & ERTS_PSFLG_EXITING) == 0) {
+        erts_link_tree_foreach(ERTS_P_LINKS(p),
+                               link_size, (void *) &size);
+        erts_monitor_tree_foreach(ERTS_P_MONITORS(p),
+                                  monitor_size, (void *) &size);
+        erts_monitor_list_foreach(ERTS_P_LT_MONITORS(p),
+                                  monitor_size, (void *) &size);
+    }
     size += (p->heap_sz + p->mbuf_sz) * sizeof(Eterm);
     if (p->abandoned_heap)
         size += (p->hend - p->heap) * sizeof(Eterm);
@@ -189,11 +193,11 @@ static ERTS_INLINE void
 dump_msg(fmtfn_t to, void *to_arg, ErtsMessage *mp)
 {
     if (ERTS_SIG_IS_MSG((ErtsSignal *) mp)) {
-        Eterm mesg = ERL_MESSAGE_TERM(mp);
-        if (is_value(mesg))
-            dump_element(to, to_arg, mesg);
+        Eterm mesg;
+        if (ERTS_SIG_IS_INTERNAL_MSG(mp))
+            dump_element(to, to_arg, ERL_MESSAGE_TERM(mp));
         else
-            dump_dist_ext(to, to_arg, mp->data.dist_ext);
+            dump_dist_ext(to, to_arg, erts_get_dist_ext(mp->data.heap_frag));
         mesg = ERL_MESSAGE_TOKEN(mp);
         erts_print(to, to_arg, ":");
         dump_element(to, to_arg, mesg);
@@ -265,6 +269,7 @@ dump_dist_ext(fmtfn_t to, void *to_arg, ErtsDistExternal *edep)
     else {
 	byte *e;
 	size_t sz;
+        int i;
 
 	if (!(edep->flags & ERTS_DIST_EXT_ATOM_TRANS_TAB))
 	    erts_print(to, to_arg, "D0:");
@@ -274,8 +279,8 @@ dump_dist_ext(fmtfn_t to, void *to_arg, ErtsDistExternal *edep)
 	    for (i = 0; i < edep->attab.size; i++)
 		dump_element(to, to_arg, edep->attab.atom[i]);
 	}
-	sz = edep->ext_endp - edep->extp;
-	e = edep->extp;
+	sz = edep->data->ext_endp - edep->data->extp;
+	e = edep->data->extp;
 	if (edep->flags & ERTS_DIST_EXT_DFLAG_HDR) {
 	    ASSERT(*e != VERSION_MAGIC);
 	    sz++;
@@ -286,15 +291,19 @@ dump_dist_ext(fmtfn_t to, void *to_arg, ErtsDistExternal *edep)
 	erts_print(to, to_arg, "E%X:", sz);
         if (edep->flags & ERTS_DIST_EXT_DFLAG_HDR) {
             byte sbuf[3];
-            int i = 0;
+
+            i = 0;
 
             sbuf[i++] = VERSION_MAGIC;
-            while (i < sizeof(sbuf) && e < edep->ext_endp) {
+            while (i < sizeof(sbuf) && e < edep->data->ext_endp) {
                 sbuf[i++] = *e++;
             }
             erts_print_base64(to, to_arg, sbuf, i);
         }
-        erts_print_base64(to, to_arg, e, edep->ext_endp - e);
+        erts_print_base64(to, to_arg, e, edep->data->ext_endp - e);
+        for (i = 1; i < edep->data->frag_id; i++)
+            erts_print_base64(to, to_arg, edep->data[i].extp,
+                              edep->data[i].ext_endp - edep->data[i].extp);
     }
 }
 
@@ -1005,6 +1014,10 @@ dump_module_literals(fmtfn_t to, void *to_arg, ErtsLiteralArea* lit_area)
             }
             size = 1 + header_arity(w);
             switch (w & _HEADER_SUBTAG_MASK) {
+            case FUN_SUBTAG:
+                ASSERT(((ErlFunThing*)(htop))->num_free == 0);
+                size += 1;
+                break;
             case MAP_SUBTAG:
                 if (is_flatmap_header(w)) {
                     size += 1 + flatmap_get_size(htop);
diff --git a/erts/emulator/beam/erl_ptab.h b/erts/emulator/beam/erl_ptab.h
index 94f0247492..c30a684002 100644
--- a/erts/emulator/beam/erl_ptab.h
+++ b/erts/emulator/beam/erl_ptab.h
@@ -68,8 +68,11 @@ typedef struct {
 	    Uint64 started_interval;
 	    struct reg_proc *reg;
 	    ErtsLink *links;
-	    ErtsMonitor *monitors;
+             /* Local target monitors, double linked list
+                contains the remote part of local monitors  */
             ErtsMonitor *lt_monitors;
+             /* other monitors, rb tree */
+	    ErtsMonitor *monitors;
 	} alive;
 
 	/* --- While being released --- */
diff --git a/erts/emulator/beam/erl_rbtree.h b/erts/emulator/beam/erl_rbtree.h
index e50abf5cec..ce401fa7e7 100644
--- a/erts/emulator/beam/erl_rbtree.h
+++ b/erts/emulator/beam/erl_rbtree.h
@@ -161,7 +161,7 @@
  *
  * - void <ERTS_RBT_PREFIX>_rbt_foreach(
  *                         ERTS_RBT_T *tree,
- *                         void (*op)(ERTS_RBT_T *, void *),
+ *                         int (*op)(ERTS_RBT_T *, void *),
  *                         void *arg);
  *         Operate by calling the operator 'op' on each element.
  *         Order is undefined.
@@ -170,7 +170,7 @@
  *
  * - void <ERTS_RBT_PREFIX>_rbt_foreach_destroy(
  *                         ERTS_RBT_T *tree,
- *                         void (*op)(ERTS_RBT_T *, void *),
+ *                         int (*op)(ERTS_RBT_T *, void *),
  *                         void *arg);
  *         Operate by calling the operator 'op' on each element.
  *         Order is undefined. Each element should be destroyed
@@ -180,39 +180,46 @@
  *
  * - int <ERTS_RBT_PREFIX>_rbt_foreach_yielding(
  *                         ERTS_RBT_T *tree,
- *                         void (*op)(ERTS_RBT_T *, void *),
+ *                         int (*op)(ERTS_RBT_T *, void *),
  *                         void *arg,
  *                         <ERTS_RBT_PREFIX>_rbt_yield_state_t *ystate,
- *                         Sint ylimit);
+ *                         Sint reds);
  *         Operate by calling the operator 'op' on each element.
  *         Order is undefined.
  *
- *         Yield when 'ylimit' elements has been processed. True is
- *         returned when yielding, and false is returned when
- *         the whole tree has been processed. The tree should not be
- *         modified until all of it has been processed.
+ *         Yield when 'reds' reductions has been processed. The 'op'
+ *         function return the number of reductions that each element
+ *         took to process. The number of reductions remaining is returned,
+ *         meaning that if 0 is returned, there are more elements to be
+ *         processed. If a value greater than 0 is returned the foreach has
+ *         ended. The tree should not be modified until all of it has been
+ *         processed.
  *
  *         'arg' is passed as argument to 'op'.
  *
  * - int <ERTS_RBT_PREFIX>_rbt_foreach_destroy_yielding(
  *                         ERTS_RBT_T *tree,
- *                         void (*op)(ERTS_RBT_T *, void *),
+ *                         int (*op)(ERTS_RBT_T *, void *),
  *                         void *arg,
  *                         <ERTS_RBT_PREFIX>_rbt_yield_state_t *ystate,
- *                         Sint ylimit);
+ *                         Sint reds);
  *         Operate by calling the operator 'op' on each element.
  *         Order is undefined. Each element should be destroyed
  *         by 'op'.
  *
- *         Yield when 'ylimit' elements has been processed. True is
- *         returned when yielding, and false is returned when
- *         the whole tree has been processed.
+ *         Yield when 'reds' reductions has been processed. The 'op'
+ *         function return the number of reductions that each element
+ *         took to process. The number of reductions remaining is returned,
+ *         meaning that if 0 is returned, there are more elements to be
+ *         processed. If a value greater than 0 is returned the foreach has
+ *         ended. The tree should not be modified until all of it has been
+ *         processed.
  *
  *         'arg' is passed as argument to 'op'.
  *
  * - void <ERTS_RBT_PREFIX>_rbt_foreach_small(
  *                         ERTS_RBT_T *tree,
- *                         void (*op)(ERTS_RBT_T *, void *),
+ *                         int (*op)(ERTS_RBT_T *, void *),
  *                         void *arg);
  *         Operate by calling the operator 'op' on each element from
  *         smallest towards larger elements.
@@ -221,7 +228,7 @@
  *
  * - void <ERTS_RBT_PREFIX>_rbt_foreach_large(
  *                         ERTS_RBT_T *tree,
- *                         void (*op)(ERTS_RBT_T *, void *),
+ *                         int (*op)(ERTS_RBT_T *, void *),
  *                         void *arg);
  *         Operate by calling the operator 'op' on each element from
  *         largest towards smaller elements.
@@ -230,40 +237,46 @@
  *
  * - int <ERTS_RBT_PREFIX>_rbt_foreach_small_yielding(
  *                         ERTS_RBT_T *tree,
- *                         void (*op)(ERTS_RBT_T *, void *),
+ *                         int (*op)(ERTS_RBT_T *, void *),
  *                         void *arg,
  *                         <ERTS_RBT_PREFIX>_rbt_yield_state_t *ystate,
- *                         Sint ylimit);
+ *                         Sint reds);
  *         Operate by calling the operator 'op' on each element from
  *         smallest towards larger elements.
  *
- *         Yield when 'ylimit' elements has been processed. True is
- *         returned when yielding, and false is returned when
- *         the whole tree has been processed. The tree should not be
- *         modified until all of it has been processed.
+ *         Yield when 'reds' reductions has been processed. The 'op'
+ *         function return the number of reductions that each element
+ *         took to process. The number of reductions remaining is returned,
+ *         meaning that if 0 is returned, there are more elements to be
+ *         processed. If a value greater than 0 is returned the foreach has
+ *         ended. The tree should not be modified until all of it has been
+ *         processed.
  *
  *         'arg' is passed as argument to 'op'.
  *
  * - int <ERTS_RBT_PREFIX>_rbt_foreach_large_yielding(
  *                         ERTS_RBT_T *tree,
- *                         void (*op)(ERTS_RBT_T *, void *),
+ *                         int (*op)(ERTS_RBT_T *, void *),
  *                         void *arg,
  *                         <ERTS_RBT_PREFIX>_rbt_yield_state_t *ystate,
- *                         Sint ylimit);
+ *                         Sint reds);
  *         Operate by calling the operator 'op' on each element from
  *         largest towards smaller elements.
  *
- *         Yield when 'ylimit' elements has been processed. True is
- *         returned when yielding, and false is returned when
- *         the whole tree has been processed. The tree should not be
- *         modified until all of it has been processed.
+ *         Yield when 'reds' reductions has been processed. The 'op'
+ *         function return the number of reductions that each element
+ *         took to process. The number of reductions remaining is returned,
+ *         meaning that if 0 is returned, there are more elements to be
+ *         processed. If a value greater than 0 is returned the foreach has
+ *         ended. The tree should not be modified until all of it has been
+ *         processed.
  *
  *         'arg' is passed as argument to 'op'.
  *
  * - void <ERTS_RBT_PREFIX>_rbt_foreach_small_destroy(
  *                         ERTS_RBT_T **tree,
- *                         void (*op)(ERTS_RBT_T *, void *),
- *                         void (*destr)(ERTS_RBT_T *, void *),
+ *                         int (*op)(ERTS_RBT_T *, void *),
+ *                         int (*destr)(ERTS_RBT_T *, void *),
  *                         void *arg);
  *         Operate by calling the operator 'op' on each element from
  *         smallest towards larger elements.
@@ -277,8 +290,8 @@
  *
  * - void <ERTS_RBT_PREFIX>_rbt_foreach_large_destroy(
  *                         ERTS_RBT_T **tree,
- *                         void (*op)(ERTS_RBT_T *, void *),
- *                         void (*destr)(ERTS_RBT_T *, void *),
+ *                         int (*op)(ERTS_RBT_T *, void *),
+ *                         int (*destr)(ERTS_RBT_T *, void *),
  *                         void *arg);
  *         Operate by calling the operator 'op' on each element from
  *         largest towards smaller elements.
@@ -292,11 +305,11 @@
  *
  * - int <ERTS_RBT_PREFIX>_rbt_foreach_small_destroy_yielding(
  *                        ERTS_RBT_T **tree,
- *                        void (*op)(ERTS_RBT_T *, void *),
- *                        void (*destr)(ERTS_RBT_T *, void *),
+ *                        int (*op)(ERTS_RBT_T *, void *),
+ *                        int (*destr)(ERTS_RBT_T *, void *),
  *                        void *arg,
  *                        <ERTS_RBT_PREFIX>_rbt_yield_state_t *ystate,
- *                        Sint ylimit);
+ *                        Sint reds);
  *         Operate by calling the operator 'op' on each element from
  *         smallest towards larger elements.
  *
@@ -305,20 +318,23 @@
  *         Note that elements are often destroyed in another order
  *         than the order that the elements are operated on.
  *
- *         Yield when 'ylimit' elements has been processed. True is
- *         returned when yielding, and false is returned when
- *         the whole tree has been processed. The tree should not be
- *         modified until all of it has been processed.
+ *         Yield when 'reds' reductions has been processed. The 'op' and
+ *         'destr' functions return the number of reductions that each element
+ *         took to process. The number of reductions remaining is returned,
+ *         meaning that if 0 is returned, there are more elements to be
+ *         processed. If a value greater than 0 is returned the foreach has
+ *         ended. The tree should not be modified until all of it has been
+ *         processed.
  *
  *         'arg' is passed as argument to 'op' and 'destroy'.
  *
  * - int <ERTS_RBT_PREFIX>_rbt_foreach_large_destroy_yielding(
  *                        ERTS_RBT_T **tree,
- *                        void (*op)(ERTS_RBT_T *, void *),
- *                        void (*destr)(ERTS_RBT_T *, void *),
+ *                        int (*op)(ERTS_RBT_T *, void *),
+ *                        int (*destr)(ERTS_RBT_T *, void *),
  *                        void *arg,
  *                        <ERTS_RBT_PREFIX>_rbt_yield_state_t *ystate,
- *                        Sint ylimit);
+ *                        Sint reds);
  *         Operate by calling the operator 'op' on each element from
  *         largest towards smaller elements.
  *
@@ -327,10 +343,13 @@
  *         Note that elements are often destroyed in another order
  *         than the order that the elements are operated on.
  *
- *         Yield when 'ylimit' elements has been processed. True is
- *         returned when yielding, and false is returned when
- *         the whole tree has been processed. The tree should not be
- *         modified until all of it has been processed.
+ *         Yield when 'reds' reductions has been processed. The 'op' and
+ *         'destr' functions return the number of reductions that each element
+ *         took to process. The number of reductions remaining is returned,
+ *         meaning that if 0 is returned, there are more elements to be
+ *         processed. If a value greater than 0 is returned the foreach has
+ *         ended. The tree should not be modified until all of it has been
+ *         processed.
  *
  *         'arg' is passed as argument to 'op' and 'destroy'.
  *
@@ -447,17 +466,6 @@
 #  define ERTS_RBT_API_INLINE__ ERTS_INLINE
 #endif
 
-#ifndef ERTS_RBT_YIELD_STAT_INITER
-#  define ERTS_RBT_YIELD_STAT_INITER {NULL, 0}
-#endif
-#ifndef ERTS_RBT_YIELD_STAT_INIT
-#  define ERTS_RBT_YIELD_STAT_INIT(YS) \
-    do {                               \
-        (YS)->x = NULL;                \
-        (YS)->up = 0;                  \
-    } while (0)
-#endif
-
 #define ERTS_RBT_CONCAT_MACRO_VALUES___(X, Y) \
     X ## Y
 #define ERTS_RBT_CONCAT_MACRO_VALUES__(X, Y) \
@@ -470,8 +478,38 @@
 typedef struct {
     ERTS_RBT_T *x;
     int up;
+#ifdef DEBUG
+    int debug_red_adj;
+#endif
 } ERTS_RBT_YIELD_STATE_T__;
 
+#define ERTS_RBT_CALLBACK_FOREACH_FUNC(NAME) int (*NAME)(ERTS_RBT_T *, void *, Sint)
+
+#ifndef ERTS_RBT_YIELD_STAT_INITER
+#  ifdef DEBUG
+#    define ERTS_RBT_YIELD_STAT_INITER {NULL, 0, CONTEXT_REDS}
+#  else
+#    define ERTS_RBT_YIELD_STAT_INITER {NULL, 0}
+#  endif
+#endif
+#ifndef ERTS_RBT_YIELD_STAT_INIT
+#  define ERTS_RBT_YIELD_STAT_INIT__(YS)                                \
+    do {                                                                \
+        (YS)->x = NULL;                                                 \
+        (YS)->up = 0;                                                   \
+    } while (0)
+#  ifdef DEBUG
+#    define ERTS_RBT_YIELD_STAT_INIT(YS)        \
+    do {                                        \
+        ERTS_RBT_YIELD_STAT_INIT__(YS);         \
+        (YS)->debug_red_adj = CONTEXT_REDS;     \
+    } while(0)
+#  else
+#    define ERTS_RBT_YIELD_STAT_INIT(YS) ERTS_RBT_YIELD_STAT_INIT__(YS)
+#  endif
+#endif
+
+
 #define ERTS_RBT_FUNC__(Name) \
     ERTS_RBT_CONCAT_MACRO_VALUES__(ERTS_RBT_PREFIX, _rbt_ ## Name)
 
@@ -1302,11 +1340,11 @@ ERTS_RBT_FUNC__(largest)(ERTS_RBT_T *root)
 static ERTS_INLINE int
 ERTS_RBT_FUNC__(foreach_unordered__)(ERTS_RBT_T **root,
 				     int destroying,
-				     void (*op)(ERTS_RBT_T *, void *),
+				     ERTS_RBT_CALLBACK_FOREACH_FUNC(op),
 				     void *arg,
-				     int yielding,
+                                     int yielding,
 				     ERTS_RBT_YIELD_STATE_T__ *ystate,
-				     Sint ylimit)
+				     Sint reds)
 {
     ERTS_RBT_T *c, *p, *x;
 
@@ -1314,13 +1352,17 @@ ERTS_RBT_FUNC__(foreach_unordered__)(ERTS_RBT_T **root,
 
     if (yielding && ystate->x) {
 	x = ystate->x;
+#ifdef DEBUG
+        if (ystate->debug_red_adj > 0)
+            ystate->debug_red_adj -= 100;
+#endif
 	ERTS_RBT_ASSERT(ystate->up);
 	goto restart_up;
     }
     else {
 	x = *root;
 	if (!x)
-	    return 0;
+	    return reds;
 	if (destroying)
 	    *root = NULL;
     }
@@ -1346,10 +1388,10 @@ ERTS_RBT_FUNC__(foreach_unordered__)(ERTS_RBT_T **root,
 #ifdef ERTS_RBT_DEBUG
 	    int cdir;
 #endif
-	    if (yielding && ylimit-- <= 0) {
+	    if (yielding && reds <= 0) {
 		ystate->x = x;
 		ystate->up = 1;
-		return 1;
+		return 0;
 	    }
 
 	restart_up:
@@ -1375,14 +1417,20 @@ ERTS_RBT_FUNC__(foreach_unordered__)(ERTS_RBT_T **root,
 	    }
 #endif
 
-	    (*op)(x, arg);
+            reds -= (*op)(x, arg, reds);
+#ifdef DEBUG
+            if (yielding)
+                reds -= ystate->debug_red_adj;
+#endif
 
 	    if (!p) {
+                /* Done */
 		if (yielding) {
 		    ystate->x = NULL;
 		    ystate->up = 0;
+                    return reds <= 0 ? 1 : reds;
 		}
-		return 0; /* Done */
+                return 1;
 	    }
 
 	    c = ERTS_RBT_GET_RIGHT(p);
@@ -1407,20 +1455,26 @@ static ERTS_INLINE int
 ERTS_RBT_FUNC__(foreach_ordered__)(ERTS_RBT_T **root,
 				   int from_small,
 				   int destroying,
-				   void (*op)(ERTS_RBT_T *, void *),
-				   void (*destroy)(ERTS_RBT_T *, void *),
+                                   ERTS_RBT_CALLBACK_FOREACH_FUNC(op),
+                                   ERTS_RBT_CALLBACK_FOREACH_FUNC(destroy),
 				   void *arg,
-				   int yielding,
+                                   int yielding,
 				   ERTS_RBT_YIELD_STATE_T__ *ystate,
-				   Sint ylimit)
+				   Sint reds)
 {
     ERTS_RBT_T *c, *p, *x;
 
     ERTS_RBT_ASSERT(!yielding || ystate);
     ERTS_RBT_ASSERT(!destroying || destroy);
+    ERTS_RBT_ASSERT(!yielding || yop);
+    ERTS_RBT_ASSERT(yielding || op);
 
     if (yielding && ystate->x) {
 	x = ystate->x;
+#ifdef DEBUG
+        if (ystate->debug_red_adj > 0)
+            ystate->debug_red_adj -= 100;
+#endif
 	if (ystate->up)
 	    goto restart_up;
 	else
@@ -1429,7 +1483,7 @@ ERTS_RBT_FUNC__(foreach_ordered__)(ERTS_RBT_T **root,
     else {
 	x = *root;
 	if (!x)
-	    return 0;
+	    return reds;
 	if (destroying)
 	    *root = NULL;
     }
@@ -1445,12 +1499,16 @@ ERTS_RBT_FUNC__(foreach_ordered__)(ERTS_RBT_T **root,
 		x = c;
 	    }
 
-	    (*op)(x, arg);
+            reds -= (*op)(x, arg, reds);
+#ifdef DEBUG
+            if (yielding)
+                reds -= ystate->debug_red_adj;
+#endif
 
-	    if (yielding && --ylimit <= 0) {
+	    if (yielding && reds <= 0) {
 		ystate->x = x;
 		ystate->up = 0;
-		return 1;
+		return 0;
 	    }
 
 	restart_down:
@@ -1472,12 +1530,16 @@ ERTS_RBT_FUNC__(foreach_ordered__)(ERTS_RBT_T **root,
 				     ? ERTS_RBT_GET_LEFT(p)
 				     : ERTS_RBT_GET_RIGHT(p)) == x);
 
-		    (*op)(p, arg);
+                    reds -= (*op)(p, arg, reds);
+#ifdef DEBUG
+                    if (yielding)
+                        reds -= ystate->debug_red_adj;
+#endif
 
-		    if (yielding && --ylimit <= 0) {
+		    if (yielding && reds <= 0) {
 			ystate->x = x;
 			ystate->up = 1;
-			return 1;
+			return 0;
 		    restart_up:
 			p = ERTS_RBT_GET_PARENT(x);
 		    }
@@ -1510,15 +1572,20 @@ ERTS_RBT_FUNC__(foreach_ordered__)(ERTS_RBT_T **root,
 		}
 #endif
 
-		(*destroy)(x, arg);
+		reds -= (*destroy)(x, arg, reds);
+#ifdef DEBUG
+                if (yielding)
+                    reds -= ystate->debug_red_adj;
+#endif
 	    }
 
 	    if (!p) {
 		if (yielding) {
 		    ystate->x = NULL;
 		    ystate->up = 0;
+                    return reds <= 0 ? 1 : reds;
 		}
-		return 0; /* Done */
+		return 1; /* Done */
 	    }
 	    x = p;
 	}
@@ -1531,7 +1598,7 @@ ERTS_RBT_FUNC__(foreach_ordered__)(ERTS_RBT_T **root,
 
 static ERTS_RBT_API_INLINE__ void
 ERTS_RBT_FUNC__(foreach)(ERTS_RBT_T *root,
-			 void (*op)(ERTS_RBT_T *, void *),
+			 ERTS_RBT_CALLBACK_FOREACH_FUNC(op),
 			 void *arg)
 {
     (void) ERTS_RBT_FUNC__(foreach_unordered__)(&root, 0, op, arg,
@@ -1544,7 +1611,7 @@ ERTS_RBT_FUNC__(foreach)(ERTS_RBT_T *root,
 
 static ERTS_RBT_API_INLINE__ void
 ERTS_RBT_FUNC__(foreach_small)(ERTS_RBT_T *root,
-			       void (*op)(ERTS_RBT_T *, void *),
+			       ERTS_RBT_CALLBACK_FOREACH_FUNC(op),
 			       void *arg)
 {
     (void) ERTS_RBT_FUNC__(foreach_ordered__)(&root, 1, 0,
@@ -1558,7 +1625,7 @@ ERTS_RBT_FUNC__(foreach_small)(ERTS_RBT_T *root,
 
 static ERTS_RBT_API_INLINE__ void
 ERTS_RBT_FUNC__(foreach_large)(ERTS_RBT_T *root,
-			       void (*op)(ERTS_RBT_T *, void *),
+			       ERTS_RBT_CALLBACK_FOREACH_FUNC(op),
 			       void *arg)
 {
     (void) ERTS_RBT_FUNC__(foreach_ordered__)(&root, 0, 0,
@@ -1572,13 +1639,13 @@ ERTS_RBT_FUNC__(foreach_large)(ERTS_RBT_T *root,
 
 static ERTS_RBT_API_INLINE__ int
 ERTS_RBT_FUNC__(foreach_yielding)(ERTS_RBT_T *root,
-				  void (*op)(ERTS_RBT_T *, void *),
+				  ERTS_RBT_CALLBACK_FOREACH_FUNC(op),
 				  void *arg,
 				  ERTS_RBT_YIELD_STATE_T__ *ystate,
-				  Sint ylimit)
+				  Sint reds)
 {
     return ERTS_RBT_FUNC__(foreach_unordered__)(&root, 0, op, arg,
-						1, ystate, ylimit);
+						1, ystate, reds);
 }
 
 #endif /* ERTS_RBT_WANT_FOREACH_YIELDING */
@@ -1587,14 +1654,14 @@ ERTS_RBT_FUNC__(foreach_yielding)(ERTS_RBT_T *root,
 
 static ERTS_RBT_API_INLINE__ int
 ERTS_RBT_FUNC__(foreach_small_yielding)(ERTS_RBT_T *root,
-					void (*op)(ERTS_RBT_T *, void *),
+					ERTS_RBT_CALLBACK_FOREACH_FUNC(op),
 					void *arg,
 					ERTS_RBT_YIELD_STATE_T__ *ystate,
-					Sint ylimit)
+					Sint reds)
 {
     return ERTS_RBT_FUNC__(foreach_ordered__)(&root, 1, 0,
 					      op, NULL, arg,
-					      1, ystate, ylimit);
+					      1, ystate, reds);
 }
 
 #endif /* ERTS_RBT_WANT_FOREACH_SMALL_YIELDING */
@@ -1603,14 +1670,14 @@ ERTS_RBT_FUNC__(foreach_small_yielding)(ERTS_RBT_T *root,
 
 static ERTS_RBT_API_INLINE__ int
 ERTS_RBT_FUNC__(foreach_large_yielding)(ERTS_RBT_T *root,
-					void (*op)(ERTS_RBT_T *, void *),
+					ERTS_RBT_CALLBACK_FOREACH_FUNC(op),
 					void *arg,
 					ERTS_RBT_YIELD_STATE_T__ *ystate,
-					Sint ylimit)
+					Sint reds)
 {
     return ERTS_RBT_FUNC__(foreach_ordered__)(&root, 0, 0,
 					      op, NULL, arg,
-					      1, ystate, ylimit);
+					      1, ystate, reds);
 }
 
 #endif /* ERTS_RBT_WANT_FOREACH_LARGE_YIELDING */
@@ -1619,11 +1686,11 @@ ERTS_RBT_FUNC__(foreach_large_yielding)(ERTS_RBT_T *root,
 
 static ERTS_RBT_API_INLINE__ void
 ERTS_RBT_FUNC__(foreach_destroy)(ERTS_RBT_T **root,
-				 void (*op)(ERTS_RBT_T *, void *),
+				 ERTS_RBT_CALLBACK_FOREACH_FUNC(op),
 				 void *arg)
 {
     (void) ERTS_RBT_FUNC__(foreach_unordered__)(root, 1, op, arg,
-						0, NULL, 0);
+                                                0, NULL, 0);
 }
 
 #endif /* ERTS_RBT_WANT_FOREACH_DESTROY */
@@ -1632,8 +1699,8 @@ ERTS_RBT_FUNC__(foreach_destroy)(ERTS_RBT_T **root,
 
 static ERTS_RBT_API_INLINE__ void
 ERTS_RBT_FUNC__(foreach_small_destroy)(ERTS_RBT_T **root,
-				       void (*op)(ERTS_RBT_T *, void *),
-				       void (*destr)(ERTS_RBT_T *, void *),
+				       ERTS_RBT_CALLBACK_FOREACH_FUNC(op),
+				       ERTS_RBT_CALLBACK_FOREACH_FUNC(destr),
 				       void *arg)
 {
     (void) ERTS_RBT_FUNC__(foreach_ordered__)(root, 1, 1,
@@ -1647,8 +1714,8 @@ ERTS_RBT_FUNC__(foreach_small_destroy)(ERTS_RBT_T **root,
 
 static ERTS_RBT_API_INLINE__ void
 ERTS_RBT_FUNC__(foreach_large_destroy)(ERTS_RBT_T **root,
-				       void (*op)(ERTS_RBT_T *, void *),
-				       void (*destr)(ERTS_RBT_T *, void *),
+				       ERTS_RBT_CALLBACK_FOREACH_FUNC(op),
+				       ERTS_RBT_CALLBACK_FOREACH_FUNC(destr),
 				       void *arg)
 {
     (void) ERTS_RBT_FUNC__(foreach_ordered__)(root, 0, 1,
@@ -1662,13 +1729,13 @@ ERTS_RBT_FUNC__(foreach_large_destroy)(ERTS_RBT_T **root,
 
 static ERTS_RBT_API_INLINE__ int
 ERTS_RBT_FUNC__(foreach_destroy_yielding)(ERTS_RBT_T **root,
-					  void (*op)(ERTS_RBT_T *, void *),
+					  ERTS_RBT_CALLBACK_FOREACH_FUNC(op),
 					  void *arg,
 					  ERTS_RBT_YIELD_STATE_T__ *ystate,
-					  Sint ylimit)
+					  Sint reds)
 {
     return ERTS_RBT_FUNC__(foreach_unordered__)(root, 1, op, arg,
-						1, ystate, ylimit);
+						1, ystate, reds);
 }
 
 #endif /* ERTS_RBT_WANT_FOREACH_DESTROY_YIELDING */
@@ -1677,15 +1744,15 @@ ERTS_RBT_FUNC__(foreach_destroy_yielding)(ERTS_RBT_T **root,
 
 static ERTS_RBT_API_INLINE__ int
 ERTS_RBT_FUNC__(foreach_small_destroy_yielding)(ERTS_RBT_T **root,
-						void (*op)(ERTS_RBT_T *, void *),
-						void (*destr)(ERTS_RBT_T *, void *),
+						ERTS_RBT_CALLBACK_FOREACH_FUNC(op),
+						ERTS_RBT_CALLBACK_FOREACH_FUNC(destr),
 						void *arg,
 						ERTS_RBT_YIELD_STATE_T__ *ystate,
-						Sint ylimit)
+						Sint reds)
 {
     return ERTS_RBT_FUNC__(foreach_ordered__)(root, 1, 1,
 					      op, destr, arg,
-					      1, ystate, ylimit);
+					      1, ystate, reds);
 }
 
 #endif /* ERTS_RBT_WANT_FOREACH_SMALL_DESTROY_YIELDING */
@@ -1694,15 +1761,15 @@ ERTS_RBT_FUNC__(foreach_small_destroy_yielding)(ERTS_RBT_T **root,
 
 static ERTS_RBT_API_INLINE__ int
 ERTS_RBT_FUNC__(foreach_large_destroy_yielding)(ERTS_RBT_T **root,
-						void (*op)(ERTS_RBT_T *, void *),
-						void (*destr)(ERTS_RBT_T *, void *),
+						ERTS_RBT_CALLBACK_FOREACH_FUNC(op),
+						ERTS_RBT_CALLBACK_FOREACH_FUNC(destr),
 						void *arg,
 						ERTS_RBT_YIELD_STATE_T__ *ystate,
-						Sint ylimit)
+						Sint reds)
 {
     return ERTS_RBT_FUNC__(foreach_ordered__)(root, 0, 1,
 					      op, destr, arg,
-					      1, ystate, ylimit);
+					      1, ystate, reds);
 }
 
 #endif /* ERTS_RBT_WANT_FOREACH_LARGE_DESTROY_YIELDING */
@@ -1855,6 +1922,7 @@ ERTS_RBT_FUNC__(hdbg_check_tree)(ERTS_RBT_T *root, ERTS_RBT_T *n)
 #ifdef ERTS_RBT_UNDEF
 #  undef ERTS_RBT_PREFIX
 #  undef ERTS_RBT_T
+#  undef ERTS_RBT_CALLBACK_FOREACH_FUNC
 #  undef ERTS_RBT_KEY_T
 #  undef ERTS_RBT_FLAGS_T
 #  undef ERTS_RBT_INIT_EMPTY_TNODE
diff --git a/erts/emulator/beam/erl_sched_spec_pre_alloc.h b/erts/emulator/beam/erl_sched_spec_pre_alloc.h
index 74cc966cbe..6f715ae80d 100644
--- a/erts/emulator/beam/erl_sched_spec_pre_alloc.h
+++ b/erts/emulator/beam/erl_sched_spec_pre_alloc.h
@@ -49,7 +49,7 @@ do {									\
 #endif
 
 #ifdef DEBUG
-extern Uint erts_no_schedulers;
+extern Uint ERTS_WRITE_UNLIKELY(erts_no_schedulers);
 #endif
 
 #define ERTS_SSPA_FORCE_THR_CHECK_PROGRESS 10
diff --git a/erts/emulator/beam/erl_time_sup.c b/erts/emulator/beam/erl_time_sup.c
index 29c698e34f..d26ea19494 100644
--- a/erts/emulator/beam/erl_time_sup.c
+++ b/erts/emulator/beam/erl_time_sup.c
@@ -1911,8 +1911,8 @@ typedef struct {
     ErtsTimeOffsetMonitorInfo *to_mon_info;
 } ErtsTimeOffsetMonitorContext;
 
-static void
-save_time_offset_monitor(ErtsMonitor *mon, void *vcntxt)
+static int
+save_time_offset_monitor(ErtsMonitor *mon, void *vcntxt, Sint reds)
 {
     ErtsTimeOffsetMonitorContext *cntxt;
     ErtsMonitorData *mdp = erts_monitor_to_data(mon);
@@ -1935,7 +1935,7 @@ save_time_offset_monitor(ErtsMonitor *mon, void *vcntxt)
 
     cntxt->to_mon_info[mix].ref
 	= make_internal_ref(&cntxt->to_mon_info[mix].heap[0]);
-
+    return 1;
 }
 
 static void
diff --git a/erts/emulator/beam/erl_trace.c b/erts/emulator/beam/erl_trace.c
index 2350d4c02f..f6f177887c 100644
--- a/erts/emulator/beam/erl_trace.c
+++ b/erts/emulator/beam/erl_trace.c
@@ -72,6 +72,7 @@ static ErtsTracer default_port_tracer;
 
 static Eterm system_monitor;
 static Eterm system_profile;
+static erts_atomic_t system_logger;
 
 #ifdef HAVE_ERTS_NOW_CPU
 int erts_cpu_timestamp;
@@ -340,6 +341,7 @@ void erts_init_trace(void) {
     default_port_trace_flags = F_INITIAL_TRACE_FLAGS;
     default_port_tracer = erts_tracer_nil;
     system_seq_tracer = erts_tracer_nil;
+    erts_atomic_init_nob(&system_logger, am_logger);
     init_sys_msg_dispatcher();
     init_tracer_nif();
 }
@@ -633,9 +635,11 @@ write_sys_msg_to_port(Eterm unused_to,
 		      Eterm message) {
     byte *buffer;
     byte *ptr;
-    unsigned size;
+    Uint size;
+
+    if (erts_encode_ext_size(message, &size) != ERTS_EXT_SZ_OK)
+	erts_exit(ERTS_ERROR_EXIT, "Internal error: System limit\n");
 
-    size = erts_encode_ext_size(message);
     buffer = (byte *) erts_alloc(ERTS_ALC_T_TMP, size);
 
     ptr = buffer;
@@ -709,7 +713,9 @@ trace_sched(Process *p, ErtsProcLocks locks, Eterm what)
     trace_sched_aux(p, locks, what);
 }
 
-/* Send {trace_ts, Pid, Send, Msg, DestPid, Timestamp}
+/* Send {trace_ts, Pid, Send, Msg, DestPid, PamResult, Timestamp}
+ * or   {trace_ts, Pid, Send, Msg, DestPid, Timestamp}
+ * or   {trace, Pid, Send, Msg, DestPid, PamResult}
  * or   {trace, Pid, Send, Msg, DestPid}
  *
  * where 'Send' is 'send' or 'send_to_non_existing_process'.
@@ -769,7 +775,9 @@ trace_send(Process *p, Eterm to, Eterm msg)
     erts_match_set_release_result_trace(p, pam_result);
 }
 
-/* Send {trace_ts, Pid, receive, Msg, Timestamp}
+/* Send {trace_ts, Pid, receive, Msg, PamResult, Timestamp}
+ * or   {trace_ts, Pid, receive, Msg, Timestamp}
+ * or   {trace, Pid, receive, Msg, PamResult}
  * or   {trace, Pid, receive, Msg}
  */
 void
@@ -2027,10 +2035,24 @@ enqueue_sys_msg(enum ErtsSysMsgType type,
     erts_mtx_unlock(&smq_mtx);
 }
 
+Eterm
+erts_get_system_logger(void)
+{
+    return (Eterm)erts_atomic_read_nob(&system_logger);
+}
+
+Eterm
+erts_set_system_logger(Eterm logger)
+{
+    if (logger != am_logger && logger != am_undefined && !is_internal_pid(logger))
+        return THE_NON_VALUE;
+    return (Eterm)erts_atomic_xchg_nob(&system_logger, logger);
+}
+
 void
 erts_queue_error_logger_message(Eterm from, Eterm msg, ErlHeapFragment *bp)
 {
-    enqueue_sys_msg(SYS_MSG_TYPE_ERRLGR, from, am_logger, msg, bp);
+    enqueue_sys_msg(SYS_MSG_TYPE_ERRLGR, from, erts_get_system_logger(), msg, bp);
 }
 
 void
@@ -2172,11 +2194,12 @@ sys_msg_dispatcher_wait(void *vwait_p)
     erts_mtx_unlock(&smq_mtx);
 }
 
+static ErtsSysMsgQ *local_sys_message_queue = NULL;
+
 static void *
 sys_msg_dispatcher_func(void *unused)
 {
     ErtsThrPrgrCallbacks callbacks;
-    ErtsSysMsgQ *local_sys_message_queue = NULL;
     ErtsThrPrgrData *tpd;
     int wait = 0;
 
@@ -2184,6 +2207,8 @@ sys_msg_dispatcher_func(void *unused)
     erts_lc_set_thread_name("system message dispatcher");
 #endif
 
+    local_sys_message_queue = NULL;
+
     callbacks.arg = (void *) &wait;
     callbacks.wakeup = sys_msg_dispatcher_wakeup;
     callbacks.prepare_wait = sys_msg_dispatcher_prep_wait;
@@ -2240,6 +2265,8 @@ sys_msg_dispatcher_func(void *unused)
 	    Process *proc = NULL;
 	    Port *port = NULL;
 
+            ASSERT(is_value(smqp->msg));
+
 	    if (erts_thr_progress_update(tpd))
 		erts_thr_progress_leader_update(tpd);
 
@@ -2271,7 +2298,7 @@ sys_msg_dispatcher_func(void *unused)
 		}
 		break;
 	    case SYS_MSG_TYPE_ERRLGR:
-		receiver = am_logger;
+		receiver = smqp->to;
 		break;
 	    default:
 		receiver = NIL;
@@ -2285,8 +2312,15 @@ sys_msg_dispatcher_func(void *unused)
 	    if (is_internal_pid(receiver)) {
 		proc = erts_pid2proc(NULL, 0, receiver, proc_locks);
 		if (!proc) {
-		    /* Bad tracer */
-		    goto failure;
+                    if (smqp->type == SYS_MSG_TYPE_ERRLGR) {
+                        /* Bad logger process, send to kernel 'logger' process */
+                        erts_set_system_logger(am_logger);
+                        receiver = erts_get_system_logger();
+                        goto logger;
+                    } else {
+                        /* Bad tracer */
+                        goto failure;
+                    }
 		}
 		else {
 		    ErtsMessage *mp;
@@ -2299,9 +2333,9 @@ sys_msg_dispatcher_func(void *unused)
 #endif
 		    erts_proc_unlock(proc, proc_locks);
 		}
-	    }
-	    else if (receiver == am_logger) {
-		proc = erts_whereis_process(NULL,0,receiver,proc_locks,0);
+	    } else if (receiver == am_logger) {
+            logger:
+		proc = erts_whereis_process(NULL,0,am_logger,proc_locks,0);
 		if (!proc)
 		    goto failure;
 		else if (smqp->from == proc->common.id)
@@ -2309,7 +2343,10 @@ sys_msg_dispatcher_func(void *unused)
 		else
 		    goto queue_proc_msg;
 	    }
-	    else if (is_internal_port(receiver)) {
+            else if (receiver == am_undefined) {
+                goto drop_sys_msg;
+	    }
+            else if (is_internal_port(receiver)) {
 		port = erts_thr_id2port_sflgs(receiver,
 					      ERTS_PORT_SFLGS_INVALID_TRACER_LOOKUP);
 		if (!port)
@@ -2342,6 +2379,7 @@ sys_msg_dispatcher_func(void *unused)
 		erts_fprintf(stderr, "dropped\n");
 #endif
 	    }
+            smqp->msg = THE_NON_VALUE;
 	}
     }
 
@@ -2349,32 +2387,38 @@ sys_msg_dispatcher_func(void *unused)
 }
 
 void
-erts_foreach_sys_msg_in_q(void (*func)(Eterm,
-				       Eterm,
-				       Eterm,
-				       ErlHeapFragment *))
+erts_debug_foreach_sys_msg_in_q(void (*func)(Eterm,
+                                             Eterm,
+                                             Eterm,
+                                             ErlHeapFragment *))
 {
-    ErtsSysMsgQ *sm;
-    erts_mtx_lock(&smq_mtx);
-    for (sm = sys_message_queue; sm; sm = sm->next) {
-	Eterm to;
-	switch (sm->type) {
-	case SYS_MSG_TYPE_SYSMON:
-	    to = erts_get_system_monitor();
-	    break;
-	case SYS_MSG_TYPE_SYSPROF:
-	    to = erts_get_system_profile();
-	    break;
-	case SYS_MSG_TYPE_ERRLGR:
-	    to = am_logger;
-	    break;
-	default:
-	    to = NIL;
-	    break;
-	}
-	(*func)(sm->from, to, sm->msg, sm->bp);
+    ErtsSysMsgQ *smq[] = {sys_message_queue, local_sys_message_queue};
+    int i;
+
+    ERTS_LC_ASSERT(erts_thr_progress_is_blocking());
+
+    for (i = 0; i < sizeof(smq)/sizeof(smq[0]); i++) {
+        ErtsSysMsgQ *sm;
+        for (sm = smq[i]; sm; sm = sm->next) {
+            Eterm to;
+            switch (sm->type) {
+            case SYS_MSG_TYPE_SYSMON:
+                to = erts_get_system_monitor();
+                break;
+            case SYS_MSG_TYPE_SYSPROF:
+                to = erts_get_system_profile();
+                break;
+            case SYS_MSG_TYPE_ERRLGR:
+                to = erts_get_system_logger();
+                break;
+            default:
+                to = NIL;
+                break;
+            }
+            if (is_value(sm->msg))
+                (*func)(sm->from, to, sm->msg, sm->bp);
+        }
     }
-    erts_mtx_unlock(&smq_mtx);
 }
 
 
diff --git a/erts/emulator/beam/erl_trace.h b/erts/emulator/beam/erl_trace.h
index bccf31606e..af38ef52db 100644
--- a/erts/emulator/beam/erl_trace.h
+++ b/erts/emulator/beam/erl_trace.h
@@ -90,10 +90,12 @@ int erts_is_tracer_valid(Process* p);
 void erts_check_my_tracer_proc(Process *);
 void erts_block_sys_msg_dispatcher(void);
 void erts_release_sys_msg_dispatcher(void);
-void erts_foreach_sys_msg_in_q(void (*func)(Eterm,
-					    Eterm,
-					    Eterm,
-					    ErlHeapFragment *));
+void erts_debug_foreach_sys_msg_in_q(void (*func)(Eterm,
+                                                  Eterm,
+                                                  Eterm,
+                                                  ErlHeapFragment *));
+Eterm erts_set_system_logger(Eterm);
+Eterm erts_get_system_logger(void);
 void erts_queue_error_logger_message(Eterm, Eterm, ErlHeapFragment *);
 void erts_send_sys_msg_proc(Eterm, Eterm, Eterm, ErlHeapFragment *);
 
diff --git a/erts/emulator/beam/erl_unicode.c b/erts/emulator/beam/erl_unicode.c
index d225916ac5..1d6869a7cd 100644
--- a/erts/emulator/beam/erl_unicode.c
+++ b/erts/emulator/beam/erl_unicode.c
@@ -1358,11 +1358,9 @@ Uint erts_atom_to_string_length(Eterm atom)
     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);
+        ASSERT(ares == ERTS_UTF8_OK); (void)ares;
 
         return num_chars;
     }
diff --git a/erts/emulator/beam/erl_utils.h b/erts/emulator/beam/erl_utils.h
index 880febba8b..430ac305c5 100644
--- a/erts/emulator/beam/erl_utils.h
+++ b/erts/emulator/beam/erl_utils.h
@@ -69,7 +69,6 @@ int erts_fit_in_bits_int32(Sint32);
 int erts_fit_in_bits_uint(Uint);
 Sint erts_list_length(Eterm);
 int erts_is_builtin(Eterm, Eterm, int);
-Uint32 block_hash(byte *, unsigned, Uint32);
 Uint32 make_hash2(Eterm);
 Uint32 make_hash(Eterm);
 Uint32 make_internal_hash(Eterm, Uint32 salt);
diff --git a/erts/emulator/beam/erl_vm.h b/erts/emulator/beam/erl_vm.h
index 4089fac48e..e623148587 100644
--- a/erts/emulator/beam/erl_vm.h
+++ b/erts/emulator/beam/erl_vm.h
@@ -41,8 +41,8 @@
 #define MAX_REG 1024            /* Max number of x(N) registers used */
 
 /*
- * The new arithmetic operations need some extra X registers in the register array.
- * so does the gc_bif's (i_gc_bif3 need 3 extra).
+ * The new trapping length/1 implementation need 3 extra registers in the
+ * register array.
  */
 #define ERTS_X_REGS_ALLOCATED (MAX_REG+3)
 
@@ -67,9 +67,10 @@
                  (unsigned long)HEAP_TOP(p),(sz),__FILE__,__LINE__)),   \
  */
 #  ifdef CHECK_FOR_HOLES
-#    define INIT_HEAP_MEM(p,sz) erts_set_hole_marker(HEAP_TOP(p), (sz))
+Eterm* erts_set_hole_marker(Eterm* ptr, Uint sz);
+#    define INIT_HEAP_MEM(p,sz) erts_set_hole_marker(p, (sz))
 #  else
-#    define INIT_HEAP_MEM(p,sz) sys_memset(HEAP_TOP(p),0x01,(sz)*sizeof(Eterm*))
+#    define INIT_HEAP_MEM(p,sz) sys_memset(p,0x01,(sz)*sizeof(Eterm*))
 #  endif
 #else
 #  define INIT_HEAP_MEM(p,sz) ((void)0)
@@ -91,7 +92,7 @@
      ErtsHAllocLockCheck(p),					      \
      (IS_FORCE_HEAP_FRAGS || (((HEAP_LIMIT(p) - HEAP_TOP(p)) < (sz))) \
       ? erts_heap_alloc((p),(sz),(xtra))                              \
-      : (INIT_HEAP_MEM(p,sz),		                              \
+      : (INIT_HEAP_MEM(HEAP_TOP(p),sz),                               \
          HEAP_TOP(p) = HEAP_TOP(p) + (sz), HEAP_TOP(p) - (sz))))
 
 #define HAlloc(P, SZ) HAllocX(P,SZ,0)
@@ -146,6 +147,21 @@
       (HEAP_TOP(p) = HEAP_TOP(p) + (sz), HEAP_TOP(p) - (sz))))
 #endif
 
+/*
+ * Always allocate in a heap fragment, never on the heap.
+ */
+#if defined(VALGRIND)
+/* Running under valgrind, allocate exactly as much as needed.*/
+#  define HeapFragOnlyAlloc(p, sz)              \
+  (ASSERT((sz) >= 0),                           \
+   ErtsHAllocLockCheck(p),                      \
+   erts_heap_alloc((p),(sz),0))
+#else
+#  define HeapFragOnlyAlloc(p, sz)              \
+  (ASSERT((sz) >= 0),                           \
+   ErtsHAllocLockCheck(p),                      \
+   erts_heap_alloc((p),(sz),512))
+#endif
 
 /*
  * Description for each instruction (defined here because the name and
diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c
index 9a66e491f3..ce61cdf040 100644
--- a/erts/emulator/beam/external.c
+++ b/erts/emulator/beam/external.c
@@ -102,7 +102,7 @@ static byte* enc_term(ErtsAtomCacheMap *, Eterm, byte*, Uint32, struct erl_off_h
 struct TTBEncodeContext_;
 static int enc_term_int(struct TTBEncodeContext_*,ErtsAtomCacheMap *acmp, Eterm obj, byte* ep, Uint32 dflags,
 			struct erl_off_heap_header** off_heap, Sint *reds, byte **res);
-static Uint is_external_string(Eterm obj, int* p_is_string);
+static int is_external_string(Eterm obj, Uint* lenp);
 static byte* enc_atom(ErtsAtomCacheMap *, Eterm, byte*, Uint32);
 static byte* enc_pid(ErtsAtomCacheMap *, Eterm, byte*, Uint32);
 struct B2TContext_t;
@@ -112,13 +112,13 @@ static byte* dec_pid(ErtsDistExternal *, ErtsHeapFactory*, byte*, Eterm*, byte t
 static Sint decoded_size(byte *ep, byte* endp, int internal_tags, struct B2TContext_t*);
 static BIF_RETTYPE term_to_binary_trap_1(BIF_ALIST_1);
 
-static Eterm erts_term_to_binary_int(Process* p, Eterm Term, int level, Uint flags, 
-				     Binary *context_b);
+static Eterm erts_term_to_binary_int(Process* p, Eterm Term, Eterm opts, int level,
+                                     Uint flags, Binary *context_b);
 
 static Uint encode_size_struct2(ErtsAtomCacheMap *, Eterm, unsigned);
 struct TTBSizeContext_;
-static int encode_size_struct_int(struct TTBSizeContext_*, ErtsAtomCacheMap *acmp, Eterm obj,
-				  unsigned dflags, Sint *reds, Uint *res);
+static ErtsExtSzRes encode_size_struct_int(struct TTBSizeContext_*, ErtsAtomCacheMap *acmp,
+                                           Eterm obj, unsigned dflags, Sint *reds, Uint *res);
 
 static Export binary_to_term_trap_export;
 static BIF_RETTYPE binary_to_term_trap_1(BIF_ALIST_1);
@@ -262,19 +262,12 @@ erts_finalize_atom_cache_map(ErtsAtomCacheMap *acmp, Uint32 dflags)
     if (acmp) {
 	int long_atoms = 0; /* !0 if one or more atoms are longer than 255. */
 	int i;
-	int sz;
-	int fix_sz
-	    = 1 /* VERSION_MAGIC */
-	    + 1 /* DIST_HEADER */
-	    + 1 /* dist header flags */
-	    + 1 /* number of internal cache entries */
-	    ;
+	int sz = 0;
 	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;
-	sz = fix_sz;
+	min_sz = (2+4)*acmp->sz;
 	for (i = 0; i < acmp->sz; i++) {
 	    Atom *a;
 	    Eterm atom;
@@ -302,17 +295,28 @@ erts_finalize_atom_cache_map(ErtsAtomCacheMap *acmp, Uint32 dflags)
 }
 
 Uint
-erts_encode_ext_dist_header_size(ErtsAtomCacheMap *acmp)
+erts_encode_ext_dist_header_size(ErtsAtomCacheMap *acmp, Uint fragments)
 {
     if (!acmp)
 	return 0;
     else {
+        int fix_sz
+            = 1 /* VERSION_MAGIC */
+            + 1 /* DIST_HEADER */
+            + 1 /* dist header flags */
+            + 1 /* number of internal cache entries */
+            ;
 	ASSERT(acmp->hdr_sz >= 0);
-	return acmp->hdr_sz;
+        if (fragments > 1)
+            fix_sz += 8 /* sequence id */
+                + 8 /* number of fragments */
+                ;
+        return fix_sz + acmp->hdr_sz;
     }
 }
 
-byte *erts_encode_ext_dist_header_setup(byte *ctl_ext, ErtsAtomCacheMap *acmp)
+byte *erts_encode_ext_dist_header_setup(byte *ctl_ext, ErtsAtomCacheMap *acmp,
+                                        Uint fragments, Eterm from)
 {
     /* Maximum number of atom must be less than the maximum of a 32 bits
        unsigned integer. Check is done in erl_init.c, erl_start function. */
@@ -346,12 +350,37 @@ byte *erts_encode_ext_dist_header_setup(byte *ctl_ext, ErtsAtomCacheMap *acmp)
 	put_int8(acmp->sz, ep);
 	--ep;
 	put_int8(dist_hdr_flags, ep);
-	*--ep = DIST_HEADER;
-	*--ep = VERSION_MAGIC;
+        if (fragments > 1) {
+            ASSERT(is_pid(from));
+            ep -= 8;
+            put_int64(fragments, ep);
+            ep -= 8;
+            put_int64(from, ep);
+            *--ep = DIST_FRAG_HEADER;
+        } else {
+            *--ep = DIST_HEADER;
+        }
+        *--ep = VERSION_MAGIC;
 	return ep;
     }
 }
 
+byte *erts_encode_ext_dist_header_fragment(byte **hdrpp,
+                                           Uint fragment,
+                                           Eterm from)
+{
+    byte *ep = *hdrpp, *start = ep;
+    ASSERT(is_pid(from));
+    *ep++ = VERSION_MAGIC;
+    *ep++ = DIST_FRAG_CONT;
+    put_int64(from, ep);
+    ep += 8;
+    put_int64(fragment, ep);
+    ep += 8;
+    *hdrpp = ep;
+    return start;
+}
+
 
 #define PASS_THROUGH 'p'
 
@@ -365,7 +394,8 @@ Sint erts_encode_ext_dist_header_finalize(ErtsDistOutputBuf* ob,
     int ci, sz;
     byte dist_hdr_flags;
     int long_atoms;
-    register byte *ep = ob->extp;
+    Uint64 seq_id = 0, frag_id = 0;
+    register byte *ep = ob->hdrp ? ob->hdrp : ob->extp;
     ASSERT(dflags & DFLAG_UTF8_ATOMS);
 
     /*
@@ -416,7 +446,7 @@ Sint erts_encode_ext_dist_header_finalize(ErtsDistOutputBuf* ob,
         }
         goto done;
     }
-    else if (ep[1] != DIST_HEADER) {
+    else if (ep[1] != DIST_HEADER && ep[1] != DIST_FRAG_HEADER && ep[1] != DIST_FRAG_CONT) {
         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 */
@@ -424,6 +454,17 @@ Sint erts_encode_ext_dist_header_finalize(ErtsDistOutputBuf* ob,
         goto done;
     }
 
+    if (ep[1] == DIST_FRAG_CONT) {
+        ep = ob->extp;
+        goto done;
+    } else if (ep[1] == DIST_FRAG_HEADER) {
+        /* skip the seq id and frag id */
+        seq_id = get_int64(&ep[2]);
+        ep += 8;
+        frag_id = get_int64(&ep[2]);
+        ep += 8;
+    }
+
     dist_hdr_flags = ep[2];
     long_atoms = ERTS_DIST_HDR_LONG_ATOMS_FLG & ((int) dist_hdr_flags);
 
@@ -546,57 +587,66 @@ Sint erts_encode_ext_dist_header_finalize(ErtsDistOutputBuf* ob,
     }
     --ep;
     put_int8(ci, ep);
-    *--ep = DIST_HEADER;
+    if (seq_id) {
+        ep -= 8;
+        put_int64(frag_id, ep);
+        ep -= 8;
+        put_int64(seq_id, ep);
+        *--ep = DIST_FRAG_HEADER;
+    } else {
+        *--ep = DIST_HEADER;
+    }
     *--ep = VERSION_MAGIC;
 done:
     ob->extp = ep;
-    ASSERT(&ob->data[0] <= ob->extp && ob->extp < ob->ext_endp);
+    ASSERT((byte*)ob->bin->orig_bytes <= ob->extp && ob->extp < ob->ext_endp);
     return reds < 0 ? 0 : reds;
 }
 
-int erts_encode_dist_ext_size(Eterm term, Uint32 flags, ErtsAtomCacheMap *acmp,
-			      Uint* szp)
+ErtsExtSzRes
+erts_encode_dist_ext_size(Eterm term, Uint32 flags, ErtsAtomCacheMap *acmp, Uint* szp)
 {
     Uint sz;
-    if (encode_size_struct_int(NULL, acmp, term, flags, NULL, &sz)) {
-	return -1;
-    } else {
+    ErtsExtSzRes res = encode_size_struct_int(NULL, acmp, term, flags, NULL, &sz);
+    if (res == ERTS_EXT_SZ_OK) {
 #ifndef ERTS_DEBUG_USE_DIST_SEP
 	if (!(flags & (DFLAG_DIST_HDR_ATOM_CACHE | DFLAG_NO_MAGIC)))
 #endif
 	    sz++ /* VERSION_MAGIC */;
 
 	*szp += sz;
-	return 0;
     }
+    return res;
 }
 
-int erts_encode_dist_ext_size_int(Eterm term, struct erts_dsig_send_context* ctx, Uint* szp)
+ErtsExtSzRes
+erts_encode_dist_ext_size_ctx(Eterm term, ErtsDSigSendContext *ctx, Uint* szp)
 {
     Uint sz;
-    if (encode_size_struct_int(&ctx->u.sc, ctx->acmp, term, ctx->flags, &ctx->reds, &sz)) {
-	return -1;
-    } else {
+    ErtsExtSzRes res = encode_size_struct_int(&ctx->u.sc, ctx->acmp, term,
+                                              ctx->flags, &ctx->reds, &sz);
+    if (res == ERTS_EXT_SZ_OK) {
 #ifndef ERTS_DEBUG_USE_DIST_SEP
 	if (!(ctx->flags & (DFLAG_DIST_HDR_ATOM_CACHE | DFLAG_NO_MAGIC)))
 #endif
 	    sz++ /* VERSION_MAGIC */;
 
 	*szp += sz;
-	return 0;
     }
+    return res;
 }
 
-Uint erts_encode_ext_size(Eterm term)
+ErtsExtSzRes erts_encode_ext_size_2(Eterm term, unsigned dflags, Uint *szp)
 {
-    return encode_size_struct2(NULL, term, TERM_TO_BINARY_DFLAGS)
-	+ 1 /* VERSION_MAGIC */;
+    ErtsExtSzRes res = encode_size_struct_int(NULL, NULL, term, dflags,
+                                              NULL, szp);
+    (*szp)++ /* VERSION_MAGIC */;
+    return res;
 }
 
-Uint erts_encode_ext_size_2(Eterm term, unsigned dflags)
+ErtsExtSzRes erts_encode_ext_size(Eterm term, Uint *szp)
 {
-    return encode_size_struct2(NULL, term, dflags)
-        + 1 /* VERSION_MAGIC */;
+    return erts_encode_ext_size_2(term, TERM_TO_BINARY_DFLAGS, szp);
 }
 
 Uint erts_encode_ext_size_ets(Eterm term)
@@ -635,56 +685,110 @@ byte* erts_encode_ext_ets(Eterm term, byte *ep, struct erl_off_heap_header** off
 		    off_heap);
 }
 
-ErtsDistExternal *
-erts_make_dist_ext_copy(ErtsDistExternal *edep, Uint xsize)
+
+static Uint
+dist_ext_size(ErtsDistExternal *edep)
 {
-    size_t align_sz;
-    size_t dist_ext_sz;
-    size_t ext_sz;
-    byte *ep;
-    ErtsDistExternal *new_edep;
+    Uint sz = sizeof(ErtsDistExternal);
 
-    dist_ext_sz = ERTS_DIST_EXT_SIZE(edep);
-    ASSERT(edep->ext_endp && edep->extp);
-    ASSERT(edep->ext_endp >= edep->extp);
-    ext_sz = edep->ext_endp - edep->extp;
+    ASSERT(edep->data->ext_endp && edep->data->extp);
+    ASSERT(edep->data->ext_endp >= edep->data->extp);
 
-    align_sz = ERTS_EXTRA_DATA_ALIGN_SZ(dist_ext_sz + ext_sz);
+    if (edep->flags & ERTS_DIST_EXT_ATOM_TRANS_TAB) {
+        ASSERT(0 <= edep->attab.size \
+               && edep->attab.size <= ERTS_ATOM_CACHE_SIZE);
+        sz -= sizeof(Eterm)*(ERTS_ATOM_CACHE_SIZE - edep->attab.size);
+    } else {
+        sz -= sizeof(ErtsAtomTranslationTable);
+    }
+    ASSERT(sz % 4 == 0);
+    return sz;
+}
 
-    new_edep = erts_alloc(ERTS_ALC_T_EXT_TERM_DATA,
-			  dist_ext_sz + ext_sz + align_sz + xsize);
+Uint
+erts_dist_ext_size(ErtsDistExternal *edep)
+{
+    Uint sz = dist_ext_size(edep);
+    sz += 4;  /* may need to pad to 8-byte-align ErtsDistExternalData */
+    sz += edep->data[0].frag_id * sizeof(ErtsDistExternalData);
+    return sz;
+}
+
+Uint
+erts_dist_ext_data_size(ErtsDistExternal *edep)
+{
+    Uint sz = 0, i;
+    for (i = 0; i < edep->data->frag_id; i++)
+        sz += edep->data[i].ext_endp - edep->data[i].extp;
+    return sz;
+}
+
+void
+erts_dist_ext_frag(ErtsDistExternalData *ede_datap, ErtsDistExternal *edep)
+{
+    ErtsDistExternalData *new_ede_datap = &edep->data[edep->data->frag_id - ede_datap->frag_id];
+    sys_memcpy(new_ede_datap, ede_datap, sizeof(ErtsDistExternalData));
+
+    /* If the data is not backed by a binary, we create one here to keep
+       things simple. Only custom distribution drivers should use lists. */
+    if (new_ede_datap->binp == NULL) {
+        size_t ext_sz = ede_datap->ext_endp - ede_datap->extp;
+        new_ede_datap->binp = erts_bin_nrml_alloc(ext_sz);
+        sys_memcpy(new_ede_datap->binp->orig_bytes, (void *) ede_datap->extp, ext_sz);
+        new_ede_datap->extp = (byte*)new_ede_datap->binp->orig_bytes;
+        new_ede_datap->ext_endp = (byte*)new_ede_datap->binp->orig_bytes + ext_sz;
+    } else {
+        erts_refc_inc(&new_ede_datap->binp->intern.refc, 2);
+    }
+}
+
+void
+erts_make_dist_ext_copy(ErtsDistExternal *edep, ErtsDistExternal *new_edep)
+{
+    size_t dist_ext_sz = dist_ext_size(edep);
+    byte *ep;
 
     ep = (byte *) new_edep;
     sys_memcpy((void *) ep, (void *) edep, dist_ext_sz);
+    erts_ref_dist_entry(new_edep->dep);
+
     ep += dist_ext_sz;
-    if (new_edep->dep)
-        erts_ref_dist_entry(new_edep->dep);
-    new_edep->extp = ep;
-    new_edep->ext_endp = ep + ext_sz;
-    new_edep->heap_size = -1;
-    sys_memcpy((void *) ep, (void *) edep->extp, ext_sz);
-    return new_edep;
+    ep += (UWord)ep & 4; /* 8-byte alignment for ErtsDistExternalData */
+    ASSERT((UWord)ep % 8 == 0);
+
+    new_edep->data = (ErtsDistExternalData*)ep;
+    sys_memzero(new_edep->data, sizeof(ErtsDistExternalData) * edep->data->frag_id);
+    new_edep->data->frag_id = edep->data->frag_id;
+    erts_dist_ext_frag(edep->data, new_edep);
 }
 
-int
+void
+erts_free_dist_ext_copy(ErtsDistExternal *edep)
+{
+    int i;
+    erts_deref_dist_entry(edep->dep);
+    for (i = 0; i < edep->data->frag_id; i++)
+        if (edep->data[i].binp)
+            erts_bin_release(edep->data[i].binp);
+}
+
+ErtsPrepDistExtRes
 erts_prepare_dist_ext(ErtsDistExternal *edep,
 		      byte *ext,
 		      Uint size,
+                      Binary *binp,
 		      DistEntry *dep,
                       Uint32 conn_id,
 		      ErtsAtomCache *cache)
 {
     register byte *ep;
 
-    edep->heap_size = -1;
-    edep->flags = 0;
-    edep->dep = dep;
-
     ASSERT(dep);
     erts_de_rlock(dep);
 
     ASSERT(dep->flags & DFLAG_UTF8_ATOMS);
 
+
     if ((dep->state != ERTS_DE_STATE_CONNECTED &&
          dep->state != ERTS_DE_STATE_PENDING)
         || dep->connection_id != conn_id) {
@@ -697,7 +801,7 @@ erts_prepare_dist_ext(ErtsDistExternal *edep,
         ext++;
         size--;
     }
-    edep->ext_endp = ext + size;
+
     ep = ext;
 
     if (size < 2)
@@ -713,16 +817,33 @@ erts_prepare_dist_ext(ErtsDistExternal *edep,
 	goto fail;
     }
 
+    edep->heap_size = -1;
+    edep->flags = 0;
+    edep->dep = dep;
+    edep->connection_id = conn_id;
+    edep->data->ext_endp = ext+size;
+    edep->data->binp = binp;
+    edep->data->seq_id = 0;
+    edep->data->frag_id = 1;
+
     if (dep->flags & DFLAG_DIST_HDR_ATOM_CACHE)
         edep->flags |= ERTS_DIST_EXT_DFLAG_HDR;
 
-    edep->connection_id = dep->connection_id;
-
-    if (ep[1] != DIST_HEADER) {
+    if (ep[1] != DIST_HEADER && ep[1] != DIST_FRAG_HEADER && ep[1] != DIST_FRAG_CONT) {
 	if (edep->flags & ERTS_DIST_EXT_DFLAG_HDR)
 	    goto bad_hdr;
 	edep->attab.size = 0;
-	edep->extp = ext;
+	edep->data->extp = ext;
+    }
+    else if (ep[1] == DIST_FRAG_CONT) {
+        if (!(dep->flags & DFLAG_FRAGMENTS))
+            goto bad_hdr;
+        edep->attab.size = 0;
+	edep->data->extp = ext + 1 + 1 + 8 + 8;
+        edep->data->seq_id = get_int64(&ep[2]);
+        edep->data->frag_id = get_int64(&ep[2+8]);
+        erts_de_runlock(dep);
+        return ERTS_PREP_DIST_EXT_FRAG_CONT;
     }
     else {
 	int tix;
@@ -731,9 +852,17 @@ erts_prepare_dist_ext(ErtsDistExternal *edep,
 	if (!(edep->flags & ERTS_DIST_EXT_DFLAG_HDR))
 	    goto bad_hdr;
 
+        if (ep[1] == DIST_FRAG_HEADER) {
+            if (!(dep->flags & DFLAG_FRAGMENTS))
+                goto bad_hdr;
+            edep->data->seq_id = get_int64(&ep[2]);
+            edep->data->frag_id = get_int64(&ep[2+8]);
+            ep += 16;
+        }
+
 #undef CHKSIZE
 #define CHKSIZE(SZ) \
-	do { if ((SZ) > edep->ext_endp - ep) goto bad_hdr; } while(0)
+	do { if ((SZ) > edep->data->ext_endp - ep) goto bad_hdr; } while(0)
 
 	CHKSIZE(1+1+1);
 	ep += 2;
@@ -863,7 +992,7 @@ erts_prepare_dist_ext(ErtsDistExternal *edep,
 #endif
 	    }
 	}
-	edep->extp = ep;
+	edep->data->extp = ep;
 #ifdef ERTS_DEBUG_USE_DIST_SEP
 	if (*ep != VERSION_MAGIC)
 	    goto bad_hdr;
@@ -888,7 +1017,7 @@ erts_prepare_dist_ext(ErtsDistExternal *edep,
 		      erts_this_node->sysname,
 		      edep->dep->sysname,
 		      dist_entry_channel_no(edep->dep));
-	for (ep = ext; ep < edep->ext_endp; ep++)
+	for (ep = ext; ep < edep->data->ext_endp; ep++)
 	    erts_dsprintf(dsbufp, ep != ext ? ",%b8u" : "<<%b8u", *ep);
 	erts_dsprintf(dsbufp, ">>");
 	erts_send_warning_to_logger_nogl(dsbufp);
@@ -913,9 +1042,9 @@ bad_dist_ext(ErtsDistExternal *edep)
 		      erts_this_node->sysname,
 		      dep->sysname,
 		      dist_entry_channel_no(dep));
-	for (ep = edep->extp; ep < edep->ext_endp; ep++)
+	for (ep = edep->data->extp; ep < edep->data->ext_endp; ep++)
 	    erts_dsprintf(dsbufp,
-			  ep != edep->extp ? ",%b8u" : "<<...,%b8u",
+			  ep != edep->data->extp ? ",%b8u" : "<<...,%b8u",
 			  *ep);
 	erts_dsprintf(dsbufp, ">>\n");
 	erts_dsprintf(dsbufp, "ATOM_CACHE_REF translations: ");
@@ -933,30 +1062,59 @@ bad_dist_ext(ErtsDistExternal *edep)
 }
 
 Sint
-erts_decode_dist_ext_size(ErtsDistExternal *edep)
+erts_decode_dist_ext_size(ErtsDistExternal *edep, int kill_connection, int payload)
 {
     Sint res;
     byte *ep;
-    if (edep->extp >= edep->ext_endp)
+
+    if (edep->data->frag_id > 1 && payload) {
+        Uint sz = 0;
+        Binary *bin;
+        int i;
+        byte *ep;
+
+        for (i = 0; i < edep->data->frag_id; i++)
+            sz += edep->data[i].ext_endp - edep->data[i].extp;
+
+        bin = erts_bin_nrml_alloc(sz);
+        ep = (byte*)bin->orig_bytes;
+
+        for (i = 0; i < edep->data->frag_id; i++) {
+            sys_memcpy(ep, edep->data[i].extp, edep->data[i].ext_endp - edep->data[i].extp);
+            ep += edep->data[i].ext_endp - edep->data[i].extp;
+            erts_bin_release(edep->data[i].binp);
+            edep->data[i].binp = NULL;
+            edep->data[i].extp = NULL;
+            edep->data[i].ext_endp = NULL;
+        }
+
+        edep->data->frag_id = 1;
+        edep->data->extp = (byte*)bin->orig_bytes;
+        edep->data->ext_endp = ep;
+        edep->data->binp = bin;
+    }
+
+    if (edep->data->extp >= edep->data->ext_endp)
 	goto fail;
 #ifndef ERTS_DEBUG_USE_DIST_SEP
     if (edep->flags & ERTS_DIST_EXT_DFLAG_HDR) {
-	if (*edep->extp == VERSION_MAGIC)
+	if (*edep->data->extp == VERSION_MAGIC)
 	    goto fail;
-	ep = edep->extp;
+	ep = edep->data->extp;
     }
     else
 #endif
     {
-	if (*edep->extp != VERSION_MAGIC)
+	if (*edep->data->extp != VERSION_MAGIC)
 	    goto fail;
-	ep = edep->extp+1;
+	ep = edep->data->extp+1;
     }
-    res = decoded_size(ep, edep->ext_endp, 0, NULL);
+    res = decoded_size(ep, edep->data->ext_endp, 0, NULL);
     if (res >= 0)
 	return res;
  fail:
-    bad_dist_ext(edep);
+    if (kill_connection)
+        bad_dist_ext(edep);
     return -1;
 }
 
@@ -982,12 +1140,15 @@ Sint erts_decode_ext_size_ets(byte *ext, Uint size)
 */
 Eterm
 erts_decode_dist_ext(ErtsHeapFactory* factory,
-		     ErtsDistExternal *edep)
+		     ErtsDistExternal *edep,
+                     int kill_connection)
 {
     Eterm obj;
-    byte* ep = edep->extp;
+    byte* ep;
+
+    ep = edep->data->extp;
 
-    if (ep >= edep->ext_endp)
+    if (ep >= edep->data->ext_endp)
 	goto error;
 #ifndef ERTS_DEBUG_USE_DIST_SEP
     if (edep->flags & ERTS_DIST_EXT_DFLAG_HDR) {
@@ -1005,14 +1166,15 @@ erts_decode_dist_ext(ErtsHeapFactory* factory,
     if (!ep)
 	goto error;
 
-    edep->extp = ep;
+    edep->data->extp = ep;
 
     return obj;
 
  error:
     erts_factory_undo(factory);
 
-    bad_dist_ext(edep);
+    if (kill_connection)
+        bad_dist_ext(edep);
 
     return THE_NON_VALUE;
 }
@@ -1029,6 +1191,7 @@ Eterm erts_decode_ext(ErtsHeapFactory* factory, byte **ext, Uint32 flags)
     if (flags) {
         ASSERT(flags == ERTS_DIST_EXT_BTT_SAFE);
         ede.flags = flags; /* a dummy struct just for the flags */
+        ede.data = NULL;
         edep = &ede;
     } else {
         edep = NULL;
@@ -1057,6 +1220,7 @@ BIF_RETTYPE erts_debug_dist_ext_to_term_2(BIF_ALIST_2)
     Eterm res;
     Sint hsz;
     ErtsDistExternal ede;
+    ErtsDistExternalData ede_data;
     Eterm *tp;
     Eterm real_bin;
     Uint offset;
@@ -1069,7 +1233,8 @@ BIF_RETTYPE erts_debug_dist_ext_to_term_2(BIF_ALIST_2)
     ede.flags = ERTS_DIST_EXT_ATOM_TRANS_TAB;
     ede.dep = NULL;
     ede.heap_size = -1;
-    
+    ede.data = &ede_data;
+
     if (is_not_tuple(BIF_ARG_1))
 	goto badarg;
     tp = tuple_val(BIF_ARG_1);
@@ -1094,15 +1259,17 @@ BIF_RETTYPE erts_debug_dist_ext_to_term_2(BIF_ALIST_2)
     if (bitsize != 0)
 	goto badarg;
 
-    ede.extp = binary_bytes(real_bin)+offset;
-    ede.ext_endp = ede.extp + size;
+    ede.data->extp = binary_bytes(real_bin)+offset;
+    ede.data->ext_endp = ede.data->extp + size;
+    ede.data->frag_id = 1;
+    ede.data->binp = NULL;
 
-    hsz = erts_decode_dist_ext_size(&ede);
+    hsz = erts_decode_dist_ext_size(&ede, 1, 1);
     if (hsz < 0)
 	goto badarg;
 
     erts_factory_proc_prealloc_init(&factory, BIF_P, hsz);
-    res = erts_decode_dist_ext(&factory, &ede);
+    res = erts_decode_dist_ext(&factory, &ede, 1);
     erts_factory_close(&factory);
 
     if (is_value(res))
@@ -1117,9 +1284,22 @@ static BIF_RETTYPE term_to_binary_trap_1(BIF_ALIST_1)
 {
     Eterm *tp = tuple_val(BIF_ARG_1);
     Eterm Term = tp[1];
-    Eterm bt = tp[2];
+    Eterm Opts = tp[2];
+    Eterm bt = tp[3];
     Binary *bin = erts_magic_ref2bin(bt);
-    Eterm res = erts_term_to_binary_int(BIF_P, Term, 0, 0,bin);
+    Eterm res = erts_term_to_binary_int(BIF_P, Term, Opts, 0, 0,bin);
+    if (is_non_value(res)) {
+        if (erts_set_gc_state(BIF_P, 1)
+            || MSO(BIF_P).overhead > BIN_VHEAP_SZ(BIF_P)) {
+            ERTS_VBUMP_ALL_REDS(BIF_P);
+        }
+        if (Opts == am_undefined)
+            ERTS_BIF_ERROR_TRAPPED1(BIF_P, SYSTEM_LIMIT,
+                                    bif_export[BIF_term_to_binary_1], Term);
+        else
+            ERTS_BIF_ERROR_TRAPPED2(BIF_P, SYSTEM_LIMIT,
+                                    bif_export[BIF_term_to_binary_2], Term, Opts);
+    }
     if (is_tuple(res)) {
 	ASSERT(BIF_P->flags & F_DISABLE_GC);
 	BIF_TRAP1(&term_to_binary_trap_export,BIF_P,res);
@@ -1136,7 +1316,12 @@ HIPE_WRAPPER_BIF_DISABLE_GC(term_to_binary, 1)
 
 BIF_RETTYPE term_to_binary_1(BIF_ALIST_1)
 {
-    Eterm res = erts_term_to_binary_int(BIF_P, BIF_ARG_1, 0, TERM_TO_BINARY_DFLAGS, NULL);
+    Eterm res = erts_term_to_binary_int(BIF_P, BIF_ARG_1, am_undefined,
+                                        0, TERM_TO_BINARY_DFLAGS, NULL);
+    if (is_non_value(res)) {
+	ASSERT(!(BIF_P->flags & F_DISABLE_GC));
+        BIF_ERROR(BIF_P, SYSTEM_LIMIT);
+    }
     if (is_tuple(res)) {
 	erts_set_gc_state(BIF_P, 0);
 	BIF_TRAP1(&term_to_binary_trap_export,BIF_P,res);
@@ -1195,7 +1380,12 @@ BIF_RETTYPE term_to_binary_2(BIF_ALIST_2)
 	goto error;
     }
 
-    res = erts_term_to_binary_int(p, Term, level, flags, NULL);
+    res = erts_term_to_binary_int(p, Term, BIF_ARG_2,
+                                  level, flags, NULL);
+    if (is_non_value(res)) {
+	ASSERT(!(BIF_P->flags & F_DISABLE_GC));
+        BIF_ERROR(BIF_P, SYSTEM_LIMIT);
+    }
     if (is_tuple(res)) {
 	erts_set_gc_state(p, 0);
 	BIF_TRAP1(&term_to_binary_trap_export,BIF_P,res);
@@ -1605,6 +1795,7 @@ static BIF_RETTYPE binary_to_term_int(Process* p, Eterm bin, B2TContext *ctx)
         case B2TDecodeBinary: {
 	    ErtsDistExternal fakedep;
             fakedep.flags = ctx->flags;
+            fakedep.data = NULL;
             dec_term(&fakedep, NULL, NULL, NULL, ctx);
             break;
 	}
@@ -1744,8 +1935,17 @@ external_size_1(BIF_ALIST_1)
 {
     Process* p = BIF_P;
     Eterm Term = BIF_ARG_1;
+    Uint size;
+
+    switch (erts_encode_ext_size(Term, &size)) {
+    case ERTS_EXT_SZ_SYSTEM_LIMIT:
+        BIF_ERROR(BIF_P, SYSTEM_LIMIT);
+    case ERTS_EXT_SZ_YIELD:
+        ERTS_INTERNAL_ERROR("Unexpected yield");
+    case ERTS_EXT_SZ_OK:
+        break;
+    }
 
-    Uint size = erts_encode_ext_size(Term);
     if (IS_USMALL(0, size)) {
 	BIF_RET(make_small(size));
     } else {
@@ -1788,7 +1988,15 @@ external_size_2(BIF_ALIST_2)
         goto error;
     }
 
-    size = erts_encode_ext_size_2(BIF_ARG_1, flags);
+    switch (erts_encode_ext_size_2(BIF_ARG_1, flags, &size)) {
+    case ERTS_EXT_SZ_SYSTEM_LIMIT:
+        BIF_ERROR(BIF_P, SYSTEM_LIMIT);
+    case ERTS_EXT_SZ_YIELD:
+        ERTS_INTERNAL_ERROR("Unexpected yield");
+    case ERTS_EXT_SZ_OK:
+        break;
+    }
+
     if (IS_USMALL(0, size)) {
         BIF_RET(make_small(size));
     } else {
@@ -1876,7 +2084,15 @@ erts_term_to_binary_simple(Process* p, Eterm Term, Uint size, int level, Uint fl
 Eterm
 erts_term_to_binary(Process* p, Eterm Term, int level, Uint flags) {
     Uint size;
-    size = encode_size_struct2(NULL, Term, flags) + 1 /* VERSION_MAGIC */;
+    switch (encode_size_struct_int(NULL, NULL, Term, flags, NULL, &size)) {
+    case ERTS_EXT_SZ_SYSTEM_LIMIT:
+        return THE_NON_VALUE;
+    case ERTS_EXT_SZ_YIELD:
+        ERTS_INTERNAL_ERROR("Unexpected yield");
+    case ERTS_EXT_SZ_OK:
+        break;
+    }
+    size++; /* VERSION_MAGIC */;
     return erts_term_to_binary_simple(p, Term, size, level, flags);
 }
 
@@ -1926,8 +2142,8 @@ static int ttb_context_destructor(Binary *context_bin)
     return 1;
 }
 
-static Eterm erts_term_to_binary_int(Process* p, Eterm Term, int level, Uint flags, 
-				     Binary *context_b) 
+static Eterm erts_term_to_binary_int(Process* p, Eterm Term, Eterm opts, int level,
+                                     Uint flags, Binary *context_b) 
 {
     Eterm *hp;
     Eterm res;
@@ -1945,18 +2161,17 @@ static Eterm erts_term_to_binary_int(Process* p, Eterm Term, int level, Uint fla
     do {								\
 	if (context_b == NULL) {					\
 	    context_b = erts_create_magic_binary(sizeof(TTBContext),    \
-                                                 ttb_context_destructor);   \
+                                                 ttb_context_destructor);\
 	    context =  ERTS_MAGIC_BIN_DATA(context_b);			\
-	    sys_memcpy(context,&c_buff,sizeof(TTBContext));			\
+	    sys_memcpy(context,&c_buff,sizeof(TTBContext));		\
 	}								\
     } while (0)
 
 #define RETURN_STATE()							\
     do {								\
-	static const int TUPLE2_SIZE = 2 + 1;				\
-	hp = HAlloc(p, ERTS_MAGIC_REF_THING_SIZE + TUPLE2_SIZE);        \
+	hp = HAlloc(p, ERTS_MAGIC_REF_THING_SIZE + 1 + 3);              \
 	c_term = erts_mk_magic_ref(&hp, &MSO(p), context_b);            \
-	res = TUPLE2(hp, Term, c_term);					\
+	res = TUPLE3(hp, Term, opts, c_term);                           \
 	BUMP_ALL_REDS(p);                                               \
 	return res;							\
     } while (0);
@@ -1982,11 +2197,17 @@ static Eterm erts_term_to_binary_int(Process* p, Eterm Term, int level, Uint fla
 		int level;
 		Uint flags;
 		/* Try for fast path */
-		if (encode_size_struct_int(&context->s.sc, NULL, Term,
-					   context->s.sc.flags, &reds, &size) < 0) {
+                switch (encode_size_struct_int(&context->s.sc, NULL, Term,
+                                               context->s.sc.flags, &reds, &size)) {
+                case ERTS_EXT_SZ_SYSTEM_LIMIT:
+                    BUMP_REDS(p, (initial_reds - reds) / TERM_TO_BINARY_LOOP_FACTOR);
+                    return THE_NON_VALUE;
+                case ERTS_EXT_SZ_YIELD:
 		    EXPORT_CONTEXT();
 		    /* Same state */
 		    RETURN_STATE();
+                case ERTS_EXT_SZ_OK:
+                    break;
 		}
 		++size; /* VERSION_MAGIC */
 		/* Move these to next state */
@@ -2348,7 +2569,7 @@ dec_atom(ErtsDistExternal *edep, byte* ep, Eterm* objp)
     return ep;
 }
 
-static ERTS_INLINE ErlNode* dec_get_node(Eterm sysname, Uint32 creation)
+static ERTS_INLINE ErlNode* dec_get_node(Eterm sysname, Uint32 creation, Eterm book)
 {
     if (sysname == INTERNAL_LOCAL_SYSNAME)  /* && DFLAG_INTERNAL_TAGS */
 	return erts_this_node;
@@ -2357,7 +2578,7 @@ static ERTS_INLINE ErlNode* dec_get_node(Eterm sysname, Uint32 creation)
 	&& (creation == erts_this_node->creation || creation == ORIG_CREATION))
 	return erts_this_node;
 
-    return erts_find_or_insert_node(sysname,creation);
+    return erts_find_or_insert_node(sysname,creation,book);
 }
 
 static byte*
@@ -2403,7 +2624,7 @@ dec_pid(ErtsDistExternal *edep, ErtsHeapFactory* factory, byte* ep,
      * We are careful to create the node entry only after all
      * validity tests are done.
      */
-    node = dec_get_node(sysname, cre);
+    node = dec_get_node(sysname, cre, make_boxed(factory->hp));
 
     if(node == erts_this_node) {
 	*objp = make_internal_pid(data);
@@ -2481,11 +2702,21 @@ enc_term_int(TTBEncodeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj, byte* ep,
 	    {
 		Eterm* cons = list_val(obj);
 		Eterm tl;
+                Uint len_cnt = WSTACK_POP(s);
 
 		obj = CAR(cons);
 		tl = CDR(cons);
-		WSTACK_PUSH2(s, (is_list(tl) ? ENC_ONE_CONS : ENC_TERM),
-			     tl);
+                if (is_list(tl)) {
+                    len_cnt++;
+                    WSTACK_PUSH3(s, len_cnt, ENC_ONE_CONS, tl);
+                }
+                else {
+                    byte* list_lenp = (byte*) WSTACK_POP(s);
+		    ASSERT(list_lenp[-1] == LIST_EXT);
+                    put_int32(len_cnt, list_lenp);
+
+                    WSTACK_PUSH2(s, ENC_TERM, tl);
+                }
 	    }
 	    break;
 	case ENC_PATCH_FUN_SIZE:
@@ -2689,10 +2920,7 @@ enc_term_int(TTBEncodeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj, byte* ep,
 	}
 	case LIST_DEF:
 	    {
-		int is_str;
-
-		i = is_external_string(obj, &is_str);
-		if (is_str) {
+		if (is_external_string(obj, &i)) {
 		    *ep++ = STRING_EXT;
 		    put_int16(i, ep);
 		    ep += 2;
@@ -2701,9 +2929,12 @@ enc_term_int(TTBEncodeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj, byte* ep,
 			*ep++ = unsigned_val(CAR(cons));
 			obj = CDR(cons);
 		    }
+		    r -= i;
 		} else {
+		    r -= i/2;
 		    *ep++ = LIST_EXT;
-		    put_int32(i, ep);
+                    /* Patch list length when we find end of list */
+                    WSTACK_PUSH2(s, (UWord)ep, 1);
 		    ep += 4;
 		    goto encode_one_cons;
 		}
@@ -2961,9 +3192,13 @@ enc_term_int(TTBEncodeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj, byte* ep,
     return 0;
 }
 
+/** @brief Is it a list of bytes not longer than MAX_STRING_LEN?
+ * @param lenp out: string length or number of list cells traversed
+ * @return true/false
+ */
 static
-Uint
-is_external_string(Eterm list, int* p_is_string)
+int
+is_external_string(Eterm list, Uint* lenp)
 {
     Uint len = 0;
 
@@ -2975,29 +3210,15 @@ is_external_string(Eterm list, int* p_is_string)
 	Eterm* consp = list_val(list);
 	Eterm hd = CAR(consp);
 
-	if (!is_byte(hd)) {
-	    break;
+	if (!is_byte(hd) || ++len > MAX_STRING_LEN) {
+	    *lenp = len;
+            return 0;
 	}
-	len++;
 	list = CDR(consp);
     }
 
-    /*
-     * If we have reached the end of the list, and we have
-     * not exceeded the maximum length of a string, this
-     * is a string.
-     */
-    *p_is_string = is_nil(list) && len < MAX_STRING_LEN;
-
-    /*
-     * Continue to calculate the length.
-     */
-    while (is_list(list)) {
-	Eterm* consp = list_val(list);
-	len++;
-	list = CDR(consp);
-    }
-    return len;
+    *lenp = len;
+    return is_nil(list);
 }
 
 
@@ -3397,7 +3618,7 @@ dec_term_atom_common:
                     cre = get_int32(ep);
                     ep += 4;
                 }
-		node = dec_get_node(sysname, cre);
+		node = dec_get_node(sysname, cre, make_boxed(hp));
 		if(node == erts_this_node) {
 		    *objp = make_internal_port(num);
 		}
@@ -3468,7 +3689,7 @@ dec_term_atom_common:
 
 		cre = get_int32(ep);
 		ep += 4;
-		r0 = get_int32(ep); /* allow full word */
+		r0 = get_int32(ep);
 		ep += 4;
 
 	    ref_ext_common: {
@@ -3477,8 +3698,15 @@ dec_term_atom_common:
 		if (ref_words > ERTS_MAX_REF_NUMBERS)
 		    goto error;
 
-		node = dec_get_node(sysname, cre);
+		node = dec_get_node(sysname, cre, make_boxed(hp));
 		if(node == erts_this_node) {
+                    if (r0 >= MAX_REFERENCE) {
+                          /*
+                           * Must reject local refs with more than 18 bits
+                           * in first word as magic ref table relies on it.
+                           */
+                        goto error;
+                    }
 	
 		    rtp = (ErtsORefThing *) hp;
 		    ref_num = &rtp->num[0];
@@ -3565,6 +3793,30 @@ dec_term_atom_common:
 		    hp += heap_bin_size(n);
 		    sys_memcpy(hb->data, ep, n);
 		    *objp = make_binary(hb);
+		} else if (edep && edep->data && edep->data->binp &&
+                           n > (edep->data->binp->orig_size / 4)) {
+                    /* If we decode a refc binary from a distribution data
+                       entry we know that it is a refc binary to begin with
+                       so we just increment it and use the reference. This
+                       means that the entire distribution data entry will
+                       remain until this binary is de-allocated so we only
+                       do it if a substantial part (> 25%) of the data
+                       is a binary. */
+                    ProcBin* pb = (ProcBin *) hp;
+                    Binary* bptr = edep->data->binp;
+                    erts_refc_inc(&bptr->intern.refc, 1);
+                    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;
+                    pb->val = bptr;
+                    pb->bytes = (byte*) ep;
+                    ERTS_ASSERT((byte*)(bptr->orig_bytes) < ep &&
+                                ep+n <= (byte*)(bptr->orig_bytes+bptr->orig_size));
+                    pb->flags = 0;
+                    OH_OVERHEAD(factory->off_heap, pb->size / sizeof(Eterm));
+                    hp += PROC_BIN_SIZE;
+                    *objp = make_binary(pb);
 		} else {
 		    Binary* dbin = erts_bin_nrml_alloc(n);
 
@@ -4041,13 +4293,21 @@ error_hamt:
    to a sequence of bytes
    N.B. That this must agree with to_external2() above!!!
    (except for cached atoms) */
-static Uint encode_size_struct2(ErtsAtomCacheMap *acmp, Eterm obj, unsigned dflags) {
-    Uint res;
-    (void) encode_size_struct_int(NULL, acmp, obj, dflags, NULL, &res);
-    return res;
+static Uint encode_size_struct2(ErtsAtomCacheMap *acmp,
+                                Eterm obj,
+                                unsigned dflags) {
+    Uint size;
+    ErtsExtSzRes res = encode_size_struct_int(NULL, acmp, obj,
+                                              dflags, NULL, &size);
+    /*
+     * encode_size_struct2() only allowed when
+     * we know the result will always be OK!
+     */ 
+    ASSERT(res == ERTS_EXT_SZ_OK); (void) res;
+    return (Uint) size;
 }
 
-static int
+static ErtsExtSzRes
 encode_size_struct_int(TTBSizeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj,
 		       unsigned dflags, Sint *reds, Uint *res)
 {
@@ -4075,12 +4335,12 @@ encode_size_struct_int(TTBSizeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj,
     for (;;) {
 	ASSERT(!is_header(obj));
 
-	if (ctx && --r == 0) {
-	    *reds = r;
+	if (ctx && --r <= 0) {
+	    *reds = 0;
 	    ctx->obj = obj;
 	    ctx->result = result;
 	    WSTACK_SAVE(s, &ctx->wstack);
-	    return -1;
+	    return ERTS_EXT_SZ_YIELD;
 	}
 	switch (tag_val_def(obj)) {
 	case NIL_DEF:
@@ -4166,8 +4426,10 @@ encode_size_struct_int(TTBSizeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj,
 	    result += (1 + encode_size_struct2(acmp, port_node_name(obj), dflags) +
 		      4 + 1);
 	    break;
-	case LIST_DEF:
-	    if ((m = is_string(obj)) && (m < MAX_STRING_LEN)) {
+	case LIST_DEF: {
+	    int is_str = is_external_string(obj, &m);
+	    r -= m/2;
+	    if (is_str) {
 		result += m + 2 + 1;
 	    } else {
 		result += 5;
@@ -4176,6 +4438,7 @@ encode_size_struct_int(TTBSizeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj,
 		continue; /* big loop */
 	    }
 	    break;
+	}
 	case TUPLE_DEF:
 	    {
 		Eterm* ptr = tuple_val(obj);
@@ -4253,11 +4516,26 @@ encode_size_struct_int(TTBSizeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj,
 		result += 32;   /* Yes, including the tag */
 	    }
 	    break;
-	case BINARY_DEF:
-	    if (dflags & DFLAG_INTERNAL_TAGS) {
+	case BINARY_DEF: {
+            ProcBin* pb = (ProcBin*) binary_val(obj);
+            Uint tot_bytes = pb->size;
+            if (!(dflags & DFLAG_INTERNAL_TAGS)) {
+#ifdef ARCH_64
+                if (tot_bytes >= (Uint) 0xffffffff) {
+                    if (pb->thing_word == HEADER_SUB_BIN) {
+                        ErlSubBin* sub = (ErlSubBin*) pb;
+                        tot_bytes += (sub->bitoffs + sub->bitsize+ 7) / 8;
+                    }
+                    if (tot_bytes > (Uint) 0xffffffff) {
+                        WSTACK_DESTROY(s);
+                        return ERTS_EXT_SZ_SYSTEM_LIMIT;
+                    }
+                }
+#endif
+            }
+            else {
 		ProcBin* pb = (ProcBin*) binary_val(obj);
 		Uint sub_extra = 0;
-		Uint tot_bytes = pb->size;
 		if (pb->thing_word == HEADER_SUB_BIN) {
 		    ErlSubBin* sub = (ErlSubBin*) pb;
 		    pb = (ProcBin*) binary_val(sub->orig);
@@ -4274,6 +4552,7 @@ encode_size_struct_int(TTBSizeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj,
 	    result += 1 + 4 + binary_size(obj) +
 		    5;			/* For unaligned binary */
 	    break;
+        }
 	case FUN_DEF:
 	    {
 		ErlFunThing* funp = (ErlFunThing *) fun_val(obj);
@@ -4306,7 +4585,7 @@ encode_size_struct_int(TTBSizeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj,
 	    break;
 
 	default:
-	    erts_exit(ERTS_ERROR_EXIT,"Internal data structure error (in encode_size_struct2)%x\n",
+	    erts_exit(ERTS_ERROR_EXIT,"Internal data structure error (in encode_size_struct_int) %x\n",
 		     obj);
 	}
 
@@ -4317,7 +4596,7 @@ encode_size_struct_int(TTBSizeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj,
 
         if (is_header(obj)) {
             switch (obj) {
-	    case LIST_TAIL_OP:
+            case LIST_TAIL_OP:
 		obj = (Eterm) WSTACK_POP(s);
 		if (is_list(obj)) {
 		    Eterm* cons = list_val(obj);
@@ -4343,10 +4622,10 @@ encode_size_struct_int(TTBSizeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj,
     WSTACK_DESTROY(s);
     if (ctx) {
 	ASSERT(ctx->wstack.wstart == NULL);
-	*reds = r;
+	*reds = r < 0 ? 0 : r;
     }
     *res = result;
-    return 0;
+    return ERTS_EXT_SZ_OK;
 }
 
 
diff --git a/erts/emulator/beam/external.h b/erts/emulator/beam/external.h
index edac177cc6..e362a6c81f 100644
--- a/erts/emulator/beam/external.h
+++ b/erts/emulator/beam/external.h
@@ -58,6 +58,8 @@
 #define SMALL_ATOM_UTF8_EXT 'w'
 
 #define DIST_HEADER       'D'
+#define DIST_FRAG_HEADER  'E'
+#define DIST_FRAG_CONT    'F'
 #define ATOM_CACHE_REF    'R'
 #define ATOM_INTERNAL_REF2 'I'
 #define ATOM_INTERNAL_REF3 'K'
@@ -122,24 +124,26 @@ typedef struct {
 
 #define ERTS_DIST_CON_ID_MASK ((Uint32) 0x00ffffff) /* also in net_kernel.erl */
 
-typedef struct {
-    DistEntry *dep;
+struct binary;
+typedef struct erl_dist_external_data ErtsDistExternalData;
+
+struct erl_dist_external_data {
+    Uint64 seq_id;
+    Uint64 frag_id;
     byte *extp;
     byte *ext_endp;
+    struct binary *binp;
+};
+
+typedef struct erl_dist_external {
     Sint heap_size;
-    Uint32 connection_id;
+    DistEntry *dep;
     Uint32 flags;
+    Uint32 connection_id;
+    ErtsDistExternalData *data;
     ErtsAtomTranslationTable attab;
 } ErtsDistExternal;
 
-#define ERTS_DIST_EXT_SIZE(EDEP) \
-  (sizeof(ErtsDistExternal) \
-   - (((EDEP)->flags & ERTS_DIST_EXT_ATOM_TRANS_TAB) \
-      ? (ASSERT(0 <= (EDEP)->attab.size \
-		&& (EDEP)->attab.size <= ERTS_ATOM_CACHE_SIZE), \
-	 sizeof(Eterm)*(ERTS_ATOM_CACHE_SIZE - (EDEP)->attab.size)) \
-      : sizeof(ErtsAtomTranslationTable)))
-
 typedef struct {
     byte *extp;
     int exttmp;
@@ -155,36 +159,48 @@ void erts_reset_atom_cache_map(ErtsAtomCacheMap *);
 void erts_destroy_atom_cache_map(ErtsAtomCacheMap *);
 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 *);
+Uint erts_encode_ext_dist_header_size(ErtsAtomCacheMap *, Uint);
+byte *erts_encode_ext_dist_header_setup(byte *, ErtsAtomCacheMap *, Uint, Eterm);
+byte *erts_encode_ext_dist_header_fragment(byte **, Uint, Eterm);
 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);
+
+typedef enum {
+    ERTS_EXT_SZ_OK,
+    ERTS_EXT_SZ_YIELD,
+    ERTS_EXT_SZ_SYSTEM_LIMIT
+} ErtsExtSzRes;
+
+ErtsExtSzRes erts_encode_dist_ext_size(Eterm, Uint32, ErtsAtomCacheMap*, Uint* szp);
+ErtsExtSzRes erts_encode_dist_ext_size_ctx(Eterm term, struct erts_dsig_send_context* ctx, Uint* szp);
 struct TTBEncodeContext_;
 int erts_encode_dist_ext(Eterm, byte **, Uint32, ErtsAtomCacheMap *,
 			  struct TTBEncodeContext_ *, Sint* reds);
 
-Uint erts_encode_ext_size(Eterm);
-Uint erts_encode_ext_size_2(Eterm, unsigned);
+ErtsExtSzRes erts_encode_ext_size(Eterm, Uint *szp);
+ErtsExtSzRes erts_encode_ext_size_2(Eterm, unsigned, Uint *szp);
 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);
 
-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);
-void *erts_dist_ext_trailer(ErtsDistExternal *);
-void erts_destroy_dist_ext_copy(ErtsDistExternal *);
-
-#define ERTS_PREP_DIST_EXT_FAILED       (-1)
-#define ERTS_PREP_DIST_EXT_SUCCESS      (0)
-#define ERTS_PREP_DIST_EXT_CLOSED       (1)
-
-int erts_prepare_dist_ext(ErtsDistExternal *, byte *, Uint,
-			  DistEntry *, Uint32 conn_id, ErtsAtomCache *);
-Sint erts_decode_dist_ext_size(ErtsDistExternal *);
-Eterm erts_decode_dist_ext(ErtsHeapFactory* factory, ErtsDistExternal *);
+Uint erts_dist_ext_size(ErtsDistExternal *);
+Uint erts_dist_ext_data_size(ErtsDistExternal *);
+void erts_free_dist_ext_copy(ErtsDistExternal *);
+void erts_make_dist_ext_copy(ErtsDistExternal *, ErtsDistExternal *);
+void erts_dist_ext_frag(ErtsDistExternalData *, ErtsDistExternal *);
+#define erts_get_dist_ext(HFRAG) ((ErtsDistExternal*)((HFRAG)->mem + (HFRAG)->used_size))
+
+typedef enum {
+    ERTS_PREP_DIST_EXT_FAILED,
+    ERTS_PREP_DIST_EXT_SUCCESS,
+    ERTS_PREP_DIST_EXT_FRAG_CONT,
+    ERTS_PREP_DIST_EXT_CLOSED
+} ErtsPrepDistExtRes;
+
+ErtsPrepDistExtRes erts_prepare_dist_ext(ErtsDistExternal *, byte *, Uint, struct binary *,
+                                         DistEntry *, Uint32, ErtsAtomCache *);
+Sint erts_decode_dist_ext_size(ErtsDistExternal *, int, int);
+Eterm erts_decode_dist_ext(ErtsHeapFactory*, ErtsDistExternal *, int);
 
 Sint erts_decode_ext_size(byte*, Uint);
 Sint erts_decode_ext_size_ets(byte*, Uint);
@@ -200,25 +216,4 @@ 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
-
-ERTS_GLB_INLINE void
-erts_free_dist_ext_copy(ErtsDistExternal *edep)
-{
-    if (edep->dep)
-	erts_deref_dist_entry(edep->dep);
-    erts_free(ERTS_ALC_T_EXT_TERM_DATA, edep);
-}
-
-ERTS_GLB_INLINE void *
-erts_dist_ext_trailer(ErtsDistExternal *edep)
-{
-    void *res = (void *) (edep->ext_endp
-			  + ERTS_EXTRA_DATA_ALIGN_SZ(edep->ext_endp));
-    ASSERT((((UWord) res) % sizeof(Uint)) == 0);
-    return res;
-}
-
-#endif
-
 #endif /* ERL_EXTERNAL_H__ */
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
index 0631404599..0c2cf98033 100644
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
@@ -113,6 +113,9 @@ extern Eterm erts_bld_resource_ref(Eterm** hp, ErlOffHeap*, ErtsResource*);
 extern void erts_pre_nif(struct enif_environment_t*, Process*,
 			 struct erl_module_nif*, Process* tracee);
 extern void erts_post_nif(struct enif_environment_t* env);
+#ifdef DEBUG
+int erts_dbg_is_resource_dying(ErtsResource*);
+#endif
 extern void erts_resource_stop(ErtsResource*, ErlNifEvent, int is_direct_call);
 void erts_fire_nif_monitor(ErtsMonitor *tmon);
 void erts_nif_demonitored(ErtsResource* resource);
@@ -131,6 +134,7 @@ extern Eterm erts_nif_call_function(Process *p, Process *tracee,
 
 int erts_call_dirty_nif(ErtsSchedulerData *esdp, Process *c_p,
 			BeamInstr *I, Eterm *reg);
+ErtsMessage* erts_create_message_from_nif_env(ErlNifEnv* msg_env);
 
 
 /* Driver handle (wrapper for old plain handle) */
@@ -292,7 +296,6 @@ union erl_off_heap_ptr {
 /* controls warning mapping in error_logger */
 
 extern Eterm node_cookie;
-extern Uint display_items;	/* no of items to display in traces etc */
 
 extern int erts_backtrace_depth;
 extern erts_atomic32_t erts_max_gen_gcs;
@@ -892,6 +895,11 @@ void erts_init_bif(void);
 Eterm erl_send(Process *p, Eterm to, Eterm msg);
 int erts_set_group_leader(Process *proc, Eterm new_gl);
 
+/* erl_bif_guard.c */
+
+void erts_init_bif_guard(void);
+Eterm erts_trapping_length_1(Process* p, Eterm* args);
+
 /* erl_bif_op.c */
 
 Eterm erl_is_function(Process* p, Eterm arg1, Eterm arg2);
@@ -899,7 +907,8 @@ Eterm erl_is_function(Process* p, Eterm arg1, Eterm arg2);
 /* beam_bif_load.c */
 Eterm erts_check_process_code(Process *c_p, Eterm module, int *redsp, int fcalls);
 Eterm erts_proc_copy_literal_area(Process *c_p, int *redsp, int fcalls, int gc_allowed);
-
+void erts_debug_foreach_release_literal_area_off_heap(void (*func)(ErlOffHeap *, void *),
+                                                      void *arg);
 typedef struct ErtsLiteralArea_ {
     struct erl_off_heap_header *off_heap;
     Eterm *end;
@@ -962,7 +971,7 @@ void init_break_handler(void);
 void erts_set_ignore_break(void);
 void erts_replace_intr(void);
 void process_info(fmtfn_t, void *);
-void print_process_info(fmtfn_t, void *, Process*);
+void print_process_info(fmtfn_t, void *, Process*, ErtsProcLocks);
 void info(fmtfn_t, void *);
 void loaded(fmtfn_t, void *);
 void erts_print_base64(fmtfn_t to, void *to_arg, byte* src, Uint size);
@@ -1064,17 +1073,46 @@ Uint size_object_x(Eterm, erts_literal_area_t*);
 #define size_object_litopt(Term,LitArea) size_object_x(Term,LitArea)
 
 Uint copy_shared_calculate(Eterm, erts_shcopy_t*);
-Eterm copy_shared_perform(Eterm, Uint, erts_shcopy_t*, Eterm**, ErlOffHeap*);
-
 Uint size_shared(Eterm);
 
+/* #define ERTS_COPY_REGISTER_LOCATION */
+
+#ifdef ERTS_COPY_REGISTER_LOCATION
+
+#define copy_shared_perform(U, V, X, Y, Z) \
+    copy_shared_perform_x((U), (V), (X), (Y), (Z), __FILE__, __LINE__)
+Eterm copy_shared_perform_x(Eterm, Uint, erts_shcopy_t*, Eterm**, ErlOffHeap*,
+                            char *file, int line);
+
+Eterm copy_struct_x(Eterm, Uint, Eterm**, ErlOffHeap*, Uint*, erts_literal_area_t*,
+                    char *file, int line);
+#define copy_struct(Obj,Sz,HPP,OH) \
+    copy_struct_x(Obj,Sz,HPP,OH,NULL,NULL,__FILE__,__LINE__)
+#define copy_struct_litopt(Obj,Sz,HPP,OH,LitArea) \
+    copy_struct_x(Obj,Sz,HPP,OH,NULL,LitArea,__FILE__,__LINE__)
+
+#define copy_shallow(R, SZ, HPP, OH) \
+    copy_shallow_x((R), (SZ), (HPP), (OH), __FILE__, __LINE__)
+Eterm copy_shallow_x(Eterm* ERTS_RESTRICT, Uint, Eterm**, ErlOffHeap*,
+                     char *file, int line);
+
+#else
+
+#define copy_shared_perform(U, V, X, Y, Z) \
+    copy_shared_perform_x((U), (V), (X), (Y), (Z))
+Eterm copy_shared_perform_x(Eterm, Uint, erts_shcopy_t*, Eterm**, ErlOffHeap*);
+
 Eterm copy_struct_x(Eterm, Uint, Eterm**, ErlOffHeap*, Uint*, erts_literal_area_t*);
 #define copy_struct(Obj,Sz,HPP,OH) \
     copy_struct_x(Obj,Sz,HPP,OH,NULL,NULL)
 #define copy_struct_litopt(Obj,Sz,HPP,OH,LitArea) \
     copy_struct_x(Obj,Sz,HPP,OH,NULL,LitArea)
 
-Eterm copy_shallow(Eterm* ERTS_RESTRICT, Uint, Eterm**, ErlOffHeap*);
+#define copy_shallow(R, SZ, HPP, OH) \
+    copy_shallow_x((R), (SZ), (HPP), (OH))
+Eterm copy_shallow_x(Eterm* ERTS_RESTRICT, Uint, Eterm**, ErlOffHeap*);
+
+#endif
 
 void erts_move_multi_frags(Eterm** hpp, ErlOffHeap*, ErlHeapFragment* first,
 			   Eterm* refs, unsigned nrefs, int literals);
@@ -1088,7 +1126,7 @@ extern int distribution_info(fmtfn_t, void *);
 extern int is_node_name_atom(Eterm a);
 
 extern int erts_net_message(Port *, DistEntry *, Uint32 conn_id,
-			    byte *, ErlDrvSizeT, byte *, ErlDrvSizeT);
+			    byte *, ErlDrvSizeT, Binary *, byte *, ErlDrvSizeT);
 
 extern void init_dist(void);
 extern int stop_dist(void);
@@ -1208,10 +1246,11 @@ Uint64 erts_timestamp_millis(void);
 
 Export* erts_find_function(Eterm, Eterm, unsigned int, ErtsCodeIndex);
 
-void *erts_calc_stacklimit(char *prev_c, UWord stacksize);
-int erts_check_below_limit(char *ptr, char *limit);
-int erts_check_above_limit(char *ptr, char *limit);
-void *erts_ptr_id(void *ptr);
+/* ERTS_NOINLINE prevents link-time optimization across modules */
+void *erts_calc_stacklimit(char *prev_c, UWord stacksize) ERTS_NOINLINE;
+int erts_check_below_limit(char *ptr, char *limit) ERTS_NOINLINE;
+int erts_check_above_limit(char *ptr, char *limit) ERTS_NOINLINE;
+void *erts_ptr_id(void *ptr) ERTS_NOINLINE;
 
 Eterm store_external_or_ref_in_proc_(Process *, Eterm);
 Eterm store_external_or_ref_(Uint **, ErlOffHeap*, Eterm);
@@ -1248,6 +1287,10 @@ Uint erts_persistent_term_count(void);
 void erts_init_persistent_dumping(void);
 extern ErtsLiteralArea** erts_persistent_areas;
 extern Uint erts_num_persistent_areas;
+void erts_debug_foreach_persistent_term_off_heap(void (*func)(ErlOffHeap *, void *),
+                                                 void *arg);
+int erts_debug_have_accessed_literal_area(ErtsLiteralArea *lap);
+void erts_debug_save_accessed_literal_area(ErtsLiteralArea *lap);
 
 /* external.c */
 void erts_init_external(void);
@@ -1303,14 +1346,7 @@ Sint intlist_to_buf(Eterm, char*, Sint); /* most callers pass plain char*'s */
 int erts_unicode_list_to_buf(Eterm list, byte *buf, Sint len, Sint* written);
 Sint erts_unicode_list_to_buf_len(Eterm list);
 
-struct Sint_buf {
-#if defined(ARCH_64)
-    char s[22];
-#else
-    char s[12];
-#endif
-};	
-char* Sint_to_buf(Sint, struct Sint_buf*);
+int Sint_to_buf(Sint num, int base, char **buf_p, size_t buf_size);
 
 #define ERTS_IOLIST_STATE_INITER(C_P, OBJ)	\
     {(C_P), 0, 0, (OBJ), {NULL, NULL, NULL, ERTS_ALC_T_INVALID}, 0, 0}
diff --git a/erts/emulator/beam/instrs.tab b/erts/emulator/beam/instrs.tab
index 42c1168f85..7cffe7fb5c 100644
--- a/erts/emulator/beam/instrs.tab
+++ b/erts/emulator/beam/instrs.tab
@@ -238,6 +238,7 @@ HANDLE_APPLY_FUN_ERROR() {
 }
 
 DISPATCH_FUN(I) {
+    //| -no_next
     SET_I($I);
     Dispatchfun();
 }
@@ -299,6 +300,7 @@ i_call_fun_last(Fun, Deallocate) {
 }
 
 return() {
+    //| -no_next
     SET_I(c_p->cp);
     DTRACE_RETURN_FROM_PC(c_p);
 
@@ -357,7 +359,7 @@ i_get_tuple_element2(Src, Element, Dst) {
     dst[1] = E2;
 }
 
-i_get_tuple_element2y(Src, Element, D1, D2) {
+i_get_tuple_element2_dst(Src, Element, D1, D2) {
     Eterm* src;
     Eterm E1, E2;
     src = ADD_BYTE_OFFSET(tuple_val($Src), $Element);
@@ -434,6 +436,30 @@ init(Y) {
     make_blank($Y);
 }
 
+init_seq3(Y1) {
+    Eterm* dst = &$Y1;
+    make_blank(dst[0]);
+    make_blank(dst[1]);
+    make_blank(dst[2]);
+}
+
+init_seq4(Y1) {
+    Eterm* dst = &$Y1;
+    make_blank(dst[0]);
+    make_blank(dst[1]);
+    make_blank(dst[2]);
+    make_blank(dst[3]);
+}
+
+init_seq5(Y1) {
+    Eterm* dst = &$Y1;
+    make_blank(dst[0]);
+    make_blank(dst[1]);
+    make_blank(dst[2]);
+    make_blank(dst[3]);
+    make_blank(dst[4]);
+}
+
 init2(Y1, Y2) {
     make_blank($Y1);
     make_blank($Y2);
@@ -451,6 +477,13 @@ i_make_fun(FunP, NumFree) {
     HEAVY_SWAPIN;
 }
 
+move_trim(Src, Dst, Words) {
+    Uint cp = E[0];
+    $Dst = $Src;
+    E += $Words;
+    E[0] = cp;
+}
+
 i_trim(Words) {
     Uint cp = E[0];
     E += $Words;
@@ -467,10 +500,6 @@ move3(S1, D1, S2, D2, S3, D3) {
     $D3 = $S3;
 }
 
-move_dup(Src, D1, D2) {
-    $D1 = $D2 = $Src;
-}
-
 move2_par(S1, D1, S2, D2) {
     Eterm V1, V2;
     V1 = $S1;
@@ -486,6 +515,48 @@ move_shift(Src, SD, D) {
     $SD = V;
 }
 
+move_src_window2(Src, D1, D2) {
+    Eterm* src = &$Src;
+    Eterm s1, s2;
+    s1 = src[0];
+    s2 = src[1];
+    $D1 = s1;
+    $D2 = s2;
+}
+
+move_src_window3(Src, D1, D2, D3) {
+    Eterm* src = &$Src;
+    Eterm s1, s2, s3;
+    s1 = src[0];
+    s2 = src[1];
+    s3 = src[2];
+    $D1 = s1;
+    $D2 = s2;
+    $D3 = s3;
+}
+
+move_src_window4(Src, D1, D2, D3, D4) {
+    Eterm* src = &$Src;
+    Eterm s1, s2, s3, s4;
+    s1 = src[0];
+    s2 = src[1];
+    s3 = src[2];
+    s4 = src[3];
+    $D1 = s1;
+    $D2 = s2;
+    $D3 = s3;
+    $D4 = s4;
+}
+
+move_window2(S1, S2, D) {
+    Eterm xt0, xt1;
+    Eterm* y = &$D;
+    xt0  = $S1;
+    xt1  = $S2;
+    y[0] = xt0;
+    y[1] = xt1;
+}
+
 move_window3(S1, S2, S3, D) {
     Eterm xt0, xt1, xt2;
     Eterm* y = &$D;
@@ -559,17 +630,19 @@ update_list(Hd, Dst) {
     HTOP += 2;
 }
 
-i_put_tuple := i_put_tuple.make.fill;
-
-i_put_tuple.make(Dst) {
-    $Dst = make_tuple(HTOP);
-}
-
-i_put_tuple.fill(Arity) {
+put_tuple2(Dst, Arity) {
     Eterm* hp = HTOP;
     Eterm arity = $Arity;
 
+    /*
+     * If operands are not packed (in the 32-bit VM),
+     * is is not safe to use $Dst directly after I
+     * has been updated.
+     */
+    Eterm* dst_ptr = &($Dst);
+
     //| -no_next
+    ASSERT(arity != 0);
     *hp++ = make_arityval(arity);
     I = $NEXT_INSTRUCTION;
     do {
@@ -586,6 +659,7 @@ i_put_tuple.fill(Arity) {
             break;
         }
     } while (--arity != 0);
+    *dst_ptr = make_tuple(HTOP);
     HTOP = hp;
     ASSERT(VALID_INSTR(* (Eterm *)I));
     Goto(*I);
@@ -637,12 +711,6 @@ is_nonempty_list(Fail, Src) {
     }
 }
 
-is_nonempty_list_test_heap(Fail, Need, Live) {
-    //| -no_prefetch
-    $is_nonempty_list($Fail, x(0));
-    $test_heap($Need, $Live);
-}
-
 is_nonempty_list_allocate(Fail, Src, Need, Live) {
     //| -no_prefetch
     $is_nonempty_list($Fail, $Src);
@@ -655,13 +723,27 @@ is_nonempty_list_get_list(Fail, Src, Hd, Tl) {
     $get_list($Src, $Hd, $Tl);
 }
 
+is_nonempty_list_get_hd(Fail, Src, Hd) {
+    //| -no_prefetch
+    $is_nonempty_list($Fail, $Src);
+    $get_hd($Src, $Hd);
+}
+
+is_nonempty_list_get_tl(Fail, Src, Tl) {
+    //| -no_prefetch
+    $is_nonempty_list($Fail, $Src);
+    $get_tl($Src, $Tl);
+}
+
 jump(Fail) {
     $JUMP($Fail);
 }
 
-move_jump(Fail, Src) {
-    x(0) = $Src;
-    $jump($Fail);
+move_jump(Lbl, Src, Dst) {
+    Eterm lbl = $Lbl;
+    Eterm src = $Src;
+    $Dst = src;
+    $JUMP(lbl);
 }
 
 //
@@ -704,12 +786,18 @@ is_function(Fail, Src) {
     }
 }
 
-is_function2(Fail, Fun, Arity) {
+cold_is_function2(Fail, Fun, Arity) {
     if (erl_is_function(c_p, $Fun, $Arity) != am_true ) {
         $FAIL($Fail);
     }
 }
 
+hot_is_function2(Fail, Fun, Arity) {
+    if (!is_function2($Fun, $Arity)) {
+        $FAIL($Fail);
+    }
+}
+
 is_integer(Fail, Src) {
     if (is_not_integer($Src)) {
         $FAIL($Fail);
@@ -767,6 +855,16 @@ is_tagged_tuple(Fail, Src, Arityval, Tag) {
     }
 }
 
+is_tagged_tuple_ff(NotTupleFail, WrongRecordFail, Src, Arityval, Tag) {
+    Eterm term = $Src;
+    if (is_not_tuple(term)) {
+        $FAIL($NotTupleFail);
+    } else if (ERTS_UNLIKELY((tuple_val(term))[0] != $Arityval ||
+                             (tuple_val(term))[1] != $Tag)) {
+        $FAIL($WrongRecordFail);
+    }
+}
+
 is_tuple(Fail, Src) {
     if (is_not_tuple($Src)) {
         $FAIL($Fail);
@@ -786,6 +884,16 @@ test_arity(Fail, Pointer, Arity) {
     }
 }
 
+test_arity_get_tuple_element(Fail, Pointer, Arity, Pos, Dst) {
+    Eterm* ptr = tuple_val($Pointer);
+    Eterm* src;
+    if (*ptr != $Arity) {
+        $FAIL($Fail);
+    }
+    src = ADD_BYTE_OFFSET(ptr, $Pos);
+    $Dst = *src;
+}
+
 i_is_eq_exact_immed(Fail, X, Y) {
     if ($X != $Y) {
         $FAIL($Fail);
@@ -824,12 +932,16 @@ i_is_ne_exact_literal(Fail, Src, Literal) {
     }
 }
 
-is_eq(Fail, X, Y) {
-    CMP_EQ_ACTION($X, $Y, $FAIL($Fail));
+is_eq(Fail, A, B) {
+    Eterm a = $A;
+    Eterm b = $B;
+    CMP_EQ_ACTION(a, b, $FAIL($Fail));
 }
 
-is_ne(Fail, X, Y) {
-    CMP_NE_ACTION($X, $Y, $FAIL($Fail));
+is_ne(Fail, A, B) {
+    Eterm a = $A;
+    Eterm b = $B;
+    CMP_NE_ACTION(a, b, $FAIL($Fail));
 }
 
 is_lt(Fail, X, Y) {
@@ -889,7 +1001,7 @@ catch_end(Y) {
             }
             /* only x(2) is included in the rootset here */
             if (E - HTOP < 3) {
-                SWAPOUT;
+                $GC_SWAPOUT();
                 PROCESS_MAIN_CHK_LOCKS(c_p);
                 FCALLS -= erts_garbage_collect_nobump(c_p, 3, reg+2, 1, FCALLS);
                 ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
@@ -948,22 +1060,34 @@ build_stacktrace() {
 }
 
 raw_raise() {
+    //| -no_prefetch
     Eterm class = x(0);
     Eterm value = x(1);
     Eterm stacktrace = x(2);
+    Eterm* freason_ptr;
+
+    /*
+     * Note that the i_raise instruction will override c_p->freason
+     * with the freason field stored inside the StackTrace struct in
+     * ftrace. Therefore, we must take care to store the class both
+     * inside the StackTrace struct and in c_p->freason (important if
+     * the class is different from the class of the original
+     * exception).
+     */
+    freason_ptr = get_freason_ptr_from_exc(stacktrace);
 
     if (class == am_error) {
-        c_p->freason = EXC_ERROR & ~EXF_SAVETRACE;
+        *freason_ptr = 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;
+        *freason_ptr = 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;
+        *freason_ptr = c_p->freason = EXC_THROWN & ~EXF_SAVETRACE;
         c_p->fvalue = value;
         c_p->ftrace = stacktrace;
         goto find_func_info;
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c
index 5325480901..45fef0c0e5 100644
--- a/erts/emulator/beam/io.c
+++ b/erts/emulator/beam/io.c
@@ -3644,20 +3644,22 @@ typedef struct {
     Eterm reason;
 } ErtsPortExitContext;
 
-static void link_port_exit(ErtsLink *lnk, void *vpectxt)
+static int link_port_exit(ErtsLink *lnk, void *vpectxt, Sint reds)
 {
     ErtsPortExitContext *pectxt = vpectxt;
     erts_proc_sig_send_link_exit(NULL, pectxt->port_id,
                                  lnk, pectxt->reason, NIL);
+    return 1;
 }
 
-static void monitor_port_exit(ErtsMonitor *mon, void *vpectxt)
+static int monitor_port_exit(ErtsMonitor *mon, void *vpectxt, Sint reds)
 {
     ErtsPortExitContext *pectxt = vpectxt;
     if (erts_monitor_is_target(mon))
         erts_proc_sig_send_monitor_down(mon, pectxt->reason);
     else
         erts_proc_sig_send_demonitor(mon);
+    return 1;
 }
 
 /* 'from' is sending 'this_port' an exit signal, (this_port must be internal).
@@ -4073,7 +4075,7 @@ done:
  * to the caller.
  */
 int
-erl_drv_port_control(Eterm port_num, char cmd, char* buff, ErlDrvSizeT size)
+erl_drv_port_control(Eterm port_num, unsigned int cmd, char* buff, ErlDrvSizeT size)
 {
     ErtsProc2PortSigData *sigdp = erts_port_task_alloc_p2p_sig_data();
 
@@ -4448,6 +4450,7 @@ erts_port_call(Process* c_p,
     char input_buf[256];
     char *bufp;
     byte *endp;
+    Uint uintsz;
     ErlDrvSizeT size;
     int try_call;
     erts_aint32_t sched_flags;
@@ -4460,7 +4463,9 @@ erts_port_call(Process* c_p,
 
     try_call = !(sched_flags & ERTS_PTS_FLGS_FORCE_SCHEDULE_OP);
 
-    size = erts_encode_ext_size(data);
+    if (erts_encode_ext_size(data, &uintsz) != ERTS_EXT_SZ_OK)
+        return ERTS_PORT_OP_BADARG;
+    size = (ErlDrvSizeT) uintsz;
 
     if (!try_call)
 	bufp = erts_alloc(ERTS_ALC_T_DRV_CALL_DATA, size);
@@ -4836,7 +4841,7 @@ typedef struct {
     void *arg;
 } prt_one_lnk_data;
 
-static void prt_one_monitor(ErtsMonitor *mon, void *vprtd)
+static int prt_one_monitor(ErtsMonitor *mon, void *vprtd, Sint reds)
 {
     ErtsMonitorData *mdp = erts_monitor_to_data(mon);
     prt_one_lnk_data *prtd = (prt_one_lnk_data *) vprtd;
@@ -4844,12 +4849,14 @@ static void prt_one_monitor(ErtsMonitor *mon, void *vprtd)
         erts_print(prtd->to, prtd->arg, "(%p,%T)", mon->other.ptr, mdp->ref);
     else
         erts_print(prtd->to, prtd->arg, "(%T,%T)", mon->other.item, mdp->ref);
+    return 1;
 }
 
-static void prt_one_lnk(ErtsLink *lnk, void *vprtd)
+static int prt_one_lnk(ErtsLink *lnk, void *vprtd, Sint reds)
 {
     prt_one_lnk_data *prtd = (prt_one_lnk_data *) vprtd;
     erts_print(prtd->to, prtd->arg, "%T", lnk->other.item);
+    return 1;
 }
 
 static void dump_port_state(fmtfn_t to, void *arg, erts_aint32_t state)
@@ -5100,7 +5107,7 @@ erts_port_resume_procs(Port *prt)
 
 	    erts_snprintf(port_str, sizeof(DTRACE_CHARBUF_NAME(port_str)), "%T", prt->common.id);
 	    while (plp2 != NULL) {
-		erts_snprintf(pid_str, sizeof(DTRACE_CHARBUF_NAME(pid_str)), "%T", plp2->pid);
+		erts_snprintf(pid_str, sizeof(DTRACE_CHARBUF_NAME(pid_str)), "%T", plp2->u.pid);
 		DTRACE2(process_port_unblocked, pid_str, port_str);
 	    }
 	}
@@ -5291,44 +5298,31 @@ erts_get_port_names(Eterm id, ErlDrvPort drv_port)
 	pnp->driver_name = NULL;
     }
     else {
-	int do_realloc = 1;
-	int len = -1;
-	size_t pnp_len = sizeof(ErtsPortNames);
-#ifndef DEBUG
-	pnp_len += 100; /* In most cases 100 characters will be enough... */
-	ASSERT(prt->common.id == id);
-#endif
-	pnp = erts_alloc(ERTS_ALC_T_PORT_NAMES, pnp_len);
-	do {
-	    int nlen;
-	    char *name, *driver_name;
-	    if (len > 0) {
-		erts_free(ERTS_ALC_T_PORT_NAMES, pnp);
-		pnp_len = sizeof(ErtsPortNames) + len;
-		pnp = erts_alloc(ERTS_ALC_T_PORT_NAMES, pnp_len);
-	    }
-	    name = prt->name;
-	    len = nlen = name ? sys_strlen(name) + 1 : 0;
-	    driver_name = (prt->drv_ptr ? prt->drv_ptr->name : NULL);
-	    len += driver_name ? sys_strlen(driver_name) + 1 : 0;
-	    if (len <= pnp_len - sizeof(ErtsPortNames)) {
-		if (!name)
-		    pnp->name = NULL;
-		else {
-		    pnp->name = ((char *) pnp) + sizeof(ErtsPortNames);
-		    sys_strcpy(pnp->name, name);
-		}
-		if (!driver_name)
-		    pnp->driver_name = NULL;
-		else {
-		    pnp->driver_name = (((char *) pnp)
-					+ sizeof(ErtsPortNames)
-					+ nlen);
-		    sys_strcpy(pnp->driver_name, driver_name);
-		}
-		do_realloc = 0;
-	    }
-	} while (do_realloc);
+	int len;
+        int nlen;
+        char *driver_name;
+
+        len = nlen = prt->name ? sys_strlen(prt->name) + 1 : 0;
+        driver_name = (prt->drv_ptr ? prt->drv_ptr->name : NULL);
+        len += driver_name ? sys_strlen(driver_name) + 1 : 0;
+
+        pnp = erts_alloc(ERTS_ALC_T_PORT_NAMES,
+                         sizeof(ErtsPortNames) + len);
+
+        if (!prt->name)
+            pnp->name = NULL;
+        else {
+            pnp->name = ((char *) pnp) + sizeof(ErtsPortNames);
+            sys_strcpy(pnp->name, prt->name);
+        }
+        if (!driver_name)
+            pnp->driver_name = NULL;
+        else {
+            pnp->driver_name = (((char *) pnp)
+                                + sizeof(ErtsPortNames)
+                                + nlen);
+            sys_strcpy(pnp->driver_name, driver_name);
+        }
     }
     return pnp;
 }
@@ -6177,6 +6171,7 @@ int driver_output_binary(ErlDrvPort ix, char* hbuf, ErlDrvSizeT hlen,
 				dep,
                                 conn_id,
 				(byte*) hbuf, hlen,
+                                ErlDrvBinary2Binary(bin),
 				(byte*) (bin->orig_bytes+offs), len);
     }
     else
@@ -6222,12 +6217,14 @@ int driver_output2(ErlDrvPort ix, char* hbuf, ErlDrvSizeT hlen,
 				    dep,
                                     conn_id,
 				    NULL, 0,
+                                    NULL,
 				    (byte*) hbuf, hlen);
 	else
 	    return erts_net_message(prt,
 				    dep,
                                     conn_id,
 				    (byte*) hbuf, hlen,
+                                    NULL,
 				    (byte*) buf, len);
     }
     else if (state & ERTS_PORT_SFLG_LINEBUF_IO)
diff --git a/erts/emulator/beam/macros.tab b/erts/emulator/beam/macros.tab
index 494fe8961e..1b5e5f66b0 100644
--- a/erts/emulator/beam/macros.tab
+++ b/erts/emulator/beam/macros.tab
@@ -63,10 +63,21 @@ JUMP(Fail) {
     Goto(*I);
 }
 
+GC_SWAPOUT() {
+    //
+    // Since a garbage collection is expensive anyway, we can afford
+    // to save the instruction counter so that the correct function will
+    // be pointed in the crash dump if the garbage collection fails
+    // because of insufficient memory.
+    //
+    SWAPOUT;
+    c_p->i = I;
+}
+
 GC_TEST(Ns, Nh, Live) {
     Uint need = $Nh + $Ns;
     if (ERTS_UNLIKELY(E - HTOP < need)) {
-       SWAPOUT;
+       $GC_SWAPOUT();
        PROCESS_MAIN_CHK_LOCKS(c_p);
        FCALLS -= erts_garbage_collect_nobump(c_p, need, reg, $Live, FCALLS);
        ERTS_VERIFY_UNUSED_TEMP_ALLOC(c_p);
@@ -79,7 +90,7 @@ GC_TEST(Ns, Nh, Live) {
 GC_TEST_PRESERVE(NeedHeap, Live, PreserveTerm) {
     Uint need = $NeedHeap;
     if (ERTS_UNLIKELY(E - HTOP < need)) {
-       SWAPOUT;
+       $GC_SWAPOUT();
        reg[$Live] = $PreserveTerm;
        PROCESS_MAIN_CHK_LOCKS(c_p);
        FCALLS -= erts_garbage_collect_nobump(c_p, need, reg, $Live+1, FCALLS);
diff --git a/erts/emulator/beam/map_instrs.tab b/erts/emulator/beam/map_instrs.tab
index c594a87298..5620d5a2d1 100644
--- a/erts/emulator/beam/map_instrs.tab
+++ b/erts/emulator/beam/map_instrs.tab
@@ -127,11 +127,21 @@ i_get_map_elements(Fail, Src, N) {
     }
 }
 
-update_map_assoc(Src, Dst, Live, N) {
+update_map_assoc := update_map_assoc.fetch.execute;
+
+update_map_assoc.head() {
+    Eterm map;
+}
+
+update_map_assoc.fetch(Src) {
+    map = $Src;
+}
+
+update_map_assoc.execute(Dst, Live, N) {
     Eterm res;
     Uint live = $Live;
 
-    reg[live] = $Src;
+    reg[live] = map;
     HEAVY_SWAPOUT;
     res = erts_gc_update_map_assoc(c_p, reg, live, $N, $NEXT_INSTRUCTION);
     HEAVY_SWAPIN;
@@ -141,11 +151,21 @@ update_map_assoc(Src, Dst, Live, N) {
     $NEXT($NEXT_INSTRUCTION+$N);
 }
 
-update_map_exact(Fail, Src, Dst, Live, N) {
+update_map_exact := update_map_exact.fetch.execute;
+
+update_map_exact.head() {
+    Eterm map;
+}
+
+update_map_exact.fetch(Src) {
+    map = $Src;
+}
+
+update_map_exact.execute(Fail, Dst, Live, N) {
     Eterm res;
     Uint live = $Live;
 
-    reg[live] = $Src;
+    reg[live] = map;
     HEAVY_SWAPOUT;
     res = erts_gc_update_map_exact(c_p, reg, live, $N, $NEXT_INSTRUCTION);
     HEAVY_SWAPIN;
diff --git a/erts/emulator/beam/msg_instrs.tab b/erts/emulator/beam/msg_instrs.tab
index 9bf3aefaca..b08466c830 100644
--- a/erts/emulator/beam/msg_instrs.tab
+++ b/erts/emulator/beam/msg_instrs.tab
@@ -105,6 +105,7 @@ i_loop_rec(Dest) {
         $SET_CP_I_ABS(I);
         c_p->arity = 0;
         c_p->current = NULL;
+        c_p->fcalls = FCALLS;
         FCALLS -= erts_proc_sig_receive_helper(c_p, FCALLS, neg_o_reds,
                                                &msgp, &get_out);
         SWAPIN;
@@ -137,8 +138,8 @@ i_loop_rec(Dest) {
 
     if (ERTS_UNLIKELY(ERTS_SIG_IS_EXTERNAL_MSG(msgp))) {
         FCALLS -= 10; /* FIXME: bump appropriate amount... */
-        SWAPOUT; /* erts_decode_dist_message() may write to heap... */
-        if (!erts_decode_dist_message(c_p, ERTS_PROC_LOCK_MAIN, msgp, 0)) {
+        SWAPOUT; /* erts_proc_sig_decode_dist() may write to heap... */
+        if (!erts_proc_sig_decode_dist(c_p, ERTS_PROC_LOCK_MAIN, msgp, 0)) {
             /*
              * A corrupt distribution message that we weren't able to decode;
              * remove it...
diff --git a/erts/emulator/beam/ops.tab b/erts/emulator/beam/ops.tab
index e76d896ffc..b9d4f6afcc 100644
--- a/erts/emulator/beam/ops.tab
+++ b/erts/emulator/beam/ops.tab
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2018. All Rights Reserved.
+# Copyright Ericsson AB 1997-2019. 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.
@@ -74,23 +74,19 @@ trace_jump W
 
 return
 
+# To ensure that a "move Src x(0)" instruction can be combined with
+# the following call instruction, we need to make sure that there is
+# no line/1 instruction between the move and the call.
 #
-# To ensure that a "move Src x(0)" instruction can be combined
-# with the following call instruction, we need to make sure that
-# there is no line/1 instruction between the move and the call.
-#
-# A tail-recursive call to an external function (non-BIF) will
-# never be saved on the stack, so there is no reason to keep
-# the line instruction. (The compiler did not remove the line
-# instruction because it cannot tell the difference between
-# BIFs and ordinary Erlang functions.)
-#
+# A tail-recursive call to an external function (BIF or non-BIF) will
+# never be saved on the stack, so there is no reason to keep the line
+# instruction.
 
 move S X0=x==0 | line Loc | call_ext Ar Func => \
      line Loc | move S X0 | call_ext Ar Func
-move S X0=x==0 | line Loc | call_ext_last Ar Func=u$is_not_bif D => \
+move S X0=x==0 | line Loc | call_ext_last Ar Func D => \
      move S X0 | call_ext_last Ar Func D
-move S X0=x==0 | line Loc | call_ext_only Ar Func=u$is_not_bif => \
+move S X0=x==0 | line Loc | call_ext_only Ar Func => \
      move S X0 | call_ext_only Ar Func
 move S X0=x==0 | line Loc | call Ar Func => \
      line Loc | move S X0 | call Ar Func
@@ -102,15 +98,18 @@ line I
 allocate t t?
 allocate_heap t I t?
 
-%cold
+# This instruction when a BIF is called tail-recursively when
+# ther is stack frame.
 deallocate Q
-%hot
 
 init y
 allocate_zero t t?
 allocate_heap_zero t I t?
 
+move Src=y Dst=x | trim N Remaining => move_trim Src Dst N
 trim N Remaining => i_trim N
+
+move_trim y x t
 i_trim t
 
 test_heap I t?
@@ -118,11 +117,21 @@ test_heap I t?
 allocate_heap S u==0 R => allocate S R
 allocate_heap_zero S u==0 R => allocate_zero S R
 
-init2 y y
-init3 y y y
+init Y1 | init Y2 | init Y3 | succ(Y1,Y2) | succ(Y2,Y3) => init_seq3 Y1
+init_seq3 Y1 | init Y4 | succ3(Y1,Y4) => init_seq4 Y1
+init_seq4 Y1 | init Y5 | succ4(Y1,Y5) => init_seq5 Y1
+
+init_seq3 y
+init_seq4 y
+init_seq5 y
+
 init Y1 | init Y2 | init Y3 => init3 Y1 Y2 Y3
 init Y1 | init Y2 => init2 Y1 Y2
 
+init2 y y
+init3 y y y
+
+
 # Selecting values
 
 select_val S=aiq Fail=f Size=u Rest=* => const_select_val(S, Fail, Size, Rest)
@@ -205,14 +214,11 @@ set_tuple_element s S P
 
 # Get tuple element
 
-i_get_tuple_element xy P x
-
-%cold
-i_get_tuple_element xy P y
-%hot
+i_get_tuple_element xy P xy
 
 i_get_tuple_element2 x P x
-i_get_tuple_element2y x P y y
+i_get_tuple_element2_dst x P x x
+i_get_tuple_element2_dst x P y y
 
 i_get_tuple_element3 x P x
 
@@ -258,12 +264,14 @@ system_limit j
 # Move instructions.
 #
 
-move C=cxy x==0 | jump Lbl => move_jump Lbl C
+move Src=cxy Dst=xy | jump Lbl => move_jump Lbl Src Dst
 
-move_jump f ncxy
+move_jump f cxy xy
+move_jump f c r
 
-# Movement to and from the stack is common
-# Try to pack as much as we can into one instruction
+
+# Movement to and from the stack is common.
+# Try to pack as much as we can into one instruction.
 
 # Window move
 move_window/5
@@ -274,6 +282,9 @@ move_window/6
 move X1=x Y1=y | move X2=x Y2=y | move X3=x Y3=y | succ(Y1,Y2) | succ(Y2,Y3) => \
     move_window X1 X2 X3 Y1 Y3
 
+move X1=x Y1=y | move X2=x Y2=y | succ(Y1,Y2) => \
+    move_window2 X1 X2 Y1
+
 move_window X1=x X2=x X3=x Y1=y Y3=y | move X4=x Y4=y | succ(Y3,Y4) => \
     move_window X1 X2 X3 X4 Y1 Y4
 
@@ -283,15 +294,54 @@ move_window X1=x X2=x X3=x X4=x Y1=y Y4=y | move X5=x Y5=y | succ(Y4,Y5) => \
 move_window X1=x X2=x X3=x Y1=y Y3=y => move_window3 X1 X2 X3 Y1
 move_window X1=x X2=x X3=x X4=x Y1=y Y4=y => move_window4 X1 X2 X3 X4 Y1
 
+move_window2 x x y
 move_window3 x x x y
 move_window4 x x x x y
 move_window5 x x x x x y
 
+# y -> x
+
+move_src_window/4
+move_src_window/5
+
+move Y1=y X1=x | move Y2=y X2=x | succ(Y1, Y2) => \
+    move_src_window Y1 Y2 X1 X2
+
+move_src_window Y1 Y2 X1 X2 | move Y3=y X3=x | succ(Y2, Y3) => \
+    move_src_window Y1 Y3 X1 X2 X3
+move_src_window Y1 Y2 X1 X2 | move Y3=y X3=x | move Y4=y X4=x | succ(Y3, Y4) => \
+    move_src_window2 Y1 X1 X2 | move_src_window Y3 Y4 X3 X4
+move_src_window Y1 Y2 X1 X2 | move Y3=y X3=x => \
+    move3 Y1 X1 Y2 X2 Y3 X3
+
+move_src_window Y1 Y3 X1 X2 X3 | move Y4=y X4=x | succ(Y3, Y4) => \
+    move_src_window4 Y1 X1 X2 X3 X4
+
+move_src_window Y1 y X1 X2    => move_src_window2 Y1 X1 X2
+move_src_window Y1 y X1 X2 X3 => move_src_window3 Y1 X1 X2 X3
+
+move_src_window2 y x x
+move_src_window3 y x x x
+move_src_window4 y x x x x
+
 # Swap registers.
-move R1=x Tmp=x | move R2=xy R1 | move Tmp R2 => swap_temp R1 R2 Tmp
+move R1=xy Tmp=x | move R2=xy R1 | move Tmp R2 => swap_temp R1 R2 Tmp
+
+# The compiler uses x(1022) when swapping registers. It will definitely
+# not be used again.
+swap_temp R1 R2 Tmp=x==1022 => swap R1 R2
+
+swap_temp R1 R2 Tmp | move Src Tmp => swap R1 R2 | move Src Tmp
 
 swap_temp R1 R2 Tmp | line Loc | apply Live | is_killed_apply(Tmp, Live) => \
   swap R1 R2 | line Loc | apply Live
+swap_temp R1 R2 Tmp | line Loc | apply_last Live D | is_killed_apply(Tmp, Live) => \
+  swap R1 R2 | line Loc | apply_last Live D
+
+swap_temp R1 R2 Tmp | line Loc | call_fun Live | is_killed_by_call_fun(Tmp, Live) => \
+  swap R1 R2 | line Loc | call_fun Live
+swap_temp R1 R2 Tmp | make_fun2 OldIndex=u | is_killed_by_make_fun(Tmp, OldIndex) => \
+  swap R1 R2 | make_fun2 OldIndex
 
 swap_temp R1 R2 Tmp | line Loc | call Live Addr | is_killed(Tmp, Live) => \
   swap R1 R2 | line Loc | call Live Addr
@@ -307,84 +357,112 @@ swap_temp R1 R2 Tmp | line Loc | call_ext_only Live Addr | \
 swap_temp R1 R2 Tmp | line Loc | call_ext_last Live Addr D | \
   is_killed(Tmp, Live) => swap R1 R2 | line Loc | call_ext_last Live Addr D
 
-swap_temp x xy x
+swap_temp R1 R2 Tmp | call_ext Live Addr | is_killed(Tmp, Live) => \
+  swap R1 R2 | call_ext Live Addr
+swap_temp R1 R2 Tmp | call_ext_only Live Addr | is_killed(Tmp, Live) => \
+  swap R1 R2 | call_ext_only Live Addr
+swap_temp R1 R2 Tmp | call_ext_last Live Addr D | is_killed(Tmp, Live) => \
+  swap R1 R2 | call_ext_last Live Addr D
+
+swap_temp R1 R2 Tmp | move Src Any | line Loc | call Live Addr | \
+  is_killed(Tmp, Live) | distinct(Tmp, Src) => \
+     swap R1 R2 | move Src Any | line Loc | call Live Addr
+swap_temp R1 R2 Tmp | move Src Any | line Loc | call_ext Live Addr | \
+  is_killed(Tmp, Live) | distinct(Tmp, Src) => \
+     swap R1 R2 | move Src Any | line Loc | call_ext Live Addr
+swap_temp R1 R2 Tmp | move Src Any | call_only Live Addr | \
+  is_killed(Tmp, Live) | distinct(Tmp, Src) => \
+    swap R1 R2 | move Src Any | call_only Live Addr
+swap_temp R1 R2 Tmp | move Src Any | line Loc | call_ext_only Live Addr | \
+  is_killed(Tmp, Live) | distinct(Tmp, Src) => \
+    swap R1 R2 | move Src Any | line Loc | call_ext_only Live Addr
+swap_temp R1 R2 Tmp | move Src Any | line Loc | call_fun Live | \
+  is_killed(Tmp, Live) | distinct(Tmp, Src) => \
+    swap R1 R2 | move Src Any | line Loc | call_fun Live
+
+swap_temp R1 R2 Tmp | line Loc | send | is_killed_by_send(Tmp) => \
+  swap R1 R2 | line Loc | send
+
+# swap_temp/3 with Y register operands are rare.
+swap_temp R1 R2=y Tmp => swap R1 R2 | move R2 Tmp
+swap_temp R1=y R2 Tmp => swap R1 R2 | move R2 Tmp
+
+swap R1=x R2=y => swap R2 R1
+
+swap_temp x x x
+
+swap xy x
+swap y y
+
+# move_shift
+
+move SD=x    D=x | move Src=cxy SD=x  | distinct(D, Src) => move_shift Src SD D
+move SD=y    D=x | move Src=x  SD=y   | distinct(D, Src) => move_shift Src SD D
+move SD=y    D=x | init SD            |                  => move_shift n   SD D
+move SD=x    D=y | move Src=x  SD=x   | distinct(D, Src) => move_shift Src SD D
+move SD=x==0 D=y | move Src=y SD=x==0 | distinct(D, Src) => move_shift Src SD D
+
+move_shift cxy x x
+move_shift nx y x
+move_shift x x y
+move_shift y r y
+
+# move2_par x x x x
 
-swap x xy
+move X1=x X2=x | move X3=x X4=x | independent_moves(X1, X2, X3, X4) => \
+     move2_par X1 X2 X3 X4
+move2_par x x x x
 
-move Src=x D1=x | move Src=x D2=x => move_dup Src D1 D2
-move Src=x SD=x | move SD=x D=x   => move_dup Src SD D
-move Src=x D1=x | move Src=x D2=y => move_dup Src D1 D2
-move Src=y SD=x | move SD=x D=y   => move_dup Src SD D
-move Src=x SD=x | move SD=x D=y   => move_dup Src SD D
-move Src=y SD=x | move SD=x D=x   => move_dup Src SD D
+# move2_par x x x y
 
-move SD=x D=x | move Src=xy SD=x => move_shift Src SD D
-move SD=y D=x | move Src=x  SD=y => move_shift Src SD D
-move SD=x D=y | move Src=x  SD=x => move_shift Src SD D
+move X1=x X2=x | move X3=x Y1=y | independent_moves(X1, X2, X3, Y1) => \
+     move2_par X1 X2 X3 Y1
+move X3=x Y1=y | move X1=x X2=x | independent_moves(X3, Y1, X1, X2) => \
+     move2_par X1 X2 X3 Y1
+move2_par x x x y
 
-# The transformations above guarantee that the source for
-# the second move is not the same as the destination for
-# the first move. That means that we can do the moves in
-# parallel (fetch both values, then store them) which could
-# be faster.
+# move2_par y x y x
 
-move X1=x Y1=y | move X2=x Y2=y => move2_par X1 Y1 X2 Y2
 move Y1=y X1=x | move Y2=y X2=x => move2_par Y1 X1 Y2 X2
+move2_par y x y x
 
-move X1=x X2=x | move X3=x X4=x => move2_par X1 X2 X3 X4
+# move2_par y x x y
 
-move X1=x X2=x | move X3=x Y1=y => move2_par X1 X2 X3 Y1
+move S1=y S2=x | move X1=x Y1=y | independent_moves(S1, S2, X1, Y1) => \
+     move2_par S1 S2 X1 Y1
+move X1=x Y1=y | move S1=y S2=x | independent_moves(S1, S2, X1, Y1) => \
+     move2_par S1 S2 X1 Y1
+move2_par y x x y
 
-move S1=x S2=x | move X1=x Y1=y => move2_par S1 S2 X1 Y1
+# move2_par y x x x
 
-move S1=y S2=x | move X1=x Y1=y => move2_par S1 S2 X1 Y1
+move Y1=y X1=x | move S1=x D1=x | independent_moves(Y1, X1, S1, D1) => \
+     move2_par Y1 X1 S1 D1
+move S1=x D1=x | move Y1=y X1=x | independent_moves(Y1, X1, S1, D1) => \
+     move2_par Y1 X1 S1 D1
+move2_par y x x x
 
-move Y1=y X1=x | move S1=x D1=x => move2_par Y1 X1 S1 D1
-move S1=x D1=x | move Y1=y X1=x => move2_par S1 D1 Y1 X1
+# move3
 
-move2_par X1=x Y1=y X2=x Y2=y | move X3=x Y3=y => move3 X1 Y1 X2 Y2 X3 Y3
 move2_par Y1=y X1=x Y2=y X2=x | move Y3=y X3=x => move3 Y1 X1 Y2 X2 Y3 X3
 move2_par X1=x X2=x X3=x X4=x | move X5=x X6=x => move3 X1 X2 X3 X4 X5 X6
 
+move3 y x y x y x
+move3 x x x x x x
+
+# move_x1, move_x2
+
 move C=aiq X=x==1 => move_x1 C
 move C=aiq X=x==2 => move_x2 C
 
+move n D=y => init D
+
 move_x1 c
 move_x2 c
 
-move_shift x x x
-move_shift y x x
-move_shift x y x
-move_shift x x y
-
-move_dup xy x xy
-
-move2_par x y x y
-move2_par y x y x
-move2_par x x x x
-
-move2_par x x x y
-
-move2_par y x x y
-
-move2_par x x y x
-move2_par y x x x
-
-move3 x y x y x y
-move3 y x y x y x
-move3 x x x x x x
-
-# The compiler almost never generates a "move Literal y(Y)" instruction,
-# so let's cheat if we encounter one.
-move S=n D=y => init D
-move S=c D=y => move S x | move x D
-
-move x x
-move x y
-move y x
-move c x
+move xy xy
+move c xy
 move n x
-move y y
 
 # The following move instructions using x(0) are frequently used.
 
@@ -478,14 +556,25 @@ is_ge f? c x
 is_ge f? s s
 %hot
 
-is_eq f? s s
+is_eq Fail=f Const=c Reg=xy => is_eq Fail Reg Const
+is_eq Fail=f C1=c C2=c => move C1 x | is_eq Fail x C2
+is_eq f? S s
 
-is_ne f? s s
+is_ne Fail=f Const=c Reg=xy => is_ne Fail Reg Const
+is_ne Fail=f C1=c C2=c => move C1 x | is_ne Fail x C2
+is_ne f? S s
 
 #
-# Putting things.
+# Putting tuples.
+#
+# Code compiled with OTP 22 and later uses put_tuple2 to
+# to construct a tuple.
+#
+# Code compiled before OTP 22 uses put_tuple + one put instruction
+# per element. Translate to put_tuple2.
 #
 
+i_put_tuple/2
 put_tuple Arity Dst => i_put_tuple Dst u
 
 i_put_tuple Dst Arity Puts=* | put S1 | put S2 | \
@@ -495,11 +584,13 @@ i_put_tuple Dst Arity Puts=* | put S1 | put S2 | \
 i_put_tuple Dst Arity Puts=* | put S => \
 	    tuple_append_put(Arity, Dst, Puts, S)
 
-i_put_tuple/2
+i_put_tuple Dst Arity Puts=* => put_tuple2 Dst Arity Puts
 
-i_put_tuple xy I
+put_tuple2 xy I
 
 #
+# Putting lists.
+#
 # The instruction "put_list Const [] Dst" were generated in rare
 # circumstances up to and including OTP 18. Starting with OTP 19,
 # AFAIK, it should never be generated.
@@ -510,32 +601,26 @@ 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
-put_list y x x
+# put_list SrcReg1 SrcReg2 => Dst
+
+put_list xy xy x
 
-put_list y y x
-put_list x y x
+# put_list SrcReg [] => Dst
 
-# put_list SrcReg Constant Dst
+put_list xy n xy
 
-put_list x c x
-put_list x c y
+# put_list SrcReg Constant => x
 
-put_list y c x
+put_list xy c x
 
-# put_list Constant SrcReg Dst
+# put_list Constant SrcReg => Dst
 
-put_list c x x
-put_list c y x
+put_list c xy x
 
 # The following put_list instructions using x(0) are frequently used.
 
-put_list r n r
-put_list r n x
-put_list r x x
-put_list r x r
+put_list r n rx
+put_list r x rx
 put_list x x r
 
 %cold
@@ -602,19 +687,36 @@ is_tuple f? rxy
 
 test_arity Fail Literal=q Arity => move Literal x | test_arity Fail x Arity
 test_arity Fail=f c Arity => jump Fail
+test_arity Fail Tuple=x Arity | get_tuple_element Tuple Pos Dst=x => \
+   test_arity_get_tuple_element Fail Tuple Arity Pos Dst
 
 test_arity f? xy A
 
-get_tuple_element Reg=x P1 D1=x | get_tuple_element Reg=x P2 D2=x | \
+test_arity_get_tuple_element f? x A P x
+
+is_tuple NotTupleFail Tuple=x | is_tagged_tuple WrongRecordFail Tuple Arity Atom => \
+   is_tagged_tuple_ff NotTupleFail WrongRecordFail Tuple Arity Atom
+
+is_tagged_tuple_ff f? f? rx A a
+
+get_tuple_element Reg=x P1 D1=x | \
+   get_tuple_element Reg=x P2 D2=x | \
    get_tuple_element Reg=x P3 D3=x | \
-   succ(P1, P2) | succ(P2, P3) | \
-   succ(D1, D2) | succ(D2, D3) => i_get_tuple_element3 Reg P1 D1
+   succ(P1, P2) | succ(P2, P3) | succ(D1, D2) | succ(D2, D3) | \
+   distinct(D1, Reg) | distinct(D2, Reg) => \
+      i_get_tuple_element3 Reg P1 D1
+
+get_tuple_element Reg=x P1 D1=x | \
+   get_tuple_element Reg=x P2 D2=x | \
+   succ(P1, P2) | succ(D1, D2) | \
+   distinct(D1, Reg) => \
+      i_get_tuple_element2 Reg P1 D1
 
 get_tuple_element Reg=x P1 D1=x | get_tuple_element Reg=x P2 D2=x | \
-   succ(P1, P2) | succ(D1, D2) => i_get_tuple_element2 Reg P1 D1
+   succ(P1, P2) | distinct(D1, Reg) => i_get_tuple_element2_dst Reg P1 D1 D2
 
 get_tuple_element Reg=x P1 D1=y | get_tuple_element Reg=x P2 D2=y | \
-   succ(P1, P2) => i_get_tuple_element2y Reg P1 D1 D2
+   succ(P1, P2) => i_get_tuple_element2_dst Reg P1 D1 D2
 
 get_tuple_element Reg P Dst => i_get_tuple_element Reg P Dst
 
@@ -638,14 +740,21 @@ is_list f? y
 
 is_nonempty_list Fail=f S=x | allocate Need Rs => is_nonempty_list_allocate Fail S Need Rs
 
-is_nonempty_list F=f x==0 | test_heap I1 I2 => is_nonempty_list_test_heap F I1 I2
-
 is_nonempty_list Fail=f S=x | get_list S D1=x D2=x => \
   is_nonempty_list_get_list Fail S D1 D2
 
+is_nonempty_list Fail=f S=x | get_hd S Dst=x => \
+  is_nonempty_list_get_hd Fail S Dst
+
+is_nonempty_list Fail=f S=x | get_tl S Dst=x => \
+  is_nonempty_list_get_tl Fail S Dst
+
 is_nonempty_list_allocate f? rx t t
-is_nonempty_list_test_heap f? I t
+
 is_nonempty_list_get_list f? rx x x
+is_nonempty_list_get_hd f? x x
+is_nonempty_list_get_tl f? x x
+
 is_nonempty_list f? xy
 
 is_atom f? x
@@ -710,11 +819,12 @@ is_boolean Fail=f ac => jump Fail
 is_boolean f? xy
 %hot
 
-is_function2 Fail=f Literal=q Arity | literal_is_export(Literal) =>
-is_function2 Fail=f c Arity => jump Fail
-is_function2 Fail=f Fun a => jump Fail
+is_function2 Fail=f Fun Arity => gen_is_function2(Fail, Fun, Arity)
 
-is_function2 f? S s
+%cold
+cold_is_function2 f? x x
+%hot
+hot_is_function2 f? S t
 
 # Allocating & initializing.
 allocate Need Regs | init Y => allocate_init Need Regs Y
@@ -946,10 +1056,9 @@ call_ext_only u==0 u$func:os:perf_counter/0 => \
 
 call_ext u Bif=u$is_bif => call_bif Bif
 
-call_ext_last u Bif=u$is_bif D => call_bif Bif | deallocate_return D
+call_ext_last u Bif=u$is_bif D => deallocate D | call_bif_only Bif
 
-call_ext_only Ar=u Bif=u$is_bif => \
-  allocate u Ar | call_bif Bif | deallocate_return u
+call_ext_only Ar=u Bif=u$is_bif => call_bif_only Bif
 
 #
 # Any remaining calls are calls to Erlang functions, not BIFs.
@@ -981,6 +1090,7 @@ i_perf_counter
 %hot
 
 call_bif e
+call_bif_only e
 
 #
 # Calls to non-building and guard BIFs.
@@ -989,14 +1099,18 @@ call_bif e
 bif0 u$bif:erlang:self/0 Dst=d => self Dst
 bif0 u$bif:erlang:node/0 Dst=d => node Dst
 
+bif1 Fail=f Bif=u$bif:erlang:hd/1 Src=x Dst=x => is_nonempty_list_get_hd Fail Src Dst
+bif1 Fail=f Bif=u$bif:erlang:tl/1 Src=x Dst=x => is_nonempty_list_get_tl Fail Src Dst
+
 bif1 Fail Bif=u$bif:erlang:get/1 Src=s Dst=d => gen_get(Src, Dst)
 
 bif2 Jump=j u$bif:erlang:element/2 S1=s S2=xy Dst=d => gen_element(Jump, S1, S2, Dst)
 
-bif1 p Bif S1 Dst => bif1_body Bif S1 Dst
+bif1 p Bif S1 Dst         => i_bif1_body S1 Bif Dst
+bif1 Fail=f Bif S1 Dst    => i_bif1 S1 Fail Bif Dst
 
-bif2 p Bif S1 S2 Dst => i_bif2_body Bif S1 S2 Dst
-bif2 Fail Bif S1 S2 Dst => i_bif2 Fail Bif S1 S2 Dst
+bif2 p Bif S1 S2 Dst      => i_bif2_body S2 S1 Bif Dst
+bif2 Fail=f Bif S1 S2 Dst => i_bif2 S2 S1 Fail Bif Dst
 
 i_get_hash c I d
 i_get s d
@@ -1014,10 +1128,12 @@ i_fast_element xy j? I d
 
 i_element xy j? s d
 
-bif1 f? b s d
-bif1_body b s d
-i_bif2 f? b s s d
-i_bif2_body b s s d
+i_bif1 s f? b d
+i_bif1_body s b d
+i_bif2 s s f? b d
+i_bif2_body s s b d
+i_bif3 s s s f? b d
+i_bif3_body s s s b d
 
 #
 # Internal calls.
@@ -1062,8 +1178,25 @@ call_fun Arity => i_call_fun Arity
 i_call_fun t
 i_call_fun_last t Q
 
+
+#
+# A fun with an empty environment can be converted to a literal.
+# As a further optimization, the we try to move the fun to its
+# final destination directly.
+
 make_fun2 OldIndex=u => gen_make_fun2(OldIndex)
 
+move_fun/2
+move_fun Fun X0 | move X0 Dst | move Src X0 => move Fun Dst | move Src X0
+move_fun Fun X0 | move A B | move X0 Dst | move Src X0 | \
+  independent_moves(Fun, X0, A, B) | distinct(Dst, A) => \
+    move Fun Dst | move A B | move Src X0
+move_fun Fun X0 | move X0 Dst | make_fun2 OldIndex | \
+  is_killed_by_make_fun(X0, OldIndex)=> \
+    move Fun Dst | make_fun2 OldIndex
+
+move_fun Fun Dst => move Fun Dst
+
 %cold
 i_make_fun W t
 %hot
@@ -1074,101 +1207,141 @@ is_function Fail=f c => jump Fail
 func_info M F A => i_func_info u M F A
 
 # ================================================================
-# New bit syntax matching (R11B).
+# Bit syntax matching obsoleted in OTP 22.
 # ================================================================
 
-%warm
+%cold
 bs_start_match2 Fail=f ica X Y D => jump Fail
 bs_start_match2 Fail Bin X Y D => i_bs_start_match2 Bin Fail X Y D
-i_bs_start_match2 xy f t t x
+i_bs_start_match2 xy f t t d
 
+bs_save2 Y=y Index => move Y x | bs_save2 x Index
 bs_save2 Reg Index => gen_bs_save(Reg, Index)
 i_bs_save2 x t
 
+bs_restore2 Y=y Index => move Y x | bs_restore2 x Index
 bs_restore2 Reg Index => gen_bs_restore(Reg, Index)
 i_bs_restore2 x t
 
+bs_context_to_binary Y=y | line L | badmatch Y => \
+    move Y x | bs_context_to_binary x | line L | badmatch x
+bs_context_to_binary Y=y => move Y x | bs_context_to_binary x
+bs_context_to_binary x
+%warm
+
+# ================================================================
+# New bit syntax matching (R11B).
+# ================================================================
+
+%warm
+
 # Matching integers
 bs_match_string Fail Ms Bits Val => i_bs_match_string Ms Fail Bits Val
 
-i_bs_match_string x f W W
+i_bs_match_string xy f W W
 
 # Fetching integers from binaries.
-bs_get_integer2 Fail=f Ms=x Live=u Sz=sq Unit=u Flags=u Dst=d => \
+bs_get_integer2 Fail=f Ms=xy Live=u Sz=sq Unit=u Flags=u Dst=d => \
 			gen_get_integer2(Fail, Ms, Live, Sz, Unit, Flags, Dst)
 
-i_bs_get_integer_small_imm x W f? t x
-i_bs_get_integer_imm x W t f? t x
-i_bs_get_integer f? t t x s x
-i_bs_get_integer_8 x f? x
-i_bs_get_integer_16 x f? x
+i_bs_get_integer_small_imm Ms Bits Fail Flags Y=y => \
+   i_bs_get_integer_small_imm Ms Bits Fail Flags x | move x Y
+
+i_bs_get_integer_imm Ms Bits Live Fail Flags Y=y => \
+   i_bs_get_integer_imm Ms Bits Live Fail Flags x | move x Y
+
+i_bs_get_integer_small_imm xy W f? t x
+i_bs_get_integer_imm xy W t f? t x
+i_bs_get_integer xy f? t t s d
+i_bs_get_integer_8 xy f? d
+i_bs_get_integer_16 xy f? d
 
 %if ARCH_64
-i_bs_get_integer_32 x f? x
+i_bs_get_integer_32 xy f? d
 %endif
 
 # Fetching binaries from binaries.
-bs_get_binary2 Fail=f Ms=x Live=u Sz=sq Unit=u Flags=u Dst=d => \
+bs_get_binary2 Fail=f Ms=xy Live=u Sz=sq Unit=u Flags=u Dst=d => \
 			gen_get_binary2(Fail, Ms, Live, Sz, Unit, Flags, Dst)
 
-i_bs_get_binary_imm2 f? x t W t x
-i_bs_get_binary2 f x t? s t x
-i_bs_get_binary_all2 f? x t t x
-i_bs_get_binary_all_reuse x f? t
+i_bs_get_binary_imm2 xy f? t W t d
+i_bs_get_binary2 xy f t? s t d
+i_bs_get_binary_all2 xy f? t t d
 
 # Fetching float from binaries.
-bs_get_float2 Fail=f Ms=x Live=u Sz=s Unit=u Flags=u Dst=d => \
+bs_get_float2 Fail=f Ms=xy Live=u Sz=s Unit=u Flags=u Dst=d => \
 		gen_get_float2(Fail, Ms, Live, Sz, Unit, Flags, Dst)
 
 bs_get_float2 Fail=f Ms=x Live=u Sz=q Unit=u Flags=u Dst=d => jump Fail
 
-i_bs_get_float2 f? x t s t x
+i_bs_get_float2 xy f? t s t d
 
 # Miscellanous
 
-bs_skip_bits2 Fail=f Ms=x Sz=sq Unit=u Flags=u => \
+bs_skip_bits2 Fail=f Ms=xy Sz=sq Unit=u Flags=u => \
 			gen_skip_bits2(Fail, Ms, Sz, Unit, Flags)
 
-i_bs_skip_bits_imm2 f? x W
-i_bs_skip_bits2 f? x xy t
-i_bs_skip_bits_all2 f? x t
+i_bs_skip_bits_imm2 f? xy W
+i_bs_skip_bits2 xy xy f? t
 
-bs_test_tail2 Fail=f Ms=x Bits=u==0 => bs_test_zero_tail2 Fail Ms
-bs_test_tail2 Fail=f Ms=x Bits=u => bs_test_tail_imm2 Fail Ms Bits
-bs_test_zero_tail2 f? x
-bs_test_tail_imm2 f? x W
+bs_test_tail2 Fail=f Ms=xy Bits=u==0 => bs_test_zero_tail2 Fail Ms
+bs_test_tail2 Fail=f Ms=xy Bits=u => bs_test_tail_imm2 Fail Ms Bits
+bs_test_zero_tail2 f? xy
+bs_test_tail_imm2 f? xy W
 
 bs_test_unit F Ms Unit=u==8 => bs_test_unit8 F Ms
-bs_test_unit f? x t
-bs_test_unit8 f? x
+bs_test_unit f? xy t
+bs_test_unit8 f? xy
 
-# An y register operand for bs_context_to_binary is rare,
-# but can happen because of inlining.
+# Gets a bitstring from the tail of a context.
+bs_get_tail xy d t
 
-bs_context_to_binary Y=y | line L | badmatch Y => \
-    move Y x | bs_context_to_binary x | line L | badmatch x
+# New bs_start_match variant for contexts with external position storage.
+#
+# bs_get/set_position is used to save positions into registers instead of
+# "slots" in the context itself, which lets us continue matching even after
+# we've passed it off to another function.
 
-bs_context_to_binary Y=y => move Y x | bs_context_to_binary x
+%if ARCH_64
+bs_start_match3 Fail Bin Live Ctx | bs_get_position Ctx Pos=x Ignored => \
+    i_bs_start_match3_gp Bin Live Fail Ctx Pos
+i_bs_start_match3_gp xy t f d x
+%endif
 
-bs_context_to_binary x
+bs_start_match3 Fail=f ica Live Dst => jump Fail
+bs_start_match3 Fail Bin Live Dst => i_bs_start_match3 Bin Live Fail Dst
+
+i_bs_start_match3 xy t f d
+
+# Match context position instructions. 64-bit assumes that all positions can
+# fit into an unsigned small.
+
+%if ARCH_64
+    bs_get_position Src Dst Live => i_bs_get_position Src Dst
+    i_bs_get_position xy xy
+    bs_set_position xy xy
+%else
+    bs_get_position xy d t?
+    bs_set_position xy xy
+%endif
 
 #
 # Utf8/utf16/utf32 support. (R12B-5)
 #
-bs_get_utf8 Fail=f Ms=x u u Dst=d => i_bs_get_utf8 Ms Fail Dst
-i_bs_get_utf8 x f? x
+bs_get_utf8 Fail=f Ms=xy u u Dst=d => i_bs_get_utf8 Ms Fail Dst
+i_bs_get_utf8 xy f? d
 
-bs_skip_utf8 Fail=f Ms=x u u => i_bs_get_utf8 Ms Fail x
+bs_skip_utf8 Fail=f Ms=xy u u => i_bs_get_utf8 Ms Fail x
 
-bs_get_utf16 Fail=f Ms=x u Flags=u Dst=d => i_bs_get_utf16 Ms Fail Flags Dst
-bs_skip_utf16 Fail=f Ms=x u Flags=u => i_bs_get_utf16 Ms Fail Flags x
+bs_get_utf16 Fail=f Ms=xy u Flags=u Dst=d => i_bs_get_utf16 Ms Fail Flags Dst
+bs_skip_utf16 Fail=f Ms=xy u Flags=u => i_bs_get_utf16 Ms Fail Flags x
 
-i_bs_get_utf16 x f? t x
+i_bs_get_utf16 xy f? t d
 
-bs_get_utf32 Fail=f Ms=x Live=u Flags=u Dst=d => \
+bs_get_utf32 Fail=f Ms=xy Live=u Flags=u Dst=d => \
 	bs_get_integer2 Fail Ms Live i=32 u=1 Flags Dst | \
 	i_bs_validate_unicode_retract Fail Dst Ms
-bs_skip_utf32 Fail=f Ms=x Live=u Flags=u => \
+bs_skip_utf32 Fail=f Ms=xy Live=u Flags=u => \
 	bs_get_integer2 Fail Ms Live i=32 u=1 Flags x | \
 	i_bs_validate_unicode_retract Fail x Ms
 
@@ -1182,6 +1355,9 @@ i_bs_validate_unicode_retract j s S
 
 bs_init2 Fail Sz Words Regs Flags Dst | binary_too_big(Sz) => system_limit Fail
 
+bs_init2 Fail Sz Words Regs Flags Dst=y => \
+   bs_init2 Fail Sz Words Regs Flags x | move x Dst
+
 bs_init2 Fail Sz=u Words=u==0 Regs Flags Dst => i_bs_init Sz Regs Dst
 
 bs_init2 Fail Sz=u Words Regs Flags Dst => \
@@ -1202,6 +1378,8 @@ i_bs_init_heap W I t? x
 
 
 bs_init_bits Fail Sz=o Words Regs Flags Dst => system_limit Fail
+bs_init_bits Fail Sz Words Regs Flags Dst=y => \
+   bs_init_bits Fail Sz Words Regs Flags x | move x Dst
 
 bs_init_bits Fail Sz=u Words=u==0 Regs Flags Dst => i_bs_init_bits Sz Regs Dst
 bs_init_bits Fail Sz=u Words Regs Flags Dst =>  i_bs_init_bits_heap Sz Words Regs Dst
@@ -1230,7 +1408,7 @@ bs_private_append Fail Size Unit Bin Flags Dst => \
 
 bs_init_writable
 
-i_bs_append j? I t? t s x
+i_bs_append j? I t? t s xy
 i_bs_private_append j? t s S x
 
 #
@@ -1240,31 +1418,35 @@ i_bs_private_append j? t s S x
 bs_put_integer Fail=j Sz=sq Unit=u Flags=u Src=s => \
 			gen_put_integer(Fail, Sz, Unit, Flags, Src)
 
-i_new_bs_put_integer j? s t s
-i_new_bs_put_integer_imm j? W t s
+i_new_bs_put_integer j? S t s
+i_new_bs_put_integer_imm xyc j? W t
 
 #
 # Utf8/utf16/utf32 support. (R12B-5)
 #
 
-bs_utf8_size j Src=s Dst=d => i_bs_utf8_size Src Dst
+bs_utf8_size j Src Dst=d => i_bs_utf8_size Src Dst
+bs_utf16_size j Src Dst=d => i_bs_utf16_size Src Dst
 
-i_bs_utf8_size s x
+bs_put_utf8 Fail u Src => i_bs_put_utf8 Fail Src
 
-bs_utf16_size j Src=s Dst=d => i_bs_utf16_size Src Dst
-
-i_bs_utf16_size s x
-
-bs_put_utf8 Fail u Src=s => i_bs_put_utf8 Fail Src
+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
 
-i_bs_put_utf8 j? s
+i_bs_utf8_size S x
+i_bs_utf16_size S x
 
-bs_put_utf16 j? t s
+i_bs_put_utf8 j? S
+bs_put_utf16 j? t S
 
-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
+i_bs_validate_unicode j? S
 
-i_bs_validate_unicode j? s
+# Handle unoptimized code.
+i_bs_utf8_size Src=c Dst => move Src x | i_bs_utf8_size x Dst
+i_bs_utf16_size Src=c Dst => move Src x | i_bs_utf16_size x Dst
+i_bs_put_utf8 Fail Src=c => move Src x | i_bs_put_utf8 Fail x
+bs_put_utf16 Fail Flags Src=c => move Src x | bs_put_utf16 Fail Flags x
+i_bs_validate_unicode Fail Src=c => move Src x | i_bs_validate_unicode Fail x
 
 #
 # Storing floats into binaries.
@@ -1274,7 +1456,7 @@ bs_put_float Fail Sz=q Unit Flags Val => badarg Fail
 bs_put_float Fail=j Sz=s Unit=u Flags=u Src=s => \
 			gen_put_float(Fail, Sz, Unit, Flags, Src)
 
-i_new_bs_put_float j? s t s
+i_new_bs_put_float j? S t s
 i_new_bs_put_float_imm j? W t s
 
 #
@@ -1284,9 +1466,18 @@ i_new_bs_put_float_imm j? W t s
 bs_put_binary Fail=j Sz=s Unit=u Flags=u Src=s => \
 			gen_put_binary(Fail, Sz, Unit, Flags, Src)
 
-i_new_bs_put_binary j? s t s
-i_new_bs_put_binary_imm j? W s
-i_new_bs_put_binary_all j? s t
+# In unoptimized code, the binary argument could be a literal. (In optimized code,
+# there would be a bs_put_string instruction.)
+i_new_bs_put_binary Fail Size Unit Lit=c => \
+   move Lit x | i_new_bs_put_binary Fail Size Unit x
+i_new_bs_put_binary_imm Fail Size Lit=c => \
+   move Lit x | i_new_bs_put_binary_imm Fail Size x
+i_new_bs_put_binary_all Lit=c Fail Unit => \
+   move Lit x | i_new_bs_put_binary_all x Fail Unit
+
+i_new_bs_put_binary j? S t S
+i_new_bs_put_binary_imm j? W S
+i_new_bs_put_binary_all xy j? t
 
 #
 # Warning: The i_bs_put_string and i_new_bs_put_string instructions
@@ -1384,23 +1575,22 @@ put_map_exact F Map Dst Live Size Rest=* | map_key_sort(Size, Rest) => \
 
 sorted_put_map_assoc Map Dst Live Size Rest=* | is_empty_map(Map) => \
    new_map Dst Live Size Rest
-sorted_put_map_assoc Src=s Dst Live Size Rest=* => \
-	       update_map_assoc Src Dst Live Size Rest
-sorted_put_map_assoc Src Dst Live Size Rest=* => \
-	       move Src x | update_map_assoc x Dst Live Size Rest
+sorted_put_map_assoc Src=xyc Dst Live Size Rest=* => \
+   update_map_assoc Src Dst Live Size Rest
 
-sorted_put_map_exact F Src=s Dst Live Size Rest=* => \
-	      update_map_exact F Src Dst Live Size Rest
-sorted_put_map_exact F Src Dst Live Size Rest=* => \
-	      move Src x | update_map_exact F x Dst Live Size Rest
+sorted_put_map_exact Fail Src=xy Dst Live Size Rest=* => \
+   update_map_exact Src Fail Dst Live Size Rest
+# Literal map arguments for an exact update operation are extremely rare.
+sorted_put_map_exact Fail Src Dst Live Size Rest=* => \
+   move Src x | update_map_exact x Fail Dst Live Size Rest
 
 new_map Dst Live Size Rest=* | is_small_map_literal_keys(Size, Rest) => \
    gen_new_small_map_lit(Dst, Live, Size, Rest)
 
 new_map d t I
 i_new_small_map_lit d t q
-update_map_assoc s d t I
-update_map_exact j? s d t I
+update_map_assoc xyc d t I
+update_map_exact xy j? d t I
 
 is_map Fail Lit=q | literal_is_map(Lit) =>
 is_map Fail cq => jump Fail
@@ -1447,80 +1637,94 @@ gc_bif2 Fail Live u$bif:erlang:sminus/2 S1 S2 Dst => \
 
 #
 # Optimize addition and subtraction of small literals using
-# the i_increment/4 instruction (in bodies, not in guards).
+# the i_increment/3 instruction (in bodies, not in guards).
 #
 
 gen_plus p Live Int=i Reg=d Dst => \
-	gen_increment(Reg, Int, Live, Dst)
+	gen_increment(Reg, Int, Dst)
 gen_plus p Live Reg=d Int=i Dst => \
-	gen_increment(Reg, Int, Live, Dst)
+	gen_increment(Reg, Int, Dst)
 
 gen_minus p Live Reg=d Int=i Dst | negation_is_small(Int) => \
-	gen_increment_from_minus(Reg, Int, Live, Dst)
+	gen_increment_from_minus(Reg, Int, Dst)
 
 #
-# GCing arithmetic instructions.
+# Arithmetic instructions.
 #
 
-gen_plus Fail Live S1 S2 Dst => i_plus S1 S2 Fail Live Dst
+# It is OK to swap arguments for '+' in a guard. It is also
+# OK to turn minus into plus in a guard.
+gen_plus Fail=f Live S1=c S2 Dst => i_plus S2 S1 Fail Dst
+gen_minus Fail=f Live S1 S2=i Dst => gen_plus_from_minus(Fail, Live, S1, S2, Dst)
+
+gen_plus Fail Live S1 S2 Dst => i_plus S1 S2 Fail Dst
 
-gen_minus Fail Live S1 S2 Dst => i_minus S1 S2 Fail Live Dst
+gen_minus Fail Live S1 S2 Dst => i_minus S1 S2 Fail Dst
 
 gc_bif2 Fail Live u$bif:erlang:stimes/2 S1 S2 Dst => \
-  i_times Fail Live S1 S2 Dst
+  i_times Fail S1 S2 Dst
 
 gc_bif2 Fail Live u$bif:erlang:div/2 S1 S2 Dst => \
-  i_m_div Fail Live S1 S2 Dst
+  i_m_div Fail S1 S2 Dst
 gc_bif2 Fail Live u$bif:erlang:intdiv/2 S1 S2 Dst => \
-  i_int_div Fail Live S1 S2 Dst
+  i_int_div Fail S1 S2 Dst
 
 gc_bif2 Fail Live u$bif:erlang:rem/2 S1 S2 Dst => \
-  i_rem S1 S2 Fail Live Dst
+  i_rem S1 S2 Fail Dst
 
 gc_bif2 Fail Live u$bif:erlang:bsl/2 S1 S2 Dst => \
-  i_bsl S1 S2 Fail Live Dst
+  i_bsl S1 S2 Fail Dst
 gc_bif2 Fail Live u$bif:erlang:bsr/2 S1 S2 Dst => \
-  i_bsr S1 S2 Fail Live Dst
+  i_bsr S1 S2 Fail Dst
 
 gc_bif2 Fail Live u$bif:erlang:band/2 S1 S2 Dst => \
-  i_band S1 S2 Fail Live Dst
+  i_band S1 S2 Fail Dst
 
 gc_bif2 Fail Live u$bif:erlang:bor/2 S1 S2 Dst => \
-  i_bor Fail Live S1 S2 Dst
+  i_bor Fail S1 S2 Dst
 
 gc_bif2 Fail Live u$bif:erlang:bxor/2 S1 S2 Dst => \
-  i_bxor Fail Live S1 S2 Dst
+  i_bxor Fail S1 S2 Dst
 
-gc_bif1 Fail I u$bif:erlang:bnot/1 Src Dst=d => i_int_bnot Fail Src I Dst
+gc_bif1 Fail Live u$bif:erlang:bnot/1 Src Dst=d => i_int_bnot Fail Src Dst
 
-i_increment rxy W t d
+i_increment rxy W d
 
-i_plus x xy j? t d
-i_plus s s  j? t d
+# Handle unoptimized code.
+i_plus S1=c S2=c Fail Dst => move S1 x | i_plus x S2 Fail Dst
+i_plus S1=c S2=xy Fail Dst => i_plus S2 S1 Fail Dst
 
-i_minus x x j? t d
-i_minus s s j? t d
+i_plus xy xyc j? d
 
-i_times j? t s s d
+# A minus instruction with a constant right operand will be
+# converted to an i_increment instruction, except in guards or
+# when the negated value of the constant won't fit in a guard.
+# Therefore, it very rare.
+i_minus S1 S2=c Fail Dst => move S2 x | i_minus S1 x Fail Dst
 
-i_m_div j? t s s d
-i_int_div j? t s s d
+i_minus xy xy j? d
+i_minus c xy j? d
 
-i_rem x x j? t d
-i_rem s s j? t d
+i_times j? s s d
 
-i_bsl s s j? t d
-i_bsr s s j? t d
+i_m_div j? s s d
+i_int_div j? s s d
 
-i_band x c j? t d
-i_band s s j? t d
+i_rem x x j? d
+i_rem s s j? d
 
-i_bor j? I s s d
-i_bxor j? I s s d
+i_bsl s s j? d
+i_bsr s s j? d
 
-i_int_bnot Fail Src=c Live Dst => move Src x | i_int_bnot Fail x Live Dst
+i_band x c j? d
+i_band s s j? d
 
-i_int_bnot j? S t d
+i_bor j? s s d
+i_bxor j? s s d
+
+i_int_bnot Fail Src=c Dst => move Src x | i_int_bnot Fail x Dst
+
+i_int_bnot j? S d
 
 #
 # Old guard BIFs that creates heap fragments are no longer allowed.
@@ -1533,29 +1737,28 @@ bif1 Fail u$bif:erlang:round/1 s d => too_old_compiler
 bif1 Fail u$bif:erlang:trunc/1 s d => too_old_compiler
 
 #
-# Guard BIFs.
+# Handle the length/1 guard BIF specially to make it trappable.
 #
-gc_bif1 Fail I Bif Src Dst => \
-	gen_guard_bif1(Fail, I, Bif, Src, Dst)
-
-gc_bif2 Fail I Bif S1 S2 Dst => \
-	gen_guard_bif2(Fail, I, Bif, S1, S2, Dst)
 
-gc_bif3 Fail I Bif S1 S2 S3 Dst => \
-	gen_guard_bif3(Fail, I, Bif, S1, S2, S3, Dst)
+gc_bif1 Fail=j Live u$bif:erlang:length/1 Src Dst => \
+   i_length_setup Live Src | i_length Fail Live Dst
 
-i_gc_bif1 j? W s t? d
+i_length_setup Live Src=c => move Src x | i_length_setup Live x
 
-i_gc_bif2 j? W t? s s d
+i_length_setup t xy
+i_length j? t d
 
-ii_gc_bif3/7
+#
+# Guard BIFs.
+#
+gc_bif1 p Live Bif Src Dst           => i_bif1_body Src Bif Dst
+gc_bif1 Fail=f Live Bif Src Dst      => i_bif1 Src Fail Bif Dst
 
-# A specific instruction can only have 6 operands, so we must
-# pass one of the arguments in an x register.
-ii_gc_bif3 Fail Bif Live S1 S2 S3 Dst => \
-  move S1 x | i_gc_bif3 Fail Bif Live S2 S3 Dst
+gc_bif2 p Live Bif S1 S2 Dst         => i_bif2_body S2 S1 Bif Dst
+gc_bif2 Fail=f Live Bif S1 S2 Dst    => i_bif2 S2 S1 Fail Bif Dst
 
-i_gc_bif3 j? W t? s s d
+gc_bif3 p Live Bif S1 S2 S3 Dst      => i_bif3_body S3 S2 S1 Bif Dst
+gc_bif3 Fail=f Live Bif S1 S2 S3 Dst => i_bif3 S3 S2 S1 Fail Bif Dst
 
 #
 # The following instruction is specially handled in beam_load.c
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h
index 869a575cb4..c261c8e117 100644
--- a/erts/emulator/beam/sys.h
+++ b/erts/emulator/beam/sys.h
@@ -63,6 +63,14 @@
 #  endif
 #endif
 
+#ifndef ERTS_NOINLINE
+#  if ERTS_AT_LEAST_GCC_VSN__(3,1,1)
+#    define ERTS_NOINLINE __attribute__((__noinline__))
+#  else
+#    define ERTS_NOINLINE
+#  endif
+#endif
+
 #if defined(DEBUG) || defined(ERTS_ENABLE_LOCK_CHECK)
 #  undef ERTS_CAN_INLINE
 #  define ERTS_CAN_INLINE 0
@@ -111,6 +119,23 @@
 #endif
 #endif
 
+/*
+ * Test for clang's convenient __has_builtin feature checking macro.
+ */
+#ifndef __has_builtin
+  #define __has_builtin(x) 0
+#endif
+
+/*
+ * Define HAVE_OVERFLOW_CHECK_BUILTINS if the overflow checking arithmetic
+ * builtins are available.
+ */
+#if ERTS_AT_LEAST_GCC_VSN__(5, 1, 0)
+#  define HAVE_OVERFLOW_CHECK_BUILTINS 1
+#elif __has_builtin(__builtin_mul_overflow)
+#  define HAVE_OVERFLOW_CHECK_BUILTINS 1
+#endif
+
 #include "erl_misc_utils.h"
 
 /*
@@ -1291,4 +1316,13 @@ erts_raw_env_next_char(byte *p, int encoding)
 
 #endif /* #if ERTS_GLB_INLINE_INCL_FUNC_DEF */
 
+/*
+ * Magic numbers for our driver port_control callbacks.
+ * Kept them below 1<<27 to not inflict extra bignum garbage on 32-bit.
+ */
+#define ERTS_TTYSL_DRV_CONTROL_MAGIC_NUMBER  0x018b0900U
+#define ERTS_INET_DRV_CONTROL_MAGIC_NUMBER   0x03f1a300U
+#define ERTS_SPAWN_DRV_CONTROL_MAGIC_NUMBER  0x04c76a00U
+#define ERTS_FORKER_DRV_CONTROL_MAGIC_NUMBER 0x050a7800U
+
 #endif
diff --git a/erts/emulator/beam/time.c b/erts/emulator/beam/time.c
index a3069e419a..9eb020d070 100644
--- a/erts/emulator/beam/time.c
+++ b/erts/emulator/beam/time.c
@@ -316,7 +316,7 @@ struct ErtsTimerWheel_ {
 #define ERTS_TW_SLOT_AT_ONCE (-1)
 
 #define ERTS_TW_BUMP_LATER_WHEEL(TIW) \
-    ((tiw)->pos + ERTS_TW_LATER_WHEEL_SLOT_SIZE >= (TIW)->later.pos)
+    ((TIW)->pos + ERTS_TW_LATER_WHEEL_SLOT_SIZE >= (TIW)->later.pos)
 
 static int bump_later_wheel(ErtsTimerWheel *tiw, int *yield_count_p);
 
@@ -701,7 +701,8 @@ remove_timer(ErtsTimerWheel *tiw, ErtsTWheelTimer *p)
         if (slot < ERTS_TW_SOON_WHEEL_END_SLOT) {
             if (empty_slot
                 && tiw->true_next_timeout_time
-                && p->timeout_pos == tiw->next_timeout_pos) {
+                && p->timeout_pos == tiw->next_timeout_pos
+                && tiw->yield_slot == ERTS_TW_SLOT_INACTIVE) {
                 tiw->true_next_timeout_time = 0;
             }
             if (--tiw->soon.nto == 0)
@@ -714,7 +715,8 @@ remove_timer(ErtsTimerWheel *tiw, ErtsTWheelTimer *p)
                 ErtsMonotonicTime tpos = tiw->later.min_tpos;
                 tpos &= ERTS_TW_LATER_WHEEL_POS_MASK;
                 tpos -= ERTS_TW_LATER_WHEEL_SLOT_SIZE;
-                if (tpos == tiw->next_timeout_pos)
+                if (tpos == tiw->next_timeout_pos
+                    && tiw->yield_slot == ERTS_TW_SLOT_INACTIVE)
                     tiw->true_next_timeout_time = 0;
             }
             if (--tiw->later.nto == 0) {
@@ -908,7 +910,6 @@ erts_bump_timers(ErtsTimerWheel *tiw, ErtsMonotonicTime curr_time)
 
             {
                 ErtsMonotonicTime tmp_slots = bump_to - tiw->pos;
-                tmp_slots = (bump_to - tiw->pos);
                 if (tmp_slots < ERTS_TW_SOON_WHEEL_SIZE)
                     slots = (int) tmp_slots;
                 else
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c
index d81bd89a48..0bbae65e28 100644
--- a/erts/emulator/beam/utils.c
+++ b/erts/emulator/beam/utils.c
@@ -1069,11 +1069,11 @@ do {                               \
 
 #define HCONST 0x9e3779b9UL /* the golden ratio; an arbitrary value */
 
-Uint32
-block_hash(byte *k, unsigned length, Uint32 initval)
+static Uint32
+block_hash(byte *k, Uint length, Uint32 initval)
 {
    Uint32 a,b,c;
-   unsigned len;
+   Uint len;
 
    /* Set up the internal state */
    len = length;
@@ -1569,7 +1569,7 @@ make_hash2(Eterm term)
  * MUST BE USED AS INPUT FOR THE HASH. Two different terms must always have a
  * chance of hashing different when salted: hash([Salt|A]) vs hash([Salt|B]).
  *
- * This is why we can not use cached hash values for atoms for example.
+ * This is why we cannot use cached hash values for atoms for example.
  *
  */
 
@@ -1749,7 +1749,7 @@ make_internal_hash(Eterm term, Uint32 salt)
 	    case SUB_BINARY_SUBTAG:
 	    {
 		byte* bptr;
-		unsigned sz = binary_size(term);
+		Uint sz = binary_size(term);
 		Uint32 con = HCONST_13 + hash;
 		Uint bitoffs;
 		Uint bitsize;
@@ -1946,7 +1946,7 @@ do_allocate_logger_message(Eterm gleader, ErtsMonotonicTime *ts, Eterm *pid,
     else
         sz += MAP4_SZ /* metadata map w gl w pid*/;
 
-    *ts = ERTS_MONOTONIC_TO_USEC(erts_get_monotonic_time(NULL) + erts_get_time_offset());
+    *ts = ERTS_MONOTONIC_TO_USEC(erts_os_system_time());
     erts_bld_sint64(NULL, &sz, *ts);
 
     *bp = new_message_buffer(sz);
@@ -2701,7 +2701,8 @@ Sint erts_cmp_compound(Eterm a, Eterm b, int exact, int eq_only)
             if((AN)->sysname != (BN)->sysname)				\
                 RETURN_NEQ(erts_cmp_atoms((AN)->sysname, (BN)->sysname));	\
 	    ASSERT((AN)->creation != (BN)->creation);			\
-	    RETURN_NEQ(((AN)->creation < (BN)->creation) ? -1 : 1);	\
+            if ((AN)->creation != 0 && (BN)->creation != 0)             \
+                RETURN_NEQ(((AN)->creation < (BN)->creation) ? -1 : 1);	\
 	}								\
     } while (0)
 
@@ -3486,7 +3487,7 @@ store_external_or_ref_(Uint **hpp, ErlOffHeap* oh, Eterm ns)
     if (is_external_header(*from_hp)) {
 	ExternalThing *etp = (ExternalThing *) from_hp;
 	ASSERT(is_external(ns));
-	erts_refc_inc(&etp->node->refc, 2);
+        erts_ref_node_entry(etp->node, 2, make_boxed(to_hp));
     }
     else if (is_ordinary_ref_thing(from_hp))
 	return make_internal_ref(to_hp);
@@ -3681,30 +3682,47 @@ erts_unicode_list_to_buf_len(Eterm list)
     }
 }
 
-/*
-** Convert an integer to a byte list
-** return pointer to converted stuff (need not to be at start of buf!)
-*/
-char* Sint_to_buf(Sint n, struct Sint_buf *buf)
+/* Prints an integer in the given base, returning the number of digits printed.
+ *
+ * (*buf) is a pointer to the buffer, and is set to the start of the string
+ * when returning. */
+int Sint_to_buf(Sint n, int base, char **buf, size_t buf_size)
 {
-    char* p = &buf->s[sizeof(buf->s)-1];
-    int sign = 0;
-
-    *p-- = '\0'; /* null terminate */
-    if (n == 0)
-	*p-- = '0';
-    else if (n < 0) {
-	sign = 1;
-	n = -n;
+    char *p = &(*buf)[buf_size - 1];
+    int sign = 0, size = 0;
+
+    ASSERT(base >= 2 && base <= 36);
+
+    if (n == 0) {
+        *p-- = '0';
+        size++;
+    } else if (n < 0) {
+        sign = 1;
+        n = -n;
     }
 
     while (n != 0) {
-	*p-- = (n % 10) + '0';
-	n /= 10;
+        int digit = n % base;
+
+        if (digit < 10) {
+            *p-- = '0' + digit;
+        } else {
+            *p-- = 'A' + (digit - 10);
+        }
+
+        size++;
+
+        n /= base;
     }
-    if (sign)
-	*p-- = '-';
-    return p+1;
+
+    if (sign) {
+        *p-- = '-';
+        size++;
+    }
+
+    *buf = p + 1;
+
+    return size;
 }
 
 /* Build a list of integers in some safe memory area
@@ -4771,58 +4789,3 @@ erts_ptr_id(void *ptr)
     return ptr;
 }
 
-#ifdef DEBUG
-/*
- * Handy functions when using a debugger - don't use in the code!
- */
-
-void upp(byte *buf, size_t sz)
-{
-    bin_write(ERTS_PRINT_STDERR, NULL, buf, sz);
-}
-
-void pat(Eterm atom)
-{
-    upp(atom_tab(atom_val(atom))->name,
-	atom_tab(atom_val(atom))->len);
-}
-
-
-void pinfo()
-{
-    process_info(ERTS_PRINT_STDOUT, NULL);
-}
-
-
-void pp(p)
-Process *p;
-{
-    if(p)
-	print_process_info(ERTS_PRINT_STDERR, NULL, p);
-}
-
-void ppi(Eterm pid)
-{
-    pp(erts_proc_lookup(pid));
-}
-
-void td(Eterm x)
-{
-    erts_fprintf(stderr, "%T\n", x);
-}
-
-void
-ps(Process* p, Eterm* stop)
-{
-    Eterm* sp = STACK_START(p) - 1;
-
-    if (stop <= STACK_END(p)) {
-        stop = STACK_END(p) + 1;
-    }
-
-    while(sp >= stop) {
-	erts_printf("%p: %.75T\n", sp, *sp);
-	sp--;
-    }
-}
-#endif
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index 47eb5df7dd..66ff8d8450 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 1997-2018. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2019. 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.
@@ -574,7 +574,7 @@ static int my_strncasecmp(const char *s1, const char *s2, size_t n)
                                     driver_select(port, e, mode | (on?ERL_DRV_USE:0), on)
 
 #define sock_select(d, flags, onoff) do { \
-        ASSERT(!(d)->is_ignored); \
+        ASSERT(!INET_IGNORED(d));         \
         (d)->event_mask = (onoff) ? \
                  ((d)->event_mask | (flags)) : \
                  ((d)->event_mask & ~(flags)); \
@@ -634,9 +634,13 @@ static size_t my_strnlen(const char *s, size_t maxlen)
  * header length.  To get the header length we use
  * the pointer difference from the cmsg start pointer
  * to the CMSG_DATA(cmsg) pointer.
+ *
+ * Some platforms (seen on ppc Linux 2.6.29-3.ydl61.3)
+ * may return 0 as the cmsg_len if the cmsg is to be ignored.
  */
 #define LEN_CMSG_DATA(cmsg)                                             \
-    ((cmsg)->cmsg_len - ((char*)CMSG_DATA(cmsg) - (char*)(cmsg)))
+    ((cmsg)->cmsg_len < sizeof (struct cmsghdr) ? 0 :                   \
+     (cmsg)->cmsg_len - ((char*)CMSG_DATA(cmsg) - (char*)(cmsg)))
 #define NXT_CMSG_HDR(cmsg)                                              \
     ((struct cmsghdr*)(((char*)(cmsg)) + CMSG_SPACE(LEN_CMSG_DATA(cmsg))))
 #endif
@@ -894,6 +898,15 @@ static size_t my_strnlen(const char *s, size_t maxlen)
 #define INET_CMSG_RECVTCLASS     (1 << 1) /* am_recvtclass, am_tclass */
 #define INET_CMSG_RECVTTL        (1 << 2) /* am_recvttl, am_ttl */
 
+/* Inet flags */
+#define INET_FLG_BUFFER_SET      (1 << 0) /* am_buffer has been set by user */
+#define INET_FLG_IS_IGNORED      (1 << 1) /* If a fd is ignored by the inet_drv.
+                                             This flag should be set to true when
+                                             the fd is used outside of inet_drv. */
+#define INET_FLG_IS_IGNORED_RD   (1 << 2)
+#define INET_FLG_IS_IGNORED_WR   (1 << 3)
+#define INET_FLG_IS_IGNORED_PASS (1 << 4)
+
 /*
 ** End of interface constants.
 **--------------------------------------------------------------------------*/
@@ -939,10 +952,11 @@ static size_t my_strnlen(const char *s, size_t maxlen)
 #define INET_IFNAMSIZ          16
 
 /* INET Ignore states */
-#define INET_IGNORE_NONE    0
-#define INET_IGNORE_READ    (1 << 0)
-#define INET_IGNORE_WRITE   (1 << 1)
-#define INET_IGNORE_PASSIVE (1 << 2)
+#define INET_IGNORE_CLEAR(desc) ((desc)->flags & ~(INET_IGNORE_READ|INET_IGNORE_WRITE|INET_IGNORE_PASSIVE))
+#define INET_IGNORED(desc)   ((desc)->flags & INET_FLG_IS_IGNORED)
+#define INET_IGNORE_READ    (INET_FLG_IS_IGNORED|INET_FLG_IS_IGNORED_RD)
+#define INET_IGNORE_WRITE   (INET_FLG_IS_IGNORED|INET_FLG_IS_IGNORED_WR)
+#define INET_IGNORE_PASSIVE (INET_FLG_IS_IGNORED|INET_FLG_IS_IGNORED_PASS)
 
 /* Max length of Erlang Term Buffer (for outputting structured terms):  */
 #ifdef  HAVE_SCTP
@@ -1063,6 +1077,7 @@ typedef struct {
     long forced_events;           /* Mask of events that are forcefully signalled 
 				   on windows see winsock_event_select 
 				   for details */
+    int err;                      /* Keeps error code for closed socket */
     int send_would_block;       /* Last send attempt failed with "WOULDBLOCK" */
 #endif
     ErlDrvPort  port;           /* the port identifier */
@@ -1124,9 +1139,7 @@ typedef struct {
     double send_avg;            /* average packet size sent */
 
     subs_list empty_out_q_subs; /* Empty out queue subscribers */
-    int is_ignored;             /* if a fd is ignored by the inet_drv.
-				   This flag should be set to true when
-				   the fd is used outside of inet_drv. */
+    int flags;
 #ifdef HAVE_SETNS
     char *netns;                /* Socket network namespace name
 				   as full file path */
@@ -3367,6 +3380,71 @@ static int udp_parse_ancillary_data(ErlDrvTermData *spec, int i,
     i = LOAD_NIL(spec, i);
     return LOAD_LIST(spec, i, n+1);
 }
+
+static int compile_ancillary_data(struct msghdr *mhdr,
+                                  char *ptr, ErlDrvSizeT anc_len) {
+    struct cmsghdr *cmsg;
+    size_t controllen = 0;
+    cmsg = CMSG_FIRSTHDR(mhdr);
+    for (;;) {
+        if (anc_len == 0) {
+            /* End of options to compile */
+            mhdr->msg_controllen = controllen;
+            return 0;
+        }
+        if (cmsg == NULL) {
+            /* End of destination before end of options */
+            return 1;
+        }
+
+#define COMPILE_ANCILLARY_DATA_ITEM(Level, Opt, Type, Get, Size)        \
+        do {                                                            \
+            if (anc_len < (Size)) return 1;                             \
+            sys_memset(cmsg, '\0', CMSG_SPACE(sizeof(Type)));           \
+            cmsg->cmsg_level = Level;                                   \
+            cmsg->cmsg_type = Opt;                                      \
+            cmsg->cmsg_len = CMSG_LEN(sizeof(Type));                    \
+            *((Type *) CMSG_DATA(cmsg)) = Get(ptr);                     \
+            controllen += CMSG_SPACE(sizeof(Type));                     \
+            cmsg = CMSG_NXTHDR(mhdr, cmsg);                             \
+            ptr += 4;                                                   \
+            anc_len -= 4;                                               \
+        } while (0)
+#define SIZEOF_ANCILLARY_DATA (2 * CMSG_SPACE(sizeof(int)))
+        /* (IP_TOS | IPV6_TCLASS) + IP_TTL */
+
+        switch (anc_len--, *ptr++) {
+        case INET_OPT_TOS: {
+#if defined(IPPROTO_IP) && defined(IP_TOS)
+            COMPILE_ANCILLARY_DATA_ITEM(IPPROTO_IP, IP_TOS, int, get_int32, 4);
+#else
+            return 1; /* Socket option not implemented */
+#endif
+            break;
+        }
+        case INET_OPT_TTL: {
+#if defined(IPPROTO_IP) && defined(IP_TTL)
+            COMPILE_ANCILLARY_DATA_ITEM(IPPROTO_IP, IP_TTL, int, get_int32, 4);
+#else
+            return 1; /* Socket option not implemented */
+#endif
+            break;
+        }
+        case INET_OPT_TCLASS: {
+#if defined(IPPROTO_IPV6) && defined(IPV6_TCLASS)
+            COMPILE_ANCILLARY_DATA_ITEM(IPPROTO_IPV6, IPV6_TCLASS, int, get_int32, 4);
+#else
+            return 1; /* Socket option not implemented */
+#endif
+            break;
+        }
+        default:
+            /* Unknow socket option */
+            return 1;
+        }
+#undef COMPILE_ANCILLARY_DATA_ITEM
+    }
+}
 #endif /* ifndef __WIN32__ */
 
 /* 
@@ -4547,7 +4625,7 @@ static void desc_close(inet_descriptor* desc)
 	 * We should close the fd here, but the other driver might still
 	 * be selecting on it.
 	 */
-	if (!desc->is_ignored)
+	if (!INET_IGNORED(desc))
 	    driver_select(desc->port,(ErlDrvEvent)(long)desc->event, 
 			  ERL_DRV_USE, 0);
 	else
@@ -4568,7 +4646,7 @@ static void desc_close_read(inet_descriptor* desc)
 {
     if (desc->s != INVALID_SOCKET) {
 #ifdef __WIN32__
-	/* This call can not be right???
+	/* This call cannot be right???
 	 * We want to turn off read events but keep any write events.
 	 * But on windows driver_select(...,READ,1) is only used as a
 	 * way to hook into the pollset. sock_select is used to control
@@ -6308,6 +6386,7 @@ static int inet_set_opts(inet_descriptor* desc, char* ptr, int len)
 		    (long)desc->port, desc->s, ival));
 	    if (ival < INET_MIN_BUFFER) ival = INET_MIN_BUFFER;
 	    desc->bufsz = ival;
+            desc->flags |= INET_FLG_BUFFER_SET;
 	    continue;
 
 	case INET_LOPT_ACTIVE:
@@ -6503,6 +6582,16 @@ static int inet_set_opts(inet_descriptor* desc, char* ptr, int len)
 	case INET_OPT_RCVBUF:    type = SO_RCVBUF; 
 	    DEBUGF(("inet_set_opts(%ld): s=%d, SO_RCVBUF=%d\r\n",
 		    (long)desc->port, desc->s, ival));
+            if (!(desc->flags & INET_FLG_BUFFER_SET)) {
+                /* make sure we have desc->bufsz >= SO_RCVBUF */
+                if (ival > (1 << 16) && desc->stype == SOCK_DGRAM && !IS_SCTP(desc))
+                    /* For UDP we don't want to automatically
+                       set the buffer size to be larger than
+                       the theoretical max MTU */
+                    desc->bufsz = 1 << 16;
+                else if (ival > desc->bufsz)
+                    desc->bufsz = ival;
+            }
 	    break;
 	case INET_OPT_LINGER:    type = SO_LINGER; 
 	    if (len < 4)
@@ -6748,23 +6837,17 @@ static int inet_set_opts(inet_descriptor* desc, char* ptr, int len)
 	}
 	DEBUGF(("inet_set_opts(%ld): s=%d returned %d\r\n",
 		(long)desc->port, desc->s, res));
-	if (type == SO_RCVBUF) {
-	    /* make sure we have desc->bufsz >= SO_RCVBUF */
-            if (ival > (1 << 16) && desc->stype == SOCK_DGRAM && !IS_SCTP(desc))
-                /* For UDP we don't want to automatically
-                   set the buffer size to be larger than
-                   the theoretical max MTU */
-                desc->bufsz = 1 << 16;
-	    else if (ival > desc->bufsz)
-		desc->bufsz = ival;
-	}
     }
 
     if ( ((desc->stype == SOCK_STREAM) && IS_CONNECTED(desc)) ||
 	((desc->stype == SOCK_DGRAM) && IS_OPEN(desc))) {
 
-	if (desc->active != old_active)
+	if (desc->active != old_active) {
+            /* Need to cancel the read_packet timer if we go from active to passive. */
+            if (desc->active == INET_PASSIVE && desc->stype == SOCK_DGRAM)
+                driver_cancel_timer(desc->port);
 	    sock_select(desc, (FD_READ|FD_CLOSE), (desc->active>0));
+        }
 
 	/* XXX: UDP sockets could also trigger immediate read here NIY */
 	if ((desc->stype==SOCK_STREAM) && desc->active) {
@@ -6906,6 +6989,7 @@ static int sctp_set_opts(inet_descriptor* desc, char* ptr, int len)
 
 	    if (desc->bufsz < INET_MIN_BUFFER)
 		desc->bufsz = INET_MIN_BUFFER;
+            desc->flags |= INET_FLG_BUFFER_SET;
 	    res = 0;	  /* This does not affect the kernel buffer size */
 	    continue;
 
@@ -7027,6 +7111,7 @@ static int sctp_set_opts(inet_descriptor* desc, char* ptr, int len)
 	       smaller than the kernel one: */
 	    if (desc->bufsz <= arg.ival)
 		desc->bufsz  = arg.ival;
+            desc->flags |= INET_FLG_BUFFER_SET;
 	    break;
 	}
 	case INET_OPT_SNDBUF:
@@ -7037,10 +7122,6 @@ static int sctp_set_opts(inet_descriptor* desc, char* ptr, int len)
 	    arg_ptr = (char*) (&arg.ival);
 	    arg_sz  = sizeof  ( arg.ival);
 
-	    /* Adjust the size of the user-level recv buffer, so it's not
-	       smaller than the kernel one: */
-	    if (desc->bufsz <= arg.ival)
-		desc->bufsz  = arg.ival;
 	    break;
 	}
 	case INET_OPT_REUSEADDR:
@@ -9048,6 +9129,7 @@ static ErlDrvData inet_start(ErlDrvPort port, int size, int protocol)
     desc->event_mask = 0;
 #ifdef __WIN32__
     desc->forced_events = 0;
+    desc->err = 0;
     desc->send_would_block = 0;
 #endif
     desc->port = port;
@@ -9097,7 +9179,7 @@ static ErlDrvData inet_start(ErlDrvPort port, int size, int protocol)
 
     sys_memzero((char *)&desc->remote,sizeof(desc->remote));
 
-    desc->is_ignored = 0;
+    desc->flags = 0;
 
 #ifdef HAVE_SETNS
     desc->netns = NULL;
@@ -9499,19 +9581,19 @@ static ErlDrvSSizeT inet_ctl(inet_descriptor* desc, int cmd, char* buf,
       if (desc->stype != SOCK_STREAM)
 	  return ctl_error(EINVAL, rbuf, rsize);
 
-      if (*buf == 1 && !desc->is_ignored) {
+      if (*buf == 1 && !INET_IGNORED(desc)) {
 	  sock_select(desc, (FD_READ|FD_WRITE|FD_CLOSE|ERL_DRV_USE_NO_CALLBACK), 0);
 	  if (desc->active)
-	    desc->is_ignored = INET_IGNORE_READ;
+	    desc->flags |= INET_IGNORE_READ;
 	  else
-	    desc->is_ignored = INET_IGNORE_PASSIVE;
-      } else if (*buf == 0 && desc->is_ignored) {
+	    desc->flags |= INET_IGNORE_PASSIVE;
+      } else if (*buf == 0 && INET_IGNORED(desc)) {
 	  int flags = FD_CLOSE;
-	  if (desc->is_ignored & INET_IGNORE_READ)
+	  if (desc->flags & INET_IGNORE_READ)
 	    flags |= FD_READ;
-	  if (desc->is_ignored & INET_IGNORE_WRITE)
+	  if (desc->flags & INET_IGNORE_WRITE)
 	    flags |= FD_WRITE;
-	  desc->is_ignored = INET_IGNORE_NONE;
+	  desc->flags = INET_IGNORE_CLEAR(desc);
 	  if (flags != FD_CLOSE)
 	    sock_select(desc, flags, 1);
       } else
@@ -9831,10 +9913,8 @@ static tcp_descriptor* tcp_inet_copy(tcp_descriptor* desc,SOCKET s,
     copy_desc->send_timeout  = desc->send_timeout;
     copy_desc->send_timeout_close = desc->send_timeout_close;
 
-    if (desc->tcp_add_flags & TCP_ADDF_SHOW_ECONNRESET)
-	copy_desc->tcp_add_flags |= TCP_ADDF_SHOW_ECONNRESET;
-    else
-	copy_desc->tcp_add_flags &= ~TCP_ADDF_SHOW_ECONNRESET;
+    copy_desc->tcp_add_flags = desc->tcp_add_flags
+        & (TCP_ADDF_SHOW_ECONNRESET | TCP_ADDF_LINGER_ZERO);
     
     /* The new port will be linked and connected to the original caller */
     port = driver_create_port(port, owner, "tcp_inet", (ErlDrvData) copy_desc);
@@ -9951,6 +10031,7 @@ static ErlDrvSSizeT tcp_inet_ctl(ErlDrvData e, unsigned int cmd,
 {
     tcp_descriptor* desc = (tcp_descriptor*)e;
 
+    cmd -= ERTS_INET_DRV_CONTROL_MAGIC_NUMBER;
     switch(cmd) {
     case INET_REQ_OPEN: { /* open socket and return internal index */
 	int domain;
@@ -10226,17 +10307,17 @@ static ErlDrvSSizeT tcp_inet_ctl(ErlDrvData e, unsigned int cmd,
 	if (enq_async(INETP(desc), tbuf, TCP_REQ_RECV) < 0)
 	    return ctl_error(EALREADY, rbuf, rsize);
 
-	if (INETP(desc)->is_ignored || tcp_recv(desc, n) == 0) {
+	if (INET_IGNORED(INETP(desc)) || tcp_recv(desc, n) == 0) {
 	    if (timeout == 0)
 		async_error_am(INETP(desc), am_timeout);
 	    else {
 		if (timeout != INET_INFINITY)
                     add_multi_timer(desc, INETP(desc)->port, 0,
                                     timeout, &tcp_inet_recv_timeout);
-		if (!INETP(desc)->is_ignored)
+		if (!INET_IGNORED(INETP(desc)))
 		    sock_select(INETP(desc),(FD_READ|FD_CLOSE),1);
 		else
-		  INETP(desc)->is_ignored |= INET_IGNORE_READ;
+		  INETP(desc)->flags |= INET_IGNORE_READ;
 	    }
 	}
 	return ctl_reply(INET_REP_OK, tbuf, 2, rbuf, rsize);
@@ -10898,7 +10979,7 @@ static int winsock_event_select(inet_descriptor *desc, int flags, int on)
 {
     int save_event_mask = desc->event_mask;
     
-    desc->forced_events = 0;
+    desc->forced_events &= FD_CLOSE;
     if (on) 
 	desc->event_mask |= flags;
     else
@@ -10950,7 +11031,7 @@ static int winsock_event_select(inet_descriptor *desc, int flags, int on)
 		TIMEVAL tmo = {0,0};
 		FD_SET fds;
 		int ret;
-		
+
 		FD_ZERO(&fds);
 		FD_SET(desc->s,&fds);
 		do_force = (select(desc->s+1,0,&fds,0,&tmo) > 0);
@@ -10967,7 +11048,7 @@ static int winsock_event_select(inet_descriptor *desc, int flags, int on)
 	    FD_SET fds;
 	    int ret;
 	    unsigned long arg;
-	  
+
 	    FD_ZERO(&fds);
 	    FD_SET(desc->s,&fds);
 	    ret = select(desc->s+1,&fds,0,0,&tmo);
@@ -11006,13 +11087,16 @@ static void tcp_inet_event(ErlDrvData e, ErlDrvEvent event)
 	goto error;
     }
 
-    DEBUGF((" => event=%02X, mask=%02X\r\n",
-	    netEv.lNetworkEvents, desc->inet.event_mask));
+    DEBUGF((" => event=%02X, mask=%02X, forced=%02X\r\n",
+	    netEv.lNetworkEvents, desc->inet.event_mask,
+            desc->inet.forced_events));
 
     /* Add the forced events. */
-
     netEv.lNetworkEvents |= desc->inet.forced_events;
 
+    if (desc->inet.forced_events & FD_CLOSE)
+        netEv.iErrorCode[FD_CLOSE_BIT] = desc->inet.err;
+
     /*
      * Calling WSAEventSelect() with a mask of 0 doesn't always turn off
      * all events.  To avoid acting on events we don't want, we mask
@@ -11032,16 +11116,29 @@ static void tcp_inet_event(ErlDrvData e, ErlDrvEvent event)
 	    goto error;
 	}
 	if (netEv.lNetworkEvents & FD_CLOSE) {
-	    /*
+
+            /* We may not get any more FD_CLOSE events so we
+               keep this event and always signal it from
+               this moment on. */
+            if ((desc->inet.forced_events & FD_CLOSE) == 0) {
+                desc->inet.forced_events |= FD_CLOSE;
+                desc->inet.err = netEv.iErrorCode[FD_CLOSE_BIT];
+            }
+
+            /*
 	     * We must loop to read out the remaining packets (if any).
 	     */
 	    for (;;) {
-		DEBUGF(("Retrying read due to closed port\r\n"));
-		/* XXX The buffer will be thrown away on error (empty que).
-		   Possible SMP FIXME. */
-		if (!desc->inet.active && (desc->inet.opt) == NULL) {
-		    goto error;
-		}
+
+                /* if passive and no subscribers, break loop */
+                if (!desc->inet.active && desc->inet.opt == NULL) {
+                    /* do not trigger close event when socket is
+                       transitioned to passive */
+                    netEv.lNetworkEvents &= ~FD_CLOSE;
+                    break;
+                }
+
+		DEBUGF(("Retrying read due to FD_CLOSE\r\n"));
 		if (tcp_inet_input(desc, event) < 0) {
 		    goto error;
 		}
@@ -11103,7 +11200,7 @@ static int tcp_inet_input(tcp_descriptor* desc, HANDLE event)
 #ifdef DEBUG
     long port = (long) desc->inet.port;  /* Used after driver_exit() */
 #endif
-    ASSERT(!INETP(desc)->is_ignored);
+    ASSERT(!INET_IGNORED(INETP(desc)));
     DEBUGF(("tcp_inet_input(%ld) {s=%d\r\n", port, desc->inet.s));
     /* XXX fprintf(stderr,"tcp_inet_input(%ld) {s=%d}\r\n",(long) desc->inet.port, desc->inet.s); */
     if (desc->inet.state == INET_STATE_ACCEPTING) {
@@ -11370,7 +11467,7 @@ static int tcp_shutdown_error(tcp_descriptor* desc, int err)
 static void tcp_inet_delay_send(ErlDrvData data, ErlDrvTermData dummy)
 {
     tcp_descriptor *desc = (tcp_descriptor*)data;
-    (void)tcp_inet_output(desc, INETP(desc)->s);
+    (void)tcp_inet_output(desc, (HANDLE) INETP(desc)->s);
 }
 
 /*
@@ -11438,8 +11535,8 @@ static int tcp_sendv(tcp_descriptor* desc, ErlIOVec* ev)
 	DEBUGF(("tcp_sendv(%ld): s=%d, about to send "LLU","LLU" bytes\r\n",
 		(long)desc->inet.port, desc->inet.s, (llu_t)h_len, (llu_t)len));
 
-	if (INETP(desc)->is_ignored) {
-	    INETP(desc)->is_ignored |= INET_IGNORE_WRITE;
+	if (INET_IGNORED(INETP(desc))) {
+	    INETP(desc)->flags |= INET_IGNORE_WRITE;
 	    n = 0;
 	} else if (desc->tcp_add_flags & TCP_ADDF_DELAY_SEND) {
             driver_enqv(ix, ev, 0);
@@ -11474,7 +11571,7 @@ static int tcp_sendv(tcp_descriptor* desc, ErlIOVec* ev)
 	DEBUGF(("tcp_sendv(%ld): s=%d, Send failed, queuing\r\n", 
 		(long)desc->inet.port, desc->inet.s));
 	driver_enqv(ix, ev, n); 
-	if (!INETP(desc)->is_ignored)
+	if (!INET_IGNORED(INETP(desc)))
 	    sock_select(INETP(desc),(FD_WRITE|FD_CLOSE), 1);
     }
     return 0;
@@ -11543,8 +11640,8 @@ static int tcp_send(tcp_descriptor* desc, char* ptr, ErlDrvSizeT len)
 
 	DEBUGF(("tcp_send(%ld): s=%d, about to send "LLU","LLU" bytes\r\n",
 		(long)desc->inet.port, desc->inet.s, (llu_t)h_len, (llu_t)len));
-	if (INETP(desc)->is_ignored) {
-	    INETP(desc)->is_ignored |= INET_IGNORE_WRITE;
+	if (INET_IGNORED(INETP(desc))) {
+	    INETP(desc)->flags |= INET_IGNORE_WRITE;
 	    n = 0;
 	} else if (desc->tcp_add_flags & TCP_ADDF_DELAY_SEND) {
 	    sock_send(desc->inet.s, buf, 0, 0);
@@ -11577,7 +11674,7 @@ static int tcp_send(tcp_descriptor* desc, char* ptr, ErlDrvSizeT len)
 	    n -= h_len;
 	    driver_enq(ix, ptr+n, len-n);
 	}
-	if (!INETP(desc)->is_ignored)
+	if (!INET_IGNORED(INETP(desc)))
 	    sock_select(INETP(desc),(FD_WRITE|FD_CLOSE), 1);
     }
     return 0;
@@ -11858,7 +11955,7 @@ static int tcp_inet_output(tcp_descriptor* desc, HANDLE event)
     int ret = 0;
     ErlDrvPort ix = desc->inet.port;
 
-    ASSERT(!INETP(desc)->is_ignored);
+    ASSERT(!INET_IGNORED(INETP(desc)));
     DEBUGF(("tcp_inet_output(%ld) {s=%d\r\n", 
 	    (long)desc->inet.port, desc->inet.s));
     if (desc->inet.state == INET_STATE_CONNECTING) {
@@ -12180,6 +12277,7 @@ static ErlDrvSSizeT packet_inet_ctl(ErlDrvData e, unsigned int cmd, char* buf,
     int type = SOCK_DGRAM;
     int af = AF_INET;
 
+    cmd -= ERTS_INET_DRV_CONTROL_MAGIC_NUMBER;
     switch(cmd) {
     case INET_REQ_OPEN:   /* open socket and return internal index */
 	DEBUGF(("packet_inet_ctl(%ld): OPEN\r\n", (long)desc->port)); 
@@ -12532,9 +12630,12 @@ static void packet_inet_timeout(ErlDrvData e)
 {
     udp_descriptor  * udesc = (udp_descriptor*) e;
     inet_descriptor * desc  = INETP(udesc);
-    if (!(desc->active))
+    if (!(desc->active)) {
 	sock_select(desc, FD_READ, 0);
-    async_error_am (desc, am_timeout);
+        async_error_am (desc, am_timeout);
+    } else {
+        (void)packet_inet_input(udesc, (HANDLE) desc->s);
+    }
 }
 
 
@@ -12577,11 +12678,8 @@ static void packet_inet_command(ErlDrvData e, char* buf, ErlDrvSizeT len)
 	    char ancd[CMSG_SPACE(sizeof(*sri))];
 	} cmsg;
 	
-	if (len < SCTP_GET_SENDPARAMS_LEN) {
-	    inet_reply_error(desc, EINVAL);
-	    return;
-	}
-	
+	if (len < SCTP_GET_SENDPARAMS_LEN) goto return_einval;
+
 	/* The ancillary data */
 	sri = (struct sctp_sndrcvinfo *) (CMSG_DATA(&cmsg.hdr));
 	/* Get the "sndrcvinfo" from the buffer, advancing the "ptr": */
@@ -12614,28 +12712,82 @@ static void packet_inet_command(ErlDrvData e, char* buf, ErlDrvSizeT len)
 	goto check_result_code;
     }
 #endif
-    /* UDP socket. Even if it is connected, there is an address prefix
-       here -- ignored for connected sockets: */
-    sz = len;
-    qtr = ptr;
-    xerror = inet_set_faddress(desc->sfamily, &other, &qtr, &sz);
-    if (xerror != NULL) {
-        inet_reply_error_am(desc, driver_mk_atom(xerror));
-	return;
-    }
-    len -= (qtr - ptr);
-    ptr = qtr;
-    /* Now "ptr" is the user data ptr, "len" is data length: */
-    inet_output_count(desc, len);
-    
-    if (desc->state & INET_F_ACTIVE) { /* connected (ignore address) */
-	code = sock_send(desc->s, ptr, len, 0);
-    }
-    else {
-	code = sock_sendto(desc->s, ptr, len, 0, &other.sa, sz);
+    {
+        ErlDrvSizeT anc_len;
+        
+        /* UDP socket. Even if it is connected, there is an address prefix
+           here -- ignored for connected sockets: */
+        sz = len;
+        qtr = ptr;
+        xerror = inet_set_faddress(desc->sfamily, &other, &qtr, &sz);
+        if (xerror != NULL) {
+            inet_reply_error_am(desc, driver_mk_atom(xerror));
+            return;
+        }
+        len -= (qtr - ptr);
+        ptr = qtr;
+
+        /* Here comes ancillary data */
+        if (len < 4) goto return_einval;
+        anc_len = get_int32(ptr);
+        len -= 4; ptr += 4;
+        if (len < anc_len) goto return_einval;
+
+        if (anc_len == 0) {
+            /* Empty ancillary data */
+            /* Now "ptr" is the user data ptr, "len" is data length: */
+            inet_output_count(desc, len);
+            if (desc->state & INET_F_ACTIVE) {
+                /* connected (ignore address) */
+                code = sock_send(desc->s, ptr, len, 0);
+            }
+            else {
+                code = sock_sendto(desc->s, ptr, len, 0, &other.sa, sz);
+            }
+        }
+        else {
+#ifdef __WIN32__
+            goto return_einval; /* Can not send ancillary data on Windows */
+#else
+            struct iovec iov[1];
+            struct msghdr mhdr;
+            union { /* For ancillary data         */
+                struct cmsghdr hdr;
+                char ancd[SIZEOF_ANCILLARY_DATA];
+            } cmsg;
+            sys_memset(&iov, '\0', sizeof(iov));
+            sys_memset(&mhdr, '\0', sizeof(mhdr));
+            sys_memset(&cmsg, '\0', sizeof(cmsg));
+            if (desc->state & INET_F_ACTIVE) {
+                /* connected (ignore address) */
+                mhdr.msg_name = NULL;
+                mhdr.msg_namelen = 0;
+            }
+            else {
+                mhdr.msg_name = &other;
+                mhdr.msg_namelen = sz;
+            }
+            mhdr.msg_control = cmsg.ancd;
+            mhdr.msg_controllen = sizeof(cmsg.ancd);
+            if (compile_ancillary_data(&mhdr, ptr, anc_len) != 0) {
+                goto return_einval;
+            }
+            ASSERT(mhdr.msg_controllen != 0);
+            len -= anc_len;
+            ptr += anc_len;
+            /* Now "ptr" is the user data ptr, "len" is data length: */
+            iov[0].iov_len = len;
+            iov[0].iov_base = ptr;
+            mhdr.msg_iov = iov;
+            mhdr.msg_iovlen = 1;
+            mhdr.msg_flags = 0;
+            inet_output_count(desc, len);
+            code = sock_sendmsg(desc->s, &mhdr, 0);
+#endif
+        }
     }
 
-#ifdef HAVE_SCTP    
+#ifdef HAVE_SCTP
  check_result_code:
     /* "code" analysis is the same for both SCTP and UDP cases above: */
 #endif
@@ -12645,8 +12797,15 @@ static void packet_inet_command(ErlDrvData e, char* buf, ErlDrvSizeT len)
     }
     else
 	inet_reply_ok(desc);
+    return;
+    
+ return_einval:
+    inet_reply_error(desc, EINVAL);
+    return;
 }
-#endif
+
+#endif /* HAVE_UDP */
+
 
 #ifdef __WIN32__
 static void packet_inet_event(ErlDrvData e, ErlDrvEvent event)
@@ -12890,6 +13049,15 @@ static int packet_inet_input(udp_descriptor* udesc, HANDLE event)
 	sock_select(desc, FD_READ, 1);
     }
 #endif
+
+    /* We set a timer on the port to trigger now.
+       This emulates a "yield" operation as that is
+       what we want to do here. We do *NOT* do a deselect
+       as that is expensive, instead we check if the
+       socket it still active when the timeout triggers
+       and if it is not, then we just ignore the timeout */
+    driver_set_timer(desc->port, 0);
+
     return count;
 }
 
@@ -12956,38 +13124,40 @@ make_noninheritable_handle(SOCKET s)
 static void fire_multi_timers(tcp_descriptor *desc, ErlDrvPort port,
 			      ErlDrvData data)
 {
-    ErlDrvTime next_timeout;
-    MultiTimerData *curr = desc->mtd;
-    if (!curr) {
-	ASSERT(0);
-	return;
+    ErlDrvTime next_timeout = 0;
+    if (!desc->mtd) {
+        ASSERT(0);
+        return;
     }
 #ifdef DEBUG
     {
 	ErlDrvTime chk = erl_drv_monotonic_time(ERL_DRV_MSEC);
-	ASSERT(chk >= curr->when);
+	ASSERT(chk >= desc->mtd->when);
     }
 #endif
     do {
-	MultiTimerData *save = curr;
+	MultiTimerData save = *desc->mtd;
 
-	(*(save->timeout_function))(data,save->caller);
+        /* We first remove the timer so that the timeout_functions has
+           can call clean_multi_timers without breaking anything */
+        if (desc->mtd_cache == NULL) {
+            desc->mtd_cache = desc->mtd;
+        } else {
+            FREE(desc->mtd);
+        }
 
-        curr = curr->next;
+        desc->mtd = save.next;
+        if (desc->mtd != NULL)
+            desc->mtd->prev = NULL;
 
-        if (desc->mtd_cache == NULL)
-            desc->mtd_cache = save;
-        else
-            FREE(save);
+	(*(save.timeout_function))(data,save.caller);
 
-	if (curr == NULL) {
-            desc->mtd = NULL;
+        if (desc->mtd == NULL)
 	    return;
-	}
-	curr->prev = NULL;
-	next_timeout = curr->when - erl_drv_monotonic_time(ERL_DRV_MSEC);
+
+	next_timeout = desc->mtd->when - erl_drv_monotonic_time(ERL_DRV_MSEC);
     } while (next_timeout <= 0);
-    desc->mtd = curr;
+
     driver_set_timer(port, (unsigned long) next_timeout);
 }
 
diff --git a/erts/emulator/drivers/unix/ttsl_drv.c b/erts/emulator/drivers/unix/ttsl_drv.c
index 28c6cc0f94..f6864f96da 100644
--- a/erts/emulator/drivers/unix/ttsl_drv.c
+++ b/erts/emulator/drivers/unix/ttsl_drv.c
@@ -31,7 +31,7 @@
 static int ttysl_init(void);
 static ErlDrvData ttysl_start(ErlDrvPort, char*);
 
-#ifdef HAVE_TERMCAP  /* else make an empty driver that can not be opened */
+#ifdef HAVE_TERMCAP  /* else make an empty driver that cannot be opened */
 
 #ifndef WANT_NONBLOCKING
 #define WANT_NONBLOCKING
@@ -394,6 +394,8 @@ static ErlDrvSSizeT ttysl_control(ErlDrvData drv_data,
 {
     char resbuff[2*sizeof(Uint32)];
     ErlDrvSizeT res_size;
+
+    command -= ERTS_TTYSL_DRV_CONTROL_MAGIC_NUMBER;
     switch (command) {
     case CTRL_OP_GET_WINSIZE:
 	{
@@ -419,7 +421,7 @@ static ErlDrvSSizeT ttysl_control(ErlDrvData drv_data,
 	}
 	break;
     default:
-	return 0;
+	return -1;
     }
     if (rlen < res_size) {
 	*rbuf = driver_alloc(res_size);
diff --git a/erts/emulator/drivers/win32/ttsl_drv.c b/erts/emulator/drivers/win32/ttsl_drv.c
index 99e7fb25a4..d19bfa3079 100644
--- a/erts/emulator/drivers/win32/ttsl_drv.c
+++ b/erts/emulator/drivers/win32/ttsl_drv.c
@@ -176,6 +176,8 @@ static ErlDrvSSizeT ttysl_control(ErlDrvData drv_data,
 {
     char resbuff[2*sizeof(Uint32)];
     ErlDrvSizeT res_size;
+
+    command -= ERTS_TTYSL_DRV_CONTROL_MAGIC_NUMBER;
     switch (command) {
     case CTRL_OP_GET_WINSIZE:
 	{
@@ -201,7 +203,7 @@ static ErlDrvSSizeT ttysl_control(ErlDrvData drv_data,
 	}
 	break;
     default:
-	return 0;
+	return -1;
     }
     if (rlen < res_size) {
 	*rbuf = driver_alloc(res_size);
diff --git a/erts/emulator/hipe/hipe_arm.c b/erts/emulator/hipe/hipe_arm.c
index b61939724c..3e1d7e4d5e 100644
--- a/erts/emulator/hipe/hipe_arm.c
+++ b/erts/emulator/hipe/hipe_arm.c
@@ -18,6 +18,7 @@
  * %CopyrightEnd%
  */
 
+#ifdef __arm__
 
 #include <stddef.h>	/* offsetof() */
 #ifdef HAVE_CONFIG_H
@@ -30,24 +31,39 @@
 #include "hipe_native_bif.h"	/* nbif_callemu() */
 #include "hipe_bif0.h"
 
+#ifndef __has_builtin
+# define __has_builtin(x) 0
+#endif
+
 /* Flush dcache and invalidate icache for a range of addresses. */
 void hipe_flush_icache_range(void *address, unsigned int nbytes)
 {
-#if defined(__ARM_EABI__)
+    void* end = (char*)address + nbytes;
+
+#if ERTS_AT_LEAST_GCC_VSN__(4, 3, 0) || __has_builtin(__builtin___clear_cache)
+    __builtin___clear_cache(address, end);
+#elif defined(__clang__)
+    void __clear_cache(void *start, void *end);
+    __clear_cache(address, end);
+#elif defined(__linux__)
+# if defined(__ARM_EABI__)
     register unsigned long beg __asm__("r0") = (unsigned long)address;
-    register unsigned long end __asm__("r1") = (unsigned long)address + nbytes;
+    register unsigned long end __asm__("r1") = (unsigned long)end;
     register unsigned long flg __asm__("r2") = 0;
     register unsigned long scno __asm__("r7") = 0xf0002;
     __asm__ __volatile__("swi 0"	/* sys_cacheflush() */
 			 : "=r"(beg)
 			 : "0"(beg), "r"(end), "r"(flg), "r"(scno));
-#else
+# else
     register unsigned long beg __asm__("r0") = (unsigned long)address;
-    register unsigned long end __asm__("r1") = (unsigned long)address + nbytes;
+    register unsigned long end __asm__("r1") = (unsigned long)end;
     register unsigned long flg __asm__("r2") = 0;
     __asm__ __volatile__("swi 0x9f0002"	/* sys_cacheflush() */
 			 : "=r"(beg)
 			 : "0"(beg), "r"(end), "r"(flg));
+# endif
+#else
+# error "Don't know how to flush instruction cache"
 #endif
 }
 
@@ -270,3 +286,5 @@ void hipe_arch_print_pcb(struct hipe_process_state *p)
     U("narity     ", narity);
 #undef U
 }
+
+#endif /*__arm__*/
diff --git a/erts/emulator/hipe/hipe_native_bif.c b/erts/emulator/hipe/hipe_native_bif.c
index 211ce0492a..80e5d81023 100644
--- a/erts/emulator/hipe/hipe_native_bif.c
+++ b/erts/emulator/hipe/hipe_native_bif.c
@@ -579,7 +579,7 @@ Eterm hipe_check_get_msg(Process *c_p)
 
     if (ERTS_SIG_IS_EXTERNAL_MSG(msgp)) {
         /* FIXME: bump appropriate amount... */
-        if (!erts_decode_dist_message(c_p, ERTS_PROC_LOCK_MAIN, msgp, 0)) {
+        if (!erts_proc_sig_decode_dist(c_p, ERTS_PROC_LOCK_MAIN, msgp, 0)) {
             /*
              * A corrupt distribution message that we weren't able to decode;
              * remove it...
diff --git a/erts/emulator/hipe/hipe_x86.h b/erts/emulator/hipe/hipe_x86.h
index 8967793171..a1fe75e792 100644
--- a/erts/emulator/hipe/hipe_x86.h
+++ b/erts/emulator/hipe/hipe_x86.h
@@ -22,17 +22,28 @@
 #ifndef HIPE_X86_H
 #define HIPE_X86_H
 
-static __inline__ void hipe_flush_icache_word(void *address)
-{
-    /* Do nothing. This works as long as compiled code is
-       executed by a single CPU thread. */
-}
+#ifndef __has_builtin
+# define __has_builtin(x) 0
+#endif
 
 static __inline__ void
 hipe_flush_icache_range(void *address, unsigned int nbytes)
 {
-    /* Do nothing. This works as long as compiled code is
-       executed by a single CPU thread. */
+    void* end = (char*)address + nbytes;
+
+#if ERTS_AT_LEAST_GCC_VSN__(4, 3, 0) || __has_builtin(__builtin___clear_cache)
+    __builtin___clear_cache(address, end);
+#elif defined(__clang__)
+    void __clear_cache(void *start, void *end);
+    __clear_cache(address, end);
+#else
+# warning "Don't know how to flush instruction cache"
+#endif
+}
+
+static __inline__ void hipe_flush_icache_word(void *address)
+{
+    hipe_flush_icache_range(address, sizeof(void*));
 }
 
 /* for stack descriptor hash lookup */
diff --git a/erts/emulator/internal_doc/CarrierMigration.md b/erts/emulator/internal_doc/CarrierMigration.md
index 3a796d11b7..40f6031ca8 100644
--- a/erts/emulator/internal_doc/CarrierMigration.md
+++ b/erts/emulator/internal_doc/CarrierMigration.md
@@ -1,6 +1,9 @@
 Carrier Migration
 =================
 
+Introduction
+------------
+
 The ERTS memory allocators manage memory blocks in two types of raw
 memory chunks. We call these chunks of raw memory
 *carriers*. Single-block carriers which only contain one large block,
@@ -34,8 +37,7 @@ Solution
 --------
 
 In order to prevent scenarios like this we've implemented support for
-migration of multi-block carriers between allocator instances of the
-same type.
+migration of multi-block carriers between allocator instances.
 
 ### Management of Free Blocks ###
 
@@ -130,10 +132,6 @@ threads may have references to it via the pool.
 
 ### Migration ###
 
-There exists one pool for each allocator type enabling migration of
-carriers between scheduler specific allocator instances of the same
-allocator type.
-
 Each allocator instance keeps track of the current utilization of its
 multi-block carriers. When the total utilization falls below the "abandon
 carrier utilization limit" it starts to inspect the utilization of the
@@ -146,11 +144,11 @@ 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 that created a carrier is called its **owner**.
+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
+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.
 
@@ -158,14 +156,14 @@ 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.
+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.
 
 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
+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.
@@ -185,14 +183,14 @@ back to the owner for deallocation using the delayed dealloc functionality.
 
 In short:
 
-* The allocator instance that created a carrier **owns** it.
-* An empty carrier is always deallocated by its **owner**.
-* **Ownership** never changes.
-* The allocator instance that uses a carrier **employs** it.
-* An **employer** can abandon a carrier into the pool.
+* The allocator instance that created a carrier *owns* it.
+* An empty carrier is always deallocated by its *owner*.
+* *Ownership* never changes.
+* The allocator instance that uses a carrier *employs* it.
+* An *employer* can abandon a carrier into the pool.
 * Pooled carriers are not allocated from.
-* Pooled carriers are always **employed** by their **owner**.
-* **Employment** can only change from **owner** to a foreign allocator
+* 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.
 
 
@@ -208,8 +206,8 @@ 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
 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
-not satisfy the request. The pool is lock-free and we do not want to
+carrier. A BUSY carrier will also be skipped by the search as it cannot
+satisfy the request. The pool is lock-free and we do not want to
 block, waiting for the other thread to finish.
 
 ### The bad cluster problem ###
@@ -234,7 +232,7 @@ carrier. When the cluster gets to the same size as the search limit,
 all searches will essentially fail.
 
 To counter the "bad cluster" problem and also ease the contention, the
-search will now always start by first looking at the allocators **own**
+search will now always start by first looking at the allocators *own*
 carriers. That is, carriers that were initially created by the
 allocator itself and later had been abandoned to the pool. If none of
 our own abandoned carrier would do, then the search continues into the
@@ -287,11 +285,3 @@ 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 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/CodeLoading.md b/erts/emulator/internal_doc/CodeLoading.md
index 151b9cd57c..0b2e3070e7 100644
--- a/erts/emulator/internal_doc/CodeLoading.md
+++ b/erts/emulator/internal_doc/CodeLoading.md
@@ -45,7 +45,7 @@ free to schedule other work while the second loader is waiting. (See
 `erts_release_code_write_permission`).
 
 The ability to prepare several modules in parallel is not currently
-used as almost all code loading is serialized by the code_server
+used as almost all code loading is serialized by the code\_server
 process. The BIF interface is however prepared for this.
 
       erlang:prepare_loading(Module, Code) -> LoaderState
@@ -71,8 +71,8 @@ structures. These *code access structures* are
 
 * Export table. One entry for every exported function.
 * Module table. One entry for each loaded module.
-* "beam_catches". Identifies jump destinations for catch instructions.
-* "beam_ranges". Map code address to function and line in source file.
+* "beam\_catches". Identifies jump destinations for catch instructions.
+* "beam\_ranges". Map code address to function and line in source file.
 
 The most frequently used of these structures is the export table that
 is accessed in run time for every executed external function call to
diff --git a/erts/emulator/internal_doc/CountingInstructions.md b/erts/emulator/internal_doc/CountingInstructions.md
new file mode 100644
index 0000000000..d4b1213d00
--- /dev/null
+++ b/erts/emulator/internal_doc/CountingInstructions.md
@@ -0,0 +1,53 @@
+Counting Instructions
+=====================
+
+Here is an example that shows how to count how many times each
+instruction is executed:
+
+    $ (cd erts/emulator && make icount)
+     MAKE	icount
+    make[1]: Entering directory `/home/uabbgus/otp/erts/emulator'
+      .
+      .
+      .
+    make[1]: Leaving directory `/home/uabbgus/otp/erts/emulator'
+    $ cat t.erl
+    -module(t).
+    -compile([export_all,nowarn_export_all]).
+
+    count() ->
+        erts_debug:ic(fun benchmark/0).
+
+    benchmark() ->
+        %% Run dialyzer.
+        Root = code:root_dir(),
+        Wc1 = filename:join(Root, "lib/{kernel,stdlib}/ebin/*.beam"),
+        Wc2 = filename:join(Root, "erts/preloaded/ebin/*.beam"),
+        Files = filelib:wildcard(Wc1) ++ filelib:wildcard(Wc2),
+        Opts = [{analysis_type,plt_build},{files,Files},{get_warnings,true}],
+        dialyzer:run(Opts).
+    $ $ERL_TOP/bin/cerl -icount
+    Erlang/OTP 22 [RELEASE CANDIDATE 1] [erts-10.2.4] [source-ac0d451] [64-bit] [smp:4:4] [ds:4:4:10] [async-threads:1] [hipe] [instruction-counting]
+
+    Eshell V10.2.4  (abort with ^G)
+    1> c(t).
+    {ok,t}
+    2> t:count().
+               0 badarg_j
+               0 badmatch_x
+               0 bs_add_jsstx
+               0 bs_context_to_binary_x
+                .
+                .
+                .
+       536461394 move_call_last_yfQ
+       552405176 allocate_tt
+       619920327 i_is_eq_exact_immed_frc
+       636419163 is_nonempty_list_allocate_frtt
+       641859278 i_get_tuple_element_xPx
+       678196718 move_return_c
+       786289914 is_tagged_tuple_frAa
+       865826424 i_call_f
+    Total: 20728870321
+    []
+    3>
diff --git a/erts/emulator/internal_doc/GarbageCollection.md b/erts/emulator/internal_doc/GarbageCollection.md
index 1d9e3f4160..a1627b3233 100644
--- a/erts/emulator/internal_doc/GarbageCollection.md
+++ b/erts/emulator/internal_doc/GarbageCollection.md
@@ -1,6 +1,6 @@
 # Erlang Garbage Collector
 
-Erlang manages dynamic memory with a [tracing garbage collector](https://en.wikipedia.org/wiki/Tracing_garbage_collection). More precisely a per process generational semi-space copying collector using [Cheney's](#cheney) copy collection algorithm together with a global large object space.
+Erlang manages dynamic memory with a [tracing garbage collector](https://en.wikipedia.org/wiki/Tracing_garbage_collection). More precisely a per process generational semi-space copying collector using Cheney's copy collection algorithm together with a global large object space. (See C. J. Cheney in [References](#references).)
 
 ## Overview
 
@@ -12,12 +12,11 @@ Terms are created on the heap by evaluating expressions. There are two major typ
 
 Let's look at an example that returns a tuple with the newly created data.
 
-```erlang
-data(Foo) ->
-   Cons = [42|Foo],
-   Literal = {text, "hello world!"},
-   {tag, Cons, Literal}.
-```
+
+    data(Foo) ->
+       Cons = [42|Foo],
+       Literal = {text, "hello world!"},
+       {tag, Cons, Literal}.
 
 In this example we first create a new cons cell with an integer and a tuple with some text. Then a tuple of size three wrapping the other values with an atom tag is created and returned.
 
@@ -25,7 +24,6 @@ On the heap tuples require a word size for each of its elements as well as for t
 
 Compiling this code to beam assembly (`erlc -S`) shows exactly what is happening.
 
-```erlang
     ...
     {test_heap,6,1}.
     {put_list,{integer,42},{x,0},{x,1}}.
@@ -34,9 +32,8 @@ Compiling this code to beam assembly (`erlc -S`) shows exactly what is happening
     {put,{x,1}}.
     {put,{literal,{text,"hello world!"}}}.
     return.
-```
 
-Looking at the assembler code we can see three things; The heap requirement in this function turns out to be only six words, as seen by the `{test_heap,6,1}` instruction. All the allocations are combined to a single instruction. The bulk of the data `{text, "hello world!"}` is a *literal*. Literals, sometimes referred to as constants, are not allocated in the function since they are a part of the module and allocated at load time.
+Looking at the assembler code we can see three things: The heap requirement in this function turns out to be only six words, as seen by the `{test_heap,6,1}` instruction. All the allocations are combined to a single instruction. The bulk of the data `{text, "hello world!"}` is a *literal*. Literals, sometimes referred to as constants, are not allocated in the function since they are a part of the module and allocated at load time.
 
 If there is not enough space available on the heap to satisfy the `test_heap` instructions request for memory, then a garbage collection is initiated. It may happen immediately in the `test_heap` instruction, or it can be delayed until a later time depending on what state the process is in. If the garbage collection is delayed, any memory needed will be allocated in heap fragments. Heap fragments are extra memory blocks that are a part of the young heap, but are not allocated in the contigious area where terms normally reside. See [The young heap](#the-young-heap) for more details.
 
@@ -50,11 +47,9 @@ It follows all the pointers from the root-set to the heap and copies each term w
 
 After the header word has been copied a [*move marker*](https://github.com/erlang/otp/blob/OTP-18.0/erts/emulator/beam/erl_gc.h#L45-L46) is destructively placed in it pointing to the term in the *to space*. Any other term that points to the already moved term will [see this move marker](https://github.com/erlang/otp/blob/OTP-18.0/erts/emulator/beam/erl_gc.c#L1125) and copy the referring pointer instead. For example, if the have the following Erlang code:
 
-```erlang
-foo(Arg) ->
-    T = {test, Arg},
-    {wrapper, T, T, T}.
-```
+    foo(Arg) ->
+        T = {test, Arg},
+        {wrapper, T, T, T}.
 
 Only one copy of T exists on the heap and during the garbage collection only the first time T is encountered will it be copied.
 
@@ -86,15 +81,15 @@ In the next garbage collection, any pointers to the old heap will be ignored and
 
 Generational garbage collection aims to increase performance at the expense of memory. This is achieved because only the young, smaller, heap is considered in most garbage collections.
 
-The generational [hypothesis](#ungar) predicts that most terms tend to die young, and for an immutable language such as Erlang, young terms die even faster than in other languages. So for most usage patterns the data in the new heap will die very soon after it is allocated. This is good because it limits the amount of data copied to the old heap and also because the garbage collection algorithm used is proportional to the amount of live data on the heap.
+The generational hypothesis predicts that most terms tend to die young (see D. Ungar in [References](#references)), and for an immutable language such as Erlang, young terms die even faster than in other languages. So for most usage patterns the data in the new heap will die very soon after it is allocated. This is good because it limits the amount of data copied to the old heap and also because the garbage collection algorithm used is proportional to the amount of live data on the heap.
 
 One critical issue to note here is that any term on the young heap can reference terms on the old heap but *no* term on the old heap may refer to a term on the young heap. This is due to the nature of the copy algorithm. Anything referenced by an old heap term is not included in the reference tree, root-set and its followers, and hence is not copied. If it was, the data would be lost, fire and brimstone would rise to cover the earth. Fortunately, this comes naturally for Erlang because the terms are immutable and thus there can be no pointers modified on the old heap to point to the young heap.
 
-To reclaim data from the old heap, both young and old heaps are included during the collection and copied to a common *to space*. Both the *from space* of the young and old heap are then deallocated and the procedure will start over from the beginning. This type of garbage collection is called a full sweep and is triggered when the size of the area under the high-watermark is larger than the size of the free area of the old heap. It can also be triggered by doing a manual call to [erlang:garbage_collect()](http://erlang.org/doc/man/erlang.html#garbage_collect-0), or by running into the young garbage collection limit set by [spawn_opt(fun(),[{fullsweep_after, N}])](http://erlang.org/doc/man/erlang.html#spawn_opt-4) where N is the number of young garbage collections to do before forcing a garbage collection of both young and old heap.
+To reclaim data from the old heap, both young and old heaps are included during the collection and copied to a common *to space*. Both the *from space* of the young and old heap are then deallocated and the procedure will start over from the beginning. This type of garbage collection is called a full sweep and is triggered when the size of the area under the high-watermark is larger than the size of the free area of the old heap. It can also be triggered by doing a manual call to [erlang:garbage_collect()](http://erlang.org/doc/man/erlang.html#garbage_collect-0), or by running into the young garbage collection limit set by [spawn\_opt(fun(),[{fullsweep\_after, N}\])](http://erlang.org/doc/man/erlang.html#spawn_opt-4) where N is the number of young garbage collections to do before forcing a garbage collection of both young and old heap.
 
 ## The young heap
 
-The young heap, or the allocation heap, consists of the stack and heap as described in the Overview. However, it also includes any heap fragments that are attached to the heap. All of the heap fragments are considered to be above the high-watermark and part of the young generation. Heap fragments contain terms that either did not fit on the heap, or were created by another process and then attached to the heap. For instance if the bif binary_to_term created a term which does not fit on the current heap without doing a garbage collection, it will create a heap-fragment for the term and then schedule a garbage collection for later. Also if a message is sent to the process, the payload may be placed in a heap-fragment and that fragment is added to young heap when the message is matched in a receive clause.
+The young heap, or the allocation heap, consists of the stack and heap as described in the Overview. However, it also includes any heap fragments that are attached to the heap. All of the heap fragments are considered to be above the high-watermark and part of the young generation. Heap fragments contain terms that either did not fit on the heap, or were created by another process and then attached to the heap. For instance if the bif `binary_to_term/1` created a term which does not fit on the current heap without doing a garbage collection, it will create a heap-fragment for the term and then schedule a garbage collection for later. Also if a message is sent to the process, the payload may be placed in a heap-fragment and that fragment is added to young heap when the message is matched in a receive clause.
 
 This procedure differs from how it worked prior to Erlang/OTP 19.0. Before 19.0, only a contiguous memory block where the young heap and stack resided was considered to be part of the young heap. Heap fragments and messages were immediately copied into the young heap before they could be inspected by the Erlang program. The behaviour introduced in 19.0 is superior in many ways - most significantly it reduces the number of necessary copy operations and the root set for garbage collection.
 
@@ -118,21 +113,19 @@ The old heap is always one step ahead in the heap growth stages than the young h
 
 When garbage collecting a heap (young or old) all literals are left in place and not copied. To figure out if a term should be copied or not when doing a garbage collection the following pseudo code is used:
 
-```c
-if (erts_is_literal(ptr) || (on_old_heap(ptr) && !fullsweep)) {
-  /* literal or non fullsweep - do not copy */
-} else {
-  copy(ptr);
-}
-```
+    if (erts_is_literal(ptr) || (on_old_heap(ptr) && !fullsweep)) {
+      /* literal or non fullsweep - do not copy */
+    } else {
+      copy(ptr);
+    }
 
 The [`erts_is_literal`](https://github.com/erlang/otp/blob/OTP-19.0/erts/emulator/beam/global.h#L1452-L1465) check works differently on different architectures and operating systems.
 
-On 64 bit systems that allow mapping of unreserved virtual memory areas (most operating systems except Windows), an area of size 1 GB (by default) is mapped and then all literals are placed within that area. Then all that has to be done to determine if something is a literal or not is [two quick pointer checks](https://github.com/erlang/otp/blob/OTP-19.0/erts/emulator/beam/erl_alloc.h#L322-L324). This system relies on the fact that a memory page that has not been touched yet does not take any actual space. So even if 1 GB of virtual memory is mapped, only the memory which is actually needed for literals is allocated in ram. The size of the literal area is configurable through the +MIscs erts_alloc option.
+On 64 bit systems that allow mapping of unreserved virtual memory areas (most operating systems except Windows), an area of size 1 GB (by default) is mapped and then all literals are placed within that area. Then all that has to be done to determine if something is a literal or not is [two quick pointer checks](https://github.com/erlang/otp/blob/OTP-19.0/erts/emulator/beam/erl_alloc.h#L322-L324). This system relies on the fact that a memory page that has not been touched yet does not take any actual space. So even if 1 GB of virtual memory is mapped, only the memory which is actually needed for literals is allocated in ram. The size of the literal area is configurable through the +MIscs erts\_alloc option.
 
 On 32 bit systems, there is not enough virtual memory space to allocate 1 GB for just literals, so instead small 256 KB sized literal regions are created on demand and a card mark bit-array of the entire 32 bit memory space is then used to determine if a term is a literal or not. Since the total memory space is only 32 bits, the card mark bit-array is only 256 words large. On a 64 bit system the same bit-array would have to be 1 tera words large, so this technique is only viable on 32 bit systems. Doing [lookups in the array](https://github.com/erlang/otp/blob/OTP-19.0/erts/emulator/beam/erl_alloc.h#L316-L319) is a little more expensive then just doing the pointer checks that can be done in 64 bit systems, but not extremely so.
 
-On 64 bit windows, on which erts_alloc cannot do unreserved virtual memory mappings, a [special tag](https://github.com/erlang/otp/blob/OTP-19.0/erts/emulator/beam/erl_term.h#L59) within the Erlang term object is used to determine if something [is a literal or not](https://github.com/erlang/otp/blob/OTP-19.0/erts/emulator/beam/erl_term.h#L248-L252). This is very cheap, however, the tag is only available on 64 bit machines, and it is possible to do a great deal of other nice optimizations with this tag in the future (like for instance a more compact list implementation) so it is not used on operating systems where it is not needed.
+On 64 bit windows, on which erts\_alloc cannot do unreserved virtual memory mappings, a [special tag](https://github.com/erlang/otp/blob/OTP-19.0/erts/emulator/beam/erl_term.h#L59) within the Erlang term object is used to determine if something [is a literal or not](https://github.com/erlang/otp/blob/OTP-19.0/erts/emulator/beam/erl_term.h#L248-L252). This is very cheap, however, the tag is only available on 64 bit machines, and it is possible to do a great deal of other nice optimizations with this tag in the future (like for instance a more compact list implementation) so it is not used on operating systems where it is not needed.
 
 This behaviour is different from how it worked prior to Erlang/OTP 19.0. Before 19.0 the literal check was done by checking if the pointer pointed to the young or old heap block. If it did not, then it was considered a literal. This lead to considerable overhead and strange memory usage scenarios, so it was removed in 19.0.
 
@@ -182,6 +175,8 @@ Using `on_heap` will force all messages to be part of on the young heap which wi
 
 Which one of these strategies is best depends a lot on what the process is doing and how it interacts with other processes. So, as always, profile the application and see how it behaves with the different options.
 
-   <a name="cheney">[1]</a>: C. J. Cheney. A nonrecursive list compacting algorithm. Commun. ACM, 13(11):677–678, Nov. 1970.
+## References
+
+C. J. Cheney. A nonrecursive list compacting algorithm. Commun. ACM, 13(11):677–678, Nov. 1970.
 
-   <a name="ungar">[2]</a>: D. Ungar. Generation scavenging: A non-disruptive high performance storage reclamation algorithm. SIGSOFT Softw. Eng. Notes, 9(3):157–167, Apr. 1984.
+D. Ungar. Generation scavenging: A non-disruptive high performance storage reclamation algorithm. SIGSOFT Softw. Eng. Notes, 9(3):157–167, Apr. 1984.
diff --git a/erts/emulator/internal_doc/PTables.md b/erts/emulator/internal_doc/PTables.md
index 6fe0e7665d..ef61963a40 100644
--- a/erts/emulator/internal_doc/PTables.md
+++ b/erts/emulator/internal_doc/PTables.md
@@ -85,13 +85,13 @@ following:
 3.  Depending on use, issue appropriate memory barrier.
 
     A common barrier used is a barrier with acquire semantics. On
-    x86/x86_64 this maps to a compiler barrier preventing the compiler
+    x86/x86\_64 this maps to a compiler barrier preventing the compiler
     to reorder instructions, but on other hardware often some kind of
     light weight hardware memory barrier is also needed.
 
     When comparing with a locked approach, at least one heavy weight
     memory barrier will be issued when locking the lock on most, if
-    not all, hardware architectures (including x86/x86_64), and often
+    not all, hardware architectures (including x86/x86\_64), and often
     some kind of light weight memory barrier will be issued when
     unlocking the lock. 
 
diff --git a/erts/emulator/internal_doc/SuperCarrier.md b/erts/emulator/internal_doc/SuperCarrier.md
index acf722ea37..f52c6613d5 100644
--- a/erts/emulator/internal_doc/SuperCarrier.md
+++ b/erts/emulator/internal_doc/SuperCarrier.md
@@ -5,7 +5,7 @@ A super carrier is large memory area, allocated at VM start, which can
 be used during runtime to allocate normal carriers from.
 
 The super carrier feature was introduced in OTP R16B03. It is
-enabled with command line option +MMscs <size in Mb>
+enabled with command line option +MMscs &lt;size in Mb&gt;
 and can be configured with other options.
 
 Problem
@@ -65,7 +65,7 @@ carrier is full.
 
 ### Implementation ###
 
-The entire super carrier implementation is kept in erl_mmap.c. The
+The entire super carrier implementation is kept in erl\_mmap.c. The
 name suggest that it can be viewed as our own mmap implementation.
 
 A super carrier needs to satisfy two slightly different kinds of
@@ -98,8 +98,8 @@ other.
 
 ### Data structures ###
 
-The MBC area is called **sa** as in super aligned and the SBC area is
-called **sua** as in super un-aligned.
+The MBC area is called *sa* as in super aligned and the SBC area is
+called *sua* as in super un-aligned.
 
 Note that the "super" in super alignment and the "super" in super
 carrier has nothing to do with each other. We could have choosen
@@ -128,7 +128,7 @@ down or up.
 We need to keep track of all the free segments in order to reuse them
 for new carrier allocations. One initial idea was to use the same
 mechanism that is used to keep track of free blocks within MBCs
-(alloc_util and the different strategies). However, that would not be
+(alloc\_util and the different strategies). However, that would not be
 as straight forward as one can think and can also waste quite a lot of
 memory as it uses prepended block headers. The granularity of the
 super carrier is one memory page (usually 4kb). We want to allocate
diff --git a/erts/emulator/internal_doc/Tracing.md b/erts/emulator/internal_doc/Tracing.md
index 7f97f64765..196ae0dd4e 100644
--- a/erts/emulator/internal_doc/Tracing.md
+++ b/erts/emulator/internal_doc/Tracing.md
@@ -37,6 +37,7 @@ what different type of break actions that are enabled.
 
 Same Same but Different
 -----------------------
+
 Even though `trace_pattern` use the same technique as the non-blocking
 code loading with replicated generations of data structures and an
 atomic switch, the implementations are quite separate from each
@@ -72,6 +73,7 @@ aligned write operation on all hardware architectures we use.
 
 Adding a new Breakpoint
 -----------------------
+
 This is a simplified sequence describing what `trace_pattern` goes
 through when adding a new breakpoint.
 
@@ -82,7 +84,7 @@ through when adding a new breakpoint.
    instruction word in the breakpoint.
 
 3. Write a pointer to the breakpoint at offset -4 from the first
-   instruction "func_info" header.
+   instruction "func\_info" header.
 
 4. Set the staging part of the breakpoint as enabled with specified
    breakpoint data.
@@ -139,7 +141,7 @@ and removing breakpoints.
 
 2. Allocate new breakpoint structures with a disabled active part and
    the original beam instruction. Write a pointer to the breakpoint in
-   "func_info" header at offset -4.
+   "func\_info" header at offset -4.
 
 3. Update the staging part of all affected breakpoints. Disable
    breakpoints that are to be removed.
diff --git a/erts/emulator/internal_doc/beam_makeops.md b/erts/emulator/internal_doc/beam_makeops.md
index 1da8d2ab05..2880099b70 100644
--- a/erts/emulator/internal_doc/beam_makeops.md
+++ b/erts/emulator/internal_doc/beam_makeops.md
@@ -403,7 +403,7 @@ 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
+A long line can be broken into shorter lines by a placing a `\` before
 the newline.
 
 ### Variable definitions ###
@@ -1159,7 +1159,6 @@ implementation of `gen_element()`:
 
         return op;
     }
-}
 
 ### Defining the implementation ###
 
@@ -1452,7 +1451,7 @@ optionally additional heap space.
 
 ##### The NEXT_INSTRUCTION pre-bound variable #####
 
-The NEXT_INSTRUCTION is a pre-bound variable that is available in
+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:
@@ -1545,7 +1544,7 @@ 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
+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.
 
diff --git a/erts/emulator/nifs/common/prim_file_nif.c b/erts/emulator/nifs/common/prim_file_nif.c
index b34bf11205..3df04e42e2 100644
--- a/erts/emulator/nifs/common/prim_file_nif.c
+++ b/erts/emulator/nifs/common/prim_file_nif.c
@@ -38,7 +38,6 @@ static void unload(ErlNifEnv *env, void* priv_data);
 
 static ErlNifResourceType *efile_resource_type;
 
-static ERL_NIF_TERM am_erts_prim_file;
 static ERL_NIF_TERM am_close;
 
 static ERL_NIF_TERM am_ok;
@@ -220,7 +219,6 @@ static int load(ErlNifEnv *env, void** priv_data, ERL_NIF_TERM prim_file_pid)
         ASSERT(!"bad pid passed to prim_file_nif");
     }
 
-    am_erts_prim_file = enif_make_atom(env, "erts_prim_file");
     am_close = enif_make_atom(env, "close");
 
     am_ok = enif_make_atom(env, "ok");
@@ -478,7 +476,8 @@ static ERL_NIF_TERM open_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]
     ERL_NIF_TERM result;
     efile_path_t path;
 
-    if(argc != 2 || !enif_is_list(env, argv[1])) {
+    ASSERT(argc == 2);
+    if(!enif_is_list(env, argv[1])) {
         return enif_make_badarg(env);
     }
 
@@ -553,7 +552,8 @@ static ERL_NIF_TERM read_nif_impl(efile_data_t *d, ErlNifEnv *env, int argc, con
     SysIOVec read_vec[1];
     ErlNifBinary result;
 
-    if(argc != 1 || !enif_is_number(env, argv[0])) {
+    ASSERT(argc == 1);
+    if(!enif_is_number(env, argv[0])) {
         return enif_make_badarg(env);
     }
 
@@ -591,7 +591,8 @@ static ERL_NIF_TERM write_nif_impl(efile_data_t *d, ErlNifEnv *env, int argc, co
     Sint64 bytes_written;
     ERL_NIF_TERM tail;
 
-    if(argc != 1 || !enif_inspect_iovec(env, 64, argv[0], &tail, &input)) {
+    ASSERT(argc == 1);
+    if(!enif_inspect_iovec(env, 64, argv[0], &tail, &input)) {
         return enif_make_badarg(env);
     }
 
@@ -614,8 +615,8 @@ static ERL_NIF_TERM pread_nif_impl(efile_data_t *d, ErlNifEnv *env, int argc, co
     SysIOVec read_vec[1];
     ErlNifBinary result;
 
-    if(argc != 2 || !enif_is_number(env, argv[0])
-                 || !enif_is_number(env, argv[1])) {
+    ASSERT(argc == 2);
+    if(!enif_is_number(env, argv[0]) || !enif_is_number(env, argv[1])) {
         return enif_make_badarg(env);
     }
 
@@ -654,8 +655,9 @@ static ERL_NIF_TERM pwrite_nif_impl(efile_data_t *d, ErlNifEnv *env, int argc, c
     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)) {
+    ASSERT(argc == 2);
+    if(!enif_is_number(env, argv[0])
+       || !enif_inspect_iovec(env, 64, argv[1], &tail, &input)) {
         return enif_make_badarg(env);
     }
 
@@ -682,7 +684,8 @@ static ERL_NIF_TERM seek_nif_impl(efile_data_t *d, ErlNifEnv *env, int argc, con
     Sint64 new_position, offset;
     enum efile_seek_t seek;
 
-    if(argc != 2 || !enif_get_int64(env, argv[1], &offset)) {
+    ASSERT(argc == 2);
+    if(!enif_get_int64(env, argv[1], &offset)) {
         return enif_make_badarg(env);
     }
 
@@ -706,7 +709,8 @@ static ERL_NIF_TERM seek_nif_impl(efile_data_t *d, ErlNifEnv *env, int argc, con
 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)) {
+    ASSERT(argc == 1);
+    if(!enif_get_int(env, argv[0], &data_only)) {
         return enif_make_badarg(env);
     }
 
@@ -718,9 +722,7 @@ static ERL_NIF_TERM sync_nif_impl(efile_data_t *d, ErlNifEnv *env, int argc, con
 }
 
 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);
-    }
+    ASSERT(argc == 0);
 
     if(!efile_truncate(d)) {
         return posix_error_to_tuple(env, d->posix_errno);
@@ -732,8 +734,8 @@ static ERL_NIF_TERM truncate_nif_impl(efile_data_t *d, ErlNifEnv *env, int argc,
 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])) {
+    ASSERT(argc == 2);
+    if(!enif_is_number(env, argv[0]) || !enif_is_number(env, argv[1])) {
         return enif_make_badarg(env);
     }
 
@@ -754,8 +756,8 @@ static ERL_NIF_TERM advise_nif_impl(efile_data_t *d, ErlNifEnv *env, int argc, c
     enum efile_advise_t advise;
     Sint64 offset, length;
 
-    if(argc != 3 || !enif_is_number(env, argv[0])
-                 || !enif_is_number(env, argv[1])) {
+    ASSERT(argc == 3);
+    if(!enif_is_number(env, argv[0]) || !enif_is_number(env, argv[1])) {
         return enif_make_badarg(env);
     }
 
@@ -818,8 +820,8 @@ static ERL_NIF_TERM ipread_s32bu_p32bu_nif_impl(efile_data_t *d, ErlNifEnv *env,
 
     ErlNifBinary payload;
 
-    if(argc != 2 || !enif_is_number(env, argv[0])
-                 || !enif_is_number(env, argv[1])) {
+    ASSERT(argc == 2);
+    if(!enif_is_number(env, argv[0]) || !enif_is_number(env, argv[1])) {
         return enif_make_badarg(env);
     }
 
@@ -886,9 +888,7 @@ static ERL_NIF_TERM ipread_s32bu_p32bu_nif_impl(efile_data_t *d, ErlNifEnv *env,
 }
 
 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);
-    }
+    ASSERT(argc == 0);
 
     return efile_get_handle(env, d);
 }
@@ -900,7 +900,8 @@ static ERL_NIF_TERM read_info_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM a
     efile_path_t path;
     int follow_links;
 
-    if(argc != 2 || !enif_get_int(env, argv[1], &follow_links)) {
+    ASSERT(argc == 2);
+    if(!enif_get_int(env, argv[1], &follow_links)) {
         return enif_make_badarg(env);
     }
 
@@ -933,9 +934,10 @@ static ERL_NIF_TERM set_permissions_nif(ErlNifEnv *env, int argc, const ERL_NIF_
     posix_errno_t posix_errno;
 
     efile_path_t path;
-    Uint permissions;
+    unsigned int permissions;
 
-    if(argc != 2 || !enif_get_uint(env, argv[1], &permissions)) {
+    ASSERT(argc == 2);
+    if(!enif_get_uint(env, argv[1], &permissions)) {
         return enif_make_badarg(env);
     }
 
@@ -952,10 +954,10 @@ static ERL_NIF_TERM set_owner_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM a
     posix_errno_t posix_errno;
 
     efile_path_t path;
-    Sint uid, gid;
+    int uid, gid;
 
-    if(argc != 3 || !enif_get_int(env, argv[1], &uid)
-                 || !enif_get_int(env, argv[2], &gid)) {
+    ASSERT(argc == 3);
+    if(!enif_get_int(env, argv[1], &uid) || !enif_get_int(env, argv[2], &gid)) {
         return enif_make_badarg(env);
     }
 
@@ -974,9 +976,10 @@ static ERL_NIF_TERM set_time_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM ar
     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)) {
+    ASSERT(argc == 4);
+    if(!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);
     }
 
@@ -995,9 +998,7 @@ static ERL_NIF_TERM read_link_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM a
     efile_path_t path;
     ERL_NIF_TERM result;
 
-    if(argc != 1) {
-        return enif_make_badarg(env);
-    }
+    ASSERT(argc == 1);
 
     if((posix_errno = efile_marshal_path(env, argv[0], &path))) {
         return posix_error_to_tuple(env, posix_errno);
@@ -1014,9 +1015,7 @@ static ERL_NIF_TERM list_dir_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM ar
     efile_path_t path;
     ERL_NIF_TERM result;
 
-    if(argc != 1) {
-        return enif_make_badarg(env);
-    }
+    ASSERT(argc == 1);
 
     if((posix_errno = efile_marshal_path(env, argv[0], &path))) {
         return posix_error_to_tuple(env, posix_errno);
@@ -1032,9 +1031,7 @@ static ERL_NIF_TERM rename_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv
 
     efile_path_t existing_path, new_path;
 
-    if(argc != 2) {
-        return enif_make_badarg(env);
-    }
+    ASSERT(argc == 2);
 
     if((posix_errno = efile_marshal_path(env, argv[0], &existing_path))) {
         return posix_error_to_tuple(env, posix_errno);
@@ -1052,9 +1049,7 @@ static ERL_NIF_TERM make_hard_link_nif(ErlNifEnv *env, int argc, const ERL_NIF_T
 
     efile_path_t existing_path, new_path;
 
-    if(argc != 2) {
-        return enif_make_badarg(env);
-    }
+    ASSERT(argc == 2);
 
     if((posix_errno = efile_marshal_path(env, argv[0], &existing_path))) {
         return posix_error_to_tuple(env, posix_errno);
@@ -1072,9 +1067,7 @@ static ERL_NIF_TERM make_soft_link_nif(ErlNifEnv *env, int argc, const ERL_NIF_T
 
     efile_path_t existing_path, new_path;
 
-    if(argc != 2) {
-        return enif_make_badarg(env);
-    }
+    ASSERT(argc == 2);
 
     if((posix_errno = efile_marshal_path(env, argv[0], &existing_path))) {
         return posix_error_to_tuple(env, posix_errno);
@@ -1092,9 +1085,7 @@ static ERL_NIF_TERM make_dir_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM ar
 
     efile_path_t path;
 
-    if(argc != 1) {
-        return enif_make_badarg(env);
-    }
+    ASSERT(argc == 1);
 
     if((posix_errno = efile_marshal_path(env, argv[0], &path))) {
         return posix_error_to_tuple(env, posix_errno);
@@ -1110,9 +1101,7 @@ static ERL_NIF_TERM del_file_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM ar
 
     efile_path_t path;
 
-    if(argc != 1) {
-        return enif_make_badarg(env);
-    }
+    ASSERT(argc == 1);
 
     if((posix_errno = efile_marshal_path(env, argv[0], &path))) {
         return posix_error_to_tuple(env, posix_errno);
@@ -1128,9 +1117,7 @@ static ERL_NIF_TERM del_dir_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM arg
 
     efile_path_t path;
 
-    if(argc != 1) {
-        return enif_make_badarg(env);
-    }
+    ASSERT(argc == 1);
 
     if((posix_errno = efile_marshal_path(env, argv[0], &path))) {
         return posix_error_to_tuple(env, posix_errno);
@@ -1147,7 +1134,8 @@ static ERL_NIF_TERM get_device_cwd_nif(ErlNifEnv *env, int argc, const ERL_NIF_T
     ERL_NIF_TERM result;
     int device_index;
 
-    if(argc != 1 || !enif_get_int(env, argv[0], &device_index)) {
+    ASSERT(argc == 1);
+    if(!enif_get_int(env, argv[0], &device_index)) {
         return enif_make_badarg(env);
     }
 
@@ -1162,9 +1150,7 @@ static ERL_NIF_TERM get_cwd_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM arg
     posix_errno_t posix_errno;
     ERL_NIF_TERM result;
 
-    if(argc != 0) {
-        return enif_make_badarg(env);
-    }
+    ASSERT(argc == 0);
 
     if((posix_errno = efile_get_cwd(env, &result))) {
         return posix_error_to_tuple(env, posix_errno);
@@ -1178,9 +1164,7 @@ static ERL_NIF_TERM set_cwd_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM arg
 
     efile_path_t path;
 
-    if(argc != 1) {
-        return enif_make_badarg(env);
-    }
+    ASSERT(argc == 1);
 
     if((posix_errno = efile_marshal_path(env, argv[0], &path))) {
         return posix_error_to_tuple(env, posix_errno);
@@ -1256,9 +1240,7 @@ static ERL_NIF_TERM read_file_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM a
 
     ErlNifBinary result;
 
-    if(argc != 1) {
-        return enif_make_badarg(env);
-    }
+    ASSERT(argc == 1);
 
     if((posix_errno = efile_marshal_path(env, argv[0], &path))) {
         return posix_error_to_tuple(env, posix_errno);
@@ -1286,9 +1268,7 @@ static ERL_NIF_TERM altname_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM arg
     efile_path_t path;
     ERL_NIF_TERM result;
 
-    if(argc != 1) {
-        return enif_make_badarg(env);
-    }
+    ASSERT(argc == 1);
 
     if((posix_errno = efile_marshal_path(env, argv[0], &path))) {
         return posix_error_to_tuple(env, posix_errno);
diff --git a/erts/emulator/nifs/common/prim_net_nif.c b/erts/emulator/nifs/common/prim_net_nif.c
new file mode 100644
index 0000000000..11a8ff724e
--- /dev/null
+++ b/erts/emulator/nifs/common/prim_net_nif.c
@@ -0,0 +1,1656 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2018-2019. 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 : The NIF (C) part of the net interface
+ *            This is a module of miscellaneous functions.
+ * ----------------------------------------------------------------------
+ *
+ */
+
+#define STATIC_ERLANG_NIF 1
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+/* If we HAVE_SCTP_H and Solaris, we need to define the following in
+ * order to get SCTP working:
+ */
+#if (defined(HAVE_SCTP_H) && defined(__sun) && defined(__SVR4))
+#define SOLARIS10    1
+/* WARNING: This is not quite correct, it may also be Solaris 11! */
+#define _XPG4_2
+#define __EXTENSIONS__
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <time.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+
+#ifdef HAVE_NET_IF_DL_H
+#include <net/if_dl.h>
+#endif
+
+#ifdef HAVE_IFADDRS_H
+#include <ifaddrs.h>
+#endif
+
+#ifdef HAVE_NETPACKET_PACKET_H
+#include <netpacket/packet.h>
+#endif
+
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+
+/* SENDFILE STUFF HERE IF WE NEED IT... */
+
+#if defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN__)
+#define __DARWIN__ 1
+#endif
+
+
+#ifdef __WIN32__
+#define STRNCASECMP               strncasecmp
+#define INCL_WINSOCK_API_TYPEDEFS 1
+
+#ifndef WINDOWS_H_INCLUDES_WINSOCK2_H
+#include <winsock2.h>
+#endif
+#include <windows.h>
+#include <Ws2tcpip.h>   /* NEED VC 6.0 or higher */
+
+/* Visual studio 2008+: NTDDI_VERSION needs to be set for iphlpapi.h
+ * to define the right structures. It needs to be set to WINXP (or LONGHORN)
+ * for IPV6 to work and it's set lower by default, so we need to change it.
+ */
+#ifdef HAVE_SDKDDKVER_H
+#  include <sdkddkver.h>
+#  ifdef NTDDI_VERSION
+#    undef NTDDI_VERSION
+#  endif
+#  define NTDDI_VERSION NTDDI_WINXP
+#endif
+#include <iphlpapi.h>
+
+#undef WANT_NONBLOCKING
+#include "sys.h"
+
+#else /* !__WIN32__ */
+
+#include <sys/time.h>
+#ifdef NETDB_H_NEEDS_IN_H
+#include <netinet/in.h>
+#endif
+#include <netdb.h>
+
+#include <sys/socket.h>
+#include <netinet/in.h>
+
+#ifdef DEF_INADDR_LOOPBACK_IN_RPC_TYPES_H
+#include <rpc/types.h>
+#endif
+
+#include <netinet/ip.h>
+#include <netinet/tcp.h>
+#include <netinet/udp.h>
+#include <arpa/inet.h>
+
+#include <sys/param.h>
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
+
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+
+#include <net/if.h>
+
+#ifdef HAVE_SCHED_H
+#include <sched.h>
+#endif
+
+#ifdef HAVE_SETNS_H
+#include <setns.h>
+#endif
+
+#define HAVE_UDP
+
+#ifndef WANT_NONBLOCKING
+#define WANT_NONBLOCKING
+#endif
+#include "sys.h"
+
+#endif
+
+#include <erl_nif.h>
+
+#include "socket_dbg.h"
+#include "socket_int.h"
+#include "socket_util.h"
+
+
+/* All platforms fail on malloc errors. */
+#define FATAL_MALLOC
+
+
+#ifdef __WIN32__
+#define net_gethostname(__buf__, __bufSz__) gethostname((__buf__), (__bufSz__))
+#else
+#define net_gethostname(__buf__, __bufSz__) gethostname((__buf__), (__bufSz__))
+#endif // __WIN32__
+
+
+
+/* *** Misc macros and defines *** */
+
+#ifdef __WIN32__
+#define get_errno() WSAGetLastError()
+#else
+#define get_errno() errno
+#endif
+
+
+#define HOSTNAME_LEN 256
+#define SERVICE_LEN  256
+
+
+/* MAXHOSTNAMELEN could be 64 or 255 depending
+ * on the platform. Instead, use INET_MAXHOSTNAMELEN
+ * which is always 255 across all platforms
+ */
+#define NET_MAXHOSTNAMELEN 255
+
+
+/* =================================================================== *
+ *                                                                     *
+ *                        Various enif macros                          *
+ *                                                                     *
+ * =================================================================== */
+
+
+#ifdef HAVE_SOCKLEN_T
+#  define SOCKLEN_T socklen_t
+#else
+#  define SOCKLEN_T size_t
+#endif
+
+/* Debug stuff... */
+#define NET_NIF_DEBUG_DEFAULT FALSE
+
+#define NDBG( proto ) ESOCK_DBG_PRINTF( data.debug , proto )
+
+
+typedef struct {
+    BOOLEAN_T debug;
+} NetData;
+
+
+
+/* =================================================================== *
+ *                                                                     *
+ *                           Static data                               *
+ *                                                                     *
+ * =================================================================== */
+
+
+static NetData data;
+
+
+
+/* ----------------------------------------------------------------------
+ *  F o r w a r d s
+ * ----------------------------------------------------------------------
+ */
+
+/* THIS IS JUST TEMPORARY */
+extern char* erl_errno_id(int error);
+
+/* All the nif "callback" functions for the net API has
+ * the exact same API:
+ *
+ * nif_<funcname>(ErlNifEnv*         env,
+ *                int                argc,
+ *                const ERL_NIF_TERM argv[]);
+ *
+ * So, to simplify, use some macro magic to define those.
+ *
+ * These are the functions making up the "official" API.
+ */
+
+#define ENET_NIF_FUNCS                  \
+    ENET_NIF_FUNC_DEF(info);            \
+    ENET_NIF_FUNC_DEF(command);         \
+    ENET_NIF_FUNC_DEF(gethostname);     \
+    ENET_NIF_FUNC_DEF(getnameinfo);     \
+    ENET_NIF_FUNC_DEF(getaddrinfo);      \
+    ENET_NIF_FUNC_DEF(if_name2index);   \
+    ENET_NIF_FUNC_DEF(if_index2name);   \
+    ENET_NIF_FUNC_DEF(if_names);
+
+#define ENET_NIF_FUNC_DEF(F)                              \
+    static ERL_NIF_TERM nif_##F(ErlNifEnv*         env,    \
+                                int                argc,   \
+                                const ERL_NIF_TERM argv[]);
+ENET_NIF_FUNCS
+#undef ENET_NIF_FUNC_DEF
+
+
+/* And here comes the functions that does the actual work (for the most part) */
+static ERL_NIF_TERM ncommand(ErlNifEnv*   env,
+                             ERL_NIF_TERM cmd);
+static ERL_NIF_TERM ngethostname(ErlNifEnv* env);
+static ERL_NIF_TERM ngetnameinfo(ErlNifEnv*          env,
+                                 const ESockAddress* saP,
+                                 SOCKLEN_T           saLen,
+                                 int                 flags);
+static ERL_NIF_TERM ngetaddrinfo(ErlNifEnv* env,
+                                 char*      host,
+                                 char*      serv);
+static ERL_NIF_TERM nif_name2index(ErlNifEnv* env,
+                                   char*      ifn);
+static ERL_NIF_TERM nif_index2name(ErlNifEnv*   env,
+                                   unsigned int id);
+static ERL_NIF_TERM nif_names(ErlNifEnv* env);
+static unsigned int nif_names_length(struct if_nameindex* p);
+
+/*
+static void net_dtor(ErlNifEnv* env, void* obj);
+static void net_stop(ErlNifEnv* env,
+                     void*      obj,
+                     int        fd,
+                     int        is_direct_call);
+static void net_down(ErlNifEnv*           env,
+                     void*                obj,
+                     const ErlNifPid*     pid,
+                     const ErlNifMonitor* mon);
+*/
+
+static BOOLEAN_T decode_nameinfo_flags(ErlNifEnv*         env,
+                                       const ERL_NIF_TERM eflags,
+                                       int*               flags);
+static BOOLEAN_T decode_nameinfo_flags_list(ErlNifEnv*         env,
+                                            const ERL_NIF_TERM eflags,
+                                            int*               flags);
+static
+BOOLEAN_T decode_addrinfo_string(ErlNifEnv*         env,
+                                 const ERL_NIF_TERM eString,
+                                 char**             stringP);
+static ERL_NIF_TERM decode_bool(ErlNifEnv*   env,
+                                ERL_NIF_TERM eBool,
+                                BOOLEAN_T*   bool);
+static ERL_NIF_TERM encode_address_infos(ErlNifEnv*       env,
+                                         struct addrinfo* addrInfo);
+static ERL_NIF_TERM encode_address_info(ErlNifEnv*       env,
+                                        struct addrinfo* addrInfoP);
+static unsigned int address_info_length(struct addrinfo* addrInfoP);
+
+static ERL_NIF_TERM encode_address_info_family(ErlNifEnv* env,
+                                         int        family);
+static ERL_NIF_TERM encode_address_info_type(ErlNifEnv* env,
+                                       int        socktype);
+static ERL_NIF_TERM encode_address_info_proto(ErlNifEnv* env,
+                                        int        proto);
+
+static char* make_address_info(ErlNifEnv*    env,
+                               ERL_NIF_TERM  fam,
+                               ERL_NIF_TERM  sockType,
+                               ERL_NIF_TERM  proto,
+                               ERL_NIF_TERM  addr,
+                               ERL_NIF_TERM* ai);
+
+static BOOLEAN_T extract_debug(ErlNifEnv*   env,
+                               ERL_NIF_TERM map);
+static int on_load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info);
+
+
+#if HAVE_IN6
+#  if ! defined(HAVE_IN6ADDR_ANY) || ! HAVE_IN6ADDR_ANY
+#    if HAVE_DECL_IN6ADDR_ANY_INIT
+static const struct in6_addr in6addr_any = { { IN6ADDR_ANY_INIT } };
+#    else
+static const struct in6_addr in6addr_any =
+    { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } };
+#    endif /* HAVE_IN6ADDR_ANY_INIT */
+#  endif /* ! HAVE_DECL_IN6ADDR_ANY */
+
+#  if ! defined(HAVE_IN6ADDR_LOOPBACK) || ! HAVE_IN6ADDR_LOOPBACK
+#    if HAVE_DECL_IN6ADDR_LOOPBACK_INIT
+static const struct in6_addr in6addr_loopback =
+    { { IN6ADDR_LOOPBACK_INIT } };
+#    else
+static const struct in6_addr in6addr_loopback =
+    { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } };
+#    endif /* HAVE_IN6ADDR_LOOPBACk_INIT */
+#  endif /* ! HAVE_DECL_IN6ADDR_LOOPBACK */
+#endif /* HAVE_IN6 */
+
+
+
+/* *** Local atoms *** */
+
+#define LOCAL_ATOMS                             \
+    LOCAL_ATOM_DECL(address_info);              \
+    LOCAL_ATOM_DECL(debug);                     \
+    LOCAL_ATOM_DECL(host);                      \
+    LOCAL_ATOM_DECL(idn);                       \
+    LOCAL_ATOM_DECL(idna_allow_unassigned);     \
+    LOCAL_ATOM_DECL(idna_use_std3_ascii_rules); \
+    LOCAL_ATOM_DECL(namereqd);                  \
+    LOCAL_ATOM_DECL(name_info);                 \
+    LOCAL_ATOM_DECL(nofqdn);                    \
+    LOCAL_ATOM_DECL(numerichost);               \
+    LOCAL_ATOM_DECL(numericserv);               \
+    LOCAL_ATOM_DECL(service);
+
+#define LOCAL_ERROR_REASON_ATOMS               \
+    LOCAL_ATOM_DECL(eaddrfamily);              \
+    LOCAL_ATOM_DECL(ebadflags);                \
+    LOCAL_ATOM_DECL(efail);                    \
+    LOCAL_ATOM_DECL(efamily);                  \
+    LOCAL_ATOM_DECL(efault);                   \
+    LOCAL_ATOM_DECL(emem);                     \
+    LOCAL_ATOM_DECL(enametoolong);             \
+    LOCAL_ATOM_DECL(enodata);                  \
+    LOCAL_ATOM_DECL(enoname);                  \
+    LOCAL_ATOM_DECL(enxio);                    \
+    LOCAL_ATOM_DECL(eoverflow);                \
+    LOCAL_ATOM_DECL(eservice);                 \
+    LOCAL_ATOM_DECL(esocktype);                \
+    LOCAL_ATOM_DECL(esystem);
+
+#define LOCAL_ATOM_DECL(A) static ERL_NIF_TERM atom_##A
+LOCAL_ATOMS
+LOCAL_ERROR_REASON_ATOMS
+#undef LOCAL_ATOM_DECL
+
+
+/* *** net *** */
+static ErlNifResourceType*    net;
+static ErlNifResourceTypeInit netInit = {
+    NULL, // net_dtor,
+    NULL, // net_stop,
+    NULL  // (ErlNifResourceDown*) net_down
+};
+
+
+
+/* ----------------------------------------------------------------------
+ *  N I F   F u n c t i o n s
+ * ----------------------------------------------------------------------
+ *
+ * Utility and admin functions:
+ * ----------------------------
+ * nif_info/0
+ * nif_command/1
+ *
+ * The "proper" net functions:
+ * ------------------------------
+ * nif_gethostname/0
+ * nif_getnameinfo/2
+ * nif_getaddrinfo/3
+ * nif_if_name2index/1
+ * nif_if_index2name/1
+ * nif_if_names/0
+ *
+ */
+
+
+/* ----------------------------------------------------------------------
+ * nif_info
+ *
+ * Description:
+ * This is currently just a placeholder...
+ */
+static
+ERL_NIF_TERM nif_info(ErlNifEnv*         env,
+                      int                argc,
+                      const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ERL_NIF_TERM info, tmp;
+
+    NDBG( ("NET", "info -> entry\r\n") );
+
+    tmp  = enif_make_new_map(env);
+    if (!enif_make_map_put(env, tmp, atom_debug, BOOL2ATOM(data.debug), &info))
+        info = tmp;
+
+    NDBG( ("NET", "info -> done: %T\r\n", info) );
+
+    return info;
+#endif
+}
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_command
+ *
+ * Description:
+ * This is a general purpose utility function.
+ *
+ * Arguments:
+ * Command - This is a general purpose command, of any type.
+ *           Currently, the only supported command is:
+ *
+ *                  {debug, boolean()}
+ */
+static
+ERL_NIF_TERM nif_command(ErlNifEnv*         env,
+                         int                argc,
+                         const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ERL_NIF_TERM ecmd, result;
+
+    NDBG( ("NET", "command -> entry (%d)\r\n", argc) );
+
+    if (argc != 1)
+        return enif_make_badarg(env);
+
+    ecmd = argv[0];
+
+    NDBG( ("NET", "command -> ecmd: %T\r\n", ecmd) );
+
+    result = ncommand(env, ecmd);
+
+    NDBG( ("NET", "command -> result: %T\r\n", result) );
+
+    return result;
+#endif
+}
+
+
+
+/*
+ * The command can, in principle, be anything, though currently we only
+ * support a debug command.
+ */
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM ncommand(ErlNifEnv*   env,
+                      ERL_NIF_TERM cmd)
+{
+    const ERL_NIF_TERM* t;
+    int                 tsz;
+
+    if (IS_TUPLE(env, cmd)) {
+        /* Could be the debug tuple */
+        if (!GET_TUPLE(env, cmd, &tsz, &t))
+            return esock_make_error(env, esock_atom_einval);
+
+        if (tsz != 2)
+            return esock_make_error(env, esock_atom_einval);
+
+        /* First element should be the atom 'debug' */
+        if (COMPARE(t[0], atom_debug) != 0)
+            return esock_make_error(env, esock_atom_einval);
+
+        return decode_bool(env, t[1], &data.debug);
+
+    } else {
+        return esock_make_error(env, esock_atom_einval);
+    }
+
+}
+#endif
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_gethostname
+ *
+ * Description:
+ * Access the hostname of the current processor.
+ *
+ */
+static
+ERL_NIF_TERM nif_gethostname(ErlNifEnv*         env,
+                             int                argc,
+                             const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ERL_NIF_TERM result;
+    
+    NDBG( ("NET", "nif_gethostname -> entry (%d)\r\n", argc) );
+
+    if (argc != 0)
+        return enif_make_badarg(env);
+
+    result = ngethostname(env);
+
+    NDBG( ("NET", "nif_gethostname -> done when result: %T\r\n", result) );
+
+    return result;
+#endif
+}
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM ngethostname(ErlNifEnv* env)
+{
+    ERL_NIF_TERM result;
+    char         buf[NET_MAXHOSTNAMELEN + 1];
+    int          res;
+
+    res = net_gethostname(buf, sizeof(buf));
+
+    NDBG( ("NET", "ngethostname -> gethostname res: %d\r\n", res) );
+
+    switch (res) {
+    case 0:
+        result = esock_make_ok2(env, MKS(env, buf));
+        break;
+
+    case EFAULT:
+        result = esock_make_error(env, atom_efault);
+        break;
+
+    case EINVAL:
+        result = esock_make_error(env, esock_atom_einval);
+        break;
+
+    case ENAMETOOLONG:
+        result = esock_make_error(env, atom_enametoolong);
+        break;
+
+    default:
+        result = esock_make_error(env, MKI(env, res));
+        break;
+    }
+
+    return result;
+}
+#endif
+
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_getnameinfo
+ *
+ * Description:
+ * Address-to-name translation in protocol-independent manner.
+ *
+ * Arguments:
+ * SockAddr - Socket Address (address and port)
+ * Flags    - The flags argument modifies the behavior of getnameinfo().
+ */
+
+static
+ERL_NIF_TERM nif_getnameinfo(ErlNifEnv*         env,
+                             int                argc,
+                             const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ERL_NIF_TERM result;
+    ERL_NIF_TERM eSockAddr, eFlags;
+    int          flags = 0; // Just in case...
+    ESockAddress sa;
+    SOCKLEN_T    saLen = 0; // Just in case...
+    char*        xres;
+
+    NDBG( ("NET", "nif_getnameinfo -> entry (%d)\r\n", argc) );
+
+    if (argc != 2)
+        return enif_make_badarg(env);
+    eSockAddr = argv[0];
+    eFlags    = argv[1];
+
+    NDBG( ("NET",
+           "nif_getnameinfo -> "
+           "\r\n   SockAddr: %T"
+           "\r\n   Flags:    %T"
+           "\r\n", eSockAddr, eFlags) );
+
+    if ((xres = esock_decode_sockaddr(env, eSockAddr, &sa, &saLen)) != NULL) {
+        NDBG( ("NET", "nif_getnameinfo -> failed decode sockaddr: %s\r\n", xres) );
+        return esock_make_error_str(env, xres);
+    }
+
+    NDBG( ("NET", "nif_getnameinfo -> (try) decode flags\r\n") );
+
+    if (!decode_nameinfo_flags(env, eFlags, &flags))
+        return enif_make_badarg(env);
+
+    result = ngetnameinfo(env, &sa, saLen, flags);
+
+    NDBG( ("NET",
+           "nif_getnameinfo -> done when result: "
+           "\r\n   %T\r\n", result) );
+
+    return result;
+#endif
+}
+
+
+
+/* Given the provided sock(et) address (and flags), retreive the host and
+ * service info.
+ */
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM ngetnameinfo(ErlNifEnv*          env,
+                          const ESockAddress* saP,
+                          SOCKLEN_T           saLen,
+                          int                 flags)
+{
+    ERL_NIF_TERM result;
+    char         host[HOSTNAME_LEN];
+    SOCKLEN_T    hostLen = sizeof(host);
+    char         serv[SERVICE_LEN];
+    SOCKLEN_T    servLen = sizeof(serv);
+
+    int res = getnameinfo((struct sockaddr*) saP, saLen,
+                          host, hostLen,
+                          serv, servLen,
+                          flags);
+
+    NDBG( ("NET", "ngetnameinfo -> res: %d\r\n", res) );
+
+    switch (res) {
+    case 0:
+        {
+            ERL_NIF_TERM keys[] = {atom_host,      atom_service};
+            ERL_NIF_TERM vals[] = {MKS(env, host), MKS(env, serv)};
+            ERL_NIF_TERM info;
+            unsigned int numKeys = sizeof(keys) / sizeof(ERL_NIF_TERM);
+            unsigned int numVals = sizeof(vals) / sizeof(ERL_NIF_TERM);
+
+            ESOCK_ASSERT( (numKeys == numVals) );
+
+            if (!MKMA(env, keys, vals, numKeys, &info))
+                return enif_make_badarg(env);
+
+            result = esock_make_ok2(env, info);
+        }
+        break;
+
+#if defined(EAI_AGAIN)
+    case EAI_AGAIN:
+        result = esock_make_error(env, esock_atom_eagain);
+        break;
+#endif
+
+#if defined(EAI_BADFLAGS)
+    case EAI_BADFLAGS:
+        result = esock_make_error(env, atom_ebadflags);
+        break;
+#endif
+
+#if defined(EAI_FAIL)
+    case EAI_FAIL:
+        result = esock_make_error(env, atom_efail);
+        break;
+#endif
+
+#if defined(EAI_FAMILY)
+    case EAI_FAMILY:
+        result = esock_make_error(env, atom_efamily);
+        break;
+#endif
+
+#if defined(EAI_MEMORY)
+    case EAI_MEMORY:
+        result = esock_make_error(env, atom_emem);
+        break;
+#endif
+
+#if defined(EAI_NONAME)
+    case EAI_NONAME:
+        result = esock_make_error(env, atom_enoname);
+        break;
+#endif
+
+#if defined(EAI_OVERFLOW)
+    case EAI_OVERFLOW:
+        result = esock_make_error(env, atom_eoverflow);
+        break;
+#endif
+
+#if defined(EAI_SYSTEM)
+    case EAI_SYSTEM:
+        result = esock_make_error_errno(env, get_errno());
+        break;
+#endif
+
+    default:
+        result = esock_make_error(env, esock_atom_einval);
+        break;
+    }
+
+    return result;
+}
+#endif
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_getaddrinfo
+ *
+ * Description:
+ * Network address and service translation.
+ *
+ * Arguments:
+ * Host    - Host name (either a string or the atom undefined)
+ * Service - Service name (either a string or the atom undefined)
+ * Hints   - Hints for the lookup (address info record) (currently *ignored*)
+ */
+
+static
+ERL_NIF_TERM nif_getaddrinfo(ErlNifEnv*         env,
+                             int                argc,
+                             const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ERL_NIF_TERM     result, eHostName, eServName; //, eHints;
+    char*            hostName;
+    char*            servName;
+    // struct addrinfo* hints;
+
+    NDBG( ("NET", "nif_getaddrinfo -> entry (%d)\r\n", argc) );
+
+    if (argc != 3) {
+        return enif_make_badarg(env);
+    }
+    eHostName = argv[0];
+    eServName = argv[1];
+    // eHints    = argv[2];
+
+    NDBG( ("NET",
+           "nif_getaddrinfo -> "
+           "\r\n   ehost:    %T"
+           "\r\n   eservice: %T"
+           "\r\n   ehints:   %T"
+           "\r\n", argv[0], argv[1], argv[2]) );
+
+    if (!decode_addrinfo_string(env, eHostName, &hostName))
+        return enif_make_badarg(env);
+
+    if (!decode_addrinfo_string(env, eServName, &servName))
+        return enif_make_badarg(env);
+
+    /*
+    if (decode_addrinfo_hints(env, eHints, &hints))
+        return enif_make_badarg(env);
+    */
+
+    if ((hostName == NULL) && (servName == NULL))
+        return enif_make_badarg(env);
+
+    result = ngetaddrinfo(env, hostName, servName);
+
+    if (hostName != NULL)
+        FREE(hostName);
+
+    if (servName != NULL)
+        FREE(servName);
+
+    /*
+    if (hints != NULL)
+        FREE(hints);
+    */
+
+    NDBG( ("NET",
+           "nif_getaddrinfo -> done when result: "
+           "\r\n   %T\r\n", result) );
+
+    return result;
+#endif
+}
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM ngetaddrinfo(ErlNifEnv* env,
+                          char*      host,
+                          char*      serv)
+{
+    ERL_NIF_TERM     result;
+    struct addrinfo* addrInfoP;
+    int              res;
+
+    NDBG( ("NET", "ngetaddrinfo -> entry with"
+           "\r\n   host: %s"
+           "\r\n   serv: %s"
+           "\r\n",
+           ((host == NULL) ? "NULL" : host),
+           ((serv == NULL) ? "NULL" : serv)) );
+    
+    res = getaddrinfo(host, serv, NULL, &addrInfoP);
+
+    NDBG( ("NET", "ngetaddrinfo -> res: %d\r\n", res) );
+    
+    switch (res) {
+    case 0:
+        {
+            ERL_NIF_TERM addrInfo = encode_address_infos(env, addrInfoP);
+            freeaddrinfo(addrInfoP);
+            result = esock_make_ok2(env, addrInfo);
+        }
+        break;
+
+#if defined(EAI_ADDRFAMILY)
+    case EAI_ADDRFAMILY:
+        result = esock_make_error(env, atom_eaddrfamily);
+        break;
+#endif
+
+#if defined(EAI_AGAIN)
+    case EAI_AGAIN:
+        result = esock_make_error(env, esock_atom_eagain);
+        break;
+#endif
+
+#if defined(EAI_BADFLAGS)
+    case EAI_BADFLAGS:
+        result = esock_make_error(env, atom_ebadflags);
+        break;
+#endif
+
+#if defined(EAI_FAIL)
+    case EAI_FAIL:
+        result = esock_make_error(env, atom_efail);
+        break;
+#endif
+
+#if defined(EAI_FAMILY)
+    case EAI_FAMILY:
+        result = esock_make_error(env, atom_efamily);
+        break;
+#endif
+
+#if defined(EAI_MEMORY)
+    case EAI_MEMORY:
+        result = esock_make_error(env, atom_emem);
+        break;
+#endif
+
+#if defined(EAI_NODATA)
+    case EAI_NODATA:
+        result = esock_make_error(env, atom_enodata);
+        break;
+#endif
+
+#if defined(EAI_NONAME)
+    case EAI_NONAME:
+        result = esock_make_error(env, atom_enoname);
+        break;
+#endif
+
+#if defined(EAI_SERVICE)
+    case EAI_SERVICE:
+        result = esock_make_error(env, atom_eservice);
+        break;
+#endif
+
+#if defined(EAI_SOCKTYPE)
+    case EAI_SOCKTYPE:
+        result = esock_make_error(env, atom_esocktype);
+        break;
+#endif
+
+#if defined(EAI_SYSTEM)
+    case EAI_SYSTEM:
+        result = esock_make_error(env, atom_esystem);
+        break;
+#endif
+
+    default:
+        result = esock_make_error(env, esock_atom_einval);
+        break;
+    }
+
+    return result;
+}
+#endif
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_if_name2index
+ *
+ * Description:
+ * Perform a Interface Name to Interface Index translation.
+ *
+ * Arguments:
+ * Ifn - Interface name to be translated.
+ */
+
+static
+ERL_NIF_TERM nif_if_name2index(ErlNifEnv*         env,
+                               int                argc,
+                               const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ERL_NIF_TERM eifn, result;
+    char         ifn[IF_NAMESIZE+1];
+
+    NDBG( ("NET", "nif_if_name2index -> entry (%d)\r\n", argc) );
+
+    if (argc != 1) {
+        return enif_make_badarg(env);
+    }
+    eifn = argv[0];
+
+    NDBG( ("NET",
+           "nif_if_name2index -> "
+           "\r\n   Ifn: %T"
+           "\r\n", argv[0]) );
+
+    if (0 >= GET_STR(env, eifn, ifn, sizeof(ifn)))
+        return esock_make_error(env, esock_atom_einval);
+
+    result = nif_name2index(env, ifn);
+
+    NDBG( ("NET", "nif_if_name2index -> done when result: %T\r\n", result) );
+
+    return result;
+#endif
+}
+
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM nif_name2index(ErlNifEnv* env,
+                            char*      ifn)
+{
+    unsigned int idx;
+
+    NDBG( ("NET", "nif_name2index -> entry with ifn: %s\r\n", ifn) );
+
+    idx = if_nametoindex(ifn);
+
+    NDBG( ("NET", "nif_name2index -> idx: %d\r\n", idx) );
+
+    if (idx == 0) {
+        int save_errno = get_errno();
+        NDBG( ("NET", "nif_name2index -> failed: %d\r\n", save_errno) );
+        return esock_make_error_errno(env, save_errno);
+    } else {
+         return esock_make_ok2(env, MKI(env, idx));
+    }
+
+}
+#endif
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_if_index2name
+ *
+ * Description:
+ * Perform a Interface Index to Interface Name translation.
+ *
+ * Arguments:
+ * Idx - Interface index to be translated.
+ */
+
+static
+ERL_NIF_TERM nif_if_index2name(ErlNifEnv*         env,
+                               int                argc,
+                               const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ERL_NIF_TERM result;
+    unsigned int idx;
+
+    NDBG( ("NET", "nif_if_index2name -> entry (%d)\r\n", argc) );
+
+    if ((argc != 1) ||
+        !GET_UINT(env, argv[0], &idx)) {
+        return enif_make_badarg(env);
+    }
+
+    NDBG( ("NET", "nif_index2name -> "
+           "\r\n   Idx: %T"
+           "\r\n", argv[0]) );
+
+    result = nif_index2name(env, idx);
+
+    NDBG( ("NET", "nif_if_index2name -> done when result: %T\r\n", result) );
+
+    return result;
+#endif
+}
+
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM nif_index2name(ErlNifEnv*   env,
+                            unsigned int idx)
+{
+    ERL_NIF_TERM result;
+    char*        ifn = MALLOC(IF_NAMESIZE+1);
+
+    if (ifn == NULL)
+        return enif_make_badarg(env); // PLACEHOLDER
+
+    if (NULL != if_indextoname(idx, ifn)) {
+        result = esock_make_ok2(env, MKS(env, ifn));
+    } else {
+        result = esock_make_error(env, atom_enxio);
+    }
+
+    FREE(ifn);
+
+    return result;
+}
+#endif
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_if_names
+ *
+ * Description:
+ * Get network interface names and indexes.
+ *
+ */
+
+static
+ERL_NIF_TERM nif_if_names(ErlNifEnv*         env,
+                          int                argc,
+                          const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ERL_NIF_TERM result;
+
+    NDBG( ("NET", "nif_if_names -> entry (%d)\r\n", argc) );
+
+    if (argc != 0) {
+        return enif_make_badarg(env);
+    }
+
+    result = nif_names(env);
+
+    NDBG( ("NET", "nif_if_names -> done when result: %T\r\n", result) );
+
+    return result;
+#endif
+}
+
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM nif_names(ErlNifEnv* env)
+{
+    ERL_NIF_TERM         result;
+    struct if_nameindex* ifs = if_nameindex();
+
+    NDBG( ("NET", "nif_names -> ifs: 0x%lX\r\n", ifs) );
+
+    if (ifs == NULL) {
+        result = esock_make_error_errno(env, get_errno());
+    } else {
+        /*
+         * We got some interfaces:
+         * 1) Calculate how many - the only way is to iterate through the list
+         *    until its end (which is indicated by an entry with index = zero
+         *    and if_name = NULL).
+         * 2) Allocate an ERL_NIF_TERM array of the calculated length.
+         * 3) Iterate through the array of interfaces and for each create
+         *    a two tuple: {Idx, If}
+         *
+         * Or shall we instead build a list in reverse order and then when
+         * its done, reverse that? Check
+         */
+        unsigned int len = nif_names_length(ifs);
+
+        NDBG( ("NET", "nif_names -> len: %d\r\n", len) );
+
+        if (len > 0) {
+            ERL_NIF_TERM* array = MALLOC(len * sizeof(ERL_NIF_TERM));
+            unsigned int  i;
+
+            for (i = 0; i < len; i++) {
+                array[i] = MKT2(env,
+                                MKI(env, ifs[i].if_index),
+                                MKS(env, ifs[i].if_name));
+            }
+
+            result = esock_make_ok2(env, MKLA(env, array, len));
+            FREE(array);
+        } else {
+            result = esock_make_ok2(env, enif_make_list(env, 0));
+        }
+    }
+
+    if (ifs != NULL)
+        if_freenameindex(ifs);
+
+    return result;
+}
+
+
+static
+unsigned int nif_names_length(struct if_nameindex* p)
+{
+    unsigned int len = 0;
+    BOOLEAN_T    done =  FALSE;
+
+    while (!done) {
+
+        NDBG( ("NET", "nif_names_length -> %d: "
+               "\r\n   if_index: %d"
+               "\r\n   if_name:  0x%lX"
+               "\r\n", len, p[len].if_index, p[len].if_name) );
+
+        if ((p[len].if_index == 0) && (p[len].if_name == NULL))
+            done = TRUE;
+        else
+            len++;
+    }
+
+    return len;
+}
+#endif // if !defined(__WIN32__)
+
+
+
+/* ----------------------------------------------------------------------
+ *  U t i l i t y   F u n c t i o n s
+ * ----------------------------------------------------------------------
+ */
+
+/* The erlang format for a set of flags is a list of atoms.
+ * A special case is when there is no flags, which is
+ * represented by the atom undefined.
+ */
+#if !defined(__WIN32__)
+static
+BOOLEAN_T decode_nameinfo_flags(ErlNifEnv*         env,
+                                const ERL_NIF_TERM eflags,
+                                int*               flags)
+{
+    BOOLEAN_T result;
+
+    if (IS_ATOM(env, eflags)) {
+        NDBG( ("NET", "decode_nameinfo_flags -> is atom (%T)\r\n", eflags) );
+        if (COMPARE(eflags, esock_atom_undefined) == 0) {
+            *flags = 0;
+            result = TRUE;
+        } else {
+            result = FALSE;
+        }
+    } else if (IS_LIST(env, eflags)) {
+        NDBG( ("NET", "decode_nameinfo_flags -> is list\r\n") );
+        result = decode_nameinfo_flags_list(env, eflags, flags);
+    } else {
+        result = FALSE;
+    }
+
+    NDBG( ("NET", "decode_nameinfo_flags -> result: %s\r\n", B2S(result)) );
+
+    return result;
+}
+
+
+
+static
+BOOLEAN_T decode_nameinfo_flags_list(ErlNifEnv*         env,
+                                     const ERL_NIF_TERM eflags,
+                                     int*               flags)
+{
+    ERL_NIF_TERM elem, tail, list = eflags;
+    int          tmp = 0;
+    BOOLEAN_T    done = FALSE;
+
+    while (!done) {
+        if (GET_LIST_ELEM(env, list, &elem, &tail)) {
+            if (COMPARE(elem, atom_namereqd) == 0) {
+                tmp |= NI_NAMEREQD;
+            } else if (COMPARE(elem, esock_atom_dgram) == 0) {
+                tmp |= NI_DGRAM;
+            } else if (COMPARE(elem, atom_nofqdn) == 0) {
+                tmp |= NI_NOFQDN;
+            } else if (COMPARE(elem, atom_numerichost) == 0) {
+                tmp |= NI_NUMERICHOST;
+            } else if (COMPARE(elem, atom_numericserv) == 0) {
+                tmp |= NI_NUMERICSERV;
+
+                /* Starting with glibc 2.3.4: */
+
+#if defined(NI_IDN)
+            } else if (COMPARE(elem, atom_idn) == 0) {
+                tmp |= NI_IDN;
+#endif
+
+#if defined(NI_IDN_ALLOW_UNASSIGNED)
+            } else if (COMPARE(elem, atom_idna_allow_unassigned) == 0) {
+                tmp |= NI_IDN_ALLOW_UNASSIGNED;
+#endif
+
+#if defined(NI_IDN_USE_STD3_ASCII_RULES)
+            } else if (COMPARE(elem, atom_idna_use_std3_ascii_rules) == 0) {
+                tmp |= NI_IDN_USE_STD3_ASCII_RULES;
+#endif
+
+            } else {
+                return FALSE;
+            }
+
+            list = tail;
+
+        } else {
+            done = TRUE;
+        }
+    }
+
+    *flags = tmp;
+
+    return TRUE;
+}
+
+
+
+/* Decode the address info string (hostname or service name)
+ * The string is either the atom undefined or an actual string.
+ */
+static
+BOOLEAN_T decode_addrinfo_string(ErlNifEnv*         env,
+                                 const ERL_NIF_TERM eString,
+                                 char**             stringP)
+{
+    BOOLEAN_T result;
+
+    if (IS_ATOM(env, eString)) {
+
+        if (COMPARE(eString, esock_atom_undefined) == 0) {
+            *stringP = NULL;
+            result   = TRUE;
+        } else {
+            *stringP = NULL;
+            result   = FALSE;
+        }
+
+    } else {
+
+        result = esock_decode_string(env, eString, stringP);
+
+    }
+
+    return result;
+
+}
+
+
+
+static
+ERL_NIF_TERM decode_bool(ErlNifEnv*   env,
+                         ERL_NIF_TERM eBool,
+                         BOOLEAN_T*   bool)
+{
+    if (COMPARE(eBool, esock_atom_true) == 0) {
+        *bool = TRUE;
+        return esock_atom_ok;
+    } else if (COMPARE(eBool, esock_atom_false) == 0) {
+        *bool = FALSE;
+        return esock_atom_ok;
+    } else {
+        return esock_make_error(env, esock_atom_einval);
+    }
+}
+
+
+
+/* Encode the address info
+ * The address info is a linked list och address info, which
+ * will result in the result being a list of zero or more length.
+ */
+static
+ERL_NIF_TERM encode_address_infos(ErlNifEnv*       env,
+                                  struct addrinfo* addrInfo)
+{
+    ERL_NIF_TERM result;
+    unsigned int len = address_info_length(addrInfo);
+
+    NDBG( ("NET", "encode_address_infos -> len: %d\r\n", len) );
+
+    if (len > 0) {
+        ERL_NIF_TERM*    array = MALLOC(len * sizeof(ERL_NIF_TERM));
+        unsigned int     i     = 0;
+        struct addrinfo* p     = addrInfo;
+
+        while (i < len) {
+            array[i] = encode_address_info(env, p);
+            p = p->ai_next;
+            i++;
+        }
+
+        result = MKLA(env, array, len);
+        FREE(array);
+    } else {
+        result = MKEL(env);
+    }
+
+    NDBG( ("NET", "encode_address_infos -> result: "
+           "\r\n   %T\r\n", result) );
+
+    return result;
+}
+
+
+
+/* Calculate the length of the adress info linked list
+ * The list is NULL-terminated, so the only way is to
+ * iterate through the list until we find next = NULL.
+ */
+static
+unsigned int address_info_length(struct addrinfo* addrInfoP)
+{
+    unsigned int     len = 1;
+    struct addrinfo* tmp;
+    BOOLEAN_T        done = FALSE;
+
+    tmp = addrInfoP;
+
+    while (!done) {
+        if (tmp->ai_next != NULL) {
+            len++;
+            tmp = tmp->ai_next;
+        } else {
+            done = TRUE;
+        }
+    }
+
+    return len;
+}
+
+
+
+/* Create one (erlang) instance of the address info record
+ * Should we have address info as a record or as a map?
+ *
+ * {address_info, Fam, Type, Proto, Addr}
+ */
+static
+ERL_NIF_TERM encode_address_info(ErlNifEnv*       env,
+                                 struct addrinfo* addrInfoP)
+{
+    ERL_NIF_TERM fam, type, proto, addr, addrInfo;
+
+    fam   = encode_address_info_family(env, addrInfoP->ai_family);
+    type  = encode_address_info_type(env,   addrInfoP->ai_socktype);
+    proto = encode_address_info_proto(env,  addrInfoP->ai_protocol);
+    esock_encode_sockaddr(env,
+                          (ESockAddress*) addrInfoP->ai_addr,
+                          addrInfoP->ai_addrlen,
+                          &addr);
+    
+    if (make_address_info(env, fam, type, proto, addr, &addrInfo) == NULL)
+        return addrInfo;
+    else
+        return esock_atom_undefined; // We should to better...
+
+}
+
+
+/* Convert an "native" family to an erlang family (=domain).
+ * Note that this is not currently exhaustive, but only supports
+ * inet and inet6. Other values will be returned as is, that is
+ * in the form of an integer.
+ */
+static
+ERL_NIF_TERM encode_address_info_family(ErlNifEnv* env,
+                                        int        family)
+{
+    ERL_NIF_TERM efam;
+
+    if (NULL != esock_encode_domain(env, family, &efam))
+        efam = MKI(env, family);
+
+    return efam;
+}
+
+
+
+/* Convert an "native" socket type to an erlang socket type.
+ * Note that this is not currently exhaustive, but only supports
+ * stream and dgram. Other values will be returned as is, that is
+ * in the form of an integer.
+ */
+static
+ERL_NIF_TERM encode_address_info_type(ErlNifEnv* env,
+                                      int        socktype)
+{
+    ERL_NIF_TERM etype;
+
+    if (NULL != esock_encode_type(env, socktype, &etype))
+        etype = MKI(env, socktype);
+
+    return etype;
+}
+
+
+
+/* Convert an "native" protocol to an erlang protocol.
+ * Note that this is not currently exhaustive, but only supports
+ * tcp and udp. Other values will be returned as is, that is
+ * in the form of an integer.
+ */
+static
+ERL_NIF_TERM encode_address_info_proto(ErlNifEnv* env,
+                                       int        proto)
+{
+    ERL_NIF_TERM eproto;
+
+    if (NULL != esock_encode_protocol(env, proto, &eproto))
+        eproto = MKI(env, proto);
+
+    return eproto;
+}
+
+
+
+static
+char* make_address_info(ErlNifEnv*    env,
+                        ERL_NIF_TERM  fam,
+                        ERL_NIF_TERM  sockType,
+                        ERL_NIF_TERM  proto,
+                        ERL_NIF_TERM  addr,
+                        ERL_NIF_TERM* ai)
+{
+    ERL_NIF_TERM keys[] = {esock_atom_family,
+                           esock_atom_type,
+                           esock_atom_protocol,
+                           esock_atom_addr};
+    ERL_NIF_TERM vals[] = {fam, sockType, proto, addr};
+    unsigned int numKeys = sizeof(keys) / sizeof(ERL_NIF_TERM);
+    unsigned int numVals = sizeof(vals) / sizeof(ERL_NIF_TERM);
+    
+    ESOCK_ASSERT( (numKeys == numVals) );
+    
+    if (!MKMA(env, keys, vals, numKeys, ai)) {
+        *ai = esock_atom_undefined;
+        return ESOCK_STR_EINVAL;
+    } else {
+        return NULL;
+    }
+}
+#endif // if !defined(__WIN32__)
+
+
+
+/* ----------------------------------------------------------------------
+ *  C a l l b a c k   F u n c t i o n s
+ * ----------------------------------------------------------------------
+ */
+
+/* =========================================================================
+ * net_dtor - Callback function for resource destructor
+ *
+ */
+/*
+static
+void net_dtor(ErlNifEnv* env, void* obj)
+{
+}
+*/
+
+
+/* =========================================================================
+ * net_stop - Callback function for resource stop
+ *
+ */
+/*
+static
+void net_stop(ErlNifEnv* env, void* obj, int fd, int is_direct_call)
+{
+}
+*/
+
+
+
+
+/* =========================================================================
+ * net_down - Callback function for resource down (monitored processes)
+ *
+ */
+/*
+static
+void net_down(ErlNifEnv*           env,
+              void*                obj,
+              const ErlNifPid*     pid,
+              const ErlNifMonitor* mon)
+{
+}
+*/
+
+
+
+/* ----------------------------------------------------------------------
+ *  L o a d / u n l o a d / u p g r a d e   F u n c t i o n s
+ * ----------------------------------------------------------------------
+ */
+
+static
+ErlNifFunc net_funcs[] =
+{
+    // Some utility functions
+    {"nif_info",      0, nif_info,      0},
+    {"nif_command",   1, nif_command,   0}, // Shall we let this be dirty?
+
+    /* get/set hostname */
+    {"nif_gethostname",         0, nif_gethostname,   0},
+
+    /* address and name translation in protocol-independent manner */
+    {"nif_getnameinfo",         2, nif_getnameinfo,   0},
+    {"nif_getaddrinfo",         3, nif_getaddrinfo,   0},
+
+    /* Network interface (name and/or index) functions */
+    {"nif_if_name2index",       1, nif_if_name2index, 0},
+    {"nif_if_index2name",       1, nif_if_index2name, 0},
+    {"nif_if_names",            0, nif_if_names,      0}
+};
+
+
+#if !defined(__WIN32__)
+static
+BOOLEAN_T extract_debug(ErlNifEnv*   env,
+                        ERL_NIF_TERM map)
+{
+    /*
+     * We need to do this here since the "proper" atom has not been
+     * created when this function is called.
+     */
+    ERL_NIF_TERM debug = MKA(env, "debug");
+    
+    return esock_extract_bool_from_map(env, map, debug, NET_NIF_DEBUG_DEFAULT);
+}
+#endif
+
+
+/* =======================================================================
+ * load_info - A map of misc info (e.g global debug)
+ */
+
+static
+int on_load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info)
+{
+#if !defined(__WIN32__)    
+    // We should make it possible to use load_info to get default values
+    data.debug = extract_debug(env, load_info);
+
+    NDBG( ("NET", "on_load -> entry\r\n") );
+#endif
+
+#define LOCAL_ATOM_DECL(A) atom_##A = MKA(env, #A)
+LOCAL_ATOMS
+LOCAL_ERROR_REASON_ATOMS
+#undef LOCAL_ATOM_DECL
+
+    // For storing "global" things...
+    // data.env       = enif_alloc_env(); // We should really check
+    // data.version   = MKA(env, ERTS_VERSION);
+    // data.buildDate = MKA(env, ERTS_BUILD_DATE);
+
+    net = enif_open_resource_type_x(env,
+                                    "net",
+                                    &netInit,
+                                    ERL_NIF_RT_CREATE,
+                                    NULL);
+
+#if !defined(__WIN32__)    
+    NDBG( ("NET", "on_load -> done\r\n") );
+#endif
+
+    return !net;
+}
+
+ERL_NIF_INIT(prim_net, net_funcs, on_load, NULL, NULL, NULL)
diff --git a/erts/emulator/nifs/common/socket_dbg.c b/erts/emulator/nifs/common/socket_dbg.c
new file mode 100644
index 0000000000..0005575017
--- /dev/null
+++ b/erts/emulator/nifs/common/socket_dbg.c
@@ -0,0 +1,97 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2018-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%
+ *
+ * ----------------------------------------------------------------------
+ *  Purpose : Debug functions for the socket and net NIF(s).
+ * ----------------------------------------------------------------------
+ *
+ */
+
+#include <stdarg.h>
+#include <string.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <time.h>
+
+#include <erl_nif.h>
+#include "socket_util.h"
+#include "socket_dbg.h"
+
+#define TSELF()            enif_thread_self()
+#define TNAME(__T__)       enif_thread_name( __T__ )
+#define TSNAME()           TNAME(TSELF())
+
+FILE* esock_dbgout = NULL;
+
+extern
+void esock_dbg_init(char* filename)
+{
+  if (filename != NULL) {
+    if (strcmp(filename, ESOCK_DBGOUT_DEFAULT) == 0) {
+        esock_dbgout = stdout;
+    } else if (strcmp(filename, ESOCK_DBGOUT_UNIQUE) == 0) {
+        char template[] = "/tmp/esock-dbg-XXXXXX";
+        esock_dbgout = fdopen(mkstemp(template), "w+");
+    } else {
+        esock_dbgout = fopen(filename, "w+");
+    }
+  } else {
+    char template[] = "/tmp/esock-dbg-XXXXXX";
+    esock_dbgout = fdopen(mkstemp(template), "w+");
+  }
+}
+
+
+
+/*
+ * Print a debug format string *with* both a timestamp and the
+ * the name of the *current* thread.
+ */
+extern
+void esock_dbg_printf( const char* prefix, const char* format, ... )
+{
+  va_list         args;
+  char            f[512 + strlen(format)]; // This has to suffice...
+  char            stamp[30];
+  int             res;
+
+  /*
+   * We should really include self in the printout,
+   * so we can se which process are executing the code.
+   * But then I must change the API....something for later.
+   */
+
+  if (esock_timestamp(stamp, sizeof(stamp))) {
+      res = enif_snprintf(f, sizeof(f), "%s [%s] [%s] %s",
+                          prefix, stamp, TSNAME(), format);
+  } else {
+      res = enif_snprintf(f, sizeof(f), "%s [%s] %s",
+                          prefix, TSNAME(), format);
+  }
+  
+  if (res > 0) {
+      va_start (args, format);
+      enif_vfprintf (esock_dbgout, f, args);
+      va_end (args);
+      fflush(esock_dbgout);
+  }
+
+  return;
+}
+
diff --git a/erts/emulator/nifs/common/socket_dbg.h b/erts/emulator/nifs/common/socket_dbg.h
new file mode 100644
index 0000000000..8fce211a8a
--- /dev/null
+++ b/erts/emulator/nifs/common/socket_dbg.h
@@ -0,0 +1,55 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2018-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%
+ *
+ * ----------------------------------------------------------------------
+ * Purpose : Defines and macros for the debug util of the socket and 
+ * net NIF(s).
+ * ----------------------------------------------------------------------
+ *
+ */
+
+#ifndef SOCKET_DBG_H__
+#define SOCKET_DBG_H__
+
+/* Used when calling the init function */
+#define ESOCK_DBGOUT_DEFAULT "stdout"
+#define ESOCK_DBGOUT_UNIQUE  "unique"
+
+
+/* Used in debug printouts */
+#ifdef __WIN32__
+#define LLU "%I64u"
+#else
+#define LLU "%llu"
+#endif
+typedef unsigned long long llu_t;
+
+extern FILE* esock_dbgout; // Initiated by the 'init' function
+
+#define ESOCK_DBG_PRINTF( ___COND___ , proto ) \
+    if ( ___COND___ ) {                        \
+        esock_dbg_printf proto;                \
+        fflush(esock_dbgout);                  \
+    }
+
+
+extern void esock_dbg_init(char* filename);
+extern void esock_dbg_printf( const char* prefix, const char* format, ... );
+
+#endif // SOCKET_DBG_H__
diff --git a/erts/emulator/nifs/common/socket_int.h b/erts/emulator/nifs/common/socket_int.h
new file mode 100644
index 0000000000..4161775a04
--- /dev/null
+++ b/erts/emulator/nifs/common/socket_int.h
@@ -0,0 +1,399 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2018-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%
+ *
+ * ----------------------------------------------------------------------
+ *  Purpose : Utility "stuff" for socket and net.
+ * ----------------------------------------------------------------------
+ *
+ */
+
+#ifndef SOCKET_INT_H__
+#define SOCKET_INT_H__
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef __WIN32__
+
+/* All this just to replace sys/socket.h, netinet/in.h and sys/un.h??? */
+#define INCL_WINSOCK_API_TYPEDEFS 1
+#ifndef WINDOWS_H_INCLUDES_WINSOCK2_H
+#include <winsock2.h>
+#endif
+#include <windows.h>
+#include <Ws2tcpip.h>   /* NEED VC 6.0 or higher */
+/* Visual studio 2008+: NTDDI_VERSION needs to be set for iphlpapi.h
+ * to define the right structures. It needs to be set to WINXP (or LONGHORN)
+ * for IPV6 to work and it's set lower by default, so we need to change it.
+ */
+#ifdef HAVE_SDKDDKVER_H
+#  include <sdkddkver.h>
+#  ifdef NTDDI_VERSION
+#    undef NTDDI_VERSION
+#  endif
+#  define NTDDI_VERSION NTDDI_WINXP
+#endif
+#include <iphlpapi.h>
+
+#else /* !__WIN32__ */
+
+#include <sys/socket.h>
+#include <netinet/in.h>
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+
+#endif
+
+#include <erl_nif.h>
+
+/* The general purpose sockaddr */
+typedef union {
+    /* General sockaddr */
+    struct sockaddr     sa;
+
+    /* IPv4 sockaddr */
+    struct sockaddr_in  in4;
+
+    /* IPv6 sockaddr */
+#if defined(HAVE_IN6) && defined(AF_INET6)
+    struct sockaddr_in6 in6;
+#endif
+
+    /* Unix Domain Socket sockaddr */
+#if defined(HAVE_SYS_UN_H)
+    struct sockaddr_un  un;
+#endif
+
+} ESockAddress;
+
+
+/* *** Boolean *type* stuff... *** */
+typedef unsigned int BOOLEAN_T;
+#define TRUE  1
+#define FALSE 0
+
+#define BOOL2ATOM(__B__) ((__B__) ? esock_atom_true : esock_atom_false)
+
+#define B2S(__B__) ((__B__) ? "true" : "false")
+
+/* Misc error strings */
+#define ESOCK_STR_EAFNOSUPPORT "eafnosupport"
+#define ESOCK_STR_EAGAIN       "eagain"
+#define ESOCK_STR_EINVAL       "einval"
+
+
+/* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ * "Global" atoms
+ *
+ * Note that when an (global) atom is added here, it must also be added
+ * in the socket_nif.c file!
+ */
+
+#define GLOBAL_ATOM_DEFS                       \
+    GLOBAL_ATOM_DEF(abort);                    \
+    GLOBAL_ATOM_DEF(accept);                   \
+    GLOBAL_ATOM_DEF(acceptconn);               \
+    GLOBAL_ATOM_DEF(acceptfilter);             \
+    GLOBAL_ATOM_DEF(adaption_layer);           \
+    GLOBAL_ATOM_DEF(addr);                     \
+    GLOBAL_ATOM_DEF(addrform);                 \
+    GLOBAL_ATOM_DEF(add_membership);           \
+    GLOBAL_ATOM_DEF(add_source_membership);    \
+    GLOBAL_ATOM_DEF(any);                      \
+    GLOBAL_ATOM_DEF(associnfo);                \
+    GLOBAL_ATOM_DEF(authhdr);                  \
+    GLOBAL_ATOM_DEF(auth_active_key);          \
+    GLOBAL_ATOM_DEF(auth_asconf);              \
+    GLOBAL_ATOM_DEF(auth_chunk);               \
+    GLOBAL_ATOM_DEF(auth_delete_key);          \
+    GLOBAL_ATOM_DEF(auth_key);                 \
+    GLOBAL_ATOM_DEF(auth_level);               \
+    GLOBAL_ATOM_DEF(autoclose);                \
+    GLOBAL_ATOM_DEF(bindtodevice);             \
+    GLOBAL_ATOM_DEF(block_source);             \
+    GLOBAL_ATOM_DEF(broadcast);                \
+    GLOBAL_ATOM_DEF(busy_poll);                \
+    GLOBAL_ATOM_DEF(checksum);                 \
+    GLOBAL_ATOM_DEF(close);                    \
+    GLOBAL_ATOM_DEF(command);                  \
+    GLOBAL_ATOM_DEF(connect);                  \
+    GLOBAL_ATOM_DEF(congestion);               \
+    GLOBAL_ATOM_DEF(context);                  \
+    GLOBAL_ATOM_DEF(cork);                     \
+    GLOBAL_ATOM_DEF(credentials);              \
+    GLOBAL_ATOM_DEF(ctrl);                     \
+    GLOBAL_ATOM_DEF(ctrunc);                   \
+    GLOBAL_ATOM_DEF(data);                     \
+    GLOBAL_ATOM_DEF(debug);                    \
+    GLOBAL_ATOM_DEF(default);      \
+    GLOBAL_ATOM_DEF(default_send_params);      \
+    GLOBAL_ATOM_DEF(delayed_ack_time);         \
+    GLOBAL_ATOM_DEF(dgram);                    \
+    GLOBAL_ATOM_DEF(disable_fragments);        \
+    GLOBAL_ATOM_DEF(domain);                   \
+    GLOBAL_ATOM_DEF(dontfrag);                 \
+    GLOBAL_ATOM_DEF(dontroute);                \
+    GLOBAL_ATOM_DEF(drop_membership);          \
+    GLOBAL_ATOM_DEF(drop_source_membership);   \
+    GLOBAL_ATOM_DEF(dstopts);                  \
+    GLOBAL_ATOM_DEF(eor);                      \
+    GLOBAL_ATOM_DEF(error);                    \
+    GLOBAL_ATOM_DEF(errqueue);                 \
+    GLOBAL_ATOM_DEF(esp_network_level);        \
+    GLOBAL_ATOM_DEF(esp_trans_level);          \
+    GLOBAL_ATOM_DEF(events);                   \
+    GLOBAL_ATOM_DEF(explicit_eor);             \
+    GLOBAL_ATOM_DEF(faith);                    \
+    GLOBAL_ATOM_DEF(false);                    \
+    GLOBAL_ATOM_DEF(family);                   \
+    GLOBAL_ATOM_DEF(flags);                    \
+    GLOBAL_ATOM_DEF(flowinfo);                 \
+    GLOBAL_ATOM_DEF(fragment_interleave);      \
+    GLOBAL_ATOM_DEF(freebind);                 \
+    GLOBAL_ATOM_DEF(get_peer_addr_info);       \
+    GLOBAL_ATOM_DEF(hdrincl);                  \
+    GLOBAL_ATOM_DEF(hmac_ident);               \
+    GLOBAL_ATOM_DEF(hoplimit);                 \
+    GLOBAL_ATOM_DEF(hopopts);                  \
+    GLOBAL_ATOM_DEF(ifindex);                  \
+    GLOBAL_ATOM_DEF(inet);                     \
+    GLOBAL_ATOM_DEF(inet6);                    \
+    GLOBAL_ATOM_DEF(info);                     \
+    GLOBAL_ATOM_DEF(initmsg);                  \
+    GLOBAL_ATOM_DEF(iov);                      \
+    GLOBAL_ATOM_DEF(ip);                       \
+    GLOBAL_ATOM_DEF(ipcomp_level);             \
+    GLOBAL_ATOM_DEF(ipv6);                     \
+    GLOBAL_ATOM_DEF(i_want_mapped_v4_addr);    \
+    GLOBAL_ATOM_DEF(join_group);               \
+    GLOBAL_ATOM_DEF(keepalive);                \
+    GLOBAL_ATOM_DEF(keepcnt);                  \
+    GLOBAL_ATOM_DEF(keepidle);                 \
+    GLOBAL_ATOM_DEF(keepintvl);                \
+    GLOBAL_ATOM_DEF(leave_group);              \
+    GLOBAL_ATOM_DEF(level);                    \
+    GLOBAL_ATOM_DEF(linger);                   \
+    GLOBAL_ATOM_DEF(local);                    \
+    GLOBAL_ATOM_DEF(local_auth_chunks);        \
+    GLOBAL_ATOM_DEF(loopback);                 \
+    GLOBAL_ATOM_DEF(lowdelay);                 \
+    GLOBAL_ATOM_DEF(mark);                     \
+    GLOBAL_ATOM_DEF(maxburst);                 \
+    GLOBAL_ATOM_DEF(maxseg);                   \
+    GLOBAL_ATOM_DEF(md5sig);                   \
+    GLOBAL_ATOM_DEF(mincost);                  \
+    GLOBAL_ATOM_DEF(minttl);                   \
+    GLOBAL_ATOM_DEF(msfilter);                 \
+    GLOBAL_ATOM_DEF(mtu);                      \
+    GLOBAL_ATOM_DEF(mtu_discover);             \
+    GLOBAL_ATOM_DEF(multicast_all);            \
+    GLOBAL_ATOM_DEF(multicast_hops);           \
+    GLOBAL_ATOM_DEF(multicast_if);             \
+    GLOBAL_ATOM_DEF(multicast_loop);           \
+    GLOBAL_ATOM_DEF(multicast_ttl);            \
+    GLOBAL_ATOM_DEF(nodelay);                  \
+    GLOBAL_ATOM_DEF(nodefrag);                 \
+    GLOBAL_ATOM_DEF(noopt);                    \
+    GLOBAL_ATOM_DEF(nopush);                   \
+    GLOBAL_ATOM_DEF(not_found);                \
+    GLOBAL_ATOM_DEF(not_owner);                \
+    GLOBAL_ATOM_DEF(ok);                       \
+    GLOBAL_ATOM_DEF(oob);                      \
+    GLOBAL_ATOM_DEF(oobinline);                \
+    GLOBAL_ATOM_DEF(options);                  \
+    GLOBAL_ATOM_DEF(origdstaddr);              \
+    GLOBAL_ATOM_DEF(partial_delivery_point);   \
+    GLOBAL_ATOM_DEF(passcred);                 \
+    GLOBAL_ATOM_DEF(path);                     \
+    GLOBAL_ATOM_DEF(peekcred);                 \
+    GLOBAL_ATOM_DEF(peek_off);                 \
+    GLOBAL_ATOM_DEF(peer_addr_params);         \
+    GLOBAL_ATOM_DEF(peer_auth_chunks);         \
+    GLOBAL_ATOM_DEF(pktinfo);                  \
+    GLOBAL_ATOM_DEF(pktoptions);               \
+    GLOBAL_ATOM_DEF(port);                     \
+    GLOBAL_ATOM_DEF(portrange);                \
+    GLOBAL_ATOM_DEF(primary_addr);             \
+    GLOBAL_ATOM_DEF(priority);                 \
+    GLOBAL_ATOM_DEF(protocol);                 \
+    GLOBAL_ATOM_DEF(raw);                      \
+    GLOBAL_ATOM_DEF(rcvbuf);                   \
+    GLOBAL_ATOM_DEF(rcvbufforce);              \
+    GLOBAL_ATOM_DEF(rcvlowat);                 \
+    GLOBAL_ATOM_DEF(rcvtimeo);                 \
+    GLOBAL_ATOM_DEF(rdm);                      \
+    GLOBAL_ATOM_DEF(recv);                     \
+    GLOBAL_ATOM_DEF(recvdstaddr);              \
+    GLOBAL_ATOM_DEF(recverr);                  \
+    GLOBAL_ATOM_DEF(recvfrom);                 \
+    GLOBAL_ATOM_DEF(recvif);                   \
+    GLOBAL_ATOM_DEF(recvmsg);                  \
+    GLOBAL_ATOM_DEF(recvopts);                 \
+    GLOBAL_ATOM_DEF(recvorigdstaddr);          \
+    GLOBAL_ATOM_DEF(recvpktinfo);              \
+    GLOBAL_ATOM_DEF(recvtclass);               \
+    GLOBAL_ATOM_DEF(recvtos);                  \
+    GLOBAL_ATOM_DEF(recvttl);                  \
+    GLOBAL_ATOM_DEF(reliability);              \
+    GLOBAL_ATOM_DEF(reset_streams);            \
+    GLOBAL_ATOM_DEF(retopts);                  \
+    GLOBAL_ATOM_DEF(reuseaddr);                \
+    GLOBAL_ATOM_DEF(reuseport);                \
+    GLOBAL_ATOM_DEF(rights);                   \
+    GLOBAL_ATOM_DEF(router_alert);             \
+    GLOBAL_ATOM_DEF(rthdr);                    \
+    GLOBAL_ATOM_DEF(rtoinfo);                  \
+    GLOBAL_ATOM_DEF(rxq_ovfl);                 \
+    GLOBAL_ATOM_DEF(scope_id);                 \
+    GLOBAL_ATOM_DEF(sctp);                     \
+    GLOBAL_ATOM_DEF(sec);                      \
+    GLOBAL_ATOM_DEF(select_failed);            \
+    GLOBAL_ATOM_DEF(select_sent);              \
+    GLOBAL_ATOM_DEF(send);                     \
+    GLOBAL_ATOM_DEF(sendmsg);                  \
+    GLOBAL_ATOM_DEF(sendsrcaddr);              \
+    GLOBAL_ATOM_DEF(sendto);                   \
+    GLOBAL_ATOM_DEF(seqpacket);                \
+    GLOBAL_ATOM_DEF(setfib);                   \
+    GLOBAL_ATOM_DEF(set_peer_primary_addr);    \
+    GLOBAL_ATOM_DEF(sndbuf);                   \
+    GLOBAL_ATOM_DEF(sndbufforce);              \
+    GLOBAL_ATOM_DEF(sndlowat);                 \
+    GLOBAL_ATOM_DEF(sndtimeo);                 \
+    GLOBAL_ATOM_DEF(socket);                   \
+    GLOBAL_ATOM_DEF(socket_tag);               \
+    GLOBAL_ATOM_DEF(spec_dst);                 \
+    GLOBAL_ATOM_DEF(status);                   \
+    GLOBAL_ATOM_DEF(stream);                   \
+    GLOBAL_ATOM_DEF(syncnt);                   \
+    GLOBAL_ATOM_DEF(tclass);                   \
+    GLOBAL_ATOM_DEF(tcp);                      \
+    GLOBAL_ATOM_DEF(throughput);               \
+    GLOBAL_ATOM_DEF(timestamp);                \
+    GLOBAL_ATOM_DEF(tos);                      \
+    GLOBAL_ATOM_DEF(transparent);              \
+    GLOBAL_ATOM_DEF(true);                     \
+    GLOBAL_ATOM_DEF(trunc);                    \
+    GLOBAL_ATOM_DEF(ttl);                      \
+    GLOBAL_ATOM_DEF(type);                     \
+    GLOBAL_ATOM_DEF(udp);                      \
+    GLOBAL_ATOM_DEF(unblock_source);           \
+    GLOBAL_ATOM_DEF(undefined);                \
+    GLOBAL_ATOM_DEF(unicast_hops);             \
+    GLOBAL_ATOM_DEF(unknown);                  \
+    GLOBAL_ATOM_DEF(usec);                     \
+    GLOBAL_ATOM_DEF(user_timeout);             \
+    GLOBAL_ATOM_DEF(use_ext_recvinfo);         \
+    GLOBAL_ATOM_DEF(use_min_mtu);              \
+    GLOBAL_ATOM_DEF(v6only);
+
+
+/* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ * Error reason atoms
+ */
+
+#define GLOBAL_ERROR_REASON_ATOM_DEFS \
+    GLOBAL_ATOM_DEF(eafnosupport);    \
+    GLOBAL_ATOM_DEF(eagain);          \
+    GLOBAL_ATOM_DEF(einval);
+
+
+#define GLOBAL_ATOM_DEF(A) extern ERL_NIF_TERM esock_atom_##A
+GLOBAL_ATOM_DEFS
+GLOBAL_ERROR_REASON_ATOM_DEFS
+#undef GLOBAL_ATOM_DEF
+
+
+/* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ * Various wrapper macros for enif functions
+ */
+#define MALLOC(SZ)          enif_alloc((SZ))
+#define REALLOC(P, SZ)      enif_realloc((P), (SZ))
+#define FREE(P)             enif_free((P))
+
+#define MKA(E,S)            enif_make_atom((E), (S))
+#define MKBIN(E,B)          enif_make_binary((E), (B))
+#define MKI(E,I)            enif_make_int((E), (I))
+#define MKL(E,L)            enif_make_long((E), (L))
+#define MKLA(E,A,L)         enif_make_list_from_array((E), (A), (L))
+#define MKEL(E)             enif_make_list((E), 0)
+#define MKMA(E,KA,VA,L,M)   enif_make_map_from_arrays((E), (KA), (VA), (L), (M))
+#define MKPID(E, P)         enif_make_pid((E), (P))
+#define MKREF(E)            enif_make_ref((E))
+#define MKS(E,S)            enif_make_string((E), (S), ERL_NIF_LATIN1)
+#define MKSL(E,S,L)         enif_make_string_len((E), (S), (L), ERL_NIF_LATIN1)
+#define MKSBIN(E,B,ST,SZ)   enif_make_sub_binary((E), (B), (ST), (SZ))
+#define MKT2(E,E1,E2)       enif_make_tuple2((E), (E1), (E2))
+#define MKT3(E,E1,E2,E3)    enif_make_tuple3((E), (E1), (E2), (E3))
+#define MKT4(E,E1,E2,E3,E4) enif_make_tuple4((E), (E1), (E2), (E3), (E4))
+#define MKT5(E,E1,E2,E3,E4,E5) \
+    enif_make_tuple5((E), (E1), (E2), (E3), (E4), (E5))
+#define MKT8(E,E1,E2,E3,E4,E5,E6,E7,E8) \
+    enif_make_tuple8((E), (E1), (E2), (E3), (E4), (E5), (E6), (E7), (E8))
+#define MKTA(E, A, AL)      enif_make_tuple_from_array((E), (A), (AL))
+#define MKUI(E,UI)          enif_make_uint((E), (UI))
+#define MKUL(E,UL)          enif_make_ulong((E), (UL))
+
+#define MCREATE(N)          enif_mutex_create((N))
+#define MDESTROY(M)         enif_mutex_destroy((M))
+#define MLOCK(M)            enif_mutex_lock((M))
+#define MUNLOCK(M)          enif_mutex_unlock((M))
+
+#define MONP(S,E,D,P,M)     esock_monitor((S), (E), (D), (P), (M))
+#define DEMONP(S,E,D,M)     esock_demonitor((S), (E), (D), (M))
+#define MON_INIT(M)         esock_monitor_init((M))
+#define MON2T(E, M)         enif_make_monitor_term((E), (M))
+
+#define COMPARE(A, B)        enif_compare((A), (B))
+#define COMPARE_PIDS(P1, P2) enif_compare_pids((P1), (P2))
+
+#define IS_ATOM(E,  TE) enif_is_atom((E),   (TE))
+#define IS_BIN(E,   TE) enif_is_binary((E), (TE))
+#define IS_LIST(E,  TE) enif_is_list((E),   (TE))
+#define IS_MAP(E,   TE) enif_is_map((E), (TE))
+#define IS_NUM(E,   TE) enif_is_number((E), (TE))
+#define IS_TUPLE(E, TE) enif_is_tuple((E),  (TE))
+
+#define GET_ATOM_LEN(E, TE, LP) \
+    enif_get_atom_length((E), (TE), (LP), ERL_NIF_LATIN1)
+#define GET_ATOM(E, TE, BP, MAX) \
+    enif_get_atom((E), (TE), (BP), (MAX), ERL_NIF_LATIN1)
+#define GET_BIN(E, TE, BP)          enif_inspect_iolist_as_binary((E), (TE), (BP))
+#define GET_INT(E, TE, IP)          enif_get_int((E), (TE), (IP))
+#define GET_LIST_ELEM(E, L, HP, TP) enif_get_list_cell((E), (L), (HP), (TP))
+#define GET_LIST_LEN(E, L, LP)      enif_get_list_length((E), (L), (LP))
+#define GET_LONG(E, TE, LP)         enif_get_long((E), (TE), (LP))
+#define GET_LPID(E, T, P)           enif_get_local_pid((E), (T), (P))
+#define GET_STR(E, L, B, SZ)      \
+    enif_get_string((E), (L), (B), (SZ), ERL_NIF_LATIN1)
+#define GET_UINT(E, TE, UIP)        enif_get_uint((E), (TE), (UIP))
+#define GET_ULONG(E, TE, ULP)       enif_get_long((E), (TE), (ULP))
+#define GET_TUPLE(E, TE, TSZ, TA)   enif_get_tuple((E), (TE), (TSZ), (TA))
+#define GET_MAP_VAL(E, M, K, V)     enif_get_map_value((E), (M), (K), (V))
+
+#define ALLOC_BIN(SZ, BP)         enif_alloc_binary((SZ), (BP))
+#define REALLOC_BIN(SZ, BP)       enif_realloc_binary((SZ), (BP))
+#define FREE_BIN(BP)              enif_release_binary((BP))
+
+/* Copy term T into environment E */
+#define CP_TERM(E, T) enif_make_copy((E), (T))
+
+#endif // SOCKET_INT_H__
diff --git a/erts/emulator/nifs/common/socket_nif.c b/erts/emulator/nifs/common/socket_nif.c
new file mode 100644
index 0000000000..bbeb8b6cdd
--- /dev/null
+++ b/erts/emulator/nifs/common/socket_nif.c
@@ -0,0 +1,19697 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2018-2019. 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 : The NIF (C) part of the socket interface
+ *
+ * All of the nif-functions which are part of the API has two parts.
+ * The first function is called 'nif_<something>', e.g. nif_open.
+ * This does the initial validation and argument processing and then 
+ * calls the function that does the actual work. This is called
+ * 'esock_<something>'.
+ * ----------------------------------------------------------------------
+ *
+ *
+ * This is just a code snippet in case there is need of extra debugging
+ *
+ * esock_dbg_printf("DEMONP", "[%d] %s: %T\r\n",
+ *                  descP->sock, slogan,
+ *                  esock_make_monitor_term(env, &mon));
+ *
+ */
+
+#define STATIC_ERLANG_NIF 1
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+/* If we HAVE_SCTP_H and Solaris, we need to define the following in
+ * order to get SCTP working:
+ */
+#if (defined(HAVE_SCTP_H) && defined(__sun) && defined(__SVR4))
+#define SOLARIS10    1
+/* WARNING: This is not quite correct, it may also be Solaris 11! */
+#define _XPG4_2
+#define __EXTENSIONS__
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <time.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
+#endif
+
+#ifdef HAVE_NET_IF_DL_H
+#include <net/if_dl.h>
+#endif
+
+#ifdef HAVE_IFADDRS_H
+#include <ifaddrs.h>
+#endif
+
+#ifdef HAVE_NETPACKET_PACKET_H
+#include <netpacket/packet.h>
+#endif
+
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+
+/* SENDFILE STUFF HERE IF WE NEED IT... */
+
+#if defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN__)
+#define __DARWIN__ 1
+#endif
+
+
+#ifdef __WIN32__
+#define STRNCASECMP               strncasecmp
+#define INCL_WINSOCK_API_TYPEDEFS 1
+
+#ifndef WINDOWS_H_INCLUDES_WINSOCK2_H
+#include <winsock2.h>
+#endif
+#include <windows.h>
+#include <Ws2tcpip.h>   /* NEED VC 6.0 or higher */
+
+/* Visual studio 2008+: NTDDI_VERSION needs to be set for iphlpapi.h
+ * to define the right structures. It needs to be set to WINXP (or LONGHORN)
+ * for IPV6 to work and it's set lower by default, so we need to change it.
+ */
+#ifdef HAVE_SDKDDKVER_H
+#  include <sdkddkver.h>
+#  ifdef NTDDI_VERSION
+#    undef NTDDI_VERSION
+#  endif
+#  define NTDDI_VERSION NTDDI_WINXP
+#endif
+#include <iphlpapi.h>
+
+#undef WANT_NONBLOCKING
+#include "sys.h"
+
+
+
+/* AND HERE WE MAY HAVE A BUNCH OF DEFINES....SEE INET DRIVER.... */
+
+
+
+
+#else /* ifdef __WIN32__ */
+
+#include <sys/time.h>
+#ifdef NETDB_H_NEEDS_IN_H
+#include <netinet/in.h>
+#endif
+#include <netdb.h>
+
+#include <sys/socket.h>
+#include <netinet/in.h>
+
+#ifdef DEF_INADDR_LOOPBACK_IN_RPC_TYPES_H
+#include <rpc/types.h>
+#endif
+
+#include <netinet/ip.h>
+#include <netinet/tcp.h>
+#include <netinet/udp.h>
+#include <arpa/inet.h>
+
+#include <sys/param.h>
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
+
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+
+#include <net/if.h>
+
+#ifdef HAVE_SCHED_H
+#include <sched.h>
+#endif
+
+#ifdef HAVE_SETNS_H
+#include <setns.h>
+#endif
+
+#define HAVE_UDP
+
+/* SCTP support -- currently for UNIX platforms only: */
+#undef HAVE_SCTP
+#if defined(HAVE_SCTP_H)
+
+#include <netinet/sctp.h>
+
+/* SCTP Socket API Draft from version 11 on specifies that netinet/sctp.h must
+   explicitly define HAVE_SCTP in case when SCTP is supported,  but Solaris 10
+   still apparently uses Draft 10, and does not define that symbol, so we have
+   to define it explicitly:
+*/
+#ifndef     HAVE_SCTP
+#    define HAVE_SCTP
+#endif
+
+/* These changed in draft 11, so SOLARIS10 uses the old MSG_* */
+#if ! HAVE_DECL_SCTP_UNORDERED
+#     define    SCTP_UNORDERED  MSG_UNORDERED
+#endif
+#if ! HAVE_DECL_SCTP_ADDR_OVER
+#     define    SCTP_ADDR_OVER  MSG_ADDR_OVER
+#endif
+#if ! HAVE_DECL_SCTP_ABORT
+#     define    SCTP_ABORT      MSG_ABORT
+#endif
+#if ! HAVE_DECL_SCTP_EOF
+#     define    SCTP_EOF        MSG_EOF
+#endif
+
+/* More Solaris 10 fixes: */
+#if ! HAVE_DECL_SCTP_CLOSED && HAVE_DECL_SCTPS_IDLE
+#    define SCTP_CLOSED SCTPS_IDLE
+#    undef HAVE_DECL_SCTP_CLOSED
+#    define HAVE_DECL_SCTP_CLOSED 1
+#endif
+#if ! HAVE_DECL_SCTP_BOUND && HAVE_DECL_SCTPS_BOUND
+#    define SCTP_BOUND SCTPS_BOUND
+#    undef HAVE_DECL_SCTP_BOUND
+#    define HAVE_DECL_SCTP_BOUND 1
+#endif
+#if ! HAVE_DECL_SCTP_LISTEN && HAVE_DECL_SCTPS_LISTEN
+#    define SCTP_LISTEN SCTPS_LISTEN
+#    undef HAVE_DECL_SCTP_LISTEN
+#    define HAVE_DECL_SCTP_LISTEN 1
+#endif
+#if ! HAVE_DECL_SCTP_COOKIE_WAIT && HAVE_DECL_SCTPS_COOKIE_WAIT
+#    define SCTP_COOKIE_WAIT SCTPS_COOKIE_WAIT
+#    undef HAVE_DECL_SCTP_COOKIE_WAIT
+#    define HAVE_DECL_SCTP_COOKIE_WAIT 1
+#endif
+#if ! HAVE_DECL_SCTP_COOKIE_ECHOED && HAVE_DECL_SCTPS_COOKIE_ECHOED
+#    define SCTP_COOKIE_ECHOED SCTPS_COOKIE_ECHOED
+#    undef HAVE_DECL_SCTP_COOKIE_ECHOED
+#    define HAVE_DECL_SCTP_COOKIE_ECHOED 1
+#endif
+#if ! HAVE_DECL_SCTP_ESTABLISHED && HAVE_DECL_SCTPS_ESTABLISHED
+#    define SCTP_ESTABLISHED SCTPS_ESTABLISHED
+#    undef HAVE_DECL_SCTP_ESTABLISHED
+#    define HAVE_DECL_SCTP_ESTABLISHED 1
+#endif
+#if ! HAVE_DECL_SCTP_SHUTDOWN_PENDING && HAVE_DECL_SCTPS_SHUTDOWN_PENDING
+#    define SCTP_SHUTDOWN_PENDING SCTPS_SHUTDOWN_PENDING
+#    undef HAVE_DECL_SCTP_SHUTDOWN_PENDING
+#    define HAVE_DECL_SCTP_SHUTDOWN_PENDING 1
+#endif
+#if ! HAVE_DECL_SCTP_SHUTDOWN_SENT && HAVE_DECL_SCTPS_SHUTDOWN_SENT
+#    define SCTP_SHUTDOWN_SENT SCTPS_SHUTDOWN_SENT
+#    undef HAVE_DECL_SCTP_SHUTDOWN_SENT
+#    define HAVE_DECL_SCTP_SHUTDOWN_SENT 1
+#endif
+#if ! HAVE_DECL_SCTP_SHUTDOWN_RECEIVED && HAVE_DECL_SCTPS_SHUTDOWN_RECEIVED
+#    define SCTP_SHUTDOWN_RECEIVED SCTPS_SHUTDOWN_RECEIVED
+#    undef HAVE_DECL_SCTP_SHUTDOWN_RECEIVED
+#    define HAVE_DECL_SCTP_SHUTDOWN_RECEIVED 1
+#endif
+#if ! HAVE_DECL_SCTP_SHUTDOWN_ACK_SENT && HAVE_DECL_SCTPS_SHUTDOWN_ACK_SENT
+#    define SCTP_SHUTDOWN_ACK_SENT SCTPS_SHUTDOWN_ACK_SENT
+#    undef HAVE_DECL_SCTP_SHUTDOWN_ACK_SENT
+#    define HAVE_DECL_SCTP_SHUTDOWN_ACK_SENT 1
+#endif
+/* New spelling in lksctp 2.6.22 or maybe even earlier:
+ *  adaption -> adaptation
+ */
+#if !defined(SCTP_ADAPTATION_LAYER) && defined (SCTP_ADAPTION_LAYER)
+#     define SCTP_ADAPTATION_LAYER       SCTP_ADAPTION_LAYER
+#     define SCTP_ADAPTATION_INDICATION  SCTP_ADAPTION_INDICATION
+#     define sctp_adaptation_event       sctp_adaption_event
+#     define sctp_setadaptation          sctp_setadaption
+#     define sn_adaptation_event         sn_adaption_event
+#     define sai_adaptation_ind          sai_adaption_ind
+#     define ssb_adaptation_ind          ssb_adaption_ind
+#     define sctp_adaptation_layer_event sctp_adaption_layer_event
+#endif
+
+/*
+ * We *may* need this stuff later when we *fully* implement support for SCTP 
+ *
+
+#if defined(__GNUC__) && defined(HAVE_SCTP_BINDX)
+static typeof(sctp_bindx) *esock_sctp_bindx = NULL;
+#else
+static int (*esock_sctp_bindx)
+	(int sd, struct sockaddr *addrs, int addrcnt, int flags) = NULL;
+#endif
+
+#if defined(__GNUC__) && defined(HAVE_SCTP_PEELOFF)
+static typeof(sctp_peeloff) *esock_sctp_peeloff = NULL;
+#else
+static int (*esock_sctp_peeloff)
+        (int sd, sctp_assoc_t assoc_id) = NULL;
+#endif
+
+#if defined(__GNUC__) && defined(HAVE_SCTP_GETLADDRS)
+static typeof(sctp_getladdrs) *esock_sctp_getladdrs = NULL;
+#else
+static int (*esock_sctp_getladdrs)
+        (int sd, sctp_assoc_t assoc_id, struct sockaddr **ss) = NULL;
+#endif
+
+#if defined(__GNUC__) && defined(HAVE_SCTP_FREELADDRS)
+static typeof(sctp_freeladdrs) *esock_sctp_freeladdrs = NULL;
+#else
+static void (*esock_sctp_freeladdrs)(struct sockaddr *addrs) = NULL;
+#endif
+
+#if defined(__GNUC__) && defined(HAVE_SCTP_GETPADDRS)
+static typeof(sctp_getpaddrs) *esock_sctp_getpaddrs = NULL;
+#else
+static int (*esock_sctp_getpaddrs)
+        (int sd, sctp_assoc_t assoc_id, struct sockaddr **ss) = NULL;
+#endif
+
+#if defined(__GNUC__) && defined(HAVE_SCTP_FREEPADDRS)
+static typeof(sctp_freepaddrs) *esock_sctp_freepaddrs = NULL;
+#else
+static void (*esock_sctp_freepaddrs)(struct sockaddr *addrs) = NULL;
+#endif
+
+*/
+
+#endif /* #if defined(HAVE_SCTP_H) */
+
+
+#ifndef WANT_NONBLOCKING
+#define WANT_NONBLOCKING
+#endif
+#include "sys.h"
+
+/* Socket stuff */
+#define INVALID_SOCKET -1
+// #define INVALID_EVENT  -1
+#define SOCKET_ERROR   -1
+
+#endif /* ifdef __WIN32__ */
+
+#include <erl_nif.h>
+
+#include "socket_dbg.h"
+#include "socket_tarray.h"
+#include "socket_int.h"
+#include "socket_util.h"
+
+
+#if defined(ERTS_INLINE)
+#  define ESOCK_INLINE ERTS_INLINE
+#else
+#  if defined(__GNUC__)
+#    define ESOCK_INLINE __inline__
+#  elif defined(__WIN32__)
+#    define ESOCK_INLINE __inline
+#  else
+#    define ESOCK_INLINE
+#  endif
+#endif
+
+
+#if defined(SOL_IPV6) || defined(IPPROTO_IPV6)
+#define HAVE_IPV6
+#endif
+
+/* All platforms fail on malloc errors. */
+#define FATAL_MALLOC
+
+
+/* Debug stuff... */
+#define ESOCK_GLOBAL_DEBUG_DEFAULT FALSE
+#define ESOCK_DEBUG_DEFAULT        FALSE
+
+/* Counters and stuff (Don't know where to sent this stuff anyway) */
+#define ESOCK_NIF_IOW_DEFAULT FALSE
+
+
+
+/* Socket stuff */
+#define INVALID_EVENT  -1
+
+#define SOCKET int
+#define HANDLE long int
+
+
+/* ==============================================================================
+ * The IS_SOCKET_ERROR macro below is used for portability reasons.
+ * While POSIX specifies that errors from socket-related system calls
+ * should be indicated with a -1 return value, some users have experienced
+ * non-Windows OS kernels that return negative values other than -1.
+ * While one can argue that such kernels are technically broken, comparing
+ * against values less than 0 covers their out-of-spec return values without
+ * imposing incorrect semantics on systems that manage to correctly return -1
+ * for errors, thus increasing Erlang's portability.
+ */
+#ifdef __WIN32__
+#define IS_SOCKET_ERROR(val) ((val) == SOCKET_ERROR)
+#else
+#define IS_SOCKET_ERROR(val) ((val) < 0)
+#endif
+
+
+/* *** Misc macros and defines *** */
+
+/* This macro exist on some (linux) platforms */
+#if !defined(IPTOS_TOS_MASK)
+#define IPTOS_TOS_MASK     0x1E
+#endif
+#if !defined(IPTOS_TOS)
+#define IPTOS_TOS(tos)          ((tos)&IPTOS_TOS_MASK)
+#endif
+
+
+#if defined(TCP_CA_NAME_MAX)
+#define ESOCK_OPT_TCP_CONGESTION_NAME_MAX TCP_CA_NAME_MAX
+#else
+/* This is really excessive, but just in case... */
+#define ESOCK_OPT_TCP_CONGESTION_NAME_MAX 256
+#endif
+
+
+#if defined(TCP_CONGESTION) || defined(SO_BINDTODEVICE)
+#define USE_GETOPT_STR_OPT
+#define USE_SETOPT_STR_OPT
+#endif
+
+
+
+/* *** Socket state defs *** */
+
+#define ESOCK_FLAG_OPEN         0x0001
+#define ESOCK_FLAG_ACTIVE       0x0004
+#define ESOCK_FLAG_LISTEN       0x0008
+#define ESOCK_FLAG_CON          0x0010
+#define ESOCK_FLAG_ACC          0x0020
+#define ESOCK_FLAG_BUSY         0x0040
+#define ESOCK_FLAG_CLOSE        0x0080
+
+#define ESOCK_STATE_CLOSED          (0)
+#define ESOCK_STATE_OPEN            (ESOCK_FLAG_OPEN)
+#define ESOCK_STATE_CONNECTED       (ESOCK_STATE_OPEN      | ESOCK_FLAG_ACTIVE)
+#define ESOCK_STATE_LISTENING       (ESOCK_STATE_OPEN      | ESOCK_FLAG_LISTEN)
+#define ESOCK_STATE_CONNECTING      (ESOCK_STATE_OPEN      | ESOCK_FLAG_CON)
+#define ESOCK_STATE_ACCEPTING       (ESOCK_STATE_LISTENING | ESOCK_FLAG_ACC)
+#define ESOCK_STATE_CLOSING         (ESOCK_FLAG_CLOSE)
+#define ESOCK_STATE_DTOR            (0xFFFF)
+
+#define IS_CLOSED(d)                            \
+    ((d)->state == ESOCK_STATE_CLOSED)
+
+/*
+#define IS_STATE(d, f) \
+    (((d)->state & (f)) == (f))
+*/
+
+#define IS_CLOSING(d)                                                   \
+    (((d)->state & ESOCK_STATE_CLOSING) == ESOCK_STATE_CLOSING)
+
+#define IS_OPEN(d)                                              \
+    (((d)->state & ESOCK_FLAG_OPEN) == ESOCK_FLAG_OPEN)
+
+#define IS_CONNECTED(d)                                                 \
+    (((d)->state & ESOCK_STATE_CONNECTED) == ESOCK_STATE_CONNECTED)
+
+#define IS_CONNECTING(d)                                \
+    (((d)->state & ESOCK_FLAG_CON) == ESOCK_FLAG_CON)
+
+/*
+#define IS_BUSY(d)                                      \
+    (((d)->state & ESOCK_FLAG_BUSY) == ESOCK_FLAG_BUSY)
+*/
+
+#define ESOCK_GET_RESOURCE(ENV, REF, RES) \
+    enif_get_resource((ENV), (REF), esocks, (RES))
+
+#define ESOCK_SEND_FLAG_CONFIRM    0
+#define ESOCK_SEND_FLAG_DONTROUTE  1
+#define ESOCK_SEND_FLAG_EOR        2
+#define ESOCK_SEND_FLAG_MORE       3
+#define ESOCK_SEND_FLAG_NOSIGNAL   4
+#define ESOCK_SEND_FLAG_OOB        5
+#define ESOCK_SEND_FLAG_LOW        ESOCK_SEND_FLAG_CONFIRM
+#define ESOCK_SEND_FLAG_HIGH       ESOCK_SEND_FLAG_OOB
+
+#define ESOCK_RECV_FLAG_CMSG_CLOEXEC 0
+#define ESOCK_RECV_FLAG_ERRQUEUE     1
+#define ESOCK_RECV_FLAG_OOB          2
+#define ESOCK_RECV_FLAG_PEEK         3
+#define ESOCK_RECV_FLAG_TRUNC        4
+#define ESOCK_RECV_FLAG_LOW          ESOCK_RECV_FLAG_CMSG_CLOEXEC
+#define ESOCK_RECV_FLAG_HIGH         ESOCK_RECV_FLAG_TRUNC
+
+#define ESOCK_RECV_BUFFER_SIZE_DEFAULT      8192
+#define ESOCK_RECV_CTRL_BUFFER_SIZE_DEFAULT 1024
+#define ESOCK_SEND_CTRL_BUFFER_SIZE_DEFAULT 1024
+
+#define VT2S(__VT__) (((__VT__) == ESOCK_OPT_VALUE_TYPE_UNSPEC) ? "unspec" : \
+                      (((__VT__) == ESOCK_OPT_VALUE_TYPE_INT) ? "int" : \
+                       ((__VT__) == ESOCK_OPT_VALUE_TYPE_BOOL) ? "bool" : \
+                       "undef"))
+
+#define ESOCK_OPT_VALUE_TYPE_UNSPEC 0
+#define ESOCK_OPT_VALUE_TYPE_INT    1
+#define ESOCK_OPT_VALUE_TYPE_BOOL   2
+
+#define ESOCK_DESC_PATTERN_CREATED 0x03030303
+#define ESOCK_DESC_PATTERN_DTOR    0xC0C0C0C0
+
+/*
+typedef union {
+    struct {
+        // 0 = not open, 1 = open
+        unsigned int open:1;
+        // 0 = not conn, 1 = connecting, 2 = connected
+        unsigned int connect:2;
+        // unsigned int connecting:1;
+        // unsigned int connected:1;
+        // 0 = not listen, 1 = listening, 2 = accepting
+        unsigned int listen:2;
+        // unsigned int listening:1;
+        // unsigned int accepting:1;
+        / * Room for more... * /
+    } flags;
+    unsigned int field; // Make it easy to reset all flags...
+} SocketState;
+*/
+
+/*
+#define IS_OPEN(d)       ((d)->state.flags.open)
+#define IS_CONNECTED(d)  ((d)->state.flags.connect == ESOCK_STATE_CONNECTED)
+#define IS_CONNECTING(d) ((d)->state.flags.connect == ESOCK_STATE_CONNECTING)
+*/
+
+
+/*----------------------------------------------------------------------------
+ * Interface constants.
+ *
+ * This section must be "identical" to the corresponding socket.hrl
+ */
+
+/* domain */
+#define ESOCK_DOMAIN_LOCAL       1
+#define ESOCK_DOMAIN_INET        2
+#define ESOCK_DOMAIN_INET6       3
+
+/* type */
+#define ESOCK_TYPE_STREAM        1
+#define ESOCK_TYPE_DGRAM         2
+#define ESOCK_TYPE_RAW           3
+// #define ESOCK_TYPE_RDM           4
+#define ESOCK_TYPE_SEQPACKET     5
+
+/* protocol */
+#define ESOCK_PROTOCOL_DEFAULT   0
+#define ESOCK_PROTOCOL_IP        1
+#define ESOCK_PROTOCOL_TCP       2
+#define ESOCK_PROTOCOL_UDP       3
+#define ESOCK_PROTOCOL_SCTP      4
+#define ESOCK_PROTOCOL_ICMP      5
+#define ESOCK_PROTOCOL_IGMP      6
+
+/* shutdown how */
+#define ESOCK_SHUTDOWN_HOW_RD    0
+#define ESOCK_SHUTDOWN_HOW_WR    1
+#define ESOCK_SHUTDOWN_HOW_RDWR  2
+
+
+#define ESOCK_OPT_LEVEL_OTP        0
+#define ESOCK_OPT_LEVEL_SOCKET     1
+#define ESOCK_OPT_LEVEL_IP         2
+#define ESOCK_OPT_LEVEL_IPV6       3
+#define ESOCK_OPT_LEVEL_TCP        4
+#define ESOCK_OPT_LEVEL_UDP        5
+#define ESOCK_OPT_LEVEL_SCTP       6
+
+#define ESOCK_OPT_OTP_DEBUG        1
+#define ESOCK_OPT_OTP_IOW          2
+#define ESOCK_OPT_OTP_CTRL_PROC    3
+#define ESOCK_OPT_OTP_RCVBUF       4
+#define ESOCK_OPT_OTP_RCVCTRLBUF   6
+#define ESOCK_OPT_OTP_SNDCTRLBUF   7
+#define ESOCK_OPT_OTP_FD           8
+#define ESOCK_OPT_OTP_DOMAIN       0xFF01 // INTERNAL AND ONLY GET
+#define ESOCK_OPT_OTP_TYPE         0xFF02 // INTERNAL AND ONLY GET
+#define ESOCK_OPT_OTP_PROTOCOL     0xFF03 // INTERNAL AND ONLY GET
+
+#define ESOCK_OPT_SOCK_ACCEPTCONN     1
+#define ESOCK_OPT_SOCK_BINDTODEVICE   3
+#define ESOCK_OPT_SOCK_BROADCAST      4
+#define ESOCK_OPT_SOCK_DEBUG          6
+#define ESOCK_OPT_SOCK_DOMAIN         7
+#define ESOCK_OPT_SOCK_DONTROUTE      8
+#define ESOCK_OPT_SOCK_KEEPALIVE     10
+#define ESOCK_OPT_SOCK_LINGER        11
+#define ESOCK_OPT_SOCK_OOBINLINE     13
+#define ESOCK_OPT_SOCK_PEEK_OFF      15
+#define ESOCK_OPT_SOCK_PRIORITY      17
+#define ESOCK_OPT_SOCK_PROTOCOL      18
+#define ESOCK_OPT_SOCK_RCVBUF        19
+#define ESOCK_OPT_SOCK_RCVLOWAT      21
+#define ESOCK_OPT_SOCK_RCVTIMEO      22
+#define ESOCK_OPT_SOCK_REUSEADDR     23
+#define ESOCK_OPT_SOCK_REUSEPORT     24
+#define ESOCK_OPT_SOCK_SNDBUF        27
+#define ESOCK_OPT_SOCK_SNDLOWAT      29
+#define ESOCK_OPT_SOCK_SNDTIMEO      30
+#define ESOCK_OPT_SOCK_TIMESTAMP     31
+#define ESOCK_OPT_SOCK_TYPE          32
+
+#define ESOCK_OPT_IP_ADD_MEMBERSHIP          1
+#define ESOCK_OPT_IP_ADD_SOURCE_MEMBERSHIP   2
+#define ESOCK_OPT_IP_BLOCK_SOURCE            3
+#define ESOCK_OPT_IP_DROP_MEMBERSHIP         5
+#define ESOCK_OPT_IP_DROP_SOURCE_MEMBERSHIP  6
+#define ESOCK_OPT_IP_FREEBIND                7
+#define ESOCK_OPT_IP_HDRINCL                 8
+#define ESOCK_OPT_IP_MINTTL                  9
+#define ESOCK_OPT_IP_MSFILTER               10
+#define ESOCK_OPT_IP_MTU                    11
+#define ESOCK_OPT_IP_MTU_DISCOVER           12
+#define ESOCK_OPT_IP_MULTICAST_ALL          13
+#define ESOCK_OPT_IP_MULTICAST_IF           14
+#define ESOCK_OPT_IP_MULTICAST_LOOP         15
+#define ESOCK_OPT_IP_MULTICAST_TTL          16
+#define ESOCK_OPT_IP_NODEFRAG               17
+#define ESOCK_OPT_IP_PKTINFO                19
+#define ESOCK_OPT_IP_RECVDSTADDR            20
+#define ESOCK_OPT_IP_RECVERR                21
+#define ESOCK_OPT_IP_RECVIF                 22
+#define ESOCK_OPT_IP_RECVOPTS               23
+#define ESOCK_OPT_IP_RECVORIGDSTADDR        24
+#define ESOCK_OPT_IP_RECVTOS                25
+#define ESOCK_OPT_IP_RECVTTL                26
+#define ESOCK_OPT_IP_RETOPTS                27
+#define ESOCK_OPT_IP_ROUTER_ALERT           28
+#define ESOCK_OPT_IP_SENDSRCADDR            29 // Same as IP_RECVDSTADDR?
+#define ESOCK_OPT_IP_TOS                    30
+#define ESOCK_OPT_IP_TRANSPARENT            31
+#define ESOCK_OPT_IP_TTL                    32
+#define ESOCK_OPT_IP_UNBLOCK_SOURCE         33
+
+#define ESOCK_OPT_IPV6_ADDRFORM              1
+#define ESOCK_OPT_IPV6_ADD_MEMBERSHIP        2
+#define ESOCK_OPT_IPV6_AUTHHDR               3
+#define ESOCK_OPT_IPV6_DROP_MEMBERSHIP       6
+#define ESOCK_OPT_IPV6_DSTOPTS               7
+#define ESOCK_OPT_IPV6_FLOWINFO             11
+#define ESOCK_OPT_IPV6_HOPLIMIT             12
+#define ESOCK_OPT_IPV6_HOPOPTS              13
+#define ESOCK_OPT_IPV6_MTU                  17
+#define ESOCK_OPT_IPV6_MTU_DISCOVER         18
+#define ESOCK_OPT_IPV6_MULTICAST_HOPS       19
+#define ESOCK_OPT_IPV6_MULTICAST_IF         20
+#define ESOCK_OPT_IPV6_MULTICAST_LOOP       21
+#define ESOCK_OPT_IPV6_RECVERR              24
+#define ESOCK_OPT_IPV6_RECVPKTINFO          25 // PKTINFO on FreeBSD
+#define ESOCK_OPT_IPV6_ROUTER_ALERT         27
+#define ESOCK_OPT_IPV6_RTHDR                28
+#define ESOCK_OPT_IPV6_UNICAST_HOPS         30
+#define ESOCK_OPT_IPV6_V6ONLY               32
+
+#define ESOCK_OPT_TCP_CONGESTION   1
+#define ESOCK_OPT_TCP_CORK         2
+#define ESOCK_OPT_TCP_MAXSEG       7
+#define ESOCK_OPT_TCP_NODELAY      9
+
+#define ESOCK_OPT_UDP_CORK         1
+
+#define ESOCK_OPT_SCTP_ASSOCINFO           2
+#define ESOCK_OPT_SCTP_AUTOCLOSE           8
+#define ESOCK_OPT_SCTP_DISABLE_FRAGMENTS  12
+#define ESOCK_OPT_SCTP_EVENTS             14
+#define ESOCK_OPT_SCTP_INITMSG            18
+#define ESOCK_OPT_SCTP_MAXSEG             21
+#define ESOCK_OPT_SCTP_NODELAY            23
+#define ESOCK_OPT_SCTP_RTOINFO            29
+
+/* We should *eventually* use this instead of hard-coding the size (to 1) */
+#define ESOCK_RECVMSG_IOVEC_SZ 1
+
+#define ESOCK_CMD_DEBUG        0x0001
+
+#define ESOCK_SUPPORTS_OPTIONS 0x0001
+#define ESOCK_SUPPORTS_SCTP    0x0002
+#define ESOCK_SUPPORTS_IPV6    0x0003
+#define ESOCK_SUPPORTS_LOCAL   0x0004
+
+#define ESOCK_WHICH_PROTO_ERROR -1
+#define ESOCK_WHICH_PROTO_UNSUP -2
+
+
+
+/* =================================================================== *
+ *                                                                     *
+ *                        Various esockmacros                          *
+ *                                                                     *
+ * =================================================================== */
+
+/* Global socket debug */
+#define SGDBG( proto )         ESOCK_DBG_PRINTF( data.dbg , proto )
+/* Socket specific debug */
+#define SSDBG( __D__ , proto ) ESOCK_DBG_PRINTF( (__D__)->dbg , proto )
+
+#define SOCK_CNT_INC( __E__, __D__, SF, ACNT, CNT, INC)  \
+    {                                                    \
+        if (cnt_inc(CNT, INC) && (__D__)->iow) {         \
+            esock_send_wrap_msg(__E__, __D__, SF, ACNT); \
+        }                                                \
+    }
+
+
+/* =================================================================== *
+ *                                                                     *
+ *                    Basic socket operations                          *
+ *                                                                     *
+ * =================================================================== */
+
+#ifdef __WIN32__
+
+/* *** Windows macros *** */
+
+#define sock_accept(s, addr, len) \
+    make_noninheritable_handle(accept((s), (addr), (len)))
+#define sock_bind(s, addr, len)        bind((s), (addr), (len))
+#define sock_close(s)                  closesocket((s))
+#define sock_close_event(e)            WSACloseEvent(e)
+#define sock_connect(s, addr, len)     connect((s), (addr), (len))
+#define sock_create_event(s)           WSACreateEvent()
+#define sock_errno()                   WSAGetLastError()
+#define sock_getopt(s,l,o,v,ln)        getsockopt((s),(l),(o),(v),(ln))
+#define sock_htons(x)                  htons((x))
+#define sock_htonl(x)                  htonl((x))
+#define sock_listen(s, b)              listen((s), (b))
+#define sock_name(s, addr, len)        getsockname((s), (addr), (len))
+#define sock_ntohs(x)                  ntohs((x))
+#define sock_open(domain, type, proto)                             \
+    make_noninheritable_handle(socket((domain), (type), (proto)))
+#define sock_peer(s, addr, len)    getpeername((s), (addr), (len))
+#define sock_recv(s,buf,len,flag)  recv((s),(buf),(len),(flag))
+#define sock_recvfrom(s,buf,blen,flag,addr,alen) \
+    recvfrom((s),(buf),(blen),(flag),(addr),(alen))
+#define sock_send(s,buf,len,flag)      send((s),(buf),(len),(flag))
+#define sock_sendto(s,buf,blen,flag,addr,alen) \
+    sendto((s),(buf),(blen),(flag),(addr),(alen))
+#define sock_setopt(s,l,o,v,ln)        setsockopt((s),(l),(o),(v),(ln))
+#define sock_shutdown(s, how)          shutdown((s), (how))
+
+
+#define SET_BLOCKING(s)            ioctlsocket(s, FIONBIO, &zero_value)
+#define SET_NONBLOCKING(s)         ioctlsocket(s, FIONBIO, &one_value)
+static unsigned long zero_value = 0;
+static unsigned long one_value  = 1;
+
+
+#else /* !__WIN32__ */
+
+
+#ifdef HAS_ACCEPT4
+// We have to figure out what the flags are...
+#define sock_accept(s, addr, len)       accept4((s), (addr), (len), (SOCK_CLOEXEC))
+#else
+#define sock_accept(s, addr, len)       accept((s), (addr), (len))
+#endif
+#define sock_bind(s, addr, len)         bind((s), (addr), (len))
+#define sock_close(s)                   close((s))
+#define sock_close_event(e)             /* do nothing */
+#define sock_connect(s, addr, len)      connect((s), (addr), (len))
+#define sock_create_event(s)            (s) /* return file descriptor */
+#define sock_errno()                    errno
+#define sock_getopt(s,t,n,v,l)          getsockopt((s),(t),(n),(v),(l))
+#define sock_htons(x)                   htons((x))
+#define sock_htonl(x)                   htonl((x))
+#define sock_listen(s, b)               listen((s), (b))
+#define sock_name(s, addr, len)         getsockname((s), (addr), (len))
+#define sock_ntohs(x)                   ntohs((x))
+#define sock_open(domain, type, proto)  socket((domain), (type), (proto))
+#define sock_peer(s, addr, len)         getpeername((s), (addr), (len))
+#define sock_recv(s,buf,len,flag)       recv((s),(buf),(len),(flag))
+#define sock_recvfrom(s,buf,blen,flag,addr,alen) \
+    recvfrom((s),(buf),(blen),(flag),(addr),(alen))
+#define sock_recvmsg(s,msghdr,flag)     recvmsg((s),(msghdr),(flag))
+#define sock_send(s,buf,len,flag)       send((s), (buf), (len), (flag))
+#define sock_sendmsg(s,msghdr,flag)     sendmsg((s),(msghdr),(flag))
+#define sock_sendto(s,buf,blen,flag,addr,alen) \
+                sendto((s),(buf),(blen),(flag),(addr),(alen))
+#define sock_setopt(s,l,o,v,ln)         setsockopt((s),(l),(o),(v),(ln))
+#define sock_shutdown(s, how)           shutdown((s), (how))
+
+#endif /* !__WIN32__ */
+
+#ifdef HAVE_SOCKLEN_T
+#  define SOCKLEN_T socklen_t
+#else
+#  define SOCKLEN_T size_t
+#endif
+
+#ifdef __WIN32__
+#define SOCKOPTLEN_T int
+#else
+#define SOCKOPTLEN_T SOCKLEN_T
+#endif
+
+/* We can use the IPv4 def for this since the beginning
+ * is the same for INET and INET6 */
+#define which_address_port(sap)		     \
+  ((((sap)->in4.sin_family == AF_INET) ||  \
+    ((sap)->in4.sin_family == AF_INET6)) ? \
+   ((sap)->in4.sin_port) : -1)
+
+
+typedef struct {
+    ErlNifMonitor mon;
+    BOOLEAN_T     isActive;
+} ESockMonitor;
+
+typedef struct {
+    ErlNifPid    pid; // PID of the requesting process
+    ESockMonitor mon; // Monitor to the requesting process
+
+    /* We need an environment for the copy of the ref we store here.
+     * We will also use this environment for any messages we send
+     * (with the ref in it). Such as the select message (used in the 
+     * select call) or the abort message.
+     */
+    ErlNifEnv*   env;
+    ERL_NIF_TERM ref; // The (unique) reference (ID) of the request
+} ESockRequestor;
+
+typedef struct esock_request_queue_element {
+    struct esock_request_queue_element* nextP;
+    ESockRequestor                      data;
+} ESockRequestQueueElement;
+
+typedef struct {
+    ESockRequestQueueElement* first;
+    ESockRequestQueueElement* last;
+} ESockRequestQueue;
+
+
+typedef struct {
+    /* 
+     * +++ This is a way to, possibly, detect memory overrides "and stuff" +++
+     *
+     * We have two patterns. One is set when the descriptor is created (allocated)
+     * and one is set when the descriptor is dtor'ed.
+     */
+    Uint32             pattern;
+
+    /* +++ The actual socket +++ */
+    SOCKET             sock;
+    HANDLE             event;
+
+    /* +++ Stuff "about" the socket +++ */
+    int                domain;
+    int                type;
+    int                protocol;
+
+    unsigned int       state;
+    ESockAddress       remote;
+    unsigned int       addrLen;
+
+    /* +++ Controller (owner) process +++ */
+    ErlNifPid          ctrlPid;
+    ESockMonitor       ctrlMon;
+
+    /* +++ Connector process +++ */
+    ErlNifPid          connPid;
+    ESockMonitor       connMon;
+
+    /* +++ Write stuff +++ */
+    ErlNifMutex*       writeMtx;
+    ESockRequestor     currentWriter;
+    ESockRequestor*    currentWriterP; // NULL or points to currentWriter
+    ESockRequestQueue  writersQ;
+    BOOLEAN_T          isWritable;
+    Uint32             writePkgCnt;
+    Uint32             writeByteCnt;
+    Uint32             writeTries;
+    Uint32             writeWaits;
+    Uint32             writeFails;
+
+    /* +++ Read stuff +++ */
+    ErlNifMutex*       readMtx;
+    ESockRequestor     currentReader;
+    ESockRequestor*    currentReaderP; // NULL or points to currentReader
+    ESockRequestQueue  readersQ;
+    BOOLEAN_T          isReadable;
+    ErlNifBinary       rbuffer;      // DO WE NEED THIS
+    Uint32             readCapacity; // DO WE NEED THIS
+    Uint32             readPkgCnt;
+    Uint32             readByteCnt;
+    Uint32             readTries;
+    Uint32             readWaits;
+    Uint32             readFails;
+
+    /* +++ Accept stuff +++ */
+    ErlNifMutex*       accMtx;
+    ESockRequestor     currentAcceptor;
+    ESockRequestor*    currentAcceptorP; // NULL or points to currentAcceptor
+    ESockRequestQueue  acceptorsQ;
+
+    /* +++ Config & Misc stuff +++ */
+    ErlNifMutex*       cfgMtx;
+    size_t       rBufSz;  // Read buffer size (when data length = 0)
+    /* rNum and rNumCnt are used (together with rBufSz) when calling the recv 
+     * function with the Length argument set to 0 (zero).
+     * If rNum is 0 (zero), then rNumCnt is not used and only *one* read will
+     * be done. Also, when get'ing the value of the option (rcvbuf) with 
+     * getopt, the value will be reported as an integer. If the rNum has a 
+     * value greater then 0 (zero), then it will instead be reported as {N, BufSz}.
+     */
+    unsigned int rNum;    // recv: Number of reads using rBufSz
+    unsigned int rNumCnt; // recv: Current number of reads (so far)
+    size_t       rCtrlSz; // Read control buffer size
+    size_t       wCtrlSz; // Write control buffer size
+    BOOLEAN_T    iow;     // Inform On (counter) Wrap
+    BOOLEAN_T    dbg;
+
+    /* +++ Close stuff +++ */
+    ErlNifMutex*  closeMtx;
+    ErlNifPid     closerPid;
+    ESockMonitor  closerMon;
+    ErlNifEnv*    closeEnv;
+    ERL_NIF_TERM  closeRef;
+    BOOLEAN_T     closeLocal;
+
+} ESockDescriptor;
+
+
+/* Global stuff.
+ */
+typedef struct {
+    /* These are for debugging, testing and the like */
+    // ERL_NIF_TERM version;
+    // ERL_NIF_TERM buildDate;
+    BOOLEAN_T    dbg;
+
+    BOOLEAN_T    iow; // Where do we send this? Subscription?
+    ErlNifMutex* cntMtx;
+    Uint32       numSockets;
+    Uint32       numTypeStreams;
+    Uint32       numTypeDGrams;
+    Uint32       numTypeSeqPkgs;
+    Uint32       numDomainInet;
+    Uint32       numDomainInet6;
+    Uint32       numDomainLocal;
+    Uint32       numProtoIP;
+    Uint32       numProtoTCP;
+    Uint32       numProtoUDP;
+    Uint32       numProtoSCTP;
+} ESockData;
+
+
+/* ----------------------------------------------------------------------
+ *  F o r w a r d s
+ * ----------------------------------------------------------------------
+ */
+
+
+extern char* erl_errno_id(int error); /* THIS IS JUST TEMPORARY??? */
+
+
+/* All the nif "callback" functions for the socket API has
+ * the exact same API:
+ *
+ * nif_<funcname>(ErlNifEnv*         env,
+ *                int                argc,
+ *                const ERL_NIF_TERM argv[]);
+ *
+ * So, to simplify, use some macro magic to define those.
+ *
+ * These are the functions making up the "official" API.
+ * Basically, these functions does some preliminary checks and argument
+ * extractions and then call the functions called 'n<funcname>', which 
+ * does the actual work. Except for the info function.
+ *
+ * nif_info
+ * nif_command
+ * nif_supports
+ * nif_open
+ * nif_bind
+ * nif_connect
+ * nif_listen
+ * nif_accept
+ * nif_send
+ * nif_sendto
+ * nif_sendmsg
+ * nif_recv
+ * nif_recvfrom
+ * nif_recvmsg
+ * nif_close
+ * nif_shutdown
+ * nif_setopt
+ * nif_getopt
+ * nif_sockname
+ * nif_peername
+ * nif_finalize_connection
+ * nif_finalize_close
+ * nif_cancel
+ */
+
+#define ESOCK_NIF_FUNCS                             \
+    ESOCK_NIF_FUNC_DEF(info);                       \
+    ESOCK_NIF_FUNC_DEF(command);                    \
+    ESOCK_NIF_FUNC_DEF(supports);                   \
+    ESOCK_NIF_FUNC_DEF(open);                       \
+    ESOCK_NIF_FUNC_DEF(bind);                       \
+    ESOCK_NIF_FUNC_DEF(connect);                    \
+    ESOCK_NIF_FUNC_DEF(listen);                     \
+    ESOCK_NIF_FUNC_DEF(accept);                     \
+    ESOCK_NIF_FUNC_DEF(send);                       \
+    ESOCK_NIF_FUNC_DEF(sendto);                     \
+    ESOCK_NIF_FUNC_DEF(sendmsg);                    \
+    ESOCK_NIF_FUNC_DEF(recv);                       \
+    ESOCK_NIF_FUNC_DEF(recvfrom);                   \
+    ESOCK_NIF_FUNC_DEF(recvmsg);                    \
+    ESOCK_NIF_FUNC_DEF(close);                      \
+    ESOCK_NIF_FUNC_DEF(shutdown);                   \
+    ESOCK_NIF_FUNC_DEF(setopt);                     \
+    ESOCK_NIF_FUNC_DEF(getopt);                     \
+    ESOCK_NIF_FUNC_DEF(sockname);                   \
+    ESOCK_NIF_FUNC_DEF(peername);                   \
+    ESOCK_NIF_FUNC_DEF(finalize_connection);        \
+    ESOCK_NIF_FUNC_DEF(finalize_close);             \
+    ESOCK_NIF_FUNC_DEF(cancel);
+
+#define ESOCK_NIF_FUNC_DEF(F)                              \
+    static ERL_NIF_TERM nif_##F(ErlNifEnv*         env,    \
+                                int                argc,   \
+                                const ERL_NIF_TERM argv[]);
+ESOCK_NIF_FUNCS
+#undef ESOCK_NIF_FUNC_DEF
+
+
+#if !defined(__WIN32__)
+
+/* And here comes the functions that does the actual work (for the most part) */
+
+static BOOLEAN_T ecommand2command(ErlNifEnv*    env,
+                                  ERL_NIF_TERM  ecommand,
+                                  Uint16*       command,
+                                  ERL_NIF_TERM* edata);
+static ERL_NIF_TERM esock_command(ErlNifEnv*   env,
+                                  Uint16       cmd,
+                                  ERL_NIF_TERM ecdata);
+static ERL_NIF_TERM esock_command_debug(ErlNifEnv* env, ERL_NIF_TERM ecdata);
+
+static ERL_NIF_TERM esock_global_info(ErlNifEnv* env);
+static ERL_NIF_TERM esock_socket_info(ErlNifEnv*       env,
+                                      ESockDescriptor* descP);
+static ERL_NIF_TERM esock_socket_info_counters(ErlNifEnv*       env,
+                                               ESockDescriptor* descP);
+#define ESOCK_SOCKET_INFO_REQ_FUNCS              \
+    ESOCK_SOCKET_INFO_REQ_FUNC_DEF(readers);     \
+    ESOCK_SOCKET_INFO_REQ_FUNC_DEF(writers);     \
+    ESOCK_SOCKET_INFO_REQ_FUNC_DEF(acceptors);
+
+#define ESOCK_SOCKET_INFO_REQ_FUNC_DEF(F)                               \
+    static ERL_NIF_TERM esock_socket_info_##F(ErlNifEnv*         env,   \
+                                              ESockDescriptor*   descP);
+ESOCK_SOCKET_INFO_REQ_FUNCS
+#undef ESOCK_SOCKET_INFO_REQ_FUNC_DEF
+
+static ERL_NIF_TERM socket_info_reqs(ErlNifEnv*         env,
+                                     ESockDescriptor*   descP,
+                                     ErlNifMutex*       mtx,
+                                     ESockRequestor*    crp,
+                                     ESockRequestQueue* q);
+
+static ERL_NIF_TERM esock_supports(ErlNifEnv* env, int key);
+static ERL_NIF_TERM esock_supports_options(ErlNifEnv* env);
+static ERL_NIF_TERM esock_supports_options_socket(ErlNifEnv* env);
+static ERL_NIF_TERM esock_supports_options_ip(ErlNifEnv* env);
+static ERL_NIF_TERM esock_supports_options_ipv6(ErlNifEnv* env);
+static ERL_NIF_TERM esock_supports_options_tcp(ErlNifEnv* env);
+static ERL_NIF_TERM esock_supports_options_udp(ErlNifEnv* env);
+static ERL_NIF_TERM esock_supports_options_sctp(ErlNifEnv* env);
+static ERL_NIF_TERM esock_supports_sctp(ErlNifEnv* env);
+static ERL_NIF_TERM esock_supports_ipv6(ErlNifEnv* env);
+static ERL_NIF_TERM esock_supports_local(ErlNifEnv* env);
+
+static ERL_NIF_TERM esock_open(ErlNifEnv* env,
+                          int        domain,
+                          int        type,
+                          int        protocol,
+                          char*      netns);
+static BOOLEAN_T esock_open_which_protocol(SOCKET sock, int* proto);
+
+static ERL_NIF_TERM esock_bind(ErlNifEnv*       env,
+                               ESockDescriptor* descP,
+                               ESockAddress*    sockAddrP,
+                               unsigned int     addrLen);
+static ERL_NIF_TERM esock_connect(ErlNifEnv*       env,
+                                  ESockDescriptor* descP,
+                                  ERL_NIF_TERM     sockRef);
+static ERL_NIF_TERM esock_listen(ErlNifEnv*       env,
+                                 ESockDescriptor* descP,
+                                 int              backlog);
+static ERL_NIF_TERM esock_accept(ErlNifEnv*       env,
+                                 ESockDescriptor* descP,
+                                 ERL_NIF_TERM     sockRef,
+                                 ERL_NIF_TERM     ref);
+static ERL_NIF_TERM esock_accept_listening(ErlNifEnv*       env,
+                                           ESockDescriptor* descP,
+                                           ERL_NIF_TERM     sockRef,
+                                           ERL_NIF_TERM     ref);
+static ERL_NIF_TERM esock_accept_listening_error(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP,
+                                                 ERL_NIF_TERM     sockRef,
+                                                 ERL_NIF_TERM     accRef,
+                                                 ErlNifPid        caller,
+                                                 int              save_errno);
+static ERL_NIF_TERM esock_accept_listening_accept(ErlNifEnv*       env,
+                                                  ESockDescriptor* descP,
+                                                  SOCKET           accSock,
+                                                  ErlNifPid        caller,
+                                                  ESockAddress*    remote);
+static ERL_NIF_TERM esock_accept_accepting(ErlNifEnv*       env,
+                                           ESockDescriptor* descP,
+                                           ERL_NIF_TERM     sockRef,
+                                           ERL_NIF_TERM     ref);
+static ERL_NIF_TERM esock_accept_accepting_current(ErlNifEnv*       env,
+                                                   ESockDescriptor* descP,
+                                                   ERL_NIF_TERM     sockRef,
+                                                   ERL_NIF_TERM     ref);
+static ERL_NIF_TERM esock_accept_accepting_current_accept(ErlNifEnv*       env,
+                                                          ESockDescriptor* descP,
+                                                          ERL_NIF_TERM     sockRef,
+                                                          SOCKET           accSock,
+                                                          ESockAddress*    remote);
+static ERL_NIF_TERM esock_accept_accepting_current_error(ErlNifEnv*       env,
+                                                         ESockDescriptor* descP,
+                                                         ERL_NIF_TERM     sockRef,
+                                                         ERL_NIF_TERM     opRef,
+                                                         int              save_errno);
+static ERL_NIF_TERM esock_accept_accepting_other(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP,
+                                                 ERL_NIF_TERM     ref,
+                                                 ErlNifPid        caller);
+static ERL_NIF_TERM esock_accept_busy_retry(ErlNifEnv*       env,
+                                            ESockDescriptor* descP,
+                                            ERL_NIF_TERM     sockRef,
+                                            ERL_NIF_TERM     accRef,
+                                            ErlNifPid*       pid,
+                                            unsigned int     nextState);
+static BOOLEAN_T esock_accept_accepted(ErlNifEnv*       env,
+                                       ESockDescriptor* descP,
+                                       SOCKET           accSock,
+                                       ErlNifPid        pid,
+                                       ESockAddress*    remote,
+                                       ERL_NIF_TERM*    result);
+static ERL_NIF_TERM esock_send(ErlNifEnv*       env,
+                               ESockDescriptor* descP,
+                               ERL_NIF_TERM     sockRef,
+                               ERL_NIF_TERM     sendRef,
+                               ErlNifBinary*    dataP,
+                               int              flags);
+static ERL_NIF_TERM esock_sendto(ErlNifEnv*       env,
+                                 ESockDescriptor* descP,
+                                 ERL_NIF_TERM     sockRef,
+                                 ERL_NIF_TERM     sendRef,
+                                 ErlNifBinary*    dataP,
+                                 int              flags,
+                                 ESockAddress*    toAddrP,
+                                 unsigned int     toAddrLen);
+static ERL_NIF_TERM esock_sendmsg(ErlNifEnv*       env,
+                                  ESockDescriptor* descP,
+                                  ERL_NIF_TERM     sockRef,
+                                  ERL_NIF_TERM     sendRef,
+                                  ERL_NIF_TERM     eMsgHdr,
+                                  int              flags);
+static ERL_NIF_TERM esock_recv(ErlNifEnv*       env,
+                               ESockDescriptor* descP,
+                               ERL_NIF_TERM     sendRef,
+                               ERL_NIF_TERM     recvRef,
+                               int              len,
+                               int              flags);
+static ERL_NIF_TERM esock_recvfrom(ErlNifEnv*       env,
+                                   ESockDescriptor* descP,
+                                   ERL_NIF_TERM     sockRef,
+                                   ERL_NIF_TERM     recvRef,
+                                   Uint16           bufSz,
+                                   int              flags);
+static ERL_NIF_TERM esock_recvmsg(ErlNifEnv*       env,
+                                  ESockDescriptor* descP,
+                                  ERL_NIF_TERM     sockRef,
+                                  ERL_NIF_TERM     recvRef,
+                                  Uint16           bufLen,
+                                  Uint16           ctrlLen,
+                                  int              flags);
+static ERL_NIF_TERM esock_close(ErlNifEnv*       env,
+                                ESockDescriptor* descP);
+static BOOLEAN_T esock_close_check(ErlNifEnv*       env,
+                                   ESockDescriptor* descP,
+                                   ERL_NIF_TERM*    reason);
+static ERL_NIF_TERM esock_close_do(ErlNifEnv*       env,
+                                   ESockDescriptor* descP);
+static ERL_NIF_TERM esock_shutdown(ErlNifEnv*       env,
+                                   ESockDescriptor* descP,
+                                   int              how);
+static ERL_NIF_TERM esock_setopt(ErlNifEnv*       env,
+                                 ESockDescriptor* descP,
+                                 BOOLEAN_T        isEncoded,
+                                 BOOLEAN_T        isOTP,
+                                 int              level,
+                                 int              eOpt,
+                                 ERL_NIF_TERM     eVal);
+
+/* Set OTP level options */
+static ERL_NIF_TERM esock_setopt_otp(ErlNifEnv*       env,
+                                     ESockDescriptor* descP,
+                                     int              eOpt,
+                                     ERL_NIF_TERM     eVal);
+/* *** esock_setopt_otp_debug      ***
+ * *** esock_setopt_otp_iow        ***
+ * *** esock_setopt_otp_ctrl_proc  ***
+ * *** esock_setopt_otp_rcvbuf     ***
+ * *** esock_setopt_otp_rcvctrlbuf ***
+ * *** esock_setopt_otp_sndctrlbuf ***
+ */
+#define ESOCK_SETOPT_OTP_FUNCS             \
+    ESOCK_SETOPT_OTP_FUNC_DEF(debug);      \
+    ESOCK_SETOPT_OTP_FUNC_DEF(iow);        \
+    ESOCK_SETOPT_OTP_FUNC_DEF(ctrl_proc);  \
+    ESOCK_SETOPT_OTP_FUNC_DEF(rcvbuf);     \
+    ESOCK_SETOPT_OTP_FUNC_DEF(rcvctrlbuf); \
+    ESOCK_SETOPT_OTP_FUNC_DEF(sndctrlbuf);
+#define ESOCK_SETOPT_OTP_FUNC_DEF(F)                                 \
+    static ERL_NIF_TERM esock_setopt_otp_##F(ErlNifEnv*       env,   \
+                                             ESockDescriptor* descP, \
+                                             ERL_NIF_TERM     eVal)
+ESOCK_SETOPT_OTP_FUNCS
+#undef ESOCK_SETOPT_OTP_FUNC_DEF
+
+/* Set native options */
+static ERL_NIF_TERM esock_setopt_native(ErlNifEnv*       env,
+                                        ESockDescriptor* descP,
+                                        int              level,
+                                        int              eOpt,
+                                        ERL_NIF_TERM     eVal);
+static ERL_NIF_TERM esock_setopt_level(ErlNifEnv*       env,
+                                       ESockDescriptor* descP,
+                                       int              level,
+                                       int              eOpt,
+                                       ERL_NIF_TERM     eVal);
+static ERL_NIF_TERM esock_setopt_lvl_socket(ErlNifEnv*       env,
+                                            ESockDescriptor* descP,
+                                            int              eOpt,
+                                            ERL_NIF_TERM     eVal);
+
+
+/* *** Handling set of socket options for level = socket *** */
+
+#if defined(SO_BINDTODEVICE)
+static ERL_NIF_TERM esock_setopt_lvl_sock_bindtodevice(ErlNifEnv*       env,
+                                                       ESockDescriptor* descP,
+                                                       ERL_NIF_TERM     eVal);
+#endif
+#if defined(SO_BROADCAST)
+static ERL_NIF_TERM esock_setopt_lvl_sock_broadcast(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP,
+                                                    ERL_NIF_TERM     eVal);
+#endif
+#if defined(SO_DEBUG)
+static ERL_NIF_TERM esock_setopt_lvl_sock_debug(ErlNifEnv*       env,
+                                                ESockDescriptor* descP,
+                                                ERL_NIF_TERM     eVal);
+#endif
+#if defined(SO_DONTROUTE)
+static ERL_NIF_TERM esock_setopt_lvl_sock_dontroute(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP,
+                                                    ERL_NIF_TERM     eVal);
+#endif
+#if defined(SO_KEEPALIVE)
+static ERL_NIF_TERM esock_setopt_lvl_sock_keepalive(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP,
+                                                    ERL_NIF_TERM     eVal);
+#endif
+#if defined(SO_LINGER)
+static ERL_NIF_TERM esock_setopt_lvl_sock_linger(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP,
+                                                 ERL_NIF_TERM     eVal);
+#endif
+#if defined(SO_OOBINLINE)
+static ERL_NIF_TERM esock_setopt_lvl_sock_oobinline(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP,
+                                                    ERL_NIF_TERM     eVal);
+#endif
+#if defined(SO_PEEK_OFF)
+static ERL_NIF_TERM esock_setopt_lvl_sock_peek_off(ErlNifEnv*       env,
+                                                   ESockDescriptor* descP,
+                                                   ERL_NIF_TERM     eVal);
+#endif
+#if defined(SO_PRIORITY)
+static ERL_NIF_TERM esock_setopt_lvl_sock_priority(ErlNifEnv*       env,
+                                                   ESockDescriptor* descP,
+                                                   ERL_NIF_TERM     eVal);
+#endif
+#if defined(SO_RCVBUF)
+static ERL_NIF_TERM esock_setopt_lvl_sock_rcvbuf(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP,
+                                                 ERL_NIF_TERM     eVal);
+#endif
+#if defined(SO_RCVLOWAT)
+static ERL_NIF_TERM esock_setopt_lvl_sock_rcvlowat(ErlNifEnv*       env,
+                                                   ESockDescriptor* descP,
+                                                   ERL_NIF_TERM     eVal);
+#endif
+#if defined(SO_RCVTIMEO)
+static ERL_NIF_TERM esock_setopt_lvl_sock_rcvtimeo(ErlNifEnv*       env,
+                                                   ESockDescriptor* descP,
+                                                   ERL_NIF_TERM     eVal);
+#endif
+#if defined(SO_REUSEADDR)
+static ERL_NIF_TERM esock_setopt_lvl_sock_reuseaddr(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP,
+                                                    ERL_NIF_TERM     eVal);
+#endif
+#if defined(SO_REUSEPORT)
+static ERL_NIF_TERM esock_setopt_lvl_sock_reuseport(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP,
+                                                    ERL_NIF_TERM     eVal);
+#endif
+#if defined(SO_SNDBUF)
+static ERL_NIF_TERM esock_setopt_lvl_sock_sndbuf(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP,
+                                                 ERL_NIF_TERM     eVal);
+#endif
+#if defined(SO_SNDLOWAT)
+static ERL_NIF_TERM esock_setopt_lvl_sock_sndlowat(ErlNifEnv*       env,
+                                                   ESockDescriptor* descP,
+                                                   ERL_NIF_TERM     eVal);
+#endif
+#if defined(SO_SNDTIMEO)
+static ERL_NIF_TERM esock_setopt_lvl_sock_sndtimeo(ErlNifEnv*       env,
+                                                   ESockDescriptor* descP,
+                                                   ERL_NIF_TERM     eVal);
+#endif
+#if defined(SO_TIMESTAMP)
+static ERL_NIF_TERM esock_setopt_lvl_sock_timestamp(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP,
+                                                    ERL_NIF_TERM     eVal);
+#endif
+static ERL_NIF_TERM esock_setopt_lvl_ip(ErlNifEnv*       env,
+                                        ESockDescriptor* descP,
+                                        int              eOpt,
+                                        ERL_NIF_TERM     eVal);
+
+/* *** Handling set of socket options for level = ip *** */
+#if defined(IP_ADD_MEMBERSHIP)
+static ERL_NIF_TERM esock_setopt_lvl_ip_add_membership(ErlNifEnv*       env,
+                                                       ESockDescriptor* descP,
+                                                       ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_ADD_SOURCE_MEMBERSHIP)
+static ERL_NIF_TERM esock_setopt_lvl_ip_add_source_membership(ErlNifEnv*       env,
+                                                              ESockDescriptor* descP,
+                                                              ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_BLOCK_SOURCE)
+static ERL_NIF_TERM esock_setopt_lvl_ip_block_source(ErlNifEnv*       env,
+                                                     ESockDescriptor* descP,
+                                                     ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_DROP_MEMBERSHIP)
+static ERL_NIF_TERM esock_setopt_lvl_ip_drop_membership(ErlNifEnv*       env,
+                                                        ESockDescriptor* descP,
+                                                        ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_DROP_SOURCE_MEMBERSHIP)
+static ERL_NIF_TERM esock_setopt_lvl_ip_drop_source_membership(ErlNifEnv*       env,
+                                                               ESockDescriptor* descP,
+                                                               ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_FREEBIND)
+static ERL_NIF_TERM esock_setopt_lvl_ip_freebind(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP,
+                                                 ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_HDRINCL)
+static ERL_NIF_TERM esock_setopt_lvl_ip_hdrincl(ErlNifEnv*       env,
+                                                ESockDescriptor* descP,
+                                                ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_MINTTL)
+static ERL_NIF_TERM esock_setopt_lvl_ip_minttl(ErlNifEnv*       env,
+                                               ESockDescriptor* descP,
+                                               ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_MSFILTER) && defined(IP_MSFILTER_SIZE)
+static ERL_NIF_TERM esock_setopt_lvl_ip_msfilter(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP,
+                                                 ERL_NIF_TERM     eVal);
+static BOOLEAN_T decode_ip_msfilter_mode(ErlNifEnv*   env,
+                                         ERL_NIF_TERM eVal,
+                                         Uint32*      mode);
+static ERL_NIF_TERM esock_setopt_lvl_ip_msfilter_set(ErlNifEnv*          env,
+                                                     SOCKET              sock,
+                                                     struct ip_msfilter* msfP,
+                                                     SOCKLEN_T           optLen);
+#endif
+#if defined(IP_MTU_DISCOVER)
+static ERL_NIF_TERM esock_setopt_lvl_ip_mtu_discover(ErlNifEnv*       env,
+                                                     ESockDescriptor* descP,
+                                                     ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_MULTICAST_ALL)
+static ERL_NIF_TERM esock_setopt_lvl_ip_multicast_all(ErlNifEnv*       env,
+                                                      ESockDescriptor* descP,
+                                                      ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_MULTICAST_IF)
+static ERL_NIF_TERM esock_setopt_lvl_ip_multicast_if(ErlNifEnv*       env,
+                                                     ESockDescriptor* descP,
+                                                     ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_MULTICAST_LOOP)
+static ERL_NIF_TERM esock_setopt_lvl_ip_multicast_loop(ErlNifEnv*       env,
+                                                       ESockDescriptor* descP,
+                                                       ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_MULTICAST_TTL)
+static ERL_NIF_TERM esock_setopt_lvl_ip_multicast_ttl(ErlNifEnv*       env,
+                                                      ESockDescriptor* descP,
+                                                      ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_NODEFRAG)
+static ERL_NIF_TERM esock_setopt_lvl_ip_nodefrag(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP,
+                                                 ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_PKTINFO)
+static ERL_NIF_TERM esock_setopt_lvl_ip_pktinfo(ErlNifEnv*       env,
+                                                ESockDescriptor* descP,
+                                                ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_RECVDSTADDR)
+static ERL_NIF_TERM esock_setopt_lvl_ip_recvdstaddr(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP,
+                                                    ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_RECVERR)
+static ERL_NIF_TERM esock_setopt_lvl_ip_recverr(ErlNifEnv*       env,
+                                                ESockDescriptor* descP,
+                                                ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_RECVIF)
+static ERL_NIF_TERM esock_setopt_lvl_ip_recvif(ErlNifEnv*       env,
+                                               ESockDescriptor* descP,
+                                               ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_RECVOPTS)
+static ERL_NIF_TERM esock_setopt_lvl_ip_recvopts(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP,
+                                                 ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_RECVORIGDSTADDR)
+static ERL_NIF_TERM esock_setopt_lvl_ip_recvorigdstaddr(ErlNifEnv*       env,
+                                                        ESockDescriptor* descP,
+                                                        ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_RECVTOS)
+static ERL_NIF_TERM esock_setopt_lvl_ip_recvtos(ErlNifEnv*       env,
+                                                ESockDescriptor* descP,
+                                                ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_RECVTTL)
+static ERL_NIF_TERM esock_setopt_lvl_ip_recvttl(ErlNifEnv*       env,
+                                                ESockDescriptor* descP,
+                                                ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_RETOPTS)
+static ERL_NIF_TERM esock_setopt_lvl_ip_retopts(ErlNifEnv*       env,
+                                                ESockDescriptor* descP,
+                                                ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_ROUTER_ALERT)
+static ERL_NIF_TERM esock_setopt_lvl_ip_router_alert(ErlNifEnv*       env,
+                                                     ESockDescriptor* descP,
+                                                     ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_SENDSRCADDR)
+static ERL_NIF_TERM esock_setopt_lvl_ip_sendsrcaddr(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP,
+                                                    ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_TOS)
+static ERL_NIF_TERM esock_setopt_lvl_ip_tos(ErlNifEnv*       env,
+                                            ESockDescriptor* descP,
+                                            ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_TRANSPARENT)
+static ERL_NIF_TERM esock_setopt_lvl_ip_transparent(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP,
+                                                    ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_TTL)
+static ERL_NIF_TERM esock_setopt_lvl_ip_ttl(ErlNifEnv*       env,
+                                            ESockDescriptor* descP,
+                                            ERL_NIF_TERM     eVal);
+#endif
+#if defined(IP_UNBLOCK_SOURCE)
+static ERL_NIF_TERM esock_setopt_lvl_ip_unblock_source(ErlNifEnv*       env,
+                                                       ESockDescriptor* descP,
+                                                       ERL_NIF_TERM     eVal);
+#endif
+
+#if defined(IP_DROP_MEMBERSHIP) || defined(IP_ADD_MEMBERSHIP)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_update_membership(ErlNifEnv*       env,
+                                                   ESockDescriptor* descP,
+                                                   ERL_NIF_TERM     eVal,
+                                                   int              opt);
+#endif
+#if defined(IP_ADD_SOURCE_MEMBERSHIP) || defined(IP_DROP_SOURCE_MEMBERSHIP) || defined(IP_BLOCK_SOURCE) || defined(IP_UNBLOCK_SOURCE)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_update_source(ErlNifEnv*       env,
+                                               ESockDescriptor* descP,
+                                               ERL_NIF_TERM     eVal,
+                                               int              opt);
+#endif
+
+
+/* *** Handling set of socket options for level = ipv6 *** */
+#if defined(HAVE_IPV6)
+static ERL_NIF_TERM esock_setopt_lvl_ipv6(ErlNifEnv*       env,
+                                          ESockDescriptor* descP,
+                                          int              eOpt,
+                                          ERL_NIF_TERM     eVal);
+#if defined(IPV6_ADDRFORM)
+static ERL_NIF_TERM esock_setopt_lvl_ipv6_addrform(ErlNifEnv*       env,
+                                                   ESockDescriptor* descP,
+                                                   ERL_NIF_TERM     eVal);
+#endif
+#if defined(IPV6_ADD_MEMBERSHIP)
+static ERL_NIF_TERM esock_setopt_lvl_ipv6_add_membership(ErlNifEnv*       env,
+                                                         ESockDescriptor* descP,
+                                                         ERL_NIF_TERM     eVal);
+#endif
+#if defined(IPV6_AUTHHDR)
+static ERL_NIF_TERM esock_setopt_lvl_ipv6_authhdr(ErlNifEnv*       env,
+                                                  ESockDescriptor* descP,
+                                                  ERL_NIF_TERM     eVal);
+#endif
+#if defined(IPV6_DROP_MEMBERSHIP)
+static ERL_NIF_TERM esock_setopt_lvl_ipv6_drop_membership(ErlNifEnv*       env,
+                                                          ESockDescriptor* descP,
+                                                          ERL_NIF_TERM     eVal);
+#endif
+#if defined(IPV6_DSTOPTS)
+static ERL_NIF_TERM esock_setopt_lvl_ipv6_dstopts(ErlNifEnv*       env,
+                                                  ESockDescriptor* descP,
+                                                  ERL_NIF_TERM     eVal);
+#endif
+#if defined(IPV6_FLOWINFO)
+static ERL_NIF_TERM esock_setopt_lvl_ipv6_flowinfo(ErlNifEnv*       env,
+                                                   ESockDescriptor* descP,
+                                                   ERL_NIF_TERM     eVal);
+#endif
+#if defined(IPV6_HOPLIMIT)
+static ERL_NIF_TERM esock_setopt_lvl_ipv6_hoplimit(ErlNifEnv*       env,
+                                                   ESockDescriptor* descP,
+                                                   ERL_NIF_TERM     eVal);
+#endif
+#if defined(IPV6_HOPOPTS)
+static ERL_NIF_TERM esock_setopt_lvl_ipv6_hopopts(ErlNifEnv*       env,
+                                                  ESockDescriptor* descP,
+                                                  ERL_NIF_TERM     eVal);
+#endif
+#if defined(IPV6_MTU)
+static ERL_NIF_TERM esock_setopt_lvl_ipv6_mtu(ErlNifEnv*       env,
+                                              ESockDescriptor* descP,
+                                              ERL_NIF_TERM     eVal);
+#endif
+#if defined(IPV6_MTU_DISCOVER)
+static ERL_NIF_TERM esock_setopt_lvl_ipv6_mtu_discover(ErlNifEnv*       env,
+                                                       ESockDescriptor* descP,
+                                                       ERL_NIF_TERM     eVal);
+#endif
+#if defined(IPV6_MULTICAST_HOPS)
+static ERL_NIF_TERM esock_setopt_lvl_ipv6_multicast_hops(ErlNifEnv*       env,
+                                                         ESockDescriptor* descP,
+                                                         ERL_NIF_TERM     eVal);
+#endif
+#if defined(IPV6_MULTICAST_IF)
+static ERL_NIF_TERM esock_setopt_lvl_ipv6_multicast_if(ErlNifEnv*       env,
+                                                       ESockDescriptor* descP,
+                                                       ERL_NIF_TERM     eVal);
+#endif
+#if defined(IPV6_MULTICAST_LOOP)
+static ERL_NIF_TERM esock_setopt_lvl_ipv6_multicast_loop(ErlNifEnv*       env,
+                                                         ESockDescriptor* descP,
+                                                         ERL_NIF_TERM     eVal);
+#endif
+#if defined(IPV6_RECVERR)
+static ERL_NIF_TERM esock_setopt_lvl_ipv6_recverr(ErlNifEnv*       env,
+                                                  ESockDescriptor* descP,
+                                                  ERL_NIF_TERM     eVal);
+#endif
+#if defined(IPV6_RECVPKTINFO) || defined(IPV6_PKTINFO)
+static ERL_NIF_TERM esock_setopt_lvl_ipv6_recvpktinfo(ErlNifEnv*       env,
+                                                      ESockDescriptor* descP,
+                                                      ERL_NIF_TERM     eVal);
+#endif
+#if defined(IPV6_ROUTER_ALERT)
+static ERL_NIF_TERM esock_setopt_lvl_ipv6_router_alert(ErlNifEnv*       env,
+                                                       ESockDescriptor* descP,
+                                                       ERL_NIF_TERM     eVal);
+#endif
+#if defined(IPV6_RTHDR)
+static ERL_NIF_TERM esock_setopt_lvl_ipv6_rthdr(ErlNifEnv*       env,
+                                                ESockDescriptor* descP,
+                                                ERL_NIF_TERM     eVal);
+#endif
+#if defined(IPV6_UNICAST_HOPS)
+static ERL_NIF_TERM esock_setopt_lvl_ipv6_unicast_hops(ErlNifEnv*       env,
+                                                       ESockDescriptor* descP,
+                                                       ERL_NIF_TERM     eVal);
+#endif
+#if defined(IPV6_V6ONLY)
+static ERL_NIF_TERM esock_setopt_lvl_ipv6_v6only(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP,
+                                                 ERL_NIF_TERM     eVal);
+#endif
+
+#if defined(IPV6_ADD_MEMBERSHIP) || defined(IPV6_DROP_MEMBERSHIP)
+static ERL_NIF_TERM esock_setopt_lvl_ipv6_update_membership(ErlNifEnv*       env,
+                                                            ESockDescriptor* descP,
+                                                            ERL_NIF_TERM     eVal,
+                                                            int              opt);
+#endif
+
+#endif // defined(HAVE_IPV6)
+static ERL_NIF_TERM esock_setopt_lvl_tcp(ErlNifEnv*       env,
+                                         ESockDescriptor* descP,
+                                         int              eOpt,
+                                         ERL_NIF_TERM     eVal);
+#if defined(TCP_CONGESTION)
+static ERL_NIF_TERM esock_setopt_lvl_tcp_congestion(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP,
+                                                    ERL_NIF_TERM     eVal);
+#endif
+#if defined(TCP_MAXSEG)
+static ERL_NIF_TERM esock_setopt_lvl_tcp_maxseg(ErlNifEnv*       env,
+                                                ESockDescriptor* descP,
+                                                ERL_NIF_TERM     eVal);
+#endif
+#if defined(TCP_NODELAY)
+static ERL_NIF_TERM esock_setopt_lvl_tcp_nodelay(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP,
+                                                 ERL_NIF_TERM     eVal);
+#endif
+static ERL_NIF_TERM esock_setopt_lvl_udp(ErlNifEnv*       env,
+                                         ESockDescriptor* descP,
+                                         int              eOpt,
+                                         ERL_NIF_TERM     eVal);
+#if defined(UDP_CORK)
+static ERL_NIF_TERM esock_setopt_lvl_udp_cork(ErlNifEnv*       env,
+                                              ESockDescriptor* descP,
+                                              ERL_NIF_TERM     eVal);
+#endif
+#if defined(HAVE_SCTP)
+static ERL_NIF_TERM esock_setopt_lvl_sctp(ErlNifEnv*       env,
+                                          ESockDescriptor* descP,
+                                          int              eOpt,
+                                          ERL_NIF_TERM     eVal);
+#if defined(SCTP_ASSOCINFO)
+static ERL_NIF_TERM esock_setopt_lvl_sctp_associnfo(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP,
+                                                    ERL_NIF_TERM     eVal);
+#endif
+#if defined(SCTP_AUTOCLOSE)
+static ERL_NIF_TERM esock_setopt_lvl_sctp_autoclose(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP,
+                                                    ERL_NIF_TERM     eVal);
+#endif
+#if defined(SCTP_DISABLE_FRAGMENTS)
+static ERL_NIF_TERM esock_setopt_lvl_sctp_disable_fragments(ErlNifEnv*       env,
+                                                            ESockDescriptor* descP,
+                                                            ERL_NIF_TERM     eVal);
+#endif
+#if defined(SCTP_EVENTS)
+static ERL_NIF_TERM esock_setopt_lvl_sctp_events(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP,
+                                                 ERL_NIF_TERM     eVal);
+#endif
+#if defined(SCTP_INITMSG)
+static ERL_NIF_TERM esock_setopt_lvl_sctp_initmsg(ErlNifEnv*       env,
+                                                  ESockDescriptor* descP,
+                                                  ERL_NIF_TERM     eVal);
+#endif
+#if defined(SCTP_MAXSEG)
+static ERL_NIF_TERM esock_setopt_lvl_sctp_maxseg(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP,
+                                                 ERL_NIF_TERM     eVal);
+#endif
+#if defined(SCTP_NODELAY)
+static ERL_NIF_TERM esock_setopt_lvl_sctp_nodelay(ErlNifEnv*       env,
+                                                  ESockDescriptor* descP,
+                                                  ERL_NIF_TERM     eVal);
+#endif
+#if defined(SCTP_RTOINFO)
+static ERL_NIF_TERM esock_setopt_lvl_sctp_rtoinfo(ErlNifEnv*       env,
+                                                  ESockDescriptor* descP,
+                                                  ERL_NIF_TERM     eVal);
+#endif
+#endif // defined(HAVE_SCTP)
+
+static ERL_NIF_TERM esock_getopt(ErlNifEnv*       env,
+                                 ESockDescriptor* descP,
+                                 BOOLEAN_T        isEncoded,
+                                 BOOLEAN_T        isOTP,
+                                 int              level,
+                                 ERL_NIF_TERM     eOpt);
+
+static ERL_NIF_TERM esock_getopt_otp(ErlNifEnv*       env,
+                                     ESockDescriptor* descP,
+                                     int              eOpt);
+/* *** esock_getopt_otp_debug      ***
+ * *** esock_getopt_otp_iow        ***
+ * *** esock_getopt_otp_ctrl_proc  ***
+ * *** esock_getopt_otp_rcvbuf     ***
+ * *** esock_getopt_otp_rcvctrlbuf ***
+ * *** esock_getopt_otp_sndctrlbuf ***
+ * *** esock_getopt_otp_fd         ***
+ * *** esock_getopt_otp_domain     ***
+ * *** esock_getopt_otp_type       ***
+ * *** esock_getopt_otp_protocol   ***
+ */
+#define ESOCK_GETOPT_OTP_FUNCS             \
+    ESOCK_GETOPT_OTP_FUNC_DEF(debug);      \
+    ESOCK_GETOPT_OTP_FUNC_DEF(iow);        \
+    ESOCK_GETOPT_OTP_FUNC_DEF(ctrl_proc);  \
+    ESOCK_GETOPT_OTP_FUNC_DEF(rcvbuf);     \
+    ESOCK_GETOPT_OTP_FUNC_DEF(rcvctrlbuf); \
+    ESOCK_GETOPT_OTP_FUNC_DEF(sndctrlbuf); \
+    ESOCK_GETOPT_OTP_FUNC_DEF(fd);         \
+    ESOCK_GETOPT_OTP_FUNC_DEF(domain);     \
+    ESOCK_GETOPT_OTP_FUNC_DEF(type);       \
+    ESOCK_GETOPT_OTP_FUNC_DEF(protocol);
+#define ESOCK_GETOPT_OTP_FUNC_DEF(F)                               \
+    static ERL_NIF_TERM esock_getopt_otp_##F(ErlNifEnv*        env, \
+                                             ESockDescriptor* descP)
+ESOCK_GETOPT_OTP_FUNCS
+#undef ESOCK_GETOPT_OTP_FUNC_DEF
+
+static ERL_NIF_TERM esock_getopt_native(ErlNifEnv*       env,
+                                        ESockDescriptor* descP,
+                                        int              level,
+                                        ERL_NIF_TERM     eOpt);
+static ERL_NIF_TERM esock_getopt_native_unspec(ErlNifEnv*       env,
+                                               ESockDescriptor* descP,
+                                               int              level,
+                                               int              opt,
+                                               SOCKOPTLEN_T     valueSz);
+static ERL_NIF_TERM esock_getopt_level(ErlNifEnv*       env,
+                                       ESockDescriptor* descP,
+                                       int              level,
+                                       int              eOpt);
+static ERL_NIF_TERM esock_getopt_lvl_socket(ErlNifEnv*       env,
+                                            ESockDescriptor* descP,
+                                            int              eOpt);
+#if defined(SO_ACCEPTCONN)
+static ERL_NIF_TERM esock_getopt_lvl_sock_acceptconn(ErlNifEnv*       env,
+                                                     ESockDescriptor* descP);
+#endif
+#if defined(SO_BINDTODEVICE)
+static ERL_NIF_TERM esock_getopt_lvl_sock_bindtodevice(ErlNifEnv*       env,
+                                                       ESockDescriptor* descP);
+#endif
+#if defined(SO_BROADCAST)
+static ERL_NIF_TERM esock_getopt_lvl_sock_broadcast(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP);
+#endif
+#if defined(SO_DEBUG)
+static ERL_NIF_TERM esock_getopt_lvl_sock_debug(ErlNifEnv*       env,
+                                                ESockDescriptor* descP);
+#endif
+#if defined(SO_DOMAIN)
+static ERL_NIF_TERM esock_getopt_lvl_sock_domain(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP);
+#endif
+#if defined(SO_DONTROUTE)
+static ERL_NIF_TERM esock_getopt_lvl_sock_dontroute(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP);
+#endif
+#if defined(SO_KEEPALIVE)
+static ERL_NIF_TERM esock_getopt_lvl_sock_keepalive(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP);
+#endif
+#if defined(SO_LINGER)
+static ERL_NIF_TERM esock_getopt_lvl_sock_linger(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP);
+#endif
+#if defined(SO_OOBINLINE)
+static ERL_NIF_TERM esock_getopt_lvl_sock_oobinline(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP);
+#endif
+#if defined(SO_PEEK_OFF)
+static ERL_NIF_TERM esock_getopt_lvl_sock_peek_off(ErlNifEnv*       env,
+                                                   ESockDescriptor* descP);
+#endif
+#if defined(SO_PRIORITY)
+static ERL_NIF_TERM esock_getopt_lvl_sock_priority(ErlNifEnv*       env,
+                                                   ESockDescriptor* descP);
+#endif
+#if defined(SO_PROTOCOL)
+static ERL_NIF_TERM esock_getopt_lvl_sock_protocol(ErlNifEnv*       env,
+                                                   ESockDescriptor* descP);
+#endif
+#if defined(SO_RCVBUF)
+static ERL_NIF_TERM esock_getopt_lvl_sock_rcvbuf(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP);
+#endif
+#if defined(SO_RCVLOWAT)
+static ERL_NIF_TERM esock_getopt_lvl_sock_rcvlowat(ErlNifEnv*       env,
+                                                   ESockDescriptor* descP);
+#endif
+#if defined(SO_RCVTIMEO)
+static ERL_NIF_TERM esock_getopt_lvl_sock_rcvtimeo(ErlNifEnv*       env,
+                                                   ESockDescriptor* descP);
+#endif
+#if defined(SO_REUSEADDR)
+static ERL_NIF_TERM esock_getopt_lvl_sock_reuseaddr(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP);
+#endif
+#if defined(SO_REUSEPORT)
+static ERL_NIF_TERM esock_getopt_lvl_sock_reuseport(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP);
+#endif
+#if defined(SO_SNDBUF)
+static ERL_NIF_TERM esock_getopt_lvl_sock_sndbuf(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP);
+#endif
+#if defined(SO_SNDLOWAT)
+static ERL_NIF_TERM esock_getopt_lvl_sock_sndlowat(ErlNifEnv*       env,
+                                                   ESockDescriptor* descP);
+#endif
+#if defined(SO_SNDTIMEO)
+static ERL_NIF_TERM esock_getopt_lvl_sock_sndtimeo(ErlNifEnv*       env,
+                                                   ESockDescriptor* descP);
+#endif
+#if defined(SO_TIMESTAMP)
+static ERL_NIF_TERM esock_getopt_lvl_sock_timestamp(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP);
+#endif
+#if defined(SO_TYPE)
+static ERL_NIF_TERM esock_getopt_lvl_sock_type(ErlNifEnv*       env,
+                                               ESockDescriptor* descP);
+#endif
+static ERL_NIF_TERM esock_getopt_lvl_ip(ErlNifEnv*       env,
+                                        ESockDescriptor* descP,
+                                        int              eOpt);
+#if defined(IP_FREEBIND)
+static ERL_NIF_TERM esock_getopt_lvl_ip_freebind(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP);
+#endif
+#if defined(IP_HDRINCL)
+static ERL_NIF_TERM esock_getopt_lvl_ip_hdrincl(ErlNifEnv*       env,
+                                                ESockDescriptor* descP);
+#endif
+#if defined(IP_MINTTL)
+static ERL_NIF_TERM esock_getopt_lvl_ip_minttl(ErlNifEnv*       env,
+                                               ESockDescriptor* descP);
+#endif
+#if defined(IP_MTU)
+static ERL_NIF_TERM esock_getopt_lvl_ip_mtu(ErlNifEnv*       env,
+                                            ESockDescriptor* descP);
+#endif
+#if defined(IP_MTU_DISCOVER)
+static ERL_NIF_TERM esock_getopt_lvl_ip_mtu_discover(ErlNifEnv*       env,
+                                                     ESockDescriptor* descP);
+#endif
+#if defined(IP_MULTICAST_ALL)
+static ERL_NIF_TERM esock_getopt_lvl_ip_multicast_all(ErlNifEnv*       env,
+                                                      ESockDescriptor* descP);
+#endif
+#if defined(IP_MULTICAST_IF)
+static ERL_NIF_TERM esock_getopt_lvl_ip_multicast_if(ErlNifEnv*       env,
+                                                     ESockDescriptor* descP);
+#endif
+#if defined(IP_MULTICAST_LOOP)
+static ERL_NIF_TERM esock_getopt_lvl_ip_multicast_loop(ErlNifEnv*       env,
+                                                       ESockDescriptor* descP);
+#endif
+#if defined(IP_MULTICAST_TTL)
+static ERL_NIF_TERM esock_getopt_lvl_ip_multicast_ttl(ErlNifEnv*       env,
+                                                      ESockDescriptor* descP);
+#endif
+#if defined(IP_NODEFRAG)
+static ERL_NIF_TERM esock_getopt_lvl_ip_nodefrag(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP);
+#endif
+#if defined(IP_PKTINFO)
+static ERL_NIF_TERM esock_getopt_lvl_ip_pktinfo(ErlNifEnv*       env,
+                                                ESockDescriptor* descP);
+#endif
+#if defined(IP_RECVDSTADDR)
+static ERL_NIF_TERM esock_getopt_lvl_ip_recvdstaddr(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP);
+#endif
+#if defined(IP_RECVERR)
+static ERL_NIF_TERM esock_getopt_lvl_ip_recverr(ErlNifEnv*       env,
+                                                ESockDescriptor* descP);
+#endif
+#if defined(IP_RECVIF)
+static ERL_NIF_TERM esock_getopt_lvl_ip_recvif(ErlNifEnv*       env,
+                                               ESockDescriptor* descP);
+#endif
+#if defined(IP_RECVOPTS)
+static ERL_NIF_TERM esock_getopt_lvl_ip_recvopts(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP);
+#endif
+#if defined(IP_RECVORIGDSTADDR)
+static ERL_NIF_TERM esock_getopt_lvl_ip_recvorigdstaddr(ErlNifEnv*       env,
+                                                        ESockDescriptor* descP);
+#endif
+#if defined(IP_RECVTOS)
+static ERL_NIF_TERM esock_getopt_lvl_ip_recvtos(ErlNifEnv*       env,
+                                                ESockDescriptor* descP);
+#endif
+#if defined(IP_RECVTTL)
+static ERL_NIF_TERM esock_getopt_lvl_ip_recvttl(ErlNifEnv*       env,
+                                                ESockDescriptor* descP);
+#endif
+#if defined(IP_RETOPTS)
+static ERL_NIF_TERM esock_getopt_lvl_ip_retopts(ErlNifEnv*       env,
+                                                ESockDescriptor* descP);
+#endif
+#if defined(IP_ROUTER_ALERT)
+static ERL_NIF_TERM esock_getopt_lvl_ip_router_alert(ErlNifEnv*       env,
+                                                     ESockDescriptor* descP);
+#endif
+#if defined(IP_SENDSRCADDR)
+static ERL_NIF_TERM esock_getopt_lvl_ip_sendsrcaddr(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP);
+#endif
+#if defined(IP_TOS)
+static ERL_NIF_TERM esock_getopt_lvl_ip_tos(ErlNifEnv*       env,
+                                            ESockDescriptor* descP);
+#endif
+#if defined(IP_TRANSPARENT)
+static ERL_NIF_TERM esock_getopt_lvl_ip_transparent(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP);
+#endif
+#if defined(IP_TTL)
+static ERL_NIF_TERM esock_getopt_lvl_ip_ttl(ErlNifEnv*       env,
+                                            ESockDescriptor* descP);
+#endif
+#if defined(HAVE_IPV6)
+static ERL_NIF_TERM esock_getopt_lvl_ipv6(ErlNifEnv*       env,
+                                          ESockDescriptor* descP,
+                                          int              eOpt);
+#if defined(IPV6_AUTHHDR)
+static ERL_NIF_TERM esock_getopt_lvl_ipv6_authhdr(ErlNifEnv*       env,
+                                                  ESockDescriptor* descP);
+#endif
+#if defined(IPV6_DSTOPTS)
+static ERL_NIF_TERM esock_getopt_lvl_ipv6_dstopts(ErlNifEnv*       env,
+                                                  ESockDescriptor* descP);
+#endif
+#if defined(IPV6_FLOWINFO)
+static ERL_NIF_TERM esock_getopt_lvl_ipv6_flowinfo(ErlNifEnv*       env,
+                                                   ESockDescriptor* descP);
+#endif
+#if defined(IPV6_HOPLIMIT)
+static ERL_NIF_TERM esock_getopt_lvl_ipv6_hoplimit(ErlNifEnv*       env,
+                                                   ESockDescriptor* descP);
+#endif
+#if defined(IPV6_HOPOPTS)
+static ERL_NIF_TERM esock_getopt_lvl_ipv6_hopopts(ErlNifEnv*       env,
+                                                  ESockDescriptor* descP);
+#endif
+#if defined(IPV6_MTU)
+static ERL_NIF_TERM esock_getopt_lvl_ipv6_mtu(ErlNifEnv*       env,
+                                              ESockDescriptor* descP);
+#endif
+#if defined(IPV6_MTU_DISCOVER)
+static ERL_NIF_TERM esock_getopt_lvl_ipv6_mtu_discover(ErlNifEnv*       env,
+                                                       ESockDescriptor* descP);
+#endif
+#if defined(IPV6_MULTICAST_HOPS)
+static ERL_NIF_TERM esock_getopt_lvl_ipv6_multicast_hops(ErlNifEnv*       env,
+                                                         ESockDescriptor* descP);
+#endif
+#if defined(IPV6_MULTICAST_IF)
+static ERL_NIF_TERM esock_getopt_lvl_ipv6_multicast_if(ErlNifEnv*       env,
+                                                       ESockDescriptor* descP);
+#endif
+#if defined(IPV6_MULTICAST_LOOP)
+static ERL_NIF_TERM esock_getopt_lvl_ipv6_multicast_loop(ErlNifEnv*       env,
+                                                         ESockDescriptor* descP);
+#endif
+#if defined(IPV6_RECVERR)
+static ERL_NIF_TERM esock_getopt_lvl_ipv6_recverr(ErlNifEnv*       env,
+                                                  ESockDescriptor* descP);
+#endif
+#if defined(IPV6_RECVPKTINFO) || defined(IPV6_PKTINFO)
+static ERL_NIF_TERM esock_getopt_lvl_ipv6_recvpktinfo(ErlNifEnv*       env,
+                                                      ESockDescriptor* descP);
+#endif
+#if defined(IPV6_ROUTER_ALERT)
+static ERL_NIF_TERM esock_getopt_lvl_ipv6_router_alert(ErlNifEnv*       env,
+                                                       ESockDescriptor* descP);
+#endif
+#if defined(IPV6_RTHDR)
+static ERL_NIF_TERM esock_getopt_lvl_ipv6_rthdr(ErlNifEnv*       env,
+                                                ESockDescriptor* descP);
+#endif
+#if defined(IPV6_UNICAST_HOPS)
+static ERL_NIF_TERM esock_getopt_lvl_ipv6_unicast_hops(ErlNifEnv*       env,
+                                                       ESockDescriptor* descP);
+#endif
+#if defined(IPV6_V6ONLY)
+static ERL_NIF_TERM esock_getopt_lvl_ipv6_v6only(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP);
+#endif
+
+#endif // defined(HAVE_IPV6)
+
+static ERL_NIF_TERM esock_getopt_lvl_tcp(ErlNifEnv*       env,
+                                         ESockDescriptor* descP,
+                                         int              eOpt);
+#if defined(TCP_CONGESTION)
+static ERL_NIF_TERM esock_getopt_lvl_tcp_congestion(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP);
+#endif
+#if defined(TCP_MAXSEG)
+static ERL_NIF_TERM esock_getopt_lvl_tcp_maxseg(ErlNifEnv*       env,
+                                                ESockDescriptor* descP);
+#endif
+#if defined(TCP_NODELAY)
+static ERL_NIF_TERM esock_getopt_lvl_tcp_nodelay(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP);
+#endif
+static ERL_NIF_TERM esock_getopt_lvl_udp(ErlNifEnv*       env,
+                                         ESockDescriptor* descP,
+                                         int              eOpt);
+#if defined(UDP_CORK)
+static ERL_NIF_TERM esock_getopt_lvl_udp_cork(ErlNifEnv*       env,
+                                              ESockDescriptor* descP);
+#endif
+#if defined(HAVE_SCTP)
+static ERL_NIF_TERM esock_getopt_lvl_sctp(ErlNifEnv*       env,
+                                          ESockDescriptor* descP,
+                                          int              eOpt);
+#if defined(SCTP_ASSOCINFO)
+static ERL_NIF_TERM esock_getopt_lvl_sctp_associnfo(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP);
+#endif
+#if defined(SCTP_AUTOCLOSE)
+static ERL_NIF_TERM esock_getopt_lvl_sctp_autoclose(ErlNifEnv*       env,
+                                                    ESockDescriptor* descP);
+#endif
+#if defined(SCTP_DISABLE_FRAGMENTS)
+static ERL_NIF_TERM esock_getopt_lvl_sctp_disable_fragments(ErlNifEnv*       env,
+                                                            ESockDescriptor* descP);
+#endif
+#if defined(SCTP_MAXSEG)
+static ERL_NIF_TERM esock_getopt_lvl_sctp_maxseg(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP);
+#endif
+#if defined(SCTP_INITMSG)
+static ERL_NIF_TERM esock_getopt_lvl_sctp_initmsg(ErlNifEnv*       env,
+                                                  ESockDescriptor* descP);
+#endif
+#if defined(SCTP_NODELAY)
+static ERL_NIF_TERM esock_getopt_lvl_sctp_nodelay(ErlNifEnv*       env,
+                                                  ESockDescriptor* descP);
+#endif
+#if defined(SCTP_RTOINFO)
+static ERL_NIF_TERM esock_getopt_lvl_sctp_rtoinfo(ErlNifEnv*       env,
+                                                  ESockDescriptor* descP);
+#endif
+#endif // defined(HAVE_SCTP)
+static ERL_NIF_TERM esock_sockname(ErlNifEnv*       env,
+                                   ESockDescriptor* descP);
+static ERL_NIF_TERM esock_peername(ErlNifEnv*       env,
+                                   ESockDescriptor* descP);
+static ERL_NIF_TERM esock_cancel(ErlNifEnv*       env,
+                                 ESockDescriptor* descP,
+                                 ERL_NIF_TERM     op,
+                                 ERL_NIF_TERM     sockRef,
+                                 ERL_NIF_TERM     opRef);
+static ERL_NIF_TERM esock_cancel_connect(ErlNifEnv*       env,
+                                         ESockDescriptor* descP,
+                                         ERL_NIF_TERM     opRef);
+static ERL_NIF_TERM esock_cancel_accept(ErlNifEnv*       env,
+                                        ESockDescriptor* descP,
+                                        ERL_NIF_TERM     sockRef,
+                                        ERL_NIF_TERM     opRef);
+static ERL_NIF_TERM esock_cancel_accept_current(ErlNifEnv*       env,
+                                                ESockDescriptor* descP,
+                                                ERL_NIF_TERM     sockRef);
+static ERL_NIF_TERM esock_cancel_accept_waiting(ErlNifEnv*       env,
+                                                ESockDescriptor* descP,
+                                                ERL_NIF_TERM     opRef);
+static ERL_NIF_TERM esock_cancel_send(ErlNifEnv*       env,
+                                      ESockDescriptor* descP,
+                                      ERL_NIF_TERM     sockRef,
+                                      ERL_NIF_TERM     opRef);
+static ERL_NIF_TERM esock_cancel_send_current(ErlNifEnv*       env,
+                                              ESockDescriptor* descP,
+                                              ERL_NIF_TERM     sockRef);
+static ERL_NIF_TERM esock_cancel_send_waiting(ErlNifEnv*       env,
+                                              ESockDescriptor* descP,
+                                              ERL_NIF_TERM     opRef);
+static ERL_NIF_TERM esock_cancel_recv(ErlNifEnv*       env,
+                                      ESockDescriptor* descP,
+                                      ERL_NIF_TERM     sockRef,
+                                      ERL_NIF_TERM     opRef);
+static ERL_NIF_TERM esock_cancel_recv_current(ErlNifEnv*       env,
+                                              ESockDescriptor* descP,
+                                              ERL_NIF_TERM     sockRef);
+static ERL_NIF_TERM esock_cancel_recv_waiting(ErlNifEnv*       env,
+                                              ESockDescriptor* descP,
+                                              ERL_NIF_TERM     opRef);
+static ERL_NIF_TERM esock_cancel_read_select(ErlNifEnv*       env,
+                                             ESockDescriptor* descP,
+                                             ERL_NIF_TERM     opRef);
+static ERL_NIF_TERM esock_cancel_write_select(ErlNifEnv*       env,
+                                              ESockDescriptor* descP,
+                                              ERL_NIF_TERM     opRef);
+static ERL_NIF_TERM esock_cancel_mode_select(ErlNifEnv*       env,
+                                             ESockDescriptor* descP,
+                                             ERL_NIF_TERM     opRef,
+                                             int              smode,
+                                             int              rmode);
+
+#if defined(USE_SETOPT_STR_OPT)
+static ERL_NIF_TERM esock_setopt_str_opt(ErlNifEnv*       env,
+                                         ESockDescriptor* descP,
+                                         int              level,
+                                         int              opt,
+                                         int              max,
+                                         ERL_NIF_TERM     eVal);
+#endif
+static ERL_NIF_TERM esock_setopt_bool_opt(ErlNifEnv*       env,
+                                          ESockDescriptor* descP,
+                                          int              level,
+                                          int              opt,
+                                          ERL_NIF_TERM     eVal);
+static ERL_NIF_TERM esock_setopt_int_opt(ErlNifEnv*       env,
+                                         ESockDescriptor* descP,
+                                         int              level,
+                                         int              opt,
+                                         ERL_NIF_TERM     eVal);
+static ERL_NIF_TERM esock_setopt_timeval_opt(ErlNifEnv*       env,
+                                             ESockDescriptor* descP,
+                                             int              level,
+                                             int              opt,
+                                             ERL_NIF_TERM     eVal);
+
+#if defined(USE_GETOPT_STR_OPT)
+static ERL_NIF_TERM esock_getopt_str_opt(ErlNifEnv*       env,
+                                         ESockDescriptor* descP,
+                                         int              level,
+                                         int              opt,
+                                         int              max);
+#endif
+static ERL_NIF_TERM esock_getopt_bool_opt(ErlNifEnv*       env,
+                                          ESockDescriptor* descP,
+                                          int              level,
+                                          int              opt);
+static ERL_NIF_TERM esock_getopt_int_opt(ErlNifEnv*       env,
+                                         ESockDescriptor* descP,
+                                         int              level,
+                                         int              opt);
+static ERL_NIF_TERM esock_getopt_timeval_opt(ErlNifEnv*       env,
+                                             ESockDescriptor* descP,
+                                             int              level,
+                                             int              opt);
+
+static BOOLEAN_T send_check_writer(ErlNifEnv*       env,
+                                   ESockDescriptor* descP,
+                                   ERL_NIF_TERM     ref,
+                                   ERL_NIF_TERM*    checkResult);
+static ERL_NIF_TERM send_check_result(ErlNifEnv*       env,
+                                      ESockDescriptor* descP,
+                                      ssize_t          written,
+                                      ssize_t          dataSize,
+                                      int              saveErrno,
+                                      ERL_NIF_TERM     sockRef,
+                                      ERL_NIF_TERM     sendRef);
+static ERL_NIF_TERM send_check_ok(ErlNifEnv*       env,
+                                  ESockDescriptor* descP,
+                                  ssize_t          written,
+                                  ssize_t          dataSize,
+                                  ERL_NIF_TERM     sockRef);
+static ERL_NIF_TERM send_check_fail(ErlNifEnv*       env,
+                                    ESockDescriptor* descP,
+                                    int              saveErrno,
+                                    ERL_NIF_TERM     sockRef);
+static ERL_NIF_TERM send_check_retry(ErlNifEnv*       env,
+                                     ESockDescriptor* descP,
+                                     ssize_t          written,
+                                     ERL_NIF_TERM     sockRef,
+                                     ERL_NIF_TERM     sendRef);
+static BOOLEAN_T recv_check_reader(ErlNifEnv*       env,
+                                   ESockDescriptor* descP,
+                                   ERL_NIF_TERM     ref,
+                                   ERL_NIF_TERM*    checkResult);
+static char* recv_init_current_reader(ErlNifEnv*       env,
+                                      ESockDescriptor* descP,
+                                      ERL_NIF_TERM     ref);
+static ERL_NIF_TERM recv_update_current_reader(ErlNifEnv*       env,
+                                               ESockDescriptor* descP,
+                                               ERL_NIF_TERM     sockRef);
+static void recv_error_current_reader(ErlNifEnv*       env,
+                                      ESockDescriptor* descP,
+                                      ERL_NIF_TERM     sockRef,
+                                      ERL_NIF_TERM     reason);
+static ERL_NIF_TERM recv_check_result(ErlNifEnv*       env,
+                                      ESockDescriptor* descP,
+                                      int              read,
+                                      int              toRead,
+                                      int              saveErrno,
+                                      ErlNifBinary*    bufP,
+                                      ERL_NIF_TERM     sockRef,
+                                      ERL_NIF_TERM     recvRef);
+static ERL_NIF_TERM recv_check_full(ErlNifEnv*       env,
+                                    ESockDescriptor* descP,
+                                    int              read,
+                                    int              toRead,
+                                    ErlNifBinary*    bufP,
+                                    ERL_NIF_TERM     sockRef,
+                                    ERL_NIF_TERM     recvRef);
+static ERL_NIF_TERM recv_check_full_maybe_done(ErlNifEnv*       env,
+                                               ESockDescriptor* descP,
+                                               int              read,
+                                               int              toRead,
+                                               ErlNifBinary*    bufP,
+                                               ERL_NIF_TERM     sockRef,
+                                               ERL_NIF_TERM     recvRef);
+static ERL_NIF_TERM recv_check_full_done(ErlNifEnv*       env,
+                                         ESockDescriptor* descP,
+                                         int              read,
+                                         ErlNifBinary*    bufP,
+                                         ERL_NIF_TERM     sockRef);
+static ERL_NIF_TERM recv_check_fail(ErlNifEnv*       env,
+                                    ESockDescriptor* descP,
+                                    int              saveErrno,
+                                    ErlNifBinary*    buf1P,
+                                    ErlNifBinary*    buf2P,
+                                    ERL_NIF_TERM     sockRef,
+                                    ERL_NIF_TERM     recvRef);
+static ERL_NIF_TERM recv_check_fail_closed(ErlNifEnv*       env,
+                                           ESockDescriptor* descP,
+                                           ERL_NIF_TERM     sockRef,
+                                           ERL_NIF_TERM     recvRef);
+static ERL_NIF_TERM recv_check_partial(ErlNifEnv*       env,
+                                       ESockDescriptor* descP,
+                                       int              read,
+                                       int              toRead,
+                                       ErlNifBinary*    bufP,
+                                       ERL_NIF_TERM     sockRef,
+                                       ERL_NIF_TERM     recvRef);
+static ERL_NIF_TERM recv_check_partial_done(ErlNifEnv*       env,
+                                            ESockDescriptor* descP,
+                                            int              read,
+                                            ErlNifBinary*    bufP,
+                                            ERL_NIF_TERM     sockRef);
+static ERL_NIF_TERM recv_check_partial_part(ErlNifEnv*       env,
+                                            ESockDescriptor* descP,
+                                            int              read,
+                                            ErlNifBinary*    bufP,
+                                            ERL_NIF_TERM     sockRef,
+                                            ERL_NIF_TERM     recvRef);
+static ERL_NIF_TERM recv_check_retry(ErlNifEnv*       env,
+                                     ESockDescriptor* descP,
+                                     ERL_NIF_TERM     sockRef,
+                                     ERL_NIF_TERM     recvRef);
+static ERL_NIF_TERM recv_check_fail_gen(ErlNifEnv*       env,
+                                        ESockDescriptor* descP,
+                                        int              saveErrno,
+                                        ERL_NIF_TERM     sockRef);
+static ERL_NIF_TERM recvfrom_check_result(ErlNifEnv*       env,
+                                          ESockDescriptor* descP,
+                                          int              read,
+                                          int              saveErrno,
+                                          ErlNifBinary*    bufP,
+                                          ESockAddress*    fromAddrP,
+                                          unsigned int     fromAddrLen,
+                                          ERL_NIF_TERM     sockRef,
+                                          ERL_NIF_TERM     recvRef);
+static ERL_NIF_TERM recvmsg_check_result(ErlNifEnv*       env,
+                                         ESockDescriptor* descP,
+                                         int              read,
+                                         int              saveErrno,
+                                         struct msghdr*   msgHdrP,
+                                         ErlNifBinary*    dataBufP,
+                                         ErlNifBinary*    ctrlBufP,
+                                         ERL_NIF_TERM     sockRef,
+                                         ERL_NIF_TERM     recvRef);
+static ERL_NIF_TERM recvmsg_check_msg(ErlNifEnv*       env,
+                                      ESockDescriptor* descP,
+                                      int              read,
+                                      struct msghdr*   msgHdrP,
+                                      ErlNifBinary*    dataBufP,
+                                      ErlNifBinary*    ctrlBufP,
+                                      ERL_NIF_TERM     sockRef);
+
+static ERL_NIF_TERM esock_finalize_connection(ErlNifEnv*       env,
+                                              ESockDescriptor* descP);
+static ERL_NIF_TERM esock_finalize_close(ErlNifEnv*       env,
+                                         ESockDescriptor* descP);
+
+extern char* encode_msghdr(ErlNifEnv*       env,
+                           ESockDescriptor* descP,
+                           int              read,
+                           struct msghdr*   msgHdrP,
+                           ErlNifBinary*    dataBufP,
+                           ErlNifBinary*    ctrlBufP,
+                           ERL_NIF_TERM*    eSockAddr);
+extern char* encode_cmsghdrs(ErlNifEnv*       env,
+                             ESockDescriptor* descP,
+                             ErlNifBinary*    cmsgBinP,
+                             struct msghdr*   msgHdrP,
+                             ERL_NIF_TERM*    eCMsgHdr);
+extern char* decode_cmsghdrs(ErlNifEnv*       env,
+                             ESockDescriptor* descP,
+                             ERL_NIF_TERM     eCMsgHdr,
+                             char*            cmsgHdrBufP,
+                             size_t           cmsgHdrBufLen,
+                             size_t*          cmsgHdrBufUsed);
+extern char* decode_cmsghdr(ErlNifEnv*       env,
+                            ESockDescriptor* descP,
+                            ERL_NIF_TERM     eCMsgHdr,
+                            char*            bufP,
+                            size_t           rem,
+                            size_t*          used);
+static char* encode_cmsghdr_level(ErlNifEnv*    env,
+                                  int           level,
+                                  ERL_NIF_TERM* eLevel);
+static char* decode_cmsghdr_level(ErlNifEnv*   env,
+                                  ERL_NIF_TERM eLevel,
+                                  int*         level);
+static char* encode_cmsghdr_type(ErlNifEnv*    env,
+                                 int           level,
+                                 int           type,
+                                 ERL_NIF_TERM* eType);
+static char* decode_cmsghdr_type(ErlNifEnv*   env,
+                                 int          level,
+                                 ERL_NIF_TERM eType,
+                                 int*         type);
+static char* encode_cmsghdr_data(ErlNifEnv*     env,
+                                 ERL_NIF_TERM   ctrlBuf,
+                                 int            level,
+                                 int            type,
+                                 unsigned char* dataP,
+                                 size_t         dataPos,
+                                 size_t         dataLen,
+                                 ERL_NIF_TERM*  eCMsgHdrData);
+static char* encode_cmsghdr_data_socket(ErlNifEnv*     env,
+                                        ERL_NIF_TERM   ctrlBuf,
+                                        int            type,
+                                        unsigned char* dataP,
+                                        size_t         dataPos,
+                                        size_t         dataLen,
+                                        ERL_NIF_TERM*  eCMsgHdrData);
+static char* encode_cmsghdr_data_ip(ErlNifEnv*     env,
+                                    ERL_NIF_TERM   ctrlBuf,
+                                    int            type,
+                                    unsigned char* dataP,
+                                    size_t         dataPos,
+                                    size_t         dataLen,
+                                    ERL_NIF_TERM*  eCMsgHdrData);
+#if defined(HAVE_IPV6)
+static char* encode_cmsghdr_data_ipv6(ErlNifEnv*     env,
+                                      ERL_NIF_TERM   ctrlBuf,
+                                      int            type,
+                                      unsigned char* dataP,
+                                      size_t         dataPos,
+                                      size_t         dataLen,
+                                      ERL_NIF_TERM*  eCMsgHdrData);
+#endif
+extern char* encode_msghdr_flags(ErlNifEnv*       env,
+                                 ESockDescriptor* descP,
+                                 int              msgFlags,
+                                 ERL_NIF_TERM*    flags);
+static char* decode_cmsghdr_data(ErlNifEnv*       env,
+                                 ESockDescriptor* descP,
+                                 char*            bufP,
+                                 size_t           rem,
+                                 int              level,
+                                 int              type,
+                                 ERL_NIF_TERM     eData,
+                                 size_t*          used);
+static char* decode_cmsghdr_final(ESockDescriptor* descP,
+                                  char*            bufP,
+                                  size_t           rem,
+                                  int              level,
+                                  int              type,
+                                  char*            data,
+                                  int              sz,
+                                  size_t*          used);
+static BOOLEAN_T decode_sock_linger(ErlNifEnv*     env,
+                                    ERL_NIF_TERM   eVal,
+                                    struct linger* valP);
+#if defined(IP_TOS)
+static BOOLEAN_T decode_ip_tos(ErlNifEnv*   env,
+                               ERL_NIF_TERM eVal,
+                               int*         val);
+#endif
+#if defined(IP_MTU_DISCOVER)
+static char* decode_ip_pmtudisc(ErlNifEnv*   env,
+                                ERL_NIF_TERM eVal,
+                                int*         val);
+#endif
+#if defined(IP_MTU_DISCOVER)
+static void encode_ip_pmtudisc(ErlNifEnv*    env,
+                               int           val,
+                               ERL_NIF_TERM* eVal);
+#endif
+#if defined(IPV6_MTU_DISCOVER)
+static char* decode_ipv6_pmtudisc(ErlNifEnv*   env,
+                                  ERL_NIF_TERM eVal,
+                                  int*         val);
+#endif
+#if defined(IPV6_MTU_DISCOVER)
+static void encode_ipv6_pmtudisc(ErlNifEnv*    env,
+                                 int           val,
+                                 ERL_NIF_TERM* eVal);
+#endif
+
+/*
+static BOOLEAN_T decode_bool(ErlNifEnv*   env,
+                             ERL_NIF_TERM eVal,
+                             BOOLEAN_T*   val);
+*/
+static BOOLEAN_T decode_native_get_opt(ErlNifEnv*   env,
+                                       ERL_NIF_TERM eVal,
+                                       int*         opt,
+                                       Uint16*      valueType,
+                                       int*         valueSz);
+// static void encode_bool(BOOLEAN_T val, ERL_NIF_TERM* eVal);
+static ERL_NIF_TERM encode_ip_tos(ErlNifEnv* env, int val);
+
+static void esock_stop_handle_current(ErlNifEnv*       env,
+                                      const char*      role,
+                                      ESockDescriptor* descP,
+                                      ERL_NIF_TERM     sockRef,
+                                      ESockRequestor*  reqP);
+static void inform_waiting_procs(ErlNifEnv*         env,
+                                 const char*        role,
+                                 ESockDescriptor*   descP,
+                                 ERL_NIF_TERM       sockRef,
+                                 ESockRequestQueue* q,
+                                 BOOLEAN_T          free,
+                                 ERL_NIF_TERM       reason);
+
+static int socket_setopt(int             sock,
+                         int             level,
+                         int             opt,
+                         const void*     optVal,
+                         const socklen_t optLen);
+
+static BOOLEAN_T is_connector(ErlNifEnv*       env,
+                              ESockDescriptor* descP);
+static BOOLEAN_T verify_is_connected(ESockDescriptor* descP, int* err);
+
+static ESockDescriptor* alloc_descriptor(SOCKET sock, HANDLE event);
+
+
+static BOOLEAN_T edomain2domain(int edomain, int* domain);
+static BOOLEAN_T etype2type(int etype, int* type);
+static BOOLEAN_T eproto2proto(ErlNifEnv*         env,
+                              const ERL_NIF_TERM eproto,
+                              int*               proto);
+static BOOLEAN_T ehow2how(unsigned int ehow, int* how);
+static BOOLEAN_T esendflags2sendflags(unsigned int esendflags, int* sendflags);
+static BOOLEAN_T erecvflags2recvflags(unsigned int erecvflags, int* recvflags);
+static BOOLEAN_T elevel2level(BOOLEAN_T  isEncoded,
+                              int        eLevel,
+                              BOOLEAN_T* isOTP,
+                              int*       level);
+#ifdef HAVE_SETNS
+static BOOLEAN_T emap2netns(ErlNifEnv* env, ERL_NIF_TERM map, char** netns);
+static BOOLEAN_T change_network_namespace(char* netns, int* cns, int* err);
+static BOOLEAN_T restore_network_namespace(int ns, SOCKET sock, int* err);
+#endif
+
+static BOOLEAN_T cnt_inc(Uint32* cnt, Uint32 inc);
+static void      cnt_dec(Uint32* cnt, Uint32 dec);
+
+static void inc_socket(int domain, int type, int protocol);
+static void dec_socket(int domain, int type, int protocol);
+
+
+
+/* *** activate_next_acceptor ***
+ * *** activate_next_writer   ***
+ * *** activate_next_reader   ***
+ *
+ * All the activate-next functions for acceptor, writer and reader
+ * have exactly the same API, so we apply some macro magic to simplify.
+ * They simply operates on dufferent data structures.
+ *
+ */
+
+#define ACTIVATE_NEXT_FUNCS_DEFS     \
+    ACTIVATE_NEXT_FUNC_DEF(acceptor) \
+    ACTIVATE_NEXT_FUNC_DEF(writer)   \
+    ACTIVATE_NEXT_FUNC_DEF(reader)
+
+#define ACTIVATE_NEXT_FUNC_DEF(F)                                 \
+    static BOOLEAN_T activate_next_##F(ErlNifEnv*       env,      \
+                                       ESockDescriptor* descP,    \
+                                       ERL_NIF_TERM     sockRef);
+ACTIVATE_NEXT_FUNCS_DEFS
+#undef ACTIVATE_NEXT_FUNC_DEF
+    
+/* *** acceptor_search4pid | writer_search4pid | reader_search4pid ***
+ * *** acceptor_push       | writer_push       | reader_push       ***
+ * *** acceptor_pop        | writer_pop        | reader_pop        ***
+ * *** acceptor_unqueue    | writer_unqueue    | reader_unqueue    ***
+ *
+ * All the queue operator functions (search4pid, push, pop
+ * and unqueue) for acceptor, writer and reader has exactly
+ * the same API, so we apply some macro magic to simplify.
+ */
+
+#define ESOCK_OPERATOR_FUNCS_DEFS      \
+    ESOCK_OPERATOR_FUNCS_DEF(acceptor) \
+    ESOCK_OPERATOR_FUNCS_DEF(writer)   \
+    ESOCK_OPERATOR_FUNCS_DEF(reader)
+
+#define ESOCK_OPERATOR_FUNCS_DEF(O)                            \
+    static BOOLEAN_T O##_search4pid(ErlNifEnv*       env,      \
+                                    ESockDescriptor* descP,    \
+                                    ErlNifPid*       pid);     \
+    static ERL_NIF_TERM O##_push(ErlNifEnv*       env,         \
+                                 ESockDescriptor* descP,       \
+                                 ErlNifPid        pid,         \
+                                 ERL_NIF_TERM     ref);        \
+    static BOOLEAN_T O##_pop(ErlNifEnv*       env,             \
+                             ESockDescriptor* descP,           \
+                             ESockRequestor*  reqP);           \
+    static BOOLEAN_T O##_unqueue(ErlNifEnv*       env,         \
+                                 ESockDescriptor* descP,       \
+                                 const ErlNifPid* pid);
+ESOCK_OPERATOR_FUNCS_DEFS
+#undef ESOCK_OPERATOR_FUNCS_DEF
+
+static BOOLEAN_T requestor_pop(ESockRequestQueue* q,
+                               ESockRequestor*    reqP);
+
+static BOOLEAN_T qsearch4pid(ErlNifEnv*         env,
+                             ESockRequestQueue* q,
+                             ErlNifPid*         pid);
+static void qpush(ESockRequestQueue*        q,
+                  ESockRequestQueueElement* e);
+static ESockRequestQueueElement* qpop(ESockRequestQueue* q);
+static BOOLEAN_T qunqueue(ErlNifEnv*         env,
+                          ESockDescriptor*   descP,
+                          const char*        slogan,
+                          ESockRequestQueue* q,
+                          const ErlNifPid*   pid);
+
+static int esock_monitor(const char*      slogan,
+                         ErlNifEnv*       env,
+                         ESockDescriptor* descP,
+                         const ErlNifPid* pid,
+                         ESockMonitor*    mon);
+static int esock_demonitor(const char*      slogan,
+                           ErlNifEnv*       env,
+                           ESockDescriptor* descP,
+                           ESockMonitor*    monP);
+static void esock_monitor_init(ESockMonitor* mon);
+static ERL_NIF_TERM esock_make_monitor_term(ErlNifEnv*          env,
+                                            const ESockMonitor* monP);
+
+
+#endif // if defined(__WIN32__)
+
+/*
+#if defined(HAVE_SYS_UN_H) || defined(SO_BINDTODEVICE)
+static size_t my_strnlen(const char *s, size_t maxlen);
+#endif
+*/
+
+static void esock_dtor(ErlNifEnv* env, void* obj);
+static void esock_stop(ErlNifEnv* env,
+                       void*      obj,
+                       int        fd,
+                       int        is_direct_call);
+static void esock_down(ErlNifEnv*           env,
+                       void*                obj,
+                       const ErlNifPid*     pid,
+                       const ErlNifMonitor* mon);
+
+#if !defined(__WIN32__)
+
+static void esock_down_acceptor(ErlNifEnv*       env,
+                                ESockDescriptor* descP,
+                                ERL_NIF_TERM     sockRef,
+                                const ErlNifPid* pid);
+static void esock_down_writer(ErlNifEnv*       env,
+                              ESockDescriptor* descP,
+                              ERL_NIF_TERM     sockRef,
+                              const ErlNifPid* pid);
+static void esock_down_reader(ErlNifEnv*       env,
+                              ESockDescriptor* descP,
+                              ERL_NIF_TERM     sockRef,
+                              const ErlNifPid* pid);
+
+static char* esock_send_wrap_msg(ErlNifEnv*       env,
+                                 ESockDescriptor* descP,
+                                 ERL_NIF_TERM     sockRef,
+                                 ERL_NIF_TERM     cnt);
+static char* esock_send_close_msg(ErlNifEnv*       env,
+                                  ESockDescriptor* descP,
+                                  ErlNifPid*       pid);
+static char* esock_send_abort_msg(ErlNifEnv*   env,
+                                  ERL_NIF_TERM sockRef,
+                                  ERL_NIF_TERM recvRef,
+                                  ErlNifEnv*   msgEnv,
+                                  ERL_NIF_TERM reason,
+                                  ErlNifPid*   pid);
+static char* esock_send_msg(ErlNifEnv*   env,
+                            ErlNifPid*   pid,
+                            ERL_NIF_TERM msg,
+                            ErlNifEnv*   msgEnv);
+
+static ERL_NIF_TERM mk_abort_msg(ErlNifEnv*   env,
+                                 ERL_NIF_TERM sockRef,
+                                 ERL_NIF_TERM opRef,
+                                 ERL_NIF_TERM reason);
+static ERL_NIF_TERM mk_wrap_msg(ErlNifEnv*   env,
+                                ERL_NIF_TERM sockRef,
+                                ERL_NIF_TERM cnt);
+static ERL_NIF_TERM mk_close_msg(ErlNifEnv*   env,
+                                 ERL_NIF_TERM sockRef,
+                                 ERL_NIF_TERM closeRef);
+static ERL_NIF_TERM mk_select_msg(ErlNifEnv*   env,
+                                  ERL_NIF_TERM sockRef,
+                                  ERL_NIF_TERM selectRef);
+static ERL_NIF_TERM mk_socket_msg(ErlNifEnv*   env,
+                                  ERL_NIF_TERM sockRef,
+                                  ERL_NIF_TERM tag,
+                                  ERL_NIF_TERM info);
+static ERL_NIF_TERM mk_socket(ErlNifEnv*   env,
+                              ERL_NIF_TERM sockRef);
+
+static int esock_select_read(ErlNifEnv*       env,
+                             ErlNifEvent      event,
+                             void*            obj,
+                             const ErlNifPid* pid,
+                             ERL_NIF_TERM     sockRef,
+                             ERL_NIF_TERM     selectRef);
+static int esock_select_write(ErlNifEnv*       env,
+                              ErlNifEvent      event,
+                              void*            obj,
+                              const ErlNifPid* pid,
+                              ERL_NIF_TERM     sockRef,
+                              ERL_NIF_TERM     selectRef);
+static int esock_select_stop(ErlNifEnv*  env,
+                             ErlNifEvent event,
+                             void*       obj);
+static int esock_select_cancel(ErlNifEnv*             env,
+                               ErlNifEvent            event,
+                               enum ErlNifSelectFlags mode,
+                               void*                  obj);
+
+static BOOLEAN_T extract_debug(ErlNifEnv*   env,
+                               ERL_NIF_TERM map);
+static BOOLEAN_T extract_iow(ErlNifEnv*   env,
+                             ERL_NIF_TERM map);
+
+#endif // if defined(__WIN32__)
+
+static int on_load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info);
+
+
+
+#if HAVE_IN6
+#  if ! defined(HAVE_IN6ADDR_ANY) || ! HAVE_IN6ADDR_ANY
+#    if HAVE_DECL_IN6ADDR_ANY_INIT
+static const struct in6_addr in6addr_any = { { IN6ADDR_ANY_INIT } };
+#    else
+static const struct in6_addr in6addr_any =
+    { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } };
+#    endif /* HAVE_IN6ADDR_ANY_INIT */
+#  endif /* ! HAVE_DECL_IN6ADDR_ANY */
+
+#  if ! defined(HAVE_IN6ADDR_LOOPBACK) || ! HAVE_IN6ADDR_LOOPBACK
+#    if HAVE_DECL_IN6ADDR_LOOPBACK_INIT
+static const struct in6_addr in6addr_loopback =
+    { { IN6ADDR_LOOPBACK_INIT } };
+#    else
+static const struct in6_addr in6addr_loopback =
+    { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } };
+#    endif /* HAVE_IN6ADDR_LOOPBACk_INIT */
+#  endif /* ! HAVE_DECL_IN6ADDR_LOOPBACK */
+#endif /* HAVE_IN6 */
+
+
+
+/* (special) error string constants */
+static char str_exmon[]          = "exmonitor";  // failed monitor
+static char str_exself[]         = "exself";     // failed self
+static char str_exsend[]         = "exsend";     // failed send
+
+
+
+/* *** Global atoms *** 
+ * Note that when an (global) atom is added here, it must also be added
+ * in the socket_int.h file!
+ */
+#define GLOBAL_ATOMS                                   \
+    GLOBAL_ATOM_DECL(abort);                           \
+    GLOBAL_ATOM_DECL(accept);                          \
+    GLOBAL_ATOM_DECL(acceptconn);                      \
+    GLOBAL_ATOM_DECL(acceptfilter);                    \
+    GLOBAL_ATOM_DECL(adaption_layer);                  \
+    GLOBAL_ATOM_DECL(addr);                            \
+    GLOBAL_ATOM_DECL(addrform);                        \
+    GLOBAL_ATOM_DECL(add_membership);                  \
+    GLOBAL_ATOM_DECL(add_source_membership);           \
+    GLOBAL_ATOM_DECL(any);                             \
+    GLOBAL_ATOM_DECL(associnfo);                       \
+    GLOBAL_ATOM_DECL(authhdr);                         \
+    GLOBAL_ATOM_DECL(auth_active_key);                 \
+    GLOBAL_ATOM_DECL(auth_asconf);                     \
+    GLOBAL_ATOM_DECL(auth_chunk);                      \
+    GLOBAL_ATOM_DECL(auth_delete_key);                 \
+    GLOBAL_ATOM_DECL(auth_key);                        \
+    GLOBAL_ATOM_DECL(auth_level);                      \
+    GLOBAL_ATOM_DECL(autoclose);                       \
+    GLOBAL_ATOM_DECL(bindtodevice);                    \
+    GLOBAL_ATOM_DECL(block_source);                    \
+    GLOBAL_ATOM_DECL(broadcast);                       \
+    GLOBAL_ATOM_DECL(busy_poll);                       \
+    GLOBAL_ATOM_DECL(checksum);                        \
+    GLOBAL_ATOM_DECL(close);                           \
+    GLOBAL_ATOM_DECL(command);                         \
+    GLOBAL_ATOM_DECL(connect);                         \
+    GLOBAL_ATOM_DECL(congestion);                      \
+    GLOBAL_ATOM_DECL(context);                         \
+    GLOBAL_ATOM_DECL(cork);                            \
+    GLOBAL_ATOM_DECL(credentials);                     \
+    GLOBAL_ATOM_DECL(ctrl);                            \
+    GLOBAL_ATOM_DECL(ctrunc);                          \
+    GLOBAL_ATOM_DECL(data);                            \
+    GLOBAL_ATOM_DECL(debug);                           \
+    GLOBAL_ATOM_DECL(default);                         \
+    GLOBAL_ATOM_DECL(default_send_params);             \
+    GLOBAL_ATOM_DECL(delayed_ack_time);                \
+    GLOBAL_ATOM_DECL(dgram);                           \
+    GLOBAL_ATOM_DECL(disable_fragments);               \
+    GLOBAL_ATOM_DECL(domain);                          \
+    GLOBAL_ATOM_DECL(dontfrag);                        \
+    GLOBAL_ATOM_DECL(dontroute);                       \
+    GLOBAL_ATOM_DECL(drop_membership);                 \
+    GLOBAL_ATOM_DECL(drop_source_membership);          \
+    GLOBAL_ATOM_DECL(dstopts);                         \
+    GLOBAL_ATOM_DECL(eor);                             \
+    GLOBAL_ATOM_DECL(error);                           \
+    GLOBAL_ATOM_DECL(errqueue);                        \
+    GLOBAL_ATOM_DECL(esp_network_level);               \
+    GLOBAL_ATOM_DECL(esp_trans_level);                 \
+    GLOBAL_ATOM_DECL(events);                          \
+    GLOBAL_ATOM_DECL(explicit_eor);                    \
+    GLOBAL_ATOM_DECL(faith);                           \
+    GLOBAL_ATOM_DECL(false);                           \
+    GLOBAL_ATOM_DECL(family);                          \
+    GLOBAL_ATOM_DECL(flags);                           \
+    GLOBAL_ATOM_DECL(flowinfo);                        \
+    GLOBAL_ATOM_DECL(fragment_interleave);             \
+    GLOBAL_ATOM_DECL(freebind);                        \
+    GLOBAL_ATOM_DECL(get_peer_addr_info);              \
+    GLOBAL_ATOM_DECL(hdrincl);                         \
+    GLOBAL_ATOM_DECL(hmac_ident);                      \
+    GLOBAL_ATOM_DECL(hoplimit);                        \
+    GLOBAL_ATOM_DECL(hopopts);                         \
+    GLOBAL_ATOM_DECL(ifindex);                         \
+    GLOBAL_ATOM_DECL(inet);                            \
+    GLOBAL_ATOM_DECL(inet6);                           \
+    GLOBAL_ATOM_DECL(info);                            \
+    GLOBAL_ATOM_DECL(initmsg);                         \
+    GLOBAL_ATOM_DECL(iov);                             \
+    GLOBAL_ATOM_DECL(ip);                              \
+    GLOBAL_ATOM_DECL(ipcomp_level);                    \
+    GLOBAL_ATOM_DECL(ipv6);                            \
+    GLOBAL_ATOM_DECL(i_want_mapped_v4_addr);           \
+    GLOBAL_ATOM_DECL(join_group);                      \
+    GLOBAL_ATOM_DECL(keepalive);                       \
+    GLOBAL_ATOM_DECL(keepcnt);                         \
+    GLOBAL_ATOM_DECL(keepidle);                        \
+    GLOBAL_ATOM_DECL(keepintvl);                       \
+    GLOBAL_ATOM_DECL(leave_group);                     \
+    GLOBAL_ATOM_DECL(level);                           \
+    GLOBAL_ATOM_DECL(linger);                          \
+    GLOBAL_ATOM_DECL(local);                           \
+    GLOBAL_ATOM_DECL(local_auth_chunks);               \
+    GLOBAL_ATOM_DECL(loopback);                        \
+    GLOBAL_ATOM_DECL(lowdelay);                        \
+    GLOBAL_ATOM_DECL(mark);                            \
+    GLOBAL_ATOM_DECL(maxburst);                        \
+    GLOBAL_ATOM_DECL(maxseg);                          \
+    GLOBAL_ATOM_DECL(md5sig);                          \
+    GLOBAL_ATOM_DECL(mincost);                         \
+    GLOBAL_ATOM_DECL(minttl);                          \
+    GLOBAL_ATOM_DECL(msfilter);                        \
+    GLOBAL_ATOM_DECL(mtu);                             \
+    GLOBAL_ATOM_DECL(mtu_discover);                    \
+    GLOBAL_ATOM_DECL(multicast_all);                   \
+    GLOBAL_ATOM_DECL(multicast_hops);                  \
+    GLOBAL_ATOM_DECL(multicast_if);                    \
+    GLOBAL_ATOM_DECL(multicast_loop);                  \
+    GLOBAL_ATOM_DECL(multicast_ttl);                   \
+    GLOBAL_ATOM_DECL(nodelay);                         \
+    GLOBAL_ATOM_DECL(nodefrag);                        \
+    GLOBAL_ATOM_DECL(noopt);                           \
+    GLOBAL_ATOM_DECL(nopush);                          \
+    GLOBAL_ATOM_DECL(not_found);                       \
+    GLOBAL_ATOM_DECL(not_owner);                       \
+    GLOBAL_ATOM_DECL(ok);                              \
+    GLOBAL_ATOM_DECL(oob);                             \
+    GLOBAL_ATOM_DECL(oobinline);                       \
+    GLOBAL_ATOM_DECL(options);                         \
+    GLOBAL_ATOM_DECL(origdstaddr);                     \
+    GLOBAL_ATOM_DECL(partial_delivery_point);          \
+    GLOBAL_ATOM_DECL(passcred);                        \
+    GLOBAL_ATOM_DECL(path);                            \
+    GLOBAL_ATOM_DECL(peekcred);                        \
+    GLOBAL_ATOM_DECL(peek_off);                        \
+    GLOBAL_ATOM_DECL(peer_addr_params);                \
+    GLOBAL_ATOM_DECL(peer_auth_chunks);                \
+    GLOBAL_ATOM_DECL(pktinfo);                         \
+    GLOBAL_ATOM_DECL(pktoptions);                      \
+    GLOBAL_ATOM_DECL(port);                            \
+    GLOBAL_ATOM_DECL(portrange);                       \
+    GLOBAL_ATOM_DECL(primary_addr);                    \
+    GLOBAL_ATOM_DECL(priority);                        \
+    GLOBAL_ATOM_DECL(protocol);                        \
+    GLOBAL_ATOM_DECL(raw);                             \
+    GLOBAL_ATOM_DECL(rcvbuf);                          \
+    GLOBAL_ATOM_DECL(rcvbufforce);                     \
+    GLOBAL_ATOM_DECL(rcvlowat);                        \
+    GLOBAL_ATOM_DECL(rcvtimeo);                        \
+    GLOBAL_ATOM_DECL(rdm);                             \
+    GLOBAL_ATOM_DECL(recv);                            \
+    GLOBAL_ATOM_DECL(recvdstaddr);                     \
+    GLOBAL_ATOM_DECL(recverr);                         \
+    GLOBAL_ATOM_DECL(recvfrom);                        \
+    GLOBAL_ATOM_DECL(recvif);                          \
+    GLOBAL_ATOM_DECL(recvmsg);                         \
+    GLOBAL_ATOM_DECL(recvopts);                        \
+    GLOBAL_ATOM_DECL(recvorigdstaddr);                 \
+    GLOBAL_ATOM_DECL(recvpktinfo);                     \
+    GLOBAL_ATOM_DECL(recvtclass);                      \
+    GLOBAL_ATOM_DECL(recvtos);                         \
+    GLOBAL_ATOM_DECL(recvttl);                         \
+    GLOBAL_ATOM_DECL(reliability);                     \
+    GLOBAL_ATOM_DECL(reset_streams);                   \
+    GLOBAL_ATOM_DECL(retopts);                         \
+    GLOBAL_ATOM_DECL(reuseaddr);                       \
+    GLOBAL_ATOM_DECL(reuseport);                       \
+    GLOBAL_ATOM_DECL(rights);                          \
+    GLOBAL_ATOM_DECL(router_alert);                    \
+    GLOBAL_ATOM_DECL(rthdr);                           \
+    GLOBAL_ATOM_DECL(rtoinfo);                         \
+    GLOBAL_ATOM_DECL(rxq_ovfl);                        \
+    GLOBAL_ATOM_DECL(scope_id);                        \
+    GLOBAL_ATOM_DECL(sctp);                            \
+    GLOBAL_ATOM_DECL(sec);                             \
+    GLOBAL_ATOM_DECL(select_failed);                   \
+    GLOBAL_ATOM_DECL(select_sent);                     \
+    GLOBAL_ATOM_DECL(send);                            \
+    GLOBAL_ATOM_DECL(sendmsg);                         \
+    GLOBAL_ATOM_DECL(sendsrcaddr);                     \
+    GLOBAL_ATOM_DECL(sendto);                          \
+    GLOBAL_ATOM_DECL(seqpacket);                       \
+    GLOBAL_ATOM_DECL(setfib);                          \
+    GLOBAL_ATOM_DECL(set_peer_primary_addr);           \
+    GLOBAL_ATOM_DECL(socket);                          \
+    GLOBAL_ATOM_DECL(sndbuf);                          \
+    GLOBAL_ATOM_DECL(sndbufforce);                     \
+    GLOBAL_ATOM_DECL(sndlowat);                        \
+    GLOBAL_ATOM_DECL(sndtimeo);                        \
+    GLOBAL_ATOM_DECL(spec_dst);                        \
+    GLOBAL_ATOM_DECL(status);                          \
+    GLOBAL_ATOM_DECL(stream);                          \
+    GLOBAL_ATOM_DECL(syncnt);                          \
+    GLOBAL_ATOM_DECL(tclass);                          \
+    GLOBAL_ATOM_DECL(tcp);                             \
+    GLOBAL_ATOM_DECL(throughput);                      \
+    GLOBAL_ATOM_DECL(timestamp);                       \
+    GLOBAL_ATOM_DECL(tos);                             \
+    GLOBAL_ATOM_DECL(transparent);                     \
+    GLOBAL_ATOM_DECL(true);                            \
+    GLOBAL_ATOM_DECL(trunc);                           \
+    GLOBAL_ATOM_DECL(ttl);                             \
+    GLOBAL_ATOM_DECL(type);                            \
+    GLOBAL_ATOM_DECL(udp);                             \
+    GLOBAL_ATOM_DECL(unblock_source);                  \
+    GLOBAL_ATOM_DECL(undefined);                       \
+    GLOBAL_ATOM_DECL(unicast_hops);                    \
+    GLOBAL_ATOM_DECL(unknown);                         \
+    GLOBAL_ATOM_DECL(usec);                            \
+    GLOBAL_ATOM_DECL(user_timeout);                    \
+    GLOBAL_ATOM_DECL(use_ext_recvinfo);                \
+    GLOBAL_ATOM_DECL(use_min_mtu);                     \
+    GLOBAL_ATOM_DECL(v6only);
+
+
+/* *** Global error reason atoms *** */
+#define GLOBAL_ERROR_REASON_ATOMS   \
+    GLOBAL_ATOM_DECL(eagain);       \
+    GLOBAL_ATOM_DECL(eafnosupport); \
+    GLOBAL_ATOM_DECL(einval);
+
+
+#define GLOBAL_ATOM_DECL(A) ERL_NIF_TERM esock_atom_##A
+GLOBAL_ATOMS
+GLOBAL_ERROR_REASON_ATOMS
+#undef GLOBAL_ATOM_DECL
+ERL_NIF_TERM esock_atom_socket_tag; // This has a "special" name ('$socket')
+
+/* *** Local atoms *** */
+#define LOCAL_ATOMS                    \
+    LOCAL_ATOM_DECL(adaptation_layer); \
+    LOCAL_ATOM_DECL(address);          \
+    LOCAL_ATOM_DECL(association);      \
+    LOCAL_ATOM_DECL(assoc_id);         \
+    LOCAL_ATOM_DECL(authentication);   \
+    LOCAL_ATOM_DECL(bool);             \
+    LOCAL_ATOM_DECL(close);            \
+    LOCAL_ATOM_DECL(closed);           \
+    LOCAL_ATOM_DECL(closing);          \
+    LOCAL_ATOM_DECL(cookie_life);      \
+    LOCAL_ATOM_DECL(counter_wrap);     \
+    LOCAL_ATOM_DECL(counters);         \
+    LOCAL_ATOM_DECL(data_in);          \
+    LOCAL_ATOM_DECL(do);               \
+    LOCAL_ATOM_DECL(dont);             \
+    LOCAL_ATOM_DECL(exclude);          \
+    LOCAL_ATOM_DECL(false);            \
+    LOCAL_ATOM_DECL(global_counters);  \
+    LOCAL_ATOM_DECL(in4_sockaddr);     \
+    LOCAL_ATOM_DECL(in6_sockaddr);     \
+    LOCAL_ATOM_DECL(include);          \
+    LOCAL_ATOM_DECL(initial);          \
+    LOCAL_ATOM_DECL(int);              \
+    LOCAL_ATOM_DECL(interface);        \
+    LOCAL_ATOM_DECL(iow);              \
+    LOCAL_ATOM_DECL(local_rwnd);       \
+    LOCAL_ATOM_DECL(max);              \
+    LOCAL_ATOM_DECL(max_attempts);     \
+    LOCAL_ATOM_DECL(max_init_timeo);   \
+    LOCAL_ATOM_DECL(max_instreams);    \
+    LOCAL_ATOM_DECL(max_rxt);          \
+    LOCAL_ATOM_DECL(min);              \
+    LOCAL_ATOM_DECL(mode);             \
+    LOCAL_ATOM_DECL(multiaddr);        \
+    LOCAL_ATOM_DECL(null);             \
+    LOCAL_ATOM_DECL(num_acceptors);    \
+    LOCAL_ATOM_DECL(num_dinet);        \
+    LOCAL_ATOM_DECL(num_dinet6);       \
+    LOCAL_ATOM_DECL(num_dlocal);       \
+    LOCAL_ATOM_DECL(num_outstreams);   \
+    LOCAL_ATOM_DECL(num_peer_dests);   \
+    LOCAL_ATOM_DECL(num_pip);          \
+    LOCAL_ATOM_DECL(num_psctp);        \
+    LOCAL_ATOM_DECL(num_ptcp);         \
+    LOCAL_ATOM_DECL(num_pudp);         \
+    LOCAL_ATOM_DECL(num_readers);      \
+    LOCAL_ATOM_DECL(num_sockets);      \
+    LOCAL_ATOM_DECL(num_tdgrams);      \
+    LOCAL_ATOM_DECL(num_tseqpkgs);     \
+    LOCAL_ATOM_DECL(num_tstreams);     \
+    LOCAL_ATOM_DECL(num_writers);      \
+    LOCAL_ATOM_DECL(partial_delivery); \
+    LOCAL_ATOM_DECL(peer_error);       \
+    LOCAL_ATOM_DECL(peer_rwnd);        \
+    LOCAL_ATOM_DECL(probe);            \
+    LOCAL_ATOM_DECL(read_byte);        \
+    LOCAL_ATOM_DECL(read_fails);       \
+    LOCAL_ATOM_DECL(read_pkg);         \
+    LOCAL_ATOM_DECL(read_tries);       \
+    LOCAL_ATOM_DECL(read_waits);       \
+    LOCAL_ATOM_DECL(select);           \
+    LOCAL_ATOM_DECL(sender_dry);       \
+    LOCAL_ATOM_DECL(send_failure);     \
+    LOCAL_ATOM_DECL(shutdown);         \
+    LOCAL_ATOM_DECL(slist);            \
+    LOCAL_ATOM_DECL(sourceaddr);       \
+    LOCAL_ATOM_DECL(timeout);          \
+    LOCAL_ATOM_DECL(true);             \
+    LOCAL_ATOM_DECL(want);             \
+    LOCAL_ATOM_DECL(write_byte);       \
+    LOCAL_ATOM_DECL(write_fails);      \
+    LOCAL_ATOM_DECL(write_pkg);        \
+    LOCAL_ATOM_DECL(write_tries);      \
+    LOCAL_ATOM_DECL(write_waits);
+
+/* Local error reason atoms */
+#define LOCAL_ERROR_REASON_ATOMS                \
+    LOCAL_ATOM_DECL(eisconn);                   \
+    LOCAL_ATOM_DECL(enotclosing);               \
+    LOCAL_ATOM_DECL(enotconn);                  \
+    LOCAL_ATOM_DECL(exalloc);                   \
+    LOCAL_ATOM_DECL(exbadstate);                \
+    LOCAL_ATOM_DECL(exbusy);                    \
+    LOCAL_ATOM_DECL(exmon);                     \
+    LOCAL_ATOM_DECL(exself);                    \
+    LOCAL_ATOM_DECL(exsend);
+
+#define LOCAL_ATOM_DECL(LA) static ERL_NIF_TERM atom_##LA
+LOCAL_ATOMS
+LOCAL_ERROR_REASON_ATOMS
+#undef LOCAL_ATOM_DECL
+
+
+/* *** Sockets *** */
+static ErlNifResourceType*    esocks;
+static ErlNifResourceTypeInit esockInit = {
+   esock_dtor,
+   esock_stop,
+   (ErlNifResourceDown*) esock_down
+};
+
+// Initiated when the nif is loaded
+static ESockData data;
+
+
+/* These two (inline) functions are primarily intended for debugging,
+ * that is, to make it easy to add debug printouts.
+ */
+static ESOCK_INLINE void esock_free_env(const char* slogan, ErlNifEnv* env)
+{
+    SGDBG( ("SOCKET", "env free - %s: 0x%lX\r\n", slogan, env) );
+    // esock_dbg_printf("SOCK ENV", "free - %s: 0x%lX\r\n", slogan, env);
+
+    if (env != NULL) enif_free_env(env);
+}
+
+
+static ESOCK_INLINE ErlNifEnv* esock_alloc_env(const char* slogan)
+{
+    ErlNifEnv* env = enif_alloc_env();
+
+    SGDBG( ("SOCKET", "env alloc - %s: 0x%lX\r\n", slogan, env) );
+    // esock_dbg_printf("SOCK ENV", "alloc - %s: 0x%lX\r\n", slogan, env);
+
+    return env;
+}
+
+
+/* ----------------------------------------------------------------------
+ *  N I F   F u n c t i o n s
+ * ----------------------------------------------------------------------
+ *
+ * Utility and admin functions:
+ * ----------------------------
+ * nif_info/0
+ * nif_command/1
+ * nif_supports/1
+ *
+ * The "proper" socket functions:
+ * ------------------------------
+ * nif_open(Domain, Type, Protocol, Extra)
+ * nif_bind(Sock, LocalAddr)
+ * nif_connect(Sock, SockAddr)
+ * nif_listen(Sock, Backlog)
+ * nif_accept(LSock, Ref)
+ * nif_send(Sock, SendRef, Data, Flags)
+ * nif_sendto(Sock, SendRef, Data, Dest, Flags)
+ * nif_sendmsg(Sock, SendRef, MsgHdr, Flags)
+ * nif_recv(Sock, RecvRef, Length, Flags)
+ * nif_recvfrom(Sock, RecvRef, BufSz, Flags)
+ * nif_recvmsg(Sock, RecvRef, BufSz, CtrlSz, Flags)
+ * nif_close(Sock)
+ * nif_shutdown(Sock, How)
+ * nif_sockname(Sock)
+ * nif_peername(Sock)
+ *
+ * And some functions to manipulate and retrieve socket options:
+ * -------------------------------------------------------------
+ * nif_setopt/5
+ * nif_getopt/4
+ *
+ * And some utility functions:
+ * -------------------------------------------------------------
+ *
+ * And some socket admin functions:
+ * -------------------------------------------------------------
+ * nif_cancel(Sock, Ref)
+ */
+
+
+/* ----------------------------------------------------------------------
+ * nif_info
+ *
+ * Description:
+ * This is currently just a placeholder...
+ */
+#define MKCT(E, T, C) MKT2((E), (T), MKUI((E), (C)))
+
+static
+ERL_NIF_TERM nif_info(ErlNifEnv*         env,
+                      int                argc,
+                      const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ERL_NIF_TERM info;
+
+    SGDBG( ("SOCKET", "nif_info -> entry with %d args\r\n", argc) );
+    
+    switch (argc) {
+    case 0:
+        info = esock_global_info(env);
+        break;
+
+    case 1:
+        {
+            ESockDescriptor* descP;
+
+            if (!ESOCK_GET_RESOURCE(env, argv[0], (void**) &descP)) {
+                return enif_make_badarg(env);
+            }
+            SSDBG( descP, ("SOCKET", "nif_info -> get socket info\r\n") );
+            info = esock_socket_info(env, descP);
+        }
+        break;
+        
+    default:
+        return enif_make_badarg(env);
+    }
+
+    return info;
+
+#endif
+}
+
+
+/*
+ * This function return a property list containing "global" info.
+ */
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_global_info(ErlNifEnv* env)
+{
+    ERL_NIF_TERM numSockets     = MKCT(env, atom_num_sockets,  data.numSockets);
+    ERL_NIF_TERM numTypeDGrams  = MKCT(env, atom_num_tdgrams,  data.numTypeDGrams);
+    ERL_NIF_TERM numTypeStreams = MKCT(env, atom_num_tstreams, data.numTypeStreams);
+    ERL_NIF_TERM numTypeSeqPkgs = MKCT(env, atom_num_tseqpkgs, data.numTypeSeqPkgs);
+    ERL_NIF_TERM numDomLocal    = MKCT(env, atom_num_dlocal,   data.numDomainLocal);
+    ERL_NIF_TERM numDomInet     = MKCT(env, atom_num_dinet,    data.numDomainInet);
+    ERL_NIF_TERM numDomInet6    = MKCT(env, atom_num_dinet6,   data.numDomainInet6);
+    ERL_NIF_TERM numProtoIP     = MKCT(env, atom_num_pip,      data.numProtoIP);
+    ERL_NIF_TERM numProtoTCP    = MKCT(env, atom_num_ptcp,     data.numProtoTCP);
+    ERL_NIF_TERM numProtoUDP    = MKCT(env, atom_num_pudp,     data.numProtoUDP);
+    ERL_NIF_TERM numProtoSCTP   = MKCT(env, atom_num_psctp,    data.numProtoSCTP);
+    ERL_NIF_TERM gcnt[]  = {numSockets,
+                            numTypeDGrams, numTypeStreams, numTypeSeqPkgs,
+                            numDomLocal, numDomInet, numDomInet6,
+                            numProtoIP, numProtoTCP, numProtoUDP, numProtoSCTP};
+    unsigned int lenGCnt = sizeof(gcnt) / sizeof(ERL_NIF_TERM);
+    ERL_NIF_TERM lgcnt   = MKLA(env, gcnt, lenGCnt);
+    ERL_NIF_TERM keys[]  = {esock_atom_debug, atom_iow, atom_global_counters};
+    ERL_NIF_TERM vals[]  = {BOOL2ATOM(data.dbg), BOOL2ATOM(data.iow), lgcnt};
+    ERL_NIF_TERM info;
+    unsigned int numKeys = sizeof(keys) / sizeof(ERL_NIF_TERM);
+    unsigned int numVals = sizeof(vals) / sizeof(ERL_NIF_TERM);
+
+    ESOCK_ASSERT( (numKeys == numVals) );
+
+    if (!MKMA(env, keys, vals, numKeys, &info))
+        return enif_make_badarg(env);
+
+    return info;
+}
+
+
+
+/*
+ * This function return a property *map*. The properties are: 
+ *    counters:  A list of each socket counter and there current values
+ *    readers:   The number of current and waiting readers
+ *    writers:   The number of current and waiting writers
+ *    acceptors: The number of current and waiting acceptors
+ */
+static
+ERL_NIF_TERM esock_socket_info(ErlNifEnv*       env,
+                               ESockDescriptor* descP)
+{
+    ERL_NIF_TERM counters  = esock_socket_info_counters(env, descP);
+    ERL_NIF_TERM readers   = esock_socket_info_readers(env, descP);
+    ERL_NIF_TERM writers   = esock_socket_info_writers(env, descP);
+    ERL_NIF_TERM acceptors = esock_socket_info_acceptors(env, descP);
+    ERL_NIF_TERM keys[]    = {atom_counters, atom_num_readers,
+                              atom_num_writers, atom_num_acceptors};
+    ERL_NIF_TERM vals[]    = {counters, readers, writers, acceptors};
+    ERL_NIF_TERM info;
+    unsigned int numKeys  = sizeof(keys) / sizeof(ERL_NIF_TERM);
+    unsigned int numVals  = sizeof(vals) / sizeof(ERL_NIF_TERM);
+
+    SSDBG( descP, ("SOCKET", "esock_socket_info -> "
+                   "\r\n   numKeys: %d"
+                   "\r\n   numVals: %d"
+                   "\r\n", numKeys, numVals) );
+
+    ESOCK_ASSERT( (numKeys == numVals) );
+
+    if (!MKMA(env, keys, vals, numKeys, &info))
+        return enif_make_badarg(env);
+
+    SSDBG( descP, ("SOCKET", "esock_socket_info -> done with"
+                   "\r\n   info: %T"
+                   "\r\n", info) );
+
+    return info;
+    
+}
+
+
+/*
+ * Collect all counters for a socket.
+ */
+static
+ERL_NIF_TERM esock_socket_info_counters(ErlNifEnv*       env,
+                                        ESockDescriptor* descP)
+{
+    ERL_NIF_TERM info;
+
+    MLOCK(descP->writeMtx);
+    MLOCK(descP->readMtx);
+
+    {
+        ERL_NIF_TERM readByteCnt  = MKCT(env, atom_read_byte, descP->readByteCnt);
+        ERL_NIF_TERM readFails    = MKCT(env, atom_read_fails, descP->readFails);
+        ERL_NIF_TERM readPkgCnt   = MKCT(env, atom_read_pkg, descP->readPkgCnt);
+        ERL_NIF_TERM readTries    = MKCT(env, atom_read_tries, descP->readTries);
+        ERL_NIF_TERM readWaits    = MKCT(env, atom_read_waits, descP->readWaits);
+        ERL_NIF_TERM writeByteCnt = MKCT(env, atom_write_byte, descP->writeByteCnt);
+        ERL_NIF_TERM writeFails   = MKCT(env, atom_write_fails, descP->writeFails);
+        ERL_NIF_TERM writePkgCnt  = MKCT(env, atom_write_pkg, descP->writePkgCnt);
+        ERL_NIF_TERM writeTries   = MKCT(env, atom_write_tries, descP->writeTries);
+        ERL_NIF_TERM writeWaits   = MKCT(env, atom_write_waits, descP->writeWaits);
+        ERL_NIF_TERM acnt[]       = {readByteCnt, readFails, readPkgCnt,
+                                     readTries, readWaits,
+                                     writeByteCnt, writeFails, writePkgCnt,
+                                     writeTries, writeWaits};
+        unsigned int lenACnt      = sizeof(acnt) / sizeof(ERL_NIF_TERM);
+
+        info = MKLA(env, acnt, lenACnt);
+
+        SSDBG( descP, ("SOCKET", "esock_socket_info_counters -> "
+                       "\r\n   lenACnt: %d"
+                       "\r\n   info:    %T"
+                       "\r\n", lenACnt, info) );
+
+    }
+
+    MUNLOCK(descP->readMtx);
+    MUNLOCK(descP->writeMtx);
+
+    SSDBG( descP, ("SOCKET", "esock_socket_info_counters -> done with"
+                   "\r\n   info: %T"
+                   "\r\n", info) );
+
+    return info;
+}
+#endif
+
+
+/* ----------------------------------------------------------------------
+ * nif_command
+ *
+ * Description:
+ * This function is intended to handle "various" commands. That is,
+ * commands and operations that are not part of the socket API proper.
+ * Currently it handles setting the global debug. Its a map with two
+ * attributes command and (command) data:
+ * #{command :: atom(), data :: term()}
+ *
+ * Command                    Data
+ * debug                      boolean()
+ *
+ */
+
+static
+ERL_NIF_TERM nif_command(ErlNifEnv*         env,
+                         int                argc,
+                         const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ERL_NIF_TERM ecmd, ecdata, result;
+    Uint16       cmd;
+
+    SGDBG( ("SOCKET", "nif_command -> entry with %d args\r\n", argc) );
+
+    if ((argc != 1) ||
+        !IS_MAP(env,  argv[0])) {
+        return enif_make_badarg(env);
+    }
+    ecmd = argv[0];
+
+    SGDBG( ("SOCKET", "nif_command -> "
+            "\r\n   (e) command: %T"
+            "\r\n", ecmd) );
+
+    if (!ecommand2command(env, ecmd, &cmd, &ecdata)) {
+        SGDBG( ("SOCKET", "nif_command -> invalid command\r\n") );
+        return esock_make_error(env, esock_atom_einval);
+    }
+
+    SGDBG( ("SOCKET", "nif_command -> "
+            "\r\n   command:          %d"
+            "\r\n   (e) command data: %T"
+            "\r\n", cmd, ecdata) );
+
+    result = esock_command(env, cmd, ecdata);
+    
+    SGDBG( ("SOCKET", "nif_command -> done with result: "
+           "\r\n   %T"
+           "\r\n", result) );
+
+    return result;
+
+#endif
+}
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_command(ErlNifEnv* env, Uint16 cmd, ERL_NIF_TERM ecdata)
+{
+    ERL_NIF_TERM result;
+
+    SGDBG( ("SOCKET", "esock_command -> entry with 0x%lX\r\n", cmd) );
+
+    switch (cmd) {
+    case ESOCK_CMD_DEBUG:
+        result = esock_command_debug(env, ecdata);
+        break;
+
+    default:
+        result = esock_make_error(env, esock_atom_einval);
+        break;
+    }
+
+    return result;
+}
+
+
+
+static
+ERL_NIF_TERM esock_command_debug(ErlNifEnv* env, ERL_NIF_TERM ecdata)
+{
+    ERL_NIF_TERM result;
+
+    /* The data *should* be a boolean() */
+
+    if (COMPARE(ecdata, esock_atom_true) == 0) {
+        data.dbg = TRUE;
+        result   = esock_atom_ok;
+    } else if (COMPARE(ecdata, esock_atom_false) == 0) {
+        data.dbg = FALSE;
+        result   = esock_atom_ok;
+    } else {
+        SGDBG( ("SOCKET", "esock_command_debug -> invalid debug value: %T\r\n",
+                ecdata) );
+        result = esock_make_error(env, esock_atom_einval);
+    }
+
+    return result;
+}
+#endif
+
+
+/* *** esock_socket_info_readers   ***
+ * *** esock_socket_info_writers   ***
+ * *** esock_socket_info_acceptors ***
+ *
+ * Calculate how many readers | writers | acceptors we have for this socket.
+ * Current requestor + any waiting requestors (of the type).
+ *
+ */
+
+#if !defined(__WIN32__)
+#define ESOCK_INFO_REQ_FUNCS                                                  \
+    ESOCK_INFO_REQ_FUNC_DECL(readers,   readMtx,  currentReaderP,   readersQ) \
+    ESOCK_INFO_REQ_FUNC_DECL(writers,   writeMtx, currentWriterP,   writersQ) \
+    ESOCK_INFO_REQ_FUNC_DECL(acceptors, accMtx,   currentAcceptorP, acceptorsQ)
+
+#define ESOCK_INFO_REQ_FUNC_DECL(F, MTX, CRP, Q)                               \
+    static                                                                      \
+    ERL_NIF_TERM esock_socket_info_##F(ErlNifEnv*       env,                    \
+                                       ESockDescriptor* descP)                  \
+    {                                                                           \
+        return socket_info_reqs(env, descP, descP->MTX, descP->CRP, &descP->Q); \
+    }
+ESOCK_INFO_REQ_FUNCS
+#undef ESOCK_INFO_REQ_FUNC_DECL
+
+
+static
+ERL_NIF_TERM socket_info_reqs(ErlNifEnv*         env,
+                              ESockDescriptor*   descP,
+                              ErlNifMutex*       mtx,
+                              ESockRequestor*    crp,
+                              ESockRequestQueue* q)
+{
+    ESockRequestQueueElement* tmp;
+    ERL_NIF_TERM              info;
+    unsigned int              cnt = 0;
+
+    MLOCK(mtx);
+
+    if (crp != NULL) {
+        // We have an active requestor!
+        cnt++;
+
+        // And add all the waiting requestors
+        tmp = q->first;
+        while (tmp != NULL) {
+            cnt++;
+            tmp = tmp->nextP;
+        }
+    }
+
+    MUNLOCK(mtx);
+
+    info = MKUI(env, cnt);
+
+    SSDBG( descP, ("SOCKET", "socket_info_reqs -> done with"
+                   "\r\n   info: %T"
+                   "\r\n", info) );
+
+    return info;
+}
+#endif
+
+
+/* ----------------------------------------------------------------------
+ * nif_supports
+ *
+ * Description:
+ * This function is intended to answer the question: "Is X supported?"
+ * Currently three keys are "supported": options | sctp | ipv6
+ * That results in a list of all *known options* (known by us) and if
+ * the platform supports (OS) it or not.
+ *
+ * Key
+ * ---
+ * options         [{socket, [{Opt, boolean()}]},
+ *                  {ip,     [{Opt, boolean()}]},
+ *                  {ipv6,   [{Opt, boolean()}]},
+ *                  {tcp,    [{Opt, boolean()}]},
+ *                  {udp,    [{Opt, boolean()}]},
+ *                  {sctp,   [{Opt, boolean()}]}]
+ * sctp            boolean()
+ * ipv6            boolean()
+ * local           boolean()
+ */
+
+static
+ERL_NIF_TERM nif_supports(ErlNifEnv*         env,
+                          int                argc,
+                          const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    int key;
+    
+    SGDBG( ("SOCKET", "nif_supports -> entry with %d args\r\n", argc) );
+    
+    /* Extract arguments and perform preliminary validation */
+
+    if ((argc != 1) ||
+        !GET_INT(env, argv[0], &key)) {
+        return enif_make_badarg(env);
+    }
+
+    return esock_supports(env, key);
+#endif
+}
+
+
+
+/* esock_supports - what features do we support
+ *
+ * This is to prove information about what features actually
+ * work on the current platform.
+ */
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_supports(ErlNifEnv* env, int key)
+{
+    ERL_NIF_TERM result;
+
+    SGDBG( ("SOCKET", "esock_supports -> entry with 0x%lX\r\n", key) );
+
+    switch (key) {
+    case ESOCK_SUPPORTS_OPTIONS:
+        result = esock_supports_options(env);
+        break;
+
+    case ESOCK_SUPPORTS_SCTP:
+        result = esock_supports_sctp(env);
+        break;
+
+    case ESOCK_SUPPORTS_IPV6:
+        result = esock_supports_ipv6(env);
+        break;
+
+    case ESOCK_SUPPORTS_LOCAL:
+        result = esock_supports_local(env);
+        break;
+
+    default:
+        result = esock_atom_false;
+        break;
+    }
+
+    return result;
+}
+#endif
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_supports_options(ErlNifEnv* env)
+{
+    ERL_NIF_TERM sockOpts  = esock_supports_options_socket(env);
+    ERL_NIF_TERM sockOptsT = MKT2(env, esock_atom_socket, sockOpts);
+    ERL_NIF_TERM ipOpts    = esock_supports_options_ip(env);
+    ERL_NIF_TERM ipOptsT   = MKT2(env, esock_atom_ip, ipOpts);
+    ERL_NIF_TERM ipv6Opts  = esock_supports_options_ipv6(env);
+    ERL_NIF_TERM ipv6OptsT = MKT2(env, esock_atom_ipv6, ipv6Opts);
+    ERL_NIF_TERM tcpOpts   = esock_supports_options_tcp(env);
+    ERL_NIF_TERM tcpOptsT  = MKT2(env, esock_atom_tcp, tcpOpts);
+    ERL_NIF_TERM udpOpts   = esock_supports_options_udp(env);
+    ERL_NIF_TERM udpOptsT  = MKT2(env, esock_atom_udp, udpOpts);
+    ERL_NIF_TERM sctpOpts  = esock_supports_options_sctp(env);
+    ERL_NIF_TERM sctpOptsT = MKT2(env, esock_atom_sctp, sctpOpts);
+    ERL_NIF_TERM optsA[]   = {sockOptsT,
+                              ipOptsT, ipv6OptsT,
+                              tcpOptsT, udpOptsT, sctpOptsT};
+    unsigned int lenOptsA  = sizeof(optsA) / sizeof(ERL_NIF_TERM);
+    ERL_NIF_TERM optsL     = MKLA(env, optsA, lenOptsA);
+
+    return optsL;
+}
+#endif
+
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_supports_options_socket(ErlNifEnv* env)
+{
+    SocketTArray opts = TARRAY_CREATE(128);
+    ERL_NIF_TERM tmp, optsL;
+
+
+    /* *** ESOCK_OPT_SOCK_ACCEPTCONN => SO_ACCEPTCONN *** */
+#if defined(SO_ACCEPTCONN)
+    tmp = MKT2(env, esock_atom_acceptconn, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_acceptconn, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_ACCEPTFILTER => SO_ACCEPTFILTER *** */
+    tmp = MKT2(env, esock_atom_acceptfilter, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_BINDTODEVICE => SO_BINDTODEVICE *** */
+#if defined(SO_BINDTODEVICE)
+    tmp = MKT2(env, esock_atom_bindtodevice, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_bindtodevice, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_BROADCAST => SO_BROADCAST *** */
+#if defined(SO_BROADCAST)
+    tmp = MKT2(env, esock_atom_broadcast, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_broadcast, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_BUSY_POLL => SO_BUSY_POLL *** */
+    tmp = MKT2(env, esock_atom_busy_poll, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_DEBUG => SO_DEBUG *** */
+#if defined(SO_DEBUG)
+    tmp = MKT2(env, esock_atom_debug, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_debug, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_DOMAIN => SO_DOMAIN *** */
+#if defined(SO_DOMAIN)
+    tmp = MKT2(env, esock_atom_domain, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_domain, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_DONTROUTE => SO_DONTROUTE *** */
+#if defined(SO_DONTROUTE)
+    tmp = MKT2(env, esock_atom_dontroute, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_dontroute, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_ERROR => SO_ERROR *** */
+    tmp = MKT2(env, esock_atom_error, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_KEEPALIVE => SO_KEEPALIVE *** */
+#if defined(SO_KEEPALIVE)
+    tmp = MKT2(env, esock_atom_keepalive, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_keepalive, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_LINGER => SO_LINGER *** */
+#if defined(SO_LINGER)
+    tmp = MKT2(env, esock_atom_linger, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_linger, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_MARK => SO_MARK *** */
+    tmp = MKT2(env, esock_atom_mark, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_OOBINLINE => SO_OOBINLINE *** */
+#if defined(SO_OOBINLINE)
+    tmp = MKT2(env, esock_atom_oobinline, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_oobinline, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_PASSCRED => SO_PASSCRED *** */
+    tmp = MKT2(env, esock_atom_passcred, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_PEEK_OFF => SO_PEEK_OFF *** */
+#if defined(SO_PEEK_OFF)
+    tmp = MKT2(env, esock_atom_peek_off, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_peek_off, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_PEEKCRED => SO_PEEKCRED *** */
+    tmp = MKT2(env, esock_atom_peekcred, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_PRIORITY => SO_PRIORITY *** */
+#if defined(SO_PRIORITY)
+    tmp = MKT2(env, esock_atom_priority, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_priority, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_PROTOCOL => SO_PROTOCOL *** */
+#if defined(SO_PROTOCOL)
+    tmp = MKT2(env, esock_atom_protocol, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_protocol, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_RCVBUF => SO_RCVBUF *** */
+#if defined(SO_RCVBUF)
+    tmp = MKT2(env, esock_atom_rcvbuf, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_rcvbuf, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_RCVBUFFORCE => SO_RCVBUFFORCE *** */
+    tmp = MKT2(env, esock_atom_rcvbufforce, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_RCVLOWAT => SO_RCVLOWAT *** */
+#if defined(SO_RCVLOWAT)
+    tmp = MKT2(env, esock_atom_rcvlowat, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_rcvlowat, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_RCVTIMEO => SO_RCVTIMEO *** */
+#if defined(SO_RCVTIMEO)
+    tmp = MKT2(env, esock_atom_rcvtimeo, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_rcvtimeo, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_REUSEADDR => SO_REUSEADDR *** */
+#if defined(SO_REUSEADDR)
+    tmp = MKT2(env, esock_atom_reuseaddr, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_reuseaddr, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_REUSEPORT => SO_REUSEPORT *** */
+#if defined(SO_REUSEPORT)
+    tmp = MKT2(env, esock_atom_reuseport, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_reuseport, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_RXQ_OVFL => SO_RXQ_OVFL *** */
+    tmp = MKT2(env, esock_atom_rxq_ovfl, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_SETFIB => SO_SETFIB *** */
+    tmp = MKT2(env, esock_atom_setfib, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_SNDBUF => SO_SNDBUF *** */
+#if defined(SO_SNDBUF)
+    tmp = MKT2(env, esock_atom_sndbuf, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_sndbuf, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_SNDBUFFORCE => SO_SNDBUFFORCE *** */
+    tmp = MKT2(env, esock_atom_sndbufforce, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_SNDLOWAT => SO_SNDLOWAT *** */
+#if defined(SO_SNDLOWAT)
+    tmp = MKT2(env, esock_atom_sndlowat, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_sndlowat, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_SNDTIMEO => SO_SNDTIMEO *** */
+#if defined(SO_SNDTIMEO)
+    tmp = MKT2(env, esock_atom_sndtimeo, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_sndtimeo, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_TIMESTAMP => SO_TIMESTAMP *** */
+#if defined(SO_TIMESTAMP)
+    tmp = MKT2(env, esock_atom_timestamp, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_timestamp, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SOCK_TYPE => SO_TYPE *** */
+#if defined(SO_TYPE)
+    tmp = MKT2(env, esock_atom_type, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_type, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    TARRAY_TOLIST(opts, env, &optsL);
+    
+    return optsL;
+}
+#endif
+
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_supports_options_ip(ErlNifEnv* env)
+{
+    SocketTArray opts = TARRAY_CREATE(128);
+    ERL_NIF_TERM tmp, optsL;
+
+
+    /* *** ESOCK_OPT_IP_ADD_MEMBERSHIP => IP_ADD_MEMBERSHIP *** */
+#if defined(IP_ADD_MEMBERSHIP)
+    tmp = MKT2(env, esock_atom_add_membership, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_add_membership, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_ADD_SOURCE_MEMBERSHIP => IP_ADD_SOURCE_MEMBERSHIP *** */
+#if defined(IP_ADD_SOURCE_MEMBERSHIP)
+    tmp = MKT2(env, esock_atom_add_source_membership, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_add_source_membership, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_BLOCK_SOURCE => IP_BLOCK_SOURCE *** */
+#if defined(IP_BLOCK_SOURCE)
+    tmp = MKT2(env, esock_atom_block_source, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_block_source, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_DONTFRAG => IP_DONTFRAG *** */
+    tmp = MKT2(env, esock_atom_dontfrag, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_DROP_MEMBERSHIP => IP_DROP_MEMBERSHIP *** */
+#if defined(IP_DROP_MEMBERSHIP)
+    tmp = MKT2(env, esock_atom_drop_membership, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_drop_membership, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_DROP_SOURCE_MEMBERSHIP => IP_DROP_SOURCE_MEMBERSHIP *** */
+#if defined(IP_DROP_SOURCE_MEMBERSHIP)
+    tmp = MKT2(env, esock_atom_drop_source_membership, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_drop_source_membership, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_FREEBIND => IP_FREEBIND *** */
+#if defined(IP_FREEBIND)
+    tmp = MKT2(env, esock_atom_freebind, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_freebind, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_HDRINCL => IP_HDRINCL *** */
+#if defined(IP_HDRINCL)
+    tmp = MKT2(env, esock_atom_hdrincl, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_hdrincl, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_MINTTL => IP_MINTTL *** */
+#if defined(IP_MINTTL)
+    tmp = MKT2(env, esock_atom_minttl, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_minttl, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_MSFILTER => IP_MSFILTER / IP_MSFILTER_SIZE *** */
+#if defined(IP_MSFILTER) && defined(IP_MSFILTER_SIZE)
+    tmp = MKT2(env, esock_atom_msfilter, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_msfilter, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_MTU => IP_MTU *** */
+    tmp = MKT2(env, esock_atom_mtu, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_MTU_DISCOVER => IP_MTU_DISCOVER *** */
+#if defined(IP_MTU_DISCOVER)
+    tmp = MKT2(env, esock_atom_mtu_discover, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_mtu_discover, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_MULTICAST_ALL => IP_MULTICAST_ALL *** */
+#if defined(IP_MULTICAST_ALL)
+    tmp = MKT2(env, esock_atom_multicast_all, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_multicast_all, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_MULTICAST_IF => IP_MULTICAST_IF *** */
+#if defined(IP_MULTICAST_IF)
+    tmp = MKT2(env, esock_atom_multicast_if, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_multicast_if, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_MULTICAST_LOOP => IP_MULTICAST_LOOP *** */
+#if defined(IP_MULTICAST_LOOP)
+    tmp = MKT2(env, esock_atom_multicast_loop, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_multicast_loop, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_MULTICAST_TTL => IP_MULTICAST_TTL *** */
+#if defined(IP_MULTICAST_TTL)
+    tmp = MKT2(env, esock_atom_multicast_ttl, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_multicast_ttl, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_NODEFRAG => IP_NODEFRAG *** */
+#if defined(IP_NODEFRAG)
+    tmp = MKT2(env, esock_atom_nodefrag, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_nodefrag, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_OPTIONS => IP_OPTIONS *** */
+    tmp = MKT2(env, esock_atom_options, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_PKTINFO => IP_PKTINFO *** */
+#if defined(IP_PKTINFO)
+    tmp = MKT2(env, esock_atom_pktinfo, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_pktinfo, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_RECVDSTADDR => IP_RECVDSTADDR *** */
+#if defined(IP_RECVDSTADDR)
+    tmp = MKT2(env, esock_atom_recvdstaddr, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_recvdstaddr, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_RECVERR => IP_RECVERR *** */
+#if defined(IP_RECVERR)
+    tmp = MKT2(env, esock_atom_recverr, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_recverr, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_RECVIF => IP_RECVIF *** */
+#if defined(IP_RECVIF)
+    tmp = MKT2(env, esock_atom_recvif, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_recvif, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_RECVOPTS => IP_RECVOPTS *** */
+#if defined(IP_RECVOPTS)
+    tmp = MKT2(env, esock_atom_recvopts, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_recvopts, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_RECVORIGDSTADDR => IP_RECVORIGDSTADDR *** */
+#if defined(IP_RECVORIGDSTADDR)
+    tmp = MKT2(env, esock_atom_recvorigdstaddr, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_recvorigdstaddr, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_RECVTOS => IP_RECVTOS *** */
+#if defined(IP_RECVTOS)
+    tmp = MKT2(env, esock_atom_recvtos, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_recvtos, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_RECVTTL => IP_RECVTTL *** */
+#if defined(IP_RECVTTL)
+    tmp = MKT2(env, esock_atom_recvttl, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_recvttl, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_RETOPTS => IP_RETOPTS *** */
+#if defined(IP_RETOPTS)
+    tmp = MKT2(env, esock_atom_retopts, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_retopts, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_ROUTER_ALERT => IP_ROUTER_ALERT *** */
+#if defined(IP_ROUTER_ALERT)
+    tmp = MKT2(env, esock_atom_router_alert, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_router_alert, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_SENDSRCADDR => IP_SENDSRCADDR *** */
+#if defined(IP_SENDSRCADDR)
+    tmp = MKT2(env, esock_atom_sendsrcaddr, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_sendsrcaddr, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_TOS => IP_TOS *** */
+#if defined(IP_TOS)
+    tmp = MKT2(env, esock_atom_tos, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_tos, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_TRANSPARENT => IP_TRANSPARENT *** */
+#if defined(IP_TRANSPARENT)
+    tmp = MKT2(env, esock_atom_transparent, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_transparent, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_TTL => IP_TTL *** */
+#if defined(IP_TTL)
+    tmp = MKT2(env, esock_atom_ttl, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_ttl, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IP_UNBLOCK_SOURCE => IP_UNBLOCK_SOURCE *** */
+#if defined(IP_UNBLOCK_SOURCE)
+    tmp = MKT2(env, esock_atom_unblock_source, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_unblock_source, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    TARRAY_TOLIST(opts, env, &optsL);
+    
+    return optsL;
+}
+#endif
+
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_supports_options_ipv6(ErlNifEnv* env)
+{
+    SocketTArray opts = TARRAY_CREATE(128);
+    ERL_NIF_TERM tmp, optsL;
+
+
+    /* *** ESOCK_OPT_IPV6_ADDRFORM => IPV6_ADDRFORM *** */
+#if defined(IPV6_ADDRFORM)
+    tmp = MKT2(env, esock_atom_addrform, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_addrform, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_ADD_MEMBERSHIP => IPV6_ADD_MEMBERSHIP *** */
+#if defined(IPV6_ADD_MEMBERSHIP)
+    tmp = MKT2(env, esock_atom_add_membership, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_add_membership, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_AUTHHDR => IPV6_AUTHHDR *** */
+#if defined(IPV6_AUTHHDR)
+    tmp = MKT2(env, esock_atom_authhdr, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_authhdr, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_AUTH_LEVEL => IPV6_AUTH_LEVEL *** */
+    tmp = MKT2(env, esock_atom_auth_level, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_CHECKSUM => IPV6_CHECKSUM *** */
+    tmp = MKT2(env, esock_atom_checksum, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_DROP_MEMBERSHIP => IPV6_DROP_MEMBERSHIP *** */
+#if defined(IPV6_DROP_MEMBERSHIP)
+    tmp = MKT2(env, esock_atom_drop_membership, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_drop_membership, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_DSTOPTS => IPV6_DSTOPTS *** */
+#if defined(IPV6_DSTOPTS)
+    tmp = MKT2(env, esock_atom_dstopts, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_dstopts, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_ESP_NETWORK_LEVEL => IPV6_ESP_NETWORK_LEVEL *** */
+    tmp = MKT2(env, esock_atom_esp_network_level, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_ESP_TRANS_LEVEL => IPV6_ESP_TRANS_LEVEL *** */
+    tmp = MKT2(env, esock_atom_esp_trans_level, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_FAITH => IPV6_FAITH *** */
+    tmp = MKT2(env, esock_atom_faith, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_FLOWINFO => IPV6_FLOWINFO *** */
+#if defined(IPV6_FLOWINFO)
+    tmp = MKT2(env, esock_atom_flowinfo, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_flowinfo, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_HOPLIMIT => IPV6_HOPLIMIT *** */
+#if defined(IPV6_HOPLIMIT)
+    tmp = MKT2(env, esock_atom_hoplimit, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_hoplimit, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_HOPOPTS => IPV6_HOPOPTS *** */
+#if defined(IPV6_HOPOPTS)
+    tmp = MKT2(env, esock_atom_hopopts, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_hopopts, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_IPCOMP_LEVEL => IPV6_IPCOMP_LEVEL *** */
+    tmp = MKT2(env, esock_atom_ipcomp_level, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_JOIN_GROUP => IPV6_JOIN_GROUP *** */
+    tmp = MKT2(env, esock_atom_join_group, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_LEAVE_GROUP => IPV6_LEAVE_GROUP *** */
+    tmp = MKT2(env, esock_atom_leave_group, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_MTU => IPV6_MTU *** */
+#if defined(IPV6_MTU)
+    tmp = MKT2(env, esock_atom_mtu, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_mtu, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_MTU_DISCOVER => IPV6_MTU_DISCOVER *** */
+#if defined(IPV6_MTU_DISCOVER)
+    tmp = MKT2(env, esock_atom_mtu_discover, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_mtu_discover, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_MULTICAST_HOPS => IPV6_MULTICAST_HOPS *** */
+#if defined(IPV6_MULTICAST_HOPS)
+    tmp = MKT2(env, esock_atom_multicast_hops, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_multicast_hops, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_MULTICAST_IF => IPV6_MULTICAST_IF *** */
+#if defined(IPV6_MULTICAST_IF)
+    tmp = MKT2(env, esock_atom_multicast_if, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_multicast_if, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_MULTICAST_LOOP => IPV6_MULTICAST_LOOP *** */
+#if defined(IPV6_MULTICAST_LOOP)
+    tmp = MKT2(env, esock_atom_multicast_loop, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_multicast_loop, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_PORTRANGE => IPV6_PORTRANGE *** */
+    tmp = MKT2(env, esock_atom_portrange, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_PKTOPTIONS => IPV6_PKTOPTIONS *** */
+    tmp = MKT2(env, esock_atom_pktoptions, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_RECVERR => IPV6_RECVERR *** */
+#if defined(IPV6_RECVERR)
+    tmp = MKT2(env, esock_atom_recverr, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_recverr, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_RECVPKTINFO => IPV6_RECVPKTINFO *** */
+#if defined(IPV6_RECVPKTINFO)
+    tmp = MKT2(env, esock_atom_recvpktinfo, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_recvpktinfo, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_RECVTCLASS => IPV6_RECVTCLASS *** */
+    tmp = MKT2(env, esock_atom_recvtclass, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_ROUTER_ALERT => IPV6_ROUTER_ALERT *** */
+#if defined(IPV6_ROUTER_ALERT)
+    tmp = MKT2(env, esock_atom_router_alert, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_router_alert, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_RTHDR => IPV6_RTHDR *** */
+#if defined(IPV6_RTHDR)
+    tmp = MKT2(env, esock_atom_rthdr, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_rthdr, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_TCLASS => IPV6_TCLASS *** */
+    tmp = MKT2(env, esock_atom_tclass, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_UNICAST_HOPS => IPV6_UNICAST_HOPS *** */
+#if defined(IPV6_UNICAST_HOPS)
+    tmp = MKT2(env, esock_atom_unicast_hops, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_unicast_hops, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_USE_MIN_MTU => IPV6_USE_MIN_MTU *** */
+    tmp = MKT2(env, esock_atom_use_min_mtu, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_IPV6_V6ONLY => IPV6_V6ONLY *** */
+#if defined(IPV6_V6ONLY)
+    tmp = MKT2(env, esock_atom_v6only, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_v6only, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    TARRAY_TOLIST(opts, env, &optsL);
+    
+    return optsL;
+}
+#endif
+
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_supports_options_tcp(ErlNifEnv* env)
+{
+    SocketTArray opts = TARRAY_CREATE(32);
+    ERL_NIF_TERM tmp, optsL;
+
+
+    /* *** ESOCK_OPT_TCP_CONGESTION => TCP_CONGESTION *** */
+#if defined(TCP_CONGESTION)
+    tmp = MKT2(env, esock_atom_congestion, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_congestion, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_TCP_CORK => TCP_CORK *** */
+#if defined(TCP_CORK)
+    tmp = MKT2(env, esock_atom_cork, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_cork, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_TCP_INFO => TCP_INFO *** */
+    tmp = MKT2(env, esock_atom_info, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_TCP_KEEPCNT => TCP_KEEPCNT *** */
+    tmp = MKT2(env, esock_atom_keepcnt, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_TCP_KEEPIDLE => TCP_KEEPIDLE *** */
+    tmp = MKT2(env, esock_atom_keepidle, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_TCP_KEEPINTVL => TCP_KEEPINTVL *** */
+    tmp = MKT2(env, esock_atom_keepintvl, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_TCP_MAXSEG => TCP_MAXSEG *** */
+#if defined(TCP_MAXSEG)
+    tmp = MKT2(env, esock_atom_maxseg, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_maxseg, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_TCP_MD5SIG => TCP_MD5SIG *** */
+    tmp = MKT2(env, esock_atom_md5sig, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_TCP_NODELAY => TCP_NODELAY *** */
+#if defined(TCP_NODELAY)
+    tmp = MKT2(env, esock_atom_nodelay, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_nodelay, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_TCP_NOOPT => TCP_NOOPT *** */
+    tmp = MKT2(env, esock_atom_noopt, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_TCP_NOPUSH => TCP_NOPUSH *** */
+    tmp = MKT2(env, esock_atom_nopush, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_TCP_SYNCNT => TCP_SYNCNT *** */
+    tmp = MKT2(env, esock_atom_syncnt, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_TCP_USER_TIMEOUT => TCP_USER_TIMEOUT *** */
+    tmp = MKT2(env, esock_atom_user_timeout, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    TARRAY_TOLIST(opts, env, &optsL);
+    
+    return optsL;
+}
+#endif
+
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_supports_options_udp(ErlNifEnv* env)
+{
+    SocketTArray opts = TARRAY_CREATE(8);
+    ERL_NIF_TERM tmp, optsL;
+
+
+    /* *** ESOCK_OPT_UDP_CORK => UDP_CORK *** */
+#if defined(UDP_CORK)
+    tmp = MKT2(env, esock_atom_cork, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_cork, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    TARRAY_TOLIST(opts, env, &optsL);
+    
+    return optsL;
+}
+#endif
+
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_supports_options_sctp(ErlNifEnv* env)
+{
+    SocketTArray opts = TARRAY_CREATE(64);
+    ERL_NIF_TERM tmp, optsL;
+
+
+    /* *** ESOCK_OPT_SCTP_ADAPTION_LAYER => SCTP_ADAPTION_LAYER *** */
+    tmp = MKT2(env, esock_atom_adaption_layer, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_ASSOCINFO => SCTP_ASSOCINFO *** */
+#if defined(SCTP_ASSOCINFO)
+    tmp = MKT2(env, esock_atom_associnfo, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_associnfo, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_AUTH_ACTIVE_KEY => SCTP_AUTH_ACTIVE_KEY *** */
+    tmp = MKT2(env, esock_atom_auth_active_key, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_AUTH_ASCONF => SCTP_AUTH_ASCONF *** */
+    tmp = MKT2(env, esock_atom_auth_asconf, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_AUTH_CHUNK => SCTP_AUTH_CHUNK *** */
+    tmp = MKT2(env, esock_atom_auth_chunk, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_AUTH_DELETE_KEY => SCTP_AUTH_DELETE_KEY *** */
+    tmp = MKT2(env, esock_atom_auth_delete_key, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_AUTH_KEY => SCTP_AUTH_KEY *** */
+    tmp = MKT2(env, esock_atom_auth_key, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_AUTOCLOSE => SCTP_AUTOCLOSE *** */
+#if defined(SCTP_AUTOCLOSE)
+    tmp = MKT2(env, esock_atom_autoclose, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_autoclose, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_CONTEXT => SCTP_CONTEXT *** */
+    tmp = MKT2(env, esock_atom_context, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_DEFAULT_SEND_PARAMS => SCTP_DEFAULT_SEND_PARAMS *** */
+    tmp = MKT2(env, esock_atom_default_send_params, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_DELAYED_ACK_TIME => SCTP_DELAYED_ACK_TIME *** */
+    tmp = MKT2(env, esock_atom_delayed_ack_time, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_DISABLE_FRAGMENTS => SCTP_DISABLE_FRAGMENTS *** */
+#if defined(SCTP_DISABLE_FRAGMENTS)
+    tmp = MKT2(env, esock_atom_disable_fragments, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_disable_fragments, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_HMAC_IDENT => SCTP_HMAC_IDENT *** */
+    tmp = MKT2(env, esock_atom_hmac_ident, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_EVENTS => SCTP_EVENTS *** */
+#if defined(SCTP_EVENTS)
+    tmp = MKT2(env, esock_atom_events, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_events, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_EXPLICIT_EOR => SCTP_EXPLICIT_EOR *** */
+    tmp = MKT2(env, esock_atom_explicit_eor, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_FRAGMENT_INTERLEAVE => SCTP_FRAGMENT_INTERLEAVE *** */
+    tmp = MKT2(env, esock_atom_fragment_interleave, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_GET_PEER_ADDR_INFO => SCTP_GET_PEER_ADDR_INFO *** */
+    tmp = MKT2(env, esock_atom_get_peer_addr_info, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_INITMSG => SCTP_INITMSG *** */
+#if defined(SCTP_INITMSG)
+    tmp = MKT2(env, esock_atom_initmsg, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_initmsg, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_I_WANT_MAPPED_V4_ADDR => SCTP_I_WANT_MAPPED_V4_ADDR *** */
+    tmp = MKT2(env, esock_atom_i_want_mapped_v4_addr, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_LOCAL_AUTH_CHUNKS => SCTP_LOCAL_AUTH_CHUNKS *** */
+    tmp = MKT2(env, esock_atom_local_auth_chunks, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_MAXSEG => SCTP_MAXSEG *** */
+#if defined(SCTP_MAXSEG)
+    tmp = MKT2(env, esock_atom_maxseg, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_maxseg, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_MAXBURST => SCTP_MAXBURST *** */
+    tmp = MKT2(env, esock_atom_maxburst, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_NODELAY => SCTP_NODELAY *** */
+#if defined(SCTP_NODELAY)
+    tmp = MKT2(env, esock_atom_nodelay, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_nodelay, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_PARTIAL_DELIVERY_POINT => SCTP_PARTIAL_DELIVERY_POINT *** */
+    tmp = MKT2(env, esock_atom_partial_delivery_point, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_PEER_ADDR_PARAMS => SCTP_PEER_ADDR_PARAMS *** */
+    tmp = MKT2(env, esock_atom_peer_addr_params, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_PEER_AUTH_CHUNKS => SCTP_PEER_AUTH_CHUNKS *** */
+    tmp = MKT2(env, esock_atom_peer_auth_chunks, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_PRIMARY_ADDR => SCTP_PRIMARY_ADDR *** */
+    tmp = MKT2(env, esock_atom_primary_addr, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_RESET_STREAMS => SCTP_RESET_STREAMS *** */
+    tmp = MKT2(env, esock_atom_reset_streams, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_RTOINFO => SCTP_RTOINFO *** */
+#if defined(SCTP_RTOINFO)
+    tmp = MKT2(env, esock_atom_rtoinfo, esock_atom_true);
+#else
+    tmp = MKT2(env, esock_atom_rtoinfo, esock_atom_false);
+#endif
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_SET_PEER_PRIMARY_ADDR => SCTP_SET_PEER_PRIMARY_ADDR *** */
+    tmp = MKT2(env, esock_atom_set_peer_primary_addr, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_STATUS => SCTP_STATUS *** */
+    tmp = MKT2(env, esock_atom_status, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    /* *** ESOCK_OPT_SCTP_USE_EXT_RECVINFO => SCTP_USE_EXT_RECVINFO *** */
+    tmp = MKT2(env, esock_atom_use_ext_recvinfo, esock_atom_false);
+    TARRAY_ADD(opts, tmp);
+
+
+    TARRAY_TOLIST(opts, env, &optsL);
+    
+    return optsL;
+}
+#endif
+
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_supports_sctp(ErlNifEnv* env)
+{
+    ERL_NIF_TERM supports;
+
+#if defined(HAVE_SCTP)
+    supports = esock_atom_true;
+#else
+    supports = esock_atom_false;
+#endif
+
+    return supports;
+}
+#endif
+
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_supports_ipv6(ErlNifEnv* env)
+{
+    ERL_NIF_TERM supports;
+
+    /* Is this (test) really sufficient for testing if we support IPv6? */
+#if defined(HAVE_IPV6)
+    supports = esock_atom_true;
+#else
+    supports = esock_atom_false;
+#endif
+
+    return supports;
+}
+#endif
+
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_supports_local(ErlNifEnv* env)
+{
+    ERL_NIF_TERM supports;
+
+#if defined(AF_LOCAL)
+    supports = esock_atom_true;
+#else
+    supports = esock_atom_false;
+#endif
+
+    return supports;
+}
+#endif
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_open
+ *
+ * Description:
+ * Create an endpoint for communication.
+ *
+ * Arguments:
+ * Domain   - The domain, for example 'inet'
+ * Type     - Type of socket, for example 'stream'
+ * Protocol - The protocol, for example 'tcp'
+ * Extra    - A map with "obscure" options.
+ *            Currently the only allowed option is netns (network namespace).
+ *            This is *only* allowed on linux!
+ *            We sould also use this for the fd value, in case we should use
+ *            an already existing (file) descriptor.
+ */
+static
+ERL_NIF_TERM nif_open(ErlNifEnv*         env,
+                      int                argc,
+                      const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    int          edomain, etype, eproto;
+    int          domain, type, proto;
+    char*        netns;
+    ERL_NIF_TERM emap;
+    ERL_NIF_TERM result;
+
+    SGDBG( ("SOCKET", "nif_open -> entry with %d args\r\n", argc) );
+    
+    /* Extract arguments and perform preliminary validation */
+
+    if ((argc != 4) ||
+        !GET_INT(env, argv[0], &edomain) ||
+        !GET_INT(env, argv[1], &etype) ||
+        !IS_MAP(env,  argv[3])) {
+        return enif_make_badarg(env);
+    }
+    eproto = argv[2];
+    emap   = argv[3];
+
+    SGDBG( ("SOCKET", "nif_open -> "
+            "\r\n   edomain: %T"
+            "\r\n   etype:   %T"
+            "\r\n   eproto:  %T"
+            "\r\n   extra:   %T"
+            "\r\n", argv[0], argv[1], eproto, emap) );
+
+    if (!edomain2domain(edomain, &domain)) {
+        SGDBG( ("SOCKET", "nif_open -> invalid domain: %d\r\n", edomain) );
+        return esock_make_error(env, esock_atom_einval);
+    }
+
+    if (!etype2type(etype, &type)) {
+        SGDBG( ("SOCKET", "nif_open -> invalid type: %d\r\n", etype) );
+        return esock_make_error(env, esock_atom_einval);
+    }
+
+    if (!eproto2proto(env, eproto, &proto)) {
+        SGDBG( ("SOCKET", "nif_open -> invalid protocol: %d\r\n", eproto) );
+        return esock_make_error(env, esock_atom_einval);
+    }
+
+#ifdef HAVE_SETNS
+    /* We *currently* only support one extra option: netns */
+    if (!emap2netns(env, emap, &netns)) {
+        SGDBG( ("SOCKET", "nif_open -> namespace: %s\r\n", netns) );
+        return enif_make_badarg(env);
+    }
+#else
+    netns = NULL;
+#endif
+
+
+    result = esock_open(env, domain, type, proto, netns);
+
+    SGDBG( ("SOCKET", "nif_open -> done with result: "
+           "\r\n   %T"
+           "\r\n", result) );
+
+    return result;
+
+#endif // if defined(__WIN32__)
+}
+
+
+/* esock_open - create an endpoint for communication
+ *
+ * Assumes the input has been validated.
+ *
+ * Normally we want debugging on (individual) sockets to be controlled
+ * by the sockets own debug flag. But since we don't even have a socket
+ * yet, we must use the global debug flag.
+ */
+#if !defined(__WIN32__)
+
+static
+ERL_NIF_TERM esock_open(ErlNifEnv* env,
+                        int domain, int type, int protocol,
+                        char* netns)
+{
+    ESockDescriptor* descP;
+    ERL_NIF_TERM     res;
+    int              proto = protocol, save_errno = 0;
+    SOCKET           sock;
+    HANDLE           event;
+#ifdef HAVE_SETNS
+    int              current_ns = 0;
+#endif
+
+    SGDBG( ("SOCKET", "esock_open -> entry with"
+            "\r\n   domain:   %d"
+            "\r\n   type:     %d"
+            "\r\n   protocol: %d"
+            "\r\n   netns:    %s"
+            "\r\n", domain, type, protocol, ((netns == NULL) ? "NULL" : netns)) );
+
+#ifdef HAVE_SETNS
+    if ((netns != NULL) &&
+        !change_network_namespace(netns, &current_ns, &save_errno))
+        return esock_make_error_errno(env, save_errno);
+#endif
+
+    if ((sock = sock_open(domain, type, proto)) == INVALID_SOCKET)
+        return esock_make_error_errno(env, sock_errno());
+
+    SGDBG( ("SOCKET", "esock_open -> open success: %d\r\n", sock) );
+
+
+    /* NOTE that if the protocol = 0 (default) and the domain is not
+     * local (AF_LOCAL) we need to explicitly get the protocol here!
+     */
+    
+    if ((proto == 0)
+#if defined(AF_LOCAL)
+        && (domain != AF_LOCAL)
+#endif
+        )
+        if (!esock_open_which_protocol(sock, &proto)) {
+            if (proto == ESOCK_WHICH_PROTO_ERROR) {
+                save_errno = sock_errno();
+                while ((sock_close(sock) == INVALID_SOCKET) &&
+                       (sock_errno() == EINTR));
+                return esock_make_error_errno(env, save_errno);
+            } else {
+                while ((sock_close(sock) == INVALID_SOCKET) &&
+                       (sock_errno() == EINTR));
+                return esock_make_error(env, esock_atom_eafnosupport);
+            }
+        }
+
+
+#ifdef HAVE_SETNS
+    if ((netns != NULL) &&
+        !restore_network_namespace(current_ns, sock, &save_errno))
+        return esock_make_error_errno(env, save_errno);
+
+    if (netns != NULL)
+        FREE(netns);
+#endif
+
+
+    if ((event = sock_create_event(sock)) == INVALID_EVENT) {
+        save_errno = sock_errno();
+        while ((sock_close(sock) == INVALID_SOCKET) && (sock_errno() == EINTR));
+        return esock_make_error_errno(env, save_errno);
+    }
+
+    SGDBG( ("SOCKET", "esock_open -> event success: %d\r\n", event) );
+
+    SET_NONBLOCKING(sock);
+
+
+    /* Create and initiate the socket "descriptor" */
+    if ((descP = alloc_descriptor(sock, event)) == NULL) {
+        sock_close(sock);
+        // Not sure if this is really the proper error, but...
+        return enif_make_badarg(env);
+    }
+
+    descP->state    = ESOCK_STATE_OPEN;
+    descP->domain   = domain;
+    descP->type     = type;
+    descP->protocol = proto;
+
+    /* Does this apply to other types? Such as RAW?
+     * Also, is this really correct? Should we not wait for bind?
+     */
+    if (type == SOCK_DGRAM) {
+        descP->isReadable = TRUE;
+        descP->isWritable = TRUE;
+    }
+
+    /*
+     * Should we keep track of sockets (resources) in some way?
+     * Doing it here will require mutex to ensure data integrity,
+     * which will be costly. Send it somewhere?
+     */
+    res = enif_make_resource(env, descP);
+    enif_release_resource(descP);
+
+    /* Keep track of the creator
+     * This should not be a problem, but just in case
+     * the *open* function is used with the wrong kind
+     * of environment...
+     */
+    if (enif_self(env, &descP->ctrlPid) == NULL)
+        return esock_make_error(env, atom_exself);
+
+    if (MONP("esock_open -> ctrl",
+             env, descP,
+             &descP->ctrlPid,
+             &descP->ctrlMon) != 0)
+        return esock_make_error(env, atom_exmon);
+
+
+    inc_socket(domain, type, protocol);
+
+    return esock_make_ok2(env, res);
+}
+
+
+static
+BOOLEAN_T esock_open_which_protocol(SOCKET sock, int* proto)
+{
+#if defined(SO_PROTOCOL)
+    int          val;
+    SOCKOPTLEN_T valSz = sizeof(val);
+    int          res;
+
+    res = sock_getopt(sock, SOL_SOCKET, SO_PROTOCOL, &val, &valSz);
+
+    if (res != 0) {
+        *proto = ESOCK_WHICH_PROTO_ERROR;
+        return FALSE;
+    } else {
+        *proto = val;
+        return TRUE;
+    }
+#else
+    *proto = ESOCK_WHICH_PROTO_UNSUP;
+    return FALSE;
+#endif
+}
+
+
+#endif // if !defined(__WIN32__)
+
+
+
+#ifdef HAVE_SETNS
+/* We should really have another API, so that we can return errno... */
+
+/* *** change network namespace ***
+ * Retreive the current namespace and set the new.
+ * Return result and previous namespace if successfull.
+ */
+#if !defined(__WIN32__)
+static
+BOOLEAN_T change_network_namespace(char* netns, int* cns, int* err)
+{
+    int save_errno;
+    int current_ns = 0;
+    int new_ns     = 0;
+
+    SGDBG( ("SOCKET", "change_network_namespace -> entry with"
+            "\r\n   new ns: %s", netns) );
+
+    if (netns != NULL) {
+        current_ns = open("/proc/self/ns/net", O_RDONLY);
+        if (current_ns == INVALID_SOCKET) {
+            *cns = current_ns;
+            *err = sock_errno();
+            return FALSE;
+        }
+        new_ns = open(netns, O_RDONLY);
+        if (new_ns == INVALID_SOCKET) {
+            save_errno = sock_errno();
+            while (close(current_ns) == INVALID_SOCKET &&
+                   sock_errno() == EINTR);
+            *cns = -1;
+            *err = save_errno;
+            return FALSE;
+        }
+        if (setns(new_ns, CLONE_NEWNET) != 0) {
+            save_errno = sock_errno();
+            while ((close(new_ns) == INVALID_SOCKET) &&
+                   (sock_errno() == EINTR));
+            while ((close(current_ns) == INVALID_SOCKET) &&
+                   (sock_errno() == EINTR));
+            *cns = -1;
+            *err = save_errno;
+            return FALSE;
+        } else {
+            while ((close(new_ns) == INVALID_SOCKET) &&
+                   (sock_errno() == EINTR));
+            *cns = current_ns;
+            *err = 0;
+            return TRUE;
+        }
+    } else {
+        *cns = INVALID_SOCKET;
+        *err = 0;
+        return TRUE;
+    }
+}
+#endif // if !defined(__WIN32__)
+
+
+/* *** restore network namespace ***
+ * Restore the previous namespace (see above).
+ */
+#if !defined(__WIN32__)
+static
+BOOLEAN_T restore_network_namespace(int ns, SOCKET sock, int* err)
+{
+    int save_errno;
+
+    SGDBG( ("SOCKET", "restore_network_namespace -> entry with"
+            "\r\n   ns: %d", ns) );
+
+    if (ns != INVALID_SOCKET) {
+        if (setns(ns, CLONE_NEWNET) != 0) {
+            /* XXX Failed to restore network namespace.
+             * What to do? Tidy up and return an error...
+             * Note that the thread now might still be in the namespace.
+             * Can this even happen? Should the emulator be aborted?
+             */
+            if (sock != INVALID_SOCKET)
+                save_errno = sock_errno();
+            while (close(sock) == INVALID_SOCKET &&
+                   sock_errno() == EINTR);
+            sock = INVALID_SOCKET;
+            while (close(ns) == INVALID_SOCKET &&
+                   sock_errno() == EINTR);
+            *err = save_errno;
+            return FALSE;
+        } else {
+            while (close(ns) == INVALID_SOCKET &&
+                   sock_errno() == EINTR);
+            *err = 0;
+            return TRUE;
+        }
+  }
+
+  *err = 0;
+  return TRUE;
+}
+#endif // if !defined(__WIN32__)
+#endif // ifdef HAVE_SETNS
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_bind
+ *
+ * Description:
+ * Bind a name to a socket.
+ *
+ * Arguments:
+ * [0] Socket (ref) - Points to the socket descriptor.
+ * [1] LocalAddr    - Local address is a sockaddr map ( socket:sockaddr() ).
+ */
+static
+ERL_NIF_TERM nif_bind(ErlNifEnv*         env,
+                      int                argc,
+                      const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ESockDescriptor* descP;
+    ERL_NIF_TERM     eSockAddr;
+    ESockAddress     sockAddr;
+    unsigned int     addrLen;
+    char*            xres;
+
+    SGDBG( ("SOCKET", "nif_bind -> entry with argc: %d\r\n", argc) );
+
+    /* Extract arguments and perform preliminary validation */
+
+    if ((argc != 2) ||
+        !ESOCK_GET_RESOURCE(env, argv[0], (void**) &descP)) {
+        return enif_make_badarg(env);
+    }
+    eSockAddr = argv[1];
+
+    if (IS_CLOSED(descP) || IS_CLOSING(descP))
+        return esock_make_error(env, atom_closed);
+    
+    SSDBG( descP,
+           ("SOCKET", "nif_bind -> args when sock = %d (0x%lX)"
+            "\r\n   Socket:   %T"
+            "\r\n   SockAddr: %T"
+            "\r\n", descP->sock, descP->state, argv[0], eSockAddr) );
+
+    /* Make sure we are ready
+     * Not sure how this would even happen, but...
+     */
+    if (descP->state != ESOCK_STATE_OPEN)
+        return esock_make_error(env, atom_exbadstate);
+
+    if ((xres = esock_decode_sockaddr(env, eSockAddr, &sockAddr, &addrLen)) != NULL)
+        return esock_make_error_str(env, xres);
+        
+    return esock_bind(env, descP, &sockAddr, addrLen);
+
+#endif // if defined(__WIN32__)
+}
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_bind(ErlNifEnv*       env,
+                        ESockDescriptor* descP,
+                        ESockAddress*    sockAddrP,
+                        unsigned int     addrLen)
+{
+    int port, ntohs_port;
+
+    SSDBG( descP, ("SOCKET", "esock_bind -> try bind\r\n") );
+
+    if (IS_SOCKET_ERROR(sock_bind(descP->sock,
+                                  (struct sockaddr*) sockAddrP, addrLen))) {
+        return esock_make_error_errno(env, sock_errno());
+    }
+
+    SSDBG( descP, ("SOCKET", "esock_bind -> bound - get port\r\n") );
+
+    port = which_address_port(sockAddrP);
+    SSDBG( descP, ("SOCKET", "esock_bind -> port: %d\r\n", port) );
+    if (port == 0) {
+        SOCKLEN_T len = sizeof(ESockAddress);
+        sys_memzero((char *) sockAddrP, len);
+        sock_name(descP->sock, &sockAddrP->sa, &len);
+        port = which_address_port(sockAddrP);
+    } else if (port == -1) {
+        port = 0;
+    }
+
+    ntohs_port = sock_ntohs(port);
+    
+    SSDBG( descP, ("SOCKET",
+                   "esock_bind -> done with port = %d\r\n", ntohs_port) );
+
+    return esock_make_ok2(env, MKI(env, ntohs_port));
+
+}
+#endif // if !defined(__WIN32__)
+
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_connect
+ *
+ * Description:
+ * Initiate a connection on a socket
+ *
+ * Arguments:
+ * Socket (ref) - Points to the socket descriptor.
+ * SockAddr     - Socket Address of "remote" host.
+ *                This is sockaddr(), which is either
+ *                sockaddr_in4 or sockaddr_in6.
+ */
+static
+ERL_NIF_TERM nif_connect(ErlNifEnv*         env,
+                         int                argc,
+                         const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ESockDescriptor* descP;
+    ERL_NIF_TERM     res, eSockAddr, sockRef;
+    char*            xres;
+
+    SGDBG( ("SOCKET", "nif_connect -> entry with argc: %d\r\n", argc) );
+
+    /* Extract arguments and perform preliminary validation */
+
+    sockRef = argv[0];
+    if ((argc != 2) ||
+        !ESOCK_GET_RESOURCE(env, sockRef, (void**) &descP)) {
+        return enif_make_badarg(env);
+    }
+    eSockAddr = argv[1];
+
+    SSDBG( descP,
+           ("SOCKET", "nif_connect -> args when sock = %d:"
+            "\r\n   Socket:   %T"
+            "\r\n   SockAddr: %T"
+            "\r\n", descP->sock, argv[0], eSockAddr) );
+    
+    if ((xres = esock_decode_sockaddr(env, eSockAddr,
+                                      &descP->remote,
+                                      &descP->addrLen)) != NULL) {
+        return esock_make_error_str(env, xres);
+    }
+
+
+    /* Only a *!%&$*# would send an opened but non-connected socket
+     * somewhere (before its actually usable), but just to be on the
+     * safe side we do the best we can to avoid complications...
+     */
+
+    MLOCK(descP->readMtx);
+    MLOCK(descP->writeMtx);
+    MLOCK(descP->cfgMtx);
+
+    res = esock_connect(env, descP, sockRef);
+
+    MUNLOCK(descP->cfgMtx);
+    MUNLOCK(descP->writeMtx);
+    MUNLOCK(descP->readMtx);
+
+    return res;
+
+#endif // if !defined(__WIN32__)
+}
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_connect(ErlNifEnv*       env,
+                           ESockDescriptor* descP,
+                           ERL_NIF_TERM     sockRef)
+{
+    ERL_NIF_TERM res, ref;
+    int          code, sres, save_errno = 0;
+
+    /* 
+     * Verify that we are where in the proper state
+     */
+
+    if (IS_CLOSED(descP) || IS_CLOSING(descP))
+        return esock_make_error(env, atom_closed);
+    
+    if (!IS_OPEN(descP)) {
+        SSDBG( descP, ("SOCKET", "esock_connect -> not open\r\n") );
+        return esock_make_error(env, atom_exbadstate);
+    }
+
+    if (IS_CONNECTED(descP)) {
+        SSDBG( descP, ("SOCKET", "esock_connect -> already connected\r\n") );
+        return esock_make_error(env, atom_eisconn);
+    }
+
+    if (IS_CONNECTING(descP) && !is_connector(env, descP)) {
+        SSDBG( descP, ("SOCKET", "esock_connect -> already connecting\r\n") );
+        return esock_make_error(env, esock_atom_einval);
+    }
+    
+
+    /* 
+     * And attempt to connect
+     */
+
+    code = sock_connect(descP->sock,
+                        (struct sockaddr*) &descP->remote,
+                        descP->addrLen);
+    save_errno = sock_errno();
+
+    SSDBG( descP, ("SOCKET", "esock_connect -> connect result: %d, %d\r\n",
+                   code, save_errno) );
+
+    if (IS_SOCKET_ERROR(code)) {
+        switch (save_errno) {
+        case ERRNO_BLOCK:   /* Winsock2            */
+        case EINPROGRESS:   /* Unix & OSE!!        */
+            SSDBG( descP, ("SOCKET",
+                           "esock_connect -> would block => select\r\n") );
+
+            ref = MKREF(env);
+
+            if (IS_CONNECTING(descP)) {
+                /* Glitch */
+                res = esock_make_ok2(env, ref);
+            } else {
+
+                /* First time here */
+
+                if (enif_self(env, &descP->connPid) == NULL)
+                    return esock_make_error(env, atom_exself);
+
+                if (MONP("esock_connect -> conn",
+                         env, descP,
+                         &descP->connPid,
+                         &descP->connMon) != 0)
+                    return esock_make_error(env, atom_exmon);
+
+                descP->state = ESOCK_STATE_CONNECTING;
+
+                if ((sres = esock_select_write(env, descP->sock, descP, NULL,
+                                               sockRef, ref)) < 0) {
+                    res = esock_make_error(env,
+                                           MKT2(env,
+                                                esock_atom_select_failed,
+                                                MKI(env, sres)));
+                } else {
+                    res = esock_make_ok2(env, ref);
+                }
+            }
+            break;
+
+        case EISCONN:
+            SSDBG( descP, ("SOCKET",
+                           "esock_connect -> *already* connected\r\n") );
+            {
+                /* This is ***strange*** so make sure */
+                int err = 0;
+                if (!verify_is_connected(descP, &err)) {
+                    descP->state = ESOCK_STATE_OPEN;  /* restore state */
+                    res = esock_make_error_errno(env, err);
+                } else {
+                    descP->state = ESOCK_STATE_CONNECTED;
+                    /* And just to be on the safe side, reset these */
+                    enif_set_pid_undefined(&descP->connPid);
+                    DEMONP("esock_connect -> connected",
+                           env, descP, &descP->connMon);
+                    descP->isReadable = TRUE;
+                    descP->isWritable = TRUE;
+                    res = esock_atom_ok;
+                }
+            }
+            break;
+
+        default:
+            SSDBG( descP, ("SOCKET", "esock_connect -> other error(1): %d\r\n",
+                           save_errno) );
+            res = esock_make_error_errno(env, save_errno);
+            break;
+        }
+
+    } else if (code == 0) {                 /* ok we are connected */
+
+        SSDBG( descP, ("SOCKET", "esock_connect -> connected\r\n") );
+
+        descP->state      = ESOCK_STATE_CONNECTED;
+        enif_set_pid_undefined(&descP->connPid);
+        DEMONP("esock_connect -> connected", env, descP, &descP->connMon);
+        descP->isReadable = TRUE;
+        descP->isWritable = TRUE;
+
+        res = esock_atom_ok;
+
+    } else {
+        /* Do we really need this case? */
+
+        SSDBG( descP, ("SOCKET", "esock_connect -> other error(2): %d\r\n",
+                       save_errno) );
+
+        res = esock_make_error_errno(env, save_errno);
+    }
+
+    return res;
+
+}
+#endif // if !defined(__WIN32__)
+
+
+/* ----------------------------------------------------------------------
+ * nif_finalize_connection
+ *
+ * Description:
+ * Make socket ready for input and output.
+ * This function is called if we where made to wait when we called the
+ * nif_connect function (we made a select, and the select message has
+ * now been received).
+ *
+ * Arguments:
+ * Socket (ref) - Points to the socket descriptor.
+ */
+static
+ERL_NIF_TERM nif_finalize_connection(ErlNifEnv*         env,
+                                     int                argc,
+                                     const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ESockDescriptor* descP;
+
+    /* Extract arguments and perform preliminary validation */
+
+    if ((argc != 1) ||
+        !ESOCK_GET_RESOURCE(env, argv[0], (void**) &descP)) {
+        return enif_make_badarg(env);
+    }
+
+    return esock_finalize_connection(env, descP);
+
+#endif
+}
+
+
+/* *** esock_finalize_connection ***
+ * Perform the final check to verify a connection.
+ */
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_finalize_connection(ErlNifEnv*       env,
+                                       ESockDescriptor* descP)
+{
+    int error;
+
+    if (!IS_CONNECTING(descP))
+        return esock_make_error(env, atom_enotconn);
+
+    if (!verify_is_connected(descP, &error)) {
+        descP->state = ESOCK_STATE_OPEN;  /* restore state */
+        return esock_make_error_errno(env, error);
+    }
+
+    descP->state      = ESOCK_STATE_CONNECTED;
+    enif_set_pid_undefined(&descP->connPid);
+    DEMONP("esock_finalize_connection -> connected",
+           env, descP, &descP->connMon);
+    descP->isReadable = TRUE;
+    descP->isWritable = TRUE;
+
+    return esock_atom_ok;
+}
+#endif
+
+
+/* *** verify_is_connected ***
+ * Check if a connection has been established.
+ */
+#if !defined(__WIN32__)
+static
+BOOLEAN_T verify_is_connected(ESockDescriptor* descP, int* err)
+{
+    /*
+     * *** This is strange ***
+     *
+     * This *should* work on Windows NT too, but doesn't.
+     * An bug in Winsock 2.0 for Windows NT?
+     *
+     * See "Unix Netwok Programming", W.R.Stevens, p 412 for a
+     * discussion about Unix portability and non blocking connect.
+     */
+
+#ifndef SO_ERROR
+    
+    int sz, code;
+
+    sz = sizeof(descP->remote);
+    sys_memzero((char *) &descP->remote, sz);
+    code = sock_peer(desc->sock,
+                     (struct sockaddr*) &descP->remote, &sz);
+
+    if (IS_SOCKET_ERROR(code)) {
+        *err = sock_errno();
+        return FALSE;
+    }
+
+#else
+
+    int          error = 0;             /* Has to be initiated, we check it */
+    unsigned int sz    = sizeof(error); /* even if we get -1                */
+    int          code  = sock_getopt(descP->sock,
+                                     SOL_SOCKET, SO_ERROR,
+                                     (void *)&error, &sz);
+
+    if ((code < 0) || error) {
+        *err = error;
+        return FALSE;
+    }
+
+#endif /* SO_ERROR */
+
+    *err = 0;
+
+    return TRUE;
+}
+#endif
+
+
+
+/* *** is_connector ***
+ * Check if the current process is the connector process.
+ */
+#if !defined(__WIN32__)
+static
+BOOLEAN_T is_connector(ErlNifEnv*       env,
+                       ESockDescriptor* descP)
+{
+    ErlNifPid caller;
+
+    if (enif_self(env, &caller) == NULL)
+        return FALSE;
+
+    if (COMPARE_PIDS(&descP->connPid, &caller) == 0)
+        return TRUE;
+    else
+        return FALSE;
+    
+}
+#endif
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_listen
+ *
+ * Description:
+ * Listen for connections on a socket.
+ *
+ * Arguments:
+ * Socket (ref) - Points to the socket descriptor.
+ * Backlog      - The maximum length to which the queue of pending
+ *                connections for socket may grow.
+ */
+static
+ERL_NIF_TERM nif_listen(ErlNifEnv*         env,
+                        int                argc,
+                        const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ESockDescriptor* descP;
+    int              backlog;
+
+    SGDBG( ("SOCKET", "nif_listen -> entry with argc: %d\r\n", argc) );
+    
+    /* Extract arguments and perform preliminary validation */
+
+    if ((argc != 2) ||
+        !ESOCK_GET_RESOURCE(env, argv[0], (void**) &descP) ||
+        !GET_INT(env, argv[1], &backlog)) {
+        return enif_make_badarg(env);
+    }
+
+    SSDBG( descP,
+           ("SOCKET", "nif_listen -> args when sock = %d:"
+            "\r\n   Socket:  %T"
+            "\r\n   backlog: %d"
+            "\r\n", descP->sock, argv[0], backlog) );
+    
+    return esock_listen(env, descP, backlog);
+
+#endif // if defined(__WIN32__)
+}
+
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_listen(ErlNifEnv*       env,
+                          ESockDescriptor* descP,
+                          int              backlog)
+{
+    
+    /* 
+     * Verify that we are where in the proper state
+     */
+
+    if (IS_CLOSED(descP) || IS_CLOSING(descP))
+        return esock_make_error(env, atom_closed);
+    
+    if (descP->state == ESOCK_STATE_CLOSED)
+        return esock_make_error(env, atom_exbadstate);
+
+    if (!IS_OPEN(descP))
+        return esock_make_error(env, atom_exbadstate);
+
+
+    /* 
+     * And attempt to make socket listening
+     */
+    
+    if (IS_SOCKET_ERROR(sock_listen(descP->sock, backlog)))
+        return esock_make_error_errno(env, sock_errno());
+
+    descP->state = ESOCK_STATE_LISTENING;
+
+    return esock_atom_ok;
+
+}
+#endif // if !defined(__WIN32__)
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_accept
+ *
+ * Description:
+ * Accept a connection on a socket.
+ *
+ * Arguments:
+ * Socket (ref) - Points to the socket descriptor.
+ * Request ref  - Unique "id" of this request
+ *                (used for the select, if none is in queue).
+ */
+static
+ERL_NIF_TERM nif_accept(ErlNifEnv*         env,
+                        int                argc,
+                        const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ESockDescriptor* descP;
+    ERL_NIF_TERM     sockRef, ref, res;
+
+    SGDBG( ("SOCKET", "nif_accept -> entry with argc: %d\r\n", argc) );
+    
+    /* Extract arguments and perform preliminary validation */
+
+    sockRef = argv[0];
+    if ((argc != 2) ||
+        !ESOCK_GET_RESOURCE(env, sockRef, (void**) &descP)) {
+        return enif_make_badarg(env); 
+    }
+    ref = argv[1];
+    
+    MLOCK(descP->accMtx);
+
+    SSDBG( descP,
+           ("SOCKET", "nif_accept -> args when sock = %d:"
+            "\r\n   Socket:                %T"
+            "\r\n   ReqRef:                %T"
+            "\r\nwhen"
+            "\r\n   State:                 %s"
+            "\r\n   Current Acceptor Addr: 0x%lX"
+            "\r\n   Current Acceptor pid:  %T"
+            "\r\n   Current Acceptor mon:  %T"
+            "\r\n   Current Acceptor env:  0x%lX"
+            "\r\n   Current Acceptor ref:  %T"
+            "\r\n",
+            descP->sock,
+            sockRef, ref,
+            ((descP->state == ESOCK_STATE_LISTENING) ? "listening" :
+             ((descP->state == ESOCK_STATE_ACCEPTING) ? "accepting" : "other")),
+            descP->currentAcceptorP,
+            descP->currentAcceptor.pid,
+            esock_make_monitor_term(env, &descP->currentAcceptor.mon),
+            descP->currentAcceptor.env,
+            descP->currentAcceptor.ref) );
+
+    res = esock_accept(env, descP, sockRef, ref);
+
+    MUNLOCK(descP->accMtx);
+
+    return res;
+
+#endif // if defined(__WIN32__)
+}
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_accept(ErlNifEnv*       env,
+                          ESockDescriptor* descP,
+                          ERL_NIF_TERM     sockRef,
+                          ERL_NIF_TERM     ref)
+{
+    ERL_NIF_TERM res;
+
+    if (IS_CLOSED(descP) || IS_CLOSING(descP))
+        return esock_make_error(env, atom_closed);
+    
+    switch (descP->state) {
+    case ESOCK_STATE_LISTENING:
+        res = esock_accept_listening(env, descP, sockRef, ref);
+        break;
+
+    case ESOCK_STATE_ACCEPTING:
+        res = esock_accept_accepting(env, descP, sockRef, ref);
+        break;
+
+    default:
+        res = esock_make_error(env, esock_atom_einval);
+        break;
+    }
+
+    return res;
+}
+#endif // if !defined(__WIN32__)
+
+
+/* *** esock_accept_listening ***
+ *
+ * We have no active acceptor (and therefor no acceptors in queue).
+ */
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_accept_listening(ErlNifEnv*       env,
+                                    ESockDescriptor* descP,
+                                    ERL_NIF_TERM     sockRef,
+                                    ERL_NIF_TERM     accRef)
+{
+    ESockAddress  remote;
+    unsigned int  n;
+    SOCKET        accSock;
+    int           save_errno;
+    ErlNifPid     caller;
+    ERL_NIF_TERM  res;
+
+    SSDBG( descP, ("SOCKET", "esock_accept_listening -> get caller\r\n") );
+
+    if (enif_self(env, &caller) == NULL)
+        return esock_make_error(env, atom_exself);
+
+    n = sizeof(remote);
+    sys_memzero((char *) &remote, n);
+    SSDBG( descP, ("SOCKET", "esock_accept_listening -> try accept\r\n") );
+    accSock = sock_accept(descP->sock, (struct sockaddr*) &remote, &n);
+    if (accSock == INVALID_SOCKET) {
+
+        save_errno = sock_errno();
+
+        SSDBG( descP,
+               ("SOCKET",
+                "esock_accept_listening -> accept failed (%d)\r\n",
+                save_errno) );
+
+        res = esock_accept_listening_error(env, descP, sockRef, accRef,
+                                           caller, save_errno);
+
+    } else {
+
+        /*
+         * We got one
+         */
+
+        SSDBG( descP, ("SOCKET", "esock_accept_listening -> success\r\n") );
+
+        res = esock_accept_listening_accept(env, descP, accSock, caller, &remote);
+
+    }
+
+    return res;
+}
+
+
+/* *** esock_accept_listening_error ***
+ *
+ * The accept call resultet in an error - handle it.
+ * There are only two cases: 
+ * 1) BLOCK => Attempt a "retry"
+ * 2) Other => Return the value (converted to an atom)
+ */
+static
+ERL_NIF_TERM esock_accept_listening_error(ErlNifEnv*       env,
+                                          ESockDescriptor* descP,
+                                          ERL_NIF_TERM     sockRef,
+                                          ERL_NIF_TERM     accRef,
+                                          ErlNifPid        caller,
+                                          int              save_errno)
+{
+    ERL_NIF_TERM res;
+
+    if (save_errno == ERRNO_BLOCK) {
+
+        /* *** Try again later *** */
+
+        SSDBG( descP,
+               ("SOCKET", "esock_accept_listening_error -> would block\r\n") );
+
+        descP->currentAcceptor.pid = caller;
+        if (MONP("esock_accept_listening -> current acceptor",
+                 env, descP,
+                 &descP->currentAcceptor.pid,
+                 &descP->currentAcceptor.mon) != 0) {
+            enif_set_pid_undefined(&descP->currentAcceptor.pid);
+            res = esock_make_error(env, atom_exmon);
+        } else {
+            ESOCK_ASSERT(!descP->currentAcceptor.env);
+            descP->currentAcceptor.env = esock_alloc_env("current acceptor");
+            descP->currentAcceptor.ref = CP_TERM(descP->currentAcceptor.env,
+                                                 accRef);
+            descP->currentAcceptorP    = &descP->currentAcceptor;
+            res = esock_accept_busy_retry(env, descP,
+                                          sockRef, accRef,
+                                          NULL, ESOCK_STATE_ACCEPTING);
+        }
+    } else {
+        SSDBG( descP,
+               ("SOCKET",
+                "esock_accept_listening -> errno: %d\r\n", save_errno) );
+        res = esock_make_error_errno(env, save_errno);
+    }
+
+    return res;
+}
+
+
+/* *** esock_accept_listening_accept ***
+ *
+ * The accept call was successful (accepted) - handle the new connection.
+ */
+static
+ERL_NIF_TERM esock_accept_listening_accept(ErlNifEnv*       env,
+                                           ESockDescriptor* descP,
+                                           SOCKET           accSock,
+                                           ErlNifPid        caller,
+                                           ESockAddress*    remote)
+{
+    ERL_NIF_TERM res;
+
+    esock_accept_accepted(env, descP, accSock, caller, remote, &res);
+    
+    return res;
+}
+#endif // if !defined(__WIN32__)
+
+
+
+/* *** esock_accept_accepting ***
+ *
+ * We have an active acceptor and possibly acceptors waiting in queue.
+ * If the pid of the calling process is not the pid of the "current process",
+ * push the requester onto the (acceptor) queue.
+ */
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_accept_accepting(ErlNifEnv*       env,
+                                    ESockDescriptor* descP,
+                                    ERL_NIF_TERM     sockRef,
+                                    ERL_NIF_TERM     ref)
+{
+    ErlNifPid     caller;
+    ERL_NIF_TERM  res;
+
+    SSDBG( descP, ("SOCKET", "esock_accept_accepting -> get caller\r\n") );
+
+    if (enif_self(env, &caller) == NULL)
+        return esock_make_error(env, atom_exself);
+
+    SSDBG( descP, ("SOCKET", "esock_accept_accepting -> check: "
+                   "are caller current acceptor:"
+                   "\r\n   Caller:  %T"
+                   "\r\n   Current: %T"
+                   "\r\n", caller, descP->currentAcceptor.pid) );
+
+    if (COMPARE_PIDS(&descP->currentAcceptor.pid, &caller) == 0) {
+
+        SSDBG( descP,
+               ("SOCKET", "esock_accept_accepting -> current acceptor\r\n") );
+
+        res = esock_accept_accepting_current(env, descP, sockRef, ref);
+
+    } else {
+
+        /* Not the "current acceptor", so (maybe) push onto queue */
+
+        SSDBG( descP,
+               ("SOCKET",
+                "esock_accept_accepting -> *not* current acceptor\r\n") );
+
+        res = esock_accept_accepting_other(env, descP, ref, caller);
+
+    }
+
+    return res;
+
+}
+
+
+
+/* *** esock_accept_accepting_current ***
+ * Handles when the current acceptor makes another attempt.
+ */
+static
+ERL_NIF_TERM esock_accept_accepting_current(ErlNifEnv*       env,
+                                            ESockDescriptor* descP,
+                                            ERL_NIF_TERM     sockRef,
+                                            ERL_NIF_TERM     accRef)
+{
+    ESockAddress  remote;
+    unsigned int  n;
+    SOCKET        accSock;
+    int           save_errno;
+    ERL_NIF_TERM  res;
+
+    SSDBG( descP, ("SOCKET",
+                   "esock_accept_accepting_current -> try accept\r\n") );
+    n = sizeof(descP->remote);
+    sys_memzero((char *) &remote, n);
+    accSock = sock_accept(descP->sock, (struct sockaddr*) &remote, &n);
+    if (accSock == INVALID_SOCKET) {
+
+        save_errno = sock_errno();
+
+        SSDBG( descP,
+               ("SOCKET",
+                "esock_accept_accepting_current -> accept failed: %d\r\n",
+                save_errno) );
+
+        res = esock_accept_accepting_current_error(env, descP, sockRef,
+                                                   accRef, save_errno);
+                                              
+    } else {
+
+        SSDBG( descP, ("SOCKET",
+                       "esock_accept_accepting_current -> accepted\r\n") );
+        
+        res = esock_accept_accepting_current_accept(env, descP, sockRef,
+                                                    accSock, &remote);
+
+    }
+
+    return res;
+}
+
+
+/* *** esock_accept_accepting_current_accept ***
+ * Handles when the current acceptor succeeded in its accept call - 
+ * handle the new connection.
+ */
+static
+ERL_NIF_TERM esock_accept_accepting_current_accept(ErlNifEnv*       env,
+                                                   ESockDescriptor* descP,
+                                                   ERL_NIF_TERM     sockRef,
+                                                   SOCKET           accSock,
+                                                   ESockAddress*    remote)
+{
+    ERL_NIF_TERM res;
+
+    if (esock_accept_accepted(env, descP, accSock,
+                              descP->currentAcceptor.pid, remote, &res)) {
+
+        /* Clean out the old cobweb's before trying to invite a new spider */
+
+        descP->currentAcceptor.ref = esock_atom_undefined;
+        enif_set_pid_undefined(&descP->currentAcceptor.pid);
+        esock_free_env("esock_accept_accepting_current_accept - "
+                       "current-accept-env",
+                       descP->currentAcceptor.env);
+        descP->currentAcceptor.env =  NULL;
+
+        if (!activate_next_acceptor(env, descP, sockRef)) {
+
+            SSDBG( descP,
+                   ("SOCKET",
+                    "esock_accept_accepting_current_accept -> "
+                    "no more writers\r\n") );
+
+            descP->state               = ESOCK_STATE_LISTENING;
+
+            descP->currentAcceptorP    = NULL;
+            ESOCK_ASSERT(!descP->currentAcceptor.env);
+            descP->currentAcceptor.env = NULL;
+            MON_INIT(&descP->currentAcceptor.mon);
+        }
+
+    }
+
+    return res;
+}
+
+
+/* *** esock_accept_accepting_current_error ***
+ * The accept call of current acceptor resultet in an error - handle it.
+ * There are only two cases: 
+ * 1) BLOCK => Attempt a "retry"
+ * 2) Other => Return the value (converted to an atom)
+ */
+static
+ERL_NIF_TERM esock_accept_accepting_current_error(ErlNifEnv*       env,
+                                                  ESockDescriptor* descP,
+                                                  ERL_NIF_TERM     sockRef,
+                                                  ERL_NIF_TERM     opRef,
+                                                  int              save_errno)
+{
+    ESockRequestor req;
+    ERL_NIF_TERM   res, reason;
+
+    req.env = NULL;
+    if (save_errno == ERRNO_BLOCK) {
+
+        /*
+         * Just try again, no real error, just a ghost trigger from poll,
+         */
+
+        SSDBG( descP,
+               ("SOCKET",
+                "esock_accept_accepting_current_error -> "
+                "would block: try again\r\n") );
+
+        res = esock_accept_busy_retry(env, descP, sockRef, opRef,
+                                      &descP->currentAcceptor.pid,
+                                      /* No state change */
+                                      descP->state);
+
+    } else {
+
+        reason = MKA(env, erl_errno_id(save_errno));
+        res    = esock_make_error(env, reason);
+
+        while (acceptor_pop(env, descP, &req)) {
+            SSDBG( descP,
+                   ("SOCKET",
+                    "esock_accept_accepting_current_error -> abort %T\r\n",
+                    req.pid) );
+            esock_send_abort_msg(env, sockRef, req.ref, req.env,
+                                 reason, &req.pid);
+            req.env = NULL;
+            DEMONP("esock_accept_accepting_current_error -> pop'ed writer",
+                   env, descP, &req.mon);
+        }
+
+    }
+
+    return res;
+}
+
+
+/* *** esock_accept_accepting_other ***
+ * Handles when the another acceptor makes an attempt, which
+ * results (maybe) in the request beeing pushed onto the 
+ * acceptor queue.
+ */
+static
+ERL_NIF_TERM esock_accept_accepting_other(ErlNifEnv*       env,
+                                          ESockDescriptor* descP,
+                                          ERL_NIF_TERM     ref,
+                                          ErlNifPid        caller)
+{
+    ERL_NIF_TERM  result;
+
+    if (!acceptor_search4pid(env, descP, &caller)) // Ugh! (&caller)
+        result = acceptor_push(env, descP, caller, ref);
+    else
+        result = esock_make_error(env, esock_atom_eagain);
+    
+    return result;
+}
+#endif // if !defined(__WIN32__)
+
+
+
+/* *** esock_accept_busy_retry ***
+ *
+ * Perform a retry select. If successful, set nextState.
+ */
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_accept_busy_retry(ErlNifEnv*       env,
+                                     ESockDescriptor* descP,
+                                     ERL_NIF_TERM     sockRef,
+                                     ERL_NIF_TERM     accRef,
+                                     ErlNifPid*       pid,
+                                     unsigned int     nextState)
+{
+    int          sres;
+    ERL_NIF_TERM res, reason;
+
+    if ((sres = esock_select_read(env, descP->sock, descP, pid,
+                                  sockRef, accRef)) < 0) {
+        reason = MKT2(env, esock_atom_select_failed, MKI(env, sres));
+        res    = esock_make_error(env, reason);
+    } else {
+        descP->state = nextState;
+        res          = esock_make_error(env, esock_atom_eagain); // OK!!
+    }
+
+    return res;
+}
+
+
+
+/* *** esock_accept_accepted ***
+ *
+ * Generic function handling a successful accept.
+ */
+static
+BOOLEAN_T esock_accept_accepted(ErlNifEnv*       env,
+                                ESockDescriptor* descP,
+                                SOCKET           accSock,
+                                ErlNifPid        pid,
+                                ESockAddress*    remote,
+                                ERL_NIF_TERM*    result)
+{
+    ESockDescriptor* accDescP;
+    HANDLE           accEvent;
+    ERL_NIF_TERM     accRef;
+    int              save_errno;
+
+    /*
+     * We got one
+     */
+
+    if ((accEvent = sock_create_event(accSock)) == INVALID_EVENT) {
+        save_errno = sock_errno();
+        while ((sock_close(accSock) == INVALID_SOCKET) &&
+               (sock_errno() == EINTR));
+        *result = esock_make_error_errno(env, save_errno);
+        return FALSE;
+    }
+
+    if ((accDescP = alloc_descriptor(accSock, accEvent)) == NULL) {
+        sock_close(accSock);
+        *result = enif_make_badarg(env);
+        return FALSE;
+    }
+
+    accDescP->domain   = descP->domain;
+    accDescP->type     = descP->type;
+    accDescP->protocol = descP->protocol;
+    accDescP->rBufSz   = descP->rBufSz;  // Inherit buffer size
+    accDescP->rNum     = descP->rNum;    // Inherit buffer uses
+    accDescP->rNumCnt  = 0;
+    accDescP->rCtrlSz  = descP->rCtrlSz; // Inherit buffer size
+    accDescP->wCtrlSz  = descP->wCtrlSz; // Inherit buffer size
+
+    accRef = enif_make_resource(env, accDescP);
+    enif_release_resource(accDescP);
+
+    accDescP->ctrlPid = pid;
+    if (MONP("esock_accept_accepted -> ctrl",
+             env, accDescP,
+             &accDescP->ctrlPid,
+             &accDescP->ctrlMon) != 0) {
+        sock_close(accSock);
+        enif_set_pid_undefined(&descP->ctrlPid);
+        *result = esock_make_error(env, atom_exmon);
+        return FALSE;
+    }
+
+    accDescP->remote = *remote;
+    SET_NONBLOCKING(accDescP->sock);
+
+    accDescP->state      = ESOCK_STATE_CONNECTED;
+    accDescP->isReadable = TRUE;
+    accDescP->isWritable = TRUE;
+
+    *result = esock_make_ok2(env, accRef);
+
+    return TRUE;
+    
+}
+#endif // if !defined(__WIN32__)
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_send
+ *
+ * Description:
+ * Send a message on a socket
+ *
+ * Arguments:
+ * Socket (ref) - Points to the socket descriptor.
+ * SendRef      - A unique id for this (send) request.
+ * Data         - The data to send in the form of a IOVec.
+ * Flags        - Send flags.
+ */
+
+static
+ERL_NIF_TERM nif_send(ErlNifEnv*         env,
+                      int                argc,
+                      const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ESockDescriptor* descP;
+    ERL_NIF_TERM     sockRef, sendRef;
+    ErlNifBinary     sndData;
+    unsigned int     eflags;
+    int              flags;
+    ERL_NIF_TERM     res;
+
+    SGDBG( ("SOCKET", "nif_send -> entry with argc: %d\r\n", argc) );
+
+    /* Extract arguments and perform preliminary validation */
+
+    if ((argc != 4) ||
+        !GET_BIN(env, argv[2], &sndData) ||
+        !GET_UINT(env, argv[3], &eflags)) {
+        return enif_make_badarg(env);
+    }
+    sockRef = argv[0]; // We need this in case we send in case we send abort
+    sendRef = argv[1];
+
+    if (!ESOCK_GET_RESOURCE(env, sockRef, (void**) &descP)) {
+        return enif_make_badarg(env);
+    }
+
+    SSDBG( descP,
+           ("SOCKET", "nif_send -> args when sock = %d:"
+            "\r\n   Socket:       %T"
+            "\r\n   SendRef:      %T"
+            "\r\n   Size of data: %d"
+            "\r\n   eFlags:       %d"
+            "\r\n", descP->sock, sockRef, sendRef, sndData.size, eflags) );
+
+    if (!esendflags2sendflags(eflags, &flags))
+        return enif_make_badarg(env);
+
+    MLOCK(descP->writeMtx);
+
+    /* We need to handle the case when another process tries
+     * to write at the same time.
+     * If the current write could not write its entire package
+     * this time (resulting in an select). The write of the
+     * other process must be made to wait until current
+     * is done!
+     */
+
+    res = esock_send(env, descP, sockRef, sendRef, &sndData, flags);
+
+    MUNLOCK(descP->writeMtx);
+
+    return res;
+
+#endif // if defined(__WIN32__)
+}
+
+
+
+/* *** esock_send ***
+ *
+ * Do the actual send.
+ * Do some initial writer checks, do the actual send and then
+ * analyze the result. If we are done, another writer may be
+ * scheduled (if there is one in the writer queue).
+ */
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_send(ErlNifEnv*       env,
+                        ESockDescriptor* descP,
+                        ERL_NIF_TERM     sockRef,
+                        ERL_NIF_TERM     sendRef,
+                        ErlNifBinary*    sndDataP,
+                        int              flags)
+{
+    int          save_errno;
+    ssize_t      written;
+    ERL_NIF_TERM writerCheck;
+
+    if (!descP->isWritable)
+        return enif_make_badarg(env);
+
+    /* Check if there is already a current writer and if its us */
+    if (!send_check_writer(env, descP, sendRef, &writerCheck))
+        return writerCheck;
+    
+    /* We ignore the wrap for the moment.
+     * Maybe we should issue a wrap-message to controlling process...
+     */
+    // cnt_inc(&descP->writeTries, 1);
+    SOCK_CNT_INC(env, descP, sockRef, atom_write_tries, &descP->writeTries, 1);
+
+    written = sock_send(descP->sock, sndDataP->data, sndDataP->size, flags);
+    if (IS_SOCKET_ERROR(written))
+        save_errno = sock_errno();
+    else
+        save_errno = -1; // The value does not actually matter in this case
+    
+    return send_check_result(env, descP,
+                             written, sndDataP->size, save_errno,
+                             sockRef, sendRef);
+
+}
+#endif // if !defined(__WIN32__)
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_sendto
+ *
+ * Description:
+ * Send a message on a socket
+ *
+ * Arguments:
+ * Socket (ref) - Points to the socket descriptor.
+ * SendRef      - A unique id for this (send) request.
+ * Data         - The data to send in the form of a IOVec.
+ * Dest         - Destination (socket) address.
+ * Flags        - Send flags.
+ */
+
+static
+ERL_NIF_TERM nif_sendto(ErlNifEnv*         env,
+                        int                argc,
+                        const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ESockDescriptor* descP;
+    ERL_NIF_TERM     sockRef, sendRef;
+    ErlNifBinary     sndData;
+    unsigned int     eflags;
+    int              flags;
+    ERL_NIF_TERM     eSockAddr;
+    ESockAddress     remoteAddr;
+    unsigned int     remoteAddrLen;
+    char*            xres;
+    ERL_NIF_TERM     res;
+
+    SGDBG( ("SOCKET", "nif_sendto -> entry with argc: %d\r\n", argc) );
+
+    /* Extract arguments and perform preliminary validation */
+
+    if ((argc != 5) ||
+        !GET_BIN(env, argv[2], &sndData) ||
+        !GET_UINT(env, argv[4], &eflags)) {
+        return enif_make_badarg(env);
+    }
+    sockRef   = argv[0]; // We need this in case we send abort (to the caller)
+    sendRef   = argv[1];
+    eSockAddr = argv[3];
+
+    if (!ESOCK_GET_RESOURCE(env, sockRef, (void**) &descP)) {
+        return enif_make_badarg(env);
+    }
+    
+    SSDBG( descP,
+           ("SOCKET", "nif_sendto -> args when sock = %d:"
+            "\r\n   Socket:       %T"
+            "\r\n   sendRef:      %T"
+            "\r\n   size of data: %d"
+            "\r\n   eSockAddr:    %T"
+            "\r\n   eflags:       %d"
+            "\r\n",
+            descP->sock, sockRef, sendRef, sndData.size, eSockAddr, eflags) );
+
+    if (!esendflags2sendflags(eflags, &flags)) {
+        SSDBG( descP, ("SOCKET", "nif_sendto -> sendflags decode failed\r\n") );
+        return esock_make_error(env, esock_atom_einval);
+    }
+
+    if ((xres = esock_decode_sockaddr(env, eSockAddr,
+                                      &remoteAddr,
+                                      &remoteAddrLen)) != NULL) {
+        SSDBG( descP,
+               ("SOCKET", "nif_sendto -> sockaddr decode: %s\r\n", xres) );
+        return esock_make_error_str(env, xres);
+    }
+
+    MLOCK(descP->writeMtx);
+
+    res = esock_sendto(env, descP, sockRef, sendRef, &sndData, flags,
+                       &remoteAddr, remoteAddrLen);
+
+    MUNLOCK(descP->writeMtx);
+
+    SGDBG( ("SOCKET", "nif_sendto -> done with result: "
+            "\r\n   %T"
+            "\r\n", res) );
+
+    return res;
+
+#endif // if defined(__WIN32__)
+}
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_sendto(ErlNifEnv*       env,
+                          ESockDescriptor* descP,
+                          ERL_NIF_TERM     sockRef,
+                          ERL_NIF_TERM     sendRef,
+                          ErlNifBinary*    dataP,
+                          int              flags,
+                          ESockAddress*    toAddrP,
+                          unsigned int     toAddrLen)
+{
+    int          save_errno;
+    ssize_t      written;
+    ERL_NIF_TERM writerCheck;
+
+    if (!descP->isWritable)
+        return enif_make_badarg(env);
+
+    /* Check if there is already a current writer and if its us */
+    if (!send_check_writer(env, descP, sendRef, &writerCheck))
+        return writerCheck;
+    
+    /* We ignore the wrap for the moment.
+     * Maybe we should issue a wrap-message to controlling process...
+     */
+    // cnt_inc(&descP->writeTries, 1);
+    SOCK_CNT_INC(env, descP, sockRef, atom_write_tries, &descP->writeTries, 1);
+
+    if (toAddrP != NULL) {
+        written = sock_sendto(descP->sock,
+                              dataP->data, dataP->size, flags,
+                              &toAddrP->sa, toAddrLen);
+    } else {
+        written = sock_sendto(descP->sock,
+                              dataP->data, dataP->size, flags,
+                              NULL, 0);
+    }
+    if (IS_SOCKET_ERROR(written))
+        save_errno = sock_errno();
+    else
+        save_errno = -1; // The value does not actually matter in this case
+
+    return send_check_result(env, descP, written, dataP->size, save_errno,
+                             sockRef, sendRef);
+}
+#endif // if !defined(__WIN32__)
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_sendmsg
+ *
+ * Description:
+ * Send a message on a socket
+ *
+ * Arguments:
+ * Socket (ref) - Points to the socket descriptor.
+ * SendRef      - A unique id for this (send) request.
+ * MsgHdr       - Message Header - data and (maybe) control and dest
+ * Flags        - Send flags.
+ */
+
+static
+ERL_NIF_TERM nif_sendmsg(ErlNifEnv*         env,
+                         int                argc,
+                         const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ERL_NIF_TERM     res, sockRef, sendRef, eMsgHdr;
+    ESockDescriptor* descP;
+    unsigned int     eflags;
+    int              flags;
+
+    SGDBG( ("SOCKET", "nif_sendmsg -> entry with argc: %d\r\n", argc) );
+
+    /* Extract arguments and perform preliminary validation */
+
+    if ((argc != 4) ||
+        !IS_MAP(env, argv[2]) ||
+        !GET_UINT(env, argv[3], &eflags)) {
+        return enif_make_badarg(env);
+    }
+    sockRef = argv[0]; // We need this in case we send abort (to the caller)
+    sendRef = argv[1];
+    eMsgHdr = argv[2];
+
+    if (!ESOCK_GET_RESOURCE(env, sockRef, (void**) &descP)) {
+        return enif_make_badarg(env);
+    }
+    
+    SSDBG( descP,
+           ("SOCKET", "nif_sendmsg -> args when sock = %d:"
+            "\r\n   Socket:  %T"
+            "\r\n   sendRef: %T"
+            "\r\n   eflags:  %d"
+            "\r\n",
+            descP->sock, argv[0], sendRef, eflags) );
+
+    if (!esendflags2sendflags(eflags, &flags))
+        return esock_make_error(env, esock_atom_einval);
+
+    MLOCK(descP->writeMtx);
+
+    res = esock_sendmsg(env, descP, sockRef, sendRef, eMsgHdr, flags);
+
+    MUNLOCK(descP->writeMtx);
+
+    SSDBG( descP,
+           ("SOCKET", "nif_sendmsg -> done with result: "
+            "\r\n   %T"
+            "\r\n", res) );
+
+    return res;
+
+#endif // if defined(__WIN32__)
+}
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_sendmsg(ErlNifEnv*       env,
+                           ESockDescriptor* descP,
+                           ERL_NIF_TERM     sockRef,
+                           ERL_NIF_TERM     sendRef,
+                           ERL_NIF_TERM     eMsgHdr,
+                           int              flags)
+{
+    ERL_NIF_TERM  res, eAddr, eIOV, eCtrl;
+    ESockAddress  addr;
+    struct msghdr msgHdr;
+    ErlNifBinary* iovBins;
+    struct iovec* iov;
+    unsigned int  iovLen;
+    char*         ctrlBuf;
+    size_t        ctrlBufLen, ctrlBufUsed;
+    int           save_errno;
+    ssize_t       written, dataSize;
+    ERL_NIF_TERM  writerCheck;
+    char*         xres;
+
+    if (!descP->isWritable)
+        return enif_make_badarg(env);
+
+    /* Check if there is already a current writer and if its us */
+    if (!send_check_writer(env, descP, sendRef, &writerCheck))
+        return writerCheck;
+    
+    /* Depending on if we are *connected* or not, we require
+     * different things in the msghdr map.
+     */
+    if (IS_CONNECTED(descP)) {
+
+        /* We don't need the address */
+
+        SSDBG( descP, ("SOCKET",
+                       "esock_sendmsg -> connected: no address\r\n") );
+
+        msgHdr.msg_name    = NULL;
+        msgHdr.msg_namelen = 0;
+        
+    } else {
+
+        /* We need the address */
+
+        msgHdr.msg_name    = (void*) &addr;
+        msgHdr.msg_namelen = sizeof(addr);
+        sys_memzero((char *) msgHdr.msg_name, msgHdr.msg_namelen);
+        if (!GET_MAP_VAL(env, eMsgHdr, esock_atom_addr, &eAddr))
+            return esock_make_error(env, esock_atom_einval);
+
+        SSDBG( descP, ("SOCKET", "esock_sendmsg -> not connected: "
+                       "\r\n   address: %T"
+                       "\r\n", eAddr) );
+
+        if ((xres = esock_decode_sockaddr(env, eAddr,
+                                          msgHdr.msg_name,
+                                          &msgHdr.msg_namelen)) != NULL)
+            return esock_make_error_str(env, xres);
+    }
+
+
+    /* Extract the (other) attributes of the msghdr map: iov and maybe ctrl */
+
+    /* The *mandatory* iov, which must be a list */
+    if (!GET_MAP_VAL(env, eMsgHdr, esock_atom_iov, &eIOV))
+        return esock_make_error(env, esock_atom_einval);
+
+    if (!GET_LIST_LEN(env, eIOV, &iovLen) && (iovLen > 0))
+        return esock_make_error(env, esock_atom_einval);
+
+    SSDBG( descP, ("SOCKET", "esock_sendmsg -> iov length: %d\r\n", iovLen) );
+
+    iovBins = MALLOC(iovLen * sizeof(ErlNifBinary));
+    ESOCK_ASSERT( (iovBins != NULL) );
+
+    iov     = MALLOC(iovLen * sizeof(struct iovec));
+    ESOCK_ASSERT( (iov != NULL) );
+
+    /* The *opional* ctrl */
+    if (GET_MAP_VAL(env, eMsgHdr, esock_atom_ctrl, &eCtrl)) {
+        ctrlBufLen = descP->wCtrlSz;
+        ctrlBuf    = (char*) MALLOC(ctrlBufLen);
+        ESOCK_ASSERT( (ctrlBuf != NULL) );
+    } else {
+        eCtrl      = esock_atom_undefined;
+        ctrlBufLen = 0;
+        ctrlBuf    = NULL;
+    }
+    SSDBG( descP, ("SOCKET", "esock_sendmsg -> optional ctrl: "
+                   "\r\n   ctrlBuf:    0x%lX"
+                   "\r\n   ctrlBufLen: %d"
+                   "\r\n   eCtrl:      %T\r\n", ctrlBuf, ctrlBufLen, eCtrl) );
+    
+    /* Decode the iov and initiate that part of the msghdr */
+    if ((xres = esock_decode_iov(env, eIOV,
+                                 iovBins, iov, iovLen, &dataSize)) != NULL) {
+        FREE(iovBins);
+        FREE(iov);
+        if (ctrlBuf != NULL) FREE(ctrlBuf);
+        return esock_make_error_str(env, xres);
+    }
+    msgHdr.msg_iov    = iov;
+    msgHdr.msg_iovlen = iovLen;
+    
+
+    SSDBG( descP, ("SOCKET",
+                   "esock_sendmsg -> "
+                   "total (iov) data size: %d\r\n", dataSize) );
+
+
+    /* Decode the ctrl and initiate that part of the msghdr.
+     */
+    if (ctrlBuf != NULL) {
+        if ((xres = decode_cmsghdrs(env, descP,
+                                    eCtrl,
+                                    ctrlBuf, ctrlBufLen, &ctrlBufUsed)) != NULL) {
+            FREE(iovBins);
+            FREE(iov);
+            if (ctrlBuf != NULL) FREE(ctrlBuf);
+            return esock_make_error_str(env, xres);
+        }
+    } else {
+        ctrlBufUsed = 0;
+    }
+    msgHdr.msg_control    = ctrlBuf;
+    msgHdr.msg_controllen = ctrlBufUsed;
+    
+
+    /* The msg-flags field is not used when sending, but zero it just in case */
+    msgHdr.msg_flags      = 0;
+    
+
+    /* We ignore the wrap for the moment.
+     * Maybe we should issue a wrap-message to controlling process...
+     */
+    // cnt_inc(&descP->writeTries, 1);
+    SOCK_CNT_INC(env, descP, sockRef, atom_write_tries, &descP->writeTries, 1);
+
+    /* And now, finally, try to send the message */
+    written = sock_sendmsg(descP->sock, &msgHdr, flags);
+
+    if (IS_SOCKET_ERROR(written))
+        save_errno = sock_errno();
+    else
+        save_errno = -1; // OK or not complete: this value should not matter in this case
+
+    res = send_check_result(env, descP, written, dataSize, save_errno,
+                            sockRef, sendRef);
+
+    FREE(iovBins);
+    FREE(iov);
+    if (ctrlBuf != NULL) FREE(ctrlBuf);
+    
+    return res;
+
+}
+#endif // if !defined(__WIN32__)
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_writev / nif_sendv
+ *
+ * Description:
+ * Send a message (vector) on a socket
+ *
+ * Arguments:
+ * Socket (ref) - Points to the socket descriptor.
+ * SendRef      - A unique id for this (send) request.
+ * Data         - A vector of binaries
+ * Flags        - Send flags.
+ */
+
+#ifdef FOBAR
+static
+ERL_NIF_TERM nwritev(ErlNifEnv*       env,
+                     ESockDescriptor* descP,
+                     ERL_NIF_TERM     sendRef,
+                     ERL_NIF_TERM     data)
+{
+    ERL_NIF_TERM tail;
+    ErlNifIOVec  vec;
+    ErlNifIOVec* iovec = &vec;
+    SysIOVec*    sysiovec;
+    int          save_errno;
+    int          iovcnt, n;
+
+    if (!enif_inspect_iovec(env, MAX_VSZ, data, &tail, &iovec))
+        return enif_make_badarg(env);
+
+    if (enif_ioq_size(descP->outQ) > 0) {
+        /* If the I/O queue contains data we enqueue the iovec
+         * and then peek the data to write out of the queue.
+         */
+        if (!enif_ioq_enqv(q, iovec, 0))
+            return -3;
+
+        sysiovec = enif_ioq_peek(descP->outQ, &iovcnt);
+
+    } else {
+        /* If the I/O queue is empty we skip the trip through it. */
+        iovcnt   = iovec->iovcnt;
+        sysiovec = iovec->iov;
+    }
+
+    /* Attempt to write the data */
+    n = writev(fd, sysiovec, iovcnt);
+    saved_errno = errno;
+
+    if (enif_ioq_size(descP->outQ) == 0) {
+        /* If the I/O queue was initially empty we enqueue any
+           remaining data into the queue for writing later. */
+        if (n >= 0 && !enif_ioq_enqv(descP->outQ, iovec, n))
+            return -3;
+    } else {
+        /* Dequeue any data that was written from the queue. */
+        if (n > 0 && !enif_ioq_deq(descP->outQ, n, NULL))
+            return -4;
+    }
+    /* return n, which is either number of bytes written or -1 if
+       some error happened */
+    errno = saved_errno;
+    return n;
+}
+#endif
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_recv
+ *
+ * Description:
+ * Receive a message on a socket.
+ * Normally used only on a connected socket!
+ * If we are trying to read > 0 bytes, then that is what we do.
+ * But if we have specified 0 bytes, then we want to read
+ * whatever is in the buffers (everything it got).
+ *
+ * Arguments:
+ * Socket (ref) - Points to the socket descriptor.
+ * RecvRef      - A unique id for this (send) request.
+ * Length       - The number of bytes to receive.
+ * Flags        - Receive flags.
+ */
+
+static
+ERL_NIF_TERM nif_recv(ErlNifEnv*         env,
+                      int                argc,
+                      const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ESockDescriptor* descP;
+    ERL_NIF_TERM     sockRef, recvRef;
+    int              len;
+    unsigned int     eflags;
+    int              flags;
+    ERL_NIF_TERM     res;
+
+    if ((argc != 4) ||
+        !GET_INT(env, argv[2], &len) ||
+        !GET_UINT(env, argv[3], &eflags)) {
+        return enif_make_badarg(env);
+    }
+    sockRef = argv[0]; // We need this in case we send abort (to the caller)
+    recvRef = argv[1];
+
+    if (!ESOCK_GET_RESOURCE(env, sockRef, (void**) &descP)) {
+        return enif_make_badarg(env);
+    }
+    
+    if (!erecvflags2recvflags(eflags, &flags))
+        return enif_make_badarg(env);
+
+    MLOCK(descP->readMtx);
+
+    /* We need to handle the case when another process tries
+     * to receive at the same time.
+     * If the current recv could not read its entire package
+     * this time (resulting in an select). The read of the
+     * other process must be made to wait until current
+     * is done!
+     */
+
+    res = esock_recv(env, descP, sockRef, recvRef, len, flags);
+
+    MUNLOCK(descP->readMtx);
+
+    return res;
+
+#endif // if defined(__WIN32__)
+}
+
+
+/* The (read) buffer handling should be optimized!
+ * But for now we make it easy for ourselves by
+ * allocating a binary (of the specified or default
+ * size) and then throwing it away...
+ */
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_recv(ErlNifEnv*       env,
+                        ESockDescriptor* descP,
+                        ERL_NIF_TERM     sockRef,
+                        ERL_NIF_TERM     recvRef,
+                        int              len,
+                        int              flags)
+{
+    ssize_t      read;
+    ErlNifBinary buf;
+    ERL_NIF_TERM readerCheck;
+    int          save_errno;
+    int          bufSz = (len ? len : descP->rBufSz);
+
+    SSDBG( descP, ("SOCKET", "esock_recv -> entry with"
+                   "\r\n   len:   %d (%d:%d)"
+                   "\r\n   flags: %d"
+                   "\r\n", len, descP->rNumCnt, bufSz, flags) );
+
+    if (!descP->isReadable)
+        return enif_make_badarg(env);
+
+    /* Check if there is already a current reader and if its us */
+    if (!recv_check_reader(env, descP, recvRef, &readerCheck))
+        return readerCheck;
+    
+    /* Allocate a buffer:
+     * Either as much as we want to read or (if zero (0)) use the "default"
+     * size (what has been configured).
+     */
+    if (!ALLOC_BIN(bufSz, &buf))
+        return esock_make_error(env, atom_exalloc);
+
+    // cnt_inc(&descP->readTries, 1);
+    SOCK_CNT_INC(env, descP, sockRef, atom_read_tries, &descP->readTries, 1);
+
+    // If it fails (read = -1), we need errno...
+    SSDBG( descP, ("SOCKET", "esock_recv -> try read (%d)\r\n", buf.size) );
+    read = sock_recv(descP->sock, buf.data, buf.size, flags);
+    if (IS_SOCKET_ERROR(read)) {
+        save_errno = sock_errno();
+    } else {
+        save_errno = -1; // The value does not actually matter in this case
+    }
+    
+    SSDBG( descP, ("SOCKET",
+                   "esock_recv -> read: %d (%d)\r\n", read, save_errno) );
+
+    return recv_check_result(env, descP,
+                             read, len,
+                             save_errno,
+                             &buf,
+                             sockRef,
+                             recvRef);
+}
+#endif // if !defined(__WIN32__)
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_recvfrom
+ *
+ * Description:
+ * Receive a message on a socket.
+ * Normally used only on a (un-) connected socket!
+ * If a buffer size = 0 is specified, then the we will use the default
+ * buffer size for this socket (whatever has been configured).
+ *
+ * Arguments:
+ * Socket (ref) - Points to the socket descriptor.
+ * RecvRef      - A unique id for this (send) request.
+ * BufSz        - Size of the buffer into which we put the received message.
+ * Flags        - Receive flags.
+ *
+ * <KOLLA>
+ *
+ * How do we handle if the peek flag is set? We need to basically keep
+ * track of if we expect any data from the read. Regardless of the 
+ * number of bytes we try to read.
+ *
+ * </KOLLA>
+ */
+
+static
+ERL_NIF_TERM nif_recvfrom(ErlNifEnv*         env,
+                          int                argc,
+                          const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ESockDescriptor* descP;
+    ERL_NIF_TERM     sockRef, recvRef;
+    unsigned int     bufSz;
+    unsigned int     eflags;
+    int              flags;
+    ERL_NIF_TERM     res;
+
+    SGDBG( ("SOCKET", "nif_recvfrom -> entry with argc: %d\r\n", argc) );
+
+    /* Extract arguments and perform preliminary validation */
+
+    if ((argc != 4) ||
+        !GET_UINT(env, argv[2], &bufSz) ||
+        !GET_UINT(env, argv[3], &eflags)) {
+        return enif_make_badarg(env);
+    }
+    sockRef = argv[0]; // We need this in case we send abort (to the caller)
+    recvRef = argv[1];
+
+    if (!ESOCK_GET_RESOURCE(env, sockRef, (void**) &descP)) {
+        return enif_make_badarg(env);
+    }
+
+    SSDBG( descP,
+           ("SOCKET", "nif_recvfrom -> args when sock = %d:"
+            "\r\n   Socket:  %T"
+            "\r\n   recvRef: %T"
+            "\r\n   bufSz:   %d"
+            "\r\n   eflags:  %d"
+            "\r\n", descP->sock, argv[0], recvRef, bufSz, eflags) );
+
+    /* if (IS_OPEN(descP)) */
+    /*     return esock_make_error(env, atom_enotconn); */
+
+    if (!erecvflags2recvflags(eflags, &flags)) {
+        SSDBG( descP, ("SOCKET", "nif_recvfrom -> recvflags decode failed\r\n") );
+        return enif_make_badarg(env);
+    }
+
+    MLOCK(descP->readMtx);
+
+    /* <KOLLA>
+     * We need to handle the case when another process tries
+     * to receive at the same time.
+     * If the current recv could not read its entire package
+     * this time (resulting in an select). The read of the
+     * other process must be made to wait until current
+     * is done!
+     * Basically, we need a read queue!
+     *
+     * A 'reading' field (boolean), which is set if we did
+     * not manage to read the entire message and reset every
+     * time we do.
+     * </KOLLA>
+     */
+
+    res = esock_recvfrom(env, descP, sockRef, recvRef, bufSz, flags);
+
+    MUNLOCK(descP->readMtx);
+
+    return res;
+#endif // if defined(__WIN32__)
+}
+
+
+/* The (read) buffer handling *must* be optimized!
+ * But for now we make it easy for ourselves by
+ * allocating a binary (of the specified or default
+ * size) and then throwing it away...
+ */
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_recvfrom(ErlNifEnv*       env,
+                            ESockDescriptor* descP,
+                            ERL_NIF_TERM     sockRef,
+                            ERL_NIF_TERM     recvRef,
+                            Uint16           len,
+                            int              flags)
+{
+    ESockAddress  fromAddr;
+    unsigned int  addrLen;
+    ssize_t       read;
+    int           save_errno;
+    ErlNifBinary  buf;
+    ERL_NIF_TERM  readerCheck;
+    int           bufSz = (len ? len : descP->rBufSz);
+
+    SSDBG( descP, ("SOCKET", "esock_recvfrom -> entry with"
+                   "\r\n   len:   %d (%d)"
+                   "\r\n   flags: %d"
+                   "\r\n", len, bufSz, flags) );
+
+    if (!descP->isReadable)
+        return enif_make_badarg(env);
+
+    /* Check if there is already a current reader and if its us */
+    if (!recv_check_reader(env, descP, recvRef, &readerCheck))
+        return readerCheck;
+    
+    /* Allocate a buffer:
+     * Either as much as we want to read or (if zero (0)) use the "default"
+     * size (what has been configured).
+     */
+    if (!ALLOC_BIN(bufSz, &buf))
+        return esock_make_error(env, atom_exalloc);
+
+    // cnt_inc(&descP->readTries, 1);
+    SOCK_CNT_INC(env, descP, sockRef, atom_read_tries, &descP->readTries, 1);
+
+    addrLen = sizeof(fromAddr);
+    sys_memzero((char*) &fromAddr, addrLen);
+
+    read = sock_recvfrom(descP->sock, buf.data, buf.size, flags,
+                         &fromAddr.sa, &addrLen);
+    if (IS_SOCKET_ERROR(read))
+        save_errno = sock_errno();
+    else
+        save_errno = -1; // The value does not actually matter in this case
+
+    return recvfrom_check_result(env, descP,
+                                 read,
+                                 save_errno,
+                                 &buf,
+                                 &fromAddr, addrLen,
+                                 sockRef,
+                                 recvRef);
+}
+#endif // if !defined(__WIN32__)
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_recvmsg
+ *
+ * Description:
+ * Receive a message on a socket.
+ * Normally used only on a (un-) connected socket!
+ * If a buffer size = 0 is specified, then we will use the default
+ * buffer size for this socket (whatever has been configured).
+ * If ctrl (buffer) size = 0 is specified, then the default ctrl
+ * (buffer) size is used (1024). 
+ *
+ * Arguments:
+ * Socket (ref) - Points to the socket descriptor.
+ * RecvRef      - A unique id for this (send) request.
+ * BufSz        - Size of the buffer into which we put the received message.
+ * CtrlSz       - Size of the ctrl (buffer) into which we put the received 
+ *                ancillary data.
+ * Flags        - Receive flags.
+ *
+ * <KOLLA>
+ *
+ * How do we handle if the peek flag is set? We need to basically keep
+ * track of if we expect any data from the read. Regardless of the 
+ * number of bytes we try to read.
+ *
+ * </KOLLA>
+ */
+
+static
+ERL_NIF_TERM nif_recvmsg(ErlNifEnv*         env,
+                         int                argc,
+                         const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ESockDescriptor* descP;
+    ERL_NIF_TERM     sockRef, recvRef;
+    unsigned int     bufSz;
+    unsigned int     ctrlSz;
+    unsigned int     eflags;
+    int              flags;
+    ERL_NIF_TERM     res;
+
+    SGDBG( ("SOCKET", "nif_recvmsg -> entry with argc: %d\r\n", argc) );
+
+    /* Extract arguments and perform preliminary validation */
+
+    if ((argc != 5) ||
+        !GET_UINT(env, argv[2], &bufSz) ||
+        !GET_UINT(env, argv[3], &ctrlSz) ||
+        !GET_UINT(env, argv[4], &eflags)) {
+        return enif_make_badarg(env);
+    }
+    sockRef = argv[0]; // We need this in case we send abort (to the caller)
+    recvRef = argv[1];
+
+    if (!ESOCK_GET_RESOURCE(env, sockRef, (void**) &descP)) {
+        return enif_make_badarg(env);
+    }
+    
+    SSDBG( descP,
+           ("SOCKET", "nif_recvmsg -> args when sock = %d:"
+            "\r\n   Socket:  %T"
+            "\r\n   recvRef: %T"
+            "\r\n   bufSz:   %d"
+            "\r\n   ctrlSz:  %d"
+            "\r\n   eflags:  %d"
+            "\r\n", descP->sock, argv[0], recvRef, bufSz, ctrlSz, eflags) );
+
+    /* if (IS_OPEN(descP)) */
+    /*     return esock_make_error(env, atom_enotconn); */
+
+    if (!erecvflags2recvflags(eflags, &flags))
+        return enif_make_badarg(env);
+
+    MLOCK(descP->readMtx);
+
+    /* <KOLLA>
+     *
+     * We need to handle the case when another process tries
+     * to receive at the same time.
+     * If the current recv could not read its entire package
+     * this time (resulting in an select). The read of the
+     * other process must be made to wait until current
+     * is done!
+     * Basically, we need a read queue!
+     *
+     * A 'reading' field (boolean), which is set if we did
+     * not manage to read the entire message and reset every
+     * time we do.
+     *
+     * </KOLLA>
+     */
+
+    res = esock_recvmsg(env, descP, sockRef, recvRef, bufSz, ctrlSz, flags);
+
+    MUNLOCK(descP->readMtx);
+
+    return res;
+#endif // if defined(__WIN32__)
+}
+
+
+/* The (read) buffer handling *must* be optimized!
+ * But for now we make it easy for ourselves by
+ * allocating a binary (of the specified or default
+ * size) and then throwing it away...
+ */
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_recvmsg(ErlNifEnv*       env,
+                           ESockDescriptor* descP,
+                           ERL_NIF_TERM     sockRef,
+                           ERL_NIF_TERM     recvRef,
+                           Uint16           bufLen,
+                           Uint16           ctrlLen,
+                           int              flags)
+{
+    unsigned int  addrLen;
+    ssize_t       read;
+    int           save_errno;
+    int           bufSz  = (bufLen  ? bufLen  : descP->rBufSz);
+    int           ctrlSz = (ctrlLen ? ctrlLen : descP->rCtrlSz);
+    struct msghdr msgHdr;
+    struct iovec  iov[1];  // Shall we always use 1?
+    ErlNifBinary  data[1]; // Shall we always use 1?
+    ErlNifBinary  ctrl;
+    ERL_NIF_TERM  readerCheck;
+    ESockAddress  addr;
+
+    SSDBG( descP, ("SOCKET", "esock_recvmsg -> entry with"
+                   "\r\n   bufSz:  %d (%d)"
+                   "\r\n   ctrlSz: %d (%d)"
+                   "\r\n   flags:  %d"
+                   "\r\n", bufSz, bufLen, ctrlSz, ctrlLen, flags) );
+
+    if (!descP->isReadable)
+        return enif_make_badarg(env);
+
+    /* Check if there is already a current reader and if its us */
+    if (!recv_check_reader(env, descP, recvRef, &readerCheck))
+        return readerCheck;
+    
+    /*
+    for (i = 0; i < sizeof(buf); i++) {
+        if (!ALLOC_BIN(bifSz, &buf[i]))
+            return esock_make_error(env, atom_exalloc);
+        iov[i].iov_base = buf[i].data;
+        iov[i].iov_len  = buf[i].size;
+    }
+    */
+    
+    /* Allocate the (msg) data buffer:
+     */
+    if (!ALLOC_BIN(bufSz, &data[0]))
+        return esock_make_error(env, atom_exalloc);
+
+    /* Allocate the ctrl (buffer):
+     */
+    if (!ALLOC_BIN(ctrlSz, &ctrl))
+        return esock_make_error(env, atom_exalloc);
+
+    // cnt_inc(&descP->readTries, 1);
+    SOCK_CNT_INC(env, descP, sockRef, atom_read_tries, &descP->readTries, 1);
+
+    addrLen = sizeof(addr);
+    sys_memzero((char*) &addr,   addrLen);
+    sys_memzero((char*) &msgHdr, sizeof(msgHdr));
+
+    iov[0].iov_base = data[0].data;
+    iov[0].iov_len  = data[0].size;
+        
+    msgHdr.msg_name       = &addr;
+    msgHdr.msg_namelen    = addrLen;
+    msgHdr.msg_iov        = iov;
+    msgHdr.msg_iovlen     = 1; // Should use a constant or calculate...
+    msgHdr.msg_control    = ctrl.data;
+    msgHdr.msg_controllen = ctrl.size;
+
+    read = sock_recvmsg(descP->sock, &msgHdr, flags);
+    if (IS_SOCKET_ERROR(read))
+        save_errno = sock_errno();
+    else
+        save_errno = -1; // The value does not actually matter in this case
+
+    return recvmsg_check_result(env, descP,
+                                read,
+                                save_errno,
+                                &msgHdr,
+                                data,  // Needed for iov encode
+                                &ctrl, // Needed for ctrl header encode
+                                sockRef,
+                                recvRef);
+}
+#endif // if !defined(__WIN32__)
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_close
+ *
+ * Description:
+ * Close a (socket) file descriptor.
+ *
+ * Arguments:
+ * Socket (ref) - Points to the socket descriptor.
+ */
+
+static
+ERL_NIF_TERM nif_close(ErlNifEnv*         env,
+                       int                argc,
+                       const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ESockDescriptor* descP;
+
+    if ((argc != 1) ||
+        !ESOCK_GET_RESOURCE(env, argv[0], (void**) &descP)) {
+        return enif_make_badarg(env);
+    }
+
+    if (IS_CLOSED(descP) || IS_CLOSING(descP))
+        return esock_make_error(env, atom_closed);
+    
+    return esock_close(env, descP);
+#endif // if defined(__WIN32__)
+}
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_close(ErlNifEnv*       env,
+                         ESockDescriptor* descP)
+{
+    ERL_NIF_TERM reply, reason;
+    BOOLEAN_T    doClose;
+
+    SSDBG( descP, ("SOCKET", 
+                   "esock_close -> [%d] entry (0x%lX, 0x%lX, 0x%lX, 0x%lX)\r\n",
+                   descP->sock,
+                   descP->state,
+                   descP->currentWriterP,
+                   descP->currentReaderP,
+                   descP->currentAcceptorP) );
+
+    MLOCK(descP->closeMtx);
+
+    doClose = esock_close_check(env, descP, &reason);
+
+    if (doClose) {
+        reply = esock_close_do(env, descP);
+    } else {
+        reply = esock_make_error(env, reason);
+    }
+
+    MUNLOCK(descP->closeMtx);
+
+    SSDBG( descP,
+           ("SOCKET", "esock_close -> [%d] done when: "
+            "\r\n   state: 0x%lX"
+            "\r\n   reply: %T"
+            "\r\n", descP->sock, descP->state, reply) );
+
+    return reply;
+}
+
+
+
+/* *** esock_close_check ***
+ *
+ * Check if we should try to perform the first stage close.
+ */
+static
+BOOLEAN_T esock_close_check(ErlNifEnv*       env,
+                            ESockDescriptor* descP,
+                            ERL_NIF_TERM*    reason)
+{
+    BOOLEAN_T doClose;
+
+    if (descP->state == ESOCK_STATE_CLOSED) {
+
+        doClose = FALSE;
+        *reason = atom_closed;
+
+    } else if (descP->state == ESOCK_STATE_CLOSING) {
+
+        doClose = FALSE;
+        *reason = atom_closing;
+
+    } else {
+
+        /* Store the PID of the caller,
+         * since we need to inform it when we
+         * (that is, the stop callback function)
+         * completes.
+         */
+
+        if (enif_self(env, &descP->closerPid) == NULL) {
+
+            doClose = FALSE;
+            *reason = atom_exself;
+
+        } else {
+
+            /* Monitor the caller, since we should complete this
+             * operation even if the caller dies (for whatever reason).
+             *
+             * <KOLLA>
+             *
+             * Can we actually use this for anything?
+             *
+             * </KOLLA>
+             */
+
+            if (MONP("esock_close_check -> closer",
+                     env, descP,
+                     &descP->closerPid,
+                     &descP->closerMon) != 0) {
+
+                doClose = FALSE;
+                *reason = atom_exmon;
+
+            } else {
+
+                descP->closeLocal = TRUE;
+                descP->state      = ESOCK_STATE_CLOSING;
+                descP->isReadable = FALSE;
+                descP->isWritable = FALSE;
+                doClose           = TRUE;
+                *reason           = esock_atom_undefined; // NOT used !!
+
+            }
+        }
+    }
+
+    return doClose;
+    
+}
+
+
+
+/* *** esock_close_do ***
+ *
+ * Perform (do) the first stage close.
+ */
+static
+ERL_NIF_TERM esock_close_do(ErlNifEnv*       env,
+                            ESockDescriptor* descP)
+{
+    int          domain   = descP->domain;
+    int          type     = descP->type;
+    int          protocol = descP->protocol;
+    int          sres;
+    ERL_NIF_TERM reply, reason;
+
+    descP->closeEnv = esock_alloc_env("esock_close_do - close-env");
+    descP->closeRef = MKREF(descP->closeEnv);
+
+    sres            = esock_select_stop(env, descP->sock, descP);
+
+    if (sres & ERL_NIF_SELECT_STOP_CALLED) {
+
+        /* Prep done - inform the caller it can finalize (close) directly */
+        SSDBG( descP,
+               ("SOCKET",
+                "esock_close -> [%d] stop was called\r\n", descP->sock) );
+
+        dec_socket(domain, type, protocol);
+        reply = esock_atom_ok;
+
+    } else if (sres & ERL_NIF_SELECT_STOP_SCHEDULED) {
+
+        /* The stop callback function has been *scheduled* which means that we
+         * have to wait for it to complete. */
+        SSDBG( descP,
+               ("SOCKET", "esock_close -> [%d] stop was scheduled\r\n",
+                descP->sock) );
+
+        dec_socket(domain, type, protocol); // SHALL WE DO THIS AT finalize?
+        reply = esock_make_ok2(env, enif_make_copy(env, descP->closeRef));
+
+    } else {
+
+        SSDBG( descP,
+               ("SOCKET", "esock_close -> [%d] stop failed: %d\r\n",
+                descP->sock, sres) );
+
+        /* <KOLLA>
+         *
+         * WE SHOULD REALLY HAVE A WAY TO CLOBBER THE SOCKET,
+         * SO WE DON'T LET STUFF LEAK.
+         * NOW, BECAUSE WE FAILED TO SELECT, WE CANNOT FINISH
+         * THE CLOSE, WHAT TO DO? ABORT?
+         *
+         * </KOLLA>
+         */
+
+        // Do we need this?
+        DEMONP("esock_close_do -> closer", env, descP, &descP->closerMon); 
+
+        reason = MKT2(env, esock_atom_select_failed, MKI(env, sres));
+        reply  = esock_make_error(env, reason);
+    }
+
+    return reply;
+}
+
+
+
+#endif // if !defined(__WIN32__)
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_finalize_close
+ *
+ * Description:
+ * Perform the actual socket close!
+ * Note that this function is executed in a dirty scheduler.
+ *
+ * Arguments:
+ * Socket (ref) - Points to the socket descriptor.
+ */
+static
+ERL_NIF_TERM nif_finalize_close(ErlNifEnv*         env,
+                                int                argc,
+                                const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ESockDescriptor* descP;
+
+    /* Extract arguments and perform preliminary validation */
+
+    if ((argc != 1) ||
+        !ESOCK_GET_RESOURCE(env, argv[0], (void**) &descP)) {
+        return enif_make_badarg(env);
+    }
+
+    return esock_finalize_close(env, descP);
+#endif // if defined(__WIN32__)
+}
+
+
+/* *** esock_finalize_close ***
+ * Perform the final step in the socket close.
+ */
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_finalize_close(ErlNifEnv*       env,
+                                  ESockDescriptor* descP)
+{
+    ERL_NIF_TERM reply;
+
+    if (IS_CLOSED(descP))
+        return esock_atom_ok;
+
+    if (!IS_CLOSING(descP))
+        return esock_make_error(env, atom_enotclosing);
+
+    /* This nif is executed in a dirty scheduler just so that
+     * it can "hang" (whith minumum effect on the VM) while the
+     * kernel writes our buffers. IF we have set the linger option
+     * for this ({true, integer() > 0}). For this to work we must
+     * be blocking...
+     */
+    SET_BLOCKING(descP->sock);
+
+    if (sock_close(descP->sock) != 0) {
+        int save_errno = sock_errno();
+
+        if (save_errno != ERRNO_BLOCK) {
+            /* Not all data in the buffers where sent,
+             * make sure the caller gets this.
+             */
+            reply = esock_make_error(env, atom_timeout);
+        } else {
+            reply = esock_make_error_errno(env, save_errno);
+        }
+    } else {
+        reply = esock_atom_ok;
+    }
+    sock_close_event(descP->event);
+
+    descP->sock  = INVALID_SOCKET;
+    descP->event = INVALID_EVENT;
+
+    descP->state = ESOCK_STATE_CLOSED;
+
+    return reply;
+}
+#endif // if !defined(__WIN32__)
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_shutdown
+ *
+ * Description:
+ * Disable sends and/or receives on a socket.
+ *
+ * Arguments:
+ * [0] Socket (ref) - Points to the socket descriptor.
+ * [1] How          - What will be shutdown.
+ */
+
+static
+ERL_NIF_TERM nif_shutdown(ErlNifEnv*         env,
+                          int                argc,
+                          const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ESockDescriptor* descP;
+    unsigned int     ehow;
+    int              how;
+
+    if ((argc != 2) ||
+        !ESOCK_GET_RESOURCE(env, argv[0], (void**) &descP) ||
+        !GET_UINT(env, argv[1], &ehow)) {
+        return enif_make_badarg(env);
+    }
+
+    if (IS_CLOSED(descP) || IS_CLOSING(descP))
+        return esock_make_error(env, atom_closed);
+    
+    if (!ehow2how(ehow, &how))
+        return enif_make_badarg(env);
+
+    return esock_shutdown(env, descP, how);
+#endif // if defined(__WIN32__)
+}
+
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_shutdown(ErlNifEnv*       env,
+                            ESockDescriptor* descP,
+                            int              how)
+{
+    ERL_NIF_TERM reply;
+
+    if (sock_shutdown(descP->sock, how) == 0) {
+        switch (how) {
+        case SHUT_RD:
+            descP->isReadable = FALSE;
+            break;
+        case SHUT_WR:
+            descP->isWritable = FALSE;
+            break;
+        case SHUT_RDWR:
+            descP->isReadable = FALSE;
+            descP->isWritable = FALSE;
+            break;
+        }
+        reply = esock_atom_ok;
+    } else {
+        reply = esock_make_error_errno(env, sock_errno());
+    }
+
+    return reply;
+}
+#endif // if !defined(__WIN32__)
+
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_setopt
+ *
+ * Description:
+ * Set socket option.
+ * Its possible to use a "raw" mode (not encoded). That is, we do not
+ * interpret level, opt and value. They are passed "as is" to the
+ * setsockopt function call (the value arguments is assumed to be a
+ * binary, already encoded).
+ *
+ * Arguments:
+ * Socket (ref) - Points to the socket descriptor.
+ * Encoded      - Are the "arguments" encoded or not.
+ * Level        - Level of the socket option.
+ * Opt          - The socket option.
+ * Value        - Value of the socket option (type depend on the option).
+ */
+
+static
+ERL_NIF_TERM nif_setopt(ErlNifEnv*         env,
+                        int                argc,
+                        const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__) 
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ESockDescriptor* descP = NULL;
+    int              eLevel, level = -1;
+    int              eOpt;
+    ERL_NIF_TERM     eIsEncoded;
+    ERL_NIF_TERM     eVal;
+    BOOLEAN_T        isEncoded, isOTP;
+    ERL_NIF_TERM     result;
+
+    SGDBG( ("SOCKET", "nif_setopt -> entry with argc: %d\r\n", argc) );
+
+    /* Extract arguments and perform preliminary validation */
+
+    if ((argc != 5) ||
+        !ESOCK_GET_RESOURCE(env, argv[0], (void**) &descP) ||
+        !GET_INT(env, argv[2], &eLevel) ||
+        !GET_INT(env, argv[3], &eOpt)) {
+        SGDBG( ("SOCKET", "nif_setopt -> failed initial arg check\r\n") );
+        return enif_make_badarg(env);
+    }
+    eIsEncoded = argv[1];
+    eVal       = argv[4];
+
+    if (IS_CLOSED(descP) || IS_CLOSING(descP))
+        return esock_make_error(env, atom_closed);
+    
+    isEncoded = esock_decode_bool(eIsEncoded);
+
+    /* SGDBG( ("SOCKET", "nif_setopt -> eIsDecoded (%T) decoded: %d\r\n", */
+    /*         eIsEncoded, isEncoded) ); */
+
+    if (!elevel2level(isEncoded, eLevel, &isOTP, &level)) {
+        SSDBG( descP, ("SOCKET", "nif_seopt -> failed decode level\r\n") );
+        return esock_make_error(env, esock_atom_einval);
+    }
+
+    SSDBG( descP,
+           ("SOCKET", "nif_setopt -> args when sock = %d:"
+            "\r\n   Socket:  %T"
+            "\r\n   Encoded: %d (%T)"
+            "\r\n   Level:   %d (%d)"
+            "\r\n   Opt:     %d"
+            "\r\n   Value:   %T"
+            "\r\n",
+            descP->sock, argv[0],
+            isEncoded, eIsEncoded,
+            level, eLevel,
+            eOpt, eVal) );
+
+    MLOCK(descP->cfgMtx);
+
+    result = esock_setopt(env, descP, isEncoded, isOTP, level, eOpt, eVal);
+
+    MUNLOCK(descP->cfgMtx);
+
+    SSDBG( descP,
+           ("SOCKET", "nif_setopt -> done when"
+            "\r\n   result: %T"
+            "\r\n", result) );
+
+    return result;
+
+#endif // if defined(__WIN32__)
+}
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_setopt(ErlNifEnv*       env,
+                          ESockDescriptor* descP,
+                          BOOLEAN_T        isEncoded,
+                          BOOLEAN_T        isOTP,
+                          int              level,
+                          int              eOpt,
+                          ERL_NIF_TERM     eVal)
+{
+    ERL_NIF_TERM result;
+
+    if (isOTP) {
+        /* These are not actual socket options,
+         * but options for our implementation.
+         */
+        result = esock_setopt_otp(env, descP, eOpt, eVal);
+    } else if (!isEncoded) {
+        result = esock_setopt_native(env, descP, level, eOpt, eVal);
+    } else {
+        result = esock_setopt_level(env, descP, level, eOpt, eVal);
+    }
+
+    return result;
+}
+
+
+
+/* esock_setopt_otp - Handle OTP (level) options
+ */
+static
+ERL_NIF_TERM esock_setopt_otp(ErlNifEnv*       env,
+                              ESockDescriptor* descP,
+                              int              eOpt,
+                              ERL_NIF_TERM     eVal)
+{
+    ERL_NIF_TERM result;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_otp -> entry with"
+            "\r\n   eOpt: %d"
+            "\r\n   eVal: %T"
+            "\r\n", eOpt, eVal) );
+
+    switch (eOpt) {
+    case ESOCK_OPT_OTP_DEBUG:
+        result = esock_setopt_otp_debug(env, descP, eVal);
+        break;
+
+    case ESOCK_OPT_OTP_IOW:
+        result = esock_setopt_otp_iow(env, descP, eVal);
+        break;
+
+    case ESOCK_OPT_OTP_CTRL_PROC:
+        result = esock_setopt_otp_ctrl_proc(env, descP, eVal);
+        break;
+
+    case ESOCK_OPT_OTP_RCVBUF:
+        result = esock_setopt_otp_rcvbuf(env, descP, eVal);
+        break;
+
+    case ESOCK_OPT_OTP_RCVCTRLBUF:
+        result = esock_setopt_otp_rcvctrlbuf(env, descP, eVal);
+        break;
+
+    case ESOCK_OPT_OTP_SNDCTRLBUF:
+        result = esock_setopt_otp_sndctrlbuf(env, descP, eVal);
+        break;
+
+    default:
+        result = esock_make_error(env, esock_atom_einval);
+        break;
+    }
+
+    return result;
+}
+
+
+/* esock_setopt_otp_debug - Handle the OTP (level) debug options
+ */
+static
+ERL_NIF_TERM esock_setopt_otp_debug(ErlNifEnv*       env,
+                                    ESockDescriptor* descP,
+                                    ERL_NIF_TERM     eVal)
+{
+    descP->dbg = esock_decode_bool(eVal);
+
+    return esock_atom_ok;
+}
+
+
+/* esock_setopt_otp_iow - Handle the OTP (level) iow options
+ */
+static
+ERL_NIF_TERM esock_setopt_otp_iow(ErlNifEnv*       env,
+                                  ESockDescriptor* descP,
+                                  ERL_NIF_TERM     eVal)
+{
+    descP->iow = esock_decode_bool(eVal);
+
+    return esock_atom_ok;
+}
+
+
+
+/* esock_setopt_otp_ctrl_proc - Handle the OTP (level) 
+ * controlling_process options
+ */
+static
+ERL_NIF_TERM esock_setopt_otp_ctrl_proc(ErlNifEnv*       env,
+                                        ESockDescriptor* descP,
+                                        ERL_NIF_TERM     eVal)
+{
+    ErlNifPid     caller, newCtrlPid;
+    ESockMonitor  newCtrlMon;
+    int           xres;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_otp_ctrl_proc -> entry with"
+            "\r\n   eVal: %T"
+            "\r\n", eVal) );
+
+    /* Before we begin, ensure that caller is (current) controlling-process */
+    if (enif_self(env, &caller) == NULL)
+        return esock_make_error(env, atom_exself);
+
+    if (COMPARE_PIDS(&descP->ctrlPid, &caller) != 0) {
+        SSDBG( descP, ("SOCKET",
+                       "esock_setopt_otp_ctrl_proc -> not owner (%T)\r\n",
+                       descP->ctrlPid) );
+        return esock_make_error(env, esock_atom_not_owner);
+    }
+    
+    if (!GET_LPID(env, eVal, &newCtrlPid)) {
+        esock_warning_msg("Failed get pid of new controlling process\r\n");
+        return esock_make_error(env, esock_atom_einval);
+    }
+
+    if ((xres = MONP("esock_setopt_otp_ctrl_proc -> (new) ctrl",
+                     env, descP, &newCtrlPid, &newCtrlMon)) != 0) {
+        esock_warning_msg("Failed monitor (%d) (new) controlling process\r\n",
+                          xres);
+        return esock_make_error(env, esock_atom_einval);
+    }
+
+    if ((xres = DEMONP("esock_setopt_otp_ctrl_proc -> (old) ctrl",
+                       env, descP, &descP->ctrlMon)) != 0) {
+        esock_warning_msg("Failed demonitor (%d) "
+                          "old controlling process %T (%T)\r\n",
+                          xres, descP->ctrlPid, descP->ctrlMon);
+    }
+
+    descP->ctrlPid = newCtrlPid;
+    descP->ctrlMon = newCtrlMon;
+    
+    SSDBG( descP, ("SOCKET", "esock_setopt_otp_ctrl_proc -> done\r\n") );
+
+    return esock_atom_ok;
+}
+
+
+
+/* esock_setopt_otp_rcvbuf - Handle the OTP (level) rcvbuf option
+ * The (otp) rcvbuf option is provided as:
+ *
+ *       BufSz :: integer() | {N :: pos_integer(), BufSz :: pod_integer()}
+ *
+ * Where N is the max number of reads.
+ */
+static
+ERL_NIF_TERM esock_setopt_otp_rcvbuf(ErlNifEnv*       env,
+                                     ESockDescriptor* descP,
+                                     ERL_NIF_TERM     eVal)
+{
+    const ERL_NIF_TERM* t;   // The array of the elements of the tuple
+    int                 tsz; // The size of the tuple - should be 2
+    unsigned int        n;
+    size_t              bufSz;
+    char*               xres;
+
+    if (IS_NUM(env, eVal)) {
+
+        /* This will have the effect that the buffer size will be
+         * reported as an integer (getopt).
+         */
+        n = 0;
+
+        if ((xres = esock_decode_bufsz(env,
+                                       eVal,
+                                       ESOCK_RECV_BUFFER_SIZE_DEFAULT,
+                                       &bufSz)) != NULL)
+            return esock_make_error_str(env, xres);
+
+    } else if (IS_TUPLE(env, eVal)) {
+
+        if (!GET_TUPLE(env, eVal, &tsz, &t))
+            return enif_make_badarg(env); // We should use a "proper" error value...
+
+        if (tsz != 2)
+            return enif_make_badarg(env); // We should use a "proper" error value...
+    
+        if (!GET_UINT(env, t[0], &n))
+            return enif_make_badarg(env); // We should use a "proper" error value...
+
+        if ((xres = esock_decode_bufsz(env,
+                                       t[1],
+                                       ESOCK_RECV_BUFFER_SIZE_DEFAULT,
+                                       &bufSz)) != NULL)
+            return esock_make_error_str(env, xres);
+
+    } else {
+        return enif_make_badarg(env); // We should use a "proper" error value...
+    }
+
+    descP->rNum   = n;
+    descP->rBufSz = bufSz;
+
+    return esock_atom_ok;
+}
+
+
+
+/* esock_setopt_otp_rcvctrlbuf - Handle the OTP (level) rcvctrlbuf option
+ */
+static
+ERL_NIF_TERM esock_setopt_otp_rcvctrlbuf(ErlNifEnv*       env,
+                                         ESockDescriptor* descP,
+                                         ERL_NIF_TERM     eVal)
+{
+    size_t val;
+    char*  xres;
+
+    if ((xres = esock_decode_bufsz(env,
+                                   eVal,
+                                   ESOCK_RECV_CTRL_BUFFER_SIZE_DEFAULT,
+                                   &val)) != NULL)
+        return esock_make_error_str(env, xres);
+
+    descP->rCtrlSz = val;
+    
+    return esock_atom_ok;
+}
+
+
+
+/* esock_setopt_otp_sndctrlbuf - Handle the OTP (level) sndctrlbuf option
+ */
+static
+ERL_NIF_TERM esock_setopt_otp_sndctrlbuf(ErlNifEnv*       env,
+                                         ESockDescriptor* descP,
+                                         ERL_NIF_TERM     eVal)
+{
+    size_t val;
+    char*  xres;
+
+    if ((xres = esock_decode_bufsz(env,
+                                   eVal,
+                                   ESOCK_SEND_CTRL_BUFFER_SIZE_DEFAULT,
+                                   &val)) != NULL)
+        return esock_make_error_str(env, xres);
+
+    descP->wCtrlSz = val;
+    
+    return esock_atom_ok;
+}
+
+
+
+/* The option has *not* been encoded. Instead it has been provided
+ * in "native mode" (option is provided as is and value as a binary).
+ */
+static
+ERL_NIF_TERM esock_setopt_native(ErlNifEnv*       env,
+                                 ESockDescriptor* descP,
+                                 int              level,
+                                 int              opt,
+                                 ERL_NIF_TERM     eVal)
+{
+    ErlNifBinary val;
+    ERL_NIF_TERM result;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_native -> entry with"
+            "\r\n   level: %d"
+            "\r\n   opt:   %d"
+            "\r\n   eVal:  %T"
+            "\r\n", level, opt, eVal) );
+
+    if (GET_BIN(env, eVal, &val)) {
+        int res = socket_setopt(descP->sock, level, opt,
+                                val.data, val.size);
+        if (res != 0)
+            result = esock_make_error_errno(env, sock_errno());
+        else
+            result = esock_atom_ok;
+    } else {
+        result = esock_make_error(env, esock_atom_einval);
+    }
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_native -> done when"
+            "\r\n   result: %T"
+            "\r\n", result) );
+
+    return result;
+}
+
+
+
+/* esock_setopt_level - A "proper" level (option) has been specified
+ */
+static
+ERL_NIF_TERM esock_setopt_level(ErlNifEnv*       env,
+                                ESockDescriptor* descP,
+                                int              level,
+                                int              eOpt,
+                                ERL_NIF_TERM     eVal)
+{
+    ERL_NIF_TERM result;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_level -> entry with"
+            "\r\n   level: %d"
+            "\r\n", level) );
+
+    switch (level) {
+    case SOL_SOCKET:
+        result = esock_setopt_lvl_socket(env, descP, eOpt, eVal);
+        break;
+
+#if defined(SOL_IP)
+    case SOL_IP:
+#else
+    case IPPROTO_IP:
+#endif
+        result = esock_setopt_lvl_ip(env, descP, eOpt, eVal);
+        break;
+
+#if defined(HAVE_IPV6)
+#if defined(SOL_IPV6)
+    case SOL_IPV6:
+#else
+    case IPPROTO_IPV6:
+#endif
+        result = esock_setopt_lvl_ipv6(env, descP, eOpt, eVal);
+        break;
+#endif
+
+    case IPPROTO_TCP:
+        result = esock_setopt_lvl_tcp(env, descP, eOpt, eVal);
+        break;
+
+    case IPPROTO_UDP:
+        result = esock_setopt_lvl_udp(env, descP, eOpt, eVal);
+        break;
+
+#if defined(HAVE_SCTP)
+    case IPPROTO_SCTP:
+        result = esock_setopt_lvl_sctp(env, descP, eOpt, eVal);
+        break;
+#endif
+
+    default:
+        SSDBG( descP,
+               ("SOCKET",
+                "esock_setopt_level -> unknown level (%d)\r\n", level) );
+        result = esock_make_error(env, esock_atom_einval);
+        break;
+    }
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_level -> done when"
+            "\r\n   result: %T"
+            "\r\n", result) );
+
+    return result;
+}
+
+
+
+/* esock_setopt_lvl_socket - Level *SOCKET* option
+ */
+static
+ERL_NIF_TERM esock_setopt_lvl_socket(ErlNifEnv*       env,
+                                     ESockDescriptor* descP,
+                                     int              eOpt,
+                                     ERL_NIF_TERM     eVal)
+{
+    ERL_NIF_TERM result;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_lvl_socket -> entry with"
+            "\r\n   opt: %d"
+            "\r\n", eOpt) );
+
+    switch (eOpt) {
+#if defined(SO_BINDTODEVICE)
+    case ESOCK_OPT_SOCK_BINDTODEVICE:
+        result = esock_setopt_lvl_sock_bindtodevice(env, descP, eVal);
+        break;
+#endif
+
+#if defined(SO_BROADCAST)
+    case ESOCK_OPT_SOCK_BROADCAST:
+        result = esock_setopt_lvl_sock_broadcast(env, descP, eVal);
+        break;
+#endif
+
+#if defined(SO_DEBUG)
+    case ESOCK_OPT_SOCK_DEBUG:
+        result = esock_setopt_lvl_sock_debug(env, descP, eVal);
+        break;
+#endif
+
+#if defined(SO_DONTROUTE)
+    case ESOCK_OPT_SOCK_DONTROUTE:
+        result = esock_setopt_lvl_sock_dontroute(env, descP, eVal);
+        break;
+#endif
+
+#if defined(SO_KEEPALIVE)
+    case ESOCK_OPT_SOCK_KEEPALIVE:
+        result = esock_setopt_lvl_sock_keepalive(env, descP, eVal);
+        break;
+#endif
+
+#if defined(SO_LINGER)
+    case ESOCK_OPT_SOCK_LINGER:
+        result = esock_setopt_lvl_sock_linger(env, descP, eVal);
+        break;
+#endif
+
+#if defined(SO_PEEK_OFF)
+    case ESOCK_OPT_SOCK_PEEK_OFF:
+        result = esock_setopt_lvl_sock_peek_off(env, descP, eVal);
+        break;
+#endif
+
+#if defined(SO_OOBINLINE)
+    case ESOCK_OPT_SOCK_OOBINLINE:
+        result = esock_setopt_lvl_sock_oobinline(env, descP, eVal);
+        break;
+#endif
+
+#if defined(SO_PRIORITY)
+    case ESOCK_OPT_SOCK_PRIORITY:
+        result = esock_setopt_lvl_sock_priority(env, descP, eVal);
+        break;
+#endif
+
+#if defined(SO_RCVBUF)
+    case ESOCK_OPT_SOCK_RCVBUF:
+        result = esock_setopt_lvl_sock_rcvbuf(env, descP, eVal);
+        break;
+#endif
+
+#if defined(SO_RCVLOWAT)
+    case ESOCK_OPT_SOCK_RCVLOWAT:
+        result = esock_setopt_lvl_sock_rcvlowat(env, descP, eVal);
+        break;
+#endif
+
+#if defined(SO_RCVTIMEO)
+    case ESOCK_OPT_SOCK_RCVTIMEO:
+        result = esock_setopt_lvl_sock_rcvtimeo(env, descP, eVal);
+        break;
+#endif
+
+#if defined(SO_REUSEADDR)
+    case ESOCK_OPT_SOCK_REUSEADDR:
+        result = esock_setopt_lvl_sock_reuseaddr(env, descP, eVal);
+        break;
+#endif
+
+#if defined(SO_REUSEPORT)
+    case ESOCK_OPT_SOCK_REUSEPORT:
+        result = esock_setopt_lvl_sock_reuseport(env, descP, eVal);
+        break;
+#endif
+
+#if defined(SO_SNDBUF)
+    case ESOCK_OPT_SOCK_SNDBUF:
+        result = esock_setopt_lvl_sock_sndbuf(env, descP, eVal);
+        break;
+#endif
+
+#if defined(SO_SNDLOWAT)
+    case ESOCK_OPT_SOCK_SNDLOWAT:
+        result = esock_setopt_lvl_sock_sndlowat(env, descP, eVal);
+        break;
+#endif
+
+#if defined(SO_SNDTIMEO)
+    case ESOCK_OPT_SOCK_SNDTIMEO:
+        result = esock_setopt_lvl_sock_sndtimeo(env, descP, eVal);
+        break;
+#endif
+
+#if defined(SO_TIMESTAMP)
+    case ESOCK_OPT_SOCK_TIMESTAMP:
+        result = esock_setopt_lvl_sock_timestamp(env, descP, eVal);
+        break;
+#endif
+
+    default:
+        SSDBG( descP,
+               ("SOCKET",
+                "esock_setopt_lvl_socket -> unknown opt (%d)\r\n", eOpt) );
+        result = esock_make_error(env, esock_atom_einval);
+        break;
+    }
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_lvl_socket -> done when"
+            "\r\n   result: %T"
+            "\r\n", result) );
+
+    return result;
+}
+
+
+#if defined(SO_BINDTODEVICE)
+static
+ERL_NIF_TERM esock_setopt_lvl_sock_bindtodevice(ErlNifEnv*       env,
+                                                ESockDescriptor* descP,
+                                                ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_str_opt(env, descP,
+                                SOL_SOCKET, SO_BINDTODEVICE,
+                                IFNAMSIZ, eVal);
+}
+#endif
+
+
+#if defined(SO_BROADCAST)
+static
+ERL_NIF_TERM esock_setopt_lvl_sock_broadcast(ErlNifEnv*       env,
+                                             ESockDescriptor* descP,
+                                             ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_bool_opt(env, descP, SOL_SOCKET, SO_BROADCAST, eVal);
+}
+#endif
+
+
+#if defined(SO_DEBUG)
+static
+ERL_NIF_TERM esock_setopt_lvl_sock_debug(ErlNifEnv*       env,
+                                         ESockDescriptor* descP,
+                                         ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_int_opt(env, descP, SOL_SOCKET, SO_DEBUG, eVal);
+}
+#endif
+
+
+#if defined(SO_DONTROUTE)
+static
+ERL_NIF_TERM esock_setopt_lvl_sock_dontroute(ErlNifEnv*       env,
+                                             ESockDescriptor* descP,
+                                             ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_bool_opt(env, descP, SOL_SOCKET, SO_DONTROUTE, eVal);
+}
+#endif
+
+
+#if defined(SO_KEEPALIVE)
+static
+ERL_NIF_TERM esock_setopt_lvl_sock_keepalive(ErlNifEnv*       env,
+                                             ESockDescriptor* descP,
+                                             ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_bool_opt(env, descP, SOL_SOCKET, SO_KEEPALIVE, eVal);
+}
+#endif
+
+
+#if defined(SO_LINGER)
+static
+ERL_NIF_TERM esock_setopt_lvl_sock_linger(ErlNifEnv*       env,
+                                          ESockDescriptor* descP,
+                                          ERL_NIF_TERM     eVal)
+{
+    ERL_NIF_TERM  result;
+    struct linger val;
+
+    if (decode_sock_linger(env, eVal, &val)) {
+        int optLen = sizeof(val);
+        int res    = socket_setopt(descP->sock, SOL_SOCKET, SO_LINGER,
+                                   (void*) &val, optLen);
+        if (res != 0)
+            result = esock_make_error_errno(env, sock_errno());
+        else
+            result = esock_atom_ok;
+    } else {
+        result = esock_make_error(env, esock_atom_einval);
+    }
+
+    return result;
+}
+#endif
+
+
+#if defined(SO_OOBINLINE)
+static
+ERL_NIF_TERM esock_setopt_lvl_sock_oobinline(ErlNifEnv*       env,
+                                             ESockDescriptor* descP,
+                                             ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_bool_opt(env, descP, SOL_SOCKET, SO_OOBINLINE, eVal);
+}
+#endif
+
+
+#if defined(SO_PEEK_OFF)
+static
+ERL_NIF_TERM esock_setopt_lvl_sock_peek_off(ErlNifEnv*       env,
+                                            ESockDescriptor* descP,
+                                            ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_int_opt(env, descP, SOL_SOCKET, SO_PEEK_OFF, eVal);
+}
+#endif
+
+
+#if defined(SO_PRIORITY)
+static
+ERL_NIF_TERM esock_setopt_lvl_sock_priority(ErlNifEnv*       env,
+                                            ESockDescriptor* descP,
+                                            ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_int_opt(env, descP, SOL_SOCKET, SO_PRIORITY, eVal);
+}
+#endif
+
+
+#if defined(SO_RCVBUF)
+static
+ERL_NIF_TERM esock_setopt_lvl_sock_rcvbuf(ErlNifEnv*       env,
+                                          ESockDescriptor* descP,
+                                          ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_int_opt(env, descP, SOL_SOCKET, SO_RCVBUF, eVal);
+}
+#endif
+
+
+#if defined(SO_RCVLOWAT)
+static
+ERL_NIF_TERM esock_setopt_lvl_sock_rcvlowat(ErlNifEnv*       env,
+                                            ESockDescriptor* descP,
+                                            ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_int_opt(env, descP, SOL_SOCKET, SO_RCVLOWAT, eVal);
+}
+#endif
+
+
+#if defined(SO_RCVTIMEO)
+static
+ERL_NIF_TERM esock_setopt_lvl_sock_rcvtimeo(ErlNifEnv*       env,
+                                            ESockDescriptor* descP,
+                                            ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_timeval_opt(env, descP, SOL_SOCKET, SO_RCVTIMEO, eVal);
+}
+#endif
+
+
+#if defined(SO_REUSEADDR)
+static
+ERL_NIF_TERM esock_setopt_lvl_sock_reuseaddr(ErlNifEnv*       env,
+                                             ESockDescriptor* descP,
+                                             ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_bool_opt(env, descP, SOL_SOCKET, SO_REUSEADDR, eVal);
+}
+#endif
+
+
+#if defined(SO_REUSEPORT)
+static
+ERL_NIF_TERM esock_setopt_lvl_sock_reuseport(ErlNifEnv*       env,
+                                             ESockDescriptor* descP,
+                                             ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_bool_opt(env, descP, SOL_SOCKET, SO_REUSEPORT, eVal);
+}
+#endif
+
+
+#if defined(SO_SNDBUF)
+static
+ERL_NIF_TERM esock_setopt_lvl_sock_sndbuf(ErlNifEnv*       env,
+                                          ESockDescriptor* descP,
+                                          ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_int_opt(env, descP, SOL_SOCKET, SO_SNDBUF, eVal);
+}
+#endif
+
+
+#if defined(SO_SNDLOWAT)
+static
+ERL_NIF_TERM esock_setopt_lvl_sock_sndlowat(ErlNifEnv*       env,
+                                            ESockDescriptor* descP,
+                                            ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_int_opt(env, descP, SOL_SOCKET, SO_SNDLOWAT, eVal);
+}
+#endif
+
+
+#if defined(SO_SNDTIMEO)
+static
+ERL_NIF_TERM esock_setopt_lvl_sock_sndtimeo(ErlNifEnv*       env,
+                                            ESockDescriptor* descP,
+                                            ERL_NIF_TERM     eVal)
+{
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_lvl_sock_sndtimeo -> entry with"
+            "\r\n   eVal: %T"
+            "\r\n", eVal) );
+
+    return esock_setopt_timeval_opt(env, descP, SOL_SOCKET, SO_SNDTIMEO, eVal);
+}
+#endif
+
+
+#if defined(SO_TIMESTAMP)
+static
+ERL_NIF_TERM esock_setopt_lvl_sock_timestamp(ErlNifEnv*       env,
+                                             ESockDescriptor* descP,
+                                             ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_bool_opt(env, descP, SOL_SOCKET, SO_TIMESTAMP, eVal);
+}
+#endif
+
+
+
+/* esock_setopt_lvl_ip - Level *IP* option(s)
+ */
+static
+ERL_NIF_TERM esock_setopt_lvl_ip(ErlNifEnv*       env,
+                                 ESockDescriptor* descP,
+                                 int              eOpt,
+                                 ERL_NIF_TERM     eVal)
+{
+    ERL_NIF_TERM result;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_lvl_ip -> entry with"
+            "\r\n   opt: %d"
+            "\r\n", eOpt) );
+
+    switch (eOpt) {
+#if defined(IP_ADD_MEMBERSHIP)
+    case ESOCK_OPT_IP_ADD_MEMBERSHIP:
+        result = esock_setopt_lvl_ip_add_membership(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_ADD_SOURCE_MEMBERSHIP)
+    case ESOCK_OPT_IP_ADD_SOURCE_MEMBERSHIP:
+        result = esock_setopt_lvl_ip_add_source_membership(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_BLOCK_SOURCE)
+    case ESOCK_OPT_IP_BLOCK_SOURCE:
+        result = esock_setopt_lvl_ip_block_source(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_DROP_MEMBERSHIP)
+    case ESOCK_OPT_IP_DROP_MEMBERSHIP:
+        result = esock_setopt_lvl_ip_drop_membership(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_DROP_SOURCE_MEMBERSHIP)
+    case ESOCK_OPT_IP_DROP_SOURCE_MEMBERSHIP:
+        result = esock_setopt_lvl_ip_drop_source_membership(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_FREEBIND)
+    case ESOCK_OPT_IP_FREEBIND:
+        result = esock_setopt_lvl_ip_freebind(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_HDRINCL)
+    case ESOCK_OPT_IP_HDRINCL:
+        result = esock_setopt_lvl_ip_hdrincl(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_MINTTL)
+    case ESOCK_OPT_IP_MINTTL:
+        result = esock_setopt_lvl_ip_minttl(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_MSFILTER) && defined(IP_MSFILTER_SIZE)
+    case ESOCK_OPT_IP_MSFILTER:
+        result = esock_setopt_lvl_ip_msfilter(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_MTU_DISCOVER)
+    case ESOCK_OPT_IP_MTU_DISCOVER:
+        result = esock_setopt_lvl_ip_mtu_discover(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_MULTICAST_ALL)
+    case ESOCK_OPT_IP_MULTICAST_ALL:
+        result = esock_setopt_lvl_ip_multicast_all(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_MULTICAST_IF)
+    case ESOCK_OPT_IP_MULTICAST_IF:
+        result = esock_setopt_lvl_ip_multicast_if(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_MULTICAST_LOOP)
+    case ESOCK_OPT_IP_MULTICAST_LOOP:
+        result = esock_setopt_lvl_ip_multicast_loop(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_MULTICAST_TTL)
+    case ESOCK_OPT_IP_MULTICAST_TTL:
+        result = esock_setopt_lvl_ip_multicast_ttl(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_NODEFRAG)
+    case ESOCK_OPT_IP_NODEFRAG:
+        result = esock_setopt_lvl_ip_nodefrag(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_PKTINFO)
+    case ESOCK_OPT_IP_PKTINFO:
+        result = esock_setopt_lvl_ip_pktinfo(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_RECVDSTADDR)
+    case ESOCK_OPT_IP_RECVDSTADDR:
+        result = esock_setopt_lvl_ip_recvdstaddr(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_RECVERR)
+    case ESOCK_OPT_IP_RECVERR:
+        result = esock_setopt_lvl_ip_recverr(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_RECVIF)
+    case ESOCK_OPT_IP_RECVIF:
+        result = esock_setopt_lvl_ip_recvif(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_RECVOPTS)
+    case ESOCK_OPT_IP_RECVOPTS:
+        result = esock_setopt_lvl_ip_recvopts(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_RECVORIGDSTADDR)
+    case ESOCK_OPT_IP_RECVORIGDSTADDR:
+        result = esock_setopt_lvl_ip_recvorigdstaddr(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_RECVTOS)
+    case ESOCK_OPT_IP_RECVTOS:
+        result = esock_setopt_lvl_ip_recvtos(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_RECVTTL)
+    case ESOCK_OPT_IP_RECVTTL:
+        result = esock_setopt_lvl_ip_recvttl(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_RETOPTS)
+    case ESOCK_OPT_IP_RETOPTS:
+        result = esock_setopt_lvl_ip_retopts(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_ROUTER_ALERT)
+    case ESOCK_OPT_IP_ROUTER_ALERT:
+        result = esock_setopt_lvl_ip_router_alert(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_SENDSRCADDR)
+    case ESOCK_OPT_IP_SENDSRCADDR:
+        result = esock_setopt_lvl_ip_sendsrcaddr(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_TOS)
+    case ESOCK_OPT_IP_TOS:
+        result = esock_setopt_lvl_ip_tos(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_TRANSPARENT)
+    case ESOCK_OPT_IP_TRANSPARENT:
+        result = esock_setopt_lvl_ip_transparent(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_TTL)
+    case ESOCK_OPT_IP_TTL:
+        result = esock_setopt_lvl_ip_ttl(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IP_UNBLOCK_SOURCE)
+    case ESOCK_OPT_IP_UNBLOCK_SOURCE:
+        result = esock_setopt_lvl_ip_unblock_source(env, descP, eVal);
+        break;
+#endif
+
+    default:
+        SSDBG( descP, ("SOCKET",
+                       "esock_setopt_lvl_ip -> unknown opt (%d)\r\n", eOpt) );
+        result = esock_make_error(env, esock_atom_einval);
+        break;
+    }
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_lvl_ip -> done when"
+            "\r\n   result: %T"
+            "\r\n", result) );
+
+    return result;
+}
+
+
+/* esock_setopt_lvl_ip_add_membership - Level IP ADD_MEMBERSHIP option
+ *
+ * The value is a map with two attributes: multiaddr and interface.
+ * The attribute 'multiaddr' is always a 4-tuple (IPv4 address).
+ * The attribute 'interface' is either the atom 'any' or a 4-tuple
+ * (IPv4 address).
+ */
+#if defined(IP_ADD_MEMBERSHIP)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_add_membership(ErlNifEnv*       env,
+                                                ESockDescriptor* descP,
+                                                ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_lvl_ip_update_membership(env, descP, eVal,
+                                                 IP_ADD_MEMBERSHIP);
+}
+#endif
+
+
+/* esock_setopt_lvl_ip_add_source_membership -
+ * Level IP ADD_SOURCE_MEMBERSHIP option
+ *
+ * The value is a map with three attributes: multiaddr, interface and
+ * sourceaddr.
+ * The attribute 'multiaddr' is always a 4-tuple (IPv4 address).
+ * The attribute 'interface' is always a 4-tuple (IPv4 address).
+ * The attribute 'sourceaddr' is always a 4-tuple (IPv4 address).
+ * (IPv4 address).
+ */
+#if defined(IP_ADD_SOURCE_MEMBERSHIP)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_add_source_membership(ErlNifEnv*       env,
+                                                       ESockDescriptor* descP,
+                                                       ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_lvl_ip_update_source(env, descP, eVal,
+                                             IP_ADD_SOURCE_MEMBERSHIP);
+}
+#endif
+
+
+/* esock_setopt_lvl_ip_block_source - Level IP BLOCK_SOURCE option
+ *
+ * The value is a map with three attributes: multiaddr, interface and
+ * sourceaddr.
+ * The attribute 'multiaddr' is always a 4-tuple (IPv4 address).
+ * The attribute 'interface' is always a 4-tuple (IPv4 address).
+ * The attribute 'sourceaddr' is always a 4-tuple (IPv4 address).
+ * (IPv4 address).
+ */
+#if defined(IP_BLOCK_SOURCE)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_block_source(ErlNifEnv*       env,
+                                              ESockDescriptor* descP,
+                                              ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_lvl_ip_update_source(env, descP, eVal, IP_BLOCK_SOURCE);
+}
+#endif
+
+
+/* esock_setopt_lvl_ip_drop_membership - Level IP DROP_MEMBERSHIP option
+ *
+ * The value is a map with two attributes: multiaddr and interface.
+ * The attribute 'multiaddr' is always a 4-tuple (IPv4 address).
+ * The attribute 'interface' is either the atom 'any' or a 4-tuple
+ * (IPv4 address).
+ *
+ * We should really have a common function with add_membership,
+ * since the code is virtually identical (except for the option
+ * value).
+ */
+#if defined(IP_DROP_MEMBERSHIP)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_drop_membership(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP,
+                                                 ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_lvl_ip_update_membership(env, descP, eVal,
+                                                 IP_DROP_MEMBERSHIP);
+}
+#endif
+
+
+
+/* esock_setopt_lvl_ip_drop_source_membership - 
+ * Level IP DROP_SOURCE_MEMBERSHIP option
+ *
+ * The value is a map with three attributes: multiaddr, interface and
+ * sourceaddr.
+ * The attribute 'multiaddr' is always a 4-tuple (IPv4 address).
+ * The attribute 'interface' is always a 4-tuple (IPv4 address).
+ * The attribute 'sourceaddr' is always a 4-tuple (IPv4 address).
+ * (IPv4 address).
+ */
+#if defined(IP_DROP_SOURCE_MEMBERSHIP)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_drop_source_membership(ErlNifEnv*       env,
+                                                        ESockDescriptor* descP,
+                                                        ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_lvl_ip_update_source(env, descP, eVal,
+                                             IP_DROP_SOURCE_MEMBERSHIP);
+}
+#endif
+
+
+
+/* esock_setopt_lvl_ip_freebind - Level IP FREEBIND option
+ */
+#if defined(IP_FREEBIND)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_freebind(ErlNifEnv*       env,
+                                          ESockDescriptor* descP,
+                                          ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_setopt_bool_opt(env, descP, level, IP_FREEBIND, eVal);
+}
+#endif
+
+
+
+/* esock_setopt_lvl_ip_hdrincl - Level IP HDRINCL option
+ */
+#if defined(IP_HDRINCL)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_hdrincl(ErlNifEnv*       env,
+                                         ESockDescriptor* descP,
+                                         ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_setopt_bool_opt(env, descP, level, IP_HDRINCL, eVal);
+}
+#endif
+
+
+
+/* esock_setopt_lvl_ip_minttl - Level IP MINTTL option
+ */
+#if defined(IP_MINTTL)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_minttl(ErlNifEnv*       env,
+                                        ESockDescriptor* descP,
+                                        ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_setopt_int_opt(env, descP, level, IP_MINTTL, eVal);
+}
+#endif
+
+
+
+/* esock_setopt_lvl_ip_msfilter - Level IP MSFILTER option
+ *
+ * The value can be *either* the atom 'null' or a map of type ip_msfilter().
+ */
+#if defined(IP_MSFILTER) && defined(IP_MSFILTER_SIZE)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_msfilter(ErlNifEnv*       env,
+                                          ESockDescriptor* descP,
+                                          ERL_NIF_TERM     eVal)
+{
+    ERL_NIF_TERM result;
+
+    if (COMPARE(eVal, atom_null) == 0) {
+        return esock_setopt_lvl_ip_msfilter_set(env, descP->sock, NULL, 0);
+    } else {
+        struct ip_msfilter* msfP;
+        Uint32              msfSz;
+        ERL_NIF_TERM        eMultiAddr, eInterface, eFMode, eSList, elem, tail;
+        size_t              sz;
+        unsigned int        slistLen, idx;
+
+        if (!IS_MAP(env, eVal))
+            return esock_make_error(env, esock_atom_einval);
+        
+        // It must have atleast four attributes
+        if (!enif_get_map_size(env, eVal, &sz) || (sz < 4))
+            return esock_make_error(env, esock_atom_einval);
+
+        if (!GET_MAP_VAL(env, eVal, atom_multiaddr, &eMultiAddr))
+            return esock_make_error(env, esock_atom_einval);
+        
+        if (!GET_MAP_VAL(env, eVal, atom_interface, &eInterface))
+            return esock_make_error(env, esock_atom_einval);
+        
+        if (!GET_MAP_VAL(env, eVal, atom_mode, &eFMode))
+            return esock_make_error(env, esock_atom_einval);
+        
+        if (!GET_MAP_VAL(env, eVal, atom_slist, &eSList))
+            return esock_make_error(env, esock_atom_einval);
+
+        /* We start (decoding) with the slist, since without it we don't
+         * really know how much (memory) to allocate.
+         */
+        if (!GET_LIST_LEN(env, eSList, &slistLen))
+            return esock_make_error(env, esock_atom_einval);
+
+        msfSz = IP_MSFILTER_SIZE(slistLen);
+        msfP  = MALLOC(msfSz);
+
+        if (!esock_decode_ip4_address(env, eMultiAddr, &msfP->imsf_multiaddr)) {
+            FREE(msfP);
+            return esock_make_error(env, esock_atom_einval);
+        }
+        
+        if (!esock_decode_ip4_address(env, eInterface, &msfP->imsf_interface)) {
+            FREE(msfP);
+            return esock_make_error(env, esock_atom_einval);
+        }
+        
+        if (!decode_ip_msfilter_mode(env, eFMode, (Uint32*) &msfP->imsf_fmode)) {
+            FREE(msfP);
+            return esock_make_error(env, esock_atom_einval);
+        }
+
+        /* And finally, extract the source addresses */
+        msfP->imsf_numsrc = slistLen;
+        for (idx = 0; idx < slistLen; idx++) {
+            if (GET_LIST_ELEM(env, eSList, &elem, &tail)) {
+                if (!esock_decode_ip4_address(env, elem, &msfP->imsf_slist[idx])) {
+                    FREE(msfP);
+                    return esock_make_error(env, esock_atom_einval);
+                } else {
+                    eSList = tail;
+                }
+            }
+        }
+
+        /* And now, finally, set the option */
+        result = esock_setopt_lvl_ip_msfilter_set(env, descP->sock,
+                                                  msfP, msfSz);
+        FREE(msfP);
+        return result;
+    }
+
+}
+
+
+static
+BOOLEAN_T decode_ip_msfilter_mode(ErlNifEnv*   env,
+                                  ERL_NIF_TERM eVal,
+                                  Uint32*      mode)
+{
+    BOOLEAN_T result;
+
+    if (COMPARE(eVal, atom_include) == 0) {
+        *mode  = MCAST_INCLUDE;
+        result = TRUE;        
+    } else if (COMPARE(eVal, atom_exclude) == 0) {
+        *mode  = MCAST_EXCLUDE;
+        result = TRUE;        
+    } else {
+        result = FALSE;
+    }
+
+    return result;
+}
+
+
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_msfilter_set(ErlNifEnv*          env,
+                                              SOCKET              sock,
+                                              struct ip_msfilter* msfP,
+                                              SOCKLEN_T           optLen)
+{
+    ERL_NIF_TERM result;
+    int          res;
+#if defined(SOL_IP)
+    int          level = SOL_IP;
+#else
+    int          level = IPPROTO_IP;
+#endif
+
+    res = socket_setopt(sock, level, IP_MSFILTER, (void*) msfP, optLen);
+    if (res != 0)
+        result = esock_make_error_errno(env, sock_errno());
+    else
+        result = esock_atom_ok;
+
+    return result;
+}
+#endif // IP_MSFILTER
+
+
+
+/* esock_setopt_lvl_ip_mtu_discover - Level IP MTU_DISCOVER option
+ *
+ * The value is an atom of the type ip_pmtudisc().
+ */
+#if defined(IP_MTU_DISCOVER)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_mtu_discover(ErlNifEnv*       env,
+                                              ESockDescriptor* descP,
+                                              ERL_NIF_TERM     eVal)
+{
+    ERL_NIF_TERM   result;
+    int            val;
+    char*          xres;
+    int            res;
+#if defined(SOL_IP)
+    int            level = SOL_IP;
+#else
+    int            level = IPPROTO_IP;
+#endif
+
+    if ((xres = decode_ip_pmtudisc(env, eVal, &val)) != NULL) {
+
+        result = esock_make_error_str(env, xres);
+
+    } else {
+
+        res = socket_setopt(descP->sock, level, IP_MTU_DISCOVER,
+                            &val, sizeof(val));
+
+        if (res != 0)
+            result = esock_make_error_errno(env, sock_errno());
+        else
+            result = esock_atom_ok;
+
+    }
+
+    return result;
+}
+#endif
+
+
+/* esock_setopt_lvl_ip_multicast_all - Level IP MULTICAST_ALL option
+ */
+#if defined(IP_MULTICAST_ALL)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_multicast_all(ErlNifEnv*       env,
+                                               ESockDescriptor* descP,
+                                               ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_setopt_bool_opt(env, descP, level, IP_MULTICAST_ALL, eVal);
+}
+#endif
+
+
+/* esock_setopt_lvl_ip_multicast_if - Level IP MULTICAST_IF option
+ *
+ * The value is either the atom 'any' or a 4-tuple.
+ */
+#if defined(IP_MULTICAST_IF)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_multicast_if(ErlNifEnv*       env,
+                                              ESockDescriptor* descP,
+                                              ERL_NIF_TERM     eVal)
+{
+    ERL_NIF_TERM   result;
+    struct in_addr ifAddr;
+    char*          xres;
+    int            res;
+#if defined(SOL_IP)
+    int            level = SOL_IP;
+#else
+    int            level = IPPROTO_IP;
+#endif
+
+    if ((xres = esock_decode_ip4_address(env, eVal, &ifAddr)) != NULL) {
+        result = esock_make_error_str(env, xres);
+    } else {
+        
+        res = socket_setopt(descP->sock, level, IP_MULTICAST_LOOP,
+                            &ifAddr, sizeof(ifAddr));
+
+        if (res != 0)
+            result = esock_make_error_errno(env, sock_errno());
+        else
+            result = esock_atom_ok;
+
+    }
+
+    return result;
+}
+#endif
+
+
+/* esock_setopt_lvl_ip_multicast_loop - Level IP MULTICAST_LOOP option
+ */
+#if defined(IP_MULTICAST_LOOP)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_multicast_loop(ErlNifEnv*       env,
+                                                ESockDescriptor* descP,
+                                                ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_setopt_bool_opt(env, descP, level, IP_MULTICAST_LOOP, eVal);
+}
+#endif
+
+
+/* esock_setopt_lvl_ip_multicast_ttl - Level IP MULTICAST_TTL option
+ */
+#if defined(IP_MULTICAST_TTL)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_multicast_ttl(ErlNifEnv*       env,
+                                               ESockDescriptor* descP,
+                                               ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_setopt_int_opt(env, descP, level, IP_MULTICAST_TTL, eVal);
+}
+#endif
+
+
+/* esock_setopt_lvl_ip_nodefrag - Level IP NODEFRAG option
+ */
+#if defined(IP_NODEFRAG)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_nodefrag(ErlNifEnv*       env,
+                                          ESockDescriptor* descP,
+                                          ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_setopt_bool_opt(env, descP, level, IP_NODEFRAG, eVal);
+}
+#endif
+
+
+/* esock_setopt_lvl_ip_pktinfo - Level IP PKTINFO option
+ */
+#if defined(IP_PKTINFO)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_pktinfo(ErlNifEnv*       env,
+                                         ESockDescriptor* descP,
+                                         ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_setopt_bool_opt(env, descP, level, IP_PKTINFO, eVal);
+}
+#endif
+
+
+/* esock_setopt_lvl_ip_recvdstaddr - Level IP RECVDSTADDR option
+ */
+#if defined(IP_RECVDSTADDR)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_recvdstaddr(ErlNifEnv*       env,
+                                             ESockDescriptor* descP,
+                                             ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_setopt_bool_opt(env, descP, level, IP_RECVDSTADDR, eVal);
+}
+#endif
+
+
+/* esock_setopt_lvl_ip_recverr - Level IP RECVERR option
+ */
+#if defined(IP_RECVERR)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_recverr(ErlNifEnv*       env,
+                                         ESockDescriptor* descP,
+                                         ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_setopt_bool_opt(env, descP, level, IP_RECVERR, eVal);
+}
+#endif
+
+
+/* esock_setopt_lvl_ip_recvif - Level IP RECVIF option
+ */
+#if defined(IP_RECVIF)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_recvif(ErlNifEnv*       env,
+                                        ESockDescriptor* descP,
+                                        ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_setopt_bool_opt(env, descP, level, IP_RECVIF, eVal);
+}
+#endif
+
+
+/* esock_setopt_lvl_ip_recvopts - Level IP RECVOPTS option
+ */
+#if defined(IP_RECVOPTS)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_recvopts(ErlNifEnv*       env,
+                                          ESockDescriptor* descP,
+                                          ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_setopt_bool_opt(env, descP, level, IP_RECVOPTS, eVal);
+}
+#endif
+
+
+/* esock_setopt_lvl_ip_recvorigdstaddr - Level IP RECVORIGDSTADDR option
+ */
+#if defined(IP_RECVORIGDSTADDR)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_recvorigdstaddr(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP,
+                                                 ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_setopt_bool_opt(env, descP, level, IP_RECVORIGDSTADDR, eVal);
+}
+#endif
+
+
+/* esock_setopt_lvl_ip_recvtos - Level IP RECVTOS option
+ */
+#if defined(IP_RECVTOS)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_recvtos(ErlNifEnv*       env,
+                                         ESockDescriptor* descP,
+                                         ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_setopt_bool_opt(env, descP, level, IP_RECVTOS, eVal);
+}
+#endif
+
+
+/* esock_setopt_lvl_ip_recvttl - Level IP RECVTTL option
+ */
+#if defined(IP_RECVTTL)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_recvttl(ErlNifEnv*       env,
+                                         ESockDescriptor* descP,
+                                         ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_setopt_bool_opt(env, descP, level, IP_RECVTTL, eVal);
+}
+#endif
+
+
+/* esock_setopt_lvl_ip_retopts - Level IP RETOPTS option
+ */
+#if defined(IP_RETOPTS)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_retopts(ErlNifEnv*       env,
+                                         ESockDescriptor* descP,
+                                         ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_setopt_bool_opt(env, descP, level, IP_RETOPTS, eVal);
+}
+#endif
+
+
+/* esock_setopt_lvl_ip_router_alert - Level IP ROUTER_ALERT option
+ */
+#if defined(IP_ROUTER_ALERT)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_router_alert(ErlNifEnv*       env,
+                                              ESockDescriptor* descP,
+                                              ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_setopt_int_opt(env, descP, level, IP_ROUTER_ALERT, eVal);
+}
+#endif
+
+
+/* esock_setopt_lvl_ip_sendsrcaddr - Level IP SENDSRCADDR option
+ */
+#if defined(IP_SENDSRCADDR)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_sendsrcaddr(ErlNifEnv*       env,
+                                             ESockDescriptor* descP,
+                                             ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_setopt_bool_opt(env, descP, level, IP_SENDSRCADDR, eVal);
+}
+#endif
+
+
+/* esock_setopt_lvl_ip_tos - Level IP TOS option
+ */
+#if defined(IP_TOS)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_tos(ErlNifEnv*       env,
+                                     ESockDescriptor* descP,
+                                     ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IP)
+    int          level = SOL_IP;
+#else
+    int          level = IPPROTO_IP;
+#endif
+    ERL_NIF_TERM result;
+    int          val;
+
+    if (decode_ip_tos(env, eVal, &val)) {
+        int res = socket_setopt(descP->sock, level, IP_TOS, &val, sizeof(val));
+
+        if (res != 0)
+            result = esock_make_error_errno(env, sock_errno());
+        else
+            result = esock_atom_ok;
+
+    } else {
+        result = esock_make_error(env, esock_atom_einval);
+    }
+
+    return result;
+}
+#endif
+
+
+/* esock_setopt_lvl_ip_transparent - Level IP TRANSPARENT option
+ */
+#if defined(IP_TRANSPARENT)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_transparent(ErlNifEnv*       env,
+                                             ESockDescriptor* descP,
+                                             ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_setopt_bool_opt(env, descP, level, IP_TRANSPARENT, eVal);
+}
+#endif
+
+
+
+/* esock_setopt_lvl_ip_ttl - Level IP TTL option
+ */
+#if defined(IP_TTL)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_ttl(ErlNifEnv*       env,
+                                     ESockDescriptor* descP,
+                                     ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_setopt_int_opt(env, descP, level, IP_TTL, eVal);
+}
+#endif
+
+
+
+/* esock_setopt_lvl_ip_unblock_source - Level IP UNBLOCK_SOURCE option
+ *
+ * The value is a map with three attributes: multiaddr, interface and
+ * sourceaddr.
+ * The attribute 'multiaddr' is always a 4-tuple (IPv4 address).
+ * The attribute 'interface' is always a 4-tuple (IPv4 address).
+ * The attribute 'sourceaddr' is always a 4-tuple (IPv4 address).
+ * (IPv4 address).
+ */
+#if defined(IP_UNBLOCK_SOURCE)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_unblock_source(ErlNifEnv*       env,
+                                                ESockDescriptor* descP,
+                                                ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_lvl_ip_update_source(env, descP, eVal,
+                                             IP_UNBLOCK_SOURCE);
+}
+#endif
+
+
+
+#if defined(IP_ADD_MEMBERSHIP) || defined(IP_DROP_MEMBERSHIP)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_update_membership(ErlNifEnv*       env,
+                                                   ESockDescriptor* descP,
+                                                   ERL_NIF_TERM     eVal,
+                                                   int              opt)
+{
+    ERL_NIF_TERM   result, eMultiAddr, eInterface;
+    struct ip_mreq mreq;
+    char*          xres;
+    int            res;
+    size_t         sz;
+#if defined(SOL_IP)
+    int            level = SOL_IP;
+#else
+    int            level = IPPROTO_IP;
+#endif
+
+    // It must be a map
+    if (!IS_MAP(env, eVal)) {
+        SSDBG( descP,
+               ("SOCKET", "esock_setopt_lvl_ip_update_membership -> "
+                "value *not* a map\r\n") );
+        return enif_make_badarg(env);
+    }
+
+    // It must have atleast two attributes
+    if (!enif_get_map_size(env, eVal, &sz) || (sz < 2)) {
+        SSDBG( descP,
+               ("SOCKET", "esock_setopt_lvl_ip_update_membership -> "
+                "invalid map value: %T\r\n", eVal) );
+        return enif_make_badarg(env);
+    }
+
+    if (!GET_MAP_VAL(env, eVal, atom_multiaddr, &eMultiAddr)) {
+        SSDBG( descP,
+               ("SOCKET", "esock_setopt_lvl_ip_update_membership -> "
+                "failed get multiaddr (map) attribute\r\n") );
+        return enif_make_badarg(env);
+    }
+
+    if (!GET_MAP_VAL(env, eVal, atom_interface, &eInterface)) {
+        SSDBG( descP,
+               ("SOCKET", "esock_setopt_lvl_ip_update_membership -> "
+                "failed get interface (map) attribute\r\n") );
+        return enif_make_badarg(env);
+    }
+
+    if ((xres = esock_decode_ip4_address(env,
+                                         eMultiAddr,
+                                         &mreq.imr_multiaddr)) != NULL) {
+        SSDBG( descP,
+               ("SOCKET", "esock_setopt_lvl_ip_update_membership -> "
+                "failed decode multiaddr %T: %s\r\n", eMultiAddr, xres) );
+        return esock_make_error_str(env, xres);
+    }
+
+    if ((xres = esock_decode_ip4_address(env,
+                                         eInterface,
+                                         &mreq.imr_interface)) != NULL) {
+        SSDBG( descP,
+               ("SOCKET", "esock_setopt_lvl_ip_update_membership -> "
+                "failed decode interface %T: %s\r\n", eInterface, xres) );
+        return esock_make_error_str(env, xres);
+    }
+
+    res = socket_setopt(descP->sock, level, opt, &mreq, sizeof(mreq));
+
+    if (res != 0) {
+        int save_errno = sock_errno();
+
+        result = esock_make_error_errno(env, save_errno);
+
+        SSDBG( descP,
+               ("SOCKET", "esock_setopt_lvl_ip_update_membership -> "
+                "failed setopt: %T (%d)\r\n", result, save_errno) );
+
+    } else {
+        result = esock_atom_ok;
+    }
+
+    return result;
+}
+#endif
+
+
+#if defined(IP_ADD_SOURCE_MEMBERSHIP) || defined(IP_DROP_SOURCE_MEMBERSHIP) || defined(IP_BLOCK_SOURCE) || defined(IP_UNBLOCK_SOURCE)
+static
+ERL_NIF_TERM esock_setopt_lvl_ip_update_source(ErlNifEnv*       env,
+                                               ESockDescriptor* descP,
+                                               ERL_NIF_TERM     eVal,
+                                               int              opt)
+{
+    ERL_NIF_TERM          result, eMultiAddr, eInterface, eSourceAddr;
+    struct ip_mreq_source mreq;
+    char*                 xres;
+    int                   res;
+    size_t                sz;
+#if defined(SOL_IP)
+    int            level = SOL_IP;
+#else
+    int            level = IPPROTO_IP;
+#endif
+
+    // It must be a map
+    if (!IS_MAP(env, eVal))
+        return enif_make_badarg(env);
+
+    // It must have atleast three attributes
+    if (!enif_get_map_size(env, eVal, &sz) || (sz >= 3))
+        return enif_make_badarg(env);
+
+    if (!GET_MAP_VAL(env, eVal, atom_multiaddr, &eMultiAddr))
+        return enif_make_badarg(env);
+
+    if (!GET_MAP_VAL(env, eVal, atom_interface, &eInterface))
+        return enif_make_badarg(env);
+
+    if (!GET_MAP_VAL(env, eVal, atom_sourceaddr, &eSourceAddr))
+        return enif_make_badarg(env);
+
+    if ((xres = esock_decode_ip4_address(env,
+                                         eMultiAddr,
+                                         &mreq.imr_multiaddr)) != NULL)
+        return esock_make_error_str(env, xres);
+
+    if ((xres = esock_decode_ip4_address(env,
+                                         eInterface,
+                                         &mreq.imr_interface)) != NULL)
+        return esock_make_error_str(env, xres);
+
+    if ((xres = esock_decode_ip4_address(env,
+                                         eSourceAddr,
+                                         &mreq.imr_sourceaddr)) != NULL)
+        return esock_make_error_str(env, xres);
+
+    res = socket_setopt(descP->sock, level, opt, &mreq, sizeof(mreq));
+
+    if (res != 0)
+        result = esock_make_error_errno(env, sock_errno());
+    else
+        result = esock_atom_ok;
+
+    return result;
+}
+#endif
+
+
+
+/* *** Handling set of socket options for level = ipv6 *** */
+
+/* esock_setopt_lvl_ipv6 - Level *IPv6* option(s)
+ */
+#if defined(HAVE_IPV6)
+static
+ERL_NIF_TERM esock_setopt_lvl_ipv6(ErlNifEnv*       env,
+                                   ESockDescriptor* descP,
+                                   int              eOpt,
+                                   ERL_NIF_TERM     eVal)
+{
+    ERL_NIF_TERM result;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_lvl_ipv6 -> entry with"
+            "\r\n   opt: %d"
+            "\r\n", eOpt) );
+
+    switch (eOpt) {
+#if defined(IPV6_ADDRFORM)
+    case ESOCK_OPT_IPV6_ADDRFORM:
+        result = esock_setopt_lvl_ipv6_addrform(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IPV6_ADD_MEMBERSHIP)
+    case ESOCK_OPT_IPV6_ADD_MEMBERSHIP:
+        result = esock_setopt_lvl_ipv6_add_membership(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IPV6_AUTHHDR)
+    case ESOCK_OPT_IPV6_AUTHHDR:
+        result = esock_setopt_lvl_ipv6_authhdr(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IPV6_DROP_MEMBERSHIP)
+    case ESOCK_OPT_IPV6_DROP_MEMBERSHIP:
+        result = esock_setopt_lvl_ipv6_drop_membership(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IPV6_DSTOPTS)
+    case ESOCK_OPT_IPV6_DSTOPTS:
+        result = esock_setopt_lvl_ipv6_dstopts(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IPV6_FLOWINFO)
+    case ESOCK_OPT_IPV6_FLOWINFO:
+        result = esock_setopt_lvl_ipv6_flowinfo(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IPV6_HOPLIMIT)
+    case ESOCK_OPT_IPV6_HOPLIMIT:
+        result = esock_setopt_lvl_ipv6_hoplimit(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IPV6_HOPOPTS)
+    case ESOCK_OPT_IPV6_HOPOPTS:
+        result = esock_setopt_lvl_ipv6_hopopts(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IPV6_MTU)
+    case ESOCK_OPT_IPV6_MTU:
+        result = esock_setopt_lvl_ipv6_mtu(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IPV6_MTU_DISCOVER)
+    case ESOCK_OPT_IPV6_MTU_DISCOVER:
+        result = esock_setopt_lvl_ipv6_mtu_discover(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IPV6_MULTICAST_HOPS)
+    case ESOCK_OPT_IPV6_MULTICAST_HOPS:
+        result = esock_setopt_lvl_ipv6_multicast_hops(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IPV6_MULTICAST_IF)
+    case ESOCK_OPT_IPV6_MULTICAST_IF:
+        result = esock_setopt_lvl_ipv6_multicast_if(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IPV6_MULTICAST_LOOP)
+    case ESOCK_OPT_IPV6_MULTICAST_LOOP:
+        result = esock_setopt_lvl_ipv6_multicast_loop(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IPV6_RECVERR)
+    case ESOCK_OPT_IPV6_RECVERR:
+        result = esock_setopt_lvl_ipv6_recverr(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IPV6_RECVPKTINFO) || defined(IPV6_PKTINFO)
+    case ESOCK_OPT_IPV6_RECVPKTINFO:
+        result = esock_setopt_lvl_ipv6_recvpktinfo(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IPV6_ROUTER_ALERT)
+    case ESOCK_OPT_IPV6_ROUTER_ALERT:
+        result = esock_setopt_lvl_ipv6_router_alert(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IPV6_RTHDR)
+    case ESOCK_OPT_IPV6_RTHDR:
+        result = esock_setopt_lvl_ipv6_rthdr(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IPV6_UNICAST_HOPS)
+    case ESOCK_OPT_IPV6_UNICAST_HOPS:
+        result = esock_setopt_lvl_ipv6_unicast_hops(env, descP, eVal);
+        break;
+#endif
+
+#if defined(IPV6_V6ONLY)
+    case ESOCK_OPT_IPV6_V6ONLY:
+        result = esock_setopt_lvl_ipv6_v6only(env, descP, eVal);
+        break;
+#endif
+
+    default:
+        SSDBG( descP,
+               ("SOCKET",
+                "esock_setopt_lvl_ipv6 -> unknown opt (%d)\r\n", eOpt) );
+        result = esock_make_error(env, esock_atom_einval);
+        break;
+    }
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_lvl_ipv6 -> done when"
+            "\r\n   result: %T"
+            "\r\n", result) );
+
+    return result;
+}
+
+
+#if defined(IPV6_ADDRFORM)
+static
+ERL_NIF_TERM esock_setopt_lvl_ipv6_addrform(ErlNifEnv*       env,
+                                            ESockDescriptor* descP,
+                                            ERL_NIF_TERM     eVal)
+{
+    ERL_NIF_TERM result;
+    int          res, edomain, domain;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_lvl_ipv6_addrform -> entry with"
+            "\r\n   eVal: %T"
+            "\r\n", eVal) );
+
+    if (!GET_INT(env, eVal, &edomain))
+        return esock_make_error(env, esock_atom_einval);
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_lvl_ipv6_addrform -> decode"
+            "\r\n   edomain: %d"
+            "\r\n", edomain) );
+
+    if (!edomain2domain(edomain, &domain))
+        return esock_make_error(env, esock_atom_einval);
+
+    SSDBG( descP, ("SOCKET",
+                   "esock_setopt_lvl_ipv6_addrform -> try set opt to %d\r\n",
+                   domain) );
+    
+    res = socket_setopt(descP->sock,
+                        SOL_IPV6, IPV6_ADDRFORM,
+                        &domain, sizeof(domain));
+
+    if (res != 0)
+        result = esock_make_error_errno(env, sock_errno());
+    else
+        result = esock_atom_ok;
+
+    return result;
+}
+#endif
+
+
+#if defined(IPV6_ADD_MEMBERSHIP)
+static
+ERL_NIF_TERM esock_setopt_lvl_ipv6_add_membership(ErlNifEnv*       env,
+                                                  ESockDescriptor* descP,
+                                                  ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_lvl_ipv6_update_membership(env, descP, eVal,
+                                              IPV6_ADD_MEMBERSHIP);
+}
+#endif
+
+
+#if defined(IPV6_AUTHHDR)
+static
+ERL_NIF_TERM esock_setopt_lvl_ipv6_authhdr(ErlNifEnv*       env,
+                                           ESockDescriptor* descP,
+                                           ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_bool_opt(env, descP, SOL_IPV6, IPV6_AUTHHDR, eVal);
+}
+#endif
+
+
+#if defined(IPV6_DROP_MEMBERSHIP)
+static
+ERL_NIF_TERM esock_setopt_lvl_ipv6_drop_membership(ErlNifEnv*       env,
+                                                   ESockDescriptor* descP,
+                                                   ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_lvl_ipv6_update_membership(env, descP, eVal,
+                                              IPV6_DROP_MEMBERSHIP);
+}
+#endif
+
+
+#if defined(IPV6_DSTOPTS)
+static
+ERL_NIF_TERM esock_setopt_lvl_ipv6_dstopts(ErlNifEnv*       env,
+                                           ESockDescriptor* descP,
+                                           ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+
+    return esock_setopt_bool_opt(env, descP, level, IPV6_DSTOPTS, eVal);
+}
+#endif
+
+
+#if defined(IPV6_FLOWINFO)
+static
+ERL_NIF_TERM esock_setopt_lvl_ipv6_flowinfo(ErlNifEnv*       env,
+                                            ESockDescriptor* descP,
+                                            ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+
+    return esock_setopt_bool_opt(env, descP, level, IPV6_FLOWINFO, eVal);
+}
+#endif
+
+
+#if defined(IPV6_HOPLIMIT)
+static
+ERL_NIF_TERM esock_setopt_lvl_ipv6_hoplimit(ErlNifEnv*       env,
+                                            ESockDescriptor* descP,
+                                            ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+
+    return esock_setopt_bool_opt(env, descP, level, IPV6_HOPLIMIT, eVal);
+}
+#endif
+
+
+#if defined(IPV6_HOPOPTS)
+static
+ERL_NIF_TERM esock_setopt_lvl_ipv6_hopopts(ErlNifEnv*       env,
+                                           ESockDescriptor* descP,
+                                           ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+
+    return esock_setopt_bool_opt(env, descP, level, IPV6_HOPOPTS, eVal);
+}
+#endif
+
+
+#if defined(IPV6_MTU)
+static
+ERL_NIF_TERM esock_setopt_lvl_ipv6_mtu(ErlNifEnv*       env,
+                                  ESockDescriptor* descP,
+                                  ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+
+    return esock_setopt_int_opt(env, descP, level, IPV6_MTU, eVal);
+}
+#endif
+
+
+/* esock_setopt_lvl_ipv6_mtu_discover - Level IPv6 MTU_DISCOVER option
+ *
+ * The value is an atom of the type ipv6_pmtudisc().
+ */
+#if defined(IPV6_MTU_DISCOVER)
+static
+ERL_NIF_TERM esock_setopt_lvl_ipv6_mtu_discover(ErlNifEnv*       env,
+                                                ESockDescriptor* descP,
+                                                ERL_NIF_TERM     eVal)
+{
+    ERL_NIF_TERM  result;
+    int           val;
+    char*         xres;
+    int           res;
+
+    if ((xres = decode_ipv6_pmtudisc(env, eVal, &val)) != NULL) {
+
+        result = esock_make_error_str(env, xres);
+
+    } else {
+#if defined(SOL_IPV6)
+        int level = SOL_IPV6;
+#else
+        int level = IPPROTO_IPV6;
+#endif
+
+
+        res = socket_setopt(descP->sock, level, IPV6_MTU_DISCOVER,
+                            &val, sizeof(val));
+
+        if (res != 0)
+            result = esock_make_error_errno(env, sock_errno());
+        else
+            result = esock_atom_ok;
+
+    }
+
+    return result;
+}
+#endif
+
+
+#if defined(IPV6_MULTICAST_HOPS)
+static
+ERL_NIF_TERM esock_setopt_lvl_ipv6_multicast_hops(ErlNifEnv*       env,
+                                                  ESockDescriptor* descP,
+                                                  ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+
+    return esock_setopt_int_opt(env, descP, level, IPV6_MULTICAST_HOPS, eVal);
+}
+#endif
+
+
+
+#if defined(IPV6_MULTICAST_IF)
+static
+ERL_NIF_TERM esock_setopt_lvl_ipv6_multicast_if(ErlNifEnv*       env,
+                                                ESockDescriptor* descP,
+                                                ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+
+    return esock_setopt_int_opt(env, descP, level, IPV6_MULTICAST_IF, eVal);
+}
+#endif
+
+
+
+#if defined(IPV6_MULTICAST_LOOP)
+static
+ERL_NIF_TERM esock_setopt_lvl_ipv6_multicast_loop(ErlNifEnv*       env,
+                                                  ESockDescriptor* descP,
+                                                  ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+
+    return esock_setopt_bool_opt(env, descP, level, IPV6_MULTICAST_LOOP, eVal);
+}
+#endif
+
+
+#if defined(IPV6_RECVERR)
+static
+ERL_NIF_TERM esock_setopt_lvl_ipv6_recverr(ErlNifEnv*       env,
+                                           ESockDescriptor* descP,
+                                           ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+
+    return esock_setopt_bool_opt(env, descP, level, IPV6_RECVERR, eVal);
+}
+#endif
+
+
+#if defined(IPV6_RECVPKTINFO) || defined(IPV6_PKTINFO)
+static
+ERL_NIF_TERM esock_setopt_lvl_ipv6_recvpktinfo(ErlNifEnv*       env,
+                                               ESockDescriptor* descP,
+                                               ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+#if defined(IPV6_RECVPKTINFO)
+    int opt = IPV6_RECVPKTINFO;
+#else
+    int opt = IPV6_PKTINFO;
+#endif
+
+    return esock_setopt_bool_opt(env, descP, level, opt, eVal);
+}
+#endif
+
+
+#if defined(IPV6_ROUTER_ALERT)
+static
+ERL_NIF_TERM esock_setopt_lvl_ipv6_router_alert(ErlNifEnv*       env,
+                                                ESockDescriptor* descP,
+                                                ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+
+    return esock_setopt_int_opt(env, descP, level, IPV6_ROUTER_ALERT, eVal);
+}
+#endif
+
+
+
+#if defined(IPV6_RTHDR)
+static
+ERL_NIF_TERM esock_setopt_lvl_ipv6_rthdr(ErlNifEnv*       env,
+                                         ESockDescriptor* descP,
+                                         ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+
+    return esock_setopt_bool_opt(env, descP, level, IPV6_RTHDR, eVal);
+}
+#endif
+
+
+#if defined(IPV6_UNICAST_HOPS)
+static
+ERL_NIF_TERM esock_setopt_lvl_ipv6_unicast_hops(ErlNifEnv*       env,
+                                                ESockDescriptor* descP,
+                                                ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+
+    return esock_setopt_int_opt(env, descP, level, IPV6_UNICAST_HOPS, eVal);
+}
+#endif
+
+
+
+#if defined(IPV6_V6ONLY)
+static
+ERL_NIF_TERM esock_setopt_lvl_ipv6_v6only(ErlNifEnv*       env,
+                                          ESockDescriptor* descP,
+                                          ERL_NIF_TERM     eVal)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+
+    return esock_setopt_bool_opt(env, descP, level, IPV6_V6ONLY, eVal);
+}
+#endif
+
+
+#if defined(IPV6_ADD_MEMBERSHIP) || defined(IPV6_DROP_MEMBERSHIP)
+static
+ERL_NIF_TERM esock_setopt_lvl_ipv6_update_membership(ErlNifEnv*       env,
+                                                     ESockDescriptor* descP,
+                                                     ERL_NIF_TERM     eVal,
+                                                     int              opt)
+{
+    ERL_NIF_TERM     result, eMultiAddr, eInterface;
+    struct ipv6_mreq mreq;
+    char*            xres;
+    int              res;
+    size_t           sz;
+#if defined(SOL_IPV6)
+    int              level = SOL_IPV6;
+#else
+    int              level = IPPROTO_IPV6;
+#endif
+
+    // It must be a map
+    if (!IS_MAP(env, eVal)) {
+        SSDBG( descP,
+               ("SOCKET", "esock_setopt_lvl_ipv6_update_membership -> "
+                "value *not* a map\r\n") );
+        return enif_make_badarg(env);
+    }
+
+    // It must have atleast two attributes
+    if (!enif_get_map_size(env, eVal, &sz) || (sz < 2)) {
+        SSDBG( descP,
+               ("SOCKET", "esock_setopt_lvl_ipv6_update_membership -> "
+                "invalid map value: %T\r\n", eVal) );
+        return enif_make_badarg(env);
+    }
+
+    if (!GET_MAP_VAL(env, eVal, atom_multiaddr, &eMultiAddr)) {
+        SSDBG( descP,
+               ("SOCKET", "esock_setopt_lvl_ipv6_update_membership -> "
+                "failed get multiaddr (map) attribute\r\n") );
+        return enif_make_badarg(env);
+    }
+
+    if (!GET_MAP_VAL(env, eVal, atom_interface, &eInterface)) {
+        SSDBG( descP,
+               ("SOCKET", "esock_setopt_lvl_ipv6_update_membership -> "
+                "failed get interface (map) attribute\r\n") );
+        return enif_make_badarg(env);
+    }
+
+    if ((xres = esock_decode_ip6_address(env,
+                                         eMultiAddr,
+                                         &mreq.ipv6mr_multiaddr)) != NULL) {
+        SSDBG( descP,
+               ("SOCKET", "esock_setopt_lvl_ipv6_update_membership -> "
+                "failed decode multiaddr %T: %s\r\n", eMultiAddr, xres) );
+        return esock_make_error_str(env, xres);
+    }
+
+    if (!GET_UINT(env, eInterface, &mreq.ipv6mr_interface)) {
+        SSDBG( descP,
+               ("SOCKET", "esock_setopt_lvl_ip_update_membership -> "
+                "failed decode interface %T: %s\r\n", eInterface, xres) );
+        return esock_make_error(env, esock_atom_einval);
+    }
+
+    res = socket_setopt(descP->sock, level, opt, &mreq, sizeof(mreq));
+
+    if (res != 0) {
+        int save_errno = sock_errno();
+
+        result = esock_make_error_errno(env, save_errno);
+
+        SSDBG( descP,
+               ("SOCKET", "esock_setopt_lvl_ipv6_update_membership -> "
+                "failed setopt: %T (%d)\r\n", result, save_errno) );
+
+    } else {
+        result = esock_atom_ok;
+    }
+
+    return result;
+}
+#endif
+
+
+
+#endif // defined(HAVE_IPV6)
+
+
+
+/* esock_setopt_lvl_tcp - Level *TCP* option(s)
+ */
+static
+ERL_NIF_TERM esock_setopt_lvl_tcp(ErlNifEnv*       env,
+                                  ESockDescriptor* descP,
+                                  int              eOpt,
+                                  ERL_NIF_TERM     eVal)
+{
+    ERL_NIF_TERM result;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_lvl_tcp -> entry with"
+            "\r\n   opt: %d"
+            "\r\n", eOpt) );
+
+    switch (eOpt) {
+#if defined(TCP_CONGESTION)
+    case ESOCK_OPT_TCP_CONGESTION:
+        result = esock_setopt_lvl_tcp_congestion(env, descP, eVal);
+        break;
+#endif
+
+#if defined(TCP_MAXSEG)
+    case ESOCK_OPT_TCP_MAXSEG:
+        result = esock_setopt_lvl_tcp_maxseg(env, descP, eVal);
+        break;
+#endif
+
+#if defined(TCP_NODELAY)
+    case ESOCK_OPT_TCP_NODELAY:
+        result = esock_setopt_lvl_tcp_nodelay(env, descP, eVal);
+        break;
+#endif
+
+    default:
+        result = esock_make_error(env, esock_atom_einval);
+        break;
+    }
+
+    return result;
+}
+
+
+/* esock_setopt_lvl_tcp_congestion - Level TCP CONGESTION option
+ */
+#if defined(TCP_CONGESTION)
+static
+ERL_NIF_TERM esock_setopt_lvl_tcp_congestion(ErlNifEnv*       env,
+                                             ESockDescriptor* descP,
+                                             ERL_NIF_TERM     eVal)
+{
+    int max = ESOCK_OPT_TCP_CONGESTION_NAME_MAX+1;
+
+    return esock_setopt_str_opt(env, descP,
+                                IPPROTO_TCP, TCP_CONGESTION, max, eVal);
+}
+#endif
+
+
+/* esock_setopt_lvl_tcp_maxseg - Level TCP MAXSEG option
+ */
+#if defined(TCP_MAXSEG)
+static
+ERL_NIF_TERM esock_setopt_lvl_tcp_maxseg(ErlNifEnv*       env,
+                                         ESockDescriptor* descP,
+                                         ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_int_opt(env, descP, IPPROTO_TCP, TCP_MAXSEG, eVal);
+}
+#endif
+
+
+/* esock_setopt_lvl_tcp_nodelay - Level TCP NODELAY option
+ */
+#if defined(TCP_NODELAY)
+static
+ERL_NIF_TERM esock_setopt_lvl_tcp_nodelay(ErlNifEnv*       env,
+                                          ESockDescriptor* descP,
+                                          ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_bool_opt(env, descP, IPPROTO_TCP, TCP_NODELAY, eVal);
+}
+#endif
+
+
+
+/* esock_setopt_lvl_udp - Level *UDP* option(s)
+ */
+static
+ERL_NIF_TERM esock_setopt_lvl_udp(ErlNifEnv*       env,
+                                  ESockDescriptor* descP,
+                                  int              eOpt,
+                                  ERL_NIF_TERM     eVal)
+{
+    ERL_NIF_TERM result;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_lvl_udp -> entry with"
+            "\r\n   opt: %d"
+            "\r\n", eOpt) );
+
+    switch (eOpt) {
+#if defined(UDP_CORK)
+    case ESOCK_OPT_UDP_CORK:
+        result = esock_setopt_lvl_udp_cork(env, descP, eVal);
+        break;
+#endif
+
+    default:
+        result = esock_make_error(env, esock_atom_einval);
+        break;
+    }
+
+    return result;
+}
+
+
+/* esock_setopt_lvl_udp_cork - Level UDP CORK option
+ */
+#if defined(UDP_CORK)
+static
+ERL_NIF_TERM esock_setopt_lvl_udp_cork(ErlNifEnv*       env,
+                                       ESockDescriptor* descP,
+                                       ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_bool_opt(env, descP, IPPROTO_UDP, UDP_CORK, eVal);
+}
+#endif
+
+
+
+
+/* esock_setopt_lvl_sctp - Level *SCTP* option(s)
+ */
+#if defined(HAVE_SCTP)
+static
+ERL_NIF_TERM esock_setopt_lvl_sctp(ErlNifEnv*       env,
+                                   ESockDescriptor* descP,
+                                   int              eOpt,
+                                   ERL_NIF_TERM     eVal)
+{
+    ERL_NIF_TERM result;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_lvl_sctp -> entry with"
+            "\r\n   opt: %d"
+            "\r\n", eOpt) );
+
+    switch (eOpt) {
+#if defined(SCTP_ASSOCINFO)
+    case ESOCK_OPT_SCTP_ASSOCINFO:
+        result = esock_setopt_lvl_sctp_associnfo(env, descP, eVal);
+        break;
+#endif
+
+#if defined(SCTP_AUTOCLOSE)
+    case ESOCK_OPT_SCTP_AUTOCLOSE:
+        result = esock_setopt_lvl_sctp_autoclose(env, descP, eVal);
+        break;
+#endif
+
+#if defined(SCTP_DISABLE_FRAGMENTS)
+    case ESOCK_OPT_SCTP_DISABLE_FRAGMENTS:
+        result = esock_setopt_lvl_sctp_disable_fragments(env, descP, eVal);
+        break;
+#endif
+
+#if defined(SCTP_EVENTS)
+    case ESOCK_OPT_SCTP_EVENTS:
+        result = esock_setopt_lvl_sctp_events(env, descP, eVal);
+        break;
+#endif
+
+#if defined(SCTP_INITMSG)
+    case ESOCK_OPT_SCTP_INITMSG:
+        result = esock_setopt_lvl_sctp_initmsg(env, descP, eVal);
+        break;
+#endif
+
+#if defined(SCTP_MAXSEG)
+    case ESOCK_OPT_SCTP_MAXSEG:
+        result = esock_setopt_lvl_sctp_maxseg(env, descP, eVal);
+        break;
+#endif
+
+#if defined(SCTP_NODELAY)
+    case ESOCK_OPT_SCTP_NODELAY:
+        result = esock_setopt_lvl_sctp_nodelay(env, descP, eVal);
+        break;
+#endif
+
+#if defined(SCTP_RTOINFO)
+    case ESOCK_OPT_SCTP_RTOINFO:
+        result = esock_setopt_lvl_sctp_rtoinfo(env, descP, eVal);
+        break;
+#endif
+
+    default:
+        result = esock_make_error(env, esock_atom_einval);
+        break;
+    }
+
+    return result;
+}
+
+
+/* esock_setopt_lvl_sctp_associnfo - Level SCTP ASSOCINFO option
+ */
+#if defined(SCTP_ASSOCINFO)
+static
+ERL_NIF_TERM esock_setopt_lvl_sctp_associnfo(ErlNifEnv*       env,
+                                             ESockDescriptor* descP,
+                                             ERL_NIF_TERM     eVal)
+{
+    ERL_NIF_TERM            result;
+    ERL_NIF_TERM            eAssocId, eMaxRxt, eNumPeerDests;
+    ERL_NIF_TERM            ePeerRWND, eLocalRWND, eCookieLife;
+    struct sctp_assocparams assocParams;
+    int                     res;
+    size_t                  sz;
+    unsigned int            tmp;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_lvl_sctp_associnfo -> entry with"
+            "\r\n   eVal: %T"
+            "\r\n", eVal) );
+
+    // It must be a map
+    if (!IS_MAP(env, eVal))
+        return esock_make_error(env, esock_atom_einval);
+
+    // It must have atleast ten attributes
+    if (!enif_get_map_size(env, eVal, &sz) || (sz < 6))
+        return esock_make_error(env, esock_atom_einval);
+
+    SSDBG( descP,
+           ("SOCKET",
+            "esock_setopt_lvl_sctp_associnfo -> extract attributes\r\n") );    
+
+    if (!GET_MAP_VAL(env, eVal, atom_assoc_id,          &eAssocId))
+        return esock_make_error(env, esock_atom_einval);
+
+    if (!GET_MAP_VAL(env, eVal, atom_max_rxt,        &eMaxRxt))
+        return esock_make_error(env, esock_atom_einval);
+
+    if (!GET_MAP_VAL(env, eVal, atom_num_peer_dests, &eNumPeerDests))
+        return esock_make_error(env, esock_atom_einval);
+
+    if (!GET_MAP_VAL(env, eVal, atom_peer_rwnd,      &ePeerRWND))
+        return esock_make_error(env, esock_atom_einval);
+
+    if (!GET_MAP_VAL(env, eVal, atom_local_rwnd,     &eLocalRWND))
+        return esock_make_error(env, esock_atom_einval);
+
+    if (!GET_MAP_VAL(env, eVal, atom_cookie_life,    &eCookieLife))
+        return esock_make_error(env, esock_atom_einval);
+
+    SSDBG( descP,
+           ("SOCKET",
+            "esock_setopt_lvl_sctp_associnfo -> decode attributes\r\n") );
+
+    /* On some platforms the assoc id is typed as an unsigned integer (uint32)
+     * So, to avoid warnings there, we always make an explicit cast... 
+     * Also, size of types matter, so adjust for that...
+     */
+
+#if (SIZEOF_INT == 4)
+    {
+        int tmpAssocId;
+        if (!GET_INT(env, eAssocId, &tmpAssocId))
+            return esock_make_error(env, esock_atom_einval);
+        assocParams.sasoc_assoc_id =
+            (typeof(assocParams.sasoc_assoc_id)) tmpAssocId;
+    }
+#elif (SIZEOF_LONG == 4)
+    {
+        long tmpAssocId;
+        if (!GET_LONG(env, eAssocId, &tmpAssocId))
+            return esock_make_error(env, esock_atom_einval);
+        assocParams.sasoc_assoc_id =
+            (typeof(assocParams.sasoc_assoc_id)) tmpAssocId;
+    }
+#else
+    SIZE CHECK FOR ASSOC ID FAILED
+#endif
+
+    
+    /*
+     * We should really make sure this is ok in erlang (to ensure that 
+     * the values (max-rxt and num-peer-dests) fits in 16-bits).
+     * The value should be a 16-bit unsigned int...
+     * Both sasoc_asocmaxrxt and sasoc_number_peer_destinations.
+     */
+    
+    if (!GET_UINT(env, eMaxRxt, &tmp))
+        return esock_make_error(env, esock_atom_einval);
+    assocParams.sasoc_asocmaxrxt = (Uint16) tmp;
+
+    if (!GET_UINT(env, eNumPeerDests, &tmp))
+        return esock_make_error(env, esock_atom_einval);
+    assocParams.sasoc_number_peer_destinations = (Uint16) tmp;
+
+    if (!GET_UINT(env, ePeerRWND, &assocParams.sasoc_peer_rwnd))
+        return esock_make_error(env, esock_atom_einval);
+
+    if (!GET_UINT(env, eLocalRWND, &assocParams.sasoc_local_rwnd))
+        return esock_make_error(env, esock_atom_einval);
+
+    if (!GET_UINT(env, eCookieLife, &assocParams.sasoc_cookie_life))
+        return esock_make_error(env, esock_atom_einval);
+    
+    SSDBG( descP,
+           ("SOCKET",
+            "esock_setopt_lvl_sctp_associnfo -> set associnfo option\r\n") );
+
+    res = socket_setopt(descP->sock, IPPROTO_SCTP, SCTP_ASSOCINFO,
+                        &assocParams, sizeof(assocParams));
+
+    if (res != 0)
+        result = esock_make_error_errno(env, sock_errno());
+    else
+        result = esock_atom_ok;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_lvl_sctp_associnfo -> done with"
+            "\r\n   result: %T"
+            "\r\n", result) );
+
+    return result;
+    
+}
+#endif
+
+
+/* esock_setopt_lvl_sctp_autoclose - Level SCTP AUTOCLOSE option
+ */
+#if defined(SCTP_AUTOCLOSE)
+static
+ERL_NIF_TERM esock_setopt_lvl_sctp_autoclose(ErlNifEnv*       env,
+                                             ESockDescriptor* descP,
+                                             ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_int_opt(env, descP,
+                                IPPROTO_SCTP, SCTP_AUTOCLOSE, eVal);
+}
+#endif
+
+
+/* esock_setopt_lvl_sctp_disable_fragments -
+ * Level SCTP DISABLE_FRAGMENTS option
+ */
+#if defined(SCTP_DISABLE_FRAGMENTS)
+static
+ERL_NIF_TERM esock_setopt_lvl_sctp_disable_fragments(ErlNifEnv*       env,
+                                                     ESockDescriptor* descP,
+                                                     ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_bool_opt(env, descP,
+                                 IPPROTO_SCTP, SCTP_DISABLE_FRAGMENTS, eVal);
+}
+#endif
+
+
+/* esock_setopt_lvl_sctp_events - Level SCTP EVENTS option
+ */
+#if defined(SCTP_EVENTS)
+static
+ERL_NIF_TERM esock_setopt_lvl_sctp_events(ErlNifEnv*       env,
+                                          ESockDescriptor* descP,
+                                          ERL_NIF_TERM     eVal)
+{
+    ERL_NIF_TERM                result;
+    ERL_NIF_TERM                eDataIn, eAssoc, eAddr, eSndFailure;
+    ERL_NIF_TERM                ePeerError, eShutdown, ePartialDelivery;
+    ERL_NIF_TERM                eAdaptLayer;
+#if defined(HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE_SCTP_AUTHENTICATION_EVENT)
+    ERL_NIF_TERM                eAuth;
+#endif
+#if defined(HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE_SCTP_SENDER_DRY_EVENT)
+    ERL_NIF_TERM                eSndDry;
+#endif
+    struct sctp_event_subscribe events;
+    int                         res;
+    size_t                      sz;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_lvl_sctp_events -> entry with"
+            "\r\n   eVal: %T"
+            "\r\n", eVal) );
+
+    // It must be a map
+    if (!IS_MAP(env, eVal))
+        return esock_make_error(env, esock_atom_einval);
+
+    // It must have atleast ten attributes
+    if (!enif_get_map_size(env, eVal, &sz) || (sz < 10))
+        return esock_make_error(env, esock_atom_einval);
+
+    SSDBG( descP,
+           ("SOCKET",
+            "esock_setopt_lvl_sctp_events -> extract attributes\r\n") );    
+
+    if (!GET_MAP_VAL(env, eVal, atom_data_in,          &eDataIn))
+        return esock_make_error(env, esock_atom_einval);
+
+    if (!GET_MAP_VAL(env, eVal, atom_association,      &eAssoc))
+        return esock_make_error(env, esock_atom_einval);
+
+    if (!GET_MAP_VAL(env, eVal, atom_address,          &eAddr))
+        return esock_make_error(env, esock_atom_einval);
+
+    if (!GET_MAP_VAL(env, eVal, atom_send_failure,     &eSndFailure))
+        return esock_make_error(env, esock_atom_einval);
+
+    if (!GET_MAP_VAL(env, eVal, atom_peer_error,       &ePeerError))
+        return esock_make_error(env, esock_atom_einval);
+
+    if (!GET_MAP_VAL(env, eVal, atom_shutdown,         &eShutdown))
+        return esock_make_error(env, esock_atom_einval);
+
+    if (!GET_MAP_VAL(env, eVal, atom_partial_delivery, &ePartialDelivery))
+        return esock_make_error(env, esock_atom_einval);
+
+    if (!GET_MAP_VAL(env, eVal, atom_adaptation_layer, &eAdaptLayer))
+        return esock_make_error(env, esock_atom_einval);
+
+#if defined(HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE_SCTP_AUTHENTICATION_EVENT)
+    if (!GET_MAP_VAL(env, eVal, atom_authentication,   &eAuth))
+        return esock_make_error(env, esock_atom_einval);
+#endif
+
+#if defined(HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE_SCTP_SENDER_DRY_EVENT)
+    if (!GET_MAP_VAL(env, eVal, atom_sender_dry,       &eSndDry))
+        return esock_make_error(env, esock_atom_einval);
+#endif
+
+    SSDBG( descP,
+           ("SOCKET",
+            "esock_setopt_lvl_sctp_events -> decode attributes\r\n") );
+
+    events.sctp_data_io_event          = esock_decode_bool(eDataIn);
+    events.sctp_association_event      = esock_decode_bool(eAssoc);
+    events.sctp_address_event          = esock_decode_bool(eAddr);
+    events.sctp_send_failure_event     = esock_decode_bool(eSndFailure);
+    events.sctp_peer_error_event       = esock_decode_bool(ePeerError);
+    events.sctp_shutdown_event         = esock_decode_bool(eShutdown);
+    events.sctp_partial_delivery_event = esock_decode_bool(ePartialDelivery);
+    events.sctp_adaptation_layer_event = esock_decode_bool(eAdaptLayer);
+#if defined(HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE_SCTP_AUTHENTICATION_EVENT)
+    events.sctp_authentication_event   = esock_decode_bool(eAuth);
+#endif
+#if defined(HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE_SCTP_SENDER_DRY_EVENT)
+    events.sctp_sender_dry_event       = esock_decode_bool(eSndDry);
+#endif
+    
+    SSDBG( descP,
+           ("SOCKET",
+            "esock_setopt_lvl_sctp_events -> set events option\r\n") );
+
+    res = socket_setopt(descP->sock, IPPROTO_SCTP, SCTP_EVENTS,
+                        &events, sizeof(events));
+
+    if (res != 0)
+        result = esock_make_error_errno(env, sock_errno());
+    else
+        result = esock_atom_ok;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_lvl_sctp_events -> done with"
+            "\r\n   result: %T"
+            "\r\n", result) );
+
+    return result;
+    
+}
+#endif
+
+
+/* esock_setopt_lvl_sctp_initmsg - Level SCTP INITMSG option
+ */
+#if defined(SCTP_INITMSG)
+static
+ERL_NIF_TERM esock_setopt_lvl_sctp_initmsg(ErlNifEnv*       env,
+                                           ESockDescriptor* descP,
+                                           ERL_NIF_TERM     eVal)
+{
+    ERL_NIF_TERM        result;
+    ERL_NIF_TERM        eNumOut, eMaxIn, eMaxAttempts, eMaxInitTO;
+    struct sctp_initmsg initMsg;
+    int                 res;
+    size_t              sz;
+    unsigned int        tmp;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_lvl_sctp_initmsg -> entry with"
+            "\r\n   eVal: %T"
+            "\r\n", eVal) );
+
+    // It must be a map
+    if (!IS_MAP(env, eVal))
+        return esock_make_error(env, esock_atom_einval);
+
+    // It must have atleast ten attributes
+    if (!enif_get_map_size(env, eVal, &sz) || (sz < 4))
+        return esock_make_error(env, esock_atom_einval);
+
+    SSDBG( descP,
+           ("SOCKET",
+            "esock_setopt_lvl_sctp_initmsg -> extract attributes\r\n") );    
+
+    if (!GET_MAP_VAL(env, eVal, atom_num_outstreams, &eNumOut))
+        return esock_make_error(env, esock_atom_einval);
+
+    if (!GET_MAP_VAL(env, eVal, atom_max_instreams,  &eMaxIn))
+        return esock_make_error(env, esock_atom_einval);
+
+    if (!GET_MAP_VAL(env, eVal, atom_max_attempts,   &eMaxAttempts))
+        return esock_make_error(env, esock_atom_einval);
+
+    if (!GET_MAP_VAL(env, eVal, atom_max_init_timeo, &eMaxInitTO))
+        return esock_make_error(env, esock_atom_einval);
+
+    SSDBG( descP,
+           ("SOCKET",
+            "esock_setopt_lvl_sctp_initmsg -> decode attributes\r\n") );
+
+    if (!GET_UINT(env, eNumOut, &tmp))
+        return esock_make_error(env, esock_atom_einval);
+    initMsg.sinit_num_ostreams = (Uint16) tmp;
+    
+    if (!GET_UINT(env, eMaxIn, &tmp))
+        return esock_make_error(env, esock_atom_einval);
+    initMsg.sinit_max_instreams = (Uint16) tmp;
+    
+    if (!GET_UINT(env, eMaxAttempts, &tmp))
+        return esock_make_error(env, esock_atom_einval);
+    initMsg.sinit_max_attempts = (Uint16) tmp;
+    
+    if (!GET_UINT(env, eMaxInitTO, &tmp))
+        return esock_make_error(env, esock_atom_einval);
+    initMsg.sinit_max_init_timeo = (Uint16) tmp;
+    
+    SSDBG( descP,
+           ("SOCKET",
+            "esock_setopt_lvl_sctp_initmsg -> set initmsg option\r\n") );
+
+    res = socket_setopt(descP->sock, IPPROTO_SCTP, SCTP_INITMSG,
+                        &initMsg, sizeof(initMsg));
+
+    if (res != 0)
+        result = esock_make_error_errno(env, sock_errno());
+    else
+        result = esock_atom_ok;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_lvl_sctp_initmsg -> done with"
+            "\r\n   result: %T"
+            "\r\n", result) );
+
+    return result;
+    
+}
+#endif
+
+
+/* esock_setopt_lvl_sctp_maxseg - Level SCTP MAXSEG option
+ */
+#if defined(SCTP_MAXSEG)
+static
+ERL_NIF_TERM esock_setopt_lvl_sctp_maxseg(ErlNifEnv*       env,
+                                          ESockDescriptor* descP,
+                                          ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_int_opt(env, descP, IPPROTO_SCTP, SCTP_MAXSEG, eVal);
+}
+#endif
+
+
+/* esock_setopt_lvl_sctp_nodelay - Level SCTP NODELAY option
+ */
+#if defined(SCTP_NODELAY)
+static
+ERL_NIF_TERM esock_setopt_lvl_sctp_nodelay(ErlNifEnv*       env,
+                                           ESockDescriptor* descP,
+                                           ERL_NIF_TERM     eVal)
+{
+    return esock_setopt_bool_opt(env, descP, IPPROTO_SCTP, SCTP_NODELAY, eVal);
+}
+#endif
+
+
+/* esock_setopt_lvl_sctp_rtoinfo - Level SCTP RTOINFO option
+ */
+#if defined(SCTP_RTOINFO)
+static
+ERL_NIF_TERM esock_setopt_lvl_sctp_rtoinfo(ErlNifEnv*       env,
+                                           ESockDescriptor* descP,
+                                           ERL_NIF_TERM     eVal)
+{
+    ERL_NIF_TERM        result;
+    ERL_NIF_TERM        eAssocId, eInitial, eMax, eMin;
+    struct sctp_rtoinfo rtoInfo;
+    int                 res;
+    size_t              sz;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_lvl_sctp_rtoinfo -> entry with"
+            "\r\n   eVal: %T"
+            "\r\n", eVal) );
+
+    // It must be a map
+    if (!IS_MAP(env, eVal))
+        return esock_make_error(env, esock_atom_einval);
+
+    // It must have atleast ten attributes
+    if (!enif_get_map_size(env, eVal, &sz) || (sz < 4))
+        return esock_make_error(env, esock_atom_einval);
+
+    SSDBG( descP,
+           ("SOCKET",
+            "esock_setopt_lvl_sctp_rtoinfo -> extract attributes\r\n") );    
+
+    if (!GET_MAP_VAL(env, eVal, atom_assoc_id, &eAssocId))
+        return esock_make_error(env, esock_atom_einval);
+
+    if (!GET_MAP_VAL(env, eVal, atom_initial,  &eInitial))
+        return esock_make_error(env, esock_atom_einval);
+
+    if (!GET_MAP_VAL(env, eVal, atom_max,      &eMax))
+        return esock_make_error(env, esock_atom_einval);
+
+    if (!GET_MAP_VAL(env, eVal, atom_min,      &eMin))
+        return esock_make_error(env, esock_atom_einval);
+
+    SSDBG( descP,
+           ("SOCKET",
+            "esock_setopt_lvl_sctp_rtoinfo -> decode attributes\r\n") );
+
+    /* On some platforms the assoc id is typed as an unsigned integer (uint32)
+     * So, to avoid warnings there, we always make an explicit cast... 
+     * Also, size of types matter, so adjust for that...
+     */
+
+#if (SIZEOF_INT == 4)
+    {
+        int tmpAssocId;
+        if (!GET_INT(env, eAssocId, &tmpAssocId))
+            return esock_make_error(env, esock_atom_einval);
+        rtoInfo.srto_assoc_id = (typeof(rtoInfo.srto_assoc_id)) tmpAssocId;
+    }
+#elif (SIZEOF_LONG == 4)
+    {
+        long tmpAssocId;
+        if (!GET_LONG(env, eAssocId, &tmpAssocId))
+            return esock_make_error(env, esock_atom_einval);
+        rtoInfo.srto_assoc_id = (typeof(rtoInfo.srto_assoc_id)) tmpAssocId;
+    }
+#else
+    SIZE CHECK FOR ASSOC ID FAILED
+#endif
+    
+    if (!GET_UINT(env, eInitial, &rtoInfo.srto_initial))
+        return esock_make_error(env, esock_atom_einval);
+
+    if (!GET_UINT(env, eMax, &rtoInfo.srto_max))
+        return esock_make_error(env, esock_atom_einval);
+
+    if (!GET_UINT(env, eMin, &rtoInfo.srto_min))
+        return esock_make_error(env, esock_atom_einval);
+
+    SSDBG( descP,
+           ("SOCKET",
+            "esock_setopt_lvl_sctp_rtoinfo -> set associnfo option\r\n") );
+
+    res = socket_setopt(descP->sock, IPPROTO_SCTP, SCTP_RTOINFO,
+                        &rtoInfo, sizeof(rtoInfo));
+
+    if (res != 0)
+        result = esock_make_error_errno(env, sock_errno());
+    else
+        result = esock_atom_ok;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_lvl_sctp_rtoinfo -> done with"
+            "\r\n   result: %T"
+            "\r\n", result) );
+
+    return result;
+    
+}
+#endif
+
+
+
+#endif // defined(HAVE_SCTP)
+
+
+
+
+/* esock_setopt_bool_opt - set an option that has an (integer) bool value
+ */
+static
+ERL_NIF_TERM esock_setopt_bool_opt(ErlNifEnv*       env,
+                                   ESockDescriptor* descP,
+                                   int              level,
+                                   int              opt,
+                                   ERL_NIF_TERM     eVal)
+{
+    ERL_NIF_TERM result;
+    BOOLEAN_T    val;
+    int          ival, res;
+
+    val = esock_decode_bool(eVal);
+    
+    ival = (val) ? 1 : 0;
+    res  = socket_setopt(descP->sock, level, opt, &ival, sizeof(ival));
+
+    if (res != 0)
+        result = esock_make_error_errno(env, sock_errno());
+    else
+        result = esock_atom_ok;
+
+    return result;
+}
+
+
+/* esock_setopt_int_opt - set an option that has an integer value
+ */
+static
+ERL_NIF_TERM esock_setopt_int_opt(ErlNifEnv*       env,
+                                  ESockDescriptor* descP,
+                                  int              level,
+                                  int              opt,
+                                  ERL_NIF_TERM     eVal)
+{
+    ERL_NIF_TERM result;
+    int          val;
+
+    if (GET_INT(env, eVal, &val)) {
+        int res;
+
+        /*
+        SSDBG( descP,
+               ("SOCKET", "esock_setopt_int_opt -> set option"
+                "\r\n   opt: %d"
+                "\r\n   val: %d"
+                "\r\n", opt, val) );
+        */
+
+        res = socket_setopt(descP->sock, level, opt, &val, sizeof(val));
+
+        if (res != 0)
+            result = esock_make_error_errno(env, sock_errno());
+        else
+            result = esock_atom_ok;
+
+    } else {
+        result = esock_make_error(env, esock_atom_einval);
+    }
+
+    return result;
+}
+
+
+/* esock_setopt_str_opt - set an option that has an string value
+ */
+#if defined(USE_SETOPT_STR_OPT)
+static
+ERL_NIF_TERM esock_setopt_str_opt(ErlNifEnv*       env,
+                                  ESockDescriptor* descP,
+                                  int              level,
+                                  int              opt,
+                                  int              max,
+                                  ERL_NIF_TERM     eVal)
+{
+    ERL_NIF_TERM result;
+    char*        val = MALLOC(max);
+
+    if (GET_STR(env, eVal, val, max) > 0) {
+        int optLen = strlen(val);
+        int res    = socket_setopt(descP->sock, level, opt, &val, optLen);
+
+        if (res != 0)
+            result = esock_make_error_errno(env, sock_errno());
+        else
+            result = esock_atom_ok;
+
+    } else {
+        result = esock_make_error(env, esock_atom_einval);
+    }
+
+    FREE(val);
+
+    return result;
+}
+#endif
+
+
+/* esock_setopt_timeval_opt - set an option that has an (timeval) bool value
+ */
+static
+ERL_NIF_TERM esock_setopt_timeval_opt(ErlNifEnv*       env,
+                                      ESockDescriptor* descP,
+                                      int              level,
+                                      int              opt,
+                                      ERL_NIF_TERM     eVal)
+{
+    ERL_NIF_TERM   result;
+    struct timeval timeVal;
+    int            res;
+    char*          xres;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_timeval_opt -> entry with"
+            "\r\n   eVal: %T"
+            "\r\n", eVal) );
+
+    if ((xres = esock_decode_timeval(env, eVal, &timeVal)) != NULL)
+        return esock_make_error_str(env, xres);
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_timeval_opt -> set timeval option\r\n") );
+
+    res = socket_setopt(descP->sock, level, opt, &timeVal, sizeof(timeVal));
+
+    if (res != 0)
+        result = esock_make_error_errno(env, sock_errno());
+    else
+        result = esock_atom_ok;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_setopt_timeval_opt -> done with"
+            "\r\n   result: %T"
+            "\r\n", result) );
+
+    return result;
+    
+}
+
+
+
+static
+BOOLEAN_T elevel2level(BOOLEAN_T  isEncoded,
+                       int        eLevel,
+                       BOOLEAN_T* isOTP,
+                       int*       level)
+{
+    BOOLEAN_T result;
+
+    if (isEncoded) {
+        switch (eLevel) {
+        case ESOCK_OPT_LEVEL_OTP:
+            *isOTP = TRUE;
+            *level = -1;
+            result = TRUE;
+            break;
+
+        case ESOCK_OPT_LEVEL_SOCKET:
+            *isOTP = FALSE;
+            *level = SOL_SOCKET;
+            result = TRUE;
+            break;
+
+        case ESOCK_OPT_LEVEL_IP:
+            *isOTP = FALSE;
+#if defined(SOL_IP)
+            *level = SOL_IP;
+#else
+            *level = IPPROTO_IP;
+#endif
+            result = TRUE;
+            break;
+
+#if defined(HAVE_IPV6)
+        case ESOCK_OPT_LEVEL_IPV6:
+            *isOTP = FALSE;
+#if defined(SOL_IPV6)
+            *level = SOL_IPV6;
+#else
+            *level = IPPROTO_IPV6;
+#endif
+            result = TRUE;
+            break;
+#endif
+
+        case ESOCK_OPT_LEVEL_TCP:
+            *isOTP = FALSE;
+            *level = IPPROTO_TCP;
+            result = TRUE;
+            break;
+
+        case ESOCK_OPT_LEVEL_UDP:
+            *isOTP = FALSE;
+            *level = IPPROTO_UDP;
+            result = TRUE;
+            break;
+
+#ifdef HAVE_SCTP
+        case ESOCK_OPT_LEVEL_SCTP:
+            *isOTP = FALSE;
+            *level = IPPROTO_SCTP;
+            result = TRUE;
+            break;
+#endif
+
+        default:
+            *isOTP = FALSE;
+            *level = -1;
+            result = FALSE;
+            break;
+        }
+    } else {
+        *isOTP = FALSE;
+        *level = eLevel;
+        result = TRUE;
+    }
+
+    return result;
+}
+
+
+
+/* +++ socket_setopt +++
+ *
+ * <Per H @ Tail-f>
+ * The original code here had problems that possibly
+ * only occur if you abuse it for non-INET sockets, but anyway:
+ * a) If the getsockopt for SO_PRIORITY or IP_TOS failed, the actual
+ *    requested setsockopt was never even attempted.
+ * b) If {get,set}sockopt for one of IP_TOS and SO_PRIORITY failed,
+ *    but ditto for the other worked and that was actually the requested
+ *    option, failure was still reported to erlang.
+ * </Per H @ Tail-f>
+ *
+ * <PaN>
+ * The relations between SO_PRIORITY, TOS and other options
+ * is not what you (or at least I) would expect...:
+ * If TOS is set after priority, priority is zeroed.
+ * If any other option is set after tos, tos might be zeroed.
+ * Therefore, save tos and priority. If something else is set,
+ * restore both after setting, if  tos is set, restore only
+ * prio and if prio is set restore none... All to keep the
+ * user feeling socket options are independent.
+ * </PaN>
+ */
+static
+int socket_setopt(int sock, int level, int opt,
+                  const void* optVal, const socklen_t optLen)
+{
+    int res;
+
+#if  defined(IP_TOS) && defined(SOL_IP) && defined(SO_PRIORITY)
+    int          tmpIValPRIO;
+    int          tmpIValTOS;
+    int          resPRIO;
+    int          resTOS;
+    SOCKOPTLEN_T tmpArgSzPRIO = sizeof(tmpIValPRIO);
+    SOCKOPTLEN_T tmpArgSzTOS  = sizeof(tmpIValTOS);
+
+    resPRIO = sock_getopt(sock, SOL_SOCKET, SO_PRIORITY,
+                           &tmpIValPRIO, &tmpArgSzPRIO);
+    resTOS  = sock_getopt(sock, SOL_IP, IP_TOS,
+                          &tmpIValTOS, &tmpArgSzTOS);
+
+    res = sock_setopt(sock, level, opt, optVal, optLen);
+    if (res == 0) {
+
+        /* Ok, now we *maybe* need to "maybe" restore PRIO and TOS...
+         * maybe, possibly, ...
+         */
+
+        if (opt != SO_PRIORITY) {
+	    if ((opt != IP_TOS) && (resTOS == 0)) {
+		resTOS = sock_setopt(sock, SOL_IP, IP_TOS,
+                                     (void *) &tmpIValTOS,
+                                     tmpArgSzTOS);
+                res = resTOS;
+            }
+	    if ((res == 0) && (resPRIO == 0)) {
+		resPRIO = sock_setopt(sock, SOL_SOCKET, SO_PRIORITY,
+                                      &tmpIValPRIO,
+                                      tmpArgSzPRIO);
+
+                /* Some kernels set a SO_PRIORITY by default
+                 * that you are not permitted to reset,
+                 * silently ignore this error condition.
+                 */
+
+                if ((resPRIO != 0) && (sock_errno() == EPERM)) {
+                    res = 0;
+                } else {
+                    res = resPRIO;
+		}
+	    }
+	}
+    }
+
+#else
+
+    res = sock_setopt(sock, level, opt, optVal, optLen);
+
+#endif
+
+    return res;
+}
+#endif // if !defined(__WIN32__)
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_getopt
+ *
+ * Description:
+ * Get socket option.
+ * Its possible to use a "raw" mode (not encoded). That is, we do not
+ * interpret level and opt. They are passed "as is" to the
+ * getsockopt function call. The value in this case will "copied" as
+ * is and provided to the user in the form of a binary.
+ *
+ * Arguments:
+ * Socket (ref) - Points to the socket descriptor.
+ * IsEncoded    - Are the "arguments" encoded or not.
+ * Level        - Level of the socket option.
+ * Opt          - The socket option.
+ */
+
+static
+ERL_NIF_TERM nif_getopt(ErlNifEnv*         env,
+                        int                argc,
+                        const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ESockDescriptor* descP;
+    int              eLevel, level = -1;
+    ERL_NIF_TERM     eIsEncoded, eOpt;
+    BOOLEAN_T        isEncoded, isOTP;
+    ERL_NIF_TERM     result;
+
+    SGDBG( ("SOCKET", "nif_getopt -> entry with argc: %d\r\n", argc) );
+
+    if ((argc != 4) ||
+        !ESOCK_GET_RESOURCE(env, argv[0], (void**) &descP) ||
+        !GET_INT(env, argv[2], &eLevel)) {
+        SGDBG( ("SOCKET", "nif_getopt -> failed processing args\r\n") );
+        return enif_make_badarg(env);
+    }
+    eIsEncoded = argv[1];
+    eOpt       = argv[3]; // Is "normally" an int, but if raw mode: {Int, ValueSz}
+
+    if (IS_CLOSED(descP) || IS_CLOSING(descP))
+        return esock_make_error(env, atom_closed);
+    
+    SSDBG( descP,
+           ("SOCKET", "nif_getopt -> args when sock = %d:"
+            "\r\n   Socket:     %T"
+            "\r\n   eIsEncoded: %T"
+            "\r\n   eLevel:     %d"
+            "\r\n   eOpt:       %T"
+            "\r\n", descP->sock, argv[0], eIsEncoded, eLevel, eOpt) );
+
+    isEncoded = esock_decode_bool(eIsEncoded);
+
+    if (!elevel2level(isEncoded, eLevel, &isOTP, &level))
+        return esock_make_error(env, esock_atom_einval);
+
+    MLOCK(descP->cfgMtx);
+
+    result = esock_getopt(env, descP, isEncoded, isOTP, level, eOpt);
+    
+    MUNLOCK(descP->cfgMtx);
+
+    return result;
+
+#endif // if defined(__WIN32__)
+}
+
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_getopt(ErlNifEnv*       env,
+                          ESockDescriptor* descP,
+                          BOOLEAN_T        isEncoded,
+                          BOOLEAN_T        isOTP,
+                          int              level,
+                          ERL_NIF_TERM     eOpt)
+{
+    ERL_NIF_TERM result;
+    int          opt;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt -> entry with"
+            "\r\n   isEncoded: %s"
+            "\r\n   isOTP:     %s"
+            "\r\n   level:     %d"
+            "\r\n   eOpt:      %T"
+            "\r\n", B2S(isEncoded), B2S(isOTP), level, eOpt) );
+
+    if (isOTP) {
+        /* These are not actual socket options,
+         * but options for our implementation.
+         */
+        if (GET_INT(env, eOpt, &opt))
+            result = esock_getopt_otp(env, descP, opt);
+        else
+            result = esock_make_error(env, esock_atom_einval);
+    } else if (!isEncoded) {
+        result = esock_getopt_native(env, descP, level, eOpt);
+    } else {
+        if (GET_INT(env, eOpt, &opt))
+            result = esock_getopt_level(env, descP, level, opt);
+        else
+            result = esock_make_error(env, esock_atom_einval);
+    }
+
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt -> done when"
+            "\r\n   result: %T"
+            "\r\n", result) );
+
+    return result;
+}
+
+
+
+/* esock_getopt_otp - Handle OTP (level) options
+ */
+static
+ERL_NIF_TERM esock_getopt_otp(ErlNifEnv*       env,
+                              ESockDescriptor* descP,
+                              int              eOpt)
+{
+    ERL_NIF_TERM result;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt_otp -> entry with"
+            "\r\n   eOpt: %d"
+            "\r\n", eOpt) );
+
+    switch (eOpt) {
+    case ESOCK_OPT_OTP_DEBUG:
+        result = esock_getopt_otp_debug(env, descP);
+        break;
+
+    case ESOCK_OPT_OTP_IOW:
+        result = esock_getopt_otp_iow(env, descP);
+        break;
+
+    case ESOCK_OPT_OTP_CTRL_PROC:
+        result = esock_getopt_otp_ctrl_proc(env, descP);
+        break;
+
+    case ESOCK_OPT_OTP_RCVBUF:
+        result = esock_getopt_otp_rcvbuf(env, descP);
+        break;
+
+    case ESOCK_OPT_OTP_RCVCTRLBUF:
+        result = esock_getopt_otp_rcvctrlbuf(env, descP);
+        break;
+
+    case ESOCK_OPT_OTP_SNDCTRLBUF:
+        result = esock_getopt_otp_sndctrlbuf(env, descP);
+        break;
+
+    case ESOCK_OPT_OTP_FD:
+        result = esock_getopt_otp_fd(env, descP);
+        break;
+
+        /* *** INTERNAL *** */
+    case ESOCK_OPT_OTP_DOMAIN:
+        result = esock_getopt_otp_domain(env, descP);
+        break;
+
+    case ESOCK_OPT_OTP_TYPE:
+        result = esock_getopt_otp_type(env, descP);
+        break;
+
+    case ESOCK_OPT_OTP_PROTOCOL:
+        result = esock_getopt_otp_protocol(env, descP);
+        break;
+
+    default:
+        result = esock_make_error(env, esock_atom_einval);
+        break;
+    }
+
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt_otp -> done when"
+            "\r\n   result: %T"
+            "\r\n", result) );
+
+    return result;
+}
+
+
+/* esock_getopt_otp_debug - Handle the OTP (level) debug option
+ */
+static
+ERL_NIF_TERM esock_getopt_otp_debug(ErlNifEnv*       env,
+                                    ESockDescriptor* descP)
+{
+    ERL_NIF_TERM eVal = esock_encode_bool(descP->dbg);
+
+    return esock_make_ok2(env, eVal);
+}
+
+
+/* esock_getopt_otp_iow - Handle the OTP (level) iow option
+ */
+static
+ERL_NIF_TERM esock_getopt_otp_iow(ErlNifEnv*       env,
+                                  ESockDescriptor* descP)
+{
+    ERL_NIF_TERM eVal = esock_encode_bool(descP->iow);
+
+    return esock_make_ok2(env, eVal);
+}
+
+
+/* esock_getopt_otp_ctrl_proc - Handle the OTP (level) controlling_process option
+ */
+static
+ERL_NIF_TERM esock_getopt_otp_ctrl_proc(ErlNifEnv*       env,
+                                        ESockDescriptor* descP)
+{
+    ERL_NIF_TERM eVal = MKPID(env, &descP->ctrlPid);
+
+    return esock_make_ok2(env, eVal);
+}
+
+
+
+/* esock_getopt_otp_rcvbuf - Handle the OTP (level) rcvbuf option
+ */
+static
+ERL_NIF_TERM esock_getopt_otp_rcvbuf(ErlNifEnv*       env,
+                                     ESockDescriptor* descP)
+{
+    ERL_NIF_TERM eVal;
+
+    if (descP->rNum == 0) {
+        eVal = MKI(env, descP->rBufSz);
+    } else {
+        eVal = MKT2(env, MKI(env, descP->rNum), MKI(env, descP->rBufSz));
+    }
+
+    return esock_make_ok2(env, eVal);
+}
+
+
+/* esock_getopt_otp_rcvctrlbuf - Handle the OTP (level) rcvctrlbuf option
+ */
+static
+ERL_NIF_TERM esock_getopt_otp_rcvctrlbuf(ErlNifEnv*       env,
+                                         ESockDescriptor* descP)
+{
+    ERL_NIF_TERM eVal = MKI(env, descP->rCtrlSz);
+
+    return esock_make_ok2(env, eVal);
+}
+
+
+/* esock_getopt_otp_sndctrlbuf - Handle the OTP (level) sndctrlbuf option
+ */
+static
+ERL_NIF_TERM esock_getopt_otp_sndctrlbuf(ErlNifEnv*       env,
+                                         ESockDescriptor* descP)
+{
+    ERL_NIF_TERM eVal = MKI(env, descP->wCtrlSz);
+
+    return esock_make_ok2(env, eVal);
+}
+
+
+/* esock_getopt_otp_fd - Handle the OTP (level) fd option
+ */
+static
+ERL_NIF_TERM esock_getopt_otp_fd(ErlNifEnv*       env,
+                                 ESockDescriptor* descP)
+{
+    ERL_NIF_TERM eVal = MKI(env, descP->sock);
+
+    return esock_make_ok2(env, eVal);
+}
+
+
+/* esock_getopt_otp_domain - Handle the OTP (level) domain option
+ */
+static
+ERL_NIF_TERM esock_getopt_otp_domain(ErlNifEnv*       env,
+                                     ESockDescriptor* descP)
+{
+    ERL_NIF_TERM result, reason;
+    int          val = descP->domain;
+
+    switch (val) {
+    case AF_INET:
+        result = esock_make_ok2(env, esock_atom_inet);
+        break;
+
+#if defined(HAVE_IN6) && defined(AF_INET6)
+    case AF_INET6:
+        result = esock_make_ok2(env, esock_atom_inet6);
+        break;
+#endif
+
+#if defined(HAVE_SYS_UN_H)
+    case AF_UNIX:
+        result = esock_make_ok2(env, esock_atom_local);
+        break;
+#endif
+
+    default:
+        reason = MKT2(env, esock_atom_unknown, MKI(env, val));
+        result = esock_make_error(env, reason);
+        break;
+    }
+    
+    return result;
+}
+
+
+/* esock_getopt_otp_type - Handle the OTP (level) type options.
+ */
+static
+ERL_NIF_TERM esock_getopt_otp_type(ErlNifEnv*       env,
+                                   ESockDescriptor* descP)
+{
+    ERL_NIF_TERM result, reason;
+    int          val = descP->type;
+
+    switch (val) {
+    case SOCK_STREAM:
+        result = esock_make_ok2(env, esock_atom_stream);
+        break;
+
+    case SOCK_DGRAM:
+        result = esock_make_ok2(env, esock_atom_dgram);
+        break;
+
+#ifdef HAVE_SCTP
+    case SOCK_SEQPACKET:
+        result = esock_make_ok2(env, esock_atom_seqpacket);
+        break;
+#endif
+    case SOCK_RAW:
+        result = esock_make_ok2(env, esock_atom_raw);
+        break;
+
+    case SOCK_RDM:
+        result = esock_make_ok2(env, esock_atom_rdm);
+        break;
+
+    default:
+        reason = MKT2(env, esock_atom_unknown, MKI(env, val));
+        result = esock_make_error(env, reason);
+        break;
+    }
+
+    return result;
+}
+
+
+/* esock_getopt_otp_protocol - Handle the OTP (level) protocol options.
+ */
+static
+ERL_NIF_TERM esock_getopt_otp_protocol(ErlNifEnv*       env,
+                                       ESockDescriptor* descP)
+{
+    ERL_NIF_TERM result, reason;
+    int          val = descP->protocol;
+
+        switch (val) {
+        case IPPROTO_IP:
+#if defined(AF_LOCAL)
+            if (descP->domain == AF_LOCAL) {
+                result = esock_make_ok2(env, esock_atom_default);
+            } else {
+                result = esock_make_ok2(env, esock_atom_ip);
+            }
+#else
+            result = esock_make_ok2(env, esock_atom_ip);
+#endif
+            break;
+
+        case IPPROTO_TCP:
+            result = esock_make_ok2(env, esock_atom_tcp);
+            break;
+
+        case IPPROTO_UDP:
+            result = esock_make_ok2(env, esock_atom_udp);
+            break;
+
+#if defined(HAVE_SCTP)
+        case IPPROTO_SCTP:
+            result = esock_make_ok2(env, esock_atom_sctp);
+            break;
+#endif
+
+        default:
+            reason = MKT2(env, esock_atom_unknown, MKI(env, val));
+            result = esock_make_error(env, reason);
+            break;
+    }
+
+    return result;
+}
+
+
+
+/* The option has *not* been encoded. Instead it has been provided
+ * in "native mode" (option is provided as is). In this case it will have the
+ * format: {NativeOpt :: integer(), ValueSize :: non_neg_integer()}
+ */
+static
+ERL_NIF_TERM esock_getopt_native(ErlNifEnv*       env,
+                                 ESockDescriptor* descP,
+                                 int              level,
+                                 ERL_NIF_TERM     eOpt)
+{
+    ERL_NIF_TERM result = enif_make_badarg(env);
+    int          opt;
+    Uint16       valueType;
+    SOCKOPTLEN_T valueSz;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt_native -> entry with"
+            "\r\n   level: %d"
+            "\r\n   eOpt:  %T"
+            "\r\n", level, eOpt) );
+
+    /* <KOLLA>
+     * We should really make it possible to specify more common specific types,
+     * such as integer or boolean (instead of the size)...
+     * </KOLLA>
+     */
+
+    if (decode_native_get_opt(env, eOpt, &opt, &valueType, (int*) &valueSz)) {
+
+        SSDBG( descP,
+               ("SOCKET", "esock_getopt_native -> decoded opt"
+                "\r\n   valueType: %d (%s)"
+                "\r\n   ValueSize: %d"
+                "\r\n", valueType, VT2S(valueType), valueSz) );
+
+        switch (valueType) {
+        case ESOCK_OPT_VALUE_TYPE_UNSPEC:
+            result = esock_getopt_native_unspec(env, descP,
+                                                level, opt, valueSz);
+            break;
+        case ESOCK_OPT_VALUE_TYPE_INT:
+            result = esock_getopt_int_opt(env, descP, level, opt);
+            break;
+        case ESOCK_OPT_VALUE_TYPE_BOOL:
+            result = esock_getopt_bool_opt(env, descP, level, opt);
+            break;
+        default:
+            result = esock_make_error(env, esock_atom_einval);
+            break;
+        }
+    } else {
+        result = esock_make_error(env, esock_atom_einval);
+    }
+
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt_native -> done when"
+            "\r\n   result: %T"
+            "\r\n", result) );
+
+    return result;
+}
+
+
+static
+ERL_NIF_TERM esock_getopt_native_unspec(ErlNifEnv*       env,
+                                        ESockDescriptor* descP,
+                                        int              level,
+                                        int              opt,
+                                        SOCKOPTLEN_T     valueSz)
+{
+    ERL_NIF_TERM result = esock_make_error(env, esock_atom_einval);
+    int          res;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt_native_unspec -> entry with"
+            "\r\n   level:   %d"
+            "\r\n   opt:     %d"
+            "\r\n   valueSz: %d"
+            "\r\n", level, opt, valueSz) );
+
+    if (valueSz == 0) {
+        res = sock_getopt(descP->sock, level, opt, NULL, NULL);
+        if (res != 0)
+            result = esock_make_error_errno(env, sock_errno());
+        else
+            result = esock_atom_ok;
+    } else {
+        SOCKOPTLEN_T vsz = valueSz;
+        ErlNifBinary val;
+
+        SSDBG( descP, ("SOCKET",
+                       "esock_getopt_native_unspec -> try alloc buffer\r\n") );
+
+        if (ALLOC_BIN(vsz, &val)) {
+            int saveErrno;
+            res = sock_getopt(descP->sock, level, opt, val.data, &vsz);
+            if (res != 0) {
+                saveErrno = sock_errno();
+                
+                result = esock_make_error_errno(env, saveErrno);
+            } else {
+
+                /* Did we use all of the buffer? */
+                if (vsz == val.size) {
+
+                    result = esock_make_ok2(env, MKBIN(env, &val));
+
+                } else {
+
+                    ERL_NIF_TERM tmp;
+
+                    tmp = MKBIN(env, &val);
+                    tmp = MKSBIN(env, tmp, 0, vsz);
+                    
+                    result = esock_make_ok2(env, tmp);
+                }
+            }
+        } else {
+            result = enif_make_badarg(env);
+        }
+    }
+
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt_native_unspec -> done when"
+            "\r\n   result: %T"
+            "\r\n", result) );
+
+    return result;
+}
+
+
+
+/* esock_getopt_level - A "proper" level (option) has been specified
+ */
+static
+ERL_NIF_TERM esock_getopt_level(ErlNifEnv*       env,
+                                ESockDescriptor* descP,
+                                int              level,
+                                int              eOpt)
+{
+    ERL_NIF_TERM result;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt_level -> entry with"
+            "\r\n   level: %d"
+            "\r\n   eOpt:  %d"
+            "\r\n", level, eOpt) );
+
+    switch (level) {
+    case SOL_SOCKET:
+        result = esock_getopt_lvl_socket(env, descP, eOpt);
+        break;
+
+#if defined(SOL_IP)
+    case SOL_IP:
+#else
+    case IPPROTO_IP:
+#endif
+        result = esock_getopt_lvl_ip(env, descP, eOpt);
+        break;
+
+#if defined(HAVE_IPV6)
+#if defined(SOL_IPV6)
+    case SOL_IPV6:
+#else
+    case IPPROTO_IPV6:
+#endif
+        result = esock_getopt_lvl_ipv6(env, descP, eOpt);
+        break;
+#endif
+
+    case IPPROTO_TCP:
+        result = esock_getopt_lvl_tcp(env, descP, eOpt);
+        break;
+
+    case IPPROTO_UDP:
+        result = esock_getopt_lvl_udp(env, descP, eOpt);
+        break;
+
+#if defined(HAVE_SCTP)
+    case IPPROTO_SCTP:
+        result = esock_getopt_lvl_sctp(env, descP, eOpt);
+        break;
+#endif
+
+    default:
+        result = esock_make_error(env, esock_atom_einval);
+        break;
+    }
+
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt_level -> done when"
+            "\r\n   result: %T"
+            "\r\n", result) );
+
+    return result;
+}
+
+
+/* esock_getopt_lvl_socket - Level *SOCKET* option
+ */
+static
+ERL_NIF_TERM esock_getopt_lvl_socket(ErlNifEnv*       env,
+                                     ESockDescriptor* descP,
+                                     int              eOpt)
+{
+    ERL_NIF_TERM result;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt_lvl_socket -> entry with"
+            "\r\n   eOpt:  %d"
+            "\r\n", eOpt) );
+
+    switch (eOpt) {
+#if defined(SO_ACCEPTCONN)
+    case ESOCK_OPT_SOCK_ACCEPTCONN:
+        result = esock_getopt_lvl_sock_acceptconn(env, descP);
+        break;
+#endif
+
+#if defined(SO_BINDTODEVICE)
+    case ESOCK_OPT_SOCK_BINDTODEVICE:
+        result = esock_getopt_lvl_sock_bindtodevice(env, descP);
+        break;
+#endif
+
+#if defined(SO_BROADCAST)
+    case ESOCK_OPT_SOCK_BROADCAST:
+        result = esock_getopt_lvl_sock_broadcast(env, descP);
+        break;
+#endif
+
+#if defined(SO_DEBUG)
+    case ESOCK_OPT_SOCK_DEBUG:
+        result = esock_getopt_lvl_sock_debug(env, descP);
+        break;
+#endif
+
+#if defined(SO_DOMAIN)
+    case ESOCK_OPT_SOCK_DOMAIN:
+        result = esock_getopt_lvl_sock_domain(env, descP);
+        break;
+#endif
+
+#if defined(SO_DONTROUTE)
+    case ESOCK_OPT_SOCK_DONTROUTE:
+        result = esock_getopt_lvl_sock_dontroute(env, descP);
+        break;
+#endif
+
+#if defined(SO_KEEPALIVE)
+    case ESOCK_OPT_SOCK_KEEPALIVE:
+        result = esock_getopt_lvl_sock_keepalive(env, descP);
+        break;
+#endif
+
+#if defined(SO_LINGER)
+    case ESOCK_OPT_SOCK_LINGER:
+        result = esock_getopt_lvl_sock_linger(env, descP);
+        break;
+#endif
+
+#if defined(SO_OOBINLINE)
+    case ESOCK_OPT_SOCK_OOBINLINE:
+        result = esock_getopt_lvl_sock_oobinline(env, descP);
+        break;
+#endif
+
+#if defined(SO_PEEK_OFF)
+    case ESOCK_OPT_SOCK_PEEK_OFF:
+        result = esock_getopt_lvl_sock_peek_off(env, descP);
+        break;
+#endif
+
+#if defined(SO_PRIORITY)
+    case ESOCK_OPT_SOCK_PRIORITY:
+        result = esock_getopt_lvl_sock_priority(env, descP);
+        break;
+#endif
+
+#if defined(SO_PROTOCOL)
+    case ESOCK_OPT_SOCK_PROTOCOL:
+        result = esock_getopt_lvl_sock_protocol(env, descP);
+        break;
+#endif
+
+#if defined(SO_RCVBUF)
+    case ESOCK_OPT_SOCK_RCVBUF:
+        result = esock_getopt_lvl_sock_rcvbuf(env, descP);
+        break;
+#endif
+
+#if defined(SO_RCVLOWAT)
+    case ESOCK_OPT_SOCK_RCVLOWAT:
+        result = esock_getopt_lvl_sock_rcvlowat(env, descP);
+        break;
+#endif
+
+#if defined(SO_RCVTIMEO)
+    case ESOCK_OPT_SOCK_RCVTIMEO:
+        result = esock_getopt_lvl_sock_rcvtimeo(env, descP);
+        break;
+#endif
+
+#if defined(SO_REUSEADDR)
+    case ESOCK_OPT_SOCK_REUSEADDR:
+        result = esock_getopt_lvl_sock_reuseaddr(env, descP);
+        break;
+#endif
+
+#if defined(SO_REUSEPORT)
+    case ESOCK_OPT_SOCK_REUSEPORT:
+        result = esock_getopt_lvl_sock_reuseport(env, descP);
+        break;
+#endif
+
+#if defined(SO_SNDBUF)
+    case ESOCK_OPT_SOCK_SNDBUF:
+        result = esock_getopt_lvl_sock_sndbuf(env, descP);
+        break;
+#endif
+
+#if defined(SO_SNDLOWAT)
+    case ESOCK_OPT_SOCK_SNDLOWAT:
+        result = esock_getopt_lvl_sock_sndlowat(env, descP);
+        break;
+#endif
+
+#if defined(SO_SNDTIMEO)
+    case ESOCK_OPT_SOCK_SNDTIMEO:
+        result = esock_getopt_lvl_sock_sndtimeo(env, descP);
+        break;
+#endif
+
+#if defined(SO_TIMESTAMP)
+    case ESOCK_OPT_SOCK_TIMESTAMP:
+        result = esock_getopt_lvl_sock_timestamp(env, descP);
+        break;
+#endif
+
+#if defined(SO_TYPE)
+    case ESOCK_OPT_SOCK_TYPE:
+        result = esock_getopt_lvl_sock_type(env, descP);
+        break;
+#endif
+
+    default:
+        result = esock_make_error(env, esock_atom_einval);
+        break;
+    }
+
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt_lvl_socket -> done when"
+            "\r\n   result:  %T"
+            "\r\n", result) );
+
+    return result;
+}
+
+
+#if defined(SO_ACCEPTCONN)
+static
+ERL_NIF_TERM esock_getopt_lvl_sock_acceptconn(ErlNifEnv*       env,
+                                              ESockDescriptor* descP)
+{
+    return esock_getopt_bool_opt(env, descP, SOL_SOCKET, SO_ACCEPTCONN);
+}
+#endif
+
+
+#if defined(SO_BINDTODEVICE)
+static
+ERL_NIF_TERM esock_getopt_lvl_sock_bindtodevice(ErlNifEnv*       env,
+                                                ESockDescriptor* descP)
+{
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt_lvl_sock_bindtodevice -> entry with\r\n") );
+
+    return esock_getopt_str_opt(env, descP,
+                                SOL_SOCKET, SO_BINDTODEVICE, IFNAMSIZ+1);
+}
+#endif
+
+
+#if defined(SO_BROADCAST)
+static
+ERL_NIF_TERM esock_getopt_lvl_sock_broadcast(ErlNifEnv*       env,
+                                             ESockDescriptor* descP)
+{
+    return esock_getopt_bool_opt(env, descP, SOL_SOCKET, SO_BROADCAST);
+}
+#endif
+
+
+#if defined(SO_DEBUG)
+static
+ERL_NIF_TERM esock_getopt_lvl_sock_debug(ErlNifEnv*       env,
+                                         ESockDescriptor* descP)
+{
+    return esock_getopt_int_opt(env, descP, SOL_SOCKET, SO_DEBUG);
+}
+#endif
+
+
+#if defined(SO_DOMAIN)
+static
+ERL_NIF_TERM esock_getopt_lvl_sock_domain(ErlNifEnv*       env,
+                                          ESockDescriptor* descP)
+{
+    ERL_NIF_TERM result, reason;
+    int          val;
+    SOCKOPTLEN_T valSz = sizeof(val);
+    int          res;
+
+    res = sock_getopt(descP->sock, SOL_SOCKET, SO_DOMAIN,
+                      &val, &valSz);
+
+    if (res != 0) {
+        result = esock_make_error_errno(env, sock_errno());
+    } else {
+        switch (val) {
+        case AF_INET:
+            result = esock_make_ok2(env, esock_atom_inet);
+            break;
+
+#if defined(HAVE_IN6) && defined(AF_INET6)
+        case AF_INET6:
+            result = esock_make_ok2(env, esock_atom_inet6);
+            break;
+#endif
+
+#ifdef HAVE_SYS_UN_H
+        case AF_UNIX:
+        result = esock_make_ok2(env, esock_atom_local);
+        break;
+#endif
+
+        default:
+            reason = MKT2(env, esock_atom_unknown, MKI(env, val));
+            result = esock_make_error(env, reason);
+            break;
+        }
+    }
+
+    return result;
+}
+#endif
+
+
+#if defined(SO_DONTROUTE)
+static
+ERL_NIF_TERM esock_getopt_lvl_sock_dontroute(ErlNifEnv*       env,
+                                             ESockDescriptor* descP)
+{
+    return esock_getopt_bool_opt(env, descP, SOL_SOCKET, SO_DONTROUTE);
+}
+#endif
+
+
+#if defined(SO_KEEPALIVE)
+static
+ERL_NIF_TERM esock_getopt_lvl_sock_keepalive(ErlNifEnv*       env,
+                                             ESockDescriptor* descP)
+{
+    return esock_getopt_bool_opt(env, descP, SOL_SOCKET, SO_KEEPALIVE);
+}
+#endif
+
+
+#if defined(SO_LINGER)
+static
+ERL_NIF_TERM esock_getopt_lvl_sock_linger(ErlNifEnv*       env,
+                                          ESockDescriptor* descP)
+{
+    ERL_NIF_TERM  result;
+    struct linger val;
+    SOCKOPTLEN_T  valSz = sizeof(val);
+    int           res;
+
+    sys_memzero((void *) &val, sizeof(val));
+
+    res = sock_getopt(descP->sock, SOL_SOCKET, SO_LINGER,
+                      &val, &valSz);
+
+    if (res != 0) {
+        result = esock_make_error_errno(env, sock_errno());
+    } else {
+        ERL_NIF_TERM lOnOff = ((val.l_onoff) ? atom_true : atom_false);
+        ERL_NIF_TERM lSecs  = MKI(env, val.l_linger);
+        ERL_NIF_TERM linger = MKT2(env, lOnOff, lSecs);
+
+        result = esock_make_ok2(env, linger);
+    }
+
+    return result;
+}
+#endif
+
+
+#if defined(SO_OOBINLINE)
+static
+ERL_NIF_TERM esock_getopt_lvl_sock_oobinline(ErlNifEnv*       env,
+                                             ESockDescriptor* descP)
+{
+    return esock_getopt_bool_opt(env, descP, SOL_SOCKET, SO_OOBINLINE);
+}
+#endif
+
+
+#if defined(SO_PEEK_OFF)
+static
+ERL_NIF_TERM esock_getopt_lvl_sock_peek_off(ErlNifEnv*       env,
+                                            ESockDescriptor* descP)
+{
+    return esock_getopt_int_opt(env, descP, SOL_SOCKET, SO_PEEK_OFF);
+}
+#endif
+
+
+#if defined(SO_PRIORITY)
+static
+ERL_NIF_TERM esock_getopt_lvl_sock_priority(ErlNifEnv*       env,
+                                            ESockDescriptor* descP)
+{
+    return esock_getopt_int_opt(env, descP, SOL_SOCKET, SO_PRIORITY);
+}
+#endif
+
+
+#if defined(SO_PROTOCOL)
+static
+ERL_NIF_TERM esock_getopt_lvl_sock_protocol(ErlNifEnv*       env,
+                                            ESockDescriptor* descP)
+{
+    ERL_NIF_TERM result, reason;
+    int          val;
+    SOCKOPTLEN_T valSz = sizeof(val);
+    int          res;
+
+    res = sock_getopt(descP->sock, SOL_SOCKET, SO_PROTOCOL,
+                      &val, &valSz);
+
+    if (res != 0) {
+        result = esock_make_error_errno(env, sock_errno());
+    } else {
+        switch (val) {
+        case IPPROTO_IP:
+#if defined(AF_LOCAL)
+            if (descP->domain == AF_LOCAL)
+                result = esock_make_ok2(env, esock_atom_default);
+            else
+                result = esock_make_ok2(env, esock_atom_ip);
+#else
+            result = esock_make_ok2(env, esock_atom_ip);
+#endif
+            break;
+
+        case IPPROTO_TCP:
+            result = esock_make_ok2(env, esock_atom_tcp);
+            break;
+
+        case IPPROTO_UDP:
+            result = esock_make_ok2(env, esock_atom_udp);
+            break;
+
+#if defined(HAVE_SCTP)
+        case IPPROTO_SCTP:
+            result = esock_make_ok2(env, esock_atom_sctp);
+            break;
+#endif
+
+        default:
+            reason = MKT2(env, esock_atom_unknown, MKI(env, val));
+            result = esock_make_error(env, reason);
+            break;
+        }
+    }
+
+    return result;
+}
+#endif
+
+
+#if defined(SO_RCVBUF)
+static
+ERL_NIF_TERM esock_getopt_lvl_sock_rcvbuf(ErlNifEnv*       env,
+                                          ESockDescriptor* descP)
+{
+    return esock_getopt_int_opt(env, descP, SOL_SOCKET, SO_RCVBUF);
+}
+#endif
+
+
+#if defined(SO_RCVLOWAT)
+static
+ERL_NIF_TERM esock_getopt_lvl_sock_rcvlowat(ErlNifEnv*       env,
+                                            ESockDescriptor* descP)
+{
+    return esock_getopt_int_opt(env, descP, SOL_SOCKET, SO_RCVLOWAT);
+}
+#endif
+
+
+#if defined(SO_RCVTIMEO)
+static
+ERL_NIF_TERM esock_getopt_lvl_sock_rcvtimeo(ErlNifEnv*       env,
+                                            ESockDescriptor* descP)
+{
+    return esock_getopt_timeval_opt(env, descP, SOL_SOCKET, SO_RCVTIMEO);
+}
+#endif
+
+
+#if defined(SO_REUSEADDR)
+static
+ERL_NIF_TERM esock_getopt_lvl_sock_reuseaddr(ErlNifEnv*       env,
+                                             ESockDescriptor* descP)
+{
+    return esock_getopt_bool_opt(env, descP, SOL_SOCKET, SO_REUSEADDR);
+}
+#endif
+
+
+#if defined(SO_REUSEPORT)
+static
+ERL_NIF_TERM esock_getopt_lvl_sock_reuseport(ErlNifEnv*       env,
+                                             ESockDescriptor* descP)
+{
+    return esock_getopt_bool_opt(env, descP, SOL_SOCKET, SO_REUSEPORT);
+}
+#endif
+
+
+#if defined(SO_SNDBUF)
+static
+ERL_NIF_TERM esock_getopt_lvl_sock_sndbuf(ErlNifEnv*       env,
+                                          ESockDescriptor* descP)
+{
+    return esock_getopt_int_opt(env, descP, SOL_SOCKET, SO_SNDBUF);
+}
+#endif
+
+
+#if defined(SO_SNDLOWAT)
+static
+ERL_NIF_TERM esock_getopt_lvl_sock_sndlowat(ErlNifEnv*       env,
+                                            ESockDescriptor* descP)
+{
+    return esock_getopt_int_opt(env, descP, SOL_SOCKET, SO_SNDLOWAT);
+}
+#endif
+
+
+#if defined(SO_SNDTIMEO)
+static
+ERL_NIF_TERM esock_getopt_lvl_sock_sndtimeo(ErlNifEnv*       env,
+                                            ESockDescriptor* descP)
+{
+    return esock_getopt_timeval_opt(env, descP, SOL_SOCKET, SO_SNDTIMEO);
+}
+#endif
+
+
+#if defined(SO_TIMESTAMP)
+static
+ERL_NIF_TERM esock_getopt_lvl_sock_timestamp(ErlNifEnv*       env,
+                                             ESockDescriptor* descP)
+{
+    return esock_getopt_bool_opt(env, descP, SOL_SOCKET, SO_TIMESTAMP);
+}
+#endif
+
+
+#if defined(SO_TYPE)
+static
+ERL_NIF_TERM esock_getopt_lvl_sock_type(ErlNifEnv*       env,
+                                        ESockDescriptor* descP)
+{
+    ERL_NIF_TERM result, reason;
+    int          val;
+    SOCKOPTLEN_T valSz = sizeof(val);
+    int          res;
+
+    res = sock_getopt(descP->sock, SOL_SOCKET, SO_TYPE, &val, &valSz);
+
+    if (res != 0) {
+        result = esock_make_error_errno(env, sock_errno());
+    } else {
+        switch (val) {
+        case SOCK_STREAM:
+            result = esock_make_ok2(env, esock_atom_stream);
+            break;
+        case SOCK_DGRAM:
+            result = esock_make_ok2(env, esock_atom_dgram);
+            break;
+#ifdef HAVE_SCTP
+        case SOCK_SEQPACKET:
+            result = esock_make_ok2(env, esock_atom_seqpacket);
+            break;
+#endif
+        case SOCK_RAW:
+            result = esock_make_ok2(env, esock_atom_raw);
+            break;
+        case SOCK_RDM:
+            result = esock_make_ok2(env, esock_atom_rdm);
+            break;
+        default:
+            reason = MKT2(env, esock_atom_unknown, MKI(env, val));
+            result = esock_make_error(env, reason);
+            break;
+        }
+    }
+
+    return result;
+}
+#endif
+
+
+/* esock_getopt_lvl_ip - Level *IP* option(s)
+ */
+static
+ERL_NIF_TERM esock_getopt_lvl_ip(ErlNifEnv*       env,
+                                 ESockDescriptor* descP,
+                                 int              eOpt)
+{
+    ERL_NIF_TERM result;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt_lvl_ip -> entry with"
+            "\r\n   eOpt: %d"
+            "\r\n", eOpt) );
+
+    switch (eOpt) {
+#if defined(IP_FREEBIND)
+    case ESOCK_OPT_IP_FREEBIND:
+        result = esock_getopt_lvl_ip_freebind(env, descP);
+        break;
+#endif
+
+#if defined(IP_HDRINCL)
+    case ESOCK_OPT_IP_HDRINCL:
+        result = esock_getopt_lvl_ip_hdrincl(env, descP);
+        break;
+#endif
+
+#if defined(IP_MINTTL)
+    case ESOCK_OPT_IP_MINTTL:
+        result = esock_getopt_lvl_ip_minttl(env, descP);
+        break;
+#endif
+
+#if defined(IP_MTU)
+    case ESOCK_OPT_IP_MTU:
+        result = esock_getopt_lvl_ip_mtu(env, descP);
+        break;
+#endif
+
+#if defined(IP_MTU_DISCOVER)
+    case ESOCK_OPT_IP_MTU_DISCOVER:
+        result = esock_getopt_lvl_ip_mtu_discover(env, descP);
+        break;
+#endif
+
+#if defined(IP_MULTICAST_ALL)
+    case ESOCK_OPT_IP_MULTICAST_ALL:
+        result = esock_getopt_lvl_ip_multicast_all(env, descP);
+        break;
+#endif
+
+#if defined(IP_MULTICAST_IF)
+    case ESOCK_OPT_IP_MULTICAST_IF:
+        result = esock_getopt_lvl_ip_multicast_if(env, descP);
+        break;
+#endif
+
+#if defined(IP_MULTICAST_LOOP)
+    case ESOCK_OPT_IP_MULTICAST_LOOP:
+        result = esock_getopt_lvl_ip_multicast_loop(env, descP);
+        break;
+#endif
+
+#if defined(IP_MULTICAST_TTL)
+    case ESOCK_OPT_IP_MULTICAST_TTL:
+        result = esock_getopt_lvl_ip_multicast_ttl(env, descP);
+        break;
+#endif
+
+#if defined(IP_NODEFRAG)
+    case ESOCK_OPT_IP_NODEFRAG:
+        result = esock_getopt_lvl_ip_nodefrag(env, descP);
+        break;
+#endif
+
+#if defined(IP_PKTINFO)
+    case ESOCK_OPT_IP_PKTINFO:
+        result = esock_getopt_lvl_ip_pktinfo(env, descP);
+        break;
+#endif
+
+#if defined(IP_RECVDSTADDR)
+    case ESOCK_OPT_IP_RECVDSTADDR:
+        result = esock_getopt_lvl_ip_recvdstaddr(env, descP);
+        break;
+#endif
+
+#if defined(IP_RECVERR)
+    case ESOCK_OPT_IP_RECVERR:
+        result = esock_getopt_lvl_ip_recverr(env, descP);
+        break;
+#endif
+
+#if defined(IP_RECVIF)
+    case ESOCK_OPT_IP_RECVIF:
+        result = esock_getopt_lvl_ip_recvif(env, descP);
+        break;
+#endif
+
+#if defined(IP_RECVOPTS)
+    case ESOCK_OPT_IP_RECVOPTS:
+        result = esock_getopt_lvl_ip_recvopts(env, descP);
+        break;
+#endif
+
+#if defined(IP_RECVORIGDSTADDR)
+    case ESOCK_OPT_IP_RECVORIGDSTADDR:
+        result = esock_getopt_lvl_ip_recvorigdstaddr(env, descP);
+        break;
+#endif
+
+#if defined(IP_RECVTOS)
+    case ESOCK_OPT_IP_RECVTOS:
+        result = esock_getopt_lvl_ip_recvtos(env, descP);
+        break;
+#endif
+
+#if defined(IP_RECVTTL)
+    case ESOCK_OPT_IP_RECVTTL:
+        result = esock_getopt_lvl_ip_recvttl(env, descP);
+        break;
+#endif
+
+#if defined(IP_RETOPTS)
+    case ESOCK_OPT_IP_RETOPTS:
+        result = esock_getopt_lvl_ip_retopts(env, descP);
+        break;
+#endif
+
+#if defined(IP_ROUTER_ALERT)
+    case ESOCK_OPT_IP_ROUTER_ALERT:
+        result = esock_getopt_lvl_ip_router_alert(env, descP);
+        break;
+#endif
+
+#if defined(IP_SENDSRCADDR)
+    case ESOCK_OPT_IP_SENDSRCADDR:
+        result = esock_getopt_lvl_ip_sendsrcaddr(env, descP);
+        break;
+#endif
+
+#if defined(IP_TOS)
+    case ESOCK_OPT_IP_TOS:
+        result = esock_getopt_lvl_ip_tos(env, descP);
+        break;
+#endif
+
+#if defined(IP_TRANSPARENT)
+    case ESOCK_OPT_IP_TRANSPARENT:
+        result = esock_getopt_lvl_ip_transparent(env, descP);
+        break;
+#endif
+
+#if defined(IP_TTL)
+    case ESOCK_OPT_IP_TTL:
+        result = esock_getopt_lvl_ip_ttl(env, descP);
+        break;
+#endif
+
+    default:
+        SSDBG( descP,
+               ("SOCKET", "esock_getopt_lvl_ip -> unknown opt %d\r\n", eOpt) );
+        result = esock_make_error(env, esock_atom_einval);
+        break;
+    }
+
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt_lvl_ip -> done when"
+            "\r\n   result: %T"
+            "\r\n", result) );
+
+    return result;
+}
+
+
+/* esock_getopt_lvl_ip_minttl - Level IP MINTTL option
+ */
+#if defined(IP_MINTTL)
+static
+ERL_NIF_TERM esock_getopt_lvl_ip_minttl(ErlNifEnv*       env,
+                                        ESockDescriptor* descP)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_getopt_int_opt(env, descP, level, IP_MINTTL);
+}
+#endif
+
+
+/* esock_getopt_lvl_ip_freebind - Level IP FREEBIND option
+ */
+#if defined(IP_FREEBIND)
+static
+ERL_NIF_TERM esock_getopt_lvl_ip_freebind(ErlNifEnv*       env,
+                                          ESockDescriptor* descP)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_getopt_bool_opt(env, descP, level, IP_FREEBIND);
+}
+#endif
+
+
+/* esock_getopt_lvl_ip_hdrincl - Level IP HDRINCL option
+ */
+#if defined(IP_HDRINCL)
+static
+ERL_NIF_TERM esock_getopt_lvl_ip_hdrincl(ErlNifEnv*       env,
+                                         ESockDescriptor* descP)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_getopt_bool_opt(env, descP, level, IP_HDRINCL);
+}
+#endif
+
+
+/* esock_getopt_lvl_ip_mtu - Level IP MTU option
+ */
+#if defined(IP_MTU)
+static
+ERL_NIF_TERM esock_getopt_lvl_ip_mtu(ErlNifEnv*       env,
+                                     ESockDescriptor* descP)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_getopt_int_opt(env, descP, level, IP_MTU);
+}
+#endif
+
+
+/* esock_getopt_lvl_ip_mtu_discover - Level IP MTU_DISCOVER option
+ */
+#if defined(IP_MTU_DISCOVER)
+static
+ERL_NIF_TERM esock_getopt_lvl_ip_mtu_discover(ErlNifEnv*       env,
+                                              ESockDescriptor* descP)
+{
+    ERL_NIF_TERM   result;
+    ERL_NIF_TERM   eMtuDisc;
+    int            mtuDisc;
+    SOCKOPTLEN_T   mtuDiscSz = sizeof(mtuDisc);
+    int            res;
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    res = sock_getopt(descP->sock, level, IP_MTU_DISCOVER,
+                      &mtuDisc, &mtuDiscSz);
+
+    if (res != 0) {
+        result = esock_make_error_errno(env, sock_errno());
+    } else {
+        encode_ip_pmtudisc(env, mtuDisc, &eMtuDisc);
+        result = esock_make_ok2(env, eMtuDisc);
+    }
+
+    return result;
+
+}
+#endif
+
+
+/* esock_getopt_lvl_ip_multicast_all - Level IP MULTICAST_ALL option
+ */
+#if defined(IP_MULTICAST_ALL)
+static
+ERL_NIF_TERM esock_getopt_lvl_ip_multicast_all(ErlNifEnv*       env,
+                                               ESockDescriptor* descP)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_getopt_bool_opt(env, descP, level, IP_MULTICAST_ALL);
+}
+#endif
+
+
+/* esock_getopt_lvl_ip_multicast_if - Level IP MULTICAST_IF option
+ */
+#if defined(IP_MULTICAST_IF)
+static
+ERL_NIF_TERM esock_getopt_lvl_ip_multicast_if(ErlNifEnv*       env,
+                                              ESockDescriptor* descP)
+{
+    ERL_NIF_TERM   result;
+    ERL_NIF_TERM   eAddr;
+    struct in_addr ifAddr;
+    SOCKOPTLEN_T   ifAddrSz = sizeof(ifAddr);
+    char*          xres;
+    int            res;
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    res = sock_getopt(descP->sock, level, IP_MULTICAST_IF, &ifAddr, &ifAddrSz);
+
+    if (res != 0) {
+        result = esock_make_error_errno(env, sock_errno());
+    } else {
+        if ((xres = esock_encode_ip4_address(env, &ifAddr, &eAddr)) != NULL) {
+            result = esock_make_error_str(env, xres);
+        } else {
+            result = esock_make_ok2(env, eAddr);
+        }
+    }
+
+    return result;
+
+}
+#endif
+
+
+/* esock_getopt_lvl_ip_multicast_loop - Level IP MULTICAST_LOOP option
+ */
+#if defined(IP_MULTICAST_LOOP)
+static
+ERL_NIF_TERM esock_getopt_lvl_ip_multicast_loop(ErlNifEnv*       env,
+                                                ESockDescriptor* descP)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_getopt_bool_opt(env, descP, level, IP_MULTICAST_LOOP);
+}
+#endif
+
+
+/* esock_getopt_lvl_ip_multicast_ttl - Level IP MULTICAST_TTL option
+ */
+#if defined(IP_MULTICAST_TTL)
+static
+ERL_NIF_TERM esock_getopt_lvl_ip_multicast_ttl(ErlNifEnv*       env,
+                                               ESockDescriptor* descP)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_getopt_int_opt(env, descP, level, IP_MULTICAST_TTL);
+}
+#endif
+
+
+/* esock_getopt_lvl_ip_nodefrag - Level IP NODEFRAG option
+ */
+#if defined(IP_NODEFRAG)
+static
+ERL_NIF_TERM esock_getopt_lvl_ip_nodefrag(ErlNifEnv*       env,
+                                          ESockDescriptor* descP)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_getopt_bool_opt(env, descP, level, IP_NODEFRAG);
+}
+#endif
+
+
+/* esock_getopt_lvl_ip_pktinfo - Level IP PKTINFO option
+ */
+#if defined(IP_PKTINFO)
+static
+ERL_NIF_TERM esock_getopt_lvl_ip_pktinfo(ErlNifEnv*       env,
+                                         ESockDescriptor* descP)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_getopt_bool_opt(env, descP, level, IP_PKTINFO);
+}
+#endif
+
+
+/* esock_getopt_lvl_ip_recvtos - Level IP RECVTOS option
+ */
+#if defined(IP_RECVTOS)
+static
+ERL_NIF_TERM esock_getopt_lvl_ip_recvtos(ErlNifEnv*       env,
+                                         ESockDescriptor* descP)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_getopt_bool_opt(env, descP, level, IP_RECVTOS);
+}
+#endif
+
+
+/* esock_getopt_lvl_ip_recvdstaddr - Level IP RECVDSTADDR option
+ */
+#if defined(IP_RECVDSTADDR)
+static
+ERL_NIF_TERM esock_getopt_lvl_ip_recvdstaddr(ErlNifEnv*       env,
+                                             ESockDescriptor* descP)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_getopt_bool_opt(env, descP, level, IP_RECVDSTADDR);
+}
+#endif
+
+
+/* esock_getopt_lvl_ip_recverr - Level IP RECVERR option
+ */
+#if defined(IP_RECVERR)
+static
+ERL_NIF_TERM esock_getopt_lvl_ip_recverr(ErlNifEnv*       env,
+                                         ESockDescriptor* descP)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_getopt_bool_opt(env, descP, level, IP_RECVERR);
+}
+#endif
+
+
+/* esock_getopt_lvl_ip_recvif - Level IP RECVIF option
+ */
+#if defined(IP_RECVIF)
+static
+ERL_NIF_TERM esock_getopt_lvl_ip_recvif(ErlNifEnv*       env,
+                                        ESockDescriptor* descP)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_getopt_bool_opt(env, descP, level, IP_RECVIF);
+}
+#endif
+
+
+/* esock_getopt_lvl_ip_recvopt - Level IP RECVOPTS option
+ */
+#if defined(IP_RECVOPTS)
+static
+ERL_NIF_TERM esock_getopt_lvl_ip_recvopts(ErlNifEnv*       env,
+                                          ESockDescriptor* descP)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_getopt_bool_opt(env, descP, level, IP_RECVOPTS);
+}
+#endif
+
+
+/* esock_getopt_lvl_ip_recvorigdstaddr - Level IP RECVORIGDSTADDR option
+ */
+#if defined(IP_RECVORIGDSTADDR)
+static
+ERL_NIF_TERM esock_getopt_lvl_ip_recvorigdstaddr(ErlNifEnv*       env,
+                                                 ESockDescriptor* descP)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_getopt_bool_opt(env, descP, level, IP_RECVORIGDSTADDR);
+}
+#endif
+
+
+/* esock_getopt_lvl_ip_recvttl - Level IP RECVTTL option
+ */
+#if defined(IP_RECVTTL)
+static
+ERL_NIF_TERM esock_getopt_lvl_ip_recvttl(ErlNifEnv*       env,
+                                         ESockDescriptor* descP)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_getopt_bool_opt(env, descP, level, IP_RECVTTL);
+}
+#endif
+
+
+/* esock_getopt_lvl_ip_retopts - Level IP RETOPTS option
+ */
+#if defined(IP_RETOPTS)
+static
+ERL_NIF_TERM esock_getopt_lvl_ip_retopts(ErlNifEnv*       env,
+                                         ESockDescriptor* descP)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_getopt_bool_opt(env, descP, level, IP_RETOPTS);
+}
+#endif
+
+
+/* esock_getopt_lvl_ip_router_alert - Level IP ROUTER_ALERT option
+ */
+#if defined(IP_ROUTER_ALERT)
+static
+ERL_NIF_TERM esock_getopt_lvl_ip_router_alert(ErlNifEnv*       env,
+                                              ESockDescriptor* descP)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_getopt_int_opt(env, descP, level, IP_ROUTER_ALERT);
+}
+#endif
+
+
+/* esock_getopt_lvl_ip_sendsrcaddr - Level IP SENDSRCADDR option
+ */
+#if defined(IP_SENDSRCADDR)
+static
+ERL_NIF_TERM esock_getopt_lvl_ip_sendsrcaddr(ErlNifEnv*       env,
+                                             ESockDescriptor* descP)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_getopt_bool_opt(env, descP, level, IP_SENDSRCADDR);
+}
+#endif
+
+
+/* esock_getopt_lvl_ip_tos - Level IP TOS option
+ */
+#if defined(IP_TOS)
+static
+ERL_NIF_TERM esock_getopt_lvl_ip_tos(ErlNifEnv*       env,
+                                     ESockDescriptor* descP)
+{
+#if defined(SOL_IP)
+    int          level = SOL_IP;
+#else
+    int          level = IPPROTO_IP;
+#endif
+    ERL_NIF_TERM result;
+    int          val;
+    SOCKOPTLEN_T valSz = sizeof(val);
+    int          res;
+
+    res = sock_getopt(descP->sock, level, IP_TOS, &val, &valSz);
+
+    if (res != 0) {
+        result = esock_make_error_errno(env, sock_errno());
+    } else {
+        result = encode_ip_tos(env, val);
+    }
+
+    return result;
+}
+#endif
+
+
+/* esock_getopt_lvl_ip_transparent - Level IP TRANSPARENT option
+ */
+#if defined(IP_TRANSPARENT)
+static
+ERL_NIF_TERM esock_getopt_lvl_ip_transparent(ErlNifEnv*       env,
+                                             ESockDescriptor* descP)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_getopt_bool_opt(env, descP, level, IP_TRANSPARENT);
+}
+#endif
+
+
+
+/* esock_getopt_lvl_ip_ttl - Level IP TTL option
+ */
+#if defined(IP_TTL)
+static
+ERL_NIF_TERM esock_getopt_lvl_ip_ttl(ErlNifEnv*       env,
+                                     ESockDescriptor* descP)
+{
+#if defined(SOL_IP)
+    int level = SOL_IP;
+#else
+    int level = IPPROTO_IP;
+#endif
+
+    return esock_getopt_int_opt(env, descP, level, IP_TTL);
+}
+#endif
+
+
+
+/* esock_getopt_lvl_ipv6 - Level *IPv6* option(s)
+ */
+#if defined(HAVE_IPV6)
+static
+ERL_NIF_TERM esock_getopt_lvl_ipv6(ErlNifEnv*       env,
+                                   ESockDescriptor* descP,
+                                   int              eOpt)
+{
+    ERL_NIF_TERM result;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt_lvl_ipv6 -> entry with"
+            "\r\n   eOpt: %d"
+            "\r\n", eOpt) );
+
+    switch (eOpt) {
+#if defined(IPV6_AUTHHDR)
+    case ESOCK_OPT_IPV6_AUTHHDR:
+        result = esock_getopt_lvl_ipv6_authhdr(env, descP);
+        break;
+#endif
+
+#if defined(IPV6_DSTOPTS)
+    case ESOCK_OPT_IPV6_DSTOPTS:
+        result = esock_getopt_lvl_ipv6_dstopts(env, descP);
+        break;
+#endif
+
+#if defined(IPV6_FLOWINFO)
+    case ESOCK_OPT_IPV6_FLOWINFO:
+        result = esock_getopt_lvl_ipv6_flowinfo(env, descP);
+        break;
+#endif
+
+#if defined(IPV6_HOPLIMIT)
+    case ESOCK_OPT_IPV6_HOPLIMIT:
+        result = esock_getopt_lvl_ipv6_hoplimit(env, descP);
+        break;
+#endif
+
+#if defined(IPV6_HOPOPTS)
+    case ESOCK_OPT_IPV6_HOPOPTS:
+        result = esock_getopt_lvl_ipv6_hopopts(env, descP);
+        break;
+#endif
+
+#if defined(IPV6_MTU)
+    case ESOCK_OPT_IPV6_MTU:
+        result = esock_getopt_lvl_ipv6_mtu(env, descP);
+        break;
+#endif
+
+#if defined(IPV6_MTU_DISCOVER)
+    case ESOCK_OPT_IPV6_MTU_DISCOVER:
+        result = esock_getopt_lvl_ipv6_mtu_discover(env, descP);
+        break;
+#endif
+
+#if defined(IPV6_MULTICAST_HOPS)
+    case ESOCK_OPT_IPV6_MULTICAST_HOPS:
+        result = esock_getopt_lvl_ipv6_multicast_hops(env, descP);
+        break;
+#endif
+
+#if defined(IPV6_MULTICAST_IF)
+    case ESOCK_OPT_IPV6_MULTICAST_IF:
+        result = esock_getopt_lvl_ipv6_multicast_if(env, descP);
+        break;
+#endif
+
+#if defined(IPV6_MULTICAST_LOOP)
+    case ESOCK_OPT_IPV6_MULTICAST_LOOP:
+        result = esock_getopt_lvl_ipv6_multicast_loop(env, descP);
+        break;
+#endif
+
+#if defined(IPV6_RECVERR)
+    case ESOCK_OPT_IPV6_RECVERR:
+        result = esock_getopt_lvl_ipv6_recverr(env, descP);
+        break;
+#endif
+
+#if defined(IPV6_RECVPKTINFO) || defined(IPV6_PKTINFO)
+    case ESOCK_OPT_IPV6_RECVPKTINFO:
+        result = esock_getopt_lvl_ipv6_recvpktinfo(env, descP);
+        break;
+#endif
+
+#if defined(IPV6_ROUTER_ALERT)
+    case ESOCK_OPT_IPV6_ROUTER_ALERT:
+        result = esock_getopt_lvl_ipv6_router_alert(env, descP);
+        break;
+#endif
+
+#if defined(IPV6_RTHDR)
+    case ESOCK_OPT_IPV6_RTHDR:
+        result = esock_getopt_lvl_ipv6_rthdr(env, descP);
+        break;
+#endif
+
+#if defined(IPV6_UNICAST_HOPS)
+    case ESOCK_OPT_IPV6_UNICAST_HOPS:
+        result = esock_getopt_lvl_ipv6_unicast_hops(env, descP);
+        break;
+#endif
+
+#if defined(IPV6_V6ONLY)
+    case ESOCK_OPT_IPV6_V6ONLY:
+        result = esock_getopt_lvl_ipv6_v6only(env, descP);
+        break;
+#endif
+
+    default:
+        result = esock_make_error(env, esock_atom_einval);
+        break;
+    }
+
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt_lvl_ipv6 -> done when"
+            "\r\n   result: %T"
+            "\r\n", result) );
+
+    return result;
+}
+
+
+#if defined(IPV6_AUTHHDR)
+static
+ERL_NIF_TERM esock_getopt_lvl_ipv6_authhdr(ErlNifEnv*       env,
+                                           ESockDescriptor* descP)
+{
+    return esock_getopt_bool_opt(env, descP, SOL_IPV6, IPV6_AUTHHDR);
+}
+#endif
+
+
+#if defined(IPV6_DSTOPTS)
+static
+ERL_NIF_TERM esock_getopt_lvl_ipv6_dstopts(ErlNifEnv*       env,
+                                           ESockDescriptor* descP)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+    return esock_getopt_bool_opt(env, descP, level, IPV6_DSTOPTS);
+}
+#endif
+
+
+#if defined(IPV6_FLOWINFO)
+static
+ERL_NIF_TERM esock_getopt_lvl_ipv6_flowinfo(ErlNifEnv*       env,
+                                            ESockDescriptor* descP)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+
+    return esock_getopt_bool_opt(env, descP, level, IPV6_FLOWINFO);
+}
+#endif
+
+
+#if defined(IPV6_HOPLIMIT)
+static
+ERL_NIF_TERM esock_getopt_lvl_ipv6_hoplimit(ErlNifEnv*       env,
+                                            ESockDescriptor* descP)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+
+    return esock_getopt_bool_opt(env, descP, level, IPV6_HOPLIMIT);
+}
+#endif
+
+
+#if defined(IPV6_HOPOPTS)
+static
+ERL_NIF_TERM esock_getopt_lvl_ipv6_hopopts(ErlNifEnv*       env,
+                                           ESockDescriptor* descP)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+
+    return esock_getopt_bool_opt(env, descP, level, IPV6_HOPOPTS);
+}
+#endif
+
+
+#if defined(IPV6_MTU)
+static
+ERL_NIF_TERM esock_getopt_lvl_ipv6_mtu(ErlNifEnv*       env,
+                                       ESockDescriptor* descP)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+
+    return esock_getopt_int_opt(env, descP, level, IPV6_MTU);
+}
+#endif
+
+
+/* esock_getopt_lvl_ipv6_mtu_discover - Level IPv6 MTU_DISCOVER option
+ */
+#if defined(IPV6_MTU_DISCOVER)
+static
+ERL_NIF_TERM esock_getopt_lvl_ipv6_mtu_discover(ErlNifEnv*       env,
+                                                ESockDescriptor* descP)
+{
+    ERL_NIF_TERM  result;
+    ERL_NIF_TERM  eMtuDisc;
+    int           mtuDisc;
+    SOCKOPTLEN_T  mtuDiscSz = sizeof(mtuDisc);
+    int           res;
+#if defined(SOL_IPV6)
+    int           level = SOL_IPV6;
+#else
+    int           level = IPPROTO_IPV6;
+#endif
+
+    res = sock_getopt(descP->sock, level, IPV6_MTU_DISCOVER,
+                      &mtuDisc, &mtuDiscSz);
+
+    if (res != 0) {
+        result = esock_make_error_errno(env, sock_errno());
+    } else {
+        encode_ipv6_pmtudisc(env, mtuDisc, &eMtuDisc);
+        result = esock_make_ok2(env, eMtuDisc);
+    }
+
+    return result;
+
+}
+#endif
+
+
+#if defined(IPV6_MULTICAST_HOPS)
+static
+ERL_NIF_TERM esock_getopt_lvl_ipv6_multicast_hops(ErlNifEnv*       env,
+                                                  ESockDescriptor* descP)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+
+    return esock_getopt_int_opt(env, descP, level, IPV6_MULTICAST_HOPS);
+}
+#endif
+
+
+#if defined(IPV6_MULTICAST_IF)
+static
+ERL_NIF_TERM esock_getopt_lvl_ipv6_multicast_if(ErlNifEnv*       env,
+                                                ESockDescriptor* descP)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+
+    return esock_getopt_int_opt(env, descP, level, IPV6_MULTICAST_IF);
+}
+#endif
+
+
+#if defined(IPV6_MULTICAST_LOOP)
+static
+ERL_NIF_TERM esock_getopt_lvl_ipv6_multicast_loop(ErlNifEnv*       env,
+                                                  ESockDescriptor* descP)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+
+    return esock_getopt_bool_opt(env, descP, level, IPV6_MULTICAST_LOOP);
+}
+#endif
+
+
+#if defined(IPV6_RECVERR)
+static
+ERL_NIF_TERM esock_getopt_lvl_ipv6_recverr(ErlNifEnv*       env,
+                                           ESockDescriptor* descP)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+
+    return esock_getopt_bool_opt(env, descP, level, IPV6_RECVERR);
+}
+#endif
+
+
+#if defined(IPV6_RECVPKTINFO) || defined(IPV6_PKTINFO)
+static
+ERL_NIF_TERM esock_getopt_lvl_ipv6_recvpktinfo(ErlNifEnv*       env,
+                                               ESockDescriptor* descP)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+#if defined(IPV6_RECVPKTINFO)
+    int opt   = IPV6_RECVPKTINFO;
+#else
+    int opt   = IPV6_PKTINFO;
+#endif
+
+    return esock_getopt_bool_opt(env, descP, level, opt);
+}
+#endif
+
+
+#if defined(IPV6_ROUTER_ALERT)
+static
+ERL_NIF_TERM esock_getopt_lvl_ipv6_router_alert(ErlNifEnv*       env,
+                                                ESockDescriptor* descP)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+
+    return esock_getopt_int_opt(env, descP, level, IPV6_ROUTER_ALERT);
+}
+#endif
+
+
+#if defined(IPV6_RTHDR)
+static
+ERL_NIF_TERM esock_getopt_lvl_ipv6_rthdr(ErlNifEnv*       env,
+                                         ESockDescriptor* descP)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+
+    return esock_getopt_bool_opt(env, descP, level, IPV6_RTHDR);
+}
+#endif
+
+
+#if defined(IPV6_UNICAST_HOPS)
+static
+ERL_NIF_TERM esock_getopt_lvl_ipv6_unicast_hops(ErlNifEnv*       env,
+                                                ESockDescriptor* descP)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+
+    return esock_getopt_int_opt(env, descP, level, IPV6_UNICAST_HOPS);
+}
+#endif
+
+
+#if defined(IPV6_V6ONLY)
+static
+ERL_NIF_TERM esock_getopt_lvl_ipv6_v6only(ErlNifEnv*       env,
+                                          ESockDescriptor* descP)
+{
+#if defined(SOL_IPV6)
+    int level = SOL_IPV6;
+#else
+    int level = IPPROTO_IPV6;
+#endif
+
+    return esock_getopt_bool_opt(env, descP, level, IPV6_V6ONLY);
+}
+#endif
+
+
+#endif // defined(HAVE_IPV6)
+
+
+
+/* esock_getopt_lvl_tcp - Level *TCP* option(s)
+ */
+static
+ERL_NIF_TERM esock_getopt_lvl_tcp(ErlNifEnv*       env,
+                                  ESockDescriptor* descP,
+                                  int              eOpt)
+{
+    ERL_NIF_TERM result;
+
+    switch (eOpt) {
+#if defined(TCP_CONGESTION)
+    case ESOCK_OPT_TCP_CONGESTION:
+        result = esock_getopt_lvl_tcp_congestion(env, descP);
+        break;
+#endif
+
+#if defined(TCP_MAXSEG)
+    case ESOCK_OPT_TCP_MAXSEG:
+        result = esock_getopt_lvl_tcp_maxseg(env, descP);
+        break;
+#endif
+
+#if defined(TCP_NODELAY)
+    case ESOCK_OPT_TCP_NODELAY:
+        result = esock_getopt_lvl_tcp_nodelay(env, descP);
+        break;
+#endif
+
+    default:
+        result = esock_make_error(env, esock_atom_einval);
+        break;
+    }
+
+    return result;
+}
+
+
+/* esock_getopt_lvl_tcp_congestion - Level TCP CONGESTION option
+ */
+#if defined(TCP_CONGESTION)
+static
+ERL_NIF_TERM esock_getopt_lvl_tcp_congestion(ErlNifEnv*       env,
+                                             ESockDescriptor* descP)
+{
+    int max = ESOCK_OPT_TCP_CONGESTION_NAME_MAX+1;
+
+    return esock_getopt_str_opt(env, descP, IPPROTO_TCP, TCP_CONGESTION, max);
+}
+#endif
+
+
+/* esock_getopt_lvl_tcp_maxseg - Level TCP MAXSEG option
+ */
+#if defined(TCP_MAXSEG)
+static
+ERL_NIF_TERM esock_getopt_lvl_tcp_maxseg(ErlNifEnv*       env,
+                                         ESockDescriptor* descP)
+{
+    return esock_getopt_int_opt(env, descP, IPPROTO_TCP, TCP_MAXSEG);
+}
+#endif
+
+
+/* esock_getopt_lvl_tcp_nodelay - Level TCP NODELAY option
+ */
+#if defined(TCP_NODELAY)
+static
+ERL_NIF_TERM esock_getopt_lvl_tcp_nodelay(ErlNifEnv*       env,
+                                          ESockDescriptor* descP)
+{
+    return esock_getopt_bool_opt(env, descP, IPPROTO_TCP, TCP_NODELAY);
+}
+#endif
+
+
+
+/* esock_getopt_lvl_udp - Level *UDP* option(s)
+ */
+static
+ERL_NIF_TERM esock_getopt_lvl_udp(ErlNifEnv*       env,
+                                  ESockDescriptor* descP,
+                                  int              eOpt)
+{
+    ERL_NIF_TERM result;
+
+    switch (eOpt) {
+#if defined(UDP_CORK)
+    case ESOCK_OPT_UDP_CORK:
+        result = esock_getopt_lvl_udp_cork(env, descP);
+        break;
+#endif
+
+    default:
+        result = esock_make_error(env, esock_atom_einval);
+        break;
+    }
+
+    return result;
+}
+
+
+/* esock_getopt_lvl_udp_cork - Level UDP CORK option
+ */
+#if defined(UDP_CORK)
+static
+ERL_NIF_TERM esock_getopt_lvl_udp_cork(ErlNifEnv*       env,
+                                       ESockDescriptor* descP)
+{
+    return esock_getopt_bool_opt(env, descP, IPPROTO_UDP, UDP_CORK);
+}
+#endif
+
+
+
+/* esock_getopt_lvl_sctp - Level *SCTP* option(s)
+ */
+#if defined(HAVE_SCTP)
+static
+ERL_NIF_TERM esock_getopt_lvl_sctp(ErlNifEnv*       env,
+                                   ESockDescriptor* descP,
+                                   int              eOpt)
+{
+    ERL_NIF_TERM result;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt_lvl_sctp -> entry with"
+            "\r\n   opt: %d"
+            "\r\n", eOpt) );
+
+    switch (eOpt) {
+#if defined(SCTP_ASSOCINFO)
+    case ESOCK_OPT_SCTP_ASSOCINFO:
+        result = esock_getopt_lvl_sctp_associnfo(env, descP);
+        break;
+#endif
+
+#if defined(SCTP_AUTOCLOSE)
+    case ESOCK_OPT_SCTP_AUTOCLOSE:
+        result = esock_getopt_lvl_sctp_autoclose(env, descP);
+        break;
+#endif
+
+#if defined(SCTP_DISABLE_FRAGMENTS)
+    case ESOCK_OPT_SCTP_DISABLE_FRAGMENTS:
+        result = esock_getopt_lvl_sctp_disable_fragments(env, descP);
+        break;
+#endif
+
+#if defined(SCTP_INITMSG)
+    case ESOCK_OPT_SCTP_INITMSG:
+        result = esock_getopt_lvl_sctp_initmsg(env, descP);
+        break;
+#endif
+
+#if defined(SCTP_MAXSEG)
+    case ESOCK_OPT_SCTP_MAXSEG:
+        result = esock_getopt_lvl_sctp_maxseg(env, descP);
+        break;
+#endif
+
+#if defined(SCTP_NODELAY)
+    case ESOCK_OPT_SCTP_NODELAY:
+        result = esock_getopt_lvl_sctp_nodelay(env, descP);
+        break;
+#endif
+
+#if defined(SCTP_RTOINFO)
+    case ESOCK_OPT_SCTP_RTOINFO:
+        result = esock_getopt_lvl_sctp_rtoinfo(env, descP);
+        break;
+#endif
+
+    default:
+        result = esock_make_error(env, esock_atom_einval);
+        break;
+    }
+
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt_lvl_sctp -> done when"
+            "\r\n   result: %T"
+            "\r\n", result) );
+
+    return result;
+}
+
+
+/* esock_getopt_lvl_sctp_associnfo - Level SCTP ASSOCINFO option
+ *
+ * <KOLLA>
+ *
+ * We should really specify which association this relates to,
+ * as it is now we get assoc-id = 0. If this socket is an 
+ * association (and not an endpoint) then it will have an
+ * assoc id. But since the sctp support at present is "limited",
+ * we leave it for now.
+ * What do we do if this is an endpoint? Invalid op?
+ *
+ * </KOLLA>
+ */
+#if defined(SCTP_ASSOCINFO)
+static
+ERL_NIF_TERM esock_getopt_lvl_sctp_associnfo(ErlNifEnv*       env,
+                                             ESockDescriptor* descP)
+{
+    ERL_NIF_TERM            result;
+    struct sctp_assocparams val;
+    SOCKOPTLEN_T            valSz = sizeof(val);
+    int                     res;
+
+    SSDBG( descP, ("SOCKET", "esock_getopt_lvl_sctp_associnfo -> entry\r\n") );
+    
+    sys_memzero((char*) &val, valSz);
+    res = sock_getopt(descP->sock, IPPROTO_SCTP, SCTP_ASSOCINFO, &val, &valSz);
+
+    if (res != 0) {
+        result = esock_make_error_errno(env, sock_errno());
+    } else {
+        ERL_NIF_TERM eAssocParams;
+        ERL_NIF_TERM keys[]  = {atom_assoc_id, atom_max_rxt, atom_num_peer_dests,
+                                atom_peer_rwnd, atom_local_rwnd, atom_cookie_life};
+        ERL_NIF_TERM vals[]  = {MKUI(env, val.sasoc_assoc_id),
+                                MKUI(env, val.sasoc_asocmaxrxt),
+                                MKUI(env, val.sasoc_number_peer_destinations),
+                                MKUI(env, val.sasoc_peer_rwnd),
+                                MKUI(env, val.sasoc_local_rwnd),
+                                MKUI(env, val.sasoc_cookie_life)};
+        unsigned int numKeys = sizeof(keys) / sizeof(ERL_NIF_TERM);
+        unsigned int numVals = sizeof(vals) / sizeof(ERL_NIF_TERM);
+
+        ESOCK_ASSERT( (numKeys == numVals) );
+
+        if (!MKMA(env, keys, vals, numKeys, &eAssocParams))
+            return esock_make_error(env, esock_atom_einval);;
+    
+        result = esock_make_ok2(env, eAssocParams);
+    }
+
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt_lvl_sctp_associnfo -> done with"
+            "\r\n   res:    %d"
+            "\r\n   result: %T"
+            "\r\n", res, result) );
+
+    return result;
+}
+#endif
+
+
+/* esock_getopt_lvl_sctp_autoclose - Level SCTP AUTOCLOSE option
+ */
+#if defined(SCTP_AUTOCLOSE)
+static
+ERL_NIF_TERM esock_getopt_lvl_sctp_autoclose(ErlNifEnv*       env,
+                                             ESockDescriptor* descP)
+{
+    return esock_getopt_int_opt(env, descP, IPPROTO_SCTP, SCTP_AUTOCLOSE);
+}
+#endif
+
+
+/* esock_getopt_lvl_sctp_disable_fragments - Level SCTP DISABLE:FRAGMENTS option
+ */
+#if defined(SCTP_DISABLE_FRAGMENTS)
+static
+ERL_NIF_TERM esock_getopt_lvl_sctp_disable_fragments(ErlNifEnv*       env,
+                                                     ESockDescriptor* descP)
+{
+    return esock_getopt_bool_opt(env, descP,
+                                 IPPROTO_SCTP, SCTP_DISABLE_FRAGMENTS);
+}
+#endif
+
+
+/* esock_getopt_lvl_sctp_initmsg - Level SCTP INITMSG option
+ *
+ */
+#if defined(SCTP_INITMSG)
+static
+ERL_NIF_TERM esock_getopt_lvl_sctp_initmsg(ErlNifEnv*       env,
+                                           ESockDescriptor* descP)
+{
+    ERL_NIF_TERM        result;
+    struct sctp_initmsg val;
+    SOCKOPTLEN_T        valSz = sizeof(val);
+    int                 res;
+
+    SSDBG( descP, ("SOCKET", "esock_getopt_lvl_sctp_initmsg -> entry\r\n") );
+    
+    sys_memzero((char*) &val, valSz);
+    res = sock_getopt(descP->sock, IPPROTO_SCTP, SCTP_INITMSG, &val, &valSz);
+
+    if (res != 0) {
+        result = esock_make_error_errno(env, sock_errno());
+    } else {
+        ERL_NIF_TERM eInitMsg;
+        ERL_NIF_TERM keys[]  = {atom_num_outstreams, atom_max_instreams,
+                                atom_max_attempts, atom_max_init_timeo};
+        ERL_NIF_TERM vals[]  = {MKUI(env, val.sinit_num_ostreams),
+                                MKUI(env, val.sinit_max_instreams),
+                                MKUI(env, val.sinit_max_attempts),
+                                MKUI(env, val.sinit_max_init_timeo)};
+        unsigned int numKeys = sizeof(keys) / sizeof(ERL_NIF_TERM);
+        unsigned int numVals = sizeof(vals) / sizeof(ERL_NIF_TERM);
+
+        ESOCK_ASSERT( (numKeys == numVals) );
+
+        if (!MKMA(env, keys, vals, numKeys, &eInitMsg))
+            return esock_make_error(env, esock_atom_einval);;
+    
+        result = esock_make_ok2(env, eInitMsg);
+    }
+
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt_lvl_sctp_initmsg -> done with"
+            "\r\n   res:    %d"
+            "\r\n   result: %T"
+            "\r\n", res, result) );
+
+    return result;
+}
+#endif
+
+
+/* esock_getopt_lvl_sctp_maxseg - Level SCTP MAXSEG option
+ */
+#if defined(SCTP_MAXSEG)
+static
+ERL_NIF_TERM esock_getopt_lvl_sctp_maxseg(ErlNifEnv*       env,
+                                          ESockDescriptor* descP)
+{
+    return esock_getopt_int_opt(env, descP, IPPROTO_SCTP, SCTP_MAXSEG);
+}
+#endif
+
+
+/* esock_getopt_lvl_sctp_nodelay - Level SCTP NODELAY option
+ */
+#if defined(SCTP_NODELAY)
+static
+ERL_NIF_TERM esock_getopt_lvl_sctp_nodelay(ErlNifEnv*       env,
+                                           ESockDescriptor* descP)
+{
+    return esock_getopt_bool_opt(env, descP, IPPROTO_SCTP, SCTP_NODELAY);
+}
+#endif
+
+
+/* esock_getopt_lvl_sctp_associnfo - Level SCTP ASSOCINFO option
+ *
+ * <KOLLA>
+ *
+ * We should really specify which association this relates to,
+ * as it is now we get assoc-id = 0. If this socket is an 
+ * association (and not an endpoint) then it will have an
+ * assoc id (we can assume). But since the sctp support at 
+ * present is "limited", we leave it for now.
+ * What do we do if this is an endpoint? Invalid op?
+ *
+ * </KOLLA>
+ */
+#if defined(SCTP_RTOINFO)
+static
+ERL_NIF_TERM esock_getopt_lvl_sctp_rtoinfo(ErlNifEnv*       env,
+                                           ESockDescriptor* descP)
+{
+    ERL_NIF_TERM        result;
+    struct sctp_rtoinfo val;
+    SOCKOPTLEN_T        valSz = sizeof(val);
+    int                 res;
+
+    SSDBG( descP, ("SOCKET", "esock_getopt_lvl_sctp_rtoinfo -> entry\r\n") );
+    
+    sys_memzero((char*) &val, valSz);
+    res = sock_getopt(descP->sock, IPPROTO_SCTP, SCTP_RTOINFO, &val, &valSz);
+
+    if (res != 0) {
+        result = esock_make_error_errno(env, sock_errno());
+    } else {
+        ERL_NIF_TERM eRTOInfo;        
+        ERL_NIF_TERM keys[]  = {atom_assoc_id, atom_initial, atom_max, atom_min};
+        ERL_NIF_TERM vals[]  = {MKUI(env, val.srto_assoc_id),
+                                MKUI(env, val.srto_initial),
+                                MKUI(env, val.srto_max),
+                                MKUI(env, val.srto_min)};
+        unsigned int numKeys = sizeof(keys) / sizeof(ERL_NIF_TERM);
+        unsigned int numVals = sizeof(vals) / sizeof(ERL_NIF_TERM);
+
+        ESOCK_ASSERT( (numKeys == numVals) );
+
+        if (!MKMA(env, keys, vals, numKeys, &eRTOInfo))
+            return esock_make_error(env, esock_atom_einval);;
+    
+        result = esock_make_ok2(env, eRTOInfo);
+    }
+
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt_lvl_sctp_rtoinfo -> done with"
+            "\r\n   res:    %d"
+            "\r\n   result: %T"
+            "\r\n", res, result) );
+
+    return result;
+}
+#endif
+
+
+
+#endif // defined(HAVE_SCTP)
+
+
+
+/* esock_getopt_bool_opt - get an (integer) bool option
+ */
+static
+ERL_NIF_TERM esock_getopt_bool_opt(ErlNifEnv*       env,
+                                   ESockDescriptor* descP,
+                                   int              level,
+                                   int              opt)
+{
+    ERL_NIF_TERM result;
+    int          val;
+    SOCKOPTLEN_T valSz = sizeof(val);
+    int          res;
+
+    /*
+    SSDBG( descP, ("SOCKET", "esock_getopt_bool_opt -> entry with"
+                   "\r\n: level: %d"
+                   "\r\n: opt:   %d"
+                   "\r\n", level, opt) );
+    */
+
+    res = sock_getopt(descP->sock, level, opt, &val, &valSz);
+
+    if (res != 0) {
+        result = esock_make_error_errno(env, sock_errno());
+    } else {
+        ERL_NIF_TERM bval = ((val) ? atom_true : atom_false);
+
+        result = esock_make_ok2(env, bval);
+    }
+
+    /*
+    SSDBG( descP, ("SOCKET", "esock_getopt_bool_opt -> done when"
+                   "\r\n: res:    %d"
+                   "\r\n: result: %T"
+                   "\r\n", res, result) );
+    */
+
+    return result;
+}
+
+
+/* esock_getopt_int_opt - get an integer option
+ */
+static
+ERL_NIF_TERM esock_getopt_int_opt(ErlNifEnv*       env,
+                                  ESockDescriptor* descP,
+                                  int              level,
+                                  int              opt)
+{
+    ERL_NIF_TERM result;
+    int          val;
+    SOCKOPTLEN_T valSz = sizeof(val);
+    int          res;
+
+    res = sock_getopt(descP->sock, level, opt, &val, &valSz);
+
+    if (res != 0) {
+        result = esock_make_error_errno(env, sock_errno());
+    } else {
+        result = esock_make_ok2(env, MKI(env, val));
+    }
+
+    return result;
+}
+
+
+
+/* esock_getopt_timeval_opt - get an timeval option
+ */
+static
+ERL_NIF_TERM esock_getopt_timeval_opt(ErlNifEnv*       env,
+                                      ESockDescriptor* descP,
+                                      int              level,
+                                      int              opt)
+{
+    ERL_NIF_TERM   result;
+    struct timeval val;
+    SOCKOPTLEN_T   valSz = sizeof(val);
+    int            res;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt_timeval_opt -> entry with"
+            "\r\n   level: %d"
+            "\r\n   opt:   %d"
+            "\r\n", level, opt) );
+
+    sys_memzero((char*) &val, valSz);
+    res = sock_getopt(descP->sock, level, opt, &val, &valSz);
+
+    if (res != 0) {
+        result = esock_make_error_errno(env, sock_errno());
+    } else {
+        ERL_NIF_TERM eTimeVal;
+        char*        xres;
+
+        if ((xres = esock_encode_timeval(env, &val, &eTimeVal)) != NULL)
+            result = esock_make_error_str(env, xres);
+        else
+            result = esock_make_ok2(env, eTimeVal);
+    }
+
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt_timeval_opt -> done when"
+            "\r\n   result: %T"
+            "\r\n", result) );
+
+    return result;
+}
+
+
+
+/* esock_getopt_str_opt - get an string option
+ *
+ * We provide the max size of the string. This is the
+ * size of the buffer we allocate for the value.
+ * The actual size of the (read) value will be communicated
+ * in the optSz variable.
+ */
+#if defined(USE_GETOPT_STR_OPT)
+static
+ERL_NIF_TERM esock_getopt_str_opt(ErlNifEnv*       env,
+                                  ESockDescriptor* descP,
+                                  int              level,
+                                  int              opt,
+                                  int              max)
+{
+    ERL_NIF_TERM result;
+    char*        val   = MALLOC(max);
+    SOCKOPTLEN_T valSz = max;
+    int          res;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt_str_opt -> entry with"
+            "\r\n   level: %d"
+            "\r\n   opt:   %d"
+            "\r\n   max:   %d"
+            "\r\n", level, opt, max) );
+
+    res = sock_getopt(descP->sock, level, opt, val, &valSz);
+
+    if (res != 0) {
+        result = esock_make_error_errno(env, sock_errno());
+    } else {
+        ERL_NIF_TERM sval = MKSL(env, val, valSz);
+
+        result = esock_make_ok2(env, sval);
+    }
+
+    SSDBG( descP,
+           ("SOCKET", "esock_getopt_str_opt -> done when"
+            "\r\n   result: %T"
+            "\r\n", result) );
+
+    FREE(val);
+
+    return result;
+}
+#endif // if defined(USE_GETOPT_STR_OPT)
+#endif // if !defined(__WIN32__)
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_sockname - get socket name
+ *
+ * Description:
+ * Returns the current address to which the socket is bound.
+ *
+ * Arguments:
+ * Socket (ref) - Points to the socket descriptor.
+ */
+
+static
+ERL_NIF_TERM nif_sockname(ErlNifEnv*         env,
+                          int                argc,
+                          const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ESockDescriptor* descP;
+    ERL_NIF_TERM     res;
+
+    SGDBG( ("SOCKET", "nif_sockname -> entry with argc: %d\r\n", argc) );
+
+    /* Extract arguments and perform preliminary validation */
+
+    if ((argc != 1) ||
+        !ESOCK_GET_RESOURCE(env, argv[0], (void**) &descP)) {
+        return enif_make_badarg(env);
+    }
+
+    if (IS_CLOSED(descP) || IS_CLOSING(descP))
+        return esock_make_error(env, atom_closed);
+    
+    SSDBG( descP,
+           ("SOCKET", "nif_sockname -> args when sock = %d:"
+            "\r\n   Socket: %T"
+            "\r\n", descP->sock, argv[0]) );
+
+    res = esock_sockname(env, descP);
+
+    SSDBG( descP, ("SOCKET", "nif_sockname -> done with res = %T\r\n", res) );
+
+    return res;
+#endif // if defined(__WIN32__)
+}
+
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_sockname(ErlNifEnv*       env,
+                            ESockDescriptor* descP)
+{
+    ESockAddress  sa;
+    ESockAddress* saP = &sa;
+    unsigned int  sz  = sizeof(ESockAddress);
+
+    sys_memzero((char*) saP, sz);
+    if (IS_SOCKET_ERROR(sock_name(descP->sock, (struct sockaddr*) saP, &sz))) {
+        return esock_make_error_errno(env, sock_errno());
+    } else {
+        ERL_NIF_TERM esa;
+        char*        xres;
+
+        if ((xres = esock_encode_sockaddr(env, saP, sz, &esa)) != NULL)
+            return esock_make_error_str(env, xres);
+        else
+            return esock_make_ok2(env, esa);
+    }
+}
+#endif // if !defined(__WIN32__)
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_peername - get name of the connected peer socket
+ *
+ * Description:
+ * Returns the address of the peer connected to the socket.
+ *
+ * Arguments:
+ * Socket (ref) - Points to the socket descriptor.
+ */
+
+static
+ERL_NIF_TERM nif_peername(ErlNifEnv*         env,
+                          int                argc,
+                          const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ESockDescriptor* descP;
+    ERL_NIF_TERM     res;
+
+    SGDBG( ("SOCKET", "nif_peername -> entry with argc: %d\r\n", argc) );
+
+    /* Extract arguments and perform preliminary validation */
+
+    if ((argc != 1) ||
+        !ESOCK_GET_RESOURCE(env, argv[0], (void**) &descP)) {
+        return enif_make_badarg(env);
+    }
+
+    if (IS_CLOSED(descP) || IS_CLOSING(descP))
+        return esock_make_error(env, atom_closed);
+    
+    SSDBG( descP,
+           ("SOCKET", "nif_peername -> args when sock = %d:"
+            "\r\n   Socket: %T"
+            "\r\n", descP->sock, argv[0]) );
+
+    res = esock_peername(env, descP);
+
+    SSDBG( descP, ("SOCKET", "nif_peername -> done with res = %T\r\n", res) );
+
+    return res;
+#endif // if defined(__WIN32__)
+}
+
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_peername(ErlNifEnv*       env,
+                            ESockDescriptor* descP)
+{
+    ESockAddress  sa;
+    ESockAddress* saP = &sa;
+    unsigned int  sz  = sizeof(ESockAddress);
+
+    sys_memzero((char*) saP, sz);
+    if (IS_SOCKET_ERROR(sock_peer(descP->sock, (struct sockaddr*) saP, &sz))) {
+        return esock_make_error_errno(env, sock_errno());
+    } else {
+        ERL_NIF_TERM esa;
+        char*        xres;
+
+        if ((xres = esock_encode_sockaddr(env, saP, sz, &esa)) != NULL)
+            return esock_make_error_str(env, xres);
+        else
+            return esock_make_ok2(env, esa);
+    }
+}
+#endif // if !defined(__WIN32__)
+
+
+
+/* ----------------------------------------------------------------------
+ * nif_cancel
+ *
+ * Description:
+ * Cancel a previous select!
+ *
+ * Arguments:
+ * Socket    (ref)  - Points to the socket descriptor.
+ * Operation (atom) - What kind of operation (accept, send, ...) is to be cancelled
+ * Ref       (ref)  - Unique id for the operation
+ */
+static
+ERL_NIF_TERM nif_cancel(ErlNifEnv*         env,
+                        int                argc,
+                        const ERL_NIF_TERM argv[])
+{
+#if defined(__WIN32__)
+    return enif_raise_exception(env, MKA(env, "notsup"));
+#else
+    ESockDescriptor* descP;
+    ERL_NIF_TERM     op, sockRef, opRef, result;
+
+    SGDBG( ("SOCKET", "nif_cancel -> entry with argc: %d\r\n", argc) );
+
+    /* Extract arguments and perform preliminary validation */
+
+    sockRef = argv[0];
+    if ((argc != 3) ||
+        !ESOCK_GET_RESOURCE(env, sockRef, (void**) &descP)) {
+        return enif_make_badarg(env);
+    }
+    op    = argv[1];
+    opRef = argv[2];
+        
+    if (IS_CLOSED(descP) || IS_CLOSING(descP))
+        return esock_make_error(env, atom_closed);
+    
+    SSDBG( descP,
+           ("SOCKET", "nif_cancel -> args when sock = %d:"
+            "\r\n   op:    %T"
+            "\r\n   opRef: %T"
+            "\r\n", descP->sock, op, opRef) );
+    
+    result = esock_cancel(env, descP, op, sockRef, opRef);
+
+    SSDBG( descP,
+           ("SOCKET", "nif_cancel -> done with result: "
+           "\r\n   %T"
+           "\r\n", result) );
+
+    return result;
+#endif // if !defined(__WIN32__)
+}
+
+
+#if !defined(__WIN32__)
+static
+ERL_NIF_TERM esock_cancel(ErlNifEnv*       env,
+                          ESockDescriptor* descP,
+                          ERL_NIF_TERM     op,
+                          ERL_NIF_TERM     sockRef,
+                          ERL_NIF_TERM     opRef)
+{
+    /* <KOLLA>
+     *
+     * Do we really need all these variants? Should it not be enough with: 
+     *
+     *     connect | accept | send | recv
+     *
+     * </KOLLA>
+     */
+    if (COMPARE(op, esock_atom_connect) == 0) {
+        return esock_cancel_connect(env, descP, opRef);
+    } else if (COMPARE(op, esock_atom_accept) == 0) {
+        return esock_cancel_accept(env, descP, sockRef, opRef);
+    } else if (COMPARE(op, esock_atom_send) == 0) {
+        return esock_cancel_send(env, descP, sockRef, opRef);
+    } else if (COMPARE(op, esock_atom_sendto) == 0) {
+        return esock_cancel_send(env, descP, sockRef, opRef);
+    } else if (COMPARE(op, esock_atom_sendmsg) == 0) {
+        return esock_cancel_send(env, descP, sockRef, opRef);
+    } else if (COMPARE(op, esock_atom_recv) == 0) {
+        return esock_cancel_recv(env, descP, sockRef, opRef);
+    } else if (COMPARE(op, esock_atom_recvfrom) == 0) {
+        return esock_cancel_recv(env, descP, sockRef, opRef);
+    } else if (COMPARE(op, esock_atom_recvmsg) == 0) {
+        return esock_cancel_recv(env, descP, sockRef, opRef);
+    } else {
+        return esock_make_error(env, esock_atom_einval);
+    }
+}
+
+
+
+/* *** esock_cancel_connect ***
+ *
+ *
+ */
+static
+ERL_NIF_TERM esock_cancel_connect(ErlNifEnv*       env,
+                                  ESockDescriptor* descP,
+                                  ERL_NIF_TERM     opRef)
+{
+    return esock_cancel_write_select(env, descP, opRef);
+}
+
+
+/* *** esock_cancel_accept ***
+ *
+ * We have two different cases:
+ *   *) Its the current acceptor
+ *      Cancel the select!
+ *      We need to activate one of the waiting acceptors.
+ *   *) Its one of the acceptors ("waiting") in the queue
+ *      Simply remove the acceptor from the queue.
+ *
+ */
+static
+ERL_NIF_TERM esock_cancel_accept(ErlNifEnv*       env,
+                                 ESockDescriptor* descP,
+                                 ERL_NIF_TERM     sockRef,
+                                 ERL_NIF_TERM     opRef)
+{
+    ERL_NIF_TERM res;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_cancel_accept -> entry with"
+            "\r\n   opRef: %T"
+            "\r\n   %s"
+            "\r\n", opRef,
+            ((descP->currentAcceptorP == NULL) ? "without acceptor" : "with acceptor")) );
+
+    MLOCK(descP->accMtx);
+
+    if (descP->currentAcceptorP != NULL) {
+        if (COMPARE(opRef, descP->currentAcceptor.ref) == 0) {
+            res = esock_cancel_accept_current(env, descP, sockRef);
+        } else {
+            res = esock_cancel_accept_waiting(env, descP, opRef);
+        }
+    } else {
+        /* Or badarg? */
+        res =  esock_make_error(env, esock_atom_einval);
+    }
+
+    MUNLOCK(descP->accMtx);
+
+    SSDBG( descP,
+           ("SOCKET", "esock_cancel_accept -> done with result:"
+            "\r\n   %T"
+            "\r\n", res) );
+
+    return res;
+}
+
+
+/* The current acceptor process has an ongoing select we first must
+ * cancel. Then we must re-activate the "first" (the first
+ * in the acceptor queue).
+ */
+static
+ERL_NIF_TERM esock_cancel_accept_current(ErlNifEnv*       env,
+                                         ESockDescriptor* descP,
+                                         ERL_NIF_TERM     sockRef)
+{
+    ERL_NIF_TERM res;
+
+    SSDBG( descP, ("SOCKET", "esock_cancel_accept_current -> entry\r\n") );
+
+    DEMONP("esock_cancel_accept_current -> current acceptor",
+           env, descP, &descP->currentAcceptor.mon);
+    res = esock_cancel_read_select(env, descP, descP->currentAcceptor.ref);
+
+    SSDBG( descP, ("SOCKET",
+                   "esock_cancel_accept_current -> cancel res: %T\r\n", res) );
+
+    if (!activate_next_acceptor(env, descP, sockRef)) {
+
+        SSDBG( descP,
+               ("SOCKET", "esock_cancel_accept_current -> no more writers\r\n") );
+
+        descP->state               = ESOCK_STATE_LISTENING;
+
+        descP->currentAcceptorP    = NULL;
+        descP->currentAcceptor.ref = esock_atom_undefined;
+        enif_set_pid_undefined(&descP->currentAcceptor.pid);
+        esock_monitor_init(&descP->currentAcceptor.mon);
+    }
+
+    SSDBG( descP, ("SOCKET", "esock_cancel_accept_current -> done with result:"
+                   "\r\n   %T"
+                   "\r\n", res) );
+
+    return res;
+}
+
+
+/* These processes have not performed a select, so we can simply
+ * remove them from the acceptor queue.
+ */
+static
+ERL_NIF_TERM esock_cancel_accept_waiting(ErlNifEnv*       env,
+                                         ESockDescriptor* descP,
+                                         ERL_NIF_TERM     opRef)
+{
+    ErlNifPid caller;
+
+    if (enif_self(env, &caller) == NULL)
+        return esock_make_error(env, atom_exself);
+
+    /* unqueue request from (acceptor) queue */
+
+    if (acceptor_unqueue(env, descP, &caller)) {
+        return esock_atom_ok;
+    } else {
+        /* Race? */
+        return esock_make_error(env, esock_atom_not_found);
+    }
+}
+
+
+
+/* *** esock_cancel_send ***
+ *
+ * Cancel a send operation.
+ * Its either the current writer or one of the waiting writers.
+ */
+static
+ERL_NIF_TERM esock_cancel_send(ErlNifEnv*       env,
+                               ESockDescriptor* descP,
+                               ERL_NIF_TERM     sockRef,
+                               ERL_NIF_TERM     opRef)
+{
+    ERL_NIF_TERM res;
+
+    MLOCK(descP->writeMtx);
+
+    SSDBG( descP,
+           ("SOCKET", "esock_cancel_send -> entry with"
+            "\r\n   opRef: %T"
+            "\r\n   %s"
+            "\r\n", opRef,
+            ((descP->currentWriterP == NULL) ? "without writer" : "with writer")) );
+
+    if (descP->currentWriterP != NULL) {
+        if (COMPARE(opRef, descP->currentWriter.ref) == 0) {
+            res = esock_cancel_send_current(env, descP, sockRef);
+        } else {
+            res = esock_cancel_send_waiting(env, descP, opRef);
+        }
+    } else {
+        /* Or badarg? */
+        res =  esock_make_error(env, esock_atom_einval);
+    }
+
+    MUNLOCK(descP->writeMtx);
+
+    SSDBG( descP,
+           ("SOCKET", "esock_cancel_send -> done with result:"
+            "\r\n   %T"
+            "\r\n", res) );
+
+    return res;
+}
+
+
+
+/* The current writer process has an ongoing select we first must
+ * cancel. Then we must re-activate the "first" (the first
+ * in the writer queue).
+ */
+static
+ERL_NIF_TERM esock_cancel_send_current(ErlNifEnv*       env,
+                                       ESockDescriptor* descP,
+                                       ERL_NIF_TERM     sockRef)
+{
+    ERL_NIF_TERM res;
+
+    SSDBG( descP, ("SOCKET", "esock_cancel_send_current -> entry\r\n") );
+
+    DEMONP("esock_cancel_send_current -> current writer",
+           env, descP, &descP->currentWriter.mon);
+    res = esock_cancel_write_select(env, descP, descP->currentWriter.ref);
+
+    SSDBG( descP,
+           ("SOCKET", "esock_cancel_send_current -> cancel res: %T\r\n", res) );
+
+    if (!activate_next_writer(env, descP, sockRef)) {
+        SSDBG( descP,
+               ("SOCKET", "esock_cancel_send_current -> no more writers\r\n") );
+        descP->currentWriterP    = NULL;
+        descP->currentWriter.ref = esock_atom_undefined;
+        enif_set_pid_undefined(&descP->currentWriter.pid);
+        esock_monitor_init(&descP->currentWriter.mon);
+    }
+
+    SSDBG( descP, ("SOCKET", "esock_cancel_send_current -> done with result:"
+                   "\r\n   %T"
+                   "\r\n", res) );
+
+    return res;
+}
+
+
+/* These processes have not performed a select, so we can simply
+ * remove them from the writer queue.
+ */
+static
+ERL_NIF_TERM esock_cancel_send_waiting(ErlNifEnv*       env,
+                                       ESockDescriptor* descP,
+                                       ERL_NIF_TERM     opRef)
+{
+    ErlNifPid caller;
+
+    if (enif_self(env, &caller) == NULL)
+        return esock_make_error(env, atom_exself);
+
+    /* unqueue request from (writer) queue */
+
+    if (writer_unqueue(env, descP, &caller)) {
+        return esock_atom_ok;
+    } else {
+        /* Race? */
+        return esock_make_error(env, esock_atom_not_found);
+    }
+}
+
+
+
+/* *** esock_cancel_recv ***
+ *
+ * Cancel a read operation.
+ * Its either the current reader or one of the waiting readers.
+ */
+static
+ERL_NIF_TERM esock_cancel_recv(ErlNifEnv*       env,
+                               ESockDescriptor* descP,
+                               ERL_NIF_TERM     sockRef,
+                               ERL_NIF_TERM     opRef)
+{
+    ERL_NIF_TERM res;
+
+    MLOCK(descP->readMtx);
+
+    SSDBG( descP,
+           ("SOCKET", "esock_cancel_recv -> entry with"
+            "\r\n   opRef: %T"
+            "\r\n   %s"
+            "\r\n", opRef,
+            ((descP->currentReaderP == NULL) ? "without reader" : "with reader")) );
+
+    if (descP->currentReaderP != NULL) {
+        if (COMPARE(opRef, descP->currentReader.ref) == 0) {
+            res = esock_cancel_recv_current(env, descP, sockRef);
+        } else {
+            res = esock_cancel_recv_waiting(env, descP, opRef);
+        }
+    } else {
+        /* Or badarg? */
+        res =  esock_make_error(env, esock_atom_einval);
+    }
+
+    MUNLOCK(descP->readMtx);
+
+    SSDBG( descP,
+           ("SOCKET", "esock_cancel_recv -> done with result:"
+            "\r\n   %T"
+            "\r\n", res) );
+
+    return res;
+}
+
+
+/* The current reader process has an ongoing select we first must
+ * cancel. Then we must re-activate the "first" (the first
+ * in the reader queue).
+ */
+static
+ERL_NIF_TERM esock_cancel_recv_current(ErlNifEnv*       env,
+                                       ESockDescriptor* descP,
+                                       ERL_NIF_TERM     sockRef)
+{
+    ERL_NIF_TERM res;
+
+    SSDBG( descP, ("SOCKET", "esock_cancel_recv_current -> entry\r\n") );
+
+    DEMONP("esock_cancel_recv_current -> current reader",
+           env, descP, &descP->currentReader.mon);
+    res = esock_cancel_read_select(env, descP, descP->currentReader.ref);
+
+    SSDBG( descP,
+           ("SOCKET", "esock_cancel_recv_current -> cancel res: %T\r\n", res) );
+
+    if (!activate_next_reader(env, descP, sockRef)) {
+        SSDBG( descP,
+               ("SOCKET", "esock_cancel_recv_current -> no more readers\r\n") );
+        descP->currentReaderP    = NULL;
+        descP->currentReader.ref = esock_atom_undefined;
+        enif_set_pid_undefined(&descP->currentReader.pid);
+        esock_monitor_init(&descP->currentReader.mon);
+    }
+
+    SSDBG( descP, ("SOCKET", "esock_cancel_recv_current -> done with result:"
+                   "\r\n   %T"
+                   "\r\n", res) );
+
+    return res;
+}
+
+
+/* These processes have not performed a select, so we can simply
+ * remove them from the reader queue.
+ */
+static
+ERL_NIF_TERM esock_cancel_recv_waiting(ErlNifEnv*       env,
+                                       ESockDescriptor* descP,
+                                       ERL_NIF_TERM     opRef)
+{
+    ErlNifPid caller;
+
+    if (enif_self(env, &caller) == NULL)
+        return esock_make_error(env, atom_exself);
+
+    /* unqueue request from (reader) queue */
+
+    if (reader_unqueue(env, descP, &caller)) {
+        return esock_atom_ok;
+    } else {
+        /* Race? */
+        return esock_make_error(env, esock_atom_not_found);
+    }
+}
+
+
+
+static
+ERL_NIF_TERM esock_cancel_read_select(ErlNifEnv*       env,
+                                      ESockDescriptor* descP,
+                                      ERL_NIF_TERM     opRef)
+{
+    return esock_cancel_mode_select(env, descP, opRef,
+                                    ERL_NIF_SELECT_READ,
+                                    ERL_NIF_SELECT_READ_CANCELLED);
+}
+
+
+static
+ERL_NIF_TERM esock_cancel_write_select(ErlNifEnv*       env,
+                                  ESockDescriptor* descP,
+                                  ERL_NIF_TERM     opRef)
+{
+    return esock_cancel_mode_select(env, descP, opRef,
+                                    ERL_NIF_SELECT_WRITE,
+                                    ERL_NIF_SELECT_WRITE_CANCELLED);
+}
+
+
+static
+ERL_NIF_TERM esock_cancel_mode_select(ErlNifEnv*       env,
+                                      ESockDescriptor* descP,
+                                      ERL_NIF_TERM     opRef,
+                                      int              smode,
+                                      int              rmode)
+{
+    int selectRes = esock_select_cancel(env, descP->sock, smode, descP);
+
+    if (selectRes & rmode) {
+        /* Was cancelled */
+        return esock_atom_ok;
+    } else if (selectRes > 0) {
+        /* Has already sent the message */
+        return esock_make_error(env, esock_atom_select_sent);
+    } else {
+        /* Stopped? */
+        SSDBG( descP, ("SOCKET",
+                       "esock_cancel_mode_select -> failed: %d (0x%lX)"
+                       "\r\n", selectRes, selectRes) );
+        return esock_make_error(env, esock_atom_einval);
+    }
+
+}
+#endif // if !defined(__WIN32__)
+
+
+
+
+/* ----------------------------------------------------------------------
+ *  U t i l i t y   F u n c t i o n s
+ * ----------------------------------------------------------------------
+ */
+
+/* *** send_check_writer ***
+ *
+ * Checks if we have a current writer and if that is us.
+ * If not (current writer), then we must be made to wait
+ * for our turn. This is done by pushing us unto the writer queue.
+ */
+#if !defined(__WIN32__)
+static
+BOOLEAN_T send_check_writer(ErlNifEnv*       env,
+                            ESockDescriptor* descP,
+                            ERL_NIF_TERM     ref,
+                            ERL_NIF_TERM*    checkResult)
+{
+    if (descP->currentWriterP != NULL) {
+        ErlNifPid caller;
+        
+        if (enif_self(env, &caller) == NULL) {
+            *checkResult = esock_make_error(env, atom_exself);
+            return FALSE;
+        }
+
+        if (COMPARE_PIDS(&descP->currentWriter.pid, &caller) != 0) {
+            /* Not the "current writer", so (maybe) push onto queue */
+
+            SSDBG( descP,
+                   ("SOCKET",
+                    "send_check_writer -> not (current) writer\r\n") );
+
+            if (!writer_search4pid(env, descP, &caller))
+                *checkResult = writer_push(env, descP, caller, ref);
+            else
+                *checkResult = esock_make_error(env, esock_atom_eagain);
+            
+            SSDBG( descP,
+                   ("SOCKET",
+                    "send_check_writer -> queue (push) result: %T\r\n",
+                    checkResult) );
+            
+            return FALSE;
+
+        }
+        
+    }
+
+    // Does not actually matter in this case, but ...
+    *checkResult = esock_atom_ok;
+
+    return TRUE;
+}
+
+
+
+/* *** send_check_result ***
+ *
+ * Check the result of a socket send (send, sendto and sendmsg) call.
+ * If a "complete" send has been made, the next (waiting) writer will be 
+ * scheduled (if there is one).
+ * If we did not manage to send the entire package, make another select,
+ * so that we can be informed when we can make another try (to send the rest),
+ * and return with the amount we actually managed to send (its up to the caller
+ * (that is the erlang code) to figure out hust much is left to send).
+ * If the write fail, we give up and return with the appropriate error code.
+ *
+ * What about the remaining writers!!
+ *
+ */
+static
+ERL_NIF_TERM send_check_result(ErlNifEnv*       env,
+                               ESockDescriptor* descP,
+                               ssize_t          written,
+                               ssize_t          dataSize,
+                               int              saveErrno,
+                               ERL_NIF_TERM     sockRef,
+                               ERL_NIF_TERM     sendRef)
+{
+    ERL_NIF_TERM res;
+
+    SSDBG( descP,
+           ("SOCKET", "send_check_result -> entry with"
+            "\r\n   written:   %d"
+            "\r\n   dataSize:  %d"
+            "\r\n   saveErrno: %d"
+            "\r\n", written, dataSize, saveErrno) );
+
+    if (written >= dataSize) {
+
+        res = send_check_ok(env, descP, written, dataSize, sockRef);
+
+    } else if (written < 0) {
+
+        /* Some kind of send failure - check what kind */
+
+        if ((saveErrno != EAGAIN) && (saveErrno != EINTR)) {
+
+            res = send_check_fail(env, descP, saveErrno, sockRef);
+
+        } else {
+
+            /* Ok, try again later */
+
+            SSDBG( descP, ("SOCKET", "send_check_result -> try again\r\n") );
+
+            res = send_check_retry(env, descP, written, sockRef, sendRef);
+
+        }
+
+    } else {
+
+        /* Not the entire package */
+
+        SSDBG( descP,
+               ("SOCKET", "send_check_result -> "
+                "not entire package written (%d of %d)\r\n",
+                written, dataSize) );
+
+        res = send_check_retry(env, descP, written, sockRef, sendRef);
+
+    }
+
+    SSDBG( descP, ("SOCKET", "send_check_result -> done: %T\r\n", res) );
+
+    return res;
+}
+
+
+/* *** send_check_ok ***
+ *
+ * Processing done upon successful send.
+ */
+static
+ERL_NIF_TERM send_check_ok(ErlNifEnv*       env,
+                           ESockDescriptor* descP,
+                           ssize_t          written,
+                           ssize_t          dataSize,
+                           ERL_NIF_TERM     sockRef)
+{
+    // cnt_inc(&descP->writePkgCnt,  1);
+    SOCK_CNT_INC(env, descP, sockRef,
+                 atom_write_pkg, &descP->writePkgCnt, 1);
+    // cnt_inc(&descP->writeByteCnt, written);
+    SOCK_CNT_INC(env, descP, sockRef,
+                 atom_write_byte, &descP->writeByteCnt, written);
+
+    if (descP->currentWriterP != NULL) {
+        DEMONP("send_check_ok -> current writer",
+               env, descP, &descP->currentWriter.mon);
+        esock_free_env("send_check_ok", descP->currentWriter.env);
+        descP->currentWriter.env = NULL;
+    }
+
+    SSDBG( descP,
+           ("SOCKET", "send_check_ok -> "
+            "everything written (%d,%d) - done\r\n", dataSize, written) );
+
+    /*
+     * Ok, this write is done maybe activate the next (if any)
+     */
+
+    if (!activate_next_writer(env, descP, sockRef)) {
+        descP->currentWriterP    = NULL;
+        ESOCK_ASSERT(!descP->currentWriter.env);
+        descP->currentWriter.env = NULL;
+        descP->currentWriter.ref = esock_atom_undefined;
+        enif_set_pid_undefined(&descP->currentWriter.pid);
+        esock_monitor_init(&descP->currentWriter.mon);
+    }
+
+    return esock_atom_ok;
+}
+
+
+
+/* *** send_check_failure ***
+ *
+ * Processing done upon failed send.
+ * An actual failure - we (and everyone waiting) give up.
+ */
+static
+ERL_NIF_TERM send_check_fail(ErlNifEnv*       env,
+                             ESockDescriptor* descP,
+                             int              saveErrno,
+                             ERL_NIF_TERM     sockRef)
+{
+    ESockRequestor req;
+    ERL_NIF_TERM   reason;
+
+    req.env = NULL;
+    // cnt_inc(&descP->writeFails, 1);
+    SOCK_CNT_INC(env, descP, sockRef, atom_write_fails, &descP->writeFails, 1);
+
+    SSDBG( descP, ("SOCKET", "send_check_fail -> error: %d\r\n", saveErrno) );
+
+    reason = MKA(env, erl_errno_id(saveErrno));
+
+    if (descP->currentWriterP != NULL) {
+
+        DEMONP("send_check_fail -> current writer",
+               env, descP, &descP->currentWriter.mon);
+
+        while (writer_pop(env, descP, &req)) {
+            SSDBG( descP,
+                   ("SOCKET", "send_check_fail -> abort %T\r\n", req.pid) );
+            esock_send_abort_msg(env, sockRef, req.ref, req.env,
+                                 reason, &req.pid);
+            req.env = NULL;
+            DEMONP("send_check_fail -> pop'ed writer", env, descP, &req.mon);
+        }
+    }
+
+    return esock_make_error(env, reason);
+}
+
+
+
+/* *** send_check_retry ***
+ *
+ * Processing done upon uncomplete or blocked send.
+ *
+ * We failed to write the *entire* packet (anything less
+ * then size of the packet, which is 0 <= written < sizeof
+ * packet, so schedule the rest for later.
+ */
+static
+ERL_NIF_TERM send_check_retry(ErlNifEnv*       env,
+                              ESockDescriptor* descP,
+                              ssize_t          written,
+                              ERL_NIF_TERM     sockRef,
+                              ERL_NIF_TERM     sendRef)
+{
+    int          sres;
+    ErlNifPid    caller;
+    ERL_NIF_TERM res;
+
+    if (descP->currentWriterP == NULL) {
+
+        if (enif_self(env, &caller) == NULL)
+            return esock_make_error(env, atom_exself);
+        descP->currentWriter.pid = caller;
+
+        if (MONP("send_check_retry -> current writer",
+                 env, descP,
+                 &descP->currentWriter.pid,
+                 &descP->currentWriter.mon) != 0) {
+            enif_set_pid_undefined(&descP->currentWriter.pid);
+            return esock_make_error(env, atom_exmon);
+        } else {
+            ESOCK_ASSERT(!descP->currentWriter.env);
+            descP->currentWriter.env = esock_alloc_env("current-writer");
+            descP->currentWriter.ref = CP_TERM(descP->currentWriter.env, sendRef);
+            descP->currentWriterP    = &descP->currentWriter;
+        }
+    }
+
+    // cnt_inc(&descP->writeWaits, 1);
+    SOCK_CNT_INC(env, descP, sockRef, atom_write_waits, &descP->writeWaits, 1);
+
+    sres = esock_select_write(env, descP->sock, descP, NULL, sockRef, sendRef);
+
+    if (written >= 0) {
+
+        /* Partial *write* success */
+
+        if (sres < 0) {
+            /* Returned: {error, Reason}
+             * Reason:   {select_failed, sres, written}
+             */
+            res = esock_make_error(env,
+                                   MKT3(env,
+                                        esock_atom_select_failed,
+                                        MKI(env, sres),
+                                        MKI(env, written)));
+        } else {
+            res = esock_make_ok2(env, MKI(env, written));
+        }
+
+    } else {
+
+        if (sres < 0) {
+            /* Returned: {error, Reason}
+             * Reason:   {select_failed, sres}
+             */
+            res = esock_make_error(env,
+                                   MKT2(env,
+                                        esock_atom_select_failed,
+                                        MKI(env, sres)));
+        } else {
+            res = esock_make_error(env, esock_atom_eagain);
+        }
+    }
+
+    return res;
+}
+
+
+
+
+/* *** recv_check_reader ***
+ *
+ * Checks if we have a current reader and if that is us. If not,
+ * then we must be made to wait for our turn. This is done by pushing
+ * us unto the reader queue.
+ * Note that we do *not* actually initiate the currentReader structure
+ * here, since we do not actually know yet if we need to! We do that in
+ * the [recv|recvfrom|recvmsg]_check_result function.
+ */
+static
+BOOLEAN_T recv_check_reader(ErlNifEnv*       env,
+                            ESockDescriptor* descP,
+                            ERL_NIF_TERM     ref,
+                            ERL_NIF_TERM*    checkResult)
+{
+    if (descP->currentReaderP != NULL) {
+        ErlNifPid caller;
+        
+        if (enif_self(env, &caller) == NULL) {
+            *checkResult = esock_make_error(env, atom_exself);
+            return FALSE;
+        }
+
+        if (COMPARE_PIDS(&descP->currentReader.pid, &caller) != 0) {
+            ERL_NIF_TERM tmp;
+
+            /* Not the "current reader", so (maybe) push onto queue */
+
+            SSDBG( descP,
+                   ("SOCKET",
+                    "recv_check_reader -> not (current) reader\r\n") );
+
+            if (!reader_search4pid(env, descP, &caller))
+                tmp = reader_push(env, descP, caller, ref);
+            else
+                tmp = esock_make_error(env, esock_atom_eagain);
+            
+            SSDBG( descP,
+                   ("SOCKET",
+                    "recv_check_reader -> queue (push) result: %T\r\n", tmp) );
+
+            *checkResult = tmp;
+
+            return FALSE;
+
+        }
+        
+    }
+
+    // Does not actually matter in this case, but ...
+    *checkResult = esock_atom_ok;
+
+    return TRUE;
+}
+
+
+
+/* *** recv_init_current_reader ***
+ *
+ * Initiate (maybe) the currentReader structure of the descriptor.
+ * Including monitoring the calling process.
+ */
+static
+char* recv_init_current_reader(ErlNifEnv*       env,
+                               ESockDescriptor* descP,
+                               ERL_NIF_TERM     recvRef)
+{
+    if (descP->currentReaderP == NULL) {
+        ErlNifPid caller;
+
+        if (enif_self(env, &caller) == NULL)
+            return str_exself;
+
+        descP->currentReader.pid = caller;
+        if (MONP("recv_init_current_reader -> current reader",
+                 env, descP,
+                 &descP->currentReader.pid,
+                 &descP->currentReader.mon) != 0) {
+            enif_set_pid_undefined(&descP->currentReader.pid);
+            return str_exmon;
+        } else {
+            ESOCK_ASSERT(!descP->currentReader.env);
+            descP->currentReader.env = esock_alloc_env("current-reader");
+            descP->currentReader.ref = CP_TERM(descP->currentReader.env,
+                                               recvRef);
+            descP->currentReaderP    = &descP->currentReader;
+        }
+    } else {
+
+        /*
+         * This is a retry:
+         * We have done, for instance, recv(Sock, X), but only received Y < X.
+         * We then call recv again with size = X-Y. So, we then get a new ref.
+         * 
+         * Make use of the existing environment
+         */
+
+        descP->currentReader.ref = CP_TERM(descP->currentReader.env, recvRef);
+    }
+
+    return NULL;
+}
+
+
+
+/* *** recv_update_current_reader ***
+ *
+ * Demonitors the current reader process and pop's the reader queue.
+ * If there is a waiting (reader) process, then it will be assigned
+ * as the new current reader and a new (read) select will be done.
+ */
+
+static
+ERL_NIF_TERM recv_update_current_reader(ErlNifEnv*       env,
+                                        ESockDescriptor* descP,
+                                        ERL_NIF_TERM     sockRef)
+{
+    ERL_NIF_TERM res = esock_atom_ok;
+
+    if (descP->currentReaderP != NULL) {
+        
+        DEMONP("recv_update_current_reader",
+               env, descP, &descP->currentReader.mon);
+
+        esock_free_env("recv_update_current_reader - current-read-env",
+                       descP->currentReader.env);
+        descP->currentReader.env = NULL;
+
+        if (!activate_next_reader(env, descP, sockRef)) {
+
+            SSDBG( descP,
+                   ("SOCKET",
+                    "recv_update_current_reader -> no more readers\r\n") );
+
+            descP->currentReaderP    = NULL;
+            descP->currentReader.ref = esock_atom_undefined;
+            enif_set_pid_undefined(&descP->currentReader.pid);
+            esock_monitor_init(&descP->currentReader.mon);
+        }
+
+    }
+
+    return res;
+}
+
+
+
+/* *** recv_error_current_reader ***
+ *
+ * Process the current reader and any waiting readers
+ * when a read (fatal) error has occured.
+ * All waiting readers will be "aborted", that is a 
+ * nif_abort message will be sent (with reaf and reason).
+ */
+static
+void recv_error_current_reader(ErlNifEnv*       env,
+                               ESockDescriptor* descP,
+                               ERL_NIF_TERM     sockRef,
+                               ERL_NIF_TERM     reason)
+{
+    ESockRequestor req;
+
+    req.env = NULL;
+    if (descP->currentReaderP != NULL) {
+
+        DEMONP("recv_error_current_reader -> current reader",
+               env, descP, &descP->currentReader.mon);
+
+        while (reader_pop(env, descP, &req)) {
+            SSDBG( descP,
+                   ("SOCKET", "recv_error_current_reader -> abort %T\r\n",
+                    req.pid) );
+            esock_send_abort_msg(env, sockRef, req.ref, req.env,
+                                 reason, &req.pid);
+            req.env = NULL;
+            DEMONP("recv_error_current_reader -> pop'ed reader",
+                   env, descP, &req.mon);
+        }
+    }
+}
+
+
+
+/* *** recv_check_result ***
+ *
+ * Process the result of a call to recv.
+ */
+static
+ERL_NIF_TERM recv_check_result(ErlNifEnv*       env,
+                               ESockDescriptor* descP,
+                               int              read,
+                               int              toRead,
+                               int              saveErrno,
+                               ErlNifBinary*    bufP,
+                               ERL_NIF_TERM     sockRef,
+                               ERL_NIF_TERM     recvRef)
+{
+    ERL_NIF_TERM res;
+
+    SSDBG( descP,
+           ("SOCKET", "recv_check_result -> entry with"
+            "\r\n   read:      %d"
+            "\r\n   toRead:    %d"
+            "\r\n   saveErrno: %d"
+            "\r\n   recvRef:   %T"
+            "\r\n", read, toRead, saveErrno, recvRef) );
+
+
+    /* <KOLLA>
+     *
+     * We need to handle read = 0 for other type(s) (DGRAM) when
+     * its actually valid to read 0 bytes.
+     *
+     * </KOLLA>
+     */
+    
+    if ((read == 0) && (descP->type == SOCK_STREAM)) {
+
+        res = esock_make_error(env, atom_closed);
+        
+        SOCK_CNT_INC(env, descP, sockRef, atom_read_fails, &descP->readFails, 1);
+
+        /*
+         * When a stream socket peer has performed an orderly shutdown,
+         * the return value will be 0 (the traditional "end-of-file" return).
+         *
+         * *We* do never actually try to read 0 bytes from a stream socket!
+         *
+         * We must also notify any waiting readers!
+         */
+
+        recv_error_current_reader(env, descP, sockRef, res);
+
+        FREE_BIN(bufP);
+
+    } else {
+    
+        /* There is a special case: If the provided 'to read' value is
+         * zero (0) (only for type =/= stream).
+         * That means that we reads as much as we can, using the default
+         * read buffer size.
+         */
+
+        if (bufP->size == read) {
+
+            /* +++ We filled the buffer +++ */
+
+            SSDBG( descP,
+                   ("SOCKET",
+                    "recv_check_result -> [%d] filled the buffer\r\n",
+                    toRead) );
+
+            res = recv_check_full(env, descP, read, toRead, bufP,
+                                  sockRef, recvRef);
+
+        } else if (read < 0) {
+
+            /* +++ Error handling +++ */
+
+            res = recv_check_fail(env, descP, saveErrno, bufP, NULL,
+                                  sockRef, recvRef);
+
+        } else {
+
+            /* +++ We did not fill the buffer +++ */
+
+            SSDBG( descP,
+                   ("SOCKET",
+                    "recv_check_result -> [%d] "
+                    "did not fill the buffer (%d of %d)\r\n",
+                    toRead, read, bufP->size) );
+
+            res = recv_check_partial(env, descP, read, toRead, bufP,
+                                     sockRef, recvRef);
+
+        }
+    }
+
+    return res;
+}
+
+
+
+/* *** recv_check_full ***
+ *
+ * This function is called if we filled the allocated buffer.
+ * But are we done yet?
+ *
+ * toRead = 0 means: Give me everything you have => maybe
+ * toRead > 0 means: Yes
+ */
+static
+ERL_NIF_TERM recv_check_full(ErlNifEnv*       env,
+                             ESockDescriptor* descP,
+                             int              read,
+                             int              toRead,
+                             ErlNifBinary*    bufP,
+                             ERL_NIF_TERM     sockRef,
+                             ERL_NIF_TERM     recvRef)
+{
+    ERL_NIF_TERM res;
+
+    if (toRead == 0) {
+
+        /* +++ Give us everything you have got =>     *
+         *     (maybe) needs to continue          +++ */
+
+        /* Send up each chunk of data for each of the read
+         * and let the erlang code assemble it: {ok, false, Bin}
+         * (when complete it should return {ok, true, Bin}).
+         * We need to read atleast one more time to be sure if its
+         * done...
+         *
+         * Also, we need to check if the rNumCnt has reached its max (rNum),
+         * in which case we will assume the read to be done!
+         */
+
+        SSDBG( descP,
+               ("SOCKET", "recv_check_full -> shall we continue reading"
+                "\r\n   read:    %d"
+                "\r\n   rNum:    %d"
+                "\r\n   rNumCnt: %d"
+                "\r\n", read, descP->rNum, descP->rNumCnt) );
+
+        res = recv_check_full_maybe_done(env, descP, read, toRead, bufP,
+                                         sockRef, recvRef);
+
+    } else {
+
+        /* +++ We got exactly as much as we requested => We are done +++ */
+
+        SSDBG( descP,
+               ("SOCKET",
+                "recv_check_full -> [%d] "
+                "we got exactly what we could fit\r\n", toRead) );
+
+        res = recv_check_full_done(env, descP, read, bufP, sockRef);
+
+    }
+
+    return res;
+
+}
+
+
+
+/* *** recv_check_full_maybe_done ***
+ *
+ * Send up each chunk of data for each of the read
+ * and let the erlang code assemble it: {ok, false, Bin}
+ * (when complete it should return {ok, true, Bin}).
+ * We need to read atleast one more time to be sure if its
+ * done...
+ *
+ * Also, we need to check if the rNumCnt has reached its max (rNum),
+ * in which case we will assume the read to be done!
+ */
+static
+ERL_NIF_TERM recv_check_full_maybe_done(ErlNifEnv*       env,
+                                        ESockDescriptor* descP,
+                                        int              read,
+                                        int              toRead,
+                                        ErlNifBinary*    bufP,
+                                        ERL_NIF_TERM     sockRef,
+                                        ERL_NIF_TERM     recvRef)
+{
+    char* xres;
+
+    // cnt_inc(&descP->readByteCnt, read);
+    SOCK_CNT_INC(env, descP, sockRef, atom_read_byte, &descP->readByteCnt, read);
+
+    if (descP->rNum > 0) {
+
+        descP->rNumCnt++;
+        if (descP->rNumCnt >= descP->rNum) {
+
+            descP->rNumCnt = 0;
+
+            // cnt_inc(&descP->readPkgCnt, 1);
+            SOCK_CNT_INC(env, descP, sockRef, atom_read_pkg, &descP->readPkgCnt, 1);
+
+            recv_update_current_reader(env, descP, sockRef);
+
+            /* This transfers "ownership" of the *allocated* binary to an
+             * erlang term (no need for an explicit free).
+             */
+
+            return esock_make_ok3(env, atom_true, MKBIN(env, bufP));
+
+        }
+    }
+
+    /* Yes, we *do* need to continue reading */
+
+    if ((xres = recv_init_current_reader(env, descP, recvRef)) != NULL) {
+        descP->rNumCnt = 0;
+        FREE_BIN(bufP);
+        return esock_make_error_str(env, xres);
+    }
+
+    /* This transfers "ownership" of the *allocated* binary to an
+     * erlang term (no need for an explicit free).
+     */
+
+    SSDBG( descP,
+           ("SOCKET",
+            "recv_check_full_maybe_done -> [%d] "
+            "we are done for now - read more\r\n", toRead) );
+
+    return esock_make_ok3(env, atom_false, MKBIN(env, bufP));
+}
+
+
+
+/* *** recv_check_full_done ***
+ *
+ * A successful recv and we filled the buffer.
+ */
+static
+ERL_NIF_TERM recv_check_full_done(ErlNifEnv*       env,
+                                  ESockDescriptor* descP,
+                                  int              read,
+                                  ErlNifBinary*    bufP,
+                                  ERL_NIF_TERM     sockRef)
+{
+    ERL_NIF_TERM data;
+
+    // cnt_inc(&descP->readPkgCnt,  1);
+    SOCK_CNT_INC(env, descP, sockRef, atom_read_pkg, &descP->readPkgCnt, 1);
+    // cnt_inc(&descP->readByteCnt, read);
+    SOCK_CNT_INC(env, descP, sockRef, atom_read_byte, &descP->readByteCnt, read);
+
+    recv_update_current_reader(env, descP, sockRef);
+
+    /* This transfers "ownership" of the *allocated* binary to an
+     * erlang term (no need for an explicit free).
+     */
+    data = MKBIN(env, bufP);
+
+    return esock_make_ok3(env, atom_true, data);
+}
+
+
+
+/* *** recv_check_fail ***
+ *
+ * Handle recv failure.
+ */
+static
+ERL_NIF_TERM recv_check_fail(ErlNifEnv*       env,
+                             ESockDescriptor* descP,
+                             int              saveErrno,
+                             ErlNifBinary*    buf1P,
+                             ErlNifBinary*    buf2P,
+                             ERL_NIF_TERM     sockRef,
+                             ERL_NIF_TERM     recvRef)
+{
+    ERL_NIF_TERM res;
+
+    FREE_BIN(buf1P); if (buf2P != NULL) FREE_BIN(buf2P);
+
+    if (saveErrno == ECONNRESET)  {
+
+        /* +++ Oups - closed +++ */
+
+        SSDBG( descP, ("SOCKET", "recv_check_fail -> closed\r\n") );
+
+        // This is a bit overkill (to count here), but just in case...
+        // cnt_inc(&descP->readFails, 1);
+        SOCK_CNT_INC(env, descP, sockRef, atom_read_fails, &descP->readFails, 1);
+
+        res = recv_check_fail_closed(env, descP, sockRef, recvRef);
+
+    } else if ((saveErrno == ERRNO_BLOCK) ||
+               (saveErrno == EAGAIN)) {
+
+        SSDBG( descP, ("SOCKET", "recv_check_fail -> eagain\r\n") );
+
+        res = recv_check_retry(env, descP, sockRef, recvRef);
+
+    } else {
+
+        SSDBG( descP, ("SOCKET", "recv_check_fail -> errno: %d\r\n",
+                       saveErrno) );
+
+        // cnt_inc(&descP->readFails, 1);
+        SOCK_CNT_INC(env, descP, sockRef, atom_read_fails, &descP->readFails, 1);
+
+        res = recv_check_fail_gen(env, descP, saveErrno, sockRef);
+    }
+
+    return res;
+}
+
+
+
+/* *** recv_check_fail_closed ***
+ *
+ * We detected that the socket was closed wile reading.
+ * Inform current and waiting readers.
+ */
+static
+ERL_NIF_TERM recv_check_fail_closed(ErlNifEnv*       env,
+                                    ESockDescriptor* descP,
+                                    ERL_NIF_TERM     sockRef,
+                                    ERL_NIF_TERM     recvRef)
+{
+    ERL_NIF_TERM res = esock_make_error(env, atom_closed);
+    int          sres;
+
+    /* <KOLLA>
+     *
+     * IF THE CURRENT PROCESS IS *NOT* THE CONTROLLING
+     * PROCESS, WE NEED TO INFORM IT!!!
+     *
+     * ALL WAITING PROCESSES MUST ALSO GET THE ERROR!!
+     * HANDLED BY THE STOP (CALLBACK) FUNCTION?
+     *
+     * SINCE THIS IS A REMOTE CLOSE, WE DON'T NEED TO WAIT
+     * FOR OUTPUT TO BE WRITTEN (NO ONE WILL READ), JUST
+     * ABORT THE SOCKET REGARDLESS OF LINGER???
+     *
+     * </KOLLA>
+     */
+
+    descP->closeLocal = FALSE;
+    descP->state      = ESOCK_STATE_CLOSING;
+
+    recv_error_current_reader(env, descP, sockRef, res);
+
+    if ((sres = esock_select_stop(env, descP->sock, descP)) < 0) {
+        esock_warning_msg("Failed stop select (closed) "
+                          "for current reader (%T): %d\r\n",
+                          recvRef, sres);
+    }
+
+    return res;
+}
+
+
+
+/* *** recv_check_retry ***
+ *
+ * The recv call would have blocked, so retry.
+ */
+static
+ERL_NIF_TERM recv_check_retry(ErlNifEnv*       env,
+                              ESockDescriptor* descP,
+                              ERL_NIF_TERM     sockRef,
+                              ERL_NIF_TERM     recvRef)
+{
+    int          sres;
+    char*        xres;
+    ERL_NIF_TERM reason;
+
+    descP->rNumCnt = 0;
+    if ((xres = recv_init_current_reader(env, descP, recvRef)) != NULL)
+        return esock_make_error_str(env, xres);
+
+    SSDBG( descP, ("SOCKET", "recv_check_retry -> SELECT for more\r\n") );
+
+    if ((sres = esock_select_read(env, descP->sock, descP, NULL,
+                                  sockRef, recvRef)) < 0) {
+        /* Ouch
+         * Now what? We have copied ref into *its own* environment!
+         */
+        reason = MKT2(env, esock_atom_select_failed, MKI(env, sres));
+    } else {
+        reason = esock_atom_eagain;
+    }
+
+    return esock_make_error(env, reason);
+
+}
+
+
+
+/* *** recv_check_fail_gen ***
+ *
+ * The recv call had a "general" failure.
+ */
+static
+ERL_NIF_TERM recv_check_fail_gen(ErlNifEnv*       env,
+                                 ESockDescriptor* descP,
+                                 int              saveErrno,
+                                 ERL_NIF_TERM     sockRef)
+{
+    ERL_NIF_TERM res = esock_make_error_errno(env, saveErrno);
+
+    recv_error_current_reader(env, descP, sockRef, res);
+
+    return res;
+}
+
+
+
+/* *** recv_check_partial ***
+ *
+ * Handle a sucessful recv which only partly filled the specified buffer.
+ */
+static
+ERL_NIF_TERM recv_check_partial(ErlNifEnv*       env,
+                                ESockDescriptor* descP,
+                                int              read,
+                                int              toRead,
+                                ErlNifBinary*    bufP,
+                                ERL_NIF_TERM     sockRef,
+                                ERL_NIF_TERM     recvRef)
+{
+    ERL_NIF_TERM res;
+
+    if (toRead == 0) {
+
+        /* +++ We got it all, but since we      +++
+         * +++ did not fill the buffer, we      +++
+         * +++ must split it into a sub-binary. +++
+         */
+
+        SSDBG( descP,
+               ("SOCKET",
+                "recv_check_partial -> [%d] split buffer\r\n", toRead) );
+
+        res = recv_check_partial_done(env, descP, read, bufP, sockRef);
+
+    } else {
+
+        SSDBG( descP, ("SOCKET", "recv_check_partial -> [%d] "
+                       "only part of message - expect more\r\n", toRead) );
+
+        res = recv_check_partial_part(env, descP, read, bufP, sockRef, recvRef);
+    }
+
+    return res;
+}
+
+
+
+/* *** recv_check_partial_done ***
+ *
+ * A successful but only partial recv, which fulfilled the required read.
+ */
+static
+ERL_NIF_TERM recv_check_partial_done(ErlNifEnv*       env,
+                                     ESockDescriptor* descP,
+                                     int              read,
+                                     ErlNifBinary*    bufP,
+                                     ERL_NIF_TERM     sockRef)
+{
+    ERL_NIF_TERM data;
+
+    descP->rNumCnt = 0;
+    // cnt_inc(&descP->readPkgCnt,  1);
+    SOCK_CNT_INC(env, descP, sockRef, atom_read_pkg, &descP->readPkgCnt, 1);
+    // cnt_inc(&descP->readByteCnt, read);
+    SOCK_CNT_INC(env, descP, sockRef, atom_read_byte, &descP->readByteCnt, read);
+
+    recv_update_current_reader(env, descP, sockRef);
+
+    /* This transfers "ownership" of the *allocated* binary to an
+     * erlang term (no need for an explicit free).
+     */
+    data = MKBIN(env, bufP);
+    data = MKSBIN(env, data, 0, read);
+
+    SSDBG( descP,
+           ("SOCKET", "recv_check_partial_done -> [%d] done\r\n", read) );
+
+    return esock_make_ok3(env, atom_true, data);
+}
+
+
+
+/* *** recv_check_partial_part ***
+ *
+ * A successful but only partial recv, which only partly fulfilled
+ * the required read.
+ */
+static
+ERL_NIF_TERM recv_check_partial_part(ErlNifEnv*       env,
+                                     ESockDescriptor* descP,
+                                     int              read,
+                                     ErlNifBinary*    bufP,
+                                     ERL_NIF_TERM     sockRef,
+                                     ERL_NIF_TERM     recvRef)
+{
+    ERL_NIF_TERM res, reason, data;
+    char*        xres;
+    int          sres;
+
+    if ((xres = recv_init_current_reader(env, descP, recvRef)) != NULL) {
+        FREE_BIN(bufP);
+        return esock_make_error_str(env, xres);
+    }
+
+    data = MKBIN(env, bufP);
+    data = MKSBIN(env, data, 0, read);
+
+    // cnt_inc(&descP->readByteCnt, read);
+    SOCK_CNT_INC(env, descP, sockRef, atom_read_byte, &descP->readByteCnt, read);
+
+    /* SELECT for more data */
+
+    sres = esock_select_read(env, descP->sock, descP, NULL,
+                             sockRef, recvRef);
+    if (sres < 0) {
+        /* Result: {error, Reason}
+         * Reason: {select_failed, sres, data}
+         */
+        reason = MKT3(env, esock_atom_select_failed, MKI(env, sres), data);
+        res    = esock_make_error(env, reason);
+
+    } else {
+
+        res = esock_make_ok3(env, atom_false, data);
+
+    }
+
+    /* This transfers "ownership" of the *allocated* binary to an
+     * erlang term (no need for an explicit free).
+     */
+    return res;
+}
+
+
+
+
+
+/* The recvfrom function delivers one (1) message. If our buffer
+ * is to small, the message will be truncated. So, regardless
+ * if we filled the buffer or not, we have got what we are going
+ * to get regarding this message.
+ */
+static
+ERL_NIF_TERM recvfrom_check_result(ErlNifEnv*       env,
+                                   ESockDescriptor* descP,
+                                   int              read,
+                                   int              saveErrno,
+                                   ErlNifBinary*    bufP,
+                                   ESockAddress*    fromAddrP,
+                                   unsigned int     fromAddrLen,
+                                   ERL_NIF_TERM     sockRef,
+                                   ERL_NIF_TERM     recvRef)
+{
+    ERL_NIF_TERM data, res;
+
+    SSDBG( descP,
+           ("SOCKET", "recvfrom_check_result -> entry with"
+            "\r\n   read:      %d"
+            "\r\n   saveErrno: %d"
+            "\r\n   recvRef:   %T"
+            "\r\n", read, saveErrno, recvRef) );
+
+    if (read < 0) {
+
+        /* +++ Error handling +++ */
+
+        res = recv_check_fail(env, descP, saveErrno, bufP, NULL,
+                              sockRef, recvRef);
+
+    } else {
+
+        /* +++ We sucessfully got a message - time to encode the address +++ */
+
+        ERL_NIF_TERM eSockAddr;
+
+        esock_encode_sockaddr(env,
+                              fromAddrP, fromAddrLen,
+                              &eSockAddr);
+
+        if (read == bufP->size) {
+
+            data = MKBIN(env, bufP);
+
+        } else {
+
+            /* +++ We got a chunk of data but +++
+             * +++ since we did not fill the  +++
+             * +++ buffer, we must split it   +++
+             * +++ into a sub-binary.         +++
+             */
+
+            data = MKBIN(env, bufP);
+            data = MKSBIN(env, data, 0, read);
+        }
+
+        // cnt_inc(&descP->readPkgCnt,  1);
+        SOCK_CNT_INC(env, descP, sockRef, atom_read_pkg, &descP->readPkgCnt, 1);
+        // cnt_inc(&descP->readByteCnt, read);
+        SOCK_CNT_INC(env, descP, sockRef, atom_read_byte,
+                     &descP->readByteCnt, read);
+
+        recv_update_current_reader(env, descP, sockRef);
+        
+        res = esock_make_ok2(env, MKT2(env, eSockAddr, data));
+
+    }
+
+    return res;
+
+}
+
+
+
+/* *** recvmsg_check_result ***
+ *
+ * The recvmsg function delivers one (1) message. If our buffer
+ * is to small, the message will be truncated. So, regardless
+ * if we filled the buffer or not, we have got what we are going
+ * to get regarding this message.
+ */
+static
+ERL_NIF_TERM recvmsg_check_result(ErlNifEnv*       env,
+                                  ESockDescriptor* descP,
+                                  int              read,
+                                  int              saveErrno,
+                                  struct msghdr*   msgHdrP,
+                                  ErlNifBinary*    dataBufP,
+                                  ErlNifBinary*    ctrlBufP,
+                                  ERL_NIF_TERM     sockRef,
+                                  ERL_NIF_TERM     recvRef)
+{
+    ERL_NIF_TERM res;
+
+    SSDBG( descP,
+           ("SOCKET", "recvmsg_check_result -> entry with"
+            "\r\n   read:      %d"
+            "\r\n   saveErrno: %d"
+            "\r\n   recvRef:   %T"
+            "\r\n", read, saveErrno, recvRef) );
+
+
+    /* <KOLLA>
+     *
+     * We need to handle read = 0 for other type(s) (DGRAM) when
+     * its actually valid to read 0 bytes.
+     *
+     * </KOLLA>
+     */
+    
+    if ((read == 0) && (descP->type == SOCK_STREAM)) {
+        
+        /*
+         * When a stream socket peer has performed an orderly shutdown,
+         * the return value will be 0 (the traditional "end-of-file" return).
+         *
+         * *We* do never actually try to read 0 bytes from a stream socket!
+         */
+
+        SOCK_CNT_INC(env, descP, sockRef, atom_read_fails, &descP->readFails, 1);
+
+        FREE_BIN(dataBufP); FREE_BIN(ctrlBufP);
+
+        return esock_make_error(env, atom_closed);
+
+    }
+
+
+    /* There is a special case: If the provided 'to read' value is
+     * zero (0). That means that we reads as much as we can, using
+     * the default read buffer size.
+     */
+
+    if (read < 0) {
+
+        /* +++ Error handling +++ */
+
+        res = recv_check_fail(env, descP, saveErrno, dataBufP, ctrlBufP,
+                              sockRef, recvRef);
+
+    } else {
+
+        /* +++ We sucessfully got a message - time to encode it +++ */
+
+        res = recvmsg_check_msg(env, descP, read, msgHdrP,
+                                dataBufP, ctrlBufP, sockRef);
+
+    }
+
+    return res;
+
+}
+
+
+
+/* *** recvmsg_check_msg ***
+ *
+ * We successfully read one message. Time to process.
+ */
+static
+ERL_NIF_TERM recvmsg_check_msg(ErlNifEnv*       env,
+                               ESockDescriptor* descP,
+                               int              read,
+                               struct msghdr*   msgHdrP,
+                               ErlNifBinary*    dataBufP,
+                               ErlNifBinary*    ctrlBufP,
+                               ERL_NIF_TERM     sockRef)
+{
+    ERL_NIF_TERM res, eMsgHdr;
+    char*        xres;
+
+    /*
+     * <KOLLA>
+     *
+     * The return value of recvmsg is the *total* number of bytes
+     * that where successfully read. This data has been put into
+     * the *IO vector*.
+     *
+     * </KOLLA>
+     */
+
+    if ((xres = encode_msghdr(env, descP,
+                              read, msgHdrP, dataBufP, ctrlBufP,
+                              &eMsgHdr)) != NULL) {
+
+        SSDBG( descP,
+               ("SOCKET",
+                "recvmsg_check_result -> "
+                "(msghdr) encode failed: %s\r\n", xres) );
+
+        /* So this is a bit strange. We did "successfully" read 'read' bytes,
+         * but then we fail to process the message header. So what counters
+         * shall we increment?
+         *    Only failure?
+         *    Or only success (pkg and byte), since the read was "ok" (or was it?)
+         *    Or all of them?
+         *
+         * For now, we increment all three...
+         */
+         
+        SOCK_CNT_INC(env, descP, sockRef, atom_read_fails, &descP->readFails, 1);
+        SOCK_CNT_INC(env, descP, sockRef, atom_read_pkg, &descP->readPkgCnt, 1);
+        SOCK_CNT_INC(env, descP, sockRef, atom_read_byte,
+                     &descP->readByteCnt, read);
+
+        recv_update_current_reader(env, descP, sockRef);
+
+        FREE_BIN(dataBufP); FREE_BIN(ctrlBufP);
+
+        res = esock_make_error_str(env, xres);
+
+    } else {
+
+        SSDBG( descP,
+               ("SOCKET", "recvmsg_check_result -> (msghdr) encode ok\r\n") );
+
+        SOCK_CNT_INC(env, descP, sockRef, atom_read_pkg, &descP->readPkgCnt, 1);
+        SOCK_CNT_INC(env, descP, sockRef, atom_read_byte,
+                     &descP->readByteCnt, read);
+
+        recv_update_current_reader(env, descP, sockRef);
+
+        res = esock_make_ok2(env, eMsgHdr);
+    }
+
+    return res;
+}
+
+
+
+
+/* +++ encode_msghdr +++
+ *
+ * Encode a msghdr (recvmsg). In erlang its represented as
+ * a map, which has a specific set of attributes:
+ *
+ *     addr (source address) - sockaddr()
+ *     iov                   - [binary()]
+ *     ctrl                  - [cmsghdr()]
+ *     flags                 - msghdr_flags()
+ */
+
+extern
+char* encode_msghdr(ErlNifEnv*       env,
+                    ESockDescriptor* descP,
+                    int              read,
+                    struct msghdr*   msgHdrP,
+                    ErlNifBinary*    dataBufP,
+                    ErlNifBinary*    ctrlBufP,
+                    ERL_NIF_TERM*    eSockAddr)
+{
+    char*        xres;
+    ERL_NIF_TERM addr, iov, ctrl, flags;
+
+    SSDBG( descP,
+           ("SOCKET", "encode_msghdr -> entry with"
+            "\r\n   read: %d"
+            "\r\n", read) );
+
+    /* The address is not used if we are connected (unless, maybe,
+     * family is 'local'), so check (length = 0) before we try to encodel
+     */
+    if (msgHdrP->msg_namelen != 0) {
+        if ((xres = esock_encode_sockaddr(env,
+                                          (ESockAddress*) msgHdrP->msg_name,
+                                          msgHdrP->msg_namelen,
+                                          &addr)) != NULL)
+            return xres;
+    } else {
+        addr = esock_atom_undefined;
+    }
+
+    SSDBG( descP, ("SOCKET", "encode_msghdr -> try encode iov\r\n") );
+    if ((xres = esock_encode_iov(env,
+                                 read,
+                                 msgHdrP->msg_iov,
+                                 msgHdrP->msg_iovlen,
+                                 dataBufP,
+                                 &iov)) != NULL)
+        return xres;
+
+    SSDBG( descP, ("SOCKET", "encode_msghdr -> try encode cmsghdrs\r\n") );
+    if ((xres = encode_cmsghdrs(env, descP, ctrlBufP, msgHdrP, &ctrl)) != NULL)
+        return xres;
+
+    SSDBG( descP, ("SOCKET", "encode_msghdr -> try encode flags\r\n") );
+    if ((xres = encode_msghdr_flags(env, descP, msgHdrP->msg_flags, &flags)) != NULL)
+        return xres;
+
+    SSDBG( descP,
+           ("SOCKET", "encode_msghdr -> components encoded:"
+            "\r\n   addr:  %T"
+            "\r\n   ctrl:  %T"
+            "\r\n   flags: %T"
+           "\r\n", addr, ctrl, flags) );
+    {
+        ERL_NIF_TERM keys[]  = {esock_atom_addr,
+                                esock_atom_iov,
+                                esock_atom_ctrl,
+                                esock_atom_flags};
+        ERL_NIF_TERM vals[]  = {addr, iov, ctrl, flags};
+        unsigned int numKeys = sizeof(keys) / sizeof(ERL_NIF_TERM);
+        unsigned int numVals = sizeof(vals) / sizeof(ERL_NIF_TERM);
+        ERL_NIF_TERM tmp;
+        
+        ESOCK_ASSERT( (numKeys == numVals) );
+        
+        SSDBG( descP, ("SOCKET", "encode_msghdr -> create msghdr map\r\n") );
+        if (!MKMA(env, keys, vals, numKeys, &tmp))
+            return ESOCK_STR_EINVAL;
+
+        SSDBG( descP, ("SOCKET", "encode_msghdr -> msghdr encoded\r\n") );
+
+        *eSockAddr = tmp;
+    }
+
+    SSDBG( descP, ("SOCKET", "encode_msghdr -> done\r\n") );
+
+    return NULL;
+}
+
+
+
+
+/* +++ encode_cmsghdrs +++
+ *
+ * Encode a list of cmsghdr(). There can be 0 or more cmsghdr "blocks".
+ *
+ * Our "problem" is that we have no idea how many control messages
+ * we have.
+ *
+ * The cmsgHdrP arguments points to the start of the control data buffer,
+ * an actual binary. Its the only way to create sub-binaries. So, what we
+ * need to continue processing this is to turn that into an binary erlang 
+ * term (which can then in turn be turned into sub-binaries).
+ *
+ * We need the cmsgBufP (even though cmsgHdrP points to it) to be able
+ * to create sub-binaries (one for each cmsg hdr).
+ *
+ * The TArray (term array) is created with the size of 128, which should
+ * be enough. But if its not, then it will be automatically realloc'ed during
+ * add. Once we are done adding hdr's to it, we convert the tarray to a list.
+ */
+
+extern
+char* encode_cmsghdrs(ErlNifEnv*       env,
+                      ESockDescriptor* descP,
+                      ErlNifBinary*    cmsgBinP,
+                      struct msghdr*   msgHdrP,
+                      ERL_NIF_TERM*    eCMsgHdr)
+{
+    ERL_NIF_TERM    ctrlBuf  = MKBIN(env, cmsgBinP); // The *entire* binary
+    SocketTArray    cmsghdrs = TARRAY_CREATE(128);
+    struct cmsghdr* firstP   = CMSG_FIRSTHDR(msgHdrP);
+    struct cmsghdr* currentP;
+    
+    SSDBG( descP, ("SOCKET", "encode_cmsghdrs -> entry when"
+                   "\r\n   msg ctrl len:  %d"
+                   "\r\n   (ctrl) firstP: 0x%lX"
+                   "\r\n",
+                   msgHdrP->msg_controllen, firstP) );
+
+    for (currentP = firstP;
+         /*
+          * In *old* versions of darwin, the CMSG_FIRSTHDR does not
+          * check the msg_controllen, so we do it here.
+          * We should really test this stuff during configure,
+          * but for now, this will have to do.
+          */
+#if defined(__DARWIN__)
+         (msgHdrP->msg_controllen >= sizeof(struct cmsghdr)) && (currentP != NULL);
+#else
+         (currentP != NULL);
+#endif
+         currentP = CMSG_NXTHDR(msgHdrP, currentP)) {
+
+        SSDBG( descP,
+               ("SOCKET", "encode_cmsghdrs -> process cmsg header when"
+                "\r\n   TArray Size: %d"
+                "\r\n", TARRAY_SZ(cmsghdrs)) );
+
+        /* MUST check this since on Linux the returned "cmsg" may actually
+         * go too far!
+         */
+        if (((CHARP(currentP) + currentP->cmsg_len) - CHARP(firstP)) >
+            msgHdrP->msg_controllen) {
+
+            /* Ouch, fatal error - give up 
+             * We assume we cannot trust any data if this is wrong.
+             */
+
+            SSDBG( descP,
+                   ("SOCKET", "encode_cmsghdrs -> check failed when: "
+                    "\r\n   currentP:           0x%lX"
+                    "\r\n   (current) cmsg_len: %d"
+                    "\r\n   firstP:             0x%lX"
+                    "\r\n   =>                  %d"
+                    "\r\n   msg ctrl len:       %d"
+                    "\r\n",
+                    CHARP(currentP), currentP->cmsg_len, CHARP(firstP),
+                    (CHARP(currentP) + currentP->cmsg_len) - CHARP(firstP),
+                    msgHdrP->msg_controllen) );
+
+            TARRAY_DELETE(cmsghdrs);
+            return ESOCK_STR_EINVAL;
+        } else {
+            ERL_NIF_TERM   level, type, data;
+            unsigned char* dataP   = (unsigned char*) CMSG_DATA(currentP);
+            size_t         dataPos = dataP - cmsgBinP->data;
+            size_t         dataLen = currentP->cmsg_len - (CHARP(currentP)-CHARP(dataP));
+
+            SSDBG( descP,
+                   ("SOCKET", "encode_cmsghdrs -> cmsg header data: "
+                    "\r\n   dataPos: %d"
+                    "\r\n   dataLen: %d"
+                    "\r\n", dataPos, dataLen) );
+
+            /* We can't give up just because its an unknown protocol,
+             * so if its a protocol we don't know, we return its integer 
+             * value and leave it to the user.
+             */
+            if (encode_cmsghdr_level(env, currentP->cmsg_level, &level) != NULL)
+                level = MKI(env, currentP->cmsg_level);
+
+            if (encode_cmsghdr_type(env,
+                                    currentP->cmsg_level, currentP->cmsg_type,
+                                    &type) != NULL)
+                type = MKI(env, currentP->cmsg_type);
+
+            if (encode_cmsghdr_data(env, ctrlBuf,
+                                    currentP->cmsg_level,
+                                    currentP->cmsg_type,
+                                    dataP, dataPos, dataLen,
+                                    &data) != NULL)
+                data = MKSBIN(env, ctrlBuf, dataPos, dataLen);
+
+            SSDBG( descP,
+                   ("SOCKET", "encode_cmsghdrs -> "
+                    "\r\n   level: %T"
+                    "\r\n   type:  %T"
+                    "\r\n   data:  %T"
+                    "\r\n", level, type, data) );
+
+            /* And finally create the 'cmsghdr' map -
+             * and if successfull add it to the tarray.
+             */
+            {
+                ERL_NIF_TERM keys[]  = {esock_atom_level,
+                                        esock_atom_type,
+                                        esock_atom_data};
+                ERL_NIF_TERM vals[]  = {level, type, data};
+                unsigned int numKeys = sizeof(keys) / sizeof(ERL_NIF_TERM);
+                unsigned int numVals = sizeof(vals) / sizeof(ERL_NIF_TERM);
+                ERL_NIF_TERM cmsgHdr;
+
+                /* Guard agains cut-and-paste errors */
+                ESOCK_ASSERT( (numKeys == numVals) );
+            
+                if (!MKMA(env, keys, vals, numKeys, &cmsgHdr)) {
+                    TARRAY_DELETE(cmsghdrs);
+                    return ESOCK_STR_EINVAL;
+                }
+
+                /* And finally add it to the list... */
+                TARRAY_ADD(cmsghdrs, cmsgHdr);
+            }
+        }
+    }
+
+    SSDBG( descP,
+           ("SOCKET", "encode_cmsghdrs -> cmsg headers processed when"
+            "\r\n   TArray Size: %d"
+            "\r\n", TARRAY_SZ(cmsghdrs)) );
+
+    /* The tarray is populated - convert it to a list */
+    TARRAY_TOLIST(cmsghdrs, env, eCMsgHdr);
+
+    return NULL;
+}
+
+
+
+/* +++ decode_cmsghdrs +++
+ *
+ * Decode a list of cmsghdr(). There can be 0 or more cmsghdr "blocks".
+ *
+ * Each element can either be a (erlang) map that needs to be decoded,
+ * or a (erlang) binary that just needs to be appended to the control
+ * buffer.
+ *
+ * Our "problem" is that we have no idea much memory we actually need.
+ *
+ */
+
+extern
+char* decode_cmsghdrs(ErlNifEnv*       env,
+                      ESockDescriptor* descP,
+                      ERL_NIF_TERM     eCMsgHdr,
+                      char*            cmsgHdrBufP,
+                      size_t           cmsgHdrBufLen,
+                      size_t*          cmsgHdrBufUsed)
+{
+    ERL_NIF_TERM elem, tail, list;
+    char*        bufP;
+    size_t       rem, used, totUsed = 0;
+    unsigned int len;
+    int          i;
+    char*        xres;
+
+    SSDBG( descP, ("SOCKET", "decode_cmsghdrs -> entry with"
+                   "\r\n   cmsgHdrBufP:   0x%lX"
+                   "\r\n   cmsgHdrBufLen: %d"
+                   "\r\n", cmsgHdrBufP, cmsgHdrBufLen) );
+
+    if (IS_LIST(env, eCMsgHdr) && GET_LIST_LEN(env, eCMsgHdr, &len)) {
+
+        SSDBG( descP, ("SOCKET", "decode_cmsghdrs -> list length: %d\r\n", len) );
+
+        for (i = 0, list = eCMsgHdr, rem  = cmsgHdrBufLen, bufP = cmsgHdrBufP;
+             i < len; i++) {
+            
+            SSDBG( descP, ("SOCKET", "decode_cmsghdrs -> process elem %d:"
+                           "\r\n   (buffer) rem:     %u"
+                           "\r\n   (buffer) totUsed: %u"
+                           "\r\n", i, rem, totUsed) );
+
+            /* Extract the (current) head of the (cmsg hdr) list */
+            if (!GET_LIST_ELEM(env, list, &elem, &tail))
+                return ESOCK_STR_EINVAL;
+            
+            used = 0; // Just in case...
+            if ((xres = decode_cmsghdr(env, descP, elem, bufP, rem, &used)) != NULL)
+                return xres;
+
+            bufP     = CHARP( ULONG(bufP) + used );
+            rem      = SZT( rem - used );
+            list     = tail;
+            totUsed += used;
+
+        }
+
+        SSDBG( descP, ("SOCKET",
+                       "decode_cmsghdrs -> all %d ctrl headers processed\r\n",
+                       len) );
+
+        xres = NULL;
+    } else {
+        xres = ESOCK_STR_EINVAL;
+    }
+
+    *cmsgHdrBufUsed = totUsed;
+
+    SSDBG( descP, ("SOCKET", "decode_cmsghdrs -> done with %s when"
+                   "\r\n   totUsed = %u\r\n",
+                   ((xres != NULL) ? xres : "NULL"), totUsed) );
+
+    return xres;
+}
+
+
+/* +++ decode_cmsghdr +++
+ *
+ * Decode one cmsghdr(). Put the "result" into the buffer and advance the
+ * pointer (of the buffer) afterwards. Also update 'rem' accordingly.
+ * But before the actual decode, make sure that there is enough room in 
+ * the buffer for the cmsg header (sizeof(*hdr) < rem).
+ *
+ * The eCMsgHdr should be a map with three fields: 
+ *
+ *     level :: cmsghdr_level()   (socket | protocol() | integer())
+ *     type  :: cmsghdr_type()    (atom() | integer())
+ *                                What values are valid depend on the level
+ *     data  :: cmsghdr_data()    (term() | binary())
+ *                                The type of the data depends on
+ *                                level and type, but can be a binary,
+ *                                which means that the data is already coded.
+ */
+extern
+char* decode_cmsghdr(ErlNifEnv*       env,
+                     ESockDescriptor* descP,
+                     ERL_NIF_TERM     eCMsgHdr,
+                     char*            bufP,
+                     size_t           rem,
+                     size_t*          used)
+{
+    SSDBG( descP, ("SOCKET", "decode_cmsghdr -> entry with"
+                   "\r\n   eCMsgHdr: %T"
+                   "\r\n", eCMsgHdr) );
+
+    if (IS_MAP(env, eCMsgHdr)) {
+        ERL_NIF_TERM eLevel, eType, eData;
+        int          level, type;
+        char*        xres;
+
+        /* First extract all three attributes (as terms) */
+
+        if (!GET_MAP_VAL(env, eCMsgHdr, esock_atom_level, &eLevel))
+            return ESOCK_STR_EINVAL;
+        
+        SSDBG( descP, ("SOCKET", "decode_cmsghdr -> eLevel: %T"
+                       "\r\n", eLevel) );
+
+        if (!GET_MAP_VAL(env, eCMsgHdr, esock_atom_type, &eType))
+            return ESOCK_STR_EINVAL;
+        
+        SSDBG( descP, ("SOCKET", "decode_cmsghdr -> eType:  %T"
+                       "\r\n", eType) );
+
+        if (!GET_MAP_VAL(env, eCMsgHdr, esock_atom_data, &eData))
+            return ESOCK_STR_EINVAL;
+
+        SSDBG( descP, ("SOCKET", "decode_cmsghdr -> eData:  %T"
+                       "\r\n", eData) );
+
+        /* Second, decode level */
+        if ((xres = decode_cmsghdr_level(env, eLevel, &level)) != NULL)
+            return xres;
+
+        SSDBG( descP, ("SOCKET", "decode_cmsghdr -> level:  %d\r\n", level) );
+
+        /* third, decode type */
+        if ((xres = decode_cmsghdr_type(env, level, eType, &type)) != NULL)
+            return xres;
+        
+        SSDBG( descP, ("SOCKET", "decode_cmsghdr -> type:   %d\r\n", type) );
+
+        /* And finally data
+         * If its a binary, we are done. Otherwise, we need to check
+         * level and type to know what kind of data to expect.
+         */
+
+        return decode_cmsghdr_data(env, descP, bufP, rem, level, type, eData, used);
+
+    } else {
+        *used = 0;
+        return ESOCK_STR_EINVAL;
+    }
+
+    return NULL;
+}
+
+
+/* *** decode_cmsghdr_data ***
+ *
+ * For all combinations of level and type we accept a binary as data,
+ * so we begin by testing for that. If its not a binary, then we check
+ * level (ip) and type (tos or ttl), in which case the data *must* be
+ * an integer and ip_tos() respectively.
+ */
+static
+char* decode_cmsghdr_data(ErlNifEnv*       env,
+                          ESockDescriptor* descP,
+                          char*            bufP,
+                          size_t           rem,
+                          int              level,
+                          int              type,
+                          ERL_NIF_TERM     eData,
+                          size_t*          used)
+{
+    char* xres;
+
+    SSDBG( descP, ("SOCKET", "decode_cmsghdr_data -> entry with"
+                   "\r\n   eData: %T"
+                   "\r\n", eData) );
+
+    if (IS_BIN(env, eData)) {
+        ErlNifBinary bin;
+        
+        if (GET_BIN(env, eData, &bin)) {
+            SSDBG( descP, ("SOCKET", "decode_cmsghdr_data -> "
+                           "do final decode with binary\r\n") );
+            return decode_cmsghdr_final(descP, bufP, rem, level, type,
+                                        (char*) bin.data, bin.size,
+                                        used);
+        } else {
+            *used = 0;
+            xres  = ESOCK_STR_EINVAL;
+        }
+    } else {
+
+        /* Its *not* a binary so we need to look at what level and type 
+         * we have and treat them individually.
+         */
+
+        switch (level) {
+#if defined(SOL_IP)
+        case SOL_IP:
+#else
+        case IPPROTO_IP:
+#endif
+            switch (type) {
+#if defined(IP_TOS)
+            case IP_TOS:
+                {
+                    int data;
+                    if (decode_ip_tos(env, eData, &data)) {
+                        SSDBG( descP, ("SOCKET", "decode_cmsghdr_data -> "
+                                       "do final decode with tos\r\n") );
+                        return decode_cmsghdr_final(descP, bufP, rem, level, type,
+                                                    (char*) &data,
+                                                    sizeof(data),
+                                                    used);
+                    } else {
+                        *used = 0;
+                        xres  = ESOCK_STR_EINVAL;
+                    }
+                }
+                break;
+#endif
+
+#if defined(IP_TTL)
+            case IP_TTL:
+                {
+                    int data;
+                    if (GET_INT(env, eData, &data)) {
+                        SSDBG( descP, ("SOCKET", "decode_cmsghdr_data -> "
+                                       "do final decode with ttl\r\n") );
+                        return decode_cmsghdr_final(descP, bufP, rem, level, type,
+                                                    (char*) &data,
+                                                    sizeof(data),
+                                                    used);
+                    } else {
+                        *used = 0;
+                        xres  = ESOCK_STR_EINVAL;
+                    }
+                }
+                break;
+#endif
+
+            }
+            break;
+
+        default:
+            *used = 0;
+            xres  = ESOCK_STR_EINVAL;
+            break;
+        }        
+
+    }
+
+    return xres;
+}
+                              
+
+/* *** decode_cmsghdr_final ***
+ *
+ * This does the final create of the cmsghdr (including the data copy).
+ */
+static
+char* decode_cmsghdr_final(ESockDescriptor* descP,
+                           char*            bufP,
+                           size_t           rem,
+                           int              level,
+                           int              type,
+                           char*            data,
+                           int              sz,
+                           size_t*          used)
+{
+    int len   = CMSG_LEN(sz);
+    int space = CMSG_SPACE(sz);
+
+    SSDBG( descP, ("SOCKET", "decode_cmsghdr_data -> entry when"
+                   "\r\n   level: %d"
+                   "\r\n   type:  %d"
+                   "\r\n   sz:    %d => %d, %d"
+                   "\r\n", level, type, sz, len, space) );
+
+    if (rem >= space) {
+        struct cmsghdr* cmsgP = (struct cmsghdr*) bufP;
+        
+        /* The header */
+        cmsgP->cmsg_len   = len;
+        cmsgP->cmsg_level = level;
+        cmsgP->cmsg_type  = type;
+
+        sys_memcpy(CMSG_DATA(cmsgP), data, sz);
+        *used = space;
+    } else {
+        *used = 0;
+        return ESOCK_STR_EINVAL;
+    }
+
+    SSDBG( descP, ("SOCKET", "decode_cmsghdr_final -> done\r\n") );
+
+    return NULL;
+}
+
+
+/* +++ encode_cmsghdr_level +++
+ *
+ * Encode the level part of the cmsghdr().
+ *
+ */
+
+static
+char* encode_cmsghdr_level(ErlNifEnv*    env,
+                           int           level,
+                           ERL_NIF_TERM* eLevel)
+{
+    char* xres;
+
+    switch (level) {
+    case SOL_SOCKET:
+        *eLevel = esock_atom_socket;
+        xres    = NULL;
+        break;
+
+#if defined(SOL_IP)
+    case SOL_IP:
+#else
+    case IPPROTO_IP:
+#endif
+        *eLevel = esock_atom_ip;
+        xres    = NULL;
+        break;
+
+#if defined(HAVE_IPV6)
+#if defined(SOL_IPV6)
+    case SOL_IPV6:
+#else
+    case IPPROTO_IPV6:
+#endif
+        *eLevel = esock_atom_ip;
+        xres    = NULL;
+        break;
+#endif
+
+    case IPPROTO_UDP:
+        *eLevel = esock_atom_udp;
+        xres    = NULL;
+        break;
+
+    default:
+        *eLevel = MKI(env, level);
+        xres    = NULL;
+        break;
+    }
+
+    return xres;
+}
+
+
+
+/* +++ decode_cmsghdr_level +++
+ *
+ * Decode the level part of the cmsghdr().
+ *
+ */
+
+static
+char* decode_cmsghdr_level(ErlNifEnv*   env,
+                           ERL_NIF_TERM eLevel,
+                           int*         level)
+{
+    char* xres = NULL;
+
+    if (IS_ATOM(env, eLevel)) {
+
+        if (COMPARE(eLevel, esock_atom_socket) == 0) {
+            *level = SOL_SOCKET;
+            xres   = NULL;
+        } else if (COMPARE(eLevel, esock_atom_ip) == 0) {
+#if defined(SOL_IP)
+            *level = SOL_IP;
+#else
+            *level = IPPROTO_IP;
+#endif
+            xres   = NULL;
+#if defined(HAVE_IPV6)
+        } else if (COMPARE(eLevel, esock_atom_ipv6) == 0) {
+#if defined(SOL_IPV6)
+            *level = SOL_IPV6;
+#else
+            *level = IPPROTO_IPV6;
+#endif
+            xres   = NULL;
+#endif
+        } else if (COMPARE(eLevel, esock_atom_udp) == 0) {
+            *level = IPPROTO_UDP;
+            xres   = NULL;
+        } else {
+            *level = -1;
+            xres   = ESOCK_STR_EINVAL;
+        }
+    } else if (IS_NUM(env, eLevel)) {
+        if (!GET_INT(env, eLevel, level))
+            xres = ESOCK_STR_EINVAL;
+    } else {
+        *level = -1;
+        xres   = ESOCK_STR_EINVAL;
+    }
+
+    return xres;
+}
+
+
+
+/* +++ encode_cmsghdr_type +++
+ *
+ * Encode the type part of the cmsghdr().
+ *
+ */
+
+static
+char* encode_cmsghdr_type(ErlNifEnv*    env,
+                          int           level,
+                          int           type,
+                          ERL_NIF_TERM* eType)
+{
+    char* xres = NULL;
+
+    switch (level) {
+    case SOL_SOCKET:
+        switch (type) {
+#if defined(SO_TIMESTAMP)
+        case SO_TIMESTAMP:
+            *eType = esock_atom_timestamp;
+            break;
+#endif
+
+#if defined(SCM_RIGHTS)
+        case SCM_RIGHTS:
+            *eType = esock_atom_rights;
+            break;
+#endif
+
+#if defined(SCM_CREDENTIALS)
+        case SCM_CREDENTIALS:
+            *eType = esock_atom_credentials;
+            break;
+#endif
+
+        default:
+            xres = ESOCK_STR_EINVAL;
+            break;
+        }        
+        break;
+
+#if defined(SOL_IP)
+    case SOL_IP:
+#else
+    case IPPROTO_IP:
+#endif
+        switch (type) {
+#if defined(IP_TOS)
+        case IP_TOS:
+            *eType = esock_atom_tos;
+            break;
+#endif
+
+#if defined(IP_TTL)
+        case IP_TTL:
+            *eType = esock_atom_ttl;
+            break;
+#endif
+
+#if defined(IP_PKTINFO)
+        case IP_PKTINFO:
+            *eType = esock_atom_pktinfo;
+            break;
+#endif
+
+#if defined(IP_ORIGDSTADDR)
+        case IP_ORIGDSTADDR:
+            *eType = esock_atom_origdstaddr;
+            break;
+#endif
+
+        default:
+            xres = ESOCK_STR_EINVAL;
+            break;
+        }
+        break;
+
+#if defined(HAVE_IPV6)
+#if defined(SOL_IPV6)
+        case SOL_IPV6:
+#else
+        case IPPROTO_IPV6:
+#endif
+        switch (type) {
+#if defined(IPV6_PKTINFO)
+        case IPV6_PKTINFO:
+            *eType = esock_atom_pktinfo;
+            break;
+#endif
+
+        default:
+            xres = ESOCK_STR_EINVAL;
+            break;
+        }        
+        break;
+#endif
+
+    case IPPROTO_TCP:
+        switch (type) {
+        default:
+            xres = ESOCK_STR_EINVAL;
+            break;
+        }        
+        break;
+
+    case IPPROTO_UDP:
+        switch (type) {
+        default:
+            xres = ESOCK_STR_EINVAL;
+            break;
+        }        
+        break;
+
+#if defined(HAVE_SCTP)
+    case IPPROTO_SCTP:
+        switch (type) {
+        default:
+            xres = ESOCK_STR_EINVAL;
+            break;
+        }        
+        break;
+#endif
+
+    default:
+        xres = ESOCK_STR_EINVAL;
+        break;
+    }
+
+    return xres;
+}
+
+
+
+/* +++ decode_cmsghdr_type +++
+ *
+ * Decode the type part of the cmsghdr().
+ *
+ */
+
+static
+char* decode_cmsghdr_type(ErlNifEnv*   env,
+                          int          level,
+                          ERL_NIF_TERM eType,
+                          int*         type)
+{
+    char* xres = NULL;
+
+    switch (level) {
+    case SOL_SOCKET:
+        if (IS_NUM(env, eType)) {
+            if (!GET_INT(env, eType, type)) {
+                *type = -1;
+                xres  = ESOCK_STR_EINVAL;
+            }
+        } else {
+            *type = -1;
+            xres = ESOCK_STR_EINVAL;
+        }
+        break;
+
+
+#if defined(SOL_IP)
+    case SOL_IP:
+#else
+    case IPPROTO_IP:
+#endif
+        if (IS_ATOM(env, eType)) {
+            if (COMPARE(eType, esock_atom_tos) == 0) {
+#if defined(IP_TOS)
+                *type = IP_TOS;
+#else
+                xres  = ESOCK_STR_EINVAL;
+#endif
+            } else if (COMPARE(eType, esock_atom_ttl) == 0) {
+#if defined(IP_TTL)
+                *type = IP_TTL;
+#else
+                xres  = ESOCK_STR_EINVAL;
+#endif
+            } else {
+                xres = ESOCK_STR_EINVAL;
+            }
+        } else if (IS_NUM(env, eType)) {
+            if (!GET_INT(env, eType, type)) {
+                *type = -1;
+                xres  = ESOCK_STR_EINVAL;
+            }
+        } else {
+            *type = -1;
+            xres  = ESOCK_STR_EINVAL;
+        }
+        break;
+        
+#if defined(HAVE_IPV6)
+#if defined(SOL_IPV6)
+    case SOL_IPV6:
+#else
+    case IPPROTO_IPV6:
+#endif
+        if (IS_NUM(env, eType)) {
+            if (!GET_INT(env, eType, type)) {
+                *type = -1;
+                xres  = ESOCK_STR_EINVAL;
+            }
+        } else {
+            *type = -1;
+            xres = ESOCK_STR_EINVAL;
+        }
+        break;
+#endif
+        
+    case IPPROTO_UDP:
+        if (IS_NUM(env, eType)) {
+            if (!GET_INT(env, eType, type)) {
+                *type = -1;
+                xres  = ESOCK_STR_EINVAL;
+            }
+        } else {
+            *type = -1;
+            xres = ESOCK_STR_EINVAL;
+        }
+        break;
+
+    default:
+        *type = -1;
+        xres  = ESOCK_STR_EINVAL;
+        break;
+    }
+
+    return xres;
+}
+
+
+
+/* +++ encode_cmsghdr_data +++
+ *
+ * Encode the data part of the cmsghdr().
+ *
+ */
+
+static
+char* encode_cmsghdr_data(ErlNifEnv*     env,
+                          ERL_NIF_TERM   ctrlBuf,
+                          int            level,
+                          int            type,
+                          unsigned char* dataP,
+                          size_t         dataPos,
+                          size_t         dataLen,
+                          ERL_NIF_TERM*  eCMsgHdrData)
+{
+    char* xres;
+
+    switch (level) {
+#if defined(SOL_SOCKET)
+    case SOL_SOCKET:
+        xres = encode_cmsghdr_data_socket(env, ctrlBuf, type,
+                                          dataP, dataPos, dataLen,
+                                          eCMsgHdrData);
+        break;
+#endif
+
+#if defined(SOL_IP)
+    case SOL_IP:
+#else
+    case IPPROTO_IP:
+#endif
+        xres = encode_cmsghdr_data_ip(env, ctrlBuf, type,
+                                      dataP, dataPos, dataLen,
+                                      eCMsgHdrData);
+        break;
+
+#if defined(HAVE_IPV6)
+#if defined(SOL_IPV6)
+    case SOL_IPV6:
+#else
+    case IPPROTO_IPV6:
+#endif        
+        xres = encode_cmsghdr_data_ipv6(env, ctrlBuf, type,
+                                        dataP, dataPos, dataLen,
+                                        eCMsgHdrData);
+        break;
+#endif
+
+        /*
+          case IPPROTO_TCP:
+          xres = encode_cmsghdr_data_tcp(env, type, dataP, eCMsgHdrData);
+          break;
+        */
+
+        /*
+          case IPPROTO_UDP:
+          xres = encode_cmsghdr_data_udp(env, type, dataP, eCMsgHdrData);
+          break;
+        */
+
+        /*
+          #if defined(HAVE_SCTP)
+          case IPPROTO_SCTP:
+          xres = encode_cmsghdr_data_sctp(env, type, dataP, eCMsgHdrData);
+          break;
+          #endif
+        */
+
+    default:
+        *eCMsgHdrData = MKSBIN(env, ctrlBuf, dataPos, dataLen);
+        xres = NULL;
+        break;
+    }
+
+    return xres;
+}
+
+
+
+/* +++ encode_cmsghdr_data_socket +++
+ *
+ * Encode the data part when "protocol" = socket of the cmsghdr().
+ *
+ */
+
+static
+char* encode_cmsghdr_data_socket(ErlNifEnv*     env,
+                                 ERL_NIF_TERM   ctrlBuf,
+                                 int            type,
+                                 unsigned char* dataP,
+                                 size_t         dataPos,
+                                 size_t         dataLen,
+                                 ERL_NIF_TERM*  eCMsgHdrData)
+{
+    // char* xres;
+
+    switch (type) {
+#if defined(SO_TIMESTAMP)
+    case SO_TIMESTAMP:
+        {
+            struct timeval* timeP = (struct timeval*) dataP;
+
+            if (esock_encode_timeval(env, timeP, eCMsgHdrData) != NULL)
+                *eCMsgHdrData = MKSBIN(env, ctrlBuf, dataPos, dataLen);
+        }
+        break;
+#endif
+
+    default:
+        *eCMsgHdrData = MKSBIN(env, ctrlBuf, dataPos, dataLen);
+        break;
+    }
+
+    return NULL;
+}
+
+
+
+/* +++ encode_cmsghdr_data_ip +++
+ *
+ * Encode the data part when protocol = IP of the cmsghdr().
+ *
+ */
+
+static
+char* encode_cmsghdr_data_ip(ErlNifEnv*     env,
+                             ERL_NIF_TERM   ctrlBuf,
+                             int            type,
+                             unsigned char* dataP,
+                             size_t         dataPos,
+                             size_t         dataLen,
+                             ERL_NIF_TERM*  eCMsgHdrData)
+{
+    char* xres = NULL;
+
+    switch (type) {
+#if defined(IP_TOS)
+    case IP_TOS:
+        {
+            unsigned char tos = *dataP;
+            switch (IPTOS_TOS(tos)) {
+            case IPTOS_LOWDELAY:
+                *eCMsgHdrData = esock_atom_lowdelay;
+                break;
+            case IPTOS_THROUGHPUT:
+                *eCMsgHdrData = esock_atom_throughput;
+                break;
+            case IPTOS_RELIABILITY:
+                *eCMsgHdrData = esock_atom_reliability;
+                break;
+#if defined(IPTOS_MINCOST)
+            case IPTOS_MINCOST:
+                *eCMsgHdrData = esock_atom_mincost;
+                break;
+#endif
+            default:
+                *eCMsgHdrData = MKUI(env, tos);
+                break;
+            }
+        }
+        break;
+#endif
+
+#if defined(IP_TTL)
+    case IP_TTL:
+        {
+            int ttl = *((int*) dataP);
+            *eCMsgHdrData = MKI(env, ttl);
+        }
+        break;
+#endif
+
+#if defined(IP_PKTINFO)
+    case IP_PKTINFO:
+        {
+            struct in_pktinfo* pktInfoP = (struct in_pktinfo*) dataP;
+            ERL_NIF_TERM       ifIndex  = MKUI(env, pktInfoP->ipi_ifindex);
+            ERL_NIF_TERM       specDst, addr;
+
+            if ((xres = esock_encode_ip4_address(env,
+                                                 &pktInfoP->ipi_spec_dst,
+                                                 &specDst)) != NULL) {
+                *eCMsgHdrData = esock_atom_undefined;
+                return xres;
+            }
+
+            if ((xres = esock_encode_ip4_address(env,
+                                                 &pktInfoP->ipi_addr,
+                                                 &addr)) != NULL) {
+                *eCMsgHdrData = esock_atom_undefined;
+                return xres;
+            }
+
+
+            {
+                ERL_NIF_TERM keys[] = {esock_atom_ifindex,
+                                       esock_atom_spec_dst,
+                                       esock_atom_addr};
+                ERL_NIF_TERM vals[] = {ifIndex, specDst, addr};
+                unsigned int numKeys = sizeof(keys) / sizeof(ERL_NIF_TERM);
+                unsigned int numVals = sizeof(vals) / sizeof(ERL_NIF_TERM);
+    
+                ESOCK_ASSERT( (numKeys == numVals) );
+                
+                if (!MKMA(env, keys, vals, numKeys, eCMsgHdrData)) {
+                    *eCMsgHdrData = esock_atom_undefined;
+                    return ESOCK_STR_EINVAL;
+                }
+            }
+        }
+        break;
+#endif
+
+#if defined(IP_ORIGDSTADDR)
+    case IP_ORIGDSTADDR:
+        if ((xres = esock_encode_sockaddr_in4(env,
+                                              (struct sockaddr_in*) dataP,
+                                              dataLen,
+                                              eCMsgHdrData)) != NULL) {
+            *eCMsgHdrData = esock_atom_undefined;
+            return xres;            
+        }
+        break;
+#endif
+
+    default:
+        *eCMsgHdrData = MKSBIN(env, ctrlBuf, dataPos, dataLen);
+        break;
+    }
+
+    return xres;
+}
+
+
+
+/* +++ encode_cmsghdr_data_ipv6 +++
+ *
+ * Encode the data part when protocol = IPv6 of the cmsghdr().
+ *
+ */
+#if defined(HAVE_IPV6)
+static
+char* encode_cmsghdr_data_ipv6(ErlNifEnv*     env,
+                               ERL_NIF_TERM   ctrlBuf,
+                               int            type,
+                               unsigned char* dataP,
+                               size_t         dataPos,
+                               size_t         dataLen,
+                               ERL_NIF_TERM*  eCMsgHdrData)
+{
+    switch (type) {
+#if defined(IPV6_PKTINFO)
+    case IPV6_PKTINFO:
+        {
+            struct in6_pktinfo* pktInfoP = (struct in6_pktinfo*) dataP;
+            ERL_NIF_TERM        ifIndex  = MKI(env, pktInfoP->ipi6_ifindex);
+            ERL_NIF_TERM        addr;
+            char*               xres;
+
+            if ((xres = esock_encode_ip6_address(env,
+                                                 &pktInfoP->ipi6_addr,
+                                                 &addr)) != NULL) {
+                *eCMsgHdrData = esock_atom_undefined;
+                return xres;
+            }
+
+            {
+                ERL_NIF_TERM keys[]  = {esock_atom_addr, esock_atom_ifindex};
+                ERL_NIF_TERM vals[]  = {addr, ifIndex};
+                unsigned int numKeys = sizeof(keys) / sizeof(ERL_NIF_TERM);
+                unsigned int numVals = sizeof(vals) / sizeof(ERL_NIF_TERM);
+    
+                ESOCK_ASSERT( (numKeys == numVals) );
+                
+                if (!MKMA(env, keys, vals, numKeys, eCMsgHdrData)) {
+                    *eCMsgHdrData = esock_atom_undefined;
+                    return ESOCK_STR_EINVAL;
+                }
+            }
+        }
+        break;
+#endif
+
+    default:
+        *eCMsgHdrData = MKSBIN(env, ctrlBuf, dataPos, dataLen);
+        break;
+    }
+
+    return NULL;
+}
+#endif
+
+
+
+/* +++ encode_msghdr_flags +++
+ *
+ * Encode a list of msghdr_flag().
+ *
+ * The following flags are handled: eor | trunc | ctrunc | oob | errqueue.
+ */
+
+extern
+char* encode_msghdr_flags(ErlNifEnv*       env,
+                          ESockDescriptor* descP,
+                          int              msgFlags,
+                          ERL_NIF_TERM*    flags)
+{
+    SSDBG( descP,
+           ("SOCKET", "encode_cmsghdrs_flags -> entry with"
+            "\r\n   msgFlags: %d (0x%lX)"
+            "\r\n", msgFlags, msgFlags) );
+
+    if (msgFlags == 0) {
+        *flags = MKEL(env);
+        return NULL;
+    } else {
+        SocketTArray ta = TARRAY_CREATE(10); // Just to be on the safe side
+
+#if defined(MSG_EOR)
+        if ((msgFlags & MSG_EOR) == MSG_EOR)
+            TARRAY_ADD(ta, esock_atom_eor);
+#endif
+
+#if defined(MSG_TRUNC)
+        if ((msgFlags & MSG_TRUNC) == MSG_TRUNC)
+            TARRAY_ADD(ta, esock_atom_trunc);
+#endif
+    
+#if defined(MSG_CTRUNC)
+        if ((msgFlags & MSG_CTRUNC) == MSG_CTRUNC)
+            TARRAY_ADD(ta, esock_atom_ctrunc);
+#endif
+    
+#if defined(MSG_OOB)
+        if ((msgFlags & MSG_OOB) == MSG_OOB)
+            TARRAY_ADD(ta, esock_atom_oob);
+#endif
+    
+#if defined(MSG_ERRQUEUE)
+        if ((msgFlags & MSG_ERRQUEUE) == MSG_ERRQUEUE)
+            TARRAY_ADD(ta, esock_atom_errqueue);
+#endif
+
+        SSDBG( descP,
+               ("SOCKET", "esock_encode_cmsghdrs -> flags processed when"
+                "\r\n   TArray size: %d"
+                "\r\n", TARRAY_SZ(ta)) );
+
+        TARRAY_TOLIST(ta, env, flags);
+
+        return NULL;
+    }
+}
+
+
+
+
+/* +++ decode the linger value +++
+ * The (socket) linger option is provided as a two tuple:
+ *
+ *       {OnOff :: boolean(), Time :: integer()}
+ *
+ */
+static
+BOOLEAN_T decode_sock_linger(ErlNifEnv* env, ERL_NIF_TERM eVal, struct linger* valP)
+{
+    const ERL_NIF_TERM* lt; // The array of the elements of the tuple
+    int                 sz; // The size of the tuple - should be 2
+    BOOLEAN_T           onOff;
+    int                 secs;
+
+    if (!GET_TUPLE(env, eVal, &sz, &lt))
+        return FALSE;
+
+    if (sz != 2)
+        return FALSE;
+
+
+    /* So fas so good - now check the two elements of the tuple. */
+
+    onOff = esock_decode_bool(lt[0]);
+
+    if (!GET_INT(env, lt[1], &secs))
+        return FALSE;
+
+    valP->l_onoff  = (onOff) ? 1 : 0;
+    valP->l_linger = secs;
+
+    return TRUE;
+}
+
+
+
+/* +++ decode the ip socket option TOS +++
+ * The (ip) option can be provide in two ways:
+ *
+ *           atom() | integer()
+ *
+ * When its an atom it can have the values:
+ *
+ *       lowdelay |  throughput | reliability | mincost
+ *
+ */
+#if defined(IP_TOS)
+static
+BOOLEAN_T decode_ip_tos(ErlNifEnv* env, ERL_NIF_TERM eVal, int* val)
+{
+    BOOLEAN_T result = FALSE;
+
+    if (IS_ATOM(env, eVal)) {
+
+        if (COMPARE(eVal, esock_atom_lowdelay) == 0) {
+            *val   = IPTOS_LOWDELAY;
+            result = TRUE;
+        } else if (COMPARE(eVal, esock_atom_throughput) == 0) {
+            *val   = IPTOS_THROUGHPUT;
+            result = TRUE;
+        } else if (COMPARE(eVal, esock_atom_reliability) == 0) {
+            *val   = IPTOS_RELIABILITY;
+            result = TRUE;
+#if defined(IPTOS_MINCOST)
+        } else if (COMPARE(eVal, esock_atom_mincost) == 0) {
+            *val   = IPTOS_MINCOST;
+            result = TRUE;
+#endif
+        } else {
+            *val   = -1;
+            result = FALSE;
+        }
+            
+    } else if (IS_NUM(env, eVal)) {
+
+        if (GET_INT(env, eVal, val)) {
+            result = TRUE;
+        } else {
+            *val   = -1;
+            result = FALSE;
+        }
+
+    } else {
+        *val   = -1;
+        result = FALSE;
+    }
+
+    return result;
+}
+#endif
+
+
+
+/* +++ decode the ip socket option MTU_DISCOVER +++
+ * The (ip) option can be provide in two ways:
+ *
+ *           atom() | integer()
+ *
+ * When its an atom it can have the values:
+ *
+ *       want | dont | do | probe
+ *
+ */
+#if defined(IP_MTU_DISCOVER)
+static
+char* decode_ip_pmtudisc(ErlNifEnv* env, ERL_NIF_TERM eVal, int* val)
+{
+    char* res = NULL;
+
+    if (IS_ATOM(env, eVal)) {
+
+        if (COMPARE(eVal, atom_want) == 0) {
+            *val = IP_PMTUDISC_WANT;
+        } else if (COMPARE(eVal, atom_dont) == 0) {
+            *val = IP_PMTUDISC_DONT;
+        } else if (COMPARE(eVal, atom_do) == 0) {
+            *val = IP_PMTUDISC_DO;
+#if defined(IP_PMTUDISC_PROBE)
+        } else if (COMPARE(eVal, atom_probe) == 0) {
+            *val = IP_PMTUDISC_PROBE;
+#endif
+        } else {
+            *val = -1;
+            res  = ESOCK_STR_EINVAL;
+        }
+
+    } else if (IS_NUM(env, eVal)) {
+
+        if (!GET_INT(env, eVal, val)) {
+            *val = -1;
+            res  = ESOCK_STR_EINVAL;
+        }
+
+    } else {
+
+        *val   = -1;
+        res  = ESOCK_STR_EINVAL;
+
+    }
+
+    return res;
+}
+#endif
+
+
+
+/* +++ decode the ipv6 socket option MTU_DISCOVER +++
+ * The (ip) option can be provide in two ways:
+ *
+ *           atom() | integer()
+ *
+ * When its an atom it can have the values:
+ *
+ *       want | dont | do | probe
+ *
+ */
+#if defined(IPV6_MTU_DISCOVER)
+static
+char* decode_ipv6_pmtudisc(ErlNifEnv* env, ERL_NIF_TERM eVal, int* val)
+{
+    char* res = NULL;
+
+    if (IS_ATOM(env, eVal)) {
+
+        if (COMPARE(eVal, atom_want) == 0) {
+            *val = IPV6_PMTUDISC_WANT;
+        } else if (COMPARE(eVal, atom_dont) == 0) {
+            *val = IPV6_PMTUDISC_DONT;
+        } else if (COMPARE(eVal, atom_do) == 0) {
+            *val = IPV6_PMTUDISC_DO;
+#if defined(IPV6_PMTUDISC_PROBE)
+        } else if (COMPARE(eVal, atom_probe) == 0) {
+            *val = IPV6_PMTUDISC_PROBE;
+#endif
+        } else {
+            *val = -1;
+            res  = ESOCK_STR_EINVAL;
+        }
+
+    } else if (IS_NUM(env, eVal)) {
+
+        if (!GET_INT(env, eVal, val)) {
+            *val = -1;
+            res  = ESOCK_STR_EINVAL;
+        }
+
+    } else {
+
+        *val   = -1;
+        res  = ESOCK_STR_EINVAL;
+
+    }
+
+    return res;
+}
+#endif
+
+
+
+/* +++ encode the ip socket option MTU_DISCOVER +++
+ * The (ip) option can be provide in two ways:
+ *
+ *           atom() | integer()
+ *
+ * If its one of the "known" values, it will be an atom:
+ *
+ *       want | dont | do | probe
+ *
+ */
+#if defined(IP_MTU_DISCOVER)
+static
+void encode_ip_pmtudisc(ErlNifEnv* env, int val, ERL_NIF_TERM* eVal)
+{
+    switch (val) {
+    case IP_PMTUDISC_WANT:
+        *eVal = atom_want;
+        break;
+
+    case IP_PMTUDISC_DONT:
+        *eVal = atom_dont;
+        break;
+
+    case IP_PMTUDISC_DO:
+        *eVal = atom_do;
+        break;
+
+#if defined(IP_PMTUDISC_PROBE)
+    case IP_PMTUDISC_PROBE:
+        *eVal = atom_probe;
+        break;
+#endif
+
+    default:
+        *eVal = MKI(env, val);
+        break;
+    }
+
+    return;
+}
+#endif
+
+
+
+/* +++ encode the ipv6 socket option MTU_DISCOVER +++
+ * The (ipv6) option can be provide in two ways:
+ *
+ *           atom() | integer()
+ *
+ * If its one of the "known" values, it will be an atom:
+ *
+ *       want | dont | do | probe
+ *
+ */
+#if defined(IPV6_MTU_DISCOVER)
+static
+void encode_ipv6_pmtudisc(ErlNifEnv* env, int val, ERL_NIF_TERM* eVal)
+{
+    switch (val) {
+    case IPV6_PMTUDISC_WANT:
+        *eVal = atom_want;
+        break;
+
+    case IPV6_PMTUDISC_DONT:
+        *eVal = atom_dont;
+        break;
+
+    case IPV6_PMTUDISC_DO:
+        *eVal = atom_do;
+        break;
+
+#if defined(IPV6_PMTUDISC_PROBE)
+    case IPV6_PMTUDISC_PROBE:
+        *eVal = atom_probe;
+        break;
+#endif
+
+    default:
+        *eVal = MKI(env, val);
+        break;
+    }
+
+    return;
+}
+#endif
+
+
+
+/* +++ decocde the native getopt option +++
+ * The option is in this case provide in the form of a two tuple:
+ *
+ *           {NativeOpt, ValueSize}
+ *
+ * NativeOpt :: integer()
+ * ValueSize :: int | bool | non_neg_integer()
+ *
+ */
+static
+BOOLEAN_T decode_native_get_opt(ErlNifEnv* env, ERL_NIF_TERM eVal,
+                                int* opt, Uint16* valueType, int* valueSz)
+{
+    const ERL_NIF_TERM* nativeOptT;
+    int                 nativeOptTSz;
+
+    /* First, get the tuple and verify its size (2) */
+
+    if (!GET_TUPLE(env, eVal, &nativeOptTSz, &nativeOptT))
+        return FALSE;
+
+    if (nativeOptTSz != 2)
+        return FALSE;
+
+    /* So far so good.
+     * First element is an integer.
+     * Second element is an atom or an integer.
+     * The only "types" that we support at the moment are:
+     *
+     *            bool - Which is actually a integer
+     *                   (but will be *returned* as a boolean())
+     *            int  - Just short for integer
+     */
+
+    if (!GET_INT(env, nativeOptT[0], opt))
+        return FALSE;
+
+    if (IS_ATOM(env, nativeOptT[1])) {
+
+        if (COMPARE(nativeOptT[1], atom_int) == 0) {
+            SGDBG( ("SOCKET", "decode_native_get_opt -> int\r\n") );
+            *valueType = ESOCK_OPT_VALUE_TYPE_INT;
+            *valueSz   = sizeof(int); // Just to be sure
+        } else if (COMPARE(nativeOptT[1], atom_bool) == 0) {
+            SGDBG( ("SOCKET", "decode_native_get_opt -> bool\r\n") );
+            *valueType = ESOCK_OPT_VALUE_TYPE_BOOL;
+            *valueSz   = sizeof(int); // Just to be sure
+        } else {
+            return FALSE;
+        }
+    } else if (IS_NUM(env, nativeOptT[1])) {
+        if (GET_INT(env, nativeOptT[1], valueSz)) {
+            SGDBG( ("SOCKET", "decode_native_get_opt -> unspec\r\n") );
+            *valueType = ESOCK_OPT_VALUE_TYPE_UNSPEC;
+        } else {
+            return FALSE;
+        }
+    } else {
+        return FALSE;
+    }
+
+    SGDBG( ("SOCKET", "decode_native_get_opt -> done\r\n") );
+
+    return TRUE;
+}
+
+
+
+/* +++ encode the ip socket option tos +++
+ * The (ip) option can be provide as:
+ *
+ *       lowdelay |  throughput | reliability | mincost | integer()
+ *
+ */
+static
+ERL_NIF_TERM encode_ip_tos(ErlNifEnv* env, int val)
+{
+    ERL_NIF_TERM result;
+
+    switch (IPTOS_TOS(val)) {
+    case IPTOS_LOWDELAY:
+        result = esock_make_ok2(env, esock_atom_lowdelay);
+        break;
+
+    case IPTOS_THROUGHPUT:
+        result = esock_make_ok2(env, esock_atom_throughput);
+        break;
+
+    case IPTOS_RELIABILITY:
+        result = esock_make_ok2(env, esock_atom_reliability);
+        break;
+
+#if defined(IPTOS_MINCOST)
+    case IPTOS_MINCOST:
+        result = esock_make_ok2(env, esock_atom_mincost);
+        break;
+#endif
+
+    default:
+        result = esock_make_ok2(env, MKI(env, val));
+        break;
+    }
+
+    return result;
+}
+
+
+
+
+
+/* *** alloc_descriptor ***
+ *
+ * Allocate and perform basic initialization of a socket descriptor.
+ *
+ */
+static
+ESockDescriptor* alloc_descriptor(SOCKET sock, HANDLE event)
+{
+    ESockDescriptor* descP;
+
+    if ((descP = enif_alloc_resource(esocks, sizeof(ESockDescriptor))) != NULL) {
+        char buf[64]; /* Buffer used for building the mutex name */
+
+        descP->pattern        = ESOCK_DESC_PATTERN_CREATED;
+
+        enif_set_pid_undefined(&descP->connPid);
+        MON_INIT(&descP->connMon);
+
+        sprintf(buf, "esock[w,%d]", sock);
+        descP->writeMtx       = MCREATE(buf);
+        enif_set_pid_undefined(&descP->currentWriter.pid);
+        MON_INIT(&descP->currentWriter.mon);
+        descP->currentWriter.env = NULL;
+        descP->currentWriter.ref = esock_atom_undefined;
+        descP->currentWriterP = NULL; // currentWriter not used
+        descP->writersQ.first = NULL;
+        descP->writersQ.last  = NULL;
+        descP->isWritable     = FALSE; // TRUE;
+        descP->writePkgCnt    = 0;
+        descP->writeByteCnt   = 0;
+        descP->writeTries     = 0;
+        descP->writeWaits     = 0;
+        descP->writeFails     = 0;
+
+        sprintf(buf, "esock[r,%d]", sock);
+        descP->readMtx        = MCREATE(buf);
+        enif_set_pid_undefined(&descP->currentReader.pid);
+        MON_INIT(&descP->currentReader.mon);
+        descP->currentReader.env = NULL;
+        descP->currentReader.ref = esock_atom_undefined;
+        descP->currentReaderP = NULL; // currentReader not used
+        descP->readersQ.first = NULL;
+        descP->readersQ.last  = NULL;
+        descP->isReadable     = FALSE; // TRUE;
+        descP->readPkgCnt     = 0;
+        descP->readByteCnt    = 0;
+        descP->readTries      = 0;
+        descP->readWaits      = 0;
+        descP->readFails      = 0;
+
+        sprintf(buf, "esock[acc,%d]", sock);
+        descP->accMtx           = MCREATE(buf);
+        enif_set_pid_undefined(&descP->currentAcceptor.pid);
+        MON_INIT(&descP->currentAcceptor.mon);
+        descP->currentAcceptor.env = NULL;
+        descP->currentAcceptor.ref = esock_atom_undefined;
+        descP->currentAcceptorP = NULL; // currentAcceptor not used
+        descP->acceptorsQ.first = NULL;
+        descP->acceptorsQ.last  = NULL;
+
+        sprintf(buf, "esock[close,%d]", sock);
+        descP->closeMtx         = MCREATE(buf);
+        descP->closeEnv         = NULL;
+        descP->closeRef         = esock_atom_undefined;
+        enif_set_pid_undefined(&descP->closerPid);
+        MON_INIT(&descP->closerMon);
+
+        sprintf(buf, "esock[cfg,%d]", sock);
+        descP->cfgMtx           = MCREATE(buf);
+        descP->rBufSz           = ESOCK_RECV_BUFFER_SIZE_DEFAULT;
+        descP->rNum             = 0;
+        descP->rNumCnt          = 0;
+        descP->rCtrlSz          = ESOCK_RECV_CTRL_BUFFER_SIZE_DEFAULT;
+        descP->wCtrlSz          = ESOCK_SEND_CTRL_BUFFER_SIZE_DEFAULT;
+        descP->iow              = FALSE;
+        descP->dbg              = ESOCK_DEBUG_DEFAULT;
+
+        descP->sock             = sock;
+        descP->event            = event;
+
+        enif_set_pid_undefined(&descP->ctrlPid);
+        MON_INIT(&descP->ctrlMon);
+
+    }
+
+    return descP;
+}
+
+
+
+/* Decrement counters for when a socket is closed
+ */
+static
+void dec_socket(int domain, int type, int protocol)
+{
+    MLOCK(data.cntMtx);
+
+    cnt_dec(&data.numSockets, 1);
+
+    /* *** Domain counter *** */
+    if (domain == AF_INET)
+        cnt_dec(&data.numDomainInet, 1);
+#if defined(HAVE_IN6) && defined(AF_INET6)
+    else if (domain == AF_INET6)
+        cnt_dec(&data.numDomainInet6, 1);
+#endif
+#if defined(HAVE_SYS_UN_H)
+    else if (domain == AF_UNIX)
+        cnt_dec(&data.numDomainInet6, 1);
+#endif
+
+    /* *** Type counter *** */
+    if (type == SOCK_STREAM)
+        cnt_dec(&data.numTypeStreams, 1);
+    else if (type == SOCK_DGRAM)
+        cnt_dec(&data.numTypeDGrams, 1);
+#ifdef HAVE_SCTP
+    else if (type == SOCK_SEQPACKET)
+        cnt_dec(&data.numTypeSeqPkgs, 1);
+#endif
+
+    /* *** Protocol counter *** */
+    if (protocol == IPPROTO_IP)
+        cnt_dec(&data.numProtoIP, 1);
+    else if (protocol == IPPROTO_TCP)
+        cnt_dec(&data.numProtoTCP, 1);
+    else if (protocol == IPPROTO_UDP)
+        cnt_dec(&data.numProtoUDP, 1);
+#if defined(HAVE_SCTP)
+    else if (protocol == IPPROTO_SCTP)
+        cnt_dec(&data.numProtoSCTP, 1);
+#endif
+
+    MUNLOCK(data.cntMtx);
+}
+
+
+/* Increment counters for when a socket is opened
+ */
+static
+void inc_socket(int domain, int type, int protocol)
+{
+    MLOCK(data.cntMtx);
+
+    cnt_inc(&data.numSockets, 1);
+    
+    /* *** Domain counter *** */
+    if (domain == AF_INET)
+        cnt_inc(&data.numDomainInet, 1);
+#if defined(HAVE_IN6) && defined(AF_INET6)
+    else if (domain == AF_INET6)
+        cnt_inc(&data.numDomainInet6, 1);
+#endif
+#if defined(HAVE_SYS_UN_H)
+    else if (domain == AF_UNIX)
+        cnt_inc(&data.numDomainInet6, 1);
+#endif
+
+    /* *** Type counter *** */
+    if (type == SOCK_STREAM)
+        cnt_inc(&data.numTypeStreams, 1);
+    else if (type == SOCK_DGRAM)
+        cnt_inc(&data.numTypeDGrams, 1);
+#ifdef HAVE_SCTP
+    else if (type == SOCK_SEQPACKET)
+        cnt_inc(&data.numTypeSeqPkgs, 1);
+#endif
+
+    /* *** Protocol counter *** */
+    if (protocol == IPPROTO_IP)
+        cnt_inc(&data.numProtoIP, 1);
+    else if (protocol == IPPROTO_TCP)
+        cnt_inc(&data.numProtoTCP, 1);
+    else if (protocol == IPPROTO_UDP)
+        cnt_inc(&data.numProtoUDP, 1);
+#if defined(HAVE_SCTP)
+    else if (protocol == IPPROTO_SCTP)
+        cnt_inc(&data.numProtoSCTP, 1);
+#endif
+
+    MUNLOCK(data.cntMtx);
+}
+
+
+#endif // if !defined(__WIN32__)
+
+
+
+/* ----------------------------------------------------------------------
+ *  D e c o d e / E n c o d e   F u n c t i o n s
+ * ----------------------------------------------------------------------
+ */
+
+/* edomain2domain - convert internal (erlang) domain to (proper) domain
+ *
+ * Note that only a subset is supported.
+ */
+#if !defined(__WIN32__)
+static
+BOOLEAN_T edomain2domain(int edomain, int* domain)
+{
+    switch (edomain) {
+    case ESOCK_DOMAIN_INET:
+        *domain = AF_INET;
+        break;
+
+#if defined(HAVE_IN6) && defined(AF_INET6)
+    case ESOCK_DOMAIN_INET6:
+        *domain = AF_INET6;
+        break;
+#endif
+#ifdef HAVE_SYS_UN_H
+    case ESOCK_DOMAIN_LOCAL:
+        *domain = AF_UNIX;
+        break;
+#endif
+
+    default:
+        *domain = -1;
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+
+/* etype2type - convert internal (erlang) type to (proper) type
+ *
+ * Note that only a subset is supported.
+ */
+static
+BOOLEAN_T etype2type(int etype, int* type)
+{
+    switch (etype) {
+    case ESOCK_TYPE_STREAM:
+        *type = SOCK_STREAM;
+        break;
+
+    case ESOCK_TYPE_DGRAM:
+        *type = SOCK_DGRAM;
+        break;
+
+    case ESOCK_TYPE_RAW:
+        *type = SOCK_RAW;
+        break;
+
+#ifdef HAVE_SCTP    
+    case ESOCK_TYPE_SEQPACKET:
+        *type = SOCK_SEQPACKET;
+        break;
+#endif
+
+    default:
+        *type = -1;
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+
+/* eproto2proto - convert internal (erlang) protocol to (proper) protocol
+ *
+ * Note that only a subset is supported.
+ */
+static
+BOOLEAN_T eproto2proto(ErlNifEnv*   env,
+                       ERL_NIF_TERM eproto,
+                       int*         proto)
+{
+    if (IS_NUM(env, eproto)) {
+        int ep;
+
+        if (!GET_INT(env, eproto, &ep)) {
+            *proto = -1;
+            return FALSE;
+        }
+
+        switch (ep) {
+        case ESOCK_PROTOCOL_DEFAULT:
+            *proto = 0; // default - note that _IP also has the value 0...
+            break;
+            
+        case ESOCK_PROTOCOL_IP:
+            *proto = IPPROTO_IP;
+            break;
+            
+        case ESOCK_PROTOCOL_TCP:
+            *proto = IPPROTO_TCP;
+            break;
+            
+        case ESOCK_PROTOCOL_UDP:
+            *proto = IPPROTO_UDP;
+            break;
+            
+#if defined(HAVE_SCTP)
+        case ESOCK_PROTOCOL_SCTP:
+            *proto = IPPROTO_SCTP;
+            break;
+#endif
+            
+        case ESOCK_PROTOCOL_ICMP:
+            *proto = IPPROTO_ICMP;
+            break;
+            
+        case ESOCK_PROTOCOL_IGMP:
+            *proto = IPPROTO_IGMP;
+            break;
+            
+        default:
+            *proto = -2;
+            return FALSE;
+        }
+    } else {
+        const ERL_NIF_TERM* a;
+        int                 sz;
+
+        if (!GET_TUPLE(env, eproto, &sz, &a)) {
+            *proto = -3;
+            return FALSE;
+        }
+        
+        if (sz != 2) {
+            *proto = -4;
+            return FALSE;
+        }
+
+        if (COMPARE(a[0], esock_atom_raw) != 0) {
+            *proto = -5;
+            return FALSE;
+        }
+
+        if (!GET_INT(env, a[1], proto)) {
+            *proto = -6;
+            return FALSE;
+        }
+    }
+
+    return TRUE;
+}
+
+
+#ifdef HAVE_SETNS
+ /* emap2netns - extract the netns field from the extra map
+ *
+ * Note that currently we only support one extra option, the netns.
+ */
+static
+BOOLEAN_T emap2netns(ErlNifEnv* env, ERL_NIF_TERM map, char** netns)
+{
+    size_t       sz;
+    ERL_NIF_TERM key;
+    ERL_NIF_TERM value;
+    unsigned int len;
+    char*        buf;
+    int          written;
+
+    /* Note that its acceptable that the extra map is empty */
+    if (!enif_get_map_size(env, map, &sz) ||
+        (sz != 1)) {
+        *netns = NULL;
+        return TRUE;
+    }
+
+    /* The currently only supported extra option is:  netns */
+    key = enif_make_atom(env, "netns");
+    if (!GET_MAP_VAL(env, map, key, &value)) {
+        *netns = NULL; // Just in case...
+        return FALSE;
+    }
+
+    /* So far so good. The value should be a string, check. */
+    if (!enif_is_list(env, value)) {
+        *netns = NULL; // Just in case...
+        return FALSE;
+    }
+
+    if (!enif_get_list_length(env, value, &len)) {
+        *netns = NULL; // Just in case...
+        return FALSE;
+    }
+
+    if ((buf = MALLOC(len+1)) == NULL) {
+        *netns = NULL; // Just in case...
+        return FALSE;
+    }
+
+    written = enif_get_string(env, value, buf, len+1, ERL_NIF_LATIN1);
+    if (written == (len+1)) {
+        *netns = buf;
+        return TRUE;
+    } else {
+        *netns = NULL; // Just in case...
+        return FALSE;
+    }
+}
+#endif
+
+
+/* esendflags2sendflags - convert internal (erlang) send flags to (proper)
+ * send flags.
+ */
+static
+BOOLEAN_T esendflags2sendflags(unsigned int eflags, int* flags)
+{
+    unsigned int ef;
+    int          tmp = 0;
+
+    /* First, check if we have any flags at all */
+    if (eflags == 0) {
+        *flags = 0;
+        return TRUE;
+    }
+        
+    for (ef = ESOCK_SEND_FLAG_LOW; ef <= ESOCK_SEND_FLAG_HIGH; ef++) {
+
+        switch (ef) {
+#if defined(MSG_CONFIRM)
+        case ESOCK_SEND_FLAG_CONFIRM:
+            if ((1 << ESOCK_SEND_FLAG_CONFIRM) & eflags)
+                tmp |= MSG_CONFIRM;
+            break;
+#endif
+
+#if defined(MSG_DONTROUTE)
+        case ESOCK_SEND_FLAG_DONTROUTE:
+            if ((1 << ESOCK_SEND_FLAG_DONTROUTE) & eflags)
+                tmp |= MSG_DONTROUTE;
+            break;
+#endif
+
+#if defined(MSG_EOR)
+        case ESOCK_SEND_FLAG_EOR:
+            if ((1 << ESOCK_SEND_FLAG_EOR) & eflags)
+                tmp |= MSG_EOR;
+            break;
+#endif
+
+#if defined(MSG_MORE)
+        case ESOCK_SEND_FLAG_MORE:
+            if ((1 << ESOCK_SEND_FLAG_MORE) & eflags)
+                tmp |= MSG_MORE;
+            break;
+#endif
+
+#if defined(MSG_NOSIGNAL)
+        case ESOCK_SEND_FLAG_NOSIGNAL:
+            if ((1 << ESOCK_SEND_FLAG_NOSIGNAL) & eflags)
+                tmp |= MSG_NOSIGNAL;
+            break;
+#endif
+
+#if defined(MSG_OOB)
+        case ESOCK_SEND_FLAG_OOB:
+            if ((1 << ESOCK_SEND_FLAG_OOB) & eflags)
+                tmp |= MSG_OOB;
+            break;
+#endif
+
+        default:
+            return FALSE;
+        }
+
+    }
+
+    *flags = tmp;
+
+    return TRUE;
+}
+
+
+
+/* erecvflags2recvflags - convert internal (erlang) send flags to (proper)
+ * send flags.
+ */
+static
+BOOLEAN_T erecvflags2recvflags(unsigned int eflags, int* flags)
+{
+    unsigned int ef;
+    int          tmp = 0;
+
+    SGDBG( ("SOCKET", "erecvflags2recvflags -> entry with"
+            "\r\n   eflags: %d"
+            "\r\n", eflags) );
+
+    if (eflags == 0) {
+        *flags = 0;
+        return TRUE;
+    }
+
+    for (ef = ESOCK_RECV_FLAG_LOW; ef <= ESOCK_RECV_FLAG_HIGH; ef++) {
+
+        SGDBG( ("SOCKET", "erecvflags2recvflags -> iteration"
+                "\r\n   ef:  %d"
+                "\r\n   tmp: %d"
+                "\r\n", ef, tmp) );
+
+        switch (ef) {
+#if defined(MSG_CMSG_CLOEXEC)
+        case ESOCK_RECV_FLAG_CMSG_CLOEXEC:
+            if ((1 << ESOCK_RECV_FLAG_CMSG_CLOEXEC) & eflags)
+                tmp |= MSG_CMSG_CLOEXEC;
+            break;
+#endif
+
+#if defined(MSG_ERRQUEUE)
+        case ESOCK_RECV_FLAG_ERRQUEUE:
+            if ((1 << ESOCK_RECV_FLAG_ERRQUEUE) & eflags)
+                tmp |= MSG_ERRQUEUE;
+            break;
+#endif
+
+#if defined(MSG_OOB)
+        case ESOCK_RECV_FLAG_OOB:
+            if ((1 << ESOCK_RECV_FLAG_OOB) & eflags)
+                tmp |= MSG_OOB;
+            break;
+#endif
+
+            /*
+             * <KOLLA>
+             *
+             * We need to handle this, because it may effect the read algorithm
+             *
+             * </KOLLA>
+             */
+#if defined(MSG_PEEK)
+        case ESOCK_RECV_FLAG_PEEK:
+            if ((1 << ESOCK_RECV_FLAG_PEEK) & eflags)
+                tmp |= MSG_PEEK;
+            break;
+#endif
+
+#if defined(MSG_TRUNC)
+        case ESOCK_RECV_FLAG_TRUNC:
+            if ((1 << ESOCK_RECV_FLAG_TRUNC) & eflags)
+                tmp |= MSG_TRUNC;
+            break;
+#endif
+
+        default:
+            return FALSE;
+        }
+
+    }
+
+    *flags = tmp;
+
+    return TRUE;
+}
+
+
+
+/* eproto2proto - convert internal (erlang) protocol to (proper) protocol
+ *
+ * Note that only a subset is supported.
+ */
+static
+BOOLEAN_T ehow2how(unsigned int ehow, int* how)
+{
+     switch (ehow) {
+     case ESOCK_SHUTDOWN_HOW_RD:
+         *how = SHUT_RD;
+         break;
+
+     case ESOCK_SHUTDOWN_HOW_WR:
+         *how = SHUT_WR;
+         break;
+
+     case ESOCK_SHUTDOWN_HOW_RDWR:
+         *how = SHUT_RDWR;
+         break;
+
+     default:
+         return FALSE;
+     }
+
+     return TRUE;
+}
+
+
+
+/* ecommand2command - convert erlang command to "native" command (and data)
+ */
+static
+BOOLEAN_T ecommand2command(ErlNifEnv*    env,
+                           ERL_NIF_TERM  ecommand,
+                           Uint16*       command,
+                           ERL_NIF_TERM* edata)
+{
+    size_t       sz;
+    ERL_NIF_TERM ecmd;
+
+    if (!IS_MAP(env, ecommand)) {
+        SGDBG( ("SOCKET", "ecommand2command -> (e)command not a map\r\n") );
+        return FALSE;
+    }
+
+    /* The map shall have exactly two attrbutes: 
+     *          'command' and 'data'
+     */
+    if (!enif_get_map_size(env, ecommand, &sz) || (sz != 2)) {
+        SGDBG( ("SOCKET", "ecommand2command -> comamnd map size invalid\r\n") );
+        return FALSE;
+    }
+
+    /* Get the command value, and transform into integer
+     * (might as well do that, since theer is no point in
+     *  extracting the data if command is invalid).
+     */
+    if (!GET_MAP_VAL(env, ecommand, esock_atom_command, &ecmd)) {
+        SGDBG( ("SOCKET", "ecommand2command -> command attribute not found\r\n") );
+        return FALSE;
+    }
+    if (COMPARE(ecmd, esock_atom_debug) == 0) {
+        *command = ESOCK_CMD_DEBUG;
+    } else {
+        SGDBG( ("SOCKET", "ecommand2command -> unknown command %T\r\n", ecmd) );
+        return FALSE;
+    }
+
+    /* Get the command data value, we do *not* convert it to 
+     * the native form (here) since it may "in theory" be complex.
+     */
+    if (!GET_MAP_VAL(env, ecommand, esock_atom_data, edata)) {
+        SGDBG( ("SOCKET", "ecommand2command -> (command) data not found\r\n") );
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+
+
+
+#if defined(HAVE_SYS_UN_H) || defined(SO_BINDTODEVICE)
+/* strnlen doesn't exist everywhere */
+/*
+static
+size_t my_strnlen(const char *s, size_t maxlen)
+{
+    size_t i = 0;
+    while (i < maxlen && s[i] != '\0')
+        i++;
+    return i;
+}
+*/
+#endif
+
+
+/* Send an counter wrap message to the controlling process:
+ * A message in the form:
+ *
+ *     {'$socket', Socket, counter_wrap, Counter :: atom()}
+ *
+ * This message will only be sent if the iow (Inform On Wrap) is TRUE.
+ */
+static
+char* esock_send_wrap_msg(ErlNifEnv*       env,
+                          ESockDescriptor* descP,
+                          ERL_NIF_TERM     sockRef,
+                          ERL_NIF_TERM     cnt)
+{
+    ERL_NIF_TERM msg = mk_wrap_msg(env, sockRef, cnt);
+    
+    return esock_send_msg(env, &descP->ctrlPid, msg, NULL);
+}
+
+
+/* Send an close message to the specified process:
+ * A message in the form:
+ *
+ *     {'$socket', Socket, close, CloseRef}
+ *
+ * This message is for processes that is waiting in the
+ * erlang API (close-) function for the socket to be "closed"
+ * (actually that the 'stop' callback function has been called).
+ */
+static
+char* esock_send_close_msg(ErlNifEnv*       env,
+                           ESockDescriptor* descP,
+                           ErlNifPid*       pid)
+{
+    ERL_NIF_TERM sockRef, msg;
+    ErlNifEnv*   menv;
+    
+    if (descP->closeEnv != NULL) {
+        sockRef = enif_make_resource(descP->closeEnv, descP);
+        msg     = mk_close_msg(descP->closeEnv, sockRef, descP->closeRef);
+        menv    = descP->closeEnv;
+    } else {
+        sockRef = enif_make_resource(env, descP);
+        msg     = mk_close_msg(env, sockRef, descP->closeRef);
+        menv    = NULL; // This has the effect that the message will be copied
+    }
+    
+    return esock_send_msg(env, pid, msg, menv);
+}
+
+
+/* Send an abort message to the specified process:
+ * A message in the form:
+ *
+ *     {'$socket', Socket, abort, {RecvRef, Reason}}
+ *
+ * This message is for processes that is waiting in the
+ * erlang API functions for a select message.
+ */
+static
+char* esock_send_abort_msg(ErlNifEnv*   env,
+                           ERL_NIF_TERM sockRef,
+                           ERL_NIF_TERM opRef,
+                           ErlNifEnv*   msgEnv,
+                           ERL_NIF_TERM reason,
+                           ErlNifPid*   pid)
+{
+    ERL_NIF_TERM msg = mk_abort_msg(msgEnv,
+                                    /* sockRef not in msgEnv so copy */
+                                    CP_TERM(msgEnv, sockRef),
+                                    opRef, reason);
+
+    return esock_send_msg(env, pid, msg, msgEnv);
+}
+
+
+/* Send a message to the specified process.
+ */
+static
+char* esock_send_msg(ErlNifEnv*   env,
+                     ErlNifPid*   pid,
+                     ERL_NIF_TERM msg,
+                     ErlNifEnv*   msgEnv)
+{
+    int res = enif_send(env, pid, msgEnv, msg);
+    if (msgEnv)
+        esock_free_env("esock_msg_send - msg-env", msgEnv);
+
+    if (!res)
+        return str_exsend;
+    else
+        return NULL;
+}
+
+
+
+/* *** mk_abort_msg ***
+ *
+ * Create the abort message, which has the following form:
+ *
+ *     {'$socket', Socket, abort, {OpRef, Reason}}
+ *
+ * This message is for processes that are waiting in the
+ * erlang API functions for a select (or this) message.
+ */
+static
+ERL_NIF_TERM mk_abort_msg(ErlNifEnv*   env,
+                          ERL_NIF_TERM sockRef,
+                          ERL_NIF_TERM opRef,
+                          ERL_NIF_TERM reason)
+{
+    ERL_NIF_TERM info = MKT2(env, opRef, reason);
+    
+    return mk_socket_msg(env, sockRef, esock_atom_abort, info);
+}
+
+
+/* *** mk_wrap_msg ***
+ *
+ * Construct a counter wrap (socket) message. It has the form: 
+ *
+ *         {'$socket', Socket, counter_wrap, Counter}
+ *
+ */
+static
+ERL_NIF_TERM mk_wrap_msg(ErlNifEnv*   env,
+                         ERL_NIF_TERM sockRef,
+                         ERL_NIF_TERM cnt)
+{
+    return mk_socket_msg(env, sockRef, atom_counter_wrap, cnt);
+}
+
+
+/* *** mk_close_msg ***
+ *
+ * Construct a close (socket) message. It has the form: 
+ *
+ *         {'$socket', Socket, close, closeRef}
+ *
+ */
+static
+ERL_NIF_TERM mk_close_msg(ErlNifEnv*   env,
+                          ERL_NIF_TERM sockRef,
+                          ERL_NIF_TERM closeRef)
+{
+    return mk_socket_msg(env, sockRef, esock_atom_close, closeRef);
+}
+
+
+/* *** mk_select_msg ***
+ *
+ * Construct a select (socket) message. It has the form: 
+ *
+ *         {'$socket', Socket, select, selectRef}
+ *
+ */
+static
+ERL_NIF_TERM mk_select_msg(ErlNifEnv*   env,
+                           ERL_NIF_TERM sockRef,
+                           ERL_NIF_TERM selectRef)
+{
+    return mk_socket_msg(env, sockRef, atom_select, selectRef);
+}
+
+
+/* *** mk_socket_msg ***
+ *
+ * Construct the socket message:
+ *
+ *         {'$socket', Socket, Tag, Info}
+ *
+ * Socket :: socket() (#socket{})
+ * Tag    :: atom()
+ * Info   :: term()
+ *
+ */
+static
+ERL_NIF_TERM mk_socket_msg(ErlNifEnv*   env,
+                           ERL_NIF_TERM sockRef,
+                           ERL_NIF_TERM tag,
+                           ERL_NIF_TERM info)
+{
+    ERL_NIF_TERM socket = mk_socket(env, sockRef);
+
+    return MKT4(env, esock_atom_socket_tag, socket, tag, info);
+}
+
+
+/* *** mk_socket ***
+ *
+ * Simple utility function that construct the socket resord:
+ *
+ *      #socket{ref = SockRef} => {socket, SockRef :: reference()}
+ */
+static
+ERL_NIF_TERM mk_socket(ErlNifEnv*   env,
+                       ERL_NIF_TERM sockRef)
+{
+    return MKT2(env, esock_atom_socket, sockRef);
+}
+
+#endif // #if defined(__WIN32__)
+
+                              
+/* ----------------------------------------------------------------------
+ *  S e l e c t   W r a p p e r   F u n c t i o n s
+ * ----------------------------------------------------------------------
+ */
+
+/* *** esock_select_read ***
+ *
+ * Perform a read select. When the select is triggered, a 'select'
+ * message (see mk_select_msg) will be sent.
+ *
+ * There are two ways to handle the select message:
+ * 1) Create "your own" environment and create the message using it
+ *    and then pass it on to the select function.
+ * 2) Or, to create the message using any available environment,
+ *    and then pass a NULL pointer to the select function.
+ *    This will have the effect that the select function will 
+ *    create its own environment and then copy the message to it.
+ * We choose the second alternative.
+ */
+static
+int esock_select_read(ErlNifEnv*       env,
+                      ErlNifEvent      event,     // The file descriptor
+                      void*            obj,       // The socket descriptor object
+                      const ErlNifPid* pid,       // Destination
+                      ERL_NIF_TERM     sockRef,   // Socket
+                      ERL_NIF_TERM     selectRef) // "ID" of the operation
+{
+    ERL_NIF_TERM selectMsg = mk_select_msg(env, sockRef, selectRef);
+
+    return enif_select_read(env, event, obj, pid, selectMsg, NULL);
+
+}
+
+
+/* *** esock_select_write ***
+ *
+ * Perform a write select. When the select is triggered, a 'select'
+ * message (see mk_select_msg) will be sent.
+ * The sockRef is copied to the msgEnv when the socket message is created,
+ * so no need to do that here, but the selectRef needs to be copied.
+ */
+static
+int esock_select_write(ErlNifEnv*       env,
+                       ErlNifEvent      event,     // The file descriptor
+                       void*            obj,       // The socket descriptor
+                       const ErlNifPid* pid,       // Destination
+                       ERL_NIF_TERM     sockRef,   // Socket
+                       ERL_NIF_TERM     selectRef) // "ID" of the operation
+{
+    ERL_NIF_TERM selectMsg = mk_select_msg(env, sockRef, selectRef);
+
+    return enif_select_write(env, event, obj, pid, selectMsg, NULL);
+}
+
+
+static
+int esock_select_stop(ErlNifEnv*  env,
+                      ErlNifEvent event,
+                      void*       obj)
+{
+    return enif_select(env, event, (ERL_NIF_SELECT_STOP), obj, NULL,
+                       esock_atom_undefined);
+}
+
+static
+int esock_select_cancel(ErlNifEnv*             env,
+                        ErlNifEvent            event,
+                        enum ErlNifSelectFlags mode,
+                        void*                  obj)
+{
+    return enif_select(env, event, (ERL_NIF_SELECT_CANCEL | mode), obj, NULL,
+                       esock_atom_undefined);
+}
+
+
+/* ----------------------------------------------------------------------
+ *  A c t i v a t e   N e x t   ( o p e r a t o r )   F u n c t i o n s
+ * ----------------------------------------------------------------------
+ */
+
+/* *** activate_next_acceptor ***
+ * *** activate_next_writer   ***
+ * *** activate_next_reader   ***
+ *
+ * This functions pops the requestors queue and then selects until it 
+ * manages to successfully activate a requestor or the queue is empty.
+ * Return value indicates if a new requestor was activated or not.
+ */
+
+#if !defined(__WIN32__)
+
+#define ACTIVATE_NEXT_FUNCS                                               \
+    ACTIVATE_NEXT_FUNC_DECL(acceptor, read,  currentAcceptor, acceptorsQ) \
+    ACTIVATE_NEXT_FUNC_DECL(writer,   write, currentWriter,   writersQ)   \
+    ACTIVATE_NEXT_FUNC_DECL(reader,   read,  currentReader,   readersQ)
+
+#define ACTIVATE_NEXT_FUNC_DECL(F, S, R, Q)                  \
+    static                                                   \
+    BOOLEAN_T activate_next_##F(ErlNifEnv*       env,        \
+                                ESockDescriptor* descP,      \
+                                ERL_NIF_TERM     sockRef)    \
+    {                                                        \
+        BOOLEAN_T          popped, activated;                \
+        int                sres;                             \
+        ERL_NIF_TERM       reason;                           \
+        ESockRequestor*    reqP = &descP->R;                 \
+        ESockRequestQueue* q    = &descP->Q;                 \
+                                                             \
+        popped = FALSE;                                      \
+        do {                                                 \
+                                                             \
+            if (requestor_pop(q, reqP)) {                    \
+                                                             \
+                /* There was another one */                  \
+                                                             \
+                SSDBG( descP,                                \
+                       ("SOCKET",                                       \
+                        "activate_next_" #F " -> new (active) requestor: " \
+                        "\r\n   pid: %T"                                \
+                        "\r\n   ref: %T"                                \
+                        "\r\n", reqP->pid, reqP->ref) );                \
+                                                                        \
+                /* We need to copy req ref to 'env' */                  \
+                if ((sres = esock_select_##S(env, descP->sock, descP,   \
+                                             &reqP->pid, sockRef,       \
+                                             CP_TERM(env, reqP->ref))) < 0) { \
+                                                                        \
+                    /* We need to inform this process, reqP->pid,  */   \
+                    /* that we failed to select, so we don't leave */   \
+                    /* it hanging.                                 */   \
+                    /* => send abort                               */   \
+                                                                        \
+                    reason = MKT2(env,                                  \
+                                  esock_atom_select_failed,             \
+                                  MKI(env, sres));                      \
+                    esock_send_abort_msg(env, sockRef,                  \
+                                         reqP->ref, reqP->env,          \
+                                         reason, &reqP->pid);           \
+                    reqP->env = NULL;                                  \
+                                                                        \
+                } else {                                                \
+                                                                        \
+                    /* Success: New requestor selected */               \
+                    popped    = TRUE;                                   \
+                    activated = FALSE;                                  \
+                                                                        \
+                }                                                       \
+                                                                        \
+            } else {                                                    \
+                                                                        \
+                SSDBG( descP,                                           \
+                       ("SOCKET",                                       \
+                        "activate_next_" #F " -> no more requestors\r\n") ); \
+                                                                        \
+                popped    = TRUE;                                       \
+                activated = FALSE;                                      \
+            }                                                           \
+                                                                        \
+        } while (!popped);                                              \
+                                                                        \
+        SSDBG( descP,                                                   \
+               ("SOCKET", "activate_next_" #F " -> "                    \
+                "done with %s\r\n", B2S(activated)) );                  \
+                                                                        \
+        return activated;                                               \
+    }
+ACTIVATE_NEXT_FUNCS
+#undef ACTIVATE_NEXT_FUNC_DECL
+
+
+#endif // if !defined(__WIN32__)
+
+
+/* ----------------------------------------------------------------------
+ *  R e q u e s t o r   Q u e u e   F u n c t i o n s
+ * ----------------------------------------------------------------------
+ *
+ * Since each of these functions (search4pid, push, pop and unqueue
+ * are virtually identical for acceptors, writers and readers, 
+ * we make use of set of declaration macros.
+ */
+
+#if !defined(__WIN32__)
+
+/* *** acceptor_search4pid ***
+ * *** writer_search4pid   ***
+ * *** reader_search4pid   ***
+ *
+ * Search for a pid in the requestor (acceptor, writer, or reader) queue.
+ *
+ */
+
+#define REQ_SEARCH4PID_FUNCS                       \
+    REQ_SEARCH4PID_FUNC_DECL(acceptor, acceptorsQ) \
+    REQ_SEARCH4PID_FUNC_DECL(writer,   writersQ)   \
+    REQ_SEARCH4PID_FUNC_DECL(reader,   readersQ)
+
+#define REQ_SEARCH4PID_FUNC_DECL(F, Q)                 \
+    static                                             \
+    BOOLEAN_T F##_search4pid(ErlNifEnv*       env,     \
+                             ESockDescriptor* descP,   \
+                             ErlNifPid*       pid)     \
+    {                                                  \
+        return qsearch4pid(env, &descP->Q, pid);       \
+    }
+REQ_SEARCH4PID_FUNCS
+#undef REQ_SEARCH4PID_FUNC_DECL
+
+
+
+/* *** acceptor_push ***
+ * *** writer_push   ***
+ * *** reader_push   ***
+ *
+ * Push a requestor (acceptor, writer, or reader) onto its queue.
+ * This happens when we already have a current request (of its type).
+ *
+ */
+
+#define REQ_PUSH_FUNCS                       \
+    REQ_PUSH_FUNC_DECL(acceptor, acceptorsQ) \
+    REQ_PUSH_FUNC_DECL(writer,   writersQ)   \
+    REQ_PUSH_FUNC_DECL(reader,   readersQ)
+
+#define REQ_PUSH_FUNC_DECL(F, Q)                                       \
+    static                                                             \
+    ERL_NIF_TERM F##_push(ErlNifEnv*       env,                        \
+                          ESockDescriptor* descP,                      \
+                          ErlNifPid        pid,                        \
+                          ERL_NIF_TERM     ref)                        \
+    {                                                                  \
+        ESockRequestQueueElement* e    = MALLOC(sizeof(ESockRequestQueueElement)); \
+        ESockRequestor*           reqP = &e->data;                     \
+                                                                       \
+        reqP->pid = pid;                                               \
+        if (MONP("reader_push -> " #F " request",                      \
+                 env, descP, &pid, &reqP->mon) != 0) {                 \
+            FREE(e);                                                   \
+            return esock_make_error(env, atom_exmon);                  \
+        }                                                              \
+        reqP->env = esock_alloc_env(#F "_push");                                  \
+        reqP->ref = enif_make_copy(reqP->env, ref);                    \
+                                                                       \
+        qpush(&descP->Q, e);                                           \
+                                                                       \
+        return esock_make_error(env, esock_atom_eagain);               \
+    }
+REQ_PUSH_FUNCS
+#undef REQ_PUSH_FUNC_DECL
+
+
+
+/* *** acceptor_pop ***
+ * *** writer_pop   ***
+ * *** reader_pop   ***
+ *
+ * Pop a requestor (acceptor, writer, or reader) from its queue.
+ *
+ */
+#define REQ_POP_FUNCS                       \
+    REQ_POP_FUNC_DECL(acceptor, acceptorsQ) \
+    REQ_POP_FUNC_DECL(writer,   writersQ)   \
+    REQ_POP_FUNC_DECL(reader,   readersQ)
+
+#define REQ_POP_FUNC_DECL(F, Q)                \
+    static                                     \
+    BOOLEAN_T F##_pop(ErlNifEnv*       env,    \
+                      ESockDescriptor* descP,  \
+                      ESockRequestor*  reqP)   \
+    {                                          \
+        return requestor_pop(&descP->Q, reqP); \
+    }
+REQ_POP_FUNCS
+#undef REQ_POP_FUNC_DECL
+
+
+
+/* *** acceptor_unqueue ***
+ * *** writer_unqueue   ***
+ * *** reader_unqueue   ***
+ *
+ * Remove a requestor (acceptor, writer, or reader) from its queue.
+ *
+ */
+
+#define REQ_UNQUEUE_FUNCS                       \
+    REQ_UNQUEUE_FUNC_DECL(acceptor, acceptorsQ) \
+    REQ_UNQUEUE_FUNC_DECL(writer,   writersQ)   \
+    REQ_UNQUEUE_FUNC_DECL(reader,   readersQ)
+
+#define REQ_UNQUEUE_FUNC_DECL(F, Q)                            \
+    static                                                     \
+    BOOLEAN_T F##_unqueue(ErlNifEnv*       env,                \
+                          ESockDescriptor* descP,              \
+                          const ErlNifPid* pid)                \
+    {                                                          \
+        return qunqueue(env, descP, "qunqueue -> waiting " #F, \
+                        &descP->Q, pid);                       \
+    }
+REQ_UNQUEUE_FUNCS
+#undef REQ_UNQUEUE_FUNC_DECL
+
+
+
+/* *** requestor pop ***
+ *
+ * Pop an requestor from its queue.
+ */
+static
+BOOLEAN_T requestor_pop(ESockRequestQueue* q,
+                        ESockRequestor*    reqP)
+{
+    ESockRequestQueueElement* e = qpop(q);
+
+    if (reqP->env)
+        esock_free_env("requestor_pop", reqP->env);
+
+    if (e != NULL) {
+        reqP->pid = e->data.pid;
+        reqP->mon = e->data.mon;
+        reqP->env = e->data.env;
+        reqP->ref = e->data.ref;
+        FREE(e);
+        return TRUE;
+    } else {
+        /* Queue was empty */
+        enif_set_pid_undefined(&reqP->pid);
+        MON_INIT(&reqP->mon);
+        reqP->env = NULL;
+        reqP->ref = esock_atom_undefined; // Just in case
+        return FALSE;
+    }
+    
+}
+
+
+static
+BOOLEAN_T qsearch4pid(ErlNifEnv*         env,
+                      ESockRequestQueue* q,
+                      ErlNifPid*         pid)
+{
+    ESockRequestQueueElement* tmp = q->first;
+    
+    while (tmp != NULL) {
+        if (COMPARE_PIDS(&tmp->data.pid, pid) == 0)
+            return TRUE;
+        else
+            tmp = tmp->nextP;
+    }
+
+    return FALSE;
+}
+
+
+static
+void qpush(ESockRequestQueue*        q,
+           ESockRequestQueueElement* e)
+{
+    if (q->first != NULL) {
+        q->last->nextP = e;
+        q->last        = e;
+        e->nextP       = NULL;
+    } else {
+        q->first = e;
+        q->last  = e;
+        e->nextP = NULL;
+    }
+}
+ 
+ 
+static
+ESockRequestQueueElement* qpop(ESockRequestQueue* q)
+{
+    ESockRequestQueueElement* e = q->first;
+    
+    if (e != NULL) {
+        /* Atleast one element in the queue */
+        if (e == q->last) {
+            /* Only one element in the queue */
+            q->first = q->last = NULL;
+        } else {
+            /* More than one element in the queue */
+            q->first = e->nextP;
+        }
+    }
+    
+    return e;
+}
+
+
+
+static
+BOOLEAN_T qunqueue(ErlNifEnv*         env,
+                   ESockDescriptor*   descP,
+                   const char*        slogan,
+                   ESockRequestQueue* q,
+                   const ErlNifPid*   pid)
+{
+    ESockRequestQueueElement* e = q->first;
+    ESockRequestQueueElement* p = NULL;
+
+    /* Check if it was one of the waiting acceptor processes */
+    while (e != NULL) {
+        if (COMPARE_PIDS(&e->data.pid, pid) == 0) {
+
+            /* We have a match */
+
+            DEMONP(slogan, env, descP, &e->data.mon);
+            
+            if (p != NULL) {
+                /* Not the first, but could be the last */
+                if (q->last == e) {
+                    q->last  = p;
+                    p->nextP = NULL;                    
+                } else {
+                    p->nextP = e->nextP;
+                }
+                    
+            } else {
+                /* The first and could also be the last */
+                if (q->last == e) {
+                    q->last  = NULL;
+                    q->first = NULL;
+                } else {
+                    q->first = e->nextP;
+                }
+            }
+
+            if (e->data.env)
+                esock_free_env("qunqueue", e->data.env);
+            FREE(e);
+
+            return TRUE;
+        }
+
+        /* Try next */
+        p = e;
+        e = e->nextP;
+    }
+
+    return FALSE;
+}
+#endif // if !defined(__WIN32__)
+
+
+
+/* ----------------------------------------------------------------------
+ *  C o u n t e r   F u n c t i o n s
+ * ----------------------------------------------------------------------
+ */
+
+#if !defined(__WIN32__)
+static
+BOOLEAN_T cnt_inc(Uint32* cnt, Uint32 inc)
+{
+    BOOLEAN_T wrap;
+    Uint32    max     = 0xFFFFFFFF;
+    Uint32    current = *cnt;
+
+    if ((max - inc) >= current) {
+        *cnt += inc;
+        wrap  = FALSE;
+    } else {
+        *cnt = inc - (max - current) - 1;
+        wrap = TRUE;
+    }
+
+    return (wrap);
+}
+
+
+static
+void cnt_dec(Uint32* cnt, Uint32 dec)
+{
+    Uint32 current = *cnt;
+
+    if (dec > current)
+        *cnt = 0; // The counter cannot be < 0 so this is the best we can do...
+    else
+        *cnt -= dec;
+
+    return;
+}
+#endif // if !defined(__WIN32__)
+
+
+
+
+/* ----------------------------------------------------------------------
+ *  M o n i t o r   W r a p p e r   F u n c t i o n s
+ * ----------------------------------------------------------------------
+ */
+
+#if !defined(__WIN32__)
+
+static
+int esock_monitor(const char*      slogan,
+                  ErlNifEnv*       env,
+                  ESockDescriptor* descP,
+                  const ErlNifPid* pid,
+                  ESockMonitor*    monP)
+{
+    int res;
+
+    SSDBG( descP, ("SOCKET", "[%d] %s: try monitor\r\n", descP->sock, slogan) );
+    res = enif_monitor_process(env, descP, pid, &monP->mon);
+
+    if (res != 0) {
+        monP->isActive = FALSE;
+        SSDBG( descP, ("SOCKET", "[%d] monitor failed: %d\r\n", descP->sock, res) );
+    } else {
+        monP->isActive = TRUE;
+    }
+
+    return res;
+}
+
+
+static
+int esock_demonitor(const char*      slogan,
+                    ErlNifEnv*       env,
+                    ESockDescriptor* descP,
+                    ESockMonitor*    monP)
+{
+    int res;
+
+    if (!monP->isActive)
+        return 1;
+
+    SSDBG( descP, ("SOCKET", "[%d] %s: try demonitor\r\n", descP->sock, slogan) );
+
+    res = enif_demonitor_process(env, descP, &monP->mon);
+
+    if (res == 0) {
+        esock_monitor_init(monP);
+    } else {
+        SSDBG( descP,
+               ("SOCKET", "[%d] demonitor failed: %d\r\n", descP->sock, res) );
+    }
+
+    return res;
+}
+
+
+static
+void esock_monitor_init(ESockMonitor* monP)
+{
+    monP->isActive = FALSE;
+}
+
+
+static
+ERL_NIF_TERM esock_make_monitor_term(ErlNifEnv* env, const ESockMonitor* monP)
+{
+    if (monP->isActive)
+        return enif_make_monitor_term(env, &monP->mon);
+    else
+        return esock_atom_undefined;
+}
+
+
+
+#endif // if !defined(__WIN32__)
+
+
+
+/* ----------------------------------------------------------------------
+ *  C a l l b a c k   F u n c t i o n s
+ * ----------------------------------------------------------------------
+ */
+
+
+static void free_request_queue(ESockRequestQueue* q)
+{
+    while (q->first) {
+        ESockRequestQueueElement* free_me = q->first;
+        q->first = free_me->nextP;
+        if (free_me->data.env)
+            esock_free_env("dtor", free_me->data.env);
+        FREE(free_me);
+    }
+}
+
+/* =========================================================================
+ * esock_dtor - Callback function for resource destructor
+ *
+ */
+static
+void esock_dtor(ErlNifEnv* env, void* obj)
+{
+#if !defined(__WIN32__)    
+  ESockDescriptor* descP = (ESockDescriptor*) obj;
+
+  MDESTROY(descP->writeMtx); descP->writeMtx = NULL;
+  MDESTROY(descP->readMtx);  descP->readMtx  = NULL;
+  MDESTROY(descP->accMtx);   descP->accMtx   = NULL;
+  MDESTROY(descP->closeMtx); descP->closeMtx = NULL;
+  MDESTROY(descP->cfgMtx);   descP->cfgMtx   = NULL;
+
+  if (descP->currentReader.env) {
+      esock_free_env("dtor reader", descP->currentReader.env);
+      descP->currentReader.env = NULL;
+  }
+  if (descP->currentWriter.env) {
+      esock_free_env("dtor writer", descP->currentWriter.env);
+      descP->currentWriter.env = NULL;
+  }
+  if (descP->currentAcceptor.env) {
+      esock_free_env("dtor acceptor", descP->currentAcceptor.env);
+      descP->currentAcceptor.env = NULL;
+  }
+  free_request_queue(&descP->readersQ);
+  free_request_queue(&descP->writersQ);
+  free_request_queue(&descP->acceptorsQ);
+
+  descP->state   = ESOCK_STATE_DTOR;
+  descP->pattern = ESOCK_DESC_PATTERN_DTOR;  
+#endif
+}
+
+
+/* =========================================================================
+ * esock_stop - Callback function for resource stop
+ *
+ * When the socket is stopped, we need to inform:
+ *
+ *     * the controlling process
+ *     * the current writer and any waiting writers
+ *     * the current reader and any waiting readers
+ *     * the current acceptor and any waiting acceptor
+ *
+ * Also, make sure no process gets the message twice
+ * (in case it is, for instance, both controlling process
+ * and a writer).
+ *
+ */
+static
+void esock_stop(ErlNifEnv* env, void* obj, int fd, int is_direct_call)
+{
+#if !defined(__WIN32__)
+    ESockDescriptor* descP = (ESockDescriptor*) obj;
+    ERL_NIF_TERM     sockRef;
+
+    SSDBG( descP,
+           ("SOCKET", "esock_stop -> entry when %s"
+            "\r\n   sock: %d (%d)"
+            "\r\n",
+            ((is_direct_call) ? "called" : "scheduled"), descP->sock, fd) );
+
+    /* +++ Lock it down +++ */
+    
+    MLOCK(descP->writeMtx);
+    MLOCK(descP->readMtx);
+    MLOCK(descP->accMtx);
+    MLOCK(descP->cfgMtx);
+    if (!is_direct_call) MLOCK(descP->closeMtx);
+    
+    SSDBG( descP, ("SOCKET", "esock_stop -> "
+                   "[%d, %T] all mutex(s) locked when counters:"
+                   "\r\n   writePkgCnt:  %u"
+                   "\r\n   writeByteCnt: %u"
+                   "\r\n   writeTries:   %u"
+                   "\r\n   writeWaits:   %u"
+                   "\r\n   writeFails:   %u"
+                   "\r\n   readPkgCnt:   %u"
+                   "\r\n   readByteCnt:  %u"
+                   "\r\n   readTries:    %u"
+                   "\r\n   readWaits:    %u"
+                   "\r\n",
+                   descP->sock, descP->ctrlPid,
+                   descP->writePkgCnt,
+                   descP->writeByteCnt,
+                   descP->writeTries,
+                   descP->writeWaits,
+                   descP->writeFails,
+                   descP->readPkgCnt,
+                   descP->readByteCnt,
+                   descP->readTries,
+                   descP->readWaits) );
+
+    sockRef           = enif_make_resource(env, descP);
+    descP->state      = ESOCK_STATE_CLOSING; // Just in case...???
+    descP->isReadable = FALSE;
+    descP->isWritable = FALSE;
+
+    /* We should check that we actually have a monitor.
+     * This *should* be done with a "NULL" monitor value,
+     * which there currently is none...
+     * If we got here because the controlling process died,
+     * there is no point to demonitor. Also, we do not actually
+     * have a monitor in that case...
+     */
+    DEMONP("esock_stop -> ctrl", env, descP, &descP->ctrlMon);
+
+
+
+    /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+     *
+     *           Check current and waiting Writers
+     *
+     * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+     */
+
+    if (descP->currentWriterP != NULL) {
+
+        /* We have a (current) writer and *may* therefor also have
+         * writers waiting.
+         */
+
+        esock_stop_handle_current(env,
+                                  "writer",
+                                  descP, sockRef, &descP->currentWriter);
+
+        /* And also deal with the waiting writers (in the same way) */
+        SSDBG( descP, ("SOCKET", "esock_stop -> handle waiting writer(s)\r\n") );
+        inform_waiting_procs(env, "writer",
+                             descP, sockRef, &descP->writersQ, TRUE, atom_closed);
+    }
+
+
+    /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+     *
+     *           Check current and waiting Readers
+     *
+     * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+     */
+
+    if (descP->currentReaderP != NULL) {
+        
+        /* We have a (current) reader and *may* therefor also have
+         * readers waiting.
+         */
+        
+        esock_stop_handle_current(env,
+                                  "reader",
+                                  descP, sockRef, &descP->currentReader);
+
+        /* And also deal with the waiting readers (in the same way) */
+        SSDBG( descP, ("SOCKET", "esock_stop -> handle waiting reader(s)\r\n") );
+        inform_waiting_procs(env, "reader",
+                             descP, sockRef, &descP->readersQ, TRUE, atom_closed);
+    }
+
+
+
+    /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+     *
+     *           Check current and waiting Acceptors
+     *
+     * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+     */
+
+    if (descP->currentAcceptorP != NULL) {
+
+        /* We have a (current) acceptor and *may* therefor also have
+         * acceptors waiting.
+         */
+
+        esock_stop_handle_current(env,
+                                  "acceptor",
+                                  descP, sockRef, &descP->currentAcceptor);
+        
+        /* And also deal with the waiting acceptors (in the same way) */
+        SSDBG( descP, ("SOCKET", "esock_stop -> handle waiting acceptor(s)\r\n") );
+        inform_waiting_procs(env, "acceptor",
+                             descP, sockRef, &descP->acceptorsQ, TRUE, atom_closed);
+    }
+    
+    
+
+    /* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+     *
+     *           Maybe inform waiting closer
+     *
+     * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+     */
+
+    if (descP->sock != INVALID_SOCKET) {
+
+        if (descP->closeLocal) {
+
+            if (!is_direct_call) {
+                
+                /* +++ send close message to the waiting process +++ */
+
+                esock_send_close_msg(env, descP, &descP->closerPid);
+
+                DEMONP("esock_stop -> closer", env, descP, &descP->closerMon);
+
+            } else {
+
+                /* We only need to explicitly free the environment here
+                 * since the message send takes care of it if scheduled.
+                 */
+
+                if (descP->closeEnv != NULL)
+                    esock_free_env("esock_stop - close-env", descP->closeEnv);
+
+            }
+        }
+    }
+    
+
+    SSDBG( descP, ("SOCKET", "esock_stop -> unlock all mutex(s)\r\n") );
+
+    if (!is_direct_call) MUNLOCK(descP->closeMtx);
+    MUNLOCK(descP->cfgMtx);
+    MUNLOCK(descP->accMtx);
+    MUNLOCK(descP->readMtx);
+    MUNLOCK(descP->writeMtx);
+
+    SSDBG( descP,
+           ("SOCKET", "esock_stop -> done (%d, %d)\r\n", descP->sock, fd) );
+
+#endif // if !defined(__WIN32__)
+}
+
+
+
+/* *** esock_stop_handle_current ***
+ *
+ * Handle current requestor (reader, writer or acceptor) during
+ * socket stop.
+ */
+#if !defined(__WIN32__)
+static
+void esock_stop_handle_current(ErlNifEnv*       env,
+                               const char*      role,
+                               ESockDescriptor* descP,
+                               ERL_NIF_TERM     sockRef,
+                               ESockRequestor*  reqP)
+{
+    SSDBG( descP, ("SOCKET", "esock_stop -> handle current %s\r\n", role) );
+
+    DEMONP("esock_stop_handle_current", env, descP, &reqP->mon);
+
+    if (COMPARE_PIDS(&descP->closerPid, &reqP->pid) != 0) {
+
+        SSDBG( descP, ("SOCKET", "esock_stop_handle_current -> "
+                       "send abort message to current %s %T\r\n",
+                       role, reqP->pid) );
+
+        if (esock_send_abort_msg(env, sockRef, reqP->ref, reqP->env,
+                                 atom_closed, &reqP->pid) != NULL) {
+
+            esock_warning_msg("Failed sending abort (%T) message to "
+                              "current %s %T\r\n",
+                              reqP->ref, role, reqP->pid);
+        }
+        reqP->env = NULL;
+    }
+}
+
+
+
+/* This function traverse the queue and sends the specified
+ * nif_abort message with the specified reason to each member,
+ * and if the 'free' argument is TRUE, the queue will be emptied.
+ */
+static
+void inform_waiting_procs(ErlNifEnv*         env,
+                          const char*        role,
+                          ESockDescriptor*   descP,
+                          ERL_NIF_TERM       sockRef,
+                          ESockRequestQueue* q,
+                          BOOLEAN_T          free,
+                          ERL_NIF_TERM       reason)
+{
+    ESockRequestQueueElement* currentP = q->first;
+    ESockRequestQueueElement* nextP;
+
+    SSDBG( descP,
+           ("SOCKET",
+            "inform_waiting_procs -> handle waiting %s(s)\r\n", role) );
+
+    while (currentP != NULL) {
+
+        /* <KOLLA>
+         *
+         * Should we inform anyone if we fail to demonitor?
+         * NOT SURE WHAT THAT WOULD REPRESENT AND IT IS NOT
+         * IMPORTANT IN *THIS* CASE, BUT ITS A FUNDAMENTAL OP...
+         *
+         * </KOLLA>
+         */
+
+        SSDBG( descP,
+               ("SOCKET",
+                "inform_waiting_procs -> abort request %T (from %T)\r\n",
+                currentP->data.ref, currentP->data.pid) );
+
+        if (esock_send_abort_msg(env,
+                                 sockRef,
+                                 currentP->data.ref,
+                                 currentP->data.env,
+                                 reason,
+                                 &currentP->data.pid) != NULL) {
+
+            esock_warning_msg("Failed sending abort (%T) message to "
+                              "current %s %T\r\n",
+                              currentP->data.ref,
+                              role,
+                              currentP->data.pid);
+
+        }
+        currentP->data.env = NULL,
+
+        DEMONP("inform_waiting_procs -> current 'request'",
+               env, descP, &currentP->data.mon);
+        nextP = currentP->nextP;
+        if (free) FREE(currentP);
+        currentP = nextP;
+    }
+
+    if (free) {
+        q->first = NULL;
+        q->last  = NULL;
+    }
+}
+#endif // if !defined(__WIN32__)
+
+
+/* =========================================================================
+ * esock_down - Callback function for resource down (monitored processes)
+ *
+ */
+static
+void esock_down(ErlNifEnv*           env,
+                void*                obj,
+                const ErlNifPid*     pid,
+                const ErlNifMonitor* mon)
+{
+#if !defined(__WIN32__)
+    ESockDescriptor* descP = (ESockDescriptor*) obj;
+    int              sres;
+    ERL_NIF_TERM     sockRef;
+
+    SSDBG( descP, ("SOCKET", "esock_down -> entry with"
+                   "\r\n   sock:  %d"
+                   "\r\n   pid:   %T"
+                   "\r\n   Close: %s (%s)"
+                   "\r\n",
+                   descP->sock, *pid,
+                   B2S(IS_CLOSED(descP)),
+                   B2S(IS_CLOSING(descP))) );
+
+    if (!IS_CLOSED(descP)) {
+
+        if (COMPARE_PIDS(&descP->ctrlPid, pid) == 0) {
+
+            /* We don't bother with the queue cleanup here - 
+             * we leave it to the stop callback function.
+             */
+
+            SSDBG( descP,
+                   ("SOCKET", "esock_down -> controlling process exit\r\n") );
+
+            descP->state      = ESOCK_STATE_CLOSING;
+            descP->closeLocal = TRUE;
+            descP->closerPid  = *pid;
+            MON_INIT(&descP->closerMon);
+
+            sres = esock_select_stop(env, descP->sock, descP);
+
+            if (sres & ERL_NIF_SELECT_STOP_CALLED) {
+
+                /* We are done - we can finalize (socket close) directly */
+                SSDBG( descP,
+                       ("SOCKET", 
+                        "esock_down -> [%d] stop called\r\n", descP->sock) );
+
+                dec_socket(descP->domain, descP->type, descP->protocol);
+                descP->state = ESOCK_STATE_CLOSED;
+
+                /* And finally close the socket.
+                 * Since we close the socket because of an exiting owner,
+                 * we do not need to wait for buffers to sync (linger).
+                 * If the owner wish to ensure the buffer are written,
+                 * it should have closed the socket explicitly...
+                 */
+                if (sock_close(descP->sock) != 0) {
+                    int save_errno = sock_errno();
+
+                    esock_warning_msg("Failed closing socket for terminating "
+                                      "controlling process: "
+                                      "\r\n   Controlling Process: %T"
+                                      "\r\n   Descriptor:          %d"
+                                      "\r\n   Errno:               %d"
+                                      "\r\n", pid, descP->sock, save_errno);
+                }
+                sock_close_event(descP->event);
+
+                descP->sock  = INVALID_SOCKET;
+                descP->event = INVALID_EVENT;
+
+                descP->state = ESOCK_STATE_CLOSED;
+
+            } else if (sres & ERL_NIF_SELECT_STOP_SCHEDULED) {
+
+                /* The stop callback function has been *scheduled* which means
+                 * that "should" wait for it to complete. But since we are in
+                 * a callback (down) function, we cannot...
+                 * So, we must close the socket
+                 */
+                SSDBG( descP,
+                       ("SOCKET",
+                        "esock_down -> [%d] stop scheduled\r\n",
+                        descP->sock) );
+
+                dec_socket(descP->domain, descP->type, descP->protocol);
+
+                /* And now what? We can't wait for the stop function here... 
+                 * So, we simply close it here and leave the rest of the "close"
+                 * for later (when the stop function actually gets called...
+                 */
+
+                if (sock_close(descP->sock) != 0) {
+                    int save_errno = sock_errno();
+
+                    esock_warning_msg("Failed closing socket for terminating "
+                                      "controlling process: "
+                                      "\r\n   Controlling Process: %T"
+                                      "\r\n   Descriptor:          %d"
+                                      "\r\n   Errno:               %d"
+                                      "\r\n", pid, descP->sock, save_errno);
+                }
+                sock_close_event(descP->event);
+
+            } else {
+
+                esock_warning_msg("Failed selecting stop when handling down "
+                                  "of controlling process: "
+                                  "\r\n   Select Res:          %d"
+                                  "\r\n   Controlling Process: %T"
+                                  "\r\n   Descriptor:          %d"
+                                  "\r\n   Monitor:             %T"
+                                  "\r\n", sres, pid, descP->sock,
+                                  MON2T(env, mon));
+            }
+
+        } else if (COMPARE_PIDS(&descP->connPid, pid) == 0) {
+
+            /* The connPid is only set during the connection.
+             * The same goes for the monitor (connMon).
+             */
+
+            descP->state = ESOCK_STATE_OPEN;  /* restore state */
+            enif_set_pid_undefined(&descP->connPid);
+            DEMONP("esock_down -> connector",
+                   env, descP, &descP->connMon);
+
+        } else {
+
+            /* check all operation queue(s): acceptor, writer and reader. 
+             *
+             * Is it really any point in doing this if the socket is closed?
+             *
+             */
+
+            SSDBG( descP, ("SOCKET", "esock_down -> other process term\r\n") );
+
+            sockRef = enif_make_resource(env, descP);
+
+            MLOCK(descP->accMtx);
+            if (descP->currentAcceptorP != NULL)
+                esock_down_acceptor(env, descP, sockRef, pid);
+            MUNLOCK(descP->accMtx);
+
+            MLOCK(descP->writeMtx);
+            if (descP->currentWriterP != NULL)
+                esock_down_writer(env, descP, sockRef, pid);
+            MUNLOCK(descP->writeMtx);
+
+            MLOCK(descP->readMtx);
+            if (descP->currentReaderP != NULL)
+                esock_down_reader(env, descP, sockRef, pid);
+            MUNLOCK(descP->readMtx);
+
+        }
+    }
+
+    SSDBG( descP, ("SOCKET", "esock_down -> done\r\n") );
+
+#endif // if !defined(__WIN32__)
+}
+
+
+
+/* *** esock_down_acceptor ***
+ *
+ * Check and then handle a downed acceptor process.
+ *
+ */
+#if !defined(__WIN32__)
+static
+void esock_down_acceptor(ErlNifEnv*       env,
+                          ESockDescriptor* descP,
+                          ERL_NIF_TERM     sockRef,
+                          const ErlNifPid* pid)
+{
+    if (COMPARE_PIDS(&descP->currentAcceptor.pid, pid) == 0) {
+        
+        SSDBG( descP, ("SOCKET",
+                       "esock_down_acceptor -> "
+                       "current acceptor - try activate next\r\n") );
+        
+        if (!activate_next_acceptor(env, descP, sockRef)) {
+
+            SSDBG( descP,
+                   ("SOCKET", "esock_down_acceptor -> no more writers\r\n") );
+
+            descP->state               = ESOCK_STATE_LISTENING;
+
+            descP->currentAcceptorP    = NULL;
+            descP->currentAcceptor.ref = esock_atom_undefined;
+            enif_set_pid_undefined(&descP->currentAcceptor.pid);
+            esock_monitor_init(&descP->currentAcceptor.mon);
+        }
+
+    } else {
+        
+        /* Maybe unqueue one of the waiting acceptors */
+        
+        SSDBG( descP, ("SOCKET",
+                       "esock_down_acceptor -> "
+                       "not current acceptor - maybe a waiting acceptor\r\n") );
+        
+        acceptor_unqueue(env, descP, pid);
+    }
+}
+
+
+
+
+/* *** esock_down_writer ***
+ *
+ * Check and then handle a downed writer process.
+ *
+ */
+static
+void esock_down_writer(ErlNifEnv*       env,
+                        ESockDescriptor* descP,
+                        ERL_NIF_TERM     sockRef,
+                        const ErlNifPid* pid)
+{
+    if (COMPARE_PIDS(&descP->currentWriter.pid, pid) == 0) {
+        
+        SSDBG( descP, ("SOCKET",
+                       "esock_down_writer -> "
+                       "current writer - try activate next\r\n") );
+        
+        if (!activate_next_writer(env, descP, sockRef)) {
+            SSDBG( descP, ("SOCKET",
+                           "esock_down_writer -> no active writer\r\n") );
+            descP->currentWriterP    = NULL;
+            descP->currentWriter.ref = esock_atom_undefined;
+            enif_set_pid_undefined(&descP->currentWriter.pid);
+            esock_monitor_init(&descP->currentWriter.mon);
+        }
+        
+    } else {
+        
+        /* Maybe unqueue one of the waiting writer(s) */
+        
+        SSDBG( descP, ("SOCKET",
+                       "esock_down_writer -> "
+                       "not current writer - maybe a waiting writer\r\n") );
+        
+        writer_unqueue(env, descP, pid);
+    }
+}
+
+
+
+
+/* *** esock_down_reader ***
+ *
+ * Check and then handle a downed reader process.
+ *
+ */
+static
+void esock_down_reader(ErlNifEnv*       env,
+                        ESockDescriptor* descP,
+                        ERL_NIF_TERM     sockRef,
+                        const ErlNifPid* pid)
+{
+    if (COMPARE_PIDS(&descP->currentReader.pid, pid) == 0) {
+        
+        SSDBG( descP, ("SOCKET",
+                       "esock_down_reader -> "
+                       "current reader - try activate next\r\n") );
+        
+        if (!activate_next_reader(env, descP, sockRef)) {
+            SSDBG( descP,
+                   ("SOCKET",
+                    "esock_down_reader -> no more readers\r\n") );
+            descP->currentReaderP    = NULL;
+            descP->currentReader.ref = esock_atom_undefined;
+            enif_set_pid_undefined(&descP->currentReader.pid);
+            esock_monitor_init(&descP->currentReader.mon);
+        }
+
+    } else {
+        
+        /* Maybe unqueue one of the waiting reader(s) */
+        
+        SSDBG( descP, ("SOCKET",
+                       "esock_down_reader -> "
+                       "not current reader - maybe a waiting reader\r\n") );
+        
+        reader_unqueue(env, descP, pid);
+    }
+}
+#endif // if !defined(__WIN32__)
+
+
+
+/* ----------------------------------------------------------------------
+ *  L o a d / u n l o a d / u p g r a d e   F u n c t i o n s
+ * ----------------------------------------------------------------------
+ */
+
+static
+ErlNifFunc esock_funcs[] =
+{
+    // Some utility and support functions
+    {"nif_info",                0, nif_info, 0},
+    {"nif_info",                1, nif_info, 0},
+    {"nif_supports",            1, nif_supports, 0},
+    {"nif_command",             1, nif_command, 0},
+
+    // The proper "socket" interface
+    // nif_open/1 is (supposed to be) used when we already have a file descriptor
+    // {"nif_open",                1, nif_open, 0},
+    {"nif_open",                4, nif_open, 0},
+    {"nif_bind",                2, nif_bind, 0},
+    {"nif_connect",             2, nif_connect, 0},
+    {"nif_listen",              2, nif_listen, 0},
+    {"nif_accept",              2, nif_accept, 0},
+    {"nif_send",                4, nif_send, 0},
+    {"nif_sendto",              5, nif_sendto, 0},
+    {"nif_sendmsg",             4, nif_sendmsg, 0},
+    {"nif_recv",                4, nif_recv, 0},
+    {"nif_recvfrom",            4, nif_recvfrom, 0},
+    {"nif_recvmsg",             5, nif_recvmsg, 0},
+    {"nif_close",               1, nif_close, 0},
+    {"nif_shutdown",            2, nif_shutdown, 0},
+    {"nif_setopt",              5, nif_setopt, 0},
+    {"nif_getopt",              4, nif_getopt, 0},
+    {"nif_sockname",            1, nif_sockname, 0},
+    {"nif_peername",            1, nif_peername, 0},
+
+    /* Misc utility functions */
+
+    /* "Extra" functions to "complete" the socket interface.
+     * For instance, the function nif_finalize_connection
+     * is called after the connect *select* has "completed".
+     */
+    {"nif_finalize_connection", 1, nif_finalize_connection, 0},
+    {"nif_cancel",              3, nif_cancel, 0},
+    {"nif_finalize_close",      1, nif_finalize_close, ERL_NIF_DIRTY_JOB_IO_BOUND}
+};
+
+
+#if !defined(__WIN32__)
+static
+BOOLEAN_T extract_debug(ErlNifEnv*   env,
+                        ERL_NIF_TERM map)
+{
+    /*
+     * We need to do this here since the "proper" atom has not been
+     * created when this function is called.
+     */
+    ERL_NIF_TERM debug = MKA(env, "debug");
+    
+    return esock_extract_bool_from_map(env, map, debug, ESOCK_GLOBAL_DEBUG_DEFAULT);
+}
+
+static
+BOOLEAN_T extract_iow(ErlNifEnv*   env,
+                      ERL_NIF_TERM map)
+{
+    /*
+     * We need to do this here since the "proper" atom has not been
+     * created when this function is called.
+     */
+    ERL_NIF_TERM iow = MKA(env, "iow");
+    
+    return esock_extract_bool_from_map(env, map, iow, ESOCK_NIF_IOW_DEFAULT);
+}
+#endif // if !defined(__WIN32__)
+
+
+
+/* =======================================================================
+ * load_info - A map of misc info (e.g global debug)
+ */
+
+static
+int on_load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info)
+{
+#if !defined(__WIN32__)    
+    esock_dbg_init(ESOCK_DBGOUT_DEFAULT);
+    // esock_dbg_init(ESOCK_DBGOUT_UNIQUE);
+
+    data.dbg = extract_debug(env, load_info);
+    data.iow = extract_iow(env, load_info);
+
+    /* +++ Global Counters +++ */
+    data.cntMtx         = MCREATE("esock[gcnt]");
+    data.numSockets     = 0;
+    data.numTypeDGrams  = 0;
+    data.numTypeStreams = 0;
+    data.numTypeSeqPkgs = 0;
+    data.numDomainLocal = 0;
+    data.numDomainInet  = 0;
+    data.numDomainInet6 = 0;
+    data.numProtoIP     = 0;
+    data.numProtoTCP    = 0;
+    data.numProtoUDP    = 0;
+    data.numProtoSCTP   = 0;
+#endif
+
+    /* +++ Local atoms and error reason atoms +++ */
+#define LOCAL_ATOM_DECL(A) atom_##A = MKA(env, #A)
+LOCAL_ATOMS
+LOCAL_ERROR_REASON_ATOMS
+#undef LOCAL_ATOM_DECL
+
+    /* Global atom(s) and error reason atom(s) */
+#define GLOBAL_ATOM_DECL(A) esock_atom_##A = MKA(env, #A)
+GLOBAL_ATOMS
+GLOBAL_ERROR_REASON_ATOMS
+#undef GLOBAL_ATOM_DECL
+    esock_atom_socket_tag = MKA(env, "$socket");
+
+    esocks = enif_open_resource_type_x(env,
+                                       "sockets",
+                                       &esockInit,
+                                       ERL_NIF_RT_CREATE,
+                                       NULL);
+
+    return !esocks;
+}
+
+/*
+ * MODULE:  socket (the erlang API/interface module)
+ * funcs:   esock_funcs (defines the API of this nif)
+ * load:    on_load (load this nif)
+ * upgrade: NULL (not used)
+ * NULL:    THIS IS NOT USED
+ * unload:  NULL (not used)
+ */
+ERL_NIF_INIT(socket, esock_funcs, on_load, NULL, NULL, NULL)
diff --git a/erts/emulator/nifs/common/socket_tarray.c b/erts/emulator/nifs/common/socket_tarray.c
new file mode 100644
index 0000000000..def22c4919
--- /dev/null
+++ b/erts/emulator/nifs/common/socket_tarray.c
@@ -0,0 +1,143 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2018-2019. 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 : Build and "maintain" a (erlang) term array of 
+ *            variable length.
+ * ----------------------------------------------------------------------
+ *
+ */
+
+/* #ifdef HAVE_CONFIG_H */
+/* #include "config.h" */
+/* #endif */
+
+#include <stdio.h>
+
+#include <erl_nif.h>
+
+#include "socket_int.h"
+#include <sys.h>
+#include "socket_util.h"
+#include "socket_tarray.h"
+
+
+
+/* ----------------------------------------------------------------------
+ * Types 
+ */
+
+typedef struct {
+  Uint32        sz;
+  Uint32        idx;
+  ERL_NIF_TERM* array;
+} SocketTArrayInt;
+
+
+/* ----------------------------------------------------------------------
+ * Forward for internal functions
+ */
+
+static void esock_tarray_add1(SocketTArrayInt* taP, ERL_NIF_TERM t);
+static void esock_tarray_ensure_fits(SocketTArrayInt* taP, Uint32 needs);
+
+
+/* ----------------------------------------------------------------------
+ * API
+ */
+
+extern
+void* esock_tarray_create(Uint32 sz)
+{
+    SocketTArrayInt* tarrayP;
+
+    ESOCK_ASSERT( (sz > 0) );
+
+    tarrayP = MALLOC(sizeof(SocketTArrayInt));
+    ESOCK_ASSERT( (tarrayP != NULL) );
+  
+    tarrayP->array = MALLOC(sz * sizeof(ERL_NIF_TERM));
+    ESOCK_ASSERT( (tarrayP->array != NULL) );
+    tarrayP->sz   = sz;
+    tarrayP->idx  = 0;
+    
+    return ((SocketTArray) tarrayP);
+}
+
+extern
+void esock_tarray_delete(SocketTArray ta)
+{
+    SocketTArrayInt* taP = (SocketTArrayInt*) ta;
+
+    FREE(taP->array);
+    FREE(taP);
+}
+
+
+extern
+Uint32 esock_tarray_sz(SocketTArray a)
+{
+  return ( ((SocketTArrayInt*) a)->idx );
+}
+
+extern
+void esock_tarray_add(SocketTArray ta, ERL_NIF_TERM t)
+{
+    esock_tarray_add1((SocketTArrayInt*) ta, t);
+}
+
+extern
+void esock_tarray_tolist(SocketTArray  ta,
+                         ErlNifEnv*    env,
+                         ERL_NIF_TERM* list)
+{
+    SocketTArrayInt* taP = (SocketTArrayInt*) ta;
+
+    *list = MKLA(env, taP->array, taP->idx);
+
+    esock_tarray_delete(taP);
+}
+
+
+
+/* ----------------------------------------------------------------------
+ * "Internal" functions
+ */
+
+static
+void esock_tarray_add1(SocketTArrayInt* taP, ERL_NIF_TERM t)
+{
+  esock_tarray_ensure_fits(taP, 1);
+
+  taP->array[taP->idx++] = t;
+}
+
+static
+void esock_tarray_ensure_fits(SocketTArrayInt* taP, Uint32 needs)
+{ 
+  if (taP->sz < (taP->idx + needs)) {
+    Uint32 newSz = (needs < taP->sz) ? 2*taP->sz : 2*needs;
+    void*  mem   = REALLOC(taP->array, newSz * sizeof(ERL_NIF_TERM));
+    
+    ESOCK_ASSERT( (mem != NULL) );
+    
+    taP->sz    = newSz;
+    taP->array = (ERL_NIF_TERM*) mem;
+  }
+}
diff --git a/erts/emulator/nifs/common/socket_tarray.h b/erts/emulator/nifs/common/socket_tarray.h
new file mode 100644
index 0000000000..4f1152fb9e
--- /dev/null
+++ b/erts/emulator/nifs/common/socket_tarray.h
@@ -0,0 +1,47 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2018-2019. 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 : Build and "maintain" a (erlang) term array of 
+ *            variable length.
+ * ----------------------------------------------------------------------
+ *
+ */
+
+#ifndef SOCKET_TARRAY_H__
+#define SOCKET_TARRAY_H__
+
+typedef void* SocketTArray;
+
+extern SocketTArray esock_tarray_create(Uint32 sz);
+extern void         esock_tarray_delete(SocketTArray ta);
+extern Uint32       esock_tarray_sz(SocketTArray ta);
+extern void         esock_tarray_add(SocketTArray ta, ERL_NIF_TERM t);
+extern void         esock_tarray_tolist(SocketTArray  ta,
+                                        ErlNifEnv*    env,
+                                        ERL_NIF_TERM* list);
+
+#define TARRAY_CREATE(SZ)        esock_tarray_create((SZ))
+#define TARRAY_DELETE(TA)        esock_tarray_delete((TA))
+#define TARRAY_SZ(TA)            esock_tarray_sz((TA))
+#define TARRAY_ADD(TA, T)        esock_tarray_add((TA), (T))
+#define TARRAY_TOLIST(TA, E, L)  esock_tarray_tolist((TA), (E), (L))
+
+
+#endif // SOCKET_TARRAY_H__
diff --git a/erts/emulator/nifs/common/socket_util.c b/erts/emulator/nifs/common/socket_util.c
new file mode 100644
index 0000000000..54c310ecc7
--- /dev/null
+++ b/erts/emulator/nifs/common/socket_util.c
@@ -0,0 +1,1699 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2018-2019. 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 : Utility functions for the socket and net NIF(s).
+ * ----------------------------------------------------------------------
+ *
+ */
+
+#include <stdarg.h>
+#include <string.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <time.h>
+#include <stddef.h>
+
+#include "socket_int.h"
+#include "sys.h"
+#include "socket_util.h"
+#include "socket_dbg.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+/* We don't have a "debug flag" to check here, so we 
+ * should use the compile debug flag, whatever that is...
+ */
+
+// #define COMPILE_DEBUG_FLAG_WE_NEED_TO_CHECK 1
+#if defined(COMPILE_DEBUG_FLAG_WE_NEED_TO_CHECK)
+#define UTIL_DEBUG TRUE
+#else
+#define UTIL_DEBUG FALSE
+#endif
+
+#define UDBG( proto ) ESOCK_DBG_PRINTF( UTIL_DEBUG , proto )
+
+
+extern char* erl_errno_id(int error); /* THIS IS JUST TEMPORARY??? */
+
+#if (defined(HAVE_LOCALTIME_R) && defined(HAVE_STRFTIME))
+#define ESOCK_USE_PRETTY_TIMESTAMP 1
+#endif
+    
+
+static char* make_sockaddr_in4(ErlNifEnv*    env,
+                               ERL_NIF_TERM  port,
+                               ERL_NIF_TERM  addr,
+                               ERL_NIF_TERM* sa);
+static char* make_sockaddr_in6(ErlNifEnv*    env,
+                               ERL_NIF_TERM  port,
+                               ERL_NIF_TERM  addr,
+                               ERL_NIF_TERM  flowInfo,
+                               ERL_NIF_TERM  scopeId,
+                               ERL_NIF_TERM* sa);
+static char* make_sockaddr_un(ErlNifEnv*    env,
+                              ERL_NIF_TERM  path,
+                              ERL_NIF_TERM* sa);
+
+
+/* +++ esock_encode_iov +++
+ *
+ * Encode an IO Vector. In erlang we represented this as a list of binaries.
+ *
+ * We iterate through the IO vector, and as long as the remaining (rem)
+ * number of bytes is greater than the size of the current buffer, we
+ * contunue. When we have a buffer that is greater than rem, we have found
+ * the last buffer (it may be empty, and then the previous was last). 
+ * We may need to split this (if 0 < rem < bufferSz).
+ */
+
+extern
+char* esock_encode_iov(ErlNifEnv*    env,
+                       int           read,
+                       struct iovec* iov,
+                       size_t        len,
+                       ErlNifBinary* data,
+                       ERL_NIF_TERM* eIOV)
+{
+    int          rem = read;
+    Uint16       i;
+    BOOLEAN_T    done = FALSE;
+    ERL_NIF_TERM a[len]; // At most this length
+
+    UDBG( ("SUTIL", "esock_encode_iov -> entry with"
+           "\r\n   read:      %d"
+           "\r\n   (IOV) len: %d"
+           "\r\n", read, len) );
+
+    if (len == 0) {
+        *eIOV = MKEL(env);
+        return NULL;
+    }
+
+    for (i = 0; (!done) && (i < len); i++) {
+        UDBG( ("SUTIL", "esock_encode_iov -> process iov:"
+               "\r\n   iov[%d].iov_len: %d"
+               "\r\n   rem:            %d"
+               "\r\n", i, iov[i].iov_len, rem) );
+        if (iov[i].iov_len == rem) {
+            /* We have the exact amount - we are done */
+            UDBG( ("SUTIL", "esock_encode_iov -> exact => done\r\n") );
+            a[i] = MKBIN(env, &data[i]);
+            rem  = 0; // Besserwisser
+            done = TRUE;
+        } else if (iov[i].iov_len < rem) {
+            /* Filled another buffer - continue */
+            UDBG( ("SUTIL", "esock_encode_iov -> filled => continue\r\n") );
+            a[i] = MKBIN(env, &data[i]);
+            rem -= iov[i].iov_len;
+        } else if (iov[i].iov_len > rem) {
+            /* Partly filled buffer (=> split) - we are done */
+            ERL_NIF_TERM tmp;
+            UDBG( ("SUTIL", "esock_encode_iov -> split => done\r\n") );
+            tmp  = MKBIN(env, &data[i]);
+            a[i] = MKSBIN(env, tmp, 0, rem);
+            rem  = 0; // Besserwisser
+            done = TRUE;
+        }
+    }
+
+    UDBG( ("SUTIL", "esock_encode_iov -> create the IOV list (%d)\r\n", i) );
+
+    *eIOV = MKLA(env, a, i);
+
+    UDBG( ("SUTIL", "esock_encode_msghdr -> done\r\n") );
+
+    return NULL;
+}
+
+
+
+/* +++ esock_decode_iov +++
+ *
+ * Decode an IO Vector. In erlang we represented this as a list of binaries.
+ *
+ * We assume that we have already figured out how long the iov (actually
+ * eIOV) is (len), and therefor allocated an array of bins and iov to be
+ * used.
+ */
+
+extern
+char* esock_decode_iov(ErlNifEnv*    env,
+                       ERL_NIF_TERM  eIOV,
+                       ErlNifBinary* bufs,
+                       struct iovec* iov,
+                       size_t        len,
+                       ssize_t*      totSize)
+{
+    Uint16       i;
+    ssize_t      sz;
+    ERL_NIF_TERM elem, tail, list;
+
+    UDBG( ("SUTIL", "esock_decode_iov -> entry with"
+           "\r\n   (IOV) len: %d"
+           "\r\n", read, len) );
+
+    for (i = 0, list = eIOV, sz = 0; (i < len); i++) {
+
+        UDBG( ("SUTIL", "esock_decode_iov -> "
+               "\r\n   iov[%d].iov_len: %d"
+               "\r\n   rem:            %d"
+               "\r\n", i) );
+
+        if (!GET_LIST_ELEM(env, list, &elem, &tail))
+            return ESOCK_STR_EINVAL;
+
+        if (IS_BIN(env, elem) && GET_BIN(env, elem, &bufs[i])) {
+            iov[i].iov_base  = (caddr_t) bufs[i].data;
+            iov[i].iov_len   = bufs[i].size;
+            sz              += bufs[i].size;
+        } else {
+            return ESOCK_STR_EINVAL;
+        }
+
+        list = tail;
+    }
+
+    *totSize = sz;
+
+    UDBG( ("SUTIL", "esock_decode_msghdr -> done (%d)\r\n", sz) );
+
+    return NULL;
+}
+
+
+
+/* +++ esock_decode_sockaddr +++
+ *
+ * Decode a socket address - sockaddr. In erlang its represented as
+ * a map, which has a specific set of attributes, depending on one
+ * mandatory attribute; family. So depending on the value of the family
+ * attribute: 
+ *
+ *    local - sockaddr_un:  path
+ *    inet  - sockaddr_in4: port, addr
+ *    inet6 - sockaddr_in6: port, addr, flowinfo, scope_id
+ */
+
+extern
+char* esock_decode_sockaddr(ErlNifEnv*    env,
+                            ERL_NIF_TERM  eSockAddr,
+                            ESockAddress* sockAddrP,
+                            unsigned int* addrLen)
+{
+    ERL_NIF_TERM efam;
+    int          fam;
+    char*        xres;
+
+    UDBG( ("SUTIL", "esock_decode_sockaddr -> entry\r\n") );
+
+    if (!IS_MAP(env, eSockAddr))
+        return ESOCK_STR_EINVAL;
+
+    if (!GET_MAP_VAL(env, eSockAddr, esock_atom_family, &efam))
+        return ESOCK_STR_EINVAL;
+
+    UDBG( ("SUTIL", "esock_decode_sockaddr -> try decode domain (%T)\r\n", efam) );
+    if ((xres = esock_decode_domain(env, efam, &fam)) != NULL)
+        return xres;
+
+    UDBG( ("SUTIL", "esock_decode_sockaddr -> fam: %d\r\n", fam) );
+    switch (fam) {
+    case AF_INET:
+        xres = esock_decode_sockaddr_in4(env, eSockAddr,
+                                         &sockAddrP->in4, addrLen);
+        break;
+
+#if defined(HAVE_IN6) && defined(AF_INET6)
+    case AF_INET6:
+        xres = esock_decode_sockaddr_in6(env, eSockAddr,
+                                         &sockAddrP->in6, addrLen);
+        break;
+#endif
+
+#ifdef HAVE_SYS_UN_H
+    case AF_UNIX:
+        xres = esock_decode_sockaddr_un(env, eSockAddr,
+                                        &sockAddrP->un, addrLen);
+        break;
+#endif
+
+    default:
+        xres = ESOCK_STR_EAFNOSUPPORT;
+        break;
+
+    }
+
+    return xres;
+}
+
+
+
+/* +++ esock_encode_sockaddr +++
+ *
+ * Encode a socket address - sockaddr. In erlang its represented as
+ * a map, which has a specific set of attributes, depending on one
+ * mandatory attribute; family. So depending on the value of the family
+ * attribute: 
+ *
+ *    local - sockaddr_un:  path
+ *    inet  - sockaddr_in4: port, addr
+ *    inet6 - sockaddr_in6: port, addr, flowinfo, scope_id
+ */
+
+extern
+char* esock_encode_sockaddr(ErlNifEnv*    env,
+                            ESockAddress* sockAddrP,
+                            unsigned int  addrLen,
+                            ERL_NIF_TERM* eSockAddr)
+{
+    char* xres;
+
+    UDBG( ("SUTIL", "esock_encode_sockaddr -> entry with"
+           "\r\n   family:  %d"
+           "\r\n   addrLen: %d"
+           "\r\n", sockAddrP->sa.sa_family, addrLen) );
+
+    switch (sockAddrP->sa.sa_family) {
+    case AF_INET:
+        xres = esock_encode_sockaddr_in4(env, &sockAddrP->in4, addrLen, eSockAddr);
+        break;
+
+#if defined(HAVE_IN6) && defined(AF_INET6)
+    case AF_INET6:
+        xres = esock_encode_sockaddr_in6(env, &sockAddrP->in6, addrLen, eSockAddr);
+        break;
+#endif
+
+#ifdef HAVE_SYS_UN_H
+    case AF_UNIX:
+        xres = esock_encode_sockaddr_un(env, &sockAddrP->un, addrLen, eSockAddr);
+        break;
+#endif
+
+    default:
+        *eSockAddr = esock_atom_undefined;
+        xres       = ESOCK_STR_EAFNOSUPPORT;
+        break;
+
+    }
+
+    return xres;
+}
+
+
+
+/* +++ esock_decode_sockaddr_in4 +++
+ *
+ * Decode a IPv4 socket address - sockaddr_in4. In erlang its represented as
+ * a map, which has a specific set of attributes (beside the mandatory family
+ * attribute, which is "inherited" from the "sockaddr" type): 
+ *
+ *    port :: port_numbber()
+ *    addr :: ip4_address()
+ *
+ * The erlang module ensures that both of these has values exist, so there 
+ * is no need for any elaborate error handling.
+ */
+
+extern
+char* esock_decode_sockaddr_in4(ErlNifEnv*          env,
+                                ERL_NIF_TERM        eSockAddr,
+                                struct sockaddr_in* sockAddrP,
+                                unsigned int*       addrLen)
+{
+    ERL_NIF_TERM eport, eaddr;
+    int          port;
+    char*        xres;
+
+    UDBG( ("SUTIL", "esock_decode_sockaddr_in4 -> entry\r\n") );
+
+    /* Basic init */
+    sys_memzero((char*) sockAddrP, sizeof(struct sockaddr_in));
+
+#ifndef NO_SA_LEN
+    sockAddrP->sin_len = sizeof(struct sockaddr_in);
+#endif
+
+    sockAddrP->sin_family = AF_INET;
+
+    /* Extract (e) port number from map */
+    UDBG( ("SUTIL", "esock_decode_sockaddr_in4 -> try get port number\r\n") );
+    if (!GET_MAP_VAL(env, eSockAddr, esock_atom_port, &eport))
+        return ESOCK_STR_EINVAL;
+
+    /* Decode port number */
+    UDBG( ("SUTIL", "esock_decode_sockaddr_in4 -> try decode port number\r\n") );
+    if (!GET_INT(env, eport, &port))
+        return ESOCK_STR_EINVAL;
+    
+    sockAddrP->sin_port = htons(port);
+
+    /* Extract (e) address from map */
+    UDBG( ("SUTIL", "esock_decode_sockaddr_in4 -> try get (ip) address\r\n") );
+    if (!GET_MAP_VAL(env, eSockAddr, esock_atom_addr, &eaddr))
+        return ESOCK_STR_EINVAL;
+
+    /* Decode address */
+    UDBG( ("SUTIL", "esock_decode_sockaddr_in4 -> try decode (ip) address\r\n") );
+    if ((xres = esock_decode_ip4_address(env,
+                                         eaddr,
+                                         &sockAddrP->sin_addr)) != NULL)
+        return xres;
+
+    *addrLen = sizeof(struct sockaddr_in);
+    
+    UDBG( ("SUTIL", "esock_decode_sockaddr_in4 -> done\r\n") );
+
+    return NULL;
+}
+
+
+
+/* +++ esock_encode_sockaddr_in4 +++
+ *
+ * Encode a IPv4 socket address - sockaddr_in4. In erlang its represented as
+ * a map, which has a specific set of attributes (beside the mandatory family
+ * attribute, which is "inherited" from the "sockaddr" type):
+ *
+ *    port :: port_numbber()
+ *    addr :: ip4_address()
+ *
+ */
+
+extern
+char* esock_encode_sockaddr_in4(ErlNifEnv*          env,
+                                struct sockaddr_in* sockAddrP,
+                                unsigned int        addrLen,
+                                ERL_NIF_TERM*       eSockAddr)
+{
+    ERL_NIF_TERM ePort, eAddr;
+    int          port;
+    char*        xres = NULL;
+
+    UDBG( ("SUTIL", "esock_encode_sockaddr_in4 -> entry\r\n") );
+
+    if (addrLen >= sizeof(struct sockaddr_in)) {
+        /* The port */
+        port  = ntohs(sockAddrP->sin_port);
+        ePort = MKI(env, port);
+
+        /* The address */
+        if ((xres = esock_encode_ip4_address(env, &sockAddrP->sin_addr,
+                                             &eAddr)) == NULL) {
+            /* And finally construct the in4_sockaddr record */
+            xres = make_sockaddr_in4(env, ePort, eAddr, eSockAddr);
+        } else {
+            UDBG( ("SUTIL", "esock_encode_sockaddr_in4 -> "
+                   "failed encoding (ip) address: "
+                   "\r\n   xres: %s"
+                   "\r\n", xres) );
+            *eSockAddr = esock_atom_undefined;
+            xres       = ESOCK_STR_EINVAL;
+        }
+
+    } else {
+        UDBG( ("SUTIL", "esock_encode_sockaddr_in4 -> wrong size: "
+               "\r\n   addrLen:   %d"
+               "\r\n   addr size: %d"
+               "\r\n", addrLen, sizeof(struct sockaddr_in)) );
+        *eSockAddr = esock_atom_undefined;
+        xres       = ESOCK_STR_EINVAL;
+    }
+
+    return xres;
+}
+
+
+
+/* +++ esock_decode_sockaddr_in6 +++
+ *
+ * Decode a IPv6 socket address - sockaddr_in6. In erlang its represented as
+ * a map, which has a specific set of attributes (beside the mandatory family
+ * attribute, which is "inherited" from the "sockaddr" type): 
+ *
+ *    port     :: port_numbber()  (integer)
+ *    addr     :: ip6_address()   (tuple)
+ *    flowinfo :: in6_flow_info() (integer)
+ *    scope_id :: in6_scope_id()  (integer)
+ *
+ * The erlang module ensures that all of these has values exist, so there
+ * is no need for any elaborate error handling here.
+ */
+
+#if defined(HAVE_IN6) && defined(AF_INET6)
+extern
+char* esock_decode_sockaddr_in6(ErlNifEnv*           env,
+                                ERL_NIF_TERM         eSockAddr,
+                                struct sockaddr_in6* sockAddrP,
+                                unsigned int*        addrLen)
+{
+    ERL_NIF_TERM eport, eaddr, eflowInfo, escopeId;
+    int          port;
+    unsigned int flowInfo, scopeId;
+    char*        xres;
+
+    UDBG( ("SUTIL", "esock_decode_sockaddr_in6 -> entry\r\n") );
+
+    /* Basic init */
+    sys_memzero((char*) sockAddrP, sizeof(struct sockaddr_in6));
+#ifndef NO_SA_LEN
+    sockAddrP->sin6_len = sizeof(struct sockaddr_in);
+#endif
+
+    sockAddrP->sin6_family = AF_INET6;
+
+    /* *** Extract (e) port number from map *** */
+    if (!GET_MAP_VAL(env, eSockAddr, esock_atom_port, &eport))
+        return ESOCK_STR_EINVAL;
+
+    /* Decode port number */
+    if (!GET_INT(env, eport, &port))
+        return ESOCK_STR_EINVAL;
+
+    UDBG( ("SUTIL", "esock_decode_sockaddr_in6 -> port: %d\r\n", port) );
+
+    sockAddrP->sin6_port = htons(port);
+
+    /* *** Extract (e) flowinfo from map *** */
+    if (!GET_MAP_VAL(env, eSockAddr, esock_atom_flowinfo, &eflowInfo))
+        return ESOCK_STR_EINVAL;
+
+    /* 4: Get the flowinfo */
+    if (!GET_UINT(env, eflowInfo, &flowInfo))
+        return ESOCK_STR_EINVAL;
+
+    UDBG( ("SUTIL", "esock_decode_sockaddr_in6 -> flowinfo: %d\r\n", flowInfo) );
+
+    sockAddrP->sin6_flowinfo = flowInfo;
+    
+    /* *** Extract (e) scope_id from map *** */
+    if (!GET_MAP_VAL(env, eSockAddr, esock_atom_scope_id, &escopeId))
+        return ESOCK_STR_EINVAL;
+
+    /* *** Get the scope_id *** */
+    if (!GET_UINT(env, escopeId, &scopeId))
+        return ESOCK_STR_EINVAL;
+
+    UDBG( ("SUTIL", "esock_decode_sockaddr_in6 -> scopeId: %d\r\n", scopeId) );
+
+    sockAddrP->sin6_scope_id = scopeId;
+
+    /* *** Extract (e) address from map *** */
+    if (!GET_MAP_VAL(env, eSockAddr, esock_atom_addr, &eaddr))
+        return ESOCK_STR_EINVAL;
+
+    /* Decode address */
+    if ((xres = esock_decode_ip6_address(env,
+                                         eaddr,
+                                         &sockAddrP->sin6_addr)) != NULL)
+        return xres;
+
+    *addrLen = sizeof(struct sockaddr_in6);
+
+    UDBG( ("SUTIL", "esock_decode_sockaddr_in6 -> done\r\n") );
+
+    return NULL;
+}
+#endif
+
+
+
+/* +++ esock_encode_sockaddr_in6 +++
+ *
+ * Encode a IPv6 socket address - sockaddr_in6. In erlang its represented as
+ * a map, which has a specific set of attributes (beside the mandatory family
+ * attribute, which is "inherited" from the "sockaddr" type): 
+ *
+ *    port     :: port_numbber()  (integer)
+ *    addr     :: ip6_address()   (tuple)
+ *    flowinfo :: in6_flow_info() (integer)
+ *    scope_id :: in6_scope_id()  (integer)
+ *
+ */
+
+#if defined(HAVE_IN6) && defined(AF_INET6)
+extern
+char* esock_encode_sockaddr_in6(ErlNifEnv*           env,
+                                struct sockaddr_in6* sockAddrP,
+                                unsigned int         addrLen,
+                                ERL_NIF_TERM*        eSockAddr)
+{
+    ERL_NIF_TERM ePort, eAddr, eFlowInfo, eScopeId;
+    char*        xres;
+
+    if (addrLen >= sizeof(struct sockaddr_in6)) {
+        /* The port */
+        ePort = MKI(env, ntohs(sockAddrP->sin6_port));
+
+        /* The flowInfo */
+        eFlowInfo = MKI(env, sockAddrP->sin6_flowinfo);
+            
+        /* The scopeId */
+        eScopeId = MKI(env, sockAddrP->sin6_scope_id);
+        
+        /* The address */
+        if ((xres = esock_encode_ip6_address(env, &sockAddrP->sin6_addr,
+                                             &eAddr)) == NULL) {
+            /* And finally construct the in6_sockaddr record */
+            xres = make_sockaddr_in6(env,
+                                     ePort, eAddr, eFlowInfo, eScopeId, eSockAddr);
+        } else {
+            *eSockAddr = esock_atom_undefined;
+            xres       = ESOCK_STR_EINVAL;
+        }
+
+    } else {
+        *eSockAddr = esock_atom_undefined;
+        xres       = ESOCK_STR_EINVAL;
+    }
+
+    return xres;
+}
+#endif
+
+
+
+/* +++ esock_decode_sockaddr_un +++
+ *
+ * Decode a Unix Domain socket address - sockaddr_un. In erlang its 
+ * represented as a map, which has a specific set of attributes
+ * (beside the mandatory family attribute, which is "inherited" from
+ * the "sockaddr" type):
+ *
+ *    path :: binary()
+ *
+ * The erlang module ensures that this value exist, so there 
+ * is no need for any elaborate error handling here.
+ */
+
+#ifdef HAVE_SYS_UN_H
+extern
+char* esock_decode_sockaddr_un(ErlNifEnv*          env,
+                               ERL_NIF_TERM        eSockAddr,
+                               struct sockaddr_un* sockAddrP,
+                               unsigned int*       addrLen)
+{
+    ErlNifBinary bin;
+    ERL_NIF_TERM epath;
+    unsigned int len;
+
+    /* *** Extract (e) path (a binary) from map *** */
+    if (!GET_MAP_VAL(env, eSockAddr, esock_atom_path, &epath))
+        return ESOCK_STR_EINVAL;
+
+    /* Get the path */
+    if (!GET_BIN(env, epath, &bin))
+        return ESOCK_STR_EINVAL;
+    
+    if ((bin.size +
+#ifdef __linux__
+         /* Make sure the address gets zero terminated
+          * except when the first byte is \0 because then it is
+          * sort of zero terminated although the zero termination
+          * comes before the address...
+          * This fix handles Linux's nonportable
+          * abstract socket address extension.
+          */
+         (bin.data[0] == '\0' ? 0 : 1)
+#else
+         1
+#endif
+         ) > sizeof(sockAddrP->sun_path))
+        return ESOCK_STR_EINVAL;
+
+
+    sys_memzero((char*) sockAddrP, sizeof(struct sockaddr_un));
+    sockAddrP->sun_family = AF_UNIX;
+
+    sys_memcpy(sockAddrP->sun_path, bin.data, bin.size);
+    len = offsetof(struct sockaddr_un, sun_path) + bin.size;
+
+#ifndef NO_SA_LEN
+    sockAddrP->sun_len = len;
+#endif
+    *addrLen = len;
+
+    return NULL;
+}
+#endif
+
+
+
+/* +++ esock_encode_sockaddr_un +++
+ *
+ * Encode a Unix Domain socket address - sockaddr_un. In erlang its 
+ * represented as a map, which has a specific set of attributes
+ * (beside the mandatory family attribute, which is "inherited" from
+ * the "sockaddr" type):
+ *
+ *    path :: binary()
+ *
+ */
+
+#ifdef HAVE_SYS_UN_H
+extern
+char* esock_encode_sockaddr_un(ErlNifEnv*          env,
+                               struct sockaddr_un* sockAddrP,
+                               unsigned int        addrLen,
+                               ERL_NIF_TERM*       eSockAddr)
+{
+    ERL_NIF_TERM ePath;
+    size_t       n, m;
+    char*        xres;
+
+    if (addrLen >= offsetof(struct sockaddr_un, sun_path)) {
+        n = addrLen - offsetof(struct sockaddr_un, sun_path);
+        if (255 < n) {
+            *eSockAddr = esock_atom_undefined;
+            xres       = ESOCK_STR_EINVAL;
+        } else {
+            m = esock_strnlen(sockAddrP->sun_path, n);
+#ifdef __linux__
+            /* Assume that the address is a zero terminated string,
+             * except when the first byte is \0 i.e the string length is 0,
+             * then use the reported length instead.
+             * This fix handles Linux's nonportable
+             * abstract socket address extension.
+             */
+            if (m == 0) {
+                m = n;
+            }
+#endif
+
+            /* And finally build the 'path' attribute */
+            ePath      = MKSL(env, sockAddrP->sun_path, m);
+
+            /* And the socket address */
+            xres = make_sockaddr_un(env, ePath, eSockAddr);
+        }
+    } else {
+        *eSockAddr = esock_atom_undefined;
+        xres       = ESOCK_STR_EINVAL;
+    }
+
+    return xres;
+}
+#endif
+
+
+
+/* +++ esock_decode_ip4_address +++
+ *
+ * Decode a IPv4 address. This can be three things:
+ *
+ *    + Then atom 'any'
+ *    + Then atom 'loopback'
+ *    + An ip4_address() (4 tuple)
+ *
+ * Note that this *only* decodes the "address" part of a
+ * (IPv4) socket address.
+ */
+
+extern
+char* esock_decode_ip4_address(ErlNifEnv*      env,
+                               ERL_NIF_TERM    eAddr,
+                               struct in_addr* inAddrP)
+{
+    struct in_addr addr;
+
+    UDBG( ("SUTIL", "esock_decode_ip4_address -> entry with"
+           "\r\n   eAddr: %T"
+           "\r\n", eAddr) );
+
+    if (IS_ATOM(env, eAddr)) {
+
+        /* This is either 'any' | 'broadcast' | 'loopback' */
+
+        if (COMPARE(esock_atom_loopback, eAddr) == 0) {
+            UDBG( ("SUTIL",
+		   "esock_decode_ip4_address -> address: lookback\r\n") );
+            addr.s_addr = htonl(INADDR_LOOPBACK);
+        } else if (COMPARE(esock_atom_any, eAddr) == 0) {
+	  UDBG( ("SUTIL",
+		 "esock_decode_ip4_address -> address: any\r\n") );
+	  addr.s_addr = htonl(INADDR_ANY);
+        } else if (COMPARE(esock_atom_broadcast, eAddr) == 0) {
+	  UDBG( ("SUTIL",
+		 "esock_decode_ip4_address -> address: broadcast\r\n") );
+	  addr.s_addr = htonl(INADDR_BROADCAST);
+        } else {
+            UDBG( ("SUTIL",
+		   "esock_decode_ip4_address -> address: unknown\r\n") );
+            return ESOCK_STR_EINVAL;
+        }
+
+        inAddrP->s_addr = addr.s_addr;
+
+    } else {
+        /* This is a 4-tuple */
+
+        const ERL_NIF_TERM* addrt;
+        int                 addrtSz;
+        int                 a, v;
+        char                addr[4];
+        
+        if (!GET_TUPLE(env, eAddr, &addrtSz, &addrt))
+            return ESOCK_STR_EINVAL;
+        
+        if (addrtSz != 4)
+            return ESOCK_STR_EINVAL;
+
+        for (a = 0; a < 4; a++) {
+            if (!GET_INT(env, addrt[a], &v))
+                return ESOCK_STR_EINVAL;
+            addr[a] = v;
+        }
+
+        sys_memcpy(inAddrP, &addr, sizeof(addr));
+        
+    }
+
+    return NULL;
+}
+
+
+
+/* +++ esock_encode_ip4_address +++
+ *
+ * Encode a IPv4 address:
+ *
+ *    + An ip4_address() (4 tuple)
+ *
+ * Note that this *only* decodes the "address" part of a
+ * (IPv4) socket address. There are several other things (port).
+ */
+
+extern
+char* esock_encode_ip4_address(ErlNifEnv*      env,
+                               struct in_addr* addrP,
+                               ERL_NIF_TERM*   eAddr)
+{
+    unsigned int   i;
+    ERL_NIF_TERM   at[4];
+    unsigned int   atLen = sizeof(at) / sizeof(ERL_NIF_TERM);
+    unsigned char* a     = (unsigned char*) addrP;
+    ERL_NIF_TERM   addr;
+    
+    /* The address */
+    for (i = 0; i < atLen; i++) {
+        at[i] = MKI(env, a[i]);
+    }
+
+    addr = MKTA(env, at, atLen);
+    UDBG( ("SUTIL", "esock_encode_ip4_address -> addr: %T\r\n", addr) );
+    // *eAddr = MKTA(env, at, atLen);
+    *eAddr = addr;
+    
+    return NULL;
+}
+
+
+
+/* +++ esock_decode_ip6_address +++
+ *
+ * Decode a IPv6 address. This can be three things:
+ *
+ *    + Then atom 'any'
+ *    + Then atom 'loopback'
+ *    + An ip6_address() (8 tuple)
+ *
+ * Note that this *only* decodes the "address" part of a
+ * (IPv6) socket address. There are several other things
+ * (port, flowinfo and scope_id) that are handled elsewhere).
+ */
+
+#if defined(HAVE_IN6) && defined(AF_INET6)
+extern
+char* esock_decode_ip6_address(ErlNifEnv*       env,
+                               ERL_NIF_TERM     eAddr,
+                               struct in6_addr* inAddrP)
+{
+    UDBG( ("SUTIL", "esock_decode_ip6_address -> entry with"
+           "\r\n   eAddr: %T"
+           "\r\n", eAddr) );
+
+    if (IS_ATOM(env, eAddr)) {
+        /* This is either 'any' or 'loopback' */
+        const struct in6_addr* addr;
+
+        if (COMPARE(esock_atom_loopback, eAddr) == 0) {
+            addr = &in6addr_loopback;
+        } else if (COMPARE(esock_atom_any, eAddr) == 0) {
+            addr = &in6addr_any;
+        } else {
+            return ESOCK_STR_EINVAL;
+        }
+        
+        *inAddrP = *addr;
+        
+    } else {
+        /* This is a 8-tuple */
+        
+        const ERL_NIF_TERM* addrt;
+        int                 addrtSz;
+        int                 ai, v;
+        unsigned char       addr[16];
+        unsigned char*      a = addr;
+        unsigned int        addrLen = sizeof(addr) / sizeof(unsigned char);
+        
+        if (!GET_TUPLE(env, eAddr, &addrtSz, &addrt))
+            return ESOCK_STR_EINVAL;
+        
+        if (addrtSz != 8)
+            return ESOCK_STR_EINVAL;
+        
+        for (ai = 0; ai < 8; ai++) {
+            if (!GET_INT(env, addrt[ai], &v))
+                return ESOCK_STR_EINVAL;
+            put_int16(v, a);
+            a += 2;
+        }
+        
+        sys_memcpy(inAddrP, &addr, addrLen);
+
+    }
+
+    return NULL;
+}
+#endif
+
+
+
+/* +++ esock_encode_ip6_address +++
+ *
+ * Encode a IPv6 address:
+ *
+ *    + An ip6_address() (8 tuple)
+ *
+ * Note that this *only* encodes the "address" part of a
+ * (IPv6) socket address. There are several other things
+ * (port, flowinfo and scope_id) that are handled elsewhere).
+ */
+
+#if defined(HAVE_IN6) && defined(AF_INET6)
+extern
+char* esock_encode_ip6_address(ErlNifEnv*       env,
+                               struct in6_addr* addrP,
+                               ERL_NIF_TERM*    eAddr)
+{
+    unsigned int   i;
+    ERL_NIF_TERM   at[8];
+    unsigned int   atLen = sizeof(at) / sizeof(ERL_NIF_TERM);
+    unsigned char* a     = (unsigned char*) addrP;
+    
+    /* The address */
+    for (i = 0; i < atLen; i++) {
+        at[i] = MKI(env, get_int16(a + i*2));
+    }
+
+    *eAddr = MKTA(env, at, atLen);
+    
+    return NULL;
+}
+#endif
+
+
+
+/* +++ esock_encode_timeval +++
+ *
+ * Encode a timeval struct into its erlang form, a map with two fields:
+ *
+ *    sec
+ *    usec
+ *
+ */
+extern
+char* esock_encode_timeval(ErlNifEnv*      env,
+                           struct timeval* timeP,
+                           ERL_NIF_TERM*   eTime)
+{
+    ERL_NIF_TERM keys[] = {esock_atom_sec, esock_atom_usec};
+    ERL_NIF_TERM vals[] = {MKL(env, timeP->tv_sec), MKL(env, timeP->tv_usec)};
+    
+    unsigned int numKeys = sizeof(keys) / sizeof(ERL_NIF_TERM);
+    unsigned int numVals = sizeof(vals) / sizeof(ERL_NIF_TERM);
+    
+    ESOCK_ASSERT( (numKeys == numVals) );
+    
+    if (!MKMA(env, keys, vals, numKeys, eTime))
+        return ESOCK_STR_EINVAL;
+
+    return NULL;
+}
+
+
+
+/* +++ esock_decode_timeval +++
+ *
+ * Decode a timeval in its erlang form (a map) into its native form,
+ * a timeval struct.
+ *
+ */
+extern
+char* esock_decode_timeval(ErlNifEnv*      env,
+                           ERL_NIF_TERM    eTime,
+                           struct timeval* timeP)
+{
+    ERL_NIF_TERM eSec, eUSec;
+    size_t       sz;
+
+    // It must be a map
+    if (!IS_MAP(env, eTime))
+        return ESOCK_STR_EINVAL;
+
+    // It must have atleast two attributes
+    if (!enif_get_map_size(env, eTime, &sz) || (sz < 2))
+        return ESOCK_STR_EINVAL;
+
+    if (!GET_MAP_VAL(env, eTime, esock_atom_sec, &eSec))
+        return ESOCK_STR_EINVAL;
+
+    if (!GET_MAP_VAL(env, eTime, esock_atom_usec, &eUSec))
+        return ESOCK_STR_EINVAL;
+
+    if (!GET_LONG(env, eSec, &timeP->tv_sec))
+        return ESOCK_STR_EINVAL;
+    
+#if (SIZEOF_INT == 4)
+    {
+        int usec;
+        if (!GET_INT(env, eUSec, &usec))
+            return ESOCK_STR_EINVAL;
+        timeP->tv_usec = (typeof(timeP->tv_usec)) usec;
+    }
+#elif (SIZEOF_LONG == 4)
+    {
+        long usec;
+        if (!GET_LONG(env, eUSec, &usec))
+            return ESOCK_STR_EINVAL;
+        timeP->tv_usec = (typeof(timeP->tv_usec)) usec;
+    }
+#else
+    /* Ok, we give up... */
+    if (!GET_LONG(env, eUSec, &timeP->tv_usec))
+        return ESOCK_STR_EINVAL;
+
+#endif
+    
+    return NULL;
+}
+
+
+
+/* +++ esock_decode_domain +++
+ *
+ * Decode the Erlang form of the 'domain' type, that is: 
+ * 
+ *    inet  => AF_INET
+ *    inet6 => AF_INET6
+ *    local => AF_UNIX
+ *
+ */
+extern
+char* esock_decode_domain(ErlNifEnv*   env,
+                          ERL_NIF_TERM eDomain,
+                          int*         domain)
+{
+    char* xres = NULL;
+
+    if (COMPARE(esock_atom_inet, eDomain) == 0) {
+        *domain = AF_INET;
+
+#if defined(HAVE_IN6) && defined(AF_INET6)
+    } else if (COMPARE(esock_atom_inet6, eDomain) == 0) {
+        *domain = AF_INET6;
+#endif
+
+#ifdef HAVE_SYS_UN_H
+    } else if (COMPARE(esock_atom_local, eDomain) == 0) {
+        *domain = AF_UNIX;
+#endif
+
+    } else {
+        *domain = -1;
+        xres    = ESOCK_STR_EAFNOSUPPORT;
+    }
+
+    return xres;
+}
+
+
+
+/* +++ esock_encode_domain +++
+ *
+ * Encode the native domain to the Erlang form, that is: 
+ * 
+ *    AF_INET  => inet
+ *    AF_INET6 => inet6
+ *    AF_UNIX  => local
+ *
+ */
+extern
+char* esock_encode_domain(ErlNifEnv*    env,
+                          int           domain,
+                          ERL_NIF_TERM* eDomain)
+{
+    char* xres = NULL;
+
+    switch (domain) {
+    case AF_INET:
+        *eDomain = esock_atom_inet;
+        break;
+
+#if defined(HAVE_IN6) && defined(AF_INET6)
+    case AF_INET6:
+        *eDomain = esock_atom_inet6;
+        break;
+#endif
+
+#ifdef HAVE_SYS_UN_H
+    case AF_UNIX:
+        *eDomain = esock_atom_local;
+        break;
+#endif
+
+    default:
+        *eDomain = esock_atom_undefined; // Just in case
+        xres     = ESOCK_STR_EAFNOSUPPORT;
+    }
+
+    return xres;
+}
+
+
+
+/* +++ esock_decode_type +++
+ *
+ * Decode the Erlang form of the 'type' type, that is: 
+ * 
+ *    stream    => SOCK_STREAM
+ *    dgram     => SOCK_DGRAM
+ *    raw       => SOCK_RAW
+ *    seqpacket => SOCK_SEQPACKET
+ *
+ */
+extern
+char* esock_decode_type(ErlNifEnv*   env,
+                        ERL_NIF_TERM eType,
+                        int*         type)
+{
+    char* xres = NULL;
+
+    if (COMPARE(esock_atom_stream, eType) == 0) {
+        *type = SOCK_STREAM;
+    } else if (COMPARE(esock_atom_dgram, eType) == 0) {
+        *type = SOCK_DGRAM;
+    } else if (COMPARE(esock_atom_raw, eType) == 0) {
+        *type = SOCK_RAW;
+
+#if defined(HAVE_SCTP)
+    } else if (COMPARE(esock_atom_seqpacket, eType) == 0) {
+        *type = SOCK_SEQPACKET;
+#endif
+
+    } else {
+        *type = -1;
+        xres  = ESOCK_STR_EAFNOSUPPORT;
+    }
+
+    return xres;
+}
+
+
+
+/* +++ esock_decode_type +++
+ *
+ * Encode the native type to the Erlang form, that is: 
+ * 
+ *    SOCK_STREAM    => stream
+ *    SOCK_DGRAM     => dgram
+ *    SOCK_RAW       => raw
+ *    SOCK_SEQPACKET => seqpacket
+ *
+ */
+extern
+char* esock_encode_type(ErlNifEnv*    env,
+                        int           type,
+                        ERL_NIF_TERM* eType)
+{
+    char* xres = NULL;
+
+    switch (type) {
+    case SOCK_STREAM:
+        *eType = esock_atom_stream;
+        break;
+
+    case SOCK_DGRAM:
+        *eType = esock_atom_dgram;
+        break;
+
+    case SOCK_RAW:
+        *eType = esock_atom_raw;
+        break;
+
+#if defined(HAVE_SCTP)
+    case SOCK_SEQPACKET:
+        *eType = esock_atom_seqpacket;
+        break;
+#endif
+
+    default:
+        *eType = esock_atom_undefined; // Just in case
+        xres   = ESOCK_STR_EAFNOSUPPORT;
+    }
+
+    return xres;
+}
+
+
+
+/* +++ esock_encode_protocol +++
+ *
+ * Encode the native protocol to the Erlang form, that is: 
+ * 
+ *    SOL_IP | IPPROTO_IP => ip
+ *    SOL_IPV6            => ipv6
+ *    SOL_TCP             => tcp
+ *    SOL_UDP             => udp
+ *    SOL_SCTP            => sctp
+ *
+ */
+extern
+char* esock_encode_protocol(ErlNifEnv*    env,
+                            int           proto,
+                            ERL_NIF_TERM* eProto)
+{
+    char* xres = NULL;
+
+    switch (proto) {
+#if defined(SOL_IP)
+    case SOL_IP:
+#else
+    case IPPROTO_IP:
+#endif
+        *eProto = esock_atom_ip;
+        break;
+
+#if defined(SOL_IPV6)
+    case SOL_IPV6:
+        *eProto = esock_atom_ipv6;
+        break;
+#endif
+
+    case IPPROTO_TCP:
+        *eProto = esock_atom_tcp;
+        break;
+
+    case IPPROTO_UDP:
+        *eProto = esock_atom_udp;
+        break;
+
+#if defined(HAVE_SCTP)
+    case IPPROTO_SCTP:
+        *eProto = esock_atom_sctp;
+        break;
+#endif
+
+    default:
+        *eProto = esock_atom_undefined;
+        xres    = ESOCK_STR_EAFNOSUPPORT;
+        break;
+    }
+
+    return xres;
+}
+
+
+
+/* +++ esock_decode_protocol +++
+ *
+ * Decode the Erlang form of the 'protocol' type, that is: 
+ * 
+ *    ip   => SOL_IP | IPPROTO_IP
+ *    ipv6 => SOL_IPV6
+ *    tcp  => SOL_TCP
+ *    udp  => SOL_UDP
+ *    sctp => SOL_SCTP
+ *
+ */
+extern
+char* esock_decode_protocol(ErlNifEnv*   env,
+                            ERL_NIF_TERM eProto,
+                            int*         proto)
+{
+    char* xres = NULL;
+
+    if (COMPARE(esock_atom_ip, eProto) == 0) {
+#if defined(SOL_IP)
+        *proto = SOL_IP;
+#else
+        *proto = IPPROTO_IP;
+#endif
+    } else if (COMPARE(esock_atom_ipv6, eProto) == 0) {
+#if defined(SOL_IPV6)
+        *proto = SOL_IPV6;
+#else
+        *proto = IPPROTO_IPV6;
+#endif
+    } else if (COMPARE(esock_atom_tcp, eProto) == 0) {
+        *proto = IPPROTO_TCP;
+    } else if (COMPARE(esock_atom_udp, eProto) == 0) {
+        *proto = IPPROTO_UDP;
+#if defined(HAVE_SCTP)
+    } else if (COMPARE(esock_atom_sctp, eProto) == 0) {
+        *proto = IPPROTO_SCTP;
+#endif
+    } else {
+        *proto = -1;
+        xres   = ESOCK_STR_EAFNOSUPPORT;
+    }
+
+    return xres;
+}
+
+
+
+/* +++ esock_decode_bufsz +++
+ *
+ * Decode an buffer size. The size of a buffer is: 
+ * 
+ *    Sz > 0 => Use provided value
+ *    Sz     => Use provided default
+ *
+ */
+extern
+char* esock_decode_bufsz(ErlNifEnv*   env,
+                         ERL_NIF_TERM eVal,
+                         size_t       defSz,
+                         size_t*      sz)
+{
+    int val;
+
+    if (!GET_INT(env, eVal, &val))
+        return ESOCK_STR_EINVAL;
+
+    if (val > 0)
+        *sz = (size_t) val;
+    else
+        *sz = defSz;
+
+    return NULL;
+}
+
+
+
+/* *** esock_decode_string ***
+ *
+ * Decode a string value. A successful decode results in an 
+ * allocation of the string, which the caller has to free
+ * once the string has been used.
+ */
+extern
+BOOLEAN_T esock_decode_string(ErlNifEnv*         env,
+                              const ERL_NIF_TERM eString,
+                              char**             stringP)
+{
+    BOOLEAN_T    result;
+    unsigned int len;
+    char*        bufP;
+    
+    if (!GET_LIST_LEN(env, eString, &len) && (len != 0)) {
+        *stringP = NULL;
+        result   = FALSE;
+    } else {
+
+        UDBG( ("SUTIL", "esock_decode_string -> len: %d\r\n", len) );
+
+        bufP = MALLOC(len + 1); // We shall NULL-terminate
+    
+        if (GET_STR(env, eString, bufP, len+1)) {
+            UDBG( ("SUTIL", "esock_decode_string -> buf: %s\r\n", bufP) );
+            // bufP[len] = '\0';
+            *stringP = bufP;
+            result   = TRUE;
+        } else {
+            *stringP = NULL;
+            result   = FALSE;
+            FREE(bufP);
+        }
+    }
+
+    return result;
+}
+
+
+
+/* *** esock_extract_bool_from_map ***
+ *
+ * Extract an boolean item from a map.
+ *
+ */
+extern
+BOOLEAN_T esock_extract_bool_from_map(ErlNifEnv*   env,
+                                      ERL_NIF_TERM map,
+                                      ERL_NIF_TERM key,
+                                      BOOLEAN_T    def)
+{
+    ERL_NIF_TERM val;
+
+    if (!GET_MAP_VAL(env, map, key, &val))
+        return def;
+
+    if (!IS_ATOM(env, val))
+        return def;
+
+    if (COMPARE(val, esock_atom_true) == 0)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+
+
+/* *** esock_decode_bool ***
+ *
+ * Decode a boolean value.
+ *
+ */
+extern
+BOOLEAN_T esock_decode_bool(ERL_NIF_TERM val)
+{
+    if (COMPARE(esock_atom_true, val) == 0) 
+        return TRUE;
+    else
+        return FALSE;
+}
+
+
+/* *** esock_encode_bool ***
+ *
+ * Encode a boolean value.
+ *
+ */
+extern
+ERL_NIF_TERM esock_encode_bool(BOOLEAN_T val)
+{
+    if (val)
+        return esock_atom_true;
+    else
+        return esock_atom_false;
+}
+
+
+/* Create an ok two (2) tuple in the form:
+ *
+ *         {ok, Any}
+ *
+ * The second element (Any) is already in the form of an
+ * ERL_NIF_TERM so all we have to do is create the tuple.
+ */
+extern
+ERL_NIF_TERM esock_make_ok2(ErlNifEnv* env, ERL_NIF_TERM any)
+{
+    return MKT2(env, esock_atom_ok, any);
+}
+
+
+/* Create an ok three (3) tuple in the form:
+ *
+ *         {ok, Val1, Val2}
+ *
+ * The second (Val1) and third (Val2) elements are already in
+ * the form of an ERL_NIF_TERM so all we have to do is create
+ * the tuple.
+ */
+extern
+ERL_NIF_TERM esock_make_ok3(ErlNifEnv* env, ERL_NIF_TERM val1, ERL_NIF_TERM val2)
+{
+  return MKT3(env, esock_atom_ok, val1, val2);
+}
+
+
+
+/* Create an error two (2) tuple in the form:
+ *
+ *          {error, Reason}
+ *
+ * The second element (Reason) is already in the form of an
+ * ERL_NIF_TERM so all we have to do is create the tuple.
+ */
+extern
+ERL_NIF_TERM esock_make_error(ErlNifEnv* env, ERL_NIF_TERM reason)
+{
+    return MKT2(env, esock_atom_error, reason);
+}
+
+
+
+/* Create an error two (2) tuple in the form: {error, Reason}.
+ *
+ *          {error, Reason}
+ *
+ * The second element, Reason, is the reason string that has
+ * converted into an atom.
+ */
+extern
+ERL_NIF_TERM esock_make_error_str(ErlNifEnv* env, char* reason)
+{
+    return esock_make_error(env, MKA(env, reason));
+}
+
+
+/* Create an error two (2) tuple in the form:
+ *
+ *          {error, Reason}
+ *
+ * The second element, Reason, is the errno value in its
+ * basic form (integer) which has been converted into an atom.
+ */
+extern
+ERL_NIF_TERM esock_make_error_errno(ErlNifEnv* env, int err)
+{
+    return esock_make_error_str(env, erl_errno_id(err));
+}
+
+
+
+/* strnlen doesn't exist everywhere */
+extern
+size_t esock_strnlen(const char *s, size_t maxlen)
+{
+    size_t i = 0;
+    while (i < maxlen && s[i] != '\0')
+        i++;
+    return i;
+}
+
+
+
+/* *** esock_abort ***
+ *
+ * Generate an abort with "extra" info. This should be called
+ * via the ESOCK_ABORT macro.
+ * Basically it prints the extra info onto stderr before aborting.
+ *
+ */
+extern
+void esock_abort(const char* expr,
+                 const char* func,
+                 const char* file,
+                 int         line)
+{
+  fflush(stdout);
+  fprintf(stderr, "%s:%d:%s() Assertion failed: %s\n",
+	  file, line, func, expr);
+  fflush(stderr);
+  abort();
+}
+
+
+
+/* *** esock_warning_msg ***
+ *
+ * Temporary function for issuing warning messages.
+ *
+ */
+extern
+void esock_warning_msg( const char* format, ... )
+{
+  va_list         args;
+  char            f[512 + sizeof(format)]; // This has to suffice...
+  char            stamp[64]; // Just in case...
+  int             res;
+
+  /*
+   * We should really include self in the printout,
+   * so we can se which process are executing the code.
+   * But then I must change the API....something for later.
+   */
+
+  // 2018-06-29 12:13:21.232089
+  // 29-Jun-2018::13:47:25.097097
+
+  if (esock_timestamp(stamp, sizeof(stamp))) {
+      res = enif_snprintf(f, sizeof(f),
+                          "=WARNING MSG==== %s ===\r\n%s",
+                          stamp, format);
+  } else {
+      res = enif_snprintf(f, sizeof(f), "=WARNING MSG==== %s", format);
+  }
+
+  if (res > 0) {
+      va_start (args, format);
+      enif_vfprintf (stdout, f, args);
+      va_end (args);
+      fflush(stdout);
+  }
+
+  return;
+}
+
+
+/* *** esock_timestamp ***
+ *
+ * Create a timestamp string.
+ * If awailable, we use the localtime_r and strftime function(s)
+ * to produces a nice readable timestamp. But if not (awailable),
+ * it produces a timestamp in the form of an "Epoch" (A real epoch
+ * is the number of seconds since 1/1 1970, but our timestamp is
+ * the number micro seconds since 1/1 1970).
+ */
+
+extern
+BOOLEAN_T esock_timestamp(char *buf, unsigned int len)
+{
+    int        ret;
+    ErlNifTime monTime = enif_monotonic_time(ERL_NIF_USEC);
+    ErlNifTime offTime = enif_time_offset(ERL_NIF_USEC);
+    ErlNifTime time    = monTime + offTime;
+#if defined(ESOCK_USE_PRETTY_TIMESTAMP)
+    time_t     sec     = time / 1000000; // (if _MSEC) sec  = time / 1000;
+    time_t     usec    = time % 1000000; // (if _MSEC) msec = time % 1000;
+    int        buflen;
+    struct tm  t;
+
+    if (localtime_r(&sec, &t) == NULL)
+        return FALSE;
+
+    ret = strftime(buf, len, "%d-%B-%Y::%T", &t);
+    if (ret == 0)
+        return FALSE;
+    len -= ret - 1;
+    buflen = strlen(buf);
+
+    ret = enif_snprintf(&buf[buflen], len, ".%06b64d", usec);
+    if (ret >= len)
+        return FALSE;
+
+    return TRUE;
+#else
+    ret = enif_snprintf(buf, len, "%b64d", time);
+    if (ret == 0)
+        return FALSE;
+    else
+        return TRUE;
+#endif
+}
+
+
+
+/* =================================================================== *
+ *                                                                     *
+ *              Various (internal) utility functions                   *
+ *                                                                     *
+ * =================================================================== */
+
+/* Construct the IPv4 socket address */
+static
+char* make_sockaddr_in4(ErlNifEnv*    env,
+                        ERL_NIF_TERM  port,
+                        ERL_NIF_TERM  addr,
+                        ERL_NIF_TERM* sa)
+{
+    ERL_NIF_TERM keys[] = {esock_atom_family, esock_atom_port, esock_atom_addr};
+    ERL_NIF_TERM vals[] = {esock_atom_inet, port, addr};
+    unsigned int numKeys = sizeof(keys) / sizeof(ERL_NIF_TERM);
+    unsigned int numVals = sizeof(vals) / sizeof(ERL_NIF_TERM);
+    
+    ESOCK_ASSERT( (numKeys == numVals) );
+    
+    if (!MKMA(env, keys, vals, numKeys, sa)) {
+        *sa = esock_atom_undefined;
+        return ESOCK_STR_EINVAL;
+    } else {
+        return NULL;
+    }
+}
+
+
+/* Construct the IPv6 socket address */
+static
+char* make_sockaddr_in6(ErlNifEnv*    env,
+                        ERL_NIF_TERM  port,
+                        ERL_NIF_TERM  addr,
+                        ERL_NIF_TERM  flowInfo,
+                        ERL_NIF_TERM  scopeId,
+                        ERL_NIF_TERM* sa)
+{
+    ERL_NIF_TERM keys[] = {esock_atom_family,
+                           esock_atom_port,
+                           esock_atom_addr,
+                           esock_atom_flowinfo,
+                           esock_atom_scope_id};
+    ERL_NIF_TERM vals[] = {esock_atom_inet6, port, addr, flowInfo, scopeId};
+    unsigned int numKeys = sizeof(keys) / sizeof(ERL_NIF_TERM);
+    unsigned int numVals = sizeof(vals) / sizeof(ERL_NIF_TERM);
+    
+    ESOCK_ASSERT( (numKeys == numVals) );
+    
+    if (!MKMA(env, keys, vals, numKeys, sa)) {
+        *sa = esock_atom_undefined;
+        return ESOCK_STR_EINVAL;
+    } else {
+        return NULL;
+    }
+}
+
+
+/* Construct the Unix Domain socket address */
+static
+char* make_sockaddr_un(ErlNifEnv*    env,
+                       ERL_NIF_TERM  path,
+                       ERL_NIF_TERM* sa)
+{
+    ERL_NIF_TERM keys[] = {esock_atom_family, esock_atom_path};
+    ERL_NIF_TERM vals[] = {esock_atom_local,  path};
+    unsigned int numKeys = sizeof(keys) / sizeof(ERL_NIF_TERM);
+    unsigned int numVals = sizeof(vals) / sizeof(ERL_NIF_TERM);
+    
+    ESOCK_ASSERT( (numKeys == numVals) );
+    
+    if (!MKMA(env, keys, vals, numKeys, sa)) {
+        *sa = esock_atom_undefined;
+        return ESOCK_STR_EINVAL;
+    } else {
+        return NULL;
+    }
+}
+
+
diff --git a/erts/emulator/nifs/common/socket_util.h b/erts/emulator/nifs/common/socket_util.h
new file mode 100644
index 0000000000..2688a920c4
--- /dev/null
+++ b/erts/emulator/nifs/common/socket_util.h
@@ -0,0 +1,208 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2018-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%
+ *
+ * ----------------------------------------------------------------------
+ *  Purpose : Utility "stuff" for socket and net.
+ * ----------------------------------------------------------------------
+ *
+ */
+
+#ifndef SOCKET_UTIL_H__
+#define SOCKET_UTIL_H__
+
+#include <erl_nif.h>
+#include "socket_int.h"
+
+#define CHAR(C)  ((char) (C))
+#define UCHAR(C) ((unsigned char) (C))
+#define INT(I)   ((int)   (I))
+#define UINT(U)  ((unsigned int) (U))
+#define LONG(L)  ((long) (L))
+#define ULONG(L) ((unsigned long) (L))
+#define SZT(I)   ((size_t) (I))
+#define VOIDP(P) ((void*) (P))
+#define CHARP(P) ((char*) (P))
+
+#define ESOCK_ABORT(E)  esock_abort(E, __func__, __FILE__, __LINE__)
+#define ESOCK_ASSERT(e) ((void) ((e) ? 1 : (ESOCK_ABORT(#e), 0)))
+
+extern
+char* esock_encode_iov(ErlNifEnv*    env,
+                       int           read,
+                       struct iovec* iov,
+                       size_t        len,
+                       ErlNifBinary* data,
+                       ERL_NIF_TERM* eIOV);
+extern
+char* esock_decode_iov(ErlNifEnv*    env,
+                       ERL_NIF_TERM  eIOV,
+                       ErlNifBinary* bufs,
+                       struct iovec* iov,
+                       size_t        len,
+                       ssize_t*      totSize);
+extern
+char* esock_decode_sockaddr(ErlNifEnv*    env,
+                            ERL_NIF_TERM  eSockAddr,
+                            ESockAddress* sockAddrP,
+                            unsigned int* addrLen);
+extern
+char* esock_encode_sockaddr(ErlNifEnv*    env,
+                            ESockAddress* sockAddrP,
+                            unsigned int  addrLen,
+                            ERL_NIF_TERM* eSockAddr);
+
+extern
+char* esock_decode_sockaddr_in4(ErlNifEnv*          env,
+                                ERL_NIF_TERM        eSockAddr,
+                                struct sockaddr_in* sockAddrP,
+                                unsigned int*       addrLen);
+extern
+char* esock_encode_sockaddr_in4(ErlNifEnv*          env,
+                                struct sockaddr_in* sockAddrP,
+                                unsigned int        addrLen,
+                                ERL_NIF_TERM*       eSockAddr);
+
+#if defined(HAVE_IN6) && defined(AF_INET6)
+extern
+char* esock_decode_sockaddr_in6(ErlNifEnv*           env,
+                                ERL_NIF_TERM         eSockAddr,
+                                struct sockaddr_in6* sockAddrP,
+                                unsigned int*        addrLen);
+extern
+char* esock_encode_sockaddr_in6(ErlNifEnv*           env,
+                                struct sockaddr_in6* sockAddrP,
+                                unsigned int         addrLen,
+                                ERL_NIF_TERM*        eSockAddr);
+#endif
+
+#ifdef HAVE_SYS_UN_H
+extern
+char* esock_decode_sockaddr_un(ErlNifEnv*          env,
+                               ERL_NIF_TERM        eSockAddr,
+                               struct sockaddr_un* sockAddrP,
+                               unsigned int*       addrLen);
+extern
+char* esock_encode_sockaddr_un(ErlNifEnv*          env,
+                               struct sockaddr_un* sockAddrP,
+                               unsigned int        addrLen,
+                               ERL_NIF_TERM*       eSockAddr);
+#endif
+
+extern
+char* esock_decode_ip4_address(ErlNifEnv*      env,
+                               ERL_NIF_TERM    eAddr,
+                               struct in_addr* inAddrP);
+extern
+char* esock_encode_ip4_address(ErlNifEnv*      env,
+                               struct in_addr* addrP,
+                               ERL_NIF_TERM*   eAddr);
+
+#if defined(HAVE_IN6) && defined(AF_INET6)
+extern
+char* esock_decode_ip6_address(ErlNifEnv*       env,
+                               ERL_NIF_TERM     eAddr,
+                               struct in6_addr* inAddrP);
+extern
+char* esock_encode_ip6_address(ErlNifEnv*       env,
+                               struct in6_addr* addrP,
+                               ERL_NIF_TERM*    eAddr);
+#endif
+
+extern char* esock_encode_timeval(ErlNifEnv*      env,
+                                  struct timeval* timeP,
+                                  ERL_NIF_TERM*   eTime);
+extern char* esock_decode_timeval(ErlNifEnv*      env,
+                                  ERL_NIF_TERM    eTime,
+                                  struct timeval* timeP);
+extern
+char* esock_decode_domain(ErlNifEnv*   env,
+                          ERL_NIF_TERM eDomain,
+                          int*         domain);
+extern
+char* esock_encode_domain(ErlNifEnv*    env,
+                          int           domain,
+                          ERL_NIF_TERM* eDomain);
+
+extern
+char* esock_decode_type(ErlNifEnv*   env,
+                        ERL_NIF_TERM eType,
+                        int*         type);
+extern
+char* esock_encode_type(ErlNifEnv*    env,
+                        int           type,
+                        ERL_NIF_TERM* eType);
+
+extern
+char* esock_decode_protocol(ErlNifEnv*   env,
+                            ERL_NIF_TERM eProtocol,
+                            int*         protocol);
+extern
+char* esock_encode_protocol(ErlNifEnv*    env,
+                            int           type,
+                            ERL_NIF_TERM* eProtocol);
+
+extern
+char* esock_decode_bufsz(ErlNifEnv*   env,
+                         ERL_NIF_TERM eVal,
+                         size_t       defSz,
+                         size_t*      sz);
+
+extern
+BOOLEAN_T esock_decode_string(ErlNifEnv*         env,
+                              const ERL_NIF_TERM eString,
+                              char**             stringP);
+
+extern
+BOOLEAN_T esock_extract_bool_from_map(ErlNifEnv*   env,
+                                      ERL_NIF_TERM map,
+                                      ERL_NIF_TERM key,
+                                      BOOLEAN_T    def);
+extern
+BOOLEAN_T esock_decode_bool(ERL_NIF_TERM val);
+extern
+ERL_NIF_TERM esock_encode_bool(BOOLEAN_T val);
+
+extern
+size_t esock_strnlen(const char *s, size_t maxlen);
+extern
+void esock_abort(const char* expr,
+                 const char* func,
+                 const char* file,
+                 int         line);
+
+extern
+ERL_NIF_TERM esock_make_ok2(ErlNifEnv* env, ERL_NIF_TERM any);
+extern
+ERL_NIF_TERM esock_make_ok3(ErlNifEnv* env, ERL_NIF_TERM val1, ERL_NIF_TERM val2);
+
+extern
+ERL_NIF_TERM esock_make_error(ErlNifEnv* env, ERL_NIF_TERM reason);
+extern
+ERL_NIF_TERM esock_make_error_str(ErlNifEnv* env, char* reason);
+extern
+ERL_NIF_TERM esock_make_error_errno(ErlNifEnv* env, int err);
+
+extern
+BOOLEAN_T esock_timestamp(char *buf, unsigned int len);
+
+extern
+void esock_warning_msg(const char* format, ... );
+
+
+#endif // SOCKET_UTIL_H__
diff --git a/erts/emulator/nifs/win32/win_prim_file.c b/erts/emulator/nifs/win32/win_prim_file.c
index d0aa70542f..e7d3924240 100644
--- a/erts/emulator/nifs/win32/win_prim_file.c
+++ b/erts/emulator/nifs/win32/win_prim_file.c
@@ -142,12 +142,15 @@ static posix_errno_t get_full_path(ErlNifEnv *env, WCHAR *input, efile_path_t *r
         maybe_unc_path = !sys_memcmp(result->data, L"\\\\", sizeof(WCHAR) * 2);
 
         if(maybe_unc_path && !is_long_path) {
-            /* \\localhost\c$\gurka -> \\?\UNC\localhost\c$\gurka */
+            /* \\localhost\c$\gurka -> \\?\UNC\localhost\c$\gurka
+             *
+             * Note that the length is reduced by 2 as the "\\" is replaced by
+             * the UNC prefix */
             sys_memmove(result->data + LP_UNC_PREFIX_SIZE,
                 &((WCHAR*)result->data)[2],
-                (actual_length - 1) * sizeof(WCHAR));
+                (actual_length + 1 - 2) * sizeof(WCHAR));
             sys_memcpy(result->data, LP_UNC_PREFIX, LP_UNC_PREFIX_SIZE);
-            actual_length += LP_UNC_PREFIX_LENGTH;
+            actual_length += LP_UNC_PREFIX_LENGTH - 2;
         } else if(!is_long_path) {
             /* C:\gurka -> \\?\C:\gurka */
             sys_memmove(result->data + LP_PREFIX_SIZE, result->data,
diff --git a/erts/emulator/pcre/LICENCE b/erts/emulator/pcre/LICENCE
index f6ef7fd766..760a6666b6 100644
--- a/erts/emulator/pcre/LICENCE
+++ b/erts/emulator/pcre/LICENCE
@@ -25,7 +25,7 @@ Email domain:     cam.ac.uk
 University of Cambridge Computing Service,
 Cambridge, England.
 
-Copyright (c) 1997-2018 University of Cambridge
+Copyright (c) 1997-2019 University of Cambridge
 All rights reserved.
 
 
@@ -34,9 +34,9 @@ PCRE JUST-IN-TIME COMPILATION SUPPORT
 
 Written by:       Zoltan Herczeg
 Email local part: hzmester
-Emain domain:     freemail.hu
+Email domain:     freemail.hu
 
-Copyright(c) 2010-2018 Zoltan Herczeg
+Copyright(c) 2010-2019 Zoltan Herczeg
 All rights reserved.
 
 
@@ -45,9 +45,9 @@ STACK-LESS JUST-IN-TIME COMPILER
 
 Written by:       Zoltan Herczeg
 Email local part: hzmester
-Emain domain:     freemail.hu
+Email domain:     freemail.hu
 
-Copyright(c) 2009-2018 Zoltan Herczeg
+Copyright(c) 2009-2019 Zoltan Herczeg
 All rights reserved.
 
 
diff --git a/erts/emulator/pcre/pcre-8.42.tar.bz2 b/erts/emulator/pcre/pcre-8.42.tar.bz2
deleted file mode 100644
index 61bfa38970..0000000000
--- a/erts/emulator/pcre/pcre-8.42.tar.bz2
+++ /dev/null
diff --git a/erts/emulator/pcre/pcre-8.43.tar.bz2 b/erts/emulator/pcre/pcre-8.43.tar.bz2
new file mode 100644
index 0000000000..e20c601f71
--- /dev/null
+++ b/erts/emulator/pcre/pcre-8.43.tar.bz2
diff --git a/erts/emulator/pcre/pcre.h b/erts/emulator/pcre/pcre.h
index 3563791223..49c9fc6dc8 100644
--- a/erts/emulator/pcre/pcre.h
+++ b/erts/emulator/pcre/pcre.h
@@ -43,9 +43,9 @@ POSSIBILITY OF SUCH DAMAGE.
 /* The current PCRE version information. */
 
 #define PCRE_MAJOR          8
-#define PCRE_MINOR          42
+#define PCRE_MINOR          43
 #define PCRE_PRERELEASE     
-#define PCRE_DATE           2018-03-20
+#define PCRE_DATE           2019-02-23
 
 /* When an application links to a PCRE DLL in Windows, the symbols that are
 imported have to be identified as such. When building PCRE, the appropriate
@@ -240,6 +240,9 @@ with J. */
 #define PCRE_UTF8_ERR20             20
 #define PCRE_UTF8_ERR21             21
 #define PCRE_UTF8_ERR22             22  /* Unused (was non-character) */
+#if defined(ERLANG_INTEGRATION)
+#define PCRE_UTF8_YIELD             23
+#endif
 
 /* Specific error codes for UTF-16 validity checks */
 
diff --git a/erts/emulator/pcre/pcre_compile.c b/erts/emulator/pcre/pcre_compile.c
index ae7f6e2a2a..6ac222b27e 100644
--- a/erts/emulator/pcre/pcre_compile.c
+++ b/erts/emulator/pcre/pcre_compile.c
@@ -6,7 +6,7 @@
 and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
-           Copyright (c) 1997-2016 University of Cambridge
+           Copyright (c) 1997-2018 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -3300,7 +3300,7 @@ for(;;)
       if ((*xclass_flags & XCL_MAP) == 0)
         {
         /* No bits are set for characters < 256. */
-        if (list[1] == 0) return TRUE;
+        if (list[1] == 0) return (*xclass_flags & XCL_NOT) == 0;
         /* Might be an empty repeat. */
         continue;
         }
@@ -7643,6 +7643,8 @@ for (;; ptr++)
         /* Can't determine a first byte now */
 
         if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE;
+        zerofirstchar = firstchar;
+        zerofirstcharflags = firstcharflags;
         continue;
 
 
@@ -8683,10 +8685,18 @@ do {
      if (!is_anchored(scode, new_map, cd, atomcount)) return FALSE;
      }
 
-   /* Positive forward assertions and conditions */
+   /* Positive forward assertion */
 
-   else if (op == OP_ASSERT || op == OP_COND)
+   else if (op == OP_ASSERT)
+     {
+     if (!is_anchored(scode, bracket_map, cd, atomcount)) return FALSE;
+     }
+
+   /* Condition; not anchored if no second branch */
+
+   else if (op == OP_COND)
      {
+     if (scode[GET(scode,1)] != OP_ALT) return FALSE;
      if (!is_anchored(scode, bracket_map, cd, atomcount)) return FALSE;
      }
 
diff --git a/erts/emulator/pcre/pcre_exec.c b/erts/emulator/pcre/pcre_exec.c
index 1946e97a72..55a7b377bf 100644
--- a/erts/emulator/pcre/pcre_exec.c
+++ b/erts/emulator/pcre/pcre_exec.c
@@ -6642,10 +6642,16 @@ typedef struct {
     REAL_PCRE *Xre;
     heapframe Xframe_zero; /* Always NO_RECURSE */
 
+    /* for yield in valid_utf() */
+
+    struct PRIV(valid_utf_ystate) valid_utf_ystate;
+    
     /* Original function parameters that need be saved */
     int Xstart_offset;
     int Xoffsetcount;
     int *Xoffsets;
+    int Xlength;
+    PCRE_SPTR Xsubject;
 } PcreExecContext;
 #endif  
    
@@ -6675,6 +6681,7 @@ pcre32_exec(const pcre32 *argument_re, const pcre32_extra *extra_data,
 #endif
 {
 #ifndef ERLANG_INTEGRATION
+#define ERTS_UPDATE_CONSUMED(X, MD)
 int rc, ocount, arg_offset_max;
 int newline;
 BOOL using_temporary_offsets = FALSE;
@@ -6736,6 +6743,8 @@ heapframe frame_zero;
   start_offset = exec_context->Xstart_offset;   \
   offsetcount = exec_context->Xoffsetcount;     \
   offsets = exec_context->Xoffsets;             \
+  length = exec_context->Xlength;               \
+  subject = exec_context->Xsubject;             \
 } while (0)
 
 #define SWAPOUT() do {				\
@@ -6750,8 +6759,30 @@ heapframe frame_zero;
   exec_context->Xstart_offset = start_offset;   \
   exec_context->Xoffsetcount = offsetcount;     \
   exec_context->Xoffsets = offsets;             \
+  exec_context->Xlength = length;               \
+  exec_context->Xsubject = subject;             \
 } while (0)
 
+#define ERTS_UPDATE_CONSUMED(X, MD)                                 \
+do {                                                                \
+    if (((X)->flags & PCRE_EXTRA_LOOP_LIMIT) != 0) {                \
+        unsigned long consumed__;                                   \
+        if (!(X)->restart_data) {                                   \
+            consumed__ = 0;                                         \
+        }                                                           \
+        else {                                                      \
+            PcreExecContext *ctx__ = (PcreExecContext *)            \
+                (*(X)->restart_data);                               \
+            consumed__ = ctx__->valid_utf_ystate.cnt;               \
+            ctx__->valid_utf_ystate.cnt = 0;                        \
+        }                                                           \
+        if ((MD)) {                                                 \
+            match_data *md__ = (MD);                                \
+            consumed__ += (X)->loop_limit - md__->loop_limit;       \
+        }                                                           \
+        *((X)->loop_counter_return) = consumed__;                   \
+    }                                                               \
+} while (0)
 PcreExecContext *exec_context;
 PcreExecContext internal_context;
 
@@ -6776,15 +6807,21 @@ pcre_uchar req_char;
      /* we are restarting, every initialization is skipped and we jump directly into the loop */
    exec_context = (PcreExecContext *) *(extra_data->restart_data);
    SWAPIN();
-
+   if (exec_context->valid_utf_ystate.yielded)
+       goto restart_valid_utf;
    goto RESTART_INTERRUPTED;
  } else {
    if (extra_data != NULL && 
        (extra_data->flags & PCRE_EXTRA_LOOP_LIMIT)) {
      exec_context = (PcreExecContext *) (erts_pcre_malloc)(sizeof(PcreExecContext));
-     *(extra_data->restart_data) = (void *) exec_context; 
+     *(extra_data->restart_data) = (void *) exec_context;
+     exec_context->valid_utf_ystate.yielded = 0;
      /* need freeing by special routine from client */
    } else {
+#if defined(ERLANG_INTEGRATION)
+     fprintf(stderr, "Unexpected execution path\n");
+     abort();
+#endif
      exec_context = &internal_context;
    }
    
@@ -6865,9 +6902,38 @@ code for an invalid string if a results vector is available. */
 if (utf && (options & PCRE_NO_UTF8_CHECK) == 0)
   {
   int erroroffset;
-  int errorcode = PRIV(valid_utf)((PCRE_PUCHAR)subject, length, &erroroffset);
+  int errorcode;
+
+#if !defined(ERLANG_INTEGRATION)
+  errorcode = PRIV(valid_utf)((PCRE_PUCHAR)subject, length);
+#else
+  struct PRIV(valid_utf_ystate) *ystate;
+  
+  if (!extra_data || !extra_data->restart_data) {
+      ystate = NULL;
+  }
+  else if (!(extra_data->flags & PCRE_EXTRA_LOOP_LIMIT)) {
+      exec_context->valid_utf_ystate.cnt = 10;
+      ystate = NULL;
+  }
+  else {
+      exec_context->valid_utf_ystate.yielded = 0;
+  restart_valid_utf:
+      ystate = &exec_context->valid_utf_ystate;
+      ystate->cnt = (int) extra_data->loop_limit;
+  }
+  errorcode = PRIV(yielding_valid_utf)((PCRE_PUCHAR)subject, length,
+                                       &erroroffset, ystate);
+#endif
   if (errorcode != 0)
     {
+#if defined(ERLANG_INTEGRATION)
+    if (ystate && ystate->yielded) {
+        ERTS_UPDATE_CONSUMED(extra_data, NULL);
+        SWAPOUT();
+        return PCRE_ERROR_LOOP_LIMIT;
+    }
+#endif
     if (offsetcount >= 2)
       {
       offsets[0] = erroroffset;
@@ -6890,6 +6956,11 @@ if (utf && (options & PCRE_NO_UTF8_CHECK) == 0)
     return PCRE_ERROR_BADUTF8_OFFSET;
 #endif
   }
+#if defined(ERLANG_INTEGRATION)
+else {
+    exec_context->valid_utf_ystate.cnt = 0;
+}
+#endif
 #endif
 
 /* If the pattern was successfully studied with JIT support, run the JIT
@@ -6950,7 +7021,11 @@ if (extra_data != NULL)
 #ifdef ERLANG_INTEGRATION
   if ((flags & PCRE_EXTRA_LOOP_LIMIT) != 0) 
     {
-    md->loop_limit = extra_data->loop_limit;
+        md->loop_limit = extra_data->loop_limit;
+        if (extra_data->restart_data)
+          md->loop_limit -= extra_data->loop_limit - exec_context->valid_utf_ystate.cnt;
+        if (md->loop_limit < 10)
+            md->loop_limit = 10; /* At least do something if we've come this far... */
     }
 #endif
   }
@@ -7266,14 +7341,8 @@ for(;;)
 #endif
         if ((start_bits[c/8] & (1 << (c&7))) != 0)
 	  {
-#ifdef ERLANG_INTEGRATION
-          if ((extra_data->flags & PCRE_EXTRA_LOOP_LIMIT) != 0) 
-            {
-            *extra_data->loop_counter_return = 
-               (extra_data->loop_limit - md->loop_limit);
-            }
-#endif
-          break;
+              ERTS_UPDATE_CONSUMED(extra_data, md);
+              break;
 	  }
         start_match++;
         }
@@ -7298,13 +7367,7 @@ for(;;)
         (pcre_uint32)(end_subject - start_match) < study->minlength)
       {
       rc = MATCH_NOMATCH;
-#ifdef ERLANG_INTEGRATION
-      if ((extra_data->flags & PCRE_EXTRA_LOOP_LIMIT) != 0) 
- 	{
- 	*extra_data->loop_counter_return = 
- 	  (extra_data->loop_limit - md->loop_limit);
-        }
-#endif
+      ERTS_UPDATE_CONSUMED(extra_data, md);
       break;
       }
 
@@ -7353,13 +7416,7 @@ for(;;)
         if (p >= end_subject)
           {
           rc = MATCH_NOMATCH;
-#ifdef ERLANG_INTEGRATION
-	if ((extra_data->flags & PCRE_EXTRA_LOOP_LIMIT) != 0) 
-	  {
-	  *extra_data->loop_counter_return = 
-	    (extra_data->loop_limit - md->loop_limit);
-          }
-#endif
+          ERTS_UPDATE_CONSUMED(extra_data, md);
           break;
           }
 
@@ -7390,11 +7447,7 @@ for(;;)
   EDEBUGF(("Calling match..."));
   rc = match(start_match, md->start_code, start_match, 2, md, NULL, 0);
 #ifdef ERLANG_INTEGRATION
-  if ((extra_data->flags & PCRE_EXTRA_LOOP_LIMIT) != 0) 
-    {
-    *extra_data->loop_counter_return = 
-       (extra_data->loop_limit - md->loop_limit);
-    }
+  ERTS_UPDATE_CONSUMED(extra_data, md);
   SWAPOUT();
   while(rc == PCRE_ERROR_LOOP_LIMIT) {
       EDEBUGF(("Loop limit break detected"));
diff --git a/erts/emulator/pcre/pcre_internal.h b/erts/emulator/pcre/pcre_internal.h
index c84dcb5a38..71f473e86f 100644
--- a/erts/emulator/pcre/pcre_internal.h
+++ b/erts/emulator/pcre/pcre_internal.h
@@ -2756,6 +2756,17 @@ extern int               PRIV(strcmp_uc_c8_utf)(const pcre_uchar *,
 
 #endif /* COMPILE_PCRE[8|16|32] */
 
+#if defined(ERLANG_INTEGRATION)
+struct PRIV(valid_utf_ystate) {
+    unsigned int cnt;
+    int length;
+    int yielded;
+    PCRE_PUCHAR p;
+};
+extern int               PRIV(yielding_valid_utf)(PCRE_PUCHAR, int, int *,
+                                                  struct PRIV(valid_utf_ystate) *);
+#endif
+                                               
 extern const pcre_uchar *PRIV(find_bracket)(const pcre_uchar *, BOOL, int);
 extern BOOL              PRIV(is_newline)(PCRE_PUCHAR, int, PCRE_PUCHAR,
                            int *, BOOL);
diff --git a/erts/emulator/pcre/pcre_jit_compile.c b/erts/emulator/pcre/pcre_jit_compile.c
index 926e40f6d3..2d2288f81e 100644
--- a/erts/emulator/pcre/pcre_jit_compile.c
+++ b/erts/emulator/pcre/pcre_jit_compile.c
@@ -9002,7 +9002,7 @@ if (exact > 1)
 #ifdef SUPPORT_UTF
       && !common->utf
 #endif
-      )
+      && type != OP_ANYNL && type != OP_EXTUNI)
     {
     OP2(SLJIT_ADD, TMP1, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(exact));
     add_jump(compiler, &backtrack->topbacktracks, CMP(SLJIT_GREATER, TMP1, 0, STR_END, 0));
diff --git a/erts/emulator/pcre/pcre_valid_utf8.c b/erts/emulator/pcre/pcre_valid_utf8.c
index 516d8f4725..1dc1f9ba0c 100644
--- a/erts/emulator/pcre/pcre_valid_utf8.c
+++ b/erts/emulator/pcre/pcre_valid_utf8.c
@@ -107,19 +107,80 @@ Returns:       = 0    if the string is a valid UTF-8 string
 int
 PRIV(valid_utf)(PCRE_PUCHAR string, int length, int *erroroffset)
 {
+
+#if defined(ERLANG_INTEGRATION)
+    return PRIV(yielding_valid_utf)(string, length, erroroffset, NULL);
+}
+
+int
+PRIV(yielding_valid_utf)(PCRE_PUCHAR string, int length, int *erroroffset, struct PRIV(valid_utf_ystate) *ystate)
+{
+#endif
+
 #ifdef SUPPORT_UTF
 register PCRE_PUCHAR p;
 
+#if defined(ERLANG_INTEGRATION)
+register long cnt;
+
+if (!ystate) {
+    cnt = -1;
+}
+else {
+    cnt = ystate->cnt;
+    if (ystate->yielded) {
+        p = ystate->p;
+        length = ystate->length;
+        if (length < 0) 
+            goto restart_length;
+        else
+            goto restart_validate;
+    }
+}
+#endif
+
 if (length < 0)
   {
-  for (p = string; *p != 0; p++);
-  length = (int)(p - string);
+      for (p = string; *p != 0; p++) {
+#if defined(ERLANG_INTEGRATION)
+          if (cnt > 0 && --cnt == 0) {
+              /*
+               * Return with cnt set to amount consumed;
+               * i.e. same amount as at start...
+               */
+              ystate->yielded = !0;
+              ystate->length = length;
+              ystate->p = p;
+              return PCRE_UTF8_YIELD;
+          }
+      restart_length:
+          (void) !0;
+#endif
+      }
+      length = (int)(p - string);
   }
 
 for (p = string; length-- > 0; p++)
   {
   register pcre_uchar ab, c, d;
 
+#if defined(ERLANG_INTEGRATION)
+
+  if (cnt > 0 && --cnt == 0) {
+      /*
+       * Return with cnt set to amount consumed;
+       * i.e. same amount as at start...
+       */
+      ystate->yielded = !0;
+      ystate->length = length;
+      ystate->p = p;
+      return PCRE_UTF8_YIELD;
+  }
+  
+  restart_validate:
+
+#endif
+  
   c = *p;
   if (c < 128) continue;                /* ASCII character */
 
@@ -290,6 +351,14 @@ for (p = string; length-- > 0; p++)
     }
   }
 
+#if defined(ERLANG_INTEGRATION)
+if (ystate) {
+    /* Return with cnt set to amount consumed... */
+    ystate->cnt -= cnt;
+    ystate->yielded = 0;
+}
+#endif
+
 #else  /* Not SUPPORT_UTF */
 (void)(string);  /* Keep picky compilers happy */
 (void)(length);
diff --git a/erts/emulator/sys/common/erl_check_io.c b/erts/emulator/sys/common/erl_check_io.c
index c681fa481f..fb18c837ab 100644
--- a/erts/emulator/sys/common/erl_check_io.c
+++ b/erts/emulator/sys/common/erl_check_io.c
@@ -44,7 +44,7 @@
 #include "erl_time.h"
 
 #if 0
-#define DEBUG_PRINT(FMT, ...) erts_printf(FMT "\r\n", ##__VA_ARGS__)
+#define DEBUG_PRINT(FMT, ...) do { erts_printf(FMT "\r\n", ##__VA_ARGS__); fflush(stdout); } while(0)
 #define DEBUG_PRINT_FD(FMT, STATE, ...)                                 \
     DEBUG_PRINT("%d: " FMT " (ev=%s, ac=%s, flg=%s)",                   \
                 (STATE) ? (STATE)->fd : (ErtsSysFdType)-1, ##__VA_ARGS__, \
@@ -534,6 +534,7 @@ erts_io_notify_port_task_executed(ErtsPortTaskType type,
             if (state->active_events & ERTS_POLL_EV_OUT)
                 oready(state->driver.select->outport, state);
             state->active_events = 0;
+            active_events = 0;
         }
     }
 
@@ -591,6 +592,96 @@ abort_tasks(ErtsDrvEventState *state, int mode)
     }
 }
 
+static void prepare_select_msg(struct erts_nif_select_event* e,
+                               enum ErlNifSelectFlags mode,
+                               Eterm recipient,
+                               ErtsResource* resource,
+                               Eterm msg,
+                               ErlNifEnv* msg_env,
+                               Eterm event_atom)
+{
+    ErtsMessage* mp;
+    Eterm* hp;
+    Uint hsz;
+
+    if (is_not_nil(e->pid)) {
+        ASSERT(e->mp);
+        erts_cleanup_messages(e->mp);
+    }
+
+    if (mode & ERL_NIF_SELECT_CUSTOM_MSG) {
+        if (msg_env) {
+            mp = erts_create_message_from_nif_env(msg_env);
+            ERL_MESSAGE_TERM(mp) = msg;
+        }
+        else {
+            hsz = size_object(msg);
+            mp = erts_alloc_message(hsz, &hp);
+            ERL_MESSAGE_TERM(mp) = copy_struct(msg, hsz, &hp, &mp->hfrag.off_heap);
+        }
+    }
+    else {
+        ErtsBinary* bin;
+        Eterm resource_term, ref_term, tuple;
+        Eterm* hp_start;
+
+         /* {select, Resource, Ref, EventAtom} */
+        hsz = 5 + ERTS_MAGIC_REF_THING_SIZE;
+        if (is_internal_ref(msg))
+            hsz += ERTS_REF_THING_SIZE;
+        else
+            ASSERT(is_immed(msg));
+
+        mp = erts_alloc_message(hsz, &hp);
+        hp_start = hp;
+
+        bin = ERTS_MAGIC_BIN_FROM_UNALIGNED_DATA(resource);
+        resource_term = erts_mk_magic_ref(&hp, &mp->hfrag.off_heap, &bin->binary);
+        if (is_internal_ref(msg)) {
+            Uint32* refn = internal_ref_numbers(msg);
+            write_ref_thing(hp, refn[0], refn[1], refn[2]);
+            ref_term = make_internal_ref(hp);
+            hp += ERTS_REF_THING_SIZE;
+        }
+        else {
+            ASSERT(is_immed(msg));
+            ref_term = msg;
+        }
+        tuple = TUPLE4(hp, am_select, resource_term, ref_term, event_atom);
+        hp += 5;
+        ERL_MESSAGE_TERM(mp) = tuple;
+        ASSERT(hp == hp_start + hsz); (void)hp_start;
+    }
+
+    ASSERT(is_not_nil(recipient));
+    e->pid = recipient;
+    e->mp = mp;
+}
+
+static ERTS_INLINE void send_select_msg(struct erts_nif_select_event* e)
+{
+    Process* rp = erts_proc_lookup(e->pid);
+
+    ASSERT(is_internal_pid(e->pid));
+    if (!rp) {
+        erts_cleanup_messages(e->mp);
+        return;
+    }
+
+    erts_queue_message(rp, 0, e->mp, ERL_MESSAGE_TERM(e->mp), am_system);
+}
+
+static void clear_select_event(struct erts_nif_select_event* e)
+{
+    if (is_not_nil(e->pid)) {
+        /* Discard unsent message */
+        ASSERT(e->mp);
+        erts_cleanup_messages(e->mp);
+        e->mp = NULL;
+        e->pid = NIL;
+    }
+}
+
 static void
 deselect(ErtsDrvEventState *state, int mode)
 {
@@ -621,8 +712,8 @@ deselect(ErtsDrvEventState *state, int mode)
         erts_io_control(state, ERTS_POLL_OP_DEL, 0);
 	switch (state->type) {
         case ERTS_EV_TYPE_NIF:
-            state->driver.nif->in.pid = NIL;
-            state->driver.nif->out.pid = NIL;
+            clear_select_event(&state->driver.nif->in);
+            clear_select_event(&state->driver.nif->out);
             enif_release_resource(state->driver.stop.resource->data);
             state->driver.stop.resource = NULL;
             break;
@@ -752,6 +843,8 @@ driver_select(ErlDrvPort ix, ErlDrvEvent e, int mode, int on)
             ret = 0;
             goto done_unknown;
         }
+        /* For some reason (don't know why), we do not clean all
+           events when doing ERL_DRV_USE_NO_CALLBACK. */
         else if ((mode&ERL_DRV_USE_NO_CALLBACK) == ERL_DRV_USE) {
             mode |= (ERL_DRV_READ | ERL_DRV_WRITE);
         }
@@ -943,12 +1036,21 @@ done_unknown:
 }
 
 int
-enif_select(ErlNifEnv* env,
-            ErlNifEvent e,
-            enum ErlNifSelectFlags mode,
-            void* obj,
-            const ErlNifPid* pid,
-            Eterm ref)
+enif_select(ErlNifEnv* env, ErlNifEvent e, enum ErlNifSelectFlags mode,
+            void* obj, const ErlNifPid* pid, Eterm msg)
+{
+    return enif_select_x(env, e, mode, obj, pid, msg, NULL);
+}
+
+
+int
+enif_select_x(ErlNifEnv* env,
+              ErlNifEvent e,
+              enum ErlNifSelectFlags mode,
+              void* obj,
+              const ErlNifPid* pid,
+              Eterm msg,
+              ErlNifEnv* msg_env)
 {
     int on;
     ErtsResource* resource = DATA_TO_RESOURCE(obj);
@@ -962,11 +1064,11 @@ enif_select(ErlNifEnv* env,
     ErtsDrvSelectDataState *free_select = NULL;
     ErtsNifSelectDataState *free_nif = NULL;
 
-    ASSERT(!resource->monitors);
+    ASSERT(!erts_dbg_is_resource_dying(resource));
 
 #ifdef ERTS_SYS_CONTINOUS_FD_NUMBERS
     if (!grow_drv_ev_state(fd)) {
-        if (fd > 0) nif_select_large_fd_error(fd, mode, resource, ref);
+        if (fd > 0) nif_select_large_fd_error(fd, mode, resource, msg);
         return INT_MIN | ERL_NIF_SELECT_INVALID_EVENT;
     }
 #endif
@@ -993,7 +1095,7 @@ enif_select(ErlNifEnv* env,
         ctl_op = ERTS_POLL_OP_DEL;
     }
     else {
-        on = 1;
+        on = !(mode & ERL_NIF_SELECT_CANCEL);
         ASSERT(mode);
         if (mode & ERL_DRV_READ) {
             ctl_events |= ERTS_POLL_EV_IN;
@@ -1012,21 +1114,21 @@ enif_select(ErlNifEnv* env,
          * Changing process and/or ref is ok (I think?).
          */
         if (state->driver.stop.resource != resource)
-            nif_select_steal(state, ERL_DRV_READ | ERL_DRV_WRITE, resource, ref);
+            nif_select_steal(state, ERL_DRV_READ | ERL_DRV_WRITE, resource, msg);
         break;
     case ERTS_EV_TYPE_DRV_SEL:
-        nif_select_steal(state, mode, resource, ref);
+        nif_select_steal(state, mode, resource, msg);
         break;
     case ERTS_EV_TYPE_STOP_USE: {
         erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
-        print_nif_select_op(dsbufp, fd, mode, resource, ref);
+        print_nif_select_op(dsbufp, fd, mode, resource, msg);
         steal_pending_stop_use(dsbufp, ERTS_INVALID_ERL_DRV_PORT, state, mode, on);
         ASSERT(state->type == ERTS_EV_TYPE_NONE);
         break;
     }
     case ERTS_EV_TYPE_STOP_NIF: {
         erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
-        print_nif_select_op(dsbufp, fd, mode, resource, ref);
+        print_nif_select_op(dsbufp, fd, mode, resource, msg);
         steal_pending_stop_nif(dsbufp, resource, state, mode, on);
         if (state->type == ERTS_EV_TYPE_STOP_NIF) {
             ret = ERL_NIF_SELECT_STOP_SCHEDULED;  /* ?? */
@@ -1082,7 +1184,7 @@ enif_select(ErlNifEnv* env,
 
     if (on) {
         const Eterm recipient = pid ? pid->pid : env->proc->common.id;
-        Uint32* refn;
+        ASSERT(is_internal_pid(recipient));
         if (!state->driver.nif)
             state->driver.nif = alloc_nif_select_data();
         if (state->type == ERTS_EV_TYPE_NONE) {
@@ -1093,64 +1195,62 @@ enif_select(ErlNifEnv* env,
         ASSERT(state->type == ERTS_EV_TYPE_NIF);
         ASSERT(state->driver.stop.resource == resource);
         if (mode & ERL_DRV_READ) {
-            state->driver.nif->in.pid = recipient;
-            if (is_immed(ref)) {
-                state->driver.nif->in.immed = ref;
-            } else {
-                ASSERT(is_internal_ref(ref));
-                refn = internal_ref_numbers(ref);
-                state->driver.nif->in.immed = THE_NON_VALUE;
-                sys_memcpy(state->driver.nif->in.refn, refn,
-                           sizeof(state->driver.nif->in.refn));
-            }
+            prepare_select_msg(&state->driver.nif->in, mode, recipient,
+                               resource, msg, msg_env, am_ready_input);
+            msg_env = NULL;
         }
         if (mode & ERL_DRV_WRITE) {
-            state->driver.nif->out.pid = recipient;
-            if (is_immed(ref)) {
-                state->driver.nif->out.immed = ref;
-            } else {
-                ASSERT(is_internal_ref(ref));
-                refn = internal_ref_numbers(ref);
-                state->driver.nif->out.immed = THE_NON_VALUE;
-                sys_memcpy(state->driver.nif->out.refn, refn,
-                           sizeof(state->driver.nif->out.refn));
-            }
+            prepare_select_msg(&state->driver.nif->out, mode, recipient,
+                               resource, msg, msg_env, am_ready_output);
         }
         ret = 0;
     }
     else { /* off */
+        ret = 0;
         if (state->type == ERTS_EV_TYPE_NIF) {
-            state->driver.nif->in.pid = NIL;
-            state->driver.nif->out.pid = NIL;
-        }
-        ASSERT(state->events==0);
-        if (!wake_poller) {
-            /*
-             * Safe to close fd now as it is not in pollset
-             * or there was no need to eject fd (kernel poll)
-             */
-            if (state->type == ERTS_EV_TYPE_NIF) {
-                ASSERT(state->driver.stop.resource == resource);
-                call_stop = CALL_STOP_AND_RELEASE;
-                state->driver.stop.resource = NULL;
+            if (mode & ERL_NIF_SELECT_READ
+                && is_not_nil(state->driver.nif->in.pid)) {
+                clear_select_event(&state->driver.nif->in);
+                ret |= ERL_NIF_SELECT_READ_CANCELLED;
             }
-            else {
-                ASSERT(!state->driver.stop.resource);
-                call_stop = CALL_STOP;
+            if (mode & ERL_NIF_SELECT_WRITE
+                && is_not_nil(state->driver.nif->out.pid)) {
+                clear_select_event(&state->driver.nif->out);
+                ret |= ERL_NIF_SELECT_WRITE_CANCELLED;
             }
-            state->type = ERTS_EV_TYPE_NONE;
-            ret = ERL_NIF_SELECT_STOP_CALLED;
         }
-        else {
-            /* Not safe to close fd, postpone stop_select callback. */
-            if (state->type == ERTS_EV_TYPE_NONE) {
-                ASSERT(!state->driver.stop.resource);
-                state->driver.stop.resource = resource;
-                enif_keep_resource(resource);
+        if (mode & ERL_NIF_SELECT_STOP) {
+            ASSERT(state->events==0);
+            if (!wake_poller) {
+                /*
+                 * Safe to close fd now as it is not in pollset
+                 * or there was no need to eject fd (kernel poll)
+                 */
+                if (state->type == ERTS_EV_TYPE_NIF) {
+                    ASSERT(state->driver.stop.resource == resource);
+                    call_stop = CALL_STOP_AND_RELEASE;
+                    state->driver.stop.resource = NULL;
+                }
+                else {
+                    ASSERT(!state->driver.stop.resource);
+                    call_stop = CALL_STOP;
+                }
+                state->type = ERTS_EV_TYPE_NONE;
+                ret |= ERL_NIF_SELECT_STOP_CALLED;
+            }
+            else {
+                /* Not safe to close fd, postpone stop_select callback. */
+                if (state->type == ERTS_EV_TYPE_NONE) {
+                    ASSERT(!state->driver.stop.resource);
+                    state->driver.stop.resource = resource;
+                    enif_keep_resource(resource);
+                }
+                state->type = ERTS_EV_TYPE_STOP_NIF;
+                ret |= ERL_NIF_SELECT_STOP_SCHEDULED;
             }
-            state->type = ERTS_EV_TYPE_STOP_NIF;
-            ret = ERL_NIF_SELECT_STOP_SCHEDULED;
         }
+        else
+            ASSERT(mode & ERL_NIF_SELECT_CANCEL);
     }
 
 done:
@@ -1328,7 +1428,8 @@ print_nif_select_op(erts_dsprintf_buf_t *dsbufp,
 		  (int) fd,
 		  mode & ERL_NIF_SELECT_READ ? " READ" : "",
 		  mode & ERL_NIF_SELECT_WRITE ? " WRITE" : "",
-		  mode & ERL_NIF_SELECT_STOP ? " STOP" : "",
+		  (mode & ERL_NIF_SELECT_STOP ? " STOP"
+                   : (mode & ERL_NIF_SELECT_CANCEL ? " CANCEL" : "")),
 		  resource->type->module,
                   resource->type->name,
                   ref);
@@ -1531,53 +1632,6 @@ oready(Eterm id, ErtsDrvEventState *state)
     }
 }
 
-static ERTS_INLINE void
-send_event_tuple(struct erts_nif_select_event* e, ErtsResource* resource,
-                 Eterm event_atom)
-{
-    Process* rp = erts_proc_lookup(e->pid);
-    ErtsProcLocks rp_locks = 0;
-    ErtsMessage* mp;
-    ErlOffHeap* ohp;
-    ErtsBinary* bin;
-    Eterm* hp;
-    Uint hsz;
-    Eterm resource_term, ref_term, tuple;
-
-    if (!rp) {
-        return;
-    }
-
-    bin = ERTS_MAGIC_BIN_FROM_UNALIGNED_DATA(resource);
-
-     /* {select, Resource, Ref, EventAtom} */
-    if (is_value(e->immed)) {
-        hsz = 5 + ERTS_MAGIC_REF_THING_SIZE;
-    }
-    else {
-        hsz = 5 + ERTS_MAGIC_REF_THING_SIZE + ERTS_REF_THING_SIZE;
-    }
-
-    mp = erts_alloc_message_heap(rp, &rp_locks, hsz, &hp, &ohp);
-
-    resource_term = erts_mk_magic_ref(&hp, ohp, &bin->binary);
-    if (is_value(e->immed)) {
-        ASSERT(is_immed(e->immed));
-        ref_term = e->immed;
-    }
-    else {
-        write_ref_thing(hp, e->refn[0], e->refn[1], e->refn[2]);
-        ref_term = make_internal_ref(hp);
-        hp += ERTS_REF_THING_SIZE;
-    }
-    tuple = TUPLE4(hp, am_select, resource_term, ref_term, event_atom);
-
-    erts_queue_message(rp, rp_locks, mp, tuple, am_system);
-
-    if (rp_locks)
-        erts_proc_unlock(rp, rp_locks);
-}
-
 static void bad_fd_in_pollset(ErtsDrvEventState *, Eterm inport, Eterm outport);
 
 void
@@ -1751,7 +1805,6 @@ erts_check_io(ErtsPollThread *psi, ErtsMonotonicTime timeout_time)
         case ERTS_EV_TYPE_NIF: { /* Requested via enif_select()... */
             struct erts_nif_select_event in = {NIL};
             struct erts_nif_select_event out = {NIL};
-            ErtsResource* resource = NULL;
 
             if (revents & (ERTS_POLL_EV_IN|ERTS_POLL_EV_OUT)) {
                 if (revents & ERTS_POLL_EV_OUT) {
@@ -1759,6 +1812,7 @@ erts_check_io(ErtsPollThread *psi, ErtsMonotonicTime timeout_time)
                         out = state->driver.nif->out;
                         resource = state->driver.stop.resource;
                         state->driver.nif->out.pid = NIL;
+                        state->driver.nif->out.mp = NULL;
                     }
                 }
                 if (revents & ERTS_POLL_EV_IN) {
@@ -1766,6 +1820,7 @@ erts_check_io(ErtsPollThread *psi, ErtsMonotonicTime timeout_time)
                         in = state->driver.nif->in;
                         resource = state->driver.stop.resource;
                         state->driver.nif->in.pid = NIL;
+                        state->driver.nif->in.mp = NULL;
                     }
                 }
                 state->events &= ~revents;
@@ -1778,10 +1833,10 @@ erts_check_io(ErtsPollThread *psi, ErtsMonotonicTime timeout_time)
             erts_mtx_unlock(fd_mtx(fd));
 
             if (is_not_nil(in.pid)) {
-                send_event_tuple(&in, resource, am_ready_input);
+                send_select_msg(&in);
             }
             if (is_not_nil(out.pid)) {
-                send_event_tuple(&out, resource, am_ready_output);
+                send_select_msg(&out);
             }
             continue;
         }
@@ -2262,14 +2317,14 @@ erts_check_io_info(void *proc)
 
 #if ERTS_POLL_USE_FALLBACK
     erts_poll_info_flbk(get_fallback_pollset(), &piv[0]);
-    piv[0].poll_threads = 1;
+    piv[0].poll_threads = 0;
     piv[0].active_fds = 0;
     piv++;
 #endif
 
 #if ERTS_POLL_USE_SCHEDULER_POLLING
     erts_poll_info(get_scheduler_pollset(0), &piv[0]);
-    piv[0].poll_threads = 1;
+    piv[0].poll_threads = 0;
     piv[0].active_fds = 0;
     piv++;
 #endif
@@ -2439,6 +2494,10 @@ drvmode2str(int mode) {
     case ERL_DRV_WRITE|ERL_DRV_USE: return "WRITE|USE";
     case ERL_DRV_READ|ERL_DRV_WRITE|ERL_DRV_USE: return "READ|WRITE|USE";
     case ERL_DRV_USE: return "USE";
+    case ERL_DRV_READ|ERL_DRV_USE_NO_CALLBACK: return "READ|USE_NO_CB";
+    case ERL_DRV_WRITE|ERL_DRV_USE_NO_CALLBACK: return "WRITE|USE_NO_CB";
+    case ERL_DRV_READ|ERL_DRV_WRITE|ERL_DRV_USE_NO_CALLBACK: return "READ|WRITE|USE_NO_CB";
+    case ERL_DRV_USE_NO_CALLBACK: return "USE_NO_CB";
     case ERL_DRV_READ: return "READ";
     case ERL_DRV_WRITE: return "WRITE";
     case ERL_DRV_READ|ERL_DRV_WRITE: return "READ|WRITE";
@@ -2448,10 +2507,16 @@ drvmode2str(int mode) {
 
 static ERTS_INLINE char *
 nifmode2str(enum ErlNifSelectFlags mode) {
+    if (mode & ERL_NIF_SELECT_STOP)
+        return "STOP";
     switch (mode) {
     case ERL_NIF_SELECT_READ: return "READ";
     case ERL_NIF_SELECT_WRITE: return "WRITE";
-    case ERL_NIF_SELECT_STOP: return "STOP";
+    case ERL_NIF_SELECT_READ|ERL_NIF_SELECT_WRITE: return "READ|WRITE";
+    case ERL_NIF_SELECT_CANCEL|ERL_NIF_SELECT_READ: return "CANCEL|READ";
+    case ERL_NIF_SELECT_CANCEL|ERL_NIF_SELECT_WRITE: return "CANCEL|WRITE";
+    case ERL_NIF_SELECT_CANCEL|ERL_NIF_SELECT_READ|ERL_NIF_SELECT_WRITE:
+        return "CANCEL|READ|WRITE";
     default: return "UNKNOWN";
     }
 }
diff --git a/erts/emulator/sys/common/erl_check_io.h b/erts/emulator/sys/common/erl_check_io.h
index 31182be5ec..0f3fc4f7a2 100644
--- a/erts/emulator/sys/common/erl_check_io.h
+++ b/erts/emulator/sys/common/erl_check_io.h
@@ -138,8 +138,7 @@ typedef struct {
 
 struct erts_nif_select_event {
     Eterm pid;
-    Eterm immed;
-    Uint32 refn[ERTS_REF_NUMBERS];
+    ErtsMessage *mp;
 };
 
 typedef struct {
diff --git a/erts/emulator/sys/common/erl_mmap.h b/erts/emulator/sys/common/erl_mmap.h
index 539daea419..3085bf7e19 100644
--- a/erts/emulator/sys/common/erl_mmap.h
+++ b/erts/emulator/sys/common/erl_mmap.h
@@ -176,4 +176,61 @@ void hard_dbg_remove_mseg(void* seg, UWord sz);
 
 #endif /* HAVE_ERTS_MMAP */
 
+/* Marks the given memory region as unused without freeing it, letting the OS
+ * reclaim its physical memory with the promise that we'll get it back (without
+ * its contents) the next time it's accessed. */
+ERTS_GLB_INLINE void erts_mem_discard(void *p, UWord size);
+
+#if ERTS_GLB_INLINE_INCL_FUNC_DEF
+
+#ifdef VALGRIND
+    #include <valgrind/memcheck.h>
+
+    ERTS_GLB_INLINE void erts_mem_discard(void *ptr, UWord size) {
+        VALGRIND_MAKE_MEM_UNDEFINED(ptr, size);
+    }
+#elif defined(DEBUG)
+    /* Try to provoke crashes by filling the discard region with garbage. It's
+     * extremely hard to find bugs where we've discarded too much, as the
+     * region often retains its old contents if it's accessed before the OS
+     * reclaims it. */
+    ERTS_GLB_INLINE void erts_mem_discard(void *ptr, UWord size) {
+        static const char pattern[] = "DISCARDED";
+        char *data;
+        int i;
+
+        for(i = 0, data = ptr; i < size; i++) {
+            data[i] = pattern[i % sizeof(pattern)];
+        }
+    }
+#elif defined(HAVE_SYS_MMAN_H) && !(defined(__sun) || defined(__sun__))
+    #include <sys/mman.h>
+
+    ERTS_GLB_INLINE void erts_mem_discard(void *ptr, UWord size) {
+    #ifdef MADV_FREE
+        /* This is preferred as it doesn't necessarily free the pages right
+         * away, which is a bit faster than MADV_DONTNEED. */
+        madvise(ptr, size, MADV_FREE);
+    #else
+        madvise(ptr, size, MADV_DONTNEED);
+    #endif
+    }
+#elif defined(_WIN32)
+    #include <winbase.h>
+
+    /* MEM_RESET is defined on all supported versions of Windows, and has the
+     * same semantics as MADV_FREE. */
+    ERTS_GLB_INLINE void erts_mem_discard(void *ptr, UWord size) {
+        VirtualAlloc(ptr, size, MEM_RESET, PAGE_READWRITE);
+    }
+#else
+    /* Dummy implementation. */
+    ERTS_GLB_INLINE void erts_mem_discard(void *ptr, UWord size) {
+        (void)ptr;
+        (void)size;
+    }
+#endif
+
+#endif /* ERTS_GLB_INLINE_INCL_FUNC_DEF */
+
 #endif /* ERL_MMAP_H__ */
diff --git a/erts/emulator/sys/common/erl_osenv.c b/erts/emulator/sys/common/erl_osenv.c
index 6a16377736..f055c5f854 100644
--- a/erts/emulator/sys/common/erl_osenv.c
+++ b/erts/emulator/sys/common/erl_osenv.c
@@ -167,9 +167,10 @@ void erts_osenv_init(erts_osenv_t *env) {
     env->tree = NULL;
 }
 
-static void destroy_foreach(env_rbtnode_t *node, void *_state) {
+static int destroy_foreach(env_rbtnode_t *node, void *_state, Sint reds) {
     erts_free(ERTS_ALC_T_ENVIRONMENT, node);
     (void)_state;
+    return 1;
 }
 
 void erts_osenv_clear(erts_osenv_t *env) {
@@ -182,7 +183,7 @@ struct __env_merge {
     erts_osenv_t *env;
 };
 
-static void merge_foreach(env_rbtnode_t *node, void *_state) {
+static int merge_foreach(env_rbtnode_t *node, void *_state, Sint reds) {
     struct __env_merge *state = (struct __env_merge*)(_state);
     env_rbtnode_t *existing_node;
 
@@ -191,6 +192,7 @@ static void merge_foreach(env_rbtnode_t *node, void *_state) {
     if(existing_node == NULL || state->overwrite_existing) {
         erts_osenv_put_native(state->env, &node->key, &node->value);
     }
+    return 1;
 }
 
 void erts_osenv_merge(erts_osenv_t *env, const erts_osenv_t *with, int overwrite) {
@@ -208,7 +210,7 @@ struct __env_foreach_term {
     void *user_state;
 };
 
-static void foreach_term_wrapper(env_rbtnode_t *node, void *_state) {
+static int foreach_term_wrapper(env_rbtnode_t *node, void *_state, Sint reds) {
     struct __env_foreach_term *state = (struct __env_foreach_term*)_state;
     Eterm key, value;
 
@@ -218,6 +220,7 @@ static void foreach_term_wrapper(env_rbtnode_t *node, void *_state) {
         node->value.length, (byte*)node->value.data);
 
     state->user_callback(state->process, state->user_state, key, value);
+    return 1;
 }
 
 void erts_osenv_foreach_term(const erts_osenv_t *env, struct process *process,
@@ -314,10 +317,11 @@ struct __env_foreach_native {
     void *user_state;
 };
 
-static void foreach_native_wrapper(env_rbtnode_t *node, void *_state) {
+static int foreach_native_wrapper(env_rbtnode_t *node, void *_state, Sint reds) {
     struct __env_foreach_native *state = (struct __env_foreach_native*)_state;
 
     state->user_callback(state->user_state, &node->key, &node->value);
+    return 1;
 }
 
 void erts_osenv_foreach_native(const erts_osenv_t *env, void *state,
diff --git a/erts/emulator/sys/common/erl_poll.c b/erts/emulator/sys/common/erl_poll.c
index 51d50933ff..1b125056f5 100644
--- a/erts/emulator/sys/common/erl_poll.c
+++ b/erts/emulator/sys/common/erl_poll.c
@@ -872,8 +872,8 @@ update_pollset(ErtsPollSet *ps, int fd, ErtsPollOp op, ErtsPollEvents events)
         }
     }
 
-#if defined(EV_DISPATCH) && !defined(__OpenBSD__)
-    /* If we have EV_DISPATCH we use it, unless we are on OpenBSD as the
+#if defined(EV_DISPATCH) && !(defined(__OpenBSD__) || defined(__NetBSD__))
+    /* If we have EV_DISPATCH we use it, unless we are on OpenBSD/NetBSD as the
        behavior of EV_EOF seems to be edge triggered there and we need it
        to be level triggered.
 
@@ -924,7 +924,7 @@ update_pollset(ErtsPollSet *ps, int fd, ErtsPollOp op, ErtsPollEvents events)
         ERTS_EV_SET(&evts[len++], fd, EVFILT_WRITE, flags, (void *) ERTS_POLL_EV_OUT);
     }
 #else
-    uint32_t flags = EV_ADD;
+    uint32_t flags = EV_ADD|EV_ENABLE;
 
     if (ps->oneshot) flags |= EV_ONESHOT;
 
@@ -932,9 +932,27 @@ update_pollset(ErtsPollSet *ps, int fd, ErtsPollOp op, ErtsPollEvents events)
         erts_atomic_dec_nob(&ps->no_of_user_fds);
         /* We don't do anything when a delete is issued. The fds will be removed
            when they are triggered, or when they are closed. */
-        events = 0;
+        if (ps->oneshot)
+            events = 0;
+        else {
+            flags = EV_DELETE;
+            events = ERTS_POLL_EV_IN;
+        }
     } else if (op == ERTS_POLL_OP_ADD) {
         erts_atomic_inc_nob(&ps->no_of_user_fds);
+        /* Only allow EV_IN in non-oneshot poll-sets */
+        ASSERT(ps->oneshot || events == ERTS_POLL_EV_IN);
+    } else if (!ps->oneshot) {
+        ASSERT(op == ERTS_POLL_OP_MOD);
+        /* If we are not oneshot and do a mod we should disable the FD.
+           We assume that it is only the read side that is active as
+           currently only read is selected upon in the non-oneshot
+           poll-sets. */
+        if (!events)
+            flags = EV_DISABLE;
+        else
+            flags = EV_ENABLE;
+        events = ERTS_POLL_EV_IN;
     }
 
     if (events & ERTS_POLL_EV_IN) {
@@ -961,16 +979,15 @@ update_pollset(ErtsPollSet *ps, int fd, ErtsPollOp op, ErtsPollEvents events)
         for (i = 0; i < len; i++) {
             const char *flags = "UNKNOWN";
             if (evts[i].flags == (EV_DELETE)) flags = "EV_DELETE";
-            if (evts[i].flags == (EV_ADD|EV_ONESHOT)) flags = "EV_ADD|EV_ONESHOT";
             if (evts[i].flags == (EV_ADD)) flags = "EV_ADD";
+            if (evts[i].flags == (EV_ADD|EV_ONESHOT)) flags = "EV_ADD|EV_ONESHOT";
+            if (evts[i].flags == (EV_ENABLE)) flags = "EV_ENABLE";
+            if (evts[i].flags == (EV_DISABLE)) flags = "EV_DISABLE";
+            if (evts[i].flags == (EV_ADD|EV_DISABLE)) flags = "EV_ADD|EV_DISABLE";
 #ifdef EV_DISPATCH
             if (evts[i].flags == (EV_ADD|EV_DISPATCH)) flags = "EV_ADD|EV_DISPATCH";
-            if (evts[i].flags == (EV_ADD|EV_DISABLE)) flags = "EV_ADD|EV_DISABLE";
             if (evts[i].flags == (EV_ENABLE|EV_DISPATCH)) flags = "EV_ENABLE|EV_DISPATCH";
-            if (evts[i].flags == (EV_ENABLE)) flags = "EV_ENABLE";
-            if (evts[i].flags == (EV_DISABLE)) flags = "EV_DISABLE";
             if (evts[i].flags == (EV_DISABLE|EV_DISPATCH)) flags = "EV_DISABLE|EV_DISABLE";
-            if (evts[i].flags == (EV_DISABLE)) flags = "EV_DISABLE";
 #endif
 
             keventbp += sprintf(keventbp, "%s{%lu, %s, %s}",i > 0 ? ", " : "",
@@ -2326,6 +2343,7 @@ uint32_t epoll_events(int kp_fd, int fd)
 {
     /* For epoll we read the information about what is selected upon from the proc fs.*/
     char fname[30];
+    char s[256];
     FILE *f;
     unsigned int pos, flags, mnt_id;
     int line = 0;
@@ -2343,16 +2361,17 @@ uint32_t epoll_events(int kp_fd, int fd)
     }
     if (fscanf(f,"\nmnt_id:\t%x\n", &mnt_id));
     line += 3;
-    while (!feof(f)) {
+    while (fgets(s, sizeof(s) / sizeof(*s), f)) {
         /* tfd:       10 events: 40000019 data:       180000000a */
         int ev_fd;
         uint32_t events;
         uint64_t data;
-        if (fscanf(f,"tfd:%d events:%x data:%llx\n", &ev_fd, &events,
+        if (sscanf(s,"tfd:%d events:%x data:%llx", &ev_fd, &events,
                    (unsigned long long*)&data) != 3) {
             fprintf(stderr,"failed to parse file %s on line %d, errno = %d\n", fname,
                     line,
                     errno);
+            fclose(f);
             return 0;
         }
         if (fd == ev_fd) {
@@ -2392,6 +2411,7 @@ ERTS_POLL_EXPORT(erts_poll_get_selected_events)(ErtsPollSet *ps,
 
     /* For epoll we read the information about what is selected upon from the proc fs.*/
     char fname[30];
+    char s[256];
     FILE *f;
     unsigned int pos, flags, mnt_id;
     int line = 0;
@@ -2406,20 +2426,22 @@ ERTS_POLL_EXPORT(erts_poll_get_selected_events)(ErtsPollSet *ps,
     if (fscanf(f,"pos:\t%x\nflags:\t%x", &pos, &flags) != 2) {
         fprintf(stderr,"failed to parse file %s, errno = %d\n", fname, errno);
         ASSERT(0);
+        fclose(f);
         return;
     }
     if (fscanf(f,"\nmnt_id:\t%x\n", &mnt_id));
     line += 3;
-    while (!feof(f)) {
+    while (fgets(s, sizeof(s) / sizeof(*s), f)) {
         /* tfd:       10 events: 40000019 data:       180000000a */
         int fd;
         uint32_t events;
         uint64_t data;
-        if (fscanf(f,"tfd:%d events:%x data:%llx\n", &fd, &events,
+        if (sscanf(s,"tfd:%d events:%x data:%llx", &fd, &events,
                    (unsigned long long*)&data) != 3) {
             fprintf(stderr,"failed to parse file %s on line %d, errno = %d\n",
                     fname, line, errno);
             ASSERT(0);
+            fclose(f);
             return;
         }
         if (fd == ps->wake_fds[0] || fd == ps->wake_fds[1])
@@ -2435,6 +2457,7 @@ ERTS_POLL_EXPORT(erts_poll_get_selected_events)(ErtsPollSet *ps,
         ev[fd] = (ERTS_POLL_EV_IN|ERTS_POLL_EV_OUT) & ERTS_POLL_EV_N2E(events);
         line++;
     }
+    fclose(f);
 #else
     for (fd = 0; fd < len; fd++)
         ev[fd] = ERTS_POLL_EV_NONE;
diff --git a/erts/emulator/sys/unix/sys_drivers.c b/erts/emulator/sys/unix/sys_drivers.c
index 816bdea9c5..92020c6f35 100644
--- a/erts/emulator/sys/unix/sys_drivers.c
+++ b/erts/emulator/sys/unix/sys_drivers.c
@@ -732,7 +732,8 @@ static ErlDrvData spawn_start(ErlDrvPort port_num, char* name,
         proto->u.start.fds[1] = ifd[1];
         proto->u.start.fds[2] = stderrfd;
         proto->u.start.port_id = opts->exit_status ? erts_drvport2id(port_num) : THE_NON_VALUE;
-        if (erl_drv_port_control(forker_port, 'S', (char*)proto, sizeof(*proto))) {
+        if (erl_drv_port_control(forker_port, ERTS_FORKER_DRV_CONTROL_MAGIC_NUMBER,
+                                 (char*)proto, sizeof(*proto))) {
             /* The forker port has been killed, we close both fd's which will
                make open_port throw an epipe error */
             close(ofd[0]);
@@ -759,6 +760,9 @@ static ErlDrvSSizeT spawn_control(ErlDrvData e, unsigned int cmd, char *buf,
     ErtsSysDriverData *dd = (ErtsSysDriverData*)e;
     ErtsSysForkerProto *proto = (ErtsSysForkerProto *)buf;
 
+    if (cmd != ERTS_SPAWN_DRV_CONTROL_MAGIC_NUMBER)
+        return -1;
+
     ASSERT(len == sizeof(*proto));
     ASSERT(proto->action == ErtsSysForkerProtoAction_SigChld);
 
@@ -781,15 +785,15 @@ static ErlDrvSSizeT spawn_control(ErlDrvData e, unsigned int cmd, char *buf,
 
 static int fd_get_window_size(int fd, Uint32 *width, Uint32 *height)
 {
-#ifdef TIOCGWINSZ 
+#ifdef TIOCGWINSZ
     struct winsize ws;
     if (ioctl(fd,TIOCGWINSZ,&ws) == 0) {
 	*width = (Uint32) ws.ws_col;
 	*height = (Uint32) ws.ws_row;
-	return 0;
+	return 1;
     }
 #endif
-    return -1;
+    return 0;
 }
 
 static ErlDrvSSizeT fd_control(ErlDrvData drv_data,
@@ -797,20 +801,34 @@ static ErlDrvSSizeT fd_control(ErlDrvData drv_data,
 			       char *buf, ErlDrvSizeT len,
 			       char **rbuf, ErlDrvSizeT rlen)
 {
-    int fd = (int)(long)drv_data;
     char resbuff[2*sizeof(Uint32)];
+    ErtsSysDriverData* dd = (ErtsSysDriverData*)drv_data;
+    command -= ERTS_TTYSL_DRV_CONTROL_MAGIC_NUMBER;
     switch (command) {
     case FD_CTRL_OP_GET_WINSIZE:
 	{
 	    Uint32 w,h;
-	    if (fd_get_window_size(fd,&w,&h)) 
-		return 0;
+            int success = 0;
+            if (dd->ofd != NULL) {
+                /* Try with output file descriptor */
+                int out_fd = dd->ofd->fd;
+                success = fd_get_window_size(out_fd,&w,&h);
+            }
+            if (!success && dd->ifd != NULL) {
+                /* Try with input file descriptor */
+                int in_fd = dd->ifd->fd;
+                success = fd_get_window_size(in_fd,&w,&h);
+            }
+            if (!success) {
+                return -1;
+            }
+            /* Succeeded */
 	    memcpy(resbuff,&w,sizeof(Uint32));
 	    memcpy(resbuff+sizeof(Uint32),&h,sizeof(Uint32));
 	}
 	break;
     default:
-	return 0;
+	return -1;
     }
     if (rlen < 2*sizeof(Uint32)) {
 	*rbuf = driver_alloc(2*sizeof(Uint32));
@@ -998,12 +1016,10 @@ static void clear_fd_data(ErtsSysFdData *fdd)
     fdd->psz = 0;
 }
 
-static void nbio_stop_fd(ErlDrvPort prt, ErtsSysFdData *fdd)
+static void nbio_stop_fd(ErlDrvPort prt, ErtsSysFdData *fdd, int use)
 {
-    driver_select(prt, abs(fdd->fd), ERL_DRV_USE_NO_CALLBACK|DO_READ|DO_WRITE, 0);
     clear_fd_data(fdd);
     SET_BLOCKING(abs(fdd->fd));
-
 }
 
 static void fd_stop(ErlDrvData ev)  /* Does not close the fds */
@@ -1020,11 +1036,13 @@ static void fd_stop(ErlDrvData ev)  /* Does not close the fds */
 
     if (dd->ifd) {
         sz += sizeof(ErtsSysFdData);
-        nbio_stop_fd(prt, dd->ifd);
+        driver_select(prt, abs(dd->ifd->fd), ERL_DRV_USE_NO_CALLBACK|DO_READ|DO_WRITE, 0);
+        nbio_stop_fd(prt, dd->ifd, 1);
     }
     if (dd->ofd && dd->ofd != dd->ifd) {
         sz += sizeof(ErtsSysFdData);
-        nbio_stop_fd(prt, dd->ofd);
+        driver_select(prt, abs(dd->ofd->fd), ERL_DRV_USE_NO_CALLBACK|DO_WRITE, 0);
+        nbio_stop_fd(prt, dd->ofd, 1);
     }
 
      erts_free(ERTS_ALC_T_DRV_TAB, dd);
@@ -1070,12 +1088,12 @@ static void stop(ErlDrvData ev)
     ErlDrvPort prt = dd->port_num;
 
     if (dd->ifd) {
-        nbio_stop_fd(prt, dd->ifd);
+        nbio_stop_fd(prt, dd->ifd, 0);
         driver_select(prt, abs(dd->ifd->fd), ERL_DRV_USE, 0);  /* close(ifd); */
     }
 
     if (dd->ofd && dd->ofd != dd->ifd) {
-	nbio_stop_fd(prt, dd->ofd);
+	nbio_stop_fd(prt, dd->ofd, 0);
 	driver_select(prt, abs(dd->ofd->fd), ERL_DRV_USE, 0);  /* close(ofd); */
     }
 
@@ -1693,7 +1711,8 @@ static void forker_sigchld(Eterm port_id, int error)
        already used by the spawn_driver, we use control instead.
        Note that when using erl_drv_port_control it is an asynchronous
        control. */
-    erl_drv_port_control(port_id, 'S', (char*)proto, sizeof(*proto));
+    erl_drv_port_control(port_id, ERTS_SPAWN_DRV_CONTROL_MAGIC_NUMBER,
+                         (char*)proto, sizeof(*proto));
 }
 
 static void forker_ready_input(ErlDrvData e, ErlDrvEvent fd)
@@ -1778,6 +1797,9 @@ static ErlDrvSSizeT forker_control(ErlDrvData e, unsigned int cmd, char *buf,
     ErlDrvPort port_num = (ErlDrvPort)e;
     int res;
 
+    if (cmd != ERTS_FORKER_DRV_CONTROL_MAGIC_NUMBER)
+        return -1;
+
     if (first_call) {
         /*
          * Do driver_select here when schedulers and their pollsets have started.
diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c
index a1c630d68a..b95aadc9b2 100644
--- a/erts/emulator/sys/win32/sys.c
+++ b/erts/emulator/sys/win32/sys.c
@@ -186,7 +186,9 @@ void sys_primitive_init(HMODULE beam)
 UWord
 erts_sys_get_page_size(void)
 {
-    return (UWord) 4*1024; /* Guess 4 KB */
+    SYSTEM_INFO info;
+    GetSystemInfo(&info);
+    return (UWord)info.dwPageSize;
 }
 
 Uint
diff --git a/erts/emulator/test/Makefile b/erts/emulator/test/Makefile
index 6a064ec8d4..019af2162f 100644
--- a/erts/emulator/test/Makefile
+++ b/erts/emulator/test/Makefile
@@ -28,6 +28,24 @@ EBIN = .
 # Target Specs
 # ----------------------------------------------------
 
+SOCKET_MODULES = \
+	socket_test_lib \
+	socket_test_logger \
+	socket_test_evaluator \
+	socket_test_ttest_lib \
+	socket_test_ttest_tcp_gen \
+	socket_test_ttest_tcp_socket \
+	socket_test_ttest_tcp_client \
+	socket_test_ttest_tcp_client_gen \
+	socket_test_ttest_tcp_client_socket \
+	socket_test_ttest_tcp_server \
+	socket_test_ttest_tcp_server_gen \
+	socket_test_ttest_tcp_server_socket \
+	socket_SUITE
+
+NET_MODULES = \
+	net_SUITE
+
 MODULES= \
 	a_SUITE \
 	after_SUITE \
@@ -84,6 +102,7 @@ MODULES= \
 	monitor_SUITE \
 	multi_load_SUITE \
 	nested_SUITE \
+	$(NET_MODULES) \
 	nif_SUITE \
 	node_container_SUITE \
 	nofrag_SUITE \
@@ -105,7 +124,9 @@ MODULES= \
 	send_term_SUITE \
 	sensitive_SUITE \
 	signal_SUITE \
+	small_SUITE \
 	smoke_test_SUITE \
+	$(SOCKET_MODULES) \
 	statistics_SUITE \
 	system_info_SUITE \
 	system_profile_SUITE \
@@ -130,6 +151,7 @@ MODULES= \
 	ignore_cores \
 	dgawd_handler \
 	random_iolist \
+	erts_test_utils \
 	crypto_reference
 
 NO_OPT= bs_bincomp \
@@ -152,8 +174,14 @@ NATIVE_MODULES= $(NATIVE:%=%_native_SUITE)
 NATIVE_ERL_FILES= $(NATIVE_MODULES:%=%.erl)
 
 ERL_FILES= $(MODULES:%=%.erl)
+HRL_FILES= \
+	socket_test_evaluator.hrl \
+	socket_test_ttest.hrl \
+	socket_test_ttest_client.hrl
 
 TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+NET_TARGETS = $(NET_MODULES:%=$(EBIN)/%.$(EMULATOR))
+SOCKET_TARGETS = $(SOCKET_MODULES:%=$(EBIN)/%.$(EMULATOR))
 
 EMAKEFILE=Emakefile
 
@@ -179,14 +207,10 @@ ERL_COMPILE_FLAGS +=
 # ----------------------------------------------------
 
 make_emakefile: $(NO_OPT_ERL_FILES) $(NATIVE_ERL_FILES)
-	# This special rule can be removed when communication with R7B nodes 
-	# is no longer supported.
-	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) +compressed -o$(EBIN) \
-	'*_SUITE_make' > $(EMAKEFILE)
 	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) +compressed -o$(EBIN) \
 	$(MODULES) >> $(EMAKEFILE)
-	$(ERL_TOP)/make/make_emakefile +no_copt +no_postopt $(ERL_COMPILE_FLAGS) \
-	-o$(EBIN) $(NO_OPT_MODULES) >> $(EMAKEFILE)
+	$(ERL_TOP)/make/make_emakefile +no_copt +no_postopt +no_ssa_opt +no_bsm_opt \
+        $(ERL_COMPILE_FLAGS) -o$(EBIN) $(NO_OPT_MODULES) >> $(EMAKEFILE)
 	$(ERL_TOP)/make/make_emakefile +native $(ERL_COMPILE_FLAGS) \
 	-o$(EBIN) $(NATIVE_MODULES) >> $(EMAKEFILE)
 
@@ -200,6 +224,10 @@ clean:
 
 docs:
 
+targets: $(TARGET_FILES)
+socket_targets: $(SOCKET_TARGETS)
+net_targets: $(NET_TARGETS)
+
 # ----------------------------------------------------
 # Special targets
 # ----------------------------------------------------
@@ -220,7 +248,7 @@ release_spec:
 release_tests_spec: make_emakefile
 	$(INSTALL_DIR) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(EMAKEFILE) $(TEST_SPEC_FILES) \
-		$(ERL_FILES) "$(RELSYSDIR)"
+		$(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(NO_OPT_ERL_FILES) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(NATIVE_ERL_FILES) "$(RELSYSDIR)"
 	chmod -R u+w "$(RELSYSDIR)"
diff --git a/erts/emulator/test/alloc_SUITE.erl b/erts/emulator/test/alloc_SUITE.erl
index 343afe85e6..4e0243c1cd 100644
--- a/erts/emulator/test/alloc_SUITE.erl
+++ b/erts/emulator/test/alloc_SUITE.erl
@@ -71,7 +71,8 @@ migration(Cfg) ->
     %% 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").
+    drv_case(Cfg, concurrent, "+MZe true +MRe false +MZas ageffcbf"),
+    drv_case(Cfg, concurrent, "+MZe true +MRe false +MZas chaosff").
 
 erts_mmap(Config) when is_list(Config) ->
     case {os:type(), mmsc_flags()} of
diff --git a/erts/emulator/test/atomics_SUITE.erl b/erts/emulator/test/atomics_SUITE.erl
index 8c42354770..a5407c42ee 100644
--- a/erts/emulator/test/atomics_SUITE.erl
+++ b/erts/emulator/test/atomics_SUITE.erl
@@ -126,6 +126,9 @@ unsigned_limits(Config) when is_list(Config) ->
     Min = atomics:add_get(Ref, 1, 1),
     Max = atomics:sub_get(Ref, 1, 1),
 
+    atomics:put(Ref, 1, Max),
+    io:format("Max=~p~n", [atomics:get(Ref, 1)]),
+
     {'EXIT',{badarg,_}} = (catch atomics:add(Ref, 1, Max+1)),
     IncrMin = -(1 bsl (Bits-1)),
     ok = atomics:put(Ref, 1, -IncrMin),
diff --git a/erts/emulator/test/bif_SUITE.erl b/erts/emulator/test/bif_SUITE.erl
index 9e7bcd5255..c5abd04e07 100644
--- a/erts/emulator/test/bif_SUITE.erl
+++ b/erts/emulator/test/bif_SUITE.erl
@@ -37,7 +37,9 @@
          group_leader_prio/1, group_leader_prio_dirty/1,
          is_process_alive/1,
          process_info_blast/1,
-         os_env_case_sensitivity/1]).
+         os_env_case_sensitivity/1,
+         test_length/1,
+         fixed_apply_badarg/1]).
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
@@ -52,7 +54,8 @@ all() ->
      erl_crash_dump_bytes, min_max, erlang_halt, is_builtin,
      error_stacktrace, error_stacktrace_during_call_trace,
      group_leader_prio, group_leader_prio_dirty,
-     is_process_alive, process_info_blast, os_env_case_sensitivity].
+     is_process_alive, process_info_blast, os_env_case_sensitivity,
+     test_length,fixed_apply_badarg].
 
 %% Uses erlang:display to test that erts_printf does not do deep recursion
 display(Config) when is_list(Config) ->
@@ -609,6 +612,16 @@ binary_to_existing_atom(Config) when is_list(Config) ->
 
     UnlikelyAtom = binary_to_atom(id(UnlikelyBin), latin1),
     UnlikelyAtom = binary_to_existing_atom(UnlikelyBin, latin1),
+
+    %% ERL-944; a binary that was too large would overflow the latin1-to-utf8
+    %% conversion buffer.
+    OverflowAtom = <<0:511/unit:8,
+                     196, 133, 196, 133, 196, 133, 196, 133, 196, 133,
+                     196, 133, 196, 133, 196, 133, 196, 133, 196, 133,
+                     196, 133, 196, 133, 196, 133, 196, 133, 196, 133,
+                     196, 133, 196, 133, 196, 133, 196, 133, 196, 133>>,
+    {'EXIT', _} = (catch binary_to_existing_atom(OverflowAtom, latin1)),
+
     ok.
 
 
@@ -1181,7 +1194,70 @@ consume_msgs() ->
     after 0 ->
               ok
     end.
-                              
+
+%% Test that length/1 returns the correct result after trapping, and
+%% also that the argument is correct in the stacktrace for a badarg
+%% exception.
+
+test_length(_Config) ->
+    {Start,Inc} = case test_server:timetrap_scale_factor() of
+                      1 -> {16*4000,3977};
+                      _ -> {100,1}
+            end,
+    Good = lists:reverse(lists:seq(1, Start)),
+    Bad = Good ++ [bad|cons],
+    test_length(Start, 10*Start, Inc, Good, Bad),
+
+    %% Test that calling length/1 from a match spec works.
+    MsList = lists:seq(1, 2*Start),
+    MsInput = [{tag,Good},{tag,MsList}],
+    Ms0 = [{{tag,'$1'},[{'>',{length,'$1'},Start}],['$1']}],
+    Ms = ets:match_spec_compile(Ms0),
+    [MsList] = ets:match_spec_run(MsInput, Ms),
+    ok.
+
+test_length(I, N, Inc, Good, Bad) when I < N ->
+    Length = id(length),
+    I = length(Good),
+    I = erlang:Length(Good),
+
+    %% Test length/1 in guards.
+    if
+        length(Good) =:= I ->
+            ok
+    end,
+    if
+        length(Bad) =:= I ->
+            error(should_fail);
+        true ->
+            ok
+    end,
+
+    {'EXIT',{badarg,[{erlang,length,[[I|_]],_}|_]}} = (catch length(Bad)),
+    {'EXIT',{badarg,[{erlang,length,[[I|_]],_}|_]}} = (catch erlang:Length(Bad)),
+    IncSeq = lists:seq(I + 1, I + Inc),
+    test_length(I+Inc, N, Inc,
+                lists:reverse(IncSeq, Good),
+                lists:reverse(IncSeq, Bad));
+test_length(_, _, _, _, _) -> ok.
+
+%% apply/3 with a fixed number of arguments didn't include all arguments on
+%% badarg exceptions.
+fixed_apply_badarg(Config) when is_list(Config) ->
+    Bad = id({}),
+
+    {'EXIT',{badarg, [{erlang,apply,[{},baz,[a,b]],[]} | _]}} =
+        (catch Bad:baz(a,b)),
+    {'EXIT',{badarg, [{erlang,apply,[baz,{},[c,d]],[]} | _]}} =
+        (catch baz:Bad(c,d)),
+
+    {'EXIT',{badarg, [{erlang,apply,[{},baz,[e,f]],[]} | _]}} =
+        (catch apply(Bad,baz,[e,f])),
+    {'EXIT',{badarg, [{erlang,apply,[baz,{},[g,h]],[]} | _]}} =
+        (catch apply(baz,Bad,[g,h])),
+
+    ok.
+
 %% helpers
     
 id(I) -> I.
diff --git a/erts/emulator/test/big_SUITE.erl b/erts/emulator/test/big_SUITE.erl
index 0a42b09903..3b9b9e5989 100644
--- a/erts/emulator/test/big_SUITE.erl
+++ b/erts/emulator/test/big_SUITE.erl
@@ -24,7 +24,7 @@
 
 -export([t_div/1, eq_28/1, eq_32/1, eq_big/1, eq_math/1, big_literals/1,
 	 borders/1, negative/1, big_float_1/1, big_float_2/1,
-         bxor_2pow/1,
+         bxor_2pow/1, band_2pow/1,
 	 shift_limit_1/1, powmod/1, system_limit/1, toobig/1, otp_6692/1]).
 
 %% Internal exports.
@@ -43,7 +43,7 @@ suite() ->
 all() -> 
     [t_div, eq_28, eq_32, eq_big, eq_math, big_literals,
      borders, negative, {group, big_float}, shift_limit_1,
-     bxor_2pow,
+     bxor_2pow, band_2pow,
      powmod, system_limit, toobig, otp_6692].
 
 groups() -> 
@@ -168,7 +168,11 @@ eval({op,_,Op,A0,B0}, LFH) ->
     Res = eval_op(Op, A, B),
     erlang:garbage_collect(),
     Res;
-eval({integer,_,I}, _) -> I;
+eval({integer,_,I}, _) ->
+    %% "Parasitic" ("symbiotic"?) test of squaring all numbers
+    %% found in the test data.
+    test_squaring(I),
+    I;
 eval({call,_,{atom,_,Local},Args0}, LFH) ->
     Args = eval_list(Args0, LFH),
     LFH(Local, Args).
@@ -192,6 +196,18 @@ eval_op('bxor', A, B) -> A bxor B;
 eval_op('bsl', A, B) -> A bsl B;
 eval_op('bsr', A, B) -> A bsr B.
 
+test_squaring(I) ->
+    %% Multiplying an integer by itself is specially optimized, so we
+    %% should take special care to test squaring.  The optimization
+    %% will kick in when the two operands have the same address.
+    Sqr = I * I,
+
+    %% This expression will be multiplied in the usual way, because
+    %% the the two operands for '*' are stored at different addresses.
+    Sqr = I * ((I + id(1)) - id(1)),
+
+    ok.
+
 %% Built in test functions
 
 fac(0) -> 1;
@@ -456,3 +472,38 @@ my_bxor(A, B, N, Acc0) ->
                false -> Acc0 bor (1 bsl N)
           end,
     my_bxor(A bsr 1, B bsr 1, N+1, Acc1).
+
+
+%% ERL-804
+band_2pow(_Config) ->
+    IL = lists:seq(8*3, 8*16, 4),
+    JL = lists:seq(0, 64),
+    [band_2pow_1((1 bsl I), (1 bsl J))
+     || I <- IL, J <- JL],
+    ok.
+
+band_2pow_1(A, B) ->
+    for(-1,1, fun(Ad) ->
+                      for(-1,1, fun(Bd) ->
+                                        band_2pow_2(A+Ad, B+Bd),
+                                        band_2pow_2(-A+Ad, B+Bd),
+                                        band_2pow_2(A+Ad, -B+Bd),
+                                        band_2pow_2(-A+Ad, -B+Bd)
+                                end)
+              end).
+
+band_2pow_2(A, B) ->
+    Correct = my_band(A, B),
+    case A band B of
+        Correct -> ok;
+        Wrong ->
+            io:format("~.16# band ~.16#\n", [A,B]),
+            io:format("Expected ~.16#\n", [Correct]),
+            io:format("Got      ~.16#\n", [Wrong]),
+            ct:fail({failed, 'band'})
+
+    end.
+
+%% Implement band without band
+my_band(A, B) ->
+    bnot ((bnot A) bor (bnot B)).
diff --git a/erts/emulator/test/binary_SUITE.erl b/erts/emulator/test/binary_SUITE.erl
index 23c675733c..fbd1325c3a 100644
--- a/erts/emulator/test/binary_SUITE.erl
+++ b/erts/emulator/test/binary_SUITE.erl
@@ -40,6 +40,7 @@
 %%
 
 -include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2, 
@@ -50,6 +51,14 @@
 	 terms/1, terms_float/1, float_middle_endian/1,
          b2t_used_big/1,
 	 external_size/1, t_iolist_size/1,
+         t_iolist_size_huge_list/1,
+         t_iolist_size_huge_bad_arg_list/1,
+         t_iolist_size_shallow_trapping/1,
+         t_iolist_size_shallow_short_lists/1,
+         t_iolist_size_shallow_tiny_lists/1,
+         t_iolist_size_deep_trapping/1,
+         t_iolist_size_deep_short_lists/1,
+         t_iolist_size_deep_tiny_lists/1,
 	 t_hash/1,
 	 bad_size/1,
 	 bad_term_to_binary/1,
@@ -62,7 +71,8 @@
          term2bin_tuple_fallbacks/1,
          robustness/1,otp_8117/1,
 	 otp_8180/1, trapping/1, large/1,
-	 error_after_yield/1, cmp_old_impl/1]).
+	 error_after_yield/1, cmp_old_impl/1,
+         t2b_system_limit/1]).
 
 %% Internal exports.
 -export([sleeper/0,trapping_loop/4]).
@@ -70,15 +80,19 @@
 suite() -> [{ct_hooks,[ts_install_cth]},
 	    {timetrap,{minutes,4}}].
 
-all() -> 
+all() ->
     [copy_terms, conversions, deep_lists, deep_bitstr_lists,
      t_split_binary, bad_split,
      bad_list_to_binary, bad_binary_to_list, terms,
      terms_float, float_middle_endian, external_size, t_iolist_size,
+     t_iolist_size_huge_list,
+     t_iolist_size_huge_bad_arg_list,
+     {group, iolist_size_benchmarks},
      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,
+     bad_term_to_binary, t2b_system_limit, more_bad_terms,
+     otp_5484, otp_5933,
      ordering, unaligned_order, gc_test,
      bit_sized_binary_sizes, otp_6817, otp_8117, deep,
      term2bin_tuple_fallbacks,
@@ -86,13 +100,36 @@ all() ->
      error_after_yield, cmp_old_impl].
 
 groups() -> 
-    [].
+    [
+     {
+      iolist_size_benchmarks, 
+      [],
+      [t_iolist_size_shallow_trapping,
+       t_iolist_size_shallow_short_lists,
+       t_iolist_size_shallow_tiny_lists,
+       t_iolist_size_deep_trapping,
+       t_iolist_size_deep_short_lists,
+       t_iolist_size_deep_tiny_lists
+      ]
+     }
+    ].
 
 init_per_suite(Config) ->
+    A0 = case application:start(sasl) of
+	     ok -> [sasl];
+	     _ -> []
+	 end,
+    A = case application:start(os_mon) of
+	     ok -> [os_mon|A0];
+	     _ -> A0
+	 end,
+    [{started_apps, A}|Config].
+
+end_per_suite(Config) ->
+    As = proplists:get_value(started_apps, Config),
+    lists:foreach(fun (A) -> application:stop(A) end, As),
     Config.
 
-end_per_suite(_Config) ->
-    ok.
 
 init_per_group(_GroupName, Config) ->
     Config.
@@ -427,6 +464,54 @@ bad_term_to_binary(Config) when is_list(Config) ->
 
     ok.
 
+t2b_system_limit(Config) when is_list(Config) ->
+    case erlang:system_info(wordsize) of
+        8 ->
+            case proplists:get_value(system_total_memory,
+                                     memsup:get_system_memory_data()) of
+                Memory when is_integer(Memory),
+                            Memory > 6*1024*1024*1024 ->
+                    test_t2b_system_limit(),
+                    garbage_collect(),
+                    ok;
+                _ ->
+                    {skipped, "Not enough memory on this machine"}
+            end;
+        4 ->
+            {skipped, "Only interesting on 64-bit builds"}
+    end.
+
+test_t2b_system_limit() ->
+    io:format("Creating HugeBin~n", []),
+    Bits = ((1 bsl 32)+1)*8,
+    HugeBin = <<0:Bits>>,
+
+    io:format("Testing term_to_binary(HugeBin)~n", []),
+    {'EXIT',{system_limit,[{erlang,term_to_binary,
+                            [HugeBin],
+                            _} |_]}} = (catch term_to_binary(HugeBin)),
+
+    io:format("Testing term_to_binary(HugeBin, [compressed])~n", []),
+    {'EXIT',{system_limit,[{erlang,term_to_binary,
+                            [HugeBin, [compressed]],
+                            _} |_]}} = (catch term_to_binary(HugeBin, [compressed])),
+
+    %% Check that it works also after we have trapped...
+    io:format("Creating HugeListBin~n", []),
+    HugeListBin = [lists:duplicate(2000000,2000000), HugeBin],
+
+    io:format("Testing term_to_binary(HugeListBin)~n", []),
+    {'EXIT',{system_limit,[{erlang,term_to_binary,
+                            [HugeListBin],
+                            _} |_]}} = (catch term_to_binary(HugeListBin)),
+
+    io:format("Testing term_to_binary(HugeListBin, [compressed])~n", []),
+    {'EXIT',{system_limit,[{erlang,term_to_binary,
+                            [HugeListBin, [compressed]],
+                            _} |_]}} = (catch term_to_binary(HugeListBin, [compressed])),
+
+    ok.
+
 %% Tests binary_to_term/1 and term_to_binary/1.
 
 terms(Config) when is_list(Config) ->
@@ -615,6 +700,143 @@ build_iolist(N0, Base) ->
 	    [47,L,L|Seq]
     end.
 
+approx_4GB_bin() ->
+    Bin = lists:duplicate(4194304, 255),
+    BinRet = erlang:iolist_to_binary(lists:duplicate(1124, Bin)),
+    BinRet.
+
+duplicate_iolist(IOList, 0) ->
+    IOList;
+duplicate_iolist(IOList, NrOfTimes) ->
+    duplicate_iolist([IOList, IOList], NrOfTimes - 1).
+
+t_iolist_size_huge_list(Config)  when is_list(Config) ->
+    run_when_enough_resources(
+      fun() ->
+              {TimeToCreateIOList, IOList} = timer:tc(fun()->duplicate_iolist(approx_4GB_bin(), 32) end),
+              {IOListSizeTime, CalculatedSize} = timer:tc(fun()->erlang:iolist_size(IOList) end),
+              20248183924657750016 = CalculatedSize,
+              {comment, io_lib:format("Time to create iolist: ~f s. Time to calculate size: ~f s.", 
+                                      [TimeToCreateIOList / 1000000, IOListSizeTime / 1000000])}
+      end).
+
+t_iolist_size_huge_bad_arg_list(Config)  when is_list(Config) ->
+    run_when_enough_resources(
+      fun() ->
+              P = self(),
+              spawn_link(fun()-> IOListTmp = duplicate_iolist(approx_4GB_bin(), 32),
+                                 IOList = [IOListTmp, [badarg]],
+                                 {'EXIT',{badarg,_}} = (catch erlang:iolist_size(IOList)),
+                                 P ! ok
+                         end),
+              receive ok -> ok end
+         end).
+
+%% iolist_size tests for shallow lists
+
+t_iolist_size_shallow_trapping(Config) when is_list(Config) ->
+    Lengths = [2000, 20000, 200000, 200000, 2000000, 20000000],
+    run_iolist_size_test_and_benchmark(Lengths, fun make_shallow_iolist/2).
+
+t_iolist_size_shallow_short_lists(Config) when is_list(Config) ->
+    Lengths = lists:duplicate(15000, 300),
+    run_iolist_size_test_and_benchmark(Lengths, fun make_shallow_iolist/2).
+
+t_iolist_size_shallow_tiny_lists(Config) when is_list(Config) ->
+    Lengths = lists:duplicate(250000, 18),
+    run_iolist_size_test_and_benchmark(Lengths, fun make_shallow_iolist/2).
+
+make_shallow_iolist(SizeDiv2, LastItem) ->
+    lists:map(
+      fun(I) -> 
+              case I of
+                  SizeDiv2 -> [1, LastItem];
+                  _ -> [1, 1]
+              end
+      end,
+      lists:seq(1, SizeDiv2)).
+
+%% iolist_size tests for deep lists
+
+t_iolist_size_deep_trapping(Config) when is_list(Config) ->
+    Lengths = [2000, 20000, 200000, 200000, 2000000, 10000000],
+    run_iolist_size_test_and_benchmark(Lengths, fun make_deep_iolist/2).
+
+t_iolist_size_deep_short_lists(Config) when is_list(Config) ->
+    Lengths = lists:duplicate(10000, 300),
+    run_iolist_size_test_and_benchmark(Lengths, fun make_deep_iolist/2).
+
+t_iolist_size_deep_tiny_lists(Config) when is_list(Config) ->
+    Lengths = lists:duplicate(150000, 18),
+    run_iolist_size_test_and_benchmark(Lengths, fun make_deep_iolist/2).
+
+make_deep_iolist(1, LastItem) ->
+    [1, LastItem];
+make_deep_iolist(Depth, LastItem) ->
+    [[1, 1], make_deep_iolist(Depth - 1, LastItem)].
+
+% Helper functions for iolist_size tests
+
+run_iolist_size_test_and_benchmark(Lengths, ListGenerator) ->
+    run_when_enough_resources(
+      fun() ->
+              GoodListsWithSizes =
+                  lists:map(fun(Length) -> {Length*2, ListGenerator(Length, 1)} end, Lengths),
+              BadListsWithSizes =
+                  lists:map(fun(Length) -> {Length*2, ListGenerator(Length, bad)} end, Lengths),
+              erlang:garbage_collect(),
+              report_throughput(
+                fun() ->
+                        lists:foreach(
+                          fun(_)->
+                                  lists:foreach(
+                                    fun({Size, List}) -> Size = iolist_size(List) end,
+                                    GoodListsWithSizes),
+                                  lists:foreach(
+                                    fun({_, List}) -> {'EXIT',_} = (catch (iolist_size(List))) end,
+                                    BadListsWithSizes)
+                          end,
+                          lists:seq(1,3))
+                end,
+                lists:sum(Lengths)*4)
+      end).
+
+report_throughput(Fun, NrOfItems) ->
+    Parent = self(),
+    spawn(fun() -> Parent ! timer:tc(Fun) end),
+    {Time, _} = receive D -> D end,
+    ItemsPerMicrosecond = NrOfItems / Time,
+    ct_event:notify(#event{ name = benchmark_data, data = [{value, ItemsPerMicrosecond}]}),
+    {comment, io_lib:format("Items per microsecond: ~p, Nr of items: ~p, Benchmark time: ~p seconds)",
+                            [ItemsPerMicrosecond, NrOfItems, Time/1000000])}.
+
+total_memory() ->
+    %% Total memory in GB.
+    try
+	MemoryData = memsup:get_system_memory_data(),
+	case lists:keysearch(total_memory, 1, MemoryData) of
+	    {value, {total_memory, TM}} ->
+		TM div (1024*1024*1024);
+	    false ->
+		{value, {system_total_memory, STM}} =
+		    lists:keysearch(system_total_memory, 1, MemoryData),
+		STM div (1024*1024*1024)
+	end
+    catch
+	_ : _ ->
+	    undefined
+    end.
+
+run_when_enough_resources(Fun) ->
+    case {total_memory(), erlang:system_info(wordsize)} of
+        {Mem, 8} when is_integer(Mem) andalso Mem >= 15 ->
+            Fun();
+        {Mem, WordSize} ->
+            {skipped, 
+             io_lib:format("Not enough resources (System Memory >= ~p, Word Size = ~p)",
+                           [Mem, WordSize])}
+    end.
+    
 
 %% OTP-4053
 bad_binary_to_term_2(Config) when is_list(Config) ->
@@ -1216,7 +1438,8 @@ sleeper() ->
 gc_test(Config) when is_list(Config) ->
     %% Note: This test is only relevant for REFC binaries.
     %% Therefore, we take care that all binaries are REFC binaries.
-    B = list_to_binary(lists:seq(0, ?heap_binary_size)),
+    true = 192 > ?heap_binary_size,
+    B = list_to_binary(lists:seq(1, 192)),
     Self = self(),
     F1 = fun() ->
 		 gc(),
@@ -1225,22 +1448,22 @@ gc_test(Config) when is_list(Config) ->
 	 end,
     F = fun() ->
 		receive go -> ok end,
-		{binary,[{_,65,1}]} = process_info(self(), binary),
+		{binary,[{_,192,1}]} = process_info(self(), binary),
 		gc(),
-		{B1,B2} = my_split_binary(B, 4),
+		{B1,B2} = my_split_binary(B, 68),
 		gc(),
 		gc(),
 		{binary,L1} = process_info(self(), binary),
 		[Binfo1,Binfo2,Binfo3] = L1,
-		{_,65,3} = Binfo1 = Binfo2 = Binfo3,
-		65 = size(B),
-		4 = size(B1),
-		61 = size(B2),
+		{_,192,3} = Binfo1 = Binfo2 = Binfo3,
+		192 = size(B),
+		68 = size(B1),
+		124 = size(B2),
 		F1()
 	end,
     gc(),
     gc(),
-    65 = size(B),
+    192 = size(B),
     gc_test1(spawn_opt(erlang, apply, [F,[]], [link,{fullsweep_after,0}])).
 
 gc_test1(Pid) ->
@@ -1531,13 +1754,16 @@ error_after_yield_bad_ext_term() ->
 		    BadAtomExt]). %% Invalid atom at the end
 	    
 cmp_old_impl(Config) when is_list(Config) ->
-    %% Compare results from new yielding implementations with
-    %% old non yielding implementations 
+    %% This test was originally a comparison with the non yielding
+    %% implementation in R16B. Since OTP 22 we can't talk distribution with such
+    %% old nodes (< 19). The test case it kept but compares with previous major
+    %% version for semantic regression test.
     Cookie = atom_to_list(erlang:get_cookie()),
-    Rel = "r16b_latest",
+    Rel = (integer_to_list(list_to_integer(erlang:system_info(otp_release)) - 1)
+           ++ "_latest"),
     case test_server:is_release_available(Rel) of
 	false ->
-	    {skipped, "No "++Rel++" available"};
+	    {skipped, "No OTP "++Rel++" available"};
 	true ->
 	    {ok, Node} = test_server:start_node(list_to_atom(atom_to_list(?MODULE)++"_"++Rel),
 				       peer,
diff --git a/erts/emulator/test/bs_construct_SUITE.erl b/erts/emulator/test/bs_construct_SUITE.erl
index ce50bcdd86..8fab4f5bc4 100644
--- a/erts/emulator/test/bs_construct_SUITE.erl
+++ b/erts/emulator/test/bs_construct_SUITE.erl
@@ -16,8 +16,6 @@
 %% limitations under the License.
 %% 
 %% %CopyrightEnd%
-%%
-%% Purpose : Common utilities used by several optimization passes.
 %% 
 
 -module(bs_construct_SUITE).
@@ -26,10 +24,10 @@
          init_per_suite/1, end_per_suite/1,
 	 test1/1, test2/1, test3/1, test4/1, test5/1, testf/1,
 	 not_used/1, in_guard/1,
-	 mem_leak/1, coerce_to_float/1, bjorn/1,
-	 huge_float_field/1, huge_binary/1, system_limit/1, badarg/1,
+	 mem_leak/1, coerce_to_float/1, bjorn/1, append_empty_is_same/1,
+	 huge_float_field/1, system_limit/1, badarg/1,
 	 copy_writable_binary/1, kostis/1, dynamic/1, bs_add/1,
-	 otp_7422/1, zero_width/1, bad_append/1, bs_add_overflow/1]).
+	 otp_7422/1, zero_width/1, bad_append/1, bs_append_overflow/1]).
 
 -include_lib("common_test/include/ct.hrl").
 
@@ -39,10 +37,10 @@ suite() ->
 
 all() -> 
     [test1, test2, test3, test4, test5, testf, not_used,
-     in_guard, mem_leak, coerce_to_float, bjorn,
-     huge_float_field, huge_binary, system_limit, badarg,
+     in_guard, mem_leak, coerce_to_float, bjorn, append_empty_is_same,
+     huge_float_field, system_limit, badarg,
      copy_writable_binary, kostis, dynamic, bs_add, otp_7422, zero_width,
-     bad_append, bs_add_overflow].
+     bad_append, bs_append_overflow].
 
 init_per_suite(Config) ->
     Config.
@@ -520,6 +518,16 @@ do_more(Bin, Sz) ->
 do_something() ->
     throw(blurf).
 
+append_empty_is_same(Config) when is_list(Config) ->
+    NonWritableBin = <<"123">>,
+    true = erts_debug:same(NonWritableBin, append(NonWritableBin, <<>>)),
+    WritableBin = <<(id(<<>>))/binary,0,1,2,3,4,5,6,7>>,
+    true = erts_debug:same(WritableBin, append(WritableBin, <<>>)),
+    ok.
+
+append(A, B) ->
+    <<A/binary, B/binary>>.
+
 huge_float_field(Config) when is_list(Config) ->
     {'EXIT',{badarg,_}} = (catch <<0.0:9/float-unit:8>>),
     huge_float_check(catch <<0.0:67108865/float-unit:64>>),
@@ -533,56 +541,6 @@ huge_float_field(Config) when is_list(Config) ->
 huge_float_check({'EXIT',{system_limit,_}}) -> ok;
 huge_float_check({'EXIT',{badarg,_}}) -> ok.
 
-huge_binary(Config) when is_list(Config) ->
-    ct:timetrap({seconds, 60}),
-    16777216 = size(<<0:(id(1 bsl 26)),(-1):(id(1 bsl 26))>>),
-    garbage_collect(),
-    FreeMem = free_mem(),
-    io:format("Free memory (Mb): ~p\n", [FreeMem]),
-    {Shift,Return} = case free_mem() of
-			 undefined ->
-			     %% This test has to be inlined inside the case to
-			     %% use a literal Shift
-			     garbage_collect(),
-			     id(<<0:((1 bsl 32)-1)>>),
-			     {32,ok};
-			 Mb when Mb > 600 ->
-			     garbage_collect(),
-			     id(<<0:((1 bsl 32)-1)>>),
-			     {32,ok};
-			 Mb when Mb > 300 ->
-			     garbage_collect(),
-			     id(<<0:((1 bsl 31)-1)>>),
-			     {31,"Limit huge binaries to 256 Mb"};
-			 Mb when Mb > 200 ->
-			     garbage_collect(),
-			     id(<<0:((1 bsl 30)-1)>>),
-			     {30,"Limit huge binary to 128 Mb"};
-			 _ ->
-			     garbage_collect(),
-			     id(<<0:((1 bsl 29)-1)>>),
-                             {29,"Limit huge binary to 64 Mb"}
-		     end,
-    garbage_collect(),
-    id(<<0:((1 bsl Shift)-1)>>),
-    garbage_collect(),
-    id(<<0:(id((1 bsl Shift)-1))>>),
-    garbage_collect(),
-    case Return of
-	ok -> ok;	     
-	Comment -> {comment, Comment}
-    end.
-
-%% Return the amount of free memory in Mb.
-free_mem() ->
-    {ok,Apps} = application:ensure_all_started(os_mon),
-    Mem = memsup:get_system_memory_data(),
-    [ok = application:stop(App)||App <- Apps],
-    case proplists:get_value(free_memory,Mem) of
-        undefined -> undefined;
-        Val -> Val div (1024*1024)
-    end.
-
 system_limit(Config) when is_list(Config) ->
     WordSize = erlang:system_info(wordsize),
     BitsPerWord = WordSize * 8,
@@ -894,33 +852,37 @@ append_unit_8(Bin) ->
 append_unit_16(Bin) ->
     <<Bin/binary-unit:16,0:1>>.
 
-%% Produce a large result of bs_add that, if cast to signed int, would overflow
-%% into a negative number that fits a smallnum.
-bs_add_overflow(_Config) ->
+%% Test that the bs_append instruction will correctly check for
+%% overflow by producing a binary whose total size would exceed the
+%% maximum allowed size for a binary on a 32-bit computer.
+
+bs_append_overflow(_Config) ->
     Memsize = memsize(),
     io:format("Memsize = ~w Bytes~n", [Memsize]),
     case erlang:system_info(wordsize) of
 	8 ->
+            %% Not possible to test on a 64-bit computer.
 	    {skip, "64-bit architecture"};
         _ when Memsize < (2 bsl 30) ->
-	    {skip, "Less then 2 GB of memory"};
+	    {skip, "Less than 2 GB of memory"};
 	4 ->
-            {'EXIT', {system_limit, _}} = (catch bs_add_overflow_signed()),
-            {'EXIT', {system_limit, _}} = (catch bs_add_overflow_unsigned()),
+            {'EXIT', {system_limit, _}} = (catch bs_append_overflow_signed()),
+            erlang:garbage_collect(),
+            {'EXIT', {system_limit, _}} = (catch bs_append_overflow_unsigned()),
+            erlang:garbage_collect(),
 	    ok
     end.
 
-bs_add_overflow_signed() ->
-    %% Produce a large result of bs_add that, if cast to signed int, would
+bs_append_overflow_signed() ->
+    %% Produce a large binary that, if cast to signed int, would
     %% overflow into a negative number that fits a smallnum.
     Large = <<0:((1 bsl 30)-1)>>,
     <<Large/bits, Large/bits, Large/bits, Large/bits,
       Large/bits, Large/bits, Large/bits, Large/bits,
       Large/bits>>.
 
-bs_add_overflow_unsigned() ->
-    %% Produce a large result of bs_add that goes beyond the limit of an
-    %% unsigned word. This used to succeed but produced an incorrect result
+bs_append_overflow_unsigned() ->
+    %% The following would succeed but would produce an incorrect result
     %% where B =:= C!
     A = <<0:((1 bsl 32)-8)>>,
     B = <<2, 3>>,
diff --git a/erts/emulator/test/bs_match_int_SUITE.erl b/erts/emulator/test/bs_match_int_SUITE.erl
index e913dc98b0..454e55d017 100644
--- a/erts/emulator/test/bs_match_int_SUITE.erl
+++ b/erts/emulator/test/bs_match_int_SUITE.erl
@@ -234,34 +234,49 @@ mml_choose(<<_A:8>>) -> single_byte_binary;
 mml_choose(<<_A:8,_T/binary>>) -> multi_byte_binary.
 
 match_huge_int(Config) when is_list(Config) ->
-    Sz = 1 bsl 27,
-    Bin = <<0:Sz,13:8>>,
-    skip_huge_int_1(Sz, Bin),
-    0 = match_huge_int_1(Sz, Bin),
-
-    %% Test overflowing the size of an integer field.
-    nomatch = overflow_huge_int_skip_32(Bin),
-    case erlang:system_info(wordsize) of
-	4 ->
-	    nomatch = overflow_huge_int_32(Bin);
-	8 ->
-	    %% An attempt will be made to allocate heap space for
-	    %% the bignum (which will probably fail); only if the
-	    %% allocation succeeds will the matching fail because
-	    %% the binary is too small.
-	    ok
-    end,
-    nomatch = overflow_huge_int_skip_64(Bin),
-    nomatch = overflow_huge_int_64(Bin),
-
-    %% Test overflowing the size of an integer field using variables as sizes.
-    Sizes = case erlang:system_info(wordsize) of
-		      4 -> lists:seq(25, 32);
-		      8 -> []
-		  end ++ lists:seq(50, 64),
-    ok = overflow_huge_int_unit128(Bin, Sizes),
-
-    ok.
+    case ?MODULE of
+        bs_match_int_no_opt_SUITE ->
+            %% This test case is written with the assumption that
+            %% bs_skip2 instructions are used when the value of the
+            %% extracted segment will not be used. In OTP 21 and earlier, that
+            %% assumption was always true, because the bs_skip optimization
+            %% was included in v3_codegen and could not be disabled.
+            %% In OTP 22, the bs_skip optimization is done by beam_ssa_opt
+            %% and is disabled.
+            %%
+            %% On memory-constrained computers, using bs_get_integer2
+            %% instructions may cause the runtime system to terminate
+            %% because of insufficient memory.
+            {skip, "unoptimized code would use too much memory"};
+        bs_match_int_SUITE ->
+            Sz = 1 bsl 27,
+            Bin = <<0:Sz,13:8>>,
+            skip_huge_int_1(Sz, Bin),
+            0 = match_huge_int_1(Sz, Bin),
+
+            %% Test overflowing the size of an integer field.
+            nomatch = overflow_huge_int_skip_32(Bin),
+            case erlang:system_info(wordsize) of
+                4 ->
+                    nomatch = overflow_huge_int_32(Bin);
+                8 ->
+                    %% An attempt will be made to allocate heap space for
+                    %% the bignum (which will probably fail); only if the
+                    %% allocation succeeds will the matching fail because
+                    %% the binary is too small.
+                    ok
+            end,
+            nomatch = overflow_huge_int_skip_64(Bin),
+            nomatch = overflow_huge_int_64(Bin),
+
+            %% Test overflowing the size of an integer field using
+            %% variables as sizes.
+            Sizes = case erlang:system_info(wordsize) of
+                        4 -> lists:seq(25, 32);
+                        8 -> []
+                    end ++ lists:seq(50, 64),
+            ok = overflow_huge_int_unit128(Bin, Sizes)
+    end.
 
 overflow_huge_int_unit128(Bin, [Sz0|Sizes]) ->
     Sz = id(1 bsl Sz0),
diff --git a/erts/emulator/test/bs_match_misc_SUITE.erl b/erts/emulator/test/bs_match_misc_SUITE.erl
index 17759d78f3..cae4eb54d2 100644
--- a/erts/emulator/test/bs_match_misc_SUITE.erl
+++ b/erts/emulator/test/bs_match_misc_SUITE.erl
@@ -24,7 +24,7 @@
 	 kenneth/1,encode_binary/1,native/1,happi/1,
 	 size_var/1,wiger/1,x0_context/1,huge_float_field/1,
 	 writable_binary_matched/1,otp_7198/1,unordered_bindings/1,
-	 float_middle_endian/1]).
+	 float_middle_endian/1,unsafe_get_binary_reuse/1]).
 
 -include_lib("common_test/include/ct.hrl").
 
@@ -36,7 +36,8 @@ all() ->
     [bound_var, bound_tail, t_float, little_float, sean,
      kenneth, encode_binary, native, happi, size_var, wiger,
      x0_context, huge_float_field, writable_binary_matched,
-     otp_7198, unordered_bindings, float_middle_endian].
+     otp_7198, unordered_bindings, float_middle_endian,
+     unsafe_get_binary_reuse].
 
 
 %% Test matching of bound variables.
@@ -556,5 +557,21 @@ unordered_bindings(CompressedLength, HashSize, PadLength, T) ->
      Padding:PadLength/binary,PadLength>> = T,
     {Content,Mac,Padding}.
 
+%% ERL-901: A load-time optimization assumed that match contexts had no further
+%% uses when a bs_get_binary2 overwrote the match context's register, and
+%% figured it would be safe to reuse the match context's memory for the
+%% resulting binary.
+%%
+%% This is no longer safe as of OTP 22, as a match context may be reused after
+%% being passed to another function.
+unsafe_get_binary_reuse(Config) when is_list(Config) ->
+    <<_First, Rest/binary>> = <<"hello">>,
+    ubgr_1(Rest),
+    <<Second,_/bits>> = Rest,
+    $e = Second,
+    ok.
+
+ubgr_1(<<_CP/utf8, Rest/binary>>) -> id(Rest);
+ubgr_1(_) -> false.
 
 id(I) -> I.
diff --git a/erts/emulator/test/call_trace_SUITE.erl b/erts/emulator/test/call_trace_SUITE.erl
index d19f7f81ad..742592f88e 100644
--- a/erts/emulator/test/call_trace_SUITE.erl
+++ b/erts/emulator/test/call_trace_SUITE.erl
@@ -1395,7 +1395,7 @@ seq(M, N, R) when M =< N ->
     seq(M, N-1, [N|R]);
 seq(_, _, R) -> R.
 
-%% lists:reverse can not be called since it is traced
+%% lists:reverse cannot be called since it is traced
 reverse(L) ->
     reverse(L, []).
 %%
diff --git a/erts/emulator/test/code_SUITE.erl b/erts/emulator/test/code_SUITE.erl
index 0444ba4f89..493c6ebe99 100644
--- a/erts/emulator/test/code_SUITE.erl
+++ b/erts/emulator/test/code_SUITE.erl
@@ -332,6 +332,7 @@ constant_pools(Config) when is_list(Config) ->
     A = literals:a(),
     B = literals:b(),
     C = literals:huge_bignum(),
+    D = literals:funs(),
     process_flag(trap_exit, true),
     Self = self(),
 
@@ -345,7 +346,7 @@ constant_pools(Config) when is_list(Config) ->
     true = erlang:purge_module(literals),
     NoOldHeap ! done,
     receive
-        {'EXIT',NoOldHeap,{A,B,C}} ->
+        {'EXIT',NoOldHeap,{A,B,C,D}} ->
             ok;
         Other ->
             ct:fail({unexpected,Other})
@@ -362,7 +363,7 @@ constant_pools(Config) when is_list(Config) ->
     erlang:purge_module(literals),
     OldHeap ! done,
     receive
-	{'EXIT',OldHeap,{A,B,C,[1,2,3|_]=Seq}} when length(Seq) =:= 16 ->
+	{'EXIT',OldHeap,{A,B,C,D,[1,2,3|_]=Seq}} when length(Seq) =:= 16 ->
 	    ok
     end,
 
@@ -390,7 +391,7 @@ constant_pools(Config) when is_list(Config) ->
 	{'DOWN', Mon, process, Hib, Reason} ->
 	    {undef, [{no_module,
 		      no_function,
-		      [{A,B,C,[1,2,3|_]=Seq}], _}]} = Reason,
+		      [{A,B,C,D,[1,2,3|_]=Seq}], _}]} = Reason,
 	    16 = length(Seq)
     end,
     HeapSz = TotHeapSz, %% Ensure restored to hibernated state...
@@ -400,7 +401,9 @@ constant_pools(Config) when is_list(Config) ->
 no_old_heap(Parent) ->
     A = literals:a(),
     B = literals:b(),
-    Res = {A,B,literals:huge_bignum()},
+    C = literals:huge_bignum(),
+    D = literals:funs(),
+    Res = {A,B,C,D},
     Parent ! go,
     receive
         done ->
@@ -410,7 +413,9 @@ no_old_heap(Parent) ->
 old_heap(Parent) ->
     A = literals:a(),
     B = literals:b(),
-    Res = {A,B,literals:huge_bignum(),lists:seq(1, 16)},
+    C = literals:huge_bignum(),
+    D = literals:funs(),
+    Res = {A,B,C,D,lists:seq(1, 16)},
     create_old_heap(),
     Parent ! go,
     receive
@@ -421,7 +426,9 @@ old_heap(Parent) ->
 hibernated(Parent) ->
     A = literals:a(),
     B = literals:b(),
-    Res = {A,B,literals:huge_bignum(),lists:seq(1, 16)},
+    C = literals:huge_bignum(),
+    D = literals:funs(),
+    Res = {A,B,C,D,lists:seq(1, 16)},
     Parent ! go,
     erlang:hibernate(no_module, no_function, [Res]).
 
@@ -755,7 +762,8 @@ t_copy_literals_frags(Config) when is_list(Config) ->
                                           0, 1, 2, 3, 4, 5, 6, 7,
                                           8, 9,10,11,12,13,14,15,
                                           0, 1, 2, 3, 4, 5, 6, 7,
-                                          8, 9,10,11,12,13,14,15>>}]),
+                                          8, 9,10,11,12,13,14,15>>},
+                        {f, fun ?MODULE:all/0}]),
 
     {module, ?mod} = erlang:load_module(?mod, Bin),
     N = 6000,
@@ -796,6 +804,7 @@ literal_receiver() ->
             C = ?mod:c(),
             D = ?mod:d(),
             E = ?mod:e(),
+            F = ?mod:f(),
             literal_receiver();
         {Pid, sender_confirm} ->
             io:format("sender confirm ~w~n", [Pid]),
@@ -811,7 +820,8 @@ literal_sender(N, Recv) ->
                           ?mod:b(),
                           ?mod:c(),
                           ?mod:d(),
-                          ?mod:e()]},
+                          ?mod:e(),
+                          ?mod:f()]},
     literal_sender(N - 1, Recv).
 
 literal_switcher() ->
diff --git a/erts/emulator/test/code_SUITE_data/literals.erl b/erts/emulator/test/code_SUITE_data/literals.erl
index 7c3b0ebe73..13c8b412b0 100644
--- a/erts/emulator/test/code_SUITE_data/literals.erl
+++ b/erts/emulator/test/code_SUITE_data/literals.erl
@@ -19,7 +19,8 @@
 %%
 
 -module(literals).
--export([a/0,b/0,huge_bignum/0,binary/0,unused_binaries/0,bits/0]).
+-export([a/0,b/0,huge_bignum/0,funs/0,
+         binary/0,unused_binaries/0,bits/0]).
 -export([msg1/0,msg2/0,msg3/0,msg4/0,msg5/0]).
 
 a() ->
@@ -108,3 +109,8 @@ msg2() -> {"hello","world"}.
 msg3() -> <<"halloj">>.
 msg4() -> #{ 1=> "hello", b => "world"}.
 msg5() -> {1,2,3,4,5,6}.
+
+funs() ->
+    %% Literal funs (in a non-literal list).
+    [fun ?MODULE:a/0,
+     fun() -> ok end].                          %No environment.
diff --git a/erts/emulator/test/dirty_bif_SUITE.erl b/erts/emulator/test/dirty_bif_SUITE.erl
index 46eb0cba58..4f5ad0295a 100644
--- a/erts/emulator/test/dirty_bif_SUITE.erl
+++ b/erts/emulator/test/dirty_bif_SUITE.erl
@@ -38,7 +38,8 @@
 	 dirty_process_info/1,
 	 dirty_process_register/1,
 	 dirty_process_trace/1,
-	 code_purge/1]).
+	 code_purge/1,
+         otp_15688/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -64,7 +65,8 @@ all() ->
      dirty_process_info,
      dirty_process_register,
      dirty_process_trace,
-     code_purge].
+     code_purge,
+     otp_15688].
 
 init_per_suite(Config) ->
     case erlang:system_info(dirty_cpu_schedulers) of
@@ -498,10 +500,58 @@ code_purge(Config) when is_list(Config) ->
     true = Time =< 1000,
     ok.
 
+otp_15688(Config) when is_list(Config) ->
+    ImBack = make_ref(),
+    {See, SeeMon} = spawn_monitor(fun () ->
+                                          erts_debug:dirty_io(wait, 2000),
+                                          exit(ImBack)
+                                  end),
+    wait_until(fun () ->
+                       [{current_function, {erts_debug, dirty_io, 2}},
+                        {status, running}]
+                           == process_info(See,
+                                           [current_function, status])
+               end),
+    {Ser1, Ser1Mon} = spawn_monitor(fun () ->
+                                            erlang:suspend_process(See,
+                                                                   [asynchronous])
+                                    end),
+    erlang:suspend_process(See, [asynchronous]),
+    receive {'DOWN', Ser1Mon, process, Ser1, normal} -> ok end,
+
+    %% Verify that we sent the suspend request while it was executing dirty...
+    [{current_function, {erts_debug, dirty_io, 2}},
+     {status, running}] = process_info(See, [current_function, status]),
+
+    wait_until(fun () ->
+                       {status, suspended} == process_info(See, status)
+               end),
+    erlang:resume_process(See),
+
+    receive
+        {'DOWN', SeeMon, process, See, Reason} ->
+            ImBack = Reason
+    after 4000 ->
+            %% Resume bug seems to have hit us...
+            PI = process_info(See),
+            exit(See, kill),
+            ct:fail({suspendee_stuck, PI})
+    end.
+    
+
 %%
 %% Internal...
 %%
 
+wait_until(Fun) ->
+    case Fun() of
+        true ->
+            ok;
+        _ ->
+            receive after 100 -> ok end,
+            wait_until(Fun)
+    end.
+
 access_dirty_process(Config, Start, Test, Finish) ->
     {ok, Node} = start_node(Config, ""),
     [ok] = mcall(Node,
diff --git a/erts/emulator/test/distribution_SUITE.erl b/erts/emulator/test/distribution_SUITE.erl
index 885c66331c..9dcdd60060 100644
--- a/erts/emulator/test/distribution_SUITE.erl
+++ b/erts/emulator/test/distribution_SUITE.erl
@@ -19,7 +19,6 @@
 %%
 
 -module(distribution_SUITE).
--compile(r16).
 
 -define(VERSION_MAGIC,       131).
 
@@ -39,6 +38,8 @@
 -define(Line,).
 
 -export([all/0, suite/0, groups/0,
+         init_per_suite/1, end_per_suite/1,
+         init_per_group/2, end_per_group/2,
          ping/1, bulk_send_small/1,
          group_leader/1,
          optimistic_dflags/1,
@@ -53,7 +54,6 @@
          dist_parallel_send/1,
          atom_roundtrip/1,
          unicode_atom_roundtrip/1,
-         atom_roundtrip_r16b/1,
          contended_atom_cache_entry/1,
          contended_unicode_atom_cache_entry/1,
          bad_dist_structure/1,
@@ -62,7 +62,13 @@
          bad_dist_ext_control/1,
          bad_dist_ext_connection_id/1,
          bad_dist_ext_size/1,
-	 start_epmd_false/1, epmd_module/1]).
+	 start_epmd_false/1, epmd_module/1,
+         bad_dist_fragments/1,
+         message_latency_large_message/1,
+         message_latency_large_link_exit/1,
+         message_latency_large_monitor_exit/1,
+         message_latency_large_exit2/1,
+         system_limit/1]).
 
 %% Internal exports.
 -export([sender/3, receiver2/2, dummy_waiter/0, dead_process/0,
@@ -70,7 +76,7 @@
          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]).
+         dist_evil_parallel_receiver/0, make_busy/2]).
 
 %% epmd_module exports
 -export([start_link/0, register_node/2, register_node/3, port_please/2, address_please/3]).
@@ -88,10 +94,10 @@ all() ->
      ref_port_roundtrip, nil_roundtrip, stop_dist,
      {group, trap_bif}, {group, dist_auto_connect},
      dist_parallel_send, atom_roundtrip, unicode_atom_roundtrip,
-     atom_roundtrip_r16b,
      contended_atom_cache_entry, contended_unicode_atom_cache_entry,
-     bad_dist_structure, {group, bad_dist_ext},
-     start_epmd_false, epmd_module].
+     {group, message_latency},
+     {group, bad_dist}, {group, bad_dist_ext},
+     start_epmd_false, epmd_module, system_limit].
 
 groups() ->
     [{bulk_send, [], [bulk_send_small, bulk_send_big, bulk_send_bigbig]},
@@ -100,10 +106,40 @@ groups() ->
      {trap_bif, [], [trap_bif_1, trap_bif_2, trap_bif_3]},
      {dist_auto_connect, [],
       [dist_auto_connect_never, dist_auto_connect_once]},
+     {bad_dist, [],
+      [bad_dist_structure, bad_dist_fragments]},
      {bad_dist_ext, [],
       [bad_dist_ext_receive, bad_dist_ext_process_info,
        bad_dist_ext_size,
-       bad_dist_ext_control, bad_dist_ext_connection_id]}].
+       bad_dist_ext_control, bad_dist_ext_connection_id]},
+     {message_latency, [],
+      [message_latency_large_message,
+       message_latency_large_link_exit,
+       message_latency_large_monitor_exit,
+       message_latency_large_exit2]}
+    ].
+
+init_per_suite(Config) ->
+    {ok, Apps} = application:ensure_all_started(os_mon),
+    [{started_apps, Apps} | Config].
+
+end_per_suite(Config) ->
+    Apps = proplists:get_value(started_apps, Config),
+    [application:stop(App) || App <- lists:reverse(Apps)],
+    Config.
+
+init_per_group(message_latency, Config) ->
+    Free = free_memory(),
+    if Free < 2048 ->
+            {skip, "Not enough memory"};
+       true ->
+            Config
+    end;
+init_per_group(_, Config) ->
+    Config.
+
+end_per_group(_, Config) ->
+    Config.
 
 %% Tests pinging a node in different ways.
 ping(Config) when is_list(Config) ->
@@ -568,10 +604,20 @@ do_busy_test(Node, Fun) ->
             %% Don't match arity; it is different in debug and
             %% optimized emulator
             [{status, suspended},
-             {current_function, {erlang, bif_return_trap, _}}] = Pinfo,
+             {current_function, {Mod, Func, _}}] = Pinfo,
+            if
+                Mod =:= erlang andalso Func =:= bif_return_trap ->
+                    true;
+                Mod =:= erts_internal andalso Func =:= dsend_continue_trap ->
+                    true;
+                true ->
+                    ct:fail({incorrect, pinfo, Pinfo})
+            end,
             receive
                 {'DOWN', M, process, P, Reason} ->
                     io:format("~p died with exit reason ~p~n", [P, Reason]),
+                    verify_nc(node()),
+                    verify_nc(Node),
                     normal = Reason
             end
     end.
@@ -720,6 +766,7 @@ link_to_dead_new_node(Config) when is_list(Config) ->
         {'EXIT', Pid, noproc} ->
             ok;
         Other ->
+            stop_node(Node),
             ct:fail({unexpected_message, Other})
     after 5000 ->
               ct:fail(nothing_received)
@@ -931,7 +978,9 @@ dist_auto_connect_never(Config) when is_list(Config) ->
                      ok;
                  {do_dist_auto_connect, Error} ->
                      {error, Error};
-                 Other ->
+                 %% The io:formats in dos_dist_auto_connect will
+                 %% generate port output messages that are ok
+                 Other when not is_port(element(1, Other))->
                      {error, Other}
              after 32000 ->
                        timeout
@@ -1107,23 +1156,6 @@ atom_roundtrip(Config) when is_list(Config) ->
     stop_node(Node),
     ok.
 
-atom_roundtrip_r16b(Config) when is_list(Config) ->
-    case test_server:is_release_available("r16b") of
-        true ->
-            ct:timetrap({minutes, 6}),
-            AtomData = unicode_atom_data(),
-            verify_atom_data(AtomData),
-            case start_node(Config, [], "r16b") of
-                {ok, Node} ->
-                    do_atom_roundtrip(Node, AtomData),
-                    stop_node(Node);
-                {error, timeout} ->
-                    {skip,"Unable to start OTP R16B release"}
-            end;
-        false ->
-            {skip,"No OTP R16B available"}
-    end.
-
 unicode_atom_roundtrip(Config) when is_list(Config) ->
     AtomData = unicode_atom_data(),
     verify_atom_data(AtomData),
@@ -1364,6 +1396,303 @@ get_conflicting_unicode_atoms(CIX, N) ->
             get_conflicting_unicode_atoms(CIX, N)
     end.
 
+
+%% The message_latency_large tests that small distribution messages are
+%% not blocked by other large distribution messages. Basically it tests
+%% that fragmentation of distribution messages works.
+%%
+%% Because of large problems to get reliable values from these testcases
+%% they no longer fail when the latency is incorrect. However, they are
+%% kept as they continue to find bugs in the distribution implementation.
+message_latency_large_message(Config) when is_list(Config) ->
+    measure_latency_large_message(?FUNCTION_NAME, fun(Dropper, Payload) -> Dropper ! Payload end).
+
+message_latency_large_exit2(Config) when is_list(Config) ->
+    measure_latency_large_message(?FUNCTION_NAME, fun erlang:exit/2).
+
+message_latency_large_link_exit(Config) when is_list(Config) ->
+    message_latency_large_exit(?FUNCTION_NAME, fun erlang:link/1).
+
+message_latency_large_monitor_exit(Config) when is_list(Config) ->
+    message_latency_large_exit(?FUNCTION_NAME, fun(Dropper) ->
+                                                       Dropper ! {monitor, self()},
+                                                       receive ok -> ok end
+                                               end).
+
+message_latency_large_exit(Nodename, ReasonFun) ->
+    measure_latency_large_message(
+      Nodename,
+      fun(Dropper, Payload) ->
+              Pid  = spawn(fun() ->
+                                   receive go -> ok end,
+                                   ReasonFun(Dropper),
+                                   exit(Payload)
+                           end),
+
+              FlushTrace = fun F() ->
+                                   receive
+                                       {trace, Pid, _, _} ->
+                                           F()
+                                   after 0 ->
+                                           ok
+                                   end
+                           end,
+
+              erlang:trace(Pid, true, [exiting]),
+              Pid ! go,
+              receive
+                  {trace, Pid, out_exited, 0} ->
+                      FlushTrace()
+              end
+      end).
+
+measure_latency_large_message(Nodename, DataFun) ->
+
+    erlang:system_monitor(self(), [busy_dist_port]),
+
+    {ok, N} = start_node(Nodename),
+
+    Dropper = spawn(N, fun F() ->
+                               process_flag(trap_exit, true),
+                               receive
+                                   {monitor,Pid} ->
+                                       erlang:monitor(process, Pid),
+                                       Pid ! ok;
+                                   _ -> ok
+                               end,
+                               F()
+                       end),
+
+    Echo = spawn(N, fun F() -> receive {From, Msg} -> From ! Msg, F() end end),
+
+    BuildType = erlang:system_info(build_type),
+    WordSize = erlang:system_info(wordsize),
+
+    if
+        BuildType =/= opt; WordSize =:= 4 ->
+            %% Test 3.2 MB and 32 MB and test the latency difference of sent messages
+            Payloads = [{I, <<0:(I * 32 * 1024 * 8)>>} || I <- [1,10]];
+        true ->
+            %% Test 32 MB and 320 MB and test the latency difference of sent messages
+            Payloads = [{I, <<0:(I * 32 * 1024 * 1024 * 8)>>} || I <- [1,10]]
+    end,
+
+    IndexTimes = [{I, measure_latency(DataFun, Dropper, Echo, P)}
+                  || {I, P} <- Payloads],
+
+    Times = [ Time || {_I, Time} <- IndexTimes],
+
+    ct:pal("~p",[IndexTimes]),
+
+    stop_node(N),
+
+    case {lists:max(Times), lists:min(Times)} of
+        {Max, Min} when Max * 0.25 > Min, BuildType =:= opt ->
+            %% We only issue a comment for this failure as the
+            %% testcases proved very difficult to run successfully
+            %% on many platforms.
+            ct:comment({incorrect_latency, IndexTimes}),
+            ok;
+        _ ->
+            ok
+    end.
+
+measure_latency(DataFun, Dropper, Echo, Payload) ->
+
+    flush(),
+
+    Senders = [spawn_monitor(
+                 fun F() ->
+                         DataFun(Dropper, Payload),
+                         receive
+                             die -> ok
+                         after 0 ->
+                                 F()
+                         end
+                 end) || _ <- lists:seq(1,2)],
+
+    wait_for_busy_dist(2 * 60 * 1000, 10),
+
+    {TS, Times} =
+        timer:tc(fun() ->
+                         [begin
+                              T0 = erlang:monotonic_time(),
+                              Echo ! {self(), hello},
+                              receive hello -> ok end,
+                              (erlang:monotonic_time() - T0) / 1000000
+                          end || _ <- lists:seq(1,100)]
+                 end),
+    Avg = lists:sum(Times) / length(Times),
+    StdDev = math:sqrt(lists:sum([math:pow(V - Avg,2) || V <- Times]) / length(Times)),
+    ct:pal("Times: Avg: ~p Max: ~p Min: ~p Var: ~p",
+           [Avg, lists:max(Times), lists:min(Times), StdDev]),
+    [begin
+         Sender ! die,
+         receive
+             {'DOWN', Ref, process, _, _} ->
+                 ok
+         end
+     end || {Sender, Ref} <- Senders],
+    TS.
+
+wait_for_busy_dist(_Tmo, 0) ->
+    ok;
+wait_for_busy_dist(Tmo, N) ->
+    T0 = erlang:monotonic_time(millisecond),
+    receive
+         {monitor, _Sender, busy_dist_port, _Info} ->
+             wait_for_busy_dist(Tmo - (erlang:monotonic_time(millisecond) - T0), N - 1)
+    after Tmo ->
+            ct:log("Timed out waiting for busy_dist, ~p left",[N]),
+            timeout
+    end.
+
+flush() ->
+    receive
+        _ ->
+            flush()
+    after 0 ->
+            ok
+    end.
+
+system_limit(Config) when is_list(Config) ->
+    case erlang:system_info(wordsize) of
+        8 ->
+            case proplists:get_value(system_total_memory,
+                                     memsup:get_system_memory_data()) of
+                Memory when is_integer(Memory),
+                            Memory > 6*1024*1024*1024 ->
+                    test_system_limit(Config),
+                    garbage_collect(),
+                    ok;
+                _ ->
+                    {skipped, "Not enough memory on this machine"}
+            end;
+        4 ->
+            {skipped, "Only interesting on 64-bit builds"}
+    end.
+
+test_system_limit(Config) when is_list(Config) ->
+    Bits = ((1 bsl 32)+1)*8,
+    HugeBin = <<0:Bits>>,
+    HugeListBin = [lists:duplicate(2000000,2000000), HugeBin],
+    {ok, N1} = start_node(Config),
+    monitor_node(N1, true),
+    receive
+        {nodedown, N1} ->
+            ct:fail({unexpected_nodedown, N1})
+    after 0 ->
+            ok
+    end,
+    P1 = spawn(N1,
+               fun () ->
+                       receive after infinity -> ok end
+               end),
+
+    io:format("~n** distributed send **~n~n", []),
+    try
+        P1 ! HugeBin,
+        exit(oops1)
+    catch
+        error:system_limit -> ok
+    end,
+    try
+        P1 ! HugeListBin,
+        exit(oops2)
+    catch
+        error:system_limit -> ok
+    end,
+
+    io:format("~n** distributed exit **~n~n", []),
+    try
+        exit(P1, HugeBin),
+        exit(oops3)
+    catch
+        error:system_limit -> ok
+    end,
+    try
+        exit(P1, HugeListBin),
+        exit(oops4)
+    catch
+        error:system_limit -> ok
+    end,
+
+    io:format("~n** distributed registered send **~n~n", []),
+    try
+        {missing_proc, N1} ! HugeBin,
+        exit(oops5)
+    catch
+        error:system_limit -> ok
+    end,
+    try
+        {missing_proc, N1} ! HugeListBin,
+        exit(oops6)
+    catch
+        error:system_limit -> ok
+    end,
+    receive
+        {nodedown, N1} ->
+            ct:fail({unexpected_nodedown, N1})
+    after 0 ->
+            ok
+    end,
+
+    %%
+    %% system_limit in exit reasons brings the
+    %% connection down...
+    %%
+
+    io:format("~n** distributed link exit **~n~n", []),
+    spawn(fun () ->
+                  link(P1),
+                  exit(HugeBin)
+          end),
+    receive {nodedown, N1} -> ok end,
+
+    {ok, N2} = start_node(Config),
+    monitor_node(N2, true),
+    P2 = spawn(N2,
+               fun () ->
+                       receive after infinity -> ok end
+               end),
+    spawn(fun () ->
+                  link(P2),
+                  exit(HugeListBin)
+          end),
+    receive {nodedown, N2} -> ok end,
+
+    io:format("~n** distributed monitor down **~n~n", []),
+    {ok, N3} = start_node(Config),
+    monitor_node(N3, true),
+    Go1 = make_ref(),
+    LP1 = spawn(fun () ->
+                        receive Go1 -> ok end,
+                        exit(HugeBin)
+                end),
+    _ = spawn(N3,
+               fun () ->
+                       _ = erlang:monitor(process, LP1),
+                       LP1 ! Go1,
+                       receive after infinity -> ok end
+               end),
+    receive {nodedown, N3} -> ok end,
+
+    {ok, N4} = start_node(Config),
+    monitor_node(N4, true),
+    Go2 = make_ref(),
+    LP2 = spawn(fun () ->
+                        receive Go2 -> ok end,
+                        exit(HugeListBin)
+                end),
+    _ = spawn(N4,
+              fun () ->
+                      _ = erlang:monitor(process, LP2),
+                      LP2 ! Go2,
+                      receive after infinity -> ok end
+              end),
+    receive {nodedown, N4} -> ok end,
+    ok.
+
 -define(COOKIE, '').
 -define(DOP_LINK,		1).
 -define(DOP_SEND,		2).
@@ -1382,6 +1711,15 @@ get_conflicting_unicode_atoms(CIX, N) ->
 -define(DOP_DEMONITOR_P,	20).
 -define(DOP_MONITOR_P_EXIT,	21).
 
+-define(DOP_SEND_SENDER, 22).
+-define(DOP_SEND_SENDER_TT, 23).
+
+-define(DOP_PAYLOAD_EXIT, 24).
+-define(DOP_PAYLOAD_EXIT_TT, 25).
+-define(DOP_PAYLOAD_EXIT2, 26).
+-define(DOP_PAYLOAD_EXIT2_TT, 27).
+-define(DOP_PAYLOAD_MONITOR_P_EXIT, 28).
+
 start_monitor(Offender,P) ->
     Parent = self(),
     Q = spawn(Offender,
@@ -1515,7 +1853,145 @@ bad_dist_structure(Config) when is_list(Config) ->
     stop_node(Victim),
     ok.
 
+%% Test various dist fragmentation errors
+bad_dist_fragments(Config) when is_list(Config) ->
+    ct:timetrap({seconds, 15}),
+
+    {ok, Offender} = start_node(bad_dist_fragment_offender),
+    {ok, Victim} = start_node(bad_dist_fragment_victim),
+
+    Msg = iolist_to_binary(dmsg_ext(lists:duplicate(255,255))),
+
+    start_node_monitors([Offender,Victim]),
+    Parent = self(),
+    P = spawn(Victim,
+              fun () ->
+                      process_flag(trap_exit,true),
+                      Parent ! {self(), started},
+                      receive check_msgs -> ok end,
+                      bad_dist_struct_check_msgs([one,
+                                                  two]),
+                      Parent ! {self(), messages_checked},
+                      receive done -> ok end
+              end),
+    receive {P, started} -> ok end,
+    pong = rpc:call(Victim, net_adm, ping, [Offender]),
+    verify_up(Offender, Victim),
+    true = lists:member(Offender, rpc:call(Victim, erlang, nodes, [])),
+    start_monitor(Offender,P),
+    P ! one,
+
+    start_monitor(Offender,P),
+    send_bad_fragments(Offender, Victim, P,{?DOP_SEND,?COOKIE,P},3,
+                      [{frg, 1, binary:part(Msg, 10,byte_size(Msg)-10)}]),
+
+    start_monitor(Offender,P),
+    send_bad_fragments(Offender, Victim, P,{?DOP_SEND,?COOKIE,P},3,
+                      [{hdr, 3, binary:part(Msg, 0,10)},
+                       {frg, 1, binary:part(Msg, 10,byte_size(Msg)-10)}]),
+
+    start_monitor(Offender,P),
+    send_bad_fragments(Offender, Victim, P,{?DOP_SEND,?COOKIE,P},3,
+                      [{hdr, 3, binary:part(Msg, 0,10)},
+                       {hdr, 3, binary:part(Msg, 0,10)}]),
+
+    start_monitor(Offender,P),
+    send_bad_fragments(Offender, Victim, P,{?DOP_SEND,?COOKIE,P,broken},3,
+                      [{hdr, 1, binary:part(Msg, 10,byte_size(Msg)-10)}]),
+
+    start_monitor(Offender,P),
+    send_bad_fragments(Offender, Victim, P,{?DOP_SEND,?COOKIE,P},3,
+                      [{hdr, 3, binary:part(Msg, 10,byte_size(Msg)-10)},
+                       close]),
+
+    start_monitor(Offender,P),
+    ExitVictim = spawn(Victim, fun() -> receive ok -> ok end end),
+    send_bad_fragments(Offender, Victim, P,{?DOP_PAYLOAD_EXIT,P,ExitVictim},2,
+                      [{hdr, 1, [131]}]),
+
+    start_monitor(Offender,P),
+    Exit2Victim = spawn(Victim, fun() -> receive ok -> ok end end),
+    send_bad_fragments(Offender, Victim, P,{?DOP_PAYLOAD_EXIT2,P,Exit2Victim},2,
+                      [{hdr, 1, [132]}]),
+
+    start_monitor(Offender,P),
+    DownVictim = spawn(Victim, fun() -> receive ok -> ok end end),
+    DownRef = erlang:monitor(process, DownVictim),
+    send_bad_fragments(Offender, Victim, P,{?DOP_PAYLOAD_MONITOR_P_EXIT,P,DownVictim,DownRef},2,
+                      [{hdr, 1, [133]}]),
+
+    P ! two,
+    P ! check_msgs,
+    receive
+        {P, messages_checked} -> ok
+    after 5000 ->
+              exit(victim_is_dead)
+    end,
+
+    {message_queue_len, 0}
+    = rpc:call(Victim, erlang, process_info, [P, message_queue_len]),
+
+    unlink(P),
+    P ! done,
+    stop_node(Offender),
+    stop_node(Victim),
+    ok.
+
+dmsg_frag_hdr(Frag) ->
+    dmsg_frag_hdr(erlang:phash2(self()), Frag).
+dmsg_frag_hdr(Seq, Frag) ->
+    [131, $E, uint64_be(Seq), uint64_be(Frag), 0].
+
+dmsg_frag(Frag) ->
+    dmsg_frag(erlang:phash2(self()), Frag).
+dmsg_frag(Seq, Frag) ->
+    [131, $F, uint64_be(Seq), uint64_be(Frag)].
 
+send_bad_fragments(Offender,VictimNode,Victim,Ctrl,WhereToPutSelf,Fragments) ->
+    Parent = self(),
+    Done = make_ref(),
+    ct:pal("Send: ~p",[Fragments]),
+    spawn_link(Offender,
+          fun () ->
+                  Node = node(Victim),
+                  pong = net_adm:ping(Node),
+                  erlang:monitor_node(Node, true),
+                  DCtrl = dctrl(Node),
+                  Ctrl1 = case WhereToPutSelf of
+                             0 ->
+                                 Ctrl;
+                             N when N > 0 ->
+                                 setelement(N,Ctrl,self())
+                         end,
+
+                  FragData = [case Type of
+                                  hdr ->
+                                      [dmsg_frag_hdr(FragId),
+                                       dmsg_ext(Ctrl1), FragPayload];
+                                  frg ->
+                                      [dmsg_frag(FragId), FragPayload]
+                              end || {Type, FragId, FragPayload} <- Fragments],
+
+                  receive {nodedown, Node} -> exit("premature nodedown")
+                  after 10 -> ok
+                  end,
+
+                  [ dctrl_send(DCtrl, D) || D <- FragData ],
+                  [ erlang:port_close(DCtrl) || close <- Fragments],
+
+                  receive {nodedown, Node} -> ok
+                  after 5000 -> exit("missing nodedown")
+                  end,
+                  Parent ! {FragData,Done}
+          end),
+    receive
+        {WhatSent,Done} ->
+            io:format("Offender sent ~p~n",[WhatSent]),
+            verify_nc(VictimNode),
+            ok
+    after 7000 ->
+              exit(unable_to_send)
+    end.
 
 bad_dist_ext_receive(Config) when is_list(Config) ->
     {ok, Offender} = start_node(bad_dist_ext_receive_offender),
@@ -2124,8 +2600,30 @@ start_node(Config, Args, Rel) when is_list(Config), is_list(Rel) ->
     start_node(Name, Args, Rel).
 
 stop_node(Node) ->
+    verify_nc(Node),
     test_server:stop_node(Node).
 
+verify_nc(Node) ->
+    P = self(),
+    Ref = make_ref(),
+    Pid = spawn(Node,
+                fun() ->
+                        R = erts_test_utils:check_node_dist(fun(E) -> E end),
+                        P ! {Ref, R}
+                end),
+    MonRef = monitor(process, Pid),
+    receive
+        {Ref, ok} ->
+            demonitor(MonRef,[flush]),
+            ok;
+        {Ref, Error} ->
+            ct:log("~s",[Error]),
+            ct:fail(failed_nc_refc_check);
+        {'DOWN', MonRef, _, _, _} = Down ->
+            ct:log("~p",[Down]),
+            ct:fail(crashed_nc_refc_check)
+    end.
+
 freeze_node(Node, MS) ->
     Own = 300,
     DoingIt = make_ref(),
@@ -2485,6 +2983,17 @@ mk_ref({NodeNameExt, Creation}, Numbers) when is_integer(Creation),
             exit({unexpected_binary_to_term_result, Other})
     end.
 
+uint64_be(Uint) when is_integer(Uint), 0 =< Uint, Uint < 1 bsl 64 ->
+    [(Uint bsr 56) band 16#ff,
+     (Uint bsr 48) band 16#ff,
+     (Uint bsr 40) band 16#ff,
+     (Uint bsr 32) band 16#ff,
+     (Uint bsr 24) band 16#ff,
+     (Uint bsr 16) band 16#ff,
+     (Uint bsr 8) band 16#ff,
+     Uint band 16#ff];
+uint64_be(Uint) ->
+    exit({badarg, uint64_be, [Uint]}).
 
 uint32_be(Uint) when is_integer(Uint), 0 =< Uint, Uint < 1 bsl 32 ->
     [(Uint bsr 24) band 16#ff,
@@ -2505,3 +3014,23 @@ uint8(Uint) when is_integer(Uint), 0 =< Uint, Uint < 1 bsl 8 ->
     Uint band 16#ff;
 uint8(Uint) ->
     exit({badarg, uint8, [Uint]}).
+
+free_memory() ->
+    %% Free memory in MB.
+    try
+	SMD = memsup:get_system_memory_data(),
+	{value, {free_memory, Free}} = lists:keysearch(free_memory, 1, SMD),
+	TotFree = (Free +
+		   case lists:keysearch(cached_memory, 1, SMD) of
+		       {value, {cached_memory, Cached}} -> Cached;
+		       false -> 0
+		   end +
+		   case lists:keysearch(buffered_memory, 1, SMD) of
+		       {value, {buffered_memory, Buffed}} -> Buffed;
+		       false -> 0
+		   end),
+	TotFree div (1024*1024)
+    catch
+	error : undef ->
+	    ct:fail({"os_mon not built"})
+    end.
diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl
index bd62708aa7..f6d7c55017 100644
--- a/erts/emulator/test/driver_SUITE.erl
+++ b/erts/emulator/test/driver_SUITE.erl
@@ -120,29 +120,6 @@
 
 -define(heap_binary_size, 64).
 
-init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
-    CIOD = rpc(Config,
-               fun() ->
-                       case catch erts_debug:get_internal_state(available_internal_state) of
-                           true -> ok;
-                           _ -> erts_debug:set_internal_state(available_internal_state, true)
-                       end,
-                       erts_debug:get_internal_state(check_io_debug)
-               end),
-    erlang:display({init_per_testcase, Case}),
-    0 = element(1, CIOD),
-    [{testcase, Case}|Config].
-
-end_per_testcase(Case, Config) ->
-    erlang:display({end_per_testcase, Case}),
-    CIOD = rpc(Config,
-               fun() ->
-                       get_stable_check_io_info(),
-                       erts_debug:get_internal_state(check_io_debug)
-               end),
-    0 = element(1, CIOD),
-    ok.
-
 suite() ->
     [{ct_hooks,[ts_install_cth]},
      {timetrap, {minutes, 1}}].
@@ -219,6 +196,48 @@ end_per_group(_GroupName, Config) ->
     end,
     Config.
 
+init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
+    CIOD = rpc(Config,
+               fun() ->
+                       case catch erts_debug:get_internal_state(available_internal_state) of
+                           true -> ok;
+                           _ -> erts_debug:set_internal_state(available_internal_state, true)
+                       end,
+                       erts_debug:get_internal_state(check_io_debug)
+               end),
+    erlang:display({init_per_testcase, Case}),
+    0 = element(1, CIOD),
+    [{testcase, Case}|Config].
+
+end_per_testcase(Case, Config) ->
+    erlang:display({end_per_testcase, Case}),
+    try rpc(Config, fun() ->
+                            get_stable_check_io_info(),
+                            erts_debug:get_internal_state(check_io_debug)
+                    end) of
+        CIOD ->
+            0 = element(1, CIOD)
+    catch _E:_R:_ST ->
+            %% Logs some info about the system
+            ct_os_cmd("epmd -names"),
+            ct_os_cmd("ps aux"),
+            %% Restart the node
+            case proplists:get_value(node, Config) of
+                undefined ->
+                    ok;
+                Node ->
+                    timer:sleep(1000), %% Give the node time to die
+                    [NodeName, _] = string:lexemes(atom_to_list(Node),"@"),
+                    {ok, Node} = start_node_final(
+                                   list_to_atom(NodeName),
+                                   proplists:get_value(node_args, Config))
+            end
+    end,
+    ok.
+
+ct_os_cmd(Cmd) ->
+    ct:log("~s: ~s",[Cmd,os:cmd(Cmd)]).
+
 %% Test sending bad types to port with an outputv-capable driver.
 outputv_errors(Config) when is_list(Config) ->
     Path = proplists:get_value(data_dir, Config),
@@ -998,7 +1017,9 @@ chkio_test({erts_poll_info, Before},
             During = get_check_io_total(erlang:system_info(check_io)),
             erlang:display(During),
 
-            0 = element(1, erts_debug:get_internal_state(check_io_debug)),
+            [0 = element(1, erts_debug:get_internal_state(check_io_debug)) ||
+                %% The pollset is not stable when running the fallback testcase
+                Test /= ?CHKIO_USE_FALLBACK_POLLSET],
             io:format("During test: ~p~n", [During]),
             chk_chkio_port(Port),
             case erlang:port_control(Port, ?CHKIO_STOP, "") of
@@ -1069,14 +1090,19 @@ get_stable_check_io_info(N) ->
 get_check_io_total(ChkIo) ->
     ct:log("ChkIo = ~p~n",[ChkIo]),
     {Fallback, Rest} = get_fallback(ChkIo),
+    OnlyPollThreads = [PS || PS <- Rest, not is_scheduler_pollset(PS)],
     add_fallback_infos(Fallback,
-      lists:foldl(fun(Pollset, Acc) ->
-                          lists:zipwith(fun(A, B) ->
-                                                add_pollset_infos(A,B)
-                                        end,
-                                        Pollset, Acc)
-                  end,
-                  hd(Rest), tl(Rest))).
+      lists:foldl(
+        fun(Pollset, Acc) ->
+                lists:zipwith(fun(A, B) ->
+                                      add_pollset_infos(A,B)
+                              end,
+                              Pollset, Acc)
+        end,
+        hd(OnlyPollThreads), tl(OnlyPollThreads))).
+
+is_scheduler_pollset(Pollset) ->
+    proplists:get_value(poll_threads, Pollset) == 0.
 
 add_pollset_infos({Tag, A}=TA , {Tag, B}=TB) ->
     case tag_type(Tag) of
@@ -2637,7 +2663,6 @@ start_node(Config) when is_list(Config) ->
 start_node(Name) ->
     start_node(Name, "").
 start_node(NodeName, Args) ->
-    Pa = filename:dirname(code:which(?MODULE)),
     Name = list_to_atom(atom_to_list(?MODULE)
                         ++ "-"
                         ++ atom_to_list(NodeName)
@@ -2645,7 +2670,17 @@ start_node(NodeName, Args) ->
                         ++ integer_to_list(erlang:system_time(second))
                         ++ "-"
                         ++ integer_to_list(erlang:unique_integer([positive]))),
-    test_server:start_node(Name, slave, [{args, Args ++ " -pa "++Pa}]).
+    start_node_final(Name, Args).
+start_node_final(Name, Args) ->
+    {ok, Pwd} = file:get_cwd(),
+    FinalArgs = [Args, " -pa ", filename:dirname(code:which(?MODULE))],
+    {ok, Node} = test_server:start_node(Name, slave, [{args, FinalArgs}]),
+    LogPath = Pwd ++ "/error_log." ++ atom_to_list(Name),
+    ct:pal("Logging to: ~s", [LogPath]),
+    rpc:call(Node, logger, add_handler, [file_handler, logger_std_h,
+                                         #{formatter => {logger_formatter,#{ single_line => false }},
+                                           config => #{file => LogPath }}]),
+    {ok, Node}.
 
 stop_node(Node) ->
     test_server:stop_node(Node).
@@ -2660,24 +2695,7 @@ wait_deallocations() ->
 
 driver_alloc_size() ->
     wait_deallocations(),
-    case erlang:system_info({allocator_sizes, driver_alloc}) of
-        false ->
-            undefined;
-        MemInfo ->
-            CS = lists:foldl(
-                   fun ({instance, _, L}, Acc) ->
-                           {value,{_,MBCS}} = lists:keysearch(mbcs, 1, L),
-                           {value,{_,SBCS}} = lists:keysearch(sbcs, 1, L),
-                           [MBCS,SBCS | Acc]
-                   end,
-                   [],
-                   MemInfo),
-            lists:foldl(
-              fun(L, Sz0) ->
-                      {value,{_,Sz,_,_}} = lists:keysearch(blocks_size, 1, L),
-                      Sz0+Sz
-              end, 0, CS)
-    end.
+    erts_debug:alloc_blocks_size(driver_alloc).
 
 rpc(Config, Fun) ->
     case proplists:get_value(node, Config) of
diff --git a/erts/emulator/test/dump_SUITE.erl b/erts/emulator/test/dump_SUITE.erl
index d0237b78cc..6133b82756 100644
--- a/erts/emulator/test/dump_SUITE.erl
+++ b/erts/emulator/test/dump_SUITE.erl
@@ -24,7 +24,7 @@
 
 -export([all/0, suite/0, init_per_testcase/2, end_per_testcase/2]).
 
--export([signal_abort/1]).
+-export([signal_abort/1, exiting_dump/1, free_dump/1]).
 
 -export([load/0]).
 
@@ -35,7 +35,7 @@ suite() ->
      {timetrap, {minutes, 2}}].
 
 all() ->
-    [signal_abort].
+    [signal_abort, exiting_dump, free_dump].
 
 init_per_testcase(signal_abort, Config) ->
     SO = erlang:system_info(schedulers_online),
@@ -48,7 +48,10 @@ init_per_testcase(signal_abort, Config) ->
             {skip, "the platform does not support scheduler dump"};
        Dump ->
             Config
-    end.
+    end;
+init_per_testcase(_, Config) ->
+    Config.
+
 
 end_per_testcase(_, Config) ->
     Config.
@@ -65,12 +68,14 @@ signal_abort(Config) ->
 
     {ok, Node} = start_node(Config),
 
-    _P1 = spawn(Node, ?MODULE, load, []),
-    _P2 = spawn(Node, ?MODULE, load, []),
-    _P3 = spawn(Node, ?MODULE, load, []),
-    _P4 = spawn(Node, ?MODULE, load, []),
-    _P5 = spawn(Node, ?MODULE, load, []),
-    _P6 = spawn(Node, ?MODULE, load, []),
+    SO = rpc:call(Node, erlang, system_info, [schedulers_online]),
+
+    _P1 = spawn_opt(Node, ?MODULE, load, [], [{scheduler, (0 rem SO) + 1}]),
+    _P2 = spawn_opt(Node, ?MODULE, load, [], [{scheduler, (1 rem SO) + 1}]),
+    _P3 = spawn_opt(Node, ?MODULE, load, [], [{scheduler, (2 rem SO) + 1}]),
+    _P4 = spawn_opt(Node, ?MODULE, load, [], [{scheduler, (3 rem SO) + 1}]),
+    _P5 = spawn_opt(Node, ?MODULE, load, [], [{scheduler, (4 rem SO) + 1}]),
+    _P6 = spawn_opt(Node, ?MODULE, load, [], [{scheduler, (5 rem SO) + 1}]),
 
     timer:sleep(500),
 
@@ -79,8 +84,6 @@ signal_abort(Config) ->
 
     {ok, Bin} = get_dump_when_done(Dump),
 
-    ct:log("~s",[Bin]),
-
     {match, Matches} = re:run(Bin,"Current Process: <",[global]),
 
     ct:log("Found ~p",[Matches]),
@@ -91,6 +94,111 @@ signal_abort(Config) ->
 
     ok.
 
+load() ->
+    lists:seq(1,10000),
+    load().
+
+
+%% Test that crash dumping when a process is in the state EXITING works
+exiting_dump(Config) when is_list(Config) ->
+    Dump = filename:join(proplists:get_value(priv_dir, Config),"signal_abort.dump"),
+
+    {ok, Node} = start_node(Config),
+
+    Self = self(),
+
+    Pid = spawn_link(Node,
+                     fun() ->
+                             [begin
+                                  T = ets:new(hej,[]),
+                                  [ets:insert(T,{I,I}) || I <- lists:seq(1,1000)]
+                              end || _ <- lists:seq(1,1000)],
+                             Self ! ready,
+                             receive ok -> ok end
+                     end),
+
+    true = rpc:call(Node, os, putenv, ["ERL_CRASH_DUMP",Dump]),
+
+    receive ready -> unlink(Pid), Pid ! ok end,
+
+    rpc:call(Node, erlang, halt, ["dump"]),
+
+    {ok, Bin} = get_dump_when_done(Dump),
+
+    {match, Matches} = re:run(Bin,"^State: Exiting", [global, multiline]),
+
+    ct:log("Found ~p",[Matches]),
+
+    true = length(Matches) == 1,
+
+    file:delete(Dump),
+
+    ok.
+
+%% Test that crash dumping when a process is in the state FREE works
+free_dump(Config) when is_list(Config) ->
+    Dump = filename:join(proplists:get_value(priv_dir, Config),"signal_abort.dump"),
+
+    {ok, NodeA} = start_node(Config),
+    {ok, NodeB} = start_node(Config),
+
+    Self = self(),
+
+    PidA = spawn_link(
+             NodeA,
+             fun() ->
+                     Self ! ready,
+                     Reason = lists:duplicate(1000000,100),
+                     receive
+                         ok ->
+                             spawn(fun() ->
+                                           erlang:system_monitor(self(), [busy_dist_port]),
+                                           timer:sleep(5),
+                                           receive
+                                               M ->
+                                                   io:format("~p",[M])
+%% We may want to add this timeout here in-case no busy condition is triggered
+%%                                           after 60 * 1000 ->
+%%                                                   io:format("Timeout")
+                                           end,
+                                           erlang:halt("dump")
+                                   end),
+                             exit(Reason)
+                     end
+             end),
+
+    PidB = spawn_link(NodeB,
+                      fun() ->
+                              [erlang:monitor(process, PidA) || _ <- lists:seq(1,10000)],
+                              Self ! done,
+                              receive _ -> ok end
+                      end),
+
+    receive done -> ok end,
+    true = rpc:call(NodeA, os, putenv, ["ERL_CRASH_DUMP",Dump]),
+    %% Make the node busy towards NodeB for 10 seconds.
+    BusyPid = rpc:call(NodeA, distribution_SUITE, make_busy, [NodeB,10000]),
+    ct:pal("~p",[BusyPid]),
+
+    receive ready -> unlink(PidA), PidA ! ok end,
+
+    {ok, Bin} = get_dump_when_done(Dump),
+
+    {match, Matches} = re:run(Bin,"^State: Non Existing", [global, multiline]),
+
+    ct:log("Found ~p",[Matches]),
+
+    true = length(Matches) == 1,
+
+    file:delete(Dump),
+
+    unlink(PidB),
+
+    rpc:call(NodeB, erlang, halt, [0]),
+
+    ok.
+
+
 get_dump_when_done(Dump) ->
     case file:read_file_info(Dump) of
         {ok, #file_info{ size = Sz }} ->
@@ -104,15 +212,13 @@ get_dump_when_done(Dump, Sz) ->
     timer:sleep(1000),
     case file:read_file_info(Dump) of
         {ok, #file_info{ size = Sz }} ->
-            file:read_file(Dump);
+            {ok, Bin} = file:read_file(Dump),
+            ct:log("~s",[Bin]),
+            {ok, Bin};
         {ok, #file_info{ size = NewSz }} ->
             get_dump_when_done(Dump, NewSz)
     end.
 
-load() ->
-    lists:seq(1,10000),
-    load().
-
 start_node(Config) when is_list(Config) ->
     Pa = filename:dirname(code:which(?MODULE)),
     Name = list_to_atom(atom_to_list(?MODULE)
diff --git a/erts/emulator/test/efile_SUITE.erl b/erts/emulator/test/efile_SUITE.erl
index 7dcf302742..045b351e02 100644
--- a/erts/emulator/test/efile_SUITE.erl
+++ b/erts/emulator/test/efile_SUITE.erl
@@ -45,7 +45,12 @@ iter_max_files(Config) when is_list(Config) ->
 iter_max_files_1(Config) ->
     DataDir = proplists:get_value(data_dir,Config),
     TestFile = filename:join(DataDir, "existing_file"),
-    N = 10,
+    case erlang:system_info(debug_compiled) of
+        true ->
+            N = 5;
+        false ->
+            N = 10
+    end,
     %% 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,
@@ -100,34 +105,27 @@ open_files(Name) ->
 %% a /proc directory), let's read some zero sized files 500 times each, while
 %% ensuring that response isn't empty << >>
 proc_zero_sized_files(Config) when is_list(Config) ->
-    {Type, Flavor} = os:type(),
-    %% Some files which exist on Linux but might be missing on other systems
-    Inputs = ["/proc/cpuinfo",
-              "/proc/meminfo",
-              "/proc/partitions",
-              "/proc/swaps",
-              "/proc/version",
-              "/proc/uptime",
-              %% curproc is present on freebsd
-              "/proc/curproc/cmdline"],
-    case filelib:is_dir("/proc") of
-        false -> {skip, "/proc not found"}; % skip the test if no /proc
-        _ when Type =:= unix andalso Flavor =:= sunos ->
-            %% SunOS has a /proc, but no zero sized special files
-            {skip, "sunos does not have any zero sized special files"};
-        true ->
-            %% Take away files which do not exist in proc
-            Inputs1 = lists:filter(fun filelib:is_file/1, Inputs),
-
-            %% Fail if none of mentioned files exist in /proc, did we just get
-            %% a normal /proc directory without any special files?
-            ?assertNotEqual([], Inputs1),
-
+    TestFiles0 = [%% Some files which exist on Linux but might be missing on
+                  %% other systems
+                  "/proc/cpuinfo",
+                  "/proc/meminfo",
+                  "/proc/partitions",
+                  "/proc/swaps",
+                  "/proc/version",
+                  "/proc/uptime",
+                  %% curproc is present on FreeBSD
+                  "/proc/curproc/cmdline"],
+
+    TestFiles = [F || F <- TestFiles0, filelib:is_file(F)],
+
+    case TestFiles of
+        [_|_] ->
             %% For 6 inputs and 500 attempts each this do run anywhere
             %% between 500 and 3000 function calls.
-            lists:foreach(
-                fun(Filename) -> do_proc_zero_sized(Filename, 500) end,
-                Inputs1)
+            [do_proc_zero_sized(F, 500) || F <- TestFiles],
+            ok;
+        [] ->
+            {skip, "Failed to find any known zero-sized files"}
     end.
 
 %% @doc Test one file N times to also trigger possible leaking fds and memory
diff --git a/erts/emulator/test/emulator_bench.spec b/erts/emulator/test/emulator_bench.spec
index f709d913b7..03638bfa23 100644
--- a/erts/emulator/test/emulator_bench.spec
+++ b/erts/emulator/test/emulator_bench.spec
@@ -1 +1,3 @@
 {groups,"../emulator_test",estone_SUITE,[estone_bench]}.
+{groups,"../emulator_test",binary_SUITE,[iolist_size_benchmarks]}.
+{groups,"../emulator_test",erts_debug_SUITE,[interpreter_size_bench]}.
diff --git a/erts/emulator/test/erts_debug_SUITE.erl b/erts/emulator/test/erts_debug_SUITE.erl
index 6aa7a445b5..6798e3bf25 100644
--- a/erts/emulator/test/erts_debug_SUITE.erl
+++ b/erts/emulator/test/erts_debug_SUITE.erl
@@ -20,10 +20,14 @@
 
 -module(erts_debug_SUITE).
 -include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
 
--export([all/0, suite/0,
-	 test_size/1,flat_size_big/1,df/1,term_type/1,
-	 instructions/1, stack_check/1]).
+-export([all/0, suite/0, groups/0,
+         test_size/1,flat_size_big/1,df/1,term_type/1,
+         instructions/1, stack_check/1, alloc_blocks_size/1,
+         interpreter_size_bench/1]).
+
+-export([do_alloc_blocks_size/0]).
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
@@ -31,7 +35,16 @@ suite() ->
 
 all() -> 
     [test_size, flat_size_big, df, instructions, term_type,
-     stack_check].
+     stack_check, alloc_blocks_size].
+
+groups() -> 
+    [{interpreter_size_bench, [], [interpreter_size_bench]}].
+
+interpreter_size_bench(_Config) ->
+    Size = erts_debug:interpreter_size(),
+    ct_event:notify(#event{name=benchmark_data,
+                           data=[{value,Size}]}),
+    {comment,integer_to_list(Size)++" bytes"}.
 
 test_size(Config) when is_list(Config) ->
     ConsCell1 = id([a|b]),
@@ -210,5 +223,28 @@ instructions(Config) when is_list(Config) ->
     _ = [list_to_atom(I) || I <- Is],
     ok.
 
+alloc_blocks_size(Config) when is_list(Config) ->
+    F = fun(Args) ->
+                Node = start_slave(Args),
+                ok = rpc:call(Node, ?MODULE, do_alloc_blocks_size, []),
+                true = test_server:stop_node(Node)
+        end,
+    F("+Meamax"),
+    F("+Meamin"),
+    F(""),
+    ok.
+
+do_alloc_blocks_size() ->
+    _ = erts_debug:alloc_blocks_size(binary_alloc),
+    ok.
+
+start_slave(Args) ->
+    Name = ?MODULE_STRING ++ "_slave",
+    Pa = filename:dirname(code:which(?MODULE)),
+    {ok, Node} = test_server:start_node(list_to_atom(Name),
+                                        slave,
+                                        [{args, "-pa " ++ Pa ++ " " ++ Args}]),
+    Node.
+
 id(I) ->
     I.
diff --git a/erts/emulator/test/erts_test_utils.erl b/erts/emulator/test/erts_test_utils.erl
new file mode 100644
index 0000000000..9c9eaa70ed
--- /dev/null
+++ b/erts/emulator/test/erts_test_utils.erl
@@ -0,0 +1,272 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2002-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(erts_test_utils).
+-compile(r20).
+
+%%
+%% THIS MODULE IS ALSO USED BY *OTHER* APPLICATIONS TEST CODE
+%%
+
+-export([mk_ext_pid/3,
+         mk_ext_port/2,
+         mk_ext_ref/2,
+         available_internal_state/1,
+         check_node_dist/0, check_node_dist/1, check_node_dist/3]).
+
+
+
+-define(VERSION_MAGIC,       131).
+
+-define(ATOM_EXT,            100).
+-define(REFERENCE_EXT,       101).
+-define(PORT_EXT,            102).
+-define(PID_EXT,             103).
+-define(NEW_REFERENCE_EXT,   114).
+-define(NEW_PID_EXT,         $X).
+-define(NEW_PORT_EXT,        $Y).
+-define(NEWER_REFERENCE_EXT, $Z).
+
+uint32_be(Uint) when is_integer(Uint), 0 =< Uint, Uint < 1 bsl 32 ->
+    [(Uint bsr 24) band 16#ff,
+     (Uint bsr 16) band 16#ff,
+     (Uint bsr 8) band 16#ff,
+     Uint band 16#ff];
+uint32_be(Uint) ->
+    exit({badarg, uint32_be, [Uint]}).
+
+
+uint16_be(Uint) when is_integer(Uint), 0 =< Uint, Uint < 1 bsl 16 ->
+    [(Uint bsr 8) band 16#ff,
+     Uint band 16#ff];
+uint16_be(Uint) ->
+    exit({badarg, uint16_be, [Uint]}).
+
+uint8(Uint) when is_integer(Uint), 0 =< Uint, Uint < 1 bsl 8 ->
+    Uint band 16#ff;
+uint8(Uint) ->
+    exit({badarg, uint8, [Uint]}).
+
+pid_tag(bad_creation) -> ?PID_EXT;
+pid_tag(Creation) when Creation =< 3 -> ?PID_EXT;
+pid_tag(_Creation) -> ?NEW_PID_EXT.
+
+enc_creation(bad_creation) -> uint8(4);
+enc_creation(Creation) when Creation =< 3 -> uint8(Creation);
+enc_creation(Creation) -> uint32_be(Creation).
+
+mk_ext_pid({NodeName, Creation}, Number, Serial) when is_atom(NodeName) ->
+    mk_ext_pid({atom_to_list(NodeName), Creation}, Number, Serial);
+mk_ext_pid({NodeName, Creation}, Number, Serial) ->
+    case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
+					      pid_tag(Creation),
+					      ?ATOM_EXT,
+					      uint16_be(length(NodeName)),
+					      NodeName,
+					      uint32_be(Number),
+					      uint32_be(Serial),
+					      enc_creation(Creation)])) of
+	Pid when is_pid(Pid) ->
+	    Pid;
+	{'EXIT', {badarg, _}} ->
+	    exit({badarg, mk_pid, [{NodeName, Creation}, Number, Serial]});
+	Other ->
+	    exit({unexpected_binary_to_term_result, Other})
+    end.
+
+port_tag(bad_creation) -> ?PORT_EXT;
+port_tag(Creation) when Creation =< 3 -> ?PORT_EXT;
+port_tag(_Creation) -> ?NEW_PORT_EXT.
+
+mk_ext_port({NodeName, Creation}, Number) when is_atom(NodeName) ->
+    mk_ext_port({atom_to_list(NodeName), Creation}, Number);
+mk_ext_port({NodeName, Creation}, Number) ->
+    case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
+					      port_tag(Creation),
+					      ?ATOM_EXT,
+					      uint16_be(length(NodeName)),
+					      NodeName,
+					      uint32_be(Number),
+					      enc_creation(Creation)])) of
+	Port when is_port(Port) ->
+	    Port;
+	{'EXIT', {badarg, _}} ->
+	    exit({badarg, mk_port, [{NodeName, Creation}, Number]});
+	Other ->
+	    exit({unexpected_binary_to_term_result, Other})
+    end.
+
+ref_tag(bad_creation) -> ?NEW_REFERENCE_EXT;
+ref_tag(Creation) when Creation =< 3 -> ?NEW_REFERENCE_EXT;
+ref_tag(_Creation) -> ?NEWER_REFERENCE_EXT.
+
+mk_ext_ref({NodeName, Creation}, Numbers) when is_atom(NodeName),
+					   is_list(Numbers) ->
+    mk_ext_ref({atom_to_list(NodeName), Creation}, Numbers);
+mk_ext_ref({NodeName, Creation}, [Number]) when is_list(NodeName),
+                                                Creation =< 3,
+                                                is_integer(Number) ->
+    case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
+                                              ?REFERENCE_EXT,
+                                              ?ATOM_EXT,
+                                              uint16_be(length(NodeName)),
+                                              NodeName,
+                                              uint32_be(Number),
+                                              uint8(Creation)])) of
+        Ref when is_reference(Ref) ->
+            Ref;
+        {'EXIT', {badarg, _}} ->
+            exit({badarg, mk_ref, [{NodeName, Creation}, [Number]]});
+        Other ->
+            exit({unexpected_binary_to_term_result, Other})
+    end;
+mk_ext_ref({NodeName, Creation}, Numbers) when is_list(NodeName),
+                                               is_list(Numbers) ->
+    case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
+					      ref_tag(Creation),
+					      uint16_be(length(Numbers)),
+					      ?ATOM_EXT,
+					      uint16_be(length(NodeName)),
+					      NodeName,
+					      enc_creation(Creation),
+					      lists:map(fun (N) ->
+								uint32_be(N)
+							end,
+							Numbers)])) of
+	Ref when is_reference(Ref) ->
+	    Ref;
+	{'EXIT', {badarg, _}} ->
+	    exit({badarg, mk_ref, [{NodeName, Creation}, Numbers]});
+	Other ->
+	    exit({unexpected_binary_to_term_result, Other})
+    end.
+
+
+available_internal_state(Bool) when Bool == true; Bool == false ->
+    case {Bool,
+          (catch erts_debug:get_internal_state(available_internal_state))} of
+        {true, true} ->
+            true;
+        {false, true} ->
+            erts_debug:set_internal_state(available_internal_state, false),
+            true;
+        {true, _} ->
+            erts_debug:set_internal_state(available_internal_state, true),
+            false;
+        {false, _} ->
+            false
+    end.
+
+
+%%
+%% Check reference counters for node- and dist entries.
+%%
+check_node_dist() ->
+    check_node_dist(fun(ErrMsg) ->
+                            io:format("check_node_dist ERROR:\n~p\n", [ErrMsg]),
+                            error
+                    end).
+
+check_node_dist(Fail) ->
+    AIS = available_internal_state(true),
+    [erlang:garbage_collect(P) || P <- erlang:processes()],
+    {{node_references, NodeRefs},
+     {dist_references, DistRefs}} =
+        erts_debug:get_internal_state(node_and_dist_references),
+    R = check_node_dist(Fail, NodeRefs, DistRefs),
+    available_internal_state(AIS),
+    R.
+
+check_node_dist(Fail, NodeRefs, DistRefs) ->
+    AIS = available_internal_state(true),
+    R = check_nd_refc({node(),erlang:system_info(creation)},
+                  NodeRefs, DistRefs, Fail),
+    available_internal_state(AIS),
+    R.
+
+
+check_nd_refc({ThisNodeName, ThisCreation}, NodeRefs, DistRefs, Fail) ->
+    case catch begin
+                   check_refc(ThisNodeName,ThisCreation,"node table",NodeRefs),
+                   check_refc(ThisNodeName,ThisCreation,"dist table",DistRefs),
+                   ok
+               end of
+        ok ->
+            ok;
+        {'EXIT', Reason} ->
+            {Y,Mo,D} = date(),
+            {H,Mi,S} = time(),
+            ErrMsg = io_lib:format("~n"
+                                   "*** Reference count check of node ~w "
+                                   "failed (~p) at ~w~w~w ~w:~w:~w~n"
+                                   "*** Node table references:~n ~p~n"
+                                   "*** Dist table references:~n ~p~n",
+                                   [node(), Reason, Y, Mo, D, H, Mi, S,
+                                    NodeRefs, DistRefs]),
+            Fail(lists:flatten(ErrMsg))
+    end.
+
+
+check_refc(ThisNodeName,ThisCreation,Table,EntryList) when is_list(EntryList) ->
+    lists:foreach(
+      fun ({Entry, Refc, ReferrerList}) ->
+              {DelayedDeleteTimer,
+               FoundRefs} =
+              lists:foldl(
+                fun ({Referrer, ReferencesList}, {DDT, A1}) ->
+                        {case Referrer of
+                             {system,delayed_delete_timer} ->
+                                 true;
+                             {system,thread_progress_delete_timer} ->
+                                 true;
+                             _ ->
+                                 DDT
+                         end,
+                         A1 + lists:foldl(fun ({_T,Rs},A2) ->
+                                                  A2+Rs
+                                          end,
+                                          0,
+                                          ReferencesList)}
+                end,
+                {false, 0},
+                ReferrerList),
+
+              %% Reference count equals found references?
+              case {Refc, FoundRefs, DelayedDeleteTimer} of
+                  {X, X, _} ->
+                      ok;
+                  {0, 1, true} ->
+                      ok;
+                  _ ->
+                      exit({invalid_reference_count, Table, Entry})
+              end,
+
+              %% All entries in table referred to?
+              case {Entry, Refc} of
+                  {ThisNodeName, 0} -> ok;
+                  {{ThisNodeName, ThisCreation}, 0} -> ok;
+                  {_, 0} when DelayedDeleteTimer == false ->
+                      exit({not_referred_entry_in_table, Table, Entry});
+                  {_, _} -> ok 
+              end
+
+      end,
+      EntryList),
+    ok.
diff --git a/erts/emulator/test/esock_misc/socket_client.erl b/erts/emulator/test/esock_misc/socket_client.erl
new file mode 100644
index 0000000000..1c07e799b8
--- /dev/null
+++ b/erts/emulator/test/esock_misc/socket_client.erl
@@ -0,0 +1,538 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018-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(socket_client).
+
+-export([
+         start/1, start/2, start/5, start/6,
+         start_tcp/1, start_tcp/2, start_tcp/3,
+         start_tcp4/1, start_tcp4/2, start_tcp6/1, start_tcp6/2,
+         start_udp/1, start_udp/2, start_udp/3,
+         start_udp4/1, start_udp4/2, start_udp6/1, start_udp6/2
+        ]).
+
+-define(LIB, socket_lib).
+
+-record(client, {socket, verbose = true, msg = true, type, dest, msg_id = 1}).
+
+start(Port) ->
+    start(Port, 1).
+
+start(Port, Num) ->
+    start_tcp(Port, Num).
+
+start_tcp(Port) ->
+    start_tcp(Port, 1).
+
+start_tcp(Port, Num) ->
+    start_tcp4(Port, Num).
+
+start_tcp4(Port) ->
+    start_tcp4(Port, 1).
+
+start_tcp4(Port, Num) ->
+    start(inet, stream, tcp, Port, Num).
+
+start_tcp6(Port) ->
+    start_tcp6(Port, 1).
+
+start_tcp6(Port, Num) ->
+    start(inet6, stream, tcp, Port, Num).
+
+start_tcp(Addr, Port, Num) when (size(Addr) =:= 4) andalso 
+                                is_integer(Num) andalso 
+                                (Num > 0) ->
+    start(inet, stream, tcp, Addr, Port, Num);
+start_tcp(Addr, Port, Num) when (size(Addr) =:= 8) andalso 
+                                is_integer(Num) andalso 
+                                (Num > 0) ->
+    start(inet6, stream, tcp, Addr, Port, Num).
+
+
+start_udp(Port) ->
+    start_udp(Port, 1).
+
+start_udp(Port, Num) ->
+    start_udp4(Port, Num).
+
+start_udp4(Port) ->
+    start_udp4(Port, 1).
+
+start_udp4(Port, Num) ->
+    start(inet, dgram, udp, Port, Num).
+
+start_udp6(Port) ->
+    start_udp6(Port, 1).
+
+start_udp6(Port, Num) ->
+    start(inet6, dgram, udp, Port, Num).
+
+start_udp(Addr, Port, Num) when (size(Addr) =:= 4) ->
+    start(inet, dgram, udp, Addr, Port, Num);
+start_udp(Addr, Port, Num) when (size(Addr) =:= 8) ->
+    start(inet6, dgram, udp, Addr, Port, Num).
+
+
+start(Domain, Type, Proto, Port, Num) 
+  when is_integer(Port) andalso is_integer(Num) ->
+    start(Domain, Type, Proto, which_addr(Domain), Port, Num);
+
+start(Domain, Type, Proto, Addr, Port) ->
+    start(Domain, Type, Proto, Addr, Port, 1).
+
+start(Domain, Type, Proto, Addr, Port, 1 = Num) ->
+    start(Domain, Type, Proto, Addr, Port, Num, true);
+start(Domain, Type, Proto, Addr, Port, Num) 
+  when is_integer(Num) andalso (Num > 1) ->
+    start(Domain, Type, Proto, Addr, Port, Num, false).
+
+start(Domain, Type, Proto, Addr, Port, Num, Verbose) ->
+    put(sname, "starter"),
+    Clients = start_clients(Num, Domain, Type, Proto, Addr, Port, Verbose),
+    await_clients(Clients).
+
+start_clients(Num, Domain, Type, Proto, Addr, Port, Verbose) ->
+    start_clients(Num, 1, Domain, Type, Proto, Addr, Port, Verbose, []).
+
+start_clients(Num, ID, Domain, Type, Proto, Addr, Port, Verbose, Acc) 
+  when (Num > 0) ->
+    StartClient = fun() ->
+                          start_client(ID, Domain, Type, Proto, Addr, Port, Verbose)
+                  end,
+    {Pid, _} = spawn_monitor(StartClient),
+    ?LIB:sleep(500),
+    i("start client ~w", [ID]),
+    start_clients(Num-1, ID+1, Domain, Type, Proto, Addr, Port, Verbose, [Pid|Acc]);
+start_clients(_, _, _, _, _, _, _, _, Acc) ->
+    i("all client(s) started"),
+    lists:reverse(Acc).
+
+await_clients([]) ->
+    i("all clients done");
+await_clients(Clients) ->
+    receive
+        {'DOWN', _MRef, process, Pid, _Reason} ->
+            case lists:delete(Pid, Clients) of
+                Clients2 when (Clients2 =/= Clients) ->
+                    i("client ~p done", [Pid]),
+                    await_clients(Clients2);
+                _ ->
+                    await_clients(Clients)
+            end
+    end.
+
+
+start_client(ID, Domain, Type, Proto, Addr, Port, Verbose) ->
+    put(sname, ?LIB:f("client[~w]", [ID])),
+    SA = #{family => Domain,
+           addr   => Addr,
+           port   => Port},
+    %% The way we use tos only works because we
+    %% send so few messages (a new value for every
+    %% message).
+    tos_init(),
+    do_start(Domain, Type, Proto, SA, Verbose).
+
+do_start(Domain, stream = Type, Proto, SA, Verbose) ->
+    try do_init(Domain, Type, Proto) of
+        Sock ->
+            connect(Sock, SA),
+            maybe_print_start_info(Verbose, Sock, Type),
+            %% Give the server some time...
+            ?LIB:sleep(5000),
+            %% ok = socket:close(Sock),
+            send_loop(#client{socket  = Sock, 
+                              type    = Type,
+                              verbose = Verbose})
+    catch
+        throw:E ->
+            e("Failed initiate: "
+              "~n   Error: ~p", [E])
+    end;
+do_start(Domain, dgram = Type, Proto, SA, Verbose) ->
+    try do_init(Domain, Type, Proto) of
+        Sock ->
+            maybe_print_start_info(Verbose, Sock, Type),
+            %% Give the server some time...
+            ?LIB:sleep(5000),
+            %% ok = socket:close(Sock),
+            send_loop(#client{socket  = Sock,
+                              type    = Type,
+                              dest    = SA,
+                              verbose = Verbose})
+    catch
+        throw:E ->
+            e("Failed initiate: "
+              "~n   Error: ~p", [E])
+    end.
+
+maybe_print_start_info(true = _Verbose, Sock, stream = _Type) ->
+    {ok, Name}    = socket:sockname(Sock),
+    {ok, Peer}    = socket:peername(Sock),
+    {ok, Domain}  = socket:getopt(Sock, socket, domain),
+    {ok, Type}    = socket:getopt(Sock, socket, type),
+    {ok, Proto}   = socket:getopt(Sock, socket, protocol),
+    {ok, OOBI}    = socket:getopt(Sock, socket, oobinline),
+    {ok, SndBuf}  = socket:getopt(Sock, socket, sndbuf),
+    {ok, RcvBuf}  = socket:getopt(Sock, socket, rcvbuf),
+    {ok, Linger}  = socket:getopt(Sock, socket, linger),
+    {ok, MTU}     = socket:getopt(Sock, ip,     mtu),
+    {ok, MTUDisc} = socket:getopt(Sock, ip,     mtu_discover),
+    {ok, MALL}    = socket:getopt(Sock, ip,     multicast_all),
+    {ok, MIF}     = socket:getopt(Sock, ip,     multicast_if),
+    {ok, MLoop}   = socket:getopt(Sock, ip,     multicast_loop),
+    {ok, MTTL}    = socket:getopt(Sock, ip,     multicast_ttl),
+    {ok, RecvTOS} = socket:getopt(Sock, ip,     recvtos),
+    i("connected: "
+      "~n   From: ~p"
+      "~n   To:   ~p"
+      "~nwhen"
+      "~n   (socket) Domain:         ~p"
+      "~n   (socket) Type:           ~p"
+      "~n   (socket) Protocol:       ~p"
+      "~n   (socket) OOBInline:      ~p"
+      "~n   (socket) SndBuf:         ~p"
+      "~n   (socket) RcvBuf:         ~p"
+      "~n   (socket) Linger:         ~p"
+      "~n   (ip)     MTU:            ~p"
+      "~n   (ip)     MTU Discovery:  ~p"
+      "~n   (ip)     Multicast ALL:  ~p"
+      "~n   (ip)     Multicast IF:   ~p"
+      "~n   (ip)     Multicast Loop: ~p"
+      "~n   (ip)     Multicast TTL:  ~p"
+      "~n   (ip)     RecvTOS:        ~p"
+      "~n   => wait some", 
+      [Name, Peer,
+       Domain, Type, Proto,
+       OOBI, SndBuf, RcvBuf, Linger,
+       MTU, MTUDisc, MALL, MIF, MLoop, MTTL,
+       RecvTOS]);
+maybe_print_start_info(true = _Verbose, Sock, dgram = _Type) ->
+    {ok, Domain}  = socket:getopt(Sock, socket, domain),
+    {ok, Type}    = socket:getopt(Sock, socket, type),
+    {ok, Proto}   = socket:getopt(Sock, socket, protocol),
+    {ok, OOBI}    = socket:getopt(Sock, socket, oobinline),
+    {ok, SndBuf}  = socket:getopt(Sock, socket, sndbuf),
+    {ok, RcvBuf}  = socket:getopt(Sock, socket, rcvbuf),
+    {ok, Linger}  = socket:getopt(Sock, socket, linger),
+    {ok, MALL}    = socket:getopt(Sock, ip,     multicast_all),
+    {ok, MIF}     = socket:getopt(Sock, ip,     multicast_if),
+    {ok, MLoop}   = socket:getopt(Sock, ip,     multicast_loop),
+    {ok, MTTL}    = socket:getopt(Sock, ip,     multicast_ttl),
+    {ok, RecvTOS} = socket:getopt(Sock, ip,     recvtos),
+    {ok, RecvTTL} = socket:getopt(Sock, ip,     recvttl),
+    i("initiated when: "
+      "~n   (socket) Domain:         ~p"
+      "~n   (socket) Type:           ~p"
+      "~n   (socket) Protocol:       ~p"
+      "~n   (socket) OOBInline:      ~p"
+      "~n   (socket) SndBuf:         ~p"
+      "~n   (socket) RcvBuf:         ~p"
+      "~n   (socket) Linger:         ~p"
+      "~n   (ip)     Multicast ALL:  ~p"
+      "~n   (ip)     Multicast IF:   ~p"
+      "~n   (ip)     Multicast Loop: ~p"
+      "~n   (ip)     Multicast TTL:  ~p"
+      "~n   (ip)     RecvTOS:        ~p"
+      "~n   (ip)     RecvTTL:        ~p"
+      "~n   => wait some",
+      [Domain, Type, Proto,
+       OOBI, SndBuf, RcvBuf, Linger,
+       MALL, MIF, MLoop, MTTL,
+       RecvTOS, RecvTTL]);
+maybe_print_start_info(_Verbose, _Sock, _Type) ->
+    ok.
+
+    
+do_init(Domain, stream = Type, Proto) ->
+    i("try (socket) open"),
+    Sock = case socket:open(Domain, Type, Proto) of
+               {ok, S} ->
+                   S;
+               {error, OReason} ->
+                   throw({open, OReason})
+           end,
+    i("try (socket) bind"),
+    case socket:bind(Sock, any) of
+        {ok, _P} ->
+            ok = socket:setopt(Sock, socket, timestamp, true),
+            ok = socket:setopt(Sock, ip,     tos,       mincost),
+            ok = socket:setopt(Sock, ip,     recvtos,   true),
+            Sock;
+        {error, BReason} ->
+            throw({bind, BReason})
+    end;
+do_init(Domain, dgram = Type, Proto) ->
+    i("try (socket) open"),
+    Sock = case socket:open(Domain, Type, Proto) of
+               {ok, S} ->
+                   S;
+               {error, OReason} ->
+                   throw({open, OReason})
+           end,
+    case socket:bind(Sock, any) of
+        {ok, _} ->
+            ok = socket:setopt(Sock, socket, timestamp, true),
+            ok = socket:setopt(Sock, ip,     tos,       mincost),
+            ok = socket:setopt(Sock, ip,     recvtos,   true),
+            ok = socket:setopt(Sock, ip,     recvttl,   true),
+            Sock;
+        {error, BReason} ->
+            throw({bind, BReason})
+    end.
+
+
+which_addr(Domain) ->
+    Iflist = case inet:getifaddrs() of
+                 {ok, IFL} ->
+                     IFL;
+                 {error, Reason} ->
+                     throw({inet,getifaddrs,Reason})
+             end,
+    which_addr(Domain, Iflist).
+
+
+connect(Sock, SA) ->
+    i("try (socket) connect to:"
+      "~n   ~p", [SA]),
+    case socket:connect(Sock, SA) of
+        ok ->
+            ok;
+        {error, Reason} ->
+            e("connect failure: "
+              "~n   ~p", [Reason]),
+            exit({connect, Reason})
+    end.
+
+
+send_loop(#client{msg_id = N} = C) when (N =< 10) ->
+    i("try send request ~w", [N]),
+    Req = ?LIB:enc_req_msg(N, "hejsan"),
+    case send(C, Req) of
+        ok ->
+            i("request ~w sent - now try read answer", [N]),
+            case recv(C) of
+                {ok, {Source, Msg}} ->
+                    if
+                        (C#client.verbose =:= true) ->
+                            i("received ~w bytes of data~s", 
+                              [size(Msg),  case Source of
+                                               undefined -> "";
+                                               _ -> ?LIB:f(" from:~n   ~p", [Source])
+                                           end]);
+                        true ->
+                            i("received ~w bytes", [size(Msg)])
+                    end,
+                    case ?LIB:dec_msg(Msg) of
+                        {reply, N, Reply} ->
+                            if
+                                (C#client.verbose =:= true) ->
+                                    i("received reply ~w: ~p", [N, Reply]);
+                                true ->
+                                    i("received reply ~w", [N])
+                            end,
+                            ?LIB:sleep(500), % Just to spread it out a bit
+                            send_loop(C#client{msg_id = N+1})
+                    end;
+                {error, RReason} ->
+                    e("Failed recv response for request ~w: "
+                      "~n   ~p", [N, RReason]),
+                    exit({failed_recv, RReason})
+            end;
+        {error, SReason} ->
+            e("Failed send request ~w: "
+              "~n   ~p", [N, SReason]),
+            exit({failed_send, SReason})
+    end;
+send_loop(Client) ->
+    sock_close(Client).
+
+sock_close(#client{socket = Sock, verbose = true}) ->
+    i("we are done - close the socket when: "
+      "~n   ~p", [socket:info()]),
+    ok = socket:close(Sock),
+    i("we are done - socket closed when: "
+      "~n   ~p", [socket:info()]);
+sock_close(#client{socket = Sock}) ->
+    i("we are done"),
+    ok = socket:close(Sock).
+
+    
+
+send(#client{socket = Sock, type = stream}, Msg) ->
+    socket:send(Sock, Msg);
+send(#client{socket = Sock, type = dgram, dest = Dest}, Msg) ->
+    %% i("try send to: "
+    %%   "~n   ~p", [Dest]),
+    %% ok = socket:setopt(Sock, otp, debug, true),
+    TOS = tos_next(),
+    ok = socket:setopt(Sock, ip, tos, TOS),
+    case socket:sendto(Sock, Msg, Dest) of
+        ok = OK ->
+            OK;
+        {error, _} = ERROR ->
+            ERROR
+    end.
+
+recv(#client{socket = Sock, type = stream, msg = false}) ->
+    case socket:recv(Sock) of
+        {ok, Msg} ->
+            {ok, {undefined, Msg}};
+        {error, _} = ERROR ->
+            ERROR
+    end;
+recv(#client{socket = Sock, verbose = Verbose, type = stream, msg = true}) ->
+    case socket:recvmsg(Sock) of
+        %% An iov of length 1 is an simplification...
+        {ok, #{addr  := undefined = Source,
+               iov   := [Msg],
+               ctrl  := CMsgHdrs,
+               flags := Flags}} ->
+            if
+                (Verbose =:= true) ->
+                    i("received message: "
+                      "~n   CMsgHdr: ~p"
+                      "~n   Flags:   ~p", [CMsgHdrs, Flags]);
+                true ->
+                    ok
+                        end,
+            {ok, {Source, Msg}};
+        {error, _} = ERROR ->
+            ERROR
+    end;
+recv(#client{socket = Sock, type = dgram, msg = false}) ->
+    socket:recvfrom(Sock);
+recv(#client{socket = Sock, verbose = Verbose, type = dgram, msg = true}) ->
+    case socket:recvmsg(Sock) of
+        {ok, #{addr  := Source,
+               iov   := [Msg],
+               ctrl  := CMsgHdrs,
+               flags := Flags}} ->
+            if
+                (Verbose =:= true) ->
+                    i("received message: "
+                      "~n   CMsgHdr: ~p"
+                      "~n   Flags:   ~p", [CMsgHdrs, Flags]);
+                true ->
+                    ok
+            end,
+            {ok, {Source, Msg}};
+        {error, _} = ERROR ->
+            ERROR
+    end.
+        
+
+
+which_addr(_Domain, []) ->
+    throw(no_address);
+which_addr(Domain, [{Name, IFO}|_IFL]) when (Name =/= "lo") ->
+    which_addr2(Domain, IFO);
+which_addr(Domain, [_|IFL]) ->
+    which_addr(Domain, IFL).
+
+which_addr2(inet = _Domain, [{addr, Addr}|_IFO]) when (size(Addr) =:= 4) ->
+    Addr;
+which_addr2(inet6 = _Domain, [{addr, Addr}|_IFO]) when (size(Addr) =:= 8) ->
+    Addr;
+which_addr2(Domain, [_|IFO]) ->
+    which_addr2(Domain, IFO).
+
+
+%% ---
+
+%% enc_req_msg(N, Data) ->
+%%     enc_msg(?REQ, N, Data).
+
+%% enc_rep_msg(N, Data) ->
+%%     enc_msg(?REP, N, Data).
+
+%% enc_msg(Type, N, Data) when is_list(Data) ->
+%%     enc_msg(Type, N, list_to_binary(Data));
+%% enc_msg(Type, N, Data) 
+%%   when is_integer(Type) andalso is_integer(N) andalso is_binary(Data) ->
+%%     <<Type:32/integer, N:32/integer, Data/binary>>.
+    
+%% dec_msg(<<?REQ:32/integer, N:32/integer, Data/binary>>) ->
+%%     {request, N, Data};
+%% dec_msg(<<?REP:32/integer, N:32/integer, Data/binary>>) ->
+%%     {reply, N, Data}.
+
+
+%% ---
+
+%% sleep(T) ->
+%%     receive after T -> ok end.
+
+                     
+%% ---
+
+%% formated_timestamp() ->
+%%     format_timestamp(os:timestamp()).
+
+%% format_timestamp(Now) ->
+%%     N2T = fun(N) -> calendar:now_to_local_time(N) end,
+%%     format_timestamp(Now, N2T, true).
+
+%% format_timestamp({_N1, _N2, N3} = N, N2T, true) ->
+%%     FormatExtra = ".~.2.0w",
+%%     ArgsExtra   = [N3 div 10000],
+%%     format_timestamp(N, N2T, FormatExtra, ArgsExtra);
+%% format_timestamp({_N1, _N2, _N3} = N, N2T, false) ->
+%%     FormatExtra = "",
+%%     ArgsExtra   = [],
+%%     format_timestamp(N, N2T, FormatExtra, ArgsExtra).
+
+%% format_timestamp(N, N2T, FormatExtra, ArgsExtra) ->
+%%     {Date, Time}   = N2T(N),
+%%     {YYYY,MM,DD}   = Date,
+%%     {Hour,Min,Sec} = Time,
+%%     FormatDate =
+%%         io_lib:format("~.4w-~.2.0w-~.2.0w ~.2.0w:~.2.0w:~.2.0w" ++ FormatExtra,
+%%                       [YYYY, MM, DD, Hour, Min, Sec] ++ ArgsExtra),
+%%     lists:flatten(FormatDate).
+
+
+%% ---
+
+tos_init() ->
+    put(tos, 1).
+
+tos_next() ->
+    case get(tos) of
+        TOS when (TOS < 100) ->
+            put(tos, TOS + 1),
+            TOS;
+        _ ->
+            put(tos, 1),
+            1
+    end.
+
+
+%% ---
+
+e(F, A) ->
+    ?LIB:e(F, A).
+
+i(F) ->
+    ?LIB:i(F).
+
+i(F, A) ->
+    ?LIB:i(F, A).
+    
diff --git a/erts/emulator/test/esock_misc/socket_lib.erl b/erts/emulator/test/esock_misc/socket_lib.erl
new file mode 100644
index 0000000000..9d6524d467
--- /dev/null
+++ b/erts/emulator/test/esock_misc/socket_lib.erl
@@ -0,0 +1,133 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018-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(socket_lib).
+
+-export([
+         sleep/1,
+         req/0, rep/0,
+         enc_req_msg/2, enc_rep_msg/2,
+         enc_msg/3, dec_msg/1,
+         request/3, reply/4,
+         f/2,
+         i/1, i/2,
+         e/2
+        ]).
+
+
+-define(REQ, 0).
+-define(REP, 1).
+
+
+%% ---
+
+sleep(T) ->
+    receive after T -> ok end.
+
+
+%% ---
+
+req() -> ?REQ.
+rep() -> ?REP.
+
+enc_req_msg(N, Data) ->
+    enc_msg(?REQ, N, Data).
+
+enc_rep_msg(N, Data) ->
+    enc_msg(?REP, N, Data).
+
+enc_msg(Type, N, Data) when is_list(Data) ->
+    enc_msg(Type, N, list_to_binary(Data));
+enc_msg(Type, N, Data) 
+  when is_integer(Type) andalso is_integer(N) andalso is_binary(Data) ->
+    <<Type:32/integer, N:32/integer, Data/binary>>.
+    
+dec_msg(<<?REQ:32/integer, N:32/integer, Data/binary>>) ->
+    {request, N, Data};
+dec_msg(<<?REP:32/integer, N:32/integer, Data/binary>>) ->
+    {reply, N, Data}.
+
+
+%% ---
+
+request(Tag, Pid, Request) ->
+    Ref = make_ref(),
+    Pid ! {Tag, self(), Ref, Request},
+    receive
+        {Tag, Pid, Ref, Reply} ->
+            Reply
+    end.
+    
+reply(Tag, Pid, Ref, Reply) ->
+    Pid ! {Tag, self(), Ref, Reply}.
+
+
+%% ---
+
+f(F, A) ->
+    lists:flatten(io_lib:format(F, A)).
+
+
+%% ---
+
+e(F, A) ->
+    p("<ERROR> " ++ F, A).
+
+i(F) ->
+    i(F, []).
+i(F, A) ->
+    p("*** " ++ F, A).
+
+p(F, A) ->
+    p(get(sname), F, A).
+
+p(SName, F, A) ->
+    io:format("[~s,~p][~s] " ++ F ++ "~n", 
+              [SName,self(),formated_timestamp()|A]).
+
+
+%% ---
+
+formated_timestamp() ->
+    format_timestamp(os:timestamp()).
+
+format_timestamp(Now) ->
+    N2T = fun(N) -> calendar:now_to_local_time(N) end,
+    format_timestamp(Now, N2T, true).
+
+format_timestamp({_N1, _N2, N3} = N, N2T, true) ->
+    FormatExtra = ".~.2.0w",
+    ArgsExtra   = [N3 div 10000],
+    format_timestamp(N, N2T, FormatExtra, ArgsExtra);
+format_timestamp({_N1, _N2, _N3} = N, N2T, false) ->
+    FormatExtra = "",
+    ArgsExtra   = [],
+    format_timestamp(N, N2T, FormatExtra, ArgsExtra).
+
+format_timestamp(N, N2T, FormatExtra, ArgsExtra) ->
+    {Date, Time}   = N2T(N),
+    {YYYY,MM,DD}   = Date,
+    {Hour,Min,Sec} = Time,
+    FormatDate =
+        io_lib:format("~.4w-~.2.0w-~.2.0w ~.2.0w:~.2.0w:~.2.0w" ++ FormatExtra,
+                      [YYYY, MM, DD, Hour, Min, Sec] ++ ArgsExtra),
+    lists:flatten(FormatDate).
+
+
diff --git a/erts/emulator/test/esock_misc/socket_server.erl b/erts/emulator/test/esock_misc/socket_server.erl
new file mode 100644
index 0000000000..45adffc5e6
--- /dev/null
+++ b/erts/emulator/test/esock_misc/socket_server.erl
@@ -0,0 +1,954 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018-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(socket_server).
+
+-export([
+         start/0, start/5,
+         start_tcp/0,  start_tcp/1,  start_tcp/3,
+         start_tcp4/0, start_tcp4/1, start_tcp4/2,
+         start_tcp6/0, start_tcp6/1, start_tcp6/2,
+         start_udp/0,  start_udp/1,  start_udp/3,
+         start_udp4/0, start_udp4/1, start_udp4/2,
+         start_udp6/0, start_udp6/1, start_udp6/2,
+         start_sctp/0, start_sctp/1
+        ]).
+
+-define(LIB, socket_lib).
+
+-record(manager,  {socket, msg, peek, acceptors, handler_id, handlers}).
+-record(acceptor, {id, socket, manager, 
+                   atimeout = 5000}).
+-record(handler,  {socket, peek, msg, type, manager, 
+                   stimeout = 5000, rtimeout = 5000}).
+
+-define(NUM_ACCEPTORS, 5).
+
+start() ->
+    start_tcp().
+
+start_tcp() ->
+    start_tcp4().
+
+start_tcp(Peek) ->
+    start_tcp4(Peek).
+
+start_tcp4() ->
+    start_tcp4(false).
+
+start_tcp4(Peek) ->
+    start_tcp4(false, Peek).
+
+start_tcp4(UseMsg, Peek) ->
+    start_tcp(inet, UseMsg, Peek).
+
+start_tcp6() ->
+    start_tcp6(false).
+
+start_tcp6(Peek) ->
+    start_tcp6(false, Peek).
+
+start_tcp6(UseMsg, Peek) ->
+    start_tcp(inet6, UseMsg, Peek).
+
+start_tcp(Domain, UseMsg, Peek) when is_boolean(UseMsg) andalso is_boolean(Peek) ->
+    start(Domain, stream, tcp, UseMsg, Peek).
+
+start_udp() ->
+    start_udp4().
+
+start_udp(Peek) ->
+    start_udp4(Peek).
+
+start_udp4() ->
+    start_udp4(false).
+
+start_udp4(Peek) ->
+    start_udp4(false, Peek).
+
+start_udp4(UseMsg, Peek) ->
+    start_udp(inet, UseMsg, Peek).
+
+start_udp6() ->
+    start_udp6(false, false).
+
+start_udp6(Peek) ->
+    start_udp6(false, Peek).
+
+start_udp6(UseMsg, Peek) ->
+    start_udp(inet6, UseMsg, Peek).
+
+start_udp(Domain, UseMsg, Peek) when is_boolean(UseMsg) andalso is_boolean(Peek) ->
+    start(Domain, dgram, udp, UseMsg, Peek).
+
+
+start_sctp() ->
+    start_sctp(inet).
+
+start_sctp(Domain) when ((Domain =:= inet) orelse (Domain =:= inet6)) ->
+    start(Domain, seqpacket, sctp, true, false).
+
+start(Domain, Type, Proto, UseMsg, Peek) ->
+    put(sname, "starter"),
+    i("try start manager"),
+    {Pid, MRef} = manager_start(Domain, Type, Proto, UseMsg, Peek),
+    i("manager (~p) started", [Pid]),
+    loop(Pid, MRef).
+
+loop(Pid, MRef) ->
+    receive
+        {'DOWN', MRef, process, Pid, Reason} ->
+            i("manager process exited: "
+              "~n   ~p", [Reason]),
+            ok
+    end.
+
+
+%% =========================================================================
+
+manager_start(Domain, Type, Proto, UseMsg, Peek) ->
+    spawn_monitor(fun() -> manager_init(Domain, Type, Proto, UseMsg, Peek) end).
+
+manager_start_handler(Pid, Sock) ->
+    manager_request(Pid, {start_handler, Sock}).
+
+manager_stop(Pid, Reason) ->
+    manager_request(Pid, {stop, Reason}).
+
+manager_request(Pid, Request) ->
+    ?LIB:request(manager, Pid, Request).
+
+manager_reply(Pid, Ref, Reply) ->
+    ?LIB:reply(manager, Pid, Ref, Reply).
+
+
+manager_init(Domain, Type, Proto, UseMsg, Peek) ->
+    put(sname, "manager"),
+    do_manager_init(Domain, Type, Proto, UseMsg, Peek).
+
+do_manager_init(Domain, stream = Type, Proto, UseMsg, Peek) ->
+    i("try start acceptor(s)"),
+    {Sock, Acceptors} = manager_stream_init(Domain, Type, Proto),
+    manager_loop(#manager{socket     = Sock,
+                          msg        = UseMsg,
+                          peek       = Peek,
+                          acceptors  = Acceptors,
+                          handler_id = 1,
+                          handlers   = []});
+do_manager_init(Domain, dgram = Type, Proto, UseMsg, Peek) ->
+    i("try open socket"),
+    case socket:open(Domain, Type, Proto) of
+        {ok, Sock} ->
+            F = fun(X) -> case socket:getopt(Sock, socket, X) of
+                              {ok, V} ->    f("~p", [V]);
+                              {error, R} -> f("error: ~p", [R])
+                          end
+                end,
+            i("socket opened (~s,~s,~s): "
+              "~n   broadcast: ~s"
+              "~n   dontroute: ~s"
+              "~n   keepalive: ~s"
+              "~n   reuseaddr: ~s"
+              "~n   linger:    ~s"
+              "~n   debug:     ~s"
+              "~n   prio:      ~s"
+              "~n   rcvbuf:    ~s"
+              "~n   rcvtimeo:  ~s"
+              "~n   sndbuf:    ~s"
+              "~n   sndtimeo:  ~s"
+              "~n   => try find (local) address", 
+              [F(domain), F(type), F(protocol), 
+               F(broadcast), F(dontroute), F(keepalive), F(reuseaddr), F(linger),
+               F(debug), F(priority), 
+               F(rcvbuf), F(rcvtimeo), F(sndbuf), F(sndtimeo)]),
+            Addr = which_addr(Domain),
+            SA = #{family => Domain,
+                   addr   => Addr},
+            i("try bind to: "
+              "~n   ~p", [Addr]),
+            case socket:bind(Sock, SA) of
+                {ok, _P} ->
+                   ok;
+                {error, BReason} ->
+                    throw({bind, BReason})
+            end,
+            i("bound to: "
+              "~n   ~s"
+              "~n   => try start handler", 
+              [case socket:sockname(Sock) of
+                   {ok, Name} -> f("~p", [Name]);
+                   {error, R} -> f("error: ~p", [R])
+               end]),
+            case handler_start(1, Sock, UseMsg, Peek) of
+                {ok, {Pid, MRef}} ->
+                    i("handler (~p) started", [Pid]),
+                    handler_continue(Pid),
+                    manager_loop(#manager{peek       = Peek,
+                                          msg        = UseMsg,
+                                          handler_id = 2, % Just in case
+                                          handlers   = [{1, Pid, MRef}]});
+                {error, SReason} ->
+                    e("Failed starting handler: "
+                      "~n   ~p", [SReason]),
+                    exit({failed_start_handler, SReason})
+            end;
+        {error, OReason} ->
+            e("Failed open socket: "
+              "~n   ~p", [OReason]),
+            exit({failed_open_socket, OReason})
+    end;
+do_manager_init(Domain, seqpacket = Type, sctp = Proto, _UseMsg, _Peek) ->
+    %% This is as far as I have got with SCTP at the moment...
+    case socket:open(Domain, Type, Proto) of
+        {ok, Sock} ->
+            i("(sctp) socket opened: "
+              "~n   ~p", [Sock]),
+            EXP = fun(_Desc, Expect, Expect) ->
+                          Expect;
+                     (Desc, Expect, Actual) ->
+                          e("Unexpected result ~w: "
+                            "~n   Expect: ~p"
+                            "~n   Actual: ~p", [Desc, Expect, Actual]),
+                          exit({Desc, Expect, Actual})
+                  end,
+            GO = fun(O) -> case socket:getopt(Sock, sctp, O) of
+                               {ok, V}    -> f("~p", [V]);
+                               {error, R} -> f("error: ~p", [R])
+                           end
+                 end,
+            %% ok = socket:setopt(Sock, otp, debug, true),
+
+            i("Miscellaneous options: "
+              "~n   associnfo:         ~s"
+              "~n   autoclose:         ~s"
+              "~n   disable-fragments: ~s"
+              "~n   initmsg:           ~s"
+              "~n   maxseg:            ~s"
+              "~n   nodelay:           ~s"
+              "~n   rtoinfo:           ~s", 
+              [GO(associnfo),
+               GO(autoclose),
+               GO(disable_fragments),
+               GO(initmsg),
+               GO(maxseg),
+               GO(nodelay),
+               GO(rtoinfo)]),
+
+            Events = #{data_in          => true,
+                       association      => true,
+                       address          => true,
+                       send_failure     => true,
+                       peer_error       => true,
+                       shutdown         => true,
+                       partial_delivery => true,
+                       adaptation_layer => true,
+                       authentication   => true,
+                       sender_dry       => true},
+            EXP(set_sctp_events, ok, socket:setopt(Sock, sctp, events, Events)),
+            EXP(close_socket, ok, socket:close(Sock));
+        {error, Reason} ->
+            exit({failed_open, Reason})
+    end;
+do_manager_init(Domain, raw = Type, Proto, UseMsg, Peek) when is_integer(Proto) ->
+    do_manager_init(Domain, Type, {raw, Proto}, UseMsg, Peek);
+do_manager_init(Domain, raw = Type, Proto, _UseMsg, _Peek) ->
+    case socket:open(Domain, Type, Proto) of
+        {ok, Sock} ->
+            i("(sctp) socket opened: "
+              "~n   ~p", [Sock]),
+            socket:close(Sock);
+        {error, Reason} ->
+            exit({failed_open, Reason})
+    end.
+
+
+
+manager_stream_init(Domain, Type, Proto) ->
+    i("try (socket) open"),
+    Sock = case socket:open(Domain, Type, Proto) of
+               {ok, S} ->
+                   S;
+               {error, OReason} ->
+                   throw({open, OReason})
+           end,
+    F = fun(X) -> case socket:getopt(Sock, socket, X) of
+                      {ok, V} ->    f("~p", [V]);
+                      {error, R} -> f("error: ~p", [R])
+                  end
+        end,
+    i("(socket) open (~s,~s,~s): "
+      "~n   debug:     ~s"
+      "~n   prio:      ~s"
+      "~n   => try find (local) address", 
+      [F(domain), F(type), F(protocol), F(debug), F(priority)]),
+    Addr = which_addr(Domain),
+    SA = #{family => Domain,
+           addr   => Addr},
+    i("found: "
+      "~n   ~p"
+      "~n   => try (socket) bind", [Addr]),
+    %% ok = socket:setopt(Sock, otp, debug, true),
+    %% ok = socket:setopt(Sock, socket, debug, 1), %% must have rights!!
+    Port = case socket:bind(Sock, SA) of
+               {ok, P} ->
+                   %% ok = socket:setopt(Sock, socket, debug, 0), %% must have rights!!
+                   %% ok = socket:setopt(Sock, otp, debug, false),
+                   P;
+               {error, BReason} ->
+                   throw({bind, BReason})
+           end,
+    i("bound to: "
+      "~n   ~p"
+      "~n   => try (socket) listen (acceptconn: ~s)", 
+      [Port, F(acceptconn)]),
+    case socket:listen(Sock) of
+        ok ->
+            i("listening (acceptconn: ~s)", 
+              [F(acceptconn)]),
+            manager_stream_init(Sock, 1, ?NUM_ACCEPTORS, []);
+        {error, LReason} ->
+            throw({listen, LReason})
+    end.
+
+which_addr(Domain) ->
+    Iflist = case inet:getifaddrs() of
+                 {ok, IFL} ->
+                     IFL;
+                 {error, Reason} ->
+                     throw({inet,getifaddrs,Reason})
+             end,
+    which_addr(Domain, Iflist).
+
+which_addr(_Domain, []) ->
+    throw(no_address);
+which_addr(Domain, [{Name, IFO}|_IFL]) when (Name =/= "lo") ->
+    which_addr2(Domain, IFO);
+which_addr(Domain, [_|IFL]) ->
+    which_addr(Domain, IFL).
+
+which_addr2(_, []) ->
+    throw(no_address);
+which_addr2(inet = _Domain, [{addr, Addr}|_IFO]) when (size(Addr) =:= 4) ->
+    Addr;
+which_addr2(inet6 = _Domain, [{addr, Addr}|_IFO]) when (size(Addr) =:= 8) ->
+    Addr;
+which_addr2(Domain, [_|IFO]) ->
+    which_addr2(Domain, IFO).
+
+
+manager_stream_init(Sock, ID, NumAcceptors, Acc) 
+  when (NumAcceptors > 0) ->
+    i("try start acceptor"),
+    case acceptor_start(Sock, ID) of
+        {ok, {Pid, MRef}} ->
+            i("acceptor ~w (~p) started", [ID, Pid]),
+            ?LIB:sleep(2000),
+            manager_stream_init(Sock, ID+1, NumAcceptors-1, 
+                                [{ID, Pid, MRef}|Acc]);
+        {error, Reason} ->
+            exit({failed_starting_acceptor, Reason})
+    end;
+manager_stream_init(Sock, _ID, 0, Acc) ->
+    %% Req = {kill_acceptor, length(Acc)}, % Last in the queue
+    %% Req = {kill_acceptor, 3},           % In the "middle" of the queue
+    %% Req = {kill_acceptor, 2},           % The first in the queue
+    %% Req = {kill_acceptor, 1},           % Current acceptor
+    %% Msg = {manager, self(), make_ref(), Req},
+    %% erlang:send_after(timer:seconds(10), self(), Msg),
+    {Sock, lists:reverse(Acc)}.
+
+
+manager_loop(M) ->
+    receive
+        {'DOWN', MRef, process, Pid, Reason} ->
+            M2 = manager_handle_down(M, MRef, Pid, Reason),
+            manager_loop(M2);
+        
+        {manager, Pid, Ref, Request} ->
+            M2 = manager_handle_request(M, Pid, Ref, Request),
+            manager_loop(M2)
+    end.
+
+
+manager_handle_down(#manager{acceptors = Acceptors,
+                             handlers  = Handlers} = M, MRef, Pid, Reason) ->
+    case lists:keysearch(Pid, 2, Acceptors) of
+        {value, {ID, Pid, MRef}} when (Reason =:= normal) ->
+            i("acceptor ~w exited (normally)", [ID]),
+            case lists:keydelete(Pid, 2, Acceptors) of
+                [] ->
+                    %% We are done
+                    i("the last acceptor - we are done"),
+                    exit(normal);
+                Acceptors2 ->
+                    M#manager{acceptors = Acceptors2}
+            end;
+        {value, {ID, Pid, MRef}} ->
+            e("acceptor ~w crashed: "
+              "~n   ~p", [ID, Reason]),
+            exit({acceptor_died, Reason});
+
+        false -> %% handler!
+            if
+                (Reason =/= normal) ->
+                    e("handler ~p died: "
+                      "~n   ~p", [Pid, Reason]);
+                true ->
+                    i("handler ~p terminated", [Pid])
+            end,
+            Handlers2 = lists:keydelete(Pid, 2, Handlers),
+            M#manager{handlers = Handlers2}
+    end.
+
+
+manager_handle_request(#manager{peek       = Peek,
+                                msg        = UseMsg,
+                                handler_id = HID,
+                                handlers   = Handlers} = M, Pid, Ref,
+                       {start_handler, Sock}) ->
+    i("try start handler (~w)", [HID]),
+    case handler_start(HID, Sock, UseMsg, Peek) of
+        {ok, {HPid, HMRef}} ->
+            i("handler ~w started", [HID]),
+            manager_reply(Pid, Ref, {ok, HPid}),
+            M#manager{handler_id = HID+1,
+                      handlers   = [{HID, HPid, HMRef}|Handlers]};
+        {error, Reason} = ERROR ->
+            e("Failed starting new handler: "
+              "~n   Sock:   ~p"
+              "~n   Reason: ~p", [Sock, Reason]),
+            manager_reply(Pid, Ref, ERROR),
+            M
+    end;
+manager_handle_request(#manager{socket    = Sock,
+                                acceptors = [{AID, APid, AMRef}]} = M, _Pid, _Ref,
+                       {kill_acceptor, AID}) ->
+    i("try kill (only remeining) acceptor ~w", [AID]),
+    socket:setopt(Sock, otp, debug, true),
+    manager_stop_acceptor(APid, AMRef, AID, kill),
+    M#manager{acceptors = []};
+manager_handle_request(#manager{socket    = Sock,
+                                acceptors = Acceptors} = M, _Pid, _Ref,
+                       {kill_acceptor, AID}) ->
+    i("try kill acceptor ~w", [AID]),
+    case lists:keysearch(AID, 1, Acceptors) of
+        {value, {AID, APid, AMRef}} ->
+            socket:setopt(Sock, otp, debug, true),
+            manager_stop_acceptor(APid, AMRef, AID, kill),
+            Acceptors2 = lists:keydelete(AID, 1, Acceptors),
+            M#manager{acceptors = Acceptors2};
+        false ->
+            e("no such acceptor"),
+            M
+    end;
+manager_handle_request(#manager{acceptors = Acceptors,
+                                handlers  = Handlers}, Pid, Ref,
+                       {stop, Reason}) ->
+    i("stop"),
+    manager_reply(Pid, Ref, ok),
+    manager_stop_handlers(Handlers, Reason),
+    manager_stop_acceptors(Acceptors, Reason),
+    i("stopped", []),
+    exit(Reason).
+
+manager_stop_acceptors(Acceptors, Reason) ->
+    lists:foreach(fun({ID,P,M}) -> 
+                          manager_stop_acceptor(P, M, ID, Reason) 
+                  end, Acceptors).
+    
+manager_stop_acceptor(Pid, MRef, ID, Reason) ->
+    i("try stop acceptor ~w (~p): ~p", [ID, Pid, Reason]),
+    erlang:demonitor(MRef, [flush]),
+    acceptor_stop(Pid, Reason),
+    ok.
+
+manager_stop_handlers(Handlers, Reason) ->
+    lists:foreach(fun({ID,P,M}) -> 
+                          manager_stop_handler(P, M, ID, Reason) 
+                  end, Handlers).
+
+manager_stop_handler(Pid, MRef, ID, Reason) ->
+    i("try stop handler ~w (~p): ~p", [ID, Pid, Reason]),
+    erlang:demonitor(MRef, [flush]),
+    handler_stop(Pid, Reason),
+    ok.
+
+    
+
+%% =========================================================================
+
+acceptor_start(Sock, ID) ->
+    Self = self(),
+    A = {Pid, _} = spawn_monitor(fun() -> 
+                                         acceptor_init(Self, Sock, ID) 
+                                 end),
+    receive
+        {acceptor, Pid, ok} ->
+            {ok, A};
+        {acceptor, Pid, {error, _} = Error} ->
+            exit(Pid, kill), % Just in case
+            Error;
+        {'DOWN', _MRef, process, Pid, Reason} ->
+            {error, {crashed, Reason}}
+    end.
+
+acceptor_stop(Pid, _Reason) ->
+    %% acceptor_request(Pid, {stop, Reason}).
+    exit(Pid, kill).
+
+%% acceptor_request(Pid, Request) ->
+%%     request(acceptor, Pid, Request).
+
+%% acceptor_reply(Pid, Ref, Reply) ->
+%%     reply(acceptor, Pid, Ref, Reply).
+
+
+acceptor_init(Manager, Sock, ID) ->
+    put(sname, f("acceptor[~w]", [ID])),
+    Manager ! {acceptor, self(), ok},
+    %% ok = socket:setopt(Sock, otp, debug, true),
+    acceptor_loop(#acceptor{id      = ID,
+                            manager = Manager,
+                            socket  = Sock}).
+
+acceptor_loop(#acceptor{socket = LSock, atimeout = Timeout} = A) ->
+    i("try accept"),
+    case socket:accept(LSock, Timeout) of
+        {ok, Sock} ->
+            i("accepted: "
+              "~n   ~p"
+              "~nwhen"
+              "~n   ~p", [Sock, socket:info()]),
+            case acceptor_handle_accept_success(A, Sock) of
+                ok ->
+                    acceptor_loop(A);
+                {error, Reason} ->
+                    e("Failed starting handler: "
+                      "~n   ~p", [Reason]),
+                    socket:close(Sock),
+                    exit({failed_starting_handler, Reason})
+            end;
+        {error, timeout} ->
+            i("timeout"),
+            acceptor_loop(A);
+        {error, Reason} ->
+            e("accept failure: "
+              "~n   ~p", [Reason]),
+            exit({accept, Reason})
+    end.
+
+acceptor_handle_accept_success(#acceptor{manager = Manager}, Sock) ->
+    i("try start handler for peer"
+      "~n   ~p", [case socket:peername(Sock) of
+                      {ok, Peer} -> Peer;
+                      {error, _} = E -> E
+                  end]),
+    case manager_start_handler(Manager, Sock) of
+        {ok, Pid} ->
+            i("handler (~p) started - now change 'ownership'", [Pid]),
+            case socket:setopt(Sock, otp, controlling_process, Pid) of
+                ok ->
+                    %% Normally we should have a msgs collection here
+                    %% (of messages we receive before the control was
+                    %% handled over to Handler), but since we don't 
+                    %% have active implemented yet...
+                    i("new handler (~p) now controlling process", [Pid]),
+                    handler_continue(Pid),
+                    ok;
+                {error, _} = ERROR ->
+                    exit(Pid, kill),
+                    ERROR
+            end;
+        {error, Reason2} ->
+            e("failed starting handler: "
+              "~n   (new) Socket: ~p"
+              "~n   Reason:       ~p", [Sock, Reason2]),
+            exit({failed_starting_handler, Reason2})
+    end.
+
+
+
+%% =========================================================================
+
+handler_start(ID, Sock, UseMsg, Peek) ->
+    Self = self(),
+    H = {Pid, _} = spawn_monitor(fun() ->
+                                         handler_init(Self, ID, UseMsg, Peek, Sock)
+                                 end),
+    receive
+        {handler, Pid, ok} ->
+            {ok, H};
+        {handler, Pid, {error, _} = ERROR} ->
+            exit(Pid, kill), % Just in case
+            ERROR
+    end.
+
+handler_stop(Pid, _Reason) ->
+    %% handler_request(Pid, {stop, Reason}).
+    exit(Pid, kill).
+
+handler_continue(Pid) ->
+    handler_request(Pid, continue).
+
+handler_request(Pid, Request) ->
+    ?LIB:request(handler, Pid, Request).
+
+handler_reply(Pid, Ref, Reply) ->
+    ?LIB:reply(handler, Pid, Ref, Reply).
+
+
+handler_init(Manager, ID, Msg, Peek, Sock) ->
+    put(sname, f("handler:~w", [ID])),
+    i("starting"),
+    Manager ! {handler, self(), ok},
+    receive
+        {handler, Pid, Ref, continue} ->
+            i("got continue"),
+            handler_reply(Pid, Ref, ok),
+            G = fun(L, O) -> case socket:getopt(Sock, L, O) of
+                                {ok, Val} ->
+                                    f("~p", [Val]);
+                                {error, R} when is_atom(R) ->
+                                    f("error: ~w", [R]);
+                                {error, {T, R}} when is_atom(T) ->
+                                    f("error: ~w, ~p", [T, R]);
+                                {error, R} ->
+                                    f("error: ~p", [R])
+                          end
+                end,
+            GSO  = fun(O) -> G(socket, O) end,
+            GIP4 = fun(O) -> G(ip,     O) end,
+            GIP6 = fun(O) -> G(ipv6,   O) end,
+            {ok, Domain} = socket:getopt(Sock, socket, domain),
+            {ok, Type}   = socket:getopt(Sock, socket, type),
+            {ok, Proto}  = socket:getopt(Sock, socket, protocol),
+            B2D          = GSO(bindtodevice),
+            RA           = GSO(reuseaddr),
+            RP           = GSO(reuseport),
+            OOBI         = GSO(oobinline),
+            RcvBuf       = GSO(rcvbuf),
+            RcvLW        = GSO(rcvlowat),
+            RcvTO        = GSO(rcvtimeo),
+            SndBuf       = GSO(sndbuf),
+            SndLW        = GSO(sndlowat),
+            SndTO        = GSO(sndtimeo),
+            Linger       = GSO(linger),
+            Timestamp    = GSO(timestamp),
+            FreeBind     = GIP4(freebind),
+            MTU          = GIP4(mtu),
+            MTUDisc      = GIP4(mtu_discover),
+            MALL         = GIP4(multicast_all),
+            MIF4         = GIP4(multicast_if),
+            MLoop4       = GIP4(multicast_loop),
+            MTTL         = GIP4(multicast_ttl),
+            NF           = GIP4(nodefrag), % raw only
+            PktInfo      = GIP4(pktinfo),  % dgram only
+            RecvErr4     = GIP4(recverr),
+            RecvIF       = GIP4(recvif),   % Only dgram and raw (and FreeBSD)
+            RecvOPTS     = GIP4(recvopts), % Not stream
+            RecvOrigDstAddr = GIP4(recvorigdstaddr),
+            RecvTOS      = GIP4(recvtos),
+            RecvTTL      = GIP4(recvttl),  % not stream
+            RetOpts      = GIP4(retopts),  % not stream
+            SendSrcAddr  = GIP4(sendsrcaddr),
+            TOS          = GIP4(tos),
+            Transparent  = GIP4(transparent),
+            TTL          = GIP4(ttl),
+            MHops        = GIP6(multicast_hops),
+            MIF6         = GIP6(multicast_if), % Only dgram and raw
+            MLoop6       = GIP6(multicast_loop),
+            RecvErr6     = GIP6(recverr),
+            RecvPktInfo  = GIP6(recvpktinfo),
+            RtHdr        = GIP6(rthdr),
+            AuthHdr      = GIP6(authhdr),
+            HopLimit     = GIP6(hoplimit),
+            HopOpts      = GIP6(hopopts),
+            DstOpts      = GIP6(dstopts),
+            FlowInfo     = GIP6(flowinfo),
+            UHops        = GIP6(unicast_hops),
+            i("got continue when: "
+              "~n   (socket) Domain:             ~p"
+              "~n   (socket) Type:               ~p"
+              "~n   (socket) Protocol:           ~p"
+              "~n   (socket) Reuse Address:      ~s"
+              "~n   (socket) Reuse Port:         ~s"
+              "~n   (socket) Bind To Device:     ~s"
+              "~n   (socket) OOBInline:          ~s"
+              "~n   (socket) RcvBuf:             ~s"
+              "~n   (socket) RcvLW:              ~s"
+              "~n   (socket) RcvTO:              ~s"
+              "~n   (socket) SndBuf:             ~s"
+              "~n   (socket) SndLW:              ~s"
+              "~n   (socket) SndTO:              ~s"
+              "~n   (socket) Linger:             ~s"
+              "~n   (socket) Timestamp:          ~s"
+              "~n   (ip)     FreeBind:           ~s"
+              "~n   (ip)     MTU:                ~s"
+              "~n   (ip)     MTU Discovery:      ~s"
+              "~n   (ip)     Multicast ALL:      ~s"
+              "~n   (ip)     Multicast IF:       ~s"
+              "~n   (ip)     Multicast Loop:     ~s"
+              "~n   (ip)     Multicast TTL:      ~s"
+              "~n   (ip)     Node Frag:          ~s"
+              "~n   (ip)     Pkt Info:           ~s"
+              "~n   (ip)     Recv Err:           ~s"
+              "~n   (ip)     Recv IF:            ~s"
+              "~n   (ip)     Recv OPTS:          ~s"
+              "~n   (ip)     Recv Orig Dst Addr: ~s"
+              "~n   (ip)     Recv TOS:           ~s"
+              "~n   (ip)     Recv TTL:           ~s"
+              "~n   (ip)     Ret Opts:           ~s"
+              "~n   (ip)     Send Src Addr:      ~s"
+              "~n   (ip)     TOS:                ~s"
+              "~n   (ip)     Transparent:        ~s"
+              "~n   (ip)     TTL:                ~s"
+              "~n   (ipv6)   Multicast Hops:     ~s"
+              "~n   (ipv6)   Multicast IF:       ~s"
+              "~n   (ipv6)   Multicast Loop:     ~s"
+              "~n   (ipv6)   Recv Err:           ~s"
+              "~n   (ipv6)   Recv Pkt Info:      ~s"
+              "~n   (ipv6)   RT Hdr:             ~s"
+              "~n   (ipv6)   Auth Hdr:           ~s"
+              "~n   (ipv6)   Hop Limit:          ~s"
+              "~n   (ipv6)   Hop Opts:           ~s"
+              "~n   (ipv6)   Dst Opts:           ~s"
+              "~n   (ipv6)   Flow Info:          ~s"
+              "~n   (ipv6)   Unicast Hops:       ~s",
+              [Domain, Type, Proto,
+               RA, RP, B2D, OOBI,
+               RcvBuf, RcvLW, RcvTO, SndBuf, SndLW, SndTO,
+               Linger, Timestamp,
+               FreeBind, MTU, MTUDisc, MALL, MIF4, MLoop4, MTTL,
+               NF, PktInfo,RecvErr4, 
+               RecvIF, RecvOPTS, RecvOrigDstAddr, RecvTOS, RecvTTL, RetOpts,
+               SendSrcAddr, TOS, Transparent, TTL,
+               MHops, MIF6, MLoop6, RecvErr6, RecvPktInfo,
+               RtHdr, AuthHdr, HopLimit, HopOpts, DstOpts, FlowInfo,
+               UHops]),
+
+            %% ok = socket:setopt(Sock, otp, debug, true),
+            %% case socket:getopt(Sock, 0, {13, int}) of
+            %%     {ok, Val} ->
+            %%         i("PktOpts ok:  ~p", [Val]);
+            %%     {error, Reason} ->
+            %%         e("PktOpts err: ~p", [Reason])
+            %% end,
+            %% ok = socket:setopt(Sock, otp, debug, false),
+            SSO = fun(O, V) -> soso(Sock, O, V) end,
+            SIP4 = 
+                fun(O, V) ->
+                        if 
+                            (Type =:= dgram) -> 
+                                ok = soip(Sock, O,  V);
+                            true ->
+                                ok
+                        end
+                end,
+            SSO(timestamp, true),
+            SIP4(pktinfo, true),
+            ok = soip(Sock, recvtos,  true),
+            SIP4(recvttl,  true),
+            ok = soip(Sock, recvorigdstaddr,  true),
+
+            handler_loop(#handler{msg     = Msg,
+                                  peek    = Peek,
+                                  manager = Manager,
+                                  type    = Type,
+                                  socket  = Sock})
+    end.
+
+so(Sock, Lvl, Opt, Val) ->
+    ok = socket:setopt(Sock, Lvl, Opt, Val).
+
+soso(Sock, Opt, Val) ->
+    so(Sock, socket, Opt, Val).
+
+soip(Sock, Opt, Val) ->
+    so(Sock, ip, Opt, Val).
+
+%% soipv6(Sock, Opt, Val) ->
+%%     so(Sock, ipv6, Opt, Val).
+
+handler_loop(H) ->
+    i("try read message"),
+    case recv(H) of
+        {ok, {Source, Msg}} ->
+            i("received ~w bytes of data~s", 
+              [size(Msg), case Source of
+                              undefined -> "";
+                              _ -> f(" from:~n   ~p", [Source])
+                          end]),
+            case ?LIB:dec_msg(Msg) of
+                {request, N, Req} ->
+                    i("received request ~w: "
+                      "~n   ~p", [N, Req]),
+                    Reply = ?LIB:enc_rep_msg(N, "hoppsan"),
+                    case send(H, Reply, Source) of
+                        ok ->
+                            i("successfully sent reply ~w", [N]),
+                            handler_loop(H);
+                        {error, SReason} ->
+                            e("failed sending reply ~w:"
+                              "~n   ~p", [N, SReason]),
+                            exit({failed_sending_reply, SReason})
+                    end
+            end;
+
+        {error, closed} ->
+            i("closed when"
+              "~n   ~p", [socket:info()]),
+            exit(normal);
+        
+        {error, RReason} ->
+            e("failed reading request: "
+              "~n   ~p", [RReason]),
+            exit({failed_reading_request, RReason})
+    end.
+
+
+recv(#handler{peek = true, socket = Sock, type = stream}) ->
+    peek_recv(Sock);
+recv(#handler{socket = Sock, msg = true, type = stream}) ->
+    case socket:recvmsg(Sock) of
+        {ok, #{addr  := undefined = Source,
+               iov   := [Data],
+               ctrl  := CMsgHdrs,
+               flags := Flags}} ->
+            i("received message: "
+              "~n   CMsgHdrs: ~p"
+              "~n   Flags:    ~p", [CMsgHdrs, Flags]),
+            {ok, {Source, Data}};
+        {ok, X} ->
+            e("received *unexpected* message: "
+              "~n   ~p", [X]),
+            {error, {unexpected, X}};
+        {error, _} = ERROR ->
+            ERROR
+    end;
+recv(#handler{socket = Sock, msg = true, type = dgram}) ->
+    case socket:recvmsg(Sock) of
+        {ok, #{addr  := Source,
+               iov   := [Data],
+               ctrl  := CMsgHdrs,
+               flags := Flags}} ->
+            i("received message: "
+              "~n   CMsgHdrs: ~p"
+              "~n   Flags:    ~p", [CMsgHdrs, Flags]),
+            {ok, {Source, Data}};
+        {ok, X} ->
+            {error, {unexpected, X}};
+        {error, _} = ERROR ->
+            ERROR
+    end;
+recv(#handler{peek = false, socket = Sock, type = stream}) ->
+    do_recv(Sock);
+recv(#handler{peek = Peek, socket = Sock, type = dgram})
+  when (Peek =:= true) ->
+    %% ok  = socket:setopt(Sock, otp, debug, true),
+    RES = peek_recvfrom(Sock, 5),
+    %% ok  = socket:setopt(Sock, otp, debug, false),
+    RES;
+recv(#handler{peek = Peek, socket = Sock, type = dgram})
+  when (Peek =:= false) ->
+    %% ok = socket:setopt(Sock, otp, debug, true),
+    socket:recvfrom(Sock).
+
+do_recv(Sock) ->
+    case socket:recv(Sock) of
+        {ok, Msg} ->
+            {ok, {undefined, Msg}};
+        {error, _} = ERROR ->
+            ERROR
+    end.
+
+peek_recv(Sock) ->
+    i("try peek on the message type (expect request)"),
+    Type = ?LIB:req(),
+    case socket:recv(Sock, 4, [peek]) of
+        {ok, <<Type:32>>} ->
+            i("was request - do proper recv"),
+            do_recv(Sock);
+        {error, _} = ERROR ->
+            ERROR
+    end.
+
+peek_recvfrom(Sock, BufSz) ->
+    i("try peek recvfrom with buffer size ~w", [BufSz]),
+    case socket:recvfrom(Sock, BufSz, [peek]) of
+        {ok, {_Source, Msg}} when (BufSz =:= size(Msg)) ->
+            %% i("we filled the buffer: "
+            %%   "~n   ~p", [Msg]),
+            %% It *may not* fit => try again with double size
+            peek_recvfrom(Sock, BufSz*2);
+        {ok, _} ->
+            %% It fits => read for real
+            i("we did *not* fill the buffer - do the 'real' read"),
+            socket:recvfrom(Sock);
+        {error, _} = ERROR ->
+            ERROR
+    end.
+
+
+send(#handler{socket = Sock, msg = true, type = stream, stimeout = Timeout}, 
+     Msg, _) ->
+    CMsgHdr  = #{level => ip, type => tos, data => reliability},
+    CMsgHdrs = [CMsgHdr],
+    MsgHdr   = #{iov => [Msg], ctrl => CMsgHdrs},
+    %% socket:setopt(Sock, otp, debug, true),
+    Res = socket:sendmsg(Sock, MsgHdr, Timeout),
+    %% socket:setopt(Sock, otp, debug, false),
+    Res;
+send(#handler{socket = Sock, type = stream, stimeout = Timeout}, Msg, _) ->
+    socket:send(Sock, Msg, Timeout);
+send(#handler{socket = Sock, msg = true, type = dgram, stimeout = Timeout}, 
+     Msg, Dest) ->
+    CMsgHdr  = #{level => ip, type => tos, data => reliability},
+    CMsgHdrs = [CMsgHdr],
+    MsgHdr   = #{addr => Dest,
+                 ctrl => CMsgHdrs,
+                 iov  => [Msg]},
+    %% ok = socket:setopt(Sock, otp, debug, true),
+    Res = socket:sendmsg(Sock, MsgHdr, Timeout),
+    %% ok = socket:setopt(Sock, otp, debug, false),
+    Res;
+send(#handler{socket = Sock, type = dgram, stimeout = Timeout}, Msg, Dest) ->
+    socket:sendto(Sock, Msg, Dest, Timeout).
+
+%% filler() ->
+%%     list_to_binary(lists:duplicate(2048, " FILLER ")).
+
+
+
+%% =========================================================================
+
+f(F, A) ->
+    ?LIB:f(F, A).
+
+e(F) ->
+    e(F, []).
+e(F, A) ->
+    ?LIB:e(F, A).
+
+i(F) ->
+    ?LIB:i(F).
+
+i(F, A) ->
+    ?LIB:i(F, A).
+
diff --git a/lib/os_mon/mibs/v1/.gitignore b/erts/emulator/test/esock_ttest/.gitignore
index e69de29bb2..e69de29bb2 100644
--- a/lib/os_mon/mibs/v1/.gitignore
+++ b/erts/emulator/test/esock_ttest/.gitignore
diff --git a/erts/emulator/test/esock_ttest/esock-ttest b/erts/emulator/test/esock_ttest/esock-ttest
new file mode 100755
index 0000000000..2ded557484
--- /dev/null
+++ b/erts/emulator/test/esock_ttest/esock-ttest
@@ -0,0 +1,382 @@
+#!/usr/bin/env escript
+
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2018-2019. 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 simple wrapper escript on top of the socket ttest program(s).
+%% The idea is to make it simple to run in a normal shell (bash).
+%%
+%% ==========================================================================
+
+-define(SECS(I), timer:seconds(I)).
+
+-define(CLIENT_MSG_1_MAX_OUTSTANDING, 100).
+-define(CLIENT_MSG_2_MAX_OUTSTANDING,  10).
+-define(CLIENT_MSG_3_MAX_OUTSTANDING,   1).
+
+main(Args) ->
+    State = process_args(Args),
+    exec(State),
+    ok.
+
+usage(ErrorString) when is_list(ErrorString) ->
+    eprint(ErrorString),
+    usage(),
+    erlang:halt(0).
+
+usage() ->
+    io:format("usage: ~s [options]"
+              "~n"
+              "~n   This erlang script is used to start the (e)socket ttest "
+              "~n   units (server or client)."
+              "~n"
+              "~n   options: "
+              "~n     --help                       Display this info and exit. "
+              "~n     --server [server-options]    Start a server. "
+              "~n                                  There are no mandatory server options."
+              "~n     --client client-options      Start a client"
+              "~n                                  Some client options are mandatory and"
+              "~n                                  others optional."
+              "~n     --domain <domain>            local | inet | inet6"
+              "~n                                  Which domain to use."
+              "~n                                  Only valid for server."
+              "~n                                  Defaults to: inet"
+              "~n     --async                      Asynchronous mode (Timeout = nowait)"
+              "~n                                  This option is only valid for transport = sock."
+              "~n                                  Also, its only used when active =/= false."
+              "~n     --active <active>            boolean() | once."
+              "~n                                  Valid for both client and server."
+              "~n                                  Defaults to: false"
+              "~n     --transport <transport>      Which transport to use: gen|sock[:plain|msg]"
+              "~n                                     gen:  gen_tcp"
+              "~n                                     sock: socket"
+              "~n                                          plain: recv/send (default)"
+              "~n                                          msg:   recvmsg/sendmsg"
+              "~n                                  Defaults to: sock:plain"
+              "~n     --scon <addr>:<port>|<path>  Server info."
+              "~n                                  The address part is in the standard form:"
+              "~n                                       \"a.b.c.d\"."
+              "~n                                  <path> is used for Unix Domain sockets (local)."
+              "~n                                  Only valid, and mandatory, for client."
+              "~n     --msg-id <1|2|3>             Choose which message to use during the test."
+              "~n                                  Basically: "
+              "~n                                     1: small"
+              "~n                                     2: medium"
+              "~n                                     3: large"
+              "~n                                  Defaults to: 1"
+              "~n     --max-outstanding <Num>      How many messages to send before waiting for"
+              "~n                                  a reply."
+              "~n                                  Valid only for client."
+              "~n                                  Defaults to: "
+              "~n                                     MsgID 1: 100"
+              "~n                                     MsgID 2:  10"
+              "~n                                     MsgID 3:   1"
+              "~n     --runtime <Time>             Time of the test in seconds."
+              "~n                                  Only valid for client."
+              "~n                                  Mandatory."
+              "~n                                  Defaults to: 60 (seconds)"
+              "~n"
+              "~n"
+              "~n", 
+              [scriptname()]),
+    ok.
+
+process_args(["--help"|_]) ->
+    usage();
+process_args(["--server"|ServerArgs]) ->
+    process_server_args(ServerArgs);
+process_args(["--client"|ClientArgs]) ->
+    process_client_args(ClientArgs);
+process_args(Args) ->
+    usage(f("Invalid Args: "
+            "~n   ~p", [Args])).
+
+
+process_server_args(Args) ->
+    Defaults = #{role      => server,
+                 domain    => inet,
+                 async     => false,
+                 active    => false,
+                 transport => {sock, plain}},
+    process_server_args(Args, Defaults).
+
+process_server_args([], State) ->
+    State;
+
+process_server_args(["--domain", Domain|Args], State) 
+  when ((Domain =:= "local") orelse
+        (Domain =:= "inet") orelse
+        (Domain =:= "inet6")) ->
+    process_server_args(Args, State#{domain => list_to_atom(Domain)});
+
+process_server_args(["--async"|Args], State) ->
+    process_server_args(Args, State#{async => true});
+
+process_server_args(["--active", Active|Args], State) 
+  when ((Active =:= "false") orelse
+        (Active =:= "once") orelse
+        (Active =:= "true")) ->
+    process_server_args(Args, State#{active => list_to_atom(Active)});
+
+process_server_args(["--transport", "gen" | Args], State) ->
+    process_server_args(Args, State#{transport => gen});
+process_server_args(["--transport", "sock" | Args], State) ->
+    process_server_args(Args, State#{transport => {sock, plain}});
+process_server_args(["--transport", "sock:plain" | Args], State) ->
+    process_server_args(Args, State#{transport => {sock, plain}});
+process_server_args(["--transport", "sock:msg" | Args], State) ->
+    process_server_args(Args, State#{transport => {sock, msg}});
+
+process_server_args([Arg|_], _State) ->
+    usage(f("Invalid Server arg: ~s", [Arg])).
+
+
+process_client_args(Args) ->
+    Defaults = #{role            => client,
+                 async           => false,
+                 active          => false,
+                 transport       => {sock, plain},
+                 %% Will cause error if not provided
+                 %% Should be "addr:port or string()
+                 server          => undefined,
+                 msg_id          => 1,
+                 %% Will be filled in based on msg_id if not provided
+                 max_outstanding => undefined,
+                 runtime         => ?SECS(60)},
+    process_client_args(Args, Defaults).
+
+process_client_args([], State) ->
+    process_client_args_ensure_max_outstanding(State);
+
+process_client_args(["--async"|Args], State) ->
+    process_client_args(Args, State#{async => true});
+
+process_client_args(["--active", Active|Args], State) 
+  when (Active =:= "false") orelse
+       (Active =:= "once") orelse
+       (Active =:= "true") ->
+    process_client_args(Args, State#{active => list_to_atom(Active)});
+
+process_client_args(["--transport", "gen" | Args], State) ->
+    process_client_args(Args, State#{transport => gen});
+process_client_args(["--transport", "sock" | Args], State) ->
+    process_client_args(Args, State#{transport => {sock, plain}});
+process_client_args(["--transport", "sock:plain" | Args], State) ->
+    process_client_args(Args, State#{transport => {sock, plain}});
+process_client_args(["--transport", "sock:msg" | Args], State) ->
+    process_client_args(Args, State#{transport => {sock, msg}});
+
+process_client_args(["--msg-id", MsgID|Args], State)
+  when ((MsgID =:= "1") orelse
+        (MsgID =:= "2") orelse
+        (MsgID =:= "3")) ->
+    process_client_args(Args, State#{msg_id => list_to_integer(MsgID)});
+
+process_client_args(["--max-outstanding", Max|Args], State) ->
+    try list_to_integer(Max) of
+        I when (I > 0) ->
+            process_client_args(Args, State#{max_outstanding => I});
+        _ ->
+            usage(f("Invalid Max Outstanding: ~s", [Max]))
+    catch
+        _:_:_ ->
+            usage(f("Invalid Max Outstanding: ~s", [Max]))
+    end;
+
+process_client_args(["--scon", Server|Args], State) ->
+    case string:split(Server, ":", trailing) of
+        [AddrStr,PortStr] ->
+            Addr = case inet:parse_address(AddrStr) of
+                       {ok, A} ->
+                           A;
+                       {error, _} ->
+                           usage(f("Invalid Server Address: ~s", [AddrStr]))
+                   end,
+            Port = try list_to_integer(PortStr) of
+                       I when (I > 0) ->
+                           I;
+                       _ ->
+                           usage(f("Invalid Server Port: ~s", [PortStr]))
+                   catch
+                       _:_:_ ->
+                           usage(f("Invalid Server Port: ~s", [PortStr]))
+                   end,
+            process_client_args(Args, State#{server => {Addr, Port}});
+        [Path] ->
+            process_client_args(Args, State#{server => Path});
+        _ ->
+            usage(f("Invalid Server: ~s", [Server]))
+    end;
+
+process_client_args(["--runtime", T|Args], State) ->
+    try list_to_integer(T) of
+        I when (I > 0) ->
+            process_client_args(Args, State#{runtime => ?SECS(I)});
+        _ ->
+            usage(f("Invalid Run Time: ~s", [T]))
+    catch
+        _:_:_ ->
+            usage(f("Invalid Run Time: ~s", [T]))
+    end;
+
+process_client_args([Arg|_], _State) ->
+    usage(f("Invalid Client arg: ~s", [Arg])).
+
+
+process_client_args_ensure_max_outstanding(
+  #{msg_id          := 1,
+    max_outstanding := undefined} = State) ->
+    State#{max_outstanding => ?CLIENT_MSG_1_MAX_OUTSTANDING};
+process_client_args_ensure_max_outstanding(
+  #{msg_id          := 2,
+    max_outstanding := undefined} = State) ->
+    State#{max_outstanding => ?CLIENT_MSG_2_MAX_OUTSTANDING};
+process_client_args_ensure_max_outstanding(
+  #{msg_id          := 3,
+    max_outstanding := undefined} = State) ->
+    State#{max_outstanding => ?CLIENT_MSG_3_MAX_OUTSTANDING};
+process_client_args_ensure_max_outstanding(
+  #{msg_id          := MsgID,
+    max_outstanding := MaxOutstanding} = State)
+  when ((MsgID =:= 1) orelse
+        (MsgID =:= 2) orelse
+        (MsgID =:= 3)) andalso 
+       (is_integer(MaxOutstanding) andalso (MaxOutstanding > 0)) ->
+    State;
+process_client_args_ensure_max_outstanding(
+  #{msg_id          := MsgID,
+    max_outstanding := MaxOutstanding}) ->
+    usage(f("Invalid Msg ID (~w) and Max Outstanding (~w)", 
+            [MsgID, MaxOutstanding])).
+
+
+
+%% ==========================================================================
+
+exec(#{role      := server,
+       domain    := Domain,
+       active    := Active,
+       transport := gen})
+  when (Domain =:= inet) orelse (Domain =:= inet6) ->
+    case socket_test_ttest_tcp_server_gen:start(Domain, Active) of
+        {ok, {Pid, _}} ->
+            MRef = erlang:monitor(process, Pid),
+            receive
+                {'DOWN', MRef, process, Pid, Info} ->
+                    Info
+            end;
+        {error, Reason} ->
+            eprint(f("Failed starting server: "
+                     "~n   ~p", [Reason])),
+            error
+    end;
+exec(#{role      := server,
+       domain    := Domain,
+       async     := Async,
+       active    := Active,
+       transport := {sock, Method}}) ->
+    case socket_test_ttest_tcp_server_socket:start(Method, Domain, Async, Active) of
+        {ok, {Pid, _}} ->
+            MRef = erlang:monitor(process, Pid),
+            receive
+                {'DOWN', MRef, process, Pid, Info} ->
+                    Info
+            end;
+        {error, Reason} ->
+            eprint(f("Failed starting server: "
+                     "~n   ~p", [Reason])),
+            error
+    end;
+
+exec(#{role   := client,
+       server := undefined}) ->
+    usage("Mandatory option 'server' not provided");
+exec(#{role            := client,
+       server          := {_Addr, _Port} = ServerInfo,
+       active          := Active,
+       transport       := gen,
+       msg_id          := MsgID,
+       max_outstanding := MaxOutstanding,
+       runtime         := RunTime}) ->
+    case socket_test_ttest_tcp_client_gen:start(true,
+                                                ServerInfo,
+                                                Active,
+                                                MsgID, MaxOutstanding,
+                                                RunTime) of
+        {ok, Pid} ->
+            MRef = erlang:monitor(process, Pid),
+            receive
+                {'DOWN', MRef, process, Pid, Info} ->
+                    Info
+            end;
+        {error, Reason} ->
+            eprint(f("Failed starting server: "
+                     "~n   ~p", [Reason])),
+            error
+    end;
+exec(#{role            := client,
+       server          := ServerInfo,
+       async           := Async,
+       active          := Active,
+       transport       := {sock, Method},
+       msg_id          := MsgID,
+       max_outstanding := MaxOutstanding,
+       runtime         := RunTime}) ->
+    case socket_test_ttest_tcp_client_socket:start(true,
+                                                   Async,
+						   Active,
+                                                   Method,
+                                                   ServerInfo,
+                                                   MsgID, MaxOutstanding,
+                                                   RunTime) of
+        {ok, Pid} ->
+            MRef = erlang:monitor(process, Pid),
+            receive
+                {'DOWN', MRef, process, Pid, Info} ->
+                    Info
+            end;
+        {error, Reason} ->
+            eprint(f("Failed starting server: "
+                     "~n   ~p", [Reason])),
+            error
+    end;
+exec(_) ->
+    usage("Unexpected option combo"),
+    ok.
+
+
+
+%% ==========================================================================
+    
+f(F, A) ->
+    socket_test_ttest_lib:format(F, A).
+
+eprint(ErrorString) when is_list(ErrorString) ->
+    print("<ERROR> " ++ ErrorString ++ "~n", []).
+
+print(F, A) ->
+    io:format(F ++ "~n", A).
+
+scriptname() ->
+    FullName = escript:script_name(),
+    filename:basename(FullName).
+
diff --git a/erts/emulator/test/esock_ttest/esock-ttest-client b/erts/emulator/test/esock_ttest/esock-ttest-client
new file mode 100755
index 0000000000..5ae05d03b8
--- /dev/null
+++ b/erts/emulator/test/esock_ttest/esock-ttest-client
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# 
+#  %CopyrightBegin%
+#  
+#  Copyright Ericsson AB 2019-2019. 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 just a simple convenience wrapper to the esock-ttest.
+# That means that there are some options not available here.
+#
+
+EMU=$ERL_TOP/erts/emulator
+EMU_TEST=$EMU/test
+ESOCK_TTEST=$EMU_TEST/esock_ttest
+
+RUNTIME=30
+# RUNTIME=60
+# RUNTIME=600
+
+if [ $# = 3 ]; then
+    MSGID=$1
+    SERVER_INFO=$2:$3
+
+    ITERATIONS="\
+       gen  false $MSGID
+       gen  true  $MSGID
+       gen  once  $MSGID
+       sock false $MSGID --async
+       sock true  $MSGID --async
+       sock once  $MSGID --async"
+
+else
+    if [ $# = 2 ]; then
+	MSGID=$1
+	SERVER_INFO=$2
+
+	ITERATIONS="\
+           sock false $MSGID --async
+           sock true  $MSGID --async
+           sock once  $MSGID --async"
+
+    else
+	echo "Invalid number of args"
+	exit 1;
+    fi
+fi
+
+
+# ---------------------------------------------------------------------------
+
+# For when we have figured out how to configure local for gen_tcp...
+
+#ITERATIONS="\
+#   gen  false  $MSGID
+#   gen  true   $MSGID
+#   gen  once   $MSGID
+#   sock false  $MSGID
+#   sock true   $MSGID
+#   sock once   $MSGID"
+
+# ---------------------------------------------------------------------------
+
+echo "$ITERATIONS" |
+  while read TRANSPORT ACTIVE MSG_ID ASYNC; do
+
+      echo ""
+      echo "=========== transport = $TRANSPORT, active = $ACTIVE, msg-id = $MSG_ID ==========="
+      # The /dev/null at the end is necessary because erlang "does things" with stdin
+      # and this case would cause the 'while read' to "fail" so that we only would
+      # loop one time
+      $ESOCK_TTEST/esock-ttest --client --transport $TRANSPORT $ASYNC --active $ACTIVE --msg-id $MSG_ID --scon $SERVER_INFO --runtime $RUNTIME </dev/null
+      echo ""
+
+  done
+
+
diff --git a/erts/emulator/test/esock_ttest/esock-ttest-server-gen b/erts/emulator/test/esock_ttest/esock-ttest-server-gen
new file mode 100755
index 0000000000..c29184772e
--- /dev/null
+++ b/erts/emulator/test/esock_ttest/esock-ttest-server-gen
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# 
+#  %CopyrightBegin%
+#  
+#  Copyright Ericsson AB 2019-2019. 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%
+# 
+
+EMU=$ERL_TOP/erts/emulator
+EMU_TEST=$EMU/test
+ESOCK_TTEST=$EMU_TEST/esock_ttest
+
+if [ $# = 1 ]; then
+    ACTIVE="--active $1"
+fi
+
+$ESOCK_TTEST/esock-ttest --server --transport gen $ACTIVE
+
diff --git a/erts/emulator/test/esock_ttest/esock-ttest-server-sock b/erts/emulator/test/esock_ttest/esock-ttest-server-sock
new file mode 100755
index 0000000000..c443d42e64
--- /dev/null
+++ b/erts/emulator/test/esock_ttest/esock-ttest-server-sock
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+# 
+#  %CopyrightBegin%
+#  
+#  Copyright Ericsson AB 2019-2019. 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%
+# 
+
+EMU=$ERL_TOP/erts/emulator
+EMU_TEST=$EMU/test
+ESOCK_TTEST=$EMU_TEST/esock_ttest
+
+#  $1 - async  - boolean()
+#  $2 - active - once | boolean()
+# [$3 - domain - inet (default) | inet6 | local]
+if [ $# -ge 2 ]; then
+
+    async=$1
+    active=$2
+
+    if [ $async = true ]; then
+	ASYNC="--async"
+    else
+	ASYNC=
+    fi
+
+    ACTIVE="--active $active"
+
+    if [ $# = 3 ]; then
+	DOMAIN="--domain $3"
+    fi
+
+
+else
+    echo "<ERROR> Missing args: async and active"
+    echo ""
+    exit 1
+fi
+
+
+$ESOCK_TTEST/esock-ttest --server $DOMAIN $ASYNC --transport sock $ACTIVE
+
diff --git a/erts/emulator/test/exception_SUITE.erl b/erts/emulator/test/exception_SUITE.erl
index aec66cb9a3..154bce3c35 100644
--- a/erts/emulator/test/exception_SUITE.erl
+++ b/erts/emulator/test/exception_SUITE.erl
@@ -23,6 +23,7 @@
 -export([all/0, suite/0,
          badmatch/1, pending_errors/1, nil_arith/1, top_of_stacktrace/1,
          stacktrace/1, nested_stacktrace/1, raise/1, gunilla/1, per/1,
+         change_exception_class/1,
          exception_with_heap_frag/1, backtrace_depth/1,
          line_numbers/1]).
 
@@ -36,6 +37,11 @@
 %% during compilation instead of at runtime, so do not perform this analysis.
 -compile([{hipe, [no_icode_range]}]).
 
+%% Module-level type optimization propagates the constants used when testing
+%% increment1/1 and increment2/1, which makes it test something completely
+%% different, so we're turning it off.
+-compile(no_module_opt).
+
 suite() ->
     [{ct_hooks,[ts_install_cth]},
      {timetrap, {minutes, 1}}].
@@ -43,6 +49,7 @@ suite() ->
 all() -> 
     [badmatch, pending_errors, nil_arith, top_of_stacktrace,
      stacktrace, nested_stacktrace, raise, gunilla, per,
+     change_exception_class,
      exception_with_heap_frag, backtrace_depth, line_numbers].
 
 -define(try_match(E),
@@ -507,6 +514,38 @@ t1(_,X,_) ->
 t2(_,X,_) ->
     (X bsl 1) + 1.
 
+change_exception_class(_Config) ->
+    try
+        change_exception_class_1(fun() -> throw(arne) end)
+    catch
+        error:arne ->
+            ok;
+        Class:arne ->
+            ct:fail({wrong_exception_class,Class})
+    end.
+
+change_exception_class_1(F) ->
+    try
+        change_exception_class_2(F)
+    after
+        %% The exception would be caught and rethrown using
+        %% an i_raise instruction. Before the correction
+        %% of the raw_raise instruction, the change of class
+        %% would not stick.
+        io:put_chars("Exception automatically rethrown here\n")
+    end.
+
+change_exception_class_2(F) ->
+    try
+        F()
+    catch
+        throw:Reason:Stack ->
+            %% Translated to a raw_raise instruction.
+            %% The change of exception class would not stick
+            %% if the i_raise instruction was later executed.
+            erlang:raise(error, Reason, Stack)
+    end.
+
 %%
 %% Make sure that even if a BIF builds an heap fragment, then causes an exception,
 %% the stacktrace term will still be OK (specifically, that it does not contain
diff --git a/erts/emulator/test/fun_SUITE.erl b/erts/emulator/test/fun_SUITE.erl
index 73fe9b0d8f..ad8ef0feff 100644
--- a/erts/emulator/test/fun_SUITE.erl
+++ b/erts/emulator/test/fun_SUITE.erl
@@ -27,7 +27,7 @@
 	 fun_to_port/1,t_phash/1,t_phash2/1,md5/1,
 	 refc/1,refc_ets/1,refc_dist/1,
 	 const_propagation/1,t_arity/1,t_is_function2/1,
-	 t_fun_info/1,t_fun_info_mfa/1]).
+	 t_fun_info/1,t_fun_info_mfa/1,t_fun_to_list/1]).
 
 -export([nothing/0]).
 
@@ -44,7 +44,7 @@ all() ->
      equality, ordering, fun_to_port, t_phash,
      t_phash2, md5, refc, refc_ets, refc_dist,
      const_propagation, t_arity, t_is_function2, t_fun_info,
-     t_fun_info_mfa].
+     t_fun_info_mfa,t_fun_to_list].
 
 %% Test that the correct EXIT code is returned for all types of bad funs.
 bad_apply(Config) when is_list(Config) ->
@@ -513,6 +513,8 @@ refc(Config) when is_list(Config) ->
 	Other -> ct:fail({unexpected,Other})
     end,
     process_flag(trap_exit, false),
+    %% Wait to make sure that the process has terminated completely.
+    receive after 1 -> ok end,
     {refc,3} = erlang:fun_info(F1, refc),
 
     %% Garbage collect. Only the F2 fun will be left.
@@ -576,7 +578,7 @@ refc_dist(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     Pid = spawn_link(Node, fun() -> receive
                                         Fun when is_function(Fun) ->
-                                            2 = fun_refc(Fun),
+                                            3 = fun_refc(Fun),
                                             exit({normal,Fun}) end
                            end),
     F = fun() -> 42 end,
@@ -592,13 +594,14 @@ refc_dist(Config) when is_list(Config) ->
     3 = fun_refc(F2),
     true = erlang:garbage_collect(),
     2 = fun_refc(F),
-    refc_dist_send(Node, F).
+    refc_dist_send(Node, F),
+    test_server:stop_node(Node).
 
 refc_dist_send(Node, F) ->
     Pid = spawn_link(Node, fun() -> receive
                                         {To,Fun} when is_function(Fun) ->
                                             wait_until(fun () ->
-                                                               2 =:= fun_refc(Fun)
+                                                               3 =:= fun_refc(Fun)
                                                        end),
                                             To ! Fun
                                     end
@@ -626,7 +629,7 @@ refc_dist_reg_send(Node, F) ->
                                    Me ! Ref,
                                    receive
                                        {Me,Fun} when is_function(Fun) ->
-                                           2 = fun_refc(Fun),
+                                           3 = fun_refc(Fun),
                                            Me ! Fun
                                    end
                            end),
@@ -682,6 +685,7 @@ t_arity(Config) when is_list(Config) ->
     43 = spawn_call(Node, fun(X, Y) -> A+X+Y end),
     1 = spawn_call(Node, fun(X, Y) -> X+Y end),
     45 = spawn_call(Node, fun(X, Y, Z) -> A+X+Y+Z end),
+    test_server:stop_node(Node),
     ok.
 
 t_is_function2(Config) when is_list(Config) ->
@@ -710,6 +714,16 @@ t_is_function2(Config) when is_list(Config) ->
     bad_arity({}),
     bad_arity({a,b}),
     bad_arity(self()),
+
+    %% Bad arity argument in guard test.
+    Fun = fun erlang:abs/1,
+    ok = if
+             is_function(Fun, -1) -> error;
+             is_function(Fun, 256) -> error;
+             is_function(Fun, a) -> error;
+             is_function(Fun, Fun) -> error;
+             true -> ok
+         end,
     ok.
 
 bad_arity(A) ->
@@ -788,6 +802,12 @@ t_fun_info_mfa(Config) when is_list(Config) ->
     {'EXIT',_} = (catch erlang:fun_info_mfa(id(d))),
     ok.
 
+t_fun_to_list(Config) when is_list(Config) ->
+    "fun a:b/1" = erlang:fun_to_list(fun a:b/1),
+    "fun 'a-esc':'b-esc'/1" = erlang:fun_to_list(fun 'a-esc':'b-esc'/1),
+    "fun 'a-esc':b/1" = erlang:fun_to_list(fun 'a-esc':b/1),
+    "fun a:'b-esc'/1" = erlang:fun_to_list(fun a:'b-esc'/1),
+    ok.
 
 bad_info(Term) ->
     try	erlang:fun_info(Term, module) of
@@ -806,11 +826,13 @@ verify_not_undef(Fun, Tag) ->
 	    ct:fail("tag ~w not defined in fun_info", [Tag]);
 	{Tag,_} -> ok
     end.
-	    
+
 id(X) ->
     X.
 
 spawn_call(Node, AFun) ->
+    Parent = self(),
+    Init = erlang:whereis(init),
     Pid = spawn_link(Node,
 		     fun() ->
 			     receive
@@ -821,8 +843,10 @@ spawn_call(Node, AFun) ->
 						_ -> lists:seq(0, Arity-1)
 					    end,
 				     Res = apply(Fun, Args),
-				     {pid,Creator} = erlang:fun_info(Fun, pid),
-				     Creator ! {result,Res}
+                     case erlang:fun_info(Fun, pid) of
+                        {pid,Init} -> Parent ! {result,Res};
+                        {pid,Creator} -> Creator ! {result,Res}
+                     end
 			     end
 		     end),
     Pid ! {AFun,AFun,AFun},
diff --git a/erts/emulator/test/lcnt_SUITE.erl b/erts/emulator/test/lcnt_SUITE.erl
index 87b97037d6..2dbaec9942 100644
--- a/erts/emulator/test/lcnt_SUITE.erl
+++ b/erts/emulator/test/lcnt_SUITE.erl
@@ -187,5 +187,8 @@ remove_untoggleable_locks([]) ->
     [];
 remove_untoggleable_locks([{resource_monitors, _, _, _} | T]) ->
     remove_untoggleable_locks(T);
+remove_untoggleable_locks([{'socket[gcnt]', _, _, _} | T]) ->
+    %% Global lock used by socket NIF
+    remove_untoggleable_locks(T);
 remove_untoggleable_locks([H | T]) ->
     [H | remove_untoggleable_locks(T)].
diff --git a/erts/emulator/test/map_SUITE.erl b/erts/emulator/test/map_SUITE.erl
index d0a6763fe5..9ea59e1084 100644
--- a/erts/emulator/test/map_SUITE.erl
+++ b/erts/emulator/test/map_SUITE.erl
@@ -17,7 +17,7 @@
 %% %CopyrightEnd%
 %%
 -module(map_SUITE).
--export([all/0, suite/0]).
+-export([all/0, suite/0, init_per_suite/1, end_per_suite/1]).
 
 -export([t_build_and_match_literals/1, t_build_and_match_literals_large/1,
          t_update_literals/1, t_update_literals_large/1,
@@ -84,7 +84,10 @@
          %% instruction-level tests
          t_has_map_fields/1,
          y_regs/1,
-         badmap_17/1]).
+         badmap_17/1,
+
+         %%Bugs
+         t_large_unequal_bins_same_hash_bug/1]).
 
 -include_lib("stdlib/include/ms_transform.hrl").
 
@@ -149,7 +152,26 @@ all() -> [t_build_and_match_literals, t_build_and_match_literals_large,
           %% instruction-level tests
           t_has_map_fields,
           y_regs,
-          badmap_17].
+          badmap_17,
+
+          %% Bugs
+          t_large_unequal_bins_same_hash_bug].
+
+init_per_suite(Config) ->
+    A0 = case application:start(sasl) of
+	     ok -> [sasl];
+	     _ -> []
+	 end,
+    A = case application:start(os_mon) of
+	     ok -> [os_mon|A0];
+	     _ -> A0
+	 end,
+    [{started_apps, A}|Config].
+
+end_per_suite(Config) ->
+    As = proplists:get_value(started_apps, Config),
+    lists:foreach(fun (A) -> application:stop(A) end, As),
+    Config.
 
 %% tests
 
@@ -3374,3 +3396,67 @@ fannerl() ->
       104,2,97,9,97,16,70,63,184,100,97,32,0,0,0,104,2,97,10,97,16,70,63,169,174,
       254,64,0,0,0,104,2,97,11,97,16,70,191,119,121,234,0,0,0,0,104,2,97,12,97,
       16,70,63,149,12,170,128,0,0,0,104,2,97,13,97,16,70,191,144,193,191,0,0,0,0>>.
+
+%% This test case checks that the bug with ticket number OTP-15707 is
+%% fixed. The bug could cause a crash or memory usage to grow until
+%% the machine ran out of memory.
+t_large_unequal_bins_same_hash_bug(Config) when is_list(Config) ->
+    run_when_enough_resources(
+      fun() ->
+              K1 = get_4GB_bin(1),
+              K2 = get_4GB_bin(2),
+              Map = make_map(500),
+              Map2 = maps:put(K1, 42, Map),
+              %% The map needed to contain at least 32 key-value pairs
+              %% at this point to get the crash or out of memory
+              %% problem on the next line
+              Map3 = maps:put(K2, 43, Map2),
+              %% The following line should avoid that the compiler
+              %% optimizes away the above
+              io:format("~p ~p~n", [erlang:phash2(Map3), maps:size(Map3)])
+      end).
+
+make_map(0) -> 
+    #{};
+make_map(Size) ->
+    maps:put(Size, Size, make_map(Size-1)).
+
+get_4GB_bin(Value) ->
+    List = lists:duplicate(65536, Value),
+    Bin = erlang:iolist_to_binary(List),
+    IOList4GB = duplicate_iolist(Bin, 16),
+    Bin4GB = erlang:iolist_to_binary(IOList4GB),
+    4294967296 = size(Bin4GB),
+    Bin4GB.
+
+duplicate_iolist(IOList, 0) ->
+    IOList;
+duplicate_iolist(IOList, NrOfTimes) ->
+    duplicate_iolist([IOList, IOList], NrOfTimes - 1).
+
+run_when_enough_resources(Fun) ->
+    case {total_memory(), erlang:system_info(wordsize)} of
+        {Mem, 8} when is_integer(Mem) andalso Mem >= 31 ->
+            Fun();
+        {Mem, WordSize} ->
+            {skipped, 
+             io_lib:format("Not enough resources (System Memory >= ~p, Word Size = ~p)",
+                           [Mem, WordSize])}
+    end.
+
+total_memory() ->
+    %% Total memory in GB.
+    try
+	MemoryData = memsup:get_system_memory_data(),
+	case lists:keysearch(total_memory, 1, MemoryData) of
+	    {value, {total_memory, TM}} ->
+		TM div (1024*1024*1024);
+	    false ->
+		{value, {system_total_memory, STM}} =
+		    lists:keysearch(system_total_memory, 1, MemoryData),
+		STM div (1024*1024*1024)
+	end
+    catch
+	_ : _ ->
+	    undefined
+    end.
diff --git a/erts/emulator/test/multi_load_SUITE.erl b/erts/emulator/test/multi_load_SUITE.erl
index edf3205812..c79e2b6dcd 100644
--- a/erts/emulator/test/multi_load_SUITE.erl
+++ b/erts/emulator/test/multi_load_SUITE.erl
@@ -30,7 +30,15 @@ all() ->
     [many,on_load,errors].
 
 many(_Config) ->
-    Ms = make_modules(100, fun many_module/1),
+
+    N = case erlang:system_info(build_type) of
+            valgrind ->
+                10;
+            _ ->
+                100
+        end,
+
+    Ms = make_modules(N, fun many_module/1),
 
     io:put_chars("Light load\n"
 		 "=========="),
diff --git a/erts/emulator/test/net_SUITE.erl b/erts/emulator/test/net_SUITE.erl
new file mode 100644
index 0000000000..c6e77a5373
--- /dev/null
+++ b/erts/emulator/test/net_SUITE.erl
@@ -0,0 +1,489 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2019-2019. 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 test suite is basically a "placeholder" for a proper test suite...
+%% Also we should really call prim_net directly, and not net (since that does
+%% not even reside here).
+%%
+
+%% Run the entire test suite: 
+%% ts:run(emulator, net_SUITE, [batch]).
+%%
+%% Run a specific group:
+%% ts:run(emulator, net_SUITE, {group, foo}, [batch]).
+%%
+%% Run a specific test case:
+%% ts:run(emulator, net_SUITE, foo, [batch]).
+
+-module(net_SUITE).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+%% Suite exports
+-export([suite/0, all/0, groups/0]).
+-export([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([
+         %% *** API Basic ***
+         api_b_gethostname/1,
+         api_b_name_and_addr_info/1,
+         
+         api_b_name_and_index/1
+
+         %% Tickets
+        ]).
+
+
+%% -include("socket_test_evaluator.hrl").
+
+%% Internal exports
+%% -export([]).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-define(SLEEP(T), receive after T -> ok end).
+
+-define(FAIL(R), exit(R)).
+
+-define(MINS(M), timer:minutes(M)).
+-define(SECS(S), timer:seconds(S)).
+
+-define(TT(T),   ct:timetrap(T)).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
+
+all() -> 
+    Groups = [{api, "ENET_TEST_API", include}],
+    [use_group(Group, Env, Default) || {Group, Env, Default} <- Groups].
+
+use_group(Group, Env, Default) ->
+	case os:getenv(Env) of
+	    false when (Default =:= include) ->
+		[{group, Group}];
+	    false ->
+		[];
+	    Val ->
+		case list_to_atom(string:to_lower(Val)) of
+		    Use when (Use =:= include) orelse 
+			     (Use =:= enable) orelse 
+			     (Use =:= true) ->
+			[{group, Group}];
+		    _ ->
+			[]
+		end
+	end.
+    
+
+groups() -> 
+    [{api,       [], api_cases()},
+     {api_basic, [], api_basic_cases()}
+
+     %% {tickets, [], ticket_cases()}
+    ].
+     
+api_cases() ->
+    [
+     {group, api_basic}
+    ].
+
+api_basic_cases() ->
+    [
+     api_b_gethostname,
+     api_b_name_and_addr_info,
+     api_b_name_and_index
+    ].
+
+%% ticket_cases() ->
+%%     [].
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+init_per_suite(Config) ->
+    %% We test on the socket module for simplicity
+    case lists:member(socket, erlang:loaded()) of
+        true ->
+            case os:type() of
+                {win32, _} ->
+                    not_yet_implemented();
+                _ ->
+                    %% ?LOGGER:start(),
+                    Config
+            end;
+        false ->
+            {skip, "esock disabled"}
+    end.
+
+end_per_suite(_) ->
+    %% ?LOGGER:stop(),
+    ok.
+
+init_per_group(_Group, Config) ->
+    Config.
+
+end_per_group(_Group, Config) ->
+    Config.
+
+
+init_per_testcase(_TC, Config) ->
+    Config.
+
+end_per_testcase(_TC, Config) ->
+    Config.
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                     %%
+%%                           API BASIC                                 %%
+%%                                                                     %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Get the hostname of the host.
+api_b_gethostname(suite) ->
+    [];
+api_b_gethostname(doc) ->
+    [];
+api_b_gethostname(_Config) when is_list(_Config) ->
+    ?TT(?SECS(5)),
+    tc_try(api_b_gethostname,
+           fun() ->
+                   ok = api_b_gethostname()
+           end).
+
+
+api_b_gethostname() ->
+    case net:gethostname() of
+        {ok, Hostname} ->
+            i("hostname: ~s", [Hostname]),
+            ok;
+        {error, Reason} ->
+            ?FAIL(Reason)
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Get name and address info.
+api_b_name_and_addr_info(suite) ->
+    [];
+api_b_name_and_addr_info(doc) ->
+    [];
+api_b_name_and_addr_info(_Config) when is_list(_Config) ->
+    ?TT(?SECS(5)),
+    tc_try(api_b_name_and_addr_info,
+           fun() ->
+                   ok = api_b_name_and_addr_info()
+           end).
+
+
+api_b_name_and_addr_info() ->
+    Domain = inet,
+    Addr   = which_local_addr(Domain),
+    SA     = #{family => Domain, addr => Addr},
+    Hostname =
+        case net:getnameinfo(SA) of
+            {ok, #{host := Name, service := Service} = NameInfo} 
+              when is_list(Name) andalso is_list(Service) ->
+                i("getnameinfo: "
+                  "~n   ~p", [NameInfo]),
+                Name;
+            {ok, BadNameInfo} ->
+                ?FAIL({getnameinfo, SA, BadNameInfo});
+            {error, Reason1} ->
+                ?FAIL({getnameinfo, SA, Reason1})
+        end,
+    case net:getaddrinfo(Hostname) of
+        {ok, AddrInfos} when is_list(AddrInfos) ->
+            i("getaddrinfo: "
+              "~n   ~p", [AddrInfos]),
+            verify_addr_info(AddrInfos, Domain);
+        {ok, BadAddrInfo} ->
+            ?FAIL({getaddrinfo, Hostname, BadAddrInfo});
+        {error, Reason2} ->
+            ?FAIL({getaddrinfo, Hostname, Reason2})
+    end.
+
+
+verify_addr_info(AddrInfos, Domain) when (AddrInfos =/= []) ->
+    verify_addr_info2(AddrInfos, Domain).
+    
+verify_addr_info2([], _Domain) ->
+    ok;
+verify_addr_info2([#{addr     := #{addr   := Addr,
+				   family := Domain,
+				   port   := Port},
+                     family   := Domain,
+                     type     := _Type,
+                     protocol := _Proto}|T], Domain) 
+  when is_integer(Port) andalso
+       (((Domain =:= inet) andalso is_tuple(Addr) andalso (size(Addr) =:= 4)) orelse
+        ((Domain =:= inet6) andalso is_tuple(Addr) andalso (size(Addr) =:= 8))) -> 
+    verify_addr_info2(T, Domain);
+verify_addr_info2([#{family := DomainA}|T], DomainB) 
+  when (DomainA =/= DomainB) ->
+    %% Ignore entries for other domains
+    verify_addr_info2(T, DomainB);
+verify_addr_info2([BadAddrInfo|_], Domain) ->
+    ?FAIL({bad_address_info, BadAddrInfo, Domain}).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Verify (interface) name and index functions.
+%% if_names/0,
+%% if_name2index/1
+%% if_index2name/1
+api_b_name_and_index(suite) ->
+    [];
+api_b_name_and_index(doc) ->
+    [];
+api_b_name_and_index(_Config) when is_list(_Config) ->
+    ?TT(?SECS(5)),
+    tc_try(api_b_name_and_index,
+           fun() ->
+                   ok = api_b_name_and_index()
+           end).
+
+
+api_b_name_and_index() ->
+    Names =
+        case net:if_names() of
+            {ok, N} when is_list(N) andalso (N =/= []) ->
+                N;
+            {error, Reason} ->
+                ?FAIL({if_names, Reason})
+        end,
+    verify_if_names(Names).
+
+verify_if_names([]) ->
+    ok;
+verify_if_names([{Index, Name}|T]) ->
+    case net:if_name2index(Name) of
+        {ok, Index} ->
+            ok;
+        {ok, BadIndex} ->
+            ?FAIL({name2index, Name, Index, BadIndex});
+        {error, ReasonN2I} ->
+            ?FAIL({name2index, Name, ReasonN2I})
+    end,
+    case net:if_index2name(Index) of
+        {ok, Name} ->
+            ok;
+        {ok, BadName} ->
+            ?FAIL({index2name, Index, Name, BadName});
+        {error, ReasonI2N} ->
+            ?FAIL({index2name, Index, ReasonI2N})
+    end,
+    verify_if_names(T).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% local_host() ->
+%%     try net_adm:localhost() of
+%%         Host when is_list(Host) ->
+%% 	    %% Convert to shortname if long
+%% 	    case string:tokens(Host, [$.]) of
+%% 		[H|_] ->
+%% 		    list_to_atom(H)
+%% 	    end
+%%     catch
+%%         C:E:S ->
+%%             erlang:raise(C, E, S)
+%%     end.
+
+
+%% This gets the local address (not 127.0...)
+%% We should really implement this using the (new) net module,
+%% but until that gets the necessary functionality...
+which_local_addr(Domain) ->
+    case inet:getifaddrs() of
+        {ok, IFL} ->
+            which_addr(Domain, IFL);
+        {error, Reason} ->
+            ?FAIL({inet, getifaddrs, Reason})
+    end.
+
+which_addr(_Domain, []) ->
+    skip(no_address);
+which_addr(Domain, [{"lo" ++ _, _}|IFL]) ->
+    which_addr(Domain, IFL);
+which_addr(Domain, [{_Name, IFO}|IFL]) ->
+    case which_addr2(Domain, IFO) of
+        {ok, Addr} ->
+            Addr;
+        {error, no_address} ->
+            which_addr(Domain, IFL)
+    end;
+which_addr(Domain, [_|IFL]) ->
+    which_addr(Domain, IFL).
+
+which_addr2(_Domain, []) ->
+    {error, no_address};
+which_addr2(inet = _Domain, [{addr, Addr}|_IFO]) when (size(Addr) =:= 4) ->
+    {ok, Addr};
+which_addr2(inet6 = _Domain, [{addr, Addr}|_IFO]) when (size(Addr) =:= 8) ->
+    {ok, Addr};
+which_addr2(Domain, [_|IFO]) ->
+    which_addr2(Domain, IFO).
+
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+not_yet_implemented() ->
+    skip("not yet implemented").
+
+skip(Reason) ->
+    throw({skip, Reason}).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% t() ->
+%%     os:timestamp().
+
+
+%% tdiff({A1, B1, C1} = _T1x, {A2, B2, C2} = _T2x) ->
+%%     T1 = A1*1000000000+B1*1000+(C1 div 1000), 
+%%     T2 = A2*1000000000+B2*1000+(C2 div 1000), 
+%%     T2 - T1.
+
+
+formated_timestamp() ->
+    format_timestamp(os:timestamp()).
+
+format_timestamp({_N1, _N2, _N3} = TS) ->
+    {_Date, Time}   = calendar:now_to_local_time(TS),
+    %% {YYYY,MM,DD}   = Date,
+    {Hour,Min,Sec} = Time,
+    %% FormatTS = 
+    %%     io_lib:format("~.4w-~.2.0w-~.2.0w ~.2.0w:~.2.0w:~.2.0w.~w",
+    %%                   [YYYY, MM, DD, Hour, Min, Sec, N3]),  
+    FormatTS = io_lib:format("~.2.0w:~.2.0w:~.2.0w", [Hour, Min, Sec]),  
+    lists:flatten(FormatTS).
+
+   
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+set_tc_name(N) when is_atom(N) ->
+    set_tc_name(atom_to_list(N));
+set_tc_name(N) when is_list(N) ->
+    put(tc_name, N).
+
+%% get_tc_name() ->
+%%     get(tc_name).
+
+tc_begin(TC) ->
+    set_tc_name(TC),
+    tc_print("begin ***",
+             "~n----------------------------------------------------~n", "").
+    
+tc_end(Result) when is_list(Result) ->
+    tc_print("done: ~s", [Result], 
+             "", "----------------------------------------------------~n~n"),
+    ok.
+
+
+tc_try(Case, Fun) when is_atom(Case) andalso is_function(Fun, 0) ->
+    tc_begin(Case),
+    try 
+        begin
+            Fun(),
+            ?SLEEP(?SECS(1)),
+            tc_end("ok")
+        end
+    catch
+        throw:{skip, _} = SKIP ->
+            tc_end("skipping"),
+            SKIP;
+        Class:Error:Stack ->
+            tc_end("failed"),
+            erlang:raise(Class, Error, Stack)
+    end.
+
+
+tc_print(F, Before, After) ->
+    tc_print(F, [], Before, After).
+
+tc_print(F, A, Before, After) ->
+    Name = tc_which_name(),
+    FStr = f("*** [~s][~s][~p] " ++ F ++ "~n", 
+             [formated_timestamp(),Name,self()|A]),
+    io:format(user, Before ++ FStr ++ After, []).
+
+tc_which_name() ->
+    case get(tc_name) of
+        undefined ->
+            case get(sname) of
+                undefined ->
+                    "";
+                SName when is_list(SName) ->
+                    SName
+            end;
+        Name when is_list(Name) ->
+            Name
+    end.
+    
+   
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% l2a(S) when is_list(S) ->
+%%     list_to_atom(S).
+
+%% l2b(L) when is_list(L) ->
+%%     list_to_binary(L).
+
+%% b2l(B) when is_binary(B) ->
+%%     binary_to_list(B).
+
+f(F, A) ->
+    lists:flatten(io_lib:format(F, A)).
+
+
+%% i(F) ->
+%%     i(F, []).
+
+i(F, A) ->
+    FStr = f("[~s] " ++ F, [formated_timestamp()|A]),
+    io:format(user, FStr ++ "~n", []),
+    io:format(FStr, []).
+
diff --git a/erts/emulator/test/nif_SUITE.erl b/erts/emulator/test/nif_SUITE.erl
index a2f3489943..b824daea67 100644
--- a/erts/emulator/test/nif_SUITE.erl
+++ b/erts/emulator/test/nif_SUITE.erl
@@ -28,6 +28,7 @@
 -include_lib("stdlib/include/assert.hrl").
 
 -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,
          basic/1, reload_error/1, upgrade/1, heap_frag/1,
@@ -64,7 +65,9 @@
          nif_phash2/1,
          nif_whereis/1, nif_whereis_parallel/1,
          nif_whereis_threaded/1, nif_whereis_proxy/1,
-         nif_ioq/1
+         nif_ioq/1,
+         pid/1,
+         nif_term_type/1
 	]).
 
 -export([many_args_100/100]).
@@ -103,7 +106,17 @@ all() ->
      nif_internal_hash_salted,
      nif_phash2,
      nif_whereis, nif_whereis_parallel, nif_whereis_threaded,
-     nif_ioq].
+     nif_ioq,
+     pid,
+     nif_term_type].
+
+init_per_suite(Config) ->
+    erts_debug:set_internal_state(available_internal_state, true),
+    Config.
+
+end_per_suite(_Config) ->
+    catch erts_debug:set_internal_state(available_internal_state, false),
+    ok.
 
 groups() ->
     [{G, [], api_repeaters()} || G <- api_groups()]
@@ -114,7 +127,6 @@ groups() ->
                     monitor_process_d,
                     demonitor_process]}].
 
-
 api_groups() -> [api_latest, api_2_4, api_2_0].
 
 api_repeaters() -> [upgrade, resource_takeover, t_on_load].
@@ -485,91 +497,118 @@ t_on_load(Config) when is_list(Config) ->
 -define(ERL_NIF_SELECT_READ, (1 bsl 0)).
 -define(ERL_NIF_SELECT_WRITE, (1 bsl 1)).
 -define(ERL_NIF_SELECT_STOP, (1 bsl 2)).
+-define(ERL_NIF_SELECT_CANCEL, (1 bsl 3)).
+-define(ERL_NIF_SELECT_CUSTOM_MSG, (1 bsl 4)).
 
 -define(ERL_NIF_SELECT_STOP_CALLED, (1 bsl 0)).
 -define(ERL_NIF_SELECT_STOP_SCHEDULED, (1 bsl 1)).
 -define(ERL_NIF_SELECT_INVALID_EVENT, (1 bsl 2)).
 -define(ERL_NIF_SELECT_FAILED, (1 bsl 3)).
-
+-define(ERL_NIF_SELECT_READ_CANCELLED, (1 bsl 4)).
+-define(ERL_NIF_SELECT_WRITE_CANCELLED, (1 bsl 5)).
 
 select(Config) when is_list(Config) ->
     ensure_lib_loaded(Config),
+    select_do(0, make_ref(), make_ref(), null),
+
+    RefBin = list_to_binary(lists:duplicate(100, $x)),
+    [select_do(?ERL_NIF_SELECT_CUSTOM_MSG,
+               small, {a, tuple, with, "some", RefBin}, MSG_ENV)
+     || MSG_ENV <- [null, alloc_env]],
+    ok.
+
+select_do(Flag, Ref, Ref2, MSG_ENV) ->
+    io:format("select_do(~p, ~p, ~p)\n", [Ref, Ref2, MSG_ENV]),
 
-    Ref = make_ref(),
-    Ref2 = make_ref(),
     {{R, R_ptr}, {W, W_ptr}} = pipe_nif(),
     ok = write_nif(W, <<"hej">>),
     <<"hej">> = read_nif(R, 3),
 
     %% Wait for read
     eagain = read_nif(R, 3),
-    0 = select_nif(R,?ERL_NIF_SELECT_READ,R,null,Ref),
+    0 = select_nif(R,?ERL_NIF_SELECT_READ bor Flag, R,null,Ref,MSG_ENV),
     [] = flush(0),
     ok = write_nif(W, <<"hej">>),
-    [{select, R, Ref, ready_input}] = flush(),
-    0 = select_nif(R,?ERL_NIF_SELECT_READ,R,self(),Ref2),
-    [{select, R, Ref2, ready_input}] = flush(),
+    receive_ready(R, Ref, ready_input),
+    0 = select_nif(R,?ERL_NIF_SELECT_READ bor Flag,R,self(),Ref2,MSG_ENV),
+    receive_ready(R, Ref2, ready_input),
     Papa = self(),
     Pid = spawn_link(fun() ->
-                             [{select, R, Ref, ready_input}] = flush(),
+                             receive_ready(R, Ref, ready_input),
                              Papa ! {self(), done}
                      end),
-    0 = select_nif(R,?ERL_NIF_SELECT_READ,R,Pid,Ref),
+    0 = select_nif(R, ?ERL_NIF_SELECT_READ bor Flag, R, Pid, Ref,MSG_ENV),
     {Pid, done} = receive_any(1000),
+
+    %% Cancel read
+    0 = select_nif(R,?ERL_NIF_SELECT_READ bor ?ERL_NIF_SELECT_CANCEL,R,null,Ref,null),
     <<"hej">> = read_nif(R, 3),
+    0 = select_nif(R, ?ERL_NIF_SELECT_READ bor Flag, R, null, Ref, MSG_ENV),
+    ?ERL_NIF_SELECT_READ_CANCELLED =
+        select_nif(R,?ERL_NIF_SELECT_READ bor ?ERL_NIF_SELECT_CANCEL,R,null,Ref,null),
+    ok = write_nif(W, <<"hej again">>),
+    [] = flush(0),
+    <<"hej again">> = read_nif(R, 9),
 
     %% Wait for write
     Written = write_full(W, $a),
-    0 = select_nif(W,?ERL_NIF_SELECT_WRITE,W,self(),Ref),
+    0 = select_nif(W, ?ERL_NIF_SELECT_WRITE bor Flag, W, self(), Ref, MSG_ENV),
     [] = flush(0),
     Written = read_nif(R,byte_size(Written)),
-    [{select, W, Ref, ready_output}] = flush(),
+    receive_ready(W, Ref, ready_output),
+
+    %% Cancel write
+    0 = select_nif(W, ?ERL_NIF_SELECT_WRITE bor ?ERL_NIF_SELECT_CANCEL, W, null, Ref, null),
+    Written2 = write_full(W, $b),
+    0 = select_nif(W, ?ERL_NIF_SELECT_WRITE bor Flag, W, null, Ref, MSG_ENV),
+    ?ERL_NIF_SELECT_WRITE_CANCELLED =
+        select_nif(W, ?ERL_NIF_SELECT_WRITE bor ?ERL_NIF_SELECT_CANCEL, W, null, Ref, null),
+    Written2 = read_nif(R,byte_size(Written2)),
+    [] = flush(0),
 
     %% Close write and wait for EOF
     eagain = read_nif(R, 1),
-    check_stop_ret(select_nif(W,?ERL_NIF_SELECT_STOP,W,null,Ref)),
+    check_stop_ret(select_nif(W, ?ERL_NIF_SELECT_STOP, W, null, Ref, null)),
     [{fd_resource_stop, W_ptr, _}] = flush(),
     {1, {W_ptr,_}} = last_fd_stop_call(),
     true = is_closed_nif(W),
     [] = flush(0),
-    0 = select_nif(R,?ERL_NIF_SELECT_READ,R,self(),Ref),
-    [{select, R, Ref, ready_input}] = flush(),
+    0 = select_nif(R, ?ERL_NIF_SELECT_READ bor Flag, R, self(), Ref, MSG_ENV),
+    receive_ready(R, Ref, ready_input),
     eof = read_nif(R,1),
 
-    check_stop_ret(select_nif(R,?ERL_NIF_SELECT_STOP,R,null,Ref)),
+    check_stop_ret(select_nif(R, ?ERL_NIF_SELECT_STOP, R, null, Ref, null)),
     [{fd_resource_stop, R_ptr, _}] = flush(),
     {1, {R_ptr,_}} = last_fd_stop_call(),
     true = is_closed_nif(R),
 
-    select_2(Config).
+    select_2(Flag, Ref, Ref2, MSG_ENV).
 
-select_2(Config) ->
+select_2(Flag, Ref1, Ref2, MSG_ENV) ->
     erlang:garbage_collect(),
     {_,_,2} = last_resource_dtor_call(),
 
-    Ref1 = make_ref(),
-    Ref2 = make_ref(),
     {{R, R_ptr}, {W, W_ptr}} = pipe_nif(),
 
     %% Change ref
     eagain = read_nif(R, 1),
-    0 = select_nif(R,?ERL_NIF_SELECT_READ,R,null,Ref1),
-    0 = select_nif(R,?ERL_NIF_SELECT_READ,R,self(),Ref2),
+    0 = select_nif(R, ?ERL_NIF_SELECT_READ bor Flag, R, null, Ref1, MSG_ENV),
+    0 = select_nif(R, ?ERL_NIF_SELECT_READ bor Flag, R, self(), Ref2, MSG_ENV),
 
     [] = flush(0),
     ok = write_nif(W, <<"hej">>),
-    [{select, R, Ref2, ready_input}] = flush(),
+    receive_ready(R, Ref2, ready_input),
     <<"hej">> = read_nif(R, 3),
 
     %% Change pid
     eagain = read_nif(R, 1),
-    0 = select_nif(R,?ERL_NIF_SELECT_READ,R,null,Ref1),
+    0 = select_nif(R, ?ERL_NIF_SELECT_READ bor Flag, R, null, Ref1, MSG_ENV),
     Papa = self(),
     spawn_link(fun() ->
-                       0 = select_nif(R,?ERL_NIF_SELECT_READ,R,null,Ref1),
+                       0 = select_nif(R, ?ERL_NIF_SELECT_READ bor Flag, R, null, Ref1, MSG_ENV),
                        [] = flush(0),
                        Papa ! sync,
-                       [{select, R, Ref1, ready_input}] = flush(),
+                       receive_ready(R, Ref1, ready_input),
                        <<"hej">> = read_nif(R, 3),
                        Papa ! done
                end),
@@ -578,24 +617,30 @@ select_2(Config) ->
     done = receive_any(),
     [] = flush(0),
 
-    check_stop_ret(select_nif(R,?ERL_NIF_SELECT_STOP,R,null,Ref1)),
+    check_stop_ret(select_nif(R,?ERL_NIF_SELECT_STOP,R,null,Ref1, null)),
     [{fd_resource_stop, R_ptr, _}] = flush(),
     {1, {R_ptr,_}} = last_fd_stop_call(),
     true = is_closed_nif(R),
 
     %% Stop without previous read/write select
-    ?ERL_NIF_SELECT_STOP_CALLED = select_nif(W,?ERL_NIF_SELECT_STOP,W,null,Ref1),
+    ?ERL_NIF_SELECT_STOP_CALLED = select_nif(W,?ERL_NIF_SELECT_STOP,W,null,Ref1,null),
     [{fd_resource_stop, W_ptr, 1}] = flush(),
     {1, {W_ptr,1}} = last_fd_stop_call(),
     true = is_closed_nif(W),
 
-    select_3(Config).
+    select_3().
 
-select_3(_Config) ->
+select_3() ->
     erlang:garbage_collect(),
     {_,_,2} = last_resource_dtor_call(),
     ok.
 
+receive_ready(R, Ref, IOatom) when is_reference(Ref) ->
+    [{select, R, Ref, IOatom}] = flush();
+receive_ready(_, Msg, _) ->
+    [Got] = flush(),
+    {true,_,_} = {Got=:=Msg, Got, Msg}.
+
 %% @doc The stealing child process for the select_steal test. Duplicates given
 %% W/RFds and runs select on them to steal
 select_steal_child_process(Parent, RFd) ->
@@ -604,7 +649,7 @@ select_steal_child_process(Parent, RFd) ->
     Ref2 = make_ref(),
 
     %% Try to select from the child pid (steal from parent)
-    ?assertEqual(0, select_nif(R2Fd, ?ERL_NIF_SELECT_READ, R2Fd, null, Ref2)),
+    ?assertEqual(0, select_nif(R2Fd, ?ERL_NIF_SELECT_READ, R2Fd, null, Ref2, null)),
     ?assertEqual([], flush(0)),
     ?assertEqual(eagain, read_nif(R2Fd, 1)),
 
@@ -612,7 +657,7 @@ select_steal_child_process(Parent, RFd) ->
     Parent ! {self(), stage1}, % signal parent to send the <<"stolen1">>
 
     %% Receive <<"stolen1">> via enif_select
-    ?assertEqual(0, select_nif(R2Fd, ?ERL_NIF_SELECT_READ, R2Fd, null, Ref2)),
+    ?assertEqual(0, select_nif(R2Fd, ?ERL_NIF_SELECT_READ, R2Fd, null, Ref2, null)),
     ?assertMatch([{select, R2Fd, Ref2, ready_input}], flush()),
     ?assertEqual(<<"stolen1">>, read_nif(R2Fd, 7)),
 
@@ -630,7 +675,7 @@ select_steal(Config) when is_list(Config) ->
     {{RFd, RPtr}, {WFd, WPtr}} = pipe_nif(),
 
     %% Bind the socket to current pid in enif_select
-    ?assertEqual(0, select_nif(RFd, ?ERL_NIF_SELECT_READ, RFd, null, Ref)),
+    ?assertEqual(0, select_nif(RFd, ?ERL_NIF_SELECT_READ, RFd, null, Ref, null)),
     ?assertEqual([], flush(0)),
 
     %% Spawn a process and do some stealing
@@ -644,15 +689,15 @@ select_steal(Config) when is_list(Config) ->
     ?assertMatch([{Pid, done}], flush(1)),  % synchronize with the child
 
     %% Try to select from the parent pid (steal back)
-    ?assertEqual(0, select_nif(RFd, ?ERL_NIF_SELECT_READ, RFd, Pid, Ref)),
+    ?assertEqual(0, select_nif(RFd, ?ERL_NIF_SELECT_READ, RFd, Pid, Ref, null)),
 
     %% Ensure that no data is hanging and close.
     %% Rfd is stolen at this point.
-    check_stop_ret(select_nif(WFd, ?ERL_NIF_SELECT_STOP, WFd, null, Ref)),
+    check_stop_ret(select_nif(WFd, ?ERL_NIF_SELECT_STOP, WFd, null, Ref, null)),
     ?assertMatch([{fd_resource_stop, WPtr, _}], flush()),
     {1, {WPtr, 1}} = last_fd_stop_call(),
 
-    check_stop_ret(select_nif(RFd, ?ERL_NIF_SELECT_STOP, RFd, null, Ref)),
+    check_stop_ret(select_nif(RFd, ?ERL_NIF_SELECT_STOP, RFd, null, Ref, null)),
     ?assertMatch([{fd_resource_stop, RPtr, _}], flush()),
     {1, {RPtr, _DirectCall}} = last_fd_stop_call(),
 
@@ -789,8 +834,11 @@ demonitor_process(Config) ->
                      end),
     R_ptr = alloc_monitor_resource_nif(),
     {0,MonBin1} = monitor_process_nif(R_ptr, Pid, true, self()),
+    MonTerm1 = make_monitor_term_nif(MonBin1),
     [R_ptr] = monitored_by(Pid),
     {0,MonBin2} = monitor_process_nif(R_ptr, Pid, true, self()),
+    MonTerm2 = make_monitor_term_nif(MonBin2),
+    true = (MonTerm1 =/= MonTerm2),
     [R_ptr, R_ptr] = monitored_by(Pid),
     0 = demonitor_process_nif(R_ptr, MonBin1),
     [R_ptr] = monitored_by(Pid),
@@ -804,6 +852,10 @@ demonitor_process(Config) ->
     {R_ptr, _, 1} = last_resource_dtor_call(),
     [] = monitored_by(Pid),
     Pid ! return,
+
+    erlang:garbage_collect(),
+    true = (MonTerm1 =/= MonTerm2),
+    io:format("MonTerm1 = ~p\nMonTerm2 = ~p\n", [MonTerm1, MonTerm2]),
     ok.
 
 
@@ -1175,6 +1227,15 @@ maps(Config) when is_list(Config) ->
     M2 = maps_from_list_nif(maps:to_list(M2)),
     M3 = maps_from_list_nif(maps:to_list(M3)),
 
+    %% Test different map sizes (OTP-15567)
+    repeat_while(fun({35,_}) -> false;
+                    ({K,Map}) ->
+                         Map = maps_from_list_nif(maps:to_list(Map)),
+                         Map = maps:filter(fun(K2,V) -> V =:= K2*100 end, Map),
+                         {K+1, maps:put(K,K*100,Map)}
+                 end,
+                 {1,#{}}),
+
     has_duplicate_keys = maps_from_list_nif([{1,1},{1,1}]),
 
     verify_tmpmem(TmpMem),
@@ -1241,24 +1302,29 @@ resource_hugo_do(Type) ->
     release_resource(HugoPtr),
     erlang:garbage_collect(),
     {HugoPtr,HugoBin} = get_resource(Type,Hugo),
-    Pid = spawn_link(fun() -> 			     
-                             receive {Pid, Type, Resource, Ptr, Bin} ->
-                                         Pid ! {self(), got_it},
-                                         receive {Pid, check_it} ->
-                                                     {Ptr,Bin} = get_resource(Type,Resource),
-                                                     Pid ! {self(), ok}
-                                         end
-                             end
-                     end),
+    {Pid,_} =
+        spawn_monitor(fun() ->
+                              receive {Pid, Type, Resource, Ptr, Bin} ->
+                                      Pid ! {self(), got_it},
+                                      receive {Pid, check_it} ->
+                                              {Ptr,Bin} = get_resource(Type,Resource)
+                                      end
+                              end,
+                              gc_and_exit(ok)
+                      end),
     Pid ! {self(), Type, Hugo, HugoPtr, HugoBin},
     {Pid, got_it} = receive_any(),
     erlang:garbage_collect(),   % just to make our ProcBin move in memory
     Pid ! {self(), check_it},
-    {Pid, ok} = receive_any(),
+    {'DOWN', _, process, Pid, ok} = receive_any(),
     [] = last_resource_dtor_call(),
     {HugoPtr,HugoBin} = get_resource(Type,Hugo),
     {HugoPtr, HugoBin, 1}.
 
+gc_and_exit(Reason) ->
+    erlang:garbage_collect(),
+    exit(Reason).
+
 resource_otto(Type) ->
     {OttoPtr, OttoBin} = resource_otto_do(Type),
     erlang:garbage_collect(),
@@ -1335,14 +1401,14 @@ resource_binary_do() ->
     ResInfo = {Ptr,_} = get_resource(binary_resource_type,ResBin1),
 
     Papa = self(),
-    Forwarder = spawn_link(fun() -> forwarder(Papa) end),
+    {Forwarder,_} = spawn_monitor(fun() -> forwarder(Papa) end),
     io:format("sending to forwarder pid=~p\n",[Forwarder]),  
     Forwarder ! ResBin1,
     ResBin2 = receive_any(),
     ResBin2 = ResBin1,
     ResInfo = get_resource(binary_resource_type,ResBin2),
     Forwarder ! terminate,
-    {Forwarder, 1} = receive_any(),
+    {'DOWN', _, process, Forwarder, 1} = receive_any(),
     erlang:garbage_collect(),
     ResInfo = get_resource(binary_resource_type,ResBin1),
     ResInfo = get_resource(binary_resource_type,ResBin2),
@@ -1702,6 +1768,7 @@ read_resource(Type, {Holder,Id}) ->
 forget_resource({Holder,Id}) ->
     Holder ! {self(), forget, Id},
     {Holder, forget_ok, Id} = receive_any(),
+    erts_debug:set_internal_state(wait, aux_work),
     ok.
 
 
@@ -1862,11 +1929,11 @@ send2_do1(SendBlobF) ->
     send2_do2(SendBlobF, self()),
 
     Papa = self(),
-    Forwarder = spawn_link(fun() -> forwarder(Papa) end),
+    {Forwarder,_} = spawn_monitor(fun() -> forwarder(Papa) end),
     io:format("sending to forwarder pid=~p\n",[Forwarder]),
     send2_do2(SendBlobF, Forwarder),
     Forwarder ! terminate,
-    {Forwarder, 4} = receive_any(),
+    {'DOWN', _, process, Forwarder, 4} = receive_any(),
     ok.
 
 send2_do2(SendBlobF, To) ->   
@@ -1922,7 +1989,7 @@ forwarder(To) ->
 forwarder(To, N) ->
     case receive_any() of
 	terminate ->
-	    To ! {self(), N};
+            gc_and_exit(N);
 	Msg ->	    
 	    To ! Msg,	   
 	    forwarder(To, N+1)
@@ -2471,6 +2538,13 @@ repeat(0, _, Arg) ->
 repeat(N, Fun, Arg0) ->
     repeat(N-1, Fun, Fun(Arg0)).
 
+repeat_while(Fun, Acc0) ->
+    case Fun(Acc0) of
+        false -> ok;
+        Acc1 ->
+            repeat_while(Fun, Acc1)
+    end.
+
 check(Exp,Got,Line) ->
     case Got of
  	Exp -> Exp;	    
@@ -3040,22 +3114,31 @@ nif_whereis_threaded(Config) when is_list(Config) ->
     RegName = nif_whereis_test_threaded,
     undefined = erlang:whereis(RegName),
 
-    Ref = make_ref(),
-    {Pid, Mon} = spawn_monitor(?MODULE, nif_whereis_proxy, [Ref]),
-    true = register(RegName, Pid),
+    Self = self(),
+    true = register(RegName, Self),
 
-    {ok, ProcThr} = whereis_thd_lookup(pid, RegName),
-    {ok, Pid} = whereis_thd_result(ProcThr),
+    {ok, ProcThr} = whereis_thd_lookup(pid, RegName, "dtor to proc"),
+    {ok, Self} = whereis_thd_result(ProcThr),
 
-    Pid ! {Ref, quit},
-    ok = receive {'DOWN', Mon, process, Pid, normal} -> ok end,
+    nif_whereis_threaded_2(RegName).
+
+nif_whereis_threaded_2(RegName) ->
+    erlang:garbage_collect(),
+    "dtor to proc" = receive_any(1000),
+    true = unregister(RegName),
 
     Port = open_port({spawn, echo_drv}, [eof]),
     true = register(RegName, Port),
 
-    {ok, PortThr} = whereis_thd_lookup(port, RegName),
+    {ok, PortThr} = whereis_thd_lookup(port, RegName, "dtor to port"),
     {ok, Port} = whereis_thd_result(PortThr),
 
+    nif_whereis_threaded_3(Port).
+
+nif_whereis_threaded_3(Port) ->
+    erlang:garbage_collect(),
+    {Port, {data, "dtor to port"}} = receive_any(1000),
+
     port_close(Port),
     ok.
 
@@ -3311,6 +3394,69 @@ make_unaligned_binary(Bin0) ->
     <<0:3,Bin:Size/binary,31:5>> = id(<<0:3,Bin0/binary,31:5>>),
     Bin.
 
+pid(Config) ->
+    ensure_lib_loaded(Config),
+    Self = self(),
+    {true, ErlNifPid} = get_local_pid_nif(Self),
+    false = is_pid_undefined_nif(ErlNifPid),
+    Self = make_pid_nif(ErlNifPid),
+
+    UndefPid = set_pid_undefined_nif(),
+    true = is_pid_undefined_nif(UndefPid),
+    undefined = make_pid_nif(UndefPid),
+    0 = send_term(UndefPid, message),
+
+    Other = spawn(fun() -> ok end),
+    {true,OtherNifPid} = get_local_pid_nif(Other),
+    Cmp = compare_pids_nif(ErlNifPid, OtherNifPid),
+    true = if Cmp < 0 -> Self < Other;
+              Cmp > 0 -> Self > Other
+           end,
+    0 = compare_pids_nif(ErlNifPid, ErlNifPid),
+
+    {false, _} = get_local_pid_nif(undefined),
+    ok.
+
+nif_term_type(Config) ->
+    ensure_lib_loaded(Config),
+
+    atom = term_type_nif(atom),
+
+    bitstring = term_type_nif(<<1:1>>),
+    bitstring = term_type_nif(<<1:8>>),
+
+    float = term_type_nif(0.0),
+
+    'fun' = term_type_nif(fun external:function/1),
+    'fun' = term_type_nif(fun(A) -> A end),
+    'fun' = term_type_nif(fun id/1),
+
+    integer = term_type_nif(1 bsl 1024),        %Bignum.
+    integer = term_type_nif(1),
+
+    list = term_type_nif([list]),
+    list = term_type_nif([]),
+
+    LargeMap = maps:from_list([{N, N} || N <- lists:seq(1, 256)]),
+    map = term_type_nif(LargeMap),
+    map = term_type_nif(#{ small => map }),
+
+    pid = term_type_nif(self()),
+
+    Port = open_port({spawn,echo_drv},[eof]),
+    port = term_type_nif(Port),
+    port_close(Port),
+
+    reference = term_type_nif(make_ref()),
+
+    tuple = term_type_nif({}),
+
+    ok.
+
+last_resource_dtor_call() ->
+    erts_debug:set_internal_state(wait, aux_work),
+    last_resource_dtor_call_nif().
+
 id(I) -> I.
 
 %% The NIFs:
@@ -3338,7 +3484,7 @@ make_resource(_) -> ?nif_stub.
 get_resource(_,_) -> ?nif_stub.
 release_resource(_) -> ?nif_stub.
 release_resource_from_thread(_) -> ?nif_stub.
-last_resource_dtor_call() -> ?nif_stub.
+last_resource_dtor_call_nif() -> ?nif_stub.
 make_new_resource(_,_) -> ?nif_stub.
 check_is(_,_,_,_,_,_,_,_,_,_,_) -> ?nif_stub.
 check_is_exception() -> ?nif_stub.
@@ -3376,7 +3522,7 @@ term_to_binary_nif(_, _) -> ?nif_stub.
 binary_to_term_nif(_, _, _) -> ?nif_stub.
 port_command_nif(_, _) -> ?nif_stub.
 format_term_nif(_,_) -> ?nif_stub.
-select_nif(_,_,_,_,_) -> ?nif_stub.
+select_nif(_,_,_,_,_,_) -> ?nif_stub.
 dupe_resource_nif(_) -> ?nif_stub.
 pipe_nif() -> ?nif_stub.
 write_nif(_,_) -> ?nif_stub.
@@ -3388,6 +3534,7 @@ alloc_monitor_resource_nif() -> ?nif_stub.
 monitor_process_nif(_,_,_,_) -> ?nif_stub.
 demonitor_process_nif(_,_) -> ?nif_stub.
 compare_monitors_nif(_,_) -> ?nif_stub.
+make_monitor_term_nif(_) -> ?nif_stub.
 monitor_frenzy_nif(_,_,_,_) -> ?nif_stub.
 ioq_nif(_) -> ?nif_stub.
 ioq_nif(_,_) -> ?nif_stub.
@@ -3397,7 +3544,7 @@ ioq_nif(_,_,_,_) -> ?nif_stub.
 %% whereis
 whereis_send(_Type,_Name,_Msg) -> ?nif_stub.
 whereis_term(_Type,_Name) -> ?nif_stub.
-whereis_thd_lookup(_Type,_Name) -> ?nif_stub.
+whereis_thd_lookup(_Type,_Name, _Msg) -> ?nif_stub.
 whereis_thd_result(_Thd) -> ?nif_stub.
 
 %% maps
@@ -3418,5 +3565,13 @@ convert_time_unit(_,_,_) -> ?nif_stub.
 now_time() -> ?nif_stub.
 cpu_time() -> ?nif_stub.
 
+get_local_pid_nif(_) -> ?nif_stub.
+make_pid_nif(_) -> ?nif_stub.
+set_pid_undefined_nif() -> ?nif_stub.
+is_pid_undefined_nif(_) -> ?nif_stub.
+compare_pids_nif(_, _) -> ?nif_stub.
+
+term_type_nif(_) -> ?nif_stub.
+
 nif_stub_error(Line) ->
     exit({nif_not_loaded,module,?MODULE,line,Line}).
diff --git a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
index f2ce6dbe67..ff47cfe500 100644
--- a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
+++ b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
@@ -27,6 +27,7 @@
 #ifndef __WIN32__
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/uio.h>
 #endif
 
 #include "nif_mod.h"
@@ -707,28 +708,23 @@ static ERL_NIF_TERM tuple_2_list(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar
 
 static ERL_NIF_TERM is_identical(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {    
-    if (argc != 2) {
-	return enif_make_badarg(env);
-    }
+    assert(argc == 2);
     return enif_make_atom(env, (enif_is_identical(argv[0],argv[1]) ?
 				"true" : "false"));
 }
 
 static ERL_NIF_TERM compare(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {    
-    if (argc != 2) {
-	return enif_make_badarg(env);
-    }
+    assert(argc == 2);
     return enif_make_int(env, enif_compare(argv[0],argv[1]));
 }
 
 static ERL_NIF_TERM hash_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
-    if (argc != 3) {
-        return enif_make_badarg(env);
-    }
-
     ErlNifHash type;
+    ErlNifUInt64 salt;
+
+    assert(argc == 3);
     if (enif_is_identical(argv[0], enif_make_atom(env, "internal"))) {
         type = ERL_NIF_INTERNAL_HASH;
     }
@@ -739,7 +735,6 @@ static ERL_NIF_TERM hash_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]
         return enif_make_badarg(env);
     }
 
-    ErlNifUInt64 salt;
     if (! enif_get_uint64(env, argv[2], &salt)) {
         return enif_make_badarg(env);
     }
@@ -866,7 +861,7 @@ static ERL_NIF_TERM iolist_2_bin(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar
     return enif_make_binary(env,&obin);
 }
 
-static ERL_NIF_TERM last_resource_dtor_call(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+static ERL_NIF_TERM last_resource_dtor_call_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
     ERL_NIF_TERM ret;
     if (resource_dtor_last != NULL) {
@@ -1010,6 +1005,7 @@ static ERL_NIF_TERM release_resource(ErlNifEnv* env, int argc, const ERL_NIF_TER
 static void* threaded_release_resource(void* resource)
 {
     enif_release_resource(resource);
+    return NULL;
 }
 
 static ERL_NIF_TERM release_resource_from_thread(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
@@ -1201,7 +1197,6 @@ static void fill(void* dst, unsigned bytes, int seed)
 enum {
     /* results */
     WHEREIS_SUCCESS,
-    WHEREIS_ERROR_TYPE,
     WHEREIS_ERROR_LOOKUP,
     WHEREIS_ERROR_SEND,
     /* types */
@@ -1221,6 +1216,8 @@ typedef struct {
     whereis_term_data_t res;
     ErlNifTid tid;
     int type;
+    int rc;
+    ERL_NIF_TERM dtor_msg;
 } whereis_thread_resource_t;
 
 static whereis_thread_resource_t* whereis_thread_resource_create(void)
@@ -1233,21 +1230,35 @@ static whereis_thread_resource_t* whereis_thread_resource_create(void)
     return rp;
 }
 
+static int whereis_lookup_internal(ErlNifEnv*, int type, ERL_NIF_TERM name,
+                                   whereis_term_data_t* out);
+static int whereis_send_internal(ErlNifEnv*, int type, whereis_term_data_t* to,
+                                 ERL_NIF_TERM msg);
+
+
 static void whereis_thread_resource_dtor(ErlNifEnv* env, void* obj)
 {
     whereis_thread_resource_t* rp = (whereis_thread_resource_t*) obj;
+    whereis_term_data_t to;
+
+    if (whereis_lookup_internal(env, rp->type, rp->name, &to)
+        == WHEREIS_SUCCESS) {
+        whereis_send_internal(env, rp->type, &to, rp->dtor_msg);
+    }
     enif_free_env(rp->env);
 }
 
-static int whereis_type(ERL_NIF_TERM type)
+static int whereis_type(ERL_NIF_TERM type_term, int* type_p)
 {
-    if (enif_is_identical(type, atom_pid))
-        return WHEREIS_LOOKUP_PID;
-
-    if (enif_is_identical(type, atom_port))
-        return WHEREIS_LOOKUP_PORT;
-
-    return WHEREIS_ERROR_TYPE;
+    if (enif_is_identical(type_term, atom_pid)) {
+        *type_p = WHEREIS_LOOKUP_PID;
+        return 1;
+    }
+    if (enif_is_identical(type_term, atom_port)) {
+        *type_p = WHEREIS_LOOKUP_PORT;
+        return 1;
+    }
+    return 0;
 }
 
 static int whereis_lookup_internal(
@@ -1261,7 +1272,7 @@ static int whereis_lookup_internal(
         return enif_whereis_port(env, name, & out->port)
             ? WHEREIS_SUCCESS : WHEREIS_ERROR_LOOKUP;
 
-    return WHEREIS_ERROR_TYPE;
+    abort();
 }
 
 static int whereis_send_internal(
@@ -1275,23 +1286,20 @@ static int whereis_send_internal(
         return enif_port_command(env, & to->port, NULL, msg)
             ? WHEREIS_SUCCESS : WHEREIS_ERROR_SEND;
 
-    return WHEREIS_ERROR_TYPE;
+    abort();
 }
 
-static int whereis_resolved_term(
-    ErlNifEnv* env, int type, whereis_term_data_t* res, ERL_NIF_TERM* out)
+static ERL_NIF_TERM whereis_resolved_term(
+    ErlNifEnv* env, int type, whereis_term_data_t* res)
 {
     switch (type) {
         case WHEREIS_LOOKUP_PID:
-            *out = enif_make_pid(env, & res->pid);
-            break;
+            return enif_make_pid(env, &res->pid);
         case WHEREIS_LOOKUP_PORT:
-            *out = enif_make_port(env, & res->port);
-            break;
+            return enif_make_port(env, &res->port);
         default:
-            return WHEREIS_ERROR_TYPE;
+            abort();
     }
-    return WHEREIS_SUCCESS;
 }
 
 static ERL_NIF_TERM whereis_result_term(ErlNifEnv* env, int result)
@@ -1307,9 +1315,6 @@ static ERL_NIF_TERM whereis_result_term(ErlNifEnv* env, int result)
         case WHEREIS_ERROR_SEND:
             err = atom_send;
             break;
-        case WHEREIS_ERROR_TYPE:
-            err = atom_badarg;
-            break;
         default:
             err = enif_make_int(env, -result);
             break;
@@ -1320,14 +1325,10 @@ static ERL_NIF_TERM whereis_result_term(ErlNifEnv* env, int result)
 static void* whereis_lookup_thread(void* arg)
 {
     whereis_thread_resource_t* rp = (whereis_thread_resource_t*) arg;
-    int rc;
 
-    /* enif_whereis_xxx should work with allocated or null env */
-    rc = whereis_lookup_internal(
-        ((rp->type == WHEREIS_LOOKUP_PID) ? NULL : rp->env),
-        rp->type, rp->name, & rp->res);
+    rp->rc = whereis_lookup_internal(NULL, rp->type, rp->name, &rp->res);
 
-    return (((char*) NULL) + rc);
+    return NULL;
 }
 
 /* whereis_term(Type, Name) -> pid() | port() | false */
@@ -1335,20 +1336,16 @@ static ERL_NIF_TERM
 whereis_term(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
     whereis_term_data_t res;
-    ERL_NIF_TERM ret;
     int type, rc;
 
-    if (argc != 2)  /* allow non-atom name for testing */
-        return enif_make_badarg(env);
-
-    if ((type = whereis_type(argv[0])) == WHEREIS_ERROR_TYPE)
+    assert(argc == 2);
+    if (!whereis_type(argv[0], &type))
         return enif_make_badarg(env);
 
     rc = whereis_lookup_internal(env, type, argv[1], & res);
-    if (rc == WHEREIS_SUCCESS) {
-        rc = whereis_resolved_term(env, type, & res, & ret);
-    }
-    return (rc == WHEREIS_SUCCESS) ? ret : atom_false;
+    return (rc == WHEREIS_SUCCESS ?
+            whereis_resolved_term(env, type, &res) :
+            atom_false);
 }
 
 /* whereis_send(Type, Name, Message) -> ok | {error, Reason} */
@@ -1358,10 +1355,11 @@ whereis_send(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
     whereis_term_data_t to;
     int type, rc;
 
-    if (argc != 3 || !enif_is_atom(env, argv[1]))
+    assert(argc == 3);
+    if (!enif_is_atom(env, argv[1]))
         return enif_make_badarg(env);
 
-    if ((type = whereis_type(argv[0])) == WHEREIS_ERROR_TYPE)
+    if (!whereis_type(argv[0], &type))
         return enif_make_badarg(env);
 
     rc = whereis_lookup_internal(env, type, argv[1], & to);
@@ -1371,33 +1369,35 @@ whereis_send(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
     return whereis_result_term(env, rc);
 }
 
-/* whereis_thd_lookup(Type, Name) -> {ok, Resource} | {error, SysErrno} */
+/* whereis_thd_lookup(Type, Name, DtorMsg) -> {ok, Resource} | {error, SysErrno} */
 static ERL_NIF_TERM
 whereis_thd_lookup(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
     whereis_thread_resource_t* rp;
     int type, rc;
+    ERL_NIF_TERM ret;
 
-    if (argc != 2 || !enif_is_atom(env, argv[1]))
+    assert(argc == 3);
+    if (!enif_is_atom(env, argv[1]))
         return enif_make_badarg(env);
 
-    if ((type = whereis_type(argv[0])) == WHEREIS_ERROR_TYPE)
+    if (!whereis_type(argv[0], &type))
         return enif_make_badarg(env);
 
     rp = whereis_thread_resource_create();
     rp->type = type;
     rp->name = enif_make_copy(rp->env, argv[1]);
+    rp->dtor_msg = enif_make_copy(rp->env, argv[2]);
 
     rc = enif_thread_create(
         "nif_SUITE:whereis_thd", & rp->tid, whereis_lookup_thread, rp, NULL);
 
-    if (rc == 0) {
-        return enif_make_tuple2(env, atom_ok, enif_make_resource(env, rp));
-    }
-    else {
-        enif_release_resource(rp);
-        return enif_make_tuple2(env, atom_error, enif_make_int(env, rc));
-    }
+    if (rc == 0)
+        ret = enif_make_tuple2(env, atom_ok, enif_make_resource(env, rp));
+    else
+        ret = enif_make_tuple2(env, atom_error, enif_make_int(env, rc));
+    enif_release_resource(rp);
+    return ret;
 }
 
 /* whereis_thd_result(Resource) -> {ok, pid() | port()} | {error, ErrNum} */
@@ -1406,24 +1406,22 @@ whereis_thd_result(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
     whereis_thread_resource_t* rp;
     ERL_NIF_TERM ret;
-    char* thdret; /* so we can keep compilers happy converting to int */
-    int rc;
+    int join_rc;
 
-    if (argc != 1
-    || !enif_get_resource(env, argv[0], whereis_resource_type, (void**) & rp))
+    assert(argc == 1);
+    if (!enif_get_resource(env, argv[0], whereis_resource_type, (void**) & rp))
         return enif_make_badarg(env);
 
-    if ((rc = enif_thread_join(rp->tid, (void**) & thdret)) != 0)
-        return enif_make_tuple2(env, atom_error, enif_make_int(env, rc));
+    if ((join_rc = enif_thread_join(rp->tid, NULL)) != 0)
+        return enif_make_tuple2(env, atom_error, enif_make_int(env, join_rc));
     
-    rc = (int)(thdret - ((char*) NULL));
-    if (rc == WHEREIS_SUCCESS) {
-        rc = whereis_resolved_term(env, rp->type, & rp->res, & ret);
+    if (rp->rc == WHEREIS_SUCCESS) {
+        ret = enif_make_tuple2(env, atom_ok,
+                               whereis_resolved_term(env, rp->type, &rp->res));
     }
-    ret = (rc == WHEREIS_SUCCESS)
-        ? enif_make_tuple2(env, atom_ok, ret) : whereis_result_term(env, rc);
+    else
+        ret = whereis_result_term(env, rp->rc);
     
-    enif_release_resource(rp);
     return ret;
 }
 
@@ -1882,12 +1880,23 @@ static ERL_NIF_TERM copy_blob(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[
     return enif_make_copy(env, mti.p->blob);
 }
 
+static int get_pidbin(ErlNifEnv* env, ERL_NIF_TERM pidbin, ErlNifPid* pid)
+{
+    ErlNifBinary bin;
+
+    if (!enif_inspect_binary(env, pidbin, &bin) || bin.size != sizeof(ErlNifPid))
+        return 0;
+
+    memcpy(pid, bin.data, bin.size);
+    return 1;
+}
+
 static ERL_NIF_TERM send_term(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
     ErlNifEnv* menv;
     ErlNifPid pid;
     int ret;
-    if (!enif_get_local_pid(env, argv[0], &pid)) {
+    if (!enif_get_local_pid(env, argv[0], &pid) && !get_pidbin(env, argv[0], &pid)) {
 	return enif_make_badarg(env);
     }
     menv = enif_alloc_env();
@@ -1996,8 +2005,7 @@ static ERL_NIF_TERM nif_sched1(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv
 static ERL_NIF_TERM call_nif_schedule(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
     ERL_NIF_TERM result;
-    if (argc != 2)
-	return enif_make_atom(env, "false");
+    assert(argc == 2);
     result = enif_schedule_nif(env, "nif_sched1", 0, nif_sched1, argc, argv);
     assert(!enif_is_exception(env, result));
     return result;
@@ -2144,7 +2152,8 @@ static ERL_NIF_TERM maps_from_list_nif(ErlNifEnv* env, int argc, const ERL_NIF_T
     ERL_NIF_TERM result, cell;
     unsigned count;
 
-    if (argc != 1 || !enif_get_list_length(env, argv[0], &count)) {
+    assert(argc == 1);
+    if (!enif_get_list_length(env, argv[0], &count)) {
         return enif_make_badarg(env);
     }
 
@@ -2191,7 +2200,8 @@ static ERL_NIF_TERM sorted_list_from_maps_nif(ErlNifEnv* env, int argc, const ER
     ErlNifMapIterator iter_b;
     int cnt, next_ret, prev_ret;
 
-    if (argc != 1 && !enif_is_map(env, map))
+    assert(argc == 1);
+    if (!enif_is_map(env, map))
 	return enif_make_int(env, __LINE__);
 
     if(!enif_map_iterator_create(env, map, &iter_f, ERL_NIF_MAP_ITERATOR_FIRST))
@@ -2252,9 +2262,7 @@ static ERL_NIF_TERM monotonic_time(ErlNifEnv* env, int argc, const ERL_NIF_TERM
 {
     ErlNifTimeUnit time_unit;
 
-    if (argc != 1)
-	return atom_false;
-
+    assert(argc == 1);
     if (enif_compare(argv[0], atom_second) == 0)
 	time_unit = ERL_NIF_SEC;
     else if (enif_compare(argv[0], atom_millisecond) == 0)
@@ -2273,9 +2281,7 @@ static ERL_NIF_TERM time_offset(ErlNifEnv* env, int argc, const ERL_NIF_TERM arg
 {
     ErlNifTimeUnit time_unit;
 
-    if (argc != 1)
-	return atom_false;
-
+    assert(argc == 1);
     if (enif_compare(argv[0], atom_second) == 0)
 	time_unit = ERL_NIF_SEC;
     else if (enif_compare(argv[0], atom_millisecond) == 0)
@@ -2295,9 +2301,7 @@ static ERL_NIF_TERM convert_time_unit(ErlNifEnv* env, int argc, const ERL_NIF_TE
     ErlNifTime val;
     ErlNifTimeUnit from, to;
 
-    if (argc != 3)
-	return atom_false;
-
+    assert(argc == 3);
     if (!enif_get_int64(env, argv[0], &i64))
 	return enif_make_badarg(env);
 
@@ -2486,7 +2490,8 @@ static ERL_NIF_TERM select_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv
     enum ErlNifSelectFlags mode;
     void* obj;
     ErlNifPid nifpid, *pid = NULL;
-    ERL_NIF_TERM ref;
+    ERL_NIF_TERM ref_or_msg;
+    ErlNifEnv* msg_env = NULL;
     int retval;
 
     if (!get_fd(env, argv[0], &fdr)
@@ -2501,11 +2506,27 @@ static ERL_NIF_TERM select_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv
 	    return enif_make_badarg(env);
 	pid = &nifpid;
     }
-    ref = argv[4];
+    ref_or_msg = argv[4];
+    if (argv[5] != atom_null) {
+        msg_env = enif_alloc_env();
+        ref_or_msg = enif_make_copy(msg_env, ref_or_msg);
+    }
 
     fdr->was_selected = 1;
     enif_self(env, &fdr->pid);
-    retval = enif_select(env, fdr->fd, mode, obj, pid, ref);
+    switch (mode) {
+    case ERL_NIF_SELECT_CUSTOM_MSG | ERL_NIF_SELECT_READ:
+        retval = enif_select_read(env, fdr->fd, obj, pid, ref_or_msg, msg_env);
+        break;
+    case ERL_NIF_SELECT_CUSTOM_MSG | ERL_NIF_SELECT_WRITE:
+        retval = enif_select_write(env, fdr->fd, obj, pid, ref_or_msg, msg_env);
+        break;
+    default:
+        retval = enif_select(env, fdr->fd, mode, obj, pid, ref_or_msg);
+    }
+
+    if (msg_env)
+        enif_free_env(msg_env);
 
     return enif_make_int(env, retval);
 }
@@ -2830,6 +2851,16 @@ static ERL_NIF_TERM compare_monitors_nif(ErlNifEnv* env, int argc, const ERL_NIF
     return enif_make_int(env, enif_compare_monitors(&m1, &m2));
 }
 
+static ERL_NIF_TERM make_monitor_term_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    ErlNifMonitor m;
+    if (!get_monitor(env, argv[0], &m)) {
+        return enif_make_badarg(env);
+    }
+
+    return enif_make_monitor_term(env, &m);
+}
+
 
 /*********** monitor_frenzy ************/
 
@@ -3281,7 +3312,7 @@ static int writeiovec(ErlNifEnv *env, ERL_NIF_TERM term, ERL_NIF_TERM *tail, Erl
     }
 
     /* Attempt to write the data */
-    n = writev(fd, sysiovec, iovcnt);
+    n = writev(fd, (struct iovec*)sysiovec, iovcnt);
     saved_errno = errno;
 
     if (enif_ioq_size(q) == 0) {
@@ -3355,10 +3386,11 @@ static ERL_NIF_TERM ioq(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 
         if (enif_is_identical(argv[0], enif_make_atom(env, "example"))) {
 #ifndef __WIN32__
-            int fd[2], res = 0, cnt = 0, queue_cnt;
+            int fd[2], res = 0, cnt = 0;
             ERL_NIF_TERM tail;
             char buff[255];
-            pipe(fd);
+            res = pipe(fd);
+            assert(res == 0);
             fcntl(fd[0], F_SETFL, fcntl(fd[0], F_GETFL) | O_NONBLOCK);
             fcntl(fd[1], F_SETFL, fcntl(fd[1], F_GETFL) | O_NONBLOCK);
 
@@ -3486,6 +3518,95 @@ static ERL_NIF_TERM ioq(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
     return enif_make_badarg(env);
 }
 
+static ERL_NIF_TERM make_bool(ErlNifEnv* env, int bool)
+{
+    return bool ? atom_true : atom_false;
+}
+
+static ERL_NIF_TERM get_local_pid_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    ErlNifPid pid;
+    ERL_NIF_TERM pid_bin;
+    int ret = enif_get_local_pid(env, argv[0], &pid);
+
+    memcpy(enif_make_new_binary(env, sizeof(ErlNifPid), &pid_bin),
+           &pid, sizeof(ErlNifPid));
+
+    return enif_make_tuple2(env, make_bool(env, ret), pid_bin);
+}
+
+static ERL_NIF_TERM make_pid_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    ErlNifPid pid;
+
+    if (!get_pidbin(env, argv[0], &pid))
+        return enif_make_badarg(env);
+
+    return enif_make_pid(env, &pid);
+}
+
+static ERL_NIF_TERM set_pid_undefined_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    ErlNifPid pid;
+    ERL_NIF_TERM pid_bin;
+
+    enif_set_pid_undefined(&pid);
+    memcpy(enif_make_new_binary(env, sizeof(ErlNifPid), &pid_bin),
+           &pid, sizeof(ErlNifPid));
+
+    return pid_bin;
+}
+
+static ERL_NIF_TERM is_pid_undefined_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    ErlNifPid pid;
+
+    if (!get_pidbin(env, argv[0], &pid))
+        return enif_make_badarg(env);
+
+    return make_bool(env, enif_is_pid_undefined(&pid));
+}
+
+static ERL_NIF_TERM compare_pids_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    ErlNifPid a, b;
+
+    if (!get_pidbin(env, argv[0], &a) || !get_pidbin(env, argv[1], &b))
+        return enif_make_badarg(env);
+
+    return enif_make_int(env, enif_compare_pids(&a, &b));
+}
+
+static ERL_NIF_TERM term_type_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    switch (enif_term_type(env, argv[0])) {
+    case ERL_NIF_TERM_TYPE_ATOM:
+        return enif_make_atom(env, "atom");
+    case ERL_NIF_TERM_TYPE_BITSTRING:
+        return enif_make_atom(env, "bitstring");
+    case ERL_NIF_TERM_TYPE_FLOAT:
+        return enif_make_atom(env, "float");
+    case ERL_NIF_TERM_TYPE_FUN:
+        return enif_make_atom(env, "fun");
+    case ERL_NIF_TERM_TYPE_INTEGER:
+        return enif_make_atom(env, "integer");
+    case ERL_NIF_TERM_TYPE_LIST:
+        return enif_make_atom(env, "list");
+    case ERL_NIF_TERM_TYPE_MAP:
+        return enif_make_atom(env, "map");
+    case ERL_NIF_TERM_TYPE_PID:
+        return enif_make_atom(env, "pid");
+    case ERL_NIF_TERM_TYPE_PORT:
+        return enif_make_atom(env, "port");
+    case ERL_NIF_TERM_TYPE_REFERENCE:
+        return enif_make_atom(env, "reference");
+    case ERL_NIF_TERM_TYPE_TUPLE:
+        return enif_make_atom(env, "tuple");
+    default:
+        return enif_make_badarg(env);
+    }
+}
+
 static ErlNifFunc nif_funcs[] =
 {
     {"lib_version", 0, lib_version},
@@ -3512,7 +3633,7 @@ static ErlNifFunc nif_funcs[] =
     {"get_resource", 2, get_resource},
     {"release_resource", 1, release_resource},
     {"release_resource_from_thread", 1, release_resource_from_thread},
-    {"last_resource_dtor_call", 0, last_resource_dtor_call},
+    {"last_resource_dtor_call_nif", 0, last_resource_dtor_call_nif},
     {"make_new_resource", 2, make_new_resource},
     {"check_is", 11, check_is},
     {"check_is_exception", 0, check_is_exception},
@@ -3565,7 +3686,7 @@ static ErlNifFunc nif_funcs[] =
     {"binary_to_term_nif", 3, binary_to_term},
     {"port_command_nif", 2, port_command},
     {"format_term_nif", 2, format_term},
-    {"select_nif", 5, select_nif},
+    {"select_nif", 6, select_nif},
 #ifndef __WIN32__
     {"pipe_nif", 0, pipe_nif},
     {"write_nif", 2, write_nif},
@@ -3579,15 +3700,22 @@ static ErlNifFunc nif_funcs[] =
     {"monitor_process_nif", 4, monitor_process_nif},
     {"demonitor_process_nif", 2, demonitor_process_nif},
     {"compare_monitors_nif", 2, compare_monitors_nif},
+    {"make_monitor_term_nif", 1, make_monitor_term_nif},
     {"monitor_frenzy_nif", 4, monitor_frenzy_nif},
     {"whereis_send", 3, whereis_send},
     {"whereis_term", 2, whereis_term},
-    {"whereis_thd_lookup", 2, whereis_thd_lookup},
+    {"whereis_thd_lookup", 3, whereis_thd_lookup},
     {"whereis_thd_result", 1, whereis_thd_result},
     {"ioq_nif", 1, ioq},
     {"ioq_nif", 2, ioq},
     {"ioq_nif", 3, ioq},
-    {"ioq_nif", 4, ioq}
+    {"ioq_nif", 4, ioq},
+    {"get_local_pid_nif", 1, get_local_pid_nif},
+    {"make_pid_nif", 1, make_pid_nif},
+    {"set_pid_undefined_nif", 0, set_pid_undefined_nif},
+    {"is_pid_undefined_nif", 1, is_pid_undefined_nif},
+    {"compare_pids_nif", 2, compare_pids_nif},
+    {"term_type_nif", 1, term_type_nif}
 };
 
 ERL_NIF_INIT(nif_SUITE,nif_funcs,load,NULL,upgrade,unload)
diff --git a/erts/emulator/test/node_container_SUITE.erl b/erts/emulator/test/node_container_SUITE.erl
index 300b4ed036..c44693f8d9 100644
--- a/erts/emulator/test/node_container_SUITE.erl
+++ b/erts/emulator/test/node_container_SUITE.erl
@@ -51,7 +51,8 @@
          unique_pid/1,
          iter_max_procs/1,
          magic_ref/1,
-         dist_entry_gc/1]).
+         dist_entry_gc/1,
+         persistent_term/1]).
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
@@ -63,7 +64,8 @@ all() ->
      node_table_gc, dist_link_refc, dist_monitor_refc,
      node_controller_refc, ets_refc, match_spec_refc,
      timer_refc, pid_wrap, port_wrap, bad_nc,
-     unique_pid, iter_max_procs, magic_ref].
+     unique_pid, iter_max_procs,
+     magic_ref, persistent_term].
 
 init_per_suite(Config) ->
     Config.
@@ -71,25 +73,10 @@ init_per_suite(Config) ->
 end_per_suite(_Config) ->
     erts_debug:set_internal_state(available_internal_state, true),
     erts_debug:set_internal_state(node_tab_delayed_delete, -1), %% restore original value
-    available_internal_state(false).
-
-available_internal_state(Bool) when Bool == true; Bool == false ->
-    case {Bool,
-          (catch erts_debug:get_internal_state(available_internal_state))} of
-        {true, true} ->
-            true;
-        {false, true} ->
-            erts_debug:set_internal_state(available_internal_state, false),
-            true;
-        {true, _} ->
-            erts_debug:set_internal_state(available_internal_state, true),
-            false;
-        {false, _} ->
-            false
-    end.
+    erts_test_utils:available_internal_state(false).
 
 init_per_testcase(_Case, Config) when is_list(Config) ->
-    available_internal_state(true),
+    erts_test_utils:available_internal_state(true),
     Config.
 
 end_per_testcase(_Case, Config) when is_list(Config) ->
@@ -585,7 +572,17 @@ node_controller_refc(Config) when is_list(Config) ->
     wait_until(fun () -> not is_process_alive(P) end),
     lists:foreach(fun (Proc) -> garbage_collect(Proc) end, processes()),
     false = get_node_references({Node,Creation}),
-    false = get_dist_references(Node),
+    wait_until(fun () ->
+                       case get_dist_references(Node) of
+                           false ->
+                               true;
+                           [{{system,thread_progress_delete_timer},
+                             [{system,1}]}] ->
+                               false;
+                           Other ->
+                               ct:fail(Other)
+                       end
+               end),
     false = lists:member(Node, nodes(known)),
     nc_refc_check(node()),
     erts_debug:set_internal_state(node_tab_delayed_delete, -1), %% restore original value
@@ -886,7 +883,22 @@ magic_ref(Config) when is_list(Config) ->
 	{'DOWN', Mon, process, Pid, _} ->
 	    ok
     end,
-    {Addr0, 2, true} = erts_debug:get_internal_state({magic_ref,MRef0}),
+    MaxTime = erlang:monotonic_time(millisecond) + 1000,
+    %% The DOWN signal is sent before heap is cleaned up,
+    %% so we might need to wait some time after the DOWN
+    %% signal has been received before the heap actually
+    %% has been cleaned up...
+    wait_until(fun () ->
+                       case erts_debug:get_internal_state({magic_ref,MRef0}) of
+                           {Addr0, 2, true} ->
+                               true;
+                           {Addr0, 3, true} ->
+                               true = MaxTime >= erlang:monotonic_time(millisecond),
+                               false;
+                           Error ->
+                               ct:fail(Error)
+                       end
+               end),
     id(MRef0),
     id(MRef1),
     MRefExt = term_to_binary(erts_debug:set_internal_state(make, magic_ref)),
@@ -896,6 +908,44 @@ magic_ref(Config) when is_list(Config) ->
     true = erts_debug:get_internal_state({magic_ref,MRef2}),
     ok.
 
+persistent_term(Config) when is_list(Config) ->
+    {ok, Node} = start_node(get_nodefirstname()),
+    Self = self(),
+    NcData = make_ref(),
+    RPid = spawn_link(Node,
+                      fun () ->
+                              Self ! {NcData, self(), hd(erlang:ports()), erlang:make_ref()}
+                      end),
+    Data = receive
+               {NcData, RPid, RPort, RRef} ->
+                   {RPid, RPort, RRef}
+           end,
+    unlink(RPid),
+    stop_node(Node),
+    Stuff = lists:foldl(fun (N, Acc) ->
+                                persistent_term:put({?MODULE, N}, Data),
+                                persistent_term:erase({?MODULE, N-1}),
+                                node_container_refc_check(node()),
+                                Data = persistent_term:get({?MODULE, N}),
+                                try
+                                    persistent_term:get({?MODULE, N-1})
+                                catch
+                                    error:badarg ->
+                                        ok
+                                end,
+                                case N rem 4 of
+                                    0 -> [persistent_term:get({?MODULE, N})|Acc];
+                                    _ -> Acc
+                                end
+                        end,
+                        [],
+                        lists:seq(1, 100)),
+    persistent_term:erase({?MODULE, 100}),
+    receive after 2000 -> ok end, %% give literal gc some time to run...
+    node_container_refc_check(node()),
+    id(Stuff),
+    ok.
+
 
 lost_pending_connection(Node) ->
     _ = (catch erts_internal:new_connection(Node)),
@@ -928,9 +978,9 @@ id(X) ->
 -define(ND_REFS, erts_debug:get_internal_state(node_and_dist_references)).
 
 node_container_refc_check(Node) when is_atom(Node) ->
-    AIS = available_internal_state(true),
+    AIS = erts_test_utils:available_internal_state(true),
     nc_refc_check(Node),
-    available_internal_state(AIS).
+    erts_test_utils:available_internal_state(AIS).
 
 nc_refc_check(Node) when is_atom(Node) ->
     Ref = make_ref(),
@@ -938,15 +988,11 @@ nc_refc_check(Node) when is_atom(Node) ->
     io:format("Starting reference count check of node ~w~n", [Node]),
     spawn_link(Node,
                fun () ->
-                       {{node_references, NodeRefs},
-                        {dist_references, DistRefs}} = ?ND_REFS,
-                       check_nd_refc({node(), erlang:system_info(creation)},
-                                     NodeRefs,
-                                     DistRefs,
-                                     fun (ErrMsg) ->
-                                             Self ! {Ref, ErrMsg, failed},
-                                             exit(normal)
-                                     end),
+                       erts_test_utils:check_node_dist(
+                         fun (ErrMsg) ->
+                                 Self ! {Ref, ErrMsg, failed},
+                                 exit(normal)
+                         end),
                        Self ! {Ref, succeded}
                end),
     receive
@@ -958,98 +1004,26 @@ nc_refc_check(Node) when is_atom(Node) ->
             ok
     end.
 
-check_nd_refc({ThisNodeName, ThisCreation}, NodeRefs, DistRefs, Fail) ->
-    case catch begin
-                   check_refc(ThisNodeName,ThisCreation,"node table",NodeRefs),
-                   check_refc(ThisNodeName,ThisCreation,"dist table",DistRefs),
-                   ok
-               end of
-        ok ->
-            ok;
-        {'EXIT', Reason} ->
-            {Y,Mo,D} = date(),
-            {H,Mi,S} = time(),
-            ErrMsg = io_lib:format("~n"
-                                   "*** Reference count check of node ~w "
-                                   "failed (~p) at ~w~w~w ~w:~w:~w~n"
-                                   "*** Node table references:~n ~p~n"
-                                   "*** Dist table references:~n ~p~n",
-                                   [node(), Reason, Y, Mo, D, H, Mi, S,
-                                    NodeRefs, DistRefs]),
-            Fail(lists:flatten(ErrMsg))
-    end.
-
-
-check_refc(ThisNodeName,ThisCreation,Table,EntryList) when is_list(EntryList) ->
-    lists:foreach(
-      fun ({Entry, Refc, ReferrerList}) ->
-              {DelayedDeleteTimer,
-               FoundRefs} =
-              lists:foldl(
-                fun ({Referrer, ReferencesList}, {DDT, A1}) ->
-                        {case Referrer of
-                             {system,delayed_delete_timer} ->
-                                 true;
-                             {system,thread_progress_delete_timer} ->
-                                 true;
-                             _ ->
-                                 DDT
-                         end,
-                         A1 + lists:foldl(fun ({_T,Rs},A2) ->
-                                                  A2+Rs
-                                          end,
-                                          0,
-                                          ReferencesList)}
-                end,
-                {false, 0},
-                ReferrerList),
-
-              %% Reference count equals found references?
-              case {Refc, FoundRefs, DelayedDeleteTimer} of
-                  {X, X, _} ->
-                      ok;
-                  {0, 1, true} ->
-                      ok;
-                  _ ->
-                      exit({invalid_reference_count, Table, Entry})
-              end,
-
-              %% All entries in table referred to?
-              case {Entry, Refc} of
-                  {ThisNodeName, 0} -> ok;
-                  {{ThisNodeName, ThisCreation}, 0} -> ok;
-                  {_, 0} when DelayedDeleteTimer == false ->
-                      exit({not_referred_entry_in_table, Table, Entry});
-                  {_, _} -> ok 
-              end
-
-      end,
-      EntryList),
-    ok.
-
 get_node_references({NodeName, Creation} = Node) when is_atom(NodeName),
                                                       is_integer(Creation) ->
     {{node_references, NodeRefs},
      {dist_references, DistRefs}} = ?ND_REFS,
-    check_nd_refc({node(), erlang:system_info(creation)},
-                  NodeRefs,
-                  DistRefs,
-                  fun (ErrMsg) ->
-                          io:format("~s", [ErrMsg]),
-                          ct:fail(reference_count_check_failed)
-                  end),
+    erts_test_utils:check_node_dist(
+      fun (ErrMsg) ->
+              io:format("~s", [ErrMsg]),
+              ct:fail(reference_count_check_failed)
+      end,
+      NodeRefs, DistRefs),
     find_references(Node, NodeRefs).
 
 get_dist_references(NodeName) when is_atom(NodeName) ->
     {{node_references, NodeRefs},
      {dist_references, DistRefs}} = ?ND_REFS,
-    check_nd_refc({node(), erlang:system_info(creation)},
-                  NodeRefs,
-                  DistRefs,
-                  fun (ErrMsg) ->
-                          io:format("~s", [ErrMsg]),
-                          ct:fail(reference_count_check_failed)
-                  end),
+    erts_test_utils:check_node_dist(fun (ErrMsg) ->
+                                            io:format("~s", [ErrMsg]),
+                                            ct:fail(reference_count_check_failed)
+                                    end,
+                                    NodeRefs, DistRefs),
     find_references(NodeName, DistRefs).
 
 find_references(N, NRefList) ->
@@ -1138,133 +1112,15 @@ get_nodename() ->
                  ++ "@"
                  ++ hostname()).
 
-
-
--define(VERSION_MAGIC,       131).
-
--define(ATOM_EXT,            100).
--define(REFERENCE_EXT,       101).
--define(PORT_EXT,            102).
--define(PID_EXT,             103).
--define(NEW_REFERENCE_EXT,   114).
--define(NEW_PID_EXT,         $X).
--define(NEW_PORT_EXT,        $Y).
--define(NEWER_REFERENCE_EXT, $Z).
-
-uint32_be(Uint) when is_integer(Uint), 0 =< Uint, Uint < 1 bsl 32 ->
-    [(Uint bsr 24) band 16#ff,
-     (Uint bsr 16) band 16#ff,
-     (Uint bsr 8) band 16#ff,
-     Uint band 16#ff];
-uint32_be(Uint) ->
-    exit({badarg, uint32_be, [Uint]}).
-
-
-uint16_be(Uint) when is_integer(Uint), 0 =< Uint, Uint < 1 bsl 16 ->
-    [(Uint bsr 8) band 16#ff,
-     Uint band 16#ff];
-uint16_be(Uint) ->
-    exit({badarg, uint16_be, [Uint]}).
-
-uint8(Uint) when is_integer(Uint), 0 =< Uint, Uint < 1 bsl 8 ->
-    Uint band 16#ff;
-uint8(Uint) ->
-    exit({badarg, uint8, [Uint]}).
-
-
-pid_tag(bad_creation) -> ?PID_EXT;
-pid_tag(Creation) when Creation =< 3 -> ?PID_EXT;
-pid_tag(_Creation) -> ?NEW_PID_EXT.
-
-enc_creation(bad_creation) -> uint8(4);
-enc_creation(Creation) when Creation =< 3 -> uint8(Creation);
-enc_creation(Creation) -> uint32_be(Creation).
-
-mk_pid({NodeName, Creation}, Number, Serial) when is_atom(NodeName) ->
-    mk_pid({atom_to_list(NodeName), Creation}, Number, Serial);
 mk_pid({NodeName, Creation}, Number, Serial) ->
-    case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
-					      pid_tag(Creation),
-					      ?ATOM_EXT,
-					      uint16_be(length(NodeName)),
-					      NodeName,
-					      uint32_be(Number),
-					      uint32_be(Serial),
-					      enc_creation(Creation)])) of
-	Pid when is_pid(Pid) ->
-	    Pid;
-	{'EXIT', {badarg, _}} ->
-	    exit({badarg, mk_pid, [{NodeName, Creation}, Number, Serial]});
-	Other ->
-	    exit({unexpected_binary_to_term_result, Other})
-    end.
+    erts_test_utils:mk_ext_pid({NodeName, Creation}, Number, Serial).
 
-port_tag(bad_creation) -> ?PORT_EXT;
-port_tag(Creation) when Creation =< 3 -> ?PORT_EXT;
-port_tag(_Creation) -> ?NEW_PORT_EXT.
-
-mk_port({NodeName, Creation}, Number) when is_atom(NodeName) ->
-    mk_port({atom_to_list(NodeName), Creation}, Number);
 mk_port({NodeName, Creation}, Number) ->
-    case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
-					      port_tag(Creation),
-					      ?ATOM_EXT,
-					      uint16_be(length(NodeName)),
-					      NodeName,
-					      uint32_be(Number),
-					      enc_creation(Creation)])) of
-	Port when is_port(Port) ->
-	    Port;
-	{'EXIT', {badarg, _}} ->
-	    exit({badarg, mk_port, [{NodeName, Creation}, Number]});
-	Other ->
-	    exit({unexpected_binary_to_term_result, Other})
-    end.
+    erts_test_utils:mk_ext_port({NodeName, Creation}, Number).
+
+mk_ref({NodeName, Creation}, Numbers) ->
+    erts_test_utils:mk_ext_ref({NodeName, Creation}, Numbers).
 
-ref_tag(bad_creation) -> ?NEW_REFERENCE_EXT;
-ref_tag(Creation) when Creation =< 3 -> ?NEW_REFERENCE_EXT;
-ref_tag(_Creation) -> ?NEWER_REFERENCE_EXT.
-
-mk_ref({NodeName, Creation}, Numbers) when is_atom(NodeName),
-					   is_list(Numbers) ->
-    mk_ref({atom_to_list(NodeName), Creation}, Numbers);
-mk_ref({NodeName, Creation}, [Number]) when is_list(NodeName),
-					    Creation =< 3,
-					    is_integer(Number) ->
-    case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
-                                              ?REFERENCE_EXT,
-                                              ?ATOM_EXT,
-                                              uint16_be(length(NodeName)),
-                                              NodeName,
-                                              uint32_be(Number),
-                                              uint8(Creation)])) of
-        Ref when is_reference(Ref) ->
-            Ref;
-        {'EXIT', {badarg, _}} ->
-            exit({badarg, mk_ref, [{NodeName, Creation}, [Number]]});
-        Other ->
-            exit({unexpected_binary_to_term_result, Other})
-    end;
-mk_ref({NodeName, Creation}, Numbers) when is_list(NodeName),
-					   is_list(Numbers) ->
-    case catch binary_to_term(list_to_binary([?VERSION_MAGIC,
-					      ref_tag(Creation),
-					      uint16_be(length(Numbers)),
-					      ?ATOM_EXT,
-					      uint16_be(length(NodeName)),
-					      NodeName,
-					      enc_creation(Creation),
-					      lists:map(fun (N) ->
-								uint32_be(N)
-							end,
-							Numbers)])) of
-	Ref when is_reference(Ref) ->
-	    Ref;
-	{'EXIT', {badarg, _}} ->
-	    exit({badarg, mk_ref, [{NodeName, Creation}, Numbers]});
-	Other ->
-	    exit({unexpected_binary_to_term_result, Other})
-    end.
 
 exec_loop() ->
     receive
diff --git a/erts/emulator/test/num_bif_SUITE.erl b/erts/emulator/test/num_bif_SUITE.erl
index f15217814a..6b834705cf 100644
--- a/erts/emulator/test/num_bif_SUITE.erl
+++ b/erts/emulator/test/num_bif_SUITE.erl
@@ -504,6 +504,10 @@ t_integer_to_string(Config) when is_list(Config) ->
     test_its("A", 10, 16),
     test_its("D4BE", 54462, 16),
     test_its("-D4BE", -54462, 16),
+    test_its("FFFFFFFFFF", 1099511627775, 16),
+    test_its("123456789ABCDEF123456789ABCDEF123456789ABCDEF",
+             108977460683796539709587792812439445667270661579197935,
+             16),
 
     lists:foreach(fun(Value) ->
 			  {'EXIT', {badarg, _}} =
@@ -515,12 +519,14 @@ t_integer_to_string(Config) when is_list(Config) ->
     ok.
 
 test_its(List,Int) ->
-    Int = list_to_integer(List),
-    Int = binary_to_integer(list_to_binary(List)).
+    List = integer_to_list(Int),
+    Binary = list_to_binary(List),
+    Binary = integer_to_binary(Int).
 
 test_its(List,Int,Base) ->
-    Int = list_to_integer(List, Base),
-    Int = binary_to_integer(list_to_binary(List), Base).
+    List = integer_to_list(Int, Base),
+    Binary = list_to_binary(List),
+    Binary = integer_to_binary(Int, Base).
 
 %% Tests binary_to_integer/1.
 
diff --git a/erts/emulator/test/persistent_term_SUITE.erl b/erts/emulator/test/persistent_term_SUITE.erl
index 58cd3276b0..c9874e5679 100644
--- a/erts/emulator/test/persistent_term_SUITE.erl
+++ b/erts/emulator/test/persistent_term_SUITE.erl
@@ -6,7 +6,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
-%5
+%%
 %%     http://www.apache.org/licenses/LICENSE-2.0
 %%
 %% Unless required by applicable law or agreed to in writing, software
@@ -21,11 +21,13 @@
 -module(persistent_term_SUITE).
 -include_lib("common_test/include/ct.hrl").
 
--export([all/0,suite/0,
+-export([all/0,suite/0,init_per_suite/1,end_per_suite/1,
 	 basic/1,purging/1,sharing/1,get_trapping/1,
          info/1,info_trapping/1,killed_while_trapping/1,
          off_heap_values/1,keys/1,collisions/1,
-         init_restart/1]).
+         init_restart/1, put_erase_trapping/1,
+         killed_while_trapping_put/1,
+         killed_while_trapping_erase/1]).
 
 %%
 -export([test_init_restart_cmd/1]).
@@ -37,41 +39,53 @@ suite() ->
 all() ->
     [basic,purging,sharing,get_trapping,info,info_trapping,
      killed_while_trapping,off_heap_values,keys,collisions,
-     init_restart].
+     init_restart, put_erase_trapping, killed_while_trapping_put,
+     killed_while_trapping_erase].
+
+init_per_suite(Config) ->
+    %% Put a term in the dict so that we know that the testcases handle
+    %% stray terms left by stdlib or other test suites.
+    persistent_term:put(init_per_suite, {?MODULE}),
+    Config.
+
+end_per_suite(Config) ->
+    persistent_term:erase(init_per_suite),
+    Config.
 
 basic(_Config) ->
     Chk = chk(),
     N = 777,
     Seq = lists:seq(1, N),
-    par(2, N, Seq),
-    seq(3, Seq),
-    seq(3, Seq),                                %Same values.
+    par(2, N, Seq, Chk),
+    seq(3, Seq, Chk),
+    seq(3, Seq, Chk),                                %Same values.
     _ = [begin
              Key = {?MODULE,{key,I}},
              true = persistent_term:erase(Key),
              false = persistent_term:erase(Key),
-             {'EXIT',{badarg,_}} = (catch persistent_term:get(Key))
+             {'EXIT',{badarg,_}} = (catch persistent_term:get(Key)),
+             {not_present,Key} = persistent_term:get(Key, {not_present,Key})
          end || I <- Seq],
-    [] = [P || {{?MODULE,_},_}=P <- persistent_term:get()],
+    [] = [P || {{?MODULE,_},_}=P <- pget(Chk)],
     chk(Chk).
 
-par(C, N, Seq) ->
+par(C, N, Seq, Chk) ->
     _ = [spawn_link(fun() ->
                             ok = persistent_term:put({?MODULE,{key,I}},
                                                      {value,C*I})
                     end) || I <- Seq],
-    Result = wait(N),
+    Result = wait(N, Chk),
     _ = [begin
              Double = C*I,
              {{?MODULE,{key,I}},{value,Double}} = Res
          end || {I,Res} <- lists:zip(Seq, Result)],
     ok.
 
-seq(C, Seq) ->
+seq(C, Seq, Chk) ->
     _ = [ok = persistent_term:put({?MODULE,{key,I}}, {value,C*I}) ||
             I <- Seq],
-    All = persistent_term:get(),
-    All = [P || {{?MODULE,_},_}=P <- persistent_term:get()],
+    All = pget(Chk),
+    All = [P || {{?MODULE,_},_}=P <- All],
     All = [{Key,persistent_term:get(Key)} || {Key,_} <- All],
     Result = lists:sort(All),
     _ = [begin
@@ -80,15 +94,15 @@ seq(C, Seq) ->
          end || {I,Res} <- lists:zip(Seq, Result)],
     ok.
 
-wait(N) ->
-    All = [P || {{?MODULE,_},_}=P <- persistent_term:get()],
+wait(N, Chk) ->
+    All = [P || {{?MODULE,_},_}=P <- pget(Chk)],
     case length(All) of
         N ->
             All = [{Key,persistent_term:get(Key)} || {Key,_} <- All],
             lists:sort(All);
         _ ->
             receive after 10 -> ok end,
-            wait(N)
+            wait(N, Chk)
     end.
 
 %% Make sure that terms that have been erased are copied into all
@@ -200,23 +214,23 @@ get_trapping(_Config) ->
             _ -> 1000
         end,
     spawn_link(fun() -> get_trapping_create(N) end),
-    All = do_get_trapping(N, []),
+    All = do_get_trapping(N, [], Chk),
     N = get_trapping_check_result(lists:sort(All), 1),
     erlang:garbage_collect(),
     get_trapping_erase(N),
     chk(Chk).
 
-do_get_trapping(N, Prev) ->
-    case persistent_term:get() of
+do_get_trapping(N, Prev, Chk) ->
+    case pget(Chk) of
         Prev when length(Prev) >= N ->
             All = [P || {{?MODULE,{get_trapping,_}},_}=P <- Prev],
             case length(All) of
                 N -> All;
-                _ -> do_get_trapping(N, Prev)
+                _ -> do_get_trapping(N, Prev, Chk)
             end;
         New ->
             receive after 1 -> ok end,
-            do_get_trapping(N, New)
+            do_get_trapping(N, New, Chk)
     end.
 
 get_trapping_create(0) ->
@@ -331,25 +345,25 @@ info_trapping(_Config) ->
             _ -> 1000
         end,
     spawn_link(fun() -> info_trapping_create(N) end),
-    All = do_info_trapping(N, 0),
+    All = do_info_trapping(N, 0, Chk),
     N = info_trapping_check_result(lists:sort(All), 1),
     erlang:garbage_collect(),
     info_trapping_erase(N),
     chk(Chk).
 
-do_info_trapping(N, PrevMem) ->
+do_info_trapping(N, PrevMem, Chk) ->
     case info_info() of
-        {N,Mem} ->
+        {M,Mem} when M >= N ->
             true = Mem >= PrevMem,
-            All = [P || {{?MODULE,{info_trapping,_}},_}=P <- persistent_term:get()],
+            All = [P || {{?MODULE,{info_trapping,_}},_}=P <- pget(Chk)],
             case length(All) of
                 N -> All;
-                _ -> do_info_trapping(N, PrevMem)
+                _ -> do_info_trapping(N, PrevMem, Chk)
             end;
         {_,Mem} ->
             true = Mem >= PrevMem,
             receive after 1 -> ok end,
-            do_info_trapping(N, Mem)
+            do_info_trapping(N, Mem, Chk)
     end.
 
 info_trapping_create(0) ->
@@ -462,17 +476,17 @@ collisions(_Config) ->
     _ = [V = persistent_term:get(K) || {K,V} <- Kvs],
 
     %% Now delete the persistent terms in random order.
-    collisions_delete(lists:keysort(2, Kvs)),
+    collisions_delete(lists:keysort(2, Kvs), Chk),
 
     chk(Chk).
 
-collisions_delete([{Key,Val}|Kvs]) ->
+collisions_delete([{Key,Val}|Kvs], Chk) ->
     Val = persistent_term:get(Key),
     true = persistent_term:erase(Key),
-    true = lists:sort(persistent_term:get()) =:= lists:sort(Kvs),
+    true = lists:sort(pget(Chk)) =:= lists:sort(Kvs),
     _ = [V = persistent_term:get(K) || {K,V} <- Kvs],
-    collisions_delete(Kvs);
-collisions_delete([]) ->
+    collisions_delete(Kvs, Chk);
+collisions_delete([], _) ->
     ok.
 
 colliding_keys() ->
@@ -589,15 +603,16 @@ do_test_init_restart_cmd(File) ->
 %% and after each test case.
 
 chk() ->
-    persistent_term:info().
+    {persistent_term:info(), persistent_term:get()}.
 
-chk(Chk) ->
-    Chk = persistent_term:info(),
+chk({Info, _Initial} = Chk) ->
+    Info = persistent_term:info(),
     Key = {?MODULE,?FUNCTION_NAME},
-    ok = persistent_term:put(Key, {term,Chk}),
+    ok = persistent_term:put(Key, {term,Info}),
     Term = persistent_term:get(Key),
     true = persistent_term:erase(Key),
     chk_not_stuck(Term),
+    [persistent_term:erase(K) || {K, _} <- pget(Chk)],
     ok.
 
 chk_not_stuck(Term) ->
@@ -612,3 +627,72 @@ chk_not_stuck(Term) ->
         _ ->
             ok
     end.
+
+pget({_, Initial}) ->
+    persistent_term:get() -- Initial.
+
+
+killed_while_trapping_put(_Config) ->
+    erts_debug:set_internal_state(available_internal_state, true),
+    repeat(
+      fun() ->
+              NrOfPutsInChild = 10000,
+              do_puts(2500, my_value),
+              Pid =
+                  spawn(fun() ->
+                                do_puts(NrOfPutsInChild, my_value2)
+                        end),
+              timer:sleep(1),
+              erlang:exit(Pid, kill),
+              do_erases(NrOfPutsInChild)
+      end,
+      10),
+    erts_debug:set_internal_state(available_internal_state, false).
+
+killed_while_trapping_erase(_Config) ->
+    erts_debug:set_internal_state(available_internal_state, true),
+    repeat(
+      fun() ->
+              NrOfErases = 2500,
+              do_puts(NrOfErases, my_value),
+              Pid =
+                  spawn(fun() ->
+                                do_erases(NrOfErases)
+                        end),
+              timer:sleep(1),
+              erlang:exit(Pid, kill),
+              do_erases(NrOfErases)
+      end,
+      10),
+    erts_debug:set_internal_state(available_internal_state, false).
+
+put_erase_trapping(_Config) ->
+    NrOfItems = 5000,
+    erts_debug:set_internal_state(available_internal_state, true),
+    do_puts(NrOfItems, first),
+    do_puts(NrOfItems, second),
+    do_erases(NrOfItems),
+    erts_debug:set_internal_state(available_internal_state, false).
+
+do_puts(0, _) -> ok;
+do_puts(NrOfPuts, ValuePrefix) ->
+    Key = {?MODULE, NrOfPuts},
+    Value = {ValuePrefix, NrOfPuts},
+    erts_debug:set_internal_state(reds_left, rand:uniform(250)),
+    persistent_term:put(Key, Value),
+    Value = persistent_term:get(Key),
+    do_puts(NrOfPuts - 1, ValuePrefix).
+
+do_erases(0) -> ok;
+do_erases(NrOfErases) ->
+    Key = {?MODULE,NrOfErases},
+    erts_debug:set_internal_state(reds_left, rand:uniform(500)),
+    persistent_term:erase(Key),
+    not_found = persistent_term:get(Key, not_found),
+    do_erases(NrOfErases - 1).
+
+repeat(_Fun, 0) ->
+    ok;
+repeat(Fun, N) ->
+    Fun(),
+    repeat(Fun, N-1).
diff --git a/erts/emulator/test/process_SUITE.erl b/erts/emulator/test/process_SUITE.erl
index 57eb082d64..13dde12e69 100644
--- a/erts/emulator/test/process_SUITE.erl
+++ b/erts/emulator/test/process_SUITE.erl
@@ -44,6 +44,7 @@
          process_info_garbage_collection/1,
          process_info_smoke_all/1,
          process_info_status_handled_signal/1,
+         process_info_reductions/1,
 	 bump_reductions/1, low_prio/1, binary_owner/1, yield/1, yield2/1,
 	 otp_4725/1, bad_register/1, garbage_collect/1, otp_6237/1,
 	 process_info_messages/1, process_flag_badarg/1, process_flag_heap_size/1,
@@ -84,6 +85,7 @@ all() ->
      process_info_garbage_collection,
      process_info_smoke_all,
      process_info_status_handled_signal,
+     process_info_reductions,
      bump_reductions, low_prio, yield, yield2, otp_4725,
      bad_register, garbage_collect, process_info_messages,
      process_flag_badarg, process_flag_heap_size,
@@ -133,6 +135,15 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
+init_per_testcase(Func, Config)
+  when Func =:= processes_default_tab;
+       Func =:= processes_this_tab ->
+    case erlang:system_info(debug_compiled) of
+        true ->
+            {skip, "Don't run in debug"};
+        false ->
+            [{testcase, Func} | Config]
+    end;
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
     [{testcase, Func}|Config].
 
@@ -1084,6 +1095,90 @@ process_info_status_handled_signal(Config) when is_list(Config) ->
     false = erlang:is_process_alive(P),
     ok.
 
+%% OTP-15709
+%% Provoke a bug where process_info(reductions) returned wrong result
+%% because REDS_IN (def_arg_reg[5]) is read when the process in not running.
+%%
+%% And a bug where process_info(reductions) on a process which was releasing its
+%% main lock during execution could result in negative reduction diffs.
+process_info_reductions(Config) when is_list(Config) ->
+    {S1, S2} = case erlang:system_info(schedulers) of
+                   1 -> {1,1};
+                   _ -> {1,2}
+               end,
+    io:format("Run on schedulers ~p and ~p\n", [S1,S2]),
+    Boss = self(),
+    Doer = spawn_opt(fun () ->
+                             pi_reductions_tester(true, 10, fun pi_reductions_spinnloop/0, S2),
+                             pi_reductions_tester(true, 10, fun pi_reductions_recvloop/0, S2),
+                             pi_reductions_tester(false, 100, fun pi_reductions_main_unlocker/0, S2),
+                             Boss ! {self(), done}
+                     end,
+                     [link, {scheduler, S1}]),
+
+    {Doer, done} = receive M -> M end,
+    ok.
+
+pi_reductions_tester(ForceSignal, MaxCalls, Fun, S2) ->
+    Pid = spawn_opt(Fun, [link, {scheduler,S2}]),
+    Extra = case ForceSignal of
+                true ->
+                    %% Add another item that force sending the request
+                    %% as a signal, like 'current_function'.
+                    [current_function];
+                false ->
+                    []
+            end,
+    LoopFun = fun Me(Calls, Prev, Acc0) ->
+                      PI = process_info(Pid, [reductions | Extra]),
+                      [{reductions,Reds} | _] = PI,
+                      Diff = Reds - Prev,
+                      %% Verify we get sane non-negative reduction diffs
+                      {Diff, true} = {Diff, (Diff >= 0)},
+                      {Diff, true} = {Diff, (Diff =< 1000*1000)},
+                      Acc1 = [Diff | Acc0],
+                      case Calls >= MaxCalls of
+                          true -> Acc1;
+                          false -> Me(Calls+1, Reds, Acc1)
+                      end
+              end,
+    DiffList = LoopFun(0, 0, []),
+    unlink(Pid),
+    exit(Pid,kill),
+    io:format("Reduction diffs: ~p\n", [lists:reverse(DiffList)]),
+    ok.
+
+pi_reductions_spinnloop() ->
+    %% 6 args to make use of def_arg_reg[5] which is also used as REDS_IN
+    pi_reductions_spinnloop(999*1000, atom, "hej", self(), make_ref(), 3.14).
+
+pi_reductions_spinnloop(N,A,B,C,D,E) when N > 0 ->
+    pi_reductions_spinnloop(N-1,B,C,D,E,A);
+pi_reductions_spinnloop(0,_,_,_,_,_) ->
+    %% Stop to limit max number of reductions consumed
+    pi_reductions_recvloop().
+
+pi_reductions_recvloop() ->
+    receive
+        "a free lunch" -> false
+    end.
+
+pi_reductions_main_unlocker() ->
+    Other = spawn_link(fun() -> receive die -> ok end end),
+    pi_reductions_main_unlocker_loop(Other).
+
+pi_reductions_main_unlocker_loop(Other) ->
+    %% Assumption: register(OtherPid, Name) will unlock main lock of calling
+    %% process during execution.
+    register(pi_reductions_main_unlocker, Other),
+    unregister(pi_reductions_main_unlocker),
+
+    %% Yield in order to increase probability of process_info sometimes probing
+    %% this process when it's not RUNNING.
+    erlang:yield(),
+    pi_reductions_main_unlocker_loop(Other).
+
+
 %% Tests erlang:bump_reductions/1.
 bump_reductions(Config) when is_list(Config) ->
     erlang:garbage_collect(),
@@ -2104,6 +2199,13 @@ spawn_opt_max_heap_size(_Config) ->
 
     error_logger:add_report_handler(?MODULE, self()),
 
+    %% flush any prior messages in error_logger
+    Pid = spawn(fun() -> ok = nok end),
+    receive
+        {error, _, {emulator, _, [Pid|_]}} ->
+            flush()
+    end,
+
     %% Test that numerical limit works
     max_heap_size_test(1024, 1024, true, true),
 
@@ -2208,6 +2310,13 @@ receive_unexpected() ->
             ok
     end.
 
+flush() ->
+    receive
+        _M -> flush()
+    after 0 ->
+            ok
+    end.
+
 %% error_logger report handler proxy
 init(Pid) ->
     {ok, Pid}.
@@ -2233,8 +2342,8 @@ processes_term_proc_list(Config) when is_list(Config) ->
     %% We have to run this test case with +S1 since instrument:allocations()
     %% will report a free()'d block as present until it's actually deallocated
     %% by its employer.
-    Run("+MSe true +MSatags false +S1"),
-    Run("+MSe true +MSatags true +S1"),
+    Run("+MSe true +Muatags false +S1"),
+    Run("+MSe true +Muatags true +S1"),
 
     ok.
 
@@ -2242,10 +2351,12 @@ processes_term_proc_list(Config) when is_list(Config) ->
 	chk_term_proc_list(?LINE, MC, XB)).
 
 chk_term_proc_list(Line, MustChk, ExpectBlks) ->
-    Allocs = instrument:allocations(#{ allocator_types => [sl_alloc] }),
+    Allocs = instrument:allocations(),
     case {MustChk, Allocs} of
 	{false, {error, not_enabled}} ->
 	    not_enabled;
+	{false, {ok, {_Shift, _Unscanned, ByOrigin}}} when ByOrigin =:= #{} ->
+	    not_enabled;
 	{_, {ok, {_Shift, _Unscanned, ByOrigin}}} ->
             ByType = maps:get(system, ByOrigin, #{}),
             Hist = maps:get(ptab_list_deleted_el, ByType, {}),
@@ -2489,14 +2600,20 @@ garb_other_running(Config) when is_list(Config) ->
 
 no_priority_inversion(Config) when is_list(Config) ->
     Prio = process_flag(priority, max),
-    HTLs = lists:map(fun (_) ->
+    Master = self(),
+    Executing = make_ref(),
+    HTLs = lists:map(fun (Sched) ->
 			     spawn_opt(fun () ->
+                                               Master ! {self(), Executing},
 					       tok_loop()
 				       end,
-				       [{priority, high}, monitor, link])
+				       [{priority, high},
+                                        {scheduler, Sched},
+                                        monitor,
+                                        link])
 		     end,
-		     lists:seq(1, 2*erlang:system_info(schedulers))),
-    receive after 500 -> ok end,
+		     lists:seq(1, erlang:system_info(schedulers_online))),
+    lists:foreach(fun ({P, _}) -> receive {P,Executing} -> ok end end, HTLs),
     LTL = spawn_opt(fun () ->
 			    tok_loop()
 		    end,
@@ -2518,14 +2635,19 @@ no_priority_inversion(Config) when is_list(Config) ->
 
 no_priority_inversion2(Config) when is_list(Config) ->
     Prio = process_flag(priority, max),
-    MTLs = lists:map(fun (_) ->
+    Master = self(),
+    Executing = make_ref(),
+    MTLs = lists:map(fun (Sched) ->
 			     spawn_opt(fun () ->
+                                               Master ! {self(), Executing},
 					       tok_loop()
 				       end,
-				       [{priority, max}, monitor, link])
+				       [{priority, max},
+                                        {scheduler, Sched},
+                                        monitor, link])
 		     end,
-		     lists:seq(1, 2*erlang:system_info(schedulers))),
-    receive after 2000 -> ok end,
+		     lists:seq(1, erlang:system_info(schedulers_online))),
+    lists:foreach(fun ({P, _}) -> receive {P,Executing} -> ok end end, MTLs),
     {PL, ML} = spawn_opt(fun () ->
 			       tok_loop()
 		       end,
diff --git a/erts/emulator/test/scheduler_SUITE.erl b/erts/emulator/test/scheduler_SUITE.erl
index 2e0dfa42f3..f61949c75b 100644
--- a/erts/emulator/test/scheduler_SUITE.erl
+++ b/erts/emulator/test/scheduler_SUITE.erl
@@ -1450,28 +1450,26 @@ poll_threads(Config) when is_list(Config) ->
     {Conc, PollType, KP} = get_ioconfig(Config),
     {Sched, SchedOnln, _} = get_sstate(Config, ""),
 
+    [1, 1] = get_ionum(Config,"+IOt 2 +IOp 2"),
+    [1, 1, 1, 1, 1] = get_ionum(Config,"+IOt 5 +IOp 5"),
+    [1, 1] = get_ionum(Config, "+S 2 +IOPt 100 +IOPp 100"),
+
     if
         Conc ->
-            [1, 1, 1] = get_ionum(Config,"+IOt 2 +IOp 2"),
-            [1, 1, 1, 1, 1, 1] = get_ionum(Config,"+IOt 5 +IOp 5"),
-            [1, 1, 1] = get_ionum(Config, "+S 2 +IOPt 100 +IOPp 100"),
 
-            [5, 1] = get_ionum(Config,"+IOt 5 +IOp 1"),
-            [3, 2, 1] = get_ionum(Config,"+IOt 5 +IOp 2"),
-            [2, 2, 2, 2, 2, 1] = get_ionum(Config,"+IOt 10 +IOPp 50"),
+            [5] = get_ionum(Config,"+IOt 5 +IOp 1"),
+            [3, 2] = get_ionum(Config,"+IOt 5 +IOp 2"),
+            [2, 2, 2, 2, 2] = get_ionum(Config,"+IOt 10 +IOPp 50"),
 
-            [2, 1] = get_ionum(Config, "+S 2 +IOPt 100"),
-            [4, 1] = get_ionum(Config, "+S 4 +IOPt 100"),
-            [4, 1] = get_ionum(Config, "+S 4:2 +IOPt 100"),
-            [4, 4, 1] = get_ionum(Config, "+S 8 +IOPt 100 +IOPp 25"),
+            [2] = get_ionum(Config, "+S 2 +IOPt 100"),
+            [4] = get_ionum(Config, "+S 4 +IOPt 100"),
+            [4] = get_ionum(Config, "+S 4:2 +IOPt 100"),
+            [4, 4] = get_ionum(Config, "+S 8 +IOPt 100 +IOPp 25"),
 
             fail = get_ionum(Config, "+IOt 1 +IOp 2"),
 
             ok;
         not Conc ->
-            [1, 1] = get_ionum(Config,"+IOt 2 +IOp 2"),
-            [1, 1, 1, 1, 1] = get_ionum(Config,"+IOt 5 +IOp 5"),
-            [1, 1] = get_ionum(Config, "+S 2 +IOPt 100 +IOPp 100"),
 
             [1, 1, 1, 1, 1] = get_ionum(Config,"+IOt 5 +IOp 1"),
             [1, 1, 1, 1, 1] = get_ionum(Config,"+IOt 5 +IOp 2"),
@@ -1515,7 +1513,8 @@ get_iostate(Config, Cmd)->
                                              erlang:system_info(check_io)
                                      end]),
             IO = [IOState || IOState <- IOStates,
-                             proplists:get_value(fallback, IOState) == false],
+                             proplists:get_value(fallback, IOState) == false,
+                             proplists:get_value(poll_threads, IOState) /= 0],
             stop_node(Node),
             IO;
         {error,timeout} ->
diff --git a/erts/emulator/test/small_SUITE.erl b/erts/emulator/test/small_SUITE.erl
new file mode 100644
index 0000000000..00a02e5560
--- /dev/null
+++ b/erts/emulator/test/small_SUITE.erl
@@ -0,0 +1,115 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019. 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(small_SUITE).
+
+-export([all/0, suite/0]).
+-export([edge_cases/1]).
+
+-include_lib("common_test/include/ct.hrl").
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap, {minutes, 1}}].
+
+all() ->
+    [edge_cases].
+
+edge_cases(Config) when is_list(Config) ->
+    {MinSmall, MaxSmall} = Limits = determine_small_limits(0),
+    ct:pal("Limits = ~p", [Limits]),
+
+    true = (MaxSmall + 1) =:= MaxSmall + id(1),
+    true = (MinSmall - 1) =:= MinSmall - id(1),
+    true = (MaxSmall + 1) > id(MaxSmall),
+    true = (MinSmall - 1) < id(MinSmall),
+    -1 = MinSmall + id(MaxSmall),
+    -1 = MaxSmall + id(MinSmall),
+
+    false = is_small(MinSmall * -1),
+    false = is_small(MinSmall - id(1)),
+    false = is_small(MinSmall - 1),
+    false = is_small(MaxSmall + id(1)),
+
+    Lower = lists:seq(MinSmall, MinSmall + 128),
+    Upper = lists:seq(MaxSmall, MaxSmall - 128, -1),
+    Pow2 = seq_pow2(MinSmall, MaxSmall),
+    NearZero = lists:seq(-128, 128),
+
+    ok = test_combinations([Lower, Upper, Pow2, NearZero], MinSmall, MaxSmall),
+
+    ok.
+
+test_combinations([As | Rest]=TestVectors, MinS, MaxS) ->
+    [begin
+        _ = [arith_test(A, B, MinS, MaxS) || B <- Bs]
+     end || A <- As, Bs <- TestVectors],
+    test_combinations(Rest, MinS, MaxS);
+test_combinations([], _MinS, _MaxS) ->
+    ok.
+
+%% Builds a sequence of all powers of 2 between MinSmall and MaxSmall
+seq_pow2(MinSmall, MaxSmall) ->
+    sp2_1(MinSmall, MinSmall, MaxSmall).
+
+sp2_1(N, _MinS, MaxS) when N >= MaxS ->
+    [];
+sp2_1(-1, MinS, MaxS) ->
+    [-1 | sp2_1(1, MinS, MaxS)];
+sp2_1(N, MinS, MaxS) when N < 0 ->
+    [N | sp2_1(N bsr 1, MinS, MaxS)];
+sp2_1(N, MinS, MaxS) when N > 0 ->
+    [N | sp2_1(N bsl 1, MinS, MaxS)].
+
+arith_test(A, B, MinS, MaxS) ->
+    verify_kind(A + B, MinS, MaxS),
+    verify_kind(B + A, MinS, MaxS),
+    verify_kind(A - B, MinS, MaxS),
+    verify_kind(B - A, MinS, MaxS),
+    verify_kind(A * B, MinS, MaxS),
+    verify_kind(B * A, MinS, MaxS),
+
+    true = A + B =:= apply(erlang, id('+'), [A, B]),
+    true = A - B =:= apply(erlang, id('-'), [A, B]),
+    true = A * B =:= apply(erlang, id('*'), [A, B]),
+
+    true = A + B =:= B + id(A),
+    true = A - B =:= A + id(-B),
+    true = B - A =:= B + id(-A),
+    true = A * B =:= B * id(A),
+
+    true = B =:= 0 orelse ((A * B) div id(B) =:= A),
+    true = A =:= 0 orelse ((B * A) div id(A) =:= B),
+
+    ok.
+
+%% Verifies that N is a small when it should be
+verify_kind(N, MinS, MaxS) ->
+    true = is_small(N) =:= (N >= MinS andalso N =< MaxS).
+
+is_small(N) when is_integer(N) ->
+    0 =:= erts_debug:flat_size(N).
+
+determine_small_limits(N) ->
+    case is_small(-1 bsl N) of
+        true -> determine_small_limits(N + 1);
+        false -> {-1 bsl (N - 1), (1 bsl (N - 1)) - 1}
+    end.
+
+id(I) -> I.
diff --git a/erts/emulator/test/smoke_test_SUITE.erl b/erts/emulator/test/smoke_test_SUITE.erl
index 26c610e3a8..5b46342127 100644
--- a/erts/emulator/test/smoke_test_SUITE.erl
+++ b/erts/emulator/test/smoke_test_SUITE.erl
@@ -56,7 +56,7 @@ end_per_testcase(_Case, Config) when is_list(Config) ->
 %%%
 
 boot_combo(Config) when is_list(Config) ->
-    ZFlags = os:getenv("ERL_ZFLAGS"),
+    ZFlags = os:getenv("ERL_ZFLAGS", ""),
     NOOP = fun () -> ok end,
     A42 = fun () ->
 		  case erlang:system_info(threads) of
@@ -87,10 +87,7 @@ boot_combo(Config) when is_list(Config) ->
 	%% A lot more combos could be implemented...
 	ok
     after
-	os:putenv("ERL_ZFLAGS", case ZFlags of
-				    false -> "";
-				    _ -> ZFlags
-				end)
+	os:putenv("ERL_ZFLAGS", ZFlags)
     end.
 
 native_atomics(Config) when is_list(Config) ->
diff --git a/erts/emulator/test/socket_SUITE.erl b/erts/emulator/test/socket_SUITE.erl
new file mode 100644
index 0000000000..4980ea2a82
--- /dev/null
+++ b/erts/emulator/test/socket_SUITE.erl
@@ -0,0 +1,29159 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2018-2019. 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%
+%%
+
+%% There are some environment variables that can be used to "manipulate"
+%% the test suite: 
+%%
+%% Variable that controls which 'groups' are to run (with default values)
+%%
+%%         ESOCK_TEST_API:         include
+%%         ESOCK_TEST_SOCK_CLOSE:  include
+%%         ESOCK_TEST_TRAFFIC:     include
+%%         ESOCK_TEST_TTEST:       exclude
+%%
+%% Variable that controls "verbosity" of the test case(s):
+%%
+%%         ESOCK_TEST_QUIET: true (default) | false
+%%
+%% Defines the runtime of the ttest cases
+%% (This is the time during which "measurement" is performed. 
+%%  the actual time it takes for the test case to complete
+%%  will be longer; setup, completion, ...)
+%%
+%%          ESOCK_TEST_TTEST_RUNTIME: 10 seconds
+%%              Format of values: <integer>[<unit>]
+%%              Where unit is: ms | s | m
+%%                 ms - milli seconds
+%%                 s  - seconds (default)
+%%                 m  - minutes
+%%
+
+%% Run the entire test suite: 
+%% ts:run(emulator, socket_SUITE, [batch]).
+%%
+%% Run a specific group:
+%% ts:run(emulator, socket_SUITE, {group, foo}, [batch]).
+%%
+%% Run a specific test case:
+%% ts:run(emulator, socket_SUITE, foo, [batch]).
+
+-module(socket_SUITE).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+-include("socket_test_evaluator.hrl").
+
+%% Suite exports
+-export([suite/0, all/0, groups/0]).
+-export([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([
+         %% *** API Misc ***
+         api_m_debug/1,
+
+         %% *** API Basic ***
+         api_b_open_and_close_udp4/1,
+         api_b_open_and_close_tcp4/1,
+         api_b_open_and_close_udpL/1,
+         api_b_open_and_close_tcpL/1,
+         api_b_sendto_and_recvfrom_udp4/1,
+         api_b_sendto_and_recvfrom_udpL/1,
+         api_b_sendmsg_and_recvmsg_udp4/1,
+         api_b_sendmsg_and_recvmsg_udpL/1,
+         api_b_send_and_recv_tcp4/1,
+         api_b_send_and_recv_tcpL/1,
+         api_b_sendmsg_and_recvmsg_tcp4/1,
+         api_b_sendmsg_and_recvmsg_tcpL/1,
+
+         %% *** API async ***
+         api_a_connect_tcp4/1,
+         api_a_connect_tcp6/1,
+         api_a_sendto_and_recvfrom_udp4/1,
+         api_a_sendto_and_recvfrom_udp6/1,
+         api_a_sendmsg_and_recvmsg_udp4/1,
+         api_a_sendmsg_and_recvmsg_udp6/1,
+         api_a_send_and_recv_tcp4/1,
+         api_a_send_and_recv_tcp6/1,
+         api_a_sendmsg_and_recvmsg_tcp4/1,
+         api_a_sendmsg_and_recvmsg_tcp6/1,
+         api_a_recvfrom_cancel_udp4/1,
+         api_a_recvfrom_cancel_udp6/1,
+         api_a_recvmsg_cancel_udp4/1,
+         api_a_recvmsg_cancel_udp6/1,
+         api_a_accept_cancel_tcp4/1,
+         api_a_accept_cancel_tcp6/1,
+         api_a_recv_cancel_tcp4/1,
+         api_a_recv_cancel_tcp6/1,
+         api_a_recvmsg_cancel_tcp4/1,
+         api_a_recvmsg_cancel_tcp6/1,
+         api_a_mrecvfrom_cancel_udp4/1,
+         api_a_mrecvfrom_cancel_udp6/1,
+         api_a_mrecvmsg_cancel_udp4/1,
+         api_a_mrecvmsg_cancel_udp6/1,
+         api_a_maccept_cancel_tcp4/1,
+         api_a_maccept_cancel_tcp6/1,
+         api_a_mrecv_cancel_tcp4/1,
+         api_a_mrecv_cancel_tcp6/1,
+         api_a_mrecvmsg_cancel_tcp4/1,
+         api_a_mrecvmsg_cancel_tcp6/1,
+
+
+         %% *** API Options ***
+         api_opt_simple_otp_options/1,
+         api_opt_simple_otp_rcvbuf_option/1,
+         api_opt_simple_otp_controlling_process/1,
+         api_opt_sock_acceptconn_udp/1,
+         api_opt_sock_acceptconn_tcp/1,
+         api_opt_sock_acceptfilter/1,
+         api_opt_sock_bindtodevice/1,
+         api_opt_sock_broadcast/1,
+         api_opt_sock_debug/1,
+         api_opt_sock_domain/1,
+         api_opt_sock_dontroute/1,
+         api_opt_sock_error/1,
+         api_opt_sock_keepalive/1,
+         api_opt_sock_linger/1,
+         api_opt_ip_add_drop_membership/1,
+
+         %% *** API Operation Timeout ***
+         api_to_connect_tcp4/1,
+         api_to_connect_tcp6/1,
+         api_to_accept_tcp4/1,
+         api_to_accept_tcp6/1,
+         api_to_maccept_tcp4/1,
+         api_to_maccept_tcp6/1,
+         api_to_send_tcp4/1,
+         api_to_send_tcp6/1,
+         api_to_sendto_udp4/1,
+         api_to_sendto_udp6/1,
+         api_to_sendmsg_tcp4/1,
+         api_to_sendmsg_tcp6/1,
+         api_to_recv_udp4/1,
+         api_to_recv_udp6/1,
+         api_to_recv_tcp4/1,
+         api_to_recv_tcp6/1,
+         api_to_recvfrom_udp4/1,
+         api_to_recvfrom_udp6/1,
+         api_to_recvmsg_udp4/1,
+         api_to_recvmsg_udp6/1,
+         api_to_recvmsg_tcp4/1,
+         api_to_recvmsg_tcp6/1,
+
+         %% *** Socket Closure ***
+         sc_cpe_socket_cleanup_tcp4/1,
+         sc_cpe_socket_cleanup_tcp6/1,
+         sc_cpe_socket_cleanup_tcpL/1,
+         sc_cpe_socket_cleanup_udp4/1,
+         sc_cpe_socket_cleanup_udp6/1,
+         sc_cpe_socket_cleanup_udpL/1,
+
+         sc_lc_recv_response_tcp4/1,
+         sc_lc_recv_response_tcp6/1,
+         sc_lc_recv_response_tcpL/1,
+         sc_lc_recvfrom_response_udp4/1,
+         sc_lc_recvfrom_response_udp6/1,
+         sc_lc_recvfrom_response_udpL/1,
+         sc_lc_recvmsg_response_tcp4/1,
+         sc_lc_recvmsg_response_tcp6/1,
+         sc_lc_recvmsg_response_tcpL/1,
+         sc_lc_recvmsg_response_udp4/1,
+         sc_lc_recvmsg_response_udp6/1,
+         sc_lc_recvmsg_response_udpL/1,
+         sc_lc_acceptor_response_tcp4/1,
+         sc_lc_acceptor_response_tcp6/1,
+         sc_lc_acceptor_response_tcpL/1,
+
+         sc_rc_recv_response_tcp4/1,
+         sc_rc_recv_response_tcp6/1,
+         sc_rc_recv_response_tcpL/1,
+         sc_rc_recvmsg_response_tcp4/1,
+         sc_rc_recvmsg_response_tcp6/1,
+         sc_rc_recvmsg_response_tcpL/1,
+
+         sc_rs_recv_send_shutdown_receive_tcp4/1,
+         sc_rs_recv_send_shutdown_receive_tcp6/1,
+         sc_rs_recv_send_shutdown_receive_tcpL/1,
+         sc_rs_recvmsg_send_shutdown_receive_tcp4/1,
+         sc_rs_recvmsg_send_shutdown_receive_tcp6/1,
+         sc_rs_recvmsg_send_shutdown_receive_tcpL/1,
+
+         %% *** Traffic ***
+         traffic_send_and_recv_counters_tcp4/1,
+         traffic_send_and_recv_counters_tcp6/1,
+         traffic_send_and_recv_counters_tcpL/1,
+         traffic_sendmsg_and_recvmsg_counters_tcp4/1,
+         traffic_sendmsg_and_recvmsg_counters_tcp6/1,
+         traffic_sendmsg_and_recvmsg_counters_tcpL/1,
+         traffic_sendto_and_recvfrom_counters_udp4/1,
+         traffic_sendto_and_recvfrom_counters_udp6/1,
+         traffic_sendto_and_recvfrom_counters_udpL/1,
+         traffic_sendmsg_and_recvmsg_counters_udp4/1,
+         traffic_sendmsg_and_recvmsg_counters_udp6/1,
+         traffic_sendmsg_and_recvmsg_counters_udpL/1,
+
+         traffic_send_and_recv_chunks_tcp4/1,
+         traffic_send_and_recv_chunks_tcp6/1,
+         traffic_send_and_recv_chunks_tcpL/1,
+
+         traffic_ping_pong_small_send_and_recv_tcp4/1,
+         traffic_ping_pong_small_send_and_recv_tcp6/1,
+         traffic_ping_pong_small_send_and_recv_tcpL/1,
+         traffic_ping_pong_medium_send_and_recv_tcp4/1,
+         traffic_ping_pong_medium_send_and_recv_tcp6/1,
+         traffic_ping_pong_medium_send_and_recv_tcpL/1,
+         traffic_ping_pong_large_send_and_recv_tcp4/1,
+         traffic_ping_pong_large_send_and_recv_tcp6/1,
+         traffic_ping_pong_large_send_and_recv_tcpL/1,
+
+         traffic_ping_pong_small_sendto_and_recvfrom_udp4/1,
+         traffic_ping_pong_small_sendto_and_recvfrom_udp6/1,
+         traffic_ping_pong_small_sendto_and_recvfrom_udpL/1,
+         traffic_ping_pong_medium_sendto_and_recvfrom_udp4/1,
+         traffic_ping_pong_medium_sendto_and_recvfrom_udp6/1,
+         traffic_ping_pong_medium_sendto_and_recvfrom_udpL/1,
+
+         traffic_ping_pong_small_sendmsg_and_recvmsg_tcp4/1,
+         traffic_ping_pong_small_sendmsg_and_recvmsg_tcp6/1,
+         traffic_ping_pong_small_sendmsg_and_recvmsg_tcpL/1,
+         traffic_ping_pong_medium_sendmsg_and_recvmsg_tcp4/1,
+         traffic_ping_pong_medium_sendmsg_and_recvmsg_tcp6/1,
+         traffic_ping_pong_medium_sendmsg_and_recvmsg_tcpL/1,
+         traffic_ping_pong_large_sendmsg_and_recvmsg_tcp4/1,
+         traffic_ping_pong_large_sendmsg_and_recvmsg_tcp6/1,
+         traffic_ping_pong_large_sendmsg_and_recvmsg_tcpL/1,
+
+         traffic_ping_pong_small_sendmsg_and_recvmsg_udp4/1,
+         traffic_ping_pong_small_sendmsg_and_recvmsg_udp6/1,
+         traffic_ping_pong_small_sendmsg_and_recvmsg_udpL/1,
+         traffic_ping_pong_medium_sendmsg_and_recvmsg_udp4/1,
+         traffic_ping_pong_medium_sendmsg_and_recvmsg_udp6/1,
+         traffic_ping_pong_medium_sendmsg_and_recvmsg_udpL/1,
+
+         %% *** Time Test ***
+         %% Server: transport = gen_tcp, active = false
+         %% Client: transport = gen_tcp
+         ttest_sgenf_cgenf_small_tcp4/1,
+         ttest_sgenf_cgenf_small_tcp6/1,
+         ttest_sgenf_cgenf_medium_tcp4/1,
+         ttest_sgenf_cgenf_medium_tcp6/1,
+         ttest_sgenf_cgenf_large_tcp4/1,
+         ttest_sgenf_cgenf_large_tcp6/1,
+
+         ttest_sgenf_cgeno_small_tcp4/1,
+         ttest_sgenf_cgeno_small_tcp6/1,
+         ttest_sgenf_cgeno_medium_tcp4/1,
+         ttest_sgenf_cgeno_medium_tcp6/1,
+         ttest_sgenf_cgeno_large_tcp4/1,
+         ttest_sgenf_cgeno_large_tcp6/1,
+
+         ttest_sgenf_cgent_small_tcp4/1,
+         ttest_sgenf_cgent_small_tcp6/1,
+         ttest_sgenf_cgent_medium_tcp4/1,
+         ttest_sgenf_cgent_medium_tcp6/1,
+         ttest_sgenf_cgent_large_tcp4/1,
+         ttest_sgenf_cgent_large_tcp6/1,
+
+         %% Server: transport = gen_tcp, active = false
+         %% Client: transport = socket(tcp)
+         ttest_sgenf_csockf_small_tcp4/1,
+         ttest_sgenf_csockf_small_tcp6/1,
+         ttest_sgenf_csockf_medium_tcp4/1,
+         ttest_sgenf_csockf_medium_tcp6/1,
+         ttest_sgenf_csockf_large_tcp4/1,
+         ttest_sgenf_csockf_large_tcp6/1,
+
+         ttest_sgenf_csocko_small_tcp4/1,
+         ttest_sgenf_csocko_small_tcp6/1,
+         ttest_sgenf_csocko_medium_tcp4/1,
+         ttest_sgenf_csocko_medium_tcp6/1,
+         ttest_sgenf_csocko_large_tcp4/1,
+         ttest_sgenf_csocko_large_tcp6/1,
+
+         ttest_sgenf_csockt_small_tcp4/1,
+         ttest_sgenf_csockt_small_tcp6/1,
+         ttest_sgenf_csockt_medium_tcp4/1,
+         ttest_sgenf_csockt_medium_tcp6/1,
+         ttest_sgenf_csockt_large_tcp4/1,
+         ttest_sgenf_csockt_large_tcp6/1,
+
+         %% Server: transport = gen_tcp, active = once
+         %% Client: transport = gen_tcp
+         ttest_sgeno_cgenf_small_tcp4/1,
+         ttest_sgeno_cgenf_small_tcp6/1,
+         ttest_sgeno_cgenf_medium_tcp4/1,
+         ttest_sgeno_cgenf_medium_tcp6/1,
+         ttest_sgeno_cgenf_large_tcp4/1,
+         ttest_sgeno_cgenf_large_tcp6/1,
+
+         ttest_sgeno_cgeno_small_tcp4/1,
+         ttest_sgeno_cgeno_small_tcp6/1,
+         ttest_sgeno_cgeno_medium_tcp4/1,
+         ttest_sgeno_cgeno_medium_tcp6/1,
+         ttest_sgeno_cgeno_large_tcp4/1,
+         ttest_sgeno_cgeno_large_tcp6/1,
+
+         ttest_sgeno_cgent_small_tcp4/1,
+         ttest_sgeno_cgent_small_tcp6/1,
+         ttest_sgeno_cgent_medium_tcp4/1,
+         ttest_sgeno_cgent_medium_tcp6/1,
+         ttest_sgeno_cgent_large_tcp4/1,
+         ttest_sgeno_cgent_large_tcp6/1,
+
+         %% Server: transport = gen_tcp, active = once
+         %% Client: transport = socket(tcp)
+         ttest_sgeno_csockf_small_tcp4/1,
+         ttest_sgeno_csockf_small_tcp6/1,
+         ttest_sgeno_csockf_medium_tcp4/1,
+         ttest_sgeno_csockf_medium_tcp6/1,
+         ttest_sgeno_csockf_large_tcp4/1,
+         ttest_sgeno_csockf_large_tcp6/1,
+
+         ttest_sgeno_csocko_small_tcp4/1,
+         ttest_sgeno_csocko_small_tcp6/1,
+         ttest_sgeno_csocko_medium_tcp4/1,
+         ttest_sgeno_csocko_medium_tcp6/1,
+         ttest_sgeno_csocko_large_tcp4/1,
+         ttest_sgeno_csocko_large_tcp6/1,
+
+         ttest_sgeno_csockt_small_tcp4/1,
+         ttest_sgeno_csockt_small_tcp6/1,
+         ttest_sgeno_csockt_medium_tcp4/1,
+         ttest_sgeno_csockt_medium_tcp6/1,
+         ttest_sgeno_csockt_large_tcp4/1,
+         ttest_sgeno_csockt_large_tcp6/1,
+
+         %% Server: transport = gen_tcp, active = true
+         %% Client: transport = gen_tcp
+         ttest_sgent_cgenf_small_tcp4/1,
+         ttest_sgent_cgenf_small_tcp6/1,
+         ttest_sgent_cgenf_medium_tcp4/1,
+         ttest_sgent_cgenf_medium_tcp6/1,
+         ttest_sgent_cgenf_large_tcp4/1,
+         ttest_sgent_cgenf_large_tcp6/1,
+
+         ttest_sgent_cgeno_small_tcp4/1,
+         ttest_sgent_cgeno_small_tcp6/1,
+         ttest_sgent_cgeno_medium_tcp4/1,
+         ttest_sgent_cgeno_medium_tcp6/1,
+         ttest_sgent_cgeno_large_tcp4/1,
+         ttest_sgent_cgeno_large_tcp6/1,
+
+         ttest_sgent_cgent_small_tcp4/1,
+         ttest_sgent_cgent_small_tcp6/1,
+         ttest_sgent_cgent_medium_tcp4/1,
+         ttest_sgent_cgent_medium_tcp6/1,
+         ttest_sgent_cgent_large_tcp4/1,
+         ttest_sgent_cgent_large_tcp6/1,
+
+         %% Server: transport = gen_tcp, active = true
+         %% Client: transport = socket(tcp)
+         ttest_sgent_csockf_small_tcp4/1,
+         ttest_sgent_csockf_small_tcp6/1,
+         ttest_sgent_csockf_medium_tcp4/1,
+         ttest_sgent_csockf_medium_tcp6/1,
+         ttest_sgent_csockf_large_tcp4/1,
+         ttest_sgent_csockf_large_tcp6/1,
+
+         ttest_sgent_csocko_small_tcp4/1,
+         ttest_sgent_csocko_small_tcp6/1,
+         ttest_sgent_csocko_medium_tcp4/1,
+         ttest_sgent_csocko_medium_tcp6/1,
+         ttest_sgent_csocko_large_tcp4/1,
+         ttest_sgent_csocko_large_tcp6/1,
+
+         ttest_sgent_csockt_small_tcp4/1,
+         ttest_sgent_csockt_small_tcp6/1,
+         ttest_sgent_csockt_medium_tcp4/1,
+         ttest_sgent_csockt_medium_tcp6/1,
+         ttest_sgent_csockt_large_tcp4/1,
+         ttest_sgent_csockt_large_tcp6/1,
+
+         %% Server: transport = socket(tcp), active = false
+         %% Client: transport = gen_tcp
+         ttest_ssockf_cgenf_small_tcp4/1,
+         ttest_ssockf_cgenf_small_tcp6/1,
+         ttest_ssockf_cgenf_medium_tcp4/1,
+         ttest_ssockf_cgenf_medium_tcp6/1,
+         ttest_ssockf_cgenf_large_tcp4/1,
+         ttest_ssockf_cgenf_large_tcp6/1,
+
+         ttest_ssockf_cgeno_small_tcp4/1,
+         ttest_ssockf_cgeno_small_tcp6/1,
+         ttest_ssockf_cgeno_medium_tcp4/1,
+         ttest_ssockf_cgeno_medium_tcp6/1,
+         ttest_ssockf_cgeno_large_tcp4/1,
+         ttest_ssockf_cgeno_large_tcp6/1,
+
+         ttest_ssockf_cgent_small_tcp4/1,
+         ttest_ssockf_cgent_small_tcp6/1,
+         ttest_ssockf_cgent_medium_tcp4/1,
+         ttest_ssockf_cgent_medium_tcp6/1,
+         ttest_ssockf_cgent_large_tcp4/1,
+         ttest_ssockf_cgent_large_tcp6/1,
+
+         %% Server: transport = socket(tcp), active = false
+         %% Client: transport = socket(tcp)
+         ttest_ssockf_csockf_small_tcp4/1,
+         ttest_ssockf_csockf_small_tcp6/1,
+         ttest_ssockf_csockf_small_tcpL/1,
+         ttest_ssockf_csockf_medium_tcp4/1,
+         ttest_ssockf_csockf_medium_tcp6/1,
+         ttest_ssockf_csockf_medium_tcpL/1,
+         ttest_ssockf_csockf_large_tcp4/1,
+         ttest_ssockf_csockf_large_tcp6/1,
+         ttest_ssockf_csockf_large_tcpL/1,
+
+         ttest_ssockf_csocko_small_tcp4/1,
+         ttest_ssockf_csocko_small_tcp6/1,
+         ttest_ssockf_csocko_small_tcpL/1,
+         ttest_ssockf_csocko_medium_tcp4/1,
+         ttest_ssockf_csocko_medium_tcp6/1,
+         ttest_ssockf_csocko_medium_tcpL/1,
+         ttest_ssockf_csocko_large_tcp4/1,
+         ttest_ssockf_csocko_large_tcp6/1,
+         ttest_ssockf_csocko_large_tcpL/1,
+
+         ttest_ssockf_csockt_small_tcp4/1,
+         ttest_ssockf_csockt_small_tcp6/1,
+         ttest_ssockf_csockt_small_tcpL/1,
+         ttest_ssockf_csockt_medium_tcp4/1,
+         ttest_ssockf_csockt_medium_tcp6/1,
+         ttest_ssockf_csockt_medium_tcpL/1,
+         ttest_ssockf_csockt_large_tcp4/1,
+         ttest_ssockf_csockt_large_tcp6/1,
+         ttest_ssockf_csockt_large_tcpL/1,
+
+         %% Server: transport = socket(tcp), active = once
+         %% Client: transport = gen_tcp
+         ttest_ssocko_cgenf_small_tcp4/1,
+         ttest_ssocko_cgenf_small_tcp6/1,
+         ttest_ssocko_cgenf_medium_tcp4/1,
+         ttest_ssocko_cgenf_medium_tcp6/1,
+         ttest_ssocko_cgenf_large_tcp4/1,
+         ttest_ssocko_cgenf_large_tcp6/1,
+
+         ttest_ssocko_cgeno_small_tcp4/1,
+         ttest_ssocko_cgeno_small_tcp6/1,
+         ttest_ssocko_cgeno_medium_tcp4/1,
+         ttest_ssocko_cgeno_medium_tcp6/1,
+         ttest_ssocko_cgeno_large_tcp4/1,
+         ttest_ssocko_cgeno_large_tcp6/1,
+
+         ttest_ssocko_cgent_small_tcp4/1,
+         ttest_ssocko_cgent_small_tcp6/1,
+         ttest_ssocko_cgent_medium_tcp4/1,
+         ttest_ssocko_cgent_medium_tcp6/1,
+         ttest_ssocko_cgent_large_tcp4/1,
+         ttest_ssocko_cgent_large_tcp6/1,
+
+         %% Server: transport = socket(tcp), active = once
+         %% Client: transport = socket(tcp)
+         ttest_ssocko_csockf_small_tcp4/1,
+         ttest_ssocko_csockf_small_tcp6/1,
+         ttest_ssocko_csockf_small_tcpL/1,
+         ttest_ssocko_csockf_medium_tcp4/1,
+         ttest_ssocko_csockf_medium_tcpL/1,
+         ttest_ssocko_csockf_medium_tcp6/1,
+         ttest_ssocko_csockf_large_tcp4/1,
+         ttest_ssocko_csockf_large_tcp6/1,
+         ttest_ssocko_csockf_large_tcpL/1,
+
+         ttest_ssocko_csocko_small_tcp4/1,
+         ttest_ssocko_csocko_small_tcp6/1,
+         ttest_ssocko_csocko_small_tcpL/1,
+         ttest_ssocko_csocko_medium_tcp4/1,
+         ttest_ssocko_csocko_medium_tcp6/1,
+         ttest_ssocko_csocko_medium_tcpL/1,
+         ttest_ssocko_csocko_large_tcp4/1,
+         ttest_ssocko_csocko_large_tcp6/1,
+         ttest_ssocko_csocko_large_tcpL/1,
+
+         ttest_ssocko_csockt_small_tcp4/1,
+         ttest_ssocko_csockt_small_tcp6/1,
+         ttest_ssocko_csockt_small_tcpL/1,
+         ttest_ssocko_csockt_medium_tcp4/1,
+         ttest_ssocko_csockt_medium_tcp6/1,
+         ttest_ssocko_csockt_medium_tcpL/1,
+         ttest_ssocko_csockt_large_tcp4/1,
+         ttest_ssocko_csockt_large_tcp6/1,
+         ttest_ssocko_csockt_large_tcpL/1,
+
+         %% Server: transport = socket(tcp), active = true
+         %% Client: transport = gen_tcp
+         ttest_ssockt_cgenf_small_tcp4/1,
+         ttest_ssockt_cgenf_small_tcp6/1,
+         ttest_ssockt_cgenf_medium_tcp4/1,
+         ttest_ssockt_cgenf_medium_tcp6/1,
+         ttest_ssockt_cgenf_large_tcp4/1,
+         ttest_ssockt_cgenf_large_tcp6/1,
+
+         ttest_ssockt_cgeno_small_tcp4/1,
+         ttest_ssockt_cgeno_small_tcp6/1,
+         ttest_ssockt_cgeno_medium_tcp4/1,
+         ttest_ssockt_cgeno_medium_tcp6/1,
+         ttest_ssockt_cgeno_large_tcp4/1,
+         ttest_ssockt_cgeno_large_tcp6/1,
+
+         ttest_ssockt_cgent_small_tcp4/1,
+         ttest_ssockt_cgent_small_tcp6/1,
+         ttest_ssockt_cgent_medium_tcp4/1,
+         ttest_ssockt_cgent_medium_tcp6/1,
+         ttest_ssockt_cgent_large_tcp4/1,
+         ttest_ssockt_cgent_large_tcp6/1,
+
+         %% Server: transport = socket(tcp), active = true
+         %% Client: transport = socket(tcp)
+         ttest_ssockt_csockf_small_tcp4/1,
+         ttest_ssockt_csockf_small_tcp6/1,
+         ttest_ssockt_csockf_small_tcpL/1,
+         ttest_ssockt_csockf_medium_tcp4/1,
+         ttest_ssockt_csockf_medium_tcp6/1,
+         ttest_ssockt_csockf_medium_tcpL/1,
+         ttest_ssockt_csockf_large_tcp4/1,
+         ttest_ssockt_csockf_large_tcp6/1,
+         ttest_ssockt_csockf_large_tcpL/1,
+
+         ttest_ssockt_csocko_small_tcp4/1,
+         ttest_ssockt_csocko_small_tcp6/1,
+         ttest_ssockt_csocko_small_tcpL/1,
+         ttest_ssockt_csocko_medium_tcp4/1,
+         ttest_ssockt_csocko_medium_tcp6/1,
+         ttest_ssockt_csocko_medium_tcpL/1,
+         ttest_ssockt_csocko_large_tcp4/1,
+         ttest_ssockt_csocko_large_tcp6/1,
+         ttest_ssockt_csocko_large_tcpL/1,
+
+         ttest_ssockt_csockt_small_tcp4/1,
+         ttest_ssockt_csockt_small_tcp6/1,
+         ttest_ssockt_csockt_small_tcpL/1,
+         ttest_ssockt_csockt_medium_tcp4/1,
+         ttest_ssockt_csockt_medium_tcp6/1,
+         ttest_ssockt_csockt_medium_tcpL/1,
+         ttest_ssockt_csockt_large_tcp4/1,
+         ttest_ssockt_csockt_large_tcp6/1,
+         ttest_ssockt_csockt_large_tcpL/1
+
+         %% Tickets
+        ]).
+
+
+%% Internal exports
+%% -export([]).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-define(LIB,        socket_test_lib).
+-define(TTEST_LIB,  socket_test_ttest_lib).
+-define(LOGGER,     socket_test_logger).
+
+-define(BASIC_REQ,  <<"hejsan">>).
+-define(BASIC_REP,  <<"hoppsan">>).
+
+-define(DATA,       <<"HOPPSAN">>). % Temporary
+-define(FAIL(R),    exit(R)).
+
+-define(SLEEP(T),   receive after T -> ok end).
+
+-define(MINS(M),    timer:minutes(M)).
+-define(SECS(S),    timer:seconds(S)).
+
+-define(TT(T),      ct:timetrap(T)).
+
+-define(F(F, A),    ?LIB:f(F, A)).
+
+
+-define(TPP_SMALL,  lists:seq(1, 8)).
+-define(TPP_MEDIUM, lists:flatten(lists:duplicate(1024, ?TPP_SMALL))).
+-define(TPP_LARGE,  lists:flatten(lists:duplicate(1024, ?TPP_MEDIUM))).
+
+-define(TPP_SMALL_NUM,  10000).
+-define(TPP_MEDIUM_NUM, 1000).
+-define(TPP_LARGE_NUM,  100).
+
+-define(TTEST_RUNTIME,  ?SECS(10)).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+suite() ->
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,1}}].
+
+all() -> 
+    Groups = [{api,          "ESOCK_TEST_API",        include},
+	      {socket_close, "ESOCK_TEST_SOCK_CLOSE", include},
+	      {traffic,      "ESOCK_TEST_TRAFFIC",    include},
+	      {ttest,        "ESOCK_TEST_TTEST",      exclude}],
+    [use_group(Group, Env, Default) || {Group, Env, Default} <- Groups].
+
+use_group(Group, Env, Default) ->
+	case os:getenv(Env) of
+	    false when (Default =:= include) ->
+		[{group, Group}];
+	    false ->
+		[];
+	    Val ->
+		case list_to_atom(string:to_lower(Val)) of
+		    Use when (Use =:= include) orelse 
+			     (Use =:= enable) orelse 
+			     (Use =:= true) ->
+			[{group, Group}];
+		    _ ->
+			[]
+		end
+	end.
+    
+
+groups() -> 
+    [{api,                         [], api_cases()},
+     {api_misc,                    [], api_misc_cases()},
+     {api_basic,                   [], api_basic_cases()},
+     {api_async,                   [], api_async_cases()},
+     {api_options,                 [], api_options_cases()},
+     {api_options_otp,             [], api_options_otp_cases()},
+     {api_options_socket,          [], api_options_socket_cases()},
+     {api_option_sock_acceptconn,  [], api_option_sock_acceptconn_cases()},
+     {api_options_ip,              [], api_options_ip_cases()},
+     %% {api_options_ipv6,           [], api_options_ipv6_cases()},
+     %% {api_options_tcp,            [], api_options_tcp_cases()},
+     %% {api_options_udp,            [], api_options_udp_cases()},
+     %% {api_options_sctp,           [], api_options_sctp_cases()},
+     {api_op_with_timeout,         [], api_op_with_timeout_cases()},
+     {socket_close,                [], socket_close_cases()},
+     {sc_ctrl_proc_exit,           [], sc_cp_exit_cases()},
+     {sc_local_close,              [], sc_lc_cases()},
+     {sc_remote_close,             [], sc_rc_cases()},
+     {sc_remote_shutdown,          [], sc_rs_cases()},
+     {traffic,                     [], traffic_cases()},
+     {traffic_counters,            [], traffic_counters_cases()},
+     {traffic_chunks,              [], traffic_chunks_cases()},
+     {traffic_pp_send_recv,        [], traffic_pp_send_recv_cases()},
+     {traffic_pp_sendto_recvfrom,  [], traffic_pp_sendto_recvfrom_cases()},
+     {traffic_pp_sendmsg_recvmsg,  [], traffic_pp_sendmsg_recvmsg_cases()},
+     {ttest,                       [], ttest_cases()},
+     {ttest_sgenf,                 [], ttest_sgenf_cases()},
+     {ttest_sgenf_cgen,            [], ttest_sgenf_cgen_cases()},
+     {ttest_sgenf_cgenf,           [], ttest_sgenf_cgenf_cases()},
+     {ttest_sgenf_cgeno,           [], ttest_sgenf_cgeno_cases()},
+     {ttest_sgenf_cgent,           [], ttest_sgenf_cgent_cases()},
+     {ttest_sgenf_csock,           [], ttest_sgenf_csock_cases()},
+     {ttest_sgenf_csockf,          [], ttest_sgenf_csockf_cases()},
+     {ttest_sgenf_csocko,          [], ttest_sgenf_csocko_cases()},
+     {ttest_sgenf_csockt,          [], ttest_sgenf_csockt_cases()},
+     {ttest_sgeno,                 [], ttest_sgeno_cases()},
+     {ttest_sgeno_cgen,            [], ttest_sgeno_cgen_cases()},
+     {ttest_sgeno_cgenf,           [], ttest_sgeno_cgenf_cases()},
+     {ttest_sgeno_cgeno,           [], ttest_sgeno_cgeno_cases()},
+     {ttest_sgeno_cgent,           [], ttest_sgeno_cgent_cases()},
+     {ttest_sgeno_csock,           [], ttest_sgeno_csock_cases()},
+     {ttest_sgeno_csockf,          [], ttest_sgeno_csockf_cases()},
+     {ttest_sgeno_csocko,          [], ttest_sgeno_csocko_cases()},
+     {ttest_sgeno_csockt,          [], ttest_sgeno_csockt_cases()},
+     {ttest_sgent,                 [], ttest_sgent_cases()},
+     {ttest_sgent_cgen,            [], ttest_sgent_cgen_cases()},
+     {ttest_sgent_cgenf,           [], ttest_sgent_cgenf_cases()},
+     {ttest_sgent_cgeno,           [], ttest_sgent_cgeno_cases()},
+     {ttest_sgent_cgent,           [], ttest_sgent_cgent_cases()},
+     {ttest_sgent_csock,           [], ttest_sgent_csock_cases()},
+     {ttest_sgent_csockf,          [], ttest_sgent_csockf_cases()},
+     {ttest_sgent_csocko,          [], ttest_sgent_csocko_cases()},
+     {ttest_sgent_csockt,          [], ttest_sgent_csockt_cases()},
+     {ttest_ssockf,                [], ttest_ssockf_cases()},
+     {ttest_ssockf_cgen,           [], ttest_ssockf_cgen_cases()},
+     {ttest_ssockf_cgenf,          [], ttest_ssockf_cgenf_cases()},
+     {ttest_ssockf_cgeno,          [], ttest_ssockf_cgeno_cases()},
+     {ttest_ssockf_cgent,          [], ttest_ssockf_cgent_cases()},
+     {ttest_ssockf_csock,          [], ttest_ssockf_csock_cases()},
+     {ttest_ssockf_csockf,         [], ttest_ssockf_csockf_cases()},
+     {ttest_ssockf_csocko,         [], ttest_ssockf_csocko_cases()},
+     {ttest_ssockf_csockt,         [], ttest_ssockf_csockt_cases()},
+     {ttest_ssocko,                [], ttest_ssocko_cases()},
+     {ttest_ssocko_cgen,           [], ttest_ssocko_cgen_cases()},
+     {ttest_ssocko_cgenf,          [], ttest_ssocko_cgenf_cases()},
+     {ttest_ssocko_cgeno,          [], ttest_ssocko_cgeno_cases()},
+     {ttest_ssocko_cgent,          [], ttest_ssocko_cgent_cases()},
+     {ttest_ssocko_csock,          [], ttest_ssocko_csock_cases()},
+     {ttest_ssocko_csockf,         [], ttest_ssocko_csockf_cases()},
+     {ttest_ssocko_csocko,         [], ttest_ssocko_csocko_cases()},
+     {ttest_ssocko_csockt,         [], ttest_ssocko_csockt_cases()},
+     {ttest_ssockt,                [], ttest_ssockt_cases()},
+     {ttest_ssockt_cgen,           [], ttest_ssockt_cgen_cases()},
+     {ttest_ssockt_cgenf,          [], ttest_ssockt_cgenf_cases()},
+     {ttest_ssockt_cgeno,          [], ttest_ssockt_cgeno_cases()},
+     {ttest_ssockt_cgent,          [], ttest_ssockt_cgent_cases()},
+     {ttest_ssockt_csock,          [], ttest_ssockt_csock_cases()},
+     {ttest_ssockt_csockf,         [], ttest_ssockt_csockf_cases()},
+     {ttest_ssockt_csocko,         [], ttest_ssockt_csocko_cases()},
+     {ttest_ssockt_csockt,         [], ttest_ssockt_csockt_cases()}
+
+     %% {tickets,             [], ticket_cases()}
+    ].
+     
+api_cases() ->
+    [
+     {group, api_misc},
+     {group, api_basic},
+     {group, api_async},
+     {group, api_options},
+     {group, api_op_with_timeout}
+    ].
+
+api_misc_cases() ->
+    [
+     api_m_debug
+    ].
+
+api_basic_cases() ->
+    [
+     api_b_open_and_close_udp4,
+     api_b_open_and_close_tcp4,
+     api_b_open_and_close_udpL,
+     api_b_open_and_close_tcpL,
+     api_b_sendto_and_recvfrom_udp4,
+     api_b_sendto_and_recvfrom_udpL,
+     api_b_sendmsg_and_recvmsg_udp4,
+     api_b_sendmsg_and_recvmsg_udpL,
+     api_b_send_and_recv_tcp4,
+     api_b_send_and_recv_tcpL,
+     api_b_sendmsg_and_recvmsg_tcp4,
+     api_b_sendmsg_and_recvmsg_tcpL
+    ].
+
+api_async_cases() ->
+    [
+     api_a_connect_tcp4,
+     api_a_connect_tcp6,
+     api_a_sendto_and_recvfrom_udp4,
+     api_a_sendto_and_recvfrom_udp6,
+     api_a_sendmsg_and_recvmsg_udp4,
+     api_a_sendmsg_and_recvmsg_udp6,
+     api_a_send_and_recv_tcp4,
+     api_a_send_and_recv_tcp6,
+     api_a_sendmsg_and_recvmsg_tcp4,
+     api_a_sendmsg_and_recvmsg_tcp6,
+     api_a_recvfrom_cancel_udp4,
+     api_a_recvfrom_cancel_udp6,
+     api_a_recvmsg_cancel_udp4,
+     api_a_recvmsg_cancel_udp6,
+     api_a_accept_cancel_tcp4,
+     api_a_accept_cancel_tcp6,
+     api_a_recv_cancel_tcp4,
+     api_a_recv_cancel_tcp6,
+     api_a_recvmsg_cancel_tcp4,
+     api_a_recvmsg_cancel_tcp6,
+     api_a_mrecvfrom_cancel_udp4,
+     api_a_mrecvfrom_cancel_udp6,
+     api_a_mrecvmsg_cancel_udp4,
+     api_a_mrecvmsg_cancel_udp6,
+     api_a_maccept_cancel_tcp4,
+     api_a_maccept_cancel_tcp6,
+     api_a_mrecv_cancel_tcp4,
+     api_a_mrecv_cancel_tcp6,
+     api_a_mrecvmsg_cancel_tcp4,
+     api_a_mrecvmsg_cancel_tcp6
+    ].
+
+api_options_cases() ->
+    [
+     {group, api_options_otp},
+     {group, api_options_socket},
+     {group, api_options_ip}% ,
+     %% {group, api_options_ipv6},
+     %% {group, api_options_tcp},
+     %% {group, api_options_udp},
+     %% {group, api_options_sctp}
+    ].
+
+api_options_otp_cases() ->
+    [
+     api_opt_simple_otp_options,
+     api_opt_simple_otp_rcvbuf_option,
+     api_opt_simple_otp_controlling_process
+    ].
+
+api_options_socket_cases() ->
+    [
+     {group, api_option_sock_acceptconn},
+     api_opt_sock_acceptfilter,
+     api_opt_sock_bindtodevice,
+     api_opt_sock_broadcast,
+     api_opt_sock_debug,
+     api_opt_sock_domain,
+     api_opt_sock_dontroute,
+     api_opt_sock_error,
+     api_opt_sock_keepalive,
+     api_opt_sock_linger
+    ].
+
+api_option_sock_acceptconn_cases() ->
+    [
+     api_opt_sock_acceptconn_udp,
+     api_opt_sock_acceptconn_tcp
+    ].
+
+api_options_ip_cases() ->
+    [
+     api_opt_ip_add_drop_membership
+    ].
+
+%% api_options_ipv6_cases() ->
+%%     [
+%%     ].
+
+api_op_with_timeout_cases() ->
+    [
+     api_to_connect_tcp4,
+     api_to_connect_tcp6,
+     api_to_accept_tcp4,
+     api_to_accept_tcp6,
+     api_to_maccept_tcp4,
+     api_to_maccept_tcp6,
+     api_to_send_tcp4,
+     api_to_send_tcp6,
+     api_to_sendto_udp4,
+     api_to_sendto_udp6,
+     api_to_sendmsg_tcp4,
+     api_to_sendmsg_tcp6,
+     api_to_recv_udp4,
+     api_to_recv_udp6,
+     api_to_recv_tcp4,
+     api_to_recv_tcp6,
+     api_to_recvfrom_udp4,
+     api_to_recvfrom_udp6,
+     api_to_recvmsg_udp4,
+     api_to_recvmsg_udp6,
+     api_to_recvmsg_tcp4,
+     api_to_recvmsg_tcp6
+    ].
+
+%% These cases tests what happens when the socket is closed/shutdown,
+%% locally or remotely.
+socket_close_cases() ->
+    [
+     {group, sc_ctrl_proc_exit},
+     {group, sc_local_close},
+     {group, sc_remote_close},
+     {group, sc_remote_shutdown}
+    ].
+
+%% These cases are all about socket cleanup after the controlling process
+%% exits *without* explicitly calling socket:close/1.
+sc_cp_exit_cases() ->
+    [
+     sc_cpe_socket_cleanup_tcp4,
+     sc_cpe_socket_cleanup_tcp6,
+     sc_cpe_socket_cleanup_tcpL,
+     sc_cpe_socket_cleanup_udp4,
+     sc_cpe_socket_cleanup_udp6,
+     sc_cpe_socket_cleanup_udpL
+    ].
+
+%% These cases tests what happens when the socket is closed locally.
+sc_lc_cases() ->
+    [
+     sc_lc_recv_response_tcp4,
+     sc_lc_recv_response_tcp6,
+     sc_lc_recv_response_tcpL,
+
+     sc_lc_recvfrom_response_udp4,
+     sc_lc_recvfrom_response_udp6,
+     sc_lc_recvfrom_response_udpL,
+
+     sc_lc_recvmsg_response_tcp4,
+     sc_lc_recvmsg_response_tcp6,
+     sc_lc_recvmsg_response_tcpL,
+     sc_lc_recvmsg_response_udp4,
+     sc_lc_recvmsg_response_udp6,
+     sc_lc_recvmsg_response_udpL,
+
+     sc_lc_acceptor_response_tcp4,
+     sc_lc_acceptor_response_tcp6,
+     sc_lc_acceptor_response_tcpL
+    ].
+
+%% These cases tests what happens when the socket is closed remotely.
+sc_rc_cases() ->
+    [
+     sc_rc_recv_response_tcp4,
+     sc_rc_recv_response_tcp6,
+     sc_rc_recv_response_tcpL,
+
+     sc_rc_recvmsg_response_tcp4,
+     sc_rc_recvmsg_response_tcp6,
+     sc_rc_recvmsg_response_tcpL
+    ].
+
+%% These cases tests what happens when the socket is shutdown/closed remotely
+%% after writing and reading is ongoing.
+sc_rs_cases() ->
+    [
+     sc_rs_recv_send_shutdown_receive_tcp4,
+     sc_rs_recv_send_shutdown_receive_tcp6,
+     sc_rs_recv_send_shutdown_receive_tcpL,
+
+     sc_rs_recvmsg_send_shutdown_receive_tcp4,
+     sc_rs_recvmsg_send_shutdown_receive_tcp6,
+     sc_rs_recvmsg_send_shutdown_receive_tcpL
+    ].
+
+
+traffic_cases() ->
+    [
+     {group, traffic_counters},
+     {group, traffic_chunks},
+     {group, traffic_pp_send_recv},
+     {group, traffic_pp_sendto_recvfrom},
+     {group, traffic_pp_sendmsg_recvmsg}
+    ].
+
+traffic_counters_cases() ->
+    [
+     traffic_send_and_recv_counters_tcp4,
+     traffic_send_and_recv_counters_tcp6,
+     traffic_send_and_recv_counters_tcpL,
+     traffic_sendmsg_and_recvmsg_counters_tcp4,
+     traffic_sendmsg_and_recvmsg_counters_tcp6,
+     traffic_sendmsg_and_recvmsg_counters_tcpL,
+     traffic_sendto_and_recvfrom_counters_udp4,
+     traffic_sendto_and_recvfrom_counters_udp6,
+     traffic_sendto_and_recvfrom_counters_udpL,
+     traffic_sendmsg_and_recvmsg_counters_udp4,
+     traffic_sendmsg_and_recvmsg_counters_udp6,
+     traffic_sendmsg_and_recvmsg_counters_udpL
+    ].
+
+traffic_chunks_cases() ->
+    [
+     traffic_send_and_recv_chunks_tcp4,
+     traffic_send_and_recv_chunks_tcp6,
+     traffic_send_and_recv_chunks_tcpL
+    ].
+
+traffic_pp_send_recv_cases() ->
+    [
+     traffic_ping_pong_small_send_and_recv_tcp4,
+     traffic_ping_pong_small_send_and_recv_tcp6,
+     traffic_ping_pong_small_send_and_recv_tcpL,
+     traffic_ping_pong_medium_send_and_recv_tcp4,
+     traffic_ping_pong_medium_send_and_recv_tcp6,
+     traffic_ping_pong_medium_send_and_recv_tcpL,
+     traffic_ping_pong_large_send_and_recv_tcp4,
+     traffic_ping_pong_large_send_and_recv_tcp6,
+     traffic_ping_pong_large_send_and_recv_tcpL
+    ].    
+
+traffic_pp_sendto_recvfrom_cases() ->
+    [
+     traffic_ping_pong_small_sendto_and_recvfrom_udp4,
+     traffic_ping_pong_small_sendto_and_recvfrom_udp6,
+     traffic_ping_pong_small_sendto_and_recvfrom_udpL,
+     traffic_ping_pong_medium_sendto_and_recvfrom_udp4,
+     traffic_ping_pong_medium_sendto_and_recvfrom_udp6,
+     traffic_ping_pong_medium_sendto_and_recvfrom_udpL
+    ].
+
+traffic_pp_sendmsg_recvmsg_cases() ->
+    [    
+     traffic_ping_pong_small_sendmsg_and_recvmsg_tcp4,
+     traffic_ping_pong_small_sendmsg_and_recvmsg_tcp6,
+     traffic_ping_pong_small_sendmsg_and_recvmsg_tcpL,
+     traffic_ping_pong_medium_sendmsg_and_recvmsg_tcp4,
+     traffic_ping_pong_medium_sendmsg_and_recvmsg_tcp6,
+     traffic_ping_pong_medium_sendmsg_and_recvmsg_tcpL,
+     traffic_ping_pong_large_sendmsg_and_recvmsg_tcp4,
+     traffic_ping_pong_large_sendmsg_and_recvmsg_tcp6,
+     traffic_ping_pong_large_sendmsg_and_recvmsg_tcpL,
+
+     traffic_ping_pong_small_sendmsg_and_recvmsg_udp4,
+     traffic_ping_pong_small_sendmsg_and_recvmsg_udp6,
+     traffic_ping_pong_small_sendmsg_and_recvmsg_udpL,
+     traffic_ping_pong_medium_sendmsg_and_recvmsg_udp4,
+     traffic_ping_pong_medium_sendmsg_and_recvmsg_udp6,
+     traffic_ping_pong_medium_sendmsg_and_recvmsg_udpL
+    ].
+    
+ttest_cases() ->
+    [
+     %% Server: transport = gen_tcp, active = false
+     {group, ttest_sgenf},
+
+     %% Server: transport = gen_tcp, active = once
+     {group, ttest_sgeno},
+
+     %% Server: transport = gen_tcp, active = true
+     {group, ttest_sgent},
+
+     %% Server: transport = socket(tcp), active = false
+     {group, ttest_ssockf},
+
+     %% Server: transport = socket(tcp), active = once
+     {group, ttest_ssocko},
+
+     %% Server: transport = socket(tcp), active = true
+     {group, ttest_ssockt}
+
+    ].
+
+
+%% Server: transport = gen_tcp, active = false
+ttest_sgenf_cases() ->
+    [
+     {group, ttest_sgenf_cgen},
+     {group, ttest_sgenf_csock}
+    ].
+
+%% Server: transport = gen_tcp, active = false
+%% Client: transport = gen_tcp
+ttest_sgenf_cgen_cases() ->
+    [
+     {group, ttest_sgenf_cgenf},
+     {group, ttest_sgenf_cgeno},
+     {group, ttest_sgenf_cgent}
+    ].
+
+%% Server: transport = gen_tcp, active = false
+%% Client: transport = gen_tcp, active = false
+ttest_sgenf_cgenf_cases() ->
+    [
+     ttest_sgenf_cgenf_small_tcp4,
+     ttest_sgenf_cgenf_small_tcp6,
+
+     ttest_sgenf_cgenf_medium_tcp4,
+     ttest_sgenf_cgenf_medium_tcp6,
+
+     ttest_sgenf_cgenf_large_tcp4,
+     ttest_sgenf_cgenf_large_tcp6
+    ].
+
+%% Server: transport = gen_tcp, active = false
+%% Client: transport = gen_tcp, active = once
+ttest_sgenf_cgeno_cases() ->
+    [
+     ttest_sgenf_cgeno_small_tcp4,
+     ttest_sgenf_cgeno_small_tcp6,
+
+     ttest_sgenf_cgeno_medium_tcp4,
+     ttest_sgenf_cgeno_medium_tcp6,
+
+     ttest_sgenf_cgeno_large_tcp4,
+     ttest_sgenf_cgeno_large_tcp6
+    ].
+
+%% Server: transport = gen_tcp, active = false
+%% Client: transport = gen_tcp, active = true
+ttest_sgenf_cgent_cases() ->
+    [
+     ttest_sgenf_cgent_small_tcp4,
+     ttest_sgenf_cgent_small_tcp6,
+
+     ttest_sgenf_cgent_medium_tcp4,
+     ttest_sgenf_cgent_medium_tcp6,
+
+     ttest_sgenf_cgent_large_tcp4,
+     ttest_sgenf_cgent_large_tcp6
+    ].
+
+%% Server: transport = gen_tcp, active = false
+%% Client: transport = socket(tcp)
+ttest_sgenf_csock_cases() ->
+    [
+     {group, ttest_sgenf_csockf},
+     {group, ttest_sgenf_csocko},
+     {group, ttest_sgenf_csockt}
+    ].
+
+ttest_sgenf_csockf_cases() ->
+    [
+     ttest_sgenf_csockf_small_tcp4,
+     ttest_sgenf_csockf_small_tcp6,
+
+     ttest_sgenf_csockf_medium_tcp4,
+     ttest_sgenf_csockf_medium_tcp6,
+
+     ttest_sgenf_csockf_large_tcp4,
+     ttest_sgenf_csockf_large_tcp6
+    ].
+
+ttest_sgenf_csocko_cases() ->
+    [
+     ttest_sgenf_csocko_small_tcp4,
+     ttest_sgenf_csocko_small_tcp6,
+
+     ttest_sgenf_csocko_medium_tcp4,
+     ttest_sgenf_csocko_medium_tcp6,
+
+     ttest_sgenf_csocko_large_tcp4,
+     ttest_sgenf_csocko_large_tcp6
+    ].
+
+ttest_sgenf_csockt_cases() ->
+    [
+     ttest_sgenf_csockt_small_tcp4,
+     ttest_sgenf_csockt_small_tcp6,
+
+     ttest_sgenf_csockt_medium_tcp4,
+     ttest_sgenf_csockt_medium_tcp6,
+
+     ttest_sgenf_csockt_large_tcp4,
+     ttest_sgenf_csockt_large_tcp6
+    ].
+
+%% Server: transport = gen_tcp, active = once
+ttest_sgeno_cases() ->
+    [
+     {group, ttest_sgeno_cgen},
+     {group, ttest_sgeno_csock}
+    ].
+
+%% Server: transport = gen_tcp, active = once
+%% Client: transport = gen_tcp
+ttest_sgeno_cgen_cases() ->
+    [
+     {group, ttest_sgeno_cgenf},
+     {group, ttest_sgeno_cgeno},
+     {group, ttest_sgeno_cgent}
+    ].
+
+%% Server: transport = gen_tcp, active = once
+%% Client: transport = gen_tcp, active = false
+ttest_sgeno_cgenf_cases() ->
+    [
+     ttest_sgeno_cgenf_small_tcp4,
+     ttest_sgeno_cgenf_small_tcp6,
+
+     ttest_sgeno_cgenf_medium_tcp4,
+     ttest_sgeno_cgenf_medium_tcp6,
+
+     ttest_sgeno_cgenf_large_tcp4,
+     ttest_sgeno_cgenf_large_tcp6
+    ].
+
+%% Server: transport = gen_tcp, active = once
+%% Client: transport = gen_tcp, active = once
+ttest_sgeno_cgeno_cases() ->
+    [
+     ttest_sgeno_cgeno_small_tcp4,
+     ttest_sgeno_cgeno_small_tcp6,
+
+     ttest_sgeno_cgeno_medium_tcp4,
+     ttest_sgeno_cgeno_medium_tcp6,
+
+     ttest_sgeno_cgeno_large_tcp4,
+     ttest_sgeno_cgeno_large_tcp6
+    ].
+
+%% Server: transport = gen_tcp, active = once
+%% Client: transport = gen_tcp, active = true
+ttest_sgeno_cgent_cases() ->
+    [
+     ttest_sgeno_cgent_small_tcp4,
+     ttest_sgeno_cgent_small_tcp6,
+
+     ttest_sgeno_cgent_medium_tcp4,
+     ttest_sgeno_cgent_medium_tcp6,
+
+     ttest_sgeno_cgent_large_tcp4,
+     ttest_sgeno_cgent_large_tcp6
+    ].
+
+%% Server: transport = gen_tcp, active = once
+%% Client: transport = socket(tcp)
+ttest_sgeno_csock_cases() ->
+    [
+     {group, ttest_sgeno_csockf},
+     {group, ttest_sgeno_csocko},
+     {group, ttest_sgeno_csockt}
+    ].
+
+ttest_sgeno_csockf_cases() ->
+    [
+     ttest_sgeno_csockf_small_tcp4,
+     ttest_sgeno_csockf_small_tcp6,
+
+     ttest_sgeno_csockf_medium_tcp4,
+     ttest_sgeno_csockf_medium_tcp6,
+
+     ttest_sgeno_csockf_large_tcp4,
+     ttest_sgeno_csockf_large_tcp6
+    ].
+
+ttest_sgeno_csocko_cases() ->
+    [
+     ttest_sgeno_csocko_small_tcp4,
+     ttest_sgeno_csocko_small_tcp6,
+
+     ttest_sgeno_csocko_medium_tcp4,
+     ttest_sgeno_csocko_medium_tcp6,
+
+     ttest_sgeno_csocko_large_tcp4,
+     ttest_sgeno_csocko_large_tcp6
+    ].
+
+ttest_sgeno_csockt_cases() ->
+    [
+     ttest_sgeno_csockt_small_tcp4,
+     ttest_sgeno_csockt_small_tcp6,
+
+     ttest_sgeno_csockt_medium_tcp4,
+     ttest_sgeno_csockt_medium_tcp6,
+
+     ttest_sgeno_csockt_large_tcp4,
+     ttest_sgeno_csockt_large_tcp6
+    ].
+
+%% Server: transport = gen_tcp, active = true
+ttest_sgent_cases() ->
+    [
+     {group, ttest_sgent_cgen},
+     {group, ttest_sgent_csock}
+    ].
+
+%% Server: transport = gen_tcp, active = true
+%% Client: transport = gen_tcp
+ttest_sgent_cgen_cases() ->
+    [
+     {group, ttest_sgent_cgenf},
+     {group, ttest_sgent_cgeno},
+     {group, ttest_sgent_cgent}
+    ].
+
+%% Server: transport = gen_tcp, active = true
+%% Client: transport = gen_tcp, active = false
+ttest_sgent_cgenf_cases() ->
+    [
+     ttest_sgent_cgenf_small_tcp4,
+     ttest_sgent_cgenf_small_tcp6,
+
+     ttest_sgent_cgenf_medium_tcp4,
+     ttest_sgent_cgenf_medium_tcp6,
+
+     ttest_sgent_cgenf_large_tcp4,
+     ttest_sgent_cgenf_large_tcp6
+    ].
+
+%% Server: transport = gen_tcp, active = true
+%% Client: transport = gen_tcp, active = once
+ttest_sgent_cgeno_cases() ->
+    [
+     ttest_sgent_cgeno_small_tcp4,
+     ttest_sgent_cgeno_small_tcp6,
+
+     ttest_sgent_cgeno_medium_tcp4,
+     ttest_sgent_cgeno_medium_tcp6,
+
+     ttest_sgent_cgeno_large_tcp4,
+     ttest_sgent_cgeno_large_tcp6
+    ].
+
+%% Server: transport = gen_tcp, active = true
+%% Client: transport = gen_tcp, active = true
+ttest_sgent_cgent_cases() ->
+    [
+     ttest_sgent_cgent_small_tcp4,
+     ttest_sgent_cgent_small_tcp6,
+
+     ttest_sgent_cgent_medium_tcp4,
+     ttest_sgent_cgent_medium_tcp6,
+
+     ttest_sgent_cgent_large_tcp4,
+     ttest_sgent_cgent_large_tcp6
+    ].
+
+%% Server: transport = gen_tcp, active = true
+%% Client: transport = socket(tcp)
+ttest_sgent_csock_cases() ->
+    [
+     {group, ttest_sgent_csockf},
+     {group, ttest_sgent_csocko},
+     {group, ttest_sgent_csockt}
+    ].
+
+ttest_sgent_csockf_cases() ->
+    [
+     ttest_sgent_csockf_small_tcp4,
+     ttest_sgent_csockf_small_tcp6,
+
+     ttest_sgent_csockf_medium_tcp4,
+     ttest_sgent_csockf_medium_tcp6,
+
+     ttest_sgent_csockf_large_tcp4,
+     ttest_sgent_csockf_large_tcp6
+    ].
+
+ttest_sgent_csocko_cases() ->
+    [
+     ttest_sgent_csocko_small_tcp4,
+     ttest_sgent_csocko_small_tcp6,
+
+     ttest_sgent_csocko_medium_tcp4,
+     ttest_sgent_csocko_medium_tcp6,
+
+     ttest_sgent_csocko_large_tcp4,
+     ttest_sgent_csocko_large_tcp6
+    ].
+
+ttest_sgent_csockt_cases() ->
+    [
+     ttest_sgent_csockt_small_tcp4,
+     ttest_sgent_csockt_small_tcp6,
+
+     ttest_sgent_csockt_medium_tcp4,
+     ttest_sgent_csockt_medium_tcp6,
+
+     ttest_sgent_csockt_large_tcp4,
+     ttest_sgent_csockt_large_tcp6
+    ].
+
+%% Server: transport = socket(tcp), active = false
+ttest_ssockf_cases() ->
+    [
+     {group, ttest_ssockf_cgen},
+     {group, ttest_ssockf_csock}
+    ].
+
+%% Server: transport = socket(tcp), active = false
+%% Client: transport = gen_tcp
+ttest_ssockf_cgen_cases() ->
+    [
+     {group, ttest_ssockf_cgenf},
+     {group, ttest_ssockf_cgeno},
+     {group, ttest_ssockf_cgent}
+    ].
+
+%% Server: transport = socket(tcp), active = false
+%% Client: transport = gen_tcp, active = false
+ttest_ssockf_cgenf_cases() ->
+    [
+     ttest_ssockf_cgenf_small_tcp4,
+     ttest_ssockf_cgenf_small_tcp6,
+
+     ttest_ssockf_cgenf_medium_tcp4,
+     ttest_ssockf_cgenf_medium_tcp6,
+
+     ttest_ssockf_cgenf_large_tcp4,
+     ttest_ssockf_cgenf_large_tcp6
+    ].
+
+%% Server: transport = socket(tcp), active = false
+%% Client: transport = gen_tcp, active = once
+ttest_ssockf_cgeno_cases() ->
+    [
+     ttest_ssockf_cgeno_small_tcp4,
+     ttest_ssockf_cgeno_small_tcp6,
+
+     ttest_ssockf_cgeno_medium_tcp4,
+     ttest_ssockf_cgeno_medium_tcp6,
+
+     ttest_ssockf_cgeno_large_tcp4,
+     ttest_ssockf_cgeno_large_tcp6
+    ].
+
+%% Server: transport = socket(tcp), active = false
+%% Client: transport = gen_tcp, active = true
+ttest_ssockf_cgent_cases() ->
+    [
+     ttest_ssockf_cgent_small_tcp4,
+     ttest_ssockf_cgent_small_tcp6,
+
+     ttest_ssockf_cgent_medium_tcp4,
+     ttest_ssockf_cgent_medium_tcp6,
+
+     ttest_ssockf_cgent_large_tcp4,
+     ttest_ssockf_cgent_large_tcp6
+    ].
+
+%% Server: transport = socket(tcp), active = false
+%% Client: transport = socket(tcp)
+ttest_ssockf_csock_cases() ->
+    [
+     {group, ttest_ssockf_csockf},
+     {group, ttest_ssockf_csocko},
+     {group, ttest_ssockf_csockt}
+    ].
+
+%% Server: transport = socket(tcp), active = false
+%% Client: transport = socket(tcp), active = false
+ttest_ssockf_csockf_cases() ->
+    [
+     ttest_ssockf_csockf_small_tcp4,
+     ttest_ssockf_csockf_small_tcp6,
+     ttest_ssockf_csockf_small_tcpL,
+
+     ttest_ssockf_csockf_medium_tcp4,
+     ttest_ssockf_csockf_medium_tcp6,
+     ttest_ssockf_csockf_medium_tcpL,
+
+     ttest_ssockf_csockf_large_tcp4,
+     ttest_ssockf_csockf_large_tcp6,
+     ttest_ssockf_csockf_large_tcpL
+    ].
+
+%% Server: transport = socket(tcp), active = false
+%% Client: transport = socket(tcp), active = once
+ttest_ssockf_csocko_cases() ->
+    [
+     ttest_ssockf_csocko_small_tcp4,
+     ttest_ssockf_csocko_small_tcp6,
+     ttest_ssockf_csocko_small_tcpL,
+
+     ttest_ssockf_csocko_medium_tcp4,
+     ttest_ssockf_csocko_medium_tcp6,
+     ttest_ssockf_csocko_medium_tcpL,
+
+     ttest_ssockf_csocko_large_tcp4,
+     ttest_ssockf_csocko_large_tcp6,
+     ttest_ssockf_csocko_large_tcpL
+    ].
+
+%% Server: transport = socket(tcp), active = false
+%% Client: transport = socket(tcp), active = true
+ttest_ssockf_csockt_cases() ->
+    [
+     ttest_ssockf_csockt_small_tcp4,
+     ttest_ssockf_csockt_small_tcp6,
+     ttest_ssockf_csockt_small_tcpL,
+
+     ttest_ssockf_csockt_medium_tcp4,
+     ttest_ssockf_csockt_medium_tcp6,
+     ttest_ssockf_csockt_medium_tcpL,
+
+     ttest_ssockf_csockt_large_tcp4,
+     ttest_ssockf_csockt_large_tcp6,
+     ttest_ssockf_csockt_large_tcpL
+    ].
+
+%% Server: transport = socket(tcp), active = once
+ttest_ssocko_cases() ->
+    [
+     {group, ttest_ssocko_cgen},
+     {group, ttest_ssocko_csock}
+    ].
+
+%% Server: transport = socket(tcp), active = once
+%% Client: transport = gen_tcp
+ttest_ssocko_cgen_cases() ->
+    [
+     {group, ttest_ssocko_cgenf},
+     {group, ttest_ssocko_cgeno},
+     {group, ttest_ssocko_cgent}
+    ].
+
+%% Server: transport = socket(tcp), active = once
+%% Client: transport = gen_tcp, active = false
+ttest_ssocko_cgenf_cases() ->
+    [
+     ttest_ssocko_cgenf_small_tcp4,
+     ttest_ssocko_cgenf_small_tcp6,
+
+     ttest_ssocko_cgenf_medium_tcp4,
+     ttest_ssocko_cgenf_medium_tcp6,
+
+     ttest_ssocko_cgenf_large_tcp4,
+     ttest_ssocko_cgenf_large_tcp6
+    ].
+
+%% Server: transport = socket(tcp), active = once
+%% Client: transport = gen_tcp, active = once
+ttest_ssocko_cgeno_cases() ->
+    [
+     ttest_ssocko_cgeno_small_tcp4,
+     ttest_ssocko_cgeno_small_tcp6,
+
+     ttest_ssocko_cgeno_medium_tcp4,
+     ttest_ssocko_cgeno_medium_tcp6,
+
+     ttest_ssocko_cgeno_large_tcp4,
+     ttest_ssocko_cgeno_large_tcp6
+    ].
+
+%% Server: transport = socket(tcp), active = once
+%% Client: transport = gen_tcp, active = true
+ttest_ssocko_cgent_cases() ->
+    [
+     ttest_ssocko_cgent_small_tcp4,
+     ttest_ssocko_cgent_small_tcp6,
+
+     ttest_ssocko_cgent_medium_tcp4,
+     ttest_ssocko_cgent_medium_tcp6,
+
+     ttest_ssocko_cgent_large_tcp4,
+     ttest_ssocko_cgent_large_tcp6
+    ].
+
+%% Server: transport = socket(tcp), active = once
+%% Client: transport = socket(tcp)
+ttest_ssocko_csock_cases() ->
+    [
+     {group, ttest_ssocko_csockf},
+     {group, ttest_ssocko_csocko},
+     {group, ttest_ssocko_csockt}
+    ].
+
+%% Server: transport = socket(tcp), active = once
+%% Client: transport = socket(tcp), active = false
+ttest_ssocko_csockf_cases() ->
+    [
+     ttest_ssocko_csockf_small_tcp4,
+     ttest_ssocko_csockf_small_tcp6,
+     ttest_ssocko_csockf_small_tcpL,
+
+     ttest_ssocko_csockf_medium_tcp4,
+     ttest_ssocko_csockf_medium_tcp6,
+     ttest_ssocko_csockf_medium_tcpL,
+
+     ttest_ssocko_csockf_large_tcp4,
+     ttest_ssocko_csockf_large_tcp6,
+     ttest_ssocko_csockf_large_tcpL
+    ].
+
+%% Server: transport = socket(tcp), active = once
+%% Client: transport = socket(tcp), active = once
+ttest_ssocko_csocko_cases() ->
+    [
+     ttest_ssocko_csocko_small_tcp4,
+     ttest_ssocko_csocko_small_tcp6,
+     ttest_ssocko_csocko_small_tcpL,
+
+     ttest_ssocko_csocko_medium_tcp4,
+     ttest_ssocko_csocko_medium_tcp6,
+     ttest_ssocko_csocko_medium_tcpL,
+
+     ttest_ssocko_csocko_large_tcp4,
+     ttest_ssocko_csocko_large_tcp6,
+     ttest_ssocko_csocko_large_tcpL
+    ].
+
+%% Server: transport = socket(tcp), active = once
+%% Client: transport = socket(tcp), active = true
+ttest_ssocko_csockt_cases() ->
+    [
+     ttest_ssocko_csockt_small_tcp4,
+     ttest_ssocko_csockt_small_tcp6,
+     ttest_ssocko_csockt_small_tcpL,
+
+     ttest_ssocko_csockt_medium_tcp4,
+     ttest_ssocko_csockt_medium_tcp6,
+     ttest_ssocko_csockt_medium_tcpL,
+
+     ttest_ssocko_csockt_large_tcp4,
+     ttest_ssocko_csockt_large_tcp6,
+     ttest_ssocko_csockt_large_tcpL
+    ].
+
+%% Server: transport = socket(tcp), active = true
+ttest_ssockt_cases() ->
+    [
+     {group, ttest_ssockt_cgen},
+     {group, ttest_ssockt_csock}
+    ].
+
+%% Server: transport = socket(tcp), active = true
+%% Client: transport = gen_tcp
+ttest_ssockt_cgen_cases() ->
+    [
+     {group, ttest_ssockt_cgenf},
+     {group, ttest_ssockt_cgeno},
+     {group, ttest_ssockt_cgent}
+    ].
+
+%% Server: transport = socket(tcp), active = true
+%% Client: transport = gen_tcp, active = false
+ttest_ssockt_cgenf_cases() ->
+    [
+     ttest_ssockt_cgenf_small_tcp4,
+     ttest_ssockt_cgenf_small_tcp6,
+
+     ttest_ssockt_cgenf_medium_tcp4,
+     ttest_ssockt_cgenf_medium_tcp6,
+
+     ttest_ssockt_cgenf_large_tcp4,
+     ttest_ssockt_cgenf_large_tcp6
+    ].
+
+%% Server: transport = socket(tcp), active = true
+%% Client: transport = gen_tcp, active = once
+ttest_ssockt_cgeno_cases() ->
+    [
+     ttest_ssockt_cgeno_small_tcp4,
+     ttest_ssockt_cgeno_small_tcp6,
+
+     ttest_ssockt_cgeno_medium_tcp4,
+     ttest_ssockt_cgeno_medium_tcp6,
+
+     ttest_ssockt_cgeno_large_tcp4,
+     ttest_ssockt_cgeno_large_tcp6
+    ].
+
+%% Server: transport = socket(tcp), active = true
+%% Client: transport = gen_tcp, active = true
+ttest_ssockt_cgent_cases() ->
+    [
+     ttest_ssockt_cgent_small_tcp4,
+     ttest_ssockt_cgent_small_tcp6,
+
+     ttest_ssockt_cgent_medium_tcp4,
+     ttest_ssockt_cgent_medium_tcp6,
+
+     ttest_ssockt_cgent_large_tcp4,
+     ttest_ssockt_cgent_large_tcp6
+    ].
+
+%% Server: transport = socket(tcp), active = true
+%% Client: transport = socket(tcp)
+ttest_ssockt_csock_cases() ->
+    [
+     {group, ttest_ssockt_csockf},
+     {group, ttest_ssockt_csocko},
+     {group, ttest_ssockt_csockt}
+    ].
+
+%% Server: transport = socket(tcp), active = true
+%% Client: transport = socket(tcp), active = false
+ttest_ssockt_csockf_cases() ->
+    [
+     ttest_ssockt_csockf_small_tcp4,
+     ttest_ssockt_csockf_small_tcp6,
+     ttest_ssockt_csockf_small_tcpL,
+
+     ttest_ssockt_csockf_medium_tcp4,
+     ttest_ssockt_csockf_medium_tcp6,
+     ttest_ssockt_csockf_medium_tcpL,
+
+     ttest_ssockt_csockf_large_tcp4,
+     ttest_ssockt_csockf_large_tcp6,
+     ttest_ssockt_csockf_large_tcpL
+    ].
+
+%% Server: transport = socket(tcp), active = true
+%% Client: transport = socket(tcp), active = once
+ttest_ssockt_csocko_cases() ->
+    [
+     ttest_ssockt_csocko_small_tcp4,
+     ttest_ssockt_csocko_small_tcp6,
+     ttest_ssockt_csocko_small_tcpL,
+
+     ttest_ssockt_csocko_medium_tcp4,
+     ttest_ssockt_csocko_medium_tcp6,
+     ttest_ssockt_csocko_medium_tcpL,
+
+     ttest_ssockt_csocko_large_tcp4,
+     ttest_ssockt_csocko_large_tcp6,
+     ttest_ssockt_csocko_large_tcpL
+    ].
+
+%% Server: transport = socket(tcp), active = true
+%% Client: transport = socket(tcp), active = true
+ttest_ssockt_csockt_cases() ->
+    [
+     ttest_ssockt_csockt_small_tcp4,
+     ttest_ssockt_csockt_small_tcp6,
+     ttest_ssockt_csockt_small_tcpL,
+
+     ttest_ssockt_csockt_medium_tcp4,
+     ttest_ssockt_csockt_medium_tcp6,
+     ttest_ssockt_csockt_medium_tcpL,
+
+     ttest_ssockt_csockt_large_tcp4,
+     ttest_ssockt_csockt_large_tcp6,
+     ttest_ssockt_csockt_large_tcpL
+    ].
+
+%% ticket_cases() ->
+%%     [].
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+init_per_suite(Config) ->
+    case lists:member(socket, erlang:loaded()) of
+        true ->
+            case os:type() of
+                {win32, _} ->
+                    (catch not_yet_implemented());
+                _ ->
+                    case quiet_mode(Config) of
+                        default ->
+                            ?LOGGER:start(),
+                            Config;
+                        Quiet ->
+                            ?LOGGER:start(Quiet),
+                            [{esock_test_quiet, Quiet}|Config]
+                    end
+            end;
+        false ->
+            {skip, "esock disabled"}
+    end.
+
+end_per_suite(_) ->
+    (catch ?LOGGER:stop()),
+    ok.
+
+
+init_per_group(ttest = _GroupName, Config) ->
+    io:format("init_per_group(~w) -> entry with"
+              "~n   Config: ~p"
+              "~n", [_GroupName, Config]),
+    ttest_manager_start(),
+    case lists:keysearch(esock_test_ttest_runtime, 1, Config) of
+        {value, _} ->
+            Config;
+        false ->
+            [{esock_test_ttest_runtime, which_ttest_runtime_env()} | Config]
+    end;
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(ttest = _GroupName, Config) ->
+    io:format("init_per_group(~w) -> entry with"
+              "~n   Config: ~p"
+              "~n", [_GroupName, Config]),
+    ttest_manager_stop(),
+    lists:keydelete(esock_test_ttest_runtime, 1, Config);
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_testcase(_TC, Config) ->
+    io:format("init_per_testcase(~w) -> entry with"
+              "~n   Config: ~p"
+              "~n", [_TC, Config]),
+    %% case quiet_mode(Config) of
+    %%     default ->
+    %%         ?LOGGER:start();
+    %%     Quiet ->
+    %%         ?LOGGER:start(Quiet)
+    %% end,
+    Config.
+
+end_per_testcase(_TC, Config) ->
+    %% ?LOGGER:stop(),
+    Config.
+
+
+quiet_mode(Config) ->
+    case lists:keysearch(esock_test_quiet, 1, Config) of
+        {value, {esock_test_quiet, Quiet}} ->
+            Quiet;
+        false ->
+            case os:getenv("ESOCK_TEST_QUIET") of
+                "true"  -> true;
+                "false" -> false;
+                _       -> default
+            end
+    end.
+
+
+                
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                     %%
+%%                           API MISC                                  %%
+%%                                                                     %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% A simple test case that tests that the global debug can be channged.
+%% At the same time, it will test the info function (since it uses it
+%% for verification).
+
+api_m_debug(suite) ->
+    [];
+api_m_debug(doc) ->
+    [];
+api_m_debug(_Config) when is_list(_Config) ->
+    ?TT(?SECS(5)),
+    tc_try(api_m_debug,
+           fun() -> has_bugfree_gcc() end,
+           fun() ->
+                   ok = api_m_debug()
+           end).
+
+%% For some reason this test case triggers a gcc bug, which causes
+%% a segfault, on an ancient Fedora 16 VM. So, check the version of gcc...
+%% Not pretty, but the simplest way to skip (without actually testing for the host).
+has_bugfree_gcc() ->
+    has_bugfree_gcc(os:type()).
+
+%% Make sure we are on linux
+has_bugfree_gcc({unix, linux}) ->
+    has_bugfree_gcc2(string:trim(os:cmd("cat /etc/issue")));
+has_bugfree_gcc(_) ->
+    ok.
+
+%% Make sure we are on Fedora 16
+has_bugfree_gcc2("Fedora release 16 " ++ _) ->
+    has_bugfree_gcc3(os:cmd("gcc --version"));
+has_bugfree_gcc2("Welcome to SUSE Linux " ++ _) ->
+    has_bugfree_gcc4(os:cmd("gcc --version"));
+has_bugfree_gcc2(_) ->
+    ok.
+
+has_bugfree_gcc3("gcc (GCC) 4.6.3 20120306 (Red Hat 4.6.3-2" ++ _) ->
+    skip("Buggy GCC");
+has_bugfree_gcc3(_) ->
+    ok.
+
+has_bugfree_gcc4("gcc (SUSE Linux) 4.3.2" ++ _) ->
+    skip("Buggy GCC");
+has_bugfree_gcc4(_) ->
+    ok.
+
+api_m_debug() ->
+    i("get initial info"),
+    #{debug := D0} = socket:info(),
+    D1 = not D0,
+    i("set new debug (~w => ~w)", [D0, D1]),
+    ok = socket:debug(D1),
+    i("get updated info (~w)", [D1]),
+    #{debug := D1} = socket:info(),
+    D2 = not D1,
+    i("set new debug (~w => ~w)", [D1, D2]),
+    ok = socket:debug(D2),
+    i("get updated info (~w)", [D2]),
+    #{debug := D2} = socket:info(),
+    i("ok"),
+    ok.
+    
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                     %%
+%%                           API BASIC                                 %%
+%%                                                                     %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically open (create) and close an IPv4 UDP (dgram) socket.
+%% With some extra checks...
+api_b_open_and_close_udp4(suite) ->
+    [];
+api_b_open_and_close_udp4(doc) ->
+    [];
+api_b_open_and_close_udp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(5)),
+    tc_try(api_b_open_and_close_udp4,
+           fun() ->
+                   InitState = #{domain   => inet,
+                                 type     => dgram,
+                                 protocol => udp},
+                   ok = api_b_open_and_close(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically open (create) and close an IPv4 TCP (stream) socket.
+%% With some extra checks...
+api_b_open_and_close_tcp4(suite) ->
+    [];
+api_b_open_and_close_tcp4(doc) ->
+    [];
+api_b_open_and_close_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(5)),
+    tc_try(api_b_open_and_close_tcp4,
+           fun() ->
+                   InitState = #{domain   => inet,
+                                 type     => stream,
+                                 protocol => tcp},
+                   ok = api_b_open_and_close(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically open (create) and close an Unix Domain dgram (UDP) socket.
+%% With some extra checks...
+api_b_open_and_close_udpL(suite) ->
+    [];
+api_b_open_and_close_udpL(doc) ->
+    [];
+api_b_open_and_close_udpL(_Config) when is_list(_Config) ->
+    ?TT(?SECS(5)),
+    tc_try(api_b_open_and_close_udpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   InitState = #{domain   => local,
+                                 type     => dgram,
+                                 protocol => default},
+                   ok = api_b_open_and_close(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically open (create) and close an Unix Domain stream (TCP) socket.
+%% With some extra checks...
+api_b_open_and_close_tcpL(suite) ->
+    [];
+api_b_open_and_close_tcpL(doc) ->
+    [];
+api_b_open_and_close_tcpL(_Config) when is_list(_Config) ->
+    ?TT(?SECS(5)),
+    tc_try(api_b_open_and_close_tcpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   InitState = #{domain   => local,
+                                 type     => stream,
+                                 protocol => default},
+                   ok = api_b_open_and_close(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+api_b_open_and_close(InitState) ->
+    Seq = 
+        [
+         #{desc => "open",
+           cmd  => fun(#{domain   := Domain,
+                         type     := Type,
+                         protocol := Protocol} = S) -> 
+                           Res = socket:open(Domain, Type, Protocol), 
+                           {ok, {S, Res}} 
+                   end},
+         #{desc => "validate open",
+           cmd  => fun({S, {ok, Sock}}) -> 
+                           NewS = S#{socket => Sock},
+                           {ok, NewS};
+                      ({_, {error, _} = ERROR}) ->
+                           ERROR
+                   end},
+         #{desc => "get domain (maybe)",
+           cmd  => fun(#{socket := Sock} = S) ->
+                           Res = socket:getopt(Sock, socket, domain),
+                           {ok, {S, Res}}
+                   end},
+         #{desc => "validate domain (maybe)",
+           cmd  => fun({#{domain := Domain} = S, {ok, Domain}}) -> 
+                           {ok, S};
+                      ({#{domain := ExpDomain}, {ok, Domain}}) ->
+                           {error, {unexpected_domain, ExpDomain, Domain}};
+                      %% Some platforms do not support this option
+                      ({S, {error, einval}}) ->
+                           {ok, S};
+                      ({_, {error, _} = ERROR}) ->
+                           ERROR
+                   end},
+         #{desc => "get type",
+           cmd  => fun(#{socket := Sock} = State) ->
+                           Res = socket:getopt(Sock, socket, type), 
+                           {ok, {State, Res}}
+                   end},
+         #{desc => "validate type",
+           cmd  => fun({#{type := Type} = State, {ok, Type}}) ->
+                           {ok, State};
+                      ({#{type := ExpType}, {ok, Type}}) ->
+                           {error, {unexpected_type, ExpType, Type}};
+                      ({_, {error, _} = ERROR}) ->
+                           ERROR
+                   end},
+         #{desc => "get protocol",
+           cmd  => fun(#{socket := Sock} = State) ->
+			   case socket:supports(options, socket, protocol) of
+			       true ->
+				   Res = socket:getopt(Sock, socket, protocol),
+				   {ok, {State, Res}};
+			       false ->
+				   {ok, {State, not_supported}}
+			   end
+                   end},
+         #{desc => "validate protocol",
+           cmd  => fun({State, not_supported}) ->
+			   ?SEV_IPRINT("socket option 'protocol' "
+				       "not supported"),
+                           {ok, State};
+                      ({#{protocol := Protocol} = State, {ok, Protocol}}) ->
+                           {ok, State};
+                      ({#{protocol := ExpProtocol}, {ok, Protocol}}) ->
+                           {error, {unexpected_type, ExpProtocol, Protocol}};
+                      ({_, {error, _} = ERROR}) ->
+                           ERROR
+                   end},
+         #{desc => "get controlling-process",
+           cmd  => fun(#{socket := Sock} = State) ->
+                           Res = socket:getopt(Sock, otp, controlling_process),
+                           {ok, {State, Res}}
+                   end},
+         #{desc => "validate controlling-process",
+           cmd  => fun({State, {ok, Pid}}) ->
+                           case self() of
+                               Pid ->
+                                   {ok, State};
+                               _ ->
+                                   {error, {unexpected_owner, Pid}}
+                           end;
+                      ({_, {error, _} = ERROR}) ->
+                           ERROR
+                   end},
+         #{desc => "close socket",
+           cmd  => fun(#{socket := Sock} = State) ->
+                           Res = socket:close(Sock),
+                           {ok, {State, Res}}
+                   end},
+         #{desc => "validate socket close",
+           cmd  => fun({_, ok}) ->
+                           ok;
+                      ({_, {error, _} = ERROR}) ->
+                           ERROR
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+    Evaluator = ?SEV_START("tester", Seq, InitState),
+    ok = ?SEV_AWAIT_FINISH([Evaluator]).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically send and receive on an IPv4 UDP (dgram) socket using
+%% sendto and recvfrom..
+api_b_sendto_and_recvfrom_udp4(suite) ->
+    [];
+api_b_sendto_and_recvfrom_udp4(doc) ->
+    [];
+api_b_sendto_and_recvfrom_udp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(5)),
+    tc_try(api_b_sendto_and_recvfrom_udp4,
+           fun() ->
+                   Send = fun(Sock, Data, Dest) ->
+                                  socket:sendto(Sock, Data, Dest)
+                          end,
+                   Recv = fun(Sock) ->
+                                  socket:recvfrom(Sock)
+                          end,
+                   InitState = #{domain => inet,
+                                 proto  => udp,
+                                 send   => Send,
+                                 recv   => Recv},
+                   ok = api_b_send_and_recv_udp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically send and receive on an IPv4 UDP (dgram) socket using
+%% sendto and recvfrom.
+api_b_sendto_and_recvfrom_udpL(suite) ->
+    [];
+api_b_sendto_and_recvfrom_udpL(doc) ->
+    [];
+api_b_sendto_and_recvfrom_udpL(_Config) when is_list(_Config) ->
+    ?TT(?SECS(5)),
+    tc_try(api_b_sendto_and_recvfrom_udpL,
+           fun() ->
+                   has_support_unix_domain_socket(),
+                   unix_domain_socket_host_cond()
+           end,
+           fun() ->
+                   Send = fun(Sock, Data, Dest) ->
+                                  socket:sendto(Sock, Data, Dest)
+                          end,
+                   Recv = fun(Sock) ->
+                                  socket:recvfrom(Sock)
+                          end,
+                   InitState = #{domain => local,
+                                 proto  => default,
+                                 send   => Send,
+                                 recv   => Recv},
+                   ok = api_b_send_and_recv_udp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically send and receive on an IPv4 UDP (dgram) socket
+%% using sendmsg and recvmsg.
+api_b_sendmsg_and_recvmsg_udp4(suite) ->
+    [];
+api_b_sendmsg_and_recvmsg_udp4(doc) ->
+    [];
+api_b_sendmsg_and_recvmsg_udp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(5)),
+    tc_try(api_b_sendmsg_and_recvmsg_udp4,
+           fun() ->
+                   Send = fun(Sock, Data, Dest) ->
+                                  %% We need tests for this,
+                                  %% but this is not the place it.
+                                  %% CMsgHdr  = #{level => ip,
+                                  %%              type  => tos,
+                                  %%              data  => reliability},
+                                  %% CMsgHdrs = [CMsgHdr],
+                                  MsgHdr = #{addr => Dest,
+                                             %% ctrl => CMsgHdrs,
+                                             iov  => [Data]},
+                                  socket:sendmsg(Sock, MsgHdr)
+                          end,
+                   Recv = fun(Sock) ->
+                                  %% We have some issues on old darwing...
+                                  %% socket:setopt(Sock, otp, debug, true),
+                                  case socket:recvmsg(Sock) of
+                                      {ok, #{addr  := Source,
+                                             iov   := [Data]}} ->
+                                          %% socket:setopt(Sock, otp, debug, false),
+                                          {ok, {Source, Data}};
+                                      {error, _} = ERROR ->
+                                          ERROR
+                                  end
+                          end,
+                   InitState = #{domain => inet,
+                                 proto  => udp,
+                                 send   => Send,
+                                 recv   => Recv},
+                   ok = api_b_send_and_recv_udp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically send and receive on an IPv4 UDP (dgram) socket
+%% using sendmsg and recvmsg.
+api_b_sendmsg_and_recvmsg_udpL(suite) ->
+    [];
+api_b_sendmsg_and_recvmsg_udpL(doc) ->
+    [];
+api_b_sendmsg_and_recvmsg_udpL(_Config) when is_list(_Config) ->
+    ?TT(?SECS(5)),
+    tc_try(api_b_sendmsg_and_recvmsg_udpL,
+           fun() ->
+                   has_support_unix_domain_socket(),
+                   unix_domain_socket_host_cond()
+           end,
+           fun() ->
+                   Send = fun(Sock, Data, Dest) ->
+                                  %% We need tests for this,
+                                  %% but this is not the place it.
+                                  %% CMsgHdr  = #{level => ip,
+                                  %%              type  => tos,
+                                  %%              data  => reliability},
+                                  %% CMsgHdrs = [CMsgHdr],
+                                  MsgHdr = #{addr => Dest,
+                                             %% ctrl => CMsgHdrs,
+                                             iov  => [Data]},
+                                  socket:sendmsg(Sock, MsgHdr)
+                          end,
+                   Recv = fun(Sock) ->
+                                  %% We have some issues on old darwing...
+                                  %% socket:setopt(Sock, otp, debug, true),
+                                  case socket:recvmsg(Sock) of
+                                      {ok, #{addr  := Source,
+                                             iov   := [Data]}} ->
+                                          %% socket:setopt(Sock, otp, debug, false),
+                                          {ok, {Source, Data}};
+                                      {error, _} = ERROR ->
+                                          ERROR
+                                  end
+                          end,
+                   InitState = #{domain => local,
+                                 proto  => default,
+                                 send   => Send,
+                                 recv   => Recv},
+                   ok = api_b_send_and_recv_udp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+api_b_send_and_recv_udp(InitState) ->
+    Seq = 
+        [
+         #{desc => "local address",
+           cmd  => fun(#{domain := local = Domain} = State) ->
+                           LSASrc = which_local_socket_addr(Domain),
+                           LSADst = which_local_socket_addr(Domain),
+                           {ok, State#{lsa_src => LSASrc,
+                                       lsa_dst => LSADst}};
+                      (#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{lsa_src => LSA,
+                                       lsa_dst => LSA}}
+                   end},
+
+         #{desc => "open src socket",
+           cmd  => fun(#{domain := Domain,
+                         proto  := Proto} = State) ->
+                           Sock = sock_open(Domain, dgram, Proto),
+                           {ok, State#{sock_src => Sock}}
+                   end},
+         #{desc => "bind src",
+           cmd  => fun(#{sock_src := Sock, lsa_src := LSA}) ->
+                           case socket:bind(Sock, LSA) of
+                               {ok, _Port} ->
+                                   ?SEV_IPRINT("src bound"),
+                                   ok;
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("src bind failed: ~p", [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "sockname src socket",
+           cmd  => fun(#{sock_src := Sock} = State) ->
+                           SASrc = sock_sockname(Sock),
+                           ?SEV_IPRINT("src sockaddr: "
+                                       "~n   ~p", [SASrc]),
+                           {ok, State#{sa_src => SASrc}}
+                   end},
+
+         #{desc => "open dst socket",
+           cmd  => fun(#{domain := Domain,
+                         proto  := Proto} = State) ->
+                           Sock = sock_open(Domain, dgram, Proto),
+                           {ok, State#{sock_dst => Sock}}
+                   end},
+         #{desc => "bind dst",
+           cmd  => fun(#{sock_dst := Sock, lsa_dst := LSA}) ->
+                           case socket:bind(Sock, LSA) of
+                               {ok, _Port} ->
+                                   ?SEV_IPRINT("src bound"),
+                                   ok;
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("src bind failed: ~p", [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "sockname dst socket",
+           cmd  => fun(#{sock_dst := Sock} = State) ->
+                           SADst = sock_sockname(Sock),
+                           ?SEV_IPRINT("dst sockaddr: "
+                                       "~n   ~p", [SADst]),
+                           {ok, State#{sa_dst => SADst}}
+                   end},
+         #{desc => "send req (to dst)",
+           cmd  => fun(#{sock_src := Sock, sa_dst := Dst, send := Send}) ->
+                           Send(Sock, ?BASIC_REQ, Dst)
+                   end},
+         #{desc => "recv req (from src)",
+           cmd  => fun(#{sock_dst := Sock, sa_src := Src, recv := Recv}) ->
+                           case Recv(Sock) of
+                               {ok, {Src, ?BASIC_REQ}} ->
+                                   ok;
+                               {ok, UnexpData} ->
+                                   {error, {unexpected_data, UnexpData}};
+                               {error, _} = ERROR ->
+                                   %% At the moment there is no way to get
+                                   %% status or state for the socket...
+                                   ERROR
+                           end
+                   end},
+         #{desc => "send rep (to src)",
+           cmd  => fun(#{sock_dst := Sock, sa_src := Src, send := Send}) ->
+                           Send(Sock, ?BASIC_REP, Src)
+                   end},
+         #{desc => "recv rep (from dst)",
+           cmd  => fun(#{sock_src := Sock, sa_dst := Dst, recv := Recv}) ->
+                           case Recv(Sock) of
+                               {ok, {Dst, ?BASIC_REP}} ->
+                                   ok;
+                               {ok, UnexpData} ->
+                                   {error, {unexpected_data, UnexpData}};
+                               {error, _} = ERROR ->
+                                   %% At the moment there is no way to get
+                                   %% status or state for the socket...
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close src socket",
+           cmd  => fun(#{domain   := local,
+                         sock_src := Sock,
+                         lsa_src  := #{path := Path}} = State) ->
+                           ok = socket:close(Sock),
+                           State1 =
+                               unlink_path(Path,
+                                           fun() -> maps:remove(lsa_src, State) end,
+                                           fun() -> State end),
+                           {ok, maps:remove(sock_src, State1)};
+                      (#{sock_src := Sock} = State) ->
+                           ok = socket:close(Sock),
+                           {ok, maps:remove(sock_src, State)}
+                   end},
+         #{desc => "close dst socket",
+           cmd  => fun(#{domain   := local,
+                         sock_dst := Sock,
+                         lsa_dst  := #{path := Path}} = State) ->
+                           ok = socket:close(Sock),
+                           State1 =
+                               unlink_path(Path,
+                                           fun() -> maps:remove(lsa_dst, State) end,
+                                           fun() -> State end),
+                           {ok, maps:remove(sock_dst, State1)};
+                      (#{sock_dst := Sock} = State) ->
+                           ok = socket:close(Sock),
+                           {ok, maps:remove(sock_dst, State)}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+    Evaluator = ?SEV_START("tester", Seq, InitState),
+    ok = ?SEV_AWAIT_FINISH([Evaluator]).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically send and receive using the "common" functions (send and recv)
+%% on an IPv4 TCP (stream) socket.
+api_b_send_and_recv_tcp4(suite) ->
+    [];
+api_b_send_and_recv_tcp4(doc) ->
+    [];
+api_b_send_and_recv_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_b_send_and_recv_tcp4,
+           fun() ->
+                   Send = fun(Sock, Data) ->
+                                  socket:send(Sock, Data)
+                          end,
+                   Recv = fun(Sock) ->
+                                  socket:recv(Sock)
+                          end,
+                   InitState = #{domain => inet,
+                                 proto  => tcp,
+                                 send   => Send,
+                                 recv   => Recv},
+                   ok = api_b_send_and_recv_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically send and receive using the "common" functions (send and recv)
+%% on an Unix Domain (stream) socket (TCP).
+api_b_send_and_recv_tcpL(suite) ->
+    [];
+api_b_send_and_recv_tcpL(doc) ->
+    [];
+api_b_send_and_recv_tcpL(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_b_send_and_recv_tcpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   Send = fun(Sock, Data) ->
+                                  socket:send(Sock, Data)
+                          end,
+                   Recv = fun(Sock) ->
+                                  socket:recv(Sock)
+                          end,
+                   InitState = #{domain => local,
+                                 proto  => default,
+                                 send   => Send,
+                                 recv   => Recv},
+                   ok = api_b_send_and_recv_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically send and receive using the msg functions (sendmsg and recvmsg)
+%% on an IPv4 TCP (stream) socket.
+api_b_sendmsg_and_recvmsg_tcp4(suite) ->
+    [];
+api_b_sendmsg_and_recvmsg_tcp4(doc) ->
+    [];
+api_b_sendmsg_and_recvmsg_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_b_sendmsg_and_recvmsg_tcp4,
+           fun() ->
+                   Send = fun(Sock, Data) ->
+                                  MsgHdr = #{iov => [Data]},
+                                  socket:sendmsg(Sock, MsgHdr)
+                          end,
+                   Recv = fun(Sock) ->
+                                  case socket:recvmsg(Sock) of
+                                      {ok, #{addr  := undefined,
+                                             iov   := [Data]}} ->
+                                          {ok, Data};
+                                      {error, _} = ERROR ->
+                                          ERROR
+                                  end
+                          end,
+                   InitState = #{domain => inet,
+                                 proto  => tcp,
+                                 send   => Send,
+                                 recv   => Recv},
+                   ok = api_b_send_and_recv_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically send and receive using the msg functions (sendmsg and recvmsg)
+%% on an Unix Domain (stream) socket (TCP).
+api_b_sendmsg_and_recvmsg_tcpL(suite) ->
+    [];
+api_b_sendmsg_and_recvmsg_tcpL(doc) ->
+    [];
+api_b_sendmsg_and_recvmsg_tcpL(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_b_sendmsg_and_recvmsg_tcpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   Send = fun(Sock, Data) ->
+                                  MsgHdr = #{iov => [Data]},
+                                  socket:sendmsg(Sock, MsgHdr)
+                          end,
+                   Recv = fun(Sock) ->
+                                  case socket:recvmsg(Sock) of
+                                      %% On some platforms, the address
+                                      %% is *not* provided (e.g. FreeBSD)
+                                      {ok, #{addr  := undefined,
+                                             iov   := [Data]}} ->
+                                          {ok, Data};
+                                      %% On some platforms, the address
+                                      %% *is* provided (e.g. linux)
+                                      {ok, #{addr  := #{family := local},
+                                             iov   := [Data]}} ->
+                                          socket:setopt(Sock, 
+                                                        otp, 
+                                                        debug, 
+                                                        false),
+                                          {ok, Data};
+                                      {error, _} = ERROR ->
+                                          socket:setopt(Sock, 
+                                                        otp, 
+                                                        debug, 
+                                                        false),
+                                          ERROR
+                                  end
+                          end,
+                   InitState = #{domain => local,
+                                 proto  => default,
+                                 send   => Send,
+                                 recv   => Recv},
+                   ok = api_b_send_and_recv_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+api_b_send_and_recv_tcp(InitState) ->
+    process_flag(trap_exit, true),
+    ServerSeq = 
+        [
+         %% *** Wait for start order ***
+         #{desc => "await start (from tester)",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester}) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{lsa => LSA}}
+                   end},
+         #{desc => "create listen socket",
+           cmd  => fun(#{domain := Domain,
+                         proto  := Proto} = State) ->
+                           case socket:open(Domain, stream, Proto) of
+                               {ok, Sock} ->
+                                   {ok, State#{lsock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{domain := local,
+                         lsock  := LSock,
+                         lsa    := LSA} = _State) ->
+                           case socket:bind(LSock, LSA) of
+                               {ok, _Port} ->
+                                   ok; % We do not care about the port for local
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end;
+                      (#{lsock := LSock, lsa := LSA} = State) ->
+                           case socket:bind(LSock, LSA) of
+                               {ok, Port} ->
+                                   ?SEV_IPRINT("bound to port: ~w", [Port]),
+                                   {ok, State#{lport => Port}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "make listen socket",
+           cmd  => fun(#{lsock := LSock}) ->
+                           socket:listen(LSock)
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{domain := local,
+                         tester := Tester, lsa := #{path := Path}}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, Path),
+                           ok;
+                      (#{tester := Tester, lport := Port}) ->
+                           %% This is actually not used for unix domain socket
+                           ?SEV_ANNOUNCE_READY(Tester, init, Port),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (accept)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, accept)
+                   end},
+         #{desc => "await connection",
+           cmd  => fun(#{lsock := LSock} = State) ->
+                           case socket:accept(LSock) of
+                               {ok, Sock} ->
+                                   ?SEV_IPRINT("accepted: ~n   ~p", [Sock]),
+                                   {ok, State#{csock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (accept)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, accept),
+                           ok
+                   end},
+         #{desc => "await (recv) request",
+           cmd  => fun(#{csock := Sock, recv := Recv}) ->
+                           case Recv(Sock) of
+                               {ok, ?BASIC_REQ} ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv request)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_req),
+                           ok
+                   end},
+         #{desc => "await continue (with send reply)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, send_reply)
+                   end},
+         #{desc => "send reply",
+           cmd  => fun(#{csock := Sock, send := Send}) ->
+                           Send(Sock, ?BASIC_REP)
+                   end},
+         #{desc => "announce ready (send reply)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, send_reply),
+                           ok
+                   end},
+
+         %% *** Termination ***
+         #{desc => "await terminate",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close connection socket",
+           cmd  => fun(#{csock := Sock} = State) ->
+                           ok = socket:close(Sock),
+                           {ok, maps:remove(csock, State)}
+                   end},
+         #{desc => "close listen socket",
+           cmd  => fun(#{domain   := local,
+                         lsock    := Sock,
+                         local_sa := #{path := Path}} = State) ->
+                           ok = socket:close(Sock),
+                           State1 =
+                               unlink_path(Path,
+                                           fun() ->
+                                                   maps:remove(local_sa, State)
+                                           end,
+                                           fun() -> State end),
+                           {ok, maps:remove(lsock, State1)};
+                      (#{lsock := LSock} = State) ->
+                           case socket:close(LSock) of
+                               ok ->
+                                   {ok, maps:remove(lsock, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    ClientSeq = 
+        [
+         %% *** Wait for start order ***
+         #{desc => "await start (from tester)",
+           cmd  => fun(#{domain := local} = State) ->
+                           {Tester, Path} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester, server_path => Path}};
+                      (State) ->
+                           {Tester, Port} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester, server_port => Port}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester}) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** The init part ***
+         #{desc => "which server (local) address",
+           cmd  => fun(#{domain      := local = Domain,
+                         server_path := Path} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           SSA = #{family => Domain, path => Path},
+                           {ok, State#{local_sa => LSA, server_sa => SSA}};
+                      (#{domain := Domain, server_port := Port} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           SSA = LSA#{port => Port},
+                           {ok, State#{local_sa => LSA, server_sa => SSA}}
+                   end},
+         #{desc => "create socket",
+           cmd  => fun(#{domain := Domain,
+                         proto  := Proto} = State) ->
+                           case socket:open(Domain, stream, Proto) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{sock := Sock, local_sa := LSA} = _State) ->
+                           case socket:bind(Sock, LSA) of
+                               {ok, _Port} ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init),
+                           ok
+                   end},
+
+         %% *** The actual test ***
+         #{desc => "await continue (connect)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, connect)
+                   end},
+         #{desc => "connect to server",
+           cmd  => fun(#{sock := Sock, server_sa := SSA}) ->
+                           socket:connect(Sock, SSA)
+                   end},
+         #{desc => "announce ready (connect)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, connect),
+                           ok
+                   end},
+         #{desc => "await continue (send request)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, send_req)
+                   end},
+         #{desc => "send request (to server)",
+           cmd  => fun(#{sock := Sock, send := Send}) ->
+                           Send(Sock, ?BASIC_REQ)
+                   end},
+         #{desc => "announce ready (send request)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, send_req),
+                           ok
+                   end},
+         #{desc => "await recv reply (from server)",
+           cmd  => fun(#{sock := Sock, recv := Recv}) ->
+                           {ok, ?BASIC_REP} = Recv(Sock),
+                           ok
+                   end},
+         #{desc => "announce ready (recv reply)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_reply),
+                           ok
+                   end},
+
+         %% *** Termination ***
+         #{desc => "await terminate",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close socket",
+           cmd  => fun(#{domain   := local,
+                         sock     := Sock,
+                         local_sa := #{path := Path}} = State) ->
+                           ok = socket:close(Sock),
+                           State1 =
+                               unlink_path(Path,
+                                           fun() ->
+                                                   maps:remove(local_sa, State)
+                                           end,
+                                           fun() -> State end),
+                           {ok, maps:remove(sock, State1)};
+                      (#{sock := Sock} = State) ->
+                           ok = socket:close(Sock),
+                           {ok, maps:remove(sock, State)}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "monitor server",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor client",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+
+         %% Start the server
+         #{desc => "order server start",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid),
+                           ok
+                   end},
+         #{desc => "await server ready (init)",
+           cmd  => fun(#{server := Pid} = State) ->
+                           {ok, Port} = ?SEV_AWAIT_READY(Pid, server, init),
+                           {ok, State#{server_port => Port}}
+                   end},
+
+         %% Start the client
+         #{desc => "order client start",
+           cmd  => fun(#{client := Pid, server_port := Port} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, Port),
+                           ok
+                   end},
+         #{desc => "await client ready (init)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, client, init)
+                   end},
+
+         %% *** The actual test ***
+         #{desc => "order server to continue (with accept)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Server, accept),
+                           ok
+                   end},
+         ?SEV_SLEEP(?SECS(1)),
+         #{desc => "order client to continue (with connect)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, connect),
+                           ok
+                   end},
+         #{desc => "await client ready (connect)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, connect)
+                   end},
+         #{desc => "await server ready (accept)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, accept)
+                   end},
+         #{desc => "order client to continue (with send request)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, send_req),
+                           ok
+                   end},
+         #{desc => "await client ready (with send request)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, send_req)
+                   end},
+         #{desc => "await server ready (request recv)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, recv_req)
+                   end},
+         #{desc => "order server to continue (with send reply)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Server, send_reply),
+                           ok
+                   end},
+         #{desc => "await server ready (with reply sent)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, send_reply)
+                   end},
+         #{desc => "await client ready (reply recv)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, recv_reply)
+                   end},
+
+
+         %% *** Termination ***
+         #{desc => "order client to terminate",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Client),
+                           ok
+                   end},
+         #{desc => "await client termination",
+           cmd  => fun(#{client := Client} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Client),
+                           State1 = maps:remove(client, State),
+                           {ok, State1}
+                   end},
+         #{desc => "order server to terminate",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Server),
+                           ok
+                   end},
+         #{desc => "await server termination",
+           cmd  => fun(#{server := Server} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Server),
+                           State1 = maps:remove(server, State),
+                           {ok, State1}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    i("start server evaluator"),
+    Server = ?SEV_START("server", ServerSeq, InitState),
+
+    i("start client evaluator"),
+    Client = ?SEV_START("client", ClientSeq, InitState),
+    i("await evaluator(s)"),
+
+    i("start tester evaluator"),
+    TesterInitState = #{server => Server#ev.pid,
+                        client => Client#ev.pid},
+    Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    ok = ?SEV_AWAIT_FINISH([Server, Client, Tester]).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically establish a TCP connection via an async connect. IPv4.
+
+api_a_connect_tcp4(suite) ->
+    [];
+api_a_connect_tcp4(doc) ->
+    [];
+api_a_connect_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_a_connect_tcp4,
+           fun() ->
+                   ok = api_a_connect_tcpD(inet)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically establish a TCP connection via an async connect. IPv6.
+
+api_a_connect_tcp6(suite) ->
+    [];
+api_a_connect_tcp6(doc) ->
+    [];
+api_a_connect_tcp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_a_connect_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   ok = api_a_connect_tcpD(inet6)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+api_a_connect_tcpD(Domain) ->
+    Connect = fun(Sock, SockAddr) ->
+                      socket:connect(Sock, SockAddr, nowait)
+              end,
+    Send = fun(Sock, Data) ->
+                   socket:send(Sock, Data)
+           end,
+    Recv = fun(Sock) ->
+                   socket:recv(Sock)
+           end,
+    InitState = #{domain  => Domain,
+                  connect => Connect,
+                  send    => Send,
+                  recv    => Recv},
+    api_a_connect_tcp(InitState).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+api_a_connect_tcp(InitState) ->
+    process_flag(trap_exit, true),
+    ServerSeq = 
+        [
+         %% *** Wait for start order ***
+         #{desc => "await start (from tester)",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester}) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{lsa => LSA}}
+                   end},
+         #{desc => "create listen socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, stream, tcp) of
+                               {ok, Sock} ->
+                                   {ok, State#{lsock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{lsock := LSock, lsa := LSA} = State) ->
+                           case socket:bind(LSock, LSA) of
+                               {ok, Port} ->
+                                   {ok, State#{lport => Port}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "make listen socket",
+           cmd  => fun(#{lsock := LSock}) ->
+                           socket:listen(LSock)
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester, lport := Port}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, Port),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (accept)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, accept)
+                   end},
+         #{desc => "await connection",
+           cmd  => fun(#{lsock := LSock} = State) ->
+                           case socket:accept(LSock) of
+                               {ok, Sock} ->
+                                   ?SEV_IPRINT("accepted: ~n   ~p", [Sock]),
+                                   {ok, State#{csock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (accept)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, accept),
+                           ok
+                   end},
+
+         #{desc => "await continue (recv_req)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, recv_req)
+                   end},
+         #{desc => "recv req",
+           cmd  => fun(#{csock := Sock, recv := Recv}) ->
+                           case Recv(Sock) of
+                               {ok, ?BASIC_REQ} ->
+                                   ok;
+                               {ok, UnexpData} ->
+                                   {error, {unexpected_data, UnexpData}};
+                               {error, _} = ERROR ->
+                                   %% At the moment there is no way to get
+                                   %% status or state for the socket...
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv_req)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_req),
+                           ok
+                   end},
+         #{desc => "await continue (send_rep)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, send_rep)
+                   end},
+         #{desc => "send rep",
+           cmd  => fun(#{csock := Sock, send := Send}) ->
+                           Send(Sock, ?BASIC_REP)
+                   end},
+         #{desc => "announce ready (send_rep)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, send_rep),
+                           ok
+                   end},
+	 
+
+         %% *** Termination ***
+         #{desc => "await terminate",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close connection socket",
+           cmd  => fun(#{csock := Sock} = State) ->
+                           ok = socket:close(Sock),
+                           {ok, maps:remove(csock, State)}
+                   end},
+         #{desc => "close listen socket",
+           cmd  => fun(#{lsock := Sock} = State) ->
+                           ok = socket:close(Sock),
+                           {ok, maps:remove(lsock, State)}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    ClientSeq = 
+        [
+         %% *** Wait for start order ***
+         #{desc => "await start (from tester)",
+           cmd  => fun(State) ->
+                           {Tester, Port} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester, server_port => Port}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester}) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** The init part ***
+         #{desc => "which server (local) address",
+           cmd  => fun(#{domain := Domain, server_port := Port} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           SSA = LSA#{port => Port},
+                           {ok, State#{local_sa => LSA, server_sa => SSA}}
+                   end},
+         #{desc => "create socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, stream, tcp) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{sock := Sock, local_sa := LSA} = _State) ->
+                           case socket:bind(Sock, LSA) of
+                               {ok, _Port} ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init),
+                           ok
+                   end},
+
+         %% *** The actual test ***
+         #{desc => "await continue (async connect)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, async_connect)
+                   end},
+         #{desc => "connect (async) to server",
+           cmd  => fun(#{sock      := Sock,
+                         server_sa := SSA,
+                         connect   := Connect} = State) ->
+                           case Connect(Sock, SSA) of
+                               ok ->
+                                   ?SEV_IPRINT("ok -> "
+					       "unexpected success => SKIP", 
+                                               []),
+                                   {skip, unexpected_success};
+                               {select, {select_info, ST, SR}} ->
+                                   ?SEV_IPRINT("select ->"
+                                               "~n   tag: ~p"
+                                               "~n   ref: ~p", [ST, SR]),
+                                   {ok, State#{connect_stag => ST,
+                                               connect_sref => SR}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (connect select)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, connect_select),
+                           ok
+                   end},
+         #{desc => "await select message",
+           cmd  => fun(#{sock := Sock, connect_sref := Ref}) ->
+                           receive
+                               {'$socket', Sock, select, Ref} ->
+                                   ?SEV_IPRINT("select message ->"
+                                               "~n   ref: ~p", [Ref]),
+                                   ok
+                           after 5000 ->
+                                   ?SEV_EPRINT("timeout: "
+                                               "~n   message queue: ~p",
+                                               [mq()]),
+                                   {error, timeout}
+                           end
+                   end},
+         #{desc => "announce ready (select)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, select),
+                           ok
+                   end},
+         #{desc => "connect (async) to server",
+           cmd  => fun(#{sock := Sock, server_sa := SSA, connect := Connect}) ->
+                           case Connect(Sock, SSA) of
+                               ok ->
+                                   ok;
+                               {select, SelectInfo} ->
+                                   {error, {unexpected_select, SelectInfo}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (connect)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, connect),
+                           ok
+                   end},
+         #{desc => "get peername",
+           cmd  => fun(#{sock := Sock} = _State) ->
+                           case socket:peername(Sock) of
+                               {ok, SockAddr} ->
+                                   ?SEV_IPRINT("Peer Name: ~p", [SockAddr]),
+                                   ok;
+                                {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         #{desc => "await continue (send_req)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, send_req)
+                   end},
+         #{desc => "send req",
+           cmd  => fun(#{sock := Sock, send := Send}) ->
+                           Send(Sock, ?BASIC_REQ)
+                   end},
+         #{desc => "announce ready (send_req)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, send_req),
+                           ok
+                   end},
+         #{desc => "await continue (recv_rep)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, recv_rep)
+                   end},
+         #{desc => "recv rep",
+           cmd  => fun(#{sock := Sock, recv := Recv}) ->
+                           case Recv(Sock) of
+                               {ok, ?BASIC_REP} ->
+                                   ok;
+                               {ok, UnexpData} ->
+                                   {error, {unexpected_data, UnexpData}};
+                               {error, _} = ERROR ->
+                                   %% At the moment there is no way to get
+                                   %% status or state for the socket...
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv_rep)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_rep),
+                           ok
+                   end},
+
+         %% *** Termination ***
+         #{desc => "await terminate",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close socket",
+           cmd  => fun(#{sock := Sock} = State) ->
+                           ok = socket:close(Sock),
+                           State2 = maps:remove(sock,         State),
+                           State3 = maps:remove(connect_stag, State2),
+                           State4 = maps:remove(connect_sref, State3),
+                           {ok, State4}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "monitor server",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor client",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+
+         %% Start the server
+         #{desc => "order server start",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid),
+                           ok
+                   end},
+         #{desc => "await server ready (init)",
+           cmd  => fun(#{server := Pid} = State) ->
+                           {ok, Port} = ?SEV_AWAIT_READY(Pid, server, init),
+                           {ok, State#{server_port => Port}}
+                   end},
+
+         %% Start the client
+         #{desc => "order client start",
+           cmd  => fun(#{client := Pid, server_port := Port} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, Port),
+                           ok
+                   end},
+         #{desc => "await client ready (init)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, client, init)
+                   end},
+
+
+         %% *** The actual test ***
+         #{desc => "order client to continue (async connect)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, async_connect),
+                           ok
+                   end},
+         #{desc => "await client ready (connect select)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, connect_select)
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "order server to continue (with accept)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Server, accept),
+                           ok
+                   end},
+         #{desc => "await client ready (select)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, select)
+                   end},
+         #{desc => "await client ready (connect)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, connect)
+                   end},
+         #{desc => "await server ready (accept)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, accept)
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "order server to recv test req (recv req)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Server, recv_req),
+                           ok
+                   end},
+         #{desc => "order client to send test req (send req)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, send_req),
+                           ok
+                   end},
+         #{desc => "await client ready (send_req)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, send_req)
+                   end},
+         #{desc => "await server ready (recv_req)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, recv_req)
+                   end},
+         #{desc => "order client to recv test rep (send rep)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, recv_rep),
+                           ok
+                   end},
+         #{desc => "order server to send test rep (send rep)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Server, send_rep),
+                           ok
+                   end},
+         #{desc => "await server ready (send_rep)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, send_rep)
+                   end},
+         #{desc => "await client ready (recv_rep)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, recv_rep)
+                   end},
+
+
+         %% *** Termination ***
+         #{desc => "order client to terminate",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Client),
+                           ok
+                   end},
+         #{desc => "await client termination",
+           cmd  => fun(#{client := Client} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Client),
+                           State1 = maps:remove(client, State),
+                           {ok, State1}
+                   end},
+         #{desc => "order server to terminate",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Server),
+                           ok
+                   end},
+         #{desc => "await server termination",
+           cmd  => fun(#{server := Server} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Server),
+                           State1 = maps:remove(server, State),
+                           {ok, State1}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    i("start server evaluator"),
+    Server = ?SEV_START("server", ServerSeq, InitState),
+
+    i("start client evaluator"),
+    Client = ?SEV_START("client", ClientSeq, InitState),
+    i("await evaluator(s)"),
+
+    i("start tester evaluator"),
+    TesterInitState = #{server => Server#ev.pid,
+                        client => Client#ev.pid},
+    Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    ok = ?SEV_AWAIT_FINISH([Server, Client, Tester]).
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically send and receive on an IPv4 UDP (dgram) socket using
+%% sendto and recvfrom. But we try to be async. That is, we use
+%% the 'nowait' value for the Timeout argument (and await the eventual
+%% select message). Note that we only do this for the recvfrom,
+%% since its much more difficult to "arrange" for sendto.
+%%
+api_a_sendto_and_recvfrom_udp4(suite) ->
+    [];
+api_a_sendto_and_recvfrom_udp4(doc) ->
+    [];
+api_a_sendto_and_recvfrom_udp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(5)),
+    tc_try(api_a_sendto_and_recvfrom_udp4,
+           fun() ->
+                   Send = fun(Sock, Data, Dest) ->
+                                  socket:sendto(Sock, Data, Dest)
+                          end,
+                   Recv = fun(Sock) ->
+                                  socket:recvfrom(Sock, 0, nowait)
+                          end,
+                   InitState = #{domain => inet,
+                                 send   => Send,
+                                 recv   => Recv},
+                   ok = api_a_send_and_recv_udp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically send and receive on an IPv6 UDP (dgram) socket using
+%% sendto and recvfrom. But we try to be async. That is, we use
+%% the 'nowait' value for the Timeout argument (and await the eventual
+%% select message). Note that we only do this for the recvfrom,
+%% since its much more difficult to "arrange" for sendto.
+%%
+api_a_sendto_and_recvfrom_udp6(suite) ->
+    [];
+api_a_sendto_and_recvfrom_udp6(doc) ->
+    [];
+api_a_sendto_and_recvfrom_udp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(5)),
+    tc_try(api_a_sendto_and_recvfrom_udp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   Send = fun(Sock, Data, Dest) ->
+                                  socket:sendto(Sock, Data, Dest)
+                          end,
+                   Recv = fun(Sock) ->
+                                  socket:recvfrom(Sock, 0, nowait)
+                          end,
+                   InitState = #{domain => inet6,
+                                 send   => Send,
+                                 recv   => Recv},
+                   ok = api_a_send_and_recv_udp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically send and receive on an IPv4 UDP (dgram) socket using
+%% sendto and recvfrom. But we try to be async. That is, we use
+%% the 'nowait' value for the Timeout argument (and await the eventual
+%% select message). Note that we only do this for the recvmsg,
+%% since its much more difficult to "arrange" for sendmsg.
+%%
+api_a_sendmsg_and_recvmsg_udp4(suite) ->
+    [];
+api_a_sendmsg_and_recvmsg_udp4(doc) ->
+    [];
+api_a_sendmsg_and_recvmsg_udp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(5)),
+    tc_try(api_a_sendmsg_and_recvmsg_udp4,
+           fun() ->
+                   Send = fun(Sock, Data, Dest) ->
+                                  MsgHdr = #{addr => Dest,
+                                             %% ctrl => CMsgHdrs,
+                                             iov  => [Data]},
+                                  socket:sendmsg(Sock, MsgHdr)
+                          end,
+                   Recv = fun(Sock) ->
+                                  case socket:recvmsg(Sock, nowait) of
+                                      {ok, #{addr  := Source,
+                                             iov   := [Data]}} ->
+                                          {ok, {Source, Data}};
+                                      {ok, _} = OK ->
+                                          OK;
+                                      {select, _} = SELECT ->
+                                          SELECT;
+                                      {error, _} = ERROR ->
+                                          ERROR
+                                  end
+                          end,
+                   InitState = #{domain => inet,
+                                 send   => Send,
+                                 recv   => Recv},
+                   ok = api_a_send_and_recv_udp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically send and receive on an IPv6 UDP (dgram) socket using
+%% sendto and recvfrom. But we try to be async. That is, we use
+%% the 'nowait' value for the Timeout argument (and await the eventual
+%% select message). Note that we only do this for the recvmsg,
+%% since its much more difficult to "arrange" for sendmsg.
+%%
+api_a_sendmsg_and_recvmsg_udp6(suite) ->
+    [];
+api_a_sendmsg_and_recvmsg_udp6(doc) ->
+    [];
+api_a_sendmsg_and_recvmsg_udp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(5)),
+    tc_try(api_a_sendmsg_and_recvmsg_udp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   Send = fun(Sock, Data, Dest) ->
+                                  MsgHdr = #{addr => Dest,
+                                             %% ctrl => CMsgHdrs,
+                                             iov  => [Data]},
+                                  socket:sendmsg(Sock, MsgHdr)
+                          end,
+                   Recv = fun(Sock) ->
+                                  case socket:recvmsg(Sock, nowait) of
+                                      {ok, #{addr  := Source,
+                                             iov   := [Data]}} ->
+                                          {ok, {Source, Data}};
+                                      {ok, _} = OK ->
+                                          OK;
+                                      {select, _} = SELECT ->
+                                          SELECT;
+                                      {error, _} = ERROR ->
+                                          ERROR
+                                  end
+                          end,
+                   InitState = #{domain => inet6,
+                                 send   => Send,
+                                 recv   => Recv},
+                   ok = api_a_send_and_recv_udp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+api_a_send_and_recv_udp(InitState) ->
+    ServerSeq = 
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{local_sa => LSA}}
+                   end},
+         #{desc => "create socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, dgram, udp) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind socket (to local address)",
+           cmd  => fun(#{sock := Sock, local_sa := LSA} = State) ->
+                           case socket:bind(Sock, LSA) of
+                               {ok, Port} ->
+                                   {ok, State#{port => Port}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester, local_sa := LSA, port := Port}) ->
+                           ServerSA = LSA#{port => Port},
+                           ?SEV_ANNOUNCE_READY(Tester, init, ServerSA),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (recv)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, recv)
+                   end},
+         #{desc => "try recv request (with nowait, expect select)",
+           cmd  => fun(#{sock := Sock, recv := Recv} = State) ->
+                           case Recv(Sock) of
+                               {select, {select_info, Tag, RecvRef}} ->
+                                   ?SEV_IPRINT("expected select: "
+                                               "~n   Tag: ~p"
+                                               "~n   Ref: ~p", [Tag, RecvRef]),
+                                   {ok, State#{recv_stag => Tag,
+                                               recv_sref => RecvRef}};
+                               {ok, X} ->
+                                   {error, {unexpected_succes, X}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv_select)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_select),
+                           ok
+                   end},
+         #{desc => "await select message",
+           cmd  => fun(#{sock := Sock, recv_sref := RecvRef}) ->
+                           receive
+                               {'$socket', Sock, select, RecvRef} ->
+                                   ok
+                           after 5000 ->
+                                   ?SEV_EPRINT("message queue: ~p", [mq()]),
+                                   {error, timeout}
+                           end
+                   end},
+         #{desc => "announce ready (select)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, select),
+                           ok
+                   end},
+         #{desc => "now read the data (request)",
+           cmd  => fun(#{sock := Sock, recv := Recv} = State) ->
+                           case Recv(Sock) of
+                               {ok, {Src, ?BASIC_REQ}} ->
+                                   {ok, State#{req_src => Src}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv request)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_req),
+                           ok
+                   end},
+
+         #{desc => "await continue (send reply)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, send_reply)
+                   end},
+         #{desc => "send reply",
+           cmd  => fun(#{sock := Sock, req_src := Src, send := Send}) ->
+                           Send(Sock, ?BASIC_REP, Src)
+                   end},
+         #{desc => "announce ready (send)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, send),
+                           ok
+                   end},
+
+         %% Termination
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   State2 = maps:remove(tester,    State),
+                                   State3 = maps:remove(recv_stag, State2),
+                                   State4 = maps:remove(recv_sref, State3),
+                                   State5 = maps:remove(req_src,   State4),
+                                   {ok, State5};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close socket",
+           cmd  => fun(#{sock := Sock} = State) ->
+                           ok = socket:close(Sock),
+                           {ok, maps:remove(sock, State)}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+
+    ClientSeq = 
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           {Tester, ServerSA} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester    => Tester, 
+                                       server_sa => ServerSA}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{lsa => LSA}}
+                   end},
+         #{desc => "open socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           Sock = sock_open(Domain, dgram, udp),
+                           SA   = sock_sockname(Sock),
+                           {ok, State#{sock => Sock, sa => SA}}
+                   end},
+         #{desc => "bind socket (to local address)",
+           cmd  => fun(#{sock := Sock, lsa := LSA}) ->
+                          case socket:bind(Sock, LSA) of
+                               {ok, _Port} ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (send request)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, send_req)
+                   end},
+         #{desc => "send request",
+           cmd  => fun(#{sock := Sock, server_sa := Server, send := Send}) ->
+                           Send(Sock, ?BASIC_REQ, Server)
+                   end},
+         #{desc => "announce ready (send request)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, send_req),
+                           ok
+                   end},
+         #{desc => "await continue (recv)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, recv)
+                   end},
+         #{desc => "try recv reply (with nowait)",
+           cmd  => fun(#{sock := Sock, recv := Recv} = State) ->
+                           case Recv(Sock) of
+                               {select, {select_info, Tag, RecvRef}} ->
+                                   {ok, State#{recv_stag => Tag,
+                                               recv_sref => RecvRef}};
+                               {ok, X} ->
+                                   {error, {unexpected_select_info, X}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv_select)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_select),
+                           ok
+                   end},
+         #{desc => "await select message",
+           cmd  => fun(#{sock := Sock, recv_sref := RecvRef}) ->
+                           receive
+                               {'$socket', Sock, select, RecvRef} ->
+                                   ok
+                           end
+                   end},
+         #{desc => "announce ready (select)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, select),
+                           ok
+                   end},
+         #{desc => "now read the data (reply)",
+           cmd  => fun(#{sock := Sock, recv := Recv}) ->
+                           case Recv(Sock) of
+                               {ok, {_Src, ?BASIC_REP}} ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv reply)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_rep),
+                           ok
+                   end},
+
+         %% Termination
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   State2 = maps:remove(tester,    State),
+                                   State3 = maps:remove(recv_stag, State2),
+                                   State4 = maps:remove(recv_sref, State3),
+                                   {ok, State4};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close socket",
+           cmd  => fun(#{sock := Sock} = State) ->
+                           ok = socket:close(Sock),
+                           {ok, maps:remove(sock, State)}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+
+    TesterSeq = 
+        [
+         %% *** Init part ***
+         #{desc => "monitor server",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor client",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+
+         %% Start the server
+         #{desc => "order server start",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid),
+                           ok
+                   end},
+         #{desc => "await server ready (init)",
+           cmd  => fun(#{server := Pid} = State) ->
+                           {ok, ServerSA} = ?SEV_AWAIT_READY(Pid, server, init),
+                           {ok, State#{server_sa => ServerSA}}
+                   end},
+
+         %% Start the client
+         #{desc => "order client start",
+           cmd  => fun(#{client    := Pid, 
+                         server_sa := ServerSA} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, ServerSA),
+                           ok
+                   end},
+         #{desc => "await client ready (init)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, client, init)
+                   end},
+ 
+         %% The actual test
+         #{desc => "order server continue (recv)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv),
+                           ok
+                   end},
+         #{desc => "await server ready (recv_select)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, server, recv_select)
+                   end},
+
+         #{desc => "order client continue (send request)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, send_req),
+                           ok
+                   end},
+         #{desc => "await client ready (send request)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, client, send_req)
+                   end},
+         #{desc => "await server ready (select)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, server, select)
+                   end},
+         #{desc => "await server ready (recv request)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, server, recv_req)
+                   end},
+
+         #{desc => "order client continue (recv)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv),
+                           ok
+                   end},
+         #{desc => "await client ready (recv_select)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, client, recv_select)
+                   end},
+         #{desc => "order server continue (send reply)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, send_reply),
+                           ok
+                   end},
+         #{desc => "await server ready (send)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, server, send)
+                   end},
+         #{desc => "await client ready (select)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, client, select)
+                   end},
+         #{desc => "await client ready (recv reply)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, client, recv_rep)
+                   end},
+
+         %% Terminations
+         #{desc => "order client to terminate",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await client termination",
+           cmd  => fun(#{client := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(client, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order server to terminate",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await server termination",
+           cmd  => fun(#{server := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(server, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    i("start server evaluator"),
+    ServerInitState = InitState,
+    Server = ?SEV_START("server", ServerSeq, ServerInitState),
+
+    i("start client evaluator(s)"),
+    ClientInitState = InitState,
+    Client = ?SEV_START("client", ClientSeq, ClientInitState),
+
+    i("start 'tester' evaluator"),
+    TesterInitState = #{server => Server#ev.pid,
+                        client => Client#ev.pid},
+    Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    i("await evaluator"),
+    ok = ?SEV_AWAIT_FINISH([Server, Client, Tester]).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically send and receive using the "common" functions (send and recv)
+%% on an IPv4 TCP (stream) socket. But we try to be async. That is, we use
+%% the 'nowait' value for the Timeout argument (and await the eventual
+%% select message). Note that we only do this for the recv,
+%% since its much more difficult to "arrange" for send.
+%% We *also* test async for accept.
+api_a_send_and_recv_tcp4(suite) ->
+    [];
+api_a_send_and_recv_tcp4(doc) ->
+    [];
+api_a_send_and_recv_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_a_send_and_recv_tcp4,
+           fun() ->
+                   Send = fun(Sock, Data) ->
+                                  socket:send(Sock, Data)
+                          end,
+                   Recv = fun(Sock) ->
+                                  socket:recv(Sock, 0, nowait)
+                          end,
+                   InitState = #{domain => inet,
+                                 send   => Send,
+                                 recv   => Recv},
+                   ok = api_a_send_and_recv_tcp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically send and receive using the "common" functions (send and recv)
+%% on an IPv6 TCP (stream) socket. But we try to be async. That is, we use
+%% the 'nowait' value for the Timeout argument (and await the eventual
+%% select message). Note that we only do this for the recv,
+%% since its much more difficult to "arrange" for send.
+%% We *also* test async for accept.
+api_a_send_and_recv_tcp6(suite) ->
+    [];
+api_a_send_and_recv_tcp6(doc) ->
+    [];
+api_a_send_and_recv_tcp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_a_send_and_recv_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   Send = fun(Sock, Data) ->
+                                  socket:send(Sock, Data)
+                          end,
+                   Recv = fun(Sock) ->
+                                  socket:recv(Sock, 0, nowait)
+                          end,
+                   InitState = #{domain => inet6,
+                                 send   => Send,
+                                 recv   => Recv},
+                   ok = api_a_send_and_recv_tcp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically send and receive using the msg functions (sendmsg and recvmsg)
+%% on an IPv4 TCP (stream) socket. But we try to be async. That is, we use
+%% the 'nowait' value for the Timeout argument (and await the eventual
+%% select message). Note that we only do this for the recvmsg,
+%% since its much more difficult to "arrange" for sendmsg.
+%% We *also* test async for accept.
+api_a_sendmsg_and_recvmsg_tcp4(suite) ->
+    [];
+api_a_sendmsg_and_recvmsg_tcp4(doc) ->
+    [];
+api_a_sendmsg_and_recvmsg_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_a_sendmsg_and_recvmsg_tcp4,
+           fun() ->
+                   Send = fun(Sock, Data) ->
+                                  MsgHdr = #{iov => [Data]},
+                                  socket:sendmsg(Sock, MsgHdr)
+                          end,
+                   Recv = fun(Sock) ->
+                                  case socket:recvmsg(Sock, nowait) of
+                                      {ok, #{addr  := undefined,
+                                             iov   := [Data]}} ->
+                                          {ok, Data};
+                                      {ok, _} = OK ->
+                                          OK;
+                                      {select, _} = SELECT ->
+                                          SELECT;
+				      {error, _} = ERROR ->
+                                          ERROR
+                                  end
+                          end,
+                   InitState = #{domain => inet,
+                                 send   => Send,
+                                 recv   => Recv},
+                   ok = api_a_send_and_recv_tcp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically send and receive using the msg functions (sendmsg and recvmsg)
+%% on an IPv6 TCP (stream) socket. But we try to be async. That is, we use
+%% the 'nowait' value for the Timeout argument (and await the eventual
+%% select message). Note that we only do this for the recvmsg,
+%% since its much more difficult to "arrange" for sendmsg.
+%% We *also* test async for accept.
+api_a_sendmsg_and_recvmsg_tcp6(suite) ->
+    [];
+api_a_sendmsg_and_recvmsg_tcp6(doc) ->
+    [];
+api_a_sendmsg_and_recvmsg_tcp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_a_sendmsg_and_recvmsg_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   Send = fun(Sock, Data) ->
+                                  MsgHdr = #{iov => [Data]},
+                                  socket:sendmsg(Sock, MsgHdr)
+                          end,
+                   Recv = fun(Sock) ->
+                                  case socket:recvmsg(Sock, nowait) of
+                                      {ok, #{addr  := undefined,
+                                             iov   := [Data]}} ->
+                                          {ok, Data};
+                                      {ok, _} = OK ->
+                                          OK;
+                                      {select, _} = SELECT ->
+                                          SELECT;
+				      {error, _} = ERROR ->
+                                          ERROR
+                                  end
+                          end,
+                   InitState = #{domain => inet6,
+                                 send   => Send,
+                                 recv   => Recv},
+                   ok = api_a_send_and_recv_tcp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+api_a_send_and_recv_tcp(InitState) ->
+    process_flag(trap_exit, true),
+    ServerSeq = 
+        [
+         %% *** Wait for start order ***
+         #{desc => "await start (from tester)",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester}) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{lsa => LSA}}
+                   end},
+         #{desc => "create listen socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, stream, tcp) of
+                               {ok, Sock} ->
+                                   {ok, State#{lsock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{lsock := LSock, lsa := LSA} = State) ->
+                           case socket:bind(LSock, LSA) of
+                               {ok, Port} ->
+                                   {ok, State#{lport => Port}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "make listen socket",
+           cmd  => fun(#{lsock := LSock}) ->
+                           socket:listen(LSock)
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester, lport := Port}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, Port),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (accept)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, accept)
+                   end},
+         #{desc => "await connection (nowait)",
+           cmd  => fun(#{lsock := LSock} = State) ->
+                           case socket:accept(LSock, nowait) of
+                               {select, {select_info, Tag, Ref}} ->
+                                   ?SEV_IPRINT("accept select: "
+                                               "~n   Tag: ~p"
+                                               "~n   Ref: ~p", [Tag, Ref]),
+                                   {ok, State#{accept_stag => Tag,
+                                               accept_sref => Ref}};
+                               {ok, X} ->
+                                   {error, {unexpected_select_info, X}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (accept_select)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, accept_select),
+                           ok
+                   end},
+         #{desc => "await select message",
+           cmd  => fun(#{lsock := Sock, accept_sref := Ref}) ->
+                           receive
+                               {'$socket', Sock, select, Ref} ->
+                                   ok
+                           end
+                   end},
+         #{desc => "announce ready (select)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, select),
+                           ok
+                   end},
+         #{desc => "await connection (again)",
+           cmd  => fun(#{lsock := LSock} = State) ->
+                           case socket:accept(LSock, nowait) of
+                               {ok, Sock} ->
+                                   ?SEV_IPRINT("accepted: "
+                                               "~n   Sock: ~p", [Sock]),
+                                   {ok, State#{csock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (accept)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, accept),
+                           ok
+                   end},
+
+         #{desc => "await continue (recv request)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, recv_req)
+                   end},
+         #{desc => "try recv request (with nowait, expect select)",
+           cmd  => fun(#{csock := Sock, recv := Recv} = State) ->
+                           case Recv(Sock) of
+                               {select, {select_info, Tag, Ref}} ->
+                                   ?SEV_IPRINT("recv select: "
+                                               "~n   Tag: ~p"
+                                               "~n   Ref: ~p", [Tag, Ref]),
+                                   {ok, State#{recv_stag => Tag,
+                                               recv_sref => Ref}};
+                               {ok, X} ->
+                                   {error, {unexpected_select_info, X}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv_select)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_select),
+                           ok
+                   end},
+         #{desc => "await select message",
+           cmd  => fun(#{csock := Sock, recv_sref := RecvRef}) ->
+                           receive
+                               {'$socket', Sock, select, RecvRef} ->
+                                   ok
+                           end
+                   end},
+         #{desc => "announce ready (select)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, select),
+                           ok
+                   end},
+         #{desc => "now read the data (request)",
+           cmd  => fun(#{csock := Sock, recv := Recv} = _State) ->
+                           case Recv(Sock) of
+                               {ok, ?BASIC_REQ} ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv request)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_req),
+                           ok
+                   end},
+
+         #{desc => "await continue (send reply)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, send_rep)
+                   end},
+         #{desc => "send reply",
+           cmd  => fun(#{csock := Sock, send := Send}) ->
+                           Send(Sock, ?BASIC_REP)
+                   end},
+         #{desc => "announce ready (send reply)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, send_rep),
+                           ok
+                   end},
+
+         %% *** Termination ***
+         #{desc => "await terminate",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close connection socket",
+           cmd  => fun(#{csock := Sock}) ->
+                           socket:close(Sock)
+                   end},
+         #{desc => "close listen socket",
+           cmd  => fun(#{lsock := Sock}) ->
+                           socket:close(Sock)
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+
+    ClientSeq = 
+        [
+         %% *** Wait for start order ***
+         #{desc => "await start (from tester)",
+           cmd  => fun(State) ->
+                           {Tester, Port} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester, server_port => Port}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester}) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** The init part ***
+         #{desc => "which server (local) address",
+           cmd  => fun(#{domain := Domain, server_port := Port} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           SSA = LSA#{port => Port},
+                           {ok, State#{local_sa => LSA, server_sa => SSA}}
+                   end},
+         #{desc => "create socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, stream, tcp) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{sock := Sock, local_sa := LSA} = _State) ->
+                           case socket:bind(Sock, LSA) of
+                               {ok, _Port} ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init),
+                           ok
+                   end},
+
+         %% *** The actual test ***
+         #{desc => "await continue (connect)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, connect)
+                   end},
+         #{desc => "connect to server",
+           cmd  => fun(#{sock := Sock, server_sa := SSA}) ->
+                           socket:connect(Sock, SSA)
+                   end},
+         #{desc => "announce ready (connect)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, connect),
+                           ok
+                   end},
+
+         #{desc => "await continue (send request)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, send_req)
+                   end},
+         #{desc => "send request (to server)",
+           cmd  => fun(#{sock := Sock, send := Send}) ->
+                           ok = Send(Sock, ?BASIC_REQ)
+                   end},
+         #{desc => "announce ready (send request)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, send_req),
+                           ok
+                   end},
+
+         #{desc => "try recv reply (with nowait, expect select)",
+           cmd  => fun(#{sock := Sock, recv := Recv} = State) ->
+                           case Recv(Sock) of
+                               {select, {select_info, Tag, Ref}} ->
+                                   ?SEV_IPRINT("recv select: "
+                                               "~n   Tag: ~p"
+                                               "~n   Ref: ~p", [Tag, Ref]),
+                                   {ok, State#{recv_stag => Tag,
+                                               recv_sref => Ref}};
+                               {ok, X} ->
+                                   {error, {unexpected_select_info, X}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv_select)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_select),
+                           ok
+                   end},
+         #{desc => "await select message",
+           cmd  => fun(#{sock := Sock, recv_sref := RecvRef}) ->
+                           receive
+                               {'$socket', Sock, select, RecvRef} ->
+                                   ok
+                           end
+                   end},
+         #{desc => "announce ready (select)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, select),
+                           ok
+                   end},
+         #{desc => "now read the data (reply)",
+           cmd  => fun(#{sock := Sock, recv := Recv}) ->
+                           {ok, ?BASIC_REP} = Recv(Sock),
+                           ok
+                   end},
+         #{desc => "announce ready (recv reply)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_rep),
+                           ok
+                   end},
+
+         %% *** Termination ***
+         #{desc => "await terminate",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close socket",
+           cmd  => fun(#{sock := Sock}) ->
+                           socket:close(Sock)
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "monitor server",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor client",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+
+         %% Start the server
+         #{desc => "order server start",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid),
+                           ok
+                   end},
+         #{desc => "await server ready (init)",
+           cmd  => fun(#{server := Pid} = State) ->
+                           {ok, Port} = ?SEV_AWAIT_READY(Pid, server, init),
+                           {ok, State#{server_port => Port}}
+                   end},
+
+         %% Start the client
+         #{desc => "order client start",
+           cmd  => fun(#{client := Pid, server_port := Port} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, Port),
+                           ok
+                   end},
+         #{desc => "await client ready (init)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, client, init)
+                   end},
+
+         %% *** The actual test ***
+         #{desc => "order server to continue (with accept)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Server, accept),
+                           ok
+                   end},
+         #{desc => "await server ready (accept select)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, server, accept_select)
+                   end},
+         #{desc => "order client to continue (with connect)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, connect),
+                           ok
+                   end},
+         #{desc => "await server ready (select)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, server, select)
+                   end},
+         #{desc => "await server ready (accept)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, server, accept)
+                   end},
+         #{desc => "await client ready (connect)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, client, connect)
+                   end},
+
+         #{desc => "order server to continue (recv request)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv_req),
+                           ok
+                   end},
+         #{desc => "await server ready (recv select)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, server, recv_select)
+                   end},
+         #{desc => "order client to continue (send request)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, send_req),
+                           ok
+                   end},
+         #{desc => "await client ready (send request)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, send_req)
+                   end},
+         #{desc => "await server ready (select)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, server, select)
+                   end},
+         #{desc => "await server ready (recv request)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, server, recv_req)
+                   end},
+
+         #{desc => "order client to continue (recv reply)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv_rep),
+                           ok
+                   end},
+         #{desc => "await client ready (recv select)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, client, recv_select)
+                   end},
+         #{desc => "order server to continue (send reply)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, send_rep),
+                           ok
+                   end},
+         #{desc => "await server ready (send reply)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, server, send_rep)
+                   end},
+         #{desc => "await client ready (select)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, client, select)
+                   end},
+         #{desc => "await client ready (reply recv)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, recv_rep)
+                   end},
+
+
+         %% *** Termination ***
+         #{desc => "order client to terminate",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Client),
+                           ok
+                   end},
+         #{desc => "await client termination",
+           cmd  => fun(#{client := Client} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Client),
+                           State1 = maps:remove(client, State),
+                           {ok, State1}
+                   end},
+         #{desc => "order server to terminate",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Server),
+                           ok
+                   end},
+         #{desc => "await server termination",
+           cmd  => fun(#{server := Server} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Server),
+                           State1 = maps:remove(server, State),
+                           {ok, State1}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    i("start server evaluator"),
+    Server = ?SEV_START("server", ServerSeq, InitState),
+
+    i("start client evaluator"),
+    Client = ?SEV_START("client", ClientSeq, InitState),
+
+    i("start tester evaluator"),
+    TesterInitState = #{server => Server#ev.pid,
+                        client => Client#ev.pid},
+    Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    i("await evaluator(s)"),
+    ok = ?SEV_AWAIT_FINISH([Server, Client, Tester]).
+
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically we make an async (Timeout = nowait) call to recvfrom,
+%% wait some time and then cancel. IPv4
+%%
+api_a_recvfrom_cancel_udp4(suite) ->
+    [];
+api_a_recvfrom_cancel_udp4(doc) ->
+    [];
+api_a_recvfrom_cancel_udp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_a_recvfrom_cancel_udp4,
+           fun() ->
+                   Recv = fun(Sock) ->
+                                  case socket:recvfrom(Sock, 0, nowait) of
+                                      {ok, _} = OK ->
+                                          OK;
+                                      {select, _} = SELECT ->
+                                          SELECT;
+                                      {error, _} = ERROR ->
+                                          ERROR
+                                  end
+                          end,
+                   InitState = #{domain => inet,
+                                 recv   => Recv},
+                   ok = api_a_recv_cancel_udp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically we make an async (Timeout = nowait) call to recvfrom,
+%% wait some time and then cancel. IPv6
+%%
+api_a_recvfrom_cancel_udp6(suite) ->
+    [];
+api_a_recvfrom_cancel_udp6(doc) ->
+    [];
+api_a_recvfrom_cancel_udp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_a_recvfrom_cancel_udp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   Recv = fun(Sock) ->
+                                  case socket:recvfrom(Sock, 0, nowait) of
+                                      {ok, _} = OK ->
+                                          OK;
+                                      {select, _} = SELECT ->
+                                          SELECT;
+                                      {error, _} = ERROR ->
+                                          ERROR
+                                  end
+                          end,
+                   InitState = #{domain => inet6,
+                                 recv   => Recv},
+                   ok = api_a_recv_cancel_udp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically we make an async (Timeout = nowait) call to recvmsg,
+%% wait some time and then cancel. IPv4
+%%
+api_a_recvmsg_cancel_udp4(suite) ->
+    [];
+api_a_recvmsg_cancel_udp4(doc) ->
+    [];
+api_a_recvmsg_cancel_udp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_a_recvmsg_cancel_udp4,
+           fun() ->
+                   Recv = fun(Sock) ->
+                                  case socket:recvmsg(Sock, nowait) of
+                                      {ok, _} = OK ->
+                                          OK;
+                                      {select, _} = SELECT ->
+                                          SELECT;
+                                      {error, _} = ERROR ->
+                                          ERROR
+                                  end
+                          end,
+                   InitState = #{domain => inet,
+                                 recv   => Recv},
+                   ok = api_a_recv_cancel_udp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically we make an async (Timeout = nowait) call to recvmsg,
+%% wait some time and then cancel. IPv6
+%%
+api_a_recvmsg_cancel_udp6(suite) ->
+    [];
+api_a_recvmsg_cancel_udp6(doc) ->
+    [];
+api_a_recvmsg_cancel_udp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_a_recvmsg_cancel_udp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   Recv = fun(Sock) ->
+                                  case socket:recvmsg(Sock, nowait) of
+                                      {ok, _} = OK ->
+                                          OK;
+                                      {select, _} = SELECT ->
+                                          SELECT;
+                                      {error, _} = ERROR ->
+                                          ERROR
+                                  end
+                          end,
+                   InitState = #{domain => inet6,
+                                 recv   => Recv},
+                   ok = api_a_recv_cancel_udp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+api_a_recv_cancel_udp(InitState) ->
+    ServerSeq = 
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{local_sa => LSA}}
+                   end},
+         #{desc => "create socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, dgram, udp) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind socket (to local address)",
+           cmd  => fun(#{sock := Sock, local_sa := LSA} = State) ->
+                           case socket:bind(Sock, LSA) of
+                               {ok, Port} ->
+                                   {ok, State#{port => Port}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester, local_sa := LSA, port := Port}) ->
+                           ServerSA = LSA#{port => Port},
+                           ?SEV_ANNOUNCE_READY(Tester, init, ServerSA),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (recv)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, recv)
+                   end},
+         #{desc => "try recv request (with nowait, expect select)",
+           cmd  => fun(#{sock := Sock, recv := Recv} = State) ->
+                           case Recv(Sock) of
+                               {select, SelectInfo} ->
+                                   {ok, State#{recv_select_info => SelectInfo}};
+                               {ok, X} ->
+                                   {error, {unexpected_select_info, X}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv_select)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_select),
+                           ok
+                   end},
+         #{desc => "await select message (without success)",
+           cmd  => fun(#{sock := Sock}) ->
+                           receive
+                               {'$socket', Sock, select, Ref} ->
+                                   {error, {unexpected_select, Ref}}
+                           after 5000 ->
+                                   ok
+                           end
+                   end},
+         #{desc => "announce ready (no select)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, no_select),
+                           ok
+                   end},
+         #{desc => "await continue (cancel)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, cancel)
+                   end},
+         #{desc => "cancel",
+           cmd  => fun(#{sock := Sock, recv_select_info := SelectInfo}) ->
+                           ok = socket:cancel(Sock, SelectInfo)
+                   end},
+         #{desc => "announce ready (cancel)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, cancel),
+                           ok
+                   end},
+
+         %% Termination
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   State2 = maps:remove(tester,    State),
+                                   State3 = maps:remove(recv_stag, State2),
+                                   State4 = maps:remove(recv_sref, State3),
+                                   State5 = maps:remove(req_src,   State4),
+                                   {ok, State5};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close socket",
+           cmd  => fun(#{sock := Sock} = State) ->
+                           ok = socket:close(Sock),
+                           {ok, maps:remove(sock, State)}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+
+    TesterSeq = 
+        [
+         %% *** Init part ***
+         #{desc => "monitor server",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+
+         %% Start the server
+         #{desc => "order server start",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid),
+                           ok
+                   end},
+         #{desc => "await server ready (init)",
+           cmd  => fun(#{server := Pid} = State) ->
+                           {ok, ServerSA} = ?SEV_AWAIT_READY(Pid, server, init),
+                           {ok, State#{server_sa => ServerSA}}
+                   end},
+
+         %% The actual test
+         #{desc => "order server continue (recv)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv),
+                           ok
+                   end},
+         #{desc => "await server ready (recv select)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, server, recv_select)
+                   end},
+         #{desc => "await server ready (no select)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, server, no_select)
+                   end},
+         #{desc => "order server continue (cancel)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, cancel),
+                           ok
+                   end},
+         #{desc => "await server ready (cancel)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, server, cancel)
+                   end},
+
+         %% Terminations
+         #{desc => "order server to terminate",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await server termination",
+           cmd  => fun(#{server := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(server, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    i("start server evaluator"),
+    ServerInitState = InitState,
+    Server = ?SEV_START("server", ServerSeq, ServerInitState),
+
+    i("start 'tester' evaluator"),
+    TesterInitState = #{server => Server#ev.pid},
+    Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    i("await evaluator"),
+    ok = ?SEV_AWAIT_FINISH([Server, Tester]).
+
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically we make an async (Timeout = nowait) call to accept,
+%% wait some time and then cancel. IPv4
+%%
+api_a_accept_cancel_tcp4(suite) ->
+    [];
+api_a_accept_cancel_tcp4(doc) ->
+    [];
+api_a_accept_cancel_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_a_accept_cancel_tcp4,
+           fun() ->
+                   Accept = fun(Sock) ->
+                                    case socket:accept(Sock, nowait) of
+                                        {ok, _} = OK ->
+                                            OK;
+                                        {select, _} = SELECT ->
+                                            SELECT;
+                                        {error, _} = ERROR ->
+                                            ERROR
+                                    end
+                            end,
+                   InitState = #{domain => inet,
+                                 accept => Accept},
+                   ok = api_a_accept_cancel_tcp(InitState)
+           end).
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically we make an async (Timeout = nowait) call to accept,
+%% wait some time and then cancel. IPv6
+%%
+api_a_accept_cancel_tcp6(suite) ->
+    [];
+api_a_accept_cancel_tcp6(doc) ->
+    [];
+api_a_accept_cancel_tcp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_a_accept_cancel_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   Accept = fun(Sock) ->
+                                    case socket:accept(Sock, nowait) of
+                                        {ok, _} = OK ->
+                                            OK;
+                                        {select, _} = SELECT ->
+                                            SELECT;
+                                        {error, _} = ERROR ->
+                                            ERROR
+                                    end
+                            end,
+                   InitState = #{domain => inet6,
+                                 accept => Accept},
+                   ok = api_a_accept_cancel_tcp(InitState)
+           end).
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+api_a_accept_cancel_tcp(InitState) ->
+    process_flag(trap_exit, true),
+    ServerSeq = 
+        [
+         %% *** Wait for start order ***
+         #{desc => "await start (from tester)",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester}) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{lsa => LSA}}
+                   end},
+         #{desc => "create listen socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, stream, tcp) of
+                               {ok, Sock} ->
+                                   {ok, State#{lsock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{lsock := LSock, lsa := LSA} = State) ->
+                           case socket:bind(LSock, LSA) of
+                               {ok, Port} ->
+                                   {ok, State#{lport => Port}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "make listen socket",
+           cmd  => fun(#{lsock := LSock}) ->
+                           socket:listen(LSock)
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester, lport := Port}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, Port),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (accept)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, accept)
+                   end},
+         #{desc => "await connection (nowait)",
+           cmd  => fun(#{lsock := LSock, accept := Accept} = State) ->
+                           case Accept(LSock) of
+                               {select, {select_info, T, R} = SelectInfo} ->
+                                   ?SEV_IPRINT("accept select: "
+                                               "~n   T: ~p"
+                                               "~n   R: ~p", [T, R]),
+                                   {ok, State#{accept_select_info => SelectInfo}};
+                               {ok, X} ->
+                                   {error, {unexpected_select_info, X}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (accept_select)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, accept_select),
+                           ok
+                   end},
+         #{desc => "await select message (without success)",
+           cmd  => fun(#{lsock := Sock}) ->
+                           receive
+                               {'$socket', Sock, select, Ref} ->
+                                   {error, {unexpected_select, Ref}}
+                           after 5000 ->
+                                   ok
+                           end
+                   end},
+         #{desc => "announce ready (no select)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, no_select),
+                           ok
+                   end},
+         #{desc => "await continue (cancel)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, cancel)
+                   end},
+         #{desc => "cancel",
+           cmd  => fun(#{lsock := Sock, accept_select_info := SelectInfo}) ->
+                           ok = socket:cancel(Sock, SelectInfo)
+                   end},
+         #{desc => "announce ready (cancel)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, cancel),
+                           ok
+                   end},
+
+         %% *** Termination ***
+         #{desc => "await terminate",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close listen socket",
+           cmd  => fun(#{lsock := Sock}) ->
+                           socket:close(Sock)
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "monitor server",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+
+         %% Start the server
+         #{desc => "order server start",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid),
+                           ok
+                   end},
+         #{desc => "await server ready (init)",
+           cmd  => fun(#{server := Pid} = State) ->
+                           {ok, Port} = ?SEV_AWAIT_READY(Pid, server, init),
+                           {ok, State#{server_port => Port}}
+                   end},
+
+         %% *** The actual test ***
+         #{desc => "order server to continue (with accept)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Server, accept),
+                           ok
+                   end},
+         #{desc => "await server ready (accept select)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, server, accept_select)
+                   end},
+         #{desc => "await server ready (no select)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, server, no_select)
+                   end},
+         #{desc => "order server to continue (cancel)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, cancel),
+                           ok
+                   end},
+         #{desc => "await server ready (cancel)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, server, cancel)
+                   end},
+
+         %% *** Termination ***
+         #{desc => "order server to terminate",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Server),
+                           ok
+                   end},
+         #{desc => "await server termination",
+           cmd  => fun(#{server := Server} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Server),
+                           State1 = maps:remove(server, State),
+                           {ok, State1}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    i("start server evaluator"),
+    Server = ?SEV_START("server", ServerSeq, InitState),
+
+    i("start tester evaluator"),
+    TesterInitState = #{server => Server#ev.pid},
+    Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    i("await evaluator(s)"),
+    ok = ?SEV_AWAIT_FINISH([Server, Tester]).
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically we make an async (Timeout = nowait) call to recv,
+%% wait some time and then cancel. IPv4
+%%
+api_a_recv_cancel_tcp4(suite) ->
+    [];
+api_a_recv_cancel_tcp4(doc) ->
+    [];
+api_a_recv_cancel_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_a_recv_cancel_tcp4,
+           fun() ->
+                   Recv = fun(Sock) ->
+                                  socket:recv(Sock, 0, nowait)
+                          end,
+                   InitState = #{domain => inet,
+                                 recv   => Recv},
+                   ok = api_a_recv_cancel_tcp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically we make an async (Timeout = nowait) call to recv,
+%% wait some time and then cancel. IPv6
+%%
+api_a_recv_cancel_tcp6(suite) ->
+    [];
+api_a_recv_cancel_tcp6(doc) ->
+    [];
+api_a_recv_cancel_tcp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_a_recv_cancel_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   Recv = fun(Sock) ->
+                                  socket:recv(Sock, 0, nowait)
+                          end,
+                   InitState = #{domain => inet6,
+                                 recv   => Recv},
+                   ok = api_a_recv_cancel_tcp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically we make an async (Timeout = nowait) call to recvmsg,
+%% wait some time and then cancel. IPv4
+%%
+api_a_recvmsg_cancel_tcp4(suite) ->
+    [];
+api_a_recvmsg_cancel_tcp4(doc) ->
+    [];
+api_a_recvmsg_cancel_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_a_recvmsg_cancel_tcp4,
+           fun() ->
+                   Recv = fun(Sock) ->
+                                  socket:recvmsg(Sock, nowait)
+                          end,
+                   InitState = #{domain => inet,
+                                 recv   => Recv},
+                   ok = api_a_recv_cancel_tcp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically we make an async (Timeout = nowait) call to recvmsg,
+%% wait some time and then cancel. IPv6
+%%
+api_a_recvmsg_cancel_tcp6(suite) ->
+    [];
+api_a_recvmsg_cancel_tcp6(doc) ->
+    [];
+api_a_recvmsg_cancel_tcp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_a_recvmsg_cancel_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   Recv = fun(Sock) ->
+                                  socket:recvmsg(Sock, nowait)
+                          end,
+                   InitState = #{domain => inet6,
+                                 recv   => Recv},
+                   ok = api_a_recv_cancel_tcp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+api_a_recv_cancel_tcp(InitState) ->
+    process_flag(trap_exit, true),
+    ServerSeq = 
+        [
+         %% *** Wait for start order ***
+         #{desc => "await start (from tester)",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester}) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{lsa => LSA}}
+                   end},
+         #{desc => "create listen socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, stream, tcp) of
+                               {ok, Sock} ->
+                                   {ok, State#{lsock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{lsock := LSock, lsa := LSA} = State) ->
+                           case socket:bind(LSock, LSA) of
+                               {ok, Port} ->
+                                   {ok, State#{lport => Port}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "make listen socket",
+           cmd  => fun(#{lsock := LSock}) ->
+                           socket:listen(LSock)
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester, lport := Port}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, Port),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (accept)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, accept)
+                   end},
+         #{desc => "await connection (nowait)",
+           cmd  => fun(#{lsock := LSock} = State) ->
+                           case socket:accept(LSock) of
+                               {ok, CSock} ->
+                                   {ok, State#{csock => CSock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (accept)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, accept),
+                           ok
+                   end},
+
+         #{desc => "await continue (nowait recv)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, recv)
+                   end},
+         #{desc => "try recv request (with nowait, expect select)",
+           cmd  => fun(#{csock := Sock, recv := Recv} = State) ->
+                           case Recv(Sock) of
+                               {select, {select_info, T, R} = SelectInfo} ->
+                                   ?SEV_IPRINT("recv select: "
+                                               "~n   Tag: ~p"
+                                               "~n   Ref: ~p", [T, R]),
+                                   {ok, State#{recv_select_info => SelectInfo}};
+                               {ok, X} ->
+                                   {error, {unexpected_select_info, X}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv_select)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_select),
+                           ok
+                   end},
+         #{desc => "await select message",
+           cmd  => fun(#{csock := Sock}) ->
+                           receive
+                               {'$socket', Sock, select, Ref} ->
+                                   {error, {unexpected_select, Ref}}
+                           after 5000 ->
+                                   ok
+                           end
+                   end},
+         #{desc => "announce ready (no select)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, no_select),
+                           ok
+                   end},
+         #{desc => "await continue (cancel)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, cancel)
+                   end},
+         #{desc => "cancel",
+           cmd  => fun(#{csock := Sock, recv_select_info := SelectInfo}) ->
+                           ok = socket:cancel(Sock, SelectInfo)
+                   end},
+         #{desc => "announce ready (cancel)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, cancel),
+                           ok
+                   end},
+
+         %% *** Termination ***
+         #{desc => "await terminate",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close connection socket",
+           cmd  => fun(#{csock := Sock}) ->
+                           socket:close(Sock)
+                   end},
+         #{desc => "close listen socket",
+           cmd  => fun(#{lsock := Sock}) ->
+                           socket:close(Sock)
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+
+    ClientSeq = 
+        [
+         %% *** Wait for start order ***
+         #{desc => "await start (from tester)",
+           cmd  => fun(State) ->
+                           {Tester, Port} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester, server_port => Port}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester}) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** The init part ***
+         #{desc => "which server (local) address",
+           cmd  => fun(#{domain := Domain, server_port := Port} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           SSA = LSA#{port => Port},
+                           {ok, State#{local_sa => LSA, server_sa => SSA}}
+                   end},
+         #{desc => "create socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, stream, tcp) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{sock := Sock, local_sa := LSA} = _State) ->
+                           case socket:bind(Sock, LSA) of
+                               {ok, _Port} ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init),
+                           ok
+                   end},
+
+         %% *** The actual test ***
+         #{desc => "await continue (connect)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, connect)
+                   end},
+         #{desc => "connect to server",
+           cmd  => fun(#{sock := Sock, server_sa := SSA}) ->
+                           socket:connect(Sock, SSA)
+                   end},
+         #{desc => "announce ready (connect)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, connect),
+                           ok
+                   end},
+
+         %% *** Termination ***
+         #{desc => "await terminate",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close socket",
+           cmd  => fun(#{sock := Sock}) ->
+                           socket:close(Sock)
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "monitor server",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor client",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+
+         %% Start the server
+         #{desc => "order server start",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid),
+                           ok
+                   end},
+         #{desc => "await server ready (init)",
+           cmd  => fun(#{server := Pid} = State) ->
+                           {ok, Port} = ?SEV_AWAIT_READY(Pid, server, init),
+                           {ok, State#{server_port => Port}}
+                   end},
+
+         %% Start the client
+         #{desc => "order client start",
+           cmd  => fun(#{client := Pid, server_port := Port} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, Port),
+                           ok
+                   end},
+         #{desc => "await client ready (init)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, client, init)
+                   end},
+
+         %% *** The actual test ***
+         #{desc => "order server to continue (with accept)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Server, accept),
+                           ok
+                   end},
+         #{desc => "order client to continue (connect)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, connect),
+                           ok
+                   end},
+         #{desc => "await client ready (connect)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, client, connect)
+                   end},
+         #{desc => "await server ready (accept)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, server, accept)
+                   end},
+
+         #{desc => "order server to continue (recv)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv),
+                           ok
+                   end},
+         #{desc => "await server ready (recv select)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, server, recv_select)
+                   end},
+         #{desc => "await server ready (no select)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, server, no_select)
+                   end},
+         #{desc => "order server to continue (send request)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, cancel),
+                           ok
+                   end},
+         #{desc => "await server ready (cancel)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, server, cancel)
+                   end},
+
+         %% *** Termination ***
+         #{desc => "order client to terminate",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Client),
+                           ok
+                   end},
+         #{desc => "await client termination",
+           cmd  => fun(#{client := Client} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Client),
+                           State1 = maps:remove(client, State),
+                           {ok, State1}
+                   end},
+         #{desc => "order server to terminate",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Server),
+                           ok
+                   end},
+         #{desc => "await server termination",
+           cmd  => fun(#{server := Server} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Server),
+                           State1 = maps:remove(server, State),
+                           {ok, State1}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    i("start server evaluator"),
+    Server = ?SEV_START("server", ServerSeq, InitState),
+
+    i("start client evaluator"),
+    Client = ?SEV_START("client", ClientSeq, InitState),
+
+    i("start tester evaluator"),
+    TesterInitState = #{server => Server#ev.pid,
+                        client => Client#ev.pid},
+    Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    i("await evaluator(s)"),
+    ok = ?SEV_AWAIT_FINISH([Server, Client, Tester]).
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically we make multiple async (Timeout = nowait) call(s) to recvfrom
+%% (from *several* processes), wait some time and then cancel.
+%% This should result in abort messages to the 'other' processes. IPv4
+%%
+api_a_mrecvfrom_cancel_udp4(suite) ->
+    [];
+api_a_mrecvfrom_cancel_udp4(doc) ->
+    [];
+api_a_mrecvfrom_cancel_udp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(20)),
+    tc_try(api_a_mrecvfrom_cancel_udp4,
+           fun() ->
+                   Recv = fun(Sock) ->
+                                  case socket:recvfrom(Sock, 0, nowait) of
+                                      {ok, _} = OK ->
+                                          OK;
+                                      {select, _} = SELECT ->
+                                          SELECT;
+                                      {error, _} = ERROR ->
+                                          ERROR
+                                  end
+                          end,
+                   InitState = #{domain => inet,
+                                 recv   => Recv},
+                   ok = api_a_mrecv_cancel_udp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically we make multiple async (Timeout = nowait) call(s) to recvfrom
+%% (from *several* processes), wait some time and then cancel.
+%% This should result in abort messages to the 'other' processes. IPv6
+%%
+api_a_mrecvfrom_cancel_udp6(suite) ->
+    [];
+api_a_mrecvfrom_cancel_udp6(doc) ->
+    [];
+api_a_mrecvfrom_cancel_udp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(20)),
+    tc_try(api_a_mrecvfrom_cancel_udp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   Recv = fun(Sock) ->
+                                  case socket:recvfrom(Sock, 0, nowait) of
+                                      {ok, _} = OK ->
+                                          OK;
+                                      {select, _} = SELECT ->
+                                          SELECT;
+                                      {error, _} = ERROR ->
+                                          ERROR
+                                  end
+                          end,
+                   InitState = #{domain => inet6,
+                                 recv   => Recv},
+                   ok = api_a_mrecv_cancel_udp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically we make multiple async (Timeout = nowait) call(s) to recvmsg
+%% (from *several* processes), wait some time and then cancel.
+%% This should result in abort messages to the 'other' processes. IPv4
+%%
+api_a_mrecvmsg_cancel_udp4(suite) ->
+    [];
+api_a_mrecvmsg_cancel_udp4(doc) ->
+    [];
+api_a_mrecvmsg_cancel_udp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(20)),
+    tc_try(api_a_mrecvmsg_cancel_udp4,
+           fun() ->
+                   Recv = fun(Sock) ->
+                                  case socket:recvmsg(Sock, nowait) of
+                                      {ok, _} = OK ->
+                                          OK;
+                                      {select, _} = SELECT ->
+                                          SELECT;
+                                      {error, _} = ERROR ->
+                                          ERROR
+                                  end
+                          end,
+                   InitState = #{domain => inet,
+                                 recv   => Recv},
+                   ok = api_a_mrecv_cancel_udp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically we make multiple async (Timeout = nowait) call(s) to recvmsg
+%% (from *several* processes), wait some time and then cancel.
+%% This should result in abort messages to the 'other' processes. IPv6
+%%
+api_a_mrecvmsg_cancel_udp6(suite) ->
+    [];
+api_a_mrecvmsg_cancel_udp6(doc) ->
+    [];
+api_a_mrecvmsg_cancel_udp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(20)),
+    tc_try(api_a_mrecvmsg_cancel_udp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   Recv = fun(Sock) ->
+                                  case socket:recvmsg(Sock, nowait) of
+                                      {ok, _} = OK ->
+                                          OK;
+                                      {select, _} = SELECT ->
+                                          SELECT;
+                                      {error, _} = ERROR ->
+                                          ERROR
+                                  end
+                          end,
+                   InitState = #{domain => inet6,
+                                 recv   => Recv},
+                   ok = api_a_mrecv_cancel_udp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+api_a_mrecv_cancel_udp(InitState) ->
+    ServerSeq = 
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{local_sa => LSA}}
+                   end},
+         #{desc => "create socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, dgram, udp) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind socket (to local address)",
+           cmd  => fun(#{sock := Sock, local_sa := LSA} = State) ->
+                           case socket:bind(Sock, LSA) of
+                               {ok, Port} ->
+                                   {ok, State#{port => Port}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester, sock := Sock}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, Sock),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (recv)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, recv)
+                   end},
+         #{desc => "try recv request (with nowait, expect select)",
+           cmd  => fun(#{sock := Sock, recv := Recv} = State) ->
+                           case Recv(Sock) of
+                               {select, SelectInfo} ->
+                                   {ok, State#{recv_select_info => SelectInfo}};
+                               {ok, X} ->
+                                   {error, {unexpected_select_info, X}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv_select)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_select),
+                           ok
+                   end},
+         #{desc => "await abort message",
+           cmd  => fun(#{sock             := Sock,
+                         recv_select_info := {select_info, _, Ref}} = State) ->
+                           receive
+                               {'$socket', Sock, select, Ref} ->
+                                   {error, {unexpected_select, Ref}};
+                               {'$socket', Sock, abort, {Ref, closed}} ->
+                                   {ok, maps:remove(sock, State)}
+                           after 5000 ->
+                                   ?SEV_EPRINT("message queue: ~p", [mq()]),
+                                   {error, timeout}
+                           end
+                   end},
+         #{desc => "announce ready (abort)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, abort),
+                           ok
+                   end},
+
+         %% Termination
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   State2 = maps:remove(tester,    State),
+                                   State3 = maps:remove(recv_stag, State2),
+                                   State4 = maps:remove(recv_sref, State3),
+                                   State5 = maps:remove(req_src,   State4),
+                                   {ok, State5};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+
+    AltServerSeq = 
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           {Tester, Sock} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester, sock => Sock}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (recv)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, recv)
+                   end},
+         #{desc => "try recv request (with nowait, expect select)",
+           cmd  => fun(#{sock := Sock, recv := Recv} = State) ->
+                           case Recv(Sock) of
+                               {select, SelectInfo} ->
+                                   {ok, State#{recv_select_info => SelectInfo}};
+                               {ok, X} ->
+                                   {error, {unexpected_select_info, X}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv_select)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_select),
+                           ok
+                   end},
+         #{desc => "await abort message",
+           cmd  => fun(#{sock             := Sock,
+                         recv_select_info := {select_info, _, Ref}} = State) ->
+                           receive
+                               {'$socket', Sock, select, Ref} ->
+                                   {error, {unexpected_select, Ref}};
+                               {'$socket', Sock, abort, {Ref, closed}} ->
+                                   {ok, maps:remove(sock, State)}
+                           after 5000 ->
+                                   ?SEV_EPRINT("message queue: ~p", [mq()]),
+                                   {error, timeout}
+                           end
+                   end},
+         #{desc => "announce ready (abort)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, abort),
+                           ok
+                   end},
+
+         %% Termination
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   ?SEV_IPRINT("terminating"),
+                                   State1 = maps:remove(recv_select_info, State),
+                                   State2 = maps:remove(tester,           State1),
+                                   State3 = maps:remove(sock,             State2),
+                                   {ok, State3};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+
+
+    TesterSeq = 
+        [
+         %% *** Init part ***
+         #{desc => "monitor server",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor alt-server 1",
+           cmd  => fun(#{alt_server1 := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor alt-server 2",
+           cmd  => fun(#{alt_server2 := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+
+         %% Start the server
+         #{desc => "order server start",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid),
+                           ok
+                   end},
+         #{desc => "await server ready (init)",
+           cmd  => fun(#{server := Pid} = State) ->
+                           {ok, Sock} = ?SEV_AWAIT_READY(Pid, server, init),
+                           {ok, State#{sock => Sock}}
+                   end},
+
+         %% Start the alt-server 1
+         #{desc => "order alt-server 1 start",
+           cmd  => fun(#{alt_server1 := Pid, sock := Sock} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, Sock),
+                           ok
+                   end},
+         #{desc => "await alt-server 1 ready (init)",
+           cmd  => fun(#{alt_server1 := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, alt_server1, init)
+                   end},
+
+         %% Start the alt-server 2
+         #{desc => "order alt-server 2 start",
+           cmd  => fun(#{alt_server2 := Pid, sock := Sock} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, Sock),
+                           ok
+                   end},
+         #{desc => "await alt-server 2 ready (init)",
+           cmd  => fun(#{alt_server2 := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, alt_server2, init)
+                   end},
+
+
+         %% The actual test
+         #{desc => "order server continue (recv)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv),
+                           ok
+                   end},
+         #{desc => "await server ready (recv select)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, server, recv_select)
+                   end},
+
+         #{desc => "order alt-server 1 continue (recv)",
+           cmd  => fun(#{alt_server1 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv),
+                           ok
+                   end},
+         #{desc => "await alt-server 1 ready (recv select)",
+           cmd  => fun(#{alt_server1 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, alt_server1, recv_select)
+                   end},
+
+         #{desc => "order alt-server 2 continue (recv)",
+           cmd  => fun(#{alt_server2 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv),
+                           ok
+                   end},
+         #{desc => "await alt-server 2 ready (recv select)",
+           cmd  => fun(#{alt_server2 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, alt_server2, recv_select)
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "close the socket",
+           cmd  => fun(#{sock := Sock} = _State) ->
+                           socket:close(Sock)
+                   end},
+
+         #{desc => "await server ready (abort)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, server, abort)
+                   end},
+         #{desc => "await alt-server 1 ready (abort)",
+           cmd  => fun(#{alt_server1 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, alt_server1, abort)
+                   end},
+         #{desc => "await alt-server 2 ready (abort)",
+           cmd  => fun(#{alt_server2 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, alt_server2, abort)
+                   end},
+
+         %% Terminations
+         #{desc => "order alt-server 2 to terminate",
+           cmd  => fun(#{alt_server2 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await alt-server 2 termination",
+           cmd  => fun(#{alt_server2 := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(alt_server2, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         #{desc => "order alt-server 1 to terminate",
+           cmd  => fun(#{alt_server1 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await alt-server 1 termination",
+           cmd  => fun(#{alt_server1 := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(alt_server1, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         #{desc => "order server to terminate",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await server termination",
+           cmd  => fun(#{server := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(server, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    i("start server evaluator"),
+    Server = ?SEV_START("server", ServerSeq, InitState),
+
+    i("start alt-server 1 evaluator"),
+    AltServer1 = ?SEV_START("alt_server1", AltServerSeq, InitState),
+
+    i("start alt-server 2 evaluator"),
+    AltServer2 = ?SEV_START("alt_server2", AltServerSeq, InitState),
+
+    i("start 'tester' evaluator"),
+    TesterInitState = #{server      => Server#ev.pid,
+                        alt_server1 => AltServer1#ev.pid,
+                        alt_server2 => AltServer2#ev.pid},
+    Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    i("await evaluator(s)"),
+    ok = ?SEV_AWAIT_FINISH([Server, AltServer1, AltServer2, Tester]).
+
+
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically we make multiple async (Timeout = nowait) call(s) to accept
+%% (from *several* processes), wait some time and then cancel,
+%% This should result in abort messages to the 'other' processes. IPv4
+%%
+api_a_maccept_cancel_tcp4(suite) ->
+    [];
+api_a_maccept_cancel_tcp4(doc) ->
+    [];
+api_a_maccept_cancel_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(20)),
+    tc_try(api_a_maccept_cancel_tcp4,
+           fun() ->
+                   Accept = fun(Sock) ->
+                                    case socket:accept(Sock, nowait) of
+                                        {ok, _} = OK ->
+                                            OK;
+                                        {select, _} = SELECT ->
+                                            SELECT;
+                                        {error, _} = ERROR ->
+                                            ERROR
+                                    end
+                            end,
+                   InitState = #{domain => inet,
+                                 accept => Accept},
+                   ok = api_a_maccept_cancel_tcp(InitState)
+           end).
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically we make multiple async (Timeout = nowait) call(s) to accept
+%% (from *several* processes), wait some time and then cancel,
+%% This should result in abort messages to the 'other' processes. IPv6
+%%
+api_a_maccept_cancel_tcp6(suite) ->
+    [];
+api_a_maccept_cancel_tcp6(doc) ->
+    [];
+api_a_maccept_cancel_tcp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(20)),
+    tc_try(api_a_maccept_cancel_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   Accept = fun(Sock) ->
+                                    case socket:accept(Sock, nowait) of
+                                        {ok, _} = OK ->
+                                            OK;
+                                        {select, _} = SELECT ->
+                                            SELECT;
+                                        {error, _} = ERROR ->
+                                            ERROR
+                                    end
+                            end,
+                   InitState = #{domain => inet6,
+                                 accept => Accept},
+                   ok = api_a_maccept_cancel_tcp(InitState)
+           end).
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+api_a_maccept_cancel_tcp(InitState) ->
+    process_flag(trap_exit, true),
+    ServerSeq = 
+        [
+         %% *** Wait for start order ***
+         #{desc => "await start (from tester)",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester}) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{lsa => LSA}}
+                   end},
+         #{desc => "create listen socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, stream, tcp) of
+                               {ok, Sock} ->
+                                   {ok, State#{lsock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{lsock := LSock, lsa := LSA} = State) ->
+                           case socket:bind(LSock, LSA) of
+                               {ok, Port} ->
+                                   {ok, State#{lport => Port}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "make listen socket",
+           cmd  => fun(#{lsock := LSock}) ->
+                           socket:listen(LSock)
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester, lsock := Sock}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, Sock),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (accept)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, accept)
+                   end},
+         #{desc => "await connection (nowait)",
+           cmd  => fun(#{lsock := LSock, accept := Accept} = State) ->
+                           case Accept(LSock) of
+                               {select, {select_info, T, R} = SelectInfo} ->
+                                   ?SEV_IPRINT("accept select: "
+                                               "~n   T: ~p"
+                                               "~n   R: ~p", [T, R]),
+                                   {ok, State#{accept_select_info => SelectInfo}};
+                               {ok, X} ->
+                                   {error, {unexpected_select_info, X}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (accept_select)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, accept_select),
+                           ok
+                   end},
+         #{desc => "await select message (without success)",
+           cmd  => fun(#{lsock              := Sock,
+                         accept_select_info := {select_info, _, Ref}} = State) ->
+                           receive
+                               {'$socket', Sock, select, Ref} ->
+                                   {error, {unexpected_select, Ref}};
+                               {'$socket', Sock, abort, {Ref, closed}} ->
+                                   {ok, maps:remove(lsock, State)}
+                           after 5000 ->
+                                   ?SEV_EPRINT("message queue: ~p", [mq()]),
+                                   {error, timeout}
+                           end
+                   end},
+         #{desc => "announce ready (abort)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, abort),
+                           ok
+                   end},
+
+         %% *** Termination ***
+         #{desc => "await terminate",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+
+    AltServerSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           {Tester, Sock} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester, lsock => Sock}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (accept)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, accept)
+                   end},
+         #{desc => "try accept request (with nowait, expect select)",
+           cmd  => fun(#{lsock := Sock, accept := Accept} = State) ->
+                           case Accept(Sock) of
+                               {select, SelectInfo} ->
+                                   {ok, State#{accept_select_info => SelectInfo}};
+                               {ok, X} ->
+                                   {error, {unexpected_select_info, X}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (accept_select)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, accept_select),
+                           ok
+                   end},
+         #{desc => "await abort message",
+           cmd  => fun(#{lsock              := Sock,
+                         accept_select_info := {select_info, _, Ref}} = State) ->
+                           receive
+                               {'$socket', Sock, select, Ref} ->
+                                   {error, {unexpected_select, Ref}};
+                               {'$socket', Sock, abort, {Ref, closed}} ->
+                                   {ok, maps:remove(sock, State)}
+                           after 5000 ->
+                                   ?SEV_EPRINT("message queue: ~p", [mq()]),
+                                   {error, timeout}
+                           end
+                   end},
+         #{desc => "announce ready (abort)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, abort),
+                           ok
+                   end},
+
+         %% Termination
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   ?SEV_IPRINT("terminating"),
+                                   State1 = maps:remove(tester,             State),
+                                   State2 = maps:remove(accept_select_info, State1),
+                                   State3 = maps:remove(lsock,              State2),
+                                   {ok, State3};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "monitor server",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor alt-server 1",
+           cmd  => fun(#{alt_server1 := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor alt-server 2",
+           cmd  => fun(#{alt_server2 := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+
+         %% Start the server
+         #{desc => "order server start",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid),
+                           ok
+                   end},
+         #{desc => "await server ready (init)",
+           cmd  => fun(#{server := Pid} = State) ->
+                           {ok, Sock} = ?SEV_AWAIT_READY(Pid, server, init),
+                           {ok, State#{sock => Sock}}
+                   end},
+
+         %% Start the alt-server 1
+         #{desc => "order alt-server 1 start",
+           cmd  => fun(#{alt_server1 := Pid, sock := Sock} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, Sock),
+                           ok
+                   end},
+         #{desc => "await alt-server 1 ready (init)",
+           cmd  => fun(#{alt_server1 := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, alt_server1, init)
+                   end},
+
+         %% Start the alt-server 2
+         #{desc => "order alt-server 2 start",
+           cmd  => fun(#{alt_server2 := Pid, sock := Sock} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, Sock),
+                           ok
+                   end},
+         #{desc => "await alt-server 2 ready (init)",
+           cmd  => fun(#{alt_server2 := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, alt_server2, init)
+                   end},
+
+
+         %% *** The actual test ***
+         #{desc => "order server continue (accept)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, accept),
+                           ok
+                   end},
+         #{desc => "await server ready (accept select)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, server, accept_select)
+                   end},
+
+         #{desc => "order alt-server 1 continue (accept)",
+           cmd  => fun(#{alt_server1 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, accept),
+                           ok
+                   end},
+         #{desc => "await alt-server 1 ready (accept select)",
+           cmd  => fun(#{alt_server1 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, alt_server1, accept_select)
+                   end},
+
+         #{desc => "order alt-server 2 continue (accept)",
+           cmd  => fun(#{alt_server2 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, accept),
+                           ok
+                   end},
+         #{desc => "await alt-server 2 ready (accept select)",
+           cmd  => fun(#{alt_server2 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, alt_server2, accept_select)
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "close the socket",
+           cmd  => fun(#{sock := Sock} = _State) ->
+                           socket:close(Sock)
+                   end},
+
+         #{desc => "await server ready (abort)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, server, abort)
+                   end},
+         #{desc => "await alt-server 1 ready (abort)",
+           cmd  => fun(#{alt_server1 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, alt_server1, abort)
+                   end},
+         #{desc => "await alt-server 2 ready (abort)",
+           cmd  => fun(#{alt_server2 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, alt_server2, abort)
+                   end},
+
+
+         %% *** Termination ***
+         #{desc => "order alt-server 2 to terminate",
+           cmd  => fun(#{alt_server2 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await alt-server 2 termination",
+           cmd  => fun(#{alt_server2 := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(alt_server2, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         #{desc => "order alt-server 1 to terminate",
+           cmd  => fun(#{alt_server1 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await alt-server 1 termination",
+           cmd  => fun(#{alt_server1 := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(alt_server1, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         #{desc => "order server to terminate",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Server),
+                           ok
+                   end},
+         #{desc => "await server termination",
+           cmd  => fun(#{server := Server} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Server),
+                           State1 = maps:remove(server, State),
+                           {ok, State1}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    i("start server evaluator"),
+    Server = ?SEV_START("server", ServerSeq, InitState),
+
+    i("start alt-server 1 evaluator"),
+    AltServer1 = ?SEV_START("alt_server1", AltServerSeq, InitState),
+
+    i("start alt-server 2 evaluator"),
+    AltServer2 = ?SEV_START("alt_server2", AltServerSeq, InitState),
+
+    i("start tester evaluator"),
+    TesterInitState = #{server      => Server#ev.pid,
+                        alt_server1 => AltServer1#ev.pid,
+                        alt_server2 => AltServer2#ev.pid},
+    Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    i("await evaluator(s)"),
+    ok = ?SEV_AWAIT_FINISH([Server, AltServer1, AltServer2, Tester]).
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically we make multiple async (Timeout = nowait) call(s) to recv
+%% (from *several* processes), wait some time and then cancel,
+%% This should result in abort messages to the 'other' processes. IPv4
+%%
+api_a_mrecv_cancel_tcp4(suite) ->
+    [];
+api_a_mrecv_cancel_tcp4(doc) ->
+    [];
+api_a_mrecv_cancel_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(20)),
+    tc_try(api_a_mrecv_cancel_tcp4,
+           fun() ->
+                   Recv = fun(Sock) ->
+                                  socket:recv(Sock, 0, nowait)
+                          end,
+                   InitState = #{domain => inet,
+                                 recv   => Recv},
+                   ok = api_a_mrecv_cancel_tcp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically we make multiple async (Timeout = nowait) call(s) to recv
+%% (from *several* processes), wait some time and then cancel,
+%% This should result in abort messages to the 'other' processes. IPv6
+%%
+api_a_mrecv_cancel_tcp6(suite) ->
+    [];
+api_a_mrecv_cancel_tcp6(doc) ->
+    [];
+api_a_mrecv_cancel_tcp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(20)),
+    tc_try(api_a_mrecv_cancel_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   Recv = fun(Sock) ->
+                                  socket:recv(Sock, 0, nowait)
+                          end,
+                   InitState = #{domain => inet6,
+                                 recv   => Recv},
+                   ok = api_a_mrecv_cancel_tcp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically we make multiple async (Timeout = nowait) call(s) to recvmsg
+%% (from *several* processes), wait some time and then cancel,
+%% This should result in abort messages to the 'other' processes. IPv4
+%%
+api_a_mrecvmsg_cancel_tcp4(suite) ->
+    [];
+api_a_mrecvmsg_cancel_tcp4(doc) ->
+    [];
+api_a_mrecvmsg_cancel_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(20)),
+    tc_try(api_a_mrecvmsg_cancel_tcp4,
+           fun() ->
+                   Recv = fun(Sock) ->
+                                  socket:recvmsg(Sock, nowait)
+                          end,
+                   InitState = #{domain => inet,
+                                 recv   => Recv},
+                   ok = api_a_mrecv_cancel_tcp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Basically we make multiple async (Timeout = nowait) call(s) to recvmsg
+%% (from *several* processes), wait some time and then cancel,
+%% This should result in abort messages to the 'other' processes. IPv6
+%%
+api_a_mrecvmsg_cancel_tcp6(suite) ->
+    [];
+api_a_mrecvmsg_cancel_tcp6(doc) ->
+    [];
+api_a_mrecvmsg_cancel_tcp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(20)),
+    tc_try(api_a_mrecvmsg_cancel_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   Recv = fun(Sock) ->
+                                  socket:recvmsg(Sock, nowait)
+                          end,
+                   InitState = #{domain => inet6,
+                                 recv   => Recv},
+                   ok = api_a_mrecv_cancel_tcp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+api_a_mrecv_cancel_tcp(InitState) ->
+    process_flag(trap_exit, true),
+    ServerSeq = 
+        [
+         %% *** Wait for start order ***
+         #{desc => "await start (from tester)",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester}) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{lsa => LSA}}
+                   end},
+         #{desc => "create listen socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, stream, tcp) of
+                               {ok, Sock} ->
+                                   {ok, State#{lsock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{lsock := LSock, lsa := LSA} = State) ->
+                           case socket:bind(LSock, LSA) of
+                               {ok, Port} ->
+                                   {ok, State#{lport => Port}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "make listen socket",
+           cmd  => fun(#{lsock := LSock}) ->
+                           socket:listen(LSock)
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester, lport := Port}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, Port),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (accept)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, accept)
+                   end},
+         #{desc => "await connection (nowait)",
+           cmd  => fun(#{lsock := LSock} = State) ->
+                           case socket:accept(LSock) of
+                               {ok, CSock} ->
+                                   {ok, State#{csock => CSock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (accept)",
+           cmd  => fun(#{tester := Tester, csock := Sock}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, accept, Sock),
+                           ok
+                   end},
+
+         #{desc => "await continue (nowait recv)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, recv)
+                   end},
+         #{desc => "try recv request (with nowait, expect select)",
+           cmd  => fun(#{csock := Sock, recv := Recv} = State) ->
+                           case Recv(Sock) of
+                               {select, {select_info, T, R} = SelectInfo} ->
+                                   ?SEV_IPRINT("recv select: "
+                                               "~n   Tag: ~p"
+                                               "~n   Ref: ~p", [T, R]),
+                                   {ok, State#{recv_select_info => SelectInfo}};
+                               {ok, X} ->
+                                   {error, {unexpected_select_info, X}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv_select)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_select),
+                           ok
+                   end},
+         #{desc => "await select message",
+           cmd  => fun(#{csock            := Sock,
+                         recv_select_info := {select_info, _, Ref}} = State) ->
+                           receive
+                               {'$socket', Sock, select, Ref} ->
+                                   {error, {unexpected_select, Ref}};
+                               {'$socket', Sock, abort, {Ref, closed}} ->
+                                   {ok, maps:remove(sock, State)}
+                           after 5000 ->
+                                   ok
+                           end
+                   end},
+         #{desc => "announce ready (abort)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, abort),
+                           ok
+                   end},
+
+         %% *** Termination ***
+         #{desc => "await terminate",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close listen socket",
+           cmd  => fun(#{lsock := Sock}) ->
+                           socket:close(Sock)
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    AltServerSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           {Tester, Sock} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester, sock => Sock}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (recv)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, recv)
+                   end},
+         #{desc => "try recv request (with nowait, expect select)",
+           cmd  => fun(#{sock := Sock, recv := Recv} = State) ->
+                           case Recv(Sock) of
+                               {select, SelectInfo} ->
+                                   {ok, State#{recv_select_info => SelectInfo}};
+                               {ok, X} ->
+                                   {error, {unexpected_select_info, X}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv_select)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_select),
+                           ok
+                   end},
+         #{desc => "await abort message",
+           cmd  => fun(#{sock             := Sock,
+                         recv_select_info := {select_info, _, Ref}} = State) ->
+                           receive
+                               {'$socket', Sock, select, Ref} ->
+                                   {error, {unexpected_select, Ref}};
+                               {'$socket', Sock, abort, {Ref, closed}} ->
+                                   {ok, maps:remove(sock, State)}
+                           after 5000 ->
+                                   ?SEV_EPRINT("message queue: ~p", [mq()]),
+                                   {error, timeout}
+                           end
+                   end},
+         #{desc => "announce ready (abort)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, abort),
+                           ok
+                   end},
+
+         %% Termination
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   ?SEV_IPRINT("terminating"),
+                                   State1 = maps:remove(recv_select_info, State),
+                                   State2 = maps:remove(tester,           State1),
+                                   State3 = maps:remove(sock,             State2),
+                                   {ok, State3};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    ClientSeq = 
+        [
+         %% *** Wait for start order ***
+         #{desc => "await start (from tester)",
+           cmd  => fun(State) ->
+                           {Tester, Port} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester, server_port => Port}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester}) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** The init part ***
+         #{desc => "which server (local) address",
+           cmd  => fun(#{domain := Domain, server_port := Port} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           SSA = LSA#{port => Port},
+                           {ok, State#{local_sa => LSA, server_sa => SSA}}
+                   end},
+         #{desc => "create socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, stream, tcp) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{sock := Sock, local_sa := LSA} = _State) ->
+                           case socket:bind(Sock, LSA) of
+                               {ok, _Port} ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init),
+                           ok
+                   end},
+
+         %% *** The actual test ***
+         #{desc => "await continue (connect)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, connect)
+                   end},
+         #{desc => "connect to server",
+           cmd  => fun(#{sock := Sock, server_sa := SSA}) ->
+                           socket:connect(Sock, SSA)
+                   end},
+         #{desc => "announce ready (connect)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, connect),
+                           ok
+                   end},
+
+         %% *** Termination ***
+         #{desc => "await terminate",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close socket",
+           cmd  => fun(#{sock := Sock}) ->
+                           socket:close(Sock)
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "monitor server",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor alt-server 1",
+           cmd  => fun(#{alt_server1 := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor alt-server 2",
+           cmd  => fun(#{alt_server2 := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor client",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+
+         %% Start the server
+         #{desc => "order server start",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid),
+                           ok
+                   end},
+         #{desc => "await server ready (init)",
+           cmd  => fun(#{server := Pid} = State) ->
+                           {ok, Port} = ?SEV_AWAIT_READY(Pid, server, init),
+                           {ok, State#{server_port => Port}}
+                   end},
+
+         %% Start the client
+         #{desc => "order client start",
+           cmd  => fun(#{client := Pid, server_port := Port} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, Port),
+                           ok
+                   end},
+         #{desc => "await client ready (init)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, client, init)
+                   end},
+
+         #{desc => "order server to continue (with accept)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Server, accept),
+                           ok
+                   end},
+         #{desc => "order client to continue (connect)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, connect),
+                           ok
+                   end},
+         #{desc => "await client ready (connect)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, client, connect)
+                   end},
+         #{desc => "await server ready (accept)",
+           cmd  => fun(#{server := Pid} = State) ->
+                           {ok, Sock} = ?SEV_AWAIT_READY(Pid, server, accept),
+                           {ok, State#{sock => Sock}}
+                   end},
+
+         %% Start the alt server 1
+         #{desc => "order alt-server 1 start",
+           cmd  => fun(#{alt_server1 := Pid, sock := Sock} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, Sock),
+                           ok
+                   end},
+         #{desc => "await alt-server 1 ready (init)",
+           cmd  => fun(#{alt_server1 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, alt_server1, init)
+                   end},
+
+         %% Start the alt server 2
+         #{desc => "order alt-server 2 start",
+           cmd  => fun(#{alt_server2 := Pid, sock := Sock} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, Sock),
+                           ok
+                   end},
+         #{desc => "await alt-server 2 ready (init)",
+           cmd  => fun(#{alt_server2 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, alt_server2, init)
+                   end},
+
+
+         %% *** The actual test ***
+         #{desc => "order server continue (recv)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv),
+                           ok
+                   end},
+         #{desc => "await server ready (recv select)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, server, recv_select)
+                   end},
+
+         #{desc => "order alt-server 1 continue (recv)",
+           cmd  => fun(#{alt_server1 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv),
+                           ok
+                   end},
+         #{desc => "await alt-server 1 ready (recv select)",
+           cmd  => fun(#{alt_server1 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, alt_server1, recv_select)
+                   end},
+
+         #{desc => "order alt-server 2 continue (recv)",
+           cmd  => fun(#{alt_server2 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv),
+                           ok
+                   end},
+         #{desc => "await alt-server 2 ready (recv select)",
+           cmd  => fun(#{alt_server2 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, alt_server2, recv_select)
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "close the socket",
+           cmd  => fun(#{sock := Sock} = _State) ->
+                           socket:close(Sock)
+                   end},
+
+         #{desc => "await server ready (abort)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, server, abort)
+                   end},
+         #{desc => "await alt-server 1 ready (abort)",
+           cmd  => fun(#{alt_server1 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, alt_server1, abort)
+                   end},
+         #{desc => "await alt-server 2 ready (abort)",
+           cmd  => fun(#{alt_server2 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, alt_server2, abort)
+                   end},
+
+         %% Terminations
+         #{desc => "order client to terminate",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Client),
+                           ok
+                   end},
+         #{desc => "await client termination",
+           cmd  => fun(#{client := Client} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Client),
+                           State1 = maps:remove(client, State),
+                           {ok, State1}
+                   end},
+
+         #{desc => "order alt-server 2 to terminate",
+           cmd  => fun(#{alt_server2 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await alt-server 2 termination",
+           cmd  => fun(#{alt_server2 := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(alt_server2, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         #{desc => "order alt-server 1 to terminate",
+           cmd  => fun(#{alt_server1 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await alt-server 1 termination",
+           cmd  => fun(#{alt_server1 := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(alt_server1, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         #{desc => "order server to terminate",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await server termination",
+           cmd  => fun(#{server := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(server, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    i("start server evaluator"),
+    Server = ?SEV_START("server", ServerSeq, InitState),
+
+    i("start alt-server 1 evaluator"),
+    AltServer1 = ?SEV_START("alt_server1", AltServerSeq, InitState),
+
+    i("start alt-server 2 evaluator"),
+    AltServer2 = ?SEV_START("alt_server2", AltServerSeq, InitState),
+
+    i("start client evaluator"),
+    Client = ?SEV_START("client", ClientSeq, InitState),
+
+    i("start tester evaluator"),
+    TesterInitState = #{server      => Server#ev.pid,
+                        alt_server1 => AltServer1#ev.pid,
+                        alt_server2 => AltServer2#ev.pid,
+                        client      => Client#ev.pid},
+    Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    i("await evaluator(s)"),
+    ok = ?SEV_AWAIT_FINISH([Server, AltServer1, AltServer2, Client, Tester]).
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                     %%
+%%                           API OPTIONS                               %%
+%%                                                                     %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Perform some simple getopt and setopt with the level = otp options
+api_opt_simple_otp_options(suite) ->
+    [];
+api_opt_simple_otp_options(doc) ->
+    [];
+api_opt_simple_otp_options(_Config) when is_list(_Config) ->
+    ?TT(?SECS(5)),
+    tc_try(api_opt_simple_otp_options,
+           fun() -> api_opt_simple_otp_options() end).
+
+api_opt_simple_otp_options() ->
+    Get = fun(S, Key) ->
+                  socket:getopt(S, otp, Key)
+          end,
+    Set = fun(S, Key, Val) ->
+                  socket:setopt(S, otp, Key, Val)
+          end,
+
+    Seq = 
+        [
+         %% *** Init part ***
+         #{desc => "create socket",
+           cmd  => fun(#{domain   := Domain, 
+                         type     := Type,
+                         protocol := Protocol} = State) ->
+                           Sock = sock_open(Domain, Type, Protocol),
+                           {ok, State#{sock => Sock}}
+                   end},
+         #{desc => "create dummy process",
+           cmd  => fun(State) ->
+                           Pid =  spawn_link(fun() -> 
+                                                     put(sname, "dummy"),
+                                                     receive
+                                                         die -> 
+                                                             exit(normal) 
+                                                     end 
+                                             end),
+                           {ok, State#{dummy => Pid}}
+                   end},
+
+         %% *** Check iow part ***
+         #{desc => "get iow",
+           cmd  => fun(#{sock := Sock} = State) ->
+                           case Get(Sock, iow) of
+                               {ok, IOW} when is_boolean(IOW) ->
+                                   {ok, State#{iow => IOW}};
+                               {ok, InvalidIOW} ->
+                                   {error, {invalid, InvalidIOW}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% #{desc => "enable debug",
+         %%   cmd  => fun(#{sock := Sock}) ->
+         %%                   ok = socket:setopt(Sock, otp, debug, true)
+         %%           end},
+
+         #{desc => "set (new) iow",
+           cmd  => fun(#{sock := Sock, iow := OldIOW} = State) ->
+                           NewIOW = not OldIOW,
+                           case Set(Sock, iow, NewIOW) of
+                               ok ->
+                                   {ok, State#{iow => NewIOW}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "get (new) iow",
+           cmd  => fun(#{sock := Sock, iow := IOW}) ->
+                           case Get(Sock, iow) of
+                               {ok, IOW} ->
+                                   ok;
+                               {ok, InvalidIOW} ->
+                                   {error, {invalid, InvalidIOW}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% *** Check rcvbuf part ***
+         #{desc => "get rcvbuf",
+           cmd  => fun(#{sock := Sock} = State) ->
+                           case Get(Sock, rcvbuf) of
+                               {ok, RcvBuf} when is_integer(RcvBuf) ->
+                                   {ok, State#{rcvbuf => RcvBuf}};
+                               {ok, {N, RcvBuf} = V} when is_integer(N) andalso 
+                                                          is_integer(RcvBuf) ->
+                                   {ok, State#{rcvbuf => V}};
+                               {ok, InvalidRcvBuf} ->
+                                   {error, {invalid, InvalidRcvBuf}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "set (new) rcvbuf",
+           cmd  => fun(#{sock := Sock, rcvbuf := {OldN, OldRcvBuf}} = State) ->
+                           NewRcvBuf = {OldN+2, OldRcvBuf + 1024},
+                           case Set(Sock, rcvbuf, NewRcvBuf) of
+                               ok ->
+                                   {ok, State#{rcvbuf => NewRcvBuf}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end;
+                      (#{sock := Sock, rcvbuf := OldRcvBuf} = State) when is_integer(OldRcvBuf) ->
+                           NewRcvBuf = 2 * OldRcvBuf,
+                           case Set(Sock, rcvbuf, NewRcvBuf) of
+                               ok ->
+                                   {ok, State#{rcvbuf => NewRcvBuf}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end;
+                      (#{sock := Sock, rcvbuf := OldRcvBuf,
+                         type := stream,
+                         protocol := tcp} = State) when is_integer(OldRcvBuf) ->
+                           NewRcvBuf = {2, OldRcvBuf},
+                           case Set(Sock, rcvbuf, NewRcvBuf) of
+                               ok ->
+                                   {ok, State#{rcvbuf => NewRcvBuf}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "get (new) rcvbuf",
+           cmd  => fun(#{sock := Sock, rcvbuf := RcvBuf}) ->
+                           case Get(Sock, rcvbuf) of
+                               {ok, RcvBuf} ->
+                                   ok;
+                               {ok, InvalidRcvBuf} ->
+                                   {error, {invalid, InvalidRcvBuf}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% *** Check rcvctrlbuf part ***
+         #{desc => "get rcvctrlbuf",
+           cmd  => fun(#{sock := Sock} = State) ->
+                           case Get(Sock, rcvctrlbuf) of
+                               {ok, RcvCtrlBuf} when is_integer(RcvCtrlBuf) ->
+                                   {ok, State#{rcvctrlbuf => RcvCtrlBuf}};
+                               {ok, InvalidRcvCtrlBuf} ->
+                                   {error, {invalid, InvalidRcvCtrlBuf}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "set (new) rcvctrlbuf",
+           cmd  => fun(#{sock := Sock, rcvctrlbuf := OldRcvCtrlBuf} = State) ->
+                           NewRcvCtrlBuf = 2 * OldRcvCtrlBuf,
+                           case Set(Sock, rcvctrlbuf, NewRcvCtrlBuf) of
+                               ok ->
+                                   {ok, State#{rcvctrlbuf => NewRcvCtrlBuf}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "get (new) rcvctrlbuf",
+           cmd  => fun(#{sock := Sock, rcvctrlbuf := RcvCtrlBuf}) ->
+                           case Get(Sock, rcvctrlbuf) of
+                               {ok, RcvCtrlBuf} ->
+                                   ok;
+                               {ok, InvalidRcvCtrlBuf} ->
+                                   {error, {invalid, InvalidRcvCtrlBuf}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         %% *** Check rcvctrlbuf part ***
+         #{desc => "get rcvctrlbuf",
+           cmd  => fun(#{sock := Sock} = State) ->
+                           case Get(Sock, rcvctrlbuf) of
+                               {ok, RcvCtrlBuf} when is_integer(RcvCtrlBuf) ->
+                                   {ok, State#{rcvctrlbuf => RcvCtrlBuf}};
+                               {ok, InvalidRcvCtrlBuf} ->
+                                   {error, {invalid, InvalidRcvCtrlBuf}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "set (new) rcvctrlbuf",
+           cmd  => fun(#{sock := Sock, rcvctrlbuf := OldRcvCtrlBuf} = State) ->
+                           NewRcvCtrlBuf = 2 * OldRcvCtrlBuf,
+                           case Set(Sock, rcvctrlbuf, NewRcvCtrlBuf) of
+                               ok ->
+                                   {ok, State#{rcvctrlbuf => NewRcvCtrlBuf}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "get (new) rcvctrlbuf",
+           cmd  => fun(#{sock := Sock, rcvctrlbuf := RcvCtrlBuf}) ->
+                           case Get(Sock, rcvctrlbuf) of
+                               {ok, RcvCtrlBuf} ->
+                                   ok;
+                               {ok, InvalidRcvCtrlBuf} ->
+                                   {error, {invalid, InvalidRcvCtrlBuf}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+
+         %% *** Check sndctrlbuf part ***
+         #{desc => "get sndctrlbuf",
+           cmd  => fun(#{sock := Sock} = State) ->
+                           case Get(Sock, sndctrlbuf) of
+                               {ok, SndCtrlBuf} when is_integer(SndCtrlBuf) ->
+                                   {ok, State#{sndctrlbuf => SndCtrlBuf}};
+                               {ok, InvalidSndCtrlBuf} ->
+                                   {error, {invalid, InvalidSndCtrlBuf}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "set (new) sndctrlbuf",
+           cmd  => fun(#{sock := Sock, sndctrlbuf := OldSndCtrlBuf} = State) ->
+                           NewSndCtrlBuf = 2 * OldSndCtrlBuf,
+                           case Set(Sock, sndctrlbuf, NewSndCtrlBuf) of
+                               ok ->
+                                   {ok, State#{sndctrlbuf => NewSndCtrlBuf}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "get (new) sndctrlbuf",
+           cmd  => fun(#{sock := Sock, sndctrlbuf := SndCtrlBuf}) ->
+                           case Get(Sock, sndctrlbuf) of
+                               {ok, SndCtrlBuf} ->
+                                   ok;
+                               {ok, InvalidSndCtrlBuf} ->
+                                   {error, {invalid, InvalidSndCtrlBuf}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% *** Check controlling-process part ***
+         #{desc => "verify self as controlling-process",
+           cmd  => fun(#{sock := Sock}) ->
+                           Self = self(),
+                           case Get(Sock, controlling_process) of
+                               {ok, Self} ->
+                                   ok;
+                               {ok, InvalidPid} ->
+                                   {error, {invalid, InvalidPid}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "set dummy as controlling-process",
+           cmd  => fun(#{sock := Sock, dummy := Dummy}) ->
+                           Set(Sock, controlling_process, Dummy)
+                   end},
+         #{desc => "verify dummy as controlling-process",
+           cmd  => fun(#{sock := Sock, dummy := Dummy}) ->
+                           case Get(Sock, controlling_process) of
+                               {ok, Dummy} ->
+                                   ok;
+                               {ok, InvalidPid} ->
+                                   {error, {invalid, InvalidPid}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% *** We are done ***
+         #{desc => "finish",
+           cmd  => fun(_) ->
+                           {ok, normal}
+                   end}
+        ],
+
+    i("start tcp (stream) evaluator"),
+    InitState1 = #{domain => inet, type => stream, protocol => tcp},
+    Tester1 = ?SEV_START("tcp-tester", Seq, InitState1),
+    i("await tcp evaluator"),
+    ok = ?SEV_AWAIT_FINISH([Tester1]),
+
+    i("start udp (dgram) socket"),
+    InitState2 = #{domain => inet, type => dgram, protocol => udp},
+    Tester2 = ?SEV_START("udp-tester", Seq, InitState2),
+    i("await udp evaluator"),
+    ok = ?SEV_AWAIT_FINISH([Tester2]).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Perform some simple operations with the rcvbuf otp option
+%% The operations we test here are only for type = stream and
+%% protocol = tcp.
+api_opt_simple_otp_rcvbuf_option(suite) ->
+    [];
+api_opt_simple_otp_rcvbuf_option(doc) ->
+    [];
+api_opt_simple_otp_rcvbuf_option(_Config) when is_list(_Config) ->
+    ?TT(?SECS(15)),
+    tc_try(api_opt_simple_otp_rcvbuf_option,
+           fun() -> api_opt_simple_otp_rcvbuf_option() end).
+
+api_opt_simple_otp_rcvbuf_option() ->
+    Get = fun(S) ->
+                  socket:getopt(S, otp, rcvbuf)
+          end,
+    Set = fun(S, Val) ->
+                  socket:setopt(S, otp, rcvbuf, Val)
+          end,
+
+    ServerSeq = 
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start (from tester)",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{local_sa => LSA}}
+                   end},
+         #{desc => "create listen socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, stream, tcp) of
+                               {ok, Sock} ->
+                                   {ok, State#{lsock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{lsock := LSock, local_sa := LSA} = State) ->
+                           case socket:bind(LSock, LSA) of
+                               {ok, Port} ->
+                                   {ok, State#{lport => Port}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "make listen socket",
+           cmd  => fun(#{lsock := LSock}) ->
+                           socket:listen(LSock)
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester   := Tester,
+                         local_sa := LocalSA,
+                         lport    := Port}) ->
+                           ServerSA = LocalSA#{port => Port},
+                           ?SEV_ANNOUNCE_READY(Tester, init, ServerSA),
+                           ok
+                   end},
+
+
+         %% *** The actual test part ***
+         #{desc => "await continue (accept)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, accept)
+                   end},
+         #{desc => "attempt to accept",
+           cmd  => fun(#{lsock := LSock} = State) ->
+                           case socket:accept(LSock) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (accept)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, accept),
+                           ok
+                   end},
+
+         %% Recv with default size for (otp) rcvbuf
+         #{desc => "await continue (recv initial)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_CONTINUE(Tester, tester, recv) of
+                               {ok, MsgSz} ->
+                                   ?SEV_IPRINT("MsgSz: ~p", [MsgSz]),
+                                   {ok, State#{msg_sz => MsgSz}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "attempt to recv",
+           cmd  => fun(#{sock := Sock, msg_sz := MsgSz} = _State) ->
+                           ?SEV_IPRINT("try recv ~w bytes when rcvbuf is ~s", 
+                                       [MsgSz,
+                                        case Get(Sock) of
+                                            {ok, RcvBuf} -> f("~w", [RcvBuf]);
+                                            {error, _}   -> "-"
+                                        end]),
+                           case socket:recv(Sock) of
+                               {ok, Data} when (size(Data) =:= MsgSz) ->
+                                   ok;
+                               {ok, Data} ->
+                                   {error, {invalid_msg_sz, MsgSz, size(Data)}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv initial)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv),
+                           ok
+                   end},
+
+         %% Recv with new size (1) for (otp) rcvbuf
+         #{desc => "await continue (recv 1)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_CONTINUE(Tester, tester, recv) of
+                               {ok, NewRcvBuf} ->
+                                   ?SEV_IPRINT("set new rcvbuf: ~p", [NewRcvBuf]),
+                                   {ok, State#{rcvbuf => NewRcvBuf}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "attempt to setopt rcvbuf",
+           cmd  => fun(#{sock := Sock, rcvbuf := NewRcvBuf} = _State) ->
+                           case Set(Sock, NewRcvBuf) of
+                               ok ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "attempt to recv",
+           cmd  => fun(#{sock := Sock, msg_sz := MsgSz} = _State) ->
+                           case socket:recv(Sock) of
+                               {ok, Data} when (size(Data) =:= MsgSz) ->
+                                   ok;
+                               {ok, Data} ->
+                                   {error, {invalid_msg_sz, MsgSz, size(Data)}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv 1)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv),
+                           ok
+                   end},
+
+         %% Recv with new size (2) for (otp) rcvbuf
+         #{desc => "await continue (recv 2)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_CONTINUE(Tester, tester, recv) of
+                               {ok, NewRcvBuf} ->
+                                   ?SEV_IPRINT("set new rcvbuf: ~p", [NewRcvBuf]),
+                                   {ok, State#{rcvbuf => NewRcvBuf}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "attempt to setopt rcvbuf",
+           cmd  => fun(#{sock := Sock, rcvbuf := NewRcvBuf} = _State) ->
+                           case Set(Sock, NewRcvBuf) of
+                               ok ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "attempt to recv",
+           cmd  => fun(#{sock := Sock, msg_sz := MsgSz} = _State) ->
+                           case socket:recv(Sock) of
+                               {ok, Data} when (size(Data) =:= MsgSz) ->
+                                   ok;
+                               {ok, Data} ->
+                                   {error, {invalid_msg_sz, MsgSz, size(Data)}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv 2)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv),
+                           ok
+                   end},
+
+         %% Recv with new size (3) for (otp) rcvbuf
+         #{desc => "await continue (recv 3, truncated)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_CONTINUE(Tester, tester, recv) of
+                               {ok, {ExpSz, NewRcvBuf}} ->
+                                   {ok, State#{msg_sz => ExpSz,
+                                               rcvbuf => NewRcvBuf}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "attempt to setopt rcvbuf",
+           cmd  => fun(#{sock := Sock, rcvbuf := NewRcvBuf} = _State) ->
+                           case Set(Sock, NewRcvBuf) of
+                               ok ->
+                                   ?SEV_IPRINT("set new rcvbuf: ~p", [NewRcvBuf]),
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "attempt to recv",
+           cmd  => fun(#{sock := Sock, msg_sz := MsgSz} = _State) ->
+                           ?SEV_IPRINT("try recv ~w bytes of data", [MsgSz]),
+                           case socket:recv(Sock) of
+                               {ok, Data} when (size(Data) =:= MsgSz) ->
+                                   ok;
+                               {ok, Data} ->
+                                   {error, {invalid_msg_sz, MsgSz, size(Data)}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv),
+                           ok
+                   end},
+
+
+         %% Termination
+         #{desc => "await terminate",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close socket(s)",
+           cmd  => fun(#{lsock := LSock, sock := Sock} = State) ->
+                           sock_close(Sock),
+                           sock_close(LSock),
+                           State1 = maps:remove(sock,  State),
+                           State2 = maps:remove(lport, State1),
+                           State3 = maps:remove(lsock, State2),
+                           {ok, State3}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    ClientSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           {Tester, ServerSA} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester    => Tester,
+                                       server_sa => ServerSA}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{local_sa => LSA}}
+                   end},
+         #{desc => "create socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, stream, tcp) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{sock := Sock, local_sa := LSA} = _State) ->
+                           case socket:bind(Sock, LSA) of
+                               {ok, _Port} ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (connect)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, connect)
+                   end},
+         #{desc => "connect to server",
+           cmd  => fun(#{sock := Sock, server_sa := SSA}) ->
+                           socket:connect(Sock, SSA)
+                   end},
+         #{desc => "announce ready (connect)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, connect),
+                           ok
+                   end},
+
+         #{desc => "await continue (send initial)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_CONTINUE(Tester, tester, send) of
+                               {ok, Data} ->
+                                   {ok, State#{data => Data}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "send (initial) data to server",
+           cmd  => fun(#{sock := Sock, data := Data} = _State) ->
+                           ?SEV_IPRINT("try send ~w bytes", [size(Data)]),
+                           socket:send(Sock, Data)
+                   end},
+         #{desc => "announce ready (send initial)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, send),
+                           ok
+                   end},
+
+         #{desc => "await continue (send 1)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, send)
+                   end},
+         #{desc => "send (1) data to server",
+           cmd  => fun(#{sock := Sock, data := Data}) ->
+                           ?SEV_IPRINT("try send ~w bytes", [size(Data)]),
+                           socket:send(Sock, Data)
+                   end},
+         #{desc => "announce ready (send 1)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, send),
+                           ok
+                   end},
+
+         #{desc => "await continue (send 2)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, send)
+                   end},
+         #{desc => "send (2) data to server",
+           cmd  => fun(#{sock := Sock, data := Data}) ->
+                           ?SEV_IPRINT("try send ~w bytes", [size(Data)]),
+                           socket:send(Sock, Data)
+                   end},
+         #{desc => "announce ready (send 2)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, send),
+                           ok
+                   end},
+
+         #{desc => "await continue (send 3)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, send)
+                   end},
+         #{desc => "send (3) data to server",
+           cmd  => fun(#{sock := Sock, data := Data}) ->
+                           ?SEV_IPRINT("try send ~w bytes", [size(Data)]),
+                           socket:send(Sock, Data)
+                   end},
+         #{desc => "announce ready (send 3)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, send),
+                           ok
+                   end},
+
+
+         %% Termination
+         #{desc => "await terminate",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close socket",
+           cmd  => fun(#{sock := Sock}) ->
+                           socket:close(Sock)
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "monitor server",
+           cmd  => fun(#{server := Server} = _State) ->
+                           _MRef = erlang:monitor(process, Server),
+                           ok
+                   end},
+         #{desc => "monitor client",
+           cmd  => fun(#{client := Client} = _State) ->
+                           _MRef = erlang:monitor(process, Client),
+                           ok
+                   end},
+         #{desc => "order server start",
+           cmd  => fun(#{server := Server}) ->
+                           ?SEV_ANNOUNCE_START(Server)
+                   end},
+         #{desc => "await server ready (init)",
+           cmd  => fun(#{server := Server} = State) ->
+                           {ok, ServerSA} = ?SEV_AWAIT_READY(Server, server, init),
+                           {ok, State#{server_sa => ServerSA}}
+                   end},
+         #{desc => "order client start",
+           cmd  => fun(#{client    := Client,
+                         server_sa := ServerSA}) ->
+                           ?SEV_ANNOUNCE_START(Client, ServerSA),
+                           ok
+                   end},
+         #{desc => "await client ready (init)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, init)
+                   end},
+
+
+         %% The actual test (connecting)
+         #{desc => "order server accept (accept)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Server, accept),
+                           ok
+                   end},
+         ?SEV_SLEEP(?SECS(1)),
+         #{desc => "order client continue (connect)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, connect),
+                           ok
+                   end},
+         #{desc => "await client ready (connect)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, connect)
+                   end},
+         #{desc => "await server ready (accept)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, accept)
+                   end},
+
+         %% The actual test (initial part)
+         #{desc => "order client continue (send initial)",
+           cmd  => fun(#{client := Client, data := Data} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, send, Data),
+                           ok
+                   end},
+         ?SEV_SLEEP(?SECS(1)),
+         #{desc => "order server continue (recv initial)",
+           cmd  => fun(#{server := Server, data := Data} = _State) ->
+                           ExpMsgSz = size(Data),
+                           ?SEV_ANNOUNCE_CONTINUE(Server, recv, ExpMsgSz),
+                           ok
+                   end},
+         #{desc => "await client ready (send initial)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = _State) ->
+                           case ?SEV_AWAIT_READY(Client, client, send,
+                                                 [{server, Server}]) of
+                               ok ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "await server ready (recv initial)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = _State) ->
+                           case ?SEV_AWAIT_READY(Server, client, recv,
+                                                 [{client, Client}]) of
+                               ok ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% The actual test (part 1)
+         #{desc => "order client continue (send 1)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, send),
+                           ok
+                   end},
+         ?SEV_SLEEP(?SECS(1)),
+         #{desc => "order server continue (recv 1)",
+           cmd  => fun(#{server := Server, data := Data} = _State) ->
+                           MsgSz     = size(Data),
+                           NewRcvBuf = {2 + (MsgSz div 1024), 1024},
+                           ?SEV_ANNOUNCE_CONTINUE(Server, recv, NewRcvBuf),
+                           ok
+                   end},
+         #{desc => "await client ready (send 1)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = _State) ->
+                           case ?SEV_AWAIT_READY(Client, client, send,
+                                                 [{server, Server}]) of
+                               ok ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "await server ready (recv 1)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = _State) ->
+                           case ?SEV_AWAIT_READY(Server, client, recv,
+                                                 [{client, Client}]) of
+                               ok ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% The actual test (part 2)
+         #{desc => "order client continue (send 2)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, send),
+                           ok
+                   end},
+         ?SEV_SLEEP(?SECS(1)),
+         #{desc => "order server continue (recv 2)",
+           cmd  => fun(#{server := Server, data := Data} = _State) ->
+                           MsgSz     = size(Data),
+                           NewRcvBuf = {2 + (MsgSz div 2048), 2048},
+                           ?SEV_ANNOUNCE_CONTINUE(Server, recv, NewRcvBuf),
+                           ok
+                   end},
+         #{desc => "await client ready (send 2)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = _State) ->
+                           case ?SEV_AWAIT_READY(Client, client, send,
+                                                 [{server, Server}]) of
+                               ok ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "await server ready (recv 2)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = _State) ->
+                           case ?SEV_AWAIT_READY(Server, client, recv,
+                                                 [{client, Client}]) of
+                               ok ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+
+         %% The actual test (part 3)
+         #{desc => "order client continue (send 3)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, send),
+                           ok
+                   end},
+         ?SEV_SLEEP(?SECS(1)),
+         #{desc => "order server continue (recv 3)",
+           cmd  => fun(#{server := Server, data := Data} = _State) ->
+                           MsgSz     = size(Data),
+                           BufSz     = 2048,
+                           N         = MsgSz div BufSz - 1,
+                           NewRcvBuf = {N, BufSz},
+                           ?SEV_ANNOUNCE_CONTINUE(Server, recv,
+                                                  {N*BufSz, NewRcvBuf})
+                   end},
+         #{desc => "await client ready (send 3)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = _State) ->
+                           case ?SEV_AWAIT_READY(Client, client, send,
+                                                 [{server, Server}]) of
+                               ok ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "await server ready (recv 3)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = _State) ->
+                           case ?SEV_AWAIT_READY(Server, client, recv,
+                                                 [{client, Client}]) of
+                               ok ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         %% *** Terminate server ***
+         #{desc => "order client terminate",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Client),
+                           ok
+                   end},
+         #{desc => "await client down",
+           cmd  => fun(#{client := Client} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Client),
+                           State1 = maps:remove(client,    State),
+                           {ok, State1}
+                   end},
+         #{desc => "order server terminate",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Server),
+                           ok
+                   end},
+         #{desc => "await server down",
+           cmd  => fun(#{server := Server} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Server),
+                           State1 = maps:remove(server,    State),
+                           State2 = maps:remove(server_sa, State1),
+                           {ok, State2}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    %% Create a data binary of 6*1024 bytes
+    Data      = list_to_binary(lists:duplicate(6*4, lists:seq(0, 255))),
+    InitState = #{domain => inet,
+                  data   => Data},
+
+    i("create server evaluator"),
+    ServerInitState = #{domain => maps:get(domain, InitState)},
+    Server          = ?SEV_START("server", ServerSeq, ServerInitState),
+
+    i("create client evaluator"),
+    ClientInitState = #{host   => local_host(),
+                        domain => maps:get(domain, InitState)},
+    Client          = ?SEV_START("client", ClientSeq, ClientInitState),
+
+    i("create tester evaluator"),
+    TesterInitState = InitState#{server => Server#ev.pid,
+                                 client => Client#ev.pid},
+    Tester          = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    i("await evaluator(s)"),
+    ok = ?SEV_AWAIT_FINISH([Server, Client, Tester]).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Perform some simple getopt and setopt with the level = otp options
+api_opt_simple_otp_controlling_process(suite) ->
+    [];
+api_opt_simple_otp_controlling_process(doc) ->
+    [];
+api_opt_simple_otp_controlling_process(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(api_opt_simple_otp_controlling_process,
+           fun() -> api_opt_simple_otp_controlling_process() end).
+
+api_opt_simple_otp_controlling_process() ->
+    Get = fun(S, Key) ->
+                  socket:getopt(S, otp, Key)
+          end,
+    Set = fun(S, Key, Val) ->
+                  socket:setopt(S, otp, Key, Val)
+          end,
+
+    ClientSeq =
+        [
+         %% *** Init part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           {Tester, Sock} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester,
+                                       sock   => Sock}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester}) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** The actual test ***
+         #{desc => "verify tester as controlling-process",
+           cmd  => fun(#{tester := Tester, sock := Sock} = _State) ->
+                           case Get(Sock, controlling_process) of
+                               {ok, Tester} ->
+                                   ok;
+                               {ok, InvalidPid} ->
+                                   {error, {invalid, InvalidPid}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "attempt invalid controlling-process transfer (to self)",
+           cmd  => fun(#{sock := Sock} = _State) ->
+                           case Set(Sock, controlling_process, self()) of
+                               {error, not_owner} ->
+                                   ok;
+                               ok ->
+                                   {error, unexpected_success};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (not owner)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_ANNOUNCE_READY(Tester, not_owner),
+                           ok
+                   end},
+         #{desc => "await continue (owner)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, owner)
+                   end},
+         #{desc => "verify self as controlling-process",
+           cmd  => fun(#{sock := Sock} = _State) ->
+                           Self = self(),
+                           case Get(Sock, controlling_process) of
+                               {ok, Self} ->
+                                   ok;
+                               {ok, InvalidPid} ->
+                                   {error, {invalid, InvalidPid}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "attempt controlling-process transfer to tester",
+           cmd  => fun(#{tester := Tester, sock := Sock} = _State) ->
+                           Set(Sock, controlling_process, Tester)
+                   end},
+         #{desc => "attempt invalid controlling-process transfer (to self)",
+           cmd  => fun(#{sock := Sock} = _State) ->
+                           case Set(Sock, controlling_process, self()) of
+                               {error, not_owner} ->
+                                   ok;
+                               ok ->
+                                   {error, unexpected_success};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (owner)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_ANNOUNCE_READY(Tester, owner),
+                           ok
+
+                   end},
+         
+         %% *** Termination ***
+         #{desc => "await termination",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           ?SEV_AWAIT_TERMINATE(Tester, tester),
+                           State1 = maps:remove(tester, State),
+                           State2 = maps:remove(sock, State1),
+                           {ok, State2}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "create socket",
+           cmd  => fun(#{domain   := Domain, 
+                         type     := Type,
+                         protocol := Protocol} = State) ->
+                           Sock = sock_open(Domain, Type, Protocol),
+                           {ok, State#{sock => Sock}}
+                   end},
+         #{desc => "monitor client",
+           cmd  => fun(#{client := Client} = _State) ->
+                           _MRef = erlang:monitor(process, Client),
+                           ok
+                   end},
+
+         %% *** The actual test ***
+         #{desc => "verify self as controlling-process",
+           cmd  => fun(#{sock := Sock} = _State) ->
+                           Self = self(),
+                           case Get(Sock, controlling_process) of
+                               {ok, Self} ->
+                                   ok;
+                               {ok, InvalidPid} ->
+                                   {error, {invalid, InvalidPid}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order (client) start",
+           cmd  => fun(#{client := Client, sock := Sock} = _State) ->
+                           ?SEV_ANNOUNCE_START(Client, Sock),
+                           ok
+                   end},
+         #{desc => "await (client) ready (not owner)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, not_owner)
+                   end},
+         #{desc => "attempt controlling-process transfer to client",
+           cmd  => fun(#{client := Client, sock := Sock} = _State) ->
+                           Set(Sock, controlling_process, Client)
+                   end},
+         #{desc => "verify client as controlling-process",
+           cmd  => fun(#{client := Client, sock := Sock} = _State) ->
+                           case Get(Sock, controlling_process) of
+                               {ok, Client} ->
+                                   ok;
+                               {ok, InvalidPid} ->
+                                   {error, {invalid, InvalidPid}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "attempt invalid controlling-process transfer (to self)",
+           cmd  => fun(#{sock := Sock} = _State) ->
+                           case Set(Sock, controlling_process, self()) of
+                               {error, not_owner} ->
+                                   ok;
+                               ok ->
+                                   {error, unexpected_success};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order (client) continue (owner)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, owner),
+                           ok
+                   end},
+         #{desc => "await (client) ready (2)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, owner),
+                           ok
+                   end},
+         #{desc => "verify self as controlling-process",
+           cmd  => fun(#{sock := Sock} = _State) ->
+                           Self = self(),
+                           case Get(Sock, controlling_process) of
+                               {ok, Self} ->
+                                   ok;
+                               {ok, InvalidPid} ->
+                                   {error, {invalid, InvalidPid}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% *** Termination ***
+         #{desc => "order (client) terminate",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Client),
+                           ok
+                   end},
+         #{desc => "await client termination",
+           cmd  => fun(#{client := Client} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Client),
+                           {ok, maps:remove(client, State)}
+                   end},
+         #{desc => "close socket",
+           cmd  => fun(#{sock := Sock} = State) ->
+                           sock_close(Sock),
+                           {ok, maps:remove(sock, State)}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    i("start tcp (stream) client evaluator"),
+    ClientInitState1 = #{},
+    Client1 = ?SEV_START("tcp-client", ClientSeq, ClientInitState1),
+
+    i("start tcp (stream) tester evaluator"),
+    TesterInitState1 = #{domain   => inet, 
+                         type     => stream, 
+                         protocol => tcp,
+                         client   => Client1#ev.pid},
+    Tester1 = ?SEV_START("tcp-tester", TesterSeq, TesterInitState1),
+
+    i("await tcp evaluator(s)"),
+    ok = ?SEV_AWAIT_FINISH([Tester1, Client1]),
+
+    i("start udp (dgram) client evaluator"),
+    ClientInitState2 = #{},
+    Client2 = ?SEV_START("udp-client", ClientSeq, ClientInitState2),
+
+    i("start udp (dgram) tester evaluator"),
+    TesterInitState2 = #{domain   => inet, 
+                         type     => dgram, 
+                         protocol => udp,
+                         client   => Client2#ev.pid},
+    Tester2 = ?SEV_START("udp-tester", TesterSeq, TesterInitState2),
+
+    i("await udp evaluator(s)"),
+    ok = ?SEV_AWAIT_FINISH([Tester2, Client2]).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Tests the socket option acceptconn for UDP.
+%% This should be possible to get but not set.
+
+api_opt_sock_acceptconn_udp(suite) ->
+    [];
+api_opt_sock_acceptconn_udp(doc) ->
+    [];
+api_opt_sock_acceptconn_udp(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(api_opt_sock_acceptconn_udp,
+           fun() ->
+                   has_support_sock_acceptconn()
+           end,
+           fun() -> api_opt_sock_acceptconn_udp() end).
+
+
+
+api_opt_sock_acceptconn_udp() ->
+    Opt = acceptconn,
+    Set = fun(S, Val) ->
+                  socket:setopt(S, socket, Opt, Val)
+          end,
+    Get = fun(S) ->
+                  socket:getopt(S, socket, Opt)
+          end,
+
+    TesterSeq =
+        [
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{local_sa => LSA}}
+                   end},
+         #{desc => "create socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, dgram, udp) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         #{desc => "[get] verify socket (before bind)",
+           cmd  => fun(#{sock := Sock} = _State) ->
+                           case Get(Sock) of
+                               {ok, false} ->
+                                   ?SEV_IPRINT("Expected Success: "
+                                               "Not accepting connections"),
+                                   ok;
+                               {ok, true} ->
+                                   ?SEV_EPRINT("Unexpected Success: "
+                                               "Accepting connections"),
+                                   {error, {unexpected_success, {Opt, true}}};
+                               {error, enoprotoopt = Reason} ->
+                                   %% On some platforms this is not accepted
+                                   %% for UDP, so skip this part (UDP).
+                                   ?SEV_EPRINT("Expected Failure: "
+                                               "~p => SKIP", [Reason]),
+                                   (catch socket:close(Sock)),
+                                   {skip, Reason};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p",
+                                               [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "[set] verify socket (before bind)",
+           cmd  => fun(#{sock := Sock} = _State) ->
+                           case Set(Sock, true) of
+                               {error, Reason} ->
+                                   ?SEV_IPRINT("Expected Failure: ~p",
+                                               [Reason]),
+                                   ok;
+                               ok ->
+                                   ?SEV_EPRINT("Unexpected Success: "
+                                               "Set acceptconn (=true)"),
+                                   {error, unexpected_success}
+                           end
+                   end},
+
+         #{desc => "bind socket to local address",
+           cmd  => fun(#{sock := Sock, local_sa := LSA} = _State) ->
+                           case socket:bind(Sock, LSA) of
+                               {ok, _} ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "[get] verify socket (after bind)",
+           cmd  => fun(#{sock := Sock} = _State) ->
+                           case Get(Sock) of
+                               {ok, false} ->
+                                   ?SEV_IPRINT("Expected Success: "
+                                               "Not accepting connections"),
+                                   ok;
+                               {ok, true} ->
+                                   ?SEV_EPRINT("Unexpected Success: "
+                                               "Accepting connections"),
+                                   {error, {unexpected_success, {Opt, true}}};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p",
+                                               [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "[set] verify socket (after bind)",
+           cmd  => fun(#{sock := Sock} = _State) ->
+                           case Set(Sock, true) of
+                               {error, Reason} ->
+                                   ?SEV_IPRINT("Expected Failure: ~p",
+                                               [Reason]),
+                                   ok;
+                               ok ->
+                                   ?SEV_EPRINT("Unexpected Success: "
+                                               "Set acceptconn (=true)"),
+                                   {error, unexpected_success}
+                           end
+                   end},
+
+         %% *** Termination ***
+         #{desc => "close socket",
+           cmd  => fun(#{sock := Sock} = State) ->
+                           socket:close(Sock),
+                           {ok, maps:remove(sock, State)}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    Domain = inet,
+
+    i("start tester evaluator"),
+    InitState = #{domain  => Domain},
+    Tester = ?SEV_START("tester", TesterSeq, InitState),
+
+    i("await evaluator(s)"),
+    ok = ?SEV_AWAIT_FINISH([Tester]).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Tests the socket option acceptconn for TCP.
+%% This should be possible to get but not set.
+
+api_opt_sock_acceptconn_tcp(suite) ->
+    [];
+api_opt_sock_acceptconn_tcp(doc) ->
+    [];
+api_opt_sock_acceptconn_tcp(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(api_opt_sock_acceptconn_tcp,
+           fun() ->
+                   has_support_sock_acceptconn()
+           end,
+           fun() -> api_opt_sock_acceptconn_tcp() end).
+
+
+
+api_opt_sock_acceptconn_tcp() ->
+    Opt = acceptconn,
+    Set = fun(S, Val) ->
+                  socket:setopt(S, socket, Opt, Val)
+          end,
+    Get = fun(S) ->
+                  socket:getopt(S, socket, Opt)
+          end,
+
+    TesterSeq =
+        [
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{local_sa => LSA}}
+                   end},
+
+         #{desc => "create listen socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, stream, tcp) of
+                               {ok, Sock} ->
+                                   {ok, State#{lsock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         #{desc => "[get] verify listen socket (before bind)",
+           cmd  => fun(#{lsock := Sock} = _State) ->
+                           case Get(Sock) of
+                               {ok, false} ->
+                                   ?SEV_IPRINT("Expected Success: "
+                                               "Not accepting connections"),
+                                   ok;
+                               {ok, true} ->
+                                   ?SEV_EPRINT("Unexpected Success: "
+                                               "Accepting connections"),
+                                   {error, {unexpected_success, {Opt, true}}};
+                               {error, enoprotoopt = Reason} ->
+                                   ?SEV_EPRINT("Expected Failure: "
+                                               "~p => SKIP", [Reason]),
+                                   (catch socket:close(Sock)),
+                                   {skip, Reason};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p",
+                                               [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "[set] verify listen socket (before bind)",
+           cmd  => fun(#{lsock := Sock} = _State) ->
+                           case Set(Sock, true) of
+                               {error, Reason} ->
+                                   ?SEV_IPRINT("Expected Failure: ~p", [Reason]),
+                                   ok;
+                               ok ->
+                                   ?SEV_EPRINT("Unexpected Success: "
+                                               "Set acceptconn (=true)"),
+                                   {error, unexpected_success}
+                           end
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "bind listen socket to local address",
+           cmd  => fun(#{lsock := Sock, local_sa := LSA} = State) ->
+                           case socket:bind(Sock, LSA) of
+                               {ok, Port} ->
+                                   {ok, State#{server_sa => LSA#{port => Port}}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         #{desc => "[get] verify listen socket (after bind)",
+           cmd  => fun(#{lsock := Sock} = _State) ->
+                           case Get(Sock) of
+                               {ok, false} ->
+                                   ?SEV_IPRINT("Expected Success: "
+                                               "Not accepting connections"),
+                                   ok;
+                               {ok, true} ->
+                                   ?SEV_EPRINT("Unexpected Success: "
+                                               "Accepting connections"),
+                                   {error, {unexpected_success, {Opt, true}}};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p", [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "[set] verify listen socket (after bind)",
+           cmd  => fun(#{lsock := Sock} = _State) ->
+                           case Set(Sock, true) of
+                               {error, Reason} ->
+                                   ?SEV_IPRINT("Expected Failure: ~p", [Reason]),
+                                   ok;
+                               ok ->
+                                   ?SEV_EPRINT("Unexpected Success: "
+                                               "Set acceptconn (=true)"),
+                                   {error, unexpected_success}
+                           end
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "make listen socket accept connections",
+           cmd  => fun(#{lsock := Sock} = _State) ->
+                           case socket:listen(Sock) of
+                               ok ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         #{desc => "[get] verify listen socket (after listen)",
+           cmd  => fun(#{lsock := Sock} = _State) ->
+                           case Get(Sock) of
+                               {ok, true} ->
+                                   ?SEV_IPRINT("Expected Success: "
+                                               "Accepting connections"),
+                                   ok;
+                               {ok, false} ->
+                                   ?SEV_EPRINT("Unexpected Success: "
+                                               "Not accepting connections"),
+                                   {error, {unexpected_success, {Opt, false}}};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p", [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "[set] verify listen socket (after listen)",
+           cmd  => fun(#{lsock := Sock} = _State) ->
+                           case Set(Sock, false) of
+                               {error, Reason} ->
+                                   ?SEV_IPRINT("Expected Failure: ~p", [Reason]),
+                                   ok;
+                               ok ->
+                                   ?SEV_EPRINT("Unexpected Success: "
+                                               "Set acceptconn (=false)"),
+                                   {error, unexpected_success}
+                           end
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "create (connecting) socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, stream, tcp) of
+                               {ok, Sock} ->
+                                   {ok, State#{csockc => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         #{desc => "bind connecting socket to local address",
+           cmd  => fun(#{csockc := Sock, local_sa := LSA} = _State) ->
+                           case socket:bind(Sock, LSA) of
+                               {ok, _Port} ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "[get] verify connecting socket (before connect)",
+           cmd  => fun(#{csockc := Sock} = _State) ->
+                           case Get(Sock) of
+                               {ok, false} ->
+                                   ?SEV_IPRINT("Expected Success: "
+                                               "Not accepting connections"),
+                                   ok;
+                               {ok, true} ->
+                                   ?SEV_EPRINT("Unexpected Success: "
+                                               "Accepting connections"),
+                                   {error, {unexpected_success, {Opt, true}}};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p", [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "[set] verify connecting socket (before connect)",
+           cmd  => fun(#{csockc := Sock} = _State) ->
+                           case Set(Sock, true) of
+                               {error, Reason} ->
+                                   ?SEV_IPRINT("Expected Failure: ~p", [Reason]),
+                                   ok;
+                               ok ->
+                                   ?SEV_EPRINT("Unexpected Success: "
+                                               "Set acceptconn (=true)"),
+                                   {error, unexpected_success}
+                           end
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "connect to server",
+           cmd  => fun(#{csockc := Sock, server_sa := SSA} = _State) ->
+                           case socket:connect(Sock, SSA) of
+                               ok ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         #{desc => "accept connection",
+           cmd  => fun(#{lsock := Sock} = State) ->
+                           case socket:accept(Sock) of
+                               {ok, CSock} ->
+                                   {ok, State#{csocks => CSock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         #{desc => "[get] verify connecting socket (after connect)",
+           cmd  => fun(#{csockc := Sock} = _State) ->
+                           case Get(Sock) of
+                               {ok, false} ->
+                                   ?SEV_IPRINT("Expected Success: "
+                                               "Not accepting connections"),
+                                   ok;
+                               {ok, true} ->
+                                   ?SEV_EPRINT("Unexpected Success: "
+                                               "Accepting connections"),
+                                   {error, {unexpected_success, {Opt, true}}};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p", [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "[set] verify connecting socket (after connect)",
+           cmd  => fun(#{csockc := Sock} = _State) ->
+                           case Set(Sock, true) of
+                               {error, Reason} ->
+                                   ?SEV_IPRINT("Expected Failure: ~p", [Reason]),
+                                   ok;
+                               ok ->
+                                   ?SEV_EPRINT("Unexpected Success: "
+                                               "Set acceptconn (=true)"),
+                                   {error, unexpected_success}
+                           end
+                   end},
+
+         #{desc => "[get] verify connected socket",
+           cmd  => fun(#{csocks := Sock} = _State) ->
+                           case Get(Sock) of
+                               {ok, false} ->
+                                   ?SEV_IPRINT("Expected Success: "
+                                               "Not accepting connections"),
+                                   ok;
+                               {ok, true} ->
+                                   ?SEV_EPRINT("Unexpected Success: "
+                                               "Accepting connections"),
+                                   {error, {unexpected_success, {Opt, true}}};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p", [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "[set] verify connected socket",
+           cmd  => fun(#{csocks := Sock} = _State) ->
+                           case Set(Sock, true) of
+                               {error, Reason} ->
+                                   ?SEV_IPRINT("Expected Failure: ~p", [Reason]),
+                                   ok;
+                               ok ->
+                                   ?SEV_EPRINT("Unexpected Success: "
+                                               "Set acceptconn (=true)"),
+                                   {error, unexpected_success}
+                           end
+                   end},
+
+         #{desc => "[get] verify listen socket (after connect)",
+           cmd  => fun(#{lsock := Sock} = _State) ->
+                           case Get(Sock) of
+                               {ok, true} ->
+                                   ?SEV_IPRINT("Expected Success: "
+                                               "Accepting connections"),
+                                   ok;
+                               {ok, false} ->
+                                   ?SEV_EPRINT("Unexpected Success: "
+                                               "Not accepting connections"),
+                                   {error, {unexpected_success, {Opt, false}}};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p", [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "[set] verify listen socket (after connect)",
+           cmd  => fun(#{lsock := Sock} = _State) ->
+                           case Set(Sock, false) of
+                               {error, Reason} ->
+                                   ?SEV_IPRINT("Expected Failure: ~p", [Reason]),
+                                   ok;
+                               ok ->
+                                   ?SEV_EPRINT("Unexpected Success: "
+                                               "Set acceptconn (=false)"),
+                                   {error, unexpected_success}
+                           end
+                   end},
+
+         %% *** Termination ***
+         #{desc => "close connecting socket(s)",
+           cmd  => fun(#{csockc := Sock} = State0) ->
+                           socket:close(Sock),
+                           State1 = maps:remove(csockc, State0),
+                           State2 = maps:remove(csocks, State1), %% Auto-close
+                           {ok, maps:remove(csockc, State2)}
+                   end},
+         #{desc => "close listen socket",
+           cmd  => fun(#{lsock := Sock} = State) ->
+                           socket:close(Sock),
+                           {ok, maps:remove(lsock, State)}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+
+    Domain = inet,
+
+    i("start tester evaluator"),
+    InitState = #{domain  => Domain},
+    Tester = ?SEV_START("tester", TesterSeq, InitState),
+
+    i("await evaluator(s)"),
+    ok = ?SEV_AWAIT_FINISH([Tester]).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Tests the socket option acceptfilter. PLACEHOLDER!
+
+api_opt_sock_acceptfilter(suite) ->
+    [];
+api_opt_sock_acceptfilter(doc) ->
+    [];
+api_opt_sock_acceptfilter(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(api_opt_sock_acceptfilter,
+           fun() -> not_yet_implemented() end,
+           fun() -> ok end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Tests the socket option bindtodevice.
+%% It has not always been possible to 'get' this option
+%% (atleast on linux).
+
+api_opt_sock_bindtodevice(suite) ->
+    [];
+api_opt_sock_bindtodevice(doc) ->
+    [];
+api_opt_sock_bindtodevice(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(api_opt_sock_bindtodevice,
+           fun() -> has_support_sock_bindtodevice() end,
+           fun() -> api_opt_sock_bindtodevice() end).
+
+
+api_opt_sock_bindtodevice() ->
+    Opt = bindtodevice,
+    Set = fun(S, Val) ->
+                  socket:setopt(S, socket, Opt, Val)
+          end,
+    Get = fun(S) ->
+                  socket:getopt(S, socket, Opt)
+          end,
+
+    TesterSeq =
+        [
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case ?LIB:which_local_host_info(Domain) of
+                               {ok, #{name := Name, addr := Addr}} ->
+                                   ?SEV_IPRINT("local host info (~p): "
+                                               "~n   Name: ~p"
+                                               "~n   Addr: ~p",
+                                               [Domain, Name, Addr]),
+                                   LSA = #{family => Domain,
+                                           addr   => Addr},
+                                   {ok, State#{dev      => Name,
+                                               local_sa => LSA}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "create UDP socket 1",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, dgram, udp) of
+                               {ok, Sock} ->
+                                   {ok, State#{usock1 => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "create UDP socket 2",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, dgram, udp) of
+                               {ok, Sock} ->
+                                   {ok, State#{usock2 => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "create TCP socket 1",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, stream, tcp) of
+                               {ok, Sock} ->
+                                   {ok, State#{tsock1 => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "create TCP socket 2",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, stream, tcp) of
+                               {ok, Sock} ->
+                                   {ok, State#{tsock2 => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         #{desc => "[get] verify UDP socket 1 (before bindtodevice)",
+           cmd  => fun(#{usock1 := Sock} = _State) ->
+                           case Get(Sock) of
+                               {ok, Dev} ->
+                                   ?SEV_IPRINT("Expected Success: ~p", [Dev]),
+                                   ok;
+                               {error, enoprotoopt = Reason} ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p => SKIP",
+					       [Reason]),
+                                   {skip, Reason};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p",
+					       [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "[get] verify UDP socket 2 (before bind)",
+           cmd  => fun(#{usock2 := Sock} = _State) ->
+                           case Get(Sock) of
+                               {ok, Dev} ->
+                                   ?SEV_IPRINT("Expected Success: ~p", [Dev]),
+                                   ok;
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p", [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "[get] verify TCP socket 1 (before bindtodevice)",
+           cmd  => fun(#{tsock1 := Sock} = _State) ->
+                           case Get(Sock) of
+                               {ok, Dev} ->
+                                   ?SEV_IPRINT("Expected Success: ~p", [Dev]),
+                                   ok;
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p", [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "[get] verify TCP socket 2 (before bind)",
+           cmd  => fun(#{tsock2 := Sock} = _State) ->
+                           case Get(Sock) of
+                               {ok, Dev} ->
+                                   ?SEV_IPRINT("Expected Success: ~p", [Dev]),
+                                   ok;
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p", [Reason]),
+                                   ERROR
+                           end
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "Bind UDP socket 1 to device",
+           cmd  => fun(#{usock1 := Sock, dev := Dev} = State) ->
+                           case Set(Sock, Dev) of
+                               ok ->
+                                   ?SEV_IPRINT("Expected Success"),
+                                   ok;
+                               {error, eperm = Reason} ->
+                                   ?SEV_IPRINT("Expected Failure: ~p", [Reason]),
+                                   (catch socket:close(Sock)),
+                                   {ok, State#{usock1 => skip}};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p", [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "Bind UDP socket 2 to local address",
+           cmd  => fun(#{usock2 := Sock, local_sa := LSA} = _State) ->
+                           case socket:bind(Sock, LSA) of
+                               {ok, _Port} ->
+                                   ?SEV_IPRINT("Expected Success"),
+                                   ok;
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p", [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "Bind TCP socket 1 to device",
+           cmd  => fun(#{usock1 := USock1,
+                         tsock1 := Sock, dev := Dev} = State) ->
+                           case Set(Sock, Dev) of
+                               ok ->
+                                   ?SEV_IPRINT("Expected Success"),
+                                   ok;
+                               {error, eperm = Reason} when (USock1 =:= skip) ->
+                                   ?SEV_IPRINT("Expected Failure: ~p", [Reason]),
+                                   {skip, Reason};
+                               {error, eperm = Reason} ->
+                                   ?SEV_IPRINT("Expected Failure: ~p", [Reason]),
+                                   (catch socket:close(Sock)),
+                                   {ok, State#{tsock1 => skip}};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p", [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "Bind TCP socket 2 to local address",
+           cmd  => fun(#{tsock2 := Sock, local_sa := LSA} = _State) ->
+                           case socket:bind(Sock, LSA) of
+                               {ok, _Port} ->
+                                   ?SEV_IPRINT("Expected Success"),
+                                   ok;
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p", [Reason]),
+                                   ERROR
+                           end
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "[get] verify UDP socket 1 (after bindtodevice)",
+           cmd  => fun(#{usock1 := skip} = _State) ->
+                           ?SEV_IPRINT("SKIP'ed (previous eperm)"),
+                           ok;
+                      (#{usock1 := Sock} = _State) ->
+                           case Get(Sock) of
+                               {ok, Dev} ->
+                                   ?SEV_IPRINT("Expected Success: ~p", [Dev]),
+                                   ok;
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p", [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "[get] verify UDP socket 2 (after bind)",
+           cmd  => fun(#{usock2 := Sock} = _State) ->
+                           case Get(Sock) of
+                               {ok, Dev} ->
+                                   ?SEV_IPRINT("Expected Success: ~p", [Dev]),
+                                   ok;
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p", [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "[get] verify TCP socket 1 (after bindtodevice)",
+           cmd  => fun(#{tsock1 := skip} = _State) ->
+                           ?SEV_IPRINT("SKIP'ed (previous eperm)"),
+                           ok;
+                      (#{tsock1 := Sock} = _State) ->
+                           case Get(Sock) of
+                               {ok, Dev} ->
+                                   ?SEV_IPRINT("Expected Success: ~p", [Dev]),
+                                   ok;
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p", [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "[get] verify TCP socket 2 (after bind)",
+           cmd  => fun(#{tsock2 := Sock} = _State) ->
+                           case Get(Sock) of
+                               {ok, Dev} ->
+                                   ?SEV_IPRINT("Expected Success: ~p", [Dev]),
+                                   ok;
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p", [Reason]),
+                                   ERROR
+                           end
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         %% *** Termination ***
+         #{desc => "close UDP socket 1",
+           cmd  => fun(#{usock1 := skip} = State) ->
+                           ?SEV_IPRINT("SKIP'ed (already closed)"),
+                           {ok, maps:remove(usock1, State)};
+                      (#{usock1 := Sock} = State) ->
+                           socket:close(Sock),
+                           {ok, maps:remove(usock1, State)}
+                   end},
+         #{desc => "close UDP socket 2",
+           cmd  => fun(#{usock2 := Sock} = State) ->
+                           socket:close(Sock),
+                           {ok, maps:remove(usock2, State)}
+                   end},
+         #{desc => "close TCP socket 1",
+           cmd  => fun(#{tsock1 := skip} = State) ->
+                           ?SEV_IPRINT("SKIP'ed (already closed)"),
+                           {ok, maps:remove(tsock1, State)};
+                      (#{tsock1 := Sock} = State) ->
+                           socket:close(Sock),
+                           {ok, maps:remove(tsock1, State)}
+                   end},
+         #{desc => "close TCP socket 2",
+           cmd  => fun(#{tsock2 := Sock} = State) ->
+                           socket:close(Sock),
+                           {ok, maps:remove(tsock2, State)}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    Domain = inet,
+
+    i("start tester evaluator"),
+    InitState = #{domain  => Domain},
+    Tester = ?SEV_START("tester", TesterSeq, InitState),
+
+    i("await evaluator(s)"),
+    ok = ?SEV_AWAIT_FINISH([Tester]).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Tests the socket option broadcast.
+%% Make it possible for datagram sockets to send packets to a broadcast
+%% address (IPv4 only).
+
+api_opt_sock_broadcast(suite) ->
+    [];
+api_opt_sock_broadcast(doc) ->
+    [];
+api_opt_sock_broadcast(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(api_opt_sock_broadcast,
+           fun() -> has_support_sock_broadcast() end,
+           fun() -> api_opt_sock_broadcast() end).
+
+
+api_opt_sock_broadcast() ->
+    Opt    = broadcast,
+    Set    = fun(S, Val) when is_boolean(Val) ->
+                     socket:setopt(S, socket, Opt, Val)
+             end,
+    Get    = fun(S) ->
+                     socket:getopt(S, socket, Opt)
+             end,
+
+    TesterSeq =
+        [
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case ?LIB:which_local_host_info(Domain) of
+                               {ok, #{name      := Name,
+                                      addr      := Addr,
+                                      broadaddr := BAddr}} ->
+                                   ?SEV_IPRINT("local host info: "
+                                               "~n   Name:           ~p"
+                                               "~n   Addr:           ~p"
+                                               "~n   Broadcast Addr: ~p",
+                                               [Name, Addr, BAddr]),
+                                   LSA = #{family => Domain,
+                                           addr   => Addr},
+                                   BSA = #{family => Domain,
+                                           addr   => BAddr},
+                                   {ok, State#{lsa => LSA,
+                                               bsa => BSA}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         #{desc => "[socket 1] create UDP socket (listening 1)",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, dgram, udp) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock1 => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "[socket 1] Bind UDP socket (to limited broadcast address)",
+           cmd  => fun(#{sock1 := Sock} = State) ->
+			   BSA = #{family => inet,
+				   addr   => broadcast},
+                           ?SEV_IPRINT("Try bind (socket 1) to: "
+                                       "~n   ~p", [BSA]),
+                           case socket:bind(Sock, BSA) of
+                               {ok, Port} ->
+                                   ?SEV_IPRINT("Expected Success (bound): ~p",
+                                               [Port]),
+                                   {ok, State#{sa1 => BSA#{port => Port}}};
+                               {error, eaddrnotavail = Reason} ->
+                                   ?SEV_IPRINT("~p => "
+					       "SKIP limited broadcast test",
+					       [Reason]),
+                                   {ok, State#{sa1 => skip}};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p",
+					       [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "[socket 1] UDP socket sockname",
+           cmd  => fun(#{sa1 := skip} = _State) ->
+                           ?SEV_IPRINT("SKIP limited broadcast test"),
+                           ok;
+		      (#{sock1 := Sock} = _State) ->
+			   case socket:sockname(Sock) of
+			       {ok, SA} ->
+				   ?SEV_IPRINT("SA: ~p", [SA]),
+				   ok;
+			       {error, _} = ERROR ->
+				   ERROR
+			   end
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "[socket 2] create UDP socket (listening 2)",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, dgram, udp) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock2 => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "[socket 2] Bind UDP socket (to subnet-directed broadcast address)",
+           cmd  => fun(#{sock2 := Sock,
+			 bsa   := BSA} = State) ->
+                           ?SEV_IPRINT("Try bind (socket 1) to: "
+                                       "~n   ~p", [BSA]),
+                           case socket:bind(Sock, BSA) of
+                               {ok, Port} ->
+                                   ?SEV_IPRINT("Expected Success (bound): ~p",
+                                               [Port]),
+                                   {ok, State#{sa2 => BSA#{port => Port}}};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p",
+					       [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "[socket 2] UDP socket sockname",
+           cmd  => fun(#{sock2 := Sock} = _State) ->
+                           case socket:sockname(Sock) of
+                               {ok, SA} ->
+				   ?SEV_IPRINT("SA: ~p", [SA]),
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "[socket 3] create UDP socket (sender)",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, dgram, udp) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock3 => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "[socket 3][get] verify UDP socket (before bind and set)",
+           cmd  => fun(#{sock3 := Sock} = _State) ->
+                           case Get(Sock) of
+                               {ok, false} ->
+                                   ?SEV_IPRINT("Expected Success: "
+                                               "broadcast not allowed"),
+                                   ok;
+                               {ok, true} ->
+                                   ?SEV_IPRINT("Unexpected Success result: "
+                                               "broadcast already allowed"),
+                                   ok;
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p",
+					       [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "[socket 3] Try make broadcast allowed",
+           cmd  => fun(#{sock3 := Sock} = _State) ->
+                           case Set(Sock, true) of
+                               ok ->
+                                   ?SEV_IPRINT("Expected Success: "
+                                               "broadcast now allowed"),
+                                   ok;
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p",
+					       [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "[socket 3] verify UDP socket broadcast allowed",
+           cmd  => fun(#{sock3 := Sock} = _State) ->
+                           case Get(Sock) of
+                               {ok, true} ->
+                                   ?SEV_IPRINT("Expected Success: "
+                                               "broadcast allowed"),
+                                   ok;
+                               {ok, false} ->
+                                   ?SEV_IPRINT("Unexpected Success result: "
+                                               "broadcast *not* allowed"),
+                                   ok;
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p",
+					       [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "[socket 3] Bind UDP socket (to local address)",
+           cmd  => fun(#{sock3 := Sock, lsa := LSA} = State) ->
+                           ?SEV_IPRINT("Try bind (socket 2) to: "
+                                       "~n   ~p", [LSA]),
+                           case socket:bind(Sock, LSA) of
+                               {ok, Port} ->
+                                   ?SEV_IPRINT("Expected Success (bound): ~p",
+                                               [Port]),
+                                   {ok, State#{sa3 => LSA#{port => Port}}};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p",
+					       [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "[socket 3] verify UDP socket (after set)",
+           cmd  => fun(#{sock3 := Sock} = _State) ->
+                           case Get(Sock) of
+                               {ok, true} ->
+                                   ?SEV_IPRINT("Expected Success: "
+                                               "broadcast allowed"),
+                                   ok;
+                               {ok, false} ->
+                                   ?SEV_IPRINT("Unexpected Success result: "
+                                               "broadcast not allowed"),
+                                   {error, not_allowed};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p",
+					       [Reason]),
+                                   ERROR
+                           end
+                   end},
+
+	 ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "[socket 3] try send to limited broadcast address",
+           cmd  => fun(#{sa1 := skip} = _State) ->
+                           ?SEV_IPRINT("SKIP limited broadcast test"),
+			   ok;
+		      (#{sock3 := Sock,
+			 sa1   := Dest} = _State) ->
+			   Data = list_to_binary("hejsan"),
+			   ?SEV_IPRINT("try send to bradcast address: "
+				       "~n   ~p", [Dest]),
+			   case socket:sendto(Sock, Data, Dest) of
+			       ok ->
+				   ?SEV_IPRINT("Expected Success: "
+					       "broadcast message sent"),
+				   ok;
+			       {error, Reason} = ERROR ->
+				   ?SEV_EPRINT("Unexpected Failure: ~p",
+					       [Reason]),
+				   ERROR
+			   end
+		   end},
+         #{desc => "[socket 1] try recv",
+           cmd  => fun(#{sa1 := skip} = _State) ->
+			   ?SEV_IPRINT("SKIP limited broadcast test"),
+			   ok;
+		      (#{sock1 := Sock} = State) ->
+                           case socket:recvfrom(Sock, 0, 5000) of
+                               {ok, _} ->
+                                   ?SEV_IPRINT("Expected Success: "
+                                               "received message"),
+                                   ok;
+                               {error, timeout = Reason} ->
+                                   %% Some platforms seem to balk at this.
+                                   %% It spossible to bind to this, and
+                                   %% send to it, but no data is received.
+                                   %% At some point we should investigate...
+                                   %% For now, we just skip this part of
+                                   %% the test...
+                                   ?SEV_IPRINT("Unexpected Failure: ~p",
+					       [Reason]),
+                                   {ok, State#{sa1 => skip}};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p",
+					       [Reason]),
+                                   ERROR
+                           end
+                   end},
+
+	 ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "[socket 3] try send to subnet-directed broadcast address",
+           cmd  => fun(#{sock3 := Sock,
+                         sa2   := Dest} = _State) ->
+                           Data = list_to_binary("hejsan"),
+                           ?SEV_IPRINT("try send to bradcast address: "
+                                       "~n   ~p", [Dest]),
+                           case socket:sendto(Sock, Data, Dest) of
+                               ok ->
+                                   ?SEV_IPRINT("Expected Success: "
+                                               "broadcast message sent"),
+                                   ok;
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p",
+					       [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "[socket 2] try recv",
+           cmd  => fun(#{sock2 := Sock, sa1 := SA1} = _State) ->
+                           case socket:recvfrom(Sock, 0, 5000) of
+                               {ok, _} ->
+                                   ?SEV_IPRINT("Expected Success: "
+                                               "received message"),
+                                   ok;
+                               {error, timeout = Reason} when (SA1 =:= skip) ->
+                                   ?SEV_IPRINT("Unexpected Failure: ~p",
+					       [Reason]),
+                                   {skip, "receive timeout"};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p",
+					       [Reason]),
+                                   ERROR
+                           end
+                   end},
+
+         %% *** Termination ***
+         #{desc => "[socket 3] close UDP socket (sender)",
+           cmd  => fun(#{sock3 := Sock} = State0) ->
+                           socket:close(Sock),
+			   State1 = maps:remove(sock3, State0),
+			   State2 = maps:remove(sa3,   State1),
+			   {ok, State2}
+                   end},
+         #{desc => "[socket 2] close UDP socket (listener 2)",
+           cmd  => fun(#{sock2 := Sock} = State0) ->
+                           socket:close(Sock),
+			   State1 = maps:remove(sock2, State0),
+			   State2 = maps:remove(sa2,   State1),
+                           {ok, State2}
+                   end},
+         #{desc => "[socket 1] close UDP socket (listener 1)",
+           cmd  => fun(#{sock1 := Sock} = State0) ->
+                           socket:close(Sock),
+			   State1 = maps:remove(sock1, State0),
+			   State2 = maps:remove(sa1,   State1),
+                           {ok, State2}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    Domain = inet,
+
+    i("start tester evaluator"),
+    InitState = #{domain => Domain},
+    Tester = ?SEV_START("tester", TesterSeq, InitState),
+
+    i("await evaluator(s)"),
+    ok = ?SEV_AWAIT_FINISH([Tester]).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Tests the socket option debug.
+%% On linux, this test requires that the user running the test to have
+%% CAP_NET_ADMIN capabilities or be root (effective user ID of 0), 
+%% therefor we explicitly test for the result eacces when attempting to
+%% set, and skip if we get it.
+
+api_opt_sock_debug(suite) ->
+    [];
+api_opt_sock_debug(doc) ->
+    [];
+api_opt_sock_debug(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_opt_sock_debug,
+           fun() -> has_support_sock_debug() end,
+           fun() -> api_opt_sock_debug() end).
+
+
+api_opt_sock_debug() ->
+    Opt    = debug,
+    Set    = fun(S, Val) when is_integer(Val) ->
+                     socket:setopt(S, socket, Opt, Val)
+             end,
+    Get    = fun(S) ->
+                     socket:getopt(S, socket, Opt)
+             end,
+
+    TesterSeq =
+        [
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case ?LIB:which_local_host_info(Domain) of
+                               {ok, #{name      := Name,
+                                      addr      := Addr,
+                                      broadaddr := BAddr}} ->
+                                   ?SEV_IPRINT("local host info: "
+                                               "~n   Name:           ~p"
+                                               "~n   Addr:           ~p"
+                                               "~n   Broadcast Addr: ~p",
+                                               [Name, Addr, BAddr]),
+                                   LSA = #{family => Domain,
+                                           addr   => Addr},
+                                   BSA = #{family => Domain,
+                                           addr   => BAddr},
+                                   {ok, State#{lsa => LSA,
+                                               bsa => BSA}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         #{desc => "create UDP socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, dgram, udp) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "Get current debug value",
+           cmd  => fun(#{sock := Sock} = State) ->
+                           case Get(Sock) of
+                               {ok, Debug} when is_integer(Debug) ->
+                                   ?SEV_IPRINT("Success: ~p", [Debug]),
+                                   {ok, State#{debug => Debug}};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected failure: ~p",
+                                               [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "Try enable socket debug",
+           cmd  => fun(#{sock := Sock, debug := Debug} = State) ->
+			   NewDebug = Debug + 1,
+                           case Set(Sock, NewDebug) of
+                               ok ->
+                                   ?SEV_IPRINT("Expected Success"),
+                                   {ok, State#{debug => NewDebug}};
+                               {error, eacces = Reason} ->
+                                   ?SEV_EPRINT("NO ACCESS => SKIP"),
+                                   {skip, Reason};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p",
+					       [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "Get current (new) debug value",
+           cmd  => fun(#{sock := Sock, debug := Debug} = _State) ->
+                           case Get(Sock) of
+                               {ok, Debug} when is_integer(Debug) ->
+                                   ?SEV_IPRINT("Success: ~p", [Debug]),
+                                   ok;
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected failure: ~p",
+                                               [Reason]),
+                                   ERROR
+                           end
+                   end},
+
+         %% *** Termination ***
+         #{desc => "close UDP socket",
+           cmd  => fun(#{sock := Sock} = State0) ->
+                           socket:close(Sock),
+			   State1 = maps:remove(sock, State0),
+                           {ok, State1}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    Domain = inet,
+
+    i("start tester evaluator"),
+    InitState = #{domain => Domain},
+    Tester = ?SEV_START("tester", TesterSeq, InitState),
+
+    i("await evaluator(s)"),
+    ok = ?SEV_AWAIT_FINISH([Tester]).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Tests the socket option domain.
+%% This is a read only option. Also not available on all platforms.
+
+api_opt_sock_domain(suite) ->
+    [];
+api_opt_sock_domain(doc) ->
+    [];
+api_opt_sock_domain(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_opt_sock_domain,
+           fun() -> has_support_sock_domain() end,
+           fun() -> api_opt_sock_domain() end).
+
+
+api_opt_sock_domain() ->
+    Opt = domain,
+    Get = fun(S) ->
+                  socket:getopt(S, socket, Opt)
+          end,
+
+    TesterSeq =
+        [
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case ?LIB:which_local_host_info(Domain) of
+                               {ok, #{name      := Name,
+                                      addr      := Addr,
+                                      broadaddr := BAddr}} ->
+                                   ?SEV_IPRINT("local host info: "
+                                               "~n   Name:           ~p"
+                                               "~n   Addr:           ~p"
+                                               "~n   Broadcast Addr: ~p",
+                                               [Name, Addr, BAddr]),
+                                   LSA = #{family => Domain,
+                                           addr   => Addr},
+                                   BSA = #{family => Domain,
+                                           addr   => BAddr},
+                                   {ok, State#{lsa => LSA,
+                                               bsa => BSA}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         #{desc => "create IPv4 UDP socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, dgram, udp) of
+                               {ok, Sock} ->
+                                   {ok, State#{usock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "Get domain for the UDP socket",
+           cmd  => fun(#{domain := Domain, usock := Sock} = _State) ->
+                           case Get(Sock) of
+                               {ok, Domain} ->
+                                   ?SEV_IPRINT("Success: ~p", [Domain]),
+                                   ok;
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected failure: ~p",
+                                               [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "create TCP socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, stream, tcp) of
+                               {ok, Sock} ->
+                                   {ok, State#{tsock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "Get domain for the TCP socket",
+           cmd  => fun(#{domain := Domain, tsock := Sock} = _State) ->
+                           case Get(Sock) of
+                               {ok, Domain} ->
+                                   ?SEV_IPRINT("Success: ~p", [Domain]),
+                                   ok;
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected failure: ~p",
+                                               [Reason]),
+                                   ERROR
+                           end
+                   end},
+
+         %% *** Termination ***
+         #{desc => "close UDP socket",
+           cmd  => fun(#{usock := Sock} = State0) ->
+                           socket:close(Sock),
+			   State1 = maps:remove(usock, State0),
+                           {ok, State1}
+                   end},
+         #{desc => "close TCP socket",
+           cmd  => fun(#{tsock := Sock} = State0) ->
+                           socket:close(Sock),
+			   State1 = maps:remove(tsock, State0),
+                           {ok, State1}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    Domain = inet,
+
+    i("start tester evaluator"),
+    InitState = #{domain => Domain},
+    Tester = ?SEV_START("tester", TesterSeq, InitState),
+
+    i("await evaluator(s)"),
+    ok = ?SEV_AWAIT_FINISH([Tester]).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Tests the socket option dontroute.
+%% The man page has the following to say:
+%% "Don't send via a gateway, send only to directly connected hosts.
+%%  The same effect can be achieved by setting the MSG_DONTROUTE
+%%  flag on a socket send(2) operation."
+%% Since its "kind of" difficult to check if it actually takes an 
+%% effect (you would need a gateway for that and a machine "on the
+%% other side"), we only test if we can set and get the value.
+%% Better then nothing.
+
+api_opt_sock_dontroute(suite) ->
+    [];
+api_opt_sock_dontroute(doc) ->
+    [];
+api_opt_sock_dontroute(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_opt_sock_dontroute,
+           fun() -> has_support_sock_dontroute() end,
+           fun() -> api_opt_sock_dontroute() end).
+
+
+api_opt_sock_dontroute() ->
+    Opt    = dontroute,
+    Set    = fun(S, Val) when is_boolean(Val) ->
+                     socket:setopt(S, socket, Opt, Val)
+             end,
+    Get    = fun(S) ->
+                     socket:getopt(S, socket, Opt)
+             end,
+
+    TesterSeq =
+        [
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case ?LIB:which_local_host_info(Domain) of
+                               {ok, #{name      := Name,
+                                      addr      := Addr,
+                                      broadaddr := BAddr}} ->
+                                   ?SEV_IPRINT("local host info: "
+                                               "~n   Name:           ~p"
+                                               "~n   Addr:           ~p"
+                                               "~n   Broadcast Addr: ~p",
+                                               [Name, Addr, BAddr]),
+                                   LSA = #{family => Domain,
+                                           addr   => Addr},
+                                   BSA = #{family => Domain,
+                                           addr   => BAddr},
+                                   {ok, State#{lsa => LSA,
+                                               bsa => BSA}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         #{desc => "create UDP socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, dgram, udp) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "Get current value",
+           cmd  => fun(#{sock := Sock} = State) ->
+                           case Get(Sock) of
+                               {ok, Val} when is_boolean(Val) ->
+                                   ?SEV_IPRINT("Success: ~p", [Val]),
+                                   {ok, State#{dontroute => Val}};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected failure: ~p",
+                                               [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "Try change value",
+           cmd  => fun(#{sock := Sock, dontroute := Current} = State) ->
+			   New = not Current,
+                           ?SEV_IPRINT("Change from ~p to ~p", [Current, New]),
+                           case Set(Sock, New) of
+                               ok ->
+                                   ?SEV_IPRINT("Expected Success"),
+                                   {ok, State#{dontroute => New}};
+                               {error, eopnotsupp = Reason} ->
+                                   ?SEV_EPRINT("Expected Failure: ~p",
+					       [Reason]),
+                                   {skip, Reason};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p",
+					       [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "Verify changed value",
+           cmd  => fun(#{sock := Sock, dontroute := Val} = _State) ->
+                           case Get(Sock) of
+                               {ok, Val} ->
+                                   ?SEV_IPRINT("Expected Success"),
+                                   ok;
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected failure: ~p",
+                                               [Reason]),
+                                   ERROR
+                           end
+                   end},
+
+         %% *** Termination ***
+         #{desc => "close UDP socket",
+           cmd  => fun(#{sock := Sock} = State0) ->
+                           socket:close(Sock),
+			   State1 = maps:remove(sock, State0),
+                           {ok, State1}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    Domain = inet,
+
+    i("start tester evaluator"),
+    InitState = #{domain => Domain},
+    Tester = ?SEV_START("tester", TesterSeq, InitState),
+
+    i("await evaluator(s)"),
+    ok = ?SEV_AWAIT_FINISH([Tester]).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Tests the socket option error. PLACEHOLDER!
+
+api_opt_sock_error(suite) ->
+    [];
+api_opt_sock_error(doc) ->
+    [];
+api_opt_sock_error(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_opt_sock_error,
+           fun() -> not_yet_implemented() end,
+           fun() -> ok end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Tests the socket option keepalive.
+%% This is bit tricky to test, partly because we have no control over
+%% the underlying TCP timeouts. So, for now, we just test that we can
+%% change the value.
+
+api_opt_sock_keepalive(suite) ->
+    [];
+api_opt_sock_keepalive(doc) ->
+    [];
+api_opt_sock_keepalive(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_opt_sock_keepalive,
+           fun() -> has_support_sock_keepalive() end,
+           fun() -> api_opt_sock_keepalive() end).
+
+
+api_opt_sock_keepalive() ->
+    Opt    = keepalive,
+    Set    = fun(S, Val) when is_boolean(Val) ->
+                     socket:setopt(S, socket, Opt, Val)
+             end,
+    Get    = fun(S) ->
+                     socket:getopt(S, socket, Opt)
+             end,
+
+    TesterSeq =
+        [
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case ?LIB:which_local_host_info(Domain) of
+                               {ok, #{name      := Name,
+                                      addr      := Addr,
+                                      broadaddr := BAddr}} ->
+                                   ?SEV_IPRINT("local host info: "
+                                               "~n   Name:           ~p"
+                                               "~n   Addr:           ~p"
+                                               "~n   Broadcast Addr: ~p",
+                                               [Name, Addr, BAddr]),
+                                   LSA = #{family => Domain,
+                                           addr   => Addr},
+                                   BSA = #{family => Domain,
+                                           addr   => BAddr},
+                                   {ok, State#{lsa => LSA,
+                                               bsa => BSA}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         #{desc => "create TCP socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, stream, tcp) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "Get current value",
+           cmd  => fun(#{sock := Sock} = State) ->
+                           case Get(Sock) of
+                               {ok, Val} when is_boolean(Val) ->
+                                   ?SEV_IPRINT("Success: ~p", [Val]),
+                                   {ok, State#{keepalive => Val}};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected failure: ~p",
+                                               [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "Try change the value",
+           cmd  => fun(#{sock := Sock, keepalive := Current} = State) ->
+			   New = not Current,
+                           ?SEV_IPRINT("Try change value from ~p to ~p", 
+                                       [Current, New]),
+                           case Set(Sock, New) of
+                               ok ->
+                                   ?SEV_IPRINT("Expected Success"),
+                                   {ok, State#{keepalive => New}};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected Failure: ~p",
+					       [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "Verify (new) current value",
+           cmd  => fun(#{sock := Sock, keepalive := Val} = _State) ->
+                           case Get(Sock) of
+                               {ok, Val} ->
+                                   ?SEV_IPRINT("Expected Success (~p)", [Val]),
+                                   ok;
+                               {ok, OtherVal} ->
+                                   ?SEV_IPRINT("Unexpected Success: ~p",
+                                               [OtherVal]),
+                                   {error, {unexpected_success_value,
+                                            Val, OtherVal}};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected failure: ~p",
+                                               [Reason]),
+                                   ERROR
+                           end
+                   end},
+
+         %% *** Termination ***
+         #{desc => "close UDP socket",
+           cmd  => fun(#{sock := Sock} = State0) ->
+                           socket:close(Sock),
+			   State1 = maps:remove(sock, State0),
+                           {ok, State1}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    Domain = inet,
+
+    i("start tester evaluator"),
+    InitState = #{domain => Domain},
+    Tester = ?SEV_START("tester", TesterSeq, InitState),
+
+    i("await evaluator(s)"),
+    ok = ?SEV_AWAIT_FINISH([Tester]).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Tests the socket option linger. PLACEHOLDER!
+
+api_opt_sock_linger(suite) ->
+    [];
+api_opt_sock_linger(doc) ->
+    [];
+api_opt_sock_linger(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_opt_sock_linger,
+           fun() -> not_yet_implemented() end,
+           fun() -> ok end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Tests that the add_mambership and drop_membership ip options work.
+%% We create one server and two clients. The server only send messages,
+%% the clients only receives messages.
+%% An UDP datagram is forbidden (RFC 1122) from having a source address
+%% that is a multicast address (or a broadcast address).
+%% So, the server create a socket "for sending" and the clients sockets
+%% "for receiving".
+%% Sending socket:   Bound to the local address (and any port).
+%%                   When sending, the dest will be the multicast address
+%%                   and port of the receiving socket.
+%% Receiving socket: Bound to the multicast address and port.
+api_opt_ip_add_drop_membership(suite) ->
+    [];
+api_opt_ip_add_drop_membership(doc) ->
+    ["OTP-15908 (ERL-980)"];
+api_opt_ip_add_drop_membership(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(api_opt_ip_add_drop_membership,
+           fun() ->
+                   has_support_ip_add_membership(),
+                   has_support_ip_drop_membership(),
+                   has_support_ip_multicast()
+           end,
+           fun() -> api_opt_ip_add_drop_membership() end).
+
+
+api_opt_ip_add_drop_membership() ->
+    Set = fun(S, Key, Val) ->
+                  socket:setopt(S, ip, Key, Val)
+          end,
+    AddMembership  = fun(S, Val) -> Set(S, add_membership,  Val) end,
+    DropMembership = fun(S, Val) -> Set(S, drop_membership, Val) end,
+
+    ServerSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           {Tester, MSA} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester, msa => MSA}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{local_sa => LSA}}
+                   end},
+         #{desc => "create socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, dgram, udp) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "make recv socket reuse addr",
+           cmd  => fun(#{sock := Sock} = _State) ->
+                           case socket:setopt(Sock, socket, reuseaddr, true) of
+                               ok ->
+                                   ok;
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Failed set reuseaddr: "
+                                               "~n   ~p", [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind recv socket to multicast address",
+           cmd  => fun(#{sock := Sock, msa := MSA} = State) ->
+                           case socket:bind(Sock, MSA) of
+                               {ok, Port} ->
+                                   ?SEV_IPRINT("bound to:"
+                                               "~n   ~p", [Port]),
+                                   {ok, State#{msa => MSA#{port => Port}}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (add_membership)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, add_membership)
+                   end},
+         #{desc => "add membership",
+           cmd  => fun(#{sock     := Sock,
+                         msa      := #{addr := MAddr},
+                         local_sa := #{addr := Addr}} = State) ->
+                           MReq = #{multiaddr => MAddr,
+                                    interface => Addr},
+                           ?SEV_IPRINT("try add membership to:"
+                                       "~n   ~p", [MReq]),
+                           case AddMembership(Sock, MReq) of
+                               ok ->
+                                   ?SEV_IPRINT("membership added"),
+                                   {ok, State#{mreq => MReq}};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Failed adding membership to: "
+                                               "~n   ~p"
+                                               "~n   Reason:  ~p",
+                                               [MReq, Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (add-membership)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, add_membership),
+                           ok
+                   end},
+
+         #{desc => "await continue (drop_membership)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, drop_membership)
+                   end},
+         #{desc => "drop membership",
+           cmd  => fun(#{sock := Sock,
+                         mreq := MReq} = State) ->
+                           ?SEV_IPRINT("try drop membership from:"
+                                       "~n   ~p", [MReq]),
+                           case DropMembership(Sock, MReq) of
+                               ok ->
+                                   ?SEV_IPRINT("membership dropped"),
+                                   {ok, maps:remove(mreq, State)};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Failed drop membership from: "
+                                               "~n   ~p"
+                                               "~n   Reason:  ~p",
+                                               [MReq, Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (drop-membership)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, drop_membership),
+                           ok
+                   end},
+
+
+         %% Termination
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close socket",
+           cmd  => fun(#{sock := Sock} = State) ->
+                           socket:close(Sock),
+                           {ok, maps:remove(sock, State)}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "monitor server",
+           cmd  => fun(#{server := Server} = _State) ->
+                           _MRef = erlang:monitor(process, Server),
+                           ok
+                   end},
+
+         %% Start the server
+         #{desc => "order server start",
+           cmd  => fun(#{server := Pid, msa := MSA} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, MSA),
+                           ok
+                   end},
+         #{desc => "await server ready (init)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           case ?SEV_AWAIT_READY(Pid, server, init) of
+                               ok ->
+                                   ok;
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Start of server failed: "
+                                               "~n   ~p", [Reason]),
+                                   ERROR
+                           end
+                   end},
+
+
+         %% *** The actual test ***
+         #{desc => "order server to continue (add-membership)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Server, add_membership),
+                           ok
+                   end},
+         #{desc => "await server ready (add-membership)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, add_membership)
+                   end},
+
+         #{desc => "order server to continue (drop-membership)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Server, drop_membership),
+                           ok
+                   end},
+         #{desc => "await server ready (drop-membership)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, drop_membership)
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         %% *** Termination ***
+         #{desc => "order server terminate",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Server),
+                           ok
+                   end},
+         #{desc => "await server termination",
+           cmd  => fun(#{server := Server} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Server),
+                           {ok, maps:remove(server, State)}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+
+    Domain = inet,
+    i("get multicast address"),
+    MAddr  = which_ip_multicast_address(),
+    MSA    = #{family => Domain, addr => MAddr},
+
+    i("start server evaluator"),
+    ServerInitState = #{domain => Domain},
+    Server = ?SEV_START("server", ServerSeq, ServerInitState),
+
+    i("start tester evaluator"),
+    TesterInitState = #{domain  => Domain,
+                        msa     => MSA,
+                        server  => Server#ev.pid},
+    Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    i("await evaluator(s)"),
+    ok = ?SEV_AWAIT_FINISH([Tester, Server]).
+
+
+
+which_ip_multicast_address() ->
+    which_multicast_address(inet).
+
+which_multicast_address(Domain) ->
+    case os:type() of
+        {unix, linux} ->
+            WhichMAddr = fun([_, _, MAddr]) -> MAddr end,
+            which_multicast_address2(Domain, WhichMAddr);
+
+        {unix, sunos} ->
+            WhichMAddr = fun([_, MAddr, _]) -> MAddr end,
+            which_multicast_address2(Domain, WhichMAddr);
+
+        Type ->
+            %% Actually, what is "not supported". is netstat!
+            not_supported({multicast, Type})
+    end.
+
+%% Note that the 'netstat -g' table looks different on linux and SunOS
+%% Linux: IfName - RefCnt - Group
+%% SunOS: IfName - Group  - RefCnt
+
+which_multicast_address2(Domain, WhichMAddr) ->
+    IfName = which_local_host_ifname(Domain),
+    %% On some platforms the netstat barfs out some crap on stderr
+    %% before the actual info...
+    case os:cmd("netstat -g 2>/dev/null | grep " ++ IfName) of
+        [] ->
+            %% Can't figure out if we support multicast or not...
+            not_supported(no_netstat);
+        NetstatGroupsStr ->
+            try
+                begin
+                    NetstatGroups0   = string:tokens(NetstatGroupsStr, [$\n]),
+                    NetstatGroups    = [string:tokens(G, [$ ]) || 
+                                           G <- NetstatGroups0],
+                    MAddrs           = [WhichMAddr(NetstatGroup) || 
+                                           NetstatGroup <- NetstatGroups],
+                    which_multicast_address3(Domain, MAddrs)
+                end
+            catch
+                throw:E:_ ->
+                    throw(E);
+                C:E:S ->
+                    not_supported({multicast, {C,E,S}})
+            end
+    end.
+
+which_multicast_address3(_Domain, []) ->
+    not_supported({multicast, no_valid_addrs});
+which_multicast_address3(Domain, [MAddrStr|MAddrs]) ->
+    %% Even on linux some of these are not actually addresses, but
+    %% "host names", such as all-systems.mcast.net. But both
+    %% address strings, such as "224.0.0.251" and host name strings
+    %% gets translated into an address by the inet:inet:getaddr/2.
+    case inet:getaddr(MAddrStr, Domain) of
+        {ok, MAddr} ->
+            MAddr;
+        {error, _} ->
+            which_multicast_address3(Domain, MAddrs)
+    end.
+    
+which_local_host_ifname(Domain) ->
+    case ?LIB:which_local_host_info(Domain) of
+        {ok, #{name := Name}} ->
+            Name;
+        {error, Reason} ->
+            not_supported({multicast, Reason})
+    end.
+
+    
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                     %%
+%%                  API OPERATIONS WITH TIMEOUT                        %%
+%%                                                                     %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This test case is intended to test the connect timeout option
+%% on an IPv4 TCP (stream) socket.
+api_to_connect_tcp4(suite) ->
+    [];
+api_to_connect_tcp4(doc) ->
+    [];
+api_to_connect_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    Cond = fun() -> api_to_connect_cond() end,
+    tc_try(api_to_connect_tcp4,
+           Cond,
+           fun() ->
+                   InitState = #{domain        => inet,
+                                 backlog       => 1,
+                                 timeout       => 5000,
+                                 connect_limit => 3},
+                   ok = api_to_connect_tcp(InitState)
+           end).
+
+api_to_connect_cond() ->
+    api_to_connect_cond(os:type(), os:version()).
+
+%% I don't know exactly at which version this starts to work.
+%% I know it does not work for 4.4.*, but is does for 4.15.
+%% So, just to simplify, we require atleast 4.15
+api_to_connect_cond({unix, linux}, {Maj, Min, _Rev}) ->
+    if
+        (Maj > 4) ->
+            ok;
+        ((Maj =:= 4) andalso (Min >= 15)) ->
+            ok;
+        true ->
+            skip("TC does not work")
+    end;
+%% Only test on one machine, which has version 6.3, and there it does
+%% not work, so disable for all.
+api_to_connect_cond({unix, openbsd}, _) ->
+    skip("TC does not work");
+api_to_connect_cond({unix, freebsd}, {Maj, Min, _Rev}) ->
+    if
+        ((Maj >= 10) andalso (Min >= 4)) ->
+            ok;
+        true ->
+            skip("TC may not work")
+    end;
+api_to_connect_cond({unix, sunos}, {Maj, Min, _Rev}) ->
+    if
+        ((Maj >= 5) andalso (Min >= 10)) ->
+            ok;
+        true ->
+            skip("TC may not work")
+    end;
+api_to_connect_cond(_, _) ->
+    skip("TC may not work").
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This test case is intended to test the connect timeout option
+%% on an IPv6 TCP (stream) socket.
+api_to_connect_tcp6(suite) ->
+    [];
+api_to_connect_tcp6(doc) ->
+    [];
+api_to_connect_tcp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_to_connect_tcp6,
+           fun() -> has_support_ipv6(), api_to_connect_cond() end,
+           fun() ->
+                   InitState = #{domain        => inet6,
+                                 backlog       => 1,
+                                 timeout       => 5000,
+                                 connect_limit => 3},
+                   ok = api_to_connect_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% We use the backlog (listen) argument to test this.
+%% Note that the behaviour of the TCP "server side" can vary when 
+%% a client connect to a "busy" server (full backlog).
+%% For instance, on FreeBSD (11.2) the reponse when the backlog is full
+%% is a econreset.
+
+api_to_connect_tcp(InitState) ->
+    process_flag(trap_exit, true),
+
+    ServerSeq = 
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start (from tester)",
+           cmd  => fun(State) ->
+                           {Tester, Backlog} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester  => Tester,
+                                       backlog => Backlog}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{local_sa => LSA}}
+                   end},
+         #{desc => "create listen socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, stream, tcp) of
+                               {ok, Sock} ->
+                                   {ok, State#{lsock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{lsock := LSock, local_sa := LSA} = State) ->
+                           case socket:bind(LSock, LSA) of
+                               {ok, Port} ->
+                                   {ok, State#{lport => Port}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "make listen socket (with backlog = 1)",
+           cmd  => fun(#{lsock := LSock, backlog := Backlog}) ->
+                           socket:listen(LSock, Backlog)
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester, lport := Port}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, Port),
+                           ok
+                   end},
+
+         %% Termination
+         #{desc => "await terminate",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close socket",
+           cmd  => fun(#{lsock := Sock} = State) ->
+                           sock_close(Sock),
+                           State1 = maps:remove(lport, State),
+                           State2 = maps:remove(sock,  State1),
+                           {ok, State2}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    ClientSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           {Tester, ServerSA} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester    => Tester,
+                                       server_sa => ServerSA}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{local_sa => LSA}}
+                   end},
+         #{desc => "create node",
+           cmd  => fun(#{host := Host} = State) ->
+			   ?SEV_IPRINT("try create node on ~p", [Host]),
+                           case start_node(Host, client) of
+                               {ok, Node} ->
+                                   ?SEV_IPRINT("client node ~p started",
+                                               [Node]),
+                                   {ok, State#{node => Node}};
+                               {error, Reason} ->
+                                   {skip, Reason}
+                           end
+                   end},
+         #{desc => "monitor client node",
+           cmd  => fun(#{node := Node} = _State) ->
+                           true = erlang:monitor_node(Node, true),
+                           ok
+                   end},
+         #{desc => "start remote client on client node",
+           cmd  => fun(#{node := Node} = State) ->
+                           Pid = api_toc_tcp_client_start(Node),
+                           ?SEV_IPRINT("remote client ~p started", [Pid]),
+                           {ok, State#{rclient => Pid}}
+                   end},
+         #{desc => "monitor remote client",
+           cmd  => fun(#{rclient := Pid}) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "order remote client to start",
+           cmd  => fun(#{rclient   := Client,
+                         server_sa := ServerSA}) ->
+                           ?SEV_ANNOUNCE_START(Client, ServerSA),
+                           ok
+                   end},
+         #{desc => "await remote client ready",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, rclient, init,
+                                            [{tester, Tester}])
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (connect)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = State) ->
+                           case ?SEV_AWAIT_CONTINUE(Tester, tester, connect,
+                                                    [{rclient, Client}]) of
+                               {ok, {ConTimeout, ConLimit}} ->
+                                   {ok, State#{connect_timeout => ConTimeout,
+                                               connect_limit   => ConLimit}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order remote client to continue (connect)",
+           cmd  => fun(#{rclient         := RClient,
+                         connect_timeout := ConTimeout,
+                         connect_limit   := ConLimit}) ->
+                           ?SEV_ANNOUNCE_CONTINUE(RClient, connect,
+                                                  {ConTimeout, ConLimit}),
+                           ok
+                   end},
+         #{desc => "await remote client ready (connect)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := RClient} = State) ->
+                           case ?SEV_AWAIT_READY(RClient, rclient, connect,
+                                                 [{tester, Tester}]) of
+                               {ok, ok = _Result} ->
+                                   {ok, maps:remove(connect_limit, State)};
+                               {ok, {error, {connect_limit_reached,R,L}}} ->
+                                   {skip,
+                                    ?LIB:f("Connect limit reached ~w: ~w",
+                                           [L, R])};
+                               {ok, Result} ->
+                                   Result;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         #{desc => "announce ready (connect)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, connect),
+                           ok
+                   end},
+
+         %% Termination
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := RClient} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester,
+                                                     [{rclient, RClient}]) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "kill remote client",
+           cmd  => fun(#{rclient := Client}) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Client),
+                           ok
+                   end},
+         #{desc => "await remote client termination",
+           cmd  => fun(#{rclient := Client} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Client),
+                           State1 = maps:remove(rclient, State),
+                           {ok, State1}
+                   end},
+         #{desc => "stop client node",
+           cmd  => fun(#{node := Node} = _State) ->
+                           stop_node(Node)
+                   end},
+         #{desc => "await client node termination",
+           cmd  => fun(#{node := Node} = State) ->
+                           receive
+                               {nodedown, Node} ->
+                                   State1 = maps:remove(node_id, State),
+                                   State2 = maps:remove(node,    State1),
+                                   {ok, State2}
+                           end
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "monitor server",
+           cmd  => fun(#{server := Server} = _State) ->
+                           _MRef = erlang:monitor(process, Server),
+                           ok
+                   end},
+         #{desc => "monitor client",
+           cmd  => fun(#{client := Client} = _State) ->
+                           _MRef = erlang:monitor(process, Client),
+                           ok
+                   end},
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{local_sa => LSA}}
+                   end},
+         #{desc => "order server start",
+           cmd  => fun(#{server  := Server,
+                         backlog := Backlog}) ->
+                           ?SEV_ANNOUNCE_START(Server, Backlog),
+                           ok
+                   end},
+         #{desc => "await server ready (init)",
+           cmd  => fun(#{server := Server, local_sa := LSA} = State) ->
+                           {ok, Port} = ?SEV_AWAIT_READY(Server, server, init),
+                           ServerSA = LSA#{port => Port},
+                           {ok, State#{server_sa => ServerSA}}
+                   end},
+         #{desc => "order client start",
+           cmd  => fun(#{client    := Client,
+                         server_sa := ServerSA}) ->
+                           ?SEV_ANNOUNCE_START(Client, ServerSA),
+                           ok
+                   end},
+         #{desc => "await client ready (init)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, init),
+                           ok
+                   end},
+
+         %% The actual test
+         %% The server does nothing (this is the point), no accept,
+         %% the client tries to connect.
+         #{desc => "order client continue (connect)",
+           cmd  => fun(#{client        := Client,
+                         timeout       := Timeout,
+                         connect_limit := ConLimit} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, connect,
+                                                  {Timeout, ConLimit}),
+                           ok
+                   end},
+         #{desc => "await client ready (connect)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = _State) ->
+                           case ?SEV_AWAIT_READY(Client, client, connect,
+                                                 [{server, Server}]) of
+                               ok ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+
+         %% *** Terminate server ***
+         #{desc => "order client terminate",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Client),
+                           ok
+                   end},
+         #{desc => "await client down",
+           cmd  => fun(#{client := Client} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Client),
+                           State1 = maps:remove(client,    State),
+                           {ok, State1}
+                   end},
+         #{desc => "order server terminate",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Server),
+                           ok
+                   end},
+         #{desc => "await server down",
+           cmd  => fun(#{server := Server} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Server),
+                           State1 = maps:remove(server,    State),
+                           State2 = maps:remove(server_sa, State1),
+                           {ok, State2}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    i("create server evaluator"),
+    ServerInitState = #{domain => maps:get(domain, InitState)},
+    Server          = ?SEV_START("server", ServerSeq, ServerInitState),
+
+    i("create client evaluator"),
+    ClientInitState = #{host   => local_host(),
+                        domain => maps:get(domain, InitState)},
+    Client          = ?SEV_START("client", ClientSeq, ClientInitState),
+
+    i("create tester evaluator"),
+    TesterInitState = InitState#{server => Server#ev.pid,
+                                 client => Client#ev.pid},
+    Tester          = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    i("await evaluator(s)"),
+    ok = ?SEV_AWAIT_FINISH([Server, Client, Tester]).
+
+
+api_toc_tcp_client_start(Node) ->
+    Self = self(),
+    Fun  = fun() -> api_toc_tcp_client(Self) end,
+    erlang:spawn(Node, Fun).
+
+api_toc_tcp_client(Parent) ->
+    api_toc_tcp_client_init(Parent),
+    ServerSA = api_toc_tcp_client_await_start(Parent),
+    Domain   = maps:get(family, ServerSA),
+    api_toc_tcp_client_announce_ready(Parent, init),
+    {To, ConLimit} = api_toc_tcp_client_await_continue(Parent, connect),
+    Result = api_to_connect_tcp_await_timeout(To, ServerSA, Domain, ConLimit),
+    ?SEV_IPRINT("result: ~p", [Result]),
+    api_toc_tcp_client_announce_ready(Parent, connect, Result),
+    Reason = api_toc_tcp_client_await_terminate(Parent),
+    exit(Reason).
+
+api_toc_tcp_client_init(Parent) ->
+    put(sname, "rclient"),
+    %% i("api_toc_tcp_client_init -> entry"),
+    _MRef = erlang:monitor(process, Parent),
+    ok.
+
+api_toc_tcp_client_await_start(Parent) ->
+    %% i("api_toc_tcp_client_await_start -> entry"),
+    ?SEV_AWAIT_START(Parent).
+
+api_toc_tcp_client_announce_ready(Parent, Slogan) ->
+    ?SEV_ANNOUNCE_READY(Parent, Slogan).
+api_toc_tcp_client_announce_ready(Parent, Slogan, Result) ->
+    ?SEV_ANNOUNCE_READY(Parent, Slogan, Result).
+
+api_toc_tcp_client_await_continue(Parent, Slogan) ->
+    %% i("api_toc_tcp_client_await_continue -> entry"),
+    case ?SEV_AWAIT_CONTINUE(Parent, parent, Slogan) of
+        ok ->
+            ok;
+        {ok, Extra} ->
+            Extra;
+        {error, Reason} ->
+            exit({await_continue, Slogan, Reason})
+    end.
+
+api_toc_tcp_client_await_terminate(Parent) ->
+    %% i("api_toc_tcp_client_await_terminate -> entry"),
+    case ?SEV_AWAIT_TERMINATE(Parent, parent) of
+        ok ->
+            ok;
+        {error, Reason} ->
+            Reason
+    end.
+
+api_to_connect_tcp_await_timeout(To, ServerSA, Domain, ConLimit) ->
+    LSA = which_local_socket_addr(Domain),
+    NewSock = fun() ->
+                      S = case socket:open(Domain, stream, tcp) of
+                              {ok, Sock} ->
+                                  Sock;
+                              {error, OReason} ->
+                                  ?FAIL({open, OReason})
+                          end,
+                      case socket:bind(S, LSA) of
+                          {ok, _} ->
+                              S;
+                          {error, BReason} ->
+                              ?FAIL({bind, BReason})
+                      end
+              end,
+    api_to_connect_tcp_await_timeout(1, ConLimit, To, ServerSA, NewSock, []).
+
+api_to_connect_tcp_await_timeout(ID, ConLimit, _To, _ServerSA, _NewSock, Acc)
+  when (ID > ConLimit) ->
+    api_to_connect_tcp_await_timeout3(Acc),
+    {error, {connect_limit_reached, ID, ConLimit}};
+api_to_connect_tcp_await_timeout(ID, ConLimit, To, ServerSA, NewSock, Acc) ->
+    case api_to_connect_tcp_await_timeout2(ID, To, ServerSA, NewSock) of
+        ok ->
+            %% ?SEV_IPRINT("success when number of socks: ~w", [length(Acc)]),
+            api_to_connect_tcp_await_timeout3(Acc),
+            ok;
+        {ok, Sock} ->
+            %% ?SEV_IPRINT("~w: unexpected success (connect)", [ID]),
+            api_to_connect_tcp_await_timeout(ID+1, ConLimit,
+                                             To, ServerSA, NewSock,
+                                             [Sock|Acc]);
+        {error, _} = ERROR ->
+            ERROR
+    end.
+
+api_to_connect_tcp_await_timeout2(_ID, To, ServerSA, NewSock) ->
+    Sock = NewSock(),
+    %% ?SEV_IPRINT("~w: try connect", [ID]),
+    Start = t(),
+    case socket:connect(Sock, ServerSA, To) of
+        {error, timeout} ->
+            Stop  = t(),
+            TDiff = Stop - Start,
+            if
+                (TDiff >= To) ->
+                    (catch socket:close(Sock)),
+                    ok;
+                true ->
+                    (catch socket:close(Sock)),
+                    ?FAIL({unexpected_timeout, TDiff, To})
+            end;
+        {error, econnreset = _Reason} ->
+            (catch socket:close(Sock)),
+            ok;
+        {error, Reason} ->
+            (catch socket:close(Sock)),
+            ?FAIL({connect, Reason});
+        ok ->
+            {ok, Sock}
+    end.
+
+api_to_connect_tcp_await_timeout3([]) ->
+    ok;
+api_to_connect_tcp_await_timeout3([Sock|Socka]) ->
+    (catch socket:close(Sock)),
+    api_to_connect_tcp_await_timeout3(Socka).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This test case is intended to test the accept timeout option
+%% on an IPv4 TCP (stream) socket.
+api_to_accept_tcp4(suite) ->
+    [];
+api_to_accept_tcp4(doc) ->
+    [];
+api_to_accept_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_to_accept_tcp4,
+           fun() ->
+                   InitState = #{domain => inet, timeout => 5000},
+                   ok = api_to_accept_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This test case is intended to test the accept timeout option
+%% on an IPv6 TCP (stream) socket.
+api_to_accept_tcp6(suite) ->
+    [];
+api_to_accept_tcp6(doc) ->
+    [];
+api_to_accept_tcp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_to_accept_tcp4,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   InitState = #{domain => inet6, timeout => 5000},
+                   ok = api_to_accept_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+api_to_accept_tcp(InitState) ->
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{lsa => LSA}}
+                   end},
+         #{desc => "create (listen) socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, stream, tcp) of
+                               {ok, Sock} ->
+                                   {ok, State#{lsock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{lsock := LSock, lsa := LSA} = _State) ->
+                           case socket:bind(LSock, LSA) of
+                               {ok, _} ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "make listen socket",
+           cmd  => fun(#{lsock := LSock}) ->
+                           socket:listen(LSock)
+                   end},
+
+         %% *** The actual test part ***
+         #{desc => "attempt to accept (without success)",
+           cmd  => fun(#{lsock := LSock, timeout := To} = State) ->
+                           Start = t(),
+                           case socket:accept(LSock, To) of
+                               {error, timeout} ->
+                                   {ok, State#{start => Start, stop => t()}};
+                               {ok, Sock} ->
+                                   (catch socket:close(Sock)),
+                                   {error, unexpected_success};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "validate timeout time",
+           cmd  => fun(#{start := Start, stop := Stop, timeout := To} = _State) ->
+                           TDiff  = Stop - Start,
+                           if
+                               (TDiff >= To) ->
+                                   ok;
+                               true ->
+                                   {error, {unexpected_timeout, TDiff, To}}
+                           end
+                   end},
+
+         %% *** Close (listen) socket ***
+         #{desc => "close (listen) socket",
+           cmd  => fun(#{lsock := LSock} = State) ->
+                           sock_close(LSock),
+                           {ok, maps:remove(sock3, State)}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    i("create tester evaluator"),
+    Tester = ?SEV_START("tester", TesterSeq, InitState),
+
+    i("await evaluator"),
+    ok = ?SEV_AWAIT_FINISH([Tester]).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This test case is intended to test the multi accept timeout option
+%% on an IPv4 TCP (stream) socket with multiple acceptor processes 
+%% (three in this case).
+api_to_maccept_tcp4(suite) ->
+    [];
+api_to_maccept_tcp4(doc) ->
+    [];
+api_to_maccept_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(20)),
+    tc_try(api_to_maccept_tcp4,
+           fun() ->
+                   InitState = #{domain => inet, timeout => 5000},
+                   ok = api_to_maccept_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This test case is intended to test the accept timeout option
+%% on an IPv6 TCP (stream) socket.
+api_to_maccept_tcp6(suite) ->
+    [];
+api_to_maccept_tcp6(doc) ->
+    [];
+api_to_maccept_tcp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(20)),
+    tc_try(api_to_maccept_tcp4,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   InitState = #{domain => inet6, timeout => 5000},
+                   ok = api_to_maccept_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+api_to_maccept_tcp(InitState) ->
+    PrimAcceptorSeq =
+        [
+         %% *** Init part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{lsa => LSA}}
+                   end},
+         #{desc => "create (listen) socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, stream, tcp) of
+                               {ok, Sock} ->
+                                   {ok, State#{lsock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{lsock := LSock, lsa := LSA} = _State) ->
+                           case socket:bind(LSock, LSA) of
+                               {ok, _} ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "make listen socket",
+           cmd  => fun(#{lsock := LSock}) ->
+                           socket:listen(LSock)
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{lsock := LSock, tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, LSock),
+                           ok
+                   end},
+
+         %% *** The actual test ***
+         #{desc => "await continue (accept)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, accept)
+                   end},
+         #{desc => "attempt to accept (without success)",
+           cmd  => fun(#{lsock := LSock, timeout := To} = State) ->
+                           Start = t(),
+                           case socket:accept(LSock, To) of
+                               {error, timeout} ->
+                                   {ok, State#{start => Start, stop => t()}};
+                               {ok, Sock} ->
+                                   ?SEV_EPRINT("Unexpected accept success: "
+                                               "~n   ~p", [Sock]),
+                                   (catch socket:close(Sock)),
+                                   {error, unexpected_success};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "validate timeout time",
+           cmd  => fun(#{start := Start, stop := Stop, timeout := To} = _State) ->
+                           TDiff  = Stop - Start,
+                           if
+                               (TDiff >= To) ->
+                                   ok;
+                               true ->
+                                   {error, {unexpected_timeout, TDiff, To}}
+                           end
+                   end},
+         #{desc => "announce ready (accept)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, accept),
+                           ok
+                   end},
+
+         %% *** Terminate ***
+         #{desc => "await terminate",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_TERMINATE(Tester, tester),
+                           ok
+                   end},
+         %% *** Close (listen) socket ***
+         #{desc => "close (listen) socket",
+           cmd  => fun(#{lsock := LSock} = State) ->
+                           sock_close(LSock),
+                           {ok, maps:remove(lsock, State)}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+
+    SecAcceptorSeq =
+        [
+         %% *** Init part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           {Tester, LSock} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester,
+                                       lsock  => LSock}}
+                           
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init),
+                           ok
+                   end},
+
+         %% *** The actual test part ***
+         #{desc => "await continue (accept)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, accept)
+                   end},
+         #{desc => "attempt to accept (without success)",
+           cmd  => fun(#{lsock := LSock, timeout := To} = State) ->
+                           Start = t(),
+                           case socket:accept(LSock, To) of
+                               {error, timeout} ->
+                                   {ok, State#{start => Start, stop => t()}};
+                               {ok, Sock} ->
+                                   (catch socket:close(Sock)),
+                                   {error, unexpected_success};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "validate timeout time",
+           cmd  => fun(#{start := Start, stop := Stop, timeout := To} = State) ->
+                           TDiff  = Stop - Start,
+                           if
+                               (TDiff >= To) ->
+                                   State1 = maps:remove(start, State),
+                                   State2 = maps:remove(stop,  State1),
+                                   {ok, State2};
+                               true ->
+                                   {error, {unexpected_timeout, TDiff, To}}
+                           end
+                   end},
+         #{desc => "announce ready (accept)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_ANNOUNCE_READY(Tester, accept),
+                           ok
+                   end},
+
+         %% *** Terminate ***
+         #{desc => "await terminate",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+
+    TesterSeq =
+        [
+         %% Init part
+         #{desc => "monitor prim-acceptor",
+           cmd  => fun(#{prim_acceptor := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor sec-acceptor 1",
+           cmd  => fun(#{sec_acceptor1 := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor sec-acceptor 2",
+           cmd  => fun(#{sec_acceptor2 := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+
+
+         %% Start the prim-acceptor
+         #{desc => "start prim-acceptor",
+           cmd  => fun(#{prim_acceptor := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid),
+                           ok
+                   end},
+         #{desc => "await prim-acceptor ready (init)",
+           cmd  => fun(#{prim_acceptor := Pid} = State) ->
+                           {ok, Sock} = ?SEV_AWAIT_READY(Pid, prim_acceptor, init),
+                           {ok, State#{lsock => Sock}}
+                   end},
+
+         %% Start sec-acceptor-1
+         #{desc => "start sec-acceptor 1",
+           cmd  => fun(#{sec_acceptor1 := Pid, lsock := LSock} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, LSock),
+                           ok
+                   end},
+         #{desc => "await sec-acceptor 1 ready (init)",
+           cmd  => fun(#{sec_acceptor1 := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, sec_acceptor1, init)
+                   end},
+
+         %% Start sec-acceptor-2
+         #{desc => "start sec-acceptor 2",
+           cmd  => fun(#{sec_acceptor2 := Pid, lsock := LSock} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, LSock),
+                           ok
+                   end},
+         #{desc => "await sec-acceptor 2 ready (init)",
+           cmd  => fun(#{sec_acceptor2 := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, sec_acceptor2, init)
+                   end},
+
+         %% Activate the acceptor(s)
+         #{desc => "active prim-acceptor",
+           cmd  => fun(#{prim_acceptor := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, accept),
+                           ok
+                   end},
+         #{desc => "active sec-acceptor 1",
+           cmd  => fun(#{sec_acceptor1 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, accept),
+                           ok
+                   end},
+         #{desc => "active sec-acceptor 2",
+           cmd  => fun(#{sec_acceptor2 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, accept),
+                           ok
+                   end},
+
+         %% Await acceptor(s) completions
+         #{desc => "await prim-acceptor ready (accept)",
+           cmd  => fun(#{prim_acceptor := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, prim_acceptor, accept)
+                   end},
+         #{desc => "await sec-acceptor 1 ready (accept)",
+           cmd  => fun(#{sec_acceptor1 := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, sec_acceptor1, accept)
+                   end},
+         #{desc => "await sec-acceptor 2 ready (accept)",
+           cmd  => fun(#{sec_acceptor2 := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, sec_acceptor2, accept)
+                   end},
+
+         %% Terminate
+         #{desc => "order prim-acceptor to terminate",
+           cmd  => fun(#{prim_acceptor := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await prim-acceptor termination",
+           cmd  => fun(#{prim_acceptor := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(prim_acceptor, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order sec-acceptor 1 to terminate",
+           cmd  => fun(#{sec_acceptor1 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await sec-acceptor 1 termination",
+           cmd  => fun(#{sec_acceptor1 := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(sec_acceptor1, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order sec-acceptor 2 to terminate",
+           cmd  => fun(#{sec_acceptor2 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await sec-acceptor 2 termination",
+           cmd  => fun(#{sec_acceptor2 := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(sec_acceptor2, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    i("create prim-acceptor evaluator"),
+    PrimAInitState = InitState,
+    PrimAcceptor = ?SEV_START("prim-acceptor", PrimAcceptorSeq, PrimAInitState),
+
+    i("create sec-acceptor 1 evaluator"),
+    SecAInitState1 = maps:remove(domain, InitState),
+    SecAcceptor1 = ?SEV_START("sec-acceptor-1", SecAcceptorSeq, SecAInitState1),
+    
+    i("create sec-acceptor 2 evaluator"),
+    SecAInitState2 = SecAInitState1,
+    SecAcceptor2 = ?SEV_START("sec-acceptor-2", SecAcceptorSeq, SecAInitState2),
+
+    i("create tester evaluator"),
+    TesterInitState = #{prim_acceptor => PrimAcceptor#ev.pid,
+                        sec_acceptor1 => SecAcceptor1#ev.pid,
+                        sec_acceptor2 => SecAcceptor2#ev.pid},
+    Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    i("await evaluator(s)"),
+    ok = ?SEV_AWAIT_FINISH([PrimAcceptor, SecAcceptor1, SecAcceptor2, Tester]).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This test case is intended to test the send timeout option
+%% on an IPv4 TCP (stream) socket.
+api_to_send_tcp4(suite) ->
+    [];
+api_to_send_tcp4(doc) ->
+    [];
+api_to_send_tcp4(_Config) when is_list(_Config) ->
+    tc_try(api_to_send_tcp4,
+           fun() ->
+                   not_yet_implemented()%% ,
+                   %% ok = api_to_send_tcp(inet)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This test case is intended to test the send timeout option
+%% on an IPv6 TCP (stream) socket.
+api_to_send_tcp6(suite) ->
+    [];
+api_to_send_tcp6(doc) ->
+    [];
+api_to_send_tcp6(_Config) when is_list(_Config) ->
+    tc_try(api_to_send_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   not_yet_implemented()%% ,
+                   %% ok = api_to_send_tcp(inet6)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This test case is intended to test the sendto timeout option
+%% on an IPv4 UDP (dgram) socket.
+api_to_sendto_udp4(suite) ->
+    [];
+api_to_sendto_udp4(doc) ->
+    [];
+api_to_sendto_udp4(_Config) when is_list(_Config) ->
+    tc_try(api_to_sendto_udp4,
+           fun() ->
+                   not_yet_implemented()%% ,
+                   %% ok = api_to_sendto_to_udp(inet)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This test case is intended to test the sendto timeout option
+%% on an IPv6 UDP (dgram) socket.
+api_to_sendto_udp6(suite) ->
+    [];
+api_to_sendto_udp6(doc) ->
+    [];
+api_to_sendto_udp6(_Config) when is_list(_Config) ->
+    tc_try(api_to_sendto_udp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   not_yet_implemented()%% ,
+                   %% ok = api_to_sendto_to_udp(inet6)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This test case is intended to test the sendmsg timeout option
+%% on an IPv4 TCP (stream) socket.
+api_to_sendmsg_tcp4(suite) ->
+    [];
+api_to_sendmsg_tcp4(doc) ->
+    [];
+api_to_sendmsg_tcp4(_Config) when is_list(_Config) ->
+    tc_try(api_to_sendmsg_tcp4,
+           fun() ->
+                   not_yet_implemented()%% ,
+                   %% ok = api_to_sendmsg_tcp(inet)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This test case is intended to test the sendmsg timeout option
+%% on an IPv6 TCP (stream) socket.
+api_to_sendmsg_tcp6(suite) ->
+    [];
+api_to_sendmsg_tcp6(doc) ->
+    [];
+api_to_sendmsg_tcp6(_Config) when is_list(_Config) ->
+    tc_try(api_to_sendmsg_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   not_yet_implemented()%% ,
+                   %% ok = api_to_sendmsg_tcp(inet6)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This test case is intended to test the recv timeout option
+%% on an IPv4 UDP (dgram) socket. To test this we must connect
+%% the socket.
+api_to_recv_udp4(suite) ->
+    [];
+api_to_recv_udp4(doc) ->
+    [];
+api_to_recv_udp4(_Config) when is_list(_Config) ->
+    tc_try(api_to_recv_udp4,
+           fun() ->
+                   not_yet_implemented()%%,
+                   %%ok = api_to_recv_udp(inet)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This test case is intended to test the recv timeout option
+%% on an IPv6 UDP (dgram) socket. To test this we must connect
+%% the socket.
+api_to_recv_udp6(suite) ->
+    [];
+api_to_recv_udp6(doc) ->
+    [];
+api_to_recv_udp6(_Config) when is_list(_Config) ->
+    tc_try(api_to_recv_udp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   not_yet_implemented()%% ,
+                   %% ok = api_to_recv_udp(inet6)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This test case is intended to test the recv timeout option
+%% on an IPv4 TCP (stream) socket.
+api_to_recv_tcp4(suite) ->
+    [];
+api_to_recv_tcp4(doc) ->
+    [];
+api_to_recv_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_to_recv_tcp4,
+           fun() ->
+                   Recv = fun(Sock, To) -> socket:recv(Sock, 0, To) end,
+                   InitState = #{domain  => inet,
+                                 recv    => Recv,
+                                 timeout => 2000},
+                   ok = api_to_receive_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This test case is intended to test the recv timeout option
+%% on an IPv6 TCP (stream) socket.
+api_to_recv_tcp6(suite) ->
+    [];
+api_to_recv_tcp6(doc) ->
+    [];
+api_to_recv_tcp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_to_recv_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   case socket:supports(ipv6) of
+                       true ->
+                           Recv = fun(Sock, To) -> 
+                                          socket:recv(Sock, 0, To)
+                                  end,
+                           InitState = #{domain  => inet6,
+                                         recv    => Recv,
+                                         timeout => 2000},
+                           ok = api_to_receive_tcp(InitState);
+                       false ->
+                           skip("ipv6 not supported")
+                   end
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+api_to_receive_tcp(InitState) ->
+    process_flag(trap_exit, true),
+
+    ServerSeq = 
+        [
+         %% *** Wait for start order ***
+         #{desc => "await start (from tester)",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester}) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{local_sa => LSA}}
+                   end},
+         #{desc => "create listen socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, stream, tcp) of
+                               {ok, Sock} ->
+                                   {ok, State#{lsock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{lsock := LSock, local_sa := LSA} = State) ->
+                           case socket:bind(LSock, LSA) of
+                               {ok, Port} ->
+                                   {ok, State#{lport => Port}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "make listen socket (with backlog = 1)",
+           cmd  => fun(#{lsock := LSock}) ->
+                           socket:listen(LSock, 1)
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester, lport := Port}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, Port),
+                           ok
+                   end},
+
+         %% *** The actual test ***
+         #{desc => "await continue (accept and recv)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, accept_recv)
+                   end},
+         #{desc => "attempt accept",
+           cmd  => fun(#{lsock := LSock} = State) ->
+                           case socket:accept(LSock) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "attempt to recv (without success)",
+           cmd  => fun(#{sock := Sock, recv := Recv, timeout := To} = State) ->
+                           Start = t(),
+                           case Recv(Sock, To) of
+                               {error, timeout} ->
+                                   {ok, State#{start => Start, stop => t()}};
+                               {ok, _Data} ->
+                                   {error, unexpected_success};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "validate timeout time",
+           cmd  => fun(#{start := Start, stop := Stop, timeout := To} = State) ->
+                           TDiff  = Stop - Start,
+                           if
+                               (TDiff >= To) ->
+                                   State1 = maps:remove(start, State),
+                                   State2 = maps:remove(stop,  State1),
+                                   {ok, State2};
+                               true ->
+                                   {error, {unexpected_timeout, TDiff, To}}
+                           end
+                   end},
+         #{desc => "announce ready (recv timeout success)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_ANNOUNCE_READY(Tester, accept_recv),
+                           ok
+                   end},
+
+         %% *** Termination ***
+         #{desc => "await terminate",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close (traffic) socket",
+           cmd  => fun(#{sock := Sock} = State) ->
+                           sock_close(Sock),
+                           {ok, maps:remove(sock, State)}
+                   end},
+         #{desc => "close (listen) socket",
+           cmd  => fun(#{lsock := LSock} = State) ->
+                           sock_close(LSock),
+                           {ok, maps:remove(lsock, State)}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    ClientSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start (from tester)",
+           cmd  => fun(State) ->
+                           {Tester, Port} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester      => Tester,
+                                       server_port => Port}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain, server_port := Port} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           SSA = LSA#{port => Port},
+                           {ok, State#{local_sa => LSA, server_sa => SSA}}
+                   end},
+         #{desc => "create socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, stream, tcp) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{sock := Sock, local_sa := LSA} = _State) ->
+                           case socket:bind(Sock, LSA) of
+                               {ok, _} ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init),
+                           ok
+                   end},
+
+         %% *** The actual test ***
+         #{desc => "await continue (with connect)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, connect)
+                   end},
+         #{desc => "connect",
+           cmd  => fun(#{sock := Sock, server_sa := SSA}) ->
+                           sock_connect(Sock, SSA),
+                           ok
+                   end},
+
+         %% *** Termination ***
+         #{desc => "await terminate",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close socket",
+           cmd  => fun(#{sock := Sock} = State) ->
+                           sock_close(Sock),
+                           {ok, maps:remove(sock, State)}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "monitor server",
+           cmd  => fun(#{server := Server} = _State) ->
+                           _MRef = erlang:monitor(process, Server),
+                           ok
+                   end},
+         #{desc => "monitor client",
+           cmd  => fun(#{client := Client} = _State) ->
+                           _MRef = erlang:monitor(process, Client),
+                           ok
+                   end},
+
+         %% *** Activate server ***
+         #{desc => "start server",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_START(Server),
+                           ok
+                   end},
+         #{desc => "await server ready (init)",
+           cmd  => fun(#{server := Server} = State) ->
+                           {ok, Port} = ?SEV_AWAIT_READY(Server, server, init),
+                           {ok, State#{server_port => Port}}
+                   end},
+         #{desc => "order server to continue (with accept)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Server, accept_recv),
+                           ok
+                   end},
+
+         %% *** Activate client ***
+         #{desc => "start client",
+           cmd  => fun(#{client := Client, server_port := Port} = _State) ->
+                           ?SEV_ANNOUNCE_START(Client, Port),
+                           ok
+                   end},
+         #{desc => "await client ready (init)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, init)
+                   end},
+
+         %% *** The actual test ***
+         #{desc => "order client to continue (with connect)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, connect),
+                           ok
+                   end},
+         #{desc => "await server ready (accept/recv)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, accept_recv)
+                   end},
+
+         %% *** Termination ***
+         #{desc => "order client to terminate",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Client),
+                           ok
+                   end},
+         #{desc => "await client termination",
+           cmd  => fun(#{client := Client} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Client) of
+                               ok ->
+                                   State1 = maps:remove(client, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order server to terminate",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Server),
+                           ok
+                   end},
+         #{desc => "await server termination",
+           cmd  => fun(#{server := Server} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Server) of
+                               ok ->
+                                   State1 = maps:remove(server, State),
+                                   State2 = maps:remove(server_port, State1),
+                                   {ok, State2};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    
+    i("start server evaluator"),
+    ServerInitState = InitState,
+    Server = ?SEV_START("server", ServerSeq, ServerInitState),
+
+    i("start client evaluator"),
+    ClientInitState = InitState,
+    Client = ?SEV_START("client", ClientSeq, ClientInitState),
+
+    i("start tester evaluator"),
+    TesterInitState = #{server => Server#ev.pid, 
+                        client => Client#ev.pid},
+    Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    i("await evaluator(s)"),
+    ok = ?SEV_AWAIT_FINISH([Server, Client, Tester]).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This test case is intended to test the recvfrom timeout option
+%% on an IPv4 UDP (dgram) socket.
+api_to_recvfrom_udp4(suite) ->
+    [];
+api_to_recvfrom_udp4(doc) ->
+    [];
+api_to_recvfrom_udp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_to_recvfrom_udp4,
+           fun() ->
+                   Recv = fun(Sock, To) -> socket:recvfrom(Sock, 0, To) end,
+                   InitState = #{domain  => inet,
+                                 recv    => Recv,
+                                 timeout => 2000},
+                   ok = api_to_receive_udp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This test case is intended to test the recvfrom timeout option
+%% on an IPv6 UDP (dgram) socket.
+api_to_recvfrom_udp6(suite) ->
+    [];
+api_to_recvfrom_udp6(doc) ->
+    [];
+api_to_recvfrom_udp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_to_recvfrom_udp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   Recv = fun(Sock, To) -> socket:recvfrom(Sock, 0, To) end,
+                   InitState = #{domain  => inet6,
+                                 recv    => Recv,
+                                 timeout => 2000},
+                   ok = api_to_receive_udp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+api_to_receive_udp(InitState) ->
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{lsa => LSA}}
+                   end},
+         #{desc => "create socket",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           case socket:open(Domain, dgram, udp) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{sock := Sock, lsa := LSA} = _State) ->
+                           case socket:bind(Sock, LSA) of
+                               {ok, _Port} ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% *** The actual test ***
+         #{desc => "attempt to read (without success)",
+           cmd  => fun(#{sock := Sock, recv := Recv, timeout := To} = State) ->
+                           Start = t(),
+                           case Recv(Sock, To) of
+                               {error, timeout} ->
+                                   {ok, State#{start => Start,
+                                               stop => t()}};
+                               {ok, _} ->
+                                   {error, unexpected_sucsess};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "validate timeout time",
+           cmd  => fun(#{start := Start, stop := Stop, timeout := To} = _State) ->
+                           TDiff  = Stop - Start,
+                           if
+                               (TDiff >= To) ->
+                                   ok;
+                               true ->
+                                   {error, {unexpected_timeout, TDiff, To}}
+                           end
+                   end},
+         
+         %% *** Termination ***
+         #{desc => "close socket",
+           cmd  => fun(#{sock := Sock} = _State) ->
+                           %% socket:setopt(Sock, otp, debug, true),
+                           sock_close(Sock),
+                           ok
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    i("start tester evaluator"),
+    Tester = ?SEV_START("tester", TesterSeq, InitState),
+    
+    i("await evaluator"),
+    ok = ?SEV_AWAIT_FINISH([Tester]).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This test case is intended to test the recvmsg timeout option
+%% on an IPv4 UDP (dgram) socket.
+api_to_recvmsg_udp4(suite) ->
+    [];
+api_to_recvmsg_udp4(doc) ->
+    [];
+api_to_recvmsg_udp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_to_recvmsg_udp4,
+           fun() ->
+                   Recv = fun(Sock, To) -> socket:recvmsg(Sock, To) end,
+                   InitState = #{domain  => inet,
+                                 recv    => Recv,
+                                 timeout => 2000},
+                   ok = api_to_receive_udp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This test case is intended to test the recvmsg timeout option
+%% on an IPv6 UDP (dgram) socket.
+api_to_recvmsg_udp6(suite) ->
+    [];
+api_to_recvmsg_udp6(doc) ->
+    [];
+api_to_recvmsg_udp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_to_recvmsg_udp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   Recv = fun(Sock, To) -> socket:recvmsg(Sock, To) end,
+                   InitState = #{domain  => inet6,
+                                 recv    => Recv,
+                                 timeout => 2000},
+                   ok = api_to_receive_udp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This test case is intended to test the recvmsg timeout option
+%% on an IPv4 TCP (stream) socket.
+api_to_recvmsg_tcp4(suite) ->
+    [];
+api_to_recvmsg_tcp4(doc) ->
+    [];
+api_to_recvmsg_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_to_recvmsg_tcp4,
+           fun() ->
+                   Recv = fun(Sock, To) -> socket:recvmsg(Sock, To) end,
+                   InitState = #{domain  => inet,
+                                 recv    => Recv,
+                                 timeout => 2000},
+                   ok = api_to_receive_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This test case is intended to test the recvmsg timeout option
+%% on an IPv6 TCP (stream) socket.
+api_to_recvmsg_tcp6(suite) ->
+    [];
+api_to_recvmsg_tcp6(doc) ->
+    [];
+api_to_recvmsg_tcp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(api_to_recvmsg_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   Recv = fun(Sock, To) -> socket:recvmsg(Sock, To) end,
+                   InitState = #{domain  => inet6,
+                                 recv    => Recv,
+                                 timeout => 2000},
+                   ok = api_to_receive_tcp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                                     %%
+%%                         SOCKET CLOSURE                              %%
+%%                                                                     %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sockets are cleaned up
+%% ("removed") when the controlling process terminates (without explicitly 
+%% calling the close function). For a IPv4 TCP (stream) socket.
+
+sc_cpe_socket_cleanup_tcp4(suite) ->
+    [];
+sc_cpe_socket_cleanup_tcp4(doc) ->
+    [];
+sc_cpe_socket_cleanup_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(sc_cpe_socket_cleanup_tcp4,
+           fun() ->
+                   InitState = #{domain   => inet,
+                                 type     => stream,
+                                 protocol => tcp},
+                   ok = sc_cpe_socket_cleanup(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sockets are cleaned up
+%% ("removed") when the controlling process terminates (without explicitly 
+%% calling the close function). For a IPv6 TCP (stream) socket.
+
+sc_cpe_socket_cleanup_tcp6(suite) ->
+    [];
+sc_cpe_socket_cleanup_tcp6(doc) ->
+    [];
+sc_cpe_socket_cleanup_tcp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(sc_cpe_socket_cleanup_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   InitState = #{domain   => inet6,
+                                 type     => stream,
+                                 protocol => tcp},
+                   ok = sc_cpe_socket_cleanup(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sockets are cleaned up
+%% ("removed") when the controlling process terminates (without explicitly 
+%% calling the close function). For a Unix Domain (stream) socket (TCP).
+
+sc_cpe_socket_cleanup_tcpL(suite) ->
+    [];
+sc_cpe_socket_cleanup_tcpL(doc) ->
+    [];
+sc_cpe_socket_cleanup_tcpL(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(sc_cpe_socket_cleanup_tcpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   InitState = #{domain   => local,
+                                 type     => stream,
+                                 protocol => default},
+                   ok = sc_cpe_socket_cleanup(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sockets are cleaned up
+%% ("removed") when the controlling process terminates (without explicitly 
+%% calling the close function). For a IPv4 UDP (dgram) socket.
+
+sc_cpe_socket_cleanup_udp4(suite) ->
+    [];
+sc_cpe_socket_cleanup_udp4(doc) ->
+    [];
+sc_cpe_socket_cleanup_udp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(sc_cpe_socket_cleanup_udp4,
+           fun() ->
+                   InitState = #{domain   => inet,
+                                 type     => dgram,
+                                 protocol => udp},
+                   ok = sc_cpe_socket_cleanup(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sockets are cleaned up
+%% (removed) when the controlling process terminates (without explicitly 
+%% calling the close function). For a IPv6 UDP (dgram) socket.
+
+sc_cpe_socket_cleanup_udp6(suite) ->
+    [];
+sc_cpe_socket_cleanup_udp6(doc) ->
+    [];
+sc_cpe_socket_cleanup_udp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(sc_cpe_socket_cleanup_udp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   InitState = #{domain   => inet6,
+                                 type     => dgram,
+                                 protocol => udp},
+                   ok = sc_cpe_socket_cleanup(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sockets are cleaned up
+%% ("removed") when the controlling process terminates (without explicitly 
+%% calling the close function). For a Unix Domain (dgram) socket (UDP).
+
+sc_cpe_socket_cleanup_udpL(suite) ->
+    [];
+sc_cpe_socket_cleanup_udpL(doc) ->
+    [];
+sc_cpe_socket_cleanup_udpL(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(sc_cpe_socket_cleanup_udpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   InitState = #{domain   => local,
+                                 type     => dgram,
+                                 protocol => default},
+                   ok = sc_cpe_socket_cleanup(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+sc_cpe_socket_cleanup(InitState) ->
+    OwnerSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start (from tester)",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "create socket",
+           cmd  => fun(#{domain   := Domain, 
+                         type     := Type, 
+                         protocol := Proto} = State) ->
+                           case socket:open(Domain, Type, Proto) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester, sock := Sock} = _State) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, Sock),
+                           ok
+                   end},
+
+         %% *** The actual test ***
+         %% We *intentially* leave the socket "as is", no explicit close
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "monitor owner",
+           cmd  => fun(#{owner := Owner} = _State) ->
+                           _MRef = erlang:monitor(process, Owner),
+                           ok
+                   end},
+         #{desc => "order (owner) start",
+           cmd  => fun(#{owner := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid),
+                           ok
+                   end},
+         #{desc => "await (owner) ready",
+           cmd  => fun(#{owner := Pid} = State) ->
+                           {ok, Sock} = ?SEV_AWAIT_READY(Pid, owner, init),
+                           {ok, State#{sock => Sock}}
+                   end},
+         #{desc => "verify owner as controlling-process",
+           cmd  => fun(#{owner := Pid, sock := Sock} = _State) ->
+                           case socket:getopt(Sock, otp, controlling_process) of
+                               {ok, Pid} ->
+                                   ok;
+                               {ok, Other} ->
+                                   {error, {unexpected_owner, Other}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order (owner) terminate",
+           cmd  => fun(#{owner := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await (owner) termination",
+           cmd  => fun(#{owner := Pid} = _State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         ?SEV_SLEEP(?SECS(5)),
+
+         %% The reason we get closed, is that as long as there is a ref to 
+         %% the resource (socket), then it will not be garbage collected.
+         %% Note that its still a race that the nif has processed that the
+         %% "controlling process" has terminated. There really is no 
+         %% proper timeout for this, but the 5 seconds "should" be enough...
+         %% We should really have some way to subscribe to socket events...
+         #{desc => "verify no socket (closed)",
+           cmd  => fun(#{owner := Pid, sock := Sock} = _State) ->
+                           case socket:getopt(Sock, otp, controlling_process) of
+                               {ok, OtherPid} ->
+                                   {error, {unexpected_success, Pid, OtherPid}};
+                               {error, closed} ->
+                                   ok;
+                               {error, Reason} ->
+                                   ?SEV_IPRINT("expected failure: ~p", [Reason]),
+                                   {error, {unexpected_failure, Reason}}
+                           end
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    i("start (socket) owner evaluator"),
+    Owner = ?SEV_START("owner", OwnerSeq, InitState),
+
+    i("start tester evaluator"),
+    TesterInitState = #{owner => Owner#ev.pid},
+    Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    i("await evaluator"),
+    ok = ?SEV_AWAIT_FINISH([Owner, Tester]).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is 
+%% locally closed while a process is calling the recv function.
+%% Socket is IPv4.
+%% 
+%% <KOLLA>
+%% 
+%% We should really have a similar test cases for when the controlling
+%% process exits and there are other processes in recv, accept, and 
+%% all the other functions.
+%% 
+%% </KOLLA>
+
+sc_lc_recv_response_tcp4(suite) ->
+    [];
+sc_lc_recv_response_tcp4(doc) ->
+    [];
+sc_lc_recv_response_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(sc_lc_recv_response_tcp4,
+           fun() ->
+                   Recv      = fun(Sock) -> socket:recv(Sock) end,
+                   InitState = #{domain   => inet,
+                                 protocol => tcp,
+                                 recv     => Recv},
+                   ok = sc_lc_receive_response_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is 
+%% locally closed while the process is calling the recv function.
+%% Socket is IPv6.
+
+sc_lc_recv_response_tcp6(suite) ->
+    [];
+sc_lc_recv_response_tcp6(doc) ->
+    [];
+sc_lc_recv_response_tcp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(sc_lc_recv_response_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   Recv      = fun(Sock) -> socket:recv(Sock) end,
+                   InitState = #{domain   => inet6,
+                                 protocol => tcp,
+                                 recv     => Recv},
+                   ok = sc_lc_receive_response_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is 
+%% locally closed while the process is calling the recv function.
+%% Socket is Unix Domain (stream) socket.
+
+sc_lc_recv_response_tcpL(suite) ->
+    [];
+sc_lc_recv_response_tcpL(doc) ->
+    [];
+sc_lc_recv_response_tcpL(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(sc_lc_recv_response_tcpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   Recv      = fun(Sock) -> socket:recv(Sock) end,
+                   InitState = #{domain   => local,
+                                 protocol => default,
+                                 recv     => Recv},
+                   ok = sc_lc_receive_response_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+sc_lc_receive_response_tcp(InitState) ->
+    %% This (acceptor) is the server that accepts connections.
+    %% But it is also suppose to close the connection socket, 
+    %% and trigger the read failure (=closed) for the handler process.
+    AcceptorSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start (from tester)",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{lsa => LSA}}
+                   end},
+         #{desc => "create (listen) socket",
+           cmd  => fun(#{domain   := Domain, 
+                         protocol := Proto} = State) ->
+                           case socket:open(Domain, stream, Proto) of
+                               {ok, Sock} ->
+                                   {ok, State#{lsock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{domain := local,
+                         lsock  := LSock,
+                         lsa    := LSA} = _State) ->
+                           ?SEV_IPRINT("bind to LSA: "
+                                       "~n   ~p", [LSA]),
+                           case socket:bind(LSock, LSA) of
+                               {ok, _Port} ->
+                                   ok; % We do not care about the port for local
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end;
+                      (#{lsock := LSock,
+                         lsa   := LSA} = State) ->
+                           case socket:bind(LSock, LSA) of
+                               {ok, Port} ->
+                                   ?SEV_IPRINT("bound to port: ~w", [Port]),
+                                   {ok, State#{lport => Port}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "make listen socket",
+           cmd  => fun(#{lsock := LSock}) ->
+                           socket:listen(LSock)
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{domain := local,
+                         tester := Tester,
+                         lsa    := #{path := Path}}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, Path),
+                           ok;
+                      (#{tester := Tester, lport := Port}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, Port),
+                           ok
+                   end},
+                           
+         %% The actual test
+         #{desc => "await continue (accept)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_CONTINUE(Tester, tester, accept) of
+                               {ok, {H1, H2, H3}} ->
+                                   {ok, State#{handler1 => H1,
+                                               handler2 => H2,
+                                               handler3 => H3}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "await accept",
+           cmd  => fun(#{lsock := LSock} = State) ->
+                           case socket:accept(LSock) of
+                               {ok, Sock} ->
+                                   ?SEV_IPRINT("connection accepted: "
+                                               "~n   ~p", [socket:sockname(Sock)]),
+                                   {ok, State#{csock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (accept)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, accept),
+                           ok
+                   end},
+         #{desc => "transfer connection to handler 1",
+           cmd  => fun(#{handler1 := Handler, csock := Sock}) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Handler, transfer, Sock),
+                           ok
+                   end},
+         #{desc => "transfer connection to handler 2",
+           cmd  => fun(#{handler2 := Handler, csock := Sock}) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Handler, transfer, Sock),
+                           ok
+                   end},
+         #{desc => "transfer connection to handler 3",
+           cmd  => fun(#{handler3 := Handler, csock := Sock}) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Handler, transfer, Sock),
+                           ok
+                   end},
+         #{desc => "await continue (close)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, close),
+                           ok
+                   end},
+         #{desc => "close connection socket",
+           cmd  => fun(#{csock := Sock} = State) ->
+                           case socket:close(Sock) of
+                               ok ->
+                                   {ok, maps:remove(csock, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (close)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, close),
+                           ok
+                   end},
+
+         %% *** Terminate ***
+         #{desc => "await terminate",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close listen socket",
+           cmd  => fun(#{domain := local,
+                         lsock  := Sock,
+                         lsa    := #{path := Path}} = State) ->
+                           ok = socket:close(Sock),
+                           State1 =
+                               unlink_path(Path,
+                                           fun() ->maps:remove(lsa, State) end,
+                                           fun() -> State end),
+                           State2 = maps:remove(lsock, State1),
+                           State3 = maps:remove(lport, State2),
+                           {ok, State3};
+                      (#{lsock := Sock} = State) ->
+                           case socket:close(Sock) of
+                               ok ->
+                                   State1 = maps:remove(lsock, State),
+                                   State2 = maps:remove(lport, State1),
+                                   {ok, State2};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    %% The point of this is to perform the recv for which
+    %% we are testing the reponse.
+    HandlerSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start (from tester)",
+           cmd  => fun(State) ->
+                           {Tester, Acceptor} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester  => Tester, 
+                                      acceptor => Acceptor}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+         #{desc => "monitor acceptor",
+           cmd  => fun(#{acceptor := Acceptor} = _State) ->
+                           _MRef = erlang:monitor(process, Acceptor),
+                           ok
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (transfer)",
+           cmd  => fun(#{acceptor := Pid} = State) ->
+                           case ?SEV_AWAIT_CONTINUE(Pid, acceptor, transfer) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (transfer)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, transfer),
+                           ok
+                   end},
+         #{desc => "attempt recv (=> closed)",
+           cmd  => fun(#{sock := Sock, recv := Recv} = State) ->
+                           %% ok = socket:setopt(Sock, otp, debug, true),
+                           case Recv(Sock) of
+                               {ok, _Data} ->
+                                   ?SEV_EPRINT("Unexpected data received"),
+                                   {error, unexpected_success};
+                               {error, closed} ->
+                                   ?SEV_IPRINT("received expected 'closed' "
+                                               "result"),
+                                   State1 = maps:remove(sock, State),
+                                   {ok, State1};
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("Unexpected read failure: "
+                                               "~n   ~p", [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv closed)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_closed),
+                           ok
+                   end},
+
+         %% *** Terminate ***
+         #{desc => "await terminate",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    %% The point of this is basically just to create the connection.
+    ClientSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start (from tester)",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{local_sa => LSA}}
+                   end},
+         #{desc => "create socket",
+           cmd  => fun(#{domain   := Domain, 
+                         protocol := Proto} = State) ->
+                           case socket:open(Domain, stream, Proto) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind socket to local address",
+           cmd  => fun(#{sock := Sock, local_sa := LSA} = _State) ->
+                           ?SEV_IPRINT("bind to LSA: "
+                                       "~n   ~p", [LSA]),
+                           case socket:bind(Sock, LSA) of
+                               {ok, _} ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (connect)",
+           cmd  => fun(#{domain := local = Domain,
+                         tester := Tester} = State) ->
+                           case ?SEV_AWAIT_CONTINUE(Tester, tester, connect) of
+                               {ok, ServerPath} ->
+                                   ?SEV_IPRINT("Server Path: "
+                                               "~n   ~s", [ServerPath]),
+                                   ServerSA = #{family => Domain,
+                                                path   => ServerPath},
+                                   {ok, State#{server_sa => ServerSA}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end;
+                      (#{tester := Tester, local_sa := LSA} = State) ->
+                           case ?SEV_AWAIT_CONTINUE(Tester, tester, connect) of
+                               {ok, Port} ->
+                                   ServerSA = LSA#{port => Port},
+                                   {ok, State#{server_sa => ServerSA}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "connect to server",
+           cmd  => fun(#{sock := Sock, server_sa := ServerSA}) ->
+                           socket:connect(Sock, ServerSA)
+                   end},
+         #{desc => "announce ready (connect)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_ANNOUNCE_READY(Tester, connect),
+                           ok
+                   end},
+
+         %% *** Terminate ***
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end                           
+                   end},
+         #{desc => "close socket",
+           cmd  => fun(#{domain   := local,
+                         sock     := Sock,
+                         local_sa := #{path := Path}} = State) ->
+                           sock_close(Sock),
+                           State1 =
+                               unlink_path(Path,
+                                           fun() ->
+                                                   maps:remove(local_sa, State)
+                                           end,
+                                           fun() -> State end),
+                           {ok, maps:remove(sock, State1)};
+                       (#{sock := Sock} = State) ->
+                           sock_close(Sock),
+                           {ok, maps:remove(sock, State)}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "monitor acceptor",
+           cmd  => fun(#{acceptor := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor handler 1",
+           cmd  => fun(#{handler1 := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor handler 2",
+           cmd  => fun(#{handler2 := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor handler 3",
+           cmd  => fun(#{handler3 := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor client",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+
+         %% Start the acceptor
+         #{desc => "order acceptor start",
+           cmd  => fun(#{acceptor := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid),
+                           ok
+                   end},
+         #{desc => "await acceptor ready (init)",
+           cmd  => fun(#{acceptor := Pid} = State) ->
+                           case ?SEV_AWAIT_READY(Pid, acceptor, init) of
+                               {ok, PortOrPath} ->
+                                   {ok, State#{server_info => PortOrPath}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% Start the handler(s)
+         #{desc => "order handler 1 start",
+           cmd  => fun(#{acceptor := Acceptor, handler1 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, Acceptor),
+                           ok
+                   end},
+         #{desc => "await handler 1 ready (init)",
+           cmd  => fun(#{handler1 := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, handler1, init)
+                   end},
+         #{desc => "order handler 2 start",
+           cmd  => fun(#{acceptor := Acceptor, handler2 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, Acceptor),
+                           ok
+                   end},
+         #{desc => "await handler 2 ready (init)",
+           cmd  => fun(#{handler2 := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, handler2, init)
+                   end},
+         #{desc => "order handler 3 start",
+           cmd  => fun(#{acceptor := Acceptor, handler3 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, Acceptor),
+                           ok
+                   end},
+         #{desc => "await handler 3 ready (init)",
+           cmd  => fun(#{handler3 := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, handler3, init)
+                   end},
+
+         %% Start the client
+         #{desc => "order client start",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid),
+                           ok
+                   end},
+         #{desc => "await client ready (init)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, client, init)
+                   end},
+
+         %% The actual test
+         #{desc => "order acceptor to continue (accept)",
+           cmd  => fun(#{acceptor := Pid, 
+                         handler1 := H1, 
+                         handler2 := H2, 
+                         handler3 := H3} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, accept, {H1, H2, H3}),
+                           ok
+                   end},
+         ?SEV_SLEEP(?SECS(1)),
+         #{desc => "order client to continue (connect)",
+           cmd  => fun(#{client := Pid, server_info := Info} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, connect, Info),
+                           ok
+                   end},
+         #{desc => "await acceptor ready (accept)",
+           cmd  => fun(#{acceptor := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, acceptor, accept)
+                   end},
+         #{desc => "await client ready (connect)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, client, connect)
+                   end},
+         #{desc => "await handler 1 ready (transfer)",
+           cmd  => fun(#{handler1 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, handler1, transfer)
+                   end},
+         #{desc => "await handler 2 ready (transfer)",
+           cmd  => fun(#{handler2 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, handler2, transfer)
+                   end},
+         #{desc => "await handler 3 ready (transfer)",
+           cmd  => fun(#{handler3 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, handler3, transfer)
+                   end},
+         ?SEV_SLEEP(?SECS(1)),
+         #{desc => "order acceptor to continue (close connection socket)",
+           cmd  => fun(#{acceptor := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, close),
+                           ok
+                   end},
+         #{desc => "await acceptor ready (close)",
+           cmd  => fun(#{acceptor := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, acceptor, close)
+                   end},
+         #{desc => "await handler 1 ready (recv closed)",
+           cmd  => fun(#{handler1 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, handler1, recv_closed)
+                   end},
+         #{desc => "await handler 2 ready (recv closed)",
+           cmd  => fun(#{handler2 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, handler2, recv_closed)
+                   end},
+         #{desc => "await handler 3 ready (recv closed)",
+           cmd  => fun(#{handler3 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, handler3, recv_closed)
+                   end},
+
+         %% Terminations
+         #{desc => "order client to terminate",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await client termination",
+           cmd  => fun(#{client := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   {ok, maps:remove(client, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order handler 1 to terminate",
+           cmd  => fun(#{handler1 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await handler 1 termination",
+           cmd  => fun(#{handler1 := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   {ok, maps:remove(handler1, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order handler 2 to terminate",
+           cmd  => fun(#{handler2 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await handler 2 termination",
+           cmd  => fun(#{handler2 := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   {ok, maps:remove(handler2, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order handler 3 to terminate",
+           cmd  => fun(#{handler3 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await handler 3 termination",
+           cmd  => fun(#{handler3 := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   {ok, maps:remove(handler3, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order acceptor to terminate",
+           cmd  => fun(#{acceptor := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await acceptor termination",
+           cmd  => fun(#{acceptor := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   {ok, maps:remove(acceptor, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    i("start acceptor evaluator"),
+    AccInitState = InitState,
+    Acceptor = ?SEV_START("acceptor", AcceptorSeq, AccInitState),
+
+    i("start handler 1 evaluator"),
+    HandlerInitState = #{recv => maps:get(recv, InitState)},
+    Handler1 = ?SEV_START("handler-1", HandlerSeq, HandlerInitState),
+
+    i("start handler 2 evaluator"),
+    Handler2 = ?SEV_START("handler-2", HandlerSeq, HandlerInitState),
+
+    i("start handler 3 evaluator"),
+    Handler3 = ?SEV_START("handler-3", HandlerSeq, HandlerInitState),
+
+    i("start client evaluator"),
+    ClientInitState = InitState,
+    Client = ?SEV_START("client", ClientSeq, ClientInitState),
+
+    i("start tester evaluator"),
+    TesterInitState = #{acceptor => Acceptor#ev.pid,
+                        handler1 => Handler1#ev.pid,
+                        handler2 => Handler2#ev.pid,
+                        handler3 => Handler3#ev.pid,
+                        client   => Client#ev.pid},
+    Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    i("await evaluator"),
+    ok = ?SEV_AWAIT_FINISH([Acceptor, 
+                            Handler1, Handler2, Handler3, 
+                            Client, Tester]).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is 
+%% locally closed while a process is calling the recvfrom function.
+%% Socket is IPv4.
+%% 
+
+sc_lc_recvfrom_response_udp4(suite) ->
+    [];
+sc_lc_recvfrom_response_udp4(doc) ->
+    [];
+sc_lc_recvfrom_response_udp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(sc_lc_recvfrom_response_udp4,
+           fun() ->
+                   Recv      = fun(Sock, To) -> socket:recvfrom(Sock, [], To) end,
+                   InitState = #{domain   => inet,
+                                 protocol => udp,
+                                 recv     => Recv},
+                   ok = sc_lc_receive_response_udp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is 
+%% locally closed while the process is calling the recv function.
+%% Socket is IPv6.
+
+sc_lc_recvfrom_response_udp6(suite) ->
+    [];
+sc_lc_recvfrom_response_udp6(doc) ->
+    [];
+sc_lc_recvfrom_response_udp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(sc_lc_recvfrom_response_udp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   Recv      = fun(Sock, To) -> socket:recvfrom(Sock, [], To) end,
+                   InitState = #{domain   => inet6,
+                                 protocol => udp,
+                                 recv     => Recv},
+                   ok = sc_lc_receive_response_udp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is 
+%% locally closed while the process is calling the recv function.
+%% Socket is Unix Domainm (dgram) socket.
+
+sc_lc_recvfrom_response_udpL(suite) ->
+    [];
+sc_lc_recvfrom_response_udpL(doc) ->
+    [];
+sc_lc_recvfrom_response_udpL(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(sc_lc_recvfrom_response_udpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   Recv      = fun(Sock, To) -> socket:recvfrom(Sock, [], To) end,
+                   InitState = #{domain   => local,
+                                 protocol => default,
+                                 recv     => Recv},
+                   ok = sc_lc_receive_response_udp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+sc_lc_receive_response_udp(InitState) ->
+    PrimServerSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{local_sa => LSA}}
+                   end},
+         #{desc => "open socket",
+           cmd  => fun(#{domain := Domain, protocol := Proto} = State) ->
+                           Sock = sock_open(Domain, dgram, Proto),
+                           SA   = sock_sockname(Sock),
+                           {ok, State#{sock => Sock, sa => SA}}
+                   end},
+         #{desc => "bind socket",
+           cmd  => fun(#{sock := Sock, local_sa := LSA}) ->
+                           case socket:bind(Sock, LSA) of
+                               {ok, _Port} ->
+                                   ?SEV_IPRINT("src bound"),
+                                   ok;
+                               {error, Reason} = ERROR ->
+                                   ?SEV_EPRINT("src bind failed: ~p", [Reason]),
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester, sock := Sock}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, Sock),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (recv, with timeout)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_CONTINUE(Tester, tester, recv) of
+                               {ok, Timeout} ->
+                                   {ok, State#{timeout => Timeout}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "receive, with timeout",
+           cmd  => fun(#{sock := Sock, recv := Recv, timeout := Timeout}) ->
+                           case Recv(Sock, Timeout) of
+                               {error, timeout} ->
+                                   ok;
+                               {ok, _} ->
+                                   {error, unexpected_success};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv, with timeout)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv),
+                           ok
+                   end},
+         #{desc => "await continue (close)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ok = ?SEV_AWAIT_CONTINUE(Tester, tester, close)
+                   end},
+         #{desc => "close socket",
+           cmd  => fun(#{domain   := local,
+                         sock     := Sock,
+                         local_sa := #{path := Path}} = State) ->
+                           ok = socket:close(Sock),
+                           State1 =
+                               unlink_path(Path,
+                                           fun() ->
+                                                   maps:remove(local_sa, State)
+                                           end,
+                                           fun() -> State end),
+                           {ok, maps:remove(sock, State1)};
+                      (#{sock := Sock} = State) ->
+                           case socket:close(Sock) of
+                               ok ->
+                                   {ok, maps:remove(sock, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (close)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, close),
+                           ok
+                   end},
+
+         %% Termination
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, terminate) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    SecServerSeq =
+        [
+         %% *** Init part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           {Tester, Sock} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester, sock => Sock}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (recv)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ok = ?SEV_AWAIT_CONTINUE(Tester, tester, recv)
+                           
+                   end},
+         #{desc => "receive",
+           cmd  => fun(#{sock := Sock, recv := Recv} = State) ->
+                           case Recv(Sock, infinity) of
+                               {error, closed} ->
+                                   {ok, maps:remove(sock, State)};
+                               {ok, _} ->
+                                   {error, unexpected_success};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv closed)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_closed),
+                           ok
+                   end},
+
+         %% Termination
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "monitor primary server",
+           cmd  => fun(#{prim_server := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor secondary server 1",
+           cmd  => fun(#{sec_server1 := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor secondary server 2",
+           cmd  => fun(#{sec_server2 := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor secondary server 3",
+           cmd  => fun(#{sec_server3 := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+
+         %% Start the primary server
+         #{desc => "order 'primary server' start",
+           cmd  => fun(#{prim_server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid),
+                           ok
+                   end},
+         #{desc => "await 'primary server' ready (init)",
+           cmd  => fun(#{prim_server := Pid} = State) ->
+                           {ok, Sock} = ?SEV_AWAIT_READY(Pid, prim_server, init),
+                           {ok, State#{sock => Sock}}
+                   end},
+
+         %% Start the secondary server 1
+         #{desc => "order 'secondary server 1' start",
+           cmd  => fun(#{sec_server1 := Pid, sock := Sock} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, Sock),
+                           ok
+                   end},
+         #{desc => "await 'secondary server 1' ready (init)",
+           cmd  => fun(#{sec_server1 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, sec_server1, init)
+                   end},
+
+         %% Start the secondary server 2
+         #{desc => "order 'secondary server 2' start",
+           cmd  => fun(#{sec_server2 := Pid, sock := Sock} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, Sock),
+                           ok
+                   end},
+         #{desc => "await 'secondary server 2' ready (init)",
+           cmd  => fun(#{sec_server2 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, sec_server2, init)
+                   end},
+
+         %% Start the secondary server 3
+         #{desc => "order 'secondary server 3' start",
+           cmd  => fun(#{sec_server3 := Pid, sock := Sock} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, Sock),
+                           ok
+                   end},
+         #{desc => "await 'secondary server 3' ready (init)",
+           cmd  => fun(#{sec_server3 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, sec_server3, init)
+                   end},
+
+
+         %% The actual test
+         %% Make all the seondary servers continue, with an infinit recvfrom
+         %% and then the prim-server with a timed recvfrom.
+         %% After the prim server notifies us (about the timeout) we order it
+         %% to close the socket, which should cause the all the secondary 
+         %% server to return with error-closed.
+
+         #{desc => "order 'secondary server 1' to continue (recv)",
+           cmd  => fun(#{sec_server1 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv),
+                           ok
+                   end},
+         ?SEV_SLEEP(?SECS(1)),
+         #{desc => "order 'secondary server 2' to continue (recv)",
+           cmd  => fun(#{sec_server2 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv),
+                           ok
+                   end},
+         ?SEV_SLEEP(?SECS(1)),
+         #{desc => "order 'secondary server 3' to continue (recv)",
+           cmd  => fun(#{sec_server3 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv),
+                           ok
+                   end},
+         ?SEV_SLEEP(?SECS(1)),
+         #{desc => "order 'primary server' to continue (recv, with timeout)",
+           cmd  => fun(#{prim_server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv, ?SECS(5)),
+                           ok
+                   end},
+         #{desc => "await 'primary server' ready (recv, with timeout)",
+           cmd  => fun(#{prim_server := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, prim_server, recv)
+                   end},
+         #{desc => "order 'primary server' to continue (close)",
+           cmd  => fun(#{prim_server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, close),
+                           ok
+                   end},
+         #{desc => "await 'primary server' ready (close)",
+           cmd  => fun(#{prim_server := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, prim_server, close)
+                   end},
+         #{desc => "await 'secondary server 1' ready (closed)",
+           cmd  => fun(#{sec_server1 := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, sec_server1, recv_closed)
+                   end},
+         #{desc => "await 'secondary server 2' ready (closed)",
+           cmd  => fun(#{sec_server2 := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, sec_server2, recv_closed)
+                   end},
+         #{desc => "await 'secondary server 3' ready (closed)",
+           cmd  => fun(#{sec_server3 := Pid} = _State) ->
+                           ?SEV_AWAIT_READY(Pid, sec_server3, recv_closed)
+                   end},
+
+         %% Terminations
+         #{desc => "order 'secondary server 3' to terminate",
+           cmd  => fun(#{sec_server3 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await 'secondary server 3' termination",
+           cmd  => fun(#{sec_server3 := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   {ok, maps:remove(sec_server3, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order 'secondary server 2' to terminate",
+           cmd  => fun(#{sec_server2 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await 'secondary server 2' termination",
+           cmd  => fun(#{sec_server2 := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   {ok, maps:remove(sec_server2, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order 'secondary server 1' to terminate",
+           cmd  => fun(#{sec_server1 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await 'secondary server 1' termination",
+           cmd  => fun(#{sec_server1 := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   {ok, maps:remove(sec_server1, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order 'primary server' to terminate",
+           cmd  => fun(#{prim_server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await 'primary server' termination",
+           cmd  => fun(#{prim_server := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   {ok, maps:remove(prim_server, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+    
+
+    i("start 'primary server' evaluator"),
+    PrimSrvInitState = InitState,
+    PrimServer = ?SEV_START("prim-server", PrimServerSeq, PrimSrvInitState),
+
+    i("start 'secondary server 1' evaluator"),
+    SecSrvInitState = #{recv => maps:get(recv, InitState)},
+    SecServer1 = ?SEV_START("sec-server-1", SecServerSeq, SecSrvInitState),
+
+    i("start 'secondary server 2' evaluator"),
+    SecServer2 = ?SEV_START("sec-server-2", SecServerSeq, SecSrvInitState),
+
+    i("start 'secondary server 3' evaluator"),
+    SecServer3 = ?SEV_START("sec-server-3", SecServerSeq, SecSrvInitState),
+
+    i("start 'tester' evaluator"),
+    TesterInitState = #{prim_server => PrimServer#ev.pid,
+                        sec_server1 => SecServer1#ev.pid,
+                        sec_server2 => SecServer2#ev.pid,
+                        sec_server3 => SecServer3#ev.pid},
+    Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    i("await evaluator"),
+    ok = ?SEV_AWAIT_FINISH([PrimServer, 
+                            SecServer1, SecServer2, SecServer3,
+                            Tester]).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is 
+%% locally closed while the process is calling the recvmsg function.
+%% Socket is IPv4.
+
+sc_lc_recvmsg_response_tcp4(suite) ->
+    [];
+sc_lc_recvmsg_response_tcp4(doc) ->
+    [];
+sc_lc_recvmsg_response_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(sc_lc_recvmsg_response_tcp4,
+           fun() ->
+                   Recv      = fun(Sock) -> socket:recvmsg(Sock) end,
+                   InitState = #{domain   => inet,
+                                 protocol => tcp,
+                                 recv     => Recv},
+                   ok = sc_lc_receive_response_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is 
+%% locally closed while the process is calling the recvmsg function.
+%% Socket is IPv6.
+
+sc_lc_recvmsg_response_tcp6(suite) ->
+    [];
+sc_lc_recvmsg_response_tcp6(doc) ->
+    [];
+sc_lc_recvmsg_response_tcp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(sc_recvmsg_response_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   Recv      = fun(Sock) -> socket:recvmsg(Sock) end,
+                   InitState = #{domain   => inet6,
+                                 protocol => tcp,
+                                 recv     => Recv},
+                   ok = sc_lc_receive_response_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is 
+%% locally closed while the process is calling the recvmsg function.
+%% Socket is Unix Domain (stream) socket.
+
+sc_lc_recvmsg_response_tcpL(suite) ->
+    [];
+sc_lc_recvmsg_response_tcpL(doc) ->
+    [];
+sc_lc_recvmsg_response_tcpL(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(sc_recvmsg_response_tcpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   Recv      = fun(Sock) -> socket:recvmsg(Sock) end,
+                   InitState = #{domain   => local,
+                                 protocol => default,
+                                 recv     => Recv},
+                   ok = sc_lc_receive_response_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is 
+%% locally closed while the process is calling the recvmsg function.
+%% Socket is IPv4.
+
+sc_lc_recvmsg_response_udp4(suite) ->
+    [];
+sc_lc_recvmsg_response_udp4(doc) ->
+    [];
+sc_lc_recvmsg_response_udp4(_Config) when is_list(_Config) ->
+    tc_try(sc_lc_recvmsg_response_udp4,
+           fun() ->
+                   ?TT(?SECS(10)),
+                   Recv      = fun(Sock, To) -> socket:recvmsg(Sock, To) end,
+                   InitState = #{domain   => inet,
+                                 protocol => udp,
+                                 recv     => Recv},
+                   ok = sc_lc_receive_response_udp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is 
+%% locally closed while the process is calling the recvmsg function.
+%% Socket is IPv6.
+
+sc_lc_recvmsg_response_udp6(suite) ->
+    [];
+sc_lc_recvmsg_response_udp6(doc) ->
+    [];
+sc_lc_recvmsg_response_udp6(_Config) when is_list(_Config) ->
+    tc_try(sc_recvmsg_response_udp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   ?TT(?SECS(10)),
+                   Recv      = fun(Sock, To) -> socket:recvmsg(Sock, To) end,
+                   InitState = #{domain   => inet6,
+                                 protocol => udp,
+                                 recv     => Recv},
+                   ok = sc_lc_receive_response_udp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is 
+%% locally closed while the process is calling the recvmsg function.
+%% Socket is Unix Domain (dgram) socket.
+
+sc_lc_recvmsg_response_udpL(suite) ->
+    [];
+sc_lc_recvmsg_response_udpL(doc) ->
+    [];
+sc_lc_recvmsg_response_udpL(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(sc_recvmsg_response_udpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   Recv      = fun(Sock, To) -> socket:recvmsg(Sock, To) end,
+                   InitState = #{domain   => local,
+                                 protocol => default,
+                                 recv     => Recv},
+                   ok = sc_lc_receive_response_udp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is 
+%% locally closed while the process is calling the accept function.
+%% We test what happens with a non-controlling_process also, since we 
+%% git the setup anyway.
+%% Socket is IPv4.
+
+sc_lc_acceptor_response_tcp4(suite) ->
+    [];
+sc_lc_acceptor_response_tcp4(doc) ->
+    [];
+sc_lc_acceptor_response_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(sc_lc_acceptor_response_tcp4,
+           fun() ->
+                   InitState = #{domain   => inet,
+                                 protocol => tcp},
+                   ok = sc_lc_acceptor_response_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is 
+%% locally closed while the process is calling the accept function.
+%% We test what happens with a non-controlling_process also, since we 
+%% git the setup anyway.
+%% Socket is IPv6.
+
+sc_lc_acceptor_response_tcp6(suite) ->
+    [];
+sc_lc_acceptor_response_tcp6(doc) ->
+    [];
+sc_lc_acceptor_response_tcp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(sc_lc_acceptor_response_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   InitState = #{domain   => inet6,
+                                 protocol => tcp},
+                   ok = sc_lc_acceptor_response_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is 
+%% locally closed while the process is calling the accept function.
+%% We test what happens with a non-controlling_process also, since we 
+%% git the setup anyway.
+%% Socket is Unix Domain (stream) socket.
+
+sc_lc_acceptor_response_tcpL(suite) ->
+    [];
+sc_lc_acceptor_response_tcpL(doc) ->
+    [];
+sc_lc_acceptor_response_tcpL(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(sc_lc_acceptor_response_tcpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   InitState = #{domain   => local,
+                                 protocol => default},
+                   ok = sc_lc_acceptor_response_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+sc_lc_acceptor_response_tcp(InitState) ->
+    PrimAcceptorSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start (from tester)",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{lsa => LSA}}
+                   end},
+         #{desc => "create (listen) socket",
+           cmd  => fun(#{domain   := Domain, 
+                         protocol := Proto} = State) ->
+                           case socket:open(Domain, stream, Proto) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{sock := Sock, lsa := LSA} = _State) ->
+                           case socket:bind(Sock, LSA) of
+                               {ok, _Port} ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "make listen socket",
+           cmd  => fun(#{sock := Sock}) ->
+                           socket:listen(Sock)
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester, sock := Sock} = _State) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, Sock),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (accept)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_CONTINUE(Tester, tester, accept) of
+                               {ok, Timeout} ->
+                                   {ok, State#{timeout => Timeout}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "await connection",
+           cmd  => fun(#{sock := LSock, timeout := Timeout} = _State) ->
+                           case socket:accept(LSock, Timeout) of
+                               {error, timeout} ->
+                                   ok;
+                               {ok, Sock} ->
+                                   ?SEV_EPRINT("unexpected success"),
+                                   (catch socket:close(Sock)),
+                                   {error, unexpected_success};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (accept timeout)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, accept_timeout),
+                           ok
+                   end},
+         #{desc => "await continue (close)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ok = ?SEV_AWAIT_CONTINUE(Tester, tester, close)
+                   end},
+         #{desc => "close socket",
+           cmd  => fun(#{domain := local,
+                         sock   := Sock,
+                         lsa    := #{path := Path}} = State) ->
+                           case socket:close(Sock) of
+                               ok ->
+                                   State1 =
+                                       unlink_path(Path,
+                                                   fun() ->
+                                                           maps:remove(lsa, State)
+                                                   end,
+                                                   fun() ->
+                                                           State
+                                                   end),
+                                   {ok, maps:remove(sock, State1)};
+                               {error, _} = ERROR ->
+                                   unlink_path(Path),
+                                   ERROR
+                           end;
+                      (#{sock := Sock} = State) ->
+                           case socket:close(Sock) of
+                               ok ->
+                                   {ok, maps:remove(sock, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (close)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, close),
+                           ok
+                   end},
+
+                                                % Termination
+         #{desc => "await terminate",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    SecAcceptorSeq =
+        [
+         %% *** Init part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           {Tester, Sock} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester, sock => Sock}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init)
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (accept)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ok = ?SEV_AWAIT_CONTINUE(Tester, tester, accept)
+                   end},
+         #{desc => "accept",
+           cmd  => fun(#{sock := Sock} = State) ->
+                           case socket:accept(Sock) of
+                               {error, closed} ->
+                                   {ok, maps:remove(sock, State)};
+                               {ok, _} ->
+                                   {error, unexpected_success};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (accept closed)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, accept_closed)
+                   end},
+
+         %% Termination
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "monitor 'primary acceptor'",
+           cmd  => fun(#{prim_acc := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor 'secondary acceptor 1'",
+           cmd  => fun(#{sec_acc1 := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor secondary acceptor 2",
+           cmd  => fun(#{sec_acc2 := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor secondary acceptor 3",
+           cmd  => fun(#{sec_acc3 := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+
+         %% Start the primary server
+         #{desc => "order 'primary acceptor' start",
+           cmd  => fun(#{prim_acc := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid),
+                           ok
+                   end},
+         #{desc => "await 'primary acceptor' ready (init)",
+           cmd  => fun(#{prim_acc := Pid} = State) ->
+                           {ok, Sock} = ?SEV_AWAIT_READY(Pid, prim_acc, init),
+                           {ok, State#{sock => Sock}}
+                   end},
+
+         %% Start the secondary acceptor 1
+         #{desc => "order 'secondary acceptor 1' start",
+           cmd  => fun(#{sec_acc1 := Pid, sock := Sock} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, Sock),
+                           ok
+                   end},
+         #{desc => "await 'secondary acceptor 1' ready (init)",
+           cmd  => fun(#{sec_acc1 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, sec_acc1, init)
+                   end},
+
+         %% Start the secondary acceptor 2
+         #{desc => "order 'secondary acceptor 2' start",
+           cmd  => fun(#{sec_acc2 := Pid, sock := Sock} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, Sock),
+                           ok
+                   end},
+         #{desc => "await 'secondary acceptor 2' ready (init)",
+           cmd  => fun(#{sec_acc2 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, sec_acc2, init)
+                   end},
+
+         %% Start the secondary acceptor 3
+         #{desc => "order 'secondary acceptor 3' start",
+           cmd  => fun(#{sec_acc3 := Pid, sock := Sock} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, Sock),
+                           ok
+                   end},
+         #{desc => "await 'secondary acceptor 3' ready (init)",
+           cmd  => fun(#{sec_acc3 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, sec_acc3, init)
+                   end},
+
+
+         %% The actual test
+         %% Make all the seondary servers continue, with an infinit recvfrom
+         %% and then the prim-server with a timed recvfrom.
+         %% After the prim server notifies us (about the timeout) we order it
+         %% to close the socket, which should cause the all the secondary 
+         %% server to return with error-closed.
+
+         #{desc => "order 'secondary acceptor 1' to continue (accept)",
+           cmd  => fun(#{sec_acc1 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, accept),
+                           ok
+                   end},
+         ?SEV_SLEEP(?SECS(1)),
+         #{desc => "order 'secondary acceptor 2' to continue (accept)",
+           cmd  => fun(#{sec_acc2 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, accept),
+                           ok
+                   end},
+         ?SEV_SLEEP(?SECS(1)),
+         #{desc => "order 'secondary acceptor 3' to continue (accept)",
+           cmd  => fun(#{sec_acc3 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, accept),
+                           ok
+                   end},
+         ?SEV_SLEEP(?SECS(1)),
+         #{desc => "order 'primary acceptor' to continue",
+           cmd  => fun(#{prim_acc := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, accept, ?SECS(5)),
+                           ok
+                   end},
+         #{desc => "await 'primary acceptor' ready (accept timeout)",
+           cmd  => fun(#{prim_acc := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, prim_acc, accept_timeout)
+                   end},
+         #{desc => "order 'primary acceptor' to continue (close)",
+           cmd  => fun(#{prim_acc := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, close),
+                           ok
+                   end},
+         #{desc => "await 'primary acceptor' ready (close)",
+           cmd  => fun(#{prim_acc := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, prim_acc, close)
+                   end},
+         #{desc => "await 'secondary acceptor 1' ready (accept closed)",
+           cmd  => fun(#{sec_acc1 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, sec_acc1, accept_closed)
+                   end},
+         #{desc => "await 'secondary acceptor 2' ready (accept closed)",
+           cmd  => fun(#{sec_acc2 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, sec_acc2, accept_closed)
+                   end},
+         #{desc => "await 'secondary acceptor 3' ready (accept closed)",
+           cmd  => fun(#{sec_acc3 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, sec_acc3, accept_closed)
+                   end},
+
+
+         %% Terminations
+         #{desc => "order 'secondary acceptor 3' to terminate",
+           cmd  => fun(#{sec_acc3 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await 'secondary acceptor 3' termination",
+           cmd  => fun(#{sec_acc3 := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   {ok, maps:remove(sec_acc3, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order 'secondary acceptor 2' to terminate",
+           cmd  => fun(#{sec_acc2 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await 'secondary acceptor 2' termination",
+           cmd  => fun(#{sec_acc2 := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   {ok, maps:remove(sec_acc2, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order 'secondary acceptor 1' to terminate",
+           cmd  => fun(#{sec_acc1 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await 'secondary acceptor 1' termination",
+           cmd  => fun(#{sec_acc1 := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   {ok, maps:remove(sec_acc1, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order 'primary acceptor' to terminate",
+           cmd  => fun(#{prim_acc := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await 'primary acceptor' termination",
+           cmd  => fun(#{prim_acc := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   {ok, maps:remove(prim_acc, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+
+    i("start 'primary acceptor' evaluator"),
+    PrimAccInitState = InitState,
+    PrimAcc = ?SEV_START("prim-acceptor", PrimAcceptorSeq, PrimAccInitState),
+
+    i("start 'secondary acceptor 1' evaluator"),
+    SecAccInitState = #{},
+    SecAcc1 = ?SEV_START("sec-acceptor-1", SecAcceptorSeq, SecAccInitState),
+
+    i("start 'secondary acceptor 2' evaluator"),
+    SecAcc2 = ?SEV_START("sec-acceptor-2", SecAcceptorSeq, SecAccInitState),
+
+    i("start 'secondary acceptor 3' evaluator"),
+    SecAcc3 = ?SEV_START("sec-acceptor-3", SecAcceptorSeq, SecAccInitState),
+
+    i("start 'tester' evaluator"),
+    TesterInitState = #{prim_acc => PrimAcc#ev.pid,
+                        sec_acc1 => SecAcc1#ev.pid,
+                        sec_acc2 => SecAcc2#ev.pid,
+                        sec_acc3 => SecAcc3#ev.pid},
+    Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    i("await evaluator"),
+    ok = ?SEV_AWAIT_FINISH([PrimAcc, SecAcc1, SecAcc2, SecAcc3, Tester]).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is 
+%% remotely closed while the process is calling the recv function.
+%% Socket is IPv4.
+%%
+%% To minimize the chance of "weirdness", we should really have test cases
+%% where the two sides of the connection is on different machines. But for
+%% now, we will make do with different VMs on the same host.
+%%
+
+sc_rc_recv_response_tcp4(suite) ->
+    [];
+sc_rc_recv_response_tcp4(doc) ->
+    [];
+sc_rc_recv_response_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(sc_rc_recv_response_tcp4,
+           fun() ->
+                   Recv      = fun(Sock) -> socket:recv(Sock) end,
+                   InitState = #{domain   => inet,
+                                 protocol => tcp,
+                                 recv     => Recv},
+                   ok = sc_rc_receive_response_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is 
+%% remotely closed while the process is calling the recv function.
+%% Socket is IPv6.
+
+sc_rc_recv_response_tcp6(suite) ->
+    [];
+sc_rc_recv_response_tcp6(doc) ->
+    [];
+sc_rc_recv_response_tcp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(sc_rc_recv_response_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   Recv      = fun(Sock) -> socket:recv(Sock) end,
+                   InitState = #{domain   => inet6,
+                                 protocol => tcp,
+                                 recv     => Recv},
+                   ok = sc_rc_receive_response_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is 
+%% remotely closed while the process is calling the recv function.
+%% Socket is Unix Domain (stream) socket.
+
+sc_rc_recv_response_tcpL(suite) ->
+    [];
+sc_rc_recv_response_tcpL(doc) ->
+    [];
+sc_rc_recv_response_tcpL(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(sc_rc_recv_response_tcpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   Recv      = fun(Sock) -> socket:recv(Sock) end,
+                   InitState = #{domain   => local,
+                                 protocol => default,
+                                 recv     => Recv},
+                   ok = sc_rc_receive_response_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+sc_rc_receive_response_tcp(InitState) ->
+    %% Each connection are handled by handler processes.
+    %% These are created (on the fly) and handled internally 
+    %% by the server!
+    ServerSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{local_sa => LSA}}
+                   end},
+         #{desc => "create listen socket",
+           cmd  => fun(#{domain := Domain, protocol := Proto} = State) ->
+                           case socket:open(Domain, stream, Proto) of
+                               {ok, Sock} ->
+                                   {ok, State#{lsock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{domain := local,
+                         lsock  := LSock,
+                         lsa    := LSA} = _State) ->
+                           case socket:bind(LSock, LSA) of
+                               {ok, _Port} ->
+                                   ok; % We do not care about the port for local
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end;
+                      (#{lsock    := LSock,
+                         local_sa := LSA} = State) ->
+                           case socket:bind(LSock, LSA) of
+                               {ok, Port} ->
+                                   {ok, State#{lport => Port}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "make listen socket",
+           cmd  => fun(#{lsock := LSock}) ->
+                           socket:listen(LSock)
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{domain   := local,
+                         tester   := Tester,
+                         local_sa := LSA}) ->
+                           %% Actually we only need to send the path,
+                           %% but to keep it simple, we send the "same"
+                           %% as for non-local.
+                           ?SEV_ANNOUNCE_READY(Tester, init, LSA),
+                           ok;
+                      (#{tester := Tester, local_sa := LSA, lport := Port}) ->
+                           ServerSA = LSA#{port => Port},
+                           ?SEV_ANNOUNCE_READY(Tester, init, ServerSA),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (accept all three connections)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Tester, tester, accept)
+                   end},
+         #{desc => "accept 1",
+           cmd  => fun(#{lsock := LSock, recv := Recv} = State) ->
+                           case socket:accept(LSock) of
+                               {ok, Sock} ->
+                                   ?SEV_IPRINT("accepted: try start handler"),
+                                   Handler = sc_rc_tcp_handler_start(1, Recv, Sock),
+                                   ?SEV_IPRINT("handler started"),
+                                   {ok, State#{csock1   => Sock,
+                                               handler1 => Handler}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "await handler 1 ready (init)",
+           cmd  => fun(#{tester   := Tester, 
+                         handler1 := Handler1} = _State) ->
+                           ?SEV_AWAIT_READY(Handler1, handler1, init, 
+                                            [{tester, Tester}])
+                   end},
+         #{desc => "accept 2",
+           cmd  => fun(#{lsock := LSock, recv := Recv} = State) ->
+                           case socket:accept(LSock) of
+                               {ok, Sock} ->
+                                   ?SEV_IPRINT("accepted: try start handler"),
+                                   Handler = sc_rc_tcp_handler_start(2, Recv, Sock),
+                                   ?SEV_IPRINT("handler started"),
+                                   {ok, State#{csock2   => Sock,
+                                               handler2 => Handler}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "await handler 2 ready (init)",
+           cmd  => fun(#{tester   := Tester, 
+                         handler1 := Handler1, 
+                         handler2 := Handler2} = _State) ->
+                           ?SEV_AWAIT_READY(Handler2, handler2, init, 
+                                            [{tester,   Tester},
+                                             {handler1, Handler1}])
+                   end},
+         #{desc => "accept 3",
+           cmd  => fun(#{lsock := LSock, recv := Recv} = State) ->
+                           case socket:accept(LSock) of
+                               {ok, Sock} ->
+                                   ?SEV_IPRINT("accepted: try start handler"),
+                                   Handler = sc_rc_tcp_handler_start(3, Recv, Sock),
+                                   ?SEV_IPRINT("handler started"),
+                                   {ok, State#{csock3   => Sock,
+                                               handler3 => Handler}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "await handler 3 ready (init)",
+           cmd  => fun(#{tester   := Tester, 
+                         handler1 := Handler1, 
+                         handler2 := Handler2, 
+                         handler3 := Handler3} = _State) ->
+                           ?SEV_AWAIT_READY(Handler3, handler3, init, 
+                                            [{tester,   Tester},
+                                             {handler1, Handler1},
+                                             {handler2, Handler2}])
+                   end},
+         #{desc => "announce ready (accept all three connections)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, accept),
+                           ok
+                   end},
+         #{desc => "await continue (recv)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, recv)
+                   end},
+         #{desc => "order handler 1 to receive",
+           cmd  => fun(#{handler1 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv),
+                           ok
+                   end},
+         #{desc => "order handler 2 to receive",
+           cmd  => fun(#{handler2 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv),
+                           ok
+                   end},
+         #{desc => "order handler 3 to receive",
+           cmd  => fun(#{handler3 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv),
+                           ok
+                   end},
+         #{desc => "await ready from handler 1 (recv)",
+           cmd  => fun(#{tester := Tester, handler1 := Pid} = _State) ->
+                           case ?SEV_AWAIT_READY(Pid, handler1, recv, 
+                                                 [{tester, Tester}]) of
+                               {ok, Result} ->
+                                   Result;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "await ready from handler 2 (recv)",
+           cmd  => fun(#{tester := Tester, handler2 := Pid} = _State) ->
+                           case ?SEV_AWAIT_READY(Pid, handler2, recv, 
+                                                 [{tester, Tester}]) of
+                               {ok, Result} ->
+                                   Result;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "await ready from handler 3 (recv)",
+           cmd  => fun(#{tester := Tester, handler3 := Pid} = _State) ->
+                           case ?SEV_AWAIT_READY(Pid, handler3, recv, 
+                                                 [{tester, Tester}]) of
+                               {ok, Result} ->
+                                   Result;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv closed from all handlers)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_closed),
+                           ok
+                   end},
+
+         %% Termination
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order handler 1 to terminate",
+           cmd  => fun(#{handler1 := Pid} = _State) ->
+                           %% Pid ! {terminate, self(), ok},
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await handler 1 termination",
+           cmd  => fun(#{handler1 := Pid} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Pid),
+                           State1 = maps:remove(csock1,   State),
+                           State2 = maps:remove(handler1, State1),
+                           {ok, State2}
+                   end},
+         #{desc => "order handler 2 to terminate",
+           cmd  => fun(#{handler2 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await handler 2 termination",
+           cmd  => fun(#{handler2 := Pid} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Pid),
+                           State1 = maps:remove(csock2,   State),
+                           State2 = maps:remove(handler2, State1),
+                           {ok, State2}
+                   end},
+         #{desc => "order handler 3 to terminate",
+           cmd  => fun(#{handler3 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await handler 3 termination",
+           cmd  => fun(#{handler3 := Pid} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Pid),
+                           State1 = maps:remove(csock3,   State),
+                           State2 = maps:remove(handler3, State1),
+                           {ok, State2}
+                   end},
+         #{desc => "close listen socket",
+           cmd  => fun(#{domain := local,
+                         lsock  := LSock,
+                         lsa    := #{path := Path}} = State) ->
+                           case socket:close(LSock) of
+                               ok ->
+                                   State1 =
+                                       unlink_path(Path,
+                                                   fun() ->
+                                                           maps:remove(lsa, State)
+                                                   end,
+                                                   fun() ->
+                                                           State
+                                                   end),
+                                   {ok, maps:remove(lsock, State1)};
+                               {error, _} = ERROR ->
+                                   unlink_path(Path),
+                                   ERROR
+                           end;
+                      (#{lsock := LSock} = State) ->
+                           case socket:close(LSock) of
+                               ok ->
+                                   {ok, maps:remove(lsock, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    ClientSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           {Tester, {NodeID, ServerSA}} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester    => Tester, 
+                                       node_id   => NodeID, 
+                                       server_sa => ServerSA}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "create node",
+           cmd  => fun(#{host := Host, node_id := NodeID} = State) ->
+                           case start_node(Host, l2a(f("client_~w", [NodeID]))) of
+                               {ok, Node} ->
+                                   ?SEV_IPRINT("client node ~p started", [Node]),
+                                   {ok, State#{node => Node}};
+                               {error, Reason} ->
+                                   {skip, Reason}
+                           end
+                   end},
+         #{desc => "monitor client node 1",
+           cmd  => fun(#{node := Node} = _State) ->
+                           true = erlang:monitor_node(Node, true),
+                           ok
+                   end},
+         #{desc => "start remote client on client node",
+           cmd  => fun(#{node := Node} = State) ->
+                           Pid = sc_rc_tcp_client_start(Node),
+                           ?SEV_IPRINT("client ~p started", [Pid]),
+                           {ok, State#{rclient => Pid}}
+                   end},
+         #{desc => "monitor remote client",
+           cmd  => fun(#{rclient := Pid}) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "order remote client to start",
+           cmd  => fun(#{rclient   := Client,
+                         server_sa := ServerSA,
+                         protocol  := Proto}) ->
+                           ?SEV_ANNOUNCE_START(Client, {ServerSA, Proto}),
+                           ok
+                   end},
+         #{desc => "await remote client ready",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, rclient, init, 
+                                            [{tester, Tester}])
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (connect)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, connect, 
+                                               [{rclient, Client}]),
+                           ok
+                   end},
+         #{desc => "order remote client to continue (connect)",
+           cmd  => fun(#{rclient := Client}) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, connect),
+                           ok
+                   end},
+         #{desc => "await client process ready (connect)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, rclient, connect, 
+                                            [{tester, Tester}])
+                   end},
+         #{desc => "announce ready (connected)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, connect),
+                           ok
+                   end},
+         #{desc => "await continue (close)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, close, 
+                                               [{rclient, Client}]),
+                           ok
+                   end},
+         #{desc => "order remote client to close",
+           cmd  => fun(#{rclient := Client}) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, close),
+                           ok
+                   end},
+         #{desc => "await remote client ready (closed)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, rclient, close, 
+                                            [{tester, Tester}])
+                   end},
+         #{desc => "announce ready (close)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, close),
+                           ok
+                   end},
+
+         %% Termination
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester  := Tester, 
+                         rclient := Client} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester,
+                                                     [{rclient, Client}]) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "kill remote client",
+           cmd  => fun(#{rclient := Client}) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Client),
+                           ok
+                   end},
+         #{desc => "await remote client termination",
+           cmd  => fun(#{rclient := Client} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Client),
+                           State1 = maps:remove(rclient, State),
+                           {ok, State1}
+                   end},
+         #{desc => "stop client node",
+           cmd  => fun(#{node := Node} = _State) ->
+                           stop_node(Node)
+                   end},
+         #{desc => "await client node termination",
+           cmd  => fun(#{node := Node} = State) ->
+                           receive
+                               {nodedown, Node} ->
+                                   State1 = maps:remove(node_id, State),
+                                   State2 = maps:remove(node,    State1),
+                                   {ok, State2}
+                           end
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "monitor server",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor client 1",
+           cmd  => fun(#{client1 := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor client 2",
+           cmd  => fun(#{client2 := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor client 3",
+           cmd  => fun(#{client3 := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+
+         %% Start the server
+         #{desc => "order server start",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid),
+                           ok
+                   end},
+         #{desc => "await server ready (init)",
+           cmd  => fun(#{server := Pid} = State) ->
+                           {ok, ServerSA} = ?SEV_AWAIT_READY(Pid, server, init),
+                           {ok, State#{server_sa => ServerSA}}
+                   end},
+
+         %% Start the client(s)
+         #{desc => "order client 1 start",
+           cmd  => fun(#{client1   := Pid, 
+                         server_sa := ServerSA} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, {1, ServerSA}),
+                           ok
+                   end},
+         #{desc => "await client 1 ready (init)",
+           cmd  => fun(#{client1 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, client1, init)
+                   end},
+         #{desc => "order client 2 start",
+           cmd  => fun(#{client2   := Pid, 
+                         server_sa := ServerSA} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, {2, ServerSA}),
+                           ok
+                   end},
+         #{desc => "await client 2 ready (init)",
+           cmd  => fun(#{client2 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, client2, init)
+                   end},
+         #{desc => "order client 3 start",
+           cmd  => fun(#{client3   := Pid, 
+                         server_sa := ServerSA} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, {3, ServerSA}),
+                           ok
+                   end},
+         #{desc => "await client 3 ready (init)",
+           cmd  => fun(#{client3 := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, client3, init)
+                   end},
+
+         %% The actual test
+         #{desc => "order server continue (accept)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, accept),
+                           ok
+                   end},
+         ?SEV_SLEEP(?SECS(1)),
+         #{desc => "order client 1 continue (connect)",
+           cmd  => fun(#{client1 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, connect),
+                           ok
+                   end},
+         #{desc => "await client 1 ready (connect)",
+           cmd  => fun(#{server  := Server,
+                         client1 := Client1,
+                         client2 := Client2,
+                         client3 := Client3} = _State) ->
+                           ?SEV_AWAIT_READY(Client1, client1, connect, 
+                                            [{server,  Server},
+                                             {client2, Client2},
+                                             {client3, Client3}]),
+                           ok
+                   end},
+         #{desc => "order client 2 continue (connect)",
+           cmd  => fun(#{client2 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, connect),
+                           ok
+                   end},
+         #{desc => "await client 2 ready (connect)",
+           cmd  => fun(#{server  := Server,
+                         client1 := Client1,
+                         client2 := Client2,
+                         client3 := Client3} = _State) ->
+                           ?SEV_AWAIT_READY(Client2, client2, connect, 
+                                            [{server,  Server},
+                                             {client1, Client1},
+                                             {client3, Client3}]),
+                           ok
+                   end},
+         #{desc => "order client 3 continue (connect)",
+           cmd  => fun(#{client3 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, connect),
+                           ok
+                   end},
+         #{desc => "await client 3 ready (connect)",
+           cmd  => fun(#{server  := Server,
+                         client1 := Client1,
+                         client2 := Client2,
+                         client3 := Client3} = _State) ->
+                           ?SEV_AWAIT_READY(Client3, client3, connect, 
+                                            [{server,  Server},
+                                             {client1, Client1},
+                                             {client2, Client2}]),
+                           ok
+                   end},
+         #{desc => "await server ready (accept from all connections)",
+           cmd  => fun(#{server  := Server,
+                         client1 := Client1,
+                         client2 := Client2,
+                         client3 := Client3} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, accept,
+                                            [{client1, Client1},
+                                             {client2, Client2},
+                                             {client3, Client3}]),
+                           ok
+                   end},
+         #{desc => "order server continue (recv for all connections)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv),
+                           ok
+                   end},
+         ?SEV_SLEEP(?SECS(1)),
+         #{desc => "order client 1 continue (close)",
+           cmd  => fun(#{client1 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, close),
+                           ok
+                   end},
+         #{desc => "await client 1 ready (close)",
+           cmd  => fun(#{server  := Server,
+                         client1 := Client1,
+                         client2 := Client2,
+                         client3 := Client3} = _State) ->
+                           ?SEV_AWAIT_READY(Client1, client1, close, 
+                                            [{server,  Server},
+                                             {client2, Client2},
+                                             {client3, Client3}]),
+                           ok
+                   end},
+         #{desc => "order client 2 continue (close)",
+           cmd  => fun(#{client2 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, close),
+                           ok
+                   end},
+         #{desc => "await client 2 ready (close)",
+           cmd  => fun(#{server  := Server,
+                         client1 := Client1,
+                         client2 := Client2,
+                         client3 := Client3} = _State) ->
+                           ?SEV_AWAIT_READY(Client2, client2, close, 
+                                            [{server,  Server},
+                                             {client1, Client1},
+                                             {client3, Client3}]),
+                           ok
+                   end},
+         #{desc => "order client 3 continue (close)",
+           cmd  => fun(#{client3 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, close),
+                           ok
+                   end},
+         #{desc => "await client 3 ready (close)",
+           cmd  => fun(#{server  := Server,
+                         client1 := Client1,
+                         client2 := Client2,
+                         client3 := Client3} = _State) ->
+                           ?SEV_AWAIT_READY(Client3, client1, close, 
+                                            [{server,  Server},
+                                             {client1, Client1},
+                                             {client2, Client2}]),
+                           ok
+                   end},
+         #{desc => "await server ready (close for all connections)",
+           cmd  => fun(#{server  := Server,
+                         client1 := Client1,
+                         client2 := Client2,
+                         client3 := Client3} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, recv_closed,
+                                            [{client1, Client1},
+                                             {client2, Client2},
+                                             {client3, Client3}]),
+                           ok
+                   end},
+
+         %% Terminations
+         #{desc => "order client 1 to terminate",
+           cmd  => fun(#{client1 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await client 1 termination",
+           cmd  => fun(#{client1 := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(client1, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order client 2 to terminate",
+           cmd  => fun(#{client2 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await client 2 termination",
+           cmd  => fun(#{client2 := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(client2, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order client 3 to terminate",
+           cmd  => fun(#{client3 := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await client 3 termination",
+           cmd  => fun(#{client3 := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(client3, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order server to terminate",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await server termination",
+           cmd  => fun(#{server := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(server, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    i("start server evaluator"),
+    ServerInitState = InitState,
+    Server = ?SEV_START("server", ServerSeq, ServerInitState),
+
+    i("start client evaluator(s)"),
+    ClientInitState = InitState#{host => local_host()},
+    Client1 = ?SEV_START("client-1", ClientSeq, ClientInitState),
+    Client2 = ?SEV_START("client-2", ClientSeq, ClientInitState),
+    Client3 = ?SEV_START("client-3", ClientSeq, ClientInitState),
+
+    i("start 'tester' evaluator"),
+    TesterInitState = #{server  => Server#ev.pid,
+                        client1 => Client1#ev.pid,
+                        client2 => Client2#ev.pid,
+                        client3 => Client3#ev.pid},
+    Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    i("await evaluator"),
+    ok = ?SEV_AWAIT_FINISH([Server,
+                            Client1, Client2, Client3,
+                            Tester]).
+
+
+sc_rc_tcp_client_start(Node) ->
+    Self = self(),
+    Fun  = fun() -> sc_rc_tcp_client(Self) end,
+    erlang:spawn(Node, Fun).
+
+
+sc_rc_tcp_client(Parent) ->
+    sc_rc_tcp_client_init(Parent),
+    {ServerSA, Proto} = sc_rc_tcp_client_await_start(Parent),
+    Domain   = maps:get(family, ServerSA),
+    Sock     = sc_rc_tcp_client_create(Domain, Proto),
+    Path     = sc_rc_tcp_client_bind(Sock, Domain),
+    sc_rc_tcp_client_announce_ready(Parent, init),
+    sc_rc_tcp_client_await_continue(Parent, connect),
+    sc_rc_tcp_client_connect(Sock, ServerSA),
+    sc_rc_tcp_client_announce_ready(Parent, connect),
+    sc_rc_tcp_client_await_continue(Parent, close),
+    sc_rc_tcp_client_close(Sock, Path),
+    sc_rc_tcp_client_announce_ready(Parent, close),
+    Reason = sc_rc_tcp_client_await_terminate(Parent),
+    ?SEV_IPRINT("terminate"),
+    exit(Reason).
+
+sc_rc_tcp_client_init(Parent) ->
+    put(sname, "rclient"),
+    ?SEV_IPRINT("init"),
+    _MRef = erlang:monitor(process, Parent),
+    ok.
+
+sc_rc_tcp_client_await_start(Parent) ->
+    i("sc_rc_tcp_client_await_start -> entry"),
+    ?SEV_AWAIT_START(Parent).
+
+sc_rc_tcp_client_create(Domain, Proto) ->
+    i("sc_rc_tcp_client_create -> entry"),
+    case socket:open(Domain, stream, Proto) of
+        {ok, Sock} ->
+            case socket:getopt(Sock, otp, fd) of
+                {ok, FD} ->
+                    put(sname, f("rclient-~w", [FD])); % Update SName
+                _ ->
+                    ok
+            end,
+            Sock;
+        {error, Reason} ->
+            exit({open_failed, Reason})
+    end.
+
+sc_rc_tcp_client_bind(Sock, Domain) ->
+    i("sc_rc_tcp_client_bind -> entry"),
+    LSA = which_local_socket_addr(Domain),
+    case socket:bind(Sock, LSA) of
+        {ok, _} ->
+            case socket:sockname(Sock) of
+                {ok, #{family := local, path := Path}} ->
+                    Path;
+                {ok, _} ->
+                    undefined;
+                {error, Reason1} ->
+                    exit({sockname, Reason1})
+            end;
+        {error, Reason} ->
+            exit({bind, Reason})
+    end.
+
+sc_rc_tcp_client_announce_ready(Parent, Slogan) ->
+    ?SEV_IPRINT("ready ~w", [Slogan]),
+    ?SEV_ANNOUNCE_READY(Parent, Slogan).
+
+sc_rc_tcp_client_await_continue(Parent, Slogan) ->
+    ?SEV_IPRINT("await ~w continue", [Slogan]),
+    ?SEV_AWAIT_CONTINUE(Parent, parent, Slogan).
+
+sc_rc_tcp_client_connect(Sock, ServerSA) ->
+    i("sc_rc_tcp_client_connect -> entry"),
+    case socket:connect(Sock, ServerSA) of
+        ok ->
+            ok;
+        {error, Reason} ->
+            exit({connect, Reason})
+    end.
+
+sc_rc_tcp_client_close(Sock, Path) ->
+    i("sc_rc_tcp_client_close -> entry"),
+    case socket:close(Sock) of
+        ok ->
+            unlink_path(Path),
+            ok;
+        {error, Reason} ->
+            ?SEV_EPRINT("failed closing: "
+                        "~n   Reason: ~p", [Reason]),
+            unlink_path(Path),
+            {error, {close, Reason}}
+    end.
+
+sc_rc_tcp_client_await_terminate(Parent) ->
+    i("sc_rc_tcp_client_await_terminate -> entry"),
+    case ?SEV_AWAIT_TERMINATE(Parent, parent) of
+        ok ->
+            ok;
+        {error, Reason} ->
+            Reason
+    end.
+
+
+%% The handlers run on the same node as the server (the local node).
+
+sc_rc_tcp_handler_start(ID, Recv, Sock) ->
+    Self     = self(),
+    Fun      = fun() -> sc_rc_tcp_handler(ID, Self, Recv, Sock) end,
+    {Pid, _} = erlang:spawn_monitor(Fun),
+    Pid.
+
+sc_rc_tcp_handler(ID, Parent, Recv, Sock) ->
+    sc_rc_tcp_handler_init(ID, socket:getopt(Sock, otp, fd), Parent),
+    sc_rc_tcp_handler_await(Parent, recv),
+    RecvRes = sc_rc_tcp_handler_recv(Recv, Sock),
+    sc_rc_tcp_handler_announce_ready(Parent, recv, RecvRes),
+    Reason = sc_rc_tcp_handler_await(Parent, terminate),
+    exit(Reason).
+
+sc_rc_tcp_handler_init(ID, {ok, FD}, Parent) ->
+    put(sname, f("handler-~w:~w", [ID, FD])),
+    _MRef = erlang:monitor(process, Parent),
+    ?SEV_IPRINT("started"),
+    ?SEV_ANNOUNCE_READY(Parent, init),
+    ok.
+
+sc_rc_tcp_handler_await(Parent, terminate) ->
+    ?SEV_IPRINT("await terminate"),
+    ?SEV_AWAIT_TERMINATE(Parent, tester);
+sc_rc_tcp_handler_await(Parent, Slogan) ->
+    ?SEV_IPRINT("await ~w", [Slogan]),
+    ?SEV_AWAIT_CONTINUE(Parent, parent, Slogan).
+
+sc_rc_tcp_handler_recv(Recv, Sock) ->
+    ?SEV_IPRINT("recv"),
+    try Recv(Sock) of
+        {error, closed} ->
+            ok;
+        {ok, _} ->
+            ?SEV_IPRINT("unexpected success"),
+            {error, unexpected_success};
+        {error, Reason} = ERROR ->
+            ?SEV_IPRINT("receive error: "
+                        "~n   ~p", [Reason]),
+            ERROR
+    catch
+        C:E:S ->
+            ?SEV_IPRINT("receive failure: "
+                        "~n   Class: ~p"
+                        "~n   Error: ~p"
+                        "~n   Stack: ~p", [C, E, S]),
+            {error, {recv, C, E, S}}
+    end.
+
+sc_rc_tcp_handler_announce_ready(Parent, Slogan, Result) ->
+    ?SEV_IPRINT("announce ready"),
+    ?SEV_ANNOUNCE_READY(Parent, Slogan, Result),
+    ok.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is 
+%% remotely closed while the process is calling the recvmsg function.
+%% Socket is IPv4.
+
+sc_rc_recvmsg_response_tcp4(suite) ->
+    [];
+sc_rc_recvmsg_response_tcp4(doc) ->
+    [];
+sc_rc_recvmsg_response_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(sc_rc_recvmsg_response_tcp4,
+           fun() ->
+                   Recv      = fun(Sock) -> socket:recvmsg(Sock) end,
+                   InitState = #{domain   => inet,
+                                 protocol => tcp,
+                                 recv     => Recv},
+                   ok = sc_rc_receive_response_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is 
+%% remotely closed while the process is calling the recvmsg function.
+%% Socket is IPv6.
+
+sc_rc_recvmsg_response_tcp6(suite) ->
+    [];
+sc_rc_recvmsg_response_tcp6(doc) ->
+    [];
+sc_rc_recvmsg_response_tcp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(sc_rc_recvmsg_response_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   Recv      = fun(Sock) -> socket:recvmsg(Sock) end,
+                   InitState = #{domain   => inet6,
+                                 protocol => tcp,
+                                 recv     => Recv},
+                   ok = sc_rc_receive_response_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is 
+%% remotely closed while the process is calling the recvmsg function.
+%% Socket is Unix Domain (stream) socket.
+
+sc_rc_recvmsg_response_tcpL(suite) ->
+    [];
+sc_rc_recvmsg_response_tcpL(doc) ->
+    [];
+sc_rc_recvmsg_response_tcpL(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(sc_rc_recvmsg_response_tcpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   Recv      = fun(Sock) -> socket:recvmsg(Sock) end,
+                   InitState = #{domain   => local,
+                                 protocol => default,
+                                 recv     => Recv},
+                   ok = sc_rc_receive_response_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is
+%% remotely closed while the process is calling the recv function.
+%% The remote client sends data, then shutdown(write) and then the
+%% reader attempts a recv.
+%% Socket is IPv4.
+%%
+%% To minimize the chance of "weirdness", we should really have test cases
+%% where the two sides of the connection is on different machines. But for
+%% now, we will make do with different VMs on the same host.
+%% This would of course not work for Unix Domain sockets.
+%%
+
+sc_rs_recv_send_shutdown_receive_tcp4(suite) ->
+    [];
+sc_rs_recv_send_shutdown_receive_tcp4(doc) ->
+    [];
+sc_rs_recv_send_shutdown_receive_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(sc_rs_recv_send_shutdown_receive_tcp4,
+           fun() ->
+                   MsgData   = ?DATA,
+                   Recv      = fun(Sock) ->
+                                       socket:recv(Sock)
+                               end,
+                   Send      = fun(Sock, Data) ->
+                                       socket:send(Sock, Data)
+                               end,
+                   InitState = #{domain => inet,
+                                 proto  => tcp,
+                                 recv   => Recv,
+                                 send   => Send,
+                                 data   => MsgData},
+                   ok = sc_rs_send_shutdown_receive_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is
+%% remotely closed while the process is calling the recv function.
+%% The remote client sends data, then shutdown(write) and then the
+%% reader attempts a recv.
+%% Socket is IPv6.
+
+sc_rs_recv_send_shutdown_receive_tcp6(suite) ->
+    [];
+sc_rs_recv_send_shutdown_receive_tcp6(doc) ->
+    [];
+sc_rs_recv_send_shutdown_receive_tcp6(_Config) when is_list(_Config) ->
+    tc_try(sc_rs_recv_send_shutdown_receive_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   ?TT(?SECS(10)),
+                   MsgData   = ?DATA,
+                   Recv      = fun(Sock) ->
+                                       socket:recv(Sock)
+                               end,
+                   Send      = fun(Sock, Data) ->
+                                       socket:send(Sock, Data)
+                               end,
+                   InitState = #{domain => inet6,
+                                 proto  => tcp,
+                                 recv   => Recv,
+                                 send   => Send,
+                                 data   => MsgData},
+                   ok = sc_rs_send_shutdown_receive_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is
+%% remotely closed while the process is calling the recv function.
+%% The remote client sends data, then shutdown(write) and then the
+%% reader attempts a recv.
+%% Socket is Unix Domain (stream) socket.
+
+sc_rs_recv_send_shutdown_receive_tcpL(suite) ->
+    [];
+sc_rs_recv_send_shutdown_receive_tcpL(doc) ->
+    [];
+sc_rs_recv_send_shutdown_receive_tcpL(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(sc_rs_recv_send_shutdown_receive_tcpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   MsgData   = ?DATA,
+                   Recv      = fun(Sock) ->
+                                       socket:recv(Sock)
+                               end,
+                   Send      = fun(Sock, Data) ->
+                                       socket:send(Sock, Data)
+                               end,
+                   InitState = #{domain => local,
+                                 proto  => default,
+                                 recv   => Recv,
+                                 send   => Send,
+                                 data   => MsgData},
+                   ok = sc_rs_send_shutdown_receive_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+sc_rs_send_shutdown_receive_tcp(InitState) ->
+    %% The connection is handled by a handler processes.
+    %% This are created (on the fly) and handled internally
+    %% by the server!
+    ServerSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           i("get local address for ~p", [Domain]),
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{local_sa => LSA}}
+                   end},
+         #{desc => "create listen socket",
+           cmd  => fun(#{domain := Domain, proto := Proto} = State) ->
+                           case socket:open(Domain, stream, Proto) of
+                               {ok, Sock} ->
+                                   {ok, State#{lsock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{domain   := local,
+                         lsock    := LSock,
+                         local_sa := LSA} = _State) ->
+                           case socket:bind(LSock, LSA) of
+                               {ok, _Port} ->
+                                   ok; % We do not care about the port for local
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end;
+                      (#{lsock := LSock, local_sa := LSA} = State) ->
+                           case socket:bind(LSock, LSA) of
+                               {ok, Port} ->
+                                   ?SEV_IPRINT("bound to port: ~w", [Port]),
+                                   {ok, State#{lport => Port}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "make listen socket",
+           cmd  => fun(#{lsock := LSock}) ->
+                           socket:listen(LSock)
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{domain := local,
+                         tester := Tester, local_sa := LSA}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, LSA),
+                           ok;
+                      (#{tester := Tester, local_sa := LSA, lport := Port}) ->
+                           ServerSA = LSA#{port => Port},
+                           ?SEV_ANNOUNCE_READY(Tester, init, ServerSA),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (accept)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Tester, tester, accept)
+                   end},
+         #{desc => "accept",
+           cmd  => fun(#{lsock := LSock, recv := Recv} = State) ->
+                           case socket:accept(LSock) of
+                               {ok, Sock} ->
+                                   ?SEV_IPRINT("accepted: try start handler"),
+                                   Handler =
+                                       sc_rs_tcp_handler_start(Recv, Sock),
+                                   ?SEV_IPRINT("handler started"),
+                                   {ok, State#{csock   => Sock,
+                                               handler => Handler}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "await handler ready (init)",
+           cmd  => fun(#{tester  := Tester,
+                         handler := Handler} = _State) ->
+                           ?SEV_AWAIT_READY(Handler, handler, init,
+                                            [{tester, Tester}])
+                   end},
+         #{desc => "announce ready (accept)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, accept),
+                           ok
+                   end},
+
+         #{desc => "await continue (first recv)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, recv)
+                   end},
+         #{desc => "order handler to receive (first)",
+           cmd  => fun(#{handler := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv),
+                           ok
+                   end},
+         #{desc => "await ready from handler (first recv)",
+           cmd  => fun(#{tester := Tester, handler := Pid} = _State) ->
+                           case ?SEV_AWAIT_READY(Pid, handler, recv,
+                                                 [{tester, Tester}]) of
+                               {ok, Result} ->
+                                   ?SEV_IPRINT("first recv: ~p", [Result]),
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (first recv)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv),
+                           ok
+                   end},
+         #{desc => "await continue (second recv)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, recv)
+                   end},
+         #{desc => "order handler to receive (second)",
+           cmd  => fun(#{handler := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv),
+                           ok
+                   end},
+         #{desc => "await ready from handler (second recv)",
+           cmd  => fun(#{tester := Tester, handler := Pid} = _State) ->
+                           case ?SEV_AWAIT_READY(Pid, handler, recv,
+                                                 [{tester, Tester}]) of
+                               {ok, Result} ->
+                                   ?SEV_IPRINT("second recv: ~p", [Result]),
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (second recv)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv),
+                           ok
+                   end},
+
+         %% Termination
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order handler to terminate",
+           cmd  => fun(#{handler := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await handler termination",
+           cmd  => fun(#{handler := Pid} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Pid),
+                           State1 = maps:remove(csock,   State),
+                           State2 = maps:remove(handler, State1),
+                           {ok, State2}
+                   end},
+         #{desc => "close listen socket",
+           cmd  => fun(#{domain   := local,
+                         lsock    := Sock,
+                         local_sa := #{path := Path}} = State) ->
+                           socket:close(Sock),
+                           State1 =
+                               unlink_path(Path,
+                                           fun() ->
+                                                   maps:remove(local_sa, State)
+                                           end,
+                                           fun() -> State end),
+                           {ok, maps:remove(lsock, State1)};
+                      (#{lsock := LSock} = State) ->
+                           case socket:close(LSock) of
+                               ok ->
+                                   {ok, maps:remove(lsock, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    ClientSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           {Tester, ServerSA} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester    => Tester, 
+                                       server_sa => ServerSA}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "create node",
+           cmd  => fun(#{host := Host} = State) ->
+                           case start_node(Host, client) of
+                               {ok, Node} ->
+                                   ?SEV_IPRINT("client node ~p started",
+                                               [Node]),
+                                   {ok, State#{node => Node}};
+                               {error, Reason} ->
+                                   {skip, Reason}
+                           end
+                   end},
+         #{desc => "monitor client node",
+           cmd  => fun(#{node := Node} = _State) ->
+                           true = erlang:monitor_node(Node, true),
+                           ok
+                   end},
+         #{desc => "start remote client on client node",
+           cmd  => fun(#{node := Node,
+                         send := Send} = State) ->
+                           Pid = sc_rs_tcp_client_start(Node, Send),
+                           ?SEV_IPRINT("client ~p started", [Pid]),
+                           {ok, State#{rclient => Pid}}
+                   end},
+         #{desc => "monitor remote client",
+           cmd  => fun(#{rclient := Pid}) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "order remote client to start",
+           cmd  => fun(#{rclient   := Client,
+                         proto     := Proto,
+                         server_sa := ServerSA}) ->
+                           ?SEV_ANNOUNCE_START(Client, {ServerSA, Proto}),
+                           ok
+                   end},
+         #{desc => "await remote client ready",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, rclient, init, 
+                                            [{tester, Tester}])
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (connect)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, connect, 
+                                               [{rclient, Client}]),
+                           ok
+                   end},
+         #{desc => "order remote client to continue (connect)",
+           cmd  => fun(#{rclient := Client}) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, connect),
+                           ok
+                   end},
+         #{desc => "await client process ready (connect)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, rclient, connect,
+                                            [{tester, Tester}])
+                   end},
+         #{desc => "announce ready (connect)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, connect),
+                           ok
+                   end},
+
+         #{desc => "await continue (send)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = State) ->
+                           case ?SEV_AWAIT_CONTINUE(Tester, tester, send,
+                                                    [{rclient, Client}]) of
+                               {ok, Data} ->
+                                   {ok, State#{rclient_data => Data}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order remote client to send",
+           cmd  => fun(#{rclient      := Client,
+                         rclient_data := Data}) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, send, Data),
+                           ok
+                   end},
+         #{desc => "await remote client ready (closed)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, rclient, send,
+                                            [{tester, Tester}])
+                   end},
+         #{desc => "announce ready (send)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, send),
+                           ok
+                   end},
+
+
+         #{desc => "await continue (shutdown)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, shutdown,
+                                               [{rclient, Client}]),
+                           ok
+                   end},
+         #{desc => "order remote client to shutdown",
+           cmd  => fun(#{rclient := Client}) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, shutdown),
+                           ok
+                   end},
+         #{desc => "await remote client ready (shiutdown)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, rclient, shutdown,
+                                            [{tester, Tester}])
+                   end},
+         #{desc => "announce ready (shutdown)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, shutdown),
+                           ok
+                   end},
+
+         #{desc => "await continue (close)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, close,
+                                               [{rclient, Client}]),
+                           ok
+                   end},
+         #{desc => "order remote client to close",
+           cmd  => fun(#{rclient := Client}) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, close),
+                           ok
+                   end},
+         #{desc => "await remote client ready (closed)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, rclient, close,
+                                            [{tester, Tester}])
+                   end},
+         #{desc => "announce ready (close)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, close),
+                           ok
+                   end},
+
+         %% Termination
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester,
+                                                     [{rclient, Client}]) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "kill remote client",
+           cmd  => fun(#{rclient := Client}) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Client),
+                           ok
+                   end},
+         #{desc => "await remote client termination",
+           cmd  => fun(#{rclient := Client} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Client),
+                           State1 = maps:remove(rclient, State),
+                           {ok, State1}
+                   end},
+         #{desc => "stop client node",
+           cmd  => fun(#{node := Node} = _State) ->
+                           stop_node(Node)
+                   end},
+         #{desc => "await client node termination",
+           cmd  => fun(#{node := Node} = State) ->
+                           receive
+                               {nodedown, Node} ->
+                                   State1 = maps:remove(node_id, State),
+                                   State2 = maps:remove(node,    State1),
+                                   {ok, State2}
+                           end
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "monitor server",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor client",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+
+         %% Start the server
+         #{desc => "order server start",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid),
+                           ok
+                   end},
+         #{desc => "await server ready (init)",
+           cmd  => fun(#{server := Pid} = State) ->
+                           {ok, ServerSA} = ?SEV_AWAIT_READY(Pid, server, init),
+                           {ok, State#{server_sa => ServerSA}}
+                   end},
+
+         %% Start the client(s)
+         #{desc => "order client start",
+           cmd  => fun(#{client    := Pid,
+                         server_sa := ServerSA} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, ServerSA),
+                           ok
+                   end},
+         #{desc => "await client ready (init)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, client, init)
+                   end},
+
+         %% The actual test
+         #{desc => "order server continue (accept)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, accept),
+                           ok
+                   end},
+         ?SEV_SLEEP(?SECS(1)),
+         #{desc => "order client continue (connect)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, connect),
+                           ok
+                   end},
+         #{desc => "await client ready (connect)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, connect,
+                                            [{server, Server}]),
+                           ok
+                   end},
+         #{desc => "await server ready (accept)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, accept,
+                                            [{client, Client}]),
+                           ok
+                   end},
+
+         #{desc => "order client continue (send)",
+           cmd  => fun(#{client := Pid,
+                         data   := Data} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, send, Data),
+                           ok
+                   end},
+         #{desc => "await client ready (send)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, send,
+                                            [{server, Server}]),
+                           ok
+                   end},
+
+         #{desc => "order client continue (shutdown)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, shutdown),
+                           ok
+                   end},
+         #{desc => "await client ready (shutdown)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, shutdown,
+                                            [{server, Server}]),
+                           ok
+                   end},
+
+         #{desc => "order server continue (first recv)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv),
+                           ok
+                   end},
+         #{desc => "await server ready (first recv)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, recv,
+                                            [{client, Client}]),
+                           ok
+                   end},
+
+         #{desc => "order server continue (second recv)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv),
+                           ok
+                   end},
+         #{desc => "await server ready (second recv)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, recv,
+                                            [{client, Client}]),
+                           ok
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "order client continue (close)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, close),
+                           ok
+                   end},
+         #{desc => "await client ready (close)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, close,
+                                            [{server, Server}]),
+                           ok
+                   end},
+
+         %% Terminations
+         #{desc => "order client to terminate",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await client termination",
+           cmd  => fun(#{client := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(client, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order server to terminate",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await server termination",
+           cmd  => fun(#{server := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(server, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    i("start server evaluator"),
+    ServerInitState = #{domain => maps:get(domain, InitState),
+                        proto  => maps:get(proto,  InitState),
+                        recv   => maps:get(recv,   InitState)},
+    Server = ?SEV_START("server", ServerSeq, ServerInitState),
+
+    i("start client evaluator"),
+    ClientInitState = #{host   => local_host(),
+                        domain => maps:get(domain, InitState),
+                        proto  => maps:get(proto,  InitState),
+                        send   => maps:get(send, InitState)},
+    Client = ?SEV_START("client", ClientSeq, ClientInitState),
+
+    i("start 'tester' evaluator"),
+    TesterInitState = #{server => Server#ev.pid,
+                        client => Client#ev.pid,
+                        data   => maps:get(data, InitState)},
+    Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    i("await evaluator"),
+    ok = ?SEV_AWAIT_FINISH([Server, Client, Tester]).
+
+
+sc_rs_tcp_client_start(Node, Send) ->
+    Self = self(),
+    Fun  = fun() -> sc_rs_tcp_client(Self, Send) end,
+    erlang:spawn(Node, Fun).
+
+
+sc_rs_tcp_client(Parent, Send) ->
+    sc_rs_tcp_client_init(Parent),
+    {ServerSA, Proto} = sc_rs_tcp_client_await_start(Parent),
+    Domain   = maps:get(family, ServerSA),
+    Sock     = sc_rs_tcp_client_create(Domain, Proto),
+    Path     = sc_rs_tcp_client_bind(Sock, Domain),
+    sc_rs_tcp_client_announce_ready(Parent, init),
+    sc_rs_tcp_client_await_continue(Parent, connect),
+    sc_rs_tcp_client_connect(Sock, ServerSA),
+    sc_rs_tcp_client_announce_ready(Parent, connect),
+    Data = sc_rs_tcp_client_await_continue(Parent, send),
+    sc_rs_tcp_client_send(Sock, Send, Data),
+    sc_rs_tcp_client_announce_ready(Parent, send),
+    sc_rs_tcp_client_await_continue(Parent, shutdown),
+    sc_rs_tcp_client_shutdown(Sock),
+    sc_rs_tcp_client_announce_ready(Parent, shutdown),
+    sc_rs_tcp_client_await_continue(Parent, close),
+    sc_rs_tcp_client_close(Sock, Path),
+    sc_rs_tcp_client_announce_ready(Parent, close),
+    Reason = sc_rs_tcp_client_await_terminate(Parent),
+    ?SEV_IPRINT("terminate"),
+    exit(Reason).
+
+sc_rs_tcp_client_init(Parent) ->
+    put(sname, "rclient"),
+    ?SEV_IPRINT("init"),
+    _MRef = erlang:monitor(process, Parent),
+    ok.
+
+sc_rs_tcp_client_await_start(Parent) ->
+    i("sc_rs_tcp_client_await_start -> entry"),
+    ?SEV_AWAIT_START(Parent).
+
+sc_rs_tcp_client_create(Domain, Proto) ->
+    i("sc_rs_tcp_client_create -> entry"),
+    case socket:open(Domain, stream, Proto) of
+        {ok, Sock} ->
+            Sock;
+        {error, Reason} ->
+            exit({open_failed, Reason})
+    end.
+
+sc_rs_tcp_client_bind(Sock, Domain) ->
+    i("sc_rs_tcp_client_bind -> entry"),
+    LSA = which_local_socket_addr(Domain),
+    case socket:bind(Sock, LSA) of
+        {ok, _} ->
+            case socket:sockname(Sock) of
+                {ok, #{family := local, path := Path}} ->
+                    Path;
+                {ok, _} ->
+                    undefined;
+                {error, Reason1} ->
+                    exit({sockname, Reason1})
+            end;
+        {error, Reason} ->
+            exit({bind, Reason})
+    end.
+
+sc_rs_tcp_client_announce_ready(Parent, Slogan) ->
+    ?SEV_ANNOUNCE_READY(Parent, Slogan).
+
+sc_rs_tcp_client_await_continue(Parent, Slogan) ->
+    i("sc_rs_tcp_client_await_continue -> entry"),
+    case ?SEV_AWAIT_CONTINUE(Parent, parent, Slogan) of
+        ok ->
+            ok;
+        {ok, Extra} ->
+            Extra;
+        {error, Reason} ->
+            exit({await_continue, Slogan, Reason})
+    end.
+
+
+sc_rs_tcp_client_connect(Sock, ServerSA) ->
+    i("sc_rs_tcp_client_connect -> entry"),
+    case socket:connect(Sock, ServerSA) of
+        ok ->
+            ok;
+        {error, Reason} ->
+            exit({connect, Reason})
+    end.
+
+sc_rs_tcp_client_send(Sock, Send, Data) ->
+    i("sc_rs_tcp_client_send -> entry"),
+    case Send(Sock, Data) of
+        ok ->
+            ok;
+        {error, Reason} ->
+            exit({send, Reason})
+    end.
+
+sc_rs_tcp_client_shutdown(Sock) ->
+    i("sc_rs_tcp_client_shutdown -> entry"),
+    case socket:shutdown(Sock, write) of
+        ok ->
+            ok;
+        {error, Reason} ->
+            exit({shutdown, Reason})
+    end.
+
+sc_rs_tcp_client_close(Sock, Path) ->
+    i("sc_rs_tcp_client_close -> entry"),
+    case socket:close(Sock) of
+        ok ->
+            unlink_path(Path),
+            ok;
+        {error, Reason} ->
+            ?SEV_EPRINT("failed closing: "
+                        "~n   Reason: ~p", [Reason]),
+            unlink_path(Path),
+            {error, {close, Reason}}
+    end.
+
+sc_rs_tcp_client_await_terminate(Parent) ->
+    i("sc_rs_tcp_client_await_terminate -> entry"),
+    case ?SEV_AWAIT_TERMINATE(Parent, parent) of
+        ok ->
+            ok;
+        {error, Reason} ->
+            Reason
+    end.
+
+
+%% The handlers run on the same node as the server (the local node).
+
+sc_rs_tcp_handler_start(Recv, Sock) ->
+    Self     = self(),
+    Fun      = fun() -> sc_rs_tcp_handler(Self, Recv, Sock) end,
+    {Pid, _} = erlang:spawn_monitor(Fun),
+    Pid.
+
+sc_rs_tcp_handler(Parent, Recv, Sock) ->
+    sc_rs_tcp_handler_init(Parent),
+    sc_rs_tcp_handler_await(Parent, recv),
+    ok = sc_rs_tcp_handler_recv(Recv, Sock, true),
+    sc_rs_tcp_handler_announce_ready(Parent, recv, received),
+    sc_rs_tcp_handler_await(Parent, recv),
+    ok = sc_rs_tcp_handler_recv(Recv, Sock, false),
+    sc_rs_tcp_handler_announce_ready(Parent, recv, closed),
+    Reason = sc_rs_tcp_handler_await(Parent, terminate),
+    exit(Reason).
+
+sc_rs_tcp_handler_init(Parent) ->
+    put(sname, "handler"),
+    _MRef = erlang:monitor(process, Parent),
+    ?SEV_IPRINT("started"),
+    ?SEV_ANNOUNCE_READY(Parent, init),
+    ok.
+
+sc_rs_tcp_handler_await(Parent, terminate) ->
+    ?SEV_IPRINT("await terminate"),
+    ?SEV_AWAIT_TERMINATE(Parent, tester);
+sc_rs_tcp_handler_await(Parent, Slogan) ->
+    ?SEV_IPRINT("await ~w", [Slogan]),
+    ?SEV_AWAIT_CONTINUE(Parent, parent, Slogan).
+
+%% This hould actually work - we leave it for now
+sc_rs_tcp_handler_recv(Recv, Sock, First) ->
+    ?SEV_IPRINT("recv"),
+    try Recv(Sock) of
+        {ok, _} when (First =:= true) ->
+            ok;
+        {error, closed} when (First =:= false) ->
+            ok;
+        {ok, _} ->
+            ?SEV_IPRINT("unexpected success"),
+            {error, unexpected_success};
+        {error, Reason} = ERROR ->
+            ?SEV_IPRINT("receive error: "
+                        "~n   ~p", [Reason]),
+            ERROR
+    catch
+        C:E:S ->
+            ?SEV_IPRINT("receive failure: "
+                        "~n   Class: ~p"
+                        "~n   Error: ~p"
+                        "~n   Stack: ~p", [C, E, S]),
+            {error, {recv, C, E, S}}
+    end.
+
+sc_rs_tcp_handler_announce_ready(Parent, Slogan, Result) ->
+    ?SEV_IPRINT("announce ready"),
+    ?SEV_ANNOUNCE_READY(Parent, Slogan, Result),
+    ok.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is
+%% remotely closed while the process is calling the recvmsg function.
+%% The remote client sends data, then shutdown(write) and then the
+%% reader attempts a recv.
+%% Socket is IPv4.
+
+sc_rs_recvmsg_send_shutdown_receive_tcp4(suite) ->
+    [];
+sc_rs_recvmsg_send_shutdown_receive_tcp4(doc) ->
+    [];
+sc_rs_recvmsg_send_shutdown_receive_tcp4(_Config) when is_list(_Config) ->
+    tc_try(sc_rs_recvmsg_send_shutdown_receive_tcp4,
+           fun() ->
+                   ?TT(?SECS(30)),
+                   MsgData   = ?DATA,
+                   Recv      = fun(Sock) ->
+                                       case socket:recvmsg(Sock) of
+                                           {ok, #{addr  := undefined,
+                                                  iov   := [Data]}} ->
+                                               {ok, Data};
+                                           {error, _} = ERROR ->
+                                               ERROR
+                                       end
+                               end,
+                   Send      = fun(Sock, Data) when is_binary(Data) ->
+                                  MsgHdr = #{iov => [Data]},
+                                  socket:sendmsg(Sock, MsgHdr)
+                               end,
+                   InitState = #{domain => inet,
+                                 proto  => tcp,
+                                 recv   => Recv,
+                                 send   => Send,
+                                 data   => MsgData},
+                   ok = sc_rs_send_shutdown_receive_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is
+%% remotely closed while the process is calling the recvmsg function.
+%% The remote client sends data, then shutdown(write) and then the
+%% reader attempts a recv.
+%% Socket is IPv6.
+
+sc_rs_recvmsg_send_shutdown_receive_tcp6(suite) ->
+    [];
+sc_rs_recvmsg_send_shutdown_receive_tcp6(doc) ->
+    [];
+sc_rs_recvmsg_send_shutdown_receive_tcp6(_Config) when is_list(_Config) ->
+    tc_try(sc_rs_recvmsg_send_shutdown_receive_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   ?TT(?SECS(10)),
+                   MsgData   = ?DATA,
+                   Recv      = fun(Sock) ->
+                                       case socket:recvmsg(Sock) of
+                                           {ok, #{addr  := undefined,
+                                                  iov   := [Data]}} ->
+                                               {ok, Data};
+                                           {error, _} = ERROR ->
+                                               ERROR
+                                       end
+                               end,
+                   Send      = fun(Sock, Data) when is_binary(Data) ->
+                                       MsgHdr = #{iov => [Data]},
+                                       socket:sendmsg(Sock, MsgHdr)
+                               end,
+                   InitState = #{domain => inet6,
+                                 proto  => tcp,
+                                 recv   => Recv,
+                                 send   => Send,
+                                 data   => MsgData},
+                   ok = sc_rs_send_shutdown_receive_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test what happens when a socket is
+%% remotely closed while the process is calling the recvmsg function.
+%% The remote client sends data, then shutdown(write) and then the
+%% reader attempts a recv.
+%% Socket is UNix Domain (stream) socket.
+
+sc_rs_recvmsg_send_shutdown_receive_tcpL(suite) ->
+    [];
+sc_rs_recvmsg_send_shutdown_receive_tcpL(doc) ->
+    [];
+sc_rs_recvmsg_send_shutdown_receive_tcpL(_Config) when is_list(_Config) ->
+    ?TT(?SECS(10)),
+    tc_try(sc_rs_recvmsg_send_shutdown_receive_tcpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   {ok, CWD} = file:get_cwd(),
+                   ?SEV_IPRINT("CWD: ~s", [CWD]),
+                   MsgData   = ?DATA,
+                   Recv      = fun(Sock) ->
+                                       case socket:recvmsg(Sock) of
+                                           %% On some platforms, the address
+                                           %% is *not* provided (e.g. FreeBSD)
+                                           {ok, #{addr  := undefined,
+                                                  iov   := [Data]}} ->
+                                               {ok, Data};
+                                           %% On some platforms, the address
+                                           %% *is* provided (e.g. linux)
+                                           {ok, #{addr  := #{family := local},
+                                                  iov   := [Data]}} ->
+                                               {ok, Data};
+                                           {error, _} = ERROR ->
+                                               ERROR
+                                       end
+                               end,
+                   Send      = fun(Sock, Data) when is_binary(Data) ->
+                                       MsgHdr = #{iov => [Data]},
+                                       socket:sendmsg(Sock, MsgHdr)
+                               end,
+                   InitState = #{domain => local,
+                                 proto  => default,
+                                 recv   => Recv,
+                                 send   => Send,
+                                 data   => MsgData},
+                   ok = sc_rs_send_shutdown_receive_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to (simply) test that the counters
+%% for both read and write.
+%% So that its easy to extend, we use fun's for read and write.
+%% We use TCP on IPv4.
+
+traffic_send_and_recv_counters_tcp4(suite) ->
+    [];
+traffic_send_and_recv_counters_tcp4(doc) ->
+    [];
+traffic_send_and_recv_counters_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(15)),
+    tc_try(traffic_send_and_recv_counters_tcp4,
+           fun() ->
+                   InitState = #{domain => inet,
+                                 proto  => tcp,
+                                 recv   => fun(S)    -> socket:recv(S)    end,
+                                 send   => fun(S, D) -> socket:send(S, D) end},
+                   ok = traffic_send_and_recv_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to (simply) test that the counters
+%% for both read and write.
+%% So that its easy to extend, we use fun's for read and write.
+%% We use TCP on IPv6.
+
+traffic_send_and_recv_counters_tcp6(suite) ->
+    [];
+traffic_send_and_recv_counters_tcp6(doc) ->
+    [];
+traffic_send_and_recv_counters_tcp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(15)),
+    tc_try(traffic_send_and_recv_counters_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   InitState = #{domain => inet6,
+                                 proto  => tcp,
+                                 recv   => fun(S)    -> socket:recv(S)    end,
+                                 send   => fun(S, D) -> socket:send(S, D) end},
+                   ok = traffic_send_and_recv_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to (simply) test that the counters
+%% for both read and write.
+%% So that its easy to extend, we use fun's for read and write.
+%% We use default (TCP) on local.
+
+traffic_send_and_recv_counters_tcpL(suite) ->
+    [];
+traffic_send_and_recv_counters_tcpL(doc) ->
+    [];
+traffic_send_and_recv_counters_tcpL(_Config) when is_list(_Config) ->
+    ?TT(?SECS(15)),
+    tc_try(traffic_send_and_recv_counters_tcpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   InitState = #{domain => local,
+                                 proto  => default,
+                                 recv   => fun(S)    -> socket:recv(S)    end,
+                                 send   => fun(S, D) -> socket:send(S, D) end},
+                   ok = traffic_send_and_recv_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to (simply) test that the counters
+%% for both read and write.
+%% So that its easy to extend, we use fun's for read and write.
+%% We use TCP on IPv4.
+
+traffic_sendmsg_and_recvmsg_counters_tcp4(suite) ->
+    [];
+traffic_sendmsg_and_recvmsg_counters_tcp4(doc) ->
+    [];
+traffic_sendmsg_and_recvmsg_counters_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(15)),
+    tc_try(traffic_sendmsg_and_recvmsg_counters_tcp4,
+           fun() ->
+                   InitState = #{domain => inet,
+                                 proto  => tcp,
+                                 recv   => fun(S) ->
+                                                   case socket:recvmsg(S) of
+                                                       {ok, #{addr := _Source,
+                                                              iov  := [Data]}} ->
+                                                           {ok, Data};
+                                                       {error, _} = ERROR ->
+                                                           ERROR
+                                                   end
+                                           end,
+                                 send   => fun(S, Data) ->
+                                                   MsgHdr = #{iov => [Data]},
+                                                   socket:sendmsg(S, MsgHdr)
+                                           end},
+                   ok = traffic_send_and_recv_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to (simply) test that the counters
+%% for both read and write.
+%% So that its easy to extend, we use fun's for read and write.
+%% We use TCP on IPv6.
+
+traffic_sendmsg_and_recvmsg_counters_tcp6(suite) ->
+    [];
+traffic_sendmsg_and_recvmsg_counters_tcp6(doc) ->
+    [];
+traffic_sendmsg_and_recvmsg_counters_tcp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(15)),
+    tc_try(traffic_sendmsg_and_recvmsg_counters_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   InitState = #{domain => inet6,
+                                 proto  => tcp,
+                                 recv   => fun(S) ->
+                                                   case socket:recvmsg(S) of
+                                                       {ok, #{addr := _Source,
+                                                              iov  := [Data]}} ->
+                                                           {ok, Data};
+                                                       {error, _} = ERROR ->
+                                                           ERROR
+                                                   end
+                                           end,
+                                 send   => fun(S, Data) ->
+                                                   MsgHdr = #{iov => [Data]},
+                                                   socket:sendmsg(S, MsgHdr)
+                                           end},
+                   ok = traffic_send_and_recv_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to (simply) test that the counters
+%% for both read and write.
+%% So that its easy to extend, we use fun's for read and write.
+%% We use default (TCP) on local.
+
+traffic_sendmsg_and_recvmsg_counters_tcpL(suite) ->
+    [];
+traffic_sendmsg_and_recvmsg_counters_tcpL(doc) ->
+    [];
+traffic_sendmsg_and_recvmsg_counters_tcpL(_Config) when is_list(_Config) ->
+    ?TT(?SECS(15)),
+    tc_try(traffic_sendmsg_and_recvmsg_counters_tcpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   InitState = #{domain => local,
+                                 proto  => default,
+                                 recv   => fun(S) ->
+                                                   case socket:recvmsg(S) of
+                                                       {ok, #{addr := _Source,
+                                                              iov  := [Data]}} ->
+                                                           {ok, Data};
+                                                       {error, _} = ERROR ->
+                                                           ERROR
+                                                   end
+                                           end,
+                                 send   => fun(S, Data) ->
+                                                   MsgHdr = #{iov => [Data]},
+                                                   socket:sendmsg(S, MsgHdr)
+                                           end},
+                   ok = traffic_send_and_recv_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+traffic_send_and_recv_tcp(InitState) ->
+    ServerSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{local_sa => LSA}}
+                   end},
+         #{desc => "create listen socket",
+           cmd  => fun(#{domain := Domain, proto := Proto} = State) ->
+                           case socket:open(Domain, stream, Proto) of
+                               {ok, Sock} ->
+                                   {ok, State#{lsock => Sock}};
+                               {error, eafnosupport = Reason} ->
+                                   {skip, Reason};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{domain   := local,
+                         lsock    := LSock,
+                         local_sa := LSA} = _State) ->
+                           case socket:bind(LSock, LSA) of
+                               {ok, _Port} ->
+                                   ok; % We do not care about the port for local
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end;
+                      (#{lsock    := LSock,
+                         local_sa := LSA} = State) ->
+                           case socket:bind(LSock, LSA) of
+                               {ok, Port} ->
+                                   {ok, State#{lport => Port}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "make listen socket",
+           cmd  => fun(#{lsock := LSock}) ->
+                           socket:listen(LSock)
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{domain   := local,
+                         tester   := Tester,
+                         local_sa := #{path := Path}}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, Path),
+                           ok;
+                      (#{tester   := Tester,
+                         lport    := Port}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, Port),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (accept)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, accept)
+                   end},
+         #{desc => "accept",
+           cmd  => fun(#{lsock := LSock} = State) ->
+                           case socket:accept(LSock) of
+                               {ok, Sock} ->
+                                   {ok, State#{csock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "initial counter validation (=zero)",
+           cmd  => fun(#{csock := Sock} = _State) ->
+                           try socket:info(Sock) of
+                               #{counters := Counters} ->
+                                   ?SEV_IPRINT("Validate initial counters: "
+                                               "~n   ~p", [Counters]),
+                                   traffic_sar_counters_validation(Counters)
+                           catch
+                               C:E:S ->
+                                   ?SEV_EPRINT("Failed get socket info: "
+                                               "~n   Class: ~p"
+                                               "~n   Error: ~p"
+                                               "~n   Stack: ~p", [C, E, S]),
+                                   {error, {socket_info_failed, {C, E, S}}}
+                           end
+                   end},
+         #{desc => "announce ready (accept)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, accept),
+                           ok
+                   end},
+
+         #{desc => "await continue (recv_and_validate 1)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, recv_and_validate)
+                   end},
+         #{desc => "recv (1)",
+           cmd  => fun(#{csock := Sock,
+                         recv  := Recv} = State) ->
+                           case Recv(Sock) of
+                               {ok, Data} ->
+                                   ?SEV_IPRINT("recv ~p bytes", [size(Data)]),
+                                   {ok, State#{read_pkg  => 1,
+                                               read_byte => size(Data)}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "validate (recv 1)",
+           cmd  => fun(#{csock     := Sock,
+                         read_pkg  := Pkg,
+                         read_byte := Byte} = _State) ->
+                           try socket:info(Sock) of
+                               #{counters := Counters} ->
+                                   ?SEV_IPRINT("validate counters: "
+                                               "~n   ~p", [Counters]),
+                                   traffic_sar_counters_validation(
+                                     Counters,
+                                     [{read_pkg,   Pkg},
+                                      {read_byte,  Byte},
+                                      {read_tries, any}])
+                           catch
+                               C:E:S ->
+                                   ?SEV_EPRINT("Failed get socket info: "
+                                               "~n   Class: ~p"
+                                               "~n   Error: ~p"
+                                               "~n   Stack: ~p", [C, E, S]),
+                                   {error, {socket_info_failed, {C, E, S}}}
+                           end
+                   end},
+         #{desc => "announce ready (recv_and_validate 1)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_and_validate),
+                           ok
+                   end},
+
+         #{desc => "await continue (send_and_validate 1)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, send_and_validate)
+                   end},
+         #{desc => "send (1)",
+           cmd  => fun(#{csock := Sock,
+                         send  := Send} = State) ->
+                           Data = ?DATA,
+                           case Send(Sock, Data) of
+                               ok ->
+                                   ?SEV_IPRINT("sent ~p bytes", [size(Data)]),
+                                   {ok, State#{write_pkg  => 1,
+                                               write_byte => size(Data)}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "validate (send 1)",
+           cmd  => fun(#{csock      := Sock,
+                         read_pkg   := RPkg,
+                         read_byte  := RByte,
+                         write_pkg  := SPkg,
+                         write_byte := SByte} = _State) ->
+                           try socket:info(Sock) of
+                               #{counters := Counters} ->
+                                   ?SEV_IPRINT("validate counters: "
+                                               "~n   ~p", [Counters]),
+                                   traffic_sar_counters_validation(
+                                     Counters,
+                                     [{read_pkg,    RPkg},
+                                      {read_byte,   RByte},
+                                      {write_pkg,   SPkg},
+                                      {write_byte,  SByte},
+                                      {read_tries,  any},
+                                      {write_tries, any}])
+                           catch
+                               C:E:S ->
+                                   ?SEV_EPRINT("Failed get socket info: "
+                                               "~n   Class: ~p"
+                                               "~n   Error: ~p"
+                                               "~n   Stack: ~p", [C, E, S]),
+                                   {error, {socket_info_failed, {C, E, S}}}
+                           end
+                   end},
+         #{desc => "announce ready (send_and_validate 1)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, send_and_validate),
+                           ok
+                   end},
+
+         #{desc => "await continue (recv_and_validate 2)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, recv_and_validate)
+                   end},
+         #{desc => "recv (2)",
+           cmd  => fun(#{csock     := Sock,
+                         recv      := Recv,
+                         read_pkg  := Pkg,
+                         read_byte := Byte} = State) ->
+                           case Recv(Sock) of
+                               {ok, Data} ->
+                                   ?SEV_IPRINT("recv ~p bytes", [size(Data)]),
+                                   {ok, State#{read_pkg  => Pkg + 1,
+                                               read_byte => Byte + size(Data)}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "validate (recv 2)",
+           cmd  => fun(#{csock      := Sock,
+                         read_pkg   := RPkg,
+                         read_byte  := RByte,
+                         write_pkg  := SPkg,
+                         write_byte := SByte} = _State) ->
+                           try socket:info(Sock) of
+                               #{counters := Counters} ->
+                                   ?SEV_IPRINT("validate counters: "
+                                               "~n   ~p", [Counters]),
+                                   traffic_sar_counters_validation(
+                                     Counters,
+                                     [{read_pkg,    RPkg},
+                                      {read_byte,   RByte},
+                                      {write_pkg,   SPkg},
+                                      {write_byte,  SByte},
+                                      {read_tries,  any},
+                                      {write_tries, any}])
+                           catch
+                               C:E:S ->
+                                   ?SEV_EPRINT("Failed get socket info: "
+                                               "~n   Class: ~p"
+                                               "~n   Error: ~p"
+                                               "~n   Stack: ~p", [C, E, S]),
+                                   {error, {socket_info_failed, {C, E, S}}}
+                           end
+                   end},
+         #{desc => "announce ready (recv_and_validate 2)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_and_validate),
+                           ok
+                   end},
+
+         #{desc => "await continue (send_and_validate 2)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, send_and_validate)
+                   end},
+         #{desc => "send (2)",
+           cmd  => fun(#{csock      := Sock,
+                         send       := Send,
+                         write_pkg  := Pkg,
+                         write_byte := Byte} = State) ->
+                           Data = ?DATA,
+                           case Send(Sock, Data) of
+                               ok ->
+                                   ?SEV_IPRINT("sent ~p bytes", [size(Data)]),
+                                   {ok, State#{write_pkg  => Pkg + 1,
+                                               write_byte => Byte + size(Data)}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "validate (send 2)",
+           cmd  => fun(#{csock      := Sock,
+                         read_pkg   := RPkg,
+                         read_byte  := RByte,
+                         write_pkg  := SPkg,
+                         write_byte := SByte} = _State) ->
+                           try socket:info(Sock) of
+                               #{counters := Counters} ->
+                                   ?SEV_IPRINT("validate counters: "
+                                               "~n   ~p", [Counters]),
+                                   traffic_sar_counters_validation(
+                                     Counters,
+                                     [{read_pkg,    RPkg},
+                                      {read_byte,   RByte},
+                                      {write_pkg,   SPkg},
+                                      {write_byte,  SByte},
+                                      {read_tries,  any},
+                                      {write_tries, any}])
+                           catch
+                               C:E:S ->
+                                   ?SEV_EPRINT("Failed get socket info: "
+                                               "~n   Class: ~p"
+                                               "~n   Error: ~p"
+                                               "~n   Stack: ~p", [C, E, S]),
+                                   {error, {socket_info_failed, {C, E, S}}}
+                           end
+                   end},
+         #{desc => "announce ready (send_and_validate 2)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, send_and_validate),
+                           ok
+                   end},
+
+
+         %% Termination
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close connection socket (just in case)",
+           cmd  => fun(#{csock := Sock} = State) ->
+                           (catch socket:close(Sock)),
+                           {ok, maps:remove(csock, State)}
+                   end},
+         #{desc => "close listen socket",
+           cmd  => fun(#{domain   := local,
+                         lsock    := Sock,
+                         local_sa := #{path := Path}} = State) ->
+                           ok = socket:close(Sock),
+                           State1 =
+                               unlink_path(Path,
+                                           fun() ->
+                                                   maps:remove(local_sa, State)
+                                           end,
+                                           fun() -> State end),
+                           {ok, maps:remove(lsock, State1)};
+                      (#{lsock := Sock} = State) ->
+                           (catch socket:close(Sock)),
+                           {ok, maps:remove(lsock, State)}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    ClientSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start (from tester)",
+           cmd  => fun(#{domain := local} = State) ->
+                           {Tester, Path} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester, server_path => Path}};
+                      (State) ->
+                           {Tester, Port} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester, server_port => Port}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which server (local) address",
+           cmd  => fun(#{domain      := local = Domain,
+                         server_path := Path} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           SSA = #{family => Domain, path => Path},
+                           {ok, State#{local_sa => LSA, server_sa => SSA}};
+                      (#{domain := Domain, server_port := Port} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           SSA = LSA#{port => Port},
+                           {ok, State#{local_sa => LSA, server_sa => SSA}}
+                   end},
+         #{desc => "create socket",
+           cmd  => fun(#{domain := Domain,
+                         proto  := Proto} = State) ->
+                           case socket:open(Domain, stream, Proto) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, eafnosupport = Reason} ->
+                                   {skip, Reason};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{sock := Sock, local_sa := LSA} = _State) ->
+                           case socket:bind(Sock, LSA) of
+                               {ok, _Port} ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (connect)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, connect),
+                           ok
+                   end},
+         #{desc => "connect to server",
+           cmd  => fun(#{sock := Sock, server_sa := SSA}) ->
+                           socket:connect(Sock, SSA)
+                   end},
+         #{desc => "announce ready (connect)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, connect),
+                           ok
+                   end},
+
+         #{desc => "await continue (send_and_validate 1)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, send_and_validate)
+                   end},
+         #{desc => "send (1)",
+           cmd  => fun(#{sock := Sock,
+                         send := Send} = State) ->
+                           Data = ?DATA,
+                           case Send(Sock, Data) of
+                               ok ->
+                                   ?SEV_IPRINT("sent ~p bytes", [size(Data)]),
+                                   {ok, State#{write_pkg  => 1,
+                                               write_byte => size(Data)}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "validate (send 1)",
+           cmd  => fun(#{sock      := Sock,
+                         write_pkg  := SPkg,
+                         write_byte := SByte} = _State) ->
+                           try socket:info(Sock) of
+                               #{counters := Counters} ->
+                                   ?SEV_IPRINT("validate counters: "
+                                               "~n   ~p", [Counters]),
+                                   traffic_sar_counters_validation(
+                                     Counters,
+                                     [{write_pkg,   SPkg},
+                                      {write_byte,  SByte},
+                                      {write_tries, any}])
+                           catch
+                               C:E:S ->
+                                   ?SEV_EPRINT("Failed get socket info: "
+                                               "~n   Class: ~p"
+                                               "~n   Error: ~p"
+                                               "~n   Stack: ~p", [C, E, S]),
+                                   {error, {socket_info_failed, {C, E, S}}}
+                           end
+                   end},
+         #{desc => "announce ready (send_and_validate 1)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, send_and_validate),
+                           ok
+                   end},
+
+         #{desc => "await continue (recv_and_validate 1)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, recv_and_validate)
+                   end},
+         #{desc => "recv (1)",
+           cmd  => fun(#{sock := Sock,
+                         recv := Recv} = State) ->
+                           case Recv(Sock) of
+                               {ok, Data} ->
+                                   ?SEV_IPRINT("recv ~p bytes", [size(Data)]),
+                                   {ok, State#{read_pkg  => 1,
+                                               read_byte => size(Data)}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "validate (recv 1)",
+           cmd  => fun(#{sock      := Sock,
+                         read_pkg  := RPkg,
+                         read_byte := RByte,
+                         write_pkg  := SPkg,
+                         write_byte := SByte} = _State) ->
+                           try socket:info(Sock) of
+                               #{counters := Counters} ->
+                                   ?SEV_IPRINT("validate counters: "
+                                               "~n   ~p", [Counters]),
+                                   traffic_sar_counters_validation(
+                                     Counters,
+                                     [{read_pkg,    RPkg},
+                                      {read_byte,   RByte},
+                                      {write_pkg,   SPkg},
+                                      {write_byte,  SByte},
+                                      {read_tries,  any},
+                                      {write_tries, any}])
+                           catch
+                               C:E:S ->
+                                   ?SEV_EPRINT("Failed get socket info: "
+                                               "~n   Class: ~p"
+                                               "~n   Error: ~p"
+                                               "~n   Stack: ~p", [C, E, S]),
+                                   {error, {socket_info_failed, {C, E, S}}}
+                           end
+                   end},
+         #{desc => "announce ready (recv_and_validate 1)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_and_validate),
+                           ok
+                   end},
+
+         #{desc => "await continue (send_and_validate 2)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, send_and_validate)
+                   end},
+         #{desc => "send (2)",
+           cmd  => fun(#{sock       := Sock,
+                         send       := Send,
+                         write_pkg  := SPkg,
+                         write_byte := SByte} = State) ->
+                           Data = ?DATA,
+                           case Send(Sock, Data) of
+                               ok ->
+                                   ?SEV_IPRINT("sent ~p bytes", [size(Data)]),
+                                   {ok, State#{write_pkg  => SPkg + 1,
+                                               write_byte => SByte + size(Data)}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "validate (send 2)",
+           cmd  => fun(#{sock      := Sock,
+                         read_pkg  := RPkg,
+                         read_byte := RByte,
+                         write_pkg  := SPkg,
+                         write_byte := SByte} = _State) ->
+                           try socket:info(Sock) of
+                               #{counters := Counters} ->
+                                   ?SEV_IPRINT("validate counters: "
+                                               "~n   ~p", [Counters]),
+                                   traffic_sar_counters_validation(
+                                     Counters,
+                                     [{read_pkg,    RPkg},
+                                      {read_byte,   RByte},
+                                      {write_pkg,   SPkg},
+                                      {write_byte,  SByte},
+                                      {read_tries,  any},
+                                      {write_tries, any}])
+                           catch
+                               C:E:S ->
+                                   ?SEV_EPRINT("Failed get socket info: "
+                                               "~n   Class: ~p"
+                                               "~n   Error: ~p"
+                                               "~n   Stack: ~p", [C, E, S]),
+                                   {error, {socket_info_failed, {C, E, S}}}
+                           end
+                   end},
+         #{desc => "announce ready (send_and_validate 2)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, send_and_validate),
+                           ok
+                   end},
+
+         #{desc => "await continue (recv_and_validate 2)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, recv_and_validate)
+                   end},
+         #{desc => "recv (2)",
+           cmd  => fun(#{sock      := Sock,
+                         recv      := Recv,
+                         read_pkg  := RPkg,
+                         read_byte := RByte} = State) ->
+                           case Recv(Sock) of
+                               {ok, Data} ->
+                                   ?SEV_IPRINT("recv ~p bytes", [size(Data)]),
+                                   {ok, State#{read_pkg  => RPkg + 1,
+                                               read_byte => RByte + size(Data)}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "validate (recv 2)",
+           cmd  => fun(#{sock      := Sock,
+                         read_pkg  := RPkg,
+                         read_byte := RByte,
+                         write_pkg  := SPkg,
+                         write_byte := SByte} = _State) ->
+                           try socket:info(Sock) of
+                               #{counters := Counters} ->
+                                   ?SEV_IPRINT("validate counters: "
+                                               "~n   ~p", [Counters]),
+                                   traffic_sar_counters_validation(
+                                     Counters,
+                                     [{read_pkg,    RPkg},
+                                      {read_byte,   RByte},
+                                      {write_pkg,   SPkg},
+                                      {write_byte,  SByte},
+                                      {read_tries,  any},
+                                      {write_tries, any}])
+                           catch
+                               C:E:S ->
+                                   ?SEV_EPRINT("Failed get socket info: "
+                                               "~n   Class: ~p"
+                                               "~n   Error: ~p"
+                                               "~n   Stack: ~p", [C, E, S]),
+                                   {error, {socket_info_failed, {C, E, S}}}
+                           end
+                   end},
+         #{desc => "announce ready (recv_and_validate 2)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_and_validate),
+                           ok
+                   end},
+
+         %% Termination
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close connection socket",
+           cmd  => fun(#{domain   := local,
+                         sock     := Sock,
+                         local_sa := #{path := Path}} = State) ->
+                           ok = socket:close(Sock),
+                           State1 =
+                               unlink_path(Path,
+                                           fun() ->
+                                                   maps:remove(local_sa, State)
+                                           end,
+                                           fun() -> State end),
+                           {ok, maps:remove(sock, State1)};
+                      (#{sock := Sock} = State) ->
+                           socket:close(Sock),
+                           {ok, maps:remove(sock, State)}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "monitor server",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor client",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+
+         %% Start the server
+         #{desc => "order server start",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid),
+                           ok
+                   end},
+         #{desc => "await server ready (init)",
+           cmd  => fun(#{domain := local,
+                         server := Pid} = State) ->
+                           {ok, Path} = ?SEV_AWAIT_READY(Pid, server, init),
+                           {ok, State#{path => Path}};
+                      (#{server := Pid} = State) ->
+                           {ok, Port} = ?SEV_AWAIT_READY(Pid, server, init),
+                           {ok, State#{port => Port}}
+                   end},
+
+         %% Start the client
+         #{desc => "order client start",
+           cmd  => fun(#{domain := local,
+                         client := Pid,
+                         path   := Path} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, Path),
+                           ok;
+                      (#{client := Pid,
+                         port   := Port} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, Port),
+                           ok
+                   end},
+         #{desc => "await client ready (init)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, client, init)
+                   end},
+
+         %% *** The actual test ***
+
+         #{desc => "order server to continue (with accept)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Server, accept),
+                           ok
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "order client to continue (with connect)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, connect),
+                           ok
+                   end},
+         #{desc => "await client ready (connect)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, connect)
+                   end},
+         #{desc => "await server ready (accept)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, accept)
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "order server to continue (recv_and_validate 1)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Server, recv_and_validate),
+                           ok
+                   end},
+         #{desc => "order client to continue (send_and_validate 1)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, send_and_validate),
+                           ok
+                   end},
+         #{desc => "await client ready (send_and_validate 1)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, send_and_validate)
+                   end},
+         #{desc => "await server ready (recv_and_validate 1)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, recv_and_validate)
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "order client to continue (recv_and_validate 1)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, recv_and_validate),
+                           ok
+                   end},
+         #{desc => "order server to continue (send_and_validate 1)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Server, send_and_validate),
+                           ok
+                   end},
+         #{desc => "await server ready (send_and_validate 1)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, send_and_validate)
+                   end},
+         #{desc => "await client ready (recv_and_validate 1)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, recv_and_validate)
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "order server to continue (recv_and_validate 2)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Server, recv_and_validate),
+                           ok
+                   end},
+         #{desc => "order client to continue (send_and_validate 2)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, send_and_validate),
+                           ok
+                   end},
+         #{desc => "await client ready (send_and_validate 2)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, send_and_validate)
+                   end},
+         #{desc => "await server ready (recv_and_validate 2)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, recv_and_validate)
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "order client to continue (recv_and_validate 2)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, recv_and_validate),
+                           ok
+                   end},
+         #{desc => "order server to continue (send_and_validate 2)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Server, send_and_validate),
+                           ok
+                   end},
+         #{desc => "await server ready (send_and_validate 2)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, send_and_validate)
+                   end},
+         #{desc => "await client ready (recv_and_validate 2)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, recv_and_validate)
+                   end},
+
+         %% *** Termination ***
+         #{desc => "order client to terminate",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Client),
+                           ok
+                   end},
+         #{desc => "await client termination",
+           cmd  => fun(#{client := Client} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Client),
+                           State1 = maps:remove(client, State),
+                           {ok, State1}
+                   end},
+         #{desc => "order server to terminate",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Server),
+                           ok
+                   end},
+         #{desc => "await server termination",
+           cmd  => fun(#{server := Server} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Server),
+                           State1 = maps:remove(server, State),
+                           {ok, State1}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    i("start server evaluator"),
+    ServerInitState = InitState#{host => local_host()},
+    Server = ?SEV_START("server", ServerSeq, ServerInitState),
+
+    i("start client evaluator(s)"),
+    ClientInitState = InitState#{host => local_host()},
+    Client = ?SEV_START("client", ClientSeq, ClientInitState),
+
+    i("start 'tester' evaluator"),
+    TesterInitState = #{server => Server#ev.pid,
+                        client => Client#ev.pid},
+    Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    i("await evaluator"),
+    ok = ?SEV_AWAIT_FINISH([Server, Client, Tester]).
+
+
+
+traffic_sar_counters_validation(Counters) ->
+    traffic_sar_counters_validation(Counters, []).
+
+traffic_sar_counters_validation(Counters, []) ->
+    (catch lists:foreach(
+             fun({_Cnt, 0})   -> ok;
+                ({Cnt,  Val}) -> throw({error, {invalid_counter, Cnt, Val}})
+             end,
+             Counters));
+traffic_sar_counters_validation(Counters, [{Cnt, Val}|ValidateCounters]) ->
+    case lists:keysearch(Cnt, 1, Counters) of
+        {value, {Cnt, Val}} ->
+            Counters2 = lists:keydelete(Cnt, 1, Counters),
+            traffic_sar_counters_validation(Counters2, ValidateCounters);
+        {value, {Cnt, _Val}} when (Val =:= any) ->
+            Counters2 = lists:keydelete(Cnt, 1, Counters),
+            traffic_sar_counters_validation(Counters2, ValidateCounters);
+        {value, {Cnt, InvVal}} ->
+            {error, {invalid_counter, Cnt, InvVal, Val}};
+        false ->
+            {error, {unknown_counter, Cnt, Counters}}
+    end.
+
+                          
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to (simply) test that the counters
+%% for both read and write.
+%% So that its easy to extend, we use fun's for read and write.
+%% We use UDP on IPv4.
+
+traffic_sendto_and_recvfrom_counters_udp4(suite) ->
+    [];
+traffic_sendto_and_recvfrom_counters_udp4(doc) ->
+    [];
+traffic_sendto_and_recvfrom_counters_udp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(15)),
+    tc_try(traffic_sendto_and_recvfrom_counters_udp4,
+           fun() ->
+                   InitState = #{domain => inet,
+                                 proto  => udp,
+                                 recv   => fun(S) ->
+                                                   socket:recvfrom(S)
+                                           end,
+                                 send   => fun(S, Data, Dest) ->
+                                                   socket:sendto(S, Data, Dest)
+                                           end},
+                   ok = traffic_send_and_recv_udp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to (simply) test that the counters
+%% for both read and write.
+%% So that its easy to extend, we use fun's for read and write.
+%% We use UDP on IPv6.
+
+traffic_sendto_and_recvfrom_counters_udp6(suite) ->
+    [];
+traffic_sendto_and_recvfrom_counters_udp6(doc) ->
+    [];
+traffic_sendto_and_recvfrom_counters_udp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(15)),
+    tc_try(traffic_sendto_and_recvfrom_counters_udp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   InitState = #{domain => inet6,
+                                 proto  => udp,
+                                 recv   => fun(S) ->
+                                                   socket:recvfrom(S)
+                                           end,
+                                 send   => fun(S, Data, Dest) ->
+                                                   socket:sendto(S, Data, Dest)
+                                           end},
+                   ok = traffic_send_and_recv_udp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to (simply) test that the counters
+%% for both read and write.
+%% So that its easy to extend, we use fun's for read and write.
+%% We use default (UDP) on local.
+
+traffic_sendto_and_recvfrom_counters_udpL(suite) ->
+    [];
+traffic_sendto_and_recvfrom_counters_udpL(doc) ->
+    [];
+traffic_sendto_and_recvfrom_counters_udpL(_Config) when is_list(_Config) ->
+    ?TT(?SECS(15)),
+    tc_try(traffic_sendto_and_recvfrom_counters_udp4,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   InitState = #{domain => local,
+                                 proto  => default,
+                                 recv   => fun(S) ->
+                                                   socket:recvfrom(S)
+                                           end,
+                                 send   => fun(S, Data, Dest) ->
+                                                   socket:sendto(S, Data, Dest)
+                                           end},
+                   ok = traffic_send_and_recv_udp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to (simply) test that the counters
+%% for both read and write.
+%% So that its easy to extend, we use fun's for read and write.
+%% We use UDP on IPv4.
+
+traffic_sendmsg_and_recvmsg_counters_udp4(suite) ->
+    [];
+traffic_sendmsg_and_recvmsg_counters_udp4(doc) ->
+    [];
+traffic_sendmsg_and_recvmsg_counters_udp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(15)),
+    tc_try(traffic_sendmsg_and_recvmsg_counters_udp4,
+           fun() ->
+                   InitState = #{domain => inet,
+                                 proto  => udp,
+                                 recv   => fun(S) ->
+                                                   case socket:recvmsg(S) of
+                                                       {ok, #{addr  := Source,
+                                                              iov   := [Data]}} ->
+                                                           {ok, {Source, Data}};
+                                                       {error, _} = ERROR ->
+                                                           ERROR
+                                                   end
+                                           end,
+                                 send   => fun(S, Data, Dest) ->
+                                                   MsgHdr = #{addr => Dest,
+                                                              iov  => [Data]},
+                                                   socket:sendmsg(S, MsgHdr)
+                                           end},
+                   ok = traffic_send_and_recv_udp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to (simply) test that the counters
+%% for both read and write.
+%% So that its easy to extend, we use fun's for read and write.
+%% We use UDP on IPv6.
+
+traffic_sendmsg_and_recvmsg_counters_udp6(suite) ->
+    [];
+traffic_sendmsg_and_recvmsg_counters_udp6(doc) ->
+    [];
+traffic_sendmsg_and_recvmsg_counters_udp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(15)),
+    tc_try(traffic_sendmsg_and_recvmsg_counters_udp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   InitState = #{domain => inet6,
+                                 proto  => udp,
+                                 recv   => fun(S) ->
+                                                   case socket:recvmsg(S) of
+                                                       {ok, #{addr  := Source,
+                                                              iov   := [Data]}} ->
+                                                           {ok, {Source, Data}};
+                                                       {error, _} = ERROR ->
+                                                           ERROR
+                                                   end
+                                           end,
+                                 send   => fun(S, Data, Dest) ->
+                                                   MsgHdr = #{addr => Dest,
+                                                              iov  => [Data]},
+                                                   socket:sendmsg(S, MsgHdr)
+                                           end},
+                   ok = traffic_send_and_recv_udp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to (simply) test that the counters
+%% for both read and write.
+%% So that its easy to extend, we use fun's for read and write.
+%% We use default (UDP) on local.
+
+traffic_sendmsg_and_recvmsg_counters_udpL(suite) ->
+    [];
+traffic_sendmsg_and_recvmsg_counters_udpL(doc) ->
+    [];
+traffic_sendmsg_and_recvmsg_counters_udpL(_Config) when is_list(_Config) ->
+    ?TT(?SECS(15)),
+    tc_try(traffic_sendmsg_and_recvmsg_counters_udpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   InitState = #{domain => local,
+                                 proto  => default,
+                                 recv   => fun(S) ->
+                                                   case socket:recvmsg(S) of
+                                                       {ok, #{addr  := Source,
+                                                              iov   := [Data]}} ->
+                                                           {ok, {Source, Data}};
+                                                       {error, _} = ERROR ->
+                                                           ERROR
+                                                   end
+                                           end,
+                                 send   => fun(S, Data, Dest) ->
+                                                   MsgHdr = #{addr => Dest,
+                                                              iov  => [Data]},
+                                                   socket:sendmsg(S, MsgHdr)
+                                           end},
+                   ok = traffic_send_and_recv_udp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+traffic_send_and_recv_udp(InitState) ->
+    ServerSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{local_sa => LSA}}
+                   end},
+         #{desc => "create socket",
+           cmd  => fun(#{domain := Domain, proto := Proto} = State) ->
+                           case socket:open(Domain, dgram, Proto) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{domain   := local,
+                         sock     := Sock,
+                         local_sa := LSA} = _State) ->
+                           case socket:bind(Sock, LSA) of
+                               {ok, _Port} ->
+                                   ok; % We do not care about the port for local
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end;
+                      (#{sock     := LSock,
+                         local_sa := LSA} = State) ->
+                           case socket:bind(LSock, LSA) of
+                               {ok, Port} ->
+                                   {ok, State#{lport => Port}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "initial counter validation (=zero)",
+           cmd  => fun(#{sock := Sock} = _State) ->
+                           try socket:info(Sock) of
+                               #{counters := Counters} ->
+                                   ?SEV_IPRINT("Validate initial counters: "
+                                               "~n   ~p", [Counters]),
+                                   traffic_sar_counters_validation(Counters)
+                           catch
+                               C:E:S ->
+                                   ?SEV_EPRINT("Failed get socket info: "
+                                               "~n   Class: ~p"
+                                               "~n   Error: ~p"
+                                               "~n   Stack: ~p", [C, E, S]),
+                                   {error, {socket_info_failed, {C, E, S}}}
+                           end
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{domain   := local,
+                         tester   := Tester,
+                         local_sa := #{path := Path}}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, Path),
+                           ok;
+                      (#{tester   := Tester,
+                         lport    := Port}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, Port),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (recv_and_validate 1)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, recv_and_validate)
+                   end},
+         #{desc => "recv (1)",
+           cmd  => fun(#{sock := Sock,
+                         recv := Recv} = State) ->
+                           case Recv(Sock) of
+                               {ok, {ClientSA, Data}} ->
+                                   ?SEV_IPRINT("recv ~p bytes", [size(Data)]),
+                                   {ok, State#{client_sa => ClientSA,
+                                               read_pkg  => 1,
+                                               read_byte => size(Data)}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "validate (recv 1)",
+           cmd  => fun(#{sock      := Sock,
+                         read_pkg  := Pkg,
+                         read_byte := Byte} = _State) ->
+                           try socket:info(Sock) of
+                               #{counters := Counters} ->
+                                   ?SEV_IPRINT("validate counters: "
+                                               "~n   ~p", [Counters]),
+                                   traffic_sar_counters_validation(
+                                     Counters,
+                                     [{read_pkg,   Pkg},
+                                      {read_byte,  Byte},
+                                      {read_tries, any}])
+                           catch
+                               C:E:S ->
+                                   ?SEV_EPRINT("Failed get socket info: "
+                                               "~n   Class: ~p"
+                                               "~n   Error: ~p"
+                                               "~n   Stack: ~p", [C, E, S]),
+                                   {error, {socket_info_failed, {C, E, S}}}
+                           end
+                   end},
+         #{desc => "announce ready (recv_and_validate 1)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_and_validate),
+                           ok
+                   end},
+
+         #{desc => "await continue (send_and_validate 1)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, send_and_validate)
+                   end},
+         #{desc => "send (1)",
+           cmd  => fun(#{sock      := Sock,
+                         send      := Send,
+                         client_sa := ClientSA} = State) ->
+                           Data = ?DATA,
+                           case Send(Sock, Data, ClientSA) of
+                               ok ->
+                                   ?SEV_IPRINT("sent ~p bytes", [size(Data)]),
+                                   {ok, State#{write_pkg  => 1,
+                                               write_byte => size(Data)}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "validate (send 1)",
+           cmd  => fun(#{sock       := Sock,
+                         read_pkg   := RPkg,
+                         read_byte  := RByte,
+                         write_pkg  := SPkg,
+                         write_byte := SByte} = _State) ->
+                           try socket:info(Sock) of
+                               #{counters := Counters} ->
+                                   ?SEV_IPRINT("validate counters: "
+                                               "~n   ~p", [Counters]),
+                                   traffic_sar_counters_validation(
+                                     Counters,
+                                     [{read_pkg,    RPkg},
+                                      {read_byte,   RByte},
+                                      {write_pkg,   SPkg},
+                                      {write_byte,  SByte},
+                                      {read_tries,  any},
+                                      {write_tries, any}])
+                           catch
+                               C:E:S ->
+                                   ?SEV_EPRINT("Failed get socket info: "
+                                               "~n   Class: ~p"
+                                               "~n   Error: ~p"
+                                               "~n   Stack: ~p", [C, E, S]),
+                                   {error, {socket_info_failed, {C, E, S}}}
+                           end
+                   end},
+         #{desc => "announce ready (send_and_validate 1)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, send_and_validate),
+                           ok
+                   end},
+
+         #{desc => "await continue (recv_and_validate 2)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, recv_and_validate)
+                   end},
+         #{desc => "recv (2)",
+           cmd  => fun(#{sock      := Sock,
+                         recv      := Recv,
+                         read_pkg  := Pkg,
+                         read_byte := Byte} = State) ->
+                           case Recv(Sock) of
+                               {ok, {Source, Data}} ->
+                                   ?SEV_IPRINT("recv ~p bytes", [size(Data)]),
+                                   {ok, State#{client_sa => Source,
+                                               read_pkg  => Pkg + 1,
+                                               read_byte => Byte + size(Data)}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "validate (recv 2)",
+           cmd  => fun(#{sock       := Sock,
+                         read_pkg   := RPkg,
+                         read_byte  := RByte,
+                         write_pkg  := SPkg,
+                         write_byte := SByte} = _State) ->
+                           try socket:info(Sock) of
+                               #{counters := Counters} ->
+                                   ?SEV_IPRINT("validate counters: "
+                                               "~n   ~p", [Counters]),
+                                   traffic_sar_counters_validation(
+                                     Counters,
+                                     [{read_pkg,    RPkg},
+                                      {read_byte,   RByte},
+                                      {write_pkg,   SPkg},
+                                      {write_byte,  SByte},
+                                      {read_tries,  any},
+                                      {write_tries, any}])
+                           catch
+                               C:E:S ->
+                                   ?SEV_EPRINT("Failed get socket info: "
+                                               "~n   Class: ~p"
+                                               "~n   Error: ~p"
+                                               "~n   Stack: ~p", [C, E, S]),
+                                   {error, {socket_info_failed, {C, E, S}}}
+                           end
+                   end},
+         #{desc => "announce ready (recv_and_validate 2)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_and_validate),
+                           ok
+                   end},
+
+         #{desc => "await continue (send_and_validate 2)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, send_and_validate)
+                   end},
+         #{desc => "send (2)",
+           cmd  => fun(#{sock       := Sock,
+                         client_sa  := ClientSA,
+                         send       := Send,
+                         write_pkg  := Pkg,
+                         write_byte := Byte} = State) ->
+                           Data = ?DATA,
+                           case Send(Sock, Data, ClientSA) of
+                               ok ->
+                                   ?SEV_IPRINT("sent ~p bytes", [size(Data)]),
+                                   {ok, State#{write_pkg  => Pkg + 1,
+                                               write_byte => Byte + size(Data)}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "validate (send 2)",
+           cmd  => fun(#{sock       := Sock,
+                         read_pkg   := RPkg,
+                         read_byte  := RByte,
+                         write_pkg  := SPkg,
+                         write_byte := SByte} = _State) ->
+                           try socket:info(Sock) of
+                               #{counters := Counters} ->
+                                   ?SEV_IPRINT("validate counters: "
+                                               "~n   ~p", [Counters]),
+                                   traffic_sar_counters_validation(
+                                     Counters,
+                                     [{read_pkg,    RPkg},
+                                      {read_byte,   RByte},
+                                      {write_pkg,   SPkg},
+                                      {write_byte,  SByte},
+                                      {read_tries,  any},
+                                      {write_tries, any}])
+                           catch
+                               C:E:S ->
+                                   ?SEV_EPRINT("Failed get socket info: "
+                                               "~n   Class: ~p"
+                                               "~n   Error: ~p"
+                                               "~n   Stack: ~p", [C, E, S]),
+                                   {error, {socket_info_failed, {C, E, S}}}
+                           end
+                   end},
+         #{desc => "announce ready (send_and_validate 2)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, send_and_validate),
+                           ok
+                   end},
+
+
+         %% Termination
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close socket (just in case)",
+           cmd  => fun(#{domain   := local,
+                         sock     := Sock,
+                         local_sa := #{path := Path}} = State) ->
+                           ok = socket:close(Sock),
+                           State1 =
+                               unlink_path(Path,
+                                           fun() ->
+                                                   maps:remove(local_sa, State)
+                                           end,
+                                           fun() -> State end),
+                           {ok, maps:remove(lsock, State1)};
+                      (#{sock := Sock} = State) ->
+                           (catch socket:close(Sock)),
+                           {ok, maps:remove(sock, State)}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    ClientSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start (from tester)",
+           cmd  => fun(#{domain := local} = State) ->
+                           {Tester, Path} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester, server_path => Path}};
+                      (State) ->
+                           {Tester, Port} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester, server_port => Port}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which server (local) address",
+           cmd  => fun(#{domain      := local = Domain,
+                         server_path := Path} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           SSA = #{family => Domain, path => Path},
+                           {ok, State#{local_sa => LSA, server_sa => SSA}};
+                      (#{domain := Domain, server_port := Port} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           SSA = LSA#{port => Port},
+                           {ok, State#{local_sa => LSA, server_sa => SSA}}
+                   end},
+         #{desc => "create socket",
+           cmd  => fun(#{domain := Domain,
+                         proto  := Proto} = State) ->
+                           case socket:open(Domain, dgram, Proto) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{sock := Sock, local_sa := LSA} = _State) ->
+                           case socket:bind(Sock, LSA) of
+                               {ok, _Port} ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "initial counter validation (=zero)",
+           cmd  => fun(#{sock := Sock} = _State) ->
+                           try socket:info(Sock) of
+                               #{counters := Counters} ->
+                                   ?SEV_IPRINT("Validate initial counters: "
+                                               "~n   ~p", [Counters]),
+                                   traffic_sar_counters_validation(Counters)
+                           catch
+                               C:E:S ->
+                                   ?SEV_EPRINT("Failed get socket info: "
+                                               "~n   Class: ~p"
+                                               "~n   Error: ~p"
+                                               "~n   Stack: ~p", [C, E, S]),
+                                   {error, {socket_info_failed, {C, E, S}}}
+                           end
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (send_and_validate 1)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, send_and_validate)
+                   end},
+         #{desc => "send (1)",
+           cmd  => fun(#{sock      := Sock,
+                         send      := Send,
+                         server_sa := ServerSA} = State) ->
+                           Data = ?DATA,
+                           case Send(Sock, Data, ServerSA) of
+                               ok ->
+                                   ?SEV_IPRINT("sent ~p bytes", [size(Data)]),
+                                   {ok, State#{write_pkg  => 1,
+                                               write_byte => size(Data)}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "validate (send 1)",
+           cmd  => fun(#{sock       := Sock,
+                         write_pkg  := SPkg,
+                         write_byte := SByte} = _State) ->
+                           try socket:info(Sock) of
+                               #{counters := Counters} ->
+                                   ?SEV_IPRINT("validate counters: "
+                                               "~n   ~p", [Counters]),
+                                   traffic_sar_counters_validation(
+                                     Counters,
+                                     [{write_pkg,   SPkg},
+                                      {write_byte,  SByte},
+                                      {write_tries, any}])
+                           catch
+                               C:E:S ->
+                                   ?SEV_EPRINT("Failed get socket info: "
+                                               "~n   Class: ~p"
+                                               "~n   Error: ~p"
+                                               "~n   Stack: ~p", [C, E, S]),
+                                   {error, {socket_info_failed, {C, E, S}}}
+                           end
+                   end},
+         #{desc => "announce ready (send_and_validate 1)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, send_and_validate),
+                           ok
+                   end},
+
+         #{desc => "await continue (recv_and_validate 1)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, recv_and_validate)
+                   end},
+         #{desc => "recv (1)",
+           cmd  => fun(#{sock      := Sock,
+                         recv      := Recv,
+                         server_sa := #{family := local} = ServerSA} = State) ->
+                           case Recv(Sock) of
+                               {ok, {ServerSA, Data}} ->
+                                   ?SEV_IPRINT("recv ~p bytes", [size(Data)]),
+                                   {ok, State#{read_pkg  => 1,
+                                               read_byte => size(Data)}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end;
+                      (#{sock      := Sock,
+                         recv      := Recv,
+                         server_sa := #{addr := Addr, port := Port}} = State) ->
+                           case Recv(Sock) of
+                               {ok, {#{addr := Addr, port := Port}, Data}} ->
+                                   ?SEV_IPRINT("recv ~p bytes", [size(Data)]),
+                                   {ok, State#{read_pkg  => 1,
+                                               read_byte => size(Data)}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "validate (recv 1)",
+           cmd  => fun(#{sock      := Sock,
+                         read_pkg  := RPkg,
+                         read_byte := RByte,
+                         write_pkg  := SPkg,
+                         write_byte := SByte} = _State) ->
+                           try socket:info(Sock) of
+                               #{counters := Counters} ->
+                                   ?SEV_IPRINT("validate counters: "
+                                               "~n   ~p", [Counters]),
+                                   traffic_sar_counters_validation(
+                                     Counters,
+                                     [{read_pkg,    RPkg},
+                                      {read_byte,   RByte},
+                                      {write_pkg,   SPkg},
+                                      {write_byte,  SByte},
+                                      {read_tries,  any},
+                                      {write_tries, any}])
+                           catch
+                               C:E:S ->
+                                   ?SEV_EPRINT("Failed get socket info: "
+                                               "~n   Class: ~p"
+                                               "~n   Error: ~p"
+                                               "~n   Stack: ~p", [C, E, S]),
+                                   {error, {socket_info_failed, {C, E, S}}}
+                           end
+                   end},
+         #{desc => "announce ready (recv_and_validate 1)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_and_validate),
+                           ok
+                   end},
+
+         #{desc => "await continue (send_and_validate 2)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, send_and_validate)
+                   end},
+         #{desc => "send (2)",
+           cmd  => fun(#{sock       := Sock,
+                         send       := Send,
+                         server_sa  := ServerSA,
+                         write_pkg  := SPkg,
+                         write_byte := SByte} = State) ->
+                           Data = ?DATA,
+                           case Send(Sock, Data, ServerSA) of
+                               ok ->
+                                   ?SEV_IPRINT("sent ~p bytes", [size(Data)]),
+                                   {ok, State#{write_pkg  => SPkg + 1,
+                                               write_byte => SByte + size(Data)}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "validate (send 2)",
+           cmd  => fun(#{sock       := Sock,
+                         read_pkg   := RPkg,
+                         read_byte  := RByte,
+                         write_pkg  := SPkg,
+                         write_byte := SByte} = _State) ->
+                           try socket:info(Sock) of
+                               #{counters := Counters} ->
+                                   ?SEV_IPRINT("validate counters: "
+                                               "~n   ~p", [Counters]),
+                                   traffic_sar_counters_validation(
+                                     Counters,
+                                     [{read_pkg,    RPkg},
+                                      {read_byte,   RByte},
+                                      {write_pkg,   SPkg},
+                                      {write_byte,  SByte},
+                                      {read_tries,  any},
+                                      {write_tries, any}])
+                           catch
+                               C:E:S ->
+                                   ?SEV_EPRINT("Failed get socket info: "
+                                               "~n   Class: ~p"
+                                               "~n   Error: ~p"
+                                               "~n   Stack: ~p", [C, E, S]),
+                                   {error, {socket_info_failed, {C, E, S}}}
+                           end
+                   end},
+         #{desc => "announce ready (send_and_validate 2)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, send_and_validate),
+                           ok
+                   end},
+
+         #{desc => "await continue (recv_and_validate 2)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, recv_and_validate)
+                   end},
+         #{desc => "recv (2)",
+           cmd  => fun(#{sock      := Sock,
+                         server_sa := #{family := local} = ServerSA,
+                         recv      := Recv,
+                         read_pkg  := RPkg,
+                         read_byte := RByte} = State) ->
+                           case Recv(Sock) of
+                               {ok, {ServerSA, Data}} ->
+                                   ?SEV_IPRINT("recv ~p bytes", [size(Data)]),
+                                   {ok, State#{read_pkg  => RPkg + 1,
+                                               read_byte => RByte + size(Data)}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end;
+		      (#{sock      := Sock,
+                         server_sa := #{addr := Addr, port := Port},
+                         recv      := Recv,
+                         read_pkg  := RPkg,
+                         read_byte := RByte} = State) ->
+                           case Recv(Sock) of
+                               {ok, {#{addr := Addr, port := Port}, Data}} ->
+                                   ?SEV_IPRINT("recv ~p bytes", [size(Data)]),
+                                   {ok, State#{read_pkg  => RPkg + 1,
+                                               read_byte => RByte + size(Data)}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "validate (recv 2)",
+           cmd  => fun(#{sock      := Sock,
+                         read_pkg  := RPkg,
+                         read_byte := RByte,
+                         write_pkg  := SPkg,
+                         write_byte := SByte} = _State) ->
+                           try socket:info(Sock) of
+                               #{counters := Counters} ->
+                                   ?SEV_IPRINT("validate counters: "
+                                               "~n   ~p", [Counters]),
+                                   traffic_sar_counters_validation(
+                                     Counters,
+                                     [{read_pkg,    RPkg},
+                                      {read_byte,   RByte},
+                                      {write_pkg,   SPkg},
+                                      {write_byte,  SByte},
+                                      {read_tries,  any},
+                                      {write_tries, any}])
+                           catch
+                               C:E:S ->
+                                   ?SEV_EPRINT("Failed get socket info: "
+                                               "~n   Class: ~p"
+                                               "~n   Error: ~p"
+                                               "~n   Stack: ~p", [C, E, S]),
+                                   {error, {socket_info_failed, {C, E, S}}}
+                           end
+                   end},
+         #{desc => "announce ready (recv_and_validate 2)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv_and_validate),
+                           ok
+                   end},
+
+         %% Termination
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close connection socket",
+           cmd  => fun(#{domain   := local,
+                         sock     := Sock,
+                         local_sa := #{path := Path}} = State) ->
+                           ok = socket:close(Sock),
+                           State1 =
+                               unlink_path(Path,
+                                           fun() ->
+                                                   maps:remove(local_sa, State)
+                                           end,
+                                           fun() -> State end),
+                           {ok, maps:remove(sock, State1)};
+                      (#{sock := Sock} = State) ->
+                           socket:close(Sock),
+                           {ok, maps:remove(sock, State)}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "monitor server",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor client",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+
+         %% Start the server
+         #{desc => "order server start",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid),
+                           ok
+                   end},
+         #{desc => "await server ready (init)",
+           cmd  => fun(#{domain := local,
+                         server := Pid} = State) ->
+                           {ok, Path} = ?SEV_AWAIT_READY(Pid, server, init),
+                           {ok, State#{path => Path}};
+                      (#{server := Pid} = State) ->
+                           {ok, Port} = ?SEV_AWAIT_READY(Pid, server, init),
+                           {ok, State#{port => Port}}
+                   end},
+
+         %% Start the client
+         #{desc => "order client start",
+           cmd  => fun(#{domain := local,
+                         client := Pid,
+                         path   := Path} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, Path),
+                           ok;
+                      (#{client := Pid,
+                         port   := Port} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, Port),
+                           ok
+                   end},
+         #{desc => "await client ready (init)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, client, init)
+                   end},
+
+         %% *** The actual test ***
+
+         #{desc => "order server to continue (recv_and_validate 1)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Server, recv_and_validate),
+                           ok
+                   end},
+         #{desc => "order client to continue (send_and_validate 1)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, send_and_validate),
+                           ok
+                   end},
+         #{desc => "await client ready (send_and_validate 1)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, send_and_validate)
+                   end},
+         #{desc => "await server ready (recv_and_validate 1)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, recv_and_validate)
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "order client to continue (recv_and_validate 1)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, recv_and_validate),
+                           ok
+                   end},
+         #{desc => "order server to continue (send_and_validate 1)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Server, send_and_validate),
+                           ok
+                   end},
+         #{desc => "await server ready (send_and_validate 1)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, send_and_validate)
+                   end},
+         #{desc => "await client ready (recv_and_validate 1)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, recv_and_validate)
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "order server to continue (recv_and_validate 2)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Server, recv_and_validate),
+                           ok
+                   end},
+         #{desc => "order client to continue (send_and_validate 2)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, send_and_validate),
+                           ok
+                   end},
+         #{desc => "await client ready (send_and_validate 2)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, send_and_validate)
+                   end},
+         #{desc => "await server ready (recv_and_validate 2)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, recv_and_validate)
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "order client to continue (recv_and_validate 2)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, recv_and_validate),
+                           ok
+                   end},
+         #{desc => "order server to continue (send_and_validate 2)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Server, send_and_validate),
+                           ok
+                   end},
+         #{desc => "await server ready (send_and_validate 2)",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, send_and_validate)
+                   end},
+         #{desc => "await client ready (recv_and_validate 2)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, recv_and_validate)
+                   end},
+
+         %% *** Termination ***
+         #{desc => "order client to terminate",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Client),
+                           ok
+                   end},
+         #{desc => "await client termination",
+           cmd  => fun(#{client := Client} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Client),
+                           State1 = maps:remove(client, State),
+                           {ok, State1}
+                   end},
+         #{desc => "order server to terminate",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Server),
+                           ok
+                   end},
+         #{desc => "await server termination",
+           cmd  => fun(#{server := Server} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Server),
+                           State1 = maps:remove(server, State),
+                           {ok, State1}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    i("start server evaluator"),
+    ServerInitState = InitState#{host => local_host()},
+    Server = ?SEV_START("server", ServerSeq, ServerInitState),
+
+    i("start client evaluator(s)"),
+    ClientInitState = InitState#{host => local_host()},
+    Client = ?SEV_START("client", ClientSeq, ClientInitState),
+
+    i("start 'tester' evaluator"),
+    TesterInitState = #{server => Server#ev.pid,
+                        client => Client#ev.pid},
+    Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    i("await evaluator"),
+    ok = ?SEV_AWAIT_FINISH([Server, Client, Tester]).
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the send and recv functions
+%% behave as expected when sending and/or reading chunks.
+%% First send data in one "big" chunk, and read it in "small" chunks.
+%% Second, send in a bunch of "small" chunks, and read in one "big" chunk.
+%% Socket is IPv4.
+
+traffic_send_and_recv_chunks_tcp4(suite) ->
+    [];
+traffic_send_and_recv_chunks_tcp4(doc) ->
+    [];
+traffic_send_and_recv_chunks_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(traffic_send_and_recv_chunks_tcp4,
+           fun() ->
+                   InitState = #{domain => inet,
+                                 proto  => tcp},
+                   ok = traffic_send_and_recv_chunks_tcp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the send and recv functions
+%% behave as expected when sending and/or reading chunks.
+%% First send data in one "big" chunk, and read it in "small" chunks.
+%% Second, send in a bunch of "small" chunks, and read in one "big" chunk.
+%% Socket is IPv6.
+
+traffic_send_and_recv_chunks_tcp6(suite) ->
+    [];
+traffic_send_and_recv_chunks_tcp6(doc) ->
+    [];
+traffic_send_and_recv_chunks_tcp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(traffic_send_and_recv_chunks_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   InitState = #{domain => inet6,
+                                 proto  => tcp},
+                   ok = traffic_send_and_recv_chunks_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the send and recv functions
+%% behave as expected when sending and/or reading chunks.
+%% First send data in one "big" chunk, and read it in "small" chunks.
+%% Second, send in a bunch of "small" chunks, and read in one "big" chunk.
+%% Socket is UNix Domain (Stream) socket.
+
+traffic_send_and_recv_chunks_tcpL(suite) ->
+    [];
+traffic_send_and_recv_chunks_tcpL(doc) ->
+    [];
+traffic_send_and_recv_chunks_tcpL(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    tc_try(traffic_send_and_recv_chunks_tcp6,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   InitState = #{domain => local,
+                                 proto  => default},
+                   ok = traffic_send_and_recv_chunks_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+traffic_send_and_recv_chunks_tcp(InitState) ->
+    ServerSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{local_sa => LSA}}
+                   end},
+         #{desc => "create listen socket",
+           cmd  => fun(#{domain := Domain, proto := Proto} = State) ->
+                           case socket:open(Domain, stream, Proto) of
+                               {ok, Sock} ->
+                                   {ok, State#{lsock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{domain   := local,
+                         lsock    := LSock,
+                         local_sa := LSA} = _State) ->
+                           case socket:bind(LSock, LSA) of
+                               {ok, _Port} ->
+                                   ok; % We do not care about the port for local
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end;
+                      (#{lsock    := LSock,
+                         local_sa := LSA} = State) ->
+                           case socket:bind(LSock, LSA) of
+                               {ok, Port} ->
+                                   {ok, State#{lport => Port}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "make listen socket",
+           cmd  => fun(#{lsock := LSock}) ->
+                           socket:listen(LSock)
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{domain   := local,
+                         tester   := Tester,
+                         local_sa := LSA}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, LSA),
+                           ok;
+                      (#{tester   := Tester,
+                         local_sa := LSA,
+                         lport    := Port}) ->
+                           ServerSA = LSA#{port => Port},
+                           ?SEV_ANNOUNCE_READY(Tester, init, ServerSA),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (accept)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, accept)
+                   end},
+         #{desc => "accept",
+           cmd  => fun(#{lsock := LSock} = State) ->
+                           case socket:accept(LSock) of
+                               {ok, Sock} ->
+                                   {ok, State#{csock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (accept)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, accept),
+                           ok
+                   end},
+
+         #{desc => "await continue (recv-many-small)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, recv_many_small)
+                   end},
+         #{desc => "recv chunk 1",
+           cmd  => fun(#{csock := Sock} = State) ->
+                           case socket:recv(Sock, 100) of
+                               {ok, Chunk} ->
+                                   ?SEV_IPRINT("recv of chunk 1 of ~p bytes",
+                                               [size(Chunk)]),
+                                   {ok, State#{chunks => [b2l(Chunk)]}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "recv chunk 2",
+           cmd  => fun(#{csock  := Sock,
+                         chunks := Chunks} = State) ->
+                           case socket:recv(Sock, 100) of
+                               {ok, Chunk} ->
+                                   ?SEV_IPRINT("recv of chunk 2 of ~p bytes",
+                                               [size(Chunk)]),
+                                   {ok, State#{chunks => [b2l(Chunk)|Chunks]}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "recv chunk 3",
+           cmd  => fun(#{csock  := Sock,
+                         chunks := Chunks} = State) ->
+                           case socket:recv(Sock, 100) of
+                               {ok, Chunk} ->
+                                   ?SEV_IPRINT("recv of chunk 3 of ~p bytes",
+                                               [size(Chunk)]),
+                                   {ok, State#{chunks => [b2l(Chunk)|Chunks]}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "recv chunk 4",
+           cmd  => fun(#{csock  := Sock,
+                         chunks := Chunks} = State) ->
+                           case socket:recv(Sock, 100) of
+                               {ok, Chunk} ->
+                                   ?SEV_IPRINT("recv of chunk 4 of ~p bytes",
+                                               [size(Chunk)]),
+                                   {ok, State#{chunks => [b2l(Chunk)|Chunks]}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "recv chunk 5",
+           cmd  => fun(#{csock  := Sock,
+                         chunks := Chunks} = State) ->
+                           case socket:recv(Sock, 100) of
+                               {ok, Chunk} ->
+                                   ?SEV_IPRINT("recv of chunk 5 of ~p bytes",
+                                               [size(Chunk)]),
+                                   {ok, State#{chunks => [b2l(Chunk)|Chunks]}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "recv chunk 6",
+           cmd  => fun(#{csock  := Sock,
+                         chunks := Chunks} = State) ->
+                           case socket:recv(Sock, 100) of
+                               {ok, Chunk} ->
+                                   ?SEV_IPRINT("recv of chunk 6 of ~p bytes",
+                                               [size(Chunk)]),
+                                   {ok, State#{chunks => [b2l(Chunk)|Chunks]}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "recv chunk 7",
+           cmd  => fun(#{csock  := Sock,
+                         chunks := Chunks} = State) ->
+                           case socket:recv(Sock, 100) of
+                               {ok, Chunk} ->
+                                   ?SEV_IPRINT("recv of chunk 7 of ~p bytes",
+                                               [size(Chunk)]),
+                                   {ok, State#{chunks => [b2l(Chunk)|Chunks]}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "recv chunk 8",
+           cmd  => fun(#{csock  := Sock,
+                         chunks := Chunks} = State) ->
+                           case socket:recv(Sock, 100) of
+                               {ok, Chunk} ->
+                                   ?SEV_IPRINT("recv of chunk 8 of ~p bytes",
+                                               [size(Chunk)]),
+                                   {ok, State#{chunks => [b2l(Chunk)|Chunks]}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "recv chunk 9",
+           cmd  => fun(#{csock  := Sock,
+                         chunks := Chunks} = State) ->
+                           case socket:recv(Sock, 100) of
+                               {ok, Chunk} ->
+                                   ?SEV_IPRINT("recv of chunk 9 of ~p bytes",
+                                               [size(Chunk)]),
+                                   {ok, State#{chunks => [b2l(Chunk)|Chunks]}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "recv chunk 10",
+           cmd  => fun(#{csock  := Sock,
+                         chunks := Chunks} = State) ->
+                           case socket:recv(Sock, 100) of
+                               {ok, Chunk} ->
+                                   ?SEV_IPRINT("recv of chunk 10 of ~p bytes",
+                                               [size(Chunk)]),
+                                   {ok, State#{chunks => [b2l(Chunk)|Chunks]}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv-many-small)",
+           cmd  => fun(#{tester := Tester,
+                         chunks := Chunks} = State) ->
+                           Data = lists:flatten(lists:reverse(Chunks)),
+                           ?SEV_ANNOUNCE_READY(Tester, recv_many_small, Data),
+                           {ok, maps:remove(chunks, State)}
+                   end},
+
+         #{desc => "await continue (recv-one-big)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_CONTINUE(Tester, tester, recv_one_big) of
+                               {ok, Size} ->
+                                   {ok, State#{size => Size}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "recv (one big)",
+           cmd  => fun(#{tester := Tester, csock := Sock, size := Size} = _State) ->
+                           %% socket:setopt(Sock, otp, debug, true),
+                           case socket:recv(Sock, Size) of
+                               {ok, Data} ->
+                                   ?SEV_ANNOUNCE_READY(Tester,
+                                                       recv_one_big,
+                                                       b2l(Data)),
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "close connection socket (just in case)",
+           cmd  => fun(#{csock := Sock} = State) ->
+                           (catch socket:close(Sock)),
+                           {ok, maps:remove(csock, State)}
+                   end},
+         #{desc => "close listen socket",
+           cmd  => fun(#{domain   := local,
+                         lsock    := Sock,
+                         local_sa := #{path := Path}} = State) ->
+                           ok = socket:close(Sock),
+                           State1 =
+                               unlink_path(Path,
+                                           fun() ->
+                                                   maps:remove(local_sa, State)
+                                           end,
+                                           fun() -> State end),
+                           {ok, maps:remove(lsock, State1)};
+                      (#{lsock := Sock} = State) ->
+                           (catch socket:close(Sock)),
+                           {ok, maps:remove(lsock, State)}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    ClientSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           {Tester, ServerSA} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester    => Tester,
+                                       server_sa => ServerSA}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "create node",
+           cmd  => fun(#{host := Host} = State) ->
+                           case start_node(Host, client) of
+                               {ok, Node} ->
+                                   ?SEV_IPRINT("(remote) client node ~p started",
+                                               [Node]),
+                                   {ok, State#{node => Node}};
+                               {error, Reason} ->
+                                   {skip, Reason}
+                           end
+                   end},
+         #{desc => "monitor client node",
+           cmd  => fun(#{node := Node} = _State) ->
+                           true = erlang:monitor_node(Node, true),
+                           ok
+                   end},
+         #{desc => "start remote client",
+           cmd  => fun(#{node := Node} = State) ->
+                           Pid = traffic_snr_tcp_client_start(Node),
+                           ?SEV_IPRINT("client ~p started", [Pid]),
+                           {ok, State#{rclient => Pid}}
+                   end},
+         #{desc => "monitor remote client",
+           cmd  => fun(#{rclient := Pid}) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "order remote client to start",
+           cmd  => fun(#{rclient   := Client,
+                         server_sa := ServerSA,
+                         proto     := Proto}) ->
+                           ?SEV_ANNOUNCE_START(Client, {ServerSA, Proto}),
+                           ok
+                   end},
+         #{desc => "await remote client ready",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, rclient, init,
+                                            [{tester, Tester}])
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (connect)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, connect,
+                                               [{rclient, Client}]),
+                           ok
+                   end},
+         #{desc => "order remote client to continue (connect)",
+           cmd  => fun(#{rclient := Client}) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, connect),
+                           ok
+                   end},
+         #{desc => "await client process ready (connect)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, rclient, connect,
+                                            [{tester, Tester}])
+                   end},
+         #{desc => "announce ready (connect)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, connect),
+                           ok
+                   end},
+
+         #{desc => "await continue (send-one-big)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = State) ->
+                           case ?SEV_AWAIT_CONTINUE(Tester, tester,
+                                                    send_one_big,
+                                                    [{rclient, Client}]) of
+                               {ok, Data} ->
+                                   {ok, State#{data => Data}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order remote client to continue (send)",
+           cmd  => fun(#{rclient := Client, data := Data}) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, send, Data),
+                           ok
+                   end},
+         #{desc => "await client process ready (send)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           case ?SEV_AWAIT_READY(Client, rclient, send,
+                                                 [{tester, Tester}]) of
+                               {ok, Result} ->
+                                   Result;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (send-one-big)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, send_one_big),
+                           ok
+                   end},
+
+         #{desc => "await continue (send-many-small)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = State) ->
+                           case ?SEV_AWAIT_CONTINUE(Tester, tester,
+                                                    send_many_small,
+                                                    [{rclient, Client}]) of
+                               {ok, Data} ->
+                                   {ok, State#{data => Data}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order remote client to continue (send chunk 1)",
+           cmd  => fun(#{rclient := Client,
+                         data    := Data} = State) ->
+                           {Chunk, RestData} = lists:split(100, Data),
+                           %% ?SEV_IPRINT("order send of chunk 1: "
+                           %%             "~n   Size: ~p"
+                           %%             "~n   ~p", [length(Chunk), Chunk]),
+                           ?SEV_ANNOUNCE_CONTINUE(Client, send, Chunk),
+                           {ok, State#{data => RestData}}
+                   end},
+         #{desc => "await client process ready (send chunk 1)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           case ?SEV_AWAIT_READY(Client, rclient, send, 
+                                                 [{tester, Tester}]) of
+                               {ok, Result} ->
+                                   Result;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order remote client to continue (send chunk 2)",
+           cmd  => fun(#{rclient := Client,
+                         data    := Data} = State) ->
+                           {Chunk, RestData} = lists:split(100, Data),
+                           %% ?SEV_IPRINT("order send of chunk 2: "
+                           %%             "~n   Size: ~p"
+                           %%             "~n   ~p", [length(Chunk), Chunk]),
+                           ?SEV_ANNOUNCE_CONTINUE(Client, send, Chunk),
+                           {ok, State#{data => RestData}}
+                   end},
+         #{desc => "await client process ready (send chunk 2)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           case ?SEV_AWAIT_READY(Client, rclient, send, 
+                                                 [{tester, Tester}]) of
+                               {ok, Result} ->
+                                   Result;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order remote client to continue (send chunk 3)",
+           cmd  => fun(#{rclient := Client,
+                         data    := Data} = State) ->
+                           {Chunk, RestData} = lists:split(100, Data),
+                           %% ?SEV_IPRINT("order send of chunk 3: "
+                           %%             "~n   Size: ~p"
+                           %%             "~n   ~p", [length(Chunk), Chunk]),
+                           ?SEV_ANNOUNCE_CONTINUE(Client, send, Chunk),
+                           {ok, State#{data => RestData}}
+                   end},
+         #{desc => "await client process ready (send chunk 3)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           case ?SEV_AWAIT_READY(Client, rclient, send, 
+                                                 [{tester, Tester}]) of
+                               {ok, Result} ->
+                                   Result;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order remote client to continue (send chunk 4)",
+           cmd  => fun(#{rclient := Client,
+                         data    := Data} = State) ->
+                           {Chunk, RestData} = lists:split(100, Data),
+                           %% ?SEV_IPRINT("order send of chunk 4: "
+                           %%             "~n   Size: ~p"
+                           %%             "~n   ~p", [length(Chunk), Chunk]),
+                           ?SEV_ANNOUNCE_CONTINUE(Client, send, Chunk),
+                           {ok, State#{data => RestData}}
+                   end},
+         #{desc => "await client process ready (send chunk 4)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           case ?SEV_AWAIT_READY(Client, rclient, send, 
+                                                 [{tester, Tester}]) of
+                               {ok, Result} ->
+                                   Result;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order remote client to continue (send chunk 5)",
+           cmd  => fun(#{rclient := Client,
+                         data    := Data} = State) ->
+                           {Chunk, RestData} = lists:split(100, Data),
+                           %% ?SEV_IPRINT("order send of chunk 5: "
+                           %%             "~n   Size: ~p"
+                           %%             "~n   ~p", [length(Chunk), Chunk]),
+                           ?SEV_ANNOUNCE_CONTINUE(Client, send, Chunk),
+                           {ok, State#{data => RestData}}
+                   end},
+         #{desc => "await client process ready (send chunk 5)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           case ?SEV_AWAIT_READY(Client, rclient, send, 
+                                                 [{tester, Tester}]) of
+                               {ok, Result} ->
+                                   Result;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order remote client to continue (send chunk 6)",
+           cmd  => fun(#{rclient := Client,
+                         data    := Data} = State) ->
+                           {Chunk, RestData} = lists:split(100, Data),
+                           %% ?SEV_IPRINT("order send of chunk 6: "
+                           %%             "~n   Size: ~p"
+                           %%             "~n   ~p", [length(Chunk), Chunk]),
+                           ?SEV_ANNOUNCE_CONTINUE(Client, send, Chunk),
+                           {ok, State#{data => RestData}}
+                   end},
+         #{desc => "await client process ready (send chunk 6)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           case ?SEV_AWAIT_READY(Client, rclient, send, 
+                                                 [{tester, Tester}]) of
+                               {ok, Result} ->
+                                   Result;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order remote client to continue (send chunk 7)",
+           cmd  => fun(#{rclient := Client,
+                         data    := Data} = State) ->
+                           {Chunk, RestData} = lists:split(100, Data),
+                           %% ?SEV_IPRINT("order send of chunk 7: "
+                           %%             "~n   Size: ~p"
+                           %%             "~n   ~p", [length(Chunk), Chunk]),
+                           ?SEV_ANNOUNCE_CONTINUE(Client, send, Chunk),
+                           {ok, State#{data => RestData}}
+                   end},
+         #{desc => "await client process ready (send chunk 7)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           case ?SEV_AWAIT_READY(Client, rclient, send, 
+                                                 [{tester, Tester}]) of
+                               {ok, Result} ->
+                                   Result;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order remote client to continue (send chunk 8)",
+           cmd  => fun(#{rclient := Client,
+                         data    := Data} = State) ->
+                           {Chunk, RestData} = lists:split(100, Data),
+                           %% ?SEV_IPRINT("order send of chunk 8: "
+                           %%             "~n   Size: ~p"
+                           %%             "~n   ~p", [length(Chunk), Chunk]),
+                           ?SEV_ANNOUNCE_CONTINUE(Client, send, Chunk),
+                           {ok, State#{data => RestData}}
+                   end},
+         #{desc => "await client process ready (send chunk 8)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           case ?SEV_AWAIT_READY(Client, rclient, send, 
+                                                 [{tester, Tester}]) of
+                               {ok, Result} ->
+                                   Result;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order remote client to continue (send chunk 9)",
+           cmd  => fun(#{rclient := Client,
+                         data    := Data} = State) ->
+                           {Chunk, RestData} = lists:split(100, Data),
+                           %% ?SEV_IPRINT("order send of chunk 9: "
+                           %%             "~n   Size: ~p"
+                           %%             "~n   ~p", [length(Chunk), Chunk]),
+                           ?SEV_ANNOUNCE_CONTINUE(Client, send, Chunk),
+                           {ok, State#{data => RestData}}
+                   end},
+         #{desc => "await client process ready (send chunk 9)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           case ?SEV_AWAIT_READY(Client, rclient, send, 
+                                                 [{tester, Tester}]) of
+                               {ok, Result} ->
+                                   Result;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order remote client to continue (send chunk 10)",
+           cmd  => fun(#{rclient := Client,
+                         data    := Data} = State) ->
+                           {Chunk, []} = lists:split(100, Data),
+                           %% ?SEV_IPRINT("order send of chunk 10: "
+                           %%             "~n   Size: ~p"
+                           %%             "~n   ~p", [length(Chunk), Chunk]),
+                           ?SEV_ANNOUNCE_CONTINUE(Client, send, Chunk),
+                           {ok, maps:remove(data, State)}
+                   end},
+         #{desc => "await client process ready (send chunk 10)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           case ?SEV_AWAIT_READY(Client, rclient, send, 
+                                                 [{tester, Tester}]) of
+                               {ok, Result} ->
+                                   Result;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order remote client to continue (send stop)",
+           cmd  => fun(#{rclient := Client} = State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, send, stop),
+                           {ok, maps:remove(data, State)}
+                   end},
+         #{desc => "await client process ready (send stop)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := Client} = _State) ->
+                           case ?SEV_AWAIT_READY(Client, rclient, send, 
+                                                 [{tester, Tester}]) of
+                               {ok, Result} ->
+                                   Result;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (send-many-small)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, send_many_small),
+                           ok
+                   end},
+
+         %% Termination
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester  := Tester, 
+                         rclient := Client} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester,
+                                                     [{rclient, Client}]) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "kill remote client",
+           cmd  => fun(#{rclient := Client}) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Client),
+                           ok
+                   end},
+         #{desc => "await remote client termination",
+           cmd  => fun(#{rclient := Client} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Client),
+                           State1 = maps:remove(rclient, State),
+                           {ok, State1}
+                   end},
+         #{desc => "stop client node",
+           cmd  => fun(#{node := Node} = _State) ->
+                           stop_node(Node)
+                   end},
+         #{desc => "await client node termination",
+           cmd  => fun(#{node := Node} = State) ->
+                           receive
+                               {nodedown, Node} ->
+                                   {ok, maps:remove(node, State)}
+                           end
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "monitor server",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor client",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+
+         %% Start the server
+         #{desc => "order server start",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid),
+                           ok
+                   end},
+         #{desc => "await server ready (init)",
+           cmd  => fun(#{server := Pid} = State) ->
+                           {ok, ServerSA} = ?SEV_AWAIT_READY(Pid, server, init),
+                           {ok, State#{server_sa => ServerSA}}
+                   end},
+
+         %% Start the client
+         #{desc => "order client start",
+           cmd  => fun(#{client    := Pid, 
+                         server_sa := ServerSA} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, ServerSA),
+                           ok
+                   end},
+         #{desc => "await client ready (init)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, client, init)
+                   end},
+ 
+         %% The actual test
+         #{desc => "order server continue (accept)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, accept),
+                           ok
+                   end},
+         ?SEV_SLEEP(?SECS(1)),
+         #{desc => "order client continue (connect)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, connect),
+                           ok
+                   end},
+         #{desc => "await server ready (accept)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, accept,
+                                            [{client, Client}]),
+                           ok
+                   end},
+         #{desc => "await client ready (connect)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, connect, 
+                                            [{server, Server}])
+                   end},
+
+         #{desc => "generate data",
+           cmd  => fun(State) ->
+                           D1 = lists:seq(1,250),
+                           D2 = lists:duplicate(4, D1),
+                           D3 = lists:flatten(D2),
+                           {ok, State#{data => D3}}
+                   end},
+
+         %% (client) Send one big and (server) recv may small
+         #{desc => "order server continue (recv-many-small)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv_many_small),
+                           ok
+                   end},
+         ?SEV_SLEEP(?SECS(1)),
+         #{desc => "order client continue (send-one-big)",
+           cmd  => fun(#{client := Pid, data := Data} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, send_one_big, Data),
+                           ok
+                   end},
+         #{desc => "await client ready (send-one-big)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Client, client, send_one_big, 
+                                                 [{server, Server}])
+                   end},
+         #{desc => "await server ready (recv-many-small)",
+           cmd  => fun(#{server := Server,
+                         client := Client, 
+                         data   := Data} = _State) ->
+                           case ?SEV_AWAIT_READY(Server, server, recv_many_small,
+                                                 [{client, Client}]) of
+                               {ok, Data} ->
+                                   ok;
+                               {ok, OtherData} ->
+                                   {error, {mismatched_data, Data, OtherData}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         #{desc => "order server continue (recv-one-big)",
+           cmd  => fun(#{server := Pid, data := Data} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv_one_big, length(Data)),
+                           ok
+                   end},
+         ?SEV_SLEEP(?SECS(1)),
+         #{desc => "order client continue (send-many-small)",
+           cmd  => fun(#{client := Pid, data := Data} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, send_many_small, Data),
+                           ok
+                   end},
+         #{desc => "await client ready (send-many-small)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Client, client, send_many_small, 
+                                                 [{server, Server}])
+                   end},
+         #{desc => "await server ready (recv-one-big)",
+           cmd  => fun(#{server := Server,
+                         client := Client, 
+                         data   := Data} = State) ->
+                           case ?SEV_AWAIT_READY(Server, server, recv_one_big,
+                                                 [{client, Client}]) of
+                               {ok, Data} ->
+                                   {ok, maps:remove(data, State)};
+                               {ok, OtherData} ->
+                                   {error, {mismatched_data, Data, OtherData}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+         %% Terminations
+         #{desc => "order client to terminate",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await client termination",
+           cmd  => fun(#{client := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(client, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order server to terminate",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await server termination",
+           cmd  => fun(#{server := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(server, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    i("start server evaluator"),
+    ServerInitState = InitState,
+    Server = ?SEV_START("server", ServerSeq, ServerInitState),
+
+    i("start client evaluator(s)"),
+    ClientInitState = InitState#{host => local_host()},
+    Client = ?SEV_START("client", ClientSeq, ClientInitState),
+
+    i("start 'tester' evaluator"),
+    TesterInitState = #{server => Server#ev.pid,
+                        client => Client#ev.pid},
+    Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    i("await evaluator"),
+    ok = ?SEV_AWAIT_FINISH([Server, Client, Tester]).
+    
+
+
+traffic_snr_tcp_client_start(Node) ->
+    Self = self(),
+    Fun  = fun() -> traffic_snr_tcp_client(Self) end,
+    erlang:spawn(Node, Fun).
+
+traffic_snr_tcp_client(Parent) ->
+    {Sock, ServerSA, Path} = traffic_snr_tcp_client_init(Parent),
+    traffic_snr_tcp_client_announce_ready(Parent, init),
+    traffic_snr_tcp_client_await_continue(Parent, connect),
+    traffic_snr_tcp_client_connect(Sock, ServerSA),
+    traffic_snr_tcp_client_announce_ready(Parent, connect),
+    traffic_snr_tcp_client_send_loop(Parent, Sock),
+    Reason = traffic_snr_tcp_client_await_terminate(Parent),
+    traffic_snr_tcp_client_close(Sock, Path),
+    exit(Reason).
+
+
+traffic_snr_tcp_client_send_loop(Parent, Sock) ->
+    case ?SEV_AWAIT_CONTINUE(Parent, parent, send) of
+        {ok, stop} -> % Breakes the loop
+            ?SEV_ANNOUNCE_READY(Parent, send, ok),
+            ok;
+        {ok, Data} ->
+            case socket:send(Sock, Data) of
+                ok ->
+                    ?SEV_ANNOUNCE_READY(Parent, send, ok),
+                    traffic_snr_tcp_client_send_loop(Parent, Sock);
+                {error, Reason} = ERROR ->
+                    ?SEV_ANNOUNCE_READY(Parent, send, ERROR),
+                    exit({send, Reason})
+            end;
+        {error, Reason} ->
+            exit({await_continue, Reason})
+    end.
+
+traffic_snr_tcp_client_init(Parent) ->
+    put(sname, "rclient"),
+    ?SEV_IPRINT("init"),
+    _MRef = erlang:monitor(process, Parent),
+    {ServerSA, Proto} = traffic_snr_tcp_client_await_start(Parent),
+    Domain   = maps:get(family, ServerSA),
+    Sock     = traffic_snr_tcp_client_create(Domain, Proto),
+    Path     = traffic_snr_tcp_client_bind(Sock, Domain),
+    {Sock, ServerSA, Path}.
+
+traffic_snr_tcp_client_await_start(Parent) ->
+    i("traffic_snr_tcp_client_await_start -> entry"),
+    ?SEV_AWAIT_START(Parent).
+
+traffic_snr_tcp_client_create(Domain, Proto) ->
+    i("traffic_snr_tcp_client_create -> entry"),
+    case socket:open(Domain, stream, Proto) of
+        {ok, Sock} ->
+            Sock;
+        {error, Reason} ->
+            exit({open_failed, Reason})
+    end.
+
+traffic_snr_tcp_client_bind(Sock, Domain) ->
+    i("traffic_snr_tcp_client_bind -> entry"),
+    LSA = which_local_socket_addr(Domain),
+    case socket:bind(Sock, LSA) of
+        {ok, _} ->
+            case socket:sockname(Sock) of
+                {ok, #{family := local, path := Path}} ->
+                    Path;
+                {ok, _} ->
+                    undefined;
+                {error, Reason1} ->
+                    exit({sockname, Reason1})
+            end;
+        {error, Reason} ->
+            exit({bind, Reason})
+    end.
+
+traffic_snr_tcp_client_announce_ready(Parent, Slogan) ->
+    ?SEV_ANNOUNCE_READY(Parent, Slogan).
+
+traffic_snr_tcp_client_await_continue(Parent, Slogan) ->
+    i("traffic_snr_tcp_client_await_continue -> entry"),
+    ?SEV_AWAIT_CONTINUE(Parent, parent, Slogan).
+
+traffic_snr_tcp_client_connect(Sock, ServerSA) ->
+    i("traffic_snr_tcp_client_connect -> entry"),
+    case socket:connect(Sock, ServerSA) of
+        ok ->
+            ok;
+        {error, Reason} ->
+            exit({connect, Reason})
+    end.
+
+traffic_snr_tcp_client_close(Sock, Path) ->
+    i("traffic_snr_tcp_client_close -> entry"),
+    case socket:close(Sock) of
+        ok ->
+            unlink_path(Path),
+            ok;
+        {error, Reason} ->
+            ?SEV_EPRINT("failed closing: "
+                        "~n   Reason: ~p", [Reason]),
+            unlink_path(Path),
+            {error, {close, Reason}}
+    end.
+
+traffic_snr_tcp_client_await_terminate(Parent) ->
+    i("traffic_snr_tcp_client_await_terminate -> entry"),
+    case ?SEV_AWAIT_TERMINATE(Parent, parent) of
+        ok ->
+            ok;
+        {error, Reason} ->
+            Reason
+    end.
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the send and recv functions
+%% by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for three different message sizes; 
+%% small (8 bytes), medium (8K) and large (8M).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'small' message test case, for IPv4.
+
+traffic_ping_pong_small_send_and_recv_tcp4(suite) ->
+    [];
+traffic_ping_pong_small_send_and_recv_tcp4(doc) ->
+    [];
+traffic_ping_pong_small_send_and_recv_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(15)),
+    Msg = l2b(?TPP_SMALL),
+    Num = ?TPP_SMALL_NUM,
+    tc_try(traffic_ping_pong_small_send_and_recv_tcp4,
+           fun() ->
+                   InitState = #{domain => inet,
+                                 proto  => tcp,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_send_and_recv_tcp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the send and recv functions
+%% by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for three different message sizes; 
+%% small (8 bytes), medium (8K) and large (8M).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'small' message test case, for IPv6.
+
+traffic_ping_pong_small_send_and_recv_tcp6(suite) ->
+    [];
+traffic_ping_pong_small_send_and_recv_tcp6(doc) ->
+    [];
+traffic_ping_pong_small_send_and_recv_tcp6(_Config) when is_list(_Config) ->
+    ?TT(?SECS(15)),
+    Msg = l2b(?TPP_SMALL),
+    Num = ?TPP_SMALL_NUM,
+    tc_try(traffic_ping_pong_small_send_and_recv_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   InitState = #{domain => inet6,
+                                 proto  => tcp,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_send_and_recv_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the send and recv functions
+%% by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for three different message sizes; 
+%% small (8 bytes), medium (8K) and large (8M).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'small' message test case, for Unix Domain (stream) socket.
+
+traffic_ping_pong_small_send_and_recv_tcpL(suite) ->
+    [];
+traffic_ping_pong_small_send_and_recv_tcpL(doc) ->
+    [];
+traffic_ping_pong_small_send_and_recv_tcpL(_Config) when is_list(_Config) ->
+    ?TT(?SECS(15)),
+    Msg = l2b(?TPP_SMALL),
+    Num = ?TPP_SMALL_NUM,
+    tc_try(traffic_ping_pong_small_send_and_recv_tcpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   InitState = #{domain => local,
+                                 proto  => default,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_send_and_recv_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the send and recv functions
+%% by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for three different message sizes; 
+%% small (8 bytes), medium (8K) and large (8M).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'medium' message test case, for IPv4.
+
+traffic_ping_pong_medium_send_and_recv_tcp4(suite) ->
+    [];
+traffic_ping_pong_medium_send_and_recv_tcp4(doc) ->
+    [];
+traffic_ping_pong_medium_send_and_recv_tcp4(_Config) when is_list(_Config) ->
+    Msg = l2b(?TPP_MEDIUM),
+    Num = ?TPP_MEDIUM_NUM,
+    tc_try(traffic_ping_pong_medium_send_and_recv_tcp4,
+           fun() ->
+                   ?TT(?SECS(30)),
+                   InitState = #{domain => inet,
+                                 proto  => tcp,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_send_and_recv_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the send and recv functions
+%% by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for three different message sizes; 
+%% small (8 bytes), medium (8K) and large (8M).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'medium' message test case, for IPv6.
+
+traffic_ping_pong_medium_send_and_recv_tcp6(suite) ->
+    [];
+traffic_ping_pong_medium_send_and_recv_tcp6(doc) ->
+    [];
+traffic_ping_pong_medium_send_and_recv_tcp6(_Config) when is_list(_Config) ->
+    Msg = l2b(?TPP_MEDIUM),
+    Num = ?TPP_MEDIUM_NUM,
+    tc_try(traffic_ping_pong_medium_send_and_recv_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   ?TT(?SECS(30)),
+                   InitState = #{domain => inet6,
+                                 proto  => tcp,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_send_and_recv_tcp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the send and recv functions
+%% by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for three different message sizes; 
+%% small (8 bytes), medium (8K) and large (8M).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'medium' message test case, for Unix Domain (stream) socket.
+
+traffic_ping_pong_medium_send_and_recv_tcpL(suite) ->
+    [];
+traffic_ping_pong_medium_send_and_recv_tcpL(doc) ->
+    [];
+traffic_ping_pong_medium_send_and_recv_tcpL(_Config) when is_list(_Config) ->
+    ?TT(?SECS(30)),
+    Msg = l2b(?TPP_MEDIUM),
+    Num = ?TPP_MEDIUM_NUM,
+    tc_try(traffic_ping_pong_medium_send_and_recv_tcpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   InitState = #{domain => local,
+                                 proto  => default,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_send_and_recv_tcp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the send and recv functions
+%% by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for three different message sizes; 
+%% small (8 bytes), medium (8K) and large (8M).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'large' message test case, for IPv4.
+
+traffic_ping_pong_large_send_and_recv_tcp4(suite) ->
+    [];
+traffic_ping_pong_large_send_and_recv_tcp4(doc) ->
+    [];
+traffic_ping_pong_large_send_and_recv_tcp4(_Config) when is_list(_Config) ->
+    ?TT(?SECS(45)),
+    Msg = l2b(?TPP_LARGE),
+    Num = ?TPP_LARGE_NUM,
+    tc_try(traffic_ping_pong_large_send_and_recv_tcp4,
+           fun() ->
+                   InitState = #{domain => inet,
+                                 proto  => tcp,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_send_and_recv_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the send and recv functions
+%% by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for three different message sizes; 
+%% small (8 bytes), medium (8K) and large (8M).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'large' message test case, for IPv6.
+
+traffic_ping_pong_large_send_and_recv_tcp6(suite) ->
+    [];
+traffic_ping_pong_large_send_and_recv_tcp6(doc) ->
+    [];
+traffic_ping_pong_large_send_and_recv_tcp6(_Config) when is_list(_Config) ->
+    Msg = l2b(?TPP_LARGE),
+    Num = ?TPP_LARGE_NUM,
+    tc_try(traffic_ping_pong_large_send_and_recv_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   ?TT(?SECS(45)),
+                   InitState = #{domain => inet6,
+                                 proto  => tcp,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_send_and_recv_tcp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the send and recv functions
+%% by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for three different message sizes; 
+%% small (8 bytes), medium (8K) and large (8M).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'large' message test case, for UNix Domain (stream) socket.
+
+traffic_ping_pong_large_send_and_recv_tcpL(suite) ->
+    [];
+traffic_ping_pong_large_send_and_recv_tcpL(doc) ->
+    [];
+traffic_ping_pong_large_send_and_recv_tcpL(_Config) when is_list(_Config) ->
+    ?TT(?SECS(45)),
+    Msg = l2b(?TPP_LARGE),
+    Num = ?TPP_LARGE_NUM,
+    tc_try(traffic_ping_pong_large_send_and_recv_tcpL,
+           fun() ->
+                   has_support_unix_domain_socket(),
+                   traffic_ping_pong_large_host_cond()
+           end,
+           fun() ->
+                   InitState = #{domain => local,
+                                 proto  => default,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_send_and_recv_tcp(InitState)
+           end).
+
+%% This test case is a bit extreme and fails on some hosts
+%% (e.g. OpenIndiana Hipster), so exclude them.
+traffic_ping_pong_large_host_cond() ->
+    traffic_ping_pong_large_host_cond(os:type(), os:version()).
+
+traffic_ping_pong_large_host_cond({unix, sunos}, _) ->
+    skip("TC does not work on platform");
+traffic_ping_pong_large_host_cond(_, _) ->
+    ok.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sendto and recvfrom 
+%% functions by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for two different message sizes; 
+%% small (8 bytes) and medium (8K).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'small' message test case, for IPv4.
+
+traffic_ping_pong_small_sendto_and_recvfrom_udp4(suite) ->
+    [];
+traffic_ping_pong_small_sendto_and_recvfrom_udp4(doc) ->
+    [];
+traffic_ping_pong_small_sendto_and_recvfrom_udp4(_Config) when is_list(_Config) ->
+    Msg = l2b(?TPP_SMALL),
+    Num = ?TPP_SMALL_NUM,
+    tc_try(traffic_ping_pong_small_sendto_and_recvfrom_udp4,
+           fun() ->
+                   ?TT(?SECS(45)),
+                   InitState = #{domain => inet,
+                                 proto  => udp,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_sendto_and_recvfrom_udp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sendto and recvfrom 
+%% functions by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for two different message sizes; 
+%% small (8 bytes) and medium (8K).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'small' message test case, for IPv6.
+
+traffic_ping_pong_small_sendto_and_recvfrom_udp6(suite) ->
+    [];
+traffic_ping_pong_small_sendto_and_recvfrom_udp6(doc) ->
+    [];
+traffic_ping_pong_small_sendto_and_recvfrom_udp6(_Config) when is_list(_Config) ->
+    Msg = l2b(?TPP_SMALL),
+    Num = ?TPP_SMALL_NUM,
+    tc_try(traffic_ping_pong_small_sendto_and_recvfrom_udp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   ?TT(?SECS(45)),
+                   InitState = #{domain => inet6,
+                                 proto  => udp,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_sendto_and_recvfrom_udp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sendto and recvfrom 
+%% functions by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for two different message sizes; 
+%% small (8 bytes) and medium (8K).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'small' message test case, for Unix Domain (dgram) socket.
+
+traffic_ping_pong_small_sendto_and_recvfrom_udpL(suite) ->
+    [];
+traffic_ping_pong_small_sendto_and_recvfrom_udpL(doc) ->
+    [];
+traffic_ping_pong_small_sendto_and_recvfrom_udpL(_Config) when is_list(_Config) ->
+    Msg = l2b(?TPP_SMALL),
+    Num = ?TPP_SMALL_NUM,
+    tc_try(traffic_ping_pong_small_sendto_and_recvfrom_udpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   ?TT(?SECS(45)),
+                   InitState = #{domain => local,
+                                 proto  => default,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_sendto_and_recvfrom_udp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sendto and recvfrom 
+%% functions by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for two different message sizes; 
+%% small (8 bytes) and medium (8K).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'medium' message test case, for IPv4.
+
+traffic_ping_pong_medium_sendto_and_recvfrom_udp4(suite) ->
+    [];
+traffic_ping_pong_medium_sendto_and_recvfrom_udp4(doc) ->
+    [];
+traffic_ping_pong_medium_sendto_and_recvfrom_udp4(_Config) when is_list(_Config) ->
+    Msg = l2b(?TPP_MEDIUM),
+    Num = ?TPP_MEDIUM_NUM,
+    tc_try(traffic_ping_pong_medium_sendto_and_recvfrom_udp4,
+           fun() ->
+                   ?TT(?SECS(45)),
+                   InitState = #{domain => inet,
+                                 proto  => udp,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_sendto_and_recvfrom_udp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sendto and recvfrom 
+%% functions by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for two different message sizes; 
+%% small (8 bytes) and medium (8K).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'medium' message test case, for IPv6.
+
+traffic_ping_pong_medium_sendto_and_recvfrom_udp6(suite) ->
+    [];
+traffic_ping_pong_medium_sendto_and_recvfrom_udp6(doc) ->
+    [];
+traffic_ping_pong_medium_sendto_and_recvfrom_udp6(_Config) when is_list(_Config) ->
+    Msg = l2b(?TPP_MEDIUM),
+    Num = ?TPP_MEDIUM_NUM,
+    tc_try(traffic_ping_pong_medium_sendto_and_recvfrom_udp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   ?TT(?SECS(45)),
+                   InitState = #{domain => inet6,
+                                 proto  => udp,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_sendto_and_recvfrom_udp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sendto and recvfrom 
+%% functions by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for two different message sizes; 
+%% small (8 bytes) and medium (8K).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'medium' message test case, for Unix Domain (dgram) socket.
+
+traffic_ping_pong_medium_sendto_and_recvfrom_udpL(suite) ->
+    [];
+traffic_ping_pong_medium_sendto_and_recvfrom_udpL(doc) ->
+    [];
+traffic_ping_pong_medium_sendto_and_recvfrom_udpL(_Config) when is_list(_Config) ->
+    Msg = l2b(?TPP_MEDIUM),
+    Num = ?TPP_MEDIUM_NUM,
+    tc_try(traffic_ping_pong_medium_sendto_and_recvfrom_udpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   ?TT(?SECS(45)),
+                   InitState = #{domain => local,
+                                 proto  => default,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_sendto_and_recvfrom_udp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sendmsg and recvmsg 
+%% functions by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for three different message sizes; 
+%% small (8 bytes), medium (8K) and large (8M).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'small' message test case, for IPv4.
+
+traffic_ping_pong_small_sendmsg_and_recvmsg_tcp4(suite) ->
+    [];
+traffic_ping_pong_small_sendmsg_and_recvmsg_tcp4(doc) ->
+    [];
+traffic_ping_pong_small_sendmsg_and_recvmsg_tcp4(_Config) when is_list(_Config) ->
+    Msg = l2b(?TPP_SMALL),
+    Num = ?TPP_SMALL_NUM,
+    tc_try(traffic_ping_pong_small_sendmsg_and_recvmsg_tcp4,
+           fun() ->
+                   ?TT(?SECS(20)),
+                   InitState = #{domain => inet,
+                                 proto  => tcp,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_sendmsg_and_recvmsg_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sendmsg and recvmsg functions
+%% by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for three different message sizes; 
+%% small (8 bytes), medium (8K) and large (8M).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'small' message test case, for IPv6.
+
+traffic_ping_pong_small_sendmsg_and_recvmsg_tcp6(suite) ->
+    [];
+traffic_ping_pong_small_sendmsg_and_recvmsg_tcp6(doc) ->
+    [];
+traffic_ping_pong_small_sendmsg_and_recvmsg_tcp6(_Config) when is_list(_Config) ->
+    Msg = l2b(?TPP_SMALL),
+    Num = ?TPP_SMALL_NUM,
+    tc_try(traffic_ping_pong_small_sendmsg_and_recvmsg_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   ?TT(?SECS(20)),
+                   InitState = #{domain => inet6,
+                                 proto  => tcp,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_sendmsg_and_recvmsg_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sendmsg and recvmsg functions
+%% by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for three different message sizes; 
+%% small (8 bytes), medium (8K) and large (8M).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'small' message test case, for Unix Domain (stream) socket.
+
+traffic_ping_pong_small_sendmsg_and_recvmsg_tcpL(suite) ->
+    [];
+traffic_ping_pong_small_sendmsg_and_recvmsg_tcpL(doc) ->
+    [];
+traffic_ping_pong_small_sendmsg_and_recvmsg_tcpL(_Config) when is_list(_Config) ->
+    Msg = l2b(?TPP_SMALL),
+    Num = ?TPP_SMALL_NUM,
+    tc_try(traffic_ping_pong_small_sendmsg_and_recvmsg_tcpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   ?TT(?SECS(20)),
+                   InitState = #{domain => local,
+                                 proto  => default,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_sendmsg_and_recvmsg_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sendmsg and recvmsg 
+%% functions by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for three different message sizes; 
+%% small (8 bytes), medium (8K) and large (8M).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'medium' message test case, for IPv4.
+
+traffic_ping_pong_medium_sendmsg_and_recvmsg_tcp4(suite) ->
+    [];
+traffic_ping_pong_medium_sendmsg_and_recvmsg_tcp4(doc) ->
+    [];
+traffic_ping_pong_medium_sendmsg_and_recvmsg_tcp4(_Config) when is_list(_Config) ->
+    Msg = l2b(?TPP_MEDIUM),
+    Num = ?TPP_MEDIUM_NUM,
+    tc_try(traffic_ping_pong_medium_sendmsg_and_recvmsg_tcp4,
+           fun() ->
+                   ?TT(?SECS(30)),
+                   InitState = #{domain => inet,
+                                 proto  => tcp,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_sendmsg_and_recvmsg_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sendmsg and recvmsg functions
+%% by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for three different message sizes; 
+%% small (8 bytes), medium (8K) and large (8M).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'medium' message test case, for IPv6.
+
+traffic_ping_pong_medium_sendmsg_and_recvmsg_tcp6(suite) ->
+    [];
+traffic_ping_pong_medium_sendmsg_and_recvmsg_tcp6(doc) ->
+    [];
+traffic_ping_pong_medium_sendmsg_and_recvmsg_tcp6(_Config) when is_list(_Config) ->
+    Msg = l2b(?TPP_MEDIUM),
+    Num = ?TPP_MEDIUM_NUM,
+    tc_try(traffic_ping_pong_medium_sendmsg_and_recvmsg_tcp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   ?TT(?SECS(30)),
+                   InitState = #{domain => inet6,
+                                 proto  => tcp,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_sendmsg_and_recvmsg_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sendmsg and recvmsg functions
+%% by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for three different message sizes; 
+%% small (8 bytes), medium (8K) and large (8M).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'medium' message test case, for Unix Domain (stream) socket.
+
+traffic_ping_pong_medium_sendmsg_and_recvmsg_tcpL(suite) ->
+    [];
+traffic_ping_pong_medium_sendmsg_and_recvmsg_tcpL(doc) ->
+    [];
+traffic_ping_pong_medium_sendmsg_and_recvmsg_tcpL(_Config) when is_list(_Config) ->
+    Msg = l2b(?TPP_MEDIUM),
+    Num = ?TPP_MEDIUM_NUM,
+    tc_try(traffic_ping_pong_medium_sendmsg_and_recvmsg_tcpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   ?TT(?SECS(30)),
+                   InitState = #{domain => local,
+                                 proto  => default,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_sendmsg_and_recvmsg_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sendmsg and recvmsg 
+%% functions by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for three different message sizes; 
+%% small (8 bytes), medium (8K) and large (8M).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'large' message test case, for IPv4.
+
+traffic_ping_pong_large_sendmsg_and_recvmsg_tcp4(suite) ->
+    [];
+traffic_ping_pong_large_sendmsg_and_recvmsg_tcp4(doc) ->
+    [];
+traffic_ping_pong_large_sendmsg_and_recvmsg_tcp4(_Config) when is_list(_Config) ->
+    Msg = l2b(?TPP_LARGE),
+    Num = ?TPP_LARGE_NUM,
+    tc_try(traffic_ping_pong_large_sendmsg_and_recvmsg_tcp4,
+           fun() -> traffic_ping_pong_large_sendmsg_and_recvmsg_cond() end,
+           fun() ->
+                   ?TT(?SECS(60)),
+                   InitState = #{domain => inet,
+                                 proto  => tcp,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_sendmsg_and_recvmsg_tcp(InitState)
+           end).
+
+
+traffic_ping_pong_large_sendmsg_and_recvmsg_cond() ->
+    traffic_ping_pong_large_sendmsg_and_recvmsg_cond(os:type(), os:version()).
+
+traffic_ping_pong_large_sendmsg_and_recvmsg_cond({unix, linux}, {M, _, _})
+  when (M < 3) ->
+    skip("TC may not work on this version");
+traffic_ping_pong_large_sendmsg_and_recvmsg_cond(_, _) ->
+    ok.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sendmsg and recvmsg functions
+%% by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for three different message sizes; 
+%% small (8 bytes), medium (8K) and large (8M).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'large' message test case, for IPv6.
+
+traffic_ping_pong_large_sendmsg_and_recvmsg_tcp6(suite) ->
+    [];
+traffic_ping_pong_large_sendmsg_and_recvmsg_tcp6(doc) ->
+    [];
+traffic_ping_pong_large_sendmsg_and_recvmsg_tcp6(_Config) when is_list(_Config) ->
+    Msg = l2b(?TPP_LARGE),
+    Num = ?TPP_LARGE_NUM,
+    tc_try(traffic_ping_pong_large_sendmsg_and_recvmsg_tcp6,
+           fun() ->
+                   has_support_ipv6(),
+                   traffic_ping_pong_large_sendmsg_and_recvmsg_cond()
+           end,
+           fun() ->
+                   ?TT(?SECS(60)),
+                   InitState = #{domain => inet6,
+                                 proto  => tcp,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_sendmsg_and_recvmsg_tcp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sendmsg and recvmsg functions
+%% by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for three different message sizes; 
+%% small (8 bytes), medium (8K) and large (8M).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'large' message test case, for Unix Domain (stream) socket.
+
+traffic_ping_pong_large_sendmsg_and_recvmsg_tcpL(suite) ->
+    [];
+traffic_ping_pong_large_sendmsg_and_recvmsg_tcpL(doc) ->
+    [];
+traffic_ping_pong_large_sendmsg_and_recvmsg_tcpL(_Config) when is_list(_Config) ->
+    Msg = l2b(?TPP_LARGE),
+    Num = ?TPP_LARGE_NUM,
+    tc_try(traffic_ping_pong_large_sendmsg_and_recvmsg_tcpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   ?TT(?SECS(60)),
+                   InitState = #{domain => local,
+                                 proto  => default,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_sendmsg_and_recvmsg_tcp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sendmsg and recvmsg 
+%% functions by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for three different message sizes; 
+%% small (8 bytes) and medium (8K).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'small' message test case, for IPv4.
+
+traffic_ping_pong_small_sendmsg_and_recvmsg_udp4(suite) ->
+    [];
+traffic_ping_pong_small_sendmsg_and_recvmsg_udp4(doc) ->
+    [];
+traffic_ping_pong_small_sendmsg_and_recvmsg_udp4(_Config) when is_list(_Config) ->
+    Msg = l2b(?TPP_SMALL),
+    Num = ?TPP_SMALL_NUM,
+    tc_try(traffic_ping_pong_small_sendmsg_and_recvmsg_udp4,
+           fun() ->
+                   ?TT(?SECS(60)),
+                   InitState = #{domain => inet,
+                                 proto  => udp,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_sendmsg_and_recvmsg_udp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sendmsg and recvmsg functions
+%% by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for three different message sizes; 
+%% small (8 bytes) and medium (8K).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'small' message test case, for IPv6.
+
+traffic_ping_pong_small_sendmsg_and_recvmsg_udp6(suite) ->
+    [];
+traffic_ping_pong_small_sendmsg_and_recvmsg_udp6(doc) ->
+    [];
+traffic_ping_pong_small_sendmsg_and_recvmsg_udp6(_Config) when is_list(_Config) ->
+    Msg = l2b(?TPP_SMALL),
+    Num = ?TPP_SMALL_NUM,
+    tc_try(traffic_ping_pong_small_sendmsg_and_recvmsg_udp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   ?TT(?SECS(60)),
+                   InitState = #{domain => inet6,
+                                 proto  => udp,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_sendmsg_and_recvmsg_udp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sendmsg and recvmsg functions
+%% by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for three different message sizes; 
+%% small (8 bytes) and medium (8K).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'small' message test case, for Unix Domain (dgram) socket.
+
+traffic_ping_pong_small_sendmsg_and_recvmsg_udpL(suite) ->
+    [];
+traffic_ping_pong_small_sendmsg_and_recvmsg_udpL(doc) ->
+    [];
+traffic_ping_pong_small_sendmsg_and_recvmsg_udpL(_Config) when is_list(_Config) ->
+    Msg = l2b(?TPP_SMALL),
+    Num = ?TPP_SMALL_NUM,
+    tc_try(traffic_ping_pong_small_sendmsg_and_recvmsg_udpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   ?TT(?SECS(60)),
+                   InitState = #{domain => local,
+                                 proto  => default,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_sendmsg_and_recvmsg_udp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sendmsg and recvmsg 
+%% functions by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for three different message sizes; 
+%% small (8 bytes) and medium (8K).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'medium' message test case, for IPv4.
+
+traffic_ping_pong_medium_sendmsg_and_recvmsg_udp4(suite) ->
+    [];
+traffic_ping_pong_medium_sendmsg_and_recvmsg_udp4(doc) ->
+    [];
+traffic_ping_pong_medium_sendmsg_and_recvmsg_udp4(_Config) when is_list(_Config) ->
+    Msg = l2b(?TPP_MEDIUM),
+    Num = ?TPP_MEDIUM_NUM,
+    tc_try(traffic_ping_pong_medium_sendmsg_and_recvmsg_udp4,
+           fun() ->
+                   ?TT(?SECS(60)),
+                   InitState = #{domain => inet,
+                                 proto  => udp,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_sendmsg_and_recvmsg_udp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sendmsg and recvmsg 
+%% functions by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for three different message sizes; 
+%% small (8 bytes) and medium (8K).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'medium' message test case, for IPv6.
+
+traffic_ping_pong_medium_sendmsg_and_recvmsg_udp6(suite) ->
+    [];
+traffic_ping_pong_medium_sendmsg_and_recvmsg_udp6(doc) ->
+    [];
+traffic_ping_pong_medium_sendmsg_and_recvmsg_udp6(_Config) when is_list(_Config) ->
+    Msg = l2b(?TPP_MEDIUM),
+    Num = ?TPP_MEDIUM_NUM,
+    tc_try(traffic_ping_pong_medium_sendmsg_and_recvmsg_udp6,
+           fun() -> has_support_ipv6() end,
+           fun() ->
+                   ?TT(?SECS(60)),
+                   InitState = #{domain => inet6,
+                                 proto  => udp,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_sendmsg_and_recvmsg_udp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case is intended to test that the sendmsg and recvmsg 
+%% functions by repeatedly sending a meassage between two entities.
+%% The same basic test case is used for three different message sizes; 
+%% small (8 bytes) and medium (8K).
+%% The message is sent from A to B and then back again. This is 
+%% repeated a set number of times (more times the small the message).
+%% This is the 'medium' message test case, for Unix Domain (dgram) socket.
+
+traffic_ping_pong_medium_sendmsg_and_recvmsg_udpL(suite) ->
+    [];
+traffic_ping_pong_medium_sendmsg_and_recvmsg_udpL(doc) ->
+    [];
+traffic_ping_pong_medium_sendmsg_and_recvmsg_udpL(_Config) when is_list(_Config) ->
+    Msg = l2b(?TPP_MEDIUM),
+    Num = ?TPP_MEDIUM_NUM,
+    tc_try(traffic_ping_pong_medium_sendmsg_and_recvmsg_udpL,
+           fun() -> has_support_unix_domain_socket() end,
+           fun() ->
+                   ?TT(?SECS(60)),
+                   InitState = #{domain => local,
+                                 proto  => default,
+                                 msg    => Msg,
+                                 num    => Num},
+                   ok = traffic_ping_pong_sendmsg_and_recvmsg_udp(InitState)
+           end).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Ping-Pong for TCP
+
+traffic_ping_pong_send_and_recv_tcp(InitState) ->
+    Send = fun(Sock, Data) -> socket:send(Sock, Data) end,
+    Recv = fun(Sock, Sz)   -> socket:recv(Sock, Sz) end,
+    InitState2 = InitState#{send => Send, % Send function
+                            recv => Recv  % Receive function
+                           },
+    traffic_ping_pong_send_and_receive_tcp(InitState2).
+
+traffic_ping_pong_sendmsg_and_recvmsg_tcp(#{domain := local} = InitState) ->
+    Recv = fun(Sock, Sz)   -> 
+                   case socket:recvmsg(Sock, Sz, 0) of
+                       %% On some platforms, the address
+                       %% is *not* provided (e.g. FreeBSD)
+                       {ok, #{addr  := undefined,
+                              iov   := [Data]}} ->
+                           {ok, Data};
+                       %% On some platforms, the address
+                       %% *is* provided (e.g. linux)
+                       {ok, #{addr  := #{family := local},
+                              iov   := [Data]}} ->
+                           {ok, Data};
+                       {error, _} = ERROR ->
+                           ERROR
+                   end
+           end,
+    InitState2 = InitState#{recv => Recv},  % Receive function
+    traffic_ping_pong_sendmsg_and_recvmsg_tcp2(InitState2);
+traffic_ping_pong_sendmsg_and_recvmsg_tcp(InitState) ->
+    Recv = fun(Sock, Sz)   -> 
+                   case socket:recvmsg(Sock, Sz, 0) of
+                       {ok, #{addr  := undefined,
+                              iov   := [Data]}} ->
+                           {ok, Data};
+                       {error, _} = ERROR ->
+                           ERROR
+                   end
+           end,
+    InitState2 = InitState#{recv => Recv},  % Receive function
+    traffic_ping_pong_sendmsg_and_recvmsg_tcp2(InitState2).
+
+traffic_ping_pong_sendmsg_and_recvmsg_tcp2(InitState) ->
+    Send = fun(Sock, Data) when is_binary(Data) ->
+                   MsgHdr = #{iov => [Data]},
+                   socket:sendmsg(Sock, MsgHdr);
+              (Sock, Data) when is_list(Data) -> %% We assume iovec...
+                   MsgHdr = #{iov => Data},
+                   socket:sendmsg(Sock, MsgHdr)
+           end,
+    InitState2 = InitState#{send => Send}, % Send function
+    traffic_ping_pong_send_and_receive_tcp(InitState2).
+
+
+traffic_ping_pong_send_and_receive_tcp(#{msg := Msg} = InitState) ->
+    Fun = fun(Sock) -> 
+                  {ok, RcvSz} = socket:getopt(Sock, socket, rcvbuf),
+		  ?SEV_IPRINT("RcvBuf is ~p (needs atleast ~p)", 
+			      [RcvSz, 16+size(Msg)]),
+                  if (RcvSz < size(Msg)) ->
+                          NewRcvSz = 1024+size(Msg),
+                          case socket:setopt(Sock, socket, rcvbuf, NewRcvSz) of
+			      ok ->
+				  ok;
+			      {error, enobufs} ->
+				  skip(?F("Change ~w buffer size (to ~w) "
+                                          "not allowed", 
+                                          [rcvbuf, NewRcvSz]));
+			      {error, Reason1} ->
+				  ?FAIL({rcvbuf, Reason1})
+			  end;
+                     true ->
+                          ok
+                  end,
+                  {ok, SndSz} = socket:getopt(Sock, socket, sndbuf),
+		  ?SEV_IPRINT("SndBuf is ~p (needs atleast ~p)", 
+			      [SndSz, 16+size(Msg)]),
+                  if (SndSz < size(Msg)) ->
+                          NewSndSz = 1024+size(Msg),
+                          case socket:setopt(Sock, socket, sndbuf, NewSndSz) of
+			      ok ->
+				  ok;
+			      {error, enobufs} ->
+				  skip(?F("Change ~w buffer size (to ~w) "
+                                          "not allowed", 
+                                          [sndbuf, NewSndSz]));
+			      {error, Reason2} ->
+				  ?FAIL({sndbuf, Reason2})
+			  end;
+                     true ->
+                          ok
+                  end,
+                  ok = socket:setopt(Sock, otp, rcvbuf, {12, 1024})
+          end,
+    traffic_ping_pong_send_and_receive_tcp2(InitState#{buf_init => Fun}).
+
+traffic_ping_pong_send_and_receive_tcp2(InitState) ->
+    ServerSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{local_sa => LSA}}
+                   end},
+         #{desc => "create listen socket",
+           cmd  => fun(#{domain := Domain, proto := Proto} = State) ->
+                           case socket:open(Domain, stream, Proto) of
+                               {ok, Sock} ->
+                                   {ok, State#{lsock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{domain := local,
+                         lsock  := LSock,
+                         lsa    := LSA} = _State) ->
+                           case socket:bind(LSock, LSA) of
+                               {ok, _Port} ->
+                                   ok; % We do not care about the port for local
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end;
+                      (#{lsock := LSock, local_sa := LSA} = State) ->
+                           case socket:bind(LSock, LSA) of
+                               {ok, Port} ->
+                                   ?SEV_IPRINT("bound to port: ~w", [Port]),
+                                   {ok, State#{lport => Port}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "maybe init buffers",
+           cmd  => fun(#{lsock := LSock, buf_init := BufInit} = _State) ->
+                           BufInit(LSock)
+                   end},
+         #{desc => "make listen socket",
+           cmd  => fun(#{lsock := LSock}) ->
+                           socket:listen(LSock)
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{domain := local,
+                         tester := Tester, local_sa := LSA}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, LSA),
+                           ok;
+                      (#{tester := Tester, local_sa := LSA, lport := Port}) ->
+                           ServerSA = LSA#{port => Port},
+                           ?SEV_ANNOUNCE_READY(Tester, init, ServerSA),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (accept)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, accept)
+                   end},
+         #{desc => "accept",
+           cmd  => fun(#{lsock := LSock} = State) ->
+                           case socket:accept(LSock) of
+                               {ok, Sock} ->
+                                   {ok, State#{csock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "create handler",
+           cmd  => fun(State) ->
+                           Handler = tpp_tcp_handler_create(),
+                           ?SEV_IPRINT("handler created: ~p", [Handler]),
+                           {ok, State#{handler => Handler}}
+                   end},
+         #{desc => "monitor handler",
+           cmd  => fun(#{handler := Handler} = _State) ->
+                           _MRef = erlang:monitor(process, Handler),
+                           ok
+                   end},
+         #{desc => "transfer connection socket ownership to handler",
+           cmd  => fun(#{handler := Handler, csock := Sock} = _State) ->
+                           socket:setopt(Sock, otp, controlling_process, Handler)
+                   end},
+         #{desc => "start handler",
+           cmd  => fun(#{handler  := Handler,
+                         csock    := Sock,
+                         send     := Send,
+                         recv     := Recv} = _State) ->
+                           ?SEV_ANNOUNCE_START(Handler, {Sock, Send, Recv}),
+                           ok
+                   end},
+         #{desc => "await handler ready (init)",
+           cmd  => fun(#{tester  := Tester,
+                         handler := Handler} = State) ->
+                           case ?SEV_AWAIT_READY(Handler, handler, init, 
+                                                 [{tester, Tester}]) of
+                               ok ->
+                                   {ok, maps:remove(csock, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (accept)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, accept),
+                           ok
+                   end},
+         #{desc => "await continue (recv)",
+           cmd  => fun(#{tester  := Tester,
+                         handler := Handler} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, recv, 
+                                               [{handler, Handler}])
+                   end},
+         #{desc => "order handler to recv",
+           cmd  => fun(#{handler := Handler} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Handler, recv),
+                           ok
+                   end},
+         #{desc => "await handler ready (recv)",
+           cmd  => fun(#{tester  := Tester,
+                         handler := Handler} = State) ->
+                           case ?SEV_AWAIT_READY(Handler, handler, recv, 
+                                                 [{tester, Tester}]) of
+                               {ok, Result} ->
+                                   %% ?SEV_IPRINT("Result: ~p", [Result]),
+                                   {ok, State#{result => Result}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv)",
+           cmd  => fun(#{tester := Tester, 
+                         result := Result} = State) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv, Result),
+                           {ok, maps:remove(result, State)}
+                   end},
+
+         %% Termination
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "stop handler",
+           cmd  => fun(#{handler := Handler}) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Handler),
+                           ok
+                   end},
+         #{desc => "await handler termination",
+           cmd  => fun(#{handler := Handler} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Handler),
+                           State1 = maps:remove(handler, State),
+                           {ok, State1}
+                   end},
+         #{desc => "close listen socket",
+           cmd  => fun(#{domain   := local,
+                         lsock    := Sock,
+                         local_sa := #{path := Path}} = State) ->
+                           (catch socket:close(Sock)),
+                           State1 =
+                               unlink_path(Path,
+                                           fun() -> 
+                                                   maps:remove(local_sa, State)
+                                           end,
+                                           fun() -> State end),
+                           {ok, maps:remove(lsock, State1)};
+                      (#{lsock := Sock} = State) ->
+                           (catch socket:close(Sock)),
+                           {ok, maps:remove(lsock, State)}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    ClientSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           {Tester, ServerSA} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester    => Tester, 
+                                       server_sa => ServerSA}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "create node",
+           cmd  => fun(#{host := Host} = State) ->
+                           case start_node(Host, client) of
+                               {ok, Node} ->
+                                   ?SEV_IPRINT("(remote) client node ~p started", 
+                                               [Node]),
+                                   {ok, State#{node => Node}};
+                               {error, Reason} ->
+                                   {skip, Reason}
+                           end
+                   end},
+         #{desc => "monitor client node",
+           cmd  => fun(#{node := Node} = _State) ->
+                           true = erlang:monitor_node(Node, true),
+                           ok
+                   end},
+         #{desc => "create remote client",
+           cmd  => fun(#{node := Node} = State) ->
+                           Pid = tpp_tcp_client_create(Node),
+                           ?SEV_IPRINT("remote client created: ~p", [Pid]),
+                           {ok, State#{rclient => Pid}}
+                   end},
+         #{desc => "monitor remote client",
+           cmd  => fun(#{rclient := Pid}) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "order remote client to start",
+           cmd  => fun(#{rclient   := RClient,
+                         proto     := Proto,
+                         server_sa := ServerSA,
+                         buf_init  := BufInit,
+                         send      := Send,
+                         recv      := Recv}) ->
+                           ?SEV_ANNOUNCE_START(RClient, 
+                                               {ServerSA, Proto, BufInit,
+                                                Send, Recv}),
+                           ok
+                   end},
+         #{desc => "await remote client ready",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := RClient} = _State) ->
+                           ?SEV_AWAIT_READY(RClient, rclient, init, 
+                                            [{tester, Tester}])
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (connect)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := RClient} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, connect, 
+                                               [{rclient, RClient}]),
+                           ok
+                   end},
+         #{desc => "order remote client to continue (connect)",
+           cmd  => fun(#{rclient := RClient}) ->
+                           ?SEV_ANNOUNCE_CONTINUE(RClient, connect),
+                           ok
+                   end},
+         #{desc => "await remote client ready (connect)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := RClient} = _State) ->
+                           ?SEV_AWAIT_READY(RClient, rclient, connect, 
+                                            [{tester, Tester}])
+                   end},
+         #{desc => "announce ready (connect)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, connect),
+                           ok
+                   end},
+         #{desc => "await continue (send)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := RClient} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, 
+                                               send, 
+                                               [{rclient, RClient}])
+                   end},
+         #{desc => "order remote client to continue (send)",
+           cmd  => fun(#{rclient := RClient,
+                         msg     := Msg,
+                         num     := Num} = State) ->
+                           Data = {Msg, Num},
+                           ?SEV_ANNOUNCE_CONTINUE(RClient, send, Data),
+                           {ok, maps:remove(data, State)}
+                   end},
+         #{desc => "await remote client ready (send)",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := RClient} = State) ->
+                           case ?SEV_AWAIT_READY(RClient, rclient, send, 
+                                                 [{tester, Tester}]) of
+                               {ok, Result} ->
+                                   %% ?SEV_IPRINT("remote client result: "
+                                   %%             "~n   ~p", [Result]),
+                                   {ok, State#{result => Result}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (send)",
+           cmd  => fun(#{tester := Tester, result := Result} = State) ->
+                           ?SEV_ANNOUNCE_READY(Tester, send, Result),
+                           {ok, maps:remove(result, State)}
+                   end},
+
+         %% Termination
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester  := Tester, 
+                         rclient := RClient} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester,
+                                                     [{rclient, RClient}]) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "stop remote client",
+           cmd  => fun(#{rclient := RClient}) ->
+                           ?SEV_ANNOUNCE_TERMINATE(RClient),
+                           ok
+                   end},
+         #{desc => "await remote client termination",
+           cmd  => fun(#{rclient := RClient} = State) ->
+                           ?SEV_AWAIT_TERMINATION(RClient),
+                           State1 = maps:remove(rclient, State),
+                           {ok, State1}
+                   end},
+         #{desc => "stop client node",
+           cmd  => fun(#{node := Node} = _State) ->
+                           stop_node(Node)
+                   end},
+         #{desc => "await client node termination",
+           cmd  => fun(#{node := Node} = State) ->
+                           receive
+                               {nodedown, Node} ->
+                                   {ok, maps:remove(node, State)}
+                           end
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "monitor server",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor client",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+
+         %% Start the server
+         #{desc => "order server start",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid),
+                           ok
+                   end},
+         #{desc => "await server ready (init)",
+           cmd  => fun(#{server := Pid} = State) ->
+                           {ok, ServerSA} = ?SEV_AWAIT_READY(Pid, server, init),
+                           {ok, State#{server_sa => ServerSA}}
+                   end},
+
+         %% Start the client
+         #{desc => "order client start",
+           cmd  => fun(#{client    := Pid, 
+                         server_sa := ServerSA} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, ServerSA),
+                           ok
+                   end},
+         #{desc => "await client ready (init)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, client, init)
+                   end},
+ 
+         %% The actual test
+         #{desc => "order server continue (accept)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, accept),
+                           ok
+                   end},
+         ?SEV_SLEEP(?SECS(1)),
+         #{desc => "order client continue (connect)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, connect),
+                           ok
+                   end},
+         #{desc => "await server ready (accept)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Server, server, accept,
+                                            [{client, Client}]),
+                           ok
+                   end},
+         #{desc => "await client ready (connect)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = _State) ->
+                           ?SEV_AWAIT_READY(Client, client, connect, 
+                                            [{server, Server}])
+                   end},
+         #{desc => "order server continue (recv)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv),
+                           ok
+                   end},
+         ?SEV_SLEEP(?SECS(1)),
+         #{desc => "order client continue (send)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, send),
+                           ok
+                   end},
+         #{desc => "await client ready (send)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = State) ->
+                           case ?SEV_AWAIT_READY(Client, client, send, 
+                                                 [{server, Server}]) of
+                               {ok, {_, _, _, _} = Result} ->
+                                   ?SEV_IPRINT("client result: "
+                                               "~n   ~p", [Result]),
+                                   {ok, State#{client_result => Result}};
+                               {ok, BadResult} ->
+                                   ?SEV_EPRINT("client result: "
+                                               "~n   ~p", [BadResult]),
+                                   {error, {invalid_client_result, BadResult}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "await server ready (recv)",
+           cmd  => fun(#{server := Server,
+                         client := Client,
+                         num    := Num} = State) ->
+                           case ?SEV_AWAIT_READY(Server, server, recv,
+                                                 [{client, Client}]) of
+                               {ok, {Num, _, _, _, _} = Result} ->
+                                   ?SEV_IPRINT("server result: "
+                                               "~n   ~p", [Result]),
+                                   Result2 = erlang:delete_element(1, Result),
+                                   {ok, State#{server_result => Result2}};
+                               {ok, BadResult} ->
+                                   ?SEV_EPRINT("bad server result: "
+                                               "~n   ~p", [BadResult]),
+                                   {error, {invalid_server_result, BadResult}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "present result",
+           cmd  => fun(#{server_result := SRes,
+                         client_result := CRes,
+                         num           := Num} = State) ->
+                           {SSent, SReceived, SStart, SStop} = SRes,
+                           {CSent, CReceived, CStart, CStop} = CRes,
+                           STime = tdiff(SStart, SStop),
+                           CTime = tdiff(CStart, CStop),
+                           %% Note that the sizes we are counting is only 
+                           %% the "data" part of the messages. There is also
+                           %% fixed header for each message, which of cource
+                           %% is small for the large messages, but comparatively
+                           %% big for the small messages!
+                           ?SEV_IPRINT("Results: ~w messages exchanged"
+                                       "~n   Server: ~w msec"
+                                       "~n      ~.2f msec/message (roundtrip)"
+                                       "~n      ~.2f messages/msec (roundtrip)"
+                                       "~n      ~w bytes/msec sent"
+                                       "~n      ~w bytes/msec received"
+                                       "~n   Client: ~w msec"
+                                       "~n      ~.2f msec/message (roundtrip)"
+                                       "~n      ~.2f messages/msec (roundtrip)"
+                                       "~n      ~w bytes/msec sent"
+                                       "~n      ~w bytes/msec received",
+                                       [Num,
+                                        STime,
+                                        STime / Num,
+                                        Num / STime,
+                                        SSent div STime,
+                                        SReceived div STime,
+                                        CTime,
+                                        CTime / Num,
+                                        Num / CTime,
+                                        CSent div CTime,
+                                        CReceived div CTime]),
+                           State1 = maps:remove(server_result, State),
+                           State2 = maps:remove(client_result, State1),
+                           {ok, State2}
+                   end},
+
+         %% Terminations
+         #{desc => "order client to terminate",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await client termination",
+           cmd  => fun(#{client := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(client, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order server to terminate",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await server termination",
+           cmd  => fun(#{server := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(server, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    i("start server evaluator"),
+    ServerInitState = #{domain   => maps:get(domain,   InitState),
+                        proto    => maps:get(proto,    InitState),
+                        recv     => maps:get(recv,     InitState),
+                        send     => maps:get(send,     InitState),
+                        buf_init => maps:get(buf_init, InitState)},
+    Server = ?SEV_START("server", ServerSeq, ServerInitState),
+
+    i("start client evaluator(s)"),
+    ClientInitState = InitState#{host => local_host()},
+    Client = ?SEV_START("client", ClientSeq, ClientInitState),
+
+    i("start 'tester' evaluator"),
+    TesterInitState = #{server => Server#ev.pid,
+                        client => Client#ev.pid,
+                        num    => maps:get(num, InitState)},
+    Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    i("await evaluator"),
+    ok = ?SEV_AWAIT_FINISH([Server, Client, Tester]).
+    
+
+tpp_tcp_handler_create() ->
+    Self = self(),
+    erlang:spawn(fun() -> tpp_tcp_handler(Self) end).
+
+tpp_tcp_handler(Parent) ->
+    tpp_tcp_handler_init(Parent),
+    {Sock, Send, Recv} = tpp_tcp_handler_await_start(Parent),
+    tpp_tcp_handler_announce_ready(Parent, init),
+    tpp_tcp_handler_await_continue(Parent, recv),
+    Result = tpp_tcp_handler_msg_exchange(Sock, Send, Recv),
+    tpp_tcp_handler_announce_ready(Parent, recv, Result),
+    Reason = tpp_tcp_handler_await_terminate(Parent),
+    ?SEV_IPRINT("terminating"),
+    exit(Reason).
+
+tpp_tcp_handler_init(Parent) ->
+    put(sname, "handler"),
+    ?SEV_IPRINT("init"),
+    _MRef = erlang:monitor(process, Parent),
+    ok.
+
+tpp_tcp_handler_await_start(Parent) ->
+    ?SEV_IPRINT("await start"),
+    ?SEV_AWAIT_START(Parent).
+
+tpp_tcp_handler_announce_ready(Parent, Slogan) ->
+    ?SEV_IPRINT("announce ready (~p)", [Slogan]),
+    ?SEV_ANNOUNCE_READY(Parent, Slogan).
+tpp_tcp_handler_announce_ready(Parent, Slogan, Extra) ->
+    ?SEV_IPRINT("announce ready (~p)", [Slogan]),
+    ?SEV_ANNOUNCE_READY(Parent, Slogan, Extra).
+
+tpp_tcp_handler_await_continue(Parent, Slogan) ->
+    ?SEV_IPRINT("await continue (~p)", [Slogan]),
+    case ?SEV_AWAIT_CONTINUE(Parent, parent, Slogan) of
+        ok ->
+            %% ?SEV_IPRINT("continue (~p): ok", [Slogan]),
+            ok;
+        {error, Reason} ->
+            ?SEV_EPRINT("continue (~p): error"
+                        "~n   ~p", [Slogan, Reason]),
+            exit({continue, Slogan, Reason})
+    end.
+
+tpp_tcp_handler_await_terminate(Parent) ->
+    ?SEV_IPRINT("await terminate"),
+    case ?SEV_AWAIT_TERMINATE(Parent, parent) of
+        ok ->
+            ok;
+        {error, Reason} ->
+            Reason
+    end.
+
+tpp_tcp_handler_msg_exchange(Sock, Send, Recv) ->
+    tpp_tcp_handler_msg_exchange_loop(Sock, Send, Recv, 0, 0, 0, undefined).
+
+tpp_tcp_handler_msg_exchange_loop(Sock, Send, Recv, N, Sent, Received, Start) ->
+    %% ?SEV_IPRINT("[~w] try receive", [N]),
+    case tpp_tcp_recv_req(Sock, Recv) of
+        {ok, Msg, RecvSz} ->
+            NewStart = if (Start =:= undefined) -> ?LIB:timestamp(); 
+                          true -> Start end,
+            %% ?SEV_IPRINT("[~w] received - now try send", [N]),
+            case tpp_tcp_send_rep(Sock, Send, Msg) of
+                {ok, SendSz} ->
+                    tpp_tcp_handler_msg_exchange_loop(Sock, Send, Recv,
+                                                      N+1,
+                                                      Sent+SendSz,
+                                                      Received+RecvSz,
+                                                      NewStart);
+                {error, SReason} ->
+                    ?SEV_EPRINT("send (~w): ~p", [N, SReason]),
+                    exit({send, SReason, N})
+            end;
+        {error, closed} ->
+            ?SEV_IPRINT("closed - we are done: ~w, ~w, ~w", [N, Sent, Received]),
+            Stop = ?LIB:timestamp(),
+            {N, Sent, Received, Start, Stop};
+        {error, RReason} ->
+            ?SEV_EPRINT("recv (~w): ~p", [N, RReason]),
+            exit({recv, RReason, N})
+    end.
+            
+%% The (remote) client process
+
+tpp_tcp_client_create(Node) ->
+    Self = self(),
+    Fun  = fun() -> tpp_tcp_client(Self) end,
+    erlang:spawn(Node, Fun).
+
+tpp_tcp_client(Parent) ->
+    tpp_tcp_client_init(Parent),
+    {ServerSA, Proto, BufInit, Send, Recv} = tpp_tcp_client_await_start(Parent),
+    Domain   = maps:get(family, ServerSA),
+    Sock     = tpp_tcp_client_sock_open(Domain, Proto, BufInit),
+    Path     = tpp_tcp_client_sock_bind(Sock, Domain),
+    tpp_tcp_client_announce_ready(Parent, init),
+    tpp_tcp_client_await_continue(Parent, connect),
+    tpp_tcp_client_sock_connect(Sock, ServerSA),
+    tpp_tcp_client_announce_ready(Parent, connect),
+    {InitMsg, Num} = tpp_tcp_client_await_continue(Parent, send),
+    Result = tpp_tcp_client_msg_exchange(Sock, Send, Recv, InitMsg, Num),
+    tpp_tcp_client_announce_ready(Parent, send, Result),
+    Reason = tpp_tcp_client_await_terminate(Parent),
+    tpp_tcp_client_sock_close(Sock, Path),
+    ?SEV_IPRINT("terminating"),
+    exit(Reason).
+
+tpp_tcp_client_init(Parent) ->
+    put(sname, "rclient"),
+    ?SEV_IPRINT("init"),
+    _MRef = erlang:monitor(process, Parent),
+    ok.
+
+tpp_tcp_client_await_start(Parent) ->
+    ?SEV_IPRINT("await start"),
+    ?SEV_AWAIT_START(Parent).
+
+tpp_tcp_client_announce_ready(Parent, Slogan) ->
+    ?SEV_IPRINT("announce ready (~p)", [Slogan]),
+    ?SEV_ANNOUNCE_READY(Parent, Slogan).
+tpp_tcp_client_announce_ready(Parent, Slogan, Extra) ->
+    ?SEV_IPRINT("announce ready (~p): ~p", [Slogan, Extra]),
+    ?SEV_ANNOUNCE_READY(Parent, Slogan, Extra).
+
+tpp_tcp_client_await_continue(Parent, Slogan) ->
+    ?SEV_IPRINT("await continue (~p)", [Slogan]),
+    case ?SEV_AWAIT_CONTINUE(Parent, parent, Slogan) of
+        ok ->
+            ?SEV_IPRINT("continue (~p): ok", [Slogan]),
+            ok;
+        {ok, Data} ->
+            ?SEV_IPRINT("continue (~p): ok with data", [Slogan]),
+            Data;
+        {error, Reason} ->
+            ?SEV_EPRINT("continue (~p): error"
+                        "~n   ~p", [Slogan, Reason]),
+            exit({continue, Slogan, Reason})
+    end.
+
+tpp_tcp_client_await_terminate(Parent) ->
+    ?SEV_IPRINT("await terminate"),
+    case ?SEV_AWAIT_TERMINATE(Parent, parent) of
+        ok ->
+            ?SEV_IPRINT("termination received: normal"),
+            normal;
+        {error, Reason} ->
+            ?SEV_IPRINT("termination received: ~w", [Reason]),
+            Reason
+    end.
+
+tpp_tcp_client_msg_exchange(Sock, Send, Recv, InitMsg, Num) ->
+    Start = ?LIB:timestamp(),
+    tpp_tcp_client_msg_exchange_loop(Sock, Send, Recv, InitMsg, 
+                                     Num, 0, 0, 0, Start).
+
+tpp_tcp_client_msg_exchange_loop(Sock, _Send, _Recv, _Msg,
+                                 Num, Num, Sent, Received,
+                                 Start) ->
+    Stop = ?LIB:timestamp(),
+    case socket:close(Sock) of
+        ok ->
+            {Sent, Received, Start, Stop};
+        {error, Reason} ->
+            exit({failed_closing, Reason})
+    end;
+tpp_tcp_client_msg_exchange_loop(Sock, Send, Recv, Data, 
+                                 Num, N, Sent, Received, Start) ->
+    %% d("tpp_tcp_client_msg_exchange_loop(~w,~w) try send ~w", [Num,N,size(Data)]),
+    case tpp_tcp_send_req(Sock, Send, Data) of
+        {ok, SendSz} ->
+            %% d("tpp_tcp_client_msg_exchange_loop(~w,~w) sent - "
+            %%   "now try recv", [Num,N]),
+            case tpp_tcp_recv_rep(Sock, Recv) of
+                {ok, NewData, RecvSz} ->
+                    tpp_tcp_client_msg_exchange_loop(Sock, Send, Recv,
+                                                     NewData, Num, N+1,
+                                                     Sent+SendSz, 
+                                                     Received+RecvSz, 
+                                                     Start);
+                {error, RReason} ->
+                    ?SEV_EPRINT("recv (~w of ~w): ~p: "
+                                "~n   ~p", [N, Num, RReason, mq()]),
+                    exit({recv, RReason, N})
+            end;
+        {error, SReason} ->
+            ?SEV_EPRINT("send (~w of ~w): ~p"
+                        "~n   ~p", [N, Num, SReason, mq()]),
+            exit({send, SReason, N})
+    end.
+
+tpp_tcp_client_sock_open(Domain, Proto, BufInit) ->
+    case socket:open(Domain, stream, Proto) of
+        {ok, Sock} ->
+            ok = BufInit(Sock),
+            Sock;
+        {error, Reason} ->
+            exit({open_failed, Reason})
+    end.
+
+tpp_tcp_client_sock_bind(Sock, Domain) ->
+    LSA = which_local_socket_addr(Domain),
+    case socket:bind(Sock, LSA) of
+        {ok, _} ->
+            case socket:sockname(Sock) of
+                {ok, #{family := local, path := Path}} ->
+                    Path;
+                {ok, _} ->
+                    undefined;
+                {error, Reason1} ->
+                    exit({sockname, Reason1})
+            end;
+        {error, Reason2} ->
+            exit({bind, Reason2})
+    end.
+
+tpp_tcp_client_sock_connect(Sock, ServerSA) ->
+    case socket:connect(Sock, ServerSA) of
+        ok ->
+            ok;
+        {error, Reason} ->
+            exit({connect, Reason})
+    end.
+
+tpp_tcp_client_sock_close(Sock, Path) ->
+    case socket:close(Sock) of
+        ok ->
+            unlink_path(Path),
+            ok;
+        {error, Reason} ->
+            ?SEV_EPRINT("failed closing: "
+                        "~n   Reason: ~p", [Reason]),
+            unlink_path(Path),
+            {error, {close, Reason}}
+    end.
+
+    
+    
+-define(TPP_REQUEST, 1).
+-define(TPP_REPLY,   2).
+
+tpp_tcp_recv_req(Sock, Recv) ->
+    tpp_tcp_recv(Sock, Recv, ?TPP_REQUEST).
+
+tpp_tcp_recv_rep(Sock, Recv) ->
+    tpp_tcp_recv(Sock, Recv, ?TPP_REPLY).
+
+tpp_tcp_recv(Sock, Recv, Tag) ->
+    case Recv(Sock, 0) of
+        {ok, <<Tag:32/integer, Sz:32/integer, Data/binary>> = Msg} 
+          when (Sz =:= size(Data)) ->
+            %% We got it all
+            {ok, Data, size(Msg)};
+        {ok, <<Tag:32/integer, Sz:32/integer, Data/binary>> = Msg} ->
+            Remains = Sz - size(Data),
+            tpp_tcp_recv(Sock, Recv, Tag, Remains, size(Msg), [Data]);
+        {ok, <<Tag:32/integer, _/binary>>} ->
+            {error, {invalid_msg_tag, Tag}};
+        {error, _R} = ERROR ->
+            ERROR
+    end.
+
+tpp_tcp_recv(Sock, Recv, Tag, Remaining, AccSz, Acc) ->
+    case Recv(Sock, Remaining) of
+        {ok, Data} when (Remaining =:= size(Data)) ->
+            %% We got the rest
+            TotSz = AccSz + size(Data),
+            {ok, erlang:iolist_to_binary(lists:reverse([Data | Acc])), TotSz};
+        {ok, Data} when (Remaining > size(Data)) ->
+            tpp_tcp_recv(Sock, Recv, Tag, 
+                         Remaining - size(Data), AccSz + size(Data),     
+                         [Data | Acc]);
+        {error, _R} = ERROR ->
+            ERROR
+    end.
+                                                         
+            
+tpp_tcp_send_req(Sock, Send, Data) ->
+    tpp_tcp_send(Sock, Send, ?TPP_REQUEST, Data).
+
+tpp_tcp_send_rep(Sock, Send, Data) ->
+    tpp_tcp_send(Sock, Send, ?TPP_REPLY, Data).
+
+tpp_tcp_send(Sock, Send, Tag, Data) ->
+    DataSz = size(Data),
+    Msg    = <<Tag:32/integer, DataSz:32/integer, Data/binary>>,
+    tpp_tcp_send_msg(Sock, Send, Msg, 0).
+
+tpp_tcp_send_msg(Sock, Send, Msg, AccSz) when is_binary(Msg) ->
+    case Send(Sock, Msg) of
+        ok ->
+            {ok, AccSz+size(Msg)};
+        {ok, Rest} -> % This is an IOVec
+            RestBin = list_to_binary(Rest),
+            tpp_tcp_send_msg(Sock, Send, RestBin, AccSz+(size(Msg)-size(RestBin)));
+        {error, _} = ERROR ->
+            ERROR
+    end.
+    
+
+%% size_of_data(Data) when is_binary(Data) ->
+%%     size(Data);
+%% size_of_data(Data) when is_list(Data) ->
+%%     size_of_iovec(Data, 0).
+
+%% size_of_iovec([], Sz) ->
+%%     Sz;
+%% size_of_iovec([B|IOVec], Sz) ->
+%%     size_of_iovec(IOVec, Sz+size(B)).
+
+mq() ->
+    mq(self()).
+
+mq(Pid) when is_pid(Pid) ->
+    Tag = messages,
+    {Tag, Msgs} = process_info(Pid, Tag),
+    Msgs.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Ping-Pong for UDP
+
+traffic_ping_pong_sendto_and_recvfrom_udp(InitState) ->
+    Send = fun(Sock, Data, Dest) ->
+                   socket:sendto(Sock, Data, Dest)
+           end,
+    Recv = fun(Sock, Sz)         ->
+                   socket:recvfrom(Sock, Sz)
+           end,
+    InitState2 = InitState#{send => Send, % Send function
+                            recv => Recv  % Receive function
+                           },
+    traffic_ping_pong_send_and_receive_udp(InitState2).
+
+traffic_ping_pong_sendmsg_and_recvmsg_udp(InitState) ->
+    Send = fun(Sock, Data, Dest) when is_binary(Data) ->
+                   MsgHdr = #{addr => Dest, iov => [Data]},
+                   socket:sendmsg(Sock, MsgHdr);
+              (Sock, Data, Dest) when is_list(Data) -> %% We assume iovec...
+                   MsgHdr = #{addr => Dest, iov => Data},
+                   socket:sendmsg(Sock, MsgHdr)
+           end,
+    Recv = fun(Sock, Sz)   ->
+                   case socket:recvmsg(Sock, Sz, 0) of
+                       {ok, #{addr  := Source,
+                              iov   := [Data]}} ->
+                           {ok, {Source, Data}};
+                       {error, _} = ERROR ->
+                           ERROR
+                   end
+           end,
+    InitState2 = InitState#{send => Send, % Send function
+                            recv => Recv  % Receive function
+                           },
+    traffic_ping_pong_send_and_receive_udp(InitState2).
+
+
+traffic_ping_pong_send_and_receive_udp(#{msg := Msg} = InitState) ->
+    Fun = fun(Sock) -> 
+                  {ok, RcvSz} = socket:getopt(Sock, socket, rcvbuf),
+                  if (RcvSz =< (8+size(Msg))) ->
+                          i("adjust socket rcvbuf buffer size"),
+                          ok = socket:setopt(Sock, socket, rcvbuf, 1024+size(Msg));
+                     true ->
+                          ok
+                  end,
+                  {ok, SndSz} = socket:getopt(Sock, socket, sndbuf),
+                  if (SndSz =< (8+size(Msg))) ->
+                          i("adjust socket sndbuf buffer size"),
+                          ok = socket:setopt(Sock, socket, sndbuf, 1024+size(Msg));
+                     true ->
+                          ok
+                  end,
+                  {ok, OtpRcvBuf} = socket:getopt(Sock, otp, rcvbuf),
+                  if
+                      (OtpRcvBuf =< (8+size(Msg))) ->
+                          i("adjust otp rcvbuf buffer size"),
+                          ok = socket:setopt(Sock, otp, rcvbuf, 1024+size(Msg));
+                      true ->
+                          ok
+                  end
+          end,
+    traffic_ping_pong_send_and_receive_udp2(InitState#{buf_init => Fun}).
+
+traffic_ping_pong_send_and_receive_udp2(InitState) ->
+    ServerSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "which local address",
+           cmd  => fun(#{domain := Domain} = State) ->
+                           LSA = which_local_socket_addr(Domain),
+                           {ok, State#{local_sa => LSA}}
+                   end},
+         #{desc => "create socket",
+           cmd  => fun(#{domain := Domain, proto := Proto} = State) ->
+                           case socket:open(Domain, dgram, Proto) of
+                               {ok, Sock} ->
+                                   {ok, State#{sock => Sock}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "bind to local address",
+           cmd  => fun(#{domain := local,
+                         sock := Sock, local_sa := LSA} = _State) ->
+                           case socket:bind(Sock, LSA) of
+                               {ok, _} ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end;
+                      (#{sock := Sock, local_sa := LSA} = State) ->
+                           case socket:bind(Sock, LSA) of
+                               {ok, Port} ->
+                                   {ok, State#{port => Port}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "maybe init buffers",
+           cmd  => fun(#{sock := Sock, buf_init := BufInit} = _State) ->
+                           BufInit(Sock)
+                   end},
+         #{desc => "create handler",
+           cmd  => fun(State) ->
+                           Handler = tpp_udp_server_handler_create(),
+                           ?SEV_IPRINT("handler created: ~p", [Handler]),
+                           {ok, State#{handler => Handler}}
+                   end},
+         #{desc => "monitor handler",
+           cmd  => fun(#{handler := Handler} = _State) ->
+                           _MRef = erlang:monitor(process, Handler),
+                           ok
+                   end},
+         #{desc => "start handler",
+           cmd  => fun(#{handler := Handler,
+                         sock    := Sock,
+                         send    := Send,
+                         recv    := Recv} = _State) ->
+                           ?SEV_ANNOUNCE_START(Handler, {Sock, Send, Recv}),
+                           ok
+                   end},
+         #{desc => "await handler ready (init)",
+           cmd  => fun(#{tester  := Tester,
+                         handler := Handler} = State) ->
+                           case ?SEV_AWAIT_READY(Handler, handler, init, 
+                                                 [{tester, Tester}]) of
+                               ok ->
+                                   {ok, maps:remove(csock, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{domain := local,
+                         tester := Tester, local_sa := LSA}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, LSA),
+                           ok;
+                      (#{tester := Tester, local_sa := LSA, port := Port}) ->
+                           ServerSA = LSA#{port => Port},
+                           ?SEV_ANNOUNCE_READY(Tester, init, ServerSA),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (recv)",
+           cmd  => fun(#{tester  := Tester,
+                         handler := Handler} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, recv, 
+                                               [{handler, Handler}])
+                   end},
+         #{desc => "order handler to recv",
+           cmd  => fun(#{handler := Handler,
+                         sock    := _Sock} = _State) ->
+                           %% socket:setopt(Sock, otp, debug, true),
+                           ?SEV_ANNOUNCE_CONTINUE(Handler, recv),
+                           ok
+                   end},
+         #{desc => "await continue (close)",
+           cmd  => fun(#{tester  := Tester,
+                         handler := Handler} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, close, 
+                                               [{handler, Handler}])
+                   end},
+
+         ?SEV_SLEEP(?SECS(1)),
+
+         #{desc => "close socket",
+           cmd  => fun(#{sock := Sock} = State) ->
+                           %% socket:setopt(Sock, otp, debug, true),
+                           case socket:close(Sock) of
+                               ok ->
+                                   {ok, maps:remove(sock, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "(maybe) unlink socket",
+           cmd  => fun(#{domain   := local,
+                         local_sa := #{path := Path}} = State) ->
+                           unlink_path(Path,
+                                       fun() ->
+                                               {ok, maps:remove(local_sa, State)}
+                                       end,
+                                       fun() ->
+                                               ok
+                                       end);
+                      (_) ->
+                           ok
+                   end},
+         #{desc => "announce ready (close)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_ANNOUNCE_READY(Tester, close),
+                           ok
+                   end},
+         #{desc => "await handler ready (recv)",
+           cmd  => fun(#{tester  := Tester,
+                         handler := Handler} = State) ->
+                           case ?SEV_AWAIT_READY(Handler, handler, recv, 
+                                                 [{tester, Tester}]) of
+                               {ok, Result} ->
+                                   %% ?SEV_IPRINT("Result: ~p", [Result]),
+                                   {ok, State#{result => Result}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (recv)",
+           cmd  => fun(#{tester := Tester, 
+                         result := Result} = State) ->
+                           ?SEV_ANNOUNCE_READY(Tester, recv, Result),
+                           {ok, maps:remove(result, State)}
+                   end},
+
+         %% Termination
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "stop handler",
+           cmd  => fun(#{handler := Handler}) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Handler),
+                           ok
+                   end},
+         #{desc => "await handler termination",
+           cmd  => fun(#{handler := Handler} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Handler),
+                           State1 = maps:remove(handler, State),
+                           {ok, State1}
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    ClientSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           {Tester, ServerSA} = ?SEV_AWAIT_START(),
+                           {ok, State#{tester    => Tester, 
+                                       server_sa => ServerSA}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+         %% *** Init part ***
+         #{desc => "create node",
+           cmd  => fun(#{host := Host} = State) ->
+                           case start_node(Host, client) of
+                               {ok, Node} ->
+                                   ?SEV_IPRINT("(remote) client node ~p started", 
+                                               [Node]),
+                                   {ok, State#{node => Node}};
+                               {error, Reason} ->
+                                   {skip, Reason}
+                           end
+                   end},
+         #{desc => "monitor client node",
+           cmd  => fun(#{node := Node} = _State) ->
+                           true = erlang:monitor_node(Node, true),
+                           ok
+                   end},
+         #{desc => "create (remote) handler",
+           cmd  => fun(#{node := Node} = State) ->
+                           Pid = tpp_udp_client_handler_create(Node),
+                           ?SEV_IPRINT("handler created: ~p", [Pid]),
+                           {ok, State#{handler => Pid}}
+                   end},
+         #{desc => "monitor remote handler",
+           cmd  => fun(#{handler := Pid}) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "order remote handler to start",
+           cmd  => fun(#{handler   := Handler,
+                         server_sa := ServerSA,
+                         proto     := Proto,
+                         buf_init  := BufInit,
+                         send      := Send,
+                         recv      := Recv}) ->
+                           ?SEV_ANNOUNCE_START(Handler, 
+                                               {ServerSA, Proto, BufInit,
+                                                Send, Recv}),
+                           ok
+                   end},
+         #{desc => "await (remote) handler ready",
+           cmd  => fun(#{tester  := Tester,
+                         handler := Handler} = _State) ->
+                           ?SEV_AWAIT_READY(Handler, handler, init, 
+                                            [{tester, Tester}])
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init),
+                           ok
+                   end},
+
+         %% The actual test
+         #{desc => "await continue (send)",
+           cmd  => fun(#{tester  := Tester,
+                         handler := Handler} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, 
+                                               send, 
+                                               [{handler, Handler}])
+                   end},
+         #{desc => "order handler to continue (send)",
+           cmd  => fun(#{handler := Handler,
+                         msg     := Msg,
+                         num     := Num} = State) ->
+                           Data = {Msg, Num},
+                           ?SEV_ANNOUNCE_CONTINUE(Handler, send, Data),
+                           {ok, maps:remove(data, State)}
+                   end},
+         #{desc => "await remote handler ready (send)",
+           cmd  => fun(#{tester  := Tester,
+                         handler := Handler} = State) ->
+                           case ?SEV_AWAIT_READY(Handler, handler, send, 
+                                                 [{tester, Tester}]) of
+                               {ok, Result} ->
+                                   %% ?SEV_IPRINT("remote client result: "
+                                   %%             "~n   ~p", [Result]),
+                                   {ok, State#{result => Result}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (send)",
+           cmd  => fun(#{tester := Tester, result := Result} = State) ->
+                           ?SEV_ANNOUNCE_READY(Tester, send, Result),
+                           {ok, maps:remove(result, State)}
+                   end},
+
+         %% Termination
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester  := Tester, 
+                         handler := Handler} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester,
+                                                     [{handler, Handler}]) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "stop (remote) handler",
+           cmd  => fun(#{handler := Handler}) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Handler),
+                           ok
+                   end},
+         #{desc => "await (remote) handler termination",
+           cmd  => fun(#{handler := Handler} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Handler),
+                           State1 = maps:remove(handler, State),
+                           {ok, State1}
+                   end},
+         #{desc => "stop client node",
+           cmd  => fun(#{node := Node} = _State) ->
+                           stop_node(Node)
+                   end},
+         #{desc => "await client node termination",
+           cmd  => fun(#{node := Node} = State) ->
+                           receive
+                               {nodedown, Node} ->
+                                   {ok, maps:remove(node, State)}
+                           end
+                   end},
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "monitor server",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor client",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+
+         %% Start the server
+         #{desc => "order server start",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid),
+                           ok
+                   end},
+         #{desc => "await server ready (init)",
+           cmd  => fun(#{server := Pid} = State) ->
+                           {ok, ServerSA} = ?SEV_AWAIT_READY(Pid, server, init),
+                           {ok, State#{server_sa => ServerSA}}
+                   end},
+
+         %% Start the client
+         #{desc => "order client start",
+           cmd  => fun(#{client    := Pid, 
+                         server_sa := ServerSA} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, ServerSA),
+                           ok
+                   end},
+         #{desc => "await client ready (init)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, client, init)
+                   end},
+ 
+         %% The actual test
+         #{desc => "order server continue (recv)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, recv),
+                           ok
+                   end},
+         ?SEV_SLEEP(?SECS(1)),
+         #{desc => "order client continue (send)",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, send),
+                           ok
+                   end},
+         #{desc => "await client ready (send)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = State) ->
+                           case ?SEV_AWAIT_READY(Client, client, send, 
+                                                 [{server, Server}]) of
+                               {ok, {_, _, _, _} = Result} ->
+                                   ?SEV_IPRINT("client result: "
+                                               "~n   ~p", [Result]),
+                                   {ok, State#{client_result => Result}};
+                               {ok, BadResult} ->
+                                   ?SEV_EPRINT("client result: "
+                                               "~n   ~p", [BadResult]),
+                                   {error, {invalid_client_result, BadResult}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order server continue (close)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Pid, close),
+                           ok
+                   end},
+         #{desc => "await server ready (close)",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Pid, server, close)
+                   end},
+         %% Because of the way we control the server, there is no real 
+         %% point in collecting statistics from it (the time will include
+         %% our communication with it).
+         #{desc => "await server ready (recv)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = _State) ->
+                           case ?SEV_AWAIT_READY(Server, server, recv,
+                                                 [{client, Client}]) of
+                               {ok, _Result} ->
+                                   ok;
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "present result",
+           cmd  => fun(#{client_result := CRes,
+                         num           := Num} = State) ->
+                           {CSent, CReceived, CStart, CStop} = CRes,
+                           CTime = tdiff(CStart, CStop),
+                           %% Note that the sizes we are counting is only 
+                           %% the "data" part of the messages. There is also
+                           %% fixed header for each message, which of cource
+                           %% is small for the large messages, but comparatively
+                           %% big for the small messages!
+                           ?SEV_IPRINT("Results: ~w messages exchanged"
+                                       "~n   Client: ~w msec"
+                                       "~n      ~.2f msec/message (roundtrip)"
+                                       "~n      ~.2f messages/msec (roundtrip)"
+                                       "~n      ~w bytes/msec sent"
+                                       "~n      ~w bytes/msec received",
+                                       [Num,
+                                        CTime,
+                                        CTime / Num,
+                                        Num / CTime,
+                                        CSent div CTime,
+                                        CReceived div CTime]),
+                           State1 = maps:remove(client_result, State),
+                           {ok, State1}
+                   end},
+
+         %% Terminations
+         #{desc => "order client to terminate",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await client termination",
+           cmd  => fun(#{client := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(client, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "order server to terminate",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Pid),
+                           ok
+                   end},
+         #{desc => "await server termination",
+           cmd  => fun(#{server := Pid} = State) ->
+                           case ?SEV_AWAIT_TERMINATION(Pid) of
+                               ok ->
+                                   State1 = maps:remove(server, State),
+                                   {ok, State1};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+
+    i("start server evaluator"),
+    ServerInitState = #{domain   => maps:get(domain,   InitState),
+                        proto    => maps:get(proto,    InitState),
+                        recv     => maps:get(recv,     InitState),
+                        send     => maps:get(send,     InitState),
+                        buf_init => maps:get(buf_init, InitState)},
+    Server = ?SEV_START("server", ServerSeq, ServerInitState),
+
+    i("start client evaluator(s)"),
+    ClientInitState = InitState#{host => local_host()},
+    Client = ?SEV_START("client", ClientSeq, ClientInitState),
+
+    i("start 'tester' evaluator"),
+    TesterInitState = #{server => Server#ev.pid,
+                        client => Client#ev.pid,
+                        num    => maps:get(num, InitState)},
+    Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    i("await evaluator"),
+    ok = ?SEV_AWAIT_FINISH([Server, Client, Tester]).
+
+
+
+%% Server side handler process
+%% We don't actually need a separate process for this socket, 
+%% but we do it anyway to simplify the sequence.
+tpp_udp_server_handler_create() ->
+    Self = self(),
+    erlang:spawn(fun() -> tpp_udp_server_handler(Self) end).
+
+tpp_udp_server_handler(Parent) ->
+    tpp_udp_server_handler_init(Parent),
+    {Sock, Send, Recv} = tpp_udp_handler_await_start(Parent),
+    tpp_udp_handler_announce_ready(Parent, init),
+    tpp_udp_handler_await_continue(Parent, recv),
+    Result = tpp_udp_server_handler_msg_exchange(Sock, Send, Recv),
+    tpp_udp_handler_announce_ready(Parent, recv, Result),
+    Reason = tpp_udp_handler_await_terminate(Parent),
+    ?SEV_IPRINT("terminating"),
+    exit(Reason).
+
+tpp_udp_server_handler_init(Parent) ->
+    put(sname, "shandler"),
+    ?SEV_IPRINT("init"),
+    _MRef = erlang:monitor(process, Parent),
+    ok.
+
+tpp_udp_server_handler_msg_exchange(Sock, Send, Recv) ->
+    tpp_udp_server_handler_msg_exchange_loop(Sock, Send, Recv,
+                                             0, 0, 0, undefined).
+
+tpp_udp_server_handler_msg_exchange_loop(Sock, Send, Recv, 
+                                         N, Sent, Received, Start) ->
+    %% ?SEV_IPRINT("[~w] try receive", [N]),
+    %% if 
+    %%     (N =:= (?TPP_SMALL_NUM-2)) -> 
+    %%         ?SEV_IPRINT("[~w] try receive", [N]),
+    %%         socket:setopt(Sock, otp, debug, true); 
+    %%     true -> ok
+    %% end,
+    try tpp_udp_recv_req(Sock, Recv) of
+        {ok, Msg, RecvSz, From} ->
+            NewStart = if (Start =:= undefined) -> ?LIB:timestamp(); 
+                          true -> Start end,
+            %% ?SEV_IPRINT("[~w] received - now try send", [N]),
+            try tpp_udp_send_rep(Sock, Send, Msg, From) of
+                {ok, SendSz} ->
+                    tpp_udp_server_handler_msg_exchange_loop(Sock, Send, Recv,
+                                                             N+1,
+                                                             Sent+SendSz,
+                                                             Received+RecvSz,
+                                                             NewStart);
+                {error, SReason} ->
+                    ?SEV_EPRINT("send (~w): ~p", [N, SReason]),
+                    exit({send, SReason, N})
+	    catch
+		SC:SE:SS ->
+		    exit({send, {SC, SE, SS}, N})
+            end;
+        {error, closed} ->
+            ?SEV_IPRINT("closed - we are done: ~w, ~w, ~w",
+                        [N, Sent, Received]),
+            Stop = ?LIB:timestamp(),
+            {N, Sent, Received, Start, Stop};
+        {error, RReason} ->
+            ?SEV_EPRINT("recv (~w): ~p", [N, RReason]),
+            exit({recv, RReason, N})
+    catch
+	RC:RE:RS ->
+	    exit({recv, {RC, RE, RS}, N})	
+    end.
+  
+
+%% The (remote) client side handler process
+
+tpp_udp_client_handler_create(Node) ->
+    Self = self(),
+    Fun  = fun() -> put(sname, "chandler"), tpp_udp_client_handler(Self) end,
+    erlang:spawn(Node, Fun).
+
+tpp_udp_client_handler(Parent) ->
+    tpp_udp_client_handler_init(Parent),
+    ?SEV_IPRINT("await start command"),
+    {ServerSA, Proto, BufInit, Send, Recv} = tpp_udp_handler_await_start(Parent),
+    ?SEV_IPRINT("start command with"
+                "~n   ServerSA: ~p", [ServerSA]),
+    Domain   = maps:get(family, ServerSA),
+    Sock     = tpp_udp_sock_open(Domain, Proto, BufInit),
+    Path     = tpp_udp_sock_bind(Sock, Domain),
+    ?SEV_IPRINT("announce ready", []),
+    tpp_udp_handler_announce_ready(Parent, init),
+    {InitMsg, Num} = tpp_udp_handler_await_continue(Parent, send),
+    ?SEV_IPRINT("received continue with"
+                "~n   Num: ~p", [Num]),
+    Result = tpp_udp_client_handler_msg_exchange(Sock, ServerSA, 
+                                                 Send, Recv, InitMsg, Num),
+    ?SEV_IPRINT("ready"),
+    tpp_udp_handler_announce_ready(Parent, send, Result),
+    ?SEV_IPRINT("await terminate"),
+    Reason = tpp_udp_handler_await_terminate(Parent),
+    ?SEV_IPRINT("terminate with ~p", [Reason]),
+    tpp_udp_sock_close(Sock, Path),
+    ?SEV_IPRINT("terminating"),
+    exit(Reason).
+
+tpp_udp_client_handler_init(Parent) ->
+    put(sname, "chandler"),
+    ?SEV_IPRINT("init"),
+    _MRef = erlang:monitor(process, Parent),
+    ok.
+
+tpp_udp_client_handler_msg_exchange(Sock, ServerSA,
+                                    Send, Recv, InitMsg, Num) ->
+    Start = ?LIB:timestamp(),
+    tpp_udp_client_handler_msg_exchange_loop(Sock, ServerSA,
+                                             Send, Recv, InitMsg,
+                                             Num, 0, 0, 0, Start).
+
+tpp_udp_client_handler_msg_exchange_loop(_Sock, _Dest, _Send, _Recv, _Msg,
+                                         Num, Num, Sent, Received,
+                                         Start) ->
+    Stop = ?LIB:timestamp(),
+    {Sent, Received, Start, Stop};
+tpp_udp_client_handler_msg_exchange_loop(Sock,
+					 #{family := local} = Dest,
+					 Send, Recv, Data,
+                                         Num, N, Sent, Received, Start) ->
+    case tpp_udp_send_req(Sock, Send, Data, Dest) of
+        {ok, SendSz} ->
+            case tpp_udp_recv_rep(Sock, Recv) of
+                {ok, NewData, RecvSz, Dest} ->
+                    tpp_udp_client_handler_msg_exchange_loop(Sock, Dest,
+                                                             Send, Recv,
+                                                             NewData, Num, N+1,
+                                                             Sent+SendSz, 
+                                                             Received+RecvSz, 
+                                                             Start);
+                {error, RReason} ->
+                    ?SEV_EPRINT("recv (~w of ~w): ~p", [N, Num, RReason]),
+                    exit({recv, RReason, N})
+            end;
+        {error, SReason} ->
+            ?SEV_EPRINT("send (~w of ~w): ~p", [N, Num, SReason]),
+            exit({send, SReason, N})
+    end;
+tpp_udp_client_handler_msg_exchange_loop(Sock,
+					 #{addr := Addr, port := Port} = Dest0,
+					 Send, Recv, Data,
+                                         Num, N, Sent, Received, Start) ->
+    case tpp_udp_send_req(Sock, Send, Data, Dest0) of
+        {ok, SendSz} ->
+            case tpp_udp_recv_rep(Sock, Recv) of
+                {ok, NewData, RecvSz, #{addr := Addr, port := Port} = Dest1} ->
+                    tpp_udp_client_handler_msg_exchange_loop(Sock, Dest1,
+                                                             Send, Recv,
+                                                             NewData, Num, N+1,
+                                                             Sent+SendSz, 
+                                                             Received+RecvSz, 
+                                                             Start);
+                {error, RReason} ->
+                    ?SEV_EPRINT("recv (~w of ~w): ~p", [N, Num, RReason]),
+                    exit({recv, RReason, N})
+            end;
+        {error, SReason} ->
+            ?SEV_EPRINT("send (~w of ~w): ~p", [N, Num, SReason]),
+            exit({send, SReason, N})
+    end.
+
+
+tpp_udp_recv_req(Sock, Recv) ->
+    tpp_udp_recv(Sock, Recv, ?TPP_REQUEST).
+
+tpp_udp_recv_rep(Sock, Recv) ->
+    tpp_udp_recv(Sock, Recv, ?TPP_REPLY).
+
+tpp_udp_recv(Sock, Recv, Tag) ->
+    %% ok = socket:setopt(Sock, otp, debug, true),
+    try Recv(Sock, 0) of
+        {ok, {Source, <<Tag:32/integer, Sz:32/integer, Data/binary>> = Msg}} 
+          when (Sz =:= size(Data)) ->
+	    %% ok = socket:setopt(Sock, otp, debug, false),
+            %% We got it all
+            %% ?SEV_IPRINT("tpp_udp_recv -> got all: "
+            %%             "~n   Source:     ~p"
+            %%             "~n   Tag:        ~p"
+            %%             "~n   Sz:         ~p"
+            %%             "~n   size(Data): ~p",
+            %%             [Source, Tag, Sz, size(Data)]),
+            {ok, Data, size(Msg), Source};
+        {ok, {_Source, <<Tag:32/integer, Sz:32/integer, Data/binary>>}} ->
+	    %% ok = socket:setopt(Sock, otp, debug, false),
+            {error, {invalid_msg, Sz, size(Data)}};
+        {ok, {_, <<Tag:32/integer, _/binary>>}} ->
+	    %% ok = socket:setopt(Sock, otp, debug, false),
+            {error, {invalid_msg_tag, Tag}};
+        {error, _} = ERROR ->
+	    %% ok = socket:setopt(Sock, otp, debug, false),
+            ERROR
+    catch
+	C:E:S ->
+	    {error, {catched, C, E, S}}
+    end.
+
+tpp_udp_send_req(Sock, Send, Data, Dest) ->
+    tpp_udp_send(Sock, Send, ?TPP_REQUEST, Data, Dest).
+
+tpp_udp_send_rep(Sock, Send, Data, Dest) ->
+    tpp_udp_send(Sock, Send, ?TPP_REPLY, Data, Dest).
+
+tpp_udp_send(Sock, Send, Tag, Data, Dest) ->
+    DataSz = size(Data),
+    Msg    = <<Tag:32/integer, DataSz:32/integer, Data/binary>>,
+    tpp_udp_send_msg(Sock, Send, Msg, Dest, 0).
+
+tpp_udp_send_msg(Sock, Send, Msg, Dest, AccSz) when is_binary(Msg) ->
+    case Send(Sock, Msg, Dest) of
+        ok ->
+            {ok, AccSz+size(Msg)};
+        {ok, Rest} -> % This is an IOVec
+            RestBin = list_to_binary(Rest),
+            tpp_udp_send_msg(Sock, Send, RestBin, Dest,
+                             AccSz+(size(Msg)-size(RestBin)));
+        {error, _} = ERROR ->
+            ERROR
+    end.
+    
+
+tpp_udp_handler_await_start(Parent) ->
+    ?SEV_IPRINT("await start"),
+    ?SEV_AWAIT_START(Parent).
+
+tpp_udp_handler_announce_ready(Parent, Slogan) ->
+    ?SEV_IPRINT("announce ready (~p)", [Slogan]),
+    ?SEV_ANNOUNCE_READY(Parent, Slogan).
+tpp_udp_handler_announce_ready(Parent, Slogan, Extra) ->
+    ?SEV_IPRINT("announce ready (~p)", [Slogan]),
+    ?SEV_ANNOUNCE_READY(Parent, Slogan, Extra).
+
+tpp_udp_handler_await_continue(Parent, Slogan) ->
+    ?SEV_IPRINT("await continue (~p)", [Slogan]),
+    case ?SEV_AWAIT_CONTINUE(Parent, parent, Slogan) of
+        ok ->
+            ?SEV_IPRINT("continue (~p): ok", [Slogan]),
+            ok;
+        {ok, Data} ->
+            ?SEV_IPRINT("continue (~p): ok with data", [Slogan]),
+            Data;
+        {error, Reason} ->
+            ?SEV_EPRINT("continue (~p): error"
+                        "~n   ~p", [Slogan, Reason]),
+            exit({continue, Slogan, Reason})
+    end.
+
+tpp_udp_handler_await_terminate(Parent) ->
+    ?SEV_IPRINT("await terminate"),
+    case ?SEV_AWAIT_TERMINATE(Parent, parent) of
+        ok ->
+            ok;
+        {error, Reason} ->
+            Reason
+    end.
+
+
+tpp_udp_sock_open(Domain, Proto, BufInit) ->
+    case socket:open(Domain, dgram, Proto) of
+        {ok, Sock} ->
+            ok = BufInit(Sock),
+            Sock;
+        {error, Reason} ->
+            exit({open_failed, Reason})
+    end.
+
+tpp_udp_sock_bind(Sock, Domain) ->
+    LSA = which_local_socket_addr(Domain),
+    case socket:bind(Sock, LSA) of
+        {ok, _} ->
+            ok;
+        {error, Reason} ->
+            exit({bind, Reason})
+    end.
+
+tpp_udp_sock_close(Sock, Path) ->
+    case socket:close(Sock) of
+        ok ->
+            unlink_path(Path),
+            ok;
+        {error, Reason} ->
+            ?SEV_EPRINT("Failed closing socket: "
+                        "~n   ~p", [Reason]),
+            unlink_path(Path),
+            {error, {close, Reason}}
+    end.
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_sgenf_cgenf_small_tcp4(suite) ->
+    [];
+ttest_sgenf_cgenf_small_tcp4(doc) ->
+    [];
+ttest_sgenf_cgenf_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_cgenf_small_tcp4,
+              Runtime,
+              inet,
+              gen, false,
+              gen, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_cgenf_small_tcp6(suite) ->
+    [];
+ttest_sgenf_cgenf_small_tcp6(doc) ->
+    [];
+ttest_sgenf_cgenf_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_cgenf_small_tcp6,
+              Runtime,
+              inet6,
+              gen, false,
+              gen, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_sgenf_cgenf_medium_tcp4(suite) ->
+    [];
+ttest_sgenf_cgenf_medium_tcp4(doc) ->
+    [];
+ttest_sgenf_cgenf_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_cgenf_medium_tcp4,
+              Runtime,
+              inet,
+              gen, false,
+              gen, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_cgenf_medium_tcp6(suite) ->
+    [];
+ttest_sgenf_cgenf_medium_tcp6(doc) ->
+    [];
+ttest_sgenf_cgenf_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_cgenf_medium_tcp6,
+              Runtime,
+              inet6,
+              gen, false,
+              gen, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_sgenf_cgenf_large_tcp4(suite) ->
+    [];
+ttest_sgenf_cgenf_large_tcp4(doc) ->
+    [];
+ttest_sgenf_cgenf_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_cgenf_large_tcp4,
+              Runtime,
+              inet,
+              gen, false,
+              gen, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_cgenf_large_tcp6(suite) ->
+    [];
+ttest_sgenf_cgenf_large_tcp6(doc) ->
+    [];
+ttest_sgenf_cgenf_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_cgenf_large_tcp6,
+              Runtime,
+              inet6,
+              gen, false,
+              gen, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_sgenf_cgeno_small_tcp4(suite) ->
+    [];
+ttest_sgenf_cgeno_small_tcp4(doc) ->
+    [];
+ttest_sgenf_cgeno_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_cgeno_small_tcp4,
+              Runtime,
+              inet,
+              gen, false,
+              gen, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_cgeno_small_tcp6(suite) ->
+    [];
+ttest_sgenf_cgeno_small_tcp6(doc) ->
+    [];
+ttest_sgenf_cgeno_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_cgeno_small_tcp6,
+              Runtime,
+              inet6,
+              gen, false,
+              gen, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_sgenf_cgeno_medium_tcp4(suite) ->
+    [];
+ttest_sgenf_cgeno_medium_tcp4(doc) ->
+    [];
+ttest_sgenf_cgeno_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_cgeno_medium_tcp4,
+              Runtime,
+              inet,
+              gen, false,
+              gen, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_cgeno_medium_tcp6(suite) ->
+    [];
+ttest_sgenf_cgeno_medium_tcp6(doc) ->
+    [];
+ttest_sgenf_cgeno_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_cgeno_medium_tcp6,
+              Runtime,
+              inet6,
+              gen, false,
+              gen, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_sgenf_cgeno_large_tcp4(suite) ->
+    [];
+ttest_sgenf_cgeno_large_tcp4(doc) ->
+    [];
+ttest_sgenf_cgeno_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_cgeno_large_tcp4,
+              Runtime,
+              inet,
+              gen, false,
+              gen, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_cgeno_large_tcp6(suite) ->
+    [];
+ttest_sgenf_cgeno_large_tcp6(doc) ->
+    [];
+ttest_sgenf_cgeno_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_cgeno_large_tcp6,
+              Runtime,
+              inet6,
+              gen, false,
+              gen, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_sgenf_cgent_small_tcp4(suite) ->
+    [];
+ttest_sgenf_cgent_small_tcp4(doc) ->
+    [];
+ttest_sgenf_cgent_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_cgent_small_tcp4,
+              Runtime,
+              inet,
+              gen, false,
+              gen, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_cgent_small_tcp6(suite) ->
+    [];
+ttest_sgenf_cgent_small_tcp6(doc) ->
+    [];
+ttest_sgenf_cgent_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_cgeno_small_tcp6,
+              Runtime,
+              inet6,
+              gen, false,
+              gen, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_sgenf_cgent_medium_tcp4(suite) ->
+    [];
+ttest_sgenf_cgent_medium_tcp4(doc) ->
+    [];
+ttest_sgenf_cgent_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_cgent_medium_tcp4,
+              Runtime,
+              inet,
+              gen, false,
+              gen, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_cgent_medium_tcp6(suite) ->
+    [];
+ttest_sgenf_cgent_medium_tcp6(doc) ->
+    [];
+ttest_sgenf_cgent_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_cgent_medium_tcp6,
+              Runtime,
+              inet6,
+              gen, false,
+              gen, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_sgenf_cgent_large_tcp4(suite) ->
+    [];
+ttest_sgenf_cgent_large_tcp4(doc) ->
+    [];
+ttest_sgenf_cgent_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_cgent_large_tcp4,
+              Runtime,
+              inet,
+              gen, false,
+              gen, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_cgent_large_tcp6(suite) ->
+    [];
+ttest_sgenf_cgent_large_tcp6(doc) ->
+    [];
+ttest_sgenf_cgent_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_cgent_large_tcp6,
+              Runtime,
+              inet6,
+              gen, false,
+              gen, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_sgenf_csockf_small_tcp4(suite) ->
+    [];
+ttest_sgenf_csockf_small_tcp4(doc) ->
+    [];
+ttest_sgenf_csockf_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_csockf_small_tcp4,
+              Runtime,
+              inet,
+              gen, false,
+              sock, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_csockf_small_tcp6(suite) ->
+    [];
+ttest_sgenf_csockf_small_tcp6(doc) ->
+    [];
+ttest_sgenf_csockf_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_csockf_small_tcp6,
+              Runtime,
+              inet6,
+              gen, false,
+              sock, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_sgenf_csockf_medium_tcp4(suite) ->
+    [];
+ttest_sgenf_csockf_medium_tcp4(doc) ->
+    [];
+ttest_sgenf_csockf_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_csockf_medium_tcp4,
+              Runtime,
+              inet,
+              gen, false,
+              sock, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_csockf_medium_tcp6(suite) ->
+    [];
+ttest_sgenf_csockf_medium_tcp6(doc) ->
+    [];
+ttest_sgenf_csockf_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_csockf_medium_tcp6,
+              Runtime,
+              inet6,
+              gen, false,
+              sock, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_sgenf_csockf_large_tcp4(suite) ->
+    [];
+ttest_sgenf_csockf_large_tcp4(doc) ->
+    [];
+ttest_sgenf_csockf_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_csockf_large_tcp4,
+              Runtime,
+              inet,
+              gen, false,
+              sock, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_csockf_large_tcp6(suite) ->
+    [];
+ttest_sgenf_csockf_large_tcp6(doc) ->
+    [];
+ttest_sgenf_csockf_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_csockf_large_tcp6,
+              Runtime,
+              inet6,
+              gen, false,
+              sock, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_sgenf_csocko_small_tcp4(suite) ->
+    [];
+ttest_sgenf_csocko_small_tcp4(doc) ->
+    [];
+ttest_sgenf_csocko_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_csocko_small_tcp4,
+              Runtime,
+              inet,
+              gen, false,
+              sock, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_csocko_small_tcp6(suite) ->
+    [];
+ttest_sgenf_csocko_small_tcp6(doc) ->
+    [];
+ttest_sgenf_csocko_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_csocko_small_tcp6,
+              Runtime,
+              inet6,
+              gen, false,
+              sock, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_sgenf_csocko_medium_tcp4(suite) ->
+    [];
+ttest_sgenf_csocko_medium_tcp4(doc) ->
+    [];
+ttest_sgenf_csocko_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_csocko_medium_tcp4,
+              Runtime,
+              inet,
+              gen, false,
+              sock, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_csocko_medium_tcp6(suite) ->
+    [];
+ttest_sgenf_csocko_medium_tcp6(doc) ->
+    [];
+ttest_sgenf_csocko_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_csocko_medium_tcp6,
+              Runtime,
+              inet6,
+              gen, false,
+              sock, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_sgenf_csocko_large_tcp4(suite) ->
+    [];
+ttest_sgenf_csocko_large_tcp4(doc) ->
+    [];
+ttest_sgenf_csocko_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_csocko_large_tcp4,
+              Runtime,
+              inet,
+              gen, false,
+              sock, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_csocko_large_tcp6(suite) ->
+    [];
+ttest_sgenf_csocko_large_tcp6(doc) ->
+    [];
+ttest_sgenf_csocko_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_csocko_large_tcp6,
+              Runtime,
+              inet6,
+              gen, false,
+              sock, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_sgenf_csockt_small_tcp4(suite) ->
+    [];
+ttest_sgenf_csockt_small_tcp4(doc) ->
+    [];
+ttest_sgenf_csockt_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_csockt_small_tcp4,
+              Runtime,
+              inet,
+              gen, false,
+              sock, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_csockt_small_tcp6(suite) ->
+    [];
+ttest_sgenf_csockt_small_tcp6(doc) ->
+    [];
+ttest_sgenf_csockt_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_csocko_small_tcp6,
+              Runtime,
+              inet6,
+              gen, false,
+              sock, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_sgenf_csockt_medium_tcp4(suite) ->
+    [];
+ttest_sgenf_csockt_medium_tcp4(doc) ->
+    [];
+ttest_sgenf_csockt_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_csockt_medium_tcp4,
+              Runtime,
+              inet,
+              gen, false,
+              sock, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_csockt_medium_tcp6(suite) ->
+    [];
+ttest_sgenf_csockt_medium_tcp6(doc) ->
+    [];
+ttest_sgenf_csockt_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_csockt_medium_tcp6,
+              Runtime,
+              inet6,
+              gen, false,
+              sock, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_sgenf_csockt_large_tcp4(suite) ->
+    [];
+ttest_sgenf_csockt_large_tcp4(doc) ->
+    [];
+ttest_sgenf_csockt_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_csockt_large_tcp4,
+              Runtime,
+              inet,
+              gen, false,
+              sock, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = false
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_sgenf_csockt_large_tcp6(suite) ->
+    [];
+ttest_sgenf_csockt_large_tcp6(doc) ->
+    [];
+ttest_sgenf_csockt_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgenf_csockt_large_tcp6,
+              Runtime,
+              inet6,
+              gen, false,
+              sock, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_sgeno_cgenf_small_tcp4(suite) ->
+    [];
+ttest_sgeno_cgenf_small_tcp4(doc) ->
+    [];
+ttest_sgeno_cgenf_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_cgenf_small_tcp4,
+              Runtime,
+              inet,
+              gen, once,
+              gen, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_cgenf_small_tcp6(suite) ->
+    [];
+ttest_sgeno_cgenf_small_tcp6(doc) ->
+    [];
+ttest_sgeno_cgenf_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_cgenf_small_tcp6,
+              Runtime,
+              inet6,
+              gen, once,
+              gen, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_sgeno_cgenf_medium_tcp4(suite) ->
+    [];
+ttest_sgeno_cgenf_medium_tcp4(doc) ->
+    [];
+ttest_sgeno_cgenf_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_cgenf_medium_tcp4,
+              Runtime,
+              inet,
+              gen, once,
+              gen, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_cgenf_medium_tcp6(suite) ->
+    [];
+ttest_sgeno_cgenf_medium_tcp6(doc) ->
+    [];
+ttest_sgeno_cgenf_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_cgenf_medium_tcp6,
+              Runtime,
+              inet6,
+              gen, once,
+              gen, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_sgeno_cgenf_large_tcp4(suite) ->
+    [];
+ttest_sgeno_cgenf_large_tcp4(doc) ->
+    [];
+ttest_sgeno_cgenf_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_cgenf_large_tcp4,
+              Runtime,
+              inet,
+              gen, once,
+              gen, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_cgenf_large_tcp6(suite) ->
+    [];
+ttest_sgeno_cgenf_large_tcp6(doc) ->
+    [];
+ttest_sgeno_cgenf_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_cgenf_large_tcp6,
+              Runtime,
+              inet6,
+              gen, once,
+              gen, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_sgeno_cgeno_small_tcp4(suite) ->
+    [];
+ttest_sgeno_cgeno_small_tcp4(doc) ->
+    [];
+ttest_sgeno_cgeno_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_cgeno_small_tcp4,
+              Runtime,
+              inet,
+              gen, once,
+              gen, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_cgeno_small_tcp6(suite) ->
+    [];
+ttest_sgeno_cgeno_small_tcp6(doc) ->
+    [];
+ttest_sgeno_cgeno_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_cgeno_small_tcp6,
+              Runtime,
+              inet6,
+              gen, once,
+              gen, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_sgeno_cgeno_medium_tcp4(suite) ->
+    [];
+ttest_sgeno_cgeno_medium_tcp4(doc) ->
+    [];
+ttest_sgeno_cgeno_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_cgeno_medium_tcp4,
+              Runtime,
+              inet,
+              gen, once,
+              gen, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_cgeno_medium_tcp6(suite) ->
+    [];
+ttest_sgeno_cgeno_medium_tcp6(doc) ->
+    [];
+ttest_sgeno_cgeno_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_cgeno_medium_tcp6,
+              Runtime,
+              inet6,
+              gen, once,
+              gen, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_sgeno_cgeno_large_tcp4(suite) ->
+    [];
+ttest_sgeno_cgeno_large_tcp4(doc) ->
+    [];
+ttest_sgeno_cgeno_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_cgeno_large_tcp4,
+              Runtime,
+              inet,
+              gen, once,
+              gen, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_cgeno_large_tcp6(suite) ->
+    [];
+ttest_sgeno_cgeno_large_tcp6(doc) ->
+    [];
+ttest_sgeno_cgeno_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_cgeno_large_tcp6,
+              Runtime,
+              inet6,
+              gen, once,
+              gen, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_sgeno_cgent_small_tcp4(suite) ->
+    [];
+ttest_sgeno_cgent_small_tcp4(doc) ->
+    [];
+ttest_sgeno_cgent_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_cgent_small_tcp4,
+              Runtime,
+              inet,
+              gen, once,
+              gen, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_cgent_small_tcp6(suite) ->
+    [];
+ttest_sgeno_cgent_small_tcp6(doc) ->
+    [];
+ttest_sgeno_cgent_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_cgeno_small_tcp6,
+              Runtime,
+              inet6,
+              gen, once,
+              gen, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_sgeno_cgent_medium_tcp4(suite) ->
+    [];
+ttest_sgeno_cgent_medium_tcp4(doc) ->
+    [];
+ttest_sgeno_cgent_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_cgent_medium_tcp4,
+              Runtime,
+              inet,
+              gen, once,
+              gen, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_cgent_medium_tcp6(suite) ->
+    [];
+ttest_sgeno_cgent_medium_tcp6(doc) ->
+    [];
+ttest_sgeno_cgent_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_cgent_medium_tcp6,
+              Runtime,
+              inet6,
+              gen, once,
+              gen, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_sgeno_cgent_large_tcp4(suite) ->
+    [];
+ttest_sgeno_cgent_large_tcp4(doc) ->
+    [];
+ttest_sgeno_cgent_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_cgent_large_tcp4,
+              Runtime,
+              inet,
+              gen, once,
+              gen, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_cgent_large_tcp6(suite) ->
+    [];
+ttest_sgeno_cgent_large_tcp6(doc) ->
+    [];
+ttest_sgeno_cgent_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_cgent_large_tcp6,
+              Runtime,
+              inet6,
+              gen, once,
+              gen, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_sgeno_csockf_small_tcp4(suite) ->
+    [];
+ttest_sgeno_csockf_small_tcp4(doc) ->
+    [];
+ttest_sgeno_csockf_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_csockf_small_tcp4,
+              Runtime,
+              inet,
+              gen, once,
+              sock, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_csockf_small_tcp6(suite) ->
+    [];
+ttest_sgeno_csockf_small_tcp6(doc) ->
+    [];
+ttest_sgeno_csockf_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_csockf_small_tcp6,
+              Runtime,
+              inet6,
+              gen, once,
+              sock, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_sgeno_csockf_medium_tcp4(suite) ->
+    [];
+ttest_sgeno_csockf_medium_tcp4(doc) ->
+    [];
+ttest_sgeno_csockf_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_csockf_medium_tcp4,
+              Runtime,
+              inet,
+              gen, once,
+              sock, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_csockf_medium_tcp6(suite) ->
+    [];
+ttest_sgeno_csockf_medium_tcp6(doc) ->
+    [];
+ttest_sgeno_csockf_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_csockf_medium_tcp6,
+              Runtime,
+              inet6,
+              gen, once,
+              sock, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_sgeno_csockf_large_tcp4(suite) ->
+    [];
+ttest_sgeno_csockf_large_tcp4(doc) ->
+    [];
+ttest_sgeno_csockf_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_csockf_large_tcp4,
+              Runtime,
+              inet,
+              gen, once,
+              sock, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_csockf_large_tcp6(suite) ->
+    [];
+ttest_sgeno_csockf_large_tcp6(doc) ->
+    [];
+ttest_sgeno_csockf_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_csockf_large_tcp6,
+              Runtime,
+              inet6,
+              gen, once,
+              sock, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_sgeno_csocko_small_tcp4(suite) ->
+    [];
+ttest_sgeno_csocko_small_tcp4(doc) ->
+    [];
+ttest_sgeno_csocko_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_csocko_small_tcp4,
+              Runtime,
+              inet,
+              gen, once,
+              sock, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_csocko_small_tcp6(suite) ->
+    [];
+ttest_sgeno_csocko_small_tcp6(doc) ->
+    [];
+ttest_sgeno_csocko_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_csocko_small_tcp6,
+              Runtime,
+              inet6,
+              gen, once,
+              sock, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_sgeno_csocko_medium_tcp4(suite) ->
+    [];
+ttest_sgeno_csocko_medium_tcp4(doc) ->
+    [];
+ttest_sgeno_csocko_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_csocko_medium_tcp4,
+              Runtime,
+              inet,
+              gen, once,
+              sock, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_csocko_medium_tcp6(suite) ->
+    [];
+ttest_sgeno_csocko_medium_tcp6(doc) ->
+    [];
+ttest_sgeno_csocko_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_csocko_medium_tcp6,
+              Runtime,
+              inet6,
+              gen, once,
+              sock, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_sgeno_csocko_large_tcp4(suite) ->
+    [];
+ttest_sgeno_csocko_large_tcp4(doc) ->
+    [];
+ttest_sgeno_csocko_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_csocko_large_tcp4,
+              Runtime,
+              inet,
+              gen, once,
+              sock, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_csocko_large_tcp6(suite) ->
+    [];
+ttest_sgeno_csocko_large_tcp6(doc) ->
+    [];
+ttest_sgeno_csocko_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_csocko_large_tcp6,
+              Runtime,
+              inet6,
+              gen, once,
+              sock, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_sgeno_csockt_small_tcp4(suite) ->
+    [];
+ttest_sgeno_csockt_small_tcp4(doc) ->
+    [];
+ttest_sgeno_csockt_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_csockt_small_tcp4,
+              Runtime,
+              inet,
+              gen, once,
+              sock, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_csockt_small_tcp6(suite) ->
+    [];
+ttest_sgeno_csockt_small_tcp6(doc) ->
+    [];
+ttest_sgeno_csockt_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_csocko_small_tcp6,
+              Runtime,
+              inet6,
+              gen, once,
+              sock, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_sgeno_csockt_medium_tcp4(suite) ->
+    [];
+ttest_sgeno_csockt_medium_tcp4(doc) ->
+    [];
+ttest_sgeno_csockt_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_csockt_medium_tcp4,
+              Runtime,
+              inet,
+              gen, once,
+              sock, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_csockt_medium_tcp6(suite) ->
+    [];
+ttest_sgeno_csockt_medium_tcp6(doc) ->
+    [];
+ttest_sgeno_csockt_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_csockt_medium_tcp6,
+              Runtime,
+              inet6,
+              gen, once,
+              sock, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_sgeno_csockt_large_tcp4(suite) ->
+    [];
+ttest_sgeno_csockt_large_tcp4(doc) ->
+    [];
+ttest_sgeno_csockt_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_csockt_large_tcp4,
+              Runtime,
+              inet,
+              gen, once,
+              sock, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = once
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_sgeno_csockt_large_tcp6(suite) ->
+    [];
+ttest_sgeno_csockt_large_tcp6(doc) ->
+    [];
+ttest_sgeno_csockt_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgeno_csockt_large_tcp6,
+              Runtime,
+              inet6,
+              gen, once,
+              sock, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_sgent_cgenf_small_tcp4(suite) ->
+    [];
+ttest_sgent_cgenf_small_tcp4(doc) ->
+    [];
+ttest_sgent_cgenf_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_cgenf_small_tcp4,
+              Runtime,
+              inet,
+              gen, true,
+              gen, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_sgent_cgenf_small_tcp6(suite) ->
+    [];
+ttest_sgent_cgenf_small_tcp6(doc) ->
+    [];
+ttest_sgent_cgenf_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_cgenf_small_tcp6,
+              Runtime,
+              inet6,
+              gen, true,
+              gen, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_sgent_cgenf_medium_tcp4(suite) ->
+    [];
+ttest_sgent_cgenf_medium_tcp4(doc) ->
+    [];
+ttest_sgent_cgenf_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_cgenf_medium_tcp4,
+              Runtime,
+              inet,
+              gen, true,
+              gen, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_sgent_cgenf_medium_tcp6(suite) ->
+    [];
+ttest_sgent_cgenf_medium_tcp6(doc) ->
+    [];
+ttest_sgent_cgenf_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_cgenf_medium_tcp6,
+              Runtime,
+              inet6,
+              gen, true,
+              gen, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_sgent_cgenf_large_tcp4(suite) ->
+    [];
+ttest_sgent_cgenf_large_tcp4(doc) ->
+    [];
+ttest_sgent_cgenf_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_cgenf_large_tcp4,
+              Runtime,
+              inet,
+              gen, true,
+              gen, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_sgent_cgenf_large_tcp6(suite) ->
+    [];
+ttest_sgent_cgenf_large_tcp6(doc) ->
+    [];
+ttest_sgent_cgenf_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_cgenf_large_tcp6,
+              Runtime,
+              inet6,
+              gen, true,
+              gen, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_sgent_cgeno_small_tcp4(suite) ->
+    [];
+ttest_sgent_cgeno_small_tcp4(doc) ->
+    [];
+ttest_sgent_cgeno_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_cgeno_small_tcp4,
+              Runtime,
+              inet,
+              gen, true,
+              gen, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_sgent_cgeno_small_tcp6(suite) ->
+    [];
+ttest_sgent_cgeno_small_tcp6(doc) ->
+    [];
+ttest_sgent_cgeno_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_cgeno_small_tcp6,
+              Runtime,
+              inet6,
+              gen, true,
+              gen, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_sgent_cgeno_medium_tcp4(suite) ->
+    [];
+ttest_sgent_cgeno_medium_tcp4(doc) ->
+    [];
+ttest_sgent_cgeno_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_cgeno_medium_tcp4,
+              Runtime,
+              inet,
+              gen, true,
+              gen, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_sgent_cgeno_medium_tcp6(suite) ->
+    [];
+ttest_sgent_cgeno_medium_tcp6(doc) ->
+    [];
+ttest_sgent_cgeno_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_cgeno_medium_tcp6,
+              Runtime,
+              inet6,
+              gen, true,
+              gen, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_sgent_cgeno_large_tcp4(suite) ->
+    [];
+ttest_sgent_cgeno_large_tcp4(doc) ->
+    [];
+ttest_sgent_cgeno_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_cgeno_large_tcp4,
+              Runtime,
+              inet,
+              gen, true,
+              gen, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_sgent_cgeno_large_tcp6(suite) ->
+    [];
+ttest_sgent_cgeno_large_tcp6(doc) ->
+    [];
+ttest_sgent_cgeno_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_cgeno_large_tcp6,
+              Runtime,
+              inet6,
+              gen, true,
+              gen, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_sgent_cgent_small_tcp4(suite) ->
+    [];
+ttest_sgent_cgent_small_tcp4(doc) ->
+    [];
+ttest_sgent_cgent_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_cgent_small_tcp4,
+              Runtime,
+              inet,
+              gen, true,
+              gen, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_sgent_cgent_small_tcp6(suite) ->
+    [];
+ttest_sgent_cgent_small_tcp6(doc) ->
+    [];
+ttest_sgent_cgent_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_cgeno_small_tcp6,
+              Runtime,
+              inet6,
+              gen, true,
+              gen, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_sgent_cgent_medium_tcp4(suite) ->
+    [];
+ttest_sgent_cgent_medium_tcp4(doc) ->
+    ["Server(gen,true), Client(gen,true), Domain=inet, msg=medium"];
+ttest_sgent_cgent_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_cgent_medium_tcp4,
+              Runtime,
+              inet,
+              gen, true,
+              gen, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_sgent_cgent_medium_tcp6(suite) ->
+    [];
+ttest_sgent_cgent_medium_tcp6(doc) ->
+    ["Server(gen,true), Client(gen,true), Domain=inet6, msg=medium"];
+ttest_sgent_cgent_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_cgent_medium_tcp6,
+              Runtime,
+              inet6,
+              gen, true,
+              gen, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_sgent_cgent_large_tcp4(suite) ->
+    [];
+ttest_sgent_cgent_large_tcp4(doc) ->
+    ["Server(gen,true), Client(gen,true), Domain=inet, msg=large"];
+ttest_sgent_cgent_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_cgent_large_tcp4,
+              Runtime,
+              inet,
+              gen, true,
+              gen, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_sgent_cgent_large_tcp6(suite) ->
+    [];
+ttest_sgent_cgent_large_tcp6(doc) ->
+    ["Server(gen,true), Client(gen,true), Domain=inet6, msg=large"];
+ttest_sgent_cgent_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_cgent_large_tcp6,
+              Runtime,
+              inet6,
+              gen, true,
+              gen, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_sgent_csockf_small_tcp4(suite) ->
+    [];
+ttest_sgent_csockf_small_tcp4(doc) ->
+    [];
+ttest_sgent_csockf_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_csockf_small_tcp4,
+              Runtime,
+              inet,
+              gen, true,
+              sock, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_sgent_csockf_small_tcp6(suite) ->
+    [];
+ttest_sgent_csockf_small_tcp6(doc) ->
+    [];
+ttest_sgent_csockf_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_csockf_small_tcp6,
+              Runtime,
+              inet6,
+              gen, true,
+              sock, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_sgent_csockf_medium_tcp4(suite) ->
+    [];
+ttest_sgent_csockf_medium_tcp4(doc) ->
+    [];
+ttest_sgent_csockf_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_csockf_medium_tcp4,
+              Runtime,
+              inet,
+              gen, true,
+              sock, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_sgent_csockf_medium_tcp6(suite) ->
+    [];
+ttest_sgent_csockf_medium_tcp6(doc) ->
+    [];
+ttest_sgent_csockf_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_csockf_medium_tcp6,
+              Runtime,
+              inet6,
+              gen, true,
+              sock, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_sgent_csockf_large_tcp4(suite) ->
+    [];
+ttest_sgent_csockf_large_tcp4(doc) ->
+    [];
+ttest_sgent_csockf_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_csockf_large_tcp4,
+              Runtime,
+              inet,
+              gen, true,
+              sock, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_sgent_csockf_large_tcp6(suite) ->
+    [];
+ttest_sgent_csockf_large_tcp6(doc) ->
+    [];
+ttest_sgent_csockf_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_csockf_large_tcp6,
+              Runtime,
+              inet6,
+              gen, true,
+              sock, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_sgent_csocko_small_tcp4(suite) ->
+    [];
+ttest_sgent_csocko_small_tcp4(doc) ->
+    [];
+ttest_sgent_csocko_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_csocko_small_tcp4,
+              Runtime,
+              inet,
+              gen, true,
+              sock, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_sgent_csocko_small_tcp6(suite) ->
+    [];
+ttest_sgent_csocko_small_tcp6(doc) ->
+    [];
+ttest_sgent_csocko_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_csocko_small_tcp6,
+              Runtime,
+              inet6,
+              gen, true,
+              sock, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_sgent_csocko_medium_tcp4(suite) ->
+    [];
+ttest_sgent_csocko_medium_tcp4(doc) ->
+    [];
+ttest_sgent_csocko_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_csocko_medium_tcp4,
+              Runtime,
+              inet,
+              gen, true,
+              sock, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_sgent_csocko_medium_tcp6(suite) ->
+    [];
+ttest_sgent_csocko_medium_tcp6(doc) ->
+    [];
+ttest_sgent_csocko_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_csocko_medium_tcp6,
+              Runtime,
+              inet6,
+              gen, true,
+              sock, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_sgent_csocko_large_tcp4(suite) ->
+    [];
+ttest_sgent_csocko_large_tcp4(doc) ->
+    [];
+ttest_sgent_csocko_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_csocko_large_tcp4,
+              Runtime,
+              inet,
+              gen, true,
+              sock, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_sgent_csocko_large_tcp6(suite) ->
+    [];
+ttest_sgent_csocko_large_tcp6(doc) ->
+    [];
+ttest_sgent_csocko_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_csocko_large_tcp6,
+              Runtime,
+              inet6,
+              gen, true,
+              sock, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_sgent_csockt_small_tcp4(suite) ->
+    [];
+ttest_sgent_csockt_small_tcp4(doc) ->
+    [];
+ttest_sgent_csockt_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_csockt_small_tcp4,
+              Runtime,
+              inet,
+              gen, true,
+              sock, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_sgent_csockt_small_tcp6(suite) ->
+    [];
+ttest_sgent_csockt_small_tcp6(doc) ->
+    [];
+ttest_sgent_csockt_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_csocko_small_tcp6,
+              Runtime,
+              inet6,
+              gen, true,
+              sock, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_sgent_csockt_medium_tcp4(suite) ->
+    [];
+ttest_sgent_csockt_medium_tcp4(doc) ->
+    [];
+ttest_sgent_csockt_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_csockt_medium_tcp4,
+              Runtime,
+              inet,
+              gen, true,
+              sock, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_sgent_csockt_medium_tcp6(suite) ->
+    [];
+ttest_sgent_csockt_medium_tcp6(doc) ->
+    [];
+ttest_sgent_csockt_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_csockt_medium_tcp6,
+              Runtime,
+              inet6,
+              gen, true,
+              sock, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_sgent_csockt_large_tcp4(suite) ->
+    [];
+ttest_sgent_csockt_large_tcp4(doc) ->
+    [];
+ttest_sgent_csockt_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_csockt_large_tcp4,
+              Runtime,
+              inet,
+              gen, true,
+              sock, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = gen_tcp, Active = true
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_sgent_csockt_large_tcp6(suite) ->
+    [];
+ttest_sgent_csockt_large_tcp6(doc) ->
+    [];
+ttest_sgent_csockt_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_sgent_csockt_large_tcp6,
+              Runtime,
+              inet6,
+              gen, true,
+              sock, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_ssockf_cgenf_small_tcp4(suite) ->
+    [];
+ttest_ssockf_cgenf_small_tcp4(doc) ->
+    [];
+ttest_ssockf_cgenf_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_cgenf_small_tcp4,
+              Runtime,
+              inet,
+              sock, false,
+              gen, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_ssockf_cgenf_small_tcp6(suite) ->
+    [];
+ttest_ssockf_cgenf_small_tcp6(doc) ->
+    [];
+ttest_ssockf_cgenf_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_cgenf_small_tcp6,
+              Runtime,
+              inet6,
+              sock, false,
+              gen, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_ssockf_cgenf_medium_tcp4(suite) ->
+    [];
+ttest_ssockf_cgenf_medium_tcp4(doc) ->
+    [];
+ttest_ssockf_cgenf_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_cgenf_medium_tcp4,
+              Runtime,
+              inet,
+              sock, false,
+              gen, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_ssockf_cgenf_medium_tcp6(suite) ->
+    [];
+ttest_ssockf_cgenf_medium_tcp6(doc) ->
+    [];
+ttest_ssockf_cgenf_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_cgenf_medium_tcp6,
+              Runtime,
+              inet6,
+              sock, false,
+              gen, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_ssockf_cgenf_large_tcp4(suite) ->
+    [];
+ttest_ssockf_cgenf_large_tcp4(doc) ->
+    [];
+ttest_ssockf_cgenf_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_cgenf_large_tcp4,
+              Runtime,
+              inet,
+              sock, false,
+              gen, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_ssockf_cgenf_large_tcp6(suite) ->
+    [];
+ttest_ssockf_cgenf_large_tcp6(doc) ->
+    [];
+ttest_ssockf_cgenf_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_cgenf_large_tcp6,
+              Runtime,
+              inet6,
+              sock, false,
+              gen, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_ssockf_cgeno_small_tcp4(suite) ->
+    [];
+ttest_ssockf_cgeno_small_tcp4(doc) ->
+    [];
+ttest_ssockf_cgeno_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_cgeno_small_tcp4,
+              Runtime,
+              inet,
+              sock, false,
+              gen, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_ssockf_cgeno_small_tcp6(suite) ->
+    [];
+ttest_ssockf_cgeno_small_tcp6(doc) ->
+    [];
+ttest_ssockf_cgeno_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_cgeno_small_tcp6,
+              Runtime,
+              inet6,
+              sock, false,
+              gen, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_ssockf_cgeno_medium_tcp4(suite) ->
+    [];
+ttest_ssockf_cgeno_medium_tcp4(doc) ->
+    [];
+ttest_ssockf_cgeno_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_cgeno_medium_tcp4,
+              Runtime,
+              inet,
+              sock, false,
+              gen, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_ssockf_cgeno_medium_tcp6(suite) ->
+    [];
+ttest_ssockf_cgeno_medium_tcp6(doc) ->
+    [];
+ttest_ssockf_cgeno_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_cgeno_medium_tcp6,
+              Runtime,
+              inet6,
+              sock, false,
+              gen, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_ssockf_cgeno_large_tcp4(suite) ->
+    [];
+ttest_ssockf_cgeno_large_tcp4(doc) ->
+    [];
+ttest_ssockf_cgeno_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_cgeno_large_tcp4,
+              Runtime,
+              inet,
+              sock, false,
+              gen, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_ssockf_cgeno_large_tcp6(suite) ->
+    [];
+ttest_ssockf_cgeno_large_tcp6(doc) ->
+    [];
+ttest_ssockf_cgeno_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_cgeno_large_tcp6,
+              Runtime,
+              inet6,
+              sock, false,
+              gen, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_ssockf_cgent_small_tcp4(suite) ->
+    [];
+ttest_ssockf_cgent_small_tcp4(doc) ->
+    [];
+ttest_ssockf_cgent_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_cgent_small_tcp4,
+              Runtime,
+              inet,
+              sock, false,
+              gen, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport =  socket(tcp), Active = false
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_ssockf_cgent_small_tcp6(suite) ->
+    [];
+ttest_ssockf_cgent_small_tcp6(doc) ->
+    [];
+ttest_ssockf_cgent_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_cgeno_small_tcp6,
+              Runtime,
+              inet6,
+              sock, false,
+              gen, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_ssockf_cgent_medium_tcp4(suite) ->
+    [];
+ttest_ssockf_cgent_medium_tcp4(doc) ->
+    [];
+ttest_ssockf_cgent_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_cgent_medium_tcp4,
+              Runtime,
+              inet,
+              sock, false,
+              gen, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_ssockf_cgent_medium_tcp6(suite) ->
+    [];
+ttest_ssockf_cgent_medium_tcp6(doc) ->
+    [];
+ttest_ssockf_cgent_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_cgent_medium_tcp6,
+              Runtime,
+              inet6,
+              sock, false,
+              gen, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_ssockf_cgent_large_tcp4(suite) ->
+    [];
+ttest_ssockf_cgent_large_tcp4(doc) ->
+    [];
+ttest_ssockf_cgent_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_cgent_large_tcp4,
+              Runtime,
+              inet,
+              sock, false,
+              gen, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_ssockf_cgent_large_tcp6(suite) ->
+    [];
+ttest_ssockf_cgent_large_tcp6(doc) ->
+    [];
+ttest_ssockf_cgent_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_cgent_large_tcp6,
+              Runtime,
+              inet6,
+              sock, false,
+              gen, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_ssockf_csockf_small_tcp4(suite) ->
+    [];
+ttest_ssockf_csockf_small_tcp4(doc) ->
+    [];
+ttest_ssockf_csockf_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csockf_small_tcp4,
+              Runtime,
+              inet,
+              sock, false,
+              sock, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_ssockf_csockf_small_tcp6(suite) ->
+    [];
+ttest_ssockf_csockf_small_tcp6(doc) ->
+    [];
+ttest_ssockf_csockf_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csockf_small_tcp6,
+              Runtime,
+              inet6,
+              sock, false,
+              sock, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: small (=1)
+%% Domain:       local
+%% 
+
+ttest_ssockf_csockf_small_tcpL(suite) ->
+    [];
+ttest_ssockf_csockf_small_tcpL(doc) ->
+    [];
+ttest_ssockf_csockf_small_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csockf_small_tcpL,
+              Runtime,
+              local,
+              sock, false,
+              sock, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_ssockf_csockf_medium_tcp4(suite) ->
+    [];
+ttest_ssockf_csockf_medium_tcp4(doc) ->
+    [];
+ttest_ssockf_csockf_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csockf_medium_tcp4,
+              Runtime,
+              inet,
+              sock, false,
+              sock, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_ssockf_csockf_medium_tcp6(suite) ->
+    [];
+ttest_ssockf_csockf_medium_tcp6(doc) ->
+    [];
+ttest_ssockf_csockf_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csockf_medium_tcp6,
+              Runtime,
+              inet6,
+              sock, false,
+              sock, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: medium (=2)
+%% Domain:       local
+%% 
+
+ttest_ssockf_csockf_medium_tcpL(suite) ->
+    [];
+ttest_ssockf_csockf_medium_tcpL(doc) ->
+    [];
+ttest_ssockf_csockf_medium_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csockf_medium_tcpL,
+              Runtime,
+              local,
+              sock, false,
+              sock, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_ssockf_csockf_large_tcp4(suite) ->
+    [];
+ttest_ssockf_csockf_large_tcp4(doc) ->
+    [];
+ttest_ssockf_csockf_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csockf_large_tcp4,
+              Runtime,
+              inet,
+              sock, false,
+              sock, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_ssockf_csockf_large_tcp6(suite) ->
+    [];
+ttest_ssockf_csockf_large_tcp6(doc) ->
+    [];
+ttest_ssockf_csockf_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csockf_large_tcp6,
+              Runtime,
+              inet6,
+              sock, false,
+              sock, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: large (=3)
+%% Domain:       local
+%% 
+
+ttest_ssockf_csockf_large_tcpL(suite) ->
+    [];
+ttest_ssockf_csockf_large_tcpL(doc) ->
+    [];
+ttest_ssockf_csockf_large_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csockf_large_tcpL,
+              Runtime,
+              local,
+              sock, false,
+              sock, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_ssockf_csocko_small_tcp4(suite) ->
+    [];
+ttest_ssockf_csocko_small_tcp4(doc) ->
+    [];
+ttest_ssockf_csocko_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csocko_small_tcp4,
+              Runtime,
+              inet,
+              sock, false,
+              sock, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_ssockf_csocko_small_tcp6(suite) ->
+    [];
+ttest_ssockf_csocko_small_tcp6(doc) ->
+    [];
+ttest_ssockf_csocko_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csocko_small_tcp6,
+              Runtime,
+              inet6,
+              sock, false,
+              sock, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: small (=1)
+%% Domain:       local
+%% 
+
+ttest_ssockf_csocko_small_tcpL(suite) ->
+    [];
+ttest_ssockf_csocko_small_tcpL(doc) ->
+    [];
+ttest_ssockf_csocko_small_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csocko_small_tcpL,
+              Runtime,
+              local,
+              sock, false,
+              sock, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_ssockf_csocko_medium_tcp4(suite) ->
+    [];
+ttest_ssockf_csocko_medium_tcp4(doc) ->
+    [];
+ttest_ssockf_csocko_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csocko_medium_tcp4,
+              Runtime,
+              inet,
+              sock, false,
+              sock, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_ssockf_csocko_medium_tcp6(suite) ->
+    [];
+ttest_ssockf_csocko_medium_tcp6(doc) ->
+    [];
+ttest_ssockf_csocko_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csocko_medium_tcp6,
+              Runtime,
+              inet6,
+              sock, false,
+              sock, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: medium (=2)
+%% Domain:       local
+%% 
+
+ttest_ssockf_csocko_medium_tcpL(suite) ->
+    [];
+ttest_ssockf_csocko_medium_tcpL(doc) ->
+    [];
+ttest_ssockf_csocko_medium_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csocko_medium_tcpL,
+              Runtime,
+              local,
+              sock, false,
+              sock, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_ssockf_csocko_large_tcp4(suite) ->
+    [];
+ttest_ssockf_csocko_large_tcp4(doc) ->
+    [];
+ttest_ssockf_csocko_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csocko_large_tcp4,
+              Runtime,
+              inet,
+              sock, false,
+              sock, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_ssockf_csocko_large_tcp6(suite) ->
+    [];
+ttest_ssockf_csocko_large_tcp6(doc) ->
+    [];
+ttest_ssockf_csocko_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csocko_large_tcp6,
+              Runtime,
+              inet6,
+              sock, false,
+              sock, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: large (=3)
+%% Domain:       local
+%% 
+
+ttest_ssockf_csocko_large_tcpL(suite) ->
+    [];
+ttest_ssockf_csocko_large_tcpL(doc) ->
+    [];
+ttest_ssockf_csocko_large_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csocko_large_tcpL,
+              Runtime,
+              local,
+              sock, false,
+              sock, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_ssockf_csockt_small_tcp4(suite) ->
+    [];
+ttest_ssockf_csockt_small_tcp4(doc) ->
+    [];
+ttest_ssockf_csockt_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csockt_small_tcp4,
+              Runtime,
+              inet,
+              sock, false,
+              sock, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport =  socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_ssockf_csockt_small_tcp6(suite) ->
+    [];
+ttest_ssockf_csockt_small_tcp6(doc) ->
+    [];
+ttest_ssockf_csockt_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csocko_small_tcp6,
+              Runtime,
+              inet6,
+              sock, false,
+              sock, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport =  socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: small (=1)
+%% Domain:       local
+%% 
+
+ttest_ssockf_csockt_small_tcpL(suite) ->
+    [];
+ttest_ssockf_csockt_small_tcpL(doc) ->
+    [];
+ttest_ssockf_csockt_small_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csocko_small_tcpL,
+              Runtime,
+              local,
+              sock, false,
+              sock, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_ssockf_csockt_medium_tcp4(suite) ->
+    [];
+ttest_ssockf_csockt_medium_tcp4(doc) ->
+    [];
+ttest_ssockf_csockt_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csockt_medium_tcp4,
+              Runtime,
+              inet,
+              sock, false,
+              sock, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_ssockf_csockt_medium_tcp6(suite) ->
+    [];
+ttest_ssockf_csockt_medium_tcp6(doc) ->
+    [];
+ttest_ssockf_csockt_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csockt_medium_tcp6,
+              Runtime,
+              inet6,
+              sock, false,
+              sock, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: medium (=2)
+%% Domain:       local
+%% 
+
+ttest_ssockf_csockt_medium_tcpL(suite) ->
+    [];
+ttest_ssockf_csockt_medium_tcpL(doc) ->
+    [];
+ttest_ssockf_csockt_medium_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csockt_medium_tcpL,
+              Runtime,
+              local,
+              sock, false,
+              sock, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_ssockf_csockt_large_tcp4(suite) ->
+    [];
+ttest_ssockf_csockt_large_tcp4(doc) ->
+    [];
+ttest_ssockf_csockt_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csockt_large_tcp4,
+              Runtime,
+              inet,
+              sock, false,
+              sock, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_ssockf_csockt_large_tcp6(suite) ->
+    [];
+ttest_ssockf_csockt_large_tcp6(doc) ->
+    [];
+ttest_ssockf_csockt_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csockt_large_tcp6,
+              Runtime,
+              inet6,
+              sock, false,
+              sock, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: large (=3)
+%% Domain:       local
+%% 
+
+ttest_ssockf_csockt_large_tcpL(suite) ->
+    [];
+ttest_ssockf_csockt_large_tcpL(doc) ->
+    [];
+ttest_ssockf_csockt_large_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockf_csockt_large_tcpL,
+              Runtime,
+              local,
+              sock, false,
+              sock, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_ssocko_cgenf_small_tcp4(suite) ->
+    [];
+ttest_ssocko_cgenf_small_tcp4(doc) ->
+    [];
+ttest_ssocko_cgenf_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_cgenf_small_tcp4,
+              Runtime,
+              inet,
+              sock, once,
+              gen, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_ssocko_cgenf_small_tcp6(suite) ->
+    [];
+ttest_ssocko_cgenf_small_tcp6(doc) ->
+    [];
+ttest_ssocko_cgenf_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_cgenf_small_tcp6,
+              Runtime,
+              inet6,
+              sock, once,
+              gen, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_ssocko_cgenf_medium_tcp4(suite) ->
+    [];
+ttest_ssocko_cgenf_medium_tcp4(doc) ->
+    [];
+ttest_ssocko_cgenf_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_cgenf_medium_tcp4,
+              Runtime,
+              inet,
+              sock, once,
+              gen, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_ssocko_cgenf_medium_tcp6(suite) ->
+    [];
+ttest_ssocko_cgenf_medium_tcp6(doc) ->
+    [];
+ttest_ssocko_cgenf_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_cgenf_medium_tcp6,
+              Runtime,
+              inet6,
+              sock, once,
+              gen, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_ssocko_cgenf_large_tcp4(suite) ->
+    [];
+ttest_ssocko_cgenf_large_tcp4(doc) ->
+    [];
+ttest_ssocko_cgenf_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_cgenf_large_tcp4,
+              Runtime,
+              inet,
+              sock, once,
+              gen, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_ssocko_cgenf_large_tcp6(suite) ->
+    [];
+ttest_ssocko_cgenf_large_tcp6(doc) ->
+    [];
+ttest_ssocko_cgenf_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_cgenf_large_tcp6,
+              Runtime,
+              inet6,
+              sock, once,
+              gen, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_ssocko_cgeno_small_tcp4(suite) ->
+    [];
+ttest_ssocko_cgeno_small_tcp4(doc) ->
+    [];
+ttest_ssocko_cgeno_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_cgeno_small_tcp4,
+              Runtime,
+              inet,
+              sock, once,
+              gen, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_ssocko_cgeno_small_tcp6(suite) ->
+    [];
+ttest_ssocko_cgeno_small_tcp6(doc) ->
+    [];
+ttest_ssocko_cgeno_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_cgeno_small_tcp6,
+              Runtime,
+              inet6,
+              sock, once,
+              gen, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_ssocko_cgeno_medium_tcp4(suite) ->
+    [];
+ttest_ssocko_cgeno_medium_tcp4(doc) ->
+    [];
+ttest_ssocko_cgeno_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_cgeno_medium_tcp4,
+              Runtime,
+              inet,
+              sock, once,
+              gen, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_ssocko_cgeno_medium_tcp6(suite) ->
+    [];
+ttest_ssocko_cgeno_medium_tcp6(doc) ->
+    [];
+ttest_ssocko_cgeno_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_cgeno_medium_tcp6,
+              Runtime,
+              inet6,
+              sock, once,
+              gen, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_ssocko_cgeno_large_tcp4(suite) ->
+    [];
+ttest_ssocko_cgeno_large_tcp4(doc) ->
+    [];
+ttest_ssocko_cgeno_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_cgeno_large_tcp4,
+              Runtime,
+              inet,
+              sock, once,
+              gen, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_ssocko_cgeno_large_tcp6(suite) ->
+    [];
+ttest_ssocko_cgeno_large_tcp6(doc) ->
+    [];
+ttest_ssocko_cgeno_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_cgeno_large_tcp6,
+              Runtime,
+              inet6,
+              sock, once,
+              gen, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_ssocko_cgent_small_tcp4(suite) ->
+    [];
+ttest_ssocko_cgent_small_tcp4(doc) ->
+    [];
+ttest_ssocko_cgent_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_cgent_small_tcp4,
+              Runtime,
+              inet,
+              sock, once,
+              gen, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport =  socket(tcp), Active = false
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_ssocko_cgent_small_tcp6(suite) ->
+    [];
+ttest_ssocko_cgent_small_tcp6(doc) ->
+    [];
+ttest_ssocko_cgent_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_cgent_small_tcp6,
+              Runtime,
+              inet6,
+              sock, once,
+              gen, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_ssocko_cgent_medium_tcp4(suite) ->
+    [];
+ttest_ssocko_cgent_medium_tcp4(doc) ->
+    [];
+ttest_ssocko_cgent_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_cgent_medium_tcp4,
+              Runtime,
+              inet,
+              sock, once,
+              gen, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_ssocko_cgent_medium_tcp6(suite) ->
+    [];
+ttest_ssocko_cgent_medium_tcp6(doc) ->
+    [];
+ttest_ssocko_cgent_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_cgent_medium_tcp6,
+              Runtime,
+              inet6,
+              sock, once,
+              gen, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_ssocko_cgent_large_tcp4(suite) ->
+    [];
+ttest_ssocko_cgent_large_tcp4(doc) ->
+    [];
+ttest_ssocko_cgent_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_cgent_large_tcp4,
+              Runtime,
+              inet,
+              sock, once,
+              gen, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = false
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_ssocko_cgent_large_tcp6(suite) ->
+    [];
+ttest_ssocko_cgent_large_tcp6(doc) ->
+    [];
+ttest_ssocko_cgent_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_cgent_large_tcp6,
+              Runtime,
+              inet6,
+              sock, once,
+              gen, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_ssocko_csockf_small_tcp4(suite) ->
+    [];
+ttest_ssocko_csockf_small_tcp4(doc) ->
+    [];
+ttest_ssocko_csockf_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csockf_small_tcp4,
+              Runtime,
+              inet,
+              sock, once,
+              sock, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_ssocko_csockf_small_tcp6(suite) ->
+    [];
+ttest_ssocko_csockf_small_tcp6(doc) ->
+    [];
+ttest_ssocko_csockf_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csockf_small_tcp6,
+              Runtime,
+              inet6,
+              sock, once,
+              sock, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: small (=1)
+%% Domain:       local
+%% 
+
+ttest_ssocko_csockf_small_tcpL(suite) ->
+    [];
+ttest_ssocko_csockf_small_tcpL(doc) ->
+    [];
+ttest_ssocko_csockf_small_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csockf_small_tcpL,
+              Runtime,
+              local,
+              sock, once,
+              sock, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_ssocko_csockf_medium_tcp4(suite) ->
+    [];
+ttest_ssocko_csockf_medium_tcp4(doc) ->
+    [];
+ttest_ssocko_csockf_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csockf_medium_tcp4,
+              Runtime,
+              inet,
+              sock, once,
+              sock, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_ssocko_csockf_medium_tcp6(suite) ->
+    [];
+ttest_ssocko_csockf_medium_tcp6(doc) ->
+    [];
+ttest_ssocko_csockf_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csockf_medium_tcp6,
+              Runtime,
+              inet6,
+              sock, once,
+              sock, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: medium (=2)
+%% Domain:       local
+%% 
+
+ttest_ssocko_csockf_medium_tcpL(suite) ->
+    [];
+ttest_ssocko_csockf_medium_tcpL(doc) ->
+    [];
+ttest_ssocko_csockf_medium_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csockf_medium_tcpL,
+              Runtime,
+              local,
+              sock, once,
+              sock, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_ssocko_csockf_large_tcp4(suite) ->
+    [];
+ttest_ssocko_csockf_large_tcp4(doc) ->
+    [];
+ttest_ssocko_csockf_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csockf_large_tcp4,
+              Runtime,
+              inet,
+              sock, once,
+              sock, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_ssocko_csockf_large_tcp6(suite) ->
+    [];
+ttest_ssocko_csockf_large_tcp6(doc) ->
+    [];
+ttest_ssocko_csockf_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csockf_large_tcp6,
+              Runtime,
+              inet6,
+              sock, once,
+              sock, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: large (=3)
+%% Domain:       local
+%% 
+
+ttest_ssocko_csockf_large_tcpL(suite) ->
+    [];
+ttest_ssocko_csockf_large_tcpL(doc) ->
+    [];
+ttest_ssocko_csockf_large_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csockf_large_tcpL,
+              Runtime,
+              local,
+              sock, once,
+              sock, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_ssocko_csocko_small_tcp4(suite) ->
+    [];
+ttest_ssocko_csocko_small_tcp4(doc) ->
+    [];
+ttest_ssocko_csocko_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csocko_small_tcp4,
+              Runtime,
+              inet,
+              sock, once,
+              sock, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_ssocko_csocko_small_tcp6(suite) ->
+    [];
+ttest_ssocko_csocko_small_tcp6(doc) ->
+    [];
+ttest_ssocko_csocko_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csocko_small_tcp6,
+              Runtime,
+              inet6,
+              sock, once,
+              sock, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: small (=1)
+%% Domain:       local
+%% 
+
+ttest_ssocko_csocko_small_tcpL(suite) ->
+    [];
+ttest_ssocko_csocko_small_tcpL(doc) ->
+    [];
+ttest_ssocko_csocko_small_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csocko_small_tcpL,
+              Runtime,
+              local,
+              sock, once,
+              sock, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_ssocko_csocko_medium_tcp4(suite) ->
+    [];
+ttest_ssocko_csocko_medium_tcp4(doc) ->
+    [];
+ttest_ssocko_csocko_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csocko_medium_tcp4,
+              Runtime,
+              inet,
+              sock, once,
+              sock, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_ssocko_csocko_medium_tcp6(suite) ->
+    [];
+ttest_ssocko_csocko_medium_tcp6(doc) ->
+    [];
+ttest_ssocko_csocko_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csocko_medium_tcp6,
+              Runtime,
+              inet6,
+              sock, once,
+              sock, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: medium (=2)
+%% Domain:       local
+%% 
+
+ttest_ssocko_csocko_medium_tcpL(suite) ->
+    [];
+ttest_ssocko_csocko_medium_tcpL(doc) ->
+    [];
+ttest_ssocko_csocko_medium_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csocko_medium_tcpL,
+              Runtime,
+              local,
+              sock, once,
+              sock, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_ssocko_csocko_large_tcp4(suite) ->
+    [];
+ttest_ssocko_csocko_large_tcp4(doc) ->
+    [];
+ttest_ssocko_csocko_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csocko_large_tcp4,
+              Runtime,
+              inet,
+              sock, once,
+              sock, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_ssocko_csocko_large_tcp6(suite) ->
+    [];
+ttest_ssocko_csocko_large_tcp6(doc) ->
+    [];
+ttest_ssocko_csocko_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csocko_large_tcp6,
+              Runtime,
+              inet6,
+              sock, once,
+              sock, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: large (=3)
+%% Domain:       local
+%% 
+
+ttest_ssocko_csocko_large_tcpL(suite) ->
+    [];
+ttest_ssocko_csocko_large_tcpL(doc) ->
+    [];
+ttest_ssocko_csocko_large_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csocko_large_tcpL,
+              Runtime,
+              local,
+              sock, once,
+              sock, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_ssocko_csockt_small_tcp4(suite) ->
+    [];
+ttest_ssocko_csockt_small_tcp4(doc) ->
+    [];
+ttest_ssocko_csockt_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csockt_small_tcp4,
+              Runtime,
+              inet,
+              sock, once,
+              sock, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport =  socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_ssocko_csockt_small_tcp6(suite) ->
+    [];
+ttest_ssocko_csockt_small_tcp6(doc) ->
+    [];
+ttest_ssocko_csockt_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csocko_small_tcp6,
+              Runtime,
+              inet6,
+              sock, once,
+              sock, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport =  socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: small (=1)
+%% Domain:       local
+%% 
+
+ttest_ssocko_csockt_small_tcpL(suite) ->
+    [];
+ttest_ssocko_csockt_small_tcpL(doc) ->
+    [];
+ttest_ssocko_csockt_small_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csocko_small_tcpL,
+              Runtime,
+              local,
+              sock, once,
+              sock, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_ssocko_csockt_medium_tcp4(suite) ->
+    [];
+ttest_ssocko_csockt_medium_tcp4(doc) ->
+    [];
+ttest_ssocko_csockt_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csockt_medium_tcp4,
+              Runtime,
+              inet,
+              sock, once,
+              sock, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_ssocko_csockt_medium_tcp6(suite) ->
+    [];
+ttest_ssocko_csockt_medium_tcp6(doc) ->
+    [];
+ttest_ssocko_csockt_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csockt_medium_tcp6,
+              Runtime,
+              inet6,
+              sock, once,
+              sock, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: medium (=2)
+%% Domain:       local
+%% 
+
+ttest_ssocko_csockt_medium_tcpL(suite) ->
+    [];
+ttest_ssocko_csockt_medium_tcpL(doc) ->
+    [];
+ttest_ssocko_csockt_medium_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csockt_medium_tcpL,
+              Runtime,
+              local,
+              sock, once,
+              sock, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_ssocko_csockt_large_tcp4(suite) ->
+    [];
+ttest_ssocko_csockt_large_tcp4(doc) ->
+    [];
+ttest_ssocko_csockt_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csockt_large_tcp4,
+              Runtime,
+              inet,
+              sock, once,
+              sock, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_ssocko_csockt_large_tcp6(suite) ->
+    [];
+ttest_ssocko_csockt_large_tcp6(doc) ->
+    [];
+ttest_ssocko_csockt_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csockt_large_tcp6,
+              Runtime,
+              inet6,
+              sock, once,
+              sock, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = once
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: large (=3)
+%% Domain:       local
+%% 
+
+ttest_ssocko_csockt_large_tcpL(suite) ->
+    [];
+ttest_ssocko_csockt_large_tcpL(doc) ->
+    [];
+ttest_ssocko_csockt_large_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssocko_csockt_large_tcpL,
+              Runtime,
+              local,
+              sock, once,
+              sock, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_ssockt_cgenf_small_tcp4(suite) ->
+    [];
+ttest_ssockt_cgenf_small_tcp4(doc) ->
+    [];
+ttest_ssockt_cgenf_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_cgenf_small_tcp4,
+              Runtime,
+              inet,
+              sock, true,
+              gen, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_ssockt_cgenf_small_tcp6(suite) ->
+    [];
+ttest_ssockt_cgenf_small_tcp6(doc) ->
+    [];
+ttest_ssockt_cgenf_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_cgenf_small_tcp6,
+              Runtime,
+              inet6,
+              sock, true,
+              gen, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_ssockt_cgenf_medium_tcp4(suite) ->
+    [];
+ttest_ssockt_cgenf_medium_tcp4(doc) ->
+    [];
+ttest_ssockt_cgenf_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_cgenf_medium_tcp4,
+              Runtime,
+              inet,
+              sock, true,
+              gen, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_ssockt_cgenf_medium_tcp6(suite) ->
+    [];
+ttest_ssockt_cgenf_medium_tcp6(doc) ->
+    [];
+ttest_ssockt_cgenf_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_cgenf_medium_tcp6,
+              Runtime,
+              inet6,
+              sock, true,
+              gen, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_ssockt_cgenf_large_tcp4(suite) ->
+    [];
+ttest_ssockt_cgenf_large_tcp4(doc) ->
+    [];
+ttest_ssockt_cgenf_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_cgenf_large_tcp4,
+              Runtime,
+              inet,
+              sock, true,
+              gen, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = gen_tcp, Active = false
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_ssockt_cgenf_large_tcp6(suite) ->
+    [];
+ttest_ssockt_cgenf_large_tcp6(doc) ->
+    [];
+ttest_ssockt_cgenf_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_cgenf_large_tcp6,
+              Runtime,
+              inet6,
+              sock, true,
+              gen, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_ssockt_cgeno_small_tcp4(suite) ->
+    [];
+ttest_ssockt_cgeno_small_tcp4(doc) ->
+    [];
+ttest_ssockt_cgeno_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_cgeno_small_tcp4,
+              Runtime,
+              inet,
+              sock, true,
+              gen, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_ssockt_cgeno_small_tcp6(suite) ->
+    [];
+ttest_ssockt_cgeno_small_tcp6(doc) ->
+    [];
+ttest_ssockt_cgeno_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_cgeno_small_tcp6,
+              Runtime,
+              inet6,
+              sock, true,
+              gen, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_ssockt_cgeno_medium_tcp4(suite) ->
+    [];
+ttest_ssockt_cgeno_medium_tcp4(doc) ->
+    [];
+ttest_ssockt_cgeno_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_cgeno_medium_tcp4,
+              Runtime,
+              inet,
+              sock, true,
+              gen, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_ssockt_cgeno_medium_tcp6(suite) ->
+    [];
+ttest_ssockt_cgeno_medium_tcp6(doc) ->
+    [];
+ttest_ssockt_cgeno_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_cgeno_medium_tcp6,
+              Runtime,
+              inet6,
+              sock, true,
+              gen, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_ssockt_cgeno_large_tcp4(suite) ->
+    [];
+ttest_ssockt_cgeno_large_tcp4(doc) ->
+    [];
+ttest_ssockt_cgeno_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_cgeno_large_tcp4,
+              Runtime,
+              inet,
+              sock, true,
+              gen, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = gen_tcp, Active = once
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_ssockt_cgeno_large_tcp6(suite) ->
+    [];
+ttest_ssockt_cgeno_large_tcp6(doc) ->
+    [];
+ttest_ssockt_cgeno_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_cgeno_large_tcp6,
+              Runtime,
+              inet6,
+              sock, true,
+              gen, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_ssockt_cgent_small_tcp4(suite) ->
+    [];
+ttest_ssockt_cgent_small_tcp4(doc) ->
+    [];
+ttest_ssockt_cgent_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_cgent_small_tcp4,
+              Runtime,
+              inet,
+              sock, true,
+              gen, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport =  socket(tcp), Active = true
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_ssockt_cgent_small_tcp6(suite) ->
+    [];
+ttest_ssockt_cgent_small_tcp6(doc) ->
+    [];
+ttest_ssockt_cgent_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_cgent_small_tcp6,
+              Runtime,
+              inet6,
+              sock, true,
+              gen, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_ssockt_cgent_medium_tcp4(suite) ->
+    [];
+ttest_ssockt_cgent_medium_tcp4(doc) ->
+    [];
+ttest_ssockt_cgent_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_cgent_medium_tcp4,
+              Runtime,
+              inet,
+              sock, true,
+              gen, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_ssockt_cgent_medium_tcp6(suite) ->
+    [];
+ttest_ssockt_cgent_medium_tcp6(doc) ->
+    [];
+ttest_ssockt_cgent_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_cgent_medium_tcp6,
+              Runtime,
+              inet6,
+              sock, true,
+              gen, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_ssockt_cgent_large_tcp4(suite) ->
+    [];
+ttest_ssockt_cgent_large_tcp4(doc) ->
+    [];
+ttest_ssockt_cgent_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_cgent_large_tcp4,
+              Runtime,
+              inet,
+              sock, true,
+              gen, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = gen_tcp, Active = true
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_ssockt_cgent_large_tcp6(suite) ->
+    [];
+ttest_ssockt_cgent_large_tcp6(doc) ->
+    [];
+ttest_ssockt_cgent_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_cgent_large_tcp6,
+              Runtime,
+              inet6,
+              sock, true,
+              gen, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_ssockt_csockf_small_tcp4(suite) ->
+    [];
+ttest_ssockt_csockf_small_tcp4(doc) ->
+    [];
+ttest_ssockt_csockf_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csockf_small_tcp4,
+              Runtime,
+              inet,
+              sock, true,
+              sock, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_ssockt_csockf_small_tcp6(suite) ->
+    [];
+ttest_ssockt_csockf_small_tcp6(doc) ->
+    [];
+ttest_ssockt_csockf_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csockf_small_tcp6,
+              Runtime,
+              inet6,
+              sock, true,
+              sock, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: small (=1)
+%% Domain:       local
+%% 
+
+ttest_ssockt_csockf_small_tcpL(suite) ->
+    [];
+ttest_ssockt_csockf_small_tcpL(doc) ->
+    [];
+ttest_ssockt_csockf_small_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csockf_small_tcpL,
+              Runtime,
+              local,
+              sock, true,
+              sock, false,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_ssockt_csockf_medium_tcp4(suite) ->
+    [];
+ttest_ssockt_csockf_medium_tcp4(doc) ->
+    [];
+ttest_ssockt_csockf_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csockf_medium_tcp4,
+              Runtime,
+              inet,
+              sock, true,
+              sock, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_ssockt_csockf_medium_tcp6(suite) ->
+    [];
+ttest_ssockt_csockf_medium_tcp6(doc) ->
+    [];
+ttest_ssockt_csockf_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csockf_medium_tcp6,
+              Runtime,
+              inet6,
+              sock, true,
+              sock, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: medium (=2)
+%% Domain:       local
+%% 
+
+ttest_ssockt_csockf_medium_tcpL(suite) ->
+    [];
+ttest_ssockt_csockf_medium_tcpL(doc) ->
+    [];
+ttest_ssockt_csockf_medium_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csockf_medium_tcpL,
+              Runtime,
+              local,
+              sock, true,
+              sock, false,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_ssockt_csockf_large_tcp4(suite) ->
+    [];
+ttest_ssockt_csockf_large_tcp4(doc) ->
+    [];
+ttest_ssockt_csockf_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csockf_large_tcp4,
+              Runtime,
+              inet,
+              sock, true,
+              sock, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_ssockt_csockf_large_tcp6(suite) ->
+    [];
+ttest_ssockt_csockf_large_tcp6(doc) ->
+    [];
+ttest_ssockt_csockf_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csockf_large_tcp6,
+              Runtime,
+              inet6,
+              sock, true,
+              sock, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = false
+%% Message Size: large (=3)
+%% Domain:       local
+%% 
+
+ttest_ssockt_csockf_large_tcpL(suite) ->
+    [];
+ttest_ssockt_csockf_large_tcpL(doc) ->
+    [];
+ttest_ssockt_csockf_large_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csockf_large_tcpL,
+              Runtime,
+              local,
+              sock, true,
+              sock, false,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_ssockt_csocko_small_tcp4(suite) ->
+    [];
+ttest_ssockt_csocko_small_tcp4(doc) ->
+    [];
+ttest_ssockt_csocko_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csocko_small_tcp4,
+              Runtime,
+              inet,
+              sock, true,
+              sock, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_ssockt_csocko_small_tcp6(suite) ->
+    [];
+ttest_ssockt_csocko_small_tcp6(doc) ->
+    [];
+ttest_ssockt_csocko_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csocko_small_tcp6,
+              Runtime,
+              inet6,
+              sock, true,
+              sock, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: small (=1)
+%% Domain:       local
+%% 
+
+ttest_ssockt_csocko_small_tcpL(suite) ->
+    [];
+ttest_ssockt_csocko_small_tcpL(doc) ->
+    [];
+ttest_ssockt_csocko_small_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csocko_small_tcpL,
+              Runtime,
+              local,
+              sock, true,
+              sock, once,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_ssockt_csocko_medium_tcp4(suite) ->
+    [];
+ttest_ssockt_csocko_medium_tcp4(doc) ->
+    [];
+ttest_ssockt_csocko_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csocko_medium_tcp4,
+              Runtime,
+              inet,
+              sock, true,
+              sock, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_ssockt_csocko_medium_tcp6(suite) ->
+    [];
+ttest_ssockt_csocko_medium_tcp6(doc) ->
+    [];
+ttest_ssockt_csocko_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csocko_medium_tcp6,
+              Runtime,
+              inet6,
+              sock, true,
+              sock, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: medium (=2)
+%% Domain:       local
+%% 
+
+ttest_ssockt_csocko_medium_tcpL(suite) ->
+    [];
+ttest_ssockt_csocko_medium_tcpL(doc) ->
+    [];
+ttest_ssockt_csocko_medium_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csocko_medium_tcpL,
+              Runtime,
+              local,
+              sock, true,
+              sock, once,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_ssockt_csocko_large_tcp4(suite) ->
+    [];
+ttest_ssockt_csocko_large_tcp4(doc) ->
+    [];
+ttest_ssockt_csocko_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csocko_large_tcp4,
+              Runtime,
+              inet,
+              sock, true,
+              sock, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_ssockt_csocko_large_tcp6(suite) ->
+    [];
+ttest_ssockt_csocko_large_tcp6(doc) ->
+    [];
+ttest_ssockt_csocko_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csocko_large_tcp6,
+              Runtime,
+              inet6,
+              sock, true,
+              sock, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = once
+%% Message Size: large (=3)
+%% Domain:       local
+%% 
+
+ttest_ssockt_csocko_large_tcpL(suite) ->
+    [];
+ttest_ssockt_csocko_large_tcpL(doc) ->
+    [];
+ttest_ssockt_csocko_large_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csocko_large_tcpL,
+              Runtime,
+              local,
+              sock, true,
+              sock, once,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: small (=1)
+%% Domain:       inet
+%%
+
+ttest_ssockt_csockt_small_tcp4(suite) ->
+    [];
+ttest_ssockt_csockt_small_tcp4(doc) ->
+    [];
+ttest_ssockt_csockt_small_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csockt_small_tcp4,
+              Runtime,
+              inet,
+              sock, true,
+              sock, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport =  socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: small (=1)
+%% Domain:       inet6
+%% 
+
+ttest_ssockt_csockt_small_tcp6(suite) ->
+    [];
+ttest_ssockt_csockt_small_tcp6(doc) ->
+    [];
+ttest_ssockt_csockt_small_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csocko_small_tcp6,
+              Runtime,
+              inet6,
+              sock, true,
+              sock, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport =  socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: small (=1)
+%% Domain:       local
+%% 
+
+ttest_ssockt_csockt_small_tcpL(suite) ->
+    [];
+ttest_ssockt_csockt_small_tcpL(doc) ->
+    [];
+ttest_ssockt_csockt_small_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csocko_small_tcpL,
+              Runtime,
+              local,
+              sock, true,
+              sock, true,
+              1, 200).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet
+%%
+
+ttest_ssockt_csockt_medium_tcp4(suite) ->
+    [];
+ttest_ssockt_csockt_medium_tcp4(doc) ->
+    [];
+ttest_ssockt_csockt_medium_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csockt_medium_tcp4,
+              Runtime,
+              inet,
+              sock, true,
+              sock, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: medium (=2)
+%% Domain:       inet6
+%% 
+
+ttest_ssockt_csockt_medium_tcp6(suite) ->
+    [];
+ttest_ssockt_csockt_medium_tcp6(doc) ->
+    [];
+ttest_ssockt_csockt_medium_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csockt_medium_tcp6,
+              Runtime,
+              inet6,
+              sock, true,
+              sock, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: medium (=2)
+%% Domain:       local
+%% 
+
+ttest_ssockt_csockt_medium_tcpL(suite) ->
+    [];
+ttest_ssockt_csockt_medium_tcpL(doc) ->
+    [];
+ttest_ssockt_csockt_medium_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csockt_medium_tcpL,
+              Runtime,
+              local,
+              sock, true,
+              sock, true,
+              2, 20).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: large (=3)
+%% Domain:       inet
+%%
+
+ttest_ssockt_csockt_large_tcp4(suite) ->
+    [];
+ttest_ssockt_csockt_large_tcp4(doc) ->
+    [];
+ttest_ssockt_csockt_large_tcp4(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csockt_large_tcp4,
+              Runtime,
+              inet,
+              sock, true,
+              sock, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: large (=3)
+%% Domain:       inet6
+%% 
+
+ttest_ssockt_csockt_large_tcp6(suite) ->
+    [];
+ttest_ssockt_csockt_large_tcp6(doc) ->
+    [];
+ttest_ssockt_csockt_large_tcp6(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csockt_large_tcp6,
+              Runtime,
+              inet6,
+              sock, true,
+              sock, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% This test case uses the time test (ttest) utility to implement a 
+%% ping-pong like test case.
+%% Server:       Transport = socket(tcp), Active = true
+%% Client:       Transport = socket(tcp), Active = true
+%% Message Size: large (=3)
+%% Domain:       local
+%% 
+
+ttest_ssockt_csockt_large_tcpL(suite) ->
+    [];
+ttest_ssockt_csockt_large_tcpL(doc) ->
+    [];
+ttest_ssockt_csockt_large_tcpL(Config) when is_list(Config) ->
+    Runtime = which_ttest_runtime(Config),
+    ttest_tcp(ttest_ssockt_csockt_large_tcpL,
+              Runtime,
+              local,
+              sock, true,
+              sock, true,
+              3, 2).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+which_ttest_runtime(Config) when is_list(Config) ->
+    case lists:keysearch(esock_test_ttest_runtime, 1, Config) of
+        {value, {esock_test_ttest_runtime, Runtime}} ->
+            Runtime;
+        false ->
+            which_ttest_runtime_env()
+    end.
+
+which_ttest_runtime_env() ->
+    which_ttest_runtime_env(os:getenv("ESOCK_TEST_TTEST_RUNTIME")).
+
+which_ttest_runtime_env(TStr) when is_list(TStr) ->
+    which_ttest_runtime_env2(lists:reverse(TStr));
+which_ttest_runtime_env(false) ->
+    ?TTEST_RUNTIME.
+
+
+%% The format is: <int>[unit]
+%% where the optional unit can be:
+%% ms: milliseconds
+%% s:  seconds (default)
+%% m:  minutes
+which_ttest_runtime_env2([$s, $m | MS]) when (length(MS) > 0) ->
+    convert_time(MS, fun(X) -> X end);
+which_ttest_runtime_env2([$m | M]) when (length(M) > 0) ->
+    convert_time(M, fun(X) -> ?MINS(X) end);
+which_ttest_runtime_env2([$s | S]) when (length(S) > 0) ->
+    convert_time(S, fun(X) -> ?SECS(X) end);
+which_ttest_runtime_env2(S) ->
+    convert_time(S, fun(X) -> ?SECS(X) end).
+
+convert_time(TStrRev, Convert) ->
+    try list_to_integer(lists:reverse(TStrRev)) of
+        I -> Convert(I)
+    catch
+        _:_ ->
+            ?TTEST_RUNTIME
+    end.
+
+%% ttest_tcp(TC,
+%%           Domain,
+%%           ServerMod, ServerActive,
+%%           ClientMod, ClientActive,
+%%           MsgID, MaxOutstanding) ->
+%%     ttest_tcp(TC,
+%%               ?TTEST_RUNTIME,
+%%               Domain,
+%%               ServerMod, ServerActive,
+%%               ClientMod, ClientActive,
+%%               MsgID, MaxOutstanding).
+ttest_tcp(TC,
+          Runtime,
+          Domain,
+          ServerMod, ServerActive,
+          ClientMod, ClientActive,
+          MsgID, MaxOutstanding) ->
+    tc_try(TC,
+           fun() ->
+                   if
+                       (Domain =:= local) -> has_support_unix_domain_socket(); 
+                       (Domain =:= inet6) -> has_support_ipv6();
+                       true -> ok 
+                   end
+           end,
+           fun() ->
+                   %% This may be overkill, depending on the runtime,
+                   %% but better safe then sorry...
+                   ?TT(Runtime + ?SECS(60)),
+                   InitState = #{domain          => Domain,
+                                 msg_id          => MsgID,
+                                 max_outstanding => MaxOutstanding,
+                                 runtime         => Runtime,
+                                 server_mod      => ServerMod,
+                                 server_active   => ServerActive,
+                                 client_mod      => ClientMod,
+                                 client_active   => ClientActive},
+                   ok = ttest_tcp(InitState)
+           end).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+ttest_tcp(InitState) ->
+    ServerSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start",
+           cmd  => fun(State) ->
+                           Tester = ?SEV_AWAIT_START(),
+                           {ok, State#{tester => Tester}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+
+         %% *** Init part ***
+         #{desc => "create node",
+           cmd  => fun(#{host := Host} = State) ->
+                           case start_node(Host, server) of
+                               {ok, Node} ->
+                                   {ok, State#{node => Node}};
+                               {error, Reason} ->
+                                   {skip, Reason}
+                           end
+                   end},
+         #{desc => "monitor server node",
+           cmd  => fun(#{node := Node} = _State) ->
+                           true = erlang:monitor_node(Node, true),
+                           ok
+                   end},
+         #{desc => "start ttest (remote) server",
+           cmd  => fun(#{domain := local = Domain,
+                         mod    := Mod,
+                         active := Active,
+                         node   := Node} = State) ->
+                           case ttest_tcp_server_start(Node,
+                                                       Domain, Mod, Active) of
+                               {ok, {{Pid, _}, Path}} ->
+                                   {ok, State#{rserver => Pid,
+                                               path    => Path}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end;
+                      (#{domain := Domain,
+                         mod    := Mod,
+                         active := Active,
+                         node   := Node} = State) ->
+                           case ttest_tcp_server_start(Node,
+                                                       Domain, Mod, Active) of
+                               {ok, {{Pid, _}, {Addr, Port}}} ->
+                                   {ok, State#{rserver => Pid,
+                                               addr    => Addr,
+                                               port    => Port}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{domain := local,
+                         tester := Tester,
+                         path   := Path}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, Path),
+                           ok;
+                      (#{tester := Tester,
+                         addr   := Addr,
+                         port   := Port}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init, {Addr, Port}),
+                           ok
+                   end},
+
+
+         %% *** Termination ***
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester  := Tester, 
+                         rserver := RServer} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester,
+                                                     [{rserver, RServer}]) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         %% The remote server is in a accept, with a timeout of 5 seconds,
+         %% so may have to wait a bit...
+         #{desc => "order (remote) ttest server terminate",
+           cmd  => fun(#{node    := _Node,
+                         rserver := RServer}) ->
+                           ttest_tcp_server_stop(RServer),
+                           ok
+                   end},
+         #{desc => "await ttest (remote) server termination",
+           cmd  => fun(#{rserver := RServer} = State) ->
+                           ?SEV_AWAIT_TERMINATION(RServer),
+                           State1 = maps:remove(rserver, State),
+                           {ok, State1}
+                   end},
+         #{desc => "stop (server) node",
+           cmd  => fun(#{node := Node} = _State) ->
+                           stop_node(Node)
+                   end},
+         #{desc => "await (server) node termination",
+           cmd  => fun(#{node := Node} = State) ->
+                           receive
+                               {nodedown, Node} ->
+                                   {ok, maps:remove(node, State)}
+                           end
+                   end},
+
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    ClientSeq =
+        [
+         %% *** Wait for start order part ***
+         #{desc => "await start",
+           cmd  => fun(#{domain := local} = State) ->
+                           {Tester, ServerPath} = 
+                               ?SEV_AWAIT_START(),
+                           {ok, State#{tester      => Tester,
+                                       server_path => ServerPath}};
+                      (State) ->
+                           {Tester, {ServerAddr, ServerPort}} = 
+                               ?SEV_AWAIT_START(),
+                           {ok, State#{tester      => Tester,
+                                       server_addr => ServerAddr,
+                                       server_port => ServerPort}}
+                   end},
+         #{desc => "monitor tester",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           _MRef = erlang:monitor(process, Tester),
+                           ok
+                   end},
+
+
+         %% *** Init part ***
+         #{desc => "create node",
+           cmd  => fun(#{host := Host} = State) ->
+                           case start_node(Host, client) of
+                               {ok, Node} ->
+                                   {ok, State#{node => Node}};
+                               {error, Reason} ->
+                                   {skip, Reason}
+                           end
+                   end},
+         #{desc => "monitor client node",
+           cmd  => fun(#{node := Node} = _State) ->
+                           true = erlang:monitor_node(Node, true),
+                           ok
+                   end},
+         #{desc => "announce ready (init)",
+           cmd  => fun(#{tester := Tester}) ->
+                           ?SEV_ANNOUNCE_READY(Tester, init),
+                           ok
+                   end},
+
+
+         %% The actual test
+         #{desc => "await continue (ttest)",
+           cmd  => fun(#{tester := Tester} = _State) ->
+                           ?SEV_AWAIT_CONTINUE(Tester, tester, ttest),
+                           ok
+                   end},
+         #{desc => "start ttest (remote) client",
+           cmd  => fun(#{domain          := local = Domain,
+                         node            := Node,
+                         mod             := Mod,
+                         active          := Active,
+                         msg_id          := MsgID,
+                         max_outstanding := MaxOutstanding,
+                         runtime         := RunTime,
+                         server_path     := Path} = State) ->
+                           Self   = self(),
+                           Notify =
+                               fun(Result) ->
+                                       ?SEV_ANNOUNCE_READY(Self, ttest, Result)
+                               end,                           
+                           case ttest_tcp_client_start(Node, Notify,
+                                                       Domain, Mod,
+                                                       Path,
+                                                       Active,
+                                                       MsgID, MaxOutstanding,
+                                                       RunTime) of
+                               {ok, {Pid, _MRef}} ->
+                                   {ok, State#{rclient => Pid}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end;
+                      (#{domain          := Domain,
+                         node            := Node,
+                         mod             := Mod,
+                         active          := Active,
+                         msg_id          := MsgID,
+                         max_outstanding := MaxOutstanding,
+                         runtime         := RunTime,
+                         server_addr     := Addr,
+                         server_port     := Port} = State) ->
+                           Self   = self(),
+                           Notify =
+                               fun(Result) ->
+                                       ?SEV_ANNOUNCE_READY(Self, ttest, Result)
+                               end,                           
+                           case ttest_tcp_client_start(Node, Notify,
+                                                       Domain, Mod,
+                                                       {Addr, Port},
+                                                       Active,
+                                                       MsgID, MaxOutstanding,
+                                                       RunTime) of
+                               {ok, {Pid, _MRef}} ->
+                                   {ok, State#{rclient => Pid}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "await ttest ready",
+           cmd  => fun(#{tester  := Tester,
+                         rclient := RClient} = State) ->
+                           case ?SEV_AWAIT_READY(RClient, rclient, ttest, 
+                                                 [{tester, Tester}]) of
+                             {ok, Result} ->
+                                 {ok, State#{result => Result}};
+                             {error, _} = ERROR ->
+                                 ERROR
+                         end
+                   end},
+         #{desc => "await ttest (remote) client termination",
+           cmd  => fun(#{rclient := RClient} = State) ->
+                           ?SEV_AWAIT_TERMINATION(RClient),
+                           State1 = maps:remove(rclient, State),
+                           {ok, State1}
+                   end},
+         #{desc => "announce ready (ttest)",
+           cmd  => fun(#{tester := Tester,
+                         result := Result} = State) ->
+                           ?SEV_ANNOUNCE_READY(Tester, ttest, Result),
+                           {ok, maps:remove(result, State)}
+                   end},
+
+
+         %% *** Termination ***
+         #{desc => "await terminate (from tester)",
+           cmd  => fun(#{tester := Tester} = State) ->
+                           case ?SEV_AWAIT_TERMINATE(Tester, tester) of
+                               ok ->
+                                   {ok, maps:remove(tester, State)};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+         #{desc => "stop (client) node",
+           cmd  => fun(#{node := Node} = _State) ->
+                           stop_node(Node)
+                   end},
+         #{desc => "await (client) node termination",
+           cmd  => fun(#{node := Node} = State) ->
+                           receive
+                               {nodedown, Node} ->
+                                   {ok, maps:remove(node, State)}
+                           end
+                   end},
+
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    TesterSeq =
+        [
+         %% *** Init part ***
+         #{desc => "monitor server",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+         #{desc => "monitor client",
+           cmd  => fun(#{client := Pid} = _State) ->
+                           _MRef = erlang:monitor(process, Pid),
+                           ok
+                   end},
+
+         %% Start the server
+         #{desc => "order server start",
+           cmd  => fun(#{server := Pid} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid),
+                           ok
+                   end},
+         #{desc => "await server ready (init)",
+           cmd  => fun(#{domain := local,
+                         server := Pid} = State) ->
+                           {ok, Path} = ?SEV_AWAIT_READY(Pid, server, init),
+                           {ok, State#{server_path => Path}};
+                      (#{server := Pid} = State) ->
+                           {ok, {Addr, Port}} =
+                               ?SEV_AWAIT_READY(Pid, server, init),
+                           {ok, State#{server_addr => Addr,
+                                       server_port => Port}}
+                   end},
+
+
+         %% Start the client
+         #{desc => "order client start",
+           cmd  => fun(#{domain      := local,
+                         client      := Pid,
+                         server_path := Path} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, Path),
+                           ok;
+                      (#{client      := Pid,
+                         server_addr := Addr,
+                         server_port := Port} = _State) ->
+                           ?SEV_ANNOUNCE_START(Pid, {Addr, Port}),
+                           ok
+                   end},
+         #{desc => "await client ready (init)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ok = ?SEV_AWAIT_READY(Client, client, init)
+                   end},
+ 
+         %% The actual test
+         #{desc => "order client continue (ttest)",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_CONTINUE(Client, ttest),
+                           ok
+                   end},
+         #{desc => "await client ready (ttest)",
+           cmd  => fun(#{server := Server,
+                         client := Client} = State) ->
+                           case ?SEV_AWAIT_READY(Client, client, ttest,
+                                                 [{server, Server}]) of
+                               {ok, Result} ->
+                                   {ok, State#{result => Result}};
+                               {error, _} = ERROR ->
+                                   ERROR
+                           end
+                   end},
+
+
+         %% *** Terminate server ***
+         #{desc => "order client terminate",
+           cmd  => fun(#{client := Client} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Client),
+                           ok
+                   end},
+         #{desc => "await client down",
+           cmd  => fun(#{client := Client} = State) ->
+                           ?SEV_AWAIT_TERMINATION(Client),
+                           State1 = maps:remove(client,    State),
+                           {ok, State1}
+                   end},
+         #{desc => "order server terminate",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_ANNOUNCE_TERMINATE(Server),
+                           ok
+                   end},
+         #{desc => "await server down",
+           cmd  => fun(#{server := Server} = _State) ->
+                           ?SEV_AWAIT_TERMINATION(Server),
+                           ok
+                   end},
+
+         
+         %% Present the results
+         #{desc => "present the results",
+           cmd  => fun(#{result        := Result,
+                         domain        := Domain,
+                         server_mod    := ServerTrans,
+                         server_active := ServerActive,
+                         client_mod    := ClientTrans,
+                         client_active := ClientActive,
+                         msg_id        := MsgID} = State) ->
+                           case Result of
+                               #{status  := ok,
+                                 runtime := RunTime,
+                                 cnt     := Cnt,
+                                 bcnt    := BCnt} ->
+                                   ttest_report(Domain,
+                                                ServerTrans, ServerActive,
+                                                ClientTrans, ClientActive,
+                                                MsgID,
+                                                RunTime, BCnt, Cnt),
+                                   ?SEV_IPRINT(
+                                      "TTest results: "
+                                      "~n   Run Time:                    ~s"
+                                      "~n   Byte Count:                  ~s"
+                                      "~n   Number of message exchanges: ~s"
+                                      "~n~n",
+                                      [
+                                       ?TTEST_LIB:format_time(RunTime),
+                                       if ((BCnt =:= 0) orelse (RunTime =:= 0)) ->
+                                               ?TTEST_LIB:format("~w, ~w",
+                                                                 [BCnt, RunTime]);
+                                          true ->
+                                               ?TTEST_LIB:format("~p => ~p byte / ms",
+                                                                 [BCnt, BCnt div RunTime])
+                                       end,
+                                       if (RunTime =:= 0) ->
+                                               "-";
+                                          true ->
+                                               ?TTEST_LIB:format("~p => ~p iterations / ms",
+                                                                 [Cnt, Cnt div RunTime])
+                                       end
+                                      ]),
+                                   {ok, maps:remove(result, State)};
+
+                               #{status  := Failure,
+                                 runtime := RunTime,
+                                 sid     := SID,
+                                 rid     := RID,
+                                 scnt    := SCnt,
+                                 rcnt    := RCnt,
+                                 bcnt    := BCnt,
+                                 num     := Num} ->
+                                   ?SEV_EPRINT("Time Test failed: "
+                                               "~n   ~p"
+                                               "~n"
+                                               "~nwhen"
+                                               "~n"
+                                               "~n   Run Time:       ~s"
+                                               "~n   Send ID:        ~p"
+                                               "~n   Recv ID:        ~p"
+                                               "~n   Send Count:     ~p"
+                                               "~n   Recv Count:     ~p"
+                                               "~n   Byte Count:     ~p"
+                                               "~n   Num Iterations: ~p",
+                                               [Failure,
+                                                ?TTEST_LIB:format_time(RunTime),
+                                                SID, RID, SCnt, RCnt, BCnt, Num]),
+                                   {error, Failure}
+                           end
+                   end},
+
+         %% This is just so that the printout above shall have time to come
+         %% out before then end of the test case.
+         ?SEV_SLEEP(?SECS(1)),
+
+         %% *** We are done ***
+         ?SEV_FINISH_NORMAL
+        ],
+
+    Domain = maps:get(domain, InitState),
+    LHost  = local_host(),
+    LAddr  = which_local_addr(Domain),
+
+    i("start server evaluator"),
+    ServerInitState = #{host   => LHost,
+			addr   => LAddr,
+                        domain => Domain,
+                        mod    => maps:get(server_mod,    InitState),
+                        active => maps:get(server_active, InitState)},
+    Server          = ?SEV_START("server", ServerSeq, ServerInitState),
+
+    i("start client evaluator"),
+    ClientInitState = #{host            => LHost,
+			addr            => LAddr,
+                        domain          => Domain,
+                        mod             => maps:get(client_mod,      InitState),
+                        active          => maps:get(client_active,   InitState),
+                        msg_id          => maps:get(msg_id,          InitState),
+                        max_outstanding => maps:get(max_outstanding, InitState),
+                        runtime         => maps:get(runtime,         InitState)},
+    Client          = ?SEV_START("client", ClientSeq, ClientInitState),
+    
+    i("start 'tester' evaluator"),
+    TesterInitState = #{domain        => Domain,
+			msg_id        => maps:get(msg_id,        InitState),
+                        client        => Client#ev.pid,
+			client_mod    => maps:get(client_mod,    InitState),
+			client_active => maps:get(client_active, InitState),
+                        server        => Server#ev.pid,
+                        server_mod    => maps:get(server_mod,    InitState),
+                        server_active => maps:get(server_active, InitState)},
+    Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
+
+    i("await evaluator(s)"),
+    ok = ?SEV_AWAIT_FINISH([Server, Client, Tester]).
+
+
+
+ttest_tcp_server_start(Node, Domain, gen, Active) ->
+    TransportMod = socket_test_ttest_tcp_gen,
+    Transport    = {TransportMod, #{domain => Domain}},
+    socket_test_ttest_tcp_server:start_monitor(Node, Transport, Active);
+ttest_tcp_server_start(Node, Domain, sock, Active) ->
+    TransportMod = socket_test_ttest_tcp_socket,
+    Transport    = {TransportMod, #{domain => Domain,
+                                    async  => true,
+                                    method => plain}},
+    socket_test_ttest_tcp_server:start_monitor(Node, Transport, Active).
+
+ttest_tcp_server_stop(Pid) ->
+    socket_test_ttest_tcp_server:stop(Pid).
+
+ttest_tcp_client_start(Node,
+                       Notify,
+                       Domain, gen,
+                       ServerInfo, Active, MsgID, MaxOutstanding, RunTime) ->
+    TransportMod = socket_test_ttest_tcp_gen,
+    Transport    = {TransportMod, #{domain => Domain}},    
+    socket_test_ttest_tcp_client:start_monitor(Node,
+                                               Notify,
+                                               Transport,
+                                               ServerInfo,
+                                               Active,
+                                               MsgID, MaxOutstanding, RunTime);
+ttest_tcp_client_start(Node,
+                       Notify,
+                       Domain, sock,
+                       ServerInfo, Active, MsgID, MaxOutstanding, RunTime) ->
+    TransportMod = socket_test_ttest_tcp_socket,
+    Transport    = {TransportMod, #{domain => Domain,
+                                    async  => true,
+                                    method => plain}},
+    socket_test_ttest_tcp_client:start_monitor(Node,
+                                               Notify,
+                                               Transport,
+                                               ServerInfo,
+                                               Active,
+                                               MsgID, MaxOutstanding, RunTime).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-define(TTEST_MANAGER, esock_ttest_manager).
+
+-record(ttest_report_id,
+        {domain        :: socket:domain(),
+         serv_trans    :: gen | sock,
+         serv_active   :: once | boolean(),
+         client_trans  :: gen | sock,
+         client_active :: once | boolean(),
+         msg_id        :: small | medium | large}).
+
+-record(ttest_report, {id    :: #ttest_report_id{},
+                       time  :: non_neg_integer(),
+                       bytes :: non_neg_integer(),
+                       msgs  :: non_neg_integer()}).
+
+-spec ttest_report(Domain      :: socket:domain(),
+                   ServTrans   :: gen | sock, ServActive   :: once | boolean(),
+                   ClientTrans :: gen | sock, ClientActive :: once | boolean(),
+                   MsgID       :: 1 | 2 | 3,
+                   RunTime     :: non_neg_integer(),
+                   NumBytes    :: non_neg_integer(),
+                   NumMsgs     :: non_neg_integer()) -> ok.
+
+ttest_report(Domain,
+             ServTrans,   ServActive,
+             ClientTrans, ClientActive,
+             MsgID,
+             RunTime,
+             NumBytes,
+             NumMsgs) ->
+    ID = #ttest_report_id{domain        = Domain,
+                          serv_trans    = ServTrans,
+                          serv_active   = ServActive,
+                          client_trans  = ClientTrans,
+                          client_active = ClientActive,
+                          msg_id        = ttest_msg_id_num_to_name(MsgID)},
+    Report = #ttest_report{id    = ID,
+                           time  = RunTime,
+                           bytes = NumBytes,
+                           msgs  = NumMsgs},
+    %% If we run just one test case, the group init has never been run
+    %% and therefor the ttest manager is not running (we also don't actually
+    %% care about collecting reports in that case).
+    (catch global:send(?TTEST_MANAGER, Report)),
+    ok.
+
+ttest_msg_id_num_to_name(1) ->
+    small;
+ttest_msg_id_num_to_name(2) ->
+    medium;
+ttest_msg_id_num_to_name(3) ->
+    large.
+    
+ttest_manager_start() ->
+    Self = self(),
+    {Pid, MRef} = spawn_monitor(fun() -> ttest_manager_init(Self) end),
+    receive
+        {ttest_manager_started, Pid} ->
+            erlang:demonitor(MRef, [flush]),
+            ok;
+        {'DOWN', MRef, process, Pid, Reason} ->
+            exit({failed_starting, ttest_manager, Reason})
+    after 5000 ->
+            exit(Pid, kill),
+            exit({failed_starting, ttest_manager, timeout})
+    end.
+
+ttest_manager_stop() ->
+    case global:whereis_name(?TTEST_MANAGER) of
+        Pid when is_pid(Pid) ->
+            erlang:monitor(process, Pid),
+            global:send(?TTEST_MANAGER, stop),
+            receive
+                {'DOWN', _MRef, process, Pid, _} ->
+                    ok
+            after 10000 ->
+                    exit(Pid, kill),
+                    ok
+            end;
+        _ ->
+            ok
+    end.
+
+ttest_manager_init(Parent) ->
+    yes = global:register_name(?TTEST_MANAGER, self()),
+    ets:new(?TTEST_MANAGER, 
+            [{keypos, #ttest_report.id}, named_table, protected, ordered_set]),
+    Parent ! {ttest_manager_started, self()},
+    ttest_manager_loop().
+
+ttest_manager_loop() ->
+    receive
+        stop ->
+            ?LOGGER:format("manager stopping~n", []),
+            ttest_manager_done();
+
+        #ttest_report{id    = _ID,
+                      time  = _RunTime,
+                      bytes = _NumBytes,
+                      msgs  = _NumMsgs} = Report ->
+            true = ets:insert_new(?TTEST_MANAGER, Report),
+            ttest_manager_loop()
+    end.
+
+%% We are supposed to pretty print the result here...
+ttest_manager_done() ->
+    format_reports(inet),
+    %% format_reports(inet6),
+    ets:delete(?TTEST_MANAGER),
+    exit(normal).
+
+format_reports(Domain) ->
+    ?LOGGER:format("Domain ~w reports:~n~n", [Domain]),
+    format_reports(Domain, small),
+    format_reports(Domain, medium),
+    format_reports(Domain, large).
+    
+format_reports(Domain, MsgID) when is_atom(MsgID) ->
+    case which_ttest_reports(Domain, MsgID) of
+        [] ->
+            ?LOGGER:format("   No ~w reports~n~n", [MsgID]);
+        Reports ->
+            ?LOGGER:format("   ~w reports: ~n", [MsgID]),
+            lists:foreach(fun(R) -> format_report(R) end, Reports)
+    end.
+
+%% This should really be a table like this:
+%%
+%%             client
+%% server      gen(false)  gen(once)  gen(true)  sock(false)  sock(once)  sock(true)
+%% gen(false)  nnn
+%% gen(once)   nnn
+%% gen(true)   nnn
+%% sock(false) nnn
+%% sock(once)  nnn
+%% sock(true)  nnn
+%%
+format_report(#ttest_report{id    = #ttest_report_id{serv_trans    = STrans,
+                                                     serv_active   = SActive,
+                                                     client_trans  = CTrans,
+                                                     client_active = CActive},
+                            time  = RunTime,
+                            bytes = BCnt,
+                            msgs  = MCnt}) ->
+    ?LOGGER:format("      server ~w[~w] - client ~w[~w] => "
+                   "~n         Run Time: ~s"
+                   "~n         Bytes:    ~s"
+                   "~n         Messages: ~s"
+                   "~n", [STrans, SActive, CTrans, CActive,
+                          ?TTEST_LIB:format_time(RunTime),
+                          if ((BCnt =:= 0) orelse (RunTime =:= 0)) ->
+                                  ?TTEST_LIB:format("~w, ~w",
+                                                    [BCnt, RunTime]);
+                             true ->
+                                  ?TTEST_LIB:format("~p => ~p byte / ms",
+                                                    [BCnt, BCnt div RunTime])
+                          end,
+                          if (RunTime =:= 0) ->
+                                  "-";
+                             true ->
+                                  ?TTEST_LIB:format("~p => ~p iterations / ms",
+                                                    [MCnt, MCnt div RunTime])
+                          end]),
+    ok.
+
+
+which_ttest_reports(Domain, all) ->
+    [R || R = #ttest_report{id = #ttest_report_id{domain = D}} <- 
+              ets:tab2list(?TTEST_MANAGER), Domain =:= D];
+which_ttest_reports(Domain, MsgID) ->
+    [R || R = #ttest_report{id = #ttest_report_id{domain = D, msg_id = MID}} <- 
+              ets:tab2list(?TTEST_MANAGER), (Domain =:= D) andalso (MsgID =:= MID)].
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This mechanism has only one purpose: So that we are able to kill
+%% the node-starter process if it takes to long. The node-starter
+%% runs on the local node.
+%% This crapola is hopefully temporary, but we have seen that on
+%% some platforms the ct_slave:start simply hangs.
+-define(NODE_START_TIMEOUT, 10000).
+start_node(Host, NodeName) ->
+    start_node(Host, NodeName, ?NODE_START_TIMEOUT).
+
+start_node(Host, NodeName, Timeout) ->
+    {NodeStarter, _} =
+        spawn_monitor(fun() -> exit(start_unique_node(Host, NodeName)) end),
+    receive
+        {'DOWN', _, process, NodeStarter, Result} ->
+            %% i("Node Starter (~p) reported: ~p", [NodeStarter, Result]),
+            Result
+    after Timeout ->
+            exit(NodeStarter, kill),
+            {error, {failed_starting_node, NodeName, timeout}}
+    end.
+
+start_unique_node(Host, NodeName) ->
+    UniqueNodeName = f("~w_~w", [NodeName, erlang:system_time(millisecond)]),
+    case do_start_node(Host, UniqueNodeName) of
+        {ok, _} = OK ->
+            global:sync(),
+            %% i("Node ~p started: "
+            %%    "~n   Nodes:        ~p"
+            %%    "~n   Logger:       ~p"
+            %%    "~n   Global Names: ~p",
+            %%    [NodeName, nodes(),
+            %%     global:whereis_name(socket_test_logger),
+            %%     global:registered_names()]),
+            OK;
+        {error, Reason, _} ->
+            {error, Reason}
+    end.
+
+do_start_node(Host, NodeName) when is_list(NodeName) ->
+    do_start_node(Host, list_to_atom(NodeName));
+do_start_node(Host, NodeName) when is_atom(NodeName) ->
+    Dir   = filename:dirname(code:which(?MODULE)),
+    Flags = "-pa " ++ Dir,
+    Opts  = [{monitor_master, true}, {erl_flags, Flags}],
+    ct_slave:start(Host, NodeName, Opts).
+
+
+stop_node(Node) ->
+    case ct_slave:stop(Node) of
+        {ok, _} ->
+            ok;
+        {error, _} = ERROR ->
+            ERROR
+    end.
+
+    
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+sock_open(Domain, Type, Proto) ->
+    try socket:open(Domain, Type, Proto) of
+        {ok, Socket} ->
+            Socket;
+        {error, Reason} ->
+            ?FAIL({open, Reason})
+    catch
+        C:E:S ->
+            ?FAIL({open, C, E, S})
+    end.
+
+
+sock_connect(Sock, SockAddr) ->
+    try socket:connect(Sock, SockAddr) of
+        ok ->
+            ok;
+        {error, Reason} ->
+            ?FAIL({connect, Reason})
+    catch
+        C:E:S ->
+            ?FAIL({connect, C, E, S})
+    end.
+    
+sock_sockname(Sock) ->
+    try socket:sockname(Sock) of
+        {ok, SockAddr} ->
+            SockAddr;
+        {error, Reason} ->
+            ?FAIL({sockname, Reason})
+    catch
+        C:E:S ->
+            ?FAIL({sockname, C, E, S})
+    end.
+    
+sock_close(Sock) ->
+    try socket:close(Sock) of
+        ok ->
+            ok;
+        {error, Reason} ->
+            i("sock_close -> error: ~p", [Reason]),
+            ?FAIL({close, Reason})
+    catch
+        C:E:S ->
+            i("sock_close -> failed: ~p, ~p, ~p", [C, E, S]),
+            ?FAIL({close, C, E, S})
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+local_host() ->
+    try net_adm:localhost() of
+        Host when is_list(Host) ->
+	    %% Convert to shortname if long
+	    case string:tokens(Host, [$.]) of
+		[H|_] ->
+		    list_to_atom(H)
+	    end
+    catch
+        C:E:S ->
+            erlang:raise(C, E, S)
+    end.
+
+
+%% The point of this is to "ensure" that paths from different test runs
+%% don't clash.
+mk_unique_path() ->
+    [NodeName | _] = string:tokens(atom_to_list(node()), [$@]),
+    Path = ?LIB:f("/tmp/esock_~s_~w", [NodeName, erlang:system_time(nanosecond)]),
+    ensure_unique_path(Path).
+
+ensure_unique_path(Path) ->
+    case file:read_file_info(Path) of
+        {ok, _} -> % Ouch, append a unique ID and try again
+            ensure_unique_path(Path, 1);
+        {error, _} ->
+            %% We assume this means it does not exist yet...
+            %% If we have several process in paralell trying to create
+            %% (unique) path's, then we are in trouble. To *really* be
+            %% on the safe side we should have a (central) path registry...
+            Path
+    end.
+
+ensure_unique_path(Path, ID) when (ID < 100) -> % If this is not enough...
+    NewPath = ?LIB:f("~s_~w", [Path, ID]),
+    case file:read_file_info(NewPath) of
+        {ok, _} -> % Ouch, this also existed, increment and try again
+            ensure_unique_path(Path, ID + 1);
+        {error, _} -> % We assume this means it does not exist yet...
+            NewPath
+    end;
+ensure_unique_path(_, _) -> 
+    skip("Could not create unique path").
+    
+            
+which_local_socket_addr(local = Domain) ->
+    #{family => Domain,
+      path   => mk_unique_path()};
+
+%% This gets the local socket address (not 127.0...)
+%% We should really implement this using the (new) net module,
+%% but until that gets the necessary functionality...
+which_local_socket_addr(Domain) ->
+    case ?LIB:which_local_host_info(Domain) of
+        {ok, #{addr := Addr}} ->
+            #{family => Domain,
+              addr   => Addr};
+        {error, Reason} ->
+            ?FAIL(Reason)
+    end.
+
+
+
+which_local_addr(local = _Domain) ->
+    mk_unique_path();
+
+%% This gets the local address (not 127.0...)
+%% We should really implement this using the (new) net module,
+%% but until that gets the necessary functionality...
+which_local_addr(Domain) ->
+    ?LIB:which_local_addr(Domain).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Here are all the *general* test case condition functions.
+
+%% We also need (be able) to figure out the the multicast address,
+%% which we only support for some platforms (linux and sunos).
+%% We don't do that here, but since we can only do that (find a
+%% multicast address) for specific platforms, we check that we are
+%% on of those platforms here.
+has_support_ip_multicast() ->
+    case os:type() of
+        {unix, OsName} when (OsName =:= linux) orelse
+                            (OsName =:= sunos) ->
+            case ?LIB:which_local_host_info(inet) of
+                {ok, #{flags := Flags}} ->
+                    case lists:member(multicast, Flags) of
+                        true ->
+                            ok;
+                        false ->
+                            not_supported(multicast)
+                    end;
+                {error, Reason} ->
+                    not_supported({multicast, Reason})
+            end;
+        {unix, OsName} ->
+            skip(?F("Not Supported: platform ~w", [OsName]));
+        Type ->
+            skip(?F("Not Supported: platform ~p", [Type]))
+    end.
+
+has_support_sock_acceptconn() ->
+    has_support_socket_option_sock(acceptconn).
+
+has_support_sock_bindtodevice() ->
+    has_support_socket_option_sock(bindtodevice).
+
+has_support_sock_broadcast() ->
+    has_support_socket_option_sock(broadcast),
+    case ?LIB:which_local_host_info(inet) of
+        {ok, #{flags := Flags}} ->
+            case lists:member(broadcast, Flags) of
+                true ->
+                    ok;
+                false ->
+                    not_supported({broadcast, Flags})
+            end;
+        {error, Reason} ->
+            not_supported({broadcast, Reason})
+    end.
+
+has_support_sock_debug() ->
+    has_support_socket_option_sock(debug).
+
+has_support_sock_domain() ->
+    has_support_socket_option_sock(domain).
+
+has_support_sock_dontroute() ->
+    has_support_socket_option_sock(dontroute).
+
+has_support_sock_keepalive() ->
+    has_support_socket_option_sock(keepalive).
+
+
+has_support_ip_add_membership() ->
+    has_support_socket_option_ip(add_membership).
+
+has_support_ip_drop_membership() ->
+    has_support_socket_option_ip(drop_membership).
+
+
+has_support_socket_option_ip(Opt) ->
+    has_support_socket_option(ip, Opt).
+
+has_support_socket_option_sock(Opt) ->
+    has_support_socket_option(socket, Opt).
+
+has_support_socket_option(Level, Option) ->
+    case socket:supports(options, Level, Option) of
+        true ->
+            ok;
+        false ->
+            skip(?F("Not Supported: ~w option ~w", [Level, Option]))
+    end.
+
+
+
+
+unix_domain_socket_host_cond() ->
+    unix_domain_socket_host_cond(os:type(), os:version()).
+
+unix_domain_socket_host_cond({unix, linux}, {M, _, _}) when (M < 3) ->
+    skip("TC may not work on this version");
+unix_domain_socket_host_cond(_, _) ->
+    ok.
+
+has_support_unix_domain_socket() ->
+    case os:type() of
+        {win32, _} ->
+            skip("Not supported");
+        _ ->
+            case socket:supports(local) of
+                true ->
+                    ok;
+                false ->
+                    skip("Not supported")
+            end
+    end.
+
+
+%% The idea is that this function shall test if the test host has 
+%% support for IPv6. If not, there is no point in running IPv6 tests.
+%% Currently we just skip.
+has_support_ipv6() ->
+    ?LIB:has_support_ipv6().
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+unlink_path(Path) ->
+    unlink_path(Path, fun() -> ok end, fun() -> ok end).
+
+unlink_path(Path, Success, Failure) when is_list(Path) andalso 
+                                         is_function(Success, 0) andalso
+                                         is_function(Failure, 0) ->
+    ?SEV_IPRINT("try unlink path: "
+                "~n   ~s", [Path]),
+    case os:cmd("unlink " ++ Path) of
+        "" ->
+            ?SEV_IPRINT("path unlinked: "
+                        "~n   Path: ~s", [Path]),
+            Success();
+        Result ->
+            ?SEV_EPRINT("unlink maybe failed: "
+                        "~n   Path: ~s"
+                        "~n   Res:  ~s", [Path, Result]),
+            Failure()
+    end;
+unlink_path(_, _, _) ->
+    ok.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+not_supported(What) ->
+    skip({not_supported, What}).
+
+not_yet_implemented() ->
+    skip("not yet implemented").
+
+skip(Reason) ->
+    throw({skip, Reason}).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+t() ->
+    ts(ms).
+
+ts(ms) ->
+    erlang:monotonic_time(milli_seconds).
+
+tdiff({A1, B1, C1} = _T1x, {A2, B2, C2} = _T2x) ->
+    T1 = A1*1000000000+B1*1000+(C1 div 1000), 
+    T2 = A2*1000000000+B2*1000+(C2 div 1000), 
+    T2 - T1.
+
+
+formated_timestamp() ->
+    format_timestamp(os:timestamp()).
+
+format_timestamp({_N1, _N2, _N3} = TS) ->
+    {_Date, Time}   = calendar:now_to_local_time(TS),
+    %% {YYYY,MM,DD}   = Date,
+    {Hour,Min,Sec} = Time,
+    %% FormatTS = 
+    %%     io_lib:format("~.4w-~.2.0w-~.2.0w ~.2.0w:~.2.0w:~.2.0w.~w",
+    %%                   [YYYY, MM, DD, Hour, Min, Sec, N3]),  
+    FormatTS = io_lib:format("~.2.0w:~.2.0w:~.2.0w", [Hour, Min, Sec]),  
+    lists:flatten(FormatTS).
+
+   
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+set_tc_name(N) when is_atom(N) ->
+    set_tc_name(atom_to_list(N));
+set_tc_name(N) when is_list(N) ->
+    put(tc_name, N).
+
+%% get_tc_name() ->
+%%     get(tc_name).
+
+tc_begin(TC) ->
+    OldVal = process_flag(trap_exit, true),
+    put(old_trap_exit, OldVal),
+    set_tc_name(TC),
+    tc_print("begin ***",
+             "~n----------------------------------------------------~n", "").
+    
+tc_end(Result) when is_list(Result) ->
+    OldVal = erase(old_trap_exit),
+    process_flag(trap_exit, OldVal),
+    tc_print("done: ~s", [Result], 
+             "", "----------------------------------------------------~n~n"),
+    ok.
+
+%% *** tc_try/2,3 ***
+%% Case:      Basically the test case name
+%% TCCondFun: A fun that is evaluated before the actual test case
+%%            The point of this is that it can performs checks to
+%%            see if we shall run the test case at all.
+%%            For instance, the test case may only work in specific
+%%            conditions.
+%% FCFun:     The test case fun
+tc_try(Case, TCFun) ->
+    TCCondFun = fun() -> ok end,
+    tc_try(Case, TCCondFun, TCFun).
+
+tc_try(Case, TCCondFun, TCFun) 
+  when is_atom(Case) andalso
+       is_function(TCCondFun, 0) andalso
+       is_function(TCFun, 0) ->
+    tc_begin(Case),
+    try TCCondFun() of
+        ok ->
+            try 
+                begin
+                    TCFun(),
+                    ?SLEEP(?SECS(1)),
+                    tc_end("ok")
+                end
+            catch
+                C:{skip, _} = SKIP when ((C =:= throw) orelse (C =:= exit)) ->
+                    %% i("catched[tc] (skip): "
+                    %%   "~n   C:    ~p"
+                    %%   "~n   SKIP: ~p"
+                    %%   "~n", [C, SKIP]),
+                    tc_end( f("skipping(catched,~w,tc)", [C]) ),
+                    SKIP;
+                C:E:S ->
+                    %% i("catched[tc]: "
+                    %%   "~n   C: ~p"
+                    %%   "~n   E: ~p"
+                    %%   "~n   S: ~p"
+                    %%    "~n", [C, E, S]),
+                    tc_end( f("failed(catched,~w,tc)", [C]) ),
+                    erlang:raise(C, E, S)
+            end;
+        {skip, _} = SKIP ->
+            tc_end("skipping(tc)"),
+            SKIP;
+        {error, Reason} ->
+            tc_end("failed(tc)"),
+            exit({tc_cond_failed, Reason})
+    catch
+        C:{skip, _} = SKIP when ((C =:= throw) orelse (C =:= exit)) ->
+            %% i("catched[cond] (skip): "
+            %%   "~n   C:    ~p"
+            %%   "~n   SKIP: ~p"
+            %%   "~n", [C, SKIP]),
+            tc_end( f("skipping(catched,~w,cond)", [C]) ),
+            SKIP;
+        C:E:S ->
+            %% i("catched[cond]: "
+            %%   "~n   C: ~p"
+            %%   "~n   E: ~p"
+            %%   "~n   S: ~p"
+            %%   "~n", [C, E, S]),
+            tc_end( f("failed(catched,~w,cond)", [C]) ),
+            erlang:raise(C, E, S)
+    end.
+
+
+tc_print(F, Before, After) ->
+    tc_print(F, [], Before, After).
+
+tc_print(F, A, Before, After) ->
+    Name = tc_which_name(),
+    FStr = f("*** [~s][~s][~p] " ++ F ++ "~n", 
+             [formated_timestamp(),Name,self()|A]),
+    io:format(user, Before ++ FStr ++ After, []).
+
+tc_which_name() ->
+    case get(tc_name) of
+        undefined ->
+            case get(sname) of
+                undefined ->
+                    "";
+                SName when is_list(SName) ->
+                    SName
+            end;
+        Name when is_list(Name) ->
+            Name
+    end.
+    
+   
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+l2a(S) when is_list(S) ->
+    list_to_atom(S).
+
+l2b(L) when is_list(L) ->
+    list_to_binary(L).
+
+b2l(B) when is_binary(B) ->
+    binary_to_list(B).
+
+f(F, A) ->
+    lists:flatten(io_lib:format(F, A)).
+
+%% p(F) ->
+%%     p(F, []).
+
+%% p(F, A) ->
+%%     p(F, A, "", "").
+
+%% p(F, A, Before, After) when is_list(Before) andalso is_list(After) ->
+%%     TcName = 
+%%         case get(tc_name) of
+%%             undefined ->
+%%                 case get(sname) of
+%%                     undefined ->
+%%                         "";
+%%                     SName when is_list(SName) ->
+%%                         SName
+%%                 end;
+%%             Name when is_list(Name) ->
+%%                 Name
+%%         end,
+%%     FStr = f("*** [~s][~s][~p] " ++ F ++ "~n", 
+%%              [formated_timestamp(),TcName,self()|A]),
+%%     i(Before ++ FStr ++ After, []).
+
+
+%% d(F, A) ->
+%%     d(get(dbg_fd), F, A).
+
+%% d(undefined, F, A) ->
+%%     [NodeNameStr|_] = string:split(atom_to_list(node()), [$@]),
+%%     DbgFileName = f("~s-dbg.txt", [NodeNameStr]),
+%%     case file:open(DbgFileName, [write]) of
+%%         {ok, FD} ->
+%%             put(dbg_fd, FD),
+%%             d(FD, F, A);
+%%         {error, Reason} ->
+%%             exit({failed_open_dbg_file, Reason})
+%%     end;
+%% d(FD, F, A) ->
+%%     io:format(FD, "~s~n", [f("[~s] " ++ F, [formated_timestamp()|A])]).
+
+i(F) ->
+    i(F, []).
+
+i(F, A) ->
+    FStr = f("[~s] " ++ F, [formated_timestamp()|A]),
+    io:format(user, FStr ++ "~n", []),
+    io:format(FStr, []).
+
diff --git a/erts/emulator/test/socket_test_evaluator.erl b/erts/emulator/test/socket_test_evaluator.erl
new file mode 100644
index 0000000000..694f0d5f1e
--- /dev/null
+++ b/erts/emulator/test/socket_test_evaluator.erl
@@ -0,0 +1,664 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2018-2019. 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(socket_test_evaluator).
+
+%% Evaluator control functions
+-export([
+         start/3,
+         await_finish/1
+        ]).
+
+%% Functions used by evaluators to interact with eachother
+-export([
+         %% Announce functions
+         %% (Send an announcement from one evaluator to another)
+         announce_start/1,     announce_start/2,
+         announce_continue/2,  announce_continue/3,
+         announce_ready/2,     announce_ready/3,
+         announce_terminate/1,
+
+         %% Await functions
+         %% (Wait for an announcement from another evaluator)
+         await_start/0,        await_start/1,
+         await_continue/3,     await_continue/4,
+         await_ready/3,        await_ready/4,
+         await_terminate/2,    await_terminate/3,
+         await_termination/1,  await_termination/2
+        ]).
+
+%% Utility functions
+-export([
+         iprint/2, % Info  printouts
+         eprint/2  % Error printouts
+        ]).
+
+-export_type([
+              ev/0,
+              initial_evaluator_state/0,
+              evaluator_state/0,
+              command_fun/0,
+              command/0
+             ]).
+
+
+-include("socket_test_evaluator.hrl").
+
+-type ev() :: #ev{}.
+-type initial_evaluator_state() :: map().
+-type evaluator_state() :: term().
+-type command_fun() :: 
+        fun((State :: evaluator_state()) -> ok) |
+        fun((State :: evaluator_state()) -> {ok, evaluator_state()}) |
+        fun((State :: evaluator_state()) -> {error, term()}).
+
+-type command() :: #{desc  := string(),
+                     cmd   := command_fun()}.
+
+
+%% ============================================================================
+
+-define(LIB,                    socket_test_lib).
+-define(LOGGER,                 socket_test_logger).
+
+-define(EXTRA_NOTHING,          '$nothing').
+-define(ANNOUNCEMENT_START,     '$start').
+-define(ANNOUNCEMENT_READY,     '$ready').
+-define(ANNOUNCEMENT_CONTINUE,  '$continue').
+-define(ANNOUNCEMENT_TERMINATE, '$terminate').
+
+-define(START_NAME_NONE,        '$no-name').
+-define(START_SLOGAN,           ?ANNOUNCEMENT_START).
+-define(TERMINATE_SLOGAN,       ?ANNOUNCEMENT_TERMINATE).
+
+
+%% ============================================================================
+
+-spec start(Name, Seq, Init) -> ev() when
+      Name :: string(),
+      Seq  :: [command()],
+      Init :: initial_evaluator_state().
+                             
+start(Name, Seq, InitState) 
+  when is_list(Name) andalso is_list(Seq) andalso (Seq =/= []) ->
+    %% Make sure 'parent' is not already used
+    case maps:find(parent, InitState) of
+        {ok, _} ->
+            erlang:error({already_used, parent});
+        error ->
+            InitState2 = InitState#{parent => self()},
+            Pid = erlang:spawn_link(
+                    fun() -> init(Name, Seq, InitState2) end),
+            %% MRef = erlang:monitor(process, Pid),
+            #ev{name = Name, pid = Pid}%, mref = MRef}
+    end.
+
+init(Name, Seq, Init) ->
+    put(sname, Name),
+    process_flag(trap_exit, true),
+    loop(1, Seq, Init).
+
+loop(_ID, [], FinalState) ->
+    exit(FinalState);
+loop(ID, [#{desc := Desc,
+            cmd  := Cmd}|Cmds], State) when is_function(Cmd, 1) ->
+    iprint("evaluate command ~2w: ~s", [ID, Desc]),
+    try Cmd(State) of
+        ok ->
+            loop(ID + 1, Cmds, State);
+        {ok, NewState} ->
+            loop(ID + 1, Cmds, NewState);
+        {skip, Reason} ->
+            ?SEV_IPRINT("command ~w skip: "
+                        "~n   ~p", [ID, Reason]),
+            exit({skip, Reason});
+        {error, Reason} ->
+            ?SEV_EPRINT("command ~w failed: "
+                        "~n   ~p", [ID, Reason]),
+            exit({command_failed, ID, Reason, State})
+    catch
+        C:{skip, command} = E:_ when ((C =:= throw) orelse (C =:= exit)) ->
+            %% Secondary skip
+            exit(E);
+        C:{skip, R} = E:_ when ((C =:= throw) orelse (C =:= exit)) ->
+            ?SEV_IPRINT("command ~w skip catched(~w): "
+                        "~n   Reason: ~p", [ID, C, R]),
+            exit(E);
+        C:E:S ->
+            ?SEV_EPRINT("command ~w crashed: "
+                        "~n   Class:      ~p"
+                        "~n   Error:      ~p"
+                        "~n   Call Stack: ~p", [ID, C, E, S]),
+            exit({command_crashed, ID, {C,E,S}, State})
+    end.
+
+
+%% ============================================================================
+
+-spec await_finish(Evs) -> term() when
+      Evs :: [ev()].
+
+await_finish(Evs) ->
+    await_finish(Evs, [], []).
+
+await_finish([], _, []) ->
+    ok;
+await_finish([], _OK, Fails) ->
+    ?SEV_EPRINT("Fails: "
+		"~n   ~p", [Fails]),
+    Fails;
+await_finish(Evs, OK, Fails) ->
+    receive
+        %% Successfull termination of evaluator
+        {'DOWN', _MRef, process, Pid, normal} ->
+            {Evs2, OK2, Fails2} = await_finish_normal(Pid, Evs, OK, Fails),
+            await_finish(Evs2, OK2, Fails2);
+        {'EXIT', Pid, normal} ->
+            {Evs2, OK2, Fails2} = await_finish_normal(Pid, Evs, OK, Fails),
+            await_finish(Evs2, OK2, Fails2);
+
+        %% The evaluator can skip the test case:
+        {'DOWN', _MRef, process, Pid, {skip, Reason}} ->
+            %% ?SEV_IPRINT("await_finish -> skip (down) received: "
+            %%             "~n   Pid:    ~p"
+            %%             "~n   Reason: ~p", [Pid, Reason]),
+            await_finish_skip(Pid, Reason, Evs, OK);
+        {'EXIT', Pid, {skip, Reason}} ->
+            %% ?SEV_IPRINT("await_finish -> skip (exit) received: "
+            %%             "~n   Pid:    ~p"
+            %%             "~n   Reason: ~p", [Pid, Reason]),
+            await_finish_skip(Pid, Reason, Evs, OK);
+
+        %% Evaluator failed
+        {'DOWN', _MRef, process, Pid, Reason} ->
+            %% ?SEV_IPRINT("await_finish -> fail (down) received: "
+            %%             "~n   Pid:    ~p"
+            %%             "~n   Reason: ~p", [Pid, Reason]),
+            {Evs2, OK2, Fails2} =
+                await_finish_fail(Pid, Reason, Evs, OK, Fails),
+            await_finish(Evs2, OK2, Fails2);
+        {'EXIT', Pid, Reason} ->
+            %% ?SEV_IPRINT("await_finish -> fail (exit) received: "
+            %%             "~n   Pid:    ~p"
+            %%             "~n   Reason: ~p", [Pid, Reason]),
+            {Evs2, OK2, Fails2} =
+                await_finish_fail(Pid, Reason, Evs, OK, Fails),
+            await_finish(Evs2, OK2, Fails2)
+    end.
+
+
+await_finish_normal(Pid, Evs, OK, Fails) ->
+    case lists:keysearch(Pid, #ev.pid, Evs) of
+        {value, #ev{name = Name}} ->
+            iprint("evaluator '~s' (~p) success", [Name, Pid]),
+            NewEvs = lists:keydelete(Pid, #ev.pid, Evs),
+            {NewEvs, [Pid|OK], Fails};
+        false ->
+            case lists:member(Pid, OK) of
+                true ->
+                    ok;
+                false ->
+                    iprint("unknown process ~p died (normal)", [Pid]),
+                    ok
+            end,
+            {Evs, OK, Fails}
+    end.
+
+await_finish_skip(Pid, Reason, Evs, OK) ->
+    Evs2 =
+        case lists:keysearch(Pid, #ev.pid, Evs) of
+            {value, #ev{name = Name}} ->
+                ?SEV_IPRINT("evaluator '~s' (~p) issued SKIP: "
+                            "~n   ~p", [Name, Pid, Reason]),
+                lists:keydelete(Pid, #ev.pid, Evs);
+            false ->
+                case lists:member(Pid, OK) of
+                    true ->
+                        ?SEV_IPRINT("already terminated (ok) process ~p skip"
+                                    "~n   ~p", [Pid]),
+                        ok;
+                    false ->
+                        ?SEV_IPRINT("unknown process ~p issued SKIP: "
+                                    "~n   ~p", [Pid, Reason]),
+                        iprint("unknown process ~p issued SKIP: "
+                               "~n   ~p", [Pid, Reason])
+                end,
+                Evs
+        end,
+    await_evs_terminated(Evs2),
+    ?LIB:skip(Reason).
+
+await_evs_terminated(Evs) ->
+    Instructions =
+        [
+         %% Just wait for the evaluators to die on their own
+         {fun() -> ?SEV_IPRINT("await (no action) evs termination") end,
+          fun(_) -> ok end},
+
+         %% Send them a skip message, causing the evaluators to
+         %% die with a skip reason.
+         {fun() -> ?SEV_IPRINT("await (send skip message) evs termination") end,
+          fun(#ev{pid = Pid}) -> Pid ! skip end},
+
+         %% And if nothing else works, try to kill the remaining evaluators
+         {fun() -> ?SEV_IPRINT("await (issue exit kill) evs termination") end,
+          fun(#ev{pid = Pid}) -> exit(Pid, kill) end}],
+
+    await_evs_terminated(Evs, Instructions).
+
+await_evs_terminated([], _) ->
+    ok;
+await_evs_terminated(Evs, []) ->
+    {error, {failed_terminated, [P||#ev{pid=P} <- Evs]}};
+await_evs_terminated(Evs, [{Inform, Command}|Instructions]) ->
+    Inform(),
+    lists:foreach(Command, Evs),
+    RemEvs = await_evs_termination(Evs),
+    await_evs_terminated(RemEvs, Instructions).
+
+await_evs_termination(Evs) ->
+    await_evs_termination(Evs, 2000).
+
+await_evs_termination([], _Timeout) ->
+    [];
+await_evs_termination(Evs, Timeout) ->
+    T = t(),
+    receive
+        {'DOWN', _MRef, process, Pid, _Reason} ->
+            %% ?SEV_IPRINT("await_evs_termination -> DOWN: "
+            %%             "~n   Pid:    ~p"
+            %%             "~n   Reason: ~p", [Pid, Reason]),
+            Evs2 = lists:keydelete(Pid, #ev.pid, Evs),
+            await_evs_termination(Evs2, tdiff(T, t()));
+        {'EXIT', Pid, _Reason} ->
+            %% ?SEV_IPRINT("await_evs_termination -> EXIT: "
+            %%             "~n   Pid:    ~p"
+            %%             "~n   Reason: ~p", [Pid, Reason]),
+            Evs2 = lists:keydelete(Pid, #ev.pid, Evs),
+            await_evs_termination(Evs2, tdiff(T, t()))
+
+    after Timeout ->
+            Evs
+    end.
+
+        
+await_finish_fail(Pid, Reason, Evs, OK, Fails) ->
+    case lists:keysearch(Pid, #ev.pid, Evs) of
+        {value, #ev{name = Name}} ->
+            iprint("evaluator '~s' (~p) failed", [Name, Pid]),
+            NewEvs = lists:keydelete(Pid, #ev.pid, Evs),
+            {NewEvs, OK, [{Pid, Reason}|Fails]};
+        false ->
+            case lists:member(Pid, OK) of
+                true ->
+                    ok;
+                false ->
+                    iprint("unknown process ~p died: "
+                           "~n   ~p", [Pid, Reason])
+            end,
+            {Evs, OK, Fails}
+    end.
+
+
+
+%% ============================================================================
+
+-spec announce_start(To) -> ok when
+      To :: pid().
+
+announce_start(To) ->
+    announce(To, ?ANNOUNCEMENT_START, ?START_SLOGAN).
+
+-spec announce_start(To, Extra) -> ok when
+      To    :: pid(),
+      Extra :: term().
+
+announce_start(To, Extra) ->
+    announce(To, ?ANNOUNCEMENT_START, ?START_SLOGAN, Extra).
+
+
+%% ============================================================================
+
+-spec announce_continue(To, Slogan) -> ok when
+      To     :: pid(),
+      Slogan :: atom().
+
+announce_continue(To, Slogan) ->
+    announce_continue(To, Slogan, ?EXTRA_NOTHING).
+
+-spec announce_continue(To, Slogan, Extra) -> ok when
+      To     :: pid(),
+      Slogan :: atom(),
+      Extra  :: term().
+
+announce_continue(To, Slogan, Extra) ->
+    announce(To, ?ANNOUNCEMENT_CONTINUE, Slogan, Extra).
+
+
+%% ============================================================================
+
+-spec announce_ready(To, Slogan) -> ok when
+      To     :: pid(),
+      Slogan :: atom().
+
+announce_ready(To, Slogan) ->
+    announce_ready(To, Slogan, ?EXTRA_NOTHING).
+
+-spec announce_ready(To, Slogan, Extra) -> ok when
+      To     :: pid(),
+      Slogan :: atom(),
+      Extra  :: term().
+
+announce_ready(To, Slogan, Extra) ->
+    announce(To, ?ANNOUNCEMENT_READY, Slogan, Extra).
+
+
+%% ============================================================================
+
+-spec announce_terminate(To) -> ok when
+      To     :: pid().
+
+announce_terminate(To) ->
+    announce(To, ?ANNOUNCEMENT_TERMINATE, ?TERMINATE_SLOGAN).
+
+
+%% ============================================================================
+
+-spec announce(To, Announcement, Slogan) -> ok when
+      To           :: pid(),
+      Announcement :: atom(),
+      Slogan       :: atom().
+
+announce(To, Announcement, Slogan) ->
+    announce(To, Announcement, Slogan, ?EXTRA_NOTHING).
+
+-spec announce(To, Announcement, Slogan, Extra) -> ok when
+      To           :: pid(),
+      Announcement :: atom(),
+      Slogan       :: atom(),
+      Extra        :: term().
+
+announce(To, Announcement, Slogan, Extra) 
+  when is_pid(To) andalso 
+       is_atom(Announcement) andalso  
+       is_atom(Slogan) ->
+    %% iprint("announce -> entry with: "
+    %%        "~n   To:           ~p"
+    %%        "~n   Announcement: ~p"
+    %%        "~n   Slogan:       ~p"
+    %%        "~n   Extra:        ~p", 
+    %%        [To, Announcement, Slogan, Extra]),
+    To ! {Announcement, self(), Slogan, Extra},
+    ok.
+
+
+
+%% ============================================================================
+
+-spec await_start() -> Pid | {Pid, Extra} when
+      Pid   :: pid(),
+      Extra :: term().
+
+await_start() ->
+    await_start(any).
+
+-spec await_start(Pid) -> Pid | {Pid, Extra} when
+      Pid   :: pid(),
+      Extra :: term().
+
+await_start(P) when is_pid(P) orelse (P =:= any) ->
+    case await(P, ?START_NAME_NONE, ?ANNOUNCEMENT_START, ?START_SLOGAN, []) of
+        {ok, Any} when is_pid(P) ->
+            Any;
+        {ok, Pid} when is_pid(Pid) andalso (P =:= any) ->
+            Pid;
+        {ok, {Pid, _} = OK} when is_pid(Pid) andalso (P =:= any) ->
+            OK
+    end.
+
+
+%% ============================================================================
+
+-spec await_continue(From, Name, Slogan) -> ok | {ok, Extra} | {error, Reason} when 
+      From   :: pid(),
+      Name   :: atom(),
+      Slogan :: atom(),
+      Extra  :: term(),
+      Reason :: term().
+
+await_continue(From, Name, Slogan) ->
+    await_continue(From, Name, Slogan, []).
+
+-spec await_continue(From, Name, Slogan, OtherPids) -> 
+                         ok | {ok, Extra} | {error, Reason} when 
+      From      :: pid(),
+      Name      :: atom(),
+      Slogan    :: atom(),
+      OtherPids :: [{pid(), atom()}],
+      Extra     :: term(),
+      Reason    :: term().
+
+await_continue(From, Name, Slogan, OtherPids) 
+  when is_pid(From) andalso
+       is_atom(Name) andalso
+       is_atom(Slogan) andalso
+       is_list(OtherPids) ->
+    await(From, Name, ?ANNOUNCEMENT_CONTINUE, Slogan, OtherPids).
+
+
+
+%% ============================================================================
+
+-spec await_ready(From, Name, Slogan) -> ok | {ok, Extra} | {error, Reason} when 
+      From   :: pid(),
+      Name   :: atom(),
+      Slogan :: atom(),
+      Extra  :: term(),
+      Reason :: term().
+
+await_ready(From, Name, Slogan) ->
+    await_ready(From, Name, Slogan, []).
+
+-spec await_ready(From, Name, Slogan, OtherPids) -> 
+                         ok | {ok, Extra} | {error, Reason} when 
+      From      :: pid(),
+      Name      :: atom(),
+      Slogan    :: atom(),
+      OtherPids :: [{pid(), atom()}],
+      Extra     :: term(),
+      Reason    :: term().
+
+await_ready(From, Name, Slogan, OtherPids) 
+  when is_pid(From) andalso
+       is_atom(Name) andalso
+       is_atom(Slogan) andalso
+       is_list(OtherPids) ->
+    await(From, Name, ?ANNOUNCEMENT_READY, Slogan, OtherPids).
+
+
+
+%% ============================================================================
+
+-spec await_terminate(Pid, Name) -> ok | {error, Reason} when
+      Pid    :: pid(),
+      Name   :: atom(),
+      Reason :: term().
+
+await_terminate(Pid, Name) when is_pid(Pid) andalso is_atom(Name) ->
+    await_terminate(Pid, Name, []).
+
+-spec await_terminate(Pid, Name, OtherPids) -> ok | {error, Reason} when
+      Pid       :: pid(),
+      Name      :: atom(),
+      OtherPids :: [{pid(), atom()}],
+      Reason    :: term().
+
+await_terminate(Pid, Name, OtherPids) ->
+    await(Pid, Name, ?ANNOUNCEMENT_TERMINATE, ?TERMINATE_SLOGAN, OtherPids).
+
+
+%% ============================================================================
+
+-spec await_termination(Pid) -> ok | {error, Reason} when
+      Pid    :: pid(),
+      Reason :: term().
+
+await_termination(Pid) when is_pid(Pid) ->
+    await_termination(Pid, any).
+
+-spec await_termination(Pid, ExpReason) -> ok | {error, Reason} when
+      Pid       :: pid(),
+      ExpReason :: term(),
+      Reason    :: term().
+
+await_termination(Pid, ExpReason) ->
+    receive
+        {'DOWN', _, process, Pid, _} when (ExpReason =:= any) ->
+            ok;
+        {'DOWN', _, process, Pid, Reason} when (ExpReason =:= Reason) ->
+            ok;
+        {'DOWN', _, process, Pid, Reason} ->
+            {error, {unexpected_reason, ExpReason, Reason}}
+    end.
+
+
+%% ============================================================================
+
+%% We expect a message (announcement) from Pid, but we also watch for DOWN from 
+%% both Pid and OtherPids, in which case the test has failed!
+
+-spec await(ExpPid, Name, Announcement, Slogan, OtherPids) -> 
+                   ok | {ok, Extra} | {error, Reason} when
+      ExpPid       :: any | pid(),
+      Name         :: atom(),
+      Announcement :: atom(),
+      Slogan       :: atom(),
+      OtherPids    :: [{pid(), atom()}],
+      Extra        :: term(),
+      Reason       :: term().
+
+await(ExpPid, Name, Announcement, Slogan, OtherPids) 
+  when (is_pid(ExpPid) orelse (ExpPid =:= any)) andalso 
+       is_atom(Name) andalso 
+       is_atom(Announcement) andalso 
+       is_atom(Slogan) andalso 
+       is_list(OtherPids) ->
+    receive
+        skip ->
+            %% This means that another evaluator has issued a skip,
+            %% and we have been instructed to terminate as a result.
+            ?LIB:skip(command);
+        {Announcement, Pid, Slogan, ?EXTRA_NOTHING} when (ExpPid =:= any) ->
+            {ok, Pid};
+        {Announcement, Pid, Slogan, Extra} when (ExpPid =:= any) ->
+            {ok, {Pid, Extra}};
+        {Announcement, Pid, Slogan, ?EXTRA_NOTHING} when (Pid =:= ExpPid) ->
+            ok;
+        {Announcement, Pid, Slogan, Extra} when (Pid =:= ExpPid) ->
+            {ok, Extra};
+        {'DOWN', _, process, Pid, {skip, SkipReason}} when (Pid =:= ExpPid) ->
+            iprint("Unexpected SKIP from ~w (~p): "
+                   "~n   ~p", [Name, Pid, SkipReason]),
+            ?LIB:skip({Name, SkipReason});
+        {'DOWN', _, process, Pid, Reason} when (Pid =:= ExpPid) ->
+            eprint("Unexpected DOWN from ~w (~p): "
+                   "~n   ~p", [Name, Pid, Reason]),
+            {error, {unexpected_exit, Name, Reason}};
+        {'DOWN', _, process, OtherPid, Reason} ->
+            case check_down(OtherPid, Reason, OtherPids) of
+                ok ->
+                    iprint("DOWN from unknown process ~p: "
+                           "~n      ~p"
+                           "~n   when"
+                           "~n      OtherPids: "
+                           "~n         ~p", [OtherPid, Reason, OtherPids]),
+                    await(ExpPid, Name, Announcement, Slogan, OtherPids);
+                {error, _} = ERROR ->
+                    ERROR
+            end
+    after infinity -> % For easy debugging, just change to some valid time (5000)
+            iprint("await -> timeout for msg from ~p (~w): "
+                   "~n   Announcement: ~p"
+                   "~n   Slogan:       ~p"
+                   "~nwhen"
+                   "~n   Messages:     ~p", 
+                   [ExpPid, Name, Announcement, Slogan, pi(messages)]),
+            await(ExpPid, Name, Announcement, Slogan, OtherPids)
+    end.
+
+pi(Item) ->
+    pi(self(), Item).
+
+pi(Pid, Item) ->
+    {Item, Info} = process_info(Pid, Item),
+    Info.
+
+check_down(Pid, DownReason, Pids) ->
+    case lists:keymember(Pid, 1, Pids) of
+        {value, {_, Name}} ->
+            eprint("Unexpected DOWN from ~w (~p): "
+                   "~n   ~p", [Name, Pid, DownReason]),
+            {error, {unexpected_exit, Name, DownReason}};
+        false ->
+            ok
+    end.
+
+
+%% ============================================================================
+
+f(F, A) ->
+    lists:flatten(io_lib:format(F, A)).
+
+
+iprint(F, A) ->
+    print("", F, A).
+
+eprint(F, A) ->
+    print("<ERROR> ", F, A).
+
+print(Prefix, F, A) ->
+    %% The two prints is to get the output both in the shell (for when
+    %% "personal" testing is going on) and in the logs.
+    IDStr = 
+        case get(sname) of
+            undefined ->
+                %% This means its not an evaluator, 
+                %% or a named process. Instead its 
+                %% most likely the test case itself, 
+                %% so skip the name and the pid.
+                "";
+            SName ->
+                f("[~s][~p]", [SName, self()])
+        end,
+    ?LOGGER:format("[~s]~s ~s" ++ F,
+                   [?LIB:formated_timestamp(), IDStr, Prefix | A]).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+t() ->
+    os:timestamp().
+
+
+tdiff({A1, B1, C1} = _T1x, {A2, B2, C2} = _T2x) ->
+    T1 = A1*1000000000+B1*1000+(C1 div 1000), 
+    T2 = A2*1000000000+B2*1000+(C2 div 1000), 
+    T2 - T1.
+
diff --git a/erts/emulator/test/socket_test_evaluator.hrl b/erts/emulator/test/socket_test_evaluator.hrl
new file mode 100644
index 0000000000..5be49dc022
--- /dev/null
+++ b/erts/emulator/test/socket_test_evaluator.hrl
@@ -0,0 +1,68 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2018-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%
+%%
+
+-ifndef(socket_test_evaluator).
+-define(socket_test_evaluator, true).
+
+-record(ev, {name :: string(),
+             pid  :: pid(),
+             mref :: reference()}).
+
+-define(SEV,                              socket_test_evaluator).
+
+-define(SEV_START(N, S, IS),              ?SEV:start(N, S, IS)).
+-define(SEV_AWAIT_FINISH(Evs),            ?SEV:await_finish(Evs)).
+
+-define(SEV_ANNOUNCE_START(To),           ?SEV:announce_start(To)).
+-define(SEV_ANNOUNCE_START(To, Ex),       ?SEV:announce_start(To, Ex)).
+-define(SEV_ANNOUNCE_CONTINUE(To, S),     ?SEV:announce_continue(To, S)).
+-define(SEV_ANNOUNCE_CONTINUE(To, S, Ex), ?SEV:announce_continue(To, S, Ex)).
+-define(SEV_ANNOUNCE_READY(To, S),        ?SEV:announce_ready(To, S)).
+-define(SEV_ANNOUNCE_READY(To, S, Ex),    ?SEV:announce_ready(To, S, Ex)).
+-define(SEV_ANNOUNCE_TERMINATE(To),       ?SEV:announce_terminate(To)).
+
+-define(SEV_AWAIT_START(),                ?SEV:await_start()).
+-define(SEV_AWAIT_START(P),               ?SEV:await_start(P)).
+-define(SEV_AWAIT_CONTINUE(F, N, S),      ?SEV:await_continue(F, N, S)).
+-define(SEV_AWAIT_CONTINUE(F, N, S, Ps),  ?SEV:await_continue(F, N, S, Ps)).
+-define(SEV_AWAIT_READY(F, N, S),         ?SEV:await_ready(F, N, S)).
+-define(SEV_AWAIT_READY(F, N, S, Ps),     ?SEV:await_ready(F, N, S, Ps)).
+-define(SEV_AWAIT_TERMINATE(F, N),        ?SEV:await_terminate(F, N)).
+-define(SEV_AWAIT_TERMINATE(F, N, Ps),    ?SEV:await_terminate(F, N, Ps)).
+-define(SEV_AWAIT_TERMINATION(P),         ?SEV:await_termination(P)).
+-define(SEV_AWAIT_TERMINATION(P, R),      ?SEV:await_termination(P, R)).
+
+-define(SEV_IPRINT(F, A),                 ?SEV:iprint(F, A)).
+-define(SEV_IPRINT(F),                    ?SEV_IPRINT(F, [])).
+-define(SEV_EPRINT(F, A),                 ?SEV:eprint(F, A)).
+-define(SEV_EPRINT(F),                    ?SEV_EPRINT(F, [])).
+
+-define(SEV_SLEEP(T), #{desc => "sleep",
+                        cmd  => fun(_) ->
+                                        ?SLEEP(T),
+                                        ok
+                                end}).
+-define(SEV_FINISH_NORMAL, #{desc => "finish",
+                             cmd  => fun(_) ->
+                                             {ok, normal}
+                                     end}).
+
+-endif. % -ifdef(socket_test_evaluator).
+
diff --git a/erts/emulator/test/socket_test_lib.erl b/erts/emulator/test/socket_test_lib.erl
new file mode 100644
index 0000000000..39cbf0c79f
--- /dev/null
+++ b/erts/emulator/test/socket_test_lib.erl
@@ -0,0 +1,299 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2018-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(socket_test_lib).
+
+-export([
+         pi/1, pi/2, pi/3,
+
+         %% Time stuff
+         timestamp/0,
+         tdiff/2,
+         formated_timestamp/0,
+         format_timestamp/1,
+
+         %% String and format
+         f/2,
+
+         %% Generic 'has support' test function(s)
+         has_support_ipv6/0,
+
+         which_local_host_info/1,
+         which_local_addr/1,
+
+         %% Skipping
+         not_yet_implemented/0,
+         skip/1
+        ]).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-define(FAIL(R), exit(R)).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+pi(Item) when is_atom(Item) ->
+    pi(self(), Item).
+
+pi(Pid, Item) when is_pid(Pid) andalso is_atom(Item) ->
+    {Item, Info} = process_info(Pid, Item),
+    Info;
+pi(Node, Pid) when is_pid(Pid) ->
+    rpc:call(Node, erlang, process_info, [Pid]).
+
+pi(Node, Pid, Item) when is_pid(Pid) andalso is_atom(Item) ->
+    rpc:call(Node, erlang, process_info, [Pid, Item]).
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+timestamp() ->
+    os:timestamp().
+
+
+tdiff({A1, B1, C1} = _T1x, {A2, B2, C2} = _T2x) ->
+    T1 = A1*1000000000+B1*1000+(C1 div 1000), 
+    T2 = A2*1000000000+B2*1000+(C2 div 1000), 
+    T2 - T1.
+
+
+formated_timestamp() ->
+    format_timestamp(os:timestamp()).
+
+format_timestamp({_N1, _N2, _N3} = TS) ->
+    {_Date, Time}   = calendar:now_to_local_time(TS),
+    %% {YYYY,MM,DD}   = Date,
+    {Hour,Min,Sec} = Time,
+    %% FormatTS = 
+    %%     io_lib:format("~.4w-~.2.0w-~.2.0w ~.2.0w:~.2.0w:~.2.0w.~w",
+    %%                   [YYYY, MM, DD, Hour, Min, Sec, N3]),  
+    FormatTS = io_lib:format("~.2.0w:~.2.0w:~.2.0w", [Hour, Min, Sec]),  
+    lists:flatten(FormatTS).
+
+   
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+f(F, A) ->
+    lists:flatten(io_lib:format(F, A)).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+has_support_ipv6() ->
+    case socket:supports(ipv6) of
+        true ->
+            ok;
+        false ->
+            skip("IPv6 Not Supported")
+    end,
+    Domain = inet6,
+    LocalAddr =
+        case which_local_addr(Domain) of
+            {ok, Addr} ->
+                Addr;
+            {error, R1} ->
+                skip(f("Local Address eval failed: ~p", [R1]))
+        end,
+    ServerSock =
+        case socket:open(Domain, dgram, udp) of
+            {ok, SS} ->
+                SS;
+            {error, R2} ->
+                skip(f("(server) socket open failed: ~p", [R2]))
+        end,
+    LocalSA = #{family => Domain, addr => LocalAddr},
+    ServerPort =
+        case socket:bind(ServerSock, LocalSA) of
+            {ok, P1} ->
+                P1;
+            {error, R3} ->
+                socket:close(ServerSock),
+                skip(f("(server) socket bind failed: ~p", [R3]))
+        end,
+    ServerSA = LocalSA#{port => ServerPort},
+    ClientSock =
+        case socket:open(Domain, dgram, udp) of
+            {ok, CS} ->
+                CS;
+            {error, R4} ->
+                skip(f("(client) socket open failed: ~p", [R4]))
+        end,
+    case socket:bind(ClientSock, LocalSA) of
+        {ok, _} ->
+            ok;
+        {error, R5} ->
+            socket:close(ServerSock),
+            socket:close(ClientSock),
+            skip(f("(client) socket bind failed: ~p", [R5]))
+    end,
+    case socket:sendto(ClientSock, <<"hejsan">>, ServerSA) of
+        ok ->
+            ok;
+        {error, R6} ->
+            socket:close(ServerSock),
+            socket:close(ClientSock),
+            skip(f("failed socket sendto test: ~p", [R6]))
+    end,
+    case socket:recvfrom(ServerSock) of
+        {ok, {_, <<"hejsan">>}} ->
+            socket:close(ServerSock),
+            socket:close(ClientSock),
+            ok;
+        {error, R7} ->
+            socket:close(ServerSock),
+            socket:close(ClientSock),
+            skip(f("failed socket recvfrom test: ~p", [R7]))
+   end.
+            
+            
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% This gets the local address (not {127, _} or {0, ...} or {16#fe80, ...})
+%% We should really implement this using the (new) net module,
+%% but until that gets the necessary functionality...
+which_local_addr(Domain) ->
+    case which_local_host_info(Domain) of
+        {ok, #{addr := Addr}} ->
+            {ok, Addr};
+        {error, _Reason} = ERROR ->
+            ERROR
+    end.
+    
+
+%% Returns the interface (name), flags and address (not 127...)
+%% of the local host.
+which_local_host_info(Domain) ->
+    case inet:getifaddrs() of
+        {ok, IFL} ->
+            which_local_host_info(Domain, IFL);
+        {error, _} = ERROR ->
+            ERROR
+    end.
+
+which_local_host_info(_Domain, []) ->
+    {error, no_address};
+which_local_host_info(Domain, [{"lo" ++ _, _}|IFL]) ->
+    which_local_host_info(Domain, IFL);
+which_local_host_info(Domain, [{"docker" ++ _, _}|IFL]) ->
+    which_local_host_info(Domain, IFL);
+which_local_host_info(Domain, [{"br-" ++ _, _}|IFL]) ->
+    which_local_host_info(Domain, IFL);
+which_local_host_info(Domain, [{Name, IFO}|IFL]) ->
+    try which_local_host_info2(Domain, IFO) of
+        Info ->
+            {ok, Info#{name => Name}}
+    catch
+        throw:_:_ ->
+            which_local_host_info(Domain, IFL)
+    end;
+which_local_host_info(Domain, [_|IFL]) ->
+    which_local_host_info(Domain, IFL).
+
+%% which_local_host_info2(Domain, IFO) ->
+%%     case lists:keysearch(flags, 1, IFO) of
+%%         {value, {flags, Flags}} ->
+%%             which_local_host_info2(Domain, IFO, Flags);
+%%         false ->
+%%             {error, no_flags}
+%%     end.
+
+
+%% which_local_host_info2(_Domain, [], _Flags) ->
+%%     {error, no_address};
+%% which_local_host_info2(inet = _Domain, [{addr, Addr}|_IFO], Flags)
+%%   when (size(Addr) =:= 4) andalso (element(1, Addr) =/= 127) ->
+%%     {ok, {Flags, Addr}};
+%% which_local_host_info2(inet6 = _Domain, [{addr, Addr}|_IFO], Flags)
+%%   when (size(Addr) =:= 8) andalso 
+%%        (element(1, Addr) =/= 0) andalso
+%%        (element(1, Addr) =/= 16#fe80) ->
+%%     {ok, {Flags, Addr}};
+%% which_local_host_info2(Domain, [_|IFO], Flags) ->
+%%     which_local_host_info2(Domain, IFO, Flags).
+
+%% foo(Info, inet = Domain, IFO) ->
+%%     foo(Info, Domain, IFO, [flags, addr, netmask, broadaddr, hwaddr]);
+%% foo(Info, inet6 = Domain, IFO) ->
+%%     foo(Info, Domain, IFO, [flags, addr, netmask, hwaddr]).
+
+which_local_host_info2(inet = _Domain, IFO) ->
+    Addr      = which_local_host_info3(addr,  IFO,
+                                       fun({A, _, _, _}) when (A =/= 127) -> true;
+                                          (_) -> false
+                                       end),
+    NetMask   = which_local_host_info3(netmask,  IFO,
+                                       fun({_, _, _, _}) -> true;
+                                          (_) -> false
+                                       end),
+    BroadAddr = which_local_host_info3(broadaddr,  IFO,
+                                       fun({_, _, _, _}) -> true;
+                                          (_) -> false
+                                       end),
+    Flags     = which_local_host_info3(flags, IFO, fun(_) -> true end),
+    #{flags     => Flags,
+      addr      => Addr,
+      broadaddr => BroadAddr,
+      netmask   => NetMask};
+which_local_host_info2(inet6 = _Domain, IFO) ->
+    Addr    = which_local_host_info3(addr,  IFO,
+                                     fun({A, _, _, _, _, _, _, _}) 
+                                           when (A =/= 0) andalso 
+                                                (A =/= 16#fe80) -> true;
+                                        (_) -> false
+                                     end),
+    NetMask = which_local_host_info3(netmask,  IFO,
+                                       fun({_, _, _, _, _, _, _, _}) -> true;
+                                          (_) -> false
+                                       end),
+    Flags   = which_local_host_info3(flags, IFO, fun(_) -> true end),
+    #{flags   => Flags,
+      addr    => Addr,
+      netmask => NetMask}.
+
+which_local_host_info3(_Key, [], _) ->
+    throw({error, no_address});
+which_local_host_info3(Key, [{Key, Val}|IFO], Check) ->
+    case Check(Val) of
+        true ->
+            Val;
+        false ->
+            which_local_host_info3(Key, IFO, Check)
+    end;
+which_local_host_info3(Key, [_|IFO], Check) ->
+    which_local_host_info3(Key, IFO, Check).
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+not_yet_implemented() ->
+    skip("not yet implemented").
+
+skip(Reason) ->
+    throw({skip, Reason}).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/erts/emulator/test/socket_test_logger.erl b/erts/emulator/test/socket_test_logger.erl
new file mode 100644
index 0000000000..f5d4c8c7b2
--- /dev/null
+++ b/erts/emulator/test/socket_test_logger.erl
@@ -0,0 +1,118 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018-2019. 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(socket_test_logger).
+
+-export([
+         start/0, start/1,
+         stop/0,
+         format/2
+        ]).
+
+
+-define(QUIET,  true).
+-define(LIB,    socket_test_lib).
+-define(LOGGER, ?MODULE).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+start() ->
+    start(?QUIET).
+
+start(Quiet) ->
+    case global:whereis_name(?LOGGER) of
+        Pid when is_pid(Pid) ->
+            ok;
+        undefined ->
+            Self = self(),
+            Pid = spawn(fun() -> init(Self, Quiet) end),
+            yes = global:register_name(?LOGGER, Pid),
+            ok
+    end.
+
+
+stop() ->
+    case global:whereis_name(?LOGGER) of
+        undefined ->
+            ok;
+        Pid when is_pid(Pid) ->
+            global:unregister_name(?LOGGER),
+            Pid ! {?LOGGER, '$logger', stop},
+            ok
+    end.
+
+
+format(F, []) ->
+    do_format(F);
+format(F, A) ->
+    do_format(?LIB:f(F, A)).
+
+do_format(Msg) ->
+    case global:whereis_name(?LOGGER) of
+        undefined ->
+            ok;
+        Pid when is_pid(Pid) ->
+            Pid ! {?MODULE, '$logger', {msg, Msg}},
+            ok
+    end.
+
+init(Parent, Quiet) ->
+    put(sname, "logger"),
+    print("[~s][logger] starting~n", [?LIB:formated_timestamp()]),
+    loop(#{parent => Parent, quiet => Quiet}).
+
+loop(#{parent := Parent,
+       quiet  := Quiet} = State) ->
+    receive
+        {'EXIT', Parent, _} ->
+            print("[~s][logger] parent exit~n", [?LIB:formated_timestamp()]),
+            exit(normal);
+
+        {?MODULE, '$logger', stop} ->
+            print("[~s][logger] stopping~n", [?LIB:formated_timestamp()]),
+            exit(normal);
+
+        {?MODULE, '$logger', {msg, Msg}} ->
+            print_str(Quiet, Msg),
+            loop(State)
+    end.
+
+
+print(F, A) ->
+    print_str(false, ?LIB:f(F, A)).
+
+print_str(Quiet, Str) ->
+    try
+        begin
+            if (Quiet =/= true) -> io:format(user, Str ++ "~n", []);
+               true             -> ok
+            end,
+            io:format(Str, [])
+        end
+    catch
+        _:_:_ ->
+            io:format(user,
+                      "~nFailed Format message:"
+                      "~n~p~n", [Str]),
+            io:format("~nFailed Format message:"
+                      "~n~p~n", [Str])
+    end.
+            
diff --git a/lib/otp_mibs/src/otp_mibs.appup.src b/erts/emulator/test/socket_test_ttest.hrl
index 9437ae2222..1a004a9a7a 100644
--- a/lib/otp_mibs/src/otp_mibs.appup.src
+++ b/erts/emulator/test/socket_test_ttest.hrl
@@ -1,7 +1,7 @@
-%% -*- erlang -*-
+%%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2018-2018. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -16,7 +16,17 @@
 %% limitations under the License.
 %% 
 %% %CopyrightEnd%
-{"%VSN%",
- [{<<".*">>,[{restart_application, otp_mibs}]}],
- [{<<".*">>,[{restart_application, otp_mibs}]}]
-}.
+%%
+
+-ifndef(socket_test_ttest).
+-define(socket_test_ttest, true).
+
+-define(TTEST_TAG,          42).
+-define(TTEST_TYPE_REQUEST, 101).
+-define(TTEST_TYPE_REPLY,   102).
+
+-define(SECS(I), timer:seconds(I)).
+
+-define(SLEEP(T), receive after T -> ok end).
+
+-endif. % -ifdef(socket_test_ttest).
diff --git a/erts/emulator/test/socket_test_ttest_client.hrl b/erts/emulator/test/socket_test_ttest_client.hrl
new file mode 100644
index 0000000000..84e736cc34
--- /dev/null
+++ b/erts/emulator/test/socket_test_ttest_client.hrl
@@ -0,0 +1,141 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2018-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%
+%%
+
+-ifndef(socket_test_ttest_client).
+-define(socket_test_ttest_client, true).
+
+-define(MSG_ID_DEFAULT,  2).
+-define(RUNTIME_DEFAULT, ?SECS(10)).
+-define(MAX_ID,          16#FFFFFFFF).
+
+-define(MSG_DATA1, <<"This is test data 0123456789 0123456789 0123456789">>).
+-define(MSG_DATA2, <<"This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789">>).
+-define(MSG_DATA3, <<"This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+		     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+		     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+		     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+		     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+		     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+		     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+		     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+		     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+		     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789"
+                     "This is test data 0123456789 0123456789 0123456789">>).
+
+
+-endif. % -ifdef(socket_test_ttest_client).
diff --git a/erts/emulator/test/socket_test_ttest_lib.erl b/erts/emulator/test/socket_test_ttest_lib.erl
new file mode 100644
index 0000000000..7fc13df46a
--- /dev/null
+++ b/erts/emulator/test/socket_test_ttest_lib.erl
@@ -0,0 +1,127 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2018-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(socket_test_ttest_lib).
+
+-compile({no_auto_import, [error/2]}).
+
+-export([
+         t/0, tdiff/2,
+         formated_timestamp/0, format_timestamp/1,
+         format_time/1,
+
+         formated_process_stats/1, formated_process_stats/2,
+
+         format/2,
+         error/1, error/2,
+         info/1, info/2
+        ]).
+
+%% ==========================================================================
+
+t() ->
+    os:timestamp().
+
+tdiff({A1, B1, C1} = _T1x, {A2, B2, C2} = _T2x) ->
+    T1 = A1*1000000000+B1*1000+(C1 div 1000), 
+    T2 = A2*1000000000+B2*1000+(C2 div 1000), 
+    T2 - T1.
+
+formated_timestamp() ->
+    format_timestamp(os:timestamp()).
+
+format_timestamp({_N1, _N2, N3} = TS) ->
+    {_Date, Time}  = calendar:now_to_local_time(TS),
+    {Hour,Min,Sec} = Time,
+    FormatTS = io_lib:format("~.2.0w:~.2.0w:~.2.0w.4~w",
+                             [Hour, Min, Sec, round(N3/1000)]),  
+    lists:flatten(FormatTS).
+
+%% Time is always in number os ms (milli seconds)
+%% At some point, we should convert this to a more readable format...
+format_time(T) when (T < 1000) ->
+    format("~w ms", [T]);
+format_time(T) ->
+    format("~w sec (~w ms)", [T div 1000, T]).
+
+
+formated_process_stats(Pid) ->
+    formated_process_stats("", Pid).
+
+formated_process_stats(Prefix, Pid) when is_list(Prefix) andalso is_pid(Pid) ->
+    try
+        begin
+            TotHeapSz = pi(Pid, total_heap_size),
+            HeapSz    = pi(Pid, heap_size),
+            StackSz   = pi(Pid, stack_size),
+            Reds      = pi(Pid, reductions),
+            GCInfo    = pi(Pid, garbage_collection),
+            MinBinVHeapSz = proplists:get_value(min_bin_vheap_size, GCInfo),
+            MinHeapSz     = proplists:get_value(min_heap_size,      GCInfo),
+            MinGCS        = proplists:get_value(minor_gcs,          GCInfo),
+            format("~n   ~sTotal Heap Size:         ~p"
+                   "~n   ~sHeap Size:               ~p"
+                   "~n   ~sStack Size:              ~p"
+                   "~n   ~sReductions:              ~p"
+                   "~n   ~s[GC] Min Bin VHeap Size: ~p"
+                   "~n   ~s[GC] Min Heap Size:      ~p"
+                   "~n   ~s[GC] Minor GCS:          ~p",
+                   [Prefix, TotHeapSz,
+                    Prefix, HeapSz,
+                    Prefix, StackSz,
+                    Prefix, Reds,
+                    Prefix, MinBinVHeapSz,
+                    Prefix, MinHeapSz,
+                    Prefix, MinGCS])
+        end
+    catch
+        _:_:_ ->
+            ""
+    end.
+
+
+pi(Pid, Item) ->
+    {Item, Info} = process_info(Pid, Item),
+    Info.
+
+
+
+%% ==========================================================================
+
+format(F, A) ->
+    lists:flatten(io_lib:format(F, A)).
+
+error(F) ->
+    error(F, []).
+
+error(F, A) ->
+    print(get(sname), "<ERROR> " ++ F, A).
+
+info(F) ->
+    info(F, []).
+
+info(F, A) ->
+    print(get(sname), "<INFO> " ++ F, A).
+
+print(undefined, F, A) ->
+    print("- ", F, A);
+print(Prefix, F, A) ->
+    io:format("[~s, ~s] " ++ F ++ "~n", [formated_timestamp(), Prefix |A]).
+
diff --git a/erts/emulator/test/socket_test_ttest_tcp_client.erl b/erts/emulator/test/socket_test_ttest_tcp_client.erl
new file mode 100644
index 0000000000..f28819ca69
--- /dev/null
+++ b/erts/emulator/test/socket_test_ttest_tcp_client.erl
@@ -0,0 +1,687 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2018-2019. 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 the "simple" client using gen_tcp. The client is supposed to be
+%% as simple as possible in order to incur as little overhead as possible.
+%%
+%% There are three ways to run the client: active, passive or active-once.
+%%
+%% The client is the entity that controls the test, timing and counting.
+%%
+%% ==========================================================================
+%%
+%% Before the actual test starts, the client performs a "warmup".
+%% The warmup has two functions. First, to ensure that everything is "loaded"
+%% and, second, to calculate an approximate roundtrip time, in order to
+%% "know" how many iterations we should make (to run for the expected time).
+%% This is not intended to be exact, but just to ensure that all tests take
+%% approx the same time to run.
+%%
+%% ==========================================================================
+
+-module(socket_test_ttest_tcp_client).
+
+-export([
+         %% These are for the test suite
+         start_monitor/5, start_monitor/6, start_monitor/8,
+
+         %% These are for starting in a shell when run "manually"
+         start/3, start/4, start/6, start/7,
+         stop/1
+        ]).
+
+%% Internal exports
+-export([
+         do_start/9
+        ]).
+
+-include_lib("kernel/include/inet.hrl").
+-include("socket_test_ttest.hrl").
+-include("socket_test_ttest_client.hrl").
+
+-define(RECV_TIMEOUT,              10000).
+-define(MAX_OUTSTANDING_DEFAULT_1, 100).
+-define(MAX_OUTSTANDING_DEFAULT_2, 10).
+-define(MAX_OUTSTANDING_DEFAULT_3, 3).
+
+-define(LIB,            socket_test_ttest_lib).
+-define(I(F),           ?LIB:info(F)).
+-define(I(F,A),         ?LIB:info(F, A)).
+-define(E(F,A),         ?LIB:error(F, A)).
+-define(F(F,A),         ?LIB:format(F, A)).
+-define(FORMAT_TIME(T), ?LIB:format_time(T)).
+-define(T(),            ?LIB:t()).
+-define(TDIFF(T1,T2),   ?LIB:tdiff(T1, T2)).
+
+-type active()          :: once | boolean().
+-type msg_id()          :: 1..3.
+-type max_outstanding() :: pos_integer().
+-type runtime()         :: pos_integer().
+
+
+%% ==========================================================================
+
+start_monitor(Node, Notify, Transport, ServerInfo, Active) ->
+    start_monitor(Node, Notify, Transport, ServerInfo, Active, ?MSG_ID_DEFAULT).
+
+start_monitor(Node, Notify, Transport, ServerInfo, Active, 1 = MsgID) ->
+    start_monitor(Node, Notify, Transport, ServerInfo, Active, MsgID,
+                  ?MAX_OUTSTANDING_DEFAULT_1, ?RUNTIME_DEFAULT);
+start_monitor(Node, Notify, Transport, ServerInfo, Active, 2 = MsgID) ->
+    start_monitor(Node, Notify, Transport, ServerInfo, Active, MsgID,
+                  ?MAX_OUTSTANDING_DEFAULT_2, ?RUNTIME_DEFAULT);
+start_monitor(Node, Notify, Transport, ServerInfo, Active, 3 = MsgID) ->
+    start_monitor(Node, Notify, Transport, ServerInfo, Active, MsgID,
+                  ?MAX_OUTSTANDING_DEFAULT_3, ?RUNTIME_DEFAULT).
+
+start_monitor(Node, Notify, Transport, ServerInfo, Active,
+              MsgID, MaxOutstanding, RunTime)
+  when (Node =/= node()) ->
+    Args = [false,
+	    self(), Notify,
+            Transport, ServerInfo, Active, MsgID, MaxOutstanding, RunTime],
+    case rpc:call(Node, ?MODULE, do_start, Args) of
+        {badrpc, _} = Reason ->
+            {error, Reason};
+        {ok, Pid} when is_pid(Pid) ->
+            MRef = erlang:monitor(process, Pid),
+            {ok, {Pid, MRef}};
+        {error, _} = ERROR ->
+            ERROR
+    end;
+start_monitor(_, Notify, Transport, ServerInfo, Active,
+              MsgID, MaxOutstanding, RunTime) ->
+    case do_start(false,
+		  self(), Notify,
+                  Transport, Active, ServerInfo,
+                  MsgID, MaxOutstanding, RunTime) of
+        {ok, Pid} ->
+            MRef = erlang:monitor(process, Pid),
+            {ok, {Pid, MRef}};
+        {error, _} = ERROR ->
+            ERROR
+    end.
+
+
+start(Transport, ServerInfo, Active) ->
+    start(Transport, ServerInfo, Active, ?MSG_ID_DEFAULT).
+
+start(Transport, ServerInfo, Active, 1 = MsgID) ->
+    start(false,
+	  Transport, ServerInfo, Active, MsgID,
+          ?MAX_OUTSTANDING_DEFAULT_1, ?RUNTIME_DEFAULT);
+start(Transport, ServerInfo, Active, 2 = MsgID) ->
+    start(false,
+	  Transport, ServerInfo, Active, MsgID,
+          ?MAX_OUTSTANDING_DEFAULT_2, ?RUNTIME_DEFAULT);
+start(Transport, ServerInfo, Active, 3 = MsgID) ->
+    start(false,
+	  Transport, ServerInfo, Active, MsgID,
+          ?MAX_OUTSTANDING_DEFAULT_3, ?RUNTIME_DEFAULT).
+
+start(Transport, ServerInfo, Active, MsgID, MaxOutstanding, RunTime) ->
+    start(false,
+	  Transport, ServerInfo, Active, MsgID, MaxOutstanding, RunTime).
+
+start(Quiet, Transport, ServerInfo, Active, MsgID, MaxOutstanding, RunTime) ->
+    Notify = fun(R) -> present_results(R) end,
+    do_start(Quiet,
+	     self(), Notify,
+             Transport, ServerInfo, Active, MsgID, MaxOutstanding, RunTime).
+                      
+
+-spec do_start(Quiet,
+	       Parent,
+               Notify,
+               Transport,
+               ServerInfo,
+               Active,
+               MsgID,
+               MaxOutstanding,
+               RunTime) -> {ok, Pid} | {error, Reason} when
+      Quiet          :: boolean(),
+      Parent         :: pid(),
+      Notify         :: function(),
+      Transport      :: atom() | tuple(),
+      ServerInfo     :: {inet:ip_address(), inet:port_number()} | string(),
+      Active         :: active(),
+      MsgID          :: msg_id(),
+      MaxOutstanding :: max_outstanding(),
+      RunTime        :: runtime(),
+      Pid            :: pid(),
+      Reason         :: term().
+
+do_start(Quiet,
+	 Parent, Notify,
+         Transport, ServerInfo, Active, MsgID, MaxOutstanding, RunTime)
+  when is_boolean(Quiet) andalso
+       is_pid(Parent) andalso
+       is_function(Notify) andalso
+       (is_atom(Transport) orelse is_tuple(Transport)) andalso
+       (is_boolean(Active) orelse (Active =:= once)) andalso
+       (is_tuple(ServerInfo) orelse is_list(ServerInfo)) andalso 
+       (is_integer(MsgID) andalso (MsgID >= 1) andalso (MsgID =< 3)) andalso
+       (is_integer(MaxOutstanding) andalso (MaxOutstanding > 0)) andalso
+       (is_integer(RunTime) andalso (RunTime > 0)) ->
+    Starter = self(),
+    Init = fun() -> put(sname, "client"),
+                    init(Quiet,
+			 Starter, 
+                         Parent,
+                         Notify,
+                         Transport, Active, ServerInfo,
+                         MsgID, MaxOutstanding, RunTime)
+           end,
+    {Pid, MRef} = spawn_monitor(Init),
+    receive
+        {'DOWN', MRef, process, Pid, Reason} ->
+            {error, Reason};
+        {?MODULE, Pid, ok} ->
+            erlang:demonitor(MRef),
+            {ok, Pid};
+        {?MODULE, Pid, {error, _} = ERROR} ->
+            erlang:demonitor(MRef, [flush]),
+            ERROR
+    end.
+
+
+%% We should not normally stop this (it terminates when its done).
+stop(Pid) when is_pid(Pid) ->
+    req(Pid, stop).
+
+
+%% ==========================================================================
+
+init(Quiet,
+     Starter,
+     Parent, Notify,
+     Transport, Active, ServerInfo,
+     MsgID, MaxOutstanding, RunTime) ->
+    if
+	not Quiet ->
+	    ?I("init with"
+	       "~n   Transport:            ~p"
+	       "~n   Active:               ~p"
+	       "~n   ServerInfo:           ~s"
+	       "~n   Msg ID:               ~p (=> 16 + ~w bytes)"
+	       "~n   Max Outstanding:      ~p"
+	       "~n   (Suggested) Run Time: ~p ms",
+	       [Transport, Active,
+                case ServerInfo of
+                    {Addr, Port} ->
+                        ?F("Addr: ~s, Port: ~w", [inet:ntoa(Addr), Port]);
+                    Path ->
+                        Path
+                end,
+		MsgID, size(which_msg_data(MsgID)), MaxOutstanding, RunTime]);
+	true ->
+	    ok
+    end,
+    {Mod, Connect} = process_transport(Transport),
+    case Connect(ServerInfo) of
+        {ok, Sock} ->
+            if not Quiet -> ?I("connected");
+	       true      -> ok
+	    end,
+            Starter ! {?MODULE, self(), ok},
+	    initial_activation(Mod, Sock, Active),
+            Results = loop(#{quiet           => Quiet,
+			     slogan          => run,
+			     runtime         => RunTime,
+			     start           => ?T(),
+			     parent          => Parent,
+			     mod             => Mod,
+			     sock            => Sock,
+			     active          => Active,
+			     msg_data        => which_msg_data(MsgID),
+			     outstanding     => 0,
+			     max_outstanding => MaxOutstanding,
+			     sid             => 1,
+			     rid             => 1,
+			     scnt            => 0,
+			     rcnt            => 0,
+			     bcnt            => 0,
+			     num             => undefined,
+			     acc             => <<>>}),
+            Notify(Results),
+            (catch Mod:close(Sock)),
+            exit(normal);
+        {error, Reason} ->
+            ?E("connect failed: ~p"
+	       "~n   ~p", [Reason, ServerInfo]),
+            exit({connect, Reason, ServerInfo})
+    end.
+
+process_transport(Mod) when is_atom(Mod) ->
+    %% In this case we assume it to be a plain tcp socket
+    {Mod, fun({A, P}) -> Mod:connect(A, P) end};
+process_transport({Mod, #{domain := Domain} = Opts}) ->
+    Connect =
+        case Domain of
+            local -> fun(Path)   -> Mod:connect(Path, Opts) end;
+            _     -> fun({A, P}) -> Mod:connect(A, P, Opts) end
+        end,
+    {Mod, Connect}.
+
+            
+which_msg_data(1) -> ?MSG_DATA1;
+which_msg_data(2) -> ?MSG_DATA2;
+which_msg_data(3) -> ?MSG_DATA3.
+
+
+present_results(#{status  := ok,
+		  runtime := RunTime,
+                  bcnt    := ByteCnt,
+                  cnt     := NumIterations}) ->
+    ?I("Results: "
+       "~n   Run Time:      ~s"
+       "~n   ByteCnt:       ~s"
+       "~n   NumIterations: ~s", 
+       [?FORMAT_TIME(RunTime), 
+        if ((ByteCnt =:= 0) orelse (RunTime =:= 0)) ->
+                ?F("~w, ~w", [ByteCnt, RunTime]);
+          true ->
+                ?F("~p => ~p byte / ms", [ByteCnt, ByteCnt div RunTime])
+       end,
+       if (RunTime =:= 0) ->
+               "-";
+          true ->
+               ?F("~p => ~p iterations / ms",
+                  [NumIterations, NumIterations div RunTime])
+       end]),
+    ok;
+present_results(#{status  := Failure,
+		  runtime := RunTime,
+		  sid     := SID,
+		  rid     := RID,
+                  scnt    := SCnt,
+                  rcnt    := RCnt,
+                  bcnt    := BCnt,
+		  num     := Num}) ->
+    ?I("Time Test failed: "
+       "~n   ~p"
+       "~n"
+       "~nwhen"
+       "~n"
+       "~n   Run Time:       ~s"
+       "~n   Send ID:        ~p"
+       "~n   Recv ID:        ~p"
+       "~n   Send Count:     ~p"
+       "~n   Recv Count:     ~p"
+       "~n   Byte Count:     ~p"
+       "~n   Num Iterations: ~p",
+       [Failure,
+        ?FORMAT_TIME(RunTime),
+        SID, RID, SCnt, RCnt, BCnt, Num]).
+
+
+
+loop(#{runtime := RunTime} = State) ->
+    erlang:start_timer(RunTime, self(), stop),
+    try do_loop(State)
+    catch
+        throw:Results ->
+            Results
+    end.
+
+do_loop(State) ->
+    do_loop( handle_message( msg_exchange(State) ) ).
+
+msg_exchange(#{rcnt := Num, num := Num} = State) ->
+    finish(ok, State);
+msg_exchange(#{scnt := Num, num := Num} = State) ->
+    %% We are done sending more requests - now we will just await 
+    %% the replies for the (still) outstanding replies.
+    msg_exchange( recv_reply(State) );
+msg_exchange(#{outstanding     := Outstanding,
+               max_outstanding := MaxOutstanding} = State)
+  when (Outstanding < MaxOutstanding) ->
+    msg_exchange( send_request(State) );
+msg_exchange(State) ->
+    send_request( recv_reply(State) ).
+
+
+finish(ok,
+       #{start := Start, bcnt  := BCnt, num := Num}) ->
+    Stop = ?T(),
+    throw(#{status  => ok,
+	    runtime => ?TDIFF(Start, Stop),
+            bcnt    => BCnt,
+            cnt     => Num});
+finish(Reason,
+       #{start := Start,
+	 sid  := SID, rid := RID,
+	 scnt := SCnt, rcnt := RCnt, bcnt := BCnt,
+	 num  := Num}) ->
+    Stop = ?T(),
+    throw(#{status  => Reason,
+	    runtime => ?TDIFF(Start, Stop),
+	    sid     => SID,
+	    rid     => RID,
+            scnt    => SCnt,
+            rcnt    => RCnt,
+            bcnt    => BCnt,
+            num     => Num}).
+    
+send_request(#{mod             := Mod,
+	       sock            := Sock, 
+	       sid             := ID,
+	       scnt            := Cnt,
+	       outstanding     := Outstanding,
+	       max_outstanding := MaxOutstanding,
+	       msg_data        := Data} = State)
+  when (MaxOutstanding > Outstanding) ->
+    SZ   = size(Data),
+    Req  = <<?TTEST_TAG:32,
+	     ?TTEST_TYPE_REQUEST:32,
+	     ID:32,
+	     SZ:32,
+	     Data/binary>>,
+    case Mod:send(Sock, Req) of
+        ok ->
+            State#{sid         => next_id(ID),
+		   scnt        => Cnt + 1,
+		   outstanding => Outstanding + 1};
+        {error, Reason} ->
+            ?E("Failed sending request: ~p", [Reason]),
+            exit({send, Reason})
+    end;
+send_request(State) ->
+    State.
+
+
+
+recv_reply(#{mod         := Mod,
+	     sock        := Sock, 
+             rid         := ID,
+             active      := false,
+             bcnt        := BCnt,
+             rcnt        := Cnt,
+	     outstanding := Outstanding} = State) ->
+    case recv_reply_message1(Mod, Sock, ID) of
+	{ok, MsgSz} ->
+	    State#{rid         => next_id(ID),
+		   bcnt        => BCnt + MsgSz,
+		   rcnt        => Cnt + 1,
+		   outstanding => Outstanding - 1};
+
+	{error, timeout} ->
+	    ?I("receive timeout"),
+	    State;
+
+	{error, Reason} ->
+	    finish(Reason, State)
+    end;
+recv_reply(#{mod         := Mod,
+	     sock        := Sock,
+             rid         := ID,
+             active      := Active,
+             bcnt        := BCnt,
+             scnt        := SCnt,
+             rcnt        := RCnt,
+	     outstanding := Outstanding,
+	     acc         := Acc} = State) ->
+    case recv_reply_message2(Mod, Sock, ID, Acc) of
+	{ok, {MsgSz, NewAcc}} when is_integer(MsgSz) andalso is_binary(NewAcc) ->
+	    maybe_activate(Mod, Sock, Active),
+	    State#{rid         => next_id(ID),
+		   bcnt        => BCnt + MsgSz,
+		   rcnt        => RCnt + 1,
+		   outstanding => Outstanding - 1,
+		   acc         => NewAcc};
+
+	ok ->
+	    State;
+
+	{error, stop} ->
+	    ?I("receive [~w] -> stop", [Active]),
+	    %% This will have the effect that no more requests are sent...
+	    State#{num => SCnt, stop_started => ?T()};
+
+	{error, timeout} ->
+	    ?I("receive[~w] -> timeout", [Active]),
+	    State;
+
+	{error, Reason} ->
+	    finish(Reason, State)
+    end.
+
+
+%% This function reads exactly one (reply) message. No more no less.	
+recv_reply_message1(Mod, Sock, ID) ->
+    case Mod:recv(Sock, 4*4, ?RECV_TIMEOUT) of
+        {ok, <<?TTEST_TAG:32,
+               ?TTEST_TYPE_REPLY:32,
+               ID:32,
+               SZ:32>> = Hdr} ->
+            %% Receive the ping-pong reply boby
+            case Mod:recv(Sock, SZ, ?RECV_TIMEOUT) of
+                {ok, Data} when (size(Data) =:= SZ) ->
+		    {ok, size(Hdr) + size(Data)};
+                {error, Reason2} ->
+		    ?E("Failed reading body: "
+                       "~n   ~p: ~p", [Reason2]),
+                    {error, {recv_body, Reason2}}
+            end;
+
+        {ok, <<BadTag:32,
+               BadType:32,
+               BadID:32,
+               BadSZ:32>>} ->
+            {error, {invalid_hdr, 
+		     {?TTEST_TAG,        BadTag},
+		     {?TTEST_TYPE_REPLY, BadType},
+		     {ID,                BadID},
+		     BadSZ}};
+        {ok, _InvHdr} ->
+            {error, invalid_hdr};
+
+        {error, Reason1} ->
+	    ?E("Feiled reading header: "
+	      "~n   ~p", [Reason1]),
+            {error, {recv_hdr, Reason1}}
+    end.
+
+
+%% This function first attempts to process the data we have already
+%% accumulated. If that is not enough for a (complete) reply, it
+%% will attempt to receive more.
+recv_reply_message2(Mod, Sock, ID, Acc) ->
+    case process_acc_data(ID, Acc) of
+	ok ->
+	    %% No or insufficient data, so get more
+	    recv_reply_message3(Mod, Sock, ID, Acc);
+
+	{ok, _} = OK -> % We already had a reply accumulated - no need to read more
+	    OK;
+
+	{error, _} = ERROR ->
+	    ERROR
+    end.
+
+%% This function receives a "chunk" of data, then it tries to extract
+%% one (reply) message from the accumulated and new data (combined).
+recv_reply_message3(_Mod, Sock, ID, Acc) ->
+    receive
+	{timeout, _TRef, stop} ->
+	    {error, stop};
+
+        {TagClosed, Sock} when (TagClosed =:= tcp_closed) orelse
+			       (TagClosed =:= socket_closed) ->
+            {error, closed};
+
+        {TagErr, Sock, Reason} when (TagErr =:= tcp_error) orelse
+				    (TagErr =:= socket_error) ->
+            {error, Reason};
+
+        {Tag, Sock, Msg} when (Tag =:= tcp) orelse
+			      (Tag =:= socket) ->
+            process_acc_data(ID, <<Acc/binary, Msg/binary>>)
+        
+    after ?RECV_TIMEOUT ->
+            ?I("timeout when"
+               "~n   ID:        ~p"
+               "~n   size(Acc): ~p",
+               [ID, size(Acc)]),
+            %% {error, timeout}
+            recv_reply_message3(_Mod, Sock, ID, Acc)
+    end.
+
+
+process_acc_data(ID, <<?TTEST_TAG:32,
+		       ?TTEST_TYPE_REPLY:32,
+		       ID:32,
+		       SZ:32,
+		       Data/binary>>) when (SZ =< size(Data)) ->
+    <<_Body:SZ/binary, Rest/binary>> = Data,
+    {ok, {4*4+SZ, Rest}};
+process_acc_data(ID, <<BadTag:32,
+		       BadType:32,
+		       BadID:32,
+		       BadSZ:32,
+		       _Data/binary>>) 
+  when ((BadTag  =/= ?TTEST_TAG) orelse
+	(BadType =/= ?TTEST_TYPE_REPLY) orelse
+	(BadID   =/= ID)) ->
+    {error, {invalid_hdr, 
+	     {?TTEST_TAG,        BadTag},
+	     {?TTEST_TYPE_REPLY, BadType},
+	     {ID,                BadID},
+	     BadSZ}};
+%% Not enough for an entire (reply) message
+process_acc_data(_ID, _Data) ->
+    ok.
+
+    
+handle_message(#{quiet  := Quiet,
+		 parent := Parent, sock := Sock, scnt := SCnt} = State) ->
+    receive
+	{timeout, _TRef, stop} ->
+	    if not Quiet -> ?I("STOP");
+	       true      -> ok
+	    end,
+	    %% This will have the effect that no more requests are sent...
+	    State#{num => SCnt, stop_started => ?T()};
+
+        {?MODULE, Ref, Parent, stop} ->
+            %% This *aborts* the test
+            reply(Parent, Ref, ok),
+            exit(normal);
+	
+	%% Only when active
+        {TagClosed, Sock, Reason} when (TagClosed =:= tcp_closed) orelse
+				       (TagClosed =:= socket_closed) ->
+            %% We should never get this (unless the server crashed)
+            exit({closed, Reason});
+
+	%% Only when active
+        {TagErr, Sock, Reason} when (TagErr =:= tcp_error) orelse
+				    (TagErr =:= socket_error) ->
+            exit({error, Reason})
+            
+    after 0 ->
+            State
+    end.
+        
+
+initial_activation(_Mod, _Sock, false = _Active) ->
+    ok;
+initial_activation(Mod, Sock, Active) ->
+    Mod:active(Sock, Active).
+
+
+maybe_activate(Mod, Sock, once = Active) ->
+    Mod:active(Sock, Active);
+maybe_activate(_, _, _) ->
+    ok.
+                  
+
+%% ==========================================================================
+
+req(Pid, Req) ->
+    Ref = make_ref(),
+    Pid ! {?MODULE, Ref, Pid, Req},
+    receive
+        {'EXIT', Pid, Reason} ->
+            {error, {exit, Reason}};
+        {?MODULE, Ref, Reply} ->
+            Reply
+    end.
+
+reply(Pid, Ref, Reply) ->
+    Pid ! {?MODULE, Ref, Reply}.
+
+
+%% ==========================================================================
+
+next_id(ID) when (ID < ?MAX_ID) ->
+    ID + 1;
+next_id(_) ->
+    1.
+
+
+%% ==========================================================================
+
+%% t() ->
+%%     os:timestamp().
+
+%% tdiff({A1, B1, C1} = _T1x, {A2, B2, C2} = _T2x) ->
+%%     T1 = A1*1000000000+B1*1000+(C1 div 1000), 
+%%     T2 = A2*1000000000+B2*1000+(C2 div 1000), 
+%%     T2 - T1.
+
+%% formated_timestamp() ->
+%%     format_timestamp(os:timestamp()).
+
+%% format_timestamp({_N1, _N2, N3} = TS) ->
+%%     {_Date, Time}  = calendar:now_to_local_time(TS),
+%%     {Hour,Min,Sec} = Time,
+%%     FormatTS = io_lib:format("~.2.0w:~.2.0w:~.2.0w.4~w",
+%%                              [Hour, Min, Sec, round(N3/1000)]),  
+%%     lists:flatten(FormatTS).
+
+%% %% Time is always in number os ms (milli seconds)
+%% format_time(T) ->
+%%     f("~p", [T]).
+
+
+%% ==========================================================================
+
+%% f(F, A) ->
+%%     lists:flatten(io_lib:format(F, A)).
+
+%% %% e(F) ->
+%% %%     i("<ERROR> " ++ F).
+
+%% e(F, A) ->
+%%     p(get(sname), "<ERROR> " ++ F, A).
+
+%% i(F) ->
+%%     i(F, []).
+
+%% i(F, A) ->
+%%     p(get(sname), "<INFO> " ++ F, A).
+
+%% p(undefined, F, A) ->
+%%     p("- ", F, A);
+%% p(Prefix, F, A) ->
+%%     io:format("[~s, ~s] " ++ F ++ "~n", [formated_timestamp(), Prefix |A]).
diff --git a/erts/emulator/test/socket_test_ttest_tcp_client_gen.erl b/erts/emulator/test/socket_test_ttest_tcp_client_gen.erl
new file mode 100644
index 0000000000..65a3a94d38
--- /dev/null
+++ b/erts/emulator/test/socket_test_ttest_tcp_client_gen.erl
@@ -0,0 +1,49 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2018-2019. 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(socket_test_ttest_tcp_client_gen).
+
+-export([
+         start/2, start/3, start/5, start/6,
+         stop/1
+        ]).
+
+-define(TRANSPORT_MOD, socket_test_ttest_tcp_gen).
+
+start(ServerInfo, Active) ->
+    socket_test_ttest_tcp_client:start(?TRANSPORT_MOD, ServerInfo, Active).
+
+start(ServerInfo, Active, MsgID) ->
+    socket_test_ttest_tcp_client:start(?TRANSPORT_MOD, ServerInfo, Active, MsgID).
+
+start(ServerInfo, Active, MsgID, MaxOutstanding, RunTime) ->
+    socket_test_ttest_tcp_client:start(false,
+				       ?TRANSPORT_MOD,
+                                       ServerInfo, Active,
+                                       MsgID, MaxOutstanding, RunTime).
+
+start(Quiet, ServerInfo, Active, MsgID, MaxOutstanding, RunTime) ->
+    socket_test_ttest_tcp_client:start(Quiet,
+				       ?TRANSPORT_MOD,
+                                       ServerInfo, Active,
+                                       MsgID, MaxOutstanding, RunTime).
+
+stop(Pid) ->
+    socket_test_ttest_tcp_client:stop(Pid).
diff --git a/erts/emulator/test/socket_test_ttest_tcp_client_socket.erl b/erts/emulator/test/socket_test_ttest_tcp_client_socket.erl
new file mode 100644
index 0000000000..2fb1242028
--- /dev/null
+++ b/erts/emulator/test/socket_test_ttest_tcp_client_socket.erl
@@ -0,0 +1,116 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2018-2019. 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(socket_test_ttest_tcp_client_socket).
+
+-export([
+         start/4, start/5, start/7, start/8,
+         stop/1
+        ]).
+
+-define(TRANSPORT_MOD, socket_test_ttest_tcp_socket).
+-define(MOD(D, A, M),  {?TRANSPORT_MOD, #{domain => D,
+                                          async  => A,
+                                          method => M}}).
+
+start(Method, Async, Active, ServerInfo)
+  when is_list(ServerInfo) ->
+    Domain = local,
+    socket_test_ttest_tcp_client:start_monitor(?MOD(Domain, Async, Method),
+                                               ServerInfo, Active);
+start(Method, Async, Active, ServerInfo = {Addr, _})
+  when is_tuple(Addr) andalso (size(Addr) =:= 4) ->
+    Domain = inet,
+    socket_test_ttest_tcp_client:start_monitor(?MOD(Domain, Async, Method),
+                                               ServerInfo, Active);
+start(Method, Async, Active, ServerInfo = {Addr, _})
+  when is_tuple(Addr) andalso (size(Addr) =:= 8) ->
+    Domain = inet6,
+    socket_test_ttest_tcp_client:start_monitor(?MOD(Domain, Async, Method),
+                                               ServerInfo, Active).
+
+start(Method, Async, Active, ServerInfo, MsgID)
+  when is_list(ServerInfo) ->
+    %% This is just a simplification
+    Domain = local,
+    socket_test_ttest_tcp_client:start(?MOD(Domain, Async, Method),
+                                       ServerInfo, Active, MsgID);
+start(Method, Async, Active, ServerInfo = {Addr, _}, MsgID)
+  when is_tuple(Addr) andalso (size(Addr) =:= 4) ->
+    %% This is just a simplification
+    Domain = inet,
+    socket_test_ttest_tcp_client:start(?MOD(Domain, Async, Method),
+                                       Active, ServerInfo, MsgID);
+start(Method, Async, Active, ServerInfo = {Addr, _}, MsgID)
+  when is_tuple(Addr) andalso (size(Addr) =:= 8) ->
+    Domain = inet6,
+    socket_test_ttest_tcp_client:start(?MOD(Domain, Async, Method),
+                                       ServerInfo, Active, MsgID).
+
+start(Method, Async, Active, ServerInfo, MsgID, MaxOutstanding, RunTime)
+  when is_list(ServerInfo) ->
+    Domain = local,
+    socket_test_ttest_tcp_client:start(false,
+				       ?MOD(Domain, Async, Method),
+                                       ServerInfo, Active,
+                                       MsgID, MaxOutstanding, RunTime);
+start(Method, Async, Active, ServerInfo = {Addr, _},
+      MsgID, MaxOutstanding, RunTime)
+  when is_tuple(Addr) andalso (size(Addr) =:= 4) ->
+    Domain = inet,
+    socket_test_ttest_tcp_client:start(false,
+				       ?MOD(Domain, Async, Method),
+                                       ServerInfo, Active,
+                                       MsgID, MaxOutstanding, RunTime);
+start(Method, Async, Active, ServerInfo = {Addr, _},
+      MsgID, MaxOutstanding, RunTime)
+  when is_tuple(Addr) andalso (size(Addr) =:= 8) ->
+    Domain = inet6,
+    socket_test_ttest_tcp_client:start(false,
+				       ?MOD(Domain, Async, Method),
+                                       ServerInfo, Active,
+                                       MsgID, MaxOutstanding, RunTime).
+
+start(Quiet, Async, Active, Method, ServerInfo, MsgID, MaxOutstanding, RunTime)
+  when is_list(ServerInfo) ->
+    Domain = local,
+    socket_test_ttest_tcp_client:start(Quiet,
+				       ?MOD(Domain, Async, Method),
+                                       ServerInfo, Active,
+                                       MsgID, MaxOutstanding, RunTime);
+start(Quiet, Async, Active, Method, ServerInfo = {Addr, _},
+      MsgID, MaxOutstanding, RunTime)
+  when is_tuple(Addr) andalso (size(Addr) =:= 4) ->
+    Domain = inet,
+    socket_test_ttest_tcp_client:start(Quiet,
+				       ?MOD(Domain, Async, Method),
+                                       ServerInfo, Active,
+                                       MsgID, MaxOutstanding, RunTime);
+start(Quiet, Async, Active, Method, ServerInfo = {Addr, _}, 
+      MsgID, MaxOutstanding, RunTime)
+  when is_tuple(Addr) andalso (size(Addr) =:= 8) ->
+    Domain = inet6,
+    socket_test_ttest_tcp_client:start(Quiet,
+				       ?MOD(Domain, Async, Method),
+                                       ServerInfo, Active,
+                                       MsgID, MaxOutstanding, RunTime).
+
+stop(Pid) ->
+    socket_test_ttest_client:stop(Pid).
diff --git a/erts/emulator/test/socket_test_ttest_tcp_gen.erl b/erts/emulator/test/socket_test_ttest_tcp_gen.erl
new file mode 100644
index 0000000000..e59bd881e7
--- /dev/null
+++ b/erts/emulator/test/socket_test_ttest_tcp_gen.erl
@@ -0,0 +1,137 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2018-2019. 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(socket_test_ttest_tcp_gen).
+
+-export([
+	 accept/1, accept/2,
+	 active/2,
+	 close/1,
+	 connect/2, connect/3,
+	 controlling_process/2,
+	 listen/0, listen/1, listen/2,
+	 peername/1,
+	 port/1,
+	 recv/2, recv/3,
+	 send/2,
+	 shutdown/2,
+	 sockname/1
+	]).
+
+
+-define(LIB, socket_test_lib).
+
+%% ==========================================================================
+
+accept(Sock) ->
+    case gen_tcp:accept(Sock) of
+	{ok, NewSock} ->
+	    {ok, NewSock};
+	{error, _} = ERROR ->
+	    ERROR
+    end.
+
+accept(Sock, Timeout) ->
+    case gen_tcp:accept(Sock, Timeout) of
+	{ok, NewSock} ->
+	    {ok, NewSock};
+	{error, _} = ERROR ->
+	    ERROR
+    end.
+
+
+active(Sock, NewActive) 
+  when (is_boolean(NewActive) orelse (NewActive =:= once)) ->
+    inet:setopts(Sock, [{active, NewActive}]).
+
+
+close(Sock) ->
+    gen_tcp:close(Sock).
+
+
+connect(Addr, Port) ->
+    Opts = [binary, {packet, raw}, {active, false}, {buffer, 32*1024}], 
+    do_connect(Addr, Port, Opts).
+
+connect(Addr, Port, #{domain := Domain}) ->
+    Opts = [Domain, binary, {packet, raw}, {active, false}, {buffer, 32*1024}], 
+    do_connect(Addr, Port, Opts).
+
+do_connect(Addr, Port, Opts) ->
+    case gen_tcp:connect(Addr, Port, Opts) of
+	{ok, Sock} ->
+	    {ok, Sock};
+	{error, _} = ERROR ->
+	    ERROR
+    end.
+
+controlling_process(Sock, NewPid) ->
+    gen_tcp:controlling_process(Sock, NewPid).
+
+
+%% Create a listen socket
+listen() ->
+    listen(0).
+
+listen(Port) ->
+    listen(Port, #{domain => inet}).
+
+listen(Port, #{domain := Domain}) when is_integer(Port) andalso (Port >= 0) ->
+    case ?LIB:which_local_host_info(Domain) of
+	{ok, {_, _, Addr}} ->
+	    Opts = [Domain,
+		    binary, {ip, Addr}, {packet, raw}, {active, false},
+		    {buffer, 32*1024}],
+	    gen_tcp:listen(Port, Opts);
+	{error, _} = ERROR ->
+	    ERROR
+    end.
+
+
+peername(Sock) ->
+    inet:peername(Sock).
+
+
+port(Sock) ->
+    inet:port(Sock).
+
+
+recv(Sock, Length) ->
+    gen_tcp:recv(Sock, Length).
+recv(Sock, Length, Timeout) ->
+    gen_tcp:recv(Sock, Length, Timeout).
+
+
+send(Sock, Data) ->
+    gen_tcp:send(Sock, Data).
+
+
+shutdown(Sock, How) ->
+    gen_tcp:shutdown(Sock, How).
+
+
+sockname(Sock) ->
+    inet:sockname(Sock).
+
+
+%% ==========================================================================
+
+
+			   
diff --git a/erts/emulator/test/socket_test_ttest_tcp_server.erl b/erts/emulator/test/socket_test_ttest_tcp_server.erl
new file mode 100644
index 0000000000..2394dc7924
--- /dev/null
+++ b/erts/emulator/test/socket_test_ttest_tcp_server.erl
@@ -0,0 +1,684 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2018-2019. 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 the "simple" server using gen_tcp. The server is supposed to be
+%% as simple as possible in order to incur as little overhead as possible.
+%%
+%% There are three ways to run the server: active, passive or active-once.
+%%
+%% The server does only two things; accept connnections and then reply
+%% to requests (actually the handler(s) does that). No timing or counting.
+%% That is all done by the clients.
+%%
+%% ==========================================================================
+
+-module(socket_test_ttest_tcp_server).
+
+-export([
+         %% This are for the test suite
+         start_monitor/3,
+
+         %% This are for starting in a shell when run "manually"
+         start/2,
+
+         stop/1
+        ]).
+
+%% Internal exports
+-export([
+         do_start/3
+        ]).
+
+-include_lib("kernel/include/inet.hrl").
+-include("socket_test_ttest.hrl").
+
+-define(ACC_TIMEOUT,  5000).
+-define(RECV_TIMEOUT, 5000).
+
+-define(LIB,            socket_test_ttest_lib).
+-define(I(F),           ?LIB:info(F)).
+-define(I(F,A),         ?LIB:info(F, A)).
+-define(E(F,A),         ?LIB:error(F, A)).
+-define(F(F,A),         ?LIB:format(F, A)).
+-define(FORMAT_TIME(T), ?LIB:format_time(T)).
+-define(T(),            ?LIB:t()).
+-define(TDIFF(T1,T2),   ?LIB:tdiff(T1, T2)).
+
+
+%% ==========================================================================
+
+start_monitor(Node, Transport, Active) when (Node =/= node()) ->
+    case rpc:call(Node, ?MODULE, do_start, [self(), Transport, Active]) of
+        {badrpc, _} = Reason ->
+            {error, Reason};
+        {ok, {Pid, AddrPort}} ->
+            MRef = erlang:monitor(process, Pid),
+            {ok, {{Pid, MRef}, AddrPort}};
+        {error, _} = ERROR ->
+            ERROR
+    end;
+start_monitor(_, Transport, Active) ->
+    case do_start(self(), Transport, Active) of
+        {ok, {Pid, AddrPort}} ->
+            MRef = erlang:monitor(process, Pid),
+            {ok, {{Pid, MRef}, AddrPort}};
+        {error, _} = ERROR ->
+            ERROR
+    end.
+            
+
+
+start(Transport, Active) ->
+    do_start(self(), Transport, Active).
+
+%% Note that the Async option is actually only "used" for the
+%% socket transport module (it details how to implement the
+%% active feature).
+do_start(Parent, Transport, Active)
+  when is_pid(Parent) andalso
+       (is_atom(Transport) orelse is_tuple(Transport)) andalso
+       (is_boolean(Active) orelse (Active =:= once)) ->
+    Starter    = self(),
+    ServerInit = fun() -> 
+                         put(sname, "server"),
+                         server_init(Starter, Parent, Transport, Active)
+                 end,
+    {Pid, MRef} = spawn_monitor(ServerInit),
+    receive
+        {'DOWN', MRef, process, Pid, Reason} ->
+            {error, Reason};
+        {?MODULE, Pid, {ok, AddrPort}} ->
+            erlang:demonitor(MRef),
+            {ok, {Pid, AddrPort}};
+        {?MODULE, Pid, {error, _} = ERROR} ->
+            erlang:demonitor(MRef, [flush]),
+            ERROR
+    end.
+    
+
+stop(Pid) when is_pid(Pid) ->
+    req(Pid, stop).
+
+
+%% ==========================================================================
+
+server_init(Starter, Parent, Transport, Active) ->
+    ?I("init with"
+       "~n   Transport: ~p"
+       "~n   Active:    ~p", [Transport, Active]),
+    {Mod, Listen, StatsInterval} = process_transport(Transport, Active),
+    case Listen(0) of
+        {ok, LSock} ->
+            case Mod:port(LSock) of
+                {ok, PortOrPath} ->
+                    Result =
+                        if
+                            is_integer(PortOrPath) ->
+                                %% This is just for convenience
+                                case Mod:sockname(LSock) of
+				    {ok, {Addr, _}} ->
+					?I("listening on:"
+					   "~n   Addr: ~p (~s)"
+					   "~n   Port: ~w"
+					   "~n", [Addr,
+						  inet:ntoa(Addr),
+						  PortOrPath]),
+					{Addr, PortOrPath};
+				    {error, SNReason} ->
+					exit({sockname, SNReason})
+				end;
+                            is_list(PortOrPath) ->
+                                ?I("listening on:"
+                                   "~n   Path: ~s"
+                                   "~n", [PortOrPath]),
+                                PortOrPath
+                        end,
+                    Starter ! {?MODULE, self(), {ok, Result}},
+                    server_loop(#{parent         => Parent,
+				  mod            => Mod,
+                                  active         => Active,
+                                  lsock          => LSock,
+                                  port_or_path   => PortOrPath,
+                                  handlers       => [],
+                                  stats_interval => StatsInterval,
+				  %% Accumulation
+				  runtime  => 0,
+				  mcnt     => 0,
+				  bcnt     => 0,
+				  hcnt     => 0
+				 });
+                {error, PReason} ->
+                    (catch Mod:close(LSock)),
+                    exit({port, PReason})
+            end;
+        {error, LReason} ->
+            exit({listen, LReason})
+    end.
+
+process_transport(Mod, _) when is_atom(Mod) ->
+    {Mod, fun(Port) -> Mod:listen(Port) end, infinity};
+process_transport({Mod, #{stats_interval := T} = Opts}, Active)
+  when (Active =/= false) ->
+    {Mod, fun(Port) -> Mod:listen(Port, Opts#{stats_to => self()}) end, T};
+process_transport({Mod, #{stats_interval := T} = Opts}, _Active) ->
+    {Mod, fun(Port) -> Mod:listen(Port, Opts) end, T};
+process_transport({Mod, Opts}, _Active) ->
+    {Mod, fun(Port) -> Mod:listen(Port, Opts) end, infinity}.
+
+
+
+server_loop(State) ->
+    server_loop( server_handle_message( server_accept(State, ?ACC_TIMEOUT), 0) ).
+
+server_accept(#{mod := Mod, lsock := LSock} = State, Timeout) ->
+    case Mod:accept(LSock, Timeout) of
+        {ok, Sock} ->
+            server_handle_accepted(State, Sock);
+        {error, timeout} when (Timeout =/= nowait) ->
+            State;
+        {error, AReason} ->
+	    (catch Mod:close(LSock)),
+            exit({accept, AReason})
+    end.
+
+%% server_accept(#{mod   := Mod,
+%%                 lsock := LSock} = State) ->
+%%     case Mod:accept(LSock, ?ACC_TIMEOUT) of
+%%         {ok, Sock} ->
+%%             server_handle_accepted(State, Sock);
+%%         {error, timeout} ->
+%%             State;
+%%         {error, AReason} ->
+%% 	    (catch Mod:close(LSock)),
+%%             exit({accept, AReason})
+%%     end.
+
+server_handle_accepted(#{mod      := Mod,
+                         lsock    := LSock,
+                         active   := Active,
+                         handlers := Handlers} = State,
+                      Sock) ->
+    ?I("accepted connection from ~s", 
+       [case Mod:peername(Sock) of
+            {ok, Peer} ->
+                format_peername(Peer);
+            {error, _} ->
+                "-"
+        end]),
+    {Pid, _} = handler_start(),
+    ?I("handler ~p started -> try transfer socket control", [Pid]),
+    case Mod:controlling_process(Sock, Pid) of
+        ok ->
+            maybe_start_stats_timer(State, Pid),
+            ?I("server-accept: handler ~p started", [Pid]),
+            handler_continue(Pid, Mod, Sock, Active),
+            Handlers2 = [Pid | Handlers],
+            State#{handlers => Handlers2};
+        {error, CPReason} ->
+            (catch Mod:close(Sock)),
+            (catch Mod:close(LSock)),
+            exit({controlling_process, CPReason})
+    end.
+    
+
+format_peername({Addr, Port}) ->
+    case inet:gethostbyaddr(Addr) of
+        {ok, #hostent{h_name = N}} ->
+            ?F("~s (~s:~w)", [N, inet:ntoa(Addr), Port]);
+        {error, _} ->
+            ?F("~p, ~p", [Addr, Port])
+    end;
+format_peername(Path) when is_list(Path) ->
+    Path.
+
+maybe_start_stats_timer(#{active := Active, stats_interval := Time}, Handler)
+  when (Active =/= false) andalso (is_integer(Time) andalso (Time > 0)) ->
+    start_stats_timer(Time, "handler", Handler);
+maybe_start_stats_timer(_, _) ->
+    ok.
+
+start_stats_timer(Time, ProcStr, Pid) ->
+    erlang:start_timer(Time, self(), {stats, Time, ProcStr, Pid}).
+
+server_handle_message(#{mod      := Mod,
+                        lsock    := LSock,
+                        parent   := Parent,
+                        handlers := H} = State, Timeout) ->
+    receive
+        {timeout, _TRef, {stats, Interval, ProcStr, Pid}} ->
+            case server_handle_stats(ProcStr, Pid) of
+                ok ->
+                    start_stats_timer(Interval, ProcStr, Pid);
+                skip ->
+                    ok
+            end,
+            State;
+
+        {?MODULE, Ref, Parent, stop} ->
+            reply(Parent, Ref, ok),
+            lists:foreach(fun(P) -> handler_stop(P) end, H),
+            (catch Mod:close(LSock)),
+            exit(normal);
+
+        {'DOWN', _MRef, process, Pid, Reason} -> 
+	    server_handle_down(Pid, Reason, State)
+            
+    after Timeout ->
+            State
+    end.
+
+server_handle_stats(ProcStr, Pid) ->
+    case ?LIB:formated_process_stats(Pid) of
+        "" ->
+            skip;
+        FormatedStats ->
+            ?I("Statistics for ~s ~p:~s", [ProcStr, Pid, FormatedStats]),
+            ok
+    end.
+
+
+server_handle_down(Pid, Reason, #{handlers := Handlers} = State) ->
+    case lists:delete(Pid, Handlers) of
+        Handlers ->
+            ?I("unknown process ~p died", [Pid]),                    
+            State;
+        Handlers2 ->
+            server_handle_handler_down(Pid, Reason, State#{handlers => Handlers2})
+    end.
+
+
+server_handle_handler_down(Pid,
+			   {done, RunTime, MCnt, BCnt},
+			   #{runtime := AccRunTime,
+			     mcnt    := AccMCnt,
+			     bcnt    := AccBCnt,
+			     hcnt    := AccHCnt} = State) ->
+    AccRunTime2 = AccRunTime + RunTime,
+    AccMCnt2    = AccMCnt + MCnt,
+    AccBCnt2    = AccBCnt + BCnt,
+    AccHCnt2    = AccHCnt + 1,
+    MsgCount2Str =
+        fun(RT, ART, MC, AMC) when (RT > 0) ->
+                ?F("~w => ~w (~w) msgs / ms", [MC, MC div RT, AMC div ART]);
+           (_, _, MC, AMC) ->
+                ?F("~w (~w)", [MC, AMC])
+        end,
+    ByteCount2Str =
+        fun(RT, ART, BC, ABC) when (RT > 0) ->
+                ?F("~w => ~w (~w) bytes / ms", [BC, BC div RT, ABC div ART]);
+           (_, _, BC, ABC) ->
+                ?F("~w", [BC, ABC])
+        end,
+    ?I("handler ~p (~w) done: "
+       "~n   Run Time:      ~s"
+       "~n   Message Count: ~s"
+       "~n   Byte Count:    ~s",
+       [Pid, AccHCnt2,
+        ?FORMAT_TIME(RunTime),
+        MsgCount2Str(RunTime, AccRunTime2, MCnt, AccMCnt2),
+        ByteCount2Str(RunTime, AccRunTime2, BCnt, AccBCnt2)]),
+    State#{runtime => AccRunTime2,
+	   mcnt    => AccMCnt2,
+	   bcnt    => AccBCnt2,
+	   hcnt    => AccHCnt2};
+server_handle_handler_down(Pid, Reason, State) ->
+    ?I("handler ~p terminated: "
+       "~n   ~p", [Pid, Reason]),
+    State.
+
+
+
+%% ==========================================================================
+
+handler_start() ->
+    Self         = self(),
+    HandlerInit = fun() -> put(sname, "handler"), handler_init(Self) end,
+    spawn_monitor(HandlerInit).
+
+handler_continue(Pid, Mod, Sock, Active) ->
+    req(Pid, {continue, Mod, Sock, Active}).
+
+handler_stop(Pid) ->
+    req(Pid, stop).
+
+handler_init(Parent) ->
+    ?I("starting"),
+    receive
+	{?MODULE, Ref, Parent, {continue, Mod, Sock, Active}} ->
+	    ?I("received continue"),
+	    reply(Parent, Ref, ok),
+	    handler_initial_activation(Mod, Sock, Active),
+	    handler_loop(#{parent      => Parent,
+			   mod         => Mod,
+			   sock        => Sock,
+			   active      => Active,
+			   start       => ?T(),
+			   mcnt        => 0,
+			   bcnt        => 0,
+			   last_reply  => none,
+			   acc         => <<>>})
+
+    after 5000 ->
+	    ?I("timeout when message queue: "
+               "~n   ~p"
+               "~nwhen"
+               "~n   Parent: ~p", [process_info(self(), messages), Parent]),
+	    handler_init(Parent)
+    end.
+
+handler_loop(State) ->
+    handler_loop( handler_handle_message( handler_recv_message(State) ) ).
+
+%% When passive, we read *one* request and then attempt to reply to it.
+handler_recv_message(#{mod        := Mod,
+		       sock       := Sock,
+                       active     := false,
+                       mcnt       := MCnt,
+                       bcnt       := BCnt,
+                       last_reply := LID} = State) ->
+    case handler_recv_message2(Mod, Sock) of
+        {ok, {MsgSz, ID, Body}} ->
+            handler_send_reply(Mod, Sock, ID, Body),
+            State#{mcnt       => MCnt + 1,
+                   bcnt       => BCnt + MsgSz,
+		   last_reply => ID};
+        {error, closed} ->
+            handler_done(State);
+        {error, timeout} ->
+	    ?I("timeout when: "
+               "~n   MCnt: ~p"
+               "~n   BCnt: ~p"
+               "~n   LID:  ~p", [MCnt, BCnt, LID]),
+            State
+    end;
+
+
+%% When "active" (once or true), we receive one data "message", which may 
+%% contain any number of requests or only part of a request. Then we 
+%% process this data together with whatever we had "accumulated" from 
+%% prevous messages. Each request will be extracted and replied to. If
+%% there is some data left, not enough for a complete request, we store
+%% this in 'acc' (accumulate it).
+handler_recv_message(#{mod        := Mod,
+		       sock       := Sock,
+                       active     := Active,
+                       mcnt       := MCnt,
+                       bcnt       := BCnt,
+                       last_reply := LID,
+                       acc        := Acc} = State) ->
+    case handler_recv_message3(Mod, Sock, Acc, LID) of
+	{ok, {MCnt2, BCnt2, LID2}, NewAcc} ->
+	    handler_maybe_activate(Mod, Sock, Active),
+	    State#{mcnt       => MCnt + MCnt2,
+		   bcnt       => BCnt + BCnt2,
+		   last_reply => LID2,
+		   acc        => NewAcc};
+
+        {error, closed} ->
+            if
+                (size(Acc) =:= 0) ->
+                    handler_done(State);
+                true ->
+                    ?E("client done with partial message: "
+                       "~n   Last Reply Sent: ~w"
+                       "~n   Message Count:   ~w"
+                       "~n   Byte    Count:   ~w"
+                       "~n   Partial Message: ~w bytes",
+                       [LID, MCnt, BCnt, size(Acc)]),
+                    exit({closed_with_partial_message, LID})
+            end;
+
+        {error, timeout} ->
+	    ?I("timeout when: "
+               "~n   MCnt:      ~p"
+               "~n   BCnt:      ~p"
+               "~n   LID:       ~p"
+               "~n   size(Acc): ~p", [MCnt, BCnt, LID, size(Acc)]),
+            State
+    end.
+
+handler_process_data(Acc, Mod, Sock, LID) ->
+    handler_process_data(Acc, Mod, Sock, 0, 0, LID).
+
+%% Extract each complete request, one at a time.
+handler_process_data(<<?TTEST_TAG:32,
+		       ?TTEST_TYPE_REQUEST:32,
+ 		       ID:32,
+ 		       SZ:32,
+ 		       Rest/binary>>,
+ 		     Mod, Sock,
+ 		     MCnt, BCnt, _LID) when (size(Rest) >= SZ)  ->
+    <<Body:SZ/binary, Rest2/binary>> = Rest,
+    case handler_send_reply(Mod, Sock, ID, Body) of
+ 	ok ->
+ 	    handler_process_data(Rest2, Mod, Sock, MCnt+1, BCnt+16+SZ, ID);
+ 	{error, _} = ERROR ->
+ 	    ERROR
+    end;
+handler_process_data(Data, _Mod, _Sock, MCnt, BCnt, LID) ->
+    {ok, {MCnt, BCnt, LID}, Data}.
+	    
+	    
+handler_recv_message2(Mod, Sock) ->
+    case Mod:recv(Sock, 4*4, ?RECV_TIMEOUT) of
+        {ok, <<?TTEST_TAG:32,
+               ?TTEST_TYPE_REQUEST:32,
+               ID:32,
+               SZ:32>> = Hdr} ->
+            case Mod:recv(Sock, SZ, ?RECV_TIMEOUT) of
+                {ok, Body} when (SZ =:= size(Body)) ->
+                    {ok, {size(Hdr) + size(Body), ID, Body}};
+                {error, BReason} ->
+                    ?E("failed reading body (~w) of message ~w:"
+                       "~n   ~p", [SZ, ID, BReason]),
+                    exit({recv, body, ID, SZ, BReason})
+            end;
+        {error, timeout} = ERROR ->
+            ERROR;
+        {error, closed} = ERROR ->
+            ERROR;
+        {error, HReason} ->
+            ?E("Failed reading header of message:"
+               "~n   ~p", [HReason]),
+            exit({recv, header, HReason})
+    end.
+
+
+handler_recv_message3(Mod, Sock, Acc, LID) ->
+    receive
+        {TagClosed, Sock} when (TagClosed =:= tcp_closed) orelse
+			       (TagClosed =:= socket_closed) ->
+            {error, closed};
+
+        {TagErr, Sock, Reason} when (TagErr =:= tcp_error) orelse
+				    (TagErr =:= socket_error) ->
+            {error, Reason};
+
+        {Tag, Sock, Msg} when (Tag =:= tcp) orelse
+			      (Tag =:= socket) ->
+            handler_process_data(<<Acc/binary, Msg/binary>>, Mod, Sock, LID)
+        
+    after ?RECV_TIMEOUT ->
+            {error, timeout}
+    end.
+
+
+
+handler_send_reply(Mod, Sock, ID, Data) ->
+    SZ = size(Data),
+    Msg = <<?TTEST_TAG:32,
+	    ?TTEST_TYPE_REPLY:32,
+	    ID:32,
+	    SZ:32,
+	    Data/binary>>,
+    case Mod:send(Sock, Msg) of
+        ok ->
+            ok;
+        {error, Reason} ->
+            (catch Mod:close(Sock)),
+            exit({send, Reason})
+    end.
+
+
+handler_done(State) ->
+    handler_done(State, ?T()).
+
+handler_done(#{start := Start,
+	       mod   := Mod,
+               sock  := Sock,
+               mcnt  := MCnt,
+               bcnt  := BCnt}, Stop) ->
+    (catch Mod:close(Sock)),
+    exit({done, ?TDIFF(Start, Stop), MCnt, BCnt}).
+
+
+handler_handle_message(#{parent := Parent} = State) ->
+    receive
+        {'EXIT', Parent, Reason} ->
+            exit({parent_exit, Reason})
+    after 0 ->
+            State
+    end.
+
+
+handler_initial_activation(_Mod, _Sock, false = _Active) ->
+    ok;
+handler_initial_activation(Mod, Sock, Active) ->
+    Mod:active(Sock, Active).
+
+
+handler_maybe_activate(Mod, Sock, once = Active) ->
+    Mod:active(Sock, Active);
+handler_maybe_activate(_, _, _) ->
+    ok.
+
+
+
+%% ==========================================================================
+
+%% which_addr() ->
+%%     case inet:getifaddrs() of
+%%         {ok, IfAddrs} ->
+%%             which_addrs(inet, IfAddrs);
+%%         {error, Reason} ->
+%%             exit({getifaddrs, Reason})
+%%     end.
+
+%% which_addrs(_Family, []) ->
+%%     exit({getifaddrs, not_found});
+%% which_addrs(Family, [{"lo", _} | IfAddrs]) ->
+%%     %% Skip
+%%     which_addrs(Family, IfAddrs);
+%% which_addrs(Family, [{"docker" ++ _, _} | IfAddrs]) ->
+%%     %% Skip docker
+%%     which_addrs(Family, IfAddrs);
+%% which_addrs(Family, [{"br-" ++ _, _} | IfAddrs]) ->
+%%     %% Skip docker
+%%     which_addrs(Family, IfAddrs);
+%% which_addrs(Family, [{"en" ++ _, IfOpts} | IfAddrs]) ->
+%%     %% Maybe take this one
+%%     case which_addr(Family, IfOpts) of
+%%         {ok, Addr} ->
+%%             Addr;
+%%         error ->
+%%             which_addrs(Family, IfAddrs)
+%%     end;
+%% which_addrs(Family, [{_IfName, IfOpts} | IfAddrs]) ->
+%%     case which_addr(Family, IfOpts) of
+%%         {ok, Addr} ->
+%%             Addr;
+%%         error ->
+%%             which_addrs(Family, IfAddrs)
+%%     end.
+
+%% which_addr(_, []) ->
+%%     error;
+%% which_addr(inet, [{addr, Addr}|_])
+%%   when is_tuple(Addr) andalso (size(Addr) =:= 4) ->
+%%     {ok, Addr};
+%% which_addr(inet6, [{addr, Addr}|_])
+%%   when is_tuple(Addr) andalso (size(Addr) =:= 8) ->
+%%     {ok, Addr};
+%% which_addr(Family, [_|IfOpts]) ->
+%%     which_addr(Family, IfOpts).
+
+
+%% ==========================================================================
+
+req(Pid, Req) ->
+    Ref = make_ref(),
+    Pid ! {?MODULE, Ref, self(), Req},
+    receive
+        {'EXIT', Pid, Reason} ->
+            {error, {exit, Reason}};
+        {?MODULE, Ref, Reply} ->
+            Reply
+    end.
+
+reply(Pid, Ref, Reply) ->
+    Pid ! {?MODULE, Ref, Reply}.
+
+
+%% ==========================================================================
+
+%% t() ->
+%%     os:timestamp().
+
+%% tdiff({A1, B1, C1} = _T1x, {A2, B2, C2} = _T2x) ->
+%%     T1 = A1*1000000000+B1*1000+(C1 div 1000), 
+%%     T2 = A2*1000000000+B2*1000+(C2 div 1000), 
+%%     T2 - T1.
+
+%% formated_timestamp() ->
+%%     format_timestamp(os:timestamp()).
+
+%% format_timestamp({_N1, _N2, N3} = TS) ->
+%%     {_Date, Time}  = calendar:now_to_local_time(TS),
+%%     {Hour,Min,Sec} = Time,
+%%     FormatTS = io_lib:format("~.2.0w:~.2.0w:~.2.0w.4~w",
+%%                              [Hour, Min, Sec, round(N3/1000)]),  
+%%     lists:flatten(FormatTS).
+
+%% %% Time is always in number os ms (milli seconds)
+%% format_time(T) ->
+%%     f("~p", [T]).
+
+
+%% ==========================================================================
+
+%% f(F, A) ->
+%%     lists:flatten(io_lib:format(F, A)).
+
+%% e(F, A) ->
+%%     p(get(sname), "<ERROR> " ++ F, A).
+
+%% i(F) ->
+%%     i(F, []).
+
+%% i(F, A) ->
+%%     p(get(sname), "<INFO> " ++ F, A).
+
+%% p(undefined, F, A) ->
+%%     p("- ", F, A);
+%% p(Prefix, F, A) ->
+%%     io:format("[~s, ~s] " ++ F ++ "~n", [formated_timestamp(), Prefix |A]).
+
diff --git a/lib/otp_mibs/src/otp_mibs.app.src b/erts/emulator/test/socket_test_ttest_tcp_server_gen.erl
index 75ef25c366..fdf40f1369 100644
--- a/lib/otp_mibs/src/otp_mibs.app.src
+++ b/erts/emulator/test/socket_test_ttest_tcp_server_gen.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2018-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,13 +18,22 @@
 %% %CopyrightEnd%
 %%
 
-{application, otp_mibs,
- [{description, "SNMP managment information base for Erlang/OTP nodes."},
-  {vsn, "%VSN%"},
-  {modules, [otp_mib]},
-  {registered, []},
-  {applications, [kernel, stdlib, snmp]},
-  {env,[]},
-  {runtime_dependencies, ["stdlib-2.0","snmp-4.25.1","mnesia-4.12",
-			  "kernel-3.0","erts-6.0"]}]}.
+-module(socket_test_ttest_tcp_server_gen).
 
+-export([
+         start/1, start/2,
+         stop/1
+        ]).
+
+-define(TRANSPORT_MOD, socket_test_ttest_tcp_gen).
+-define(MOD(D),        {?TRANSPORT_MOD, #{domain => D}}).
+
+start(Active) ->
+    start(inet, Active).
+
+start(Domain, Active) ->
+    socket_test_ttest_tcp_server:start(?MOD(Domain), Active).
+            
+
+stop(Pid) ->
+    socket_test_ttest_tcp_server:stop(Pid).
diff --git a/erts/emulator/test/socket_test_ttest_tcp_server_socket.erl b/erts/emulator/test/socket_test_ttest_tcp_server_socket.erl
new file mode 100644
index 0000000000..4045bf4e4e
--- /dev/null
+++ b/erts/emulator/test/socket_test_ttest_tcp_server_socket.erl
@@ -0,0 +1,46 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2018-2019. 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(socket_test_ttest_tcp_server_socket).
+
+-export([
+         start/4,
+         stop/1
+        ]).
+
+-define(TRANSPORT_MOD, socket_test_ttest_tcp_socket).
+%% -define(MOD(M),        {?TRANSPORT_MOD, #{async          => false, 
+%%                                           method         => M,
+%%                                           stats_interval => 10000}}).
+-define(MOD(D,M,A),      {?TRANSPORT_MOD, #{domain => D,
+                                            async  => A,
+                                            method => M}}).
+
+start(Method, Domain, Async, Active) ->
+    socket_test_ttest_tcp_server:start(?MOD(Domain, Method, Async), Active).
+    %%     {ok, {Pid, AddrPort}} ->
+    %%         MRef = erlang:monitor(process, Pid),
+    %%         {ok, {Pid, MRef, AddrPort}};
+    %%     {error, _} = ERROR ->
+    %%         ERROR
+    %% end.
+
+stop(Pid) ->
+    socket_test_ttest_tcp_server:stop(Pid).
diff --git a/erts/emulator/test/socket_test_ttest_tcp_socket.erl b/erts/emulator/test/socket_test_ttest_tcp_socket.erl
new file mode 100644
index 0000000000..9112748b4c
--- /dev/null
+++ b/erts/emulator/test/socket_test_ttest_tcp_socket.erl
@@ -0,0 +1,724 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2018-2019. 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(socket_test_ttest_tcp_socket).
+
+-export([
+	 accept/1, accept/2,
+	 active/2,
+	 close/1,
+	 connect/1, connect/2, connect/3,
+	 controlling_process/2,
+	 listen/0, listen/1, listen/2,
+	 port/1,
+	 peername/1,
+	 recv/2, recv/3,
+	 send/2,
+	 shutdown/2,
+	 sockname/1
+	]).
+
+
+-define(LIB, socket_test_lib).
+
+-define(READER_RECV_TIMEOUT, 1000).
+
+-define(DATA_MSG(Sock, Method, Data),
+        {socket,
+         #{sock => Sock, reader => self(), method => Method},
+         Data}).
+
+-define(CLOSED_MSG(Sock, Method),
+        {socket_closed,
+         #{sock => Sock, reader => self(), method => Method}}).
+
+-define(ERROR_MSG(Sock, Method, Reason),
+        {socket_error,
+         #{sock => Sock, reader => self(), method => Method},
+         Reason}).
+
+
+%% ==========================================================================
+
+%% This does not really work. Its just a placeholder for the time being...
+
+%% getopt(Sock, Opt) when is_atom(Opt) ->
+%%     socket:getopt(Sock, socket, Opt).
+
+%% setopt(Sock, Opt, Value) when is_atom(Opt) ->
+%%     socket:setopts(Sock, socket, Opt, Value).
+
+
+%% ==========================================================================
+
+%% The way we use server async its no point in doing a async accept call
+%% (we do never actually run the test with more than one client).
+accept(#{sock := LSock, opts := #{async  := Async,
+                                  method := Method} = Opts}) ->
+    case socket:accept(LSock) of
+        {ok, Sock} ->
+	    Self = self(),
+	    Reader = spawn(fun() ->
+                                   reader_init(Self, Sock, Async, false, Method)
+                           end),
+            maybe_start_stats_timer(Opts, Reader),
+	    {ok, #{sock => Sock, reader => Reader, method => Method}};
+	{error, _} = ERROR ->
+	    ERROR
+    end.
+
+%% If a timeout has been explictly specified, then we do not use
+%% async here. We will pass it on to the reader process.
+accept(#{sock := LSock, opts := #{async  := Async,
+                                  method := Method} = Opts}, Timeout) ->
+    case socket:accept(LSock, Timeout) of
+	{ok, Sock} ->
+	    Self = self(),
+	    Reader = spawn(fun() ->
+                                   reader_init(Self, Sock, Async, false, Method)
+                           end),
+            maybe_start_stats_timer(Opts, Reader),
+	    {ok, #{sock => Sock, reader => Reader, method => Method}};
+	{error, _} = ERROR ->
+	    ERROR
+    end.
+
+
+active(#{reader := Pid}, NewActive) 
+  when (is_boolean(NewActive) orelse (NewActive =:= once)) ->
+    Pid ! {?MODULE, active, NewActive},
+    ok.
+
+
+close(#{sock := Sock, reader := Pid}) ->
+    Pid ! {?MODULE, stop},
+    Unlink = case socket:sockname(Sock) of
+                 {ok, #{family := local, path := Path}} ->
+                     fun() -> os:cmd("unlink " ++ Path), ok end;
+                 _ ->
+                     fun() -> ok end
+             end,
+    Res = socket:close(Sock),
+    Unlink(),
+    Res.
+
+%% Create a socket and connect it to a peer
+connect(ServerPath) when is_list(ServerPath) ->
+    Domain     = local,
+    ClientPath = mk_unique_path(),
+    LocalSA    = #{family => Domain,
+                   path   => ClientPath},
+    ServerSA   = #{family => Domain, path => ServerPath},
+    Opts       = #{domain => Domain,
+                   proto  => default,
+                   method => plain},
+    Cleanup = fun() -> os:cmd("unlink " ++ ClientPath), ok end,
+    do_connect(LocalSA, ServerSA, Cleanup, Opts).
+
+connect(Addr, Port) when is_tuple(Addr) andalso is_integer(Port) ->
+    Domain   = inet,
+    LocalSA  = any,
+    ServerSA = #{family => Domain,
+                 addr   => Addr,
+                 port   => Port},
+    Opts     = #{domain => Domain,
+                 proto  => tcp,
+                 method => plain},
+    Cleanup  = fun() -> ok end,
+    do_connect(LocalSA, ServerSA, Cleanup, Opts);
+connect(ServerPath,
+        #{domain := local = Domain} = Opts)
+  when is_list(ServerPath) ->
+    ClientPath = mk_unique_path(),
+    LocalSA    = #{family => Domain,
+                   path   => ClientPath},
+    ServerSA   = #{family => Domain,
+                   path   => ServerPath},
+    Cleanup    = fun() -> os:cmd("unlink " ++ ClientPath), ok end,
+    do_connect(LocalSA, ServerSA, Cleanup, Opts#{proto => default}).
+
+connect(Addr, Port, #{domain := Domain} = Opts) ->
+    LocalSA  = any,
+    ServerSA = #{family => Domain,
+                 addr   => Addr,
+                 port   => Port},
+    Cleanup  = fun() -> ok end,
+    do_connect(LocalSA, ServerSA, Cleanup, Opts#{proto => tcp}).
+
+do_connect(LocalSA, ServerSA, Cleanup, #{domain := Domain,
+                                         proto  := Proto,
+                                         async  := Async,
+                                         method := Method} = Opts) ->
+    try
+	begin
+	    Sock =
+		case socket:open(Domain, stream, Proto) of
+		    {ok, S} ->
+			S;
+		    {error, OReason} ->
+			throw({error, {open, OReason}})
+		end,
+	    case socket:bind(Sock, LocalSA) of
+		{ok, _} ->
+		    ok;
+		{error, BReason} ->
+		    (catch socket:close(Sock)),
+                    Cleanup(),
+		    throw({error, {bind, BReason}})
+	    end,
+	    case socket:connect(Sock, ServerSA) of
+		ok ->
+		    ok;
+		{error, CReason} ->
+		    (catch socket:close(Sock)),
+                    Cleanup(),
+		    throw({error, {connect, CReason}})
+	    end,
+	    Self   = self(),
+	    Reader = spawn(fun() ->
+                                   reader_init(Self, Sock, Async, false, Method)
+                           end),
+            maybe_start_stats_timer(Opts, Reader),
+	    {ok, #{sock => Sock, reader => Reader, method => Method}}
+	end
+    catch
+	throw:ERROR:_ ->
+	    ERROR
+    end.
+
+mk_unique_path() ->
+    [NodeName | _] = string:tokens(atom_to_list(node()), [$@]),
+    ?LIB:f("/tmp/esock_~s_~w", [NodeName, erlang:system_time(nanosecond)]).
+
+maybe_start_stats_timer(#{stats_to       := Pid,
+                          stats_interval := T},
+                        Reader) when is_pid(Pid) ->
+    erlang:start_timer(T, Pid, {stats, T, "reader", Reader});
+maybe_start_stats_timer(_O, _) ->
+    ok.
+
+controlling_process(#{sock := Sock, reader := Pid}, NewPid) ->
+    case socket:setopt(Sock, otp, controlling_process, NewPid) of
+	ok ->
+	    Pid ! {?MODULE, self(), controlling_process, NewPid},
+	    receive
+		{?MODULE, Pid, controlling_process} ->
+		    ok
+	    end;
+	{error, _} = ERROR ->
+	    ERROR
+    end.
+
+
+%% Create a listen socket
+listen() ->
+    listen(0).
+
+listen(Port) when is_integer(Port) ->
+    listen(Port, #{domain => inet, async => false, method => plain});
+listen(Path) when is_list(Path) ->
+    listen(Path, #{domain => local, async => false, method => plain}).
+
+listen(0, #{domain := local} = Opts) ->
+    listen(mk_unique_path(), Opts);
+listen(Path, #{domain := local = Domain} = Opts)
+  when is_list(Path) andalso (Path =/= []) ->
+    SA = #{family => Domain,
+           path   => Path},
+    Cleanup = fun() -> os:cmd("unlink " ++ Path), ok end,
+    do_listen(SA, Cleanup, Opts#{proto => default});
+listen(Port, #{domain := Domain} = Opts)
+  when is_integer(Port) andalso (Port >= 0) ->
+    %% Bind fills in the rest
+    case ?LIB:which_local_host_info(Domain) of
+	{ok, {_, _, Addr}} ->
+	    SA = #{family => Domain,
+		   addr   => Addr,
+		   port   => Port},
+	    Cleanup = fun() -> ok end,
+	    do_listen(SA, Cleanup, Opts#{proto => tcp});
+	{error, _} = ERROR ->
+	    ERROR
+    end.
+
+do_listen(SA,
+          Cleanup,
+          #{domain := Domain, proto  := Proto, 
+            async  := Async,  method := Method} = Opts)
+  when (Method =:= plain) orelse (Method =:= msg) andalso
+       is_boolean(Async) ->
+    try
+	begin
+	    Sock = case socket:open(Domain, stream, Proto) of
+		       {ok, S} ->
+			   S;
+		       {error, OReason} ->
+			   throw({error, {open, OReason}})
+		   end,
+	    case socket:bind(Sock, SA) of
+		{ok, _} ->
+		    ok;
+		{error, BReason} ->
+		    (catch socket:close(Sock)),
+                    Cleanup(),
+		    throw({error, {bind, BReason}})
+	    end,
+	    case socket:listen(Sock) of
+		ok ->
+                    ok;
+                {error, LReason} ->
+		    (catch socket:close(Sock)),
+                    Cleanup(),
+                    throw({error, {listen, LReason}})
+            end,
+	    {ok, #{sock => Sock, opts => Opts}}
+	end
+    catch
+	throw:{error, Reason}:_ ->
+	    {error, Reason}
+    end.
+
+
+port(#{sock := Sock}) ->
+    case socket:sockname(Sock) of
+	{ok, #{family := local, path := Path}} ->
+	    {ok, Path};
+	{ok, #{port := Port}} ->
+	    {ok, Port};
+	{error, _} = ERROR ->
+	    ERROR
+    end.
+
+
+peername(#{sock := Sock}) ->
+    case socket:peername(Sock) of
+	{ok, #{family := local, path := Path}} ->
+	    {ok, Path};
+	{ok, #{addr := Addr, port := Port}} ->
+	    {ok, {Addr, Port}};
+	{error, _} = ERROR ->
+	    ERROR
+    end.
+
+
+recv(#{sock := Sock, method := plain}, Length) ->
+    socket:recv(Sock, Length);
+recv(#{sock := Sock, method := msg}, Length) ->
+    case socket:recvmsg(Sock, Length, 0, [], infinity) of
+        {ok, #{iov := [Bin]}} ->
+            {ok, Bin};
+        {error, _} = ERROR ->
+            ERROR
+    end.
+
+recv(#{sock := Sock, method := plain}, Length, Timeout) ->
+    socket:recv(Sock, Length, Timeout);
+recv(#{sock := Sock, method := msg}, Length, Timeout) ->
+    case socket:recvmsg(Sock, Length, 0, [], Timeout) of
+        {ok, #{iov := [Bin]}} ->
+            {ok, Bin};
+        {error, _} = ERROR ->
+            ERROR
+    end.
+
+
+send(#{sock := Sock, method := plain}, Bin) ->
+    socket:send(Sock, Bin);
+send(#{sock := Sock, method := msg}, Bin) ->
+    socket:sendmsg(Sock, #{iov => [Bin]}).
+
+
+shutdown(#{sock := Sock}, How) ->
+    socket:shutdown(Sock, How).
+
+
+sockname(#{sock := Sock}) ->
+    case socket:sockname(Sock) of
+	{ok, #{addr := Addr, port := Port}} ->
+	    {ok, {Addr, Port}};
+	{error, _} = ERROR ->
+	    ERROR
+    end.
+
+
+%% ==========================================================================
+
+reader_init(ControllingProcess, Sock, Async, Active, Method) 
+  when is_pid(ControllingProcess) andalso
+       is_boolean(Async) andalso
+       (is_boolean(Active) orelse (Active =:= once)) andalso 
+       ((Method =:= plain) orelse (Method =:= msg)) ->
+    put(verbose, false),
+    MRef = erlang:monitor(process, ControllingProcess),
+    reader_loop(#{ctrl_proc      => ControllingProcess,
+		  ctrl_proc_mref => MRef,
+                  async          => Async,
+                  select_info    => undefined,
+                  select_num     => 0, % Count the number of select messages
+		  active         => Active,
+		  sock           => Sock,
+                  method         => Method}).
+
+
+%% Never read
+reader_loop(#{active    := false,
+	      ctrl_proc := Pid} = State) ->
+    receive
+	{?MODULE, stop} ->
+            reader_exit(State, stop);
+
+	{?MODULE, Pid, controlling_process, NewPid} ->
+	    OldMRef = maps:get(ctrl_proc_mref, State),
+	    erlang:demonitor(OldMRef, [flush]),
+	    NewMRef = erlang:monitor(process, NewPid),
+	    Pid ! {?MODULE, self(), controlling_process},
+	    reader_loop(State#{ctrl_proc      => NewPid,
+			       ctrl_proc_mref => NewMRef});
+
+	{?MODULE, active, NewActive} ->
+	    reader_loop(State#{active => NewActive});
+
+	{'DOWN', MRef, process, Pid, Reason} ->
+	    case maps:get(ctrl_proc_mref, State) of
+		MRef ->
+                    reader_exit(State, {ctrl_exit, Reason});
+		_ ->
+		    reader_loop(State)
+	    end
+    end;
+
+%% Read *once* and then change to false
+reader_loop(#{active    := once,
+	      async     := false,
+              sock      := Sock,
+              method    := Method,
+	      ctrl_proc := Pid} = State) ->
+    case do_recv(Method, Sock) of
+	{ok, Data} ->
+	    Pid ! ?DATA_MSG(Sock, Method, Data),
+	    reader_loop(State#{active => false});
+	{error, timeout} ->
+	    receive
+		{?MODULE, stop} ->
+		    reader_exit(State, stop);
+
+		{?MODULE, Pid, controlling_process, NewPid} ->
+		    OldMRef = maps:get(ctrl_proc_mref, State),
+		    erlang:demonitor(OldMRef, [flush]),
+		    NewMRef = erlang:monitor(process, NewPid),
+		    Pid ! {?MODULE, self(), controlling_process},
+		    reader_loop(State#{ctrl_proc      => NewPid,
+				       ctrl_proc_mref => NewMRef});
+
+		{?MODULE, active, NewActive} ->
+		    reader_loop(State#{active => NewActive});
+
+		{'DOWN', MRef, process, Pid, Reason} ->
+		    case maps:get(ctrl_proc_mref, State) of
+                        MRef ->
+                            reader_exit(State, {ctrl_exit, Reason});
+			_ ->
+			    reader_loop(State)
+		    end
+	    after 0 ->
+		    reader_loop(State)
+	    end;
+
+	{error, closed} = E1 ->
+            Pid ! ?CLOSED_MSG(Sock, Method),
+            reader_exit(State, E1);
+
+	{error, Reason} = E2 ->
+	    Pid ! ?ERROR_MSG(Sock, Method, Reason),
+            reader_exit(State, E2)
+    end;
+reader_loop(#{active      := once,
+	      async       := true,
+              select_info := undefined,
+              sock        := Sock,
+              method      := Method,
+	      ctrl_proc   := Pid} = State) ->
+    case do_recv(Method, Sock, nowait) of
+        {select, SelectInfo} ->
+            reader_loop(State#{select_info => SelectInfo});
+	{ok, Data} ->
+	    Pid ! ?DATA_MSG(Sock, Method, Data),
+	    reader_loop(State#{active => false});
+
+	{error, closed} = E1 ->
+	    Pid ! ?CLOSED_MSG(Sock, Method),
+            reader_exit(State, E1);
+
+	{error, Reason} = E2 ->
+	    Pid ! ?ERROR_MSG(Sock, Method, Reason),
+            reader_exit(State, E2)
+    end;
+reader_loop(#{active      := once,
+	      async       := true,
+              select_info := {select_info, _, Ref},
+              select_num  := N,
+              sock        := Sock,
+              method      := Method,
+	      ctrl_proc   := Pid} = State) ->
+    receive
+        {?MODULE, stop} ->
+            reader_exit(State, stop);
+        
+        {?MODULE, Pid, controlling_process, NewPid} ->
+            OldMRef = maps:get(ctrl_proc_mref, State),
+            erlang:demonitor(OldMRef, [flush]),
+            NewMRef = erlang:monitor(process, NewPid),
+            Pid ! {?MODULE, self(), controlling_process},
+            reader_loop(State#{ctrl_proc      => NewPid,
+                               ctrl_proc_mref => NewMRef});
+        
+        {?MODULE, active, NewActive} ->
+            reader_loop(State#{active => NewActive});
+        
+        {'DOWN', MRef, process, Pid, Reason} ->
+            case maps:get(ctrl_proc_mref, State) of
+                MRef ->
+                    reader_exit(State, {ctrl_exit, Reason});
+                _ ->
+                    reader_loop(State)
+            end;
+
+        {'$socket', Sock, select, Ref} ->
+            case do_recv(Method, Sock, nowait) of
+                {ok, Data} when is_binary(Data) ->
+                    Pid ! ?DATA_MSG(Sock, Method, Data),
+                    reader_loop(State#{active      => false,
+                                       select_info => undefined,
+                                       select_num  => N+1});
+                
+                {error, closed} = E1 ->
+                    Pid ! ?CLOSED_MSG(Sock, Method),
+                    reader_exit(State, E1);
+                
+                {error, Reason} = E2 ->
+                    Pid ! ?ERROR_MSG(Sock, Method, Reason),
+                    reader_exit(State, E2)
+            end
+    end;
+
+%% Read and forward data continuously
+reader_loop(#{active    := true,
+	      async     := false,
+	      sock      := Sock,
+              method    := Method,
+	      ctrl_proc := Pid} = State) ->
+    case do_recv(Method, Sock) of
+	{ok, Data} ->
+	    Pid ! ?DATA_MSG(Sock, Method, Data),
+	    reader_loop(State);
+	{error, timeout} ->
+	    receive
+		{?MODULE, stop} ->
+                    reader_exit(State, stop);
+
+		{?MODULE, Pid, controlling_process, NewPid} ->
+		    OldMRef = maps:get(ctrl_proc_mref, State),
+		    erlang:demonitor(OldMRef, [flush]),
+		    NewMRef = erlang:monitor(process, NewPid),
+		    Pid ! {?MODULE, self(), controlling_process},
+		    reader_loop(State#{ctrl_proc      => NewPid,
+				       ctrl_proc_mref => NewMRef});
+
+		{?MODULE, active, NewActive} ->
+		    reader_loop(State#{active => NewActive});
+
+		{'DOWN', MRef, process, Pid, Reason} ->
+		    case maps:get(ctrl_proc_mref, State) of
+			MRef ->
+                            reader_exit(State, {ctrl_exit, Reason});
+			_ ->
+			    reader_loop(State)
+		    end
+	    after 0 ->
+		    reader_loop(State)
+	    end;
+
+	{error, closed} = E1 ->
+	    Pid ! ?CLOSED_MSG(Sock, Method),
+            reader_exit(State, E1);
+
+	{error, Reason} = E2 ->
+	    Pid ! ?ERROR_MSG(Sock, Method, Reason),
+            reader_exit(State, E2)
+    end;
+reader_loop(#{active      := true,
+	      async       := true,
+              select_info := undefined,
+	      sock        := Sock,
+              method      := Method,
+	      ctrl_proc   := Pid} = State) ->
+    case do_recv(Method, Sock) of
+        {select, SelectInfo} ->
+            reader_loop(State#{select_info => SelectInfo});
+	{ok, Data} ->
+	    Pid ! ?DATA_MSG(Sock, Method, Data),
+	    reader_loop(State);
+
+	{error, closed} = E1 ->
+	    Pid ! ?CLOSED_MSG(Sock, Method),
+            reader_exit(State, E1);
+
+	{error, Reason} = E2 ->
+	    Pid ! ?ERROR_MSG(Sock, Method, Reason),
+            reader_exit(State, E2)
+    end;
+reader_loop(#{active      := true,
+	      async       := true,
+              select_info := {select_info, _, Ref},
+              select_num  := N,
+	      sock        := Sock,
+              method      := Method,
+	      ctrl_proc   := Pid} = State) ->
+    receive
+        {?MODULE, stop} ->
+            reader_exit(State, stop);
+        
+        {?MODULE, Pid, controlling_process, NewPid} ->
+            OldMRef = maps:get(ctrl_proc_mref, State),
+            erlang:demonitor(OldMRef, [flush]),
+            NewMRef = erlang:monitor(process, NewPid),
+            Pid ! {?MODULE, self(), controlling_process},
+            reader_loop(State#{ctrl_proc      => NewPid,
+                               ctrl_proc_mref => NewMRef});
+        
+        {?MODULE, active, NewActive} ->
+            reader_loop(State#{active => NewActive});
+        
+        {'DOWN', MRef, process, Pid, Reason} ->
+            case maps:get(ctrl_proc_mref, State) of
+                MRef ->
+                    reader_exit(State, {ctrl_exit, Reason});
+                _ ->
+                    reader_loop(State)
+            end;
+
+        {'$socket', Sock, select, Ref} ->
+            case do_recv(Method, Sock, nowait) of
+                {ok, Data} when is_binary(Data) ->
+                    Pid ! ?DATA_MSG(Sock, Method, Data),
+                    reader_loop(State#{select_info => undefined,
+                                       select_num  => N+1});
+                
+                {error, closed} = E1 ->
+                    Pid ! ?CLOSED_MSG(Sock, Method),
+                    reader_exit(State, E1);
+                
+                {error, Reason} = E2 ->
+                    Pid ! ?ERROR_MSG(Sock, Method, Reason),
+                    reader_exit(State, E2)
+            end
+    end.
+
+
+do_recv(Method, Sock) ->
+    do_recv(Method, Sock, ?READER_RECV_TIMEOUT).
+
+do_recv(plain, Sock, Timeout) ->
+    socket:recv(Sock, 0, Timeout);
+do_recv(msg, Sock, Timeout) ->
+    case socket:recvmsg(Sock, 0, 0, [], Timeout) of
+        {ok, #{iov := [Bin]}} ->
+            {ok, Bin};
+        {select, _} = SELECT ->
+            SELECT;
+        {error, _} = ERROR ->
+            ERROR
+    end.
+
+
+reader_exit(#{async := false, active := Active}, stop) ->
+    vp("reader stopped when active: ~w", [Active]),
+    exit(normal);
+reader_exit(#{async       := true, 
+              active      := Active,
+              select_info := SelectInfo,
+              select_num  := N}, stop) ->
+    vp("reader stopped when active: ~w"
+       "~n   Current select info:       ~p"
+       "~n   Number of select messages: ~p", [Active, SelectInfo, N]),
+    exit(normal);
+reader_exit(#{async := false, active := Active}, {ctrl_exit, normal}) ->
+    vp("reader ctrl exit when active: ~w", [Active]),
+    exit(normal);
+reader_exit(#{async       := true, 
+              active      := Active,
+              select_info := SelectInfo,
+              select_num  := N}, {ctrl_exit, normal}) ->
+    vp("reader ctrl exit when active: ~w"
+       "~n   Current select info:       ~p"
+       "~n   Number of select messages: ~p", [Active, SelectInfo, N]),
+    exit(normal);
+reader_exit(#{async := false, active := Active}, {ctrl_exit, Reason}) ->
+    vp("reader exit when ctrl crash when active: ~w", [Active]),
+    exit({controlling_process, Reason});
+reader_exit(#{async       := true, 
+              active      := Active,
+              select_info := SelectInfo,
+              select_num  := N}, {ctrl_exit, Reason}) ->
+    vp("reader exit when ctrl crash when active: ~w"
+       "~n   Current select info:       ~p"
+       "~n   Number of select messages: ~p", [Active, SelectInfo, N]),
+    exit({controlling_process, Reason});
+reader_exit(#{async := false, active := Active}, {error, closed}) ->
+    vp("reader exit when socket closed when active: ~w", [Active]),
+    exit(normal);
+reader_exit(#{async       := true, 
+              active      := Active,
+              select_info := SelectInfo,
+              select_num  := N}, {error, closed}) ->
+    vp("reader exit when socket closed when active: ~w "
+       "~n   Current select info:       ~p"
+       "~n   Number of select messages: ~p", [Active, SelectInfo, N]),
+    exit(normal);
+reader_exit(#{async := false, active := Active}, {error, Reason}) ->
+    vp("reader exit when socket error when active: ~w", [Active]),
+    exit(Reason);
+reader_exit(#{async       := true, 
+              active      := Active,
+              select_info := SelectInfo,
+              select_num  := N}, {error, Reason}) ->
+    vp("reader exit when socket error when active: ~w: "
+       "~n   Current select info:       ~p"
+       "~n   Number of select messages: ~p", [Active, SelectInfo, N]),
+    exit(Reason).
+
+
+
+
+
+
+%% ==========================================================================
+
+vp(F, A) ->
+    vp(get(verbose), F, A).
+
+vp(true, F, A) ->
+    p(F, A);
+vp(_, _, _) ->
+    ok.
+
+p(F, A) ->
+    io:format(F ++ "~n", A).
+
diff --git a/erts/emulator/test/statistics_SUITE.erl b/erts/emulator/test/statistics_SUITE.erl
index ae3099633a..d278ac86c7 100644
--- a/erts/emulator/test/statistics_SUITE.erl
+++ b/erts/emulator/test/statistics_SUITE.erl
@@ -93,25 +93,34 @@ wall_clock_zero_diff1(0) ->
 %% statistics(wall_clock) are compatible, and are within a small number
 %% of ms of the amount of real time we waited for.
 wall_clock_update(Config) when is_list(Config) ->
-    wall_clock_update1(6).
+    N = 10,
+    Inc = 200,
+    TotalTime = wall_clock_update1(N, Inc, 0),
+    Overhead = TotalTime - N * Inc,
+    IsDebug = test_server:is_debug(),
 
-wall_clock_update1(N) when N > 0 ->
-    {T1_wc_time, _} = statistics(wall_clock),
-    receive after 1000 -> ok end,
-    {T2_wc_time, Wc_Diff} = statistics(wall_clock),
-
-    Wc_Diff = T2_wc_time - T1_wc_time,
-    io:format("Wall clock diff = ~p; should be  = 1000..1040~n", [Wc_Diff]),
-    case test_server:is_debug() of
-        false ->
-            true = Wc_Diff =< 1040;
+    %% Check that the average overhead is reasonable.
+    if
+        Overhead < N * 100 ->
+            ok;
+        IsDebug, Overhead < N * 1000 ->
+            ok;
         true ->
-            true = Wc_Diff =< 2000	%Be more tolerant in debug-compiled emulator.
-    end,
-    true = Wc_Diff >= 1000,
-    wall_clock_update1(N-1);
-wall_clock_update1(0) ->
-    ok.
+            io:format("There was an overhead of ~p ms during ~p rounds.",
+                      [Overhead,N]),
+            ct:fail(too_much_overhead)
+    end.
+
+wall_clock_update1(N, Inc, Total) when N > 0 ->
+    {Time1, _} = statistics(wall_clock),
+    receive after Inc -> ok end,
+    {Time2, WcDiff} = statistics(wall_clock),
+    WcDiff = Time2 - Time1,
+    io:format("Wall clock diff = ~p (expected at least ~p)\n", [WcDiff,Inc]),
+    true = WcDiff >= Inc,
+    wall_clock_update1(N-1, Inc, Total + WcDiff);
+wall_clock_update1(0, _, Total) ->
+    Total.
 
 
 %%% Test statistics(runtime).
diff --git a/erts/emulator/test/system_info_SUITE.erl b/erts/emulator/test/system_info_SUITE.erl
index 21ab6b378a..b48be3dd04 100644
--- a/erts/emulator/test/system_info_SUITE.erl
+++ b/erts/emulator/test/system_info_SUITE.erl
@@ -37,8 +37,12 @@
 
 -export([process_count/1, system_version/1, misc_smoke_tests/1,
          heap_size/1, wordsize/1, memory/1, ets_limit/1, atom_limit/1,
-         ets_count/1,
-         atom_count/1]).
+         procs_bug/1,
+         ets_count/1, atom_count/1, system_logger/1]).
+
+-export([init/1, handle_event/2, handle_call/2]).
+
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
@@ -46,8 +50,20 @@ suite() ->
 
 all() -> 
     [process_count, system_version, misc_smoke_tests,
-     ets_count,
-     heap_size, wordsize, memory, ets_limit, atom_limit, atom_count].
+     ets_count, heap_size, wordsize, memory, ets_limit, atom_limit, atom_count,
+     procs_bug,
+     system_logger].
+
+
+init_per_testcase(procs_bug, Config) ->
+    procs_bug(init_per_testcase, Config);
+init_per_testcase(_, Config) ->
+    Config.
+
+end_per_testcase(procs_bug, Config) ->
+    procs_bug(end_per_testcase, Config);
+end_per_testcase(_, _) ->
+    ok.
 
 %%%
 %%% The test cases -------------------------------------------------------------
@@ -457,11 +473,16 @@ cmp_memory(MWs, Str) ->
     %% Total, processes, processes_used, and system will seldom
     %% give us exactly the same result since the two readings
     %% aren't taken atomically.
+    %%
+    %% Torerance is scaled according to the number of schedulers
+    %% to match spawn_mem_workers.
+
+    Tolerance = 1.05 + 0.01 * erlang:system_info(schedulers_online),
 
-    cmp_memory(total, EM, EDM, 1.05),
-    cmp_memory(processes, EM, EDM, 1.05),
-    cmp_memory(processes_used, EM, EDM, 1.05),
-    cmp_memory(system, EM, EDM, 1.05),
+    cmp_memory(total, EM, EDM, Tolerance),
+    cmp_memory(processes, EM, EDM, Tolerance),
+    cmp_memory(processes_used, EM, EDM, Tolerance),
+    cmp_memory(system, EM, EDM, Tolerance),
 
     ok.
     
@@ -573,3 +594,116 @@ atom_count(Config) when is_list(Config) ->
     true = Limit >= Count2,
     true = Count2 > Count1,
     ok.
+
+
+system_logger(Config) when is_list(Config) ->
+
+    TC = self(),
+
+    ok = error_logger:add_report_handler(?MODULE, [TC]),
+
+    generate_log_event(),
+
+    flush(1, report_handler),
+
+    Initial = erlang:system_info(system_logger),
+
+    {Logger,_} = spawn_monitor(fun F() -> receive M -> TC ! {system_logger,M}, F() end end),
+
+    Initial = erlang:system_flag(system_logger, Logger),
+    Logger = erlang:system_info(system_logger),
+
+    generate_log_event(),
+    flush(1, system_logger),
+
+    Logger = erlang:system_flag(system_logger, Logger),
+
+    generate_log_event(),
+    flush(1, system_logger),
+
+    exit(Logger, die),
+    receive {'DOWN',_,_,_,_} -> ok end,
+
+    generate_log_event(),
+    flush(1, report_handler),
+
+    logger = erlang:system_info(system_logger),
+
+    logger = erlang:system_flag(system_logger, undefined),
+    generate_log_event(),
+    flush(),
+
+    undefined = erlang:system_flag(system_logger, Initial),
+
+    ok.
+
+flush() ->
+    receive
+        M ->
+            ct:fail({unexpected_message, M})
+    after 0 ->
+            ok
+    end.
+
+flush(0, _Pat) ->
+    flush();
+flush(Cnt, Pat) ->
+    receive
+        M when element(1,M) =:= Pat ->
+            ct:log("~p",[M]),
+            flush(Cnt-1, Pat)
+    after 500 ->
+            ct:fail({missing, Cnt, Pat})
+    end.
+
+generate_log_event() ->
+    {_Pid, Ref} = spawn_monitor(fun() -> ok = nok end),
+    receive {'DOWN', Ref, _, _, _} -> ok end.
+
+init([To]) ->
+    {ok, To}.
+
+handle_call(Msg, State) ->
+    {ok, Msg, State}.
+
+handle_event(Event, State) ->
+    State ! {report_handler, Event},
+    {ok, State}.
+
+
+%% OTP-15909: Provoke bug that would cause VM crash
+%% if doing system_info(procs) when process have queued exit/down signals.
+procs_bug(init_per_testcase, Config) ->
+    %% Use single scheduler and process prio to starve monitoring processes
+    %% from handling their received DOWN signals.
+    OldSchedOnline = erlang:system_flag(schedulers_online,1),
+    [{schedulers_online, OldSchedOnline} | Config];
+procs_bug(end_per_testcase, Config) ->
+    erlang:system_flag(schedulers_online,
+                       proplists:get_value(schedulers_online, Config)),
+    ok.
+
+procs_bug(Config) when is_list(Config) ->
+    {Monee,_} = spawn_opt(fun () -> receive die -> ok end end,
+                         [monitor,{priority,max}]),
+    Papa = self(),
+    Pids = [begin
+                P = spawn_opt(fun () ->
+                                      erlang:monitor(process, Monee),
+                                      Papa ! {self(),ready},
+                                      receive "nada" -> no end
+                              end,
+                              [link, {priority,normal}]),
+                {P, ready} = receive M -> M end,
+                P
+            end
+            || _ <- lists:seq(1,10)],
+    process_flag(priority,high),
+    Monee ! die,
+    {'DOWN',_,process,Monee,normal} = receive M -> M end,
+
+    %% This call did crash VM as Pids have pending DOWN signals.
+    erlang:system_info(procs),
+    process_flag(priority,normal),
+    [begin unlink(P), exit(P, kill) end || P <- Pids],
+    ok.
diff --git a/erts/emulator/test/timer_bif_SUITE.erl b/erts/emulator/test/timer_bif_SUITE.erl
index fc11a04a31..15fe13c8c0 100644
--- a/erts/emulator/test/timer_bif_SUITE.erl
+++ b/erts/emulator/test/timer_bif_SUITE.erl
@@ -361,7 +361,7 @@ evil_timers(Config) when is_list(Config) ->
     %%
     %% 1. A timer started with erlang:start_timer(Time, Receiver, Msg),
     %%    where Msg is a composite term, expires, and the receivers main
-    %%    lock *can not* be acquired immediately (typically when the
+    %%    lock *cannot* be acquired immediately (typically when the
     %%    receiver *is* running).
     %%
     %%    The wrap tuple ({timeout, TRef, Msg}) will in this case
@@ -372,7 +372,7 @@ evil_timers(Config) when is_list(Config) ->
     RecvTimeOutMsgs0 = evil_recv_timeouts(200),
     %% 2. A timer started with erlang:start_timer(Time, Receiver, Msg),
     %%    where Msg is an immediate term, expires, and the receivers main
-    %%    lock *can not* be acquired immediately (typically when the
+    %%    lock *cannot* be acquired immediately (typically when the
     %%    receiver *is* running).
     %%
     %%    The wrap tuple will in this case be allocated in a new
diff --git a/erts/emulator/test/trace_local_SUITE.erl b/erts/emulator/test/trace_local_SUITE.erl
index 253d5fed23..ad802352b9 100644
--- a/erts/emulator/test/trace_local_SUITE.erl
+++ b/erts/emulator/test/trace_local_SUITE.erl
@@ -1181,7 +1181,9 @@ undef(X) ->
     ?MODULE:undef(X, X). % undef
 
 lists_reverse(A, B) ->
-    lists:reverse(A, B).
+    Res = lists:reverse(A, B),
+    _ = (catch abs(A)),
+    Res.
 
 
 
diff --git a/erts/emulator/test/z_SUITE.erl b/erts/emulator/test/z_SUITE.erl
index 1c52e1a934..6549108126 100644
--- a/erts/emulator/test/z_SUITE.erl
+++ b/erts/emulator/test/z_SUITE.erl
@@ -251,7 +251,7 @@ pollset_size(Config) when is_list(Config) ->
 	  end.
 
 check_io_debug(Config) when is_list(Config) ->
-    case lists:keysearch(name, 1, erlang:system_info(check_io)) of
+    case lists:keysearch(name, 1, hd(erlang:system_info(check_io))) of
 	      {value, {name, erts_poll}} -> check_io_debug_test();
 	      _ -> {skipped, "Not implemented in this emulator"}
 	  end.
diff --git a/erts/emulator/utils/beam_makeops b/erts/emulator/utils/beam_makeops
index da994fae3e..605a402f2a 100755
--- a/erts/emulator/utils/beam_makeops
+++ b/erts/emulator/utils/beam_makeops
@@ -1488,7 +1488,7 @@ sub code_gen {
                 $var_decls .= "Eterm $tmp;\n";
                 $tmp_arg_num++;
                 push(@f, $tmp);
-                $prefix .= "GetR($arg_offset, $tmp);\n";
+                $prefix .= "GetSource(" . arg_offset($arg_offset) . ", $tmp);\n";
                 $need_block = 1;
                 last SWITCH;
             };
@@ -1840,12 +1840,57 @@ sub do_pack_one {
     }
 
     #
-    # Return if there is nothing to pack.
-    #
-    if ($packable_args == 0) {
-        return (-1);
-    } elsif ($packable_args == 1 and $options == 0) {
-        return (-1);
+    # Check whether any packing can be done.
+    #
+    my $nothing_to_pack = $packable_args == 0 ||
+        $packable_args == 1 && $options == 0;
+    if ($nothing_to_pack) {
+        # The packing engine in the loader processes the operands from
+        # right to left. Rightmost operands that are not packed must
+        # be stacked and then unstacked.
+        #
+        # Because instructions may be broken up into micro
+        # instructions, we might not see all operands at once. So
+        # there could be a micro instructions that packs the operands
+        # to the left of the current micro instruction. If that is the
+        # case, it is essential that we generate stacking and
+        # unstacking instructions even when no packing is
+        # possible. (build_pack_spec() will remove any unecessary
+        # stacking and unstacking operations.)
+        #
+        # Here is an example. Say that we have this instruction:
+        #
+        #     i_plus x x j d
+        #
+        # that comprises two micro instructions:
+        #
+        #     i_plus.fetch x x
+        #     i_plus.execute j d
+        #
+        # This function (do_pack_one()) will be called twice, once to pack
+        # 'x' and 'x', and once to pack 'j' and 'd'.
+        #
+        # On a 32-bit machine, the 'j' and 'd' operands can't be
+        # packed because 'j' requires a full word. The two 'x'
+        # operands in the i_plus.fetch micro instruction will be
+        # packed, though, so we must generate instructions for packing
+        # and unpacking the 'j' and 'd' operands.
+        my $down = '';
+        my $up = '';
+        foreach my $arg (@args) {
+            my $push = 'g';
+            if ($type_bit{$arg} & $type_bit{'q'}) {
+                # The operand may be a literal.
+                $push = 'q';
+            } elsif ($type_bit{$arg} & $type_bit{'f'}) {
+                # The operand may be a failure label.
+                $push = 'f';
+            }
+            $down = "$push${down}";
+            $up = "${up}p";
+        }
+        my $pack_spec = "$down:$up";
+        return (1, ['',$pack_spec,@args]);
     }
 
     #
@@ -2692,7 +2737,7 @@ sub tr_maybe_keep {
 		return;
 	    }
 	} elsif ($op eq 'store_var_next_arg') {
-	    return unless shift(@last_instr) eq $args[0];
+	    return unless @last_instr and shift(@last_instr) eq $args[0];
 	} elsif (defined $pos) {
 	    return;
 	}
diff --git a/erts/emulator/zlib/adler32.c b/erts/emulator/zlib/adler32.c
index c693a42b7c..d0be4380a3 100644
--- a/erts/emulator/zlib/adler32.c
+++ b/erts/emulator/zlib/adler32.c
@@ -1,20 +1,15 @@
 /* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2011 Mark Adler
+ * Copyright (C) 1995-2011, 2016 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 /* @(#) $Id$ */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
 #include "zutil.h"
 
-#define local static
-
 local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
 
-#define BASE 65521      /* largest prime smaller than 65536 */
+#define BASE 65521U     /* largest prime smaller than 65536 */
 #define NMAX 5552
 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
 
@@ -65,10 +60,10 @@ local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
 #endif
 
 /* ========================================================================= */
-uLong ZEXPORT adler32(adler, buf, len)
+uLong ZEXPORT adler32_z(adler, buf, len)
     uLong adler;
     const Bytef *buf;
-    uInt len;
+    z_size_t len;
 {
     unsigned long sum2;
     unsigned n;
@@ -136,6 +131,15 @@ uLong ZEXPORT adler32(adler, buf, len)
 }
 
 /* ========================================================================= */
+uLong ZEXPORT adler32(adler, buf, len)
+    uLong adler;
+    const Bytef *buf;
+    uInt len;
+{
+    return adler32_z(adler, buf, len);
+}
+
+/* ========================================================================= */
 local uLong adler32_combine_(adler1, adler2, len2)
     uLong adler1;
     uLong adler2;
@@ -159,7 +163,7 @@ local uLong adler32_combine_(adler1, adler2, len2)
     sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
     if (sum1 >= BASE) sum1 -= BASE;
     if (sum1 >= BASE) sum1 -= BASE;
-    if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1);
+    if (sum2 >= ((unsigned long)BASE << 1)) sum2 -= ((unsigned long)BASE << 1);
     if (sum2 >= BASE) sum2 -= BASE;
     return sum1 | (sum2 << 16);
 }
diff --git a/erts/emulator/zlib/compress.c b/erts/emulator/zlib/compress.c
index 8ecef0f790..e2db404abf 100644
--- a/erts/emulator/zlib/compress.c
+++ b/erts/emulator/zlib/compress.c
@@ -1,13 +1,10 @@
 /* compress.c -- compress a memory buffer
- * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 /* @(#) $Id$ */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
 #define ZLIB_INTERNAL
 #include "zlib.h"
 
@@ -31,16 +28,11 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
 {
     z_stream stream;
     int err;
+    const uInt max = (uInt)-1;
+    uLong left;
 
-    stream.next_in = (z_const Bytef *)source;
-    stream.avail_in = (uInt)sourceLen;
-#ifdef MAXSEG_64K
-    /* Check for source > 64K on 16-bit machine: */
-    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
-#endif
-    stream.next_out = dest;
-    stream.avail_out = (uInt)*destLen;
-    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
+    left = *destLen;
+    *destLen = 0;
 
     stream.zalloc = (alloc_func)0;
     stream.zfree = (free_func)0;
@@ -49,15 +41,26 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
     err = deflateInit(&stream, level);
     if (err != Z_OK) return err;
 
-    err = deflate(&stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        deflateEnd(&stream);
-        return err == Z_OK ? Z_BUF_ERROR : err;
-    }
-    *destLen = stream.total_out;
+    stream.next_out = dest;
+    stream.avail_out = 0;
+    stream.next_in = (z_const Bytef *)source;
+    stream.avail_in = 0;
+
+    do {
+        if (stream.avail_out == 0) {
+            stream.avail_out = left > (uLong)max ? max : (uInt)left;
+            left -= stream.avail_out;
+        }
+        if (stream.avail_in == 0) {
+            stream.avail_in = sourceLen > (uLong)max ? max : (uInt)sourceLen;
+            sourceLen -= stream.avail_in;
+        }
+        err = deflate(&stream, sourceLen ? Z_NO_FLUSH : Z_FINISH);
+    } while (err == Z_OK);
 
-    err = deflateEnd(&stream);
-    return err;
+    *destLen = stream.total_out;
+    deflateEnd(&stream);
+    return err == Z_STREAM_END ? Z_OK : err;
 }
 
 /* ===========================================================================
diff --git a/erts/emulator/zlib/crc32.c b/erts/emulator/zlib/crc32.c
index ba506d8dd3..9580440c0e 100644
--- a/erts/emulator/zlib/crc32.c
+++ b/erts/emulator/zlib/crc32.c
@@ -1,5 +1,5 @@
 /* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler
+ * Copyright (C) 1995-2006, 2010, 2011, 2012, 2016 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  *
  * Thanks to Rodney Brown <[email protected]> for his contribution of faster
@@ -28,23 +28,17 @@
 #  endif /* !DYNAMIC_CRC_TABLE */
 #endif /* MAKECRCH */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include "zutil.h"      /* for STDC and FAR definitions */
 
-#define local static
-
 /* Definitions for doing the crc four data bytes at a time. */
 #if !defined(NOBYFOUR) && defined(Z_U4)
 #  define BYFOUR
 #endif
 #ifdef BYFOUR
    local unsigned long crc32_little OF((unsigned long,
-                        const unsigned char FAR *, unsigned));
+                        const unsigned char FAR *, z_size_t));
    local unsigned long crc32_big OF((unsigned long,
-                        const unsigned char FAR *, unsigned));
+                        const unsigned char FAR *, z_size_t));
 #  define TBLS 8
 #else
 #  define TBLS 1
@@ -205,10 +199,10 @@ const z_crc_t FAR * ZEXPORT get_crc_table()
 #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
 
 /* ========================================================================= */
-unsigned long ZEXPORT crc32(crc, buf, len)
+unsigned long ZEXPORT crc32_z(crc, buf, len)
     unsigned long crc;
     const unsigned char FAR *buf;
-    uInt len;
+    z_size_t len;
 {
     if (buf == Z_NULL) return 0UL;
 
@@ -239,8 +233,29 @@ unsigned long ZEXPORT crc32(crc, buf, len)
     return crc ^ 0xffffffffUL;
 }
 
+/* ========================================================================= */
+unsigned long ZEXPORT crc32(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
+    uInt len;
+{
+    return crc32_z(crc, buf, len);
+}
+
 #ifdef BYFOUR
 
+/*
+   This BYFOUR code accesses the passed unsigned char * buffer with a 32-bit
+   integer pointer type. This violates the strict aliasing rule, where a
+   compiler can assume, for optimization purposes, that two pointers to
+   fundamentally different types won't ever point to the same memory. This can
+   manifest as a problem only if one of the pointers is written to. This code
+   only reads from those pointers. So long as this code remains isolated in
+   this compilation unit, there won't be a problem. For this reason, this code
+   should not be copied and pasted into a compilation unit in which other code
+   writes to the buffer that is passed to these routines.
+ */
+
 /* ========================================================================= */
 #define DOLIT4 c ^= *buf4++; \
         c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
@@ -251,7 +266,7 @@ unsigned long ZEXPORT crc32(crc, buf, len)
 local unsigned long crc32_little(crc, buf, len)
     unsigned long crc;
     const unsigned char FAR *buf;
-    unsigned len;
+    z_size_t len;
 {
     register z_crc_t c;
     register const z_crc_t FAR *buf4;
@@ -282,7 +297,7 @@ local unsigned long crc32_little(crc, buf, len)
 }
 
 /* ========================================================================= */
-#define DOBIG4 c ^= *++buf4; \
+#define DOBIG4 c ^= *buf4++; \
         c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
             crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
 #define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
@@ -291,7 +306,7 @@ local unsigned long crc32_little(crc, buf, len)
 local unsigned long crc32_big(crc, buf, len)
     unsigned long crc;
     const unsigned char FAR *buf;
-    unsigned len;
+    z_size_t len;
 {
     register z_crc_t c;
     register const z_crc_t FAR *buf4;
@@ -304,7 +319,6 @@ local unsigned long crc32_big(crc, buf, len)
     }
 
     buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
-    buf4--;
     while (len >= 32) {
         DOBIG32;
         len -= 32;
@@ -313,7 +327,6 @@ local unsigned long crc32_big(crc, buf, len)
         DOBIG4;
         len -= 4;
     }
-    buf4++;
     buf = (const unsigned char FAR *)buf4;
 
     if (len) do {
diff --git a/erts/emulator/zlib/deflate.c b/erts/emulator/zlib/deflate.c
index 943c26dfb2..1ec761448d 100644
--- a/erts/emulator/zlib/deflate.c
+++ b/erts/emulator/zlib/deflate.c
@@ -1,5 +1,5 @@
 /* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+ * Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -49,13 +49,10 @@
 
 /* @(#) $Id$ */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
 #include "deflate.h"
 
 const char deflate_copyright[] =
-   " deflate 1.2.8 Copyright 1995-2013 Jean-loup Gailly and Mark Adler ";
+   " deflate 1.2.11 Copyright 1995-2017 Jean-loup Gailly and Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -76,6 +73,8 @@ typedef enum {
 typedef block_state (*compress_func) OF((deflate_state *s, int flush));
 /* Compression function. Returns the block state after the call. */
 
+local int deflateStateCheck      OF((z_streamp strm));
+local void slide_hash     OF((deflate_state *s));
 local void fill_window    OF((deflate_state *s));
 local block_state deflate_stored OF((deflate_state *s, int flush));
 local block_state deflate_fast   OF((deflate_state *s, int flush));
@@ -87,15 +86,16 @@ local block_state deflate_huff   OF((deflate_state *s, int flush));
 local void lm_init        OF((deflate_state *s));
 local void putShortMSB    OF((deflate_state *s, uInt b));
 local void flush_pending  OF((z_streamp strm));
-local int read_buf        OF((z_streamp strm, Bytef *buf, unsigned size));
+local unsigned read_buf   OF((z_streamp strm, Bytef *buf, unsigned size));
 #ifdef ASMV
+#  pragma message("Assembler code may have bugs -- use at your own risk")
       void match_init OF((void)); /* asm code initialization */
       uInt longest_match  OF((deflate_state *s, IPos cur_match));
 #else
 local uInt longest_match  OF((deflate_state *s, IPos cur_match));
 #endif
 
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
 local  void check_match OF((deflate_state *s, IPos start, IPos match,
                             int length));
 #endif
@@ -151,21 +151,14 @@ local const config configuration_table[10] = {
  * meaning.
  */
 
-#define EQUAL 0
-/* result of memcmp for equal strings */
-
-#ifndef NO_DUMMY_DECL
-struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
-#endif
-
 /* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
-#define RANK(f) (((f) << 1) - ((f) > 4 ? 9 : 0))
+#define RANK(f) (((f) * 2) - ((f) > 4 ? 9 : 0))
 
 /* ===========================================================================
  * Update a hash value with the given input byte
- * IN  assertion: all calls to to UPDATE_HASH are made with consecutive
- *    input characters, so that a running hash key can be computed from the
- *    previous key instead of complete recalculation each time.
+ * IN  assertion: all calls to UPDATE_HASH are made with consecutive input
+ *    characters, so that a running hash key can be computed from the previous
+ *    key instead of complete recalculation each time.
  */
 #define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
 
@@ -176,9 +169,9 @@ struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
  * the previous length of the hash chain.
  * If this file is compiled with -DFASTEST, the compression level is forced
  * to 1, and no hash chains are maintained.
- * IN  assertion: all calls to to INSERT_STRING are made with consecutive
- *    input characters and the first MIN_MATCH bytes of str are valid
- *    (except for the last MIN_MATCH-1 bytes of the input file).
+ * IN  assertion: all calls to INSERT_STRING are made with consecutive input
+ *    characters and the first MIN_MATCH bytes of str are valid (except for
+ *    the last MIN_MATCH-1 bytes of the input file).
  */
 #ifdef FASTEST
 #define INSERT_STRING(s, str, match_head) \
@@ -200,6 +193,37 @@ struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
     s->head[s->hash_size-1] = NIL; \
     zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
 
+/* ===========================================================================
+ * Slide the hash table when sliding the window down (could be avoided with 32
+ * bit values at the expense of memory usage). We slide even when level == 0 to
+ * keep the hash table consistent if we switch back to level > 0 later.
+ */
+local void slide_hash(s)
+    deflate_state *s;
+{
+    unsigned n, m;
+    Posf *p;
+    uInt wsize = s->w_size;
+
+    n = s->hash_size;
+    p = &s->head[n];
+    do {
+        m = *--p;
+        *p = (Pos)(m >= wsize ? m - wsize : NIL);
+    } while (--n);
+    n = wsize;
+#ifndef FASTEST
+    p = &s->prev[n];
+    do {
+        m = *--p;
+        *p = (Pos)(m >= wsize ? m - wsize : NIL);
+        /* If n is not on any hash chain, prev[n] is garbage but
+         * its value will never be used.
+         */
+    } while (--n);
+#endif
+}
+
 /* ========================================================================= */
 int ZEXPORT deflateInit_(strm, level, version, stream_size)
     z_streamp strm;
@@ -273,7 +297,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
 #endif
     if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
         windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
-        strategy < 0 || strategy > Z_FIXED) {
+        strategy < 0 || strategy > Z_FIXED || (windowBits == 8 && wrap != 1)) {
         return Z_STREAM_ERROR;
     }
     if (windowBits == 8) windowBits = 9;  /* until 256-byte window bug fixed */
@@ -281,14 +305,15 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
     if (s == Z_NULL) return Z_MEM_ERROR;
     strm->state = (struct internal_state FAR *)s;
     s->strm = strm;
+    s->status = INIT_STATE;     /* to pass state test in deflateReset() */
 
     s->wrap = wrap;
     s->gzhead = Z_NULL;
-    s->w_bits = windowBits;
+    s->w_bits = (uInt)windowBits;
     s->w_size = 1 << s->w_bits;
     s->w_mask = s->w_size - 1;
 
-    s->hash_bits = memLevel + 7;
+    s->hash_bits = (uInt)memLevel + 7;
     s->hash_size = 1 << s->hash_bits;
     s->hash_mask = s->hash_size - 1;
     s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
@@ -322,6 +347,31 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
     return deflateReset(strm);
 }
 
+/* =========================================================================
+ * Check for a valid deflate stream state. Return 0 if ok, 1 if not.
+ */
+local int deflateStateCheck (strm)
+    z_streamp strm;
+{
+    deflate_state *s;
+    if (strm == Z_NULL ||
+        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
+        return 1;
+    s = strm->state;
+    if (s == Z_NULL || s->strm != strm || (s->status != INIT_STATE &&
+#ifdef GZIP
+                                           s->status != GZIP_STATE &&
+#endif
+                                           s->status != EXTRA_STATE &&
+                                           s->status != NAME_STATE &&
+                                           s->status != COMMENT_STATE &&
+                                           s->status != HCRC_STATE &&
+                                           s->status != BUSY_STATE &&
+                                           s->status != FINISH_STATE))
+        return 1;
+    return 0;
+}
+
 /* ========================================================================= */
 int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
     z_streamp strm;
@@ -334,7 +384,7 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
     unsigned avail;
     z_const unsigned char *next;
 
-    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL)
+    if (deflateStateCheck(strm) || dictionary == Z_NULL)
         return Z_STREAM_ERROR;
     s = strm->state;
     wrap = s->wrap;
@@ -392,13 +442,34 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
 }
 
 /* ========================================================================= */
+int ZEXPORT deflateGetDictionary (strm, dictionary, dictLength)
+    z_streamp strm;
+    Bytef *dictionary;
+    uInt  *dictLength;
+{
+    deflate_state *s;
+    uInt len;
+
+    if (deflateStateCheck(strm))
+        return Z_STREAM_ERROR;
+    s = strm->state;
+    len = s->strstart + s->lookahead;
+    if (len > s->w_size)
+        len = s->w_size;
+    if (dictionary != Z_NULL && len)
+        zmemcpy(dictionary, s->window + s->strstart + s->lookahead - len, len);
+    if (dictLength != Z_NULL)
+        *dictLength = len;
+    return Z_OK;
+}
+
+/* ========================================================================= */
 int ZEXPORT deflateResetKeep (strm)
     z_streamp strm;
 {
     deflate_state *s;
 
-    if (strm == Z_NULL || strm->state == Z_NULL ||
-        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) {
+    if (deflateStateCheck(strm)) {
         return Z_STREAM_ERROR;
     }
 
@@ -413,7 +484,11 @@ int ZEXPORT deflateResetKeep (strm)
     if (s->wrap < 0) {
         s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */
     }
-    s->status = s->wrap ? INIT_STATE : BUSY_STATE;
+    s->status =
+#ifdef GZIP
+        s->wrap == 2 ? GZIP_STATE :
+#endif
+        s->wrap ? INIT_STATE : BUSY_STATE;
     strm->adler =
 #ifdef GZIP
         s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
@@ -443,8 +518,8 @@ int ZEXPORT deflateSetHeader (strm, head)
     z_streamp strm;
     gz_headerp head;
 {
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    if (strm->state->wrap != 2) return Z_STREAM_ERROR;
+    if (deflateStateCheck(strm) || strm->state->wrap != 2)
+        return Z_STREAM_ERROR;
     strm->state->gzhead = head;
     return Z_OK;
 }
@@ -455,7 +530,7 @@ int ZEXPORT deflatePending (strm, pending, bits)
     int *bits;
     z_streamp strm;
 {
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
     if (pending != Z_NULL)
         *pending = strm->state->pending;
     if (bits != Z_NULL)
@@ -472,7 +547,7 @@ int ZEXPORT deflatePrime (strm, bits, value)
     deflate_state *s;
     int put;
 
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
     s = strm->state;
     if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
         return Z_BUF_ERROR;
@@ -497,9 +572,8 @@ int ZEXPORT deflateParams(strm, level, strategy)
 {
     deflate_state *s;
     compress_func func;
-    int err = Z_OK;
 
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
     s = strm->state;
 
 #ifdef FASTEST
@@ -513,13 +587,22 @@ int ZEXPORT deflateParams(strm, level, strategy)
     func = configuration_table[s->level].func;
 
     if ((strategy != s->strategy || func != configuration_table[level].func) &&
-        strm->total_in != 0) {
+        s->high_water) {
         /* Flush the last buffer: */
-        err = deflate(strm, Z_BLOCK);
-        if (err == Z_BUF_ERROR && s->pending == 0)
-            err = Z_OK;
+        int err = deflate(strm, Z_BLOCK);
+        if (err == Z_STREAM_ERROR)
+            return err;
+        if (strm->avail_out == 0)
+            return Z_BUF_ERROR;
     }
     if (s->level != level) {
+        if (s->level == 0 && s->matches != 0) {
+            if (s->matches == 1)
+                slide_hash(s);
+            else
+                CLEAR_HASH(s);
+            s->matches = 0;
+        }
         s->level = level;
         s->max_lazy_match   = configuration_table[level].max_lazy;
         s->good_match       = configuration_table[level].good_length;
@@ -527,7 +610,7 @@ int ZEXPORT deflateParams(strm, level, strategy)
         s->max_chain_length = configuration_table[level].max_chain;
     }
     s->strategy = strategy;
-    return err;
+    return Z_OK;
 }
 
 /* ========================================================================= */
@@ -540,12 +623,12 @@ int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
 {
     deflate_state *s;
 
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
     s = strm->state;
-    s->good_match = good_length;
-    s->max_lazy_match = max_lazy;
+    s->good_match = (uInt)good_length;
+    s->max_lazy_match = (uInt)max_lazy;
     s->nice_match = nice_length;
-    s->max_chain_length = max_chain;
+    s->max_chain_length = (uInt)max_chain;
     return Z_OK;
 }
 
@@ -572,14 +655,13 @@ uLong ZEXPORT deflateBound(strm, sourceLen)
 {
     deflate_state *s;
     uLong complen, wraplen;
-    Bytef *str;
 
     /* conservative upper bound for compressed data */
     complen = sourceLen +
               ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;
 
     /* if can't get parameters, return conservative bound plus zlib wrapper */
-    if (strm == Z_NULL || strm->state == Z_NULL)
+    if (deflateStateCheck(strm))
         return complen + 6;
 
     /* compute wrapper length */
@@ -591,9 +673,11 @@ uLong ZEXPORT deflateBound(strm, sourceLen)
     case 1:                                 /* zlib wrapper */
         wraplen = 6 + (s->strstart ? 4 : 0);
         break;
+#ifdef GZIP
     case 2:                                 /* gzip wrapper */
         wraplen = 18;
         if (s->gzhead != Z_NULL) {          /* user-supplied gzip header */
+            Bytef *str;
             if (s->gzhead->extra != Z_NULL)
                 wraplen += 2 + s->gzhead->extra_len;
             str = s->gzhead->name;
@@ -610,6 +694,7 @@ uLong ZEXPORT deflateBound(strm, sourceLen)
                 wraplen += 2;
         }
         break;
+#endif
     default:                                /* for compiler happiness */
         wraplen = 6;
     }
@@ -637,10 +722,10 @@ local void putShortMSB (s, b)
 }
 
 /* =========================================================================
- * Flush as much pending output as possible. All deflate() output goes
- * through this function so some applications may wish to modify it
- * to avoid allocating a large strm->next_out buffer and copying into it.
- * (See also read_buf()).
+ * Flush as much pending output as possible. All deflate() output, except for
+ * some deflate_stored() output, goes through this function so some
+ * applications may wish to modify it to avoid allocating a large
+ * strm->next_out buffer and copying into it. (See also read_buf()).
  */
 local void flush_pending(strm)
     z_streamp strm;
@@ -657,13 +742,23 @@ local void flush_pending(strm)
     strm->next_out  += len;
     s->pending_out  += len;
     strm->total_out += len;
-    strm->avail_out  -= len;
-    s->pending -= len;
+    strm->avail_out -= len;
+    s->pending      -= len;
     if (s->pending == 0) {
         s->pending_out = s->pending_buf;
     }
 }
 
+/* ===========================================================================
+ * Update the header CRC with the bytes s->pending_buf[beg..s->pending - 1].
+ */
+#define HCRC_UPDATE(beg) \
+    do { \
+        if (s->gzhead->hcrc && s->pending > (beg)) \
+            strm->adler = crc32(strm->adler, s->pending_buf + (beg), \
+                                s->pending - (beg)); \
+    } while (0)
+
 /* ========================================================================= */
 int ZEXPORT deflate (strm, flush)
     z_streamp strm;
@@ -672,230 +767,229 @@ int ZEXPORT deflate (strm, flush)
     int old_flush; /* value of flush param for previous deflate call */
     deflate_state *s;
 
-    if (strm == Z_NULL || strm->state == Z_NULL ||
-        flush > Z_BLOCK || flush < 0) {
+    if (deflateStateCheck(strm) || flush > Z_BLOCK || flush < 0) {
         return Z_STREAM_ERROR;
     }
     s = strm->state;
 
     if (strm->next_out == Z_NULL ||
-        (strm->next_in == Z_NULL && strm->avail_in != 0) ||
+        (strm->avail_in != 0 && strm->next_in == Z_NULL) ||
         (s->status == FINISH_STATE && flush != Z_FINISH)) {
         ERR_RETURN(strm, Z_STREAM_ERROR);
     }
     if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
 
-    s->strm = strm; /* just in case */
     old_flush = s->last_flush;
     s->last_flush = flush;
 
+    /* Flush as much pending output as possible */
+    if (s->pending != 0) {
+        flush_pending(strm);
+        if (strm->avail_out == 0) {
+            /* Since avail_out is 0, deflate will be called again with
+             * more output space, but possibly with both pending and
+             * avail_in equal to zero. There won't be anything to do,
+             * but this is not an error situation so make sure we
+             * return OK instead of BUF_ERROR at next call of deflate:
+             */
+            s->last_flush = -1;
+            return Z_OK;
+        }
+
+    /* Make sure there is something to do and avoid duplicate consecutive
+     * flushes. For repeated and useless calls with Z_FINISH, we keep
+     * returning Z_STREAM_END instead of Z_BUF_ERROR.
+     */
+    } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) &&
+               flush != Z_FINISH) {
+        ERR_RETURN(strm, Z_BUF_ERROR);
+    }
+
+    /* User must not provide more input after the first FINISH: */
+    if (s->status == FINISH_STATE && strm->avail_in != 0) {
+        ERR_RETURN(strm, Z_BUF_ERROR);
+    }
+
     /* Write the header */
     if (s->status == INIT_STATE) {
-#ifdef GZIP
-        if (s->wrap == 2) {
-            strm->adler = crc32(0L, Z_NULL, 0);
-            put_byte(s, 31);
-            put_byte(s, 139);
-            put_byte(s, 8);
-            if (s->gzhead == Z_NULL) {
-                put_byte(s, 0);
-                put_byte(s, 0);
-                put_byte(s, 0);
-                put_byte(s, 0);
-                put_byte(s, 0);
-                put_byte(s, s->level == 9 ? 2 :
-                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
-                             4 : 0));
-                put_byte(s, OS_CODE);
-                s->status = BUSY_STATE;
-            }
-            else {
-                put_byte(s, (s->gzhead->text ? 1 : 0) +
-                            (s->gzhead->hcrc ? 2 : 0) +
-                            (s->gzhead->extra == Z_NULL ? 0 : 4) +
-                            (s->gzhead->name == Z_NULL ? 0 : 8) +
-                            (s->gzhead->comment == Z_NULL ? 0 : 16)
-                        );
-                put_byte(s, (Byte)(s->gzhead->time & 0xff));
-                put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));
-                put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));
-                put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));
-                put_byte(s, s->level == 9 ? 2 :
-                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
-                             4 : 0));
-                put_byte(s, s->gzhead->os & 0xff);
-                if (s->gzhead->extra != Z_NULL) {
-                    put_byte(s, s->gzhead->extra_len & 0xff);
-                    put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
-                }
-                if (s->gzhead->hcrc)
-                    strm->adler = crc32(strm->adler, s->pending_buf,
-                                        s->pending);
-                s->gzindex = 0;
-                s->status = EXTRA_STATE;
-            }
-        }
+        /* zlib header */
+        uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
+        uInt level_flags;
+
+        if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
+            level_flags = 0;
+        else if (s->level < 6)
+            level_flags = 1;
+        else if (s->level == 6)
+            level_flags = 2;
         else
-#endif
-        {
-            uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
-            uInt level_flags;
-
-            if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
-                level_flags = 0;
-            else if (s->level < 6)
-                level_flags = 1;
-            else if (s->level == 6)
-                level_flags = 2;
-            else
-                level_flags = 3;
-            header |= (level_flags << 6);
-            if (s->strstart != 0) header |= PRESET_DICT;
-            header += 31 - (header % 31);
+            level_flags = 3;
+        header |= (level_flags << 6);
+        if (s->strstart != 0) header |= PRESET_DICT;
+        header += 31 - (header % 31);
+
+        putShortMSB(s, header);
+
+        /* Save the adler32 of the preset dictionary: */
+        if (s->strstart != 0) {
+            putShortMSB(s, (uInt)(strm->adler >> 16));
+            putShortMSB(s, (uInt)(strm->adler & 0xffff));
+        }
+        strm->adler = adler32(0L, Z_NULL, 0);
+        s->status = BUSY_STATE;
 
+        /* Compression must start with an empty pending buffer */
+        flush_pending(strm);
+        if (s->pending != 0) {
+            s->last_flush = -1;
+            return Z_OK;
+        }
+    }
+#ifdef GZIP
+    if (s->status == GZIP_STATE) {
+        /* gzip header */
+        strm->adler = crc32(0L, Z_NULL, 0);
+        put_byte(s, 31);
+        put_byte(s, 139);
+        put_byte(s, 8);
+        if (s->gzhead == Z_NULL) {
+            put_byte(s, 0);
+            put_byte(s, 0);
+            put_byte(s, 0);
+            put_byte(s, 0);
+            put_byte(s, 0);
+            put_byte(s, s->level == 9 ? 2 :
+                     (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
+                      4 : 0));
+            put_byte(s, OS_CODE);
             s->status = BUSY_STATE;
-            putShortMSB(s, header);
 
-            /* Save the adler32 of the preset dictionary: */
-            if (s->strstart != 0) {
-                putShortMSB(s, (uInt)(strm->adler >> 16));
-                putShortMSB(s, (uInt)(strm->adler & 0xffff));
+            /* Compression must start with an empty pending buffer */
+            flush_pending(strm);
+            if (s->pending != 0) {
+                s->last_flush = -1;
+                return Z_OK;
+            }
+        }
+        else {
+            put_byte(s, (s->gzhead->text ? 1 : 0) +
+                     (s->gzhead->hcrc ? 2 : 0) +
+                     (s->gzhead->extra == Z_NULL ? 0 : 4) +
+                     (s->gzhead->name == Z_NULL ? 0 : 8) +
+                     (s->gzhead->comment == Z_NULL ? 0 : 16)
+                     );
+            put_byte(s, (Byte)(s->gzhead->time & 0xff));
+            put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));
+            put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));
+            put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));
+            put_byte(s, s->level == 9 ? 2 :
+                     (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
+                      4 : 0));
+            put_byte(s, s->gzhead->os & 0xff);
+            if (s->gzhead->extra != Z_NULL) {
+                put_byte(s, s->gzhead->extra_len & 0xff);
+                put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
             }
-            strm->adler = adler32(0L, Z_NULL, 0);
+            if (s->gzhead->hcrc)
+                strm->adler = crc32(strm->adler, s->pending_buf,
+                                    s->pending);
+            s->gzindex = 0;
+            s->status = EXTRA_STATE;
         }
     }
-#ifdef GZIP
     if (s->status == EXTRA_STATE) {
         if (s->gzhead->extra != Z_NULL) {
-            uInt beg = s->pending;  /* start of bytes to update crc */
-
-            while (s->gzindex < (s->gzhead->extra_len & 0xffff)) {
-                if (s->pending == s->pending_buf_size) {
-                    if (s->gzhead->hcrc && s->pending > beg)
-                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                            s->pending - beg);
-                    flush_pending(strm);
-                    beg = s->pending;
-                    if (s->pending == s->pending_buf_size)
-                        break;
+            ulg beg = s->pending;   /* start of bytes to update crc */
+            uInt left = (s->gzhead->extra_len & 0xffff) - s->gzindex;
+            while (s->pending + left > s->pending_buf_size) {
+                uInt copy = s->pending_buf_size - s->pending;
+                zmemcpy(s->pending_buf + s->pending,
+                        s->gzhead->extra + s->gzindex, copy);
+                s->pending = s->pending_buf_size;
+                HCRC_UPDATE(beg);
+                s->gzindex += copy;
+                flush_pending(strm);
+                if (s->pending != 0) {
+                    s->last_flush = -1;
+                    return Z_OK;
                 }
-                put_byte(s, s->gzhead->extra[s->gzindex]);
-                s->gzindex++;
-            }
-            if (s->gzhead->hcrc && s->pending > beg)
-                strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                    s->pending - beg);
-            if (s->gzindex == s->gzhead->extra_len) {
-                s->gzindex = 0;
-                s->status = NAME_STATE;
+                beg = 0;
+                left -= copy;
             }
+            zmemcpy(s->pending_buf + s->pending,
+                    s->gzhead->extra + s->gzindex, left);
+            s->pending += left;
+            HCRC_UPDATE(beg);
+            s->gzindex = 0;
         }
-        else
-            s->status = NAME_STATE;
+        s->status = NAME_STATE;
     }
     if (s->status == NAME_STATE) {
         if (s->gzhead->name != Z_NULL) {
-            uInt beg = s->pending;  /* start of bytes to update crc */
+            ulg beg = s->pending;   /* start of bytes to update crc */
             int val;
-
             do {
                 if (s->pending == s->pending_buf_size) {
-                    if (s->gzhead->hcrc && s->pending > beg)
-                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                            s->pending - beg);
+                    HCRC_UPDATE(beg);
                     flush_pending(strm);
-                    beg = s->pending;
-                    if (s->pending == s->pending_buf_size) {
-                        val = 1;
-                        break;
+                    if (s->pending != 0) {
+                        s->last_flush = -1;
+                        return Z_OK;
                     }
+                    beg = 0;
                 }
                 val = s->gzhead->name[s->gzindex++];
                 put_byte(s, val);
             } while (val != 0);
-            if (s->gzhead->hcrc && s->pending > beg)
-                strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                    s->pending - beg);
-            if (val == 0) {
-                s->gzindex = 0;
-                s->status = COMMENT_STATE;
-            }
+            HCRC_UPDATE(beg);
+            s->gzindex = 0;
         }
-        else
-            s->status = COMMENT_STATE;
+        s->status = COMMENT_STATE;
     }
     if (s->status == COMMENT_STATE) {
         if (s->gzhead->comment != Z_NULL) {
-            uInt beg = s->pending;  /* start of bytes to update crc */
+            ulg beg = s->pending;   /* start of bytes to update crc */
             int val;
-
             do {
                 if (s->pending == s->pending_buf_size) {
-                    if (s->gzhead->hcrc && s->pending > beg)
-                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                            s->pending - beg);
+                    HCRC_UPDATE(beg);
                     flush_pending(strm);
-                    beg = s->pending;
-                    if (s->pending == s->pending_buf_size) {
-                        val = 1;
-                        break;
+                    if (s->pending != 0) {
+                        s->last_flush = -1;
+                        return Z_OK;
                     }
+                    beg = 0;
                 }
                 val = s->gzhead->comment[s->gzindex++];
                 put_byte(s, val);
             } while (val != 0);
-            if (s->gzhead->hcrc && s->pending > beg)
-                strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                    s->pending - beg);
-            if (val == 0)
-                s->status = HCRC_STATE;
+            HCRC_UPDATE(beg);
         }
-        else
-            s->status = HCRC_STATE;
+        s->status = HCRC_STATE;
     }
     if (s->status == HCRC_STATE) {
         if (s->gzhead->hcrc) {
-            if (s->pending + 2 > s->pending_buf_size)
+            if (s->pending + 2 > s->pending_buf_size) {
                 flush_pending(strm);
-            if (s->pending + 2 <= s->pending_buf_size) {
-                put_byte(s, (Byte)(strm->adler & 0xff));
-                put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
-                strm->adler = crc32(0L, Z_NULL, 0);
-                s->status = BUSY_STATE;
+                if (s->pending != 0) {
+                    s->last_flush = -1;
+                    return Z_OK;
+                }
             }
+            put_byte(s, (Byte)(strm->adler & 0xff));
+            put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
+            strm->adler = crc32(0L, Z_NULL, 0);
         }
-        else
-            s->status = BUSY_STATE;
-    }
-#endif
+        s->status = BUSY_STATE;
 
-    /* Flush as much pending output as possible */
-    if (s->pending != 0) {
+        /* Compression must start with an empty pending buffer */
         flush_pending(strm);
-        if (strm->avail_out == 0) {
-            /* Since avail_out is 0, deflate will be called again with
-             * more output space, but possibly with both pending and
-             * avail_in equal to zero. There won't be anything to do,
-             * but this is not an error situation so make sure we
-             * return OK instead of BUF_ERROR at next call of deflate:
-             */
+        if (s->pending != 0) {
             s->last_flush = -1;
             return Z_OK;
         }
-
-    /* Make sure there is something to do and avoid duplicate consecutive
-     * flushes. For repeated and useless calls with Z_FINISH, we keep
-     * returning Z_STREAM_END instead of Z_BUF_ERROR.
-     */
-    } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) &&
-               flush != Z_FINISH) {
-        ERR_RETURN(strm, Z_BUF_ERROR);
-    }
-
-    /* User must not provide more input after the first FINISH: */
-    if (s->status == FINISH_STATE && strm->avail_in != 0) {
-        ERR_RETURN(strm, Z_BUF_ERROR);
     }
+#endif
 
     /* Start a new block or continue the current one.
      */
@@ -903,9 +997,10 @@ int ZEXPORT deflate (strm, flush)
         (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
         block_state bstate;
 
-        bstate = s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :
-                    (s->strategy == Z_RLE ? deflate_rle(s, flush) :
-                        (*(configuration_table[s->level].func))(s, flush));
+        bstate = s->level == 0 ? deflate_stored(s, flush) :
+                 s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :
+                 s->strategy == Z_RLE ? deflate_rle(s, flush) :
+                 (*(configuration_table[s->level].func))(s, flush);
 
         if (bstate == finish_started || bstate == finish_done) {
             s->status = FINISH_STATE;
@@ -947,7 +1042,6 @@ int ZEXPORT deflate (strm, flush)
             }
         }
     }
-    Assert(strm->avail_out > 0, "bug2");
 
     if (flush != Z_FINISH) return Z_OK;
     if (s->wrap <= 0) return Z_STREAM_END;
@@ -984,18 +1078,9 @@ int ZEXPORT deflateEnd (strm)
 {
     int status;
 
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
 
     status = strm->state->status;
-    if (status != INIT_STATE &&
-        status != EXTRA_STATE &&
-        status != NAME_STATE &&
-        status != COMMENT_STATE &&
-        status != HCRC_STATE &&
-        status != BUSY_STATE &&
-        status != FINISH_STATE) {
-      return Z_STREAM_ERROR;
-    }
 
     /* Deallocate in reverse order of allocations: */
     TRY_FREE(strm, strm->state->pending_buf);
@@ -1026,7 +1111,7 @@ int ZEXPORT deflateCopy (dest, source)
     ushf *overlay;
 
 
-    if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {
+    if (deflateStateCheck(source) || dest == Z_NULL) {
         return Z_STREAM_ERROR;
     }
 
@@ -1076,7 +1161,7 @@ int ZEXPORT deflateCopy (dest, source)
  * allocating a large strm->next_in buffer and copying from it.
  * (See also flush_pending()).
  */
-local int read_buf(strm, buf, size)
+local unsigned read_buf(strm, buf, size)
     z_streamp strm;
     Bytef *buf;
     unsigned size;
@@ -1100,7 +1185,7 @@ local int read_buf(strm, buf, size)
     strm->next_in  += len;
     strm->total_in += len;
 
-    return (int)len;
+    return len;
 }
 
 /* ===========================================================================
@@ -1154,9 +1239,9 @@ local uInt longest_match(s, cur_match)
 {
     unsigned chain_length = s->max_chain_length;/* max hash chain length */
     register Bytef *scan = s->window + s->strstart; /* current string */
-    register Bytef *match;                       /* matched string */
+    register Bytef *match;                      /* matched string */
     register int len;                           /* length of current match */
-    int best_len = s->prev_length;              /* best match length so far */
+    int best_len = (int)s->prev_length;         /* best match length so far */
     int nice_match = s->nice_match;             /* stop if match long enough */
     IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
         s->strstart - (IPos)MAX_DIST(s) : NIL;
@@ -1191,7 +1276,7 @@ local uInt longest_match(s, cur_match)
     /* Do not look for matches beyond the end of the input. This is necessary
      * to make deflate deterministic.
      */
-    if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
+    if ((uInt)nice_match > s->lookahead) nice_match = (int)s->lookahead;
 
     Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
 
@@ -1352,7 +1437,11 @@ local uInt longest_match(s, cur_match)
 
 #endif /* FASTEST */
 
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
+
+#define EQUAL 0
+/* result of memcmp for equal strings */
+
 /* ===========================================================================
  * Check that the match at match_start is indeed a match.
  */
@@ -1378,7 +1467,7 @@ local void check_match(s, start, match, length)
 }
 #else
 #  define check_match(s, start, match, length)
-#endif /* DEBUG */
+#endif /* ZLIB_DEBUG */
 
 /* ===========================================================================
  * Fill the window when the lookahead becomes insufficient.
@@ -1393,8 +1482,7 @@ local void check_match(s, start, match, length)
 local void fill_window(s)
     deflate_state *s;
 {
-    register unsigned n, m;
-    register Posf *p;
+    unsigned n;
     unsigned more;    /* Amount of free space at the end of the window. */
     uInt wsize = s->w_size;
 
@@ -1421,35 +1509,11 @@ local void fill_window(s)
          */
         if (s->strstart >= wsize+MAX_DIST(s)) {
 
-            zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
+            zmemcpy(s->window, s->window+wsize, (unsigned)wsize - more);
             s->match_start -= wsize;
             s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
             s->block_start -= (long) wsize;
-
-            /* Slide the hash table (could be avoided with 32 bit values
-               at the expense of memory usage). We slide even when level == 0
-               to keep the hash table consistent if we switch back to level > 0
-               later. (Using level 0 permanently is not an optimal usage of
-               zlib, so we don't care about this pathological case.)
-             */
-            n = s->hash_size;
-            p = &s->head[n];
-            do {
-                m = *--p;
-                *p = (Pos)(m >= wsize ? m-wsize : NIL);
-            } while (--n);
-
-            n = wsize;
-#ifndef FASTEST
-            p = &s->prev[n];
-            do {
-                m = *--p;
-                *p = (Pos)(m >= wsize ? m-wsize : NIL);
-                /* If n is not on any hash chain, prev[n] is garbage but
-                 * its value will never be used.
-                 */
-            } while (--n);
-#endif
+            slide_hash(s);
             more += wsize;
         }
         if (s->strm->avail_in == 0) break;
@@ -1555,70 +1619,199 @@ local void fill_window(s)
    if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \
 }
 
+/* Maximum stored block length in deflate format (not including header). */
+#define MAX_STORED 65535
+
+/* Minimum of a and b. */
+#define MIN(a, b) ((a) > (b) ? (b) : (a))
+
 /* ===========================================================================
  * Copy without compression as much as possible from the input stream, return
  * the current block state.
- * This function does not insert new strings in the dictionary since
- * uncompressible data is probably not useful. This function is used
- * only for the level=0 compression option.
- * NOTE: this function should be optimized to avoid extra copying from
- * window to pending_buf.
+ *
+ * In case deflateParams() is used to later switch to a non-zero compression
+ * level, s->matches (otherwise unused when storing) keeps track of the number
+ * of hash table slides to perform. If s->matches is 1, then one hash table
+ * slide will be done when switching. If s->matches is 2, the maximum value
+ * allowed here, then the hash table will be cleared, since two or more slides
+ * is the same as a clear.
+ *
+ * deflate_stored() is written to minimize the number of times an input byte is
+ * copied. It is most efficient with large input and output buffers, which
+ * maximizes the opportunites to have a single copy from next_in to next_out.
  */
 local block_state deflate_stored(s, flush)
     deflate_state *s;
     int flush;
 {
-    /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
-     * to pending_buf_size, and each stored block has a 5 byte header:
+    /* Smallest worthy block size when not flushing or finishing. By default
+     * this is 32K. This can be as small as 507 bytes for memLevel == 1. For
+     * large input and output buffers, the stored block size will be larger.
      */
-    ulg max_block_size = 0xffff;
-    ulg max_start;
-
-    if (max_block_size > s->pending_buf_size - 5) {
-        max_block_size = s->pending_buf_size - 5;
-    }
-
-    /* Copy as much as possible from input to output: */
-    for (;;) {
-        /* Fill the window as much as possible: */
-        if (s->lookahead <= 1) {
+    unsigned min_block = MIN(s->pending_buf_size - 5, s->w_size);
 
-            Assert(s->strstart < s->w_size+MAX_DIST(s) ||
-                   s->block_start >= (long)s->w_size, "slide too late");
+    /* Copy as many min_block or larger stored blocks directly to next_out as
+     * possible. If flushing, copy the remaining available input to next_out as
+     * stored blocks, if there is enough space.
+     */
+    unsigned len, left, have, last = 0;
+    unsigned used = s->strm->avail_in;
+    do {
+        /* Set len to the maximum size block that we can copy directly with the
+         * available input data and output space. Set left to how much of that
+         * would be copied from what's left in the window.
+         */
+        len = MAX_STORED;       /* maximum deflate stored block length */
+        have = (s->bi_valid + 42) >> 3;         /* number of header bytes */
+        if (s->strm->avail_out < have)          /* need room for header */
+            break;
+            /* maximum stored block length that will fit in avail_out: */
+        have = s->strm->avail_out - have;
+        left = s->strstart - s->block_start;    /* bytes left in window */
+        if (len > (ulg)left + s->strm->avail_in)
+            len = left + s->strm->avail_in;     /* limit len to the input */
+        if (len > have)
+            len = have;                         /* limit len to the output */
+
+        /* If the stored block would be less than min_block in length, or if
+         * unable to copy all of the available input when flushing, then try
+         * copying to the window and the pending buffer instead. Also don't
+         * write an empty block when flushing -- deflate() does that.
+         */
+        if (len < min_block && ((len == 0 && flush != Z_FINISH) ||
+                                flush == Z_NO_FLUSH ||
+                                len != left + s->strm->avail_in))
+            break;
 
-            fill_window(s);
-            if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more;
+        /* Make a dummy stored block in pending to get the header bytes,
+         * including any pending bits. This also updates the debugging counts.
+         */
+        last = flush == Z_FINISH && len == left + s->strm->avail_in ? 1 : 0;
+        _tr_stored_block(s, (char *)0, 0L, last);
+
+        /* Replace the lengths in the dummy stored block with len. */
+        s->pending_buf[s->pending - 4] = len;
+        s->pending_buf[s->pending - 3] = len >> 8;
+        s->pending_buf[s->pending - 2] = ~len;
+        s->pending_buf[s->pending - 1] = ~len >> 8;
+
+        /* Write the stored block header bytes. */
+        flush_pending(s->strm);
+
+#ifdef ZLIB_DEBUG
+        /* Update debugging counts for the data about to be copied. */
+        s->compressed_len += len << 3;
+        s->bits_sent += len << 3;
+#endif
 
-            if (s->lookahead == 0) break; /* flush the current block */
+        /* Copy uncompressed bytes from the window to next_out. */
+        if (left) {
+            if (left > len)
+                left = len;
+            zmemcpy(s->strm->next_out, s->window + s->block_start, left);
+            s->strm->next_out += left;
+            s->strm->avail_out -= left;
+            s->strm->total_out += left;
+            s->block_start += left;
+            len -= left;
         }
-        Assert(s->block_start >= 0L, "block gone");
-
-        s->strstart += s->lookahead;
-        s->lookahead = 0;
-
-        /* Emit a stored block if pending_buf will be full: */
-        max_start = s->block_start + max_block_size;
-        if (s->strstart == 0 || (ulg)s->strstart >= max_start) {
-            /* strstart == 0 is possible when wraparound on 16-bit machine */
-            s->lookahead = (uInt)(s->strstart - max_start);
-            s->strstart = (uInt)max_start;
-            FLUSH_BLOCK(s, 0);
+
+        /* Copy uncompressed bytes directly from next_in to next_out, updating
+         * the check value.
+         */
+        if (len) {
+            read_buf(s->strm, s->strm->next_out, len);
+            s->strm->next_out += len;
+            s->strm->avail_out -= len;
+            s->strm->total_out += len;
         }
-        /* Flush if we may have to slide, otherwise block_start may become
-         * negative and the data will be gone:
+    } while (last == 0);
+
+    /* Update the sliding window with the last s->w_size bytes of the copied
+     * data, or append all of the copied data to the existing window if less
+     * than s->w_size bytes were copied. Also update the number of bytes to
+     * insert in the hash tables, in the event that deflateParams() switches to
+     * a non-zero compression level.
+     */
+    used -= s->strm->avail_in;      /* number of input bytes directly copied */
+    if (used) {
+        /* If any input was used, then no unused input remains in the window,
+         * therefore s->block_start == s->strstart.
          */
-        if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {
-            FLUSH_BLOCK(s, 0);
+        if (used >= s->w_size) {    /* supplant the previous history */
+            s->matches = 2;         /* clear hash */
+            zmemcpy(s->window, s->strm->next_in - s->w_size, s->w_size);
+            s->strstart = s->w_size;
         }
+        else {
+            if (s->window_size - s->strstart <= used) {
+                /* Slide the window down. */
+                s->strstart -= s->w_size;
+                zmemcpy(s->window, s->window + s->w_size, s->strstart);
+                if (s->matches < 2)
+                    s->matches++;   /* add a pending slide_hash() */
+            }
+            zmemcpy(s->window + s->strstart, s->strm->next_in - used, used);
+            s->strstart += used;
+        }
+        s->block_start = s->strstart;
+        s->insert += MIN(used, s->w_size - s->insert);
     }
-    s->insert = 0;
-    if (flush == Z_FINISH) {
-        FLUSH_BLOCK(s, 1);
+    if (s->high_water < s->strstart)
+        s->high_water = s->strstart;
+
+    /* If the last block was written to next_out, then done. */
+    if (last)
         return finish_done;
+
+    /* If flushing and all input has been consumed, then done. */
+    if (flush != Z_NO_FLUSH && flush != Z_FINISH &&
+        s->strm->avail_in == 0 && (long)s->strstart == s->block_start)
+        return block_done;
+
+    /* Fill the window with any remaining input. */
+    have = s->window_size - s->strstart - 1;
+    if (s->strm->avail_in > have && s->block_start >= (long)s->w_size) {
+        /* Slide the window down. */
+        s->block_start -= s->w_size;
+        s->strstart -= s->w_size;
+        zmemcpy(s->window, s->window + s->w_size, s->strstart);
+        if (s->matches < 2)
+            s->matches++;           /* add a pending slide_hash() */
+        have += s->w_size;          /* more space now */
     }
-    if ((long)s->strstart > s->block_start)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
+    if (have > s->strm->avail_in)
+        have = s->strm->avail_in;
+    if (have) {
+        read_buf(s->strm, s->window + s->strstart, have);
+        s->strstart += have;
+    }
+    if (s->high_water < s->strstart)
+        s->high_water = s->strstart;
+
+    /* There was not enough avail_out to write a complete worthy or flushed
+     * stored block to next_out. Write a stored block to pending instead, if we
+     * have enough input for a worthy block, or if flushing and there is enough
+     * room for the remaining input as a stored block in the pending buffer.
+     */
+    have = (s->bi_valid + 42) >> 3;         /* number of header bytes */
+        /* maximum stored block length that will fit in pending: */
+    have = MIN(s->pending_buf_size - have, MAX_STORED);
+    min_block = MIN(have, s->w_size);
+    left = s->strstart - s->block_start;
+    if (left >= min_block ||
+        ((left || flush == Z_FINISH) && flush != Z_NO_FLUSH &&
+         s->strm->avail_in == 0 && left <= have)) {
+        len = MIN(left, have);
+        last = flush == Z_FINISH && s->strm->avail_in == 0 &&
+               len == left ? 1 : 0;
+        _tr_stored_block(s, (charf *)s->window + s->block_start, len, last);
+        s->block_start += len;
+        flush_pending(s->strm);
+    }
+
+    /* We've done all we can with the available input and output. */
+    return last ? finish_started : need_more;
 }
 
 /* ===========================================================================
@@ -1895,7 +2088,7 @@ local block_state deflate_rle(s, flush)
                          prev == *++scan && prev == *++scan &&
                          prev == *++scan && prev == *++scan &&
                          scan < strend);
-                s->match_length = MAX_MATCH - (int)(strend - scan);
+                s->match_length = MAX_MATCH - (uInt)(strend - scan);
                 if (s->match_length > s->lookahead)
                     s->match_length = s->lookahead;
             }
diff --git a/erts/emulator/zlib/deflate.h b/erts/emulator/zlib/deflate.h
index ce0299edd1..23ecdd312b 100644
--- a/erts/emulator/zlib/deflate.h
+++ b/erts/emulator/zlib/deflate.h
@@ -1,5 +1,5 @@
 /* deflate.h -- internal compression state
- * Copyright (C) 1995-2012 Jean-loup Gailly
+ * Copyright (C) 1995-2016 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -51,13 +51,16 @@
 #define Buf_size 16
 /* size of bit buffer in bi_buf */
 
-#define INIT_STATE    42
-#define EXTRA_STATE   69
-#define NAME_STATE    73
-#define COMMENT_STATE 91
-#define HCRC_STATE   103
-#define BUSY_STATE   113
-#define FINISH_STATE 666
+#define INIT_STATE    42    /* zlib header -> BUSY_STATE */
+#ifdef GZIP
+#  define GZIP_STATE  57    /* gzip header -> BUSY_STATE | EXTRA_STATE */
+#endif
+#define EXTRA_STATE   69    /* gzip extra block -> NAME_STATE */
+#define NAME_STATE    73    /* gzip file name -> COMMENT_STATE */
+#define COMMENT_STATE 91    /* gzip comment -> HCRC_STATE */
+#define HCRC_STATE   103    /* gzip header CRC -> BUSY_STATE */
+#define BUSY_STATE   113    /* deflate -> FINISH_STATE */
+#define FINISH_STATE 666    /* stream complete */
 /* Stream status */
 
 
@@ -83,7 +86,7 @@ typedef struct static_tree_desc_s  static_tree_desc;
 typedef struct tree_desc_s {
     ct_data *dyn_tree;           /* the dynamic tree */
     int     max_code;            /* largest code with non zero frequency */
-    static_tree_desc *stat_desc; /* the corresponding static tree */
+    const static_tree_desc *stat_desc;  /* the corresponding static tree */
 } FAR tree_desc;
 
 typedef ush Pos;
@@ -100,10 +103,10 @@ typedef struct internal_state {
     Bytef *pending_buf;  /* output still pending */
     ulg   pending_buf_size; /* size of pending_buf */
     Bytef *pending_out;  /* next pending byte to output to the stream */
-    uInt   pending;      /* nb of bytes in the pending buffer */
+    ulg   pending;       /* nb of bytes in the pending buffer */
     int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */
     gz_headerp  gzhead;  /* gzip header information to write */
-    uInt   gzindex;      /* where in extra, name, or comment */
+    ulg   gzindex;       /* where in extra, name, or comment */
     Byte  method;        /* can only be DEFLATED */
     int   last_flush;    /* value of flush param for previous deflate call */
 
@@ -249,7 +252,7 @@ typedef struct internal_state {
     uInt matches;       /* number of string matches in current block */
     uInt insert;        /* bytes at end of window left to insert */
 
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
     ulg compressed_len; /* total bit length of compressed file mod 2^32 */
     ulg bits_sent;      /* bit length of compressed data sent mod 2^32 */
 #endif
@@ -275,7 +278,7 @@ typedef struct internal_state {
 /* Output a byte on the stream.
  * IN assertion: there is enough room in pending_buf.
  */
-#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);}
+#define put_byte(s, c) {s->pending_buf[s->pending++] = (Bytef)(c);}
 
 
 #define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
@@ -309,7 +312,7 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
  * used.
  */
 
-#ifndef DEBUG
+#ifndef ZLIB_DEBUG
 /* Inline versions of _tr_tally for speed: */
 
 #if defined(GEN_TREES_H) || !defined(STDC)
@@ -328,8 +331,8 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
     flush = (s->last_lit == s->lit_bufsize-1); \
    }
 # define _tr_tally_dist(s, distance, length, flush) \
-  { uch len = (length); \
-    ush dist = (distance); \
+  { uch len = (uch)(length); \
+    ush dist = (ush)(distance); \
     s->d_buf[s->last_lit] = dist; \
     s->l_buf[s->last_lit++] = len; \
     dist--; \
diff --git a/erts/emulator/zlib/gzguts.h b/erts/emulator/zlib/gzguts.h
index d87659d031..990a4d2514 100644
--- a/erts/emulator/zlib/gzguts.h
+++ b/erts/emulator/zlib/gzguts.h
@@ -1,5 +1,5 @@
 /* gzguts.h -- zlib internal header definitions for gz* operations
- * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
+ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -25,6 +25,10 @@
 #  include <stdlib.h>
 #  include <limits.h>
 #endif
+
+#ifndef _POSIX_SOURCE
+#  define _POSIX_SOURCE
+#endif
 #include <fcntl.h>
 
 #ifdef _WIN32
@@ -35,6 +39,10 @@
 #  include <io.h>
 #endif
 
+#if defined(_WIN32) || defined(__CYGWIN__)
+#  define WIDECHAR
+#endif
+
 #ifdef WINAPI_FAMILY
 #  define open _open
 #  define read _read
@@ -95,18 +103,19 @@
 #  endif
 #endif
 
-/* unlike snprintf (which is required in C99, yet still not supported by
-   Microsoft more than a decade later!), _snprintf does not guarantee null
-   termination of the result -- however this is only used in gzlib.c where
+/* unlike snprintf (which is required in C99), _snprintf does not guarantee
+   null termination of the result -- however this is only used in gzlib.c where
    the result is assured to fit in the space provided */
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && _MSC_VER < 1900
 #  define snprintf _snprintf
 #endif
 
 #ifndef local
 #  define local static
 #endif
-/* compile with -Dlocal if your debugger can't find static symbols */
+/* since "static" is used to mean two completely different things in C, we
+   define "local" for the non-static meaning of "static", for readability
+   (compile with -Dlocal if your debugger can't find static symbols) */
 
 /* gz* functions always use library allocation functions */
 #ifndef STDC
@@ -170,7 +179,7 @@ typedef struct {
     char *path;             /* path or fd for error messages */
     unsigned size;          /* buffer size, zero if not allocated yet */
     unsigned want;          /* requested buffer size, default is GZBUFSIZE */
-    unsigned char *in;      /* input buffer */
+    unsigned char *in;      /* input buffer (double-sized when writing) */
     unsigned char *out;     /* output buffer (double-sized when reading) */
     int direct;             /* 0 if processing gzip, 1 if transparent */
         /* just for reading */
diff --git a/erts/emulator/zlib/inffast.c b/erts/emulator/zlib/inffast.c
index 5187743fde..0dbd1dbc09 100644
--- a/erts/emulator/zlib/inffast.c
+++ b/erts/emulator/zlib/inffast.c
@@ -1,36 +1,16 @@
 /* inffast.c -- fast decoding
- * Copyright (C) 1995-2008, 2010, 2013 Mark Adler
+ * Copyright (C) 1995-2017 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
 #include "zutil.h"
 #include "inftrees.h"
 #include "inflate.h"
 #include "inffast.h"
 
-#ifndef ASMINF
-
-/* Allow machine dependent optimization for post-increment or pre-increment.
-   Based on testing to date,
-   Pre-increment preferred for:
-   - PowerPC G3 (Adler)
-   - MIPS R5000 (Randers-Pehrson)
-   Post-increment preferred for:
-   - none
-   No measurable difference:
-   - Pentium III (Anderson)
-   - M68060 (Nikl)
- */
-#ifdef POSTINC
-#  define OFF 0
-#  define PUP(a) *(a)++
+#ifdef ASMINF
+#  pragma message("Assembler code may have bugs -- use at your own risk")
 #else
-#  define OFF 1
-#  define PUP(a) *++(a)
-#endif
 
 /*
    Decode literal, length, and distance codes and write out the resulting
@@ -99,9 +79,9 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
 
     /* copy state to local variables */
     state = (struct inflate_state FAR *)strm->state;
-    in = strm->next_in - OFF;
+    in = strm->next_in;
     last = in + (strm->avail_in - 5);
-    out = strm->next_out - OFF;
+    out = strm->next_out;
     beg = out - (start - strm->avail_out);
     end = out + (strm->avail_out - 257);
 #ifdef INFLATE_STRICT
@@ -122,9 +102,9 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
        input data or output space */
     do {
         if (bits < 15) {
-            hold += (unsigned long)(PUP(in)) << bits;
+            hold += (unsigned long)(*in++) << bits;
             bits += 8;
-            hold += (unsigned long)(PUP(in)) << bits;
+            hold += (unsigned long)(*in++) << bits;
             bits += 8;
         }
         here = lcode[hold & lmask];
@@ -137,14 +117,14 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
             Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
                     "inflate:         literal '%c'\n" :
                     "inflate:         literal 0x%02x\n", here.val));
-            PUP(out) = (unsigned char)(here.val);
+            *out++ = (unsigned char)(here.val);
         }
         else if (op & 16) {                     /* length base */
             len = (unsigned)(here.val);
             op &= 15;                           /* number of extra bits */
             if (op) {
                 if (bits < op) {
-                    hold += (unsigned long)(PUP(in)) << bits;
+                    hold += (unsigned long)(*in++) << bits;
                     bits += 8;
                 }
                 len += (unsigned)hold & ((1U << op) - 1);
@@ -153,9 +133,9 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
             }
             Tracevv((stderr, "inflate:         length %u\n", len));
             if (bits < 15) {
-                hold += (unsigned long)(PUP(in)) << bits;
+                hold += (unsigned long)(*in++) << bits;
                 bits += 8;
-                hold += (unsigned long)(PUP(in)) << bits;
+                hold += (unsigned long)(*in++) << bits;
                 bits += 8;
             }
             here = dcode[hold & dmask];
@@ -168,10 +148,10 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                 dist = (unsigned)(here.val);
                 op &= 15;                       /* number of extra bits */
                 if (bits < op) {
-                    hold += (unsigned long)(PUP(in)) << bits;
+                    hold += (unsigned long)(*in++) << bits;
                     bits += 8;
                     if (bits < op) {
-                        hold += (unsigned long)(PUP(in)) << bits;
+                        hold += (unsigned long)(*in++) << bits;
                         bits += 8;
                     }
                 }
@@ -199,30 +179,30 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
 #ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
                         if (len <= op - whave) {
                             do {
-                                PUP(out) = 0;
+                                *out++ = 0;
                             } while (--len);
                             continue;
                         }
                         len -= op - whave;
                         do {
-                            PUP(out) = 0;
+                            *out++ = 0;
                         } while (--op > whave);
                         if (op == 0) {
                             from = out - dist;
                             do {
-                                PUP(out) = PUP(from);
+                                *out++ = *from++;
                             } while (--len);
                             continue;
                         }
 #endif
                     }
-                    from = window - OFF;
+                    from = window;
                     if (wnext == 0) {           /* very common case */
                         from += wsize - op;
                         if (op < len) {         /* some from window */
                             len -= op;
                             do {
-                                PUP(out) = PUP(from);
+                                *out++ = *from++;
                             } while (--op);
                             from = out - dist;  /* rest from output */
                         }
@@ -233,14 +213,14 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                         if (op < len) {         /* some from end of window */
                             len -= op;
                             do {
-                                PUP(out) = PUP(from);
+                                *out++ = *from++;
                             } while (--op);
-                            from = window - OFF;
+                            from = window;
                             if (wnext < len) {  /* some from start of window */
                                 op = wnext;
                                 len -= op;
                                 do {
-                                    PUP(out) = PUP(from);
+                                    *out++ = *from++;
                                 } while (--op);
                                 from = out - dist;      /* rest from output */
                             }
@@ -251,35 +231,35 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                         if (op < len) {         /* some from window */
                             len -= op;
                             do {
-                                PUP(out) = PUP(from);
+                                *out++ = *from++;
                             } while (--op);
                             from = out - dist;  /* rest from output */
                         }
                     }
                     while (len > 2) {
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
+                        *out++ = *from++;
+                        *out++ = *from++;
+                        *out++ = *from++;
                         len -= 3;
                     }
                     if (len) {
-                        PUP(out) = PUP(from);
+                        *out++ = *from++;
                         if (len > 1)
-                            PUP(out) = PUP(from);
+                            *out++ = *from++;
                     }
                 }
                 else {
                     from = out - dist;          /* copy direct from output */
                     do {                        /* minimum length is three */
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
+                        *out++ = *from++;
+                        *out++ = *from++;
+                        *out++ = *from++;
                         len -= 3;
                     } while (len > 2);
                     if (len) {
-                        PUP(out) = PUP(from);
+                        *out++ = *from++;
                         if (len > 1)
-                            PUP(out) = PUP(from);
+                            *out++ = *from++;
                     }
                 }
             }
@@ -316,8 +296,8 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
     hold &= (1U << bits) - 1;
 
     /* update state and return */
-    strm->next_in = in + OFF;
-    strm->next_out = out + OFF;
+    strm->next_in = in;
+    strm->next_out = out;
     strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
     strm->avail_out = (unsigned)(out < end ?
                                  257 + (end - out) : 257 - (out - end));
diff --git a/erts/emulator/zlib/inflate.c b/erts/emulator/zlib/inflate.c
index 532330b06b..ac333e8c2e 100644
--- a/erts/emulator/zlib/inflate.c
+++ b/erts/emulator/zlib/inflate.c
@@ -1,5 +1,5 @@
 /* inflate.c -- zlib decompression
- * Copyright (C) 1995-2012 Mark Adler
+ * Copyright (C) 1995-2016 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -80,9 +80,6 @@
  * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
 #include "zutil.h"
 #include "inftrees.h"
 #include "inflate.h"
@@ -95,6 +92,7 @@
 #endif
 
 /* function prototypes */
+local int inflateStateCheck OF((z_streamp strm));
 local void fixedtables OF((struct inflate_state FAR *state));
 local int updatewindow OF((z_streamp strm, const unsigned char FAR *end,
                            unsigned copy));
@@ -104,12 +102,26 @@ local int updatewindow OF((z_streamp strm, const unsigned char FAR *end,
 local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf,
                               unsigned len));
 
+local int inflateStateCheck(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+    if (strm == Z_NULL ||
+        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)
+        return 1;
+    state = (struct inflate_state FAR *)strm->state;
+    if (state == Z_NULL || state->strm != strm ||
+        state->mode < HEAD || state->mode > SYNC)
+        return 1;
+    return 0;
+}
+
 int ZEXPORT inflateResetKeep(strm)
 z_streamp strm;
 {
     struct inflate_state FAR *state;
 
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
     strm->total_in = strm->total_out = state->total = 0;
     strm->msg = Z_NULL;
@@ -134,7 +146,7 @@ z_streamp strm;
 {
     struct inflate_state FAR *state;
 
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
     state->wsize = 0;
     state->whave = 0;
@@ -150,7 +162,7 @@ int windowBits;
     struct inflate_state FAR *state;
 
     /* get the state */
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
 
     /* extract wrap request from windowBits parameter */
@@ -159,7 +171,7 @@ int windowBits;
         windowBits = -windowBits;
     }
     else {
-        wrap = (windowBits >> 4) + 1;
+        wrap = (windowBits >> 4) + 5;
 #ifdef GUNZIP
         if (windowBits < 48)
             windowBits &= 15;
@@ -213,7 +225,9 @@ int stream_size;
     if (state == Z_NULL) return Z_MEM_ERROR;
     Tracev((stderr, "inflate: allocated\n"));
     strm->state = (struct internal_state FAR *)state;
+    state->strm = strm;
     state->window = Z_NULL;
+    state->mode = HEAD;     /* to pass state test in inflateReset2() */
     ret = inflateReset2(strm, windowBits);
     if (ret != Z_OK) {
         ZFREE(strm, state);
@@ -237,17 +251,17 @@ int value;
 {
     struct inflate_state FAR *state;
 
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
     if (bits < 0) {
         state->hold = 0;
         state->bits = 0;
         return Z_OK;
     }
-    if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR;
+    if (bits > 16 || state->bits + (uInt)bits > 32) return Z_STREAM_ERROR;
     value &= (1L << bits) - 1;
-    state->hold += value << state->bits;
-    state->bits += bits;
+    state->hold += (unsigned)value << state->bits;
+    state->bits += (uInt)bits;
     return Z_OK;
 }
 
@@ -628,7 +642,7 @@ int flush;
     static const unsigned short order[19] = /* permutation of code lengths */
         {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
 
-    if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL ||
+    if (inflateStateCheck(strm) || strm->next_out == Z_NULL ||
         (strm->next_in == Z_NULL && strm->avail_in != 0))
         return Z_STREAM_ERROR;
 
@@ -648,6 +662,8 @@ int flush;
             NEEDBITS(16);
 #ifdef GUNZIP
             if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */
+                if (state->wbits == 0)
+                    state->wbits = 15;
                 state->check = crc32(0L, Z_NULL, 0);
                 CRC2(state->check, hold);
                 INITBITS();
@@ -675,7 +691,7 @@ int flush;
             len = BITS(4) + 8;
             if (state->wbits == 0)
                 state->wbits = len;
-            else if (len > state->wbits) {
+            if (len > 15 || len > state->wbits) {
                 strm->msg = (char *)"invalid window size";
                 state->mode = BAD;
                 break;
@@ -702,14 +718,16 @@ int flush;
             }
             if (state->head != Z_NULL)
                 state->head->text = (int)((hold >> 8) & 1);
-            if (state->flags & 0x0200) CRC2(state->check, hold);
+            if ((state->flags & 0x0200) && (state->wrap & 4))
+                CRC2(state->check, hold);
             INITBITS();
             state->mode = TIME;
         case TIME:
             NEEDBITS(32);
             if (state->head != Z_NULL)
                 state->head->time = hold;
-            if (state->flags & 0x0200) CRC4(state->check, hold);
+            if ((state->flags & 0x0200) && (state->wrap & 4))
+                CRC4(state->check, hold);
             INITBITS();
             state->mode = OS;
         case OS:
@@ -718,7 +736,8 @@ int flush;
                 state->head->xflags = (int)(hold & 0xff);
                 state->head->os = (int)(hold >> 8);
             }
-            if (state->flags & 0x0200) CRC2(state->check, hold);
+            if ((state->flags & 0x0200) && (state->wrap & 4))
+                CRC2(state->check, hold);
             INITBITS();
             state->mode = EXLEN;
         case EXLEN:
@@ -727,7 +746,8 @@ int flush;
                 state->length = (unsigned)(hold);
                 if (state->head != Z_NULL)
                     state->head->extra_len = (unsigned)hold;
-                if (state->flags & 0x0200) CRC2(state->check, hold);
+                if ((state->flags & 0x0200) && (state->wrap & 4))
+                    CRC2(state->check, hold);
                 INITBITS();
             }
             else if (state->head != Z_NULL)
@@ -745,7 +765,7 @@ int flush;
                                 len + copy > state->head->extra_max ?
                                 state->head->extra_max - len : copy);
                     }
-                    if (state->flags & 0x0200)
+                    if ((state->flags & 0x0200) && (state->wrap & 4))
                         state->check = crc32(state->check, next, copy);
                     have -= copy;
                     next += copy;
@@ -764,9 +784,9 @@ int flush;
                     if (state->head != Z_NULL &&
                             state->head->name != Z_NULL &&
                             state->length < state->head->name_max)
-                        state->head->name[state->length++] = len;
+                        state->head->name[state->length++] = (Bytef)len;
                 } while (len && copy < have);
-                if (state->flags & 0x0200)
+                if ((state->flags & 0x0200) && (state->wrap & 4))
                     state->check = crc32(state->check, next, copy);
                 have -= copy;
                 next += copy;
@@ -785,9 +805,9 @@ int flush;
                     if (state->head != Z_NULL &&
                             state->head->comment != Z_NULL &&
                             state->length < state->head->comm_max)
-                        state->head->comment[state->length++] = len;
+                        state->head->comment[state->length++] = (Bytef)len;
                 } while (len && copy < have);
-                if (state->flags & 0x0200)
+                if ((state->flags & 0x0200) && (state->wrap & 4))
                     state->check = crc32(state->check, next, copy);
                 have -= copy;
                 next += copy;
@@ -799,7 +819,7 @@ int flush;
         case HCRC:
             if (state->flags & 0x0200) {
                 NEEDBITS(16);
-                if (hold != (state->check & 0xffff)) {
+                if ((state->wrap & 4) && hold != (state->check & 0xffff)) {
                     strm->msg = (char *)"header crc mismatch";
                     state->mode = BAD;
                     break;
@@ -1180,11 +1200,11 @@ int flush;
                 out -= left;
                 strm->total_out += out;
                 state->total += out;
-                if (out)
+                if ((state->wrap & 4) && out)
                     strm->adler = state->check =
                         UPDATE(state->check, put - out, out);
                 out = left;
-                if ((
+                if ((state->wrap & 4) && (
 #ifdef GUNZIP
                      state->flags ? hold :
 #endif
@@ -1243,10 +1263,10 @@ int flush;
     strm->total_in += in;
     strm->total_out += out;
     state->total += out;
-    if (state->wrap && out)
+    if ((state->wrap & 4) && out)
         strm->adler = state->check =
             UPDATE(state->check, strm->next_out - out, out);
-    strm->data_type = state->bits + (state->last ? 64 : 0) +
+    strm->data_type = (int)state->bits + (state->last ? 64 : 0) +
                       (state->mode == TYPE ? 128 : 0) +
                       (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);
     if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
@@ -1258,7 +1278,7 @@ int ZEXPORT inflateEnd(strm)
 z_streamp strm;
 {
     struct inflate_state FAR *state;
-    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
+    if (inflateStateCheck(strm))
         return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
     if (state->window != Z_NULL) ZFREE(strm, state->window);
@@ -1276,7 +1296,7 @@ uInt *dictLength;
     struct inflate_state FAR *state;
 
     /* check state */
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
 
     /* copy dictionary */
@@ -1301,7 +1321,7 @@ uInt dictLength;
     int ret;
 
     /* check state */
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
     if (state->wrap != 0 && state->mode != DICT)
         return Z_STREAM_ERROR;
@@ -1333,7 +1353,7 @@ gz_headerp head;
     struct inflate_state FAR *state;
 
     /* check state */
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
     if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;
 
@@ -1386,7 +1406,7 @@ z_streamp strm;
     struct inflate_state FAR *state;
 
     /* check parameters */
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
     if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
 
@@ -1433,7 +1453,7 @@ z_streamp strm;
 {
     struct inflate_state FAR *state;
 
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
     return state->mode == STORED && state->bits == 0;
 }
@@ -1448,8 +1468,7 @@ z_streamp source;
     unsigned wsize;
 
     /* check input */
-    if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL ||
-        source->zalloc == (alloc_func)0 || source->zfree == (free_func)0)
+    if (inflateStateCheck(source) || dest == Z_NULL)
         return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)source->state;
 
@@ -1470,6 +1489,7 @@ z_streamp source;
     /* copy state */
     zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
     zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state));
+    copy->strm = dest;
     if (state->lencode >= state->codes &&
         state->lencode <= state->codes + ENOUGH - 1) {
         copy->lencode = copy->codes + (state->lencode - state->codes);
@@ -1491,25 +1511,51 @@ int subvert;
 {
     struct inflate_state FAR *state;
 
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
     state = (struct inflate_state FAR *)strm->state;
-    state->sane = !subvert;
 #ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+    state->sane = !subvert;
     return Z_OK;
 #else
+    (void)subvert;
     state->sane = 1;
     return Z_DATA_ERROR;
 #endif
 }
 
+int ZEXPORT inflateValidate(strm, check)
+z_streamp strm;
+int check;
+{
+    struct inflate_state FAR *state;
+
+    if (inflateStateCheck(strm)) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (check)
+        state->wrap |= 4;
+    else
+        state->wrap &= ~4;
+    return Z_OK;
+}
+
 long ZEXPORT inflateMark(strm)
 z_streamp strm;
 {
     struct inflate_state FAR *state;
 
-    if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16;
+    if (inflateStateCheck(strm))
+        return -(1L << 16);
     state = (struct inflate_state FAR *)strm->state;
-    return ((long)(state->back) << 16) +
+    return (long)(((unsigned long)((long)state->back)) << 16) +
         (state->mode == COPY ? state->length :
             (state->mode == MATCH ? state->was - state->length : 0));
 }
+
+unsigned long ZEXPORT inflateCodesUsed(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+    if (inflateStateCheck(strm)) return (unsigned long)-1;
+    state = (struct inflate_state FAR *)strm->state;
+    return (unsigned long)(state->next - state->codes);
+}
diff --git a/erts/emulator/zlib/inflate.h b/erts/emulator/zlib/inflate.h
index 95f4986d40..a46cce6b6d 100644
--- a/erts/emulator/zlib/inflate.h
+++ b/erts/emulator/zlib/inflate.h
@@ -1,5 +1,5 @@
 /* inflate.h -- internal inflate state definition
- * Copyright (C) 1995-2009 Mark Adler
+ * Copyright (C) 1995-2016 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -18,7 +18,7 @@
 
 /* Possible inflate modes between inflate() calls */
 typedef enum {
-    HEAD,       /* i: waiting for magic header */
+    HEAD = 16180,   /* i: waiting for magic header */
     FLAGS,      /* i: waiting for method and flags (gzip) */
     TIME,       /* i: waiting for modification time (gzip) */
     OS,         /* i: waiting for extra flags and operating system (gzip) */
@@ -77,11 +77,14 @@ typedef enum {
         CHECK -> LENGTH -> DONE
  */
 
-/* state maintained between inflate() calls.  Approximately 10K bytes. */
+/* State maintained between inflate() calls -- approximately 7K bytes, not
+   including the allocated sliding window, which is up to 32K bytes. */
 struct inflate_state {
+    z_streamp strm;             /* pointer back to this zlib stream */
     inflate_mode mode;          /* current inflate mode */
     int last;                   /* true if processing last block */
-    int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip */
+    int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip,
+                                   bit 2 true to validate check value */
     int havedict;               /* true if dictionary provided */
     int flags;                  /* gzip header method and flags (0 if zlib) */
     unsigned dmax;              /* zlib header max distance (INFLATE_STRICT) */
diff --git a/erts/emulator/zlib/inftrees.c b/erts/emulator/zlib/inftrees.c
index 3766fa2646..2ea08fc13e 100644
--- a/erts/emulator/zlib/inftrees.c
+++ b/erts/emulator/zlib/inftrees.c
@@ -1,18 +1,15 @@
 /* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2013 Mark Adler
+ * Copyright (C) 1995-2017 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
 #include "zutil.h"
 #include "inftrees.h"
 
 #define MAXBITS 15
 
 const char inflate_copyright[] =
-   " inflate 1.2.8 Copyright 1995-2013 Mark Adler ";
+   " inflate 1.2.11 Copyright 1995-2017 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -57,7 +54,7 @@ unsigned short FAR *work;
     code FAR *next;             /* next available space in table */
     const unsigned short FAR *base;     /* base value table to use */
     const unsigned short FAR *extra;    /* extra bits table to use */
-    int end;                    /* use base and extra for symbol > end */
+    unsigned match;             /* use base and extra for symbol >= match */
     unsigned short count[MAXBITS+1];    /* number of codes of each length */
     unsigned short offs[MAXBITS+1];     /* offsets in table for each length */
     static const unsigned short lbase[31] = { /* Length codes 257..285 base */
@@ -65,7 +62,7 @@ unsigned short FAR *work;
         35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78};
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 77, 202};
     static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
         257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
@@ -184,19 +181,17 @@ unsigned short FAR *work;
     switch (type) {
     case CODES:
         base = extra = work;    /* dummy value--not used */
-        end = 19;
+        match = 20;
         break;
     case LENS:
         base = lbase;
-        base -= 257;
         extra = lext;
-        extra -= 257;
-        end = 256;
+        match = 257;
         break;
-    default:            /* DISTS */
+    default:    /* DISTS */
         base = dbase;
         extra = dext;
-        end = -1;
+        match = 0;
     }
 
     /* initialize state for loop */
@@ -219,13 +214,13 @@ unsigned short FAR *work;
     for (;;) {
         /* create table entry */
         here.bits = (unsigned char)(len - drop);
-        if ((int)(work[sym]) < end) {
+        if (work[sym] + 1U < match) {
             here.op = (unsigned char)0;
             here.val = work[sym];
         }
-        else if ((int)(work[sym]) > end) {
-            here.op = (unsigned char)(extra[work[sym]]);
-            here.val = base[work[sym]];
+        else if (work[sym] >= match) {
+            here.op = (unsigned char)(extra[work[sym] - match]);
+            here.val = base[work[sym] - match];
         }
         else {
             here.op = (unsigned char)(32 + 64);         /* end of block */
diff --git a/erts/emulator/zlib/trees.c b/erts/emulator/zlib/trees.c
index 465e944e5b..50cf4b4571 100644
--- a/erts/emulator/zlib/trees.c
+++ b/erts/emulator/zlib/trees.c
@@ -1,5 +1,5 @@
 /* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2012 Jean-loup Gailly
+ * Copyright (C) 1995-2017 Jean-loup Gailly
  * detect_data_type() function provided freely by Cosmin Truta, 2006
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
@@ -34,12 +34,9 @@
 
 /* #define GEN_TREES_H */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
 #include "deflate.h"
 
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
 #  include <ctype.h>
 #endif
 
@@ -125,13 +122,13 @@ struct static_tree_desc_s {
     int     max_length;          /* max bit length for the codes */
 };
 
-local static_tree_desc  static_l_desc =
+local const static_tree_desc  static_l_desc =
 {static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
 
-local static_tree_desc  static_d_desc =
+local const static_tree_desc  static_d_desc =
 {static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
 
-local static_tree_desc  static_bl_desc =
+local const static_tree_desc  static_bl_desc =
 {(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
 
 /* ===========================================================================
@@ -155,18 +152,16 @@ local int  detect_data_type OF((deflate_state *s));
 local unsigned bi_reverse OF((unsigned value, int length));
 local void bi_windup      OF((deflate_state *s));
 local void bi_flush       OF((deflate_state *s));
-local void copy_block     OF((deflate_state *s, charf *buf, unsigned len,
-                              int header));
 
 #ifdef GEN_TREES_H
 local void gen_trees_header OF((void));
 #endif
 
-#ifndef DEBUG
+#ifndef ZLIB_DEBUG
 #  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
    /* Send a code of the given tree. c and tree must not have side effects */
 
-#else /* DEBUG */
+#else /* !ZLIB_DEBUG */
 #  define send_code(s, c, tree) \
      { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
        send_bits(s, tree[c].Code, tree[c].Len); }
@@ -185,7 +180,7 @@ local void gen_trees_header OF((void));
  * Send a value on a given number of bits.
  * IN assertion: length <= 16 and value fits in length bits.
  */
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
 local void send_bits      OF((deflate_state *s, int value, int length));
 
 local void send_bits(s, value, length)
@@ -211,12 +206,12 @@ local void send_bits(s, value, length)
         s->bi_valid += length;
     }
 }
-#else /* !DEBUG */
+#else /* !ZLIB_DEBUG */
 
 #define send_bits(s, value, length) \
 { int len = length;\
   if (s->bi_valid > (int)Buf_size - len) {\
-    int val = value;\
+    int val = (int)value;\
     s->bi_buf |= (ush)val << s->bi_valid;\
     put_short(s, s->bi_buf);\
     s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
@@ -226,7 +221,7 @@ local void send_bits(s, value, length)
     s->bi_valid += len;\
   }\
 }
-#endif /* DEBUG */
+#endif /* ZLIB_DEBUG */
 
 
 /* the arguments must not have side effects */
@@ -320,7 +315,7 @@ local void tr_static_init()
  * Genererate the file trees.h describing the static trees.
  */
 #ifdef GEN_TREES_H
-#  ifndef DEBUG
+#  ifndef ZLIB_DEBUG
 #    include <stdio.h>
 #  endif
 
@@ -397,7 +392,7 @@ void ZLIB_INTERNAL _tr_init(s)
 
     s->bi_buf = 0;
     s->bi_valid = 0;
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
     s->compressed_len = 0L;
     s->bits_sent = 0L;
 #endif
@@ -525,12 +520,12 @@ local void gen_bitlen(s, desc)
         xbits = 0;
         if (n >= base) xbits = extra[n-base];
         f = tree[n].Freq;
-        s->opt_len += (ulg)f * (bits + xbits);
-        if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits);
+        s->opt_len += (ulg)f * (unsigned)(bits + xbits);
+        if (stree) s->static_len += (ulg)f * (unsigned)(stree[n].Len + xbits);
     }
     if (overflow == 0) return;
 
-    Trace((stderr,"\nbit length overflow\n"));
+    Tracev((stderr,"\nbit length overflow\n"));
     /* This happens for example on obj2 and pic of the Calgary corpus */
 
     /* Find the first bit length which could increase: */
@@ -557,9 +552,8 @@ local void gen_bitlen(s, desc)
             m = s->heap[--h];
             if (m > max_code) continue;
             if ((unsigned) tree[m].Len != (unsigned) bits) {
-                Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
-                s->opt_len += ((long)bits - (long)tree[m].Len)
-                              *(long)tree[m].Freq;
+                Tracev((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
+                s->opt_len += ((ulg)bits - tree[m].Len) * tree[m].Freq;
                 tree[m].Len = (ush)bits;
             }
             n--;
@@ -581,7 +575,7 @@ local void gen_codes (tree, max_code, bl_count)
     ushf *bl_count;            /* number of codes at each bit length */
 {
     ush next_code[MAX_BITS+1]; /* next code value for each bit length */
-    ush code = 0;              /* running code value */
+    unsigned code = 0;         /* running code value */
     int bits;                  /* bit index */
     int n;                     /* code index */
 
@@ -589,7 +583,8 @@ local void gen_codes (tree, max_code, bl_count)
      * without bit reversal.
      */
     for (bits = 1; bits <= MAX_BITS; bits++) {
-        next_code[bits] = code = (code + bl_count[bits-1]) << 1;
+        code = (code + bl_count[bits-1]) << 1;
+        next_code[bits] = (ush)code;
     }
     /* Check that the bit counts in bl_count are consistent. The last code
      * must be all ones.
@@ -602,7 +597,7 @@ local void gen_codes (tree, max_code, bl_count)
         int len = tree[n].Len;
         if (len == 0) continue;
         /* Now reverse the bits */
-        tree[n].Code = bi_reverse(next_code[len]++, len);
+        tree[n].Code = (ush)bi_reverse(next_code[len]++, len);
 
         Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
              n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
@@ -824,7 +819,7 @@ local int build_bl_tree(s)
         if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
     }
     /* Update opt_len to include the bit length tree and counts */
-    s->opt_len += 3*(max_blindex+1) + 5+5+4;
+    s->opt_len += 3*((ulg)max_blindex+1) + 5+5+4;
     Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
             s->opt_len, s->static_len));
 
@@ -872,11 +867,17 @@ void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
     int last;         /* one if this is the last block for a file */
 {
     send_bits(s, (STORED_BLOCK<<1)+last, 3);    /* send block type */
-#ifdef DEBUG
+    bi_windup(s);        /* align on byte boundary */
+    put_short(s, (ush)stored_len);
+    put_short(s, (ush)~stored_len);
+    zmemcpy(s->pending_buf + s->pending, (Bytef *)buf, stored_len);
+    s->pending += stored_len;
+#ifdef ZLIB_DEBUG
     s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
     s->compressed_len += (stored_len + 4) << 3;
+    s->bits_sent += 2*16;
+    s->bits_sent += stored_len<<3;
 #endif
-    copy_block(s, buf, (unsigned)stored_len, 1); /* with header */
 }
 
 /* ===========================================================================
@@ -897,7 +898,7 @@ void ZLIB_INTERNAL _tr_align(s)
 {
     send_bits(s, STATIC_TREES<<1, 3);
     send_code(s, END_BLOCK, static_ltree);
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
     s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
 #endif
     bi_flush(s);
@@ -905,7 +906,7 @@ void ZLIB_INTERNAL _tr_align(s)
 
 /* ===========================================================================
  * Determine the best encoding for the current block: dynamic trees, static
- * trees or store, and output the encoded block to the zip file.
+ * trees or store, and write out the encoded block.
  */
 void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
     deflate_state *s;
@@ -977,7 +978,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
         send_bits(s, (STATIC_TREES<<1)+last, 3);
         compress_block(s, (const ct_data *)static_ltree,
                        (const ct_data *)static_dtree);
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
         s->compressed_len += 3 + s->static_len;
 #endif
     } else {
@@ -986,7 +987,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
                        max_blindex+1);
         compress_block(s, (const ct_data *)s->dyn_ltree,
                        (const ct_data *)s->dyn_dtree);
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
         s->compressed_len += 3 + s->opt_len;
 #endif
     }
@@ -998,7 +999,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
 
     if (last) {
         bi_windup(s);
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
         s->compressed_len += 7;  /* align on byte boundary */
 #endif
     }
@@ -1093,7 +1094,7 @@ local void compress_block(s, ltree, dtree)
             send_code(s, code, dtree);       /* send the distance code */
             extra = extra_dbits[code];
             if (extra != 0) {
-                dist -= base_dist[code];
+                dist -= (unsigned)base_dist[code];
                 send_bits(s, dist, extra);   /* send the extra distance bits */
             }
         } /* literal or match pair ? */
@@ -1196,34 +1197,7 @@ local void bi_windup(s)
     }
     s->bi_buf = 0;
     s->bi_valid = 0;
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
     s->bits_sent = (s->bits_sent+7) & ~7;
 #endif
 }
-
-/* ===========================================================================
- * Copy a stored block, storing first the length and its
- * one's complement if requested.
- */
-local void copy_block(s, buf, len, header)
-    deflate_state *s;
-    charf    *buf;    /* the input data */
-    unsigned len;     /* its length */
-    int      header;  /* true if block header must be written */
-{
-    bi_windup(s);        /* align on byte boundary */
-
-    if (header) {
-        put_short(s, (ush)len);
-        put_short(s, (ush)~len);
-#ifdef DEBUG
-        s->bits_sent += 2*16;
-#endif
-    }
-#ifdef DEBUG
-    s->bits_sent += (ulg)len<<3;
-#endif
-    while (len--) {
-        put_byte(s, *buf++);
-    }
-}
diff --git a/erts/emulator/zlib/uncompr.c b/erts/emulator/zlib/uncompr.c
index 864d571719..f03a1a865e 100644
--- a/erts/emulator/zlib/uncompr.c
+++ b/erts/emulator/zlib/uncompr.c
@@ -1,62 +1,93 @@
 /* uncompr.c -- decompress a memory buffer
- * Copyright (C) 1995-2003, 2010 Jean-loup Gailly.
+ * Copyright (C) 1995-2003, 2010, 2014, 2016 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 /* @(#) $Id$ */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
 #define ZLIB_INTERNAL
 #include "zlib.h"
 
 /* ===========================================================================
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be large enough to hold the
-   entire uncompressed data. (The size of the uncompressed data must have
-   been saved previously by the compressor and transmitted to the decompressor
-   by some mechanism outside the scope of this compression library.)
-   Upon exit, destLen is the actual size of the compressed buffer.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted.
+     Decompresses the source buffer into the destination buffer.  *sourceLen is
+   the byte length of the source buffer. Upon entry, *destLen is the total size
+   of the destination buffer, which must be large enough to hold the entire
+   uncompressed data. (The size of the uncompressed data must have been saved
+   previously by the compressor and transmitted to the decompressor by some
+   mechanism outside the scope of this compression library.) Upon exit,
+   *destLen is the size of the decompressed data and *sourceLen is the number
+   of source bytes consumed. Upon return, source + *sourceLen points to the
+   first unused input byte.
+
+     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer, or
+   Z_DATA_ERROR if the input data was corrupted, including if the input data is
+   an incomplete zlib stream.
 */
-int ZEXPORT uncompress (dest, destLen, source, sourceLen)
+int ZEXPORT uncompress2 (dest, destLen, source, sourceLen)
     Bytef *dest;
     uLongf *destLen;
     const Bytef *source;
-    uLong sourceLen;
+    uLong *sourceLen;
 {
     z_stream stream;
     int err;
+    const uInt max = (uInt)-1;
+    uLong len, left;
+    Byte buf[1];    /* for detection of incomplete stream when *destLen == 0 */
 
-    stream.next_in = (z_const Bytef *)source;
-    stream.avail_in = (uInt)sourceLen;
-    /* Check for source > 64K on 16-bit machine: */
-    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
-
-    stream.next_out = dest;
-    stream.avail_out = (uInt)*destLen;
-    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
+    len = *sourceLen;
+    if (*destLen) {
+        left = *destLen;
+        *destLen = 0;
+    }
+    else {
+        left = 1;
+        dest = buf;
+    }
 
+    stream.next_in = (z_const Bytef *)source;
+    stream.avail_in = 0;
     stream.zalloc = (alloc_func)0;
     stream.zfree = (free_func)0;
+    stream.opaque = (voidpf)0;
 
     err = inflateInit(&stream);
     if (err != Z_OK) return err;
 
-    err = inflate(&stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        inflateEnd(&stream);
-        if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0))
-            return Z_DATA_ERROR;
-        return err;
-    }
-    *destLen = stream.total_out;
+    stream.next_out = dest;
+    stream.avail_out = 0;
 
-    err = inflateEnd(&stream);
-    return err;
+    do {
+        if (stream.avail_out == 0) {
+            stream.avail_out = left > (uLong)max ? max : (uInt)left;
+            left -= stream.avail_out;
+        }
+        if (stream.avail_in == 0) {
+            stream.avail_in = len > (uLong)max ? max : (uInt)len;
+            len -= stream.avail_in;
+        }
+        err = inflate(&stream, Z_NO_FLUSH);
+    } while (err == Z_OK);
+
+    *sourceLen -= len + stream.avail_in;
+    if (dest != buf)
+        *destLen = stream.total_out;
+    else if (stream.total_out && err == Z_BUF_ERROR)
+        left = 1;
+
+    inflateEnd(&stream);
+    return err == Z_STREAM_END ? Z_OK :
+           err == Z_NEED_DICT ? Z_DATA_ERROR  :
+           err == Z_BUF_ERROR && left + stream.avail_out ? Z_DATA_ERROR :
+           err;
+}
+
+int ZEXPORT uncompress (dest, destLen, source, sourceLen)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong sourceLen;
+{
+    return uncompress2(dest, destLen, source, &sourceLen);
 }
diff --git a/erts/emulator/zlib/zconf.h b/erts/emulator/zlib/zconf.h
index 9987a77553..5e1d68a004 100644
--- a/erts/emulator/zlib/zconf.h
+++ b/erts/emulator/zlib/zconf.h
@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
+ * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -17,7 +17,7 @@
 #ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
 #  define Z_PREFIX_SET
 
-/* all linked symbols */
+/* all linked symbols and init macros */
 #  define _dist_code            z__dist_code
 #  define _length_code          z__length_code
 #  define _tr_align             z__tr_align
@@ -29,6 +29,7 @@
 #  define adler32               z_adler32
 #  define adler32_combine       z_adler32_combine
 #  define adler32_combine64     z_adler32_combine64
+#  define adler32_z             z_adler32_z
 #  ifndef Z_SOLO
 #    define compress              z_compress
 #    define compress2             z_compress2
@@ -37,10 +38,14 @@
 #  define crc32                 z_crc32
 #  define crc32_combine         z_crc32_combine
 #  define crc32_combine64       z_crc32_combine64
+#  define crc32_z               z_crc32_z
 #  define deflate               z_deflate
 #  define deflateBound          z_deflateBound
 #  define deflateCopy           z_deflateCopy
 #  define deflateEnd            z_deflateEnd
+#  define deflateGetDictionary  z_deflateGetDictionary
+#  define deflateInit           z_deflateInit
+#  define deflateInit2          z_deflateInit2
 #  define deflateInit2_         z_deflateInit2_
 #  define deflateInit_          z_deflateInit_
 #  define deflateParams         z_deflateParams
@@ -67,6 +72,8 @@
 #    define gzeof                 z_gzeof
 #    define gzerror               z_gzerror
 #    define gzflush               z_gzflush
+#    define gzfread               z_gzfread
+#    define gzfwrite              z_gzfwrite
 #    define gzgetc                z_gzgetc
 #    define gzgetc_               z_gzgetc_
 #    define gzgets                z_gzgets
@@ -78,7 +85,6 @@
 #      define gzopen_w              z_gzopen_w
 #    endif
 #    define gzprintf              z_gzprintf
-#    define gzvprintf             z_gzvprintf
 #    define gzputc                z_gzputc
 #    define gzputs                z_gzputs
 #    define gzread                z_gzread
@@ -89,32 +95,39 @@
 #    define gztell                z_gztell
 #    define gztell64              z_gztell64
 #    define gzungetc              z_gzungetc
+#    define gzvprintf             z_gzvprintf
 #    define gzwrite               z_gzwrite
 #  endif
 #  define inflate               z_inflate
 #  define inflateBack           z_inflateBack
 #  define inflateBackEnd        z_inflateBackEnd
+#  define inflateBackInit       z_inflateBackInit
 #  define inflateBackInit_      z_inflateBackInit_
+#  define inflateCodesUsed      z_inflateCodesUsed
 #  define inflateCopy           z_inflateCopy
 #  define inflateEnd            z_inflateEnd
+#  define inflateGetDictionary  z_inflateGetDictionary
 #  define inflateGetHeader      z_inflateGetHeader
+#  define inflateInit           z_inflateInit
+#  define inflateInit2          z_inflateInit2
 #  define inflateInit2_         z_inflateInit2_
 #  define inflateInit_          z_inflateInit_
 #  define inflateMark           z_inflateMark
 #  define inflatePrime          z_inflatePrime
 #  define inflateReset          z_inflateReset
 #  define inflateReset2         z_inflateReset2
+#  define inflateResetKeep      z_inflateResetKeep
 #  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateGetDictionary  z_inflateGetDictionary
 #  define inflateSync           z_inflateSync
 #  define inflateSyncPoint      z_inflateSyncPoint
 #  define inflateUndermine      z_inflateUndermine
-#  define inflateResetKeep      z_inflateResetKeep
+#  define inflateValidate       z_inflateValidate
 #  define inflate_copyright     z_inflate_copyright
 #  define inflate_fast          z_inflate_fast
 #  define inflate_table         z_inflate_table
 #  ifndef Z_SOLO
 #    define uncompress            z_uncompress
+#    define uncompress2           z_uncompress2
 #  endif
 #  define zError                z_zError
 #  ifndef Z_SOLO
@@ -224,9 +237,19 @@
 #  define z_const
 #endif
 
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-#  define NO_DUMMY_DECL
+#ifdef Z_SOLO
+   typedef unsigned long z_size_t;
+#else
+#  define z_longlong long long
+#  if defined(NO_SIZE_T)
+     typedef unsigned NO_SIZE_T z_size_t;
+#  elif defined(STDC)
+#    include <stddef.h>
+     typedef size_t z_size_t;
+#  else
+     typedef unsigned long z_size_t;
+#  endif
+#  undef z_longlong
 #endif
 
 /* Maximum value for memLevel in deflateInit2 */
@@ -256,7 +279,7 @@
  Of course this will generally degrade compression (there's no free lunch).
 
    The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
  for small objects.
 */
 
diff --git a/erts/emulator/zlib/zlib.h b/erts/emulator/zlib/zlib.h
index 3e0c7672ac..f09cdaf1e0 100644
--- a/erts/emulator/zlib/zlib.h
+++ b/erts/emulator/zlib/zlib.h
@@ -1,7 +1,7 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.8, April 28th, 2013
+  version 1.2.11, January 15th, 2017
 
-  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -37,11 +37,11 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.8"
-#define ZLIB_VERNUM 0x1280
+#define ZLIB_VERSION "1.2.11"
+#define ZLIB_VERNUM 0x12b0
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 8
+#define ZLIB_VER_REVISION 11
 #define ZLIB_VER_SUBREVISION 0
 
 /*
@@ -65,7 +65,8 @@ extern "C" {
   with "gz".  The gzip format is different from the zlib format.  gzip is a
   gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
 
-    This library can optionally read and write gzip streams in memory as well.
+    This library can optionally read and write gzip and raw deflate streams in
+  memory as well.
 
     The zlib format was designed to be compact and fast for use in memory
   and on communications channels.  The gzip format was designed for single-
@@ -74,7 +75,7 @@ extern "C" {
 
     The library does not install any signal handler.  The decoder checks
   the consistency of the compressed data, so the library should never crash
-  even in case of corrupted input.
+  even in the case of corrupted input.
 */
 
 typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
@@ -87,7 +88,7 @@ typedef struct z_stream_s {
     uInt     avail_in;  /* number of bytes available at next_in */
     uLong    total_in;  /* total number of input bytes read so far */
 
-    Bytef    *next_out; /* next output byte should be put there */
+    Bytef    *next_out; /* next output byte will go here */
     uInt     avail_out; /* remaining free space at next_out */
     uLong    total_out; /* total number of bytes output so far */
 
@@ -98,8 +99,9 @@ typedef struct z_stream_s {
     free_func  zfree;   /* used to free the internal state */
     voidpf     opaque;  /* private data object passed to zalloc and zfree */
 
-    int     data_type;  /* best guess about the data type: binary or text */
-    uLong   adler;      /* adler32 value of the uncompressed data */
+    int     data_type;  /* best guess about the data type: binary or text
+                           for deflate, or the decoding state for inflate */
+    uLong   adler;      /* Adler-32 or CRC-32 value of the uncompressed data */
     uLong   reserved;   /* reserved for future use */
 } z_stream;
 
@@ -142,7 +144,9 @@ typedef gz_header FAR *gz_headerp;
 
      zalloc must return Z_NULL if there is not enough memory for the object.
    If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.
+   thread safe.  In that case, zlib is thread-safe.  When zalloc and zfree are
+   Z_NULL on entry to the initialization function, they are set to internal
+   routines that use the standard library functions malloc() and free().
 
      On 16-bit systems, the functions zalloc and zfree must be able to allocate
    exactly 65536 bytes, but will not be required to allocate more than this if
@@ -155,7 +159,7 @@ typedef gz_header FAR *gz_headerp;
 
      The fields total_in and total_out can be used for statistics or progress
    reports.  After compression, total_in holds the total size of the
-   uncompressed data and may be saved for use in the decompressor (particularly
+   uncompressed data and may be saved for use by the decompressor (particularly
    if the decompressor wants to decompress everything in a single step).
 */
 
@@ -200,7 +204,7 @@ typedef gz_header FAR *gz_headerp;
 #define Z_TEXT     1
 #define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
 #define Z_UNKNOWN  2
-/* Possible values of the data_type field (though see inflate()) */
+/* Possible values of the data_type field for deflate() */
 
 #define Z_DEFLATED   8
 /* The deflate compression method (the only one supported in this version) */
@@ -258,11 +262,11 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
     enough room in the output buffer), next_in and avail_in are updated and
     processing will resume at this point for the next call of deflate().
 
-  - Provide more output starting at next_out and update next_out and avail_out
+  - Generate more output starting at next_out and update next_out and avail_out
     accordingly.  This action is forced if the parameter flush is non zero.
     Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).  Some
-    output may be provided even if flush is not set.
+    should be set only when necessary.  Some output may be provided even if
+    flush is zero.
 
     Before the call of deflate(), the application should ensure that at least
   one of the actions is possible, by providing more input and/or consuming more
@@ -271,7 +275,9 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
   output when it wants, for example when the output buffer is full (avail_out
   == 0), or after each call of deflate().  If deflate returns Z_OK and with
   zero avail_out, it must be called again after making room in the output
-  buffer because there might be more output pending.
+  buffer because there might be more output pending. See deflatePending(),
+  which can be used if desired to determine whether or not there is more ouput
+  in that case.
 
     Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
   decide how much data to accumulate before producing output, in order to
@@ -292,8 +298,8 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
   input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
   This completes the current deflate block and follows it with an empty fixed
   codes block that is 10 bits long.  This assures that enough bytes are output
-  in order for the decompressor to finish the block before the empty fixed code
-  block.
+  in order for the decompressor to finish the block before the empty fixed
+  codes block.
 
     If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
   for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
@@ -319,34 +325,38 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
 
     If the parameter flush is set to Z_FINISH, pending input is processed,
   pending output is flushed and deflate returns with Z_STREAM_END if there was
-  enough output space; if deflate returns with Z_OK, this function must be
-  called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error.  After
-  deflate has returned Z_STREAM_END, the only possible operations on the stream
-  are deflateReset or deflateEnd.
-
-    Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step.  In this case, avail_out must be at least the
-  value returned by deflateBound (see below).  Then deflate is guaranteed to
-  return Z_STREAM_END.  If not enough output space is provided, deflate will
-  not return Z_STREAM_END, and it must be called again as described above.
-
-    deflate() sets strm->adler to the adler32 checksum of all input read
-  so far (that is, total_in bytes).
+  enough output space.  If deflate returns with Z_OK or Z_BUF_ERROR, this
+  function must be called again with Z_FINISH and more output space (updated
+  avail_out) but no more input data, until it returns with Z_STREAM_END or an
+  error.  After deflate has returned Z_STREAM_END, the only possible operations
+  on the stream are deflateReset or deflateEnd.
+
+    Z_FINISH can be used in the first deflate call after deflateInit if all the
+  compression is to be done in a single step.  In order to complete in one
+  call, avail_out must be at least the value returned by deflateBound (see
+  below).  Then deflate is guaranteed to return Z_STREAM_END.  If not enough
+  output space is provided, deflate will not return Z_STREAM_END, and it must
+  be called again as described above.
+
+    deflate() sets strm->adler to the Adler-32 checksum of all input read
+  so far (that is, total_in bytes).  If a gzip stream is being generated, then
+  strm->adler will be the CRC-32 checksum of the input read so far.  (See
+  deflateInit2 below.)
 
     deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT).  In doubt, the data is considered
-  binary.  This field is only for information purposes and does not affect the
-  compression algorithm in any manner.
+  the input data type (Z_BINARY or Z_TEXT).  If in doubt, the data is
+  considered binary.  This field is only for information purposes and does not
+  affect the compression algorithm in any manner.
 
     deflate() returns Z_OK if some progress has been made (more input
   processed or more output produced), Z_STREAM_END if all input has been
   consumed and all output has been produced (only when flush is set to
   Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not
-  fatal, and deflate() can be called again with more input and more output
-  space to continue compressing.
+  if next_in or next_out was Z_NULL or the state was inadvertently written over
+  by the application), or Z_BUF_ERROR if no progress is possible (for example
+  avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not fatal, and
+  deflate() can be called again with more input and more output space to
+  continue compressing.
 */
 
 
@@ -369,23 +379,21 @@ ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
 
      Initializes the internal stream state for decompression.  The fields
    next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller.  If next_in is not Z_NULL and avail_in is large enough (the
-   exact value depends on the compression method), inflateInit determines the
-   compression method from the zlib header and allocates all data structures
-   accordingly; otherwise the allocation will be deferred to the first call of
-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
-   use default allocation functions.
+   the caller.  In the current version of inflate, the provided input is not
+   read or consumed.  The allocation of a sliding window will be deferred to
+   the first call of inflate (if the decompression does not complete on the
+   first call).  If zalloc and zfree are set to Z_NULL, inflateInit updates
+   them to use default allocation functions.
 
      inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
    version assumed by the caller, or Z_STREAM_ERROR if the parameters are
    invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit does not perform any decompression
-   apart from possibly reading the zlib header if present: actual decompression
-   will be done by inflate().  (So next_in and avail_in may be modified, but
-   next_out and avail_out are unused and unchanged.) The current implementation
-   of inflateInit() does not process any header information -- that is deferred
-   until inflate() is called.
+   there is no error message.  inflateInit does not perform any decompression.
+   Actual decompression will be done by inflate().  So next_in, and avail_in,
+   next_out, and avail_out are unused and unchanged.  The current
+   implementation of inflateInit() does not process any header information --
+   that is deferred until inflate() is called.
 */
 
 
@@ -401,17 +409,20 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
 
   - Decompress more input starting at next_in and update next_in and avail_in
     accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing will
-    resume at this point for the next call of inflate().
+    enough room in the output buffer), then next_in and avail_in are updated
+    accordingly, and processing will resume at this point for the next call of
+    inflate().
 
-  - Provide more output starting at next_out and update next_out and avail_out
+  - Generate more output starting at next_out and update next_out and avail_out
     accordingly.  inflate() provides as much output as possible, until there is
     no more input data or no more space in the output buffer (see below about
     the flush parameter).
 
     Before the call of inflate(), the application should ensure that at least
   one of the actions is possible, by providing more input and/or consuming more
-  output, and updating the next_* and avail_* values accordingly.  The
+  output, and updating the next_* and avail_* values accordingly.  If the
+  caller of inflate() does not provide both available input and available
+  output space, it is possible that there will be no progress made.  The
   application can consume the uncompressed output when it wants, for example
   when the output buffer is full (avail_out == 0), or after each call of
   inflate().  If inflate returns Z_OK and with zero avail_out, it must be
@@ -428,7 +439,7 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
   gets to the end of that block, or when it runs out of data.
 
     The Z_BLOCK option assists in appending to or combining deflate streams.
-  Also to assist in this, on return inflate() will set strm->data_type to the
+  To assist in this, on return inflate() always sets strm->data_type to the
   number of unused bits in the last byte taken from strm->next_in, plus 64 if
   inflate() is currently decoding the last block in the deflate stream, plus
   128 if inflate() returned immediately after decoding an end-of-block code or
@@ -454,7 +465,7 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
   this case all pending input is processed and all pending output is flushed;
   avail_out must be large enough to hold all of the uncompressed data for the
   operation to complete.  (The size of the uncompressed data may have been
-  saved by the compressor for this purpose.) The use of Z_FINISH is not
+  saved by the compressor for this purpose.)  The use of Z_FINISH is not
   required to perform an inflation in one step.  However it may be used to
   inform inflate that a faster approach can be used for the single inflate()
   call.  Z_FINISH also informs inflate to not maintain a sliding window if the
@@ -476,32 +487,33 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
   chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
   strm->adler to the Adler-32 checksum of all output produced so far (that is,
   total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below.  At the end of the stream, inflate() checks that its computed adler32
+  below.  At the end of the stream, inflate() checks that its computed Adler-32
   checksum is equal to that saved by the compressor and returns Z_STREAM_END
   only if the checksum is correct.
 
     inflate() can decompress and check either zlib-wrapped or gzip-wrapped
   deflate data.  The header type is detected automatically, if requested when
   initializing with inflateInit2().  Any information contained in the gzip
-  header is not retained, so applications that need that information should
-  instead use raw inflate, see inflateInit2() below, or inflateBack() and
-  perform their own processing of the gzip header and trailer.  When processing
+  header is not retained unless inflateGetHeader() is used.  When processing
   gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
-  producted so far.  The CRC-32 is checked against the gzip trailer.
+  produced so far.  The CRC-32 is checked against the gzip trailer, as is the
+  uncompressed length, modulo 2^32.
 
     inflate() returns Z_OK if some progress has been made (more input processed
   or more output produced), Z_STREAM_END if the end of the compressed data has
   been reached and all uncompressed output has been produced, Z_NEED_DICT if a
   preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
   corrupted (input stream not conforming to the zlib format or incorrect check
-  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,
-  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
-  output buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
+  value, in which case strm->msg points to a string with a more specific
+  error), Z_STREAM_ERROR if the stream structure was inconsistent (for example
+  next_in or next_out was Z_NULL, or the state was inadvertently written over
+  by the application), Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR
+  if no progress was possible or if there was not enough room in the output
+  buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
   inflate() can be called again with more input and more output space to
   continue decompressing.  If Z_DATA_ERROR is returned, the application may
   then call inflateSync() to look for a good compression block if a partial
-  recovery of the data is desired.
+  recovery of the data is to be attempted.
 */
 
 
@@ -511,9 +523,8 @@ ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
    This function discards any unprocessed input and does not flush any pending
    output.
 
-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent.  In the error case, msg may be set but then points to a
-   static string (which must not be deallocated).
+     inflateEnd returns Z_OK if success, or Z_STREAM_ERROR if the stream state
+   was inconsistent.
 */
 
 
@@ -544,16 +555,29 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
    compression at the expense of memory usage.  The default value is 15 if
    deflateInit is used instead.
 
+     For the current implementation of deflate(), a windowBits value of 8 (a
+   window size of 256 bytes) is not supported.  As a result, a request for 8
+   will result in 9 (a 512-byte window).  In that case, providing 8 to
+   inflateInit2() will result in an error when the zlib header with 9 is
+   checked against the initialization of inflate().  The remedy is to not use 8
+   with deflateInit2() with this initialization, or at least in that case use 9
+   with inflateInit2().
+
      windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
    determines the window size.  deflate() will then generate raw deflate data
-   with no zlib header or trailer, and will not compute an adler32 check value.
+   with no zlib header or trailer, and will not compute a check value.
 
      windowBits can also be greater than 15 for optional gzip encoding.  Add
    16 to windowBits to write a simple gzip header and trailer around the
    compressed data instead of a zlib wrapper.  The gzip header will have no
    file name, no extra data, no comment, no modification time (set to zero), no
-   header crc, and the operating system will be set to 255 (unknown).  If a
-   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
+   header crc, and the operating system will be set to the appropriate value,
+   if the operating system was determined at compile time.  If a gzip stream is
+   being written, strm->adler is a CRC-32 instead of an Adler-32.
+
+     For raw deflate or gzip encoding, a request for a 256-byte window is
+   rejected as invalid, since only the zlib header provides a means of
+   transmitting the window size to the decompressor.
 
      The memLevel parameter specifies how much memory should be allocated
    for the internal compression state.  memLevel=1 uses minimum memory but is
@@ -614,12 +638,12 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
    addition, the current implementation of deflate will use at most the window
    size minus 262 bytes of the provided dictionary.
 
-     Upon return of this function, strm->adler is set to the adler32 value
+     Upon return of this function, strm->adler is set to the Adler-32 value
    of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor.  (The adler32 value
+   which dictionary has been used by the compressor.  (The Adler-32 value
    applies to the whole dictionary even if only a subset of the dictionary is
    actually used by the compressor.) If a raw deflate was requested, then the
-   adler32 value is not computed and strm->adler is not set.
+   Adler-32 value is not computed and strm->adler is not set.
 
      deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
    parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
@@ -628,6 +652,28 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
    not perform any compression: this will be done by deflate().
 */
 
+ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm,
+                                             Bytef *dictionary,
+                                             uInt  *dictLength));
+/*
+     Returns the sliding dictionary being maintained by deflate.  dictLength is
+   set to the number of bytes in the dictionary, and that many bytes are copied
+   to dictionary.  dictionary must have enough space, where 32768 bytes is
+   always enough.  If deflateGetDictionary() is called with dictionary equal to
+   Z_NULL, then only the dictionary length is returned, and nothing is copied.
+   Similary, if dictLength is Z_NULL, then it is not set.
+
+     deflateGetDictionary() may return a length less than the window size, even
+   when more than the window size in input has been provided. It may return up
+   to 258 bytes less in that case, due to how zlib's implementation of deflate
+   manages the sliding window and lookahead for matches, where matches can be
+   up to 258 bytes long. If the application needs the last window-size bytes of
+   input, then that would need to be saved by the application outside of zlib.
+
+     deflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
+   stream state is inconsistent.
+*/
+
 ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
                                     z_streamp source));
 /*
@@ -648,10 +694,10 @@ ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
 
 ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
 /*
-     This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.  The
-   stream will keep the same compression level and any other attributes that
-   may have been set by deflateInit2.
+     This function is equivalent to deflateEnd followed by deflateInit, but
+   does not free and reallocate the internal compression state.  The stream
+   will leave the compression level and any other attributes that may have been
+   set unchanged.
 
      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent (such as zalloc or state being Z_NULL).
@@ -662,20 +708,36 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
                                       int strategy));
 /*
      Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2.  This can be
+   interpretation of level and strategy is as in deflateInit2().  This can be
    used to switch between compression and straight copy of the input data, or
    to switch to a different kind of input data requiring a different strategy.
-   If the compression level is changed, the input available so far is
-   compressed with the old level (and may be flushed); the new level will take
-   effect only at the next call of deflate().
-
-     Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to be
-   compressed and flushed.  In particular, strm->avail_out must be non-zero.
-
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if
-   strm->avail_out was zero.
+   If the compression approach (which is a function of the level) or the
+   strategy is changed, and if any input has been consumed in a previous
+   deflate() call, then the input available so far is compressed with the old
+   level and strategy using deflate(strm, Z_BLOCK).  There are three approaches
+   for the compression levels 0, 1..3, and 4..9 respectively.  The new level
+   and strategy will take effect at the next call of deflate().
+
+     If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
+   not have enough output space to complete, then the parameter change will not
+   take effect.  In this case, deflateParams() can be called again with the
+   same parameters and more output space to try again.
+
+     In order to assure a change in the parameters on the first try, the
+   deflate stream should be flushed using deflate() with Z_BLOCK or other flush
+   request until strm.avail_out is not zero, before calling deflateParams().
+   Then no more input data should be provided before the deflateParams() call.
+   If this is done, the old level and strategy will be applied to the data
+   compressed before deflateParams(), and the new level and strategy will be
+   applied to the the data compressed after deflateParams().
+
+     deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream
+   state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if
+   there was not enough output space to complete the compression of the
+   available input data before a change in the strategy or approach.  Note that
+   in the case of a Z_BUF_ERROR, the parameters are not changed.  A return
+   value of Z_BUF_ERROR is not fatal, in which case deflateParams() can be
+   retried with more output space.
 */
 
 ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
@@ -793,7 +855,7 @@ ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
    is for use with other formats that use the deflate compressed data format
    such as zip.  Those formats provide their own check values.  If a custom
    format is developed using the raw deflate format for compressed data, it is
-   recommended that a check value such as an adler32 or a crc32 be applied to
+   recommended that a check value such as an Adler-32 or a CRC-32 be applied to
    the uncompressed data as is done in the zlib, gzip, and zip formats.  For
    most applications, the zlib format should be used as is.  Note that comments
    above on the use in deflateInit2() applies to the magnitude of windowBits.
@@ -802,7 +864,10 @@ ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
    32 to windowBits to enable zlib and gzip decoding with automatic header
    detection, or add 16 to decode only the gzip format (the zlib format will
    return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
-   crc32 instead of an adler32.
+   CRC-32 instead of an Adler-32.  Unlike the gunzip utility and gzread() (see
+   below), inflate() will not automatically decode concatenated gzip streams.
+   inflate() will return Z_STREAM_END at the end of the gzip stream.  The state
+   would need to be reset to continue decoding a subsequent gzip stream.
 
      inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
@@ -823,7 +888,7 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
      Initializes the decompression dictionary from the given uncompressed byte
    sequence.  This function must be called immediately after a call of inflate,
    if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
-   can be determined from the adler32 value returned by that call of inflate.
+   can be determined from the Adler-32 value returned by that call of inflate.
    The compressor and decompressor must use exactly the same dictionary (see
    deflateSetDictionary).  For raw inflate, this function can be called at any
    time to set the dictionary.  If the provided dictionary is smaller than the
@@ -834,7 +899,7 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
      inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
    parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
    inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect adler32 value).  inflateSetDictionary does not
+   expected one (incorrect Adler-32 value).  inflateSetDictionary does not
    perform any decompression: this will be done by subsequent calls of
    inflate().
 */
@@ -892,7 +957,7 @@ ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
 ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
 /*
      This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.  The
+   but does not free and reallocate the internal decompression state.  The
    stream will keep attributes that may have been set by inflateInit2.
 
      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
@@ -904,7 +969,9 @@ ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
 /*
      This function is the same as inflateReset, but it also permits changing
    the wrap and window size requests.  The windowBits parameter is interpreted
-   the same as it is for inflateInit2.
+   the same as it is for inflateInit2.  If the window size is changed, then the
+   memory allocated for the window is freed, and the window will be reallocated
+   by inflate() if needed.
 
      inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent (such as zalloc or state being Z_NULL), or if
@@ -956,7 +1023,7 @@ ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
    location in the input stream can be determined from avail_in and data_type
    as noted in the description for the Z_BLOCK flush parameter for inflate.
 
-     inflateMark returns the value noted above or -1 << 16 if the provided
+     inflateMark returns the value noted above, or -65536 if the provided
    source stream state was inconsistent.
 */
 
@@ -1048,9 +1115,9 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
    This routine would normally be used in a utility that reads zip or gzip
    files and writes out uncompressed files.  The utility would decode the
    header and process the trailer on its own, hence this routine expects only
-   the raw deflate stream to decompress.  This is different from the normal
-   behavior of inflate(), which expects either a zlib or gzip header and
-   trailer around the deflate stream.
+   the raw deflate stream to decompress.  This is different from the default
+   behavior of inflate(), which expects a zlib header and trailer around the
+   deflate stream.
 
      inflateBack() uses two subroutines supplied by the caller that are then
    called by inflateBack() for input and output.  inflateBack() calls those
@@ -1059,12 +1126,12 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
    parameters and return types are defined above in the in_func and out_func
    typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
    number of bytes of provided input, and a pointer to that input in buf.  If
-   there is no input available, in() must return zero--buf is ignored in that
-   case--and inflateBack() will return a buffer error.  inflateBack() will call
-   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
-   should return zero on success, or non-zero on failure.  If out() returns
-   non-zero, inflateBack() will return with an error.  Neither in() nor out()
-   are permitted to change the contents of the window provided to
+   there is no input available, in() must return zero -- buf is ignored in that
+   case -- and inflateBack() will return a buffer error.  inflateBack() will
+   call out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].
+   out() should return zero on success, or non-zero on failure.  If out()
+   returns non-zero, inflateBack() will return with an error.  Neither in() nor
+   out() are permitted to change the contents of the window provided to
    inflateBackInit(), which is also the buffer that out() uses to write from.
    The length written by out() will be at most the window size.  Any non-zero
    amount of input may be provided by in().
@@ -1092,7 +1159,7 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
    using strm->next_in which will be Z_NULL only if in() returned an error.  If
    strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
    non-zero.  (in() will always be called before out(), so strm->next_in is
-   assured to be defined if out() returns non-zero.) Note that inflateBack()
+   assured to be defined if out() returns non-zero.)  Note that inflateBack()
    cannot return Z_OK.
 */
 
@@ -1114,7 +1181,7 @@ ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
      7.6: size of z_off_t
 
     Compiler, assembler, and debug options:
-     8: DEBUG
+     8: ZLIB_DEBUG
      9: ASMV or ASMINF -- use ASM code
      10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
      11: 0 (reserved)
@@ -1164,7 +1231,8 @@ ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
    the byte length of the source buffer.  Upon entry, destLen is the total size
    of the destination buffer, which must be at least the value returned by
    compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.
+   compressed data.  compress() is equivalent to compress2() with a level
+   parameter of Z_DEFAULT_COMPRESSION.
 
      compress returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_BUF_ERROR if there was not enough room in the output
@@ -1180,7 +1248,7 @@ ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
    length of the source buffer.  Upon entry, destLen is the total size of the
    destination buffer, which must be at least the value returned by
    compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.
+   compressed data.
 
      compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_BUF_ERROR if there was not enough room in the output buffer,
@@ -1203,7 +1271,7 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
    uncompressed data.  (The size of the uncompressed data must have been saved
    previously by the compressor and transmitted to the decompressor by some
    mechanism outside the scope of this compression library.) Upon exit, destLen
-   is the actual size of the uncompressed buffer.
+   is the actual size of the uncompressed data.
 
      uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_BUF_ERROR if there was not enough room in the output
@@ -1212,6 +1280,14 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
    buffer with the uncompressed data up to that point.
 */
 
+ZEXTERN int ZEXPORT uncompress2 OF((Bytef *dest,   uLongf *destLen,
+                                    const Bytef *source, uLong *sourceLen));
+/*
+     Same as uncompress, except that sourceLen is a pointer, where the
+   length of the source is *sourceLen.  On return, *sourceLen is the number of
+   source bytes consumed.
+*/
+
                         /* gzip file access functions */
 
 /*
@@ -1290,10 +1366,9 @@ ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
    default buffer size is 8192 bytes.  This function must be called after
    gzopen() or gzdopen(), and before any other calls that read or write the
    file.  The buffer memory allocation is always deferred to the first read or
-   write.  Two buffers are allocated, either both of the specified size when
-   writing, or one of the specified size and the other twice that size when
-   reading.  A larger buffer size of, for example, 64K or 128K bytes will
-   noticeably increase the speed of decompression (reading).
+   write.  Three times that size in buffer space is allocated.  A larger buffer
+   size of, for example, 64K or 128K bytes will noticeably increase the speed
+   of decompression (reading).
 
      The new buffer size also affects the maximum length for gzprintf().
 
@@ -1304,10 +1379,12 @@ ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
 ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
 /*
      Dynamically update the compression level or strategy.  See the description
-   of deflateInit2 for the meaning of these parameters.
+   of deflateInit2 for the meaning of these parameters.  Previously provided
+   data is flushed before the parameter change.
 
-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
-   opened for writing.
+     gzsetparams returns Z_OK if success, Z_STREAM_ERROR if the file was not
+   opened for writing, Z_ERRNO if there is an error writing the flushed data,
+   or Z_MEM_ERROR if there is a memory allocation error.
 */
 
 ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
@@ -1335,7 +1412,35 @@ ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
    case.
 
      gzread returns the number of uncompressed bytes actually read, less than
-   len for end of file, or -1 for error.
+   len for end of file, or -1 for error.  If len is too large to fit in an int,
+   then nothing is read, -1 is returned, and the error state is set to
+   Z_STREAM_ERROR.
+*/
+
+ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems,
+                                     gzFile file));
+/*
+     Read up to nitems items of size size from file to buf, otherwise operating
+   as gzread() does.  This duplicates the interface of stdio's fread(), with
+   size_t request and return types.  If the library defines size_t, then
+   z_size_t is identical to size_t.  If not, then z_size_t is an unsigned
+   integer type that can contain a pointer.
+
+     gzfread() returns the number of full items read of size size, or zero if
+   the end of the file was reached and a full item could not be read, or if
+   there was an error.  gzerror() must be consulted if zero is returned in
+   order to determine if there was an error.  If the multiplication of size and
+   nitems overflows, i.e. the product does not fit in a z_size_t, then nothing
+   is read, zero is returned, and the error state is set to Z_STREAM_ERROR.
+
+     In the event that the end of file is reached and only a partial item is
+   available at the end, i.e. the remaining uncompressed data length is not a
+   multiple of size, then the final partial item is nevetheless read into buf
+   and the end-of-file flag is set.  The length of the partial item read is not
+   provided, but could be inferred from the result of gztell().  This behavior
+   is the same as the behavior of fread() implementations in common libraries,
+   but it prevents the direct use of gzfread() to read a concurrently written
+   file, reseting and retrying on end-of-file, when size is not 1.
 */
 
 ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
@@ -1346,19 +1451,33 @@ ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
    error.
 */
 
+ZEXTERN z_size_t ZEXPORT gzfwrite OF((voidpc buf, z_size_t size,
+                                      z_size_t nitems, gzFile file));
+/*
+     gzfwrite() writes nitems items of size size from buf to file, duplicating
+   the interface of stdio's fwrite(), with size_t request and return types.  If
+   the library defines size_t, then z_size_t is identical to size_t.  If not,
+   then z_size_t is an unsigned integer type that can contain a pointer.
+
+     gzfwrite() returns the number of full items written of size size, or zero
+   if there was an error.  If the multiplication of size and nitems overflows,
+   i.e. the product does not fit in a z_size_t, then nothing is written, zero
+   is returned, and the error state is set to Z_STREAM_ERROR.
+*/
+
 ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
 /*
      Converts, formats, and writes the arguments to the compressed file under
    control of the format string, as in fprintf.  gzprintf returns the number of
-   uncompressed bytes actually written, or 0 in case of error.  The number of
-   uncompressed bytes written is limited to 8191, or one less than the buffer
-   size given to gzbuffer().  The caller should assure that this limit is not
-   exceeded.  If it is exceeded, then gzprintf() will return an error (0) with
-   nothing written.  In this case, there may also be a buffer overflow with
-   unpredictable consequences, which is possible only if zlib was compiled with
-   the insecure functions sprintf() or vsprintf() because the secure snprintf()
-   or vsnprintf() functions were not available.  This can be determined using
-   zlibCompileFlags().
+   uncompressed bytes actually written, or a negative zlib error code in case
+   of error.  The number of uncompressed bytes written is limited to 8191, or
+   one less than the buffer size given to gzbuffer().  The caller should assure
+   that this limit is not exceeded.  If it is exceeded, then gzprintf() will
+   return an error (0) with nothing written.  In this case, there may also be a
+   buffer overflow with unpredictable consequences, which is possible only if
+   zlib was compiled with the insecure functions sprintf() or vsprintf()
+   because the secure snprintf() or vsnprintf() functions were not available.
+   This can be determined using zlibCompileFlags().
 */
 
 ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
@@ -1418,7 +1537,7 @@ ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
      If the flush parameter is Z_FINISH, the remaining data is written and the
    gzip stream is completed in the output.  If gzwrite() is called again, a new
    gzip stream will be started in the output.  gzread() is able to read such
-   concatented gzip streams.
+   concatenated gzip streams.
 
      gzflush should be called only when strictly necessary because it will
    degrade compression if called too often.
@@ -1572,7 +1691,7 @@ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
    return the updated checksum.  If buf is Z_NULL, this function returns the
    required initial value for the checksum.
 
-     An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
+     An Adler-32 checksum is almost as reliable as a CRC-32 but can be computed
    much faster.
 
    Usage example:
@@ -1585,6 +1704,12 @@ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
      if (adler != original_adler) error();
 */
 
+ZEXTERN uLong ZEXPORT adler32_z OF((uLong adler, const Bytef *buf,
+                                    z_size_t len));
+/*
+     Same as adler32(), but with a size_t length.
+*/
+
 /*
 ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
                                           z_off_t len2));
@@ -1614,6 +1739,12 @@ ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
      if (crc != original_crc) error();
 */
 
+ZEXTERN uLong ZEXPORT crc32_z OF((uLong adler, const Bytef *buf,
+                                  z_size_t len));
+/*
+     Same as crc32(), but with a size_t length.
+*/
+
 /*
 ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
 
@@ -1644,19 +1775,35 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
                                          unsigned char FAR *window,
                                          const char *version,
                                          int stream_size));
-#define deflateInit(strm, level) \
-        deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit(strm) \
-        inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
-                      (int)sizeof(z_stream))
-#define inflateBackInit(strm, windowBits, window) \
-        inflateBackInit_((strm), (windowBits), (window), \
-                      ZLIB_VERSION, (int)sizeof(z_stream))
+#ifdef Z_PREFIX_SET
+#  define z_deflateInit(strm, level) \
+          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define z_inflateInit(strm) \
+          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define z_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+          deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define z_inflateInit2(strm, windowBits) \
+          inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+                        (int)sizeof(z_stream))
+#  define z_inflateBackInit(strm, windowBits, window) \
+          inflateBackInit_((strm), (windowBits), (window), \
+                           ZLIB_VERSION, (int)sizeof(z_stream))
+#else
+#  define deflateInit(strm, level) \
+          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define inflateInit(strm) \
+          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+          deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
+#  define inflateInit2(strm, windowBits) \
+          inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+                        (int)sizeof(z_stream))
+#  define inflateBackInit(strm, windowBits, window) \
+          inflateBackInit_((strm), (windowBits), (window), \
+                           ZLIB_VERSION, (int)sizeof(z_stream))
+#endif
 
 #ifndef Z_SOLO
 
@@ -1676,10 +1823,10 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
 #ifdef Z_PREFIX_SET
 #  undef z_gzgetc
 #  define z_gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
 #else
 #  define gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
 #endif
 
 /* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
@@ -1737,19 +1884,16 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
 
 #endif /* !Z_SOLO */
 
-/* hack for buggy compilers */
-#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;};
-#endif
-
 /* undocumented functions */
 ZEXTERN const char   * ZEXPORT zError           OF((int));
 ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
 ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
 ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
+ZEXTERN int            ZEXPORT inflateValidate OF((z_streamp, int));
+ZEXTERN unsigned long  ZEXPORT inflateCodesUsed OF ((z_streamp));
 ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
 ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
-#if defined(_WIN32) && !defined(Z_SOLO)
+#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(Z_SOLO)
 ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
                                             const char *mode));
 #endif
diff --git a/erts/emulator/zlib/zlib.mk b/erts/emulator/zlib/zlib.mk
index 3f0d64d250..b51b4ec8d6 100644
--- a/erts/emulator/zlib/zlib.mk
+++ b/erts/emulator/zlib/zlib.mk
@@ -52,7 +52,7 @@ ifeq ($(TYPE),gcov)
 ZLIB_CFLAGS = -O0 -fprofile-arcs -ftest-coverage $(DEBUG_CFLAGS) $(DEFS) $(THR_DEFS)
 else  # gcov
 ifeq ($(TYPE),debug)
-ZLIB_CFLAGS = $(DEBUG_CFLAGS) $(DEFS) $(THR_DEFS)
+ZLIB_CFLAGS = -DZLIB_DEBUG=1 $(DEBUG_CFLAGS) $(DEFS) $(THR_DEFS)
 else # debug
 ZLIB_CFLAGS = $(subst -O2, -O3, $(CONFIGURE_CFLAGS) $(DEFS) $(THR_DEFS))
 #ZLIB_CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
@@ -62,6 +62,9 @@ ZLIB_CFLAGS = $(subst -O2, -O3, $(CONFIGURE_CFLAGS) $(DEFS) $(THR_DEFS))
 endif # debug
 endif # gcov
 
+# Don't fail if _LFS64_LARGEFILE is undefined
+ZLIB_CFLAGS := $(filter-out -Werror=undef,$(ZLIB_CFLAGS))
+
 ifeq ($(TARGET), win32)
 $(ZLIB_LIBRARY): $(ZLIB_OBJS)
 	$(V_AR) -out:$@ $(ZLIB_OBJS)
diff --git a/erts/emulator/zlib/zutil.c b/erts/emulator/zlib/zutil.c
index 27a8af4a2b..a76c6b0c7e 100644
--- a/erts/emulator/zlib/zutil.c
+++ b/erts/emulator/zlib/zutil.c
@@ -1,33 +1,27 @@
 /* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly.
+ * Copyright (C) 1995-2017 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 /* @(#) $Id$ */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
 #include "zutil.h"
 #ifndef Z_SOLO
 #  include "gzguts.h"
 #endif
 
-#ifndef NO_DUMMY_DECL
-struct internal_state      {int dummy;}; /* for buggy compilers */
-#endif
-
 z_const char * const z_errmsg[10] = {
-"need dictionary",     /* Z_NEED_DICT       2  */
-"stream end",          /* Z_STREAM_END      1  */
-"",                    /* Z_OK              0  */
-"file error",          /* Z_ERRNO         (-1) */
-"stream error",        /* Z_STREAM_ERROR  (-2) */
-"data error",          /* Z_DATA_ERROR    (-3) */
-"insufficient memory", /* Z_MEM_ERROR     (-4) */
-"buffer error",        /* Z_BUF_ERROR     (-5) */
-"incompatible version",/* Z_VERSION_ERROR (-6) */
-""};
+    (z_const char *)"need dictionary",     /* Z_NEED_DICT       2  */
+    (z_const char *)"stream end",          /* Z_STREAM_END      1  */
+    (z_const char *)"",                    /* Z_OK              0  */
+    (z_const char *)"file error",          /* Z_ERRNO         (-1) */
+    (z_const char *)"stream error",        /* Z_STREAM_ERROR  (-2) */
+    (z_const char *)"data error",          /* Z_DATA_ERROR    (-3) */
+    (z_const char *)"insufficient memory", /* Z_MEM_ERROR     (-4) */
+    (z_const char *)"buffer error",        /* Z_BUF_ERROR     (-5) */
+    (z_const char *)"incompatible version",/* Z_VERSION_ERROR (-6) */
+    (z_const char *)""
+};
 
 
 const char * ZEXPORT zlibVersion()
@@ -64,7 +58,7 @@ uLong ZEXPORT zlibCompileFlags()
     case 8:     flags += 2 << 6;        break;
     default:    flags += 3 << 6;
     }
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
     flags += 1 << 8;
 #endif
 #if defined(ASMV) || defined(ASMINF)
@@ -118,8 +112,8 @@ uLong ZEXPORT zlibCompileFlags()
     return flags;
 }
 
-#ifdef DEBUG
-
+#ifdef ZLIB_DEBUG
+#include <stdlib.h>
 #  ifndef verbose
 #    define verbose 0
 #  endif
@@ -222,9 +216,11 @@ local ptr_table table[MAX_PTR];
 
 voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
 {
-    voidpf buf = opaque; /* just to make some compilers happy */
+    voidpf buf;
     ulg bsize = (ulg)items*size;
 
+    (void)opaque;
+
     /* If we allocate less than 65520 bytes, we assume that farmalloc
      * will return a usable pointer which doesn't have to be normalized.
      */
@@ -247,6 +243,9 @@ voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
 void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
 {
     int n;
+
+    (void)opaque;
+
     if (*(ush*)&ptr != 0) { /* object < 64K */
         farfree(ptr);
         return;
@@ -262,7 +261,6 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
         next_ptr--;
         return;
     }
-    ptr = opaque; /* just to make some compilers happy */
     Assert(0, "zcfree: ptr not found");
 }
 
@@ -281,13 +279,13 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
 
 voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
 {
-    if (opaque) opaque = 0; /* to make compiler happy */
+    (void)opaque;
     return _halloc((long)items, size);
 }
 
 void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
 {
-    if (opaque) opaque = 0; /* to make compiler happy */
+    (void)opaque;
     _hfree(ptr);
 }
 
@@ -309,7 +307,7 @@ voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
     unsigned items;
     unsigned size;
 {
-    if (opaque) items += size - size; /* make compiler happy */
+    (void)opaque;
     return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
                               (voidpf)calloc(items, size);
 }
@@ -318,8 +316,8 @@ void ZLIB_INTERNAL zcfree (opaque, ptr)
     voidpf opaque;
     voidpf ptr;
 {
+    (void)opaque;
     free(ptr);
-    if (opaque) return; /* make compiler happy */
 }
 
 #endif /* MY_ZCALLOC */
diff --git a/erts/emulator/zlib/zutil.h b/erts/emulator/zlib/zutil.h
index 24ab06b1cf..b079ea6a80 100644
--- a/erts/emulator/zlib/zutil.h
+++ b/erts/emulator/zlib/zutil.h
@@ -1,5 +1,5 @@
 /* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
+ * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -36,7 +36,9 @@
 #ifndef local
 #  define local static
 #endif
-/* compile with -Dlocal if your debugger can't find static symbols */
+/* since "static" is used to mean two completely different things in C, we
+   define "local" for the non-static meaning of "static", for readability
+   (compile with -Dlocal if your debugger can't find static symbols) */
 
 typedef unsigned char  uch;
 typedef uch FAR uchf;
@@ -98,28 +100,38 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #endif
 
 #ifdef AMIGA
-#  define OS_CODE  0x01
+#  define OS_CODE  1
 #endif
 
 #if defined(VAXC) || defined(VMS)
-#  define OS_CODE  0x02
+#  define OS_CODE  2
 #  define F_OPEN(name, mode) \
      fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
 #endif
 
+#ifdef __370__
+#  if __TARGET_LIB__ < 0x20000000
+#    define OS_CODE 4
+#  elif __TARGET_LIB__ < 0x40000000
+#    define OS_CODE 11
+#  else
+#    define OS_CODE 8
+#  endif
+#endif
+
 #if defined(ATARI) || defined(atarist)
-#  define OS_CODE  0x05
+#  define OS_CODE  5
 #endif
 
 #ifdef OS2
-#  define OS_CODE  0x06
+#  define OS_CODE  6
 #  if defined(M_I86) && !defined(Z_SOLO)
 #    include <malloc.h>
 #  endif
 #endif
 
 #if defined(MACOS) || defined(TARGET_OS_MAC)
-#  define OS_CODE  0x07
+#  define OS_CODE  7
 #  ifndef Z_SOLO
 #    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
 #      include <unix.h> /* for fdopen */
@@ -131,18 +143,24 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  endif
 #endif
 
-#ifdef TOPS20
-#  define OS_CODE  0x0a
+#ifdef __acorn
+#  define OS_CODE 13
 #endif
 
-#ifdef WIN32
-#  ifndef __CYGWIN__  /* Cygwin is Unix, not Win32 */
-#    define OS_CODE  0x0b
-#  endif
+#if defined(WIN32) && !defined(__CYGWIN__)
+#  define OS_CODE  10
+#endif
+
+#ifdef _BEOS_
+#  define OS_CODE  16
+#endif
+
+#ifdef __TOS_OS400__
+#  define OS_CODE 18
 #endif
 
-#ifdef __50SERIES /* Prime/PRIMOS */
-#  define OS_CODE  0x0f
+#ifdef __APPLE__
+#  define OS_CODE 19
 #endif
 
 #if defined(_BEOS_) || defined(RISCOS)
@@ -177,7 +195,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
         /* common defaults */
 
 #ifndef OS_CODE
-#  define OS_CODE  0x03  /* assume Unix */
+#  define OS_CODE  3     /* assume Unix */
 #endif
 
 #ifndef F_OPEN
@@ -216,7 +234,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #endif
 
 /* Diagnostic functions */
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
 #  include <stdio.h>
    extern int ZLIB_INTERNAL z_verbose;
    extern void ZLIB_INTERNAL z_error OF((char *m));
diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c
index 44e997e609..8313678b5d 100644
--- a/erts/epmd/src/epmd.c
+++ b/erts/epmd/src/epmd.c
@@ -437,6 +437,11 @@ static void usage(EpmdVars *g)
     fprintf(stderr, "        epmd -kill even if there "
 	    "are registered nodes.\n");
     fprintf(stderr, "        Also allows forced unregister (epmd -stop).\n");
+#ifdef HAVE_SYSTEMD_DAEMON
+    fprintf(stderr, "    -systemd\n");
+    fprintf(stderr, "        Wait for socket from systemd. The option makes sense\n");
+    fprintf(stderr, "        when started from .socket unit.\n");
+#endif /* HAVE_SYSTEMD_DAEMON */
     fprintf(stderr, "\nDbgExtra options\n");
     fprintf(stderr, "    -packet_timeout Seconds\n");
     fprintf(stderr, "        Set the number of seconds a connection can be\n");
@@ -462,11 +467,6 @@ static void usage(EpmdVars *g)
     fprintf(stderr, "        Forcibly unregisters a name with epmd\n");
     fprintf(stderr, "        (only allowed if -relaxed_command_check was given when \n");
     fprintf(stderr, "        epmd was started).\n");
-#ifdef HAVE_SYSTEMD_DAEMON
-    fprintf(stderr, "    -systemd\n");
-    fprintf(stderr, "        Wait for socket from systemd. The option makes sense\n");
-    fprintf(stderr, "        when started from .socket unit.\n");
-#endif /* HAVE_SYSTEMD_DAEMON */
     epmd_cleanup_exit(g,1);
 }
 
diff --git a/erts/epmd/src/epmd_srv.c b/erts/epmd/src/epmd_srv.c
index 66c10a65bc..3c6f1fbdf4 100644
--- a/erts/epmd/src/epmd_srv.c
+++ b/erts/epmd/src/epmd_srv.c
@@ -747,7 +747,7 @@ static void do_request(g, fd, s, buf, bsize)
 	    put_int16(node->creation, wbuf+2);
 	}
   
-	if (reply(g, fd, wbuf, 4) != 4)
+	if (!reply(g, fd, wbuf, 4))
 	  {
             node_unreg(g, name);
 	    dbg_tty_printf(g,1,"** failed to send ALIVE2_RESP for \"%s\"",
@@ -807,7 +807,7 @@ static void do_request(g, fd, s, buf, bsize)
 		offset += 2;
 		memcpy(wbuf + offset,node->extra,node->extralen);
 		offset += node->extralen;
-		if (reply(g, fd, wbuf, offset) != offset)
+		if (!reply(g, fd, wbuf, offset))
 		  {
 		    dbg_tty_printf(g,1,"** failed to send PORT2_RESP (ok) for \"%s\"",name);
 		    return;
@@ -817,7 +817,7 @@ static void do_request(g, fd, s, buf, bsize)
 	    }
 	}
 	wbuf[1] = 1; /* error */
-	if (reply(g, fd, wbuf, 2) != 2)
+	if (!reply(g, fd, wbuf, 2))
 	  {
 	    dbg_tty_printf(g,1,"** failed to send PORT2_RESP (error) for \"%s\"",name);
 	    return;
@@ -835,7 +835,7 @@ static void do_request(g, fd, s, buf, bsize)
 	i = htonl(g->port);
 	memcpy(wbuf,&i,4);
 
-	if (reply(g, fd,wbuf,4) != 4)
+	if (!reply(g, fd,wbuf,4))
 	  {
 	    dbg_tty_printf(g,1,"failed to send NAMES_RESP");
 	    return;
@@ -856,7 +856,7 @@ static void do_request(g, fd, s, buf, bsize)
 	    if (r < 0)
 		goto failed_names_resp;
 	    len += r;
-	    if (reply(g, fd, wbuf, len) != len)
+	    if (!reply(g, fd, wbuf, len))
 	      {
 	      failed_names_resp:
 		dbg_tty_printf(g,1,"failed to send NAMES_RESP");
@@ -878,7 +878,7 @@ static void do_request(g, fd, s, buf, bsize)
 
 	i = htonl(g->port);
 	memcpy(wbuf,&i,4);
-	if (reply(g, fd,wbuf,4) != 4)
+	if (!reply(g, fd,wbuf,4))
 	  {
 	    dbg_tty_printf(g,1,"failed to send DUMP_RESP");
 	    return;
@@ -899,7 +899,7 @@ static void do_request(g, fd, s, buf, bsize)
 	      if (r < 0)
 		  goto failed_dump_resp;
 	      len += r + 1;
-	      if (reply(g, fd,wbuf,len) != len)
+	      if (!reply(g, fd,wbuf,len))
 	      {
 	      failed_dump_resp:
 		dbg_tty_printf(g,1,"failed to send DUMP_RESP");
@@ -922,7 +922,7 @@ static void do_request(g, fd, s, buf, bsize)
 	      if (r < 0)
 		  goto failed_dump_resp2;
 	      len += r + 1;
-	      if (reply(g, fd,wbuf,len) != len)
+	      if (!reply(g, fd,wbuf,len))
 	      {
 	      failed_dump_resp2:
 		dbg_tty_printf(g,1,"failed to send DUMP_RESP");
@@ -942,12 +942,12 @@ static void do_request(g, fd, s, buf, bsize)
 
       if (!g->brutal_kill && (g->nodes.reg != NULL)) {
 	  dbg_printf(g,0,"Disallowed KILL_REQ, live nodes");
-	  if (reply(g, fd,"NO",2) != 2)
+	  if (!reply(g, fd,"NO",2))
 	      dbg_printf(g,0,"failed to send reply to KILL_REQ");
 	  return;
       }
 
-      if (reply(g, fd,"OK",2) != 2)
+      if (!reply(g, fd,"OK",2))
 	dbg_printf(g,0,"failed to send reply to KILL_REQ");
       dbg_tty_printf(g,1,"epmd killed");
       conn_close_fd(g,fd);	/* We never return to caller so close here */
@@ -977,7 +977,7 @@ static void do_request(g, fd, s, buf, bsize)
 
 	if ((node_fd = node_unreg(g,name)) < 0)
 	  {
-	    if (reply(g, fd,"NOEXIST",7) != 7)
+	    if (!reply(g, fd,"NOEXIST",7))
 	      {
 		dbg_tty_printf(g,1,"failed to send STOP_RESP NOEXIST");
 		return;
@@ -988,7 +988,7 @@ static void do_request(g, fd, s, buf, bsize)
 	conn_close_fd(g,node_fd);
 	dbg_tty_printf(g,1,"epmd connection stopped");
 
-	if (reply(g, fd,"STOPPED",7) != 7)
+	if (!reply(g, fd,"STOPPED",7))
 	  {
 	    dbg_tty_printf(g,1,"failed to send STOP_RESP STOPPED");
 	    return;
@@ -1448,7 +1448,9 @@ static time_t current_time(EpmdVars *g)
 
 static int reply(EpmdVars *g,int fd,char *buf,int len)
 {
-  int val;
+  char* p = buf;
+  int nbytes = len;
+  int val, ret;
 
   if (len < 0)
     {
@@ -1459,15 +1461,27 @@ static int reply(EpmdVars *g,int fd,char *buf,int len)
   if (g->delay_write)		/* Test of busy server */
     sleep(g->delay_write);
 
-  val = write(fd,buf,len);
-  if (val < 0)
-    dbg_perror(g,"error in write");
-  else if (val != len)
-    dbg_printf(g,0,"could only send %d bytes out of %d to fd %d",val,len,fd);
+  for (;;) {
+      val = write(fd, p, nbytes);
+      if (val == nbytes) {
+          ret = 1;
+          break;
+      }
+      if (val < 0) {
+          if (errno == EINTR)
+              continue;
+          dbg_perror(g,"error in write, errno=%d", errno);
+          ret = 0;
+          break;
+      }
+      dbg_printf(g,0,"could only send %d bytes out of %d to fd %d",val,nbytes,fd);
+      p += val;
+      nbytes -= val;
+  }
 
   dbg_print_buf(g,buf,len);
 
-  return val;
+  return ret;
 }
       
 
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index 0cb01fd4ef..477a501876 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -255,7 +255,9 @@ static char* key_val_name = ERLANG_VERSION; /* Used by the registry
 					   * access functions.
 					   */
 static char* boot_script = NULL; /* used by option -start_erl and -boot */
-static char* config_script = NULL; /* used by option -start_erl and -config */
+static char** config_scripts = NULL; /* used by option -start_erl and -config */
+static int config_script_cnt = 0;
+static int got_start_erl = 0;
 
 static HANDLE this_module_handle;
 static int run_werl;
@@ -392,6 +394,22 @@ add_extra_suffixes(char *prog)
 }
 
 #ifdef __WIN32__
+static void add_boot_config(void)
+{
+    int i;
+    if (boot_script)
+	add_args("-boot", boot_script, NULL);
+    for (i = 0; i < config_script_cnt; i++) {
+        add_args("-config", config_scripts[i], NULL);
+    }
+}
+# define ADD_BOOT_CONFIG add_boot_config()
+#else
+# define ADD_BOOT_CONFIG
+#endif
+
+
+#ifdef __WIN32__
 __declspec(dllexport) int win_erlexec(int argc, char **argv, HANDLE module, int windowed)
 #else
 int main(int argc, char **argv)
@@ -408,7 +426,6 @@ int main(int argc, char **argv)
     int process_args = 1;
     int print_args_exit = 0;
     int print_qouted_cmd_exit = 0;
-    erts_cpu_info_t *cpuinfo = NULL;
     char* emu_name;
 
 #ifdef __WIN32__
@@ -467,8 +484,6 @@ int main(int argc, char **argv)
     /*
      * Construct the path of the executable.
      */
-    cpuinfo = erts_cpu_info_create();
-
 #if defined(__WIN32__) && defined(WIN32_ALWAYS_DEBUG)
     emu_type = "debug";
 #endif
@@ -526,9 +541,6 @@ int main(int argc, char **argv)
 	i++;
     }
 
-    erts_cpu_info_destroy(cpuinfo);
-    cpuinfo = NULL;
-
     if (malloc_lib) {
 	if (strcmp(malloc_lib, "libc") != 0)
 	    usage("+MYm");
@@ -587,16 +599,6 @@ int main(int argc, char **argv)
     
     i = 1;
 
-#ifdef __WIN32__
-#define ADD_BOOT_CONFIG					\
-    if (boot_script)					\
-	add_args("-boot", boot_script, NULL);		\
-    if (config_script)					\
-	add_args("-config", config_script, NULL);
-#else
-#define ADD_BOOT_CONFIG
-#endif
-
     get_home();
     add_args("-home", home, NULL);
 
@@ -616,7 +618,9 @@ int main(int argc, char **argv)
 		case 'b':
 		    if (strcmp(argv[i], "-boot") == 0) {
 			if (boot_script)
-			    error("Conflicting -start_erl and -boot options");
+			    error("Conflicting -boot options");
+                        if (got_start_erl)
+                            error("Conflicting -start_erl and -boot options");
 			if (i+1 >= argc)
 			    usage("-boot");
 			boot_script = strsave(argv[i+1]);
@@ -640,11 +644,14 @@ int main(int argc, char **argv)
 		    }
 #ifdef __WIN32__
 		    else if (strcmp(argv[i], "-config") == 0){
-			if (config_script)
+			if (got_start_erl)
 			    error("Conflicting -start_erl and -config options");
 			if (i+1 >= argc)
 			    usage("-config");
-			config_script = strsave(argv[i+1]);
+                        config_script_cnt++;
+                        config_scripts = erealloc(config_scripts,
+                                                  config_script_cnt * sizeof(char*));
+			config_scripts[config_script_cnt-1] = strsave(argv[i+1]);
 			i++;
 		    }
 #endif
@@ -662,15 +669,6 @@ int main(int argc, char **argv)
 		    }
 		    break;
 
-		  case 'i':
-		    if (strcmp(argv[i], "-instr") == 0) {
-			add_Eargs("-Mim");
-			add_Eargs("true");
-		    }
-		    else
-			add_arg(argv[i]);
-		    break;
-
 		  case 'e':
 		    if (strcmp(argv[i], "-extra") == 0) {
 			process_args = 0;
@@ -819,10 +817,8 @@ int main(int argc, char **argv)
 
 	      case '+':
 		switch (argv[i][1]) {
-		  case '#':
 		  case 'a':
 		  case 'A':
-		  case 'b':
 		  case 'C':
 		  case 'e':
 		  case 'i':
@@ -1388,6 +1384,7 @@ strsave(char* string)
 
 static void get_start_erl_data(char *file)
 {
+    static char* a_config_script;
     int fp;
     char tmpbuffer[512];
     char start_erl_data[512];
@@ -1398,7 +1395,7 @@ static void get_start_erl_data(char *file)
     char* tprogname;
     if (boot_script) 
 	error("Conflicting -start_erl and -boot options");
-    if (config_script)
+    if (config_scripts)
 	error("Conflicting -start_erl and -config options");
     env = get_env("RELDIR");
     if (env)
@@ -1448,10 +1445,13 @@ static void get_start_erl_data(char *file)
     erts_snprintf(progname,strlen(tprogname) + 20,"%s -start_erl",tprogname);
 
     boot_script = emalloc(512);
-    config_script = emalloc(512);
+    a_config_script = emalloc(512);
     erts_snprintf(boot_script, 512, "%s/%s/start", reldir, otpstring);
-    erts_snprintf(config_script, 512, "%s/%s/sys", reldir, otpstring);
+    erts_snprintf(a_config_script, 512, "%s/%s/sys", reldir, otpstring);
+    config_scripts = &a_config_script;
+    config_script_cnt = 1;
        
+    got_start_erl = 1;
 }
 
 
@@ -1690,9 +1690,9 @@ static char **build_args_from_string(char *string)
     for(;;) {
 	switch (state) {
 	case Start:
-	    if (!*p) 
+	    if (!*p)
 		goto done;
-	    if (argc >= alloced - 1) { /* Make room for extra NULL */
+	    if (argc >= alloced - 2) { /* Make room for extra NULL and "--" */
 		argv = erealloc(argv, (alloced += 10) * sizeof(char *));
 	    }
 	    cur_s = argc + argv;
@@ -1781,11 +1781,14 @@ static char **build_args_from_string(char *string)
 	}
     }
 done:
-    argv[argc] = NULL; /* Sure to be large enough */
     if (!argc) {
 	efree(argv);
 	return NULL;
     }
+    argv[argc++] = "--"; /* Add a -- separator in order
+                            for different from different environments
+                            to effect each other */
+    argv[argc++] = NULL; /* Sure to be large enough */
     return argv;
 #undef ENSURE
 }
@@ -2036,11 +2039,13 @@ initial_argv_massage(int *argc, char ***argv)
     argv_buf ab = {0}, xab = {0};
     int ix, vix, ac;
     char **av;
+    char *sep = "--";
     struct {
 	int argc;
 	char **argv;
     } avv[] = {{INT_MAX, NULL}, {INT_MAX, NULL}, {INT_MAX, NULL},
-	       {INT_MAX, NULL}, {INT_MAX, NULL}, {INT_MAX, NULL}};
+	       {INT_MAX, NULL}, {INT_MAX, NULL},
+               {INT_MAX, NULL}, {INT_MAX, NULL}};
     /*
      * The environment flag containing OTP release is intentionally
      * undocumented and intended for OTP internal use only.
@@ -2060,6 +2065,8 @@ initial_argv_massage(int *argc, char ***argv)
     if (*argc > 1) {
 	avv[vix].argc = *argc - 1;
 	avv[vix++].argv = &(*argv)[1];
+        avv[vix].argc = 1;
+        avv[vix++].argv = &sep;
     }
 
     av = build_args_from_env("ERL_FLAGS");
diff --git a/erts/etc/common/heart.c b/erts/etc/common/heart.c
index bd218ff725..bb843a616b 100644
--- a/erts/etc/common/heart.c
+++ b/erts/etc/common/heart.c
@@ -500,7 +500,7 @@ message_loop(erlin_fd, erlout_fd)
 
 #if defined(__WIN32__)
 static void 
-kill_old_erlang(void){
+kill_old_erlang(int reason){
     HANDLE erlh;
     DWORD exit_code;
     char* envvar = NULL;
@@ -536,7 +536,8 @@ kill_old_erlang(void){
 }
 #else
 static void 
-kill_old_erlang(void){
+kill_old_erlang(int reason)
+{
     pid_t pid;
     int i, res;
     int sig = SIGKILL;
@@ -546,14 +547,25 @@ kill_old_erlang(void){
     if (envvar && strcmp(envvar, "TRUE") == 0)
       return;
 
-    envvar = get_env(HEART_KILL_SIGNAL);
-    if (envvar && strcmp(envvar, "SIGABRT") == 0) {
-        print_error("kill signal SIGABRT requested");
-        sig = SIGABRT;
-    }
-
     if(heart_beat_kill_pid != 0){
-	pid = (pid_t) heart_beat_kill_pid;
+        pid = (pid_t) heart_beat_kill_pid;
+        if (reason == R_CLOSED) {
+            print_error("Wait 5 seconds for Erlang to terminate nicely");
+            for (i=0; i < 5; ++i) {
+                res = kill(pid, 0); /* check if alive */
+                if (res < 0 && errno == ESRCH)
+                    return;
+                sleep(1);
+            }
+            print_error("Erlang still alive, kill it");
+        }
+
+        envvar = get_env(HEART_KILL_SIGNAL);
+        if (envvar && strcmp(envvar, "SIGABRT") == 0) {
+            print_error("kill signal SIGABRT requested");
+            sig = SIGABRT;
+        }
+
 	res = kill(pid,sig);
 	for(i=0; i < 5 && res == 0; ++i){
 	    sleep(1);
@@ -677,7 +689,7 @@ do_terminate(int erlin_fd, int reason) {
 	    if(!command)
 		print_error("Would reboot. Terminating.");
 	    else {
-		kill_old_erlang();
+		kill_old_erlang(reason);
 		/* High prio combined with system() works badly indeed... */
 		SetPriorityClass(GetCurrentProcess(), NORMAL_PRIORITY_CLASS);
 		win_system(command);
@@ -685,7 +697,7 @@ do_terminate(int erlin_fd, int reason) {
 	    }
 	    free_env_val(command);
 	} else {
-	    kill_old_erlang();
+	    kill_old_erlang(reason);
 	    /* High prio combined with system() works badly indeed... */
 	    SetPriorityClass(GetCurrentProcess(), NORMAL_PRIORITY_CLASS);
 	    win_system(&cmd[0]);
@@ -697,13 +709,13 @@ do_terminate(int erlin_fd, int reason) {
 	    if(!command)
 		print_error("Would reboot. Terminating.");
 	    else {
-		kill_old_erlang();
+		kill_old_erlang(reason);
 		ret = system(command);
 		print_error("Executed \"%s\" -> %d. Terminating.",command, ret);
 	    }
 	    free_env_val(command);
 	} else {
-	    kill_old_erlang();
+	    kill_old_erlang(reason);
 	    ret = system((char*)&cmd[0]);
 	    print_error("Executed \"%s\" -> %d. Terminating.",cmd, ret);
 	}
diff --git a/erts/etc/unix/Makefile b/erts/etc/unix/Makefile
index 83c64d35fd..21a725cb88 100644
--- a/erts/etc/unix/Makefile
+++ b/erts/etc/unix/Makefile
@@ -30,7 +30,8 @@ opt debug lcnt: etc
 etc: etp-commands
 
 etp-commands: etp-commands.in
-	$(gen_verbose)sed 's:@ERL_TOP@:${ERL_TOP}:g' etp-commands.in > etp-commands
+	$(gen_verbose)sed -e 's:@ERL_TOP@:${ERL_TOP}:g' \
+	etp-commands.in > etp-commands
 
 .PHONY: docs
 docs:
diff --git a/erts/etc/unix/cerl.src b/erts/etc/unix/cerl.src
index 2e034513b0..59de9bdec8 100644
--- a/erts/etc/unix/cerl.src
+++ b/erts/etc/unix/cerl.src
@@ -224,7 +224,13 @@ while [ $# -gt 0 ]; do
 	    shift
 	    cargs="$cargs -rr"
 	    run_rr=yes
-	    skip_erlexec=yes
+            case "$1" in
+                "replay"|"ps")
+                    ;;
+                *)
+	            skip_erlexec=yes
+                    ;;
+            esac
 	    ;;
 	*)
 	    break
@@ -286,28 +292,60 @@ if [ "x$GDB" = "x" ]; then
 		valgrind_log="$log_file_prefix$VALGRIND_LOG_DIR/$VALGRIND_LOGFILE_PREFIX$VALGRIND_LOGFILE_INFIX$EMU_NAME.log"
 	    fi
 	fi
-	if [ "x$VALGRIND_MISC_FLAGS" = "x" ]; then
-	    valgrind_misc_flags=
-	else
-	    valgrind_misc_flags="$VALGRIND_MISC_FLAGS"
+	# Add default flags
+	vgflags=$VALGRIND_MISC_FLAGS
+	if [ "x${vgflags#*--show-possibly-lost}" = "x$vgflags" ]; then
+	    vgflags="$vgflags --show-possibly-lost=no"
+	fi
+	if [ "x${vgflags#*--child-silent-after-fork}" = "x$vgflags" ]; then
+	    vgflags="$vgflags --child-silent-after-fork=yes"
+	fi
+	if [ "x${vgflags#*--suppressions}" = "x$vgflags" ]; then
+	    if [ "x$ERL_TOP" != "x" ]; then
+		vgflags="$vgflags --suppressions=$ERL_TOP/erts/emulator/valgrind/suppress.standard"
+	    else
+		echo "No valgrind suppression file found in \$VALGRIND_MISC_FLAGS and \$ERL_TOP not set."
+	    fi
 	fi
 	if which taskset > /dev/null && test -e /proc/cpuinfo; then
 	    # We only let valgrind utilize one core with "taskset 1" as it can be very slow
 	    # on multiple cores (especially with async threads). Valgrind only run one pthread
 	    # at a time anyway so there is no point letting it utilize more than one core.
 	    # Use $sched_arg to force all schedulers online to emulate multicore.
-	    taskset1="taskset 1"
 	    ncpu=`cat /proc/cpuinfo | grep -w processor | wc -l`
+            # Choose a random core in order to not collide with any other valgrind
+            # run on the same machine.
+            taskset1=$((1 << (`shuf -i 1-$ncpu -n 1` - 1) ))
+	    taskset1="taskset $taskset1"
 	    sched_arg="-S$ncpu:$ncpu"
 	else
 	    taskset1=
 	    sched_arg=
 	fi
 
-	exec $taskset1 valgrind $valgrind_xml $valgrind_log $valgrind_misc_flags $BINDIR/$EMU_NAME $sched_arg $emu_xargs "$@"
+	exec $taskset1 valgrind $valgrind_xml $valgrind_log $vgflags $BINDIR/$EMU_NAME $sched_arg $emu_xargs "$@"
 
     elif [ $run_rr = yes ]; then
-	exec rr record --ignore-nested $BINDIR/$EMU_NAME $emu_xargs "$@"
+        if [ $1 = replay ]; then
+            shift
+            cmdfile="/tmp/.cerlgdb.$$"
+            echo "set \$etp_beam_executable = \"$BINDIR/$EMU_NAME\"" > $cmdfile
+            if [ "$1" = "-p" ]; then
+                echo 'set $etp_rr_run_until_beam = 1' >> $cmdfile
+            fi
+            cat $ROOTDIR/erts/etc/unix/etp-commands >> $cmdfile
+            exec rr replay -x $cmdfile $*
+        elif [ $1 = ps ]; then
+            shift
+            rr ps $* | head -1
+            ChildSetup=`rr ps $* | grep 'erl_child_setup' | awk '{ print $2 }'`
+            for CS in $ChildSetup; do
+                rr ps $* | grep -E "^$CS"
+            done
+            exit 0
+        else
+	    exec rr record --ignore-nested $BINDIR/$EMU_NAME $emu_xargs "$@"
+        fi
     else
 	exec $EXEC $xargs ${1+"$@"}
     fi
diff --git a/erts/etc/unix/etp-commands.in b/erts/etc/unix/etp-commands.in
index b12a205ba7..20809d61e8 100644
--- a/erts/etc/unix/etp-commands.in
+++ b/erts/etc/unix/etp-commands.in
@@ -37,7 +37,7 @@ document etp-help
 % - GDB command toolbox for analyzing core dumps from the
 % Erlang emulator (BEAM).
 % 
-% Should work for 32-bit erts-5.2/R9B, ...
+% Should work for 32-bit and 64-bit unix gdb
 % 
 % The commands are prefixed with:
 %   etp:  Acronym for erts-term-print
@@ -55,7 +55,8 @@ document etp-help
 % Special commands for not really terms:
 %   etp-mfa, etp-cp, etp-disasm,
 %   etp-msgq, etpf-msgq, 
-%   etp-stacktrace, etp-stackdump, etpf-stackdump, etp-dictdump
+%   etp-stacktrace, etp-stacktrace-emu, etp-stackdump, etp-stackdump-emu,
+%   etpf-stackdump, etp-dictdump
 %   etp-process-info, etp-process-memory-info
 %   etp-port-info, etp-port-state, etp-port-sched-flags
 %   etp-heapdump, etp-offheapdump, etpf-offheapdump,
@@ -132,14 +133,14 @@ define etp-1
   if (($arg0) & 0x3) == 1
     # Cons pointer
     if $etp_flat
-      printf "<etpf-cons %#x>", ($arg0)
+      printf "<etpf-cons %p>", (($arg0)-1)
     else
       etp-list-1 ($arg0) ($arg1)
     end
   else
     if (($arg0) & 0x3) == 2
       if $etp_flat
-        printf "<etpf-boxed %#x>", ($arg0)
+        printf "<etpf-boxed %p>", (($arg0)-2)
       else
         etp-boxed-1 ($arg0) ($arg1)
       end
@@ -149,7 +150,7 @@ define etp-1
       else
         # (($arg0) & 0x3) == 0
         if (($arg0) == etp_the_non_value)
-          printf "<the non-value>"
+          printf "<the-non-value>"
         else
           etp-cp-1 ($arg0)
         end
@@ -187,7 +188,7 @@ define etp-list-1
 # Reentrant
 #
   if (($arg0) & 0x3) != 0x1
-    printf "#NotCons<%#x>", ($arg0)
+    printf "#NotCons<%p>", ($arg0)
   else
     # Cons pointer
     if $etp_chart
@@ -210,7 +211,7 @@ define etp-list-printable-1
 # Returns: $etp_list_printable
 #
   if (($arg0) & 0x3) != 0x1
-    printf "#NotCons<%#x>", ($arg0)
+    printf "#NotCons<%p>", ($arg0)
   else
     # Loop to check if it is a printable string
     set $etp_list_p = ($arg0)
@@ -272,7 +273,7 @@ define etp-list-2
 # Reentrant
 #
   if (($arg0) & 0x3) != 0x1
-    printf "#NotCons<%#x>", ($arg0)
+    printf "#NotCons<%p>", ($arg0)
   else
     # Cons pointer
     if ($arg1) >= $etp_max_depth
@@ -307,7 +308,7 @@ define etpf-cons
 # Reentrant capable
 #
   if ((Eterm)($arg0) & 0x3) != 0x1
-    printf "#NotCons<%#x>", ($arg0)
+    printf "#NotCons<%p>", ($arg0)
   else
     # Cons pointer
     set $etp_flat = 1
@@ -336,13 +337,13 @@ define etp-boxed-1
 # Reentrant
 #
   if (($arg0) & 0x3) != 0x2
-    printf "#NotBoxed<%#x>", ($arg0)
+    printf "#NotBoxed<%p>", ($arg0)
   else
     if (((Eterm*)(($arg0) & ~0x3))[0] & 0x3) != 0x0
       if $etp_chart
         etp-chart-entry-1 (($arg0)&~0x3) ($arg1) 1
       end
-      printf "#BoxedError<%#x>", ($arg0)
+      printf "#BoxedError<%p>", ($arg0)
     else
       if $etp_chart
         etp-chart-entry-1 (($arg0)&~0x3) ($arg1) \
@@ -390,10 +391,10 @@ define etp-boxed-immediate-1
 # Non-reentrant
 #
   if (($arg0) & 0x3) != 0x2
-    printf "#NotBoxed<%#x>", ($arg0)
+    printf "#NotBoxed<%p>", ($arg0)
   else
     if (((Eterm*)(($arg0) & ~0x3))[0] & 0x3) != 0x0
-      printf "#BoxedError<%#x>", ($arg0)
+      printf "#BoxedError<%p>", ($arg0)
     else
       set $etp_boxed_immediate_p = (Eterm*)(($arg0) & ~0x3)
       set $etp_boxed_immediate_h = ($etp_boxed_immediate_p[0] >> 2) & 0xF
@@ -438,12 +439,12 @@ define etp-boxed-immediate-1
                   while $etp_boxed_immediate_arity > 0
                     set $etp_boxed_immediate_p++
                     if $etp_boxed_immediate_arity > 1
-                      printf "%#x,", *$etp_boxed_immediate_p
+                      printf "%p,", *$etp_boxed_immediate_p
                     else
-                      printf "%#x", *$etp_boxed_immediate_p
+                      printf "%p", *$etp_boxed_immediate_p
         	      if ($etp_boxed_immediate_h == 0xA)
                         set $etp_boxed_immediate_p++
-		    	printf ":%#x", *$etp_boxed_immediate_p
+			printf ":%p", *$etp_boxed_immediate_p
 		      end
 		      printf ">"
                     end
@@ -558,7 +559,7 @@ define etp-immediate-1
 # Reentrant capable
 #
   if (($arg0) & 0x3) != 0x3
-    printf "#NotImmediate<%#x>", ($arg0)
+    printf "#NotImmediate<%p>", ($arg0)
   else
     if (($arg0) & 0xF) == 0x3 
       etp-pid-1 ($arg0)
@@ -580,7 +581,7 @@ define etp-immediate-1
               if (($arg0) == $etp_nil)
                 printf "[]"
               else
-                printf "#UnknownImmediate<%#x>", ($arg0)
+                printf "#UnknownImmediate<%p>", ($arg0)
               end
             end
           end
@@ -598,7 +599,7 @@ define etp-atom-1
 # Non-reentrant
 #
   if ((Eterm)($arg0) & 0x3f) != 0xb
-    printf "#NotAtom<%#x>", ($arg0)
+    printf "#NotAtom<%p>", ($arg0)
   else
     set $etp_atom_1_ap = (Atom*)erts_atom_table.seg_table[(Eterm)($arg0)>>16][((Eterm)($arg0)>>6)&0x3FF]
     set $etp_atom_1_i = ($etp_atom_1_ap)->len
@@ -652,7 +653,7 @@ define etp-char-1
 # Non-reentrant
 #
   if (($arg0) < 0) || (0377 < ($arg0))
-    printf "#NotChar<%#x>", ($arg0)
+    printf "#NotChar<%p>", ($arg0)
   else
     if ($arg0) == ($arg1)
       printf "\\%c", ($arg0)
@@ -787,7 +788,7 @@ define etp-pid-1
     # Internal pid
     printf "<0.%u.%u>", $etp_pid_data & 0x7fff, ($etp_pid_data >> 15) & 0x1fff
   else
-    printf "#NotPid<%#x>", ($arg0)
+    printf "#NotPid<%p>", ($arg0)
   end
 end
 
@@ -797,11 +798,11 @@ define etp-extpid-1
 # Non-reentrant
 #
   if ((Eterm)($arg0) & 0x3) != 0x2
-    printf "#NotBoxed<%#x>", (Eterm)($arg0)
+    printf "#NotBoxed<%p>", (Eterm)($arg0)
   else
     set $etp_extpid_1_p = (ExternalThing*)((Eterm)($arg0) & ~0x3)
     if ($etp_extpid_1_p->header & 0x3f) != 0x30
-      printf "#NotExternalPid<%#x>", $etp_extpid_1_p->header
+      printf "#NotExternalPid<%p>", $etp_extpid_1_p->header
     else
       ## External pid
       set $etp_extpid_1_number = $etp_extpid_1_p->data.ui[0]&0x7fff
@@ -812,7 +813,7 @@ define etp-extpid-1
       set $etp_extpid_1_node = $etp_extpid_1_np->sysname
       if ($etp_extpid_1_node & 0x3f) != 0xb
         # Should be an atom
-        printf "#ExternalPidError<%#x>", ($arg0)
+        printf "#ExternalPidError<%p>", ($arg0)
       else
         if $etp_extpid_1_dep == erts_this_dist_entry
           printf "<0:"
@@ -847,7 +848,7 @@ define etp-port-1
     # Internal port
     printf "#Port<0.%u>", $etp_port_data
   else
-    printf "#NotPort<%#x>", ($arg0)
+    printf "#NotPort<%p>", ($arg0)
   end
 end
 
@@ -857,11 +858,11 @@ define etp-extport-1
 # Non-reentrant
 #
   if ((Eterm)($arg0) & 0x3) != 0x2
-    printf "#NotBoxed<%#x>", (Eterm)($arg0)
+    printf "#NotBoxed<%p>", (Eterm)($arg0)
   else
     set $etp_extport_1_p = (ExternalThing*)((Eterm)($arg0) & ~0x3)
     if ($etp_extport_1_p->header & 0x3F) != 0x34
-      printf "#NotExternalPort<%#x>", $etp_extport_1->header
+      printf "#NotExternalPort<%p>", $etp_extport_1->header
     else
       ## External port
       set $etp_extport_1_number = $etp_extport_1_p->data.ui[0]&0x3ffff
@@ -871,7 +872,7 @@ define etp-extport-1
       set $etp_extport_1_node = $etp_extport_1_np->sysname
       if ($etp_extport_1_node & 0x3f) != 0xb
         # Should be an atom
-        printf "#ExternalPortError<%#x>", ($arg0)
+        printf "#ExternalPortError<%p>", ($arg0)
       else
         if $etp_extport_1_dep == erts_this_dist_entry
           printf "#Port<0:"
@@ -893,15 +894,15 @@ define etp-bignum-1
 # Non-reentrant
 #
   if ((Eterm)($arg0) & 0x3) != 0x2
-    printf "#NotBoxed<%#x>", (Eterm)($arg0)
+    printf "#NotBoxed<%p>", (Eterm)($arg0)
   else
     set $etp_bignum_1_p = (Eterm*)((Eterm)($arg0) & ~0x3)
     if ($etp_bignum_1_p[0] & 0x3b) != 0x08
-      printf "#NotBignum<%#x>", $etp_bignum_1_p[0]
+      printf "#NotBignum<%p>", $etp_bignum_1_p[0]
     else
       set $etp_bignum_1_i = ($etp_bignum_1_p[0] >> 6)
       if $etp_bignum_1_i < 1
-        printf "#BignumError<%#x>", (Eterm)($arg0)
+        printf "#BignumError<%p>", (Eterm)($arg0)
       else
         if $etp_bignum_1_p[0] & 0x04
           printf "-"
@@ -932,11 +933,11 @@ define etp-float-1
 # Non-reentrant
 #
   if ((Eterm)($arg0) & 0x3) != 0x2
-    printf "#NotBoxed<%#x>", (Eterm)($arg0)
+    printf "#NotBoxed<%p>", (Eterm)($arg0)
   else
     set $etp_float_1_p = (Eterm*)((Eterm)($arg0) & ~0x3)
     if ($etp_float_1_p[0] & 0x3f) != 0x18
-      printf "#NotFloat<%#x>", $etp_float_1_p[0]
+      printf "#NotFloat<%p>", $etp_float_1_p[0]
     else
       printf "%f", *(double*)($etp_float_1_p+1)
     end
@@ -951,14 +952,14 @@ define etp-ref-1
 # Non-reentrant
 #
   if ((Eterm)($arg0) & 0x3) != 0x2
-    printf "#NotBoxed<%#x>", (Eterm)($arg0)
+    printf "#NotBoxed<%p>", (Eterm)($arg0)
   else
     set $etp_ref_1_p = (ErtsORefThing *)((Eterm)($arg0) & ~0x3)
     if ($etp_ref_1_p->header & 0x3b) != 0x10
-      printf "#NotRef<%#x>", $etp_ref_1_p->header
+      printf "#NotRef<%p>", $etp_ref_1_p->header
     else
       if $etp_ref_1_p->header != etp_ref_header && $etp_ref_1_p->header != etp_magic_ref_header
-        printf "#InternalRefError<%#x>", ($arg0)
+        printf "#InternalRefError<%p>", ($arg0)
       else
 	set $etp_magic_ref = 0
 	set $etp_ref_1_i = 3
@@ -998,11 +999,11 @@ define etp-extref-1
 # Non-reentrant
 #
   if ((Eterm)($arg0) & 0x3) != 0x2
-    printf "#NotBoxed<%#x>", (Eterm)($arg0)
+    printf "#NotBoxed<%p>", (Eterm)($arg0)
   else
     set $etp_extref_1_p = (ExternalThing*)((Eterm)($arg0) & ~0x3)
     if ($etp_extref_1_p->header & 0x3F) != 0x38
-      printf "#NotExternalRef<%#x>", $etp_extref_1->header
+      printf "#NotExternalRef<%p>", $etp_extref_1->header
     else
       ## External ref
       set $etp_extref_1_nump = (Uint32 *) 0
@@ -1041,7 +1042,7 @@ define etp-extref-1
         end
       end
       if $etp_extref_1_error
-        printf "#ExternalRefError<%#x>", ($arg0)
+        printf "#ExternalRefError<%p>", ($arg0)
       else
         set $etp_extref_1_i--
         while $etp_extref_1_i >= 0
@@ -1166,7 +1167,7 @@ define etp-cp-1
         if *(Eterm*)($etp_cp) == beam_return_to_trace[0]
 	  printf "#Cp<return to trace>"
 	else
-          printf "#Cp<%#x>", $etp_cp
+          printf "#Cp<%p>", $etp_cp
 	end
       end
     end
@@ -1241,7 +1242,7 @@ define etp-sig-int
     if $etp_sig_tag != etp_the_non_value
       etp-1 $etp_sig_tag 0
     else
-      print "!ENCODED-DIST-MSG"
+      printf "!ENCODED-DIST-MSG"
     end
     if ($arg0)->m[1] != $etp_nil
       printf " @token= "
@@ -1251,7 +1252,7 @@ define etp-sig-int
     etp-1 ($arg0)->m[2] 0
   else
     if ($etp_sig_tag & 0x3f) != 0x30
-      print "!INVALID-SIGNAL"
+      printf "!INVALID-SIGNAL"
     else
       set $etp_sig_op = (($etp_sig_tag >> 6) & 0xff)
       set $etp_sig_type = (($etp_sig_tag >> 14) & 0xff)
@@ -1452,28 +1453,74 @@ end
 define etp-stack-preamble
   set $etp_stack_p = ($arg0)->stop
   set $etp_stack_end = ($arg0)->hend
+  if ($arg0)->state.counter & 0x8000
+    printf "%%%%%% WARNING: The process is currently running, so c_p->stop will not be correct\r\n"
+    printf "%%%%%%          Consider using %s-emu instead\r\n", $arg1
+  end
   printf "%% Stacktrace (%u)\n", $etp_stack_end-$etp_stack_p
-  etp-1 ((Eterm)($arg0)->i) 0
-  printf "  (I)\n"
+  if ($arg0)->i != 0
+    printf "I: "
+    etp ((Eterm)($arg0)->i)
+  end
   if ($arg0)->cp != 0
-    etp-1 ((Eterm)($arg0)->cp) 0
-    printf "  (cp)\n"
+    printf "cp:"
+    etp ((Eterm)($arg0)->cp)
+  end
+end
+
+define etp-stack-preamble-emu
+  set $etp_stack_p = E
+  set $etp_stack_end = ($arg0)->hend
+  printf "%% Stacktrace (%u)\n", $etp_stack_end-$etp_stack_p
+  printf "I: "
+  etp ((BeamInstr)I)
+  if ($arg0)->cp != 0
+    printf "cp: "
+    etp ((Eterm)($arg0)->cp)
+  end
+end
+
+define etp-stacktrace-1
+  set $etp_stack_stop = (Eterm*)($arg0)
+  set $etp_stack_send = (Eterm*)($arg1)
+  set $etp_stack_cnt = 0
+  while $etp_stack_stop < $etp_stack_send
+    if ($etp_stack_stop[0] & 0x3) == 0x0
+      # Continuation pointer
+      printf "%d: ", $etp_stack_cnt
+      etp $etp_stack_stop[0]
+    end
+    set $etp_stack_stop++
+    set $etp_stack_cnt++
   end
 end
 
+define etp-stacktrace-emu
+# Args: Process*
+#
+# Non-reentrant
+#
+  etp-stack-preamble-emu ($arg0)
+  etp-stacktrace-1 $etp_stack_p $etp_stack_end
+end
+
+document etp-stacktrace-emu
+%---------------------------------------------------------------------------
+% etp-stacktrace-emu Process*
+% 
+% Take an Process* and print a stactrace for the process.
+% This macro assumes that the current frame is the process_main frame
+% and that E is not optimized out.
+%---------------------------------------------------------------------------
+end
+
 define etp-stacktrace
 # Args: Process*
 #
 # Non-reentrant
 #
-  etp-stack-preamble ($arg0)
-  while $etp_stack_p < $etp_stack_end
-    if ($etp_stack_p[0] & 0x3) == 0x0
-      # Continuation pointer
-      etp $etp_stack_p[0]
-    end
-    set $etp_stack_p++
-  end
+  etp-stack-preamble ($arg0) "etp-stacktrace"
+  etp-stacktrace-1 $etp_stack_p $etp_stack_end
 end
 
 document etp-stacktrace
@@ -1486,16 +1533,48 @@ document etp-stacktrace
 %---------------------------------------------------------------------------
 end
 
+define etp-stackdump-1
+  # Args: Eterm *stop, Eterm *hend
+  #
+  # Non-reentrant
+  #
+  set $etp_stackdump_stop = (Eterm*)($arg0)
+  set $etp_stackdump_send = (Eterm*)($arg1)
+  set $etp_stackdump_cnt = 0
+  while $etp_stackdump_stop < $etp_stackdump_send
+    printf "%d: ", $etp_stackdump_cnt
+    etp $etp_stackdump_stop[0]
+    set $etp_stackdump_stop++
+    set $etp_stackdump_cnt++
+  end
+end
+
+define etp-stackdump-emu
+# Args: Process*
+#
+# Non-reentrant
+#
+  etp-stack-preamble-emu ($arg0)
+  etp-stackdump-1 $etp_stack_p $etp_stack_end
+end
+
+document etp-stacktrace-emu
+%---------------------------------------------------------------------------
+% etp-stacktrace-emu Process*
+% 
+% Take an Process* and print a stactdump for the process.
+% This macro assumes that the current frame is the process_main frame
+% and that E is not optimized out.
+%---------------------------------------------------------------------------
+end
+
 define etp-stackdump
 # Args: Process*
 #
 # Non-reentrant
 #
-  etp-stack-preamble ($arg0)
-  while $etp_stack_p < $etp_stack_end
-    etp $etp_stack_p[0]
-    set $etp_stack_p++
-  end
+  etp-stack-preamble ($arg0) "etp-stackdump"
+  etp-stackdump-1 $etp_stack_p $etp_stack_end
 end
 
 document etp-stackdump
@@ -1741,7 +1820,7 @@ define etp-term-dump-pid
     # Internal pid
     printf "| <0.%04u.%03u> ", $etp_pid_data & 0x7fff, ($etp_pid_data >> 15) & 0x1fff
   else
-    printf "| #NotPid<%#x> ", ($arg0)
+    printf "| #NotPid<%p> ", ($arg0)
   end
 end
 
@@ -1789,7 +1868,7 @@ define etp-pix2proc
 # Args: Eterm
 #
    set $proc = (Process *) *((UWord *) &erts_proc.r.o.tab[((int) $arg0)])
-   printf "(Process *) %p\n", $proc
+   printf "(Process*)%p\n", $proc
 end
 
 define etp-pid2proc-1
@@ -1803,7 +1882,7 @@ define etp-pid2proc
 # Args: Eterm
 #
    etp-pid2proc-1 $arg0
-   printf "(Process *) %p\n", $proc
+   printf "(Process*)%p\n", $proc
 end
 
 define etp-proc-state-int
@@ -2083,12 +2162,12 @@ define etp-process-info-int
   printf "\n  Flags: "
   etp-proc-flags $etp_proc
   if $proxy_process != 0
-    printf "  Pointer: (Process *) %p\n", $etp_proc
+    printf "  Pointer: (Process*)%p\n", $etp_proc
     printf "  *** PROXY process struct *** refer to: \n"
     etp-pid2proc-1 $etp_proc->common.id
     etp-process-info $proc
   else
-  if (*(((Uint32 *) &($etp_proc->state))) & 0x4) == 0
+  if (*(((Uint32 *) &($etp_proc->state))) & 0x800) == 0
     if ($etp_proc->common.u.alive.reg)
       printf "  Registered name: "
       etp-1 $etp_proc->common.u.alive.reg->name
@@ -2096,7 +2175,7 @@ define etp-process-info-int
     end
   end
   printf "  Current function: "
-  if ($etp_proc->current)
+  if ($etp_proc->current && !($etp_proc->state.counter & 0x800))
     etp-1 $etp_proc->current->module
     printf ":"
     etp-1 $etp_proc->current->function
@@ -2133,7 +2212,7 @@ define etp-process-info-int
   end
   printf "  Parent: "
   etp-1 ((Eterm)($etp_proc->parent))
-  printf "\n  Pointer: (Process *) %p\n", $etp_proc
+  printf "\n  Pointer: (Process*)%p\n", $etp_proc
   end
   if ($arg1)
     etp-sigqs $etp_proc
@@ -2156,6 +2235,43 @@ document etp-process-info
 %---------------------------------------------------------------------------
 end
 
+define etp-processes-free-runq-int
+  set $runq_prio = 0
+  while $runq_prio < 3
+    set $runq_proc = ($arg0)->procs.prio[$runq_prio].first
+    while $runq_proc != 0
+      if $runq_proc->state.counter & 0x400
+        printf "---\n"
+        printf "  Pix: FREE -> run_queue %p\n", ($arg0)
+        etp-process-info-int $runq_proc ($arg1)
+      end
+      set $runq_proc = $runq_proc->next
+    end
+    set $runq_prio++
+  end
+end
+
+define etp-processes-free-de-int
+  set $de_ix = 0
+  set $de = ($arg0)
+  while $de
+    set $susp = $de->suspended
+    set $susp_curr = $susp
+    set $first_loop = 1
+    while $susp_curr != 0 && (($susp_curr != $susp) || $first_loop)
+      if ($susp_curr->u.pid & 0x3) == 0
+        printf "---\n"
+        printf "  Pix: FREE "
+        etp $de->sysname
+        etp-process-info-int $susp_curr->u.pid ($arg2)
+      end
+      set $first_loop = 0
+      set $susp_curr = $susp_curr->next
+    end
+    set $de = $de->next
+  end
+end
+
 define etp-processes-int
   if (!erts_initialized)
     printf "No processes, since system isn't initialized!\n"
@@ -2176,11 +2292,36 @@ define etp-processes-int
         set $proc_cnt--
       end
       if $proc_ix == $proc_printile
-        printf "--- %d%% (%d / %d) searched\n", $proc_printile / $proc_decentile * 10, $proc_ix, $proc_max_ix
+        printf "--- %d%% (%d / %d) searched, looking for %d more\n", $proc_printile / $proc_decentile * 10, $proc_ix, $proc_max_ix, $proc_cnt
         set $proc_printile += $proc_decentile
       end
       set $proc_ix++
     end
+
+    ## We should also check for any FREE processes that are running
+    ## They can be found in esdp->current_process, dep->suspendees and
+    ## runq. Running FREE processes are processes that either are yielding
+    ## when exiting or running on a dirty scheduler while having exited.
+    set $sched_ix = 0
+    while $sched_ix < erts_no_schedulers
+      set $sched_data = &erts_aligned_scheduler_data[$sched_ix].esd
+      if $sched_data->current_process != 0
+        if $sched_data->current_process.state.counter & 0x400
+          printf "---\n"
+          printf "  Pix: FREE -> scheduler %d\n", $sched_ix+1
+          etp-process-info-int $sched_data->current_process ($arg0)
+        end
+      end
+      etp-processes-free-runq-int $sched_data->run_queue ($arg0)
+      set $sched_ix++
+    end
+    etp-processes-free-runq-int &erts_aligned_run_queues[erts_no_run_queues].runq ($arg0)
+    etp-processes-free-runq-int &erts_aligned_run_queues[erts_no_run_queues+1].runq ($arg0)
+    etp-processes-free-de-int erts_hidden_dist_entries erts_no_of_hidden_dist_entries ($arg0)
+    etp-processes-free-de-int erts_visible_dist_entries erts_no_of_visible_dist_entries ($arg0)
+    etp-processes-free-de-int erts_pending_dist_entries erts_no_of_pending_dist_entries ($arg0)
+    etp-processes-free-de-int erts_not_connected_dist_entries erts_no_of_not_connected_dist_entries ($arg0)
+    etp-processes-free-de-int erts_this_dist_entry 1 ($arg0)
     printf "---\n",
   end
 end
@@ -2237,9 +2378,9 @@ define etp-process-memory-info
   end
   printf "  "
   etp-1 $etp_pmem_proc->common.id
-  printf ": (Process *) %p ", $etp_pmem_proc
+  printf ": (Process*)%p ", $etp_pmem_proc
   if $proxy_process != 0
-    printf "(Process *) %p ", $etp_pmem_proc
+    printf "(Process*)%p ", $etp_pmem_proc
     printf "  *** PROXY process struct *** refer to next: \n"
     etp-pid2proc-1 $etp_pmem_proc->common.id
     printf " -"
@@ -2313,7 +2454,7 @@ define etp-pix2port
 # Args: Eterm
 #
    set $port = (Port *) *((UWord *) &erts_port.r.o.tab[((int) $arg0)])
-   printf "(Port *) %p\n", $port
+   printf "(Port*)%p\n", $port
 end
 
 define etp-id2port-1
@@ -2327,7 +2468,7 @@ define etp-id2port
 # Args: Eterm
 #
    etp-id2port-1 $arg0
-   printf "(Port *) %p\n", $port
+   printf "(Port*)%p\n", $port
 end
 
 define etp-port-sched-flags-int
@@ -2501,7 +2642,7 @@ define etp-port-info
   printf "  Connected: "
   set $connected = *(((Eterm *) &(((Port *) $etp_pinfo_port)->connected)))
   etp-1 $connected
-  printf "\n  Pointer: (Port *) %p\n", $etp_pinfo_port
+  printf "\n  Pointer: (Port*)%p\n", $etp_pinfo_port
 end
 
 document etp-port-info
@@ -2851,7 +2992,7 @@ define etp-scheduler-info-internal
   printf " Sleep Info Flags:"
   set $ssi_flags = *((Uint32 *) &$sched_data->ssi->flags)
   etp-ssi-flags $ssi_flags
-  printf " Pointer: (ErtsSchedulerData *) %p\n", $sched_data
+  printf " Pointer: (ErtsSchedulerData*)%p\n", $sched_data
 end
 
 define etp-run-queue-info-internal
@@ -2884,7 +3025,7 @@ define etp-run-queue-info-internal
   end
   set $rq_flags = *((Uint32 *) &($runq->flags))
   etp-rq-flags-int $rq_flags
-  printf "  Pointer: (ErtsRunQueue *) %p\n", $runq
+  printf "  Pointer: (ErtsRunQueue*)%p\n", $runq
 end
 
 define etp-fds
@@ -2895,12 +3036,21 @@ define etp-fds
   end
 end
 
+document etp-fds
+%---------------------------------------------------------------------------
+% etp-fds
+% 
+% Print the state of the fds currently in check_io. Only works in running systems.
+%---------------------------------------------------------------------------
+end
+
 define etp-disasm-1
-  set $code_ptr = ((BeamInstr*)$arg0)
-  set $addr = *$code_ptr
+  set $code_ptr = ((BeamInstr*)($arg0))
+  set $addr32 = (BeamInstr)(Uint32)*$code_ptr
+  set $addr64 = (BeamInstr)(Uint64)*$code_ptr
   set $i = 0
-  while $i < (sizeof(opc) / sizeof(OpEntry))
-    if $addr == beam_ops[$i]
+  while $i < num_instructions
+    if $addr32 == beam_ops[$i] || $addr64 == beam_ops[$i]
       printf "%s %d", opc[$i].name, opc[$i].sz
       set $next_i = $code_ptr + opc[$i].sz
       set $i += 4999
@@ -2910,6 +3060,11 @@ define etp-disasm-1
 end
 
 define etp-disasm
+  if $argc == 1
+    set $code_end = $arg0
+  else
+    set $code_end = $arg1
+  end
   etp-cp-func-info-1 $arg0
   if $etp_cp_p == 0
     printf "invalid argument"
@@ -2918,7 +3073,7 @@ define etp-disasm
     printf ": "
     etp-disasm-1 $arg0
     printf "\r\n"
-    while $next_i < ((BeamInstr*)$arg1)
+    while $next_i < ((BeamInstr*)$code_end)
       set $prev_i = $next_i
       etp-cp-func-info-1 $next_i
       etp-mfa-1 $etp_cp_p $cp_cp_p_offset
@@ -2934,6 +3089,16 @@ define etp-disasm
   end
 end
 
+document etp-disasm
+%---------------------------------------------------------------------------
+% etp-fds BeamInstr* (BeamInstr*)
+% 
+% Disassemble the instructions inbetween arg0 and arg1,
+% if no second argument is given only the current
+% instruction is printed.
+%---------------------------------------------------------------------------
+end
+
 ############################################################################
 #
 # Timer Wheel
@@ -2961,7 +3126,7 @@ define etp-timer-wheel
         printf "\n"
         while 1
            printf "- Timeout pos: %ld\n", $tmr->timeout_pos
-	   printf "  Pointer: (ErtsTWheelTimer *) %p\n", $tmr
+	   printf "  Pointer: (ErtsTWheelTimer*)%p\n", $tmr
            set $tmr = $tmr->next
            if ($tmr == $tiw->w[$ix])
              loop_break
@@ -2991,7 +3156,7 @@ define etp-timer-wheel
         printf "\n"
         while 1
            printf "- Timeout pos: %ld\n", $tmr->timeout_pos
-	   printf "  Pointer: (ErtsTWheelTimer *) %p\n", $tmr
+	   printf "  Pointer: (ErtsTWheelTimer*)%p\n", $tmr
            set $tmr = $tmr->next
            if ($tmr == $tiw->w[$ix])
              loop_break
@@ -3260,7 +3425,7 @@ define etp-offheapdump
       set $etp_offheapdump_p = $etp_offheapdump_p->next
       set $etp_offheapdump_i++
     else
-      printf "#TaggedPtr<%#x>", $etp_offheapdump_p
+      printf "#TaggedPtr<%p>", $etp_offheapdump_p
       set $etp_offheapdump_p = 0
     end
   end
@@ -3299,12 +3464,12 @@ define etp-search-heaps
 #
 # Non-reentrant
 #
-  printf "%% Search all (<%u) process heaps for ", erts_max_processes
+  printf "%% Search all (<%u) process heaps for ", erts_proc.r.o.max
   set $etp_flat = 1
   etp-1 ($arg0) 0
   set $etp_flat = 0
   printf ":...\n"
-  etp-search-heaps-1 ((Eterm*)((Eterm)($arg0)&~3))
+  etp-search-heaps-1 ((Eterm*)((Eterm)($arg0)&~(Eterm)3))
 end
 
 define etp-search-heaps-1
@@ -3312,8 +3477,8 @@ define etp-search-heaps-1
 #
 # Non-reentrant
 #
-  set $etp_search_heaps_q = erts_max_processes / 10
-  set $etp_search_heaps_r = erts_max_processes % 10
+  set $etp_search_heaps_q = erts_proc.r.o.max / 10
+  set $etp_search_heaps_r = erts_proc.r.o.max % 10
   set $etp_search_heaps_t = 10
   set $etp_search_heaps_m = $etp_search_heaps_q
   if $etp_search_heaps_r > 0
@@ -3323,7 +3488,7 @@ define etp-search-heaps-1
   set $etp_search_heaps_i = 0
   set $etp_search_heaps_found = 0
   while $etp_search_heaps_i < erts_proc.r.o.max
-    set $proc = (Process *) *((UWord *) &erts_proc.r.o.tab[$proc_ix])
+    set $proc = (Process *) *((UWord *) &erts_proc.r.o.tab[$etp_search_heaps_i])
     if $proc
       if ($proc->heap <= ($arg0)) && \
          (($arg0) < $proc->hend)
@@ -3340,7 +3505,7 @@ define etp-search-heaps-1
       while $etp_search_heaps_p && ($etp_search_heaps_cnt < $etp_max_depth)
         set $etp_search_heaps_cnt++
         if (&($etp_search_heaps_p->mem) <= ($arg0)) && \
-           (($arg0) < &($etp_search_heaps_p->mem)+$etp_search_heaps_p->size)
+           (($arg0) < &($etp_search_heaps_p->mem)+$etp_search_heaps_p->used_size)
           printf "process_tab[%d]->mbuf(%d)+%d\n", \
                  $etp_search_heaps_i, $etp_search_heaps_cnt, \
                  ($arg0)-&($etp_search_heaps_p->mem)
@@ -3636,8 +3801,8 @@ define etp-overlapped-heaps
 # Non-reentrant
 #
   printf "%% Dumping heap addresses to \"etp-commands.bin\"\n"
-  set $etp_overlapped_heaps_q = erts_max_processes / 10
-  set $etp_overlapped_heaps_r = erts_max_processes % 10
+  set $etp_overlapped_heaps_q = erts_proc.r.o.max / 10
+  set $etp_overlapped_heaps_r = erts_proc.r.o.max % 10
   set $etp_overlapped_heaps_t = 10
   set $etp_overlapped_heaps_m = $etp_overlapped_heaps_q
   if $etp_overlapped_heaps_r > 0
@@ -3663,7 +3828,7 @@ define etp-overlapped-heaps
   append binary value etp-commands.bin 'p'
   append binary value etp-commands.bin 's'
   append binary value etp-commands.bin '\0'
-  while $etp_overlapped_heaps_i < erts_max_processes
+  while $etp_overlapped_heaps_i < erts_proc.r.o.max
     if process_tab[$etp_overlapped_heaps_i]
       append binary value etp-commands.bin \
         (Eterm)$etp_overlapped_heaps_i
@@ -3804,7 +3969,7 @@ define etp-chart-entry-1
   append binary value etp-commands.bin (Eterm)(($arg2)*sizeof(Eterm))
   append binary value etp-commands.bin (Eterm)$etp_chart_id
   append binary value etp-commands.bin (Eterm)($arg1)
-#   printf "<dumped %#x %lu %lu %lu>", ($arg0)&~0x3, \
+#   printf "<dumped %p %lu %lu %lu>", ($arg0)&~0x3, \
 #     (Eterm)(($arg2)*sizeof(Eterm)), (Eterm)$etp_chart_id, (Eterm)($arg1)
 end
 
@@ -3828,22 +3993,79 @@ end
 # ETS table debug
 #
 
+define etp-ets-tab-status-int
+# Args:
+#
+# Non-reentrant
+  if ($arg0 & 0x1)
+    printf "priv"
+  end
+  if ($arg0 & 0x2)
+    printf "prot"
+  end
+  if ($arg0 & 0x4)
+    printf "pub"
+  end
+  if ($arg0 & 0x8)
+    printf "|del"
+  end
+  if ($arg0 & 0x10)
+    printf "|set"
+  end
+  if ($arg0 & 0x20)
+    printf "|bag"
+  end
+  if ($arg0 & 0x40)
+    printf "|dbag"
+  end
+  if ($arg0 & 0x80)
+    printf "|oset"
+  end
+  if ($arg0 & 0x100)
+    printf "|caoset"
+  end
+  if ($arg0 & 0x200)
+    printf "|flocked"
+  end
+  if ($arg0 & 0x400)
+    printf "|fread"
+  end
+  if ($arg0 & 0x800)
+    printf "|named"
+  end
+  if ($arg0 & 0x1000)
+    printf "|busy"
+  end
+end
+
 define etp-ets-tables
 # Args:
 #
 # Non-reentrant
-  printf "%% Dumping < %lu ETS tables\n", (unsigned long)db_max_tabs
-  while $etp_ets_tables_i < db_max_tabs
-    if (meta_main_tab[$etp_ets_tables_i].u.next_free & 3) == 0
-      printf "%% %d:", $etp_ets_tables_i
-      etp-1 ((Eterm)(meta_main_tab[$etp_ets_tables_i].u.tb->common.id)) 0
+  set $sched_ix = 0
+  while $sched_ix < erts_no_schedulers
+    set $ets_tabs = &erts_aligned_scheduler_data[$sched_ix].esd.ets_tables
+    set $no_ets_tabs = *(unsigned long *)&($ets_tabs->count)
+    printf "\n%% %lu ETS tables created on scheduler %lu...\n\n", $no_ets_tabs, (unsigned long)$sched_ix+1
+    set $ets_tab = $ets_tabs->clist
+    set $first_ets_tab = $ets_tab
+    while $ets_tab
+      set $refn = &((ErtsMagicBinary *)$ets_tab->common->btid)->refn
+      printf "%% "
+      etp-1 $ets_tab->common.the_name 0
+      printf " #Ref<0.%u.%u.%u> ", (unsigned)$refn[2], (unsigned)$refn[1], (unsigned)$refn[0]
+      etp-1 $ets_tab->common.owner 0
       printf " "
-      etp-1 ((Eterm)(meta_main_tab[$etp_ets_tables_i].u.tb->common.owner)) 0
-      printf "\n"
+      etp-ets-tab-status-int $ets_tab->common.status
+      printf " (DbTable*)%p\n", $ets_tab
+      if $ets_tab->common.all.next == $first_ets_tab
+	set $ets_tab = (DbTable *) 0
+      else
+	set $ets_tab = $ets_tab->common.all.next
+      end
     end
-    set $etp_ets_tables_i++
+    set $sched_ix++
   end
-  set $etp_ets_tables_i = 0
 end
 
 document etp-ets-tables
@@ -4060,14 +4282,6 @@ define etp-block-size-1
       set $etp_blk_sz = ($arg0)->bhdr & ~7
   else
       # Allocated block
-      if !$etp_MBC_ABLK_SZ_MASK
-        if etp_arch_bits == 64
-          set $etp_MBC_ABLK_OFFSET_SHIFT = (64 - 24)
-        else
-          set $etp_MBC_ABLK_OFFSET_SHIFT = (32 - 9)
-        end
-        set $etp_MBC_ABLK_SZ_MASK = ((UWord)1 << $etp_MBC_ABLK_OFFSET_SHIFT) - 1 - 7
-      end
       set $etp_blk_sz = ($arg0)->bhdr & $etp_MBC_ABLK_SZ_MASK
   end
 end
@@ -4082,14 +4296,7 @@ define etp-block2mbc-1
       set $etp_mbc = ($arg0)->u.carrier
   else
       # Allocated block
-      if !$etp_MBC_ABLK_OFFSET_SHIFT
-        if etp_arch_bits == 64
-          set $etp_MBC_ABLK_OFFSET_SHIFT = (64 - 24)
-        else
-          set $etp_MBC_ABLK_OFFSET_SHIFT = (32 - 9)
-        end
-      end
-      set $etp_mbc = (Carrier_t*) ((((UWord)($arg0) >> 18) - (($arg0)->bhdr >> $etp_MBC_ABLK_OFFSET_SHIFT)) << 18)
+      set $etp_mbc = (Carrier_t*) ((((UWord)($arg0) >> 18) - ((($arg0)->bhdr & $etp_MBC_ABLK_OFFSET_MASK) >> $etp_MBC_ABLK_OFFSET_SHIFT)) << 18)
   end
 end
 
@@ -4133,7 +4340,7 @@ document etp-smp-atomic
 %---------------------------------------------------------------------------
 end
 
-define etp-carrier-blocks
+define etp-carrier-blocks-1
   set $etp_crr = (Carrier_t*) $arg0
   etp-smp-atomic $etp_crr->allctr $etp_alc
   set $etp_alc = (Allctr_t*)($etp_alc & ~7)
@@ -4145,12 +4352,6 @@ define etp-carrier-blocks
   set $etp_fblk_cnt = 0
   set $etp_aborted = 0
 
-  if $argc == 2
-    set $etp_be_silent = $arg1
-  else
-    set $etp_be_silent = 0
-  end
-
   while 1
     if !$etp_be_silent
       etp-block $etp_blk
@@ -4173,6 +4374,12 @@ define etp-carrier-blocks
           printf "ERROR: Missing PREV_FREE_BLK_HDR_FLG (2) in block at %#lx\n", $etp_blk
 	  set $etp_error_cnt = $etp_error_cnt + 1
         end
+      else
+	# Prev is ALLOCATED
+        if ($etp_blk->bhdr & 2)
+          printf "ERROR: Invalid PREV_FREE_BLK_HDR_FLG (2) set in block at %#lx\n", $etp_blk
+	  set $etp_error_cnt = $etp_error_cnt + 1
+        end
       end
     end
     if $etp_blk->bhdr & 1
@@ -4210,13 +4417,31 @@ define etp-carrier-blocks
   end
 end
 
-document etp-carrier-blocks
+define etp-carrier-print
+  set $etp_be_silent = 0
+  etp-carrier-blocks-1 $arg0
+end
+
+document etp-carrier-print
 %---------------------------------------------------------------------------
-% Check and (maybe) print all memory blocks in carrier
-% Args: (Carrier_t*) [1=be_silent]
+% Print all memory blocks in carrier
+% Args: (Carrier_t*)
 %---------------------------------------------------------------------------
 end
 
+define etp-carrier-check
+  set $etp_be_silent = 1
+  etp-carrier-blocks-1 $arg0
+end
+
+document etp-carrier-check
+%---------------------------------------------------------------------------
+% Check all memory blocks in carrier
+% Args: (Carrier_t*)
+%---------------------------------------------------------------------------
+end
+
+
 define etp-address-to-beam-opcode
   set $etp_i = 0
   set $etp_min_diff = ((UWord)1 << (sizeof(UWord)*8 - 1))
@@ -4326,6 +4551,20 @@ document etp-show
 %---------------------------------------------------------------------------
 end
 
+define etp-rr-run-until-beam
+  source @ERL_TOP@/erts/etc/unix/etp-rr-run-until-beam.py
+end
+
+document etp-rr-run-until-beam
+%---------------------------------------------------------------------------
+% etp-rr-run-until-beam
+%
+% Use this gdb macro to make cerl -rr replay -p PID walk until
+% the correct execute has been made. You may have to change the
+% file that is used to debug with.
+%---------------------------------------------------------------------------
+end
+
 ############################################################################
 # Init
 #
@@ -4334,9 +4573,14 @@ define etp-init
   set $etp_arch64 = (sizeof(void *) == 8)
   if $etp_arch64
     set $etp_nil = 0xfffffffffffffffb
+    set $etp_MBC_ABLK_OFFSET_BITS = 23
   else
     set $etp_nil = 0xfffffffb
+    set $etp_MBC_ABLK_OFFSET_BITS = 8
   end
+  set $etp_MBC_ABLK_OFFSET_SHIFT = (sizeof(UWord)*8 - 1 - $etp_MBC_ABLK_OFFSET_BITS)
+  set $etp_MBC_ABLK_OFFSET_MASK = ((((UWord)1 << $etp_MBC_ABLK_OFFSET_BITS) - 1) << $etp_MBC_ABLK_OFFSET_SHIFT)
+  set $etp_MBC_ABLK_SZ_MASK = ((UWord)1 << $etp_MBC_ABLK_OFFSET_SHIFT) - 1 - 7
   set $etp_flat = 0
   set $etp_chart_id = 0
   set $etp_chart = 0
@@ -4363,7 +4607,13 @@ define hook-run
   set $_exitsignal = -1
 end
 
+handle SIGPIPE nostop
+
 etp-init
 help etp-init
-etp-show
-etp-system-info
+if $etp_rr_run_until_beam
+  help etp-rr-run-until-beam
+else
+  etp-show
+  etp-system-info
+end
diff --git a/erts/etc/unix/etp-rr-run-until-beam.py b/erts/etc/unix/etp-rr-run-until-beam.py
new file mode 100644
index 0000000000..078998b910
--- /dev/null
+++ b/erts/etc/unix/etp-rr-run-until-beam.py
@@ -0,0 +1,45 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2013-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%
+#
+
+has_exited = False
+
+def stop_handler (event):
+  global has_exited
+  if isinstance(event, gdb.SignalEvent):
+    print("exit code: %s" % (event.stop_signal))
+    has_exited = True
+
+gdb.events.stop.connect (stop_handler)
+
+gdb.execute('continue')
+
+while not has_exited:
+  r = gdb.execute('when', to_string=True)
+  m = re.match("[^0-9]*([0-9]+)", r)
+  if m:
+    event = int(m.group(1));
+    gdb.execute('start ' + str(event + 1));
+    gdb.execute('continue')
+
+gdb.events.stop.disconnect (stop_handler)
+
+gdb.execute('file ' + str(gdb.parse_and_eval("$etp_beam_executable")))
+gdb.execute('break main')
+gdb.execute('reverse-continue')
diff --git a/erts/etc/unix/gcov-gen-html b/erts/etc/unix/gcov-gen-html
new file mode 100755
index 0000000000..3fd9f1ca49
--- /dev/null
+++ b/erts/etc/unix/gcov-gen-html
@@ -0,0 +1,62 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+@ARGV == 2 or die "Usage: gcov-gen-html \$ERL_TOP <output directory>\n";
+
+my $srcdir = shift @ARGV;
+my $outdir = shift @ARGV;
+
+my $verbose = 1;
+my $flavor = "smp";
+
+# setup filenames and paths, observe geninfos --base-directory
+# it needs a correct path just after the $geninfo
+
+my $lcov_path = ""; #/usr/local/bin/";
+
+my $geninfo      = $lcov_path . "geninfo --no-checksum --base-directory";
+my $genhtml      = $lcov_path . "genhtml";
+
+# src paths
+
+my $emu_src_path  = "$srcdir/erts/emulator";
+my $elib_src_path = "$srcdir/erts/lib_src";
+my $pcre_src_path = "$emu_src_path";
+my $zlib_src_path = "$emu_src_path";
+
+# obj paths
+
+my $emu_obj_path  = <$emu_src_path/obj/*-linux-*/gcov/$flavor>;
+my $elib_obj_path = <$elib_src_path/obj/*-linux-*/gcov>;
+my $pcre_obj_path = <$emu_src_path/pcre/obj/*-linux-*/gcov>;
+my $zlib_obj_path = <$emu_src_path/zlib/obj/*-linux-*/gcov>;
+
+# info files
+
+my $emu_info  = "$srcdir/emulator-cover.info";
+my $elib_info = "$srcdir/elib-cover.info";
+my $pcre_info = "$srcdir/pcre-cover.info";
+
+my $infofiles = "$emu_info $elib_info $pcre_info";
+
+run("$geninfo $emu_src_path  -o $emu_info  $emu_obj_path");
+run("$geninfo $elib_src_path -o $elib_info $elib_obj_path");
+run("$geninfo $pcre_src_path -o $pcre_info $pcre_obj_path");
+
+if (<$zlib_obj_path/*.o>) {
+    my $zlib_info = "$srcdir/zlib-cover.info";
+    $infofiles .= " $zlib_info";
+    run("$geninfo $zlib_src_path -o $zlib_info $zlib_obj_path");
+}
+
+run("$genhtml -o $outdir $infofiles");
+
+
+
+sub run {
+    my $cmd = shift;
+    print STDERR "\nrun($cmd)\n" if $verbose > 0;
+    system("$cmd 2>&1") == 0 or die "\nCan't run \"$cmd\": $?";
+}
diff --git a/erts/etc/unix/to_erl.c b/erts/etc/unix/to_erl.c
index afff8f7e54..1448980f77 100644
--- a/erts/etc/unix/to_erl.c
+++ b/erts/etc/unix/to_erl.c
@@ -245,7 +245,6 @@ int main(int argc, char **argv)
     tty_smode.c_iflag =
 	1*BRKINT |/*Signal interrupt on break.*/
 	    1*IGNPAR |/*Ignore characters with parity errors.*/
-		1*ISTRIP |/*Strip character.*/
 		    0;
     
 #if 0
@@ -416,7 +415,7 @@ int main(int argc, char **argv)
 
 	if (len) {
 #ifdef DEBUG
-	    (void)write(1, buf, len);
+	    write_all(1, buf, len);
 #endif
 	    if (write_all(wfd, buf, len) != len) {
 		fprintf(stderr, "Error in writing to FIFO.\n");
diff --git a/erts/etc/win32/msys_tools/vc/cc.sh b/erts/etc/win32/msys_tools/vc/cc.sh
index 2b0482e876..71af14b9b2 100644
--- a/erts/etc/win32/msys_tools/vc/cc.sh
+++ b/erts/etc/win32/msys_tools/vc/cc.sh
@@ -195,7 +195,6 @@ mkdir $TMPOBJDIR
 
 # Compile
 for x in $SOURCES; do
-    start_time=`date '+%s'` 
     # Compile each source
     if [ $LINKING = false ]; then
 	# We should have an output defined, which is a directory 
@@ -260,16 +259,28 @@ for x in $SOURCES; do
     else
 	tail -n +2 $ERR_FILE >&2
 	if test $DEPENDENCIES = true; then
-	    if test `grep -v $x $MSG_FILE | grep -c '#line'` != "0"; then
-		o=`echo $x | sed 's,.*/,,' | sed 's,\.cp*$,.o,'`
-		echo -n $o':'
-#		cat $MSG_FILE | grep '#line' | grep -v $x | awk -F\" '{printf("%s\n",$2)}' | sort -u | grep -v " " | xargs -n 1 win2msys_path.sh | awk '{printf("\\\n %s ",$0)}' 
-		cat $MSG_FILE | grep '#line' | grep -v $x | awk -F\" '{printf("%s\n",$2)}' | sort -u | grep -v " " | sed 's,^\([A-Za-z]\):[\\/]*,/\1/,;s,\\\\*,/,g'| awk '{printf("\\\n %s ",$0)}' 
-		echo
-		echo 
-		after_sed=`date '+%s'`
-		echo Made dependencies for $x':' `expr $after_sed '-' $start_time` 's' >&2
-	    fi 
+	    perl -e '
+my $file = "'$x'";
+while (<>) {
+      next unless /^#line/;
+      next if /$file/o;
+      (undef,$_) = split(/\"/);
+      next if / /;
+      $all{$_} = 1;
+}
+foreach (sort keys %all) {
+      s@^([A-Za-z]):@/$1@;
+      s@\\\\@/@g;
+      push @f, "\\\n $_ ";
+}
+if (@f) {
+     my $oname = $file;
+     $oname =~ s@.*/@@;
+     $oname =~ s@[.]cp*@.o@;
+     print $oname, ":", @f;
+     print "\n\n";
+     print STDERR "Made dependencies for $file\n";
+}' $MSG_FILE
 	else
 	    cat $MSG_FILE
 	fi
diff --git a/erts/etc/win32/msys_tools/vc/ld.sh b/erts/etc/win32/msys_tools/vc/ld.sh
index 8917251f51..22184faf76 100644
--- a/erts/etc/win32/msys_tools/vc/ld.sh
+++ b/erts/etc/win32/msys_tools/vc/ld.sh
@@ -178,7 +178,10 @@ if [ "$RES" = "0" -a -f "$CMANIFEST" ]; then
     RES=$?
     if [ "$RES" != "0" ]; then
 	REMOVE=`echo "$OUTPUTRES" | sed 's,\\\;[12]$,,g'`
-	CREMOVE=`cygpath $REMOVE`
+	CREMOVE=`win2msys_path.sh $REMOVE`
+        ## If Defender or Search are enabled, they will lock just created files
+        ## and then mt will fail :/
+        echo "If you get this error, make sure Windows Defender AND Windows Search is disabled">>/tmp/link.exe.${p}.1
 	rm -f "$CREMOVE"
     fi
     rm -f "$CMANIFEST"
diff --git a/erts/include/internal/ethr_internal.h b/erts/include/internal/ethr_internal.h
index ac27ff2ed0..17ec84c52b 100644
--- a/erts/include/internal/ethr_internal.h
+++ b/erts/include/internal/ethr_internal.h
@@ -90,7 +90,7 @@ int ethr_init_common__(ethr_init_data *id);
 int ethr_late_init_common__(ethr_late_init_data *lid);
 void ethr_run_exit_handlers__(void);
 void ethr_ts_event_destructor__(void *vtsep);
-void ethr_set_stacklimit__(char *prev_c, size_t stacksize);
+void ethr_set_stacklimit__(char *prev_c, size_t stacksize) ETHR_NOINLINE;
 
 #if defined(ETHR_X86_RUNTIME_CONF__)
 void ethr_x86_cpuid__(int *eax, int *ebx, int *ecx, int *edx);
diff --git a/erts/include/internal/ethread_inline.h b/erts/include/internal/ethread_inline.h
index 8e6bcfc4a8..791d7fa0ff 100644
--- a/erts/include/internal/ethread_inline.h
+++ b/erts/include/internal/ethread_inline.h
@@ -62,12 +62,15 @@
 #  define ETHR_INLINE __inline__
 #  if ETHR_AT_LEAST_GCC_VSN__(3, 1, 1)
 #    define ETHR_FORCE_INLINE __inline__ __attribute__((__always_inline__))
+#    define ETHR_NOINLINE __attribute__((__noinline__))
 #  else
 #    define ETHR_FORCE_INLINE __inline__
+#    define ETHR_NOINLINE
 #  endif
 #elif defined(__WIN32__)
 #  define ETHR_INLINE __forceinline
 #  define ETHR_FORCE_INLINE __forceinline
+#  define ETHR_NOINLINE
 #endif
 
 #endif /* #ifndef ETHREAD_INLINE_H__ */
diff --git a/erts/include/internal/gcc/ethr_dw_atomic.h b/erts/include/internal/gcc/ethr_dw_atomic.h
index 47158b7295..dd116c81ce 100644
--- a/erts/include/internal/gcc/ethr_dw_atomic.h
+++ b/erts/include/internal/gcc/ethr_dw_atomic.h
@@ -78,7 +78,7 @@ typedef volatile ETHR_NATIVE_SU_DW_SINT_T * ethr_native_dw_ptr_t;
  * runtime. We, therefore, need an extra word allocated.
  */
 #define ETHR_DW_NATMC_MEM__(VAR) \
-   (&var->c[(int) ((ethr_uint_t) &(VAR)->c[0]) & ETHR_DW_NATMC_ALIGN_MASK__])
+   (&(VAR)->c[(int) ((ethr_uint_t) &(VAR)->c[0]) & ETHR_DW_NATMC_ALIGN_MASK__])
 typedef union {
     volatile ETHR_NATIVE_SU_DW_SINT_T dw_sint;
     volatile ethr_sint_t sint[3];
diff --git a/erts/include/internal/gcc/ethr_membar.h b/erts/include/internal/gcc/ethr_membar.h
index 07960ce040..5cbda5582d 100644
--- a/erts/include/internal/gcc/ethr_membar.h
+++ b/erts/include/internal/gcc/ethr_membar.h
@@ -96,7 +96,7 @@
  *          issue an aquire memory barrier and an __atomic
  *          builtin memory acess with the __ATOMIC_RELEASE
  *          memory model must at least issue a release memory
- *          barrier. Otherwise the two can not be paired.
+ *          barrier. Otherwise the two cannot be paired.
  *       4. All __atomic builtins accessing memory using the
  *          __ATOMIC_CONSUME builtin can be used for the same
  *          reason __ATOMIC_ACQUIRE can be used. The ethread
diff --git a/erts/include/internal/i386/ethr_dw_atomic.h b/erts/include/internal/i386/ethr_dw_atomic.h
index 91acdb0483..3c47da9758 100644
--- a/erts/include/internal/i386/ethr_dw_atomic.h
+++ b/erts/include/internal/i386/ethr_dw_atomic.h
@@ -73,7 +73,7 @@ typedef volatile ethr_native_sint128_t__ * ethr_native_dw_ptr_t;
  * runtime. We, therefore, need an extra word allocated.
  */
 #define ETHR_DW_NATMC_MEM__(VAR) \
-   (&var->c[(int) ((ethr_uint_t) &(VAR)->c[0]) & ETHR_DW_NATMC_ALIGN_MASK__])
+   (&(VAR)->c[(int) ((ethr_uint_t) &(VAR)->c[0]) & ETHR_DW_NATMC_ALIGN_MASK__])
 typedef union {
 #ifdef ETHR_NATIVE_SU_DW_SINT_T
     volatile ETHR_NATIVE_SU_DW_SINT_T dw_sint;
diff --git a/erts/include/internal/win/ethr_dw_atomic.h b/erts/include/internal/win/ethr_dw_atomic.h
index a6b26ab7bb..f7a1900a82 100644
--- a/erts/include/internal/win/ethr_dw_atomic.h
+++ b/erts/include/internal/win/ethr_dw_atomic.h
@@ -80,7 +80,7 @@ typedef volatile __int64 * ethr_native_dw_ptr_t;
  * runtime. We, therefore, need an extra word allocated.
  */
 #define ETHR_DW_NATMC_MEM__(VAR) \
-   (&var->c[(int) ((ethr_uint_t) &(VAR)->c[0]) & ETHR_DW_NATMC_ALIGN_MASK__])
+   (&(VAR)->c[(int) ((ethr_uint_t) &(VAR)->c[0]) & ETHR_DW_NATMC_ALIGN_MASK__])
 typedef union {
 #ifdef ETHR_NATIVE_SU_DW_SINT_T
     volatile ETHR_NATIVE_SU_DW_SINT_T dw_sint;
diff --git a/erts/lib_src/Makefile.in b/erts/lib_src/Makefile.in
index 8e1f5b58c4..1da11c2d0a 100644
--- a/erts/lib_src/Makefile.in
+++ b/erts/lib_src/Makefile.in
@@ -29,7 +29,6 @@ CC=@CC@
 LD=@LD@
 AR=@AR@
 RANLIB=@RANLIB@
-RM=@RM@
 MKDIR=@MKDIR@
 INSTALL=@INSTALL@
 INSTALL_DIR=@INSTALL_DIR@
@@ -536,9 +535,9 @@ release_docs_spec:
 #
 .PHONY: clean
 clean:
-	$(RM) -rf ../lib/internal/$(TARGET)/*
-	$(RM) -rf ../lib/$(TARGET)/*
-	$(RM) -rf obj/$(TARGET)/*
+	$(RM) -r ../lib/internal/$(TARGET)/*
+	$(RM) -r ../lib/$(TARGET)/*
+	$(RM) -r obj/$(TARGET)/*
 
 #
 # Make dependencies
diff --git a/erts/lib_src/common/erl_printf.c b/erts/lib_src/common/erl_printf.c
index 259ba8c81d..86f5da1c40 100644
--- a/erts/lib_src/common/erl_printf.c
+++ b/erts/lib_src/common/erl_printf.c
@@ -27,6 +27,11 @@
 #include "config.h"
 #endif
 
+#if defined(__sun) || defined(__sun__)
+    /* For flockfile(3c), putc_unlocked(3c), etc */
+    #define __EXTENSIONS__
+#endif
+
 #include <string.h>
 #include "erl_errno.h"
 #ifdef __WIN32__
diff --git a/erts/lib_src/pthread/ethread.c b/erts/lib_src/pthread/ethread.c
index b4b12fcd86..b567ed81b0 100644
--- a/erts/lib_src/pthread/ethread.c
+++ b/erts/lib_src/pthread/ethread.c
@@ -208,9 +208,9 @@ ethr_x86_cpuid__(int *eax, int *ebx, int *ecx, int *edx)
              "popl %%eax\n\t"
              "movl $0x0, %0\n\t"
              "xorl %%ecx, %%eax\n\t"
-             "jz no_cpuid\n\t"
+             "jz 1f\n\t"
 	     "movl $0x1, %0\n\t"
-             "no_cpuid:\n\t"
+             "1:\n\t"
              : "=r"(have_cpuid)
              :
              : "%eax", "%ecx", "cc");
diff --git a/erts/preloaded/ebin/atomics.beam b/erts/preloaded/ebin/atomics.beam
index a5ac24f0b8..c74ce3ce2d 100644
--- a/erts/preloaded/ebin/atomics.beam
+++ b/erts/preloaded/ebin/atomics.beam
diff --git a/erts/preloaded/ebin/counters.beam b/erts/preloaded/ebin/counters.beam
index a1aa34a415..2aec433bcb 100644
--- a/erts/preloaded/ebin/counters.beam
+++ b/erts/preloaded/ebin/counters.beam
diff --git a/erts/preloaded/ebin/erl_init.beam b/erts/preloaded/ebin/erl_init.beam
new file mode 100644
index 0000000000..bc7639781c
--- /dev/null
+++ b/erts/preloaded/ebin/erl_init.beam
diff --git a/erts/preloaded/ebin/erl_prim_loader.beam b/erts/preloaded/ebin/erl_prim_loader.beam
index 37903d24b6..13fdd7908b 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 2509f238bf..16e17b870b 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 7563663807..866f9df79f 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 bc697d11d7..d81bc08282 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_signal_handler.beam b/erts/preloaded/ebin/erts_dirty_process_signal_handler.beam
index 5b788368af..a8d492dfa5 100644
--- a/erts/preloaded/ebin/erts_dirty_process_signal_handler.beam
+++ b/erts/preloaded/ebin/erts_dirty_process_signal_handler.beam
diff --git a/erts/preloaded/ebin/erts_internal.beam b/erts/preloaded/ebin/erts_internal.beam
index b8415a9833..dd08111aad 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 e2a8c65f38..0f7dd6efbe 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 fee2da33a6..942f29a11c 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 324e111ad1..0d194896c7 100644
--- a/erts/preloaded/ebin/otp_ring0.beam
+++ b/erts/preloaded/ebin/otp_ring0.beam
diff --git a/erts/preloaded/ebin/persistent_term.beam b/erts/preloaded/ebin/persistent_term.beam
index c73da80a98..7871b64991 100644
--- a/erts/preloaded/ebin/persistent_term.beam
+++ b/erts/preloaded/ebin/persistent_term.beam
diff --git a/erts/preloaded/ebin/prim_buffer.beam b/erts/preloaded/ebin/prim_buffer.beam
index 75e5b7c9cb..90d9596fe6 100644
--- a/erts/preloaded/ebin/prim_buffer.beam
+++ b/erts/preloaded/ebin/prim_buffer.beam
diff --git a/erts/preloaded/ebin/prim_eval.beam b/erts/preloaded/ebin/prim_eval.beam
index ddda4764e1..19935eeee3 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 2d1ce7d631..a2c5f2f336 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 558968b58a..f77e9e863d 100644
--- a/erts/preloaded/ebin/prim_inet.beam
+++ b/erts/preloaded/ebin/prim_inet.beam
diff --git a/erts/preloaded/ebin/prim_net.beam b/erts/preloaded/ebin/prim_net.beam
new file mode 100644
index 0000000000..9d50b3210f
--- /dev/null
+++ b/erts/preloaded/ebin/prim_net.beam
diff --git a/erts/preloaded/ebin/prim_zip.beam b/erts/preloaded/ebin/prim_zip.beam
index 51721a27a8..bd51c3b271 100644
--- a/erts/preloaded/ebin/prim_zip.beam
+++ b/erts/preloaded/ebin/prim_zip.beam
diff --git a/erts/preloaded/ebin/socket.beam b/erts/preloaded/ebin/socket.beam
new file mode 100644
index 0000000000..73a0bd4f72
--- /dev/null
+++ b/erts/preloaded/ebin/socket.beam
diff --git a/erts/preloaded/ebin/zlib.beam b/erts/preloaded/ebin/zlib.beam
index 4519b540c4..8b7c5fe2ef 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 e1bd5bc295..38b85915cc 100644
--- a/erts/preloaded/src/Makefile
+++ b/erts/preloaded/src/Makefile
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2008-2018. All Rights Reserved.
+# Copyright Ericsson AB 2008-2019. 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,15 +33,24 @@ STATIC_EBIN=../ebin
 include $(ERL_TOP)/erts/vsn.mk
 include $(ERL_TOP)/lib/kernel/vsn.mk
 
+ifeq ($(USE_ESOCK), yes)
+PRE_LOADED_ERL_ESOCK_MODULES = \
+	socket \
+	prim_net
+else
+PRE_LOADED_ERL_ESOCK_MODULES =
+endif
+
 PRE_LOADED_ERL_MODULES = \
 	erl_prim_loader \
 	init \
 	prim_buffer \
 	prim_file \
 	prim_inet \
+	$(PRE_LOADED_ERL_ESOCK_MODULES) \
 	zlib \
 	prim_zip \
-	otp_ring0 \
+	erl_init \
 	erts_code_purger \
 	erlang \
 	erts_internal \
@@ -71,6 +80,11 @@ STATIC_TARGET_FILES = $(PRE_LOADED_MODULES:%=$(STATIC_EBIN)/%.$(EMULATOR))
 APP_FILE= erts.app
 APP_SRC= $(APP_FILE).src
 APP_TARGET= $(STATIC_EBIN)/$(APP_FILE)
+ifeq ($(USE_ESOCK), yes)
+APP_ESOCK_MODS= prim_net, socket
+else
+APP_ESOCK_MODS=
+endif
 
 
 KERNEL_SRC=$(ERL_TOP)/lib/kernel/src
@@ -79,6 +93,19 @@ STDLIB_INCLUDE=$(ERL_TOP)/lib/stdlib/include
 
 ERL_COMPILE_FLAGS += +debug_info -I$(KERNEL_SRC) -I$(KERNEL_INCLUDE)
 
+DIA_PLT      = erts-preloaded.plt
+DIA_ANALYSIS = $(basename $(DIA_PLT)).dialyzer_analysis
+ifeq ($(DIAW_EH),true)
+DIA_WARNINGS += -Werror_handling
+endif
+ifeq ($(DIAW_US),true)
+DIA_WARNINGS += -Wunderspecs
+endif
+ifeq ($(DIAW_UR),true)
+DIA_WARNINGS += -Wunmatched_returns
+endif
+
+
 debug opt: $(TARGET_FILES) 
 
 clean:
@@ -88,8 +115,7 @@ copy:
 	cp *.beam $(STATIC_EBIN)
 
 $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' -e 's;%ESOCK_MODS%;$(APP_ESOCK_MODS);' $< > $@
 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
@@ -105,6 +131,31 @@ release_docs_spec:
 list_preloaded:
 	@echo $(PRE_LOADED_MODULES)
 
+dclean:
+	rm -f $(DIA_PLT)
+	rm -f $(DIA_ANALYSIS)
+
+dialyzer_plt: $(DIA_PLT)
+
+$(DIA_PLT): $(ERL_FILES)
+	@echo "Building ($(basename $(DIA_PLT))) plt file"
+	@dialyzer --build_plt \
+                  --output_plt $@ \
+                  -r ../ebin \
+                     ../../../lib/kernel/ebin \
+                     ../../../lib/stdlib/ebin \
+                     ../../../lib/crypto/ebin \
+                     ../../../lib/compiler/ebin \
+                  --output $(DIA_ANALYSIS) \
+                  --verbose
+
+dialyzer: $(DIA_PLT)
+	@echo "Running dialyzer on $(basename $(DIA_PLT))"
+	@dialyzer --plt $< \
+                  ../ebin \
+                  $(DIA_WARNINGS) \
+                  --verbose
+
 #
 # Combine a BEAM assembly script file a stub Erlang file into a BEAM file.
 # See add_abstract_chunk script.
diff --git a/erts/preloaded/src/erl_init.erl b/erts/preloaded/src/erl_init.erl
new file mode 100644
index 0000000000..dadf7dda6f
--- /dev/null
+++ b/erts/preloaded/src/erl_init.erl
@@ -0,0 +1,73 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2000-2019. 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_init).
+
+%% Initial process of an Erlang system.
+
+-export([start/2]).
+
+%% This gets the module name given by the +i option (default 'init')
+%% and the list of command line arguments
+
+-spec start(Mod, BootArgs) -> no_return() when
+      Mod :: module(),
+      BootArgs :: [binary()].
+start(Mod, BootArgs) ->
+    %% Load the static nifs
+    zlib:on_load(),
+    erl_tracer:on_load(),
+    prim_buffer:on_load(),
+    prim_file:on_load(),
+    %% socket:on_load(), prim_net:on_load(),
+    conditional_load(socket, [socket, prim_net]),
+    %% Proceed to the specified boot module
+    run(Mod, boot, BootArgs).
+
+run(M, F, A) ->
+    case erlang:function_exported(M, F, 1) of
+	false ->
+	    erlang:display({fatal,error,module,M,"does not export",F,"/1"}),
+	    halt(1);
+	true ->
+            M:F(A)
+    end.
+
+conditional_load(CondMod, Mods2Load) ->
+    Loaded = erlang:loaded(),
+    %% erlang:display({?MODULE, conditional_load, Loaded}),
+    conditional_load(CondMod, Loaded, Mods2Load).
+
+conditional_load(_CondMod, [], _Mods2LOad) ->
+    ok;
+conditional_load(CondMod, [CondMod|_], Mods2Load) ->
+    on_load(Mods2Load);
+conditional_load(CondMod, [_|T], Mods2Load) ->
+    conditional_load(CondMod, T, Mods2Load).
+
+on_load([]) ->
+    ok;
+on_load([Mod|Mods]) ->
+    Mod:on_load(),
+    on_load(Mods).
+
+
+    
+
+
diff --git a/erts/preloaded/src/erl_prim_loader.erl b/erts/preloaded/src/erl_prim_loader.erl
index ae5f86e017..1605c20f2c 100644
--- a/erts/preloaded/src/erl_prim_loader.erl
+++ b/erts/preloaded/src/erl_prim_loader.erl
@@ -297,12 +297,13 @@ check_file_result(Func, Target, {error,Reason}) ->
                         "Target: " ++ TargetStr ++ ". " ++
                         "Function: " ++ atom_to_list(Func) ++ ". " ++ Process
                 end,
-            %% this is equal to calling error_logger:error_report/1 which
-            %% we don't want to do from code_server during system boot
+            %% This is equal to calling logger:error/2 which
+            %% we don't want to do from code_server during system boot.
+            %% We don't want to call logger:timestamp() either.
             logger ! {log,error,#{label=>{?MODULE,file_error},report=>Report},
                       #{pid=>self(),
                         gl=>group_leader(),
-                        time=>erlang:monotonic_time(microsecond),
+                        time=>os:system_time(microsecond),
                         error_logger=>#{tag=>error_report,
                                         type=>std_error}}},
             error
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 1ed6b6b284..06f0ee1dc6 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -48,6 +48,8 @@
          dist_ctrl_put_data/2,
          dist_ctrl_get_data/1,
          dist_ctrl_get_data_notification/1,
+         dist_ctrl_get_opt/2,
+         dist_ctrl_set_opt/3,
          dist_get_stat/1]).
 
 -deprecated([get_stacktrace/0,now/0]).
@@ -2295,7 +2297,7 @@ process_flag(_Flag, _Value) ->
                             non_neg_integer()}]} |
       {catchlevel, CatchLevel :: non_neg_integer()} |
       {current_function,
-       {Module :: module(), Function :: atom(), Arity :: arity()}} |
+       {Module :: module(), Function :: atom(), Arity :: arity()} | undefined} |
       {current_location,
        {Module :: module(), Function :: atom(), Arity :: arity(),
         Location :: [{file, Filename :: string()} | % not a stack_item()!
@@ -2526,6 +2528,9 @@ subtract(_,_) ->
                                 OldSchedulersOnline when
       SchedulersOnline :: pos_integer(),
       OldSchedulersOnline :: pos_integer();
+                        (system_logger, Logger) -> PrevLogger when
+      Logger :: logger | undefined | pid(),
+      PrevLogger :: logger | undefined | pid();
                         (trace_control_word, TCW) -> OldTCW when
       TCW :: non_neg_integer(),
       OldTCW :: non_neg_integer();
@@ -2534,7 +2539,7 @@ subtract(_,_) ->
                         %% These are deliberately not documented
 			(internal_cpu_topology, term()) -> term();
                         (sequential_tracer, pid() | port() | {module(), term()} | false) -> pid() | port() | false;
-                        (1,0) -> true.
+                        (reset_seq_trace,true) -> true.
 
 system_flag(_Flag, _Value) ->
     erlang:nif_error(undefined).
@@ -2731,8 +2736,9 @@ tuple_to_list(_Tuple) ->
          (schedulers | schedulers_online) -> pos_integer();
          (smp_support) -> boolean();
          (start_time) -> integer();
-         (system_version) -> string();
          (system_architecture) -> string();
+         (system_logger) -> logger | undefined | pid();
+         (system_version) -> string();
          (threads) -> boolean();
          (thread_pool_size) -> non_neg_integer();
          (time_correction) -> true | false;
@@ -3322,7 +3328,8 @@ dist_ctrl_input_handler(_DHandle, _InputHandler) ->
 dist_ctrl_put_data(_DHandle, _Data) ->
     erlang:nif_error(undefined).
 
--spec erlang:dist_ctrl_get_data(DHandle) -> Data | 'none' when
+-spec erlang:dist_ctrl_get_data(DHandle) -> {Size, Data} | Data | 'none' when
+      Size :: non_neg_integer(),
       DHandle :: dist_handle(),
       Data :: iodata().
 
@@ -3335,11 +3342,26 @@ dist_ctrl_get_data(_DHandle) ->
 dist_ctrl_get_data_notification(_DHandle) ->
     erlang:nif_error(undefined).
 
+-spec erlang:dist_ctrl_set_opt(DHandle, 'get_size', Value) -> OldValue when
+      DHandle :: dist_handle(),
+      Value :: boolean(),
+      OldValue :: boolean().
+
+dist_ctrl_set_opt(_DHandle, _Opt, _Val) ->
+    erlang:nif_error(undefined).
+
+-spec erlang:dist_ctrl_get_opt(DHandle, 'get_size') -> Value when
+      DHandle :: dist_handle(),
+      Value :: boolean().
+
+dist_ctrl_get_opt(_DHandle, _Opt) ->
+    erlang:nif_error(undefined).
+
 -spec erlang:dist_get_stat(DHandle) -> Res when
       DHandle :: dist_handle(),
       InputPackets :: non_neg_integer(),
       OutputPackets :: non_neg_integer(),
-      PendingOutputPackets :: boolean(),
+      PendingOutputPackets :: non_neg_integer(),
       Res :: {'ok', InputPackets, OutputPackets, PendingOutputPackets}.
 
 dist_get_stat(_DHandle) ->
@@ -3395,60 +3417,15 @@ get_cookie() ->
 -spec integer_to_list(Integer, Base) -> string() when
       Integer :: integer(),
       Base :: 2..36.
-integer_to_list(I, 10) ->
-    erlang:integer_to_list(I);
-integer_to_list(I, Base) 
-  when erlang:is_integer(I), erlang:is_integer(Base),
-       Base >= 2, Base =< 1+$Z-$A+10 ->
-    if I < 0 ->
-	    [$-|integer_to_list(-I, Base, [])];
-       true ->
-	    integer_to_list(I, Base, [])
-    end;
-integer_to_list(I, Base) ->
-    erlang:error(badarg, [I, Base]).
-
-integer_to_list(I0, Base, R0) ->
-    D = I0 rem Base,
-    I1 = I0 div Base,
-    R1 = if D >= 10 ->
-		 [D-10+$A|R0];
-	    true ->
-		 [D+$0|R0]
-	 end,
-    if I1 =:= 0 ->
-	    R1;
-       true ->
-	    integer_to_list(I1, Base, R1)
-    end.
+integer_to_list(_I, _Base) ->
+    erlang:nif_error(undefined).
 
 -spec integer_to_binary(Integer, Base) -> binary() when
       Integer :: integer(),
       Base :: 2..36.
-integer_to_binary(I, 10) ->
-    erlang:integer_to_binary(I);
-integer_to_binary(I, Base) 
-  when erlang:is_integer(I), erlang:is_integer(Base),
-       Base >= 2, Base =< 1+$Z-$A+10 ->
-    if I < 0 ->
-	    <<$-,(integer_to_binary(-I, Base, <<>>))/binary>>;
-       true ->
-	    integer_to_binary(I, Base, <<>>)
-    end;
-integer_to_binary(I, Base) ->
-    erlang:error(badarg, [I, Base]).
-
-integer_to_binary(I0, Base, R0) ->
-    D = I0 rem Base,
-    I1 = I0 div Base,
-    R1 = if
-             D >= 10 -> <<(D-10+$A),R0/binary>>;
-             true -> <<(D+$0),R0/binary>>
-         end,
-    if
-        I1 =:= 0 -> R1;
-        true -> integer_to_binary(I1, Base, R1)
-    end.
+integer_to_binary(_I, _Base) ->
+    erlang:nif_error(undefined).
+
 
 -record(cpu, {node = -1,
 	      processor = -1,
@@ -3654,90 +3631,28 @@ memory() ->
 -spec erlang:memory(Type :: memory_type()) -> non_neg_integer();
                    (TypeList :: [memory_type()]) -> [{memory_type(), non_neg_integer()}].
 memory(Type) when erlang:is_atom(Type) ->
-    {AA, ALCU, ChkSup, BadArgZero} = need_mem_info(Type),
-    case get_mem_data(ChkSup, ALCU, AA) of
-	notsup ->
-	    erlang:error(notsup, [Type]);
-	Mem ->
-	    Value = get_memval(Type, Mem),
-	    case {BadArgZero, Value} of
-		{true, 0} -> erlang:error(badarg, [Type]);
-		_ -> Value
-	    end
+    try
+        case aa_mem_data(au_mem_data(?ALL_NEEDED_ALLOCS)) of
+            notsup -> erlang:error(notsup);
+            Mem -> get_memval(Type, Mem)
+        end
+    catch
+        error:badarg -> erlang:error(badarg)
     end;
 memory(Types) when erlang:is_list(Types) ->
-    {AA, ALCU, ChkSup, BadArgZeroList} = need_mem_info_list(Types),
-    case get_mem_data(ChkSup, ALCU, AA) of
-	notsup ->
-	    erlang:error(notsup, [Types]);
-	Mem ->
-	    case memory_result_list(Types, BadArgZeroList, Mem) of
-		badarg -> erlang:error(badarg, [Types]);
-		Result -> Result
-	    end
-    end.
-
-memory_result_list([], [], _Mem) ->
-    [];
-memory_result_list([T|Ts], [BAZ|BAZs], Mem) ->
-    case memory_result_list(Ts, BAZs, Mem) of
-	badarg -> badarg;
-	TVs ->
-	    V = get_memval(T, Mem),
-	    case {BAZ, V} of
-		{true, 0} -> badarg;
-		_ -> [{T, V}| TVs]
-	    end
-    end.
-
-get_mem_data(true, AlcUAllocs, NeedAllocatedAreas) ->
-    case memory_is_supported() of
-	false -> notsup;
-	true -> get_mem_data(false, AlcUAllocs, NeedAllocatedAreas)
-    end;
-get_mem_data(false, AlcUAllocs, NeedAllocatedAreas) ->
-    AlcUMem = case AlcUAllocs of
-		  [] -> #memory{};
-		  _ ->
-		      au_mem_data(AlcUAllocs)
-	      end,
-    case NeedAllocatedAreas of
-	true -> aa_mem_data(AlcUMem);
-	false -> AlcUMem
+    try
+        case aa_mem_data(au_mem_data(?ALL_NEEDED_ALLOCS)) of
+            notsup -> erlang:error(notsup);
+            Mem -> memory_1(Types, Mem)
+        end
+    catch
+        error:badarg -> erlang:error(badarg)
     end.
 
-need_mem_info_list([]) ->
-    {false, [], false, []};
-need_mem_info_list([T|Ts]) ->
-    {MAA, MALCU, MChkSup, MBadArgZero} = need_mem_info_list(Ts),
-    {AA, ALCU, ChkSup, BadArgZero} = need_mem_info(T),
-    {case AA of
-	 true -> true;
-	 _ -> MAA
-     end,
-     ALCU ++ (MALCU -- ALCU),
-     case ChkSup of
-	 true -> true;
-	 _ -> MChkSup
-     end,
-     [BadArgZero|MBadArgZero]}.
-
-need_mem_info(Type) when Type == total;
-			 Type == system ->
-    {true, ?ALL_NEEDED_ALLOCS, false, false};
-need_mem_info(Type) when Type == processes;
-			 Type == processes_used ->
-    {true, [eheap_alloc, fix_alloc], true, false};
-need_mem_info(Type) when Type == atom;
-			 Type == atom_used;
-			 Type == code ->
-    {true, [], true, false};
-need_mem_info(binary) ->
-    {false, [binary_alloc], true, false};
-need_mem_info(ets) ->
-    {true, [ets_alloc], true, false};
-need_mem_info(_) ->
-    {false, [], false, true}.
+memory_1([Type | Types], Mem) ->
+    [{Type, get_memval(Type, Mem)} | memory_1(Types, Mem)];
+memory_1([], _Mem) ->
+    [].
 
 get_memval(total, #memory{total = V}) -> V;
 get_memval(processes, #memory{processes = V}) -> V;
@@ -3748,16 +3663,7 @@ get_memval(atom_used, #memory{atom_used = V}) -> V;
 get_memval(binary, #memory{binary = V}) -> V;
 get_memval(code, #memory{code = V}) -> V;
 get_memval(ets, #memory{ets = V}) -> V;
-get_memval(_, #memory{}) -> 0.
-
-memory_is_supported() ->
-    {_, _, FeatureList, _} = erlang:system_info(allocator),
-    case ((erlang:system_info(alloc_util_allocators) 
-	   -- ?CARRIER_ALLOCS)
-	  -- FeatureList) of
-	[] -> true;
-	_ -> false
-    end.
+get_memval(_, #memory{}) -> erlang:error(badarg).
 
 get_blocks_size([{blocks_size, Sz, _, _} | Rest], Acc) ->
     get_blocks_size(Rest, Acc+Sz);
@@ -3768,16 +3674,6 @@ get_blocks_size([_ | Rest], Acc) ->
 get_blocks_size([], Acc) ->
     Acc.
 
-
-blocks_size([{Carriers, SizeList} | Rest], Acc) when Carriers == mbcs;
-						     Carriers == mbcs_pool;
-						     Carriers == sbcs ->
-    blocks_size(Rest, get_blocks_size(SizeList, Acc));
-blocks_size([_ | Rest], Acc) ->
-    blocks_size(Rest, Acc);
-blocks_size([], Acc) ->
-    Acc.
-
 get_fix_proc([{ProcType, A1, U1}| Rest], {A0, U0}) when ProcType == proc;
 							ProcType == monitor;
 							ProcType == link;
@@ -3802,64 +3698,78 @@ fix_proc([_ | Rest], Acc) ->
 fix_proc([], Acc) ->
     Acc.
 
+au_mem_fix(#memory{ processes = Proc,
+                    processes_used = ProcU,
+                    system = Sys } = Mem, Data) ->
+    case fix_proc(Data, {0, 0}) of
+        {A, U} ->
+            Mem#memory{ processes = Proc+A,
+                        processes_used = ProcU+U,
+                        system = Sys-A };
+        {Mask, A, U} ->
+            Mem#memory{ processes = Mask band (Proc+A),
+                        processes_used = Mask band (ProcU+U),
+                        system = Mask band (Sys-A) }
+    end.
+
+au_mem_acc(#memory{ total = Tot,
+                    processes = Proc,
+                    processes_used = ProcU } = Mem,
+           eheap_alloc, Data) ->
+    Sz = get_blocks_size(Data, 0),
+    Mem#memory{ total = Tot+Sz,
+                processes = Proc+Sz,
+                processes_used = ProcU+Sz};
+au_mem_acc(#memory{ total = Tot,
+                    system = Sys,
+                    ets = Ets } = Mem, ets_alloc, Data) ->
+    Sz = get_blocks_size(Data, 0),
+    Mem#memory{ total = Tot+Sz,
+                system = Sys+Sz,
+                ets = Ets+Sz };
+au_mem_acc(#memory{total = Tot,
+		    system = Sys,
+		    binary = Bin } = Mem,
+	    binary_alloc, Data) ->
+    Sz = get_blocks_size(Data, 0),
+    Mem#memory{ total = Tot+Sz,
+                system = Sys+Sz,
+                binary = Bin+Sz};
+au_mem_acc(#memory{ total = Tot,
+                    system = Sys } = Mem,
+           _Type, Data) ->
+    Sz = get_blocks_size(Data, 0),
+    Mem#memory{ total = Tot+Sz,
+                system = Sys+Sz }.
+
+au_mem_foreign(Mem, [{Type, SizeList} | Rest]) ->
+    au_mem_foreign(au_mem_acc(Mem, Type, SizeList), Rest);
+au_mem_foreign(Mem, []) ->
+    Mem.
+
+au_mem_current(Mem0, Type, [{mbcs_pool, MBCS} | Rest]) ->
+    [Foreign] = [Foreign || {foreign_blocks, Foreign} <- MBCS],
+    SizeList = MBCS -- [Foreign],
+    Mem = au_mem_foreign(Mem0, Foreign),
+    au_mem_current(au_mem_acc(Mem, Type, SizeList), Type, Rest);
+au_mem_current(Mem, Type, [{mbcs, SizeList} | Rest]) ->
+    au_mem_current(au_mem_acc(Mem, Type, SizeList), Type, Rest);
+au_mem_current(Mem, Type, [{sbcs, SizeList} | Rest]) ->
+    au_mem_current(au_mem_acc(Mem, Type, SizeList), Type, Rest);
+au_mem_current(Mem, Type, [_ | Rest]) ->
+    au_mem_current(Mem, Type, Rest);
+au_mem_current(Mem, _Type, []) ->
+    Mem.
+
 au_mem_data(notsup, _) ->
     notsup;
 au_mem_data(_, [{_, false} | _]) ->
     notsup;
-au_mem_data(#memory{total = Tot,
-		    processes = Proc,
-		    processes_used = ProcU} = Mem,
-	    [{eheap_alloc, _, Data} | Rest]) ->
-    Sz = blocks_size(Data, 0),
-    au_mem_data(Mem#memory{total = Tot+Sz,
-			   processes = Proc+Sz,
-			   processes_used = ProcU+Sz},
-		Rest);
-au_mem_data(#memory{total = Tot,
-		    system = Sys,
-		    ets = Ets} = Mem,
-	    [{ets_alloc, _, Data} | Rest]) ->
-    Sz = blocks_size(Data, 0),
-    au_mem_data(Mem#memory{total = Tot+Sz,
-			   system = Sys+Sz,
-			   ets = Ets+Sz},
-		Rest);
-au_mem_data(#memory{total = Tot,
-		    system = Sys,
-		    binary = Bin} = Mem,
-	    [{binary_alloc, _, Data} | Rest]) ->
-    Sz = blocks_size(Data, 0),
-    au_mem_data(Mem#memory{total = Tot+Sz,
-			   system = Sys+Sz,
-			   binary = Bin+Sz},
-		Rest);
-au_mem_data(#memory{total = Tot,
-		    processes = Proc,
-		    processes_used = ProcU,
-		    system = Sys} = Mem,
-	    [{fix_alloc, _, Data} | Rest]) ->
-    Sz = blocks_size(Data, 0),
-    case fix_proc(Data, {0, 0}) of
-	{A, U} ->
-	    au_mem_data(Mem#memory{total = Tot+Sz,
-				   processes = Proc+A,
-				   processes_used = ProcU+U,
-				   system = Sys+Sz-A},
-			Rest);
-	{Mask, A, U} ->
-	    au_mem_data(Mem#memory{total = Tot+Sz,
-				   processes = Mask band (Proc+A),
-				   processes_used = Mask band (ProcU+U),
-				   system = Mask band (Sys+Sz-A)},
-			Rest)
-    end;
-au_mem_data(#memory{total = Tot,
-		    system = Sys} = Mem,
-	    [{_, _, Data} | Rest]) ->
-    Sz = blocks_size(Data, 0),
-    au_mem_data(Mem#memory{total = Tot+Sz,
-			   system = Sys+Sz},
-		Rest);
+au_mem_data(#memory{} = Mem0, [{fix_alloc, _, Data} | Rest]) ->
+    Mem = au_mem_fix(Mem0, Data),
+    au_mem_data(au_mem_current(Mem, fix_alloc, Data), Rest);
+au_mem_data(#memory{} = Mem, [{Type, _, Data} | Rest]) ->
+    au_mem_data(au_mem_current(Mem, Type, Data), Rest);
 au_mem_data(EMD, []) ->
     EMD.
 
diff --git a/erts/preloaded/src/erts.app.src b/erts/preloaded/src/erts.app.src
index ab0b9494b0..132397b478 100644
--- a/erts/preloaded/src/erts.app.src
+++ b/erts/preloaded/src/erts.app.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2019. 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,7 +26,7 @@
 		erl_prim_loader,
 		erts_internal,
 		init,
-		otp_ring0,
+		erl_init,
 		erts_code_purger,
 		prim_buffer,
 		prim_eval,
@@ -35,7 +35,8 @@
 		prim_zip,
                 atomics,
                 counters,
-		zlib
+		zlib,
+		%ESOCK_MODS%
 	    ]},
 	{registered, []},
 	{applications, []},
diff --git a/erts/preloaded/src/erts_internal.erl b/erts/preloaded/src/erts_internal.erl
index 8f29a569f2..305b524438 100644
--- a/erts/preloaded/src/erts_internal.erl
+++ b/erts/preloaded/src/erts_internal.erl
@@ -97,6 +97,8 @@
 -export([counters_new/1, counters_get/2, counters_add/3,
          counters_put/3, counters_info/1]).
 
+-export([spawn_system_process/3]).
+
 %%
 %% Await result of send to port
 %%
@@ -726,3 +728,10 @@ counters_put(_Ref, _Ix, _Value) ->
 -spec counters_info(reference()) -> #{}.
 counters_info(_Ref) ->
     erlang:nif_error(undef).
+
+-spec spawn_system_process(Mod, Func, Args) -> pid() when
+    Mod :: atom(),
+    Func :: atom(),
+    Args :: list().
+spawn_system_process(_Mod, _Func, _Args) ->
+    erlang:nif_error(undefined).
diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl
index b4b8b3bf9b..5ea67347ec 100644
--- a/erts/preloaded/src/init.erl
+++ b/erts/preloaded/src/init.erl
@@ -200,12 +200,6 @@ boot(BootArgs) ->
     register(init, self()),
     process_flag(trap_exit, true),
 
-    %% Load the static nifs
-    zlib:on_load(),
-    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
     case b2a(get_flag(profile_boot, Flags, false)) of
@@ -483,13 +477,16 @@ do_handle_msg(Msg,State) ->
 	{From, {ensure_loaded, _}} ->
 	    From ! {init, not_allowed};
 	X ->
+            %% This is equal to calling logger:info/3 which we don't
+            %% want to do from the init process, at least not during
+            %% system boot. We don't want to call logger:timestamp()
+            %% either.
 	    case whereis(user) of
 		undefined ->
-		    Time = erlang:monotonic_time(microsecond),
                     catch logger ! {log, info, "init got unexpected: ~p", [X],
                                     #{pid=>self(),
                                       gl=>self(),
-                                      time=>Time,
+                                      time=>os:system_time(microsecond),
                                       error_logger=>#{tag=>info_msg}}};
 		User ->
 		    User ! X,
diff --git a/erts/preloaded/src/persistent_term.erl b/erts/preloaded/src/persistent_term.erl
index 5d0c266127..ee7e49b6cb 100644
--- a/erts/preloaded/src/persistent_term.erl
+++ b/erts/preloaded/src/persistent_term.erl
@@ -19,7 +19,7 @@
 %%
 -module(persistent_term).
 
--export([erase/1,get/0,get/1,info/0,put/2]).
+-export([erase/1,get/0,get/1,get/2,info/0,put/2]).
 
 -type key() :: term().
 -type value() :: term().
@@ -41,6 +41,13 @@ get() ->
 get(_Key) ->
     erlang:nif_error(undef).
 
+-spec get(Key, Default) -> Value when
+      Key :: key(),
+      Default :: value(),
+      Value :: value().
+get(_Key, _Default) ->
+    erlang:nif_error(undef).
+
 -spec info() -> Info when
       Info :: #{'count':=Count,'memory':=Memory},
       Count :: non_neg_integer(),
diff --git a/erts/preloaded/src/prim_eval.S b/erts/preloaded/src/prim_eval.S
index e4b1560517..900fda5d89 100644
--- a/erts/preloaded/src/prim_eval.S
+++ b/erts/preloaded/src/prim_eval.S
@@ -42,6 +42,10 @@
   {label,3}.
     {loop_rec,{f,5},{x,0}}.
     {move,{y,1},{x,1}}.
+    %% Tell the validator that it's safe to pass the message as an argument,
+    %% as the match fun is "known" not to build a term with it, and the
+    %% loop_rec instruction has disabled the GC.
+    {'%', {remove_fragility, {x,0}}}.
     {call_fun,1}.
     {test,is_ne_exact,{f,4},[{x,0},{atom,nomatch}]}.
     remove_message.
diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl
index 5fc22bc582..1aa5d85c64 100644
--- a/erts/preloaded/src/prim_file.erl
+++ b/erts/preloaded/src/prim_file.erl
@@ -46,7 +46,7 @@
 -define(MIN_READLINE_SIZE, 256).
 -define(LARGEFILESIZE, (1 bsl 63)).
 
--export([copy/3]).
+-export([copy/3, start/0]).
 
 -include("file_int.hrl").
 
@@ -85,14 +85,21 @@ is_translatable(_) ->
 
 %% This is a janitor process used to close files whose controlling process has
 %% died. The emulator will be torn down if this is killed.
-delayed_close_loop() ->
+start() ->
+    helper_loop().
+
+helper_loop() ->
     receive
         {close, FRef} when is_reference(FRef) -> delayed_close_nif(FRef);
         _ -> ok
     end,
-    delayed_close_loop().
+    helper_loop().
 
-%%
+on_load() ->
+    %% This is spawned as a system process to prevent init:restart/0 from
+    %% killing it.
+    Pid = erts_internal:spawn_system_process(?MODULE, start, []),
+    ok = erlang:load_nif(atom_to_list(?MODULE), Pid).
 
 %% Returns {error, Reason} | {ok, BytesCopied}
 copy(#file_descriptor{module = ?MODULE} = Source,
@@ -103,14 +110,6 @@ copy(#file_descriptor{module = ?MODULE} = Source,
     %% XXX Should be moved down to the driver for optimization.
     file:copy_opened(Source, Dest, Length).
 
-on_load() ->
-    Pid = spawn(fun() ->
-                    process_flag(trap_exit, true),
-                    delayed_close_loop()
-                end),
-    true = register(erts_prim_file, Pid),
-    ok = erlang:load_nif(atom_to_list(?MODULE), Pid).
-
 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
@@ -573,12 +572,13 @@ list_dir_convert([RawName | Rest], SkipInvalid, Result) ->
         {error, ignore} ->
             list_dir_convert(Rest, SkipInvalid, Result);
         {error, warning} ->
-            %% this is equal to calling error_logger:warning_msg/2 which
-            %% we don't want to do from code_server during system boot
+            %% This is equal to calling logger:warning/3 which
+            %% we don't want to do from code_server during system boot.
+            %% We don't want to call logger:timestamp() either.
             logger ! {log,warning,"Non-unicode filename ~p ignored\n", [RawName],
                       #{pid=>self(),
                         gl=>group_leader(),
-                        time=>erlang:system_time(microsecond),
+                        time=>os:system_time(microsecond),
                         error_logger=>#{tag=>warning_msg}}},
             list_dir_convert(Rest, SkipInvalid, Result);
         {error, _} ->
diff --git a/erts/preloaded/src/prim_inet.erl b/erts/preloaded/src/prim_inet.erl
index f1d938c9a4..4dab3de006 100644
--- a/erts/preloaded/src/prim_inet.erl
+++ b/erts/preloaded/src/prim_inet.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2019. 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.
@@ -172,8 +172,18 @@ close(S) when is_port(S) ->
             %% and is a contradiction in itself.
             %% We have hereby done our best...
             %%
-            Tref = erlang:start_timer(T * 1000, self(), close_port),
-            close_pend_loop(S, Tref, undefined);
+            case subscribe(S, [subs_empty_out_q]) of
+                {ok, [{subs_empty_out_q,0}]} ->
+                    close_port(S);
+                {ok, [{subs_empty_out_q,N}]} when N > 0 ->
+                    %% Wait for pending output to be sent
+                    Tref = erlang:start_timer(T * 1000, self(), close_port),
+                    close_pend_loop(S, Tref, N);
+                _ ->
+                    %% Subscribe failed - wait full time
+                    Tref = erlang:start_timer(T * 1000, self(), close_port),
+                    close_pend_loop(S, Tref, undefined)
+            end;
 	_ -> % Regard this as {ok,{false,_}}
             case subscribe(S, [subs_empty_out_q]) of
                 {ok, [{subs_empty_out_q,N}]} when N > 0 ->
@@ -417,7 +427,7 @@ accept_opts(L, S, FamilyOpts) ->
     case
         getopts(
           L,
-          [active, nodelay, keepalive, delay_send, priority]
+          [active, nodelay, keepalive, delay_send, priority, linger]
           ++ FamilyOpts)
     of
 	{ok, Opts} ->
@@ -543,34 +553,49 @@ send(S, Data) ->
 %% "sendto" is for UDP. IP and Port are set by the caller to 0 if the socket
 %% is known to be connected.
 
-sendto(S, Addr, _, Data) when is_port(S), tuple_size(Addr) =:= 2 ->
-    case type_value(set, addr, Addr) of
-	true ->
-	    ?DBG_FORMAT("prim_inet:sendto(~p, ~p, ~p)~n", [S,Addr,Data]),
-	    try
-		erlang:port_command(S, [enc_value(set, addr, Addr),Data])
-	    of
-		true ->
-		    receive
-			{inet_reply,S,Reply} ->
-			    ?DBG_FORMAT(
-			       "prim_inet:sendto() -> ~p~n", [Reply]),
-			    Reply
-		    end
-	    catch
-		error:_ ->
-		    ?DBG_FORMAT(
-		       "prim_inet:sendto() -> {error,einval}~n", []),
-		    {error,einval}
-	    end;
-	false ->
-	    ?DBG_FORMAT(
-	       "prim_inet:sendto() -> {error,einval}~n", []),
-	    {error,einval}
-    end;
-sendto(S, IP, Port, Data) ->
-    sendto(S, {IP, Port}, 0, Data).
-
+sendto(S, {_, _} = Address, AncOpts, Data)
+  when is_port(S), is_list(AncOpts) ->
+    case encode_opt_val(AncOpts) of
+        {ok, AncData} ->
+            AncDataLen = iolist_size(AncData),
+            case
+                type_value(set, addr, Address) andalso
+                type_value(set, uint32, AncDataLen)
+            of
+                true ->
+                    ?DBG_FORMAT("prim_inet:sendto(~p, ~p, ~p, ~p)~n",
+                                [S,Address,AncOpts,Data]),
+                    PortCommandData =
+                        [enc_value(set, addr, Address),
+                         enc_value(set, uint32, AncDataLen), AncData,
+                         Data],
+                    try erlang:port_command(S, PortCommandData) of
+                        true ->
+                            receive
+                                {inet_reply,S,Reply} ->
+                                    ?DBG_FORMAT(
+                                       "prim_inet:sendto() -> ~p~n", [Reply]),
+                                    Reply
+                            end
+                    catch
+                        _:_ ->
+                            ?DBG_FORMAT(
+                               "prim_inet:sendto() -> {error,einval}~n", []),
+                            {error,einval}
+                    end;
+                false ->
+                    ?DBG_FORMAT(
+                       "prim_inet:sendto() -> {error,einval}~n", []),
+                    {error,einval}
+            end;
+        {error,_} ->
+            ?DBG_FORMAT(
+               "prim_inet:sendto() -> {error,einval}~n", []),
+            {error,einval}
+    end;                        
+sendto(S, IP, Port, Data)
+  when is_port(S), is_integer(Port) ->
+    sendto(S, {IP, Port}, [], Data).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
@@ -1742,7 +1767,7 @@ type_opt_1(O) when is_atom(O) -> undefined.
 
 %% Get. No supplied value.
 type_value(get, undefined)        -> false; % Undefined type
-%% These two clauses can not happen since they are only used
+%% These two clauses cannot happen since they are only used
 %% in record fields - from record fields they must have a
 %% value though it might be 'undefined', so record fields
 %% calls type_value/3, not type_value/2.
@@ -1908,7 +1933,7 @@ type_value_2(_, _)         -> false.
 
 %% Get. No supplied value.
 %%
-%% These two clauses can not happen since they are only used
+%% These two clauses cannot happen since they are only used
 %% in record fields - from record fields they must have a
 %% value though it might be 'undefined', so record fields
 %% calls enc_value/3, not enc_value/2.
@@ -1983,15 +2008,15 @@ enc_value_2(addr, {File,_}) when is_list(File); is_binary(File) ->
     [?INET_AF_LOCAL,iolist_size(File)|File];
 %%
 enc_value_2(addr, {inet,{any,Port}}) ->
-    [?INET_AF_INET,?int16(Port),0,0,0,0];
+    [?INET_AF_INET,?int16(Port)|ip4_to_bytes({0,0,0,0})];
 enc_value_2(addr, {inet,{loopback,Port}}) ->
-    [?INET_AF_INET,?int16(Port),127,0,0,1];
+    [?INET_AF_INET,?int16(Port)|ip4_to_bytes({127,0,0,1})];
 enc_value_2(addr, {inet,{IP,Port}}) ->
     [?INET_AF_INET,?int16(Port)|ip4_to_bytes(IP)];
 enc_value_2(addr, {inet6,{any,Port}}) ->
-    [?INET_AF_INET6,?int16(Port),0,0,0,0,0,0,0,0];
+    [?INET_AF_INET6,?int16(Port)|ip6_to_bytes({0,0,0,0,0,0,0,0})];
 enc_value_2(addr, {inet6,{loopback,Port}}) ->
-    [?INET_AF_INET6,?int16(Port),0,0,0,0,0,0,0,1];
+    [?INET_AF_INET6,?int16(Port)|ip6_to_bytes({0,0,0,0,0,0,0,1})];
 enc_value_2(addr, {inet6,{IP,Port}}) ->
     [?INET_AF_INET6,?int16(Port)|ip6_to_bytes(IP)];
 enc_value_2(addr, {local,Addr}) ->
@@ -2139,10 +2164,10 @@ enum_name(_, []) -> false.
 %% encode opt/val REVERSED since options are stored in reverse order
 %% i.e. the recent options first (we must process old -> new)
 encode_opt_val(Opts) -> 
-    try 
-	enc_opt_val(Opts, [])
+    try
+	{ok, enc_opt_val(Opts, [])}
     catch
-	Reason -> {error,Reason}
+	throw:Reason -> {error,Reason}
     end.
 
 %% {active, once} and {active, N} are specially optimized because they will
@@ -2161,17 +2186,21 @@ enc_opt_val([binary|Opts], Acc) ->
     enc_opt_val(Opts, Acc, mode, binary);
 enc_opt_val([list|Opts], Acc) ->
     enc_opt_val(Opts, Acc, mode, list);
-enc_opt_val([_|_], _) -> {error,einval};
-enc_opt_val([], Acc)  -> {ok,Acc}.
+enc_opt_val([_|_], _) ->
+    throw(einval);
+enc_opt_val([], Acc) ->
+    Acc.
 
 enc_opt_val(Opts, Acc, Opt, Val) when is_atom(Opt) ->
     Type = type_opt(set, Opt),
     case type_value(set, Type, Val) of
 	true -> 
 	    enc_opt_val(Opts, [enc_opt(Opt),enc_value(set, Type, Val)|Acc]);
-	false -> {error,einval}
+	false ->
+            throw(einval)
     end;
-enc_opt_val(_, _, _, _) -> {error,einval}.
+enc_opt_val(_, _, _, _) ->
+    throw(einval).
 
 
 
@@ -2679,12 +2708,13 @@ get_ip6([X1,X2,X3,X4,X5,X6,X7,X8,X9,X10,X11,X12,X13,X14,X15,X16 | T]) ->
 	?u16(X9,X10),?u16(X11,X12),?u16(X13,X14),?u16(X15,X16)},
       T }.
 
+-define(ERTS_INET_DRV_CONTROL_MAGIC_NUMBER, 16#03f1a300).
 
 %% Control command
 ctl_cmd(Port, Cmd, Args) ->
     ?DBG_FORMAT("prim_inet:ctl_cmd(~p, ~p, ~p)~n", [Port,Cmd,Args]),
     Result =
-	try erlang:port_control(Port, Cmd, Args) of
+	try erlang:port_control(Port, Cmd+?ERTS_INET_DRV_CONTROL_MAGIC_NUMBER, Args) of
 	    [?INET_REP_OK|Reply]  -> {ok,Reply};
 	    [?INET_REP]  -> inet_reply;
 	    [?INET_REP_ERROR|Err] -> {error,list_to_atom(Err)}
diff --git a/erts/preloaded/src/prim_net.erl b/erts/preloaded/src/prim_net.erl
new file mode 100644
index 0000000000..107043d1aa
--- /dev/null
+++ b/erts/preloaded/src/prim_net.erl
@@ -0,0 +1,289 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018-2019. 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_net).
+
+-compile(no_native).
+
+%% Administrative and "global" utility functions
+-export([
+	 on_load/0, on_load/1,
+	 info/0,
+         command/1
+        ]).
+
+-export([
+         gethostname/0,
+         getnameinfo/2,
+         getaddrinfo/2,
+
+         if_name2index/1,
+         if_index2name/1,
+         if_names/0
+        ]).
+
+-export_type([
+              address_info/0,
+              name_info/0,
+
+              name_info_flags/0,
+              name_info_flag/0,
+              name_info_flag_ext/0,
+
+              network_interface_name/0,
+              network_interface_index/0
+             ]).
+
+
+-type name_info_flags()         :: [name_info_flag()|name_info_flag_ext()].
+-type name_info_flag()          :: namereqd |
+                                   dgram |
+                                   nofqdn |
+                                   numerichost |
+                                   nomericserv.
+-type name_info_flag_ext()      :: idn |
+                                   idna_allow_unassigned |
+                                   idna_use_std3_ascii_rules.
+-type name_info()               :: #{host    := string(),
+                                     service := string()}.
+-type address_info()            :: #{family   := socket:domain(),
+                                     socktype := socket:type(),
+                                     protocol := socket:protocol(),
+                                     address  := socket:sockaddr()}.
+-type network_interface_name()  :: string().
+-type network_interface_index() :: non_neg_integer().
+
+
+%% ===========================================================================
+%%
+%% Administrative and utility API
+%%
+%% ===========================================================================
+
+-spec on_load() -> ok.
+
+%% Should we require that the Extra arg is a map?
+on_load() ->
+    on_load(#{}).
+
+-spec on_load(Extra) -> ok when
+      Extra :: map().
+
+on_load(Extra) ->
+    ok = erlang:load_nif(atom_to_list(net), Extra).
+
+
+-spec info() -> list().
+
+info() ->
+    nif_info().
+
+
+-spec command(Cmd :: term()) -> term().
+
+command(Cmd) ->
+    nif_command(Cmd).
+
+
+
+%% ===========================================================================
+%%
+%% The proper net API
+%%
+%% ===========================================================================
+
+%% ===========================================================================
+%%
+%% gethostname - Get the name of the current host.
+%%
+%%
+
+-spec gethostname() -> {ok, HostName} | {error, Reason} when
+      HostName :: string(),
+      Reason   :: term().
+
+gethostname() ->
+    nif_gethostname().
+
+
+%% ===========================================================================
+%%
+%% getnameinfo - Address-to-name translation in protocol-independent manner.
+%%
+%%
+
+-spec getnameinfo(SockAddr, Flags) -> {ok, Info} | {error, Reason} when
+      SockAddr :: socket:sockaddr(),
+      Flags    :: name_info_flags() | undefined,
+      Info     :: name_info(),
+      Reason   :: term().
+
+getnameinfo(SockAddr, [] = _Flags) ->
+    getnameinfo(SockAddr, undefined);
+getnameinfo(#{family := Fam, addr := _Addr} = SockAddr, Flags)
+  when ((Fam =:= inet) orelse (Fam =:= inet6)) andalso 
+       (is_list(Flags) orelse (Flags =:= undefined)) ->
+    nif_getnameinfo(socket:ensure_sockaddr(SockAddr), Flags);
+getnameinfo(#{family := Fam, path := _Path} = SockAddr, Flags)
+  when (Fam =:= local) andalso (is_list(Flags) orelse (Flags =:= undefined)) ->
+    nif_getnameinfo(SockAddr, Flags).
+
+
+%% ===========================================================================
+%%
+%% getaddrinfo - Network address and service translation
+%%
+%% There is also a "hint" argument that we "at some point" should implement.
+
+-spec getaddrinfo(Host, undefined) -> {ok, Info} | {error, Reason} when
+      Host    :: string(),
+      Info    :: [address_info()],
+      Reason  :: term()
+                 ; (undefined, Service) -> {ok, Info} | {error, Reason} when
+      Service :: string(),
+      Info    :: [address_info()],
+      Reason  :: term()
+                 ; (Host, Service) -> {ok, Info} | {error, Reason} when
+      Host    :: string(),
+      Service :: string(),
+      Info    :: [address_info()],
+      Reason  :: term().
+
+getaddrinfo(Host, Service)
+  when (is_list(Host) orelse (Host =:= undefined)) andalso
+       (is_list(Service) orelse (Service =:= undefined)) andalso
+       (not ((Service =:= undefined) andalso (Host =:= undefined))) ->
+    nif_getaddrinfo(Host, Service, undefined).
+
+
+
+%% ===========================================================================
+%%
+%% if_name2index - Mappings between network interface names and indexes:
+%%                 name -> idx
+%%
+%%
+
+-spec if_name2index(Name) -> {ok, Idx} | {error, Reason} when
+      Name   :: network_interface_name(),
+      Idx    :: network_interface_index(),
+      Reason :: term().
+
+if_name2index(If) when is_list(If) ->
+    nif_if_name2index(If).
+
+
+
+%% ===========================================================================
+%%
+%% if_index2name - Mappings between network interface index and names:
+%%                 idx -> name
+%%
+%%
+
+-spec if_index2name(Idx) -> {ok, Name} | {error, Reason} when
+      Idx    :: network_interface_index(),
+      Name   :: network_interface_name(),
+      Reason :: term().
+
+if_index2name(Idx) when is_integer(Idx) ->
+    nif_if_index2name(Idx).
+
+
+
+%% ===========================================================================
+%%
+%% if_names - Get network interface names and indexes
+%%
+%%
+
+-spec if_names() -> Names | {error, Reason} when
+      Names  :: [{Idx, If}],
+      Idx    :: network_interface_index(),
+      If     :: network_interface_name(),
+      Reason :: term().
+
+if_names() ->
+    nif_if_names().
+
+
+
+%% ===========================================================================
+%%
+%% Misc utility functions
+%%
+%% ===========================================================================
+
+%% formated_timestamp() ->
+%%     format_timestamp(os:timestamp()).
+
+%% format_timestamp(Now) ->
+%%     N2T = fun(N) -> calendar:now_to_local_time(N) end,
+%%     format_timestamp(Now, N2T, true).
+
+%% format_timestamp({_N1, _N2, N3} = N, N2T, true) ->
+%%     FormatExtra = ".~.2.0w",
+%%     ArgsExtra   = [N3 div 10000],
+%%     format_timestamp(N, N2T, FormatExtra, ArgsExtra);
+%% format_timestamp({_N1, _N2, _N3} = N, N2T, false) ->
+%%     FormatExtra = "",
+%%     ArgsExtra   = [],
+%%     format_timestamp(N, N2T, FormatExtra, ArgsExtra).
+
+%% format_timestamp(N, N2T, FormatExtra, ArgsExtra) ->
+%%     {Date, Time}   = N2T(N),
+%%     {YYYY,MM,DD}   = Date,
+%%     {Hour,Min,Sec} = Time,
+%%     FormatDate =
+%%         io_lib:format("~.4w-~.2.0w-~.2.0w ~.2.0w:~.2.0w:~.2.0w" ++ FormatExtra,
+%%                       [YYYY, MM, DD, Hour, Min, Sec] ++ ArgsExtra),
+%%     lists:flatten(FormatDate).
+
+
+%% ===========================================================================
+%%
+%% The actual NIF-functions.
+%%
+%% ===========================================================================
+
+nif_info() ->
+    erlang:nif_error(undef).
+
+nif_command(_Cmd) ->
+    erlang:nif_error(undef).
+
+nif_gethostname() ->
+    erlang:nif_error(undef).
+
+nif_getnameinfo(_Addr, _Flags) ->
+    erlang:nif_error(undef).
+
+nif_getaddrinfo(_Host, _Service, _Hints) ->
+    erlang:nif_error(undef).
+
+nif_if_name2index(_Name) ->
+    erlang:nif_error(undef).
+
+nif_if_index2name(_Id) ->
+    erlang:nif_error(undef).
+
+nif_if_names() ->
+    erlang:nif_error(undef).
+
diff --git a/erts/preloaded/src/socket.erl b/erts/preloaded/src/socket.erl
new file mode 100644
index 0000000000..07e720c44d
--- /dev/null
+++ b/erts/preloaded/src/socket.erl
@@ -0,0 +1,3989 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018-2019. 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(socket).
+
+-compile(no_native).
+-compile({no_auto_import,[error/1]}).
+
+%% Administrative and "global" utility functions
+-export([
+	 on_load/0, on_load/1,
+
+         ensure_sockaddr/1,
+
+         debug/1,
+         %% command/1,
+	 info/0, info/1,
+         supports/0, supports/1, supports/2, supports/3
+        ]).
+
+-export([
+         open/2, open/3, open/4,
+         bind/2, bind/3,
+         connect/2, connect/3,
+         listen/1, listen/2,
+         accept/1, accept/2,
+
+         send/2, send/3, send/4,
+         sendto/3, sendto/4, sendto/5,
+         sendmsg/2, sendmsg/3, sendmsg/4,
+
+         recv/1, recv/2, recv/3, recv/4,
+         recvfrom/1, recvfrom/2, recvfrom/3, recvfrom/4,
+         recvmsg/1, recvmsg/2, recvmsg/3, recvmsg/5,
+
+         close/1,
+         shutdown/2,
+
+         setopt/4,
+         getopt/3,
+
+         sockname/1,
+         peername/1,
+
+         cancel/2
+        ]).
+
+-export_type([
+              select_tag/0,
+              select_ref/0,
+              select_info/0,
+
+              socket_counters/0,
+              socket_counter/0,
+              socket_info/0,
+
+              %% command/0,
+
+              domain/0,
+              type/0,
+              protocol/0,
+              socket/0,
+
+              port_number/0,
+              ip_address/0,
+              ip4_address/0,
+              ip6_address/0,
+              sockaddr/0,
+              sockaddr_in4/0,
+              sockaddr_in6/0,
+              sockaddr_un/0,
+
+              accept_flags/0,
+              accept_flag/0,
+
+              send_flags/0,
+              send_flag/0,
+
+              recv_flags/0,
+              recv_flag/0,
+
+              shutdown_how/0,
+
+              sockopt_level/0,
+              otp_socket_option/0,
+              socket_option/0,
+              ip_socket_option/0,
+              ipv6_socket_option/0,
+              tcp_socket_option/0,
+              udp_socket_option/0,
+              sctp_socket_option/0,
+              raw_socket_option/0,
+
+              timeval/0,
+              ip_tos/0,
+              ip_mreq/0,
+              ip_mreq_source/0,
+              ip_pmtudisc/0,
+              ip_msfilter_mode/0,
+              ip_msfilter/0,
+              ip_pktinfo/0,
+              ipv6_mreq/0,
+              ipv6_pmtudisc/0,
+              ipv6_pktinfo/0,
+              in6_flow_info/0,
+              in6_scope_id/0,
+              sctp_assoc_id/0,
+              sctp_sndrcvinfo/0,
+              sctp_event_subscribe/0,
+              sctp_assocparams/0,
+              sctp_initmsg/0,
+              sctp_rtoinfo/0,
+
+
+              msghdr_flag/0,
+              msghdr_flags/0,
+              msghdr/0,
+              cmsghdr_level/0,
+              cmsghdr_type/0,
+              %% cmsghdr_data/0,
+              cmsghdr_recv/0, cmsghdr_send/0,
+
+              uint8/0,
+              uint16/0,
+              uint20/0,
+              uint32/0,
+              int32/0
+             ]).
+
+
+%% The command type has the general form: 
+%% #{
+%%   command := atom(),
+%%   data    := term()
+%%  }
+%% But only certain values are actually valid, so the type gets the form:
+-type debug_command() :: #{
+                           command := debug,
+                           data    := boolean()
+                          }.
+%% -type command() :: debug_command().
+
+-type socket_counters() :: [{socket_counter(), non_neg_integer()}].
+-type socket_counter()  :: read_byte | read_fails | read_pkg | read_tries |
+                           read_waits | write_byte | write_fails | write_pkg |
+                           write_tries | write_waits.
+-type socket_info() :: #{counters      := socket_counters(),
+                         num_readers   := non_neg_integer(),
+                         num_writers   := non_neg_integer(),
+                         num_acceptors := non_neg_integer()}.
+
+-type uint8()  :: 0..16#FF.
+-type uint16() :: 0..16#FFFF.
+-type uint20() :: 0..16#FFFFF.
+-type uint32() :: 0..16#FFFFFFFF.
+-type int32()  :: -2147483648..2147483647.
+
+
+%% We support only a subset of all domains.
+-type domain() :: local | inet | inet6.
+
+%% We support only a subset of all types.
+%% RDM - Reliably Delivered Messages
+-type type()   :: stream | dgram | raw | rdm | seqpacket.
+
+%% We support only a subset of all protocols:
+%% Note that the '{raw, integer()}' construct is intended
+%% to be used with type = raw.
+%% Note also that only the "superuser" can create a raw socket.
+-type protocol() :: ip | tcp | udp | sctp | icmp | igmp | {raw, integer()}.
+
+-type port_number() :: 0..65535.
+
+-type ip_address() :: ip4_address() | ip6_address().
+
+-type ip4_address() :: {0..255, 0..255, 0..255, 0..255}.
+
+-type in6_flow_info() :: uint20().
+-type in6_scope_id()  :: uint32().
+
+-type ip6_address() ::
+           {0..65535,
+            0..65535,
+            0..65535,
+            0..65535,
+            0..65535,
+            0..65535,
+            0..65535,
+            0..65535}.
+
+-type timeval() :: #{sec  := integer(),
+                     usec := integer()}.
+
+-type ip_pktinfo() :: #{
+                        ifindex  := non_neg_integer(), % Interface Index
+                        spec_dst := ip4_address(),     % Local Address
+                        addr     := ip4_address()      % Header Destination address
+                       }.
+
+%% If the integer value is used, its up to the caller to ensure its valid!
+-type ip_tos() :: lowdeley |
+                  throughput |
+                  reliability |
+                  mincost |
+                  integer().
+
+%% This type is used when requesting to become member of a multicast
+%% group with a call to setopt. Example: 
+%%
+%%     socket:setopt(Socket, ip, add_membership, #{multiaddr => Addr,
+%%                                                 interface => any}).
+%%
+%% Its also used when removing from a multicast group. Example:
+%%
+%%     socket:setopt(Socket, ip, drop_membership, #{multiaddr => Addr,
+%%                                                  interface => any}).
+%%
+
+-type ip_mreq() :: #{multiaddr := ip4_address(),
+                     interface := any | ip4_address()}.
+%% -type ip_mreqn() :: #{multiaddr := ip4_address(),
+%%                       address   := any | ip4_address(),
+%%                       ifindex   := integer()}.
+
+-type ip_mreq_source() :: #{multiaddr  := ip4_address(),
+                            interface  := ip4_address(),
+                            sourceaddr := ip4_address()}.
+
+-type ip_pmtudisc() :: want | dont | do | probe.
+
+%% multiaddr: Multicast group address
+%% interface: Address of local interface
+%% mode:      Filter mode
+%% slist:     List of source addresses
+-type ip_msfilter_mode() :: include | exclude.
+
+-type ip_msfilter() :: #{multiaddr := ip4_address(),
+                         interface := ip4_address(),
+                         mode      := ip_msfilter_mode(),
+                         slist     := [ip4_address()]}.
+
+-type ipv6_mreq() :: #{multiaddr := ip6_address(),
+                       interface := non_neg_integer()}.
+
+-type ipv6_pmtudisc() :: ip_pmtudisc().
+
+-type ipv6_pktinfo() :: #{
+                          addr    := ip6_address(),
+                          ifindex := integer()
+                         }.
+
+
+-type sctp_assoc_id() :: int32().
+-type sctp_sndrcvinfo() :: #{
+                             stream     := uint16(),
+                             ssn        := uint16(),
+                             flags      := uint16(),
+                             ppid       := uint16(),
+                             context    := uint16(),
+                             timetolive := uint16(),
+                             tsn        := uint16(),
+                             cumtsn     := uint16(),
+                             assoc_id   := sctp_assoc_id()
+                            }.
+
+-type sctp_event_subscribe() :: #{data_in          := boolean(),
+                                  association      := boolean(),
+                                  address          := boolean(),
+                                  send_failure     := boolean(),
+                                  peer_error       := boolean(),
+                                  shutdown         := boolean(),
+                                  partial_delivery := boolean(),
+                                  adaptation_layer := boolean(),
+                                  authentication   := boolean(),
+                                  sender_dry       := boolean()}.
+
+-type sctp_assocparams() :: #{assoc_id       := sctp_assoc_id(),
+                              max_rxt        := uint16(),
+                              num_peer_dests := uint16(),
+                              peer_rwnd      := uint32(),
+                              local_rwnd     := uint32(),
+                              cookie_life    := uint32()}.
+
+-type sctp_initmsg() :: #{num_outstreams := uint16(),
+                          max_instreams  := uint16(),
+                          max_attempts   := uint16(),
+                          max_init_timeo := uint16()
+                         }.
+
+-type sctp_rtoinfo() :: #{assoc_id := sctp_assoc_id(),
+                          initial  := uint32(),
+                          max      := uint32(),
+                          min      := uint32()}.
+
+-type sockaddr_un()  :: #{family := local,
+                          path   := binary() | string()}.
+-type sockaddr_in4() :: #{family := inet,
+                          port   := port_number(),
+			  %% The 'broadcast' here is the "limited broadcast"
+                          addr   := any | broadcast | loopback | ip4_address()}.
+-type sockaddr_in6() :: #{family   := inet6,
+                          port     := port_number(),
+                          addr     := any | loopback | ip6_address(),
+                          flowinfo := in6_flow_info(),
+                          scope_id := in6_scope_id()}.
+-type sockaddr() :: sockaddr_in4() |
+                    sockaddr_in6() |
+                    sockaddr_un().
+
+-define(SOCKADDR_IN4_DEFAULTS(A), #{port => 0,
+                                    addr => A}).
+-define(SOCKADDR_IN4_DEFAULTS,    ?SOCKADDR_IN4_DEFAULTS(any)).
+-define(SOCKADDR_IN4_DEFAULT(A),  (?SOCKADDR_IN4_DEFAULTS(A))#{family => inet}).
+-define(SOCKADDR_IN6_DEFAULTS(A), #{port     => 0,
+                                    addr     => A,
+                                    flowinfo => 0, 
+                                    scope_id => 0}).
+-define(SOCKADDR_IN6_DEFAULTS,    ?SOCKADDR_IN6_DEFAULTS(any)).
+-define(SOCKADDR_IN6_DEFAULT(A),  (?SOCKADDR_IN6_DEFAULTS(A))#{family => inet6}).
+
+%% otp    - This option is internal to our (OTP) implementation.
+%% socket - The socket layer (SOL_SOCKET).
+%% ip     - The IP layer (SOL_IP or is it IPPROTO_IP?).
+%% ipv6   - The IPv6 layer (SOL_IPV6).
+%% tcp    - The TCP (Transport Control Protocol) layer (IPPROTO_TCP).
+%% udp    - The UDP (User Datagram Protocol) layer (IPPROTO_UDP).
+%% sctp   - The SCTP (Stream Control Transmission Protocol) layer (IPPROTO_SCTP).
+%% Int    - Raw level, sent down and used "as is".
+%%          Its up to the caller to make sure this is correct!
+-type sockopt_level() :: otp |
+                         socket |
+                         ip | ipv6 | tcp | udp | sctp |
+                         non_neg_integer().
+
+%% There are some options that are 'read-only'.
+%% Should those be included here or in a special list?
+%% Should we just document it and leave it to the user?
+%% Or catch it in the encode functions?
+%% A setopt for a readonly option leads to einval?
+%% Do we really need a sndbuf?
+
+-type otp_socket_option() :: debug |
+                             iow |
+                             controlling_process |
+                             rcvbuf | % sndbuf |
+                             rcvctrlbuf |
+                             sndctrlbuf |
+                             fd.
+%% Shall we have special treatment of linger??
+%% read-only options:
+%% domain | protocol | type.
+%% FreeBSD (only?): acceptfilter
+-type socket_option() :: acceptconn |
+                         acceptfilter |
+                         bindtodevice |
+                         broadcast |
+                         busy_poll |
+                         debug |
+                         domain |
+                         dontroute |
+                         error |
+                         keepalive |
+                         linger |
+                         mark |
+                         oobinline |
+                         passcred |
+                         peek_off |
+                         peekcred |
+                         priority |
+                         protocol |
+                         rcvbuf |
+                         rcvbufforce |
+                         rcvlowat |
+                         rcvtimeo |
+                         reuseaddr |
+                         reuseport |
+                         rxq_ovfl |
+                         setfib |
+                         sndbuf |
+                         sndbufforce |
+                         sndlowat |
+                         sndtimeo |
+                         timestamp |
+                         type.
+
+%% Read-only options:
+%% mtu
+%%
+%% Options only valid on FreeBSD?:
+%% dontfrag
+%% Options only valid for RAW sockets:
+%% nodefrag (linux only?)
+-type ip_socket_option() :: add_membership |
+                            add_source_membership |
+                            block_source |
+                            dontfrag |
+                            drop_membership |
+                            drop_source_membership |
+                            freebind |
+                            hdrincl |
+                            minttl |
+                            msfilter |
+                            mtu |
+                            mtu_discover |
+                            multicast_all |
+                            multicast_if |
+                            multicast_loop |
+                            multicast_ttl |
+                            nodefrag |
+                            options |
+                            pktinfo |
+                            recverr |
+                            recvif |
+                            recvdstaddr |
+                            recvopts |
+                            recvorigdstaddr |
+                            recvtos |
+                            recvttl |
+                            retopts |
+                            router_alert |
+                            sndsrcaddr |
+                            tos |
+                            transparent |
+                            ttl |
+                            unblock_source.
+-type ipv6_socket_option() ::
+        addrform |
+        add_membership |
+        authhdr |
+        auth_level |
+        checksum |
+        drop_membership |
+        dstopts |
+        esp_trans_level |
+        esp_network_level |
+        faith |
+        flowinfo |
+        hoplimit |
+        hopopts |
+        ipcomp_level |
+        join_group |
+        leave_group |
+        mtu |
+        mtu_discover |
+        multicast_hops |
+        multicast_if |
+        multicast_loop |
+        portrange |
+        pktoptions |
+        recverr |
+        recvpktinfo | pktinfo |
+        recvtclass |
+        router_alert |
+        rthdr |
+        tclass |
+        unicast_hops |
+        use_min_mtu |
+        v6only.
+
+-type tcp_socket_option()  :: congestion |
+                              cork |
+                              info |
+                              keepcnt |
+                              keepidle |
+                              keepintvl |
+                              maxseg |
+                              md5sig |
+                              nodelay |
+                              noopt |
+                              nopush |
+                              syncnt |
+                              user_timeout.
+
+-type udp_socket_option() :: cork.
+
+-type sctp_socket_option() ::
+        adaption_layer |
+        associnfo |
+        auth_active_key |
+        auth_asconf |
+        auth_chunk |
+        auth_key |
+        auth_delete_key |
+        autoclose |
+        context |
+        default_send_params |
+        delayed_ack_time |
+        disable_fragments |
+        hmac_ident |
+        events |
+        explicit_eor |
+        fragment_interleave |
+        get_peer_addr_info |
+        initmsg |
+        i_want_mapped_v4_addr |
+        local_auth_chunks |
+        maxseg |
+        maxburst |
+        nodelay |
+        partial_delivery_point |
+        peer_addr_params |
+        peer_auth_chunks |
+        primary_addr |
+        reset_streams |
+        rtoinfo |
+        set_peer_primary_addr |
+        status |
+        use_ext_recvinfo.
+
+-type raw_socket_option() :: filter.
+
+%% -type plain_socket_option()  :: integer().
+%% -type sockopt() :: otp_socket_option() |
+%%                    socket_option() |
+%%                    ip_socket_option() |
+%%                    ipv6_socket_option() |
+%%                    tcp_socket_option() |
+%%                    udp_socket_option() |
+%%                    sctp_socket_option() |
+%%                    raw_socket_option() |
+%%                    plain_socket_option().
+
+-record(socket, {ref :: reference()}).
+
+-opaque socket() :: #socket{}.
+
+-type accept_flags() :: [accept_flag()].
+-type accept_flag()  :: nonblock | cloexec.
+
+-type send_flags() :: [send_flag()].
+-type send_flag()  :: confirm |
+                      dontroute |
+                      eor |
+                      more |
+                      nosignal |
+                      oob.
+
+%% Extend with OWN flags for other usage:
+%%   - adapt-buffer-sz:
+%%     This will have the effect that the nif recvfrom will use
+%%     MSG_PEEK to ensure no part of the message is lost, but if
+%%     necessary adapt (increase) the buffer size until all of
+%%     it fits.
+%%
+%% Note that not all of these flags are useful for every recv function!
+%%
+-type recv_flags() :: [recv_flag()].
+-type recv_flag()  :: cmsg_cloexec |
+                      errqueue |
+                      oob |
+                      peek |
+                      trunc.
+
+-type shutdown_how() :: read | write | read_write.
+
+-type msghdr_flag()  :: ctrunc | eor | errqueue | oob | trunc.
+-type msghdr_flags() :: [msghdr_flag()].
+-type msghdr() :: #{
+                    %% *Optional* target address
+                    %% Used on an unconnected socket to specify the 
+                    %% target address for a datagram.
+                    addr  := sockaddr(),
+                    
+                    iov   := [binary()],
+
+                    %% The maximum size of the control buffer is platform
+                    %% specific. It is the users responsibility to ensure 
+                    %% that its not exceeded.
+                    ctrl  := [cmsghdr_recv()] | [cmsghdr_send()],
+
+                    %% Only valid with recvmsg
+                    flags := msghdr_flags()
+                   }.
+%% We are able to (completely) decode *some* control message headers.
+%% Even if we are able to decode both level and type, we may not be
+%% able to decode the data, in which case it will be a binary.
+
+-type cmsghdr_level() :: socket | ip | ipv6 | integer().
+-type cmsghdr_type()  :: timestamp |
+                         pktinfo |
+                         tos |
+                         ttl |
+                         rights |
+                         credentials |
+                         origdstaddr |
+                         integer().
+-type cmsghdr_recv() :: 
+        #{level := socket,    type := timestamp,   data := timeval()}      |
+        #{level := socket,    type := rights,      data := binary()}       |
+        #{level := socket,    type := credentials, data := binary()}       |
+        #{level := socket,    type := integer(),   data := binary()}       |
+        #{level := ip,        type := tos,         data := ip_tos()}       |
+        #{level := ip,        type := ttl,         data := integer()}      |
+        #{level := ip,        type := pktinfo,     data := ip_pktinfo()}   |
+        #{level := ip,        type := origdstaddr, data := sockaddr_in4()} |
+        #{level := ip,        type := integer(),   data := binary()}       |
+        #{level := ipv6,      type := pktinfo,     data := ipv6_pktinfo()} |
+        #{level := ipv6,      type := integer(),   data := binary()}       |
+        #{level := integer(), type := integer(),   data := binary()}.
+-type cmsghdr_send() :: 
+        #{level := socket,    type := integer(), data := binary()} |
+        #{level := ip,        type := tos,       data := ip_tos()  | binary()} |
+        #{level := ip,        type := ttl,       data := integer() | binary()} |
+        #{level := ip,        type := integer(), data := binary()} |
+        #{level := ipv6,      type := integer(), data := binary()} |
+        #{level := udp,       type := integer(), data := binary()} |
+        #{level := integer(), type := integer(), data := binary()}.
+
+
+-opaque select_tag() :: atom().
+-opaque select_ref() :: reference().
+
+%% -record(select_info, {tag :: select_tag(), ref :: select_ref()}).
+
+-type select_info() :: {select_info, select_tag(), select_ref()}.
+
+-define(SELECT_INFO(T, R), {select_info, T, R}).
+-define(SELECT(T, R),      {select, ?SELECT_INFO(T, R)}).
+
+
+%% This is used in messages sent from the nif-code to erlang processes:
+%%
+%%         {?SOCKET_TAG, Socket :: socket(), Tag :: atom(), Info :: term()}
+%%
+-define(SOCKET_TAG, '$socket').
+
+-define(SOCKET_DOMAIN_LOCAL, 1).
+-define(SOCKET_DOMAIN_UNIX,  ?SOCKET_DOMAIN_LOCAL).
+-define(SOCKET_DOMAIN_INET,  2).
+-define(SOCKET_DOMAIN_INET6, 3).
+
+-define(SOCKET_TYPE_STREAM,    1).
+-define(SOCKET_TYPE_DGRAM,     2).
+-define(SOCKET_TYPE_RAW,       3).
+%% -define(SOCKET_TYPE_RDM,       4).
+-define(SOCKET_TYPE_SEQPACKET, 5).
+
+-define(SOCKET_PROTOCOL_DEFAULT, 0).
+-define(SOCKET_PROTOCOL_IP,      1).
+-define(SOCKET_PROTOCOL_TCP,     2).
+-define(SOCKET_PROTOCOL_UDP,     3).
+-define(SOCKET_PROTOCOL_SCTP,    4).
+-define(SOCKET_PROTOCOL_ICMP,    5).
+-define(SOCKET_PROTOCOL_IGMP,    6).
+
+-define(SOCKET_LISTEN_BACKLOG_DEFAULT, 5).
+
+-define(SOCKET_ACCEPT_TIMEOUT_DEFAULT, infinity).
+
+-define(SOCKET_SEND_FLAG_CONFIRM,    0).
+-define(SOCKET_SEND_FLAG_DONTROUTE,  1).
+-define(SOCKET_SEND_FLAG_EOR,        2).
+-define(SOCKET_SEND_FLAG_MORE,       3).
+-define(SOCKET_SEND_FLAG_NOSIGNAL,   4).
+-define(SOCKET_SEND_FLAG_OOB,        5).
+
+-define(SOCKET_SEND_FLAGS_DEFAULT,      []).
+-define(SOCKET_SEND_TIMEOUT_DEFAULT,    infinity).
+-define(SOCKET_SENDTO_FLAGS_DEFAULT,    []).
+-define(SOCKET_SENDTO_TIMEOUT_DEFAULT,  ?SOCKET_SEND_TIMEOUT_DEFAULT).
+-define(SOCKET_SENDMSG_FLAGS_DEFAULT,   []).
+-define(SOCKET_SENDMSG_TIMEOUT_DEFAULT, ?SOCKET_SEND_TIMEOUT_DEFAULT).
+
+-define(SOCKET_RECV_FLAG_CMSG_CLOEXEC, 0).
+-define(SOCKET_RECV_FLAG_ERRQUEUE,     1).
+-define(SOCKET_RECV_FLAG_OOB,          2).
+-define(SOCKET_RECV_FLAG_PEEK,         3).
+-define(SOCKET_RECV_FLAG_TRUNC,        4).
+
+-define(SOCKET_RECV_FLAGS_DEFAULT,   []).
+-define(SOCKET_RECV_TIMEOUT_DEFAULT, infinity).
+
+-define(SOCKET_OPT_LEVEL_OTP,            0).
+-define(SOCKET_OPT_LEVEL_SOCKET,         1).
+-define(SOCKET_OPT_LEVEL_IP,             2).
+-define(SOCKET_OPT_LEVEL_IPV6,           3).
+-define(SOCKET_OPT_LEVEL_TCP,            4).
+-define(SOCKET_OPT_LEVEL_UDP,            5).
+-define(SOCKET_OPT_LEVEL_SCTP,           6).
+
+%% *** OTP (socket) options
+-define(SOCKET_OPT_OTP_DEBUG,            1).
+-define(SOCKET_OPT_OTP_IOW,              2).
+-define(SOCKET_OPT_OTP_CTRL_PROC,        3).
+-define(SOCKET_OPT_OTP_RCVBUF,           4).
+%%-define(SOCKET_OPT_OTP_SNDBUF,           5).
+-define(SOCKET_OPT_OTP_RCVCTRLBUF,       6).
+-define(SOCKET_OPT_OTP_SNDCTRLBUF,       7).
+-define(SOCKET_OPT_OTP_FD,               8).
+-define(SOCKET_OPT_OTP_DOMAIN,           16#FF01). % INTERNAL
+-define(SOCKET_OPT_OTP_TYPE,             16#FF02). % INTERNAL
+-define(SOCKET_OPT_OTP_PROTOCOL,         16#FF03). % INTERNAL
+
+%% *** SOCKET (socket) options
+-define(SOCKET_OPT_SOCK_ACCEPTCONN,      1).
+%% -define(SOCKET_OPT_SOCK_ACCEPTFILTER,    2). % FreeBSD
+-define(SOCKET_OPT_SOCK_BINDTODEVICE,    3).
+-define(SOCKET_OPT_SOCK_BROADCAST,       4).
+%% -define(SOCKET_OPT_SOCK_BUSY_POLL,       5).
+-define(SOCKET_OPT_SOCK_DEBUG,           6).
+-define(SOCKET_OPT_SOCK_DOMAIN,          7).
+-define(SOCKET_OPT_SOCK_DONTROUTE,       8).
+%% -define(SOCKET_OPT_SOCK_ERROR,           9).
+-define(SOCKET_OPT_SOCK_KEEPALIVE,      10).
+-define(SOCKET_OPT_SOCK_LINGER,         11).
+%% -define(SOCKET_OPT_SOCK_MARK,           12).
+-define(SOCKET_OPT_SOCK_OOBINLINE,      13).
+%% -define(SOCKET_OPT_SOCK_PASSCRED,       14).
+-define(SOCKET_OPT_SOCK_PEEK_OFF,       15).
+%% -define(SOCKET_OPT_SOCK_PEEKCRED,       16).
+-define(SOCKET_OPT_SOCK_PRIORITY,       17).
+-define(SOCKET_OPT_SOCK_PROTOCOL,       18).
+-define(SOCKET_OPT_SOCK_RCVBUF,         19).
+%% -define(SOCKET_OPT_SOCK_RCVBUFFORCE,    20).
+-define(SOCKET_OPT_SOCK_RCVLOWAT,       21).
+-define(SOCKET_OPT_SOCK_RCVTIMEO,       22).
+-define(SOCKET_OPT_SOCK_REUSEADDR,      23).
+-define(SOCKET_OPT_SOCK_REUSEPORT,      24).
+%% -define(SOCKET_OPT_SOCK_RXQ_OVFL,       25).
+%% -define(SOCKET_OPT_SOCK_SETFIB,         26). % FreeBSD
+-define(SOCKET_OPT_SOCK_SNDBUF,         27).
+%% -define(SOCKET_OPT_SOCK_SNDBUFFORCE,    28).
+-define(SOCKET_OPT_SOCK_SNDLOWAT,       29).
+-define(SOCKET_OPT_SOCK_SNDTIMEO,       30).
+-define(SOCKET_OPT_SOCK_TIMESTAMP,      31).
+-define(SOCKET_OPT_SOCK_TYPE,           32).
+
+%% *** IP (socket) options
+-define(SOCKET_OPT_IP_ADD_MEMBERSHIP,         1).
+-define(SOCKET_OPT_IP_ADD_SOURCE_MEMBERSHIP,  2).
+-define(SOCKET_OPT_IP_BLOCK_SOURCE,           3).
+%% -define(SOCKET_OPT_IP_DONTFRAG,               4). % FreeBSD
+-define(SOCKET_OPT_IP_DROP_MEMBERSHIP,        5).
+-define(SOCKET_OPT_IP_DROP_SOURCE_MEMBERSHIP, 6).
+-define(SOCKET_OPT_IP_FREEBIND,               7).
+-define(SOCKET_OPT_IP_HDRINCL,                8).
+-define(SOCKET_OPT_IP_MINTTL,                 9).
+-define(SOCKET_OPT_IP_MSFILTER,              10).
+-define(SOCKET_OPT_IP_MTU,                   11).
+-define(SOCKET_OPT_IP_MTU_DISCOVER,          12).
+-define(SOCKET_OPT_IP_MULTICAST_ALL,         13).
+-define(SOCKET_OPT_IP_MULTICAST_IF,          14).
+-define(SOCKET_OPT_IP_MULTICAST_LOOP,        15).
+-define(SOCKET_OPT_IP_MULTICAST_TTL,         16).
+-define(SOCKET_OPT_IP_NODEFRAG,              17).
+%% -define(SOCKET_OPT_IP_OPTIONS,               18). % FreeBSD
+-define(SOCKET_OPT_IP_PKTINFO,               19).
+-define(SOCKET_OPT_IP_RECVDSTADDR,           20). % FreeBSD
+-define(SOCKET_OPT_IP_RECVERR,               21).
+-define(SOCKET_OPT_IP_RECVIF,                22).
+-define(SOCKET_OPT_IP_RECVOPTS,              23).
+-define(SOCKET_OPT_IP_RECVORIGDSTADDR,       24).
+-define(SOCKET_OPT_IP_RECVTOS,               25).
+-define(SOCKET_OPT_IP_RECVTTL,               26).
+-define(SOCKET_OPT_IP_RETOPTS,               27).
+-define(SOCKET_OPT_IP_ROUTER_ALERT,          28).
+-define(SOCKET_OPT_IP_SENDSRCADDR,           29). % FreeBSD
+-define(SOCKET_OPT_IP_TOS,                   30).
+-define(SOCKET_OPT_IP_TRANSPARENT,           31).
+-define(SOCKET_OPT_IP_TTL,                   32).
+-define(SOCKET_OPT_IP_UNBLOCK_SOURCE,        33).
+
+%% *** IPv6 (socket) options
+-define(SOCKET_OPT_IPV6_ADDRFORM,           1).
+-define(SOCKET_OPT_IPV6_ADD_MEMBERSHIP,     2).
+-define(SOCKET_OPT_IPV6_AUTHHDR,            3). % Obsolete?
+%% -define(SOCKET_OPT_IPV6_AUTH_LEVEL,         4). % FreeBSD
+%% -define(SOCKET_OPT_IPV6_CHECKSUM,           5). % FreeBSD
+-define(SOCKET_OPT_IPV6_DROP_MEMBERSHIP,    6).
+-define(SOCKET_OPT_IPV6_DSTOPTS,            7).
+%% -define(SOCKET_OPT_IPV6_ESP_NETWORK_LEVEL,  8). % FreeBSD
+%% -define(SOCKET_OPT_IPV6_ESP_TRANS_LEVEL,    9). % FreeBSD
+%% -define(SOCKET_OPT_IPV6_FAITH,             10). % FreeBSD
+-define(SOCKET_OPT_IPV6_FLOWINFO,          11).
+-define(SOCKET_OPT_IPV6_HOPLIMIT,          12).
+-define(SOCKET_OPT_IPV6_HOPOPTS,           13).
+%% -define(SOCKET_OPT_IPV6_IPCOMP_LEVEL,      14). % FreeBSD
+%% -define(SOCKET_OPT_IPV6_JOIN_GROUP,        15). % FreeBSD
+%% -define(SOCKET_OPT_IPV6_LEAVE_GROUP,       16). % FreeBSD
+-define(SOCKET_OPT_IPV6_MTU,               17).
+-define(SOCKET_OPT_IPV6_MTU_DISCOVER,      18).
+-define(SOCKET_OPT_IPV6_MULTICAST_HOPS,    19).
+-define(SOCKET_OPT_IPV6_MULTICAST_IF,      20).
+-define(SOCKET_OPT_IPV6_MULTICAST_LOOP,    21).
+%% -define(SOCKET_OPT_IPV6_PORTRANGE,         22). % FreeBSD
+%% -define(SOCKET_OPT_IPV6_PKTOPTIONS,        23). % FreeBSD
+-define(SOCKET_OPT_IPV6_RECVERR,           24).
+-define(SOCKET_OPT_IPV6_RECVPKTINFO,       25). % On FreeBSD: PKTINFO
+%% -define(SOCKET_OPT_IPV6_RECVTCLASS,        26).
+-define(SOCKET_OPT_IPV6_ROUTER_ALERT,      27).
+-define(SOCKET_OPT_IPV6_RTHDR,             28).
+%% -define(SOCKET_OPT_IPV6_TCLASS,            29). % FreeBSD
+-define(SOCKET_OPT_IPV6_UNICAST_HOPS,      30).
+%% -define(SOCKET_OPT_IPV6_USE_MIN_MTU,       31). % FreeBSD
+-define(SOCKET_OPT_IPV6_V6ONLY,            32).
+
+%% *** TCP (socket) options
+-define(SOCKET_OPT_TCP_CONGESTION,      1).
+-define(SOCKET_OPT_TCP_CORK,            2).
+%% -define(SOCKET_OPT_TCP_INFO,            3).
+%% -define(SOCKET_OPT_TCP_KEEPCNT,         4).
+%% -define(SOCKET_OPT_TCP_KEEPIDLE,        5).
+%% -define(SOCKET_OPT_TCP_KEEPINTVL,       6).
+-define(SOCKET_OPT_TCP_MAXSEG,          7).
+%% -define(SOCKET_OPT_TCP_MD5SIG,          8).
+-define(SOCKET_OPT_TCP_NODELAY,         9).
+%% -define(SOCKET_OPT_TCP_NOOPT,          10).
+%% -define(SOCKET_OPT_TCP_NOPUSH,         11).
+%% -define(SOCKET_OPT_TCP_SYNCNT,         12).
+%% -define(SOCKET_OPT_TCP_USER_TIMEOUT,   13).
+
+%% *** UDP (socket) options
+-define(SOCKET_OPT_UDP_CORK,            1).
+
+%% *** SCTP (socket) options
+%% -define(SOCKET_OPT_SCTP_ADAPTION_LAYER,          1).
+-define(SOCKET_OPT_SCTP_ASSOCINFO,               2).
+%% -define(SOCKET_OPT_SCTP_AUTH_ACTIVE_KEY,         3).
+%% -define(SOCKET_OPT_SCTP_AUTH_ASCONF,             4).
+%% -define(SOCKET_OPT_SCTP_AUTH_CHUNK,              5).
+%% -define(SOCKET_OPT_SCTP_AUTH_KEY,                6).
+%% -define(SOCKET_OPT_SCTP_AUTH_DELETE_KEY,         7).
+-define(SOCKET_OPT_SCTP_AUTOCLOSE,               8).
+%% -define(SOCKET_OPT_SCTP_CONTEXT,                 9).
+%% -define(SOCKET_OPT_SCTP_DEFAULT_SEND_PARAMS,    10).
+%% -define(SOCKET_OPT_SCTP_DELAYED_ACK_TIME,       11).
+-define(SOCKET_OPT_SCTP_DISABLE_FRAGMENTS,      12).
+%% -define(SOCKET_OPT_SCTP_HMAC_IDENT,             13).
+-define(SOCKET_OPT_SCTP_EVENTS,                 14).
+%% -define(SOCKET_OPT_SCTP_EXPLICIT_EOR,           15).
+%% -define(SOCKET_OPT_SCTP_FRAGMENT_INTERLEAVE,    16).
+%% -define(SOCKET_OPT_SCTP_GET_PEER_ADDR_INFO,     17).
+-define(SOCKET_OPT_SCTP_INITMSG,                18).
+%% -define(SOCKET_OPT_SCTP_I_WANT_MAPPED_V4_ADDR,  19).
+%% -define(SOCKET_OPT_SCTP_LOCAL_AUTH_CHUNKS,      20).
+-define(SOCKET_OPT_SCTP_MAXSEG,                 21).
+%% -define(SOCKET_OPT_SCTP_MAXBURST,               22).
+-define(SOCKET_OPT_SCTP_NODELAY,                23).
+%% -define(SOCKET_OPT_SCTP_PARTIAL_DELIVERY_POINT, 24).
+%% -define(SOCKET_OPT_SCTP_PEER_ADDR_PARAMS,       25).
+%% -define(SOCKET_OPT_SCTP_PEER_AUTH_CHUNKS,       26).
+%% -define(SOCKET_OPT_SCTP_PRIMARY_ADDR,           27).
+%% -define(SOCKET_OPT_SCTP_RESET_STREAMS,          28).
+-define(SOCKET_OPT_SCTP_RTOINFO,                29).
+%% -define(SOCKET_OPT_SCTP_SET_PEER_PRIMARY_ADDR,  30).
+%% -define(SOCKET_OPT_SCTP_STATUS,                 31).
+%% -define(SOCKET_OPT_SCTP_USE_EXT_RECVINFO,       32).
+
+-define(SOCKET_SHUTDOWN_HOW_READ,       0).
+-define(SOCKET_SHUTDOWN_HOW_WRITE,      1).
+-define(SOCKET_SHUTDOWN_HOW_READ_WRITE, 2).
+
+
+-define(SOCKET_SUPPORTS_OPTIONS, 16#0001).
+-define(SOCKET_SUPPORTS_SCTP,    16#0002).
+-define(SOCKET_SUPPORTS_IPV6,    16#0003).
+-define(SOCKET_SUPPORTS_LOCAL,   16#0004).
+
+
+%% ===========================================================================
+%%
+%% Administrative and utility API
+%%
+%% ===========================================================================
+
+-spec on_load() -> ok.
+
+%% Should we require that the Extra arg is a map?
+on_load() ->
+    on_load(#{}).
+
+-spec on_load(Extra) -> ok when
+      Extra :: map().
+
+on_load(Extra) ->
+    ok = erlang:load_nif(atom_to_list(?MODULE), Extra).
+
+
+
+-spec info() -> map().
+
+info() ->
+    nif_info().
+
+
+-spec debug(D) -> ok when
+      D :: boolean().
+
+debug(D) when is_boolean(D) ->
+    command(#{command => debug,
+              data    => D}).
+
+
+-spec command(Command) -> ok when
+      Command :: debug_command().
+
+command(#{command := debug,
+          data    := Dbg} = Command) when is_boolean(Dbg) ->
+    nif_command(Command).
+
+
+
+%% ===========================================================================
+%%
+%% info - Get miscellaneous information about a socket.
+%%
+%% Generates a list of various info about the socket, such as counter values.
+%%
+%% Do *not* call this function often.
+%% 
+%% ===========================================================================
+
+-spec info(Socket) -> socket_info() when
+      Socket :: socket().
+
+info(#socket{ref = SockRef}) ->
+    nif_info(SockRef).
+
+
+
+%% ===========================================================================
+%%
+%% supports - get information about what the platform "supports".
+%%
+%% Generates a list of various info about what the plaform can support. 
+%% The most obvious case is 'options'. 
+%%
+%% Each item in a 'supports'-list will appear only *one* time.
+%% 
+%% ===========================================================================
+
+-type supports_options_socket() :: [{socket_option(),      boolean()}].
+-type supports_options_ip()     :: [{ip_socket_option(),   boolean()}].
+-type supports_options_ipv6()   :: [{ipv6_socket_option(), boolean()}].
+-type supports_options_tcp()    :: [{tcp_socket_option(),  boolean()}].
+-type supports_options_udp()    :: [{udp_socket_option(),  boolean()}].
+-type supports_options_sctp()   :: [{sctp_socket_option(), boolean()}].
+-type supports_options() :: [{socket, supports_options_socket()} |
+                             {ip,     supports_options_ip()}     |
+                             {ipv6,   supports_options_ipv6()}   |
+                             {tcp,    supports_options_tcp()}    |
+                             {udp,    supports_options_udp()}    |
+                             {sctp,   supports_options_sctp()}].
+
+-spec supports() -> [{options, supports_options()} | 
+                     {sctp,    boolean()} |
+                     {ipv6,    boolean()} |
+                     {local,   boolean()}].
+
+supports() ->
+    [{options, supports(options)},
+     {sctp,    supports(sctp)},
+     {ipv6,    supports(ipv6)},
+     {local,   supports(local)}].
+
+
+-dialyzer({nowarn_function, supports/1}).
+-spec supports(options) -> supports_options();
+              (sctp)    -> boolean();
+              (ipv6)    -> boolean();
+              (local)   -> boolean();
+              (Key1)    -> false when
+      Key1 :: term().
+                        
+supports(options) ->
+    nif_supports(?SOCKET_SUPPORTS_OPTIONS);
+supports(sctp) ->
+    nif_supports(?SOCKET_SUPPORTS_SCTP);
+supports(ipv6) ->
+    nif_supports(?SOCKET_SUPPORTS_IPV6);
+supports(local) ->
+    nif_supports(?SOCKET_SUPPORTS_LOCAL);
+supports(_Key1) ->
+    false.
+
+-dialyzer({nowarn_function, supports/2}).
+-spec supports(options, socket) -> supports_options_socket();
+              (options, ip) -> supports_options_ip();
+              (options, ipv6) -> supports_options_ipv6();
+              (options, tcp) -> supports_options_tcp();
+              (options, udp) -> supports_options_udp();
+              (options, sctp) -> supports_options_sctp();
+              (Key1, Key2) -> false when
+      Key1 :: term(),
+      Key2 :: term().
+
+supports(options, Level) ->
+    proplists:get_value(Level, supports(options), false);
+supports(_Key1, _Level) ->
+    false.
+
+
+-dialyzer({nowarn_function, supports/3}).
+-spec supports(options, socket, Opt) -> boolean() when
+      Opt :: socket_option();
+              (options, ip, Opt) -> boolean() when
+      Opt :: ip_socket_option();
+              (options, ipv6, Opt) -> boolean() when
+      Opt :: ipv6_socket_option();
+              (options, tcp, Opt) -> boolean() when
+      Opt :: tcp_socket_option();
+              (options, udp, Opt) -> boolean() when
+      Opt :: udp_socket_option();
+              (options, sctp, Opt) -> boolean() when
+      Opt :: sctp_socket_option();
+              (Key1, Key2, Key3) -> false when
+      Key1 :: term(),
+      Key2 :: term(),
+      Key3 :: term().
+
+supports(options, Level, Opt) ->
+    case supports(options, Level) of
+        S when is_list(S) ->
+            proplists:get_value(Opt, S, false);
+        _ ->
+            false
+    end;
+supports(_Key1, _Key2, _Key3) ->
+    false.
+
+
+
+%% ===========================================================================
+%%
+%% The proper socket API
+%%
+%% ===========================================================================
+
+%% ===========================================================================
+%%
+%% <KOLLA>
+%%
+%% How do we handle the case when an fd has been created (somehow)
+%% and we shall create a socket "from it".
+%% Can we figure out Domain, Type and Protocol from fd?
+%% No we can't: For instance, its not possible to 'get' domain on FreeBSD.
+%% 
+%% Instead, require: open(Domain, Stream, Proto, #{fd => FD}).
+%% The last argument, Extra, is used to provide the fd.
+%% 
+%% </KOLLA>
+%%
+%%
+%% <KOLLA>
+%%
+%% Possibly add a "registry" in the nif, allowing the user processes to 
+%% "register" themselves.
+%% The point of this would be to ensure that these processes are
+%% informed if the socket "terminates". Could possibly be used for
+%% other things? If gen_tcp implements the active feature using
+%% a reader process, the nif may need to know about this process,
+%% since its probably "hidden" from the socket "owner" (someone
+%% needs to handle it if it dies).
+%% Register under a name?
+%%
+%% The nif sets up a monitor to this process, and if it dies the socket
+%% is closed. It is also used if someone wants to monitor the socket.
+%%
+%% We may therefor need monitor function(s): 
+%%
+%%               socket:monitor(Socket)
+%%               socket:demonitor(Socket)
+%%
+%% </KOLLA>
+%%
+
+
+
+%% ===========================================================================
+%%
+%% open - create an endpoint for communication
+%%
+%% Extra: Currently only used for netns
+%%
+
+-spec open(Domain, Type) -> {ok, Socket} | {error, Reason} when
+      Domain   :: domain(),
+      Type     :: type(),
+      Socket   :: socket(),
+      Reason   :: term().
+
+open(Domain, Type) ->
+    open(Domain, Type, default).
+
+-spec open(Domain, Type, Protocol) -> {ok, Socket} | {error, Reason} when
+      Domain   :: domain(),
+      Type     :: type(),
+      Protocol :: default | protocol(),
+      Socket   :: socket(),
+      Reason   :: term().
+
+open(Domain, Type, Protocol) ->
+    open(Domain, Type, Protocol, #{}).
+
+-spec open(Domain, Type, Protocol, Extra) -> {ok, Socket} | {error, Reason} when
+      Domain   :: domain(),
+      Type     :: type(),
+      Protocol :: default | protocol(),
+      Extra    :: map(),
+      Socket   :: socket(),
+      Reason   :: term().
+
+open(Domain, Type, Protocol, Extra) when is_map(Extra) ->
+    try
+        begin
+            EDomain   = enc_domain(Domain),
+            EType     = enc_type(Domain, Type),
+            EProtocol = enc_protocol(Type, Protocol),
+            case nif_open(EDomain, EType, EProtocol, Extra) of
+                {ok, SockRef} ->
+                    Socket = #socket{ref = SockRef},
+                    {ok, Socket};
+                {error, _} = ERROR ->
+                    ERROR
+            end
+        end
+    catch
+        throw:T ->
+            T;
+        %% <WIN32-TEMPORARY>
+        error:notsup:S ->
+            erlang:raise(error, notsup, S);
+        %% </WIN32-TEMPORARY>
+        error:Reason ->
+            {error, Reason}
+    end.
+
+
+
+%% ===========================================================================
+%%
+%% bind - bind a name to a socket
+%%
+%% Note that Addr can only have the value of broadcast *if* Domain =:= inet!
+%%
+
+-spec bind(Socket, Addr) -> ok | {error, Reason} when
+      Socket :: socket(),
+      Addr   :: any | broadcast | loopback | sockaddr(),
+      Reason :: term().
+
+bind(#socket{ref = SockRef}, Addr)
+  when ((Addr =:= any) orelse
+	(Addr =:= broadcast) orelse
+	(Addr =:= loopback)) ->
+    try which_domain(SockRef) of
+        inet ->
+            nif_bind(SockRef, ?SOCKADDR_IN4_DEFAULT(Addr));
+        inet6 when (Addr =:= any) orelse (Addr =:= loopback) ->
+            nif_bind(SockRef, ?SOCKADDR_IN6_DEFAULT(Addr));
+	_ ->
+	    einval()
+    catch
+        %% <WIN32-TEMPORARY>
+        error:notsup:S ->
+            erlang:raise(error, notsup, S);
+        %% </WIN32-TEMPORARY>
+        throw:ERROR ->
+            ERROR
+    end;
+bind(#socket{ref = SockRef} = _Socket, Addr) when is_map(Addr) ->
+    try
+        begin
+            nif_bind(SockRef, ensure_sockaddr(Addr))
+        end
+    catch
+        %% <WIN32-TEMPORARY>
+        error:notsup:S ->
+            erlang:raise(error, notsup, S);
+        %% </WIN32-TEMPORARY>
+        throw:ERROR ->
+            ERROR
+    end.
+
+
+
+%% ===========================================================================
+%%
+%% bind - Add or remove a bind addresses on a socket
+%%
+%% Calling this function is only valid if the socket is: 
+%%   type     = seqpacket
+%%   protocol = sctp
+%%
+%% If the domain is inet, then all addresses *must* be IPv4.
+%% If the domain is inet6, the addresses can be aither IPv4 or IPv6.
+%%
+
+-spec bind(Socket, Addrs, Action) -> ok | {error, Reason} when
+      Socket :: socket(),
+      Addrs  :: [sockaddr()],
+      Action :: add | remove,
+      Reason :: term().
+
+bind(#socket{ref = SockRef}, Addrs, Action) 
+  when is_list(Addrs) andalso ((Action =:= add) orelse (Action =:= remove)) ->
+    try
+        begin
+            ensure_type(SockRef, seqpacket),
+            ensure_proto(SockRef, sctp),
+            validate_addrs(which_domain(SockRef), Addrs),
+            nif_bind(SockRef, Addrs, Action)
+        end
+    catch
+        %% <WIN32-TEMPORARY>
+        error:notsup:S ->
+            erlang:raise(error, notsup, S);
+        %% </WIN32-TEMPORARY>
+        throw:ERROR ->
+            ERROR
+    end.
+
+ensure_type(SockRef, Type) ->
+    case which_type(SockRef) of
+        Type ->
+            ok;
+        _InvalidType ->
+            einval()
+    end.
+
+ensure_proto(SockRef, Proto) ->
+    case which_protocol(SockRef) of
+        Proto ->
+            ok;
+        _InvalidProto ->
+            einval()
+    end.
+
+validate_addrs(inet = _Domain, Addrs) ->
+    validate_inet_addrs(Addrs);
+validate_addrs(inet6 = _Domain, Addrs) ->
+    validate_inet6_addrs(Addrs).
+
+validate_inet_addrs(Addrs) ->
+    Validator = fun(#{family := inet,
+                      addrs  := Addr}) when is_tuple(Addr) andalso 
+                                            (size(Addr) =:= 4) ->
+                        ok;
+                   (X) ->
+                        throw({error, {invalid_address, X}})
+                end,
+    lists:foreach(Validator, Addrs).
+
+validate_inet6_addrs(Addrs) ->
+    Validator = fun(#{family := inet,
+                      addrs  := Addr}) when is_tuple(Addr) andalso 
+                                            (size(Addr) =:= 4) ->
+                        ok;
+                   (#{family := inet6,
+                      addrs  := Addr}) when is_tuple(Addr) andalso 
+                                            (size(Addr) =:= 8) ->
+                        ok;
+                   (X) ->
+                        throw({error, {invalid_address, X}})
+                end,
+    lists:foreach(Validator, Addrs).
+
+
+%% ===========================================================================
+%%
+%% connect - initiate a connection on a socket
+%%
+
+-spec connect(Socket, SockAddr) -> ok | {error, Reason} when
+    Socket   :: socket(),
+    SockAddr :: sockaddr(),
+    Reason   :: term().
+
+connect(Socket, SockAddr) ->
+    connect(Socket, SockAddr, infinity).
+
+-spec connect(Socket, SockAddr, nowait) ->
+           ok | {select, SelectInfo} | {error, Reason} when
+    Socket     :: socket(),
+    SockAddr   :: sockaddr(),
+    SelectInfo :: select_info(),
+    Reason     :: term()
+        ; (Socket, SockAddr, Timeout) -> ok | {error, Reason} when
+    Socket   :: socket(),
+    SockAddr :: sockaddr(),
+    Timeout  :: timeout(),
+    Reason   :: term().
+
+%% <KOLLA>
+%% Is it possible to connect with family = local for the (dest) sockaddr?
+%% </KOLLA>
+connect(_Socket, _SockAddr, Timeout)
+  when (is_integer(Timeout) andalso (Timeout =< 0)) ->
+    {error, timeout};
+connect(#socket{ref = SockRef}, #{family := Fam} = SockAddr, Timeout)
+  when ((Fam =:= inet) orelse (Fam =:= inet6) orelse (Fam =:= local)) andalso
+       ((Timeout =:= nowait) orelse 
+        (Timeout =:= infinity) orelse is_integer(Timeout)) ->
+    TS = timestamp(Timeout),
+    case nif_connect(SockRef, ensure_sockaddr(SockAddr)) of
+        ok ->
+            %% Connected!
+            ok;
+
+        {ok, Ref} when (Timeout =:= nowait) ->
+            %% Connecting, but the caller does not want to wait...
+            ?SELECT(connect, Ref);
+
+        {ok, Ref} ->
+            %% Connecting...
+	    NewTimeout = next_timeout(TS, Timeout),
+	    receive
+                {?SOCKET_TAG, #socket{ref = SockRef}, select, Ref} -> 
+		    nif_finalize_connection(SockRef)
+	    after NewTimeout ->
+                    cancel(SockRef, connect, Ref),
+		    {error, timeout}
+	    end;
+	{error, _} = ERROR ->
+	    ERROR
+    end.
+
+
+%% ===========================================================================
+%%
+%% listen - listen for connections on a socket
+%%
+
+-spec listen(Socket) -> ok | {error, Reason} when
+      Socket  :: socket(),
+      Reason  :: term().
+
+listen(Socket) ->
+    listen(Socket, ?SOCKET_LISTEN_BACKLOG_DEFAULT).
+
+-spec listen(Socket, Backlog) -> ok | {error, Reason} when
+      Socket  :: socket(),
+      Backlog :: pos_integer(),
+      Reason  :: term().
+
+listen(#socket{ref = SockRef}, Backlog)
+  when (is_integer(Backlog) andalso (Backlog >= 0)) ->
+    nif_listen(SockRef, Backlog).
+
+
+
+
+%% ===========================================================================
+%%
+%% accept, accept4 - accept a connection on a socket
+%%
+
+-spec accept(LSocket) -> {ok, Socket} | {error, Reason} when
+      LSocket :: socket(),
+      Socket  :: socket(),
+      Reason  :: term().
+
+accept(Socket) ->
+    accept(Socket, ?SOCKET_ACCEPT_TIMEOUT_DEFAULT).
+
+-spec accept(LSocket, nowait) -> 
+                    {ok, Socket} |
+                    {select, SelectInfo} |
+                    {error, Reason} when
+      LSocket    :: socket(),
+      Socket     :: socket(),
+      SelectInfo :: select_info(),
+      Reason     :: term()
+                 ; (LSocket, Timeout) -> {ok, Socket} | {error, Reason} when
+      LSocket    :: socket(),
+      Timeout    :: timeout(),
+      Socket     :: socket(),
+      Reason     :: term().
+
+%% Do we really need this optimization?
+accept(_, Timeout) when is_integer(Timeout) andalso (Timeout =< 0) ->
+    {error, timeout};
+accept(#socket{ref = LSockRef}, Timeout)
+  when is_integer(Timeout) orelse
+       (Timeout =:= infinity)  orelse
+       (Timeout =:= nowait) ->
+    do_accept(LSockRef, Timeout).
+
+do_accept(LSockRef, Timeout) ->
+    TS     = timestamp(Timeout),
+    AccRef = make_ref(),
+    case nif_accept(LSockRef, AccRef) of
+        {ok, SockRef} ->
+            Socket = #socket{ref = SockRef},
+            {ok, Socket};
+
+
+        {error, eagain} when (Timeout =:= nowait) ->
+            ?SELECT(accept, AccRef);
+
+
+        {error, eagain} ->
+            %% Each call is non-blocking, but even then it takes
+            %% *some* time, so just to be sure, recalculate before 
+            %% the receive.
+	    NewTimeout = next_timeout(TS, Timeout),
+            receive
+                {?SOCKET_TAG, #socket{ref = LSockRef}, select, AccRef} -> 
+                    do_accept(LSockRef, next_timeout(TS, Timeout));
+
+                {?SOCKET_TAG, _Socket, abort, {AccRef, Reason}} ->
+                    {error, Reason}
+
+            after NewTimeout ->
+                    cancel(LSockRef, accept, AccRef),
+                    {error, timeout}
+            end;
+
+        {error, _} = ERROR ->
+            cancel(LSockRef, accept, AccRef), % Just to be on the safe side...
+            ERROR
+    end.
+
+
+
+%% ===========================================================================
+%%
+%% send, sendto, sendmsg - send a message on a socket
+%%
+
+-spec send(Socket, Data) -> ok | {error, Reason} when
+      Socket  :: socket(),
+      Data    :: iodata(),
+      Reason  :: term().
+
+send(Socket, Data) ->
+    send(Socket, Data, ?SOCKET_SEND_FLAGS_DEFAULT, ?SOCKET_SEND_TIMEOUT_DEFAULT).
+
+-spec send(Socket, Data, Flags) -> ok | {error, Reason} when
+      Socket     :: socket(),
+      Data       :: iodata(),
+      Flags      :: send_flags(),
+      Reason     :: term()
+                 ; (Socket, Data, Timeout :: nowait) -> ok |
+                                             {select, SelectInfo} |
+                                             {ok, {RestData, SelectInfo}} |
+                                             {error, Reason} when
+      Socket     :: socket(),
+      Data       :: iodata(),
+      RestData   :: binary(),
+      SelectInfo :: select_info(),
+      Reason     :: term()
+                 ; (Socket, Data, Timeout) -> ok | {error, Reason} when
+      Socket     :: socket(),
+      Data       :: iodata(),
+      Timeout    :: timeout(),
+      Reason     :: term().
+
+send(Socket, Data, Flags) when is_list(Flags) ->
+    send(Socket, Data, Flags, ?SOCKET_SEND_TIMEOUT_DEFAULT);
+send(Socket, Data, Timeout) ->
+    send(Socket, Data, ?SOCKET_SEND_FLAGS_DEFAULT, Timeout).
+
+-spec send(Socket, Data, Flags, nowait) -> ok |
+                                           {select, SelectInfo} |
+                                           {ok, {RestData, SelectInfo}} |
+                                           {error, Reason} when
+      Socket     :: socket(),
+      Data       :: iodata(),
+      Flags      :: send_flags(),
+      RestData   :: binary(),
+      SelectInfo :: select_info(),
+      Reason     :: term()
+                 ; (Socket, Data, Flags, Timeout) -> ok | {error, Reason} when
+      Socket     :: socket(),
+      Data       :: iodata(),
+      Flags      :: send_flags(),
+      Timeout    :: timeout(),
+      Reason     :: term().
+
+send(Socket, Data, Flags, Timeout) when is_list(Data) ->
+    Bin = erlang:list_to_binary(Data),
+    send(Socket, Bin, Flags, Timeout);
+send(#socket{ref = SockRef}, Data, Flags, Timeout)
+  when is_binary(Data) andalso 
+       is_list(Flags) andalso
+       ((Timeout =:= nowait) orelse
+        (Timeout =:= infinity) orelse
+        (is_integer(Timeout) andalso (Timeout > 0)))  ->
+    EFlags = enc_send_flags(Flags),
+    do_send(SockRef, Data, EFlags, Timeout).
+
+do_send(SockRef, Data, EFlags, Timeout) ->
+    TS      = timestamp(Timeout),
+    SendRef = make_ref(),
+    case nif_send(SockRef, SendRef, Data, EFlags) of
+        ok ->
+            ok;
+
+
+        {ok, Written} when (Timeout =:= nowait) ->
+            <<_:Written/binary, Rest/binary>> = Data,
+	    %% We are partially done, but the user don't want to wait (here) 
+            %% for completion
+            {ok, {Rest, ?SELECT_INFO(send, SendRef)}};
+
+
+        {ok, Written} ->
+	    NewTimeout = next_timeout(TS, Timeout),
+	    %% We are partially done, wait for continuation
+            receive
+                {?SOCKET_TAG, #socket{ref = SockRef}, select, SendRef} 
+                  when (Written > 0) -> 
+                    <<_:Written/binary, Rest/binary>> = Data,
+                    do_send(SockRef, Rest, EFlags,
+                            next_timeout(TS, Timeout));
+
+                {?SOCKET_TAG, #socket{ref = SockRef}, select, SendRef} ->
+                    do_send(SockRef, Data, EFlags,
+                            next_timeout(TS, Timeout));
+
+                {?SOCKET_TAG, _Socket, abort, {SendRef, Reason}} ->
+                    {error, Reason}
+
+            after NewTimeout ->
+                    cancel(SockRef, send, SendRef),
+                    {error, {timeout, size(Data)}}
+            end;
+
+
+        {error, eagain} when (Timeout =:= nowait) ->
+            ?SELECT(send, SendRef);
+
+
+        {error, eagain} ->
+            receive
+                {?SOCKET_TAG, #socket{ref = SockRef}, select, SendRef} ->
+                    do_send(SockRef, Data, EFlags,
+                            next_timeout(TS, Timeout));
+
+                {?SOCKET_TAG, _Socket, abort, {SendRef, Reason}} ->
+                    {error, Reason}
+
+            after Timeout ->
+                    cancel(SockRef, send, SendRef),
+                    {error, {timeout, size(Data)}}
+            end;
+
+        {error, _} = ERROR ->
+            ERROR
+    end.
+
+
+
+
+%% ---------------------------------------------------------------------------
+%%
+
+-spec sendto(Socket, Data, Dest) ->
+                    ok | {error, Reason} when
+      Socket :: socket(),
+      Data   :: binary(),
+      Dest   :: sockaddr(),
+      Reason :: term().
+
+sendto(Socket, Data, Dest) ->
+    sendto(Socket, Data, Dest, ?SOCKET_SENDTO_FLAGS_DEFAULT).
+
+-spec sendto(Socket, Data, Dest, Flags) -> ok | {error, Reason} when
+      Socket    :: socket(),
+      Data      :: binary(),
+      Dest      :: sockaddr(),
+      Flags     :: send_flags(),
+      Reason    :: term()
+                   ; (Socket, Data, Dest, Timeout :: nowait) -> ok |
+                                                  {select, SelectInfo} |
+                                                  {error, Reason} when
+      Socket     :: socket(),
+      Data       :: iodata(),
+      Dest       :: sockaddr(),
+      SelectInfo :: select_info(),
+      Reason     :: term()
+                 ; (Socket, Data, Dest, Timeout) -> ok | {error, Reason} when
+      Socket     :: socket(),
+      Data       :: iodata(),
+      Dest       :: sockaddr(),
+      Timeout    :: timeout(),
+      Reason     :: term().
+
+sendto(Socket, Data, Dest, Flags) when is_list(Flags) ->
+    sendto(Socket, Data, Dest, Flags, ?SOCKET_SENDTO_TIMEOUT_DEFAULT);
+sendto(Socket, Data, Dest, Timeout) ->
+    sendto(Socket, Data, Dest, ?SOCKET_SENDTO_FLAGS_DEFAULT, Timeout).
+
+
+-spec sendto(Socket, Data, Dest, Flags, nowait) -> ok |
+                                                   {select, SelectInfo} |
+                                                   {error, Reason} when
+      Socket     :: socket(),
+      Data       :: binary(),
+      Dest       :: sockaddr(),
+      Flags      :: send_flags(),
+      SelectInfo :: select_info(),
+      Reason     :: term()
+                 ; (Socket, Data, Dest, Flags, Timeout) -> ok | {error, Reason} when
+      Socket     :: socket(),
+      Data       :: binary(),
+      Dest       :: sockaddr(),
+      Flags      :: send_flags(),
+      Timeout    :: timeout(),
+      Reason     :: term().
+
+sendto(Socket, Data, Dest, Flags, Timeout) when is_list(Data) ->
+    Bin = erlang:list_to_binary(Data),
+    sendto(Socket, Bin, Dest, Flags, Timeout);
+sendto(#socket{ref = SockRef}, Data, #{family := Fam} = Dest, Flags, Timeout)
+  when is_binary(Data) andalso
+       ((Fam =:= inet) orelse (Fam =:= inet6) orelse (Fam =:= local)) andalso 
+       is_list(Flags) andalso
+       ((Timeout =:= nowait) orelse
+        (Timeout =:= infinity) orelse
+        (is_integer(Timeout) andalso (Timeout > 0))) ->
+    EFlags = enc_send_flags(Flags),
+    do_sendto(SockRef, Data, ensure_sockaddr(Dest), EFlags, Timeout).
+
+do_sendto(SockRef, Data, Dest, EFlags, Timeout) ->
+    TS      = timestamp(Timeout),
+    SendRef = make_ref(),
+    case nif_sendto(SockRef, SendRef, Data, Dest, EFlags) of
+        ok ->
+            %% We are done
+            ok;
+
+        {ok, Written} when (Timeout =:= nowait) ->
+            <<_:Written/binary, Rest/binary>> = Data,
+            {ok, {Rest, ?SELECT_INFO(sendto, SendRef)}};
+
+
+        {ok, Written} ->
+	    %% We are partially done, wait for continuation
+            receive
+                {?SOCKET_TAG, #socket{ref = SockRef}, select, SendRef} 
+                  when (Written > 0) ->
+                    <<_:Written/binary, Rest/binary>> = Data,
+                    do_sendto(SockRef, Rest, Dest, EFlags,
+                              next_timeout(TS, Timeout));
+
+                {?SOCKET_TAG, #socket{ref = SockRef}, select, SendRef} ->
+                    do_sendto(SockRef, Data, Dest, EFlags,
+                              next_timeout(TS, Timeout));
+
+                {?SOCKET_TAG, _Socket, abort, {SendRef, Reason}} ->
+                    {error, Reason}
+
+            after Timeout ->
+                    cancel(SockRef, sendto, SendRef),
+                    {error, timeout}
+            end;
+
+
+        {error, eagain} when (Timeout =:= nowait) ->
+            ?SELECT(sendto, SendRef);
+
+
+        {error, eagain} ->
+            receive
+                {?SOCKET_TAG, #socket{ref = SockRef}, select, SendRef} ->
+                    do_sendto(SockRef, Data, Dest, EFlags, 
+                              next_timeout(TS, Timeout));
+
+                {?SOCKET_TAG, _Socket, abort, {SendRef, Reason}} ->
+                    {error, Reason}
+
+            after Timeout ->
+                    cancel(SockRef, sendto, SendRef),
+                    {error, timeout}
+            end;
+
+        {error, _} = ERROR ->
+            ERROR
+    end.
+
+
+
+%% ---------------------------------------------------------------------------
+%%
+%% The only part of the msghdr() that *must* exist (a connected
+%% socket need not specify the addr field) is the iov.
+%% The ctrl field is optional, and the addr and flags are not
+%% used when sending.
+%%
+
+-spec sendmsg(Socket, MsgHdr) -> ok | {error, Reason} when
+      Socket  :: socket(),
+      MsgHdr  :: msghdr(),
+      Reason  :: term().
+
+sendmsg(Socket, MsgHdr) ->
+    sendmsg(Socket, MsgHdr,
+            ?SOCKET_SENDMSG_FLAGS_DEFAULT, ?SOCKET_SENDMSG_TIMEOUT_DEFAULT).
+
+
+-spec sendmsg(Socket, MsgHdr, Flags) -> ok | {error, Reason} when
+      Socket  :: socket(),
+      MsgHdr  :: msghdr(),
+      Flags   :: send_flags(),
+      Reason  :: term()
+                 ; (Socket, MsgHdr, Timeout :: nowait) -> ok |
+                                               {select, SelectInfo} |
+                                               {error, Reason} when
+      Socket     :: socket(),
+      MsgHdr     :: msghdr(),
+      SelectInfo :: select_info(),
+      Reason     :: term()
+                 ; (Socket, MsgHdr, Timeout) -> ok | {error, Reason} when
+      Socket     :: socket(),
+      MsgHdr     :: msghdr(),
+      Timeout    :: timeout(),
+      Reason     :: term().
+
+sendmsg(Socket, MsgHdr, Flags) when is_list(Flags) ->
+    sendmsg(Socket, MsgHdr, Flags, ?SOCKET_SENDMSG_TIMEOUT_DEFAULT);
+sendmsg(Socket, MsgHdr, Timeout) 
+  when is_integer(Timeout) orelse (Timeout =:= infinity) ->
+    sendmsg(Socket, MsgHdr, ?SOCKET_SENDMSG_FLAGS_DEFAULT, Timeout).
+
+
+-spec sendmsg(Socket, MsgHdr, Flags, nowait) -> 
+                     ok |
+                     {ok, Remaining} |
+                     {select, SelectInfo} |
+                     {error, Reason} when
+      Socket     :: socket(),
+      MsgHdr     :: msghdr(),
+      Flags      :: send_flags(),
+      Remaining  :: erlang:iovec(),
+      SelectInfo :: select_info(),
+      Reason     :: term()
+                   ; (Socket, MsgHdr, Flags, Timeout) -> 
+                     ok |
+                     {ok, Remaining} |
+                     {error, Reason} when
+      Socket     :: socket(),
+      MsgHdr     :: msghdr(),
+      Flags      :: send_flags(),
+      Timeout    :: timeout(),
+      Remaining  :: erlang:iovec(),
+      Reason     :: term().
+
+sendmsg(#socket{ref = SockRef}, #{iov := IOV} = MsgHdr, Flags, Timeout)
+  when is_list(IOV) andalso 
+       is_list(Flags) andalso
+       ((Timeout =:= nowait) orelse
+        (Timeout =:= infinity) orelse
+        (is_integer(Timeout) andalso (Timeout > 0))) ->
+    try ensure_msghdr(MsgHdr) of
+        M ->
+            EFlags = enc_send_flags(Flags),
+            do_sendmsg(SockRef, M, EFlags, Timeout)
+    catch
+        throw:T ->
+            T;
+        error:Reason ->
+            {error, Reason}
+    end.
+
+do_sendmsg(SockRef, MsgHdr, EFlags, Timeout) ->
+    TS      = timestamp(Timeout),
+    SendRef = make_ref(),
+    case nif_sendmsg(SockRef, SendRef, MsgHdr, EFlags) of
+        ok ->
+            %% We are done
+            ok;
+
+
+        {ok, Written} when is_integer(Written) andalso (Written > 0) ->
+            %% We should not retry here since the protocol may not
+            %% be able to handle a message being split. Leave it to
+            %% the caller to figure out (call again with the rest).
+            %%
+            %% We should really not need to cancel, since this is
+            %% accepted for sendmsg!
+            %%
+            cancel(SockRef, sendmsg, SendRef),
+            {ok, do_sendmsg_rest(maps:get(iov, MsgHdr), Written)};
+
+
+        {error, eagain} when (Timeout =:= nowait) ->
+            ?SELECT(sendmsg, SendRef);
+            
+
+        {error, eagain} ->
+            receive
+                {?SOCKET_TAG, #socket{ref = SockRef}, select, SendRef} ->
+                    do_sendmsg(SockRef, MsgHdr, EFlags, 
+                              next_timeout(TS, Timeout))
+
+            after Timeout ->
+                    cancel(SockRef, sendmsg, SendRef),
+                    {error, timeout}
+            end;
+
+        {error, _} = ERROR ->
+            ERROR
+    end.
+
+do_sendmsg_rest([B|IOVec], Written) when (Written >= size(B)) ->
+    do_sendmsg_rest(IOVec, Written - size(B));
+do_sendmsg_rest([B|IOVec], Written) ->
+    <<_:Written/binary, Rest/binary>> = B,
+    [Rest|IOVec].
+
+ensure_msghdr(#{ctrl := []} = M) ->
+    ensure_msghdr(maps:remove(ctrl, M));
+ensure_msghdr(#{iov := IOV, addr := Addr} = M) 
+  when is_list(IOV) andalso (IOV =/= []) ->
+    M#{iov => erlang:iolist_to_iovec(IOV), addr => ensure_sockaddr(Addr)};
+ensure_msghdr(#{iov := IOV} = M) 
+  when is_list(IOV) andalso (IOV =/= []) ->
+    M#{iov => erlang:iolist_to_iovec(IOV)};
+ensure_msghdr(_) ->
+    einval().
+
+
+
+
+%% ===========================================================================
+%%
+%% recv, recvfrom, recvmsg - receive a message from a socket
+%%
+%% Description:
+%% There is a special case for the argument Length. If its set to zero (0),
+%% it means "give me everything you have".
+%%
+%% Returns: {ok, Binary} | {error, Reason}
+%% Binary  - The received data as a binary
+%% Reason  - The error reason:
+%%              timeout | {timeout, AccData} |
+%%              posix() | {posix(), AccData} |
+%%              atom()  | {atom(), AccData}
+%% AccData - The data (as a binary) that we did manage to receive
+%%           before the timeout.
+%%
+%% Arguments:
+%% Socket  - The socket to read from.
+%% Length  - The number of bytes to read.
+%% Flags   - A list of "options" for the read.
+%% Timeout - Time-out in milliseconds.
+
+-spec recv(Socket) -> {ok, Data} | {error, Reason} when
+      Socket :: socket(),
+      Data   :: binary(),
+      Reason :: term().
+                          
+recv(Socket) ->
+    recv(Socket, 0).
+
+-spec recv(Socket, Length) -> {ok, Data} | {error, Reason} when
+      Socket :: socket(),
+      Length :: non_neg_integer(),
+      Data   :: binary(),
+      Reason :: term().
+
+recv(Socket, Length) ->
+    recv(Socket, Length,
+         ?SOCKET_RECV_FLAGS_DEFAULT,
+         ?SOCKET_RECV_TIMEOUT_DEFAULT).
+
+-spec recv(Socket, Length, Flags) -> {ok, Data} |
+                                     {error, Reason} when
+      Socket :: socket(),
+      Length :: non_neg_integer(),
+      Flags  :: recv_flags(),
+      Data   :: binary(),
+      Reason :: term()
+                ; (Socket, Length, Timeout :: nowait) -> {ok, Data} |
+                                              {select, SelectInfo} |
+                                              {ok, {Data, SelectInfo}} |
+                                              {error, Reason} when
+      Socket     :: socket(),
+      Length     :: non_neg_integer(),
+      Data       :: binary(),
+      SelectInfo :: select_info(),
+      Reason     :: term()
+                 ; (Socket, Length, Timeout) -> {ok, Data} |
+                                                {error, Reason} when
+      Socket  :: socket(),
+      Length  :: non_neg_integer(),
+      Timeout :: timeout(),
+      Data    :: binary(),
+      Reason  :: term().
+
+recv(Socket, Length, Flags) when is_list(Flags) ->
+    recv(Socket, Length, Flags, ?SOCKET_RECV_TIMEOUT_DEFAULT);
+recv(Socket, Length, Timeout) ->
+    recv(Socket, Length, ?SOCKET_RECV_FLAGS_DEFAULT, Timeout).
+
+-spec recv(Socket, Length, Flags, nowait) -> {ok, Data} |
+                                             {select, SelectInfo} |
+                                             {ok, {Data, SelectInfo}} |
+                                             {error, Reason} when
+      Socket     :: socket(),
+      Length     :: non_neg_integer(),
+      Flags      :: recv_flags(),
+      Data       :: binary(),
+      SelectInfo :: select_info(),
+      Reason     :: term()
+                 ; (Socket, Length, Flags, Timeout) -> {ok, Data} |
+                                                       {error, Reason} when
+      Socket     :: socket(),
+      Length     :: non_neg_integer(),
+      Flags      :: recv_flags(),
+      Timeout    :: timeout(),
+      Data       :: binary(),
+      Reason     :: term().
+
+recv(#socket{ref = SockRef}, Length, Flags, Timeout)
+  when (is_integer(Length) andalso (Length >= 0)) andalso
+       is_list(Flags) andalso
+       (is_integer(Timeout) orelse 
+        (Timeout =:= infinity) orelse 
+        (Timeout =:= nowait))  ->
+    EFlags = enc_recv_flags(Flags),
+    do_recv(SockRef, undefined, Length, EFlags, <<>>, Timeout).
+
+%% We need to pass the "old recv ref" around because of the special case
+%% with Length = 0. This case makes it neccessary to have a timeout function
+%% clause since we may never wait for anything (no receive select), and so the
+%% the only timeout check will be the function clause.
+%% Note that the Timeout value of 'nowait' has a special meaning. It means
+%% that we will either return with data or with the with {error, NNNN}. In
+%% wich case the caller will receive a select message at some later time.
+do_recv(SockRef, _OldRef, Length, EFlags, Acc, Timeout)
+  when (Timeout =:= nowait) orelse
+       (Timeout =:= infinity) orelse
+       (is_integer(Timeout) andalso (Timeout > 0)) ->
+    TS      = timestamp(Timeout),
+    RecvRef = make_ref(),
+    case nif_recv(SockRef, RecvRef, Length, EFlags) of
+        {ok, true = _Complete, Bin} when (size(Acc) =:= 0) ->
+            {ok, Bin};
+        {ok, true = _Complete, Bin} ->
+            {ok, <<Acc/binary, Bin/binary>>};
+
+        %% It depends on the amount of bytes we tried to read:
+        %%    0   - Read everything available
+        %%          We got something, but there may be more - keep reading.
+        %%    > 0 - We got a part of the message and we will be notified
+        %%          when there is more to read (a select message)
+        {ok, false = _Complete, Bin} when (Length =:= 0) ->
+            do_recv(SockRef, RecvRef,
+                    Length, EFlags,
+                    <<Acc/binary, Bin/binary>>,
+                    next_timeout(TS, Timeout));
+
+
+        %% Did not get all the user asked for, but the user also
+        %% specified 'nowait', so deliver what we got and the 
+        %% select info.
+        {ok, false = _Completed, Bin} when (Timeout =:= nowait) andalso 
+                                           (size(Acc) =:= 0) ->
+            {ok, {Bin, ?SELECT_INFO(recv, RecvRef)}};
+
+
+        {ok, false = _Completed, Bin} when (size(Acc) =:= 0) ->
+            %% We got the first chunk of it.
+            %% We will be notified (select message) when there
+            %% is more to read.
+	    NewTimeout = next_timeout(TS, Timeout),
+            receive
+                {?SOCKET_TAG, #socket{ref = SockRef}, select, RecvRef} ->
+                    do_recv(SockRef, RecvRef,
+                            Length-size(Bin), EFlags,
+                            Bin,
+                            next_timeout(TS, Timeout));
+
+                {?SOCKET_TAG, _Socket, abort, {RecvRef, Reason}} ->
+                    {error, Reason}
+
+            after NewTimeout ->
+                    cancel(SockRef, recv, RecvRef),
+                    {error, {timeout, Acc}}
+            end;
+
+        {ok, false = _Completed, Bin} ->
+            %% We got a chunk of it!
+	    NewTimeout = next_timeout(TS, Timeout),
+            receive
+                {?SOCKET_TAG, #socket{ref = SockRef}, select, RecvRef} ->
+                    do_recv(SockRef, RecvRef,
+                            Length-size(Bin), EFlags,
+                            <<Acc/binary, Bin/binary>>,
+                            next_timeout(TS, Timeout));
+
+                {?SOCKET_TAG, _Socket, abort, {RecvRef, Reason}} ->
+                    {error, Reason}
+
+            after NewTimeout ->
+                    cancel(SockRef, recv, RecvRef),
+                    {error, {timeout, Acc}}
+            end;
+
+
+        %% The user does not want to wait!
+        %% The user will be informed that there is something to read
+        %% via the select socket message (see below).
+
+        {error, eagain} when (Timeout =:= nowait) andalso (size(Acc) =:= 0) ->
+            ?SELECT(recv, RecvRef);
+        {error, eagain} when (Timeout =:= nowait) ->
+            {ok, {Acc, ?SELECT_INFO(recv, RecvRef)}};
+
+
+        %% We return with the accumulated binary (if its non-empty)
+        {error, eagain} when (Length =:= 0) andalso (size(Acc) > 0) ->
+            %% CAN WE REALLY DO THIS? THE NIF HAS SELECTED!! OR?
+            {ok, Acc};
+
+        {error, eagain} ->
+            %% There is nothing just now, but we will be notified when there
+            %% is something to read (a select message).
+            NewTimeout = next_timeout(TS, Timeout),
+            receive
+                {?SOCKET_TAG, #socket{ref = SockRef}, select, RecvRef} ->
+                    do_recv(SockRef, RecvRef,
+                            Length, EFlags,
+                            Acc,
+                            next_timeout(TS, Timeout));
+
+                {?SOCKET_TAG, _Socket, abort, {RecvRef, Reason}} ->
+                    {error, Reason}
+
+            after NewTimeout ->
+                    cancel(SockRef, recv, RecvRef),
+                    {error, timeout}
+            end;
+
+        {error, closed = Reason} ->
+            do_close(SockRef),
+            if
+                (size(Acc) =:= 0) ->
+                    {error, Reason};
+                true ->
+                    {error, {Reason, Acc}}
+            end;
+
+        {error, _} = ERROR when (size(Acc) =:= 0) ->
+            ERROR;
+
+        {error, Reason} ->
+            {error, {Reason, Acc}}
+
+    end;
+
+do_recv(SockRef, RecvRef, 0 = _Length, _Eflags, Acc, _Timeout) ->
+    %% The current recv operation is to be cancelled, so no need for a ref...
+    %% The cancel will end our 'read everything you have' and "activate"
+    %% any waiting reader.
+    cancel(SockRef, recv, RecvRef),
+    {ok, Acc};
+do_recv(_SockRef, _RecvRef, _Length, _EFlags, Acc, _Timeout)
+  when (size(Acc) > 0) ->
+    {error, {timeout, Acc}};
+do_recv(_SockRef, _RecvRef, _Length, _EFlags, _Acc, _Timeout) ->
+    {error, timeout}.
+
+
+
+%% ---------------------------------------------------------------------------
+%%
+%% With recvfrom we get messages, which means that regardless of how
+%% much we want to read, we return when we get a message.
+%% The MaxSize argument basically defines the size of our receive
+%% buffer. By setting the size to zero (0), we use the configured
+%% size (see setopt).
+%% It may be impossible to know what (buffer) size is appropriate
+%% "in advance", and in those cases it may be convenient to use the
+%% (recv) 'peek' flag. When this flag is provided the message is *not*
+%% "consumed" from the underlying (OS) buffers, so another recvfrom call
+%% is needed, possibly with a then adjusted buffer size.
+%%
+
+-spec recvfrom(Socket) -> {ok, {Source, Data}} | {error, Reason} when
+      Socket    :: socket(),
+      Source    :: sockaddr() | undefined,
+      Data      :: binary(),
+      Reason    :: term().
+
+recvfrom(Socket) ->
+    recvfrom(Socket, 0).
+
+-spec recvfrom(Socket, BufSz) -> {ok, {Source, Data}} | {error, Reason} when
+      Socket    :: socket(),
+      BufSz     :: non_neg_integer(),
+      Source    :: sockaddr() | undefined,
+      Data      :: binary(),
+      Reason    :: term().
+
+recvfrom(Socket, BufSz) ->
+    recvfrom(Socket, BufSz,
+             ?SOCKET_RECV_FLAGS_DEFAULT,
+             ?SOCKET_RECV_TIMEOUT_DEFAULT).
+
+-spec recvfrom(Socket, Flags, nowait) -> 
+                      {ok, {Source, Data}} |
+                      {select, SelectInfo} |
+                      {error, Reason} when
+      Socket     :: socket(),
+      Flags      :: recv_flags(),
+      Source     :: sockaddr() | undefined,
+      Data       :: binary(),
+      SelectInfo :: select_info(),
+      Reason     :: term()
+                 ; (Socket, Flags, Timeout) -> 
+                      {ok, {Source, Data}} |
+                      {error, Reason} when
+      Socket     :: socket(),
+      Flags      :: recv_flags(),
+      Timeout    :: timeout(),
+      Source     :: sockaddr() | undefined,
+      Data       :: binary(),
+      Reason     :: term()
+                 ; (Socket, BufSz, Flags) -> 
+                      {ok, {Source, Data}} | {error, Reason} when
+      Socket    :: socket(),
+      BufSz     :: non_neg_integer(),
+      Flags     :: recv_flags(),
+      Source    :: sockaddr() | undefined,
+      Data      :: binary(),
+      Reason    :: term()
+                ; (Socket, BufSz, nowait) -> 
+                      {ok, {Source, Data}} |
+                      {select, SelectInfo} |
+                      {error, Reason} when
+      Socket     :: socket(),
+      BufSz      :: non_neg_integer(),
+      Source     :: sockaddr() | undefined,
+      Data       :: binary(),
+      SelectInfo :: select_info(),
+      Reason     :: term()
+                 ; (Socket, BufSz, Timeout) -> 
+                      {ok, {Source, Data}} | {error, Reason} when
+      Socket     :: socket(),
+      BufSz      :: non_neg_integer(),
+      Timeout    :: timeout(),
+      Source     :: sockaddr() | undefined,
+      Data       :: binary(),
+      Reason     :: term().
+
+recvfrom(Socket, Flags, Timeout) when is_list(Flags) ->
+    recvfrom(Socket, 0, Flags, Timeout);
+recvfrom(Socket, BufSz, Flags) when is_list(Flags) ->
+    recvfrom(Socket, BufSz, Flags, ?SOCKET_RECV_TIMEOUT_DEFAULT);
+recvfrom(Socket, BufSz, Timeout) ->
+    recvfrom(Socket, BufSz, ?SOCKET_RECV_FLAGS_DEFAULT, Timeout).
+
+-spec recvfrom(Socket, BufSz, Flags, nowait) -> 
+                      {ok, {Source, Data}} |
+                      {select, SelectInfo} |
+                      {error, Reason} when
+      Socket     :: socket(),
+      BufSz      :: non_neg_integer(),
+      Flags      :: recv_flags(),
+      Source     :: sockaddr() | undefined,
+      Data       :: binary(),
+      SelectInfo :: select_info(),
+      Reason     :: term()
+                 ; (Socket, BufSz, Flags, Timeout) -> 
+                      {ok, {Source, Data}} |
+                      {error, Reason} when
+      Socket  :: socket(),
+      BufSz   :: non_neg_integer(),
+      Flags   :: recv_flags(),
+      Timeout :: timeout(),
+      Source  :: sockaddr() | undefined,
+      Data    :: binary(),
+      Reason  :: term().
+
+recvfrom(#socket{ref = SockRef}, BufSz, Flags, Timeout)
+  when (is_integer(BufSz) andalso (BufSz >= 0)) andalso
+       is_list(Flags) andalso
+       (is_integer(Timeout) orelse
+        (Timeout =:= infinity) orelse
+        (Timeout =:= nowait)) ->
+    EFlags = enc_recv_flags(Flags),
+    do_recvfrom(SockRef, BufSz, EFlags, Timeout).
+
+do_recvfrom(SockRef, BufSz, EFlags, Timeout)  ->
+    TS      = timestamp(Timeout),
+    RecvRef = make_ref(),
+    case nif_recvfrom(SockRef, RecvRef, BufSz, EFlags) of
+        {ok, {_Source, _NewData}} = OK ->
+            OK;
+
+
+        {error, eagain} when (Timeout =:= nowait) ->
+            ?SELECT(recvfrom, RecvRef);
+
+
+        {error, eagain} ->
+            %% There is nothing just now, but we will be notified when there
+            %% is something to read (a select message).
+            NewTimeout = next_timeout(TS, Timeout),
+            receive
+                {?SOCKET_TAG, #socket{ref = SockRef}, select, RecvRef} ->
+                    do_recvfrom(SockRef, BufSz, EFlags,
+                                next_timeout(TS, Timeout));
+
+                {?SOCKET_TAG, _Socket, abort, {RecvRef, Reason}} ->
+                    {error, Reason}
+
+            after NewTimeout ->
+                    cancel(SockRef, recvfrom, RecvRef),
+                    {error, timeout}
+            end;
+
+        {error, _Reason} = ERROR ->
+            ERROR
+
+    end.
+
+
+%% ---------------------------------------------------------------------------
+%%
+
+-spec recvmsg(Socket) -> {ok, MsgHdr} | {error, Reason} when
+      Socket  :: socket(),
+      MsgHdr  :: msghdr(),
+      Reason  :: term().
+
+recvmsg(Socket) ->
+    recvmsg(Socket, 0, 0,
+            ?SOCKET_RECV_FLAGS_DEFAULT, ?SOCKET_RECV_TIMEOUT_DEFAULT).
+
+-spec recvmsg(Socket, Flags) -> {ok, MsgHdr} | {error, Reason} when
+      Socket  :: socket(),
+      Flags   :: recv_flags(),
+      MsgHdr  :: msghdr(),
+      Reason  :: term()
+                 ; (Socket, Timeout :: nowait) -> {ok, MsgHdr} |
+                                                  {select, SelectInfo} |
+                                                  {error, Reason} when
+      Socket     :: socket(),
+      MsgHdr     :: msghdr(),
+      SelectInfo :: select_info(),
+      Reason     :: term()
+                 ; (Socket, Timeout) -> {ok, MsgHdr} | {error, Reason} when
+      Socket     :: socket(),
+      Timeout    :: timeout(),
+      MsgHdr     :: msghdr(),
+      Reason     :: term().
+
+recvmsg(Socket, Flags) when is_list(Flags) ->
+    recvmsg(Socket, 0, 0, Flags, ?SOCKET_RECV_TIMEOUT_DEFAULT);
+recvmsg(Socket, Timeout) ->
+    recvmsg(Socket, 0, 0, ?SOCKET_RECV_FLAGS_DEFAULT, Timeout).
+
+-spec recvmsg(Socket, Flags, nowait) -> {ok, MsgHdr} |
+                                        {select, SelectInfo} |
+                                        {error, Reason} when
+      Socket     :: socket(),
+      Flags      :: recv_flags(),
+      MsgHdr     :: msghdr(),
+      SelectInfo :: select_info(),
+      Reason     :: term()
+                 ; (Socket, Flags, Timeout) -> {ok, MsgHdr} | {error, Reason} when
+      Socket     :: socket(),
+      Flags      :: recv_flags(),
+      Timeout    :: timeout(),
+      MsgHdr     :: msghdr(),
+      Reason     :: term()
+                 ; (Socket, BufSz, CtrlSz) -> {ok, MsgHdr} | {error, Reason} when
+      Socket     :: socket(),
+      BufSz      :: non_neg_integer(),
+      CtrlSz     :: non_neg_integer(),
+      MsgHdr     :: msghdr(),
+      Reason     :: term().
+
+recvmsg(Socket, Flags, Timeout) when is_list(Flags) ->
+    recvmsg(Socket, 0, 0, Flags, Timeout);
+recvmsg(Socket, BufSz, CtrlSz) when is_integer(BufSz) andalso is_integer(CtrlSz) ->
+    recvmsg(Socket, BufSz, CtrlSz,
+            ?SOCKET_RECV_FLAGS_DEFAULT, ?SOCKET_RECV_TIMEOUT_DEFAULT).
+
+
+-spec recvmsg(Socket, 
+              BufSz, CtrlSz,
+              Flags, nowait) -> {ok, MsgHdr} |
+                                {select, SelectInfo} |
+                                {error, Reason} when
+      Socket     :: socket(),
+      BufSz      :: non_neg_integer(),
+      CtrlSz     :: non_neg_integer(),
+      Flags      :: recv_flags(),
+      MsgHdr     :: msghdr(),
+      SelectInfo :: select_info(),
+      Reason     :: term()
+                 ; (Socket, 
+                    BufSz, CtrlSz,
+                    Flags, Timeout) -> {ok, MsgHdr} | {error, Reason} when
+      Socket     :: socket(),
+      BufSz      :: non_neg_integer(),
+      CtrlSz     :: non_neg_integer(),
+      Flags      :: recv_flags(),
+      Timeout    :: timeout(),
+      MsgHdr     :: msghdr(),
+      Reason     :: term().
+
+recvmsg(#socket{ref = SockRef}, BufSz, CtrlSz, Flags, Timeout)
+  when (is_integer(BufSz) andalso (BufSz >= 0)) andalso
+       (is_integer(CtrlSz) andalso (CtrlSz >= 0)) andalso
+       is_list(Flags) andalso
+       (is_integer(Timeout) orelse
+        (Timeout =:= infinity) orelse
+        (Timeout =:= nowait)) ->
+    EFlags = enc_recv_flags(Flags),
+    do_recvmsg(SockRef, BufSz, CtrlSz, EFlags, Timeout).
+
+do_recvmsg(SockRef, BufSz, CtrlSz, EFlags, Timeout)  ->
+    TS      = timestamp(Timeout),
+    RecvRef = make_ref(),
+    case nif_recvmsg(SockRef, RecvRef, BufSz, CtrlSz, EFlags) of
+        {ok, _MsgHdr} = OK ->
+            OK;
+
+
+        {error, eagain} when (Timeout =:= nowait) ->
+            ?SELECT(recvmsg, RecvRef);
+
+
+        {error, eagain} ->
+            %% There is nothing just now, but we will be notified when there
+            %% is something to read (a select message).
+            NewTimeout = next_timeout(TS, Timeout),
+            receive
+                {?SOCKET_TAG, #socket{ref = SockRef}, select, RecvRef} ->
+                    do_recvmsg(SockRef, BufSz, CtrlSz, EFlags,
+                               next_timeout(TS, Timeout));
+
+                {?SOCKET_TAG, _Socket, abort, {RecvRef, Reason}} ->
+                    {error, Reason}
+
+            after NewTimeout ->
+                    cancel(SockRef, recvmsg, RecvRef),
+                    {error, timeout}
+            end;
+
+        {error, closed} = ERROR ->
+            do_close(SockRef),
+            ERROR;
+
+        {error, _Reason} = ERROR ->
+            ERROR
+
+    end.
+
+
+
+
+%% ===========================================================================
+%%
+%% close - close a file descriptor
+%%
+%% Closing a socket is a two stage rocket (because of linger).
+%% We need to perform the actual socket close while in BLOCKING mode.
+%% But that would hang the entire VM, so what we do is divide the 
+%% close in two steps: 
+%% 1) nif_close + the socket_stop (nif) callback function
+%%    This is for everything that can be done safely NON-BLOCKING.
+%% 2) nif_finalize_close which is executed by a *dirty* scheduler
+%%    Before we call the socket close function, we set the socket 
+%%    BLOCKING. Thereby linger is handled properly.
+
+-spec close(Socket) -> ok | {error, Reason} when
+      Socket :: socket(),
+      Reason :: term().
+
+close(#socket{ref = SockRef}) ->
+    do_close(SockRef).
+
+do_close(SockRef) ->
+    case nif_close(SockRef) of
+        ok ->
+            nif_finalize_close(SockRef);
+        {ok, CloseRef} ->
+            %% We must wait for the socket_stop callback function to 
+            %% complete its work
+            receive
+                {?SOCKET_TAG, #socket{ref = SockRef}, close, CloseRef} ->
+                    nif_finalize_close(SockRef)
+            end;
+        {error, _} = ERROR ->
+            ERROR
+    end.
+
+
+
+
+%% ===========================================================================
+%%
+%% shutdown - shut down part of a full-duplex connection
+%%
+
+-spec shutdown(Socket, How) -> ok | {error, Reason} when
+      Socket :: socket(),
+      How    :: shutdown_how(),
+      Reason :: term().
+
+shutdown(#socket{ref = SockRef}, How) ->
+    try
+        begin
+            EHow = enc_shutdown_how(How),
+            nif_shutdown(SockRef, EHow)
+        end
+    catch
+        throw:T ->
+            T;
+        %% <WIN32-TEMPORARY>
+        error:notsup:S ->
+            erlang:raise(error, notsup, S);
+        %% </WIN32-TEMPORARY>
+        error:Reason ->
+            {error, Reason}
+    end.
+
+
+
+
+%% ===========================================================================
+%%
+%% setopt - manipulate individual properties of a socket
+%%
+%% What properties are valid depend on what kind of socket it is
+%% (domain, type and protocol)
+%% If its an "invalid" option (or value), we should not crash but return some
+%% useful error...
+%%
+%% <KOLLA>
+%%
+%% WE NEED TO MAKE SURE THAT THE USER DOES NOT MAKE US BLOCKING
+%% AS MUCH OF THE CODE EXPECTS TO BE NON-BLOCKING!!
+%%
+%% </KOLLA>
+
+-spec setopt(Socket, otp, otp_socket_option(), Value) -> ok | {error, Reason} when
+      Socket :: socket(),
+      Value  :: term(),
+      Reason :: term()
+                ; (Socket, socket, socket_option(), Value) -> ok | {error, Reason} when
+      Socket :: socket(),
+      Value  :: term(),
+      Reason :: term()
+                ; (Socket, ip, ip_socket_option(), Value) -> ok | {error, Reason} when
+      Socket :: socket(),
+      Value  :: term(),
+      Reason :: term()
+                ; (Socket, ipv6, ipv6_socket_option(), Value) -> ok | {error, Reason} when
+      Socket :: socket(),
+      Value  :: term(),
+      Reason :: term()
+                ; (Socket, tcp, tcp_socket_option(), Value) -> ok | {error, Reason} when
+      Socket :: socket(),
+      Value  :: term(),
+      Reason :: term()
+                ; (Socket, udp, udp_socket_option(), Value) -> ok | {error, Reason} when
+      Socket :: socket(),
+      Value  :: term(),
+      Reason :: term()
+                ; (Socket, sctp, sctp_socket_option(), Value) -> ok | {error, Reason} when
+      Socket :: socket(),
+      Value  :: term(),
+      Reason :: term()
+                ; (Socket, Level, Key, Value) -> ok | {error, Reason} when
+      Socket :: socket(),
+      Level  :: non_neg_integer(),
+      Key    :: non_neg_integer(),
+      Value  :: binary(),
+      Reason :: term().
+
+setopt(#socket{ref = SockRef}, Level, Key, Value) ->
+    try
+        begin
+            Domain               = which_domain(SockRef),
+            Type                 = which_type(SockRef),
+            Protocol             = which_protocol(SockRef),
+            {EIsEncoded, ELevel} = enc_setopt_level(Level),
+            EKey = enc_setopt_key(Level, Key, Domain, Type, Protocol),
+            EVal = enc_setopt_value(Level, Key, Value, Domain, Type, Protocol),
+            nif_setopt(SockRef, EIsEncoded, ELevel, EKey, EVal)
+        end
+    catch
+        throw:T ->
+            T;
+        %% <WIN32-TEMPORARY>
+        error:notsup:S ->
+            erlang:raise(error, notsup, S);
+        %% </WIN32-TEMPORARY>
+        error:Reason ->
+            {error, Reason} % Process more?
+    end.
+
+
+
+
+%% ===========================================================================
+%%
+%% getopt - retrieve individual properties of a socket
+%%
+%% What properties are valid depend on what kind of socket it is
+%% (domain, type and protocol).
+%% If its an "invalid" option, we should not crash but return some
+%% useful error...
+%%
+%% When specifying level as an integer, and therefor using "native mode",
+%% we should make it possible to specify common types instead of the
+%% value size. Example: int | bool | {string, pos_integer()} | non_neg_integer()
+%%
+
+-spec getopt(Socket, otp, otp_socket_option()) -> {ok, Value} | {error, Reason} when
+      Socket :: socket(),
+      Value  :: term(),
+      Reason :: term()
+                ; (Socket, socket, socket_option()) -> {ok, Value} | {error, Reason} when
+      Socket :: socket(),
+      Value  :: term(),
+      Reason :: term()
+                ; (Socket, ip, ip_socket_option()) -> {ok, Value} | {error, Reason} when
+      Socket :: socket(),
+      Value  :: term(),
+      Reason :: term()
+                ; (Socket, ipv6, ipv6_socket_option()) -> {ok, Value} | {error, Reason} when
+      Socket :: socket(),
+      Value  :: term(),
+      Reason :: term()
+                ; (Socket, tcp, tcp_socket_option()) -> {ok, Value} | {error, Reason} when
+      Socket :: socket(),
+      Value  :: term(),
+      Reason :: term()
+                ; (Socket, udp, udp_socket_option()) -> {ok, Value} | {error, Reason} when
+      Socket :: socket(),
+      Value  :: term(),
+      Reason :: term()
+                ; (Socket, sctp, sctp_socket_option()) -> {ok, Value} | {error, Reason} when
+      Socket :: socket(),
+      Value  :: term(),
+      Reason :: term()
+                ; (Socket, Level, Key) -> ok | {ok, Value} | {error, Reason} when
+      Socket    :: socket(),
+      Level     :: integer(),
+      Key       :: {NativeOpt, ValueSize},
+      NativeOpt :: integer(),
+      ValueSize :: int | bool | non_neg_integer(),
+      Value     :: term(),
+      Reason    :: term().
+
+getopt(#socket{ref = SockRef}, Level, Key) ->
+    try
+        begin
+            Domain   = which_domain(SockRef),
+            Type     = which_type(SockRef),
+            Protocol = which_protocol(SockRef),
+            {EIsEncoded, ELevel} = enc_getopt_level(Level),
+            EKey     = enc_getopt_key(Level, Key, Domain, Type, Protocol),
+            %% We may need to decode the value (for the same reason
+            %% we (may have) needed to encode the value for setopt).
+            case nif_getopt(SockRef, EIsEncoded, ELevel, EKey) of
+                ok ->
+                    ok;
+                {ok, EVal} ->
+                    Val = dec_getopt_value(Level, Key, EVal,
+                                           Domain, Type, Protocol),
+                    {ok, Val};
+                {error, _} = ERROR ->
+                    ERROR
+            end
+        end
+    catch
+        throw:E:_S ->
+            E;
+        %% <WIN32-TEMPORARY>
+        error:notsup:S ->
+            erlang:raise(error, notsup, S);
+        %% </WIN32-TEMPORARY>
+        error:Reason:_Stack ->
+            {error, Reason} % Process more?
+    end.
+
+
+%% These are internal "shortcut" functions for the options
+%% domain, type and protocol.
+
+-spec which_domain(SockRef) -> Domain when
+      SockRef :: reference(),
+      Domain  :: domain().
+
+which_domain(SockRef) ->
+    case nif_getopt(SockRef, true,
+                    ?SOCKET_OPT_LEVEL_OTP, ?SOCKET_OPT_OTP_DOMAIN) of
+        {ok, Domain} ->
+            Domain;
+        {error, _} = ERROR ->
+            throw(ERROR)
+    end.
+        
+
+-spec which_type(SockRef) -> Type when
+      SockRef :: reference(),
+      Type    :: type().
+
+which_type(SockRef) ->
+    case nif_getopt(SockRef, true,
+                    ?SOCKET_OPT_LEVEL_OTP, ?SOCKET_OPT_OTP_TYPE) of
+        {ok, Type} ->
+            Type;
+        {error, _} = ERROR ->
+            throw(ERROR)
+    end.
+
+-spec which_protocol(SockRef) -> Protocol when
+      SockRef  :: reference(),
+      Protocol :: protocol().
+
+which_protocol(SockRef) ->
+    case nif_getopt(SockRef, true,
+                    ?SOCKET_OPT_LEVEL_OTP, ?SOCKET_OPT_OTP_PROTOCOL) of
+        {ok, Proto} ->
+            Proto;
+        {error, _} = ERROR ->
+            throw(ERROR)
+    end.
+
+
+
+
+%% ===========================================================================
+%%
+%% sockname - return the current address of the socket.
+%%
+%%
+
+-spec sockname(Socket) -> {ok, SockAddr} | {error, Reason} when
+      Socket   :: socket(),
+      SockAddr :: sockaddr(),
+      Reason   :: term().
+
+sockname(#socket{ref = SockRef}) ->
+    nif_sockname(SockRef).
+
+
+
+%% ===========================================================================
+%%
+%% peername - return the address of the peer *connected* to the socket.
+%%
+%%
+
+-spec peername(Socket) -> {ok, SockAddr} | {error, Reason} when
+      Socket   :: socket(),
+      SockAddr :: sockaddr(),
+      Reason   :: term().
+
+peername(#socket{ref = SockRef}) ->
+    nif_peername(SockRef).
+
+
+%% ===========================================================================
+%%
+%% cancel - cancel an operation resulting in a select
+%%
+%% A call to accept, recv/recvfrom/recvmsg and send/sendto/sendmsg
+%% can result in a select if they are called with the Timeout argument
+%% set to nowait. This is indicated by the return of the select-info.
+%% Such a operation can be cancelled by calling this function.
+%%
+
+-spec cancel(Socket, SelectInfo) -> ok | {error, Reason} when
+      Socket     :: socket(),
+      SelectInfo :: select_info(),
+      Reason     :: term().
+
+cancel(#socket{ref = SockRef}, ?SELECT_INFO(Tag, Ref)) ->
+    cancel(SockRef, Tag, Ref).
+
+
+
+%% ===========================================================================
+%%
+%% Encode / decode
+%%
+%% ===========================================================================
+
+%% -spec enc_domain(Domain) -> non_neg_integer() when
+%%       Domain :: domain().
+
+enc_domain(local)  -> ?SOCKET_DOMAIN_LOCAL;
+enc_domain(inet)   -> ?SOCKET_DOMAIN_INET;
+enc_domain(inet6)  -> ?SOCKET_DOMAIN_INET6;
+enc_domain(Domain) -> invalid_domain(Domain).
+
+%% -spec enc_type(Domain, Type) -> non_neg_integer() when
+%%       Domain :: domain(),
+%%       Type   :: type().
+
+%% What combos are valid?
+enc_type(_, stream)    -> ?SOCKET_TYPE_STREAM;
+enc_type(_, dgram)     -> ?SOCKET_TYPE_DGRAM;
+enc_type(_, raw)       -> ?SOCKET_TYPE_RAW;
+enc_type(_, seqpacket) -> ?SOCKET_TYPE_SEQPACKET;
+enc_type(_, Type)      -> invalid_type(Type).
+
+-spec enc_protocol(Type, Protocol) -> non_neg_integer() | 
+                                      {raw, non_neg_integer()} when
+      Type     :: type(),
+      Protocol :: protocol().
+
+enc_protocol(_,         default) -> ?SOCKET_PROTOCOL_DEFAULT;
+enc_protocol(dgram,     ip)      -> ?SOCKET_PROTOCOL_IP;
+enc_protocol(stream,    tcp)     -> ?SOCKET_PROTOCOL_TCP;
+enc_protocol(dgram,     udp)     -> ?SOCKET_PROTOCOL_UDP;
+enc_protocol(seqpacket, sctp)    -> ?SOCKET_PROTOCOL_SCTP;
+enc_protocol(raw,       icmp)    -> ?SOCKET_PROTOCOL_ICMP;
+enc_protocol(raw,       igmp)    -> ?SOCKET_PROTOCOL_IGMP;
+enc_protocol(raw,       {raw, P} = RAW) when is_integer(P) -> RAW;
+enc_protocol(Type, Proto) -> 
+    invalid_protocol(Type, Proto).
+
+
+-spec enc_send_flags(Flags) -> non_neg_integer() when
+      Flags :: send_flags().
+
+enc_send_flags(Flags) ->
+    EFlags = [{confirm,   ?SOCKET_SEND_FLAG_CONFIRM},
+              {dontroute, ?SOCKET_SEND_FLAG_DONTROUTE},
+              {eor,       ?SOCKET_SEND_FLAG_EOR},
+              {more,      ?SOCKET_SEND_FLAG_MORE},
+              {nosignal,  ?SOCKET_SEND_FLAG_NOSIGNAL},
+              {oob,       ?SOCKET_SEND_FLAG_OOB}],
+    enc_flags(Flags, EFlags).
+
+-spec enc_recv_flags(Flags) -> non_neg_integer() when
+      Flags :: recv_flags().
+
+enc_recv_flags(Flags) ->
+    EFlags = [{cmsg_cloexec, ?SOCKET_RECV_FLAG_CMSG_CLOEXEC},
+              {errqueue,     ?SOCKET_RECV_FLAG_ERRQUEUE},
+              {oob,          ?SOCKET_RECV_FLAG_OOB},
+              {peek,         ?SOCKET_RECV_FLAG_PEEK},
+              {trunc,        ?SOCKET_RECV_FLAG_TRUNC}],
+    enc_flags(Flags, EFlags).
+
+
+enc_flags([], _) ->
+    0;
+enc_flags(Flags, EFlags) ->
+    F = fun(Flag, Acc) ->
+                case lists:keysearch(Flag, 1, EFlags) of
+                    {value, {Flag, EFlag}} ->
+                        Acc bor (1 bsl EFlag);
+                    false ->
+                        throw({error, {unknown_flag, Flag}})
+                end
+        end,
+    lists:foldl(F, 0, Flags).
+
+
+%% +++ Encode setopt level +++
+
+-spec enc_setopt_level(Level) -> {IsEncoded, EncodedLevel} when
+      Level        :: sockopt_level(),
+      IsEncoded    :: boolean(),
+      EncodedLevel :: integer().
+
+enc_setopt_level(otp) ->
+    {true, ?SOCKET_OPT_LEVEL_OTP};
+enc_setopt_level(socket) ->
+    {true, ?SOCKET_OPT_LEVEL_SOCKET};
+enc_setopt_level(ip) ->
+    {true, ?SOCKET_OPT_LEVEL_IP};
+enc_setopt_level(ipv6) ->
+    {true, ?SOCKET_OPT_LEVEL_IPV6};
+enc_setopt_level(tcp) ->
+    {true, ?SOCKET_OPT_LEVEL_TCP};
+enc_setopt_level(udp) ->
+    {true, ?SOCKET_OPT_LEVEL_UDP};
+enc_setopt_level(sctp) ->
+    {true, ?SOCKET_OPT_LEVEL_SCTP};
+%% Any option that is of an plain level must be provided as a binary
+%% already fully encoded!
+enc_setopt_level(L) when is_integer(L) ->
+    {false, L}.
+
+
+%% +++ Encode setopt key +++
+
+%% We should ...really... do something with the domain, type and protocol args...
+%% Also, any option (key) which has an integer level (plain) must also be provided
+%% in a plain mode, that is, as an integer.
+%% Also, not all options are available on all platforms. That is something we
+%% don't check here, but in the nif-code.
+
+enc_setopt_key(Level, Opt, Domain, Type, Protocol) ->
+    enc_sockopt_key(Level, Opt, set, Domain, Type, Protocol).
+
+
+%% +++ Encode setopt value +++
+%%
+%% For the most part this function does *not* do an actual encode,
+%% it simply validates the value type. But in some cases it will
+%% encode the value into an more "manageable" type.
+%% It also handles "aliases" (see linger).
+
+-dialyzer({nowarn_function, enc_setopt_value/6}).
+-spec enc_setopt_value(otp, otp_socket_option(),
+                       Value, Domain, Type, Protocol) -> term() when
+      Value    :: term(),
+      Domain   :: domain(),
+      Type     :: type(),
+      Protocol :: protocol()
+                  ; (socket, socket_option(),
+                     Value, Domain, Type, Protocol) -> term() when
+      Value    :: term(),
+      Domain   :: domain(),
+      Type     :: type(),
+      Protocol :: protocol()
+           ; (ip, ip_socket_option(),
+              Value, Domain, Type, Protocol) -> term() when
+      Value    :: term(),
+      Domain   :: domain(),
+      Type     :: type(),
+      Protocol :: protocol()
+           ; (ipv6, ipv6_socket_option(),
+              Value, Domain, Type, Protocol) -> term() when
+      Value    :: term(),
+      Domain   :: domain(),
+      Type     :: type(),
+      Protocol :: protocol()
+           ; (tcp, tcp_socket_option(),
+              Value, Domain, Type, Protocol) -> term() when
+      Value    :: term(),
+      Domain   :: domain(),
+      Type     :: type(),
+      Protocol :: protocol()
+           ; (udp, udp_socket_option(),
+              Value, Domain, Type, Protocol) -> term() when
+      Value    :: term(),
+      Domain   :: domain(),
+      Type     :: type(),
+      Protocol :: protocol()
+           ; (sctp, sctp_socket_option(),
+              Value, Domain, Type, Protocol) -> term() when
+      Value    :: term(),
+      Domain   :: domain(),
+      Type     :: type(),
+      Protocol :: protocol()
+           ; (Level, Opt,
+              Value, Domain, Type, Protocol) -> term() when
+      Level    :: integer(),
+      Opt      :: integer(),
+      Value    :: binary(),
+      Domain   :: domain(),
+      Type     :: type(),
+      Protocol :: protocol().
+      
+enc_setopt_value(otp, debug, V, _, _, _) when is_boolean(V) ->
+    V;
+enc_setopt_value(otp, iow, V, _, _, _) when is_boolean(V) ->
+    V;
+enc_setopt_value(otp, controlling_process, V, _, _, _) when is_pid(V) ->
+    V;
+enc_setopt_value(otp, rcvbuf, V, _, _, _) when (V =:= default) ->
+    0; % This will cause the nif-code to choose the default value
+enc_setopt_value(otp, rcvbuf, V, _, _, _) when is_integer(V) andalso (V > 0) ->
+    V;
+%% N: Number of reads (when specifying length = 0)
+%% V: Size of the "read" buffer
+enc_setopt_value(otp, rcvbuf, {N, BufSz} = V, _, stream = _T, _P) 
+  when (is_integer(N) andalso (N > 0)) andalso 
+       (is_integer(BufSz) andalso (BufSz > 0)) ->
+    V;
+enc_setopt_value(otp, rcvctrlbuf, V, _, _, _) when (V =:= default) ->
+    0;
+enc_setopt_value(otp, rcvctrlbuf, V, _, _, _) when is_integer(V) andalso (V > 0) ->
+    V;
+enc_setopt_value(otp, sndctrlbuf, V, _, _, _) when (V =:= default) ->
+    0;
+enc_setopt_value(otp, sndctrlbuf, V, _, _, _) when is_integer(V) andalso (V > 0) ->
+    V;
+enc_setopt_value(otp = L, Opt, V, _D, _T, _P) ->
+    not_supported({L, Opt, V});
+
+enc_setopt_value(socket, bindtodevice, V, _D, _T, _P) when is_list(V) ->
+    V;
+enc_setopt_value(socket, broadcast, V, _D, _T, _P) when is_boolean(V) ->
+    V;
+enc_setopt_value(socket, debug, V, _D, _T, _P) when is_integer(V) ->
+    V;
+enc_setopt_value(socket, dontroute, V, _D, _T, _P) when is_boolean(V) ->
+    V;
+enc_setopt_value(socket, keepalive, V, _D, _T, _P) when is_boolean(V) ->
+    V;
+enc_setopt_value(socket, linger, abort, D, T, P) ->
+    enc_setopt_value(socket, linger, {true, 0}, D, T, P);
+enc_setopt_value(socket, linger, {OnOff, Secs} = V, _D, _T, _P)
+  when is_boolean(OnOff) andalso is_integer(Secs) andalso (Secs >= 0) ->
+    V;
+enc_setopt_value(socket, oobinline, V, _D, _T, _P) when is_boolean(V) ->
+    V;
+enc_setopt_value(socket, peek_off, V, _D, _T, _P) when is_integer(V) ->
+    V;
+enc_setopt_value(socket, priority, V, _D, _T, _P) when is_integer(V) ->
+    V;
+enc_setopt_value(socket, rcvbuf, V, _D, _T, _P) when is_integer(V) ->
+    V;
+enc_setopt_value(socket, rcvlowat, V, _D, _T, _P) when is_integer(V) ->
+    V;
+enc_setopt_value(socket, rcvtimeo, #{sec := Sec, usec := USec} = V, _D, _T, _P) 
+  when is_integer(Sec) andalso is_integer(USec) ->
+    V;
+enc_setopt_value(socket, reuseaddr, V, _D, _T, _P) when is_boolean(V) ->
+    V;
+enc_setopt_value(socket, reuseport, V, _D, _T, _P) when is_boolean(V) ->
+    V;
+enc_setopt_value(socket, sndbuf, V, _D, _T, _P) when is_integer(V) ->
+    V;
+enc_setopt_value(socket, sndlowat, V, _D, _T, _P) when is_integer(V) ->
+    V;
+enc_setopt_value(socket, sndtimeo, #{sec := Sec, usec := USec} = V, _D, _T, _P) 
+  when is_integer(Sec) andalso is_integer(USec) ->
+    V;
+enc_setopt_value(socket, timestamp, V, _D, _T, _P) when is_boolean(V) ->
+    V;
+enc_setopt_value(socket = L, Opt, V, _D, _T, _P) ->
+    not_supported({L, Opt, V});
+
+enc_setopt_value(ip, add_membership, #{multiaddr := MA,
+                                       interface := IF} = V, _D, _T, _P)
+  when (is_tuple(MA) andalso (size(MA) =:= 4)) andalso
+       ((IF =:= any) orelse (is_tuple(IF) andalso (size(IF) =:= 4))) ->
+    V;
+enc_setopt_value(ip, add_source_membership, #{multiaddr  := MA,
+                                              interface  := IF,
+                                              sourceaddr := SA} = V, _D, _T, _P)
+  when (is_tuple(MA) andalso (size(MA) =:= 4)) andalso
+       (is_tuple(IF) andalso (size(IF) =:= 4)) andalso
+       (is_tuple(SA) andalso (size(SA) =:= 4)) ->
+    V;
+enc_setopt_value(ip, block_source, #{multiaddr  := MA,
+                                     interface  := IF,
+                                     sourceaddr := SA} = V, _D, _T, _P)
+  when (is_tuple(MA) andalso (size(MA) =:= 4)) andalso
+       (is_tuple(IF) andalso (size(IF) =:= 4)) andalso
+       (is_tuple(SA) andalso (size(SA) =:= 4)) ->
+    V;
+enc_setopt_value(ip, drop_membership, #{multiaddr := MA,
+                                        interface := IF} = V, _D, _T, _P)
+  when (is_tuple(MA) andalso (size(MA) =:= 4)) andalso
+       ((IF =:= any) orelse (is_tuple(IF) andalso (size(IF) =:= 4))) ->
+    V;
+enc_setopt_value(ip, drop_source_membership, #{multiaddr  := MA,
+                                               interface  := IF,
+                                               sourceaddr := SA} = V, _D, _T, _P)
+  when (is_tuple(MA) andalso (size(MA) =:= 4)) andalso
+       (is_tuple(IF) andalso (size(IF) =:= 4)) andalso
+       (is_tuple(SA) andalso (size(SA) =:= 4)) ->
+    V;
+enc_setopt_value(ip, freebind, V, _D, _T, _P) when is_boolean(V) ->
+    V;
+enc_setopt_value(ip, hdrincl, V, _D, _T, _P) when is_boolean(V) ->
+    V;
+enc_setopt_value(ip, minttl, V, _D, _T, _P) when is_integer(V) ->
+    V;
+enc_setopt_value(ip, msfilter, null = V, _D, _T, _P) ->
+    V;
+enc_setopt_value(ip, msfilter, #{multiaddr := MA,
+                                 interface := IF,
+                                 fmode     := FMode,
+                                 slist     := SL} = V, _D, _T, _P) 
+  when (is_tuple(MA) andalso (size(MA) =:= 4)) andalso
+       (is_tuple(IF) andalso (size(IF) =:= 4)) andalso
+       ((FMode =:= include) orelse (FMode =:= exclude)) andalso 
+       is_list(SL) ->
+    ensure_ip_msfilter_slist(SL),
+    V;
+enc_setopt_value(ip, mtu_discover, V, _D, _T, _P)
+  when (V =:= want)  orelse
+       (V =:= dont)  orelse
+       (V =:= do)    orelse
+       (V =:= probe) orelse
+       is_integer(V) ->
+    V;
+enc_setopt_value(ip, multicast_all, V, _D, _T, _P)
+  when is_boolean(V) ->
+    V;
+enc_setopt_value(ip, multicast_if, V, _D, _T, _P)
+  when (V =:= any) orelse (is_tuple(V) andalso (size(V) =:= 4)) ->
+    V;
+enc_setopt_value(ip, multicast_loop, V, _D, _T, _P)
+  when is_boolean(V) ->
+    V;
+enc_setopt_value(ip, multicast_ttl, V, _D, _T, _P)
+  when is_integer(V) andalso (0 =< V) andalso (V =< 255) ->
+    V;
+enc_setopt_value(ip, nodefrag, V, _D, _T, _P)
+  when is_boolean(V) ->
+    V;
+enc_setopt_value(ip, pktinfo, V, _D, _T, _P)
+  when is_boolean(V) ->
+    V;
+enc_setopt_value(ip, recvdstaddr, V, _D, _T, _P)
+  when is_boolean(V) ->
+    V;
+enc_setopt_value(ip, recverr, V, _D, _T, _P)
+  when is_boolean(V) ->
+    V;
+enc_setopt_value(ip, recvif, V, _D, _T, _P)
+  when is_boolean(V) ->
+    V;
+enc_setopt_value(ip, recvopts, V, _D, _T, _P)
+  when is_boolean(V) ->
+    V;
+enc_setopt_value(ip, recvorigdstaddr, V, _D, _T, _P)
+  when is_boolean(V) ->
+    V;
+enc_setopt_value(ip, recvtos, V, _D, _T, _P)
+  when is_boolean(V) ->
+    V;
+enc_setopt_value(ip, recvttl, V, _D, _T, _P)
+  when is_boolean(V) ->
+    V;
+enc_setopt_value(ip, retopts, V, _D, _T, _P)
+  when is_boolean(V) ->
+    V;
+enc_setopt_value(ip, router_alert, V, _D, _T, _P)
+  when is_integer(V) ->
+    V;
+enc_setopt_value(ip, sendsrcaddr, V, _D, _T, _P)
+  when is_boolean(V) ->
+    V;
+enc_setopt_value(ip, tos, V, _D, _T, _P)
+  when (V =:= lowdelay)    orelse
+       (V =:= throughput)  orelse
+       (V =:= reliability) orelse
+       (V =:= mincost)     orelse
+       is_integer(V) ->
+    V;
+enc_setopt_value(ip, transparent, V, _D, _T, _P)
+  when is_boolean(V) ->
+    V;
+enc_setopt_value(ip, ttl, V, _D, _T, _P)
+  when is_integer(V) ->
+    V;
+enc_setopt_value(ip, unblock_source, #{multiaddr  := MA,
+                                       interface  := IF,
+                                       sourceaddr := SA} = V, _D, _T, _P)
+  when (is_tuple(MA) andalso (size(MA) =:= 4)) andalso
+       (is_tuple(IF) andalso (size(IF) =:= 4)) andalso
+       (is_tuple(SA) andalso (size(SA) =:= 4)) ->
+    V;
+enc_setopt_value(ip = L, Opt, V, _D, _T, _P) ->
+    not_supported({L, Opt, V});
+
+enc_setopt_value(ipv6, addrform, inet = V, _D, _T, _P) ->
+    enc_domain(V);
+enc_setopt_value(ipv6, add_membership, #{multiaddr := MA,
+                                         interface := IF} = V, _D, _T, _P)
+  when ((is_tuple(MA) andalso (size(MA) =:= 8)) andalso
+        (is_integer(IF) andalso (IF >= 0))) ->
+    V;
+%% Is this obsolete? When get, the result is enoprotoopt and in the 
+%% header file it says 'obsolete'...
+%% But there might be (old?) versions of linux where it still works...
+enc_setopt_value(ipv6, authhdr, V, _D, T, _P)
+  when is_boolean(V) andalso ((T =:= dgram) orelse (T =:= raw)) ->
+    V;
+enc_setopt_value(ipv6, dstopts, V, _D, T, _P)
+  when is_boolean(V) andalso ((T =:= dgram) orelse (T =:= raw)) ->
+    V;
+enc_setopt_value(ipv6, drop_membership, #{multiaddr := MA,
+                                          interface := IF} = V, _D, _T, _P)
+  when ((is_tuple(MA) andalso (size(MA) =:= 8)) andalso
+        (is_integer(IF) andalso (IF >= 0))) ->
+    V;
+enc_setopt_value(ipv6, flowinfo, V, _D, T, _P)
+  when is_boolean(V) andalso ((T =:= dgram) orelse (T =:= raw)) ->
+    V;
+enc_setopt_value(ipv6, hoplimit, V, _D, T, _P)
+  when is_boolean(V) andalso ((T =:= dgram) orelse (T =:= raw)) ->
+    V;
+enc_setopt_value(ipv6, hopopts, V, _D, T, _P)
+  when is_boolean(V) andalso ((T =:= dgram) orelse (T =:= raw)) ->
+    V;
+enc_setopt_value(ipv6, mtu, V, _D, _T, _P) when is_integer(V) ->
+    V;
+enc_setopt_value(ipv6, mtu_discover, V, _D, _T, _P)
+  when (V =:= want)  orelse
+       (V =:= dont)  orelse
+       (V =:= do)    orelse
+       (V =:= probe) orelse
+       is_integer(V) ->
+    V;
+enc_setopt_value(ipv6, multicast_hops, V, _D, _T, _P)
+  when (V =:= default) ->
+    -1;
+enc_setopt_value(ipv6, multicast_hops, V, _D, _T, _P)
+  when is_integer(V) andalso (V >= 0) andalso (V =< 255) ->
+    V;
+enc_setopt_value(ipv6, multicast_if, V, _D, _T, _P)
+  when is_integer(V) ->
+    V;
+enc_setopt_value(ipv6, multicast_loop, V, _D, _T, _P)
+  when is_boolean(V) ->
+    V;
+enc_setopt_value(ipv6, recverr, V, _D, _T, _P)
+  when is_boolean(V) ->
+    V;
+enc_setopt_value(ipv6, Opt, V, _D, _T, _P)
+  when ((Opt =:= recvpktinfo) orelse (Opt =:= pktinfo)) andalso 
+       is_boolean(V) ->
+    V;
+enc_setopt_value(ipv6, router_alert, V, _D, T, _P)
+  when is_integer(V) andalso (T =:= raw) ->
+    V;
+enc_setopt_value(ipv6, rthdr, V, _D, T, _P)
+  when is_boolean(V) andalso ((T =:= dgram) orelse (T =:= raw)) ->
+    V;
+enc_setopt_value(ipv6, unicast_hops, V, _D, _T, _P)
+  when (V =:= default) ->
+    -1;
+enc_setopt_value(ipv6, unicast_hops, V, _D, _T, _P)
+  when is_integer(V) andalso (V >= 0) andalso (V =< 255) ->
+    V;
+enc_setopt_value(ipv6, v6only, V, _D, _T, _P) when is_boolean(V) ->
+    V;
+enc_setopt_value(ipv6 = L, Opt, V, _D, _T, _P) ->
+    not_supported({L, Opt, V});
+
+enc_setopt_value(tcp, congestion, V, _D, T, P)
+  when is_list(V) andalso
+       (T =:= stream) andalso
+       (P =:= tcp) ->
+    V;
+enc_setopt_value(tcp, maxseg, V, _D, T, P)
+  when is_integer(V) andalso
+       (T =:= stream) andalso
+       (P =:= tcp) ->
+    V;
+enc_setopt_value(tcp, nodelay, V, _D, T, P)
+  when is_boolean(V) andalso
+       (T =:= stream) andalso
+       (P =:= tcp) ->
+    V;
+enc_setopt_value(tcp = L, Opt, V, _D, _T, _P) ->
+    not_supported({L, Opt, V});
+
+enc_setopt_value(udp, cork, V, _D, T, P)
+  when is_boolean(V) andalso (T =:= dgram) andalso (P =:= udp) ->
+    V;
+enc_setopt_value(udp = L, Opt, _V, _D, _T, _P) ->
+    not_supported({L, Opt});
+
+enc_setopt_value(sctp, associnfo, #{assoc_id       := AssocId,
+                                    asocmaxrxt     := MaxRxt,
+                                    num_peer_dests := NumPeerDests,
+                                    peer_rwnd      := PeerRWND,
+                                    local_rwnd     := LocalRWND,
+                                    cookie_life    := CLife} = V,
+                 _D, _T, P)
+  when is_integer(AssocId) andalso
+       is_integer(MaxRxt)       andalso (MaxRxt >= 0)       andalso
+       is_integer(NumPeerDests) andalso (NumPeerDests >= 0) andalso
+       is_integer(PeerRWND)     andalso (PeerRWND >= 0)     andalso
+       is_integer(LocalRWND)    andalso (LocalRWND >= 0)    andalso
+       is_integer(CLife)        andalso (CLife >= 0)        andalso
+       (P =:= sctp) ->
+    V;
+enc_setopt_value(sctp, autoclose, V, _D, _T, P)
+  when is_integer(V) andalso (V >= 0) andalso (P =:= sctp) ->
+    V;
+enc_setopt_value(sctp, disable_fragments, V, _D, _T, P)
+  when is_boolean(V) andalso (P =:= sctp) ->
+    V;
+enc_setopt_value(sctp, events, #{data_in          := DataIn,
+                                 association      := Assoc,
+                                 address          := Addr,
+                                 send_failure     := SndFailure,
+                                 peer_error       := PeerError,
+                                 shutdown         := Shutdown,
+                                 partial_delivery := PartialDelivery,
+                                 adaptation_layer := AdaptLayer,
+                                 authentication   := Auth,
+                                 sender_dry       := SndDry} = V, _D, _T, P)
+  when is_boolean(DataIn)          andalso
+       is_boolean(Assoc)           andalso
+       is_boolean(Addr)            andalso
+       is_boolean(SndFailure)      andalso
+       is_boolean(PeerError)       andalso
+       is_boolean(Shutdown)        andalso
+       is_boolean(PartialDelivery) andalso
+       is_boolean(AdaptLayer)      andalso
+       is_boolean(Auth)            andalso
+       is_boolean(SndDry)          andalso
+       (P =:= sctp) ->
+    V;
+enc_setopt_value(sctp, initmsg, #{num_outstreams := NumOut,
+                                  max_instreams  := MaxIn,
+                                  max_attempts   := MaxAttempts,
+                                  max_init_timeo := MaxInitTO} = V,
+                 _D, _T, P)
+  when is_integer(NumOut)      andalso (NumOut >= 0)      andalso
+       is_integer(MaxIn)       andalso (MaxIn >= 0)       andalso
+       is_integer(MaxAttempts) andalso (MaxAttempts >= 0) andalso
+       is_integer(MaxInitTO)   andalso (MaxInitTO >= 0)   andalso
+       (P =:= sctp) ->
+    V;
+enc_setopt_value(sctp, maxseg, V, _D, _T, P)
+  when is_integer(V) andalso (V >= 0) andalso (P =:= sctp) ->
+    V;
+enc_setopt_value(sctp, nodelay, V, _D, _T, P)
+  when is_boolean(V) andalso (P =:= sctp) ->
+    V;
+enc_setopt_value(sctp, rtoinfo, #{assoc_id := AssocId,
+                                  initial  := Init,
+                                  max      := Max,
+                                  min      := Min} = V,
+                 _D, _T, P)
+  when is_integer(AssocId) andalso
+       is_integer(Init) andalso (Init >= 0) andalso
+       is_integer(Max)  andalso (Max >= 0)  andalso
+       is_integer(Min)  andalso (Min >= 0)  andalso
+       (P =:= sctp) ->
+    V;
+enc_setopt_value(sctp = L, Opt, V, _D, _T, _P) ->
+    not_supported({L, Opt, V});
+
+%% enc_setopt_value(raw = L, Opt, _V, _D, _T, _P) ->
+%%     not_supported({L, Opt});
+
+%% Is this correct? What about getopt?
+enc_setopt_value(L, Opt, V, _, _, _)
+  when is_integer(L) andalso is_integer(Opt) andalso is_binary(V) ->
+    V.
+
+
+
+
+%% +++ Encode getopt value +++
+
+enc_getopt_level(Level) ->
+    enc_setopt_level(Level).
+
+
+%% +++ Encode getopt key +++
+
+enc_getopt_key(Level, Opt, Domain, Type, Protocol) ->
+    enc_sockopt_key(Level, Opt, get, Domain, Type, Protocol).
+
+
+%% +++ Decode getopt value +++
+%%
+%% For the most part, we simply let the value pass through, but for some
+%% values we may need to do an actual decode.
+%%
+
+%% Let the user deal with this for now...
+dec_getopt_value(_L, _Opt, V, _D, _T, _P) ->
+    V.
+
+
+
+%% +++ Encode socket option key +++
+
+%% Most options are usable both for set and get, but some are
+%% are only available for e.g. get.
+-spec enc_sockopt_key(Level, Opt,
+                      Direction,
+                      Domain, Type, Protocol) -> non_neg_integer() when
+      Level     :: otp,
+      Direction :: set | get,
+      Opt       :: otp_socket_option(),
+      Domain    :: domain(),
+      Type      :: type(),
+      Protocol  :: protocol()
+                   ; (Level, Direction, Opt,
+                      Domain, Type, Protocol) -> non_neg_integer() when
+      Level     :: socket,
+      Direction :: set | get,
+      Opt       :: socket_option(),
+      Domain    :: domain(),
+      Type      :: type(),
+      Protocol  :: protocol()
+                   ; (Level, Direction, Opt,
+                      Domain, Type, Protocol) -> non_neg_integer() when
+      Level     :: ip,
+      Direction :: set | get,
+      Opt       :: ip_socket_option(),
+      Domain    :: domain(),
+      Type      :: type(),
+      Protocol  :: protocol()
+                   ; (Level, Direction, Opt,
+                      Domain, Type, Protocol) -> non_neg_integer() when
+      Level     :: ipv6,
+      Direction :: set | get,
+      Opt       :: ipv6_socket_option(),
+      Domain    :: domain(),
+      Type      :: type(),
+      Protocol  :: protocol()
+                   ; (Level, Direction, Opt,
+                      Domain, Type, Protocol) -> non_neg_integer() when
+      Level     :: tcp,
+      Direction :: set | get,
+      Opt       :: tcp_socket_option(),
+      Domain    :: domain(),
+      Type      :: type(),
+      Protocol  :: protocol()
+                   ; (Level, Direction, Opt,
+                      Domain, Type, Protocol) -> non_neg_integer() when
+      Level     :: udp,
+      Direction :: set | get,
+      Opt       :: udp_socket_option(),
+      Domain    :: domain(),
+      Type      :: type(),
+      Protocol  :: protocol()
+                   ; (Level, Direction, Opt,
+                      Domain, Type, Protocol) -> non_neg_integer() when
+      Level     :: sctp,
+      Direction :: set | get,
+      Opt       :: sctp_socket_option(),
+      Domain    :: domain(),
+      Type      :: type(),
+      Protocol  :: protocol()
+                   ; (Level, Direction, Opt,
+                      Domain, Type, Protocol) -> non_neg_integer() when
+      Level     :: integer(),
+      Direction :: set,
+      Opt       :: integer(),
+      Domain    :: domain(),
+      Type      :: type(),
+      Protocol  :: protocol()
+                   ; (Level, Direction, Opt,
+                      Domain, Type, Protocol) -> non_neg_integer() when
+      Level     :: integer(),
+      Direction :: get,
+      Opt       :: {NativeOpt, ValueSize},
+      NativeOpt :: integer(),
+      ValueSize :: non_neg_integer(),
+      Domain    :: domain(),
+      Type      :: type(),
+      Protocol  :: protocol().
+
+
+%% +++ OTP socket options +++
+enc_sockopt_key(otp, debug, _, _, _, _) ->
+    ?SOCKET_OPT_OTP_DEBUG;
+enc_sockopt_key(otp, iow, _, _, _, _) ->
+    ?SOCKET_OPT_OTP_IOW;
+enc_sockopt_key(otp, controlling_process, _, _, _, _) ->
+    ?SOCKET_OPT_OTP_CTRL_PROC;
+enc_sockopt_key(otp, rcvbuf, _, _, _, _) ->
+    ?SOCKET_OPT_OTP_RCVBUF;
+enc_sockopt_key(otp, rcvctrlbuf, _, _, _, _) ->
+    ?SOCKET_OPT_OTP_RCVCTRLBUF;
+enc_sockopt_key(otp, sndctrlbuf, _, _, _, _) ->
+    ?SOCKET_OPT_OTP_SNDCTRLBUF;
+enc_sockopt_key(otp, fd, get = _Dir, _, _, _) ->
+    ?SOCKET_OPT_OTP_FD;
+enc_sockopt_key(otp = L, Opt, _, _, _, _) ->
+    not_supported({L, Opt});
+
+%% +++ SOCKET socket options +++
+enc_sockopt_key(socket = _L, acceptconn = _Opt, get = _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SOCK_ACCEPTCONN;
+enc_sockopt_key(socket = L, acceptconn = Opt, Dir, _D, _T, _P) ->
+    not_supported({L, Opt, Dir});
+enc_sockopt_key(socket = L, acceptfilter = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+%% Before linux 3.8, this socket option could be set but not get.
+%% Maximum size of buffer for name: IFNAMSIZ
+%% So, we let the implementation decide.
+enc_sockopt_key(socket = _L, bindtodevice = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SOCK_BINDTODEVICE;
+enc_sockopt_key(socket, broadcast = _Opt, _Dir, _D, dgram = _T, _P) ->
+    ?SOCKET_OPT_SOCK_BROADCAST;
+enc_sockopt_key(socket = L, busy_poll = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(socket = _L, debug = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SOCK_DEBUG;
+enc_sockopt_key(socket, domain = _Opt, get = _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SOCK_DOMAIN;
+enc_sockopt_key(socket, dontroute = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SOCK_DONTROUTE;
+enc_sockopt_key(socket = L, error = Opt, get = _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+%% This is only for connection-oriented sockets, but who are those?
+%% Type = stream or Protocol = tcp?
+%% For now, we just let is pass and it will fail later if not ok...
+enc_sockopt_key(socket, keepalive = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SOCK_KEEPALIVE;
+enc_sockopt_key(socket, linger = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SOCK_LINGER;
+enc_sockopt_key(socket = L, mark = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(socket = _L, oobinline = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SOCK_OOBINLINE;
+enc_sockopt_key(socket = L, passcred = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(socket = _L, peek_off = _Opt, _Dir, local = _D, _T, _P) ->
+    ?SOCKET_OPT_SOCK_PEEK_OFF;
+enc_sockopt_key(socket = L, peekcred = Opt, get = _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(socket, priority = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SOCK_PRIORITY;
+enc_sockopt_key(socket, protocol = _Opt, get = _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SOCK_PROTOCOL;
+enc_sockopt_key(socket, rcvbuf = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SOCK_RCVBUF;
+enc_sockopt_key(socket = L, rcvbufforce = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+%% May not work on linux.
+enc_sockopt_key(socket = _L, rcvlowat = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SOCK_RCVLOWAT;
+enc_sockopt_key(socket = _L, rcvtimeo = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SOCK_RCVTIMEO;
+enc_sockopt_key(socket = _L, reuseaddr = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SOCK_REUSEADDR;
+enc_sockopt_key(socket = _L, reuseport = _Opt, _Dir, D, _T, _P)
+  when ((D =:= inet) orelse (D =:= inet6)) ->
+    ?SOCKET_OPT_SOCK_REUSEPORT;
+enc_sockopt_key(socket = L, rxq_ovfl = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(socket = L, setfib = Opt, set = _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(socket = _L, sndbuf = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SOCK_SNDBUF;
+enc_sockopt_key(socket = L, sndbufforce = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+%% Not changeable on linux.
+enc_sockopt_key(socket = _L, sndlowat = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SOCK_SNDLOWAT;
+enc_sockopt_key(socket = _L, sndtimeo = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SOCK_SNDTIMEO;
+enc_sockopt_key(socket = _L, timestamp = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SOCK_TIMESTAMP;
+enc_sockopt_key(socket = _L, type = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SOCK_TYPE;
+enc_sockopt_key(socket = L, UnknownOpt, _Dir, _D, _T, _P) ->
+    unknown({L, UnknownOpt});
+
+%% +++ IP socket options +++
+enc_sockopt_key(ip = _L, add_membership = _Opt, set = _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IP_ADD_MEMBERSHIP;
+enc_sockopt_key(ip = _L, add_source_membership = _Opt, set = _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IP_ADD_SOURCE_MEMBERSHIP;
+enc_sockopt_key(ip = _L, block_source = _Opt, set = _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IP_BLOCK_SOURCE;
+%% FreeBSD only?
+%% Only respected on udp and raw ip (unless the hdrincl option has been set).
+enc_sockopt_key(ip = L, dontfrag = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(ip = _L, drop_membership = _Opt, set = _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IP_DROP_MEMBERSHIP;
+enc_sockopt_key(ip = _L, drop_source_membership = _Opt, set = _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IP_DROP_SOURCE_MEMBERSHIP;
+%% Linux only?
+enc_sockopt_key(ip = _L, freebind = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IP_FREEBIND;
+enc_sockopt_key(ip = _L, hdrincl = _Opt, _Dir, _D, raw = _T, _P) ->
+    ?SOCKET_OPT_IP_HDRINCL;
+enc_sockopt_key(ip = _L, minttl = _Opt, _Dir, _D, raw = _T, _P) ->
+    ?SOCKET_OPT_IP_MINTTL;
+enc_sockopt_key(ip = _L, msfilter = _Opt, set = _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IP_MSFILTER;
+enc_sockopt_key(ip = _L, mtu = _Opt, get = _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IP_MTU;
+enc_sockopt_key(ip = _L, mtu_discover = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IP_MTU_DISCOVER;
+enc_sockopt_key(ip = _L, multicast_all = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IP_MULTICAST_ALL;
+enc_sockopt_key(ip = _L, multicast_if = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IP_MULTICAST_IF;
+enc_sockopt_key(ip = _L, multicast_loop = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IP_MULTICAST_LOOP;
+enc_sockopt_key(ip = _L, multicast_ttl = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IP_MULTICAST_TTL;
+enc_sockopt_key(ip = _L, nodefrag = _Opt, _Dir, _D, raw = _T, _P) ->
+    ?SOCKET_OPT_IP_NODEFRAG;
+enc_sockopt_key(ip = L, options = Opt, _Dir, _D, _T, _P) ->
+    not_supported({Opt, L});
+enc_sockopt_key(ip = _L, pktinfo = _Opt, _Dir, _D, dgram = _T, _P) ->
+    ?SOCKET_OPT_IP_PKTINFO;
+enc_sockopt_key(ip = _L, recvdstaddr = _Opt, _Dir, _D, T, _P) when (T =:= dgram) ->
+    ?SOCKET_OPT_IP_RECVDSTADDR;
+enc_sockopt_key(ip = _L, recverr = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IP_RECVERR;
+enc_sockopt_key(ip = _L, recvif = _Opt, _Dir, _D, T, _P)
+  when (T =:= dgram) orelse (T =:= raw) ->
+    ?SOCKET_OPT_IP_RECVIF;
+enc_sockopt_key(ip = _L, recvopts = _Opt, _Dir, _D, T, _P) when (T =/= stream) ->
+    ?SOCKET_OPT_IP_RECVOPTS;
+enc_sockopt_key(ip = _L, recvorigdstaddr = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IP_RECVORIGDSTADDR;
+enc_sockopt_key(ip, recvtos = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IP_RECVTOS;
+enc_sockopt_key(ip = _L, recvttl = _Opt, _Dir, _D, T, _P) when (T =/= stream) ->
+    ?SOCKET_OPT_IP_RECVTTL;
+enc_sockopt_key(ip = _L, retopts = _Opt, _Dir, _D, T, _P) when (T =/= stream) ->
+    ?SOCKET_OPT_IP_RETOPTS;
+enc_sockopt_key(ip, router_alert = _Opt, _Dir, _D, raw = _T, _P) ->
+    ?SOCKET_OPT_IP_ROUTER_ALERT;
+enc_sockopt_key(ip, sendsrcaddr = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IP_SENDSRCADDR;
+%% On FreeBSD it specifies that this option is only valid
+%% for stream, dgram and "some" raw sockets...
+%% No such condition on linux (in the man page)...
+enc_sockopt_key(ip, tos = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IP_TOS;
+enc_sockopt_key(ip = _L, transparent = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IP_TRANSPARENT;
+enc_sockopt_key(ip, ttl = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IP_TTL;
+enc_sockopt_key(ip = _L, unblock_source = _Opt, set = _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IP_UNBLOCK_SOURCE;
+enc_sockopt_key(ip = L, UnknownOpt, _Dir, _D, _T, _P) ->
+    unknown({L, UnknownOpt});
+
+%% IPv6 socket options
+enc_sockopt_key(ipv6 = _L, addrform = _Opt, set = _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IPV6_ADDRFORM;
+enc_sockopt_key(ipv6, add_membership = _Opt, set = _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IPV6_ADD_MEMBERSHIP;
+enc_sockopt_key(ipv6 = _L, authhdr = _Opt, _Dir, _D, T, _P) 
+  when ((T =:= dgram) orelse (T =:= raw)) ->
+    ?SOCKET_OPT_IPV6_AUTHHDR;
+enc_sockopt_key(ipv6 = L, auth_level = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(ipv6 = L, checksum = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(ipv6, drop_membership = _Opt, set = _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IPV6_DROP_MEMBERSHIP;
+enc_sockopt_key(ipv6 = _L, dstopts = _Opt, _Dir, _D, T, _P)
+  when (T =:= dgram) orelse (T =:= raw) ->
+    ?SOCKET_OPT_IPV6_DSTOPTS;
+enc_sockopt_key(ipv6 = L, esp_trans_level = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(ipv6 = L, esp_network_level = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(ipv6 = _L, flowinfo = _Opt, _Dir, _D, T, _P)
+  when (T =:= dgram) orelse (T =:= raw) ->
+    ?SOCKET_OPT_IPV6_DSTOPTS;
+enc_sockopt_key(ipv6, hoplimit = _Opt, _Dir, _D, T, _P)
+  when (T =:= dgram) orelse (T =:= raw) ->
+    ?SOCKET_OPT_IPV6_HOPLIMIT;
+enc_sockopt_key(ipv6 = _L, hopopts = _Opt, _Dir, _D, T, _P) 
+  when ((T =:= dgram) orelse (T =:= raw)) ->
+    ?SOCKET_OPT_IPV6_HOPOPTS;
+enc_sockopt_key(ipv6 = L, ipcomp_level = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(ipv6 = L, join_group = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(ipv6 = L, leave_group = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(ipv6 = _L, mtu = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IPV6_MTU;
+enc_sockopt_key(ipv6 = _L, mtu_discover = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IPV6_MTU_DISCOVER;
+enc_sockopt_key(ipv6 = _L, multicast_hops = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IPV6_MULTICAST_HOPS;
+enc_sockopt_key(ipv6 = _L, multicast_if = _Opt, _Dir, _D, T, _P) 
+  when (T =:= dgram) orelse (T =:= raw) ->
+    ?SOCKET_OPT_IPV6_MULTICAST_IF;
+enc_sockopt_key(ipv6 = _L, multicast_loop = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IPV6_MULTICAST_LOOP;
+enc_sockopt_key(ipv6 = L, portrange = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(ipv6 = L, pktoptions = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(ipv6 = _L, recverr = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IPV6_RECVERR;
+enc_sockopt_key(ipv6 = _L, Opt, _Dir, _D, T, _P) 
+  when ((Opt =:= recvpktinfo) orelse (Opt =:= pktinfo)) andalso 
+       ((T =:= dgram) orelse (T =:= raw)) ->
+    ?SOCKET_OPT_IPV6_RECVPKTINFO;
+enc_sockopt_key(ipv6 = L, recvtclass = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(ipv6 = _L, router_alert = _Opt, _Dir, _D, T, _P) when (T =:= raw) ->
+    ?SOCKET_OPT_IPV6_ROUTER_ALERT;
+enc_sockopt_key(ipv6 = _L, rthdr = _Opt, _Dir, _D, T, _P) 
+  when ((T =:= dgram) orelse (T =:= raw)) ->
+    ?SOCKET_OPT_IPV6_RTHDR;
+enc_sockopt_key(ipv6 = L, tclass = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(ipv6 = _L, unicast_hops = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IPV6_UNICAST_HOPS;
+enc_sockopt_key(ipv6 = L, use_min_mtu = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(ipv6 = _L, v6only = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_IPV6_V6ONLY;
+enc_sockopt_key(ipv6 = L, UnknownOpt, _Dir, _D, _T, _P) ->
+    unknown({L, UnknownOpt});
+
+%% TCP socket options
+%% There are other options that would be useful; info,
+%% but they are difficult to get portable...
+enc_sockopt_key(tcp, congestion = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_TCP_CONGESTION;
+enc_sockopt_key(tcp = L, cork = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(tcp = L, keepidle = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(tcp = L, keepintvl = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(tcp = L, keepcnt = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(tcp, maxseg = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_TCP_MAXSEG;
+enc_sockopt_key(tcp = L, md5sig = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(tcp, nodelay = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_TCP_NODELAY;
+enc_sockopt_key(tcp = L, noopt = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(tcp = L, nopush = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(tcp = L, syncnt = Opt, _Dir, _D, _T, _P) -> % Only set? 1..255
+    not_supported({L, Opt});
+enc_sockopt_key(tcp = L, user_timeout = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(tcp = L, UnknownOpt, _Dir, _D, _T, _P) ->
+    unknown({L, UnknownOpt});
+
+%% UDP socket options
+enc_sockopt_key(udp, cork = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_UDP_CORK;
+enc_sockopt_key(udp = L, UnknownOpt, _Dir, _D, _T, _P) ->
+    unknown({L, UnknownOpt});
+
+%% SCTP socket options
+enc_sockopt_key(sctp = L, adaption_layer = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(sctp = _L, associnfo = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SCTP_ASSOCINFO;
+enc_sockopt_key(sctp = L, auth_active_key = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(sctp = L, auth_asconf = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(sctp = L, auth_chunk = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(sctp = L, auth_key = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(sctp = L, auth_delete_key = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(sctp, autoclose = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SCTP_AUTOCLOSE;
+enc_sockopt_key(sctp = L, context = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(sctp = L, default_send_params = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(sctp = L, delayed_ack_time = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(sctp = _L, disable_fragments = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SCTP_DISABLE_FRAGMENTS;
+enc_sockopt_key(sctp = L, hmac_ident = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(sctp = _L, events = _Opt, set = _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SCTP_EVENTS;
+enc_sockopt_key(sctp = L, explicit_eor = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(sctp = L, fragment_interleave = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(sctp = L, get_peer_addr_info = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(sctp = _L, initmsg = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SCTP_INITMSG;
+enc_sockopt_key(sctp = L, i_want_mapped_v4_addr = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(sctp = L, local_auth_chunks = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(sctp = _L, maxseg = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SCTP_MAXSEG;
+enc_sockopt_key(sctp = L, maxburst = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(sctp, nodelay = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SCTP_NODELAY;
+enc_sockopt_key(sctp = L, partial_delivery_point = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(sctp = L, peer_addr_params = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(sctp = L, peer_auth_chunks = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(sctp = L, primary_addr = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(sctp = L, reset_streams = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(sctp = _L, rtoinfo = _Opt, _Dir, _D, _T, _P) ->
+    ?SOCKET_OPT_SCTP_RTOINFO;
+enc_sockopt_key(sctp = L, set_peer_primary_addr = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(sctp = L, status = Opt, get = _Dir, _D, _T, _P) ->
+    not_supported({L, Opt}); % ?SOCKET_OPT_SCTP_RTOINFO;
+enc_sockopt_key(sctp = L, use_exp_recvinfo = Opt, _Dir, _D, _T, _P) ->
+    not_supported({L, Opt});
+enc_sockopt_key(sctp = L, UnknownOpt, _Dir, _D, _T, _P) ->
+    unknown({L, UnknownOpt});
+
+%% +++ "Native" socket options +++
+enc_sockopt_key(Level, Opt, set = _Dir, _D, _T, _P)
+  when is_integer(Level) andalso is_integer(Opt) ->
+    Opt;
+enc_sockopt_key(Level, {NativeOpt, ValueSize} = Opt, get = _Dir, _D, _T, _P)
+  when is_integer(Level) andalso
+       is_integer(NativeOpt) andalso
+       ((is_integer(ValueSize) andalso (ValueSize >= 0)) orelse
+        ((ValueSize =:= int) orelse (ValueSize =:= bool))) ->
+    Opt;
+
+enc_sockopt_key(Level, Opt, _Dir, _Domain, _Type, _Protocol) ->
+    unknown({Level, Opt}).
+
+
+
+enc_shutdown_how(read) ->
+    ?SOCKET_SHUTDOWN_HOW_READ;
+enc_shutdown_how(write) ->
+    ?SOCKET_SHUTDOWN_HOW_WRITE;
+enc_shutdown_how(read_write) ->
+    ?SOCKET_SHUTDOWN_HOW_READ_WRITE.
+
+
+
+
+%% ===========================================================================
+%%
+%% Misc utility functions
+%%
+%% ===========================================================================
+
+-dialyzer({nowarn_function, ensure_ip_msfilter_slist/1}).
+ensure_ip_msfilter_slist(SL) ->
+    EnsureSA = fun(SA) when is_tuple(SA) andalso (size(SA) =:= 4) -> ok;
+                  (_) -> einval()
+               end,
+    lists:foreach(EnsureSA, SL).
+
+
+ensure_sockaddr(#{family := inet} = SockAddr) ->
+    maps:merge(?SOCKADDR_IN4_DEFAULTS, SockAddr);
+ensure_sockaddr(#{family := inet6} = SockAddr) ->
+    maps:merge(?SOCKADDR_IN6_DEFAULTS, SockAddr);
+ensure_sockaddr(#{family := local, path := Path} = SockAddr) 
+  when is_list(Path) andalso 
+       (length(Path) > 0) andalso 
+       (length(Path) =< 255) ->
+    BinPath = unicode:characters_to_binary(Path, file:native_name_encoding()),
+    ensure_sockaddr(SockAddr#{path => BinPath});
+ensure_sockaddr(#{family := local, path := Path} = SockAddr) 
+  when is_binary(Path) andalso 
+       (byte_size(Path) > 0) andalso 
+       (byte_size(Path) =< 255) ->
+    SockAddr;
+ensure_sockaddr(_SockAddr) ->
+    einval().
+
+
+
+cancel(SockRef, Op, OpRef) ->
+    case nif_cancel(SockRef, Op, OpRef) of
+        %% The select has already completed
+        {error, select_sent} ->
+            flush_select_msgs(SockRef, OpRef);
+        Other ->
+            Other
+    end.
+
+flush_select_msgs(SockRef, Ref) ->
+    receive
+        {?SOCKET_TAG, #socket{ref = SockRef}, select, Ref} ->
+            flush_select_msgs(SockRef, Ref)
+    after 0 ->
+            ok
+    end.
+
+
+%% formated_timestamp() ->
+%%     format_timestamp(os:timestamp()).
+
+%% format_timestamp(Now) ->
+%%     N2T = fun(N) -> calendar:now_to_local_time(N) end,
+%%     format_timestamp(Now, N2T, true).
+
+%% format_timestamp({_N1, _N2, N3} = N, N2T, true) ->
+%%     FormatExtra = ".~.2.0w",
+%%     ArgsExtra   = [N3 div 10000],
+%%     format_timestamp(N, N2T, FormatExtra, ArgsExtra);
+%% format_timestamp({_N1, _N2, _N3} = N, N2T, false) ->
+%%     FormatExtra = "",
+%%     ArgsExtra   = [],
+%%     format_timestamp(N, N2T, FormatExtra, ArgsExtra).
+
+%% format_timestamp(N, N2T, FormatExtra, ArgsExtra) ->
+%%     {Date, Time}   = N2T(N),
+%%     {YYYY,MM,DD}   = Date,
+%%     {Hour,Min,Sec} = Time,
+%%     FormatDate =
+%%         io_lib:format("~.4w-~.2.0w-~.2.0w ~.2.0w:~.2.0w:~.2.0w" ++ FormatExtra,
+%%                       [YYYY, MM, DD, Hour, Min, Sec] ++ ArgsExtra),
+%%     lists:flatten(FormatDate).
+
+
+%% A timestamp in ms
+
+timestamp(nowait = T) ->
+    T;
+timestamp(infinity) ->
+    undefined;
+timestamp(_) ->
+    timestamp().
+
+timestamp() ->
+    erlang:monotonic_time(milli_seconds).
+
+next_timeout(_, nowait = Timeout) ->
+    Timeout;
+next_timeout(_, infinity = Timeout) ->
+    Timeout;
+next_timeout(TS, Timeout) ->
+    NewTimeout = Timeout - tdiff(TS, timestamp()),
+    if
+        (NewTimeout > 0) ->
+            NewTimeout;
+        true ->
+            0
+    end.
+
+tdiff(T1, T2) ->
+    T2 - T1.
+
+
+
+%% p(F) ->
+%%     p(F, []).
+
+%% p(F, A) ->
+%%     p(get(sname), F, A).
+
+%% p(undefined, F, A) ->
+%%     p("***", F, A);
+%% p(SName, F, A) ->
+%%     TS = formated_timestamp(),
+%%     io:format(user,"[~s][~s,~p] " ++ F ++ "~n", [TS, SName, self()|A]),
+%%     io:format("[~s][~s,~p] " ++ F ++ "~n", [TS, SName, self()|A]).
+
+
+
+%% ===========================================================================
+%%
+%% Error functions
+%%
+%% ===========================================================================
+
+-spec invalid_domain(Domain) -> no_return() when
+      Domain :: term().
+
+invalid_domain(Domain) ->
+    error({invalid_domain, Domain}).
+
+-spec invalid_type(Type) -> no_return() when
+      Type :: term().
+
+invalid_type(Type) ->
+    error({invalid_type, Type}).
+
+-spec invalid_protocol(Type, Proto) -> no_return() when
+      Type  :: term(),
+      Proto :: term().
+
+invalid_protocol(Type, Proto) ->
+    error({invalid_protocol, {Type, Proto}}).
+
+-spec not_supported(What) -> no_return() when
+      What :: term().
+
+not_supported(What) ->
+    error({not_supported, What}).
+
+-spec unknown(What) -> no_return() when
+      What :: term().
+
+unknown(What) ->
+    error({unknown, What}).
+
+-spec einval() -> no_return().
+
+einval() ->
+    error(einval).
+
+-spec error(Reason) -> no_return() when
+      Reason :: term().
+
+error(Reason) ->
+    throw({error, Reason}).
+
+
+%% ===========================================================================
+%%
+%% Below follows the actual NIF-functions.
+%%
+%% ===========================================================================
+
+nif_info() ->
+    erlang:nif_error(undef).
+
+nif_info(_SRef) ->
+    erlang:nif_error(undef).
+
+nif_command(_Command) ->
+    erlang:nif_error(undef).
+
+nif_supports(_Key) ->
+    erlang:nif_error(undef).
+
+nif_open(_Domain, _Type, _Protocol, _Extra) ->
+    erlang:nif_error(undef).
+
+nif_bind(_SRef, _SockAddr) ->
+    erlang:nif_error(undef).
+
+nif_bind(_SRef, _SockAddrs, _Action) ->
+    erlang:nif_error(undef).
+
+nif_connect(_SRef, _SockAddr) ->
+    erlang:nif_error(undef).
+
+nif_finalize_connection(_SRef) ->
+    erlang:nif_error(undef).
+
+nif_listen(_SRef, _Backlog) ->
+    erlang:nif_error(undef).
+
+nif_accept(_SRef, _Ref) ->
+    erlang:nif_error(undef).
+
+nif_send(_SockRef, _SendRef, _Data, _Flags) ->
+    erlang:nif_error(undef).
+
+nif_sendto(_SRef, _SendRef, _Data, _Dest, _Flags) ->
+    erlang:nif_error(undef).
+
+nif_sendmsg(_SRef, _SendRef, _MsgHdr, _Flags) ->
+    erlang:nif_error(undef).
+
+nif_recv(_SRef, _RecvRef, _Length, _Flags) ->
+    erlang:nif_error(undef).
+
+nif_recvfrom(_SRef, _RecvRef, _Length, _Flags) ->
+    erlang:nif_error(undef).
+
+nif_recvmsg(_SRef, _RecvRef, _BufSz, _CtrlSz, _Flags) ->
+    erlang:nif_error(undef).
+
+nif_cancel(_SRef, _Op, _Ref) ->
+    erlang:nif_error(undef).
+
+nif_close(_SRef) ->
+    erlang:nif_error(undef).
+
+nif_shutdown(_SRef, _How) ->
+    erlang:nif_error(undef).
+
+nif_finalize_close(_SRef) ->
+    erlang:nif_error(undef).
+
+nif_setopt(_Ref, _IsEnc, _Lev, _Key, _Val) ->
+    erlang:nif_error(undef).
+
+nif_getopt(_Ref, _IsEnc, _Lev, _Key) ->
+    erlang:nif_error(undef).
+
+nif_sockname(_Ref) ->
+    erlang:nif_error(undef).
+
+nif_peername(_Ref) ->
+    erlang:nif_error(undef).
+
diff --git a/erts/test/erlexec_SUITE.erl b/erts/test/erlexec_SUITE.erl
index 602dc5ce2e..952e6da4dc 100644
--- a/erts/test/erlexec_SUITE.erl
+++ b/erts/test/erlexec_SUITE.erl
@@ -30,7 +30,7 @@
 -export([all/0, suite/0, init_per_testcase/2, end_per_testcase/2]).
 
 -export([args_file/1, evil_args_file/1, env/1, args_file_env/1,
-         otp_7461/1, otp_7461_remote/1, otp_8209/1,
+         otp_7461/1, otp_7461_remote/1, argument_separation/1,
          zdbbl_dist_buf_busy_limit/1]).
 
 -include_lib("common_test/include/ct.hrl").
@@ -51,21 +51,28 @@ suite() ->
 
 all() -> 
     [args_file, evil_args_file, env, args_file_env,
-     otp_7461, otp_8209, zdbbl_dist_buf_busy_limit].
+     otp_7461, argument_separation, zdbbl_dist_buf_busy_limit].
 
 %% Test that plain first argument does not
-%% destroy -home switch [OTP-8209]
-otp_8209(Config) when is_list(Config) ->
+%% destroy -home switch [OTP-8209] or interact with environments
+argument_separation(Config) when is_list(Config) ->
     {ok,[[PName]]} = init:get_argument(progname),
     SNameS = "erlexec_test_01",
     SName = list_to_atom(SNameS++"@"++
 			 hd(tl(string:lexemes(atom_to_list(node()),"@")))),
-    Cmd = PName ++ " dummy_param -sname "++SNameS++" -setcookie "++
-	atom_to_list(erlang:get_cookie()),
-    open_port({spawn,Cmd},[]),
+    Cmd = PName ++ " cmd_param -sname "++SNameS++" -setcookie "++
+	atom_to_list(erlang:get_cookie()) ++ " -cmd_test",
+    open_port({spawn,Cmd},[{env,[{"ERL_AFLAGS","-atest"},
+                                 {"ERL_FLAGS","env_param -test"},
+                                 {"ERL_ZFLAGS","zenv_param"}]}]),
     pong = loop_ping(SName,40),
+    ct:log("emu_args: ~p",[rpc:call(SName,erlang,system_info,[emu_args])]),
     {ok,[[_]]} = rpc:call(SName,init,get_argument,[home]),
-    ["dummy_param"] = rpc:call(SName,init,get_plain_arguments,[]),
+    {ok,[[]]} = rpc:call(SName,init,get_argument,[atest]),
+    {ok,[[]]} = rpc:call(SName,init,get_argument,[cmd_test]),
+    {ok,[[]]} = rpc:call(SName,init,get_argument,[test]),
+    error = rpc:call(SName,init,get_argument,[unkown]),
+    ["cmd_param","env_param","zenv_param"] = rpc:call(SName,init,get_plain_arguments,[]),
     ok = cleanup_nodes(),
     ok.
 
@@ -85,6 +92,7 @@ cleanup_node(SNameS,N) ->
     end.
 
 loop_ping(_,0) ->
+    flush(),
     pang;
 loop_ping(Node,N) ->
     case net_adm:ping(Node) of
@@ -98,6 +106,14 @@ loop_ping(Node,N) ->
 	    pong
     end.
 
+flush() ->
+    receive M ->
+            ct:pal("~p",[M]),
+            flush()
+    after 10 ->
+            ok
+    end.
+
 args_file(Config) when is_list(Config) ->
     AFN1 = privfile("1", Config),
     AFN2 = privfile("2", Config),
diff --git a/erts/test/upgrade_SUITE.erl b/erts/test/upgrade_SUITE.erl
index c32dbabe8d..f92c25bdb4 100644
--- a/erts/test/upgrade_SUITE.erl
+++ b/erts/test/upgrade_SUITE.erl
@@ -25,7 +25,7 @@
 
 -define(upgr_sname,otp_upgrade).
 
-%% Applications that are excluded from this test because they can not
+%% Applications that are excluded from this test because they cannot
 %% just be started in a new node with out specific configuration.
 -define(start_exclude,
 	[cosEvent,cosEventDomain,cosFileTransfer,cosNotification,
diff --git a/erts/test/z_SUITE.erl b/erts/test/z_SUITE.erl
index 6a34299dd2..536212af2e 100644
--- a/erts/test/z_SUITE.erl
+++ b/erts/test/z_SUITE.erl
@@ -88,10 +88,10 @@ find_cerl(DBTop) ->
 	[Cerl | _ ] ->
 	    case filelib:is_regular(Cerl) of
 		true -> Cerl;
-		_ -> false
+		_ -> find_cerl(false)
 	    end;
 	_ ->
-	    false
+	    find_cerl(false)
     end.
 
 is_dir(false) ->
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 0adee946cc..f06fd08540 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 10.2
+VSN = 10.4.4
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
diff --git a/lib/Makefile b/lib/Makefile
index cdb3f3f3dc..ea2827bef0 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -28,7 +28,7 @@ ERTS_APPLICATIONS = stdlib sasl kernel compiler
 ERLANG_APPLICATIONS = tools common_test runtime_tools inets parsetools
 
 # These are only build if -a is given to otp_build or make is used directly
-ALL_ERLANG_APPLICATIONS = xmerl edoc erl_docgen snmp otp_mibs erl_interface \
+ALL_ERLANG_APPLICATIONS = xmerl edoc erl_docgen snmp erl_interface \
 		  asn1 jinterface \
 	          wx debugger reltool \
 	          mnesia crypto os_mon syntax_tools \
@@ -58,10 +58,10 @@ else
       SUB_DIRECTORIES = hipe parsetools asn1/src
     else
       ifdef TERTIARY_BOOTSTRAP
-        SUB_DIRECTORIES = snmp sasl jinterface syntax_tools wx
+        SUB_DIRECTORIES = snmp sasl erl_interface jinterface syntax_tools wx
       else
         ifdef DOC_BOOTSTRAP
-          SUB_DIRECTORIES = xmerl edoc erl_docgen
+          SUB_DIRECTORIES = xmerl edoc erl_docgen public_key
         else # Not bootstrap build
           SUB_DIRECTORIES = $(ERTS_APPLICATIONS) \
 			    $(ERLANG_APPLICATIONS) \
diff --git a/lib/asn1/doc/src/asn1ct.xml b/lib/asn1/doc/src/asn1ct.xml
index ccf07a9cc1..e86dbd9f5e 100644
--- a/lib/asn1/doc/src/asn1ct.xml
+++ b/lib/asn1/doc/src/asn1ct.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>asn1.sgml</file>
   </header>
-  <module>asn1ct</module>
+  <module since="">asn1ct</module>
   <modulesummary>ASN.1 compiler and compile-time support functions</modulesummary>
   <description>
     <p>The ASN.1 compiler takes an ASN.1 module as input and generates a 
@@ -72,8 +72,8 @@
 
   <funcs>
     <func>
-      <name>compile(Asn1module) -> ok | {error, Reason}</name>
-      <name>compile(Asn1module, Options) -> ok | {error, Reason}</name>
+      <name since="">compile(Asn1module) -> ok | {error, Reason}</name>
+      <name since="">compile(Asn1module, Options) -> ok | {error, Reason}</name>
       <fsummary>Compiles an ASN.1 module and generates encode/decode functions according to encoding rules BER or PER.</fsummary>
       <type>
         <v>Asn1module = atom() | string()</v>
@@ -336,7 +336,7 @@ File3.asn</pre>
     </func>
 
     <func>
-      <name>value(Module, Type) -> {ok, Value} | {error, Reason}</name>
+      <name since="">value(Module, Type) -> {ok, Value} | {error, Reason}</name>
       <fsummary>Creates an ASN.1 value for test purposes.</fsummary>
       <type>
         <v>Module = Type = atom()</v>
@@ -361,9 +361,9 @@ File3.asn</pre>
     </func>
 
     <func>
-      <name>test(Module) -> ok | {error, Reason}</name>
-      <name>test(Module, Type | Options) -> ok | {error, Reason}</name>
-      <name>test(Module, Type, Value | Options) -> ok | {error, Reason}</name>
+      <name since="">test(Module) -> ok | {error, Reason}</name>
+      <name since="">test(Module, Type | Options) -> ok | {error, Reason}</name>
+      <name since="">test(Module, Type, Value | Options) -> ok | {error, Reason}</name>
       <fsummary>Performs a test of encode and decode for types in an ASN.1 module.</fsummary>
       <type>
         <v>Module = Type = atom()</v>
diff --git a/lib/asn1/doc/src/notes.xml b/lib/asn1/doc/src/notes.xml
index 22ca7840de..284a2b4ce5 100644
--- a/lib/asn1/doc/src/notes.xml
+++ b/lib/asn1/doc/src/notes.xml
@@ -32,6 +32,32 @@
   <p>This document describes the changes made to the asn1 application.</p>
 
 
+<section><title>Asn1 5.0.9</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    All incorrect (that is, all) uses of "can not" has been
+	    corrected to "cannot" in source code comments,
+	    documentation, examples, and so on.</p>
+          <p>
+	    Own Id: OTP-14282 Aux Id: PR-1891 </p>
+        </item>
+        <item>
+	    <p>Corrected problems with the following value
+	    definitions:</p> <list> <item>value of SEQUENCE OF CHOICE
+	    with extensions</item> <item>value of CHOICE with
+	    extensions</item> <item>DEFAULT used with OCTET
+	    STRING</item> </list>
+          <p>
+	    Own Id: OTP-15697 Aux Id: PR-2159 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Asn1 5.0.8</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl
index 321980e5e4..9eec05abd1 100644
--- a/lib/asn1/src/asn1ct_check.erl
+++ b/lib/asn1/src/asn1ct_check.erl
@@ -1710,7 +1710,7 @@ check_value(S,#valuedef{pos=Pos,name=Name,type=Type,
     {valueset,
      check_type(S,#typedef{pos=Pos,name=Name,typespec=NewType},NewType)};
 check_value(S, #valuedef{}=V) ->
-    ?dbg("check_value, V: ~p~n",[V0]),
+    ?dbg("check_value, V: ~p~n",[V]),
     case V of
 	#valuedef{checked=true} ->
 	    V;
@@ -1721,7 +1721,8 @@ check_value(S, #valuedef{}=V) ->
 check_valuedef(#state{recordtopname=TopName}=S0, V0) ->
     #valuedef{name=Name,type=Vtype0,value=Value,module=ModName} = V0,
     V = V0#valuedef{checked=true},
-    Vtype = check_type(S0, #typedef{name=Name,typespec=Vtype0},Vtype0),
+    Vtype1 = expand_valuedef_type(Vtype0),
+    Vtype = check_type(S0, #typedef{name=Name,typespec=Vtype1},Vtype1),
     Def = Vtype#type.def,
     S1 = S0#state{tname=Def},
     SVal = update_state(S1, ModName),
@@ -1767,6 +1768,27 @@ check_valuedef(#state{recordtopname=TopName}=S0, V0) ->
 	    V#valuedef{value=normalize_value(SVal, Vtype, Value, TopName)}
     end.
 
+expand_valuedef_type(#type{def=Seq}=Type)
+  when is_record(Seq,'SEQUENCE') ->
+    NewComponents = case Seq#'SEQUENCE'.components of
+                        {R1,_Ext,R2} -> R1 ++ R2;
+                        {Root,_Ext} -> Root;
+                        Root -> take_only_rootset(Root)
+                    end,
+    NewSeq = Seq#'SEQUENCE'{components = NewComponents},
+    Type#type{def=NewSeq};
+expand_valuedef_type(#type{def=Set}=Type)
+  when is_record(Set,'SET') ->
+    NewComponents = case Set#'SET'.components of
+                        {R1,_Ext,R2} -> R1 ++ R2;
+                        {Root,_Ext} -> Root;
+                        Root -> take_only_rootset(Root)
+                    end,
+    NewSet = Set#'SET'{components = NewComponents},
+    Type#type{def=NewSet};
+expand_valuedef_type(Type) ->
+    Type.
+
 is_contextswitchtype(#typedef{name='EXTERNAL'})->
     true;
 is_contextswitchtype(#typedef{name='EMBEDDED PDV'}) ->
@@ -1998,7 +2020,8 @@ normalize_value(S, Type, {'DEFAULT',Value}, NameList) ->
 	{'ENUMERATED',CType,_} ->
 	    normalize_enumerated(S,Value,CType);
 	{'CHOICE',CType,NewNameList} ->
-	    normalize_choice(S,Value,CType,NewNameList);
+	    ChoiceComponents = get_choice_components(S, {'CHOICE',CType}),
+	    normalize_choice(S,Value,ChoiceComponents,NewNameList);
 	{'SEQUENCE',CType,NewNameList} ->
 	    normalize_sequence(S,Value,CType,NewNameList);
 	{'SEQUENCE OF',CType,NewNameList} ->
@@ -2140,6 +2163,9 @@ normalize_octetstring(S, Value) ->
 		_ ->
 		    asn1_error(S, illegal_octet_string_value)
 	    end;
+        Val when is_binary(Val) ->
+            %% constant default value
+            Val;
 	_ ->
 	    asn1_error(S, illegal_octet_string_value)
     end.
@@ -2751,8 +2777,9 @@ check_type(S=#state{recordtopname=TopName},Type,Ts) when is_record(Ts,type) ->
 		TempNewDef#newt{type={'SEQUENCE OF',check_sequenceof(S,Type,Components)},
 				tag=
 				merge_tags(Tag,?TAG_CONSTRUCTED(?N_SEQUENCE))};
-	    {'CHOICE',Components} ->
+	    {'CHOICE',_} = Choice->
 		Ct = maybe_illicit_implicit_tag(S, choice, Tag),
+                Components = get_choice_components(S, Choice),
 		TempNewDef#newt{type={'CHOICE',check_choice(S,Type,Components)},tag=Ct};
 	    Set when is_record(Set,'SET') ->
 		RecordName=
@@ -5770,7 +5797,7 @@ format_error({missing_ocft,Component}) ->
 format_error(multiple_uniqs) ->
     "implementation limitation: only one UNIQUE field is allowed in CLASS";
 format_error({namelist_redefinition,Name}) ->
-    io_lib:format("the name '~s' can not be redefined", [Name]);
+    io_lib:format("the name '~s' cannot be redefined", [Name]);
 format_error({param_bad_type, Ref}) ->
     io_lib:format("'~p' is not a parameterized type", [Ref]);
 format_error(param_wrong_number_of_arguments) ->
diff --git a/lib/asn1/test/Makefile b/lib/asn1/test/Makefile
index c38d1c6ebd..6ff4aa8d0f 100644
--- a/lib/asn1/test/Makefile
+++ b/lib/asn1/test/Makefile
@@ -60,6 +60,7 @@ MODULES= \
 	testSeqOf \
 	testSeqOfIndefinite \
 	testSeqOfCho \
+	testSeqOfChoExt \
 	testSeqOfExternal \
 	testSeqOfTag \
 	testSetDefault \
@@ -72,6 +73,7 @@ MODULES= \
 	testSetTypeRefPrim \
 	testSetTypeRefSeq \
 	testSetTypeRefSet \
+	testDefaultOctetString \
 	testChoiceIndefinite \
 	testSetOf \
 	testSetOfCho \
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index ab78678110..a88e464996 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -99,6 +99,7 @@ groups() ->
        testChoTypeRefPrim,
        testChoTypeRefSeq,
        testChoTypeRefSet,
+       testDefaultOctetString,
        testMultipleLevels,
        testOpt,
        testSeqDefault,
@@ -118,6 +119,7 @@ groups() ->
        {group, [], [testSeqOf,
                     testSeqOfIndefinite]}, % Uses 'Mvrasn*'
        testSeqOfCho,
+       testSeqOfChoExt,
        testSetDefault,
        testExtensionAdditionGroup,
        testSetOptional,
@@ -430,6 +432,11 @@ testChoTypeRefSet(Config, Rule, Opts) ->
     asn1_test_lib:compile("ChoTypeRefSet", Config, [Rule|Opts]),
     testChoTypeRefSet:set(Rule).
 
+testDefaultOctetString(Config) -> test(Config, fun testDefaultOctetString/3).
+testDefaultOctetString(Config, Rule, Opts) ->
+    asn1_test_lib:compile("DefaultOctetString", Config, [Rule|Opts]),
+    testDefaultOctetString:dos(Rule).
+
 testMultipleLevels(Config) -> test(Config, fun testMultipleLevels/3).
 testMultipleLevels(Config, Rule, Opts) ->
     asn1_test_lib:compile("MultipleLevels", Config, [Rule|Opts]),
@@ -535,6 +542,11 @@ testSeqOfCho(Config, Rule, Opts) ->
     asn1_test_lib:compile("SeqOfCho", Config, [Rule|Opts]),
     testSeqOfCho:main(Rule).
 
+testSeqOfChoExt(Config) -> test(Config, fun testSeqOfChoExt/3).
+testSeqOfChoExt(Config, Rule, Opts) ->
+    asn1_test_lib:compile("SeqOfChoExt", Config, [Rule|Opts]),
+    testSeqOfChoExt:main(Rule).
+
 testSeqOfIndefinite(Config) ->
     test(Config, fun testSeqOfIndefinite/3, [ber]).
 testSeqOfIndefinite(Config, Rule, Opts) ->
diff --git a/lib/asn1/test/asn1_SUITE_data/ChoExtension.asn1 b/lib/asn1/test/asn1_SUITE_data/ChoExtension.asn1
index 18473bae30..c488704196 100644
--- a/lib/asn1/test/asn1_SUITE_data/ChoExtension.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/ChoExtension.asn1
@@ -41,4 +41,6 @@ ChoExt4 ::= CHOICE
   str OCTET STRING
 }
 
+choExt1 ChoExt1 ::= int : 1
+
 END
diff --git a/lib/asn1/test/asn1_SUITE_data/DefaultOctetString.asn b/lib/asn1/test/asn1_SUITE_data/DefaultOctetString.asn
new file mode 100644
index 0000000000..076e965d58
--- /dev/null
+++ b/lib/asn1/test/asn1_SUITE_data/DefaultOctetString.asn
@@ -0,0 +1,15 @@
+DefaultOctetString
+DEFINITIONS
+AUTOMATIC TAGS
+ ::=
+BEGIN
+Dos ::= SEQUENCE {
+	opt [2] OCTET STRING (SIZE(2..4)) OPTIONAL,
+	def [10] OCTET STRING (SIZE (1)) DEFAULT '05'H
+}
+
+dos Dos ::= {
+	opt '1234'H
+}
+
+END
diff --git a/lib/asn1/test/asn1_SUITE_data/IN-CS-1-Datatypes.asn b/lib/asn1/test/asn1_SUITE_data/IN-CS-1-Datatypes.asn
index ff0361f5c5..fb092f3f9c 100644
--- a/lib/asn1/test/asn1_SUITE_data/IN-CS-1-Datatypes.asn
+++ b/lib/asn1/test/asn1_SUITE_data/IN-CS-1-Datatypes.asn
@@ -1152,7 +1152,7 @@ FilteringCriteria ::= CHOICE {
 

 --  In case calledAddressValue is specified, the numbers to be filtered are from calledAddressValue

 --  up to and including calledAddressValue + maximumNumberOfCounters-1.

---  The last two digits of calledAddressvalue can not exceed 100-maximumNumberOfCounters.

+--  The last two digits of calledAddressvalue cannot exceed 100-maximumNumberOfCounters.

 FilteringTimeOut ::= CHOICE {

   duration  [0]  Duration,

   stopTime  [1]  DateAndTime

diff --git a/lib/asn1/test/asn1_SUITE_data/SeqOfChoExt.asn1 b/lib/asn1/test/asn1_SUITE_data/SeqOfChoExt.asn1
new file mode 100644
index 0000000000..51077754fd
--- /dev/null
+++ b/lib/asn1/test/asn1_SUITE_data/SeqOfChoExt.asn1
@@ -0,0 +1,27 @@
+SeqOfChoExt DEFINITIONS AUTOMATIC TAGS EXTENSIBILITY IMPLIED ::=

+BEGIN

+

+Seq2 ::= SEQUENCE {

+	octstr [PRIVATE 6] OCTET STRING OPTIONAL

+}

+

+SeqOfCho ::= SEQUENCE OF CHOICE {

+	nullable	NULL,

+	seq2 Seq2

+}

+

+Seq1 ::= SEQUENCE {

+	int INTEGER,

+	soc SeqOfCho

+}

+

+seq1 Seq1 ::= {

+  int  10,

+  soc {

+    seq2 : {

+      octstr '01020A'H

+    }

+  }

+}

+

+END

diff --git a/lib/asn1/test/testChoExtension.erl b/lib/asn1/test/testChoExtension.erl
index 4c632aab81..cfb28be5c7 100644
--- a/lib/asn1/test/testChoExtension.erl
+++ b/lib/asn1/test/testChoExtension.erl
@@ -28,6 +28,7 @@
 extension(_Rules) ->
     roundtrip('ChoExt1', {bool,true}),
     roundtrip('ChoExt1', {int,33}),
+    {int, 1} = 'ChoExtension':choExt1(),
 
     %% A trick to encode with another compatible CHOICE type to test reception
     %% extension alternative
diff --git a/lib/asn1/test/testDefaultOctetString.erl b/lib/asn1/test/testDefaultOctetString.erl
new file mode 100644
index 0000000000..82cd5810e5
--- /dev/null
+++ b/lib/asn1/test/testDefaultOctetString.erl
@@ -0,0 +1,34 @@
+-module(testDefaultOctetString).
+
+-export([dos/1]).
+
+-include_lib("common_test/include/ct.hrl").
+
+-record('Dos', {
+  opt = asn1_NOVALUE,
+  def = asn1_DEFAULT
+}).
+
+-define(def_DEFAULT, <<5>>).
+
+dos(Rules) ->
+    %% test roundtrip default
+    E1 = roundtrip(#'Dos'{}, #'Dos'{def = ?def_DEFAULT}),
+    %% test the value dos defined in the .asn file
+    E2 = roundtrip('DefaultOctetString':dos()),
+    %% sanity test a fully specified SEQUENCE
+    E3 = roundtrip(#'Dos'{opt = <<1,2,3>>, def = <<6>>}),
+    %% test def is/isn't encoded according to the value
+    if Rules == ber ->
+            <<48, 0>> = E1,
+            <<48, 4, 16#82, 2, 16#12, 16#34>> = E2,
+            <<48, 8, 16#82, 3, 1, 2, 3, 16#8A, 1, 6>> = E3;
+       true ->
+            ignore
+    end,
+    ok.
+
+roundtrip(Value) ->
+    roundtrip(Value, Value).
+roundtrip(Value, Exp) ->
+    asn1_test_lib:roundtrip('DefaultOctetString', 'Dos', Value, Exp).
diff --git a/lib/asn1/test/testSeqOfChoExt.erl b/lib/asn1/test/testSeqOfChoExt.erl
new file mode 100644
index 0000000000..1e72c60841
--- /dev/null
+++ b/lib/asn1/test/testSeqOfChoExt.erl
@@ -0,0 +1,15 @@
+-module(testSeqOfChoExt).
+
+-export([main/1]).
+
+%-record('Seq2', { octstr = asn1_NOVALUE }).
+%-record('Seq1', { int, soc }).
+
+main(_Rules) ->
+    roundtrip('SeqOfChoExt':seq1()).
+
+roundtrip(Value) ->
+    roundtrip(Value, Value).
+roundtrip(Value, Exp) ->
+    Type = element(1,Value),
+    asn1_test_lib:roundtrip('SeqOfChoExt', Type, Value, Exp).
diff --git a/lib/asn1/vsn.mk b/lib/asn1/vsn.mk
index 69f1af28e8..018beda307 100644
--- a/lib/asn1/vsn.mk
+++ b/lib/asn1/vsn.mk
@@ -1 +1 @@
-ASN1_VSN = 5.0.8
+ASN1_VSN = 5.0.9
diff --git a/lib/common_test/doc/src/basics_chapter.xml b/lib/common_test/doc/src/basics_chapter.xml
index 95599ca1f1..899a52fa31 100644
--- a/lib/common_test/doc/src/basics_chapter.xml
+++ b/lib/common_test/doc/src/basics_chapter.xml
@@ -125,7 +125,7 @@
       The test case is the smallest unit that the <c>Common Test</c> test server deals with.
     </p>
     <p>
-      Subsets of test cases, called test case groups, can also be defined. A test case 
+      Sets of test cases, called test case groups, can also be defined. A test case
       group can have execution properties associated with it. Execution properties 
       specify if the test cases in the group are to be executed in
       random order, in parallel, or in sequence, and if the execution of the group 
diff --git a/lib/common_test/doc/src/common_test_app.xml b/lib/common_test/doc/src/common_test_app.xml
index a3b3f927eb..081adeaec7 100644
--- a/lib/common_test/doc/src/common_test_app.xml
+++ b/lib/common_test/doc/src/common_test_app.xml
@@ -32,7 +32,7 @@
     <rev>PA1</rev>
     <file>common_test_app.sgml</file>
   </header>
-  <module>common_test</module> 
+  <module since="">common_test</module> 
   <modulesummary>A framework for automated testing of any target nodes.</modulesummary>
 
   <description>
@@ -68,18 +68,19 @@
 
   <funcs>
     <func>
-      <name>Module:all() -> Tests | {skip,Reason} </name>
+      <name since="">Module:all() -> Tests | {skip,Reason} </name>
       <fsummary>Returns the list of all test case groups and test cases
 	in the module.</fsummary>
       <type>
-	<v>Tests = [TestCase | {group,GroupName} | {group,GroupName,Properties} | {group,GroupName,Properties,SubGroups}]</v>
+	<v>Tests = [TestCase | {testcase,TestCase,TCRepeatProps} | {group,GroupName} | {group,GroupName,Properties} | {group,GroupName,Properties,SubGroups}]</v>
 	<v>TestCase = atom()</v>
+	<v>TCRepeatProps = [{repeat,N} | {repeat_until_ok,N} | {repeat_until_fail,N}]</v>
 	<v>GroupName = atom()</v>
-	<v>Properties = [parallel | sequence | Shuffle | {RepeatType,N}] | default</v>
+	<v>Properties = [parallel | sequence | Shuffle | {GroupRepeatType,N}] | default</v>
 	<v>SubGroups = [{GroupName,Properties} | {GroupName,Properties,SubGroups}]</v>
 	<v>Shuffle = shuffle | {shuffle,Seed}</v>
 	<v>Seed = {integer(),integer(),integer()}</v>
-	<v>RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail | repeat_until_any_ok | repeat_until_any_fail</v>
+	<v>GroupRepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail | repeat_until_any_ok | repeat_until_any_fail</v>
 	<v>N = integer() | forever</v>
 	<v>Reason = term()</v>
       </type>
@@ -91,7 +92,8 @@
           test suite module to be executed. This list also specifies the
           order the cases and groups are executed by <c>Common Test</c>.
           A test case is represented by an atom,
-	  the name of the test case function. A test case group is
+	  the name of the test case function, or a <c>testcase</c> tuple
+	  indicating that the test case shall be repeated. A test case group is
 	  represented by a <c>group</c> tuple, where <c>GroupName</c>,
 	  an atom, is the name of the group (defined in
 	  <seealso marker="#Module:groups-0"><c>groups/0</c></seealso>).
@@ -115,18 +117,19 @@
     </func>
 
     <func>
-      <name>Module:groups() -> GroupDefs</name>
+      <name since="">Module:groups() -> GroupDefs</name>
       <fsummary>Returns a list of test case group definitions.</fsummary>
       <type>
         <v>GroupDefs = [Group]</v>
         <v>Group = {GroupName,Properties,GroupsAndTestCases}</v>
         <v>GroupName = atom()</v>
-        <v>Properties = [parallel | sequence | Shuffle | {RepeatType,N}]</v>
-        <v>GroupsAndTestCases = [Group | {group,GroupName} | TestCase]</v>
+        <v>Properties = [parallel | sequence | Shuffle | {GroupRepeatType,N}]</v>
+        <v>GroupsAndTestCases = [Group | {group,GroupName} | TestCase | {testcase,TestCase,TCRepeatProps}]</v>
         <v>TestCase = atom()</v>
+	<v>TCRepeatProps = [{repeat,N} | {repeat_until_ok,N} | {repeat_until_fail,N}]</v>
         <v>Shuffle = shuffle | {shuffle,Seed}</v>
         <v>Seed = {integer(),integer(),integer()}</v>
-        <v>RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail | repeat_until_any_ok | repeat_until_any_fail</v>
+        <v>GroupRepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail | repeat_until_any_ok | repeat_until_any_fail</v>
         <v>N = integer() | forever</v>
       </type>
 
@@ -140,7 +143,7 @@
     </func>
 
       <func>
-	<name>Module:suite() -> [Info] </name>
+	<name since="">Module:suite() -> [Info] </name>
 	<fsummary>Test suite info function (providing default data
 	  for the suite).</fsummary>
 	<type>
@@ -213,7 +216,7 @@
     </func>
 
       <func>
-	<name>Module:init_per_suite(Config) -> NewConfig | {skip,Reason} |
+	<name since="">Module:init_per_suite(Config) -> NewConfig | {skip,Reason} |
 	  {skip_and_save,Reason,SaveConfig}</name>
 	<fsummary>Test suite initializations.</fsummary>
 	<type>
@@ -248,7 +251,7 @@
     </func>
 
     <func>
-      <name>Module:end_per_suite(Config) -> term() | 
+      <name since="">Module:end_per_suite(Config) -> term() | 
 	{save_config,SaveConfig}</name>
       <fsummary>Test suite finalization.</fsummary>
       <type>
@@ -272,7 +275,7 @@
     </func>
 
     <func>
-      <name>Module:group(GroupName) -> [Info] </name>
+      <name since="OTP R15B">Module:group(GroupName) -> [Info] </name>
       <fsummary>Test case group information function (providing default data
         for a test case group, that is, its test cases and
         subgroups).</fsummary>
@@ -352,7 +355,7 @@
     </func>
 
       <func>
-	<name>Module:init_per_group(GroupName, Config) -> NewConfig |
+	<name since="">Module:init_per_group(GroupName, Config) -> NewConfig |
 	  {skip,Reason}</name>
 	<fsummary>Test case group initializations.</fsummary>
 	<type>
@@ -390,7 +393,7 @@
     </func>
 
       <func>
-	<name>Module:end_per_group(GroupName, Config) -> term() |
+	<name since="">Module:end_per_group(GroupName, Config) -> term() |
 	  {return_group_result,Status}</name>
 	<fsummary>Test case group finalization.</fsummary>
 	<type>
@@ -424,7 +427,7 @@
     </func>
 
       <func>
-	<name>Module:init_per_testcase(TestCase, Config) -> NewConfig | {fail,Reason} | {skip,Reason}</name>
+	<name since="">Module:init_per_testcase(TestCase, Config) -> NewConfig | {fail,Reason} | {skip,Reason}</name>
 	<fsummary>Test case initializations.</fsummary>
 	<type>
 	  <v> TestCase = atom()</v>
@@ -454,7 +457,7 @@
     </func>
 
       <func>
-	<name>Module:end_per_testcase(TestCase, Config) -> term() | {fail,Reason} | {save_config,SaveConfig}</name>
+	<name since="">Module:end_per_testcase(TestCase, Config) -> term() | {fail,Reason} | {save_config,SaveConfig}</name>
 	<fsummary>Test case finalization.</fsummary>
 	<type>
 	  <v>TestCase = atom()</v>
@@ -486,7 +489,7 @@
       </func>
 
     <func>
-      <name>Module:Testcase() -> [Info] </name>
+      <name since="OTP R14B">Module:Testcase() -> [Info] </name>
       <fsummary>Test case information function.</fsummary>
       <type>
 	<v>Info = {timetrap,Time} | {require,Required} | {require,Name,Required} | {userdata,UserData} | {silent_connections,Conns}</v>
@@ -560,7 +563,7 @@
     </func>
 
     <func>
-	<name>Module:Testcase(Config) ->  term() | {skip,Reason} | {comment,Comment} | {save_config,SaveConfig} | {skip_and_save,Reason,SaveConfig} | exit() </name>
+	<name since="OTP R14B">Module:Testcase(Config) ->  term() | {skip,Reason} | {comment,Comment} | {save_config,SaveConfig} | {skip_and_save,Reason,SaveConfig} | exit() </name>
       <fsummary>A test case.</fsummary>
       <type>
 	<v>Config = SaveConfig = [{Key,Value}]</v>
diff --git a/lib/common_test/doc/src/ct.xml b/lib/common_test/doc/src/ct.xml
index c0380c4142..83c0ecb309 100644
--- a/lib/common_test/doc/src/ct.xml
+++ b/lib/common_test/doc/src/ct.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>ct.xml</file>
   </header>
-  <module>ct</module>
+  <module since="">ct</module>
   <modulesummary>Main user interface for the Common Test framework.</modulesummary>
 
   <description>
@@ -139,7 +139,7 @@
 
   <funcs>
     <func>
-      <name>abort_current_testcase(Reason) -&gt; ok | {error, ErrorReason}</name>
+      <name since="">abort_current_testcase(Reason) -&gt; ok | {error, ErrorReason}</name>
       <fsummary>Aborts the currently executing test case.</fsummary>
       <type>
         <v>Reason = term()</v>
@@ -157,7 +157,7 @@
     </func>
 
     <func>
-      <name>add_config(Callback, Config) -&gt; ok | {error, Reason}</name>
+      <name since="OTP R14B">add_config(Callback, Config) -&gt; ok | {error, Reason}</name>
       <fsummary>Loads configuration variables using the specified callback
         module and configuration string.</fsummary>
       <type>
@@ -176,7 +176,7 @@
     </func>
 
     <func>
-      <name>break(Comment) -&gt; ok | {error, Reason}</name>
+      <name since="OTP R15B02">break(Comment) -&gt; ok | {error, Reason}</name>
       <fsummary>Cancels any active timetrap and pause the execution of the
         current test case until the user calls function continue/0.</fsummary>
       <type>
@@ -206,7 +206,7 @@
     </func>
 
     <func>
-      <name>break(TestCase, Comment) -&gt; ok | {error, Reason}</name>
+      <name since="OTP R15B02">break(TestCase, Comment) -&gt; ok | {error, Reason}</name>
       <fsummary>Works the same way as break/1, only argument TestCase makes it
         possible to pause a test case executing in a parallel group.</fsummary>
       <type>
@@ -228,7 +228,7 @@
     </func>
 
     <func>
-      <name>capture_get() -&gt; ListOfStrings</name>
+      <name since="OTP R15B">capture_get() -&gt; ListOfStrings</name>
       <fsummary>Equivalent to capture_get([default]).</fsummary>
       <type>
         <v>ListOfStrings = [string()]</v>
@@ -240,7 +240,7 @@
     </func>
 
     <func>
-      <name>capture_get(ExclCategories) -&gt; ListOfStrings</name>
+      <name since="OTP R15B">capture_get(ExclCategories) -&gt; ListOfStrings</name>
       <fsummary>Returns and purges the list of text strings buffered during
         the latest session of capturing printouts to stdout.</fsummary>
       <type>
@@ -262,7 +262,7 @@
     </func>
 
     <func>
-      <name>capture_start() -&gt; ok</name>
+      <name since="OTP R15B">capture_start() -&gt; ok</name>
       <fsummary>Starts capturing all text strings printed to stdout
         during execution of the test case.</fsummary>
         <desc><marker id="capture_start-0"/>
@@ -276,7 +276,7 @@
     </func>
 
     <func>
-      <name>capture_stop() -&gt; ok</name>
+      <name since="OTP R15B">capture_stop() -&gt; ok</name>
       <fsummary>Stops capturing text strings (a session started with
         capture_start/0).</fsummary>
       <desc><marker id="capture_stop-0"/>
@@ -290,7 +290,7 @@
     </func>
 
     <func>
-      <name>comment(Comment) -&gt; ok</name>
+      <name since="">comment(Comment) -&gt; ok</name>
       <fsummary>Prints the specified Comment in the comment field in the
         table on the test suite result page.</fsummary>
       <type>
@@ -307,7 +307,7 @@
     </func>
 
     <func>
-      <name>comment(Format, Args) -&gt; ok</name>
+      <name since="OTP R15B">comment(Format, Args) -&gt; ok</name>
       <fsummary>Prints the formatted string in the comment field in the
         table on the test suite result page.</fsummary>
       <type>
@@ -326,7 +326,7 @@
     </func>
 
     <func>
-      <name>continue() -&gt; ok</name>
+      <name since="OTP R15B02">continue() -&gt; ok</name>
       <fsummary>This function must be called to continue after a test
         case (not executing in a parallel group) has called break/1.</fsummary>
       <desc><marker id="continue-0"/>
@@ -337,7 +337,7 @@
     </func>
 
     <func>
-      <name>continue(TestCase) -&gt; ok</name>
+      <name since="OTP R15B02">continue(TestCase) -&gt; ok</name>
       <fsummary>This function must be called to continue after a test case
         has called break/2.</fsummary>
       <type>
@@ -353,7 +353,7 @@
     </func>
 
     <func>
-      <name>decrypt_config_file(EncryptFileName, TargetFileName) -&gt; ok | {error, Reason}</name>
+      <name since="">decrypt_config_file(EncryptFileName, TargetFileName) -&gt; ok | {error, Reason}</name>
       <fsummary>Decrypts EncryptFileName, previously generated with
         encrypt_config_file/2,3.</fsummary>
       <type>
@@ -372,7 +372,7 @@
     </func>
 
     <func>
-      <name>decrypt_config_file(EncryptFileName, TargetFileName, KeyOrFile) -&gt; ok | {error, Reason}</name>
+      <name since="">decrypt_config_file(EncryptFileName, TargetFileName, KeyOrFile) -&gt; ok | {error, Reason}</name>
       <fsummary>Decrypts EncryptFileName, previously generated with
         encrypt_config_file/2,3.</fsummary>
       <type>
@@ -390,7 +390,7 @@
     </func>
 
     <func>
-      <name>encrypt_config_file(SrcFileName, EncryptFileName) -&gt; ok | {error, Reason}</name>
+      <name since="">encrypt_config_file(SrcFileName, EncryptFileName) -&gt; ok | {error, Reason}</name>
       <fsummary>Encrypts the source configuration file with DES3 and saves the
         result in file EncryptFileName.</fsummary>
       <type>
@@ -416,7 +416,7 @@
     </func>
 
     <func>
-      <name>encrypt_config_file(SrcFileName, EncryptFileName, KeyOrFile) -&gt; ok | {error, Reason}</name>
+      <name since="">encrypt_config_file(SrcFileName, EncryptFileName, KeyOrFile) -&gt; ok | {error, Reason}</name>
       <fsummary>Encrypts the source configuration file with DES3 and saves the
        result in the target file EncryptFileName.</fsummary>
       <type>
@@ -442,7 +442,7 @@
     </func>
 
     <func>
-      <name>fail(Reason) -&gt; ok</name>
+      <name since="">fail(Reason) -&gt; ok</name>
       <fsummary>Terminates a test case with the specified error
         Reason.</fsummary>
       <type>
@@ -454,7 +454,7 @@
     </func>
 
     <func>
-      <name>fail(Format, Args) -&gt; ok</name>
+      <name since="OTP R15B">fail(Format, Args) -&gt; ok</name>
       <fsummary>Terminates a test case with an error message specified by
         a format string and a list of values (used as arguments to
         io_lib:format/2).</fsummary>
@@ -470,7 +470,7 @@
     </func>
 
     <func>
-      <name>get_config(Required) -&gt; Value</name>
+      <name since="">get_config(Required) -&gt; Value</name>
       <fsummary>Equivalent to get_config(Required, undefined, []).</fsummary>
       <desc><marker id="get_config-1"/>
         <p>Equivalent to <seealso marker="#get_config-3"><c>ct:get_config(Required,
@@ -479,7 +479,7 @@
     </func>
 
     <func>
-      <name>get_config(Required, Default) -&gt; Value</name>
+      <name since="">get_config(Required, Default) -&gt; Value</name>
       <fsummary>Equivalent to get_config(Required, Default, []).</fsummary>
       <desc><marker id="get_config-2"/>
         <p>Equivalent to <seealso marker="#get_config-3"><c>ct:get_config(Required,
@@ -488,7 +488,7 @@
     </func>
 
     <func>
-      <name>get_config(Required, Default, Opts) -&gt; ValueOrElement</name>
+      <name since="">get_config(Required, Default, Opts) -&gt; ValueOrElement</name>
       <fsummary>Reads configuration data values.</fsummary>
       <type>
         <v>Required = KeyOrName | {KeyOrName, SubKey} | {KeyOrName, SubKey, SubKey}</v>
@@ -554,7 +554,7 @@
     </func>
 
     <func>
-      <name>get_event_mgr_ref() -&gt; EvMgrRef</name>
+      <name since="OTP 17.5">get_event_mgr_ref() -&gt; EvMgrRef</name>
       <fsummary>Gets a reference to the <c>Common Test</c> event manager.</fsummary>
         <type>
           <v>EvMgrRef = atom()</v>
@@ -572,7 +572,7 @@
     </func>
 
     <func>
-      <name>get_progname() -&gt; string()</name>
+      <name since="OTP 21.0">get_progname() -&gt; string()</name>
       <fsummary>Returns the command used to start this Erlang instance.</fsummary>
       <desc><marker id="get_progname-0"/>
         <p>Returns the command used to start this Erlang instance.
@@ -582,7 +582,7 @@
     </func>
 
     <func>
-      <name>get_status() -&gt; TestStatus | {error, Reason} | no_tests_running</name>
+      <name since="">get_status() -&gt; TestStatus | {error, Reason} | no_tests_running</name>
       <fsummary>Returns status of ongoing test.</fsummary>
       <type>
         <v>TestStatus = [StatusElem]</v>
@@ -608,7 +608,7 @@
     </func>
 
     <func>
-      <name>get_target_name(Handle) -&gt; {ok, TargetName} | {error, Reason}</name>
+      <name since="">get_target_name(Handle) -&gt; {ok, TargetName} | {error, Reason}</name>
       <fsummary>Returns the name of the target that the specified connection
         belongs to.</fsummary>
       <type>
@@ -622,7 +622,7 @@
     </func>
 
     <func>
-      <name>get_testspec_terms() -&gt; TestSpecTerms | undefined</name>
+      <name since="OTP 18.0">get_testspec_terms() -&gt; TestSpecTerms | undefined</name>
       <fsummary>Gets a list of all test specification terms used to
         configure and run this test.</fsummary>
       <type>
@@ -636,7 +636,7 @@
     </func>
 
     <func>
-      <name>get_testspec_terms(Tags) -&gt; TestSpecTerms | undefined</name>
+      <name since="OTP 18.0">get_testspec_terms(Tags) -&gt; TestSpecTerms | undefined</name>
       <fsummary>Reads one or more terms from the test specification used to
         configure and run this test.</fsummary>
       <type>
@@ -663,7 +663,7 @@
     </func>
 
     <func>
-      <name>get_timetrap_info() -&gt; {Time, {Scaling,ScaleVal}}</name>
+      <name since="OTP R15B">get_timetrap_info() -&gt; {Time, {Scaling,ScaleVal}}</name>
       <fsummary>Reads information about the timetrap set for the current
         test case.</fsummary>
       <type>
@@ -682,7 +682,7 @@
     </func>
 
     <func>
-      <name>get_verbosity(Category) -&gt; Level | undefined</name>
+      <name since="OTP 19.1">get_verbosity(Category) -&gt; Level | undefined</name>
       <fsummary>Read the verbosity level for a logging category.</fsummary>
       <type>
         <v>Category = default | atom()</v>
@@ -697,7 +697,7 @@
     </func>
 
     <func>
-      <name>install(Opts) -&gt; ok | {error, Reason}</name>
+      <name since="">install(Opts) -&gt; ok | {error, Reason}</name>
       <fsummary>Installs configuration files and event handlers.</fsummary>
       <type>
         <v>Opts = [Opt]</v>
@@ -724,7 +724,7 @@
     </func>
 
     <func>
-      <name>listenv(Telnet) -&gt; [Env]</name>
+      <name since="">listenv(Telnet) -&gt; [Env]</name>
       <fsummary>Performs command listenv on the specified Telnet connection
         and returns the result as a list of key-value pairs.</fsummary>
       <type>
@@ -740,7 +740,7 @@
     </func>
 
     <func>
-      <name>log(Format) -&gt; ok</name>
+      <name since="">log(Format) -&gt; ok</name>
       <fsummary>Equivalent to log(default, 50, Format, [], []).</fsummary>
       <desc><marker id="log-1"/>
         <p>Equivalent to
@@ -749,7 +749,7 @@
     </func>
 
     <func>
-      <name>log(X1, X2) -&gt; ok</name>
+      <name since="">log(X1, X2) -&gt; ok</name>
       <fsummary>Equivalent to log(Category, Importance, Format,
         FormatArgs, []).</fsummary>
       <type>
@@ -763,7 +763,7 @@
     </func>
 
     <func>
-      <name>log(X1, X2, X3) -&gt; ok</name>
+      <name since="">log(X1, X2, X3) -&gt; ok</name>
       <fsummary>Equivalent to log(Category, Importance, Format,
         FormatArgs, Opts).</fsummary>
       <type>
@@ -778,7 +778,7 @@
     </func>
 
     <func>
-      <name>log(X1, X2, X3, X4) -&gt; ok</name>
+      <name since="OTP R15B02">log(X1, X2, X3, X4) -&gt; ok</name>
       <fsummary>Equivalent to log(Category, Importance, Format,
         FormatArgs, Opts).</fsummary>
       <type>
@@ -794,7 +794,7 @@
     </func>
 
     <func>
-      <name>log(Category, Importance, Format, FormatArgs, Opts) -&gt; ok</name>
+      <name since="OTP 18.3">log(Category, Importance, Format, FormatArgs, Opts) -&gt; ok</name>
       <fsummary>Prints from a test case to the log file.</fsummary>
       <type>
         <v>Category = atom()</v>
@@ -825,7 +825,7 @@
     </func>
 
     <func>
-      <name>make_priv_dir() -&gt; ok | {error, Reason}</name>
+      <name since="OTP R15B01">make_priv_dir() -&gt; ok | {error, Reason}</name>
       <fsummary>If the test has been started with option create_priv_dir
         set to manual_per_tc, in order for the test case to use the private
         directory, it must first create it by calling this function.</fsummary>
@@ -841,7 +841,7 @@
     </func>
 
     <func>
-      <name>notify(Name, Data) -&gt; ok</name>
+      <name since="OTP R15B02">notify(Name, Data) -&gt; ok</name>
       <fsummary>Sends an asynchronous notification of type Name with Data
         to the <c>Common Test</c> event manager.</fsummary>
       <type>
@@ -859,7 +859,7 @@
     </func>
 
     <func>
-      <name>pal(Format) -&gt; ok</name>
+      <name since="">pal(Format) -&gt; ok</name>
       <fsummary>Equivalent to pal(default, 50, Format, [], []).</fsummary>
       <desc><marker id="pal-1"/>
         <p>Equivalent to
@@ -869,7 +869,7 @@
     </func>
 
     <func>
-      <name>pal(X1, X2) -&gt; ok</name>
+      <name since="">pal(X1, X2) -&gt; ok</name>
       <fsummary>Equivalent to pal(Category, Importance, Format,
         FormatArgs, []).</fsummary>
       <type>
@@ -883,7 +883,7 @@
     </func>
 
     <func>
-      <name>pal(X1, X2, X3) -&gt; ok</name>
+      <name since="">pal(X1, X2, X3) -&gt; ok</name>
       <fsummary>Equivalent to pal(Category, Importance, Format,
         FormatArgs, Opts).</fsummary>
       <type>
@@ -898,7 +898,7 @@
     </func>
 
     <func>
-      <name>pal(X1, X2, X3, X4) -&gt; ok</name>
+      <name since="OTP R15B02">pal(X1, X2, X3, X4) -&gt; ok</name>
       <fsummary>Equivalent to pal(Category, Importance, Format,
         FormatArgs, Opts).</fsummary>
       <type>
@@ -914,7 +914,7 @@
     </func>
 
     <func>
-      <name>pal(Category, Importance, Format, FormatArgs, Opts) -&gt; ok</name>
+      <name since="OTP 19.2">pal(Category, Importance, Format, FormatArgs, Opts) -&gt; ok</name>
       <fsummary>Prints and logs from a test case.</fsummary>
       <type>
         <v>Category = atom()</v>
@@ -945,7 +945,7 @@
     </func>
 
     <func>
-      <name>parse_table(Data) -&gt; {Heading, Table}</name>
+      <name since="">parse_table(Data) -&gt; {Heading, Table}</name>
       <fsummary>Parses the printout from an SQL table and returns a list of
         tuples.</fsummary>
       <type>
@@ -967,7 +967,7 @@
     </func>
 
     <func>
-      <name>print(Format) -&gt; ok</name>
+      <name since="">print(Format) -&gt; ok</name>
       <fsummary>Equivalent to print(default, 50, Format, [], []).</fsummary>
       <desc><marker id="print-1"/>
         <p>Equivalent to <seealso marker="#print-5"><c>ct:print(default,
@@ -976,7 +976,7 @@
     </func>
 
     <func>
-      <name>print(X1, X2) -&gt; ok</name>
+      <name since="OTP R15B02">print(X1, X2) -&gt; ok</name>
       <fsummary>Equivalent to print(Category, Importance, Format,
         FormatArgs, []).</fsummary>
       <type>
@@ -990,7 +990,7 @@
     </func>
 
     <func>
-      <name>print(X1, X2, X3) -&gt; ok</name>
+      <name since="">print(X1, X2, X3) -&gt; ok</name>
       <fsummary>Equivalent to print(Category, Importance, Format,
         FormatArgs, Opts).</fsummary>
       <type>
@@ -1005,7 +1005,7 @@
     </func>
 
     <func>
-      <name>print(X1, X2, X3, X4) -&gt; ok</name>
+      <name since="OTP R15B02">print(X1, X2, X3, X4) -&gt; ok</name>
       <fsummary>Equivalent to print(Category, Importance, Format,
         FormatArgs, Opts).</fsummary>
       <type>
@@ -1021,7 +1021,7 @@
     </func>
 
     <func>
-      <name>print(Category, Importance, Format, FormatArgs, Opts) -&gt; ok</name>
+      <name since="OTP 19.2">print(Category, Importance, Format, FormatArgs, Opts) -&gt; ok</name>
       <fsummary>Prints from a test case to the console.</fsummary>
       <type>
         <v>Category = atom()</v>
@@ -1048,7 +1048,7 @@
     </func>
 
     <func>
-      <name>reload_config(Required) -&gt; ValueOrElement | {error, Reason}</name>
+      <name since="OTP R14B">reload_config(Required) -&gt; ValueOrElement | {error, Reason}</name>
       <fsummary>Reloads configuration file containing specified configuration
         key.</fsummary>
       <type>
@@ -1071,7 +1071,7 @@
     </func>
 
      <func>
-      <name>remaining_test_procs() -&gt; {TestProcs,SharedGL,OtherGLs}</name>
+      <name since="OTP 20.2">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>
@@ -1107,7 +1107,7 @@
     </func>   
 
     <func>
-      <name>remove_config(Callback, Config) -&gt; ok</name>
+      <name since="OTP R14B">remove_config(Callback, Config) -&gt; ok</name>
       <fsummary>Removes configuration variables (together with
         their aliases) that were loaded with specified callback module and
         configuration string.</fsummary>
@@ -1124,7 +1124,7 @@
     </func>
 
     <func>
-      <name>require(Required) -&gt; ok | {error, Reason}</name>
+      <name since="">require(Required) -&gt; ok | {error, Reason}</name>
       <fsummary>Checks if the required configuration is available.</fsummary>
       <type>
         <v>Required = Key | {Key, SubKeys} | {Key, SubKey, SubKeys}</v>
@@ -1178,7 +1178,7 @@
     </func>
 
     <func>
-      <name>require(Name, Required) -&gt; ok | {error, Reason}</name>
+      <name since="">require(Name, Required) -&gt; ok | {error, Reason}</name>
       <fsummary>Checks if the required configuration is available and gives
         it a name.</fsummary>
       <type>
@@ -1237,7 +1237,7 @@
     </func>
 
     <func>
-      <name>run(TestDirs) -&gt; Result</name>
+      <name since="">run(TestDirs) -&gt; Result</name>
       <fsummary>Runs all test cases in all suites in the specified
         directories.</fsummary>
       <type>
@@ -1251,7 +1251,7 @@
     </func>
 
     <func>
-      <name>run(TestDir, Suite) -&gt; Result</name>
+      <name since="">run(TestDir, Suite) -&gt; Result</name>
       <fsummary>Runs all test cases in the specified suite.</fsummary>
       <desc><marker id="run-2"/>
         <p>Runs all test cases in the specified suite.</p>
@@ -1261,7 +1261,7 @@
     </func>
 
     <func>
-      <name>run(TestDir, Suite, Cases) -&gt; Result</name>
+      <name since="">run(TestDir, Suite, Cases) -&gt; Result</name>
       <fsummary>Runs the specified test cases.</fsummary>
       <type>
         <v>TestDir = string()</v>
@@ -1283,7 +1283,7 @@
     </func>
 
     <func>
-      <name>run_test(Opts) -&gt; Result</name>
+      <name since="">run_test(Opts) -&gt; Result</name>
       <fsummary>Runs tests as specified by the combination of options in
         Opts.</fsummary>
       <type>
@@ -1355,7 +1355,7 @@
     </func>
 
     <func>
-      <name>run_testspec(TestSpec) -&gt; Result</name>
+      <name since="">run_testspec(TestSpec) -&gt; Result</name>
       <fsummary>Runs a test specified by TestSpec.</fsummary>
       <type>
         <v>TestSpec = [term()]</v>
@@ -1375,7 +1375,7 @@
     </func>
 
     <func>
-      <name>set_verbosity(Category, Level) -&gt; ok</name>
+      <name since="OTP 19.1">set_verbosity(Category, Level) -&gt; ok</name>
       <fsummary>Set the verbosity level for a logging category.</fsummary>
       <type>
         <v>Category = default | atom()</v>
@@ -1390,7 +1390,7 @@
     </func>
 
     <func>
-      <name>sleep(Time) -&gt; ok</name>
+      <name since="OTP R14B">sleep(Time) -&gt; ok</name>
       <fsummary>This function, similar to timer:sleep/1, suspends the
         test case for a specified time.</fsummary>
       <type>
@@ -1412,7 +1412,7 @@
     </func>
 
     <func>
-      <name>start_interactive() -&gt; ok</name>
+      <name since="">start_interactive() -&gt; ok</name>
       <fsummary>Starts <c>Common Test</c> in interactive mode.</fsummary>
       <desc><marker id="start_interactive-0"/>
         <p>Starts <c>Common Test</c> in interactive mode.</p>
@@ -1440,7 +1440,7 @@
     </func>
 
     <func>
-      <name>step(TestDir, Suite, Case) -&gt; Result</name>
+      <name since="">step(TestDir, Suite, Case) -&gt; Result</name>
       <fsummary>Steps through a test case with the debugger.</fsummary>
       <type>
         <v>Case = atom()</v>
@@ -1453,7 +1453,7 @@
     </func>
 
     <func>
-      <name>step(TestDir, Suite, Case, Opts) -&gt; Result</name>
+      <name since="">step(TestDir, Suite, Case, Opts) -&gt; Result</name>
       <fsummary>Steps through a test case with the debugger.</fsummary>
       <type>
         <v>Case = atom()</v>
@@ -1470,7 +1470,7 @@
     </func>
 
     <func>
-      <name>stop_interactive() -&gt; ok</name>
+      <name since="">stop_interactive() -&gt; ok</name>
       <fsummary>Exits the interactive mode.</fsummary>
       <desc><marker id="stop_interactive-0"/>
         <p>Exits the interactive mode.</p>
@@ -1482,7 +1482,7 @@
     </func>
 
     <func>
-      <name>sync_notify(Name, Data) -&gt; ok</name>
+      <name since="OTP R15B02">sync_notify(Name, Data) -&gt; ok</name>
       <fsummary>Sends a synchronous notification of type Name with Data to
         the <c>Common Test</c> event manager.</fsummary>
       <type>
@@ -1501,7 +1501,7 @@
     </func>
 
     <func>
-      <name>testcases(TestDir, Suite) -&gt; Testcases | {error, Reason}</name>
+      <name since="">testcases(TestDir, Suite) -&gt; Testcases | {error, Reason}</name>
       <fsummary>Returns all test cases in the specified suite.</fsummary>
       <type>
         <v>TestDir = string()</v>
@@ -1515,7 +1515,7 @@
     </func>
 
     <func>
-      <name>timetrap(Time) -&gt; ok</name>
+      <name since="OTP R14B">timetrap(Time) -&gt; ok</name>
       <fsummary>Sets a new timetrap for the running test case.</fsummary>
       <type>
         <v>Time = {hours, Hours} | {minutes, Mins} | {seconds, Secs} | Millisecs | infinity | Func</v>
@@ -1539,7 +1539,7 @@
     </func>
 
     <func>
-      <name>userdata(TestDir, Suite) -&gt; SuiteUserData | {error, Reason}</name>
+      <name since="">userdata(TestDir, Suite) -&gt; SuiteUserData | {error, Reason}</name>
       <fsummary>Returns any data specified with tag userdata in the list of
         tuples returned from Suite:suite/0.</fsummary>
       <type>
@@ -1556,7 +1556,7 @@
     </func>
 
     <func>
-      <name>userdata(TestDir, Suite, Case::GroupOrCase) -&gt; TCUserData | {error, Reason}</name>
+      <name since="">userdata(TestDir, Suite, Case::GroupOrCase) -&gt; TCUserData | {error, Reason}</name>
       <fsummary>Returns any data specified with tag userdata in the list of
         tuples returned from Suite:group(GroupName) or Suite:Case().</fsummary>
       <type>
diff --git a/lib/common_test/doc/src/ct_cover.xml b/lib/common_test/doc/src/ct_cover.xml
index 89d944acbe..61365d3522 100644
--- a/lib/common_test/doc/src/ct_cover.xml
+++ b/lib/common_test/doc/src/ct_cover.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>ct_cover.xml</file>
   </header>
-  <module>ct_cover</module>
+  <module since="">ct_cover</module>
   <modulesummary>Common Test framework code coverage support module.
   </modulesummary>
 
@@ -47,7 +47,7 @@
 
   <funcs>
     <func>
-    <name>add_nodes(Nodes) -&gt; {ok, StartedNodes} | {error, Reason}</name>
+    <name since="">add_nodes(Nodes) -&gt; {ok, StartedNodes} | {error, Reason}</name>
     <fsummary>Adds nodes to current cover test (only works if cover support
       is active).</fsummary>
       <type>
@@ -67,7 +67,7 @@
     </func>
 
     <func>
-    <name>cross_cover_analyse(Level, Tests) -&gt; ok</name>
+    <name since="OTP R16B">cross_cover_analyse(Level, Tests) -&gt; ok</name>
     <fsummary>Accumulates cover results over multiple tests.</fsummary>
       <type>
         <v>Level = overview | details</v>
@@ -83,7 +83,7 @@
     </func>
 
     <func>
-    <name>remove_nodes(Nodes) -&gt; ok | {error, Reason}</name>
+    <name since="">remove_nodes(Nodes) -&gt; ok | {error, Reason}</name>
     <fsummary>Removes nodes from the current cover test.</fsummary>
       <type>
         <v>Nodes = [atom()]</v>
diff --git a/lib/common_test/doc/src/ct_ftp.xml b/lib/common_test/doc/src/ct_ftp.xml
index 592c5eb05d..7ee6049486 100644
--- a/lib/common_test/doc/src/ct_ftp.xml
+++ b/lib/common_test/doc/src/ct_ftp.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>ct_ftp.xml</file>
   </header>
-  <module>ct_ftp</module>
+  <module since="">ct_ftp</module>
   <modulesummary>FTP client module (based on the FTP application).</modulesummary>
 
   <description>
@@ -59,7 +59,7 @@
 
   <funcs>
     <func>
-      <name>cd(Connection, Dir) -&gt; ok | {error, Reason}</name>
+      <name since="">cd(Connection, Dir) -&gt; ok | {error, Reason}</name>
       <fsummary>Changes directory on remote host.</fsummary>
       <type>
         <v>Connection = connection()</v>
@@ -71,7 +71,7 @@
     </func>
 
     <func>
-      <name>close(Connection) -&gt; ok | {error, Reason}</name>
+      <name since="">close(Connection) -&gt; ok | {error, Reason}</name>
       <fsummary>Closes the FTP connection.</fsummary>
       <type>
         <v>Connection = connection()</v>
@@ -82,7 +82,7 @@
     </func>
 
     <func>
-      <name>delete(Connection, File) -&gt; ok | {error, Reason}</name>
+      <name since="">delete(Connection, File) -&gt; ok | {error, Reason}</name>
       <fsummary>Deletes a file on remote host.</fsummary>
       <type>
         <v>Connection = connection()</v>
@@ -94,7 +94,7 @@
     </func>
 
     <func>
-      <name>get(KeyOrName, RemoteFile, LocalFile) -&gt; ok | {error, Reason}</name>
+      <name since="">get(KeyOrName, RemoteFile, LocalFile) -&gt; ok | {error, Reason}</name>
       <fsummary>Opens an FTP connection and fetches a file from the remote
         host.</fsummary>
       <type>
@@ -122,7 +122,7 @@
     </func>
 
     <func>
-      <name>ls(Connection, Dir) -&gt; {ok, Listing} | {error, Reason}</name>
+      <name since="">ls(Connection, Dir) -&gt; {ok, Listing} | {error, Reason}</name>
       <fsummary>Lists directory Dir.</fsummary>
       <type>
         <v>Connection = connection()</v>
@@ -135,7 +135,7 @@
     </func>
 
     <func>
-      <name>open(KeyOrName) -&gt; {ok, Handle} | {error, Reason}</name>
+      <name since="">open(KeyOrName) -&gt; {ok, Handle} | {error, Reason}</name>
       <fsummary>Opens an FTP connection to the specified node.</fsummary>
       <type>
         <v>KeyOrName = Key | Name</v>
@@ -164,7 +164,7 @@
     </func>
 
     <func>
-      <name>put(KeyOrName, LocalFile, RemoteFile) -&gt; ok | {error, Reason}</name>
+      <name since="">put(KeyOrName, LocalFile, RemoteFile) -&gt; ok | {error, Reason}</name>
       <fsummary>Opens an FTP connection and sends a file to the remote
         host.</fsummary>
       <type>
@@ -203,7 +203,7 @@
     </func>
 
     <func>
-      <name>recv(Connection, RemoteFile) -&gt; ok | {error, Reason}</name>
+      <name since="">recv(Connection, RemoteFile) -&gt; ok | {error, Reason}</name>
       <fsummary>Fetches a file over FTP.</fsummary>
       <desc><marker id="recv-2"/>
         <p>Fetches a file over FTP.</p>
@@ -215,7 +215,7 @@
     </func>
 
     <func>
-      <name>recv(Connection, RemoteFile, LocalFile) -&gt; ok | {error, Reason}</name>
+      <name since="">recv(Connection, RemoteFile, LocalFile) -&gt; ok | {error, Reason}</name>
       <fsummary>Fetches a file over FTP.</fsummary>
       <type>
         <v>Connection = connection()</v>
@@ -230,7 +230,7 @@
     </func>
 
     <func>
-      <name>send(Connection, LocalFile) -&gt; ok | {error, Reason}</name>
+      <name since="">send(Connection, LocalFile) -&gt; ok | {error, Reason}</name>
       <fsummary>Sends a file over FTP.</fsummary>
       <desc><marker id="send-2"/>
         <p>Sends a file over FTP.</p>
@@ -243,7 +243,7 @@
     </func>
 
     <func>
-      <name>send(Connection, LocalFile, RemoteFile) -&gt; ok | {error, Reason}</name>
+      <name since="">send(Connection, LocalFile, RemoteFile) -&gt; ok | {error, Reason}</name>
       <fsummary>Sends a file over FTP.</fsummary>
       <type>
         <v>Connection = connection()</v>
@@ -258,7 +258,7 @@
     </func>
 
     <func>
-      <name>type(Connection, Type) -&gt; ok | {error, Reason}</name>
+      <name since="">type(Connection, Type) -&gt; ok | {error, Reason}</name>
       <fsummary>Changes the file transfer type.</fsummary>
       <type>
         <v>Connection = connection()</v>
diff --git a/lib/common_test/doc/src/ct_hooks.xml b/lib/common_test/doc/src/ct_hooks.xml
index 954be0ffba..100be85cac 100644
--- a/lib/common_test/doc/src/ct_hooks.xml
+++ b/lib/common_test/doc/src/ct_hooks.xml
@@ -32,7 +32,7 @@
     <rev>PA1</rev>
     <file>ct_hooks.sgml</file>
   </header>
-  <module>ct_hooks</module> 
+  <module since="OTP R14B02">ct_hooks</module> 
   <modulesummary>A callback interface on top of Common Test.</modulesummary>
 
   <description>
@@ -75,7 +75,7 @@
   
   <funcs>
     <func>
-      <name>Module:init(Id, Opts) -&gt; {ok, State} | {ok, State, Priority}</name>
+      <name since="OTP R14B02">Module:init(Id, Opts) -&gt; {ok, State} | {ok, State, Priority}</name>
       <fsummary>Initiates the Common Test Hook.</fsummary>
       <type>
         <v>Id = reference() | term()</v>
@@ -109,7 +109,132 @@
     </func>
 
     <func>
-      <name>Module:pre_init_per_suite(SuiteName, InitData, CTHState) -&gt; Result</name>
+      <name since="OTP 21.3.8">Module:post_groups(SuiteName, GroupDefs) -&gt; NewGroupDefs</name>
+      <fsummary>Called after groups/0.</fsummary>
+      <type>
+        <v>SuiteName = atom()</v>
+        <v>GroupDefs = NewGroupDefs = [Group]</v>
+        <v>Group = {GroupName,Properties,GroupsAndTestCases}</v>
+        <v>GroupName = atom()</v>
+        <v>Properties = [parallel | sequence | Shuffle | {GroupRepeatType,N}]</v>
+        <v>GroupsAndTestCases = [Group | {group,GroupName} | TestCase | {testcase,TestCase,TCRepeatProps}]</v>
+        <v>TestCase = atom()</v>
+	<v>TCRepeatProps = [{repeat,N} | {repeat_until_ok,N} | {repeat_until_fail,N}]</v>
+        <v>Shuffle = shuffle | {shuffle,Seed}</v>
+        <v>Seed = {integer(),integer(),integer()}</v>
+        <v>GroupRepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail | repeat_until_any_ok | repeat_until_any_fail</v>
+        <v>N = integer() | forever</v>
+      </type>
+      <desc>
+        <p>OPTIONAL</p>
+
+        <p>This function is called after
+          <seealso marker="common_test#Module:groups-0"><c>groups/0</c></seealso>.
+	  It is used to modify the test group definitions, for
+	  instance to add or remove groups or change group properties.</p>
+
+        <p><c>GroupDefs</c> is what
+          <seealso marker="common_test#Module:groups-0"><c>groups/0</c></seealso>
+          returned, that is, a list of group definitions.</p>
+
+        <p><c>NewGroupDefs</c> is the possibly modified version of this list.</p>
+
+        <p>This function is called only if the CTH is added before
+          <c>init_per_suite</c> is run. For details, see section
+          <seealso marker="ct_hooks_chapter#scope">CTH Scope</seealso>
+          in the User's Guide.</p>
+
+	<p>Notice that for CTHs that are installed by means of the
+	  <seealso marker="common_test#Module:suite-0"><c>suite/0</c></seealso>
+	  function, <c>post_groups/2</c> is called before
+	  the <seealso marker="#Module:init-2"><c>init/2</c></seealso>
+	  hook function. However, for CTHs that are installed by means
+	  of the CT start flag,
+	  the <seealso marker="#Module:init-2"><c>init/2</c></seealso>
+	  function is called first.</p>
+
+	<note>
+	  <p>Prior to each test execution, Common Test does a
+	    simulated test run in order to count test suites, groups
+	    and cases for logging purposes. This causes
+	    the <c>post_groups/2</c> hook function to always be called
+	    twice. For this reason, side effects are best avoided in
+	    this callback.</p>
+	</note>
+      </desc>
+    </func>
+
+    <func>
+      <name since="OTP 21.3.8">Module:post_all(SuiteName, Return, GroupDefs) -&gt; NewReturn</name>
+      <fsummary>Called after all/0.</fsummary>
+      <type>
+        <v>SuiteName = atom()</v>
+	<v>Return = NewReturn = Tests | {skip,Reason}</v>
+	<v>Tests = [TestCase | {testcase,TestCase,TCRepeatProps} | {group,GroupName} | {group,GroupName,Properties} | {group,GroupName,Properties,SubGroups}]</v>
+	<v>TestCase = atom()</v>
+	<v>TCRepeatProps = [{repeat,N} | {repeat_until_ok,N} | {repeat_until_fail,N}]</v>
+	<v>GroupName = atom()</v>
+	<v>Properties = GroupProperties | default</v>
+	<v>SubGroups = [{GroupName,Properties} | {GroupName,Properties,SubGroups}]</v>
+	<v>Shuffle = shuffle | {shuffle,Seed}</v>
+	<v>Seed = {integer(),integer(),integer()}</v>
+	<v>GroupRepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail | repeat_until_any_ok | repeat_until_any_fail</v>
+	<v>N = integer() | forever</v>
+        <v>GroupDefs = NewGroupDefs = [Group]</v>
+        <v>Group = {GroupName,GroupProperties,GroupsAndTestCases}</v>
+        <v>GroupProperties = [parallel | sequence | Shuffle | {GroupRepeatType,N}]</v>
+        <v>GroupsAndTestCases = [Group | {group,GroupName} | TestCase]</v>
+	<v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>OPTIONAL</p>
+
+        <p>This function is called after
+          <seealso marker="common_test#Module:all-0"><c>all/0</c></seealso>.
+	  It is used to modify the set of test cases and test group to
+	  be executed, for instance to add or remove test cases and
+	  groups, change group properties, or even skip all tests in
+	  the suite.</p>
+
+        <p><c>Return</c> is what
+          <seealso marker="common_test#Module:all-0"><c>all/0</c></seealso>
+          returned, that is, a list of test cases and groups to be
+          executed, or a tuple <c>{skip,Reason}</c>.</p>
+
+        <p><c>GroupDefs</c> is what
+          <seealso marker="common_test#Module:groups-0"><c>groups/0</c></seealso>
+          or the <c>post_groups/2</c> hook returned, that is, a list
+          of group definitions.</p>
+
+        <p><c>NewReturn</c> is the possibly modified version of <c>Return</c>.</p>
+
+        <p>This function is called only if the CTH is added before
+          <c>init_per_suite</c> is run. For details, see section
+          <seealso marker="ct_hooks_chapter#scope">CTH Scope</seealso>
+          in the User's Guide.</p>
+
+	<p>Notice that for CTHs that are installed by means of the
+	  <seealso marker="common_test#Module:suite-0"><c>suite/0</c></seealso>
+	  function, <c>post_all/2</c> is called before
+	  the <seealso marker="#Module:init-2"><c>init/2</c></seealso>
+	  hook function. However, for CTHs that are installed by means
+	  of the CT start flag,
+	  the <seealso marker="#Module:init-2"><c>init/2</c></seealso>
+	  function is called first.</p>
+
+	<note>
+	  <p>Prior to each test execution, Common Test does a
+	    simulated test run in order to count test suites, groups
+	    and cases for logging purposes. This causes
+	    the <c>post_all/3</c> hook function to always be called
+	    twice. For this reason, side effects are best avoided in
+	    this callback.</p>
+	</note>
+      </desc>
+    </func>
+
+    <func>
+      <name since="OTP R14B02">Module:pre_init_per_suite(SuiteName, InitData, CTHState) -&gt; Result</name>
       <fsummary>Called before init_per_suite.</fsummary>
       <type>
         <v>SuiteName = atom()</v>
@@ -161,7 +286,7 @@
     </func>
 
     <func>
-      <name>Module:post_init_per_suite(SuiteName, Config, Return, CTHState) -&gt; Result</name>
+      <name since="OTP R14B02">Module:post_init_per_suite(SuiteName, Config, Return, CTHState) -&gt; Result</name>
       <fsummary>Called after init_per_suite.</fsummary>
       <type>
         <v>SuiteName = atom()</v>
@@ -208,7 +333,7 @@
     </func>
 
     <func>
-      <name>Module:pre_init_per_group(SuiteName, GroupName, InitData, CTHState) -&gt; Result</name>
+      <name since="OTP 19.3">Module:pre_init_per_group(SuiteName, GroupName, InitData, CTHState) -&gt; Result</name>
       <fsummary>Called before init_per_group.</fsummary>
       <type>
         <v>SuiteName = atom()</v>
@@ -241,7 +366,7 @@
     </func>
 
     <func>
-      <name>Module:post_init_per_group(SuiteName, GroupName, Config, Return, CTHState) -&gt; Result</name>
+      <name since="OTP 19.3">Module:post_init_per_group(SuiteName, GroupName, Config, Return, CTHState) -&gt; Result</name>
       <fsummary>Called after init_per_group.</fsummary>
       <type>
         <v>SuiteName = atom()</v>
@@ -274,7 +399,7 @@
     </func>
 
     <func>
-      <name>Module:pre_init_per_testcase(SuiteName, TestcaseName, InitData, CTHState) -&gt; Result</name>
+      <name since="OTP 19.3">Module:pre_init_per_testcase(SuiteName, TestcaseName, InitData, CTHState) -&gt; Result</name>
       <fsummary>Called before init_per_testcase.</fsummary>
       <type>
         <v>SuiteName = atom()</v>
@@ -311,7 +436,7 @@
     </func>
 
     <func>
-      <name>Module:post_init_per_testcase(SuiteName, TestcaseName, Config, Return, CTHState) -&gt; Result</name>
+      <name since="OTP 19.3">Module:post_init_per_testcase(SuiteName, TestcaseName, Config, Return, CTHState) -&gt; Result</name>
       <fsummary>Called after init_per_testcase.</fsummary>
       <type>
         <v>SuiteName = atom()</v>
@@ -344,7 +469,7 @@
     </func>
 
     <func>
-      <name>Module:pre_end_per_testcase(SuiteName, TestcaseName, EndData, CTHState) -&gt; Result</name>
+      <name since="OTP 19.3">Module:pre_end_per_testcase(SuiteName, TestcaseName, EndData, CTHState) -&gt; Result</name>
       <fsummary>Called before end_per_testcase.</fsummary>
       <type>
         <v>SuiteName = atom()</v>
@@ -368,7 +493,7 @@
           <seealso marker="common_test#Module:end_per_testcase-2"><c>end_per_testcase</c></seealso>
           instead.</p>
 
-        <p>This function can not change the result of the test case by returning skip or fail
+        <p>This function cannot change the result of the test case by returning skip or fail
 	tuples, but it may insert items in <c>Config</c> that can be read in
 	<c>end_per_testcase/2</c> or in <c>post_end_per_testcase/5</c>.</p>
 
@@ -380,7 +505,7 @@
     </func>
 
     <func>
-      <name>Module:post_end_per_testcase(SuiteName, TestcaseName, Config, Return, CTHState) -&gt; Result</name>
+      <name since="OTP 19.3">Module:post_end_per_testcase(SuiteName, TestcaseName, Config, Return, CTHState) -&gt; Result</name>
       <fsummary>Called after end_per_testcase.</fsummary>
       <type>
         <v>SuiteName = atom()</v>
@@ -413,7 +538,7 @@
     </func>
 
     <func>
-      <name>Module:pre_end_per_group(SuiteName, GroupName, EndData, CTHState) -&gt; Result</name>
+      <name since="OTP 19.3">Module:pre_end_per_group(SuiteName, GroupName, EndData, CTHState) -&gt; Result</name>
       <fsummary>Called before end_per_group.</fsummary>
       <type>
         <v>SuiteName = atom()</v>
@@ -446,7 +571,7 @@
     </func>
 
     <func>
-      <name>Module:post_end_per_group(SuiteName, GroupName, Config, Return, CTHState) -&gt; Result</name>
+      <name since="OTP 19.3">Module:post_end_per_group(SuiteName, GroupName, Config, Return, CTHState) -&gt; Result</name>
       <fsummary>Called after end_per_group.</fsummary>
       <type>
         <v>SuiteName = atom()</v>
@@ -479,7 +604,7 @@
     </func>
 
     <func>
-      <name>Module:pre_end_per_suite(SuiteName, EndData, CTHState) -&gt; Result</name>
+      <name since="OTP R14B02">Module:pre_end_per_suite(SuiteName, EndData, CTHState) -&gt; Result</name>
       <fsummary>Called before end_per_suite.</fsummary>
       <type>
         <v>SuiteName = atom()</v>
@@ -506,7 +631,7 @@
     </func>
 
     <func>
-      <name>Module:post_end_per_suite(SuiteName, Config, Return, CTHState) -&gt; Result</name>
+      <name since="OTP R14B02">Module:post_end_per_suite(SuiteName, Config, Return, CTHState) -&gt; Result</name>
       <fsummary>Called after end_per_suite.</fsummary>
       <type>
         <v>SuiteName = atom()</v>
@@ -533,7 +658,7 @@
     </func>
 
     <func>
-      <name>Module:on_tc_fail(SuiteName, TestName, Reason, CTHState) -&gt; NewCTHState</name>
+      <name since="OTP 19.3">Module:on_tc_fail(SuiteName, TestName, Reason, CTHState) -&gt; NewCTHState</name>
       <fsummary>Called after the CTH scope ends.</fsummary>
       <type>
         <v>SuiteName = atom()</v>
@@ -577,7 +702,7 @@
     </func>
 
     <func>
-      <name>Module:on_tc_skip(SuiteName, TestName, Reason, CTHState) -&gt; NewCTHState</name>
+      <name since="OTP 19.3">Module:on_tc_skip(SuiteName, TestName, Reason, CTHState) -&gt; NewCTHState</name>
       <fsummary>Called after the CTH scope ends.</fsummary>
       <type>
         <v>SuiteName = atom()</v>
@@ -623,7 +748,7 @@
     </func>
 
     <func>
-      <name>Module:terminate(CTHState)</name>
+      <name since="OTP R14B02">Module:terminate(CTHState)</name>
       <fsummary>Called after the CTH scope ends.</fsummary>
       <type>
         <v>CTHState = term()</v>
@@ -637,7 +762,7 @@
     </func>
 
     <func>
-      <name>Module:id(Opts) -&gt; Id</name>
+      <name since="OTP R14B02">Module:id(Opts) -&gt; Id</name>
       <fsummary>Called before the init function of a CTH.</fsummary>
       <type>
         <v>Opts = term()</v>
@@ -662,5 +787,3 @@
   </funcs>
 
 </erlref>
-
-
diff --git a/lib/common_test/doc/src/ct_master.xml b/lib/common_test/doc/src/ct_master.xml
index 6bde4644c6..f003b7de11 100644
--- a/lib/common_test/doc/src/ct_master.xml
+++ b/lib/common_test/doc/src/ct_master.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>ct_master.xml</file>
   </header>
-  <module>ct_master</module>
+  <module since="">ct_master</module>
   <modulesummary>Distributed test execution control for Common Test.</modulesummary>
 
 <description>
@@ -46,7 +46,7 @@
 
   <funcs>
     <func>
-      <name>abort() -&gt; ok</name>
+      <name since="">abort() -&gt; ok</name>
       <fsummary>Stops all running tests.</fsummary>
       <desc><marker id="abort-0"/>
         <p>Stops all running tests.</p>
@@ -54,7 +54,7 @@
     </func>
 
     <func>
-      <name>abort(Nodes) -&gt; ok</name>
+      <name since="">abort(Nodes) -&gt; ok</name>
       <fsummary>Stops tests on specified nodes.</fsummary>
       <type>
         <v>Nodes = atom() | [atom()]</v>
@@ -65,7 +65,7 @@
     </func>
 
     <func>
-      <name>basic_html(Bool) -&gt; ok</name>
+      <name since="OTP R15B01">basic_html(Bool) -&gt; ok</name>
       <fsummary>If set to true, the ct_master logs are written on a primitive
         HTML format, not using the <c>Common Test</c> CSS style sheet.</fsummary>
       <type>
@@ -79,7 +79,7 @@
     </func>
 
     <func>
-      <name>get_event_mgr_ref() -&gt; MasterEvMgrRef</name>
+      <name since="OTP 17.5">get_event_mgr_ref() -&gt; MasterEvMgrRef</name>
       <fsummary>Gets a reference to the <c>Common Test</c> master event
         manager.</fsummary>
       <type>
@@ -98,7 +98,7 @@
     </func>
 
     <func>
-      <name>progress() -&gt; [{Node, Status}]</name>
+      <name since="">progress() -&gt; [{Node, Status}]</name>
       <fsummary>Returns test progress.</fsummary>
       <type>
         <v>Node = atom()</v>
@@ -112,7 +112,7 @@
     </func>
 
     <func>
-      <name>run(TestSpecs) -&gt; ok</name>
+      <name since="">run(TestSpecs) -&gt; ok</name>
       <fsummary>Equivalent to run(TestSpecs, false, [], []).</fsummary>
       <type>
         <v>TestSpecs = string() | [SeparateOrMerged]</v>
@@ -124,7 +124,7 @@
     </func>
 
     <func>
-      <name>run(TestSpecs, InclNodes, ExclNodes) -&gt; ok</name>
+      <name since="">run(TestSpecs, InclNodes, ExclNodes) -&gt; ok</name>
       <fsummary>Equivalent to run(TestSpecs, false, InclNodes, ExclNodes).
       </fsummary>
       <type>
@@ -140,7 +140,7 @@
      </func>
 
      <func>
-       <name>run(TestSpecs, AllowUserTerms, InclNodes, ExclNodes) -&gt; ok</name>
+       <name since="">run(TestSpecs, AllowUserTerms, InclNodes, ExclNodes) -&gt; ok</name>
        <fsummary>Tests are spawned on the nodes as specified in TestSpecs.
        </fsummary>
        <type>
@@ -162,7 +162,7 @@
     </func>
 
     <func>
-      <name>run_on_node(TestSpecs, Node) -&gt; ok</name>
+      <name since="">run_on_node(TestSpecs, Node) -&gt; ok</name>
       <fsummary>Equivalent to run_on_node(TestSpecs, false, Node).</fsummary>
       <type>
         <v>TestSpecs = string() | [SeparateOrMerged]</v>
@@ -177,7 +177,7 @@
     </func>
 
     <func>
-      <name>run_on_node(TestSpecs, AllowUserTerms, Node) -&gt; ok</name>
+      <name since="">run_on_node(TestSpecs, AllowUserTerms, Node) -&gt; ok</name>
       <fsummary>Tests are spawned on Node according to TestSpecs.</fsummary>
       <type>
         <v>TestSpecs = string() | [SeparateOrMerged]</v>
@@ -191,7 +191,7 @@
     </func>
 
     <func>
-      <name>run_test(Node, Opts) -&gt; ok</name>
+      <name since="">run_test(Node, Opts) -&gt; ok</name>
       <fsummary>Tests are spawned on Node using ct:run_test/1.</fsummary>
       <type>
         <v>Node = atom()</v>
@@ -210,7 +210,7 @@
       </type>
       <desc><marker id="run_test-2"/>
         <p>Tests are spawned on <c>Node</c> using
-          <seealso marker="ct:run_test-1"><c>ct:run_test/1</c></seealso></p>
+          <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso></p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/common_test/doc/src/ct_netconfc.xml b/lib/common_test/doc/src/ct_netconfc.xml
index 7ec8f23073..8fbe5f3df6 100644
--- a/lib/common_test/doc/src/ct_netconfc.xml
+++ b/lib/common_test/doc/src/ct_netconfc.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>ct_netconfc.xml</file>
   </header>
-  <module>ct_netconfc</module>
+  <module since="OTP R15B02">ct_netconfc</module>
   <modulesummary>NETCONF client module.</modulesummary>
 
   <description>
@@ -312,8 +312,8 @@
 
   <funcs>
     <func>
-      <name name="action" arity="2"/>
-      <name name="action" arity="3"/>
+      <name name="action" arity="2" since="OTP R15B02"/>
+      <name name="action" arity="3" since="OTP R15B02"/>
       <fsummary>Executes an action.</fsummary>
       <desc>
         <p>Executes an action. If the return type is void, <c>ok</c> is
@@ -322,8 +322,8 @@
     </func>
 
     <func>
-      <name name="close_session" arity="1"/>
-      <name name="close_session" arity="2"/>
+      <name name="close_session" arity="1" since="OTP R15B02"/>
+      <name name="close_session" arity="2" since="OTP R15B02"/>
       <fsummary>Requests graceful termination of the session associated with
         the client.</fsummary>
       <desc>
@@ -339,7 +339,7 @@
     </func>
 
     <func>
-      <name name="connect" arity="1"/>
+      <name name="connect" arity="1" since="OTP 20.0"/>
       <fsummary>Opens an SSH connection to a NETCONF server.</fsummary>
       <desc>
         <p>Opens an SSH connection to a NETCONF server.</p>
@@ -361,7 +361,7 @@
     </func>
 
     <func>
-      <name name="connect" arity="2"/>
+      <name name="connect" arity="2" since="OTP 20.0"/>
       <fsummary>Opens an SSH connection to a named NETCONF server.</fsummary>
       <desc>
         <p>Open an SSH connection to a named NETCONF server.</p>
@@ -399,8 +399,8 @@
     </func>
 
     <func>
-      <name name="copy_config" arity="3"/>
-      <name name="copy_config" arity="4"/>
+      <name name="copy_config" arity="3" since="OTP R15B02"/>
+      <name name="copy_config" arity="4" since="OTP R15B02"/>
       <fsummary>Copies configuration data.</fsummary>
       <desc>
         <p>Copies configuration data.</p>
@@ -412,12 +412,12 @@
     </func>
 
     <func>
-      <name>create_subscription(Client) -> Result</name>
-      <name>create_subscription(Client, Stream) -> Result</name>
-      <name>create_subscription(Client, Stream, Filter) -> Result</name>
-      <name>create_subscription(Client, Stream, Filter, Timeout) -> Result</name>
-      <name name="create_subscription" arity="5" clause_i="2"/>
-      <name name="create_subscription" arity="6"/>
+      <name since="OTP R15B02">create_subscription(Client) -> Result</name>
+      <name since="OTP R15B02">create_subscription(Client, Stream) -> Result</name>
+      <name since="OTP R15B02">create_subscription(Client, Stream, Filter) -> Result</name>
+      <name since="OTP R15B02">create_subscription(Client, Stream, Filter, Timeout) -> Result</name>
+      <name name="create_subscription" arity="5" clause_i="2" since="OTP R15B02"/>
+      <name name="create_subscription" arity="6" since="OTP R15B02"/>
       <fsummary>Creates a subscription for event notifications.</fsummary>
       <desc>
         <p>Creates a subscription for event notifications.</p>
@@ -490,8 +490,8 @@ create_subscription(Client, Stream, Filter, StartTime, StopTime, Timeout)</pre>
     </func>
 
     <func>
-      <name name="delete_config" arity="2"/>
-      <name name="delete_config" arity="3"/>
+      <name name="delete_config" arity="2" since="OTP R15B02"/>
+      <name name="delete_config" arity="3" since="OTP R15B02"/>
       <fsummary>Deletes configuration data.</fsummary>
       <desc>
         <p>Deletes configuration data.</p>
@@ -502,7 +502,7 @@ create_subscription(Client, Stream, Filter, StartTime, StopTime, Timeout)</pre>
     </func>
 
      <func>
-      <name name="disconnect" arity="1"/>
+      <name name="disconnect" arity="1" since="OTP 20.0"/>
       <fsummary>Closes the given SSH connection.</fsummary>
       <desc>
 	<p>Closes the given SSH connection.</p>
@@ -514,10 +514,10 @@ create_subscription(Client, Stream, Filter, StartTime, StopTime, Timeout)</pre>
     </func>
 
     <func>
-      <name name="edit_config" arity="3"/>
-      <name name="edit_config" arity="4" clause_i="1"/>
-      <name name="edit_config" arity="4" clause_i="2"/>
-      <name name="edit_config" arity="5"/>
+      <name name="edit_config" arity="3" since="OTP R15B02"/>
+      <name name="edit_config" arity="4" clause_i="1" since="OTP 18.0"/>
+      <name name="edit_config" arity="4" clause_i="2" since="OTP R15B02"/>
+      <name name="edit_config" arity="5" since="OTP 18.0"/>
       <fsummary>Edits configuration data.</fsummary>
       <desc>
         <p>Edits configuration data.</p>
@@ -542,8 +542,8 @@ create_subscription(Client, Stream, Filter, StartTime, StopTime, Timeout)</pre>
     </func>
 
     <func>
-      <name name="get" arity="2"/>
-      <name name="get" arity="3"/>
+      <name name="get" arity="2" since="OTP R15B02"/>
+      <name name="get" arity="3" since="OTP R15B02"/>
       <fsummary>Gets data.</fsummary>
       <desc>
         <p>Gets data.</p>
@@ -557,8 +557,8 @@ create_subscription(Client, Stream, Filter, StartTime, StopTime, Timeout)</pre>
     </func>
 
     <func>
-      <name name="get_capabilities" arity="1"/>
-      <name name="get_capabilities" arity="2"/>
+      <name name="get_capabilities" arity="1" since="OTP R15B02"/>
+      <name name="get_capabilities" arity="2" since="OTP R15B02"/>
       <fsummary>Returns the server side capabilities.</fsummary>
       <desc>
         <p>Returns the server side capabilities.</p>
@@ -582,8 +582,8 @@ create_subscription(Client, Stream, Filter, StartTime, StopTime, Timeout)</pre>
     </func>
 
     <func>
-      <name name="get_config" arity="3"/>
-      <name name="get_config" arity="4"/>
+      <name name="get_config" arity="3" since="OTP R15B02"/>
+      <name name="get_config" arity="4" since="OTP R15B02"/>
       <fsummary>Gets configuration data.</fsummary>
       <desc>
         <p>Gets configuration data.</p>
@@ -597,10 +597,10 @@ create_subscription(Client, Stream, Filter, StartTime, StopTime, Timeout)</pre>
     </func>
 
     <func>
-      <name name="get_event_streams" arity="1"/>
-      <name name="get_event_streams" arity="2" clause_i="1"/>
-      <name name="get_event_streams" arity="2" clause_i="2"/>
-      <name name="get_event_streams" arity="3"/>
+      <name name="get_event_streams" arity="1" since="OTP 20.0"/>
+      <name name="get_event_streams" arity="2" clause_i="1" since="OTP R15B02"/>
+      <name name="get_event_streams" arity="2" clause_i="2" since="OTP 20.0"/>
+      <name name="get_event_streams" arity="3" since="OTP R15B02"/>
       <fsummary>Sends a request to get the specified event streams.</fsummary>
       <desc>
         <p>Sends a request to get the specified event streams.</p>
@@ -637,8 +637,8 @@ create_subscription(Client, Stream, Filter, StartTime, StopTime, Timeout)</pre>
     </func>
 
     <func>
-      <name name="get_session_id" arity="1"/>
-      <name name="get_session_id" arity="2"/>
+      <name name="get_session_id" arity="1" since="OTP R15B02"/>
+      <name name="get_session_id" arity="2" since="OTP R15B02"/>
       <fsummary>Returns the session Id associated with the specified
         client.</fsummary>
       <desc>
@@ -647,9 +647,9 @@ create_subscription(Client, Stream, Filter, StartTime, StopTime, Timeout)</pre>
     </func>
 
     <func>
-      <name name="hello" arity="1"/>
-      <name name="hello" arity="2"/>
-      <name name="hello" arity="3"/>
+      <name name="hello" arity="1" since="OTP R15B02"/>
+      <name name="hello" arity="2" since="OTP R15B02"/>
+      <name name="hello" arity="3" since="OTP 17.5.3"/>
       <fsummary>Exchanges hello messages with the server.</fsummary>
       <desc>
         <p>Exchanges <c>hello</c> messages with the server.</p>
@@ -660,8 +660,8 @@ create_subscription(Client, Stream, Filter, StartTime, StopTime, Timeout)</pre>
     </func>
 
     <func>
-      <name name="kill_session" arity="2"/>
-      <name name="kill_session" arity="3"/>
+      <name name="kill_session" arity="2" since="OTP R15B02"/>
+      <name name="kill_session" arity="3" since="OTP R15B02"/>
       <fsummary>Forces termination of the session associated with the supplied
         session Id.</fsummary>
       <desc>
@@ -682,8 +682,8 @@ create_subscription(Client, Stream, Filter, StartTime, StopTime, Timeout)</pre>
     </func>
 
     <func>
-      <name name="lock" arity="2"/>
-      <name name="lock" arity="3"/>
+      <name name="lock" arity="2" since="OTP R15B02"/>
+      <name name="lock" arity="3" since="OTP R15B02"/>
       <fsummary>Locks the configuration target.</fsummary>
       <desc>
         <p>Locks the configuration target.</p>
@@ -703,7 +703,7 @@ create_subscription(Client, Stream, Filter, StartTime, StopTime, Timeout)</pre>
     </func>
 
     <func>
-      <name name="only_open" arity="1"/>
+      <name name="only_open" arity="1" since="OTP R15B02"/>
       <fsummary>Opens a NETCONF session, but does not send hello.</fsummary>
       <desc>
         <p>Opens a NETCONF session, but does not send <c>hello</c>.</p>
@@ -714,7 +714,7 @@ create_subscription(Client, Stream, Filter, StartTime, StopTime, Timeout)</pre>
     </func>
 
     <func>
-      <name name="only_open" arity="2"/>
+      <name name="only_open" arity="2" since="OTP R15B02"/>
       <fsummary>Opens a named NETCONF session, but does not send hello.</fsummary>
       <desc>
         <p>Opens a named NETCONF session, but does not send <c>hello</c>.</p>
@@ -725,7 +725,7 @@ create_subscription(Client, Stream, Filter, StartTime, StopTime, Timeout)</pre>
     </func>
 
     <func>
-      <name name="open" arity="1"/>
+      <name name="open" arity="1" since="OTP R15B02"/>
       <fsummary>Opens a NETCONF session and exchanges hello messages.</fsummary>
       <desc>
         <p>Opens a NETCONF session and exchanges <c>hello</c> messages.</p>
@@ -749,7 +749,7 @@ create_subscription(Client, Stream, Filter, StartTime, StopTime, Timeout)</pre>
     </func>
 
     <func>
-      <name name="open" arity="2"/>
+      <name name="open" arity="2" since="OTP R15B02"/>
       <fsummary>Opens a named NETCONF session and exchanges hello
         messages.</fsummary>
       <desc>
@@ -791,8 +791,8 @@ create_subscription(Client, Stream, Filter, StartTime, StopTime, Timeout)</pre>
     </func>
 
     <func>
-      <name name="send" arity="2"/>
-      <name name="send" arity="3"/>
+      <name name="send" arity="2" since="OTP R16B02"/>
+      <name name="send" arity="3" since="OTP R16B02"/>
       <fsummary>Sends an XML document to the server.</fsummary>
       <desc>
         <p>Sends an XML document to the server.</p>
@@ -804,8 +804,8 @@ create_subscription(Client, Stream, Filter, StartTime, StopTime, Timeout)</pre>
     </func>
 
     <func>
-      <name name="send_rpc" arity="2"/>
-      <name name="send_rpc" arity="3"/>
+      <name name="send_rpc" arity="2" since="OTP R16B02"/>
+      <name name="send_rpc" arity="3" since="OTP R16B02"/>
       <fsummary>Sends a NETCONF rpc request to the server.</fsummary>
       <desc>
         <p>Sends a NETCONF <c>rpc</c> request to the server.</p>
@@ -820,10 +820,10 @@ create_subscription(Client, Stream, Filter, StartTime, StopTime, Timeout)</pre>
     </func>
 
     <func>
-      <name name="session" arity="1"/>
-      <name name="session" arity="2" clause_i="1"/>
-      <name name="session" arity="2" clause_i="2"/>
-      <name name="session" arity="3"/>
+      <name name="session" arity="1" since="OTP 20.0"/>
+      <name name="session" arity="2" clause_i="1" since="OTP 20.0"/>
+      <name name="session" arity="2" clause_i="2" since="OTP 20.0"/>
+      <name name="session" arity="3" since="OTP 20.0"/>
       <fsummary>Opens a NETCONF session as a channel on the given SSH
 	connection, and exchanges hello messages with the
 	server.</fsummary>
@@ -848,8 +848,8 @@ create_subscription(Client, Stream, Filter, StartTime, StopTime, Timeout)</pre>
     </func>
 
     <func>
-      <name name="unlock" arity="2"/>
-      <name name="unlock" arity="3"/>
+      <name name="unlock" arity="2" since="OTP R15B02"/>
+      <name name="unlock" arity="3" since="OTP R15B02"/>
       <fsummary>Unlocks the configuration target.</fsummary>
       <desc>
         <p>Unlocks the configuration target.</p>
diff --git a/lib/common_test/doc/src/ct_property_test.xml b/lib/common_test/doc/src/ct_property_test.xml
index 028e5eb69f..1e01d9a5d7 100644
--- a/lib/common_test/doc/src/ct_property_test.xml
+++ b/lib/common_test/doc/src/ct_property_test.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>ct_property_test.xml</file>
   </header>
-  <module>ct_property_test</module>
+  <module since="OTP 17.3">ct_property_test</module>
   <modulesummary>EXPERIMENTAL support in Common Test for calling
     property-based tests.</modulesummary>
 
@@ -79,7 +79,7 @@
 
   <funcs>
     <func>
-    <name>init_per_suite(Config) -&gt; Config | {skip, Reason}</name>
+    <name since="OTP 17.3">init_per_suite(Config) -&gt; Config | {skip, Reason}</name>
     <fsummary>Initializes Config for property testing.</fsummary>
       <desc><marker id="init_per_suite-1"/>
         <p>Initializes <c>Config</c> for property testing.</p>
@@ -98,7 +98,7 @@
     </func>
 
     <func>
-    <name>quickcheck(Property, Config) -&gt; true | {fail, Reason}</name>
+    <name since="OTP 17.3">quickcheck(Property, Config) -&gt; true | {fail, Reason}</name>
     <fsummary>Calls quickcheck and returns the result in a form suitable for
       Common Test.</fsummary>
       <desc><marker id="quickcheck-2"/>
diff --git a/lib/common_test/doc/src/ct_rpc.xml b/lib/common_test/doc/src/ct_rpc.xml
index 90e6b833f7..00a4dcec08 100644
--- a/lib/common_test/doc/src/ct_rpc.xml
+++ b/lib/common_test/doc/src/ct_rpc.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>ct_rpc.xml</file>
   </header>
-  <module>ct_rpc</module>
+  <module since="">ct_rpc</module>
   <modulesummary>Common Test specific layer on Erlang/OTP rpc.</modulesummary>
 
   <description>
@@ -43,7 +43,7 @@
 
   <funcs>
     <func>
-      <name>app_node(App, Candidates) -&gt; NodeName</name>
+      <name since="">app_node(App, Candidates) -&gt; NodeName</name>
       <fsummary>From a set of candidate nodes determines which of them is
         running the application App.</fsummary>
       <type>
@@ -61,7 +61,7 @@
     </func>
 
     <func>
-      <name>app_node(App, Candidates, FailOnBadRPC) -&gt; NodeName</name>
+      <name since="">app_node(App, Candidates, FailOnBadRPC) -&gt; NodeName</name>
         <fsummary>Same as app_node/2, except that argument FailOnBadRPC
           determines if the search for a candidate node is to stop if
           badrpc is received at some point.</fsummary>
@@ -81,7 +81,7 @@
     </func>
 
     <func>
-      <name>app_node(App, Candidates, FailOnBadRPC, Cookie) -&gt; NodeName</name>
+      <name since="">app_node(App, Candidates, FailOnBadRPC, Cookie) -&gt; NodeName</name>
       <fsummary>Same as app_node/2, except that argument FailOnBadRPC
         determines if the search for a candidate node is to stop if badrpc is
         received at some point.</fsummary>
@@ -105,7 +105,7 @@
     </func>
 
     <func>
-      <name>call(Node, Module, Function, Args) -&gt; term() | {badrpc, Reason}</name>
+      <name since="">call(Node, Module, Function, Args) -&gt; term() | {badrpc, Reason}</name>
       <fsummary>Same as call(Node, Module, Function, Args, infinity).</fsummary>
       <desc><marker id="call-4"/>
         <p>Same as <c>call(Node, Module, Function, Args, infinity)</c>.</p>
@@ -113,7 +113,7 @@
     </func>
 
     <func>
-      <name>call(Node, Module, Function, Args, TimeOut) -&gt; term() | {badrpc, Reason}</name>
+      <name since="">call(Node, Module, Function, Args, TimeOut) -&gt; term() | {badrpc, Reason}</name>
       <fsummary>Evaluates apply(Module, Function, Args) on the node
         Node.</fsummary>
       <type>
@@ -136,7 +136,7 @@
     </func>
 
     <func>
-      <name>call(Node, Module, Function, Args, TimeOut, Cookie) -&gt; term() | {badrpc, Reason}</name>
+      <name since="">call(Node, Module, Function, Args, TimeOut, Cookie) -&gt; term() | {badrpc, Reason}</name>
       <fsummary>Evaluates apply(Module, Function, Args) on the node
         Node.</fsummary>
       <type>
@@ -163,7 +163,7 @@
     </func>
 
     <func>
-      <name>cast(Node, Module, Function, Args) -&gt; ok</name>
+      <name since="">cast(Node, Module, Function, Args) -&gt; ok</name>
       <fsummary>Evaluates apply(Module, Function, Args) on the node
         Node.</fsummary>
       <type>
@@ -187,7 +187,7 @@
     </func>
 
     <func>
-      <name>cast(Node, Module, Function, Args, Cookie) -&gt; ok</name>
+      <name since="">cast(Node, Module, Function, Args, Cookie) -&gt; ok</name>
       <fsummary>Evaluates apply(Module, Function, Args) on the node
         Node.</fsummary>
       <type>
diff --git a/lib/common_test/doc/src/ct_slave.xml b/lib/common_test/doc/src/ct_slave.xml
index 9d9aa50051..84e619482d 100644
--- a/lib/common_test/doc/src/ct_slave.xml
+++ b/lib/common_test/doc/src/ct_slave.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>ct_slave.xml</file>
   </header>
-  <module>ct_slave</module>
+  <module since="OTP R14B">ct_slave</module>
   <modulesummary>Common Test framework functions for starting and stopping
     nodes for Large-Scale Testing.</modulesummary>
 
@@ -50,7 +50,7 @@
 
   <funcs>
     <func>
-      <name>start(Node) -&gt; Result</name>
+      <name since="OTP R14B">start(Node) -&gt; Result</name>
       <fsummary>Starts an Erlang node with name Node on the local
         host.</fsummary>
       <type>
@@ -68,7 +68,7 @@
     </func>
 
     <func>
-      <name>start(HostOrNode, NodeOrOpts) -&gt; Result</name>
+      <name since="OTP R14B">start(HostOrNode, NodeOrOpts) -&gt; Result</name>
       <fsummary>Starts an Erlang node with default options on a specified
         host, or on the local host with specified options.</fsummary>
       <type>
@@ -90,7 +90,7 @@
     </func>
 
     <func>
-      <name>start(Host, Node, Opts) -&gt; Result</name>
+      <name since="OTP R14B">start(Host, Node, Opts) -&gt; Result</name>
       <fsummary>Starts an Erlang node with name Node on host Host as
         specified by the combination of options in Opts.</fsummary>
       <type>
@@ -184,7 +184,7 @@
     </func>
 
     <func>
-      <name>stop(Node) -&gt; Result</name>
+      <name since="OTP R14B">stop(Node) -&gt; Result</name>
       <fsummary>Stops the running Erlang node with name Node on the local
         host.</fsummary>
       <type>
@@ -199,7 +199,7 @@
     </func>
 
     <func>
-      <name>stop(Host, Node) -&gt; Result</name>
+      <name since="OTP R14B">stop(Host, Node) -&gt; Result</name>
       <fsummary>Stops the running Erlang node with name Node on host
         Host.</fsummary>
       <type>
diff --git a/lib/common_test/doc/src/ct_snmp.xml b/lib/common_test/doc/src/ct_snmp.xml
index 0a5e52b16c..343781814a 100644
--- a/lib/common_test/doc/src/ct_snmp.xml
+++ b/lib/common_test/doc/src/ct_snmp.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>ct_snmp.xml</file>
   </header>
-  <module>ct_snmp</module>
+  <module since="">ct_snmp</module>
   <modulesummary>Common Test user interface module for the SNMP application.</modulesummary>
 
   <description>
@@ -240,7 +240,7 @@
 
   <funcs>
     <func>
-      <name>get_next_values(Agent, Oids, MgrAgentConfName) -&gt; SnmpReply</name>
+      <name since="">get_next_values(Agent, Oids, MgrAgentConfName) -&gt; SnmpReply</name>
       <fsummary>Issues a synchronous SNMP get next request.</fsummary>
       <type>
         <v>Agent = agent_name()</v>
@@ -254,7 +254,7 @@
     </func>
 
     <func>
-      <name>get_values(Agent, Oids, MgrAgentConfName) -&gt; SnmpReply</name>
+      <name since="">get_values(Agent, Oids, MgrAgentConfName) -&gt; SnmpReply</name>
       <fsummary>Issues a synchronous SNMP get request.</fsummary>
       <type>
         <v>Agent = agent_name()</v>
@@ -268,7 +268,7 @@
     </func>
 
     <func>
-      <name>load_mibs(Mibs) -&gt; ok | {error, Reason}</name>
+      <name since="">load_mibs(Mibs) -&gt; ok | {error, Reason}</name>
       <fsummary>Loads the MIBs into agent snmp_master_agent.</fsummary>
       <type>
         <v>Mibs = [MibName]</v>
@@ -281,7 +281,7 @@
     </func>
 
     <func>
-      <name>register_agents(MgrAgentConfName, ManagedAgents) -&gt; ok | {error, Reason}</name>
+      <name since="">register_agents(MgrAgentConfName, ManagedAgents) -&gt; ok | {error, Reason}</name>
       <fsummary>Explicitly instructs the manager to handle this
         agent.</fsummary>
       <type>
@@ -300,7 +300,7 @@
     </func>
 
     <func>
-      <name>register_users(MgrAgentConfName, Users) -&gt; ok | {error, Reason}</name>
+      <name since="">register_users(MgrAgentConfName, Users) -&gt; ok | {error, Reason}</name>
       <fsummary>Registers the manager entity (=user) responsible for specific
         agent(s).</fsummary>
       <type>
@@ -319,7 +319,7 @@
     </func>
 
     <func>
-      <name>register_usm_users(MgrAgentConfName, UsmUsers) -&gt; ok | {error, Reason}</name>
+      <name since="">register_usm_users(MgrAgentConfName, UsmUsers) -&gt; ok | {error, Reason}</name>
       <fsummary>Explicitly instructs the manager to handle this USM user.</fsummary>
       <type>
         <v>MgrAgentConfName = atom()</v>
@@ -337,7 +337,7 @@
     </func>
 
     <func>
-      <name>set_info(Config) -&gt; [{Agent, OldVarsAndVals, NewVarsAndVals}]</name>
+      <name since="">set_info(Config) -&gt; [{Agent, OldVarsAndVals, NewVarsAndVals}]</name>
       <fsummary>Returns a list of all successful set requests performed in the
         test case in reverse order.</fsummary>
       <type>
@@ -357,7 +357,7 @@
     </func>
 
     <func>
-      <name>set_values(Agent, VarsAndVals, MgrAgentConfName, Config) -&gt; SnmpReply</name>
+      <name since="">set_values(Agent, VarsAndVals, MgrAgentConfName, Config) -&gt; SnmpReply</name>
       <fsummary>Issues a synchronous SNMP set request.</fsummary>
       <type>
         <v>Agent = agent_name()</v>
@@ -372,7 +372,7 @@
     </func>
 
     <func>
-      <name>start(Config, MgrAgentConfName) -&gt; ok</name>
+      <name since="">start(Config, MgrAgentConfName) -&gt; ok</name>
       <fsummary>Equivalent to start(Config, MgrAgentConfName,
         undefined).</fsummary>
       <desc><marker id="start-2"/>
@@ -383,7 +383,7 @@
     </func>
 
     <func>
-      <name>start(Config, MgrAgentConfName, SnmpAppConfName) -&gt; ok</name>
+      <name since="">start(Config, MgrAgentConfName, SnmpAppConfName) -&gt; ok</name>
       <fsummary>Starts an SNMP manager and/or agent.</fsummary>
       <type>
         <v>Config = [{Key, Value}]</v>
@@ -415,7 +415,7 @@
     </func>
 
     <func>
-      <name>stop(Config) -&gt; ok</name>
+      <name since="">stop(Config) -&gt; ok</name>
       <fsummary>Stops the SNMP manager and/or agent, and removes all files
         created.</fsummary>
       <type>
@@ -430,7 +430,7 @@
     </func>
 
     <func>
-      <name>unload_mibs(Mibs) -&gt; ok | {error, Reason}</name>
+      <name since="OTP R16B">unload_mibs(Mibs) -&gt; ok | {error, Reason}</name>
       <fsummary>Unloads the MIBs from agent snmp_master_agent.</fsummary>
       <type>
         <v>Mibs = [MibName]</v>
@@ -443,7 +443,7 @@
     </func>
 
     <func>
-      <name>unregister_agents(MgrAgentConfName) -&gt; ok</name>
+      <name since="">unregister_agents(MgrAgentConfName) -&gt; ok</name>
       <fsummary>Unregisters all managed agents.</fsummary>
       <type>
         <v>MgrAgentConfName = atom()</v>
@@ -455,7 +455,7 @@
     </func>
 
     <func>
-      <name>unregister_agents(MgrAgentConfName, ManagedAgents) -&gt; ok</name>
+      <name since="OTP R16B">unregister_agents(MgrAgentConfName, ManagedAgents) -&gt; ok</name>
       <fsummary>Unregisters the specified managed agents.</fsummary>
       <type>
         <v>MgrAgentConfName = atom()</v>
@@ -468,7 +468,7 @@
     </func>
 
     <func>
-      <name>unregister_users(MgrAgentConfName) -&gt; ok</name>
+      <name since="">unregister_users(MgrAgentConfName) -&gt; ok</name>
       <fsummary>Unregisters all users.</fsummary>
       <type>
         <v>MgrAgentConfName = atom()</v>
@@ -480,7 +480,7 @@
     </func>
 
     <func>
-      <name>unregister_users(MgrAgentConfName, Users) -&gt; ok</name>
+      <name since="OTP R16B">unregister_users(MgrAgentConfName, Users) -&gt; ok</name>
       <fsummary>Unregisters the specified users.</fsummary>
       <type>
         <v>MgrAgentConfName = atom()</v>
@@ -493,7 +493,7 @@
     </func>
 
     <func>
-      <name>unregister_usm_users(MgrAgentConfName) -&gt; ok</name>
+      <name since="OTP R16B">unregister_usm_users(MgrAgentConfName) -&gt; ok</name>
       <fsummary>Unregisters all USM users.</fsummary>
       <type>
         <v>MgrAgentConfName = atom()</v>
@@ -505,7 +505,7 @@
     </func>
 
     <func>
-      <name>unregister_usm_users(MgrAgentConfName, UsmUsers) -&gt; ok</name>
+      <name since="OTP R16B">unregister_usm_users(MgrAgentConfName, UsmUsers) -&gt; ok</name>
         <fsummary>Unregisters the specified USM users.</fsummary>
       <type>
         <v>MgrAgentConfName = atom()</v>
diff --git a/lib/common_test/doc/src/ct_ssh.xml b/lib/common_test/doc/src/ct_ssh.xml
index 0c7efed154..8d9f31aff8 100644
--- a/lib/common_test/doc/src/ct_ssh.xml
+++ b/lib/common_test/doc/src/ct_ssh.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>ct_ssh.xml</file>
   </header>
-  <module>ct_ssh</module>
+  <module since="">ct_ssh</module>
   <modulesummary>SSH/SFTP client module.</modulesummary>
 
 <description>
@@ -95,7 +95,7 @@
 
   <funcs>
     <func>
-      <name>apread(SSH, Handle, Position, Length) -&gt; Result</name>
+      <name since="">apread(SSH, Handle, Position, Length) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -109,7 +109,7 @@
     </func>
 
     <func>
-      <name>apread(SSH, Server, Handle, Position, Length) -&gt; Result</name>
+      <name since="">apread(SSH, Server, Handle, Position, Length) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -123,7 +123,7 @@
     </func>
 
     <func>
-      <name>apwrite(SSH, Handle, Position, Data) -&gt; Result</name>
+      <name since="">apwrite(SSH, Handle, Position, Data) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -137,7 +137,7 @@
     </func>
 
     <func>
-      <name>apwrite(SSH, Server, Handle, Position, Data) -&gt; Result</name>
+      <name since="">apwrite(SSH, Server, Handle, Position, Data) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -151,7 +151,7 @@
     </func>
 
     <func>
-      <name>aread(SSH, Handle, Len) -&gt; Result</name>
+      <name since="">aread(SSH, Handle, Len) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -165,7 +165,7 @@
     </func>
 
     <func>
-      <name>aread(SSH, Server, Handle, Len) -&gt; Result</name>
+      <name since="">aread(SSH, Server, Handle, Len) -&gt; Result</name>
       <fsummary>For inforamtion and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -179,7 +179,7 @@
     </func>
 
     <func>
-      <name>awrite(SSH, Handle, Data) -&gt; Result</name>
+      <name since="">awrite(SSH, Handle, Data) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -193,7 +193,7 @@
     </func>
 
     <func>
-      <name>awrite(SSH, Server, Handle, Data) -&gt; Result</name>
+      <name since="">awrite(SSH, Server, Handle, Data) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -207,7 +207,7 @@
     </func>
 
     <func>
-      <name>close(SSH, Handle) -&gt; Result</name>
+      <name since="">close(SSH, Handle) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -221,7 +221,7 @@
     </func>
 
     <func>
-      <name>close(SSH, Server, Handle) -&gt; Result</name>
+      <name since="">close(SSH, Server, Handle) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -235,7 +235,7 @@
     </func>
 
     <func>
-      <name>connect(KeyOrName) -&gt; {ok, Handle} | {error, Reason}</name>
+      <name since="">connect(KeyOrName) -&gt; {ok, Handle} | {error, Reason}</name>
       <fsummary>Equivalent to connect(KeyOrName, host, []).</fsummary>
       <desc><marker id="connect-1"/>
         <p>Equivalent to
@@ -245,7 +245,7 @@
     </func>
 
     <func>
-      <name>connect(KeyOrName, ConnType) -&gt; {ok, Handle} | {error, Reason}</name>
+      <name since="">connect(KeyOrName, ConnType) -&gt; {ok, Handle} | {error, Reason}</name>
       <fsummary>Equivalent to connect(KeyOrName, ConnType, []).</fsummary>
       <desc><marker id="connect-2"/>
         <p>Equivalent to
@@ -255,7 +255,7 @@
     </func>
 
     <func>
-      <name>connect(KeyOrName, ConnType, ExtraOpts) -&gt; {ok, Handle} | {error, Reason}</name>
+      <name since="">connect(KeyOrName, ConnType, ExtraOpts) -&gt; {ok, Handle} | {error, Reason}</name>
       <fsummary>Opens an SSH or SFTP connection using the information
         associated with KeyOrName.</fsummary>
       <type>
@@ -301,7 +301,7 @@
     </func>
 
     <func>
-      <name>del_dir(SSH, Name) -&gt; Result</name>
+      <name since="">del_dir(SSH, Name) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -315,7 +315,7 @@
     </func>
 
     <func>
-      <name>del_dir(SSH, Server, Name) -&gt; Result</name>
+      <name since="">del_dir(SSH, Server, Name) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -329,7 +329,7 @@
     </func>
 
     <func>
-      <name>delete(SSH, Name) -&gt; Result</name>
+      <name since="">delete(SSH, Name) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -343,7 +343,7 @@
     </func>
 
     <func>
-      <name>delete(SSH, Server, Name) -&gt; Result</name>
+      <name since="">delete(SSH, Server, Name) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -357,7 +357,7 @@
     </func>
 
     <func>
-      <name>disconnect(SSH) -&gt; ok | {error, Reason}</name>
+      <name since="">disconnect(SSH) -&gt; ok | {error, Reason}</name>
       <fsummary>Closes an SSH/SFTP connection.</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -369,7 +369,7 @@
     </func>
 
     <func>
-      <name>exec(SSH, Command) -&gt; {ok, Data} | {error, Reason}</name>
+      <name since="">exec(SSH, Command) -&gt; {ok, Data} | {error, Reason}</name>
       <fsummary>Equivalent to exec(SSH, Command, DefaultTimeout).</fsummary>
       <desc><marker id="exec-2"/>
         <p>Equivalent to
@@ -379,7 +379,7 @@
     </func>
 
     <func>
-      <name>exec(SSH, Command, Timeout) -&gt; {ok, Data} | {error, Reason}</name>
+      <name since="">exec(SSH, Command, Timeout) -&gt; {ok, Data} | {error, Reason}</name>
       <fsummary>Requests server to perform Command.</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -396,7 +396,7 @@
     </func>
 
     <func>
-      <name>exec(SSH, ChannelId, Command, Timeout) -&gt; {ok, Data} | {error, Reason}</name>
+      <name since="">exec(SSH, ChannelId, Command, Timeout) -&gt; {ok, Data} | {error, Reason}</name>
       <fsummary>Requests server to perform Command.</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -414,7 +414,7 @@
     </func>
 
     <func>
-      <name>get_file_info(SSH, Handle) -&gt; Result</name>
+      <name since="">get_file_info(SSH, Handle) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -428,7 +428,7 @@
     </func>
 
     <func>
-      <name>get_file_info(SSH, Server, Handle) -&gt; Result</name>
+      <name since="">get_file_info(SSH, Server, Handle) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -442,7 +442,7 @@
     </func>
 
     <func>
-      <name>list_dir(SSH, Path) -&gt; Result</name>
+      <name since="">list_dir(SSH, Path) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -456,7 +456,7 @@
     </func>
 
     <func>
-      <name>list_dir(SSH, Server, Path) -&gt; Result</name>
+      <name since="">list_dir(SSH, Server, Path) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -470,7 +470,7 @@
     </func>
 
     <func>
-      <name>make_dir(SSH, Name) -&gt; Result</name>
+      <name since="">make_dir(SSH, Name) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -484,7 +484,7 @@
     </func>
 
     <func>
-      <name>make_dir(SSH, Server, Name) -&gt; Result</name>
+      <name since="">make_dir(SSH, Server, Name) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -498,7 +498,7 @@
     </func>
 
     <func>
-      <name>make_symlink(SSH, Name, Target) -&gt; Result</name>
+      <name since="">make_symlink(SSH, Name, Target) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -512,7 +512,7 @@
     </func>
 
     <func>
-      <name>make_symlink(SSH, Server, Name, Target) -&gt; Result</name>
+      <name since="">make_symlink(SSH, Server, Name, Target) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -526,7 +526,7 @@
     </func>
 
     <func>
-      <name>open(SSH, File, Mode) -&gt; Result</name>
+      <name since="">open(SSH, File, Mode) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -540,7 +540,7 @@
     </func>
 
     <func>
-      <name>open(SSH, Server, File, Mode) -&gt; Result</name>
+      <name since="">open(SSH, Server, File, Mode) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -554,7 +554,7 @@
     </func>
 
     <func>
-      <name>opendir(SSH, Path) -&gt; Result</name>
+      <name since="">opendir(SSH, Path) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -568,7 +568,7 @@
     </func>
 
     <func>
-      <name>opendir(SSH, Server, Path) -&gt; Result</name>
+      <name since="">opendir(SSH, Server, Path) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -582,7 +582,7 @@
     </func>
 
     <func>
-      <name>position(SSH, Handle, Location) -&gt; Result</name>
+      <name since="">position(SSH, Handle, Location) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -596,7 +596,7 @@
     </func>
 
     <func>
-      <name>position(SSH, Server, Handle, Location) -&gt; Result</name>
+      <name since="">position(SSH, Server, Handle, Location) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -610,7 +610,7 @@
     </func>
 
     <func>
-      <name>pread(SSH, Handle, Position, Length) -&gt; Result</name>
+      <name since="">pread(SSH, Handle, Position, Length) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -624,7 +624,7 @@
     </func>
 
     <func>
-      <name>pread(SSH, Server, Handle, Position, Length) -&gt; Result</name>
+      <name since="">pread(SSH, Server, Handle, Position, Length) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -638,7 +638,7 @@
     </func>
 
     <func>
-      <name>pwrite(SSH, Handle, Position, Data) -&gt; Result</name>
+      <name since="">pwrite(SSH, Handle, Position, Data) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -652,7 +652,7 @@
     </func>
 
     <func>
-      <name>pwrite(SSH, Server, Handle, Position, Data) -&gt; Result</name>
+      <name since="">pwrite(SSH, Server, Handle, Position, Data) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -666,7 +666,7 @@
     </func>
 
     <func>
-      <name>read(SSH, Handle, Len) -&gt; Result</name>
+      <name since="">read(SSH, Handle, Len) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -680,7 +680,7 @@
     </func>
 
     <func>
-      <name>read(SSH, Server, Handle, Len) -&gt; Result</name>
+      <name since="">read(SSH, Server, Handle, Len) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -694,7 +694,7 @@
     </func>
 
     <func>
-      <name>read_file(SSH, File) -&gt; Result</name>
+      <name since="">read_file(SSH, File) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -708,7 +708,7 @@
     </func>
 
     <func>
-      <name>read_file(SSH, Server, File) -&gt; Result</name>
+      <name since="">read_file(SSH, Server, File) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -722,7 +722,7 @@
     </func>
 
     <func>
-      <name>read_file_info(SSH, Name) -&gt; Result</name>
+      <name since="">read_file_info(SSH, Name) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -736,7 +736,7 @@
     </func>
 
     <func>
-      <name>read_file_info(SSH, Server, Name) -&gt; Result</name>
+      <name since="">read_file_info(SSH, Server, Name) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -750,7 +750,7 @@
     </func>
 
     <func>
-      <name>read_link(SSH, Name) -&gt; Result</name>
+      <name since="">read_link(SSH, Name) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -764,7 +764,7 @@
     </func>
 
     <func>
-      <name>read_link(SSH, Server, Name) -&gt; Result</name>
+      <name since="">read_link(SSH, Server, Name) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -778,7 +778,7 @@
     </func>
 
     <func>
-      <name>read_link_info(SSH, Name) -&gt; Result</name>
+      <name since="">read_link_info(SSH, Name) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -792,7 +792,7 @@
     </func>
 
     <func>
-      <name>read_link_info(SSH, Server, Name) -&gt; Result</name>
+      <name since="">read_link_info(SSH, Server, Name) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -806,7 +806,7 @@
     </func>
 
     <func>
-      <name>receive_response(SSH, ChannelId) -&gt; {ok, Data} | {error, Reason}</name>
+      <name since="">receive_response(SSH, ChannelId) -&gt; {ok, Data} | {error, Reason}</name>
       <fsummary>Equivalent to receive_response(SSH, ChannelId,
         close).</fsummary>
       <desc><marker id="receive_response-2"/>
@@ -817,7 +817,7 @@ ChannelId, close)</c></seealso>.</p>
     </func>
 
      <func>
-       <name>receive_response(SSH, ChannelId, End) -&gt; {ok, Data} | {error, Reason}</name>
+       <name since="">receive_response(SSH, ChannelId, End) -&gt; {ok, Data} | {error, Reason}</name>
       <fsummary>Equivalent to receive_response(SSH, ChannelId, End,
         DefaultTimeout).</fsummary>
       <desc><marker id="receive_response-3"/>
@@ -828,7 +828,7 @@ ChannelId, End, DefaultTimeout)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>receive_response(SSH, ChannelId, End, Timeout) -&gt; {ok, Data} | {timeout, Data} | {error, Reason}</name>
+      <name since="">receive_response(SSH, ChannelId, End, Timeout) -&gt; {ok, Data} | {timeout, Data} | {error, Reason}</name>
       <fsummary>Receives expected data from server on the specified session
         channel.</fsummary>
       <type>
@@ -863,7 +863,7 @@ ChannelId, End, DefaultTimeout)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>rename(SSH, OldName, NewName) -&gt; Result</name>
+      <name since="">rename(SSH, OldName, NewName) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -877,7 +877,7 @@ ChannelId, End, DefaultTimeout)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>rename(SSH, Server, OldName, NewName) -&gt; Result</name>
+      <name since="">rename(SSH, Server, OldName, NewName) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -891,7 +891,7 @@ ChannelId, End, DefaultTimeout)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>send(SSH, ChannelId, Data) -&gt; ok | {error, Reason}</name>
+      <name since="">send(SSH, ChannelId, Data) -&gt; ok | {error, Reason}</name>
       <fsummary>Equivalent to send(SSH, ChannelId, 0, Data,
         DefaultTimeout).</fsummary>
       <desc><marker id="send-3"/>
@@ -901,7 +901,7 @@ ChannelId, End, DefaultTimeout)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>send(SSH, ChannelId, Data, Timeout) -&gt; ok | {error, Reason}</name>
+      <name since="">send(SSH, ChannelId, Data, Timeout) -&gt; ok | {error, Reason}</name>
       <fsummary>Equivalent to send(SSH, ChannelId, 0, Data, Timeout).</fsummary>
       <desc><marker id="send-4"/>
         <p>Equivalent to <seealso marker="#send-5"><c>ct_ssh:send(SSH,
@@ -910,7 +910,7 @@ ChannelId, End, DefaultTimeout)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>send(SSH, ChannelId, Type, Data, Timeout) -&gt; ok | {error, Reason}</name>
+      <name since="">send(SSH, ChannelId, Type, Data, Timeout) -&gt; ok | {error, Reason}</name>
       <fsummary>Sends data to server on specified session channel.</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -926,7 +926,7 @@ ChannelId, End, DefaultTimeout)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>send_and_receive(SSH, ChannelId, Data) -&gt; {ok, Data} | {error, Reason}</name>
+      <name since="">send_and_receive(SSH, ChannelId, Data) -&gt; {ok, Data} | {error, Reason}</name>
       <fsummary>Equivalent to send_and_receive(SSH, ChannelId, Data,
         close).</fsummary>
       <desc><marker id="send_and_receive-3"/>
@@ -937,7 +937,7 @@ ChannelId, End, DefaultTimeout)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>send_and_receive(SSH, ChannelId, Data, End) -&gt; {ok, Data} | {error, Reason}</name>
+      <name since="">send_and_receive(SSH, ChannelId, Data, End) -&gt; {ok, Data} | {error, Reason}</name>
       <fsummary>Equivalent to send_and_receive(SSH, ChannelId, 0, Data, End,
         DefaultTimeout).</fsummary>
       <desc><marker id="send_and_receive-4"/>
@@ -948,7 +948,7 @@ ChannelId, 0, Data, End, DefaultTimeout)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>send_and_receive(SSH, ChannelId, Data, End, Timeout) -&gt; {ok, Data} | {error, Reason}</name>
+      <name since="">send_and_receive(SSH, ChannelId, Data, End, Timeout) -&gt; {ok, Data} | {error, Reason}</name>
       <fsummary>Equivalent to send_and_receive(SSH, ChannelId, 0, Data, End,
         Timeout).</fsummary>
       <desc><marker id="send_and_receive-5"/>
@@ -959,7 +959,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>send_and_receive(SSH, ChannelId, Type, Data, End, Timeout) -&gt; {ok, Data} | {error, Reason}</name>
+      <name since="">send_and_receive(SSH, ChannelId, Type, Data, End, Timeout) -&gt; {ok, Data} | {error, Reason}</name>
       <fsummary>Sends data to server on specified session channel and waits
         to receive the server response.</fsummary>
       <type>
@@ -981,7 +981,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>session_close(SSH, ChannelId) -&gt; ok | {error, Reason}</name>
+      <name since="">session_close(SSH, ChannelId) -&gt; ok | {error, Reason}</name>
       <fsummary>Closes an SSH session channel.</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -994,7 +994,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>session_open(SSH) -&gt; {ok, ChannelId} | {error, Reason}</name>
+      <name since="">session_open(SSH) -&gt; {ok, ChannelId} | {error, Reason}</name>
       <fsummary>Equivalent to session_open(SSH, DefaultTimeout).</fsummary>
       <desc><marker id="session_open-1"/>
         <p>Equivalent to
@@ -1004,7 +1004,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>session_open(SSH, Timeout) -&gt; {ok, ChannelId} | {error, Reason}</name>
+      <name since="">session_open(SSH, Timeout) -&gt; {ok, ChannelId} | {error, Reason}</name>
       <fsummary>Opens a channel for an SSH session.</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -1018,7 +1018,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>sftp_connect(SSH) -&gt; {ok, Server} | {error, Reason}</name>
+      <name since="">sftp_connect(SSH) -&gt; {ok, Server} | {error, Reason}</name>
       <fsummary>Starts an SFTP session on an already existing SSH
         connection.</fsummary>
       <type>
@@ -1034,7 +1034,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>shell(SSH, ChannelId) -&gt; ok | {error, Reason}</name>
+      <name since="OTP 20.0">shell(SSH, ChannelId) -&gt; ok | {error, Reason}</name>
       <fsummary>Equivalent to shell(SSH, ChannelId, DefaultTimeout).</fsummary>
       <desc><marker id="shell-2"/>
         <p>Equivalent to
@@ -1044,7 +1044,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>shell(SSH, ChannelId, Timeout) -&gt; ok | {error, Reason}</name>
+      <name since="OTP 20.0">shell(SSH, ChannelId, Timeout) -&gt; ok | {error, Reason}</name>
       <fsummary>Requests that the user default shell is executed at the
         server end.</fsummary>
       <type>
@@ -1061,7 +1061,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>subsystem(SSH, ChannelId, Subsystem) -&gt; Status | {error, Reason}</name>
+      <name since="">subsystem(SSH, ChannelId, Subsystem) -&gt; Status | {error, Reason}</name>
       <fsummary>Equivalent to subsystem(SSH, ChannelId, Subsystem,
         DefaultTimeout).</fsummary>
       <desc><marker id="subsystem-3"/>
@@ -1072,7 +1072,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>subsystem(SSH, ChannelId, Subsystem, Timeout) -&gt; Status | {error, Reason}</name>
+      <name since="">subsystem(SSH, ChannelId, Subsystem, Timeout) -&gt; Status | {error, Reason}</name>
       <fsummary>Sends a request to execute a predefined subsystem.</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -1088,7 +1088,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>write(SSH, Handle, Data) -&gt; Result</name>
+      <name since="">write(SSH, Handle, Data) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -1102,7 +1102,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>write(SSH, Server, Handle, Data) -&gt; Result</name>
+      <name since="">write(SSH, Server, Handle, Data) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -1116,7 +1116,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>write_file(SSH, File, Iolist) -&gt; Result</name>
+      <name since="">write_file(SSH, File, Iolist) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -1130,7 +1130,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>write_file(SSH, Server, File, Iolist) -&gt; Result</name>
+      <name since="">write_file(SSH, Server, File, Iolist) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -1144,7 +1144,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>write_file_info(SSH, Name, Info) -&gt; Result</name>
+      <name since="">write_file_info(SSH, Name, Info) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
@@ -1158,7 +1158,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
     </func>
 
     <func>
-      <name>write_file_info(SSH, Server, Name, Info) -&gt; Result</name>
+      <name since="">write_file_info(SSH, Server, Name, Info) -&gt; Result</name>
       <fsummary>For information and other types, see ssh_sftp(3).</fsummary>
       <type>
         <v>SSH = connection()</v>
diff --git a/lib/common_test/doc/src/ct_telnet.xml b/lib/common_test/doc/src/ct_telnet.xml
index 8e85cccc99..76f5305c46 100644
--- a/lib/common_test/doc/src/ct_telnet.xml
+++ b/lib/common_test/doc/src/ct_telnet.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>ct_telnet.xml</file>
   </header>
-  <module>ct_telnet</module>
+  <module since="">ct_telnet</module>
   <modulesummary>Common Test specific layer on top of Telnet client ct_telnet_client.erl</modulesummary>
 
   <description>
@@ -205,7 +205,7 @@
 
   <funcs>
     <func>
-      <name>close(Connection) -&gt; ok | {error, Reason}</name>
+      <name since="">close(Connection) -&gt; ok | {error, Reason}</name>
       <fsummary>Closes the Telnet connection and stops the process managing
         it.</fsummary>
       <type>
@@ -223,7 +223,7 @@
     </func>
 
     <func>
-      <name>cmd(Connection, Cmd) -&gt; {ok, Data} | {error, Reason}</name>
+      <name since="">cmd(Connection, Cmd) -&gt; {ok, Data} | {error, Reason}</name>
       <fsummary>Equivalent to cmd(Connection, Cmd, []).</fsummary>
       <desc><marker id="cmd-2"/>
         <p>Equivalent to
@@ -233,24 +233,27 @@
     </func>
 
     <func>
-      <name>cmd(Connection, Cmd, Opts) -&gt; {ok, Data} | {error, Reason}</name>
+      <name since="">cmd(Connection, Cmd, Opts) -&gt; {ok, Data} | {error, Reason}</name>
       <fsummary>Sends a command through Telnet and waits for prompt.</fsummary>
       <type>
         <v>Connection = connection()</v>
         <v>Cmd = string()</v>
         <v>Opts = [Opt]</v>
-        <v>Opt = {timeout, timeout()} | {newline, boolean()}</v>
+        <v>Opt = {timeout, timeout()} | {newline, boolean() | string()}</v>
         <v>Data = [string()]</v>
         <v>Reason = term()</v>
       </type>
       <desc><marker id="cmd-3"/>
         <p>Sends a command through Telnet and waits for prompt.</p>
 
-        <p>By default, this function adds a new line to the end of the
+        <p>By default, this function adds "\n" to the end of the
           specified command. If this is not desired, use option
           <c>{newline,false}</c>. This is necessary, for example, when
           sending Telnet command sequences prefixed with character
-          Interprete As Command (IAC).</p>
+          Interpret As Command (IAC). Option <c>{newline,string()}</c>
+          can also be used if a different line end than "\n" is
+          required, for instance <c>{newline,"\r\n"}</c>, to add both
+          carriage return and newline characters.</p>
 
         <p>Option <c>timeout</c> specifies how long the client must wait
           for prompt. If the time expires, the function returns
@@ -262,7 +265,7 @@
     </func>
 
     <func>
-      <name>cmdf(Connection, CmdFormat, Args) -&gt; {ok, Data} | {error, Reason}</name>
+      <name since="">cmdf(Connection, CmdFormat, Args) -&gt; {ok, Data} | {error, Reason}</name>
       <fsummary>Equivalent to cmdf(Connection, CmdFormat, Args, []).</fsummary>
       <desc><marker id="cmdf-3"/>
         <p>Equivalent to
@@ -272,7 +275,7 @@
     </func>
 
     <func>
-      <name>cmdf(Connection, CmdFormat, Args, Opts) -&gt; {ok, Data} | {error, Reason}</name>
+      <name since="">cmdf(Connection, CmdFormat, Args, Opts) -&gt; {ok, Data} | {error, Reason}</name>
       <fsummary>Sends a Telnet command and waits for prompt (uses a format
         string and a list of arguments to build the command).</fsummary>
       <type>
@@ -280,7 +283,7 @@
         <v>CmdFormat = string()</v>
         <v>Args = list()</v>
         <v>Opts = [Opt]</v>
-        <v>Opt = {timeout, timeout()} | {newline, boolean()}</v>
+        <v>Opt = {timeout, timeout()} | {newline, boolean() | string()}</v>
         <v>Data = [string()]</v>
         <v>Reason = term()</v>
       </type>
@@ -294,7 +297,7 @@
     </func>
 
     <func>
-      <name>expect(Connection, Patterns) -&gt; term()</name>
+      <name since="">expect(Connection, Patterns) -&gt; term()</name>
       <fsummary>Equivalent to expect(Connections, Patterns, []).</fsummary>
       <desc><marker id="expect-2"/>
         <p>Equivalent to
@@ -304,7 +307,7 @@
     </func>
 
     <func>
-      <name>expect(Connection, Patterns, Opts) -&gt; {ok, Match} | {ok, MatchList, HaltReason} | {error, Reason}</name>
+      <name since="">expect(Connection, Patterns, Opts) -&gt; {ok, Match} | {ok, MatchList, HaltReason} | {error, Reason}</name>
       <fsummary>Gets data from Telnet and waits for the expected
         pattern.</fsummary>
       <type>
@@ -339,7 +342,7 @@
           subexpression number <c>N</c>. Subexpressions are denoted with
           <c>'(' ')'</c> in the regular expression.</p>
 
-        <p>If a <c>Tag</c> is speciifed, the returned <c>Match</c> also
+        <p>If a <c>Tag</c> is specified, the returned <c>Match</c> also
           includes the matched <c>Tag</c>. Otherwise, only <c>RxMatch</c>
           is returned.</p>
 
@@ -382,7 +385,7 @@
             can abort the operation of waiting for prompt.</p></item>
           <tag><c>repeat | repeat, N</c></tag>
           <item><p>The pattern(s) must be matched multiple times. If <c>N</c>
-            is speciified, the pattern(s) are matched <c>N</c> times, and
+            is specified, the pattern(s) are matched <c>N</c> times, and
             the function returns <c>HaltReason = done</c>. This option can be
             interrupted by one or more <c>HaltPatterns</c>. <c>MatchList</c>
             is always returned, that is, a list of <c>Match</c> instead of
@@ -422,7 +425,7 @@
     </func>
 
     <func>
-      <name>get_data(Connection) -&gt; {ok, Data} | {error, Reason}</name>
+      <name since="">get_data(Connection) -&gt; {ok, Data} | {error, Reason}</name>
       <fsummary>Gets all data received by the Telnet client since the last
         command was sent.</fsummary>
       <type>
@@ -446,7 +449,7 @@
     </func>
 
     <func>
-      <name>open(Name) -&gt; {ok, Handle} | {error, Reason}</name>
+      <name since="">open(Name) -&gt; {ok, Handle} | {error, Reason}</name>
       <fsummary>Equivalent to open(Name, telnet).</fsummary>
       <desc><marker id="open-1"/>
         <p>Equivalent to
@@ -456,7 +459,7 @@
     </func>
 
     <func>
-      <name>open(Name, ConnType) -&gt; {ok, Handle} | {error, Reason}</name>
+      <name since="">open(Name, ConnType) -&gt; {ok, Handle} | {error, Reason}</name>
       <fsummary>Opens a Telnet connection to the specified target
         host.</fsummary>
       <type>
@@ -471,7 +474,7 @@
     </func>
 
     <func>
-      <name>open(KeyOrName, ConnType, TargetMod) -&gt; {ok, Handle} | {error, Reason}</name>
+      <name since="">open(KeyOrName, ConnType, TargetMod) -&gt; {ok, Handle} | {error, Reason}</name>
       <fsummary>Equivalent to open(KeyOrName, ConnType, TargetMod, []).</fsummary>
       <desc><marker id="open-3"/>
         <p>Equivalent to
@@ -481,7 +484,7 @@
     </func>
 
     <func>
-      <name>open(KeyOrName, ConnType, TargetMod, Extra) -&gt; {ok, Handle} | {error, Reason}</name>
+      <name since="">open(KeyOrName, ConnType, TargetMod, Extra) -&gt; {ok, Handle} | {error, Reason}</name>
       <fsummary>Opens a Telnet connection to the specified target
         host.</fsummary>
       <type>
@@ -531,7 +534,7 @@
     </func>
 
     <func>
-      <name>send(Connection, Cmd) -&gt; ok | {error, Reason}</name>
+      <name since="">send(Connection, Cmd) -&gt; ok | {error, Reason}</name>
       <fsummary>Equivalent to send(Connection, Cmd, []).</fsummary>
       <desc><marker id="send-2"/>
         <p>Equivalent to
@@ -541,23 +544,26 @@
     </func>
 
     <func>
-      <name>send(Connection, Cmd, Opts) -&gt; ok | {error, Reason}</name>
+      <name since="OTP 17.4">send(Connection, Cmd, Opts) -&gt; ok | {error, Reason}</name>
       <fsummary>Sends a Telnet command and returns immediately.</fsummary>
       <type>
         <v>Connection = connection()</v>
         <v>Cmd = string()</v>
         <v>Opts = [Opt]</v>
-        <v>Opt = {newline, boolean()}</v>
+        <v>Opt = {newline, boolean() | string()}</v>
         <v>Reason = term()</v>
       </type>
       <desc><marker id="send-3"/>
         <p>Sends a Telnet command and returns immediately.</p>
 
-        <p>By default, this function adds a newline to the end of the
+        <p>By default, this function adds "\n" to the end of the
           specified command. If this is not desired, option
           <c>{newline,false}</c> can be used. This is necessary, for example,
           when sending Telnet command sequences prefixed with character   
-          Interprete As Command (IAC).</p>
+          Interpret As Command (IAC). Option <c>{newline,string()}</c>
+          can also be used if a different line end than "\n" is
+          required, for instance <c>{newline,"\r\n"}</c>, to add both
+          carriage return and newline characters.</p>
 
         <p>The resulting output from the command can be read with
           <seealso marker="#get_data-1"><c>ct_telnet:get_data/2</c></seealso> or
@@ -566,7 +572,7 @@
     </func>
 
     <func>
-      <name>sendf(Connection, CmdFormat, Args) -&gt; ok | {error, Reason}</name>
+      <name since="">sendf(Connection, CmdFormat, Args) -&gt; ok | {error, Reason}</name>
       <fsummary>Equivalent to sendf(Connection, CmdFormat, Args, []).</fsummary>
       <desc><marker id="sendf-3"/>
         <p>Equivalent to
@@ -576,7 +582,7 @@
     </func>
 
     <func>
-    <name>sendf(Connection, CmdFormat, Args, Opts) -&gt; ok | {error, Reason}</name>
+    <name since="OTP 17.4">sendf(Connection, CmdFormat, Args, Opts) -&gt; ok | {error, Reason}</name>
     <fsummary>Sends a Telnet command and returns immediately (uses a format
       string and a list of arguments to build the command).</fsummary>
       <type>
@@ -584,12 +590,15 @@
         <v>CmdFormat = string()</v>
         <v>Args = list()</v>
         <v>Opts = [Opt]</v>
-        <v>Opt = {newline, boolean()}</v>
+        <v>Opt = {newline, boolean() | string()}</v>
         <v>Reason = term()</v>
       </type>
       <desc><marker id="sendf-4"/>
         <p>Sends a Telnet command and returns immediately (uses a format
           string and a list of arguments to build the command).</p>
+
+        <p>For details, see
+          <seealso marker="#send-3"><c>ct_telnet:send/3</c></seealso>.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/common_test/doc/src/ct_testspec.xml b/lib/common_test/doc/src/ct_testspec.xml
index 36893f66cf..9cb9a2ae9f 100644
--- a/lib/common_test/doc/src/ct_testspec.xml
+++ b/lib/common_test/doc/src/ct_testspec.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>ct_testspec.xml</file>
   </header>
-  <module>ct_testspec</module>
+  <module since="OTP 19.3">ct_testspec</module>
   <modulesummary>Parsing of test specifications for Common Test.
   </modulesummary>
 
@@ -46,7 +46,7 @@
 
   <funcs>
     <func>
-    <name>get_tests(SpecsIn) -&gt; {ok, [{Specs,Tests}]} | {error, Reason}</name>
+    <name since="OTP 19.3">get_tests(SpecsIn) -&gt; {ok, [{Specs,Tests}]} | {error, Reason}</name>
     <fsummary>Parse the given test specification files and return the tests to run and skip.</fsummary>
       <type>
         <v>SpecsIn = [string()] | [[string()]]</v>
diff --git a/lib/common_test/doc/src/event_handler_chapter.xml b/lib/common_test/doc/src/event_handler_chapter.xml
index bd9ed21cb4..182abba7ca 100644
--- a/lib/common_test/doc/src/event_handler_chapter.xml
+++ b/lib/common_test/doc/src/event_handler_chapter.xml
@@ -378,7 +378,7 @@
 
     <note><p>To ensure that printouts to <c>stdout</c> (or printouts made with
     <seealso marker="ct#log-2"><c>ct:log/2,3</c></seealso> or 
-    <seealso marker="ct:pal-2"><c>ct:pal,2,3</c></seealso>) get written to the test case log
+    <seealso marker="ct#pal-2"><c>ct:pal,2,3</c></seealso>) get written to the test case log
     file, and not to the <c>Common Test</c> framework log, you can synchronize
     with the <c>Common Test</c> server by matching on evvents <c>tc_start</c> and <c>tc_done</c>.
     In the period between these events, all I/O is directed to the
diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
index 118dcd88bd..c454608bbe 100644
--- a/lib/common_test/doc/src/notes.xml
+++ b/lib/common_test/doc/src/notes.xml
@@ -33,6 +33,201 @@
     <file>notes.xml</file>
     </header>
 
+<section><title>Common_Test 1.17.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    All incorrect (that is, all) uses of "can not" has been
+	    corrected to "cannot" in source code comments,
+	    documentation, examples, and so on.</p>
+          <p>
+	    Own Id: OTP-14282 Aux Id: PR-1891 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Use <c>ssh</c> instead of <c>rsh</c> as the default
+	    remote shell. </p>
+          <p>
+	    Own Id: OTP-15633 Aux Id: PR-1787 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Common_Test 1.17.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    If a ct hook is installed in the <c>suite/0</c> function
+	    in a test suite, then the hook's <c>terminate/1</c>
+	    function would be called several times without it's
+	    <c>init/2</c> function being called first. This is now
+	    corrected.</p>
+          <p>
+	    Own Id: OTP-15863 Aux Id: ERIERL-370 </p>
+        </item>
+        <item>
+          <p>
+	    If <c>init_per_testcase</c> fails, the test itself is
+	    skipped. According to the documentation, it should be
+	    possible to change the result to failed in a hook
+	    function. The only available hook function in this case
+	    is <c>post_init_per_testcase</c>, but changing the return
+	    value there did not affect the test case result. This is
+	    now corrected.</p>
+          <p>
+	    Own Id: OTP-15869 Aux Id: ERIERL-350 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Common_Test 1.17.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The test result when a hook function fails is in general
+	    the same as if the function that the hook is associated
+	    with fails. For example, if <c>post_init_per_testcase</c>
+	    fails the result is that the test case is skipped, as is
+	    the case when <c>init_per_testcase</c> fails.This,
+	    however, was earlier not true for timetrap timeouts or
+	    other error situations where the process running the hook
+	    function was killed. This is now corrected, so the error
+	    handling should be the same no matter how the hook
+	    function fails.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15717 Aux Id: ERIERL-334 </p>
+        </item>
+        <item>
+          <p>
+	    In some rare cases, when two common_test nodes used the
+	    same log directory, a timing problem could occur which
+	    caused common_test to crash because it's log cache file
+	    was unexpectedly empty. This is now corrected.</p>
+          <p>
+	    Own Id: OTP-15758 Aux Id: ERIERL-342 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Two new common_test hook functions are introduced:</p>
+          <p>
+	    <c>post_groups/2</c>, which is called after
+	    <c>Suite:groups/0</c><br/> <c>post_all/3</c>, which is
+	    called after <c>Suite:all/0</c></p>
+          <p>
+	    These functions allow modifying the return values from
+	    the <c>groups/0</c> and <c>all/0</c> functions,
+	    respectively.</p>
+          <p>
+	    A new term, <c>{testcase,TestCase,RepeatProperties}</c>
+	    is now also allowed in the return from <c>all/0</c>. This
+	    can be used for repeating a single test case a specific
+	    number of times, or until it fails or succeeds once.</p>
+          <p>
+	    Own Id: OTP-14746 Aux Id: ERIERL-143 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Common_Test 1.17.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    OTP internal test improvements.</p>
+          <p>
+	    Own Id: OTP-15716</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Common_Test 1.17</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    A bug caused <c>ct:encrypt_config_file/3</c> and
+	    <c>ct:decrypt_config_file/3</c> to fail with
+	    <c>badmatch</c> if input parameter <c>KeyOrFile</c> was
+	    <c>{key,string()}</c>. This is now corrected.</p>
+          <p>
+	    Own Id: OTP-15540</p>
+        </item>
+        <item>
+          <p>
+	    The status of a test case which failed with timetrap
+	    timeout in <c>end_per_testcase</c> could not be modified
+	    by returning <c>{fail,Reason}</c> from a
+	    <c>post_end_per_testcase</c> hook function. This is now
+	    corrected.</p>
+          <p>
+	    Own Id: OTP-15584 Aux Id: ERIERL-282 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    A new variant of the <c>newline</c> option to
+	    <c>ct_telnet:cmd/3</c> and <c>ct_telnet:send/3</c> is
+	    added, which allows to specify a string to append as
+	    newline indicator on a command. By default, the value is
+	    "\n", but in some cases it is required to be "\r\n",
+	    which this option allows.</p>
+          <p>
+	    A faulty regular expression given as parameter to
+	    <c>ct_telnet:expect/2,3</c> would earlier crash and look
+	    like an internal error in common_test. A better error
+	    indication is now given, but the test case will still
+	    fail.</p>
+          <p>
+	    Own Id: OTP-15229 Aux Id: ERIERL-203 </p>
+        </item>
+        <item>
+          <p>
+	    Since the yang RFC allows more than one top element of
+	    config data in an <c>edit-config</c> element,
+	    <c>ct_netconfc:edit_config/3,4,5</c> can now take a list
+	    of XML elements.</p>
+          <p>
+	    Own Id: OTP-15298</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Common_Test 1.16.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -75,6 +270,141 @@
 
 </section>
 
+<section><title>Common_Test 1.15.4.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    If a ct hook is installed in the <c>suite/0</c> function
+	    in a test suite, then the hook's <c>terminate/1</c>
+	    function would be called several times without it's
+	    <c>init/2</c> function being called first. This is now
+	    corrected.</p>
+          <p>
+	    Own Id: OTP-15863 Aux Id: ERIERL-370 </p>
+        </item>
+        <item>
+          <p>
+	    If <c>init_per_testcase</c> fails, the test itself is
+	    skipped. According to the documentation, it should be
+	    possible to change the result to failed in a hook
+	    function. The only available hook function in this case
+	    is <c>post_init_per_testcase</c>, but changing the return
+	    value there did not affect the test case result. This is
+	    now corrected.</p>
+          <p>
+	    Own Id: OTP-15869 Aux Id: ERIERL-350 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Common_Test 1.15.4.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The test result when a hook function fails is in general
+	    the same as if the function that the hook is associated
+	    with fails. For example, if <c>post_init_per_testcase</c>
+	    fails the result is that the test case is skipped, as is
+	    the case when <c>init_per_testcase</c> fails.This,
+	    however, was earlier not true for timetrap timeouts or
+	    other error situations where the process running the hook
+	    function was killed. This is now corrected, so the error
+	    handling should be the same no matter how the hook
+	    function fails.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15717 Aux Id: ERIERL-334 </p>
+        </item>
+        <item>
+          <p>
+	    In some rare cases, when two common_test nodes used the
+	    same log directory, a timing problem could occur which
+	    caused common_test to crash because it's log cache file
+	    was unexpectedly empty. This is now corrected.</p>
+          <p>
+	    Own Id: OTP-15758 Aux Id: ERIERL-342 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Two new common_test hook functions are introduced:</p>
+          <p>
+	    <c>post_groups/2</c>, which is called after
+	    <c>Suite:groups/0</c><br/> <c>post_all/3</c>, which is
+	    called after <c>Suite:all/0</c></p>
+          <p>
+	    These functions allow modifying the return values from
+	    the <c>groups/0</c> and <c>all/0</c> functions,
+	    respectively.</p>
+          <p>
+	    A new term, <c>{testcase,TestCase,RepeatProperties}</c>
+	    is now also allowed in the return from <c>all/0</c>. This
+	    can be used for repeating a single test case a specific
+	    number of times, or until it fails or succeeds once.</p>
+          <p>
+	    Own Id: OTP-14746 Aux Id: ERIERL-143 </p>
+        </item>
+        <item>
+          <p>
+	    OTP internal test improvements.</p>
+          <p>
+	    Own Id: OTP-15716</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Common_Test 1.15.4.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The status of a test case which failed with timetrap
+	    timeout in <c>end_per_testcase</c> could not be modified
+	    by returning <c>{fail,Reason}</c> from a
+	    <c>post_end_per_testcase</c> hook function. This is now
+	    corrected.</p>
+          <p>
+	    Own Id: OTP-15584 Aux Id: ERIERL-282 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Common_Test 1.15.4.0.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The status of a test case which failed with timetrap
+	    timeout in <c>end_per_testcase</c> could not be modified
+	    by returning <c>{fail,Reason}</c> from a
+	    <c>post_end_per_testcase</c> hook function. This is now
+	    corrected.</p>
+          <p>
+	    Own Id: OTP-15584 Aux Id: ERIERL-282 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Common_Test 1.15.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -2109,7 +2439,7 @@
 	    ct_netconfc:close_session sometimes returned
 	    {error,closed} because the ssh connection was closed
 	    (from the server side) before the rpc-reply was received
-	    by the client. This is normal and can not be helped. It
+	    by the client. This is normal and cannot be helped. It
 	    has been corrected so the return will be 'ok' in this
 	    case. Other error situations will still give
 	    {error,Reason}.</p>
@@ -2123,7 +2453,7 @@
 	    {error,{process_down,Pid,normal}} because the ssh
 	    connection was closed (from the server side) before the
 	    rpc-reply was received by the client. This is normal and
-	    can not be helped. It has been corrected so the return
+	    cannot be helped. It has been corrected so the return
 	    will be 'ok' in this situation.</p>
           <p>
 	    Own Id: OTP-10570</p>
@@ -2775,8 +3105,8 @@
 	    The info function for <c>init/end_per_suite(Config)</c>
 	    is <c>init/end_per_suite()</c>, and for
 	    <c>init/end_per_group(GroupName,Config)</c> it's
-	    <c>init/end_per_group(GroupName)</c>. Info functions can
-	    not be used with <c>init/end_per_testcase(TestCase,
+	    <c>init/end_per_group(GroupName)</c>. Info functions
+	    cannot be used with <c>init/end_per_testcase(TestCase,
 	    Config)</c>, since these configuration functions execute
 	    on the test case process and will use the same properties
 	    as the test case (i.e. properties set by the test case
@@ -3860,7 +4190,7 @@
             If the Erlang runtime system was started without access
             to an erlang shell (e.g. -noshell), compilation errors
             would cause a crash in the Common Test application.
-            Without access to a shell, Common Test can not prompt the
+            Without access to a shell, Common Test cannot prompt the
             user to choose to continue or abort the test session, but
             must assume that the session should proceed.</p>
           <p>
@@ -4026,8 +4356,3 @@
   <section><title>common_test 1.3.0</title>
   </section>
 </chapter>
-
-
-
-
-
diff --git a/lib/common_test/doc/src/run_test_chapter.xml b/lib/common_test/doc/src/run_test_chapter.xml
index 56f6f7bcc4..2695e597cf 100644
--- a/lib/common_test/doc/src/run_test_chapter.xml
+++ b/lib/common_test/doc/src/run_test_chapter.xml
@@ -1297,7 +1297,7 @@
 	    </taglist>
 
 	  <p>For example, if a test is started with:</p>
-	  <p><c>$ ct_run -suite my_SUITE -logopts no_src</c></p>
+	  <p><c>$ ct_run -suite my_SUITE -logopts no_nl</c></p>
 	  <p>then printouts during the test made by successive calls to <c>io:format("x")</c>,
 	  appears in the test case log as:</p>
 	  <p><c>xxx</c></p>
diff --git a/lib/common_test/doc/src/unix_telnet.xml b/lib/common_test/doc/src/unix_telnet.xml
index b2314a53ec..03d91b7dbe 100644
--- a/lib/common_test/doc/src/unix_telnet.xml
+++ b/lib/common_test/doc/src/unix_telnet.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>unix_telnet.xml</file>
   </header>
-  <module>unix_telnet</module>
+  <module since="">unix_telnet</module>
   <modulesummary>Callback module for ct_telnet, for connecting to a Telnet
     server on a UNIX host.</modulesummary>
 
@@ -80,7 +80,7 @@
 
   <funcs>
     <func>
-      <name>connect(ConnName, Ip, Port, Timeout, KeepAlive, TCPNoDelay, Extra) -&gt; {ok, Handle} | {error, Reason}</name>
+      <name since="OTP 18.3.3">connect(ConnName, Ip, Port, Timeout, KeepAlive, TCPNoDelay, Extra) -&gt; {ok, Handle} | {error, Reason}</name>
       <fsummary>Callback for ct_telnet.erl.</fsummary>
         <type>
           <v>ConnName = target_name()</v>
@@ -107,7 +107,7 @@
     </func>
 
     <func>
-      <name>get_prompt_regexp() -&gt; PromptRegexp</name>
+      <name since="">get_prompt_regexp() -&gt; PromptRegexp</name>
       <fsummary>Callback for ct_telnet.erl.</fsummary>
         <type>
           <v>PromptRegexp = prompt_regexp()</v>
diff --git a/lib/common_test/doc/src/write_test_chapter.xml b/lib/common_test/doc/src/write_test_chapter.xml
index 82dc06834f..5eed748b08 100644
--- a/lib/common_test/doc/src/write_test_chapter.xml
+++ b/lib/common_test/doc/src/write_test_chapter.xml
@@ -455,8 +455,10 @@
  GroupDefs = [GroupDef]
  GroupDef = {GroupName,Properties,GroupsAndTestCases}
  GroupName = atom()
- GroupsAndTestCases = [GroupDef | {group,GroupName} | TestCase]
- TestCase = atom()</pre>
+ GroupsAndTestCases = [GroupDef | {group,GroupName} | TestCase |
+                      {testcase,TestCase,TCRepeatProps}]
+ TestCase = atom()
+ TCRepeatProps = [{repeat,N} | {repeat_until_ok,N} | {repeat_until_fail,N}]</pre>
 
     <p><c>GroupName</c> is the name of the group and must be unique within
     the test suite module. Groups can be nested, by including a group definition 
@@ -464,11 +466,11 @@
     <c>Properties</c> is the list of execution 
     properties for the group. The possible values are as follows:</p>
     <pre>
- Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+ Properties = [parallel | sequence | Shuffle | {GroupRepeatType,N}]
  Shuffle = shuffle | {shuffle,Seed}
  Seed = {integer(),integer(),integer()}
- RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
-              repeat_until_any_ok | repeat_until_any_fail
+ GroupRepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+                   repeat_until_any_ok | repeat_until_any_fail
  N = integer() | forever</pre>
 
     <p><em>Explanations:</em></p>
@@ -481,8 +483,8 @@
     Dependencies Between Test Cases and Suites.</p></item>
        <tag><c>shuffle</c></tag>
        <item><p>The cases in the group are executed in random order.</p></item>
-       <tag><c>repeat</c></tag>
-       <item><p>Orders <c>Common Test</c> to repeat execution of the cases in the 
+       <tag><c>repeat, repeat_until_*</c></tag>
+       <item><p>Orders <c>Common Test</c> to repeat execution of all the cases in the 
        group a given number of times, or until any, or all, cases fail or succeed.</p></item>
      </taglist>
       
@@ -496,7 +498,7 @@
     <c>{group,GroupName}</c> to the <c>all/0</c> list.</p>
     <p><em>Example:</em></p>
     <pre>
- all() -> [testcase1, {group,group1}, testcase2, {group,group2}].</pre>
+ all() -> [testcase1, {group,group1}, {testcase,testcase2,[{repeat,10}]}, {group,group2}].</pre>
 
     <p>Execution properties with a group tuple in 
     <c>all/0</c>: <c>{group,GroupName,Properties}</c> can also be specified. 
diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index 778ea2e9e2..bfa7b25862 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -390,11 +390,7 @@ testcases(TestDir, Suite) ->
     end.
 
 make_and_load(Dir, Suite) ->
-    EnvInclude =
-	case os:getenv("CT_INCLUDE_PATH") of
-	    false -> [];
-	    CtInclPath -> string:lexemes(CtInclPath, [$:,$ ,$,])
-	end,
+    EnvInclude = string:lexemes(os:getenv("CT_INCLUDE_PATH", ""), [$:,$ ,$,]),
     StartInclude =
 	case init:get_argument(include) of
 	    {ok,[Dirs]} -> Dirs;
diff --git a/lib/common_test/src/ct_config.erl b/lib/common_test/src/ct_config.erl
index a10d939919..a07e61199b 100644
--- a/lib/common_test/src/ct_config.erl
+++ b/lib/common_test/src/ct_config.erl
@@ -592,7 +592,7 @@ encrypt_config_file(SrcFileName, EncryptFileName, {file,KeyFile}) ->
 
 encrypt_config_file(SrcFileName, EncryptFileName, {key,Key}) ->
     _ = crypto:start(),
-    {Key,IVec} = make_crypto_key(Key),
+    {CryptoKey,IVec} = make_crypto_key(Key),
     case file:read_file(SrcFileName) of
 	{ok,Bin0} ->
 	    Bin1 = term_to_binary({SrcFileName,Bin0}),
@@ -600,7 +600,7 @@ encrypt_config_file(SrcFileName, EncryptFileName, {key,Key}) ->
 		       0 -> Bin1;
 		       N -> list_to_binary([Bin1,random_bytes(8-N)])
 		   end,
-	    EncBin = crypto:block_encrypt(des3_cbc, Key, IVec, Bin2),
+	    EncBin = crypto:block_encrypt(des3_cbc, CryptoKey, IVec, Bin2),
 	    case file:write_file(EncryptFileName, EncBin) of
 		ok ->
 		    io:format("~ts --(encrypt)--> ~ts~n",
@@ -631,10 +631,10 @@ decrypt_config_file(EncryptFileName, TargetFileName, {file,KeyFile}) ->
 
 decrypt_config_file(EncryptFileName, TargetFileName, {key,Key}) ->
     _ = crypto:start(),
-    {Key,IVec} = make_crypto_key(Key),
+    {CryptoKey,IVec} = make_crypto_key(Key),
     case file:read_file(EncryptFileName) of
 	{ok,Bin} ->
-	    DecBin = crypto:block_decrypt(des3_cbc, Key, IVec, Bin),
+	    DecBin = crypto:block_decrypt(des3_cbc, CryptoKey, IVec, Bin),
 	    case catch binary_to_term(DecBin) of
 		{'EXIT',_} ->
 		    {error,bad_file};
diff --git a/lib/common_test/src/ct_cover.erl b/lib/common_test/src/ct_cover.erl
index d286f20a4d..bcd98dcc58 100644
--- a/lib/common_test/src/ct_cover.erl
+++ b/lib/common_test/src/ct_cover.erl
@@ -262,6 +262,11 @@ get_app_info(App=#cover{app=Name}, [{src_files,Name,Src1}|Terms], Dir) ->
     Src = App#cover.src,
     get_app_info(App#cover{src=Src++Src1},Terms,Dir);
 
+get_app_info(App=#cover{app=none}, [{local_only,Bool}|Terms], Dir) ->
+    get_app_info(App, [{local_only,none,Bool}|Terms], Dir);
+get_app_info(App=#cover{app=Name}, [{local_only,Name,Bool}|Terms], Dir) ->
+    get_app_info(App#cover{local_only=Bool},Terms,Dir);
+
 get_app_info(App, [_|Terms], Dir) ->
     get_app_info(App, Terms, Dir);
 
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index 134ae0e1cc..bce6420042 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -314,8 +314,8 @@ add_defaults(Mod,Func, GroupPath) ->
 	    ErrStr = io_lib:format("~n*** ERROR *** "
 				   "~w:suite/0 failed: ~tp~n",
 				   [Suite,Reason]),
-	    io:format(ErrStr, []),
-	    io:format(?def_gl, ErrStr, []),
+	    io:format("~ts", [ErrStr]),
+	    io:format(?def_gl, "~ts", [ErrStr]),
 	    {suite0_failed,{exited,Reason}};
 	SuiteInfo when is_list(SuiteInfo) ->
 	    case lists:all(fun(E) when is_tuple(E) -> true;
@@ -337,16 +337,16 @@ add_defaults(Mod,Func, GroupPath) ->
 					   "Invalid return value from "
 					   "~w:suite/0: ~tp~n",
 					   [Suite,SuiteInfo]),
-		    io:format(ErrStr, []),
-		    io:format(?def_gl, ErrStr, []),
+		    io:format("~ts", [ErrStr]),
+		    io:format(?def_gl, "~ts", [ErrStr]),
 		    {suite0_failed,bad_return_value}
 	    end;
 	SuiteInfo ->
 	    ErrStr = io_lib:format("~n*** ERROR *** "
 				   "Invalid return value from "
 				   "~w:suite/0: ~tp~n", [Suite,SuiteInfo]),
-	    io:format(ErrStr, []),
-	    io:format(?def_gl, ErrStr, []),
+	    io:format("~ts", [ErrStr]),
+	    io:format(?def_gl, "~ts", [ErrStr]),
 	    {suite0_failed,bad_return_value}
     end.
 
@@ -373,8 +373,8 @@ add_defaults1(Mod,Func, GroupPath, SuiteInfo) ->
 				      "Invalid return value from "
 				      "~w:group(~tw): ~tp~n",
 				      [Mod,GrName,BadGr0Val]),
-	    io:format(Gr0ErrStr, []),
-	    io:format(?def_gl, Gr0ErrStr, []),
+	    io:format("~ts", [Gr0ErrStr]),
+	    io:format(?def_gl, "~ts", [Gr0ErrStr]),
 	    {group0_failed,bad_return_value};
 	_ ->
 	    Args = if Func == init_per_group ; Func == end_per_group ->
@@ -395,8 +395,8 @@ add_defaults1(Mod,Func, GroupPath, SuiteInfo) ->
 					      "Invalid return value from "
 					      "~w:~tw/0: ~tp~n",
 					      [Mod,Func,BadTC0Val]),
-		    io:format(TC0ErrStr, []),
-		    io:format(?def_gl, TC0ErrStr, []),
+		    io:format("~ts", [TC0ErrStr]),
+		    io:format(?def_gl, "~ts", [TC0ErrStr]),
 		    {testcase0_failed,bad_return_value};
 		_ ->
 		    %% let test case info (also for all config funcs) override
@@ -696,9 +696,16 @@ end_tc(Mod,IPTC={init_per_testcase,_Func},_TCPid,Result,Args,Return) ->
             end
     end;
 
-end_tc(Mod,Func0,TCPid,Result,Args,Return) ->
+end_tc(Mod,Func00,TCPid,Result,Args,Return) ->
     %% in case Mod == ct_framework, lookup the suite name
     Suite = get_suite_name(Mod, Args),
+    {OnlyCleanup,Func0} =
+        case Func00 of
+            {cleanup,F0} ->
+                {true,F0};
+            _ ->
+                {false,Func00}
+        end,
     {Func,FuncSpec,HookFunc} =
         case Func0 of
             {end_per_testcase_not_run,F} ->
@@ -742,6 +749,8 @@ end_tc(Mod,Func0,TCPid,Result,Args,Return) ->
         case HookFunc of
             undefined ->
                 {ok,Result};
+            _ when OnlyCleanup ->
+                {ok,Result};
             _ ->
                 case ct_hooks:end_tc(Suite,HookFunc,Args,Result,Return) of
                     '$ct_no_change' ->
@@ -752,6 +761,8 @@ end_tc(Mod,Func0,TCPid,Result,Args,Return) ->
         end,
     FinalResult =
 	case get('$test_server_framework_test') of
+            _ when OnlyCleanup ->
+                Result1;
 	    undefined ->
 		%% send sync notification so that event handlers may print
 		%% in the log file before it gets closed
@@ -972,11 +983,10 @@ error_notification(Mod,Func,_Args,{Error,Loc}) ->
     end,
 
     PrintError = fun(ErrorFormat, ErrorArgs) ->
-		       Div = "~n- - - - - - - - - - - - - - - - - - - "
-			     "- - - - - - - - - - - - - - - - - - - - -~n",
+                      Div = "\n- - - - - - - - - - - - - - - - - - - "
+                            "- - - - - - - - - - - - - - - - - - - - -\n",
 		       ErrorStr2 = io_lib:format(ErrorFormat, ErrorArgs),
-		       io:format(?def_gl, lists:concat([Div,ErrorStr2,Div,"~n"]),
-				 []),
+                      io:format(?def_gl, "~ts~n", [lists:concat([Div,ErrorStr2,Div])]),
 		       Link =
 			   "\n\n<a href=\"#end\">"
 			   "Full error description and stacktrace"
@@ -985,7 +995,8 @@ error_notification(Mod,Func,_Args,{Error,Loc}) ->
 		       ct_logs:tc_log(ct_error_notify,
 				      ?MAX_IMPORTANCE,
 				      "CT Error Notification",
-				      ErrorHtml2++Link, [], [])
+                                      "~ts", [ErrorHtml2++Link],
+                                      [])
 	       end,
     case Loc of
 	[{?MODULE,error_in_suite}] ->
@@ -1056,21 +1067,40 @@ group_or_func(Func, _Config) ->
 %%% should be returned.
 
 get_suite(Mod, all) ->
-    case catch apply(Mod, groups, []) of
-	{'EXIT',_} ->
-	    get_all(Mod, []);
-	GroupDefs when is_list(GroupDefs) ->
-	    case catch ct_groups:find_groups(Mod, all, all, GroupDefs) of
-		{error,_} = Error ->
-		    %% this makes test_server call error_in_suite as first
-		    %% (and only) test case so we can report Error properly
-		    [{?MODULE,error_in_suite,[[Error]]}];
-		ConfTests ->
-		    get_all(Mod, ConfTests)
-	    end;
-	_ ->
+    case safe_apply_groups_0(Mod,{ok,[]}) of
+        {ok,GroupDefs} ->
+            try ct_groups:find_groups(Mod, all, all, GroupDefs) of
+                ConfTests when is_list(ConfTests) ->
+                    get_all(Mod, ConfTests)
+            catch
+                throw:{error,Error} ->
+                    [{?MODULE,error_in_suite,[[{error,Error}]]}];
+                _:Error:S ->
+                    [{?MODULE,error_in_suite,[[{error,{Error,S}}]]}]
+            end;
+        {error,{bad_return,_Bad}} ->
 	    E = "Bad return value from "++atom_to_list(Mod)++":groups/0",
-	    [{?MODULE,error_in_suite,[[{error,list_to_atom(E)}]]}]
+	    [{?MODULE,error_in_suite,[[{error,list_to_atom(E)}]]}];
+        {error,{bad_hook_return,Bad}} ->
+	    E = "Bad return value from post_groups/2 hook function",
+	    [{?MODULE,error_in_suite,[[{error,{list_to_atom(E),Bad}}]]}];
+        {error,{failed,ExitReason}} ->
+	    case ct_util:get_testdata({error_in_suite,Mod}) of
+		undefined ->
+		    ErrStr = io_lib:format("~n*** ERROR *** "
+					   "~w:groups/0 failed: ~p~n",
+					   [Mod,ExitReason]),
+		    io:format(?def_gl, ErrStr, []),
+		    %% save the error info so it doesn't get printed twice
+		    ct_util:set_testdata_async({{error_in_suite,Mod},
+						ExitReason});
+		_ExitReason ->
+		    ct_util:delete_testdata({error_in_suite,Mod})
+	    end,
+	    Reason = list_to_atom(atom_to_list(Mod)++":groups/0 failed"),
+	    [{?MODULE,error_in_suite,[[{error,Reason}]]}];
+        {error,What} ->
+            [{?MODULE,error_in_suite,[[{error,What}]]}]
     end;
 
 %%!============================================================
@@ -1080,54 +1110,74 @@ get_suite(Mod, all) ->
 
 %% group
 get_suite(Mod, Group={conf,Props,_Init,TCs,_End}) ->
-    Name = ?val(name, Props),
-    case catch apply(Mod, groups, []) of
-	{'EXIT',_} ->
-	    [Group];
-	GroupDefs when is_list(GroupDefs) ->
-	    case catch ct_groups:find_groups(Mod, Name, TCs, GroupDefs) of
-		{error,_} = Error ->
-		    %% this makes test_server call error_in_suite as first
-		    %% (and only) test case so we can report Error properly
-		    [{?MODULE,error_in_suite,[[Error]]}];
-		[] ->
-		    [];
-		ConfTests ->
-		    case lists:member(skipped, Props) of
-			true ->
-			    %% a *subgroup* specified *only* as skipped (and not
-			    %% as an explicit test) should not be returned, or
-			    %% init/end functions for top groups will be executed
-			    case catch ?val(name, element(2, hd(ConfTests))) of
-				Name ->		% top group
-				    ct_groups:delete_subs(ConfTests, ConfTests);
-				_ ->
-				    []
-			    end;
-			false ->
-			    ConfTests1 = ct_groups:delete_subs(ConfTests,
-							       ConfTests),
-			    case ?val(override, Props) of
-				undefined ->
-				    ConfTests1;
-				[] ->
-				    ConfTests1;
-				ORSpec ->
-				    ORSpec1 = if is_tuple(ORSpec) -> [ORSpec];
-						 true -> ORSpec end,
-				    ct_groups:search_and_override(ConfTests1,
-								  ORSpec1, Mod)
-			    end
-		    end
-	    end;
-	_ ->
+    case safe_apply_groups_0(Mod,{ok,[Group]}) of
+        {ok,GroupDefs} ->
+            Name = ?val(name, Props),
+            try ct_groups:find_groups(Mod, Name, TCs, GroupDefs) of
+                [] ->
+                    [];
+                ConfTests when is_list(ConfTests) ->
+                    case lists:member(skipped, Props) of
+                        true ->
+                            %% a *subgroup* specified *only* as skipped (and not
+                            %% as an explicit test) should not be returned, or
+                            %% init/end functions for top groups will be executed
+                            try ?val(name, element(2, hd(ConfTests))) of
+                                Name ->		% top group
+                                    ct_groups:delete_subs(ConfTests, ConfTests);
+                                _ -> []
+                            catch
+                                _:_ -> []
+                            end;
+                        false ->
+                            ConfTests1 = ct_groups:delete_subs(ConfTests,
+                                                               ConfTests),
+                            case ?val(override, Props) of
+                                undefined ->
+                                    ConfTests1;
+                                [] ->
+                                    ConfTests1;
+                                ORSpec ->
+                                    ORSpec1 = if is_tuple(ORSpec) -> [ORSpec];
+                                                 true -> ORSpec end,
+                                    ct_groups:search_and_override(ConfTests1,
+                                                                  ORSpec1, Mod)
+                            end
+                    end
+            catch
+                throw:{error,Error} ->
+                    [{?MODULE,error_in_suite,[[{error,Error}]]}];
+                _:Error:S ->
+                    [{?MODULE,error_in_suite,[[{error,{Error,S}}]]}]
+            end;
+        {error,{bad_return,_Bad}} ->
 	    E = "Bad return value from "++atom_to_list(Mod)++":groups/0",
-	    [{?MODULE,error_in_suite,[[{error,list_to_atom(E)}]]}]
+	    [{?MODULE,error_in_suite,[[{error,list_to_atom(E)}]]}];
+        {error,{bad_hook_return,Bad}} ->
+            E = "Bad return value from post_groups/2 hook function",
+	    [{?MODULE,error_in_suite,[[{error,{list_to_atom(E),Bad}}]]}];
+        {error,{failed,ExitReason}} ->
+	    case ct_util:get_testdata({error_in_suite,Mod}) of
+		undefined ->
+		    ErrStr = io_lib:format("~n*** ERROR *** "
+					   "~w:groups/0 failed: ~p~n",
+					   [Mod,ExitReason]),
+		    io:format(?def_gl, ErrStr, []),
+		    %% save the error info so it doesn't get printed twice
+		    ct_util:set_testdata_async({{error_in_suite,Mod},
+						ExitReason});
+		_ExitReason ->
+		    ct_util:delete_testdata({error_in_suite,Mod})
+	    end,
+	    Reason = list_to_atom(atom_to_list(Mod)++":groups/0 failed"),
+	    [{?MODULE,error_in_suite,[[{error,Reason}]]}];
+         {error,What} ->
+            [{?MODULE,error_in_suite,[[{error,What}]]}]
     end;
 
 %% testcase
 get_suite(Mod, Name) ->
-     get_seq(Mod, Name).
+    get_seq(Mod, Name).
 
 %%%-----------------------------------------------------------------
 
@@ -1161,27 +1211,54 @@ get_all_cases1(_, []) ->
 
 %%%-----------------------------------------------------------------
 
-get_all(Mod, ConfTests) ->	
-    case catch apply(Mod, all, []) of
-	{'EXIT',{undef,[{Mod,all,[],_} | _]}} ->
+get_all(Mod, ConfTests) ->
+    case safe_apply_all_0(Mod) of
+        {ok,AllTCs} ->
+            %% expand group references using ConfTests
+            try ct_groups:expand_groups(AllTCs, ConfTests, Mod) of
+                {error,_} = Error ->
+                    [{?MODULE,error_in_suite,[[Error]]}];
+                Tests0 ->
+                    Tests = ct_groups:delete_subs(Tests0, Tests0),
+                    expand_tests(Mod, Tests)
+            catch
+                throw:{error,Error} ->
+                    [{?MODULE,error_in_suite,[[{error,Error}]]}];
+                _:Error:S ->
+                    [{?MODULE,error_in_suite,[[{error,{Error,S}}]]}]
+            end;
+        Skip = {skip,_Reason} ->
+	    Skip;
+        {error,undef} ->
+            Reason =
+                case code:which(Mod) of
+                    non_existing ->
+                        list_to_atom(
+                          atom_to_list(Mod)++
+                              " cannot be compiled or loaded");
+                    _ ->
+                        list_to_atom(
+                          atom_to_list(Mod)++":all/0 is missing")
+                end,
+            %% this makes test_server call error_in_suite as first
+            %% (and only) test case so we can report Reason properly
+            [{?MODULE,error_in_suite,[[{error,Reason}]]}];
+	{error,{bad_return,_Bad}} ->
 	    Reason =
-		case code:which(Mod) of
-		    non_existing ->
-			list_to_atom(atom_to_list(Mod)++
-					 " can not be compiled or loaded");
-		    _ ->
-			list_to_atom(atom_to_list(Mod)++":all/0 is missing")
-		end,
-	    %% this makes test_server call error_in_suite as first
-	    %% (and only) test case so we can report Reason properly
+		list_to_atom("Bad return value from "++
+				 atom_to_list(Mod)++":all/0"),
 	    [{?MODULE,error_in_suite,[[{error,Reason}]]}];
-	{'EXIT',ExitReason} ->
+        {error,{bad_hook_return,Bad}} ->
+	    Reason =
+		list_to_atom("Bad return value from post_all/3 hook function"),
+	    [{?MODULE,error_in_suite,[[{error,{Reason,Bad}}]]}];
+        {error,{failed,ExitReason}} ->
 	    case ct_util:get_testdata({error_in_suite,Mod}) of
 		undefined ->
 		    ErrStr = io_lib:format("~n*** ERROR *** "
 					   "~w:all/0 failed: ~tp~n",
 					   [Mod,ExitReason]),
-		    io:format(?def_gl, ErrStr, []),
+		    io:format(?def_gl, "~ts", [ErrStr]),
 		    %% save the error info so it doesn't get printed twice
 		    ct_util:set_testdata_async({{error_in_suite,Mod},
 						ExitReason});
@@ -1192,28 +1269,8 @@ get_all(Mod, ConfTests) ->
 	    %% this makes test_server call error_in_suite as first
 	    %% (and only) test case so we can report Reason properly
 	    [{?MODULE,error_in_suite,[[{error,Reason}]]}];
-	AllTCs when is_list(AllTCs) ->
-	    case catch save_seqs(Mod,AllTCs) of
-		{error,What} ->
-		    [{?MODULE,error_in_suite,[[{error,What}]]}];
-		SeqsAndTCs ->
-		    %% expand group references in all() using ConfTests
-		    case catch ct_groups:expand_groups(SeqsAndTCs,
-						       ConfTests,
-						       Mod) of
-			{error,_} = Error ->
-			    [{?MODULE,error_in_suite,[[Error]]}];
-			Tests ->
-			    ct_groups:delete_subs(Tests, Tests)
-		    end
-	    end;
-	Skip = {skip,_Reason} ->
-	    Skip;
-	_ ->
-	    Reason = 
-		list_to_atom("Bad return value from "++
-				 atom_to_list(Mod)++":all/0"),
-	    [{?MODULE,error_in_suite,[[{error,Reason}]]}]
+        {error,What} ->
+            [{?MODULE,error_in_suite,[[{error,What}]]}]
     end.
 
 %%!============================================================
@@ -1571,3 +1628,74 @@ get_html_wrapper(TestName, PrintLabel, Cwd, TableCols, Encoding) ->
 %%% -spec get_log_dir() -> {ok,LogDir}
 get_log_dir() ->
     ct_logs:get_log_dir(true).
+
+%%%-----------------------------------------------------------------
+%%% Call all and group callbacks and post_* hooks with error handling
+safe_apply_all_0(Mod) ->
+    try apply(Mod, all, []) of
+        AllTCs0 when is_list(AllTCs0) ->
+	    try save_seqs(Mod,AllTCs0) of
+		SeqsAndTCs when is_list(SeqsAndTCs) ->
+                    all_hook(Mod,SeqsAndTCs)
+            catch throw:{error,What} ->
+		    {error,What}
+            end;
+        {skip,_}=Skip ->
+            all_hook(Mod,Skip);
+        Bad ->
+            {error,{bad_return,Bad}}
+    catch
+        _:Reason:Stacktrace ->
+            handle_callback_crash(Reason,Stacktrace,Mod,all,{error,undef})
+    end.
+
+all_hook(Mod, All) ->
+    case ct_hooks:all(Mod, All) of
+        AllTCs when is_list(AllTCs) ->
+            {ok,AllTCs};
+        {skip,_}=Skip ->
+            Skip;
+        {fail,Reason} ->
+            {error,Reason};
+        Bad ->
+            {error,{bad_hook_return,Bad}}
+    end.
+
+safe_apply_groups_0(Mod,Default) ->
+    try apply(Mod, groups, []) of
+        GroupDefs when is_list(GroupDefs) ->
+            case ct_hooks:groups(Mod, GroupDefs) of
+                GroupDefs1 when is_list(GroupDefs1) ->
+                    {ok,GroupDefs1};
+                {fail,Reason} ->
+                    {error,Reason};
+                Bad ->
+                    {error,{bad_hook_return,Bad}}
+            end;
+        Bad ->
+            {error,{bad_return,Bad}}
+    catch
+        _:Reason:Stacktrace ->
+            handle_callback_crash(Reason,Stacktrace,Mod,groups,Default)
+    end.
+
+handle_callback_crash(undef,[{Mod,Func,[],_}|_],Mod,Func,Default) ->
+    case ct_hooks:Func(Mod, []) of
+        [] ->
+            Default;
+        List when is_list(List) ->
+            {ok,List};
+        {fail,Reason} ->
+            {error,Reason};
+        Bad ->
+            {error,{bad_hook_return,Bad}}
+    end;
+handle_callback_crash(Reason,Stacktrace,_Mod,_Func,_Default) ->
+    {error,{failed,{Reason,Stacktrace}}}.
+
+expand_tests(Mod, [{testcase,Case,[Prop]}|Tests]) ->
+    [{repeat,{Mod,Case},Prop}|expand_tests(Mod,Tests)];
+expand_tests(Mod,[Test|Tests]) ->
+    [Test|expand_tests(Mod,Tests)];
+expand_tests(_Mod,[]) ->
+    [].
diff --git a/lib/common_test/src/ct_groups.erl b/lib/common_test/src/ct_groups.erl
index d867069dce..f4b12c41c0 100644
--- a/lib/common_test/src/ct_groups.erl
+++ b/lib/common_test/src/ct_groups.erl
@@ -101,23 +101,34 @@ find(Mod, [], TCs, Tests, _Known, _Defs, false) ->
 				  [{Mod,TC}];
 			     ({group,_}) ->
 				  [];
+                             ({testcase,TC,[Prop]}) when is_atom(TC), TC ==all ->
+                                  [{repeat,{Mod,TC},Prop}];
 			     ({_,_}=TC) when TCs == all ->
 				  [TC];
-			     (TC) ->
-				  if is_atom(TC) ->
-					  Tuple = {Mod,TC},
-					  case lists:member(Tuple, TCs) of
-					      true  ->
-						  [Tuple];
-					      false ->
-						  case lists:member(TC, TCs) of
-						      true  -> [{Mod,TC}];
-						      false -> []
-						  end
-					  end;
-				     true ->
-					  []
-				  end
+			     (TC) when is_atom(TC) ->
+                                  Tuple = {Mod,TC},
+                                  case lists:member(Tuple, TCs) of
+                                      true  ->
+                                          [Tuple];
+                                      false ->
+                                          case lists:member(TC, TCs) of
+                                              true  -> [Tuple];
+                                              false -> []
+                                          end
+                                  end;
+                             ({testcase,TC,[Prop]}) when is_atom(TC) ->
+                                  Tuple = {Mod,TC},
+                                  case lists:member(Tuple, TCs) of
+                                      true  ->
+                                          [{repeat,Tuple,Prop}];
+                                      false ->
+                                          case lists:member(TC, TCs) of
+                                              true  -> [{repeat,Tuple,Prop}];
+                                              false -> []
+                                          end
+                                  end;
+                             (_) ->
+                                  []
 			  end, Tests),
     if Cases == [] -> ['NOMATCH'];
        true -> Cases
@@ -172,12 +183,19 @@ find(Mod, GrNames, all, [{M,TC} | Gs], Known,
      Defs, FindAll) when is_atom(M), M /= group, is_atom(TC) ->
     [{M,TC} | find(Mod, GrNames, all, Gs, Known, Defs, FindAll)];
 
+%% Save test case
+find(Mod, GrNames, all, [{testcase,TC,[Prop]} | Gs], Known,
+     Defs, FindAll) when is_atom(TC) ->
+    [{repeat,{Mod,TC},Prop} | find(Mod, GrNames, all, Gs, Known, Defs, FindAll)];
+
 %% Check if test case should be saved
-find(Mod, GrNames, TCs, [TC | Gs], Known,
-     Defs, FindAll) when is_atom(TC) orelse 
-			 ((size(TC) == 2) and (element(1,TC) /= group)) ->
+find(Mod, GrNames, TCs, [TC | Gs], Known, Defs, FindAll)
+  when is_atom(TC) orelse
+       ((size(TC) == 3) andalso (element(1,TC) == testcase)) orelse
+       ((size(TC) == 2) and (element(1,TC) /= group)) ->
     Case =
-	if is_atom(TC) ->
+        case TC of
+            _ when is_atom(TC) ->
 		Tuple = {Mod,TC},
 		case lists:member(Tuple, TCs) of
 		    true  ->
@@ -188,7 +206,18 @@ find(Mod, GrNames, TCs, [TC | Gs], Known,
 			    false -> []
 			end
 		end;
-	   true ->
+            {testcase,TC0,[Prop]} when is_atom(TC0) ->
+		Tuple = {Mod,TC0},
+		case lists:member(Tuple, TCs) of
+		    true  ->
+			{repeat,Tuple,Prop};
+		    false ->
+			case lists:member(TC0, TCs) of
+			    true  -> {repeat,{Mod,TC0},Prop};
+			    false -> []
+			end
+		end;
+            _ ->
 		case lists:member(TC, TCs) of
 		    true  -> {Mod,TC};
 		    false -> []
@@ -289,12 +318,22 @@ modify_tc_list(GrSpecTs, TSCs, []) ->
     modify_tc_list1(GrSpecTs, TSCs);
     
 modify_tc_list(GrSpecTs, _TSCs, _) ->
-    [Test || Test <- GrSpecTs, not is_atom(Test)].
+    [Test || Test <- GrSpecTs, not is_atom(Test), element(1,Test)=/=testcase].
 
 modify_tc_list1(GrSpecTs, TSCs) ->
     %% remove all cases in group tc list that should not be executed
     GrSpecTs1 =
-	lists:flatmap(fun(Test) when is_tuple(Test),
+	lists:flatmap(fun(Test={testcase,TC,_}) ->
+			      case lists:keysearch(TC, 2, TSCs) of
+				  {value,_} ->
+				      [Test];
+				  _ ->
+				      case lists:member(TC, TSCs) of
+					  true  -> [Test];
+					  false -> []
+				      end
+			      end;
+                         (Test) when is_tuple(Test),
 				     (size(Test) > 2) ->
 			      [Test];
 			 (Test={group,_}) ->
diff --git a/lib/common_test/src/ct_hooks.erl b/lib/common_test/src/ct_hooks.erl
index 49587b3edd..94551d6815 100644
--- a/lib/common_test/src/ct_hooks.erl
+++ b/lib/common_test/src/ct_hooks.erl
@@ -22,6 +22,8 @@
 
 %% API Exports
 -export([init/1]).
+-export([groups/2]).
+-export([all/2]).
 -export([init_tc/3]).
 -export([end_tc/5]).
 -export([terminate/1]).
@@ -37,7 +39,8 @@
 					opts = [],
 					prio = ctfirst }]).
 
--record(ct_hook_config, {id, module, prio, scope, opts = [], state = []}).
+-record(ct_hook_config, {id, module, prio, scope, opts = [],
+                         state = [], groups = []}).
 
 %% -------------------------------------------------------------------------
 %% API Functions
@@ -49,6 +52,48 @@ init(Opts) ->
     call(get_builtin_hooks(Opts) ++ get_new_hooks(Opts, undefined),
 	 ok, init, []).
 
+%% Call the post_groups/2 hook callback
+groups(Mod, Groups) ->
+    Info = try proplists:get_value(ct_hooks, Mod:suite(), []) of
+               CTHooks when is_list(CTHooks) ->
+                   [{?config_name,CTHooks}];
+               CTHook when is_atom(CTHook) ->
+                   [{?config_name,[CTHook]}]
+           catch _:_ ->
+                   %% since this might be the first time Mod:suite()
+                   %% is called, and it might just fail or return
+                   %% something bad, we allow any failure here - it
+                   %% will be catched later if there is something
+                   %% really wrong.
+                   [{?config_name,[]}]
+           end,
+    case call(fun call_generic/3, Info ++ [{'$ct_groups',Groups}], [post_groups, Mod]) of
+        [{'$ct_groups',NewGroups}] ->
+            NewGroups;
+        Other ->
+            Other
+    end.
+
+%% Call the post_all/3 hook callback
+all(Mod, Tests) ->
+    Info = try proplists:get_value(ct_hooks, Mod:suite(), []) of
+               CTHooks when is_list(CTHooks) ->
+                   [{?config_name,CTHooks}];
+               CTHook when is_atom(CTHook) ->
+                   [{?config_name,[CTHook]}]
+           catch _:_ ->
+                   %% just allow any failure here - it will be catched
+                   %% later if there is something really wrong.
+                   [{?config_name,[]}]
+           end,
+    case call(fun call_generic/3, Info ++ [{'$ct_all',Tests}], [post_all, Mod]) of
+        [{'$ct_all',NewTests}] ->
+            NewTests;
+        Other ->
+            Other
+    end.
+
+%% Called after all suites are done.
 -spec terminate(Hooks :: term()) ->
     ok.
 terminate(Hooks) ->
@@ -80,6 +125,7 @@ init_tc(Mod, init_per_suite, Config) ->
 		   [{?config_name,[]}]
 	   end,
     call(fun call_generic/3, Config ++ Info, [pre_init_per_suite, Mod]);
+
 init_tc(Mod, end_per_suite, Config) ->
     call(fun call_generic/3, Config, [pre_end_per_suite, Mod]);
 init_tc(Mod, {init_per_group, GroupName, Properties}, Config) ->
@@ -153,7 +199,7 @@ call_id(#ct_hook_config{ module = Mod, opts = Opts} = Hook, Config, Scope) ->
     {Config, Hook#ct_hook_config{ id = Id, scope = scope(Scope)}}.
 	
 call_init(#ct_hook_config{ module = Mod, opts = Opts, id = Id, prio = P} = Hook,
-	  Config,_Meta) ->
+	  Config, _Meta) ->
     case Mod:init(Id, Opts) of
 	{ok, NewState} when P =:= undefined ->
 	    {Config, Hook#ct_hook_config{ state = NewState, prio = 0 } };
@@ -184,6 +230,18 @@ call_generic(Hook, Value, Meta) ->
 call_generic_fallback(Hook, Value, Meta) ->
     do_call_generic(Hook, Value, Meta, true).
 
+do_call_generic(#ct_hook_config{ module = Mod} = Hook,
+                [{'$ct_groups',Groups}], [post_groups | Args], Fallback) ->
+    NewGroups = catch_apply(Mod, post_groups, Args ++ [Groups],
+                            Groups, Fallback),
+    {[{'$ct_groups',NewGroups}], Hook#ct_hook_config{ groups = NewGroups } };
+
+do_call_generic(#ct_hook_config{ module = Mod, groups = Groups} = Hook,
+                [{'$ct_all',Tests}], [post_all | Args], Fallback) ->
+    NewTests = catch_apply(Mod, post_all, Args ++ [Tests, Groups],
+                           Tests, Fallback),
+    {[{'$ct_all',NewTests}], Hook};
+
 do_call_generic(#ct_hook_config{ module = Mod, state = State} = Hook,
                 Value, [Function | Args], Fallback) ->
     {NewValue, NewState} = catch_apply(Mod, Function, Args ++ [Value, State],
@@ -218,6 +276,12 @@ call([{Hook, call_id, NextFun} | Rest], Config, Meta, Hooks) ->
 		     Rest ++ [{NewId, call_init}]};
 		ExistingHook when is_tuple(ExistingHook) ->
 		    {Hooks, Rest};
+                _ when hd(Meta)=:=post_groups; hd(Meta)=:=post_all ->
+                    %% If CTH is started because of a call from
+                    %% groups/2 or all/2, CTH:init/1 must not be
+                    %% called (the suite scope should be used).
+                    {Hooks ++ [NewHook],
+		     Rest ++ [{NewId,NextFun}]};
 		_ ->
 		    {Hooks ++ [NewHook],
 		     Rest ++ [{NewId, call_init}, {NewId,NextFun}]}
@@ -226,8 +290,8 @@ call([{Hook, call_id, NextFun} | Rest], Config, Meta, Hooks) ->
     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"
-		      ", see the CT Log for details"}, Meta, Hooks)
+	    call([], {fail,"Failed to start CTH, "
+		      "see the CT Log for details"}, Meta, Hooks)
     end;
 call([{HookId, call_init} | Rest], Config, Meta, Hooks) ->
     call([{HookId, fun call_init/3} | Rest], Config, Meta, Hooks);
@@ -267,6 +331,10 @@ scope([pre_init_per_suite, SuiteName|_]) ->
     [post_end_per_suite, SuiteName];
 scope([post_init_per_suite, SuiteName|_]) ->
     [post_end_per_suite, SuiteName];
+scope([post_groups, SuiteName|_]) ->
+    [post_groups, SuiteName];
+scope([post_all, SuiteName|_]) ->
+    [post_all, SuiteName];
 scope(init) ->
     none.
 
@@ -295,7 +363,16 @@ terminate_if_scope_ends(HookId, Function0, Hooks) ->
     Function = strip_config(Function0),
     case lists:keyfind(HookId, #ct_hook_config.id, Hooks) of
         #ct_hook_config{ id = HookId, scope = Function} = Hook ->
-            terminate([Hook]),
+            case Function of
+                [AllOrGroup,_] when AllOrGroup=:=post_all;
+                                    AllOrGroup=:=post_groups ->
+                    %% The scope only contains one function (post_all
+                    %% or post_groups), and init has not been called,
+                    %% so skip terminate as well.
+                    ok;
+                _ ->
+                    terminate([Hook])
+            end,
             lists:keydelete(HookId, #ct_hook_config.id, Hooks);
         _ ->
             Hooks
@@ -353,6 +430,7 @@ resort(Calls,Hooks,[F|_R]) when F == pre_end_per_testcase;
 				F == pre_end_per_suite;
 				F == post_end_per_suite ->
     lists:reverse(resort(Calls,Hooks));
+
 resort(Calls,Hooks,_Meta) ->
     resort(Calls,Hooks).
     
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
index 07a1693d5d..ca262b350f 100644
--- a/lib/common_test/src/ct_logs.erl
+++ b/lib/common_test/src/ct_logs.erl
@@ -149,7 +149,7 @@ close(Info, StartDir) ->
 				 ok;
 			     CacheBin ->
 				 %% save final version of the log cache to file
-				 _ = file:write_file(?log_cache_name,CacheBin),
+				 write_log_cache(CacheBin),
 				 put(ct_log_cache,undefined)
 			 end
 		 end,
@@ -542,7 +542,7 @@ tc_print(Category,Importance,Format,Args,Opts) ->
                     undefined -> atom_to_list(Category);
                     Hd        -> Hd
                 end,
-            Str = lists:concat([get_header(Heading),Format,"\n\n"]),
+            Str = lists:flatten([get_header(Heading),Format,"\n\n"]),
             try
                 io:format(?def_gl, Str, Args)
             catch
@@ -935,7 +935,7 @@ create_io_fun(FromPid, CtLogFd, EscChars) ->
 		    {_HdOrFt,S,A} -> {false,S,A};
 		    {S,A}         -> {true,S,A}
 		end,
-	    try io_lib:format(Str, Args) of
+	    try io_lib:format(lists:flatten(Str), Args) of
 		IoStr when Escapable, EscChars, IoList == [] ->
 		    escape_chars(IoStr);
 		IoStr when Escapable, EscChars ->
@@ -1138,10 +1138,10 @@ set_evmgr_gl(GL) ->
 
 open_ctlog(MiscIoName) ->
     {ok,Fd} = file:open(?ct_log_name,[write,{encoding,utf8}]),
-    io:format(Fd, header("Common Test Framework Log", {[],[1,2],[]}), []),
+    io:format(Fd, "~ts", [header("Common Test Framework Log", {[],[1,2],[]})]),
     case file:consult(ct_run:variables_file_name("../")) of
 	{ok,Vars} ->
-	    io:format(Fd, config_table(Vars), []);
+	    io:format(Fd, "~ts", [config_table(Vars)]);
 	{error,Reason} ->
 	    {ok,Cwd} = file:get_cwd(),
 	    Dir = filename:dirname(Cwd),
@@ -1213,7 +1213,7 @@ print_style_error(Fd, IoFormat, StyleSheet, Reason) ->
 
 close_ctlog(Fd) ->
     io:format(Fd, "\n</pre>\n", []),
-    io:format(Fd, [xhtml("<br><br>\n", "<br /><br />\n") | footer()], []),
+    io:format(Fd, "~ts", [[xhtml("<br><br>\n", "<br /><br />\n") | footer()]]),
     ok = file:close(Fd).
 
 %%%-----------------------------------------------------------------
@@ -2022,7 +2022,7 @@ update_all_runs_in_cache(AllRunsData) ->
 		    %% read from file as long as this logger process is alive
 		    put(ct_log_cache,term_to_binary(LogCache));
 		_ ->
-		    file:write_file(?log_cache_name,term_to_binary(LogCache))
+		    write_log_cache(term_to_binary(LogCache))
 	    end;		    
 	SavedLogCache ->
 	    update_all_runs_in_cache(AllRunsData,binary_to_term(SavedLogCache))
@@ -2036,7 +2036,7 @@ update_all_runs_in_cache(AllRunsData, LogCache) ->
 	    %% read from file as long as this logger process is alive
 	    put(ct_log_cache,term_to_binary(LogCache1));
 	_ ->
-	    file:write_file(?log_cache_name,term_to_binary(LogCache1))
+	    write_log_cache(term_to_binary(LogCache1))
     end.
 
 sort_all_runs(Dirs) ->
@@ -2668,7 +2668,7 @@ update_tests_in_cache(TempData,LogCache=#log_cache{tests=Tests}) ->
 	{_Pid,_Pid} ->
 	    put(ct_log_cache,CacheBin);
 	_ ->
-	    file:write_file(?log_cache_name,CacheBin)
+	    write_log_cache(CacheBin)
     end.
 
 %%
@@ -3400,3 +3400,9 @@ unexpected_io(Pid, _Category, _Importance, Content, CtLogFd, EscChars) ->
     Data = io_lib:format("~ts", [lists:foldl(IoFun, [], Content)]),
     test_server_io:print_unexpected(Data),
     ok.
+
+write_log_cache(LogCacheBin) when is_binary(LogCacheBin) ->
+    TmpFile = ?log_cache_name++".tmp",
+    _ = file:write_file(TmpFile,LogCacheBin),
+    _ = file:rename(TmpFile,?log_cache_name),
+    ok.
diff --git a/lib/common_test/src/ct_master.erl b/lib/common_test/src/ct_master.erl
index fd33ee2280..9fc169789c 100644
--- a/lib/common_test/src/ct_master.erl
+++ b/lib/common_test/src/ct_master.erl
@@ -350,7 +350,7 @@ master_loop(#state{node_ctrl_pids=[],
 			  io_lib:format("~-40.40.*ts~tp\n",
 					[$_,atom_to_list(Node),Result])
 		  end,lists:reverse(Finished)),
-    log(all,"TEST RESULTS",Str,[]),
+    log(all,"TEST RESULTS","~ts", [Str]),
     log(all,"Info","Updating log files",[]),
     refresh_logs(LogDirs,[]),
     
@@ -574,7 +574,7 @@ refresh_logs([],Refreshed) ->
 			  io_lib:format("Refreshing logs in ~tp... ~tp",
 					[D,Result])
 		  end,Refreshed),
-    log(all,"Info",Str,[]).
+    log(all,"Info","~ts", [Str]).
 
 %%%-----------------------------------------------------------------
 %%% NODE CONTROLLER, runs and controls tests on a test node.
diff --git a/lib/common_test/src/ct_netconfc.erl b/lib/common_test/src/ct_netconfc.erl
index 29188a648e..6a758c4ea3 100644
--- a/lib/common_test/src/ct_netconfc.erl
+++ b/lib/common_test/src/ct_netconfc.erl
@@ -583,7 +583,7 @@ get_config(Client, Source, Filter, Timeout) ->
 -spec edit_config(Client, Target, Config) -> Result when
       Client :: client(),
       Target :: netconf_db(),
-      Config :: simple_xml(),
+      Config :: simple_xml() | [simple_xml()],
       Result :: ok | {error,error_reason()}.
 edit_config(Client, Target, Config) ->
     edit_config(Client, Target, Config, ?DEFAULT_TIMEOUT).
@@ -591,7 +591,7 @@ edit_config(Client, Target, Config) ->
 -spec edit_config(Client, Target, Config, OptParams) -> Result when
       Client :: client(),
       Target :: netconf_db(),
-      Config :: simple_xml(),
+      Config :: simple_xml() | [simple_xml()],
       OptParams :: [simple_xml()],
       Result :: ok | {error,error_reason()};
                  (Client, Target, Config, Timeout) -> Result when
@@ -608,10 +608,12 @@ edit_config(Client, Target, Config, OptParams) when is_list(OptParams) ->
 -spec edit_config(Client, Target, Config, OptParams, Timeout) -> Result when
       Client :: client(),
       Target :: netconf_db(),
-      Config :: simple_xml(),
+      Config :: simple_xml() | [simple_xml()],
       OptParams :: [simple_xml()],
       Timeout :: timeout(),
       Result :: ok | {error,error_reason()}.
+edit_config(Client, Target, Config, OptParams, Timeout) when not is_list(Config)->
+    edit_config(Client, Target, [Config], OptParams, Timeout);
 edit_config(Client, Target, Config, OptParams, Timeout) ->
     call(Client, {send_rpc_op, edit_config, [Target,Config,OptParams], Timeout}).
 
@@ -1113,7 +1115,7 @@ encode_rpc_operation(get,[Filter]) ->
 encode_rpc_operation(get_config,[Source,Filter]) ->
     {'get-config',[{source,[Source]}] ++ filter(Filter)};
 encode_rpc_operation(edit_config,[Target,Config,OptParams]) ->
-    {'edit-config',[{target,[Target]}] ++ OptParams ++ [{config,[Config]}]};
+    {'edit-config',[{target,[Target]}] ++ OptParams ++ [{config,Config}]};
 encode_rpc_operation(delete_config,[Target]) ->
     {'delete-config',[{target,[Target]}]};
 encode_rpc_operation(copy_config,[Target,Source]) ->
diff --git a/lib/common_test/src/ct_release_test.erl b/lib/common_test/src/ct_release_test.erl
index 60d17f43dc..839fb300c7 100644
--- a/lib/common_test/src/ct_release_test.erl
+++ b/lib/common_test/src/ct_release_test.erl
@@ -152,10 +152,10 @@
 %% returned configuration must therefore also be returned from
 %% the calling `init_per_*'.
 %%
-%% If the initialization fails, e.g. if a required release can
-%% not be found, the function returns `{skip,Reason}'. In
+%% If the initialization fails, e.g. if a required release
+%% cannot be found, the function returns `{skip,Reason}'. In
 %% this case the other test support functions in this mudule
-%% can not be used.
+%% cannot be used.
 %%
 %% Example:
 %%
@@ -426,7 +426,7 @@ init_upgrade_test(Level) ->
     case OldRel of
 	false ->
 	    ct:log("Release ~tp is not available."
-		   " Upgrade on '~p' level can not be tested.",
+		   " Upgrade on '~p' level cannot be tested.",
 		   [FromVsn,Level]),
 	    undefined;
 	_ ->
@@ -475,7 +475,7 @@ fetch_all_apps(Node) ->
 		  A = list_to_atom(filename:basename(filename:rootname(F))),
 		  _ = rpc:call(Node,application,load,[A]),
 		  case rpc:call(Node,application,get_key,[A,vsn]) of
-		      {ok,V} -> [{A,V}];
+		      {ok,V} -> [{A,V,rpc:call(Node,code,lib_dir,[A])}];
 		      _ -> []
 		  end
 	  end,
@@ -517,7 +517,7 @@ upgrade(Apps,Level,Callback,CreateDir,InstallDir,Config) ->
 target_system(Apps,CreateDir,InstallDir,{FromVsn,_,AllAppsVsns,Path}) ->
     RelName0 = "otp-"++FromVsn,
 
-    AppsVsns = [{A,V} || {A,V} <- AllAppsVsns, lists:member(A,Apps)],
+    AppsVsns = [{A,V,D} || {A,V,D} <- AllAppsVsns, lists:member(A,Apps)],
     {RelName,ErtsVsn} = create_relfile(AppsVsns,CreateDir,RelName0,FromVsn),
 
     %% Create .script and .boot
@@ -528,7 +528,7 @@ target_system(Apps,CreateDir,InstallDir,{FromVsn,_,AllAppsVsns,Path}) ->
 				     {path,Path}]]),
 
     %% Unpack the tar to complete the installation
-    erl_tar:extract(RelName ++ ".tar.gz", [{cwd, InstallDir}, compressed]),
+    ok = erl_tar:extract(RelName ++ ".tar.gz", [{cwd, InstallDir}, compressed]),
 
     %% Add bin and log dirs
     BinDir = filename:join([InstallDir, "bin"]),
@@ -554,11 +554,11 @@ target_system(Apps,CreateDir,InstallDir,{FromVsn,_,AllAppsVsns,Path}) ->
 
     %% create start_erl.data, sys.config and start.src
     StartErlData = filename:join([InstallDir, "releases", "start_erl.data"]),
-    write_file(StartErlData, io_lib:fwrite("~s ~s~n", [ErtsVsn, FromVsn])),
+    ok = write_file(StartErlData, io_lib:fwrite("~s ~s~n", [ErtsVsn, FromVsn])),
     SysConfig = filename:join([InstallDir, "releases", FromVsn, "sys.config"]),
-    write_file(SysConfig, "[]."),
+    ok = write_file(SysConfig, "[]."),
     StartSrc = filename:join(ErtsBinDir,"start.src"),
-    write_file(StartSrc,start_script()),
+    ok = write_file(StartSrc,start_script()),
     ok = file:change_mode(StartSrc,8#0755),
 
     %% Make start_erl executable
@@ -620,7 +620,7 @@ upgrade_system(Apps, FromRel, CreateDir, InstallDir, {_,ToVsn,_,_}) ->
 			      [{path,[FromPath]},
 			       {outdir,CreateDir}]]),
     SysConfig = filename:join([CreateDir, "sys.config"]),
-    write_file(SysConfig, "[]."),
+    ok = write_file(SysConfig, "[]."),
 
     ok = systools(make_tar,[RelName,[{erts,code:root_dir()}]]),
 
@@ -636,8 +636,7 @@ do_upgrade({Cb,InitState},FromVsn,FromAppsVsns,ToRel,ToAppsVsns,InstallDir) ->
     {ok,Node} = start_node(Start,FromVsn,FromAppsVsns),
 
     ct:log("Node started: ~p",[Node]),
-    CtData = #ct_data{from = [{A,V,code:lib_dir(A)} || {A,V} <- FromAppsVsns],
-		      to=[{A,V,code:lib_dir(A)} || {A,V} <- ToAppsVsns]},
+    CtData = #ct_data{from = FromAppsVsns,to=ToAppsVsns},
     State1 = do_callback(Node,Cb,upgrade_init,[CtData,InitState]),
 
     [{"OTP upgrade test",FromVsn,_,permanent}] =
@@ -724,14 +723,14 @@ previous_major(Rel) ->
     integer_to_list(list_to_integer(Rel)-1).
 
 create_relfile(AppsVsns,CreateDir,RelName0,RelVsn) ->
-    UpgradeAppsVsns = [{A,V,restart_type(A)} || {A,V} <- AppsVsns],
+    UpgradeAppsVsns = [{A,V,restart_type(A)} || {A,V,_D} <- AppsVsns],
 
     CoreAppVsns0 = get_vsns([kernel,stdlib,sasl]),
     CoreAppVsns =
-	[{A,V,restart_type(A)} || {A,V} <- CoreAppVsns0,
+	[{A,V,restart_type(A)} || {A,V,_D} <- CoreAppVsns0,
 				  false == lists:keymember(A,1,AppsVsns)],
 
-    Apps = [App || {App,_} <- AppsVsns],
+    Apps = [App || {App,_,_} <- AppsVsns],
     StartDepsVsns = get_start_deps(Apps,CoreAppVsns),
     StartApps = [StartApp || {StartApp,_,_} <- StartDepsVsns] ++ Apps,
 
@@ -744,7 +743,7 @@ create_relfile(AppsVsns,CreateDir,RelName0,RelVsn) ->
     %% processes of these applications will not be running.
     TestToolAppsVsns0 = get_vsns([common_test]),
     TestToolAppsVsns =
-	[{A,V,none} || {A,V} <- TestToolAppsVsns0,
+	[{A,V,none} || {A,V,_D} <- TestToolAppsVsns0,
 		       false == lists:keymember(A,1,AllAppsVsns0)],
 
     AllAppsVsns1 = AllAppsVsns0 ++ TestToolAppsVsns,
@@ -766,7 +765,7 @@ get_vsns(Apps) ->
     [begin
 	 _ = application:load(A),
 	 {ok,V} = application:get_key(A,vsn),
-	 {A,V}
+	 {A,V,code:lib_dir(A)}
      end || A <- Apps].
 
 get_start_deps([App|Apps],Acc) ->
@@ -858,7 +857,7 @@ subst_file(Src, Dest, Vars, Opts) ->
     {ok, Bin} = file:read_file(Src),
     Conts = unicode:characters_to_list(Bin),
     NConts = subst(Conts, Vars),
-    write_file(Dest, NConts),
+    ok = write_file(Dest, NConts),
     case lists:member(preserve, Opts) of
         true ->
             {ok, FileInfo} = file:read_file_info(Src),
@@ -880,8 +879,9 @@ start_node(Start,ExpVsn,ExpAppsVsns) ->
     erlang:port_close(Port),
     wait_node_up(permanent,ExpVsn,ExpAppsVsns).
 
-wait_node_up(ExpStatus,ExpVsn,ExpAppsVsns) ->
+wait_node_up(ExpStatus,ExpVsn,ExpAppsVsns0) ->
     Node = node_name(?testnode),
+    ExpAppsVsns = [{A,V} || {A,V,_D} <- ExpAppsVsns0],
     wait_node_up(Node,ExpStatus,ExpVsn,lists:keysort(1,ExpAppsVsns),60).
 
 wait_node_up(Node,ExpStatus,ExpVsn,ExpAppsVsns,0) ->
@@ -893,7 +893,7 @@ wait_node_up(Node,ExpStatus,ExpVsn,ExpAppsVsns,N) ->
 	  rpc:call(Node, application, which_applications, [])} of
 	{[{_,ExpVsn,_,_}],Apps} when is_list(Apps) ->
 	    case [{A,V} || {A,_,V} <- lists:keysort(1,Apps),
-			   lists:keymember(A,1,ExpAppsVsns)] of
+                           lists:keymember(A,1,ExpAppsVsns)] of
 		ExpAppsVsns ->
 		    {ok,Node};
 		_ ->
diff --git a/lib/common_test/src/ct_repeat.erl b/lib/common_test/src/ct_repeat.erl
index 8b1c7d47bb..b97c6e59e7 100644
--- a/lib/common_test/src/ct_repeat.erl
+++ b/lib/common_test/src/ct_repeat.erl
@@ -278,7 +278,7 @@ log_loop_info(Args) ->
 		    ForceStop ->
 			io_lib:format("force_stop is set to: ~w",[ForceStop])
 		end,			
-	    ct_logs:log("Test loop info",LogStr1++LogStr2++LogStr3++LogStr4,[])
+	    ct_logs:log("Test loop info","~ts", [LogStr1++LogStr2++LogStr3++LogStr4])
     end.
 
 ts(Secs) ->
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index c9d406f1fd..960252a6fe 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -2345,18 +2345,24 @@ start_cover(Opts=#opts{coverspec=CovData,cover_stop=CovStop},LogDir) ->
      CovImport,
      _CovExport,
      #cover{app        = CovApp,
+            local_only = LocalOnly,
 	    level      = CovLevel,
 	    excl_mods  = CovExcl,
 	    incl_mods  = CovIncl,
 	    cross      = CovCross,
 	    src        = _CovSrc}} = CovData,
+    case LocalOnly of
+        true -> cover:local_only();
+        false -> ok
+    end,
     ct_logs:log("COVER INFO",
 		"Using cover specification file: ~ts~n"
 		"App: ~w~n"
+                "Local only: ~w~n"
 		"Cross cover: ~w~n"
 		"Including ~w modules~n"
 		"Excluding ~w modules",
-		[CovFile,CovApp,CovCross,
+		[CovFile,CovApp,LocalOnly,CovCross,
 		 length(CovIncl),length(CovExcl)]),
 
     %% Tell test_server to print a link in its coverlog
diff --git a/lib/common_test/src/ct_telnet.erl b/lib/common_test/src/ct_telnet.erl
index f9abecfd38..219f58dcf5 100644
--- a/lib/common_test/src/ct_telnet.erl
+++ b/lib/common_test/src/ct_telnet.erl
@@ -194,6 +194,15 @@ send(Connection,Cmd,Opts) ->
 
 check_send_opts([{newline,Bool}|Opts]) when is_boolean(Bool) ->
     check_send_opts(Opts);
+check_send_opts([{newline,String}|Opts]) when is_list(String) ->
+    case lists:all(fun(I) when is_integer(I), I>=0, I=<127 -> true;
+                      (_) -> false
+                   end, String) of
+        true ->
+            check_send_opts(Opts);
+        false ->
+            {error,{invalid_option,{newline,String}}}
+    end;
 check_send_opts([Invalid|_]) ->
     {error,{invalid_option,Invalid}};
 check_send_opts([]) ->
@@ -211,10 +220,16 @@ expect(Connection,Patterns) ->
 
 expect(Connection,Patterns,Opts) ->
     case get_handle(Connection) of
-	{ok,Pid} ->
-	    call(Pid,{expect,Patterns,Opts});
-	Error ->
-	    Error
+        {ok,Pid} ->
+            case call(Pid,{expect,Patterns,Opts}) of
+                {error,Reason} when element(1,Reason)==bad_pattern ->
+                    %% Faulty user input - should fail the test case
+                    exit({Reason,{?MODULE,?FUNCTION_NAME,3}});
+                Other ->
+                    Other
+            end;
+        Error ->
+            Error
     end.
 
 %%%=================================================================
@@ -674,60 +689,68 @@ silent_teln_expect(Name,Pid,Data,Pattern,Prx,Opts) ->
 %% 3b) Repeat (sequence): 2) is repeated either N times or until a
 %% halt condition is fulfilled.
 teln_expect(Name,Pid,Data,Pattern0,Prx,Opts) ->
-    HaltPatterns =
+    HaltPatterns0 =
 	case get_ignore_prompt(Opts) of
 	    true ->
 		get_haltpatterns(Opts);
 	    false ->
 		[prompt | get_haltpatterns(Opts)]
 	end,
-
-    PromptCheck = get_prompt_check(Opts),
-
-    {WaitForPrompt,Pattern1,Opts1} = wait_for_prompt(Pattern0,Opts),
-
-    Seq = get_seq(Opts1),
-    Pattern2 = convert_pattern(Pattern1,Seq),
-    {IdleTimeout,TotalTimeout} = get_timeouts(Opts1),
-
-    EO = #eo{teln_pid=Pid,
-	     prx=Prx,
-	     idle_timeout=IdleTimeout,
-	     total_timeout=TotalTimeout,
-	     seq=Seq,
-	     haltpatterns=HaltPatterns,
-	     prompt_check=PromptCheck},
+    case convert_pattern(HaltPatterns0,false) of
+        {ok,HaltPatterns} ->
+            {WaitForPrompt,Pattern1,Opts1} = wait_for_prompt(Pattern0,Opts),
+            Seq = get_seq(Opts1),
+            case convert_pattern(Pattern1,Seq) of
+                {ok,Pattern2} ->
+                    {IdleTimeout,TotalTimeout} = get_timeouts(Opts1),
+                    PromptCheck = get_prompt_check(Opts1),
+
+                    EO = #eo{teln_pid=Pid,
+                             prx=Prx,
+                             idle_timeout=IdleTimeout,
+                             total_timeout=TotalTimeout,
+                             seq=Seq,
+                             haltpatterns=HaltPatterns,
+                             prompt_check=PromptCheck},
     
-    case get_repeat(Opts1) of
-	false ->
-	    case teln_expect1(Name,Pid,Data,Pattern2,[],EO) of
-		{ok,Matched,Rest} when WaitForPrompt ->
-		    case lists:reverse(Matched) of
-			[{prompt,_},Matched1] ->
-			    {ok,Matched1,Rest};
-			[{prompt,_}|Matched1] ->
-			    {ok,lists:reverse(Matched1),Rest}
-		    end;
-		{ok,Matched,Rest} ->
-		    {ok,Matched,Rest};
-		{halt,Why,Rest} ->
-		    {error,Why,Rest};
-		{error,Reason} ->
-		    {error,Reason}
-	    end;
-	N ->
-	    EO1 = EO#eo{repeat=N},
-	    repeat_expect(Name,Pid,Data,Pattern2,[],EO1)
+                    case get_repeat(Opts1) of
+                        false ->
+                            case teln_expect1(Name,Pid,Data,Pattern2,[],EO) of
+                                {ok,Matched,Rest} when WaitForPrompt ->
+                                    case lists:reverse(Matched) of
+                                        [{prompt,_},Matched1] ->
+                                            {ok,Matched1,Rest};
+                                        [{prompt,_}|Matched1] ->
+                                            {ok,lists:reverse(Matched1),Rest}
+                                    end;
+                                {ok,Matched,Rest} ->
+                                    {ok,Matched,Rest};
+                                {halt,Why,Rest} ->
+                                    {error,Why,Rest};
+                                {error,Reason} ->
+                                    {error,Reason}
+                            end;
+                        N ->
+                            EO1 = EO#eo{repeat=N},
+                            repeat_expect(Name,Pid,Data,Pattern2,[],EO1)
+                    end;
+               Error ->
+                    Error
+            end;
+        Error ->
+            Error
     end.
 
-convert_pattern(Pattern,Seq) 
-  when is_list(Pattern) and not is_integer(hd(Pattern)) ->
-    case Seq of
-	true -> Pattern;
-	false -> rm_dupl(Pattern,[])
-    end;
+convert_pattern(Pattern0,Seq)
+  when Pattern0==[] orelse (is_list(Pattern0) and not is_integer(hd(Pattern0))) ->
+    Pattern =
+        case Seq of
+            true -> Pattern0;
+            false -> rm_dupl(Pattern0,[])
+        end,
+    compile_pattern(Pattern,[]);
 convert_pattern(Pattern,_Seq) ->
-    [Pattern].
+    compile_pattern([Pattern],[]).
 
 rm_dupl([P|Ps],Acc) ->
     case lists:member(P,Acc) of
@@ -739,6 +762,25 @@ rm_dupl([P|Ps],Acc) ->
 rm_dupl([],Acc) ->
     lists:reverse(Acc).
 
+compile_pattern([prompt|Patterns],Acc) ->
+    compile_pattern(Patterns,[prompt|Acc]);
+compile_pattern([{prompt,_}=P|Patterns],Acc) ->
+    compile_pattern(Patterns,[P|Acc]);
+compile_pattern([{Tag,Pattern}|Patterns],Acc) ->
+    try re:compile(Pattern,[unicode]) of
+        {ok,MP} -> compile_pattern(Patterns,[{Tag,MP}|Acc]);
+        {error,Error} -> {error,{bad_pattern,{Tag,Pattern},Error}}
+    catch error:badarg -> {error,{bad_pattern,{Tag,Pattern}}}
+    end;
+compile_pattern([Pattern|Patterns],Acc) ->
+    try re:compile(Pattern,[unicode]) of
+        {ok,MP} -> compile_pattern(Patterns,[MP|Acc]);
+        {error,Error} -> {error,{bad_pattern,Pattern,Error}}
+    catch error:badarg -> {error,{bad_pattern,Pattern}}
+    end;
+compile_pattern([],Acc) ->
+    {ok,lists:reverse(Acc)}.
+
 get_timeouts(Opts) ->
     {case lists:keysearch(idle_timeout,1,Opts) of
 	 {value,{_,T}} ->
@@ -772,7 +814,7 @@ get_seq(Opts) ->
 get_haltpatterns(Opts) ->
     case lists:keysearch(halt,1,Opts) of
 	{value,{halt,HaltPatterns}} ->
-	    convert_pattern(HaltPatterns,false);
+	    HaltPatterns;
 	false ->
 	    []
     end.
@@ -1068,7 +1110,7 @@ match_line(Name,Pid,Line,[{prompt,PromptType}|Patterns],FoundPrompt,Term,
   when PromptType=/=FoundPrompt ->
     match_line(Name,Pid,Line,Patterns,FoundPrompt,Term,EO,RetTag);
 match_line(Name,Pid,Line,[{Tag,Pattern}|Patterns],FoundPrompt,Term,EO,RetTag) ->
-    case re:run(Line,Pattern,[{capture,all,list},unicode]) of
+    case re:run(Line,Pattern,[{capture,all,list}]) of
 	nomatch ->
 	    match_line(Name,Pid,Line,Patterns,FoundPrompt,Term,EO,RetTag);
 	{match,Match} ->
@@ -1076,7 +1118,7 @@ match_line(Name,Pid,Line,[{Tag,Pattern}|Patterns],FoundPrompt,Term,EO,RetTag) ->
 	    {RetTag,{Tag,Match}}
     end;
 match_line(Name,Pid,Line,[Pattern|Patterns],FoundPrompt,Term,EO,RetTag) ->
-    case re:run(Line,Pattern,[{capture,all,list},unicode]) of
+    case re:run(Line,Pattern,[{capture,all,list}]) of
 	nomatch ->
 	    match_line(Name,Pid,Line,Patterns,FoundPrompt,Term,EO,RetTag);
 	{match,Match} ->
@@ -1085,7 +1127,7 @@ match_line(Name,Pid,Line,[Pattern|Patterns],FoundPrompt,Term,EO,RetTag) ->
     end;
 match_line(Name,Pid,Line,[],FoundPrompt,Term,EO,match) ->
     match_line(Name,Pid,Line,EO#eo.haltpatterns,FoundPrompt,Term,EO,halt);
-%% print any terminated line that can not be matched
+%% print any terminated line that cannot be matched
 match_line(Name,Pid,Line,[],_FoundPrompt,true,_EO,halt) ->
     log(name_or_pid(Name,Pid),"       ~ts",[Line]),
     nomatch;
diff --git a/lib/common_test/src/ct_telnet_client.erl b/lib/common_test/src/ct_telnet_client.erl
index 76e4b9ea70..007477c855 100644
--- a/lib/common_test/src/ct_telnet_client.erl
+++ b/lib/common_test/src/ct_telnet_client.erl
@@ -101,9 +101,11 @@ close(Pid) ->
     end.	    
 
 send_data(Pid, Data) ->
-    send_data(Pid, Data, true).
+    send_data(Pid, Data, "\n").
 send_data(Pid, Data, true) ->
-    send_data(Pid, Data++"\n", false);
+    send_data(Pid, Data, "\n");
+send_data(Pid, Data, Newline) when is_list(Newline) ->
+    send_data(Pid, Data++Newline, false);
 send_data(Pid, Data, false) ->
     Pid ! {send_data, Data},
     ok.
diff --git a/lib/common_test/src/ct_util.erl b/lib/common_test/src/ct_util.erl
index d8fd401a64..9f489e9bfb 100644
--- a/lib/common_test/src/ct_util.erl
+++ b/lib/common_test/src/ct_util.erl
@@ -192,7 +192,10 @@ do_start(Parent, Mode, LogDir, Verbosity) ->
 	    ok
     end,
 
-    ct_default_gl:start_link(group_leader()),
+    case ct_default_gl:start_link(group_leader()) of
+        {ok, _} -> ok;
+        ignore -> ok
+    end,
 
     {StartTime,TestLogDir} = ct_logs:init(Mode, Verbosity),
 
diff --git a/lib/common_test/src/ct_util.hrl b/lib/common_test/src/ct_util.hrl
index 039c8168ec..d5c93d05ba 100644
--- a/lib/common_test/src/ct_util.hrl
+++ b/lib/common_test/src/ct_util.hrl
@@ -62,6 +62,7 @@
 		   merge_tests=true}).
 
 -record(cover, {app=none,
+                local_only=false,
 		level=details,
 		excl_mods=[],
 		incl_mods=[],
diff --git a/lib/common_test/src/cth_log_redirect.erl b/lib/common_test/src/cth_log_redirect.erl
index 4980d1ee4b..fe869a4373 100644
--- a/lib/common_test/src/cth_log_redirect.erl
+++ b/lib/common_test/src/cth_log_redirect.erl
@@ -124,7 +124,8 @@ start_log_handler() ->
                   shutdown=>2000,
                   type=>worker,
                   modules=>[?MODULE]},
-            {ok,_} = supervisor:start_child(logger_sup,ChildSpec);
+            {ok,_} = supervisor:start_child(logger_sup,ChildSpec),
+            ok;
         _Pid ->
             ok
     end,
@@ -193,10 +194,10 @@ handle_call({log,
     case LogFunc of
         tc_log ->
             ct_logs:tc_log(Category, ?STD_IMPORTANCE,
-                           Header, String, [], []);
+                           Header, "~ts", [String], []);
         tc_log_async ->
             ct_logs:tc_log_async(sasl, ?STD_IMPORTANCE,
-                                 Header, String, [])
+                                 Header, "~ts", [String])
     end,
     {reply,ok,State};
 
@@ -260,34 +261,34 @@ handle_remote_events(Bool) ->
 format_header(#eh_state{curr_suite = undefined,
 			curr_group = undefined,
 			curr_func = undefined}) ->
-    io_lib:format("System report", []);
+    lists:flatten(io_lib:format("System report", []));
 
 format_header(#eh_state{curr_suite = Suite,
 			curr_group = undefined,
 			curr_func = undefined}) ->
-    io_lib:format("System report during ~w", [Suite]);
+    lists:flatten(io_lib:format("System report during ~w", [Suite]));
 
 format_header(#eh_state{curr_suite = Suite,
 			curr_group = undefined,
 			curr_func = TcOrConf}) ->
-    io_lib:format("System report during ~w:~tw/1",
-		  [Suite,TcOrConf]);
+    lists:flatten(io_lib:format("System report during ~w:~tw/1",
+                                [Suite,TcOrConf]));
 
 format_header(#eh_state{curr_suite = Suite,
 			curr_group = Group,
 			curr_func = Conf}) when Conf == init_per_group;
 						Conf == end_per_group ->
-    io_lib:format("System report during ~w:~w/2 for ~tw",
-		  [Suite,Conf,Group]);
+    lists:flatten(io_lib:format("System report during ~w:~w/2 for ~tw",
+                                [Suite,Conf,Group]));
 
 format_header(#eh_state{curr_suite = Suite,
 			curr_group = Group,
 			parallel_tcs = true}) ->
-    io_lib:format("System report during ~tw in ~w",
-		  [Group,Suite]);
+    lists:flatten(io_lib:format("System report during ~tw in ~w",
+                                [Group,Suite]));
 
 format_header(#eh_state{curr_suite = Suite,
 			curr_group = Group,
 			curr_func = TC}) ->
-    io_lib:format("System report during ~w:~tw/1 in ~tw",
-		  [Suite,TC,Group]).
+    lists:flatten(io_lib:format("System report during ~w:~tw/1 in ~tw",
+                                [Suite,TC,Group])).
diff --git a/lib/common_test/src/cth_surefire.erl b/lib/common_test/src/cth_surefire.erl
index b0742717ae..c9b4cb10c6 100644
--- a/lib/common_test/src/cth_surefire.erl
+++ b/lib/common_test/src/cth_surefire.erl
@@ -235,7 +235,7 @@ close_suite(#state{ test_cases = TCs, url_base = UrlBase } = State) ->
 terminate(State = #state{ test_cases = [] }) ->
     {ok,D} = file:open(State#state.filepath,[write,{encoding,utf8}]),
     io:format(D, "<?xml version=\"1.0\" encoding= \"UTF-8\" ?>", []),
-    io:format(D, to_xml(State), []),
+    io:format(D, "~ts", [to_xml(State)]),
     catch file:sync(D),
     catch file:close(D);
 terminate(State) ->
diff --git a/lib/common_test/src/test_server.erl b/lib/common_test/src/test_server.erl
index a896a0551b..588396f101 100644
--- a/lib/common_test/src/test_server.erl
+++ b/lib/common_test/src/test_server.erl
@@ -384,8 +384,8 @@ run_test_case_apply({CaseNum,Mod,Func,Args,Name,RunInit,TimetrapData}) ->
     {Result,DetFail,ProcBef,ProcAft}.
 
 -type tc_status() :: 'starting' | 'running' | 'init_per_testcase' |
-		     'end_per_testcase' | {'framework',atom(),atom()} |
-		     'tc'.
+		     'end_per_testcase' | {'framework',{atom(),atom(),list}} |
+                     'tc'.
 -record(st,
 	{
 	  ref :: reference(),
@@ -653,8 +653,8 @@ handle_tc_exit({testcase_aborted,{user_timetrap_error,_}=Msg,_}, St) ->
     #st{config=Config,mf={Mod,Func},pid=Pid} = St,
     spawn_fw_call(Mod, Func, Config, Pid, Msg, unknown, self()),
     St;
-handle_tc_exit(Reason, #st{status={framework,FwMod,FwFunc},
-			   config=Config,pid=Pid}=St) ->
+handle_tc_exit(Reason, #st{status={framework,{FwMod,FwFunc,_}=FwMFA},
+			   config=Config,mf={Mod,Func},pid=Pid}=St) ->
     R = case Reason of
 	    {timetrap_timeout,TVal,_} ->
 		{timetrap,TVal};
@@ -666,7 +666,7 @@ handle_tc_exit(Reason, #st{status={framework,FwMod,FwFunc},
 		Other
 	end,
     Error = {framework_error,R},
-    spawn_fw_call(FwMod, FwFunc, Config, Pid, Error, unknown, self()),
+    spawn_fw_call(Mod, Func, Config, Pid, {Error,FwMFA}, unknown, self()),
     St;
 handle_tc_exit(Reason, #st{status=tc,config=Config0,mf={Mod,Func},pid=Pid}=St)
   when is_list(Config0) ->
@@ -850,36 +850,68 @@ spawn_fw_call(Mod,EPTC={end_per_testcase,Func},EndConf,Pid,
 				"WARNING: end_per_testcase failed!</font>",
 			    {died,W}
 		    end,
-		try do_end_tc_call(Mod,EPTC,{Pid,Report,[EndConf]}, Why) of
-		    _ -> ok
-		catch
-		    _:FwEndTCErr ->
-			exit({fw_notify_done,end_tc,FwEndTCErr})
-		end,
-		FailLoc = proplists:get_value(tc_fail_loc, EndConf),
+                FailLoc0 = proplists:get_value(tc_fail_loc, EndConf),
+                {RetVal1,FailLoc} =
+                    try do_end_tc_call(Mod,EPTC,{Pid,Report,[EndConf]}, Why) of
+                        Why ->
+                            {RetVal,FailLoc0};
+                        {failed,_} = R ->
+                            {R,[{Mod,Func}]};
+                        R ->
+                            {R,FailLoc0}
+                    catch
+                        _:FwEndTCErr ->
+                            exit({fw_notify_done,end_tc,FwEndTCErr})
+                    end,
 		%% finished, report back (if end_per_testcase fails, a warning
 		%% should be printed as part of the comment)
 		SendTo ! {self(),fw_notify_done,
-			  {Time,RetVal,FailLoc,[],Warn}}
+			  {Time,RetVal1,FailLoc,[],Warn}}
 	end,
     spawn_link(FwCall);
 
-spawn_fw_call(FwMod,FwFunc,_,_Pid,{framework_error,FwError},_,SendTo) ->
+spawn_fw_call(Mod,Func,Conf,Pid,{{framework_error,FwError},
+                                 {FwMod,FwFunc,[A1,A2|_]}=FwMFA},_,SendTo) ->
     FwCall =
 	fun() ->
                 ct_util:mark_process(),
-		test_server_sup:framework_call(report, [framework_error,
-							{{FwMod,FwFunc},
-							 FwError}]),
+                Time =
+                    case FwError of
+                        {timetrap,TVal} ->
+                            TVal/1000;
+                        _ ->
+                            died
+                    end,
+                {Ret,Loc,WarnOrError} =
+                    cleanup_after_fw_error(Mod,Func,Conf,Pid,FwError,FwMFA),
 		Comment =
-		    lists:flatten(
-		      io_lib:format("<font color=\"red\">"
-				    "WARNING! ~w:~tw failed!</font>",
-				    [FwMod,FwFunc])),
+                    case WarnOrError of
+                        warn ->
+			    group_leader() !
+				{printout,12,
+                                 "WARNING! ~w:~tw(~w,~tw,...) failed!\n"
+                                 "    Reason: ~tp\n",
+                                 [FwMod,FwFunc,A1,A2,FwError]},
+                            lists:flatten(
+                              io_lib:format("<font color=\"red\">"
+                                            "WARNING! ~w:~tw(~w,~tw,...) "
+                                            "failed!</font>",
+                                            [FwMod,FwFunc,A1,A2]));
+                        error ->
+			    group_leader() !
+				{printout,12,
+                                 "Error! ~w:~tw(~w,~tw,...) failed!\n"
+                                 "    Reason: ~tp\n",
+                                 [FwMod,FwFunc,A1,A2,FwError]},
+                            lists:flatten(
+                              io_lib:format("<font color=\"red\">"
+                                            "ERROR! ~w:~tw(~w,~tw,...) "
+                                            "failed!</font>",
+                                            [FwMod,FwFunc,A1,A2]))
+                    end,
 	    %% finished, report back
 	    SendTo ! {self(),fw_notify_done,
-		      {died,{error,{FwMod,FwFunc,FwError}},
-		       {FwMod,FwFunc},[],Comment}}
+		      {Time,Ret,Loc,[],Comment}}
 	end,
     spawn_link(FwCall);
 
@@ -902,17 +934,185 @@ spawn_fw_call(Mod,Func,CurrConf,Pid,Error,Loc,SendTo) ->
 			      FwErrorNotifyErr})
 		end,
 		Conf = [{tc_status,{failed,Error}}|CurrConf],
-		try do_end_tc_call(Mod,EndTCFunc,{Pid,Error,[Conf]},Error) of
-		    _ -> ok
-		catch
-		    _:FwEndTCErr ->
-			exit({fw_notify_done,end_tc,FwEndTCErr})
-		end,
+                {Time,RetVal,Loc1} =
+                    try do_end_tc_call(Mod,EndTCFunc,{Pid,Error,[Conf]},Error) of
+                        Error ->
+                            {died, Error, Loc};
+                        {failed,Reason} = NewReturn ->
+                            fw_error_notify(Mod,Func1,Conf,Reason),
+                            {died, NewReturn, [{Mod,Func}]};
+                        NewReturn ->
+                            T = case Error of
+                                    {timetrap_timeout,TT} -> TT;
+                                    _ -> 0
+                                end,
+                            {T, NewReturn, Loc}
+                    catch
+                        _:FwEndTCErr ->
+                            exit({fw_notify_done,end_tc,FwEndTCErr})
+                    end,
 		%% finished, report back
-		SendTo ! {self(),fw_notify_done,{died,Error,Loc,[],undefined}}
+		SendTo ! {self(),fw_notify_done,{Time,RetVal,Loc1,[],undefined}}
 	end,
     spawn_link(FwCall).
 
+cleanup_after_fw_error(_Mod,_Func,Conf,Pid,FwError,
+                       {FwMod,FwFunc=init_tc,
+                        [Mod,{init_per_testcase,Func}=IPTC|_]}) ->
+    %% Failed during pre_init_per_testcase, the test must be skipped
+    Skip = {auto_skip,{failed,{FwMod,FwFunc,FwError}}},
+    try begin do_end_tc_call(Mod,IPTC, {Pid,Skip,[Conf]}, FwError),
+              do_init_tc_call(Mod,{end_per_testcase_not_run,Func},
+                              [Conf],{ok,[Conf]}),
+              do_end_tc_call(Mod,{end_per_testcase_not_run,Func},
+                             {Pid,Skip,[Conf]}, FwError) end of
+        _ -> ok
+    catch
+        _:FwEndTCErr ->
+            exit({fw_notify_done,end_tc,FwEndTCErr})
+    end,
+    {Skip,{FwMod,FwFunc},error};
+cleanup_after_fw_error(_Mod,_Func,Conf,Pid,FwError,
+                       {FwMod,FwFunc=end_tc,[Mod,{init_per_testcase,Func}|_]}) ->
+    %% Failed during post_init_per_testcase, the test must be skipped
+    Skip = {auto_skip,{failed,{FwMod,FwFunc,FwError}}},
+    try begin do_init_tc_call(Mod,{end_per_testcase_not_run,Func},
+                              [Conf],{ok,[Conf]}),
+              do_end_tc_call(Mod,{end_per_testcase_not_run,Func},
+                             {Pid,Skip,[Conf]}, FwError) end of
+        _ -> ok
+    catch
+        _:FwEndTCErr ->
+            exit({fw_notify_done,end_tc,FwEndTCErr})
+    end,
+    {Skip,{FwMod,FwFunc},error};
+cleanup_after_fw_error(_Mod,_Func,Conf,Pid,FwError,
+                       {FwMod,FwFunc=init_tc,[Mod,{end_per_testcase,Func}|_]}) ->
+    %% Failed during pre_end_per_testcase. Warn about it.
+    {RetVal,Loc} =
+        case {proplists:get_value(tc_status, Conf),
+              proplists:get_value(tc_fail_loc, Conf, unknown)} of
+            {undefined,_} ->
+                {{failed,{FwMod,FwFunc,FwError}},{FwMod,FwFunc}};
+            {E = {failed,_Reason},unknown} ->
+                {E,[{Mod,Func}]};
+            {Result,FailLoc} ->
+                {Result,FailLoc}
+        end,
+    try begin do_end_tc_call(Mod,{end_per_testcase_not_run,Func},
+                             {Pid,RetVal,[Conf]}, FwError) end of
+        _ -> ok
+    catch
+        _:FwEndTCErr ->
+            exit({fw_notify_done,end_tc,FwEndTCErr})
+    end,
+    {RetVal,Loc,warn};
+cleanup_after_fw_error(Mod,Func,Conf,Pid,FwError,
+                       {FwMod,FwFunc=end_tc,[Mod,{end_per_testcase,Func}|_]}) ->
+    %% Failed during post_end_per_testcase. Warn about it.
+    {RetVal,Report,Loc} =
+        case {proplists:get_value(tc_status, Conf),
+              proplists:get_value(tc_fail_loc, Conf, unknown)} of
+            {undefined,_} ->
+                {{failed,{FwMod,FwFunc,FwError}},
+                 {{FwMod,FwError},FwError},
+                 {FwMod,FwFunc}};
+            {E = {failed,_Reason},unknown} ->
+                {E,{Mod,Func,E},[{Mod,Func}]};
+            {Result,FailLoc} ->
+                {Result,{Mod,Func,Result},FailLoc}
+        end,
+    try begin do_end_tc_call(Mod,{cleanup,{end_per_testcase_not_run,Func}},
+                             {Pid,RetVal,[Conf]}, FwError) end of
+        _ -> ok
+    catch
+        _:FwEndTCErr ->
+            exit({fw_notify_done,end_tc,FwEndTCErr})
+    end,
+    test_server_sup:framework_call(report,[framework_error,Report]),
+    {RetVal,Loc,warn};
+cleanup_after_fw_error(Mod,Func,Conf,Pid,FwError,{FwMod,FwFunc=init_tc,_})
+  when Func =:= init_per_suite; Func =:=init_per_group ->
+    %% Failed during pre_init_per_suite or pre_init_per_group
+    RetVal = {failed,{FwMod,FwFunc,FwError}},
+    try do_end_tc_call(Mod,Func,{Pid,RetVal,[Conf]},FwError) of
+        _ -> ok
+    catch
+        _:FwEndTCErr ->
+            exit({fw_notify_done,end_tc,FwEndTCErr})
+    end,
+    {RetVal,{FwMod,FwFunc},error};
+cleanup_after_fw_error(Mod,Func,Conf,Pid,FwError,{FwMod,FwFunc=end_tc,_})
+  when Func =:= init_per_suite; Func =:=init_per_group ->
+    %% Failed during post_init_per_suite or post_init_per_group
+    RetVal = {failed,{FwMod,FwFunc,FwError}},
+    try do_end_tc_call(Mod,{cleanup,Func},{Pid,RetVal,[Conf]},FwError) of
+        _ -> ok
+    catch
+        _:FwEndTCErr ->
+            exit({fw_notify_done,end_tc,FwEndTCErr})
+    end,
+    ReportFunc =
+        case Func of
+            init_per_group ->
+                case proplists:get_value(tc_group_properties,Conf) of
+                    undefined ->
+                        {Func,unknown,[]};
+                    GProps ->
+                        Name = proplists:get_value(name,GProps),
+                        {Func,Name,proplists:delete(name,GProps)}
+                end;
+            _ ->
+                Func
+        end,
+    test_server_sup:framework_call(report,[framework_error,
+                                           {Mod,ReportFunc,RetVal}]),
+    {RetVal,{FwMod,FwFunc},error};
+cleanup_after_fw_error(Mod,Func,Conf,Pid,FwError,{FwMod,FwFunc=init_tc,_})
+  when Func =:= end_per_suite; Func =:=end_per_group ->
+    %% Failed during pre_end_per_suite or pre_end_per_group
+    RetVal = {failed,{FwMod,FwFunc,FwError}},
+    try do_end_tc_call(Mod,Func,{Pid,RetVal,[Conf]},FwError) of
+        _ -> ok
+    catch
+        _:FwEndTCErr ->
+            exit({fw_notify_done,end_tc,FwEndTCErr})
+    end,
+    {RetVal,{FwMod,FwFunc},error};
+cleanup_after_fw_error(Mod,Func,Conf,Pid,FwError,{FwMod,FwFunc=end_tc,_})
+  when Func =:= end_per_suite; Func =:=end_per_group ->
+    %% Failed during post_end_per_suite or post_end_per_group
+    RetVal = {failed,{FwMod,FwFunc,FwError}},
+    try do_end_tc_call(Mod,{cleanup,Func},{Pid,RetVal,[Conf]},FwError) of
+        _ -> ok
+    catch
+        _:FwEndTCErr ->
+            exit({fw_notify_done,end_tc,FwEndTCErr})
+    end,
+    ReportFunc =
+        case Func of
+            end_per_group ->
+                case proplists:get_value(tc_group_properties,Conf) of
+                    undefined ->
+                        {Func,unknown,[]};
+                    GProps ->
+                        Name = proplists:get_value(name,GProps),
+                        {Func,Name,proplists:delete(name,GProps)}
+                end;
+            _ ->
+                Func
+        end,
+    test_server_sup:framework_call(report,[framework_error,
+                                           {Mod,ReportFunc,RetVal}]),
+    {RetVal,{FwMod,FwFunc},error};
+cleanup_after_fw_error(_Mod,_Func,_Conf,_Pid,FwError,{FwMod,FwFunc,_}) ->
+    %% This is unexpected
+    test_server_sup:framework_call(report,
+                                   [framework_error,
+                                    {{FwMod,FwFunc},
+                                     FwError}]),
+    {FwError,{FwMod,FwFunc},error}.
+
 %% The job proxy process forwards messages between the test case
 %% process on a shielded node (and its descendants) and the job process.
 %%
@@ -1088,6 +1288,9 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
 		    EndConf1 =
 			user_callback(TCCallback, Mod, Func, 'end', EndConf),
 
+                    %% save updated config in controller loop
+                    set_tc_state(tc, EndConf1),
+
 		    %% We can't handle fails or skips here
 		    EndConf2 =
 			case do_init_tc_call(Mod,{end_per_testcase,Func},
@@ -1161,23 +1364,29 @@ do_end_tc_call(Mod, IPTC={init_per_testcase,Func}, Res, Return) ->
 	 {NOk,_} when NOk == auto_skip; NOk == fail;
 		      NOk == skip ; NOk == skipped ->
 	     {_,Args} = Res,
-	     IPTCEndRes =
+	     {NewConfig,IPTCEndRes} =
 		 case do_end_tc_call1(Mod, IPTC, Res, Return) of
 		     IPTCEndConfig when is_list(IPTCEndConfig) ->
-			 IPTCEndConfig;
+			 {IPTCEndConfig,IPTCEndConfig};
+                     {failed,RetReason} when Return=:={fail,RetReason} ->
+                         %% Fail reason not changed by framework or hook
+                         {Args,Return};
+                     {SF,_} = IPTCEndResult when SF=:=skip; SF=:=skipped;
+                                                 SF=:=fail; SF=:=failed ->
+                         {Args,IPTCEndResult};
 		     _ ->
-			 Args
+			 {Args,Return}
 		 end,
 	     EPTCInitRes =
 		 case do_init_tc_call(Mod,{end_per_testcase_not_run,Func},
-				      IPTCEndRes,Return) of
+				      NewConfig,IPTCEndRes) of
 		     {ok,EPTCInitConfig} when is_list(EPTCInitConfig) ->
-			 {Return,EPTCInitConfig};
+			 {IPTCEndRes,EPTCInitConfig};
 		     _ ->
-                         {Return,IPTCEndRes}
+                         {IPTCEndRes,NewConfig}
 		 end,
 	     do_end_tc_call1(Mod, {end_per_testcase_not_run,Func},
-			     EPTCInitRes, Return);
+			     EPTCInitRes, IPTCEndRes);
 	 _Ok ->
 	     do_end_tc_call1(Mod, IPTC, Res, Return)
      end;
diff --git a/lib/common_test/src/test_server_ctrl.erl b/lib/common_test/src/test_server_ctrl.erl
index 8bd6cd583a..003d08d70d 100644
--- a/lib/common_test/src/test_server_ctrl.erl
+++ b/lib/common_test/src/test_server_ctrl.erl
@@ -1393,7 +1393,7 @@ temp_nodename([Chr|Base], Acc) ->
 %%
 %% Counts the test cases that are about to run and returns that number.
 %% If there's a conf group in TestSpec with a repeat property, the total number
-%% of cases can not be calculated and NoOfCases = unknown.
+%% of cases cannot be calculated and NoOfCases = unknown.
 count_test_cases(TopCases, SkipCases) when is_list(TopCases) ->
     case collect_all_cases(TopCases, SkipCases) of
 	{error,_Why} = Error ->
@@ -1443,6 +1443,8 @@ remove_conf([C={Mod,error_in_suite,_}|Cases], NoConf, Repeats) ->
        true ->
 	    remove_conf(Cases, [C|NoConf], Repeats)
     end;
+remove_conf([C={repeat,_,_}|Cases], NoConf, _Repeats) ->
+    remove_conf(Cases, [C|NoConf], true);
 remove_conf([C|Cases], NoConf, Repeats) ->
     remove_conf(Cases, [C|NoConf], Repeats);
 remove_conf([], NoConf, true) ->
@@ -1558,7 +1560,7 @@ do_test_cases(TopCases, SkipCases,
 			 Html1}
 		end,
 
-	    print(html, Header),
+	    print(html, "~ts", [Header]),
 
 	    print(html, xhtml("<p>", "<h4>")),
 	    print_timestamp(html, "Test started at "),
@@ -1605,10 +1607,10 @@ do_test_cases(TopCases, SkipCases,
 		  [?suitelog_name,CoverLog,?unexpected_io_log]),
 	    print(html,
 		  "<p>~ts</p>\n" ++
-		  xhtml(["<table bgcolor=\"white\" border=\"3\" cellpadding=\"5\">\n",
-			 "<thead>\n"],
-			["<table id=\"",?sortable_table_name,"\">\n",
-			 "<thead>\n"]) ++
+		  xhtml("<table bgcolor=\"white\" border=\"3\" cellpadding=\"5\">\n" ++
+			 "<thead>\n",
+			"<table id=\"" ++ ?sortable_table_name ++ "\">\n" ++
+			 "<thead>\n") ++
 		      "<tr><th>Num</th><th>Module</th><th>Group</th>" ++
 		      "<th>Case</th><th>Log</th><th>Time</th><th>Result</th>" ++
 		      "<th>Comment</th></tr>\n</thead>\n<tbody>\n",
@@ -2061,6 +2063,14 @@ add_init_and_end_per_suite([SkipCase|Cases], LastMod, LastRef, FwMod)
     [SkipCase|add_init_and_end_per_suite(Cases, LastMod, LastRef, FwMod)];
 add_init_and_end_per_suite([{conf,_,_,_}=Case|Cases], LastMod, LastRef, FwMod) ->
     [Case|add_init_and_end_per_suite(Cases, LastMod, LastRef, FwMod)];
+add_init_and_end_per_suite([{repeat,{Mod,_},_}=Case|Cases], LastMod, LastRef, FwMod)
+  when Mod =/= LastMod, Mod =/= FwMod ->
+    {PreCases, NextMod, NextRef} =
+	do_add_init_and_end_per_suite(LastMod, LastRef, Mod, FwMod),
+    PreCases ++ [Case|add_init_and_end_per_suite(Cases, NextMod,
+						 NextRef, FwMod)];
+add_init_and_end_per_suite([{repeat,_,_}=Case|Cases], LastMod, LastRef, FwMod) ->
+    [Case|add_init_and_end_per_suite(Cases, LastMod, LastRef, FwMod)];
 add_init_and_end_per_suite([{Mod,_}=Case|Cases], LastMod, LastRef, FwMod)
   when Mod =/= LastMod, Mod =/= FwMod ->
     {PreCases, NextMod, NextRef} =
@@ -2138,7 +2148,7 @@ do_add_init_and_end_per_suite(LastMod, LastRef, Mod, FwMod) ->
 			%% let's call a "fake" end_per_suite if it exists
 			case erlang:function_exported(FwMod, end_per_suite, 1) of
 			    true ->				
-				[{conf,LastRef,[{suite,Mod}],
+				[{conf,LastRef,[{suite,LastMod}],
 				  {FwMod,end_per_suite}}|Init];
 			    false ->
 				[{conf,LastRef,[],{LastMod,end_per_suite}}|Init]
@@ -2926,6 +2936,29 @@ run_test_cases_loop([{conf,_Ref,_Props,_X}=Conf|_Cases0],
 		    Config, _TimetrapData, _Mode, _Status) ->
     erlang:error(badarg, [Conf,Config]);
 
+run_test_cases_loop([{repeat,Case,{RepeatType,N}}|Cases0], Config,
+                    TimeTrapData, Mode, Status) ->
+    Ref = make_ref(),
+    Parallel = check_prop(parallel, Mode) =/= false,
+    Sequence = check_prop(sequence, Mode) =/= false,
+    RepeatStop = RepeatType=:=repeat_until_fail
+        orelse RepeatType=:=repeat_until_ok,
+
+    if Parallel andalso RepeatStop ->
+            %% Cannot check results of test case during parallal
+            %% execution, so only RepeatType=:=repeat is allowed in
+            %% combination with parallel groups.
+            erlang:error({illegal_combination,{parallel,RepeatType}});
+       Sequence andalso RepeatStop ->
+            %% Sequence is stop on fail + skip rest, so only
+            %% RepeatType=:=repeat makes sense inside a sequence.
+            erlang:error({illegal_combination,{sequence,RepeatType}});
+       true ->
+            Mode1 = [{Ref,[{repeat,{RepeatType,1,N}}],?now}|Mode],
+            run_test_cases_loop([Case | Cases0], Config, TimeTrapData,
+                                Mode1, Status)
+    end;
+
 run_test_cases_loop([{Mod,Case}|Cases], Config, TimetrapData, Mode, Status) ->
     ActualCfg =
 	case get(test_server_create_priv_dir) of
@@ -2938,7 +2971,7 @@ run_test_cases_loop([{Mod,Case}|Cases], Config, TimetrapData, Mode, Status) ->
     run_test_cases_loop([{Mod,Case,[ActualCfg]}|Cases], Config,
 			TimetrapData, Mode, Status);
 
-run_test_cases_loop([{Mod,Func,Args}|Cases], Config, TimetrapData, Mode, Status) ->
+run_test_cases_loop([{Mod,Func,Args}=Case|Cases], Config, TimetrapData, Mode0, Status) ->
     {Num,RunInit} =
 	case FwMod = get_fw_mod(?MODULE) of
 	    Mod when Func == error_in_suite ->
@@ -2948,6 +2981,14 @@ run_test_cases_loop([{Mod,Func,Args}|Cases], Config, TimetrapData, Mode, Status)
 		 run_init}
 	end,
 
+    Mode =
+        case Mode0 of
+            [{_,[{repeat,{_,_,_}}],_}|RestMode] ->
+                RestMode;
+            _ ->
+                Mode0
+        end,
+
     %% check the current execution mode and save info about the case if
     %% detected that printouts to common log files is handled later
 
@@ -2975,36 +3016,42 @@ run_test_cases_loop([{Mod,Func,Args}|Cases], Config, TimetrapData, Mode, Status)
                 if is_tuple(RetVal) -> element(1,RetVal);
                    true -> undefined
                 end,
-	    {Failed,Status1} =
+	    {Result,Failed,Status1} =
                 case RetTag of
                     Skip when Skip==skip; Skip==skipped ->
-                        {false,update_status(skipped, Mod, Func, Status)};
+                        {skipped,false,update_status(skipped, Mod, Func, Status)};
                     Fail when Fail=='EXIT'; Fail==failed ->
-                        {true,update_status(failed, Mod, Func, Status)};
+                        {failed,true,update_status(failed, Mod, Func, Status)};
                     _ when Time==died, RetVal=/=ok ->
-                        {true,update_status(failed, Mod, Func, Status)};
+                        {failed,true,update_status(failed, Mod, Func, Status)};
                     _ ->
-                        {false,update_status(ok, Mod, Func, Status)}
+                        {ok,false,update_status(ok, Mod, Func, Status)}
                 end,
 	    case check_prop(sequence, Mode) of
 		false ->
+                    {Cases1,Mode1} =
+                        check_repeat_testcase(Case,Result,Cases,Mode0),
 		    stop_minor_log_file(),
-		    run_test_cases_loop(Cases, Config, TimetrapData, Mode, Status1);
+		    run_test_cases_loop(Cases1, Config, TimetrapData, Mode1, Status1);
 		Ref ->
 		    %% the case is in a sequence; we must check the result and
 		    %% determine if the following cases should run or be skipped
 		    if not Failed ->	      % proceed with next case
+                            {Cases1,Mode1} =
+                                check_repeat_testcase(Case,Result,Cases,Mode0),
 			    stop_minor_log_file(),
-			    run_test_cases_loop(Cases, Config, TimetrapData, Mode, Status1);
+			    run_test_cases_loop(Cases1, Config, TimetrapData, Mode1, Status1);
 		       true ->	              % skip rest of cases in sequence
 			    print(minor, "~n*** ~tw failed.~n"
 				  "    Skipping all other cases in sequence.",
 				  [Func]),
+                            {Cases1,Mode1} =
+                                check_repeat_testcase(Case,Result,Cases,Mode0),
 			    Reason = {failed,{Mod,Func}},
-			    Cases2 = skip_cases_upto(Ref, Cases, Reason, tc,
+			    Cases2 = skip_cases_upto(Ref, Cases1, Reason, tc,
 						     Mode, auto_skip_case),
 			    stop_minor_log_file(),
-			    run_test_cases_loop(Cases2, Config, TimetrapData, Mode, Status1)
+			    run_test_cases_loop(Cases2, Config, TimetrapData, Mode1, Status1)
 		    end
 	    end;
 	%% the test case is being executed in parallel with the main process (and
@@ -3013,7 +3060,8 @@ run_test_cases_loop([{Mod,Func,Args}|Cases], Config, TimetrapData, Mode, Status)
 	    %% io from Pid will be buffered by the test_server_io process and
 	    %% handled later, so we have to save info about the case
 	    queue_test_case_io(undefined, Pid, Num+1, Mod, Func),
-	    run_test_cases_loop(Cases, Config, TimetrapData, Mode, Status)
+            {Cases1,Mode1} = check_repeat_testcase(Case,ok,Cases,Mode0),
+	    run_test_cases_loop(Cases1, Config, TimetrapData, Mode1, Status)
     end;
 
 %% TestSpec processing finished
@@ -3306,7 +3354,8 @@ skip_case1(Type, CaseNum, Mod, Func, Comment, Mode) ->
        true ->
 	    print(2,"*** Skipping test case #~w ~tw ***", [CaseNum,{Mod,Func}])
     end,
-    TR = xhtml("<tr valign=\"top\">", ["<tr class=\"",odd_or_even(),"\">"]),	       
+    TR = xhtml("<tr valign=\"top\">",
+               "<tr class=\"" ++ odd_or_even() ++ "\">"),
     GroupName =	case get_name(Mode) of
 		    undefined -> "";
 		    Name      -> cast_to_list(Name)
@@ -3451,9 +3500,19 @@ modify_cases_upto1(Ref, {skip,Reason,FType,Mode,SkipType},
 			       T, Orig, Alt)
     end;
 
-%% next is some other case, ignore or copy
-modify_cases_upto1(Ref, {skip,_,_,_,_}=Op, [_Other|T], Orig, Alt) ->
+%% next is a repeated test case
+modify_cases_upto1(Ref, {skip,Reason,_,Mode,SkipType}=Op,
+                   [{repeat,{_M,_F}=MF,_Repeat}|T], Orig, Alt) ->
+    modify_cases_upto1(Ref, Op, T, Orig, [{SkipType,{MF,Reason},Mode}|Alt]);
+
+%% next is an already skipped case, ignore or copy
+modify_cases_upto1(Ref, {skip,_,_,_,_}=Op, [{SkipType,_,_}|T], Orig, Alt)
+  when SkipType=:=skip_case; SkipType=:=auto_skip_case ->
     modify_cases_upto1(Ref, Op, T, Orig, Alt);
+
+%% next is some other case, mark as skipped or copy
+modify_cases_upto1(Ref, {skip,Reason,_,Mode,SkipType}=Op, [Other|T], Orig, Alt) ->
+    modify_cases_upto1(Ref, Op, T, Orig, [{SkipType,{Other,Reason},Mode}|Alt]);
 modify_cases_upto1(Ref, CopyOp, [C|T], Orig, Alt) ->
     modify_cases_upto1(Ref, CopyOp, T, [C|Orig], [C|Alt]).
 
@@ -3796,8 +3855,8 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit,
     end,
 
     print(minor,
-	  escape_chars(io_lib:format("Config value:\n\n    ~tp\n", [Args2Print])),
-	  []),
+          "~ts",
+	  [escape_chars(io_lib:format("Config value:\n\n    ~tp\n", [Args2Print]))]),
     print(minor, "Current directory is ~tp\n", [Cwd]),
 
     GrNameStr =	case GrName of
@@ -3806,7 +3865,7 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit,
 		end,
     print(major, "=started       ~s", [lists:flatten(timestamp_get(""))]),
     {{Col0,Col1},Style} = get_font_style((RunInit==run_init), Mode),
-    TR = xhtml("<tr valign=\"top\">", ["<tr class=\"",odd_or_even(),"\">"]),
+    TR = xhtml("<tr valign=\"top\">", "<tr class=\"" ++ odd_or_even() ++ "\">"),
     EncMinorBase = uri_encode(MinorBase),
     print(html,	TR ++ "<td>" ++ Col0 ++ "~ts" ++ Col1 ++ "</td>"
 	  "<td>" ++ Col0 ++ "~w" ++ Col1 ++ "</td>"
@@ -3831,7 +3890,7 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit,
     print(minor, "<a name=\"end\"></a>", [], internal_raw),
     print(minor, "\n", [], internal_raw),
     print_timestamp(minor, "Ended at "),
-    print(major, "=ended         ~s", [lists:flatten(timestamp_get(""))]),
+    print(major, "=ended         ~s", [timestamp_get("")]),
 
     do_unless_parallel(Main, fun() -> file:set_cwd(filename:dirname(TSDir)) end),
 
@@ -3841,6 +3900,10 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit,
 	    {died,{timetrap_timeout,TimetrapTimeout}} ->
 		progress(failed, Num, Mod, Func, GrName, Loc,
 			 timetrap_timeout, TimetrapTimeout, Comment, Style);
+	    {died,Reason={auto_skip,_Why}} ->
+                %% died in init_per_testcase or in a hook in this context
+		progress(skip, Num, Mod, Func, GrName, Loc, Reason,
+			 Time, Comment, Style);
 	    {died,{Skip,Reason}} when Skip==skip; Skip==skipped ->
                 %% died in init_per_testcase
 		progress(skip, Num, Mod, Func, GrName, Loc, Reason,
@@ -4075,9 +4138,9 @@ progress(failed, CaseNum, Mod, Func, GrName, Loc, {testcase_aborted,Reason}, _T,
     FormatLoc = test_server_sup:format_loc(Loc),
     print(minor, "=== Location: ~ts", [FormatLoc]),
     print(minor,
-	  escape_chars(io_lib:format("=== Reason: {testcase_aborted,~tp}",
-				     [Reason])),
-	  []),
+          "~ts",
+	  [escape_chars(io_lib:format("=== Reason: {testcase_aborted,~tp}",
+				     [Reason]))]),
     failed;
 
 progress(failed, CaseNum, Mod, Func, GrName, unknown, Reason, Time,
@@ -4115,8 +4178,8 @@ progress(failed, CaseNum, Mod, Func, GrName, unknown, Reason, Time,
     print(minor, "=== Location: ~w", [unknown]),
     {FStr,FormattedReason} = format_exception(Reason),
     print(minor,
-	  escape_chars(io_lib:format("=== Reason: " ++ FStr, [FormattedReason])),
-	  []),
+          "~ts",
+	  [escape_chars(io_lib:format("=== Reason: " ++ FStr, [FormattedReason]))]),
     failed;
 
 progress(failed, CaseNum, Mod, Func, GrName, Loc, Reason, Time,
@@ -4150,8 +4213,9 @@ progress(failed, CaseNum, Mod, Func, GrName, Loc, Reason, Time,
     FormatLoc = test_server_sup:format_loc(LocMin),
     print(minor, "=== Location: ~ts", [FormatLoc]),
     {FStr,FormattedReason} = format_exception(Reason),
-    print(minor, "=== Reason: " ++
-	      escape_chars(io_lib:format(FStr, [FormattedReason])), []),
+    print(minor, "~ts",
+          ["=== Reason: " ++
+           escape_chars(io_lib:format(FStr, [FormattedReason]))]),
     failed;
 
 progress(ok, _CaseNum, Mod, Func, GrName, _Loc, RetVal, Time,
@@ -4184,8 +4248,8 @@ progress(ok, _CaseNum, Mod, Func, GrName, _Loc, RetVal, Time,
 	  "~ts</tr>\n",
 	  [TimeStr,Comment]),
     print(minor,
-	  escape_chars(io_lib:format("=== Returned value: ~tp", [RetVal])),
-	  []),
+          "~ts",
+	  [escape_chars(io_lib:format("=== Returned value: ~tp", [RetVal]))]),
     ok.
 
 %%--------------------------------------------------------------------
@@ -4542,7 +4606,7 @@ timestamp_get(Leader) ->
 
 timestamp_get_internal(Leader, Format) ->
     {YY,MM,DD,H,M,S} = time_get(),
-    io_lib:format(Format, [Leader,YY,MM,DD,H,M,S]).
+    lists:flatten(io_lib:format(Format, [Leader,YY,MM,DD,H,M,S])).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% time_get() -> {YY,MM,DD,H,M,S}
@@ -4798,6 +4862,14 @@ collect_cases({make,InitMFA,CaseList,FinMFA}, St0, Mode) ->
 	{error,_Reason} = Error -> Error
     end;
 
+collect_cases({repeat,{Module, Case}, Repeat}, St, Mode) ->
+    case catch collect_case([Case], St#cc{mod=Module}, [], Mode) of
+        {ok, [{Module,Case}], _} ->
+            {ok, [{repeat,{Module, Case}, Repeat}], St};
+        Other ->
+            {error,Other}
+    end;
+
 collect_cases({Module, Cases}, St, Mode) when is_list(Cases)  ->
     case (catch collect_case(Cases, St#cc{mod=Module}, [], Mode)) of
 	Result = {ok,_,_} ->
@@ -4906,7 +4978,7 @@ collect_files(Dir, Pattern, St, Mode) ->
 fullname_to_mod(Path) when is_list(Path) ->
     %% If this is called with a binary, then we are probably in +fnu
     %% mode and have found a beam file with name encoded as latin1. We
-    %% will let this crash since it can not work to load such a module
+    %% will let this crash since it cannot work to load such a module
     %% anyway. It should be removed or renamed!
     list_to_atom(filename:rootname(filename:basename(Path))).
 
@@ -5761,3 +5833,42 @@ encoding(File) ->
 	E ->
 	    E
     end.
+
+check_repeat_testcase(Case,Result,Cases,
+                      [{Ref,[{repeat,RepeatData0}],StartTime}|Mode0]) ->
+    case do_update_repeat_data(Result,RepeatData0) of
+        false ->
+            {Cases,Mode0};
+        RepeatData ->
+            {[Case|Cases],[{Ref,[{repeat,RepeatData}],StartTime}|Mode0]}
+    end;
+check_repeat_testcase(_,_,Cases,Mode) ->
+    {Cases,Mode}.
+
+do_update_repeat_data(_,{RT,N,N}) when is_integer(N) ->
+    report_repeat_testcase(N,N),
+    report_stop_repeat_testcase(done,{RT,N}),
+    false;
+do_update_repeat_data(ok,{repeat_until_ok=RT,M,N}) ->
+    report_repeat_testcase(M,N),
+    report_stop_repeat_testcase(RT,{RT,N}),
+    false;
+do_update_repeat_data(failed,{repeat_until_fail=RT,M,N}) ->
+    report_repeat_testcase(M,N),
+    report_stop_repeat_testcase(RT,{RT,N}),
+    false;
+do_update_repeat_data(_,{RT,M,N}) when is_integer(M) ->
+    report_repeat_testcase(M,N),
+    {RT,M+1,N};
+do_update_repeat_data(_,{_,M,N}=RepeatData) ->
+    report_repeat_testcase(M,N),
+    RepeatData.
+
+report_stop_repeat_testcase(Reason,RepVal) ->
+    print(minor, "~n*** Stopping test case repeat operation: ~w", [Reason]),
+    print(1, "Stopping test case repeat operation: ~w", [RepVal]).
+
+report_repeat_testcase(M,forever) ->
+    print(minor, "~n=== Repeated test case: ~w of infinity", [M]);
+report_repeat_testcase(M,N) ->
+    print(minor, "~n=== Repeated test case: ~w of ~w", [M,N]).
diff --git a/lib/common_test/src/test_server_node.erl b/lib/common_test/src/test_server_node.erl
index ea7ad8538e..f77d5a4966 100644
--- a/lib/common_test/src/test_server_node.erl
+++ b/lib/common_test/src/test_server_node.erl
@@ -18,7 +18,7 @@
 %% %CopyrightEnd%
 %%
 -module(test_server_node).
--compile(r16).
+-compile(r20).
 
 %%%
 %%% The same compiled code for this module must be possible to load
@@ -598,11 +598,20 @@ pick_erl_program(L) ->
 	{prog, S} ->
 	    S;
 	{release, S} ->
+            clear_erl_aflags(),
 	    find_release(S);
 	this ->
 	    ct:get_progname()
     end.
 
+clear_erl_aflags() ->
+    %% When starting a node with a previous release, options in
+    %% ERL_AFLAGS could prevent the node from starting. For example,
+    %% if ERL_AFLAGS is set to "-emu_type lcnt", the node will only
+    %% start if the previous release happens to also have a lock
+    %% counter emulator installed (unlikely).
+    os:unsetenv("ERL_AFLAGS").
+
 %% This is an attempt to distinguish between spaces in the program
 %% path and spaces that separate arguments. The program is quoted to
 %% allow spaces in the path.
@@ -656,9 +665,19 @@ find_release({unix,linux}, Rel) ->
 find_release(_, _) -> none.
 
 find_rel_linux(Rel) ->
-    case suse_release() of
-	none -> [];
-	SuseRel -> find_rel_suse(Rel, SuseRel)
+    try
+        case ubuntu_release() of
+            none -> none;
+            [UbuntuRel |_] -> throw(find_rel_ubuntu(Rel, UbuntuRel))
+        end,
+        case suse_release() of
+            none -> none;
+            SuseRel -> throw(find_rel_suse(Rel, SuseRel))
+        end,
+        []
+    catch
+        throw:Result ->
+            Result
     end.
 
 find_rel_suse(Rel, SuseRel) ->
@@ -735,6 +754,93 @@ suse_release(Fd) ->
 	    end
     end.
 
+find_rel_ubuntu(_Rel, UbuntuRel) when is_integer(UbuntuRel), UbuntuRel < 16 ->
+    [];
+find_rel_ubuntu(Rel, UbuntuRel) when is_integer(UbuntuRel) ->
+    Root = "/usr/local/otp/releases/ubuntu",
+    lists:foldl(fun (ChkUbuntuRel, Acc) ->
+                        find_rel_ubuntu_aux1(Rel, Root++integer_to_list(ChkUbuntuRel))
+                            ++ Acc
+                end,
+                [],
+                lists:seq(16, UbuntuRel)).
+
+find_rel_ubuntu_aux1(Rel, RootWc) ->
+    case erlang:system_info(wordsize) of
+	4 ->
+	    find_rel_ubuntu_aux2(Rel, RootWc++"_32");
+	8 ->
+	    find_rel_ubuntu_aux2(Rel, RootWc++"_64") ++
+		find_rel_ubuntu_aux2(Rel, RootWc++"_32")
+    end.
+
+find_rel_ubuntu_aux2(Rel, RootWc) ->
+    RelDir = filename:dirname(RootWc),
+    Pat = filename:basename(RootWc ++ "_" ++ Rel) ++ ".*",
+    case file:list_dir(RelDir) of
+	{ok,Dirs} ->
+	    case lists:filter(fun(Dir) ->
+				      case re:run(Dir, Pat, [unicode]) of
+					  nomatch -> false;
+					  _       -> true
+				      end
+			      end, Dirs) of
+		[] ->
+		    [];
+		[R|_] ->
+		    [filename:join([RelDir,R,"bin","erl"])]
+	    end;
+	_ ->
+	    []
+    end.
+
+ubuntu_release() ->
+    case file:open("/etc/lsb-release", [read]) of
+	{ok,Fd} ->
+	    try
+		ubuntu_release(Fd, undefined, undefined)
+	    after
+		file:close(Fd)
+	    end;
+	{error,_} -> none
+    end.
+
+ubuntu_release(_Fd, DistrId, Rel) when DistrId /= undefined,
+                                      Rel /= undefined ->
+    Ubuntu = case DistrId of
+                 "Ubuntu" -> true;
+                 "ubuntu" -> true;
+                 _ -> false
+             end,
+    case Ubuntu of
+        false -> none;
+        true -> Rel
+    end;
+ubuntu_release(Fd, DistroId, Rel) ->
+    case io:get_line(Fd, '') of
+	eof ->
+            none;
+	Line when is_list(Line) ->
+	    case re:run(Line, "^DISTRIB_ID=(\\w+)$",
+                        [{capture,all_but_first,list}]) of
+		{match,[NewDistroId]} ->
+                    ubuntu_release(Fd, NewDistroId, Rel);
+                nomatch ->
+                    case re:run(Line, "^DISTRIB_RELEASE=(\\d+(?:\\.\\d+)*)$",
+                                [{capture,all_but_first,list}]) of
+                        {match,[RelList]} ->
+                            NewRel = lists:map(fun (N) ->
+                                                       list_to_integer(N)
+                                               end,
+                                               string:lexemes(RelList, ".")),
+                            ubuntu_release(Fd, DistroId, NewRel);
+                        nomatch ->
+                            ubuntu_release(Fd, DistroId, Rel)
+                    end
+            end
+    end.
+
+
 unpack(Bin) ->
     {One,Term} = split_binary(Bin, 1),
     case binary_to_list(One) of
diff --git a/lib/common_test/src/test_server_sup.erl b/lib/common_test/src/test_server_sup.erl
index 26e7534c6c..ab8066a88d 100644
--- a/lib/common_test/src/test_server_sup.erl
+++ b/lib/common_test/src/test_server_sup.erl
@@ -770,7 +770,7 @@ framework_call(Callback,Func,Args,DefaultReturn) ->
 			 end,
 	    case SetTcState of
 		true ->
-		    test_server:set_tc_state({framework,Mod,Func});
+		    test_server:set_tc_state({framework,{Mod,Func,Args}});
 		false ->
 		    ok
 	    end,
diff --git a/lib/common_test/test/Makefile b/lib/common_test/test/Makefile
index ecd1f727a2..e510b74d6a 100644
--- a/lib/common_test/test/Makefile
+++ b/lib/common_test/test/Makefile
@@ -74,7 +74,9 @@ MODULES= \
         ct_SUITE \
 	ct_keep_logs_SUITE \
 	ct_unicode_SUITE \
-	ct_auto_clean_SUITE
+	ct_auto_clean_SUITE \
+	ct_util_SUITE \
+	ct_tc_repeat_SUITE
 
 ERL_FILES= $(MODULES:%=%.erl)
 HRL_FILES= test_server_test_lib.hrl
diff --git a/lib/common_test/test/ct_auto_compile_SUITE.erl b/lib/common_test/test/ct_auto_compile_SUITE.erl
index dface99b8f..f88f13c889 100644
--- a/lib/common_test/test/ct_auto_compile_SUITE.erl
+++ b/lib/common_test/test/ct_auto_compile_SUITE.erl
@@ -169,7 +169,7 @@ test_events(ac_flag) ->
      {?eh,start_info,{1,1,3}},
      {?eh,tc_start,{ct_framework,error_in_suite}},
      {?eh,tc_done,{ct_framework,error_in_suite,
-       {failed,{error,'bad_SUITE can not be compiled or loaded'}}}},
+       {failed,{error,'bad_SUITE cannot be compiled or loaded'}}}},
      {?eh,tc_start,{dummy_SUITE,init_per_suite}},
      {?eh,tc_done,{dummy_SUITE,init_per_suite,ok}},
      {?eh,test_stats,{1,1,{1,0}}},
@@ -186,7 +186,7 @@ test_events(ac_spec) ->
      {?eh,start_info,{1,1,3}},
      {?eh,tc_start,{ct_framework,error_in_suite}},
      {?eh,tc_done,{ct_framework,error_in_suite,
-       {failed,{error,'bad_SUITE can not be compiled or loaded'}}}},
+       {failed,{error,'bad_SUITE cannot be compiled or loaded'}}}},
      {?eh,tc_start,{dummy_SUITE,init_per_suite}},
      {?eh,tc_done,{dummy_SUITE,init_per_suite,ok}},
      {?eh,test_stats,{1,1,{1,0}}},
diff --git a/lib/common_test/test/ct_config_SUITE.erl b/lib/common_test/test/ct_config_SUITE.erl
index 5ffc735d6a..ec5278b96d 100644
--- a/lib/common_test/test/ct_config_SUITE.erl
+++ b/lib/common_test/test/ct_config_SUITE.erl
@@ -211,18 +211,12 @@ reformat_events(Events, EH) ->
 %%% Test related to 'localtime' will often fail if the test host is
 %%% time warping, so let's just skip the 'dynamic' tests then.
 skip_dynamic() ->
-    case os:getenv("TS_EXTRA_PLATFORM_LABEL") of
-	TSExtraPlatformLabel when is_list(TSExtraPlatformLabel) ->
-	    case string:find(TSExtraPlatformLabel,"TimeWarpingOS") of
-		nomatch -> false;
-		_ -> true
-	    end;
-	_ ->
-	    false
+    case string:find(os:getenv("TS_EXTRA_PLATFORM_LABEL", ""), "TimeWarpingOS") of
+	nomatch -> false;
+	_ -> true
     end.
 
 
-
 %%%-----------------------------------------------------------------
 %%% TEST EVENTS
 %%%-----------------------------------------------------------------
diff --git a/lib/common_test/test/ct_error_SUITE.erl b/lib/common_test/test/ct_error_SUITE.erl
index 7468ebe9d9..d31bd26273 100644
--- a/lib/common_test/test/ct_error_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE.erl
@@ -648,33 +648,35 @@ test_events(cfg_error) ->
      {?eh,tc_start,{cfg_error_11_SUITE,end_per_suite}},
      {?eh,tc_done,{cfg_error_11_SUITE,end_per_suite,ok}},
      {?eh,tc_start,{cfg_error_12_SUITE,tc1}},
-     {?eh,tc_done,{ct_framework,init_tc,{framework_error,{timetrap,500}}}},
-     {?eh,test_stats,{13,8,{0,19}}},
+     {?eh,tc_done,{cfg_error_12_SUITE,tc1,
+                   {auto_skipped,
+                    {failed,{ct_framework,init_tc,{timetrap,500}}}}}},
+     {?eh,test_stats,{13,7,{0,20}}},
      {?eh,tc_start,{cfg_error_12_SUITE,tc2}},
      {?eh,tc_done,{cfg_error_12_SUITE,tc2,{failed,
 					   {cfg_error_12_SUITE,end_per_testcase,
 					    {timetrap_timeout,500}}}}},
-     {?eh,test_stats,{14,8,{0,19}}},
+     {?eh,test_stats,{14,7,{0,20}}},
      {?eh,tc_start,{cfg_error_12_SUITE,tc3}},
      {?eh,tc_done,{cfg_error_12_SUITE,tc3,ok}},
-     {?eh,test_stats,{15,8,{0,19}}},
+     {?eh,test_stats,{15,7,{0,20}}},
      {?eh,tc_start,{cfg_error_12_SUITE,tc4}},
      {?eh,tc_done,{cfg_error_12_SUITE,tc4,{failed,
 					   {cfg_error_12_SUITE,end_per_testcase,
 					    {timetrap_timeout,500}}}}},
-     {?eh,test_stats,{16,8,{0,19}}},
+     {?eh,test_stats,{16,7,{0,20}}},
      {?eh,tc_start,{cfg_error_13_SUITE,init_per_suite}},
      {?eh,tc_done,{cfg_error_13_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{cfg_error_13_SUITE,tc1}},
      {?eh,tc_done,{cfg_error_13_SUITE,tc1,ok}},
-     {?eh,test_stats,{17,8,{0,19}}},
+     {?eh,test_stats,{17,7,{0,20}}},
      {?eh,tc_start,{cfg_error_13_SUITE,end_per_suite}},
      {?eh,tc_done,{cfg_error_13_SUITE,end_per_suite,ok}},
      {?eh,tc_start,{cfg_error_14_SUITE,init_per_suite}},
      {?eh,tc_done,{cfg_error_14_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{cfg_error_14_SUITE,tc1}},
      {?eh,tc_done,{cfg_error_14_SUITE,tc1,ok}},
-     {?eh,test_stats,{18,8,{0,19}}},
+     {?eh,test_stats,{18,7,{0,20}}},
      {?eh,tc_start,{cfg_error_14_SUITE,end_per_suite}},
      {?eh,tc_done,{cfg_error_14_SUITE,end_per_suite,
 		   {comment,
@@ -728,25 +730,30 @@ test_events(lib_error) ->
       {lib_error_1_SUITE,no_lines_throw,{failed,{error,{thrown,catch_me_if_u_can}}}}},
      {?eh,test_stats,{0,8,{0,0}}},
      {?eh,tc_start,{lib_error_1_SUITE,init_tc_error}},
-     {?eh,tc_done,{ct_framework,init_tc,
-         {framework_error,{{badmatch,[1,2]},'_'}}}},
-     {?eh,test_stats,{0,9,{0,0}}},
+     {?eh,tc_done,{lib_error_1_SUITE,init_tc_error,
+                   {auto_skipped,
+                    {failed,
+                     {ct_framework,init_tc,
+                      {{badmatch,[1,2]},'_'}}}}}},
+     {?eh,test_stats,{0,8,{0,1}}},
      {?eh,tc_start,{lib_error_1_SUITE,init_tc_exit}},
-     {?eh,tc_done,{ct_framework,init_tc,{framework_error,byebye}}},
-     {?eh,test_stats,{0,10,{0,0}}},
+     {?eh,tc_done,{lib_error_1_SUITE,init_tc_exit,
+                   {auto_skipped,{failed,{ct_framework,init_tc,byebye}}}}},
+     {?eh,test_stats,{0,8,{0,2}}},
      {?eh,tc_start,{lib_error_1_SUITE,init_tc_throw}},
-     {?eh,tc_done,{ct_framework,init_tc,{framework_error,catch_me_if_u_can}}},
-     {?eh,test_stats,{0,11,{0,0}}},
+     {?eh,tc_done,{lib_error_1_SUITE,init_tc_throw,
+                   {auto_skipped,{failed,{ct_framework,init_tc,
+                                          catch_me_if_u_can}}}}},
+     {?eh,test_stats,{0,8,{0,3}}},
      {?eh,tc_start,{lib_error_1_SUITE,end_tc_error}},
-     {?eh,tc_done,{ct_framework,end_tc,
-		   {framework_error,{{badmatch,[1,2]},'_'}}}},
-     {?eh,test_stats,{0,12,{0,0}}},
+     {?eh,tc_done,{lib_error_1_SUITE,end_tc_error,ok}}, % warning in comment
+     {?eh,test_stats,{1,8,{0,3}}},
      {?eh,tc_start,{lib_error_1_SUITE,end_tc_exit}},
-     {?eh,tc_done,{ct_framework,end_tc,{framework_error,byebye}}},
-     {?eh,test_stats,{0,13,{0,0}}},
+     {?eh,tc_done,{lib_error_1_SUITE,end_tc_exit,ok}}, % warning in comment
+     {?eh,test_stats,{2,8,{0,3}}},
      {?eh,tc_start,{lib_error_1_SUITE,end_tc_throw}},
-     {?eh,tc_done,{ct_framework,end_tc,{framework_error,catch_me_if_u_can}}},
-     {?eh,test_stats,{0,14,{0,0}}},
+     {?eh,tc_done,{lib_error_1_SUITE,end_tc_throw,ok}}, % warning in comment
+     {?eh,test_stats,{3,8,{0,3}}},
      {?eh,tc_start,{lib_error_1_SUITE,end_per_suite}},
      {?eh,tc_done,{lib_error_1_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
diff --git a/lib/common_test/test/ct_hooks_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE.erl
index 0f5636a789..b87464f5e4 100644
--- a/lib/common_test/test/ct_hooks_SUITE.erl
+++ b/lib/common_test/test/ct_hooks_SUITE.erl
@@ -73,18 +73,22 @@ all() ->
 all(suite) ->
     lists:reverse(
       [
+       crash_groups, crash_all, bad_return_groups, bad_return_all,
+       illegal_values_groups, illegal_values_all, alter_groups, alter_all,
+       alter_all_to_skip, alter_all_from_skip,
        one_cth, two_cth, faulty_cth_no_init, faulty_cth_id_no_init,
        faulty_cth_exit_in_init, faulty_cth_exit_in_id,
        faulty_cth_exit_in_init_scope_suite, minimal_cth,
        minimal_and_maximal_cth, faulty_cth_undef,
        scope_per_suite_cth, scope_per_group_cth, scope_suite_cth,
+       scope_suite_group_only_cth,
        scope_per_suite_state_cth, scope_per_group_state_cth,
        scope_suite_state_cth,
        fail_pre_suite_cth, double_fail_pre_suite_cth,
        fail_post_suite_cth, skip_pre_suite_cth, skip_pre_end_cth,
-       skip_pre_init_tc_cth,
+       skip_pre_init_tc_cth, fail_post_init_tc_cth,
        skip_post_suite_cth, recover_post_suite_cth, update_config_cth,
-       state_update_cth, options_cth, same_id_cth,
+       state_update_cth, update_result_cth, options_cth, same_id_cth,
        fail_n_skip_with_minimal_cth, prio_cth, no_config,
        no_init_suite_config, no_init_config, no_end_config,
        failed_sequence, repeat_force_stop, config_clash,
@@ -152,6 +156,11 @@ scope_suite_cth(Config) when is_list(Config) ->
     do_test(scope_suite_cth, "ct_scope_suite_cth_SUITE.erl",
 	    [],Config).
 
+scope_suite_group_only_cth(Config) when is_list(Config) ->
+    do_test(scope_suite_group_only_cth,
+            "ct_scope_suite_group_only_cth_SUITE.erl",
+	    [],Config,ok,2,[{group,g1}]).
+
 scope_per_group_cth(Config) when is_list(Config) ->
     do_test(scope_per_group_cth, "ct_scope_per_group_cth_SUITE.erl",
 	    [],Config).
@@ -197,6 +206,10 @@ skip_pre_init_tc_cth(Config) ->
     do_test(skip_pre_init_tc_cth, "ct_cth_empty_SUITE.erl",
 	    [skip_pre_init_tc_cth],Config).
 
+fail_post_init_tc_cth(Config) ->
+    do_test(fail_post_init_tc_cth, "ct_fail_init_tc_SUITE.erl",
+	    [fail_post_init_tc_cth],Config).
+
 recover_post_suite_cth(Config) when is_list(Config) ->
     do_test(recover_post_suite_cth, "ct_cth_fail_per_suite_SUITE.erl",
 	    [recover_post_suite_cth],Config).
@@ -209,6 +222,10 @@ state_update_cth(Config) when is_list(Config) ->
     do_test(state_update_cth, "ct_cth_fail_one_skip_one_SUITE.erl",
 	    [state_update_cth,state_update_cth],Config).
 
+update_result_cth(Config) ->
+    do_test(update_result_cth, "ct_cth_update_result_post_end_tc_SUITE.erl",
+            [update_result_post_end_tc_cth],Config).
+
 options_cth(Config) when is_list(Config) ->
     do_test(options_cth, "ct_cth_empty_SUITE.erl",
 	    [{empty_cth,[test]}],Config).
@@ -300,10 +317,74 @@ repeat_force_stop(Config) ->
             [{force_stop,skip_rest},{duration,"000009"}]).
 
 %% Test that expected callbacks, and only those, are called when a test
-%% are fails due to clash in config alias names
+%% fails due to clash in config alias names
 config_clash(Config) ->
     do_test(config_clash, "config_clash_SUITE.erl", [skip_cth], Config).
 
+%% Test post_groups and post_all hook callbacks, introduced by OTP-14746
+alter_groups(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,
+                         [{post_groups_return,[{new_group,[tc1,tc2]}]},
+                          {post_all_return,[{group,new_group}]}],Config),
+    do_test(?FUNCTION_NAME, "all_and_groups_SUITE.erl", [all_and_groups_cth],
+            Config, ok, 2, [{config,CfgFile}]).
+
+alter_all(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,[{post_all_return,[tc2]}],Config),
+    do_test(?FUNCTION_NAME, "all_and_groups_SUITE.erl", [all_and_groups_cth],
+            Config, ok, 2, [{config,CfgFile}]).
+
+alter_all_from_skip(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,[{all_return,{skip,"skipped by all/0"}},
+                                         {post_all_return,[tc2]}],Config),
+    do_test(?FUNCTION_NAME, "all_and_groups_SUITE.erl", [all_and_groups_cth],
+            Config, ok, 2, [{config,CfgFile}]).
+
+alter_all_to_skip(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,
+                         [{post_all_return,{skip,"skipped by post_all/3"}}],
+                         Config),
+    do_test(?FUNCTION_NAME, "all_and_groups_SUITE.erl", [all_and_groups_cth],
+            Config, ok, 2, [{config,CfgFile}]).
+
+bad_return_groups(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,[{post_groups_return,not_a_list}],
+                         Config),
+    do_test(?FUNCTION_NAME, "all_and_groups_SUITE.erl", [all_and_groups_cth],
+            Config, ok, 2, [{config,CfgFile}]).
+
+bad_return_all(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,[{post_all_return,not_a_list}],
+                         Config),
+    do_test(?FUNCTION_NAME, "all_and_groups_SUITE.erl", [all_and_groups_cth],
+            Config, ok, 2, [{config,CfgFile}]).
+
+illegal_values_groups(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,
+                         [{post_groups_return,[{new_group,[this_test_does_not_exist]},
+                                          this_is_not_a_group_def]}],
+                         Config),
+    do_test(?FUNCTION_NAME, "all_and_groups_SUITE.erl", [all_and_groups_cth],
+            Config, ok, 2, [{config,CfgFile}]).
+
+illegal_values_all(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,
+                         [{post_all_return,[{group,this_group_does_not_exist},
+                                       {this_is_not_a_valid_term}]}],
+                         Config),
+    do_test(?FUNCTION_NAME, "all_and_groups_SUITE.erl", [all_and_groups_cth],
+            Config, ok, 2, [{config,CfgFile}]).
+
+crash_groups(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,[{post_groups_return,crash}],Config),
+    do_test(?FUNCTION_NAME, "all_and_groups_SUITE.erl", [all_and_groups_cth],
+            Config, ok, 2, [{config,CfgFile}]).
+
+crash_all(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,[{post_all_return,crash}],Config),
+    do_test(?FUNCTION_NAME, "all_and_groups_SUITE.erl", [all_and_groups_cth],
+            Config, ok, 2, [{config,CfgFile}]).
+
 %%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
 %%%-----------------------------------------------------------------
@@ -323,6 +404,7 @@ do_test(Tag, {WhatTag,Wildcard}, CTHs, Config, Res, EC, ExtraOpts) ->
                filename:join([DataDir,"cth/tests",Wildcard])),
     {Opts,ERPid} =
         setup([{WhatTag,Files},{ct_hooks,CTHs},{label,Tag}|ExtraOpts], Config),
+
     Res = ct_test_support:run(Opts, Config),
     Events = ct_test_support:get_events(ERPid, Config),
 
@@ -348,6 +430,13 @@ reformat(Events, EH) ->
 %reformat(Events, _EH) ->
 %    Events.
 
+gen_config(Name,KeyVals,Config) ->
+    PrivDir = ?config(priv_dir,Config),
+    File = filename:join(PrivDir,atom_to_list(Name)++".cfg"),
+    ok = file:write_file(File,[io_lib:format("~p.~n",[{Key,Value}])
+                               || {Key,Value} <- KeyVals]),
+    File.
+
 %%%-----------------------------------------------------------------
 %%% TEST EVENTS
 %%%-----------------------------------------------------------------
@@ -366,13 +455,16 @@ test_events(one_empty_cth) ->
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
      {?eh,cth,{empty_cth,id,[[]]}},
      {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     %% check that post_groups and post_all comes after init when hook
+     %% is installed with start flag/option.
+     {?eh,cth,{empty_cth,post_groups,[ct_cth_empty_SUITE,[]]}},
+     {?eh,cth,{empty_cth,post_all,[ct_cth_empty_SUITE,[test_case],[]]}},
      {?eh,tc_start,{ct_cth_empty_SUITE,init_per_suite}},
      {?eh,cth,{empty_cth,pre_init_per_suite,
 	       [ct_cth_empty_SUITE,'$proplist',[]]}},
      {?eh,cth,{empty_cth,post_init_per_suite,
 	       [ct_cth_empty_SUITE,'$proplist','$proplist',[]]}},
      {?eh,tc_done,{ct_cth_empty_SUITE,init_per_suite,ok}},
-
      {?eh,tc_start,{ct_cth_empty_SUITE,test_case}},
      {?eh,cth,{empty_cth,pre_init_per_testcase,[ct_cth_empty_SUITE,test_case,'$proplist',[]]}},
      {?eh,cth,{empty_cth,post_init_per_testcase,[ct_cth_empty_SUITE,test_case,'$proplist','_',[]]}},
@@ -581,7 +673,17 @@ test_events(scope_suite_cth) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
-     {?eh,tc_start,{ct_scope_suite_cth_SUITE,init_per_suite}},
+     %% check that post_groups and post_all comes before init when hook
+     %% is installed in suite/0
+     %% And there should be no terminate after these, since init is
+     %% not yet called.
+     {?eh,cth,{'_',post_groups,['_',[]]}},
+     {negative,
+      {?eh,cth,{'_',terminate,['_']}},
+      {?eh,cth,{'_',post_all,['_','_',[]]}}},
+     {negative,
+      {?eh,cth,{'_',terminate,['_']}},
+      {?eh,tc_start,{ct_scope_suite_cth_SUITE,init_per_suite}}},
      {?eh,cth,{'_',id,[[]]}},
      {?eh,cth,{'_',init,['_',[]]}},
      {?eh,cth,{'_',pre_init_per_suite,[ct_scope_suite_cth_SUITE,'$proplist',[]]}},
@@ -602,6 +704,34 @@ test_events(scope_suite_cth) ->
      {?eh,stop_logging,[]}
     ];
 
+test_events(scope_suite_group_only_cth) ->
+    Suite = ct_scope_suite_group_only_cth_SUITE,
+    CTH = empty_cth,
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,1}},
+     %% check that post_groups and post_all comes before init when hook
+     %% is installed in suite/0
+     {?eh,cth,{CTH,post_groups,['_',['_']]}},
+     {negative,
+      {?eh,cth,{CTH,post_all,['_','_','_']}},
+      {?eh,tc_start,{Suite,init_per_suite}}},
+     {?eh,cth,{CTH,id,[[]]}},
+     {?eh,cth,{CTH,init,['_',[]]}},
+     {?eh,cth,{CTH,pre_init_per_suite,[Suite,'$proplist',mystate]}},
+     {?eh,cth,{CTH,post_init_per_suite,[Suite,'$proplist','$proplist',mystate]}},
+     {?eh,tc_done,{Suite,init_per_suite,ok}},
+
+     {?eh,tc_start,{Suite,end_per_suite}},
+     {?eh,cth,{CTH,pre_end_per_suite,[Suite,'$proplist',mystate]}},
+     {?eh,cth,{CTH,post_end_per_suite,[Suite,'$proplist','_',mystate]}},
+     {?eh,cth,{CTH,terminate,[mystate]}},
+     {?eh,tc_done,{Suite,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
 test_events(scope_per_group_cth) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
@@ -661,6 +791,8 @@ test_events(scope_suite_state_cth) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{'_',post_groups,['_',[]]}},
+     {?eh,cth,{'_',post_all,['_','_',[]]}},
      {?eh,tc_start,{ct_scope_suite_state_cth_SUITE,init_per_suite}},
      {?eh,cth,{'_',id,[[test]]}},
      {?eh,cth,{'_',init,['_',[test]]}},
@@ -914,6 +1046,44 @@ test_events(skip_pre_init_tc_cth) ->
      {?eh,stop_logging,[]}
     ];
 
+test_events(fail_post_init_tc_cth) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,init,['_',[]]}},
+     {?eh,start_info,{1,1,1}},
+     {?eh,tc_start,{ct_fail_init_tc_SUITE,init_per_suite}},
+     {?eh,cth,{empty_cth,pre_init_per_suite,[ct_fail_init_tc_SUITE,'$proplist',[]]}},
+     {?eh,cth,{empty_cth,post_init_per_suite,
+               [ct_fail_init_tc_SUITE,'$proplist','$proplist',[]]}},
+     {?eh,tc_done,{ct_fail_init_tc_SUITE,init_per_suite,ok}},
+     {?eh,tc_start,{ct_fail_init_tc_SUITE,test_case}},
+     {?eh,cth,{empty_cth,pre_init_per_testcase,
+               [ct_fail_init_tc_SUITE,test_case,'$proplist',[]]}},
+     {?eh,cth,{empty_cth,post_init_per_testcase,
+               [ct_fail_init_tc_SUITE,test_case,'$proplist',
+                {skip,
+                 {failed,
+                  {ct_fail_init_tc_SUITE,init_per_testcase,
+                   {{test_case_failed,"Failed in init_per_testcase"},'_'}}}},
+                []]}},
+     {?eh,tc_done,{ct_fail_init_tc_SUITE,test_case,
+                   {failed,"Changed skip to fail in post_init_per_testcase"}}},
+     {?eh,cth,{empty_cth,on_tc_fail,
+               [ct_fail_init_tc_SUITE,test_case,
+                "Changed skip to fail in post_init_per_testcase",
+                []]}},
+     {?eh,test_stats,{0,1,{0,0}}},
+     {?eh,tc_start,{ct_fail_init_tc_SUITE,end_per_suite}},
+     {?eh,cth,{empty_cth,pre_end_per_suite,[ct_fail_init_tc_SUITE,'$proplist',[]]}},
+     {?eh,cth,{empty_cth,post_end_per_suite,
+               [ct_fail_init_tc_SUITE,'$proplist',ok,[]]}},
+     {?eh,tc_done,{ct_fail_init_tc_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
 test_events(recover_post_suite_cth) ->
     Suite = ct_cth_fail_per_suite_SUITE,
     [
@@ -1099,6 +1269,106 @@ test_events(state_update_cth) ->
      {?eh,stop_logging,[]}
     ];
 
+test_events(update_result_cth) ->
+    Suite = ct_cth_update_result_post_end_tc_SUITE,
+    [
+     {?eh,start_logging,'_'},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{'_',init,['_',[]]}},
+     {?eh,tc_start,{Suite,init_per_suite}},
+     {?eh,tc_done,{Suite,init_per_suite,ok}},
+
+     {?eh,tc_start,{Suite,tc_ok_to_fail}},
+     {?eh,cth,{'_',post_end_per_testcase,[Suite,tc_ok_to_fail,'_',ok,[]]}},
+     {?eh,tc_done,{Suite,tc_ok_to_fail,{failed,{error,"Test failure"}}}},
+     {?eh,cth,{'_',on_tc_fail,'_'}},
+     {?eh,test_stats,{0,1,{0,0}}},
+
+     {?eh,tc_start,{Suite,tc_ok_to_skip}},
+     {?eh,cth,{'_',post_end_per_testcase,[Suite,tc_ok_to_skip,'_',ok,[]]}},
+     {?eh,tc_done,{Suite,tc_ok_to_skip,{skipped,"Test skipped"}}},
+     {?eh,cth,{'_',on_tc_skip,'_'}},
+     {?eh,test_stats,{0,1,{1,0}}},
+
+     {?eh,tc_start,{Suite,tc_fail_to_ok}},
+     {?eh,cth,{'_',post_end_per_testcase,
+               [Suite,tc_fail_to_ok,'_',
+                {error,{test_case_failed,"should be changed to ok"}},[]]}},
+     {?eh,tc_done,{Suite,tc_fail_to_ok,ok}},
+     {?eh,test_stats,{1,1,{1,0}}},
+
+     {?eh,tc_start,{Suite,tc_fail_to_skip}},
+     {?eh,cth,{'_',post_end_per_testcase,
+               [Suite,tc_fail_to_skip,'_',
+                {error,{test_case_failed,"should be changed to skip"}},[]]}},
+     {?eh,tc_done,{Suite,tc_fail_to_skip,{skipped,"Test skipped"}}},
+     {?eh,cth,{'_',on_tc_skip,'_'}},
+     {?eh,test_stats,{1,1,{2,0}}},
+
+     {?eh,tc_start,{Suite,tc_timetrap_to_ok}},
+     {?eh,cth,{'_',post_end_per_testcase,
+               [Suite,tc_timetrap_to_ok,'_',{timetrap_timeout,3000},[]]}},
+     {?eh,tc_done,{Suite,tc_timetrap_to_ok,ok}},
+     {?eh,test_stats,{2,1,{2,0}}},
+
+     {?eh,tc_start,{Suite,tc_timetrap_to_skip}},
+     {?eh,cth,{'_',post_end_per_testcase,
+               [Suite,tc_timetrap_to_skip,'_',{timetrap_timeout,3000},[]]}},
+     {?eh,tc_done,{Suite,tc_timetrap_to_skip,{skipped,"Test skipped"}}},
+     {?eh,cth,{'_',on_tc_skip,'_'}},
+     {?eh,test_stats,{2,1,{3,0}}},
+
+     {?eh,tc_start,{Suite,tc_skip_to_fail}},
+     {?eh,cth,{'_',post_end_per_testcase,
+               [Suite,tc_skip_to_fail,'_',
+                {skip,"should be changed to fail"},[]]}},
+     {?eh,tc_done,{Suite,tc_skip_to_fail,{failed,{error,"Test failure"}}}},
+     {?eh,cth,{'_',on_tc_fail,'_'}},
+     {?eh,test_stats,{2,2,{3,0}}},
+
+     {?eh,tc_start,{Suite,end_fail_to_fail}},
+     {?eh,cth,{'_',post_end_per_testcase,
+               [Suite,end_fail_to_fail,'_',
+                {failed,
+                 {Suite,end_per_testcase,
+                  {'EXIT',{test_case_failed,"change result when end fails"}}}},[]]}},
+     {?eh,tc_done,{Suite,end_fail_to_fail,{failed,{error,"Test failure"}}}},
+     {?eh,cth,{'_',on_tc_fail,'_'}},
+     {?eh,test_stats,{2,3,{3,0}}},
+
+     {?eh,tc_start,{Suite,end_fail_to_skip}},
+     {?eh,cth,{'_',post_end_per_testcase,
+               [Suite,end_fail_to_skip,'_',
+                {failed,
+                 {Suite,end_per_testcase,
+                  {'EXIT',{test_case_failed,"change result when end fails"}}}},[]]}},
+     {?eh,tc_done,{Suite,end_fail_to_skip,{skipped,"Test skipped"}}},
+     {?eh,cth,{'_',on_tc_skip,'_'}},
+     {?eh,test_stats,{2,3,{4,0}}},
+
+     {?eh,tc_start,{Suite,end_timetrap_to_fail}},
+     {?eh,cth,{'_',post_end_per_testcase,
+               [Suite,end_timetrap_to_fail,'_',
+                {failed,{Suite,end_per_testcase,{timetrap_timeout,3000}}},[]]}},
+     {?eh,tc_done,{Suite,end_timetrap_to_fail,{failed,{error,"Test failure"}}}},
+     {?eh,cth,{'_',on_tc_fail,'_'}},
+     {?eh,test_stats,{2,4,{4,0}}},
+
+     {?eh,tc_start,{Suite,end_timetrap_to_skip}},
+     {?eh,cth,{'_',post_end_per_testcase,
+               [Suite,end_timetrap_to_skip,'_',
+                {failed,{Suite,end_per_testcase,{timetrap_timeout,3000}}},[]]}},
+     {?eh,tc_done,{Suite,end_timetrap_to_skip,{skipped,"Test skipped"}}},
+     {?eh,cth,{'_',on_tc_skip,'_'}},
+     {?eh,test_stats,{2,4,{5,0}}},
+
+     {?eh,tc_start,{Suite,end_per_suite}},
+     {?eh,tc_done,{Suite,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{'_',terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
 test_events(options_cth) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
@@ -2209,6 +2479,229 @@ test_events(config_clash) ->
     %% Make sure no 'cth_error' events are received!
     [{negative,{?eh,cth_error,'_'},E} || E <- Events];
 
+test_events(alter_groups) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,id,[[]]}},
+     {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,
+                                      [{new_group,[tc1,tc2]}]]}},
+     {?eh,cth,{empty_cth,post_all,[all_and_groups_SUITE,[{group,new_group}],
+                                   [{new_group,[tc1,tc2]}]]}},
+     {?eh,start_info,{1,1,2}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,
+                                      [{new_group,[tc1,tc2]}]]}},
+     {?eh,cth,{empty_cth,post_all,[all_and_groups_SUITE,[{group,new_group}],
+                                   [{new_group,[tc1,tc2]}]]}},
+     {?eh,tc_start,{all_and_groups_SUITE,{init_per_group,new_group,[]}}},
+     {?eh,tc_done,{all_and_groups_SUITE,
+                   {init_per_group,new_group,'$proplist'},ok}},
+     {?eh,tc_start,{all_and_groups_SUITE,tc1}},
+     {?eh,tc_done,{all_and_groups_SUITE,tc1,ok}},
+     {?eh,tc_start,{all_and_groups_SUITE,tc2}},
+     {?eh,tc_done,{all_and_groups_SUITE,tc2,ok}},
+     {?eh,tc_start,{all_and_groups_SUITE,{end_per_group,new_group,[]}}},
+     {?eh,tc_done,{all_and_groups_SUITE,
+                   {end_per_group,new_group,'$proplist'},ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(alter_all) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,id,[[]]}},
+     {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,
+                                      [{test_group,[tc1]}]]}},
+     {?eh,cth,{empty_cth,post_all,[all_and_groups_SUITE,[tc2],
+                                   [{test_group,[tc1]}]]}},
+     {?eh,start_info,{1,1,1}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,'_']}},
+     {?eh,cth,{empty_cth,post_all,[all_and_groups_SUITE,[tc2],'_']}},
+     {?eh,tc_start,{all_and_groups_SUITE,tc2}},
+     {?eh,tc_done,{all_and_groups_SUITE,tc2,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(alter_all_from_skip) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,id,[[]]}},
+     {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,
+                                      [{test_group,[tc1]}]]}},
+     {?eh,cth,{empty_cth,post_all,[all_and_groups_SUITE,[tc2],
+                                   [{test_group,[tc1]}]]}},
+     {?eh,start_info,{1,1,1}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,'_']}},
+     {?eh,cth,{empty_cth,post_all,[all_and_groups_SUITE,[tc2],'_']}},
+     {?eh,tc_start,{all_and_groups_SUITE,tc2}},
+     {?eh,tc_done,{all_and_groups_SUITE,tc2,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(alter_all_to_skip) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,id,[[]]}},
+     {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,
+                                      [{test_group,[tc1]}]]}},
+     {?eh,cth,{empty_cth,post_all,[all_and_groups_SUITE,
+                                   {skip,"skipped by post_all/3"},
+                                   [{test_group,[tc1]}]]}},
+     {?eh,start_info,{1,1,0}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,'_']}},
+     {?eh,cth,{empty_cth,post_all,[all_and_groups_SUITE,
+                                   {skip,"skipped by post_all/3"},
+                                   '_']}},
+     {?eh,tc_user_skip,{all_and_groups_SUITE,all,"skipped by post_all/3"}},
+     {?eh,cth,{'_',on_tc_skip,[all_and_groups_SUITE,all,
+                               {tc_user_skip,"skipped by post_all/3"},
+                               []]}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(illegal_values_groups) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,id,[[]]}},
+     {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     {?eh,cth,{empty_cth,post_groups,
+               [all_and_groups_SUITE,
+                [{new_group,[this_test_does_not_exist]},
+                 this_is_not_a_group_def]]}},
+     {?eh,start_info,{1,0,0}},
+     {?eh,cth,{empty_cth,post_groups,
+               [all_and_groups_SUITE,
+                [{new_group,[this_test_does_not_exist]},
+                 this_is_not_a_group_def]]}},
+     {?eh,tc_start,{ct_framework,error_in_suite}},
+     {?eh,tc_done,{ct_framework,error_in_suite,{failed,{error,'_'}}}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(illegal_values_all) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,id,[[]]}},
+     {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,'_']}},
+     {?eh,cth,{empty_cth,post_all,
+               [all_and_groups_SUITE,
+                [{group,this_group_does_not_exist},
+                 {this_is_not_a_valid_term}],'_']}},
+     {?eh,start_info,{1,0,0}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,'_']}},
+     {?eh,cth,{empty_cth,post_all,
+               [all_and_groups_SUITE,
+                [{group,this_group_does_not_exist},
+                 {this_is_not_a_valid_term}],'_']}},
+     {?eh,tc_start,{ct_framework,error_in_suite}},
+     {?eh,tc_done,
+      {ct_framework,error_in_suite,
+       {failed,
+        {error,'Invalid reference to group this_group_does_not_exist in all_and_groups_SUITE:all/0'}}}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(bad_return_groups) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,id,[[]]}},
+     {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,not_a_list]}},
+     {?eh,start_info,{1,0,0}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,not_a_list]}},
+     {?eh,tc_start,{ct_framework,error_in_suite}},
+     {?eh,tc_done,
+      {ct_framework,error_in_suite,
+       {failed,
+        {error,
+         {'Bad return value from post_groups/2 hook function',not_a_list}}}}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(bad_return_all) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,id,[[]]}},
+     {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,'_']}},
+     {?eh,cth,{empty_cth,post_all,[all_and_groups_SUITE,not_a_list,'_']}},
+     {?eh,start_info,{1,0,0}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,'_']}},
+     {?eh,cth,{empty_cth,post_all,[all_and_groups_SUITE,not_a_list,'_']}},
+     {?eh,tc_start,{ct_framework,error_in_suite}},
+     {?eh,tc_done,
+      {ct_framework,error_in_suite,
+       {failed,
+        {error,{'Bad return value from post_all/3 hook function',not_a_list}}}}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(crash_groups) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,id,[[]]}},
+     {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,crash]}},
+     {?eh,start_info,{1,0,0}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,crash]}},
+     {?eh,tc_start,{ct_framework,error_in_suite}},
+     {?eh,tc_done,{ct_framework,error_in_suite,
+                   {failed,
+                    {error,"all_and_groups_cth:post_groups/2 CTH call failed"}}}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(crash_all) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,cth,{empty_cth,id,[[]]}},
+     {?eh,cth,{empty_cth,init,[{'_','_','_'},[]]}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,'_']}},
+     {?eh,cth,{empty_cth,post_all,[all_and_groups_SUITE,crash,'_']}},
+     {?eh,start_info,{1,0,0}},
+     {?eh,cth,{empty_cth,post_groups,[all_and_groups_SUITE,'_']}},
+     {?eh,cth,{empty_cth,post_all,[all_and_groups_SUITE,crash,'_']}},
+     {?eh,tc_start,{ct_framework,error_in_suite}},
+     {?eh,tc_done,{ct_framework,error_in_suite,
+                   {failed,
+                    {error,"all_and_groups_cth:post_all/3 CTH call failed"}}}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{empty_cth,terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
 test_events(ok) ->
     ok.
 
diff --git a/erts/preloaded/src/otp_ring0.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/all_and_groups_SUITE.erl
index 62a60fffe2..adc86005f9 100644
--- a/erts/preloaded/src/otp_ring0.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/all_and_groups_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-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.
@@ -17,21 +17,31 @@
 %%
 %% %CopyrightEnd%
 %%
--module(otp_ring0).
 
-%% Purpose : Start up of erlang system.
+-module(all_and_groups_SUITE).
 
--export([start/2]).
+-suite_defaults([{timetrap, {minutes, 10}}]).
 
--spec start(_, term()) -> term().
-start(_Env, Argv) ->
-    run(init, boot, Argv).
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
 
-run(M, F, A) ->
-    case erlang:function_exported(M, F, 1) of
-	false ->
-	    erlang:display({fatal,error,module,M,"does not export",F,"/1"}),
-	    halt(1);
-	true ->
-            M:F(A)
-    end.
+-include("ct.hrl").
+
+init_per_group(_Group,Config) ->
+    Config.
+
+end_per_group(_Group,Config) ->
+    ok.
+
+all() ->
+    ct:get_config(all_return,[{group,test_group}]).
+
+groups() ->
+    [{test_group,[tc1]}].
+
+%% Test cases starts here.
+tc1(Config) ->
+    ok.
+
+tc2(Config) ->
+    ok.
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/all_and_groups_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/all_and_groups_cth.erl
new file mode 100644
index 0000000000..9ebc00e9de
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/all_and_groups_cth.erl
@@ -0,0 +1,100 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-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(all_and_groups_cth).
+
+
+-include_lib("common_test/src/ct_util.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+%% Send a cth_error event if a callback is called with unexpected arguments
+-define(fail(Info),
+        gen_event:notify(
+          ?CT_EVMGR_REF, 
+          #event{ name = cth_error,
+                  node = node(),
+                  data = {illegal_hook_callback,{?MODULE,?FUNCTION_NAME,Info}}})).
+
+%% CT Hooks
+-compile(export_all).
+
+id(Opts) ->
+    empty_cth:id(Opts).
+
+post_groups(Suite,Groups) ->
+    case empty_cth:post_groups(Suite,ct:get_config(post_groups_return,Groups)) of
+        crash -> error(crash_in_post_groups);
+        R -> R
+    end.
+
+post_all(Suite,Tests,Groups) ->
+    case empty_cth:post_all(Suite,ct:get_config(post_all_return,Tests),Groups) of
+        crash -> error(crash_in_post_all);
+        R -> R
+    end.
+
+init(Id, Opts) ->
+    empty_cth:init(Id, Opts).
+
+pre_init_per_suite(Suite, Config, State) ->
+    empty_cth:pre_init_per_suite(Suite,Config,State).
+
+post_init_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_init_per_suite(Suite,Config,Return,State).
+
+pre_end_per_suite(Suite,Config,State) ->
+    empty_cth:pre_end_per_suite(Suite,Config,State).
+
+post_end_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_end_per_suite(Suite,Config,Return,State).
+
+pre_init_per_group(Suite,Group,Config,State) ->
+    empty_cth:pre_init_per_group(Suite,Group,Config,State).
+
+post_init_per_group(Suite,Group,Config,Return,State) ->
+    empty_cth:post_init_per_group(Suite,Group,Config,Return,State).
+
+pre_end_per_group(Suite,Group,Config,State) ->
+    empty_cth:pre_end_per_group(Suite,Group,Config,State).
+
+post_end_per_group(Suite,Group,Config,Return,State) ->
+    empty_cth:post_end_per_group(Suite,Group,Config,Return,State).
+
+pre_init_per_testcase(Suite,TC,Config,State) ->
+    empty_cth:pre_init_per_testcase(Suite,TC,Config,State).
+
+post_init_per_testcase(Suite,TC,Config,Return,State) ->
+    empty_cth:post_init_per_testcase(Suite,TC,Config,Return,State).
+
+pre_end_per_testcase(Suite,TC,Config,State) ->
+    empty_cth:pre_end_per_testcase(Suite,TC,Config,State).
+
+post_end_per_testcase(Suite,TC,Config,Return,State) ->
+    empty_cth:post_end_per_testcase(Suite,TC,Config,Return,State).
+
+on_tc_fail(Suite,TC,Reason,State) ->
+    empty_cth:on_tc_fail(Suite,TC,Reason,State).
+
+on_tc_skip(Suite,TC,Reason,State) ->
+    empty_cth:on_tc_skip(Suite,TC,Reason,State).
+
+terminate(State) ->
+    empty_cth:terminate(State).
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_cth_update_result_post_end_tc_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_cth_update_result_post_end_tc_SUITE.erl
new file mode 100644
index 0000000000..a16138ce6f
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_cth_update_result_post_end_tc_SUITE.erl
@@ -0,0 +1,101 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-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(ct_cth_update_result_post_end_tc_SUITE).
+
+-compile(export_all).
+
+-include("ct.hrl").
+
+suite() ->
+    [{timetrap,{seconds,3}}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(Config) ->
+    ok.
+
+init_per_group(_,Config) ->
+    Config.
+
+end_per_group(_,_) ->
+    ok.
+
+init_per_testcase(_,Config) ->
+    Config.
+
+end_per_testcase(EndTimetrap,_) when EndTimetrap==end_timetrap_to_fail;
+                                     EndTimetrap==end_timetrap_to_skip->
+    timer:sleep(10000);
+end_per_testcase(EndFail,_) when EndFail==end_fail_to_fail;
+                                 EndFail==end_fail_to_skip->
+    ct:fail("change result when end fails");
+end_per_testcase(_,_) ->
+    ok.
+
+all() ->
+    [tc_ok_to_fail,
+     tc_ok_to_skip,
+     tc_fail_to_ok,
+     tc_fail_to_skip,
+     tc_timetrap_to_ok,
+     tc_timetrap_to_skip,
+     tc_skip_to_fail,
+     end_fail_to_fail,
+     end_fail_to_skip,
+     end_timetrap_to_fail,
+     end_timetrap_to_skip].
+
+%% Test cases starts here.
+tc_ok_to_fail(_Config) ->
+    ok.
+
+tc_ok_to_skip(_Config) ->
+    ok.
+
+tc_fail_to_ok(_Config) ->
+    ct:fail("should be changed to ok").
+
+tc_fail_to_skip(_Config) ->
+    ct:fail("should be changed to skip").
+
+tc_timetrap_to_ok(_Config) ->
+    timer:sleep(10000), % will time out after 3 sek
+    ok.
+
+tc_timetrap_to_skip(_Config) ->
+    timer:sleep(10000), % will time out after 3 sek
+    ok.
+
+tc_skip_to_fail(_Config) ->
+    {skip,"should be changed to fail"}.
+
+end_fail_to_fail(_Config) ->
+    ok.
+
+end_fail_to_skip(_Config) ->
+    ok.
+
+end_timetrap_to_fail(_Config) ->
+    ok.
+
+end_timetrap_to_skip(_Config) ->
+    ok.
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_fail_init_tc_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_fail_init_tc_SUITE.erl
new file mode 100644
index 0000000000..96ddfc5782
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_fail_init_tc_SUITE.erl
@@ -0,0 +1,49 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-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_fail_init_tc_SUITE).
+
+-suite_defaults([{timetrap, {minutes, 10}}]).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include("ct.hrl").
+
+%% Test server callback functions
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_testcase(TestCase, _Config) ->
+    ct:fail("Failed in init_per_testcase").
+
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+all() ->
+    [test_case].
+
+%% Test cases starts here.
+test_case(Config) when is_list(Config) ->
+    ok.
+
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_match_state_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_match_state_cth.erl
new file mode 100644
index 0000000000..38c9da903d
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_match_state_cth.erl
@@ -0,0 +1,58 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-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(ct_match_state_cth).
+
+
+-include_lib("common_test/src/ct_util.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+-compile(export_all).
+
+id(Opts) ->
+    empty_cth:id(Opts).
+
+post_groups(Suite, Groups) ->
+    empty_cth:post_groups(Suite, Groups).
+
+post_all(Suite, Tests, Groups) ->
+    empty_cth:post_all(Suite, Tests, Groups).
+
+init(Id, Opts) ->
+    empty_cth:init(Id, Opts),
+    {ok,mystate}.
+
+%% In the following, always match against the state value, to ensure
+%% that init has indeed been called before the rest of the hooks.
+pre_init_per_suite(Suite,Config,mystate) ->
+    empty_cth:pre_init_per_suite(Suite,Config,mystate).
+
+post_init_per_suite(Suite,Config,Return,mystate) ->
+    empty_cth:post_init_per_suite(Suite,Config,Return,mystate).
+
+pre_end_per_suite(Suite,Config,mystate) ->
+    empty_cth:pre_end_per_suite(Suite,Config,mystate).
+
+post_end_per_suite(Suite,Config,Return,mystate) ->
+    empty_cth:post_end_per_suite(Suite,Config,Return,mystate).
+
+terminate(mystate) ->
+    empty_cth:terminate(mystate).
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_suite_group_only_cth_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_suite_group_only_cth_SUITE.erl
new file mode 100644
index 0000000000..537c97d3f0
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_scope_suite_group_only_cth_SUITE.erl
@@ -0,0 +1,54 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-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_scope_suite_group_only_cth_SUITE).
+
+-suite_defaults([{timetrap, {minutes, 10}}]).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include("ct.hrl").
+
+%% Test server callback functions
+suite() ->
+    [{ct_hooks,[ct_match_state_cth]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+all() ->
+    [test_case].
+
+groups() ->
+    [{g1,[test_case]}].
+
+%% Test cases starts here.
+test_case(Config) when is_list(Config) ->
+    ok.
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
index c648367838..60488e84c6 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
@@ -39,6 +39,9 @@
 -export([id/1]).
 -export([init/2]).
 
+-export([post_all/3]).
+-export([post_groups/2]).
+
 -export([pre_init_per_suite/3]).
 -export([post_init_per_suite/4]).
 -export([pre_end_per_suite/3]).
@@ -71,6 +74,31 @@
 
 -record(state, { id = ?MODULE :: term()}).
 
+%% Called after groups/0.
+%% You can change the return value in this function.
+-spec post_groups(Suite :: atom(), Groups :: list()) -> list().
+post_groups(Suite,Groups) ->
+    gen_event:notify(
+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),
+			     data = {?MODULE, post_groups,
+				     [Suite,Groups]}}),
+    ct:log("~w:post_groups(~w) called", [?MODULE,Suite]),
+    Groups.
+
+%% Called after all/0.
+%% You can change the return value in this function.
+-spec post_all(Suite :: atom(),
+               Tests :: list(),
+               Groups :: term()) ->
+    list().
+post_all(Suite,Tests,Groups) ->
+    gen_event:notify(
+      ?CT_EVMGR_REF, #event{ name = cth, node = node(),
+			     data = {?MODULE, post_all,
+				     [Suite,Tests,Groups]}}),
+    ct:log("~w:post_all(~w) called", [?MODULE,Suite]),
+    Tests.
+
 %% Always called before any other callback function. Use this to initiate
 %% any common state. It should return an state for this CTH.
 -spec init(Id :: term(), Opts :: proplists:proplist()) ->
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/fail_post_init_tc_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/fail_post_init_tc_cth.erl
new file mode 100644
index 0000000000..ca9f05c40f
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/fail_post_init_tc_cth.erl
@@ -0,0 +1,81 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-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(fail_post_init_tc_cth).
+
+
+-include_lib("common_test/src/ct_util.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+
+%% CT Hooks
+-compile(export_all).
+
+init(Id, Opts) ->
+    empty_cth:init(Id, Opts).
+
+pre_init_per_suite(Suite, Config, State) ->
+    empty_cth:pre_init_per_suite(Suite,Config,State).
+
+post_init_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_init_per_suite(Suite,Config,Return,State).
+
+pre_end_per_suite(Suite,Config,State) ->
+    empty_cth:pre_end_per_suite(Suite,Config,State).
+
+post_end_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_end_per_suite(Suite,Config,Return,State).
+
+pre_init_per_group(Suite,Group,Config,State) ->
+    empty_cth:pre_init_per_group(Suite,Group,Config,State).
+
+post_init_per_group(Suite,Group,Config,Return,State) ->
+    empty_cth:post_init_per_group(Suite,Group,Config,Return,State).
+
+pre_end_per_group(Suite,Group,Config,State) ->
+    empty_cth:pre_end_per_group(Suite,Group,Config,State).
+
+post_end_per_group(Suite,Group,Config,Return,State) ->
+    empty_cth:post_end_per_group(Suite,Group,Config,Return,State).
+
+pre_init_per_testcase(Suite,TC,Config,State) ->
+    empty_cth:pre_init_per_testcase(Suite,TC,Config,State).
+
+post_init_per_testcase(Suite,TC,Config,{skip,_}=Return,State) ->
+    empty_cth:post_init_per_testcase(Suite,TC,Config,Return,State),
+    {{fail,"Changed skip to fail in post_init_per_testcase"},State};
+post_init_per_testcase(Suite,TC,Config,Return,State) ->
+    empty_cth:post_init_per_testcase(Suite,TC,Config,Return,State).
+
+pre_end_per_testcase(Suite,TC,Config,State) ->
+    empty_cth:pre_end_per_testcase(Suite,TC,Config,State).
+
+post_end_per_testcase(Suite,TC,Config,Return,State) ->
+    empty_cth:post_end_per_testcase(Suite,TC,Config,Return,State).
+
+on_tc_fail(Suite,TC, Reason, State) ->
+    empty_cth:on_tc_fail(Suite,TC,Reason,State).
+
+on_tc_skip(Suite,TC, Reason, State) ->
+    empty_cth:on_tc_skip(Suite,TC,Reason,State).
+
+terminate(State) ->
+    empty_cth:terminate(State).
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/update_result_post_end_tc_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/update_result_post_end_tc_cth.erl
new file mode 100644
index 0000000000..7afb3d8781
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/update_result_post_end_tc_cth.erl
@@ -0,0 +1,98 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-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(update_result_post_end_tc_cth).
+
+
+-include_lib("common_test/src/ct_util.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+
+%% CT Hooks
+-compile(export_all).
+
+init(Id, Opts) ->
+    empty_cth:init(Id, Opts).
+
+pre_init_per_suite(Suite, Config, State) ->
+    empty_cth:pre_init_per_suite(Suite,Config,State).
+
+post_init_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_init_per_suite(Suite,Config,Return,State).
+
+pre_end_per_suite(Suite,Config,State) ->
+    empty_cth:pre_end_per_suite(Suite,Config,State).
+
+post_end_per_suite(Suite,Config,Return,State) ->
+    empty_cth:post_end_per_suite(Suite,Config,Return,State).
+
+pre_init_per_group(Suite,Group,Config,State) ->
+    empty_cth:pre_init_per_group(Suite,Group,Config,State).
+
+post_init_per_group(Suite,Group,Config,Return,State) ->
+    empty_cth:post_init_per_group(Suite,Group,Config,Return,State).
+
+pre_end_per_group(Suite,Group,Config,State) ->
+    empty_cth:pre_end_per_group(Suite,Group,Config,State).
+
+post_end_per_group(Suite,Group,Config,Return,State) ->
+    empty_cth:post_end_per_group(Suite,Group,Config,Return,State).
+
+pre_init_per_testcase(Suite,TC,Config,State) ->
+    empty_cth:pre_init_per_testcase(Suite,TC,Config,State).
+
+post_end_per_testcase(Suite,TC,Config,Return,State) ->
+    empty_cth:post_end_per_testcase(Suite,TC,Config,Return,State),
+    change_result(TC,Config,State).
+
+on_tc_fail(Suite,TC, Reason, State) ->
+    empty_cth:on_tc_fail(Suite,TC,Reason,State).
+
+on_tc_skip(Suite,TC, Reason, State) ->
+    empty_cth:on_tc_skip(Suite,TC,Reason,State).
+
+terminate(State) ->
+    empty_cth:terminate(State).
+
+%%%-----------------------------------------------------------------
+%%% 
+change_result(tc_ok_to_fail,_Config,State) ->
+    {{fail, "Test failure"}, State};
+change_result(tc_ok_to_skip,_Config,State) ->
+    {{skip, "Test skipped"}, State};
+change_result(tc_fail_to_ok,Config,State) ->
+    {lists:keydelete(tc_status,1,Config),State};
+change_result(tc_fail_to_skip,Config,State) ->
+    {{skip,"Test skipped"},State};
+change_result(tc_timetrap_to_ok,Config,State) ->
+    {lists:keydelete(tc_status,1,Config),State};
+change_result(tc_timetrap_to_skip,Config,State) ->
+    {{skip,"Test skipped"},State};
+change_result(tc_skip_to_fail,_Config,State) ->
+    {{fail, "Test failure"}, State};
+change_result(end_fail_to_fail,_Config,State) ->
+    {{fail, "Test failure"}, State};
+change_result(end_fail_to_skip,_Config,State) ->
+    {{skip, "Test skipped"}, State};
+change_result(end_timetrap_to_fail,_Config,State) ->
+    {{fail, "Test failure"}, State};
+change_result(end_timetrap_to_skip,_Config,State) ->
+    {{skip, "Test skipped"}, State}.
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
index a2fa099a8c..69a7de1431 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
@@ -205,7 +205,7 @@ hello_required_exists(Config) ->
     SshDir = ?config(ssh_dir,Config),
     {ok,_Client1} = open_configured_success(my_named_connection,SshDir),
 
-    %% Check that same name can not be used twice
+    %% Check that same name cannot be used twice
     {error,{connection_exists,_Client1}} =
 	ct_netconfc:open(my_named_connection,[{user_dir,SshDir}]),
 
@@ -271,7 +271,7 @@ no_client_hello(Config) ->
 
     %% Tell server to receive a get request and then die without
     %% replying since no hello has been received. (is this correct
-    %% behavoiur??)
+    %% behaviour??)
     ?NS:expect_do(get,close),
     {error,closed} = ct_netconfc:get(Client,whatever),
     ok.
@@ -385,7 +385,7 @@ timeout_get(Config) ->
 %% received, the timeout message might already be sent when the timer
 %% is cancelled. This test checks that the timeout message is flushed
 %% from the message queue. If it isn't, the client crashes and the
-%% session can not be closed afterwards.
+%% session cannot be closed afterwards.
 %% Note that we can only hope that the test case triggers the problem
 %% every now and then, as it is very timing dependent...
 flush_timeout_get(Config) ->
@@ -440,6 +440,12 @@ edit_config(Config) ->
     ?ok = ct_netconfc:edit_config(Client,running,
 				  {server,[{xmlns,"myns"}],
 				   [{name,["myserver"]}]}),
+    ?NS:expect_reply('edit-config',ok),
+    ?ok = ct_netconfc:edit_config(Client,running,
+				  [{server,[{xmlns,"myns"}],
+                                    [{name,["server1"]}]},
+                                   {server,[{xmlns,"myns"}],
+                                    [{name,["server2"]}]}]),
     ?NS:expect_do_reply('close-session',close,ok),
     ?ok = ct_netconfc:close_session(Client),
     ok.
diff --git a/lib/common_test/test/ct_release_test_SUITE_data/release_test_SUITE.erl b/lib/common_test/test/ct_release_test_SUITE_data/release_test_SUITE.erl
index 7f0ba65791..fe69ad0748 100644
--- a/lib/common_test/test/ct_release_test_SUITE_data/release_test_SUITE.erl
+++ b/lib/common_test/test/ct_release_test_SUITE_data/release_test_SUITE.erl
@@ -47,7 +47,9 @@ end_per_suite(_Config) ->
 init_per_testcase(major_fail_no_init, Config) ->
     Config;
 init_per_testcase(_Case, Config) ->
-    ct_release_test:init(Config).
+    Config1 = ct_release_test:init(Config),
+    ct:log("ct_release_test:init/1 returned:~n~p",[Config1]),
+    Config1.
 end_per_testcase(_Case, Config) ->
     ct_release_test:cleanup(Config).
 
diff --git a/lib/common_test/test/ct_tc_repeat_SUITE.erl b/lib/common_test/test/ct_tc_repeat_SUITE.erl
new file mode 100644
index 0000000000..433b5456fe
--- /dev/null
+++ b/lib/common_test/test/ct_tc_repeat_SUITE.erl
@@ -0,0 +1,438 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2017. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% 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_tc_repeat_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).
+
+%%--------------------------------------------------------------------
+%% TEST SERVER CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% 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),
+    ct_test_support:init_per_suite([{path_dirs,[DataDir]} | Config]).
+
+end_per_suite(Config) ->
+    ct_test_support:end_per_suite(Config).
+
+init_per_testcase(TestCase, Config) ->
+    ct_test_support:init_per_testcase(TestCase, Config).
+
+end_per_testcase(TestCase, Config) ->
+    ct_test_support:end_per_testcase(TestCase, Config).
+
+
+suite() ->
+    [{timetrap,{minutes,1}}].
+
+all() ->
+    all(suite).
+
+all(suite) ->
+      [
+       repeat,
+       repeat_parallel_until_ok,
+       repeat_parallel_until_fail,
+       repeat_sequence_until_ok,
+       repeat_sequence_until_fail,
+       pick_one_test_from_group,
+       pick_one_test_from_subgroup
+      ].
+
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%%%-----------------------------------------------------------------
+%%% 
+%% Test post_groups and post_all hook callbacks, introduced by OTP-14746
+repeat(Config) ->
+    ok = do_test(?FUNCTION_NAME, "tc_repeat_SUITE", [], [], Config).
+
+repeat_parallel_until_ok(Config) ->
+    {error,{{illegal_combination,{parallel,repeat_until_ok}},_}} =
+        do_test(?FUNCTION_NAME, "tc_repeat_SUITE", [{group,g_parallel_until_ok}],
+                [], Config, 1, []).
+
+repeat_parallel_until_fail(Config) ->
+    {error,{{illegal_combination,{parallel,repeat_until_fail}},_}} =
+        do_test(?FUNCTION_NAME, "tc_repeat_SUITE", [{group,g_parallel_until_fail}],
+                [], Config, 1, []).
+
+repeat_sequence_until_ok(Config) ->
+    {error,{{illegal_combination,{sequence,repeat_until_ok}},_}} =
+        do_test(?FUNCTION_NAME, "tc_repeat_SUITE", [{group,g_sequence_until_ok}],
+                [], Config, 1, []).
+
+repeat_sequence_until_fail(Config) ->
+    {error,{{illegal_combination,{sequence,repeat_until_fail}},_}} =
+        do_test(?FUNCTION_NAME, "tc_repeat_SUITE", [{group,g_sequence_until_fail}],
+                [], Config, 1, []).
+
+pick_one_test_from_group(Config) ->
+    do_test(?FUNCTION_NAME, "tc_repeat_SUITE", [{group,g_mixed},{testcase,tc2}],
+            [], Config, 1, []).
+    
+pick_one_test_from_subgroup(Config) ->
+    do_test(?FUNCTION_NAME, "tc_repeat_SUITE",
+            [{group,[[g_mixed,subgroup]]},{testcase,tc2}],
+            [], Config, 1, []).
+    
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+
+do_test(Tag, Suite, WTT, CTHs, Config) ->
+    do_test(Tag, Suite, WTT, CTHs, Config, 2, []).
+
+do_test(Tag, Suite0, WTT, CTHs, Config, EC, ExtraOpts) ->
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join([DataDir,Suite0]),
+    {Opts,ERPid} =
+        setup([{suite,Suite}|WTT]++[{ct_hooks,CTHs},{label,Tag}|ExtraOpts],
+              Config),
+    Res = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+    %% io:format("~p~n",[Events]),
+
+    ct_test_support:log_events(Tag,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+
+    TestEvents = events_to_check(Tag, EC),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config),
+    Res.
+
+setup(Test, Config) ->
+    Opts0 = ct_test_support:get_opts(Config),
+    Level = ?config(trace_level, Config),
+    EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
+    Opts = Opts0 ++ [{event_handler,{?eh,EvHArgs}}|Test],
+    ERPid = ct_test_support:start_event_receiver(Config),
+    {Opts,ERPid}.
+
+reformat(Events, EH) ->
+    ct_test_support:reformat(Events, EH).
+
+gen_config(Name,KeyVals,Config) ->
+    PrivDir = ?config(priv_dir,Config),
+    File = filename:join(PrivDir,atom_to_list(Name)++".cfg"),
+    ok = file:write_file(File,[io_lib:format("~p.~n",[{Key,Value}])
+                               || {Key,Value} <- KeyVals]),
+    File.
+
+%%%-----------------------------------------------------------------
+%%% TEST EVENTS
+%%%-----------------------------------------------------------------
+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) ->
+    test_events(Test) ++ events_to_check(Test, N-1).
+
+test_events(repeat) ->
+    S = tc_repeat_SUITE,
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,unknown}},
+
+     %% tc1, {repeat,2}
+     {?eh,tc_start,{S,tc1}},
+     {?eh,tc_done,{S,tc1,ok}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     {?eh,tc_start,{S,tc1}},
+     {?eh,tc_done,{S,tc1,ok}},
+     {?eh,test_stats,{2,0,{0,0}}},
+     %% tc2, {repeat_until_ok,3}
+     {?eh,tc_start,{S,tc2}},
+     {?eh,tc_done,{S,tc2,ok}},
+     {?eh,test_stats,{3,0,{0,0}}},
+     %% tc3, {repeat_until_ok,3}
+     {?eh,tc_start,{S,tc3}},
+     {?eh,tc_done,{tc_repeat_SUITE,tc3,
+                   {failed,{error,{test_case_failed,always_fail}}}}},
+     {?eh,test_stats,{3,1,{0,0}}},
+     {?eh,tc_start,{S,tc3}},
+     {?eh,tc_done,{S,tc3,{failed,{error,{test_case_failed,always_fail}}}}},
+     {?eh,test_stats,{3,2,{0,0}}},
+     {?eh,tc_start,{S,tc3}},
+     {?eh,tc_done,{S,tc3,{failed,{error,{test_case_failed,always_fail}}}}},
+     {?eh,test_stats,{3,3,{0,0}}},
+     %% tc4, {repeat_until_fail,3}
+     {?eh,tc_start,{S,tc4}},
+     {?eh,tc_done,{S,tc4,ok}},
+     {?eh,test_stats,{4,3,{0,0}}},
+     {?eh,tc_start,{S,tc4}},
+     {?eh,tc_done,{S,tc4,{failed,{error,{test_case_failed,second_time_fail}}}}},
+     {?eh,test_stats,{4,4,{0,0}}},
+     %% g, tc1, {repeat,2}
+     {?eh,tc_start,{S,{init_per_group,g,[]}}},
+     {?eh,tc_done,{S,{init_per_group,g,[]},ok}},
+     {?eh,tc_start,{S,tc1}},
+     {?eh,tc_done,{S,tc1,ok}},
+     {?eh,test_stats,{5,4,{0,0}}},
+     {?eh,tc_start,{S,tc1}},
+     {?eh,tc_done,{S,tc1,ok}},
+     {?eh,test_stats,{6,4,{0,0}}},
+     {?eh,tc_start,{S,{end_per_group,g,[]}}},
+     {?eh,tc_done,{S,{end_per_group,g,[]},ok}},
+     %% g_until_ok, tc2, {repeat_until_ok,3}
+     {?eh,tc_start,{S,{init_per_group,g_until_ok,[]}}},
+     {?eh,tc_done,{S,{init_per_group,g_until_ok,[]},ok}},
+     {?eh,tc_start,{S,tc2}},
+     {?eh,tc_done,{S,tc2,ok}},
+     {?eh,test_stats,{7,4,{0,0}}},
+     {?eh,tc_start,{S,{end_per_group,g_until_ok,[]}}},
+     {?eh,tc_done,{S,{end_per_group,g_until_ok,[]},ok}},
+     %% g_until_fail, tc4, {repeat_until_fail,3}
+     {?eh,tc_start,{S,{init_per_group,g_until_fail,[]}}},
+     {?eh,tc_done,{S,{init_per_group,g_until_fail,[]},ok}},
+     {?eh,tc_start,{S,tc4}},
+     {?eh,tc_done,{S,tc4,ok}},
+     {?eh,test_stats,{8,4,{0,0}}},
+     {?eh,tc_start,{S,tc4}},
+     {?eh,tc_done,{S,tc4,{failed,{error,{test_case_failed,second_time_fail}}}}},
+     {?eh,test_stats,{8,5,{0,0}}},
+     {?eh,tc_start,{S,{end_per_group,g_until_fail,[]}}},
+     {?eh,tc_done,{S,{end_per_group,g_until_fail,[]},ok}},
+     %% g, parallel, tc1, {repeat,2}
+     {parallel,
+      [{?eh,tc_start,{S,{init_per_group,g,[parallel]}}},
+       {?eh,tc_done,{S,{init_per_group,g,[parallel]},ok}},
+       {?eh,tc_start,{S,tc1}},
+       {?eh,tc_done,{S,tc1,ok}},
+       {?eh,test_stats,{9,5,{0,0}}},
+       {?eh,tc_start,{S,tc1}},
+       {?eh,tc_done,{S,tc1,ok}},
+       {?eh,test_stats,{10,5,{0,0}}},
+       {?eh,tc_start,{S,{end_per_group,g,[parallel]}}},
+       {?eh,tc_done,{S,{end_per_group,g,[parallel]},ok}}]},
+     %% g, sequence, tc1, {repeat,2}
+     {?eh,tc_start,{S,{init_per_group,g,[sequence]}}},
+     {?eh,tc_done,{S,{init_per_group,g,[sequence]},ok}},
+     {?eh,tc_start,{S,tc1}},
+     {?eh,tc_done,{S,tc1,ok}},
+     {?eh,test_stats,{11,5,{0,0}}},
+     {?eh,tc_start,{S,tc1}},
+     {?eh,tc_done,{S,tc1,ok}},
+     {?eh,test_stats,{12,5,{0,0}}},
+     {?eh,tc_start,{S,{end_per_group,g,[sequence]}}},
+     {?eh,tc_done,{S,{end_per_group,g,[sequence]},ok}},
+     %% g_sequence_skip_rest, 
+     {?eh,tc_start,{S,{init_per_group,g_mixed,[sequence]}}},
+     {?eh,tc_done,{S,{init_per_group,g_mixed,[sequence]},ok}},
+     {?eh,tc_start,{S,tc1}},
+     {?eh,tc_done,{S,tc1,ok}},
+     {?eh,test_stats,{13,5,{0,0}}},
+     {?eh,tc_start,{S,tc1}},
+     {?eh,tc_done,{S,tc1,ok}},
+     {?eh,test_stats,{14,5,{0,0}}},
+     {?eh,tc_start,{S,tc4}},
+     {?eh,tc_done,{S,tc4,ok}},
+     {?eh,test_stats,{15,5,{0,0}}},
+     {?eh,tc_start,{S,tc4}},
+     {?eh,tc_done,{S,tc4,{failed,{error,{test_case_failed,second_time_fail}}}}},
+     {?eh,test_stats,{15,6,{0,0}}},
+     %% ----> fail in sequence, so skip rest
+     {?eh,tc_auto_skip,{S,{tc4,g_mixed}, % last of current repeat tc4
+                        {failed,{tc_repeat_SUITE,tc4}}}},
+     {?eh,test_stats,{15,6,{0,1}}},
+     {?eh,tc_auto_skip,{S,{tc1,g_mixed}, % single tc1
+                        {failed,{tc_repeat_SUITE,tc4}}}},
+     {?eh,test_stats,{15,6,{0,2}}},
+     {?eh,tc_auto_skip,{S,{tc1,g}, % group g, tc1, {repeat,2}
+                        {failed,{tc_repeat_SUITE,tc4}}}},
+     {?eh,test_stats,{15,6,{0,3}}},
+     {?eh,tc_auto_skip,{S,{tc1,subgroup}, % subgroup, single tc1
+                        {failed,{tc_repeat_SUITE,tc4}}}},
+     {?eh,test_stats,{15,6,{0,4}}},
+     {?eh,tc_auto_skip,{S,{tc2,subgroup}, % subgroup, tc2, {repeat,2}
+                        {failed,{tc_repeat_SUITE,tc4}}}},
+     {?eh,test_stats,{15,6,{0,5}}},
+     {?eh,tc_auto_skip,{S,{tc2,g_mixed}, % tc2, {repeat,2}
+                        {failed,{tc_repeat_SUITE,tc4}}}},
+     {?eh,test_stats,{15,6,{0,6}}},
+     {?eh,tc_auto_skip,{S,{tc2,g_mixed}, % single tc2
+                        {failed,{tc_repeat_SUITE,tc4}}}},
+     {?eh,test_stats,{15,6,{0,7}}},
+     {?eh,tc_auto_skip,{S,{tc1,g_mixed}, % tc1, {repeat,2}
+                        {failed,{tc_repeat_SUITE,tc4}}}},
+     {?eh,test_stats,{15,6,{0,8}}},
+     {?eh,tc_auto_skip,{S,{tc1,g_mixed}, % single tc1
+                        {failed,{tc_repeat_SUITE,tc4}}}},
+     {?eh,test_stats,{15,6,{0,9}}},
+     {?eh,tc_start,{S,{end_per_group,g_mixed,'_'}}},
+     {?eh,tc_done,{S,{end_per_group,g_mixed,'_'},ok}},
+     %% done
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(repeat_parallel_until_ok) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{'_',{init_per_group,g_parallel_until_ok,[parallel]}}},
+     {?eh,tc_done,{'_',{init_per_group,g_parallel_until_ok,[parallel]},ok}},
+     {?eh,severe_error,{{illegal_combination,{parallel,repeat_until_ok}},'_'}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(repeat_parallel_until_fail) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{'_',{init_per_group,g_parallel_until_fail,[parallel]}}},
+     {?eh,tc_done,{'_',{init_per_group,g_parallel_until_fail,[parallel]},ok}},
+     {?eh,severe_error,{{illegal_combination,{parallel,repeat_until_fail}},'_'}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(repeat_sequence_until_ok) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{'_',{init_per_group,g_sequence_until_ok,[sequence]}}},
+     {?eh,tc_done,{'_',{init_per_group,g_sequence_until_ok,[sequence]},ok}},
+     {?eh,severe_error,{{illegal_combination,{sequence,repeat_until_ok}},'_'}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(repeat_sequence_until_fail) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{'_',{init_per_group,g_sequence_until_fail,[sequence]}}},
+     {?eh,tc_done,{'_',{init_per_group,g_sequence_until_fail,[sequence]},ok}},
+     {?eh,severe_error,{{illegal_combination,{sequence,repeat_until_fail}},'_'}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(pick_one_test_from_group) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{'_',{init_per_group,g_mixed,[]}}},
+     {?eh,tc_done,{'_',{init_per_group,g_mixed,[]},ok}},
+     {negative,
+      {?eh,tc_start,{'_',tc1}},
+      {?eh,tc_start,{'_',tc2}}}, % single tc2
+     {?eh,tc_done,{'_',tc2,ok}},
+     {?eh,tc_start,{'_',tc2}}, % tc2, {repeat,2}
+     {?eh,tc_done,{'_',tc2,ok}},
+     {?eh,tc_start,{'_',tc2}},
+     {?eh,tc_done,{'_',tc2,ok}},
+     {negative,
+      {?eh,tc_start,{'_',tc1}},
+      {?eh,tc_start,{'_',{end_per_group,g_mixed,[]}}}},
+     {?eh,tc_done,{'_',{end_per_group,g_mixed,[]},ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(pick_one_test_from_subgroup) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{'_',{init_per_group,g_mixed,[]}}},
+     {?eh,tc_done,{'_',{init_per_group,g_mixed,[]},ok}},
+     {negative,
+      {?eh,tc_start,{'_',tc2}},
+      {?eh,tc_start,{'_',{init_per_group,subgroup,[]}}}},
+     {?eh,tc_done,{'_',{init_per_group,subgroup,[]},ok}},
+     {negative,
+      {?eh,tc_start,{'_',tc1}},
+      {?eh,tc_start,{'_',tc2}}}, % tc2, {repeat,2}
+     {?eh,tc_done,{'_',tc2,ok}},
+     {?eh,tc_start,{'_',tc2}},
+     {?eh,tc_done,{'_',tc2,ok}},
+     {negative,
+      {?eh,tc_start,{'_',tc1}},
+      {?eh,tc_start,{'_',{end_per_group,subgroup,[]}}}},
+     {?eh,tc_done,{'_',{end_per_group,subgroup,[]},ok}},
+     {negative,
+      {?eh,tc_start,{'_',tc2}},
+      {?eh,tc_start,{'_',{end_per_group,g_mixed,[]}}}},
+     {?eh,tc_done,{'_',{end_per_group,g_mixed,[]},ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(ok) ->
+    ok.
+
+%% test events help functions
+contains(List) ->
+    fun(Proplist) when is_list(Proplist) ->
+	    contains(List,Proplist)
+    end.
+
+contains([{not_in_order,List}|T],Rest) ->
+    contains_parallel(List,Rest),
+    contains(T,Rest);
+contains([{Ele,Pos}|T] = L,[H|T2]) ->
+    case element(Pos,H) of
+	Ele ->
+	    contains(T,T2);
+	_ ->
+	    contains(L,T2)
+    end;
+contains([Ele|T],[{Ele,_}|T2])->
+    contains(T,T2);
+contains([Ele|T],[Ele|T2])->
+    contains(T,T2);
+contains(List,[_|T]) ->
+    contains(List,T);
+contains([],_) ->
+    match.
+
+contains_parallel([Key | T], Elems) ->
+    contains([Key],Elems),
+    contains_parallel(T,Elems);
+contains_parallel([],_Elems) ->
+    match.
+
+not_contains(List) ->
+    fun(Proplist) when is_list(Proplist) ->
+	    [] = [Ele || {Ele,_} <- Proplist,
+			 Test <- List,
+			 Test =:= Ele]
+    end.
diff --git a/lib/common_test/test/ct_tc_repeat_SUITE_data/tc_repeat_SUITE.erl b/lib/common_test/test/ct_tc_repeat_SUITE_data/tc_repeat_SUITE.erl
new file mode 100644
index 0000000000..f5d960d12f
--- /dev/null
+++ b/lib/common_test/test/ct_tc_repeat_SUITE_data/tc_repeat_SUITE.erl
@@ -0,0 +1,85 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-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(tc_repeat_SUITE).
+
+-suite_defaults([{timetrap, {minutes, 10}}]).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include("ct.hrl").
+
+init_per_group(_Group,Config) ->
+    Config.
+
+end_per_group(_Group,Config) ->
+    ok.
+
+all() ->
+    [{testcase,tc1,[{repeat,2}]},
+     {testcase,tc2,[{repeat_until_ok,3}]},
+     {testcase,tc3,[{repeat_until_ok,3}]},
+     {testcase,tc4,[{repeat_until_fail,3}]},
+     {group,g},
+     {group,g_until_ok},
+     {group,g_until_fail},
+     {group,g,[parallel]},
+     {group,g,[sequence]},
+     {group,g_mixed,[sequence]}].
+
+groups() ->
+    [{g,[{testcase,tc1,[{repeat,2}]}]},
+     {g_until_ok,[{testcase,tc2,[{repeat_until_ok,3}]}]},
+     {g_until_fail,[{testcase,tc4,[{repeat_until_fail,3}]}]},
+     {g_parallel_until_ok,[parallel],[{testcase,tc2,[{repeat_until_ok,3}]}]},
+     {g_parallel_until_fail,[parallel],[{testcase,tc1,[{repeat_until_fail,2}]}]},
+     {g_sequence_until_ok,[sequence],[{testcase,tc2,[{repeat_until_ok,3}]}]},
+     {g_sequence_until_fail,[sequence],[{testcase,tc1,[{repeat_until_fail,2}]}]},
+     {g_mixed,[{testcase,tc1,[{repeat,2}]},
+               {testcase,tc4,[{repeat,3}]},
+               tc1,
+               {group,g},
+               {subgroup,[tc1,{testcase,tc2,[{repeat,2}]}]},
+               {testcase,tc2,[{repeat,2}]},
+               tc2,
+               {testcase,tc1,[{repeat,2}]},
+               tc1]}].
+
+%% Test cases starts here.
+tc1(_Config) ->
+    ok.
+
+tc2(_Config) ->
+    ok.
+
+tc3(_Config) ->
+    ct:fail(always_fail).
+
+tc4(Config) ->
+    case ?config(saved_config,Config) of
+        {tc4,_} ->
+            ct:fail(second_time_fail);
+        undefined ->
+            {save_config,Config}
+    end.
+
+tc5(_Config) ->
+    {skip,"just skip this"}.
diff --git a/lib/common_test/test/ct_telnet_SUITE.erl b/lib/common_test/test/ct_telnet_SUITE.erl
index a0089c9bc9..f71b7c370f 100644
--- a/lib/common_test/test/ct_telnet_SUITE.erl
+++ b/lib/common_test/test/ct_telnet_SUITE.erl
@@ -50,10 +50,10 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 groups() ->
-    [{legacy, [], [unix_telnet,own_server,timetrap]},
-     {raw,    [], [unix_telnet,own_server,timetrap]},
-     {html,   [], [unix_telnet,own_server]},
-     {silent, [], [unix_telnet,own_server]}].
+    [{legacy, [], [unix_telnet,own_server,faulty_regexp,timetrap]},
+     {raw,    [], [unix_telnet,own_server,faulty_regexp,timetrap]},
+     {html,   [], [unix_telnet,own_server,faulty_regexp]},
+     {silent, [], [unix_telnet,own_server,faulty_regexp]}].
 
 all() ->
     [
@@ -119,6 +119,12 @@ own_server(Config) ->
     all_tests_in_suite(own_server,"ct_telnet_own_server_SUITE",
 		       CfgFile,Config).
 
+faulty_regexp(Config) ->
+    CfgFile = "telnet.faulty_regexp." ++
+	atom_to_list(groupname(Config)) ++ ".cfg",
+    all_tests_in_suite(faulty_regexp,"ct_telnet_faulty_regexp_SUITE",
+		       CfgFile,Config).
+
 timetrap(Config) ->
     CfgFile = "telnet.timetrap." ++
 	atom_to_list(groupname(Config)) ++ ".cfg",
@@ -225,6 +231,31 @@ events_to_check(unix_telnet,Config) ->
     all_cases(ct_telnet_basic_SUITE,Config);
 events_to_check(own_server,Config) ->
     all_cases(ct_telnet_own_server_SUITE,Config);
+events_to_check(faulty_regexp,_Config) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,tc_done,
+      {ct_telnet_faulty_regexp_SUITE,expect_pattern,
+       {failed,
+        {error,{{bad_pattern,"invalid(pattern",{"missing )",15}},
+                {ct_telnet,expect,3}}}}}},
+     {?eh,tc_done,
+      {ct_telnet_faulty_regexp_SUITE,expect_pattern_no_string,
+       {failed,
+        {error,{{bad_pattern,invalid_pattern},
+                {ct_telnet,expect,3}}}}}},
+     {?eh,tc_done,
+      {ct_telnet_faulty_regexp_SUITE,expect_tag_pattern,
+       {failed,
+        {error,{{bad_pattern,{tag,"invalid(pattern"},{"missing )",15}},
+                {ct_telnet,expect,3}}}}}},
+     {?eh,tc_done,
+      {ct_telnet_faulty_regexp_SUITE,expect_tag_pattern_no_string,
+       {failed,
+        {error,{{bad_pattern,{tag,invalid_pattern}},
+                {ct_telnet,expect,3}}}}}},
+     {?eh,tc_done,{ct_telnet_faulty_regexp_SUITE,expect_pattern_unicode,ok}},
+     {?eh,tc_done,{ct_telnet_faulty_regexp_SUITE,expect_tag_pattern_unicode,ok}},
+     {?eh,stop_logging,[]}];
 events_to_check(timetrap,_Config) ->
     [{?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,tc_done,{ct_telnet_timetrap_SUITE,expect_timetrap,
diff --git a/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_faulty_regexp_SUITE.erl b/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_faulty_regexp_SUITE.erl
new file mode 100644
index 0000000000..a5c9451a9c
--- /dev/null
+++ b/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_faulty_regexp_SUITE.erl
@@ -0,0 +1,79 @@
+-module(ct_telnet_faulty_regexp_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+-define(name, telnet_server_conn1).
+
+%%--------------------------------------------------------------------
+%% TEST SERVER CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+suite() -> [{require,?name,{unix,[telnet]}},
+	    {require,ct_conn_log},
+ 	    {ct_hooks, [{cth_conn_log,[]}]}].
+
+all() ->
+    [expect_pattern,
+     expect_pattern_no_string,
+     expect_tag_pattern,
+     expect_tag_pattern_no_string,
+     expect_pattern_unicode,
+     expect_tag_pattern_unicode].
+
+groups() ->
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+init_per_testcase(_,Config) ->
+    ct:log("init_per_testcase: opening telnet connection...",[]),
+    {ok,_} = ct_telnet:open(?name),
+    ct:log("...done",[]),
+    Config.
+
+end_per_testcase(_,_Config) ->
+    ct:log("end_per_testcase: closing telnet connection...",[]),
+    _ = ct_telnet:close(?name),
+    ct:log("...done",[]),
+    ok.
+
+expect_pattern(_) ->
+    ok = ct_telnet:send(?name, "echo ayt"),
+    ok = ct_telnet:expect(?name, "invalid(pattern").
+
+expect_pattern_no_string(_) ->
+    ok = ct_telnet:send(?name, "echo ayt"),
+    ok = ct_telnet:expect(?name, invalid_pattern).
+
+expect_tag_pattern(_) ->
+    ok = ct_telnet:send(?name, "echo ayt"),
+    ok = ct_telnet:expect(?name, {tag,"invalid(pattern"}).
+
+expect_tag_pattern_no_string(_) ->
+    ok = ct_telnet:send(?name, "echo ayt"),
+    ok = ct_telnet:expect(?name, {tag,invalid_pattern}).
+
+%% Test that a unicode pattern can be given without the testcase
+%% failing.  Do however notice that there is no real unicode support
+%% in ct_telnet yet, that is, the telnet binary mode is not supported.
+expect_pattern_unicode(_) ->
+    ok = ct_telnet:send(?name, "echo ayt"),
+    {error,{prompt,_}} = ct_telnet:expect(?name, "pattern_with_unicode_αβ"),
+    ok.
+
+expect_tag_pattern_unicode(_) ->
+    ok = ct_telnet:send(?name, "echo ayt"),
+    {error,{prompt,_}} = ct_telnet:expect(?name, "pattern_with_unicode_αβ"),
+    ok.
diff --git a/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_own_server_SUITE.erl b/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_own_server_SUITE.erl
index 985fa40ad2..34df57027e 100644
--- a/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_own_server_SUITE.erl
+++ b/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_own_server_SUITE.erl
@@ -58,7 +58,8 @@ all() ->
      server_speaks,
      server_disconnects,
      newline_ayt,
-     newline_break
+     newline_break,
+     newline_string
     ].
 
 groups() ->
@@ -393,3 +394,11 @@ newline_break(_) ->
     "> " = lists:flatten(R),
     ok = ct_telnet:close(Handle),
     ok.
+
+%% Test option {newline,String} to specify an own newline, e.g. "\r\n"
+newline_string(_) ->
+    {ok, Handle} = ct_telnet:open(telnet_server_conn1),
+    ok = ct_telnet:send(Handle, "echo hello-", [{newline,"own_nl\n"}]),
+    {ok,["hello-own_nl"]} = ct_telnet:expect(Handle, ["hello-own_nl"]),
+    ok = ct_telnet:close(Handle),
+    ok.
diff --git a/lib/common_test/test/ct_util_SUITE.erl b/lib/common_test/test/ct_util_SUITE.erl
new file mode 100644
index 0000000000..1d773855da
--- /dev/null
+++ b/lib/common_test/test/ct_util_SUITE.erl
@@ -0,0 +1,490 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2017. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% 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_util_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).
+
+%%--------------------------------------------------------------------
+%% TEST SERVER CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% 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")),
+    io:format("CTHs: ~p",[CTHs]),
+    [io:format("Compiling ~p: ~p",
+	    [FileName,compile:file(FileName,[{outdir,DataDir},debug_info])]) ||
+	FileName <- CTHs],
+    ct_test_support:init_per_suite([{path_dirs,[DataDir]} | Config]).
+
+end_per_suite(Config) ->
+    ct_test_support:end_per_suite(Config).
+
+init_per_testcase(TestCase, Config) ->
+    ct_test_support:init_per_testcase(TestCase, Config).
+
+end_per_testcase(TestCase, Config) ->
+    ct_test_support:end_per_testcase(TestCase, Config).
+
+
+suite() ->
+    [{timetrap,{minutes,1}}].
+
+all() ->
+    all(suite).
+
+all(suite) ->
+      [
+       pre_init_per_suite,
+       post_init_per_suite,
+       pre_end_per_suite,
+       post_end_per_suite,
+       pre_init_per_group,
+       post_init_per_group,
+       pre_end_per_group,
+       post_end_per_group,
+       pre_init_per_testcase,
+       post_init_per_testcase,
+       pre_end_per_testcase,
+       post_end_per_testcase
+      ].
+
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%%%-----------------------------------------------------------------
+%%% 
+pre_init_per_suite(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,
+                         [{pre_init_per_suite,
+                           {curr_tc_SUITE,kill}}],
+                         Config),
+    ok = do_test(?FUNCTION_NAME,
+                 "curr_tc_SUITE.erl",
+                 [{ct_hooks,[ct_util_cth]},{config,CfgFile}],
+                 Config).
+    
+post_init_per_suite(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,
+                         [{post_init_per_suite,
+                           {curr_tc_SUITE,kill}}],
+                         Config),
+    ok = do_test(?FUNCTION_NAME,
+                 "curr_tc_SUITE.erl",
+                 [{ct_hooks,[ct_util_cth]},{config,CfgFile}],
+                 Config).
+    
+pre_end_per_suite(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,
+                         [{pre_end_per_suite,
+                           {curr_tc_SUITE,kill}}],
+                         Config),
+    ok = do_test(?FUNCTION_NAME,
+                 "curr_tc_SUITE.erl",
+                 [{ct_hooks,[ct_util_cth]},{config,CfgFile}],
+                 Config).
+    
+post_end_per_suite(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,
+                         [{post_end_per_suite,
+                           {curr_tc_SUITE,kill}}],
+                         Config),
+    ok = do_test(?FUNCTION_NAME,
+                 "curr_tc_SUITE.erl",
+                 [{ct_hooks,[ct_util_cth]},{config,CfgFile}],
+                 Config).
+    
+
+pre_init_per_group(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,
+                         [{pre_init_per_group,
+                           {curr_tc_SUITE,g,kill}}],
+                         Config),
+    ok = do_test(?FUNCTION_NAME,
+                 "curr_tc_SUITE.erl",
+                 [{ct_hooks,[ct_util_cth]},{config,CfgFile}],
+                 Config).
+
+post_init_per_group(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,
+                         [{post_init_per_group,
+                           {curr_tc_SUITE,g,kill}}],
+                         Config),
+    ok = do_test(?FUNCTION_NAME,
+                 "curr_tc_SUITE.erl",
+                 [{ct_hooks,[ct_util_cth]},{config,CfgFile}],
+                 Config).
+
+pre_end_per_group(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,
+                         [{pre_end_per_group,
+                           {curr_tc_SUITE,g,kill}}],
+                         Config),
+    ok = do_test(?FUNCTION_NAME,
+                 "curr_tc_SUITE.erl",
+                 [{ct_hooks,[ct_util_cth]},{config,CfgFile}],
+                 Config).
+
+post_end_per_group(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,
+                         [{post_end_per_group,
+                           {curr_tc_SUITE,g,kill}}],
+                         Config),
+    ok = do_test(?FUNCTION_NAME,
+                 "curr_tc_SUITE.erl",
+                 [{ct_hooks,[ct_util_cth]},{config,CfgFile}],
+                 Config).
+
+pre_init_per_testcase(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,
+                         [{pre_init_per_testcase,
+                           {curr_tc_SUITE,tc1,kill}}],
+                         Config),
+    ok = do_test(?FUNCTION_NAME,
+                 "curr_tc_SUITE.erl",
+                 [{ct_hooks,[ct_util_cth]},{config,CfgFile}],
+                 Config).
+
+post_init_per_testcase(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,
+                         [{post_init_per_testcase,
+                           {curr_tc_SUITE,tc1,{timeout,5000}}}],
+                         Config),
+    ok = do_test(?FUNCTION_NAME,
+                 "curr_tc_SUITE.erl",
+                 [{ct_hooks,[ct_util_cth]},{config,CfgFile}],
+                 Config).
+
+pre_end_per_testcase(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,
+                         [{pre_end_per_testcase,
+                           {curr_tc_SUITE,tc1,{timeout,5000}}}],
+                         Config),
+    ok = do_test(?FUNCTION_NAME,
+                 "curr_tc_SUITE.erl",
+                 [{ct_hooks,[ct_util_cth]},{config,CfgFile}],
+                 Config).
+
+post_end_per_testcase(Config) ->
+    CfgFile = gen_config(?FUNCTION_NAME,
+                         [{post_end_per_testcase,
+                           {curr_tc_SUITE,tc1,kill}}],
+                         Config),
+    ok = do_test(?FUNCTION_NAME,
+                 "curr_tc_SUITE.erl",
+                 [{ct_hooks,[ct_util_cth]},{config,CfgFile}],
+                 Config).
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+
+do_test(Tag, Suite, RunTestArgs, Config) ->
+    do_test(Tag, Suite, RunTestArgs, Config, 2).
+
+do_test(Tag, Suite0, RunTestArgs, Config, EC) ->
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join([DataDir,Suite0]),
+    {Opts,ERPid} = setup([{suite,Suite}]++[{label,Tag}|RunTestArgs],Config),
+    Res = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+    %% io:format("~p~n",[Events]),
+
+    ct_test_support:log_events(Tag,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+
+    TestEvents = events_to_check(Tag, EC),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config),
+    Res.
+
+setup(Test, Config) ->
+    Opts0 = ct_test_support:get_opts(Config),
+    Level = ?config(trace_level, Config),
+    EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
+    Opts = Opts0 ++ [{event_handler,{?eh,EvHArgs}}|Test],
+    ERPid = ct_test_support:start_event_receiver(Config),
+    {Opts,ERPid}.
+
+reformat(Events, EH) ->
+    ct_test_support:reformat(Events, EH).
+
+gen_config(Name,KeyVals,Config) ->
+    PrivDir = ?config(priv_dir,Config),
+    File = filename:join(PrivDir,atom_to_list(Name)++".cfg"),
+    ok = file:write_file(File,[io_lib:format("~p.~n",[{Key,Value}])
+                               || {Key,Value} <- KeyVals]),
+    File.
+
+%%%-----------------------------------------------------------------
+%%% TEST EVENTS
+%%%-----------------------------------------------------------------
+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) ->
+    test_events(Test) ++ events_to_check(Test, N-1).
+
+test_events(IPS) when IPS=:=pre_init_per_suite; IPS=:=post_init_per_suite ->
+    S = curr_tc_SUITE,
+    FwFunc =
+        case IPS of
+            pre_init_per_suite -> init_tc;
+            post_init_per_suite -> end_tc
+        end,
+    E = {failed,{ct_framework,FwFunc,{test_case_failed,hahahahahah}}},
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,4}},
+     {?eh,tc_start,{S,init_per_suite}},
+     {?eh,tc_done,{S,init_per_suite,E}},
+     {?eh,tc_auto_skip,{S,tc1,{failed,{S,init_per_suite,E}}}},
+     {?eh,tc_auto_skip,{S,tc2,{failed,{S,init_per_suite,E}}}},
+     {?eh,tc_auto_skip,{S,{tc1,g},{failed,{S,init_per_suite,E}}}},
+     {?eh,tc_auto_skip,{S,{tc2,g},{failed,{S,init_per_suite,E}}}},
+     {?eh,test_stats,{0,0,{0,4}}},
+     {?eh,tc_auto_skip,{S,end_per_suite,{failed,{S,init_per_suite,E}}}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(EPS) when EPS=:=pre_end_per_suite; EPS=:=post_end_per_suite ->
+    S = curr_tc_SUITE,
+    FwFunc =
+        case EPS of
+            pre_end_per_suite -> init_tc;
+            post_end_per_suite -> end_tc
+        end,
+    E = {failed,{ct_framework,FwFunc,{test_case_failed,hahahahahah}}},
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,4}},
+     {?eh,tc_start,{S,init_per_suite}},
+     {?eh,tc_done,{S,init_per_suite,ok}},
+     {?eh,tc_start,{S,tc1}},
+     {?eh,tc_done,{S,tc1,ok}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     {?eh,tc_start,{S,tc2}},
+     {?eh,tc_done,{S,tc2,ok}},
+     {?eh,test_stats,{2,0,{0,0}}},
+     [{?eh,tc_start,{S,{init_per_group,g,[]}}},
+      {?eh,tc_done,{S,{init_per_group,g,[]},ok}},
+      {?eh,tc_start,{S,tc1}},
+      {?eh,tc_done,{S,tc1,ok}},
+      {?eh,test_stats,{3,0,{0,0}}},
+      {?eh,tc_start,{S,tc2}},
+      {?eh,tc_done,{S,tc2,ok}},
+      {?eh,test_stats,{4,0,{0,0}}},
+      {?eh,tc_start,{S,{end_per_group,g,[]}}},
+      {?eh,tc_done,{S,{end_per_group,g,[]},ok}}],
+     {?eh,tc_start,{S,end_per_suite}},
+     {?eh,tc_done,{S,end_per_suite,E}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(IPG) when IPG=:=pre_init_per_group; IPG=:=post_init_per_group ->
+    S = curr_tc_SUITE,
+    FwFunc =
+        case IPG of
+            pre_init_per_group -> init_tc;
+            post_init_per_group -> end_tc
+        end,
+    E = {failed,{ct_framework,FwFunc,{test_case_failed,hahahahahah}}},
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,4}},
+     {?eh,tc_start,{S,init_per_suite}},
+     {?eh,tc_done,{S,init_per_suite,ok}},
+     {?eh,tc_start,{S,tc1}},
+     {?eh,tc_done,{S,tc1,ok}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     {?eh,tc_start,{S,tc2}},
+     {?eh,tc_done,{S,tc2,ok}},
+     {?eh,test_stats,{2,0,{0,0}}},
+     [{?eh,tc_start,{S,{init_per_group,g,[]}}},
+      {?eh,tc_done,{S,{init_per_group,g,[]},E}},
+      {?eh,tc_auto_skip,{S,{tc1,g},{failed,{S,init_per_group,E}}}},
+      {?eh,tc_auto_skip,{S,{tc2,g},{failed,{S,init_per_group,E}}}},
+      {?eh,test_stats,{2,0,{0,2}}},
+      {?eh,tc_auto_skip,{S,{end_per_group,g},{failed,{S,init_per_group,E}}}}],
+     {?eh,tc_start,{S,end_per_suite}},
+     {?eh,tc_done,{S,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(EPG) when EPG=:=pre_end_per_group; EPG=:=post_end_per_group ->
+    S = curr_tc_SUITE,
+    FwFunc =
+        case EPG of
+            pre_end_per_group -> init_tc;
+            post_end_per_group -> end_tc
+        end,
+    E = {failed,{ct_framework,FwFunc,{test_case_failed,hahahahahah}}},
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,4}},
+     {?eh,tc_start,{S,init_per_suite}},
+     {?eh,tc_done,{S,init_per_suite,ok}},
+     {?eh,tc_start,{S,tc1}},
+     {?eh,tc_done,{S,tc1,ok}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     {?eh,tc_start,{S,tc2}},
+     {?eh,tc_done,{S,tc2,ok}},
+     {?eh,test_stats,{2,0,{0,0}}},
+     [{?eh,tc_start,{S,{init_per_group,g,[]}}},
+      {?eh,tc_done,{S,{init_per_group,g,[]},ok}},
+      {?eh,tc_start,{S,tc1}},
+      {?eh,tc_done,{S,tc1,ok}},
+      {?eh,test_stats,{3,0,{0,0}}},
+      {?eh,tc_start,{S,tc2}},
+      {?eh,tc_done,{S,tc2,ok}},
+      {?eh,test_stats,{4,0,{0,0}}},
+      {?eh,tc_start,{S,{end_per_group,g,[]}}},
+      {?eh,tc_done,{S,{end_per_group,g,[]},E}}],
+     {?eh,tc_start,{S,end_per_suite}},
+     {?eh,tc_done,{S,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(IPTC) when IPTC=:=pre_init_per_testcase;
+                       IPTC=:=post_init_per_testcase ->
+    S = curr_tc_SUITE,
+    E = case IPTC of
+            pre_init_per_testcase ->
+                {failed,{ct_framework,init_tc,{test_case_failed,hahahahahah}}};
+            post_init_per_testcase ->
+                {failed,{ct_framework,end_tc,{timetrap,3000}}}
+        end,
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,4}},
+     {?eh,tc_start,{S,init_per_suite}},
+     {?eh,tc_done,{S,init_per_suite,ok}},
+     {?eh,tc_start,{S,tc1}},
+     {?eh,tc_done,{S,tc1,{auto_skipped,E}}},
+     {?eh,test_stats,{0,0,{0,1}}},
+     {?eh,tc_start,{S,tc2}},
+     {?eh,tc_done,{S,tc2,ok}},
+     {?eh,test_stats,{1,0,{0,1}}},
+     [{?eh,tc_start,{S,{init_per_group,g,[]}}},
+      {?eh,tc_done,{S,{init_per_group,g,[]},ok}},
+      {?eh,tc_start,{S,tc1}},
+      {?eh,tc_done,{S,tc1,{auto_skipped,E}}},
+      {?eh,test_stats,{1,0,{0,2}}},
+      {?eh,tc_start,{S,tc2}},
+      {?eh,tc_done,{S,tc2,ok}},
+      {?eh,test_stats,{2,0,{0,2}}},
+      {?eh,tc_start,{S,{end_per_group,g,[]}}},
+      {?eh,tc_done,{S,{end_per_group,g,[]},ok}}],
+     {?eh,tc_start,{S,end_per_suite}},
+     {?eh,tc_done,{S,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
+test_events(EPTC) when EPTC=:=pre_end_per_testcase; EPTC=:=post_end_per_testcase->
+    S = curr_tc_SUITE,
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,4}},
+     {?eh,tc_start,{S,tc1}},
+     {?eh,tc_done,{S,tc1,ok}},
+     {?eh,test_stats,{1,0,{0,0}}},
+     {?eh,tc_start,{S,tc2}},
+     {?eh,tc_done,{S,tc2,ok}},
+     {?eh,test_stats,{2,0,{0,0}}},
+     [{?eh,tc_start,{S,{init_per_group,g,[]}}},
+      {?eh,tc_done,{S,{init_per_group,g,[]},ok}},
+      {?eh,tc_start,{S,tc1}},
+      {?eh,tc_done,{S,tc1,ok}},
+      {?eh,test_stats,{3,0,{0,0}}},
+      {?eh,tc_start,{S,tc2}},
+      {?eh,tc_done,{S,tc2,ok}},
+      {?eh,test_stats,{4,0,{0,0}}},
+      {?eh,tc_start,{S,{end_per_group,g,[]}}},
+      {?eh,tc_done,{S,{end_per_group,g,[]},ok}}],
+     {?eh,tc_start,{S,end_per_suite}},
+     {?eh,tc_done,{S,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ].
+
+%% test events help functions
+contains(List) ->
+    fun(Proplist) when is_list(Proplist) ->
+	    contains(List,Proplist)
+    end.
+
+contains([{not_in_order,List}|T],Rest) ->
+    contains_parallel(List,Rest),
+    contains(T,Rest);
+contains([{Ele,Pos}|T] = L,[H|T2]) ->
+    case element(Pos,H) of
+	Ele ->
+	    contains(T,T2);
+	_ ->
+	    contains(L,T2)
+    end;
+contains([Ele|T],[{Ele,_}|T2])->
+    contains(T,T2);
+contains([Ele|T],[Ele|T2])->
+    contains(T,T2);
+contains(List,[_|T]) ->
+    contains(List,T);
+contains([],_) ->
+    match.
+
+contains_parallel([Key | T], Elems) ->
+    contains([Key],Elems),
+    contains_parallel(T,Elems);
+contains_parallel([],_Elems) ->
+    match.
+
+not_contains(List) ->
+    fun(Proplist) when is_list(Proplist) ->
+	    [] = [Ele || {Ele,_} <- Proplist,
+			 Test <- List,
+			 Test =:= Ele]
+    end.
diff --git a/lib/common_test/test/ct_util_SUITE_data/ct_util_cth.erl b/lib/common_test/test/ct_util_SUITE_data/ct_util_cth.erl
new file mode 100644
index 0000000000..34c1568a87
--- /dev/null
+++ b/lib/common_test/test/ct_util_SUITE_data/ct_util_cth.erl
@@ -0,0 +1,105 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-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(ct_util_cth).
+
+
+-include_lib("common_test/src/ct_util.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+%% Send a cth_error event if a callback is called with unexpected arguments
+
+%% CT Hooks
+-compile(export_all).
+
+id(Opts) ->
+    erlang:system_time(second).
+
+init(Id, Opts) ->
+    {ok,ok}.
+
+pre_init_per_suite(Suite,Config,State) ->
+    maybe_sleep(?FUNCTION_NAME,Suite),
+    {Config, State}.
+
+post_init_per_suite(Suite,Config,Return,State) ->
+    maybe_sleep(?FUNCTION_NAME,Suite),
+    {Return, State}.
+
+pre_end_per_suite(Suite,Config,State) ->
+    maybe_sleep(?FUNCTION_NAME,Suite),
+    {Config, State}.
+
+post_end_per_suite(Suite,Config,Return,State) ->
+    maybe_sleep(?FUNCTION_NAME,Suite),
+    {Return, State}.
+
+pre_init_per_group(Suite, Group, Config, State) ->
+    maybe_sleep(?FUNCTION_NAME,Suite,Group),
+    {Config,State}.
+
+post_init_per_group(Suite, Group, Config,Return,State) ->
+    maybe_sleep(?FUNCTION_NAME,Suite,Group),
+    {Return,State}.
+
+pre_end_per_group(Suite, Group, Config, State) ->
+    maybe_sleep(?FUNCTION_NAME,Suite,Group),
+    {Config,State}.
+
+post_end_per_group(Suite, Group, Config,Return,State) ->
+    maybe_sleep(?FUNCTION_NAME,Suite,Group),
+    {Return,State}.
+
+pre_init_per_testcase(Suite, TC, Config, State) ->
+    maybe_sleep(?FUNCTION_NAME,Suite,TC),
+    {Config,State}.
+
+post_init_per_testcase(Suite, TC, Config,Return,State) ->
+    maybe_sleep(?FUNCTION_NAME,Suite,TC),
+    {Return,State}.
+
+pre_end_per_testcase(Suite, TC, Config, State) ->
+    maybe_sleep(?FUNCTION_NAME,Suite,TC),
+    {Config,State}.
+
+post_end_per_testcase(Suite, TC, Config,Return,State) ->
+    maybe_sleep(?FUNCTION_NAME,Suite,TC),
+    {Return,State}.
+
+%%%-----------------------------------------------------------------
+maybe_sleep(FuncName,Suite) ->
+    maybe_sleep(FuncName,Suite,undefined).
+maybe_sleep(FuncName,Suite,GroupOrTC) ->
+    case ct:get_config(FuncName) of
+        {Suite,GroupOrTC,Fail} ->
+            fail(Fail);
+        {Suite,Fail} when GroupOrTC=:=undefined ->
+            fail(Fail);
+        _ ->
+            ok
+    end.
+
+fail({timeout,T}) ->
+    timer:sleep(T);
+fail(kill) ->
+    spawn_link(fun() -> ct:fail(hahahahahah) end),
+    timer:sleep(10000).
+
diff --git a/lib/common_test/test/ct_util_SUITE_data/curr_tc_SUITE.erl b/lib/common_test/test/ct_util_SUITE_data/curr_tc_SUITE.erl
new file mode 100644
index 0000000000..b48ba4d24e
--- /dev/null
+++ b/lib/common_test/test/ct_util_SUITE_data/curr_tc_SUITE.erl
@@ -0,0 +1,59 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-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(curr_tc_SUITE).
+
+-suite_defaults([{timetrap, {seconds, 3}}]).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include("ct.hrl").
+
+init_per_suite(Config) ->
+    [{?MODULE,?FUNCTION_NAME}] = ct_util:get_testdata(curr_tc),
+    Config.
+
+end_per_suite(Config) ->
+    [{?MODULE,?FUNCTION_NAME}] = ct_util:get_testdata(curr_tc),
+    ok.
+
+init_per_group(_Group,Config) ->
+    [{?MODULE,?FUNCTION_NAME}] = ct_util:get_testdata(curr_tc),
+    Config.
+
+end_per_group(_Group,Config) ->
+    [{?MODULE,?FUNCTION_NAME}] = ct_util:get_testdata(curr_tc),
+    ok.
+
+all() ->
+    [tc1,tc2,{group,g}].
+
+groups() ->
+    [{g,[tc1,tc2]}].
+
+%% Test cases starts here.
+tc1(_Config) ->
+    [{?MODULE,?FUNCTION_NAME}] = ct_util:get_testdata(curr_tc),
+    ok.
+
+tc2(_Config) ->
+    [{?MODULE,?FUNCTION_NAME}] = ct_util:get_testdata(curr_tc),
+    ok.
diff --git a/lib/common_test/test/test_server_SUITE.erl b/lib/common_test/test/test_server_SUITE.erl
index 05737cfac9..6e52f24025 100644
--- a/lib/common_test/test/test_server_SUITE.erl
+++ b/lib/common_test/test/test_server_SUITE.erl
@@ -260,7 +260,7 @@ translate_filename(Filename,EncodingOnTestNode) ->
     end.
 
 get_latest_run_dir(Dir) ->
-    %% For the time being, filelib:wildcard can not take a binary
+    %% For the time being, filelib:wildcard cannot take a binary
     %% argument, so we avoid using this here.
     case file:list_dir(Dir) of
 	{ok,Files} ->
@@ -315,7 +315,7 @@ generate_and_run_unicode_test(Config0,Encoding) ->
     DataDir = ?config(data_dir,Config0),
     Suite = create_unicode_test_suite(DataDir,Encoding),
 
-    %% We can not run this test on default node since it must be
+    %% We cannot run this test on default node since it must be
     %% started with correct file name mode (+fnu/+fnl).
     %% OBS: the node are stopped by end_per_testcase/2
     Config1 = lists:keydelete(node,1,Config0),
diff --git a/lib/common_test/test/test_server_test_lib.erl b/lib/common_test/test/test_server_test_lib.erl
index 9ee946af0b..58b3aaee9b 100644
--- a/lib/common_test/test/test_server_test_lib.erl
+++ b/lib/common_test/test/test_server_test_lib.erl
@@ -22,7 +22,7 @@
 -export([parse_suite/1]).
 -export([init/2, pre_init_per_testcase/3, post_end_per_testcase/4]).
 
-%% for test_server_SUITE when node can not be started as slave
+%% for test_server_SUITE when node cannot be started as slave
 -export([prepare_tester_node/2]).
 
 -include("test_server_test_lib.hrl").
diff --git a/lib/common_test/test_server/configure.in b/lib/common_test/test_server/configure.in
index 0511d126b4..a32d050081 100644
--- a/lib/common_test/test_server/configure.in
+++ b/lib/common_test/test_server/configure.in
@@ -171,7 +171,7 @@ case $system in
 	fi
 	SHLIB_EXTRACT_ALL=""
 	;;
-    *-openbsd*)
+    *-openbsd*|*-netbsd*|*-freebsd*|*-dragonfly*)
 	# Not available on all versions:  check for include file.
 	AC_CHECK_HEADER(dlfcn.h, [
 	    SHLIB_CFLAGS="-fpic"
@@ -194,29 +194,6 @@ case $system in
 	])
 	SHLIB_EXTRACT_ALL=""
 	;;
-    *-netbsd*|*-freebsd*|*-dragonfly*)
-	# Not available on all versions:  check for include file.
-	AC_CHECK_HEADER(dlfcn.h, [
-	    SHLIB_CFLAGS="-fpic"
-	    SHLIB_LD="ld"
-	    SHLIB_LDFLAGS="$LDFLAGS -Bshareable -x"
-	    SHLIB_SUFFIX=".so"
-	    if test X${enable_m64_build} = Xyes; then
-	        AC_MSG_ERROR(don't know how to link 64-bit dynamic drivers)
-	    fi
-	    if test X${enable_m32_build} = Xyes; then
-	        AC_MSG_ERROR(don't know how to link 32-bit dynamic drivers)
-	    fi
-	], [
-	    # No dynamic loading.
-	    SHLIB_CFLAGS=""
-	    SHLIB_LD="ld"
-	    SHLIB_LDFLAGS=""
-	    SHLIB_SUFFIX=""
-	    AC_MSG_ERROR(don't know how to compile and link dynamic drivers)
-	])
-	SHLIB_EXTRACT_ALL=""
-	;;
     *-solaris2*|*-sysv4*)
 	SHLIB_CFLAGS="-KPIC"
 	SHLIB_LD="/usr/ccs/bin/ld"
@@ -459,11 +436,11 @@ dnl Freely inspired by AC_TRY_LINK. (Maybe better to create a
 dnl AC_LANG_JAVA instead...)
 AC_DEFUN(ERL_TRY_LINK_JAVA,
 [java_link='$JAVAC conftest.java 1>&AC_FD_CC'
-changequote(�, �)dnl
+changequote(, )dnl
 cat > conftest.java <<EOF
-�$1�
+$1
 class conftest { public static void main(String[] args) {
-   �$2�
+   $2
    ; return; }}
 EOF
 changequote([, ])dnl
diff --git a/lib/common_test/test_server/ts_benchmark.erl b/lib/common_test/test_server/ts_benchmark.erl
index e4e06b54c2..a9486262b3 100644
--- a/lib/common_test/test_server/ts_benchmark.erl
+++ b/lib/common_test/test_server/ts_benchmark.erl
@@ -45,7 +45,7 @@ run(Specs, Opts, Vars) ->
      || Spec <- Specs],
     file:delete(filename:join(Cwd,"latest_benchmark")),
     {ok,D} = file:open(filename:join(Cwd,"latest_benchmark"),[write]),
-    io:format(D,BDir,[]),
+    io:format(D,"~ts", [BDir]),
     file:close(D).
     
 
diff --git a/lib/common_test/test_server/ts_erl_config.erl b/lib/common_test/test_server/ts_erl_config.erl
index 537628e39a..f3972bea4e 100644
--- a/lib/common_test/test_server/ts_erl_config.erl
+++ b/lib/common_test/test_server/ts_erl_config.erl
@@ -208,7 +208,11 @@ erl_interface(Vars,OsType) ->
 			 {filename:join(Dir, "lib"),
 			  filename:join([Dir, "src", "eidefs.mk"])};
 		     {srctree, _Root, Target} ->
-			 {filename:join([Dir, "obj", Target]),
+                         Obj = case is_debug_build() of
+                                   true -> "obj.debug";
+                                   false -> "obj"
+                               end,
+			 {filename:join([Dir, Obj, Target]),
 			  filename:join([Dir, "src", Target, "eidefs.mk"])}
 		 end}
 	end,
diff --git a/lib/common_test/test_server/ts_install.erl b/lib/common_test/test_server/ts_install.erl
index 048e5493d2..86f16fa072 100644
--- a/lib/common_test/test_server/ts_install.erl
+++ b/lib/common_test/test_server/ts_install.erl
@@ -112,12 +112,6 @@ get_vars([], name, [], Result) ->
 get_vars(_, _, _, _) ->
     {error, fatal_bad_conf_vars}.
 
-config_flags() ->
-    case os:getenv("CONFIG_FLAGS") of
-	false -> [];
-	CF -> string:lexemes(CF, " \t\n")
-    end.
-
 unix_autoconf(XConf) ->
     Configure = filename:absname("configure"),
     Flags = proplists:get_value(crossflags,XConf,[]),
@@ -128,7 +122,7 @@ unix_autoconf(XConf) ->
 		  erlang:system_info(threads) /= false],
     Debug = [" --enable-debug-mode" ||
 		string:find(erlang:system_info(system_version),"debug") =/= nomatch],
-    MXX_Build = [Y || Y <- config_flags(),
+    MXX_Build = [Y || Y <- string:lexemes(os:getenv("CONFIG_FLAGS", ""), " \t\n"),
 		      Y == "--enable-m64-build"
 			  orelse Y == "--enable-m32-build"],
     Args = Host ++ Build ++ Threads ++ Debug ++ " " ++ MXX_Build,
@@ -164,7 +158,7 @@ assign_vars(FlagsStr) ->
 
 assign_all_vars([$$ | Rest], FlagSoFar) ->
     {VarName,Rest1} = get_var_name(Rest, []),
-    assign_all_vars(Rest1, FlagSoFar ++ assign_var(VarName));
+    assign_all_vars(Rest1, FlagSoFar ++ os:getenv(VarName, ""));
 assign_all_vars([Char | Rest], FlagSoFar) ->
     assign_all_vars(Rest, FlagSoFar ++ [Char]);
 assign_all_vars([], Flag) ->
@@ -177,12 +171,6 @@ get_var_name([Ch | Rest] = Str, VarR) ->
     end;
 get_var_name([], VarR) ->
     {lists:reverse(VarR),[]}.
-	    
-assign_var(VarName) ->
-    case os:getenv(VarName) of
-	false -> "";
-	Val   -> Val
-    end.
 
 valid_char(Ch) when Ch >= $a, Ch =< $z -> true;
 valid_char(Ch) when Ch >= $A, Ch =< $Z -> true;
@@ -280,7 +268,7 @@ add_vars(Vars0, Opts0) ->
     {Opts, [{longnames, LongNames},
 	    {platform_id, PlatformId},
 	    {platform_filename, PlatformFilename},
-	    {rsh_name, get_rsh_name()},
+	    {rsh_name, os:getenv("ERL_RSH", "ssh")},
 	    {platform_label, PlatformLabel},
 	    {ts_net_dir, Mounted},
 	    {erl_flags, []},
@@ -301,16 +289,10 @@ get_testcase_callback() ->
 	    end
     end.
 
-get_rsh_name() ->
-    case os:getenv("ERL_RSH") of
-	false -> "rsh";
-	Str -> Str
-    end.
-
 platform_id(Vars) ->
     {Id,_,_,_} = platform(Vars),
     Id.
-    
+
 platform(Vars) ->
     Hostname = hostname(),
 
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
index fd5d4a57aa..8dcb69c1c6 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.16.1
+COMMON_TEST_VSN = 1.17.3
diff --git a/lib/compiler/doc/src/Makefile b/lib/compiler/doc/src/Makefile
index 32f150eef8..2fb163b9e7 100644
--- a/lib/compiler/doc/src/Makefile
+++ b/lib/compiler/doc/src/Makefile
@@ -31,6 +31,7 @@ APPLICATION=compiler
 # Release directory specification
 # ----------------------------------------------------
 RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
+COMPILER_DIR = $(ERL_TOP)/lib/compiler/src
 
 # ----------------------------------------------------
 # Target Specs
@@ -38,7 +39,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 XML_APPLICATION_FILES = ref_man.xml
 XML_REF3_FILES = compile.xml
 
-XML_PART_FILES =
+XML_PART_FILES = internal.xml
 XML_CHAPTER_FILES = notes.xml
 
 BOOK_FILES = book.xml
@@ -49,6 +50,9 @@ XML_FILES = \
 	$(BOOK_FILES) $(XML_CHAPTER_FILES) \
 	$(XML_PART_FILES) $(XML_REF3_FILES) $(XML_APPLICATION_FILES)
 
+XML_INTERNAL_FILES = \
+	cerl.xml cerl_trees.xml cerl_clauses.xml
+
 # ----------------------------------------------------
 
 HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
@@ -62,6 +66,8 @@ HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE =  $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
+XML_GEN_FILES = $(XML_INTERNAL_FILES:%=$(XMLDIR)/%)
+
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
@@ -85,6 +91,9 @@ man: $(MAN3_FILES)
 
 gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
 
+$(XML_INTERNAL_FILES:%=$(XMLDIR)/%): $(COMPILER_DIR)/$(@:$(XMLDIR)/%.xml=%.erl)
+	$(gen_verbose)escript $(DOCGEN)/priv/bin/xml_from_edoc.escript -def vsn $(COMPILER_VSN) -dir $(XMLDIR) $(COMPILER_DIR)/$(@:$(XMLDIR)/%.xml=%.erl)
+
 debug opt:
 
 clean clean_docs:
diff --git a/lib/compiler/doc/src/book.xml b/lib/compiler/doc/src/book.xml
index af6b4cf47a..d101d40cb4 100644
--- a/lib/compiler/doc/src/book.xml
+++ b/lib/compiler/doc/src/book.xml
@@ -38,6 +38,9 @@
   <applications>
     <xi:include href="ref_man.xml"/>
   </applications>
+  <internals>
+    <xi:include href="internal.xml"/>
+  </internals>
   <releasenotes>
     <xi:include href="notes.xml"/>
   </releasenotes>
diff --git a/lib/compiler/doc/src/compile.xml b/lib/compiler/doc/src/compile.xml
index cfbd4c7fda..549b1049d8 100644
--- a/lib/compiler/doc/src/compile.xml
+++ b/lib/compiler/doc/src/compile.xml
@@ -29,7 +29,7 @@
     <rev>A</rev>
     <file>compile.sgml</file>
   </header>
-  <module>compile</module>
+  <module since="">compile</module>
   <modulesummary>Erlang Compiler</modulesummary>
   <description>
     <p>This module provides an interface to the standard Erlang
@@ -40,7 +40,7 @@
 
   <funcs>
     <func>
-      <name>env_compiler_options()</name>
+      <name since="OTP 19.0">env_compiler_options()</name>
       <fsummary>
 	Compiler options defined via the environment variable
 	<c>ERL_COMPILER_OPTIONS</c>
@@ -53,7 +53,7 @@
       </desc>
     </func>
     <func>
-      <name>file(File)</name>
+      <name since="">file(File)</name>
       <fsummary>Compiles a file.</fsummary>
       <desc>
         <p>Is the same as
@@ -63,7 +63,7 @@
     </func>
 
     <func>
-      <name>file(File, Options) -> CompRet</name>
+      <name since="">file(File, Options) -> CompRet</name>
       <fsummary>Compiles a file.</fsummary>
       <type>
         <v>CompRet = ModRet | BinRet | ErrRet</v>
@@ -416,6 +416,17 @@ module.beam: module.erl \
               is not documented, and can change between releases.</p>
           </item>
 
+          <tag><c>no_spawn_compiler_process</c></tag>
+          <item>
+            <p>By default, all code is compiled in a separate process
+              which is terminated at the end of compilation. However,
+              some tools, like Dialyzer or compilers for other BEAM languages,
+              may already manage their own worker processes and spawning
+              an extra process may slow the compilation down.
+              In such scenarios, you can pass this option to stop the
+              compiler from spawning an additional process.</p>
+          </item>
+
           <tag><c>no_strict_record_tests</c></tag>
           <item>
             <p>This option is not recommended.</p>
@@ -621,6 +632,22 @@ module.beam: module.erl \
 	    to be deprecated.</p>
           </item>
 
+	  <tag><c>nowarn_removed</c></tag>
+          <item>
+            <p>Turns off warnings for calls to functions that have
+            been removed. Default is to emit warnings for every call
+            to a function known by the compiler to have been recently
+            removed from Erlang/OTP.</p>
+          </item>
+
+	  <tag><c>{nowarn_removed, ModulesOrMFAs}</c></tag>
+          <item>
+            <p>Turns off warnings for calls to modules or functions
+            that have been removed. Default is to emit warnings for
+            every call to a function known by the compiler to have
+            been recently removed from Erlang/OTP.</p>
+          </item>
+
 	  <tag><c>nowarn_obsolete_guard</c></tag>
           <item>
             <p>Turns off warnings for calls to old type testing BIFs, 
@@ -684,12 +711,13 @@ module.beam: module.erl \
 	</note>
 	
 	<note>
-	<p>The options <c>{nowarn_unused_function, FAs}</c>,
-          <c>{nowarn_bif_clash, FAs}</c>, and 
-          <c>{nowarn_deprecated_function, MFAs}</c> are only
-          recognized when given in files. They are not affected by
-	  options <c>warn_unused_function</c>, <c>warn_bif_clash</c>, or 
-          <c>warn_deprecated_function</c>.</p>
+	<p>Before OTP 22, the option <c>{nowarn_deprecated_function,
+	MFAs}</c> was only recognized when given in the file with
+	attribute <c>-compile()</c>. (The option
+	<c>{nowarn_unused_function,FAs}</c> was incorrectly documented
+	to only work in a file, but it also worked when given in the
+	option list.) Starting from OTP 22, all options that can be
+	given in the file can also be given in the option list.</p>
 	</note>
 
         <p>For debugging of the compiler, or for pure curiosity,
@@ -718,7 +746,7 @@ module.beam: module.erl \
     </func>
 
     <func>
-      <name>forms(Forms)</name>
+      <name since="">forms(Forms)</name>
       <fsummary>Compiles a list of forms.</fsummary>
       <desc>
         <p>Is the same as
@@ -728,7 +756,7 @@ module.beam: module.erl \
     </func>
 
     <func>
-      <name>forms(Forms, Options) -> CompRet</name>
+      <name since="">forms(Forms, Options) -> CompRet</name>
       <fsummary>Compiles a list of forms.</fsummary>
       <type>
         <v>Forms = [Form]</v>
@@ -749,7 +777,7 @@ module.beam: module.erl \
     </func>
 
     <func>
-      <name>format_error(ErrorDescriptor) -> chars()</name>
+      <name since="">format_error(ErrorDescriptor) -> chars()</name>
       <fsummary>Formats an error descriptor.</fsummary>
       <type>
         <v>ErrorDescriptor = errordesc()</v>
@@ -764,7 +792,7 @@ module.beam: module.erl \
     </func>
 
     <func>
-      <name>output_generated(Options) -> true | false</name>
+      <name since="">output_generated(Options) -> true | false</name>
       <fsummary>Determines whether the compiler generates an output file.</fsummary>
       <type>
         <v>Options = [term()]</v>
@@ -779,7 +807,7 @@ module.beam: module.erl \
     </func>
 
     <func>
-      <name>noenv_file(File, Options) -> CompRet</name>
+      <name since="">noenv_file(File, Options) -> CompRet</name>
       <fsummary>Compiles a file (ignoring <c>ERL_COMPILER_OPTIONS)</c>.</fsummary>
       <desc>
       <p>Works like <seealso marker="#file/2">file/2</seealso>,
@@ -789,7 +817,7 @@ module.beam: module.erl \
     </func>
 
     <func>
-      <name>noenv_forms(Forms, Options) -> CompRet</name>
+      <name since="">noenv_forms(Forms, Options) -> CompRet</name>
       <fsummary>Compiles a list of forms (ignoring <c>ERL_COMPILER_OPTIONS)</c>.</fsummary>
       <desc>
         <p>Works like <seealso marker="#forms/2">forms/2</seealso>,
@@ -799,7 +827,7 @@ module.beam: module.erl \
     </func>
 
     <func>
-      <name>noenv_output_generated(Options) -> true | false</name>
+      <name since="">noenv_output_generated(Options) -> true | false</name>
       <fsummary>Determines whether the compiler generates an output file 
       (ignoring <c>ERL_COMPILER_OPTIONS)</c>.</fsummary>
       <type>
diff --git a/lib/otp_mibs/doc/src/ref_man.xml b/lib/compiler/doc/src/internal.xml
index 06c5aadcd9..f24b363c1c 100644
--- a/lib/otp_mibs/doc/src/ref_man.xml
+++ b/lib/compiler/doc/src/internal.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE application SYSTEM "application.dtd">
+<!DOCTYPE part SYSTEM "part.dtd">
 
-<application xmlns:xi="http://www.w3.org/2001/XInclude">
+<internal xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2003</year><year>2016</year>
+      <year>2018</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -22,17 +22,17 @@
     
     </legalnotice>
 
-    <title>OTP_Mibs Reference Manual</title>
-    <prepared>Ingela Anderton</prepared>
+    <title>Compiler Internal Documentation</title>
+    <prepared>Lukas Larsson</prepared>
     <docno></docno>
-    <date>2002-09-13</date>
-    <rev>A</rev>
+    <date>2018-07-07</date>
+    <rev>1.0.0</rev>
+    <file>internal.xml</file>
   </header>
   <description>
-    <p>The <em>OTP_Mibs</em> application provides an SNMP management
-      information base for Erlang nodes.</p>
   </description>
-  <xi:include href="otp_mib.xml"/>
-</application>
-
+  <xi:include href="cerl.xml"/>
+  <xi:include href="cerl_trees.xml"/>
+  <xi:include href="cerl_clauses.xml"/>
+</internal>
 
diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml
index 7addadf82c..f11444137d 100644
--- a/lib/compiler/doc/src/notes.xml
+++ b/lib/compiler/doc/src/notes.xml
@@ -32,6 +32,272 @@
   <p>This document describes the changes made to the Compiler
     application.</p>
 
+<section><title>Compiler 7.4.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixed a compiler crash introduced in <c>22.0.6</c>
+	    (OTP-15952).</p>
+          <p>
+	    Own Id: OTP-15953 Aux Id: ERL-999 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Compiler 7.4.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixed an unsafe optimization when matching
+	    <c>tuple_size/1</c> outside of guards, which could crash
+	    the emulator if the argument was not a tuple.</p>
+          <p>
+	    Own Id: OTP-15945</p>
+        </item>
+        <item>
+	    <p>Fixed a rare bug that could cause the wrong kind of
+	    exception to be thrown when a BIF failed in a function
+	    that matched bitstrings.</p>
+          <p>
+	    Own Id: OTP-15946</p>
+        </item>
+        <item>
+	    <p>Fixed a bug where receive statements inside try/catch
+	    blocks could return incorrect results.</p>
+          <p>
+	    Own Id: OTP-15952</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Compiler 7.4.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixed an incorrect type determination for constructed
+	    binaries, which could cause <c>is_binary</c> checks to
+	    succeed when they shouldn't have.</p>
+          <p>
+	    Own Id: OTP-15872</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Compiler 7.4.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>The type optimization pass of the compiler could hang
+	    or loop for a long time when analyzing a
+	    <c>setelement/3</c> call with a varible position.</p>
+          <p>
+	    Own Id: OTP-15828 Aux Id: ERL-948 </p>
+        </item>
+        <item>
+	    <p>Certain complex receive statements would result in an
+	    internal compiler failure.</p>
+          <p>
+	    Own Id: OTP-15832 Aux Id: ERL-950 </p>
+        </item>
+        <item>
+	    <p>Fixed an unsafe type optimization.</p>
+          <p>
+	    Own Id: OTP-15838</p>
+        </item>
+        <item>
+	    <p>Fixed a crash when optimizing compiler-generated
+	    exceptions (like badmatch) whose offending term was a
+	    constructed binary.</p>
+          <p>
+	    Own Id: OTP-15839 Aux Id: ERL-954 </p>
+        </item>
+        <item>
+	    <p>Fixed a bad optimization related to the <c>++/2</c>
+	    operator, where the compiler assumed that it always
+	    produced a list (<c>[] ++ RHS</c> returns <c>RHS</c>
+	    verbatim, even if it's not a list).</p>
+          <p>
+	    Own Id: OTP-15841</p>
+        </item>
+        <item>
+	    <p>An <c>is_binary/1</c> test followed by
+	    <c>is_bitstring/1</c> (or vice versa) could fail because
+	    of an usafe optimization.</p>
+          <p>
+	    Own Id: OTP-15845</p>
+        </item>
+        <item>
+	    <p>A Core Erlang module where the last clause in a
+	    <c>case</c> matched a map would fail to load.</p>
+          <p>
+	    Own Id: OTP-15846 Aux Id: ERL-955 </p>
+        </item>
+        <item>
+	    <p>Fixed a bug that could cause the compiler to crash
+	    when compiling complex nested case expressions.</p>
+          <p>
+	    Own Id: OTP-15848 Aux Id: ERL-956 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Compiler 7.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p><c>record_info/2</c> is a pseudo-function that
+	    requires literal arguments known at compile time.
+	    Therefore, the following usage is illegal: <c>fun
+	    record/info/2</c>. The compiler would crash when during
+	    compilation of that kind of code. Corrected to issue a
+	    compilation error.</p>
+          <p>
+	    Own Id: OTP-15760 Aux Id: ERL-907 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The compiler has been rewritten to internally use an
+	    intermediate representation based on Static Single
+	    Assignment (SSA). The new intermediate representation
+	    makes more optimizations possible.</p>
+          <p>
+	    Most noticeable is that the binary matching optimizations
+	    are now applicable in many more circumstances than
+	    before.</p>
+          <p>
+	    Another noticeable change is that type optimizations are
+	    now applied across local function calls, and will remove
+	    a lot more redundant type tests than before.</p>
+          <p>
+	    Own Id: OTP-14894 Aux Id: ERL-714 </p>
+        </item>
+        <item>
+	    <p>Funs are no longer created when they are only used
+	    locally, greatly improving the performance of named funs
+	    and "fun-wrapped" macros.</p>
+          <p>
+	    Own Id: OTP-15273 Aux Id: ERL-639 </p>
+        </item>
+        <item>
+	    <p>All compiler options that can be given in the source
+	    file can now also be given in the option list or from the
+	    command line for <c>erlc</c>.</p>
+	    <p>Specifically, the option
+	    <c>{nowarn_deprecated_function,MFAs}</c> was only
+	    recognized when given in the file with the attribute
+	    <c>-compile()</c>. The option
+	    <c>{nowarn_unused_function,FAs}</c> was incorrectly
+	    documented to only work in a file, but it also worked
+	    when given in the option list.</p>
+          <p>
+	    Own Id: OTP-15456</p>
+        </item>
+        <item>
+	    <p> Do not allow function specifications for functions
+	    residing in other modules. </p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15563 Aux Id: ERL-845, OTP-15562 </p>
+        </item>
+        <item>
+	    <p>Internal documentation has now been added to the
+	    <em>Erts</em> and <em>Compiler</em> applications.</p>
+	    <p>The internal documents for <em>Erts</em> describe
+	    miscellaneous interesting implementation details. Those
+	    details can change at any time.</p>
+	    <p>The internal documentation for <em>Compiler</em>
+	    documents the API for the Core Erlang modules. While we
+	    will not change those APIs without good reason, we don't
+	    give the same guarantees about backward compatibility as
+	    for the rest of the APIs in OTP.</p>
+          <p>
+	    Own Id: OTP-15715</p>
+        </item>
+        <item>
+	    <p> There are new compiler options <c>nowarn_removed</c>
+	    and <c>{nowarn_removed,Items}</c> to suppress warnings
+	    for functions and modules that have been removed from
+	    OTP.</p>
+          <p>
+	    Own Id: OTP-15749 Aux Id: ERL-904 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Compiler 7.3.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>An expression such as <c>(A / B) band 16#ff</c> would
+	    crash the compiler.</p>
+          <p>
+	    Own Id: OTP-15518 Aux Id: ERL-829 </p>
+        </item>
+        <item>
+	    <p>There could be an incorrect warning when the
+	    <c>tuple_calls</c> option was given. The generated code
+	    would be correct. Here is an example of code that would
+	    trigger the warning:</p>
+	    <p><c>(list_to_atom("prefix_" ++
+	    atom_to_list(suffix))):doit(X)</c>.</p>
+          <p>
+	    Own Id: OTP-15552 Aux Id: ERL-838 </p>
+        </item>
+        <item>
+	    <p>Optimize (again) Dialyzer's handling of
+	    left-associative use of <c>andalso</c> and <c>orelse</c>
+	    in guards.</p>
+          <p>
+	    Own Id: OTP-15577 Aux Id: ERL-851, PR-2141, PR-1944 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Compiler 7.3.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>An optimization that avoided allocation of a stack
+	    frame for some <c>case</c> expressions was introduced in
+	    OTP 21. (ERL-504/OTP-14808) It turns out that in rare
+	    circumstances, this optimization is not safe. Therefore,
+	    this optimization has been disabled.</p>
+	    <p>A similar optimization will be included in OTP 22 in a
+	    safe way.</p>
+          <p>
+	    Own Id: OTP-15501 Aux Id: ERL-807, ERL-514, OTP-14808 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Compiler 7.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/compiler/scripts/.gitignore b/lib/compiler/scripts/.gitignore
new file mode 100644
index 0000000000..4e4eba766d
--- /dev/null
+++ b/lib/compiler/scripts/.gitignore
@@ -0,0 +1 @@
+/smoke-build
diff --git a/lib/compiler/scripts/smoke b/lib/compiler/scripts/smoke
new file mode 100755
index 0000000000..ae31c923b8
--- /dev/null
+++ b/lib/compiler/scripts/smoke
@@ -0,0 +1,123 @@
+#!/usr/bin/env escript
+%% -*- erlang -*-
+-mode(compile).
+
+main(_Args) ->
+    setup(),
+    clone_elixir(),
+    build_elixir(),
+    test_elixir(),
+    setup_mix(),
+    smoke(main),
+    smoke(rabbitmq),
+    halt(0).
+
+setup() ->
+    ScriptsDir = scripts_dir(),
+    SmokeBuildDir = filename:join(ScriptsDir, "smoke-build"),
+    _ = file:make_dir(SmokeBuildDir),
+    ok = file:set_cwd(SmokeBuildDir),
+    ok.
+
+clone_elixir() ->
+    {ok,SmokeDir} = file:get_cwd(),
+    DotGitDir = filename:join([SmokeDir,"elixir",".git"]),
+    ElixirRepo = "[email protected]:elixir-lang/elixir.git",
+    case filelib:is_dir(DotGitDir) of
+        false ->
+            cmd("git clone " ++ ElixirRepo);
+        true ->
+            GetHeadSHA1 = "cd elixir && git rev-parse --verify HEAD",
+            Before = os:cmd(GetHeadSHA1),
+            cmd("cd elixir && git pull --ff-only origin master"),
+            case os:cmd(GetHeadSHA1) of
+                Before ->
+                    ok;
+                _After ->
+                    %% There were some changes. Clean to force a re-build.
+                    cmd("cd elixir && make clean")
+            end
+    end.
+
+build_elixir() ->
+    cmd("cd elixir && make compile").
+
+test_elixir() ->
+    cmd("cd elixir && make test_stdlib").
+
+setup_mix() ->
+    MixExsFile = filename:join(scripts_dir(), "smoke-mix.exs"),
+    {ok,MixExs} = file:read_file(MixExsFile),
+    ok = file:write_file("mix.exs", MixExs),
+
+    {ok,SmokeDir} = file:get_cwd(),
+    ElixirBin = filename:join([SmokeDir,"elixir","bin"]),
+    PATH = ElixirBin ++ ":" ++ os:getenv("PATH"),
+    os:putenv("PATH", PATH),
+    mix("local.hex --force"),
+    mix("local.rebar --force"),
+    ok.
+
+smoke(Set) ->
+    os:putenv("SMOKE_DEPS_SET", atom_to_list(Set)),
+    _ = file:delete("mix.lock"),
+    cmd("touch mix.exs"),
+    mix("deps.clean --all"),
+    mix("deps.get"),
+    mix("deps.compile"),
+    ok.
+
+scripts_dir() ->
+    Root = code:lib_dir(compiler),
+    filename:join(Root, "scripts").
+
+mix(Cmd) ->
+    cmd("mix " ++ Cmd).
+
+cmd(Cmd) ->
+    run("sh", ["-c",Cmd]).
+
+run(Program0, Args) ->
+    Program = case os:find_executable(Program0) of
+		  Path when is_list(Path) ->
+		      Path;
+		  false ->
+		      abort("Unable to find program: ~s\n", [Program0])
+	      end,
+    Cmd = case {Program0,Args} of
+              {"sh",["-c"|ShCmd]} ->
+                  ShCmd;
+              {_,_} ->
+                  lists:join(" ", [Program0|Args])
+          end,
+    io:format("\n# ~s\n", [Cmd]),
+    Options = [{args,Args},binary,exit_status,stderr_to_stdout],
+    try open_port({spawn_executable,Program}, Options) of
+	Port ->
+	    case run_loop(Port, <<>>) of
+                0 ->
+                    ok;
+                ExitCode ->
+                    abort("*** Failed with exit code: ~p\n",
+                          [ExitCode])
+            end
+    catch
+	error:_ ->
+	    abort("Failed to execute ~s\n", [Program0])
+    end.
+
+run_loop(Port, Output) ->
+    receive
+	{Port,{exit_status,Status}} ->
+	    Status;
+	{Port,{data,Bin}} ->
+            io:put_chars(Bin),
+	    run_loop(Port, <<Output/binary,Bin/binary>>);
+	Msg ->
+	    io:format("L: ~p~n", [Msg]),
+	    run_loop(Port, Output)
+    end.
+
+abort(Format, Args) ->
+    io:format(Format, Args),
+    halt(1).
diff --git a/lib/compiler/scripts/smoke-mix.exs b/lib/compiler/scripts/smoke-mix.exs
new file mode 100644
index 0000000000..ba0815e465
--- /dev/null
+++ b/lib/compiler/scripts/smoke-mix.exs
@@ -0,0 +1,103 @@
+defmodule Smoke.MixProject do
+  use Mix.Project
+
+  def project do
+    [
+      app: :smoke,
+      version: "0.1.0",
+      elixir: "~> 1.8",
+      start_permanent: Mix.env() == :prod,
+      deps: deps()
+    ]
+  end
+
+  # Run "mix help compile.app" to learn about applications.
+  def application do
+    [
+      extra_applications: [:logger]
+    ]
+  end
+
+  # Run "mix help deps" to learn about dependencies.
+  defp deps do
+    case :os.getenv('SMOKE_DEPS_SET') do
+      'main' ->
+	[
+	  {:bear, "~> 0.8.7"},
+	  {:cloudi_core, "~> 1.7"},
+	  {:cloudi_service_monitoring, "~> 1.7"},
+	  {:cloudi_service_tcp, "~> 1.7"},
+	  {:cloudi_service_queue, "~> 1.7"},
+	  {:cloudi_service_udp, "~> 1.7"},
+	  {:cloudi_service_map_reduce, "~> 1.7"},
+	  {:cloudi_service_api_requests, "~> 1.7"},
+	  {:cloudi_service_router, "~> 1.7"},
+	  {:cloudi_service_request_rate, "~> 1.7"},
+	  {:concuerror, "~> 0.20.0"},
+	  {:cowboy, "~> 2.6.1"},
+	  {:ecto, "~> 3.0.6"},
+	  {:ex_doc, "~> 0.19.3"},
+	  {:distillery, "~> 2.0.12"},
+	  {:erlydtl, "~> 0.12.1"},
+	  {:gen_smtp, "~> 0.13.0"},
+	  {:getopt, "~> 1.0.1"},
+	  {:gettext, "~> 0.16.1"},
+	  {:gpb, "~> 4.6"},
+	  {:gproc, "~> 0.8.0"},
+	  {:graphql, "~> 0.15.0", hex: :graphql_erl},
+	  {:hackney, "~> 1.15.0"},
+	  {:ibrowse, "~> 4.4.1"},
+	  {:jose, "~> 1.9.0"},
+	  {:lager, "~> 3.6"},
+	  {:locus, "~> 1.6"},
+	  {:nimble_parsec, "~> 0.5.0"},
+	  {:phoenix, "~> 1.4.0"},
+	  {:riak_pb, "~> 2.3"},
+	  {:scalaris, git: "https://github.com/scalaris-team/scalaris",
+	   compile: build_scalaris()},
+	  {:tdiff, "~> 0.1.2"},
+	  {:webmachine, "~> 1.11"},
+	  {:wings, git: "https://github.com/dgud/wings.git",
+	   compile: build_wings()},
+	  {:zotonic_stdlib, "~> 1.0"},
+	]
+      'rabbitmq' ->
+	[{:rabbit_common, "~> 3.7"}]
+      _ ->
+	[]
+    end
+  end
+
+  defp build_scalaris do
+    # Only compile the Erlang code.
+
+    """
+    echo '-include("rt_simple.hrl").' >include/rt.hrl
+    (cd src && erlc -W0 -I ../include -I ../contrib/log4erl/include -I ../contrib/yaws/include *.erl)
+    (cd src/comm_layer && erlc -W0 -I ../../include -I *.erl)
+    (cd src/cp && erlc -W0 -I ../../include -I *.erl)
+    (cd src/crdt && erlc -W0 -I ../../include -I *.erl)
+    (cd src/json && erlc -W0 -I ../../include -I *.erl)
+    (cd src/paxos && erlc -W0 -I ../../include -I *.erl)
+    (cd src/rbr && erlc -W0 -I ../../include -I *.erl)
+    (cd src/rrepair && erlc -W0 -I ../../include -I *.erl)
+    (cd src/time && erlc -W0 -I ../../include -I *.erl)
+    (cd src/transactions && erlc -W0 -I ../../include -I *.erl)
+    (cd src/tx && erlc -W0 -I ../../include -I *.erl)
+    """
+  end
+
+  defp build_wings do
+    # If the Erlang system is not installed, the build will
+    # crash in plugins_src/accel when attempting to build
+    # the accel driver. Since there is very little Erlang code in
+    # the directory, skip the entire directory.
+
+    """
+    echo "all:\n\t" >plugins_src/accel/Makefile
+    git commit -a -m'Disable for smoke testing'
+    git tag -a -m'Smoke test' vsmoke_test
+    make
+    """
+  end
+end
diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile
index 2408c76b48..87b0d345f2 100644
--- a/lib/compiler/src/Makefile
+++ b/lib/compiler/src/Makefile
@@ -49,10 +49,7 @@ MODULES =  \
 	beam_a \
 	beam_asm \
 	beam_block \
-	beam_bs \
-	beam_bsm \
 	beam_clean \
-	beam_dead \
 	beam_dict \
 	beam_disasm \
 	beam_except \
@@ -61,12 +58,20 @@ MODULES =  \
 	beam_listing \
 	beam_opcodes \
 	beam_peep \
-	beam_receive \
-	beam_reorder \
-	beam_record \
-	beam_split \
+	beam_ssa \
+	beam_ssa_bsm \
+	beam_ssa_codegen \
+	beam_ssa_dead \
+	beam_ssa_funs \
+	beam_ssa_lint \
+	beam_ssa_opt \
+	beam_ssa_pp \
+	beam_ssa_pre_codegen \
+	beam_ssa_recv \
+	beam_ssa_share \
+	beam_ssa_type \
+	beam_kernel_to_ssa \
 	beam_trim \
-	beam_type \
 	beam_utils \
 	beam_validator \
         beam_z \
@@ -85,12 +90,10 @@ MODULES =  \
 	rec_env \
 	sys_core_alias \
 	sys_core_bsm \
-	sys_core_dsetel \
 	sys_core_fold \
 	sys_core_fold_lists \
 	sys_core_inline \
 	sys_pre_attributes \
-	v3_codegen \
 	v3_core \
 	v3_kernel \
 	v3_kernel_pp
@@ -99,6 +102,8 @@ BEAM_H = $(wildcard ../priv/beam_h/*.h)
 
 HRL_FILES= \
 	beam_disasm.hrl \
+	beam_ssa_opt.hrl \
+	beam_ssa.hrl \
 	core_parse.hrl \
 	v3_kernel.hrl
 
@@ -124,9 +129,10 @@ APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
 
 ifeq ($(NATIVE_LIBS_ENABLED),yes)
 ERL_COMPILE_FLAGS += +native
+else
+ERL_COMPILE_FLAGS += -Werror
 endif
 ERL_COMPILE_FLAGS += +inline +warn_unused_import \
- -Werror \
  -I../../stdlib/include -I$(EGEN) -W +warn_missing_spec
 
 # ----------------------------------------------------
@@ -185,7 +191,20 @@ release_docs_spec:
 # ---------------------------------------------------- 
 
 $(EBIN)/beam_disasm.beam: $(EGEN)/beam_opcodes.hrl beam_disasm.hrl
-$(EBIN)/beam_listing.beam: core_parse.hrl v3_kernel.hrl
+$(EBIN)/beam_listing.beam: core_parse.hrl v3_kernel.hrl beam_ssa.hrl
+$(EBIN)/beam_kernel_to_ssa.beam: v3_kernel.hrl beam_ssa.hrl
+$(EBIN)/beam_ssa.beam: beam_ssa.hrl
+$(EBIN)/beam_ssa_bsm.beam: beam_ssa.hrl
+$(EBIN)/beam_ssa_codegen.beam: beam_ssa.hrl
+$(EBIN)/beam_ssa_dead.beam: beam_ssa.hrl
+$(EBIN)/beam_ssa_funs.beam: beam_ssa.hrl
+$(EBIN)/beam_ssa_lint.beam: beam_ssa.hrl
+$(EBIN)/beam_ssa_opt.beam: beam_ssa.hrl
+$(EBIN)/beam_ssa_pp.beam: beam_ssa.hrl
+$(EBIN)/beam_ssa_pre_codegen.beam: beam_ssa.hrl
+$(EBIN)/beam_ssa_recv.beam: beam_ssa.hrl
+$(EBIN)/beam_ssa_share.beam: beam_ssa.hrl
+$(EBIN)/beam_ssa_type.beam: beam_ssa.hrl
 $(EBIN)/cerl.beam: core_parse.hrl
 $(EBIN)/compile.beam: core_parse.hrl ../../stdlib/include/erl_compile.hrl
 $(EBIN)/core_lib.beam: core_parse.hrl
@@ -193,11 +212,9 @@ $(EBIN)/core_lint.beam: core_parse.hrl
 $(EBIN)/core_parse.beam: core_parse.hrl $(EGEN)/core_parse.erl
 $(EBIN)/core_pp.beam: core_parse.hrl
 $(EBIN)/sys_core_alias.beam: core_parse.hrl
-$(EBIN)/sys_core_dsetel.beam: core_parse.hrl
 $(EBIN)/sys_core_fold.beam: core_parse.hrl
 $(EBIN)/sys_core_fold_lists.beam: core_parse.hrl
 $(EBIN)/sys_core_inline.beam: core_parse.hrl
-$(EBIN)/v3_codegen.beam: v3_kernel.hrl
 $(EBIN)/v3_core.beam: core_parse.hrl
 $(EBIN)/v3_kernel.beam: core_parse.hrl v3_kernel.hrl
 $(EBIN)/v3_kernel_pp.beam: v3_kernel.hrl
diff --git a/lib/compiler/src/beam_a.erl b/lib/compiler/src/beam_a.erl
index 6fd4ace540..0bccad1ecd 100644
--- a/lib/compiler/src/beam_a.erl
+++ b/lib/compiler/src/beam_a.erl
@@ -39,14 +39,29 @@ function({function,Name,Arity,CLabel,Is0}) ->
 
 	%% Remove unusued labels for cleanliness and to help
 	%% optimization passes and HiPE.
-	Is = beam_jump:remove_unused_labels(Is1),
-	{function,Name,Arity,CLabel,Is}
+	Is2 = beam_jump:remove_unused_labels(Is1),
+
+        %% Some optimization passes can't handle consecutive labels.
+        %% Coalesce multiple consecutive labels.
+        Is = coalesce_consecutive_labels(Is2, [], []),
+
+        {function,Name,Arity,CLabel,Is}
     catch
         Class:Error:Stack ->
 	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
 
+rename_instrs([{test,is_eq_exact,_,[Dst,Src]}=Test,
+               {move,Src,Dst}|Is]) ->
+    %% The move instruction is not needed.
+    rename_instrs([Test|Is]);
+rename_instrs([{test,is_eq_exact,_,[Same,Same]}|Is]) ->
+    %% Same literal or same register. Will always succeed.
+    rename_instrs(Is);
+rename_instrs([{loop_rec,{f,Fail},{x,0}},{loop_rec_end,_},{label,Fail}|Is]) ->
+    %% This instruction sequence does nothing.
+    rename_instrs(Is);
 rename_instrs([{apply_last,A,N}|Is]) ->
     [{apply,A},{deallocate,N},return|rename_instrs(Is)];
 rename_instrs([{call_last,A,F,N}|Is]) ->
@@ -85,8 +100,12 @@ rename_instr({bs_put_utf16=I,F,Fl,Src}) ->
     {bs_put,F,{I,Fl},[Src]};
 rename_instr({bs_put_utf32=I,F,Fl,Src}) ->
     {bs_put,F,{I,Fl},[Src]};
-rename_instr({bs_put_string,_,_}=I) ->
-    {bs_put,{f,0},I,[]};
+rename_instr({bs_put_string,_,{string,String}}) ->
+    %% Only happens when compiling from .S files. In old
+    %% .S files, String is a list. In .S in OTP 22 and later,
+    %% String is a binary.
+    {bs_put,{f,0},{bs_put_binary,8,{field_flags,[unsigned,big]}},
+     [{atom,all},{literal,iolist_to_binary([String])}]};
 rename_instr({bs_add=I,F,[Src1,Src2,U],Dst}) when is_integer(U) ->
     {bif,I,F,[Src1,Src2,{integer,U}],Dst};
 rename_instr({bs_utf8_size=I,F,Src,Dst}) ->
@@ -103,16 +122,14 @@ rename_instr({bs_private_append=I,F,Sz,U,Src,Flags,Dst}) ->
     {bs_init,F,{I,U,Flags},none,[Sz,Src],Dst};
 rename_instr(bs_init_writable=I) ->
     {bs_init,{f,0},I,1,[{x,0}],{x,0}};
-rename_instr({test,Op,F,[Ctx,Bits,{string,Str}]}) ->
-    %% When compiling from a .S file.
-    <<Bs:Bits/bits,_/bits>> = list_to_binary(Str),
-    {test,Op,F,[Ctx,Bs]};
 rename_instr({put_map_assoc,Fail,S,D,R,L}) ->
     {put_map,Fail,assoc,S,D,R,L};
 rename_instr({put_map_exact,Fail,S,D,R,L}) ->
     {put_map,Fail,exact,S,D,R,L};
 rename_instr({test,has_map_fields,Fail,Src,{list,List}}) ->
     {test,has_map_fields,Fail,[Src|List]};
+rename_instr({test,is_nil,Fail,[Src]}) ->
+    {test,is_eq_exact,Fail,[Src,nil]};
 rename_instr({select_val=I,Reg,Fail,{list,List}}) ->
     {select,I,Reg,Fail,List};
 rename_instr({select_tuple_arity=I,Reg,Fail,{list,List}}) ->
@@ -120,3 +137,11 @@ rename_instr({select_tuple_arity=I,Reg,Fail,{list,List}}) ->
 rename_instr(send) ->
     {call_ext,2,send};
 rename_instr(I) -> I.
+
+coalesce_consecutive_labels([{label,L}=Lbl,{label,Alias}|Is], Replace, Acc) ->
+    coalesce_consecutive_labels([Lbl|Is], [{Alias,L}|Replace], Acc);
+coalesce_consecutive_labels([I|Is], Replace, Acc) ->
+    coalesce_consecutive_labels(Is, Replace, [I|Acc]);
+coalesce_consecutive_labels([], Replace, Acc) ->
+    D = maps:from_list(Replace),
+    beam_utils:replace_labels(Acc, [], D, fun(L) -> L end).
diff --git a/lib/compiler/src/beam_asm.erl b/lib/compiler/src/beam_asm.erl
index df0321e85a..df09dcb06c 100644
--- a/lib/compiler/src/beam_asm.erl
+++ b/lib/compiler/src/beam_asm.erl
@@ -407,14 +407,14 @@ 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) ->
-    %% Conservatily assume that all integers whose absolute
+    %% Conservatively 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);
+            encode_literal(N, Dict);
         N =< -(1 bsl 128) ->
-            encode_arg({literal, N}, Dict);
+            encode_literal(N, Dict);
         true ->
             {encode(?tag_i, N), Dict}
     end;
@@ -424,8 +424,8 @@ encode_arg({f, W}, Dict) ->
     {encode(?tag_f, W), Dict};
 %% encode_arg({'char', C}, Dict) ->
 %%     {encode(?tag_h, C), Dict};
-encode_arg({string, String}, Dict0) ->
-    {Offset, Dict} = beam_dict:string(String, Dict0),
+encode_arg({string, BinString}, Dict0) when is_binary(BinString) ->
+    {Offset, Dict} = beam_dict:string(BinString, Dict0),
     {encode(?tag_u, Offset), Dict};
 encode_arg({extfunc, M, F, A}, Dict0) ->
     {Index, Dict} = beam_dict:import(M, F, A, Dict0),
@@ -434,7 +434,7 @@ encode_arg({list, List}, Dict0) ->
     {L, Dict} = encode_list(List, Dict0, []),
     {[encode(?tag_z, 1), encode(?tag_u, length(List))|L], Dict};
 encode_arg({float, Float}, Dict) when is_float(Float) ->
-    encode_arg({literal,Float}, Dict);
+    encode_literal(Float, Dict);
 encode_arg({fr,Fr}, Dict) ->
     {[encode(?tag_z, 2),encode(?tag_u, Fr)], Dict};
 encode_arg({field_flags,Flags0}, Dict) ->
@@ -442,12 +442,24 @@ encode_arg({field_flags,Flags0}, Dict) ->
     {encode(?tag_u, Flags), Dict};
 encode_arg({alloc,List}, Dict) ->
     encode_alloc_list(List, Dict);
-encode_arg({literal,Lit}, Dict0) ->
-    {Index,Dict} = beam_dict:literal(Lit, Dict0),
-    {[encode(?tag_z, 4),encode(?tag_u, Index)],Dict};
+encode_arg({literal,Lit}, Dict) ->
+    if
+        Lit =:= [] ->
+            encode_arg(nil, Dict);
+        is_atom(Lit) ->
+            encode_arg({atom,Lit}, Dict);
+        is_integer(Lit) ->
+            encode_arg({integer,Lit}, Dict);
+        true ->
+            encode_literal(Lit, Dict)
+    end;
 encode_arg(Int, Dict) when is_integer(Int) ->
     {encode(?tag_u, Int),Dict}.
 
+encode_literal(Literal, Dict0) ->
+    {Index,Dict} = beam_dict:literal(Literal, Dict0),
+    {[encode(?tag_z, 4),encode(?tag_u, Index)],Dict}.
+
 %%flag_to_bit(aligned) -> 16#01; %% No longer useful.
 flag_to_bit(little)  -> 16#02;
 flag_to_bit(big)     -> 16#00;
diff --git a/lib/compiler/src/beam_block.erl b/lib/compiler/src/beam_block.erl
index fe43163455..707974b2c1 100644
--- a/lib/compiler/src/beam_block.erl
+++ b/lib/compiler/src/beam_block.erl
@@ -17,39 +17,24 @@
 %%
 %% %CopyrightEnd%
 %%
-%% Purpose : Partitions assembly instructions into basic blocks and
-%% optimizes them.
+%% Purpose: Partition BEAM instructions into basic blocks.
 
 -module(beam_block).
 
 -export([module/2]).
--import(lists, [reverse/1,reverse/2,member/2]).
+-import(lists, [keysort/2,reverse/1,splitwith/2]).
 
 -spec module(beam_utils:module_code(), [compile:option()]) ->
                     {'ok',beam_utils:module_code()}.
 
-module({Mod,Exp,Attr,Fs0,Lc}, Opts) ->
-    Blockify = not member(no_blockify, Opts),
-    Fs = [function(F, Blockify) || F <- Fs0],
+module({Mod,Exp,Attr,Fs0,Lc}, _Opts) ->
+    Fs = [function(F) || F <- Fs0],
     {ok,{Mod,Exp,Attr,Fs,Lc}}.
 
-function({function,Name,Arity,CLabel,Is0}, Blockify) ->
+function({function,Name,Arity,CLabel,Is0}) ->
     try
-	%% Collect basic blocks and optimize them.
-        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.
+        Is1 = blockify(Is0),
+        Is = embed_lines(Is1),
         {function,Name,Arity,CLabel,Is}
     catch
         Class:Error:Stack ->
@@ -64,14 +49,12 @@ function({function,Name,Arity,CLabel,Is0}, Blockify) ->
 blockify(Is) ->
     blockify(Is, []).
 
-blockify([{loop_rec,{f,Fail},{x,0}},{loop_rec_end,_Lbl},{label,Fail}|Is], Acc) ->
-    %% Useless instruction sequence.
-    blockify(Is, Acc);
 blockify([I|Is0]=IsAll, Acc) ->
     case collect(I) of
 	error -> blockify(Is0, [I|Acc]);
 	Instr when is_tuple(Instr) ->
-	    {Block,Is} = collect_block(IsAll),
+            {Block0,Is} = collect_block(IsAll),
+            Block = sort_moves(Block0),
 	    blockify(Is, [{block,Block}|Acc])
     end;
 blockify([], Acc) -> reverse(Acc).
@@ -80,12 +63,10 @@ collect_block(Is) ->
     collect_block(Is, []).
 
 collect_block([{allocate,N,R}|Is0], Acc) ->
-    {Inits,Is} = lists:splitwith(fun ({init,{y,_}}) -> true;
-                                     (_) -> false
-                                 end, Is0),
+    {Inits,Is} = splitwith(fun ({init,{y,_}}) -> true;
+                               (_) -> false
+                           end, Is0),
     collect_block(Is, [{set,[],[],{alloc,R,{nozero,N,0,Inits}}}|Acc]);
-collect_block([{allocate_zero,Ns,R},{test_heap,Nh,R}|Is], Acc) ->
-    collect_block(Is, [{set,[],[],{alloc,R,{zero,Ns,Nh,[]}}}|Acc]);
 collect_block([I|Is]=Is0, Acc) ->
     case collect(I) of
 	error -> {reverse(Acc),Is0};
@@ -100,23 +81,20 @@ collect({allocate_heap,Ns,Nh,R}) -> {set,[],[],{alloc,R,{nozero,Ns,Nh,[]}}};
 collect({allocate_heap_zero,Ns,Nh,R}) -> {set,[],[],{alloc,R,{zero,Ns,Nh,[]}}};
 collect({init,D})            -> {set,[D],[],init};
 collect({test_heap,N,R})     -> {set,[],[],{alloc,R,{nozero,nostack,N,[]}}};
-collect({bif,N,F,As,D})      -> {set,[D],As,{bif,N,F}};
-collect({gc_bif,N,F,R,As,D}) -> {set,[D],As,{alloc,R,{gc_bif,N,F}}};
+collect({bif,N,{f,0},As,D})  -> {set,[D],As,{bif,N,{f,0}}};
+collect({gc_bif,N,{f,0},R,As,D}) ->   {set,[D],As,{alloc,R,{gc_bif,N,{f,0}}}};
 collect({move,S,D})          -> {set,[D],[S],move};
 collect({put_list,S1,S2,D})  -> {set,[D],[S1,S2],put_list};
 collect({put_tuple,A,D})     -> {set,[D],[],{put_tuple,A}};
 collect({put,S})             -> {set,[],[S],put};
+collect({put_tuple2,D,{list,Els}}) -> {set,[D],Els,put_tuple2};
 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_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}}};
-collect({'catch'=Op,R,L}) ->
-    {set,[R],[],{try_catch,Op,L}};
-collect({'try'=Op,R,L}) ->
-    {set,[R],[],{try_catch,Op,L}};
+collect({put_map,{f,0},Op,S,D,R,{list,Puts}}) ->
+    {set,[D],[S|Puts],{alloc,R,{put_map,Op,{f,0}}}};
 collect(fclearerror)         -> {set,[],[],fclearerror};
 collect({fcheckerror,{f,0}}) -> {set,[],[],fcheckerror};
 collect({fmove,S,D})         -> {set,[D],[S],fmove};
@@ -137,557 +115,39 @@ 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.
-    [{'%anno',_}|Bl] = Bl0,
-    [{block,opt_block(Bl)}|opt_blocks(Is)];
-opt_blocks([I|Is]) ->
-    [I|opt_blocks(Is)];
-opt_blocks([]) -> [].
-
-opt_block(Is0) ->
-    find_fixpoint(fun(Is) ->
-                          opt_tuple_element(opt(Is))
-                  end, Is0).
-
-find_fixpoint(OptFun, Is0) ->
-    case OptFun(Is0) of
-	Is0 -> Is0;
-	Is1 -> find_fixpoint(OptFun, Is1)
-    end.
-
-%% move_allocates(Is0) -> Is
-%%  Move allocate instructions upwards in the instruction stream
-%%  (within the same block), in the hope of getting more possibilities
-%%  for optimizing away moves later.
-%%
-%%  For example, we can transform the following instructions:
-%%
-%%     get_tuple_element x(1) Element => x(2)
-%%     allocate_zero StackSize 3    %% x(0), x(1), x(2) are live
-%%
-%%  to the following instructions:
-%%
-%%     allocate_zero StackSize 2    %% x(0) and x(1) are live
-%%     get_tuple_element x(1) Element => x(2)
-%%
-%%  NOTE: Since the beam_reorder pass has been run, it is no longer
-%%  safe to assume that if x(N) is initialized, then all lower-numbered
-%%  x registers are also initialized.
-%%
-%%  For example, we must be careful when transforming the following
-%%  instructions:
-%%
-%%     get_tuple_element x(0) Element => x(1)
-%%     allocate_zero StackSize 3    %x(0), x(1), x(2) are live
-%%
-%%  to the following instructions:
-%%
-%%     allocate_zero StackSize 3
-%%     get_tuple_element x(0) Element => x(1)
-%%
-%%  The transformation is safe if and only if x(1) has been
-%%  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), []),
-    [{block,Bl}|move_allocates(Is)];
-move_allocates([I|Is]) ->
-    [I|move_allocates(Is)];
-move_allocates([]) -> [].
-
-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([{'%anno',_}=I|Is]) ->
-    [I|opt(Is)];
-opt([]) -> [].
-
-%% opt_moves([Dest], [Instruction]) -> {[Dest],[Instruction]}
-%%  For each Dest, does the optimization described in opt_move/2.
-
-opt_moves([], Is0) -> {[],Is0};
-opt_moves([D0]=Ds, Is0) ->
-    case opt_move(D0, Is0) of
-	not_possible -> {Ds,Is0};
-	{D1,Is} -> {[D1],Is}
-    end.
-
-%% opt_move(Dest, [Instruction]) -> {UpdatedDest,[Instruction]} | not_possible
-%%  If there is a {move,Dest,FinalDest} instruction
-%%  in the instruction stream, remove the move instruction
-%%  and let FinalDest be the destination.
-
-opt_move(Dest, Is) ->
-    opt_move_1(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
-	{yes,Is} -> opt_move_rev(D, Acc, Is);
-	no -> not_possible
-    end;
-opt_move_1(_R, [{set,_,_,{alloc,_,_}}|_], _) ->
-    %% The optimization is either not possible or not safe.
-    %%
-    %% If R is an X register killed by allocation, the optimization is
-    %% not safe. On the other hand, if the X register is killed, there
-    %% will not follow a 'move' instruction with this X register as
-    %% the source.
-    %%
-    %% If R is a Y register, the optimization is still not safe
-    %% because the new target register is an X register that cannot
-    %% safely pass the alloc instruction.
-    not_possible;
-opt_move_1(R, [{set,_,_,_}=I|Is], Acc) ->
-    %% If the source register is either killed or used by this
-    %% instruction, the optimimization is not possible.
-    case is_killed_or_used(R, I) of
-	true -> not_possible;
-	false -> opt_move_1(R, Is, [I|Acc])
-    end;
-opt_move_1(_, _, _) ->
-    not_possible.
-
-%% opt_tuple_element([Instruction]) -> [Instruction]
-%%  If possible, move get_tuple_element instructions forward
-%%  in the instruction stream to a move instruction, eliminating
-%%  the move instruction. Example:
-%%
-%%    get_tuple_element Tuple Pos Dst1
-%%    ...
-%%    move Dst1 Dst2
-%%
-%%  This code may be possible to rewrite to:
-%%
-%%    %%(Moved get_tuple_element instruction)
-%%    ...
-%%    get_tuple_element Tuple Pos Dst2
-%%
-
-opt_tuple_element([{set,[D],[S],{get_tuple_element,_}}=I|Is0]) ->
-    case opt_tuple_element_1(Is0, I, {S,D}, []) of
-	no ->
-	    [I|opt_tuple_element(Is0)];
-	{yes,Is} ->
-	    opt_tuple_element(Is)
-    end;
-opt_tuple_element([I|Is]) ->
-    [I|opt_tuple_element(Is)];
-opt_tuple_element([]) -> [].
-
-opt_tuple_element_1([{set,_,_,{alloc,_,_}}|_], _, _, _) ->
-    no;
-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
-	no ->
-	    no;
-	{yes,Is1} ->
-	    {set,[S],Ss,Op} = I0,
-	    I = {set,[D],Ss,Op},
-            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
-	true ->
-	    no;
-	false ->
-	    opt_tuple_element_1(Is, MovedI, Regs, [I|Acc])
-    end;
-opt_tuple_element_1(_, _, _, _) -> no.
-
-%% Reverse the instructions, while checking that there are no
-%% instructions that would interfere with using the new destination
-%% register (D).
-
-opt_move_rev(D, [I|Is], Acc) ->
-    case is_killed_or_used(D, I) of
-	true -> not_possible;
-	false -> opt_move_rev(D, Is, [I|Acc])
-    end;
-opt_move_rev(D, [], Acc) -> {D,Acc}.
-
-%% is_killed_or_used(Register, {set,_,_,_}) -> bool()
-%%  Test whether the register is used by the instruction.
-
-is_killed_or_used(R, {set,Ss,Ds,_}) ->
-    member(R, Ds) orelse member(R, Ss).
-
-%% eliminate_use_of_from_reg([Instruction], FromRegister, ToRegister, Acc) ->
-%%       {yes,Is} | no
-%%  Eliminate any use of FromRegister in the instruction sequence
-%%  by replacing uses of FromRegister with ToRegister. If FromRegister
-%%  is referenced by an allocation instruction, return 'no' to indicate
-%%  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 ->
-	    no;
-	true ->
-	    {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,
-    case member(From, Ds) of
-        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
-	true ->
-	    {yes,reverse(Acc, Is)};
-	false ->
-	    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], D) ->
-    Live = Live0,				%Assertion.
-    Alloc = combine_alloc(Info0, Info),
-    I = {set,[],[],{alloc,Live,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, _D, nostack, Nh, LivingRegs) ->
-    {alloc,LivingRegs,{nozero,nostack,Nh,[]}};
-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)}};
-	_ ->
-	    {alloc,LivingRegs,{zero,Ns,Nh,[]}}
-    end.
-
-gen_init(Fs, Regs) -> gen_init(Fs, Regs, 0, []).
-
-gen_init(SameFs, _Regs, SameFs, Acc) -> reverse(Acc);
-gen_init(Fs, Regs, Y, Acc) when Regs band 1 =:= 0 ->
-    gen_init(Fs, Regs bsr 1, Y+1, [{init,{y,Y}}|Acc]);
-gen_init(Fs, Regs, Y, Acc) ->
-    gen_init(Fs, Regs bsr 1, Y+1, Acc).
-
-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;
-count_ones(Bits, Acc) ->
-    count_ones(Bits bsr 1, Acc + (Bits band 1)).
-
-%% Calculate the new number of live registers when we move an allocate
-%% instruction upwards, passing a 'set' instruction.
-
-alloc_live_regs({set,Ds,Ss,_}, Is, Regs0) ->
-    Rset = x_live(Ss, x_dead(Ds, (1 bsl Regs0)-1)),
-    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) ->
-    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);
-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
+%% sort_moves([Instruction]) -> [Instruction].
+%%  Sort move instructions on the Y register to give the loader
+%%  more opportunities for combining instructions.
+
+sort_moves([{set,[{x,_}],[{y,_}],move}=I|Is0]) ->
+    {Moves,Is} = sort_moves_1(Is0, x, y, [I]),
+    Moves ++ sort_moves(Is);
+sort_moves([{set,[{y,_}],[{x,_}],move}=I|Is0]) ->
+    {Moves,Is} = sort_moves_1(Is0, y, x, [I]),
+    Moves ++ sort_moves(Is);
+sort_moves([I|Is]) ->
+    [I|sort_moves(Is)];
+sort_moves([]) -> [].
+
+sort_moves_1([{set,[{x,0}],[_],move}=I|Is], _DTag, _STag, Acc) ->
+    %% The loader sometimes combines a move to x0 with the
+    %% instruction that follows, producing, for example, a move_call
+    %% instruction. Therefore, we don't want include this move
+    %% instruction in the sorting.
+    {sort_on_yreg(Acc)++[I],Is};
+sort_moves_1([{set,[{DTag,_}],[{STag,_}],move}=I|Is], DTag, STag, Acc) ->
+    sort_moves_1(Is, DTag, STag, [I|Acc]);
+sort_moves_1(Is, _DTag, _STag, Acc) ->
+    {sort_on_yreg(Acc),Is}.
+
+sort_on_yreg([{set,[Dst],[Src],move}|_]=Moves) ->
+    case {Dst,Src} of
+        {{y,_},{x,_}} ->
+            keysort(2, Moves);
+        {{x,_},{y,_}} ->
+            keysort(3, Moves)
     end.
diff --git a/lib/compiler/src/beam_bs.erl b/lib/compiler/src/beam_bs.erl
deleted file mode 100644
index 5f1b9ed488..0000000000
--- a/lib/compiler/src/beam_bs.erl
+++ /dev/null
@@ -1,280 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% 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.
-%% 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 : Partitions assembly instructions into basic blocks and
-%% optimizes them.
-
--module(beam_bs).
-
--export([module/2]).
--import(lists, [mapfoldl/3,reverse/1]).
-
--spec module(beam_utils:module_code(), [compile:option()]) ->
-                    {'ok',beam_utils:module_code()}.
-
-module({Mod,Exp,Attr,Fs0,Lc0}, _Opt) ->
-    {Fs,Lc} = mapfoldl(fun function/2, Lc0, Fs0),
-    {ok,{Mod,Exp,Attr,Fs,Lc}}.
-
-function({function,Name,Arity,CLabel,Is0}, Lc0) ->
-    try
-	Is1 = bs_put_opt(Is0),
-	{Is,Lc} = bsm_opt(Is1, Lc0),
-	{{function,Name,Arity,CLabel,Is},Lc}
-    catch
-        Class:Error:Stack ->
-	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
-	    erlang:raise(Class, Error, Stack)
-    end.
-
-%%%
-%%% Evaluation of constant bit fields.
-%%%
-
-bs_put_opt([{bs_put,_,_,_}=I|Is0]) ->
-    {BsPuts0,Is} = collect_bs_puts(Is0, [I]),
-    BsPuts = opt_bs_puts(BsPuts0),
-    BsPuts ++ bs_put_opt(Is);
-bs_put_opt([I|Is]) ->
-    [I|bs_put_opt(Is)];
-bs_put_opt([]) -> [].
-
-collect_bs_puts([{bs_put,_,_,_}=I|Is], Acc) ->
-    collect_bs_puts(Is, [I|Acc]);
-collect_bs_puts([_|_]=Is, Acc) ->
-    {reverse(Acc),Is}.
-
-opt_bs_puts(Is) ->
-    opt_bs_1(Is, []).
-
-opt_bs_1([{bs_put,Fail,
-	   {bs_put_float,1,Flags0},[{integer,Sz},Src]}=I0|Is], Acc) ->
-    try eval_put_float(Src, Sz, Flags0) of
-	<<Int:Sz>> ->
-	    Flags = force_big(Flags0),
-	    I = {bs_put,Fail,{bs_put_integer,1,Flags},
-		 [{integer,Sz},{integer,Int}]},
-	    opt_bs_1([I|Is], Acc)
-    catch
-	error:_ ->
-	    opt_bs_1(Is, [I0|Acc])
-    end;
-opt_bs_1([{bs_put,_,{bs_put_integer,1,_},[{integer,8},{integer,_}]}|_]=IsAll,
-	 Acc0) ->
-    {Is,Acc} = bs_collect_string(IsAll, Acc0),
-    opt_bs_1(Is, Acc);
-opt_bs_1([{bs_put,Fail,{bs_put_integer,1,F},[{integer,Sz},{integer,N}]}=I|Is0],
-	 Acc) when Sz > 8 ->
-    case field_endian(F) of
-	big ->
-	    %% We can do this optimization for any field size without
-	    %% risk for code explosion.
-	    case bs_split_int(N, Sz, Fail, Is0) of
-		no_split -> opt_bs_1(Is0, [I|Acc]);
-		Is -> opt_bs_1(Is, Acc)
-	    end;
-	little when Sz < 128 ->
-	    %% We only try to optimize relatively small fields, to
-	    %% avoid an explosion in code size.
-	    <<Int:Sz>> = <<N:Sz/little>>,
-	    Flags = force_big(F),
-	    Is = [{bs_put,Fail,{bs_put_integer,1,Flags},
-		   [{integer,Sz},{integer,Int}]}|Is0],
-	    opt_bs_1(Is, Acc);
-	_ ->			      %native or too wide little field
-	    opt_bs_1(Is0, [I|Acc])
-    end;
-opt_bs_1([{bs_put,Fail,{Op,U,F},[{integer,Sz},Src]}|Is], Acc) when U > 1 ->
-    opt_bs_1([{bs_put,Fail,{Op,1,F},[{integer,U*Sz},Src]}|Is], Acc);
-opt_bs_1([I|Is], Acc) ->
-    opt_bs_1(Is, [I|Acc]);
-opt_bs_1([], Acc) -> reverse(Acc).
-
-eval_put_float(Src, Sz, Flags) when Sz =< 256 ->
-    %%Only evaluate if Sz is reasonable.
-    Val = value(Src),
-    case field_endian(Flags) of
-	little -> <<Val:Sz/little-float-unit:1>>;
-	big -> <<Val:Sz/big-float-unit:1>>
-        %% native intentionally not handled here - we can't optimize
-        %% it.
-    end.
-
-value({integer,I}) -> I;
-value({float,F}) -> F.
-
-bs_collect_string(Is, [{bs_put,_,{bs_put_string,Len,{string,Str}},[]}|Acc]) ->
-    bs_coll_str_1(Is, Len, reverse(Str), Acc);
-bs_collect_string(Is, Acc) ->
-    bs_coll_str_1(Is, 0, [], Acc).
-
-bs_coll_str_1([{bs_put,_,{bs_put_integer,U,_},[{integer,Sz},{integer,V}]}|Is],
-	      Len, StrAcc, IsAcc) when U*Sz =:= 8 ->
-    Byte = V band 16#FF,
-    bs_coll_str_1(Is, Len+1, [Byte|StrAcc], IsAcc);
-bs_coll_str_1(Is, Len, StrAcc, IsAcc) ->
-    {Is,[{bs_put,{f,0},{bs_put_string,Len,{string,reverse(StrAcc)}},[]}|IsAcc]}.
-
-field_endian({field_flags,F}) -> field_endian_1(F).
-
-field_endian_1([big=E|_]) -> E;
-field_endian_1([little=E|_]) -> E;
-field_endian_1([native=E|_]) -> E;
-field_endian_1([_|Fs]) -> field_endian_1(Fs).
-
-force_big({field_flags,F}) ->
-    {field_flags,force_big_1(F)}.
-
-force_big_1([big|_]=Fs) -> Fs;
-force_big_1([little|Fs]) -> [big|Fs];
-force_big_1([F|Fs]) -> [F|force_big_1(Fs)].
-
-bs_split_int(0, Sz, _, _) when Sz > 64 ->
-    %% We don't want to split in this case because the
-    %% string will consist of only zeroes.
-    no_split;
-bs_split_int(-1, Sz, _, _) when Sz > 64 ->
-    %% We don't want to split in this case because the
-    %% string will consist of only 255 bytes.
-    no_split;
-bs_split_int(N, Sz, Fail, Acc) ->
-    FirstByteSz = case Sz rem 8 of
-		      0 -> 8;
-		      Rem -> Rem
-		  end,
-    bs_split_int_1(N, FirstByteSz, Sz, Fail, Acc).
-
-bs_split_int_1(-1, _, Sz, Fail, Acc) when Sz > 64 ->
-    I = {bs_put,Fail,{bs_put_integer,1,{field_flags,[big]}},
-	 [{integer,Sz},{integer,-1}]},
-    [I|Acc];
-bs_split_int_1(0, _, Sz, Fail, Acc) when Sz > 64 ->
-    I = {bs_put,Fail,{bs_put_integer,1,{field_flags,[big]}},
-	 [{integer,Sz},{integer,0}]},
-    [I|Acc];
-bs_split_int_1(N, ByteSz, Sz, Fail, Acc) when Sz > 0 ->
-    Mask = (1 bsl ByteSz) - 1,
-    I = {bs_put,Fail,{bs_put_integer,1,{field_flags,[big]}},
-	 [{integer,ByteSz},{integer,N band Mask}]},
-    bs_split_int_1(N bsr ByteSz, 8, Sz-ByteSz, Fail, [I|Acc]);
-bs_split_int_1(_, _, _, _, Acc) -> Acc.
-
-%%%
-%%% Optimization of bit syntax matching: get rid
-%%% of redundant bs_restore2/2 instructions across select_val
-%%% instructions, as well as a few other simple peep-hole
-%%% optimizations.
-%%%
-
-bsm_opt(Is0, Lc0) ->
-    {Is1,D0,Lc} = bsm_scan(Is0, [], Lc0, []),
-    Is2 = case D0 of
-	      [] ->
-		  %% No bit syntax matching in this function.
-		  Is1;
-	      [_|_] ->
-		  %% Optimize the bit syntax matching.
-		  D = gb_trees:from_orddict(orddict:from_list(D0)),
-		  bsm_reroute(Is1, D, none, [])
-	 end,
-    Is = beam_clean:bs_clean_saves(Is2),
-    {bsm_opt_2(Is, []),Lc}.
-
-bsm_scan([{label,L}=Lbl,{bs_restore2,_,Save}=R|Is], D0, Lc, Acc0) ->
-    D = [{{L,Save},Lc}|D0],
-    Acc = [{label,Lc},R,Lbl|Acc0],
-    bsm_scan(Is, D, Lc+1, Acc);
-bsm_scan([I|Is], D, Lc, Acc) ->
-    bsm_scan(Is, D, Lc, [I|Acc]);
-bsm_scan([], D, Lc, Acc) ->
-    {reverse(Acc),D,Lc}.
-
-bsm_reroute([{bs_save2,Reg,Save}=I|Is], D, _, Acc) ->
-    bsm_reroute(Is, D, {Reg,Save}, [I|Acc]);
-bsm_reroute([{bs_restore2,Reg,Save}=I|Is], D, _, Acc) ->
-    bsm_reroute(Is, D, {Reg,Save}, [I|Acc]);
-bsm_reroute([{label,_}=I|Is], D, S, Acc) ->
-    bsm_reroute(Is, D, S, [I|Acc]);
-bsm_reroute([{select,select_val,Reg,F0,Lbls0}|Is], D, {_,Save}=S, Acc0) ->
-    [F|Lbls] = bsm_subst_labels([F0|Lbls0], Save, D),
-    Acc = [{select,select_val,Reg,F,Lbls}|Acc0],
-    bsm_reroute(Is, D, S, Acc);
-bsm_reroute([{test,TestOp,F0,TestArgs}=I|Is], D, {_,Save}=S, Acc0) ->
-    F = bsm_subst_label(F0, Save, D),
-    Acc = [{test,TestOp,F,TestArgs}|Acc0],
-    case bsm_not_bs_test(I) of
-	true ->
-	    %% The test instruction will not update the bit offset for
-	    %% the binary being matched. Therefore the save position
-	    %% can be kept.
-	    bsm_reroute(Is, D, S, Acc);
-	false ->
-	    %% The test instruction might update the bit offset. Kill
-	    %% our remembered Save position.
-	    bsm_reroute(Is, D, none, Acc)
-    end;
-bsm_reroute([{test,TestOp,F0,Live,TestArgs,Dst}|Is], D, {_,Save}, Acc0) ->
-    F = bsm_subst_label(F0, Save, D),
-    Acc = [{test,TestOp,F,Live,TestArgs,Dst}|Acc0],
-    %% The test instruction will update the bit offset. Kill our
-    %% remembered Save position.
-    bsm_reroute(Is, D, none, Acc);
-bsm_reroute([{block,[{set,[],[],{alloc,_,_}}]}=Bl,
-	     {bs_context_to_binary,_}=I|Is], D, S, Acc) ->
-    %% To help further bit syntax optimizations.
-    bsm_reroute([I,Bl|Is], D, S, Acc);
-bsm_reroute([I|Is], D, _, Acc) ->
-    bsm_reroute(Is, D, none, [I|Acc]);
-bsm_reroute([], _, _, Acc) -> reverse(Acc).
-
-bsm_opt_2([{test,bs_test_tail2,F,[Ctx,Bits]}|Is],
-	  [{test,bs_skip_bits2,F,[Ctx,{integer,I},Unit,_Flags]}|Acc]) ->
-    bsm_opt_2(Is, [{test,bs_test_tail2,F,[Ctx,Bits+I*Unit]}|Acc]);
-bsm_opt_2([{test,bs_skip_bits2,F,[Ctx,{integer,I1},Unit1,_]}|Is],
-	  [{test,bs_skip_bits2,F,[Ctx,{integer,I2},Unit2,Flags]}|Acc]) ->
-    bsm_opt_2(Is, [{test,bs_skip_bits2,F,
-		    [Ctx,{integer,I1*Unit1+I2*Unit2},1,Flags]}|Acc]);
-bsm_opt_2([I|Is], Acc) ->
-    bsm_opt_2(Is, [I|Acc]);
-bsm_opt_2([], Acc) -> reverse(Acc).
-
-%% bsm_not_bs_test({test,Name,_,Operands}) -> true|false.
-%%  Test whether is the test is a "safe", i.e. does not move the
-%%  bit offset for a binary.
-%%
-%%  'true' means that the test is safe, 'false' that we don't know or
-%%  that the test moves the offset (e.g. bs_get_integer2).
-
-bsm_not_bs_test({test,bs_test_tail2,_,[_,_]}) -> true;
-bsm_not_bs_test(Test) -> beam_utils:is_pure_test(Test).
-
-bsm_subst_labels(Fs, Save, D) ->
-    bsm_subst_labels_1(Fs, Save, D, []).
-
-bsm_subst_labels_1([F|Fs], Save, D, Acc) ->
-    bsm_subst_labels_1(Fs, Save, D, [bsm_subst_label(F, Save, D)|Acc]);
-bsm_subst_labels_1([], _, _, Acc) ->
-    reverse(Acc).
-
-bsm_subst_label({f,Lbl0}=F, Save, D) ->
-    case gb_trees:lookup({Lbl0,Save}, D) of
-	{value,Lbl} -> {f,Lbl};
-	none -> F
-    end;
-bsm_subst_label(Other, _, _) -> Other.
diff --git a/lib/compiler/src/beam_bsm.erl b/lib/compiler/src/beam_bsm.erl
deleted file mode 100644
index 1c8e0e9854..0000000000
--- a/lib/compiler/src/beam_bsm.erl
+++ /dev/null
@@ -1,708 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2007-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(beam_bsm).
--export([module/2,format_error/1]).
-
--import(lists, [member/2,foldl/3,reverse/1,sort/1,all/2]).
-
-%%%
-%%% We optimize bit syntax matching where the tail end of a binary is
-%%% matched out and immediately passed on to a bs_start_match2 instruction,
-%%% such as in this code sequence:
-%%%
-%%%     func_info ...
-%%% L1	test bs_start_match2 {f,...} {x,0} Live SavePositions {x,0}
-%%%              . . .
-%%%     test bs_get_binary2 {f,...} {x,0} all 1 Flags {x,0}
-%%%              . . .
-%%%     call_only 2 L1
-%%%
-%%% The sequence can be optimized simply by removing the bs_get_binary2
-%%% instruction. Another example:
-%%%
-%%%     func_info ...
-%%% L1	test bs_start_match2 {f,...} {x,0} Live SavePositions {x,0}
-%%%              . . .
-%%%     test bs_get_binary2 {f,...} {x,0} all 8 Flags {x,1}
-%%%              . . .
-%%%     move {x,1} {x,0}
-%%%     call_only 2 L1
-%%%
-%%% In this case, the bs_get_binary2 instruction must be replaced by
-%%%
-%%%	test bs_unit {x,1} 8
-%%%
-%%% to ensure that the match fail if the length of the binary in bits
-%%% is not evenly divisible by 8.
-%%%
-%%% Note that the bs_start_match2 instruction doesn't need to be in the same
-%%% function as the caller. It can be in the beginning of any function, or
-%%% follow the bs_get_binary2 instruction in the same function. The important
-%%% thing is that the match context register is not copied or built into
-%%% data structures or passed to BIFs.
-%%%
-
--type label() :: beam_asm:label().
--type func_info() :: {beam_asm:reg(),boolean()}.
-
--record(btb,
-	{f :: gb_trees:tree(label(), func_info()),
-	 index :: beam_utils:code_index(), %{Label,Code} index (for liveness).
-	 ok_br=gb_sets:empty() :: gb_sets:set(label()), %Labels that are OK.
-	 must_not_save=false :: boolean(), %Must not save position when
-					   % optimizing (reaches
-                                           % bs_context_to_binary).
-	 must_save=false :: boolean() %Must save position when optimizing.
-	}).
-
-
--spec module(beam_utils:module_code(), [compile:option()]) ->
-                    {'ok',beam_utils:module_code()}.
-
-module({Mod,Exp,Attr,Fs0,Lc}, Opts) ->
-    FIndex = btb_index(Fs0),
-    Fs = [function(F, FIndex) || F <- Fs0],
-    Code = {Mod,Exp,Attr,Fs,Lc},
-    case proplists:get_bool(bin_opt_info, Opts) of
-	true ->
-	    {ok,Code,collect_warnings(Fs)};
-	false ->
-	    {ok,Code}
-    end.
-
--spec format_error('bin_opt' | {'no_bin_opt', term()}) -> nonempty_string().
-
-format_error(bin_opt) ->
-    "OPTIMIZED: creation of sub binary delayed";
-format_error({no_bin_opt,Reason}) ->
-    lists:flatten(["NOT OPTIMIZED: "|format_error_1(Reason)]).
-
-%%%
-%%% Local functions.
-%%% 
-
-function({function,Name,Arity,Entry,Is}, FIndex) ->
-    try
-	Index = beam_utils:index_labels(Is),
-	D = #btb{f=FIndex,index=Index},
-	{function,Name,Arity,Entry,btb_opt_1(Is, D, [])}
-    catch
-        Class:Error:Stack ->
-	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
-	    erlang:raise(Class, Error, Stack)
-    end.
-
-btb_opt_1([{test,bs_get_binary2,F,_,[Reg,{atom,all},U,Fs],Reg}=I0|Is], D, Acc0) ->
-    case btb_reaches_match(Is, [Reg], D) of
-	{error,Reason} ->
-	    Comment = btb_comment_no_opt(Reason, Fs),
-	    btb_opt_1(Is, D, [Comment,I0|Acc0]);
-	{ok,MustSave} ->
-	    Comment = btb_comment_opt(Fs),
-	    Acc1 = btb_gen_save(MustSave, Reg, [Comment|Acc0]),
-	    Acc = case U of
-		      1 -> Acc1;
-		      _ -> [{test,bs_test_unit,F,[Reg,U]}|Acc1]
-		  end,
-	    btb_opt_1(Is, D, Acc)
-    end;
-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(Is0, D, [Comment,I0|Acc0]);
-	{ok,MustSave} when U =:= 1 ->
-	    Comment = btb_comment_opt(Fs),
-            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 = [{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) ->
-    %%io:format("~p\n", [I]),
-    btb_opt_1(Is, D, [I|Acc]);
-btb_opt_1([], _, Acc) ->
-    reverse(Acc).
-
-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}
-%%
-%%  The list of Registers should be a list of registers referencing a
-%%  match context. The Register may contain one element if the
-%%  bs_get_binary2 instruction looks like
-%%
-%%    test bs_get_binary2 {f,...} Ctx all _ _ Ctx
-%%
-%%  or two elements if the instruction looks like
-%%
-%%    test bs_get_binary2 {f,...} Ctx all _ _ Dst
-%%
-%%  This function determines whether the bs_get_binary2 instruction
-%%  can be omitted (retaining the match context instead of creating
-%%  a sub binary).
-%%
-%%  The rule is that the match context ultimately must end up at a
-%%  bs_start_match2 instruction and nowhere else. That it, it must not
-%%  be passed to BIFs, or copied or put into data structures. There
-%%  must only be one copy alive when the match context reaches the
-%%  bs_start_match2 instruction.
-%%
-%%  At a branch, we must follow all branches and make sure that the above
-%%  rule is followed (or that the branch kills the match context).
-%%
-%%  The MustSave return value will be true if control may end up at
-%%  bs_context_to_binary instruction. Since that instruction uses the
-%%  saved start position, we must use "bs_save2 Ctx start" to
-%%  update the saved start position. An additional complication is that
-%%  "bs_save2 Ctx start" must not be used if Dst and Ctx are
-%%  different registers and both registers may be passed to
-%%  a bs_context_to_binary instruction.
-%% 
-
-btb_reaches_match(Is, RegList, D) ->
-    try
-	Regs = btb_regs_from_list(RegList),
-	#btb{must_not_save=MustNotSave,must_save=MustSave} =
-            btb_reaches_match_1(Is, Regs, D),
-	case MustNotSave andalso MustSave of
-	    true -> btb_error(must_and_must_not_save);
-	    false -> {ok,MustSave}
-	end
-    catch
-	throw:{error,_}=Error -> Error
-    end.
-
-btb_reaches_match_1(Is, Regs, D) ->
-    case btb_are_registers_empty(Regs) of
-	false ->
-	    btb_reaches_match_2(Is, Regs, D);
-	true ->
-	    %% The context was killed, which is OK.
-	    D
-    end.
-
-btb_reaches_match_2([{block,Bl}|Is], Regs0, D) ->
-    Regs = btb_reaches_match_block(Bl, Regs0),
-    btb_reaches_match_1(Is, Regs, D);
-btb_reaches_match_2([{call,Arity,{f,Lbl}}|Is], Regs0, D) ->
-    case is_tail_call(Is) of
-	true ->
-	    Regs1 = btb_kill_not_live(Arity, Regs0),
-	    Regs = btb_kill_yregs(Regs1),
-	    btb_tail_call(Lbl, Regs, D);
-	false ->
-	    btb_call(Arity, Lbl, Regs0, Is, D)
-    end;
-btb_reaches_match_2([{apply,Arity}|Is], Regs, D) ->
-    btb_call(Arity+2, apply, Regs, Is, D);
-btb_reaches_match_2([{call_fun,Live}=I|Is], Regs, D) ->
-    btb_ensure_not_used([{x,Live}], I, Regs),
-    btb_call(Live, I, Regs, Is, D);
-btb_reaches_match_2([{make_fun2,_,_,_,Live}|Is], Regs, D) ->
-    btb_call(Live, make_fun2, Regs, Is, D);
-btb_reaches_match_2([{call_ext,Arity,Func}=I|Is], Regs0, D) ->
-    %% Allow us scanning beyond the call in case the match
-    %% context is saved on the stack.
-    case beam_jump:is_exit_instruction(I) of
-	false ->
-	    btb_call(Arity, Func, Regs0, Is, D);
-	true ->
-	    Regs = btb_kill_not_live(Arity, Regs0),
-	    btb_tail_call(Func, Regs, D)
-    end;
-btb_reaches_match_2([{kill,Y}|Is], Regs, D) ->
-    btb_reaches_match_1(Is, btb_kill([Y], Regs), D);
-btb_reaches_match_2([{deallocate,_}|Is], Regs0, D) ->
-    Regs = btb_kill_yregs(Regs0),
-    btb_reaches_match_1(Is, Regs, D);
-btb_reaches_match_2([return=I|_], Regs0, D) ->
-    btb_ensure_not_used([{x,0}], I, Regs0),
-    D;
-btb_reaches_match_2([{gc_bif,_,{f,F},Live,Ss,Dst}=I|Is], Regs0, D0) ->
-    btb_ensure_not_used(Ss, I, Regs0),
-    Regs1 = btb_kill_not_live(Live, Regs0),
-    Regs = btb_kill([Dst], Regs1),
-    D = btb_follow_branch(F, Regs, D0),
-    btb_reaches_match_1(Is, Regs, D);
-btb_reaches_match_2([{bif,_,{f,F},Ss,Dst}=I|Is], Regs0, D0) ->
-    btb_ensure_not_used(Ss, I, Regs0),
-    Regs = btb_kill([Dst], Regs0),
-    D = btb_follow_branch(F, Regs, D0),
-    btb_reaches_match_1(Is, Regs, D);
-btb_reaches_match_2([{get_map_elements,{f,F},Src,{list,Ls}}=I|Is], Regs0, D0) ->
-    {Ss,Ds} = beam_utils:split_even(Ls),
-    btb_ensure_not_used([Src|Ss], I, Regs0),
-    Regs = btb_kill(Ds, Regs0),
-    D = btb_follow_branch(F, Regs, D0),
-    btb_reaches_match_1(Is, Regs, D);
-btb_reaches_match_2([{test,bs_start_match2,{f,F},Live,[Ctx,_],Ctx}=I|Is],
-		    Regs0, D0) ->
-    CtxRegs = btb_context_regs(Regs0),
-    case member(Ctx, CtxRegs) of
-	false ->
-	    %% This bs_start_match2 instruction does not use "our"
-	    %% match state. Therefore we can continue the search
-	    %% for another bs_start_match2 instruction.
-	    D = btb_follow_branch(F, Regs0, D0),
-	    Regs = btb_kill_not_live(Live, Regs0),
-	    btb_reaches_match_2(Is, Regs, D);
-	true ->
-	    %% OK. This instruction will use "our" match state,
-	    %% but we must make sure that all other copies of the
-	    %% match state are killed in the code that follows
-	    %% the instruction. (We know that the fail branch cannot
-	    %% be taken in this case.)
-	    OtherCtxRegs = CtxRegs -- [Ctx],
-	    case btb_are_all_unused(OtherCtxRegs, Is, D0) of
-		false -> btb_error({OtherCtxRegs,not_all_unused_after,I});
-		true -> D0
-	    end
-    end;
-btb_reaches_match_2([{test,bs_start_match2,{f,F},Live,[Bin,_],Ctx}|Is],
-		    Regs0, D0) ->
-    CtxRegs = btb_context_regs(Regs0),
-    case member(Bin, CtxRegs) orelse member(Ctx, CtxRegs) of
-	false ->
-	    %% This bs_start_match2 does not reference any copy of the
-	    %% match state. Therefore it can safely be passed on the
-	    %% way to another (perhaps more suitable) bs_start_match2
-	    %% instruction.
-	    D = btb_follow_branch(F, Regs0, D0),
-	    Regs = btb_kill_not_live(Live, Regs0),
-	    btb_reaches_match_2(Is, Regs, D);
-	true ->
-	    %% This variant of the bs_start_match2 instruction does
-	    %% not accept a match state as source.
-	    btb_error(unsuitable_bs_start_match)
-    end;
-btb_reaches_match_2([{test,_,{f,F},Ss}=I|Is], Regs, D0) ->
-    btb_ensure_not_used(Ss, I, Regs),
-    D = btb_follow_branch(F, Regs, D0),
-    btb_reaches_match_1(Is, Regs, D);
-btb_reaches_match_2([{test,_,{f,F},_,Ss,_}=I|Is], Regs, D0) ->
-    btb_ensure_not_used(Ss, I, Regs),
-    D = btb_follow_branch(F, Regs, D0),
-    btb_reaches_match_1(Is, Regs, D);
-btb_reaches_match_2([{select,_,Src,{f,F},Conds}=I|Is], Regs, D0) ->
-    btb_ensure_not_used([Src], I, Regs),
-    D1 = btb_follow_branch(F, Regs, D0),
-    D = btb_follow_branches(Conds, Regs, D1),
-    btb_reaches_match_1(Is, Regs, D);
-btb_reaches_match_2([{jump,{f,Lbl}}|_], Regs, #btb{index=Li}=D) ->
-    Is = fetch_code_at(Lbl, Li),
-    btb_reaches_match_2(Is, Regs, D);
-btb_reaches_match_2([{label,_}|Is], Regs, D) ->
-    btb_reaches_match_2(Is, Regs, D);
-btb_reaches_match_2([{bs_init,{f,0},_,_,Ss,Dst}=I|Is], Regs, D) ->
-    btb_ensure_not_used(Ss, I, Regs),
-    btb_reaches_match_1(Is, btb_kill([Dst], Regs), D);
-btb_reaches_match_2([{bs_put,{f,0},_,Ss}=I|Is], Regs, D) ->
-    btb_ensure_not_used(Ss, I, Regs),
-    btb_reaches_match_1(Is, Regs, D);
-btb_reaches_match_2([{bs_restore2,Src,_}=I|Is], Regs0, D) ->
-    case btb_contains_context(Src, Regs0) of
-	false ->
-	    btb_reaches_match_1(Is, Regs0, D);
-	true ->
-	    %% Check that all other copies of the context registers
-	    %% are unused by the following instructions.
-	    Regs = btb_kill([Src], Regs0),
-	    CtxRegs = btb_context_regs(Regs),
-	    case btb_are_all_unused(CtxRegs, Is, D) of
-		false -> btb_error({CtxRegs,not_all_unused_after,I});
-		true -> D#btb{must_not_save=true}
-	    end
-    end;
-btb_reaches_match_2([{bs_context_to_binary,Src}=I|Is], Regs0, D) ->
-    case btb_contains_context(Src, Regs0) of
-	false ->
-	    btb_reaches_match_1(Is, Regs0, D);
-	true ->
-	    %% Check that all other copies of the context registers
-	    %% are unused by the following instructions.
-	    Regs = btb_kill([Src], Regs0),
-	    CtxRegs = btb_context_regs(Regs),
-	    case btb_are_all_unused(CtxRegs, Is, D) of
-		false -> btb_error({CtxRegs,not_all_unused_after,I});
-		true -> D#btb{must_not_save=true}
-	    end
-    end;
-btb_reaches_match_2([{badmatch,Src}=I|_], Regs, D) ->
-    btb_ensure_not_used([Src], I, Regs),
-    D;
-btb_reaches_match_2([{case_end,Src}=I|_], Regs, D) ->
-    btb_ensure_not_used([Src], I, Regs),
-    D;
-btb_reaches_match_2([if_end|_], _Regs, D) ->
-    D;
-btb_reaches_match_2([{func_info,_,_,Arity}=I|_], Regs0, D) ->
-    Regs = btb_kill_yregs(btb_kill_not_live(Arity, Regs0)),
-    case btb_context_regs(Regs) of
-	[] -> D;
-	_ -> {binary_used_in,I}
-    end;
-btb_reaches_match_2([{line,_}|Is], Regs, D) ->
-    btb_reaches_match_1(Is, Regs, D);
-btb_reaches_match_2([I|_], Regs, _) ->
-    btb_error({btb_context_regs(Regs),I,not_handled}).
-
-is_tail_call([{deallocate,_}|_]) -> true;
-is_tail_call([return|_]) -> true;
-is_tail_call(_) -> false.
-
-btb_call(Arity, Lbl, Regs0, Is, D0) ->
-    Regs = btb_kill_not_live(Arity, Regs0),
-    case btb_are_x_registers_empty(Regs) of
-	false ->
-	    %% There is a match context in one of the x registers.
-	    %% First handle the call as if it were a tail call.
-	    D = btb_tail_call(Lbl, Regs, D0),
-
-	    %% No problem so far (the called function can handle a
-	    %% match context). Now we must make sure that we don't
-	    %% have any copies of the match context tucked away in an
-	    %% y register.
-	    RegList = btb_context_regs(Regs),
-	    case [R || {y,_}=R <- RegList] of
-		[] ->
-		    D;
-		[_|_] ->
-		    btb_error({multiple_uses,RegList})
-	    end;
-	true ->
-	    %% No match context in any x register. It could have been
-	    %% saved to an y register, so continue to scan the code following
-	    %% the call.
-	    btb_reaches_match_1(Is, Regs, D0)
-    end.
-
-btb_tail_call(Lbl, Regs, #btb{f=Ftree,must_save=MustSave0}=D) ->
-    %% Ignore any y registers here.
-    case [R || {x,_}=R <- btb_context_regs(Regs)] of
-	[] ->
-	    D;
-	[{x,_}=Reg] ->
-	    case gb_trees:lookup(Lbl, Ftree) of
-		{value,{Reg,MustSave}} ->
-		    D#btb{must_save=MustSave0 or MustSave};
-		_ when is_integer(Lbl) ->
-		    btb_error({{label,Lbl},no_suitable_bs_start_match});
-		_ ->
-		    btb_error({binary_used_in,Lbl})
-	    end;
-	[_|_] when not is_integer(Lbl) ->
-	    btb_error({binary_used_in,Lbl});
-	[_|_]=RegList ->
-	    btb_error({multiple_uses,RegList})
-    end.
-
-%% btb_follow_branches([Cond], Regs, D) -> D'
-%%  Recursively follow all the branches.
-
-btb_follow_branches([{f,Lbl}|T], Regs, D0) ->
-    D = btb_follow_branch(Lbl, Regs, D0),
-    btb_follow_branches(T, Regs, D);
-btb_follow_branches([_|T], Regs, D) ->
-    btb_follow_branches(T, Regs, D);
-btb_follow_branches([], _, D) -> D.
-
-%% btb_follow_branch(Lbl, Regs, D) -> D'
-%%  Recursively follow the branch.
-
-btb_follow_branch(0, _Regs, D) -> D;
-btb_follow_branch(Lbl, Regs, #btb{ok_br=Br0,index=Li}=D) ->
-    Key = {Lbl,Regs},
-    case gb_sets:is_member(Key, Br0) of
-	true ->
-	    %% We have already followed this branch and it was OK.
-	    D;
-	false ->
-	    %% New branch. Try it.
-	    Is = fetch_code_at(Lbl, Li),
-	    #btb{ok_br=Br,must_not_save=MustNotSave,must_save=MustSave} =
-		btb_reaches_match_1(Is, Regs, D),
-
-	    %% Since we got back, this branch is OK.
-	    D#btb{ok_br=gb_sets:insert(Key, Br),must_not_save=MustNotSave,
-		  must_save=MustSave}
-    end.
-
-btb_reaches_match_block([{set,Ds,Ss,{alloc,Live,_}}=I|Is], Regs0) ->
-    %% An allocation instruction or a GC bif. We'll kill all registers
-    %% if any copy of the context is used as the source to the BIF.
-    btb_ensure_not_used(Ss, I, Regs0),
-    Regs1 = btb_kill_not_live(Live, Regs0),
-    Regs = btb_kill(Ds, Regs1),
-    btb_reaches_match_block(Is, Regs);
-btb_reaches_match_block([{set,[Dst]=Ds,[Src],move}|Is], Regs0) ->
-    Regs1 = btb_kill(Ds, Regs0),
-    Regs = case btb_contains_context(Src, Regs1) of
-	       false -> Regs1;
-	       true -> btb_set_context(Dst, Regs1)
-	   end,
-    btb_reaches_match_block(Is, Regs);
-btb_reaches_match_block([{set,Ds,Ss,_}=I|Is], Regs0) ->
-    btb_ensure_not_used(Ss, I, Regs0),
-    Regs = btb_kill(Ds, Regs0),
-    btb_reaches_match_block(Is, Regs);
-btb_reaches_match_block([], Regs) ->
-    Regs.
-
-%% btb_are_all_killed([Register], [Instruction], D) -> true|false
-%%  Test whether all of the register are unused in the instruction stream.
-
-btb_are_all_unused(RegList, Is, #btb{index=Li}) ->
-    all(fun(R) ->
-		beam_utils:is_not_used(R, Is, Li)
-	end, RegList).
-
-%% btp_regs_from_list([Register]) -> RegisterSet.
-%%  Create a register set from a list of registers.
-
-btb_regs_from_list(L) ->
-    foldl(fun(R, Regs) ->
-		  btb_set_context(R, Regs)
-	  end, {0,0}, L).
-
-%% btb_set_context(Register, RegisterSet) -> RegisterSet'
-%%  Update RegisterSet to indicate that Register contains the matching context.
-
-btb_set_context({x,N}, {Xregs,Yregs}) ->
-    {Xregs bor (1 bsl N),Yregs};
-btb_set_context({y,N}, {Xregs,Yregs}) ->
-    {Xregs,Yregs bor (1 bsl N)}.
-
-%% btb_ensure_not_used([Register], Instruction, RegisterSet) -> ok
-%%  If any register in RegisterSet (the register(s) known to contain
-%%  the match context) is used in the list of registers, generate an error.
-
-btb_ensure_not_used(Rs, I, Regs) ->
-    case lists:any(fun(R) -> btb_contains_context(R, Regs) end, Rs) of
-	true -> btb_error({binary_used_in,I});
-	false -> ok
-    end.
-
-%% btb_kill([Register], RegisterSet) -> RegisterSet'
-%%  Kill all registers mentioned in the list of registers.
-
-btb_kill([{x,N}|Rs], {Xregs,Yregs}) ->
-    btb_kill(Rs, {Xregs band (bnot (1 bsl N)),Yregs});
-btb_kill([{y,N}|Rs], {Xregs,Yregs}) ->
-    btb_kill(Rs, {Xregs,Yregs band (bnot (1 bsl N))});
-btb_kill([{fr,_}|Rs], Regs) ->
-    btb_kill(Rs, Regs);
-btb_kill([], Regs) -> Regs.
-
-%% btb_kill_not_live(Live, RegisterSet) -> RegisterSet'
-%%  Kill all registers indicated not live by Live.
-
-btb_kill_not_live(Live, {Xregs,Yregs}) ->
-    {Xregs band ((1 bsl Live)-1),Yregs}.
-
-%% btb_kill(Regs0) -> Regs
-%%  Kill all y registers.
-
-btb_kill_yregs({Xregs,_}) -> {Xregs,0}.
-
-%% btb_are_registers_empty(RegisterSet) -> true|false
-%%  Test whether the register set is empty.
-
-btb_are_registers_empty({0,0}) -> true;
-btb_are_registers_empty({_,_}) -> false.
-
-%% btb_are_x_registers_empty(Regs) -> true|false
-%%  Test whether the x registers are empty.
-
-btb_are_x_registers_empty({0,_}) -> true;
-btb_are_x_registers_empty({_,_}) -> false.
-
-%% btb_contains_context(Register, RegisterSet) -> true|false
-%%  Test whether Register contains the context.
-
-btb_contains_context({x,N}, {Regs,_}) -> Regs band (1 bsl N) =/= 0;
-btb_contains_context({y,N}, {_,Regs}) -> Regs band (1 bsl N) =/= 0;
-btb_contains_context(_, _) -> false.
-
-%% btb_context_regs(RegisterSet) -> [Register]
-%%  Convert the register set to an explicit list of registers.
-btb_context_regs({Xregs,Yregs}) ->
-    btb_context_regs_1(Xregs, 0, x, btb_context_regs_1(Yregs, 0, y, [])).
-
-btb_context_regs_1(0, _, _, Acc) ->
-    Acc;
-btb_context_regs_1(Regs, N, Tag, Acc) when (Regs band 1) =:= 1 ->
-    btb_context_regs_1(Regs bsr 1, N+1, Tag, [{Tag,N}|Acc]);
-btb_context_regs_1(Regs, N, Tag, Acc) ->
-    btb_context_regs_1(Regs bsr 1, N+1, Tag, Acc).
-
-%% btb_index([Function]) -> GbTree({EntryLabel,{Register,MustSave}})
-%%  Build an index of functions that accept a match context instead of
-%%  a binary. MustSave is true if the function may pass the match
-%%  context to the bs_context_to_binary instruction (in which case
-%%  the current position in the binary must have saved into the
-%%  start position using "bs_save_2 Ctx start").
-
-btb_index(Fs) ->
-    btb_index_1(Fs, []).
-
-btb_index_1([{function,_,_,Entry,Is0}|Fs], Acc0) ->
-    Is = drop_to_label(Is0, Entry),
-    Acc = btb_index_2(Is, Entry, false, Acc0),
-    btb_index_1(Fs, Acc);
-btb_index_1([], Acc) -> gb_trees:from_orddict(sort(Acc)).
-
-btb_index_2([{test,bs_start_match2,{f,_},_,[Reg,_],Reg}|_],
-	    Entry, MustSave, Acc) ->
-    [{Entry,{Reg,MustSave}}|Acc];
-btb_index_2(Is0, Entry, _, Acc) ->
-    try btb_index_find_start_match(Is0) of
-	Is -> btb_index_2(Is, Entry, true, Acc)
-    catch
-	throw:none -> Acc
-    end.
-
-drop_to_label([{label,L}|Is], L) -> Is;
-drop_to_label([_|Is], L) -> drop_to_label(Is, L).
-
-btb_index_find_start_match([{test,_,{f,F},_},{bs_context_to_binary,_}|Is]) ->
-    btb_index_find_label(Is, F);
-btb_index_find_start_match(_) ->
-    throw(none).
-
-btb_index_find_label([{label,L}|Is], L) -> Is;
-btb_index_find_label([_|Is], L) -> btb_index_find_label(Is, L).
-
-btb_error(Error) ->
-    throw({error,Error}).
-
-fetch_code_at(Lbl, Li) ->
-    case beam_utils:code_at(Lbl, Li) of
-	Is when is_list(Is) -> Is
-    end.
-
-%%%
-%%% Compilation information warnings.
-%%%
-
-btb_comment_opt({field_flags,[{anno,A}|_]}) ->
-    {'%',{bin_opt,A}};
-btb_comment_opt(_) ->
-    {'%',{bin_opt,[]}}.
-
-btb_comment_no_opt(Reason, {field_flags,[{anno,A}|_]}) ->
-    {'%',{no_bin_opt,Reason,A}};
-btb_comment_no_opt(Reason, _) ->
-    {'%',{no_bin_opt,Reason,[]}}.
-
-collect_warnings(Fs) ->
-    D = warning_index_functions(Fs),
-    foldl(fun(F, A) -> collect_warnings_fun(F, D, A) end, [], Fs).
-
-collect_warnings_fun({function,_,_,_,Is}, D, A) ->
-    collect_warnings_instr(Is, D, A).
-
-collect_warnings_instr([{'%',{bin_opt,Where}}|Is], D, Acc0) ->
-    Acc = add_warning(bin_opt, Where, Acc0),
-    collect_warnings_instr(Is, D, Acc);
-collect_warnings_instr([{'%',{no_bin_opt,Reason0,Where}}|Is], D, Acc0) ->
-    Reason = warning_translate_label(Reason0, D),
-    Acc = add_warning({no_bin_opt,Reason}, Where, Acc0),
-    collect_warnings_instr(Is, D, Acc);
-collect_warnings_instr([_|Is], D, Acc) ->
-    collect_warnings_instr(Is, D, Acc);
-collect_warnings_instr([], _, Acc) -> Acc.
-
-add_warning(Term, Anno, Ws) ->
-    Line = get_line(Anno),
-    File = get_file(Anno),
-    [{File,[{Line,?MODULE,Term}]}|Ws].
-
-warning_translate_label(Term, D) when is_tuple(Term) ->
-    case element(1, Term) of
-	{label,F} ->
-	    FA = gb_trees:get(F, D),
-	    setelement(1, Term, FA);
-	_ -> Term
-    end;
-warning_translate_label(Term, _) -> Term.
-
-get_line([Line|_]) when is_integer(Line) -> Line;
-get_line([_|T]) -> get_line(T);
-get_line([]) -> none.
-    
-get_file([{file,File}|_]) -> File;
-get_file([_|T]) -> get_file(T);
-get_file([]) -> "no_file". % should not happen
-
-warning_index_functions(Fs) ->
-    D = [{Entry,{F,A}} || {function,F,A,Entry,_} <- Fs],
-    gb_trees:from_orddict(sort(D)).
-
-format_error_1({binary_used_in,{extfunc,M,F,A}}) ->
-    [io_lib:format("sub binary used by ~p:~p/~p", [M,F,A])|
-     case {M,F,A} of
-	 {erlang,split_binary,2} ->
-	     "; SUGGEST using binary matching instead of split_binary/2";
-	 _ ->
-	     ""
-     end];
-format_error_1({binary_used_in,_}) ->
-    "sub binary is used or returned";
-format_error_1({multiple_uses,_}) ->
-    "sub binary is matched or used in more than one place";
-format_error_1(unsuitable_bs_start_match) ->
-    "the binary matching instruction that follows in the same function "
-	"have problems that prevent delayed sub binary optimization "
-	"(probably indicated by INFO warnings)";
-format_error_1({{F,A},no_suitable_bs_start_match}) ->
-    io_lib:format("called function ~p/~p does not begin with a suitable "
-		  "binary matching instruction", [F,A]);
-format_error_1(must_and_must_not_save) ->
-    "different control paths use different positions in the binary";
-format_error_1({_,I,not_handled}) ->
-    case I of
-	{'catch',_,_} ->
-	    "the compiler currently does not attempt the delayed sub binary "
-		"optimization when catch is used";
-	{'try',_,_} ->
-	    "the compiler currently does not attempt the delayed sub binary "
-		"optimization when try/catch is used";
-	_ ->
-	    io_lib:format("compiler limitation: instruction ~p prevents "
-			  "delayed sub binary optimization", [I])
-    end;
-format_error_1(Term) ->
-    io_lib:format("~w", [Term]).
diff --git a/lib/compiler/src/beam_clean.erl b/lib/compiler/src/beam_clean.erl
index 207f1c4deb..7299654476 100644
--- a/lib/compiler/src/beam_clean.erl
+++ b/lib/compiler/src/beam_clean.erl
@@ -22,34 +22,21 @@
 -module(beam_clean).
 
 -export([module/2]).
--export([bs_clean_saves/1]).
 -export([clean_labels/1]).
--import(lists, [foldl/3,reverse/1]).
 
 -spec module(beam_utils:module_code(), [compile:option()]) ->
                     {'ok',beam_utils:module_code()}.
 
 module({Mod,Exp,Attr,Fs0,_}, Opts) ->
     Order = [Lbl || {function,_,_,Lbl,_} <- Fs0],
-    All = foldl(fun({function,_,_,Lbl,_}=Func,D) -> dict:store(Lbl, Func, D) end,
-		dict:new(), Fs0),
+    All = maps:from_list([{Lbl,Func} || {function,_,_,Lbl,_}=Func <- Fs0]),
     WorkList = rootset(Fs0, Exp, Attr),
-    Used = find_all_used(WorkList, All, sets:from_list(WorkList)),
+    Used = find_all_used(WorkList, All, cerl_sets:from_list(WorkList)),
     Fs1 = remove_unused(Order, Used, All),
     {Fs2,Lc} = clean_labels(Fs1),
-    Fs3 = bs_fix(Fs2),
-    Fs = maybe_remove_lines(Fs3, Opts),
+    Fs = maybe_remove_lines(Fs2, Opts),
     {ok,{Mod,Exp,Attr,Fs,Lc}}.
 
-%% Remove all bs_save2/2 instructions not referenced by a bs_restore2/2.
-
--spec bs_clean_saves([beam_utils:instruction()]) ->
-                            [beam_utils:instruction()].
-
-bs_clean_saves(Is) ->
-    Needed = bs_restores(Is, []),
-    bs_clean_saves_1(Is, gb_sets:from_list(Needed), []).
-
 %% Determine the rootset, i.e. exported functions and
 %% the on_load function (if any).
 
@@ -66,16 +53,16 @@ rootset(Fs, Root0, Attr) ->
 %% Remove the unused functions.
 
 remove_unused([F|Fs], Used, All) ->
-    case sets:is_element(F, Used) of
+    case cerl_sets:is_element(F, Used) of
 	false -> remove_unused(Fs, Used, All);
-	true -> [dict:fetch(F, All)|remove_unused(Fs, Used, All)]
+	true -> [map_get(F, All)|remove_unused(Fs, Used, All)]
     end;
 remove_unused([], _, _) -> [].
-	    
+
 %% Find all used functions.
 
 find_all_used([F|Fs0], All, Used0) ->
-    {function,_,_,_,Code} = dict:fetch(F, All),
+    {function,_,_,_,Code} = map_get(F, All),
     {Fs,Used} = update_work_list(Code, {Fs0,Used0}),
     find_all_used(Fs, All, Used);
 find_all_used([], _All, Used) -> Used.
@@ -89,20 +76,16 @@ update_work_list([_|Is], Sets) ->
 update_work_list([], Sets) -> Sets.
 
 add_to_work_list(F, {Fs,Used}=Sets) ->
-    case sets:is_element(F, Used) of
+    case cerl_sets:is_element(F, Used) of
 	true -> Sets;
-	false -> {[F|Fs],sets:add_element(F, Used)}
+	false -> {[F|Fs],cerl_sets:add_element(F, Used)}
     end.
 
 
 %%%
 %%% Coalesce adjacent labels. Renumber all labels to eliminate gaps.
-%%% This cleanup will slightly reduce file size and slightly speed up loading.
-%%%
-%%% We also expand is_record/3 to a sequence of instructions. It is done
-%%% here merely because this module will always be called even if optimization
-%%% is turned off. We don't want to do the expansion in beam_asm because we
-%%% want to see the expanded code in a .S file.
+%%% This cleanup will slightly reduce file size and slightly speed up
+%%% loading.
 %%%
 
 -type label() :: beam_asm:label().
@@ -127,45 +110,6 @@ function_renumber([{function,Name,Arity,_Entry,Asm0}|Fs], St0, Acc) ->
     function_renumber(Fs, St, [{function,Name,Arity,St#st.entry,Asm}|Acc]);
 function_renumber([], St, Acc) -> {Acc,St}.
 
-renumber_labels([{bif,is_record,{f,_},
-		  [Term,{atom,Tag}=TagAtom,{integer,Arity}],Dst}|Is0], Acc, St) ->
-    ContLabel = 900000000+2*St#st.lc,
-    FailLabel = ContLabel+1,
-    Fail = {f,FailLabel},
-    Tmp = Dst,
-    Is = case is_record_tuple(Term, Tag, Arity) of
-	     yes ->
-		 [{move,{atom,true},Dst}|Is0];
-	     no ->
-		 [{move,{atom,false},Dst}|Is0];
-	     maybe ->
-		 [{test,is_tuple,Fail,[Term]},
-		  {test,test_arity,Fail,[Term,Arity]},
-		  {get_tuple_element,Term,0,Tmp},
-		  {test,is_eq_exact,Fail,[Tmp,TagAtom]},
-		  {move,{atom,true},Dst},
-		  {jump,{f,ContLabel}},
-		  {label,FailLabel},
-		  {move,{atom,false},Dst},
-		  {jump,{f,ContLabel}},	%Improves optimization by beam_dead.
-		  {label,ContLabel}|Is0]
-	 end,
-    renumber_labels(Is, Acc, St);
-renumber_labels([{test,is_record,{f,_}=Fail,
-		  [Term,{atom,Tag}=TagAtom,{integer,Arity}]}|Is0], Acc, St) ->
-    Tmp = {x,1022},
-    Is = case is_record_tuple(Term, Tag, Arity) of
-	     yes ->
-		 Is0;
-	     no ->
-		 [{jump,Fail}|Is0];
-	     maybe ->
-		 [{test,is_tuple,Fail,[Term]},
-		  {test,test_arity,Fail,[Term,Arity]},
-		  {get_tuple_element,Term,0,Tmp},
-		  {test,is_eq_exact,Fail,[Tmp,TagAtom]}|Is0]
-	 end,
-    renumber_labels(Is, Acc, St);
 renumber_labels([{label,Old}|Is], [{label,New}|_]=Acc, #st{lmap=D0}=St) ->
     D = [{Old,New}|D0],
     renumber_labels(Is, Acc, St#st{lmap=D});
@@ -179,12 +123,6 @@ renumber_labels([I|Is], Acc, St0) ->
     renumber_labels(Is, [I|Acc], St0);
 renumber_labels([], Acc, St) -> {Acc,St}.
 
-is_record_tuple({x,_}, _, _) -> maybe;
-is_record_tuple({y,_}, _, _) -> maybe;
-is_record_tuple({literal,Tuple}, Tag, Arity)
-  when element(1, Tuple) =:= Tag, tuple_size(Tuple) =:= Arity -> yes;
-is_record_tuple(_, _, _) -> no.
-
 function_replace([{function,Name,Arity,Entry,Asm0}|Fs], Dict, Acc) ->
     Asm = try
               Fb = fun(Old) -> throw({error,{undefined_label,Old}}) end,
@@ -199,100 +137,6 @@ function_replace([{function,Name,Arity,Entry,Asm0}|Fs], Dict, Acc) ->
 function_replace([], _, Acc) -> Acc.
 
 %%%
-%%% Final fixup of bs_start_match2/5,bs_save2/bs_restore2 instructions for
-%%% new bit syntax matching (introduced in R11B).
-%%%
-%%% Pass 1: Scan the code, looking for bs_restore2/2 instructions.
-%%%
-%%% Pass 2: Update bs_save2/2 and bs_restore/2 instructions. Remove
-%%% any bs_save2/2 instruction whose save position are never referenced
-%%% by any bs_restore2/2 instruction.
-%%%
-%%% Note this module can be invoked several times, so we must be careful
-%%% not to touch instructions that have already been fixed up.
-%%%
-
-bs_fix(Fs) ->
-    bs_fix(Fs, []).
-
-bs_fix([{function,Name,Arity,Entry,Asm0}|Fs], Acc) ->
-    Asm = bs_function(Asm0),
-    bs_fix(Fs, [{function,Name,Arity,Entry,Asm}|Acc]);
-bs_fix([], Acc) -> reverse(Acc).
-
-bs_function(Is) ->
-    Dict0 = bs_restores(Is, []),
-    S0 = sofs:relation(Dict0, [{context,save_point}]),
-    S1 = sofs:relation_to_family(S0),
-    S = sofs:to_external(S1),
-    Dict = make_save_point_dict(S, []),
-    bs_replace(Is, Dict, []).
-
-make_save_point_dict([{Ctx,Pts}|T], Acc0) ->
-    Acc = make_save_point_dict_1(Pts, Ctx, 0, Acc0),
-    make_save_point_dict(T, Acc);
-make_save_point_dict([], Acc) ->
-    gb_trees:from_orddict(ordsets:from_list(Acc)).
-
-make_save_point_dict_1([H|T], Ctx, I, Acc) ->
-    make_save_point_dict_1(T, Ctx, I+1, [{{Ctx,H},I}|Acc]);
-make_save_point_dict_1([], Ctx, I, Acc) ->
-    [{Ctx,I}|Acc].
-
-%% Pass 1.
-bs_restores([{bs_restore2,_,{Same,Same}}|Is], Dict) ->
-    %% This save point is special. No explicit save is needed.
-    bs_restores(Is, Dict);
-bs_restores([{bs_restore2,_,{atom,start}}|Is], Dict) ->
-    %% This instruction can occur if "compilation"
-    %% started from a .S file.
-    bs_restores(Is, Dict);
-bs_restores([{bs_restore2,_,{_,_}=SavePoint}|Is], Dict) ->
-    bs_restores(Is, [SavePoint|Dict]);
-bs_restores([_|Is], Dict) ->
-    bs_restores(Is, Dict);
-bs_restores([], Dict) -> Dict.
-    
-%% Pass 2.
-bs_replace([{test,bs_start_match2,F,Live,[Src,{context,Ctx}],CtxR}|T], Dict, Acc) ->
-    Slots = case gb_trees:lookup(Ctx, Dict) of
-		{value,Slots0} -> Slots0;
-		none -> 0
-	    end,
-    I = {test,bs_start_match2,F,Live,[Src,Slots],CtxR},
-    bs_replace(T, Dict, [I|Acc]);
-bs_replace([{bs_save2,CtxR,{_,_}=SavePoint}|T], Dict, Acc) ->
-    case gb_trees:lookup(SavePoint, Dict) of
-	{value,N} ->
-	    bs_replace(T, Dict, [{bs_save2,CtxR,N}|Acc]);
-	none ->
-	    bs_replace(T, Dict, Acc)
-    end;
-bs_replace([{bs_restore2,_,{atom,start}}=I|T], Dict, Acc) ->
-    %% This instruction can occur if "compilation"
-    %% started from a .S file.
-    bs_replace(T, Dict, [I|Acc]);    
-bs_replace([{bs_restore2,CtxR,{Same,Same}}|T], Dict, Acc) ->
-    %% This save point refers to the point in the binary where the match
-    %% started. It has a special name.
-    bs_replace(T, Dict, [{bs_restore2,CtxR,{atom,start}}|Acc]);
-bs_replace([{bs_restore2,CtxR,{_,_}=SavePoint}|T], Dict, Acc) ->
-    N = gb_trees:get(SavePoint, Dict),
-    bs_replace(T, Dict, [{bs_restore2,CtxR,N}|Acc]);
-bs_replace([I|Is], Dict, Acc) ->
-    bs_replace(Is, Dict, [I|Acc]);
-bs_replace([], _, Acc) -> reverse(Acc).
-
-bs_clean_saves_1([{bs_save2,_,{_,_}=SavePoint}=I|Is], Needed, Acc) ->
-    case gb_sets:is_member(SavePoint, Needed) of
-	false -> bs_clean_saves_1(Is, Needed, Acc);
-	true -> bs_clean_saves_1(Is, Needed, [I|Acc])
-    end;
-bs_clean_saves_1([I|Is], Needed, Acc) ->
-    bs_clean_saves_1(Is, Needed, [I|Acc]);
-bs_clean_saves_1([], _, Acc) -> reverse(Acc).
-
-%%%
 %%% Remove line instructions if requested.
 %%%
 
diff --git a/lib/compiler/src/beam_dead.erl b/lib/compiler/src/beam_dead.erl
deleted file mode 100644
index efad082152..0000000000
--- a/lib/compiler/src/beam_dead.erl
+++ /dev/null
@@ -1,971 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2002-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(beam_dead).
-
--export([module/2]).
-
-%%% Dead code is code that is executed but has no effect. This
-%%% optimization pass either removes dead code or jumps around it,
-%%% potentially making it unreachable and a target for the
-%%% the beam_jump pass.
-
--import(lists, [mapfoldl/3,reverse/1]).
-
-
--spec module(beam_utils:module_code(), [compile:option()]) ->
-                    {'ok',beam_utils:module_code()}.
-
-module({Mod,Exp,Attr,Fs0,_}, _Opts) ->
-    {Fs1,Lc1} = beam_clean:clean_labels(Fs0),
-    {Fs,Lc} = mapfoldl(fun function/2, Lc1, Fs1),
-    %%{Fs,Lc} = {Fs1,Lc1},
-    {ok,{Mod,Exp,Attr,Fs,Lc}}.
-
-function({function,Name,Arity,CLabel,Is0}, Lc0) ->
-    try
-	Is1 = beam_jump:remove_unused_labels(Is0),
-
-	%% Initialize label information with the code
-	%% for the func_info label. Without it, a register
-	%% may seem to be live when it is not.
-	[{label,L}|FiIs] = Is1,
-	D0 = beam_utils:empty_label_index(),
-	D = beam_utils:index_label(L, FiIs, D0),
-
-	%% Optimize away dead code.
-	{Is2,Lc} = forward(Is1, Lc0),
-	Is3 = backward(Is2, D),
-	Is = move_move_into_block(Is3, []),
-	{{function,Name,Arity,CLabel,Is},Lc}
-    catch
-        Class:Error:Stack ->
-	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
-	    erlang:raise(Class, Error, Stack)
-    end.
-
-%% 'move' instructions outside of blocks may thwart the jump optimizer.
-%% Move them back into the block.
-
-move_move_into_block([{block,Bl0},{move,S,D}|Is], Acc) ->
-    Bl = Bl0 ++ [{set,[D],[S],move}],
-    move_move_into_block([{block,Bl}|Is], Acc);
-move_move_into_block([{move,S,D}|Is], Acc) ->
-    Bl = [{set,[D],[S],move}],
-    move_move_into_block([{block,Bl}|Is], Acc);
-move_move_into_block([I|Is], Acc) ->
-    move_move_into_block(Is, [I|Acc]);
-move_move_into_block([], Acc) -> reverse(Acc).
-
-%%%
-%%% Scan instructions in execution order and remove redundant 'move'
-%%% instructions. 'move' instructions are redundant if we know that
-%%% the register already contains the value being assigned, as in the
-%%% following code:
-%%%
-%%%           test is_eq_exact SomeLabel Src Dst
-%%%           move Src Dst
-%%%
-%%% or in:
-%%%
-%%%           test is_nil SomeLabel Dst
-%%%           move nil Dst
-%%%
-%%% or in:
-%%%
-%%%           select_val Register FailLabel [... Literal => L1...]
-%%%                      .
-%%%                      .
-%%%                      .
-%%%   L1:     move Literal Register
-%%%
-%%% Also add extra labels to help the second backward pass.
-%%%
-
-forward(Is, Lc) ->
-    forward(Is, #{}, Lc, []).
-
-forward([{move,_,_}=Move|[{label,L}|_]=Is], D, Lc, Acc) ->
-    %% move/2 followed by jump/1 is optimized by backward/3.
-    forward([Move,{jump,{f,L}}|Is], D, Lc, Acc);
-forward([{bif,_,_,_,_}=Bif|[{label,L}|_]=Is], D, Lc, Acc) ->
-    %% bif/4 followed by jump/1 is optimized by backward/3.
-    forward([Bif,{jump,{f,L}}|Is], D, Lc, Acc);
-forward([{block,[]}|Is], D, Lc, Acc) ->
-    %% Empty blocks can prevent optimizations.
-    forward(Is, D, Lc, Acc);
-forward([{select,select_val,Reg,_,List}=I|Is], D0, Lc, Acc) ->
-    D = update_value_dict(List, Reg, D0),
-    forward(Is, D, Lc, [I|Acc]);
-forward([{label,Lbl}=LblI,{block,[{set,[Dst],[Lit],move}|BlkIs]}=Blk|Is], D, Lc, Acc) ->
-    %% Assumption: The target labels in a select_val/3 instruction
-    %% cannot be reached in any other way than through the select_val/3
-    %% instruction (i.e. there can be no fallthrough to such label and
-    %% it cannot be referenced by, for example, a jump/1 instruction).
-    Key = {Lbl,Dst},
-    Block = case D of
-                #{Key := Lit} -> {block,BlkIs}; %Safe to remove move instruction.
-                _ -> Blk                        %Must keep move instruction.
-            end,
-    forward([Block|Is], D, Lc, [LblI|Acc]);
-forward([{label,Lbl}=LblI|[{move,Lit,Dst}|Is1]=Is0], D, Lc, Acc) ->
-    %% Assumption: The target labels in a select_val/3 instruction
-    %% cannot be reached in any other way than through the select_val/3
-    %% instruction (i.e. there can be no fallthrough to such label and
-    %% it cannot be referenced by, for example, a jump/1 instruction).
-    Is = case maps:find({Lbl,Dst}, D) of
-	     {ok,Lit} -> Is1;     %Safe to remove move instruction.
-	     _ -> Is0		  %Keep move instruction.
-	 end,
-    forward(Is, D, Lc, [LblI|Acc]);
-forward([{test,is_eq_exact,_,[Same,Same]}|Is], D, Lc, Acc) ->
-    forward(Is, D, Lc, Acc);
-forward([{test,is_eq_exact,_,[Dst,Src]}=I,
-	 {block,[{set,[Dst],[Src],move}|Bl]}|Is], D, Lc, Acc) ->
-    forward([I,{block,Bl}|Is], D, Lc, Acc);
-forward([{test,is_nil,_,[Dst]}=I,
-	 {block,[{set,[Dst],[nil],move}|Bl]}|Is], D, Lc, Acc) ->
-    forward([I,{block,Bl}|Is], D, Lc, Acc);
-forward([{test,is_eq_exact,_,[Dst,Src]}=I,{move,Src,Dst}|Is], D, Lc, Acc) ->
-    forward([I|Is], D, Lc, Acc);
-forward([{test,is_nil,_,[Dst]}=I,{move,nil,Dst}|Is], D, Lc, Acc) ->
-    forward([I|Is], D, Lc, Acc);
-forward([{test,_,_,_}=I|Is]=Is0, D, Lc, Acc) ->
-    %% Help the second, backward pass to by inserting labels after
-    %% relational operators so that they can be skipped if they are
-    %% known to be true.
-    case useful_to_insert_label(Is0) of
-	false -> forward(Is, D, Lc, [I|Acc]);
-	true -> forward(Is, D, Lc+1, [{label,Lc},I|Acc])
-    end;
-forward([I|Is], D, Lc, Acc) ->
-    forward(Is, D, Lc, [I|Acc]);
-forward([], _, Lc, Acc) -> {Acc,Lc}.
-
-update_value_dict([Lit,{f,Lbl}|T], Reg, D0) ->
-    Key = {Lbl,Reg},
-    D = case D0 of
-            #{Key := inconsistent} -> D0;
-            #{Key := _} -> D0#{Key := inconsistent};
-            _ -> D0#{Key => Lit}
-        end,
-    update_value_dict(T, Reg, D);
-update_value_dict([], _, D) -> D.
-
-useful_to_insert_label([_,{label,_}|_]) ->
-    false;
-useful_to_insert_label([{test,Op,_,_}|_]) ->
-    case Op of
-	is_lt -> true;
-	is_ge -> true;
-	is_eq_exact -> true;
-	is_ne_exact -> true;
-	_ -> false
-    end.
-
-%%%
-%%% Scan instructions in reverse execution order and try to
-%%% shortcut branch instructions.
-%%%
-%%% For example, in this code:
-%%%
-%%%             move Literal Register
-%%%             jump L1
-%%%                .
-%%%                .
-%%%                .
-%%%     L1:     test is_{integer,atom} FailLabel Register
-%%%             select_val {x,0} FailLabel [... Literal => L2...]
-%%%                .
-%%%                .
-%%%                .
-%%%     L2:        ...
-%%%
-%%% the 'selectval' instruction will always transfer control to L2,
-%%% so we can just as well jump to L2 directly by rewriting the
-%%% first part of the sequence like this:
-%%%
-%%%           move Literal Register
-%%%           jump L2
-%%%
-%%% If register Register is killed at label L2, we can remove the
-%%% 'move' instruction, leaving just the 'jump' instruction:
-%%%
-%%%           jump L2
-%%%
-%%% These transformations may leave parts of the code unreachable.
-%%% The beam_jump pass will remove the unreachable code.
-
-backward(Is, D) ->
-    backward(Is, D, []).
-
-backward([{test,is_eq_exact,Fail,[Dst,{integer,Arity}]}=I|
-	  [{bif,tuple_size,Fail,[Reg],Dst}|Is]=Is0], D, Acc) ->
-    %% Provided that Dst is killed following this sequence,
-    %% we can rewrite the instructions like this:
-    %%
-    %% bif tuple_size Fail Reg Dst  ==>  is_tuple Fail Reg
-    %% is_eq_exact Fail Dst Integer    	 test_arity Fail Reg Integer
-    %%
-    %% (still two instructions, but they they will be combined to
-    %% one by the loader).
-    case beam_utils:is_killed(Dst, Acc, D) andalso (Arity bsr 32) =:= 0 of
-	false ->
-	    %% Not safe because the register Dst is not killed
-	    %% (probably cannot not happen in practice) or the arity
-	    %% does not fit in 32 bits (the loader will fail to load
-	    %% the module). We must move the first instruction to the
-	    %% accumulator to avoid an infinite loop.
-	    backward(Is0, D, [I|Acc]);
-	true ->
-	    %% Safe.
-	    backward([{test,test_arity,Fail,[Reg,Arity]},
-		      {test,is_tuple,Fail,[Reg]}|Is], D, Acc)
-    end;
-backward([{label,Lbl}=L|Is], D, Acc) ->
-    backward(Is, beam_utils:index_label(Lbl, Acc, D), [L|Acc]);
-backward([{select,select_val,Reg,{f,Fail0},List0}|Is], D, Acc) ->
-    List1 = shortcut_select_list(List0, Reg, D, []),
-    Fail1 = shortcut_label(Fail0, D),
-    Fail = shortcut_bs_test(Fail1, Is, D),
-    List = prune_redundant(List1, Fail),
-    case List of
-	[] ->
-	    Jump = {jump,{f,Fail}},
-	    backward([Jump|Is], D, Acc);
-	[V,F] ->
-	    Test = {test,is_eq_exact,{f,Fail},[Reg,V]},
-	    Jump = {jump,F},
-	    backward([Jump,Test|Is], D, Acc);
-	[{atom,B1},F,{atom,B2},F] when B1 =:= not B2 ->
-	    Test = {test,is_boolean,{f,Fail},[Reg]},
-	    Jump = {jump,F},
-	    backward([Jump,Test|Is], D, Acc);
-	[_|_] ->
-	    Sel = {select,select_val,Reg,{f,Fail},List},
-	    backward(Is, D, [Sel|Acc])
-    end;
-backward([{jump,{f,To0}},{move,Src,Reg}=Move|Is], D, Acc) ->
-    To = shortcut_select_label(To0, Reg, Src, D),
-    Jump = {jump,{f,To}},
-    case is_killed_at(Reg, To, D) of
-	false -> backward([Move|Is], D, [Jump|Acc]);
-	true -> backward([Jump|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
-	{Test,Jump} ->
-            backward([Jump,Test|Is], D, Acc)
-    catch
-	throw:not_possible ->
-	    case To =:= BifFail of
-		true ->
-		    %% The bif instruction is redundant. See the comment
-		    %% in the next clause for why there is no need to
-		    %% test for liveness of Reg at label To.
-		    backward([J|Is], D, Acc);
-		false ->
-		    backward(Is0, D, [J|Acc])
-	    end
-    end;
-backward([{jump,{f,To}}=J|[{gc_bif,_,{f,To},_,_,_Dst}|Is]], D, Acc) ->
-    %% The gc_bif instruction is redundant, since either the gc_bif
-    %% instruction itself or the jump instruction will transfer control
-    %% to label To. Note that a gc_bif instruction does not assign its
-    %% destination register if the failure branch is taken; therefore,
-    %% the code at label To is not allowed to assume that the destination
-    %% 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,[Src,_]=Args,Ctxt}|Is], D, Acc0) ->
-    {f,To0} = F,
-    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,Op,{f,To0},Ops0}|Is], D, Acc) ->
-    To1 = shortcut_bs_test(To0, Is, D),
-    To2 = shortcut_label(To1, D),
-    To3 = shortcut_rel_op(To2, Op, Ops0, D),
-
-    %% Try to shortcut a repeated test:
-    %%
-    %%        test Op {f,Fail1} Operands	test Op {f,Fail2} Operands
-    %%        . . .		          ==>   ...
-    %% Fail1: test Op {f,Fail2} Operands        Fail1: test Op {f,Fail2} Operands
-    %%
-    To = case beam_utils:code_at(To3, D) of
-	     [{test,Op,{f,To4},Ops}|_] ->
-		 case equal_ops(Ops0, Ops) of
-		     true -> To4;
-		     false -> To3
-		 end;
-	     _Code ->
-		 To3
-	 end,
-    I = case Op of
-	    is_eq_exact -> combine_eqs(To, Ops0, D, Acc);
-	    _ -> {test,Op,{f,To},Ops0}
-	end,
-    case {I,Acc} of
-	{{test,is_atom,Fail,Ops0},[{test,is_boolean,Fail,Ops0}|_]} ->
-	    %% An is_atom test before an is_boolean test (with the
-	    %% same failure label) is redundant.
-	    backward(Is, D, Acc);
-	{{test,is_atom,Fail,[R]},
-	 [{test,is_eq_exact,Fail,[R,{atom,_}]}|_]} ->
-	    %% An is_atom test before a comparison with an atom (with
-	    %% the same failure label) is redundant.
-	    backward(Is, D, Acc);
-	{{test,is_integer,Fail,[R]},
-	 [{test,is_eq_exact,Fail,[R,{integer,_}]}|_]} ->
-	    %% An is_integer test before a comparison with an integer
-	    %% (with the same failure label) is redundant.
-	    backward(Is, D, Acc);
-	{{test,_,_,_},_} ->
-	    %% Still a test instruction. Done.
-	    backward(Is, D, [I|Acc]);
-	{_,_} ->
-	    %% Rewritten to a select_val. Rescan.
-	    backward([I|Is], D, Acc)
-    end;
-backward([{test,Op,{f,To0},Live,Ops0,Dst}|Is], D, Acc) ->
-    To1 = shortcut_bs_test(To0, Is, D),
-    To2 = shortcut_label(To1, D),
-    %% Try to shortcut a repeated test:
-    %%
-    %%        test Op {f,Fail1} _ Ops _ 	test Op {f,Fail2} _ Ops _
-    %%        . . .		          ==>   ...
-    %% Fail1: test Op {f,Fail2} _ Ops _   Fail1: test Op {f,Fail2} _ Ops _
-    %%
-    To = case beam_utils:code_at(To2, D) of
-	     [{test,Op,{f,To3},_,Ops,_}|_] ->
-		 case equal_ops(Ops0, Ops) of
-		     true -> To3;
-		     false -> To2
-		 end;
-	     _Code ->
-		 To2
-	 end,
-    I = {test,Op,{f,To},Live,Ops0,Dst},
-    backward(Is, D, [I|Acc]);
-backward([{kill,_}=I|Is], D, [{line,_},Exit|_]=Acc) ->
-    case beam_jump:is_exit_instruction(Exit) of
-	false -> backward(Is, D, [I|Acc]);
-	true -> backward(Is, D, Acc)
-    end;
-backward([{bif,'or',{f,To0},[Dst,{atom,false}],Dst}=I|Is], D,
-	 [{test,is_eq_exact,{f,To},[Dst,{atom,true}]}|_]=Acc) ->
-    case shortcut_label(To0, D) of
-	To ->
-	    backward(Is, D, Acc);
-	_ ->
-	    backward(Is, D, [I|Acc])
-    end;
-backward([{bif,map_get,{f,FF},[Key,Map],_}=I0,
-          {test,has_map_fields,{f,FT}=F,[Map|Keys0]}=I1|Is], D, Acc) when FF =/= 0 ->
-    case shortcut_label(FF, D) of
-        FT ->
-            case lists:delete(Key, Keys0) of
-                [] ->
-                    backward([I0|Is], D, Acc);
-                Keys ->
-                    Test = {test,has_map_fields,F,[Map|Keys]},
-                    backward([Test|Is], D, [I0|Acc])
-            end;
-        _ ->
-            backward([I1|Is], D, [I0|Acc])
-    end;
-backward([{bif,map_get,{f,FF},[_,Map],_}=I0,
-          {test,is_map,{f,FT},[Map]}=I1|Is], D, Acc) when FF =/= 0 ->
-    case shortcut_label(FF, D) of
-        FT -> backward([I0|Is], D, Acc);
-        _ -> backward([I1|Is], D, [I0|Acc])
-    end;
-backward([I|Is], D, Acc) ->
-    backward(Is, D, [I|Acc]);
-backward([], _D, Acc) -> Acc.
-
-equal_ops([{field_flags,FlA0}|T0], [{field_flags,FlB0}|T1]) ->
-    FlA = lists:keydelete(anno, 1, FlA0),
-    FlB = lists:keydelete(anno, 1, FlB0),
-    FlA =:= FlB andalso equal_ops(T0, T1);
-equal_ops([Op|T0], [Op|T1]) ->
-    equal_ops(T0, T1);
-equal_ops([], []) -> true;
-equal_ops(_, _) -> false.
-    
-shortcut_select_list([Lit,{f,To0}|T], Reg, D, Acc) ->
-    To = shortcut_select_label(To0, Reg, Lit, D),
-    shortcut_select_list(T, Reg, D, [{f,To},Lit|Acc]);
-shortcut_select_list([], _, _, Acc) -> reverse(Acc).
-
-shortcut_label(0, _) ->
-    0;
-shortcut_label(To0, D) ->
-    case beam_utils:code_at(To0, D) of
-  	[{jump,{f,To}}|_] -> shortcut_label(To, D);
-	_ -> To0
-    end.
-
-shortcut_select_label(To, Reg, Lit, D) ->
-    shortcut_rel_op(To, is_ne_exact, [Reg,Lit], D).
-
-prune_redundant([_,{f,Fail}|T], Fail) ->
-    prune_redundant(T, Fail);
-prune_redundant([V,F|T], Fail) ->
-    [V,F|prune_redundant(T, Fail)];
-prune_redundant([], _) -> [].
-
-%% Replace a comparison operator with a test instruction and a jump.
-%% For example, if we have this code:
-%%
-%%     	  bif '=:=' Fail Src1 Src2 {x,0}
-%%    	  jump L1
-%%           .
-%%           .
-%%           .
-%%   L1:  select_val {x,0} FailLabel [... true => L2..., ...false => L3...]
-%%
-%% the first two instructions can be replaced with
-%%
-%%        test is_eq_exact L3 Src1 Src2
-%%	  jump L2
-%%
-%% provided that {x,0} is killed at both L2 and L3.
-
-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}}}.
-
-comp_op_find_shortcut(To0, Reg, Val, D) ->
-    case shortcut_select_label(To0, Reg, Val, D) of
-	To0 ->
-	    not_possible();
-	To ->
-	    case is_killed_at(Reg, To, D) of
-		false -> not_possible();
-		true -> To
-	    end
-    end.
-
-bif_to_test(Name, Args, Fail) ->
-    try
-	beam_utils:bif_to_test(Name, Args, {f,Fail})
-    catch
-	error:_ -> not_possible()
-    end.
-
-not_possible() -> throw(not_possible).
-
-%% combine_eqs(To, Operands, Acc) -> Instruction.
-%%  Combine two is_eq_exact instructions or (an is_eq_exact
-%%  instruction and a select_val instruction) to a select_val
-%%  instruction if possible.
-%%
-%%  Example:
-%%
-%%      is_eq_exact F1 Reg Lit1		    select_val Reg F2 [ Lit1 L1
-%%   L1:                .                                       Lit2 L2 ]
-%%                      .
-%%                      .	     ==>
-%%                      .
-%%   F1:  is_eq_exact F2 Reg Lit2          F1: is_eq_exact F2 Reg Lit2
-%%   L2:  ....				   L2:
-%%
-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,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,Next}|List]};
-	_Is ->
-	    {test,is_eq_exact,{f,To},Ops}
-	end;
-combine_eqs(To, Ops, _D, _Acc) ->
-    {test,is_eq_exact,{f,To},Ops}.
-
-remove_from_list(Lit, [Lit,{f,_}|T]) ->
-    T;
-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.
-
-shortcut_bs_test(To, Is, D) ->
-    shortcut_bs_test_1(beam_utils:code_at(To, D), Is, To, D).
-
-shortcut_bs_test_1([{bs_restore2,Reg,SavePoint},
-		    {label,_},
-		    {test,bs_test_tail2,{f,To},[_,TailBits]}|_],
-		   PrevIs, To0, D) ->
-    case count_bits_matched(PrevIs, {Reg,SavePoint}, 0) of
-	Bits when Bits > TailBits ->
-	    %% This instruction will fail. We know because a restore has been
-	    %% done from the previous point SavePoint in the binary, and we
-	    %% also know that the binary contains at least Bits bits from
-	    %% SavePoint.
-	    %%
-	    %% Since we will skip a bs_restore2 if we shortcut to label To,
-	    %% we must now make sure that code at To does not depend on
-	    %% the position in the context in any way.
-	    case shortcut_bs_pos_used(To, Reg, D) of
-		false -> To;
-		true -> To0
-	    end;
-	_Bits ->
-	    To0
-    end;
-shortcut_bs_test_1([_|_], _, To, _) -> To.
-
-%% counts_bits_matched(ReversedInstructions, SavePoint, Bits) -> Bits'
-%%  Given a reversed instruction stream, determine the minimum number
-%%  of bits that will be matched by bit syntax instructions up to the
-%%  given save point.
-
-count_bits_matched([{test,bs_get_utf8,{f,_},_,_,_}|Is], SavePoint, Bits) ->
-    count_bits_matched(Is, SavePoint, Bits+8);
-count_bits_matched([{test,bs_get_utf16,{f,_},_,_,_}|Is], SavePoint, Bits) ->
-    count_bits_matched(Is, SavePoint, Bits+16);
-count_bits_matched([{test,bs_get_utf32,{f,_},_,_,_}|Is], SavePoint, Bits) ->
-    count_bits_matched(Is, SavePoint, Bits+32);
-count_bits_matched([{test,_,_,_,[_,Sz,U,{field_flags,_}],_}|Is], SavePoint, Bits) ->
-    case Sz of
-	{integer,N} -> count_bits_matched(Is, SavePoint, Bits+N*U);
-	_ -> count_bits_matched(Is, SavePoint, Bits)
-    end;
-count_bits_matched([{test,bs_match_string,_,[_,Bs]}|Is], SavePoint, Bits) ->
-    count_bits_matched(Is, SavePoint, Bits+bit_size(Bs));
-count_bits_matched([{test,_,_,_}|Is], SavePoint, Bits) ->
-    count_bits_matched(Is, SavePoint, Bits);
-count_bits_matched([{bs_save2,Reg,SavePoint}|_], {Reg,SavePoint}, Bits) ->
-    %% The save point we are looking for - we are done.
-    Bits;
-count_bits_matched([_|_], _, Bits) -> Bits.
-
-shortcut_bs_pos_used(To, Reg, D) ->
-    shortcut_bs_pos_used_1(beam_utils:code_at(To, D), Reg, D).
-
-shortcut_bs_pos_used_1([{bs_context_to_binary,Reg}|_], Reg, _) ->
-    false;
-shortcut_bs_pos_used_1(Is, Reg, D) ->
-    not beam_utils:is_killed(Reg, Is, D).
-
-%% shortcut_bs_start_match(TargetLabel, Reg) -> TargetLabel
-%%  A failing bs_start_match2 instruction means that the source (Reg)
-%%  cannot be a binary. That means that it is safe to skip
-%%  bs_context_to_binary instructions operating on Reg, and
-%%  bs_start_match2 instructions operating on Reg.
-
-shortcut_bs_start_match(To, Reg, D) ->
-    shortcut_bs_start_match_1(beam_utils:code_at(To, D), Reg, To, D).
-
-shortcut_bs_start_match_1([{bs_context_to_binary,Reg}|Is], Reg, To, D) ->
-    shortcut_bs_start_match_1(Is, Reg, To, D);
-shortcut_bs_start_match_1([{jump,{f,To}}|_], Reg, _, D) ->
-    Code = beam_utils:code_at(To, D),
-    shortcut_bs_start_match_1(Code, Reg, To, D);
-shortcut_bs_start_match_1([{test,bs_start_match2,{f,To},_,[Reg|_],_}|_],
-			  Reg, _, D) ->
-    Code = beam_utils:code_at(To, D),
-    shortcut_bs_start_match_1(Code, Reg, To, D);
-shortcut_bs_start_match_1(_, _, To, _) ->
-    To.
-
-%% shortcut_bs_context_to_binary(TargetLabel, Reg) -> TargetLabel
-%%  If a bs_start_match2 instruction has been eliminated, the
-%%  bs_context_to_binary instruction can be eliminated too.
-
-shortcut_bs_context_to_binary(To, Reg, D) ->
-    shortcut_bs_ctb_1(beam_utils:code_at(To, D), Reg, To, D).
-
-shortcut_bs_ctb_1([{bs_context_to_binary,Reg}|Is], Reg, To, D) ->
-    shortcut_bs_ctb_1(Is, Reg, To, D);
-shortcut_bs_ctb_1([{jump,{f,To}}|_], Reg, _, D) ->
-    Code = beam_utils:code_at(To, D),
-    shortcut_bs_ctb_1(Code, Reg, To, D);
-shortcut_bs_ctb_1(_, _, To, _) ->
-    To.
-
-%% shortcut_rel_op(FailLabel, Operator, [Operand], D) -> FailLabel'
-%%  Try to shortcut the given test instruction. Example:
-%%
-%%           is_ge L1 {x,0} 48
-%%     .
-%%     .
-%%     .
-%%     L1:   is_ge L2 {x,0} 65
-%%
-%%  The first test instruction can be rewritten to "is_ge L2 {x,0} 48"
-%%  since the instruction at L1 will also fail.
-%%
-%%  If there are instructions between L1 and the other test instruction
-%%  it may still be possible to do the shortcut. For example:
-%%
-%%     L1:   is_eq_exact L3 {x,0} 92
-%%           is_ge L2 {x,0} 65
-%%
-%%  Since the first test instruction failed, we know that {x,0} must
-%%  be less than 48; therefore, we know that {x,0} cannot be equal to
-%%  92 and the jump to L3 cannot happen.
-
-shortcut_rel_op(To, Op, Ops, D) ->
-    case normalize_op({test,Op,{f,To},Ops}) of
-	{{NormOp,A,B},_} ->
-	    Normalized = {negate_op(NormOp),A,B},
-	    shortcut_rel_op_fp(To, Normalized, D);
-	{_,_} ->
-	    To;
-	error ->
-	    To
-    end.
-
-shortcut_rel_op_fp(To0, Normalized, D) ->
-    Code = beam_utils:code_at(To0, D),
-    case shortcut_any_label(Code, Normalized) of
-	error ->
-	    To0;
-	To ->
-	    shortcut_rel_op_fp(To, Normalized, D)
-    end.
-
-%% shortcut_any_label([Instruction], PrevCondition) -> FailLabel | error
-%%  Using PrevCondition (a previous condition known to be true),
-%%  try to shortcut to another failure label.
-
-shortcut_any_label([{jump,{f,Lbl}}|_], _Prev) ->
-    Lbl;
-shortcut_any_label([{label,Lbl}|_], _Prev) ->
-    Lbl;
-shortcut_any_label([{select,select_val,R,{f,Fail},L}|_], Prev) ->
-    shortcut_selectval(L, R, Fail, Prev);
-shortcut_any_label([I|Is], Prev) ->
-    case normalize_op(I) of
-	error ->
-	    error;
-	{Normalized,Fail} ->
-	    %% We have a relational operator.
-	    case will_succeed(Prev, Normalized) of
-		no ->
-		    %% This test instruction will always branch
-		    %% to Fail.
-		    Fail;
-		yes ->
-		    %% This test instruction will never branch,
-		    %% so we will look at the next instruction.
-		    shortcut_any_label(Is, Prev);
-		maybe ->
-		    %% May or may not branch. From now on, we can only
-		    %% shortcut to the this specific failure label
-		    %% Fail.
-		    shortcut_specific_label(Is, Fail, Prev)
-	    end
-    end.
-
-%% shortcut_specific_label([Instruction], FailLabel, PrevCondition) ->
-%%    FailLabel | error
-%%  We have previously encountered a test instruction that may or
-%%  may not branch to FailLabel. Therefore we are only allowed
-%%  to do the shortcut to the same fail label (FailLabel).
-
-shortcut_specific_label([{label,_}|Is], Fail, Prev) ->
-    shortcut_specific_label(Is, Fail, Prev);
-shortcut_specific_label([{select,select_val,R,{f,F},L}|_], Fail, Prev) ->
-    case shortcut_selectval(L, R, F, Prev) of
-	Fail -> Fail;
-	_ -> error
-    end;
-shortcut_specific_label([I|Is], Fail, Prev) ->
-    case normalize_op(I) of
-	error ->
-	    error;
-	{Normalized,Fail} ->
-	    case will_succeed(Prev, Normalized) of
-		no ->
-		    %% Will branch to FailLabel.
-		    Fail;
-		yes ->
-		    %% Will definitely never branch.
-		    shortcut_specific_label(Is, Fail, Prev);
-		maybe ->
-		    %% May branch, but still OK since it will branch
-		    %% to FailLabel.
-		    shortcut_specific_label(Is, Fail, Prev)
-	    end;
-	{Normalized,_} ->
-	    %% This test instruction will branch to a different
-	    %% fail label, if it branches at all.
-	    case will_succeed(Prev, Normalized) of
-		yes ->
-		    %% Still OK, since the branch will never be
-		    %% taken.
-		    shortcut_specific_label(Is, Fail, Prev);
-		no ->
-		    %% Give up. The branch will definitely be taken
-		    %% to a different fail label.
-		    error;
-		maybe ->
-		    %% Give up. If the branch is taken, it will be
-		    %% to a different fail label.
-		    error
-	    end
-    end.
-
-
-%% shortcut_selectval(List, Reg, Fail, PrevCond) -> FailLabel | error
-%%  Try to shortcut a selectval instruction. A selectval instruction
-%%  is equivalent to the following instruction sequence:
-%%
-%%      is_ne_exact L1 Reg Value1
-%%              .
-%%              .
-%%              .
-%%      is_ne_exact LN Reg ValueN
-%%      jump DefaultFailLabel
-%%
-shortcut_selectval([Val,{f,Lbl}|T], R, Fail, Prev) ->
-    case will_succeed(Prev, {'=/=',R,get_literal(Val)}) of
-	yes -> shortcut_selectval(T, R, Fail, Prev);
-	no -> Lbl;
-	maybe -> error
-    end;
-shortcut_selectval([], _, Fail, _) -> Fail.
-
-%% will_succeed(PrevCondition, Condition) -> yes | no | maybe
-%%  PrevCondition is a condition known to be true. This function
-%%  will tell whether Condition will succeed.
-
-will_succeed({Op1,Reg,A}, {Op2,Reg,B}) ->
-    will_succeed_1(Op1, A, Op2, B);
-will_succeed({'=:=',Reg,{literal,A}}, {TypeTest,Reg}) ->
-    case erlang:TypeTest(A) of
-	false -> no;
-	true -> yes
-    end;
-will_succeed({_,_,_}, maybe) ->
-    maybe;
-will_succeed({_,_,_}, Test) when is_tuple(Test) ->
-    maybe.
-
-will_succeed_1('=:=', A, '<', B) ->
-    if
-	B =< A -> no;
-	true -> yes
-    end;
-will_succeed_1('=:=', A, '=<', B) ->
-    if
-	B < A -> no;
-	true -> yes
-    end;
-will_succeed_1('=:=', A, '=:=', B) ->
-    if
-	A =:= B -> yes;
-	true -> no
-    end;
-will_succeed_1('=:=', A, '=/=', B) ->
-    if
-	A =:= B -> no;
-	true -> yes
-    end;
-will_succeed_1('=:=', A, '>=', B) ->
-    if
-	B > A -> no;
-	true -> yes
-    end;
-will_succeed_1('=:=', A, '>', B) ->
-    if
-	B >= A -> no;
-	true -> yes
-    end;
-
-will_succeed_1('=/=', A, '=/=', B) when A =:= B -> yes;
-will_succeed_1('=/=', A, '=:=', B) when A =:= B -> no;
-
-will_succeed_1('<', A, '=:=', B)  when B >= A -> no;
-will_succeed_1('<', A, '=/=', B)  when B >= A -> yes;
-will_succeed_1('<', A, '<',   B)  when B >= A -> yes;
-will_succeed_1('<', A, '=<',  B)  when B > A  -> yes;
-will_succeed_1('<', A, '>=',  B)  when B > A  -> no;
-will_succeed_1('<', A, '>',   B)  when B >= A -> no;
-
-will_succeed_1('=<', A, '=:=', B) when B > A  -> no;
-will_succeed_1('=<', A, '=/=', B) when B > A  -> yes;
-will_succeed_1('=<', A, '<',   B) when B > A  -> yes;
-will_succeed_1('=<', A, '=<',  B) when B >= A -> yes;
-will_succeed_1('=<', A, '>=',  B) when B > A  -> no;
-will_succeed_1('=<', A, '>',   B) when B >= A -> no;
-
-will_succeed_1('>=', A, '=:=', B) when B < A  -> no;
-will_succeed_1('>=', A, '=/=', B) when B < A  -> yes;
-will_succeed_1('>=', A, '<',   B) when B =< A -> no;
-will_succeed_1('>=', A, '=<',  B) when B < A  -> no;
-will_succeed_1('>=', A, '>=',  B) when B =< A -> yes;
-will_succeed_1('>=', A, '>',   B) when B < A  -> yes;
-
-will_succeed_1('>', A, '=:=', B)  when B =< A -> no;
-will_succeed_1('>', A, '=/=', B)  when B =< A -> yes;
-will_succeed_1('>', A, '<',   B)  when B =< A -> no;
-will_succeed_1('>', A, '=<',  B)  when B < A  -> no;
-will_succeed_1('>', A, '>=',  B)  when B =< A -> yes;
-will_succeed_1('>', A, '>',   B)  when B < A  -> yes;
-
-will_succeed_1(_, _, _, _) -> maybe.
-
-%% normalize_op(Instruction) -> {Normalized,FailLabel} | error
-%%    Normalized = {Operator,Register,Literal} |
-%%                 {TypeTest,Register} |
-%%                 maybe
-%%    Operation = '<' | '=<' | '=:=' | '=/=' | '>=' | '>'
-%%    TypeTest = is_atom | is_integer ...
-%%    Literal = {literal,Term}
-%%
-%%  Normalize a relational operator to facilitate further
-%%  comparisons between operators. Always make the register
-%%  operand the first operand. Thus the following instruction:
-%%
-%%    {test,is_ge,{f,99},{integer,13},{x,0}}
-%%
-%%  will be normalized to:
-%%
-%%    {'=<',{x,0},{literal,13}}
-%%
-%%  NOTE: Bit syntax test instructions are scary. They may change the
-%%  state of match contexts and update registers, so we don't dare
-%%  mess with them.
-
-normalize_op({test,is_ge,{f,Fail},Ops}) ->
-    normalize_op_1('>=', Ops, Fail);
-normalize_op({test,is_lt,{f,Fail},Ops}) ->
-    normalize_op_1('<', Ops, Fail);
-normalize_op({test,is_eq_exact,{f,Fail},Ops}) ->
-    normalize_op_1('=:=', Ops, Fail);
-normalize_op({test,is_ne_exact,{f,Fail},Ops}) ->
-    normalize_op_1('=/=', Ops, Fail);
-normalize_op({test,is_nil,{f,Fail},[R]}) ->
-    normalize_op_1('=:=', [R,nil], Fail);
-normalize_op({test,Op,{f,Fail},[R]}) ->
-    case erl_internal:new_type_test(Op, 1) of
-	true -> {{Op,R},Fail};
-	false -> {maybe,Fail}
-    end;
-normalize_op({test,_,{f,Fail},_}=I) ->
-    case beam_utils:is_pure_test(I) of
-	true -> {maybe,Fail};
-	false -> error
-    end;
-normalize_op(_) ->
-    error.
-
-normalize_op_1(Op, [Op1,Op2], Fail) ->
-    case {get_literal(Op1),get_literal(Op2)} of
-	{error,error} ->
-	    %% Both operands are registers.
-	    {maybe,Fail};
-	{error,Lit} ->
-	    {{Op,Op1,Lit},Fail};
-	{Lit,error} ->
-	    {{turn_op(Op),Op2,Lit},Fail};
-	{_,_} ->
-	    %% Both operands are literals. Can probably only
-	    %% happen if the Core Erlang optimizations passes were
-	    %% turned off, so don't bother trying to do something
-	    %% smart here.
-	    {maybe,Fail}
-    end.
-
-turn_op('<') -> '>';
-turn_op('>=') -> '=<';
-turn_op('=:='=Op) -> Op;
-turn_op('=/='=Op) -> Op.
-
-negate_op('>=') -> '<';
-negate_op('<') -> '>=';
-negate_op('=<') -> '>';
-negate_op('>') -> '=<';
-negate_op('=:=') -> '=/=';
-negate_op('=/=') -> '=:='.
-
-get_literal({atom,Val}) ->
-    {literal,Val};
-get_literal({integer,Val}) ->
-    {literal,Val};
-get_literal({float,Val}) ->
-    {literal,Val};
-get_literal(nil) ->
-    {literal,[]};
-get_literal({literal,_}=Lit) ->
-    Lit;
-get_literal({_,_}) -> error.
-
-
-%%%
-%%% Removing stores to Y registers is not always safe
-%%% if there is an instruction that causes an exception
-%%% within a catch. In practice, there are few or no
-%%% opportunities for removing stores to Y registers anyway
-%%% if sys_core_fold has been run.
-%%%
-
-is_killed_at({x,_}=Reg, Lbl, D) ->
-    beam_utils:is_killed_at(Reg, Lbl, D);
-is_killed_at({y,_}, _, _) ->
-    false.
diff --git a/lib/compiler/src/beam_dict.erl b/lib/compiler/src/beam_dict.erl
index 990e86062a..b2056332e6 100644
--- a/lib/compiler/src/beam_dict.erl
+++ b/lib/compiler/src/beam_dict.erl
@@ -126,18 +126,17 @@ import(Mod0, Name0, Arity, #asm{imports=Imp0,next_import=NextIndex}=D0)
 	    {NextIndex,D2#asm{imports=Imp,next_import=NextIndex+1}}
     end.
 
-%% Returns the index for a string in the string table (adding the string to the
-%% table if necessary).
+%% Returns the index for a binary string in the string table (adding
+%% the string to the table if necessary).
 %%    string(String, Dict) -> {Offset, Dict'}
--spec string(string(), bdict()) -> {non_neg_integer(), bdict()}.
+-spec string(binary(), bdict()) -> {non_neg_integer(), bdict()}.
 
-string(Str, Dict) when is_list(Str) ->
+string(BinString, Dict) when is_binary(BinString) ->
     #asm{strings=Strings,string_offset=NextOffset} = Dict,
-    StrBin = list_to_binary(Str),
-    case old_string(StrBin, Strings) of
+    case old_string(BinString, Strings) of
 	none ->
-	    NewDict = Dict#asm{strings = <<Strings/binary,StrBin/binary>>,
-			       string_offset=NextOffset+byte_size(StrBin)},
+	    NewDict = Dict#asm{strings = <<Strings/binary,BinString/binary>>,
+			       string_offset=NextOffset+byte_size(BinString)},
 	    {NextOffset,NewDict};
 	Offset when is_integer(Offset) ->
 	    {NextOffset-Offset,Dict}
diff --git a/lib/compiler/src/beam_disasm.erl b/lib/compiler/src/beam_disasm.erl
index 6cee9acae4..7d048716e4 100644
--- a/lib/compiler/src/beam_disasm.erl
+++ b/lib/compiler/src/beam_disasm.erl
@@ -373,6 +373,8 @@ disasm_instr(B, Bs, Atoms, Literals) ->
 	    disasm_map_inst(get_map_elements, Arity, Bs, Atoms, Literals);
 	has_map_fields ->
 	    disasm_map_inst(has_map_fields, Arity, Bs, Atoms, Literals);
+	put_tuple2 ->
+	    disasm_put_tuple2(Bs, Atoms, Literals);
 	_ ->
 	    try decode_n_args(Arity, Bs, Atoms, Literals) of
 		{Args, RestBs} ->
@@ -413,6 +415,14 @@ disasm_map_inst(Inst, Arity, Bs0, Atoms, Literals) ->
     {List, RestBs} = decode_n_args(Len, Bs2, Atoms, Literals),
     {{Inst, Args ++ [{Z,U,List}]}, RestBs}.
 
+disasm_put_tuple2(Bs, Atoms, Literals) ->
+    {X, Bs1} = decode_arg(Bs, Atoms, Literals),
+    {Z, Bs2} = decode_arg(Bs1, Atoms, Literals),
+    {U, Bs3} = decode_arg(Bs2, Atoms, Literals),
+    {u, Len} = U,
+    {List, RestBs} = decode_n_args(Len, Bs3, Atoms, Literals),
+    {{put_tuple2, [X,{Z,U,List}]}, RestBs}.
+
 %%-----------------------------------------------------------------------
 %% decode_arg([Byte]) -> {Arg, [Byte]}
 %%
@@ -1095,6 +1105,23 @@ resolve_inst({get_hd,[Src,Dst]},_,_,_) ->
 resolve_inst({get_tl,[Src,Dst]},_,_,_) ->
     {get_tl,Src,Dst};
 
+%% OTP 22
+resolve_inst({bs_start_match3,[Fail,Bin,Live,Dst]},_,_,_) ->
+    {bs_start_match3,Fail,Bin,Live,Dst};
+resolve_inst({bs_get_tail,[Src,Dst,Live]},_,_,_) ->
+    {bs_get_tail,Src,Dst,Live};
+resolve_inst({bs_get_position,[Src,Dst,Live]},_,_,_) ->
+    {bs_get_position,Src,Dst,Live};
+resolve_inst({bs_set_position,[Src,Dst]},_,_,_) ->
+    {bs_set_position,Src,Dst};
+
+%%
+%% OTP 22.
+%%
+resolve_inst({put_tuple2,[Dst,{{z,1},{u,_},List0}]},_,_,_) ->
+    List = resolve_args(List0),
+    {put_tuple2,Dst,{list,List}};
+
 %%
 %% Catches instructions that are not yet handled.
 %%
diff --git a/lib/compiler/src/beam_except.erl b/lib/compiler/src/beam_except.erl
index 05c0f4fbc7..2305502800 100644
--- a/lib/compiler/src/beam_except.erl
+++ b/lib/compiler/src/beam_except.erl
@@ -31,7 +31,7 @@
 %%% erlang:error(function_clause, Args)  => jump FuncInfoLabel
 %%%
 
--import(lists, [reverse/1]).
+-import(lists, [reverse/1,reverse/2,seq/2,splitwith/2]).
 
 -spec module(beam_utils:module_code(), [compile:option()]) ->
                     {'ok',beam_utils:module_code()}.
@@ -53,7 +53,7 @@ function({function,Name,Arity,CLabel,Is0}) ->
 -record(st,
 	{lbl :: beam_asm:label(),              %func_info label
 	 loc :: [_],                           %location for func_info
-	 arity :: arity()                       %arity for function
+	 arity :: arity()                      %arity for function
 	 }).
 
 function_1(Is0) ->
@@ -74,27 +74,33 @@ translate([I|Is], St, Acc) ->
 translate([], _, Acc) ->
     reverse(Acc).
 
-translate_1(Ar, I, Is, St, [{line,_}=Line|Acc1]=Acc0) ->
-    case dig_out(Ar, Acc1) of
+translate_1(Ar, I, Is, #st{arity=Arity}=St, [{line,_}=Line|Acc1]=Acc0) ->
+    case dig_out(Ar, Arity, Acc1) of
 	no ->
 	    translate(Is, St, [I|Acc0]);
-	{yes,{function_clause,Arity},Acc2} ->
-	    case {Line,St} of
-		{{line,Loc},#st{lbl=Fi,loc=Loc,arity=Arity}} ->
+	{yes,function_clause,Acc2} ->
+	    case {Is,Line,St} of
+		{[return|_],{line,Loc},#st{lbl=Fi,loc=Loc}} ->
 		    Instr = {jump,{f,Fi}},
 		    translate(Is, St, [Instr|Acc2]);
-		{_,_} ->
-		    %% This must be "error(function_clause, Args)" in
-		    %% the Erlang source code or a fun. Don't translate.
+		{_,_,_} ->
+                    %% Not a call_only instruction, or not the same
+                    %% location information as in in the line instruction
+                    %% before the func_info instruction. Not safe
+                    %% to translate to a jump.
 		    translate(Is, St, [I|Acc0])
 	    end;
 	{yes,Instr,Acc2} ->
 	    translate(Is, St, [Instr,Line|Acc2])
     end.
 
-dig_out(Ar, [{kill,_}|Is]) ->
-    dig_out(Ar, Is);
-dig_out(1, [{block,Bl0}|Is]) ->
+dig_out(1, _Arity, Is) ->
+    dig_out(Is);
+dig_out(2, Arity, Is) ->
+    dig_out_fc(Arity, Is);
+dig_out(_, _, _) -> no.
+
+dig_out([{block,Bl0}|Is]) ->
     case dig_out_block(reverse(Bl0)) of
 	no -> no;
 	{yes,What,[]} ->
@@ -102,25 +108,13 @@ dig_out(1, [{block,Bl0}|Is]) ->
 	{yes,What,Bl} ->
 	    {yes,What,[{block,Bl}|Is]}
     end;
-dig_out(2, [{block,Bl}|Is]) ->
-    case dig_out_block_fc(Bl) of
-	no -> no;
-	{yes,What} -> {yes,What,Is}
-    end;
-dig_out(_, _) -> no.
+dig_out(_) -> no.
 
 dig_out_block([{set,[{x,0}],[{atom,if_clause}],move}]) ->
     {yes,if_end,[]};
 dig_out_block([{set,[{x,0}],[{literal,{Exc,Value}}],move}|Is]) ->
     translate_exception(Exc, {literal,Value}, Is, 0);
-dig_out_block([{set,[{x,0}],[Tuple],move},
-	       {set,[],[Value],put},
-	       {set,[],[{atom,Exc}],put},
-	       {set,[Tuple],[],{put_tuple,2}}|Is]) ->
-    translate_exception(Exc, Value, Is, 3);
-dig_out_block([{set,[],[Value],put},
-	       {set,[],[{atom,Exc}],put},
-	       {set,[{x,0}],[],{put_tuple,2}}|Is]) ->
+dig_out_block([{set,[{x,0}],[{atom,Exc},Value],put_tuple2}|Is]) ->
     translate_exception(Exc, Value, Is, 3);
 dig_out_block(_) -> no.
 
@@ -138,23 +132,116 @@ fix_block(Is, Words) ->
     reverse(fix_block_1(Is, Words)).
 
 fix_block_1([{set,[],[],{alloc,Live,{F1,F2,Needed0,F3}}}|Is], Words) ->
-    Needed = Needed0 - Words,
-    true = Needed >= 0,				%Assertion.
-    [{set,[],[],{alloc,Live,{F1,F2,Needed,F3}}}|Is];
+    case Needed0 - Words of
+        0 ->
+            Is;
+        Needed ->
+            true = Needed >= 0,				%Assertion.
+            [{set,[],[],{alloc,Live,{F1,F2,Needed,F3}}}|Is]
+    end;
 fix_block_1([I|Is], Words) ->
-    [I|fix_block_1(Is, Words)].
+    [I|fix_block_1(Is, Words)];
+fix_block_1([], _Words) ->
+    %% Rare. The heap allocation was probably done by a binary
+    %% construction instruction.
+    [].
+
+dig_out_fc(Arity, Is0) ->
+    Regs0 = maps:from_list([{{x,X},{arg,X}} || X <- seq(0, Arity-1)]),
+    {Is,Acc0} = splitwith(fun({label,_}) -> false;
+                             ({test,_,_,_}) -> false;
+                             (_) -> true
+                          end, Is0),
+    {Regs,Acc} = dig_out_fc_1(reverse(Is), Regs0, Acc0),
+    case Regs of
+        #{{x,0}:={atom,function_clause},{x,1}:=Args} ->
+            case moves_from_stack(Args, 0, []) of
+                {Moves,Arity} ->
+                    {yes,function_clause,reverse(Moves, Acc)};
+                {_,_} ->
+                    no
+            end;
+        #{} ->
+            no
+    end.
 
-dig_out_block_fc([{set,[],[],{alloc,Live,_}}|Bl]) ->
-    case dig_out_fc(Bl, Live-1, nil) of
-	no ->
-	    no;
-	yes ->
-	    {yes,{function_clause,Live}}
+dig_out_fc_1([{block,Bl}|Is], Regs0, Acc) ->
+    Regs = dig_out_fc_block(Bl, Regs0),
+    dig_out_fc_1(Is, Regs, Acc);
+dig_out_fc_1([{bs_set_position,_,_}=I|Is], Regs, Acc) ->
+    dig_out_fc_1(Is, Regs, [I|Acc]);
+dig_out_fc_1([{bs_get_tail,Src,Dst,Live0}|Is], Regs0, Acc) ->
+    Regs = prune_xregs(Live0, Regs0),
+    Live = dig_out_stack_live(Regs, Live0),
+    I = {bs_get_tail,Src,Dst,Live},
+    dig_out_fc_1(Is, Regs, [I|Acc]);
+dig_out_fc_1([_|_], _Regs, _Acc) ->
+    {#{},[]};
+dig_out_fc_1([], Regs, Acc) ->
+    {Regs,Acc}.
+
+dig_out_fc_block([{set,[],[],{alloc,Live,_}}|Is], Regs0) ->
+    Regs = prune_xregs(Live, Regs0),
+    dig_out_fc_block(Is, Regs);
+dig_out_fc_block([{set,[Dst],[Hd,Tl],put_list}|Is], Regs0) ->
+    Regs = Regs0#{Dst=>{cons,get_reg(Hd, Regs0),get_reg(Tl, Regs0)}},
+    dig_out_fc_block(Is, Regs);
+dig_out_fc_block([{set,[Dst],[Src],move}|Is], Regs0) ->
+    Regs = Regs0#{Dst=>get_reg(Src, Regs0)},
+    dig_out_fc_block(Is, Regs);
+dig_out_fc_block([{set,_,_,_}|_], _Regs) ->
+    %% Unknown instruction. Fail.
+    #{};
+dig_out_fc_block([], Regs) -> Regs.
+
+dig_out_stack_live(Regs, Default) ->
+    Reg = {x,2},
+    case Regs of
+        #{Reg:=List} ->
+            dig_out_stack_live_1(List, Default);
+        #{} ->
+            Default
+    end.
+
+dig_out_stack_live_1({cons,{arg,N},T}, Live) ->
+    dig_out_stack_live_1(T, max(N + 1, Live));
+dig_out_stack_live_1({cons,_,T}, Live) ->
+    dig_out_stack_live_1(T, Live);
+dig_out_stack_live_1(nil, Live) ->
+    Live;
+dig_out_stack_live_1(_, Live) -> Live.
+
+prune_xregs(Live, Regs) ->
+    maps:filter(fun({x,X}, _) -> X < Live end, Regs).
+
+moves_from_stack({cons,{arg,N},_}, I, _Acc) when N =/= I ->
+    %% Wrong argument. Give up.
+    {[],-1};
+moves_from_stack({cons,H,T}, I, Acc) ->
+    case H of
+        {arg,I} ->
+            moves_from_stack(T, I+1, Acc);
+        _ ->
+            moves_from_stack(T, I+1, [{move,H,{x,I}}|Acc])
     end;
-dig_out_block_fc(_) -> no.
+moves_from_stack(nil, I, Acc) ->
+    {reverse(Acc),I};
+moves_from_stack({literal,[H|T]}, I, Acc) ->
+    Cons = {cons,tag_literal(H),tag_literal(T)},
+    moves_from_stack(Cons, I, Acc);
+moves_from_stack(_, _, _) ->
+    %% Not understood. Give up.
+    {[],-1}.
+
+
+get_reg(R, Regs) ->
+    case Regs of
+        #{R:=Val} -> Val;
+        #{} -> R
+    end.
 
-dig_out_fc([{set,[Dst],[{x,Reg},Dst0],put_list}|Is], Reg, Dst0) ->
-    dig_out_fc(Is, Reg-1, Dst);
-dig_out_fc([{set,[{x,0}],[{atom,function_clause}],move}], -1, {x,1}) ->
-    yes;
-dig_out_fc(_, _, _) -> no.
+tag_literal([]) -> nil;
+tag_literal(T) when is_atom(T) -> {atom,T};
+tag_literal(T) when is_float(T) -> {float,T};
+tag_literal(T) when is_integer(T) -> {integer,T};
+tag_literal(T) -> {literal,T}.
diff --git a/lib/compiler/src/beam_flatten.erl b/lib/compiler/src/beam_flatten.erl
index 20bd23a912..3e6bc1b1ed 100644
--- a/lib/compiler/src/beam_flatten.erl
+++ b/lib/compiler/src/beam_flatten.erl
@@ -32,8 +32,7 @@ module({Mod,Exp,Attr,Fs,Lc}, _Opt) ->
     {ok,{Mod,Exp,Attr,[function(F) || F <- Fs],Lc}}.
 
 function({function,Name,Arity,CLabel,Is0}) ->
-    Is1 = block(Is0),
-    Is = opt(Is1),
+    Is = block(Is0),
     {function,Name,Arity,CLabel,Is}.
 
 block(Is) ->
@@ -44,18 +43,11 @@ block([I|Is], Acc) -> block(Is, [I|Acc]);
 block([], Acc) -> reverse(Acc).
 
 norm_block([{set,[],[],{alloc,R,Alloc}}|Is], Acc0) ->
-    case insert_alloc_in_bs_init(Acc0, Alloc) of
-	impossible ->
-	    norm_block(Is, reverse(norm_allocate(Alloc, R), 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(Is, reverse(norm_allocate(Alloc, R), Acc0));
+norm_block([I|Is], Acc) ->
+    norm_block(Is, [norm(I)|Acc]);
 norm_block([], Acc) -> Acc.
-    
+
 norm({set,[D],As,{bif,N,F}})      -> {bif,N,F,As,D};
 norm({set,[D],As,{alloc,R,{gc_bif,N,F}}}) -> {gc_bif,N,F,R,As,D};
 norm({set,[D],[],init})           -> {init,D};
@@ -63,6 +55,7 @@ norm({set,[D],[S],move})          -> {move,S,D};
 norm({set,[D],[S],fmove})         -> {fmove,S,D};
 norm({set,[D],[S],fconv})         -> {fconv,S,D};
 norm({set,[D],[S1,S2],put_list})  -> {put_list,S1,S2,D};
+norm({set,[D],Els,put_tuple2})    -> {put_tuple2,D,{list,Els}};
 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};
@@ -88,57 +81,3 @@ norm_allocate({nozero,Ns,0,Inits}, Regs) ->
     [{allocate,Ns,Regs}|Inits];
 norm_allocate({nozero,Ns,Nh,Inits}, Regs) ->
     [{allocate_heap,Ns,Nh,Regs}|Inits].
-
-%% insert_alloc_in_bs_init(ReverseInstructionStream, AllocationInfo) ->
-%%                                  impossible | ReverseInstructionStream'
-%%   A bs_init/6 instruction should not be followed by a test heap instruction.
-%%   Given the AllocationInfo from a test heap instruction, merge the
-%%   allocation amounts into the previous bs_init/6 instruction (if any).
-%%
-insert_alloc_in_bs_init([{bs_put,_,_,_}=I|Is], Alloc) ->
-    %% The instruction sequence ends with an bs_put/4 instruction.
-    %% We'll need to search backwards for the bs_init/6 instruction.
-    insert_alloc_1(Is, Alloc, [I]);
-insert_alloc_in_bs_init(_, _) -> impossible.
-
-insert_alloc_1([{bs_init=Op,Fail,Info0,Live,Ss,Dst}|Is],
-	       {_,nostack,Ws2,[]}, Acc) when is_integer(Live) ->
-    %% The number of extra heap words is always in the second position
-    %% in the Info tuple.
-    Ws1 = element(2, Info0),
-    Al = beam_utils:combine_heap_needs(Ws1, Ws2),
-    Info = setelement(2, Info0, Al),
-    I = {Op,Fail,Info,Live,Ss,Dst},
-    reverse(Acc, [I|Is]);
-insert_alloc_1([{bs_put,_,_,_}=I|Is], Alloc, Acc) ->
-    insert_alloc_1(Is, Alloc, [I|Acc]).
-
-%% opt(Is0) -> Is
-%%  Simple peep-hole optimization to move a {move,Any,{x,0}} past
-%%  any kill up to the next call instruction. (To give the loader
-%%  an opportunity to combine the 'move' and the 'call' instructions.)
-%%
-opt(Is) ->
-    opt_1(Is, []).
-
-opt_1([{move,_,{x,0}}=I|Is0], Acc0) ->
-    case move_past_kill(Is0, I, Acc0) of
-	impossible -> opt_1(Is0, [I|Acc0]);
-	{Is,Acc} -> opt_1(Is, Acc)
-    end;
-opt_1([I|Is], Acc) ->
-    opt_1(Is, [I|Acc]);
-opt_1([], Acc) -> reverse(Acc).
-
-move_past_kill([{kill,Src}|_], {move,Src,_}, _) ->
-    impossible;
-move_past_kill([{kill,_}=I|Is], Move, Acc) ->
-    move_past_kill(Is, Move, [I|Acc]);
-move_past_kill([{trim,N,_}=I|Is], {move,Src,Dst}=Move, Acc) ->
-    case Src of
-	{y,Y} when Y < N-> impossible;
-	{y,Y} -> {Is,[{move,{y,Y-N},Dst},I|Acc]};
-	_ -> {Is,[Move,I|Acc]}
-    end;
-move_past_kill(Is, Move, Acc) ->
-    {Is,[Move|Acc]}.
diff --git a/lib/compiler/src/beam_jump.erl b/lib/compiler/src/beam_jump.erl
index 22974da398..74f80ca70e 100644
--- a/lib/compiler/src/beam_jump.erl
+++ b/lib/compiler/src/beam_jump.erl
@@ -22,7 +22,7 @@
 -module(beam_jump).
 
 -export([module/2,
-	 is_unreachable_after/1,is_exit_instruction/1,
+	 is_exit_instruction/1,
 	 remove_unused_labels/1]).
 
 %%% The following optimisations are done:
@@ -101,6 +101,10 @@
 %%%      always keep the label. (beam_clean will remove any unused
 %%%      labels.)
 %%%
+%%% (7)  Replace a jump to a return instruction with a return instruction.
+%%%      Similarly, replace a jump to deallocate + return with those
+%%%      instructions.
+%%%
 %%% Note: This modules depends on (almost) all branches and jumps only
 %%% going forward, so that we can remove instructions (including definition
 %%% of labels) after any label that has not been referenced by the code
@@ -128,27 +132,136 @@
 %%% on the program state.
 %%% 
 
--import(lists, [dropwhile/2,reverse/1,reverse/2,foldl/3]).
+-import(lists, [foldl/3,mapfoldl/3,reverse/1,reverse/2]).
 
 -type instruction() :: beam_utils:instruction().
 
 -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,Lc0}, _Opt) ->
+    {Fs,Lc} = mapfoldl(fun function/2, Lc0, Fs0),
     {ok,{Mod,Exp,Attr,Fs,Lc}}.
 
 %% function(Function) -> Function'
 %%  Optimize jumps and branches.
 %%
 %%  NOTE: This function assumes that there are no labels inside blocks.
-function({function,Name,Arity,CLabel,Asm0}) ->
-    Asm1 = share(Asm0),
-    Asm2 = move(Asm1),
-    Asm3 = opt(Asm2, CLabel),
-    Asm = remove_unused_labels(Asm3),
-    {function,Name,Arity,CLabel,Asm}.
+function({function,Name,Arity,CLabel,Asm0}, Lc0) ->
+    try
+        Asm1 = eliminate_moves(Asm0),
+        {Asm2,Lc} = insert_labels(Asm1, Lc0, []),
+        Asm3 = share(Asm2),
+        Asm4 = move(Asm3),
+        Asm5 = opt(Asm4, CLabel),
+        Asm6 = unshare(Asm5),
+        Asm = remove_unused_labels(Asm6),
+        {{function,Name,Arity,CLabel,Asm},Lc}
+    catch
+        Class:Error:Stack ->
+	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
+	    erlang:raise(Class, Error, Stack)
+    end.
+
+%%%
+%%% Scan instructions in execution order and remove redundant 'move'
+%%% instructions. 'move' instructions are redundant if we know that
+%%% the register already contains the value being assigned, as in the
+%%% following code:
+%%%
+%%%           select_val Register FailLabel [... Literal => L1...]
+%%%                      .
+%%%                      .
+%%%                      .
+%%%   L1:     move Literal Register
+%%%
+
+eliminate_moves(Is) ->
+    eliminate_moves(Is, #{}, []).
+
+eliminate_moves([{select,select_val,Reg,{f,Fail},List}=I|Is], D0, Acc) ->
+    D1 = add_unsafe_label(Fail, D0),
+    D = update_value_dict(List, Reg, D1),
+    eliminate_moves(Is, D, [I|Acc]);
+eliminate_moves([{test,is_eq_exact,_,[Reg,Val]}=I,
+                 {block,BlkIs0}|Is], D0, Acc) ->
+    D = update_unsafe_labels(I, D0),
+    RegVal = {Reg,Val},
+    BlkIs = eliminate_moves_blk(BlkIs0, RegVal),
+    eliminate_moves([{block,BlkIs}|Is], D, [I|Acc]);
+eliminate_moves([{label,Lbl},{block,BlkIs0}=Blk|Is], D, Acc0) ->
+    Acc = [{label,Lbl}|Acc0],
+    case {no_fallthrough(Acc0),D} of
+        {true,#{Lbl:={_,_}=RegVal}} ->
+            BlkIs = eliminate_moves_blk(BlkIs0, RegVal),
+            eliminate_moves([{block,BlkIs}|Is], D, Acc);
+        {_,_} ->
+            eliminate_moves([Blk|Is], D, Acc)
+    end;
+eliminate_moves([{block,[]}|Is], D, Acc) ->
+    %% Empty blocks can prevent further jump optimizations.
+    eliminate_moves(Is, D, Acc);
+eliminate_moves([I|Is], D0, Acc) ->
+    D = update_unsafe_labels(I, D0),
+    eliminate_moves(Is, D, [I|Acc]);
+eliminate_moves([], _, Acc) -> reverse(Acc).
+
+eliminate_moves_blk([{set,[Dst],[_],move}|_]=Is, {_,Dst}) ->
+    Is;
+eliminate_moves_blk([{set,[Dst],[Lit],move}|Is], {Dst,Lit}) ->
+    %% Remove redundant 'move' instruction.
+    Is;
+eliminate_moves_blk([{set,[Dst],[_],move}|_]=Is, {Dst,_}) ->
+    Is;
+eliminate_moves_blk([{set,[_],[_],move}=I|Is], {_,_}=RegVal) ->
+    [I|eliminate_moves_blk(Is, RegVal)];
+eliminate_moves_blk(Is, _) -> Is.
+
+no_fallthrough([I|_]) ->
+    is_unreachable_after(I).
+
+update_value_dict([Lit,{f,Lbl}|T], Reg, D0) ->
+    D = case D0 of
+            #{Lbl:=unsafe} -> D0;
+            #{Lbl:={Reg,Lit}} -> D0;
+            #{Lbl:=_} -> D0#{Lbl:=unsafe};
+            #{} -> D0#{Lbl=>{Reg,Lit}}
+        end,
+    update_value_dict(T, Reg, D);
+update_value_dict([], _, D) -> D.
+
+add_unsafe_label(L, D) ->
+    D#{L=>unsafe}.
+
+update_unsafe_labels(I, D) ->
+    Ls = instr_labels(I),
+    update_unsafe_labels_1(Ls, D).
+
+update_unsafe_labels_1([L|Ls], D) ->
+    update_unsafe_labels_1(Ls, D#{L=>unsafe});
+update_unsafe_labels_1([], D) -> D.
+
+%%%
+%%% It seems to be useful to insert extra labels after certain
+%%% test instructions. This used to be done by beam_dead.
+%%%
+
+insert_labels([{test,Op,_,_}=I|Is], Lc, Acc) ->
+    Useful = case Op of
+                 is_lt -> true;
+                 is_ge -> true;
+                 is_eq_exact -> true;
+                 is_ne_exact -> true;
+                 _ -> false
+             end,
+    case Useful of
+	false -> insert_labels(Is, Lc, [I|Acc]);
+	true -> insert_labels(Is, Lc+1, [{label,Lc},I|Acc])
+    end;
+insert_labels([I|Is], Lc, Acc) ->
+    insert_labels(Is, Lc, [I|Acc]);
+insert_labels([], Lc, Acc) ->
+    {reverse(Acc),Lc}.
 
 %%%
 %%% (1) We try to share the code for identical code segments by replacing all
@@ -156,41 +269,51 @@ function({function,Name,Arity,CLabel,Asm0}) ->
 %%%
 
 share(Is0) ->
-    %% We will get more sharing if we never fall through to a label.
-    Is = eliminate_fallthroughs(Is0, []),
-    share_1(Is, #{}, [], []).
+    Is1 = eliminate_fallthroughs(Is0, []),
+    Is2 = find_fixpoint(fun(Is) ->
+                                share_1(Is, #{}, #{}, [], [])
+                        end, Is1),
+    reverse(Is2).
 
-share_1([{label,L}=Lbl|Is], Dict0, [_|_]=Seq, Acc) ->
+share_1([{label,L}=Lbl|Is], Dict0, Lbls0, [_|_]=Seq, Acc) ->
     case maps:find(Seq, Dict0) of
-	error ->
-	    Dict = maps:put(Seq, L, Dict0),
-	    share_1(Is, Dict, [], [Lbl|Seq ++ Acc]);
-	{ok,Label} ->
-	    share_1(Is, Dict0, [], [Lbl,{jump,{f,Label}}|Acc])
+        error ->
+            Dict = maps:put(Seq, L, Dict0),
+            share_1(Is, Dict, Lbls0, [], [[Lbl|Seq]|Acc]);
+        {ok,Label} ->
+            Lbls = maps:put(L, Label, Lbls0),
+            share_1(Is, Dict0, Lbls, [], [[Lbl,{jump,{f,Label}}]|Acc])
     end;
-share_1([{func_info,_,_,_}=I|Is], _, [], Acc) ->
-    reverse(Is, [I|Acc]);
-share_1([{'catch',_,_}=I|Is], Dict0, Seq, Acc) ->
-    Dict = clean_non_sharable(Dict0),
-    share_1(Is, Dict, [I|Seq], Acc);
-share_1([{'try',_,_}=I|Is], Dict0, Seq, Acc) ->
-    Dict = clean_non_sharable(Dict0),
-    share_1(Is, Dict, [I|Seq], Acc);
-share_1([{try_case,_}=I|Is], Dict0, Seq, Acc) ->
-    Dict = clean_non_sharable(Dict0),
-    share_1(Is, Dict, [I|Seq], Acc);
-share_1([{catch_end,_}=I|Is], Dict0, Seq, Acc) ->
-    Dict = clean_non_sharable(Dict0),
-    share_1(Is, Dict, [I|Seq], Acc);
-share_1([I|Is], Dict, Seq, Acc) ->
+share_1([{func_info,_,_,_}|_]=Is0, _, Lbls, [], Acc0) when Lbls =/= #{} ->
+    lists:foldl(fun(Is, Acc) ->
+        beam_utils:replace_labels(Is, Acc, Lbls, fun(Old) -> Old end)
+    end, Is0, Acc0);
+share_1([{func_info,_,_,_}|_]=Is, _, Lbls, [], Acc) when Lbls =:= #{} ->
+    lists:foldl(fun lists:reverse/2, Is, Acc);
+share_1([{'catch',_,_}=I|Is], Dict0, Lbls0, Seq, Acc) ->
+    {Dict,Lbls} = clean_non_sharable(Dict0, Lbls0),
+    share_1(Is, Dict, Lbls, [I|Seq], Acc);
+share_1([{'try',_,_}=I|Is], Dict0, Lbls0, Seq, Acc) ->
+    {Dict,Lbls} = clean_non_sharable(Dict0, Lbls0),
+    share_1(Is, Dict, Lbls, [I|Seq], Acc);
+share_1([{try_case,_}=I|Is], Dict0, Lbls0, Seq, Acc) ->
+    {Dict,Lbls} = clean_non_sharable(Dict0, Lbls0),
+    share_1(Is, Dict, Lbls, [I|Seq], Acc);
+share_1([{catch_end,_}=I|Is], Dict0, Lbls0, Seq, Acc) ->
+    {Dict,Lbls} = clean_non_sharable(Dict0, Lbls0),
+    share_1(Is, Dict, Lbls, [I|Seq], Acc);
+share_1([{jump,{f,To}}=I,{label,L}=Lbl|Is], Dict0, Lbls0, _Seq, Acc) ->
+    Lbls = maps:put(L, To, Lbls0),
+    share_1(Is, Dict0, Lbls, [], [[Lbl,I]|Acc]);
+share_1([I|Is], Dict, Lbls, Seq, Acc) ->
     case is_unreachable_after(I) of
 	false ->
-	    share_1(Is, Dict, [I|Seq], Acc);
+	    share_1(Is, Dict, Lbls, [I|Seq], Acc);
 	true ->
-	    share_1(Is, Dict, [I], Acc)
+	    share_1(Is, Dict, Lbls, [I], Acc)
     end.
 
-clean_non_sharable(Dict) ->
+clean_non_sharable(Dict0, Lbls0) ->
     %% We are passing in or out of a 'catch' or 'try' block. Remove
     %% sequences that should not be shared over the boundaries of the
     %% block. Since the end of the sequence must match, the only
@@ -198,7 +321,17 @@ clean_non_sharable(Dict) ->
     %% the 'catch'/'try' block is a sequence that ends with an
     %% instruction that causes an exception. Any sequence that causes
     %% an exception must contain a line/1 instruction.
-    maps:filter(fun(K, _V) -> sharable_with_try(K) end, Dict).
+    Dict1 = maps:to_list(Dict0),
+    Lbls1 = maps:to_list(Lbls0),
+    {Dict2,Lbls2} = foldl(fun({K, V}, {Dict,Lbls}) ->
+                                  case sharable_with_try(K) of
+                                      true ->
+                                          {[{K,V}|Dict],lists:keydelete(V, 2, Lbls)};
+                                      false ->
+                                          {Dict,Lbls}
+                                  end
+                          end, {[],Lbls1}, Dict1),
+    {maps:from_list(Dict2),maps:from_list(Lbls2)}.
 
 sharable_with_try([{line,_}|_]) ->
     %% This sequence may cause an exception and may potentially
@@ -251,8 +384,6 @@ extract_seq([{line,_}=Line|Is], Acc) ->
     extract_seq(Is, [Line|Acc]);
 extract_seq([{block,_}=Bl|Is], Acc) ->
     extract_seq_1(Is, [Bl|Acc]);
-extract_seq([{bs_context_to_binary,_}=I|Is], Acc) ->
-    extract_seq_1(Is, [I|Acc]);
 extract_seq([{label,_}|_]=Is, Acc) ->
     extract_seq_1(Is, Acc);
 extract_seq(_, _) -> no.
@@ -276,14 +407,13 @@ extract_seq_1(_, _) -> no.
 	{
 	  entry :: beam_asm:label(), %Entry label (must not be moved).
 	  replace :: #{beam_asm:label() := beam_asm:label()}, %Labels to replace.
-	  labels :: cerl_sets:set(),         %Set of referenced labels.
-          index :: beam_utils:code_index() | {lazy,[beam_utils:instruction()]} %Index built lazily only if needed
+	  labels :: cerl_sets:set()         %Set of referenced labels.
 	}).
 
 opt(Is0, CLabel) ->
     find_fixpoint(fun(Is) ->
 			  Lbls = initial_labels(Is),
-			  St = #st{entry=CLabel,replace=#{},labels=Lbls,index={lazy,Is}},
+			  St = #st{entry=CLabel,replace=#{},labels=Lbls},
 			  opt(Is, [], St)
 		  end, Is0).
 
@@ -293,7 +423,7 @@ find_fixpoint(OptFun, Is0) ->
 	Is -> find_fixpoint(OptFun, Is)
     end.
 
-opt([{test,_,{f,L}=Lbl,_}=I|[{jump,{f,L}}|_]=Is], Acc0, St0) ->
+opt([{test,_,{f,L}=Lbl,_}=I|[{jump,{f,L}}|_]=Is], Acc, St) ->
     %% We have
     %%    Test Label Ops
     %%    jump Label
@@ -302,23 +432,10 @@ opt([{test,_,{f,L}=Lbl,_}=I|[{jump,{f,L}}|_]=Is], Acc0, St0) ->
     case beam_utils:is_pure_test(I) of
 	false ->
 	    %% Test is not pure; we must keep it.
-	    opt(Is, [I|Acc0], label_used(Lbl, St0));
+	    opt(Is, [I|Acc], label_used(Lbl, St));
 	true ->
 	    %% The test is pure and its failure label is the same
 	    %% as in the jump that follows -- thus it is not needed.
-            %% Check if any of the previous instructions could also be eliminated.
-            {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) ->
@@ -385,51 +502,6 @@ normalize_replace([{From,To0}|Rest], Replace, Acc) ->
 normalize_replace([], _Replace, Acc) ->
     maps:from_list(Acc).
 
-%% After eliminating a test, it might happen, that a register was only used
-%% in this test. Let's check if that was the case and if it was so, we can
-%% eliminate the load into the register completely.
-opt_useless_loads([{block,_}|_]=Is, L, #st{index={lazy,FIs}}=St) ->
-    opt_useless_loads(Is, L, St#st{index=beam_utils:index_labels(FIs)});
-opt_useless_loads([{block,Block0}|Is], L, #st{index=Index}=St) ->
-    case opt_useless_block_loads(Block0, L, Index) of
-        [] ->
-            opt_useless_loads(Is, L, St);
-        [_|_]=Block ->
-            {[{block,Block}|Is],St}
-    end;
-%% After eliminating the test and useless blocks, it might happen,
-%% that the previous test could also be eliminated.
-%% It might be that the label was already marked as used, even if ultimately,
-%% it never will be - we can't do much about it at that point, though
-opt_useless_loads([{test,_,{f,L},_}=I|Is], L, St) ->
-    case beam_utils:is_pure_test(I) of
-        false ->
-            {[I|Is],St};
-        true ->
-            opt_useless_loads(Is, L, St)
-    end;
-opt_useless_loads(Is, _L, St) ->
-    {Is,St}.
-
-opt_useless_block_loads([{set,[Dst],_,_}=I|Is0], L, Index) ->
-    BlockJump = [{block,Is0},{jump,{f,L}}],
-    case beam_utils:is_killed(Dst, BlockJump, Index) of
-        true ->
-            %% The register is killed and not used, we can remove the load.
-            %% Remove any `put` instructions in case we just
-            %% removed a `put_tuple` instruction.
-            Is = dropwhile(fun({set,_,_,put}) -> true;
-                              (_) -> false
-                           end, Is0),
-            opt_useless_block_loads(Is, L, Index);
-        false ->
-            [I|opt_useless_block_loads(Is0, L, Index)]
-    end;
-opt_useless_block_loads([I|Is], L, Index) ->
-    [I|opt_useless_block_loads(Is, L, Index)];
-opt_useless_block_loads([], _L, _Index) ->
-    [].
-
 collect_labels(Is, Label, #st{entry=Entry,replace=Replace} = St) ->
     collect_labels_1(Is, Label, Entry, Replace, St).
 
@@ -556,52 +628,109 @@ drop_upto_label([{label,_}|_]=Is) -> Is;
 drop_upto_label([_|Is]) -> drop_upto_label(Is);
 drop_upto_label([]) -> [].
 
-%% ulbl(Instruction, UsedGbSet) -> UsedGbSet'
-%%  Update the gb_set UsedGbSet with any function-local labels
+%% unshare([Instruction]) -> [Instruction].
+%%  Replace a jump to a return sequence (a `return` instruction
+%%  optionally preced by a `deallocate` instruction) with the return
+%%  sequence. This always saves execution time and may also save code
+%%  space (depending on the architecture). Eliminating `jump`
+%%  instructions also gives beam_trim more opportunities to trim the
+%%  stack.
+
+unshare(Is) ->
+    Short = unshare_collect_short(Is, #{}),
+    unshare_short(Is, Short).
+
+unshare_collect_short([{label,L},return|Is], Map) ->
+    unshare_collect_short(Is, Map#{L=>[return]});
+unshare_collect_short([{label,L},{deallocate,_}=D,return|Is], Map) ->
+    %% `deallocate` and `return` are combined into one instruction by
+    %% the loader.
+    unshare_collect_short(Is, Map#{L=>[D,return]});
+unshare_collect_short([_|Is], Map) ->
+    unshare_collect_short(Is, Map);
+unshare_collect_short([], Map) -> Map.
+
+unshare_short([{jump,{f,F}}=I|Is], Map) ->
+    case Map of
+        #{F:=Seq} ->
+            Seq ++ unshare_short(Is, Map);
+        #{} ->
+            [I|unshare_short(Is, Map)]
+    end;
+unshare_short([I|Is], Map) ->
+    [I|unshare_short(Is, Map)];
+unshare_short([], _Map) -> [].
+
+%% ulbl(Instruction, UsedCerlSet) -> UsedCerlSet'
+%%  Update the cerl_set UsedCerlSet with any function-local labels
 %%  (i.e. not with labels in call instructions) referenced by
 %%  the instruction Instruction.
 %%
 %%  NOTE: This function does NOT look for labels inside blocks.
 
-ulbl({test,_,Fail,_}, Used) ->
-    mark_used(Fail, Used);
-ulbl({test,_,Fail,_,_,_}, Used) ->
-    mark_used(Fail, Used);
-ulbl({select,_,_,Fail,Vls}, Used) ->
-    mark_used_list(Vls, mark_used(Fail, Used));
-ulbl({'try',_,Lbl}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({'catch',_,Lbl}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({jump,Lbl}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({loop_rec,Lbl,_}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({loop_rec_end,Lbl}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({wait,Lbl}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({wait_timeout,Lbl,_To}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({bif,_Name,Lbl,_As,_R}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({gc_bif,_Name,Lbl,_Live,_As,_R}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({bs_init,Lbl,_,_,_,_}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({bs_put,Lbl,_,_}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({put_map,Lbl,_Op,_Src,_Dst,_Live,_List}, Used) ->
-    mark_used(Lbl, Used);
-ulbl({get_map_elements,Lbl,_Src,_List}, Used) ->
-    mark_used(Lbl, Used);
-ulbl(_, Used) -> Used.
-
-mark_used({f,0}, Used) -> Used;
-mark_used({f,L}, Used) -> cerl_sets:add_element(L, Used).
-
-mark_used_list([{f,L}|T], Used) ->
-    mark_used_list(T, cerl_sets:add_element(L, Used));
-mark_used_list([_|T], Used) ->
-    mark_used_list(T, Used);
-mark_used_list([], Used) -> Used.
+ulbl(I, Used) ->
+    case instr_labels(I) of
+        [] ->
+            Used;
+        [Lbl] ->
+            cerl_sets:add_element(Lbl, Used);
+        [_|_]=L ->
+            ulbl_list(L, Used)
+    end.
+
+ulbl_list([L|Ls], Used) ->
+    ulbl_list(Ls, cerl_sets:add_element(L, Used));
+ulbl_list([], Used) -> Used.
+
+-spec instr_labels(Instruction) -> Labels when
+      Instruction :: instruction(),
+      Labels :: [beam_asm:label()].
+
+instr_labels({test,_,Fail,_}) ->
+    do_instr_labels(Fail);
+instr_labels({test,_,Fail,_,_,_}) ->
+    do_instr_labels(Fail);
+instr_labels({select,_,_,Fail,Vls}) ->
+    do_instr_labels_list(Vls, do_instr_labels(Fail));
+instr_labels({'try',_,Lbl}) ->
+    do_instr_labels(Lbl);
+instr_labels({'catch',_,Lbl}) ->
+    do_instr_labels(Lbl);
+instr_labels({jump,Lbl}) ->
+    do_instr_labels(Lbl);
+instr_labels({loop_rec,Lbl,_}) ->
+    do_instr_labels(Lbl);
+instr_labels({loop_rec_end,Lbl}) ->
+    do_instr_labels(Lbl);
+instr_labels({wait,Lbl}) ->
+    do_instr_labels(Lbl);
+instr_labels({wait_timeout,Lbl,_To}) ->
+    do_instr_labels(Lbl);
+instr_labels({bif,_Name,Lbl,_As,_R}) ->
+    do_instr_labels(Lbl);
+instr_labels({gc_bif,_Name,Lbl,_Live,_As,_R}) ->
+    do_instr_labels(Lbl);
+instr_labels({bs_init,Lbl,_,_,_,_}) ->
+    do_instr_labels(Lbl);
+instr_labels({bs_put,Lbl,_,_}) ->
+    do_instr_labels(Lbl);
+instr_labels({put_map,Lbl,_Op,_Src,_Dst,_Live,_List}) ->
+    do_instr_labels(Lbl);
+instr_labels({get_map_elements,Lbl,_Src,_List}) ->
+    do_instr_labels(Lbl);
+instr_labels({recv_mark,Lbl}) ->
+    do_instr_labels(Lbl);
+instr_labels({recv_set,Lbl}) ->
+    do_instr_labels(Lbl);
+instr_labels({fcheckerror,Lbl}) ->
+    do_instr_labels(Lbl);
+instr_labels(_) -> [].
+
+do_instr_labels({f,0}) -> [];
+do_instr_labels({f,F}) -> [F].
+
+do_instr_labels_list([{f,F}|T], Acc) ->
+    do_instr_labels_list(T, [F|Acc]);
+do_instr_labels_list([_|T], Acc) ->
+    do_instr_labels_list(T, Acc);
+do_instr_labels_list([], Acc) -> Acc.
diff --git a/lib/compiler/src/beam_kernel_to_ssa.erl b/lib/compiler/src/beam_kernel_to_ssa.erl
new file mode 100644
index 0000000000..df95749fb3
--- /dev/null
+++ b/lib/compiler/src/beam_kernel_to_ssa.erl
@@ -0,0 +1,1312 @@
+%%
+%% %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%
+%%
+%% Purpose: Convert the Kernel Erlang format to the SSA format.
+
+-module(beam_kernel_to_ssa).
+
+%% The main interface.
+-export([module/2]).
+
+-import(lists, [append/1,duplicate/2,flatmap/2,foldl/3,
+                keysort/2,mapfoldl/3,map/2,member/2,
+                reverse/1,reverse/2,sort/1]).
+
+-include("v3_kernel.hrl").
+-include("beam_ssa.hrl").
+
+-type label() :: beam_ssa:label().
+
+%% Main codegen structure.
+-record(cg, {lcount=1 :: label(),               %Label counter
+             bfail=1 :: label(),
+             catch_label=none :: 'none' | label(),
+             vars=#{} :: map(),     %Defined variables.
+             break=0 :: label(),    %Break label
+             recv=0 :: label(),     %Receive label
+             ultimate_failure=0 :: label() %Label for ultimate match failure.
+            }).
+
+%% Internal records.
+-record(cg_break, {args :: [beam_ssa:value()],
+                   phi :: label()
+                  }).
+-record(cg_phi, {vars :: [beam_ssa:b_var()]
+                }).
+-record(cg_unreachable, {}).
+
+-spec module(#k_mdef{}, [compile:option()]) -> {'ok',#b_module{}}.
+
+module(#k_mdef{name=Mod,exports=Es,attributes=Attr,body=Forms}, _Opts) ->
+    Body = functions(Forms, Mod),
+    Module = #b_module{name=Mod,exports=Es,attributes=Attr,body=Body},
+    {ok,Module}.
+
+functions(Forms, Mod) ->
+    [function(F, Mod) || F <- Forms].
+
+function(#k_fdef{anno=Anno0,func=Name,arity=Arity,
+                 vars=As0,body=Kb}, Mod) ->
+    try
+        #k_match{} = Kb,                   %Assertion.
+
+        %% Generate the SSA form immediate format.
+        St0 = #cg{},
+        {As,St1} = new_ssa_vars(As0, St0),
+        {Asm,St} = cg_fun(Kb, St1),
+        Anno1 = line_anno(Anno0),
+        Anno = Anno1#{func_info=>{Mod,Name,Arity}},
+        #b_function{anno=Anno,args=As,bs=Asm,cnt=St#cg.lcount}
+    catch
+        Class:Error:Stack ->
+            io:fwrite("Function: ~w/~w\n", [Name,Arity]),
+            erlang:raise(Class, Error, Stack)
+    end.
+
+%% cg_fun([Lkexpr], [HeadVar], State) -> {[Ainstr],State}
+
+cg_fun(Ke, St0) ->
+    {UltimateFail,FailIs,St1} = make_failure(badarg, St0),
+    St2 = St1#cg{bfail=UltimateFail,ultimate_failure=UltimateFail},
+    {B,St} = cg(Ke, St2),
+    Asm = [{label,0}|B++FailIs],
+    finalize(Asm, St).
+
+make_failure(Reason, St0) ->
+    {Lbl,St1} = new_label(St0),
+    {Dst,St} = new_ssa_var('@ssa_ret', St1),
+    Is = [{label,Lbl},
+          #b_set{op=call,dst=Dst,
+                 args=[#b_remote{mod=#b_literal{val=erlang},
+                                 name=#b_literal{val=error},
+                                 arity=1},
+                       #b_literal{val=Reason}]},
+          #b_ret{arg=Dst}],
+    {Lbl,Is,St}.
+
+%% cg(Lkexpr, State) -> {[Ainstr],State}.
+%%  Generate code for a kexpr.
+
+cg(#k_match{body=M,ret=Rs}, St) ->
+    do_match_cg(M, Rs, St);
+cg(#k_guard_match{body=M,ret=Rs}, St) ->
+    do_match_cg(M, Rs, St);
+cg(#k_seq{arg=Arg,body=Body}, St0) ->
+    {ArgIs,St1} = cg(Arg, St0),
+    {BodyIs,St} = cg(Body, St1),
+    {ArgIs++BodyIs,St};
+cg(#k_call{anno=Le,op=Func,args=As,ret=Rs}, St) ->
+    call_cg(Func, As, Rs, Le, St);
+cg(#k_enter{anno=Le,op=Func,args=As}, St) ->
+    enter_cg(Func, As, Le, St);
+cg(#k_bif{anno=Le}=Bif, St) ->
+    bif_cg(Bif, Le, St);
+cg(#k_try{arg=Ta,vars=Vs,body=Tb,evars=Evs,handler=Th,ret=Rs}, St) ->
+    try_cg(Ta, Vs, Tb, Evs, Th, Rs, St);
+cg(#k_try_enter{arg=Ta,vars=Vs,body=Tb,evars=Evs,handler=Th}, St) ->
+    try_enter_cg(Ta, Vs, Tb, Evs, Th, St);
+cg(#k_catch{body=Cb,ret=[R]}, St) ->
+    do_catch_cg(Cb, R, St);
+cg(#k_receive{anno=Le,timeout=Te,var=Rvar,body=Rm,action=Tes,ret=Rs}, St) ->
+    recv_loop_cg(Te, Rvar, Rm, Tes, Rs, Le, St);
+cg(#k_receive_next{}, #cg{recv=Recv}=St) ->
+    Is = [#b_set{op=recv_next},make_uncond_branch(Recv)],
+    {Is,St};
+cg(#k_receive_accept{}, St) ->
+    Remove = #b_set{op=remove_message},
+    {[Remove],St};
+cg(#k_put{anno=Le,arg=Con,ret=Var}, St) ->
+    put_cg(Var, Con, Le, St);
+cg(#k_return{args=[Ret0]}, St) ->
+    Ret = ssa_arg(Ret0, St),
+    {[#b_ret{arg=Ret}],St};
+cg(#k_break{args=Bs}, #cg{break=Br}=St) ->
+    Args = ssa_args(Bs, St),
+    {[#cg_break{args=Args,phi=Br}],St};
+cg(#k_guard_break{args=Bs}, St) ->
+    cg(#k_break{args=Bs}, St).
+
+%% match_cg(Matc, [Ret], State) -> {[Ainstr],State}.
+%%  Generate code for a match.
+
+do_match_cg(M, Rs, St0) ->
+    {B,St1} = new_label(St0),
+    {Mis,St2} = match_cg(M, St1#cg.bfail, St1#cg{break=B}),
+    {BreakVars,St} = new_ssa_vars(Rs, St2),
+    {Mis ++ [{label,B},#cg_phi{vars=BreakVars}],
+     St#cg{bfail=St0#cg.bfail,break=St1#cg.break}}.
+
+%% match_cg(Match, Fail, State) -> {[Ainstr],State}.
+%%  Generate code for a match tree.
+
+match_cg(#k_alt{first=F,then=S}, Fail, St0) ->
+    {Tf,St1} = new_label(St0),
+    {Fis,St2} = match_cg(F, Tf, St1),
+    {Sis,St3} = match_cg(S, Fail, St2),
+    {Fis ++ [{label,Tf}] ++ Sis,St3};
+match_cg(#k_select{var=#k_var{}=V,types=Scs}, Fail, St) ->
+    match_fmf(fun (S, F, Sta) ->
+                      select_cg(S, V, F, Fail, Sta)
+              end, Fail, St, Scs);
+match_cg(#k_guard{clauses=Gcs}, Fail, St) ->
+    match_fmf(fun (G, F, Sta) ->
+                      guard_clause_cg(G, F, Sta)
+              end, Fail, St, Gcs);
+match_cg(Ke, _Fail, St0) ->
+    cg(Ke, St0).
+
+%% select_cg(Sclause, V, TypeFail, ValueFail, State) -> {Is,State}.
+%%  Selecting type and value needs two failure labels, TypeFail is the
+%%  label to jump to of the next type test when this type fails, and
+%%  ValueFail is the label when this type is correct but the value is
+%%  wrong.  These are different as in the second case there is no need
+%%  to try the next type, it will always fail.
+
+select_cg(#k_type_clause{type=k_binary,values=[S]}, Var, Tf, Vf, St) ->
+    select_binary(S, Var, Tf, Vf, St);
+select_cg(#k_type_clause{type=k_bin_seg,values=Vs}, Var, Tf, _Vf, St) ->
+    select_bin_segs(Vs, Var, Tf, St);
+select_cg(#k_type_clause{type=k_bin_int,values=Vs}, Var, Tf, _Vf, St) ->
+    select_bin_segs(Vs, Var, Tf, St);
+select_cg(#k_type_clause{type=k_bin_end,values=[S]}, Var, Tf, _Vf, St) ->
+    select_bin_end(S, Var, Tf, St);
+select_cg(#k_type_clause{type=k_map,values=Vs}, Var, Tf, Vf, St) ->
+    select_map(Vs, Var, Tf, Vf, St);
+select_cg(#k_type_clause{type=k_cons,values=[S]}, Var, Tf, Vf, St) ->
+    select_cons(S, Var, Tf, Vf, St);
+select_cg(#k_type_clause{type=k_nil,values=[S]}, Var, Tf, Vf, St) ->
+    select_nil(S, Var, Tf, Vf, St);
+select_cg(#k_type_clause{type=k_literal,values=Vs}, Var, Tf, Vf, St) ->
+    select_literal(Vs, Var, Tf, Vf, St);
+select_cg(#k_type_clause{type=Type,values=Scs}, Var, Tf, Vf, St0) ->
+    {Vis,St1} =
+        mapfoldl(fun (S, Sta) ->
+                         {Val,Is,Stb} = select_val(S, Var, Vf, Sta),
+                         {{Is,[Val]},Stb}
+                 end, St0, Scs),
+    OptVls = combine(lists:sort(combine(Vis))),
+    {Vls,Sis,St2} = select_labels(OptVls, St1, [], []),
+    Arg = ssa_arg(Var, St2),
+    {Is,St} = select_val_cg(Type, Arg, Vls, Tf, Vf, Sis, St2),
+    {Is,St}.
+
+select_val_cg(k_tuple, Tuple, Vls, Tf, Vf, Sis, St0) ->
+    {Is0,St1} = make_cond_branch({bif,is_tuple}, [Tuple], Tf, St0),
+    {Arity,St2} = new_ssa_var('@ssa_arity', St1),
+    GetArity = #b_set{op={bif,tuple_size},dst=Arity,args=[Tuple]},
+    {Is,St} = select_val_cg(k_int, Arity, Vls, Vf, Vf, Sis, St2),
+    {Is0++[GetArity]++Is,St};
+select_val_cg(Type, R, Vls, Tf, Vf, Sis, St0) ->
+    {TypeIs,St1} = if
+                       Tf =:= Vf ->
+                           %% The type and value failure labels are the same;
+                           %% we don't need a type test.
+                           {[],St0};
+                       true ->
+                           %% Different labels for type failure and
+                           %% label failure; we need a type test.
+                           Test = select_type_test(Type),
+                           make_cond_branch(Test, [R], Tf, St0)
+                   end,
+    case Vls of
+        [{Val,Succ}] ->
+            {Is,St} = make_cond({bif,'=:='}, [R,Val], Vf, Succ, St1),
+            {TypeIs++Is++Sis,St};
+        [_|_] ->
+            {TypeIs++[#b_switch{arg=R,fail=Vf,list=Vls}|Sis],St1}
+    end.
+
+select_type_test(k_int) -> {bif,is_integer};
+select_type_test(k_atom) -> {bif,is_atom};
+select_type_test(k_float) -> {bif,is_float}.
+
+combine([{Is,Vs1},{Is,Vs2}|Vis]) -> combine([{Is,Vs1 ++ Vs2}|Vis]);
+combine([V|Vis]) -> [V|combine(Vis)];
+combine([]) -> [].
+
+select_labels([{Is,Vs}|Vis], St0, Vls, Sis) ->
+    {Lbl,St1} = new_label(St0),
+    select_labels(Vis, St1, add_vls(Vs, Lbl, Vls), [[{label,Lbl}|Is]|Sis]);
+select_labels([], St, Vls, Sis) ->
+    {Vls,append(Sis),St}.
+
+add_vls([V|Vs], Lbl, Acc) ->
+    add_vls(Vs, Lbl, [{#b_literal{val=V},Lbl}|Acc]);
+add_vls([], _, Acc) -> Acc.
+
+select_literal(S, V, Tf, Vf, St) ->
+    Src = ssa_arg(V, St),
+    F = fun(ValClause, Fail, St0) ->
+                {Val,ValIs,St1} = select_val(ValClause, V, Vf, St0),
+                Args = [Src,#b_literal{val=Val}],
+                {Is,St2} = make_cond_branch({bif,'=:='}, Args, Fail, St1),
+                {Is++ValIs,St2}
+        end,
+    match_fmf(F, Tf, St, S).
+
+select_cons(#k_val_clause{val=#k_cons{hd=Hd,tl=Tl},body=B},
+            V, Tf, Vf, St0) ->
+    Es = [Hd,Tl],
+    {Eis,St1} = select_extract_cons(V, Es, St0),
+    {Bis,St2} = match_cg(B, Vf, St1),
+    Src = ssa_arg(V, St2),
+    {Is,St} = make_cond_branch(is_nonempty_list, [Src], Tf, St2),
+    {Is ++ Eis ++ Bis,St}.
+
+select_nil(#k_val_clause{val=#k_nil{},body=B}, V, Tf, Vf, St0) ->
+    {Bis,St1} = match_cg(B, Vf, St0),
+    Src = ssa_arg(V, St1),
+    {Is,St} = make_cond_branch({bif,'=:='}, [Src,#b_literal{val=[]}], Tf, St1),
+    {Is ++ Bis,St}.
+
+select_binary(#k_val_clause{val=#k_binary{segs=#k_var{name=Ctx0}},body=B},
+              #k_var{}=Src, Tf, Vf, St0) ->
+    {Ctx,St1} = new_ssa_var(Ctx0, St0),
+    {Bis0,St2} = match_cg(B, Vf, St1),
+    {TestIs,St} = make_cond_branch(succeeded, [Ctx], Tf, St2),
+    Bis1 = [#b_set{op=bs_start_match,dst=Ctx,
+                   args=[ssa_arg(Src, St)]}] ++ TestIs ++ Bis0,
+    Bis = finish_bs_matching(Bis1),
+    {Bis,St}.
+
+finish_bs_matching([#b_set{op=bs_match,
+                           args=[#b_literal{val=string},Ctx,#b_literal{val=BinList}]}=Set|Is])
+  when is_list(BinList) ->
+    I = Set#b_set{args=[#b_literal{val=string},Ctx,
+                        #b_literal{val=list_to_bitstring(BinList)}]},
+    finish_bs_matching([I|Is]);
+finish_bs_matching([I|Is]) ->
+    [I|finish_bs_matching(Is)];
+finish_bs_matching([]) -> [].
+
+make_cond(Cond, Args, Fail, Succ, St0) ->
+    {Bool,St} = new_ssa_var('@ssa_bool', St0),
+    Bif = #b_set{op=Cond,dst=Bool,args=Args},
+    Br = #b_br{bool=Bool,succ=Succ,fail=Fail},
+    {[Bif,Br],St}.
+
+make_cond_branch(Cond, Args, Fail, St0) ->
+    {Bool,St1} = new_ssa_var('@ssa_bool', St0),
+    {Succ,St} = new_label(St1),
+    Bif = #b_set{op=Cond,dst=Bool,args=Args},
+    Br = #b_br{bool=Bool,succ=Succ,fail=Fail},
+    {[Bif,Br,{label,Succ}],St}.
+
+make_uncond_branch(Fail) ->
+    #b_br{bool=#b_literal{val=true},succ=Fail,fail=Fail}.
+
+%% Instructions for selection of binary segments.
+
+select_bin_segs(Scs, Ivar, Tf, St) ->
+    match_fmf(fun(S, Fail, Sta) ->
+                      select_bin_seg(S, Ivar, Fail, Sta)
+              end, Tf, St, Scs).
+
+select_bin_seg(#k_val_clause{val=#k_bin_seg{size=Size,unit=U,type=T,
+                                            seg=Seg,flags=Fs,next=Next},
+                             body=B,anno=Anno},
+               #k_var{}=Src, Fail, St0) ->
+    LineAnno = line_anno(Anno),
+    Ctx = get_context(Src, St0),
+    {Mis,St1} = select_extract_bin(Next, Size, U, T, Fs, Fail,
+                                   Ctx, LineAnno, St0),
+    {Extracted,St2} = new_ssa_var(Seg#k_var.name, St1),
+    {Bis,St} = match_cg(B, Fail, St2),
+    BsGet = #b_set{op=bs_extract,dst=Extracted,args=[ssa_arg(Next, St)]},
+    Is = Mis ++ [BsGet] ++ Bis,
+    {Is,St};
+select_bin_seg(#k_val_clause{val=#k_bin_int{size=Sz,unit=U,flags=Fs,
+                                            val=Val,next=Next},
+                             body=B},
+               #k_var{}=Src, Fail, St0) ->
+    Ctx = get_context(Src, St0),
+    {Mis,St1} = select_extract_int(Next, Val, Sz, U, Fs, Fail,
+                                     Ctx, St0),
+    {Bis,St} = match_cg(B, Fail, St1),
+    Is = case Mis ++ Bis of
+             [#b_set{op=bs_match,args=[#b_literal{val=string},OtherCtx1,Bin1]},
+              #b_set{op=succeeded,dst=Bool1},
+              #b_br{bool=Bool1,succ=Succ,fail=Fail},
+              {label,Succ},
+              #b_set{op=bs_match,dst=Dst,args=[#b_literal{val=string},_OtherCtx2,Bin2]}|
+              [#b_set{op=succeeded,dst=Bool2},
+               #b_br{bool=Bool2,fail=Fail}|_]=Is0] ->
+                 %% We used to do this optimization later, but it
+                 %% turns out that in huge functions with many
+                 %% string matching instructions, it's a huge win
+                 %% to do the combination now. To avoid copying the
+                 %% binary data again and again, we'll combine bitstrings
+                 %% in a list and convert all of it to a bitstring later.
+                 {#b_literal{val=B1},#b_literal{val=B2}} = {Bin1,Bin2},
+                 Bin = #b_literal{val=[B1,B2]},
+                 Set = #b_set{op=bs_match,dst=Dst,args=[#b_literal{val=string},OtherCtx1,Bin]},
+                 [Set|Is0];
+             Is0 ->
+                 Is0
+         end,
+    {Is,St}.
+
+get_context(#k_var{}=Var, St) ->
+    ssa_arg(Var, St).
+
+select_bin_end(#k_val_clause{val=#k_bin_end{},body=B}, Src, Tf, St0) ->
+    Ctx = get_context(Src, St0),
+    {Bis,St1} = match_cg(B, Tf, St0),
+    {TestIs,St} = make_cond_branch(bs_test_tail, [Ctx,#b_literal{val=0}], Tf, St1),
+    Is = TestIs++Bis,
+    {Is,St}.
+
+select_extract_bin(#k_var{name=Hd}, Size0, Unit, Type, Flags, Vf,
+                   Ctx, Anno, St0) ->
+    {Dst,St1} = new_ssa_var(Hd, St0),
+    Size = ssa_arg(Size0, St0),
+    build_bs_instr(Anno, Type, Vf, Ctx, Size, Unit, Flags, Dst, St1).
+
+select_extract_int(#k_var{name=Tl}, 0, #k_int{val=0}, _U, _Fs, _Vf,
+                   Ctx, St0) ->
+    St = set_ssa_var(Tl, Ctx, St0),
+    {[],St};
+select_extract_int(#k_var{name=Tl}, Val, #k_int{val=Sz}, U, Fs, Vf,
+                   Ctx, St0) ->
+    {Dst,St1} = new_ssa_var(Tl, St0),
+    Bits = U*Sz,
+    Bin = case member(big, Fs) of
+              true ->
+                  <<Val:Bits>>;
+              false ->
+                  true = member(little, Fs),	%Assertion.
+                  <<Val:Bits/little>>
+          end,
+    Bits = bit_size(Bin),			%Assertion.
+    {TestIs,St} = make_cond_branch(succeeded, [Dst], Vf, St1),
+    Set = #b_set{op=bs_match,dst=Dst,
+                 args=[#b_literal{val=string},Ctx,#b_literal{val=Bin}]},
+    {[Set|TestIs],St}.
+
+build_bs_instr(Anno, Type, Fail, Ctx, Size, Unit0, Flags0, Dst, St0) ->
+    Unit = #b_literal{val=Unit0},
+    Flags = #b_literal{val=Flags0},
+    NeedSize = bs_need_size(Type),
+    TypeArg = #b_literal{val=Type},
+    Get = case NeedSize of
+              true ->
+                  #b_set{anno=Anno,op=bs_match,dst=Dst,
+                         args=[TypeArg,Ctx,Flags,Size,Unit]};
+              false ->
+                  #b_set{anno=Anno,op=bs_match,dst=Dst,
+                         args=[TypeArg,Ctx,Flags]}
+          end,
+    {Is,St} = make_cond_branch(succeeded, [Dst], Fail, St0),
+    {[Get|Is],St}.
+
+select_val(#k_val_clause{val=#k_tuple{es=Es},body=B}, V, Vf, St0) ->
+    #k{us=Used} = k_get_anno(B),
+    {Eis,St1} = select_extract_tuple(V, Es, Used, St0),
+    {Bis,St2} = match_cg(B, Vf, St1),
+    {length(Es),Eis ++ Bis,St2};
+select_val(#k_val_clause{val=Val0,body=B}, _V, Vf, St0) ->
+    Val = case Val0 of
+              #k_atom{val=Lit} -> Lit;
+              #k_float{val=Lit} -> Lit;
+              #k_int{val=Lit} -> Lit;
+              #k_literal{val=Lit} -> Lit
+          end,
+    {Bis,St1} = match_cg(B, Vf, St0),
+    {Val,Bis,St1}.
+
+%% select_extract_tuple(Src, [V], State) -> {[E],State}.
+%%  Extract tuple elements, but only if they are actually used.
+%%
+%%  Not extracting tuple elements that are not used is an
+%%  optimization for compile time and memory use during compilation.
+%%  It is probably worthwhile because it is common to extract only a
+%%  few elements from a huge record.
+
+select_extract_tuple(Src, Vs, Used, St0) ->
+    Tuple = ssa_arg(Src, St0),
+    F = fun (#k_var{name=V}, {Elem,S0}) ->
+                case member(V, Used) of
+                    true ->
+                        Args = [Tuple,#b_literal{val=Elem}],
+                        {Dst,S} = new_ssa_var(V, S0),
+                        Get = #b_set{op=get_tuple_element,dst=Dst,args=Args},
+                        {[Get],{Elem+1,S}};
+                    false ->
+                        {[],{Elem+1,S0}}
+                end
+        end,
+    {Es,{_,St}} = flatmapfoldl(F, {0,St0}, Vs),
+    {Es,St}.
+
+select_map(Scs, V, Tf, Vf, St0) ->
+    MapSrc = ssa_arg(V, St0),
+    {Is,St1} =
+        match_fmf(fun(#k_val_clause{val=#k_map{op=exact,es=Es},
+                                    body=B}, Fail, St1) ->
+                          select_map_val(V, Es, B, Fail, St1)
+                  end, Vf, St0, Scs),
+    {TestIs,St} = make_cond_branch({bif,is_map}, [MapSrc], Tf, St1),
+    {TestIs++Is,St}.
+
+select_map_val(V, Es, B, Fail, St0) ->
+    {Eis,St1} = select_extract_map(Es, V, Fail, St0),
+    {Bis,St2} = match_cg(B, Fail, St1),
+    {Eis++Bis,St2}.
+
+select_extract_map([P|Ps], Src, Fail, St0) ->
+    MapSrc = ssa_arg(Src, St0),
+    #k_map_pair{key=Key0,val=#k_var{name=Dst0}} = P,
+    Key = ssa_arg(Key0, St0),
+    {Dst,St1} = new_ssa_var(Dst0, St0),
+    Set = #b_set{op=get_map_element,dst=Dst,args=[MapSrc,Key]},
+    {TestIs,St2} = make_cond_branch(succeeded, [Dst], Fail, St1),
+    {Is,St} = select_extract_map(Ps, Src, Fail, St2),
+    {[Set|TestIs]++Is,St};
+select_extract_map([], _, _, St) ->
+    {[],St}.
+
+select_extract_cons(Src0, [#k_var{name=Hd},#k_var{name=Tl}], St0) ->
+    Src = ssa_arg(Src0, St0),
+    {HdDst,St1} = new_ssa_var(Hd, St0),
+    {TlDst,St2} = new_ssa_var(Tl, St1),
+    GetHd = #b_set{op=get_hd,dst=HdDst,args=[Src]},
+    GetTl = #b_set{op=get_tl,dst=TlDst,args=[Src]},
+    {[GetHd,GetTl],St2}.
+
+guard_clause_cg(#k_guard_clause{guard=G,body=B}, Fail, St0) ->
+    {Gis,St1} = guard_cg(G, Fail, St0),
+    {Bis,St} = match_cg(B, Fail, St1),
+    {Gis ++ Bis,St}.
+
+%% guard_cg(Guard, Fail, State) -> {[Ainstr],State}.
+%%  A guard is a boolean expression of tests.  Tests return true or
+%%  false.  A fault in a test causes the test to return false.  Tests
+%%  never return the boolean, instead we generate jump code to go to
+%%  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,inner=Inner}, Fail, St) ->
+    protected_cg(Ts, Rs, Inner, Fail, St);
+guard_cg(#k_test{op=Test0,args=As,inverted=Inverted}, Fail, St0) ->
+    #k_remote{mod=#k_atom{val=erlang},name=#k_atom{val=Test}} = Test0,
+    test_cg(Test, Inverted, As, Fail, St0);
+guard_cg(#k_seq{arg=Arg,body=Body}, Fail, St0) ->
+    {ArgIs,St1} = guard_cg(Arg, Fail, St0),
+    {BodyIs,St} = guard_cg(Body, Fail, St1),
+    {ArgIs++BodyIs,St};
+guard_cg(G, _Fail, St) ->
+    cg(G, St).
+
+test_cg('=/=', Inverted, As, Fail, St) ->
+    test_cg('=:=', not Inverted, As, Fail, St);
+test_cg('/=', Inverted, As, Fail, St) ->
+    test_cg('==', not Inverted, As, Fail, St);
+test_cg(Test, Inverted, As0, Fail, St0) ->
+    As = ssa_args(As0, St0),
+    case {Test,ssa_args(As0, St0)} of
+        {is_record,[Tuple,#b_literal{val=Atom}=Tag,#b_literal{val=Int}=Arity]}
+          when is_atom(Atom), is_integer(Int) ->
+            test_is_record_cg(Inverted, Fail, Tuple, Tag, Arity, St0);
+        {_,As} ->
+            {Bool,St1} = new_ssa_var('@ssa_bool', St0),
+            {Succ,St} = new_label(St1),
+            Bif = #b_set{op={bif,Test},dst=Bool,args=As},
+            Br = case Inverted of
+                     false -> #b_br{bool=Bool,succ=Succ,fail=Fail};
+                     true -> #b_br{bool=Bool,succ=Fail,fail=Succ}
+                 end,
+            {[Bif,Br,{label,Succ}],St}
+    end.
+
+test_is_record_cg(false, Fail, Tuple, TagVal, ArityVal, St0) ->
+    {Arity,St1} = new_ssa_var('@ssa_arity', St0),
+    {Tag,St2} = new_ssa_var('@ssa_tag', St1),
+    {Is0,St3} = make_cond_branch({bif,is_tuple}, [Tuple], Fail, St2),
+    GetArity = #b_set{op={bif,tuple_size},dst=Arity,args=[Tuple]},
+    {Is1,St4} = make_cond_branch({bif,'=:='}, [Arity,ArityVal], Fail, St3),
+    GetTag = #b_set{op=get_tuple_element,dst=Tag,
+                    args=[Tuple,#b_literal{val=0}]},
+    {Is2,St} = make_cond_branch({bif,'=:='}, [Tag,TagVal], Fail, St4),
+    Is = Is0 ++ [GetArity] ++ Is1 ++ [GetTag] ++ Is2,
+    {Is,St};
+test_is_record_cg(true, Fail, Tuple, TagVal, ArityVal, St0) ->
+    {Succ,St1} = new_label(St0),
+    {Arity,St2} = new_ssa_var('@ssa_arity', St1),
+    {Tag,St3} = new_ssa_var('@ssa_tag', St2),
+    {Is0,St4} = make_cond_branch({bif,is_tuple}, [Tuple], Succ, St3),
+    GetArity = #b_set{op={bif,tuple_size},dst=Arity,args=[Tuple]},
+    {Is1,St5} = make_cond_branch({bif,'=:='}, [Arity,ArityVal], Succ, St4),
+    GetTag = #b_set{op=get_tuple_element,dst=Tag,
+                    args=[Tuple,#b_literal{val=0}]},
+    {Is2,St} = make_cond_branch({bif,'=:='}, [Tag,TagVal], Succ, St5),
+    Is3 = [make_uncond_branch(Fail),{label,Succ}],
+    Is = Is0 ++ [GetArity] ++ Is1 ++ [GetTag] ++ Is2 ++ Is3,
+    {Is,St}.
+
+%% protected_cg([Kexpr], [Ret], Fail, St) -> {[Ainstr],St}.
+%%  Do a protected.  Protecteds without return values are just done
+%%  for effect, the return value is not checked, success passes on to
+%%  the next instruction and failure jumps to Fail.  If there are
+%%  return values then these must be set to 'false' on failure,
+%%  control always passes to the next instruction.
+
+protected_cg(Ts, [], _, Fail, St0) ->
+    %% Protect these calls, revert when done.
+    {Tis,St1} = guard_cg(Ts, Fail, St0#cg{bfail=Fail}),
+    {Tis,St1#cg{bfail=St0#cg.bfail}};
+protected_cg(Ts, Rs, Inner0, _Fail, St0) ->
+    {Pfail,St1} = new_label(St0),
+    {Br,St2} = new_label(St1),
+    Prot = duplicate(length(Rs), #b_literal{val=false}),
+    {Tis,St3} = guard_cg(Ts, Pfail, St2#cg{break=Pfail,bfail=Pfail}),
+    Inner = ssa_args(Inner0, St3),
+    {BreakVars,St} = new_ssa_vars(Rs, St3),
+    Is = Tis ++ [#cg_break{args=Inner,phi=Br},
+                 {label,Pfail},#cg_break{args=Prot,phi=Br},
+                 {label,Br},#cg_phi{vars=BreakVars}],
+    {Is,St#cg{break=St0#cg.break,bfail=St0#cg.bfail}}.
+
+%% match_fmf(Fun, LastFail, State, [Clause]) -> {Is,State}.
+%%  This is a special flatmapfoldl for match code gen where we
+%%  generate a "failure" label for each clause. The last clause uses
+%%  an externally generated failure label, LastFail.  N.B. We do not
+%%  know or care how the failure labels are used.
+
+match_fmf(F, LastFail, St, [H]) ->
+    F(H, LastFail, St);
+match_fmf(F, LastFail, St0, [H|T]) ->
+    {Fail,St1} = new_label(St0),
+    {R,St2} = F(H, Fail, St1),
+    {Rs,St3} = match_fmf(F, LastFail, St2, T),
+    {R ++ [{label,Fail}] ++ Rs,St3}.
+
+%% fail_label(State) -> {Where,FailureLabel}.
+%%       Where = guard | no_catch | in_catch
+%%  Return an indication of which part of a function code is
+%%  being generated for and the appropriate failure label to
+%%  use.
+%%
+%%  Where has the following meaning:
+%%
+%%     guard     - Inside a guard.
+%%     no_catch  - In a function body, not in the scope of
+%%                 a try/catch or catch.
+%%     in_catch  - In the scope of a try/catch or catch.
+
+fail_label(#cg{catch_label=Catch,bfail=Fail,ultimate_failure=Ult}) ->
+    if
+        Fail =/= Ult ->
+            {guard,Fail};
+        Catch =:= none ->
+            {no_catch,Fail};
+        is_integer(Catch) ->
+            {in_catch,Catch}
+    end.
+
+%% bif_fail_label(State) -> FailureLabel.
+%%  Return the appropriate failure label for a guard BIF call or
+%%  primop that fails.
+
+bif_fail_label(St) ->
+    {_,Fail} = fail_label(St),
+    Fail.
+
+%% call_cg(Func, [Arg], [Ret], Le, State) ->
+%%      {[Ainstr],State}.
+%% enter_cg(Func, [Arg], Le, St) -> {[Ainstr],St}.
+%%  Generate code for call and enter.
+
+call_cg(Func, As, [], Le, St) ->
+    call_cg(Func, As, [#k_var{name='@ssa_ignored'}], Le, St);
+call_cg(Func0, As, [#k_var{name=R}|MoreRs]=Rs, Le, St0) ->
+    case fail_label(St0) of
+        {guard,Fail} ->
+            %% Inside a guard. The only allowed function call is to
+            %% erlang:error/1,2. We will generate a branch to the
+            %% failure branch.
+            #k_remote{mod=#k_atom{val=erlang},
+                      name=#k_atom{val=error}} = Func0, %Assertion.
+            [#k_var{name=DestVar}] = Rs,
+            St = set_ssa_var(DestVar, #b_literal{val=unused}, St0),
+            {[make_uncond_branch(Fail),#cg_unreachable{}],St};
+        {Catch,Fail} ->
+            %% Ordinary function call in a function body.
+            Args = ssa_args(As, St0),
+            {Ret,St1} = new_ssa_var(R, St0),
+            Func = call_target(Func0, Args, St0),
+            Call = #b_set{anno=line_anno(Le),op=call,dst=Ret,args=[Func|Args]},
+
+            %% If this is a call to erlang:error(), MoreRs could be a
+            %% nonempty list of variables that each need a value.
+            St2 = foldl(fun(#k_var{name=Dummy}, S) ->
+                                set_ssa_var(Dummy, #b_literal{val=unused}, S)
+                        end, St1, MoreRs),
+            case Catch of
+                no_catch ->
+                    {[Call],St2};
+                in_catch ->
+                    {TestIs,St} = make_cond_branch(succeeded, [Ret], Fail, St2),
+                    {[Call|TestIs],St}
+            end
+    end.
+
+enter_cg(Func0, As0, Le, St0) ->
+    Anno = line_anno(Le),
+    Func = call_target(Func0, As0, St0),
+    As = ssa_args(As0, St0),
+    {Ret,St} = new_ssa_var('@ssa_ret', St0),
+    Call = #b_set{anno=Anno,op=call,dst=Ret,args=[Func|As]},
+    {[Call,#b_ret{arg=Ret}],St}.
+
+call_target(Func, As, St) ->
+    Arity = length(As),
+    case Func of
+        #k_remote{mod=Mod0,name=Name0} ->
+            Mod = ssa_arg(Mod0, St),
+            Name = ssa_arg(Name0, St),
+            #b_remote{mod=Mod,name=Name,arity=Arity};
+        #k_local{name=Name} when is_atom(Name) ->
+            #b_local{name=#b_literal{val=Name},arity=Arity};
+        #k_var{}=Var ->
+            ssa_arg(Var, St)
+    end.
+
+%% bif_cg(#k_bif{}, Le,State) -> {[Ainstr],State}.
+%%  Generate code for a guard BIF or primop.
+
+bif_cg(#k_bif{op=#k_internal{name=Name},args=As,ret=Rs}, Le, St) ->
+    internal_cg(Name, As, Rs, Le, St);
+bif_cg(#k_bif{op=#k_remote{mod=#k_atom{val=erlang},name=#k_atom{val=Name}},
+              args=As,ret=Rs}, Le, St) ->
+    bif_cg(Name, As, Rs, Le, St).
+
+%% internal_cg(Bif, [Arg], [Ret], Le, State) ->
+%%      {[Ainstr],State}.
+
+internal_cg(make_fun, [Name0,Arity0|As], Rs, _Le, St0) ->
+    #k_atom{val=Name} = Name0,
+    #k_int{val=Arity} = Arity0,
+    [#k_var{name=Dst0}] = Rs,
+    {Dst,St} = new_ssa_var(Dst0, St0),
+    Args = ssa_args(As, St),
+    Local = #b_local{name=#b_literal{val=Name},arity=Arity},
+    MakeFun = #b_set{op=make_fun,dst=Dst,args=[Local|Args]},
+    {[MakeFun],St};
+internal_cg(bs_init_writable=I, As, [#k_var{name=Dst0}], _Le, St0) ->
+    %% This behaves like a function call.
+    {Dst,St} = new_ssa_var(Dst0, St0),
+    Args = ssa_args(As, St),
+    Set = #b_set{op=I,dst=Dst,args=Args},
+    {[Set],St};
+internal_cg(build_stacktrace=I, As, [#k_var{name=Dst0}], _Le, St0) ->
+    {Dst,St} = new_ssa_var(Dst0, St0),
+    Args = ssa_args(As, St),
+    Set = #b_set{op=I,dst=Dst,args=Args},
+    {[Set],St};
+internal_cg(raise, As, [#k_var{name=Dst0}], _Le, St0) ->
+    Args = ssa_args(As, St0),
+    {Dst,St} = new_ssa_var(Dst0, St0),
+    Resume = #b_set{op=resume,dst=Dst,args=Args},
+    case St of
+        #cg{catch_label=none} ->
+            {[Resume],St};
+        #cg{catch_label=Catch} when is_integer(Catch) ->
+            Is = [Resume,make_uncond_branch(Catch),#cg_unreachable{}],
+            {Is,St}
+    end;
+internal_cg(raw_raise=I, As, [#k_var{name=Dst0}], _Le, St0) ->
+    %% This behaves like a function call.
+    {Dst,St} = new_ssa_var(Dst0, St0),
+    Args = ssa_args(As, St),
+    Set = #b_set{op=I,dst=Dst,args=Args},
+    {[Set],St}.
+
+bif_cg(Bif, As0, [#k_var{name=Dst0}], Le, St0) ->
+    {Dst,St1} = new_ssa_var(Dst0, St0),
+    case {Bif,ssa_args(As0, St0)} of
+        {is_record,[Tuple,#b_literal{val=Atom}=Tag,
+                    #b_literal{val=Int}=Arity]}
+          when is_atom(Atom), is_integer(Int) ->
+            bif_is_record_cg(Dst, Tuple, Tag, Arity, St1);
+        {_,As} ->
+            I = #b_set{anno=line_anno(Le),op={bif,Bif},dst=Dst,args=As},
+            case erl_bifs:is_safe(erlang, Bif, length(As)) of
+                false ->
+                    Fail = bif_fail_label(St1),
+                    {Is,St} = make_cond_branch(succeeded, [Dst], Fail, St1),
+                    {[I|Is],St};
+                true->
+                    {[I],St1}
+            end
+        end.
+
+bif_is_record_cg(Dst, Tuple, TagVal, ArityVal, St0) ->
+    {Arity,St1} = new_ssa_var('@ssa_arity', St0),
+    {Tag,St2} = new_ssa_var('@ssa_tag', St1),
+    {Phi,St3} = new_label(St2),
+    {False,St4} = new_label(St3),
+    {Is0,St5} = make_cond_branch({bif,is_tuple}, [Tuple], False, St4),
+    GetArity = #b_set{op={bif,tuple_size},dst=Arity,args=[Tuple]},
+    {Is1,St6} = make_cond_branch({bif,'=:='}, [Arity,ArityVal], False, St5),
+    GetTag = #b_set{op=get_tuple_element,dst=Tag,
+                    args=[Tuple,#b_literal{val=0}]},
+    {Is2,St} = make_cond_branch({bif,'=:='}, [Tag,TagVal], False, St6),
+    Is3 = [#cg_break{args=[#b_literal{val=true}],phi=Phi},
+           {label,False},
+           #cg_break{args=[#b_literal{val=false}],phi=Phi},
+           {label,Phi},
+           #cg_phi{vars=[Dst]}],
+    Is = Is0 ++ [GetArity] ++ Is1 ++ [GetTag] ++ Is2 ++ Is3,
+    {Is,St}.
+
+%% recv_loop_cg(TimeOut, ReceiveVar, ReceiveMatch, TimeOutExprs,
+%%              [Ret], Le, St) -> {[Ainstr],St}.
+
+recv_loop_cg(Te, Rvar, Rm, Tes, Rs, Le, St0) ->
+    %% Get labels.
+    {Rl,St1} = new_label(St0),
+    {Tl,St2} = new_label(St1),
+    {Bl,St3} = new_label(St2),
+    St4 = St3#cg{break=Bl,recv=Rl},
+    {Ris,St5} = cg_recv_mesg(Rvar, Rm, Tl, Le, St4),
+    {Wis,St6} = cg_recv_wait(Te, Tes, St5),
+    {BreakVars,St} = new_ssa_vars(Rs, St6),
+    {Ris ++ [{label,Tl}] ++ Wis ++
+         [{label,Bl},#cg_phi{vars=BreakVars}],
+     St#cg{break=St0#cg.break,recv=St0#cg.recv}}.
+
+%% cg_recv_mesg( ) -> {[Ainstr],St}.
+
+cg_recv_mesg(#k_var{name=R}, Rm, Tl, Le, St0) ->
+    {Dst,St1} = new_ssa_var(R, St0),
+    {Mis,St2} = match_cg(Rm, none, St1),
+    RecvLbl = St1#cg.recv,
+    {TestIs,St} = make_cond_branch(succeeded, [Dst], Tl, St2),
+    Is = [#b_br{anno=line_anno(Le),bool=#b_literal{val=true},
+                succ=RecvLbl,fail=RecvLbl},
+          {label,RecvLbl},
+          #b_set{op=peek_message,dst=Dst}|TestIs],
+    {Is++Mis,St}.
+
+%% cg_recv_wait(Te, Tes, St) -> {[Ainstr],St}.
+
+cg_recv_wait(#k_int{val=0}, Es, St0) ->
+    {Tis,St} = cg(Es, St0),
+    {[#b_set{op=timeout}|Tis],St};
+cg_recv_wait(Te, Es, St0) ->
+    {Tis,St1} = cg(Es, St0),
+    Args = [ssa_arg(Te, St1)],
+    {WaitDst,St2} = new_ssa_var('@ssa_wait', St1),
+    {WaitIs,St} = make_cond_branch(succeeded, [WaitDst], St1#cg.recv, St2),
+    %% Infinite timeout will be optimized later.
+    Is = [#b_set{op=wait_timeout,dst=WaitDst,args=Args}] ++ WaitIs ++
+        [#b_set{op=timeout}] ++ Tis,
+    {Is,St}.
+
+%% try_cg(TryBlock, [BodyVar], TryBody, [ExcpVar], TryHandler, [Ret], St) ->
+%%         {[Ainstr],St}.
+
+try_cg(Ta, Vs, Tb, Evs, Th, Rs, St0) ->
+    {B,St1} = new_label(St0),			%Body label
+    {H,St2} = new_label(St1),			%Handler label
+    {E,St3} = new_label(St2),			%End label
+    {Next,St4} = new_label(St3),
+    {TryTag,St5} = new_ssa_var('@ssa_catch_tag', St4),
+    {SsaVs,St6} = new_ssa_vars(Vs, St5),
+    {SsaEvs,St7} = new_ssa_vars(Evs, St6),
+    {Ais,St8} = cg(Ta, St7#cg{break=B,catch_label=H}),
+    St9 = St8#cg{break=E,catch_label=St7#cg.catch_label},
+    {Bis,St10} = cg(Tb, St9),
+    {His,St11} = cg(Th, St10),
+    {BreakVars,St12} = new_ssa_vars(Rs, St11),
+    {CatchedAgg,St} = new_ssa_var('@ssa_agg', St12),
+    ExtractVs = extract_vars(SsaEvs, CatchedAgg, 0),
+    KillTryTag = #b_set{op=kill_try_tag,args=[TryTag]},
+    Args = [#b_literal{val='try'},TryTag],
+    Handler = [{label,H},
+               #b_set{op=landingpad,dst=CatchedAgg,args=Args}] ++
+        ExtractVs ++ [KillTryTag],
+    {[#b_set{op=new_try_tag,dst=TryTag,args=[#b_literal{val='try'}]},
+      #b_br{bool=TryTag,succ=Next,fail=H},
+      {label,Next}] ++ Ais ++
+         [{label,B},#cg_phi{vars=SsaVs},KillTryTag] ++ Bis ++
+         Handler ++ His ++
+         [{label,E},#cg_phi{vars=BreakVars}],
+     St#cg{break=St0#cg.break}}.
+
+try_enter_cg(Ta, Vs, Tb, Evs, Th, St0) ->
+    {B,St1} = new_label(St0),			%Body label
+    {H,St2} = new_label(St1),			%Handler label
+    {Next,St3} = new_label(St2),
+    {TryTag,St4} = new_ssa_var('@ssa_catch_tag', St3),
+    {SsaVs,St5} = new_ssa_vars(Vs, St4),
+    {SsaEvs,St6} = new_ssa_vars(Evs, St5),
+    {Ais,St7} = cg(Ta, St6#cg{break=B,catch_label=H}),
+    St8 = St7#cg{catch_label=St6#cg.catch_label},
+    {Bis,St9} = cg(Tb, St8),
+    {His,St10} = cg(Th, St9),
+    {CatchedAgg,St} = new_ssa_var('@ssa_agg', St10),
+    ExtractVs = extract_vars(SsaEvs, CatchedAgg, 0),
+    KillTryTag = #b_set{op=kill_try_tag,args=[TryTag]},
+    Args = [#b_literal{val='try'},TryTag],
+    Handler = [{label,H},
+               #b_set{op=landingpad,dst=CatchedAgg,args=Args}] ++
+        ExtractVs ++ [KillTryTag],
+    {[#b_set{op=new_try_tag,dst=TryTag,args=[#b_literal{val='try'}]},
+      #b_br{bool=TryTag,succ=Next,fail=H},
+      {label,Next}] ++  Ais ++
+         [{label,B},#cg_phi{vars=SsaVs},KillTryTag] ++ Bis ++
+         Handler ++ His,
+     St#cg{break=St0#cg.break}}.
+
+extract_vars([V|Vs], Agg, N) ->
+    I = #b_set{op=extract,dst=V,args=[Agg,#b_literal{val=N}]},
+    [I|extract_vars(Vs, Agg, N+1)];
+extract_vars([], _, _) -> [].
+
+%% do_catch_cg(CatchBlock, Ret, St) -> {[Ainstr],St}.
+
+do_catch_cg(Block, #k_var{name=R}, St0) ->
+    {B,St1} = new_label(St0),
+    {Next,St2} = new_label(St1),
+    {H,St3} = new_label(St2),
+    {CatchReg,St4} = new_ssa_var('@ssa_catch_tag', St3),
+    {Dst,St5} = new_ssa_var(R, St4),
+    {Succ,St6} = new_label(St5),
+    {Cis,St7} = cg(Block, St6#cg{break=Succ,catch_label=H}),
+    {CatchedVal,St8} = new_ssa_var('@catched_val', St7),
+    {SuccVal,St9} = new_ssa_var('@success_val', St8),
+    {CatchedAgg,St10} = new_ssa_var('@ssa_agg', St9),
+    {CatchEndVal,St} = new_ssa_var('@catch_end_val', St10),
+    Args = [#b_literal{val='catch'},CatchReg],
+    {[#b_set{op=new_try_tag,dst=CatchReg,args=[#b_literal{val='catch'}]},
+      #b_br{bool=CatchReg,succ=Next,fail=H},
+      {label,Next}] ++ Cis ++
+         [{label,H},
+          #b_set{op=landingpad,dst=CatchedAgg,args=Args},
+          #b_set{op=extract,dst=CatchedVal,
+                 args=[CatchedAgg,#b_literal{val=0}]},
+          #cg_break{args=[CatchedVal],phi=B},
+          {label,Succ},
+          #cg_phi{vars=[SuccVal]},
+          #cg_break{args=[SuccVal],phi=B},
+          {label,B},#cg_phi{vars=[CatchEndVal]},
+          #b_set{op=catch_end,dst=Dst,args=[CatchReg,CatchEndVal]}],
+     St#cg{break=St1#cg.break,catch_label=St1#cg.catch_label}}.
+
+%% put_cg([Var], Constr, Le, Vdb, Bef, St) -> {[Ainstr],St}.
+%%  Generate code for constructing terms.
+
+put_cg([#k_var{name=R}], #k_cons{hd=Hd,tl=Tl}, _Le, St0) ->
+    Args = ssa_args([Hd,Tl], St0),
+    {Dst,St} = new_ssa_var(R, St0),
+    PutList = #b_set{op=put_list,dst=Dst,args=Args},
+    {[PutList],St};
+put_cg([#k_var{name=R}], #k_tuple{es=Es}, _Le, St0) ->
+    {Ret,St} = new_ssa_var(R, St0),
+    Args = ssa_args(Es, St),
+    PutTuple = #b_set{op=put_tuple,dst=Ret,args=Args},
+    {[PutTuple],St};
+put_cg([#k_var{name=R}], #k_binary{segs=Segs}, Le, St0) ->
+    Fail = bif_fail_label(St0),
+    {Dst,St1} = new_ssa_var(R, St0),
+    cg_binary(Dst, Segs, Fail, Le, St1);
+put_cg([#k_var{name=R}], #k_map{op=Op,var=Map,
+                                es=[#k_map_pair{key=#k_var{}=K,val=V}]},
+       Le, St0) ->
+    %% Map: single variable key.
+    SrcMap = ssa_arg(Map, St0),
+    LineAnno = line_anno(Le),
+    List = [ssa_arg(K, St0),ssa_arg(V, St0)],
+    {Dst,St1} = new_ssa_var(R, St0),
+    {Is,St} = put_cg_map(LineAnno, Op, SrcMap, Dst, List, St1),
+    {Is,St};
+put_cg([#k_var{name=R}], #k_map{op=Op,var=Map,es=Es}, Le, St0) ->
+    %% Map: one or more literal keys.
+    [] = [Var || #k_map_pair{key=#k_var{}=Var} <- Es], %Assertion
+    SrcMap = ssa_arg(Map, St0),
+    LineAnno = line_anno(Le),
+    List = flatmap(fun(#k_map_pair{key=K,val=V}) ->
+                           [ssa_arg(K, St0),ssa_arg(V, St0)]
+                   end, Es),
+    {Dst,St1} = new_ssa_var(R, St0),
+    {Is,St} = put_cg_map(LineAnno, Op, SrcMap, Dst, List, St1),
+    {Is,St};
+put_cg([#k_var{name=R}], Con0, _Le, St0) ->
+    %% Create an alias for a variable or literal.
+    Con = ssa_arg(Con0, St0),
+    St = set_ssa_var(R, Con, St0),
+    {[],St}.
+
+put_cg_map(LineAnno, Op, SrcMap, Dst, List, St0) ->
+    Fail = bif_fail_label(St0),
+    Args = [#b_literal{val=Op},SrcMap|List],
+    PutMap = #b_set{anno=LineAnno,op=put_map,dst=Dst,args=Args},
+    if
+        Op =:= assoc ->
+            {[PutMap],St0};
+        true ->
+            {Is,St} = make_cond_branch(succeeded, [Dst], Fail, St0),
+            {[PutMap|Is],St}
+    end.
+
+%%%
+%%% Code generation for constructing binaries.
+%%%
+
+cg_binary(Dst, Segs0, Fail, Le, St0) ->
+    {PutCode0,SzCalc0,St1} = cg_bin_put(Segs0, Fail, St0),
+    LineAnno = line_anno(Le),
+    Anno = Le#k.a,
+    case PutCode0 of
+        [#b_set{op=bs_put,dst=Bool,args=[_,_,Src,#b_literal{val=all}|_]},
+         #b_br{bool=Bool},
+         {label,_}|_] ->
+            #k_bin_seg{unit=Unit0,next=Segs} = Segs0,
+            Unit = #b_literal{val=Unit0},
+            {PutCode,SzCalc1,St2} = cg_bin_put(Segs, Fail, St1),
+            {_,SzVar,SzCode0,St3} = cg_size_calc(1, SzCalc1, Fail, St2),
+            SzCode = cg_bin_anno(SzCode0, LineAnno),
+            Args = case member(single_use, Anno) of
+                       true ->
+                           [#b_literal{val=private_append},Src,SzVar,Unit];
+                       false ->
+                           [#b_literal{val=append},Src,SzVar,Unit]
+                   end,
+            BsInit = #b_set{anno=LineAnno,op=bs_init,dst=Dst,args=Args},
+            {TestIs,St} = make_cond_branch(succeeded, [Dst], Fail, St3),
+            {SzCode ++ [BsInit] ++ TestIs ++ PutCode,St};
+        [#b_set{op=bs_put}|_] ->
+            {Unit,SzVar,SzCode0,St2} = cg_size_calc(8, SzCalc0, Fail, St1),
+            SzCode = cg_bin_anno(SzCode0, LineAnno),
+            Args = [#b_literal{val=new},SzVar,Unit],
+            BsInit = #b_set{anno=LineAnno,op=bs_init,dst=Dst,args=Args},
+            {TestIs,St} = make_cond_branch(succeeded, [Dst], Fail, St2),
+            {SzCode ++ [BsInit] ++ TestIs ++ PutCode0,St}
+    end.
+
+cg_bin_anno([Set|Sets], Anno) ->
+    [Set#b_set{anno=Anno}|Sets];
+cg_bin_anno([], _) -> [].
+
+%% cg_size_calc(PreferredUnit, SzCalc, Fail, St0) ->
+%%         {ActualUnit,SizeVariable,SizeCode,St}.
+%%  Generate size calculation code.
+
+cg_size_calc(Unit, error, _Fail, St) ->
+    {#b_literal{val=Unit},#b_literal{val=badarg},[],St};
+cg_size_calc(8, [{1,_}|_]=SzCalc, Fail, St) ->
+    cg_size_calc(1, SzCalc, Fail, St);
+cg_size_calc(8, SzCalc, Fail, St0) ->
+    {Var,Pre,St} = cg_size_calc_1(SzCalc, Fail, St0),
+    {#b_literal{val=8},Var,Pre,St};
+cg_size_calc(1, SzCalc0, Fail, St0) ->
+    SzCalc = map(fun({8,#b_literal{val=Size}}) ->
+                         {1,#b_literal{val=8*Size}};
+                    ({8,{{bif,byte_size},Src}}) ->
+                         {1,{{bif,bit_size},Src}};
+                    ({8,{_,_}=UtfCalc}) ->
+                         {1,{'*',#b_literal{val=8},UtfCalc}};
+                    ({_,_}=Pair) ->
+                         Pair
+                 end, SzCalc0),
+    {Var,Pre,St} = cg_size_calc_1(SzCalc, Fail, St0),
+    {#b_literal{val=1},Var,Pre,St}.
+
+cg_size_calc_1(SzCalc, Fail, St0) ->
+    cg_size_calc_2(SzCalc, #b_literal{val=0}, Fail, St0).
+
+cg_size_calc_2([{_,{'*',Unit,{_,_}=Bif}}|T], Sum0, Fail, St0) ->
+    {Sum1,Pre0,St1} = cg_size_calc_2(T, Sum0, Fail, St0),
+    {BifDst,Pre1,St2} = cg_size_bif(Bif, Fail, St1),
+    {Sum,Pre2,St} = cg_size_add(Sum1, BifDst, Unit, Fail, St2),
+    {Sum,Pre0++Pre1++Pre2,St};
+cg_size_calc_2([{_,#b_literal{}=Sz}|T], Sum0, Fail, St0) ->
+    {Sum1,Pre0,St1} = cg_size_calc_2(T, Sum0, Fail, St0),
+    {Sum,Pre,St} = cg_size_add(Sum1, Sz, #b_literal{val=1}, Fail, St1),
+    {Sum,Pre0++Pre,St};
+cg_size_calc_2([{_,#b_var{}=Sz}|T], Sum0, Fail, St0) ->
+    {Sum1,Pre0,St1} = cg_size_calc_2(T, Sum0, Fail, St0),
+    {Sum,Pre,St} = cg_size_add(Sum1, Sz, #b_literal{val=1}, Fail, St1),
+    {Sum,Pre0++Pre,St};
+cg_size_calc_2([{_,{_,_}=Bif}|T], Sum0, Fail, St0) ->
+    {Sum1,Pre0,St1} = cg_size_calc_2(T, Sum0, Fail, St0),
+    {BifDst,Pre1,St2} = cg_size_bif(Bif, Fail, St1),
+    {Sum,Pre2,St} = cg_size_add(Sum1, BifDst, #b_literal{val=1}, Fail, St2),
+    {Sum,Pre0++Pre1++Pre2,St};
+cg_size_calc_2([], Sum, _Fail, St) ->
+    {Sum,[],St}.
+
+cg_size_bif(#b_var{}=Var, _Fail, St) ->
+    {Var,[],St};
+cg_size_bif({Name,Src}, Fail, St0) ->
+    {Dst,St1} = new_ssa_var('@ssa_bif', St0),
+    Bif = #b_set{op=Name,dst=Dst,args=[Src]},
+    {TestIs,St} = make_cond_branch(succeeded, [Dst], Fail, St1),
+    {Dst,[Bif|TestIs],St}.
+
+cg_size_add(#b_literal{val=0}, Val, #b_literal{val=1}, _Fail, St) ->
+    {Val,[],St};
+cg_size_add(A, B, Unit, Fail, St0) ->
+    {Dst,St1} = new_ssa_var('@ssa_sum', St0),
+    {TestIs,St} = make_cond_branch(succeeded, [Dst], Fail, St1),
+    BsAdd = #b_set{op=bs_add,dst=Dst,args=[A,B,Unit]},
+    {Dst,[BsAdd|TestIs],St}.
+
+cg_bin_put(Seg, Fail, St) ->
+    cg_bin_put_1(Seg, Fail, [], [], St).
+
+cg_bin_put_1(#k_bin_seg{size=Size0,unit=U,type=T,flags=Fs,seg=Src0,next=Next},
+           Fail, Acc, SzCalcAcc, St0) ->
+    [Src,Size] = ssa_args([Src0,Size0], St0),
+    NeedSize = bs_need_size(T),
+    TypeArg = #b_literal{val=T},
+    Flags = #b_literal{val=Fs},
+    Unit = #b_literal{val=U},
+    Args = case NeedSize of
+               true -> [TypeArg,Flags,Src,Size,Unit];
+               false -> [TypeArg,Flags,Src]
+           end,
+    {Is,St} = make_cond_branch(bs_put, Args, Fail, St0),
+    SzCalc = bin_size_calc(T, Src, Size, U),
+    cg_bin_put_1(Next, Fail, reverse(Is, Acc), [SzCalc|SzCalcAcc], St);
+cg_bin_put_1(#k_bin_end{}, _, Acc, SzCalcAcc, St) ->
+    SzCalc = fold_size_calc(SzCalcAcc, 0, []),
+    {reverse(Acc),SzCalc,St}.
+
+bs_need_size(utf8) -> false;
+bs_need_size(utf16) -> false;
+bs_need_size(utf32) -> false;
+bs_need_size(_) -> true.
+
+bin_size_calc(utf8, Src, _Size, _Unit) ->
+    {8,{bs_utf8_size,Src}};
+bin_size_calc(utf16, Src, _Size, _Unit) ->
+    {8,{bs_utf16_size,Src}};
+bin_size_calc(utf32, _Src, _Size, _Unit) ->
+    {8,#b_literal{val=4}};
+bin_size_calc(binary, Src, #b_literal{val=all}, Unit) ->
+    case Unit rem 8 of
+        0 -> {8,{{bif,byte_size},Src}};
+        _ -> {1,{{bif,bit_size},Src}}
+    end;
+bin_size_calc(_Type, _Src, Size, Unit) ->
+    {Unit,Size}.
+
+fold_size_calc([{Unit,#b_literal{val=Size}}|T], Bits, Acc) ->
+    if
+        is_integer(Size) ->
+            fold_size_calc(T, Bits + Unit*Size, Acc);
+        true ->
+            error
+    end;
+fold_size_calc([{U,#b_var{}}=H|T], Bits, Acc) when U =:= 1; U =:= 8 ->
+    fold_size_calc(T, Bits, [H|Acc]);
+fold_size_calc([{U,#b_var{}=Var}|T], Bits, Acc) ->
+    fold_size_calc(T, Bits, [{1,{'*',#b_literal{val=U},Var}}|Acc]);
+fold_size_calc([{_,_}=H|T], Bits, Acc) ->
+    fold_size_calc(T, Bits, [H|Acc]);
+fold_size_calc([], Bits, Acc) ->
+    Bytes = Bits div 8,
+    RemBits = Bits rem 8,
+    Sizes = sort([{1,#b_literal{val=RemBits}},{8,#b_literal{val=Bytes}}|Acc]),
+    [Pair || {_,Sz}=Pair <- Sizes, Sz =/= #b_literal{val=0}].
+
+%%%
+%%% Utilities for creating the SSA types.
+%%%
+
+ssa_args(As, St) ->
+    [ssa_arg(A, St) || A <- As].
+
+ssa_arg(#k_var{name=V}, #cg{vars=Vars}) -> maps:get(V, Vars);
+ssa_arg(#k_literal{val=V}, _) -> #b_literal{val=V};
+ssa_arg(#k_atom{val=V}, _) -> #b_literal{val=V};
+ssa_arg(#k_float{val=V}, _) -> #b_literal{val=V};
+ssa_arg(#k_int{val=V}, _) -> #b_literal{val=V};
+ssa_arg(#k_nil{}, _) -> #b_literal{val=[]}.
+
+new_ssa_vars(Vs, St) ->
+    mapfoldl(fun(#k_var{name=V}, S) ->
+                     new_ssa_var(V, S)
+             end, St, Vs).
+
+new_ssa_var(VarBase, #cg{lcount=Uniq,vars=Vars}=St0)
+  when is_atom(VarBase); is_integer(VarBase) ->
+    case Vars of
+        #{VarBase:=_} ->
+            Var = #b_var{name={VarBase,Uniq}},
+            St = St0#cg{lcount=Uniq+1,vars=Vars#{VarBase=>Var}},
+            {Var,St};
+        #{} ->
+            Var = #b_var{name=VarBase},
+            St = St0#cg{vars=Vars#{VarBase=>Var}},
+            {Var,St}
+    end.
+
+set_ssa_var(VarBase, Val, #cg{vars=Vars}=St)
+  when is_atom(VarBase); is_integer(VarBase) ->
+    St#cg{vars=Vars#{VarBase=>Val}}.
+
+%% new_label(St) -> {L,St}.
+
+new_label(#cg{lcount=Next}=St) ->
+    {Next,St#cg{lcount=Next+1}}.
+
+%% line_anno(Le) -> #{} | #{location:={File,Line}}.
+%%  Create a location annotation, containing information about the
+%%  current filename and line number.  The annotation should be
+%%  included in any operation that could cause an exception.
+
+line_anno(#k{a=Anno}) ->
+    line_anno_1(Anno).
+
+line_anno_1([Line,{file,Name}]) when is_integer(Line) ->
+    line_anno_2(Name, Line);
+line_anno_1([_|_]=A) ->
+    {Name,Line} = find_loc(A, no_file, 0),
+    line_anno_2(Name, Line);
+line_anno_1([]) ->
+    #{}.
+
+line_anno_2(no_file, _) ->
+    #{};
+line_anno_2(_, 0) ->
+    %% Missing line number or line number 0.
+    #{};
+line_anno_2(Name, Line) ->
+    #{location=>{Name,Line}}.
+
+find_loc([Line|T], File, _) when is_integer(Line) ->
+    find_loc(T, File, Line);
+find_loc([{file,File}|T], _, Line) ->
+    find_loc(T, File, Line);
+find_loc([_|T], File, Line) ->
+    find_loc(T, File, Line);
+find_loc([], File, Line) -> {File,Line}.
+
+flatmapfoldl(F, Accu0, [Hd|Tail]) ->
+    {R,Accu1} = F(Hd, Accu0),
+    {Rs,Accu2} = flatmapfoldl(F, Accu1, Tail),
+    {R++Rs,Accu2};
+flatmapfoldl(_, Accu, []) -> {[],Accu}.
+
+%%%
+%%% Finalize the code.
+%%%
+
+finalize(Asm0, St0) ->
+    Asm1 = fix_phis(Asm0),
+    {Asm,St} = fix_sets(Asm1, [], St0),
+    {build_map(Asm),St}.
+
+fix_phis(Is) ->
+    fix_phis_1(Is, none, #{}).
+
+fix_phis_1([{label,L},#cg_phi{vars=[]}=Phi|Is0], _Lbl, Map0) ->
+    case maps:is_key(L, Map0) of
+        false ->
+            %% No #cg_break{} references this label. Nothing else can
+            %% reference it, so it can be safely be removed.
+            {Is,Map} = drop_upto_label(Is0, Map0),
+            fix_phis_1(Is, none, Map);
+        true ->
+            %% There is a break referencing this label; probably caused
+            %% by a try/catch whose return value is ignored.
+            [{label,L}|fix_phis_1([Phi|Is0], L, Map0)]
+    end;
+fix_phis_1([{label,L}=I|Is], _Lbl, Map) ->
+    [I|fix_phis_1(Is, L, Map)];
+fix_phis_1([#cg_unreachable{}|Is0], _Lbl, Map0) ->
+    {Is,Map} = drop_upto_label(Is0, Map0),
+    fix_phis_1(Is, none, Map);
+fix_phis_1([#cg_break{args=Args,phi=Target}|Is], Lbl, Map) when is_integer(Lbl) ->
+    Pairs1 = case Map of
+                 #{Target:=Pairs0} -> Pairs0;
+                 #{} -> []
+             end,
+    Pairs = [[{Arg,Lbl} || Arg <- Args]|Pairs1],
+    I = make_uncond_branch(Target),
+    [I|fix_phis_1(Is, none, Map#{Target=>Pairs})];
+fix_phis_1([#cg_phi{vars=Vars}|Is0], Lbl, Map0) ->
+    Pairs = maps:get(Lbl, Map0),
+    Map1 = maps:remove(Lbl, Map0),
+    case gen_phis(Vars, Pairs) of
+        [#b_set{op=phi,args=[]}] ->
+            {Is,Map} = drop_upto_label(Is0, Map1),
+            Ret = #b_ret{arg=#b_literal{val=unreachable}},
+            [Ret|fix_phis_1(Is, none, Map)];
+        Phis ->
+            Phis ++ fix_phis_1(Is0, Lbl, Map1)
+    end;
+fix_phis_1([I|Is], Lbl, Map) ->
+    [I|fix_phis_1(Is, Lbl, Map)];
+fix_phis_1([], _, Map) ->
+    [] = maps:to_list(Map),                     %Assertion.
+    [].
+
+gen_phis([V|Vs], Preds0) ->
+    {Pairs,Preds} = collect_preds(Preds0, [], []),
+    [#b_set{op=phi,dst=V,args=Pairs}|gen_phis(Vs, Preds)];
+gen_phis([], _) -> [].
+
+collect_preds([[First|Rest]|T], ColAcc, RestAcc) ->
+    collect_preds(T, [First|ColAcc], [Rest|RestAcc]);
+collect_preds([], ColAcc, RestAcc) ->
+    {keysort(2, ColAcc),RestAcc}.
+
+fix_sets([#b_set{dst=none}=Set|Is], Acc, St0) ->
+    {Dst,St} = new_ssa_var('@ssa_ignored', St0),
+    I = Set#b_set{dst=Dst},
+    fix_sets(Is, [I|Acc], St);
+fix_sets([I|Is], Acc, St) ->
+    fix_sets(Is, [I|Acc], St);
+fix_sets([], Acc, St) ->
+    {reverse(Acc),St}.
+
+build_map(Is) ->
+    Blocks = build_graph_1(Is, [], []),
+    maps:from_list(Blocks).
+
+build_graph_1([{label,L}|Is], Lbls, []) ->
+    build_graph_1(Is, [L|Lbls], []);
+build_graph_1([{label,L}|Is], Lbls, [_|_]=BlockAcc) ->
+    make_blocks(Lbls, BlockAcc) ++ build_graph_1(Is, [L], []);
+build_graph_1([I|Is], Lbls, BlockAcc) ->
+    build_graph_1(Is, Lbls, [I|BlockAcc]);
+build_graph_1([], Lbls, BlockAcc) ->
+    make_blocks(Lbls, BlockAcc).
+
+make_blocks(Lbls, [Last|Is0]) ->
+    Is = reverse(Is0),
+    Block = #b_blk{is=Is,last=Last},
+    [{L,Block} || L <- Lbls].
+
+drop_upto_label([{label,_}|_]=Is, Map) ->
+    {Is,Map};
+drop_upto_label([#cg_break{phi=Target}|Is], Map) ->
+    Pairs = case Map of
+                #{Target:=Pairs0} -> Pairs0;
+                #{} -> []
+            end,
+    drop_upto_label(Is, Map#{Target=>Pairs});
+drop_upto_label([_|Is], Map) ->
+    drop_upto_label(Is, Map).
+
+k_get_anno(Thing) -> element(2, Thing).
diff --git a/lib/compiler/src/beam_listing.erl b/lib/compiler/src/beam_listing.erl
index 518b958794..6121593b11 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_ssa.hrl").
 -include("beam_disasm.hrl").
 
 -import(lists, [foreach/2]).
@@ -41,6 +42,12 @@ module(File, #k_mdef{}=Kern) ->
     %% This is a kernel module.
     io:put_chars(File, v3_kernel_pp:format(Kern));
     %%io:put_chars(File, io_lib:format("~p~n", [Kern]));
+module(File, #b_module{name=Mod,exports=Exp,attributes=Attr,body=Fs}) ->
+    io:format(File, "module ~p.\n", [Mod]),
+    io:format(File, "exports ~p.\n", [Exp]),
+    io:format(File, "attributes ~p.\n\n", [Attr]),
+    PP = [beam_ssa_pp:format_function(F) || F <- Fs],
+    io:put_chars(File, lists:join($\n, PP));
 module(Stream, {Mod,Exp,Attr,Code,NumLabels}) ->
     %% This is output from v3_codegen.
     io:format(Stream, "{module, ~p}.  %% version = ~w\n",
@@ -59,7 +66,7 @@ module(Stream, [_|_]=Fs) ->
     foreach(fun (F) -> io:format(Stream, "~p.\n", [F]) end, Fs).
 
 format_asm([{label,L}|Is]) ->
-    ["  {label,",integer_to_list(L),"}.\n"|format_asm(Is)];
+    [io_lib:format("  {label,~p}.\n", [L])|format_asm(Is)];
 format_asm([I|Is]) ->
     [io_lib:format("    ~p", [I]),".\n"|format_asm(Is)];
 format_asm([]) -> [].
diff --git a/lib/compiler/src/beam_peep.erl b/lib/compiler/src/beam_peep.erl
index 2b8dd40e29..5730e9704e 100644
--- a/lib/compiler/src/beam_peep.erl
+++ b/lib/compiler/src/beam_peep.erl
@@ -94,38 +94,43 @@ peep([{gc_bif,_,_,_,_,Dst}=I|Is], SeenTests0, Acc) ->
 peep([{jump,{f,L}},{label,L}=I|Is], _, Acc) ->
     %% Sometimes beam_jump has missed this optimization.
     peep(Is, gb_sets:empty(), [I|Acc]);
-peep([{select,Op,R,F,Vls0}|Is], SeenTests0, Acc0) ->
+peep([{select,select_val,R,F,Vls0}|Is], SeenTests0, Acc0) ->
     case prune_redundant_values(Vls0, F) of
 	[] ->
 	    %% No values left. Must convert to plain jump.
 	    I = {jump,F},
 	    peep([I|Is], gb_sets:empty(), Acc0);
-        [{atom,_}=Value,Lbl] when Op =:= select_val ->
-            %% Single value left. Convert to regular test and pop redundant tests.
+        [{atom,_}=Value,Lbl] ->
+            %% Single value left. Convert to regular test.
             Is1 = [{test,is_eq_exact,F,[R,Value]},{jump,Lbl}|Is],
-            case Acc0 of
-                [{test,is_atom,F,[R]}|Acc] ->
-                    peep(Is1, SeenTests0, Acc);
-                _ ->
-                    peep(Is1, SeenTests0, Acc0)
-            end;
-        [{integer,_}=Value,Lbl] when Op =:= select_val ->
-            %% Single value left. Convert to regular test and pop redundant tests.
+            peep(Is1, SeenTests0, Acc0);
+        [{integer,_}=Value,Lbl] ->
+            %% Single value left. Convert to regular test.
             Is1 = [{test,is_eq_exact,F,[R,Value]},{jump,Lbl}|Is],
-            case Acc0 of
-                [{test,is_integer,F,[R]}|Acc] ->
-                    peep(Is1, SeenTests0, Acc);
-                _ ->
-                    peep(Is1, SeenTests0, Acc0)
-            end;
-        [Arity,Lbl] when Op =:= select_tuple_arity ->
-            %% Single value left. Convert to regular test
-            Is1 = [{test,test_arity,F,[R,Arity]},{jump,Lbl}|Is],
+            peep(Is1, SeenTests0, Acc0);
+	[{atom,B1},Lbl,{atom,B2},Lbl] when B1 =:= not B2 ->
+            %% Replace with is_boolean test.
+            Is1 = [{test,is_boolean,F,[R]},{jump,Lbl}|Is],
             peep(Is1, SeenTests0, Acc0);
 	[_|_]=Vls ->
-	    I = {select,Op,R,F,Vls},
+	    I = {select,select_val,R,F,Vls},
 	    peep(Is, gb_sets:empty(), [I|Acc0])
     end;
+peep([{get_map_elements,Fail,Src,List}=I|Is], _SeenTests, Acc0) ->
+    SeenTests = gb_sets:empty(),
+    case simplify_get_map_elements(Fail, Src, List, Acc0) of
+        {ok,Acc} ->
+            peep(Is, SeenTests, Acc);
+        error ->
+            peep(Is, SeenTests, [I|Acc0])
+    end;
+peep([{test,has_map_fields,Fail,Ops}=I|Is], SeenTests, Acc0) ->
+    case simplify_has_map_fields(Fail, Ops, Acc0) of
+        {ok,Acc} ->
+            peep(Is, SeenTests, Acc);
+        error ->
+            peep(Is, SeenTests, [I|Acc0])
+    end;
 peep([{test,Op,_,Ops}=I|Is], SeenTests0, Acc) ->
     case beam_utils:is_pure_test(I) of
 	false ->
@@ -176,3 +181,39 @@ prune_redundant_values([_Val,F|Vls], F) ->
 prune_redundant_values([Val,Lbl|Vls], F) ->
     [Val,Lbl|prune_redundant_values(Vls, F)];
 prune_redundant_values([], _) -> [].
+
+simplify_get_map_elements(Fail, Src, {list,[Key,Dst]},
+                          [{get_map_elements,Fail,Src,{list,List1}}|Acc]) ->
+    case are_keys_literals([Key]) andalso are_keys_literals(List1) of
+        true ->
+            case member(Key, List1) of
+                true ->
+                    %% The key is already in the other list. That is
+                    %% very unusual, because there are optimizations to get
+                    %% rid of duplicate keys. Therefore, don't try to
+                    %% do anything smart here; just keep the
+                    %% get_map_elements instructions separate.
+                    error;
+                false ->
+                    List = [Key,Dst|List1],
+                    {ok,[{get_map_elements,Fail,Src,{list,List}}|Acc]}
+            end;
+        false ->
+            error
+    end;
+simplify_get_map_elements(_, _, _, _) -> error.
+
+simplify_has_map_fields(Fail, [Src|Keys0],
+                        [{test,has_map_fields,Fail,[Src|Keys1]}|Acc]) ->
+    case are_keys_literals(Keys0) andalso are_keys_literals(Keys1) of
+        true ->
+            Keys = Keys0 ++ Keys1,
+            {ok,[{test,has_map_fields,Fail,[Src|Keys]}|Acc]};
+        false ->
+            error
+    end;
+simplify_has_map_fields(_, _, _) -> error.
+
+are_keys_literals([{x,_}|_]) -> false;
+are_keys_literals([{y,_}|_]) -> false;
+are_keys_literals([_|_]) -> true.
diff --git a/lib/compiler/src/beam_receive.erl b/lib/compiler/src/beam_receive.erl
deleted file mode 100644
index ddbe67605a..0000000000
--- a/lib/compiler/src/beam_receive.erl
+++ /dev/null
@@ -1,416 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% 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.
-%% 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(beam_receive).
--export([module/2]).
--import(lists, [foldl/3,reverse/1,reverse/2]).
-
-%%%
-%%% In code such as:
-%%%
-%%%    Ref = make_ref(),        %Or erlang:monitor(process, Pid)
-%%%      .
-%%%      .
-%%%      .
-%%%    receive
-%%%       {Ref,Reply} -> Reply
-%%%    end.
-%%%
-%%% we know that none of the messages that exist in the message queue
-%%% before the call to make_ref/0 can be matched out in the receive
-%%% statement. Therefore we can avoid going through the entire message
-%%% queue if we introduce two new instructions (here written as
-%%% BIFs in pseudo-Erlang):
-%%%
-%%%    recv_mark(SomeUniqInteger),
-%%%    Ref = make_ref(),
-%%%      .
-%%%      .
-%%%      .
-%%%    recv_set(SomeUniqInteger),
-%%%    receive
-%%%       {Ref,Reply} -> Reply
-%%%    end.
-%%%
-%%% The recv_mark/1 instruction will save the current position and
-%%% SomeUniqInteger in the process context. The recv_set
-%%% instruction will verify that SomeUniqInteger is still stored
-%%% in the process context. If it is, it will set the current pointer
-%%% for the message queue (the next message to be read out) to the
-%%% position that was saved by recv_mark/1.
-%%%
-%%% The remove_message instruction must be modified to invalidate
-%%% the information stored by the previous recv_mark/1, in case there
-%%% is another receive executed between the calls to recv_mark/1 and
-%%% recv_set/1.
-%%%
-%%% We use a reference to a label (i.e. a position in the loaded code)
-%%% as the SomeUniqInteger.
-%%%
-
--spec module(beam_utils:module_code(), [compile:option()]) ->
-                    {'ok',beam_utils:module_code()}.
-
-module({Mod,Exp,Attr,Fs0,Lc}, _Opts) ->
-    Fs = [function(F) || F <- Fs0],
-    Code = {Mod,Exp,Attr,Fs,Lc},
-    {ok,Code}.
-
-%%%
-%%% Local functions.
-%%%
-
-function({function,Name,Arity,Entry,Is}) ->
-    try
-	D = beam_utils:index_labels(Is),
-	{function,Name,Arity,Entry,opt(Is, D, [])}
-    catch
-        Class:Error:Stack ->
-	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
-	    erlang:raise(Class, Error, Stack)
-    end.
-
-opt([{call_ext,A,{extfunc,erlang,spawn_monitor,A}}=I0|Is0], D, Acc)
-  when A =:= 1; A =:= 3 ->
-    case ref_in_tuple(Is0) of
-	no ->
-	    opt(Is0, D, [I0|Acc]);
-	{yes,Regs,Is1,MatchReversed} ->
-	    %% The call creates a brand new reference. Now
-	    %% search for a receive statement in the same
-	    %% function that will match against the reference.
-	    case opt_recv(Is1, Regs, D) of
-		no ->
-		    opt(Is0, D, [I0|Acc]);
-		{yes,Is,Lbl} ->
-		    opt(Is, D, MatchReversed++[I0,{recv_mark,{f,Lbl}}|Acc])
-	    end
-    end;
-opt([{call_ext,Arity,{extfunc,erlang,Name,Arity}}=I|Is0], D, Acc) ->
-    case creates_new_ref(Name, Arity) of
-	true ->
-	    %% The call creates a brand new reference. Now
-	    %% search for a receive statement in the same
-	    %% function that will match against the reference.
-	    case opt_recv(Is0, regs_init_x0(), D) of
-		no ->
-		    opt(Is0, D, [I|Acc]);
-		{yes,Is,Lbl} ->
-		    opt(Is, D, [I,{recv_mark,{f,Lbl}}|Acc])
-	    end;
-	false ->
-	    opt(Is0, D, [I|Acc])
-    end;
-opt([I|Is], D, Acc) ->
-    opt(Is, D, [I|Acc]);
-opt([], _, Acc) ->
-    reverse(Acc).
-
-ref_in_tuple([{test,is_tuple,_,[{x,0}]}=I1,
-	      {test,test_arity,_,[{x,0},2]}=I2,
-	      {block,[{set,[_],[{x,0}],{get_tuple_element,0}},
-		      {set,[Dst],[{x,0}],{get_tuple_element,1}}|Bl]}=I3|Is]) ->
-    ref_in_tuple_1(Bl, Dst, Is, [I3,I2,I1]);
-ref_in_tuple([{test,is_tuple,_,[{x,0}]}=I1,
-	      {test,test_arity,_,[{x,0},2]}=I2,
-	      {block,[{set,[Dst],[{x,0}],{get_tuple_element,1}}|Bl]}=I3|Is]) ->
-    ref_in_tuple_1(Bl, Dst, Is, [I3,I2,I1]);
-ref_in_tuple(_) -> no.
-
-ref_in_tuple_1(Bl, Dst, Is, MatchReversed) ->
-    Regs0 = regs_init_singleton(Dst),
-    Regs = opt_update_regs_bl(Bl, Regs0),
-    {yes,Regs,Is,MatchReversed}.
-
-%% creates_new_ref(Name, Arity) -> true|false.
-%%  Return 'true' if the BIF Name/Arity will create a new reference.
-creates_new_ref(monitor, 2) -> true;
-creates_new_ref(make_ref, 0) -> true;
-creates_new_ref(_, _) -> false.
-
-%% opt_recv([Instruction], Regs, LabelIndex) -> no|{yes,[Instruction]}
-%%  Search for a receive statement that will only retrieve messages
-%%  that contain the newly created reference (which is currently in {x,0}).
-opt_recv(Is, Regs, D) ->
-    L = gb_sets:empty(),
-    opt_recv(Is, D, Regs, L, []).
-
-opt_recv([{label,L}=Lbl,{loop_rec,{f,Fail},_}=Loop|Is], D, R0, _, Acc) ->
-    R = regs_kill_not_live(0, R0),
-    case regs_empty(R) of
-	false ->
-	    %% We now have the new reference in Y registers
-	    %% and the current instruction is the beginning of a
-	    %% receive statement. We must now verify that only messages
-	    %% that contain the reference will be matched.
-	    case opt_ref_used(Is, R, Fail, D) of
-		false ->
-		    no;
-		true ->
-		    RecvSet = {recv_set,{f,L}},
-		    {yes,reverse(Acc, [RecvSet,Lbl,Loop|Is]),L}
-	    end;
-	true ->
-	    no
-    end;
-opt_recv([I|Is], D, R0, L0, Acc) ->
-    {R,L} = opt_update_regs(I, R0, L0),
-    case regs_empty(R) of
-	true ->
-	    %% The reference is no longer alive. There is no
-	    %% point in continuing the search.
-	    no;
-	false ->
-	    opt_recv(Is, D, R, L, [I|Acc])
-    end;
-opt_recv([], _, _, _, _) -> no.
-
-opt_update_regs({block,Bl}, R, L) ->
-    {opt_update_regs_bl(Bl, R),L};
-opt_update_regs({call,_,_}, R, L) ->
-    {regs_kill_not_live(0, R),L};
-opt_update_regs({call_ext,_,_}, R, L) ->
-    {regs_kill_not_live(0, R),L};
-opt_update_regs({call_fun,_}, R, L) ->
-    {regs_kill_not_live(0, R),L};
-opt_update_regs({kill,Y}, R, L) ->
-    {regs_kill([Y], R),L};
-opt_update_regs({'catch',_,{f,Lbl}}, R, L) ->
-    {R,gb_sets:add(Lbl, L)};
-opt_update_regs({catch_end,_}, R, L) ->
-    {R,L};
-opt_update_regs({label,Lbl}, R, L) ->
-    case gb_sets:is_member(Lbl, L) of
-	false ->
-	    %% We can't allow arbitrary labels (since the receive
-	    %% could be entered without first creating the reference).
-	    {regs_init(),L};
-	true ->
-	    %% A catch label for a previously seen catch instruction is OK.
-	    {R,L}
-    end;
-opt_update_regs({'try',_,{f,Lbl}}, R, L) ->
-    {R,gb_sets:add(Lbl, L)};
-opt_update_regs({try_end,_}, R, L) ->
-    {R,L};
-opt_update_regs({line,_}, R, L) ->
-    {R,L};
-opt_update_regs(_I, _R, L) ->
-    %% Unrecognized instruction. Abort the search.
-    {regs_init(),L}.
-
-opt_update_regs_bl([{set,Ds,_,{alloc,Live,_}}|Is], Regs0) ->
-    Regs1 = regs_kill_not_live(Live, Regs0),
-    Regs = regs_kill(Ds, Regs1),
-    opt_update_regs_bl(Is, Regs);
-opt_update_regs_bl([{set,[Dst]=Ds,[Src],move}|Is], Regs0) ->
-    Regs1 = regs_kill(Ds, Regs0),
-    Regs = case regs_is_member(Src, Regs1) of
-	       false -> Regs1;
-	       true -> regs_add(Dst, Regs1)
-	   end,
-    opt_update_regs_bl(Is, Regs);
-opt_update_regs_bl([{set,Ds,_,_}|Is], Regs0) ->
-    Regs = regs_kill(Ds, Regs0),
-    opt_update_regs_bl(Is, Regs);
-opt_update_regs_bl([], Regs) -> Regs.
-
-%% opt_ref_used([Instruction], RefRegs, FailLabel, LabelIndex) -> true|false
-%%  Return 'true' if it is certain that only messages that contain the same
-%%  reference as in RefRegs can be matched out. Otherwise return 'false'.
-%%
-%%  Basically, we follow all possible paths through the receive statement.
-%%  If all paths are safe, we return 'true'.
-%%
-%%  A branch to FailLabel is safe, because it exits the receive statement
-%%  and no further message may be matched out.
-%%
-%%  If a path hits an comparision between RefRegs and part of the message,
-%%  that path is safe (any messages that may be matched further down the
-%%  path is guaranteed to contain the reference).
-%%
-%%  Otherwise, if we hit a 'remove_message' instruction, we give up
-%%  and return 'false' (the optimization is definitely unsafe). If
-%%  we hit an unrecognized instruction, we also give up and return
-%%  'false' (the optimization may be unsafe).
-
-opt_ref_used(Is, RefRegs, Fail, D) ->
-    Done = gb_sets:singleton(Fail),
-    Regs = regs_init_x0(),
-    try
-	_ = opt_ref_used_1(Is, RefRegs, D, Done, Regs),
-	true
-    catch
-	throw:not_used ->
-	    false
-    end.
-
-%% This functions only returns if all paths through the receive
-%% statement are safe, and throws an 'not_used' term otherwise.
-opt_ref_used_1([{block,Bl}|Is], RefRegs, D, Done, Regs0) ->
-    Regs = opt_ref_used_bl(Bl, Regs0),
-    opt_ref_used_1(Is, RefRegs, D, Done, Regs);
-opt_ref_used_1([{test,is_eq_exact,{f,Fail},Args}|Is],
-	       RefRegs, D, Done0, Regs) ->
-    Done = opt_ref_used_at(Fail, RefRegs, D, Done0, Regs),
-    case is_ref_msg_comparison(Args, RefRegs, Regs) of
-	false ->
-	    opt_ref_used_1(Is, RefRegs, D, Done, Regs);
-	true ->
-	    %% The instructions that follow (Is) can only be executed
-	    %% if the message contains the same reference as in RefRegs.
-	    Done
-    end;
-opt_ref_used_1([{test,is_ne_exact,{f,Fail},Args}|Is],
-	       RefRegs, D, Done0, Regs) ->
-    Done = opt_ref_used_1(Is, RefRegs, D, Done0, Regs),
-    case is_ref_msg_comparison(Args, RefRegs, Regs) of
-	false ->
-	    opt_ref_used_at(Fail, RefRegs, D, Done, Regs);
-	true ->
-	    Done
-    end;
-opt_ref_used_1([{test,_,{f,Fail},_}|Is], RefRegs, D, Done0, Regs) ->
-    Done = opt_ref_used_at(Fail, RefRegs, D, Done0, Regs),
-    opt_ref_used_1(Is, RefRegs, D, Done, Regs);
-opt_ref_used_1([{select,_,_,{f,Fail},List}|_], RefRegs, D, Done, Regs) ->
-    Lbls = [F || {f,F} <- List] ++ [Fail],
-    opt_ref_used_in_all(Lbls, RefRegs, D, Done, Regs);
-opt_ref_used_1([{label,Lbl}|Is], RefRegs, D, Done, Regs) ->
-    case gb_sets:is_member(Lbl, Done) of
-	true -> Done;
-	false -> opt_ref_used_1(Is, RefRegs, D, Done, Regs)
-    end;
-opt_ref_used_1([{loop_rec_end,_}|_], _, _, Done, _) ->
-    Done;
-opt_ref_used_1([_I|_], _RefReg, _D, _Done, _Regs) ->
-    %% The optimization may be unsafe.
-    throw(not_used).
-
-%% is_ref_msg_comparison(Args, RefRegs, RegisterSet) -> true|false.
-%%  Return 'true' if Args denotes a comparison between the
-%%  reference and message or part of the message.
-is_ref_msg_comparison([R1,R2], RefRegs, Regs) ->
-    (regs_is_member(R2, RefRegs) andalso regs_is_member(R1, Regs)) orelse
-    (regs_is_member(R1, RefRegs) andalso regs_is_member(R2, Regs)).
-
-opt_ref_used_in_all([L|Ls], RefRegs, D, Done0, Regs) ->
-    Done = opt_ref_used_at(L, RefRegs, D, Done0, Regs),
-    opt_ref_used_in_all(Ls, RefRegs, D, Done, Regs);
-opt_ref_used_in_all([], _, _, Done, _) -> Done.
-
-opt_ref_used_at(Fail, RefRegs, D, Done0, Regs) ->
-    case gb_sets:is_member(Fail, Done0) of
-	true ->
-	    Done0;
-	false ->
-	    Is = beam_utils:code_at(Fail, D),
-	    Done = opt_ref_used_1(Is, RefRegs, D, Done0, Regs),
-	    gb_sets:add(Fail, Done)
-    end.
-
-opt_ref_used_bl([{set,[],[],remove_message}|_], _) ->
-    %% We have proved that a message that does not depend on the
-    %% reference can be matched out.
-    throw(not_used);
-opt_ref_used_bl([{set,Ds,Ss,_}|Is], Regs0) ->
-    case regs_all_members(Ss, Regs0) of
-	false ->
-	    %% The destination registers may be assigned values that
-	    %% are not dependent on the message being matched.
-	    Regs = regs_kill(Ds, Regs0),
-	    opt_ref_used_bl(Is, Regs);
-	true ->
-	    %% All the sources depend on the message directly or
-	    %% indirectly.
-	    Regs = regs_add_list(Ds, Regs0),
-	    opt_ref_used_bl(Is, Regs)
-    end;
-opt_ref_used_bl([], Regs) -> Regs.
-
-%%%
-%%% Functions for keeping track of a set of registers.
-%%%
-
-%% regs_init() -> RegisterSet
-%%  Return an empty set of registers.
-
-regs_init() ->
-    {0,0}.
-
-%% regs_init_singleton(Register) -> RegisterSet
-%%  Return a set that only contains one register.
-
-regs_init_singleton(Reg) ->
-    regs_add(Reg, regs_init()).
-
-%% regs_init_x0() -> RegisterSet
-%%  Return a set that only contains the {x,0} register.
-
-regs_init_x0() ->
-    {1 bsl 0,0}.
-
-%% regs_empty(Register) -> true|false
-%%  Test whether the register set is empty.
-
-regs_empty(R) ->
-    R =:= {0,0}.
-
-%% regs_kill_not_live(Live, RegisterSet) -> RegisterSet'
-%%  Kill all registers indicated not live by Live.
-
-regs_kill_not_live(Live, {Xregs,Yregs}) ->
-    {Xregs band ((1 bsl Live)-1),Yregs}.
-
-%% regs_kill([Register], RegisterSet) -> RegisterSet'
-%%  Kill all registers mentioned in the list of registers.
-
-regs_kill([{x,N}|Rs], {Xregs,Yregs}) ->
-    regs_kill(Rs, {Xregs band (bnot (1 bsl N)),Yregs});
-regs_kill([{y,N}|Rs], {Xregs,Yregs}) ->
-    regs_kill(Rs, {Xregs,Yregs band (bnot (1 bsl N))});
-regs_kill([{fr,_}|Rs], Regs) ->
-    regs_kill(Rs, Regs);
-regs_kill([], Regs) -> Regs.
-
-regs_add_list(List, Regs) ->
-    foldl(fun(R, A) -> regs_add(R, A) end, Regs, List).
-
-%% regs_add(Register, RegisterSet) -> RegisterSet'
-%%  Add a new register to the set of registers.
-
-regs_add({x,N}, {Xregs,Yregs}) ->
-    {Xregs bor (1 bsl N),Yregs};
-regs_add({y,N}, {Xregs,Yregs}) ->
-    {Xregs,Yregs bor (1 bsl N)}.
-
-%% regs_all_members([Register], RegisterSet) -> true|false
-%%  Test whether all of the registers are part of the register set.
-
-regs_all_members([R|Rs], Regs) ->
-    regs_is_member(R, Regs) andalso regs_all_members(Rs, Regs);
-regs_all_members([], _) -> true.
-
-%% regs_is_member(Register, RegisterSet) -> true|false
-%%  Test whether Register is part of the register set.
-
-regs_is_member({x,N}, {Regs,_}) -> Regs band (1 bsl N) =/= 0;
-regs_is_member({y,N}, {_,Regs}) -> Regs band (1 bsl N) =/= 0;
-regs_is_member(_, _) -> false.
diff --git a/lib/compiler/src/beam_record.erl b/lib/compiler/src/beam_record.erl
deleted file mode 100644
index 58a6de6775..0000000000
--- a/lib/compiler/src/beam_record.erl
+++ /dev/null
@@ -1,131 +0,0 @@
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2014-2017. All Rights Reserved.
-%%
-%% 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.
-%%
-%% %CopyrightEnd%
-%%
-
-%% Rewrite the instruction stream on tagged tuple tests.
-%% 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]}.
-%%     ...
-%%     {get_tuple_element,Src,0,Dst}.
-%%     ...
-%%     {test,is_eq_exact,Fail,[Dst,Atom]}.
-%%     ...
-%% To:
-%%     ...
-%%     {test,is_tagged_tuple,Fail,[Src,Sz,Atom]}.
-%%     ...
-%%
-
--module(beam_record).
--export([module/2]).
-
--import(lists, [reverse/1,reverse/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],
-    {ok,{Mod,Exp,Attr,Fs,Lc}}.
-
-function({function,Name,Arity,CLabel,Is0}) ->
-    try
-        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 ->
-            io:fwrite("Function: ~w/~w\n", [Name,Arity]),
-            erlang:raise(Class, Error, Stack)
-    end.
-
-rewrite(Is, Idx) ->
-    rewrite(Is, Idx, 0, []).
-
-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, 0, [TT,TA|Acc0]);
-        {yes,Atom,Acc} ->
-            I = {test,is_tagged_tuple,Fail,[Src,N,Atom]},
-            rewrite(Is, Idx, Def, [I|Acc])
-    end;
-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.
-
-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(_, _, _, _, _) ->
-    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_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.
-
-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
deleted file mode 100644
index 8d2ef5a431..0000000000
--- a/lib/compiler/src/beam_reorder.erl
+++ /dev/null
@@ -1,150 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% 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.
-%% 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(beam_reorder).
-
--export([module/2]).
--import(lists, [member/2,reverse/1]).
-
--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],
-    {ok,{Mod,Exp,Attr,Fs,Lc}}.
-
-function({function,Name,Arity,CLabel,Is0}) ->
-    try
-	Is = reorder(Is0),
-	{function,Name,Arity,CLabel,Is}
-    catch
-        Class:Error:Stack ->
-	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
-	    erlang:raise(Class, Error, Stack)
-    end.
-
-%% reorder(Instructions0) -> Instructions
-%%  Reorder instructions before the beam_block pass, because reordering
-%%  will be more cumbersome when the blocks are in place.
-%%
-%%  Execution of get_tuple_element instructions can be delayed until
-%%  they are actually needed. Consider the sequence:
-%%
-%%      get_tuple_element Tuple Pos Dst
-%%      test Test Fail Operands
-%%
-%%  If Dst is killed at label Fail (and not referenced in Operands),
-%%  we can can swap the instructions:
-%%
-%%      test Test Fail Operands
-%%      get_tuple_element Tuple Pos Dst
-%%
-%%  That can be beneficial in two ways: Firstly, if the branch is taken
-%%  we have avoided execution of the get_tuple_element instruction.
-%%  Secondly, even if the branch is not taken, subsequent optimization
-%%  (opt_blocks/1) may be able to change Dst to the final destination
-%%  register and eliminate a 'move' instruction.
-
-reorder(Is) ->
-    D = beam_utils:index_labels(Is),
-    reorder_1(Is, D, []).
-
-reorder_1([{Op,_,_}=TryCatch|[I|Is]=Is0], D, Acc)
-  when Op =:= 'catch'; Op =:= 'try' ->
-    %% Don't allow 'try' or 'catch' instructions to split blocks if
-    %% it can be avoided.
-    case is_safe(I) of
-	false ->
-	    reorder_1(Is0, D, [TryCatch|Acc]);
-	true ->
-	    reorder_1([TryCatch|Is], D, [I|Acc])
-    end;
-reorder_1([{label,L}=I|_], D, Acc) ->
-    Is = beam_utils:code_at(L, D),
-    reorder_1(Is, D, [I|Acc]);
-reorder_1([{test,is_nonempty_list,_,_}=I|Is], D, Acc) ->
-    %% The run-time system may combine the is_nonempty_list test with
-    %% the following get_list instruction.
-    reorder_1(Is, D, [I|Acc]);
-reorder_1([{test,_,_,_}=I,
-	   {select,_,_,_,_}=S|Is], D, Acc) ->
-    %% There is nothing to gain by inserting a get_tuple_element
-    %% instruction between the test instruction and the select
-    %% instruction.
-    reorder_1(Is, D, [S,I|Acc]);
-reorder_1([{test,_,{f,_},[Src|_]}=I|Is], D,
-	  [{get_tuple_element,Src,_,_}|_]=Acc) ->
-    %% We want to avoid code that can confuse beam_validator such as:
-    %%   is_tuple Fail Src
-    %%   test_arity Fail Src Arity
-    %%   is_map Fail Src
-    %%   get_tuple_element Src Pos Dst
-    %% Therefore, don't reorder the instructions in such cases.
-    reorder_1(Is, D, [I|Acc]);
-reorder_1([{test,_,{f,L},Ss}=I|Is0], D0,
-	  [{get_tuple_element,_,_,El}=G|Acc0]=Acc) ->
-    case member(El, Ss) of
-	true ->
-	    reorder_1(Is0, D0, [I|Acc]);
-	false ->
-	    case beam_utils:is_killed_at(El, L, D0) of
-		true ->
-		    Is = [I,G|Is0],
-		    reorder_1(Is, D0, Acc0);
-		false ->
-		    case beam_utils:is_killed(El, Is0, D0) of
-			true ->
-			    Code0 = beam_utils:code_at(L, D0),
-			    Code = [G|Code0],
-			    D = beam_utils:index_label(L, Code, D0),
-			    Is = [I|Is0],
-			    reorder_1(Is, D, Acc0);
-			false ->
-			    reorder_1(Is0, D0, [I|Acc])
-		    end
-	    end
-    end;
-reorder_1([{allocate_zero,N,Live}=I0|Is], D,
-	  [{get_tuple_element,{x,Tup},_,{x,Dst}}=G|Acc]=Acc0) ->
-    case Tup < Dst andalso Dst+1 =:= Live of
-	true ->
-	    %% Move allocation instruction upwards past
-	    %% get_tuple_element instructions to create more
-	    %% opportunities for moving get_tuple_element
-	    %% instructions.
-	    I = {allocate_zero,N,Dst},
-	    reorder_1([I,G|Is], D, Acc);
-	false ->
-	    reorder_1(Is, D, [I0|Acc0])
-    end;
-reorder_1([I|Is], D, Acc) ->
-    reorder_1(Is, D, [I|Acc]);
-reorder_1([], _, Acc) -> reverse(Acc).
-
-%% is_safe(Instruction) -> true|false
-%%  Test whether an instruction is safe (cannot cause an exception).
-
-is_safe({kill,_}) -> true;
-is_safe({move,_,_}) -> true;
-is_safe({put,_}) -> true;
-is_safe({put_list,_,_,_}) -> true;
-is_safe({put_tuple,_,_}) -> true;
-is_safe({test_heap,_,_}) -> true;
-is_safe(_) -> false.
diff --git a/lib/compiler/src/beam_split.erl b/lib/compiler/src/beam_split.erl
deleted file mode 100644
index 809e49b3d0..0000000000
--- a/lib/compiler/src/beam_split.erl
+++ /dev/null
@@ -1,94 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% 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(beam_split).
--export([module/2]).
-
--import(lists, [reverse/1]).
-
--spec module(beam_utils:module_code(), [compile:option()]) ->
-                    {'ok',beam_utils:module_code()}.
-
-module({Mod,Exp,Attr,Fs0,Lc}, _Opts) ->
-    Fs = [split_blocks(F) || F <- Fs0],
-    {ok,{Mod,Exp,Attr,Fs,Lc}}.
-
-%% We must split the basic block when we encounter instructions with labels,
-%% such as catches and BIFs. All labels must be visible outside the blocks.
-
-split_blocks({function,Name,Arity,CLabel,Is0}) ->
-    Is = split_blocks(Is0, []),
-    {function,Name,Arity,CLabel,Is}.
-
-split_blocks([{block,Bl}|Is], Acc0) ->
-    Acc = split_block(Bl, [], Acc0),
-    split_blocks(Is, Acc);
-split_blocks([I|Is], Acc) ->
-    split_blocks(Is, [I|Acc]);
-split_blocks([], Acc) -> reverse(Acc).
-
-split_block([{set,[R],[_,_,_]=As,{bif,is_record,{f,Lbl}}}|Is], Bl, Acc) ->
-    %% is_record/3 must be translated by beam_clean; therefore,
-    %% it must be outside of any block.
-    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,[],[],{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)]);
-split_block([{set,[D],[S|Puts],{alloc,R,{put_map,Op,{f,Lbl}=Fail}}}|Is],
-	    Bl, Acc) when Lbl =/= 0 ->
-    split_block(Is, [], [{put_map,Fail,Op,S,D,R,{list,Puts}}|
-			 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([I|Is], Bl, Acc) ->
-    split_block(Is, [I|Bl], Acc);
-split_block([], Bl, Acc) -> make_block(Bl, Acc).
-
-make_block([], Acc) -> Acc;
-make_block([{set,[D],Ss,{bif,Op,Fail}}|Bl]=Bl0, Acc) ->
-    %% If the last instruction in the block is a comparison or boolean operator
-    %% (such as '=:='), move it out of the block to facilitate further
-    %% optimizations.
-    Arity = length(Ss),
-    case erl_internal:comp_op(Op, Arity) orelse
-	erl_internal:new_type_test(Op, Arity) orelse
-	erl_internal:bool_op(Op, Arity) of
-	false ->
-	    [{block,reverse(Bl0)}|Acc];
-	true ->
-	    I = {bif,Op,Fail,Ss,D},
-	    case Bl =:= [] of
-		true -> [I|Acc];
-		false -> [I,{block,reverse(Bl)}|Acc]
-	    end
-    end;
-make_block([{set,[Dst],[Src],move}|Bl], Acc) ->
-    %% Make optimization of {move,Src,Dst}, {jump,...} possible.
-    I = {move,Src,Dst},
-    case Bl =:= [] of
-	true -> [I|Acc];
-	false -> [I,{block,reverse(Bl)}|Acc]
-    end;
-make_block(Bl, Acc) -> [{block,reverse(Bl)}|Acc].
diff --git a/lib/compiler/src/beam_ssa.erl b/lib/compiler/src/beam_ssa.erl
new file mode 100644
index 0000000000..6492d1e1bf
--- /dev/null
+++ b/lib/compiler/src/beam_ssa.erl
@@ -0,0 +1,898 @@
+%%
+%% %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%
+%%
+%% Purpose: Type definitions and utilities for the SSA format.
+
+-module(beam_ssa).
+-export([add_anno/3,get_anno/2,get_anno/3,
+         clobbers_xregs/1,def/2,def_used/2,
+         definitions/1,
+         dominators/1,common_dominators/3,
+         flatmapfold_instrs_rpo/4,
+         fold_po/3,fold_po/4,fold_rpo/3,fold_rpo/4,
+         fold_instrs_rpo/4,
+         linearize/1,
+         mapfold_blocks_rpo/4,
+         mapfold_instrs_rpo/4,
+         normalize/1,
+         no_side_effect/1,
+         predecessors/1,
+         rename_vars/3,
+         rpo/1,rpo/2,
+         split_blocks/3,
+         successors/1,successors/2,
+         trim_unreachable/1,
+         update_phi_labels/4,used/1,
+         uses/1,uses/2]).
+
+-export_type([b_module/0,b_function/0,b_blk/0,b_set/0,
+              b_ret/0,b_br/0,b_switch/0,terminator/0,
+              b_var/0,b_literal/0,b_remote/0,b_local/0,
+              value/0,argument/0,label/0,
+              var_name/0,var_base/0,literal_value/0,
+              op/0,anno/0,block_map/0,dominator_map/0,
+              rename_map/0,rename_proplist/0,usage_map/0,
+              definition_map/0]).
+
+-include("beam_ssa.hrl").
+
+-type b_module()   :: #b_module{}.
+-type b_function() :: #b_function{}.
+-type b_blk()      :: #b_blk{}.
+-type b_set()      :: #b_set{}.
+
+-type b_br()       :: #b_br{}.
+-type b_ret()      :: #b_ret{}.
+-type b_switch()   :: #b_switch{}.
+-type terminator() :: b_br() | b_ret() | b_switch().
+
+-type construct()  :: b_module() | b_function() | b_blk() | b_set() |
+                      terminator().
+
+-type b_var()      :: #b_var{}.
+-type b_literal()  :: #b_literal{}.
+-type b_remote()   :: #b_remote{}.
+-type b_local()    :: #b_local{}.
+
+-type value()      :: b_var() | b_literal().
+-type phi_value()  :: {value(),label()}.
+-type argument()   :: value() | b_remote() | b_local() | phi_value().
+-type label()      :: non_neg_integer().
+
+-type var_name()   :: var_base() | {var_base(),non_neg_integer()}.
+-type var_base()   :: atom() | non_neg_integer().
+
+-type literal_value() :: atom() | integer() | float() | list() |
+                         nil() | tuple() | map() | binary().
+
+-type op()   :: {'bif',atom()} | {'float',float_op()} | prim_op() | cg_prim_op().
+-type anno() :: #{atom() := any()}.
+
+-type block_map() :: #{label():=b_blk()}.
+-type dominator_map() :: #{label():=[label()]}.
+-type numbering_map() :: #{label():=non_neg_integer()}.
+-type usage_map() :: #{b_var():=[{label(),b_set() | terminator()}]}.
+-type definition_map() :: #{b_var():=b_set()}.
+-type rename_map() :: #{b_var():=value()}.
+-type rename_proplist() :: [{b_var(),value()}].
+
+%% Note: By default, dialyzer will collapse this type to atom().
+%% To avoid the collapsing, change the value of SET_LIMIT to 50 in the
+%% file erl_types.erl in the hipe application.
+
+-type prim_op() :: 'bs_add' | 'bs_extract' | 'bs_get_tail' |
+                   'bs_init' | 'bs_init_writable' |
+                   'bs_match' | 'bs_put' | 'bs_start_match' | 'bs_test_tail' |
+                   'bs_utf16_size' | 'bs_utf8_size' | 'build_stacktrace' |
+                   'call' | 'catch_end' |
+                   'extract' |
+                   'get_hd' | 'get_map_element' | 'get_tl' | 'get_tuple_element' |
+                   'has_map_field' |
+                   'is_nonempty_list' | 'is_tagged_tuple' |
+                   'kill_try_tag' |
+                   'landingpad' |
+                   'make_fun' | 'new_try_tag' |
+                   'peek_message' | 'phi' | 'put_list' | 'put_map' | 'put_tuple' |
+                   'raw_raise' | 'recv_next' | 'remove_message' | 'resume' |
+                   'succeeded' |
+                   'timeout' |
+                   'wait' | 'wait_timeout'.
+
+-type float_op() :: 'checkerror' | 'clearerror' | 'convert' | 'get' | 'put' |
+                    '+' | '-' | '*' | '/'.
+
+%% Primops only used internally during code generation.
+-type cg_prim_op() :: 'bs_get' | 'bs_get_position' | 'bs_match_string' |
+                      'bs_restore' | 'bs_save' | 'bs_set_position' | 'bs_skip' |
+                      'copy' | 'put_tuple_arity' | 'put_tuple_element' |
+                      'put_tuple_elements' | 'set_tuple_element'.
+
+-import(lists, [foldl/3,keyfind/3,mapfoldl/3,member/2,reverse/1,umerge/1]).
+
+-spec add_anno(Key, Value, Construct) -> Construct when
+      Key :: atom(),
+      Value :: any(),
+      Construct :: construct().
+
+add_anno(Key, Val, #b_function{anno=Anno}=Bl) ->
+    Bl#b_function{anno=Anno#{Key=>Val}};
+add_anno(Key, Val, #b_blk{anno=Anno}=Bl) ->
+    Bl#b_blk{anno=Anno#{Key=>Val}};
+add_anno(Key, Val, #b_set{anno=Anno}=Bl) ->
+    Bl#b_set{anno=Anno#{Key=>Val}};
+add_anno(Key, Val, #b_br{anno=Anno}=Bl) ->
+    Bl#b_br{anno=Anno#{Key=>Val}};
+add_anno(Key, Val, #b_ret{anno=Anno}=Bl) ->
+    Bl#b_ret{anno=Anno#{Key=>Val}};
+add_anno(Key, Val, #b_switch{anno=Anno}=Bl) ->
+    Bl#b_switch{anno=Anno#{Key=>Val}}.
+
+-spec get_anno(atom(), construct()) -> any().
+
+get_anno(Key, Construct) ->
+    map_get(Key, get_anno(Construct)).
+
+-spec get_anno(atom(), construct(),any()) -> any().
+
+get_anno(Key, Construct, Default) ->
+    maps:get(Key, get_anno(Construct), Default).
+
+get_anno(#b_function{anno=Anno}) -> Anno;
+get_anno(#b_blk{anno=Anno}) -> Anno;
+get_anno(#b_set{anno=Anno}) -> Anno;
+get_anno(#b_br{anno=Anno}) -> Anno;
+get_anno(#b_ret{anno=Anno}) -> Anno;
+get_anno(#b_switch{anno=Anno}) -> Anno.
+
+%% clobbers_xregs(#b_set{}) -> true|false.
+%%  Test whether the instruction invalidates all X registers.
+
+-spec clobbers_xregs(b_set()) -> boolean().
+
+clobbers_xregs(#b_set{op=Op}) ->
+    case Op of
+        bs_init_writable -> true;
+        build_stacktrace -> true;
+        call -> true;
+        landingpad -> true;
+        make_fun -> true;
+        peek_message -> true;
+        raw_raise -> true;
+        _ -> false
+    end.
+
+%% no_side_effect(#b_set{}) -> true|false.
+%%  Test whether this instruction has no side effect and thus is safe
+%%  not to execute if its value is not used. Note that even if `true`
+%%  is returned, the instruction could still be impure (e.g. bif:get).
+
+-spec no_side_effect(b_set()) -> boolean().
+
+no_side_effect(#b_set{op=Op}) ->
+    case Op of
+        {bif,_} -> true;
+        {float,get} -> true;
+        bs_init -> true;
+        bs_extract -> true;
+        bs_match -> true;
+        bs_start_match -> true;
+        bs_test_tail -> true;
+        bs_get_tail -> true;
+        bs_put -> true;
+        extract -> true;
+        get_hd -> true;
+        get_tl -> true;
+        get_map_element -> true;
+        get_tuple_element -> true;
+        has_map_field -> true;
+        is_nonempty_list -> true;
+        is_tagged_tuple -> true;
+        make_fun -> true;
+        put_map -> true;
+        put_list -> true;
+        put_tuple -> true;
+        succeeded -> true;
+        _ -> false
+    end.
+
+-spec predecessors(Blocks) -> #{BlockNumber:=[Predecessor]} when
+      Blocks :: block_map(),
+      BlockNumber :: label(),
+      Predecessor :: label().
+
+predecessors(Blocks) ->
+    P0 = [{S,L} || {L,Blk} <- maps:to_list(Blocks),
+                   S <- successors(Blk)],
+    P1 = sofs:relation(P0),
+    P2 = sofs:rel2fam(P1),
+    P3 = sofs:to_external(P2),
+    P = [{0,[]}|P3],
+    maps:from_list(P).
+
+-spec successors(b_blk()) -> [label()].
+
+successors(#b_blk{last=Terminator}) ->
+    case Terminator of
+        #b_br{bool=#b_literal{val=true},succ=Succ} ->
+            [Succ];
+        #b_br{bool=#b_literal{val=false},fail=Fail} ->
+            [Fail];
+        #b_br{succ=Succ,fail=Fail} ->
+            [Fail,Succ];
+        #b_switch{fail=Fail,list=List} ->
+            [Fail|[L || {_,L} <- List]];
+        #b_ret{} ->
+            []
+    end.
+
+%% normalize(Instr0) -> Instr.
+%%  Normalize instructions to help optimizations.
+%%
+%%  For commutative operators (such as '+' and 'or'), always
+%%  place a variable operand before a literal operand.
+%%
+%%  Normalize #b_br{} to one of the following forms:
+%%
+%%    #b_br{b_literal{val=true},succ=Label,fail=Label}
+%%    #b_br{b_var{},succ=Label1,fail=Label2} where Label1 =/= Label2
+%%
+%%  Simplify a #b_switch{} with a literal argument to a #b_br{}.
+%%
+%%  Simplify a #b_switch{} with a variable argument and an empty
+%%  switch list to a #b_br{}.
+
+-spec normalize(b_set() | terminator()) ->
+                       b_set() | terminator().
+
+normalize(#b_set{op={bif,Bif},args=Args}=Set) ->
+    case {is_commutative(Bif),Args} of
+        {false,_} ->
+            Set;
+        {true,[#b_literal{}=Lit,#b_var{}=Var]} ->
+            Set#b_set{args=[Var,Lit]};
+        {true,_} ->
+            Set
+    end;
+normalize(#b_set{}=Set) ->
+    Set;
+normalize(#b_br{}=Br) ->
+    case Br of
+        #b_br{bool=Bool,succ=Same,fail=Same} ->
+            case Bool of
+                #b_literal{val=true} ->
+                    Br;
+                _ ->
+                    Br#b_br{bool=#b_literal{val=true}}
+            end;
+        #b_br{bool=#b_literal{val=true},succ=Succ} ->
+            Br#b_br{fail=Succ};
+        #b_br{bool=#b_literal{val=false},fail=Fail} ->
+            Br#b_br{bool=#b_literal{val=true},succ=Fail};
+        #b_br{} ->
+            Br
+    end;
+normalize(#b_switch{arg=Arg,fail=Fail,list=List}=Sw) ->
+    case Arg of
+        #b_literal{} ->
+            case keyfind(Arg, 1, List) of
+                false ->
+                    #b_br{bool=#b_literal{val=true},succ=Fail,fail=Fail};
+                {Arg,L} ->
+                    #b_br{bool=#b_literal{val=true},succ=L,fail=L}
+            end;
+        #b_var{} when List =:= [] ->
+            #b_br{bool=#b_literal{val=true},succ=Fail,fail=Fail};
+        #b_var{} ->
+            Sw
+    end;
+normalize(#b_ret{}=Ret) ->
+    Ret.
+
+-spec successors(label(), block_map()) -> [label()].
+
+successors(L, Blocks) ->
+    successors(map_get(L, Blocks)).
+
+-spec def(Ls, Blocks) -> Def when
+      Ls :: [label()],
+      Blocks :: block_map(),
+      Def :: ordsets:ordset(var_name()).
+
+def(Ls, Blocks) ->
+    Top = rpo(Ls, Blocks),
+    Blks = [map_get(L, Blocks) || L <- Top],
+    def_1(Blks, []).
+
+-spec def_used(Ls, Blocks) -> {Def,Used} when
+      Ls :: [label()],
+      Blocks :: block_map(),
+      Def :: ordsets:ordset(var_name()),
+      Used :: ordsets:ordset(var_name()).
+
+def_used(Ls, Blocks) ->
+    Top = rpo(Ls, Blocks),
+    Blks = [map_get(L, Blocks) || L <- Top],
+    Preds = cerl_sets:from_list(Top),
+    def_used_1(Blks, Preds, [], []).
+
+%% dominators(BlockMap) -> {Dominators,Numbering}.
+%%  Calculate the dominator tree, returning a map where each entry
+%%  in the map is a list that gives the path from that block to
+%%  the top of the dominator tree. (Note that the suffixes of the
+%%  paths are shared with each other, which make the representation
+%%  of the dominator tree highly memory-efficient.)
+%%
+%%  The implementation is based on:
+%%
+%%     http://www.hipersoft.rice.edu/grads/publications/dom14.pdf
+%%     Cooper, Keith D.; Harvey, Timothy J; Kennedy, Ken (2001).
+%%        A Simple, Fast Dominance Algorithm.
+
+-spec dominators(Blocks) -> Result when
+      Blocks :: block_map(),
+      Result :: {dominator_map(), numbering_map()}.
+dominators(Blocks) ->
+    Preds = predecessors(Blocks),
+    Top0 = rpo(Blocks),
+    Df = maps:from_list(number(Top0, 0)),
+    [{0,[]}|Top] = [{L,map_get(L, Preds)} || L <- Top0],
+
+    %% The flow graph for an Erlang function is reducible, and
+    %% therefore one traversal in reverse postorder is sufficient.
+    Acc = #{0=>[0]},
+    {dominators_1(Top, Df, Acc),Df}.
+
+%% common_dominators([Label], Dominators, Numbering) -> [Label].
+%%  Calculate the common dominators for the given list of blocks
+%%  and Dominators and Numbering as returned from dominators/1.
+
+-spec common_dominators([label()], dominator_map(), numbering_map()) -> [label()].
+common_dominators(Ls, Dom, Numbering) ->
+    Doms = [map_get(L, Dom) || L <- Ls],
+    dom_intersection(Doms, Numbering).
+
+-spec fold_instrs_rpo(Fun, From, Acc0, Blocks) -> any() when
+      Fun :: fun((b_blk()|terminator(), any()) -> any()),
+      From :: [label()],
+      Acc0 :: any(),
+      Blocks :: block_map().
+
+fold_instrs_rpo(Fun, From, Acc0, Blocks) ->
+    Top = rpo(From, Blocks),
+    fold_instrs_rpo_1(Top, Fun, Blocks, Acc0).
+
+%% Like mapfold_instrs_rpo but at the block level to support lookahead and
+%% scope-dependent transformations.
+-spec mapfold_blocks_rpo(Fun, From, Acc, Blocks) -> Result when
+      Fun :: fun((label(), b_blk(), any()) -> {b_blk(), any()}),
+      From :: [label()],
+      Acc :: any(),
+      Blocks :: block_map(),
+      Result :: {block_map(), any()}.
+mapfold_blocks_rpo(Fun, From, Acc, Blocks) ->
+    Successors = rpo(From, Blocks),
+    foldl(fun(Lbl, A) ->
+                  mapfold_blocks_rpo_1(Fun, Lbl, A)
+          end, {Blocks, Acc}, Successors).
+
+mapfold_blocks_rpo_1(Fun, Lbl, {Blocks0, Acc0}) ->
+    Block0 = map_get(Lbl, Blocks0),
+    {Block, Acc} = Fun(Lbl, Block0, Acc0),
+    Blocks = Blocks0#{Lbl:=Block},
+    {Blocks, Acc}.
+
+-spec mapfold_instrs_rpo(Fun, From, Acc0, Blocks0) -> {Blocks,Acc} when
+      Fun :: fun((b_blk()|terminator(), any()) -> any()),
+      From :: [label()],
+      Acc0 :: any(),
+      Acc :: any(),
+      Blocks0 :: block_map(),
+      Blocks :: block_map().
+
+mapfold_instrs_rpo(Fun, From, Acc0, Blocks) ->
+    Top = rpo(From, Blocks),
+    mapfold_instrs_rpo_1(Top, Fun, Blocks, Acc0).
+
+-spec flatmapfold_instrs_rpo(Fun, From, Acc0, Blocks0) -> {Blocks,Acc} when
+      Fun :: fun((b_blk()|terminator(), any()) -> any()),
+      From :: [label()],
+      Acc0 :: any(),
+      Acc :: any(),
+      Blocks0 :: block_map(),
+      Blocks :: block_map().
+
+flatmapfold_instrs_rpo(Fun, From, Acc0, Blocks) ->
+    Top = rpo(From, Blocks),
+    flatmapfold_instrs_rpo_1(Top, Fun, Blocks, Acc0).
+
+-type fold_fun() :: fun((label(), b_blk(), any()) -> any()).
+
+%% fold_rpo(Fun, [Label], Acc0, Blocks) -> Acc.
+%%  Fold over all blocks a reverse postorder traversal of the block
+%%  graph; that is, first visit a block, then visit its successors.
+
+-spec fold_rpo(Fun, Acc0, Blocks) -> any() when
+      Fun :: fold_fun(),
+      Acc0 :: any(),
+      Blocks :: #{label():=b_blk()}.
+
+fold_rpo(Fun, Acc0, Blocks) ->
+    fold_rpo(Fun, [0], Acc0, Blocks).
+
+%% fold_rpo(Fun, [Label], Acc0, Blocks) -> Acc.  Fold over all blocks
+%%  reachable from a given set of labels in a reverse postorder
+%%  traversal of the block graph; that is, first visit a block, then
+%%  visit its successors.
+
+-spec fold_rpo(Fun, Labels, Acc0, Blocks) -> any() when
+      Fun :: fold_fun(),
+      Labels :: [label()],
+      Acc0 :: any(),
+      Blocks :: #{label():=b_blk()}.
+
+fold_rpo(Fun, From, Acc0, Blocks) ->
+    Top = rpo(From, Blocks),
+    fold_rpo_1(Top, Fun, Blocks, Acc0).
+
+%% fold_po(Fun, Acc0, Blocks) -> Acc.
+%%  Fold over all blocks in a postorder traversal of the block graph;
+%%  that is, first visit all successors of block, then the block
+%%  itself.
+
+-spec fold_po(Fun, Acc0, Blocks) -> any() when
+      Fun :: fold_fun(),
+      Acc0 :: any(),
+      Blocks :: #{label():=b_blk()}.
+
+%% fold_po(Fun, From, Acc0, Blocks) -> Acc.
+%%  Fold over the blocks reachable from the block numbers given
+%%  by From in a postorder traversal of the block graph.
+
+fold_po(Fun, Acc0, Blocks) ->
+    fold_po(Fun, [0], Acc0, Blocks).
+
+-spec fold_po(Fun, Labels, Acc0, Blocks) -> any() when
+      Fun :: fold_fun(),
+      Labels :: [label()],
+      Acc0 :: any(),
+      Blocks :: block_map().
+
+fold_po(Fun, From, Acc0, Blocks) ->
+    Top = reverse(rpo(From, Blocks)),
+    fold_rpo_1(Top, Fun, Blocks, Acc0).
+
+%% linearize(Blocks) -> [{BlockLabel,#b_blk{}}].
+%%  Linearize the intermediate representation of the code.
+%%  Unreachable blocks will be discarded, and phi nodes will
+%%  be adjusted so that they no longer refers to discarded
+%%  blocks or to blocks that no longer are predecessors of
+%%  the phi node block.
+
+-spec linearize(Blocks) -> Linear when
+      Blocks :: block_map(),
+      Linear :: [{label(),b_blk()}].
+
+linearize(Blocks) ->
+    Seen = cerl_sets:new(),
+    {Linear0,_} = linearize_1([0], Blocks, Seen, []),
+    Linear = fix_phis(Linear0, #{}),
+    Linear.
+
+-spec rpo(Blocks) -> [Label] when
+      Blocks :: block_map(),
+      Label :: label().
+
+rpo(Blocks) ->
+    rpo([0], Blocks).
+
+-spec rpo(From, Blocks) -> Labels when
+      From :: [label()],
+      Blocks :: block_map(),
+      Labels :: [label()].
+
+rpo(From, Blocks) ->
+    Seen = cerl_sets:new(),
+    {Ls,_} = rpo_1(From, Blocks, Seen, []),
+    Ls.
+
+-spec rename_vars(Rename, [label()], block_map()) -> block_map() when
+      Rename :: rename_map() | rename_proplist().
+
+rename_vars(Rename, From, Blocks) when is_list(Rename) ->
+    rename_vars(maps:from_list(Rename), From, Blocks);
+rename_vars(Rename, From, Blocks) when is_map(Rename)->
+    Top = rpo(From, Blocks),
+    Preds = cerl_sets:from_list(Top),
+    F = fun(#b_set{op=phi,args=Args0}=Set) ->
+                Args = rename_phi_vars(Args0, Preds, Rename),
+                Set#b_set{args=Args};
+           (#b_set{args=Args0}=Set) ->
+                Args = [rename_var(A, Rename) || A <- Args0],
+                Set#b_set{args=Args};
+           (#b_switch{arg=Bool}=Sw) ->
+                Sw#b_switch{arg=rename_var(Bool, Rename)};
+           (#b_br{bool=Bool}=Br) ->
+                Br#b_br{bool=rename_var(Bool, Rename)};
+           (#b_ret{arg=Arg}=Ret) ->
+                Ret#b_ret{arg=rename_var(Arg, Rename)}
+        end,
+    map_instrs_1(Top, F, Blocks).
+
+%% split_blocks(Predicate, Blocks0, Count0) -> {Blocks,Count}.
+%%  Call Predicate(Instruction) for each instruction in all
+%%  blocks. If Predicate/1 returns true, split the block
+%%  before this instruction.
+
+-spec split_blocks(Pred, Blocks0, Count0) -> {Blocks,Count} when
+      Pred :: fun((b_set()) -> boolean()),
+      Blocks :: block_map(),
+      Count0 :: beam_ssa:label(),
+      Blocks0 :: block_map(),
+      Blocks :: block_map(),
+      Count :: beam_ssa:label().
+
+split_blocks(P, Blocks, Count) ->
+    Ls = beam_ssa:rpo(Blocks),
+    split_blocks_1(Ls, P, Blocks, Count).
+
+-spec trim_unreachable(Blocks0) -> Blocks when
+      Blocks0 :: block_map(),
+      Blocks :: block_map().
+
+%% trim_unreachable(Blocks0) -> Blocks.
+%%  Remove all unreachable blocks. Adjust all phi nodes so
+%%  they don't refer to blocks that has been removed or no
+%%  no longer branch to the phi node in question.
+
+trim_unreachable(Blocks) ->
+    %% Could perhaps be optimized if there is any need.
+    maps:from_list(linearize(Blocks)).
+
+%% update_phi_labels([BlockLabel], Old, New, Blocks0) -> Blocks.
+%%  In the given blocks, replace label Old in with New in all
+%%  phi nodes. This is useful after merging or splitting
+%%  blocks.
+
+-spec update_phi_labels(From, Old, New, Blocks0) -> Blocks when
+      From :: [label()],
+      Old :: label(),
+      New :: label(),
+      Blocks0 :: block_map(),
+      Blocks :: block_map().
+
+update_phi_labels([L|Ls], Old, New, Blocks0) ->
+    case Blocks0 of
+        #{L:=#b_blk{is=[#b_set{op=phi}|_]=Is0}=Blk0} ->
+            Is = update_phi_labels_is(Is0, Old, New),
+            Blk = Blk0#b_blk{is=Is},
+            Blocks = Blocks0#{L:=Blk},
+            update_phi_labels(Ls, Old, New, Blocks);
+        #{L:=#b_blk{}} ->
+            %% No phi nodes in this block.
+            update_phi_labels(Ls, Old, New, Blocks0)
+    end;
+update_phi_labels([], _, _, Blocks) -> Blocks.
+
+-spec used(b_blk() | b_set() | terminator()) -> [var_name()].
+
+used(#b_blk{is=Is,last=Last}) ->
+    used_1([Last|Is], ordsets:new());
+used(#b_br{bool=#b_var{}=V}) ->
+    [V];
+used(#b_ret{arg=#b_var{}=V}) ->
+    [V];
+used(#b_set{op=phi,args=Args}) ->
+    ordsets:from_list([V || {#b_var{}=V,_} <- Args]);
+used(#b_set{args=Args}) ->
+    ordsets:from_list(used_args(Args));
+used(#b_switch{arg=#b_var{}=V}) ->
+    [V];
+used(_) -> [].
+
+-spec definitions(Blocks :: block_map()) -> definition_map().
+definitions(Blocks) ->
+    fold_instrs_rpo(fun(#b_set{ dst = Var }=I, Acc) ->
+                            Acc#{Var => I};
+                       (_Terminator, Acc) ->
+                            Acc
+                    end, [0], #{}, Blocks).
+
+-spec uses(Blocks :: block_map()) -> usage_map().
+uses(Blocks) ->
+    uses([0], Blocks).
+
+-spec uses(From, Blocks) -> usage_map() when
+      From :: [label()],
+      Blocks :: block_map().
+uses(From, Blocks) ->
+    fold_rpo(fun fold_uses_block/3, From, #{}, Blocks).
+
+fold_uses_block(Lbl, #b_blk{is=Is,last=Last}, UseMap0) ->
+    F = fun(I, UseMap) ->
+                foldl(fun(Var, Acc) ->
+                              Uses0 = maps:get(Var, Acc, []),
+                              Uses = [{Lbl, I} | Uses0],
+                              maps:put(Var, Uses, Acc)
+                      end, UseMap, used(I))
+        end,
+    F(Last, foldl(F, UseMap0, Is)).
+
+%%%
+%%% Internal functions.
+%%%
+
+is_commutative('and') -> true;
+is_commutative('or') -> true;
+is_commutative('xor') -> true;
+is_commutative('band') -> true;
+is_commutative('bor') -> true;
+is_commutative('bxor') -> true;
+is_commutative('+') -> true;
+is_commutative('*') -> true;
+is_commutative('=:=') -> true;
+is_commutative('==') -> true;
+is_commutative('=/=') -> true;
+is_commutative('/=') -> true;
+is_commutative(_) -> false.
+
+def_used_1([#b_blk{is=Is,last=Last}|Bs], Preds, Def0, UsedAcc) ->
+    {Def,Used} = def_used_is(Is, Preds, Def0, used(Last)),
+    case Used of
+        [] ->
+            def_used_1(Bs, Preds, Def, UsedAcc);
+        [_|_] ->
+            def_used_1(Bs, Preds, Def, [Used|UsedAcc])
+    end;
+def_used_1([], _Preds, Def0, UsedAcc) ->
+    Def = ordsets:from_list(Def0),
+    Used = umerge(UsedAcc),
+    {Def,Used}.
+
+def_used_is([#b_set{op=phi,dst=Dst,args=Args}|Is],
+            Preds, Def0, Used0) ->
+    Def = [Dst|Def0],
+    %% We must be careful to only include variables that will
+    %% be used when arriving from one of the predecessor blocks
+    %% in Preds.
+    Used1 = [V || {#b_var{}=V,L} <- Args, cerl_sets:is_element(L, Preds)],
+    Used = ordsets:union(ordsets:from_list(Used1), Used0),
+    def_used_is(Is, Preds, Def, Used);
+def_used_is([#b_set{dst=Dst}=I|Is], Preds, Def0, Used0) ->
+    Def = [Dst|Def0],
+    Used = ordsets:union(used(I), Used0),
+    def_used_is(Is, Preds, Def, Used);
+def_used_is([], _Preds, Def, Used) ->
+    {Def,Used}.
+
+def_1([#b_blk{is=Is}|Bs], Def0) ->
+    Def = def_is(Is, Def0),
+    def_1(Bs, Def);
+def_1([], Def) ->
+    ordsets:from_list(Def).
+
+def_is([#b_set{dst=Dst}|Is], Def) ->
+    def_is(Is, [Dst|Def]);
+def_is([], Def) -> Def.
+
+dominators_1([{L,Preds}|Ls], Df, Doms) ->
+    DomPreds = [map_get(P, Doms) || P <- Preds, is_map_key(P, Doms)],
+    Dom = [L|dom_intersection(DomPreds, Df)],
+    dominators_1(Ls, Df, Doms#{L=>Dom});
+dominators_1([], _Df, Doms) -> Doms.
+
+dom_intersection([S], _Df) ->
+    S;
+dom_intersection([S|Ss], Df) ->
+    dom_intersection(S, Ss, Df).
+
+dom_intersection(S1, [S2|Ss], Df) ->
+    dom_intersection(dom_intersection_1(S1, S2, Df), Ss, Df);
+dom_intersection(S, [], _Df) -> S.
+
+dom_intersection_1([E1|Es1]=Set1, [E2|Es2]=Set2, Df) ->
+    %% Blocks are numbered in the order they are found in
+    %% reverse postorder.
+    #{E1:=Df1,E2:=Df2} = Df,
+    if Df1 > Df2 ->
+            dom_intersection_1(Es1, Set2, Df);
+       Df2 > Df1 ->
+            dom_intersection_1(Es2, Set1, Df);  %switch arguments!
+       true ->                                  %Set1 == Set2
+            %% The common suffix of the sets is the intersection.
+            Set1
+    end.
+
+number([L|Ls], N) ->
+    [{L,N}|number(Ls, N+1)];
+number([], _) -> [].
+
+fold_rpo_1([L|Ls], Fun, Blocks, Acc0) ->
+    Block = map_get(L, Blocks),
+    Acc = Fun(L, Block, Acc0),
+    fold_rpo_1(Ls, Fun, Blocks, Acc);
+fold_rpo_1([], _, _, Acc) -> Acc.
+
+fold_instrs_rpo_1([L|Ls], Fun, Blocks, Acc0) ->
+    #b_blk{is=Is,last=Last} = map_get(L, Blocks),
+    Acc1 = foldl(Fun, Acc0, Is),
+    Acc = Fun(Last, Acc1),
+    fold_instrs_rpo_1(Ls, Fun, Blocks, Acc);
+fold_instrs_rpo_1([], _, _, Acc) -> Acc.
+
+mapfold_instrs_rpo_1([L|Ls], Fun, Blocks0, Acc0) ->
+    #b_blk{is=Is0,last=Last0} = Block0 = map_get(L, Blocks0),
+    {Is,Acc1} = mapfoldl(Fun, Acc0, Is0),
+    {Last,Acc} = Fun(Last0, Acc1),
+    Block = Block0#b_blk{is=Is,last=Last},
+    Blocks = Blocks0#{L:=Block},
+    mapfold_instrs_rpo_1(Ls, Fun, Blocks, Acc);
+mapfold_instrs_rpo_1([], _, Blocks, Acc) ->
+    {Blocks,Acc}.
+
+flatmapfold_instrs_rpo_1([L|Ls], Fun, Blocks0, Acc0) ->
+    #b_blk{is=Is0,last=Last0} = Block0 = map_get(L, Blocks0),
+    {Is,Acc1} = flatmapfoldl(Fun, Acc0, Is0),
+    {[Last],Acc} = Fun(Last0, Acc1),
+    Block = Block0#b_blk{is=Is,last=Last},
+    Blocks = Blocks0#{L:=Block},
+    flatmapfold_instrs_rpo_1(Ls, Fun, Blocks, Acc);
+flatmapfold_instrs_rpo_1([], _, Blocks, Acc) ->
+    {Blocks,Acc}.
+
+linearize_1([L|Ls], Blocks, Seen0, Acc0) ->
+    case cerl_sets:is_element(L, Seen0) of
+        true ->
+            linearize_1(Ls, Blocks, Seen0, Acc0);
+        false ->
+            Seen1 = cerl_sets:add_element(L, Seen0),
+            Block = map_get(L, Blocks),
+            Successors = successors(Block),
+            {Acc,Seen} = linearize_1(Successors, Blocks, Seen1, Acc0),
+            linearize_1(Ls, Blocks, Seen, [{L,Block}|Acc])
+    end;
+linearize_1([], _, Seen, Acc) ->
+    {Acc,Seen}.
+
+fix_phis([{L,Blk0}|Bs], S) ->
+    Blk = case Blk0 of
+              #b_blk{is=[#b_set{op=phi}|_]=Is0} ->
+                  Is = fix_phis_1(Is0, L, S),
+                  Blk0#b_blk{is=Is};
+              #b_blk{} ->
+                  Blk0
+          end,
+    Successors = successors(Blk),
+    [{L,Blk}|fix_phis(Bs, S#{L=>Successors})];
+fix_phis([], _) -> [].
+
+fix_phis_1([#b_set{op=phi,args=Args0}=I|Is], L, S) ->
+    Args = [{Val,Pred} || {Val,Pred} <- Args0,
+                          is_successor(L, Pred, S)],
+    [I#b_set{args=Args}|fix_phis_1(Is, L, S)];
+fix_phis_1(Is, _, _) -> Is.
+
+is_successor(L, Pred, S) ->
+    case S of
+        #{Pred:=Successors} ->
+            member(L, Successors);
+        #{} ->
+            %% This block has been removed.
+            false
+    end.
+
+rpo_1([L|Ls], Blocks, Seen0, Acc0) ->
+    case cerl_sets:is_element(L, Seen0) of
+        true ->
+            rpo_1(Ls, Blocks, Seen0, Acc0);
+        false ->
+            Block = map_get(L, Blocks),
+            Seen1 = cerl_sets:add_element(L, Seen0),
+            Successors = successors(Block),
+            {Acc,Seen} = rpo_1(Successors, Blocks, Seen1, Acc0),
+            rpo_1(Ls, Blocks, Seen, [L|Acc])
+    end;
+rpo_1([], _, Seen, Acc) ->
+    {Acc,Seen}.
+
+rename_var(#b_var{}=Old, Rename) ->
+    case Rename of
+        #{Old:=New} -> New;
+        #{} -> Old
+    end;
+rename_var(#b_remote{mod=Mod0,name=Name0}=Remote, Rename) ->
+    Mod = rename_var(Mod0, Rename),
+    Name = rename_var(Name0, Rename),
+    Remote#b_remote{mod=Mod,name=Name};
+rename_var(Old, _) -> Old.
+
+rename_phi_vars([{Var,L}|As], Preds, Ren) ->
+    case cerl_sets:is_element(L, Preds) of
+        true ->
+            [{rename_var(Var, Ren),L}|rename_phi_vars(As, Preds, Ren)];
+        false ->
+            [{Var,L}|rename_phi_vars(As, Preds, Ren)]
+    end;
+rename_phi_vars([], _, _) -> [].
+
+map_instrs_1([L|Ls], Fun, Blocks0) ->
+    #b_blk{is=Is0,last=Last0} = Blk0 = map_get(L, Blocks0),
+    Is = [Fun(I) || I <- Is0],
+    Last = Fun(Last0),
+    Blk = Blk0#b_blk{is=Is,last=Last},
+    Blocks = Blocks0#{L:=Blk},
+    map_instrs_1(Ls, Fun, Blocks);
+map_instrs_1([], _, Blocks) -> Blocks.
+
+flatmapfoldl(F, Accu0, [Hd|Tail]) ->
+    {R,Accu1} = F(Hd, Accu0),
+    {Rs,Accu2} = flatmapfoldl(F, Accu1, Tail),
+    {R++Rs,Accu2};
+flatmapfoldl(_, Accu, []) -> {[],Accu}.
+
+split_blocks_1([L|Ls], P, Blocks0, Count0) ->
+    #b_blk{is=Is0} = Blk = map_get(L, Blocks0),
+    case split_blocks_is(Is0, P, []) of
+        {yes,Bef,Aft} ->
+            NewLbl = Count0,
+            Count = Count0 + 1,
+            Br = #b_br{bool=#b_literal{val=true},succ=NewLbl,fail=NewLbl},
+            BefBlk = Blk#b_blk{is=Bef,last=Br},
+            NewBlk = Blk#b_blk{is=Aft},
+            Blocks1 = Blocks0#{L:=BefBlk,NewLbl=>NewBlk},
+            Successors = successors(NewBlk),
+            Blocks = update_phi_labels(Successors, L, NewLbl, Blocks1),
+            split_blocks_1([NewLbl|Ls], P, Blocks, Count);
+        no ->
+            split_blocks_1(Ls, P, Blocks0, Count0)
+    end;
+split_blocks_1([], _, Blocks, Count) ->
+    {Blocks,Count}.
+
+split_blocks_is([I|Is], P, []) ->
+    split_blocks_is(Is, P, [I]);
+split_blocks_is([I|Is], P, Acc) ->
+    case P(I) of
+        true ->
+            {yes,reverse(Acc),[I|Is]};
+        false ->
+            split_blocks_is(Is, P, [I|Acc])
+    end;
+split_blocks_is([], _, _) -> no.
+
+update_phi_labels_is([#b_set{op=phi,args=Args0}=I0|Is], Old, New) ->
+    Args = [{Arg,rename_label(Lbl, Old, New)} || {Arg,Lbl} <- Args0],
+    I = I0#b_set{args=Args},
+    [I|update_phi_labels_is(Is, Old, New)];
+update_phi_labels_is(Is, _, _) -> Is.
+
+rename_label(Old, Old, New) -> New;
+rename_label(Lbl, _Old, _New) -> Lbl.
+
+used_args([#b_var{}=V|As]) ->
+    [V|used_args(As)];
+used_args([#b_remote{mod=Mod,name=Name}|As]) ->
+    used_args([Mod,Name|As]);
+used_args([_|As]) ->
+    used_args(As);
+used_args([]) -> [].
+
+used_1([H|T], Used0) ->
+    Used = ordsets:union(used(H), Used0),
+    used_1(T, Used);
+used_1([], Used) -> Used.
diff --git a/lib/compiler/src/beam_ssa.hrl b/lib/compiler/src/beam_ssa.hrl
new file mode 100644
index 0000000000..fa76b08453
--- /dev/null
+++ b/lib/compiler/src/beam_ssa.hrl
@@ -0,0 +1,66 @@
+%%
+%% %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%
+%%
+
+-record(b_module, {anno=#{} :: beam_ssa:anno(),
+                   name :: module(),
+                   exports :: [{atom(),arity()}],
+                   attributes :: list(),
+                   body :: [beam_ssa:b_function()]}).
+-record(b_function, {anno=#{} :: beam_ssa:anno(),
+                     args :: [beam_ssa:b_var()],
+                     bs :: #{beam_ssa:label():=beam_ssa:b_blk()},
+                     cnt :: beam_ssa:label()}).
+
+-record(b_blk, {anno=#{} :: beam_ssa:anno(),
+                is :: [beam_ssa:b_set()],
+                last :: beam_ssa:terminator()}).
+-record(b_set, {anno=#{} :: beam_ssa:anno(),
+                dst=none :: 'none'|beam_ssa:b_var(),
+                op :: beam_ssa:op(),
+                args=[] :: [beam_ssa:argument()]}).
+
+%% Terminators.
+-record(b_ret, {anno=#{} :: beam_ssa:anno(),
+                arg :: beam_ssa:value()}).
+
+-record(b_br, {anno=#{},
+               bool :: beam_ssa:value(),
+               succ :: beam_ssa:label(),
+               fail :: beam_ssa:label()}).
+
+-record(b_switch, {anno=#{} :: beam_ssa:anno(),
+                   arg :: beam_ssa:value(),
+                   fail :: beam_ssa:label(),
+                   list :: [{beam_ssa:b_literal(),beam_ssa:label()}]}).
+
+%% Values.
+-record(b_var, {name :: beam_ssa:var_name()}).
+
+-record(b_literal, {val :: beam_ssa:literal_value()}).
+
+-record(b_remote, {mod   :: beam_ssa:value(),
+                   name  :: beam_ssa:value(),
+                   arity :: non_neg_integer()}).
+
+-record(b_local, {name  :: beam_ssa:b_literal(),
+                  arity :: non_neg_integer()}).
+
+%% If this block exists, it calls erlang:error(badarg).
+-define(BADARG_BLOCK, 1).
diff --git a/lib/compiler/src/beam_ssa_bsm.erl b/lib/compiler/src/beam_ssa_bsm.erl
new file mode 100644
index 0000000000..1ac9e6a3bb
--- /dev/null
+++ b/lib/compiler/src/beam_ssa_bsm.erl
@@ -0,0 +1,1050 @@
+%%
+%% %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%
+%%
+
+%%%
+%%% This pass optimizes bit syntax matching, and is centered around the concept
+%%% of "match context reuse" which is best explained through example. To put it
+%%% shortly we attempt to turn this:
+%%%
+%%%    <<0,B/bits>> = A,
+%%%    <<1,C/bits>> = B,
+%%%    <<D,_/bits>> = C,
+%%%    D.
+%%%
+%%% ... Into this:
+%%%
+%%%    <<0,1,D,_/bits>>=A,
+%%%    D.
+%%%
+%%% Which is much faster as it avoids the creation of intermediate terms. This
+%%% is especially noticeable in loops where such garbage is generated on each
+%%% iteration.
+%%%
+%%% The optimization itself is very simple and can be applied whenever there's
+%%% matching on the tail end of a binary; instead of creating a new binary and
+%%% starting a new match context on it, we reuse the match context used to
+%%% extract the tail and avoid the creation of both objects.
+%%%
+%%% The catch is that a match context isn't a proper type and nothing outside
+%%% of bit syntax match operations can handle them. We therefore need to make
+%%% sure that they never "leak" into other instructions, and most of the pass
+%%% revolves around getting around that limitation.
+%%%
+%%% Unlike most other passes we look at the whole module so we can combine
+%%% matches across function boundaries, greatly increasing the performance of
+%%% complex matches and loops.
+%%%
+
+-module(beam_ssa_bsm).
+
+-export([module/2, format_error/1]).
+
+-include("beam_ssa.hrl").
+
+-import(lists, [member/2, reverse/1, splitwith/2, map/2, foldl/3, mapfoldl/3,
+                nth/2, max/1, unzip/1]).
+
+-spec format_error(term()) -> nonempty_string().
+
+format_error(OptInfo) ->
+    format_opt_info(OptInfo).
+
+-spec module(Module, Options) -> Result when
+      Module :: beam_ssa:b_module(),
+      Options :: [compile:option()],
+      Result :: {ok, beam_ssa:b_module(), list()}.
+
+-define(PASS(N), {N,fun N/1}).
+
+module(#b_module{body=Fs0}=Module, Opts) ->
+    ModInfo = analyze_module(Module),
+
+    %% combine_matches is repeated after accept_context_args as the control
+    %% flow changes can enable further optimizations, as in the example below:
+    %%
+    %%    a(<<0,X/binary>>) -> a(X);
+    %%    a(A) when bit_size(A) =:= 52 -> bar;
+    %%    a(<<1,X/binary>>) -> X. %% Match context will be reused here when
+    %%                            %% when repeated.
+
+    {Fs, _} = compile:run_sub_passes(
+                [?PASS(combine_matches),
+                 ?PASS(accept_context_args),
+                 ?PASS(combine_matches),
+                 ?PASS(allow_context_passthrough),
+                 ?PASS(skip_outgoing_tail_extraction),
+                 ?PASS(annotate_context_parameters)],
+                {Fs0, ModInfo}),
+
+    Ws = case proplists:get_bool(bin_opt_info, Opts) of
+             true -> collect_opt_info(Fs);
+             false -> []
+         end,
+
+    {ok, Module#b_module{body=Fs}, Ws}.
+
+-type module_info() :: #{ func_id() => func_info() }.
+
+-type func_id() :: {Name :: atom(), Arity :: non_neg_integer()}.
+
+-type func_info() :: #{ has_bsm_ops => boolean(),
+                        parameters => [#b_var{}],
+                        parameter_info => #{ #b_var{} => param_info() } }.
+
+-type param_info() :: suitable_for_reuse |
+                      {Problem :: atom(), Where :: term()}.
+
+-spec analyze_module(#b_module{}) -> module_info().
+
+analyze_module(#b_module{body=Fs}) ->
+    foldl(fun(#b_function{args=Parameters}=F, I) ->
+                  FuncInfo = #{ has_bsm_ops => has_bsm_ops(F),
+                                parameters => Parameters,
+                                parameter_info => #{} },
+                  FuncId = get_fa(F),
+                  I#{ FuncId => FuncInfo }
+          end, #{}, Fs).
+
+has_bsm_ops(#b_function{bs=Blocks}) ->
+    hbo_blocks(maps:to_list(Blocks)).
+
+hbo_blocks([{_,#b_blk{is=Is}} | Blocks]) ->
+    case hbo_is(Is) of
+        false -> hbo_blocks(Blocks);
+        true -> true
+    end;
+hbo_blocks([]) ->
+    false.
+
+hbo_is([#b_set{op=bs_start_match} | _]) -> true;
+hbo_is([_I | Is]) -> hbo_is(Is);
+hbo_is([]) -> false.
+
+%% Checks whether it's legal to make a call with the given argument as a match
+%% context, returning the param_info() of the relevant parameter.
+-spec check_context_call(#b_set{}, Arg, CtxChain, ModInfo) -> param_info() when
+      Arg :: #b_var{},
+      CtxChain :: [#b_var{}],
+      ModInfo :: module_info().
+check_context_call(#b_set{args=Args}, Arg, CtxChain, ModInfo) ->
+    Aliases = [Arg | CtxChain],
+    ccc_1(Args, Arg, Aliases, ModInfo).
+
+ccc_1([#b_local{}=Call | Args], Ctx, Aliases, ModInfo) ->
+    %% Matching operations assume that their context isn't aliased (as in
+    %% pointer aliasing), so we must reject calls whose arguments contain more
+    %% than one reference to the context.
+    %%
+    %% TODO: Try to fall back to passing binaries in these cases. Partial reuse
+    %% is better than nothing.
+    UseCount = foldl(fun(Arg, C) ->
+                             case member(Arg, Aliases) of
+                                 true -> C + 1;
+                                 false -> C
+                             end
+                     end, 0, Args),
+    if
+        UseCount =:= 1 ->
+            #b_local{name=#b_literal{val=Name},arity=Arity} = Call,
+            Callee = {Name, Arity},
+
+            ParamInfo = funcinfo_get(Callee, parameter_info, ModInfo),
+            Parameters = funcinfo_get(Callee, parameters, ModInfo),
+            Parameter = nth(1 + arg_index(Ctx, Args), Parameters),
+
+            case maps:find(Parameter, ParamInfo) of
+                {ok, suitable_for_reuse} ->
+                    suitable_for_reuse;
+                {ok, Other} ->
+                    {unsuitable_call, {Call, Other}};
+                error ->
+                    {no_match_on_entry, Call}
+            end;
+        UseCount > 1 ->
+            {multiple_uses_in_call, Call}
+    end;
+ccc_1([#b_remote{}=Call | _Args], _Ctx, _CtxChain, _ModInfo) ->
+    {remote_call, Call};
+ccc_1([Fun | _Args], _Ctx, _CtxChain, _ModInfo) ->
+    %% TODO: It may be possible to support this in the future for locally
+    %% defined funs, including ones with free variables.
+    {fun_call, Fun}.
+
+%% Returns the index of Var in Args.
+arg_index(Var, Args) -> arg_index_1(Var, Args, 0).
+
+arg_index_1(Var, [Var | _Args], Index) -> Index;
+arg_index_1(Var, [_Arg | Args], Index) -> arg_index_1(Var, Args, Index + 1).
+
+is_tail_binary(#b_set{op=bs_match,args=[#b_literal{val=binary} | Rest]}) ->
+    member(#b_literal{val=all}, Rest);
+is_tail_binary(#b_set{op=bs_get_tail}) ->
+    true;
+is_tail_binary(_) ->
+    false.
+
+is_tail_binary(#b_var{}=Var, Defs) ->
+    case find_match_definition(Var, Defs) of
+        {ok, Def} -> is_tail_binary(Def);
+        _ -> false
+    end;
+is_tail_binary(_Literal, _Defs) ->
+    false.
+
+assert_match_context(#b_var{}=Var, Defs) ->
+    case maps:find(Var, Defs) of
+        {ok, #b_set{op=bs_match,args=[_,#b_var{}=Ctx|_]}} ->
+            assert_match_context(Ctx, Defs);
+        {ok, #b_set{op=bs_start_match}} ->
+            ok
+    end.
+
+find_match_definition(#b_var{}=Var, Defs) ->
+    case maps:find(Var, Defs) of
+        {ok, #b_set{op=bs_extract,args=[Ctx]}} -> maps:find(Ctx, Defs);
+        {ok, #b_set{op=bs_get_tail}=Def} -> {ok, Def};
+        _ -> error
+    end.
+
+%% Returns a list of all contexts that were used to extract Var.
+context_chain_of(#b_var{}=Var, Defs) ->
+    case maps:find(Var, Defs) of
+        {ok, #b_set{op=bs_match,args=[_,#b_var{}=Ctx|_]}} ->
+            [Ctx | context_chain_of(Ctx, Defs)];
+        {ok, #b_set{op=bs_get_tail,args=[Ctx]}} ->
+            [Ctx | context_chain_of(Ctx, Defs)];
+        {ok, #b_set{op=bs_extract,args=[Ctx]}} ->
+            [Ctx | context_chain_of(Ctx, Defs)];
+        _ ->
+            []
+    end.
+
+%% Grabs the match context used to produce the given variable.
+match_context_of(#b_var{}=Var, Defs) ->
+    Ctx = match_context_of_1(Var, Defs),
+    assert_match_context(Ctx, Defs),
+    Ctx.
+
+match_context_of_1(Var, Defs) ->
+    case maps:get(Var, Defs) of
+        #b_set{op=bs_extract,args=[#b_var{}=Ctx0]} ->
+            #b_set{op=bs_match,
+                   args=[_,#b_var{}=Ctx|_]} = maps:get(Ctx0, Defs),
+            Ctx;
+        #b_set{op=bs_get_tail,args=[#b_var{}=Ctx]} ->
+            Ctx
+    end.
+
+funcinfo_get(#b_function{}=F, Attribute, ModInfo) ->
+    funcinfo_get(get_fa(F), Attribute, ModInfo);
+funcinfo_get({_,_}=Key, Attribute, ModInfo) ->
+    FuncInfo = maps:get(Key, ModInfo),
+    maps:get(Attribute, FuncInfo).
+
+funcinfo_set(#b_function{}=F, Attribute, Value, ModInfo) ->
+    funcinfo_set(get_fa(F), Attribute, Value, ModInfo);
+funcinfo_set(Key, Attribute, Value, ModInfo) ->
+    FuncInfo = maps:put(Attribute, Value, maps:get(Key, ModInfo, #{})),
+    maps:put(Key, FuncInfo, ModInfo).
+
+get_fa(#b_function{ anno = Anno }) ->
+    {_,Name,Arity} = maps:get(func_info, Anno),
+    {Name,Arity}.
+
+%% Replaces matched-out binaries with aliases that are lazily converted to
+%% binary form when used, allowing us to keep the "match path" free of binary
+%% creation.
+
+-spec alias_matched_binaries(Blocks, Counter, AliasMap) -> Result when
+      Blocks :: beam_ssa:block_map(),
+      Counter :: non_neg_integer(),
+      AliasMap :: match_alias_map(),
+      Result :: {Blocks, Counter}.
+
+-type match_alias_map() ::
+        #{ Binary :: #b_var{} =>
+                     { %% Replace all uses of Binary with an alias after this
+                       %% label.
+                       AliasAfter :: beam_ssa:label(),
+                       %% The match context whose tail is equal to Binary.
+                       Context :: #b_var{} } }.
+
+%% Keeps track of the promotions we need to insert. They're partially keyed by
+%% location because they may not be valid on all execution paths and we may
+%% need to add redundant promotions in some cases.
+-type promotion_map() ::
+        #{ { PromoteAt :: beam_ssa:label(),
+             Variable :: #b_var{} } =>
+               Instruction :: #b_set{} }.
+
+-record(amb, { dominators :: beam_ssa:dominator_map(),
+               match_aliases :: match_alias_map(),
+               cnt :: non_neg_integer(),
+               promotions = #{} :: promotion_map() }).
+
+alias_matched_binaries(Blocks0, Counter, AliasMap) when AliasMap =/= #{} ->
+    {Dominators, _} = beam_ssa:dominators(Blocks0),
+    State0 = #amb{ dominators = Dominators,
+                   match_aliases = AliasMap,
+                   cnt = Counter },
+    {Blocks, State} = beam_ssa:mapfold_blocks_rpo(fun amb_1/3, [0], State0,
+                                                  Blocks0),
+    {amb_insert_promotions(Blocks, State), State#amb.cnt};
+alias_matched_binaries(Blocks, Counter, _AliasMap) ->
+    {Blocks, Counter}.
+
+amb_1(Lbl, #b_blk{is=Is0,last=Last0}=Block, State0) ->
+    {Is, State1} = mapfoldl(fun(I, State) ->
+                                    amb_assign_set(I, Lbl, State)
+                            end, State0, Is0),
+    {Last, State} = amb_assign_last(Last0, Lbl, State1),
+    {Block#b_blk{is=Is,last=Last}, State}.
+
+amb_assign_set(#b_set{op=phi,args=Args0}=I, _Lbl, State0) ->
+    %% Phi node aliases are relative to their source block, not their
+    %% containing block.
+    {Args, State} =
+        mapfoldl(fun({Arg0, Lbl}, Acc) ->
+                         {Arg, State} = amb_get_alias(Arg0, Lbl, Acc),
+                         {{Arg, Lbl}, State}
+                 end, State0, Args0),
+    {I#b_set{args=Args}, State};
+amb_assign_set(#b_set{args=Args0}=I, Lbl, State0) ->
+    {Args, State} = mapfoldl(fun(Arg0, Acc) ->
+                                     amb_get_alias(Arg0, Lbl, Acc)
+                             end, State0, Args0),
+    {I#b_set{args=Args}, State}.
+
+amb_assign_last(#b_ret{arg=Arg0}=T, Lbl, State0) ->
+    {Arg, State} = amb_get_alias(Arg0, Lbl, State0),
+    {T#b_ret{arg=Arg}, State};
+amb_assign_last(#b_switch{arg=Arg0}=T, Lbl, State0) ->
+    {Arg, State} = amb_get_alias(Arg0, Lbl, State0),
+    {T#b_switch{arg=Arg}, State};
+amb_assign_last(#b_br{bool=Arg0}=T, Lbl, State0) ->
+    {Arg, State} = amb_get_alias(Arg0, Lbl, State0),
+    {T#b_br{bool=Arg}, State}.
+
+amb_get_alias(#b_var{}=Arg, Lbl, State) ->
+    case maps:find(Arg, State#amb.match_aliases) of
+        {ok, {AliasAfter, Context}} ->
+            %% Our context may not have been created yet, so we skip assigning
+            %% an alias unless the given block is among our dominators.
+            Dominators = maps:get(Lbl, State#amb.dominators),
+            case member(AliasAfter, Dominators) of
+                true -> amb_create_alias(Arg, Context, Lbl, State);
+                false -> {Arg, State}
+            end;
+        error ->
+            {Arg, State}
+    end;
+amb_get_alias(#b_remote{mod=Mod0,name=Name0}=Arg0, Lbl, State0) ->
+    {Mod, State1} = amb_get_alias(Mod0, Lbl, State0),
+    {Name, State} = amb_get_alias(Name0, Lbl, State1),
+    Arg = Arg0#b_remote{mod=Mod,name=Name},
+    {Arg, State};
+amb_get_alias(Arg, _Lbl, State) ->
+    {Arg, State}.
+
+amb_create_alias(#b_var{}=Arg0, Context, Lbl, State0) ->
+    Dominators = maps:get(Lbl, State0#amb.dominators),
+    Promotions0 = State0#amb.promotions,
+
+    PrevPromotions =
+        [maps:get({Dom, Arg0}, Promotions0)
+         || Dom <- Dominators, is_map_key({Dom, Arg0}, Promotions0)],
+
+    case PrevPromotions of
+        [_|_] ->
+            %% We've already created an alias prior to this block, so we'll
+            %% grab the most recent one to minimize stack use.
+
+            #b_set{dst=Alias} = max(PrevPromotions),
+            {Alias, State0};
+        [] ->
+            %% If we haven't created an alias we need to do so now. The
+            %% promotion will be inserted later by amb_insert_promotions/2.
+
+            Counter = State0#amb.cnt,
+            Alias = #b_var{name={'@ssa_bsm_alias', Counter}},
+            Promotion = #b_set{op=bs_get_tail,dst=Alias,args=[Context]},
+
+            Promotions = maps:put({Lbl, Arg0}, Promotion, Promotions0),
+            State = State0#amb{ promotions=Promotions, cnt=Counter+1 },
+
+            {Alias, State}
+    end.
+
+amb_insert_promotions(Blocks0, State) ->
+    F = fun({Lbl, #b_var{}}, Promotion, Blocks) ->
+                Block = maps:get(Lbl, Blocks),
+
+                Alias = Promotion#b_set.dst,
+                {Before, After} = splitwith(
+                                    fun(#b_set{args=Args}) ->
+                                            not is_var_in_args(Alias, Args)
+                                    end, Block#b_blk.is),
+                Is = Before ++ [Promotion | After],
+
+                maps:put(Lbl, Block#b_blk{is=Is}, Blocks)
+        end,
+    maps:fold(F, Blocks0, State#amb.promotions).
+
+is_var_in_args(Var, [Var | _]) -> true;
+is_var_in_args(Var, [#b_remote{name=Var} | _]) -> true;
+is_var_in_args(Var, [#b_remote{mod=Var} | _]) -> true;
+is_var_in_args(Var, [_ | Args]) -> is_var_in_args(Var, Args);
+is_var_in_args(_Var, []) -> false.
+
+%%%
+%%% Subpasses
+%%%
+
+%% Removes superflous chained bs_start_match instructions in the same
+%% function. When matching on an extracted tail binary, or on a binary we've
+%% already matched on, we reuse the original match context.
+%%
+%% This pass runs first since it makes subsequent optimizations more effective
+%% by removing spots where promotion would be required.
+
+-type prior_match_map() ::
+        #{ Binary :: #b_var{} =>
+                     [{ %% The context and success label of a previous
+                        %% bs_start_match made on this binary.
+                        ValidAfter :: beam_ssa:label(),
+                        Context :: #b_var{} }] }.
+
+-record(cm, { definitions :: beam_ssa:definition_map(),
+              dominators :: beam_ssa:dominator_map(),
+              blocks :: beam_ssa:block_map(),
+              match_aliases = #{} :: match_alias_map(),
+              prior_matches = #{} :: prior_match_map(),
+              renames = #{} :: beam_ssa:rename_map() }).
+
+combine_matches({Fs0, ModInfo}) ->
+    Fs = map(fun(F) -> combine_matches(F, ModInfo) end, Fs0),
+    {Fs, ModInfo}.
+
+combine_matches(#b_function{bs=Blocks0,cnt=Counter0}=F, ModInfo) ->
+    case funcinfo_get(F, has_bsm_ops, ModInfo) of
+        true ->
+            {Dominators, _} = beam_ssa:dominators(Blocks0),
+            {Blocks1, State} =
+                beam_ssa:mapfold_blocks_rpo(
+                  fun(Lbl, #b_blk{is=Is0}=Block0, State0) ->
+                          {Is, State} = cm_1(Is0, [], Lbl, State0),
+                          {Block0#b_blk{is=Is}, State}
+                  end, [0],
+                  #cm{ definitions = beam_ssa:definitions(Blocks0),
+                       dominators = Dominators,
+                       blocks = Blocks0 },
+                  Blocks0),
+
+            Blocks2 = beam_ssa:rename_vars(State#cm.renames, [0], Blocks1),
+
+            {Blocks, Counter} = alias_matched_binaries(Blocks2, Counter0,
+                                                       State#cm.match_aliases),
+
+            F#b_function{ bs=Blocks, cnt=Counter };
+        false ->
+            F
+    end.
+
+cm_1([#b_set{ op=bs_start_match,
+              dst=Ctx,
+              args=[Src] },
+      #b_set{ op=succeeded,
+              dst=Bool,
+              args=[Ctx] }]=MatchSeq, Acc0, Lbl, State0) ->
+    Acc = reverse(Acc0),
+    case is_tail_binary(Src, State0#cm.definitions) of
+        true -> cm_combine_tail(Src, Ctx, Bool, Acc, State0);
+        false -> cm_handle_priors(Src, Ctx, Bool, Acc, MatchSeq, Lbl, State0)
+    end;
+cm_1([I | Is], Acc, Lbl, State) ->
+    cm_1(Is, [I | Acc], Lbl, State);
+cm_1([], Acc, _Lbl, State) ->
+    {reverse(Acc), State}.
+
+%% If we're dominated by at least one match on the same source, we can reuse
+%% the context created by that match.
+cm_handle_priors(Src, DstCtx, Bool, Acc, MatchSeq, Lbl, State0) ->
+    PriorCtxs = case maps:find(Src, State0#cm.prior_matches) of
+                    {ok, Priors} ->
+                        %% We've seen other match contexts on this source, but
+                        %% we can only consider the ones whose success path
+                        %% dominate us.
+                        Dominators = maps:get(Lbl, State0#cm.dominators, []),
+                        [Ctx || {ValidAfter, Ctx} <- Priors,
+                                member(ValidAfter, Dominators)];
+                    error ->
+                        []
+                end,
+    case PriorCtxs of
+        [Ctx|_] ->
+            Renames0 = State0#cm.renames,
+            Renames = Renames0#{ Bool => #b_literal{val=true}, DstCtx => Ctx },
+            {Acc, State0#cm{ renames = Renames }};
+        [] ->
+            %% Since we lack a prior match, we need to register this one in
+            %% case we dominate another.
+            State = cm_register_prior(Src, DstCtx, Lbl, State0),
+            {Acc ++ MatchSeq, State}
+    end.
+
+cm_register_prior(Src, DstCtx, Lbl, State) ->
+    Block = maps:get(Lbl, State#cm.blocks),
+    #b_br{succ=ValidAfter} = Block#b_blk.last,
+
+    Priors0 = maps:get(Src, State#cm.prior_matches, []),
+    Priors = [{ValidAfter, DstCtx} | Priors0],
+
+    PriorMatches = maps:put(Src, Priors, State#cm.prior_matches),
+    State#cm{ prior_matches = PriorMatches }.
+
+cm_combine_tail(Src, DstCtx, Bool, Acc, State0) ->
+    SrcCtx = match_context_of(Src, State0#cm.definitions),
+
+    %% We replace the source with a context alias as it normally won't be used
+    %% on the happy path after being matched, and the added cost of conversion
+    %% is negligible if it is.
+    Aliases = maps:put(Src, {0, SrcCtx}, State0#cm.match_aliases),
+
+    Renames0 = State0#cm.renames,
+    Renames = Renames0#{ Bool => #b_literal{val=true}, DstCtx => SrcCtx },
+
+    State = State0#cm{ match_aliases = Aliases, renames = Renames },
+
+    {Acc, State}.
+
+%% Lets functions accept match contexts as arguments. The parameter must be
+%% unused before the bs_start_match instruction, and it must be matched in the
+%% first block.
+
+-record(aca, { unused_parameters :: ordsets:ordset(#b_var{}),
+               counter :: non_neg_integer(),
+               parameter_info = #{} :: #{ #b_var{} => param_info() },
+               match_aliases = #{} :: match_alias_map() }).
+
+accept_context_args({Fs, ModInfo}) ->
+    mapfoldl(fun accept_context_args/2, ModInfo, Fs).
+
+accept_context_args(#b_function{bs=Blocks0}=F, ModInfo0) ->
+    case funcinfo_get(F, has_bsm_ops, ModInfo0) of
+        true ->
+            Parameters = ordsets:from_list(funcinfo_get(F, parameters, ModInfo0)),
+            State0 = #aca{ unused_parameters = Parameters,
+                           counter = F#b_function.cnt },
+
+            {Blocks1, State} = aca_1(Blocks0, State0),
+            {Blocks, Counter} = alias_matched_binaries(Blocks1,
+                                                       State#aca.counter,
+                                                       State#aca.match_aliases),
+
+            ModInfo = funcinfo_set(F, parameter_info, State#aca.parameter_info,
+                                   ModInfo0),
+
+            {F#b_function{bs=Blocks,cnt=Counter}, ModInfo};
+        false ->
+            {F, ModInfo0}
+    end.
+
+aca_1(Blocks, State) ->
+    %% We only handle block 0 as we don't yet support starting a match after a
+    %% test. This is generally good enough as the sys_core_bsm pass makes the
+    %% match instruction come first if possible, and it's rare for a function
+    %% to binary-match several parameters at once.
+    EntryBlock = maps:get(0, Blocks),
+    aca_enable_reuse(EntryBlock#b_blk.is, EntryBlock, Blocks, [], State).
+
+aca_enable_reuse([#b_set{op=bs_start_match,args=[Src]}=I0 | Rest],
+                 EntryBlock, Blocks0, Acc, State0) ->
+    case aca_is_reuse_safe(Src, State0) of
+        true ->
+            {I, Last, Blocks1, State} =
+                aca_reuse_context(I0, EntryBlock, Blocks0, State0),
+
+            Is = reverse([I|Acc]) ++ Rest,
+            Blocks = maps:put(0, EntryBlock#b_blk{is=Is,last=Last}, Blocks1),
+
+            {Blocks, State};
+        false ->
+            {Blocks0, State0}
+    end;
+aca_enable_reuse([I | Is], EntryBlock, Blocks, Acc, State0) ->
+    UnusedParams0 = State0#aca.unused_parameters,
+    case ordsets:intersection(UnusedParams0, beam_ssa:used(I)) of
+        [] ->
+            aca_enable_reuse(Is, EntryBlock, Blocks, [I | Acc], State0);
+        PrematureUses ->
+            UnusedParams = ordsets:subtract(UnusedParams0, PrematureUses),
+
+            %% Mark the offending parameters as unsuitable for context reuse.
+            ParamInfo = foldl(fun(A, Ps) ->
+                                      maps:put(A, {used_before_match, I}, Ps)
+                              end, State0#aca.parameter_info, PrematureUses),
+
+            State = State0#aca{ unused_parameters = UnusedParams,
+                                parameter_info = ParamInfo },
+            aca_enable_reuse(Is, EntryBlock, Blocks, [I | Acc], State)
+    end;
+aca_enable_reuse([], _EntryBlock, Blocks, _Acc, State) ->
+    {Blocks, State}.
+
+aca_is_reuse_safe(Src, State) ->
+    %% Context reuse is unsafe unless all uses are dominated by the start_match
+    %% instruction. Since we only process block 0 it's enough to check if
+    %% they're unused so far.
+    ordsets:is_element(Src, State#aca.unused_parameters).
+
+aca_reuse_context(#b_set{dst=Dst, args=[Src]}=I0, Block, Blocks0, State0) ->
+    %% When matching fails on a reused context it needs to be converted back
+    %% to a binary. We only need to do this on the success path since it can't
+    %% be a context on the type failure path, but it's very common for these
+    %% to converge which requires special handling.
+    {State1, Last, Blocks} =
+        aca_handle_convergence(Src, State0, Block#b_blk.last, Blocks0),
+
+    Aliases = maps:put(Src, {Last#b_br.succ, Dst}, State1#aca.match_aliases),
+    ParamInfo = maps:put(Src, suitable_for_reuse, State1#aca.parameter_info),
+
+    State = State1#aca{ match_aliases = Aliases,
+                        parameter_info = ParamInfo },
+
+    I = beam_ssa:add_anno(accepts_match_contexts, true, I0),
+
+    {I, Last, Blocks, State}.
+
+aca_handle_convergence(Src, State0, Last0, Blocks0) ->
+    #b_br{fail=Fail0,succ=Succ0} = Last0,
+
+    SuccPath = beam_ssa:rpo([Succ0], Blocks0),
+    FailPath = beam_ssa:rpo([Fail0], Blocks0),
+
+    %% The promotion logic in alias_matched_binaries breaks down if the source
+    %% is used after the fail/success paths converge, as we have no way to tell
+    %% whether the source is a match context or something else past that point.
+    %%
+    %% We could handle this through clever insertion of phi nodes but it's
+    %% far simpler to copy either branch in its entirety. It doesn't matter
+    %% which one as long as they become disjoint.
+    ConvergedPaths = ordsets:intersection(
+                       ordsets:from_list(SuccPath),
+                       ordsets:from_list(FailPath)),
+
+    case maps:is_key(Src, beam_ssa:uses(ConvergedPaths, Blocks0)) of
+        true ->
+            case shortest(SuccPath, FailPath) of
+                left ->
+                    {Succ, Blocks, Counter} =
+                        aca_copy_successors(Succ0, Blocks0, State0#aca.counter),
+                    State = State0#aca{ counter = Counter },
+                    {State, Last0#b_br{succ=Succ}, Blocks};
+                right ->
+                    {Fail, Blocks, Counter} =
+                        aca_copy_successors(Fail0, Blocks0, State0#aca.counter),
+                    State = State0#aca{ counter = Counter },
+                    {State, Last0#b_br{fail=Fail}, Blocks}
+            end;
+        false ->
+            {State0, Last0, Blocks0}
+    end.
+
+shortest([_|As], [_|Bs]) -> shortest(As, Bs);
+shortest([], _) -> left;
+shortest(_, []) -> right.
+
+%% Copies all successor blocks of Lbl, returning the label to the entry block
+%% of this copy. Since the copied blocks aren't referenced anywhere else, they
+%% are all guaranteed to be dominated by Lbl.
+aca_copy_successors(Lbl0, Blocks0, Counter0) ->
+    %% Building the block rename map up front greatly simplifies phi node
+    %% handling.
+    Path = beam_ssa:rpo([Lbl0], Blocks0),
+    {BRs, Counter1} = aca_cs_build_brs(Path, Counter0, #{}),
+    {Blocks, Counter} = aca_cs_1(Path, Blocks0, Counter1, #{}, BRs, #{}),
+    Lbl = maps:get(Lbl0, BRs),
+    {Lbl, Blocks, Counter}.
+
+aca_cs_build_brs([?BADARG_BLOCK=Lbl | Path], Counter, Acc) ->
+    %% ?BADARG_BLOCK is a marker and not an actual block, so renaming it will
+    %% break exception handling.
+    aca_cs_build_brs(Path, Counter, Acc#{ Lbl => Lbl });
+aca_cs_build_brs([Lbl | Path], Counter0, Acc) ->
+    aca_cs_build_brs(Path, Counter0 + 1, Acc#{ Lbl => Counter0 });
+aca_cs_build_brs([], Counter, Acc) ->
+    {Acc, Counter}.
+
+aca_cs_1([Lbl0 | Path], Blocks, Counter0, VRs0, BRs, Acc0) ->
+    Block0 = maps:get(Lbl0, Blocks),
+    Lbl = maps:get(Lbl0, BRs),
+    {VRs, Block, Counter} = aca_cs_block(Block0, Counter0, VRs0, BRs),
+    Acc = maps:put(Lbl, Block, Acc0),
+    aca_cs_1(Path, Blocks, Counter, VRs, BRs, Acc);
+aca_cs_1([], Blocks, Counter, _VRs, _BRs, Acc) ->
+    {maps:merge(Blocks, Acc), Counter}.
+
+aca_cs_block(#b_blk{is=Is0,last=Last0}=Block0, Counter0, VRs0, BRs) ->
+    {VRs, Is, Counter} = aca_cs_is(Is0, Counter0, VRs0, BRs, []),
+    Last = aca_cs_last(Last0, VRs, BRs),
+    Block = Block0#b_blk{is=Is,last=Last},
+    {VRs, Block, Counter}.
+
+aca_cs_is([#b_set{op=Op,
+                  dst=Dst0,
+                  args=Args0}=I0 | Is],
+          Counter0, VRs0, BRs, Acc) ->
+    Args = case Op of
+               phi -> aca_cs_args_phi(Args0, VRs0, BRs);
+               _ -> aca_cs_args(Args0, VRs0)
+           end,
+    Counter = Counter0 + 1,
+    Dst = #b_var{name={'@ssa_bsm_aca',Counter}},
+    I = I0#b_set{dst=Dst,args=Args},
+    VRs = maps:put(Dst0, Dst, VRs0),
+    aca_cs_is(Is, Counter, VRs, BRs, [I | Acc]);
+aca_cs_is([], Counter, VRs, _BRs, Acc) ->
+    {VRs, reverse(Acc), Counter}.
+
+aca_cs_last(#b_switch{arg=Arg0,list=Switch0,fail=Fail0}=Sw, VRs, BRs) ->
+    Switch = [{Literal, maps:get(Lbl, BRs)} || {Literal, Lbl} <- Switch0],
+    Sw#b_switch{arg=aca_cs_arg(Arg0, VRs),
+                fail=maps:get(Fail0, BRs),
+                list=Switch};
+aca_cs_last(#b_br{bool=Arg0,succ=Succ0,fail=Fail0}=Br, VRs, BRs) ->
+    Br#b_br{bool=aca_cs_arg(Arg0, VRs),
+            succ=maps:get(Succ0, BRs),
+            fail=maps:get(Fail0, BRs)};
+aca_cs_last(#b_ret{arg=Arg0}=Ret, VRs, _BRs) ->
+    Ret#b_ret{arg=aca_cs_arg(Arg0, VRs)}.
+
+aca_cs_args_phi([{Arg, Lbl} | Args], VRs, BRs) ->
+    case BRs of
+        #{ Lbl := New } ->
+            [{aca_cs_arg(Arg, VRs), New} | aca_cs_args_phi(Args, VRs, BRs)];
+        #{} ->
+            aca_cs_args_phi(Args, VRs, BRs)
+    end;
+aca_cs_args_phi([], _VRs, _BRs) ->
+    [].
+
+aca_cs_args([Arg | Args], VRs) ->
+    [aca_cs_arg(Arg, VRs) | aca_cs_args(Args, VRs)];
+aca_cs_args([], _VRs) ->
+    [].
+
+aca_cs_arg(#b_remote{mod=Mod0,name=Name0}=Rem, VRs) ->
+    Mod = aca_cs_arg(Mod0, VRs),
+    Name = aca_cs_arg(Name0, VRs),
+    Rem#b_remote{mod=Mod,name=Name};
+aca_cs_arg(Arg, VRs) ->
+    case VRs of
+        #{ Arg := New } -> New;
+        #{} -> Arg
+    end.
+
+%% Allows contexts to pass through "wrapper functions" where the context is
+%% passed directly to a function that accepts match contexts (including other
+%% wrappers).
+%%
+%% This does not alter the function in any way, it only changes parameter info
+%% so that skip_outgoing_tail_extraction is aware that it's safe to pass
+%% contexts to us.
+
+allow_context_passthrough({Fs, ModInfo0}) ->
+    ModInfo =
+        acp_forward_params([{F, beam_ssa:uses(F#b_function.bs)} || F <- Fs],
+                           ModInfo0),
+    {Fs, ModInfo}.
+
+acp_forward_params(FsUses, ModInfo0) ->
+    F = fun({#b_function{args=Parameters}=Func, UseMap}, ModInfo) ->
+                ParamInfo =
+                    foldl(fun(Param, ParamInfo) ->
+                                  Uses = maps:get(Param, UseMap, []),
+                                  acp_1(Param, Uses, ModInfo, ParamInfo)
+                          end,
+                          funcinfo_get(Func, parameter_info, ModInfo),
+                          Parameters),
+                funcinfo_set(Func, parameter_info, ParamInfo, ModInfo)
+        end,
+    %% Allowing context passthrough on one function may make it possible to
+    %% enable it on another, so it needs to be repeated for maximum effect.
+    case foldl(F, ModInfo0, FsUses) of
+        ModInfo0 -> ModInfo0;
+        Changed -> acp_forward_params(FsUses, Changed)
+    end.
+
+%% We have no way to know if an argument is a context, so it's only safe to
+%% forward them if they're passed exactly once in the first block. Any other
+%% uses are unsafe, including function_clause errors.
+acp_1(Param, [{0, #b_set{op=call}=I}], ModInfo, ParamInfo) ->
+    %% We don't need to provide a context chain as our callers make sure that
+    %% multiple arguments never reference the same context.
+    case check_context_call(I, Param, [], ModInfo) of
+        {no_match_on_entry, _} -> ParamInfo;
+        Other -> maps:put(Param, Other, ParamInfo)
+    end;
+acp_1(_Param, _Uses, _ModInfo, ParamInfo) ->
+    ParamInfo.
+
+%% This is conceptually similar to combine_matches but operates across
+%% functions. Whenever a tail binary is passed to a parameter that accepts
+%% match contexts we'll pass the context instead, improving performance by
+%% avoiding the creation of a new match context in the callee.
+%%
+%% We also create an alias to delay extraction until it's needed as an actual
+%% binary, which is often rare on the happy path. The cost of being wrong is
+%% negligible (`bs_test_unit + bs_get_tail` vs `bs_get_binary`) so we're
+%% applying it unconditionally to keep things simple.
+
+-record(sote, { definitions :: beam_ssa:definition_map(),
+                mod_info :: module_info(),
+                match_aliases = #{} :: match_alias_map() }).
+
+skip_outgoing_tail_extraction({Fs0, ModInfo}) ->
+    Fs = map(fun(F) -> skip_outgoing_tail_extraction(F, ModInfo) end, Fs0),
+    {Fs, ModInfo}.
+
+skip_outgoing_tail_extraction(#b_function{bs=Blocks0}=F, ModInfo) ->
+    case funcinfo_get(F, has_bsm_ops, ModInfo) of
+        true ->
+            State0 = #sote{ definitions = beam_ssa:definitions(Blocks0),
+                            mod_info = ModInfo },
+
+            {Blocks1, State} = beam_ssa:mapfold_instrs_rpo(
+                                 fun sote_rewrite_calls/2, [0], State0, Blocks0),
+
+            {Blocks, Counter} = alias_matched_binaries(Blocks1,
+                                                       F#b_function.cnt,
+                                                       State#sote.match_aliases),
+
+            F#b_function{bs=Blocks,cnt=Counter};
+        false ->
+            F
+    end.
+
+sote_rewrite_calls(#b_set{op=call,args=Args}=Call, State) ->
+    sote_rewrite_call(Call, Args, [], State);
+sote_rewrite_calls(I, State) ->
+    {I, State}.
+
+sote_rewrite_call(Call, [], ArgsOut, State) ->
+    {Call#b_set{args=reverse(ArgsOut)}, State};
+sote_rewrite_call(Call0, [Arg | ArgsIn], ArgsOut, State0) ->
+    case is_tail_binary(Arg, State0#sote.definitions) of
+        true ->
+            CtxChain = context_chain_of(Arg, State0#sote.definitions),
+            case check_context_call(Call0, Arg, CtxChain, State0#sote.mod_info) of
+                suitable_for_reuse ->
+                    Ctx = match_context_of(Arg, State0#sote.definitions),
+
+                    MatchAliases0 = State0#sote.match_aliases,
+                    MatchAliases = maps:put(Arg, {0, Ctx}, MatchAliases0),
+                    State = State0#sote{ match_aliases = MatchAliases },
+
+                    Call = beam_ssa:add_anno(bsm_info, context_reused, Call0),
+                    sote_rewrite_call(Call, ArgsIn, [Ctx | ArgsOut], State);
+                Other ->
+                    Call = beam_ssa:add_anno(bsm_info, Other, Call0),
+                    sote_rewrite_call(Call, ArgsIn, [Arg | ArgsOut], State0)
+            end;
+        false ->
+            sote_rewrite_call(Call0, ArgsIn, [Arg | ArgsOut], State0)
+    end.
+
+%% Adds parameter_type_info annotations to help the validator determine whether
+%% our optimizations were safe.
+
+annotate_context_parameters({Fs, ModInfo}) ->
+    mapfoldl(fun annotate_context_parameters/2, ModInfo, Fs).
+
+annotate_context_parameters(F, ModInfo) ->
+    ParamInfo = funcinfo_get(F, parameter_info, ModInfo),
+    TypeAnno0 = beam_ssa:get_anno(parameter_type_info, F, #{}),
+    TypeAnno = maps:fold(fun(K, _V, Acc) when is_map_key(K, Acc) ->
+                                 %% Assertion.
+                                 error(conflicting_parameter_types);
+                            (K, suitable_for_reuse, Acc) ->
+                                 T = beam_validator:type_anno(match_context),
+                                 Acc#{ K => T };
+                            (_K, _V, Acc) ->
+                                 Acc
+                         end, TypeAnno0, ParamInfo),
+    {beam_ssa:add_anno(parameter_type_info, TypeAnno, F), ModInfo}.
+
+%%%
+%%% +bin_opt_info
+%%%
+
+collect_opt_info(Fs) ->
+    foldl(fun(#b_function{bs=Blocks}=F, Acc0) ->
+                  UseMap = beam_ssa:uses(Blocks),
+                  Where = beam_ssa:get_anno(location, F, []),
+                  beam_ssa:fold_instrs_rpo(
+                    fun(I, Acc) ->
+                            collect_opt_info_1(I, Where, UseMap, Acc)
+                    end, [0], Acc0, Blocks)
+          end, [], Fs).
+
+collect_opt_info_1(#b_set{op=Op,anno=Anno,dst=Dst}=I, Where, UseMap, Acc0) ->
+    case is_tail_binary(I) of
+        true when Op =:= bs_match ->
+            %% The uses include when the context is passed raw, so we discard
+            %% everything but the bs_extract instruction to limit warnings to
+            %% unoptimized uses.
+            Uses0 = maps:get(Dst, UseMap, []),
+            case [E || {_, #b_set{op=bs_extract}=E} <- Uses0] of
+                [Use] -> add_unopt_binary_info(Use, false, Where, UseMap, Acc0);
+                [] -> Acc0
+            end;
+        true ->
+            %% Add a warning for each use. Note that we don't do anything
+            %% special if unused as a later pass will remove this instruction
+            %% anyway.
+            Uses = maps:get(Dst, UseMap, []),
+            foldl(fun({_Lbl, Use}, Acc) ->
+                          add_unopt_binary_info(Use, false, Where, UseMap, Acc)
+                  end, Acc0, Uses);
+        false ->
+            add_opt_info(Anno, Where, Acc0)
+    end;
+collect_opt_info_1(#b_ret{anno=Anno}, Where, _UseMap, Acc) ->
+    add_opt_info(Anno, Where, Acc);
+collect_opt_info_1(_I, _Where, _Uses, Acc) ->
+    Acc.
+
+add_opt_info(Anno, Where, Acc) ->
+    case maps:find(bsm_info, Anno) of
+        {ok, Term} -> [make_warning(Term, Anno, Where) | Acc];
+        error -> Acc
+    end.
+
+%% When an alias is promoted we need to figure out where it goes to ignore
+%% warnings for compiler-generated things, and provide more useful warnings in
+%% general.
+%%
+%% We track whether the binary has been used to build another term because it
+%% can be helpful when there's no line information.
+
+add_unopt_binary_info(#b_set{op=Follow,dst=Dst}, _Nested, Where, UseMap, Acc0)
+  when Follow =:= put_tuple;
+       Follow =:= put_list;
+       Follow =:= put_map ->
+    %% Term-building instructions.
+    {_, Uses} = unzip(maps:get(Dst, UseMap, [])),
+    foldl(fun(Use, Acc) ->
+                  add_unopt_binary_info(Use, true, Where, UseMap, Acc)
+          end, Acc0, Uses);
+add_unopt_binary_info(#b_set{op=Follow,dst=Dst}, Nested, Where, UseMap, Acc0)
+  when Follow =:= bs_extract;
+       Follow =:= phi ->
+    %% Non-building instructions that need to be followed.
+    {_, Uses} = unzip(maps:get(Dst, UseMap, [])),
+    foldl(fun(Use, Acc) ->
+                  add_unopt_binary_info(Use, Nested, Where, UseMap, Acc)
+          end, Acc0, Uses);
+add_unopt_binary_info(#b_set{op=call,
+                             args=[#b_remote{mod=#b_literal{val=erlang},
+                                             name=#b_literal{val=error}} |
+                                   _Ignored]},
+                      _Nested, _Where, _UseMap, Acc) ->
+    %% There's no nice way to tell compiler-generated exceptions apart from
+    %% user ones so we ignore them all. I doubt anyone cares.
+    Acc;
+add_unopt_binary_info(#b_switch{anno=Anno}=I, Nested, Where, _UseMap, Acc) ->
+    [make_promotion_warning(I, Nested, Anno, Where) | Acc];
+add_unopt_binary_info(#b_set{anno=Anno}=I, Nested, Where, _UseMap, Acc) ->
+    [make_promotion_warning(I, Nested, Anno, Where) | Acc];
+add_unopt_binary_info(#b_ret{anno=Anno}=I, Nested, Where, _UseMap, Acc) ->
+    [make_promotion_warning(I, Nested, Anno, Where) | Acc];
+add_unopt_binary_info(#b_br{anno=Anno}=I, Nested, Where, _UseMap, Acc) ->
+    [make_promotion_warning(I, Nested, Anno, Where) | Acc].
+
+make_promotion_warning(I, Nested, Anno, Where) ->
+    make_warning({binary_created, I, Nested}, Anno, Where).
+
+make_warning(Term, Anno, Where) ->
+    {File, Line} = maps:get(location, Anno, Where),
+    {File,[{Line,?MODULE,Term}]}.
+
+format_opt_info(context_reused) ->
+    "OPTIMIZED: match context reused";
+format_opt_info({binary_created, _, _}=Promotion) ->
+    io_lib:format("BINARY CREATED: ~s", [format_opt_info_1(Promotion)]);
+format_opt_info(Other) ->
+    io_lib:format("NOT OPTIMIZED: ~s", [format_opt_info_1(Other)]).
+
+format_opt_info_1({binary_created, #b_set{op=call,args=[Call|_]}, false}) ->
+    io_lib:format("binary is used in call to ~s which doesn't support "
+                  "context reuse", [format_call(Call)]);
+format_opt_info_1({binary_created, #b_set{op=call,args=[Call|_]}, true}) ->
+    io_lib:format("binary is used in term passed to ~s",
+                  [format_call(Call)]);
+format_opt_info_1({binary_created, #b_set{op={bif, BIF},args=Args}, false}) ->
+    io_lib:format("binary is used in ~p/~p which doesn't support context "
+                  "reuse", [BIF, length(Args)]);
+format_opt_info_1({binary_created, #b_set{op={bif, BIF},args=Args}, true}) ->
+    io_lib:format("binary is used in term passed to ~p/~p",
+                  [BIF, length(Args)]);
+format_opt_info_1({binary_created, #b_set{op=Op}, false}) ->
+    io_lib:format("binary is used in '~p' which doesn't support context "
+                  "reuse", [Op]);
+format_opt_info_1({binary_created, #b_set{op=Op}, true}) ->
+    io_lib:format("binary is used in term passed to '~p'", [Op]);
+format_opt_info_1({binary_created, #b_ret{}, false}) ->
+    io_lib:format("binary is returned from the function", []);
+format_opt_info_1({binary_created, #b_ret{}, true}) ->
+    io_lib:format("binary is used in a term that is returned from the "
+                  "function", []);
+format_opt_info_1({unsuitable_call, {Call, Inner}}) ->
+    io_lib:format("binary used in call to ~s, where ~s",
+                  [format_call(Call), format_opt_info_1(Inner)]);
+format_opt_info_1({remote_call, Call}) ->
+    io_lib:format("binary is used in remote call to ~s", [format_call(Call)]);
+format_opt_info_1({fun_call, Call}) ->
+    io_lib:format("binary is used in fun call (~s)",
+                  [format_call(Call)]);
+format_opt_info_1({multiple_uses_in_call, Call}) ->
+    io_lib:format("binary is passed as multiple arguments to ~s",
+                  [format_call(Call)]);
+format_opt_info_1({no_match_on_entry, Call}) ->
+    io_lib:format("binary is used in call to ~s which does not begin with a "
+                  "suitable binary match", [format_call(Call)]);
+format_opt_info_1({used_before_match, #b_set{op=call,args=[Call|_]}}) ->
+    io_lib:format("binary is used in call to ~s before being matched",
+                  [format_call(Call)]);
+format_opt_info_1({used_before_match, #b_set{op={bif, BIF},args=Args}}) ->
+    io_lib:format("binary is used in ~p/~p before being matched",
+                  [BIF, length(Args)]);
+format_opt_info_1({used_before_match, #b_set{op=phi}}) ->
+    io_lib:format("binary is returned from an expression before being "
+                  "matched", []);
+format_opt_info_1({used_before_match, #b_set{op=Op}}) ->
+    io_lib:format("binary is used in '~p' before being matched",[Op]);
+format_opt_info_1(Term) ->
+    io_lib:format("~w", [Term]).
+
+format_call(#b_local{name=#b_literal{val=F},arity=A}) ->
+    io_lib:format("~p/~p", [F, A]);
+format_call(#b_remote{mod=#b_literal{val=M},name=#b_literal{val=F},arity=A}) ->
+    io_lib:format("~p:~p/~p", [M, F, A]);
+format_call(Fun) ->
+    io_lib:format("~p", [Fun]).
diff --git a/lib/compiler/src/beam_ssa_codegen.erl b/lib/compiler/src/beam_ssa_codegen.erl
new file mode 100644
index 0000000000..08641e2abc
--- /dev/null
+++ b/lib/compiler/src/beam_ssa_codegen.erl
@@ -0,0 +1,2098 @@
+%%
+%% %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%
+%%
+%% Purpose: Generate BEAM assembly code from the SSA format.
+
+-module(beam_ssa_codegen).
+
+-export([module/2]).
+-export([classify_heap_need/2]).    %Called from beam_ssa_pre_codegen.
+
+-export_type([ssa_register/0]).
+
+-include("beam_ssa.hrl").
+
+-import(lists, [foldl/3,keymember/3,keysort/2,last/1,map/2,mapfoldl/3,
+                reverse/1,reverse/2,sort/1,splitwith/2,takewhile/2]).
+
+-record(cg, {lcount=1 :: beam_label(),          %Label counter
+	     functable=#{} :: #{fa()=>beam_label()},
+             labels=#{} :: #{ssa_label()=>0|beam_label()},
+             used_labels=gb_sets:empty() :: gb_sets:set(ssa_label()),
+             regs=#{} :: #{beam_ssa:var_name()=>ssa_register()},
+             ultimate_fail=1 :: beam_label(),
+             catches=gb_sets:empty() :: gb_sets:set(ssa_label())
+             }).
+
+-spec module(beam_ssa:b_module(), [compile:option()]) ->
+                    {'ok',beam_asm:module_code()}.
+
+module(#b_module{name=Mod,exports=Es,attributes=Attrs,body=Fs}, _Opts) ->
+    {Asm,St} = functions(Fs, {atom,Mod}),
+    {ok,{Mod,Es,Attrs,Asm,St#cg.lcount}}.
+
+-record(need, {h=0 :: non_neg_integer(),
+               f=0 :: non_neg_integer()}).
+
+-record(cg_blk, {anno=#{} :: anno(),
+                 is=[] :: [instruction()],
+                 last :: terminator()}).
+
+-record(cg_set, {anno=#{} :: anno(),
+                 dst :: b_var(),
+                 op :: beam_ssa:op(),
+                 args :: [beam_ssa:argument() | xreg()]}).
+
+-record(cg_alloc, {anno=#{} :: anno(),
+                   stack=none :: 'none' | pos_integer(),
+                   words=#need{} :: #need{},
+                   live :: 'undefined' | pos_integer(),
+                   def_yregs=[] :: [yreg()]
+                  }).
+
+-record(cg_br, {bool :: beam_ssa:value(),
+                succ :: ssa_label(),
+                fail :: ssa_label()
+               }).
+-record(cg_ret, {arg :: cg_value(),
+                 dealloc=none :: 'none' | pos_integer()
+                }).
+-record(cg_switch, {arg :: cg_value(),
+                    fail :: ssa_label(),
+                    list :: [sw_list_item()]
+                   }).
+
+-type fa() :: {beam_asm:function_name(),arity()}.
+-type ssa_label() :: beam_ssa:label().
+-type beam_label() :: beam_asm:label().
+
+-type anno() :: beam_ssa:anno().
+
+-type b_var() :: beam_ssa:b_var().
+-type b_literal() :: beam_ssa:b_literal().
+
+-type cg_value() :: beam_ssa:value() | xreg().
+
+-type cg_set() :: #cg_set{}.
+-type cg_alloc() :: #cg_alloc{}.
+
+-type instruction() :: cg_set() | cg_alloc().
+
+-type cg_br() :: #cg_br{}.
+-type cg_ret() :: #cg_ret{}.
+-type cg_switch() :: #cg_switch{}.
+-type terminator() :: cg_br() | cg_ret() | cg_switch().
+
+-type sw_list_item() :: {b_literal(),ssa_label()}.
+
+-type reg_num() :: beam_asm:reg_num().
+-type xreg() :: {'x',reg_num()}.
+-type yreg() :: {'y',reg_num()}.
+
+-type ssa_register() :: xreg() | yreg() | {'fr',reg_num()} | {'z',reg_num()}.
+
+functions(Forms, AtomMod) ->
+    mapfoldl(fun (F, St) -> function(F, AtomMod, St) end,
+             #cg{lcount=1}, Forms).
+
+function(#b_function{anno=Anno,bs=Blocks}, AtomMod, St0) ->
+    #{func_info:={_,Name,Arity}} = Anno,
+    try
+        assert_badarg_block(Blocks),            %Assertion.
+        Regs = maps:get(registers, Anno),
+        St1 = St0#cg{labels=#{},used_labels=gb_sets:empty(),
+                     regs=Regs},
+        {Fi,St2} = new_label(St1),              %FuncInfo label
+        {Entry,St3} = local_func_label(Name, Arity, St2),
+        {Ult,St4} = new_label(St3),             %Ultimate failure
+        Labels = (St4#cg.labels)#{0=>Entry,?BADARG_BLOCK=>0},
+        St5 = St4#cg{labels=Labels,used_labels=gb_sets:singleton(Entry),
+                     ultimate_fail=Ult},
+        {Body,St} = cg_fun(Blocks, St5),
+        Asm = [{label,Fi},line(Anno),
+               {func_info,AtomMod,{atom,Name},Arity}] ++
+               add_parameter_annos(Body, Anno) ++
+               [{label,Ult},if_end],
+        Func = {function,Name,Arity,Entry,Asm},
+        {Func,St}
+    catch
+        Class:Error:Stack ->
+            io:fwrite("Function: ~w/~w\n", [Name,Arity]),
+            erlang:raise(Class, Error, Stack)
+    end.
+
+assert_badarg_block(Blocks) ->
+    %% Assertion: ?BADARG_BLOCK must be the call erlang:error(badarg).
+    case Blocks of
+        #{?BADARG_BLOCK:=Blk} ->
+            #b_blk{is=[#b_set{op=call,dst=Ret,
+                              args=[#b_remote{mod=#b_literal{val=erlang},
+                                              name=#b_literal{val=error}},
+                                    #b_literal{val=badarg}]}],
+                   last=#b_ret{arg=Ret}} = Blk,
+            ok;
+        #{} ->
+            %% ?BADARG_BLOCK has been removed because it was never used.
+            ok
+    end.
+
+add_parameter_annos([{label, _}=Entry | Body], Anno) ->
+    ParamInfo = maps:get(parameter_type_info, Anno, #{}),
+    Annos = maps:fold(
+        fun(K, V, Acc) when is_map_key(K, ParamInfo) ->
+                TypeInfo = maps:get(K, ParamInfo),
+                [{'%', {type_info, V, TypeInfo}} | Acc];
+           (_K, _V, Acc) ->
+                Acc
+        end, [], maps:get(registers, Anno)),
+    [Entry | sort(Annos)] ++ Body.
+
+cg_fun(Blocks, St0) ->
+    Linear0 = linearize(Blocks),
+    St = collect_catch_labels(Linear0, St0),
+    Linear1 = need_heap(Linear0),
+    Linear2 = prefer_xregs(Linear1, St),
+    Linear3 = liveness(Linear2, St),
+    Linear4 = defined(Linear3, St),
+    Linear = opt_allocate(Linear4, St),
+    cg_linear(Linear, St).
+
+%% collect_catch_labels(Linear, St) -> St.
+%%  Collect all catch labels (labels for blocks that begin
+%%  with 'landingpad' instructions) for later use.
+
+collect_catch_labels(Linear, St) ->
+    Labels = collect_catch_labels_1(Linear),
+    St#cg{catches=gb_sets:from_list(Labels)}.
+
+collect_catch_labels_1([{L,#cg_blk{is=[#cg_set{op=landingpad}|_]}}|Bs]) ->
+    [L|collect_catch_labels_1(Bs)];
+collect_catch_labels_1([_|Bs]) ->
+    collect_catch_labels_1(Bs);
+collect_catch_labels_1([]) -> [].
+
+%% need_heap([{BlockLabel,Block]) -> [{BlockLabel,Block}].
+%%  Insert need_heap instructions in the instruction list. Try to be smart and
+%%  collect them together as much as possible.
+
+need_heap(Bs0) ->
+    Bs1 = need_heap_allocs(Bs0, #{}),
+    {Bs,#need{h=0,f=0}} = need_heap_blks(reverse(Bs1), #need{}, []),
+    Bs.
+
+need_heap_allocs([{L,#cg_blk{is=Is0,last=Terminator}=Blk0}|Bs], Counts0) ->
+    Next = next_block(Bs),
+    Successors = successors(Terminator),
+    Counts = foldl(fun(S, Cnts) ->
+                           case Cnts of
+                               #{S:=C} -> Cnts#{S:=C+1};
+                               #{} when S =:= Next -> Cnts#{S=>1};
+                               #{} -> Cnts#{S=>42}
+                           end
+                   end, Counts0, Successors),
+    case Counts of
+        #{L:=1} ->
+            [{L,Blk0}|need_heap_allocs(Bs, Counts)];
+        #{L:=_} ->
+            %% This block has multiple predecessors. Force an allocation
+            %% in this block so that the predecessors don't need to do
+            %% an allocation on behalf of this block.
+            Is = case need_heap_never(Is0) of
+                     true -> Is0;
+                     false -> [#cg_alloc{}|Is0]
+                 end,
+            Blk = Blk0#cg_blk{is=Is},
+            [{L,Blk}|need_heap_allocs(Bs, Counts)];
+        #{} ->
+            [{L,Blk0}|need_heap_allocs(Bs, Counts)]
+    end;
+need_heap_allocs([], _) -> [].
+
+need_heap_never([#cg_alloc{}|_]) -> true;
+need_heap_never([#cg_set{op=recv_next}|_]) -> true;
+need_heap_never([#cg_set{op=wait}|_]) -> true;
+need_heap_never(_) -> false.
+
+need_heap_blks([{L,#cg_blk{is=Is0}=Blk0}|Bs], H0, Acc) ->
+    {Is1,H1} = need_heap_is(reverse(Is0), H0, []),
+    {Ns,H} = need_heap_terminator(Bs, L, H1),
+    Is = Ns ++ Is1,
+    Blk = Blk0#cg_blk{is=Is},
+    need_heap_blks(Bs, H, [{L,Blk}|Acc]);
+need_heap_blks([], H, Acc) ->
+    {Acc,H}.
+
+need_heap_is([#cg_alloc{words=Words}=Alloc0|Is], N, Acc) ->
+    Alloc = Alloc0#cg_alloc{words=add_heap_words(N, Words)},
+    need_heap_is(Is, #need{}, [Alloc|Acc]);
+need_heap_is([#cg_set{anno=Anno,op=bs_init}=I0|Is], N, Acc) ->
+    Alloc = case need_heap_need(N) of
+                [#cg_alloc{words=Need}] -> alloc(Need);
+                [] -> 0
+            end,
+    I = I0#cg_set{anno=Anno#{alloc=>Alloc}},
+    need_heap_is(Is, #need{}, [I|Acc]);
+need_heap_is([#cg_set{op=Op,args=Args}=I|Is], N, Acc) ->
+    case classify_heap_need(Op, Args) of
+        {put,Words} ->
+            %% Pass through adding to needed heap.
+            need_heap_is(Is, add_heap_words(N, Words), [I|Acc]);
+        put_float ->
+            need_heap_is(Is, add_heap_float(N), [I|Acc]);
+        neutral ->
+            need_heap_is(Is, N, [I|Acc]);
+        gc ->
+            need_heap_is(Is, #need{}, [I]++need_heap_need(N)++Acc)
+    end;
+need_heap_is([], N, Acc) ->
+    {Acc,N}.
+
+need_heap_terminator([{_,#cg_blk{last=#cg_br{succ=L,fail=L}}}|_], L, N) ->
+    %% Fallthrough.
+    {[],N};
+need_heap_terminator([{_,#cg_blk{is=Is,last=#cg_br{succ=L}}}|_], L, N) ->
+    case need_heap_need(N) of
+        [] ->
+            {[],#need{}};
+        [_|_]=Alloc ->
+            %% If the preceding instructions are a binary construction,
+            %% hoist the allocation and incorporate into the bs_init
+            %% instruction.
+            case reverse(Is) of
+                [#cg_set{op=succeeded},#cg_set{op=bs_init}|_] ->
+                    {[],N};
+                [#cg_set{op=bs_put}|_] ->
+                    {[],N};
+                _ ->
+                    %% Not binary construction. Must emit an allocation
+                    %% instruction in this block.
+                    {Alloc,#need{}}
+            end
+    end;
+need_heap_terminator([{_,#cg_blk{}}|_], _, N) ->
+    {need_heap_need(N),#need{}};
+need_heap_terminator([], _, H) ->
+    {need_heap_need(H),#need{}}.
+
+need_heap_need(#need{h=0,f=0}) -> [];
+need_heap_need(#need{}=N) -> [#cg_alloc{words=N}].
+
+add_heap_words(#need{h=H1,f=F1}, #need{h=H2,f=F2}) ->
+    #need{h=H1+H2,f=F1+F2};
+add_heap_words(#need{h=Heap}=N, Words) when is_integer(Words) ->
+    N#need{h=Heap+Words}.
+
+add_heap_float(#need{f=F}=N) ->
+    N#need{f=F+1}.
+
+%% classify_heap_need(Operation, Arguments) ->
+%%        gc | neutral | {put,Words} | put_float.
+%%  Classify the heap need for this instruction. The return
+%%  values have the following meaning.
+%%
+%%  {put,Words} means that the instruction will use Words words to build
+%%  something on the heap.
+%%
+%%  'put_float' means that the instruction will build one floating point
+%%  number on the heap.
+%%
+%%  'gc' means that that the instruction can potentially do a GC or throw an
+%%  exception. That means that an allocation instruction for any building
+%%  must be placed after this instruction.
+%%
+%%  'neutral' means that the instruction does nothing to disturb the heap.
+
+-spec classify_heap_need(beam_ssa:op(), [beam_ssa:value()]) ->
+                                'gc' | 'neutral' |
+                                {'put',non_neg_integer()} | 'put_float'.
+
+classify_heap_need(put_list, _) ->
+    {put,2};
+classify_heap_need(put_tuple_arity, [#b_literal{val=Words}]) ->
+    {put,Words+1};
+classify_heap_need(put_tuple, Elements) ->
+    {put,length(Elements)+1};
+classify_heap_need({bif,Name}, Args) ->
+    case is_gc_bif(Name, Args) of
+        false -> neutral;
+        true -> gc
+    end;
+classify_heap_need({float,Op}, _Args) ->
+    case Op of
+        get -> put_float;
+        _ -> neutral
+    end;
+classify_heap_need(Name, _Args) ->
+    classify_heap_need(Name).
+
+%% classify_heap_need(Operation) -> gc | neutral.
+%%  Return either 'gc' or 'neutral'.
+%%
+%%  'gc' means that that the instruction can potentially do a GC or throw an
+%%  exception. That means that an allocation instruction for any building
+%%  must be placed after this instruction.
+%%
+%%  'neutral' means that the instruction does nothing to disturb the heap.
+%%
+%%  Note: Only handle operations in this function that are not handled
+%%  by classify_heap_need/2.
+
+classify_heap_need(bs_add) -> gc;
+classify_heap_need(bs_get) -> gc;
+classify_heap_need(bs_get_tail) -> gc;
+classify_heap_need(bs_init) -> gc;
+classify_heap_need(bs_init_writable) -> gc;
+classify_heap_need(bs_match_string) -> gc;
+classify_heap_need(bs_put) -> neutral;
+classify_heap_need(bs_restore) -> neutral;
+classify_heap_need(bs_save) -> neutral;
+classify_heap_need(bs_get_position) -> gc;
+classify_heap_need(bs_set_position) -> neutral;
+classify_heap_need(bs_skip) -> gc;
+classify_heap_need(bs_start_match) -> neutral;
+classify_heap_need(bs_test_tail) -> neutral;
+classify_heap_need(bs_utf16_size) -> neutral;
+classify_heap_need(bs_utf8_size) -> neutral;
+classify_heap_need(build_stacktrace) -> gc;
+classify_heap_need(call) -> gc;
+classify_heap_need(catch_end) -> gc;
+classify_heap_need(copy) -> neutral;
+classify_heap_need(extract) -> gc;
+classify_heap_need(get_hd) -> neutral;
+classify_heap_need(get_map_element) -> neutral;
+classify_heap_need(get_tl) -> neutral;
+classify_heap_need(get_tuple_element) -> neutral;
+classify_heap_need(has_map_field) -> neutral;
+classify_heap_need(is_nonempty_list) -> neutral;
+classify_heap_need(is_tagged_tuple) -> neutral;
+classify_heap_need(kill_try_tag) -> gc;
+classify_heap_need(landingpad) -> gc;
+classify_heap_need(make_fun) -> gc;
+classify_heap_need(new_try_tag) -> gc;
+classify_heap_need(peek_message) -> gc;
+classify_heap_need(put_map) -> gc;
+classify_heap_need(put_tuple_elements) -> neutral;
+classify_heap_need(raw_raise) -> gc;
+classify_heap_need(recv_next) -> gc;
+classify_heap_need(remove_message) -> neutral;
+classify_heap_need(resume) -> gc;
+classify_heap_need(set_tuple_element) -> gc;
+classify_heap_need(succeeded) -> neutral;
+classify_heap_need(timeout) -> gc;
+classify_heap_need(wait) -> gc;
+classify_heap_need(wait_timeout) -> gc.
+
+%%%
+%%% Because beam_ssa_pre_codegen has inserted 'copy' instructions to copy
+%%% variables that must be saved on the stack, a value can for some time
+%%% be in both an X register and a Y register.
+%%%
+%%% Here we will keep track of variables that have the same value and
+%%% rewrite instructions to use the variable that refers to the X
+%%% register instead of the Y register. That could improve performance,
+%%% since the BEAM interpreter have more optimized instructions
+%%% operating on X registers than on Y registers.
+%%%
+%%% 'call' and 'make_fun' are handled somewhat specially. If a value
+%%% already is in the correct X register, the X register will always
+%%% be used instead of the Y register. However, if there are one or more
+%%% values in the wrong X registers, the X registers variables will be
+%%% used only if that does not cause more 'move' instructions to be
+%%% be emitted than if the Y register variables were used.
+%%%
+%%% Here are some examples. The first example shows how a 'move' from
+%%% an Y register is eliminated:
+%%%
+%%%     move x0 y1
+%%%     move y1 x0   %%Will be eliminated.
+%%%
+%%%     call f/1
+%%%
+%%% Here is an example when x0 and x1 must be swapped to load the argument
+%%% registers. Here the 'call' instruction will use the Y registers to
+%%% avoid introducing an extra 'move' insruction:
+%%%
+%%%     move x0 y0
+%%%     move x1 y1
+%%%
+%%%     move y0 x1
+%%%     move y1 x0
+%%%
+%%%     call f/2
+%%%
+%%% Using the X register to load the argument registers would need
+%%% an extra 'move' instruction like this:
+%%%
+%%%     move x0 y0
+%%%     move x1 y1
+%%%
+%%%     move x1 x2
+%%%     move x0 x1
+%%%     move x2 x0
+%%%
+%%%     call f/2
+%%%
+
+prefer_xregs(Linear, St) ->
+    prefer_xregs(Linear, St, #{0=>#{}}).
+
+prefer_xregs([{L,#cg_blk{is=Is0,last=Last0}=Blk0}|Bs], St, Map0) ->
+    Copies0 = maps:get(L, Map0),
+    {Is,Copies} = prefer_xregs_is(Is0, St, Copies0, []),
+    Last = prefer_xregs_terminator(Last0, Copies, St),
+    Blk = Blk0#cg_blk{is=Is,last=Last},
+    Successors = successors(Last),
+    Map = prefer_xregs_successors(Successors, Copies, Map0),
+    [{L,Blk}|prefer_xregs(Bs, St, Map)];
+prefer_xregs([], _St, _Map) -> [].
+
+prefer_xregs_successors([L|Ls], Copies0, Map0) ->
+    case Map0 of
+        #{L:=Copies1} ->
+            Copies = merge_copies(Copies0, Copies1),
+            Map = Map0#{L:=Copies},
+            prefer_xregs_successors(Ls, Copies0, Map);
+        #{} ->
+            Map = Map0#{L=>Copies0},
+            prefer_xregs_successors(Ls, Copies0, Map)
+    end;
+prefer_xregs_successors([], _, Map) -> Map.
+
+prefer_xregs_is([#cg_alloc{}=I|Is], St, Copies0, Acc) ->
+    Copies = case I of
+                 #cg_alloc{stack=none,words=#need{h=0,f=0}} ->
+                     Copies0;
+                 #cg_alloc{} ->
+                     #{}
+             end,
+    prefer_xregs_is(Is, St, Copies, [I|Acc]);
+prefer_xregs_is([#cg_set{op=copy,dst=Dst,args=[Src]}=I|Is], St, Copies0, Acc) ->
+    Copies1 = prefer_xregs_prune(I, Copies0, St),
+    Copies = case beam_args([Src,Dst], St) of
+                 [Same,Same] -> Copies1;
+                 [_,_] -> Copies1#{Dst=>Src}
+             end,
+    prefer_xregs_is(Is, St, Copies, [I|Acc]);
+prefer_xregs_is([#cg_set{op=call,dst=Dst}=I0|Is], St, Copies, Acc) ->
+    I = prefer_xregs_call(I0, Copies, St),
+    prefer_xregs_is(Is, St, #{Dst=>{x,0}}, [I|Acc]);
+prefer_xregs_is([#cg_set{op=make_fun,dst=Dst}=I0|Is], St, Copies, Acc) ->
+    I = prefer_xregs_call(I0, Copies, St),
+    prefer_xregs_is(Is, St, #{Dst=>{x,0}}, [I|Acc]);
+prefer_xregs_is([#cg_set{op=set_tuple_element}=I|Is], St, Copies, Acc) ->
+    %% FIXME: HiPE translates the following code segment incorrectly:
+    %%     {call_ext,3,{extfunc,erlang,setelement,3}}.
+    %%     {move,{x,0},{y,3}}.
+    %%     {set_tuple_element,{y,1},{y,3},1}.
+    %% Therefore, skip the translation of the arguments for set_tuple_element.
+    prefer_xregs_is(Is, St, Copies, [I|Acc]);
+prefer_xregs_is([#cg_set{args=Args0}=I0|Is], St, Copies0, Acc) ->
+    Args = [do_prefer_xreg(A, Copies0, St) || A <- Args0],
+    I = I0#cg_set{args=Args},
+    Copies = prefer_xregs_prune(I, Copies0, St),
+    prefer_xregs_is(Is, St, Copies, [I|Acc]);
+prefer_xregs_is([], _St, Copies, Acc) ->
+    {reverse(Acc),Copies}.
+
+prefer_xregs_terminator(#cg_br{bool=Arg0}=I, Copies, St) ->
+    Arg = do_prefer_xreg(Arg0, Copies, St),
+    I#cg_br{bool=Arg};
+prefer_xregs_terminator(#cg_ret{arg=Arg0}=I, Copies, St) ->
+    Arg = do_prefer_xreg(Arg0, Copies, St),
+    I#cg_ret{arg=Arg};
+prefer_xregs_terminator(#cg_switch{arg=Arg0}=I, Copies, St) ->
+    Arg = do_prefer_xreg(Arg0, Copies, St),
+    I#cg_switch{arg=Arg}.
+
+prefer_xregs_prune(#cg_set{anno=#{clobbers:=true}}, _, _) ->
+    #{};
+prefer_xregs_prune(#cg_set{dst=Dst}, Copies, St) ->
+    DstReg = beam_arg(Dst, St),
+    F = fun(_, Alias) ->
+                beam_arg(Alias, St) =/= DstReg
+        end,
+    maps:filter(F, Copies).
+
+%% prefer_xregs_call(Instruction, Copies, St) -> Instruction.
+%%  Given a 'call' or 'make_fun' instruction, minimize the number
+%%  of 'move' instructions to set up the argument registers.
+%%  Prefer using X registers over Y registers, unless that will
+%%  result in more 'move' instructions.
+
+prefer_xregs_call(#cg_set{args=[_]}=I, _Copies, _St) ->
+    I;
+prefer_xregs_call(#cg_set{args=[F|Args0]}=I, Copies, St) ->
+    case Args0 of
+        [A0] ->
+            %% Only one argument. Always prefer the X register
+            %% if available.
+            A = do_prefer_xreg(A0, Copies, St),
+            I#cg_set{args=[F,A]};
+        [_|_] ->
+            %% Two or more arguments. Try rewriting arguments in
+            %% two ways and see which way produces the least
+            %% number of 'move' instructions.
+            Args1 = prefer_xregs_call_1(Args0, Copies, 0, St),
+            Args2 = [do_prefer_xreg(A, Copies, St) || A <- Args0],
+            case {count_moves(Args1, St),count_moves(Args2, St)} of
+                {N1,N2} when N1 < N2 ->
+                    %% There will be fewer 'move' instructions if
+                    %% we keep using Y registers.
+                    I#cg_set{args=[F|Args1]};
+                {_,_} ->
+                    %% Always use the values in X registers.
+                    I#cg_set{args=[F|Args2]}
+            end
+    end.
+
+count_moves(Args, St) ->
+    length(setup_args(beam_args(Args, St))).
+
+prefer_xregs_call_1([#b_var{}=A|As], Copies, X, St) ->
+    case {beam_arg(A, St),Copies} of
+        {{y,_},#{A:=Other}} ->
+            case beam_arg(Other, St) of
+                {x,X} ->
+                    %% This value is already in the correct X register.
+                    %% It is always benefical to use the X register variable.
+                    [Other|prefer_xregs_call_1(As, Copies, X+1, St)];
+                _ ->
+                    %% This value is another X register. Keep using
+                    %% the Y register variable.
+                    [A|prefer_xregs_call_1(As, Copies, X+1, St)]
+            end;
+        {_,_} ->
+            %% The value is not available in an X register.
+            [A|prefer_xregs_call_1(As, Copies, X+1, St)]
+    end;
+prefer_xregs_call_1([A|As], Copies, X, St) ->
+    [A|prefer_xregs_call_1(As, Copies, X+1, St)];
+prefer_xregs_call_1([], _, _, _) -> [].
+
+do_prefer_xreg(#b_var{}=A, Copies, St) ->
+    case {beam_arg(A, St),Copies} of
+        {{y,_},#{A:=Copy}} ->
+            Copy;
+        {_,_} ->
+            A
+    end;
+do_prefer_xreg(A, _, _) -> A.
+
+merge_copies(Copies0, Copies1) when map_size(Copies0) =< map_size(Copies1) ->
+    maps:filter(fun(K, V) ->
+                        case Copies1 of
+                            #{K:=V} -> true;
+                            #{} -> false
+                        end
+                end, Copies0);
+merge_copies(Copies0, Copies1) ->
+    merge_copies(Copies1, Copies0).
+
+
+%%%
+%%% Add annotations for the number of live registers.
+%%%
+
+liveness(Linear, #cg{regs=Regs}) ->
+    liveness(reverse(Linear), #{}, Regs, []).
+
+liveness([{L,#cg_blk{is=Is0,last=Last0}=Blk0}|Bs], LiveMap0, Regs, Acc) ->
+    Successors = liveness_successors(Last0),
+    Live0 = ordsets:union([liveness_get(S, LiveMap0) || S <- Successors]),
+    Live1 = liveness_terminator(Last0, Live0),
+    {Is,Live} = liveness_is(reverse(Is0), Regs, Live1, []),
+    LiveMap = LiveMap0#{L=>Live},
+    Blk = Blk0#cg_blk{is=Is},
+    liveness(Bs, LiveMap, Regs, [{L,Blk}|Acc]);
+liveness([], _LiveMap, _Regs, Acc) -> Acc.
+
+liveness_get(S, LiveMap) ->
+    case LiveMap of
+        #{S:=Live} -> Live;
+        #{} -> []
+    end.
+
+liveness_successors(Terminator) ->
+    successors(Terminator) -- [?BADARG_BLOCK].
+
+liveness_is([#cg_alloc{}=I0|Is], Regs, Live, Acc) ->
+    I = I0#cg_alloc{live=num_live(Live, Regs)},
+    liveness_is(Is, Regs, Live, [I|Acc]);
+liveness_is([#cg_set{dst=Dst,args=Args}=I0|Is], Regs, Live0, Acc) ->
+    Live1 = liveness_clobber(I0, Live0, Regs),
+    I1 = liveness_yregs_anno(I0, Live1, Regs),
+    Live2 = liveness_args(Args, Live1),
+    Live = ordsets:del_element(Dst, Live2),
+    I = liveness_anno(I1, Live, Regs),
+    liveness_is(Is, Regs, Live, [I|Acc]);
+liveness_is([], _, Live, Acc) ->
+    {Acc,Live}.
+
+liveness_terminator(#cg_br{bool=Arg}, Live) ->
+    liveness_terminator_1(Arg, Live);
+liveness_terminator(#cg_switch{arg=Arg}, Live) ->
+    liveness_terminator_1(Arg, Live);
+liveness_terminator(#cg_ret{arg=Arg}, Live) ->
+    liveness_terminator_1(Arg, Live).
+
+liveness_terminator_1(#b_var{}=V, Live) ->
+    ordsets:add_element(V, Live);
+liveness_terminator_1(#b_literal{}, Live) ->
+    Live;
+liveness_terminator_1(Reg, Live) ->
+    _ = verify_beam_register(Reg),
+    ordsets:add_element(Reg, Live).
+
+liveness_args([#b_var{}=V|As], Live) ->
+    liveness_args(As, ordsets:add_element(V, Live));
+liveness_args([#b_remote{mod=Mod,name=Name}|As], Live) ->
+    liveness_args([Mod,Name|As], Live);
+liveness_args([A|As], Live) ->
+    case is_beam_register(A) of
+        true ->
+            liveness_args(As, ordsets:add_element(A, Live));
+        false ->
+            liveness_args(As, Live)
+    end;
+liveness_args([], Live) -> Live.
+
+liveness_anno(#cg_set{op=Op}=I, Live, Regs) ->
+    case need_live_anno(Op) of
+        true ->
+            NumLive = num_live(Live, Regs),
+            Anno = (I#cg_set.anno)#{live=>NumLive},
+            I#cg_set{anno=Anno};
+        false ->
+            I
+    end.
+
+liveness_yregs_anno(#cg_set{op=Op,dst=Dst}=I, Live0, Regs) ->
+    case need_live_anno(Op) of
+        true ->
+            Live = ordsets:del_element(Dst, Live0),
+            LiveYregs = [V || V <- Live, is_yreg(V, Regs)],
+            Anno = (I#cg_set.anno)#{live_yregs=>LiveYregs},
+            I#cg_set{anno=Anno};
+        false ->
+            I
+    end.
+
+liveness_clobber(#cg_set{anno=Anno}, Live, Regs) ->
+    case Anno of
+        #{clobbers:=true} ->
+            [R || R <- Live, is_yreg(R, Regs)];
+        _ ->
+            Live
+    end.
+
+is_yreg(R, Regs) ->
+    case Regs of
+        #{R:={y,_}} -> true;
+        #{} -> false
+    end.
+
+num_live(Live, Regs) ->
+    Rs = ordsets:from_list([get_register(V, Regs) || V <- Live]),
+    num_live_1(Rs, 0).
+
+num_live_1([{x,X}|T], X) ->
+    num_live_1(T, X+1);
+num_live_1([{x,_}|_]=T, X) ->
+    %% error({hole,{x,X},expected,Next});
+    num_live_1(T, X+1);
+num_live_1([{y,_}|_], X) ->
+    X;
+num_live_1([{z,_}|_], X) ->
+    X;
+num_live_1([{fr,_}|T], X) ->
+    num_live_1(T, X);
+num_live_1([], X) ->
+    X.
+
+get_live(#cg_set{anno=#{live:=Live}}) ->
+    Live.
+
+%% need_live_anno(Operation) -> true|false.
+%%  Return 'true' if the instruction needs a 'live' annotation with
+%%  the number live X registers, or 'false' otherwise.
+
+need_live_anno(Op) ->
+    case Op of
+        {bif,_} -> true;
+        bs_get -> true;
+        bs_init -> true;
+        bs_get_position -> true;
+        bs_get_tail -> true;
+        bs_start_match -> true;
+        bs_skip -> true;
+        call -> true;
+        put_map -> true;
+        _ -> false
+    end.
+
+%%%
+%%% Add the following annotations for Y registers:
+%%%
+%%%   def_yregs   An ordset with variables that refer to live Y registers.
+%%%               That is, Y registers that that have been killed
+%%%               are not included. This annotation is added to all
+%%%               instructions that require Y registers to be initialized.
+%%%
+%%%   kill_yregs  This annotation is added to call instructions. It is
+%%%               an ordset containing variables referring to Y registers
+%%%               that will no longer be used after the call instruction.
+%%%
+
+defined(Linear, #cg{regs=Regs}) ->
+    def(Linear, #{}, Regs).
+
+def([{L,#cg_blk{is=Is0,last=Last}=Blk0}|Bs], DefMap0, Regs) ->
+    Def0 = def_get(L, DefMap0),
+    {Is,Def,MaybeDef} = def_is(Is0, Regs, Def0, []),
+    DefMap = def_successors(Last, Def, MaybeDef, DefMap0),
+    Blk = Blk0#cg_blk{is=Is},
+    [{L,Blk}|def(Bs, DefMap, Regs)];
+def([], _, _) -> [].
+
+def_get(L, DefMap) ->
+    case DefMap of
+        #{L:=Def} -> Def;
+        #{} -> []
+    end.
+
+def_is([#cg_alloc{anno=Anno0}=I0|Is], Regs, Def, Acc) ->
+    I = I0#cg_alloc{anno=Anno0#{def_yregs=>Def}},
+    def_is(Is, Regs, Def, [I|Acc]);
+def_is([#cg_set{op=succeeded,args=[Var]}=I], Regs, Def, Acc) ->
+    %% Var will only be defined on the success branch of the `br`
+    %% for this block.
+    MaybeDef = def_add_yreg(Var, [], Regs),
+    {reverse(Acc, [I]),Def,MaybeDef};
+def_is([#cg_set{op=kill_try_tag,args=[#b_var{}=Tag]}=I|Is], Regs, Def0, Acc) ->
+    Def = ordsets:del_element(Tag, Def0),
+    def_is(Is, Regs, Def, [I|Acc]);
+def_is([#cg_set{op=catch_end,args=[#b_var{}=Tag|_]}=I|Is], Regs, Def0, Acc) ->
+    Def = ordsets:del_element(Tag, Def0),
+    def_is(Is, Regs, Def, [I|Acc]);
+def_is([#cg_set{anno=Anno0,op=call,dst=Dst}=I0|Is],
+       Regs, Def0, Acc) ->
+    #{live_yregs:=LiveYregVars} = Anno0,
+    LiveRegs = gb_sets:from_list([maps:get(V, Regs) || V <- LiveYregVars]),
+    Kill0 = ordsets:subtract(Def0, LiveYregVars),
+
+    %% Kill0 is the set of variables that have just died. However, the registers
+    %% used for killed variables may have been reused, so we must check that the
+    %% registers to be killed are not used by other variables.
+    Kill = [K || K <- Kill0, not gb_sets:is_element(maps:get(K, Regs), LiveRegs)],
+    Anno = Anno0#{def_yregs=>Def0,kill_yregs=>Kill},
+    I = I0#cg_set{anno=Anno},
+    Def1 = ordsets:subtract(Def0, Kill),
+    Def = def_add_yreg(Dst, Def1, Regs),
+    def_is(Is, Regs, Def, [I|Acc]);
+def_is([#cg_set{anno=Anno0,op={bif,Bif},dst=Dst,args=Args}=I0|Is],
+       Regs, Def0, Acc) ->
+    Arity = length(Args),
+    I = case is_gc_bif(Bif, Args) orelse not erl_bifs:is_safe(erlang, Bif, Arity) of
+            true ->
+                I0#cg_set{anno=Anno0#{def_yregs=>Def0}};
+            false ->
+                I0
+        end,
+    Def = def_add_yreg(Dst, Def0, Regs),
+    def_is(Is, Regs, Def, [I|Acc]);
+def_is([#cg_set{anno=Anno0,dst=Dst}=I0|Is], Regs, Def0, Acc) ->
+    I = case need_y_init(I0) of
+            true ->
+                I0#cg_set{anno=Anno0#{def_yregs=>Def0}};
+            false ->
+                I0
+        end,
+    Def = def_add_yreg(Dst, Def0, Regs),
+    def_is(Is, Regs, Def, [I|Acc]);
+def_is([], _, Def, Acc) ->
+    {reverse(Acc),Def,[]}.
+
+def_add_yreg(Dst, Def, Regs) ->
+    case is_yreg(Dst, Regs) of
+        true -> ordsets:add_element(Dst, Def);
+        false -> Def
+    end.
+
+def_successors(#cg_br{bool=#b_var{},succ=Succ,fail=Fail}, Def, MaybeDef, DefMap0) ->
+    DefMap = def_successors([Fail], ordsets:subtract(Def, MaybeDef), DefMap0),
+    def_successors([Succ], Def, DefMap);
+def_successors(Last, Def, [], DefMap) ->
+    def_successors(successors(Last), Def, DefMap).
+
+def_successors([S|Ss], Def0, DefMap) ->
+    case DefMap of
+        #{S:=Def1} ->
+            Def = ordsets:intersection(Def0, Def1),
+            def_successors(Ss, Def0, DefMap#{S:=Def});
+        #{} ->
+            def_successors(Ss, Def0, DefMap#{S=>Def0})
+    end;
+def_successors([], _, DefMap) -> DefMap.
+
+%% need_y_init(#cg_set{}) -> true|false.
+%%  Return true if this instructions needs initialized Y registers
+%%  (because the instruction may do a GC or cause an exception
+%%  so that the stack will be scanned), or false otherwise.
+
+need_y_init(#cg_set{anno=#{clobbers:=Clobbers}}) -> Clobbers;
+need_y_init(#cg_set{op=bs_get}) -> true;
+need_y_init(#cg_set{op=bs_get_position}) -> true;
+need_y_init(#cg_set{op=bs_get_tail}) -> true;
+need_y_init(#cg_set{op=bs_init}) -> true;
+need_y_init(#cg_set{op=bs_skip,args=[#b_literal{val=Type}|_]}) ->
+    case Type of
+        utf8 -> true;
+        utf16 -> true;
+        utf32 -> true;
+        _ -> false
+    end;
+need_y_init(#cg_set{op=bs_start_match}) -> true;
+need_y_init(#cg_set{op=put_map}) -> true;
+need_y_init(#cg_set{}) -> false.
+
+%% opt_allocate([{BlockLabel,Block}], #st{}) -> [BeamInstruction].
+%%  Update the def_yregs field of each #cg_alloc{} that allocates
+%%  a stack frame. #cg_alloc.def_yregs will list all Y registers
+%%  that will be initialized by the subsequent code (thus, the
+%%  listed Y registers don't require init/1 instructions).
+
+opt_allocate(Linear, #cg{regs=Regs}) ->
+    opt_allocate_1(Linear, Regs).
+
+opt_allocate_1([{L,#cg_blk{is=[#cg_alloc{stack=Stk}=I0|Is]}=Blk0}|Bs]=Bs0, Regs)
+  when is_integer(Stk) ->
+    %% Collect the variables that are initialized by copy
+    %% instruction in this block.
+    case ordsets:from_list(opt_allocate_defs(Is, Regs)) of
+        Yregs when length(Yregs) =:= Stk ->
+            %% Those copy instructions are sufficient to fully
+            %% initialize the stack frame.
+            I = I0#cg_alloc{def_yregs=Yregs},
+            [{L,Blk0#cg_blk{is=[I|Is]}}|opt_allocate_1(Bs, Regs)];
+        Yregs0 ->
+            %% Determine a conservative approximation of the Y
+            %% registers that are guaranteed to be initialized by all
+            %% successors of this block, and to it add the variables
+            %% initialized by copy instructions in this block.
+            Yregs1 = opt_alloc_def(Bs0, gb_sets:singleton(L), []),
+            Yregs = ordsets:union(Yregs0, Yregs1),
+            I = I0#cg_alloc{def_yregs=Yregs},
+            [{L,Blk0#cg_blk{is=[I|Is]}}|opt_allocate_1(Bs, Regs)]
+    end;
+opt_allocate_1([B|Bs], Regs) ->
+    [B|opt_allocate_1(Bs, Regs)];
+opt_allocate_1([], _) -> [].
+
+opt_allocate_defs([#cg_set{op=copy,dst=Dst}|Is], Regs) ->
+    case is_yreg(Dst, Regs) of
+        true -> [Dst|opt_allocate_defs(Is, Regs)];
+        false -> []
+    end;
+opt_allocate_defs(_, _Regs) -> [].
+
+opt_alloc_def([{L,#cg_blk{is=Is,last=Last}}|Bs], Ws0, Def0) ->
+    case gb_sets:is_member(L, Ws0) of
+        false ->
+            opt_alloc_def(Bs, Ws0, Def0);
+        true ->
+            case opt_allocate_is(Is) of
+                none ->
+                    Succ = successors(Last),
+                    Ws = gb_sets:union(Ws0, gb_sets:from_list(Succ)),
+                    opt_alloc_def(Bs, Ws, Def0);
+                Def1 when is_list(Def1) ->
+                    Def = [Def1|Def0],
+                    opt_alloc_def(Bs, Ws0, Def)
+            end
+    end;
+opt_alloc_def([], _, Def) ->
+    ordsets:intersection(Def).
+
+opt_allocate_is([#cg_set{anno=Anno}|Is]) ->
+    case Anno of
+        #{def_yregs:=Yregs} ->
+            Yregs;
+        #{} ->
+            opt_allocate_is(Is)
+    end;
+opt_allocate_is([#cg_alloc{anno=#{def_yregs:=Yregs},stack=none}|_]) ->
+    Yregs;
+opt_allocate_is([#cg_alloc{}|Is]) ->
+    opt_allocate_is(Is);
+opt_allocate_is([]) -> none.
+
+%%%
+%%% Here follows the main code generation functions.
+%%%
+
+%% cg_linear([{BlockLabel,Block}]) -> [BeamInstruction].
+%%  Generate BEAM instructions.
+
+cg_linear([{L,#cg_blk{anno=#{recv_set:=L}=Anno0}=B0}|Bs], St0) ->
+    Anno = maps:remove(recv_set, Anno0),
+    B = B0#cg_blk{anno=Anno},
+    {Is,St1} = cg_linear([{L,B}|Bs], St0),
+    {Fail,St} = use_block_label(L, St1),
+    {[{recv_set,Fail}|Is],St};
+cg_linear([{L,#cg_blk{is=Is0,last=Last}}|Bs], St0) ->
+    Next = next_block(Bs),
+    St1 = new_block_label(L, St0),
+    {Is1,St2} = cg_block(Is0, Last, Next, St1),
+    {Is2,St} = cg_linear(Bs, St2),
+    {def_block_label(L, St)++Is1++Is2,St};
+cg_linear([], St) -> {[],St}.
+
+cg_block([#cg_set{op=recv_next}], #cg_br{succ=Lr0}, _Next, St0) ->
+    {Lr,St} = use_block_label(Lr0, St0),
+    {[{loop_rec_end,Lr}],St};
+cg_block([#cg_set{op=wait}], #cg_br{succ=Lr0}, _Next, St0) ->
+    {Lr,St} = use_block_label(Lr0, St0),
+    {[{wait,Lr}],St};
+cg_block(Is0, Last, Next, St0) ->
+    case Last of
+        #cg_br{succ=Next,fail=Next} ->
+            cg_block(Is0, none, St0);
+        #cg_br{succ=Same,fail=Same} ->
+            {Fail,St1} = use_block_label(Same, St0),
+            {Is,St} = cg_block(Is0, none, St1),
+            {Is++[jump(Fail)],St};
+        #cg_br{bool=Bool,succ=Next,fail=Fail0} ->
+            {Fail,St1} = use_block_label(Fail0, St0),
+            {Is,St} = cg_block(Is0, {Bool,Fail}, St1),
+            {Is,St};
+        #cg_br{bool=Bool,succ=Succ0,fail=Fail0} ->
+            {[Succ,Fail],St1} = use_block_labels([Succ0,Fail0], St0),
+            {Is,St} = cg_block(Is0, {Bool,Fail}, St1),
+            {Is++[jump(Succ)],St};
+        #cg_ret{arg=Src0,dealloc=N} ->
+            Src = beam_arg(Src0, St0),
+            cg_block(Is0, {return,Src,N}, St0);
+        #cg_switch{} ->
+            cg_switch(Is0, Last, St0)
+    end.
+
+cg_switch(Is0, Last, St0) ->
+    #cg_switch{arg=Src0,fail=Fail0,list=List0} = Last,
+    Src = beam_arg(Src0, St0),
+    {Fail1,St1} = use_block_label(Fail0, St0),
+    Fail = ensure_label(Fail1, St1),
+    {List1,St2} =
+        flatmapfoldl(fun({V,L}, S0) ->
+                             {Lbl,S} = use_block_label(L, S0),
+                             {[beam_arg(V, S),Lbl],S}
+                     end, St1, List0),
+    {Is1,St} = cg_block(Is0, none, St2),
+    case reverse(Is1) of
+        [{bif,tuple_size,_,[Tuple],{z,_}=Src}|More] ->
+            List = map(fun({integer,Arity}) -> Arity;
+                          ({f,_}=F) -> F
+                       end, List1),
+            Is = reverse(More, [{select_tuple_arity,Tuple,Fail,{list,List}}]),
+            {Is,St};
+        _ ->
+            SelectVal = {select_val,Src,Fail,{list,List1}},
+            {Is1 ++ [SelectVal],St}
+    end.
+
+jump({f,_}=Fail) ->
+    {jump,Fail};
+jump({catch_tag,Fail}) ->
+    {jump,Fail}.
+
+bif_fail({f,_}=Fail) -> Fail;
+bif_fail({catch_tag,_}) -> {f,0}.
+
+next_block([]) -> none;
+next_block([{Next,_}|_]) -> Next.
+
+%% Certain instructions (such as get_map_element or is_nonempty_list)
+%% are only used in guards and **must** have a non-zero label;
+%% otherwise, the loader will refuse to load the
+%% module. ensure_label/2 replaces a zero label with the "ultimate
+%% failure" label to make the module loadable.  The instruction that
+%% have had the zero label replaced is **not** supposed to ever fail
+%% and actually jump to the label.
+
+ensure_label(Fail0, #cg{ultimate_fail=Lbl}) ->
+    case bif_fail(Fail0) of
+        {f,0} -> {f,Lbl};
+        {f,_}=Fail -> Fail
+    end.
+
+cg_block([#cg_set{anno=#{recv_mark:=L}=Anno0}=I0|T], Context, St0) ->
+    Anno = maps:remove(recv_mark, Anno0),
+    I = I0#cg_set{anno=Anno},
+    {Is,St1} = cg_block([I|T], Context, St0),
+    {Fail,St} = use_block_label(L, St1),
+    {[{recv_mark,Fail}|Is],St};
+cg_block([#cg_set{op=new_try_tag,dst=Tag,args=Args}], {Tag,Fail0}, St) ->
+    {catch_tag,Fail} = Fail0,
+    [Reg,{atom,Kind}] = beam_args([Tag|Args], St),
+    {[{Kind,Reg,Fail}],St};
+cg_block([#cg_set{anno=Anno,op={bif,Name},dst=Dst0,args=Args0}=I,
+          #cg_set{op=succeeded,dst=Bool}], {Bool,Fail0}, St) ->
+    [Dst|Args] = beam_args([Dst0|Args0], St),
+    Line0 = call_line(body, {extfunc,erlang,Name,length(Args)}, Anno),
+    Fail = bif_fail(Fail0),
+    Line = case Fail of
+               {f,0} -> Line0;
+               {f,_} -> []
+           end,
+    case is_gc_bif(Name, Args) of
+        true ->
+            Live = get_live(I),
+            Kill = kill_yregs(Anno, St),
+            {Kill++Line++[{gc_bif,Name,Fail,Live,Args,Dst}],St};
+        false ->
+            {Line++[{bif,Name,Fail,Args,Dst}],St}
+    end;
+cg_block([#cg_set{op={bif,tuple_size},dst=Arity0,args=[Tuple0]},
+          #cg_set{op={bif,'=:='},dst=Bool,args=[Arity0,#b_literal{val=Ar}]}=Eq],
+         {Bool,Fail}=Context, St0) ->
+    Tuple = beam_arg(Tuple0, St0),
+    case beam_arg(Arity0, St0) of
+        {z,_} ->
+            %% The size will only be used once. Combine to a test_arity instruction.
+            Test = {test,test_arity,ensure_label(Fail, St0),[Tuple,Ar]},
+            {[Test],St0};
+        Arity ->
+            %% The size will be used more than once. Must do an explicit
+            %% BIF call followed by the '==' test.
+            TupleSize = {bif,tuple_size,{f,0},[Tuple],Arity},
+            {Is,St} = cg_block([Eq], Context, St0),
+            {[TupleSize|Is],St}
+    end;
+cg_block([#cg_set{op={bif,Name},dst=Dst0,args=Args0}]=Is0, {Dst0,Fail}, St0) ->
+    [Dst|Args] = beam_args([Dst0|Args0], St0),
+    case Dst of
+        {z,_} ->
+            %% The result of the BIF call will only be used once. Convert to
+            %% a test instruction.
+            {Test,St1} = bif_to_test(Name, Args, ensure_label(Fail, St0), St0),
+            {Test,St1};
+        _ ->
+            %% Must explicitly call the BIF since the result will be used
+            %% more than once.
+            {Is1,St1} = cg_block(Is0, none, St0),
+            {Is2,St} = cg_block([], {Dst0,Fail}, St1),
+            {Is1++Is2,St}
+    end;
+cg_block([#cg_set{anno=Anno,op={bif,Name},dst=Dst0,args=Args0}=I|T],
+         Context, St0) ->
+    [Dst|Args] = beam_args([Dst0|Args0], St0),
+    {Is0,St} = cg_block(T, Context, St0),
+    case is_gc_bif(Name, Args) of
+        true ->
+            Line = call_line(body, {extfunc,erlang,Name,length(Args)}, Anno),
+            Live = get_live(I),
+            Kill = kill_yregs(Anno, St),
+            Is = Kill++Line++[{gc_bif,Name,{f,0},Live,Args,Dst}|Is0],
+            {Is,St};
+        false ->
+            Is = [{bif,Name,{f,0},Args,Dst}|Is0],
+            {Is,St}
+    end;
+cg_block([#cg_set{op=bs_init,dst=Dst0,args=Args0,anno=Anno}=I,
+          #cg_set{op=succeeded,dst=Bool}], {Bool,Fail0}, St) ->
+    Fail = bif_fail(Fail0),
+    Line = line(Anno),
+    Alloc = map_get(alloc, Anno),
+    [#b_literal{val=Kind}|Args1] = Args0,
+    case Kind of
+        new ->
+            [Dst,Size,{integer,Unit}] = beam_args([Dst0|Args1], St),
+            Live = get_live(I),
+            {[Line|cg_bs_init(Dst, Size, Alloc, Unit, Live, Fail)],St};
+        private_append ->
+            [Dst,Src,Bits,{integer,Unit}] = beam_args([Dst0|Args1], St),
+            Flags = {field_flags,[]},
+            Is = [Line,{bs_private_append,Fail,Bits,Unit,Src,Flags,Dst}],
+            {Is,St};
+        append ->
+            [Dst,Src,Bits,{integer,Unit}] = beam_args([Dst0|Args1], St),
+            Flags = {field_flags,[]},
+            Live = get_live(I),
+            Is = [Line,{bs_append,Fail,Bits,Alloc,Live,Unit,Src,Flags,Dst}],
+            {Is,St}
+    end;
+cg_block([#cg_set{anno=Anno,op=bs_start_match,dst=Ctx0,args=[Bin0]}=I,
+          #cg_set{op=succeeded,dst=Bool}], {Bool,Fail}, St) ->
+    [Dst,Bin1] = beam_args([Ctx0,Bin0], St),
+    {Bin,Pre} = force_reg(Bin1, Dst),
+    Live = get_live(I),
+    %% num_slots is only set when using the old instructions.
+    case maps:find(num_slots, Anno) of
+        {ok, Slots} ->
+            Is = Pre ++ [{test,bs_start_match2,Fail,Live,[Bin,Slots],Dst}],
+            {Is,St};
+        error ->
+            Is = Pre ++ [{test,bs_start_match3,Fail,Live,[Bin],Dst}],
+            {Is,St}
+    end;
+cg_block([#cg_set{op=bs_get}=Set,
+          #cg_set{op=succeeded,dst=Bool}], {Bool,Fail}, St) ->
+    {cg_bs_get(Fail, Set, St),St};
+cg_block([#cg_set{op=bs_match_string,args=[CtxVar,#b_literal{val=String}]},
+          #cg_set{op=succeeded,dst=Bool}], {Bool,Fail}, St) ->
+    CtxReg = beam_arg(CtxVar, St),
+    Is = [{test,bs_match_string,Fail,[CtxReg,String]}],
+    {Is,St};
+cg_block([#cg_set{dst=Dst0,op=landingpad,args=Args0}|T], Context, St0) ->
+    [Dst,{atom,Kind},Tag] = beam_args([Dst0|Args0], St0),
+    case Kind of
+        'catch' ->
+            cg_catch(Dst, T, Context, St0);
+        'try' ->
+            cg_try(Dst, Tag, T, Context, St0)
+    end;
+cg_block([#cg_set{op=kill_try_tag,args=Args0}|Is], Context, St0) ->
+    [Reg] = beam_args(Args0, St0),
+    {Is0,St} = cg_block(Is, Context, St0),
+    {[{try_end,Reg}|Is0],St};
+cg_block([#cg_set{op=catch_end,dst=Dst0,args=Args0}|Is], Context, St0) ->
+    [Dst,Reg,{x,0}] = beam_args([Dst0|Args0], St0),
+    {Is0,St} = cg_block(Is, Context, St0),
+    {[{catch_end,Reg}|copy({x,0}, Dst)++Is0],St};
+cg_block([#cg_set{op=call}=I,
+          #cg_set{op=succeeded,dst=Bool}], {Bool,_Fail}, St) ->
+    %% A call in try/catch block.
+    cg_block([I], none, St);
+cg_block([#cg_set{op=get_map_element,dst=Dst0,args=Args0},
+          #cg_set{op=succeeded,dst=Bool}], {Bool,Fail0}, St) ->
+    [Dst,Map,Key] = beam_args([Dst0|Args0], St),
+    Fail = ensure_label(Fail0, St),
+    {[{get_map_elements,Fail,Map,{list,[Key,Dst]}}],St};
+cg_block([#cg_set{op=Op,dst=Dst0,args=Args0}=I,
+          #cg_set{op=succeeded,dst=Bool}], {Bool,Fail}, St) ->
+    [Dst|Args] = beam_args([Dst0|Args0], St),
+    {cg_test(Op, bif_fail(Fail), Args, Dst, I),St};
+cg_block([#cg_set{op=bs_put,dst=Bool,args=Args0}], {Bool,Fail}, St) ->
+    Args = beam_args(Args0, St),
+    {cg_bs_put(bif_fail(Fail), Args),St};
+cg_block([#cg_set{op=bs_test_tail,dst=Bool,args=Args0}], {Bool,Fail}, St) ->
+    [Ctx,{integer,Bits}] = beam_args(Args0, St),
+    {[{test,bs_test_tail2,bif_fail(Fail),[Ctx,Bits]}],St};
+cg_block([#cg_set{op={float,checkerror},dst=Bool}], {Bool,Fail}, St) ->
+    {[{fcheckerror,bif_fail(Fail)}],St};
+cg_block([#cg_set{op=is_tagged_tuple,dst=Bool,args=Args0}], {Bool,Fail}, St) ->
+    [Src,{integer,Arity},Tag] = beam_args(Args0, St),
+    {[{test,is_tagged_tuple,ensure_label(Fail, St),[Src,Arity,Tag]}],St};
+cg_block([#cg_set{op=is_nonempty_list,dst=Bool,args=Args0}], {Bool,Fail}, St) ->
+    Args = beam_args(Args0, St),
+    {[{test,is_nonempty_list,ensure_label(Fail, St),Args}],St};
+cg_block([#cg_set{op=has_map_field,dst=Bool,args=Args0}], {Bool,Fail}, St) ->
+    [Src,Key] = beam_args(Args0, St),
+    {[{test,has_map_fields,Fail,Src,{list,[Key]}}],St};
+cg_block([#cg_set{op=call}=Call], {_Bool,_Fail}=Context, St0) ->
+    {Is0,St1} = cg_call(Call, body, none, St0),
+    {Is1,St} = cg_block([], Context, St1),
+    {Is0++Is1,St};
+cg_block([#cg_set{op=call,dst=Dst0}=Call], Context, St) ->
+    Dst = beam_arg(Dst0, St),
+    case Context of
+        {return,Dst,_} ->
+            cg_call(Call, tail, Context, St);
+        _ ->
+            cg_call(Call, body, Context, St)
+    end;
+cg_block([#cg_set{op=call}=Call|T], Context, St0) ->
+    {Is0,St1} = cg_call(Call, body, none, St0),
+    {Is1,St} = cg_block(T, Context, St1),
+    {Is0++Is1,St};
+cg_block([#cg_set{op=make_fun,dst=Dst0,args=[Local|Args0]}|T],
+         Context, St0) ->
+    #b_local{name=#b_literal{val=Func},arity=Arity} = Local,
+    [Dst|Args] = beam_args([Dst0|Args0], St0),
+    {FuncLbl,St1} = local_func_label(Func, Arity, St0),
+    Is0 = setup_args(Args) ++
+        [{make_fun2,{f,FuncLbl},0,0,length(Args)}|copy({x,0}, Dst)],
+    {Is1,St} = cg_block(T, Context, St1),
+    {Is0++Is1,St};
+cg_block([#cg_set{op=copy}|_]=T0, Context, St0) ->
+    {Is0,T} = cg_copy(T0, St0),
+    {Is1,St} = cg_block(T, Context, St0),
+    Is = Is0 ++ Is1,
+    case is_call(T) of
+        {yes,Arity} ->
+            {opt_call_moves(Is, Arity),St};
+        no ->
+            {Is,St}
+    end;
+cg_block([#cg_set{op=Op,dst=Dst0,args=Args0}=Set], none, St) ->
+    [Dst|Args] = beam_args([Dst0|Args0], St),
+    Is = cg_instr(Op, Args, Dst, Set),
+    {Is,St};
+cg_block([#cg_set{op=Op,dst=Dst0,args=Args0}=Set|T], Context, St0) ->
+    [Dst|Args] = beam_args([Dst0|Args0], St0),
+    Is0 = cg_instr(Op, Args, Dst, Set),
+    {Is1,St} = cg_block(T, Context, St0),
+    {Is0++Is1,St};
+cg_block([#cg_alloc{}=Alloc|T], Context, St0) ->
+    Is0 = cg_alloc(Alloc, St0),
+    {Is1,St} = cg_block(T, Context, St0),
+    {Is0++Is1,St};
+cg_block([], {return,Arg,none}, St) ->
+    Is = copy(Arg, {x,0}) ++ [return],
+    {Is,St};
+cg_block([], {return,Arg,N}, St) ->
+    Is = copy(Arg, {x,0}) ++ [{deallocate,N},return],
+    {Is,St};
+cg_block([], none, St) ->
+    {[],St};
+cg_block([], {Bool0,Fail}, St) ->
+    [Bool] = beam_args([Bool0], St),
+    {[{test,is_eq_exact,Fail,[Bool,{atom,true}]}],St}.
+
+cg_copy(T0, St) ->
+    {Copies,T} = splitwith(fun(#cg_set{op=copy}) -> true;
+                              (_) -> false
+                           end, T0),
+    Moves0 = cg_copy_1(Copies, St),
+    Moves1 = [Move || {move,Src,Dst}=Move <- Moves0, Src =/= Dst],
+    Scratch = {x,1022},
+    Moves = order_moves(Moves1, Scratch),
+    {Moves,T}.
+
+cg_copy_1([#cg_set{dst=Dst0,args=Args}|T], St) ->
+    [Dst,Src] = beam_args([Dst0|Args], St),
+    Copies = cg_copy_1(T, St),
+    case keymember(Dst, 3, Copies) of
+        true ->
+            %% Will be overwritten. Don't generate a move instruction.
+            Copies;
+        false ->
+            [{move,Src,Dst}|Copies]
+    end;
+cg_copy_1([], _St) -> [].
+
+-define(IS_LITERAL(Val), (Val =:= nil orelse
+                          element(1, Val) =:= integer orelse
+                          element(1, Val) =:= float orelse
+                          element(1, Val) =:= atom orelse
+                          element(1, Val) =:= literal)).
+
+bif_to_test('or', [V1,V2], {f,Lbl}=Fail, St0) when Lbl =/= 0 ->
+    {SuccLabel,St} = new_label(St0),
+    {[{test,is_eq_exact,{f,SuccLabel},[V1,{atom,false}]},
+      {test,is_eq_exact,Fail,[V2,{atom,true}]},
+      {label,SuccLabel}],St};
+bif_to_test(Op, Args, Fail, St) ->
+    {bif_to_test(Op, Args, Fail),St}.
+
+bif_to_test('and', [V1,V2], Fail) ->
+    [{test,is_eq_exact,Fail,[V1,{atom,true}]},
+     {test,is_eq_exact,Fail,[V2,{atom,true}]}];
+bif_to_test('not', [Var], Fail) ->
+    [{test,is_eq_exact,Fail,[Var,{atom,false}]}];
+bif_to_test(Name, Args, Fail) ->
+    [bif_to_test_1(Name, Args, Fail)].
+
+bif_to_test_1(is_atom,     [_]=Ops, Fail) ->
+    {test,is_atom,Fail,Ops};
+bif_to_test_1(is_boolean,  [_]=Ops, Fail) ->
+    {test,is_boolean,Fail,Ops};
+bif_to_test_1(is_binary,   [_]=Ops, Fail) ->
+    {test,is_binary,Fail,Ops};
+bif_to_test_1(is_bitstring,[_]=Ops, Fail) ->
+    {test,is_bitstr,Fail,Ops};
+bif_to_test_1(is_float,    [_]=Ops, Fail) ->
+    {test,is_float,Fail,Ops};
+bif_to_test_1(is_function, [_]=Ops, Fail) ->
+    {test,is_function,Fail,Ops};
+bif_to_test_1(is_function, [_,_]=Ops, Fail) ->
+    {test,is_function2,Fail,Ops};
+bif_to_test_1(is_integer,  [_]=Ops, Fail) ->
+    {test,is_integer,Fail,Ops};
+bif_to_test_1(is_list,     [_]=Ops, Fail) ->
+    {test,is_list,Fail,Ops};
+bif_to_test_1(is_map,      [_]=Ops, Fail) ->
+    {test,is_map,Fail,Ops};
+bif_to_test_1(is_number,   [_]=Ops, Fail) ->
+    {test,is_number,Fail,Ops};
+bif_to_test_1(is_pid,      [_]=Ops, Fail) ->
+    {test,is_pid,Fail,Ops};
+bif_to_test_1(is_port,     [_]=Ops, Fail) ->
+    {test,is_port,Fail,Ops};
+bif_to_test_1(is_reference, [_]=Ops, Fail) ->
+    {test,is_reference,Fail,Ops};
+bif_to_test_1(is_tuple,    [_]=Ops, Fail) ->
+    {test,is_tuple,Fail,Ops};
+bif_to_test_1('=<', [A,B], Fail) ->
+    {test,is_ge,Fail,[B,A]};
+bif_to_test_1('>', [A,B], Fail) ->
+    {test,is_lt,Fail,[B,A]};
+bif_to_test_1('<', [_,_]=Ops, Fail) ->
+    {test,is_lt,Fail,Ops};
+bif_to_test_1('>=', [_,_]=Ops, Fail) ->
+    {test,is_ge,Fail,Ops};
+bif_to_test_1('==', [C,A], Fail) when ?IS_LITERAL(C) ->
+    {test,is_eq,Fail,[A,C]};
+bif_to_test_1('==', [_,_]=Ops, Fail) ->
+    {test,is_eq,Fail,Ops};
+bif_to_test_1('/=', [C,A], Fail) when ?IS_LITERAL(C) ->
+    {test,is_ne,Fail,[A,C]};
+bif_to_test_1('/=', [_,_]=Ops, Fail) ->
+    {test,is_ne,Fail,Ops};
+bif_to_test_1('=:=', [C,A], Fail) when ?IS_LITERAL(C) ->
+    {test,is_eq_exact,Fail,[A,C]};
+bif_to_test_1('=:=', [_,_]=Ops, Fail) ->
+    {test,is_eq_exact,Fail,Ops};
+bif_to_test_1('=/=', [C,A], Fail) when ?IS_LITERAL(C) ->
+    {test,is_ne_exact,Fail,[A,C]};
+bif_to_test_1('=/=', [_,_]=Ops, Fail) ->
+    {test,is_ne_exact,Fail,Ops}.
+
+opt_call_moves(Is0, Arity) ->
+    {Moves0,Is} = splitwith(fun({move,_,_}) -> true;
+                               ({kill,_}) -> true;
+                               (_) -> false
+                            end, Is0),
+    Moves = opt_call_moves_1(Moves0, Arity),
+    Moves ++ Is.
+
+opt_call_moves_1([{move,Src,{x,_}=Tmp}=M1|[{kill,_}|_]=Is], Arity) ->
+    %% There could be a {move,Tmp,{x,0}} instruction after the
+    %% kill/1 instructions (moved to there by opt_move_to_x0/1).
+    case splitwith(fun({kill,_}) -> true;
+                      (_) -> false
+                   end, Is) of
+        {Kills,[{move,{x,_}=Tmp,{x,0}}=M2]} ->
+            %% The two move/2 instructions (M1 and M2) can be combined
+            %% to one. The question is, though, is it safe to place
+            %% them after the kill/1 instructions?
+            case is_killed(Src, Kills, Arity) of
+                true ->
+                    %% Src (a Y register) is killed by one of the
+                    %% kill/1 instructions. Thus M1 and M2
+                    %% must be placed before the kill/1 instructions
+                    %% (essentially undoing what opt_move_to_x0/1
+                    %% did, which turned out to be a pessimization
+                    %% in this case).
+                    opt_call_moves_1([M1,M2|Kills], Arity);
+                false ->
+                    %% Src is not killed by any of the kill/1
+                    %% instructions. Thus it is safe to place
+                    %% M1 and M2 after the kill/1 instructions.
+                    opt_call_moves_1(Kills++[M1,M2], Arity)
+            end;
+        {_,_} ->
+            [M1|Is]
+    end;
+opt_call_moves_1([{move,Src,{x,_}=Tmp}=M1,{move,Tmp,Dst}=M2|Is], Arity) ->
+    case is_killed(Tmp, Is, Arity) of
+        true ->
+            %% The X register Tmp is never used again. We can collapse
+            %% the two move instruction into one.
+            [{move,Src,Dst}|opt_call_moves_1(Is, Arity)];
+        false ->
+            [M1|opt_call_moves_1([M2|Is], Arity)]
+    end;
+opt_call_moves_1([M|Ms], Arity) ->
+    [M|opt_call_moves_1(Ms, Arity)];
+opt_call_moves_1([], _Arity) -> [].
+
+is_killed(Y, [{kill,Y}|_], _) ->
+    true;
+is_killed(R, [{kill,_}|Is], Arity) ->
+    is_killed(R, Is, Arity);
+is_killed(R, [{move,R,_}|_], _) ->
+    false;
+is_killed(R, [{move,_,R}|_], _) ->
+    true;
+is_killed(R, [{move,_,_}|Is], Arity) ->
+    is_killed(R, Is, Arity);
+is_killed({x,X}, [], Arity) ->
+    X >= Arity;
+is_killed({y,_}, [], _) ->
+    false.
+
+cg_alloc(#cg_alloc{stack=none,words=#need{h=0,f=0}}, _St) ->
+    [];
+cg_alloc(#cg_alloc{stack=none,words=Need,live=Live}, _St) ->
+    [{test_heap,alloc(Need),Live}];
+cg_alloc(#cg_alloc{stack=Stk,words=Need,live=Live,def_yregs=DefYregs},
+         #cg{regs=Regs}) when is_integer(Stk) ->
+    Alloc = alloc(Need),
+    All = [{y,Y} || Y <- lists:seq(0, Stk-1)],
+    Def = ordsets:from_list([maps:get(V, Regs) || V <- DefYregs]),
+    NeedInit = ordsets:subtract(All, Def),
+    NoZero = length(Def)*2 > Stk,
+    I = case {NoZero,Alloc} of
+            {true,0} -> {allocate,Stk,Live};
+            {true,_} -> {allocate_heap,Stk,Alloc,Live};
+            {false,0} -> {allocate_zero,Stk,Live};
+            {false,_} -> {allocate_heap_zero,Stk,Alloc,Live}
+        end,
+    [I|case NoZero of
+           true -> [{init,Y} || Y <- NeedInit];
+           false -> []
+       end].
+
+alloc(#need{h=Words,f=0}) ->
+    Words;
+alloc(#need{h=Words,f=Floats}) ->
+    {alloc,[{words,Words},{floats,Floats}]}.
+
+is_call([#cg_set{op=call,args=[#b_var{}|Args]}|_]) ->
+    {yes,1+length(Args)};
+is_call([#cg_set{op=call,args=[_|Args]}|_]) ->
+    {yes,length(Args)};
+is_call([#cg_set{op=make_fun,args=[_|Args]}|_]) ->
+    {yes,length(Args)};
+is_call(_) ->
+    no.
+
+cg_call(#cg_set{anno=Anno,op=call,dst=Dst0,args=[#b_local{}=Func0|Args0]},
+        Where, Context, St0) ->
+    [Dst|Args] = beam_args([Dst0|Args0], St0),
+    #b_local{name=Name0,arity=Arity} = Func0,
+    {atom,Name} = beam_arg(Name0, St0),
+    {FuncLbl,St} = local_func_label(Name, Arity, St0),
+    Line = call_line(Where, local, Anno),
+    Call = build_call(call, Arity, {f,FuncLbl}, Context, Dst),
+    Is = setup_args(Args, Anno, Context, St) ++ Line ++ Call,
+    case Anno of
+        #{ result_type := Info } ->
+            {Is ++ [{'%', {type_info, Dst, Info}}], St};
+        #{} ->
+            {Is, St}
+    end;
+cg_call(#cg_set{anno=Anno0,op=call,dst=Dst0,args=[#b_remote{}=Func0|Args0]},
+        Where, Context, St) ->
+    [Dst|Args] = beam_args([Dst0|Args0], St),
+    #b_remote{mod=Mod0,name=Name0,arity=Arity} = Func0,
+    case {beam_arg(Mod0, St),beam_arg(Name0, St)} of
+        {{atom,Mod},{atom,Name}} ->
+            Func = {extfunc,Mod,Name,Arity},
+            Line = call_line(Where, Func, Anno0),
+            Call = build_call(call_ext, Arity, Func, Context, Dst),
+            Anno = case erl_bifs:is_exit_bif(Mod, Name, Arity) of
+                       true ->
+                           %% There is no need to kill Y registers
+                           %% before calling an exit BIF.
+                           maps:remove(kill_yregs, Anno0);
+                       false ->
+                           Anno0
+                   end,
+            Is = setup_args(Args, Anno, Context, St) ++ Line ++ Call,
+            {Is,St};
+        {Mod,Name} ->
+            Apply = build_apply(Arity, Context, Dst),
+            Is = setup_args(Args++[Mod,Name], Anno0, Context, St) ++
+                [line(Anno0)] ++ Apply,
+            {Is,St}
+    end;
+cg_call(#cg_set{anno=Anno,op=call,dst=Dst0,args=Args0},
+        Where, Context, St) ->
+    [Dst,Func|Args] = beam_args([Dst0|Args0], St),
+    Line = call_line(Where, Func, Anno),
+    Arity = length(Args),
+    Call = build_call(call_fun, Arity, Func, Context, Dst),
+    Is = setup_args(Args++[Func], Anno, Context, St) ++ Line ++ Call,
+    {Is,St}.
+
+build_call(call_fun, Arity, _Func, none, Dst) ->
+    [{call_fun,Arity}|copy({x,0}, Dst)];
+build_call(call_fun, Arity, _Func, {return,Dst,N}, Dst) when is_integer(N) ->
+    [{call_fun,Arity},{deallocate,N},return];
+build_call(call_fun, Arity, _Func, {return,Val,N}, _Dst) when is_integer(N) ->
+    [{call_fun,Arity},{move,Val,{x,0}},{deallocate,N},return];
+build_call(call_ext, 2, {extfunc,erlang,'!',2}, none, Dst) ->
+    [send|copy({x,0}, Dst)];
+build_call(call_ext, 2, {extfunc,erlang,'!',2}, {return,Dst,N}, Dst)
+  when is_integer(N) ->
+    [send,{deallocate,N},return];
+build_call(Prefix, Arity, Func, {return,Dst,none}, Dst) ->
+    I = case Prefix of
+            call -> call_only;
+            call_ext -> call_ext_only
+        end,
+    [{I,Arity,Func}];
+build_call(call_ext, Arity, {extfunc,Mod,Name,Arity}=Func, {return,_,none}, _Dst) ->
+    true = erl_bifs:is_exit_bif(Mod, Name, Arity), %Assertion.
+    [{call_ext_only,Arity,Func}];
+build_call(Prefix, Arity, Func, {return,Dst,N}, Dst) when is_integer(N) ->
+    I = case Prefix of
+            call -> call_last;
+            call_ext -> call_ext_last
+        end,
+    [{I,Arity,Func,N}];
+build_call(I, Arity, Func, {return,Val,N}, _Dst) when is_integer(N) ->
+    [{I,Arity,Func}|copy(Val, {x,0})++[{deallocate,N},return]];
+build_call(I, Arity, Func, none, Dst) ->
+    [{I,Arity,Func}|copy({x,0}, Dst)].
+
+build_apply(Arity, {return,Dst,N}, Dst) when is_integer(N) ->
+    [{apply_last,Arity,N}];
+build_apply(Arity, {return,Val,N}, _Dst) when is_integer(N) ->
+    [{apply,Arity}|copy(Val, {x,0})++[{deallocate,N},return]];
+build_apply(Arity, none, Dst) ->
+    [{apply,Arity}|copy({x,0}, Dst)].
+
+cg_instr(put_map, [{atom,assoc},SrcMap|Ss], Dst, Set) ->
+    Live = get_live(Set),
+    [{put_map_assoc,{f,0},SrcMap,Dst,Live,{list,Ss}}];
+cg_instr(bs_get_tail, [Src], Dst, Set) ->
+    Live = get_live(Set),
+    [{bs_get_tail,Src,Dst,Live}];
+cg_instr(bs_get_position, [Ctx], Dst, Set) ->
+    Live = get_live(Set),
+    [{bs_get_position,Ctx,Dst,Live}];
+cg_instr(Op, Args, Dst, _Set) ->
+    cg_instr(Op, Args, Dst).
+
+cg_instr(bs_init_writable, Args, Dst) ->
+    setup_args(Args) ++ [bs_init_writable|copy({x,0}, Dst)];
+cg_instr(bs_restore, [Ctx,Slot], _Dst) ->
+    case Slot of
+        {integer,N} ->
+            [{bs_restore2,Ctx,N}];
+        {atom,start} ->
+            [{bs_restore2,Ctx,Slot}]
+    end;
+cg_instr(bs_save, [Ctx,Slot], _Dst) ->
+    {integer,N} = Slot,
+    [{bs_save2,Ctx,N}];
+cg_instr(bs_set_position, [Ctx,Pos], _Dst) ->
+    [{bs_set_position,Ctx,Pos}];
+cg_instr(build_stacktrace, Args, Dst) ->
+    setup_args(Args) ++ [build_stacktrace|copy({x,0}, Dst)];
+cg_instr(set_tuple_element=Op, [New,Tuple,{integer,Index}], _Dst) ->
+    [{Op,New,Tuple,Index}];
+cg_instr({float,clearerror}, [], _Dst) ->
+    [fclearerror];
+cg_instr({float,get}, [Src], Dst) ->
+    [{fmove,Src,Dst}];
+cg_instr({float,put}, [Src], Dst) ->
+    [{fmove,Src,Dst}];
+cg_instr(get_hd=Op, [Src], Dst) ->
+    [{Op,Src,Dst}];
+cg_instr(get_tl=Op, [Src], Dst) ->
+    [{Op,Src,Dst}];
+cg_instr(get_tuple_element=Op, [Src,{integer,N}], Dst) ->
+    [{Op,Src,N,Dst}];
+cg_instr(put_list=Op, [Hd,Tl], Dst) ->
+    [{Op,Hd,Tl,Dst}];
+cg_instr(put_tuple, Elements, Dst) ->
+    [{put_tuple2,Dst,{list,Elements}}];
+cg_instr(put_tuple_arity, [{integer,Arity}], Dst) ->
+    [{put_tuple,Arity,Dst}];
+cg_instr(put_tuple_elements, Elements, _Dst) ->
+    [{put,E} || E <- Elements];
+cg_instr(raw_raise, Args, Dst) ->
+    setup_args(Args) ++ [raw_raise|copy({x,0}, Dst)];
+cg_instr(remove_message, [], _Dst) ->
+    [remove_message];
+cg_instr(resume, [A,B], _Dst) ->
+    [{bif,raise,{f,0},[A,B],{x,0}}];
+cg_instr(timeout, [], _Dst) ->
+    [timeout].
+
+cg_test(bs_add=Op, Fail, [Src1,Src2,{integer,Unit}], Dst, _I) ->
+    [{Op,Fail,[Src1,Src2,Unit],Dst}];
+cg_test(bs_skip, Fail, Args, _Dst, I) ->
+    cg_bs_skip(Fail, Args, I);
+cg_test(bs_utf8_size=Op, Fail, [Src], Dst, _I) ->
+    [{Op,Fail,Src,Dst}];
+cg_test(bs_utf16_size=Op, Fail, [Src], Dst, _I) ->
+    [{Op,Fail,Src,Dst}];
+cg_test({float,convert}, Fail, [Src], Dst, _I) ->
+    {f,0} = Fail,                               %Assertion.
+    [{fconv,Src,Dst}];
+cg_test({float,Op0}, Fail, Args, Dst, #cg_set{anno=Anno}) ->
+    Op = case Op0 of
+             '+' -> fadd;
+             '-' when length(Args) =:= 2 -> fsub;
+             '-' -> fnegate;
+             '*' -> fmul;
+             '/' -> fdiv
+         end,
+    [line(Anno),{bif,Op,Fail,Args,Dst}];
+cg_test(peek_message, Fail, [], Dst, _I) ->
+    [{loop_rec,Fail,{x,0}}|copy({x,0}, Dst)];
+cg_test(put_map, Fail, [{atom,exact},SrcMap|Ss], Dst, Set) ->
+    Live = get_live(Set),
+    [{put_map_exact,Fail,SrcMap,Dst,Live,{list,Ss}}];
+cg_test(wait_timeout, Fail, [Timeout], _Dst, _) ->
+    case Timeout of
+        {atom,infinity} ->
+            [{wait,Fail}];
+        _ ->
+            [{wait_timeout,Fail,Timeout}]
+    end.
+
+cg_bs_get(Fail, #cg_set{dst=Dst0,args=[#b_literal{val=Type}|Ss0]}=Set, St) ->
+    Op = case Type of
+             integer -> bs_get_integer2;
+             float   -> bs_get_float2;
+             binary  -> bs_get_binary2;
+             utf8    -> bs_get_utf8;
+             utf16   -> bs_get_utf16;
+             utf32   -> bs_get_utf32
+         end,
+    [Dst|Ss1] = beam_args([Dst0|Ss0], St),
+    Ss = case Ss1 of
+             [Ctx,{literal,Flags},Size,{integer,Unit}] ->
+                 %% Plain integer/float/binary.
+                 [Ctx,Size,Unit,field_flags(Flags, Set)];
+             [Ctx,{literal,Flags}] ->
+                 %% Utf8/16/32.
+                 [Ctx,field_flags(Flags, Set)]
+         end,
+    Live = get_live(Set),
+    [{test,Op,Fail,Live,Ss,Dst}].
+
+cg_bs_skip(Fail, [{atom,Type}|Ss0], Set) ->
+    Op = case Type of
+             utf8 -> bs_skip_utf8;
+             utf16 -> bs_skip_utf16;
+             utf32 -> bs_skip_utf32;
+             _ -> bs_skip_bits2
+         end,
+    Live = get_live(Set),
+    Ss = case Ss0 of
+             [Ctx,{literal,Flags},Size,{integer,Unit}] ->
+                 %% Plain integer/float/binary.
+                 [Ctx,Size,Unit,field_flags(Flags, Set)];
+             [Ctx,{literal,Flags}] ->
+                 %% Utf8/16/32.
+                 [Ctx,Live,field_flags(Flags, Set)]
+         end,
+    case {Type,Ss} of
+        {binary,[_,{atom,all},1,_]} ->
+            [];
+        {binary,[R,{atom,all},U,_]} ->
+            [{test,bs_test_unit,Fail,[R,U]}];
+        {_,_} ->
+            [{test,Op,Fail,Ss}]
+    end.
+
+field_flags(Flags, #cg_set{anno=#{location:={File,Line}}}) ->
+    {field_flags,[{anno,[Line,{file,File}]}|Flags]};
+field_flags(Flags, _) ->
+    {field_flags,Flags}.
+
+cg_bs_put(Fail, [{atom,Type},{literal,Flags}|Args]) ->
+    Op = case Type of
+             integer -> bs_put_integer;
+             float   -> bs_put_float;
+             binary  -> bs_put_binary;
+             utf8    -> bs_put_utf8;
+             utf16   -> bs_put_utf16;
+             utf32   -> bs_put_utf32
+         end,
+    case Args of
+        [Src,Size,{integer,Unit}] ->
+            [{Op,Fail,Size,Unit,{field_flags,Flags},Src}];
+        [Src] ->
+            [{Op,Fail,{field_flags,Flags},Src}]
+    end.
+
+cg_bs_init(Dst, Size0, Alloc, Unit, Live, Fail) ->
+    Op = case Unit of
+             1 -> bs_init_bits;
+             8 -> bs_init2
+         end,
+    Size = cg_bs_init_size(Size0),
+    [{Op,Fail,Size,Alloc,Live,{field_flags,[]},Dst}].
+
+cg_bs_init_size({x,_}=R) -> R;
+cg_bs_init_size({y,_}=R) -> R;
+cg_bs_init_size({integer,Int}) -> Int.
+
+cg_catch(Agg, T0, Context, St0) ->
+    {Moves,T1} = cg_extract(T0, Agg, St0),
+    {T,St} = cg_block(T1, Context, St0),
+    {Moves++T,St}.
+
+cg_try(Agg, Tag, T0, Context, St0) ->
+    {Moves0,T1} = cg_extract(T0, Agg, St0),
+    Moves = order_moves(Moves0, {x,3}),
+    [#cg_set{op=kill_try_tag}|T2] = T1,
+    {T,St} = cg_block(T2, Context, St0),
+    {[{try_case,Tag}|Moves++T],St}.
+
+cg_extract([#cg_set{op=extract,dst=Dst0,args=Args0}|Is0], Agg, St) ->
+    [Dst,Agg,{integer,X}] = beam_args([Dst0|Args0], St),
+    {Ds,Is} = cg_extract(Is0, Agg, St),
+    case keymember(Dst, 3, Ds) of
+        true ->
+            %% This destination will be overwritten.
+            {Ds,Is};
+        false ->
+            {copy({x,X}, Dst)++Ds,Is}
+    end;
+cg_extract(Is, _, _) ->
+    {[],Is}.
+
+copy(Src, Src) -> [];
+copy(Src, Dst) -> [{move,Src,Dst}].
+
+force_reg({literal,_}=Lit, Reg) ->
+    {Reg,[{move,Lit,Reg}]};
+force_reg({integer,_}=Lit, Reg) ->
+    {Reg,[{move,Lit,Reg}]};
+force_reg({atom,_}=Lit, Reg) ->
+    {Reg,[{move,Lit,Reg}]};
+force_reg({float,_}=Lit, Reg) ->
+    {Reg,[{move,Lit,Reg}]};
+force_reg(nil=Lit, Reg) ->
+    {Reg,[{move,Lit,Reg}]};
+force_reg({Kind,_}=R, _) when Kind =:= x; Kind =:= y ->
+    {R,[]}.
+
+%% successors(Terminator) -> [Successor].
+%%  Return an ordset of all successors for the given terminator.
+
+successors(#cg_br{succ=Succ,fail=Fail}) ->
+    ordsets:from_list([Succ,Fail]);
+successors(#cg_switch{fail=Fail,list=List}) ->
+    ordsets:from_list([Fail|[Lbl || {_,Lbl} <- List]]);
+successors(#cg_ret{}) -> [].
+
+%% linearize(Blocks) -> [{BlockLabel,#cg_blk{}}].
+%%  Linearize the intermediate representation of the code. Also
+%%  translate blocks from the SSA records to internal record types
+%%  used only in this module.
+
+linearize(Blocks) ->
+    Linear = beam_ssa:linearize(Blocks),
+    linearize_1(Linear, Blocks).
+
+linearize_1([{?BADARG_BLOCK,_}|Ls], Blocks) ->
+    linearize_1(Ls, Blocks);
+linearize_1([{L,Block0}|Ls], Blocks) ->
+    Block = translate_block(L, Block0, Blocks),
+    [{L,Block}|linearize_1(Ls, Blocks)];
+linearize_1([], _Blocks) -> [].
+
+%% translate_block(BlockLabel, #b_blk{}, Blocks) -> #cg_blk{}.
+%%  Translate a block to the internal records used in this module.
+%%  Also eliminate phi nodes, replacing them with 'copy' instructions
+%%  in the predecessor blocks.
+
+translate_block(L, #b_blk{anno=Anno,is=Is0,last=Last0}, Blocks) ->
+    Last = translate_terminator(Last0),
+    PhiCopies = translate_phis(L, Last, Blocks),
+    Is1 = translate_is(Is0, PhiCopies),
+    Is = case Anno of
+             #{frame_size:=Size} ->
+                 Alloc = #cg_alloc{stack=Size},
+                 [Alloc|Is1];
+             #{} -> Is1
+         end,
+    #cg_blk{anno=Anno,is=Is,last=Last}.
+
+translate_is([#b_set{op=phi}|Is], Tail) ->
+    translate_is(Is, Tail);
+translate_is([#b_set{anno=Anno0,op=Op,dst=Dst,args=Args}=I|Is], Tail) ->
+    Anno = case beam_ssa:clobbers_xregs(I) of
+               true -> Anno0#{clobbers=>true};
+               false -> Anno0
+           end,
+    [#cg_set{anno=Anno,op=Op,dst=Dst,args=Args}|translate_is(Is, Tail)];
+translate_is([], Tail) -> Tail.
+
+translate_terminator(#b_ret{anno=Anno,arg=Arg}) ->
+    Dealloc = case Anno of
+                  #{deallocate:=N} -> N;
+                  #{} -> none
+              end,
+    #cg_ret{arg=Arg,dealloc=Dealloc};
+translate_terminator(#b_br{bool=#b_literal{val=true},succ=Succ}) ->
+    #cg_br{bool=#b_literal{val=true},succ=Succ,fail=Succ};
+translate_terminator(#b_br{bool=#b_literal{val=false},fail=Fail}) ->
+    #cg_br{bool=#b_literal{val=true},succ=Fail,fail=Fail};
+translate_terminator(#b_br{bool=Bool,succ=Succ,fail=Fail}) ->
+    #cg_br{bool=Bool,succ=Succ,fail=Fail};
+translate_terminator(#b_switch{arg=Bool,fail=Fail,list=List}) ->
+    #cg_switch{arg=Bool,fail=Fail,list=List}.
+
+translate_phis(L, #cg_br{succ=Target,fail=Target}, Blocks) ->
+    #b_blk{is=Is} = maps:get(Target, Blocks),
+    Phis = takewhile(fun(#b_set{op=phi}) -> true;
+                        (#b_set{}) -> false
+                     end, Is),
+    phi_copies(Phis, L);
+translate_phis(_, _, _) -> [].
+
+phi_copies([#b_set{dst=Dst,args=PhiArgs}|Sets], L) ->
+    CopyArgs = [V || {V,Target} <- PhiArgs, Target =:= L],
+    [#cg_set{op=copy,dst=Dst,args=CopyArgs}|phi_copies(Sets, L)];
+phi_copies([], _) -> [].
+
+%% opt_move_to_x0([Instruction]) -> [Instruction].
+%%  Simple peep-hole optimization to move a {move,Any,{x,0}} past
+%%  any kill up to the next call instruction. (To give the loader
+%%  an opportunity to combine the 'move' and the 'call' instructions.)
+
+opt_move_to_x0(Moves) ->
+    opt_move_to_x0(Moves, []).
+
+opt_move_to_x0([{move,_,{x,0}}=I|Is0], Acc0) ->
+    case move_past_kill(Is0, I, Acc0) of
+       impossible -> opt_move_to_x0(Is0, [I|Acc0]);
+       {Is,Acc} -> opt_move_to_x0(Is, Acc)
+    end;
+opt_move_to_x0([I|Is], Acc) ->
+    opt_move_to_x0(Is, [I|Acc]);
+opt_move_to_x0([], Acc) -> reverse(Acc).
+
+move_past_kill([{kill,Src}|_], {move,Src,_}, _) ->
+    impossible;
+move_past_kill([{kill,_}=I|Is], Move, Acc) ->
+    move_past_kill(Is, Move, [I|Acc]);
+move_past_kill(Is, Move, Acc) ->
+    {Is,[Move|Acc]}.
+
+%% setup_args(Args, Anno, Context) -> [Instruction].
+%% setup_args(Args) -> [Instruction].
+%%  Set up X registers for a call.
+
+setup_args(Args, Anno, none, St) ->
+    case {setup_args(Args),kill_yregs(Anno, St)} of
+        {Moves,[]} ->
+            Moves;
+        {Moves,Kills} ->
+            opt_move_to_x0(Moves ++ Kills)
+    end;
+setup_args(Args, _, _, _) ->
+    setup_args(Args).
+
+setup_args([]) ->
+    [];
+setup_args([_|_]=Args) ->
+    Moves = gen_moves(Args, 0, []),
+    Scratch = {x,1+last(sort([length(Args)-1|[X || {x,X} <- Args]]))},
+    order_moves(Moves, Scratch).
+
+%% kill_yregs(Anno, #cg{}) -> [{kill,{y,Y}}].
+%%  Kill Y registers that will not be used again.
+
+kill_yregs(#{kill_yregs:=Kill}, #cg{regs=Regs}) ->
+    ordsets:from_list([{kill,maps:get(V, Regs)} || V <- Kill]);
+kill_yregs(#{}, #cg{}) -> [].
+
+%% gen_moves(As, I, Acc)
+%%  Generate the basic move instruction to move the arguments
+%%  to their proper registers. The list will be sorted on
+%%  destinations. (I.e. the move to {x,0} will be first --
+%%  see the comment to order_moves/2.)
+
+gen_moves([A|As], I, Acc) ->
+    gen_moves(As, I+1, copy(A, {x,I}) ++ Acc);
+gen_moves([], _, Acc) ->
+    keysort(3, Acc).
+
+%% order_moves([Move], ScratchReg) -> [Move]
+%%  Orders move instruction so that source registers are not
+%%  destroyed before they are used. If there are cycles
+%%  (such as {move,{x,0},{x,1}}, {move,{x,1},{x,1}}),
+%%  the scratch register is used to break up the cycle.
+%%    If possible, the first move of the input list is placed
+%%  last in the result list (to make the move to {x,0} occur
+%%  just before the call to allow the Beam loader to coalesce
+%%  the instructions).
+
+order_moves(Ms, Scr) -> order_moves(Ms, Scr, []).
+
+order_moves([{move,_,_}=M|Ms0], ScrReg, Acc0) ->
+    {Chain,Ms} = collect_chain(Ms0, [M], ScrReg),
+    Acc = reverse(Chain, Acc0),
+    order_moves(Ms, ScrReg, Acc);
+order_moves([], _, Acc) -> Acc.
+
+collect_chain(Ms, Path, ScrReg) ->
+    collect_chain(Ms, Path, [], ScrReg).
+
+collect_chain([{move,Src,Same}=M|Ms0], [{move,Same,_}|_]=Path, Others, ScrReg) ->
+    case keymember(Src, 3, Path) of
+        false ->
+            collect_chain(reverse(Others, Ms0), [M|Path], [], ScrReg);
+        true ->
+            %% There is a cycle, which we must break up.
+            {break_up_cycle(M, Path, ScrReg),reverse(Others, Ms0)}
+    end;
+collect_chain([M|Ms], Path, Others, ScrReg) ->
+    collect_chain(Ms, Path, [M|Others], ScrReg);
+collect_chain([], Path, Others, _) ->
+    {Path,Others}.
+
+break_up_cycle({move,Src,_}=M, Path, ScrReg) ->
+    [{move,ScrReg,Src},M|break_up_cycle1(Src, Path, ScrReg)].
+
+break_up_cycle1(Dst, [{move,Src,Dst}|Path], ScrReg) ->
+    [{move,Src,ScrReg}|Path];
+break_up_cycle1(Dst, [M|Path], LastMove) ->
+    [M|break_up_cycle1(Dst, Path, LastMove)].
+
+%%%
+%%% General utility functions.
+%%%
+
+verify_beam_register({x,_}=Reg) -> Reg.
+
+is_beam_register({x,_}) -> true;
+is_beam_register(_) -> false.
+
+get_register(V, Regs) ->
+    case is_beam_register(V) of
+        true -> V;
+        false -> maps:get(V, Regs)
+    end.
+
+beam_args(As, St) ->
+    [beam_arg(A, St) || A <- As].
+
+beam_arg(#b_var{}=Name, #cg{regs=Regs}) ->
+    maps:get(Name, Regs);
+beam_arg(#b_literal{val=Val}, _) ->
+    if
+        is_atom(Val) -> {atom,Val};
+        is_float(Val) -> {float,Val};
+        is_integer(Val) -> {integer,Val};
+        Val =:= [] -> nil;
+        true -> {literal,Val}
+    end;
+beam_arg(Reg, _) ->
+    verify_beam_register(Reg).
+
+new_block_label(L, St0) ->
+    {_Lbl,St} = label_for_block(L, St0),
+    St.
+
+def_block_label(L, #cg{labels=Labels,used_labels=Used}) ->
+    Lbl = maps:get(L, Labels),
+    case gb_sets:is_member(Lbl, Used) of
+        false -> [];
+        true -> [{label,Lbl}]
+    end.
+
+use_block_labels(Ls, St) ->
+    mapfoldl(fun use_block_label/2, St, Ls).
+
+use_block_label(L, #cg{used_labels=Used,catches=Catches}=St0) ->
+    {Lbl,St} = label_for_block(L, St0),
+    case gb_sets:is_member(L, Catches) of
+        true ->
+            {{catch_tag,{f,Lbl}},
+             St#cg{used_labels=gb_sets:add(Lbl, Used)}};
+        false ->
+            {{f,Lbl},St#cg{used_labels=gb_sets:add(Lbl, Used)}}
+    end.
+
+label_for_block(L, #cg{labels=Labels0}=St0) ->
+    case Labels0 of
+        #{L:=Lbl} ->
+            {Lbl,St0};
+        #{} ->
+            {Lbl,St} = new_label(St0),
+            Labels = Labels0#{L=>Lbl},
+            {Lbl,St#cg{labels=Labels}}
+    end.
+
+%% local_func_label(Name, Arity, State) -> {Label,State'}
+%% local_func_label({Name,Arity}, State) -> {Label,State'}
+%%  Get the function entry label for a local function.
+
+local_func_label(Name, Arity, St) ->
+    local_func_label({Name,Arity}, St).
+
+local_func_label(Key, #cg{functable=Map}=St0) ->
+    case Map of
+       #{Key := Label} ->
+            {Label,St0};
+        _ ->
+            {Label,St} = new_label(St0),
+            {Label,St#cg{functable=Map#{Key => Label}}}
+    end.
+
+%% is_gc_bif(Name, Args) -> true|false.
+%%  Determines whether the BIF Name/Arity might do a GC.
+
+-spec is_gc_bif(atom(), [beam_ssa:value()]) -> boolean().
+
+is_gc_bif(hd, [_]) -> false;
+is_gc_bif(tl, [_]) -> false;
+is_gc_bif(self, []) -> false;
+is_gc_bif(node, []) -> false;
+is_gc_bif(node, [_]) -> false;
+is_gc_bif(element, [_,_]) -> false;
+is_gc_bif(get, [_]) -> false;
+is_gc_bif(is_map_key, [_,_]) -> false;
+is_gc_bif(map_get, [_,_]) -> false;
+is_gc_bif(tuple_size, [_]) -> false;
+is_gc_bif(Bif, Args) ->
+    Arity = length(Args),
+    not (erl_internal:bool_op(Bif, Arity) orelse
+	 erl_internal:new_type_test(Bif, Arity) orelse
+	 erl_internal:comp_op(Bif, Arity)).
+
+%% new_label(St) -> {L,St}.
+
+new_label(#cg{lcount=Next}=St) ->
+    {Next,St#cg{lcount=Next+1}}.
+
+%% call_line(tail|body, Func, Anno) -> [] | [{line,...}].
+%%  Produce a line instruction if it will be needed by the
+%%  call to Func.
+
+call_line(_Context, {extfunc,Mod,Name,Arity}, Anno) ->
+    case erl_bifs:is_safe(Mod, Name, Arity) of
+	false ->
+	    %% The call could be to a BIF.
+	    %% We'll need a line instruction in case the
+	    %% BIF call fails.
+	    [line(Anno)];
+	true ->
+	    %% Call to a safe BIF. Since it cannot fail,
+	    %% we don't need any line instruction here.
+	    []
+    end;
+call_line(body, _, Anno) ->
+    [line(Anno)];
+call_line(tail, local, _) ->
+    %% Tail-recursive call to a local function. A line
+    %% instruction will not be useful.
+    [];
+call_line(tail, _, Anno) ->
+    %% Call to a fun.
+    [line(Anno)].
+
+%% line(Le) -> {line,[] | {location,File,Line}}
+%%  Create a line instruction, containing information about
+%%  the current filename and line number. A line information
+%%  instruction should be placed before any operation that could
+%%  cause an exception.
+
+line(#{location:={File,Line}}) ->
+    {line,[{location,File,Line}]};
+line(#{}) ->
+    {line,[]}.
+
+flatmapfoldl(F, Accu0, [Hd|Tail]) ->
+    {R,Accu1} = F(Hd, Accu0),
+    {Rs,Accu2} = flatmapfoldl(F, Accu1, Tail),
+    {R++Rs,Accu2};
+flatmapfoldl(_, Accu, []) -> {[],Accu}.
diff --git a/lib/compiler/src/beam_ssa_dead.erl b/lib/compiler/src/beam_ssa_dead.erl
new file mode 100644
index 0000000000..e78e4647a8
--- /dev/null
+++ b/lib/compiler/src/beam_ssa_dead.erl
@@ -0,0 +1,1113 @@
+%%
+%% %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%
+%%
+%% Dead code is code that is executed but has no effect. This
+%% optimization pass either removes dead code or jumps around it,
+%% potentially making it unreachable so that it can be dropped
+%% the next time beam_ssa:linearize/1 is called.
+%%
+
+-module(beam_ssa_dead).
+-export([opt/1]).
+
+-include("beam_ssa.hrl").
+-import(lists, [append/1,keymember/3,last/1,member/2,
+                takewhile/2,reverse/1]).
+
+-type used_vars() :: #{beam_ssa:label():=cerl_sets:set(beam_ssa:var_name())}.
+
+-type basic_type_test() :: atom() | {'is_tagged_tuple',pos_integer(),atom()}.
+-type type_test() :: basic_type_test() | {'not',basic_type_test()}.
+-type op_name() :: atom().
+-type basic_rel_op() :: {op_name(),beam_ssa:b_var(),beam_ssa:value()} |
+                         {basic_type_test(),beam_ssa:value()}.
+-type rel_op() :: {op_name(),beam_ssa:b_var(),beam_ssa:value()} |
+                  {type_test(),beam_ssa:value()}.
+
+-record(st,
+        {bs :: beam_ssa:block_map(),
+         us :: used_vars(),
+         skippable :: #{beam_ssa:label():='true'},
+         rel_op=none :: 'none' | rel_op(),
+         target=any :: 'any' | 'one_way' | beam_ssa:label()
+        }).
+
+-spec opt([{Label0,Block0}]) -> [{Label,Block}] when
+      Label0 :: beam_ssa:label(),
+      Block0 :: beam_ssa:b_blk(),
+      Label :: beam_ssa:label(),
+      Block :: beam_ssa:b_blk().
+
+opt(Linear) ->
+    {Used,Skippable} = used_vars(Linear),
+    Blocks0 = maps:from_list(Linear),
+    St0 = #st{bs=Blocks0,us=Used,skippable=Skippable},
+    St = shortcut_opt(St0),
+    #st{bs=Blocks} = combine_eqs(St#st{us=#{}}),
+    beam_ssa:linearize(Blocks).
+
+%%%
+%%% Shortcut br/switch targets.
+%%%
+%%% A br/switch may branch to another br/switch that in turn always
+%%% branches to another target. Rewrite br/switch to refer to the
+%%% ultimate targets directly. That will save execution time, but
+%%% could also reduce the size of the code if some of the original
+%%% targets become unreachable and be deleted.
+%%%
+%%% When rewriting branches, we must be careful not to skip instructions
+%%% that have side effects or that bind variables that will be used
+%%% at the new target.
+%%%
+%%% We must also avoid branching to phi nodes.  The reason is
+%%% twofold. First, we might create a critical edge which is strictly
+%%% forbidden. Second, there will be a branch from a block that is not
+%%% listed in the list of predecessors in the phi node.  Those
+%%% limitations could probably be overcome, but it is not clear how
+%%% much that would improve the code.
+%%%
+
+shortcut_opt(#st{bs=Blocks}=St) ->
+    %% Processing the blocks in reverse post order seems to give more
+    %% opportunities for optimizations compared to post order. (Based on
+    %% running scripts/diffable with both PO and RPO and looking at
+    %% the diff.)
+    %%
+    %% Unfortunately, processing the blocks in reverse post order
+    %% potentially makes the time complexity quadratic, instead of
+    %% linear for post order processing. We avoid drastic slowdowns by
+    %% limiting how far we search forward to a common block that
+    %% both the success and failure label will reach (see the comment
+    %% in the first clause of shortcut_2/5).
+
+    Ls = beam_ssa:rpo(Blocks),
+    shortcut_opt(Ls, #{}, St).
+
+shortcut_opt([L|Ls], Bs, #st{bs=Blocks0}=St) ->
+    #b_blk{is=Is,last=Last0} = Blk0 = get_block(L, St),
+    case shortcut_terminator(Last0, Is, L, Bs, St) of
+        Last0 ->
+            %% No change. No need to update the block.
+            shortcut_opt(Ls, Bs, St);
+        Last ->
+            %% The terminator was simplified in some way.
+            %% Update the block.
+            Blk = Blk0#b_blk{last=Last},
+            Blocks = Blocks0#{L=>Blk},
+            shortcut_opt(Ls, Bs, St#st{bs=Blocks})
+    end;
+shortcut_opt([], _, St) -> St.
+
+shortcut_terminator(#b_br{bool=#b_literal{val=true},succ=Succ0},
+                    _Is, From, Bs, St0) ->
+    St = St0#st{rel_op=none},
+    shortcut(Succ0, From, Bs, St);
+shortcut_terminator(#b_br{bool=#b_var{}=Bool,succ=Succ0,fail=Fail0}=Br,
+                    Is, From, Bs, St0) ->
+    St = St0#st{target=one_way},
+    RelOp = get_rel_op(Bool, Is),
+
+    %% The boolean in a `br` is seldom used by the successors. By
+    %% not binding its value unless it is actually used we might be able
+    %% to skip some work in shortcut/4 and sub/2.
+    SuccBs = bind_var_if_used(Succ0, Bool, #b_literal{val=true}, Bs, St),
+    BrSucc = shortcut(Succ0, From, SuccBs, St#st{rel_op=RelOp}),
+    FailBs = bind_var_if_used(Fail0, Bool, #b_literal{val=false}, Bs, St),
+    BrFail = shortcut(Fail0, From, FailBs, St#st{rel_op=invert_op(RelOp)}),
+
+    case {BrSucc,BrFail} of
+        {#b_br{bool=#b_literal{val=true},succ=Succ},
+         #b_br{bool=#b_literal{val=true},succ=Fail}}
+          when Succ =/= Succ0; Fail =/= Fail0 ->
+            %% One or both of the targets were cut short.
+            beam_ssa:normalize(Br#b_br{succ=Succ,fail=Fail});
+        {_,_} ->
+            %% No change.
+            Br
+    end;
+shortcut_terminator(#b_switch{arg=Bool,list=List0}=Sw, _Is, From, Bs, St) ->
+    List = shortcut_switch(List0, Bool, From, Bs, St),
+    beam_ssa:normalize(Sw#b_switch{list=List});
+shortcut_terminator(Last, _Is, _Bs, _From, _St) ->
+    Last.
+
+shortcut_switch([{Lit,L0}|T], Bool, From, Bs, St0) ->
+    RelOp = {'=:=',Bool,Lit},
+    St = St0#st{rel_op=RelOp},
+    #b_br{bool=#b_literal{val=true},succ=L} =
+        shortcut(L0, From, bind_var(Bool, Lit, Bs), St#st{target=one_way}),
+    [{Lit,L}|shortcut_switch(T, Bool, From, Bs, St0)];
+shortcut_switch([], _, _, _, _) -> [].
+
+shortcut(L, _From, Bs, #st{rel_op=none,target=one_way}) when map_size(Bs) =:= 0 ->
+    %% There is no way that we can find a suitable branch, because there is no
+    %% relational operator stored, there are no bindings, and the block L can't
+    %% have any phi nodes from which we could pick bindings because when the target
+    %% is `one_way`, it implies the From block has a two-way `br` terminator.
+    #b_br{bool=#b_literal{val=true},succ=L,fail=L};
+shortcut(L, From, Bs, St) ->
+    shortcut_1(L, From, Bs, cerl_sets:new(), St).
+
+shortcut_1(L, From, Bs0, UnsetVars0, St) ->
+    case shortcut_2(L, From, Bs0, UnsetVars0, St) of
+        none ->
+            %% No more shortcuts found. Package up the previous
+            %% label in an unconditional branch.
+            #b_br{bool=#b_literal{val=true},succ=L,fail=L};
+        {#b_br{bool=#b_var{}}=Br,_,_} ->
+            %% This is a two-way branch. We can't do any better.
+            Br;
+        {#b_br{bool=#b_literal{val=true},succ=Succ},Bs,UnsetVars} ->
+            %% This is a safe `br`, but try to find a better one.
+            shortcut_1(Succ, L, Bs, UnsetVars, St)
+    end.
+
+%% Try to shortcut this block, branching to a successor.
+shortcut_2(L, From, Bs, UnsetVars, St) ->
+    case cerl_sets:size(UnsetVars) of
+        SetSize when SetSize > 128 ->
+            %% This is an heuristic to limit the search for a forced label
+            %% before it drastically slows down the compiler. Experiments
+            %% with scripts/diffable showed that limits larger than 31 did not
+            %% find any more opportunities for optimization.
+            none;
+        _SetSize ->
+            shortcut_3(L, From, Bs, UnsetVars, St)
+    end.
+
+shortcut_3(L, From, Bs0, UnsetVars0, St) ->
+    #b_blk{is=Is,last=Last} = get_block(L, St),
+    case eval_is(Is, From, Bs0, St) of
+        none ->
+            %% It is not safe to avoid this block because it
+            %% has instructions with potential side effects.
+            none;
+        Bs ->
+            %% The instructions in the block (if any) don't
+            %% have any side effects and can be skipped.
+            %% Evaluate the terminator.
+            case eval_terminator(Last, Bs, St) of
+                none ->
+                    %% The terminator is not suitable (could be
+                    %% because it is a switch that can't be simplified
+                    %% or it is a ret instruction).
+                    none;
+                #b_br{}=Br ->
+                    %% We have a potentially suitable br.
+                    %% Now update the set of variables that will never
+                    %% be set if this block will be skipped.
+                    case update_unset_vars(L, Is, Br, UnsetVars0, St) of
+                        unsafe ->
+                            %% It is unsafe to use this br,
+                            %% because it refers to a variable defined
+                            %% in this block.
+                            shortcut_unsafe_br(Br, L, Bs, UnsetVars0, St);
+                        UnsetVars ->
+                            %% Continue checking whether this br is
+                            %% suitable.
+                            shortcut_test_br(Br, L, Bs, UnsetVars, St)
+                    end
+            end
+    end.
+
+shortcut_test_br(Br, From, Bs, UnsetVars, St) ->
+    case is_br_safe(UnsetVars, Br, St) of
+        false ->
+            shortcut_unsafe_br(Br, From, Bs, UnsetVars, St);
+        true ->
+            shortcut_safe_br(Br, From, Bs, UnsetVars, St)
+    end.
+
+shortcut_unsafe_br(Br, From, Bs, UnsetVars, #st{target=Target}=St) ->
+    %% Branching using this `br` is unsafe, either because it
+    %% is an unconditional branch to a phi node, or because
+    %% one or more of the variables that are not set will be
+    %% used. Try to follow branches of this `br`, to find a
+    %% safe `br`.
+    case Br of
+        #b_br{bool=#b_literal{val=true},succ=L} ->
+            case Target of
+                L ->
+                    %% We have reached the forced target, and it
+                    %% is unsafe. Give up.
+                    none;
+                _ ->
+                    %% Try following this branch to see whether it
+                    %% leads to a safe `br`.
+                    shortcut_2(L, From, Bs, UnsetVars, St)
+            end;
+        #b_br{bool=#b_var{},succ=Succ,fail=Fail} ->
+            case {Succ,Fail} of
+                {L,Target} ->
+                    %% The failure label is the forced target.
+                    %% Try following the success label to see
+                    %% whether it also ultimately ends up at the
+                    %% forced target.
+                    shortcut_2(L, From, Bs, UnsetVars, St);
+                {Target,L} ->
+                    %% The success label is the forced target.
+                    %% Try following the failure label to see
+                    %% whether it also ultimately ends up at the
+                    %% forced target.
+                    shortcut_2(L, From, Bs, UnsetVars, St);
+                {_,_} ->
+                    case Target of
+                        any ->
+                            %% This two-way branch is unsafe. Try
+                            %% reducing it to a one-way branch.
+                            shortcut_two_way(Br, From, Bs, UnsetVars, St);
+                        one_way ->
+                            %% This two-way branch is unsafe. Try
+                            %% reducing it to a one-way branch.
+                            shortcut_two_way(Br, From, Bs, UnsetVars, St);
+                        _ when is_integer(Target) ->
+                            %% This two-way branch is unsafe, and
+                            %% there already is a forced target.
+                            %% Give up.
+                            none
+                    end
+            end
+    end.
+
+shortcut_safe_br(Br, From, Bs, UnsetVars, #st{target=Target}=St) ->
+    %% This `br` instruction is safe. It does not branch to a phi
+    %% node, and all variables that will be used are guaranteed to be
+    %% defined.
+    case Br of
+        #b_br{bool=#b_literal{val=true},succ=L} ->
+            %% This is a one-way branch.
+            case Target of
+                any ->
+                    %% No forced target. Success!
+                    {Br,Bs,UnsetVars};
+                one_way ->
+                    %% The target must be a one-way branch, which this
+                    %% `br` is. Success!
+                    {Br,Bs,UnsetVars};
+                L when is_integer(Target) ->
+                    %% The forced target is L. Success!
+                    {Br,Bs,UnsetVars};
+                _ when is_integer(Target) ->
+                    %% Wrong forced target. Try following this branch
+                    %% to see if it ultimately ends up at the forced
+                    %% target.
+                    shortcut_2(L, From, Bs, UnsetVars, St)
+            end;
+        #b_br{bool=#b_var{}} ->
+            %% This is a two-way branch.
+            if
+                Target =:= any; Target =:= one_way ->
+                    %% No specific forced target. Try to reduce the
+                    %% two-way branch to an one-way branch.
+                    case shortcut_two_way(Br, From, Bs, UnsetVars, St) of
+                        none when Target =:= any ->
+                            %% This `br` can't be reduced to a one-way
+                            %% branch. Return the `br` as-is.
+                            {Br,Bs,UnsetVars};
+                        none when Target =:= one_way ->
+                            %% This `br` can't be reduced to a one-way
+                            %% branch. The caller wants a one-way
+                            %% branch.  Give up.
+                            none;
+                        {_,_,_}=Res ->
+                            %% This `br` was successfully reduced to a
+                            %% one-way branch.
+                            Res
+                    end;
+                is_integer(Target) ->
+                    %% There is a forced target, which can't
+                    %% be reached because this `br` is a two-way
+                    %% branch. Give up.
+                    none
+            end
+    end.
+
+update_unset_vars(L, Is, Br, UnsetVars, #st{skippable=Skippable}) ->
+    case is_map_key(L, Skippable) of
+        true ->
+            %% None of the variables used in this block are used in
+            %% the successors. Thus, there is no need to add the
+            %% variables to the set of unset variables.
+            case Br of
+                #b_br{bool=#b_var{}=Bool} ->
+                    case keymember(Bool, #b_set.dst, Is) of
+                        true ->
+                            %% Bool is a variable defined in this
+                            %% block. Using the br instruction from
+                            %% this block (and skipping the body of
+                            %% the block) is unsafe.
+                            unsafe;
+                        false ->
+                            %% Bool is either a variable not defined
+                            %% in this block or a literal. Adding it
+                            %% to the UnsetVars set would not change
+                            %% the outcome of the tests in
+                            %% is_br_safe/2.
+                            UnsetVars
+                    end;
+                #b_br{} ->
+                    UnsetVars
+            end;
+        false ->
+            %% Some variables defined in this block are used by
+            %% successors. We must update the set of unset variables.
+            SetInThisBlock = [V || #b_set{dst=V} <- Is],
+            cerl_sets:union(UnsetVars, cerl_sets:from_list(SetInThisBlock))
+    end.
+
+shortcut_two_way(#b_br{succ=Succ,fail=Fail}, From, Bs0, UnsetVars0, St0) ->
+    case shortcut_2(Succ, From, Bs0, UnsetVars0, St0#st{target=Fail}) of
+        {#b_br{bool=#b_literal{},succ=Fail},_,_}=Res ->
+            Res;
+        none ->
+            St = St0#st{target=Succ},
+            case shortcut_2(Fail, From, Bs0, UnsetVars0, St) of
+                {#b_br{bool=#b_literal{},succ=Succ},_,_}=Res ->
+                    Res;
+                none ->
+                    none
+            end
+    end.
+
+get_block(L, St) ->
+    #st{bs=#{L:=Blk}} = St,
+    Blk.
+
+is_br_safe(UnsetVars, Br, #st{us=Us}=St) ->
+    %% Check that none of the unset variables will be used.
+    case Br of
+        #b_br{bool=#b_var{}=V,succ=Succ,fail=Fail} ->
+            #{Succ:=Used0,Fail:=Used1} = Us,
+
+            %% A two-way branch never branches to a phi node, so there
+            %% is no need to check for phi nodes here.
+            not cerl_sets:is_element(V, UnsetVars) andalso
+                cerl_sets:is_disjoint(Used0, UnsetVars) andalso
+                cerl_sets:is_disjoint(Used1, UnsetVars);
+        #b_br{succ=Same,fail=Same} ->
+            %% An unconditional branch must not jump to
+            %% a phi node.
+            not is_forbidden(Same, St) andalso
+                cerl_sets:is_disjoint(map_get(Same, Us), UnsetVars)
+    end.
+
+is_forbidden(L, St) ->
+    case get_block(L, St) of
+        #b_blk{is=[#b_set{op=phi}|_]} -> true;
+        #b_blk{is=[#b_set{op=peek_message}|_]} -> true;
+        #b_blk{} -> false
+    end.
+
+
+%% Evaluate the instructions in the block.
+%% Return the updated bindings, or 'none' if there is
+%% any instruction with potential side effects.
+
+eval_is([#b_set{op=phi,dst=Dst,args=Args}|Is], From, Bs0, St) ->
+    Val = get_phi_arg(Args, From),
+    Bs = bind_var(Dst, Val, Bs0),
+    eval_is(Is, From, Bs, St);
+eval_is([#b_set{op={bif,_},dst=Dst}=I0|Is], From, Bs, St) ->
+    I = sub(I0, Bs),
+    case eval_bif(I, St) of
+        #b_literal{}=Val ->
+            eval_is(Is, From, bind_var(Dst, Val, Bs), St);
+        none ->
+            eval_is(Is, From, Bs, St)
+    end;
+eval_is([#b_set{op=Op,dst=Dst}=I|Is], From, Bs, St)
+  when Op =:= is_tagged_tuple; Op =:= is_nonempty_list ->
+    #b_set{args=Args} = sub(I, Bs),
+    case eval_rel_op(Op, Args, St) of
+        #b_literal{}=Val ->
+            eval_is(Is, From, bind_var(Dst, Val, Bs), St);
+        none ->
+            eval_is(Is, From, Bs, St)
+    end;
+eval_is([#b_set{}=I|Is], From, Bs, St) ->
+    case beam_ssa:no_side_effect(I) of
+        true ->
+            %% This instruction has no side effects. It can
+            %% safely be omitted.
+            eval_is(Is, From, Bs, St);
+        false ->
+            %% This instruction may have some side effect.
+            %% It is not safe to avoid this instruction.
+            none
+    end;
+eval_is([], _From, Bs, _St) -> Bs.
+
+get_phi_arg([{Val,From}|_], From) -> Val;
+get_phi_arg([_|As], From) -> get_phi_arg(As, From).
+
+eval_terminator(#b_br{bool=#b_var{}=Bool}=Br, Bs, _St) ->
+    case get_value(Bool, Bs) of
+        #b_literal{val=Val}=Lit ->
+            case is_boolean(Val) of
+                true ->
+                    beam_ssa:normalize(Br#b_br{bool=Lit});
+                false ->
+                    %% Non-boolean literal. This means that this `br`
+                    %% terminator will never actually be reached with
+                    %% these bindings. (There must be a previous two-way
+                    %% branch that branches the other way when Bool
+                    %% is bound to a non-boolean literal.)
+                    none
+            end;
+        #b_var{}=Var ->
+            beam_ssa:normalize(Br#b_br{bool=Var})
+    end;
+eval_terminator(#b_br{bool=#b_literal{}}=Br, _Bs, _St) ->
+    beam_ssa:normalize(Br);
+eval_terminator(#b_switch{arg=Arg,fail=Fail,list=List}=Sw, Bs, St) ->
+    case get_value(Arg, Bs) of
+        #b_literal{}=Val ->
+            %% Literal argument. Simplify to a `br`.
+            beam_ssa:normalize(Sw#b_switch{arg=Val});
+        #b_var{} ->
+            %% Try optimizing the switch.
+            case eval_switch(List, Arg, St, Fail) of
+                none ->
+                    none;
+                To when is_integer(To) ->
+                    %% Either one of the values in the switch
+                    %% matched a previous value in a '=:=' test, or
+                    %% none of the values matched a previous test.
+                    #b_br{bool=#b_literal{val=true},succ=To,fail=To}
+            end
+    end;
+eval_terminator(#b_ret{}, _Bs, _St) ->
+    none.
+
+eval_switch(List, Arg, #st{rel_op={_,Arg,_}=PrevOp}, Fail) ->
+    %% There is a previous relational operator testing the same variable.
+    %% Optimization may be possible.
+    eval_switch_1(List, Arg, PrevOp, Fail);
+eval_switch(_, _, _, _) ->
+    %% There is either no previous relational operator, or it tests
+    %% a different variable. Nothing to optimize.
+    none.
+
+eval_switch_1([{Lit,Lbl}|T], Arg, PrevOp, Fail) ->
+    RelOp = {'=:=',Arg,Lit},
+    case will_succeed(PrevOp, RelOp) of
+        yes ->
+            %% Success. This branch will always be taken.
+            Lbl;
+        no ->
+            %% This branch will never be taken.
+            eval_switch_1(T, Arg, PrevOp, Fail);
+        maybe ->
+            %% This label could be reached.
+            eval_switch_1(T, Arg, PrevOp, none)
+    end;
+eval_switch_1([], _Arg, _PrevOp, Fail) ->
+    %% Fail is now either the failure label or 'none'.
+    Fail.
+
+bind_var_if_used(L, Var, Val0, Bs, #st{us=Us}) ->
+    case cerl_sets:is_element(Var, map_get(L, Us)) of
+        true ->
+            Val = get_value(Val0, Bs),
+            Bs#{Var=>Val};
+        false ->
+            Bs
+    end.
+
+bind_var(Var, Val0, Bs) ->
+    Val = get_value(Val0, Bs),
+    Bs#{Var=>Val}.
+
+get_value(#b_var{}=Var, Bs) ->
+    case Bs of
+        #{Var:=Val} -> get_value(Val, Bs);
+        #{} -> Var
+    end;
+get_value(#b_literal{}=Lit, _Bs) -> Lit.
+
+eval_bif(#b_set{op={bif,Bif},args=Args}, St) ->
+    Arity = length(Args),
+    case erl_bifs:is_pure(erlang, Bif, Arity) of
+        false ->
+            none;
+        true ->
+            case get_lit_args(Args) of
+                none ->
+                    %% Not literal arguments. Try to evaluate
+                    %% it based on a previous relational operator.
+                    eval_rel_op({bif,Bif}, Args, St);
+                LitArgs ->
+                    try apply(erlang, Bif, LitArgs) of
+                        Val -> #b_literal{val=Val}
+                    catch
+                        error:_ -> none
+                    end
+            end
+    end.
+
+get_lit_args([#b_literal{val=Lit1}]) ->
+    [Lit1];
+get_lit_args([#b_literal{val=Lit1},
+              #b_literal{val=Lit2}]) ->
+    [Lit1,Lit2];
+get_lit_args([#b_literal{val=Lit1},
+              #b_literal{val=Lit2},
+              #b_literal{val=Lit3}]) ->
+    [Lit1,Lit2,Lit3];
+get_lit_args(_) -> none.
+
+%%%
+%%% Handling of relational operators.
+%%%
+
+get_rel_op(Bool, [_|_]=Is) ->
+    case last(Is) of
+        #b_set{op=Op,dst=Bool,args=Args} ->
+            normalize_op(Op, Args);
+        #b_set{} ->
+            none
+    end;
+get_rel_op(_, []) -> none.
+
+%% normalize_op(Instruction) -> {Normalized,FailLabel} | error
+%%    Normalized = {Operator,Variable,Variable|Literal} |
+%%                 {TypeTest,Variable}
+%%    Operation = '<' | '=<' | '=:=' | '=/=' | '>=' | '>'
+%%    TypeTest = is_atom | is_integer ...
+%%    Variable = #b_var{}
+%%    Literal = #b_literal{}
+%%
+%%  Normalize a relational operator to facilitate further
+%%  comparisons between operators. Always make the register
+%%  operand the first operand. If there are two registers,
+%%  order the registers in lexical order.
+%%
+%%  For example, this instruction:
+%%
+%%    #b_set{op={bif,=<},args=[#b_literal{}, #b_var{}}
+%%
+%%  will be normalized to:
+%%
+%%    {'=<',#b_var{},#b_literal{}}
+
+-spec normalize_op(Op, Args) -> NormalizedOp | 'none' when
+      Op :: beam_ssa:op(),
+      Args :: [beam_ssa:value()],
+      NormalizedOp :: basic_rel_op().
+
+normalize_op(is_tagged_tuple, [Arg,#b_literal{val=Size},#b_literal{val=Tag}])
+  when is_integer(Size), is_atom(Tag) ->
+    {{is_tagged_tuple,Size,Tag},Arg};
+normalize_op(is_nonempty_list, [Arg]) ->
+    {is_nonempty_list,Arg};
+normalize_op({bif,Bif}, [Arg]) ->
+    case erl_internal:new_type_test(Bif, 1) of
+        true -> {Bif,Arg};
+        false -> none
+    end;
+normalize_op({bif,Bif}, [_,_]=Args) ->
+    case erl_internal:comp_op(Bif, 2) of
+        true ->
+            normalize_op_1(Bif, Args);
+        false ->
+            none
+    end;
+normalize_op(_, _) -> none.
+
+normalize_op_1(Bif, Args) ->
+    case Args of
+        [#b_literal{}=Arg1,#b_var{}=Arg2] ->
+            {turn_op(Bif),Arg2,Arg1};
+        [#b_var{}=Arg1,#b_literal{}=Arg2] ->
+            {Bif,Arg1,Arg2};
+        [#b_var{}=A,#b_var{}=B] ->
+            if A < B -> {Bif,A,B};
+               true -> {turn_op(Bif),B,A}
+            end;
+        [#b_literal{},#b_literal{}] ->
+            none
+    end.
+
+-spec invert_op(basic_rel_op() | 'none') -> rel_op() | 'none'.
+
+invert_op({Op,Arg1,Arg2}) ->
+    {invert_op_1(Op),Arg1,Arg2};
+invert_op({TypeTest,Arg}) ->
+    {{'not',TypeTest},Arg};
+invert_op(none) -> none.
+
+invert_op_1('>=') -> '<';
+invert_op_1('<') -> '>=';
+invert_op_1('=<') -> '>';
+invert_op_1('>') -> '=<';
+invert_op_1('=:=') -> '=/=';
+invert_op_1('=/=') -> '=:=';
+invert_op_1('==') -> '/=';
+invert_op_1('/=') -> '=='.
+
+turn_op('<') -> '>';
+turn_op('=<') -> '>=';
+turn_op('>') -> '<';
+turn_op('>=') -> '=<';
+turn_op('=:='=Op) -> Op;
+turn_op('=/='=Op) -> Op;
+turn_op('=='=Op) -> Op;
+turn_op('/='=Op) -> Op.
+
+eval_rel_op(_Bif, _Args, #st{rel_op=none}) ->
+    none;
+eval_rel_op(Bif, Args, #st{rel_op=Prev}) ->
+    case normalize_op(Bif, Args) of
+        none ->
+            none;
+        RelOp ->
+            case will_succeed(Prev, RelOp) of
+                yes -> #b_literal{val=true};
+                no -> #b_literal{val=false};
+                maybe -> none
+            end
+    end.
+
+%% will_succeed(PrevCondition, Condition) -> yes | no | maybe
+%%  PrevCondition is a condition known to be true. This function
+%%  will tell whether Condition will succeed.
+
+will_succeed({_Op,_Var,_Value}=Same, {_Op,_Var,_Value}=Same) ->
+    %% Repeated test.
+    yes;
+will_succeed({Op1,Var,#b_literal{val=A}}, {Op2,Var,#b_literal{val=B}}) ->
+    will_succeed_1(Op1, A, Op2, B);
+will_succeed({Op1,Var,#b_var{}=A}, {Op2,Var,#b_var{}=B}) ->
+    will_succeed_vars(Op1, A, Op2, B);
+will_succeed({'=:=',Var,#b_literal{val=A}}, {TypeTest,Var}) ->
+    eval_type_test(TypeTest, A);
+will_succeed({_,_}=Same, {_,_}=Same) ->
+    %% Repeated type test.
+    yes;
+will_succeed({Test1,Var}, {Test2,Var}) ->
+    will_succeed_test(Test1, Test2);
+will_succeed({_,_}, {_,_}) ->
+    maybe;
+will_succeed({_,_}, {_,_,_}) ->
+    maybe;
+will_succeed({_,_,_}, {_,_}) ->
+    maybe;
+will_succeed({_,_,_}, {_,_,_}) ->
+    maybe.
+
+will_succeed_test({'not',Test1}, Test2) ->
+    case Test1 =:= Test2 of
+        true -> no;
+        false -> maybe
+    end;
+will_succeed_test(is_tuple, {is_tagged_tuple,_,_}) ->
+    maybe;
+will_succeed_test({is_tagged_tuple,_,_}, is_tuple) ->
+    yes;
+will_succeed_test(is_list, is_nonempty_list) ->
+    maybe;
+will_succeed_test(is_nonempty_list, is_list) ->
+    yes;
+will_succeed_test(_T1, _T2) ->
+    maybe.
+
+will_succeed_1('=:=', A, '<', B) ->
+    if
+	B =< A -> no;
+	true -> yes
+    end;
+will_succeed_1('=:=', A, '=<', B) ->
+    if
+	B < A -> no;
+	true -> yes
+    end;
+will_succeed_1('=:=', A, '=:=', B) when A =/= B ->
+    no;
+will_succeed_1('=:=', A, '=/=', B) ->
+    if
+	A =:= B -> no;
+	true -> yes
+    end;
+will_succeed_1('=:=', A, '>=', B) ->
+    if
+	B > A -> no;
+	true -> yes
+    end;
+will_succeed_1('=:=', A, '>', B) ->
+    if
+	B >= A -> no;
+	true -> yes
+    end;
+
+will_succeed_1('=/=', A, '=:=', B) when A =:= B -> no;
+
+will_succeed_1('<', A, '=:=', B)  when B >= A -> no;
+will_succeed_1('<', A, '=/=', B)  when B >= A -> yes;
+will_succeed_1('<', A, '<',   B)  when B >= A -> yes;
+will_succeed_1('<', A, '=<',  B)  when B > A  -> yes;
+will_succeed_1('<', A, '>=',  B)  when B > A  -> no;
+will_succeed_1('<', A, '>',   B)  when B >= A -> no;
+
+will_succeed_1('=<', A, '=:=', B) when B > A  -> no;
+will_succeed_1('=<', A, '=/=', B) when B > A  -> yes;
+will_succeed_1('=<', A, '<',   B) when B > A  -> yes;
+will_succeed_1('=<', A, '=<',  B) when B >= A -> yes;
+will_succeed_1('=<', A, '>=',  B) when B > A  -> no;
+will_succeed_1('=<', A, '>',   B) when B >= A -> no;
+
+will_succeed_1('>=', A, '=:=', B) when B < A  -> no;
+will_succeed_1('>=', A, '=/=', B) when B < A  -> yes;
+will_succeed_1('>=', A, '<',   B) when B =< A -> no;
+will_succeed_1('>=', A, '=<',  B) when B < A  -> no;
+will_succeed_1('>=', A, '>=',  B) when B =< A -> yes;
+will_succeed_1('>=', A, '>',   B) when B < A  -> yes;
+
+will_succeed_1('>', A, '=:=', B)  when B =< A -> no;
+will_succeed_1('>', A, '=/=', B)  when B =< A -> yes;
+will_succeed_1('>', A, '<',   B)  when B =< A -> no;
+will_succeed_1('>', A, '=<',  B)  when B < A  -> no;
+will_succeed_1('>', A, '>=',  B)  when B =< A -> yes;
+will_succeed_1('>', A, '>',   B)  when B < A  -> yes;
+
+will_succeed_1('==', A, '==', B) ->
+    if
+	A == B -> yes;
+	true -> no
+    end;
+will_succeed_1('==', A, '/=', B) ->
+    if
+	A == B -> no;
+	true -> yes
+    end;
+will_succeed_1('/=', A, '/=', B) when A == B -> yes;
+will_succeed_1('/=', A, '==', B) when A == B -> no;
+
+will_succeed_1(_, _, _, _) -> maybe.
+
+will_succeed_vars('=/=', Val, '=:=', Val) -> no;
+will_succeed_vars('=:=', Val, '=/=', Val) -> no;
+will_succeed_vars('=:=', Val, '>=',  Val) -> yes;
+will_succeed_vars('=:=', Val, '=<',  Val) -> yes;
+
+will_succeed_vars('/=', Val1, '==', Val2) when Val1 == Val2 -> no;
+will_succeed_vars('==', Val1, '/=', Val2) when Val1 == Val2 -> no;
+
+will_succeed_vars(_, _, _, _) -> maybe.
+
+eval_type_test(Test, Arg) ->
+    case eval_type_test_1(Test, Arg) of
+        true -> yes;
+        false -> no
+    end.
+
+eval_type_test_1(is_nonempty_list, Arg) ->
+    case Arg of
+        [_|_] -> true;
+        _ -> false
+    end;
+eval_type_test_1({is_tagged_tuple,Sz,Tag}, Arg) ->
+    if
+        tuple_size(Arg) =:= Sz, element(1, Arg) =:= Tag ->
+            true;
+        true ->
+            false
+    end;
+eval_type_test_1(Test, Arg) ->
+    erlang:Test(Arg).
+
+%%%
+%%% Combine bif:'=:=' and switch instructions
+%%% to switch instructions.
+%%%
+%%% Consider this code:
+%%%
+%%%     0:
+%%%       @ssa_bool = bif:'=:=' Var, literal 1
+%%%       br @ssa_bool, label 2, label 3
+%%%
+%%%     2:
+%%%       ret literal a
+%%%
+%%%     3:
+%%%       @ssa_bool:7 = bif:'=:=' Var, literal 2
+%%%       br @ssa_bool:7, label 4, label 999
+%%%
+%%%     4:
+%%%       ret literal b
+%%%
+%%%     999:
+%%%       .
+%%%       .
+%%%       .
+%%%
+%%% The two bif:'=:=' instructions can be combined
+%%% to a switch:
+%%%
+%%%     0:
+%%%       switch Var, label 999, [ { literal 1, label 2 },
+%%%                                { literal 2, label 3 } ]
+%%%
+%%%     2:
+%%%       ret literal a
+%%%
+%%%     4:
+%%%       ret literal b
+%%%
+%%%     999:
+%%%       .
+%%%       .
+%%%       .
+%%%
+
+combine_eqs(#st{bs=Blocks}=St) ->
+    Ls = reverse(beam_ssa:rpo(Blocks)),
+    combine_eqs_1(Ls, St).
+
+combine_eqs_1([L|Ls], #st{bs=Blocks0}=St0) ->
+    case comb_get_sw(L, St0) of
+        none ->
+            combine_eqs_1(Ls, St0);
+        {_,Arg,_,Fail0,List0} ->
+            case comb_get_sw(Fail0, St0) of
+                {true,Arg,Fail1,Fail,List1} ->
+                    %% Another switch/br with the same arguments was
+                    %% found. Try combining them.
+                    case combine_lists(Fail1, List0, List1, Blocks0) of
+                        none ->
+                            %% Different types of literals in the lists,
+                            %% or the success cases in the first switch
+                            %% could branch to the second switch
+                            %% (increasing code size and repeating tests).
+                            combine_eqs_1(Ls, St0);
+                        List ->
+                            %% Everything OK! Combine the lists.
+                            Sw0 = #b_switch{arg=Arg,fail=Fail,list=List},
+                            Sw = beam_ssa:normalize(Sw0),
+                            Blk0 = map_get(L, Blocks0),
+                            Blk = Blk0#b_blk{last=Sw},
+                            Blocks = Blocks0#{L:=Blk},
+                            St = St0#st{bs=Blocks},
+                            combine_eqs_1(Ls, St)
+                    end;
+                {true,_OtherArg,_,_,_} ->
+                    %% The other switch/br uses a different Arg.
+                    combine_eqs_1(Ls, St0);
+                {false,_,_,_,_} ->
+                    %% Not safe: Bindings of variables that will be used
+                    %% or execution of instructions with potential
+                    %% side effects will be skipped.
+                    combine_eqs_1(Ls, St0);
+                none ->
+                    %% No switch/br at this label.
+                    combine_eqs_1(Ls, St0)
+            end
+    end;
+combine_eqs_1([], St) -> St.
+
+comb_get_sw(L, Blocks) ->
+    comb_get_sw(L, true, Blocks).
+
+comb_get_sw(L, Safe0, #st{bs=Blocks,skippable=Skippable}) ->
+    #b_blk{is=Is,last=Last} = map_get(L, Blocks),
+    Safe1 = Safe0 andalso is_map_key(L, Skippable),
+    case Last of
+        #b_ret{} ->
+            none;
+        #b_br{bool=#b_var{}=Bool,succ=Succ,fail=Fail} ->
+            case comb_is(Is, Bool, Safe1) of
+                {none,_} ->
+                    none;
+                {#b_set{op={bif,'=:='},args=[#b_var{}=Arg,#b_literal{}=Lit]},Safe} ->
+                    {Safe,Arg,L,Fail,[{Lit,Succ}]};
+                {#b_set{},_} ->
+                    none
+            end;
+        #b_br{} ->
+            none;
+        #b_switch{arg=#b_var{}=Arg,fail=Fail,list=List} ->
+            {none,Safe} = comb_is(Is, none, Safe1),
+            {Safe,Arg,L,Fail,List}
+    end.
+
+comb_is([#b_set{dst=#b_var{}=Bool}=I], Bool, Safe) ->
+    {I,Safe};
+comb_is([#b_set{}=I|Is], Bool, Safe0) ->
+    Safe = Safe0 andalso beam_ssa:no_side_effect(I),
+    comb_is(Is, Bool, Safe);
+comb_is([], _Bool, Safe) ->
+    {none,Safe}.
+
+%% combine_list(Fail, List1, List2, Blocks) -> List|none.
+%%  Try to combine two switch lists, returning the combined
+%%  list or 'none' if not possible.
+%%
+%%  The values in the two lists must be all of the same type.
+%%
+%%  The code reached from the labels in the first list must
+%%  not reach the failure label (if they do, tests could
+%%  be repeated).
+%%
+
+combine_lists(Fail, L1, L2, Blocks) ->
+    Ls = beam_ssa:rpo([Lbl || {_,Lbl} <- L1], Blocks),
+    case member(Fail, Ls) of
+        true ->
+            %% One or more of labels in the first list
+            %% could reach the failure label. That
+            %% means that the second switch/br instruction
+            %% will be retained, increasing code size and
+            %% potentially also execution time.
+            none;
+        false ->
+            %% The combined switch will replace both original
+            %% br/switch instructions, leading to a reduction in code
+            %% size and potentially also in execution time.
+            combine_lists_1(L1, L2)
+    end.
+
+combine_lists_1(List0, List1) ->
+    case are_lists_compatible(List0, List1) of
+        true ->
+            First = maps:from_list(List0),
+            List0 ++ [{Val,Lbl} || {Val,Lbl} <- List1,
+                                   not is_map_key(Val, First)];
+        false ->
+            none
+    end.
+
+are_lists_compatible([{#b_literal{val=Val1},_}|_],
+                     [{#b_literal{val=Val2},_}|_]) ->
+    case lit_type(Val1) of
+        none -> false;
+        Type -> Type =:= lit_type(Val2)
+    end.
+
+lit_type(Val) ->
+    if
+        is_atom(Val) -> atom;
+        is_float(Val) -> float;
+        is_integer(Val) -> integer;
+        true -> none
+    end.
+
+%%%
+%%% Calculate used variables for each block.
+%%%
+
+used_vars(Linear) ->
+    used_vars(reverse(Linear), #{}, #{}).
+
+used_vars([{L,#b_blk{is=Is}=Blk}|Bs], UsedVars0, Skip0) ->
+    %% Calculate the variables used by each block and its
+    %% successors. This information is used by
+    %% shortcut_opt/1.
+
+    Successors = beam_ssa:successors(Blk),
+    Used0 = used_vars_succ(Successors, L, UsedVars0, cerl_sets:new()),
+    Used = used_vars_blk(Blk, Used0),
+    UsedVars = used_vars_phis(Is, L, Used, UsedVars0),
+
+    %% combine_eqs/1 needs different variable usage information than
+    %% shortcut_opt/1. The Skip map will have an entry for each block
+    %% that can be skipped (does not bind any variable used in
+    %% successor). This information is also useful for speeding up
+    %% shortcut_opt/1.
+
+    Defined0 = [Def || #b_set{dst=Def} <- Is],
+    Defined = cerl_sets:from_list(Defined0),
+    MaySkip = cerl_sets:is_disjoint(Defined, Used0),
+    case MaySkip of
+        true ->
+            Skip = Skip0#{L=>true},
+            used_vars(Bs, UsedVars, Skip);
+        false ->
+            used_vars(Bs, UsedVars, Skip0)
+    end;
+used_vars([], UsedVars, Skip) ->
+    {UsedVars,Skip}.
+
+used_vars_succ([S|Ss], L, LiveMap, Live0) ->
+    Key = {S,L},
+    case LiveMap of
+        #{Key:=Live} ->
+            %% The successor has a phi node, and the value for
+            %% this block in the phi node is a variable.
+            used_vars_succ(Ss, L, LiveMap, cerl_sets:union(Live, Live0));
+        #{S:=Live} ->
+            %% No phi node in the successor, or the value for
+            %% this block in the phi node is a literal.
+            used_vars_succ(Ss, L, LiveMap, cerl_sets:union(Live, Live0));
+        #{} ->
+            %% A peek_message block which has not been processed yet.
+            used_vars_succ(Ss, L, LiveMap, Live0)
+    end;
+used_vars_succ([], _, _, Acc) -> Acc.
+
+used_vars_phis(Is, L, Live0, UsedVars0) ->
+    UsedVars = UsedVars0#{L=>Live0},
+    Phis = takewhile(fun(#b_set{op=Op}) -> Op =:= phi end, Is),
+    case Phis of
+        [] ->
+            UsedVars;
+        [_|_] ->
+            PhiArgs = append([Args || #b_set{args=Args} <- Phis]),
+            case [{P,V} || {#b_var{}=V,P} <- PhiArgs] of
+                [_|_]=PhiVars ->
+                    PhiLive0 = rel2fam(PhiVars),
+                    PhiLive = [{{L,P},cerl_sets:union(cerl_sets:from_list(Vs), Live0)} ||
+                                  {P,Vs} <- PhiLive0],
+                    maps:merge(UsedVars, maps:from_list(PhiLive));
+                [] ->
+                    %% There were only literals in the phi node(s).
+                    UsedVars
+            end
+    end.
+
+used_vars_blk(#b_blk{is=Is,last=Last}, Used0) ->
+    Used = cerl_sets:union(Used0, cerl_sets:from_list(beam_ssa:used(Last))),
+    used_vars_is(reverse(Is), Used).
+
+used_vars_is([#b_set{op=phi}|Is], Used) ->
+    used_vars_is(Is, Used);
+used_vars_is([#b_set{dst=Dst}=I|Is], Used0) ->
+    Used1 = cerl_sets:union(Used0, cerl_sets:from_list(beam_ssa:used(I))),
+    Used = cerl_sets:del_element(Dst, Used1),
+    used_vars_is(Is, Used);
+used_vars_is([], Used) ->
+    Used.
+
+%%%
+%%% Common utilities.
+%%%
+
+sub(#b_set{args=Args}=I, Sub) when map_size(Sub) =/= 0 ->
+    I#b_set{args=[sub_arg(A, Sub) || A <- Args]};
+sub(I, _Sub) -> I.
+
+sub_arg(#b_var{}=Old, Sub) ->
+    case Sub of
+        #{Old:=New} -> New;
+        #{} -> Old
+    end;
+sub_arg(Old, _Sub) -> Old.
+
+rel2fam(S0) ->
+    S1 = sofs:relation(S0),
+    S = sofs:rel2fam(S1),
+    sofs:to_external(S).
diff --git a/lib/compiler/src/beam_ssa_funs.erl b/lib/compiler/src/beam_ssa_funs.erl
new file mode 100644
index 0000000000..e77c00fa89
--- /dev/null
+++ b/lib/compiler/src/beam_ssa_funs.erl
@@ -0,0 +1,149 @@
+%%
+%% %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%
+%%
+
+%%%
+%%% If a fun is defined locally and only used for calls, it can be replaced
+%%% with direct calls to the relevant function. This greatly speeds up "named
+%%% functions" (which rely on make_fun to recreate themselves) and macros that
+%%% wrap their body in a fun.
+%%%
+
+-module(beam_ssa_funs).
+
+-export([module/2]).
+
+-include("beam_ssa.hrl").
+
+-import(lists, [foldl/3]).
+
+-spec module(Module, Options) -> Result when
+      Module :: beam_ssa:b_module(),
+      Options :: [compile:option()],
+      Result :: {ok, beam_ssa:b_module()}.
+
+module(#b_module{body=Fs0}=Module, _Opts) ->
+    Trampolines = foldl(fun find_trampolines/2, #{}, Fs0),
+    Fs = [lfo(F, Trampolines) || F <- Fs0],
+    {ok, Module#b_module{body=Fs}}.
+
+%% If a function does absolutely nothing beyond calling another function with
+%% the same arguments in the same order, we can shave off a call by short-
+%% circuiting it.
+find_trampolines(#b_function{args=Args,bs=Blocks}=F, Trampolines) ->
+    case map_get(0, Blocks) of
+        #b_blk{is=[#b_set{op=call,
+                          args=[#b_local{}=Actual | Args],
+                          dst=Dst}],
+               last=#b_ret{arg=Dst}} ->
+            {_, Name, Arity} = beam_ssa:get_anno(func_info, F),
+            Trampoline = #b_local{name=#b_literal{val=Name},arity=Arity},
+            Trampolines#{Trampoline => Actual};
+        _ ->
+            Trampolines
+    end.
+
+lfo(#b_function{bs=Blocks0}=F, Trampolines) ->
+    Linear0 = beam_ssa:linearize(Blocks0),
+    Linear = lfo_optimize(Linear0, lfo_analyze(Linear0, #{}), Trampolines),
+    F#b_function{bs=maps:from_list(Linear)}.
+
+%% Gather a map of the locally defined funs that are only used for calls.
+lfo_analyze([{_L,#b_blk{is=Is,last=Last}}|Bs], LFuns0) ->
+    LFuns = lfo_analyze_last(Last, lfo_analyze_is(Is, LFuns0)),
+    lfo_analyze(Bs, LFuns);
+lfo_analyze([], LFuns) ->
+    LFuns.
+
+lfo_analyze_is([#b_set{op=make_fun,
+                       dst=Dst,
+                       args=[#b_local{} | FreeVars]}=Def | Is],
+               LFuns0) ->
+    LFuns = maps:put(Dst, Def, maps:without(FreeVars, LFuns0)),
+    lfo_analyze_is(Is, LFuns);
+lfo_analyze_is([#b_set{op=call,
+                       args=[Fun | CallArgs]} | Is],
+               LFuns) when is_map_key(Fun, LFuns) ->
+    #b_set{args=[#b_local{arity=Arity} | FreeVars]} = map_get(Fun, LFuns),
+    case length(CallArgs) + length(FreeVars) of
+        Arity ->
+            lfo_analyze_is(Is, maps:without(CallArgs, LFuns));
+        _ ->
+            %% This will `badarity` at runtime, and it's easier to disable the
+            %% optimization than to simulate it.
+            lfo_analyze_is(Is, maps:without([Fun | CallArgs], LFuns))
+    end;
+lfo_analyze_is([#b_set{args=Args} | Is], LFuns) when map_size(LFuns) =/= 0 ->
+    %% We disqualify funs that are used outside calls because this forces them
+    %% to be created anyway, and the slight performance gain from direct calls
+    %% is not enough to offset the potential increase in stack frame size (the
+    %% free variables need to be kept alive until the call).
+    %%
+    %% This is also a kludge to make HiPE work, as the latter will generate
+    %% code with the assumption that the functions referenced in a make_fun
+    %% will only be used by funs, which will not be the case if we mix it with
+    %% direct calls. See cerl_cconv.erl for details.
+    %%
+    %% Future optimizations like delaying fun creation until use may require us
+    %% to copy affected functions so that HiPE gets its own to play with (until
+    %% HiPE is fixed anyway).
+    lfo_analyze_is(Is, maps:without(Args, LFuns));
+lfo_analyze_is([_ | Is], LFuns) ->
+    lfo_analyze_is(Is, LFuns);
+lfo_analyze_is([], LFuns) ->
+    LFuns.
+
+lfo_analyze_last(#b_switch{arg=Arg}, LFuns) ->
+    maps:remove(Arg, LFuns);
+lfo_analyze_last(#b_ret{arg=Arg}, LFuns) ->
+    maps:remove(Arg, LFuns);
+lfo_analyze_last(_, LFuns) ->
+    LFuns.
+
+%% Replace all calls of suitable funs with a direct call to their
+%% implementation. Liveness optimization will get rid of the make_fun
+%% instruction.
+lfo_optimize(Linear, LFuns, _Trampolines) when map_size(LFuns) =:= 0 ->
+    Linear;
+lfo_optimize(Linear, LFuns, Trampolines) ->
+    lfo_optimize_1(Linear, LFuns, Trampolines).
+
+lfo_optimize_1([{L,#b_blk{is=Is0}=Blk}|Bs], LFuns, Trampolines) ->
+    Is = lfo_optimize_is(Is0, LFuns, Trampolines),
+    [{L,Blk#b_blk{is=Is}} | lfo_optimize_1(Bs, LFuns, Trampolines)];
+lfo_optimize_1([], _LFuns, _Trampolines) ->
+    [].
+
+lfo_optimize_is([#b_set{op=call,
+                        args=[Fun | CallArgs]}=Call0 | Is],
+                LFuns, Trampolines) when is_map_key(Fun, LFuns) ->
+    #b_set{args=[Local | FreeVars]} = map_get(Fun, LFuns),
+    Args = [lfo_short_circuit(Local, Trampolines) | CallArgs ++ FreeVars],
+    Call = beam_ssa:add_anno(local_fun_opt, Fun, Call0#b_set{args=Args}),
+    [Call | lfo_optimize_is(Is, LFuns, Trampolines)];
+lfo_optimize_is([I | Is], LFuns, Trampolines) ->
+    [I | lfo_optimize_is(Is, LFuns, Trampolines)];
+lfo_optimize_is([], _LFuns, _Trampolines) ->
+    [].
+
+lfo_short_circuit(Call, Trampolines) ->
+    case maps:find(Call, Trampolines) of
+        {ok, Other} -> lfo_short_circuit(Other, Trampolines);
+        error -> Call
+    end.
diff --git a/lib/compiler/src/beam_ssa_lint.erl b/lib/compiler/src/beam_ssa_lint.erl
new file mode 100644
index 0000000000..a003607dab
--- /dev/null
+++ b/lib/compiler/src/beam_ssa_lint.erl
@@ -0,0 +1,349 @@
+%%
+%% %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%
+%%
+%% Purpose: Internal consistency checks for the beam_ssa format.
+
+-module(beam_ssa_lint).
+
+-export([module/2, format_error/1]).
+
+-import(lists, [append/1, foldl/3, foreach/2]).
+
+-include("beam_ssa.hrl").
+
+-spec module(#b_module{}, [compile:option()]) ->
+                    {'ok',#b_module{}} | {'error',list()}.
+module(#b_module{body=Fs,name=Name}=Mod0, _Options) ->
+    Es0 = append([validate_function(F) || F <- Fs]),
+    case [{?MODULE,E} || E <- Es0] of
+        [] ->
+            {ok, Mod0};
+        [_|_]=Es ->
+            {error,[{atom_to_list(Name), Es}]}
+    end.
+
+-spec format_error(term()) -> iolist().
+format_error({{_M,F,A},{redefined_variable, Name, Old, I}}) ->
+    io_lib:format("~p/~p: Variable ~ts (~ts) redefined by ~ts",
+                  [F, A, format_var(Name), format_instr(Old), format_instr(I)]);
+format_error({{_M,F,A},{missing_phi_paths, Paths, I}}) ->
+    io_lib:format("~p/~p: Phi node ~ts doesn't define a value for these "
+                  "branches: ~w",
+                  [F, A, format_instr(I), Paths]);
+format_error({{_M,F,A},{garbage_phi_paths, Paths, I}}) ->
+    io_lib:format("~p/~p: Phi node ~ts defines a value for these unreachable "
+                  "or non-existent branches: ~w",
+                  [F, A, format_instr(I), Paths]);
+format_error({{_M,F,A},{unknown_phi_variable, Name, {From, _To}, I}}) ->
+    io_lib:format("~p/~p: Variable ~ts used in phi node ~ts is undefined on "
+                  "branch ~w",
+                  [F, A, format_var(Name), format_instr(I), From]);
+format_error({{_M,F,A},{unknown_block, Label, I}}) ->
+    io_lib:format("~p/~p: Unknown block ~p referenced in ~ts",
+                  [F, A, Label, I]);
+format_error({{_M,F,A},{unknown_variable, Name, I}}) ->
+    io_lib:format("~p/~p: Unbound variable ~ts used in ~ts",
+                  [F, A, format_var(Name), format_instr(I)]);
+format_error({{_M,F,A},{phi_inside_block, Name, Id}}) ->
+    io_lib:format("~p/~p: Phi node defining ~ts is not at start of block ~p",
+                  [F, A, format_var(Name), Id]);
+format_error({{_M,F,A},{undefined_label_in_phi, Label, I}}) ->
+    io_lib:format("~p/~p: Unknown block label ~p in phi node ~ts",
+                  [F, A, Label, format_instr(I)]).
+
+format_instr(I) ->
+    [$',beam_ssa_pp:format_instr(I),$'].
+
+format_var(V) ->
+    beam_ssa_pp:format_var(#b_var{name=V}).
+
+validate_function(F) ->
+    try
+        validate_variables(F),
+        []
+    catch
+        throw:Reason ->
+            #{func_info:=MFA} = F#b_function.anno,
+            [{MFA,Reason}];
+        Class:Error:Stack ->
+            io:fwrite("Function: ~p\n", [F#b_function.anno]),
+            erlang:raise(Class, Error, Stack)
+    end.
+
+-type defined_vars() :: gb_sets:set(beam_ssa:var_name()).
+
+-record(vvars,
+        {blocks :: #{ beam_ssa:label() => beam_ssa:b_blk() },
+         branch_def_vars :: #{
+           %% Describes the variable state at the time of this exact branch (phi
+           %% node validation).
+           {From :: beam_ssa:label(), To :: beam_ssa:label()} => defined_vars(),
+           %% Describes the variable state common to all branches leading to this
+           %% label (un/redefined variable validation).
+           beam_ssa:label() => defined_vars() },
+         defined_vars :: defined_vars()}).
+
+-spec validate_variables(beam_ssa:b_function()) -> ok.
+validate_variables(#b_function{ args = Args, bs = Blocks }) ->
+    %% Prefill the mapping with function arguments.
+    ArgNames = vvars_get_varnames(Args),
+    DefVars = gb_sets:from_list(ArgNames),
+    Entry = 0,
+
+    State = #vvars{blocks = Blocks,
+                   branch_def_vars = #{ Entry => DefVars },
+                   defined_vars = DefVars},
+    ok = vvars_assert_unique(Blocks, ArgNames),
+    vvars_phi_nodes(vvars_block(Entry, State)).
+
+%% Checks the uniqueness of all variables across all blocks.
+-spec vvars_assert_unique(Blocks, [beam_ssa:var_name()]) -> ok when
+      Blocks :: #{ beam_ssa:label() => beam_ssa:b_blk() }.
+vvars_assert_unique(Blocks, Args) ->
+    BlockIs = [Is || #b_blk{is=Is} <- maps:values(Blocks)],
+    Defined0 = maps:from_list([{V,argument} || V <- Args]),
+    _ = foldl(fun(Is, Defined) ->
+                      vvars_assert_unique_1(Is, Defined)
+              end, Defined0, BlockIs),
+    ok.
+
+-spec vvars_assert_unique_1(Is, Defined) -> ok when
+    Is :: list(beam_ssa:b_set()),
+    Defined :: #{ beam_ssa:var_name() => beam_ssa:b_set() }.
+vvars_assert_unique_1([#b_set{dst=#b_var{name=DstName}}=I|Is], Defined) ->
+    case Defined of
+        #{DstName:=Old} -> throw({redefined_variable, DstName, Old, I});
+        _ -> vvars_assert_unique_1(Is, Defined#{DstName=>I})
+    end;
+vvars_assert_unique_1([], Defined) ->
+    Defined.
+
+-spec vvars_phi_nodes(State :: #vvars{}) -> ok.
+vvars_phi_nodes(#vvars{ blocks = Blocks }=State) ->
+    _ = [vvars_phi_nodes_1(Is, Id, State) ||
+            {Id, #b_blk{ is = Is }} <- maps:to_list(Blocks)],
+    ok.
+
+-spec vvars_phi_nodes_1(Is, Id, State) -> ok when
+    Is :: list(beam_ssa:b_set()),
+    Id :: beam_ssa:label(),
+    State :: #vvars{}.
+vvars_phi_nodes_1([#b_set{ op = phi, args = Phis }=I | Is], Id, State) ->
+    ok = vvars_assert_phi_paths(Phis, I, Id, State),
+    ok = vvars_assert_phi_vars(Phis, I, Id, State),
+    vvars_phi_nodes_1(Is, Id, State);
+vvars_phi_nodes_1([_ | Is], Id, _State) ->
+    case [Dst || #b_set{op=phi,dst=#b_var{name=Dst}} <- Is] of
+        [Name|_] ->
+            throw({phi_inside_block, Name, Id});
+        [] ->
+            ok
+    end;
+vvars_phi_nodes_1([], _Id, _State) ->
+    ok.
+
+%% Checks whether all paths leading to this phi node are represented, and that
+%% it doesn't reference any non-existent paths.
+-spec vvars_assert_phi_paths(Phis, I, Id, State) -> ok when
+    Phis :: list({beam_ssa:argument(), beam_ssa:label()}),
+    Id :: beam_ssa:label(),
+    I :: beam_ssa:b_set(),
+    State :: #vvars{}.
+vvars_assert_phi_paths(Phis, I, Id, State) ->
+    BranchKeys = maps:keys(State#vvars.branch_def_vars),
+    RequiredPaths = ordsets:from_list([From || {From, To} <- BranchKeys, To =:= Id]),
+    ProvidedPaths = ordsets:from_list([From || {_Value, From} <- Phis]),
+    case ordsets:subtract(RequiredPaths, ProvidedPaths) of
+        [_|_]=MissingPaths -> throw({missing_phi_paths, MissingPaths, I});
+        [] -> ok
+    end.
+    %% %% The following test is sometimes useful to find missing optimizations.
+    %% %% It is commented out, though, because it can be triggered by
+    %% %% by weird but legal code.
+    %% case ordsets:subtract(ProvidedPaths, RequiredPaths) of
+    %%     [_|_]=GarbagePaths -> throw({garbage_phi_paths, GarbagePaths, I});
+    %%     [] -> ok
+    %% end.
+
+%% Checks whether all variables used in this phi node are defined in the branch
+%% they arrived on.
+-spec vvars_assert_phi_vars(Phis, I, Id, State) -> ok when
+    Phis :: list({beam_ssa:argument(), beam_ssa:label()}),
+    Id :: beam_ssa:label(),
+    I :: beam_ssa:b_set(),
+    State :: #vvars{}.
+vvars_assert_phi_vars(Phis, I, Id, #vvars{blocks=Blocks,
+                                          branch_def_vars=BranchDefVars}) ->
+    Vars = [{Var, From} || {#b_var{}=Var, From} <- Phis],
+    foreach(fun({#b_var{name=VarName}, From}) ->
+                    BranchKey = {From, Id},
+                    case BranchDefVars of
+                        #{BranchKey:=DefVars} ->
+                            case gb_sets:is_member(VarName, DefVars) of
+                                true -> ok;
+                                false -> throw({unknown_variable, VarName, I})
+                            end;
+                        #{} ->
+                            throw({unknown_phi_variable, VarName, BranchKey, I})
+                    end
+            end, Vars),
+    Labels = [From || {#b_literal{},From} <- Phis],
+    foreach(fun(Label) ->
+                    case Blocks of
+                        #{Label:=_} ->
+                            ok;
+                        #{} ->
+                            throw({undefined_label_in_phi, Label, I})
+                    end
+            end, Labels).
+
+-spec vvars_block(Id, State) -> #vvars{} when
+    Id :: beam_ssa:label(),
+    State :: #vvars{}.
+vvars_block(Id, State0) ->
+    #{ Id := #b_blk{ is = Is, last = Terminator} } = State0#vvars.blocks,
+    #{ Id := DefVars } = State0#vvars.branch_def_vars,
+    State = State0#vvars{ defined_vars = DefVars },
+    vvars_terminator(Terminator, Id, vvars_block_1(Is, State)).
+
+-spec vvars_block_1(Blocks, State) -> #vvars{} when
+    Blocks :: list(beam_ssa:b_blk()),
+    State :: #vvars{}.
+vvars_block_1([], State) ->
+    State;
+vvars_block_1([#b_set{ dst = #b_var{ name = DstName }, op = phi } | Is], State0) ->
+    %% We don't check phi node arguments at this point since we may not have
+    %% visited their definition yet. They'll be handled later on in
+    %% vvars_phi_nodes/1 after all blocks are processed.
+    vvars_block_1(Is, vvars_save_var(DstName, State0));
+vvars_block_1([#b_set{ dst = #b_var{ name = DstName }, args = Args }=I | Is], State0) ->
+    ok = vvars_assert_args(Args, I, State0),
+    vvars_block_1(Is, vvars_save_var(DstName, State0)).
+
+-spec vvars_terminator(Terminator, From, State) -> #vvars{} when
+    Terminator :: beam_ssa:terminator(),
+    From :: beam_ssa:label(),
+    State :: #vvars{}.
+vvars_terminator(#b_ret{ arg = Arg }=I, _From, State) ->
+    ok = vvars_assert_args([Arg], I, State),
+    State;
+vvars_terminator(#b_switch{arg=Arg,fail=Fail,list=Switch}=I, From, State) ->
+    ok = vvars_assert_args([Arg], I, State),
+    ok = vvars_assert_args([A || {A,_Lbl} <- Switch], I, State),
+    Labels = [Fail | [Lbl || {_Arg, Lbl} <- Switch]],
+    ok = vvars_assert_labels(Labels, I, State),
+    vvars_terminator_1(Labels, From, State);
+vvars_terminator(#b_br{bool=#b_literal{val=true},succ=Succ}=I, From, State) ->
+    Labels = [Succ],
+    ok = vvars_assert_labels(Labels, I, State),
+    vvars_terminator_1(Labels, From, State);
+vvars_terminator(#b_br{bool=#b_literal{val=false},fail=Fail}=I, From, State) ->
+    Labels = [Fail],
+    ok = vvars_assert_labels(Labels, I, State),
+    vvars_terminator_1(Labels, From, State);
+vvars_terminator(#b_br{ bool = Arg, succ = Succ, fail = Fail }=I, From, State) ->
+    ok = vvars_assert_args([Arg], I, State),
+    Labels = [Fail, Succ],
+    ok = vvars_assert_labels(Labels, I, State),
+    vvars_terminator_1(Labels, From, State).
+
+-spec vvars_terminator_1(Labels, From, State) -> #vvars{} when
+    Labels :: list(beam_ssa:label()),
+    From :: beam_ssa:label(),
+    State :: #vvars{}.
+vvars_terminator_1(Labels0, From, State0) ->
+    %% Filter out all branches that have already been taken. This should result
+    %% in either all of Labels0 or an empty list.
+    Labels = [To || To <- Labels0,
+              not maps:is_key({From, To}, State0#vvars.branch_def_vars)],
+    true = Labels =:= Labels0 orelse Labels =:= [], %Assertion
+    State1 = foldl(fun(To, State) ->
+                       vvars_save_branch(From, To, State)
+                   end, State0, Labels),
+    foldl(fun(To, State) ->
+              vvars_block(To, State)
+          end, State1, Labels).
+
+%% Gets all variable names in args, ignoring literals etc
+-spec vvars_get_varnames(Args) -> list(beam_ssa:var_name()) when
+    Args :: list(beam_ssa:argument()).
+vvars_get_varnames(Args) ->
+    [Name || #b_var{ name = Name } <- Args].
+
+%% Checks that all variables in Args are defined in all paths leading to the
+%% current State.
+-spec vvars_assert_args(Args, I, State) -> ok when
+    Args :: list(beam_ssa:argument()),
+    I :: beam_ssa:terminator() | beam_ssa:b_set(),
+    State :: #vvars{}.
+vvars_assert_args(Args, I, #vvars{defined_vars=DefVars}=State) ->
+    foreach(fun(#b_remote{mod=Mod,name=Name}) ->
+                    vvars_assert_args([Mod,Name], I, State);
+               (#b_var{name=Name}) ->
+                    case gb_sets:is_member(Name, DefVars) of
+                        true -> ok;
+                        false -> throw({unknown_variable,Name,I})
+                    end;
+               (_) -> ok
+            end, Args).
+
+%% Checks that all given labels are defined in State.
+-spec vvars_assert_labels(Labels, I, State) -> ok when
+    Labels :: list(beam_ssa:label()),
+    I :: beam_ssa:terminator(),
+    State :: #vvars{}.
+vvars_assert_labels(Labels, I, #vvars{blocks=Blocks}) ->
+    foreach(fun(Label) ->
+                case maps:is_key(Label, Blocks) of
+                    false -> throw({unknown_block, Label, I});
+                    true -> ok
+                end
+            end, Labels).
+
+-spec vvars_save_branch(From, To, State) -> #vvars{} when
+    From :: beam_ssa:label(),
+    To :: beam_ssa:label(),
+    State :: #vvars{}.
+vvars_save_branch(From, To, State) ->
+    DefVars = State#vvars.defined_vars,
+    Branches0 = State#vvars.branch_def_vars,
+    case Branches0 of
+        #{ To := LblDefVars } ->
+            MergedVars = vvars_merge_branches(DefVars, LblDefVars),
+
+            Branches = Branches0#{ To => MergedVars, {From, To} => DefVars },
+            State#vvars { branch_def_vars = Branches };
+        _ ->
+            Branches = Branches0#{ To => DefVars, {From, To} => DefVars },
+            State#vvars { branch_def_vars = Branches }
+    end.
+
+-spec vvars_merge_branches(New, Existing) -> defined_vars() when
+    New :: defined_vars(),
+    Existing :: defined_vars().
+vvars_merge_branches(New, Existing) ->
+    gb_sets:intersection(New, Existing).
+
+-spec vvars_save_var(VarName, State) -> #vvars{} when
+    VarName :: beam_ssa:var_name(),
+    State :: #vvars{}.
+vvars_save_var(VarName, State0) ->
+    %% vvars_assert_unique guarantees that variables are never set twice.
+    DefVars = gb_sets:insert(VarName, State0#vvars.defined_vars),
+    State0#vvars{ defined_vars = DefVars }.
diff --git a/lib/compiler/src/beam_ssa_opt.erl b/lib/compiler/src/beam_ssa_opt.erl
new file mode 100644
index 0000000000..d87c66c272
--- /dev/null
+++ b/lib/compiler/src/beam_ssa_opt.erl
@@ -0,0 +1,2303 @@
+%%
+%% %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%
+%%
+
+%%%
+%%% This is a collection of various optimizations that don't need a separate
+%%% pass by themselves and/or are mutually beneficial to other passes.
+%%%
+%%% The optimizations are applied in "phases," each with a list of sub-passes
+%%% to run. These sub-passes are applied on all functions in a module before
+%%% moving on to the next phase, which lets us gather module-level information
+%%% in one phase and then apply it in the next without having to risk working
+%%% with incomplete information.
+%%%
+%%% Each sub-pass operates on a #st{} record and a func_info_db(), where the
+%%% former is just a #b_function{} whose blocks can be represented either in
+%%% linear or map form, and the latter is a map with information about all
+%%% functions in the module (see beam_ssa_opt.hrl for more details).
+%%%
+
+-module(beam_ssa_opt).
+-export([module/2]).
+
+-include("beam_ssa_opt.hrl").
+
+-import(lists, [all/2,append/1,duplicate/2,foldl/3,keyfind/3,member/2,
+                reverse/1,reverse/2,
+                splitwith/2,sort/1,takewhile/2,unzip/1]).
+
+-define(DEFAULT_REPETITIONS, 2).
+
+-spec module(beam_ssa:b_module(), [compile:option()]) ->
+                    {'ok',beam_ssa:b_module()}.
+
+-record(st, {ssa :: [{beam_ssa:label(),beam_ssa:b_blk()}] |
+                    beam_ssa:block_map(),
+             args :: [beam_ssa:b_var()],
+             cnt :: beam_ssa:label(),
+             anno :: beam_ssa:anno()}).
+-type st_map() :: #{ func_id() => #st{} }.
+
+module(Module, Opts) ->
+    FuncDb0 = case proplists:get_value(no_module_opt, Opts, false) of
+                  false -> build_func_db(Module);
+                  true -> #{}
+              end,
+
+    %% Passes that perform module-level optimizations are often aided by
+    %% optimizing callers before callees and vice versa, so we optimize all
+    %% functions in call order, flipping it as required.
+    StMap0 = build_st_map(Module),
+    Order = get_call_order_po(StMap0, FuncDb0),
+
+    Phases =
+        [{Order, prologue_passes(Opts)}] ++
+        repeat(Opts, repeated_passes(Opts), Order) ++
+        [{Order, epilogue_passes(Opts)}],
+
+    {StMap, _FuncDb} = foldl(fun({FuncIds, Ps}, {StMap, FuncDb}) ->
+                                     phase(FuncIds, Ps, StMap, FuncDb)
+                             end, {StMap0, FuncDb0}, Phases),
+
+    {ok, finish(Module, StMap)}.
+
+phase([FuncId | Ids], Ps, StMap, FuncDb0) ->
+    try compile:run_sub_passes(Ps, {map_get(FuncId, StMap), FuncDb0}) of
+        {St, FuncDb} ->
+            phase(Ids, Ps, StMap#{ FuncId => St }, FuncDb)
+    catch
+        Class:Error:Stack ->
+            #b_local{name=#b_literal{val=Name},arity=Arity} = FuncId,
+            io:fwrite("Function: ~w/~w\n", [Name,Arity]),
+            erlang:raise(Class, Error, Stack)
+    end;
+phase([], _Ps, StMap, FuncDb) ->
+    {StMap, FuncDb}.
+
+%% Repeats the given passes, alternating the order between runs to make the
+%% type pass more efficient.
+repeat(Opts, Ps, OrderA) ->
+    Repeat = proplists:get_value(ssa_opt_repeat, Opts, ?DEFAULT_REPETITIONS),
+    OrderB = reverse(OrderA),
+    repeat_1(Repeat, Ps, OrderA, OrderB).
+
+repeat_1(0, _Opts, _OrderA, _OrderB) ->
+    [];
+repeat_1(N, Ps, OrderA, OrderB) when N > 0, N rem 2 =:= 0 ->
+    [{OrderA, Ps} | repeat_1(N - 1, Ps, OrderA, OrderB)];
+repeat_1(N, Ps, OrderA, OrderB) when N > 0, N rem 2 =:= 1 ->
+    [{OrderB, Ps} | repeat_1(N - 1, Ps, OrderA, OrderB)].
+
+%%
+
+get_func_id(F) ->
+    {_Mod, Name, Arity} = beam_ssa:get_anno(func_info, F),
+    #b_local{name=#b_literal{val=Name}, arity=Arity}.
+
+-spec build_st_map(#b_module{}) -> st_map().
+build_st_map(#b_module{body=Fs}) ->
+    build_st_map_1(Fs, #{}).
+
+build_st_map_1([F | Fs], Map) ->
+    #b_function{anno=Anno,args=Args,cnt=Counter,bs=Bs} = F,
+    St = #st{anno=Anno,args=Args,cnt=Counter,ssa=Bs},
+    build_st_map_1(Fs, Map#{ get_func_id(F) => St });
+build_st_map_1([], Map) ->
+    Map.
+
+-spec finish(#b_module{}, st_map()) -> #b_module{}.
+finish(#b_module{body=Fs0}=Module, StMap) ->
+    Module#b_module{body=finish_1(Fs0, StMap)}.
+
+finish_1([F0 | Fs], StMap) ->
+    #st{anno=Anno,cnt=Counter,ssa=Blocks} = map_get(get_func_id(F0), StMap),
+    F = F0#b_function{anno=Anno,bs=Blocks,cnt=Counter},
+    [F | finish_1(Fs, StMap)];
+finish_1([], _StMap) ->
+    [].
+
+%%
+
+-define(PASS(N), {N,fun N/1}).
+
+prologue_passes(Opts) ->
+    Ps = [?PASS(ssa_opt_split_blocks),
+          ?PASS(ssa_opt_coalesce_phis),
+          ?PASS(ssa_opt_tail_phis),
+          ?PASS(ssa_opt_element),
+          ?PASS(ssa_opt_linearize),
+          ?PASS(ssa_opt_tuple_size),
+          ?PASS(ssa_opt_record),
+          ?PASS(ssa_opt_cse),                   %Helps the first type pass.
+          ?PASS(ssa_opt_type_start)],
+    passes_1(Ps, Opts).
+
+%% These passes all benefit from each other (in roughly this order), so they
+%% are repeated as required.
+repeated_passes(Opts) ->
+    Ps = [?PASS(ssa_opt_live),
+          ?PASS(ssa_opt_bs_puts),
+          ?PASS(ssa_opt_dead),
+          ?PASS(ssa_opt_cse),
+          ?PASS(ssa_opt_tail_phis),
+          ?PASS(ssa_opt_type_continue)],        %Must run after ssa_opt_dead to
+                                                %clean up phi nodes.
+    passes_1(Ps, Opts).
+
+epilogue_passes(Opts) ->
+    Ps = [?PASS(ssa_opt_type_finish),
+          ?PASS(ssa_opt_float),
+          ?PASS(ssa_opt_sw),
+
+          %% Run live one more time to clean up after the float and sw
+          %% passes.
+          ?PASS(ssa_opt_live),
+          ?PASS(ssa_opt_bsm),
+          ?PASS(ssa_opt_bsm_units),
+          ?PASS(ssa_opt_bsm_shortcut),
+          ?PASS(ssa_opt_blockify),
+          ?PASS(ssa_opt_sink),
+          ?PASS(ssa_opt_merge_blocks),
+          ?PASS(ssa_opt_get_tuple_element),
+          ?PASS(ssa_opt_trim_unreachable)],
+    passes_1(Ps, Opts).
+
+passes_1(Ps, Opts0) ->
+    Negations = [{list_to_atom("no_"++atom_to_list(N)),N} ||
+                    {N,_} <- Ps],
+    Opts = proplists:substitute_negations(Negations, Opts0),
+    [case proplists:get_value(Name, Opts, true) of
+         true ->
+             P;
+         false ->
+             {NoName,Name} = keyfind(Name, 2, Negations),
+             {NoName,fun(S) -> S end}
+     end || {Name,_}=P <- Ps].
+
+%% Builds a function information map with basic information about incoming and
+%% outgoing local calls, as well as whether the function is exported.
+-spec build_func_db(#b_module{}) -> func_info_db().
+build_func_db(#b_module{body=Fs,exports=Exports}) ->
+    try
+        fdb_1(Fs, gb_sets:from_list(Exports), #{})
+    catch
+        %% All module-level optimizations are invalid when a NIF can override a
+        %% function, so we have to bail out.
+        throw:load_nif -> #{}
+    end.
+
+fdb_1([#b_function{ args=Args,bs=Bs }=F | Fs], Exports, FuncDb0) ->
+    Id = get_func_id(F),
+
+    #b_local{name=#b_literal{val=Name}, arity=Arity} = Id,
+    Exported = gb_sets:is_element({Name, Arity}, Exports),
+    ArgTypes = duplicate(length(Args), #{}),
+
+    FuncDb1 = case FuncDb0 of
+                  %% We may have an entry already if someone's called us.
+                  #{ Id := Info } ->
+                      FuncDb0#{ Id := Info#func_info{ exported=Exported,
+                                                      arg_types=ArgTypes }};
+                  #{} ->
+                      FuncDb0#{ Id => #func_info{ exported=Exported,
+                                                  arg_types=ArgTypes }}
+              end,
+
+    FuncDb = beam_ssa:fold_rpo(fun(_L, #b_blk{is=Is}, FuncDb) ->
+                                       fdb_is(Is, Id, FuncDb)
+                               end, FuncDb1, Bs),
+
+    fdb_1(Fs, Exports, FuncDb);
+fdb_1([], _Exports, FuncDb) ->
+    FuncDb.
+
+fdb_is([#b_set{op=call,
+               args=[#b_local{}=Callee | _]} | Is],
+       Caller, FuncDb) ->
+    fdb_is(Is, Caller, fdb_update(Caller, Callee, FuncDb));
+fdb_is([#b_set{op=call,
+               args=[#b_remote{mod=#b_literal{val=erlang},
+                               name=#b_literal{val=load_nif}},
+                     _Path, _LoadInfo]} | _Is], _Caller, _FuncDb) ->
+    throw(load_nif);
+fdb_is([_ | Is], Caller, FuncDb) ->
+    fdb_is(Is, Caller, FuncDb);
+fdb_is([], _Caller, FuncDb) ->
+    FuncDb.
+
+fdb_update(Caller, Callee, FuncDb) ->
+    CallerVertex = maps:get(Caller, FuncDb, #func_info{}),
+    CalleeVertex = maps:get(Callee, FuncDb, #func_info{}),
+
+    Calls = ordsets:add_element(Callee, CallerVertex#func_info.out),
+    CalledBy = ordsets:add_element(Caller, CalleeVertex#func_info.in),
+
+    FuncDb#{ Caller => CallerVertex#func_info{out=Calls},
+             Callee => CalleeVertex#func_info{in=CalledBy} }.
+
+%% Returns the post-order of all local calls in this module. That is,
+%% called functions will be ordered before the functions calling them.
+%%
+%% Functions where module-level optimization is disabled are added last in
+%% arbitrary order.
+
+get_call_order_po(StMap, FuncDb) ->
+    Order = gco_po(FuncDb),
+    Order ++ maps:fold(fun(K, _V, Acc) ->
+                               case is_map_key(K, FuncDb) of
+                                   false -> [K | Acc];
+                                   true -> Acc
+                               end
+                       end, [], StMap).
+
+gco_po(FuncDb) ->
+    All = sort(maps:keys(FuncDb)),
+    {RPO,_} = gco_rpo(All, FuncDb, cerl_sets:new(), []),
+    reverse(RPO).
+
+gco_rpo([Id|Ids], FuncDb, Seen0, Acc0) ->
+    case cerl_sets:is_element(Id, Seen0) of
+        true ->
+            gco_rpo(Ids, FuncDb, Seen0, Acc0);
+        false ->
+            #func_info{out=Successors} = map_get(Id, FuncDb),
+            Seen1 = cerl_sets:add_element(Id, Seen0),
+            {Acc,Seen} = gco_rpo(Successors, FuncDb, Seen1, Acc0),
+            gco_rpo(Ids, FuncDb, Seen, [Id|Acc])
+    end;
+gco_rpo([], _, Seen, Acc) ->
+    {Acc,Seen}.
+
+%%%
+%%% Trivial sub passes.
+%%%
+
+ssa_opt_dead({#st{ssa=Linear}=St, FuncDb}) ->
+    {St#st{ssa=beam_ssa_dead:opt(Linear)}, FuncDb}.
+
+ssa_opt_linearize({#st{ssa=Blocks}=St, FuncDb}) ->
+    {St#st{ssa=beam_ssa:linearize(Blocks)}, FuncDb}.
+
+ssa_opt_type_start({#st{ssa=Linear0,args=Args,anno=Anno}=St0, FuncDb0}) ->
+    {Linear, FuncDb} = beam_ssa_type:opt_start(Linear0, Args, Anno, FuncDb0),
+    {St0#st{ssa=Linear}, FuncDb}.
+
+ssa_opt_type_continue({#st{ssa=Linear0,args=Args,anno=Anno}=St0, FuncDb0}) ->
+    {Linear, FuncDb} = beam_ssa_type:opt_continue(Linear0, Args, Anno, FuncDb0),
+    {St0#st{ssa=Linear}, FuncDb}.
+
+ssa_opt_type_finish({#st{args=Args,anno=Anno0}=St0, FuncDb0}) ->
+    {Anno, FuncDb} = beam_ssa_type:opt_finish(Args, Anno0, FuncDb0),
+    {St0#st{anno=Anno}, FuncDb}.
+
+ssa_opt_blockify({#st{ssa=Linear}=St, FuncDb}) ->
+    {St#st{ssa=maps:from_list(Linear)}, FuncDb}.
+
+ssa_opt_trim_unreachable({#st{ssa=Blocks}=St, FuncDb}) ->
+    {St#st{ssa=beam_ssa:trim_unreachable(Blocks)}, FuncDb}.
+
+%%%
+%%% Split blocks before certain instructions to enable more optimizations.
+%%%
+%%% Splitting before element/2 enables the optimization that swaps
+%%% element/2 instructions.
+%%%
+%%% Splitting before call and make_fun instructions gives more opportunities
+%%% for sinking get_tuple_element instructions.
+%%%
+
+ssa_opt_split_blocks({#st{ssa=Blocks0,cnt=Count0}=St, FuncDb}) ->
+    P = fun(#b_set{op={bif,element}}) -> true;
+           (#b_set{op=call}) -> true;
+           (#b_set{op=make_fun}) -> true;
+           (_) -> false
+        end,
+    {Blocks,Count} = beam_ssa:split_blocks(P, Blocks0, Count0),
+    {St#st{ssa=Blocks,cnt=Count}, FuncDb}.
+
+%%%
+%%% Coalesce phi nodes.
+%%%
+%%% Nested cases can led to code such as this:
+%%%
+%%%     10:
+%%%       _1 = phi {literal value1, label 8}, {Var, label 9}
+%%%       br 11
+%%%
+%%%     11:
+%%%       _2 = phi {_1, label 10}, {literal false, label 3}
+%%%
+%%% The phi nodes can be coalesced like this:
+%%%
+%%%     11:
+%%%       _2 = phi {literal value1, label 8}, {Var, label 9}, {literal false, label 3}
+%%%
+%%% Coalescing can help other optimizations, and can in some cases reduce register
+%%% shuffling (if the phi variables for two phi nodes happens to be allocated to
+%%% different registers).
+%%%
+
+ssa_opt_coalesce_phis({#st{ssa=Blocks0}=St, FuncDb}) ->
+    Ls = beam_ssa:rpo(Blocks0),
+    Blocks = c_phis_1(Ls, Blocks0),
+    {St#st{ssa=Blocks}, FuncDb}.
+
+c_phis_1([L|Ls], Blocks0) ->
+    case map_get(L, Blocks0) of
+        #b_blk{is=[#b_set{op=phi}|_]}=Blk ->
+            Blocks = c_phis_2(L, Blk, Blocks0),
+            c_phis_1(Ls, Blocks);
+        #b_blk{} ->
+            c_phis_1(Ls, Blocks0)
+    end;
+c_phis_1([], Blocks) -> Blocks.
+
+c_phis_2(L, #b_blk{is=Is0}=Blk0, Blocks0) ->
+    case c_phis_args(Is0, Blocks0) of
+        none ->
+            Blocks0;
+        {_,_,Preds}=Info ->
+            Is = c_rewrite_phis(Is0, Info),
+            Blk = Blk0#b_blk{is=Is},
+            Blocks = Blocks0#{L:=Blk},
+            c_fix_branches(Preds, L, Blocks)
+    end.
+
+c_phis_args([#b_set{op=phi,args=Args0}|Is], Blocks) ->
+    case c_phis_args_1(Args0, Blocks) of
+        none ->
+            c_phis_args(Is, Blocks);
+        Res ->
+            Res
+    end;
+c_phis_args(_, _Blocks) -> none.
+
+c_phis_args_1([{Var,Pred}|As], Blocks) ->
+    case c_get_pred_vars(Var, Pred, Blocks) of
+        none ->
+            c_phis_args_1(As, Blocks);
+        Result ->
+            Result
+    end;
+c_phis_args_1([], _Blocks) -> none.
+
+c_get_pred_vars(Var, Pred, Blocks) ->
+    case map_get(Pred, Blocks) of
+        #b_blk{is=[#b_set{op=phi,dst=Var,args=Args}]} ->
+            {Var,Pred,Args};
+        #b_blk{} ->
+            none
+    end.
+
+c_rewrite_phis([#b_set{op=phi,args=Args0}=I|Is], Info) ->
+    Args = c_rewrite_phi(Args0, Info),
+    [I#b_set{args=Args}|c_rewrite_phis(Is, Info)];
+c_rewrite_phis(Is, _Info) -> Is.
+
+c_rewrite_phi([{Var,Pred}|As], {Var,Pred,Values}) ->
+    Values ++ As;
+c_rewrite_phi([{Value,Pred}|As], {_,Pred,Values}) ->
+    [{Value,P} || {_,P} <- Values] ++ As;
+c_rewrite_phi([A|As], Info) ->
+    [A|c_rewrite_phi(As, Info)];
+c_rewrite_phi([], _Info) -> [].
+
+c_fix_branches([{_,Pred}|As], L, Blocks0) ->
+    #b_blk{last=Last0} = Blk0 = map_get(Pred, Blocks0),
+    #b_br{bool=#b_literal{val=true}} = Last0,   %Assertion.
+    Last = Last0#b_br{bool=#b_literal{val=true},succ=L,fail=L},
+    Blk = Blk0#b_blk{last=Last},
+    Blocks = Blocks0#{Pred:=Blk},
+    c_fix_branches(As, L, Blocks);
+c_fix_branches([], _, Blocks) -> Blocks.
+
+%%%
+%%% Eliminate phi nodes in the tail of a function.
+%%%
+%%% Try to eliminate short blocks that starts with a phi node
+%%% and end in a return. For example:
+%%%
+%%%    Result = phi { Res1, 4 }, { literal true, 5 }
+%%%    Ret = put_tuple literal ok, Result
+%%%    ret Ret
+%%%
+%%% The code in this block can be inserted at the end blocks 4 and
+%%% 5. Thus, the following code can be inserted into block 4:
+%%%
+%%%    Ret:1 = put_tuple literal ok, Res1
+%%%    ret Ret:1
+%%%
+%%% And the following code into block 5:
+%%%
+%%%    Ret:2 = put_tuple literal ok, literal true
+%%%    ret Ret:2
+%%%
+%%% Which can be further simplified to:
+%%%
+%%%    ret literal {ok, true}
+%%%
+%%% This transformation may lead to more code improvements:
+%%%
+%%%   - Stack trimming
+%%%   - Fewer test_heap instructions
+%%%   - Smaller stack frames
+%%%
+
+ssa_opt_tail_phis({#st{ssa=SSA0,cnt=Count0}=St, FuncDb}) ->
+    {SSA,Count} = opt_tail_phis(SSA0, Count0),
+    {St#st{ssa=SSA,cnt=Count}, FuncDb}.
+
+opt_tail_phis(Blocks, Count) when is_map(Blocks) ->
+    opt_tail_phis(maps:values(Blocks), Blocks, Count);
+opt_tail_phis(Linear0, Count0) when is_list(Linear0) ->
+    Blocks0 = maps:from_list(Linear0),
+    {Blocks,Count} = opt_tail_phis(Blocks0, Count0),
+    {beam_ssa:linearize(Blocks),Count}.
+
+opt_tail_phis([#b_blk{is=Is0,last=Last}|Bs], Blocks0, Count0) ->
+    case {Is0,Last} of
+        {[#b_set{op=phi,args=[_,_|_]}|_],#b_ret{arg=#b_var{}}=Ret} ->
+            {Phis,Is} = splitwith(fun(#b_set{op=Op}) -> Op =:= phi end, Is0),
+            case suitable_tail_ops(Is) of
+                true ->
+                    {Blocks,Count} = opt_tail_phi(Phis, Is, Ret,
+                                                  Blocks0, Count0),
+                    opt_tail_phis(Bs, Blocks, Count);
+                false ->
+                    opt_tail_phis(Bs, Blocks0, Count0)
+            end;
+        {_,_} ->
+            opt_tail_phis(Bs, Blocks0, Count0)
+    end;
+opt_tail_phis([], Blocks, Count) ->
+    {Blocks,Count}.
+
+opt_tail_phi(Phis0, Is, Ret, Blocks0, Count0) ->
+    Phis = rel2fam(reduce_phis(Phis0)),
+    {Blocks,Count,Cost} =
+        foldl(fun(PhiArg, Acc) ->
+                      opt_tail_phi_arg(PhiArg, Is, Ret, Acc)
+              end, {Blocks0,Count0,0}, Phis),
+    MaxCost = length(Phis) * 3 + 2,
+    if
+        Cost =< MaxCost ->
+            %% The transformation would cause at most a slight
+            %% increase in code size if no more optimizations
+            %% can be applied.
+            {Blocks,Count};
+        true ->
+            %% The code size would be increased too much.
+            {Blocks0,Count0}
+    end.
+
+reduce_phis([#b_set{dst=PhiDst,args=PhiArgs}|Is]) ->
+    [{L,{PhiDst,Val}} || {Val,L} <- PhiArgs] ++ reduce_phis(Is);
+reduce_phis([]) -> [].
+
+opt_tail_phi_arg({PredL,Sub0}, Is0, Ret0, {Blocks0,Count0,Cost0}) ->
+    Blk0 = map_get(PredL, Blocks0),
+    #b_blk{is=IsPrefix,last=#b_br{succ=Next,fail=Next}} = Blk0,
+    case is_exit_bif(IsPrefix) of
+        false ->
+            Sub1 = maps:from_list(Sub0),
+            {Is1,Count,Sub} = new_names(Is0, Sub1, Count0, []),
+            Is2 = [sub(I, Sub) || I <- Is1],
+            Cost = build_cost(Is2, Cost0),
+            Is = IsPrefix ++ Is2,
+            Ret = sub(Ret0, Sub),
+            Blk = Blk0#b_blk{is=Is,last=Ret},
+            Blocks = Blocks0#{PredL:=Blk},
+            {Blocks,Count,Cost};
+        true ->
+            %% The block ends in a call to a function that
+            %% will cause an exception.
+            {Blocks0,Count0,Cost0+3}
+    end.
+
+is_exit_bif([#b_set{op=call,
+                    args=[#b_remote{mod=#b_literal{val=Mod},
+                                    name=#b_literal{val=Name}}|Args]}]) ->
+    erl_bifs:is_exit_bif(Mod, Name, length(Args));
+is_exit_bif(_) -> false.
+
+new_names([#b_set{dst=Dst}=I|Is], Sub0, Count0, Acc) ->
+    {NewDst,Count} = new_var(Dst, Count0),
+    Sub = Sub0#{Dst=>NewDst},
+    new_names(Is, Sub, Count, [I#b_set{dst=NewDst}|Acc]);
+new_names([], Sub, Count, Acc) ->
+    {reverse(Acc),Count,Sub}.
+
+suitable_tail_ops(Is) ->
+    all(fun(#b_set{op=Op}) ->
+                is_suitable_tail_op(Op)
+        end, Is).
+
+is_suitable_tail_op({bif,_}) -> true;
+is_suitable_tail_op(put_list) -> true;
+is_suitable_tail_op(put_tuple) -> true;
+is_suitable_tail_op(_) -> false.
+
+build_cost([#b_set{op=put_list,args=Args}|Is], Cost) ->
+    case are_all_literals(Args) of
+        true ->
+            build_cost(Is, Cost);
+        false ->
+            build_cost(Is, Cost + 1)
+    end;
+build_cost([#b_set{op=put_tuple,args=Args}|Is], Cost) ->
+    case are_all_literals(Args) of
+        true ->
+            build_cost(Is, Cost);
+        false ->
+            build_cost(Is, Cost + length(Args) + 1)
+    end;
+build_cost([#b_set{op={bif,_},args=Args}|Is], Cost) ->
+    case are_all_literals(Args) of
+        true ->
+            build_cost(Is, Cost);
+        false ->
+            build_cost(Is, Cost + 1)
+    end;
+build_cost([], Cost) -> Cost.
+
+are_all_literals(Args) ->
+    all(fun(#b_literal{}) -> true;
+                (_) -> false
+             end, Args).
+
+%%%
+%%% Order element/2 calls.
+%%%
+%%% Order an unbroken chain of element/2 calls for the same tuple
+%%% with the same failure label so that the highest element is
+%%% retrieved first. That will allow the other element/2 calls to
+%%% be replaced with get_tuple_element/3 instructions.
+%%%
+
+ssa_opt_element({#st{ssa=Blocks}=St, FuncDb}) ->
+    %% Collect the information about element instructions in this
+    %% function.
+    GetEls = collect_element_calls(beam_ssa:linearize(Blocks)),
+
+    %% Collect the element instructions into chains. The
+    %% element calls in each chain are ordered in reverse
+    %% execution order.
+    Chains = collect_chains(GetEls, []),
+
+    %% For each chain, swap the first element call with the
+    %% element call with the highest index.
+    {St#st{ssa=swap_element_calls(Chains, Blocks)}, FuncDb}.
+
+collect_element_calls([{L,#b_blk{is=Is0,last=Last}}|Bs]) ->
+    case {Is0,Last} of
+        {[#b_set{op={bif,element},dst=Element,
+                 args=[#b_literal{val=N},#b_var{}=Tuple]},
+          #b_set{op=succeeded,dst=Bool,args=[Element]}],
+         #b_br{bool=Bool,succ=Succ,fail=Fail}} ->
+            Info = {L,Succ,{Tuple,Fail},N},
+            [Info|collect_element_calls(Bs)];
+        {_,_} ->
+            collect_element_calls(Bs)
+    end;
+collect_element_calls([]) -> [].
+
+collect_chains([{This,_,V,_}=El|Els], [{_,This,V,_}|_]=Chain) ->
+    %% Add to the previous chain.
+    collect_chains(Els, [El|Chain]);
+collect_chains([El|Els], [_,_|_]=Chain) ->
+    %% Save the previous chain and start a new chain.
+    [Chain|collect_chains(Els, [El])];
+collect_chains([El|Els], _Chain) ->
+    %% The previous chain is too short; discard it and start a new.
+    collect_chains(Els, [El]);
+collect_chains([], [_,_|_]=Chain) ->
+    %% Save the last chain.
+    [Chain];
+collect_chains([], _) ->  [].
+
+swap_element_calls([[{L,_,_,N}|_]=Chain|Chains], Blocks0) ->
+    Blocks = swap_element_calls_1(Chain, {N,L}, Blocks0),
+    swap_element_calls(Chains, Blocks);
+swap_element_calls([], Blocks) -> Blocks.
+
+swap_element_calls_1([{L1,_,_,N1}], {N2,L2}, Blocks) when N2 > N1 ->
+    %% We have reached the end of the chain, and the first
+    %% element instrution to be executed. Its index is lower
+    %% than the maximum index found while traversing the chain,
+    %% so we will need to swap the instructions.
+    #{L1:=Blk1,L2:=Blk2} = Blocks,
+    [#b_set{dst=Dst1}=GetEl1,Succ1] = Blk1#b_blk.is,
+    [#b_set{dst=Dst2}=GetEl2,Succ2] = Blk2#b_blk.is,
+    Is1 = [GetEl2,Succ1#b_set{args=[Dst2]}],
+    Is2 = [GetEl1,Succ2#b_set{args=[Dst1]}],
+    Blocks#{L1:=Blk1#b_blk{is=Is1},L2:=Blk2#b_blk{is=Is2}};
+swap_element_calls_1([{L,_,_,N1}|Els], {N2,_}, Blocks) when N1 > N2 ->
+    swap_element_calls_1(Els, {N2,L}, Blocks);
+swap_element_calls_1([_|Els], Highest, Blocks) ->
+    swap_element_calls_1(Els, Highest, Blocks);
+swap_element_calls_1([], _, Blocks) ->
+    %% Nothing to do. The element call with highest index
+    %% is already the first one to be executed.
+    Blocks.
+
+%%%
+%%% Record optimization.
+%%%
+%%% Replace tuple matching with an is_tagged_tuple instruction
+%%% when applicable.
+%%%
+
+ssa_opt_record({#st{ssa=Linear}=St, FuncDb}) ->
+    Blocks = maps:from_list(Linear),
+    {St#st{ssa=record_opt(Linear, Blocks)}, FuncDb}.
+
+record_opt([{L,#b_blk{is=Is0,last=Last}=Blk0}|Bs], Blocks) ->
+    Is = record_opt_is(Is0, Last, Blocks),
+    Blk = Blk0#b_blk{is=Is},
+    [{L,Blk}|record_opt(Bs, Blocks)];
+record_opt([], _Blocks) -> [].
+
+record_opt_is([#b_set{op={bif,is_tuple},dst=Bool,args=[Tuple]}=Set],
+              Last, Blocks) ->
+    case is_tagged_tuple(Tuple, Bool, Last, Blocks) of
+        {yes,Size,Tag} ->
+            Args = [Tuple,Size,Tag],
+            [Set#b_set{op=is_tagged_tuple,args=Args}];
+        no ->
+            [Set]
+    end;
+record_opt_is([I|Is]=Is0, #b_br{bool=Bool}=Last, Blocks) ->
+    case is_tagged_tuple_1(Is0, Last, Blocks) of
+        {yes,_Fail,Tuple,Arity,Tag} ->
+            Args = [Tuple,Arity,Tag],
+            [I#b_set{op=is_tagged_tuple,dst=Bool,args=Args}];
+        no ->
+            [I|record_opt_is(Is, Last, Blocks)]
+    end;
+record_opt_is([I|Is], Last, Blocks) ->
+    [I|record_opt_is(Is, Last, Blocks)];
+record_opt_is([], _Last, _Blocks) -> [].
+
+is_tagged_tuple(#b_var{}=Tuple, Bool,
+                #b_br{bool=Bool,succ=Succ,fail=Fail},
+                Blocks) ->
+    #b_blk{is=Is,last=Last} = map_get(Succ, Blocks),
+    case is_tagged_tuple_1(Is, Last, Blocks) of
+        {yes,Fail,Tuple,Arity,Tag} ->
+            {yes,Arity,Tag};
+        _ ->
+            no
+    end;
+is_tagged_tuple(_, _, _, _) -> no.
+
+is_tagged_tuple_1(Is, Last, Blocks) ->
+    case {Is,Last} of
+        {[#b_set{op={bif,tuple_size},dst=ArityVar,
+                 args=[#b_var{}=Tuple]},
+          #b_set{op={bif,'=:='},
+                 dst=Bool,
+                 args=[ArityVar, #b_literal{val=ArityVal}=Arity]}],
+         #b_br{bool=Bool,succ=Succ,fail=Fail}}
+          when is_integer(ArityVal) ->
+            SuccBlk = map_get(Succ, Blocks),
+            case is_tagged_tuple_2(SuccBlk, Tuple, Fail) of
+                no ->
+                    no;
+                {yes,Tag} ->
+                    {yes,Fail,Tuple,Arity,Tag}
+            end;
+        _ ->
+            no
+    end.
+
+is_tagged_tuple_2(#b_blk{is=Is,
+                         last=#b_br{bool=#b_var{}=Bool,fail=Fail}},
+                  Tuple, Fail) ->
+    is_tagged_tuple_3(Is, Bool, Tuple);
+is_tagged_tuple_2(#b_blk{}, _, _) -> no.
+
+is_tagged_tuple_3([#b_set{op=get_tuple_element,
+                          dst=TagVar,
+                          args=[#b_var{}=Tuple,#b_literal{val=0}]}|Is],
+                  Bool, Tuple) ->
+    is_tagged_tuple_4(Is, Bool, TagVar);
+is_tagged_tuple_3([_|Is], Bool, Tuple) ->
+    is_tagged_tuple_3(Is, Bool, Tuple);
+is_tagged_tuple_3([], _, _) -> no.
+
+is_tagged_tuple_4([#b_set{op={bif,'=:='},dst=Bool,
+                          args=[#b_var{}=TagVar,
+                                #b_literal{val=TagVal}=Tag]}],
+                 Bool, TagVar) when is_atom(TagVal) ->
+    {yes,Tag};
+is_tagged_tuple_4([_|Is], Bool, TagVar) ->
+    is_tagged_tuple_4(Is, Bool, TagVar);
+is_tagged_tuple_4([], _, _) -> no.
+
+%%%
+%%% Common subexpression elimination (CSE).
+%%%
+%%% Eliminate repeated evaluation of identical expressions. To avoid
+%%% increasing the size of the stack frame, we don't eliminate
+%%% subexpressions across instructions that clobber the X registers.
+%%%
+
+ssa_opt_cse({#st{ssa=Linear}=St, FuncDb}) ->
+    M = #{0=>#{}},
+    {St#st{ssa=cse(Linear, #{}, M)}, FuncDb}.
+
+cse([{L,#b_blk{is=Is0,last=Last0}=Blk}|Bs], Sub0, M0) ->
+    Es0 = map_get(L, M0),
+    {Is1,Es,Sub} = cse_is(Is0, Es0, Sub0, []),
+    Last = sub(Last0, Sub),
+    M = cse_successors(Is1, Blk, Es, M0),
+    Is = reverse(Is1),
+    [{L,Blk#b_blk{is=Is,last=Last}}|cse(Bs, Sub, M)];
+cse([], _, _) -> [].
+
+cse_successors([#b_set{op=succeeded,args=[Src]},Bif|_], Blk, EsSucc, M0) ->
+    case cse_suitable(Bif) of
+        true ->
+            %% The previous instruction only has a valid value at the success branch.
+            %% We must remove the substitution for Src from the failure branch.
+            #b_blk{last=#b_br{succ=Succ,fail=Fail}} = Blk,
+            M = cse_successors_1([Succ], EsSucc, M0),
+            EsFail = maps:filter(fun(_, Val) -> Val =/= Src end, EsSucc),
+            cse_successors_1([Fail], EsFail, M);
+        false ->
+            %% There can't be any replacement for Src in EsSucc. No need for
+            %% any special handling.
+            cse_successors_1(beam_ssa:successors(Blk), EsSucc, M0)
+    end;
+cse_successors(_Is, Blk, Es, M) ->
+    cse_successors_1(beam_ssa:successors(Blk), Es, M).
+
+cse_successors_1([L|Ls], Es0, M) ->
+    case M of
+        #{L:=Es1} when map_size(Es1) =:= 0 ->
+            %% The map is already empty. No need to do anything
+            %% since the intersection will be empty.
+            cse_successors_1(Ls, Es0, M);
+        #{L:=Es1} ->
+            %% Calculate the intersection of the two maps.
+            %% Both keys and values must match.
+            Es = maps:filter(fun(Key, Value) ->
+                                     case Es1 of
+                                         #{Key:=Value} -> true;
+                                         #{} -> false
+                                     end
+                             end, Es0),
+            cse_successors_1(Ls, Es0, M#{L:=Es});
+        #{} ->
+            cse_successors_1(Ls, Es0, M#{L=>Es0})
+    end;
+cse_successors_1([], _, M) -> M.
+
+cse_is([#b_set{op=succeeded,dst=Bool,args=[Src]}=I0|Is], Es, Sub0, Acc) ->
+    I = sub(I0, Sub0),
+    case I of
+        #b_set{args=[Src]} ->
+            cse_is(Is, Es, Sub0, [I|Acc]);
+        #b_set{} ->
+            %% The previous instruction has been eliminated. Eliminate the
+            %% 'succeeded' instruction too.
+            Sub = Sub0#{Bool=>#b_literal{val=true}},
+            cse_is(Is, Es, Sub, Acc)
+    end;
+cse_is([#b_set{dst=Dst}=I0|Is], Es0, Sub0, Acc) ->
+    I = sub(I0, Sub0),
+    case beam_ssa:clobbers_xregs(I) of
+        true ->
+            %% Retaining the expressions map across calls and other
+            %% clobbering instructions would work, but it would cause
+            %% the common subexpressions to be saved to Y registers,
+            %% which would probably increase the size of the stack
+            %% frame.
+            cse_is(Is, #{}, Sub0, [I|Acc]);
+        false ->
+            case cse_expr(I) of
+                none ->
+                    %% Not suitable for CSE.
+                    cse_is(Is, Es0, Sub0, [I|Acc]);
+                {ok,ExprKey} ->
+                    case Es0 of
+                        #{ExprKey:=Src} ->
+                            Sub = Sub0#{Dst=>Src},
+                            cse_is(Is, Es0, Sub, Acc);
+                        #{} ->
+                            Es = Es0#{ExprKey=>Dst},
+                            cse_is(Is, Es, Sub0, [I|Acc])
+                    end
+            end
+    end;
+cse_is([], Es, Sub, Acc) ->
+    {Acc,Es,Sub}.
+
+cse_expr(#b_set{op=Op,args=Args}=I) ->
+    case cse_suitable(I) of
+        true -> {ok,{Op,Args}};
+        false -> none
+    end.
+
+cse_suitable(#b_set{op=get_hd}) -> true;
+cse_suitable(#b_set{op=get_tl}) -> true;
+cse_suitable(#b_set{op=put_list}) -> true;
+cse_suitable(#b_set{op=get_tuple_element}) -> true;
+cse_suitable(#b_set{op=put_tuple}) -> true;
+cse_suitable(#b_set{op={bif,tuple_size}}) ->
+    %% Doing CSE for tuple_size/1 can prevent the
+    %% creation of test_arity and select_tuple_arity
+    %% instructions. That could decrease performance
+    %% and beam_validator could fail to understand
+    %% that tuple operations that follow are safe.
+    false;
+cse_suitable(#b_set{anno=Anno,op={bif,Name},args=Args}) ->
+    %% Doing CSE for floating point operators is unsafe.
+    %% Doing CSE for comparison operators would prevent
+    %% creation of 'test' instructions.
+    Arity = length(Args),
+    not (is_map_key(float_op, Anno) orelse
+         erl_internal:new_type_test(Name, Arity) orelse
+         erl_internal:comp_op(Name, Arity) orelse
+         erl_internal:bool_op(Name, Arity));
+cse_suitable(#b_set{}) -> false.
+
+%%%
+%%% Using floating point instructions.
+%%%
+%%% Use the special floating points version of arithmetic
+%%% instructions, if the operands are known to be floats or the result
+%%% of the operation will be a float.
+%%%
+%%% The float instructions were never used in guards before, so we
+%%% will take special care to keep not using them in guards.  Using
+%%% them in guards would require a new version of the 'fconv'
+%%% instruction that would take a failure label.  Since it is unlikely
+%%% that using float instructions in guards would be benefical, why
+%%% bother implementing a new instruction?  Also, implementing float
+%%% instructions in guards in HiPE could turn out to be a lot of work.
+%%%
+
+-record(fs,
+        {s=undefined :: 'undefined' | 'cleared',
+         regs=#{} :: #{beam_ssa:b_var():=beam_ssa:b_var()},
+         fail=none :: 'none' | beam_ssa:label(),
+         non_guards :: gb_sets:set(beam_ssa:label()),
+         bs :: beam_ssa:block_map()
+        }).
+
+ssa_opt_float({#st{ssa=Linear0,cnt=Count0}=St, FuncDb}) ->
+    NonGuards = non_guards(Linear0),
+    Blocks = maps:from_list(Linear0),
+    Fs = #fs{non_guards=NonGuards,bs=Blocks},
+    {Linear,Count} = float_opt(Linear0, Count0, Fs),
+    {St#st{ssa=Linear,cnt=Count}, FuncDb}.
+
+float_blk_is_in_guard(#b_blk{last=#b_br{fail=F}}, #fs{non_guards=NonGuards}) ->
+    not gb_sets:is_member(F, NonGuards);
+float_blk_is_in_guard(#b_blk{}, #fs{}) ->
+    false.
+
+float_opt([{L,Blk}|Bs0], Count0, Fs) ->
+    case float_blk_is_in_guard(Blk, Fs) of
+        true ->
+            %% This block is inside a guard. Don't do
+            %% any floating point optimizations.
+            {Bs,Count} = float_opt(Bs0, Count0, Fs),
+            {[{L,Blk}|Bs],Count};
+        false ->
+            %% This block is not inside a guard.
+            %% We can do the optimization.
+            float_opt_1(L, Blk, Bs0, Count0, Fs)
+    end;
+float_opt([], Count, _Fs) ->
+    {[],Count}.
+
+float_opt_1(L, #b_blk{is=Is0}=Blk0, Bs0, Count0, Fs0) ->
+    case float_opt_is(Is0, Fs0, Count0, []) of
+        {Is1,Fs1,Count1} ->
+            Fs2 = float_fail_label(Blk0, Fs1),
+            Fail = Fs2#fs.fail,
+            {Flush,Blk,Fs,Count2} = float_maybe_flush(Blk0, Fs2, Count1),
+            Split = float_split_conv(Is1, Blk),
+            {Blks0,Count3} = float_number(Split, L, Count2),
+            {Blks,Count4} = float_conv(Blks0, Fail, Count3),
+            {Bs,Count} = float_opt(Bs0, Count4, Fs),
+            {Blks++Flush++Bs,Count};
+        none ->
+            {Bs,Count} = float_opt(Bs0, Count0, Fs0),
+            {[{L,Blk0}|Bs],Count}
+    end.
+
+%% Split {float,convert} instructions into individual blocks.
+float_split_conv(Is0, Blk) ->
+    Br = #b_br{bool=#b_literal{val=true},succ=0,fail=0},
+    case splitwith(fun(#b_set{op=Op}) ->
+                           Op =/= {float,convert}
+                   end, Is0) of
+        {Is,[]} ->
+            [Blk#b_blk{is=Is}];
+        {[_|_]=Is1,[#b_set{op={float,convert}}=Conv|Is2]} ->
+            [#b_blk{is=Is1,last=Br},
+             #b_blk{is=[Conv],last=Br}|float_split_conv(Is2, Blk)];
+        {[],[#b_set{op={float,convert}}=Conv|Is1]} ->
+            [#b_blk{is=[Conv],last=Br}|float_split_conv(Is1, Blk)]
+    end.
+
+%% Number the blocks that were split.
+float_number([B|Bs0], FirstL, Count0) ->
+    {Bs,Count} = float_number(Bs0, Count0),
+    {[{FirstL,B}|Bs],Count}.
+
+float_number([B|Bs0], Count0) ->
+    {Bs,Count} = float_number(Bs0, Count0+1),
+    {[{Count0,B}|Bs],Count};
+float_number([], Count) ->
+    {[],Count}.
+
+%% Insert 'succeeded' instructions after each {float,convert}
+%% instruction.
+float_conv([{L,#b_blk{is=Is0}=Blk0}|Bs0], Fail, Count0) ->
+    case Is0 of
+        [#b_set{op={float,convert}}=Conv] ->
+            {Bool0,Count1} = new_reg('@ssa_bool', Count0),
+            Bool = #b_var{name=Bool0},
+            Succeeded = #b_set{op=succeeded,dst=Bool,
+                               args=[Conv#b_set.dst]},
+            Is = [Conv,Succeeded],
+            [{NextL,_}|_] = Bs0,
+            Br = #b_br{bool=Bool,succ=NextL,fail=Fail},
+            Blk = Blk0#b_blk{is=Is,last=Br},
+            {Bs,Count} = float_conv(Bs0, Fail, Count1),
+            {[{L,Blk}|Bs],Count};
+        [_|_] ->
+            case Bs0 of
+                [{NextL,_}|_] ->
+                    Br = #b_br{bool=#b_literal{val=true},
+                               succ=NextL,fail=NextL},
+                    Blk = Blk0#b_blk{last=Br},
+                    {Bs,Count} = float_conv(Bs0, Fail, Count0),
+                    {[{L,Blk}|Bs],Count};
+                [] ->
+                    {[{L,Blk0}],Count0}
+            end
+    end.
+
+float_maybe_flush(Blk0, #fs{s=cleared,fail=Fail,bs=Blocks}=Fs0, Count0) ->
+    #b_blk{last=#b_br{bool=#b_var{},succ=Succ}=Br} = Blk0,
+
+    %% If the success block starts with a floating point operation, we can
+    %% defer flushing to that block as long as it isn't a guard.
+    #b_blk{is=Is} = SuccBlk = map_get(Succ, Blocks),
+    SuccIsGuard = float_blk_is_in_guard(SuccBlk, Fs0),
+
+    case Is of
+        [#b_set{anno=#{float_op:=_}}|_] when not SuccIsGuard ->
+            %% No flush needed.
+            {[],Blk0,Fs0,Count0};
+        _ ->
+            %% Flush needed.
+            {Bool0,Count1} = new_reg('@ssa_bool', Count0),
+            Bool = #b_var{name=Bool0},
+
+            %% Allocate block numbers.
+            CheckL = Count1,              %For checkerror.
+            FlushL = Count1 + 1,          %For flushing of float regs.
+            Count = Count1 + 2,
+            Blk = Blk0#b_blk{last=Br#b_br{succ=CheckL}},
+
+            %% Build the block with the checkerror instruction.
+            CheckIs = [#b_set{op={float,checkerror},dst=Bool}],
+            CheckBr = #b_br{bool=Bool,succ=FlushL,fail=Fail},
+            CheckBlk = #b_blk{is=CheckIs,last=CheckBr},
+
+            %% Build the block that flushes all registers.
+            FlushIs = float_flush_regs(Fs0),
+            FlushBr = #b_br{bool=#b_literal{val=true},succ=Succ,fail=Succ},
+            FlushBlk = #b_blk{is=FlushIs,last=FlushBr},
+
+            %% Update state and blocks.
+            Fs = Fs0#fs{s=undefined,regs=#{},fail=none},
+            FlushBs = [{CheckL,CheckBlk},{FlushL,FlushBlk}],
+            {FlushBs,Blk,Fs,Count}
+    end;
+float_maybe_flush(Blk, Fs, Count) ->
+    {[],Blk,Fs,Count}.
+
+float_opt_is([#b_set{op=succeeded,args=[Src]}=I0],
+             #fs{regs=Rs}=Fs, Count, Acc) ->
+    case Rs of
+        #{Src:=Fr} ->
+            I = I0#b_set{args=[Fr]},
+            {reverse(Acc, [I]),Fs,Count};
+        #{} ->
+            {reverse(Acc, [I0]),Fs,Count}
+    end;
+float_opt_is([#b_set{anno=Anno0}=I0|Is0], Fs0, Count0, Acc) ->
+    case Anno0 of
+        #{float_op:=FTypes} ->
+            Anno = maps:remove(float_op, Anno0),
+            I1 = I0#b_set{anno=Anno},
+            {Is,Fs,Count} = float_make_op(I1, FTypes, Fs0, Count0),
+            float_opt_is(Is0, Fs, Count, reverse(Is, Acc));
+        #{} ->
+            float_opt_is(Is0, Fs0#fs{regs=#{}}, Count0, [I0|Acc])
+    end;
+float_opt_is([], Fs, _Count, _Acc) ->
+    #fs{s=undefined} = Fs,                      %Assertion.
+    none.
+
+float_make_op(#b_set{op={bif,Op},dst=Dst,args=As0}=I0,
+              Ts, #fs{s=S,regs=Rs0}=Fs, Count0) ->
+    {As1,Rs1,Count1} = float_load(As0, Ts, Rs0, Count0, []),
+    {As,Is0} = unzip(As1),
+    {Fr,Count2} = new_reg('@fr', Count1),
+    FrDst = #b_var{name=Fr},
+    I = I0#b_set{op={float,Op},dst=FrDst,args=As},
+    Rs = Rs1#{Dst=>FrDst},
+    Is = append(Is0) ++ [I],
+    case S of
+        undefined ->
+            {Ignore,Count} = new_reg('@ssa_ignore', Count2),
+            C = #b_set{op={float,clearerror},dst=#b_var{name=Ignore}},
+            {[C|Is],Fs#fs{s=cleared,regs=Rs},Count};
+        cleared ->
+            {Is,Fs#fs{regs=Rs},Count2}
+    end.
+
+float_load([A|As], [T|Ts], Rs0, Count0, Acc) ->
+    {Load,Rs,Count} = float_reg_arg(A, T, Rs0, Count0),
+    float_load(As, Ts, Rs, Count, [Load|Acc]);
+float_load([], [], Rs, Count, Acc) ->
+    {reverse(Acc),Rs,Count}.
+
+float_reg_arg(A, T, Rs, Count0) ->
+    case Rs of
+        #{A:=Fr} ->
+            {{Fr,[]},Rs,Count0};
+        #{} ->
+            {Fr,Count} = new_float_copy_reg(Count0),
+            Dst = #b_var{name=Fr},
+            I = float_load_reg(T, A, Dst),
+            {{Dst,[I]},Rs#{A=>Dst},Count}
+    end.
+
+float_load_reg(convert, #b_var{}=Src, Dst) ->
+    #b_set{op={float,convert},dst=Dst,args=[Src]};
+float_load_reg(convert, #b_literal{val=Val}=Src, Dst) ->
+    try float(Val) of
+        F ->
+            #b_set{op={float,put},dst=Dst,args=[#b_literal{val=F}]}
+    catch
+        error:_ ->
+            %% Let the exception happen at runtime.
+            #b_set{op={float,convert},dst=Dst,args=[Src]}
+    end;
+float_load_reg(float, Src, Dst) ->
+    #b_set{op={float,put},dst=Dst,args=[Src]}.
+
+new_float_copy_reg(Count) ->
+    new_reg('@fr_copy', Count).
+
+new_reg(Base, Count) ->
+    Fr = {Base,Count},
+    {Fr,Count+1}.
+
+float_fail_label(#b_blk{last=Last}, Fs) ->
+    case Last of
+        #b_br{bool=#b_var{},fail=Fail} ->
+            Fs#fs{fail=Fail};
+        _ ->
+            Fs
+    end.
+
+float_flush_regs(#fs{regs=Rs}) ->
+    maps:fold(fun(_, #b_var{name={'@fr_copy',_}}, Acc) ->
+                      Acc;
+                 (Dst, Fr, Acc) ->
+                      [#b_set{op={float,get},dst=Dst,args=[Fr]}|Acc]
+              end, [], Rs).
+
+%%%
+%%% Live optimization.
+%%%
+%%% Optimize instructions whose values are not used. They could be
+%%% removed if they have no side effects, or in a few cases replaced
+%%% with a cheaper instructions
+%%%
+
+ssa_opt_live({#st{ssa=Linear0}=St, FuncDb}) ->
+    RevLinear = reverse(Linear0),
+    Blocks0 = maps:from_list(RevLinear),
+    Blocks = live_opt(RevLinear, #{}, Blocks0),
+    Linear = beam_ssa:linearize(Blocks),
+    {St#st{ssa=Linear}, FuncDb}.
+
+live_opt([{L,Blk0}|Bs], LiveMap0, Blocks) ->
+    Blk1 = beam_ssa_share:block(Blk0, Blocks),
+    Successors = beam_ssa:successors(Blk1),
+    Live0 = live_opt_succ(Successors, L, LiveMap0, gb_sets:empty()),
+    {Blk,Live} = live_opt_blk(Blk1, Live0),
+    LiveMap = live_opt_phis(Blk#b_blk.is, L, Live, LiveMap0),
+    live_opt(Bs, LiveMap, Blocks#{L:=Blk});
+live_opt([], _, Acc) -> Acc.
+
+live_opt_succ([S|Ss], L, LiveMap, Live0) ->
+    Key = {S,L},
+    case LiveMap of
+        #{Key:=Live} ->
+            %% The successor has a phi node, and the value for
+            %% this block in the phi node is a variable.
+            live_opt_succ(Ss, L, LiveMap, gb_sets:union(Live, Live0));
+        #{S:=Live} ->
+            %% No phi node in the successor, or the value for
+            %% this block in the phi node is a literal.
+            live_opt_succ(Ss, L, LiveMap, gb_sets:union(Live, Live0));
+        #{} ->
+            %% A peek_message block which has not been processed yet.
+            live_opt_succ(Ss, L, LiveMap, Live0)
+    end;
+live_opt_succ([], _, _, Acc) -> Acc.
+
+live_opt_phis(Is, L, Live0, LiveMap0) ->
+    LiveMap = LiveMap0#{L=>Live0},
+    Phis = takewhile(fun(#b_set{op=Op}) -> Op =:= phi end, Is),
+    case Phis of
+        [] ->
+            LiveMap;
+        [_|_] ->
+            PhiArgs = append([Args || #b_set{args=Args} <- Phis]),
+            case [{P,V} || {#b_var{}=V,P} <- PhiArgs] of
+                [_|_]=PhiVars ->
+                    PhiLive0 = rel2fam(PhiVars),
+                    PhiLive = [{{L,P},gb_sets:union(gb_sets:from_list(Vs), Live0)} ||
+                                  {P,Vs} <- PhiLive0],
+                    maps:merge(LiveMap, maps:from_list(PhiLive));
+                [] ->
+                    %% There were only literals in the phi node(s).
+                    LiveMap
+            end
+    end.
+
+live_opt_blk(#b_blk{is=Is0,last=Last}=Blk, Live0) ->
+    Live1 = gb_sets:union(Live0, gb_sets:from_ordset(beam_ssa:used(Last))),
+    {Is,Live} = live_opt_is(reverse(Is0), Live1, []),
+    {Blk#b_blk{is=Is},Live}.
+
+live_opt_is([#b_set{op=phi,dst=Dst}=I|Is], Live, Acc) ->
+    case gb_sets:is_member(Dst, Live) of
+        true ->
+            live_opt_is(Is, Live, [I|Acc]);
+        false ->
+            live_opt_is(Is, Live, Acc)
+    end;
+live_opt_is([#b_set{op=succeeded,dst=SuccDst=SuccDstVar,
+                    args=[Dst]}=SuccI,
+             #b_set{dst=Dst}=I|Is], Live0, Acc) ->
+    case gb_sets:is_member(Dst, Live0) of
+        true ->
+            Live1 = gb_sets:add(Dst, Live0),
+            Live = gb_sets:delete_any(SuccDst, Live1),
+            live_opt_is([I|Is], Live, [SuccI|Acc]);
+        false ->
+            case live_opt_unused(I) of
+                {replace,NewI0} ->
+                    NewI = NewI0#b_set{dst=SuccDstVar},
+                    live_opt_is([NewI|Is], Live0, Acc);
+                keep ->
+                    case gb_sets:is_member(SuccDst, Live0) of
+                        true ->
+                            Live1 = gb_sets:add(Dst, Live0),
+                            Live = gb_sets:delete(SuccDst, Live1),
+                            live_opt_is([I|Is], Live, [SuccI|Acc]);
+                        false ->
+                            live_opt_is([I|Is], Live0, Acc)
+                    end
+            end
+    end;
+live_opt_is([#b_set{dst=Dst}=I|Is], Live0, Acc) ->
+    case gb_sets:is_member(Dst, Live0) of
+        true ->
+            Live1 = gb_sets:union(Live0, gb_sets:from_ordset(beam_ssa:used(I))),
+            Live = gb_sets:delete(Dst, Live1),
+            live_opt_is(Is, Live, [I|Acc]);
+        false ->
+            case beam_ssa:no_side_effect(I) of
+                true ->
+                    live_opt_is(Is, Live0, Acc);
+                false ->
+                    Live = gb_sets:union(Live0, gb_sets:from_ordset(beam_ssa:used(I))),
+                    live_opt_is(Is, Live, [I|Acc])
+            end
+    end;
+live_opt_is([], Live, Acc) ->
+    {Acc,Live}.
+
+live_opt_unused(#b_set{op=get_map_element}=Set) ->
+    {replace,Set#b_set{op=has_map_field}};
+live_opt_unused(_) -> keep.
+
+%%%
+%%% Optimize binary matching.
+%%%
+%%% * If the value of segment is never extracted, rewrite
+%%%   to a bs_skip instruction.
+%%%
+%%% * Coalesce adjacent bs_skip instructions and skip instructions
+%%%   with bs_test_tail.
+%%%
+
+ssa_opt_bsm({#st{ssa=Linear}=St, FuncDb}) ->
+    Extracted0 = bsm_extracted(Linear),
+    Extracted = cerl_sets:from_list(Extracted0),
+    {St#st{ssa=bsm_skip(Linear, Extracted)}, FuncDb}.
+
+bsm_skip([{L,#b_blk{is=Is0}=Blk}|Bs0], Extracted) ->
+    Bs = bsm_skip(Bs0, Extracted),
+    Is = bsm_skip_is(Is0, Extracted),
+    coalesce_skips({L,Blk#b_blk{is=Is}}, Bs);
+bsm_skip([], _) -> [].
+
+bsm_skip_is([I0|Is], Extracted) ->
+    case I0 of
+        #b_set{op=bs_match,
+               dst=Ctx,
+               args=[#b_literal{val=T}=Type,PrevCtx|Args0]}
+          when T =/= string, T =/= skip ->
+            I = case cerl_sets:is_element(Ctx, Extracted) of
+                    true ->
+                        I0;
+                    false ->
+                        %% The value is never extracted.
+                        Args = [#b_literal{val=skip},PrevCtx,Type|Args0],
+                        I0#b_set{args=Args}
+                end,
+            [I|Is];
+        #b_set{} ->
+            [I0|bsm_skip_is(Is, Extracted)]
+    end;
+bsm_skip_is([], _) -> [].
+
+bsm_extracted([{_,#b_blk{is=Is}}|Bs]) ->
+    case Is of
+        [#b_set{op=bs_extract,args=[Ctx]}|_] ->
+            [Ctx|bsm_extracted(Bs)];
+        _ ->
+            bsm_extracted(Bs)
+    end;
+bsm_extracted([]) -> [].
+
+coalesce_skips({L,#b_blk{is=[#b_set{op=bs_extract}=Extract|Is0],
+                         last=Last0}=Blk0}, Bs0) ->
+    case coalesce_skips_is(Is0, Last0, Bs0) of
+        not_possible ->
+            [{L,Blk0}|Bs0];
+        {Is,Last,Bs} ->
+            Blk = Blk0#b_blk{is=[Extract|Is],last=Last},
+            [{L,Blk}|Bs]
+    end;
+coalesce_skips({L,#b_blk{is=Is0,last=Last0}=Blk0}, Bs0) ->
+    case coalesce_skips_is(Is0, Last0, Bs0) of
+        not_possible ->
+            [{L,Blk0}|Bs0];
+        {Is,Last,Bs} ->
+            Blk = Blk0#b_blk{is=Is,last=Last},
+            [{L,Blk}|Bs]
+    end.
+
+coalesce_skips_is([#b_set{op=bs_match,
+                          args=[#b_literal{val=skip},
+                                Ctx0,Type,Flags,
+                                #b_literal{val=Size0},
+                                #b_literal{val=Unit0}]}=Skip0,
+                   #b_set{op=succeeded}],
+                  #b_br{succ=L2,fail=Fail}=Br0,
+                  Bs0) when is_integer(Size0) ->
+    case Bs0 of
+        [{L2,#b_blk{is=[#b_set{op=bs_match,
+                               dst=SkipDst,
+                               args=[#b_literal{val=skip},_,_,_,
+                                     #b_literal{val=Size1},
+                                     #b_literal{val=Unit1}]},
+                        #b_set{op=succeeded}=Succeeded],
+                    last=#b_br{fail=Fail}=Br}}|Bs] when is_integer(Size1) ->
+            SkipBits = Size0 * Unit0 + Size1 * Unit1,
+            Skip = Skip0#b_set{dst=SkipDst,
+                               args=[#b_literal{val=skip},Ctx0,
+                                     Type,Flags,
+                                     #b_literal{val=SkipBits},
+                                     #b_literal{val=1}]},
+            Is = [Skip,Succeeded],
+            {Is,Br,Bs};
+        [{L2,#b_blk{is=[#b_set{op=bs_test_tail,
+                               args=[_Ctx,#b_literal{val=TailSkip}]}],
+                    last=#b_br{succ=NextSucc,fail=Fail}}}|Bs] ->
+            SkipBits = Size0 * Unit0,
+            TestTail = Skip0#b_set{op=bs_test_tail,
+                                   args=[Ctx0,#b_literal{val=SkipBits+TailSkip}]},
+            Br = Br0#b_br{bool=TestTail#b_set.dst,succ=NextSucc},
+            Is = [TestTail],
+            {Is,Br,Bs};
+        _ ->
+            not_possible
+    end;
+coalesce_skips_is(_, _, _) ->
+    not_possible.
+
+%%%
+%%% Short-cutting binary matching instructions.
+%%%
+
+ssa_opt_bsm_shortcut({#st{ssa=Linear}=St, FuncDb}) ->
+    Positions = bsm_positions(Linear, #{}),
+    case map_size(Positions) of
+        0 ->
+            %% No binary matching instructions.
+            {St, FuncDb};
+        _ ->
+            {St#st{ssa=bsm_shortcut(Linear, Positions)}, FuncDb}
+    end.
+
+bsm_positions([{L,#b_blk{is=Is,last=Last}}|Bs], PosMap0) ->
+    PosMap = bsm_positions_is(Is, PosMap0),
+    case {Is,Last} of
+        {[#b_set{op=bs_test_tail,dst=Bool,args=[Ctx,#b_literal{val=Bits0}]}],
+         #b_br{bool=Bool,fail=Fail}} ->
+            Bits = Bits0 + map_get(Ctx, PosMap0),
+            bsm_positions(Bs, PosMap#{L=>{Bits,Fail}});
+        {_,_} ->
+            bsm_positions(Bs, PosMap)
+    end;
+bsm_positions([], PosMap) -> PosMap.
+
+bsm_positions_is([#b_set{op=bs_start_match,dst=New}|Is], PosMap0) ->
+    PosMap = PosMap0#{New=>0},
+    bsm_positions_is(Is, PosMap);
+bsm_positions_is([#b_set{op=bs_match,dst=New,args=Args}|Is], PosMap0) ->
+    [_,Old|_] = Args,
+    #{Old:=Bits0} = PosMap0,
+    Bits = bsm_update_bits(Args, Bits0),
+    PosMap = PosMap0#{New=>Bits},
+    bsm_positions_is(Is, PosMap);
+bsm_positions_is([_|Is], PosMap) ->
+    bsm_positions_is(Is, PosMap);
+bsm_positions_is([], PosMap) -> PosMap.
+
+bsm_update_bits([#b_literal{val=string},_,#b_literal{val=String}], Bits) ->
+    Bits + bit_size(String);
+bsm_update_bits([#b_literal{val=utf8}|_], Bits) ->
+    Bits + 8;
+bsm_update_bits([#b_literal{val=utf16}|_], Bits) ->
+    Bits + 16;
+bsm_update_bits([#b_literal{val=utf32}|_], Bits) ->
+    Bits + 32;
+bsm_update_bits([_,_,_,#b_literal{val=Sz},#b_literal{val=U}], Bits)
+  when is_integer(Sz) ->
+    Bits + Sz*U;
+bsm_update_bits(_, Bits) -> Bits.
+
+bsm_shortcut([{L,#b_blk{is=Is,last=Last0}=Blk}|Bs], PosMap) ->
+    case {Is,Last0} of
+        {[#b_set{op=bs_match,dst=New,args=[_,Old|_]},
+          #b_set{op=succeeded,dst=Bool,args=[New]}],
+         #b_br{bool=Bool,fail=Fail}} ->
+            case PosMap of
+                #{Old:=Bits,Fail:={TailBits,NextFail}} when Bits > TailBits ->
+                    Last = Last0#b_br{fail=NextFail},
+                    [{L,Blk#b_blk{last=Last}}|bsm_shortcut(Bs, PosMap)];
+                #{} ->
+                    [{L,Blk}|bsm_shortcut(Bs, PosMap)]
+            end;
+        {_,_} ->
+            [{L,Blk}|bsm_shortcut(Bs, PosMap)]
+    end;
+bsm_shortcut([], _PosMap) -> [].
+
+%%%
+%%% Eliminate redundant bs_test_unit2 instructions.
+%%%
+
+ssa_opt_bsm_units({#st{ssa=Linear}=St, FuncDb}) ->
+    {St#st{ssa=bsm_units(Linear, #{})}, FuncDb}.
+
+bsm_units([{L,#b_blk{last=#b_br{succ=Succ,fail=Fail}}=Block0} | Bs], UnitMaps0) ->
+    UnitsIn = maps:get(L, UnitMaps0, #{}),
+    {Block, UnitsOut} = bsm_units_skip(Block0, UnitsIn),
+    UnitMaps1 = bsm_units_join(Succ, UnitsOut, UnitMaps0),
+    UnitMaps = bsm_units_join(Fail, UnitsIn, UnitMaps1),
+    [{L, Block} | bsm_units(Bs, UnitMaps)];
+bsm_units([{L,#b_blk{last=#b_switch{fail=Fail,list=Switch}}=Block} | Bs], UnitMaps0) ->
+    UnitsIn = maps:get(L, UnitMaps0, #{}),
+    Labels = [Fail | [Lbl || {_Arg, Lbl} <- Switch]],
+    UnitMaps = foldl(fun(Lbl, UnitMaps) ->
+                             bsm_units_join(Lbl, UnitsIn, UnitMaps)
+                     end, UnitMaps0, Labels),
+    [{L, Block} | bsm_units(Bs, UnitMaps)];
+bsm_units([{L, Block} | Bs], UnitMaps) ->
+    [{L, Block} | bsm_units(Bs, UnitMaps)];
+bsm_units([], _UnitMaps) ->
+    [].
+
+bsm_units_skip(Block, Units) ->
+    bsm_units_skip_1(Block#b_blk.is, Block, Units).
+
+bsm_units_skip_1([#b_set{op=bs_start_match,dst=New}|_], Block, Units) ->
+    %% We bail early since there can't be more than one match per block.
+    {Block, Units#{ New => 1 }};
+bsm_units_skip_1([#b_set{op=bs_match,
+                         dst=New,
+                         args=[#b_literal{val=skip},
+                               Ctx,
+                               #b_literal{val=binary},
+                               _Flags,
+                               #b_literal{val=all},
+                               #b_literal{val=OpUnit}]}=Skip | Test],
+                 Block0, Units) ->
+    [#b_set{op=succeeded,dst=Bool,args=[New]}] = Test, %Assertion.
+    #b_br{bool=Bool} = Last0 = Block0#b_blk.last, %Assertion.
+    CtxUnit = map_get(Ctx, Units),
+    if
+        CtxUnit rem OpUnit =:= 0 ->
+            Is = takewhile(fun(I) -> I =/= Skip end, Block0#b_blk.is),
+            Last = Last0#b_br{bool=#b_literal{val=true}},
+            Block = Block0#b_blk{is=Is,last=Last},
+            {Block, Units#{ New => CtxUnit }};
+        CtxUnit rem OpUnit =/= 0 ->
+            {Block0, Units#{ New => OpUnit, Ctx => OpUnit }}
+    end;
+bsm_units_skip_1([#b_set{op=bs_match,dst=New,args=Args}|_], Block, Units) ->
+    [_,Ctx|_] = Args,
+    CtxUnit = map_get(Ctx, Units),
+    OpUnit = bsm_op_unit(Args),
+    {Block, Units#{ New => gcd(OpUnit, CtxUnit) }};
+bsm_units_skip_1([_I | Is], Block, Units) ->
+    bsm_units_skip_1(Is, Block, Units);
+bsm_units_skip_1([], Block, Units) ->
+    {Block, Units}.
+
+bsm_op_unit([_,_,_,Size,#b_literal{val=U}]) ->
+    case Size of
+        #b_literal{val=Sz} when is_integer(Sz) -> Sz*U;
+        _ -> U
+    end;
+bsm_op_unit([#b_literal{val=string},_,#b_literal{val=String}]) ->
+    bit_size(String);
+bsm_op_unit([#b_literal{val=utf8}|_]) ->
+    8;
+bsm_op_unit([#b_literal{val=utf16}|_]) ->
+    16;
+bsm_op_unit([#b_literal{val=utf32}|_]) ->
+    32;
+bsm_op_unit(_) ->
+    1.
+
+%% Several paths can lead to the same match instruction and the inferred units
+%% may differ between them, so we can only keep the information that is common
+%% to all paths.
+bsm_units_join(Lbl, MapA, UnitMaps0) when is_map_key(Lbl, UnitMaps0) ->
+    MapB = map_get(Lbl, UnitMaps0),
+    Merged = if
+                 map_size(MapB) =< map_size(MapA) ->
+                     bsm_units_join_1(maps:keys(MapB), MapA, MapB);
+                 map_size(MapB) > map_size(MapA) ->
+                     bsm_units_join_1(maps:keys(MapA), MapB, MapA)
+             end,
+    UnitMaps0#{Lbl := Merged};
+bsm_units_join(Lbl, MapA, UnitMaps0) when MapA =/= #{} ->
+    UnitMaps0#{Lbl => MapA};
+bsm_units_join(_Lbl, _MapA, UnitMaps0) ->
+    UnitMaps0.
+
+bsm_units_join_1([Key | Keys], Left, Right) when is_map_key(Key, Left) ->
+    UnitA = map_get(Key, Left),
+    UnitB = map_get(Key, Right),
+    bsm_units_join_1(Keys, Left, Right#{Key := gcd(UnitA, UnitB)});
+bsm_units_join_1([Key | Keys], Left, Right) ->
+    bsm_units_join_1(Keys, Left, maps:remove(Key, Right));
+bsm_units_join_1([], _MapA, Right) ->
+    Right.
+
+%%%
+%%% Optimize binary construction.
+%%%
+%%% If an integer segment or a float segment has a literal size and
+%%% a literal value, convert to a binary segment. Coalesce adjacent
+%%% literal binary segments. Literal binary segments will be converted
+%%% to bs_put_string instructions in later pass.
+%%%
+
+ssa_opt_bs_puts({#st{ssa=Linear0,cnt=Count0}=St, FuncDb}) ->
+    {Linear,Count} = opt_bs_puts(Linear0, Count0, []),
+    {St#st{ssa=Linear,cnt=Count}, FuncDb}.
+
+opt_bs_puts([{L,#b_blk{is=Is}=Blk0}|Bs], Count0, Acc0) ->
+    case Is of
+        [#b_set{op=bs_put}=I0] ->
+            case opt_bs_put(L, I0, Blk0, Count0, Acc0) of
+                not_possible ->
+                    opt_bs_puts(Bs, Count0, [{L,Blk0}|Acc0]);
+                {Count,Acc1} ->
+                    Acc = opt_bs_puts_merge(Acc1),
+                    opt_bs_puts(Bs, Count, Acc)
+            end;
+        _ ->
+            opt_bs_puts(Bs, Count0, [{L,Blk0}|Acc0])
+    end;
+opt_bs_puts([], Count, Acc) ->
+    {reverse(Acc),Count}.
+
+opt_bs_puts_merge([{L1,#b_blk{is=Is}=Blk0},{L2,#b_blk{is=AccIs}}=BAcc|Acc]) ->
+    case {AccIs,Is} of
+        {[#b_set{op=bs_put,
+                 args=[#b_literal{val=binary},
+                       #b_literal{},
+                       #b_literal{val=Bin0},
+                       #b_literal{val=all},
+                       #b_literal{val=1}]}],
+         [#b_set{op=bs_put,
+                 args=[#b_literal{val=binary},
+                       #b_literal{},
+                       #b_literal{val=Bin1},
+                       #b_literal{val=all},
+                       #b_literal{val=1}]}=I0]} ->
+            %% Coalesce the two segments to one.
+            Bin = <<Bin0/bitstring,Bin1/bitstring>>,
+            I = I0#b_set{args=bs_put_args(binary, Bin, all)},
+            Blk = Blk0#b_blk{is=[I]},
+            [{L2,Blk}|Acc];
+        {_,_} ->
+            [{L1,Blk0},BAcc|Acc]
+    end.
+
+opt_bs_put(L, I0, #b_blk{last=Br0}=Blk0, Count0, Acc) ->
+    case opt_bs_put(I0) of
+        [Bin] when is_bitstring(Bin) ->
+            Args = bs_put_args(binary, Bin, all),
+            I = I0#b_set{args=Args},
+            Blk = Blk0#b_blk{is=[I]},
+            {Count0,[{L,Blk}|Acc]};
+        [{int,Int,Size},Bin] when is_bitstring(Bin) ->
+            %% Construct a bs_put_integer instruction following
+            %% by a bs_put_binary instruction.
+            IntArgs = bs_put_args(integer, Int, Size),
+            BinArgs = bs_put_args(binary, Bin, all),
+            {BinL,BinVarNum} = {Count0,Count0+1},
+            Count = Count0 + 2,
+            BinVar = #b_var{name={'@ssa_bool',BinVarNum}},
+            BinI = I0#b_set{dst=BinVar,args=BinArgs},
+            BinBlk = Blk0#b_blk{is=[BinI],last=Br0#b_br{bool=BinVar}},
+            IntI = I0#b_set{args=IntArgs},
+            IntBlk = Blk0#b_blk{is=[IntI],last=Br0#b_br{succ=BinL}},
+            {Count,[{BinL,BinBlk},{L,IntBlk}|Acc]};
+        not_possible ->
+            not_possible
+    end.
+
+opt_bs_put(#b_set{args=[#b_literal{val=binary},_,#b_literal{val=Val},
+                        #b_literal{val=all},#b_literal{val=Unit}]})
+  when is_bitstring(Val) ->
+    if
+        bit_size(Val) rem Unit =:= 0 ->
+            [Val];
+        true ->
+            not_possible
+    end;
+opt_bs_put(#b_set{args=[#b_literal{val=Type},#b_literal{val=Flags},
+                        #b_literal{val=Val},#b_literal{val=Size},
+                        #b_literal{val=Unit}]}=I0) when is_integer(Size) ->
+    EffectiveSize = Size * Unit,
+    if
+        EffectiveSize > 0 ->
+            case {Type,opt_bs_put_endian(Flags)} of
+                {integer,big} when is_integer(Val) ->
+                    if
+                        EffectiveSize < 64 ->
+                            [<<Val:EffectiveSize>>];
+                        true ->
+                            opt_bs_put_split_int(Val, EffectiveSize)
+                    end;
+                {integer,little} when is_integer(Val), EffectiveSize < 128 ->
+                    %% To avoid an explosion in code size, we only try
+                    %% to optimize relatively small fields.
+                    <<Int:EffectiveSize>> = <<Val:EffectiveSize/little>>,
+                    Args = bs_put_args(Type, Int, EffectiveSize),
+                    I = I0#b_set{args=Args},
+                    opt_bs_put(I);
+                {binary,_} when is_bitstring(Val) ->
+                    <<Bitstring:EffectiveSize/bits,_/bits>> = Val,
+                    [Bitstring];
+                {float,Endian} ->
+                    try
+                        [opt_bs_put_float(Val, EffectiveSize, Endian)]
+                    catch error:_ ->
+                            not_possible
+                    end;
+                {_,_} ->
+                    not_possible
+            end;
+        true ->
+            not_possible
+    end;
+opt_bs_put(#b_set{}) -> not_possible.
+
+opt_bs_put_float(N, Sz, Endian) ->
+    case Endian of
+        big -> <<N:Sz/big-float-unit:1>>;
+        little -> <<N:Sz/little-float-unit:1>>
+    end.
+
+bs_put_args(Type, Val, Size) ->
+    [#b_literal{val=Type},
+     #b_literal{val=[unsigned,big]},
+     #b_literal{val=Val},
+     #b_literal{val=Size},
+     #b_literal{val=1}].
+
+opt_bs_put_endian([big=E|_]) -> E;
+opt_bs_put_endian([little=E|_]) -> E;
+opt_bs_put_endian([native=E|_]) -> E;
+opt_bs_put_endian([_|Fs]) -> opt_bs_put_endian(Fs).
+
+opt_bs_put_split_int(Int, Size) ->
+    Pos = opt_bs_put_split_int_1(Int, 0, Size - 1),
+    UpperSize = Size - Pos,
+    if
+        Pos =:= 0 ->
+            %% Value is 0 or -1 -- keep the original instruction.
+            not_possible;
+        UpperSize < 64 ->
+            %% No or few leading zeroes or ones.
+            [<<Int:Size>>];
+        true ->
+            %% There are 64 or more leading ones or zeroes in
+            %% the resulting binary. Split into two separate
+            %% segments to avoid an explosion in code size.
+            [{int,Int bsr Pos,UpperSize},<<Int:Pos>>]
+    end.
+
+opt_bs_put_split_int_1(_Int, L, R) when L > R ->
+    8 * ((L + 7) div 8);
+opt_bs_put_split_int_1(Int, L, R) ->
+    Mid = (L + R) div 2,
+    case Int bsr Mid of
+        Upper when Upper =:= 0; Upper =:= -1 ->
+            opt_bs_put_split_int_1(Int, L, Mid - 1);
+        _ ->
+            opt_bs_put_split_int_1(Int, Mid + 1, R)
+    end.
+
+%%%
+%%% Optimize expressions such as "tuple_size(Var) =:= 2".
+%%%
+%%% Consider this code:
+%%%
+%%% 0:
+%%%   .
+%%%   .
+%%%   .
+%%%   Size = bif:tuple_size Var
+%%%   BoolVar1 = succeeded Size
+%%%   br BoolVar1, label 4, label 3
+%%%
+%%% 4:
+%%%   BoolVar2 = bif:'=:=' Size, literal 2
+%%%   br BoolVar2, label 6, label 3
+%%%
+%%% 6: ...   %% OK
+%%%
+%%% 3: ...   %% Not a tuple of size 2
+%%%
+%%% The BEAM code will look this:
+%%%
+%%%   {bif,tuple_size,{f,3},[{x,0}],{x,0}}.
+%%%   {test,is_eq_exact,{f,3},[{x,0},{integer,2}]}.
+%%%
+%%% Better BEAM code will be produced if we transform the
+%%% code like this:
+%%%
+%%% 0:
+%%%   .
+%%%   .
+%%%   .
+%%%   br label 10
+%%%
+%%% 10:
+%%%   NewBoolVar = bif:is_tuple Var
+%%%   br NewBoolVar, label 11, label 3
+%%%
+%%% 11:
+%%%   Size = bif:tuple_size Var
+%%%   br label 4
+%%%
+%%% 4:
+%%%   BoolVar2 = bif:'=:=' Size, literal 2
+%%%   br BoolVar2, label 6, label 3
+%%%
+%%% (The key part of the transformation is the removal of
+%%% the 'succeeded' instruction to signal to the code generator
+%%% that the call to tuple_size/1 can't fail.)
+%%%
+%%% The BEAM code will look like:
+%%%
+%%%   {test,is_tuple,{f,3},[{x,0}]}.
+%%%   {test_arity,{f,3},[{x,0},2]}.
+%%%
+%%% Those two instructions will be combined into a single
+%%% is_tuple_of_arity instruction by the loader.
+%%%
+
+ssa_opt_tuple_size({#st{ssa=Linear0,cnt=Count0}=St, FuncDb}) ->
+    %% This optimization is only safe in guards, as prefixing tuple_size with
+    %% an is_tuple check prevents it from throwing an exception.
+    NonGuards = non_guards(Linear0),
+    {Linear,Count} = opt_tup_size(Linear0, NonGuards, Count0, []),
+    {St#st{ssa=Linear,cnt=Count}, FuncDb}.
+
+opt_tup_size([{L,#b_blk{is=Is,last=Last}=Blk}|Bs], NonGuards, Count0, Acc0) ->
+    case {Is,Last} of
+        {[#b_set{op={bif,'=:='},dst=Bool,args=[#b_var{}=Tup,#b_literal{val=Arity}]}],
+         #b_br{bool=Bool}} when is_integer(Arity), Arity >= 0 ->
+            {Acc,Count} = opt_tup_size_1(Tup, L, NonGuards, Count0, Acc0),
+            opt_tup_size(Bs, NonGuards, Count, [{L,Blk}|Acc]);
+        {_,_} ->
+            opt_tup_size(Bs, NonGuards, Count0, [{L,Blk}|Acc0])
+    end;
+opt_tup_size([], _NonGuards, Count, Acc) ->
+    {reverse(Acc),Count}.
+
+opt_tup_size_1(Size, EqL, NonGuards, Count0, [{L,Blk0}|Acc]) ->
+    #b_blk{is=Is0,last=Last} = Blk0,
+    case Last of
+        #b_br{bool=Bool,succ=EqL,fail=Fail} ->
+            case gb_sets:is_member(Fail, NonGuards) of
+                true ->
+                    {[{L,Blk0}|Acc],Count0};
+                false ->
+                    case opt_tup_size_is(Is0, Bool, Size, []) of
+                        none ->
+                            {[{L,Blk0}|Acc],Count0};
+                        {PreIs,TupleSizeIs,Tuple} ->
+                            opt_tup_size_2(PreIs, TupleSizeIs, L, EqL,
+                                           Tuple, Fail, Count0, Acc)
+                    end
+            end;
+        _ ->
+            {[{L,Blk0}|Acc],Count0}
+    end;
+opt_tup_size_1(_, _, _, Count, Acc) ->
+    {Acc,Count}.
+
+opt_tup_size_2(PreIs, TupleSizeIs, PreL, EqL, Tuple, Fail, Count0, Acc) ->
+    IsTupleL = Count0,
+    TupleSizeL = Count0 + 1,
+    Bool = #b_var{name={'@ssa_bool',Count0+2}},
+    Count = Count0 + 3,
+
+    True = #b_literal{val=true},
+    PreBr = #b_br{bool=True,succ=IsTupleL,fail=IsTupleL},
+    PreBlk = #b_blk{is=PreIs,last=PreBr},
+
+    IsTupleIs = [#b_set{op={bif,is_tuple},dst=Bool,args=[Tuple]}],
+    IsTupleBr = #b_br{bool=Bool,succ=TupleSizeL,fail=Fail},
+    IsTupleBlk = #b_blk{is=IsTupleIs,last=IsTupleBr},
+
+    TupleSizeBr = #b_br{bool=True,succ=EqL,fail=EqL},
+    TupleSizeBlk = #b_blk{is=TupleSizeIs,last=TupleSizeBr},
+    {[{TupleSizeL,TupleSizeBlk},
+      {IsTupleL,IsTupleBlk},
+      {PreL,PreBlk}|Acc],Count}.
+
+opt_tup_size_is([#b_set{op={bif,tuple_size},dst=Size,args=[Tuple]}=I,
+                 #b_set{op=succeeded,dst=Bool,args=[Size]}],
+                Bool, Size, Acc) ->
+    {reverse(Acc),[I],Tuple};
+opt_tup_size_is([I|Is], Bool, Size, Acc) ->
+    opt_tup_size_is(Is, Bool, Size, [I|Acc]);
+opt_tup_size_is([], _, _, _Acc) -> none.
+
+%%%
+%%% Optimize #b_switch{} instructions.
+%%%
+%%% If the argument for a #b_switch{} comes from a phi node with all
+%%% literals, any values in the switch list which are not in the phi
+%%% node can be removed.
+%%%
+%%% If the values in the phi node and switch list are the same,
+%%% the failure label can't be reached and be eliminated.
+%%%
+%%% A #b_switch{} with only one value can be rewritten to
+%%% a #b_br{}. A switch that only verifies that the argument
+%%% is 'true' or 'false' can be rewritten to a is_boolean test.
+%%%
+
+ssa_opt_sw({#st{ssa=Linear0,cnt=Count0}=St, FuncDb}) ->
+    {Linear,Count} = opt_sw(Linear0, Count0, []),
+    {St#st{ssa=Linear,cnt=Count}, FuncDb}.
+
+opt_sw([{L,#b_blk{is=Is,last=#b_switch{}=Sw0}=Blk0}|Bs], Count0, Acc) ->
+    %% Ensure that no label in the switch list is the same
+    %% as the failure label.
+    #b_switch{fail=Fail,list=List0} = Sw0,
+    List = [{Val,Lbl} || {Val,Lbl} <- List0, Lbl =/= Fail],
+    Sw1 = beam_ssa:normalize(Sw0#b_switch{list=List}),
+    case Sw1 of
+        #b_switch{arg=Arg,fail=Fail,list=[{Lit,Lbl}]} ->
+            %% Rewrite a single value switch to a br.
+            Bool = #b_var{name={'@ssa_bool',Count0}},
+            Count = Count0 + 1,
+            IsEq = #b_set{op={bif,'=:='},dst=Bool,args=[Arg,Lit]},
+            Br = #b_br{bool=Bool,succ=Lbl,fail=Fail},
+            Blk = Blk0#b_blk{is=Is++[IsEq],last=Br},
+            opt_sw(Bs, Count, [{L,Blk}|Acc]);
+        #b_switch{arg=Arg,fail=Fail,
+                  list=[{#b_literal{val=B1},Lbl},{#b_literal{val=B2},Lbl}]}
+          when B1 =:= not B2 ->
+            %% Replace with is_boolean test.
+            Bool = #b_var{name={'@ssa_bool',Count0}},
+            Count = Count0 + 1,
+            IsBool = #b_set{op={bif,is_boolean},dst=Bool,args=[Arg]},
+            Br = #b_br{bool=Bool,succ=Lbl,fail=Fail},
+            Blk = Blk0#b_blk{is=Is++[IsBool],last=Br},
+            opt_sw(Bs, Count, [{L,Blk}|Acc]);
+        Sw0 ->
+            opt_sw(Bs, Count0, [{L,Blk0}|Acc]);
+        Sw ->
+            Blk = Blk0#b_blk{last=Sw},
+            opt_sw(Bs, Count0, [{L,Blk}|Acc])
+    end;
+opt_sw([{L,#b_blk{}=Blk}|Bs], Count, Acc) ->
+    opt_sw(Bs, Count, [{L,Blk}|Acc]);
+opt_sw([], Count, Acc) ->
+    {reverse(Acc),Count}.
+
+%%%
+%%% Merge blocks.
+%%%
+
+ssa_opt_merge_blocks({#st{ssa=Blocks}=St, FuncDb}) ->
+    Preds = beam_ssa:predecessors(Blocks),
+    Merged = merge_blocks_1(beam_ssa:rpo(Blocks), Preds, Blocks),
+    {St#st{ssa=Merged}, FuncDb}.
+
+merge_blocks_1([L|Ls], Preds0, Blocks0) ->
+    case Preds0 of
+        #{L:=[P]} ->
+            #{P:=Blk0,L:=Blk1} = Blocks0,
+            case is_merge_allowed(L, Blk0, Blk1) of
+                true ->
+                    #b_blk{is=Is0} = Blk0,
+                    #b_blk{is=Is1} = Blk1,
+                    verify_merge_is(Is1),
+                    Is = Is0 ++ Is1,
+                    Blk = Blk1#b_blk{is=Is},
+                    Blocks1 = maps:remove(L, Blocks0),
+                    Blocks2 = Blocks1#{P:=Blk},
+                    Successors = beam_ssa:successors(Blk),
+                    Blocks = beam_ssa:update_phi_labels(Successors, L, P, Blocks2),
+                    Preds = merge_update_preds(Successors, L, P, Preds0),
+                    merge_blocks_1(Ls, Preds, Blocks);
+                false ->
+                    merge_blocks_1(Ls, Preds0, Blocks0)
+            end;
+        #{} ->
+            merge_blocks_1(Ls, Preds0, Blocks0)
+    end;
+merge_blocks_1([], _Preds, Blocks) -> Blocks.
+
+merge_update_preds([L|Ls], From, To, Preds0) ->
+    Ps = [rename_label(P, From, To) || P <- map_get(L, Preds0)],
+    Preds = Preds0#{L:=Ps},
+    merge_update_preds(Ls, From, To, Preds);
+merge_update_preds([], _, _, Preds) -> Preds.
+
+rename_label(From, From, To) -> To;
+rename_label(Lbl, _, _) -> Lbl.
+
+verify_merge_is([#b_set{op=Op}|_]) ->
+    %% The merged block has only one predecessor, so it should not have any phi
+    %% nodes.
+    true = Op =/= phi;                          %Assertion.
+verify_merge_is(_) ->
+    ok.
+
+is_merge_allowed(_, #b_blk{}, #b_blk{is=[#b_set{op=peek_message}|_]}) ->
+    false;
+is_merge_allowed(L, #b_blk{last=#b_br{}}=Blk, #b_blk{is=Is}) ->
+    %% The predecessor block must have exactly one successor (L) for
+    %% the merge to be safe.
+    case beam_ssa:successors(Blk) of
+        [L] ->
+            case Is of
+                [#b_set{op=phi,args=[_]}|_] ->
+                    %% The type optimizer pass must have been
+                    %% turned off, since it would have removed this
+                    %% redundant phi node. Refuse to merge the blocks
+                    %% to ensure that this phi node remains at the
+                    %% beginning of a block.
+                    false;
+                _ ->
+                    true
+            end;
+        [_|_] ->
+            false
+    end;
+is_merge_allowed(_, #b_blk{last=#b_switch{}}, #b_blk{}) ->
+    false.
+
+%%%
+%%% When a tuple is matched, the pattern matching compiler generates a
+%%% get_tuple_element instruction for every tuple element that will
+%%% ever be used in the rest of the function. That often forces the
+%%% extracted tuple elements to be stored in Y registers until it's
+%%% time to use them. It could also mean that there could be execution
+%%% paths that will never use the extracted elements.
+%%%
+%%% This optimization will sink get_tuple_element instructions, that
+%%% is, move them forward in the execution stream to the last possible
+%%% block there they will still dominate all uses. That may reduce the
+%%% size of stack frames, reduce register shuffling, and avoid
+%%% extracting tuple elements on execution paths that never use the
+%%% extracted values.
+%%%
+
+ssa_opt_sink({#st{ssa=Blocks0}=St, FuncDb}) ->
+    Linear = beam_ssa:linearize(Blocks0),
+
+    %% Create a map with all variables that define get_tuple_element
+    %% instructions. The variable name map to the block it is defined in.
+    case def_blocks(Linear) of
+        [] ->
+            %% No get_tuple_element instructions, so there is nothing to do.
+            {St, FuncDb};
+        [_|_]=Defs0 ->
+            Defs = maps:from_list(Defs0),
+            {do_ssa_opt_sink(Linear, Defs, St), FuncDb}
+    end.
+
+do_ssa_opt_sink(Linear, Defs, #st{ssa=Blocks0}=St) ->
+    %% Now find all the blocks that use variables defined by get_tuple_element
+    %% instructions.
+    Used = used_blocks(Linear, Defs, []),
+
+    %% Calculate dominators.
+    {Dom,Numbering} = beam_ssa:dominators(Blocks0),
+
+    %% It is not safe to move get_tuple_element instructions to blocks
+    %% that begin with certain instructions. It is also unsafe to move
+    %% the instructions into any part of a receive. To avoid such
+    %% unsafe moves, pretend that the unsuitable blocks are not
+    %% dominators.
+    Unsuitable = unsuitable(Linear, Blocks0),
+
+    %% Calculate new positions for get_tuple_element instructions. The new
+    %% position is a block that dominates all uses of the variable.
+    DefLoc = new_def_locations(Used, Defs, Dom, Numbering, Unsuitable),
+
+    %% Now move all suitable get_tuple_element instructions to their
+    %% new blocks.
+    Blocks = foldl(fun({V,To}, A) ->
+                           From = map_get(V, Defs),
+                           move_defs(V, From, To, A)
+                   end, Blocks0, DefLoc),
+    St#st{ssa=Blocks}.
+
+def_blocks([{L,#b_blk{is=Is}}|Bs]) ->
+    def_blocks_is(Is, L, def_blocks(Bs));
+def_blocks([]) -> [].
+
+def_blocks_is([#b_set{op=get_tuple_element,dst=Dst}|Is], L, Acc) ->
+    def_blocks_is(Is, L, [{Dst,L}|Acc]);
+def_blocks_is([_|Is], L, Acc) ->
+    def_blocks_is(Is, L, Acc);
+def_blocks_is([], _, Acc) -> Acc.
+
+used_blocks([{L,Blk}|Bs], Def, Acc0) ->
+    Used = beam_ssa:used(Blk),
+    Acc = [{V,L} || V <- Used, maps:is_key(V, Def)] ++ Acc0,
+    used_blocks(Bs, Def, Acc);
+used_blocks([], _Def, Acc) ->
+    rel2fam(Acc).
+
+%% unsuitable(Linear, Blocks) -> Unsuitable.
+%%  Return an ordset of block labels for the blocks that are not
+%%  suitable for sinking of get_tuple_element instructions.
+
+unsuitable(Linear, Blocks) ->
+    Predecessors = beam_ssa:predecessors(Blocks),
+    Unsuitable0 = unsuitable_1(Linear),
+    Unsuitable1 = unsuitable_recv(Linear, Blocks, Predecessors),
+    gb_sets:from_list(Unsuitable0 ++ Unsuitable1).
+
+unsuitable_1([{L,#b_blk{is=[#b_set{op=Op}|_]}}|Bs]) ->
+    Unsuitable = case Op of
+                     bs_extract -> true;
+                     bs_put -> true;
+                     {float,_} -> true;
+                     landingpad -> true;
+                     peek_message -> true;
+                     wait_timeout -> true;
+                     _ -> false
+                 end,
+    case Unsuitable of
+        true ->
+            [L|unsuitable_1(Bs)];
+        false ->
+            unsuitable_1(Bs)
+    end;
+unsuitable_1([{_,#b_blk{}}|Bs]) ->
+    unsuitable_1(Bs);
+unsuitable_1([]) -> [].
+
+unsuitable_recv([{L,#b_blk{is=[#b_set{op=Op}|_]}}|Bs], Blocks, Predecessors) ->
+    Ls = case Op of
+             remove_message ->
+                 unsuitable_loop(L, Blocks, Predecessors);
+             recv_next ->
+                 unsuitable_loop(L, Blocks, Predecessors);
+             _ ->
+                 []
+         end,
+    Ls ++ unsuitable_recv(Bs, Blocks, Predecessors);
+unsuitable_recv([_|Bs], Blocks, Predecessors) ->
+    unsuitable_recv(Bs, Blocks, Predecessors);
+unsuitable_recv([], _, _) -> [].
+
+unsuitable_loop(L, Blocks, Predecessors) ->
+    unsuitable_loop(L, Blocks, Predecessors, []).
+
+unsuitable_loop(L, Blocks, Predecessors, Acc) ->
+    Ps = map_get(L, Predecessors),
+    unsuitable_loop_1(Ps, Blocks, Predecessors, Acc).
+
+unsuitable_loop_1([P|Ps], Blocks, Predecessors, Acc0) ->
+    case map_get(P, Blocks) of
+        #b_blk{is=[#b_set{op=peek_message}|_]} ->
+            unsuitable_loop_1(Ps, Blocks, Predecessors, Acc0);
+        #b_blk{} ->
+            case ordsets:is_element(P, Acc0) of
+                false ->
+                    Acc1 = ordsets:add_element(P, Acc0),
+                    Acc = unsuitable_loop(P, Blocks, Predecessors, Acc1),
+                    unsuitable_loop_1(Ps, Blocks, Predecessors, Acc);
+                true ->
+                    unsuitable_loop_1(Ps, Blocks, Predecessors, Acc0)
+            end
+    end;
+unsuitable_loop_1([], _, _, Acc) -> Acc.
+
+%% new_def_locations([{Variable,[UsedInBlock]}|Vs], Defs,
+%%                   Dominators, Numbering, Unsuitable) ->
+%%  [{Variable,NewDefinitionBlock}]
+%%
+%%  Calculate new locations for get_tuple_element instructions. For
+%%  each variable, the new location is a block that dominates all uses
+%%  of the variable and as near to the uses of as possible.
+
+new_def_locations([{V,UsedIn}|Vs], Defs, Dom, Numbering, Unsuitable) ->
+    DefIn = map_get(V, Defs),
+    Common = common_dominator(UsedIn, Dom, Numbering, Unsuitable),
+    case member(Common, map_get(DefIn, Dom)) of
+        true ->
+            %% The common dominator is either DefIn or an
+            %% ancestor of DefIn.
+            new_def_locations(Vs, Defs, Dom, Numbering, Unsuitable);
+        false ->
+            %% We have found a suitable descendant of DefIn,
+            %% to which the get_tuple_element instruction can
+            %% be sunk.
+            [{V,Common}|new_def_locations(Vs, Defs, Dom, Numbering, Unsuitable)]
+    end;
+new_def_locations([], _, _, _, _) -> [].
+
+common_dominator(Ls0, Dom, Numbering, Unsuitable) ->
+    [Common|_] = beam_ssa:common_dominators(Ls0, Dom, Numbering),
+    case gb_sets:is_member(Common, Unsuitable) of
+        true ->
+            %% It is not allowed to place the instruction here. Try
+            %% to find another suitable dominating block by going up
+            %% one step in the dominator tree.
+            [Common,OneUp|_] = map_get(Common, Dom),
+            common_dominator([OneUp], Dom, Numbering, Unsuitable);
+        false ->
+            Common
+    end.
+
+%% Move get_tuple_element instructions to their new locations.
+
+move_defs(V, From, To, Blocks) ->
+    #{From:=FromBlk0,To:=ToBlk0} = Blocks,
+    {Def,FromBlk} = remove_def(V, FromBlk0),
+    try insert_def(V, Def, ToBlk0) of
+        ToBlk ->
+            %%io:format("~p: ~p => ~p\n", [V,From,To]),
+            Blocks#{From:=FromBlk,To:=ToBlk}
+    catch
+        throw:not_possible ->
+            Blocks
+    end.
+
+remove_def(V, #b_blk{is=Is0}=Blk) ->
+    {Def,Is} = remove_def_is(Is0, V, []),
+    {Def,Blk#b_blk{is=Is}}.
+
+remove_def_is([#b_set{dst=Dst}=Def|Is], Dst, Acc) ->
+    {Def,reverse(Acc, Is)};
+remove_def_is([I|Is], Dst, Acc) ->
+    remove_def_is(Is, Dst, [I|Acc]).
+
+insert_def(V, Def, #b_blk{is=Is0}=Blk) ->
+    Is = insert_def_is(Is0, V, Def),
+    Blk#b_blk{is=Is}.
+
+insert_def_is([#b_set{op=phi}=I|Is], V, Def) ->
+    case member(V, beam_ssa:used(I)) of
+        true ->
+            throw(not_possible);
+        false ->
+            [I|insert_def_is(Is, V, Def)]
+    end;
+insert_def_is([#b_set{op=Op}=I|Is]=Is0, V, Def) ->
+    Action0 = case Op of
+                  call -> beyond;
+                  'catch_end' -> beyond;
+                  timeout -> beyond;
+                  _ -> here
+              end,
+    Action = case Is of
+                 [#b_set{op=succeeded}|_] -> here;
+                 _ -> Action0
+             end,
+    case Action of
+        beyond ->
+            case member(V, beam_ssa:used(I)) of
+                true ->
+                    %% The variable is used by this instruction. We must
+                    %% place the definition before this instruction.
+                    [Def|Is0];
+                false ->
+                    %% Place it beyond the current instruction.
+                    [I|insert_def_is(Is, V, Def)]
+            end;
+        here ->
+            [Def|Is0]
+    end;
+insert_def_is([], _V, Def) ->
+    [Def].
+
+%%%
+%%% Order consecutive get_tuple_element instructions in ascending
+%%% position order. This will give the loader more opportunities
+%%% for combining get_tuple_element instructions.
+%%%
+
+ssa_opt_get_tuple_element({#st{ssa=Blocks0}=St, FuncDb}) ->
+    Blocks = opt_get_tuple_element(maps:to_list(Blocks0), Blocks0),
+    {St#st{ssa=Blocks}, FuncDb}.
+
+opt_get_tuple_element([{L,#b_blk{is=Is0}=Blk0}|Bs], Blocks) ->
+    case opt_get_tuple_element_is(Is0, false, []) of
+        {yes,Is} ->
+            Blk = Blk0#b_blk{is=Is},
+            opt_get_tuple_element(Bs, Blocks#{L:=Blk});
+        no ->
+            opt_get_tuple_element(Bs, Blocks)
+    end;
+opt_get_tuple_element([], Blocks) -> Blocks.
+
+opt_get_tuple_element_is([#b_set{op=get_tuple_element,
+                                 args=[#b_var{}=Src,_]}=I0|Is0],
+                         _AnyChange, Acc) ->
+    {GetIs0,Is} = collect_get_tuple_element(Is0, Src, [I0]),
+    GetIs1 = sort([{Pos,I} || #b_set{args=[_,Pos]}=I <- GetIs0]),
+    GetIs = [I || {_,I} <- GetIs1],
+    opt_get_tuple_element_is(Is, true, reverse(GetIs, Acc));
+opt_get_tuple_element_is([I|Is], AnyChange, Acc) ->
+    opt_get_tuple_element_is(Is, AnyChange, [I|Acc]);
+opt_get_tuple_element_is([], AnyChange, Acc) ->
+    case AnyChange of
+        true -> {yes,reverse(Acc)};
+        false -> no
+    end.
+
+collect_get_tuple_element([#b_set{op=get_tuple_element,
+                                  args=[Src,_]}=I|Is], Src, Acc) ->
+    collect_get_tuple_element(Is, Src, [I|Acc]);
+collect_get_tuple_element(Is, _Src, Acc) ->
+    {Acc,Is}.
+
+%%%
+%%% Common utilities.
+%%%
+
+gcd(A, B) ->
+    case A rem B of
+        0 -> B;
+        X -> gcd(B, X)
+    end.
+
+non_guards(Linear) ->
+    gb_sets:from_list(non_guards_1(Linear)).
+
+non_guards_1([{L,#b_blk{is=Is}}|Bs]) ->
+    case Is of
+        [#b_set{op=landingpad}|_] ->
+            [L | non_guards_1(Bs)];
+        _ ->
+            non_guards_1(Bs)
+    end;
+non_guards_1([]) ->
+    [?BADARG_BLOCK].
+
+rel2fam(S0) ->
+    S1 = sofs:relation(S0),
+    S = sofs:rel2fam(S1),
+    sofs:to_external(S).
+
+sub(I, Sub) ->
+    beam_ssa:normalize(sub_1(I, Sub)).
+
+sub_1(#b_set{op=phi,args=Args}=I, Sub) ->
+    I#b_set{args=[{sub_arg(A, Sub),P} || {A,P} <- Args]};
+sub_1(#b_set{args=Args}=I, Sub) ->
+    I#b_set{args=[sub_arg(A, Sub) || A <- Args]};
+sub_1(#b_br{bool=#b_var{}=Old}=Br, Sub) ->
+    New = sub_arg(Old, Sub),
+    Br#b_br{bool=New};
+sub_1(#b_switch{arg=#b_var{}=Old}=Sw, Sub) ->
+    New = sub_arg(Old, Sub),
+    Sw#b_switch{arg=New};
+sub_1(#b_ret{arg=#b_var{}=Old}=Ret, Sub) ->
+    New = sub_arg(Old, Sub),
+    Ret#b_ret{arg=New};
+sub_1(Last, _) -> Last.
+
+sub_arg(#b_remote{mod=Mod,name=Name}=Rem, Sub) ->
+    Rem#b_remote{mod=sub_arg(Mod, Sub),name=sub_arg(Name, Sub)};
+sub_arg(Old, Sub) ->
+    case Sub of
+        #{Old:=New} -> New;
+        #{} -> Old
+    end.
+
+new_var(#b_var{name={Base,N}}, Count) ->
+    true = is_integer(N),                       %Assertion.
+    {#b_var{name={Base,Count}},Count+1};
+new_var(#b_var{name=Base}, Count) ->
+    {#b_var{name={Base,Count}},Count+1}.
diff --git a/lib/compiler/src/beam_ssa_opt.hrl b/lib/compiler/src/beam_ssa_opt.hrl
new file mode 100644
index 0000000000..37711a6f48
--- /dev/null
+++ b/lib/compiler/src/beam_ssa_opt.hrl
@@ -0,0 +1,53 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019. 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("beam_ssa.hrl").
+
+-record(func_info,
+        {%% Local calls going in/out of this function.
+         in = ordsets:new() :: ordsets:ordset(func_id()),
+         out = ordsets:new() :: ordsets:ordset(func_id()),
+
+         %% Whether the function is exported or not; some optimizations may
+         %% need to be suppressed if it is.
+         exported = true :: boolean(),
+
+         %% The inferred types of each argument (as opposed to parameter),
+         %% indexed by call site.
+         %%
+         %% This is more effective than the naive approach of joining into a
+         %% "parameter_type" as we go as it lets us narrow parameter types
+         %% without having to visit all callers on each pass, which helps a lot
+         %% when dealing with co-recursive functions.
+         arg_types = [] :: list(arg_type_map()),
+
+         %% The inferred return type of this function, this is either [type()]
+         %% or [] to note absence.
+         ret_type = [] :: list()}).
+
+-type arg_key() :: {CallerId :: func_id(),
+                    CallDst :: beam_ssa:b_var()}.
+-type arg_type_map() :: #{ arg_key() => term() }.
+
+%% Per-function metadata used by various optimization passes to perform
+%% module-level optimization. If a function is absent it means that
+%% module-level optimization has been turned off for said function.
+-type func_id() :: beam_ssa:b_local().
+-type func_info_db() :: #{ func_id() => #func_info{} }.
diff --git a/lib/compiler/src/beam_ssa_pp.erl b/lib/compiler/src/beam_ssa_pp.erl
new file mode 100644
index 0000000000..34ac08b32e
--- /dev/null
+++ b/lib/compiler/src/beam_ssa_pp.erl
@@ -0,0 +1,238 @@
+%%
+%% %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(beam_ssa_pp).
+
+-export([format_function/1,format_instr/1,format_var/1]).
+
+-include("beam_ssa.hrl").
+
+-spec format_function(beam_ssa:b_function()) -> iolist().
+
+format_function(#b_function{anno=Anno0,args=Args,
+                            bs=Blocks,cnt=Counter}) ->
+    #{func_info:={M,F,_}} = Anno0,
+    Anno = maps:without([func_info,location,live_intervals,registers], Anno0),
+    FuncAnno = case Anno0 of
+                   #{live_intervals:=Intervals} ->
+                       Anno0#{live_intervals:=maps:from_list(Intervals)};
+                   #{} ->
+                       Anno0
+               end,
+     ReachableBlocks = beam_ssa:rpo(Blocks),
+     All = maps:keys(Blocks),
+     Unreachable = ordsets:subtract(ordsets:from_list(All),
+                                    ordsets:from_list(ReachableBlocks)),
+    [case Anno0 of
+         #{location:={Filename,Line}} ->
+             io_lib:format("%% ~ts:~p\n", [Filename,Line]);
+         #{} ->
+             []
+     end,
+     io_lib:format("%% Counter = ~p\n", [Counter]),
+     [format_anno(Key, Value) ||
+         {Key,Value} <- lists:sort(maps:to_list(Anno))],
+     io_lib:format("function ~p:~p(~ts) {\n", [M,F,format_args(Args, FuncAnno)]),
+     [format_live_interval(Var, FuncAnno) || Var <- Args],
+     format_blocks(ReachableBlocks, Blocks, FuncAnno),
+     case Unreachable of
+         [] ->
+             [];
+         [_|_] ->
+             ["\n%% Unreachable blocks\n\n",
+              format_blocks(Unreachable, Blocks, FuncAnno)]
+     end,
+
+     "}\n"].
+
+
+-spec format_instr(beam_ssa:b_set()) -> iolist().
+
+format_instr(#b_set{}=I) ->
+    Cs = lists:flatten(format_instr(I#b_set{anno=#{}}, #{}, true)),
+    string:trim(Cs, leading);
+format_instr(I0) ->
+    I = setelement(2, I0, #{}),
+    Cs = lists:flatten(format_terminator(I, #{})),
+    string:trim(Cs, both).
+
+-spec format_var(beam_ssa:b_var()) -> iolist().
+
+format_var(V) ->
+    Cs = lists:flatten(format_var(V, #{})),
+    string:trim(Cs, leading).
+
+%%%
+%%% Local functions.
+%%%
+
+format_anno(Key, Map) when is_map(Map) ->
+    Sorted = lists:sort(maps:to_list(Map)),
+    [io_lib:format("%% ~s:\n", [Key]),
+     [io_lib:format("%%    ~w => ~w\n", [K,V]) || {K,V} <- Sorted]];
+format_anno(Key, Value) ->
+    io_lib:format("%% ~s: ~p\n", [Key,Value]).
+
+format_blocks(Ls, Blocks, Anno) ->
+    PP = [format_block(L, Blocks, Anno) || L <- Ls],
+    lists:join($\n, PP).
+
+format_block(L, Blocks, FuncAnno) ->
+    #b_blk{anno=Anno,is=Is,last=Last} = maps:get(L, Blocks),
+    [case map_size(Anno) of
+         0 -> [];
+         _ -> io_lib:format("%% ~p\n", [Anno])
+     end,
+     io_lib:format("~p:", [L]),
+     format_instrs(Is, FuncAnno, true),
+     $\n,
+     format_terminator(Last, FuncAnno)].
+
+format_instrs([I|Is], FuncAnno, First) ->
+    [$\n,
+     format_instr(I, FuncAnno, First),
+     format_instrs(Is, FuncAnno, false)];
+format_instrs([], _FuncAnno, _First) ->
+    [].
+
+format_instr(#b_set{anno=Anno,op=Op,dst=Dst,args=Args},
+             FuncAnno, First) ->
+    AnnoStr = format_anno(Anno),
+    LiveIntervalStr = format_live_interval(Dst, FuncAnno),
+    [if
+         First ->
+             [];
+         AnnoStr =/= []; LiveIntervalStr =/= [] ->
+             $\n;
+         true ->
+             []
+     end,
+     AnnoStr,
+     LiveIntervalStr,
+     io_lib:format("  ~s~ts = ~ts", [format_i_number(Anno),
+                                     format_var(Dst, FuncAnno),
+                                     format_op(Op)]),
+     case Args of
+         [] ->
+             [];
+         [_|_] ->
+             io_lib:format(" ~ts", [format_args(Args, FuncAnno)])
+     end].
+
+format_i_number(#{n:=N}) ->
+    io_lib:format("[~p] ", [N]);
+format_i_number(#{}) -> [].
+
+format_terminator(#b_br{anno=A,bool=#b_literal{val=true},succ=Lbl}, _) ->
+    io_lib:format("  ~sbr label ~p\n", [format_i_number(A),Lbl]);
+format_terminator(#b_br{anno=A,bool=#b_literal{val=false},fail=Lbl}, _) ->
+    io_lib:format("  ~sbr label ~p\n", [format_i_number(A),Lbl]);
+format_terminator(#b_br{anno=A,bool=Bool,succ=Succ,fail=Fail}, FuncAnno) ->
+    io_lib:format("  ~sbr ~ts, label ~p, label ~p\n",
+                  [format_i_number(A),format_arg(Bool, FuncAnno),Succ,Fail]);
+format_terminator(#b_switch{anno=A,arg=Arg,fail=Fail,list=List}, FuncAnno) ->
+    io_lib:format("  ~sswitch ~ts, label ~p, ~ts\n",
+                  [format_i_number(A),format_arg(Arg, FuncAnno),Fail,
+                   format_list(List,FuncAnno)]);
+format_terminator(#b_ret{anno=A,arg=Arg}, FuncAnno) ->
+    io_lib:format("  ~sret ~ts\n", [format_i_number(A),format_arg(Arg, FuncAnno)]).
+
+format_op({Prefix,Name}) ->
+    io_lib:format("~p:~p", [Prefix,Name]);
+format_op(Name) ->
+    io_lib:format("~p", [Name]).
+
+format_register(#b_var{}=V, #{registers:=Regs}) ->
+    {Tag,N} = maps:get(V, Regs),
+    io_lib:format("~p~p", [Tag,N]);
+format_register(_, #{}) -> "".
+
+format_var(Var, FuncAnno) ->
+    VarString = format_var_1(Var),
+    case format_register(Var, FuncAnno) of
+        [] -> VarString;
+        [_|_]=Reg -> [Reg,$/,VarString]
+    end.
+
+format_var_1(#b_var{name={Name,Uniq}}) ->
+    if
+        is_atom(Name) ->
+            io_lib:format("~ts:~p", [Name,Uniq]);
+        is_integer(Name) ->
+            io_lib:format("_~p:~p", [Name,Uniq])
+    end;
+format_var_1(#b_var{name=Name}) when is_atom(Name) ->
+    atom_to_list(Name);
+format_var_1(#b_var{name=Name}) when is_integer(Name) ->
+    "_"++integer_to_list(Name).
+
+format_args(Args, FuncAnno) ->
+    Ss = [format_arg(Arg, FuncAnno) || Arg <- Args],
+    lists:join(", ", Ss).
+
+format_arg(#b_var{}=Arg, FuncAnno) ->
+    format_var(Arg, FuncAnno);
+format_arg(#b_literal{val=Val}, _FuncAnno) ->
+    io_lib:format("literal ~p", [Val]);
+format_arg(#b_remote{mod=Mod,name=Name,arity=Arity}, FuncAnno) ->
+    io_lib:format("remote (~ts):(~ts)/~p",
+                  [format_arg(Mod, FuncAnno),format_arg(Name, FuncAnno),Arity]);
+format_arg(#b_local{name=Name,arity=Arity}, FuncAnno) ->
+    io_lib:format("local ~ts/~p", [format_arg(Name, FuncAnno),Arity]);
+format_arg({Value,Label}, FuncAnno) when is_integer(Label) ->
+    io_lib:format("{ ~ts, ~p }", [format_arg(Value, FuncAnno),Label]);
+format_arg(Other, _) ->
+    io_lib:format("*** ~p ***", [Other]).
+
+format_list(List, FuncAnno) ->
+    Ss = [io_lib:format("{ ~ts, ~ts }", [format_arg(Val, FuncAnno),format_label(L)]) ||
+             {Val,L} <- List],
+    io_lib:format("[ ~ts ]", [lists:join(", ", Ss)]).
+
+format_label(L) ->
+    ["label ",integer_to_list(L)].
+
+format_anno(#{n:=_}=Anno) ->
+    format_anno(maps:remove(n, Anno));
+format_anno(#{location:={File,Line}}=Anno0) ->
+    Anno = maps:remove(location, Anno0),
+    [io_lib:format("  %% ~ts:~p\n", [File,Line])|format_anno_1(Anno)];
+format_anno(Anno) ->
+    format_anno_1(Anno).
+
+format_anno_1(Anno) ->
+    case map_size(Anno) of
+        0 ->
+            [];
+        _ ->
+            [io_lib:format("  %% Anno: ~p\n", [Anno])]
+    end.
+
+format_live_interval(#b_var{}=Dst, #{live_intervals:=Intervals}) ->
+    case Intervals of
+        #{Dst:=Rs0} ->
+            Rs1 = [io_lib:format("~p..~p", [Start,End]) ||
+                      {Start,End} <- Rs0],
+            Rs = lists:join(" ", Rs1),
+            io_lib:format("  %% ~ts: ~s\n", [format_var_1(Dst),Rs]);
+        #{} ->
+            []
+    end;
+format_live_interval(_, _) -> [].
+
diff --git a/lib/compiler/src/beam_ssa_pre_codegen.erl b/lib/compiler/src/beam_ssa_pre_codegen.erl
new file mode 100644
index 0000000000..7f816b9802
--- /dev/null
+++ b/lib/compiler/src/beam_ssa_pre_codegen.erl
@@ -0,0 +1,2937 @@
+%%
+%% %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%
+%%
+%% Purpose: Prepare for code generation, including register allocation.
+%%
+%% The output of this compiler pass is still in the SSA format, but
+%% it has been annotated and transformed to help the code generator.
+%%
+%% * Some instructions are translated to other instructions closer to
+%% the BEAM instructions. For example, the binary matching
+%% instructions are transformed from the optimization-friendly
+%% internal format to instruction more similar to the actual BEAM
+%% instructions.
+%%
+%% * Blocks that will need an instruction for allocating a stack frame
+%% are annotated with a {frame_size,Size} annotation.
+%%
+%% * 'copy' instructions are added for all variables that need
+%% to be saved to the stack frame. Additional 'copy' instructions
+%% can be added as an optimization to reuse y registers (see
+%% the copy_retval sub pass).
+%%
+%% * Each function is annotated with a {register,RegisterMap}
+%% annotation that maps each variable to a BEAM register. The linear
+%% scan algorithm is used to allocate registers.
+%%
+%% There are four kind of registers. x, y, fr (floating point register),
+%% and z. A variable will be allocated to a z register if it is only
+%% used by the instruction following the instruction that defines the
+%% the variable. The code generator will typically combine those
+%% instructions to a test instruction. z registers are also used for
+%% some instructions that don't have a return value.
+%%
+%% References:
+%%
+%% [1] H. Mössenböck and M. Pfeiffer. Linear scan register allocation
+%% in the context of SSA form and register constraints. In Proceedings
+%% of the International Conference on Compiler Construction, pages
+%% 229–246. LNCS 2304, Springer-Verlag, 2002.
+%%
+%% [2] C. Wimmer and H. Mössenböck. Optimized interval splitting in a
+%% linear scan register allocator. In Proceedings of the ACM/USENIX
+%% International Conference on Virtual Execution Environments, pages
+%% 132–141. ACM Press, 2005.
+%%
+%% [3] C. Wimmer and M. Franz. Linear Scan Register Allocation on SSA
+%% Form. In Proceedings of the International Symposium on Code
+%% Generation and Optimization, pages 170-179. ACM Press, 2010.
+%%
+
+-module(beam_ssa_pre_codegen).
+
+-export([module/2]).
+
+-include("beam_ssa.hrl").
+
+-import(lists, [all/2,any/2,append/1,duplicate/2,
+                foldl/3,last/1,map/2,member/2,partition/2,
+                reverse/1,reverse/2,sort/1,splitwith/2,zip/2]).
+
+-spec module(beam_ssa:b_module(), [compile:option()]) ->
+                    {'ok',beam_ssa:b_module()}.
+
+module(#b_module{body=Fs0}=Module, Opts) ->
+    UseBSM3 = not proplists:get_bool(no_bsm3, Opts),
+    Ps = passes(Opts),
+    Fs = functions(Fs0, Ps, UseBSM3),
+    {ok,Module#b_module{body=Fs}}.
+
+functions([F|Fs], Ps, UseBSM3) ->
+    [function(F, Ps, UseBSM3)|functions(Fs, Ps, UseBSM3)];
+functions([], _Ps, _UseBSM3) -> [].
+
+-type b_var() :: beam_ssa:b_var().
+-type var_name() :: beam_ssa:var_name().
+-type instr_number() :: pos_integer().
+-type range() :: {instr_number(),instr_number()}.
+-type reg_num() :: beam_asm:reg_num().
+-type xreg() :: {'x',reg_num()}.
+-type yreg() :: {'y',reg_num()}.
+-type ypool() :: {'y',beam_ssa:label()}.
+-type reservation() :: 'fr' | {'prefer',xreg()} | 'x' | {'x',xreg()} |
+                       ypool() | {yreg(),ypool()} | 'z'.
+-type ssa_register() :: beam_ssa_codegen:ssa_register().
+
+-define(TC(Body), tc(fun() -> Body end, ?FILE, ?LINE)).
+-record(st, {ssa :: beam_ssa:block_map(),
+             args :: [b_var()],
+             cnt :: beam_ssa:label(),
+             use_bsm3 :: boolean(),
+             frames=[] :: [beam_ssa:label()],
+             intervals=[] :: [{b_var(),[range()]}],
+             res=[] :: [{b_var(),reservation()}] | #{b_var():=reservation()},
+             regs=#{} :: #{b_var():=ssa_register()},
+             extra_annos=[] :: [{atom(),term()}]
+            }).
+-define(PASS(N), {N,fun N/1}).
+
+passes(Opts) ->
+    AddPrecgAnnos = proplists:get_bool(dprecg, Opts),
+    FixTuples = proplists:get_bool(no_put_tuple2, Opts),
+    Ps = [?PASS(assert_no_critical_edges),
+
+          %% Preliminaries.
+          ?PASS(fix_bs),
+          ?PASS(sanitize),
+          case FixTuples of
+              false -> ignore;
+              true -> ?PASS(fix_tuples)
+          end,
+          ?PASS(use_set_tuple_element),
+          ?PASS(place_frames),
+          ?PASS(fix_receives),
+
+          %% Find and reserve Y registers.
+          ?PASS(find_yregs),
+          ?PASS(reserve_yregs),
+
+          %% Handle legacy binary match instruction that don't
+          %% accept a Y register as destination.
+          ?PASS(legacy_bs),
+
+          %% Improve reuse of Y registers to potentially
+          %% reduce the size of the stack frame.
+          ?PASS(copy_retval),
+          ?PASS(opt_get_list),
+
+          %% Calculate live intervals.
+          ?PASS(number_instructions),
+          ?PASS(live_intervals),
+          ?PASS(reserve_regs),
+
+          %% If needed for a .precg file, save the live intervals
+          %% so they can be included in an annotation.
+          case AddPrecgAnnos of
+              false -> ignore;
+              true -> ?PASS(save_live_intervals)
+          end,
+
+          %% Allocate registers.
+          ?PASS(linear_scan),
+          ?PASS(frame_size),
+          ?PASS(turn_yregs),
+
+          ?PASS(assert_no_critical_edges)],
+    [P || P <- Ps, P =/= ignore].
+
+function(#b_function{anno=Anno,args=Args,bs=Blocks0,cnt=Count0}=F0,
+         Ps, UseBSM3) ->
+    try
+        St0 = #st{ssa=Blocks0,args=Args,use_bsm3=UseBSM3,cnt=Count0},
+        St = compile:run_sub_passes(Ps, St0),
+        #st{ssa=Blocks,cnt=Count,regs=Regs,extra_annos=ExtraAnnos} = St,
+        F1 = add_extra_annos(F0, ExtraAnnos),
+        F = beam_ssa:add_anno(registers, Regs, F1),
+        F#b_function{bs=Blocks,cnt=Count}
+    catch
+        Class:Error:Stack ->
+            #{func_info:={_,Name,Arity}} = Anno,
+            io:fwrite("Function: ~w/~w\n", [Name,Arity]),
+            erlang:raise(Class, Error, Stack)
+    end.
+
+save_live_intervals(#st{intervals=Intervals}=St) ->
+    St#st{extra_annos=[{live_intervals,Intervals}]}.
+
+%% Add extra annotations when a .precg listing file is being produced.
+add_extra_annos(F, Annos) ->
+    foldl(fun({Name,Value}, Acc) ->
+                  beam_ssa:add_anno(Name, Value, Acc)
+          end, F, Annos).
+
+%% assert_no_critical_edges(St0) -> St.
+%%  The code generator will not work if there are critial edges.
+%%  Abort if any critical edges are found.
+
+assert_no_critical_edges(#st{ssa=Blocks}=St) ->
+    F = fun assert_no_ces/3,
+    beam_ssa:fold_rpo(F, Blocks, Blocks),
+    St.
+
+assert_no_ces(_, #b_blk{is=[#b_set{op=phi,args=[_,_]=Phis}|_]}, Blocks) ->
+    %% This block has multiple predecessors. Make sure that none
+    %% of the precessors have more than one successor.
+    true = all(fun({_,P}) ->
+                       length(beam_ssa:successors(P, Blocks)) =:= 1
+               end, Phis),                      %Assertion.
+    Blocks;
+assert_no_ces(_, _, Blocks) -> Blocks.
+
+%% fix_bs(St0) -> St.
+%%  Fix up the binary matching instructions:
+%%
+%%    * Insert bs_save and bs_restore instructions where needed.
+%%
+%%    * Combine bs_match and bs_extract instructions to bs_get
+%%      instructions.
+
+fix_bs(#st{ssa=Blocks,cnt=Count0,use_bsm3=UseBSM3}=St) ->
+    F = fun(#b_set{op=bs_start_match,dst=Dst}, A) ->
+                %% Mark the root of the match context list.
+                [{Dst,{context,Dst}}|A];
+           (#b_set{op=bs_match,dst=Dst,args=[_,ParentCtx|_]}, A) ->
+                %% Link this match context the previous match context.
+                [{Dst,ParentCtx}|A];
+           (_, A) ->
+                A
+        end,
+    case beam_ssa:fold_instrs_rpo(F, [0], [],Blocks) of
+        [] ->
+            %% No binary matching in this function.
+            St;
+        [_|_]=M ->
+            CtxChain = maps:from_list(M),
+            Linear0 = beam_ssa:linearize(Blocks),
+
+            %% Insert position instructions where needed.
+            {Linear1,Count} = case UseBSM3 of
+                                  true ->
+                                      bs_pos_bsm3(Linear0, CtxChain, Count0);
+                                  false ->
+                                      bs_pos_bsm2(Linear0, CtxChain, Count0)
+                              end,
+
+            %% Rename instructions.
+            Linear = bs_instrs(Linear1, CtxChain, []),
+
+            St#st{ssa=maps:from_list(Linear),cnt=Count}
+    end.
+
+%% Insert bs_get_position and bs_set_position instructions as needed.
+bs_pos_bsm3(Linear0, CtxChain, Count0) ->
+    Rs0 = bs_restores(Linear0, CtxChain, #{}, #{}),
+    Rs = maps:values(Rs0),
+    S0 = sofs:relation(Rs, [{context,save_point}]),
+    S1 = sofs:relation_to_family(S0),
+    S = sofs:to_external(S1),
+
+    {SavePoints,Count1} = make_bs_pos_dict(S, Count0, []),
+    {Gets,Count2} = make_bs_setpos_map(Rs, SavePoints, Count1, []),
+    {Sets,Count} = make_bs_getpos_map(maps:to_list(Rs0), SavePoints, Count2, []),
+
+    %% Now insert all saves and restores.
+    {bs_insert_bsm3(Linear0, Gets, Sets, SavePoints),Count}.
+
+make_bs_setpos_map([{Ctx,Save}=Ps|T], SavePoints, Count, Acc) ->
+    SavePoint = get_savepoint(Ps, SavePoints),
+    I = #b_set{op=bs_get_position,dst=SavePoint,args=[Ctx]},
+    make_bs_setpos_map(T, SavePoints, Count+1, [{Save,I}|Acc]);
+make_bs_setpos_map([], _, Count, Acc) ->
+    {maps:from_list(Acc),Count}.
+
+make_bs_getpos_map([{Bef,{Ctx,_}=Ps}|T], SavePoints, Count, Acc) ->
+    Ignored = #b_var{name={'@ssa_ignored',Count}},
+    Args = [Ctx, get_savepoint(Ps, SavePoints)],
+    I = #b_set{op=bs_set_position,dst=Ignored,args=Args},
+    make_bs_getpos_map(T, SavePoints, Count+1, [{Bef,I}|Acc]);
+make_bs_getpos_map([], _, Count, Acc) ->
+    {maps:from_list(Acc),Count}.
+
+get_savepoint({_,_}=Ps, SavePoints) ->
+    Name = {'@ssa_bs_position', map_get(Ps, SavePoints)},
+    #b_var{name=Name}.
+
+make_bs_pos_dict([{Ctx,Pts}|T], Count0, Acc0) ->
+    {Acc, Count} = make_bs_pos_dict_1(Pts, Ctx, Count0, Acc0),
+    make_bs_pos_dict(T, Count, Acc);
+make_bs_pos_dict([], Count, Acc) ->
+    {maps:from_list(Acc), Count}.
+
+make_bs_pos_dict_1([H|T], Ctx, I, Acc) ->
+    make_bs_pos_dict_1(T, Ctx, I+1, [{{Ctx,H},I}|Acc]);
+make_bs_pos_dict_1([], Ctx, I, Acc) ->
+    {[{Ctx,I}|Acc], I}.
+
+%% As bs_position but without OTP-22 instructions. This is only used when
+%% cross-compiling to older versions.
+bs_pos_bsm2(Linear0, CtxChain, Count0) ->
+    Rs0 = bs_restores(Linear0, CtxChain, #{}, #{}),
+    Rs = maps:values(Rs0),
+    S0 = sofs:relation(Rs, [{context,save_point}]),
+    S1 = sofs:relation_to_family(S0),
+    S = sofs:to_external(S1),
+    Slots = make_save_point_dict(S, []),
+    {Saves,Count1} = make_save_map(Rs, Slots, Count0, []),
+    {Restores,Count} = make_restore_map(maps:to_list(Rs0), Slots, Count1, []),
+
+    %% Now insert all saves and restores.
+    {bs_insert_bsm2(Linear0, Saves, Restores, Slots),Count}.
+
+make_save_map([{Ctx,Save}=Ps|T], Slots, Count, Acc) ->
+    Ignored = #b_var{name={'@ssa_ignored',Count}},
+    case make_slot(Ps, Slots) of
+        #b_literal{val=start} ->
+            make_save_map(T, Slots, Count, Acc);
+        Slot ->
+            I = #b_set{op=bs_save,dst=Ignored,args=[Ctx,Slot]},
+            make_save_map(T, Slots, Count+1, [{Save,I}|Acc])
+    end;
+make_save_map([], _, Count, Acc) ->
+    {maps:from_list(Acc),Count}.
+
+make_restore_map([{Bef,{Ctx,_}=Ps}|T], Slots, Count, Acc) ->
+    Ignored = #b_var{name={'@ssa_ignored',Count}},
+    I = #b_set{op=bs_restore,dst=Ignored,args=[Ctx,make_slot(Ps, Slots)]},
+    make_restore_map(T, Slots, Count+1, [{Bef,I}|Acc]);
+make_restore_map([], _, Count, Acc) ->
+    {maps:from_list(Acc),Count}.
+
+make_slot({Same,Same}, _Slots) ->
+    #b_literal{val=start};
+make_slot({_,_}=Ps, Slots) ->
+    #b_literal{val=map_get(Ps, Slots)}.
+
+make_save_point_dict([{Ctx,Pts}|T], Acc0) ->
+    Acc = make_save_point_dict_1(Pts, Ctx, 0, Acc0),
+    make_save_point_dict(T, Acc);
+make_save_point_dict([], Acc) ->
+    maps:from_list(Acc).
+
+make_save_point_dict_1([Ctx|T], Ctx, I, Acc) ->
+    %% Special {atom,start} save point. Does not need a
+    %% bs_save instruction.
+    make_save_point_dict_1(T, Ctx, I, Acc);
+make_save_point_dict_1([H|T], Ctx, I, Acc) ->
+    make_save_point_dict_1(T, Ctx, I+1, [{{Ctx,H},I}|Acc]);
+make_save_point_dict_1([], Ctx, I, Acc) ->
+    [{Ctx,I}|Acc].
+
+bs_restores([{L,#b_blk{is=Is,last=Last}}|Bs], CtxChain, D0, Rs0) ->
+    InPos = maps:get(L, D0, #{}),
+    {SuccPos, FailPos, Rs} = bs_restores_is(Is, CtxChain, InPos, InPos, Rs0),
+
+    D = bs_update_successors(Last, SuccPos, FailPos, D0),
+    bs_restores(Bs, CtxChain, D, Rs);
+bs_restores([], _, _, Rs) -> Rs.
+
+bs_update_successors(#b_br{succ=Succ,fail=Fail}, SPos, FPos, D) ->
+    join_positions([{Succ,SPos},{Fail,FPos}], D);
+bs_update_successors(#b_switch{fail=Fail,list=List}, SPos, FPos, D) ->
+    SPos = FPos,                                %Assertion.
+    Update = [{L,SPos} || {_,L} <- List] ++ [{Fail,SPos}],
+    join_positions(Update, D);
+bs_update_successors(#b_ret{}, SPos, FPos, D) ->
+    SPos = FPos,                                %Assertion.
+    D.
+
+join_positions([{L,MapPos0}|T], D) ->
+    case D of
+        #{L:=MapPos0} ->
+            %% Same map.
+            join_positions(T, D);
+        #{L:=MapPos1} ->
+            %% Different maps.
+            MapPos = join_positions_1(MapPos0, MapPos1),
+            join_positions(T, D#{L:=MapPos});
+        #{} ->
+            join_positions(T, D#{L=>MapPos0})
+    end;
+join_positions([], D) -> D.
+
+join_positions_1(MapPos0, MapPos1) ->
+    MapPos2 = maps:map(fun(Start, Pos) ->
+                               case MapPos0 of
+                                   #{Start:=Pos} -> Pos;
+                                   #{Start:=_} -> unknown;
+                                   #{} -> Pos
+                               end
+                       end, MapPos1),
+    maps:merge(MapPos0, MapPos2).
+
+%%
+%% Updates the restore and position maps according to the given instructions.
+%%
+%% Note that positions may be updated even when a match fails; if a match
+%% requires a restore, the position at the fail block will be the position
+%% we've *restored to* and not the one we entered the current block with.
+%%
+
+bs_restores_is([#b_set{op=bs_start_match,dst=Start}|Is],
+               CtxChain, SPos0, FPos, Rs) ->
+    %% We only allow one match per block.
+    SPos0 = FPos,                               %Assertion.
+    SPos = SPos0#{Start=>Start},
+    bs_restores_is(Is, CtxChain, SPos, FPos, Rs);
+bs_restores_is([#b_set{op=bs_match,dst=NewPos,args=Args}=I|Is],
+               CtxChain, SPos0, FPos0, Rs0) ->
+    SPos0 = FPos0,                              %Assertion.
+    Start = bs_subst_ctx(NewPos, CtxChain),
+    [_,FromPos|_] = Args,
+    case SPos0 of
+        #{Start:=FromPos} ->
+            %% Same position, no restore needed.
+            SPos = case bs_match_type(I) of
+                         plain ->
+                             %% Update position to new position.
+                             SPos0#{Start:=NewPos};
+                         _ ->
+                             %% Position will not change (test_unit
+                             %% instruction or no instruction at
+                             %% all).
+                             SPos0#{Start:=FromPos}
+                     end,
+            bs_restores_is(Is, CtxChain, SPos, FPos0, Rs0);
+        #{Start:=_} ->
+            %% Different positions, might need a restore instruction.
+            case bs_match_type(I) of
+                none ->
+                    %% This is a tail test that will be optimized away.
+                    %% There's no need to do a restore, and all
+                    %% positions are unchanged.
+                    bs_restores_is(Is, CtxChain, SPos0, FPos0, Rs0);
+                test_unit ->
+                    %% This match instruction will be replaced by
+                    %% a test_unit instruction. We will need a
+                    %% restore. The new position will be the position
+                    %% restored to (NOT NewPos).
+                    SPos = SPos0#{Start:=FromPos},
+                    FPos = FPos0#{Start:=FromPos},
+                    Rs = Rs0#{NewPos=>{Start,FromPos}},
+                    bs_restores_is(Is, CtxChain, SPos, FPos, Rs);
+                plain ->
+                    %% Match or skip. Position will be changed.
+                    SPos = SPos0#{Start:=NewPos},
+                    FPos = FPos0#{Start:=FromPos},
+                    Rs = Rs0#{NewPos=>{Start,FromPos}},
+                    bs_restores_is(Is, CtxChain, SPos, FPos, Rs)
+            end
+    end;
+bs_restores_is([#b_set{op=bs_extract,args=[FromPos|_]}|Is],
+               CtxChain, SPos, FPos, Rs) ->
+    Start = bs_subst_ctx(FromPos, CtxChain),
+    #{Start:=FromPos} = SPos,                   %Assertion.
+    #{Start:=FromPos} = FPos,                   %Assertion.
+    bs_restores_is(Is, CtxChain, SPos, FPos, Rs);
+bs_restores_is([#b_set{op=call,dst=Dst,args=Args}|Is],
+               CtxChain, SPos0, FPos0, Rs0) ->
+    {Rs, SPos1, FPos1} = bs_restore_args(Args, SPos0, FPos0, CtxChain, Dst, Rs0),
+    {SPos, FPos} = bs_invalidate_pos(Args, SPos1, FPos1, CtxChain),
+    bs_restores_is(Is, CtxChain, SPos, FPos, Rs);
+bs_restores_is([#b_set{op=landingpad}|Is], CtxChain, SPos0, FPos0, Rs) ->
+    %% We can land here from any point, so all positions are invalid.
+    Invalidate = fun(_Start,_Pos) -> unknown end,
+    SPos = maps:map(Invalidate, SPos0),
+    FPos = maps:map(Invalidate, FPos0),
+    bs_restores_is(Is, CtxChain, SPos, FPos, Rs);
+bs_restores_is([#b_set{op=Op,dst=Dst,args=Args}|Is],
+               CtxChain, SPos0, FPos0, Rs0)
+  when Op =:= bs_test_tail;
+       Op =:= bs_get_tail ->
+    {Rs, SPos, FPos} = bs_restore_args(Args, SPos0, FPos0, CtxChain, Dst, Rs0),
+    bs_restores_is(Is, CtxChain, SPos, FPos, Rs);
+bs_restores_is([_|Is], CtxChain, SPos, FPos, Rs) ->
+    bs_restores_is(Is, CtxChain, SPos, FPos, Rs);
+bs_restores_is([], _CtxChain, SPos, FPos, Rs) ->
+    {SPos, FPos, Rs}.
+
+bs_match_type(#b_set{args=[#b_literal{val=skip},_Ctx,
+                             #b_literal{val=binary},_Flags,
+                             #b_literal{val=all},#b_literal{val=U}]}) ->
+    case U of
+        1 -> none;
+        _ -> test_unit
+    end;
+bs_match_type(_) ->
+    plain.
+
+%% Call instructions leave the match position in an undefined state,
+%% requiring us to invalidate each affected argument.
+bs_invalidate_pos([#b_var{}=Arg|Args], SPos0, FPos0, CtxChain) ->
+    Start = bs_subst_ctx(Arg, CtxChain),
+    case SPos0 of
+        #{Start:=_} ->
+            SPos = SPos0#{Start:=unknown},
+            FPos = FPos0#{Start:=unknown},
+            bs_invalidate_pos(Args, SPos, FPos, CtxChain);
+        #{} ->
+            %% Not a match context.
+            bs_invalidate_pos(Args, SPos0, FPos0, CtxChain)
+    end;
+bs_invalidate_pos([_|Args], SPos, FPos, CtxChain) ->
+    bs_invalidate_pos(Args, SPos, FPos, CtxChain);
+bs_invalidate_pos([], SPos, FPos, _CtxChain) ->
+    {SPos, FPos}.
+
+bs_restore_args([#b_var{}=Arg|Args], SPos0, FPos0, CtxChain, Dst, Rs0) ->
+    Start = bs_subst_ctx(Arg, CtxChain),
+    case SPos0 of
+        #{Start:=Arg} ->
+            %% Same position, no restore needed.
+            bs_restore_args(Args, SPos0, FPos0, CtxChain, Dst, Rs0);
+        #{Start:=_} ->
+            %% Different positions, need a restore instruction.
+            SPos = SPos0#{Start:=Arg},
+            FPos = FPos0#{Start:=Arg},
+            Rs = Rs0#{Dst=>{Start,Arg}},
+            bs_restore_args(Args, SPos, FPos, CtxChain, Dst, Rs);
+        #{} ->
+            %% Not a match context.
+            bs_restore_args(Args, SPos0, FPos0, CtxChain, Dst, Rs0)
+    end;
+bs_restore_args([_|Args], SPos, FPos, CtxChain, Dst, Rs) ->
+    bs_restore_args(Args, SPos, FPos, CtxChain, Dst, Rs);
+bs_restore_args([], SPos, FPos, _CtxChain, _Dst, Rs) ->
+    {Rs,SPos,FPos}.
+
+%% Insert all bs_save and bs_restore instructions.
+
+bs_insert_bsm3(Blocks, Saves, Restores, SavePoints) ->
+    bs_insert_1(Blocks, Saves, Restores, SavePoints, fun(I) -> I end).
+
+bs_insert_bsm2(Blocks, Saves, Restores, SavePoints) ->
+    %% The old instructions require bs_start_match to be annotated with the
+    %% number of position slots it needs.
+    bs_insert_1(Blocks, Saves, Restores, SavePoints,
+                fun(#b_set{op=bs_start_match,dst=Dst}=I0) ->
+                        NumSlots = case SavePoints of
+                                       #{Dst:=NumSlots0} -> NumSlots0;
+                                       #{} -> 0
+                                   end,
+                        beam_ssa:add_anno(num_slots, NumSlots, I0);
+                   (I) ->
+                        I
+                end).
+
+bs_insert_1([{L,#b_blk{is=Is0}=Blk}|Bs0], Saves, Restores, Slots, XFrm) ->
+    Is = bs_insert_is_1(Is0, Restores, Slots, XFrm),
+    Bs = bs_insert_saves(Is, Bs0, Saves),
+    [{L,Blk#b_blk{is=Is}}|bs_insert_1(Bs, Saves, Restores, Slots, XFrm)];
+bs_insert_1([], _, _, _, _) -> [].
+
+bs_insert_is_1([#b_set{op=Op,dst=Dst}=I0|Is], Restores, SavePoints, XFrm) ->
+    I = XFrm(I0),
+    if
+        Op =:= bs_test_tail;
+        Op =:= bs_get_tail;
+        Op =:= bs_match;
+        Op =:= call ->
+            Rs = case Restores of
+                     #{Dst:=R} -> [R];
+                     #{} -> []
+                 end,
+            Rs ++ [I|bs_insert_is_1(Is, Restores, SavePoints, XFrm)];
+        true ->
+            [I|bs_insert_is_1(Is, Restores, SavePoints, XFrm)]
+    end;
+bs_insert_is_1([], _, _, _) -> [].
+
+bs_insert_saves([#b_set{dst=Dst}|Is], Bs, Saves) ->
+    case Saves of
+        #{Dst:=S} ->
+            bs_insert_save(S, Bs);
+        #{} ->
+            bs_insert_saves(Is, Bs, Saves)
+    end;
+bs_insert_saves([], Bs, _) -> Bs.
+
+bs_insert_save(Save, [{L,#b_blk{is=Is0}=Blk}|Bs]) ->
+    Is = case Is0 of
+             [#b_set{op=bs_extract}=Ex|Is1] ->
+                 [Ex,Save|Is1];
+             _ ->
+                 [Save|Is0]
+         end,
+    [{L,Blk#b_blk{is=Is}}|Bs].
+
+%% Translate bs_match instructions to bs_get, bs_match_string,
+%% or bs_skip. Also rename match context variables to use the
+%% variable assigned to by the start_match instruction.
+
+bs_instrs([{L,#b_blk{is=Is0}=Blk}|Bs], CtxChain, Acc0) ->
+    case bs_instrs_is(Is0, CtxChain, []) of
+        [#b_set{op=bs_extract,dst=Dst,args=[Ctx]}|Is] ->
+            %% Drop this instruction. Rewrite the corresponding
+            %% bs_match instruction in the previous block to
+            %% a bs_get instruction.
+            Acc = bs_combine(Dst, Ctx, Acc0),
+            bs_instrs(Bs, CtxChain, [{L,Blk#b_blk{is=Is}}|Acc]);
+        Is ->
+            bs_instrs(Bs, CtxChain, [{L,Blk#b_blk{is=Is}}|Acc0])
+    end;
+bs_instrs([], _, Acc) ->
+    reverse(Acc).
+
+bs_instrs_is([#b_set{op=Op,args=Args0}=I0|Is], CtxChain, Acc) ->
+    Args = [bs_subst_ctx(A, CtxChain) || A <- Args0],
+    I1 = I0#b_set{args=Args},
+    I = case {Op,Args} of
+            {bs_match,[#b_literal{val=skip},Ctx,Type|As]} ->
+                I1#b_set{op=bs_skip,args=[Type,Ctx|As]};
+            {bs_match,[#b_literal{val=string},Ctx|As]} ->
+                I1#b_set{op=bs_match_string,args=[Ctx|As]};
+            {bs_get_tail,[Ctx|As]} ->
+                I1#b_set{op=bs_get_tail,args=[Ctx|As]};
+            {_,_} ->
+                I1
+        end,
+    bs_instrs_is(Is, CtxChain, [I|Acc]);
+bs_instrs_is([], _, Acc) ->
+    reverse(Acc).
+
+%% Combine a bs_match instruction with the destination register
+%% taken from a bs_extract instruction.
+
+bs_combine(Dst, Ctx, [{L,#b_blk{is=Is0}=Blk}|Acc]) ->
+    [#b_set{}=Succeeded,
+     #b_set{op=bs_match,args=[Type,_|As]}=BsMatch|Is1] = reverse(Is0),
+    Is = reverse(Is1, [BsMatch#b_set{op=bs_get,dst=Dst,args=[Type,Ctx|As]},
+                       Succeeded#b_set{args=[Dst]}]),
+    [{L,Blk#b_blk{is=Is}}|Acc].
+
+bs_subst_ctx(#b_var{}=Var, CtxChain) ->
+    case CtxChain of
+        #{Var:={context,Ctx}} ->
+            Ctx;
+        #{Var:=ParentCtx} ->
+            bs_subst_ctx(ParentCtx, CtxChain);
+        #{} ->
+            %% Not a match context variable.
+            Var
+    end;
+bs_subst_ctx(Other, _CtxChain) ->
+    Other.
+
+%% legacy_bs(St0) -> St.
+%%  Binary matching instructions in OTP 21 and earlier don't support
+%%  a Y register as destination. If St#st.use_bsm3 is false,
+%%  we will need to rewrite those instructions so that the result
+%%  is first put in an X register and then moved to a Y register
+%%  if the operation succeeded.
+
+legacy_bs(#st{use_bsm3=false,ssa=Blocks0,cnt=Count0,res=Res}=St) ->
+    IsYreg = maps:from_list([{V,true} || {V,{y,_}} <- Res]),
+    Linear0 = beam_ssa:linearize(Blocks0),
+    {Linear,Count} = legacy_bs(Linear0, IsYreg, Count0, #{}, []),
+    Blocks = maps:from_list(Linear),
+    St#st{ssa=Blocks,cnt=Count};
+legacy_bs(#st{use_bsm3=true}=St) -> St.
+
+legacy_bs([{L,Blk}|Bs], IsYreg, Count0, Copies0, Acc) ->
+    #b_blk{is=Is0,last=Last} = Blk,
+    Is1 = case Copies0 of
+              #{L:=Copy} -> [Copy|Is0];
+              #{} -> Is0
+          end,
+    {Is,Count,Copies} = legacy_bs_is(Is1, Last, IsYreg, Count0, Copies0, []),
+    legacy_bs(Bs, IsYreg, Count, Copies, [{L,Blk#b_blk{is=Is}}|Acc]);
+legacy_bs([], _IsYreg, Count, _Copies, Acc) ->
+    {Acc,Count}.
+
+legacy_bs_is([#b_set{op=Op,dst=Dst}=I0,
+              #b_set{op=succeeded,dst=SuccDst,args=[Dst]}=SuccI0],
+             Last, IsYreg, Count0, Copies0, Acc) ->
+    NeedsFix = is_map_key(Dst, IsYreg) andalso
+        case Op of
+            bs_get -> true;
+            bs_init -> true;
+            _ -> false
+        end,
+    case NeedsFix of
+        true ->
+            TempDst = #b_var{name={'@bs_temp_dst',Count0}},
+            Count = Count0 + 1,
+            I = I0#b_set{dst=TempDst},
+            SuccI = SuccI0#b_set{args=[TempDst]},
+            Copy = #b_set{op=copy,dst=Dst,args=[TempDst]},
+            #b_br{bool=SuccDst,succ=SuccL} = Last,
+            Copies = Copies0#{SuccL=>Copy},
+            legacy_bs_is([], Last, IsYreg, Count, Copies, [SuccI,I|Acc]);
+        false ->
+            legacy_bs_is([], Last, IsYreg, Count0, Copies0, [SuccI0,I0|Acc])
+    end;
+legacy_bs_is([I|Is], Last, IsYreg, Count, Copies, Acc) ->
+    legacy_bs_is(Is, Last, IsYreg, Count, Copies, [I|Acc]);
+legacy_bs_is([], _Last, _IsYreg, Count, Copies, Acc) ->
+    {reverse(Acc),Count,Copies}.
+
+%% sanitize(St0) -> St.
+%%  Remove constructs that can cause problems later:
+%%
+%%  * Unreachable blocks may cause problems for determination of
+%%  dominators.
+%%
+%%  * Some instructions (such as get_hd) don't accept literal
+%%  arguments. Evaluate the instructions and remove them.
+
+sanitize(#st{ssa=Blocks0,cnt=Count0}=St) ->
+    Ls = beam_ssa:rpo(Blocks0),
+    {Blocks,Count} = sanitize(Ls, Count0, Blocks0, #{}),
+    St#st{ssa=Blocks,cnt=Count}.
+
+sanitize([L|Ls], Count0, Blocks0, Values0) ->
+    #b_blk{is=Is0} = Blk0 = map_get(L, Blocks0),
+    case sanitize_is(Is0, Count0, Values0, false, []) of
+        no_change ->
+            sanitize(Ls, Count0, Blocks0, Values0);
+        {Is,Count,Values} ->
+            Blk = Blk0#b_blk{is=Is},
+            Blocks = Blocks0#{L:=Blk},
+            sanitize(Ls, Count, Blocks, Values)
+    end;
+sanitize([], Count, Blocks0, Values) ->
+    Blocks = if
+                 map_size(Values) =:= 0 ->
+                     Blocks0;
+                 true ->
+                     beam_ssa:rename_vars(Values, [0], Blocks0)
+             end,
+
+    %% Unreachable blocks can cause problems for the dominator calculations.
+    Ls = beam_ssa:rpo(Blocks),
+    Reachable = gb_sets:from_list(Ls),
+    {case map_size(Blocks) =:= gb_sets:size(Reachable) of
+         true -> Blocks;
+         false -> remove_unreachable(Ls, Blocks, Reachable, [])
+     end,Count}.
+
+sanitize_is([#b_set{op=get_map_element,args=Args0}=I0|Is],
+            Count0, Values, Changed, Acc) ->
+    case sanitize_args(Args0, Values) of
+        [#b_literal{}=Map,Key] ->
+            %% Bind the literal map to a variable.
+            {MapVar,Count} = new_var('@ssa_map', Count0),
+            I = I0#b_set{args=[MapVar,Key]},
+            Copy = #b_set{op=copy,dst=MapVar,args=[Map]},
+            sanitize_is(Is, Count, Values, true, [I,Copy|Acc]);
+        [_,_]=Args0 ->
+            sanitize_is(Is, Count0, Values, Changed, [I0|Acc]);
+        [_,_]=Args ->
+            I = I0#b_set{args=Args},
+            sanitize_is(Is, Count0, Values, Changed, [I|Acc])
+    end;
+sanitize_is([#b_set{op=Op,dst=Dst,args=Args0}=I0|Is0],
+            Count, Values, Changed0, Acc) ->
+    Args = sanitize_args(Args0, Values),
+    case sanitize_instr(Op, Args, I0) of
+        {value,Value0} ->
+            Value = #b_literal{val=Value0},
+            sanitize_is(Is0, Count, Values#{Dst=>Value}, true, Acc);
+        {ok,I} ->
+            sanitize_is(Is0, Count, Values, true, [I|Acc]);
+        ok ->
+            I = I0#b_set{args=Args},
+            Changed = Changed0 orelse Args =/= Args0,
+            sanitize_is(Is0, Count, Values, Changed, [I|Acc])
+    end;
+sanitize_is([], Count, Values, Changed, Acc) ->
+    case Changed of
+        true ->
+            {reverse(Acc),Count,Values};
+        false ->
+            no_change
+    end.
+
+sanitize_args(Args, Values) ->
+    map(fun(Var) ->
+                case Values of
+                    #{Var:=New} -> New;
+                    #{} -> Var
+                end
+        end, Args).
+
+sanitize_instr({bif,Bif}, [#b_literal{val=Lit}], _I) ->
+    case erl_bifs:is_pure(erlang, Bif, 1) of
+        false ->
+            ok;
+        true ->
+            try
+                {value,erlang:Bif(Lit)}
+            catch
+                error:_ ->
+                    ok
+            end
+    end;
+sanitize_instr({bif,Bif}, [#b_literal{val=Lit1},#b_literal{val=Lit2}], _I) ->
+    true = erl_bifs:is_pure(erlang, Bif, 2),    %Assertion.
+    try
+        {value,erlang:Bif(Lit1, Lit2)}
+    catch
+        error:_ ->
+            ok
+    end;
+sanitize_instr(get_hd, [#b_literal{val=[Hd|_]}], _I) ->
+    {value,Hd};
+sanitize_instr(get_tl, [#b_literal{val=[_|Tl]}], _I) ->
+    {value,Tl};
+sanitize_instr(get_tuple_element, [#b_literal{val=T},
+                                   #b_literal{val=I}], _I)
+  when I < tuple_size(T) ->
+    {value,element(I+1, T)};
+sanitize_instr(is_nonempty_list, [#b_literal{val=Lit}], _I) ->
+    {value,case Lit of
+               [_|_] -> true;
+               _ -> false
+           end};
+sanitize_instr(is_tagged_tuple, [#b_literal{val=Tuple},
+                                 #b_literal{val=Arity},
+                                 #b_literal{val=Tag}], _I)
+  when is_integer(Arity), is_atom(Tag) ->
+    if
+        tuple_size(Tuple) =:= Arity, element(1, Tuple) =:= Tag ->
+            {value,true};
+        true ->
+            {value,false}
+    end;
+sanitize_instr(bs_init, [#b_literal{val=new},#b_literal{val=Sz}|_], I0) ->
+    if
+        is_integer(Sz), Sz >= 0 -> ok;
+        true -> {ok,sanitize_badarg(I0)}
+    end;
+sanitize_instr(bs_init, [#b_literal{val=append},_,#b_literal{val=Sz}|_], I0) ->
+    if
+        is_integer(Sz), Sz >= 0 -> ok;
+        true -> {ok,sanitize_badarg(I0)}
+    end;
+sanitize_instr(succeeded, [#b_literal{}], _I) ->
+    {value,true};
+sanitize_instr(_, _, _) -> ok.
+
+sanitize_badarg(I) ->
+    Func = #b_remote{mod=#b_literal{val=erlang},
+                     name=#b_literal{val=error},arity=1},
+    I#b_set{op=call,args=[Func,#b_literal{val=badarg}]}.
+
+remove_unreachable([L|Ls], Blocks, Reachable, Acc) ->
+    #b_blk{is=Is0} = Blk0 = map_get(L, Blocks),
+    case split_phis(Is0) of
+        {[_|_]=Phis,Rest} ->
+            Is = [prune_phi(Phi, Reachable) || Phi <- Phis] ++ Rest,
+            Blk = Blk0#b_blk{is=Is},
+            remove_unreachable(Ls, Blocks, Reachable, [{L,Blk}|Acc]);
+        {[],_} ->
+            remove_unreachable(Ls, Blocks, Reachable, [{L,Blk0}|Acc])
+    end;
+remove_unreachable([], _Blocks, _, Acc) ->
+    maps:from_list(Acc).
+
+prune_phi(#b_set{args=Args0}=Phi, Reachable) ->
+    Args = [A || {_,Pred}=A <- Args0,
+                 gb_sets:is_element(Pred, Reachable)],
+    Phi#b_set{args=Args}.
+
+%%%
+%%% Fix tuples.
+%%%
+
+%% fix_tuples(St0) -> St.
+%%  If compatibility with a previous version of Erlang has been
+%%  requested, tuple creation must be split into two instruction to
+%%  mirror the the way tuples are created in BEAM prior to OTP 22.
+%%  Each put_tuple instruction is split into put_tuple_arity followed
+%%  by put_tuple_elements.
+
+fix_tuples(#st{ssa=Blocks0,cnt=Count0}=St) ->
+    F = fun (#b_set{op=put_tuple,args=Args}=Put, C0) ->
+                Arity = #b_literal{val=length(Args)},
+                {Ignore,C} = new_var('@ssa_ignore', C0),
+                {[Put#b_set{op=put_tuple_arity,args=[Arity]},
+                  #b_set{dst=Ignore,op=put_tuple_elements,args=Args}],C};
+           (I, C) -> {[I],C}
+        end,
+    {Blocks,Count} = beam_ssa:flatmapfold_instrs_rpo(F, [0], Count0, Blocks0),
+    St#st{ssa=Blocks,cnt=Count}.
+
+%%%
+%%% Introduce the set_tuple_element instructions to make
+%%% multiple-field record updates faster.
+%%%
+%%% The expansion of record field updates, when more than one field is
+%%% updated, but not a majority of the fields, will create a sequence of
+%%% calls to `erlang:setelement(Index, Value, Tuple)` where Tuple in the
+%%% first call is the original record tuple, and in the subsequent calls
+%%% Tuple is the result of the previous call. Furthermore, all Index
+%%% values are constant positive integers, and the first call to
+%%% `setelement` will have the greatest index. Thus all the following
+%%% calls do not actually need to test at run-time whether Tuple has type
+%%% tuple, nor that the index is within the tuple bounds.
+%%%
+%%% Since this optimization introduces destructive updates, it used to
+%%% be done as the very last Core Erlang pass before going to
+%%% lower-level code. However, it turns out that this kind of destructive
+%%% updates are awkward also in SSA code and can prevent or complicate
+%%% type analysis and aggressive optimizations.
+%%%
+%%% NOTE: Because there no write barriers in the system, this kind of
+%%% optimization can only be done when we are sure that garbage
+%%% collection will not be triggered between the creation of the tuple
+%%% and the destructive updates - otherwise we might insert pointers
+%%% from an older generation to a newer.
+%%%
+
+use_set_tuple_element(#st{ssa=Blocks0}=St) ->
+    Uses = count_uses(Blocks0),
+    RPO = reverse(beam_ssa:rpo(Blocks0)),
+    Blocks = use_ste_1(RPO, Uses, Blocks0),
+    St#st{ssa=Blocks}.
+
+use_ste_1([L|Ls], Uses, Blocks0) ->
+    {Blk0,Blocks} = use_ste_across(L, Uses, Blocks0),
+    #b_blk{is=Is0} = Blk0,
+    case use_ste_is(Is0, Uses) of
+        Is0 ->
+            use_ste_1(Ls, Uses, Blocks);
+        Is ->
+            Blk = Blk0#b_blk{is=Is},
+            use_ste_1(Ls, Uses, Blocks#{L:=Blk})
+    end;
+use_ste_1([], _, Blocks) -> Blocks.
+
+%%% Optimize within a single block.
+
+use_ste_is([#b_set{}=I|Is0], Uses) ->
+    Is = use_ste_is(Is0, Uses),
+    case extract_ste(I) of
+        none ->
+            [I|Is];
+        Extracted ->
+            use_ste_call(Extracted, I, Is, Uses)
+    end;
+use_ste_is([], _Uses) -> [].
+
+use_ste_call({Dst0,Pos0,_Var0,_Val0}, Call1, Is0, Uses) ->
+    case get_ste_call(Is0, []) of
+        {Prefix,{Dst1,Pos1,Dst0,Val1},Call2,Is}
+          when Pos1 > 0, Pos0 > Pos1 ->
+            case is_single_use(Dst0, Uses) of
+                true ->
+                    Call = Call1#b_set{dst=Dst1},
+                    Args = [Val1,Dst1,#b_literal{val=Pos1-1}],
+                    Dsetel = Call2#b_set{op=set_tuple_element,
+                                         dst=Dst0,
+                                         args=Args},
+                    [Call|Prefix] ++ [Dsetel|Is];
+                false ->
+                    [Call1|Is0]
+            end;
+        _ ->
+            [Call1|Is0]
+    end.
+
+get_ste_call([#b_set{op=get_tuple_element}=I|Is], Acc) ->
+    get_ste_call(Is, [I|Acc]);
+get_ste_call([#b_set{op=call}=I|Is], Acc) ->
+    case extract_ste(I) of
+        none ->
+            none;
+        Extracted ->
+            {reverse(Acc),Extracted,I,Is}
+    end;
+get_ste_call(_, _) -> none.
+
+extract_ste(#b_set{op=call,dst=Dst,
+                   args=[#b_remote{mod=#b_literal{val=M},
+                                  name=#b_literal{val=F}}|Args]}) ->
+    case {M,F,Args} of
+        {erlang,setelement,[#b_literal{val=Pos},Tuple,Val]} ->
+            {Dst,Pos,Tuple,Val};
+        {_,_,_} ->
+            none
+    end;
+extract_ste(#b_set{}) -> none.
+
+%%% Optimize accross blocks within a try/catch block.
+
+use_ste_across(L, Uses, Blocks) ->
+    case map_get(L, Blocks) of
+        #b_blk{last=#b_br{bool=#b_var{}}}=Blk ->
+            try
+                use_ste_across_1(L, Blk, Uses, Blocks)
+            catch
+                throw:not_possible ->
+                    {Blk,Blocks}
+            end;
+        #b_blk{}=Blk ->
+            {Blk,Blocks}
+    end.
+
+use_ste_across_1(L, Blk0, Uses, Blocks0) ->
+    #b_blk{is=IsThis,last=#b_br{bool=Bool,succ=Next}} = Blk0,
+    case reverse(IsThis) of
+        [#b_set{op=succeeded,dst=Bool,args=[Result]}=Succ0,
+         #b_set{op=call,args=[#b_remote{}|_],dst=Result}=Call1|Prefix] ->
+            case is_single_use(Bool, Uses) andalso
+                is_n_uses(2, Result, Uses) of
+                true -> ok;
+                false -> throw(not_possible)
+            end,
+            Call2 = use_ste_across_next(Next, Uses, Blocks0),
+            Is = [Call1,Call2],
+            case use_ste_is(Is, decrement_uses(Result, Uses)) of
+                [#b_set{}=Call,#b_set{op=set_tuple_element}=Ste] ->
+                    Blocks1 = use_ste_fix_next(Ste, Next, Blocks0),
+                    Succ = Succ0#b_set{args=[Call#b_set.dst]},
+                    Blk = Blk0#b_blk{is=reverse(Prefix, [Call,Succ])},
+                    Blocks = Blocks1#{L:=Blk},
+                    {Blk,Blocks};
+                _ ->
+                    throw(not_possible)
+            end;
+        _ ->
+            throw(not_possible)
+    end.
+
+use_ste_across_next(Next, Uses, Blocks) ->
+    case map_get(Next, Blocks) of
+        #b_blk{is=[#b_set{op=call,dst=Result,args=[#b_remote{}|_]}=Call,
+                   #b_set{op=succeeded,dst=Bool,args=[Result]}],
+               last=#b_br{bool=Bool}} ->
+            case is_single_use(Bool, Uses) andalso
+                is_n_uses(2, Result, Uses) of
+                true -> ok;
+                false -> throw(not_possible)
+            end,
+            Call;
+        #b_blk{} ->
+            throw(not_possible)
+    end.
+
+use_ste_fix_next(Ste, Next, Blocks) ->
+    Blk0 = map_get(Next, Blocks),
+    #b_blk{is=[#b_set{op=call},#b_set{op=succeeded}],last=Br0} = Blk0,
+    Br = beam_ssa:normalize(Br0#b_br{bool=#b_literal{val=true}}),
+    Blk = Blk0#b_blk{is=[Ste],last=Br},
+    Blocks#{Next:=Blk}.
+
+%% Count how many times each variable is used.
+
+count_uses(Blocks) ->
+    count_uses_blk(maps:values(Blocks), #{}).
+
+count_uses_blk([#b_blk{is=Is,last=Last}|Bs], CountMap0) ->
+    F = fun(I, CountMap) ->
+                foldl(fun(Var, Acc) ->
+                              case Acc of
+                                  #{Var:=3} -> Acc;
+                                  #{Var:=C} -> Acc#{Var:=C+1};
+                                  #{} ->       Acc#{Var=>1}
+                              end
+                      end, CountMap, beam_ssa:used(I))
+        end,
+    CountMap = F(Last, foldl(F, CountMap0, Is)),
+    count_uses_blk(Bs, CountMap);
+count_uses_blk([], CountMap) -> CountMap.
+
+decrement_uses(V, Uses) ->
+    #{V:=C} = Uses,
+    Uses#{V:=C-1}.
+
+is_n_uses(N, V, Uses) ->
+    case Uses of
+        #{V:=N} -> true;
+        #{} -> false
+    end.
+
+is_single_use(V, Uses) ->
+    case Uses of
+        #{V:=1} -> true;
+        #{} -> false
+    end.
+
+%%%
+%%% Find out where frames should be placed.
+%%%
+
+%% place_frames(St0) -> St.
+%%   Return a list of the labels for the blocks that need stack frame
+%%   allocation instructions.
+%%
+%%   This function attempts to place stack frames as tight as possible
+%%   around the code, to avoid building stack frames for code paths
+%%   that don't need one.
+%%
+%%   Stack frames are placed in blocks that dominate all of their
+%%   descendants. That guarantees that the deallocation instructions
+%%   cannot be reached from other execution paths that didn't set up
+%%   a stack frame or set up a stack frame with a different size.
+
+place_frames(#st{ssa=Blocks}=St) ->
+    {Doms,_} = beam_ssa:dominators(Blocks),
+    Ls = beam_ssa:rpo(Blocks),
+    Tried = gb_sets:empty(),
+    Frames0 = [],
+    {Frames,_} = place_frames_1(Ls, Blocks, Doms, Tried, Frames0),
+    St#st{frames=Frames}.
+
+place_frames_1([L|Ls], Blocks, Doms, Tried0, Frames0) ->
+    Blk = map_get(L, Blocks),
+    case need_frame(Blk) of
+        true ->
+            %% This block needs a frame. Try to place it here.
+            {Frames,Tried} = do_place_frame(L, Blocks, Doms, Tried0, Frames0),
+
+            %% Successfully placed. Try to place more frames in descendants
+            %% that are not dominated by this block.
+            place_frames_1(Ls, Blocks, Doms, Tried, Frames);
+        false ->
+            try
+                place_frames_1(Ls, Blocks, Doms, Tried0, Frames0)
+            catch
+                throw:{need_frame,For,Tried1}=Reason ->
+                    %% An descendant block needs a stack frame. Try to
+                    %% place it here.
+                    case is_dominated_by(For, L, Doms) of
+                        true ->
+                            %% Try to place a frame here.
+                            {Frames,Tried} = do_place_frame(L, Blocks, Doms,
+                                                            Tried1, Frames0),
+                            place_frames_1(Ls, Blocks, Doms, Tried, Frames);
+                        false ->
+                            %% Wrong place. This block does not dominate
+                            %% the block that needs the frame. Pass it on
+                            %% to our ancestors.
+                            throw(Reason)
+                    end
+            end
+    end;
+place_frames_1([], _, _, Tried, Frames) ->
+    {Frames,Tried}.
+
+%% do_place_frame(Label, Blocks, Dominators, Tried0, Frames0) -> {Frames,Tried}.
+%%  Try to place a frame in this block. This function returns
+%%  successfully if it either succeds at placing a frame in this
+%%  block, if an ancestor that dominates this block has already placed
+%%  a frame, or if we have already tried to put a frame in this block.
+%%
+%%  An {need_frame,Label,Tried} exception will be thrown if this block
+%%  block is not suitable for having a stack frame (i.e. it does not dominate
+%%  all of its descendants). The exception means that an ancestor will have to
+%%  place the frame needed by this block.
+
+do_place_frame(L, Blocks, Doms, Tried0, Frames) ->
+    case gb_sets:is_element(L, Tried0) of
+        true ->
+            %% We have already tried to put a frame in this block.
+            {Frames,Tried0};
+        false ->
+            %% Try to place a frame in this block.
+            Tried = gb_sets:insert(L, Tried0),
+            case place_frame_here(L, Blocks, Doms, Frames) of
+                yes ->
+                    %% We need a frame and it is safe to place it here.
+                    {[L|Frames],Tried};
+                no ->
+                    %% An ancestor has a frame. Not needed.
+                    {Frames,Tried};
+                ancestor ->
+                    %% This block does not dominate all of its
+                    %% descendants. We must place the frame in
+                    %% an ancestor.
+                    throw({need_frame,L,Tried})
+            end
+    end.
+
+%% place_frame_here(Label, Blocks, Doms, Frames) -> no|yes|ancestor.
+%%  Determine whether a frame should be placed in block Label.
+
+place_frame_here(L, Blocks, Doms, Frames) ->
+    B0 = any(fun(DomBy) ->
+                     is_dominated_by(L, DomBy, Doms)
+             end, Frames),
+    case B0 of
+        true ->
+            %% This block is dominated by an ancestor block that
+            %% defines a frame. Not needed/allowed to put a frame
+            %% here.
+            no;
+        false ->
+            %% No frame in any ancestor. We need a frame.
+            %% Now check whether the frame can be placed here.
+            %% If this block dominates all of its descendants
+            %% and the predecessors of any phi nodes it can be
+            %% placed here.
+            Descendants = beam_ssa:rpo([L], Blocks),
+            PhiPredecessors = phi_predecessors(L, Blocks),
+            MustDominate = ordsets:from_list(PhiPredecessors ++ Descendants),
+            Dominates = all(fun(?BADARG_BLOCK) ->
+                                    %% This block defines no variables and calls
+                                    %% erlang:error(badarg). It does not matter
+                                    %% whether L dominates ?BADARG_BLOCK or not;
+                                    %% it is still safe to put the frame in L.
+                                    true;
+                               (Bl) ->
+                                    is_dominated_by(Bl, L, Doms)
+                            end, MustDominate),
+
+            %% Also, this block must not be a loop header.
+            IsLoopHeader = is_loop_header(L, Blocks),
+            case Dominates andalso not IsLoopHeader of
+                true -> yes;
+                false -> ancestor
+            end
+    end.
+
+%% phi_predecessors(Label, Blocks) ->
+%%  Return all predecessors referenced in phi nodes.
+
+phi_predecessors(L, Blocks) ->
+    #b_blk{is=Is} = map_get(L, Blocks),
+    [P || #b_set{op=phi,args=Args} <- Is, {_,P} <- Args].
+
+%% is_dominated_by(Label, DominatedBy, Dominators) -> true|false.
+%%  Test whether block Label is dominated by block DominatedBy.
+
+is_dominated_by(L, DomBy, Doms) ->
+    DominatedBy = map_get(L, Doms),
+    member(DomBy, DominatedBy).
+
+%% need_frame(#b_blk{}) -> true|false.
+%%  Test whether any of the instructions in the block requires a stack frame.
+
+need_frame(#b_blk{is=Is,last=#b_ret{arg=Ret}}) ->
+    need_frame_1(Is, {return,Ret});
+need_frame(#b_blk{is=Is}) ->
+    need_frame_1(Is, body).
+
+need_frame_1([#b_set{op=make_fun,dst=Fun}|Is], {return,_}=Context) ->
+    %% Since make_fun clobbers X registers, a stack frame is needed if
+    %% any of the following instructions use any other variable than
+    %% the one holding the reference to the created fun.
+    need_frame_1(Is, Context) orelse
+        case beam_ssa:used(#b_blk{is=Is,last=#b_ret{arg=Fun}}) of
+            [Fun] -> false;
+            [_|_] -> true
+        end;
+need_frame_1([#b_set{op=new_try_tag}|_], _) ->
+    true;
+need_frame_1([#b_set{op=call,dst=Val}]=Is, {return,Ret}) ->
+    if
+        Val =:= Ret -> need_frame_1(Is, tail);
+        true -> need_frame_1(Is, body)
+    end;
+need_frame_1([#b_set{op=call,args=[Func|_]}|Is], Context) ->
+    case Func of
+        #b_remote{mod=#b_literal{val=Mod},
+                  name=#b_literal{val=Name},
+                  arity=Arity} when is_atom(Mod), is_atom(Name) ->
+            case erl_bifs:is_exit_bif(Mod, Name, Arity) of
+                true ->
+                    false;
+                false ->
+                    Context =:= body orelse
+                        Is =/= [] orelse
+                        is_trap_bif(Mod, Name, Arity)
+                end;
+        #b_remote{} ->
+            %% This is an apply(), which always needs a frame.
+            true;
+        #b_local{} ->
+            Context =:= body orelse Is =/= [];
+        _ ->
+             %% A fun call always needs a frame.
+            true
+    end;
+need_frame_1([I|Is], Context) ->
+    beam_ssa:clobbers_xregs(I) orelse need_frame_1(Is, Context);
+need_frame_1([], _) -> false.
+
+%% is_trap_bif(Mod, Name, Arity) -> true|false.
+%%   Test whether we need a stack frame for this BIF.
+
+is_trap_bif(erlang, '!', 2) -> true;
+is_trap_bif(erlang, link, 1) -> true;
+is_trap_bif(erlang, unlink, 1) -> true;
+is_trap_bif(erlang, monitor_node, 2) -> true;
+is_trap_bif(erlang, group_leader, 2) -> true;
+is_trap_bif(erlang, exit, 2) -> true;
+is_trap_bif(_, _, _) -> false.
+
+%%%
+%%% Fix variables used in matching in receive.
+%%%
+%%% The loop_rec/2 instruction may return a reference to a
+%%% message outside of any heap or heap fragment. If the message
+%%% does not match, it is not allowed to store any reference to
+%%% the message (or part of the message) on the stack. If we do,
+%%% the message will be corrupted if there happens to be a GC.
+%%%
+%%% Here we make sure to introduce copies of variables that are
+%%% matched out and subsequently used after the remove_message/0
+%%% instructions. That will make sure that only X registers are
+%%% used during matching.
+%%%
+%%% Depending on where variables are defined and used, they must
+%%% be handled in two different ways.
+%%%
+%%% Variables that are always defined in the receive (before branching
+%%% out into the different clauses of the receive) and used after the
+%%% receive must be handled in the following way: Before each
+%%% remove_message instruction, each such variable must be copied, and
+%%% all variables must be consolidated using a phi node in the
+%%% common exit block for the receive.
+%%%
+%%% Variables that are matched out and used in the same clause
+%%% need copy instructions before the remove_message instruction
+%%% in that clause.
+%%%
+
+fix_receives(#st{ssa=Blocks0,cnt=Count0}=St) ->
+    {Blocks,Count} = fix_receives_1(maps:to_list(Blocks0),
+                                    Blocks0, Count0),
+    St#st{ssa=Blocks,cnt=Count}.
+
+fix_receives_1([{L,Blk}|Ls], Blocks0, Count0) ->
+    case Blk of
+        #b_blk{is=[#b_set{op=peek_message}|_]} ->
+            Rm = find_rm_blocks(L, Blocks0),
+            LoopExit = find_loop_exit(Rm, Blocks0),
+            Defs0 = beam_ssa:def([L], Blocks0),
+            CommonUsed = recv_common(Defs0, LoopExit, Blocks0),
+            {Blocks1,Count1} = recv_crit_edges(Rm, LoopExit, Blocks0, Count0),
+            {Blocks2,Count2} = recv_fix_common(CommonUsed, LoopExit, Rm,
+                                               Blocks1, Count1),
+            Defs = ordsets:subtract(Defs0, CommonUsed),
+            {Blocks,Count} = fix_receive(Rm, Defs, Blocks2, Count2),
+            fix_receives_1(Ls, Blocks, Count);
+        #b_blk{} ->
+            fix_receives_1(Ls, Blocks0, Count0)
+    end;
+fix_receives_1([], Blocks, Count) ->
+    {Blocks,Count}.
+
+recv_common(_Defs, none, _Blocks) ->
+    %% There is no common exit block because receive is used
+    %% in the tail position of a function.
+    [];
+recv_common(Defs, Exit, Blocks) ->
+    {ExitDefs,ExitUsed} = beam_ssa:def_used([Exit], Blocks),
+    Def = ordsets:subtract(Defs, ExitDefs),
+    ordsets:intersection(Def, ExitUsed).
+
+%% recv_crit_edges([RemoveMessageLabel], LoopExit,
+%%                 Blocks0, Count0) -> {Blocks,Count}.
+%%
+%%  Adds dummy blocks on all conditional jumps to the exit block so that
+%%  recv_fix_common/5 can insert phi nodes without having to worry about
+%%  critical edges.
+
+recv_crit_edges(_Rms, none, Blocks0, Count0) ->
+    {Blocks0, Count0};
+recv_crit_edges(Rms, Exit, Blocks0, Count0) ->
+    Ls = beam_ssa:rpo(Rms, Blocks0),
+    rce_insert_edges(Ls, Exit, Count0, Blocks0).
+
+rce_insert_edges([L | Ls], Exit, Count0, Blocks0) ->
+    Successors = beam_ssa:successors(map_get(L, Blocks0)),
+    case member(Exit, Successors) of
+        true when Successors =/= [Exit] ->
+            {Blocks, Count} = rce_insert_edge(L, Exit, Count0, Blocks0),
+            rce_insert_edges(Ls, Exit, Count, Blocks);
+        _ ->
+            rce_insert_edges(Ls, Exit, Count0, Blocks0)
+    end;
+rce_insert_edges([], _Exit, Count, Blocks) ->
+    {Blocks, Count}.
+
+rce_insert_edge(L, Exit, Count, Blocks0) ->
+    #b_blk{last=Last0} = FromBlk0 = map_get(L, Blocks0),
+
+    ToExit = #b_br{bool=#b_literal{val=true},succ=Exit,fail=Exit},
+
+    FromBlk = FromBlk0#b_blk{last=rce_reroute_terminator(Last0, Exit, Count)},
+    EdgeBlk = #b_blk{anno=#{},is=[],last=ToExit},
+
+    Blocks = Blocks0#{ Count => EdgeBlk, L => FromBlk },
+    {Blocks, Count + 1}.
+
+rce_reroute_terminator(#b_br{succ=Exit}=Last, Exit, New) ->
+    rce_reroute_terminator(Last#b_br{succ=New}, Exit, New);
+rce_reroute_terminator(#b_br{fail=Exit}=Last, Exit, New) ->
+    rce_reroute_terminator(Last#b_br{fail=New}, Exit, New);
+rce_reroute_terminator(#b_br{}=Last, _Exit, _New) ->
+    Last;
+rce_reroute_terminator(#b_switch{fail=Exit}=Last, Exit, New) ->
+    rce_reroute_terminator(Last#b_switch{fail=New}, Exit, New);
+rce_reroute_terminator(#b_switch{list=List0}=Last, Exit, New) ->
+    List = [if
+                Lbl =:= Exit -> {Arg, New};
+                Lbl =/= Exit -> {Arg, Lbl}
+            end || {Arg, Lbl} <- List0],
+    Last#b_switch{list=List}.
+
+%% recv_fix_common([CommonVar], LoopExit, [RemoveMessageLabel],
+%%                 Blocks0, Count0) -> {Blocks,Count}.
+%%  Handle variables alwys defined in a receive and used
+%%  in the exit block following the receive.
+
+recv_fix_common([Msg0|T], Exit, Rm, Blocks0, Count0) ->
+    {Msg,Count1} = new_var('@recv', Count0),
+    Blocks1 = beam_ssa:rename_vars(#{Msg0=>Msg}, [Exit], Blocks0),
+    N = length(Rm),
+    {MsgVars,Count} = new_vars(duplicate(N, '@recv'), Count1),
+    PhiArgs = fix_exit_phi_args(MsgVars, Rm, Exit, Blocks1),
+    Phi = #b_set{op=phi,dst=Msg,args=PhiArgs},
+    ExitBlk0 = map_get(Exit, Blocks1),
+    ExitBlk = ExitBlk0#b_blk{is=[Phi|ExitBlk0#b_blk.is]},
+    Blocks2 = Blocks1#{Exit:=ExitBlk},
+    Blocks = recv_fix_common_1(MsgVars, Rm, Msg0, Blocks2),
+    recv_fix_common(T, Exit, Rm, Blocks, Count);
+recv_fix_common([], _, _, Blocks, Count) ->
+    {Blocks,Count}.
+
+recv_fix_common_1([V|Vs], [Rm|Rms], Msg, Blocks0) ->
+    Ren = #{Msg=>V},
+    Blocks1 = beam_ssa:rename_vars(Ren, [Rm], Blocks0),
+    #b_blk{is=Is0} = Blk0 = map_get(Rm, Blocks1),
+    Copy = #b_set{op=copy,dst=V,args=[Msg]},
+    Is = insert_after_phis(Is0, [Copy]),
+    Blk = Blk0#b_blk{is=Is},
+    Blocks = Blocks1#{Rm:=Blk},
+    recv_fix_common_1(Vs, Rms, Msg, Blocks);
+recv_fix_common_1([], [], _Msg, Blocks) -> Blocks.
+
+fix_exit_phi_args([V|Vs], [Rm|Rms], Exit, Blocks) ->
+    Path = beam_ssa:rpo([Rm], Blocks),
+    Preds = exit_predecessors(Path, Exit, Blocks),
+    [{V,Pred} || Pred <- Preds] ++ fix_exit_phi_args(Vs, Rms, Exit, Blocks);
+fix_exit_phi_args([], [], _, _) -> [].
+
+exit_predecessors([L|Ls], Exit, Blocks) ->
+    Blk = map_get(L, Blocks),
+    case member(Exit, beam_ssa:successors(Blk)) of
+        true ->
+            [L|exit_predecessors(Ls, Exit, Blocks)];
+        false ->
+            exit_predecessors(Ls, Exit, Blocks)
+    end;
+exit_predecessors([], _Exit, _Blocks) -> [].
+
+%% fix_receive([Label], Defs, Blocks0, Count0) -> {Blocks,Count}.
+%%  Add a copy instruction for all variables that are matched out and
+%%  later used within a clause of the receive.
+
+fix_receive([L|Ls], Defs, Blocks0, Count0) ->
+    {RmDefs,Used0} = beam_ssa:def_used([L], Blocks0),
+    Def = ordsets:subtract(Defs, RmDefs),
+    Used = ordsets:intersection(Def, Used0),
+    {NewVars,Count} = new_vars([Base || #b_var{name=Base} <- Used], Count0),
+    Ren = zip(Used, NewVars),
+    Blocks1 = beam_ssa:rename_vars(Ren, [L], Blocks0),
+    #b_blk{is=Is0} = Blk1 = map_get(L, Blocks1),
+    CopyIs = [#b_set{op=copy,dst=New,args=[Old]} || {Old,New} <- Ren],
+    Is = insert_after_phis(Is0, CopyIs),
+    Blk = Blk1#b_blk{is=Is},
+    Blocks = Blocks1#{L:=Blk},
+    fix_receive(Ls, Defs, Blocks, Count);
+fix_receive([], _Defs, Blocks, Count) ->
+    {Blocks,Count}.
+
+%% find_loop_exit([Label], Blocks) -> Label | none.
+%%  Given the list of all blocks with the remove_message instructions
+%%  for this receive, find the block to which control is transferred
+%%  when the receive loop is exited (if any).
+
+find_loop_exit([_,_|_]=RmBlocks, Blocks) ->
+    %% We used to only analyze the path from two of the remove_message
+    %% blocks. That would fail to find a common block if one or both
+    %% of the blocks happened to raise an exception. To be sure that
+    %% we always find a common block if there is one (shared by at
+    %% least two clauses), we must analyze the path from all
+    %% remove_message blocks.
+    {Dominators,_} = beam_ssa:dominators(Blocks),
+    RmSet = cerl_sets:from_list(RmBlocks),
+    Rpo = beam_ssa:rpo(RmBlocks, Blocks),
+    find_loop_exit_1(Rpo, RmSet, Dominators);
+find_loop_exit(_, _) ->
+    %% There is (at most) a single clause. There is no common
+    %% loop exit block.
+    none.
+
+find_loop_exit_1([?BADARG_BLOCK|Ls], RmSet, Dominators) ->
+    %% ?BADARG_BLOCK is a marker and not an actual block, so it is not
+    %% the block we are looking for.
+    find_loop_exit_1(Ls, RmSet, Dominators);
+find_loop_exit_1([L|Ls], RmSet, Dominators) ->
+    DomBy = map_get(L, Dominators),
+    case any(fun(E) -> cerl_sets:is_element(E, RmSet) end, DomBy) of
+        true ->
+            %% This block is dominated by one of the remove_message blocks,
+            %% which means that the block is part of only one clause.
+            %% It is not the block we are looking for.
+            find_loop_exit_1(Ls, RmSet, Dominators);
+        false ->
+            %% This block is the first block that is not dominated by
+            %% any of the blocks with remove_message instructions,
+            %% which means that at least two of the receive clauses
+            %% will ultimately transfer control to it. It is the block
+            %% we are looking for.
+            L
+    end;
+find_loop_exit_1([], _, _) ->
+    %% None of clauses transfers control to a common block after the receive
+    %% statement. That means that the receive statement is a the end of a
+    %% function (or that all clauses raise exceptions).
+    none.
+
+%% find_rm_blocks(StartLabel, Blocks) -> [Label].
+%%  Find all blocks that start with remove_message within the receive
+%%  loop whose peek_message label is StartLabel.
+
+find_rm_blocks(L, Blocks) ->
+    Seen = gb_sets:singleton(L),
+    Blk = map_get(L, Blocks),
+    Succ = beam_ssa:successors(Blk),
+    find_rm_blocks_1(Succ, Seen, Blocks).
+
+find_rm_blocks_1([L|Ls], Seen0, Blocks) ->
+    case gb_sets:is_member(L, Seen0) of
+        true ->
+            find_rm_blocks_1(Ls, Seen0, Blocks);
+        false ->
+            Seen = gb_sets:insert(L, Seen0),
+            Blk = map_get(L, Blocks),
+            case find_rm_act(Blk#b_blk.is) of
+                prune ->
+                    %% Looping back. Don't look at any successors.
+                    find_rm_blocks_1(Ls, Seen, Blocks);
+                continue ->
+                    %% Neutral block. Do nothing here, but look at
+                    %% all successors.
+                    Succ = beam_ssa:successors(Blk),
+                    find_rm_blocks_1(Succ++Ls, Seen, Blocks);
+                found ->
+                    %% Found remove_message instruction.
+                    [L|find_rm_blocks_1(Ls, Seen, Blocks)]
+            end
+    end;
+find_rm_blocks_1([], _, _) -> [].
+
+find_rm_act([#b_set{op=Op}|Is]) ->
+    case Op of
+        remove_message -> found;
+        peek_message -> prune;
+        recv_next -> prune;
+        wait_timeout -> prune;
+        wait -> prune;
+        _ -> find_rm_act(Is)
+    end;
+find_rm_act([]) ->
+    continue.
+
+%%%
+%%% Find out which variables need to be stored in Y registers.
+%%%
+
+-record(dk, {d :: ordsets:ordset(var_name()),
+             k :: ordsets:ordset(var_name())
+            }).
+
+%% find_yregs(St0) -> St.
+%%  Find all variables that must be stored in Y registers. Annotate
+%%  the blocks that allocate frames with the set of Y registers
+%%  used within that stack frame.
+%%
+%%  Basically, we following all execution paths starting from a block
+%%  that allocates a frame, keeping track of of all defined registers
+%%  and all registers killed by an instruction that clobbers X
+%%  registers. For every use of a variable, we check if if it is in
+%%  the set of killed variables; if it is, it must be stored in an Y
+%%  register.
+
+find_yregs(#st{frames=[]}=St) ->
+    St;
+find_yregs(#st{frames=[_|_]=Frames,args=Args,ssa=Blocks0}=St) ->
+    FrameDefs = find_defs(Frames, Blocks0, [V || #b_var{}=V <- Args]),
+    Blocks = find_yregs_1(FrameDefs, Blocks0),
+    St#st{ssa=Blocks}.
+
+find_yregs_1([{F,Defs}|Fs], Blocks0) ->
+    DK = #dk{d=Defs,k=[]},
+    D0 = #{F=>DK},
+    Ls = beam_ssa:rpo([F], Blocks0),
+    Yregs0 = [],
+    Yregs = find_yregs_2(Ls, Blocks0, D0, Yregs0),
+    Blk0 = map_get(F, Blocks0),
+    Blk = beam_ssa:add_anno(yregs, Yregs, Blk0),
+    Blocks = Blocks0#{F:=Blk},
+    find_yregs_1(Fs, Blocks);
+find_yregs_1([], Blocks) -> Blocks.
+
+find_yregs_2([L|Ls], Blocks0, D0, Yregs0) ->
+    Blk0 = map_get(L, Blocks0),
+    #b_blk{is=Is,last=Last} = Blk0,
+    Ys0 = map_get(L, D0),
+    {Yregs1,Ys} = find_yregs_is(Is, Ys0, Yregs0),
+    Yregs = find_yregs_terminator(Last, Ys, Yregs1),
+    Successors = beam_ssa:successors(Blk0),
+    D = find_update_succ(Successors, Ys, D0),
+    find_yregs_2(Ls, Blocks0, D, Yregs);
+find_yregs_2([], _Blocks, _D, Yregs) -> Yregs.
+
+find_defs(Frames, Blocks, Defs) ->
+    Seen = gb_sets:empty(),
+    FramesSet = gb_sets:from_list(Frames),
+    {FrameDefs,_} = find_defs_1([0], Blocks, FramesSet, Seen, Defs, []),
+    FrameDefs.
+
+find_defs_1([L|Ls], Blocks, Frames, Seen0, Defs0, Acc0) ->
+    case gb_sets:is_member(L, Frames) of
+        true ->
+            OrderedDefs = ordsets:from_list(Defs0),
+            find_defs_1(Ls, Blocks, Frames, Seen0, Defs0,
+                        [{L,OrderedDefs}|Acc0]);
+        false ->
+            case gb_sets:is_member(L, Seen0) of
+                true ->
+                    find_defs_1(Ls, Blocks, Frames, Seen0, Defs0, Acc0);
+                false ->
+                    Seen1 = gb_sets:insert(L, Seen0),
+                    {Acc,Seen} = find_defs_1(Ls, Blocks, Frames, Seen1, Defs0, Acc0),
+                    #b_blk{is=Is} = Blk = map_get(L, Blocks),
+                    Defs = find_defs_is(Is, Defs0),
+                    Successors = beam_ssa:successors(Blk),
+                    find_defs_1(Successors, Blocks, Frames, Seen, Defs, Acc)
+            end
+    end;
+find_defs_1([], _, _, Seen, _, Acc) ->
+    {Acc,Seen}.
+
+find_defs_is([#b_set{dst=Dst}|Is], Acc) ->
+    find_defs_is(Is, [Dst|Acc]);
+find_defs_is([], Acc) -> Acc.
+
+find_update_succ([S|Ss], #dk{d=Defs0,k=Killed0}=DK0, D0) ->
+    case D0 of
+        #{S:=#dk{d=Defs1,k=Killed1}} ->
+            Defs = ordsets:intersection(Defs0, Defs1),
+            Killed = ordsets:union(Killed0, Killed1),
+            DK = #dk{d=Defs,k=Killed},
+            D = D0#{S:=DK},
+            find_update_succ(Ss, DK0, D);
+        #{} ->
+            D = D0#{S=>DK0},
+            find_update_succ(Ss, DK0, D)
+    end;
+find_update_succ([], _, D) -> D.
+
+find_yregs_is([#b_set{dst=Dst}=I|Is], #dk{d=Defs0,k=Killed0}=Ys, Yregs0) ->
+    Used = beam_ssa:used(I),
+    Yregs1 = ordsets:intersection(Used, Killed0),
+    Yregs = ordsets:union(Yregs0, Yregs1),
+    case beam_ssa:clobbers_xregs(I) of
+        false ->
+            Defs = ordsets:add_element(Dst, Defs0),
+            find_yregs_is(Is, Ys#dk{d=Defs}, Yregs);
+        true ->
+            Killed = ordsets:union(Defs0, Killed0),
+            Defs = [Dst],
+            find_yregs_is(Is, Ys#dk{d=Defs,k=Killed}, Yregs)
+    end;
+find_yregs_is([], Ys, Yregs) -> {Yregs,Ys}.
+
+find_yregs_terminator(Terminator, #dk{k=Killed}, Yregs0) ->
+    Used = beam_ssa:used(Terminator),
+    Yregs = ordsets:intersection(Used, Killed),
+    ordsets:union(Yregs0, Yregs).
+
+%%%
+%%% Try to reduce the size of the stack frame, by adding an explicit
+%%% 'copy' instructions for return values from 'call' and 'make_fun' that
+%%% need to be saved in Y registers. Here is an example to show
+%%% how that's useful. First, here is the Erlang code:
+%%%
+%%% f(Pid) ->
+%%%    Res = foo(42),
+%%%    _ = node(Pid),
+%%%    bar(),
+%%%    Res.
+%%%
+%%% Compiled to SSA format, the main part of the code looks like this:
+%%%
+%%% 0:
+%%%   Res = call local literal foo/1, literal 42
+%%%   _1 = bif:node Pid
+%%%   @ssa_bool = succeeded _1
+%%%   br @ssa_bool, label 3, label 1
+%%% 3:
+%%%   @ssa_ignored = call local literal bar/0
+%%%   ret Res
+%%%
+%%% It can be seen that the variables Pid and Res must be saved in Y
+%%% registers in order to survive the function calls. A previous sub
+%%% pass has inserted a 'copy' instruction to save the value of the
+%%% variable Pid:
+%%%
+%%% 0:
+%%%   Pid:4 = copy Pid
+%%%   Res = call local literal foo/1, literal 42
+%%%   _1 = bif:node Pid:4
+%%%   @ssa_bool = succeeded _1
+%%%   br @ssa_bool, label 3, label 1
+%%%
+%%% 3:
+%%%   @ssa_ignored = call local literal bar/0
+%%%   ret Res
+%%%
+%%% The Res and Pid:4 variables must be assigned to different Y registers
+%%% because they are live at the same time. copy_retval() inserts a
+%%% 'copy' instruction to copy Res to a new variable:
+%%%
+%%% 0:
+%%%   Pid:4 = copy Pid
+%%%   Res:6 = call local literal foo/1, literal 42
+%%%   _1 = bif:node Pid:4
+%%%   @ssa_bool = succeeded _1
+%%%   br @ssa_bool, label 3, label 1
+%%%
+%%% 3:
+%%%   Res = copy Res:6
+%%%   @ssa_ignored = call local literal bar/0
+%%%   ret Res
+%%%
+%%% The new variable Res:6 is used to capture the return value from the call.
+%%% The variables Pid:4 and Res are no longer live at the same time, so they
+%%% can be assigned to the same Y register.
+%%%
+
+copy_retval(#st{frames=Frames,ssa=Blocks0,cnt=Count0}=St) ->
+    {Blocks,Count} = copy_retval_1(Frames, Blocks0, Count0),
+    St#st{ssa=Blocks,cnt=Count}.
+
+copy_retval_1([F|Fs], Blocks0, Count0) ->
+    #b_blk{anno=#{yregs:=Yregs0},is=Is} = map_get(F, Blocks0),
+    Yregs1 = gb_sets:from_list(Yregs0),
+    Yregs = collect_yregs(Is, Yregs1),
+    Ls = beam_ssa:rpo([F], Blocks0),
+    {Blocks,Count} = copy_retval_2(Ls, Yregs, none, Blocks0, Count0),
+    copy_retval_1(Fs, Blocks, Count);
+copy_retval_1([], Blocks, Count) ->
+    {Blocks,Count}.
+
+collect_yregs([#b_set{op=copy,dst=Y,args=[#b_var{}=X]}|Is],
+              Yregs0) ->
+    true = gb_sets:is_member(X, Yregs0),        %Assertion.
+    Yregs = gb_sets:insert(Y, gb_sets:delete(X, Yregs0)),
+    collect_yregs(Is, Yregs);
+collect_yregs([#b_set{}|Is], Yregs) ->
+    collect_yregs(Is, Yregs);
+collect_yregs([], Yregs) -> Yregs.
+
+copy_retval_2([L|Ls], Yregs, Copy0, Blocks0, Count0) ->
+    #b_blk{is=Is0,last=Last} = Blk = map_get(L, Blocks0),
+    RC = case {Last,Ls} of
+             {#b_br{succ=Succ,fail=?BADARG_BLOCK},[Succ|_]} ->
+                 true;
+             {_,_} ->
+                 false
+         end,
+    case copy_retval_is(Is0, RC, Yregs, Copy0, Count0, []) of
+        {Is,Count} ->
+            case Copy0 =:= none andalso Count0 =:= Count of
+                true ->
+                    copy_retval_2(Ls, Yregs, none, Blocks0, Count0);
+                false ->
+                    Blocks = Blocks0#{L=>Blk#b_blk{is=Is}},
+                    copy_retval_2(Ls, Yregs, none, Blocks, Count)
+            end;
+        {Is,Count,Copy} ->
+            Blocks = Blocks0#{L=>Blk#b_blk{is=Is}},
+            copy_retval_2(Ls, Yregs, Copy, Blocks, Count)
+    end;
+copy_retval_2([], _Yregs, none, Blocks, Count) ->
+    {Blocks,Count}.
+
+copy_retval_is([#b_set{op=put_tuple_elements,args=Args0}=I0], false, _Yregs,
+           Copy, Count, Acc) ->
+    I = I0#b_set{args=copy_sub_args(Args0, Copy)},
+    {reverse(Acc, [I|acc_copy([], Copy)]),Count};
+copy_retval_is([#b_set{op=Op}=I0], false, Yregs, Copy, Count0, Acc0)
+  when Op =:= call; Op =:= make_fun ->
+    {I,Count,Acc} = place_retval_copy(I0, Yregs, Copy, Count0, Acc0),
+    {reverse(Acc, [I]),Count};
+copy_retval_is([#b_set{}]=Is, false, _Yregs, Copy, Count, Acc) ->
+    {reverse(Acc, acc_copy(Is, Copy)),Count};
+copy_retval_is([#b_set{},#b_set{op=succeeded}]=Is, false, _Yregs, Copy, Count, Acc) ->
+    {reverse(Acc, acc_copy(Is, Copy)),Count};
+copy_retval_is([#b_set{op=Op,dst=#b_var{name=RetName}=Dst}=I0|Is], RC, Yregs,
+           Copy0, Count0, Acc0) when Op =:= call; Op =:= make_fun ->
+    {I1,Count1,Acc} = place_retval_copy(I0, Yregs, Copy0, Count0, Acc0),
+    case gb_sets:is_member(Dst, Yregs) of
+        true ->
+            {NewVar,Count} = new_var(RetName, Count1),
+            Copy = #b_set{op=copy,dst=Dst,args=[NewVar]},
+            I = I1#b_set{dst=NewVar},
+            copy_retval_is(Is, RC, Yregs, Copy, Count, [I|Acc]);
+        false ->
+            copy_retval_is(Is, RC, Yregs, none, Count1, [I1|Acc])
+    end;
+copy_retval_is([#b_set{args=Args0}=I0|Is], RC, Yregs, Copy, Count, Acc) ->
+    I = I0#b_set{args=copy_sub_args(Args0, Copy)},
+    case beam_ssa:clobbers_xregs(I) of
+        true ->
+            copy_retval_is(Is, RC, Yregs, none, Count, [I|acc_copy(Acc, Copy)]);
+        false ->
+            copy_retval_is(Is, RC, Yregs, Copy, Count, [I|Acc])
+        end;
+copy_retval_is([], RC, _, Copy, Count, Acc) ->
+    case {Copy,RC} of
+        {none,_} ->
+            {reverse(Acc),Count};
+        {#b_set{},true} ->
+            {reverse(Acc),Count,Copy};
+        {#b_set{},false} ->
+            {reverse(Acc, [Copy]),Count}
+    end.
+
+%%
+%% Consider this code:
+%%
+%%   Var = ...
+%%   ...
+%%   A1 = call foo/0
+%%   A = copy A1
+%%   B = call bar/1, Var
+%%
+%% If the Var variable is no longer used after this code, its Y register
+%% can't be reused for A. To allow the Y register to be reused
+%% we will need to insert 'copy' instructions for arguments that are
+%% in Y registers:
+%%
+%%   Var = ...
+%%   ...
+%%   A1 = call foo/0
+%%   Var1 = copy Var
+%%   A = copy A1
+%%   B = call bar/1, Var1
+%%
+
+place_retval_copy(I, _Yregs, none, Count, Acc) ->
+    {I,Count,Acc};
+place_retval_copy(#b_set{args=[F|Args0]}=I, Yregs, Copy, Count0, Acc0) ->
+    #b_set{dst=Avoid} = Copy,
+    {Args,Acc1,Count} = copy_func_args(Args0, Yregs, Avoid, Acc0, [], Count0),
+    Acc = [Copy|Acc1],
+    {I#b_set{args=[F|Args]},Count,Acc}.
+
+copy_func_args([#b_var{name=AName}=A|As], Yregs, Avoid, CopyAcc, Acc, Count0) ->
+    case gb_sets:is_member(A, Yregs) of
+        true when A =/= Avoid ->
+            {NewVar,Count} = new_var(AName, Count0),
+            Copy = #b_set{op=copy,dst=NewVar,args=[A]},
+            copy_func_args(As, Yregs, Avoid, [Copy|CopyAcc], [NewVar|Acc], Count);
+        _ ->
+            copy_func_args(As, Yregs, Avoid, CopyAcc, [A|Acc], Count0)
+    end;
+copy_func_args([A|As], Yregs, Avoid, CopyAcc, Acc, Count) ->
+    copy_func_args(As, Yregs, Avoid, CopyAcc, [A|Acc], Count);
+copy_func_args([], _Yregs, _Avoid, CopyAcc, Acc, Count) ->
+    {reverse(Acc),CopyAcc,Count}.
+
+acc_copy(Acc, none) -> Acc;
+acc_copy(Acc, #b_set{}=Copy) -> [Copy|Acc].
+
+copy_sub_args(Args, none) ->
+    Args;
+copy_sub_args(Args, #b_set{dst=Dst,args=[Src]}) ->
+    [sub_arg(A, Dst, Src) || A <- Args].
+
+sub_arg(Old, Old, New) -> New;
+sub_arg(Old, _, _) -> Old.
+
+%%%
+%%% Consider:
+%%%
+%%%   x1/Hd = get_hd x0/Cons
+%%%   y0/Tl = get_tl x0/Cons
+%%%
+%%% Register x0 can't be reused for Hd. If Hd needs to be in x0,
+%%% a 'move' instruction must be inserted.
+%%%
+%%% If we swap get_hd and get_tl when Tl is in a Y register,
+%%% x0 can be used for Hd if Cons is not used again:
+%%%
+%%%   y0/Tl = get_tl x0/Cons
+%%%   x0/Hd = get_hd x0/Cons
+%%%
+
+opt_get_list(#st{ssa=Blocks,res=Res}=St) ->
+    ResMap = maps:from_list(Res),
+    Ls = beam_ssa:rpo(Blocks),
+    St#st{ssa=opt_get_list_1(Ls, ResMap, Blocks)}.
+
+opt_get_list_1([L|Ls], Res, Blocks0) ->
+    #b_blk{is=Is0} = Blk = map_get(L, Blocks0),
+    case opt_get_list_is(Is0, Res, [], false) of
+        no ->
+            opt_get_list_1(Ls, Res, Blocks0);
+        {yes,Is} ->
+            Blocks = Blocks0#{L:=Blk#b_blk{is=Is}},
+            opt_get_list_1(Ls, Res, Blocks)
+    end;
+opt_get_list_1([], _, Blocks) -> Blocks.
+
+opt_get_list_is([#b_set{op=get_hd,dst=Hd,
+                        args=[Cons]}=GetHd,
+                 #b_set{op=get_tl,dst=Tl,
+                        args=[Cons]}=GetTl|Is],
+                Res, Acc, Changed) ->
+    %% Note that when this pass is run, only Y registers have
+    %% reservations. The absence of an entry for a variable therefore
+    %% means that the variable will be in an X register.
+    case Res of
+        #{Hd:={y,_}} ->
+            %% Hd will be in a Y register. Don't swap.
+            opt_get_list_is([GetTl|Is], Res, [GetHd|Acc], Changed);
+        #{Tl:={y,_}} ->
+            %% Tl will be in a Y register. Swap.
+            opt_get_list_is([GetHd|Is], Res, [GetTl|Acc], true);
+        #{} ->
+            %% Both are in X registers. Nothing to do.
+            opt_get_list_is([GetTl|Is], Res, [GetHd|Acc], Changed)
+    end;
+opt_get_list_is([I|Is], Res, Acc, Changed) ->
+    opt_get_list_is(Is, Res, [I|Acc], Changed);
+opt_get_list_is([], _Res, Acc, Changed) ->
+    case Changed of
+        true ->
+            {yes,reverse(Acc)};
+        false ->
+            no
+    end.
+
+%%%
+%%% Number instructions in the order they are executed.
+%%%
+
+%% number_instructions(St0) -> St.
+%%  Number instructions in the order they are executed. Use a step
+%%  size of 2. Don't number phi instructions. All phi variables in
+%%  a block will be live one unit before the first non-phi instruction
+%%  in the block.
+
+number_instructions(#st{ssa=Blocks0}=St) ->
+    Ls = beam_ssa:rpo(Blocks0),
+    St#st{ssa=number_is_1(Ls, 1, Blocks0)}.
+
+number_is_1([L|Ls], N0, Blocks0) ->
+    #b_blk{is=Is0,last=Last0} = Bl0 = map_get(L, Blocks0),
+    {Is,N1} = number_is_2(Is0, N0, []),
+    Last = beam_ssa:add_anno(n, N1, Last0),
+    N = N1 + 2,
+    Bl = Bl0#b_blk{is=Is,last=Last},
+    Blocks = Blocks0#{L:=Bl},
+    number_is_1(Ls, N, Blocks);
+number_is_1([], _, Blocks) -> Blocks.
+
+number_is_2([#b_set{op=phi}=I|Is], N, Acc) ->
+    number_is_2(Is, N, [I|Acc]);
+number_is_2([I0|Is], N, Acc) ->
+    I = beam_ssa:add_anno(n, N, I0),
+    number_is_2(Is, N+2, [I|Acc]);
+number_is_2([], N, Acc) ->
+    {reverse(Acc),N}.
+
+%%%
+%%% Calculate live intervals.
+%%%
+
+live_intervals(#st{args=Args,ssa=Blocks}=St) ->
+    Vars0 = [{V,{0,1}} || #b_var{}=V <- Args],
+    F = fun(L, _, A) -> live_interval_blk(L, Blocks, A) end,
+    LiveMap0 = #{},
+    Acc0 = {[],LiveMap0},
+    {Vars,_} = beam_ssa:fold_po(F, Acc0, Blocks),
+    Intervals = merge_ranges(rel2fam(Vars0++Vars)),
+    St#st{intervals=Intervals}.
+
+merge_ranges([{V,Rs}|T]) ->
+    [{V,merge_ranges_1(Rs)}|merge_ranges(T)];
+merge_ranges([]) -> [].
+
+merge_ranges_1([{A,N},{N,Z}|Rs]) ->
+    merge_ranges_1([{A,Z}|Rs]);
+merge_ranges_1([R|Rs]) ->
+    [R|merge_ranges_1(Rs)];
+merge_ranges_1([]) -> [].
+
+live_interval_blk(L, Blocks, {Vars0,LiveMap0}) ->
+    Live0 = [],
+    Successors = beam_ssa:successors(L, Blocks),
+    Live1 = update_successors(Successors, L, Blocks, LiveMap0, Live0),
+
+    %% Add ranges for all variables that are live in the successors.
+    #b_blk{is=Is,last=Last} = map_get(L, Blocks),
+    End = beam_ssa:get_anno(n, Last),
+    Use = [{V,{use,End+1}} || V <- Live1],
+
+    %% Determine used and defined variables in this block.
+    FirstNumber = first_number(Is, Last),
+    UseDef0 = live_interval_blk_1([Last|reverse(Is)], FirstNumber, Use),
+    UseDef = rel2fam(UseDef0),
+
+    %% Update what is live at the beginning of this block and
+    %% store it.
+    Used = [V || {V,[{use,_}|_]} <- UseDef],
+    Live2 = ordsets:union(Live1, Used),
+    Killed = [V || {V,[{def,_}|_]} <- UseDef],
+    Live = ordsets:subtract(Live2, Killed),
+    LiveMap = LiveMap0#{L=>Live},
+
+    %% Construct the ranges for this block.
+    Vars = make_block_ranges(UseDef, FirstNumber, Vars0),
+    {Vars,LiveMap}.
+
+make_block_ranges([{V,[{def,Def}]}|Vs], First, Acc) ->
+    make_block_ranges(Vs, First, [{V,{Def,Def}}|Acc]);
+make_block_ranges([{V,[{def,Def}|Uses]}|Vs], First, Acc) ->
+    {use,Last} = last(Uses),
+    make_block_ranges(Vs, First, [{V,{Def,Last}}|Acc]);
+make_block_ranges([{V,[{use,_}|_]=Uses}|Vs], First, Acc) ->
+    {use,Last} = last(Uses),
+    make_block_ranges(Vs, First, [{V,{First,Last}}|Acc]);
+make_block_ranges([], _, Acc) -> Acc.
+
+live_interval_blk_1([#b_set{op=phi,dst=Dst}|Is], FirstNumber, Acc0) ->
+    Acc = [{Dst,{def,FirstNumber}}|Acc0],
+    live_interval_blk_1(Is, FirstNumber, Acc);
+live_interval_blk_1([#b_set{op=bs_start_match}=I|Is],
+                    FirstNumber, Acc0) ->
+    N = beam_ssa:get_anno(n, I),
+    #b_set{dst=Dst} = I,
+    Acc1 = [{Dst,{def,N}}|Acc0],
+    Acc = [{V,{use,N}} || V <- beam_ssa:used(I)] ++ Acc1,
+    live_interval_blk_1(Is, FirstNumber, Acc);
+live_interval_blk_1([I|Is], FirstNumber, Acc0) ->
+    N = beam_ssa:get_anno(n, I),
+    Acc1 = case I of
+               #b_set{dst=Dst} ->
+                   [{Dst,{def,N}}|Acc0];
+               _ ->
+                   Acc0
+           end,
+    Used = beam_ssa:used(I),
+    Acc = [{V,{use,N}} || V <- Used] ++ Acc1,
+    live_interval_blk_1(Is, FirstNumber, Acc);
+live_interval_blk_1([], _FirstNumber, Acc) ->
+    Acc.
+
+%% first_number([#b_set{}]) -> InstructionNumber.
+%%  Return the number for the first instruction for the block.
+%%  Note that this number is one less than the first
+%%  non-phi instruction in the block.
+
+first_number([#b_set{op=phi}|Is], Last) ->
+    first_number(Is, Last);
+first_number([I|_], _) ->
+    beam_ssa:get_anno(n, I) - 1;
+first_number([], Last) ->
+    beam_ssa:get_anno(n, Last) - 1.
+
+update_successors([L|Ls], Pred, Blocks, LiveMap, Live0) ->
+    Live1 = ordsets:union(Live0, get_live(L, LiveMap)),
+    #b_blk{is=Is} = map_get(L, Blocks),
+    Live = update_live_phis(Is, Pred, Live1),
+    update_successors(Ls, Pred, Blocks, LiveMap, Live);
+update_successors([], _, _, _, Live) -> Live.
+
+get_live(L, LiveMap) ->
+    case LiveMap of
+        #{L:=Live} -> Live;
+        #{} -> []
+    end.
+
+update_live_phis([#b_set{op=phi,dst=Killed,args=Args}|Is],
+                 Pred, Live0) ->
+    Used = [V || {#b_var{}=V,L} <- Args, L =:= Pred],
+    Live1 = ordsets:union(ordsets:from_list(Used), Live0),
+    Live = ordsets:del_element(Killed, Live1),
+    update_live_phis(Is, Pred, Live);
+update_live_phis(_, _, Live) -> Live.
+
+%%%
+%%% Reserve Y registers.
+%%%
+
+%% reserve_yregs(St0) -> St.
+%%  In each block that allocates a stack frame, insert instructions
+%%  that copy variables that must be in Y registers (given by
+%%  the `yregs` annotation) to new variables.
+%%
+%%  Also allocate specific Y registers for try and catch tags.
+%%  The outermost try/catch tag is placed in y0, any directly
+%%  nested tag in y1, and so on. Note that this is the reversed
+%%  order as required by BEAM; it will be corrected later by
+%%  turn_yregs().
+
+reserve_yregs(#st{frames=Frames}=St0) ->
+    foldl(fun reserve_yregs_1/2, St0, Frames).
+
+reserve_yregs_1(L, #st{ssa=Blocks0,cnt=Count0,res=Res0}=St) ->
+    Blk = map_get(L, Blocks0),
+    Yregs = beam_ssa:get_anno(yregs, Blk),
+    {Def,Used} = beam_ssa:def_used([L], Blocks0),
+    UsedYregs = ordsets:intersection(Yregs, Used),
+    DefBefore = ordsets:subtract(UsedYregs, Def),
+    {BeforeVars,Blocks,Count} = rename_vars(DefBefore, L, Blocks0, Count0),
+    InsideVars = ordsets:subtract(UsedYregs, DefBefore),
+    ResTryTags0 = reserve_try_tags(L, Blocks),
+    ResTryTags = [{V,{Reg,Count}} || {V,Reg} <- ResTryTags0],
+    Vars = BeforeVars ++ InsideVars,
+    Res = [{V,{y,Count}} || V <- Vars] ++ ResTryTags ++ Res0,
+    St#st{res=Res,ssa=Blocks,cnt=Count+1}.
+
+reserve_try_tags(L, Blocks) ->
+    Seen = gb_sets:empty(),
+    {Res0,_} = reserve_try_tags_1([L], Blocks, Seen, #{}),
+    Res1 = [maps:to_list(M) || {_,M} <- maps:to_list(Res0)],
+    Res = [{V,{y,Y}} || {V,Y} <- append(Res1)],
+    ordsets:from_list(Res).
+
+reserve_try_tags_1([L|Ls], Blocks, Seen0, ActMap0) ->
+    case gb_sets:is_element(L, Seen0) of
+        true ->
+            reserve_try_tags_1(Ls, Blocks, Seen0, ActMap0);
+        false ->
+            Seen1 = gb_sets:insert(L, Seen0),
+            #b_blk{is=Is} = Blk = map_get(L, Blocks),
+            Active0 = get_active(L, ActMap0),
+            Active = reserve_try_tags_is(Is, Active0),
+            Successors = beam_ssa:successors(Blk),
+            ActMap1 = update_act_map(Successors, Active, ActMap0),
+            {ActMap,Seen} = reserve_try_tags_1(Ls, Blocks, Seen1, ActMap1),
+            reserve_try_tags_1(Successors, Blocks, Seen,ActMap)
+    end;
+reserve_try_tags_1([], _Blocks, Seen, ActMap) ->
+    {ActMap,Seen}.
+
+get_active(L, ActMap) ->
+    case ActMap of
+        #{L:=Active} -> Active;
+        #{} -> #{}
+    end.
+
+reserve_try_tags_is([#b_set{op=new_try_tag,dst=V}|Is], Active) ->
+    N = map_size(Active),
+    reserve_try_tags_is(Is, Active#{V=>N});
+reserve_try_tags_is([#b_set{op=kill_try_tag,args=[Tag]}|Is], Active) ->
+    reserve_try_tags_is(Is, maps:remove(Tag, Active));
+reserve_try_tags_is([_|Is], Active) ->
+    reserve_try_tags_is(Is, Active);
+reserve_try_tags_is([], Active) -> Active.
+
+update_act_map([L|Ls], Active0, ActMap0) ->
+    case ActMap0 of
+        #{L:=Active1} ->
+            ActMap = ActMap0#{L=>maps:merge(Active0, Active1)},
+            update_act_map(Ls, Active0, ActMap);
+        #{} ->
+            ActMap = ActMap0#{L=>Active0},
+            update_act_map(Ls, Active0, ActMap)
+    end;
+update_act_map([], _, ActMap) -> ActMap.
+
+rename_vars([], _, Blocks, Count) ->
+    {[],Blocks,Count};
+rename_vars(Vs, L, Blocks0, Count0) ->
+    {NewVars,Count} = new_vars([Base || #b_var{name=Base} <- Vs], Count0),
+    Ren = zip(Vs, NewVars),
+    Blocks1 = beam_ssa:rename_vars(Ren, [L], Blocks0),
+    #b_blk{is=Is0} = Blk0 = map_get(L, Blocks1),
+    CopyIs = [#b_set{op=copy,dst=New,args=[Old]} || {Old,New} <- Ren],
+    Is = insert_after_phis(Is0, CopyIs),
+    Blk = Blk0#b_blk{is=Is},
+    Blocks = Blocks1#{L:=Blk},
+    {NewVars,Blocks,Count}.
+
+insert_after_phis([#b_set{op=phi}=I|Is], InsertIs) ->
+    [I|insert_after_phis(Is, InsertIs)];
+insert_after_phis(Is, InsertIs) ->
+    InsertIs ++ Is.
+
+%% frame_size(St0) -> St.
+%%  Calculate the frame size for each block that allocates a frame.
+%%  Annotate the block with the frame size. Also annotate all
+%%  return instructions with {deallocate,FrameSize} to simplify
+%%  code generation.
+
+frame_size(#st{frames=Frames,regs=Regs,ssa=Blocks0}=St) ->
+    Blocks = foldl(fun(L, Blks) ->
+                           frame_size_1(L, Regs, Blks)
+                   end, Blocks0, Frames),
+    St#st{ssa=Blocks}.
+
+frame_size_1(L, Regs, Blocks0) ->
+    Def = beam_ssa:def([L], Blocks0),
+    Yregs0 = [map_get(V, Regs) || V <- Def, is_yreg(map_get(V, Regs))],
+    Yregs = ordsets:from_list(Yregs0),
+    FrameSize = length(ordsets:from_list(Yregs)),
+    if
+        FrameSize =/= 0 ->
+            [{y,0}|_] = Yregs,                  %Assertion.
+            {y,Last} = last(Yregs),
+            Last = FrameSize - 1,               %Assertion.
+            ok;
+        true ->
+            ok
+    end,
+    Blk0 = map_get(L, Blocks0),
+    Blk = beam_ssa:add_anno(frame_size, FrameSize, Blk0),
+
+    %% Insert an annotation for frame deallocation on
+    %% each #b_ret{}.
+    Blocks = Blocks0#{L:=Blk},
+    Reachable = beam_ssa:rpo([L], Blocks),
+    frame_deallocate(Reachable, FrameSize, Blocks).
+
+frame_deallocate([L|Ls], Size, Blocks0) ->
+    Blk0 = map_get(L, Blocks0),
+    Blk = case Blk0 of
+              #b_blk{last=#b_ret{}=Ret0} ->
+                  Ret = beam_ssa:add_anno(deallocate, Size, Ret0),
+                  Blk0#b_blk{last=Ret};
+              #b_blk{} ->
+                  Blk0
+          end,
+    Blocks = Blocks0#{L:=Blk},
+    frame_deallocate(Ls, Size, Blocks);
+frame_deallocate([], _, Blocks) -> Blocks.
+
+
+%% turn_yregs(St0) -> St.
+%%  Renumber y registers so that {y,0} becomes {y,FrameSize-1},
+%%  {y,FrameSize-1} becomes {y,0} and so on. This is to make nested
+%%  catches work. The register allocator (linear_scan()) has given
+%%  a lower number to the outermost catch.
+
+turn_yregs(#st{frames=Frames,regs=Regs0,ssa=Blocks}=St) ->
+    Regs1 = foldl(fun(L, A) ->
+                          Blk = map_get(L, Blocks),
+                          FrameSize = beam_ssa:get_anno(frame_size, Blk),
+                          Def = beam_ssa:def([L], Blocks),
+                          [turn_yregs_1(Def, FrameSize, Regs0)|A]
+                  end, [], Frames),
+    Regs = maps:merge(Regs0, maps:from_list(append(Regs1))),
+    St#st{regs=Regs}.
+
+turn_yregs_1(Def, FrameSize, Regs) ->
+    Yregs0 = [{map_get(V, Regs),V} || V <- Def, is_yreg(map_get(V, Regs))],
+    Yregs1 = rel2fam(Yregs0),
+    FrameSize = length(Yregs1),
+    Yregs2 = [{{y,FrameSize-Y-1},Vs} || {{y,Y},Vs} <- Yregs1],
+    R0 = sofs:family(Yregs2),
+    R1 = sofs:family_to_relation(R0),
+    R = sofs:converse(R1),
+    sofs:to_external(R).
+
+%%%
+%%% Reserving registers before register allocation.
+%%%
+
+%% reserve_regs(St0) -> St.
+%%  Reserve registers prior to register allocation. Y registers
+%%  have already been reserved. This function will reserve z,
+%%  fr, and specific x registers.
+
+reserve_regs(#st{args=Args,ssa=Blocks,intervals=Intervals,res=Res0}=St) ->
+    %% Reserve x0, x1, and so on for the function arguments.
+    Res1 = reserve_arg_regs(Args, 0, Res0),
+
+    %% Reserve Z registers (dummy registers) for instructions with no
+    %% return values (e.g. remove_message) or pseudo-return values
+    %% (e.g. landingpad).
+    Res2 = reserve_zregs(Blocks, Intervals, Res1),
+
+    %% Reserve float registers.
+    Res3 = reserve_fregs(Blocks, Res2),
+
+    %% Reserve all remaining unreserved variables as X registers.
+    Res = maps:from_list(Res3),
+    St#st{res=reserve_xregs(Blocks, Res)}.
+
+reserve_arg_regs([#b_var{}=Arg|Is], N, Acc) ->
+    reserve_arg_regs(Is, N+1, [{Arg,{x,N}}|Acc]);
+reserve_arg_regs([], _, Acc) -> Acc.
+
+reserve_zregs(Blocks, Intervals, Res) ->
+    ShortLived0 = [V || {V,[{Start,End}]} <- Intervals, Start+2 =:= End],
+    ShortLived = cerl_sets:from_list(ShortLived0),
+    F = fun(_, #b_blk{is=Is,last=Last}, A) ->
+                reserve_zreg(Is, Last, ShortLived, A)
+        end,
+    beam_ssa:fold_rpo(F, [0], Res, Blocks).
+
+reserve_zreg([#b_set{op=Op,dst=Dst}],
+              #b_br{bool=Dst}, _ShortLived, A) when Op =:= call;
+                                                    Op =:= get_tuple_element ->
+    %% If type optimization has determined that the result of these
+    %% instructions can be used directly in a branch, we must avoid reserving a
+    %% z register or code generation will fail.
+    A;
+reserve_zreg([#b_set{op={bif,tuple_size},dst=Dst},
+              #b_set{op={bif,'=:='},args=[Dst,Val]}], Last, ShortLived, A0) ->
+    case {Val,Last} of
+        {#b_literal{val=Arity},#b_br{bool=#b_var{}}} when Arity bsr 32 =:= 0 ->
+            %% These two instructions can be combined to a test_arity
+            %% instruction provided that the arity variable is short-lived.
+            reserve_zreg_1(Dst, ShortLived, A0);
+        {_,_} ->
+            %% Either the arity is too big, or the boolean value is not
+            %% used in a conditional branch.
+            A0
+    end;
+reserve_zreg([#b_set{op={bif,tuple_size},dst=Dst}],
+             #b_switch{}, ShortLived, A) ->
+    reserve_zreg_1(Dst, ShortLived, A);
+reserve_zreg([#b_set{op={bif,'xor'}}], _Last, _ShortLived, A) ->
+    %% There is no short, easy way to rewrite 'xor' to a series of
+    %% test instructions.
+    A;
+reserve_zreg([#b_set{op={bif,is_record}}], _Last, _ShortLived, A) ->
+    %% There is no short, easy way to rewrite is_record/2 to a series of
+    %% test instructions.
+    A;
+reserve_zreg([#b_set{op=Op,dst=Dst}|Is], Last, ShortLived, A0) ->
+    IsZReg = case Op of
+                 bs_match_string -> true;
+                 bs_save -> true;
+                 bs_restore -> true;
+                 bs_set_position -> true;
+                 {float,clearerror} -> true;
+                 kill_try_tag -> true;
+                 landingpad -> true;
+                 put_tuple_elements -> true;
+                 remove_message -> true;
+                 set_tuple_element -> true;
+                 succeeded -> true;
+                 timeout -> true;
+                 wait_timeout -> true;
+                 _ -> false
+             end,
+    A = case IsZReg of
+            true -> [{Dst,z}|A0];
+            false -> A0
+        end,
+    reserve_zreg(Is, Last, ShortLived, A);
+reserve_zreg([], #b_br{bool=Bool}, ShortLived, A) ->
+    reserve_zreg_1(Bool, ShortLived, A);
+reserve_zreg([], _, _, A) -> A.
+
+reserve_zreg_1(#b_var{}=V, ShortLived, A) ->
+    case cerl_sets:is_element(V, ShortLived) of
+        true -> [{V,z}|A];
+        false -> A
+    end;
+reserve_zreg_1(#b_literal{}, _, A) -> A.
+
+reserve_fregs(Blocks, Res) ->
+    F = fun(_, #b_blk{is=Is}, A) ->
+                reserve_freg(Is, A)
+        end,
+    beam_ssa:fold_rpo(F, [0], Res, Blocks).
+
+reserve_freg([#b_set{op={float,Op},dst=V}|Is], Res) ->
+    case Op of
+        get ->
+            reserve_freg(Is, Res);
+        _ ->
+            reserve_freg(Is, [{V,fr}|Res])
+    end;
+reserve_freg([_|Is], Res) ->
+    reserve_freg(Is, Res);
+reserve_freg([], Res) -> Res.
+
+%% reserve_xregs(St0) -> St.
+%%  Reserve all remaining variables as X registers.
+%%
+%%  If a variable will need to be in a specific X register for a
+%%  'call' or 'make_fun' (and there is nothing that will kill it
+%%  between the definition and use), reserve the register using a
+%%  {prefer,{x,X} annotation. That annotation means that the linear
+%%  scan algorithm will place the variable in the preferred register,
+%%  unless that register is already occupied.
+%%
+%%  All remaining variables are reserved as X registers. Linear scan
+%%  will allocate the lowest free X register for the variable.
+
+reserve_xregs(Blocks, Res) ->
+    Ls = reverse(beam_ssa:rpo(Blocks)),
+    reserve_xregs(Ls, Blocks, #{}, Res).
+
+reserve_xregs([L|Ls], Blocks, XsMap0, Res0) ->
+    #b_blk{anno=Anno,is=Is0,last=Last} = map_get(L, Blocks),
+
+    %% Calculate mapping from variable name to the preferred
+    %% register.
+    Xs0 = reserve_terminator(L, Is0, Last, Blocks, XsMap0, Res0),
+
+    %% We need to figure out where the code generator will
+    %% place instructions that will do a garbage collection.
+    %% Insert 'gc' markers as pseudo-instructions in the
+    %% instruction sequence.
+    Is1 = reverse(Is0),
+    Is2 = res_place_gc_instrs(Is1, []),
+    Is = res_place_allocate(Anno, Is2),
+
+    %% Add register hints for variables that are defined
+    %% in the (reversed) instruction sequence.
+    {Res,Xs} = reserve_xregs_is(Is, Res0, Xs0, []),
+
+    XsMap = XsMap0#{L=>Xs},
+    reserve_xregs(Ls, Blocks, XsMap, Res);
+reserve_xregs([], _, _, Res) -> Res.
+
+%% Insert explicit 'gc' markers points where there will
+%% be a garbage collection. (Note that the instruction
+%% sequence passed to this function is reversed.)
+
+res_place_gc_instrs([#b_set{op=phi}=I|Is], Acc) ->
+    res_place_gc_instrs(Is, [I|Acc]);
+res_place_gc_instrs([#b_set{op=Op}=I|Is], Acc)
+  when Op =:= call; Op =:= make_fun ->
+    case Acc of
+        [] ->
+            res_place_gc_instrs(Is, [I|Acc]);
+        [GC|_] when GC =:= gc; GC =:= test_heap ->
+            res_place_gc_instrs(Is, [I,gc|Acc]);
+        [_|_] ->
+            res_place_gc_instrs(Is, [I,gc|Acc])
+    end;
+res_place_gc_instrs([#b_set{op=Op,args=Args}=I|Is], Acc0) ->
+    case beam_ssa_codegen:classify_heap_need(Op, Args) of
+        neutral ->
+            case Acc0 of
+                [test_heap|Acc] ->
+                    res_place_gc_instrs(Is, [test_heap,I|Acc]);
+                Acc ->
+                    res_place_gc_instrs(Is, [I|Acc])
+            end;
+        {put,_} ->
+            case Acc0 of
+                [test_heap|Acc] ->
+                    res_place_gc_instrs(Is, [test_heap,I|Acc]);
+                Acc ->
+                    res_place_gc_instrs(Is, [test_heap,I|Acc])
+            end;
+        _ ->
+            res_place_gc_instrs(Is, [gc,I|Acc0])
+    end;
+res_place_gc_instrs([], Acc) ->
+    %% Reverse and replace 'test_heap' markers with 'gc'.
+    %% (The distinction is no longer useful.)
+    res_place_gc_instrs_rev(Acc, []).
+
+res_place_gc_instrs_rev([test_heap|Is], [gc|_]=Acc) ->
+    res_place_gc_instrs_rev(Is, Acc);
+res_place_gc_instrs_rev([test_heap|Is], Acc) ->
+    res_place_gc_instrs_rev(Is, [gc|Acc]);
+res_place_gc_instrs_rev([gc|Is], [gc|_]=Acc) ->
+    res_place_gc_instrs_rev(Is, Acc);
+res_place_gc_instrs_rev([I|Is], Acc) ->
+    res_place_gc_instrs_rev(Is, [I|Acc]);
+res_place_gc_instrs_rev([], Acc) -> Acc.
+
+res_place_allocate(#{yregs:=_}, Is) ->
+    %% There will be an 'allocate' instruction inserted here.
+    Is ++ [gc];
+res_place_allocate(#{}, Is) -> Is.
+
+reserve_xregs_is([gc|Is], Res, Xs0, Used) ->
+    %% At this point, the code generator will place an instruction
+    %% that does a garbage collection. We must prune the remembered
+    %% registers.
+    Xs = res_xregs_prune(Xs0, Used, Res),
+    reserve_xregs_is(Is, Res, Xs, Used);
+reserve_xregs_is([#b_set{op=Op,dst=Dst,args=Args}=I|Is], Res0, Xs0, Used0) ->
+    Res = reserve_xreg(Dst, Xs0, Res0),
+    Used1 = ordsets:union(Used0, beam_ssa:used(I)),
+    Used = ordsets:del_element(Dst, Used1),
+    case Op of
+        call ->
+            Xs = reserve_call_args(tl(Args)),
+            reserve_xregs_is(Is, Res, Xs, Used);
+        make_fun ->
+            Xs = reserve_call_args(tl(Args)),
+            reserve_xregs_is(Is, Res, Xs, Used);
+        _ ->
+            reserve_xregs_is(Is, Res, Xs0, Used)
+    end;
+reserve_xregs_is([], Res, Xs, _Used) ->
+    {Res,Xs}.
+
+%% Pick up register hints from the successors of this blocks.
+reserve_terminator(_L, _Is, #b_br{bool=#b_var{},succ=Succ,fail=?BADARG_BLOCK},
+                   _Blocks, XsMap, _Res) ->
+    %% We know that no variables are used at ?BADARG_BLOCK, so
+    %% any register hints from the success blocks are safe to use.
+    map_get(Succ, XsMap);
+reserve_terminator(L, Is, #b_br{bool=#b_var{},succ=Succ,fail=Fail},
+                   Blocks, XsMap, Res) when Succ =/= Fail ->
+    #{Succ:=SuccBlk,Fail:=FailBlk} = Blocks,
+    case {SuccBlk,FailBlk} of
+        {#b_blk{is=[],last=#b_br{succ=PhiL,fail=PhiL}},
+         #b_blk{is=[],last=#b_br{succ=PhiL,fail=PhiL}}} ->
+            %% Both branches ultimately transfer to the same
+            %% block (via two blocks with no instructions).
+            %% Pick up register hints from the phi nodes
+            %% in the common block.
+            #{PhiL:=#b_blk{is=PhiIs}} = Blocks,
+            Xs = res_xregs_from_phi(PhiIs, Succ, Res, #{}),
+            res_xregs_from_phi(PhiIs, Fail, Res, Xs);
+        {_,_} when Is =/= [] ->
+            case last(Is) of
+                #b_set{op=succeeded,args=[Arg]} ->
+                    %% We know that Arg will not be used at the failure
+                    %% label, so we can pick up register hints from the
+                    %% success label.
+                    Br = #b_br{bool=#b_literal{val=true},succ=Succ,fail=Succ},
+                    case reserve_terminator(L, [], Br, Blocks, XsMap, Res) of
+                        #{Arg:=Reg} -> #{Arg=>Reg};
+                        #{} -> #{}
+                    end;
+                _ ->
+                    %% Register hints from the success block may not
+                    %% be safe at the failure block, and vice versa.
+                    #{}
+            end;
+        {_,_} ->
+            %% Register hints from the success block may not
+            %% be safe at the failure block, and vice versa.
+            #{}
+    end;
+reserve_terminator(L, Is, #b_br{bool=#b_literal{val=true},succ=Succ},
+                   Blocks, XsMap, Res) ->
+    case map_get(Succ, Blocks) of
+        #b_blk{is=[],last=Last} ->
+            reserve_terminator(Succ, Is, Last, Blocks, XsMap, Res);
+        #b_blk{is=[_|_]=PhiIs} ->
+            res_xregs_from_phi(PhiIs, L, Res, #{})
+    end;
+reserve_terminator(_, _, _, _, _, _) -> #{}.
+
+%% Pick up a reservation from a phi node.
+res_xregs_from_phi([#b_set{op=phi,dst=Dst,args=Args}|Is],
+                   Pred, Res, Acc) ->
+    case [V || {#b_var{}=V,L} <- Args, L =:= Pred] of
+        [] ->
+            %% The value of the phi node for this predecessor
+            %% is a literal. Nothing to do here.
+            res_xregs_from_phi(Is, Pred, Res, Acc);
+        [V] ->
+            case Res of
+                #{Dst:={prefer,Reg}} ->
+                    %% Try placing V in the same register as for
+                    %% the phi node.
+                    res_xregs_from_phi(Is, Pred, Res, Acc#{V=>Reg});
+                #{Dst:=_} ->
+                    res_xregs_from_phi(Is, Pred, Res, Acc)
+            end
+    end;
+res_xregs_from_phi(_, _, _, Acc) -> Acc.
+
+reserve_call_args(Args) ->
+    reserve_call_args(Args, 0, #{}).
+
+reserve_call_args([#b_var{}=Var|As], X, Xs) ->
+    reserve_call_args(As, X+1, Xs#{Var=>{x,X}});
+reserve_call_args([#b_literal{}|As], X, Xs) ->
+    reserve_call_args(As, X+1, Xs);
+reserve_call_args([], _, Xs) -> Xs.
+
+reserve_xreg(V, Xs, Res) ->
+    case Res of
+        #{V:=_} ->
+            %% Already reserved (but not as an X register).
+            Res;
+        #{} ->
+            case Xs of
+                #{V:=X} ->
+                    %% Add a hint that this specific X register is
+                    %% preferred, unless it is already in use.
+                    Res#{V=>{prefer,X}};
+                #{} ->
+                    %% Reserve as an X register in general.
+                    Res#{V=>x}
+            end
+    end.
+
+%% res_xregs_prune(PreferredRegs, Used, Res) -> PreferredRegs.
+%%  Prune the list of preferred registers, to make sure that
+%%  there are no "holes" (uninitialized X registers) when
+%%  invoking the garbage collector.
+
+res_xregs_prune(Xs, Used, Res) when map_size(Xs) =/= 0 ->
+    %% The number of safe registers is the number of the X registers
+    %% used after this point. The actual number of safe registers may
+    %% be higher than this number, but this is a conservative safe
+    %% estimate.
+    NumSafe = foldl(fun(V, N) ->
+                            case Res of
+                                #{V:={x,_}} -> N + 1;
+                                #{V:=_} -> N;
+                                #{} -> N + 1
+                            end
+                    end, 0, Used),
+
+    %% Remove unsafe registers from the list of potential
+    %% preferred registers.
+    maps:filter(fun(_, {x,X}) -> X < NumSafe end, Xs);
+res_xregs_prune(Xs, _Used, _Res) -> Xs.
+
+%%%
+%%% Register allocation using linear scan.
+%%%
+
+-record(i,
+        {sort=1 :: instr_number(),
+         reg=none :: i_reg(),
+         pool=x :: pool_id(),
+         var=#b_var{} :: b_var(),
+         rs=[] :: [range()]
+        }).
+
+-record(l,
+        {cur=#i{} :: interval(),
+         unhandled_res=[] :: [interval()],
+         unhandled_any=[] :: [interval()],
+         active=[] :: [interval()],
+         inactive=[] :: [interval()],
+         free=#{} :: #{var_name()=>pool(),
+                       {'next',pool_id()}:=reg_num()},
+         regs=[] :: [{b_var(),ssa_register()}]
+        }).
+
+-type interval() :: #i{}.
+-type i_reg() :: ssa_register() | {'prefer',xreg()} | 'none'.
+-type pool_id() :: 'fr' | 'x' | 'z' | instr_number().
+-type pool() :: ordsets:ordset(ssa_register()).
+
+linear_scan(#st{intervals=Intervals0,res=Res}=St0) ->
+    St = St0#st{intervals=[],res=[]},
+    Free = init_free(maps:to_list(Res)),
+    Intervals1 = [init_interval(Int, Res) || Int <- Intervals0],
+    Intervals = sort(Intervals1),
+    IsReserved = fun(#i{reg=Reg}) ->
+                         case Reg of
+                             none -> false;
+                             {prefer,{_,_}} -> false;
+                             {_,_} -> true
+                         end
+                 end,
+    {UnhandledRes,Unhandled} = partition(IsReserved, Intervals),
+    L = #l{unhandled_res=UnhandledRes,
+           unhandled_any=Unhandled,free=Free},
+    #l{regs=Regs} = do_linear(L),
+    St#st{regs=maps:from_list(Regs)}.
+
+init_interval({V,[{Start,_}|_]=Rs}, Res) ->
+    Info = map_get(V, Res),
+    Pool = case Info of
+               {prefer,{x,_}} -> x;
+               x -> x;
+               {x,_} -> x;
+               {y,Uniq} -> Uniq;
+               {{y,_},Uniq} -> Uniq;
+               z -> z;
+               fr -> fr
+           end,
+    Reg = case Info of
+              {prefer,{x,_}} -> Info;
+              {x,_} -> Info;
+              {{y,_}=Y,_} -> Y;
+              _ -> none
+          end,
+    #i{sort=Start,var=V,reg=Reg,pool=Pool,rs=Rs}.
+
+init_free(Res) ->
+    Free0 = rel2fam([{x,{x,0}}|init_free_1(Res)]),
+    #{x:=Xs0} = Free1 = maps:from_list(Free0),
+    Xs = init_xregs(Xs0),
+    Free = Free1#{x:=Xs},
+    Next = maps:fold(fun(K, V, A) -> [{{next,K},length(V)}|A] end, [], Free),
+    maps:merge(Free, maps:from_list(Next)).
+
+init_free_1([{_,{prefer,{x,_}=Reg}}|Res]) ->
+    [{x,Reg}|init_free_1(Res)];
+init_free_1([{_,{x,_}=Reg}|Res]) ->
+    [{x,Reg}|init_free_1(Res)];
+init_free_1([{_,{y,Uniq}}|Res]) ->
+    [{Uniq,{y,0}}|init_free_1(Res)];
+init_free_1([{_,{{y,_}=Reg,Uniq}}|Res]) ->
+    [{Uniq,Reg}|init_free_1(Res)];
+init_free_1([{_,z}|Res]) ->
+    [{z,{z,0}}|init_free_1(Res)];
+init_free_1([{_,fr}|Res]) ->
+    [{fr,{fr,0}}|init_free_1(Res)];
+init_free_1([{_,x}|Res]) ->
+    init_free_1(Res);
+init_free_1([]) -> [].
+
+%% Make sure that the pool of xregs is contiguous.
+init_xregs([{x,N},{x,M}|Is]) when N+1 =:= M ->
+    [{x,N}|init_xregs([{x,M}|Is])];
+init_xregs([{x,N}|[{x,_}|_]=Is]) ->
+    [{x,N}|init_xregs([{x,N+1}|Is])];
+init_xregs([{x,_}]=Is) -> Is.
+
+do_linear(L0) ->
+    case set_next_current(L0) of
+        done ->
+            L0;
+        L1 ->
+            L2 = expire_active(L1),
+            L3 = check_inactive(L2),
+            Available = collect_available(L3),
+            L4 = select_register(Available, L3),
+            L = make_cur_active(L4),
+            do_linear(L)
+    end.
+
+set_next_current(#l{unhandled_res=[Cur1|T1],
+                    unhandled_any=[Cur2|T2]}=L) ->
+    case {Cur1,Cur2} of
+        {#i{sort=N1},#i{sort=N2}} when N1 < N2 ->
+            L#l{cur=Cur1,unhandled_res=T1};
+        {_,_} ->
+            L#l{cur=Cur2,unhandled_any=T2}
+    end;
+set_next_current(#l{unhandled_res=[],
+                    unhandled_any=[Cur|T]}=L) ->
+    L#l{cur=Cur,unhandled_any=T};
+set_next_current(#l{unhandled_res=[Cur|T],
+                    unhandled_any=[]}=L) ->
+    L#l{cur=Cur,unhandled_res=T};
+set_next_current(#l{unhandled_res=[],unhandled_any=[]}) ->
+    done.
+
+expire_active(#l{cur=#i{sort=CurBegin},active=Act0}=L0) ->
+    {Act,L} = expire_active(Act0, CurBegin, L0, []),
+    L#l{active=Act}.
+
+expire_active([#i{reg=Reg,rs=Rs0}=I|Is], CurBegin, L0, Acc) ->
+    {_,_} = Reg,                                %Assertion.
+    case overlap_status(Rs0, CurBegin) of
+        ends_before_cur ->
+            L = free_reg(I, L0),
+            expire_active(Is, CurBegin, L, Acc);
+        overlapping ->
+            expire_active(Is, CurBegin, L0, [I|Acc]);
+        not_overlapping ->
+            Rs = strip_before_current(Rs0, CurBegin),
+            L1 = free_reg(I, L0),
+            L = L1#l{inactive=[I#i{rs=Rs}|L1#l.inactive]},
+            expire_active(Is, CurBegin, L, Acc)
+    end;
+expire_active([], _CurBegin, L, Acc) ->
+    {Acc,L}.
+
+check_inactive(#l{cur=#i{sort=CurBegin},inactive=InAct0}=L0) ->
+    {InAct,L} = check_inactive(InAct0, CurBegin, L0, []),
+    L#l{inactive=InAct}.
+
+check_inactive([#i{rs=Rs0}=I|Is], CurBegin, L0, Acc) ->
+    case overlap_status(Rs0, CurBegin) of
+        ends_before_cur ->
+            check_inactive(Is, CurBegin, L0, Acc);
+        not_overlapping ->
+            check_inactive(Is, CurBegin, L0, [I|Acc]);
+        overlapping ->
+            Rs = strip_before_current(Rs0, CurBegin),
+            L1 = L0#l{active=[I#i{rs=Rs}|L0#l.active]},
+            L = reserve_reg(I, L1),
+            check_inactive(Is, CurBegin, L, Acc)
+    end;
+check_inactive([], _CurBegin, L, Acc) ->
+    {Acc,L}.
+
+strip_before_current([{_,E}|Rs], CurBegin) when E =< CurBegin ->
+    strip_before_current(Rs, CurBegin);
+strip_before_current(Rs, _CurBegin) -> Rs.
+
+collect_available(#l{cur=#i{reg={prefer,{_,_}=Prefer}}=I}=L) ->
+    %% Use the preferred register if it is available.
+    Avail = collect_available(L#l{cur=I#i{reg=none}}),
+    case member(Prefer, Avail) of
+        true -> [Prefer];
+        false -> Avail
+    end;
+collect_available(#l{cur=#i{reg={_,_}=ReservedReg}}) ->
+    %% Return the already reserved register.
+    [ReservedReg];
+collect_available(#l{unhandled_res=Unhandled,cur=Cur}=L) ->
+    Free = get_pool(Cur, L),
+
+    %% Note that since the live intervals are constructed from
+    %% SSA form, there cannot be any overlap of the current interval
+    %% with any inactive interval. See [3], page 175. Therefore we
+    %% only have check the unhandled intervals for overlap with
+    %% the current interval. As a further optimization, we only need
+    %% to check the intervals that have reserved registers.
+    collect_available(Unhandled, Cur, Free).
+
+collect_available([#i{pool=Pool1}|Is], #i{pool=Pool2}=Cur, Free)
+  when Pool1 =/= Pool2 ->
+    %% Wrong pool. Ignore this interval.
+    collect_available(Is, Cur, Free);
+collect_available([#i{reg={_,_}=Reg}=I|Is], Cur, Free0) ->
+    case overlaps(I, Cur) of
+        true ->
+            Free = ordsets:del_element(Reg, Free0),
+            collect_available(Is, Cur, Free);
+        false ->
+            collect_available(Is, Cur, Free0)
+    end;
+collect_available([], _, Free) -> Free.
+
+select_register([{_,_}=Reg|_], #l{cur=Cur0,regs=Regs}=L) ->
+    Cur = Cur0#i{reg=Reg},
+    reserve_reg(Cur, L#l{cur=Cur,regs=[{Cur#i.var,Reg}|Regs]});
+select_register([], #l{cur=Cur0,regs=Regs}=L0) ->
+    %% Allocate a new register in the pool.
+    {Reg,L1} = get_next_free(Cur0, L0),
+    Cur = Cur0#i{reg=Reg},
+    L = L1#l{cur=Cur,regs=[{Cur#i.var,Reg}|Regs]},
+    reserve_reg(Cur, L).
+
+make_cur_active(#l{cur=Cur,active=Act}=L) ->
+    L#l{active=[Cur|Act]}.
+
+overlaps(#i{rs=Rs1}, #i{rs=Rs2}) ->
+    are_overlapping(Rs1, Rs2).
+
+overlap_status([{S,E}], CurBegin) ->
+    if
+        E =< CurBegin -> ends_before_cur;
+        CurBegin < S -> not_overlapping;
+        true -> overlapping
+    end;
+overlap_status([{S,E}|Rs], CurBegin) ->
+    if
+        E =< CurBegin ->
+            overlap_status(Rs, CurBegin);
+        S =< CurBegin ->
+            overlapping;
+        true ->
+            not_overlapping
+    end.
+
+reserve_reg(#i{reg={_,_}=Reg}=I, L) ->
+    FreeRegs0 = get_pool(I, L),
+    FreeRegs = ordsets:del_element(Reg, FreeRegs0),
+    update_pool(I, FreeRegs, L).
+
+free_reg(#i{reg={_,_}=Reg}=I, L) ->
+    FreeRegs0 = get_pool(I, L),
+    FreeRegs = ordsets:add_element(Reg, FreeRegs0),
+    update_pool(I, FreeRegs, L).
+
+get_pool(#i{pool=Pool}, #l{free=Free}) ->
+    map_get(Pool, Free).
+
+update_pool(#i{pool=Pool}, New, #l{free=Free0}=L) ->
+    Free = Free0#{Pool:=New},
+    L#l{free=Free}.
+
+get_next_free(#i{pool=Pool}, #l{free=Free0}=L0) ->
+    K = {next,Pool},
+    N = map_get(K, Free0),
+    Free = Free0#{K:=N+1},
+    L = L0#l{free=Free},
+    if
+        is_integer(Pool) -> {{y,N},L};
+        is_atom(Pool)    -> {{Pool,N},L}
+    end.
+
+%%%
+%%% Interval utilities.
+%%%
+
+are_overlapping([R|Rs1], Rs2) ->
+    case are_overlapping_1(R, Rs2) of
+        true ->
+            true;
+        false ->
+            are_overlapping(Rs1, Rs2)
+    end;
+are_overlapping([], _) -> false.
+
+are_overlapping_1({_S1,E1}, [{S2,_E2}|_]) when E1 < S2 ->
+    false;
+are_overlapping_1({S1,E1}=R, [{S2,E2}|Rs]) ->
+    (S2 < E1 andalso E2 > S1) orelse are_overlapping_1(R, Rs);
+are_overlapping_1({_,_}, []) -> false.
+
+%%%
+%%% Utilities.
+%%%
+
+%% is_loop_header(L, Blocks) -> false|true.
+%%  Check whether the block is a loop header.
+
+is_loop_header(L, Blocks) ->
+    %% We KNOW that a loop header must start with a peek_message
+    %% instruction.
+    case map_get(L, Blocks) of
+        #b_blk{is=[#b_set{op=peek_message}|_]} -> true;
+        _ -> false
+    end.
+
+rel2fam(S0) ->
+    S1 = sofs:relation(S0),
+    S = sofs:rel2fam(S1),
+    sofs:to_external(S).
+
+split_phis(Is) ->
+    splitwith(fun(#b_set{op=Op}) -> Op =:= phi end, Is).
+
+is_yreg({y,_}) -> true;
+is_yreg({x,_}) -> false;
+is_yreg({z,_}) -> false;
+is_yreg({fr,_}) -> false.
+
+new_vars([Base|Vs0], Count0) ->
+    {V,Count1} = new_var(Base, Count0),
+    {Vs,Count} = new_vars(Vs0, Count1),
+    {[V|Vs],Count};
+new_vars([], Count) -> {[],Count}.
+
+new_var({Base,Int}, Count)  ->
+    true = is_integer(Int),                     %Assertion.
+    {#b_var{name={Base,Count}},Count+1};
+new_var(Base, Count) ->
+    {#b_var{name={Base,Count}},Count+1}.
diff --git a/lib/compiler/src/beam_ssa_recv.erl b/lib/compiler/src/beam_ssa_recv.erl
new file mode 100644
index 0000000000..1e0e1ecac2
--- /dev/null
+++ b/lib/compiler/src/beam_ssa_recv.erl
@@ -0,0 +1,278 @@
+%%
+%% %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(beam_ssa_recv).
+-export([module/2]).
+
+%%%
+%%% In code such as:
+%%%
+%%%    Ref = make_ref(),        %Or erlang:monitor(process, Pid)
+%%%      .
+%%%      .
+%%%      .
+%%%    receive
+%%%       {Ref,Reply} -> Reply
+%%%    end.
+%%%
+%%% we know that none of the messages that exist in the message queue
+%%% before the call to make_ref/0 can be matched out in the receive
+%%% statement. Therefore we can avoid going through the entire message
+%%% queue if we introduce two new instructions (here written as
+%%% BIFs in pseudo-Erlang):
+%%%
+%%%    recv_mark(SomeUniqInteger),
+%%%    Ref = make_ref(),
+%%%      .
+%%%      .
+%%%      .
+%%%    recv_set(SomeUniqInteger),
+%%%    receive
+%%%       {Ref,Reply} -> Reply
+%%%    end.
+%%%
+%%% The recv_mark/1 instruction will save the current position and
+%%% SomeUniqInteger in the process context. The recv_set
+%%% instruction will verify that SomeUniqInteger is still stored
+%%% in the process context. If it is, it will set the current pointer
+%%% for the message queue (the next message to be read out) to the
+%%% position that was saved by recv_mark/1.
+%%%
+%%% The remove_message instruction must be modified to invalidate
+%%% the information stored by the previous recv_mark/1, in case there
+%%% is another receive executed between the calls to recv_mark/1 and
+%%% recv_set/1.
+%%%
+%%% We use a reference to a label (i.e. a position in the loaded code)
+%%% as the SomeUniqInteger.
+%%%
+
+-include("beam_ssa.hrl").
+-import(lists, [all/2,reverse/2]).
+
+-spec module(beam_ssa:b_module(), [compile:option()]) ->
+                    {'ok',beam_ssa:b_module()}.
+
+module(#b_module{body=Fs0}=Module, _Opts) ->
+    Fs = [function(F) || F <- Fs0],
+    {ok,Module#b_module{body=Fs}}.
+
+%%%
+%%% Local functions.
+%%%
+
+function(#b_function{anno=Anno,bs=Blocks0}=F) ->
+    try
+        Blocks = opt(Blocks0),
+        F#b_function{bs=Blocks}
+    catch
+        Class:Error:Stack ->
+            #{func_info:={_,Name,Arity}} = Anno,
+            io:fwrite("Function: ~w/~w\n", [Name,Arity]),
+            erlang:raise(Class, Error, Stack)
+    end.
+
+opt(Blocks) ->
+    Linear = beam_ssa:linearize(Blocks),
+    opt(Linear, Blocks, []).
+
+opt([{L,#b_blk{is=[#b_set{op=peek_message}|_]}=Blk0}|Bs], Blocks0, Preds) ->
+    %% Search for a suitable reference creating call in one of the predecessor
+    %% blocks. Whether we find such a call or not, we always clear the
+    %% the list of predecessors to ensure that any nested receive can't
+    %% search above the current receive.
+    case recv_opt(Preds, L, Blocks0) of
+        {yes,Blocks1} ->
+            Blk = beam_ssa:add_anno(recv_set, L, Blk0),
+            Blocks = Blocks1#{L:=Blk},
+            opt(Bs, Blocks, []);
+        no ->
+            opt(Bs, Blocks0, [])
+    end;
+opt([{L,_}|Bs], Blocks, Preds) ->
+    opt(Bs, Blocks, [L|Preds]);
+opt([], Blocks, _) -> Blocks.
+
+recv_opt([L|Ls], RecvLbl, Blocks) ->
+    #b_blk{is=Is0} = Blk0 = map_get(L, Blocks),
+    case recv_opt_is(Is0, RecvLbl, Blocks, []) of
+        {yes,Is} ->
+            Blk = Blk0#b_blk{is=Is},
+            {yes,Blocks#{L:=Blk}};
+        no ->
+            recv_opt(Ls, RecvLbl, Blocks)
+    end;
+recv_opt([], _, _Blocks) -> no.
+
+recv_opt_is([#b_set{op=call}=I0|Is], RecvLbl, Blocks0, Acc) ->
+    case makes_ref(I0, Blocks0) of
+        no ->
+            recv_opt_is(Is, RecvLbl, Blocks0, [I0|Acc]);
+        {yes,Ref} ->
+            case opt_ref_used(RecvLbl, Ref, Blocks0) of
+                false ->
+                    recv_opt_is(Is, RecvLbl, Blocks0, [I0|Acc]);
+                true ->
+                    I = beam_ssa:add_anno(recv_mark, RecvLbl, I0),
+                    {yes,reverse(Acc, [I|Is])}
+            end
+    end;
+recv_opt_is([I|Is], RecvLbl, Blocks, Acc) ->
+    recv_opt_is(Is, RecvLbl, Blocks, [I|Acc]);
+recv_opt_is([], _, _, _) -> no.
+
+makes_ref(#b_set{dst=Dst,args=[Func0|_]}, Blocks) ->
+    Func = case Func0 of
+               #b_remote{mod=#b_literal{val=erlang},
+                         name=#b_literal{val=Name},arity=A0} ->
+                   {Name,A0};
+               _ ->
+                   none
+           end,
+    case Func of
+        {make_ref,0} ->
+            {yes,Dst};
+        {monitor,2} ->
+            {yes,Dst};
+        {spawn_monitor,A} when A =:= 1; A =:= 3 ->
+            ref_in_tuple(Dst, Blocks);
+        _ ->
+            no
+    end.
+
+ref_in_tuple(Tuple, Blocks) ->
+    F = fun(#b_set{op=get_tuple_element,dst=Ref,
+                   args=[#b_var{}=Tup,#b_literal{val=1}]}, no)
+              when Tup =:= Tuple -> {yes,Ref};
+           (_, A) -> A
+        end,
+    beam_ssa:fold_instrs_rpo(F, [0], no, Blocks).
+
+opt_ref_used(RecvLbl, Ref, Blocks) ->
+    Vs = #{Ref=>ref,ref=>Ref,ref_matched=>false},
+    case opt_ref_used_1(RecvLbl, Vs, Blocks) of
+        used -> true;
+        not_used -> false;
+        done -> false
+    end.
+
+opt_ref_used_1(L, Vs0, Blocks) ->
+    #b_blk{is=Is} = Blk = map_get(L, Blocks),
+    case opt_ref_used_is(Is, Vs0) of
+        #{}=Vs ->
+            opt_ref_used_last(Blk, Vs, Blocks);
+        Result ->
+            Result
+    end.
+
+opt_ref_used_is([#b_set{op=peek_message,dst=Msg}|Is], Vs0) ->
+    Vs = Vs0#{Msg=>message},
+    opt_ref_used_is(Is, Vs);
+opt_ref_used_is([#b_set{op={bif,Bif},args=Args,dst=Dst}=I|Is],
+                Vs0) ->
+    S = case Bif of
+            '=:=' -> true;
+            '==' -> true;
+            _ -> none
+        end,
+    case S of
+        none ->
+            Vs = update_vars(I, Vs0),
+            opt_ref_used_is(Is, Vs);
+        Bool when is_boolean(Bool) ->
+            case is_ref_msg_comparison(Args, Vs0) of
+                true ->
+                    Vs = Vs0#{Dst=>{is_ref,Bool}},
+                    opt_ref_used_is(Is, Vs);
+                false ->
+                    opt_ref_used_is(Is, Vs0)
+            end
+    end;
+opt_ref_used_is([#b_set{op=remove_message}|_], Vs) ->
+    case Vs of
+        #{ref_matched:=true} ->
+            used;
+        #{ref_matched:=false} ->
+            not_used
+    end;
+opt_ref_used_is([#b_set{op=recv_next}|_], _Vs) ->
+    done;
+opt_ref_used_is([#b_set{op=wait_timeout}|_], _Vs) ->
+    done;
+opt_ref_used_is([#b_set{op=wait}|_], _Vs) ->
+    done;
+opt_ref_used_is([#b_set{}=I|Is], Vs0) ->
+    Vs = update_vars(I, Vs0),
+    opt_ref_used_is(Is, Vs);
+opt_ref_used_is([], Vs) -> Vs.
+
+opt_ref_used_last(#b_blk{last=Last}=Blk, Vs, Blocks) ->
+    case Last of
+        #b_br{bool=#b_var{}=Bool,succ=Succ,fail=Fail} ->
+            case Vs of
+                #{Bool:={is_ref,Matched}} ->
+                    ref_used_in([{Succ,Vs#{ref_matched:=Matched}},
+                                 {Fail,Vs#{ref_matched:=not Matched}}],
+                                Blocks);
+                #{} ->
+                    ref_used_in([{Succ,Vs},{Fail,Vs}], Blocks)
+            end;
+        _ ->
+            SuccVs = [{Succ,Vs} || Succ <- beam_ssa:successors(Blk)],
+            ref_used_in(SuccVs, Blocks)
+    end.
+
+ref_used_in([{L,Vs0}|Ls], Blocks) ->
+    case opt_ref_used_1(L, Vs0, Blocks) of
+        not_used ->
+            not_used;
+        used ->
+            case ref_used_in(Ls, Blocks) of
+                done -> used;
+                Result -> Result
+            end;
+        done -> ref_used_in(Ls, Blocks)
+    end;
+ref_used_in([], _) -> done.
+
+update_vars(#b_set{args=Args,dst=Dst}, Vs) ->
+    Vars = [V || #b_var{}=V <- Args],
+    All = all(fun(Var) ->
+                      case Vs of
+                          #{Var:=message} -> true;
+                          #{} -> false
+                      end
+              end, Vars),
+    case All of
+        true -> Vs#{Dst=>message};
+        false -> Vs
+    end.
+
+%% is_ref_msg_comparison(Args, Variables) -> true|false.
+%%  Return 'true' if Args denotes a comparison between the
+%%  reference and message or part of the message.
+
+is_ref_msg_comparison([#b_var{}=V1,#b_var{}=V2], Vs) ->
+    case Vs of
+        #{V1:=ref,V2:=message} -> true;
+        #{V1:=message,V2:=ref} -> true;
+        #{} -> false
+    end;
+is_ref_msg_comparison(_, _) -> false.
diff --git a/lib/compiler/src/beam_ssa_share.erl b/lib/compiler/src/beam_ssa_share.erl
new file mode 100644
index 0000000000..73983bd34a
--- /dev/null
+++ b/lib/compiler/src/beam_ssa_share.erl
@@ -0,0 +1,374 @@
+%%
+%% %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%
+%%
+
+%%
+%% Share code for semantically equivalent blocks referred to
+%% to by `br` and `switch` instructions.
+%%
+%% A similar optimization is done in beam_jump, but doing it here as
+%% well is beneficial as it may enable other optimizations. If there
+%% are many semantically equivalent clauses, this optimization can
+%% substanstially decrease compilation times.
+%%
+%% block/2 is called from the liveness optimization pass in
+%% beam_ssa_opt, as code sharing helps the liveness pass and vice
+%% versa.
+%%
+
+-module(beam_ssa_share).
+-export([module/2,block/2]).
+
+-include("beam_ssa.hrl").
+
+-import(lists, [keyfind/3,reverse/1,sort/1]).
+
+-spec module(beam_ssa:b_module(), [compile:option()]) ->
+                    {'ok',beam_ssa:b_module()}.
+
+module(#b_module{body=Fs0}=Module, _Opts) ->
+    Fs = [function(F) || F <- Fs0],
+    {ok,Module#b_module{body=Fs}}.
+
+-spec block(Blk0, Blocks0) -> Blk when
+      Blk0 :: beam_ssa:b_blk(),
+      Blocks0 :: beam_ssa:block_map(),
+      Blk :: beam_ssa:b_blk().
+
+block(#b_blk{last=Last0}=Blk, Blocks) ->
+    case share_terminator(Last0, Blocks) of
+        none -> Blk;
+        Last -> Blk#b_blk{last=beam_ssa:normalize(Last)}
+    end.
+
+%%%
+%%% Local functions.
+%%%
+
+function(#b_function{anno=Anno,bs=Blocks0}=F) ->
+    try
+        PO = reverse(beam_ssa:rpo(Blocks0)),
+        {Blocks1,Changed} = blocks(PO, Blocks0, false),
+        Blocks = case Changed of
+                     true ->
+                         beam_ssa:trim_unreachable(Blocks1);
+                     false ->
+                         Blocks0
+                 end,
+        F#b_function{bs=Blocks}
+    catch
+        Class:Error:Stack ->
+            #{func_info:={_,Name,Arity}} = Anno,
+            io:fwrite("Function: ~w/~w\n", [Name,Arity]),
+            erlang:raise(Class, Error, Stack)
+    end.
+
+blocks([L|Ls], Blocks, Changed) ->
+    #b_blk{last=Last0} = Blk0 = map_get(L, Blocks),
+    case block(Blk0, Blocks) of
+        #b_blk{last=Last0} ->
+            blocks(Ls, Blocks, Changed);
+        #b_blk{}=Blk ->
+            blocks(Ls, Blocks#{L:=Blk}, true)
+    end;
+blocks([], Blocks, Changed) ->
+    {Blocks,Changed}.
+
+share_terminator(#b_br{bool=#b_var{},succ=Succ0,fail=Fail0}=Br, Blocks) ->
+    {Succ,SuccBlk} = shortcut_nonempty_block(Succ0, Blocks),
+    {Fail,FailBlk} = shortcut_nonempty_block(Fail0, Blocks),
+    case are_equivalent(Succ, SuccBlk, Fail, FailBlk, Blocks) of
+        true ->
+            %% The blocks are semantically equivalent.
+            Br#b_br{succ=Succ,fail=Succ};
+        false ->
+            if
+                Succ =:= Succ0, Fail =:= Fail0 ->
+                    %% None of blocks were cut short.
+                    none;
+                true ->
+                    %% One or both labels were cut short
+                    %% to avoid jumping to an empty block.
+                    Br#b_br{succ=Succ,fail=Fail}
+            end
+    end;
+share_terminator(#b_switch{}=Sw, Blocks) ->
+    share_switch(Sw, Blocks);
+share_terminator(_Last, _Blocks) -> none.
+
+%% Test whether the two blocks are semantically equivalent.  This
+%% function is specially optimized to return `false` as fast as
+%% possible if the blocks are not equivalent, as that is the common
+%% case.
+
+are_equivalent(_Succ, _, ?BADARG_BLOCK, _, _Blocks) ->
+    %% ?BADARG_BLOCK is special. Sharing could be incorrect.
+    false;
+are_equivalent(_Succ, #b_blk{is=Is1,last=#b_ret{arg=RetVal1}=Ret1},
+         _Fail, #b_blk{is=Is2,last=#b_ret{arg=RetVal2}=Ret2}, _Blocks) ->
+    case {RetVal1,RetVal2} of
+        {#b_literal{},#b_literal{}} ->
+            case RetVal1 =:= RetVal2 of
+                true ->
+                    %% The return values are identical literals. We
+                    %% only need to compare the canonicalized bodies.
+                    Can1 = canonical_is(Is1),
+                    Can2 = canonical_is(Is2),
+                    Can1 =:= Can2;
+                false ->
+                    %% Non-equal literals.
+                    false
+            end;
+        {#b_var{},#b_var{}} ->
+            %% The return values are varibles. We must canonicalize
+            %% the blocks (including returns) and compare them.
+            Can1 = canonical_is(Is1 ++ [Ret1]),
+            Can2 = canonical_is(Is2 ++ [Ret2]),
+            Can1 =:= Can2;
+        {_,_} ->
+            %% One literal and one variable.
+            false
+    end;
+are_equivalent(Succ,
+         #b_blk{is=Is1,
+                last=#b_br{bool=#b_literal{val=true},
+                           succ=Target}},
+         Fail,
+         #b_blk{is=Is2,
+                last=#b_br{bool=#b_literal{val=true},
+                           succ=Target}},
+         Blocks) ->
+    %% Both blocks end with an unconditional branch to the
+    %% same target block. If the target block has phi nodes,
+    %% we must pick up the values from the phi nodes and
+    %% compare them.
+    #b_blk{is=Is} = map_get(Target, Blocks),
+    Phis1 = canonical_terminator_phis(Is, Succ),
+    Phis2 = canonical_terminator_phis(Is, Fail),
+    case {Phis1,Phis2} of
+        {[#b_set{args=[#b_literal{}]}|_],_} when Phis1 =/= Phis2 ->
+            %% Different values are used in the phi nodes.
+            false;
+        {_,[#b_set{args=[#b_literal{}]}|_]} when Phis1 =/= Phis2 ->
+            %% Different values are used in the phi nodes.
+            false;
+        {_,_} ->
+            %% The values in the phi nodes are variables or identical
+            %% literals. We must canonicalize the blocks and compare
+            %% them.
+            Can1 = canonical_is(Is1 ++ Phis1),
+            Can2 = canonical_is(Is2 ++ Phis2),
+            Can1 =:= Can2
+    end;
+are_equivalent(Succ0, #b_blk{is=Is1,last=#b_br{bool=#b_var{},fail=Same}},
+         Fail0, #b_blk{is=Is2,last=#b_br{bool=#b_var{},fail=Same}},
+         Blocks) ->
+    %% Two-way branches with identical failure labels. First compare the
+    %% canonicalized bodies of the blocks.
+    case canonical_is(Is1) =:= canonical_is(Is2) of
+        false ->
+            %% Different bodies.
+            false;
+        true ->
+            %% Bodies were equal. That is fairly uncommon, so to keep
+            %% the code simple we will rewrite the `br` to a `switch`
+            %% and let share_switch/2 do the work of following the
+            %% branches.
+            Sw = #b_switch{arg=#b_var{name=not_used},fail=Fail0,
+                           list=[{#b_literal{},Succ0}]},
+            #b_switch{fail=Fail,list=[{_,Succ}]} = share_switch(Sw, Blocks),
+            Fail =:= Succ
+    end;
+are_equivalent(_, _, _, _, _) -> false.
+
+share_switch(#b_switch{fail=Fail0,list=List0}=Sw, Blocks) ->
+    Prep = share_prepare_sw([{value,Fail0}|List0], Blocks, 0, []),
+    Res = do_share_switch(Prep, Blocks, []),
+    [{_,Fail}|List] = [VL || {_,VL} <- sort(Res)],
+    Sw#b_switch{fail=Fail,list=List}.
+
+share_prepare_sw([{V,L0}|T], Blocks, N, Acc) ->
+    {L,_Blk} = shortcut_nonempty_block(L0, Blocks),
+    share_prepare_sw(T, Blocks, N+1, [{{L,#{}},{N,{V,L}}}|Acc]);
+share_prepare_sw([], _, _, Acc) -> Acc.
+
+do_share_switch(Prep, Blocks, Acc) ->
+    Map = share_switch_1(Prep, Blocks, #{}),
+    share_switch_2(maps:values(Map), Blocks, Acc).
+
+share_switch_1([{Next0,Res}|T], Blocks, Map) ->
+    {Can,Next} = canonical_block(Next0, Blocks),
+    case Map of
+        #{Can:=Ls} ->
+            share_switch_1(T, Blocks, Map#{Can:=[{Next,Res}|Ls]});
+        #{} ->
+            share_switch_1(T, Blocks, Map#{Can=>[{Next,Res}]})
+    end;
+share_switch_1([], _Blocks, Map) -> Map.
+
+share_switch_2([[{_,{N,Res}}]|T], Blocks, Acc) ->
+    %% This block is not equivalent to any other block.
+    share_switch_2(T, Blocks, [{N,Res}|Acc]);
+share_switch_2([[{done,{_,{_,Common}}}|_]=Eqs|T], Blocks, Acc0) ->
+    %% Two or more blocks are semantically equivalent, and all blocks
+    %% are either terminated with a `ret` or a `br` to the same target
+    %% block. Replace the labels in the `switch` for all of those
+    %% blocks with the label for the first of the blocks.
+    Acc = [{N,{V,Common}} || {done,{N,{V,_}}} <- Eqs] ++ Acc0,
+    share_switch_2(T, Blocks, Acc);
+share_switch_2([[{_,_}|_]=Prep|T], Blocks, Acc0) ->
+    %% Two or more blocks are semantically equivalent, but they have
+    %% different successful successor blocks. Now we must check
+    %% recursively whether the successor blocks are equivalent too.
+    Acc = do_share_switch(Prep, Blocks, Acc0),
+    share_switch_2(T, Blocks, Acc);
+share_switch_2([], _, Acc) -> Acc.
+
+canonical_block({L,VarMap0}, Blocks) ->
+    #b_blk{is=Is,last=Last0} = map_get(L, Blocks),
+    case canonical_terminator(L, Last0, Blocks) of
+        none ->
+            %% The block has a terminator that we don't handle.
+            {{none,L},done};
+        {Last,done} ->
+            %% The block ends with a `ret` or an unconditional `br` to
+            %% another block.
+            {Can,_VarMap} = canonical_is(Is ++ Last, VarMap0, []),
+            {Can,done};
+        {Last,Next} ->
+            %% The block ends with a conditional branch.
+            {Can,VarMap} = canonical_is(Is ++ Last, VarMap0, []),
+            {Can,{Next,VarMap}}
+    end.
+
+%% Translate a sequence of instructions to a canonical representation. If the
+%% canonical representation of two blocks compare equal, the blocks are
+%% semantically equivalent. The following translations are done:
+%%
+%%    * Variables defined in the instruction sequence are replaced with
+%%    {var,0}, {var,1}, and so on. Free variables are not changed.
+%%
+%%    * `location` annotations that would produce a `line` instruction are
+%%    kept. All other annotations are cleared.
+%%
+%%    * Instructions are repackaged into tuples instead of into the
+%%    usual records. The main reason is to avoid violating the types for
+%%    the SSA records. We can simplify things a little by linking the
+%%    instructions directly instead of putting them into a list.
+
+canonical_is(Is) ->
+    {Can,_} = canonical_is(Is, #{}, []),
+    Can.
+
+canonical_is([#b_set{op=Op,dst=Dst,args=Args0}=I|Is], VarMap0, Acc) ->
+    Args = [canonical_arg(Arg, VarMap0) || Arg <-Args0],
+    Var = {var,map_size(VarMap0)},
+    VarMap = VarMap0#{Dst=>Var},
+    LineAnno = case Op of
+                   bs_match ->
+                       %% The location annotation for a bs_match instruction
+                       %% is only used in warnings, never to emit a `line`
+                       %% instruction. Therefore, it should not be included.
+                       [];
+                   _ ->
+                       %% The location annotation will be used in a `line`
+                       %% instruction. It must be included.
+                       beam_ssa:get_anno(location, I, none)
+               end,
+    canonical_is(Is, VarMap, {Op,LineAnno,Var,Args,Acc});
+canonical_is([#b_ret{arg=Arg}], VarMap, Acc0) ->
+    Acc1 = case Acc0 of
+               {call,_Anno,Var,[#b_local{}|_]=Args,PrevAcc} ->
+                   %% This is a tail-recursive call to a local function.
+                   %% There will be no line instruction generated;
+                   %% thus, the annotation is not significant.
+                   {call,[],Var,Args,PrevAcc};
+               _ ->
+                   Acc0
+           end,
+    {{ret,canonical_arg(Arg, VarMap),Acc1},VarMap};
+canonical_is([#b_br{bool=#b_var{}=Arg,fail=Fail}], VarMap, Acc) ->
+    %% A previous buggy version of this code omitted the canonicalized
+    %% argument in the return value. Unfortunately, that worked most
+    %% of the time, except when `br` terminator referenced a variable
+    %% defined in a previous block instead of in the same block.
+    {{br,canonical_arg(Arg, VarMap),succ,Fail,Acc},VarMap};
+canonical_is([#b_br{succ=Succ}], VarMap, Acc) ->
+    {{br,Succ,Acc},VarMap};
+canonical_is([], VarMap, Acc) ->
+    {Acc,VarMap}.
+
+canonical_terminator(_L, #b_ret{}=Ret, _Blocks) ->
+    {[Ret],done};
+canonical_terminator(L, #b_br{bool=#b_literal{val=true},succ=Succ}=Br, Blocks) ->
+    #b_blk{is=Is} = map_get(Succ, Blocks),
+    case canonical_terminator_phis(Is, L) of
+        [] ->
+            {[],Succ};
+        [_|_]=Phis ->
+            {Phis ++ [Br],done}
+    end;
+canonical_terminator(_L, #b_br{bool=#b_var{},succ=Succ}=Br, _Blocks) ->
+    {[Br],Succ};
+canonical_terminator(_, _, _) -> none.
+
+canonical_terminator_phis([#b_set{op=phi,args=PhiArgs}=Phi|Is], L) ->
+    {Value,L} = keyfind(L, 2, PhiArgs),
+    [Phi#b_set{op=copy,args=[Value]}|canonical_terminator_phis(Is, L)];
+canonical_terminator_phis([#b_set{op=peek_message}=I|_], L) ->
+    %% We could get stuck into an infinite loop if we allowed the
+    %% comparisons to continue into this block. Force an unequal
+    %% compare with all other predecessors of this block.
+    [I#b_set{op=copy,args=[#b_literal{val=L}]}];
+canonical_terminator_phis(_, _) -> [].
+
+canonical_arg(#b_var{}=Var, VarMap) ->
+    case VarMap of
+        #{Var:=CanonicalVar} ->
+            CanonicalVar;
+        #{} ->
+            Var
+    end;
+canonical_arg(#b_remote{mod=Mod,name=Name}, VarMap) ->
+    {remote,canonical_arg(Mod, VarMap),
+     canonical_arg(Name, VarMap)};
+canonical_arg(Other, _VarMap) -> Other.
+
+%% Shortcut branches to empty blocks if safe.
+
+shortcut_nonempty_block(L, Blocks) ->
+    case map_get(L, Blocks) of
+        #b_blk{is=[],last=#b_br{bool=#b_literal{val=true},succ=Succ}}=Blk ->
+            %% This block is empty.
+            case is_forbidden(Succ, Blocks) of
+                false ->
+                    shortcut_nonempty_block(Succ, Blocks);
+                true ->
+                    {L,Blk}
+            end;
+        #b_blk{}=Blk ->
+            {L,Blk}
+    end.
+
+is_forbidden(L, Blocks) ->
+    case map_get(L, Blocks) of
+        #b_blk{is=[#b_set{op=phi}|_]} -> true;
+        #b_blk{is=[#b_set{op=peek_message}|_]} -> true;
+        #b_blk{} -> false
+    end.
diff --git a/lib/compiler/src/beam_ssa_type.erl b/lib/compiler/src/beam_ssa_type.erl
new file mode 100644
index 0000000000..3c06c83e2e
--- /dev/null
+++ b/lib/compiler/src/beam_ssa_type.erl
@@ -0,0 +1,1967 @@
+%%
+%% %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(beam_ssa_type).
+-export([opt_start/4, opt_continue/4, opt_finish/3]).
+
+-include("beam_ssa_opt.hrl").
+-import(lists, [all/2,any/2,droplast/1,foldl/3,last/1,member/2,
+                keyfind/3,reverse/1,reverse/2,
+                sort/1,split/2]).
+
+-define(UNICODE_INT, #t_integer{elements={0,16#10FFFF}}).
+
+-record(d,
+        {ds :: #{beam_ssa:b_var():=beam_ssa:b_set()},
+         ls :: #{beam_ssa:label():=type_db()},
+         once :: cerl_sets:set(beam_ssa:b_var()),
+         func_id :: func_id(),
+         func_db :: func_info_db(),
+         sub = #{} :: #{beam_ssa:b_var():=beam_ssa:value()},
+         ret_type = [] :: [type()]}).
+
+-define(ATOM_SET_SIZE, 5).
+
+%% Records that represent type information.
+-record(t_atom, {elements=any :: 'any' | [atom()]}).
+-record(t_integer, {elements=any :: 'any' | {integer(),integer()}}).
+-record(t_bs_match, {type :: type()}).
+-record(t_tuple, {size=0 :: integer(),
+                  exact=false :: boolean(),
+                  %% Known element types (1-based index), unknown elements are
+                  %% are assumed to be 'any'.
+                  elements=#{} :: #{ non_neg_integer() => type() }}).
+
+-type type() :: 'any' | 'none' |
+                #t_atom{} | #t_integer{} | #t_bs_match{} | #t_tuple{} |
+                {'binary',pos_integer()} | 'cons' | 'float' | 'list' | 'map' | 'nil' | 'number'.
+-type type_db() :: #{beam_ssa:var_name():=type()}.
+
+-spec opt_start(Linear, Args, Anno, FuncDb) -> {Linear, FuncDb} when
+      Linear :: [{non_neg_integer(), beam_ssa:b_blk()}],
+      Args :: [beam_ssa:b_var()],
+      Anno :: beam_ssa:anno(),
+      FuncDb :: func_info_db().
+opt_start(Linear, Args, Anno, FuncDb) ->
+    %% This is the first run through the module, so our arg_types can be
+    %% incomplete as we may not have visited all call sites at least once.
+    Ts = maps:from_list([{V,any} || #b_var{}=V <- Args]),
+    opt_continue_1(Linear, Args, get_func_id(Anno), Ts, FuncDb).
+
+-spec opt_continue(Linear, Args, Anno, FuncDb) -> {Linear, FuncDb} when
+      Linear :: [{non_neg_integer(), beam_ssa:b_blk()}],
+      Args :: [beam_ssa:b_var()],
+      Anno :: beam_ssa:anno(),
+      FuncDb :: func_info_db().
+opt_continue(Linear, Args, Anno, FuncDb) ->
+    Id = get_func_id(Anno),
+    case FuncDb of
+        #{ Id := #func_info{exported=false,arg_types=ArgTypes} } ->
+            %% This is a local function and we're guaranteed to have visited
+            %% every call site at least once, so we know that the parameter
+            %% types are at least as narrow as the join of all argument types.
+            Ts = join_arg_types(Args, ArgTypes, Anno),
+            opt_continue_1(Linear, Args, Id, Ts, FuncDb);
+        #{} ->
+            %% We can't infer the parameter types of exported functions, nor
+            %% the ones where module-level optimization is disabled, but
+            %% running the pass again could still help other functions.
+            Ts = maps:from_list([{V,any} || #b_var{}=V <- Args]),
+            opt_continue_1(Linear, Args, Id, Ts, FuncDb)
+    end.
+
+join_arg_types(Args, ArgTypes, Anno) ->
+    %% We suppress type optimization for parameters that have already been
+    %% optimized by another pass, as they may have done things we have no idea
+    %% how to interpret and running them over could generate incorrect code.
+    ParamTypes = maps:get(parameter_type_info, Anno, #{}),
+    Ts0 = join_arg_types_1(Args, ArgTypes, #{}),
+    maps:fold(fun(Arg, _V, Ts) ->
+                      maps:put(Arg, any, Ts)
+              end, Ts0, ParamTypes).
+
+join_arg_types_1([Arg | Args], [TM | TMs], Ts) when map_size(TM) =/= 0 ->
+    join_arg_types_1(Args, TMs, Ts#{ Arg => join(maps:values(TM))});
+join_arg_types_1([Arg | Args], [_TM | TMs], Ts) ->
+    join_arg_types_1(Args, TMs, Ts#{ Arg => any });
+join_arg_types_1([], [], Ts) ->
+    Ts.
+
+-spec opt_continue_1(Linear, Args, Id, Ts, FuncDb) -> Result when
+      Linear :: [{non_neg_integer(), beam_ssa:b_blk()}],
+      Args :: [beam_ssa:b_var()],
+      Id :: func_id(),
+      Ts :: type_db(),
+      FuncDb :: func_info_db(),
+      Result :: {Linear, FuncDb}.
+opt_continue_1(Linear0, Args, Id, Ts, FuncDb0) ->
+    UsedOnce = used_once(Linear0, Args),
+    FakeCall = #b_set{op=call,args=[#b_remote{mod=#b_literal{val=unknown},
+                                              name=#b_literal{val=unknown},
+                                              arity=0}]},
+    Defs = maps:from_list([{Var,FakeCall#b_set{dst=Var}} ||
+                              #b_var{}=Var <- Args]),
+
+    D = #d{ func_db=FuncDb0,
+            func_id=Id,
+            ds=Defs,
+            ls=#{0=>Ts,?BADARG_BLOCK=>#{}},
+            once=UsedOnce },
+
+    {Linear, FuncDb, NewRet} = opt(Linear0, D, []),
+
+    case FuncDb of
+        #{ Id := Entry0 } ->
+            Entry = Entry0#func_info{ret_type=NewRet},
+            {Linear, FuncDb#{ Id := Entry }};
+        #{} ->
+            %% Module-level optimizations have been turned off for this
+            %% function.
+            {Linear, FuncDb}
+    end.
+
+-spec opt_finish(Args, Anno, FuncDb) -> {Anno, FuncDb} when
+      Args :: [beam_ssa:b_var()],
+      Anno :: beam_ssa:anno(),
+      FuncDb :: func_info_db().
+opt_finish(Args, Anno, FuncDb) ->
+    Id = get_func_id(Anno),
+    case FuncDb of
+        #{ Id := #func_info{exported=false,arg_types=ArgTypes} } ->
+            ParamInfo0 = maps:get(parameter_type_info, Anno, #{}),
+            ParamInfo = opt_finish_1(Args, ArgTypes, ParamInfo0),
+            {Anno#{ parameter_type_info => ParamInfo }, FuncDb};
+        #{} ->
+            {Anno, FuncDb}
+    end.
+
+opt_finish_1([Arg | Args], [TypeMap | TypeMaps], ParamInfo)
+  when is_map_key(Arg, ParamInfo); %% See join_arg_types/3
+       map_size(TypeMap) =:= 0 ->
+    opt_finish_1(Args, TypeMaps, ParamInfo);
+opt_finish_1([Arg | Args], [TypeMap | TypeMaps], ParamInfo0) ->
+    case join(maps:values(TypeMap)) of
+        any ->
+            opt_finish_1(Args, TypeMaps, ParamInfo0);
+        none ->
+            %% This function will never be called. Pretend that we don't
+            %% know the type for this argument.
+            opt_finish_1(Args, TypeMaps, ParamInfo0);
+        JoinedType ->
+            JoinedType = verified_type(JoinedType),
+            ParamInfo = ParamInfo0#{ Arg => validator_anno(JoinedType) },
+            opt_finish_1(Args, TypeMaps, ParamInfo)
+    end;
+opt_finish_1([], [], ParamInfo) ->
+    ParamInfo.
+
+validator_anno(#t_tuple{size=Size,exact=Exact,elements=Elements0}) ->
+    Elements = maps:fold(fun(Index, Type, Acc) ->
+                                 Key = beam_validator:type_anno(integer, Index),
+                                 Acc#{ Key => validator_anno(Type) }
+                         end, #{}, Elements0),
+    beam_validator:type_anno(tuple, Size, Exact, Elements);
+validator_anno(#t_integer{elements={Same,Same}}) ->
+    beam_validator:type_anno(integer, Same);
+validator_anno(#t_integer{}) ->
+    beam_validator:type_anno(integer);
+validator_anno(float) ->
+    beam_validator:type_anno(float);
+validator_anno(#t_atom{elements=[Val]}) ->
+    beam_validator:type_anno(atom, Val);
+validator_anno(#t_atom{}=A) ->
+    case t_is_boolean(A) of
+        true -> beam_validator:type_anno(bool);
+        false -> beam_validator:type_anno(atom)
+    end;
+validator_anno(T) ->
+    beam_validator:type_anno(T).
+
+get_func_id(Anno) ->
+    #{func_info:={_Mod, Name, Arity}} = Anno,
+    #b_local{name=#b_literal{val=Name}, arity=Arity}.
+
+opt([{L,Blk}|Bs], #d{ls=Ls}=D, Acc) ->
+    case Ls of
+        #{L:=Ts} ->
+            opt_1(L, Blk, Bs, Ts, D, Acc);
+        #{} ->
+            %% This block is never reached. Discard it.
+            opt(Bs, D, Acc)
+    end;
+opt([], D, Acc) ->
+    #d{func_db=FuncDb,ret_type=NewRet} = D,
+    {reverse(Acc), FuncDb, NewRet}.
+
+opt_1(L, #b_blk{is=Is0,last=Last0}=Blk0, Bs, Ts0,
+      #d{ds=Ds0,sub=Sub0,func_db=Fdb0}=D0, Acc) ->
+    case opt_is(Is0, Ts0, Ds0, Fdb0, D0, Sub0, []) of
+        {Is,Ts,Ds,Fdb,Sub} ->
+            D1 = D0#d{ds=Ds,sub=Sub,func_db=Fdb},
+            Last1 = simplify_terminator(Last0, Sub, Ts, Ds),
+            Last = opt_terminator(Last1, Ts, Ds),
+            D = update_successors(Last, Ts, D1),
+            Blk = Blk0#b_blk{is=Is,last=Last},
+            opt(Bs, D, [{L,Blk}|Acc]);
+        {no_return,Ret,Is,Ds,Fdb,Sub} ->
+            %% This call will never reach the successor block.
+            %% Rewrite the terminator to a 'ret', and remove
+            %% all type information for this label. That can
+            %% potentially narrow the type of the phi node
+            %% in the former successor.
+            Ls = maps:remove(L, D0#d.ls),
+            RetType = join([none|D0#d.ret_type]),
+            D = D0#d{ds=Ds,ls=Ls,sub=Sub,
+                     func_db=Fdb,ret_type=[RetType]},
+            Blk = Blk0#b_blk{is=Is,last=Ret},
+            opt(Bs, D, [{L,Blk}|Acc])
+    end.
+
+simplify_terminator(#b_br{bool=Bool}=Br, Sub, Ts, _Ds) ->
+    Br#b_br{bool=simplify_arg(Bool, Sub, Ts)};
+simplify_terminator(#b_switch{arg=Arg}=Sw, Sub, Ts, _Ds) ->
+    Sw#b_switch{arg=simplify_arg(Arg, Sub, Ts)};
+simplify_terminator(#b_ret{arg=Arg}=Ret, Sub, Ts, Ds) ->
+    %% Reducing the result of a call to a literal (fairly common for 'ok')
+    %% breaks tail call optimization.
+    case Ds of
+        #{ Arg := #b_set{op=call}} -> Ret;
+        #{} -> Ret#b_ret{arg=simplify_arg(Arg, Sub, Ts)}
+    end.
+
+opt_is([#b_set{op=phi,dst=Dst,args=Args0}=I0|Is],
+       Ts0, Ds0, Fdb, #d{ls=Ls}=D, Sub0, Acc) ->
+    %% Simplify the phi node by removing all predecessor blocks that no
+    %% longer exists or no longer branches to this block.
+    Args = [{simplify_arg(Arg, Sub0, Ts0),From} ||
+               {Arg,From} <- Args0, maps:is_key(From, Ls)],
+    case all_same(Args) of
+        true ->
+            %% Eliminate the phi node if there is just one source
+            %% value or if the values are identical.
+            [{Val,_}|_] = Args,
+            Sub = Sub0#{Dst=>Val},
+            opt_is(Is, Ts0, Ds0, Fdb, D, Sub, Acc);
+        false ->
+            I = I0#b_set{args=Args},
+            Ts = update_types(I, Ts0, Ds0),
+            Ds = Ds0#{Dst=>I},
+            opt_is(Is, Ts, Ds, Fdb, D, Sub0, [I|Acc])
+    end;
+opt_is([#b_set{op=call,args=Args0,dst=Dst}=I0|Is],
+       Ts0, Ds0, Fdb0, D, Sub0, Acc) ->
+    Args = simplify_args(Args0, Sub0, Ts0),
+    I1 = beam_ssa:normalize(I0#b_set{args=Args}),
+    {Ts1,Ds,Fdb,I2} = opt_call(I1, D, Ts0, Ds0, Fdb0),
+    case {map_get(Dst, Ts1),Is} of
+        {Type,[#b_set{op=succeeded}]} when Type =/= none ->
+            %% This call instruction is inside a try/catch
+            %% block. Don't attempt to simplify it.
+            opt_is(Is, Ts1, Ds, Fdb, D, Sub0, [I2|Acc]);
+        {none,[#b_set{op=succeeded}]} ->
+            %% This call instruction is inside a try/catch
+            %% block, but we know it will never return and
+            %% later optimizations may try to exploit that.
+            %%
+            %% For example, if we have an expression that
+            %% either returns this call or a tuple, we know
+            %% that the expression always returns a tuple
+            %% and can turn a later element/3 into
+            %% get_tuple_element.
+            %%
+            %% This is sound but difficult to validate in a
+            %% meaningful way as try/catch currently forces
+            %% us to maintain the illusion that the success
+            %% block is reachable even when its not, so we
+            %% disable the optimization to keep things
+            %% simple.
+            Ts = Ts1#{ Dst := any },
+            opt_is(Is, Ts, Ds, Fdb, D, Sub0, [I2|Acc]);
+        {none,_} ->
+            %% This call never returns. The rest of the
+            %% instructions will not be executed.
+            Ret = #b_ret{arg=Dst},
+            {no_return,Ret,reverse(Acc, [I2]),Ds,Fdb,Sub0};
+        {_,_} ->
+            case simplify_call(I2) of
+                #b_set{}=I ->
+                    opt_is(Is, Ts1, Ds, Fdb, D, Sub0, [I|Acc]);
+                #b_literal{}=Lit ->
+                    Sub = Sub0#{Dst=>Lit},
+                    Ts = maps:remove(Dst, Ts1),
+                    opt_is(Is, Ts, Ds0, Fdb, D, Sub, Acc);
+                #b_var{}=Var ->
+                    Ts = maps:remove(Dst, Ts1),
+                    Sub = Sub0#{Dst=>Var},
+                    opt_is(Is, Ts, Ds0, Fdb, D, Sub, Acc)
+            end
+    end;
+opt_is([#b_set{op=succeeded,args=[Arg],dst=Dst}=I],
+       Ts0, Ds0, Fdb, D, Sub0, Acc) ->
+    case Ds0 of
+        #{ Arg := #b_set{op=call} } ->
+            %% The success check of a call is part of exception handling and
+            %% must not be optimized away. We still have to update its type
+            %% though.
+            Ts = update_types(I, Ts0, Ds0),
+            Ds = Ds0#{Dst=>I},
+
+            opt_is([], Ts, Ds, Fdb, D, Sub0, [I|Acc]);
+        #{} ->
+            Args = simplify_args([Arg], Sub0, Ts0),
+            Type = type(succeeded, Args, Ts0, Ds0),
+            case get_literal_from_type(Type) of
+                #b_literal{}=Lit ->
+                    Sub = Sub0#{Dst=>Lit},
+                    opt_is([], Ts0, Ds0, Fdb, D, Sub, Acc);
+                none ->
+                    Ts = Ts0#{Dst=>Type},
+                    Ds = Ds0#{Dst=>I},
+                    opt_is([], Ts, Ds, Fdb, D, Sub0, [I|Acc])
+            end
+    end;
+opt_is([#b_set{args=Args0,dst=Dst}=I0|Is],
+       Ts0, Ds0, Fdb, D, Sub0, Acc) ->
+    Args = simplify_args(Args0, Sub0, Ts0),
+    I1 = beam_ssa:normalize(I0#b_set{args=Args}),
+    case simplify(I1, Ts0) of
+        #b_set{}=I2 ->
+            I = beam_ssa:normalize(I2),
+            Ts = update_types(I, Ts0, Ds0),
+            Ds = Ds0#{Dst=>I},
+            opt_is(Is, Ts, Ds, Fdb, D, Sub0, [I|Acc]);
+        #b_literal{}=Lit ->
+            Sub = Sub0#{Dst=>Lit},
+            opt_is(Is, Ts0, Ds0, Fdb, D, Sub, Acc);
+        #b_var{}=Var ->
+            case Is of
+                [#b_set{op=succeeded,dst=SuccDst,args=[Dst]}] ->
+                    %% We must remove this 'succeeded' instruction.
+                    Sub = Sub0#{Dst=>Var,SuccDst=>#b_literal{val=true}},
+                    opt_is([], Ts0, Ds0, Fdb, D, Sub, Acc);
+                _ ->
+                    Sub = Sub0#{Dst=>Var},
+                    opt_is(Is, Ts0, Ds0, Fdb, D, Sub, Acc)
+            end
+    end;
+opt_is([], Ts, Ds, Fdb, _D, Sub, Acc) ->
+    {reverse(Acc), Ts, Ds, Fdb, Sub}.
+
+simplify_call(#b_set{op=call,args=[#b_remote{}=Rem|Args]}=I) ->
+    case Rem of
+        #b_remote{mod=#b_literal{val=Mod},
+                  name=#b_literal{val=Name}} ->
+            case erl_bifs:is_pure(Mod, Name, length(Args)) of
+                true ->
+                    simplify_remote_call(Mod, Name, Args, I);
+                false ->
+                    I
+            end;
+         #b_remote{} ->
+            I
+    end;
+simplify_call(I) -> I.
+
+%% Simplify a remote call to a pure BIF.
+simplify_remote_call(erlang, '++', [#b_literal{val=[]},Tl], _I) ->
+    Tl;
+simplify_remote_call(erlang, setelement,
+                     [#b_literal{val=Pos},
+                      #b_literal{val=Tuple},
+                      #b_var{}=Value], I)
+  when is_integer(Pos), 1 =< Pos, Pos =< tuple_size(Tuple) ->
+    %% Position is a literal integer and the shape of the
+    %% tuple is known.
+    Els0 = [#b_literal{val=El} || El <- tuple_to_list(Tuple)],
+    {Bef,[_|Aft]} = split(Pos - 1, Els0),
+    Els = Bef ++ [Value|Aft],
+    I#b_set{op=put_tuple,args=Els};
+simplify_remote_call(Mod, Name, Args0, I) ->
+    case make_literal_list(Args0) of
+        none ->
+            I;
+        Args ->
+            %% The arguments are literals. Try to evaluate the BIF.
+            try apply(Mod, Name, Args) of
+                Val ->
+                    case cerl:is_literal_term(Val) of
+                        true ->
+                            #b_literal{val=Val};
+                        false ->
+                            %% The value can't be expressed as a literal
+                            %% (e.g. a pid).
+                            I
+                    end
+            catch
+                _:_ ->
+                    %% Failed. Don't bother trying to optimize
+                    %% the call.
+                    I
+            end
+    end.
+
+opt_call(#b_set{dst=Dst,args=[#b_local{}=Callee|Args]}=I0, D, Ts0, Ds0, Fdb0) ->
+    {Ts, Ds, I} = opt_local_call(I0, Ts0, Ds0, Fdb0),
+    case Fdb0 of
+        #{ Callee := #func_info{exported=false,arg_types=ArgTypes0}=Info } ->
+            %% Update the argument types of *this exact call*, the types
+            %% will be joined later when the callee is optimized.
+            CallId = {D#d.func_id, Dst},
+            ArgTypes = update_arg_types(Args, ArgTypes0, CallId, Ts0),
+
+            Fdb = Fdb0#{ Callee => Info#func_info{arg_types=ArgTypes} },
+            {Ts, Ds, Fdb, I};
+        #{} ->
+            %% We can't narrow the argument types of exported functions as they
+            %% can receive anything as part of an external call.
+            {Ts, Ds, Fdb0, I}
+    end;
+opt_call(#b_set{dst=Dst}=I, _D, Ts0, Ds0, Fdb) ->
+    Ts = update_types(I, Ts0, Ds0),
+    Ds = Ds0#{ Dst => I },
+    {Ts, Ds, Fdb, I}.
+
+opt_local_call(#b_set{dst=Dst,args=[Id|_]}=I0, Ts0, Ds0, Fdb) ->
+    Type = case Fdb of
+               #{ Id := #func_info{ret_type=[T]} } -> T;
+               #{} -> any
+           end,
+    I = case Type of
+            any -> I0;
+            none -> I0;
+            _ -> beam_ssa:add_anno(result_type, validator_anno(Type), I0)
+        end,
+    Ts = Ts0#{ Dst => Type },
+    Ds = Ds0#{ Dst => I },
+    {Ts, Ds, I}.
+
+update_arg_types([Arg | Args], [TypeMap0 | TypeMaps], CallId, Ts) ->
+    %% Match contexts are treated as bitstrings when optimizing arguments, as
+    %% we don't yet support removing the "bs_start_match3" instruction.
+    NewType = case get_type(Arg, Ts) of
+                  #t_bs_match{} -> {binary, 1};
+                  Type -> Type
+              end,
+    TypeMap = TypeMap0#{ CallId => NewType },
+    [TypeMap | update_arg_types(Args, TypeMaps, CallId, Ts)];
+update_arg_types([], [], _CallId, _Ts) ->
+    [].
+
+simplify(#b_set{op={bif,'and'},args=Args}=I, Ts) ->
+    case is_safe_bool_op(Args, Ts) of
+        true ->
+            case Args of
+                [_,#b_literal{val=false}=Res] -> Res;
+                [Res,#b_literal{val=true}] -> Res;
+                _ -> eval_bif(I, Ts)
+            end;
+        false ->
+            I
+    end;
+simplify(#b_set{op={bif,'or'},args=Args}=I, Ts) ->
+    case is_safe_bool_op(Args, Ts) of
+        true ->
+            case Args of
+                [Res,#b_literal{val=false}] -> Res;
+                [_,#b_literal{val=true}=Res] -> Res;
+                _ -> eval_bif(I, Ts)
+            end;
+        false ->
+            I
+    end;
+simplify(#b_set{op={bif,element},args=[#b_literal{val=Index},Tuple]}=I0, Ts) ->
+    case t_tuple_size(get_type(Tuple, Ts)) of
+        {_,Size} when is_integer(Index), 1 =< Index, Index =< Size ->
+            I = I0#b_set{op=get_tuple_element,
+                         args=[Tuple,#b_literal{val=Index-1}]},
+            simplify(I, Ts);
+        _ ->
+            eval_bif(I0, Ts)
+    end;
+simplify(#b_set{op={bif,hd},args=[List]}=I, Ts) ->
+    case get_type(List, Ts) of
+        cons ->
+            I#b_set{op=get_hd};
+        _ ->
+            eval_bif(I, Ts)
+    end;
+simplify(#b_set{op={bif,tl},args=[List]}=I, Ts) ->
+    case get_type(List, Ts) of
+        cons ->
+            I#b_set{op=get_tl};
+        _ ->
+            eval_bif(I, Ts)
+    end;
+simplify(#b_set{op={bif,size},args=[Term]}=I, Ts) ->
+    case get_type(Term, Ts) of
+        #t_tuple{} ->
+            simplify(I#b_set{op={bif,tuple_size}}, Ts);
+        _ ->
+            eval_bif(I, Ts)
+    end;
+simplify(#b_set{op={bif,tuple_size},args=[Term]}=I, Ts) ->
+    case get_type(Term, Ts) of
+        #t_tuple{size=Size,exact=true} ->
+            #b_literal{val=Size};
+        _ ->
+            I
+    end;
+simplify(#b_set{op={bif,'=='},args=Args}=I, Ts) ->
+    Types = get_types(Args, Ts),
+    EqEq = case {meet(Types),join(Types)} of
+               {none,any} -> true;
+               {#t_integer{},#t_integer{}} -> true;
+               {float,float} -> true;
+               {{binary,_},_} -> true;
+               {#t_atom{},_} -> true;
+               {_,_} -> false
+           end,
+    case EqEq of
+        true ->
+            simplify(I#b_set{op={bif,'=:='}}, Ts);
+        false ->
+            eval_bif(I, Ts)
+    end;
+simplify(#b_set{op={bif,'=:='},args=[Same,Same]}, _Ts) ->
+    #b_literal{val=true};
+simplify(#b_set{op={bif,'=:='},args=[A1,_A2]=Args}=I, Ts) ->
+    [T1,T2] = get_types(Args, Ts),
+    case meet(T1, T2) of
+        none ->
+            #b_literal{val=false};
+        _ ->
+            case {t_is_boolean(T1),T2} of
+                {true,#t_atom{elements=[true]}} ->
+                    %% Bool =:= true  ==>  Bool
+                    A1;
+                {_,_} ->
+                    eval_bif(I, Ts)
+            end
+    end;
+simplify(#b_set{op={bif,Op},args=Args}=I, Ts) ->
+    Types = get_types(Args, Ts),
+    case is_float_op(Op, Types) of
+        false ->
+            eval_bif(I, Ts);
+        true ->
+            AnnoArgs = [anno_float_arg(A) || A <- Types],
+            eval_bif(beam_ssa:add_anno(float_op, AnnoArgs, I), Ts)
+    end;
+simplify(#b_set{op=get_tuple_element,args=[Tuple,#b_literal{val=N}]}=I, Ts) ->
+    case get_type(Tuple, Ts) of
+        #t_tuple{size=Size,elements=Es} when Size > N ->
+            ElemType = get_element_type(N + 1, Es),
+            case get_literal_from_type(ElemType) of
+                #b_literal{}=Lit -> Lit;
+                none -> I
+            end;
+        none ->
+            %% Will never be executed because of type conflict.
+            %% #b_literal{val=ignored};
+            I
+    end;
+simplify(#b_set{op=is_nonempty_list,args=[Src]}=I, Ts) ->
+    case get_type(Src, Ts) of
+        any ->  I;
+        list -> I;
+        cons -> #b_literal{val=true};
+        _ ->    #b_literal{val=false}
+    end;
+simplify(#b_set{op=is_tagged_tuple,
+                args=[Src,#b_literal{val=Size},#b_literal{}=Tag]}=I, Ts) ->
+    simplify_is_record(I, get_type(Src, Ts), Size, Tag, Ts);
+simplify(#b_set{op=put_list,args=[#b_literal{val=H},
+                                  #b_literal{val=T}]}, _Ts) ->
+    #b_literal{val=[H|T]};
+simplify(#b_set{op=put_tuple,args=Args}=I, _Ts) ->
+    case make_literal_list(Args) of
+        none -> I;
+        List -> #b_literal{val=list_to_tuple(List)}
+    end;
+simplify(#b_set{op=wait_timeout,args=[#b_literal{val=0}]}, _Ts) ->
+    #b_literal{val=true};
+simplify(#b_set{op=wait_timeout,args=[#b_literal{val=infinity}]}=I, _Ts) ->
+    I#b_set{op=wait,args=[]};
+simplify(I, _Ts) -> I.
+
+make_literal_list(Args) ->
+    make_literal_list(Args, []).
+
+make_literal_list([#b_literal{val=H}|T], Acc) ->
+    make_literal_list(T, [H|Acc]);
+make_literal_list([_|_], _) ->
+    none;
+make_literal_list([], Acc) ->
+    reverse(Acc).
+
+is_safe_bool_op(Args, Ts) ->
+    [T1,T2] = get_types(Args, Ts),
+    t_is_boolean(T1) andalso t_is_boolean(T2).
+
+all_same([{H,_}|T]) ->
+    all(fun({E,_}) -> E =:= H end, T).
+
+eval_bif(#b_set{op={bif,Bif},args=Args}=I, Ts) ->
+    Arity = length(Args),
+    case erl_bifs:is_pure(erlang, Bif, Arity) of
+        false ->
+            I;
+        true ->
+            case make_literal_list(Args) of
+                none ->
+                    case get_types(Args, Ts) of
+                        [any] ->
+                            I;
+                        [Type] ->
+                            case will_succeed(Bif, Type) of
+                                yes ->
+                                    #b_literal{val=true};
+                                no ->
+                                    #b_literal{val=false};
+                                maybe ->
+                                    I
+                            end;
+                        _ ->
+                            I
+                    end;
+                LitArgs ->
+                    try apply(erlang, Bif, LitArgs) of
+                        Val -> #b_literal{val=Val}
+                    catch
+                        error:_ -> I
+                    end
+
+            end
+    end.
+
+simplify_args(Args, Sub, Ts) ->
+    [simplify_arg(Arg, Sub, Ts) || Arg <- Args].
+
+simplify_arg(#b_var{}=Arg0, Sub, Ts) ->
+    case sub_arg(Arg0, Sub) of
+        #b_literal{}=LitArg ->
+            LitArg;
+        #b_var{}=Arg ->
+            Type = get_type(Arg, Ts),
+            case get_literal_from_type(Type) of
+                none -> Arg;
+                #b_literal{}=Lit -> Lit
+            end
+    end;
+simplify_arg(#b_remote{mod=Mod,name=Name}=Rem, Sub, Ts) ->
+    Rem#b_remote{mod=simplify_arg(Mod, Sub, Ts),
+                 name=simplify_arg(Name, Sub, Ts)};
+simplify_arg(Arg, _Sub, _Ts) -> Arg.
+
+sub_arg(#b_var{}=Old, Sub) ->
+    case Sub of
+        #{Old:=New} -> New;
+        #{} -> Old
+    end.
+
+is_float_op('-', [float]) ->
+    true;
+is_float_op('/', [_,_]) ->
+    true;
+is_float_op(Op, [float,_Other]) ->
+    is_float_op_1(Op);
+is_float_op(Op, [_Other,float]) ->
+    is_float_op_1(Op);
+is_float_op(_, _) -> false.
+
+is_float_op_1('+') -> true;
+is_float_op_1('-') -> true;
+is_float_op_1('*') -> true;
+is_float_op_1(_) -> false.
+
+anno_float_arg(float) -> float;
+anno_float_arg(_) -> convert.
+
+opt_terminator(#b_br{bool=#b_literal{}}=Br, _Ts, _Ds) ->
+    beam_ssa:normalize(Br);
+opt_terminator(#b_br{bool=#b_var{}}=Br, Ts, Ds) ->
+    simplify_not(Br, Ts, Ds);
+opt_terminator(#b_switch{arg=#b_literal{}}=Sw, _Ts, _Ds) ->
+    beam_ssa:normalize(Sw);
+opt_terminator(#b_switch{arg=#b_var{}=V}=Sw, Ts, Ds) ->
+    case get_type(V, Ts) of
+        any ->
+            beam_ssa:normalize(Sw);
+        Type ->
+            beam_ssa:normalize(opt_switch(Sw, Type, Ts, Ds))
+    end;
+opt_terminator(#b_ret{}=Ret, _Ts, _Ds) -> Ret.
+
+
+opt_switch(#b_switch{fail=Fail,list=List0}=Sw0, Type, Ts, Ds) ->
+    List = prune_switch_list(List0, Fail, Type, Ts),
+    Sw1 = Sw0#b_switch{list=List},
+    case Type of
+        #t_integer{elements={_,_}=Range} ->
+            simplify_switch_int(Sw1, Range);
+        #t_atom{elements=[_|_]} ->
+            case t_is_boolean(Type) of
+                true ->
+                    #b_br{} = Br = simplify_switch_bool(Sw1, Ts, Ds),
+                    opt_terminator(Br, Ts, Ds);
+                false ->
+                    simplify_switch_atom(Type, Sw1)
+            end;
+        _ ->
+            Sw1
+    end.
+
+prune_switch_list([{_,Fail}|T], Fail, Type, Ts) ->
+    prune_switch_list(T, Fail, Type, Ts);
+prune_switch_list([{Arg,_}=Pair|T], Fail, Type, Ts) ->
+    case meet(get_type(Arg, Ts), Type) of
+        none ->
+            %% Different types. This value can never match.
+            prune_switch_list(T, Fail, Type, Ts);
+        _ ->
+            [Pair|prune_switch_list(T, Fail, Type, Ts)]
+    end;
+prune_switch_list([], _, _, _) -> [].
+
+update_successors(#b_br{bool=#b_literal{val=true},succ=S}, Ts, D) ->
+    update_successor(S, Ts, D);
+update_successors(#b_br{bool=#b_var{}=Bool,succ=Succ,fail=Fail}, Ts0, D0) ->
+    case cerl_sets:is_element(Bool, D0#d.once) of
+        true ->
+            %% This variable is defined in this block and is only
+            %% referenced by this br terminator. Therefore, there is
+            %% no need to include it in the type database passed on to
+            %% the successors of this block.
+            Ts = maps:remove(Bool, Ts0),
+            {SuccTs,FailTs} = infer_types_br(Bool, Ts, D0),
+            D = update_successor(Fail, FailTs, D0),
+            update_successor(Succ, SuccTs, D);
+        false ->
+            {SuccTs,FailTs} = infer_types_br(Bool, Ts0, D0),
+            D = update_successor_bool(Bool, false, Fail, FailTs, D0),
+            update_successor_bool(Bool, true, Succ, SuccTs, D)
+    end;
+update_successors(#b_switch{arg=#b_var{}=V,fail=Fail,list=List}, Ts, D0) ->
+    case cerl_sets:is_element(V, D0#d.once) of
+        true ->
+            %% This variable is defined in this block and is only
+            %% referenced by this switch terminator. Therefore, there is
+            %% no need to include it in the type database passed on to
+            %% the successors of this block.
+            D = update_successor(Fail, Ts, D0),
+            F = fun({Val,S}, A) ->
+                        SuccTs0 = infer_types_switch(V, Val, Ts, D),
+                        SuccTs = maps:remove(V, SuccTs0),
+                        update_successor(S, SuccTs, A)
+                end,
+            foldl(F, D, List);
+        false ->
+            %% V can not be equal to any of the values in List at the fail
+            %% block.
+            FailTs = subtract_sw_list(V, List, Ts),
+            D = update_successor(Fail, FailTs, D0),
+            F = fun({Val,S}, A) ->
+                        SuccTs = infer_types_switch(V, Val, Ts, D),
+                        update_successor(S, SuccTs, A)
+                end,
+            foldl(F, D, List)
+    end;
+update_successors(#b_ret{arg=Arg}, Ts, D) ->
+    FuncId = D#d.func_id,
+    case D#d.ds of
+        #{ Arg := #b_set{op=call,args=[FuncId | _]} } ->
+            %% Returning a call to ourselves doesn't affect our own return
+            %% type.
+            D;
+        #{} ->
+            RetType = join([get_type(Arg, Ts) | D#d.ret_type]),
+            D#d{ret_type=[RetType]}
+    end.
+
+subtract_sw_list(V, List, Ts) ->
+    Ts#{ V := sub_sw_list_1(get_type(V, Ts), List, Ts) }.
+
+sub_sw_list_1(Type, [{Val,_}|T], Ts) ->
+    ValType = get_type(Val, Ts),
+    sub_sw_list_1(subtract(Type, ValType), T, Ts);
+sub_sw_list_1(Type, [], _Ts) ->
+    Type.
+
+update_successor_bool(#b_var{}=Var, BoolValue, S, Ts, D) ->
+    case t_is_boolean(get_type(Var, Ts)) of
+        true ->
+            update_successor(S, Ts#{Var:=t_atom(BoolValue)}, D);
+        false ->
+            %% The `br` terminator is preceeded by an instruction that
+            %% does not produce a boolean value, such a `new_try_tag`.
+            update_successor(S, Ts, D)
+    end.
+
+update_successor(?BADARG_BLOCK, _Ts, #d{}=D) ->
+    %% We KNOW that no variables are used in the ?BADARG_BLOCK,
+    %% so there is no need to update the type information. That
+    %% can be a huge timesaver for huge functions.
+    D;
+update_successor(S, Ts0, #d{ls=Ls}=D) ->
+    case Ls of
+        #{S:=Ts1} ->
+            Ts = join_types(Ts0, Ts1),
+            D#d{ls=Ls#{S:=Ts}};
+        #{} ->
+            D#d{ls=Ls#{S=>Ts0}}
+    end.
+
+update_types(#b_set{op=Op,dst=Dst,args=Args}, Ts, Ds) ->
+    T = type(Op, Args, Ts, Ds),
+    Ts#{Dst=>T}.
+
+type(phi, Args, Ts, _Ds) ->
+    Types = [get_type(A, Ts) || {A,_} <- Args],
+    join(Types);
+type({bif,'band'}, Args, Ts, _Ds) ->
+    band_type(Args, Ts);
+type({bif,Bif}, Args, Ts, _Ds) ->
+    case bif_type(Bif, Args) of
+        number ->
+            arith_op_type(Args, Ts);
+        Type ->
+            Type
+    end;
+type(bs_init, _Args, _Ts, _Ds) ->
+    {binary, 1};
+type(bs_extract, [Ctx], Ts, _Ds) ->
+    #t_bs_match{type=Type} = get_type(Ctx, Ts),
+    Type;
+type(bs_match, Args, _Ts, _Ds) ->
+    #t_bs_match{type=bs_match_type(Args)};
+type(bs_get_tail, _Args, _Ts, _Ds) ->
+    {binary, 1};
+type(call, [#b_remote{mod=#b_literal{val=Mod},
+                      name=#b_literal{val=Name}}|Args], Ts, _Ds) ->
+    case {Mod,Name,Args} of
+        {erlang,setelement,[Pos,Tuple,Arg]} ->
+            case {get_type(Pos, Ts),get_type(Tuple, Ts)} of
+                {#t_integer{elements={Index,Index}},
+                 #t_tuple{elements=Es0,size=Size}=T} ->
+                    %% This is an exact index, update the type of said element
+                    %% or return 'none' if it's known to be out of bounds.
+                    Es = set_element_type(Index, get_type(Arg, Ts), Es0),
+                    case T#t_tuple.exact of
+                        false ->
+                            T#t_tuple{size=max(Index, Size),elements=Es};
+                        true when Index =< Size ->
+                            T#t_tuple{elements=Es};
+                        true ->
+                            none
+                    end;
+                {#t_integer{elements={Min,_}}=IntType,
+                 #t_tuple{elements=Es0,size=Size}=T} ->
+                    %% Remove type information for all indices that
+                    %% falls into the range of the integer.
+                    Es = remove_element_info(IntType, Es0),
+                    case T#t_tuple.exact of
+                        false ->
+                            T#t_tuple{elements=Es,size=max(Min, Size)};
+                        true when Min =< Size ->
+                            T#t_tuple{elements=Es,size=Size};
+                        true ->
+                            none
+                    end;
+                {_,#t_tuple{}=T} ->
+                    %% Position unknown, so we have to discard all element
+                    %% information.
+                    T#t_tuple{elements=#{}};
+                {#t_integer{elements={Min,_Max}},_} ->
+                    #t_tuple{size=Min};
+                {_,_} ->
+                    #t_tuple{}
+            end;
+        {erlang,'++',[LHS,RHS]} ->
+            LType = get_type(LHS, Ts),
+            RType = get_type(RHS, Ts),
+            case LType =:= cons orelse RType =:= cons of
+                true ->
+                    cons;
+                false ->
+                    %% `[] ++ RHS` yields RHS, even if RHS is not a list.
+                    join(list, RType)
+            end;
+        {erlang,'--',[_,_]} ->
+            list;
+        {lists,F,Args} ->
+            Types = get_types(Args, Ts),
+            lists_function_type(F, Types);
+        {math,_,_} ->
+            case is_math_bif(Name, length(Args)) of
+                false -> any;
+                true -> float
+            end;
+        {_,_,_} ->
+            case erl_bifs:is_exit_bif(Mod, Name, length(Args)) of
+                true -> none;
+                false -> any
+            end
+    end;
+type(get_tuple_element, [Tuple, Offset], Ts, _Ds) ->
+    #t_tuple{size=Size,elements=Es} = get_type(Tuple, Ts),
+    #b_literal{val=N} = Offset,
+    true = Size > N, %Assertion.
+    get_element_type(N + 1, Es);
+type(is_nonempty_list, [_], _Ts, _Ds) ->
+    t_boolean();
+type(is_tagged_tuple, [_,#b_literal{},#b_literal{}], _Ts, _Ds) ->
+    t_boolean();
+type(put_map, _Args, _Ts, _Ds) ->
+    map;
+type(put_list, _Args, _Ts, _Ds) ->
+    cons;
+type(put_tuple, Args, Ts, _Ds) ->
+    {Es, _} = foldl(fun(Arg, {Es0, Index}) ->
+                        Type = get_type(Arg, Ts),
+                        Es = set_element_type(Index, Type, Es0),
+                        {Es, Index + 1}
+                    end, {#{}, 1}, Args),
+    #t_tuple{exact=true,size=length(Args),elements=Es};
+type(succeeded, [#b_var{}=Src], Ts, Ds) ->
+    case maps:get(Src, Ds) of
+        #b_set{op={bif,Bif},args=BifArgs} ->
+            Types = get_types(BifArgs, Ts),
+            case {Bif,Types} of
+                {BoolOp,[T1,T2]} when BoolOp =:= 'and'; BoolOp =:= 'or' ->
+                    case t_is_boolean(T1) andalso t_is_boolean(T2) of
+                        true -> t_atom(true);
+                        false -> t_boolean()
+                    end;
+                {byte_size,[{binary,_}]} ->
+                    t_atom(true);
+                {bit_size,[{binary,_}]} ->
+                    t_atom(true);
+                {map_size,[map]} ->
+                    t_atom(true);
+                {'not',[Type]} ->
+                    case t_is_boolean(Type) of
+                        true -> t_atom(true);
+                        false -> t_boolean()
+                    end;
+                {size,[{binary,_}]} ->
+                    t_atom(true);
+                {tuple_size,[#t_tuple{}]} ->
+                    t_atom(true);
+                {_,_} ->
+                    t_boolean()
+            end;
+        #b_set{op=get_hd} ->
+            t_atom(true);
+        #b_set{op=get_tl} ->
+            t_atom(true);
+        #b_set{op=get_tuple_element} ->
+            t_atom(true);
+        #b_set{op=wait} ->
+            t_atom(false);
+        #b_set{} ->
+            t_boolean()
+    end;
+type(succeeded, [#b_literal{}], _Ts, _Ds) ->
+    t_atom(true);
+type(_, _, _, _) -> any.
+
+arith_op_type(Args, Ts) ->
+    Types = get_types(Args, Ts),
+    foldl(fun(#t_integer{}, unknown) -> t_integer();
+             (#t_integer{}, number) -> number;
+             (#t_integer{}, float) -> float;
+             (#t_integer{}, #t_integer{}) -> t_integer();
+             (float, unknown) -> float;
+             (float, #t_integer{}) -> float;
+             (float, number) -> float;
+             (number, unknown) -> number;
+             (number, #t_integer{}) -> number;
+             (number, float) -> float;
+             (any, _) -> number;
+             (Same, Same) -> Same;
+             (_, _) -> none
+          end, unknown, Types).
+
+lists_function_type(F, Types) ->
+    case {F,Types} of
+        %% Functions that return booleans.
+        {all,[_,_]} ->
+            t_boolean();
+        {any,[_,_]} ->
+            t_boolean();
+        {keymember,[_,_,_]} ->
+            t_boolean();
+        {member,[_,_]} ->
+            t_boolean();
+        {prefix,[_,_]} ->
+            t_boolean();
+        {suffix,[_,_]} ->
+            t_boolean();
+
+        %% Functions that return lists.
+        {dropwhile,[_,_]} ->
+            list;
+        {duplicate,[_,_]} ->
+            list;
+        {filter,[_,_]} ->
+            list;
+        {flatten,[_]} ->
+            list;
+        {map,[_Fun,List]} ->
+            same_length_type(List);
+        {MapFold,[_Fun,_Acc,List]} when MapFold =:= mapfoldl;
+                                        MapFold =:= mapfoldr ->
+            #t_tuple{size=2,exact=true,
+                     elements=#{1=>same_length_type(List)}};
+        {partition,[_,_]} ->
+            t_two_tuple(list, list);
+        {reverse,[List]} ->
+            same_length_type(List);
+        {sort,[List]} ->
+            same_length_type(List);
+        {splitwith,[_,_]} ->
+            t_two_tuple(list, list);
+        {takewhile,[_,_]} ->
+            list;
+        {unzip,[List]} ->
+            ListType = same_length_type(List),
+            t_two_tuple(ListType, ListType);
+        {usort,[List]} ->
+            same_length_type(List);
+        {zip,[_,_]} ->
+            list;
+        {zipwith,[_,_,_]} ->
+            list;
+        {_,_} ->
+            any
+    end.
+
+%% For a lists function that return a list of the same
+%% length as the input list, return the type of the list.
+same_length_type(cons) -> cons;
+same_length_type(nil) -> nil;
+same_length_type(_) -> list.
+
+t_two_tuple(Type1, Type2) ->
+    #t_tuple{size=2,exact=true,
+             elements=#{1=>Type1,2=>Type2}}.
+
+%% 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
+        #t_atom{} -> 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_bitstring, Type) ->
+    case Type of
+        {binary,_} -> yes;
+        _ -> no
+    end;
+will_succeed(is_boolean, Type) ->
+    case Type of
+        #t_atom{elements=any} ->
+            maybe;
+        #t_atom{elements=Es} ->
+            case t_is_boolean(Type) of
+                true ->
+                    yes;
+                false ->
+                    case any(fun is_boolean/1, Es) of
+                        true -> maybe;
+                        false -> no
+                    end
+            end;
+        _ ->
+            no
+    end;
+will_succeed(is_float, Type) ->
+    case Type of
+        float -> yes;
+        number -> maybe;
+        _ -> no
+    end;
+will_succeed(is_integer, Type) ->
+    case Type of
+        #t_integer{} -> yes;
+        number -> maybe;
+        _ -> no
+    end;
+will_succeed(is_list, Type) ->
+    case Type of
+        list -> yes;
+        cons -> yes;
+        _ -> no
+    end;
+will_succeed(is_map, Type) ->
+    case Type of
+        map -> yes;
+        _ -> no
+    end;
+will_succeed(is_number, Type) ->
+    case Type of
+        float -> yes;
+        #t_integer{} -> yes;
+        number -> yes;
+        _ -> no
+    end;
+will_succeed(is_tuple, Type) ->
+    case Type of
+        #t_tuple{} -> yes;
+        _ -> no
+    end;
+will_succeed(_, _) -> maybe.
+
+
+band_type([Other,#b_literal{val=Int}], Ts) when is_integer(Int) ->
+    band_type_1(Int, Other, Ts);
+band_type([_,_], _) -> t_integer().
+
+band_type_1(Int, OtherSrc, Ts) ->
+    Type = band_type_2(Int, 0),
+    OtherType = get_type(OtherSrc, Ts),
+    meet(Type, OtherType).
+
+band_type_2(N, Bits) when Bits < 64 ->
+    case 1 bsl Bits of
+        P when P =:= N + 1 ->
+            t_integer(0, N);
+        P when P > N + 1 ->
+            t_integer();
+        _ ->
+            band_type_2(N, Bits+1)
+    end;
+band_type_2(_, _) ->
+    %% Negative or large positive number. Give up.
+    t_integer().
+
+bs_match_type([#b_literal{val=Type}|Args]) ->
+    bs_match_type(Type, Args).
+
+bs_match_type(binary, Args) ->
+    [_,_,_,#b_literal{val=U}] = Args,
+    {binary,U};
+bs_match_type(float, _) ->
+    float;
+bs_match_type(integer, Args) ->
+    case Args of
+        [_,
+         #b_literal{val=Flags},
+         #b_literal{val=Size},
+         #b_literal{val=Unit}] when Size * Unit < 64 ->
+            NumBits = Size * Unit,
+            case member(unsigned, Flags) of
+                true ->
+                    t_integer(0, (1 bsl NumBits)-1);
+                false ->
+                    %% Signed integer. Don't bother.
+                    t_integer()
+            end;
+        [_|_] ->
+            t_integer()
+    end;
+bs_match_type(skip, _) ->
+    any;
+bs_match_type(string, _) ->
+    any;
+bs_match_type(utf8, _) ->
+    ?UNICODE_INT;
+bs_match_type(utf16, _) ->
+    ?UNICODE_INT;
+bs_match_type(utf32, _) ->
+    ?UNICODE_INT.
+
+simplify_switch_atom(#t_atom{elements=Atoms}, #b_switch{list=List0}=Sw) ->
+    case sort([A || {#b_literal{val=A},_} <- List0]) of
+        Atoms ->
+            %% All possible atoms are included in the list. The
+            %% failure label will never be used.
+            [{_,Fail}|List] = List0,
+            Sw#b_switch{fail=Fail,list=List};
+        _ ->
+            Sw
+    end.
+
+simplify_switch_int(#b_switch{list=List0}=Sw, {Min,Max}) ->
+    List1 = sort(List0),
+    Vs = [V || {#b_literal{val=V},_} <- List1],
+    case eq_ranges(Vs, Min, Max) of
+        true ->
+            {_,LastL} = last(List1),
+            List = droplast(List1),
+            Sw#b_switch{fail=LastL,list=List};
+        false ->
+            Sw
+    end.
+
+eq_ranges([H], H, H) -> true;
+eq_ranges([H|T], H, Max) -> eq_ranges(T, H+1, Max);
+eq_ranges(_, _, _) -> false.
+
+simplify_is_record(I, #t_tuple{exact=Exact,
+                               size=Size,
+                               elements=Es},
+                   RecSize, RecTag, Ts) ->
+    TagType = maps:get(1, Es, any),
+    TagMatch = case get_literal_from_type(TagType) of
+                   #b_literal{}=RecTag -> yes;
+                   #b_literal{} -> no;
+                   none ->
+                       %% Is it at all possible for the tag to match?
+                       case meet(get_type(RecTag, Ts), TagType) of
+                           none -> no;
+                           _ -> maybe
+                       end
+               end,
+    if
+        Size =/= RecSize, Exact; Size > RecSize; TagMatch =:= no ->
+            #b_literal{val=false};
+        Size =:= RecSize, Exact, TagMatch =:= yes ->
+            #b_literal{val=true};
+        true ->
+            I
+    end;
+simplify_is_record(I, any, _Size, _Tag, _Ts) ->
+    I;
+simplify_is_record(_I, _Type, _Size, _Tag, _Ts) ->
+    #b_literal{val=false}.
+
+simplify_switch_bool(#b_switch{arg=B,fail=Fail,list=List0}, Ts, Ds) ->
+    FalseVal = #b_literal{val=false},
+    TrueVal = #b_literal{val=true},
+    List1 = List0 ++ [{FalseVal,Fail},{TrueVal,Fail}],
+    {_,FalseLbl} = keyfind(FalseVal, 1, List1),
+    {_,TrueLbl} = keyfind(TrueVal, 1, List1),
+    Br = beam_ssa:normalize(#b_br{bool=B,succ=TrueLbl,fail=FalseLbl}),
+    simplify_not(Br, Ts, Ds).
+
+simplify_not(#b_br{bool=#b_var{}=V,succ=Succ,fail=Fail}=Br0, Ts, Ds) ->
+    case Ds of
+        #{V:=#b_set{op={bif,'not'},args=[Bool]}} ->
+            case t_is_boolean(get_type(Bool, Ts)) of
+                true ->
+                    Br = Br0#b_br{bool=Bool,succ=Fail,fail=Succ},
+                    beam_ssa:normalize(Br);
+                false ->
+                    Br0
+            end;
+        #{} ->
+            Br0
+    end;
+simplify_not(#b_br{bool=#b_literal{}}=Br, _Ts, _Ds) -> Br.
+
+%%%
+%%% Calculate the set of variables that are only used once in the
+%%% terminator of the block that defines them. That will allow us to
+%%% discard type information for variables that will never be
+%%% referenced by the successor blocks, potentially improving
+%%% compilation times.
+%%%
+
+used_once(Linear, Args) ->
+    Map0 = used_once_1(reverse(Linear), #{}),
+    Map = maps:without(Args, Map0),
+    cerl_sets:from_list(maps:keys(Map)).
+
+used_once_1([{L,#b_blk{is=Is,last=Last}}|Bs], Uses0) ->
+    Uses1 = used_once_last_uses(beam_ssa:used(Last), L, Uses0),
+    Uses = used_once_2(reverse(Is), L, Uses1),
+    used_once_1(Bs, Uses);
+used_once_1([], Uses) -> Uses.
+
+used_once_2([#b_set{dst=Dst}=I|Is], L, Uses0) ->
+    Uses = used_once_uses(beam_ssa:used(I), L, Uses0),
+    case Uses of
+        #{Dst:=[L]} ->
+            used_once_2(Is, L, Uses);
+        #{} ->
+            %% Used more than once or used once in
+            %% in another block.
+            used_once_2(Is, L, maps:remove(Dst, Uses))
+    end;
+used_once_2([], _, Uses) -> Uses.
+
+used_once_uses([V|Vs], L, Uses) ->
+    case Uses of
+        #{V:=more_than_once} ->
+            used_once_uses(Vs, L, Uses);
+        #{} ->
+            %% Already used or first use is not in
+            %% a terminator.
+            used_once_uses(Vs, L, Uses#{V=>more_than_once})
+    end;
+used_once_uses([], _, Uses) -> Uses.
+
+used_once_last_uses([V|Vs], L, Uses) ->
+    case Uses of
+        #{V:=[_]} ->
+            %% Second time this variable is used.
+            used_once_last_uses(Vs, L, Uses#{V:=more_than_once});
+        #{V:=more_than_once} ->
+            %% Used at least twice before.
+            used_once_last_uses(Vs, L, Uses);
+        #{} ->
+            %% First time this variable is used.
+            used_once_last_uses(Vs, L, Uses#{V=>[L]})
+    end;
+used_once_last_uses([], _, Uses) -> Uses.
+
+
+get_types(Values, Ts) ->
+    [get_type(Val, Ts) || Val <- Values].
+-spec get_type(beam_ssa:value(), type_db()) -> type().
+
+get_type(#b_var{}=V, Ts) ->
+    #{V:=T} = Ts,
+    T;
+get_type(#b_literal{val=Val}, _Ts) ->
+    if
+        is_atom(Val) ->
+            t_atom(Val);
+        is_float(Val) ->
+            float;
+        is_integer(Val) ->
+            t_integer(Val);
+        is_list(Val), Val =/= [] ->
+            cons;
+        is_map(Val) ->
+            map;
+        Val =:= {} ->
+            #t_tuple{exact=true};
+        is_tuple(Val) ->
+            {Es, _} = foldl(fun(E, {Es0, Index}) ->
+                                Type = get_type(#b_literal{val=E}, #{}),
+                                Es = set_element_type(Index, Type, Es0),
+                                {Es, Index + 1}
+                            end, {#{}, 1}, tuple_to_list(Val)),
+            #t_tuple{exact=true,size=tuple_size(Val),elements=Es};
+        Val =:= [] ->
+            nil;
+        true ->
+            any
+    end.
+
+%% infer_types(Var, Types, #d{}) -> {SuccTypes,FailTypes}
+%%  Looking at the expression that defines the variable Var, infer
+%%  the types for the variables in the arguments. Return the updated
+%%  type database for the case that the expression evaluates to
+%%  true, and and for the case that it evaluates to false.
+%%
+%%  Here is an example. The variable being asked about is
+%%  the variable Bool, which is defined like this:
+%%
+%%     Bool = is_nonempty_list L
+%%
+%%  If 'is_nonempty_list L' evaluates to 'true', L must
+%%  must be cons. The meet of the previously known type of L and 'cons'
+%%  will be added to SuccTypes.
+%%
+%%  On the other hand, if 'is_nonempty_list L' evaluates to false, L
+%%  is not cons and cons can be subtracted from the previously known
+%%  type for L. For example, if L was known to be 'list', subtracting
+%%  'cons' would give 'nil' as the only possible type. The result of the
+%%  subtraction for L will be added to FailTypes.
+
+infer_types_br(#b_var{}=V, Ts, #d{ds=Ds}) ->
+    #{V:=#b_set{op=Op,args=Args}} = Ds,
+    PosTypes0 = infer_type(Op, Args, Ds),
+    NegTypes0 = infer_type_negative(Op, Args, Ds),
+
+    %% We must be careful with types inferred from '=:='.
+    %%
+    %% If we have seen L =:= [a], we know that L is 'cons' if the
+    %% comparison succeeds. However, if the comparison fails, L could
+    %% still be 'cons'. Therefore, we must not subtract 'cons' from the
+    %% previous type of L.
+    %%
+    %% However, it is safe to subtract a type inferred from '=:=' if
+    %% it is single-valued, e.g. if it is [] or the atom 'true'.
+
+    EqTypes = infer_eq_type(Op, Args, Ts, Ds),
+    NegTypes1 = [P || {_,T}=P <- EqTypes, is_singleton_type(T)],
+
+    PosTypes = EqTypes ++ PosTypes0,
+    SuccTs = meet_types(PosTypes, Ts),
+
+    NegTypes = NegTypes0 ++ NegTypes1,
+    FailTs = subtract_types(NegTypes, Ts),
+
+    {SuccTs,FailTs}.
+
+infer_types_switch(V, Lit, Ts, #d{ds=Ds}) ->
+    Types = infer_eq_type({bif,'=:='}, [V, Lit], Ts, Ds),
+    meet_types(Types, Ts).
+
+infer_eq_type({bif,'=:='}, [#b_var{}=Src,#b_literal{}=Lit], Ts, Ds) ->
+    Def = maps:get(Src, Ds),
+    Type = get_type(Lit, Ts),
+    [{Src,Type} | infer_eq_lit(Def, Lit)];
+infer_eq_type({bif,'=:='}, [#b_var{}=Arg0,#b_var{}=Arg1], Ts, _Ds) ->
+    %% As an example, assume that L1 is known to be 'list', and L2 is
+    %% known to be 'cons'. Then if 'L1 =:= L2' evaluates to 'true', it can
+    %% be inferred that L1 is 'cons' (the meet of 'cons' and 'list').
+    Type0 = get_type(Arg0, Ts),
+    Type1 = get_type(Arg1, Ts),
+    Type = meet(Type0, Type1),
+    [{V,MeetType} ||
+        {V,OrigType,MeetType} <-
+            [{Arg0,Type0,Type},{Arg1,Type1,Type}],
+        OrigType =/= MeetType];
+infer_eq_type(_Op, _Args, _Ts, _Ds) ->
+    [].
+
+infer_eq_lit(#b_set{op={bif,tuple_size},args=[#b_var{}=Tuple]},
+             #b_literal{val=Size}) when is_integer(Size) ->
+    [{Tuple,#t_tuple{exact=true,size=Size}}];
+infer_eq_lit(#b_set{op=get_tuple_element,
+                    args=[#b_var{}=Tuple,#b_literal{val=N}]},
+             #b_literal{}=Lit) ->
+    Index = N + 1,
+    Es = set_element_type(Index, get_type(Lit, #{}), #{}),
+    [{Tuple,#t_tuple{size=Index,elements=Es}}];
+infer_eq_lit(_, _) -> [].
+
+infer_type_negative(Op, Args, Ds) ->
+    case is_negative_inference_safe(Op, Args) of
+        true ->
+            infer_type(Op, Args, Ds);
+        false ->
+            []
+    end.
+
+%% Conservative list of instructions for which negative
+%% inference is safe.
+is_negative_inference_safe(is_nonempty_list, _Args) -> true;
+is_negative_inference_safe(_, _) -> false.
+
+infer_type({bif,element}, [#b_literal{val=Pos},#b_var{}=Tuple], _Ds) ->
+    if
+        is_integer(Pos), 1 =< Pos ->
+            [{Tuple,#t_tuple{size=Pos}}];
+        true ->
+            []
+    end;
+infer_type({bif,element}, [#b_var{}=Position,#b_var{}=Tuple], _Ds) ->
+    [{Position,t_integer()},{Tuple,#t_tuple{}}];
+infer_type({bif,Bif}, [#b_var{}=Src]=Args, _Ds) ->
+    case inferred_bif_type(Bif, Args) of
+        any -> [];
+        T -> [{Src,T}]
+    end;
+infer_type({bif,binary_part}, [#b_var{}=Src,_], _Ds) ->
+    [{Src,{binary,8}}];
+infer_type({bif,is_map_key}, [_,#b_var{}=Src], _Ds) ->
+    [{Src,map}];
+infer_type({bif,map_get}, [_,#b_var{}=Src], _Ds) ->
+    [{Src,map}];
+infer_type({bif,Bif}, [_,_]=Args, _Ds) ->
+    case inferred_bif_type(Bif, Args) of
+        any -> [];
+        T -> [{A,T} || #b_var{}=A <- Args]
+    end;
+infer_type({bif,binary_part}, [#b_var{}=Src,Pos,Len], _Ds) ->
+    [{Src,{binary,8}}|
+     [{V,t_integer()} || #b_var{}=V <- [Pos,Len]]];
+infer_type(bs_start_match, [#b_var{}=Bin], _Ds) ->
+    [{Bin,{binary,1}}];
+infer_type(is_nonempty_list, [#b_var{}=Src], _Ds) ->
+    [{Src,cons}];
+infer_type(is_tagged_tuple, [#b_var{}=Src,#b_literal{val=Size},
+                             #b_literal{}=Tag], _Ds) ->
+    Es = set_element_type(1, get_type(Tag, #{}), #{}),
+    [{Src,#t_tuple{exact=true,size=Size,elements=Es}}];
+infer_type(succeeded, [#b_var{}=Src], Ds) ->
+    #b_set{op=Op,args=Args} = maps:get(Src, Ds),
+    infer_type(Op, Args, Ds);
+infer_type(_Op, _Args, _Ds) ->
+    [].
+
+%% bif_type(Name, Args) -> Type
+%%  Return the return type for the guard BIF or operator Name with
+%%  arguments Args.
+%%
+%%  Note that that the following BIFs are handle elsewhere:
+%%
+%%     band/2
+
+bif_type(abs, [_]) -> number;
+bif_type(bit_size, [_]) -> t_integer();
+bif_type(byte_size, [_]) -> t_integer();
+bif_type(ceil, [_]) -> t_integer();
+bif_type(float, [_]) -> float;
+bif_type(floor, [_]) -> t_integer();
+bif_type(is_map_key, [_,_]) -> t_boolean();
+bif_type(length, [_]) -> t_integer();
+bif_type(map_size, [_]) -> t_integer();
+bif_type(node, []) -> #t_atom{};
+bif_type(node, [_]) -> #t_atom{};
+bif_type(round, [_]) -> t_integer();
+bif_type(size, [_]) -> t_integer();
+bif_type(trunc, [_]) -> t_integer();
+bif_type(tuple_size, [_]) -> t_integer();
+bif_type('bnot', [_]) -> t_integer();
+bif_type('bor', [_,_]) -> t_integer();
+bif_type('bsl', [_,_]) -> t_integer();
+bif_type('bsr', [_,_]) -> t_integer();
+bif_type('bxor', [_,_]) -> t_integer();
+bif_type('div', [_,_]) -> t_integer();
+bif_type('rem', [_,_]) -> t_integer();
+bif_type('/', [_,_]) -> float;
+bif_type(Name, Args) ->
+    Arity = length(Args),
+    case erl_internal:new_type_test(Name, Arity) orelse
+        erl_internal:bool_op(Name, Arity) orelse
+        erl_internal:comp_op(Name, Arity) of
+        true ->
+            t_boolean();
+        false ->
+            case erl_internal:arith_op(Name, Arity) of
+                true -> number;
+                false -> any
+            end
+    end.
+
+inferred_bif_type(is_atom, [_]) -> t_atom();
+inferred_bif_type(is_binary, [_]) -> {binary,8};
+inferred_bif_type(is_bitstring, [_]) -> {binary,1};
+inferred_bif_type(is_boolean, [_]) -> t_boolean();
+inferred_bif_type(is_float, [_]) -> float;
+inferred_bif_type(is_integer, [_]) -> t_integer();
+inferred_bif_type(is_list, [_]) -> list;
+inferred_bif_type(is_map, [_]) -> map;
+inferred_bif_type(is_number, [_]) -> number;
+inferred_bif_type(is_tuple, [_]) -> #t_tuple{};
+inferred_bif_type(abs, [_]) -> number;
+inferred_bif_type(bit_size, [_]) -> {binary,1};
+inferred_bif_type('bnot', [_]) -> t_integer();
+inferred_bif_type(byte_size, [_]) -> {binary,1};
+inferred_bif_type(ceil, [_]) -> number;
+inferred_bif_type(float, [_]) -> number;
+inferred_bif_type(floor, [_]) -> number;
+inferred_bif_type(hd, [_]) -> cons;
+inferred_bif_type(length, [_]) -> list;
+inferred_bif_type(map_size, [_]) -> map;
+inferred_bif_type('not', [_]) -> t_boolean();
+inferred_bif_type(round, [_]) -> number;
+inferred_bif_type(trunc, [_]) -> number;
+inferred_bif_type(tl, [_]) -> cons;
+inferred_bif_type(tuple_size, [_]) -> #t_tuple{};
+inferred_bif_type('and', [_,_]) -> t_boolean();
+inferred_bif_type('or', [_,_]) -> t_boolean();
+inferred_bif_type('xor', [_,_]) -> t_boolean();
+inferred_bif_type('band', [_,_]) -> t_integer();
+inferred_bif_type('bor', [_,_]) -> t_integer();
+inferred_bif_type('bsl', [_,_]) -> t_integer();
+inferred_bif_type('bsr', [_,_]) -> t_integer();
+inferred_bif_type('bxor', [_,_]) -> t_integer();
+inferred_bif_type('div', [_,_]) -> t_integer();
+inferred_bif_type('rem', [_,_]) -> t_integer();
+inferred_bif_type('+', [_,_]) -> number;
+inferred_bif_type('-', [_,_]) -> number;
+inferred_bif_type('*', [_,_]) -> number;
+inferred_bif_type('/', [_,_]) -> number;
+inferred_bif_type(_, _) -> any.
+
+is_math_bif(cos, 1) -> true;
+is_math_bif(cosh, 1) -> true;
+is_math_bif(sin, 1) -> true;
+is_math_bif(sinh, 1) -> true;
+is_math_bif(tan, 1) -> true;
+is_math_bif(tanh, 1) -> true;
+is_math_bif(acos, 1) -> true;
+is_math_bif(acosh, 1) -> true;
+is_math_bif(asin, 1) -> true;
+is_math_bif(asinh, 1) -> true;
+is_math_bif(atan, 1) -> true;
+is_math_bif(atanh, 1) -> true;
+is_math_bif(erf, 1) -> true;
+is_math_bif(erfc, 1) -> true;
+is_math_bif(exp, 1) -> true;
+is_math_bif(log, 1) -> true;
+is_math_bif(log2, 1) -> true;
+is_math_bif(log10, 1) -> true;
+is_math_bif(sqrt, 1) -> true;
+is_math_bif(atan2, 2) -> true;
+is_math_bif(pow, 2) -> true;
+is_math_bif(ceil, 1) -> true;
+is_math_bif(floor, 1) -> true;
+is_math_bif(fmod, 2) -> true;
+is_math_bif(pi, 0) -> true;
+is_math_bif(_, _) -> false.
+
+join_types(Ts0, Ts1) ->
+    if
+        map_size(Ts0) < map_size(Ts1) ->
+            join_types_1(maps:keys(Ts0), Ts1, Ts0);
+        true ->
+            join_types_1(maps:keys(Ts1), Ts0, Ts1)
+    end.
+
+join_types_1([V|Vs], Ts0, Ts1) ->
+    case {Ts0,Ts1} of
+        {#{V:=Same},#{V:=Same}} ->
+            join_types_1(Vs, Ts0, Ts1);
+        {#{V:=T0},#{V:=T1}} ->
+            case join(T0, T1) of
+                T1 ->
+                    join_types_1(Vs, Ts0, Ts1);
+                T ->
+                    join_types_1(Vs, Ts0, Ts1#{V:=T})
+            end;
+        {#{},#{V:=_}} ->
+            join_types_1(Vs, Ts0, Ts1)
+    end;
+join_types_1([], Ts0, Ts1) ->
+    maps:merge(Ts0, Ts1).
+
+join([T1,T2|Ts]) ->
+    join([join(T1, T2)|Ts]);
+join([T]) -> T.
+
+get_literal_from_type(#t_atom{elements=[Atom]}) ->
+    #b_literal{val=Atom};
+get_literal_from_type(#t_integer{elements={Int,Int}}) ->
+    #b_literal{val=Int};
+get_literal_from_type(nil) ->
+    #b_literal{val=[]};
+get_literal_from_type(_) -> none.
+
+remove_element_info(#t_integer{elements={Min,Max}}, Es) ->
+    foldl(fun(El, Acc) when Min =< El, El =< Max ->
+                  maps:remove(El, Acc);
+             (_El, Acc) -> Acc
+          end, Es, maps:keys(Es)).
+
+t_atom() ->
+    #t_atom{elements=any}.
+
+t_atom(Atom) when is_atom(Atom) ->
+    #t_atom{elements=[Atom]}.
+
+t_boolean() ->
+    #t_atom{elements=[false,true]}.
+
+t_integer() ->
+    #t_integer{elements=any}.
+
+t_integer(Int) when is_integer(Int) ->
+    #t_integer{elements={Int,Int}}.
+
+t_integer(Min, Max) when is_integer(Min), is_integer(Max) ->
+    #t_integer{elements={Min,Max}}.
+
+t_is_boolean(#t_atom{elements=[F,T]}) ->
+    F =:= false andalso T =:= true;
+t_is_boolean(#t_atom{elements=[B]}) ->
+    is_boolean(B);
+t_is_boolean(_) -> false.
+
+t_tuple_size(#t_tuple{size=Size,exact=false}) ->
+    {at_least,Size};
+t_tuple_size(#t_tuple{size=Size,exact=true}) ->
+    {exact,Size};
+t_tuple_size(_) ->
+    none.
+
+is_singleton_type(Type) ->
+    get_literal_from_type(Type) =/= none.
+
+get_element_type(Index, Es) ->
+    case Es of
+        #{ Index := T } -> T;
+        #{} -> any
+    end.
+
+set_element_type(_Key, none, Es) ->
+    Es;
+set_element_type(Key, any, Es) ->
+    maps:remove(Key, Es);
+set_element_type(Key, Type, Es) ->
+    Es#{ Key => Type }.
+
+%% join(Type1, Type2) -> Type
+%%  Return the "join" of Type1 and Type2. The join is a more general
+%%  type than Type1 and Type2. For example:
+%%
+%%     join(#t_integer{elements=any}, #t_integer=elements={0,3}}) ->
+%%          #t_integer{}
+%%
+%%  The join for two different types result in 'any', which is
+%%  the top element for our type lattice:
+%%
+%%     join(#t_integer{}, map) -> any
+
+-spec join(type(), type()) -> type().
+
+join(T, T) ->
+    verified_type(T);
+join(none, T) ->
+    verified_type(T);
+join(T, none) ->
+    verified_type(T);
+join(any, _) -> any;
+join(_, any) -> any;
+join(#t_atom{elements=[_|_]=Set1}, #t_atom{elements=[_|_]=Set2}) ->
+    Set = ordsets:union(Set1, Set2),
+    case ordsets:size(Set) of
+        Size when Size =< ?ATOM_SET_SIZE ->
+            #t_atom{elements=Set};
+        _Size ->
+            #t_atom{elements=any}
+    end;
+join(#t_atom{elements=any}=T, #t_atom{elements=[_|_]}) -> T;
+join(#t_atom{elements=[_|_]}, #t_atom{elements=any}=T) -> T;
+join({binary,U1}, {binary,U2}) ->
+    {binary,gcd(U1, U2)};
+join(#t_integer{}, #t_integer{}) -> t_integer();
+join(list, cons) -> list;
+join(cons, list) -> list;
+join(nil, cons) -> list;
+join(cons, nil) -> list;
+join(nil, list) -> list;
+join(list, nil) -> list;
+join(#t_integer{}, float) -> number;
+join(float, #t_integer{}) -> number;
+join(#t_integer{}, number) -> number;
+join(number, #t_integer{}) -> number;
+join(float, number) -> number;
+join(number, float) -> number;
+join(#t_tuple{size=Sz,exact=ExactA,elements=EsA},
+     #t_tuple{size=Sz,exact=ExactB,elements=EsB}) ->
+    Exact = ExactA and ExactB,
+    Es = join_tuple_elements(Sz, EsA, EsB),
+    #t_tuple{size=Sz,exact=Exact,elements=Es};
+join(#t_tuple{size=SzA,elements=EsA}, #t_tuple{size=SzB,elements=EsB}) ->
+    Sz = min(SzA, SzB),
+    Es = join_tuple_elements(Sz, EsA, EsB),
+    #t_tuple{size=Sz,elements=Es};
+join(_T1, _T2) ->
+    %%io:format("~p ~p\n", [_T1,_T2]),
+    any.
+
+join_tuple_elements(MinSize, EsA, EsB) ->
+    Es0 = join_elements(EsA, EsB),
+    maps:filter(fun(Index, _Type) -> Index =< MinSize end, Es0).
+
+join_elements(Es1, Es2) ->
+    Keys = if
+               map_size(Es1) =< map_size(Es2) -> maps:keys(Es1);
+               map_size(Es1) > map_size(Es2) -> maps:keys(Es2)
+           end,
+    join_elements_1(Keys, Es1, Es2, #{}).
+
+join_elements_1([Key | Keys], Es1, Es2, Acc0) ->
+    case {Es1, Es2} of
+        {#{ Key := Type1 }, #{ Key := Type2 }} ->
+            Acc = set_element_type(Key, join(Type1, Type2), Acc0),
+            join_elements_1(Keys, Es1, Es2, Acc);
+        {#{}, #{}} ->
+            join_elements_1(Keys, Es1, Es2, Acc0)
+    end;
+join_elements_1([], _Es1, _Es2, Acc) ->
+    Acc.
+
+gcd(A, B) ->
+    case A rem B of
+        0 -> B;
+        X -> gcd(B, X)
+    end.
+
+meet_types([{V,T0}|Vs], Ts) ->
+    #{V:=T1} = Ts,
+    case meet(T0, T1) of
+        T1 -> meet_types(Vs, Ts);
+        T -> meet_types(Vs, Ts#{V:=T})
+    end;
+meet_types([], Ts) -> Ts.
+
+meet([T1,T2|Ts]) ->
+    meet([meet(T1, T2)|Ts]);
+meet([T]) -> T.
+
+subtract_types([{V,T0}|Vs], Ts) ->
+    #{V:=T1} = Ts,
+    case subtract(T1, T0) of
+        T1 -> subtract_types(Vs, Ts);
+        T -> subtract_types(Vs, Ts#{V:=T})
+    end;
+subtract_types([], Ts) -> Ts.
+
+%% subtract(Type1, Type2) -> Type.
+%%  Subtract Type2 from Type1. Example:
+%%
+%%     subtract(list, cons) -> nil
+
+subtract(#t_atom{elements=[_|_]=Set0}, #t_atom{elements=[_|_]=Set1}) ->
+    case ordsets:subtract(Set0, Set1) of
+        [] -> none;
+        [_|_]=Set -> #t_atom{elements=Set}
+    end;
+subtract(number, float) -> #t_integer{};
+subtract(number, #t_integer{elements=any}) -> float;
+subtract(list, cons) -> nil;
+subtract(list, nil) -> cons;
+subtract(T, _) -> T.
+
+%% meet(Type1, Type2) -> Type
+%%  Return the "meet" of Type1 and Type2. The meet is a narrower
+%%  type than Type1 and Type2. For example:
+%%
+%%     meet(#t_integer{elements=any}, #t_integer{elements={0,3}}) ->
+%%          #t_integer{elements={0,3}}
+%%
+%%  The meet for two different types result in 'none', which is
+%%  the bottom element for our type lattice:
+%%
+%%     meet(#t_integer{}, map) -> none
+
+-spec meet(type(), type()) -> type().
+
+meet(T, T) ->
+    verified_type(T);
+meet(#t_atom{elements=[_|_]=Set1}, #t_atom{elements=[_|_]=Set2}) ->
+    case ordsets:intersection(Set1, Set2) of
+        [] ->
+            none;
+        [_|_]=Set ->
+            #t_atom{elements=Set}
+    end;
+meet(#t_atom{elements=[_|_]}=T, #t_atom{elements=any}) ->
+    T;
+meet(#t_atom{elements=any}, #t_atom{elements=[_|_]}=T) ->
+    T;
+meet(#t_integer{elements={_,_}}=T, #t_integer{elements=any}) ->
+    T;
+meet(#t_integer{elements=any}, #t_integer{elements={_,_}}=T) ->
+    T;
+meet(#t_integer{elements={Min1,Max1}},
+     #t_integer{elements={Min2,Max2}}) ->
+    #t_integer{elements={max(Min1, Min2),min(Max1, Max2)}};
+meet(#t_integer{}=T, number) -> T;
+meet(float=T, number) -> T;
+meet(number, #t_integer{}=T) -> T;
+meet(number, float=T) -> T;
+meet(list, cons) -> cons;
+meet(list, nil) -> nil;
+meet(cons, list) -> cons;
+meet(nil, list) -> nil;
+meet(#t_tuple{}=T1, #t_tuple{}=T2) ->
+    meet_tuples(T1, T2);
+meet({binary,U1}, {binary,U2}) ->
+    {binary,max(U1, U2)};
+meet(any, T) ->
+    verified_type(T);
+meet(T, any) ->
+    verified_type(T);
+meet(_, _) ->
+    %% Inconsistent types. There will be an exception at runtime.
+    none.
+
+meet_tuples(#t_tuple{size=Sz1,exact=true},
+            #t_tuple{size=Sz2,exact=true}) when Sz1 =/= Sz2 ->
+    none;
+meet_tuples(#t_tuple{size=Sz1,exact=Ex1,elements=Es1},
+            #t_tuple{size=Sz2,exact=Ex2,elements=Es2}) ->
+    Size = max(Sz1, Sz2),
+    Exact = Ex1 or Ex2,
+    case meet_elements(Es1, Es2) of
+        none ->
+            none;
+        Es ->
+            #t_tuple{size=Size,exact=Exact,elements=Es}
+    end.
+
+meet_elements(Es1, Es2) ->
+    Keys = maps:keys(Es1) ++ maps:keys(Es2),
+    meet_elements_1(Keys, Es1, Es2, #{}).
+
+meet_elements_1([Key | Keys], Es1, Es2, Acc) ->
+    case {Es1, Es2} of
+        {#{ Key := Type1 }, #{ Key := Type2 }} ->
+            case meet(Type1, Type2) of
+                none -> none;
+                Type -> meet_elements_1(Keys, Es1, Es2, Acc#{ Key => Type })
+            end;
+        {#{ Key := Type1 }, _} ->
+            meet_elements_1(Keys, Es1, Es2, Acc#{ Key => Type1 });
+        {_, #{ Key := Type2 }} ->
+            meet_elements_1(Keys, Es1, Es2, Acc#{ Key => Type2 })
+    end;
+meet_elements_1([], _Es1, _Es2, Acc) ->
+    Acc.
+
+%% 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).
+%%
+%%  #t_atom{}            Any atom or some specific atoms.
+%%  {binary,Unit}        Binary/bitstring aligned to unit Unit.
+%%  float                Floating point number.
+%%  #t_integer{}         Integer
+%%  list                 Empty or nonempty list.
+%%  map                  Map.
+%%  nil                  Empty list.
+%%  cons                 Cons (nonempty list).
+%%  number               A number (float or integer).
+%%  #t_tuple{}           Tuple.
+%%
+%%  none                 No type (bottom element for the type lattice).
+
+-spec verified_type(T) -> T when
+      T :: type().
+
+verified_type(any=T) -> T;
+verified_type(none=T) -> T;
+verified_type(#t_atom{elements=any}=T) -> T;
+verified_type(#t_atom{elements=[_|_]}=T) -> T;
+verified_type({binary,U}=T) when is_integer(U) -> T;
+verified_type(#t_integer{elements=any}=T) -> T;
+verified_type(#t_integer{elements={Min,Max}}=T)
+  when is_integer(Min), is_integer(Max) -> T;
+verified_type(list=T) -> T;
+verified_type(map=T) -> T;
+verified_type(nil=T) -> T;
+verified_type(cons=T) -> T;
+verified_type(number=T) -> T;
+verified_type(#t_tuple{size=Size,elements=Es}=T) ->
+    %% All known elements must have a valid index and type. 'any' is prohibited
+    %% since it's implicit and should never be present in the map.
+    maps:fold(fun(Index, Element, _) when is_integer(Index),
+                                          1 =< Index, Index =< Size,
+                                          Element =/= any, Element =/= none ->
+                      verified_type(Element)
+              end, [], Es),
+    T;
+verified_type(float=T) -> T.
diff --git a/lib/compiler/src/beam_trim.erl b/lib/compiler/src/beam_trim.erl
index 4da0985085..acf3838da4 100644
--- a/lib/compiler/src/beam_trim.erl
+++ b/lib/compiler/src/beam_trim.erl
@@ -21,12 +21,11 @@
 -module(beam_trim).
 -export([module/2]).
 
--import(lists, [reverse/1,reverse/2,splitwith/2,sort/1]).
+-import(lists, [any/2,member/2,reverse/1,reverse/2,splitwith/2,sort/1]).
 
 -record(st,
-	{safe :: gb_sets:set(beam_asm:label()), %Safe labels.
-	 lbl :: beam_utils:code_index()         %Code at each label.
-	 }).
+	{safe :: cerl_sets:set(beam_asm:label()) %Safe labels.
+        }).
 
 -spec module(beam_utils:module_code(), [compile:option()]) ->
                     {'ok',beam_utils:module_code()}.
@@ -36,10 +35,15 @@ module({Mod,Exp,Attr,Fs0,Lc}, _Opts) ->
     {ok,{Mod,Exp,Attr,Fs,Lc}}.
 
 function({function,Name,Arity,CLabel,Is0}) ->
-    %%ok = io:fwrite("~w: ~p\n", [?LINE,{Name,Arity}]),
-    St = #st{safe=safe_labels(Is0, []),lbl=beam_utils:index_labels(Is0)},
-    Is = trim(Is0, St, []),
-    {function,Name,Arity,CLabel,Is}.
+    try
+        St = #st{safe=safe_labels(Is0, [])},
+        Is = trim(Is0, St, []),
+        {function,Name,Arity,CLabel,Is}
+    catch
+        Class:Error:Stack ->
+	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
+	    erlang:raise(Class, Error, Stack)
+    end.
 
 trim([{kill,_}|_]=Is0, St, Acc) ->
     {Kills0,Is1} = splitwith(fun({kill,_}) -> true;
@@ -47,14 +51,33 @@ trim([{kill,_}|_]=Is0, St, Acc) ->
 			    end, Is0),
     Kills = sort(Kills0),
     try
-	{FrameSize,Layout} = frame_layout(Is1, Kills, St),
-	Configs = trim_instructions(Layout),
-	try_remap(Configs, Is1, FrameSize)
-	of
+        %% Find out the size and layout of the stack frame.
+        %% Example of a layout:
+        %%
+        %%    [{kill,{y,0}},{dead,{y,1},{live,{y,2}},{kill,{y,3}}]
+        %%
+        %% That means that y0 and y3 are to be killed, that y1
+        %% has been killed previously, and that y2 is live.
+        {FrameSize,Layout} = frame_layout(Is1, Kills, St),
+
+        %% Calculate all recipes that are not worse in terms
+        %% of estimated execution time. The recipes are ordered
+        %% in descending order from how much they trim.
+        Recipes = trim_recipes(Layout),
+
+        %% Try the recipes in order. A recipe may not work out because
+        %% a register that was previously killed may be
+        %% resurrected. If that happens, the next recipe, which trims
+        %% less, will be tried.
+        try_remap(Recipes, Is1, FrameSize)
+    of
 	{Is,TrimInstr} ->
+            %% One of the recipes was applied.
 	    trim(Is, St, reverse(TrimInstr)++Acc)
     catch
 	not_possible ->
+            %% No recipe worked out. Use the original kill
+            %% instructions.
 	    trim(Is1, St, reverse(Kills, Acc))
     end;
 trim([I|Is], St, Acc) ->
@@ -62,34 +85,42 @@ trim([I|Is], St, Acc) ->
 trim([], _, Acc) ->
     reverse(Acc).
 
-%% trim_instructions([{kill,R}|{live,R}|{dead,R}]) -> {[Instruction],MapFun}
-%%  Figure out the sequence of moves and trim to use.
+%% trim_recipes([{kill,R}|{live,R}|{dead,R}]) -> [Recipe].
+%%      Recipe = {Kills,NumberToTrim,Moves}
+%%      Kills = [{kill,Y}]
+%%      Moves = [{move,SrcY,DstY}]
+%%
+%%  Calculate how to best trim the stack and kill the correct
+%%  Y registers. Return a list of possible recipes. The best
+%%  recipe (the one that trims the most) is first in the list.
+%%  All of the recipes are no worse in estimated execution time
+%%  than the original sequences of kill instructions.
 
-trim_instructions(Layout) ->
+trim_recipes(Layout) ->
     Cost = length([I || {kill,_}=I <- Layout]),
-    trim_instructions_1(Layout, 0, [], {Cost,[]}).
+    trim_recipes_1(Layout, 0, [], {Cost,[]}).
 
-trim_instructions_1([{kill,{y,Trim0}}|Ks], Trim0, Moves, Config0) ->
+trim_recipes_1([{kill,{y,Trim0}}|Ks], Trim0, Moves, Recipes0) ->
     Trim = Trim0 + 1,
-    Config = save_config(Ks, Trim, Moves, Config0),
-    trim_instructions_1(Ks, Trim, Moves, Config);
-trim_instructions_1([{dead,{y,Trim0}}|Ks], Trim0, Moves, Config0) ->
+    Recipes = save_recipe(Ks, Trim, Moves, Recipes0),
+    trim_recipes_1(Ks, Trim, Moves, Recipes);
+trim_recipes_1([{dead,{y,Trim0}}|Ks], Trim0, Moves, Recipes0) ->
     Trim = Trim0 + 1,
-    Config = save_config(Ks, Trim, Moves, Config0),
-    trim_instructions_1(Ks, Trim, Moves, Config);
-trim_instructions_1([{live,{y,Trim0}=Src}|Ks0], Trim0, Moves0, Config0) ->
+    Recipes = save_recipe(Ks, Trim, Moves, Recipes0),
+    trim_recipes_1(Ks, Trim, Moves, Recipes);
+trim_recipes_1([{live,{y,Trim0}=Src}|Ks0], Trim0, Moves0, Recipes0) ->
     case take_last_dead(Ks0) of
 	none ->
-	    {_,ConfigList} = Config0,
-	    ConfigList;
+            {_,RecipesList} = Recipes0,
+            RecipesList;
 	{Dst,Ks} ->
 	    Trim = Trim0 + 1,
 	    Moves = [{move,Src,Dst}|Moves0],
-	    Config = save_config(Ks, Trim, Moves, Config0),
-	    trim_instructions_1(Ks, Trim, Moves, Config)
+            Recipes = save_recipe(Ks, Trim, Moves, Recipes0),
+            trim_recipes_1(Ks, Trim, Moves, Recipes)
     end;
-trim_instructions_1([], _, _, {_,ConfigList}) ->
-    ConfigList.
+trim_recipes_1([], _, _, {_,RecipesList}) ->
+    RecipesList.
 
 take_last_dead(L) ->
     take_last_dead_1(reverse(L)).
@@ -100,28 +131,48 @@ take_last_dead_1([{dead,Reg}|Is]) ->
     {Reg,reverse(Is)};
 take_last_dead_1(_) -> none.
 
-save_config(Ks, Trim, Moves, {MaxCost,Acc}=Config) ->
-    case config_cost(Ks, Moves) of
-	Cost when Cost =< MaxCost ->
-	    {MaxCost,[{Ks,Trim,Moves}|Acc]};
+save_recipe(Ks, Trim, Moves, {MaxCost,Acc}=Recipes) ->
+    case recipe_cost(Ks, Moves) of
+        Cost when Cost =< MaxCost ->
+            %% The price is right.
+            {MaxCost,[{Ks,Trim,Moves}|Acc]};
 	_Cost ->
-	    Config
+            %% Too expensive.
+            Recipes
     end.
 
-config_cost(Ks, Moves) ->
+recipe_cost(Ks, Moves) ->
     %% We estimate that a {move,{y,_},{y,_}} instruction is roughly twice as
     %% expensive as a {kill,{y,_}} instruction. A {trim,_} instruction is
     %% roughly as expensive as a {kill,{y,_}} instruction.
 
-    config_cost_1(Ks, 1+2*length(Moves)).
+    recipe_cost_1(Ks, 1+2*length(Moves)).
 
-config_cost_1([{kill,_}|Ks], Cost) ->
-    config_cost_1(Ks, Cost+1);
-config_cost_1([_|Ks], Cost) ->
-    config_cost_1(Ks, Cost);
-config_cost_1([], Cost) -> Cost.
+recipe_cost_1([{kill,_}|Ks], Cost) ->
+    recipe_cost_1(Ks, Cost+1);
+recipe_cost_1([_|Ks], Cost) ->
+    recipe_cost_1(Ks, Cost);
+recipe_cost_1([], Cost) -> Cost.
 
-expand_config({Layout,Trim,Moves}, FrameSize) ->
+%% try_remap([Recipe], [Instruction], FrameSize) ->
+%%           {[Instruction],[TrimInstruction]}.
+%%  Try to renumber Y registers in the instruction stream. The
+%%  first rececipe that works will be used.
+%%
+%%  This function will issue a `not_possible` exception if none
+%%  of the recipes were possible to apply.
+
+try_remap([R|Rs], Is, FrameSize) ->
+    {TrimInstr,Map} = expand_recipe(R, FrameSize),
+    try
+	{remap(Is, Map, []),TrimInstr}
+    catch
+	throw:not_possible ->
+	    try_remap(Rs, Is, FrameSize)
+    end;
+try_remap([], _, _) -> throw(not_possible).
+
+expand_recipe({Layout,Trim,Moves}, FrameSize) ->
     Kills = [Kill || {kill,_}=Kill <- Layout],
     {Kills++reverse(Moves, [{trim,Trim,FrameSize-Trim}]),create_map(Trim, Moves)}.
 
@@ -132,16 +183,16 @@ create_map(Trim, []) ->
        (Any) -> Any
     end;
 create_map(Trim, Moves) ->
-    GbTree0 = [{Src,Dst-Trim} || {move,{y,Src},{y,Dst}} <- Moves],
-    GbTree = gb_trees:from_orddict(sort(GbTree0)),
-    IllegalTargets = gb_sets:from_list([Dst || {move,_,{y,Dst}} <- Moves]),
+    Map0 = [{Src,Dst-Trim} || {move,{y,Src},{y,Dst}} <- Moves],
+    Map = maps:from_list(Map0),
+    IllegalTargets = cerl_sets:from_list([Dst || {move,_,{y,Dst}} <- Moves]),
     fun({y,Y0}) when Y0 < Trim ->
-	    case gb_trees:lookup(Y0, GbTree) of
-		{value,Y} -> {y,Y};
-		none -> throw(not_possible)
-	    end;
+            case Map of
+                #{Y0:=Y} -> {y,Y};
+                #{} -> throw(not_possible)
+            end;
        ({y,Y}) ->
-	    case gb_sets:is_element(Y, IllegalTargets) of
+	    case cerl_sets:is_element(Y, IllegalTargets) of
 		true -> throw(not_possible);
 		false -> {y,Y-Trim}
 	    end;
@@ -149,19 +200,17 @@ create_map(Trim, Moves) ->
        (Any) -> Any
     end.
 
-try_remap([C|Cs], Is, FrameSize) ->
-    {TrimInstr,Map} = expand_config(C, FrameSize),
-    try
-	{remap(Is, Map, []),TrimInstr}
-    catch
-	throw:not_possible ->
-	    try_remap(Cs, Is, FrameSize)
-    end;
-try_remap([], _, _) -> throw(not_possible).
-
+remap([{'%',_}=I|Is], Map, Acc) ->
+    remap(Is, Map, [I|Acc]);
 remap([{block,Bl0}|Is], Map, Acc) ->
     Bl = remap_block(Bl0, Map, []),
     remap(Is, Map, [{block,Bl}|Acc]);
+remap([{bs_get_tail,Src,Dst,Live}|Is], Map, Acc) ->
+    I = {bs_get_tail,Map(Src),Map(Dst),Live},
+    remap(Is, Map, [I|Acc]);
+remap([{bs_set_position,Src1,Src2}|Is], Map, Acc) ->
+    I = {bs_set_position,Map(Src1),Map(Src2)},
+    remap(Is, Map, [I|Acc]);
 remap([{call_fun,_}=I|Is], Map, Acc) ->
     remap(Is, Map, [I|Acc]);
 remap([{call,_,_}=I|Is], Map, Acc) ->
@@ -205,35 +254,68 @@ remap([return|_]=Is, _, Acc) ->
     reverse(Acc, Is);
 remap([{line,_}=I|Is], Map, Acc) ->
     remap(Is, Map, [I|Acc]).
-    
+
 remap_block([{set,Ds0,Ss0,Info}|Is], Map, Acc) ->
     Ds = [Map(D) || D <- Ds0],
     Ss = [Map(S) || S <- Ss0],
     remap_block(Is, Map, [{set,Ds,Ss,Info}|Acc]);
 remap_block([], _, Acc) -> reverse(Acc).
-    
-safe_labels([{label,L},{line,_},{badmatch,{Tag,_}}|Is], Acc) when Tag =/= y ->
-    safe_labels(Is, [L|Acc]);
-safe_labels([{label,L},{line,_},{case_end,{Tag,_}}|Is], Acc) when Tag =/= y ->
-    safe_labels(Is, [L|Acc]);
-safe_labels([{label,L},{line,_},if_end|Is], Acc) ->
-    safe_labels(Is, [L|Acc]);
-safe_labels([{label,L},
-	     {block,[{set,[{x,0}],[{Tag,_}],move}]},
-	     {line,_},
-	     {call_ext,1,{extfunc,erlang,error,1}}|Is], Acc) when Tag =/= y ->
-    safe_labels(Is, [L|Acc]);
+
+%% safe_labels([Instruction], Accumulator) -> gb_set()
+%%  Build a gb_set of safe labels. The code at a safe
+%%  label does not depend on the values in a specific
+%%  Y register, only that all Y registers are initialized
+%%  so that it safe to scan the stack when an exception
+%%  is generated.
+%%
+%%  In other words, code at a safe label will continue
+%%  to work if Y registers have been renumbered and
+%%  the size of the stack frame has changed.
+
+safe_labels([{label,L}|Is], Acc) ->
+    case is_safe_label(Is) of
+        true -> safe_labels(Is, [L|Acc]);
+        false -> safe_labels(Is, Acc)
+    end;
 safe_labels([_|Is], Acc) ->
     safe_labels(Is, Acc);
-safe_labels([], Acc) -> gb_sets:from_list(Acc).
+safe_labels([], Acc) -> cerl_sets:from_list(Acc).
+
+is_safe_label([{'%',_}|Is]) ->
+    is_safe_label(Is);
+is_safe_label([{line,_}|Is]) ->
+    is_safe_label(Is);
+is_safe_label([{badmatch,{Tag,_}}|_]) ->
+    Tag =/= y;
+is_safe_label([{case_end,{Tag,_}}|_]) ->
+    Tag =/= y;
+is_safe_label([{try_case_end,{Tag,_}}|_]) ->
+    Tag =/= y;
+is_safe_label([if_end|_]) ->
+    true;
+is_safe_label([{block,Bl}|Is]) ->
+    is_safe_label_block(Bl) andalso is_safe_label(Is);
+is_safe_label([{call_ext,_,{extfunc,M,F,A}}|_]) ->
+    erl_bifs:is_exit_bif(M, F, A);
+is_safe_label(_) -> false.
+
+is_safe_label_block([{set,Ds,Ss,_}|Is]) ->
+    IsYreg = fun({y,_}) -> true;
+                (_) -> false
+             end,
+    %% This instruction is safe if the instruction
+    %% neither reads or writes Y registers.
+    not (any(IsYreg, Ss) orelse any(IsYreg, Ds)) andalso
+        is_safe_label_block(Is);
+is_safe_label_block([]) -> true.
 
 %% frame_layout([Instruction], [{kill,_}], St) ->
 %%      [{kill,Reg} | {live,Reg} | {dead,Reg}]
 %%  Figure out the layout of the stack frame.
 
-frame_layout(Is, Kills, #st{safe=Safe,lbl=D}) ->
+frame_layout(Is, Kills, #st{safe=Safe}) ->
     N = frame_size(Is, Safe),
-    IsKilled = fun(R) -> beam_utils:is_not_used(R, Is, D) end,
+    IsKilled = fun(R) -> is_not_used(R, Is) end,
     {N,frame_layout_1(Kills, 0, N, IsKilled, [])}.
 
 frame_layout_1([{kill,{y,Y}}=I|Ks], Y, N, IsKilled, Acc) ->
@@ -253,7 +335,14 @@ frame_layout_2(Is) -> reverse(Is).
 
 %% frame_size([Instruction], SafeLabels) -> FrameSize
 %%  Find out the frame size by looking at the code that follows.
+%%
+%%  Implicitly, also check that the instructions are a straight
+%%  sequence of code that ends in a return. Any branches are
+%%  to safe labels (i.e., the code at those labels don't depend
+%%  on the contents of any Y register).
 
+frame_size([{'%',_}|Is], Safe) ->
+    frame_size(Is, Safe);
 frame_size([{block,_}|Is], Safe) ->
     frame_size(Is, Safe);
 frame_size([{call_fun,_}|Is], Safe) ->
@@ -285,15 +374,94 @@ frame_size([{make_fun2,_,_,_,_}|Is], Safe) ->
     frame_size(Is, Safe);
 frame_size([{get_map_elements,{f,L},_,_}|Is], Safe) ->
     frame_size_branch(L, Is, Safe);
-frame_size([{deallocate,N}|_], _) -> N;
+frame_size([{deallocate,N}|_], _) ->
+    N;
 frame_size([{line,_}|Is], Safe) ->
     frame_size(Is, Safe);
-frame_size([_|_], _) -> throw(not_possible).
+frame_size([{bs_set_position,_,_}|Is], Safe) ->
+    frame_size(Is, Safe);
+frame_size([{bs_get_tail,_,_,_}|Is], Safe) ->
+    frame_size(Is, Safe);
+frame_size(_, _) -> throw(not_possible).
 
 frame_size_branch(0, Is, Safe) ->
     frame_size(Is, Safe);
 frame_size_branch(L, Is, Safe) ->
-    case gb_sets:is_member(L, Safe) of
+    case cerl_sets:is_element(L, Safe) of
 	false -> throw(not_possible);
 	true -> frame_size(Is, Safe)
     end.
+
+%% is_not_used(Y, [Instruction]) -> true|false.
+%%  Test whether the value of Y is unused in the instruction sequence.
+%%  Return true if the value of Y is not used, and false if it is used.
+%%
+%%  This function handles the same instructions as frame_size/2. It
+%%  assumes that any labels in the instructions are safe labels.
+
+is_not_used(Y, [{'%',_}|Is]) ->
+    is_not_used(Y, Is);
+is_not_used(Y, [{apply,_}|Is]) ->
+    is_not_used(Y, Is);
+is_not_used(Y, [{bif,_,{f,_},Ss,Dst}|Is]) ->
+    is_not_used_ss_dst(Y, Ss, Dst, Is);
+is_not_used(Y, [{block,Bl}|Is]) ->
+    case is_not_used_block(Y, Bl) of
+        used -> false;
+        killed -> true;
+        transparent -> is_not_used(Y, Is)
+    end;
+is_not_used(Y, [{bs_get_tail,Src,Dst,_}|Is]) ->
+    is_not_used_ss_dst(Y, [Src], Dst, Is);
+is_not_used(Y, [{bs_init,_,_,_,Ss,Dst}|Is]) ->
+    is_not_used_ss_dst(Y, Ss, Dst, Is);
+is_not_used(Y, [{bs_put,{f,_},_,Ss}|Is]) ->
+    not member(Y, Ss) andalso is_not_used(Y, Is);
+is_not_used(Y, [{bs_set_position,Src1,Src2}|Is]) ->
+    Y =/= Src1 andalso Y =/= Src2 andalso
+        is_not_used(Y, Is);
+is_not_used(Y, [{call,_,_}|Is]) ->
+    is_not_used(Y, Is);
+is_not_used(Y, [{call_ext,_,_}=I|Is]) ->
+    beam_jump:is_exit_instruction(I) orelse is_not_used(Y, Is);
+is_not_used(Y, [{call_fun,_}|Is]) ->
+    is_not_used(Y, Is);
+is_not_used(_Y, [{deallocate,_}|_]) ->
+    true;
+is_not_used(Y, [{gc_bif,_,{f,_},_Live,Ss,Dst}|Is]) ->
+    is_not_used_ss_dst(Y, Ss, Dst, Is);
+is_not_used(Y, [{get_map_elements,{f,_},S,{list,List}}|Is]) ->
+    {Ss,Ds} = beam_utils:split_even(List),
+    case member(Y, [S|Ss]) of
+	true ->
+	    false;
+	false ->
+            member(Y, Ds) orelse is_not_used(Y, Is)
+    end;
+is_not_used(Y, [{kill,Yreg}|Is]) ->
+    Y =:= Yreg orelse is_not_used(Y, Is);
+is_not_used(Y, [{line,_}|Is]) ->
+    is_not_used(Y, Is);
+is_not_used(Y, [{make_fun2,_,_,_,_}|Is]) ->
+    is_not_used(Y, Is);
+is_not_used(Y, [{test,_,_,Ss}|Is]) ->
+    not member(Y, Ss) andalso is_not_used(Y, Is);
+is_not_used(Y, [{test,_Op,{f,_},_Live,Ss,Dst}|Is]) ->
+    is_not_used_ss_dst(Y, Ss, Dst, Is).
+
+is_not_used_block(Y, [{set,Ds,Ss,_}|Is]) ->
+    case member(Y, Ss) of
+        true ->
+            used;
+        false ->
+            case member(Y, Ds) of
+                true ->
+                    killed;
+                false ->
+                    is_not_used_block(Y, Is)
+            end
+    end;
+is_not_used_block(_Y, []) -> transparent.
+
+is_not_used_ss_dst(Y, Ss, Dst, Is) ->
+    not member(Y, Ss) andalso (Y =:= Dst orelse is_not_used(Y, Is)).
diff --git a/lib/compiler/src/beam_type.erl b/lib/compiler/src/beam_type.erl
deleted file mode 100644
index b5c979e529..0000000000
--- a/lib/compiler/src/beam_type.erl
+++ /dev/null
@@ -1,1117 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% 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.
-%% 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: 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, [foldl/3,member/2,reverse/1,reverse/2,sort/1]).
-
--define(UNICODE_INT, {integer,{0,16#10FFFF}}).
-
--spec module(beam_utils:module_code(), [compile:option()]) ->
-                    {'ok',beam_utils:module_code()}.
-
-module({Mod,Exp,Attr,Fs0,Lc}, _Opts) ->
-    Fs = [function(F) || F <- Fs0],
-    {ok,{Mod,Exp,Attr,Fs,Lc}}.
-
-function({function,Name,Arity,CLabel,Asm0}) ->
-    try
-	Asm1 = beam_utils:live_opt(Asm0),
-	Asm2 = opt(Asm1, [], tdb_new()),
-	Asm3 = beam_utils:live_opt(Asm2),
-	Asm = beam_utils:delete_annos(Asm3),
-	{function,Name,Arity,CLabel,Asm}
-    catch
-        Class:Error:Stack ->
-	    io:fwrite("Function: ~w/~w\n", [Name,Arity]),
-	    erlang:raise(Class, Error, Stack)
-    end.
-
-%% opt([Instruction], Accumulator, TypeDb) -> {[Instruction'],TypeDb'}
-%%  Keep track of type information; try to simplify.
-
-opt([{block,Body1}|Is], [{block,Body0}|Acc], Ts0) ->
-    {Body2,Ts} = simplify(Body1, Ts0),
-    Body = merge_blocks(Body0, Body2),
-    opt(Is, [{block,Body}|Acc], Ts);
-opt([{block,Body0}|Is], Acc, Ts0) ->
-    {Body,Ts} = simplify(Body0, Ts0),
-    opt(Is, [{block,Body}|Acc], Ts);
-opt([I0|Is], Acc, Ts0) ->
-    case simplify_basic([I0], Ts0) of
-	{[],Ts} -> opt(Is, Acc, Ts);
-	{[I],Ts} -> opt(Is, [I|Acc], Ts)
-    end;
-opt([], Acc, _) -> reverse(Acc).
-
-%% simplify(Instruction, TypeDb) -> NewInstruction
-%%  Simplify an instruction using type information (this is
-%%  technically a "strength reduction").
-
-simplify(Is0, TypeDb0) ->
-    {Is,_} = BasicRes = simplify_basic(Is0, TypeDb0),
-    case simplify_float(Is, TypeDb0) of
-	not_possible -> BasicRes;
-	{_,_}=Res -> Res
-    end.
-
-%% simplify_basic([Instruction], TypeDatabase) -> {[Instruction],TypeDatabase'}
-%%  Basic simplification, mostly tuples, no floating point optimizations.
-
-simplify_basic(Is, Ts) ->
-    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_instr({test,Test,Fail,[R]}=I, Ts) ->
-    case tdb_find(R, Ts) of
-        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_instr({test,test_arity,_,[R,Arity]}=I, Ts) ->
-    case tdb_find(R, Ts) of
-        {tuple,exact_size,Arity,_} -> [];
-        _ -> [I]
-    end;
-simplify_instr({test,is_eq_exact,Fail,[R,{atom,A}=Atom]}=I, Ts) ->
-    case tdb_find(R, Ts) of
-        {atom,_}=Atom -> [];
-        boolean when is_boolean(A) -> [I];
-        any -> [I];
-        _ -> [{jump,Fail}]
-    end;
-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_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_instr(I, _) -> [I].
-
-simplify_select_val_int({select,select_val,R,_,L0}=I, {Min,Max}) ->
-    Vs = sort([V || {integer,V} <- L0]),
-    case eq_ranges(Vs, Min, Max) of
-	false -> I;
-	true -> simplify_select_val_1(L0, {integer,Max}, R, [])
-    end.
-
-simplify_select_val_bool({select,select_val,R,_,L}=I) ->
-    Vs = sort([V || {atom,V} <- L]),
-    case Vs of
-	[false,true] ->
-	    simplify_select_val_1(L, {atom,false}, R, []);
-	_ ->
-	    I
-    end.
-
-simplify_select_val_1([Val,F|T], Val, R, Acc) ->
-    L = reverse(Acc, T),
-    {select,select_val,R,F,L};
-simplify_select_val_1([V,F|T], Val, R, Acc) ->
-    simplify_select_val_1(T, Val, R, [F,V|Acc]).
-
-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.
-%%
-simplify_float(Is0, Ts0) ->
-    {Is1,Ts} = simplify_float_1(Is0, Ts0, [], []),
-    Is2 = opt_fmoves(Is1, []),
-    Is3 = flt_need_heap(Is2),
-    try
-	{flt_liveness(Is3),Ts}
-    catch
-	throw:not_possible -> not_possible
-    end.
-
-simplify_float_1([{set,[],[],fclearerror}|Is], Ts, Rs, Acc) ->
-    simplify_float_1(Is, Ts, Rs, clearerror(Acc));
-simplify_float_1([{set,[],[],fcheckerror}|Is], Ts, Rs, Acc) ->
-    simplify_float_1(Is, Ts, Rs, checkerror(Acc));
-simplify_float_1([{set,[{fr,_}],_,_}=I|Is], Ts, Rs, Acc) ->
-    simplify_float_1(Is, Ts, Rs, [I|Acc]);
-simplify_float_1([{set,[D0],[A0],{alloc,_,{gc_bif,'-',{f,0}}}}=I|Is]=Is0,
-		 Ts0, Rs0, Acc0) ->
-    case tdb_find(A0, Ts0) of
-	float ->
-	    A = coerce_to_float(A0),
-	    {Rs1,Acc1} = load_reg(A, Ts0, Rs0, Acc0),
-	    {D,Rs} = find_dest(D0, Rs1),
-	    Areg = fetch_reg(A, Rs),
-	    Acc = [{set,[D],[Areg],{bif,fnegate,{f,0}}}|clearerror(Acc1)],
-	    Ts = tdb_store(D0, float, Ts0),
-	    simplify_float_1(Is, Ts, Rs, Acc);
-	_Other ->
-	    Ts = update(I, Ts0),
-	    {Rs,Acc} = flush(Rs0, Is0, Acc0),
-	    simplify_float_1(Is, Ts, Rs, [I|checkerror(Acc)])
-    end;
-simplify_float_1([{set,[D0],[A0,B0],{alloc,_,{gc_bif,Op0,{f,0}}}}=I|Is]=Is0,
-		 Ts0, Rs0, Acc0) ->
-    case float_op(Op0, A0, B0, Ts0) of
-	no ->
-	    Ts = update(I, Ts0),
-	    {Rs,Acc} = flush(Rs0, Is0, Acc0),
-	    simplify_float_1(Is, Ts, Rs, [I|checkerror(Acc)]);
-	{yes,Op} ->
-	    A = coerce_to_float(A0),
-	    B = coerce_to_float(B0),
-	    {Rs1,Acc1} = load_reg(A, Ts0, Rs0, Acc0),
-	    {Rs2,Acc2} = load_reg(B, Ts0, Rs1, Acc1),
-	    {D,Rs} = find_dest(D0, Rs2),
-	    Areg = fetch_reg(A, Rs),
-	    Breg = fetch_reg(B, Rs),
-	    Acc = [{set,[D],[Areg,Breg],{bif,Op,{f,0}}}|clearerror(Acc2)],
-	    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) ->
-    Acc = flush_all(Rs0, Is0, Acc0),
-    simplify_float_1(Is, tdb_new(), Rs0, [I|Acc]);
-simplify_float_1([{set,_,_,{line,_}}=I|Is], Ts, Rs, Acc) ->
-    simplify_float_1(Is, Ts, Rs, [I|Acc]);
-simplify_float_1([I|Is], Ts0, [], Acc) ->
-    Ts = update(I, Ts0),
-    simplify_float_1(Is, Ts, [], [I|Acc]);
-simplify_float_1([I|Is]=Is0, Ts0, Rs0, Acc0) ->
-    Ts = update(I, Ts0),
-    {Rs,Acc} = flush(Rs0, Is0, Acc0),
-    simplify_float_1(Is, Ts, Rs, [I|checkerror(Acc)]);
-simplify_float_1([], Ts, [], Acc) ->
-    Is = reverse(Acc),
-    {Is,Ts}.
-
-coerce_to_float({integer,I}=Int) ->
-    try float(I) of
-	F ->
-	    {float,F}
-    catch _:_ ->
-	    %% Let the overflow happen at run-time.
-	    Int
-    end;
-coerce_to_float(Other) -> Other.
-
-opt_fmoves([{set,[{x,_}=R],[{fr,_}]=Src,fmove}=I1,
-	    {set,[_]=Dst,[{x,_}=R],move}=I2|Is], Acc) ->
-    case beam_utils:is_killed_block(R, Is) of
-	false -> opt_fmoves(Is, [I2,I1|Acc]);
-	true -> opt_fmoves(Is, [{set,Dst,Src,fmove}|Acc])
-    end;
-opt_fmoves([I|Is], Acc) ->
-    opt_fmoves(Is, [I|Acc]);
-opt_fmoves([], Acc) -> reverse(Acc).
-
-clearerror(Is) ->
-    clearerror(Is, Is).
-
-clearerror([{set,[],[],fclearerror}|_], OrigIs) -> OrigIs;
-clearerror([{set,[],[],fcheckerror}|_], OrigIs) -> [{set,[],[],fclearerror}|OrigIs];
-clearerror([_|Is], OrigIs) -> clearerror(Is, OrigIs);
-clearerror([], OrigIs) -> [{set,[],[],fclearerror}|OrigIs].
-
-%% merge_blocks(Block1, Block2) -> Block.
-%%  Combine two blocks and eliminate any move instructions that assign
-%%  to registers that are killed later in the block.
-%%
-merge_blocks(B1, [{'%anno',_}|B2]) ->
-    merge_blocks_1(B1++[{set,[],[],stop_here}|B2]).
-
-merge_blocks_1([{set,[],_,stop_here}|Is]) -> Is;
-merge_blocks_1([{set,[D],_,move}=I|Is]) ->
-    case beam_utils:is_killed_block(D, Is) of
-	true -> merge_blocks_1(Is);
-	false -> [I|merge_blocks_1(Is)]
-    end;
-merge_blocks_1([I|Is]) -> [I|merge_blocks_1(Is)].
-
-%% flt_need_heap([Instruction]) -> [Instruction]
-%%  Insert need heap allocation instructions in the instruction stream
-%%  to properly account for both inserted floating point operations and
-%%  normal term build operations (such as put_list/3).
-%%
-%%  Ignore old heap allocation instructions (except if they allocate a stack
-%%  frame too), as they may be in the wrong place (because gc_bif instructions
-%%  could have been converted to floating point operations).
-
-flt_need_heap(Is) ->
-    flt_need_heap_1(reverse(Is), 0, 0, []).
-
-flt_need_heap_1([{set,[],[],{alloc,_,Alloc}}|Is], H, Fl, Acc) ->
-    case Alloc of
-	{_,nostack,_,_} ->
-	    %% Remove any existing test_heap/2 instruction.
-	    flt_need_heap_1(Is, H, Fl, Acc);
-	{Z,Stk,_,Inits} when is_integer(Stk) ->
-	    %% Keep any allocate*/2 instruction and recalculate heap need.
-	    I = {set,[],[],{alloc,regs,{Z,Stk,build_alloc(H, Fl),Inits}}},
-	    flt_need_heap_1(Is, 0, 0, [I|Acc])
-    end;
-flt_need_heap_1([I|Is], H0, Fl0, Acc) ->
-    {Ns,H1,Fl1} = flt_need_heap_2(I, H0, Fl0),
-    flt_need_heap_1(Is, H1, Fl1, [I|Ns]++Acc);
-flt_need_heap_1([], H, Fl, Acc) ->
-    flt_alloc(H, Fl) ++ Acc.
-
-%% First come all instructions that build. We pass through, while we
-%% add to the need for heap words and floats on the heap.
-flt_need_heap_2({set,[_],[{fr,_}],fmove}, H, Fl) ->
-    {[],H,Fl+1};
-flt_need_heap_2({set,_,_,put_list}, H, Fl) ->
-    {[],H+2,Fl};
-flt_need_heap_2({set,_,_,{put_tuple,_}}, H, Fl) ->
-    {[],H+1,Fl};
-flt_need_heap_2({set,_,_,put}, H, Fl) ->
-    {[],H+1,Fl};
-%% 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) ->
-    {[],H,Fl}.
-
-flt_alloc(0, 0) ->
-    [];
-flt_alloc(H, 0) ->
-    [{set,[],[],{alloc,regs,{nozero,nostack,H,[]}}}];
-flt_alloc(H, F) ->
-    [{set,[],[],{alloc,regs,{nozero,nostack,
-			     build_alloc(H, F),[]}}}].
-
-build_alloc(Words, 0) -> Words;
-build_alloc(Words, Floats) -> {alloc,[{words,Words},{floats,Floats}]}.
-
-
-%% flt_liveness([Instruction]) -> [Instruction]
-%%  (Re)calculate the number of live registers for each heap allocation
-%%  function. We base liveness of the number of register map at the
-%%  beginning of the instruction sequence.
-%%
-%%  A 'not_possible' term will be thrown if the set of live registers
-%%  is not continous at an allocation function (e.g. if {x,0} and {x,2}
-%%  are live, but not {x,1}).
-
-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) ->
-    Live = min(Live0, live_regs(Regs0)),
-    I = {set,Ds,Ss,{alloc,Live,Alloc}},
-    Regs1 = init_regs(Live),
-    Regs = x_live(Ds, Regs1),
-    flt_liveness_1(Is, Regs, [I|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([{'%anno',_}], _Regs, Acc) ->
-    reverse(Acc).
-
-init_regs(Live) ->
-    (1 bsl Live) - 1.
-
-live_regs(Regs) ->
-    live_regs_1(Regs, 0).
-
-live_regs_1(0, N) -> N;
-live_regs_1(R, N) ->
-    case R band 1 of
-	0 -> throw(not_possible);
-	1 -> live_regs_1(R bsr 1, N+1)
-    end.
-
-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.
-
-%% update(Instruction, TypeDb) -> NewTypeDb
-%%  Update the type database to account for executing an instruction.
-%%
-%%  First the cases for instructions inside basic blocks.
-update({'%anno',_}, Ts) ->
-    Ts;
-update({set,[D],[S],move}, Ts) ->
-    tdb_copy(S, D, Ts);
-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],[_Key,Map],{bif,map_get,_}}, Ts0) ->
-    Ts = tdb_meet(Map, map, 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),
-    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],{alloc,_,{gc_bif,float,{f,0}}}}, Ts0) ->
-    %% Make sure we reject non-numeric literal argument.
-    case possibly_numeric(S) of
-        true ->  tdb_store(D, float, Ts0);
-        false -> Ts0
-    end;
-update({set,[D],[S1,S2],{alloc,_,{gc_bif,'band',{f,0}}}}, Ts) ->
-    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_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_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_store(D, any, Ts);
-
-%% Instructions outside of blocks.
-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),
-    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_meet(Src, {tuple,exact_size,Arity,[Tag]}, Ts);
-
-%% Binaries and binary matching.
-
-update({test,bs_get_integer2,_,_,Args,Dst}, Ts) ->
-    tdb_store(Dst, get_bs_integer_type(Args), Ts);
-update({test,bs_get_utf8,_,_,_,Dst}, Ts) ->
-    tdb_store(Dst, ?UNICODE_INT, Ts);
-update({test,bs_get_utf16,_,_,_,Dst}, Ts) ->
-    tdb_store(Dst, ?UNICODE_INT, Ts);
-update({test,bs_get_utf32,_,_,_,Dst}, 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_store(Dst, {binary,1}, Ts);
-update({bs_put,_,_,_}, Ts) ->
-    Ts;
-update({bs_save2,_,_}, Ts) ->
-    Ts;
-update({bs_restore2,_,_}, Ts) ->
-    Ts;
-update({bs_context_to_binary,Dst}, Ts) ->
-    tdb_store(Dst, any, 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_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;
-
-%% Calls
-
-update({call_ext,Ar,{extfunc,math,Math,Ar}}, Ts) ->
-    case is_math_bif(Math, Ar) of
-	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,SzKind,Sz,_}=T0 ->
-	    T = case tdb_find({x,0}, Ts0) of
-		    {integer,{I,I}} when I > 1 ->
-			%% First element is not changed. The result
-			%% will have the same type.
-			T0;
-		    _ ->
-			%% Position is 1 or unknown. May change the
-			%% first element of the tuple.
-			{tuple,SzKind,Sz,[]}
-		end,
-            tdb_store({x,0}, T, Ts);
-	_ ->
-	    Ts
-    end;
-update({call,_Arity,_Func}, Ts) -> tdb_kill_xregs(Ts);
-update({call_ext,_Arity,_Func}, Ts) -> tdb_kill_xregs(Ts);
-update({make_fun2,_,_,_,_}, Ts) -> tdb_kill_xregs(Ts);
-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().
-
-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.
-
-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;
-	_ ->
-	    band_type_2(N, Bits+1)
-    end;
-band_type_2(_, _) ->
-    %% Negative or large positive number. Give up.
-    integer.
-
-get_bs_integer_type([_,{integer,N},U,{field_flags,Fl}])
-  when N*U < 64 ->
-    NumBits = N*U,
-    case member(unsigned, Fl) of
-	true ->
-	    {integer,{0,(1 bsl NumBits)-1}};
-	false ->
-	    %% Signed integer. Don't bother.
-	    integer
-    end;
-get_bs_integer_type(_) ->
-    %% Avoid creating ranges with a huge upper limit.
-    integer.
-
-is_math_bif(cos, 1) -> true;
-is_math_bif(cosh, 1) -> true;
-is_math_bif(sin, 1) -> true;
-is_math_bif(sinh, 1) -> true;
-is_math_bif(tan, 1) -> true;
-is_math_bif(tanh, 1) -> true;
-is_math_bif(acos, 1) -> true;
-is_math_bif(acosh, 1) -> true;
-is_math_bif(asin, 1) -> true;
-is_math_bif(asinh, 1) -> true;
-is_math_bif(atan, 1) -> true;
-is_math_bif(atanh, 1) -> true;
-is_math_bif(erf, 1) -> true;
-is_math_bif(erfc, 1) -> true;
-is_math_bif(exp, 1) -> true;
-is_math_bif(log, 1) -> true;
-is_math_bif(log2, 1) -> true;
-is_math_bif(log10, 1) -> true;
-is_math_bif(sqrt, 1) -> true;
-is_math_bif(atan2, 2) -> true;
-is_math_bif(pow, 2) -> true;
-is_math_bif(ceil, 1) -> true;
-is_math_bif(floor, 1) -> true;
-is_math_bif(fmod, 2) -> true;
-is_math_bif(pi, 0) -> true;
-is_math_bif(_, _) -> false.
-
-%% Reject non-numeric literals.
-possibly_numeric({x,_}) -> true;
-possibly_numeric({y,_}) -> true;
-possibly_numeric({integer,_}) -> true;
-possibly_numeric({float,_}) -> true;
-possibly_numeric(_) -> false.
-
-max_tuple_size(Reg, Ts) ->
-    case tdb_find(Reg, Ts) of
-	{tuple,_,Sz,_} -> Sz;
-	_Other -> 0
-    end.
-
-float_op('/', A, B, _) ->
-    case possibly_numeric(A) andalso possibly_numeric(B) of
-	true -> {yes,fdiv};
-	false -> no
-    end;
-float_op(Op, {float,_}, B, _) ->
-    case possibly_numeric(B) of
-	true -> arith_op(Op);
-	false -> no
-    end;
-float_op(Op, A, {float,_}, _) ->
-    case possibly_numeric(A) of
-	true -> arith_op(Op);
-	false -> no
-    end;
-float_op(Op, A, B, Ts) ->
-    case {tdb_find(A, Ts),tdb_find(B, Ts)} of
-	{float,_} -> arith_op(Op);
-	{_,float} -> arith_op(Op);
-	{_,_} -> no
-    end.
-
-find_dest(V, Rs0) ->
-    case find_reg(V, Rs0) of
-	{ok,FR} ->
-	    {FR,mark(V, Rs0, dirty)};
-	error ->
-	    Rs = put_reg(V, Rs0, dirty),
-	    {ok,FR} = find_reg(V, Rs),
-	    {FR,Rs}
-    end.
-
-load_reg({float,_}=F, _, Rs0, Is0) ->
-    Rs = put_reg(F, Rs0, clean),
-    {ok,FR} = find_reg(F, Rs),
-    Is = [{set,[FR],[F],fmove}|Is0],
-    {Rs,Is};
-load_reg(V, Ts, Rs0, Is0) ->
-    case find_reg(V, Rs0) of
-	{ok,_FR} -> {Rs0,Is0};
-	error ->
-	    Rs = put_reg(V, Rs0, clean),
-	    {ok,FR} = find_reg(V, Rs),
-	    Op = case tdb_find(V, Ts) of
-		     float -> fmove;
-		     _ -> fconv
-		 end,
-	    Is = [{set,[FR],[V],Op}|Is0],
-	    {Rs,Is}
-    end.
-
-arith_op(Op) ->
-    case op_type(Op) of
-	{float,Instr} -> {yes,Instr};
-	_ -> no
-    end.
-
-op_type('+') -> {float,fadd};
-op_type('-') -> {float,fsub};
-op_type('*') -> {float,fmul};
-%% '/' and 'band' are specially handled.
-op_type('bor') -> integer;
-op_type('bxor') -> integer;
-op_type('bsl') -> integer;
-op_type('bsr') -> integer;
-op_type('div') -> integer;
-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),
-    {[],Acc};
-flush(Rs, [{set,[_],[],{put_tuple,_}}|_]=Is0, Acc0) ->
-    Acc = flush_all(Rs, Is0, Acc0),
-    {[],Acc};
-flush(Rs0, [{set,Ds,Ss,_Op}|_], Acc0) ->
-    Save = cerl_sets:from_list(Ss),
-    Acc = save_regs(Rs0, Save, Acc0),
-    Rs1 = foldl(fun(S, A) -> mark(S, A, clean) end, Rs0, Ss),
-    Kill = cerl_sets:from_list(Ds),
-    Rs = kill_regs(Rs1, Kill),
-    {Rs,Acc};
-flush(Rs0, Is, Acc0) ->
-    Acc = flush_all(Rs0, Is, Acc0),
-    {[],Acc}.
-
-flush_all([{_,{float,_},_}|Rs], Is, Acc) ->
-    flush_all(Rs, Is, Acc);
-flush_all([{I,V,dirty}|Rs], Is, Acc0) ->
-    Acc = checkerror(Acc0),
-    case beam_utils:is_killed_block(V, Is) of
-	true  -> flush_all(Rs, Is, Acc);
-	false -> flush_all(Rs, Is, [{set,[V],[{fr,I}],fmove}|Acc])
-    end;
-flush_all([{_,_,clean}|Rs], Is, Acc) -> flush_all(Rs, Is, Acc);
-flush_all([free|Rs], Is, Acc) -> flush_all(Rs, Is, Acc);
-flush_all([], _, Acc) -> Acc.
-
-save_regs(Rs, Save, Acc) ->
-    foldl(fun(R, A) -> save_reg(R, Save, A) end, Acc, Rs).
-
-save_reg({I,V,dirty}, Save, Acc) ->
-    case cerl_sets:is_element(V, Save) of
-	true -> [{set,[V],[{fr,I}],fmove}|checkerror(Acc)];
-	false -> Acc
-    end;
-save_reg(_, _, Acc) -> Acc.
-
-kill_regs(Rs, Kill) ->
-    [kill_reg(R, Kill) || R <- Rs].
-
-kill_reg({_,V,_}=R, Kill) ->
-    case cerl_sets:is_element(V, Kill) of
-	true -> free;
-	false -> R
-    end;
-kill_reg(R, _) -> R.
-
-mark(V, [{I,V,_}|Rs], Mark) -> [{I,V,Mark}|Rs];
-mark(V, [R|Rs], Mark) -> [R|mark(V, Rs, Mark)];
-mark(_, [], _) -> [].
-
-fetch_reg(V, [{I,V,_}|_]) -> {fr,I};
-fetch_reg(V, [_|SRs]) -> fetch_reg(V, SRs).
-
-find_reg(V, [{I,V,_}|_]) -> {ok,{fr,I}};
-find_reg(V, [_|SRs]) -> find_reg(V, SRs);
-find_reg(_, []) -> error.
-
-put_reg(V, Rs, Dirty) -> put_reg_1(V, Rs, Dirty, 0).
-
-put_reg_1(V, [free|Rs], Dirty, I) -> [{I,V,Dirty}|Rs];
-put_reg_1(V, [R|Rs], Dirty, I) -> [R|put_reg_1(V, Rs, Dirty, I+1)];
-put_reg_1(V, [], Dirty, I) -> [{I,V,Dirty}].
-
-checkerror(Is) ->
-    checkerror_1(Is, Is).
-
-checkerror_1([{set,[],[],fcheckerror}|_], OrigIs) -> OrigIs;
-checkerror_1([{set,_,_,{bif,fadd,_}}|_], OrigIs) -> checkerror_2(OrigIs);
-checkerror_1([{set,_,_,{bif,fsub,_}}|_], OrigIs) -> checkerror_2(OrigIs);
-checkerror_1([{set,_,_,{bif,fmul,_}}|_], OrigIs) -> checkerror_2(OrigIs);
-checkerror_1([{set,_,_,{bif,fdiv,_}}|_], OrigIs) -> checkerror_2(OrigIs);
-checkerror_1([{set,_,_,{bif,fnegate,_}}|_], OrigIs) -> checkerror_2(OrigIs);
-checkerror_1([_|Is], OrigIs) -> checkerror_1(Is, OrigIs);
-checkerror_1([], OrigIs) -> OrigIs.
-
-checkerror_2(OrigIs) -> [{set,[],[],fcheckerror}|OrigIs].
-
-
-%%% Routines for maintaining a type database.  The type database
-%%% associates type information with registers.
-%%%
-%%% 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) -> 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(Reg, Ts) ->
-    case tdb_find_raw(Reg, Ts) of
-        {tuple_element,_,_} -> any;
-        Type -> Type
-    end.
-
-%% 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'
-%%  Update the type information for Dest to have the same type
-%%  as the Source.
-
-tdb_copy({Tag,_}=S, D, Ts) when Tag =:= x; Tag =:= y ->
-    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
-	       {atom,_} -> Literal;
-	       {float,_} -> float;
-	       {integer,Int} -> {integer,{Int,Int}};
-	       {literal,[_|_]} -> nonempty_list;
-	       {literal,#{}} -> map;
-	       {literal,Tuple} when tuple_size(Tuple) >= 1 ->
-		   Lit = tag_literal(element(1, Tuple)),
-		   {tuple,exact_size,tuple_size(Tuple),[Lit]};
-	       _ -> any
-	   end,
-    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};
-tag_literal(F) when is_float(F) -> {float,F};
-tag_literal(I) when is_integer(I) -> {integer,I};
-tag_literal([]) -> nil;
-tag_literal(Lit) -> {literal,Lit}.
-
-%% tdb_kill_xregs(Db) -> NewDb
-%%  Kill all information about x registers. Also kill all tuple_element
-%%  dependencies from y registers to x registers.
-
-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([]) -> [].
-
-%% 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;
-meet({tuple,min_size,Sz1,Same}=Max, {tuple,min_size,Sz2,Same}) when Sz1 > Sz2 ->
-    Max;
-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 6b2ab5a2a4..6e6574c0b3 100644
--- a/lib/compiler/src/beam_utils.erl
+++ b/lib/compiler/src/beam_utils.erl
@@ -18,29 +18,16 @@
 %% %CopyrightEnd%
 %%
 %% Purpose : Common utilities used by several optimization passes.
-%% 
+%%
 
 -module(beam_utils).
--export([is_killed_block/2,is_killed/3,is_killed_at/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_annos/1,combine_heap_needs/2,
-         anno_defs/1,
-	 split_even/1
-        ]).
+-export([replace_labels/4,is_pure_test/1,split_even/1]).
 
 -export_type([code_index/0,module_code/0,instruction/0]).
 
--import(lists, [flatmap/2,map/2,member/2,sort/1,reverse/1,splitwith/2]).
-
--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)).
+-import(lists, [map/2,reverse/1]).
 
-%% instruction() describes all instructions that are used during optimzation
+%% instruction() describes all instructions that are used during optimization
 %% (from beam_a to beam_z).
 -type instruction() :: atom() | tuple().
 
@@ -56,137 +43,6 @@
 -type fail() :: beam_asm:fail() | 'fail'.
 -type test() :: {'test',atom(),fail(),[beam_asm:src()]} |
 		{'test',atom(),fail(),integer(),list(),beam_asm:reg()}.
--type result_cache() :: gb_trees:tree(beam_asm:label(), 'killed' | 'used').
-
--record(live,
-	{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
-%%  a block.
-%%
-%%  If true is returned, it means that the register will not be
-%%  referenced in ANY way (not even indirectly by an allocate instruction);
-%%  i.e. it is OK to enter the instruction sequence with Register
-%%  containing garbage.
-
--spec is_killed_block(beam_asm:reg(), [instruction()]) -> boolean().
-
-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, [{'%anno',{used,Regs}}|Is]) ->
-    case R of
-	{x,X} when (Regs bsr X) band 1 =:= 0 -> true;
-	_ -> is_killed_block(R, Is)
-    end;
-is_killed_block(_, []) -> false.
-
-%% is_killed(Register, [Instruction], State) -> true|false
-%%  Determine whether a register is killed by the instruction sequence.
-%%  If true is returned, it means that the register will not be
-%%  referenced in ANY way (not even indirectly by an allocate instruction);
-%%  i.e. it is OK to enter the instruction sequence with Register
-%%  containing garbage.
-%%
-%%  The state (constructed by index_instructions/1) is used to allow us
-%%  to determine the kill state across branches.
-
--spec is_killed(beam_asm:reg(), [instruction()], code_index()) -> boolean().
-
-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.
-
-%% is_killed_at(Reg, Lbl, State) -> true|false
-%%  Determine whether Reg is killed at label Lbl.
-
--spec is_killed_at(beam_asm:reg(), beam_asm:label(), code_index()) -> boolean().
-
-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.
-
-%% is_not_used(Register, [Instruction], State) -> true|false
-%%  Determine whether a register is never used in the instruction sequence
-%%  (it could still be referenced by an allocate instruction, meaning that
-%%  it MUST be initialized, but that its value does not matter).
-%%    The state is used to allow us to determine the usage state
-%%  across branches.
-
--spec is_not_used(beam_asm:reg(), [instruction()], code_index()) -> boolean().
-
-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.
-
-%% index_labels(FunctionIs) -> State
-%%  Index the instruction sequence so that we can quickly
-%%  look up the instruction following a specific label.
-
--spec index_labels([instruction()]) -> code_index().
-
-index_labels(Is) ->
-    index_labels_1(Is, []).
-
-%% empty_label_index() -> State
-%%  Create an empty label index.
-
--spec empty_label_index() -> code_index().
-
-empty_label_index() ->
-    gb_trees:empty().
-
-%% index_label(Label, [Instruction], State) -> State
-%%  Add an index for a label.
-
--spec index_label(beam_asm:label(), [instruction()], code_index()) ->
-   code_index().
-
-index_label(Lbl, Is0, Acc) ->
-    Is = drop_labels(Is0),
-    gb_trees:enter(Lbl, Is, Acc).
-
-
-%% code_at(Label, State) -> [I].
-%%  Retrieve the code at the given label.
-
--spec code_at(beam_asm:label(), code_index()) -> [instruction()].
-
-code_at(L, Ll) ->
-    gb_trees:get(L, Ll).
 
 %% replace_labels(FunctionIs, Tail, ReplaceDb, Fallback) -> FunctionIs.
 %%  Replace all labels in instructions according to the ReplaceDb.
@@ -200,49 +56,6 @@ code_at(L, Ll) ->
 replace_labels(Is, Acc, D, Fb) ->
     replace_labels_1(Is, Acc, D, Fb).
 
-%% bif_to_test(Bif, [Op], Fail) -> {test,Test,Fail,[Op]}
-%%  Convert a BIF to a test. Fail if not possible.
-
--spec bif_to_test(atom(), list(), fail()) -> test().
-
-bif_to_test(is_atom,     [_]=Ops, Fail) -> {test,is_atom,Fail,Ops};
-bif_to_test(is_boolean,  [_]=Ops, Fail) -> {test,is_boolean,Fail,Ops};
-bif_to_test(is_binary,   [_]=Ops, Fail) -> {test,is_binary,Fail,Ops};
-bif_to_test(is_bitstring,[_]=Ops, Fail) -> {test,is_bitstr,Fail,Ops};
-bif_to_test(is_float,    [_]=Ops, Fail) -> {test,is_float,Fail,Ops};
-bif_to_test(is_function, [_]=Ops, Fail) -> {test,is_function,Fail,Ops};
-bif_to_test(is_function, [_,_]=Ops, Fail) -> {test,is_function2,Fail,Ops};
-bif_to_test(is_integer,  [_]=Ops, Fail) -> {test,is_integer,Fail,Ops};
-bif_to_test(is_list,     [_]=Ops, Fail) -> {test,is_list,Fail,Ops};
-bif_to_test(is_map,      [_]=Ops, Fail) -> {test,is_map,Fail,Ops};
-bif_to_test(is_number,   [_]=Ops, Fail) -> {test,is_number,Fail,Ops};
-bif_to_test(is_pid,      [_]=Ops, Fail) -> {test,is_pid,Fail,Ops};
-bif_to_test(is_port,     [_]=Ops, Fail) -> {test,is_port,Fail,Ops};
-bif_to_test(is_reference, [_]=Ops, Fail) -> {test,is_reference,Fail,Ops};
-bif_to_test(is_tuple,    [_]=Ops, Fail)     -> {test,is_tuple,Fail,Ops};
-bif_to_test('=<', [A,B], Fail) -> {test,is_ge,Fail,[B,A]};
-bif_to_test('>', [A,B], Fail) -> {test,is_lt,Fail,[B,A]};
-bif_to_test('<', [_,_]=Ops, Fail) -> {test,is_lt,Fail,Ops};
-bif_to_test('>=', [_,_]=Ops, Fail) -> {test,is_ge,Fail,Ops};
-bif_to_test('==', [A,nil], Fail) -> {test,is_nil,Fail,[A]};
-bif_to_test('==', [nil,A], Fail) -> {test,is_nil,Fail,[A]};
-bif_to_test('==', [C,A], Fail) when ?is_const(C) ->
-    {test,is_eq,Fail,[A,C]};
-bif_to_test('==', [_,_]=Ops, Fail) -> {test,is_eq,Fail,Ops};
-bif_to_test('/=', [C,A], Fail) when ?is_const(C) ->
-    {test,is_ne,Fail,[A,C]};
-bif_to_test('/=', [_,_]=Ops, Fail) -> {test,is_ne,Fail,Ops};
-bif_to_test('=:=', [A,nil], Fail) -> {test,is_nil,Fail,[A]};
-bif_to_test('=:=', [nil,A], Fail) -> {test,is_nil,Fail,[A]};
-bif_to_test('=:=', [C,A], Fail) when ?is_const(C) ->
-    {test,is_eq_exact,Fail,[A,C]};
-bif_to_test('=:=', [_,_]=Ops, Fail) -> {test,is_eq_exact,Fail,Ops};
-bif_to_test('=/=', [C,A], Fail) when ?is_const(C) ->
-    {test,is_ne_exact,Fail,[A,C]};
-bif_to_test('=/=', [_,_]=Ops, Fail) -> {test,is_ne_exact,Fail,Ops};
-bif_to_test(is_record, [_,_,_]=Ops, Fail) -> {test,is_record,Fail,Ops}.
-
-
 %% is_pure_test({test,Op,Fail,Ops}) -> true|false.
 %%  Return 'true' if the test instruction does not modify any
 %%  registers and/or bit syntax matching state.
@@ -256,82 +69,15 @@ is_pure_test({test,is_eq_exact,_,[_,_]}) -> true;
 is_pure_test({test,is_ne_exact,_,[_,_]}) -> true;
 is_pure_test({test,is_ge,_,[_,_]}) -> true;
 is_pure_test({test,is_lt,_,[_,_]}) -> true;
-is_pure_test({test,is_nil,_,[_]}) -> true;
 is_pure_test({test,is_nonempty_list,_,[_]}) -> true;
+is_pure_test({test,is_tagged_tuple,_,[_,_,_]}) -> true;
 is_pure_test({test,test_arity,_,[_,_]}) -> true;
 is_pure_test({test,has_map_fields,_,[_|_]}) -> true;
 is_pure_test({test,is_bitstr,_,[_]}) -> true;
 is_pure_test({test,is_function2,_,[_,_]}) -> true;
-is_pure_test({test,Op,_,Ops}) -> 
+is_pure_test({test,Op,_,Ops}) ->
     erl_internal:new_type_test(Op, length(Ops)).
 
-    
-%% live_opt([Instruction]) -> [Instruction].
-%%  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 {used,Regs} annotations at the beginning
-%%  and end of each block.
-
--spec live_opt([instruction()]) -> [instruction()].
-
-live_opt(Is0) ->
-    {[{label,Fail}|_]=Bef,[Fi|Is]} =
-	splitwith(fun({func_info,_,_,_}) -> false;
-		     (_) -> true
-		  end, Is0),
-    {func_info,_,_,Live} = Fi,
-    D = gb_trees:insert(Fail, live_call(Live), gb_trees:empty()),
-    Bef ++ [Fi|live_opt(reverse(Is), 0, D, [])].
-
-
-%% delete_annos([Instruction]) -> [Instruction].
-%%  Delete all annotations.
-
--spec delete_annos([instruction()]) -> [instruction()].
-
-delete_annos([{block,Bl0}|Is]) ->
-    case delete_annos(Bl0) of
-	[] -> delete_annos(Is);
-	[_|_]=Bl -> [{block,Bl}|delete_annos(Is)]
-    end;
-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.
-
--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(H1, H2) when is_integer(H1), is_integer(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]}
 
@@ -343,446 +89,6 @@ split_even(Rs) -> split_even(Rs, [], []).
 %%% Local functions.
 %%%
 
-
-%% check_liveness(Reg, [Instruction], #live{}) ->
-%%                      {killed | not_used | used, #live{}}
-%%  Find out whether Reg is used or killed in instruction sequence.
-%%
-%%    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({fr,_}, _, St) ->
-    %% Conservatively always consider the floating point register used.
-    {used,St};
-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;
-check_liveness(R, [{label,_}|Is], St) ->
-    check_liveness(R, Is, St);
-check_liveness(R, [{test,_,{f,Fail},As}|Is], St0) ->
-    case member(R, As) of
-	true ->
-	    {used,St0};
-	false ->
-	    case check_liveness_at(R, Fail, St0) of
-		{killed,St1} ->
-		    check_liveness(R, Is, St1);
-		{exit_not_used,St1} ->
-		    not_used(check_liveness(R, Is, St1));
-		{not_used,St1} ->
-		    not_used(check_liveness(R, Is, St1));
-		{used,_}=Used ->
-		    Used
-	    end
-    end;
-check_liveness(R, [{test,Op,Fail,Live,Ss,Dst}|Is], St) ->
-    %% Check this instruction as a block to get a less conservative
-    %% result if the caller is is_not_used/3.
-    Block = [{set,[Dst],Ss,{alloc,Live,{bif,Op,Fail}}}],
-    check_liveness(R, [{block,Block}|Is], St);
-check_liveness(R, [{select,_,R,_,_}|_], St) ->
-    {used,St};
-check_liveness(R, [{select,_,_,Fail,Branches}|_], St) ->
-    check_liveness_everywhere(R, [Fail|Branches], St);
-check_liveness(R, [{jump,{f,F}}|_], St) ->
-    check_liveness_at(R, F, St);
-check_liveness(R, [{case_end,Used}|_], St) ->
-    check_liveness_exit(R, Used, St);
-check_liveness(R, [{try_case_end,Used}|_], St) ->
-    check_liveness_exit(R, Used, St);
-check_liveness(R, [{badmatch,Used}|_], St) ->
-    check_liveness_exit(R, Used, St);
-check_liveness(R, [if_end|_], St) ->
-    check_liveness_exit(R, ignore, St);
-check_liveness(R, [{func_info,_,_,Ar}|_], St) ->
-    case R of
-	{x,X} when X < Ar -> {used,St};
-	_ -> {killed,St}
-    end;
-check_liveness(R, [{kill,R}|_], St) ->
-    {killed,St};
-check_liveness(R, [{kill,_}|Is], St) ->
-    check_liveness(R, Is, St);
-check_liveness(R, [{bs_init,_,_,none,Ss,Dst}|Is], St) ->
-    case member(R, Ss) of
-	true ->
-	    {used,St};
-	false ->
-	    if
-		R =:= Dst -> {killed,St};
-		true -> check_liveness(R, Is, St)
-	    end
-    end;
-check_liveness(R, [{bs_init,_,_,Live,Ss,Dst}|Is], St) ->
-    case R of
-	{x,X} ->
-            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 -> {not_used,St};
-			true -> not_used(check_liveness(R, Is, St))
-		    end
-	    end
-    end;
-check_liveness(R, [{deallocate,_}|Is], St) ->
-    case R of
-	{y,_} -> {killed,St};
-	_ -> check_liveness(R, Is, St)
-    end;
-check_liveness({x,_}=R, [return|_], St) ->
-    case R of
-	{x,0} -> {used,St};
-	{x,_} -> {killed,St}
-    end;
-check_liveness(R, [{call,Live,_}|Is], St) ->
-    case R of
-	{x,X} when X < Live -> {used,St};
-	{x,_} -> {killed,St};
-	{y,_} -> not_used(check_liveness(R, Is, St))
-    end;
-check_liveness(R, [{call_ext,Live,_}=I|Is], St) ->
-    case R of
-	{x,X} when X < Live ->
-	    {used,St};
-	{x,_} ->
-	    {killed,St};
-	{y,_} ->
-	    case beam_jump:is_exit_instruction(I) of
-		false ->
-		    not_used(check_liveness(R, Is, St));
-		true ->
-		    %% 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.
-		    {exit_not_used,St}
-	    end
-    end;
-check_liveness(R, [{call_fun,Live}|Is], St) ->
-    case R of
-	{x,X} when X =< Live -> {used,St};
-	{x,_} -> {killed,St};
-	{y,_} -> not_used(check_liveness(R, Is, St))
-    end;
-check_liveness(R, [{apply,Args}|Is], St) ->
-    case R of
-	{x,X} when X < Args+2 -> {used,St};
-	{x,_} -> {killed,St};
-	{y,_} -> not_used(check_liveness(R, Is, St))
-    end;
-check_liveness(R, [{bif,Op,Fail,Ss,D}|Is], St) ->
-    Set = {set,[D],Ss,{bif,Op,Fail}},
-    check_liveness(R, [{block,[Set]}|Is], St);
-check_liveness(R, [{gc_bif,Op,{f,Fail},Live,Ss,D}|Is], St) ->
-    Set = {set,[D],Ss,{alloc,Live,{gc_bif,Op,Fail}}},
-    check_liveness(R, [{block,[Set]}|Is], St);
-check_liveness(R, [{bs_put,{f,0},_,Ss}|Is], St) ->
-    case member(R, Ss) of
-	true -> {used,St};
-	false -> check_liveness(R, Is, St)
-    end;
-check_liveness(R, [{bs_restore2,S,_}|Is], St) ->
-    case R of
-	S -> {used,St};
-	_ -> check_liveness(R, Is, St)
-    end;
-check_liveness(R, [{bs_save2,S,_}|Is], St) ->
-    case R of
-	S -> {used,St};
-	_ -> check_liveness(R, Is, St)
-    end;
-check_liveness(R, [{move,S,D}|Is], St) ->
-    case R of
-	S -> {used,St};
-	D -> {killed,St};
-	_ -> check_liveness(R, Is, St)
-    end;
-check_liveness(R, [{make_fun2,_,_,_,NumFree}|Is], St) ->
-    case R of
-	{x,X} when X < NumFree -> {used,St};
-	{x,_} -> {killed,St};
-	{y,_} -> not_used(check_liveness(R, Is, St))
-    end;
-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 ->
-	    {killed,St};
-	{y,_} ->
-	    %% y registers will be used if an exception occurs and
-	    %% control transfers to the label given in the previous
-	    %% try/2 instruction.
-	    {used,St};
-	_ ->
-	    check_liveness(R, Is, St)
-    end;
-check_liveness(R, [{catch_end,Y}|Is], St) ->
-    case R of
-	Y -> {killed,St};
-	_ -> check_liveness(R, Is, St)
-    end;
-check_liveness(R, [{get_tuple_element,S,_,D}|Is], St) ->
-    case R of
-	S -> {used,St};
-	D -> {killed,St};
-	_ -> check_liveness(R, Is, St)
-    end;
-check_liveness(R, [{bs_context_to_binary,S}|Is], St) ->
-    case R of
-	S -> {used,St};
-	_ -> check_liveness(R, Is, St)
-    end;
-check_liveness(R, [{loop_rec,{f,_},{x,0}}|_], St) ->
-    case R of
-	{x,_} ->
-	    {killed,St};
-	_ ->
-	    %% y register. Rarely happens. Be very conversative and
-	    %% assume it's used.
-	    {used,St}
-    end;
-check_liveness(R, [{loop_rec_end,{f,Fail}}|_], St) ->
-    check_liveness_at(R, Fail, St);
-check_liveness(R, [{line,_}|Is], St) ->
-    check_liveness(R, Is, St);
-check_liveness(R, [{get_map_elements,{f,Fail},S,{list,L}}|Is], St0) ->
-    {Ss,Ds} = split_even(L),
-    case member(R, [S|Ss]) of
-	true ->
-	    {used,St0};
-	false ->
-	    case check_liveness_at(R, Fail, St0) of
-		{killed,St}=Killed ->
-		    case member(R, Ds) of
-			true -> Killed;
-			false -> check_liveness(R, Is, St)
-		    end;
-		Other ->
-		    Other
-	    end
-    end;
-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_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}.
-
-check_liveness_everywhere(R, Lbls, St0) ->
-    check_liveness_everywhere_1(R, Lbls, killed, St0).
-
-check_liveness_everywhere_1(R, [{f,Lbl}|T], Res0, St0) ->
-    {Res1,St} = check_liveness_at(R, Lbl, St0),
-    Res = case Res1 of
-	      killed -> Res0;
-	      _ -> Res1
-	  end,
-    case Res of
-	used -> {used,St};
-	_ -> check_liveness_everywhere_1(R, T, Res, St)
-    end;
-check_liveness_everywhere_1(R, [_|T], Res, St) ->
-    check_liveness_everywhere_1(R, T, Res, St);
-check_liveness_everywhere_1(_, [], Res, St) ->
-    {Res,St}.
-
-check_liveness_at(R, Lbl, #live{lbl=Ll,res=ResMemorized}=St0) ->
-    case gb_trees:lookup(Lbl, ResMemorized) of
-	{value,Res} ->
-	    {Res,St0};
-	none ->
-	    {Res,St} = case gb_trees:lookup(Lbl, Ll) of
-			   {value,Is} -> check_liveness(R, Is, St0);
-			   none -> {used,St0}
-		       end,
-	    {Res,St#live{res=gb_trees:insert(Lbl, Res, St#live.res)}}
-    end.
-
-not_used({used,_}=Res) -> Res;
-not_used({_,St}) -> {not_used,St}.
-
-check_liveness_exit(R, R, St) -> {used,St};
-check_liveness_exit({x,_}, _, St) -> {killed,St};
-check_liveness_exit({y,_}, _, St) -> {exit_not_used,St}.
-
-%% check_liveness_block(Reg, [Instruction], 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
-%%       allocation instruction
-%%    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
-%%
-%%  Annotations are not allowed.
-%%
-%%  (Unknown instructions will cause an exception.)
-
-check_liveness_block({x,X}=R, [{set,Ds,Ss,{alloc,Live,Op}}|Is], St0) ->
-    if 
-	X >= Live ->
-	    {killed,St0};
-	true ->
-	    case check_liveness_block_1(R, Ss, Ds, Op, Is, St0) of
-                {transparent,St} -> {alloc_used,St};
-		{_,_}=Res -> not_used(Res)
-	    end
-    end;
-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}.
-
-check_liveness_block_1(R, Ss, Ds, Op, Is, St0) ->
-    case member(R, Ss) of
-	true ->
-	    {used,St0};
-	false ->
-	    case check_liveness_block_2(R, Op, Ss, St0) of
-		{killed,St} ->
-		    case member(R, Ds) of
-			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};
-				 false -> check_liveness_block(R, Is, St)
-			     end);
-		{used,St} ->
-		    {used,St}
-	    end
-    end.
-
-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),
-
-    %% Note that is_function/2 is a type test but is not safe.
-    case erl_internal:comp_op(Op, Arity) orelse
-	(erl_internal:new_type_test(Op, Arity) andalso
-         erl_bifs:is_safe(erlang, Op, Arity)) of
-	true ->
-	    {killed,St};
-	false ->
-	    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, {unsafe,0}, St);
-check_liveness_block_2(_, _, _, St) ->
-    {killed,St}.
-
-check_liveness_block_3({x,_}, 0, _FA, St) ->
-    {killed,St};
-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) ->
-    Is = drop_labels(Is0),
-    index_labels_1(Is0, [{Lbl,Is}|Acc]);
-index_labels_1([_|Is], Acc) ->
-    index_labels_1(Is, Acc);
-index_labels_1([], Acc) -> gb_trees:from_orddict(sort(Acc)).
-
-drop_labels([{label,_}|Is]) -> drop_labels(Is);
-drop_labels(Is) -> Is.
-
-
 replace_labels_1([{test,Test,{f,Lbl},Ops}|Is], Acc, D, Fb) ->
     replace_labels_1(Is, [{test,Test,{f,label(Lbl, D, Fb)},Ops}|Acc], D, Fb);
 replace_labels_1([{test,Test,{f,Lbl},Live,Ops,Dst}|Is], Acc, D, Fb) ->
@@ -838,485 +144,7 @@ label(Old, D, Fb) ->
         _ -> Fb(Old)
     end.
 
-%% Help function for combine_heap_needs.
-
-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.
-
-%% Bit syntax instructions.
-live_opt([{bs_context_to_binary,Src}=I|Is], Regs0, D, Acc) ->
-    Regs = x_live([Src], Regs0),
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{bs_init,Fail,_,none,Ss,Dst}=I|Is], Regs0, D, Acc) ->
-    Regs1 = x_live(Ss, x_dead([Dst], Regs0)),
-    Regs = live_join_label(Fail, D, Regs1),
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{bs_init,Fail,Info,Live0,Ss,Dst}|Is], Regs0, D, Acc) ->
-    Regs1 = x_dead([Dst], Regs0),
-    Live = live_regs(Regs1),
-    true = Live =< Live0,	%Assertion.
-    Regs2 = live_call(Live),
-    Regs3 = x_live(Ss, Regs2),
-    Regs = live_join_label(Fail, D, Regs3),
-    I = {bs_init,Fail,Info,Live,Ss,Dst},
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{bs_put,Fail,_,Ss}=I|Is], Regs0, D, Acc) ->
-    Regs1 = x_live(Ss, Regs0),
-    Regs = live_join_label(Fail, D, Regs1),
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{bs_restore2,Src,_}=I|Is], Regs0, D, Acc) ->
-    Regs = x_live([Src], Regs0),
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{bs_save2,Src,_}=I|Is], Regs0, D, Acc) ->
-    Regs = x_live([Src], Regs0),
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{test,bs_start_match2,Fail,Live,[Src,_],_}=I|Is], _, D, Acc) ->
-    Regs0 = live_call(Live),
-    Regs1 = x_live([Src], Regs0),
-    Regs = live_join_label(Fail, D, Regs1),
-    live_opt(Is, Regs, D, [I|Acc]);
-
-%% Other instructions.
-live_opt([{block,Bl0}|Is], Regs0, D, Acc) ->
-    Live0 = make_anno({used,Regs0}),
-    {Bl,Regs} = live_opt_block(reverse(Bl0), Regs0, D, [Live0]),
-    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]);
-live_opt([{jump,{f,L}}=I|Is], _, D, Acc) ->
-    Regs = gb_trees:get(L, D),
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([return=I|Is], _, D, Acc) ->
-    live_opt(Is, 1, D, [I|Acc]);
-live_opt([{catch_end,_}=I|Is], _, D, Acc) ->
-    live_opt(Is, live_call(1), D, [I|Acc]);
-live_opt([{badmatch,Src}=I|Is], _, D, Acc) ->
-    Regs = x_live([Src], 0),
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{case_end,Src}=I|Is], _, D, Acc) ->
-    Regs = x_live([Src], 0),
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{try_case_end,Src}=I|Is], _, D, Acc) ->
-    Regs = x_live([Src], 0),
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([if_end=I|Is], _, D, Acc) ->
-    Regs = 0,
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{call,Arity,_}=I|Is], _, D, Acc) ->
-    live_opt(Is, live_call(Arity), D, [I|Acc]);
-live_opt([{call_ext,Arity,_}=I|Is], _, D, Acc) ->
-    live_opt(Is, live_call(Arity), D, [I|Acc]);
-live_opt([{call_fun,Arity}=I|Is], _, D, Acc) ->
-    live_opt(Is, live_call(Arity+1), D, [I|Acc]);
-live_opt([{apply,Arity}=I|Is], _, D, Acc) ->
-    live_opt(Is, live_call(Arity+2), D, [I|Acc]);
-live_opt([{make_fun2,_,_,_,Arity}=I|Is], _, D, Acc) ->
-    live_opt(Is, live_call(Arity), D, [I|Acc]);
-live_opt([{test,_,Fail,Ss}=I|Is], Regs0, D, Acc) ->
-    Regs1 = x_live(Ss, Regs0),
-    Regs = live_join_label(Fail, D, Regs1),
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{test,_,Fail,Live,Ss,_}=I|Is], _, D, Acc) ->
-    Regs0 = live_call(Live),
-    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], _, D, Acc) ->
-    Regs0 = 0,
-    Regs1 = x_live([Src], Regs0),
-    Regs = live_join_labels([Fail|List], D, Regs1),
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{try_case,Y}=I|Is], Regs0, D, Acc) ->
-    Regs = live_call(1),
-    case Regs0 of
-        0 ->
-            live_opt(Is, Regs, D, [{try_end,Y}|Acc]);
-        _ ->
-            live_opt(Is, live_call(1), D, [I|Acc])
-    end;
-live_opt([{loop_rec,_Fail,_Dst}=I|Is], _, D, Acc) ->
-    live_opt(Is, 0, D, [I|Acc]);
-live_opt([timeout=I|Is], _, D, Acc) ->
-    live_opt(Is, 0, D, [I|Acc]);
-live_opt([{wait,_}=I|Is], _, D, Acc) ->
-    live_opt(Is, 0, D, [I|Acc]);
-live_opt([{get_map_elements,Fail,Src,{list,List}}=I|Is], Regs0, D, Acc) ->
-    {Ss,Ds} = split_even(List),
-    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) ->
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{kill,_}=I|Is], Regs, D, Acc) ->
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{try_end,_}=I|Is], Regs, D, Acc) ->
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{loop_rec_end,_}=I|Is], Regs, D, Acc) ->
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{wait_timeout,_,nil}=I|Is], Regs, D, Acc) ->
-    live_opt(Is, Regs, D, [I|Acc]);
-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.
-live_opt([{trim,_,_}=I|Is], Regs, D, Acc) ->
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{'%',_}=I|Is], Regs, D, Acc) ->
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{recv_set,_}=I|Is], Regs, D, Acc) ->
-    live_opt(Is, Regs, D, [I|Acc]);
-live_opt([{recv_mark,_}=I|Is], Regs, D, Acc) ->
-    live_opt(Is, Regs, D, [I|Acc]);
-
-live_opt([], _, _, Acc) -> 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([{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_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,
-    live_join_labels(T, D, Regs);
-live_join_labels([_|T], D, Regs) ->
-    live_join_labels(T, D, Regs);
-live_join_labels([], _, Regs) -> Regs.
-
-live_join_label({f,0}, _, Regs) ->
-    Regs;
-live_join_label({f,L}, D, Regs) ->
-    gb_trees:get(L, D) bor Regs.
-
-live_call(Live) -> (1 bsl Live) - 1.
-
-live_regs(Regs) ->
-    live_regs_1(0, Regs).
-
-live_regs_1(N, 0) -> N;
-live_regs_1(N, Regs) -> live_regs_1(N+1, Regs bsr 1).
-
-x_dead([{x,N}|Rs], Regs) -> x_dead(Rs, Regs band (bnot (1 bsl N)));
-x_dead([_|Rs], Regs) -> x_dead(Rs, Regs);
-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.
-
-is_live(X, Regs) -> ((Regs bsr X) band 1) =:= 1.
-
 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},_,Live,_,Dst}=I|Is], Regs0, D) ->
-    Regs1 = case Live of
-                none -> Regs0;
-                _ -> init_def_regs(Live)
-            end,
-    Regs = def_regs([Dst], Regs1),
-    [I|defs(Is, Regs, update_regs(L, Regs, D))];
-defs([{test,bs_start_match2,{f,L},Live,_,Dst}=I|Is], _Regs, D) ->
-    Regs0 = init_def_regs(Live),
-    Regs = def_regs([Dst], Regs0),
-    [I|defs(Is, Regs, update_regs(L, Regs0, 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_unreachable(Is, 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 fb2e7df65c..349d74eb58 100644
--- a/lib/compiler/src/beam_validator.erl
+++ b/lib/compiler/src/beam_validator.erl
@@ -26,8 +26,9 @@
 
 %% Interface for compiler.
 -export([module/2, format_error/1]).
+-export([type_anno/1, type_anno/2, type_anno/4]).
 
--import(lists, [any/2,dropwhile/2,foldl/3,foreach/2,reverse/1]).
+-import(lists, [dropwhile/2,foldl/3,member/2,reverse/1,sort/1,zip/2]).
 
 %% To be called by the compiler.
 
@@ -44,6 +45,34 @@ module({Mod,Exp,Attr,Fs,Lc}=Code, _Opts)
 	    {error,[{atom_to_list(Mod),Es}]}
     end.
 
+%% Provides a stable interface for type annotations, used by certain passes to
+%% indicate that we can safely assume that a register has a given type.
+-spec type_anno(term()) -> term().
+type_anno(atom) -> {atom,[]};
+type_anno(bool) -> bool;
+type_anno({binary,_}) -> binary;
+type_anno(cons) -> cons;
+type_anno(float) -> {float,[]};
+type_anno(integer) -> {integer,[]};
+type_anno(list) -> list;
+type_anno(map) -> map;
+type_anno(match_context) -> match_context;
+type_anno(number) -> number;
+type_anno(nil) -> nil.
+
+-spec type_anno(term(), term()) -> term().
+type_anno(atom, Value) when is_atom(Value) -> {atom, Value};
+type_anno(float, Value) when is_float(Value)  -> {float, Value};
+type_anno(integer, Value) when is_integer(Value) -> {integer, Value}.
+
+-spec type_anno(term(), term(), term(), term()) -> term().
+type_anno(tuple, Size, Exact, Elements) when is_integer(Size), Size >= 0,
+                                             is_map(Elements) ->
+    case Exact of
+        true -> {tuple, Size, Elements};
+        false -> {tuple, [Size], Elements}
+    end.
+
 -spec format_error(term()) -> iolist().
 
 format_error({{_M,F,A},{I,Off,limit}}) ->
@@ -90,34 +119,9 @@ format_error(Error) ->
 %%  format as used in the compiler and in .S files.
 
 validate(Module, Fs) ->
-    Ft = index_bs_start_match(Fs, []),
+    Ft = index_parameter_types(Fs, []),
     validate_0(Module, Fs, Ft).
 
-index_bs_start_match([{function,_,_,Entry,Code0}|Fs], Acc0) ->
-    Code = dropwhile(fun({label,L}) when L =:= Entry -> false;
-			(_) -> true
-		     end, Code0),
-    case Code of
-	[{label,Entry}|Is] ->
-	    Acc = index_bs_start_match_1(Is, Entry, Acc0),
-	    index_bs_start_match(Fs, Acc);
-	_ ->
-	    %% Something serious is wrong. Ignore it for now.
-	    %% It will be detected and diagnosed later.
-	    index_bs_start_match(Fs, Acc0)
-    end;
-index_bs_start_match([], Acc) ->
-    gb_trees:from_orddict(lists:sort(Acc)).
-
-index_bs_start_match_1([{test,bs_start_match2,_,_,_,_}=I|_], Entry, Acc) ->
-    [{Entry,[I]}|Acc];
-index_bs_start_match_1([{test,_,{f,F},_},{bs_context_to_binary,_}|Is0], Entry, Acc) ->
-    [{label,F}|Is] = dropwhile(fun({label,L}) when L =:= F -> false;
-				  (_)  -> true
-			       end, Is0),
-    index_bs_start_match_1(Is, Entry, Acc);
-index_bs_start_match_1(_, _, Acc) -> Acc.
-
 validate_0(_Module, [], _) -> [];
 validate_0(Module, [{function,Name,Ar,Entry,Code}|Fs], Ft) ->
     try validate_1(Code, Name, Ar, Entry, Ft) of
@@ -132,41 +136,126 @@ validate_0(Module, [{function,Name,Ar,Entry,Code}|Fs], Ft) ->
 	    erlang:raise(Class, Error, Stack)
     end.
 
+-record(value_ref, {id :: index()}).
+-record(value, {op :: term(), args :: [argument()], type :: type()}).
+
+-type argument() :: #value_ref{} | literal().
+
 -type index() :: non_neg_integer().
--type reg_tab() :: gb_trees:tree(index(), 'none' | {'value', _}).
-
--record(st,				%Emulation state
-	{x=init_regs(0, term)        :: reg_tab(),%x register info.
-	 y=init_regs(0, initialized) :: reg_tab(),%y register info.
-	 f=init_fregs(),                %
-	 numy=none,			%Number of y registers.
-	 h=0,				%Available heap size.
-	 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.
-         puts_left=none                 %put/1 instructions left.
-	}).
+
+-type literal() :: {atom, [] | atom()} |
+                   {float, [] | float()} |
+                   {integer, [] | integer()} |
+                   {literal, term()} |
+                   nil.
+
+-type tuple_sz() :: [non_neg_integer()] | %% Inexact
+                    non_neg_integer(). %% Exact.
+
+%% Match context type.
+-record(ms,
+        {id=make_ref() :: reference(),          %Unique ID.
+         valid=0 :: non_neg_integer(),          %Valid slots
+         slots=0 :: non_neg_integer()           %Number of slots
+        }).
+
+-type type() :: binary |
+                cons |
+                list |
+                map |
+                nil |
+                #ms{} |
+                ms_position |
+                none |
+                number |
+                term |
+                tuple_in_progress |
+                {tuple, tuple_sz(), #{ literal() => type() }} |
+                literal().
+
+-type tag() :: initialized |
+               uninitialized |
+               {catchtag, [label()]} |
+               {trytag, [label()]}.
+
+-type x_regs() :: #{ {x, index()} => #value_ref{} }.
+-type y_regs() :: #{ {y, index()} => tag() | #value_ref{} }.
+
+%% Emulation state
+-record(st,
+        {%% All known values.
+         vs=#{} :: #{ #value_ref{} => #value{} },
+         %% Register states.
+         xs=#{} :: x_regs(),
+         ys=#{} :: y_regs(),
+         f=init_fregs(),
+         %% A set of all registers containing "fragile" terms. That is, terms
+         %% that don't exist on our process heap and would be destroyed by a
+         %% GC.
+         fragile=cerl_sets:new() :: cerl_sets:set(),
+         %% Number of Y registers.
+         %%
+         %% Note that this may be 0 if there's a frame without saved values,
+         %% such as on a body-recursive call.
+         numy=none :: none | undecided | index(),
+         %% Available heap size.
+         h=0,
+         %Available heap size for floats.
+         hf=0,
+         %% Floating point state.
+         fls=undefined,
+         %% List of hot catch/try labels
+         ct=[],
+         %% Previous instruction was setelement/3.
+         setelem=false,
+         %% put/1 instructions left.
+         puts_left=none
+        }).
 
 -type label()        :: integer().
 -type label_set()    :: gb_sets:set(label()).
 -type branched_tab() :: gb_trees:tree(label(), #st{}).
 -type ft_tab()       :: gb_trees:tree().
 
--record(vst,				%Validator state
-	{current=none              :: #st{} | 'none',	%Current state
-	 branched=gb_trees:empty() :: branched_tab(),	%States at jumps
-	 labels=gb_sets:empty()    :: label_set(),	%All defined labels
-	 ft=gb_trees:empty()       :: ft_tab()          %Some other functions
-	 		% in the module (those that start with bs_start_match2).
-	}).
-
-%% Match context type.
--record(ms,
-	{id=make_ref() :: reference(),		%Unique ID.
-	 valid=0 :: non_neg_integer(),		%Valid slots
-	 slots=0 :: non_neg_integer()		%Number of slots
-	}).
+%% Validator state
+-record(vst,
+        {%% Current state
+         current=none              :: #st{} | 'none',
+         %% States at labels
+         branched=gb_trees:empty() :: branched_tab(),
+         %% All defined labels
+         labels=gb_sets:empty()    :: label_set(),
+         %% Argument information of other functions in the module
+         ft=gb_trees:empty()       :: ft_tab(),
+         %% Counter for #value_ref{} creation
+         ref_ctr=0                 :: index()
+        }).
+
+index_parameter_types([{function,_,_,Entry,Code0}|Fs], Acc0) ->
+    Code = dropwhile(fun({label,L}) when L =:= Entry -> false;
+			(_) -> true
+		     end, Code0),
+    case Code of
+	[{label,Entry}|Is] ->
+	    Acc = index_parameter_types_1(Is, Entry, Acc0),
+	    index_parameter_types(Fs, Acc);
+	_ ->
+	    %% Something serious is wrong. Ignore it for now.
+	    %% It will be detected and diagnosed later.
+	    index_parameter_types(Fs, Acc0)
+    end;
+index_parameter_types([], Acc) ->
+    gb_trees:from_orddict(sort(Acc)).
+
+index_parameter_types_1([{'%', {type_info, Reg, Type0}} | Is], Entry, Acc) ->
+    Type = case Type0 of
+                match_context -> #ms{};
+                _ -> Type0
+            end,
+    Key = {Entry, Reg},
+    index_parameter_types_1(Is, Entry, [{Key, Type} | Acc]);
+index_parameter_types_1(_, _, Acc) ->
+    Acc.
 
 validate_1(Is, Name, Arity, Entry, Ft) ->
     validate_2(labels(Is), Name, Arity, Entry, Ft).
@@ -179,14 +268,10 @@ validate_2({Ls1,Is}, Name, Arity, _Entry, _Ft) ->
 
 validate_3({Ls2,Is}, Name, Arity, Entry, Mod, Ls1, Ft) ->
     Offset = 1 + length(Ls1) + 1 + length(Ls2),
-    EntryOK = lists:member(Entry, Ls2),
+    EntryOK = member(Entry, Ls2),
     if
 	EntryOK ->
-	    St = init_state(Arity),
-	    Vst0 = #vst{current=St,
-			branched=gb_trees_from_list([{L,St} || L <- Ls1]),
-			labels=gb_sets:from_list(Ls1++Ls2),
-			ft=Ft},
+            Vst0 = init_vst(Arity, Ls1, Ls2, Ft),
 	    MFA = {Mod,Name,Arity},
 	    Vst = valfun(Is, MFA, Offset, Vst0),
 	    validate_fun_info_branches(Ls1, MFA, Vst);
@@ -203,7 +288,13 @@ validate_fun_info_branches([], _, _) -> ok.
 validate_fun_info_branches_1(Arity, {_,_,Arity}, _) -> ok;
 validate_fun_info_branches_1(X, {Mod,Name,Arity}=MFA, Vst) ->
     try
-	get_term_type({x,X}, Vst)
+        case Vst of
+            #vst{current=#st{numy=none}} ->
+                ok;
+            #vst{current=#st{numy=Size}} ->
+                error({unexpected_stack_frame,Size})
+        end,
+        assert_term({x,X}, Vst)
     catch Error ->
 	    I = {func_info,{atom,Mod},{atom,Name},Arity},
 	    Offset = 2,
@@ -224,19 +315,22 @@ labels_1([{line,_}|Is], R) ->
 labels_1(Is, R) ->
     {reverse(R),Is}.
 
-init_state(Arity) ->
-    Xs = init_regs(Arity, term),
-    Ys = init_regs(0, initialized),
-    kill_heap_allocation(#st{x=Xs,y=Ys,numy=none,ct=[]}).
+init_vst(Arity, Ls1, Ls2, Ft) ->
+    Vst0 = init_function_args(Arity - 1, #vst{current=#st{}}),
+    Branches = gb_trees_from_list([{L,Vst0#vst.current} || L <- Ls1]),
+    Labels = gb_sets:from_list(Ls1++Ls2),
+    Vst0#vst{branched=Branches,
+             labels=Labels,
+             ft=Ft}.
+
+init_function_args(-1, Vst) ->
+    Vst;
+init_function_args(X, Vst) ->
+    init_function_args(X - 1, create_term(term, argument, [], {x,X}, Vst)).
 
 kill_heap_allocation(St) ->
     St#st{h=0,hf=0}.
 
-init_regs(0, _) ->
-    gb_trees:empty();
-init_regs(N, Type) ->
-    gb_trees_from_list([{R,Type} || R <- lists:seq(0, N-1)]).
-
 valfun([], MFA, _Offset, #vst{branched=Targets0,labels=Labels0}=Vst) ->
     Targets = gb_trees:keys(Targets0),
     Labels = gb_sets:to_list(Labels0),
@@ -257,20 +351,25 @@ valfun([I|Is], MFA, Offset, Vst0) ->
 
 %% Instructions that are allowed in dead code or when failing,
 %% that is while the state is undecided in some way.
-valfun_1({label,Lbl}, #vst{current=St0,branched=B,labels=Lbls}=Vst) ->
-    St = merge_states(Lbl, St0, B),
-    Vst#vst{current=St,branched=gb_trees:enter(Lbl, St, B),
-	    labels=gb_sets:add(Lbl, Lbls)};
+valfun_1({label,Lbl}, #vst{current=St0,
+                           ref_ctr=Counter0,
+                           branched=B,
+                           labels=Lbls}=Vst) ->
+    {St, Counter} = merge_states(Lbl, St0, B, Counter0),
+    Vst#vst{current=St,
+            ref_ctr=Counter,
+            branched=gb_trees:enter(Lbl, St, B),
+            labels=gb_sets:add(Lbl, Lbls)};
 valfun_1(_I, #vst{current=none}=Vst) ->
     %% Ignore instructions after erlang:error/1,2, which
     %% the original R10B compiler thought would return.
     Vst;
 valfun_1({badmatch,Src}, Vst) ->
-    assert_term(Src, Vst),
+    assert_durable_term(Src, Vst),
     verify_y_init(Vst),
     kill_state(Vst);
 valfun_1({case_end,Src}, Vst) ->
-    assert_term(Src, Vst),
+    assert_durable_term(Src, Vst),
     verify_y_init(Vst),
     kill_state(Vst);
 valfun_1(if_end, Vst) ->
@@ -278,35 +377,21 @@ valfun_1(if_end, Vst) ->
     kill_state(Vst);
 valfun_1({try_case_end,Src}, Vst) ->
     verify_y_init(Vst),
-    assert_term(Src, Vst),
+    assert_durable_term(Src, Vst),
     kill_state(Vst);
-%% Instructions that can not cause exceptions
-valfun_1({bs_context_to_binary,Ctx}, #vst{current=#st{x=Xs}}=Vst) ->
-    case Ctx of
-	{Tag,X} when Tag =:= x; Tag =:= y ->
-	    Type = case gb_trees:lookup(X, Xs) of
-		       {value,#ms{}} -> term;
-		       _ -> get_term_type(Ctx, Vst)
-		   end,
-	    set_type_reg(Type, Ctx, Vst);
-	_ ->
-	    error({bad_source,Ctx})
-    end;
+%% Instructions that cannot cause exceptions
+valfun_1({bs_get_tail,Ctx,Dst,Live}, Vst0) ->
+    bsm_validate_context(Ctx, Vst0),
+    verify_live(Live, Vst0),
+    verify_y_init(Vst0),
+    Vst = prune_x_regs(Live, Vst0),
+    extract_term(binary, bs_get_tail, [Ctx], Dst, Vst, Vst0);
 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.
-    case get_term_type_1(Src, Vst) of
-	{catchtag,_} -> error({catchtag,Src});
-	{trytag,_} -> error({trytag,Src});
-	Type -> set_type_reg(Type, Dst, Vst)
-    end;
 valfun_1({move,Src,Dst}, Vst) ->
-    Type = get_move_term_type(Src, Vst),
-    set_type_reg(Type, Dst, Vst);
+    assign(Src, Dst, Vst);
 valfun_1({fmove,Src,{fr,_}=Dst}, Vst) ->
     assert_type(float, Src, Vst),
     set_freg(Dst, Vst);
@@ -314,15 +399,15 @@ valfun_1({fmove,{fr,_}=Src,Dst}, Vst0) ->
     assert_freg_set(Src, Vst0),
     assert_fls(checked, Vst0),
     Vst = eat_heap_float(Vst0),
-    set_type_reg({float,[]}, Dst, Vst);
-valfun_1({kill,{y,_}=Reg}, Vst) ->
-    set_type_y(initialized, Reg, Vst);
-valfun_1({init,{y,_}=Reg}, Vst) ->
-    set_type_y(initialized, Reg, Vst);
+    create_term({float,[]}, fmove, [], Dst, Vst);
+valfun_1({kill,Reg}, Vst) ->
+    create_tag(initialized, kill, [], Reg, Vst);
+valfun_1({init,Reg}, Vst) ->
+    create_tag(initialized, init, [], Reg, Vst);
 valfun_1({test_heap,Heap,Live}, Vst) ->
     test_heap(Heap, Live, Vst);
-valfun_1({bif,Op,{f,_},Src,Dst}=I, Vst) ->
-    case is_bif_safe(Op, length(Src)) of
+valfun_1({bif,Op,{f,_},Ss,Dst}=I, Vst) ->
+    case is_bif_safe(Op, length(Ss)) of
 	false ->
 	    %% Since the BIF can fail, make sure that any catch state
 	    %% is updated.
@@ -330,21 +415,32 @@ valfun_1({bif,Op,{f,_},Src,Dst}=I, Vst) ->
 	true ->
 	    %% It can't fail, so we finish handling it here (not updating
 	    %% catch state).
-	    validate_src(Src, Vst),
-	    Type = bif_type(Op, Src, Vst),
-	    set_type_reg(Type, Dst, Vst)
+	    validate_src(Ss, Vst),
+	    Type = bif_return_type(Op, Ss, Vst),
+	    extract_term(Type, {bif,Op}, Ss, Dst, Vst)
     end;
 %% Put instructions.
 valfun_1({put_list,A,B,Dst}, Vst0) ->
     assert_term(A, Vst0),
     assert_term(B, Vst0),
     Vst = eat_heap(2, Vst0),
-    set_type_reg(cons, Dst, Vst);
+    create_term(cons, put_list, [A, B], Dst, Vst);
+valfun_1({put_tuple2,Dst,{list,Elements}}, Vst0) ->
+    _ = [assert_term(El, Vst0) || El <- Elements],
+    Size = length(Elements),
+    Vst = eat_heap(Size+1, Vst0),
+    {Es,_} = foldl(fun(Val, {Es0, Index}) ->
+                       Type = get_term_type(Val, Vst0),
+                       Es = set_element_type({integer,Index}, Type, Es0),
+                       {Es, Index + 1}
+                   end, {#{}, 1}, Elements),
+    Type = {tuple,Size,Es},
+    create_term(Type, put_tuple2, [], 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 = create_term(tuple_in_progress, put_tuple, [], Dst, Vst1),
     #vst{current=St0} = Vst,
-    St = St0#st{puts_left={Sz,{Dst,{tuple,Sz}}}},
+    St = St0#st{puts_left={Sz,{Dst,Sz,#{}}}},
     Vst#vst{current=St};
 valfun_1({put,Src}, Vst0) ->
     assert_term(Src, Vst0),
@@ -353,11 +449,14 @@ valfun_1({put,Src}, Vst0) ->
     case St0 of
         #st{puts_left=none} ->
             error(not_building_a_tuple);
-        #st{puts_left={1,{Dst,Type}}} ->
+        #st{puts_left={1,{Dst,Sz,Es0}}} ->
+            Es = Es0#{ {integer,Sz} => get_term_type(Src, Vst0) },
             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}},
+            create_term({tuple,Sz,Es}, put_tuple, [], Dst, Vst#vst{current=St});
+        #st{puts_left={PutsLeft,{Dst,Sz,Es0}}} when is_integer(PutsLeft) ->
+            Index = Sz - PutsLeft + 1,
+            Es = Es0#{ {integer,Index} => get_term_type(Src, Vst0) },
+            St = St0#st{puts_left={PutsLeft-1,{Dst,Sz,Es}}},
             Vst#vst{current=St}
     end;
 %% Instructions for optimization of selective receives.
@@ -370,13 +469,28 @@ valfun_1(remove_message, Vst) ->
     %% The message term is no longer fragile. It can be used
     %% without restrictions.
     remove_fragility(Vst);
+valfun_1({'%', {type_info, Reg, match_context}}, Vst) ->
+    update_type(fun meet/2, #ms{}, Reg, Vst);
+valfun_1({'%', {type_info, Reg, Type}}, Vst) ->
+    %% Explicit type information inserted by optimization passes to indicate
+    %% that Reg has a certain type, so that we can accept cross-function type
+    %% optimizations.
+    update_type(fun meet/2, Type, Reg, Vst);
+valfun_1({'%', {remove_fragility, Reg}}, Vst) ->
+    %% This is a hack to make prim_eval:'receive'/2 work.
+    %%
+    %% Normally it's illegal to pass fragile terms as a function argument as we
+    %% have no way of knowing what the callee will do with it, but we know that
+    %% prim_eval:'receive'/2 won't leak the term, nor cause a GC since it's
+    %% disabled while matching messages.
+    remove_fragility(Reg, Vst);
 valfun_1({'%',_}, Vst) ->
     Vst;
 valfun_1({line,_}, Vst) ->
     Vst;
 %% Exception generating calls
 valfun_1({call_ext,Live,Func}=I, Vst) ->
-    case return_type(Func, Vst) of
+    case call_return_type(Func, Vst) of
 	exception ->
 	    verify_live(Live, Vst),
             %% The stack will be scanned, so Y registers
@@ -391,88 +505,122 @@ valfun_1(_I, #vst{current=#st{ct=undecided}}) ->
 %%
 %% Allocate and deallocate, et.al
 valfun_1({allocate,Stk,Live}, Vst) ->
-    allocate(false, Stk, 0, Live, Vst);
+    allocate(uninitialized, Stk, 0, Live, Vst);
 valfun_1({allocate_heap,Stk,Heap,Live}, Vst) ->
-    allocate(false, Stk, Heap, Live, Vst);
+    allocate(uninitialized, Stk, Heap, Live, Vst);
 valfun_1({allocate_zero,Stk,Live}, Vst) ->
-    allocate(true, Stk, 0, Live, Vst);
+    allocate(initialized, Stk, 0, Live, Vst);
 valfun_1({allocate_heap_zero,Stk,Heap,Live}, Vst) ->
-    allocate(true, Stk, Heap, Live, Vst);
+    allocate(initialized, Stk, Heap, Live, Vst);
 valfun_1({deallocate,StkSize}, #vst{current=#st{numy=StkSize}}=Vst) ->
     verify_no_ct(Vst),
     deallocate(Vst);
 valfun_1({deallocate,_}, #vst{current=#st{numy=NumY}}) ->
     error({allocated,NumY});
-valfun_1({trim,N,Remaining}, #vst{current=#st{y=Yregs0,numy=NumY}=St}=Vst) ->
+valfun_1({trim,N,Remaining}, #vst{current=St0}=Vst) ->
+    #st{numy=NumY} = St0,
     if
-	N =< NumY, N+Remaining =:= NumY ->
-	    Yregs1 = [{Y-N,Type} || {Y,Type} <- gb_trees:to_list(Yregs0), Y >= N],
-	    Yregs = gb_trees_from_list(Yregs1),
-	    Vst#vst{current=St#st{y=Yregs,numy=NumY-N}};
-	true ->
-	    error({trim,N,Remaining,allocated,NumY})
+        N =< NumY, N+Remaining =:= NumY ->
+            Vst#vst{current=trim_stack(N, 0, NumY, St0)};
+        N > NumY; N+Remaining =/= NumY ->
+            error({trim,N,Remaining,allocated,NumY})
     end;
 %% Catch & try.
-valfun_1({'catch',Dst,{f,Fail}}, Vst0) when Fail /= none ->
-    Vst = #vst{current=#st{ct=Fails}=St} = 
-	set_type_y({catchtag,[Fail]}, Dst, Vst0),
-    Vst#vst{current=St#st{ct=[[Fail]|Fails]}};
-valfun_1({'try',Dst,{f,Fail}}, Vst0) ->
-    Vst = #vst{current=#st{ct=Fails}=St} = 
-	set_type_y({trytag,[Fail]}, Dst, Vst0),
-    Vst#vst{current=St#st{ct=[[Fail]|Fails]}};
-valfun_1({catch_end,Reg}, #vst{current=#st{ct=[Fail|Fails]}}=Vst0) ->
-    case get_special_y_type(Reg, Vst0) of
-	{catchtag,Fail} ->
-	    Vst = #vst{current=St} = set_catch_end(Reg, Vst0),
-	    Xs = gb_trees_from_list([{0,term}]),
-	    Vst#vst{current=St#st{x=Xs,ct=Fails,fls=undefined}};
-	Type ->
-	    error({bad_type,Type})
+valfun_1({'catch',Dst,{f,Fail}}, Vst) when Fail =/= none ->
+    init_try_catch_branch(catchtag, Dst, Fail, Vst);
+valfun_1({'try',Dst,{f,Fail}}, Vst)  when Fail =/= none ->
+    init_try_catch_branch(trytag, Dst, Fail, Vst);
+valfun_1({catch_end,Reg}, #vst{current=#st{ct=[Fail|_]}}=Vst0) ->
+    case get_tag_type(Reg, Vst0) of
+        {catchtag,Fail} ->
+            %% {x,0} contains the caught term, if any.
+            create_term(term, catch_end, [], {x,0}, kill_catch_tag(Reg, Vst0));
+        Type ->
+            error({wrong_tag_type,Type})
     end;
-valfun_1({try_end,Reg}, #vst{current=#st{ct=[Fail|Fails]}=St0}=Vst0) ->
-    case get_special_y_type(Reg, Vst0) of
-	{trytag,Fail} ->
-	    Vst = case Fail of
-		      [FailLabel] -> branch_state(FailLabel, Vst0);
-		      _ -> Vst0
-		  end,
-	    St = St0#st{ct=Fails,fls=undefined},
-	    set_catch_end(Reg, Vst#vst{current=St});
-	Type ->
-	    error({bad_type,Type})
+valfun_1({try_end,Reg}, #vst{current=#st{ct=[Fail|_]}}=Vst) ->
+    case get_tag_type(Reg, Vst) of
+        {trytag,Fail} ->
+            %% Kill the catch tag, note that x registers are unaffected.
+            kill_catch_tag(Reg, Vst);
+        Type ->
+            error({wrong_tag_type,Type})
     end;
-valfun_1({try_case,Reg}, #vst{current=#st{ct=[Fail|Fails]}}=Vst0) ->
-    case get_special_y_type(Reg, Vst0) of
-	{trytag,Fail} ->
-	    Vst = #vst{current=St} = set_catch_end(Reg, Vst0),
-	    Xs = gb_trees_from_list([{0,{atom,[]}},{1,term},{2,term}]),
-	    Vst#vst{current=St#st{x=Xs,ct=Fails,fls=undefined}};
-	Type ->
-	    error({bad_type,Type})
+valfun_1({try_case,Reg}, #vst{current=#st{ct=[Fail|_]}}=Vst0) ->
+    case get_tag_type(Reg, Vst0) of
+        {trytag,Fail} ->
+            %% Kill the catch tag and all x registers.
+            Vst1 = prune_x_regs(0, kill_catch_tag(Reg, Vst0)),
+
+            %% Class:Error:Stacktrace
+            Vst2 = create_term({atom,[]}, try_case, [], {x,0}, Vst1),
+            Vst = create_term(term, try_case, [], {x,1}, Vst2),
+            create_term(term, try_case, [], {x,2}, Vst);
+        Type ->
+            error({wrong_tag_type,Type})
     end;
 valfun_1({get_list,Src,D1,D2}, Vst0) ->
+    assert_not_literal(Src),
     assert_type(cons, Src, Vst0),
-    Vst = set_type_reg(term, Src, D1, Vst0),
-    set_type_reg(term, Src, D2, Vst);
+    Vst = extract_term(term, get_hd, [Src], D1, Vst0),
+    extract_term(term, get_tl, [Src], D2, Vst);
 valfun_1({get_hd,Src,Dst}, Vst) ->
+    assert_not_literal(Src),
     assert_type(cons, Src, Vst),
-    set_type_reg(term, Src, Dst, Vst);
+    extract_term(term, get_hd, [Src], Dst, Vst);
 valfun_1({get_tl,Src,Dst}, Vst) ->
+    assert_not_literal(Src),
     assert_type(cons, Src, Vst),
-    set_type_reg(term, Src, Dst, Vst);
-valfun_1({get_tuple_element,Src,I,Dst}, Vst) ->
-    assert_type({tuple_element,I+1}, Src, Vst),
-    set_type_reg(term, Src, Dst, Vst);
+    extract_term(term, get_tl, [Src], Dst, Vst);
+valfun_1({get_tuple_element,Src,N,Dst}, Vst) ->
+    assert_not_literal(Src),
+    assert_type({tuple_element,N+1}, Src, Vst),
+    Index = {integer,N+1},
+    Type = get_element_type(Index, Src, Vst),
+    extract_term(Type, {bif,element}, [Index, Src], Dst, Vst);
+valfun_1({jump,{f,Lbl}}, Vst) ->
+    branch(Lbl, Vst,
+           fun(SuccVst) ->
+                   %% The next instruction is never executed.
+                   kill_state(SuccVst)
+           end);
 valfun_1(I, Vst) ->
     valfun_2(I, Vst).
 
-%% Update branched state if necessary and try next set of instructions.
-valfun_2(I, #vst{current=#st{ct=[]}}=Vst) ->
-    valfun_3(I, Vst);
+init_try_catch_branch(Tag, Dst, Fail, Vst0) ->
+    Vst1 = create_tag({Tag,[Fail]}, 'try_catch', [], Dst, Vst0),
+    #vst{current=#st{ct=Fails}=St0} = Vst1,
+    St = St0#st{ct=[[Fail]|Fails]},
+    Vst = Vst0#vst{current=St},
+
+    branch(Fail, Vst,
+           fun(CatchVst) ->
+                    #vst{current=#st{ys=Ys}} = CatchVst,
+                    maps:fold(fun init_catch_handler_1/3, CatchVst, Ys)
+           end,
+           fun(SuccVst) ->
+                    %% All potentially-throwing instructions after this
+                    %% one will implicitly branch to the fail label;
+                    %% see valfun_2/2
+                    SuccVst
+           end).
+
+%% Set the initial state at the try/catch label. Assume that Y registers
+%% contain terms or try/catch tags.
+init_catch_handler_1(Reg, initialized, Vst) ->
+    create_term(term, 'catch_handler', [], Reg, Vst);
+init_catch_handler_1(Reg, uninitialized, Vst) ->
+    create_term(term, 'catch_handler', [], Reg, Vst);
+init_catch_handler_1(_, _, Vst) ->
+    Vst.
+
 valfun_2(I, #vst{current=#st{ct=[[Fail]|_]}}=Vst) when is_integer(Fail) ->
-    %% Update branched state
+    %% We have an active try/catch tag and we can jump there from this
+    %% instruction, so we need to update the branched state of the try/catch
+    %% handler.
     valfun_3(I, branch_state(Fail, Vst));
+valfun_2(I, #vst{current=#st{ct=[]}}=Vst) ->
+    valfun_3(I, Vst);
 valfun_2(_, _) ->
     error(ambiguous_catch_try_state).
 
@@ -480,17 +628,23 @@ valfun_2(_, _) ->
 %% Floating point.
 valfun_3({fconv,Src,{fr,_}=Dst}, Vst) ->
     assert_term(Src, Vst),
-    set_freg(Dst, Vst);
-valfun_3({bif,fadd,_,[_,_]=Src,Dst}, Vst) ->
-    float_op(Src, Dst, Vst);
-valfun_3({bif,fdiv,_,[_,_]=Src,Dst}, Vst) ->
-    float_op(Src, Dst, Vst);
-valfun_3({bif,fmul,_,[_,_]=Src,Dst}, Vst) ->
-    float_op(Src, Dst, Vst);
-valfun_3({bif,fnegate,_,[_]=Src,Dst}, Vst) ->
-    float_op(Src, Dst, Vst);
-valfun_3({bif,fsub,_,[_,_]=Src,Dst}, Vst) ->
-    float_op(Src, Dst, Vst);
+
+    %% An exception is raised on error, hence branching to 0.
+    branch(0, Vst,
+           fun(SuccVst0) ->
+               SuccVst = update_type(fun meet/2, number, Src, SuccVst0),
+               set_freg(Dst, SuccVst)
+           end);
+valfun_3({bif,fadd,_,[_,_]=Ss,Dst}, Vst) ->
+    float_op(Ss, Dst, Vst);
+valfun_3({bif,fdiv,_,[_,_]=Ss,Dst}, Vst) ->
+    float_op(Ss, Dst, Vst);
+valfun_3({bif,fmul,_,[_,_]=Ss,Dst}, Vst) ->
+    float_op(Ss, Dst, Vst);
+valfun_3({bif,fnegate,_,[_]=Ss,Dst}, Vst) ->
+    float_op(Ss, Dst, Vst);
+valfun_3({bif,fsub,_,[_,_]=Ss,Dst}, Vst) ->
+    float_op(Ss, Dst, Vst);
 valfun_3(fclearerror, Vst) ->
     case get_fls(Vst) of
 	undefined -> ok;
@@ -541,67 +695,87 @@ valfun_4({call_ext_last,_,_,_}, #vst{current=#st{numy=NumY}}) ->
 valfun_4({make_fun2,_,_,_,Live}, Vst) ->
     call(make_fun, Live, Vst);
 %% Other BIFs
-valfun_4({bif,tuple_size,{f,Fail},[Tuple],Dst}, Vst0) ->
-    TupleType0 = get_term_type(Tuple, Vst0),
-    Vst1 = branch_state(Fail, Vst0),
-    TupleType = upgrade_tuple_type({tuple,[0]}, TupleType0),
-    Vst = set_type(TupleType, Tuple, Vst1),
-    set_type_reg({integer,[]}, Dst, Vst);
-valfun_4({bif,element,{f,Fail},[Pos,Tuple],Dst}, Vst0) ->
-    TupleType0 = get_term_type(Tuple, Vst0),
-    PosType = get_term_type(Pos, Vst0),
-    Vst1 = branch_state(Fail, Vst0),
-    TupleType = upgrade_tuple_type({tuple,[get_tuple_size(PosType)]}, TupleType0),
-    Vst = set_type(TupleType, Tuple, Vst1),
-    set_type_reg(term, Tuple, Dst, Vst);
+valfun_4({bif,element,{f,Fail},[Pos,Src],Dst}, Vst) ->
+    branch(Fail, Vst,
+           fun(SuccVst0) ->
+                   PosType = get_term_type(Pos, SuccVst0),
+                   TupleType = {tuple,[get_tuple_size(PosType)],#{}},
+
+                   SuccVst1 = update_type(fun meet/2, TupleType,
+                                         Src, SuccVst0),
+                   SuccVst = update_type(fun meet/2, {integer,[]},
+                                         Pos, SuccVst1),
+
+                   ElementType = get_element_type(PosType, Src, SuccVst),
+                   extract_term(ElementType, {bif,element}, [Pos,Src],
+                                Dst, SuccVst)
+           end);
 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,map_get,{f,Fail},[_Key,Map]=Src,Dst}, Vst0) ->
-    validate_src(Src, Vst0),
-    Vst1 = branch_state(Fail, Vst0),
-    Vst = set_type(map, Map, Vst1),
-    Type = propagate_fragility(term, Src, Vst),
-    set_type_reg(Type, Dst, Vst);
-valfun_4({bif,is_map_key,{f,Fail},[_Key,Map]=Src,Dst}, Vst0) ->
-    validate_src(Src, Vst0),
-    Vst1 = branch_state(Fail, Vst0),
-    Vst = set_type(map, Map, Vst1),
-    Type = propagate_fragility(bool, Src, Vst),
-    set_type_reg(Type, Dst, Vst);
-valfun_4({bif,Op,{f,Fail},Src,Dst}, Vst0) ->
-    validate_src(Src, Vst0),
-    Vst = branch_state(Fail, Vst0),
-    Type0 = bif_type(Op, Src, Vst),
-    Type = propagate_fragility(Type0, Src, Vst),
-    set_type_reg(Type, Dst, Vst);
-valfun_4({gc_bif,Op,{f,Fail},Live,Src,Dst}, #vst{current=St0}=Vst0) ->
+valfun_4({bif,Op,{f,Fail},[Src]=Ss,Dst}, Vst) when Op =:= hd; Op =:= tl ->
+    assert_term(Src, Vst),
+    branch(Fail, Vst,
+           fun(FailVst) ->
+                   update_type(fun subtract/2, cons, Src, FailVst)
+           end,
+           fun(SuccVst0) ->
+                   SuccVst = update_type(fun meet/2, cons, Src, SuccVst0),
+                   extract_term(term, {bif,Op}, Ss, Dst, SuccVst)
+           end);
+valfun_4({bif,Op,{f,Fail},Ss,Dst}, Vst) ->
+    validate_src(Ss, Vst),
+    branch(Fail, Vst,
+           fun(SuccVst0) ->
+                   %% Infer argument types. Note that we can't subtract
+                   %% types as the BIF could fail for reasons other than
+                   %% bad argument types.
+                   ArgTypes = bif_arg_types(Op, Ss),
+                   SuccVst = foldl(fun({Arg, T}, V) ->
+                                           update_type(fun meet/2, T, Arg, V)
+                                   end, SuccVst0, zip(Ss, ArgTypes)),
+                   Type = bif_return_type(Op, Ss, SuccVst),
+                   extract_term(Type, {bif,Op}, Ss, Dst, SuccVst)
+           end);
+valfun_4({gc_bif,Op,{f,Fail},Live,Ss,Dst}, #vst{current=St0}=Vst0) ->
+    validate_src(Ss, Vst0),
     verify_live(Live, Vst0),
     verify_y_init(Vst0),
+
+    %% Heap allocations and X registers are killed regardless of whether we
+    %% fail or not, as we may fail after GC.
     St = kill_heap_allocation(St0),
-    Vst1 = Vst0#vst{current=St},
-    Vst2 = branch_state(Fail, Vst1),
-    Vst = prune_x_regs(Live, Vst2),
-    validate_src(Src, Vst),
-    Type0 = bif_type(Op, Src, Vst),
-    Type = propagate_fragility(Type0, Src, Vst),
-    set_type_reg(Type, Dst, Vst);
+    Vst = prune_x_regs(Live, Vst0#vst{current=St}),
+
+    branch(Fail, Vst,
+           fun(SuccVst0) ->
+                   ArgTypes = bif_arg_types(Op, Ss),
+                   SuccVst = foldl(fun({Arg, T}, V) ->
+                                           update_type(fun meet/2, T, Arg, V)
+                                   end, SuccVst0, zip(Ss, ArgTypes)),
+
+                   Type = bif_return_type(Op, Ss, SuccVst),
+
+                   %% We're passing Vst0 as the original because the
+                   %% registers were pruned before the branch.
+                   extract_term(Type, {gc_bif,Op}, Ss, Dst, SuccVst, Vst0)
+           end);
 valfun_4(return, #vst{current=#st{numy=none}}=Vst) ->
-    assert_term({x,0}, Vst),
+    assert_durable_term({x,0}, Vst),
     kill_state(Vst);
 valfun_4(return, #vst{current=#st{numy=NumY}}) ->
     error({stack_frame,NumY});
-valfun_4({jump,{f,Lbl}}, Vst) ->
-    kill_state(branch_state(Lbl, Vst));
-valfun_4({loop_rec,{f,Fail},Dst}, Vst0) ->
-    Vst = branch_state(Fail, Vst0),
-    %% This term may not be part of the root set until
-    %% remove_message/0 is executed. If control transfers
-    %% to the loop_rec_end/1 instruction, no part of
-    %% this term must be stored in a Y register.
-    set_type_reg({fragile,term}, Dst, Vst);
+valfun_4({loop_rec,{f,Fail},Dst}, Vst) ->
+    %% This term may not be part of the root set until remove_message/0 is
+    %% executed. If control transfers to the loop_rec_end/1 instruction, no
+    %% part of this term must be stored in a Y register.
+    branch(Fail, Vst,
+           fun(SuccVst0) ->
+                   {Ref, SuccVst} = new_value(term, loop_rec, [], SuccVst0),
+                   mark_fragile(Dst, set_reg_vref(Ref, Dst, SuccVst))
+           end);
 valfun_4({wait,_}, Vst) ->
     verify_y_init(Vst),
     kill_state(Vst);
@@ -612,131 +786,169 @@ valfun_4({wait_timeout,_,Src}, Vst) ->
 valfun_4({loop_rec_end,_}, Vst) ->
     verify_y_init(Vst),
     kill_state(Vst);
-valfun_4(timeout, #vst{current=St}=Vst) ->
-    Vst#vst{current=St#st{x=init_regs(0, term)}};
+valfun_4(timeout, Vst) ->
+    prune_x_regs(0, Vst);
 valfun_4(send, Vst) ->
     call(send, 2, Vst);
-valfun_4({set_tuple_element,Src,Tuple,I}, Vst) ->
+valfun_4({set_tuple_element,Src,Tuple,N}, Vst) ->
+    I = N + 1,
     assert_term(Src, Vst),
-    assert_type({tuple_element,I+1}, Tuple, Vst),
-    Vst;
+    assert_type({tuple_element,I}, Tuple, Vst),
+    %% Manually update the tuple type; we can't rely on the ordinary update
+    %% helpers as we must support overwriting (rather than just widening or
+    %% narrowing) known elements, and we can't use extract_term either since
+    %% the source tuple may be aliased.
+    {tuple, Sz, Es0} = get_term_type(Tuple, Vst),
+    Es = set_element_type({integer,I}, get_term_type(Src, Vst), Es0),
+    override_type({tuple, Sz, Es}, Tuple, Vst);
 %% Match instructions.
 valfun_4({select_val,Src,{f,Fail},{list,Choices}}, Vst) ->
     assert_term(Src, Vst),
-    Lbls = [L || {f,L} <- Choices]++[Fail],
-    kill_state(foldl(fun(L, S) -> branch_state(L, S) end, Vst, Lbls));
+    assert_choices(Choices),
+    validate_select_val(Fail, Choices, Src, Vst);
 valfun_4({select_tuple_arity,Tuple,{f,Fail},{list,Choices}}, Vst) ->
     assert_type(tuple, Tuple, Vst),
-    kill_state(branch_arities(Choices, Tuple, branch_state(Fail, Vst)));
+    assert_arities(Choices),
+    validate_select_tuple_arity(Fail, Choices, Tuple, Vst);
 
 %% New bit syntax matching instructions.
-valfun_4({test,bs_start_match2,{f,Fail},Live,[Ctx,NeedSlots],Ctx}, Vst0) ->
-    %% If source and destination registers are the same, match state
-    %% is OK as input.
-    CtxType = get_move_term_type(Ctx, Vst0),
-    verify_live(Live, Vst0),
-    verify_y_init(Vst0),
-    Vst1 = prune_x_regs(Live, Vst0),
-    BranchVst = case CtxType of
-		    #ms{} ->
-			%% The failure branch will never be taken when Ctx
-			%% is a match context. Therefore, the type for Ctx
-			%% at the failure label must not be match_context
-			%% (or we could reject legal code).
-			set_type_reg(term, Ctx, Vst1);
-		    _ ->
-			Vst1
-		end,
-    Vst = branch_state(Fail, BranchVst),
-    set_type_reg(bsm_match_state(NeedSlots), Ctx, Vst);
-valfun_4({test,bs_start_match2,{f,Fail},Live,[Src,Slots],Dst}, Vst0) ->
-    assert_term(Src, Vst0),
-    verify_live(Live, Vst0),
-    verify_y_init(Vst0),
-    Vst1 = prune_x_regs(Live, Vst0),
-    Vst = branch_state(Fail, Vst1),
-    set_type_reg(bsm_match_state(Slots), Src, Dst, Vst);
+valfun_4({test,bs_start_match3,{f,Fail},Live,[Src],Dst}, Vst) ->
+    validate_bs_start_match(Fail, Live, bsm_match_state(), Src, Dst, Vst);
+valfun_4({test,bs_start_match2,{f,Fail},Live,[Src,Slots],Dst}, Vst) ->
+    validate_bs_start_match(Fail, Live, bsm_match_state(Slots), Src, Dst, Vst);
 valfun_4({test,bs_match_string,{f,Fail},[Ctx,_,_]}, Vst) ->
     bsm_validate_context(Ctx, Vst),
-    branch_state(Fail, Vst);
+    branch(Fail, Vst, fun(V) -> V end);
 valfun_4({test,bs_skip_bits2,{f,Fail},[Ctx,Src,_,_]}, Vst) ->
     bsm_validate_context(Ctx, Vst),
     assert_term(Src, Vst),
-    branch_state(Fail, Vst);
+    branch(Fail, Vst, fun(V) -> V end);
 valfun_4({test,bs_test_tail2,{f,Fail},[Ctx,_]}, Vst) ->
     bsm_validate_context(Ctx, Vst),
-    branch_state(Fail, Vst);
+    branch(Fail, Vst, fun(V) -> V end);
 valfun_4({test,bs_test_unit,{f,Fail},[Ctx,_]}, Vst) ->
     bsm_validate_context(Ctx, Vst),
-    branch_state(Fail, Vst);
+    branch(Fail, Vst, fun(V) -> V end);
 valfun_4({test,bs_skip_utf8,{f,Fail},[Ctx,Live,_]}, Vst) ->
     validate_bs_skip_utf(Fail, Ctx, Live, Vst);
 valfun_4({test,bs_skip_utf16,{f,Fail},[Ctx,Live,_]}, Vst) ->
     validate_bs_skip_utf(Fail, Ctx, Live, Vst);
 valfun_4({test,bs_skip_utf32,{f,Fail},[Ctx,Live,_]}, Vst) ->
     validate_bs_skip_utf(Fail, Ctx, Live, Vst);
-valfun_4({test,bs_get_integer2,{f,Fail},Live,[Ctx,_,_,_],Dst}, Vst) ->
-    validate_bs_get(Fail, Ctx, Live, {integer, []}, Dst, Vst);
-valfun_4({test,bs_get_float2,{f,Fail},Live,[Ctx,_,_,_],Dst}, Vst) ->
-    validate_bs_get(Fail, Ctx, Live, {float, []}, Dst, Vst);
-valfun_4({test,bs_get_binary2,{f,Fail},Live,[Ctx,_,_,_],Dst}, Vst) ->
-    Type = propagate_fragility(term, [Ctx], Vst),
-    validate_bs_get(Fail, Ctx, Live, Type, Dst, Vst);
-valfun_4({test,bs_get_utf8,{f,Fail},Live,[Ctx,_],Dst}, Vst) ->
-    validate_bs_get(Fail, Ctx, Live, {integer, []}, Dst, Vst);
-valfun_4({test,bs_get_utf16,{f,Fail},Live,[Ctx,_],Dst}, Vst) ->
-    validate_bs_get(Fail, Ctx, Live, {integer, []}, Dst, Vst);
-valfun_4({test,bs_get_utf32,{f,Fail},Live,[Ctx,_],Dst}, Vst) ->
-    validate_bs_get(Fail, Ctx, Live, {integer, []}, Dst, Vst);
+valfun_4({test,bs_get_integer2=Op,{f,Fail},Live,[Ctx,_,_,_],Dst}, Vst) ->
+    validate_bs_get(Op, Fail, Ctx, Live, {integer, []}, Dst, Vst);
+valfun_4({test,bs_get_float2=Op,{f,Fail},Live,[Ctx,_,_,_],Dst}, Vst) ->
+    validate_bs_get(Op, Fail, Ctx, Live, {float, []}, Dst, Vst);
+valfun_4({test,bs_get_binary2=Op,{f,Fail},Live,[Ctx,_,_,_],Dst}, Vst) ->
+    validate_bs_get(Op, Fail, Ctx, Live, binary, Dst, Vst);
+valfun_4({test,bs_get_utf8=Op,{f,Fail},Live,[Ctx,_],Dst}, Vst) ->
+    validate_bs_get(Op, Fail, Ctx, Live, {integer, []}, Dst, Vst);
+valfun_4({test,bs_get_utf16=Op,{f,Fail},Live,[Ctx,_],Dst}, Vst) ->
+    validate_bs_get(Op, Fail, Ctx, Live, {integer, []}, Dst, Vst);
+valfun_4({test,bs_get_utf32=Op,{f,Fail},Live,[Ctx,_],Dst}, Vst) ->
+    validate_bs_get(Op, Fail, Ctx, Live, {integer, []}, Dst, Vst);
 valfun_4({bs_save2,Ctx,SavePoint}, Vst) ->
     bsm_save(Ctx, SavePoint, Vst);
 valfun_4({bs_restore2,Ctx,SavePoint}, Vst) ->
     bsm_restore(Ctx, SavePoint, Vst);
+valfun_4({bs_get_position, Ctx, Dst, Live}, Vst0) ->
+    bsm_validate_context(Ctx, Vst0),
+    verify_live(Live, Vst0),
+    verify_y_init(Vst0),
+    Vst = prune_x_regs(Live, Vst0),
+    create_term(ms_position, bs_get_position, [Ctx], Dst, Vst, Vst0);
+valfun_4({bs_set_position, Ctx, Pos}, Vst) ->
+    bsm_validate_context(Ctx, Vst),
+    assert_type(ms_position, Pos, Vst),
+    Vst;
 
 %% Other test instructions.
-valfun_4({test,is_float,{f,Lbl},[Float]}, Vst) ->
-    assert_term(Float, Vst),
-    set_type({float,[]}, Float, branch_state(Lbl, Vst));
-valfun_4({test,is_tuple,{f,Lbl},[Tuple]}, Vst) ->
-    Type0 = get_term_type(Tuple, Vst),
-    Type = upgrade_tuple_type({tuple,[0]}, Type0),
-    set_type(Type, Tuple, branch_state(Lbl, Vst));
-valfun_4({test,is_nonempty_list,{f,Lbl},[Cons]}, Vst) ->
-    assert_term(Cons, Vst),
-    set_type(cons, Cons, branch_state(Lbl, Vst));
-valfun_4({test,test_arity,{f,Lbl},[Tuple,Sz]}, Vst) when is_integer(Sz) ->
-    assert_type(tuple, Tuple, Vst),
-    set_type_reg({tuple,Sz}, Tuple, branch_state(Lbl, Vst));
-valfun_4({test,is_tagged_tuple,{f,Lbl},[Src,Sz,_Atom]}, Vst) ->
-    validate_src([Src], Vst),
-    set_type_reg({tuple, Sz}, Src, branch_state(Lbl, Vst));
 valfun_4({test,has_map_fields,{f,Lbl},Src,{list,List}}, Vst) ->
     assert_type(map, Src, Vst),
     assert_unique_map_keys(List),
-    branch_state(Lbl, Vst);
-valfun_4({test,is_map,{f,Lbl},[Src]}, Vst0) ->
-    Vst = branch_state(Lbl, Vst0),
-    case Src of
-	{Tag,_} when Tag =:= x; Tag =:= y ->
-	    set_type_reg(map, Src, Vst);
-	{literal,Map} when is_map(Map) ->
-	    Vst;
-	_ ->
-	    kill_state(Vst)
-    end;
+    branch(Lbl, Vst, fun(V) -> V end);
+valfun_4({test,is_atom,{f,Lbl},[Src]}, Vst) ->
+    type_test(Lbl, {atom,[]}, Src, Vst);
+valfun_4({test,is_binary,{f,Lbl},[Src]}, Vst) ->
+    type_test(Lbl, binary, Src, Vst);
+valfun_4({test,is_bitstr,{f,Lbl},[Src]}, Vst) ->
+    type_test(Lbl, binary, Src, Vst);
+valfun_4({test,is_boolean,{f,Lbl},[Src]}, Vst) ->
+    type_test(Lbl, bool, Src, Vst);
+valfun_4({test,is_float,{f,Lbl},[Src]}, Vst) ->
+    type_test(Lbl, {float,[]}, Src, Vst);
+valfun_4({test,is_tuple,{f,Lbl},[Src]}, Vst) ->
+    type_test(Lbl, {tuple,[0],#{}}, Src, Vst);
+valfun_4({test,is_integer,{f,Lbl},[Src]}, Vst) ->
+    type_test(Lbl, {integer,[]}, Src, Vst);
+valfun_4({test,is_nonempty_list,{f,Lbl},[Src]}, Vst) ->
+    type_test(Lbl, cons, Src, Vst);
+valfun_4({test,is_number,{f,Lbl},[Src]}, Vst) ->
+    type_test(Lbl, number, Src, Vst);
+valfun_4({test,is_list,{f,Lbl},[Src]}, Vst) ->
+    type_test(Lbl, list, Src, Vst);
+valfun_4({test,is_map,{f,Lbl},[Src]}, Vst) ->
+    type_test(Lbl, map, Src, Vst);
+valfun_4({test,is_nil,{f,Lbl},[Src]}, Vst) ->
+    %% is_nil is an exact check against the 'nil' value, and should not be
+    %% treated as a simple type test.
+    assert_term(Src, Vst),
+    branch(Lbl, Vst,
+           fun(FailVst) ->
+                   update_ne_types(Src, nil, FailVst)
+           end,
+           fun(SuccVst) ->
+                   update_eq_types(Src, nil, SuccVst)
+           end);
+valfun_4({test,test_arity,{f,Lbl},[Tuple,Sz]}, Vst) when is_integer(Sz) ->
+    assert_type(tuple, Tuple, Vst),
+    Type = {tuple, Sz, #{}},
+    type_test(Lbl, Type, Tuple, Vst);
+valfun_4({test,is_tagged_tuple,{f,Lbl},[Src,Sz,Atom]}, Vst) ->
+    assert_term(Src, Vst),
+    Type = {tuple, Sz, #{ {integer,1} => Atom }},
+    type_test(Lbl, Type, Src, Vst);
+valfun_4({test,is_eq_exact,{f,Lbl},[Src,Val]=Ss}, Vst) ->
+    validate_src(Ss, Vst),
+    branch(Lbl, Vst,
+           fun(FailVst) ->
+                   update_ne_types(Src, Val, FailVst)
+           end,
+           fun(SuccVst) ->
+                   update_eq_types(Src, Val, SuccVst)
+           end);
+valfun_4({test,is_ne_exact,{f,Lbl},[Src,Val]=Ss}, Vst) ->
+    validate_src(Ss, Vst),
+    branch(Lbl, Vst,
+           fun(FailVst) ->
+                   update_eq_types(Src, Val, FailVst)
+           end,
+           fun(SuccVst) ->
+                   update_ne_types(Src, Val, SuccVst)
+           end);
 valfun_4({test,_Op,{f,Lbl},Src}, Vst) ->
+    %% is_pid, is_reference, et cetera.
     validate_src(Src, Vst),
-    branch_state(Lbl, Vst);
+    branch(Lbl, Vst, fun(V) -> V end);
 valfun_4({bs_add,{f,Fail},[A,B,_],Dst}, Vst) ->
     assert_term(A, Vst),
     assert_term(B, Vst),
-    set_type_reg({integer,[]}, Dst, branch_state(Fail, Vst));
+    branch(Fail, Vst,
+           fun(SuccVst) ->
+                   create_term({integer,[]}, bs_add, [A, B], Dst, SuccVst)
+           end);
 valfun_4({bs_utf8_size,{f,Fail},A,Dst}, Vst) ->
     assert_term(A, Vst),
-    set_type_reg({integer,[]}, Dst, branch_state(Fail, Vst));
+    branch(Fail, Vst,
+           fun(SuccVst) ->
+                   create_term({integer,[]}, bs_utf8_size, [A], Dst, SuccVst)
+           end);
 valfun_4({bs_utf16_size,{f,Fail},A,Dst}, Vst) ->
     assert_term(A, Vst),
-    set_type_reg({integer,[]}, Dst, branch_state(Fail, Vst));
+    branch(Fail, Vst,
+           fun(SuccVst) ->
+                   create_term({integer,[]}, bs_utf16_size, [A], Dst, SuccVst)
+           end);
 valfun_4({bs_init2,{f,Fail},Sz,Heap,Live,_,Dst}, Vst0) ->
     verify_live(Live, Vst0),
     verify_y_init(Vst0),
@@ -746,10 +958,12 @@ valfun_4({bs_init2,{f,Fail},Sz,Heap,Live,_,Dst}, Vst0) ->
 	true ->
 	    assert_term(Sz, Vst0)
     end,
-    Vst1 = heap_alloc(Heap, Vst0),
-    Vst2 = branch_state(Fail, Vst1),
-    Vst = prune_x_regs(Live, Vst2),
-    set_type_reg(binary, Dst, Vst);
+    Vst = heap_alloc(Heap, Vst0),
+    branch(Fail, Vst,
+           fun(SuccVst0) ->
+                   SuccVst = prune_x_regs(Live, SuccVst0),
+                   create_term(binary, bs_init2, [], Dst, SuccVst, SuccVst0)
+           end);
 valfun_4({bs_init_bits,{f,Fail},Sz,Heap,Live,_,Dst}, Vst0) ->
     verify_live(Live, Vst0),
     verify_y_init(Vst0),
@@ -759,116 +973,217 @@ valfun_4({bs_init_bits,{f,Fail},Sz,Heap,Live,_,Dst}, Vst0) ->
 	true ->
 	    assert_term(Sz, Vst0)
     end,
-    Vst1 = heap_alloc(Heap, Vst0),
-    Vst2 = branch_state(Fail, Vst1),
-    Vst = prune_x_regs(Live, Vst2),
-    set_type_reg(binary, Dst, Vst);
+    Vst = heap_alloc(Heap, Vst0),
+    branch(Fail, Vst,
+           fun(SuccVst0) ->
+                   SuccVst = prune_x_regs(Live, SuccVst0),
+                   create_term(binary, bs_init_bits, [], Dst, SuccVst)
+           end);
 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),
-    Vst2 = branch_state(Fail, Vst1),
-    Vst = prune_x_regs(Live, Vst2),
-    set_type_reg(binary, Dst, Vst);
-valfun_4({bs_private_append,{f,Fail},Bits,_Unit,Bin,_Flags,Dst}, Vst0) ->
-    assert_term(Bits, Vst0),
-    assert_term(Bin, Vst0),
-    Vst = branch_state(Fail, Vst0),
-    set_type_reg(binary, Dst, Vst);
+    Vst = heap_alloc(Heap, Vst0),
+    branch(Fail, Vst,
+           fun(SuccVst0) ->
+                   SuccVst = prune_x_regs(Live, SuccVst0),
+                   create_term(binary, bs_append, [Bin], Dst, SuccVst, SuccVst0)
+           end);
+valfun_4({bs_private_append,{f,Fail},Bits,_Unit,Bin,_Flags,Dst}, Vst) ->
+    assert_term(Bits, Vst),
+    assert_term(Bin, Vst),
+    branch(Fail, Vst,
+           fun(SuccVst) ->
+                   create_term(binary, bs_private_append, [Bin], Dst, SuccVst)
+           end);
 valfun_4({bs_put_string,Sz,_}, Vst) when is_integer(Sz) ->
     Vst;
 valfun_4({bs_put_binary,{f,Fail},Sz,_,_,Src}, Vst) ->
     assert_term(Sz, Vst),
     assert_term(Src, Vst),
-    branch_state(Fail, Vst);
+    branch(Fail, Vst,
+           fun(SuccVst) ->
+                   update_type(fun meet/2, binary, Src, SuccVst)
+           end);
 valfun_4({bs_put_float,{f,Fail},Sz,_,_,Src}, Vst) ->
     assert_term(Sz, Vst),
     assert_term(Src, Vst),
-    branch_state(Fail, Vst);
+    branch(Fail, Vst,
+           fun(SuccVst) ->
+                   update_type(fun meet/2, {float,[]}, Src, SuccVst)
+           end);
 valfun_4({bs_put_integer,{f,Fail},Sz,_,_,Src}, Vst) ->
     assert_term(Sz, Vst),
     assert_term(Src, Vst),
-    branch_state(Fail, Vst);
+    branch(Fail, Vst,
+           fun(SuccVst) ->
+                   update_type(fun meet/2, {integer,[]}, Src, SuccVst)
+           end);
 valfun_4({bs_put_utf8,{f,Fail},_,Src}, Vst) ->
     assert_term(Src, Vst),
-    branch_state(Fail, Vst);
+    branch(Fail, Vst,
+           fun(SuccVst) ->
+                   update_type(fun meet/2, {integer,[]}, Src, SuccVst)
+           end);
 valfun_4({bs_put_utf16,{f,Fail},_,Src}, Vst) ->
     assert_term(Src, Vst),
-    branch_state(Fail, Vst);
+    branch(Fail, Vst,
+           fun(SuccVst) ->
+                   update_type(fun meet/2, {integer,[]}, Src, SuccVst)
+           end);
 valfun_4({bs_put_utf32,{f,Fail},_,Src}, Vst) ->
     assert_term(Src, Vst),
-    branch_state(Fail, Vst);
+    branch(Fail, Vst,
+           fun(SuccVst) ->
+                   update_type(fun meet/2, {integer,[]}, Src, SuccVst)
+           end);
 %% Map instructions.
-valfun_4({put_map_assoc,{f,Fail},Src,Dst,Live,{list,List}}, Vst) ->
-    verify_put_map(Fail, Src, Dst, Live, List, Vst);
-valfun_4({put_map_exact,{f,Fail},Src,Dst,Live,{list,List}}, Vst) ->
-    verify_put_map(Fail, Src, Dst, Live, List, Vst);
+valfun_4({put_map_assoc=Op,{f,Fail},Src,Dst,Live,{list,List}}, Vst) ->
+    verify_put_map(Op, Fail, Src, Dst, Live, List, Vst);
+valfun_4({put_map_exact=Op,{f,Fail},Src,Dst,Live,{list,List}}, Vst) ->
+    verify_put_map(Op, Fail, Src, Dst, Live, List, Vst);
 valfun_4({get_map_elements,{f,Fail},Src,{list,List}}, Vst) ->
     verify_get_map(Fail, Src, List, Vst);
 valfun_4(_, _) ->
     error(unknown_instruction).
 
 verify_get_map(Fail, Src, List, Vst0) ->
+    assert_not_literal(Src),                    %OTP 22.
     assert_type(map, Src, Vst0),
-    Vst1 = foldl(fun(D, Vsti) ->
-                         case is_reg_defined(D,Vsti) of
-                             true -> set_type_reg(term,D,Vsti);
-                             false -> Vsti
-                         end
-                 end, Vst0, extract_map_vals(List)),
-    Vst2 = branch_state(Fail, Vst1),
-    Keys = extract_map_keys(List),
-    assert_unique_map_keys(Keys),
-    verify_get_map_pair(List, Src, Vst0, Vst2).
-
-extract_map_vals([_Key,Val|T]) ->
-    [Val|extract_map_vals(T)];
-extract_map_vals([]) -> [].
+
+    branch(Fail, Vst0,
+           fun(FailVst) ->
+                   clobber_map_vals(List, Src, FailVst)
+           end,
+           fun(SuccVst) ->
+                   Keys = extract_map_keys(List),
+                   assert_unique_map_keys(Keys),
+                   extract_map_vals(List, Src, SuccVst, SuccVst)
+           end).
+
+%% get_map_elements may leave its destinations in an inconsistent state when
+%% the fail label is taken. Consider the following:
+%%
+%%    {get_map_elements,{f,7},{x,1},{list,[{atom,a},{x,1},{atom,b},{x,2}]}}.
+%%
+%% If 'a' exists but not 'b', {x,1} is overwritten when we jump to {f,7}.
+%%
+%% We must be careful to preserve the uninitialized status for Y registers
+%% that have been allocated but not yet defined.
+clobber_map_vals([Key,Dst|T], Map, Vst0) ->
+    case is_reg_initialized(Dst, Vst0) of
+        true ->
+            Vst = extract_term(term, {bif,map_get}, [Key, Map], Dst, Vst0),
+            clobber_map_vals(T, Map, Vst);
+        false ->
+            clobber_map_vals(T, Map, Vst0)
+    end;
+clobber_map_vals([], _Map, Vst) ->
+    Vst.
+
+is_reg_initialized({x,_}=Reg, #vst{current=#st{xs=Xs}}) ->
+    is_map_key(Reg, Xs);
+is_reg_initialized({y,_}=Reg, #vst{current=#st{ys=Ys}}) ->
+    case Ys of
+        #{Reg:=Val} ->
+            Val =/= uninitialized;
+        #{} ->
+            false
+    end;
+is_reg_initialized(V, #vst{}) -> error({not_a_register, V}).
 
 extract_map_keys([Key,_Val|T]) ->
     [Key|extract_map_keys(T)];
 extract_map_keys([]) -> [].
 
-verify_get_map_pair([Src,Dst|Vs], Map, Vst0, Vsti0) ->
-    assert_term(Src, Vst0),
-    Vsti = set_type_reg(term, Map, Dst, Vsti0),
-    verify_get_map_pair(Vs, Map, Vst0, Vsti);
-verify_get_map_pair([], _Map, _Vst0, Vst) -> Vst.
+extract_map_vals([Key,Dst|Vs], Map, Vst0, Vsti0) ->
+    assert_term(Key, Vst0),
+    Vsti = extract_term(term, {bif,map_get}, [Key, Map], Dst, Vsti0),
+    extract_map_vals(Vs, Map, Vst0, Vsti);
+extract_map_vals([], _Map, _Vst0, Vst) ->
+    Vst.
 
-verify_put_map(Fail, Src, Dst, Live, List, Vst0) ->
+verify_put_map(Op, Fail, Src, Dst, Live, List, Vst0) ->
     assert_type(map, Src, Vst0),
     verify_live(Live, Vst0),
     verify_y_init(Vst0),
-    foreach(fun (Term) -> assert_term(Term, Vst0) end, List),
-    Vst1 = heap_alloc(0, Vst0),
-    Vst2 = branch_state(Fail, Vst1),
-    Vst = prune_x_regs(Live, Vst2),
-    Keys = extract_map_keys(List),
-    assert_unique_map_keys(Keys),
-    set_type_reg(map, Dst, Vst).
+    _ = [assert_term(Term, Vst0) || Term <- List],
+    Vst = heap_alloc(0, Vst0),
+
+    branch(Fail, Vst,
+           fun(SuccVst0) ->
+                   SuccVst = prune_x_regs(Live, SuccVst0),
+                   Keys = extract_map_keys(List),
+                   assert_unique_map_keys(Keys),
+                   create_term(map, Op, [Src], Dst, SuccVst, SuccVst0)
+           end).
+
+%%
+%% Common code for validating bs_start_match* instructions.
+%%
+
+validate_bs_start_match(Fail, Live, Type, Src, Dst, Vst) ->
+    verify_live(Live, Vst),
+    verify_y_init(Vst),
+
+    %% #ms{} can represent either a match context or a term, so we have to mark
+    %% the source as a term if it fails with a match context as an input. This
+    %% hack is only needed until we get proper union types.
+    branch(Fail, Vst,
+           fun(FailVst) ->
+                   case get_movable_term_type(Src, FailVst) of
+                       #ms{} -> override_type(term, Src, FailVst);
+                       _ -> FailVst
+                   end
+           end,
+           fun(SuccVst0) ->
+                   SuccVst1 = update_type(fun meet/2, binary,
+                                          Src, SuccVst0),
+                   SuccVst = prune_x_regs(Live, SuccVst1),
+                   extract_term(Type, bs_start_match, [Src], Dst,
+                                SuccVst, SuccVst0)
+           end).
 
 %%
 %% Common code for validating bs_get* instructions.
 %%
-validate_bs_get(Fail, Ctx, Live, Type, Dst, Vst0) ->
-    bsm_validate_context(Ctx, Vst0),
-    verify_live(Live, Vst0),
-    verify_y_init(Vst0),
-    Vst1 = prune_x_regs(Live, Vst0),
-    Vst = branch_state(Fail, Vst1),
-    set_type_reg(Type, Dst, Vst).
+validate_bs_get(Op, Fail, Ctx, Live, Type, Dst, Vst) ->
+    bsm_validate_context(Ctx, Vst),
+    verify_live(Live, Vst),
+    verify_y_init(Vst),
+
+    branch(Fail, Vst,
+           fun(SuccVst0) ->
+                   SuccVst = prune_x_regs(Live, SuccVst0),
+                   extract_term(Type, Op, [Ctx], Dst, SuccVst, SuccVst0)
+           end).
 
 %%
 %% Common code for validating bs_skip_utf* instructions.
 %%
-validate_bs_skip_utf(Fail, Ctx, Live, Vst0) ->
-    bsm_validate_context(Ctx, Vst0),
-    verify_y_init(Vst0),
-    verify_live(Live, Vst0),
-    Vst = prune_x_regs(Live, Vst0),
-    branch_state(Fail, Vst).
+validate_bs_skip_utf(Fail, Ctx, Live, Vst) ->
+    bsm_validate_context(Ctx, Vst),
+    verify_y_init(Vst),
+    verify_live(Live, Vst),
+
+    branch(Fail, Vst,
+           fun(SuccVst) ->
+                   prune_x_regs(Live, SuccVst)
+           end).
+
+%%
+%% Common code for is_$type instructions.
+%%
+type_test(Fail, Type, Reg, Vst) ->
+    assert_term(Reg, Vst),
+    branch(Fail, Vst,
+           fun(FailVst) ->
+                   update_type(fun subtract/2, Type, Reg, FailVst)
+           end,
+           fun(SuccVst) ->
+                   update_type(fun meet/2, Type, Reg, SuccVst)
+           end).
 
 %%
 %% Special state handling for setelement/3 and set_tuple_element/3 instructions.
@@ -885,34 +1200,29 @@ val_dsetel({set_tuple_element,_,_,_}, #vst{current=#st{setelem=false}}) ->
     error(illegal_context_for_set_tuple_element);
 val_dsetel({set_tuple_element,_,_,_}, #vst{current=#st{setelem=true}}=Vst) ->
     Vst;
+val_dsetel({get_tuple_element,_,_,_}, Vst) ->
+    Vst;
 val_dsetel({line,_}, Vst) ->
     Vst;
 val_dsetel(_, #vst{current=#st{setelem=true}=St}=Vst) ->
     Vst#vst{current=St#st{setelem=false}};
 val_dsetel(_, Vst) -> Vst.
 
-kill_state(#vst{current=#st{ct=[[Fail]|_]}}=Vst) when is_integer(Fail) ->
-    %% There is an active catch. Make sure that we merge the state into
-    %% the catch label before clearing it, so that that we can be sure
-    %% that the label gets a state.
-    kill_state_1(branch_state(Fail, Vst));
 kill_state(Vst) ->
-    kill_state_1(Vst).
-
-kill_state_1(Vst) ->
     Vst#vst{current=none}.
 
 %% A "plain" call.
 %%  The stackframe must be initialized.
 %%  The instruction will return to the instruction following the call.
-call(Name, Live, #vst{current=St}=Vst) ->
-    verify_call_args(Name, Live, Vst),
-    verify_y_init(Vst),
-    case return_type(Name, Vst) of
-	Type when Type =/= exception ->
-	    %% Type is never 'exception' because it has been handled earlier.
-	    Xs = gb_trees_from_list([{0,Type}]),
-	    Vst#vst{current=St#st{x=Xs,f=init_fregs()}}
+call(Name, Live, #vst{current=St0}=Vst0) ->
+    verify_call_args(Name, Live, Vst0),
+    verify_y_init(Vst0),
+    case call_return_type(Name, Vst0) of
+        Type when Type =/= exception ->
+            %% Type is never 'exception' because it has been handled earlier.
+            St = St0#st{f=init_fregs()},
+            Vst = prune_x_regs(0, Vst0#vst{current=St}),
+            create_term(Type, call, [], {x,0}, Vst)
     end.
 
 %% Tail call.
@@ -928,79 +1238,131 @@ tail_call(Name, Live, Vst0) ->
 verify_call_args(_, 0, #vst{}) ->
     ok;
 verify_call_args({f,Lbl}, Live, Vst) when is_integer(Live)->
-    verify_local_call(Lbl, Live, Vst);
+    verify_local_args(Live - 1, Lbl, #{}, Vst);
 verify_call_args(_, Live, Vst) when is_integer(Live)->
-    verify_call_args_1(Live, Vst);
+    verify_remote_args_1(Live - 1, Vst);
 verify_call_args(_, Live, _) ->
     error({bad_number_of_live_regs,Live}).
 
-verify_call_args_1(0, _) -> ok;
-verify_call_args_1(N, Vst) ->
-    X = N - 1,
-    get_term_type({x,X}, Vst),
-    verify_call_args_1(X, Vst).
-
-verify_local_call(Lbl, Live, Vst) ->
-    case all_ms_in_x_regs(Live, Vst) of
-	[{R,Ctx}] ->
-	    %% Verify that there is a suitable bs_start_match2 instruction.
-	    verify_call_match_context(Lbl, R, Vst),
-
-	    %% Since the callee has consumed the match context,
-	    %% there must be no additional copies in Y registers.
-	    #ms{id=Id} = Ctx,
-	    case ms_in_y_regs(Id, Vst) of
-		[] ->
-		    ok;
-		[_|_]=Ys ->
-		    error({multiple_match_contexts,[R|Ys]})
-	    end;
-	[_,_|_]=Xs0 ->
-	    Xs = [R || {R,_} <- Xs0],
-	    error({multiple_match_contexts,Xs});
-	[] ->
-	    ok
+verify_remote_args_1(-1, _) ->
+    ok;
+verify_remote_args_1(X, Vst) ->
+    assert_durable_term({x, X}, Vst),
+    verify_remote_args_1(X - 1, Vst).
+
+verify_local_args(-1, _Lbl, _CtxIds, _Vst) ->
+    ok;
+verify_local_args(X, Lbl, CtxIds, Vst) ->
+    Reg = {x, X},
+    assert_not_fragile(Reg, Vst),
+    case get_movable_term_type(Reg, Vst) of
+        #ms{id=Id}=Type ->
+            case CtxIds of
+                #{ Id := Other } ->
+                    error({multiple_match_contexts, [Reg, Other]});
+                #{} ->
+                    verify_arg_type(Lbl, Reg, Type, Vst),
+                    verify_local_args(X - 1, Lbl, CtxIds#{ Id => Reg }, Vst)
+            end;
+        Type ->
+            verify_arg_type(Lbl, Reg, Type, Vst),
+            verify_local_args(X - 1, Lbl, CtxIds, Vst)
     end.
 
-all_ms_in_x_regs(0, _Vst) ->
-    [];
-all_ms_in_x_regs(Live0, Vst) ->
-    Live = Live0 - 1,
-    R = {x,Live},
-    case get_move_term_type(R, Vst) of
-	#ms{}=M ->
-	    [{R,M}|all_ms_in_x_regs(Live, Vst)];
-	_ ->
-	    all_ms_in_x_regs(Live, Vst)
+%% Verifies that the given argument narrows to what the function expects.
+verify_arg_type(Lbl, Reg, #ms{}, #vst{ft=Ft}) ->
+    %% Match contexts require explicit support, and may not be passed to a
+    %% function that accepts arbitrary terms.
+    case gb_trees:lookup({Lbl, Reg}, Ft) of
+        {value, #ms{}} -> ok;
+        _ -> error(no_bs_start_match2)
+    end;
+verify_arg_type(Lbl, Reg, GivenType, #vst{ft=Ft}) ->
+    case gb_trees:lookup({Lbl, Reg}, Ft) of
+        {value, #ms{}} ->
+            %% Functions that accept match contexts also accept all other
+            %% terms. This will change once we support union types.
+            ok;
+        {value, RequiredType} ->
+            case vat_1(GivenType, RequiredType) of
+                true -> ok;
+                false -> error({bad_arg_type, Reg, GivenType, RequiredType})
+            end;
+        none ->
+            ok
     end.
 
-ms_in_y_regs(Id, #vst{current=#st{y=Ys0}}) ->
-    Ys = gb_trees:to_list(Ys0),
-    [{y,Y} || {Y,#ms{id=OtherId}} <- Ys, OtherId =:= Id].
+%% Checks whether the Given argument is compatible with the Required one. This
+%% is essentially a relaxed version of 'meet(Given, Req) =:= Given', where we
+%% accept that the Given value has the right type but not necessarily the exact
+%% same value; if {atom,gurka} is required, we'll consider {atom,[]} valid.
+%%
+%% This will catch all problems that could crash the emulator, like passing a
+%% 1-tuple when the callee expects a 3-tuple, but some value errors might slip
+%% through.
+vat_1(Same, Same) -> true;
+vat_1({atom,A}, {atom,B}) -> A =:= B orelse is_list(A) orelse is_list(B);
+vat_1({atom,A}, bool) -> is_boolean(A) orelse is_list(A);
+vat_1(bool, {atom,B}) -> is_boolean(B) orelse is_list(B);
+vat_1(cons, list) -> true;
+vat_1({float,A}, {float,B}) -> A =:= B orelse is_list(A) orelse is_list(B);
+vat_1({float,_}, number) -> true;
+vat_1({integer,A}, {integer,B}) -> A =:= B orelse is_list(A) orelse is_list(B);
+vat_1({integer,_}, number) -> true;
+vat_1(_, {literal,_}) -> false;
+vat_1({literal,_}=Lit, Required) -> vat_1(get_literal_type(Lit), Required);
+vat_1(nil, list) -> true;
+vat_1({tuple,SzA,EsA}, {tuple,SzB,EsB}) ->
+    if
+        is_list(SzB) ->
+            tuple_sz(SzA) >= tuple_sz(SzB) andalso vat_elements(EsA, EsB);
+        SzA =:= SzB ->
+            vat_elements(EsA, EsB);
+        SzA =/= SzB ->
+            false
+    end;
+vat_1(_, _) -> false.
 
-verify_call_match_context(Lbl, Ctx, #vst{ft=Ft}) ->
-    case gb_trees:lookup(Lbl, Ft) of
-	none ->
-	    error(no_bs_start_match2);
-	{value,[{test,bs_start_match2,_,_,[Ctx,_],Ctx}|_]} ->
-	    ok;
-	{value,[{test,bs_start_match2,_,_,_,_}=I|_]} ->
-	    error({unsuitable_bs_start_match2,I})
-    end.
+vat_elements(EsA, EsB) ->
+    maps:fold(fun(Key, Req, Acc) ->
+                      case EsA of
+                          #{ Key := Given } -> Acc andalso vat_1(Given, Req);
+                          #{} -> false
+                      end
+              end, true, EsB).
 
-allocate(Zero, Stk, Heap, Live, #vst{current=#st{numy=none}}=Vst0) ->
+allocate(Tag, Stk, Heap, Live, #vst{current=#st{numy=none}=St}=Vst0) ->
     verify_live(Live, Vst0),
-    Vst = #vst{current=St} = prune_x_regs(Live, Vst0),
-    Ys = init_regs(Stk, case Zero of 
-			    true -> initialized;
-			    false -> uninitialized
-			end),
-    heap_alloc(Heap, Vst#vst{current=St#st{y=Ys,numy=Stk}});
+    Vst1 = Vst0#vst{current=St#st{numy=Stk}},
+    Vst2 = prune_x_regs(Live, Vst1),
+    Vst = init_stack(Tag, Stk - 1, Vst2),
+    heap_alloc(Heap, Vst);
 allocate(_, _, _, _, #vst{current=#st{numy=Numy}}) ->
     error({existing_stack_frame,{size,Numy}}).
 
 deallocate(#vst{current=St}=Vst) ->
-    Vst#vst{current=St#st{y=init_regs(0, initialized),numy=none}}.
+    Vst#vst{current=St#st{ys=#{},numy=none}}.
+
+init_stack(_Tag, -1, Vst) ->
+    Vst;
+init_stack(Tag, Y, Vst) ->
+    init_stack(Tag, Y - 1, create_tag(Tag, allocate, [], {y,Y}, Vst)).
+
+trim_stack(From, To, Top, #st{ys=Ys0}=St) when From =:= Top ->
+    Ys = maps:filter(fun({y,Y}, _) -> Y < To end, Ys0),
+    St#st{numy=To,ys=Ys};
+trim_stack(From, To, Top, St0) ->
+    Src = {y, From},
+    Dst = {y, To},
+
+    #st{ys=Ys0} = St0,
+    Ys = case Ys0 of
+             #{ Src := Ref } -> Ys0#{ Dst => Ref };
+             #{} -> error({invalid_shift,Src,Dst})
+         end,
+    St = St0#st{ys=Ys},
+
+    trim_stack(From + 1, To + 1, Top, St).
 
 test_heap(Heap, Live, Vst0) ->
     verify_live(Live, Vst0),
@@ -1025,13 +1387,43 @@ heap_alloc_2([{floats,Floats}|T], St0) ->
     St = St0#st{hf=Floats},
     heap_alloc_2(T, St);
 heap_alloc_2([], St) -> St.
-    
-prune_x_regs(Live, #vst{current=#st{x=Xs0}=St0}=Vst) when is_integer(Live) ->
-    Xs1 = gb_trees:to_list(Xs0),
-    Xs = [P || {R,_}=P <- Xs1, R < Live],
-    St = St0#st{x=gb_trees:from_orddict(Xs)},
+
+prune_x_regs(Live, #vst{current=St0}=Vst) when is_integer(Live) ->
+    #st{fragile=Fragile0,xs=Xs0} = St0,
+    Fragile = cerl_sets:filter(fun({x,X}) ->
+                                       X < Live;
+                                  ({y,_}) ->
+                                       true
+                               end, Fragile0),
+    Xs = maps:filter(fun({x,X}, _) ->
+                             X < Live
+                     end, Xs0),
+    St = St0#st{fragile=Fragile,xs=Xs},
     Vst#vst{current=St}.
 
+%% All choices in a select_val list must be integers, floats, or atoms.
+%% All must be of the same type.
+assert_choices([{Tag,_},{f,_}|T]) ->
+    if
+        Tag =:= atom; Tag =:= float; Tag =:= integer ->
+            assert_choices_1(T, Tag);
+        true ->
+            error(bad_select_list)
+    end;
+assert_choices([]) -> ok.
+
+assert_choices_1([{Tag,_},{f,_}|T], Tag) ->
+    assert_choices_1(T, Tag);
+assert_choices_1([_,{f,_}|_], _Tag) ->
+    error(bad_select_list);
+assert_choices_1([], _Tag) -> ok.
+
+assert_arities([Arity,{f,_}|T]) when is_integer(Arity) ->
+    assert_arities(T);
+assert_arities([]) -> ok;
+assert_arities(_) -> error(bad_tuple_arity_list).
+
+
 %%%
 %%% Floating point checking.
 %%%
@@ -1051,8 +1443,8 @@ prune_x_regs(Live, #vst{current=#st{x=Xs0}=St0}=Vst) when is_integer(Live) ->
 %%%   fmove Src {fr,_}		%% Move INTO floating point register.
 %%%
 
-float_op(Src, Dst, Vst0) ->
-    foreach (fun(S) -> assert_freg_set(S, Vst0) end, Src),
+float_op(Ss, Dst, Vst0) ->
+    _ = [assert_freg_set(S, Vst0) || S <- Ss],
     assert_fls(cleared, Vst0),
     Vst = set_fls(cleared, Vst0),
     set_freg(Dst, Vst).
@@ -1070,8 +1462,7 @@ get_fls(#vst{current=#st{fls=Fls}}) when is_atom(Fls) -> Fls.
 
 init_fregs() -> 0.
 
-set_freg({fr,Fr}=Freg, #vst{current=#st{f=Fregs0}=St}=Vst)
-  when is_integer(Fr), 0 =< Fr ->
+set_freg({fr,Fr}=Freg, #vst{current=#st{f=Fregs0}=St}=Vst) ->
     check_limit(Freg),
     Bit = 1 bsl Fr,
     if
@@ -1107,7 +1498,10 @@ assert_unique_map_keys([]) ->
 assert_unique_map_keys([_]) ->
     ok;
 assert_unique_map_keys([_,_|_]=Ls) ->
-    Vs = [get_literal(L) || L <- Ls],
+    Vs = [begin
+              assert_literal(L),
+              L
+          end || L <- Ls],
     case length(Vs) =:= sets:size(sets:from_list(Vs)) of
 	true -> ok;
 	false -> error(keys_not_unique)
@@ -1117,6 +1511,8 @@ assert_unique_map_keys([_,_|_]=Ls) ->
 %%% New binary matching instructions.
 %%%
 
+bsm_match_state() ->
+    #ms{}.
 bsm_match_state(Slots) ->
     #ms{slots=Slots}.
 
@@ -1124,13 +1520,13 @@ bsm_validate_context(Reg, Vst) ->
     _ = bsm_get_context(Reg, Vst),
     ok.
 
-bsm_get_context({x,X}=Reg, #vst{current=#st{x=Xs}}=_Vst) when is_integer(X) ->
-    case gb_trees:lookup(X, Xs) of
-	{value,#ms{}=Ctx} -> Ctx;
-	{value,{fragile,#ms{}=Ctx}} -> Ctx;
-	_ -> error({no_bsm_context,Reg})
+bsm_get_context({Kind,_}=Reg, Vst) when Kind =:= x; Kind =:= y->
+    case get_movable_term_type(Reg, Vst) of
+        #ms{}=Ctx -> Ctx;
+        _ -> error({no_bsm_context,Reg})
     end;
-bsm_get_context(Reg, _) -> error({bad_source,Reg}).
+bsm_get_context(Reg, _) ->
+    error({bad_source,Reg}).
 
 bsm_save(Reg, {atom,start}, Vst) ->
     %% Save point refering to where the match started.
@@ -1141,7 +1537,7 @@ bsm_save(Reg, SavePoint, Vst) ->
     case bsm_get_context(Reg, Vst) of
 	#ms{valid=Bits,slots=Slots}=Ctxt0 when SavePoint < Slots ->
 	    Ctx = Ctxt0#ms{valid=Bits bor (1 bsl SavePoint),slots=Slots},
-	    set_type_reg(Ctx, Reg, Vst);
+	    override_type(Ctx, Reg, Vst);
 	_ -> error({illegal_save,SavePoint})
     end.
 
@@ -1160,104 +1556,365 @@ bsm_restore(Reg, SavePoint, Vst) ->
 	_ -> error({illegal_restore,SavePoint,range})
     end.
 
+validate_select_val(_Fail, _Choices, _Src, #vst{current=none}=Vst) ->
+    %% We've already branched on all of Src's possible values, so we know we
+    %% can't reach the fail label or any of the remaining choices.
+    Vst;
+validate_select_val(Fail, [Val,{f,L}|T], Src, Vst0) ->
+    Vst = branch(L, Vst0,
+                 fun(BranchVst) ->
+                         update_eq_types(Src, Val, BranchVst)
+                 end,
+                 fun(FailVst) ->
+                         update_ne_types(Src, Val, FailVst)
+                 end),
+    validate_select_val(Fail, T, Src, Vst);
+validate_select_val(Fail, [], _, Vst) ->
+    branch(Fail, Vst,
+           fun(SuccVst) ->
+                   %% The next instruction is never executed.
+                   kill_state(SuccVst)
+           end).
+
+validate_select_tuple_arity(_Fail, _Choices, _Src, #vst{current=none}=Vst) ->
+    %% We've already branched on all of Src's possible values, so we know we
+    %% can't reach the fail label or any of the remaining choices.
+    Vst;
+validate_select_tuple_arity(Fail, [Arity,{f,L}|T], Tuple, Vst0) ->
+    Type = {tuple, Arity, #{}},
+    Vst = branch(L, Vst0,
+                 fun(BranchVst) ->
+                         update_type(fun meet/2, Type, Tuple, BranchVst)
+                 end,
+                 fun(FailVst) ->
+                         update_type(fun subtract/2, Type, Tuple, FailVst)
+                 end),
+    validate_select_tuple_arity(Fail, T, Tuple, Vst);
+validate_select_tuple_arity(Fail, [], _, #vst{}=Vst) ->
+    branch(Fail, Vst,
+           fun(SuccVst) ->
+                   %% The next instruction is never executed.
+                   kill_state(SuccVst)
+           end).
+
+infer_types({Kind,_}=Reg, Vst) when Kind =:= x; Kind =:= y ->
+    infer_types(get_reg_vref(Reg, Vst), Vst);
+infer_types(#value_ref{}=Ref, #vst{current=#st{vs=Vs}}) ->
+    case Vs of
+        #{ Ref := Entry } -> infer_types_1(Entry);
+        #{} -> fun(_, S) -> S end
+    end;
+infer_types(_, #vst{}) ->
+    fun(_, S) -> S end.
+
+infer_types_1(#value{op={bif,'=:='},args=[LHS,RHS]}) ->
+    fun({atom,true}, S) ->
+            %% Either side might contain something worth inferring, so we need
+            %% to check them both.
+            Infer_L = infer_types(RHS, S),
+            Infer_R = infer_types(LHS, S),
+            Infer_R(RHS, Infer_L(LHS, S));
+       (_, S) -> S
+    end;
+infer_types_1(#value{op={bif,element},args=[{integer,Index}=Key,Tuple]}) ->
+    fun(Val, S) ->
+            Type = {tuple,[Index], #{ Key => get_term_type(Val, S) }},
+            update_type(fun meet/2, Type, Tuple, S)
+    end;
+infer_types_1(#value{op={bif,is_atom},args=[Src]}) ->
+    infer_type_test_bif({atom,[]}, Src);
+infer_types_1(#value{op={bif,is_boolean},args=[Src]}) ->
+    infer_type_test_bif(bool, Src);
+infer_types_1(#value{op={bif,is_binary},args=[Src]}) ->
+    infer_type_test_bif(binary, Src);
+infer_types_1(#value{op={bif,is_bitstring},args=[Src]}) ->
+    infer_type_test_bif(binary, Src);
+infer_types_1(#value{op={bif,is_float},args=[Src]}) ->
+    infer_type_test_bif(float, Src);
+infer_types_1(#value{op={bif,is_integer},args=[Src]}) ->
+    infer_type_test_bif({integer,{}}, Src);
+infer_types_1(#value{op={bif,is_list},args=[Src]}) ->
+    infer_type_test_bif(list, Src);
+infer_types_1(#value{op={bif,is_map},args=[Src]}) ->
+    infer_type_test_bif(map, Src);
+infer_types_1(#value{op={bif,is_number},args=[Src]}) ->
+    infer_type_test_bif(number, Src);
+infer_types_1(#value{op={bif,is_tuple},args=[Src]}) ->
+    infer_type_test_bif({tuple,[0],#{}}, Src);
+infer_types_1(#value{op={bif,tuple_size}, args=[Tuple]}) ->
+    fun({integer,Arity}, S) ->
+            update_type(fun meet/2, {tuple,Arity,#{}}, Tuple, S);
+       (_, S) -> S
+    end;
+infer_types_1(_) ->
+    fun(_, S) -> S end.
+
+infer_type_test_bif(Type, Src) ->
+    fun({atom,true}, S) ->
+            update_type(fun meet/2, Type, Src, S);
+       (_, S) ->
+            S
+    end.
+
 %%%
 %%% Keeping track of types.
 %%%
 
-set_type(Type, {x,_}=Reg, Vst) -> set_type_reg(Type, Reg, Vst);
-set_type(Type, {y,_}=Reg, Vst) -> set_type_y(Type, Reg, Vst);
-set_type(_, _, #vst{}=Vst) -> Vst.
-
-set_type_reg(Type, Src, Dst, Vst) ->
-    case get_term_type_1(Src, Vst) of
-        {fragile,_} ->
-            set_type_reg(make_fragile(Type), Dst, Vst);
+%% Assigns Src to Dst and marks them as aliasing each other.
+assign({y,_}=Src, {y,_}=Dst, Vst) ->
+    %% The stack trimming optimization may generate a move from an initialized
+    %% but unassigned Y register to another Y register.
+    case get_raw_type(Src, Vst) of
+        initialized -> create_tag(initialized, init, [], Dst, Vst);
+        _ -> assign_1(Src, Dst, Vst)
+    end;
+assign({Kind,_}=Src, Dst, Vst) when Kind =:= x; Kind =:= y ->
+    assign_1(Src, Dst, Vst);
+assign(Literal, Dst, Vst) ->
+    Type = get_literal_type(Literal),
+    create_term(Type, move, [Literal], Dst, Vst).
+
+%% Creates a special tag value that isn't a regular term, such as 'initialized'
+%% or 'catchtag'
+create_tag(Tag, _Op, _Ss, {y,_}=Dst, #vst{current=#st{ys=Ys0}=St0}=Vst) ->
+    case maps:get(Dst, Ys0, uninitialized) of
+        {catchtag,_}=Prev ->
+            error(Prev);
+        {trytag,_}=Prev ->
+            error(Prev);
         _ ->
-            set_type_reg(Type, Dst, Vst)
+            check_try_catch_tags(Tag, Dst, Vst),
+            Ys = Ys0#{ Dst => Tag },
+            St = St0#st{ys=Ys},
+            remove_fragility(Dst, Vst#vst{current=St})
+    end;
+create_tag(_Tag, _Op, _Ss, Dst, _Vst) ->
+    error({invalid_tag_register, Dst}).
+
+%% Wipes a special tag, leaving the register initialized but empty.
+kill_tag({y,_}=Reg, #vst{current=#st{ys=Ys0}=St0}=Vst) ->
+    _ = get_tag_type(Reg, Vst),                 %Assertion.
+    Ys = Ys0#{ Reg => initialized },
+    Vst#vst{current=St0#st{ys=Ys}}.
+
+%% Creates a completely new term with the given type.
+create_term(Type, Op, Ss0, Dst, Vst0) ->
+    create_term(Type, Op, Ss0, Dst, Vst0, Vst0).
+
+%% As create_term/4, but uses the incoming Vst for argument resolution in
+%% case x-regs have been pruned and the sources can no longer be found.
+create_term(Type, Op, Ss0, Dst, Vst0, OrigVst) ->
+    {Ref, Vst1} = new_value(Type, Op, resolve_args(Ss0, OrigVst), Vst0),
+    Vst = remove_fragility(Dst, Vst1),
+    set_reg_vref(Ref, Dst, Vst).
+
+%% Extracts a term from Ss, propagating fragility.
+extract_term(Type, Op, Ss0, Dst, Vst0) ->
+    extract_term(Type, Op, Ss0, Dst, Vst0, Vst0).
+
+%% As extract_term/4, but uses the incoming Vst for argument resolution in
+%% case x-regs have been pruned and the sources can no longer be found.
+extract_term(Type, Op, Ss0, Dst, Vst0, OrigVst) ->
+    {Ref, Vst1} = new_value(Type, Op, resolve_args(Ss0, OrigVst), Vst0),
+    Vst = propagate_fragility(Dst, Ss0, Vst1),
+    set_reg_vref(Ref, Dst, Vst).
+
+%% Translates instruction arguments into the argument() type, decoupling them
+%% from their registers, allowing us to infer their types after they've been
+%% clobbered or moved.
+resolve_args([{Kind,_}=Src | Args], Vst) when Kind =:= x; Kind =:= y ->
+    [get_reg_vref(Src, Vst) | resolve_args(Args, Vst)];
+resolve_args([Lit | Args], Vst) ->
+    assert_literal(Lit),
+    [Lit | resolve_args(Args, Vst)];
+resolve_args([], _Vst) ->
+    [].
+
+%% Overrides the type of Reg. This is ugly but a necessity for certain
+%% destructive operations.
+override_type(Type, Reg, Vst) ->
+    update_type(fun(_, T) -> T end, Type, Reg, Vst).
+
+%% This is used when linear code finds out more and more information about a
+%% type, so that the type gets more specialized.
+update_type(Merge, With, #value_ref{}=Ref, Vst) ->
+    %% If the old type can't be merged with the new one, the type information
+    %% is inconsistent and we know that some instructions will never be
+    %% executed at run-time. For example:
+    %%
+    %%   {test,is_list,Fail,[Reg]}.
+    %%   {test,is_tuple,Fail,[Reg]}.
+    %%   {test,test_arity,Fail,[Reg,5]}.
+    %%
+    %% Note that the test_arity instruction can never be reached, so we need to
+    %% kill the state to avoid raising an error when we encounter it.
+    %%
+    %% Simply returning `kill_state(Vst)` is unsafe however as we might be in
+    %% the middle of an instruction, and altering the rest of the validator
+    %% (eg. prune_x_regs/2) to no-op on dead states is prone to error.
+    %%
+    %% We therefore throw a 'type_conflict' error instead, which causes
+    %% validation to fail unless we're in a context where such errors can be
+    %% handled, such as in a branch handler.
+    Current = get_raw_type(Ref, Vst),
+    case Merge(Current, With) of
+        none -> throw({type_conflict, Current, With});
+        Type -> set_type(Type, Ref, Vst)
+    end;
+update_type(Merge, With, {Kind,_}=Reg, Vst) when Kind =:= x; Kind =:= y ->
+    update_type(Merge, With, get_reg_vref(Reg, Vst), Vst);
+update_type(Merge, With, Literal, Vst) ->
+    assert_literal(Literal),
+    %% Literals always retain their type, but we still need to bail on type
+    %% conflicts.
+    case Merge(Literal, With) of
+        none -> throw({type_conflict, Literal, With});
+        _Type -> Vst
     end.
 
-set_type_reg(Type, {x,_}=Reg, Vst) ->
-    set_type_x(Type, Reg, Vst);
-set_type_reg(Type, Reg, Vst) ->
-    set_type_y(Type, Reg, Vst).
-
-set_type_x(Type, {x,X}=Reg, #vst{current=#st{x=Xs0}=St}=Vst)
-  when is_integer(X), 0 =< X ->
-    check_limit(Reg),
-    Xs = case gb_trees:lookup(X, Xs0) of
-             none ->
-                 gb_trees:insert(X, Type, Xs0);
-             {value,{fragile,_}} ->
-                 gb_trees:update(X, make_fragile(Type), Xs0);
-             {value,_} ->
-                 gb_trees:update(X, Type, Xs0)
-         end,
-    Vst#vst{current=St#st{x=Xs}};
-set_type_x(Type, Reg, #vst{}) ->
-    error({invalid_store,Reg,Type}).
-
-set_type_y(Type, {y,Y}=Reg, #vst{current=#st{y=Ys0}=St}=Vst)
-  when is_integer(Y), 0 =< Y ->
-    check_limit(Reg),
-    Ys = case gb_trees:lookup(Y, Ys0) of
-	     none ->
-		 error({invalid_store,Reg,Type});
-	     {value,{catchtag,_}=Tag} ->
-		 error(Tag);
-	     {value,{trytag,_}=Tag} ->
-		 error(Tag);
-	     {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}).
-
-make_fragile({fragile,_}=Type) -> Type;
-make_fragile(Type) -> {fragile,Type}.
-
-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
+update_ne_types(LHS, RHS, Vst) ->
+    %% While updating types on equality is fairly straightforward, inequality
+    %% is a bit trickier since all we know is that the *value* of LHS differs
+    %% from RHS, so we can't blindly subtract their types.
+    %%
+    %% Consider `number =/= {integer,[]}`; all we know is that LHS isn't equal
+    %% to some *specific integer* of unknown value, and if we were to subtract
+    %% {integer,[]} we would erroneously infer that the new type is {float,[]}.
+    %%
+    %% Therefore, we only subtract when we know that RHS has a specific value.
+    RType = get_term_type(RHS, Vst),
+    case is_literal(RType) of
+        true -> update_type(fun subtract/2, RType, LHS, Vst);
+        false -> Vst
     end.
 
-is_try_catch_tag({catchtag,_}) -> true;
-is_try_catch_tag({trytag,_}) -> true;
-is_try_catch_tag(_) -> false.
+update_eq_types(LHS, RHS, Vst0) ->
+    %% Either side might contain something worth inferring, so we need
+    %% to check them both.
+    Infer_L = infer_types(RHS, Vst0),
+    Infer_R = infer_types(LHS, Vst0),
+    Vst1 = Infer_R(RHS, Infer_L(LHS, Vst0)),
+
+    T1 = get_term_type(LHS, Vst1),
+    T2 = get_term_type(RHS, Vst1),
+
+    Vst = update_type(fun meet/2, T2, LHS, Vst1),
+    update_type(fun meet/2, T1, RHS, Vst).
+
+%% Helper functions for the above.
+
+assign_1(Src, Dst, Vst0) ->
+    assert_movable(Src, Vst0),
+    Vst = propagate_fragility(Dst, [Src], Vst0),
+    set_reg_vref(get_reg_vref(Src, Vst), Dst, Vst).
+
+set_reg_vref(Ref, {x,_}=Dst, Vst) ->
+    check_limit(Dst),
+    #vst{current=#st{xs=Xs0}=St0} = Vst,
+    St = St0#st{xs=Xs0#{ Dst => Ref }},
+    Vst#vst{current=St};
+set_reg_vref(Ref, {y,_}=Dst, #vst{current=#st{ys=Ys0}=St0} = Vst) ->
+    check_limit(Dst),
+    case Ys0 of
+        #{ Dst := {catchtag,_}=Tag } ->
+            error(Tag);
+        #{ Dst := {trytag,_}=Tag } ->
+            error(Tag);
+        #{ Dst := _ } ->
+            St = St0#st{ys=Ys0#{ Dst => Ref }},
+            Vst#vst{current=St};
+        #{} ->
+            %% Storing into a non-existent Y register means that we haven't set
+            %% up a (sufficiently large) stack.
+            error({invalid_store, Dst})
+    end.
 
-is_reg_defined({x,_}=Reg, Vst) -> is_type_defined_x(Reg, Vst);
-is_reg_defined({y,_}=Reg, Vst) -> is_type_defined_y(Reg, Vst);
-is_reg_defined(V, #vst{}) -> error({not_a_register, V}).
+get_reg_vref({x,_}=Src, #vst{current=#st{xs=Xs}}) ->
+    check_limit(Src),
+    case Xs of
+        #{ Src := #value_ref{}=Ref } ->
+            Ref;
+        #{} ->
+            error({uninitialized_reg, Src})
+    end;
+get_reg_vref({y,_}=Src, #vst{current=#st{ys=Ys}}) ->
+    check_limit(Src),
+    case Ys of
+        #{ Src := #value_ref{}=Ref } ->
+            Ref;
+        #{ Src := initialized } ->
+            error({unassigned, Src});
+        #{ Src := Tag } when Tag =/= uninitialized ->
+            error(Tag);
+        #{} ->
+            error({uninitialized_reg, Src})
+    end.
+
+set_type(Type, #value_ref{}=Ref, #vst{current=#st{vs=Vs0}=St}=Vst) ->
+    case Vs0 of
+        #{ Ref := #value{}=Entry } ->
+            Vs = Vs0#{ Ref => Entry#value{type=Type} },
+            Vst#vst{current=St#st{vs=Vs}};
+        #{} ->
+            %% Dead references may happen during type inference and are not an
+            %% error in and of themselves. If a problem were to arise from this
+            %% it'll explode elsewhere.
+            Vst
+    end.
+
+new_value(Type, Op, Ss, #vst{current=#st{vs=Vs0}=St,ref_ctr=Counter}=Vst) ->
+    Ref = #value_ref{id=Counter},
+    Vs = Vs0#{ Ref => #value{op=Op,args=Ss,type=Type} },
 
-is_type_defined_x({x,X}, #vst{current=#st{x=Xs}}) ->
-    gb_trees:is_defined(X,Xs).
+    {Ref, Vst#vst{current=St#st{vs=Vs},ref_ctr=Counter+1}}.
 
-is_type_defined_y({y,Y}, #vst{current=#st{y=Ys}}) ->
-    gb_trees:is_defined(Y,Ys).
+kill_catch_tag(Reg, #vst{current=#st{ct=[Fail|Fails]}=St}=Vst0) ->
+    Vst = Vst0#vst{current=St#st{ct=Fails,fls=undefined}},
+    {_, Fail} = get_tag_type(Reg, Vst),         %Assertion.
+    kill_tag(Reg, Vst).
+
+check_try_catch_tags(Type, {y,N}=Reg, Vst) ->
+    %% 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.
+    case is_try_catch_tag(Type) of
+        true ->
+            case collect_try_catch_tags(N - 1, Vst, []) of
+                [_|_]=Bad -> error({bad_try_catch_nesting, Reg, Bad});
+                [] -> ok
+            end;
+        false ->
+            ok
+    end.
 
 assert_term(Src, Vst) ->
-    get_term_type(Src, Vst),
+    _ = get_term_type(Src, Vst),
     ok.
 
+assert_movable(Src, Vst) ->
+    _ = get_movable_term_type(Src, Vst),
+    ok.
+
+assert_literal(Src) ->
+    case is_literal(Src) of
+        true -> ok;
+        false -> error({literal_required,Src})
+    end.
+
+assert_not_literal(Src) ->
+    case is_literal(Src) of
+        true -> error({literal_not_allowed,Src});
+        false -> ok
+    end.
+
+is_literal(nil) -> true;
+is_literal({atom,A}) when is_atom(A) -> true;
+is_literal({float,F}) when is_float(F) -> true;
+is_literal({integer,I}) when is_integer(I) -> true;
+is_literal({literal,_L}) -> true;
+is_literal(_) -> false.
+
 %% The possible types.
 %%
 %% First non-term types:
@@ -1276,10 +1933,10 @@ assert_term(Src, Vst) ->
 %%			used by the catch instructions; NOT safe to use in other
 %%			instructions.
 %%
-%% exception		Can only be used as a type returned by return_type/2
-%%			(which gives the type of the value returned by a BIF).
-%%			Thus 'exception' is never stored as type descriptor
-%%			for a register.
+%% exception            Can only be used as a type returned by
+%%                      call_return_type/2 (which gives the type of the value
+%%                      returned by a call). Thus 'exception' is never stored
+%%                      as type descriptor for a register.
 %%
 %% #ms{}	        A match context for bit syntax matching. We do allow
 %%			it to moved/to from stack, but otherwise it must only
@@ -1290,17 +1947,22 @@ assert_term(Src, Vst) ->
 %%
 %% term			Any valid Erlang (but not of the special types above).
 %%
+%% binary               Binary or bitstring.
+%%
 %% bool			The atom 'true' or the atom 'false'.
 %%
 %% cons         	Cons cell: [_|_]
 %%
 %% nil			Empty list: []
 %%
-%% {tuple,[Sz]}		Tuple. An element has been accessed using
-%%              	element/2 or setelement/3 so that it is known that
-%%              	the type is a tuple of size at least Sz.
+%% list                 List: [] or [_|_]
+%%
+%% {tuple,[Sz],Es}      Tuple. An element has been accessed using
+%%                      element/2 or setelement/3 so that it is known that
+%%                      the type is a tuple of size at least Sz. Es is a map
+%%                      containing known types by tuple index.
 %%
-%% {tuple,Sz}		Tuple. A test_arity instruction has been seen
+%% {tuple,Sz,Es}	Tuple. A test_arity instruction has been seen
 %%           		so that it is known that the size is exactly Sz.
 %%
 %% {atom,[]}		Atom.
@@ -1316,35 +1978,214 @@ assert_term(Src, Vst) ->
 %%
 %% map			Map.
 %%
+%% none                 A conflict in types. There will be an exception at runtime.
 %%
-%%
-%% FRAGILITY
-%% ---------
-%%
-%% The loop_rec/2 instruction may return a reference to a term that is
-%% not part of the root set. That term or any part of it must not be
-%% included in a garbage collection. Therefore, the term (or any part
-%% of it) must not be stored in an Y register.
-%%
-%% Such terms are wrapped in a {fragile,Type} tuple, where Type is one
-%% of the types described above.
 
-assert_type(WantedType, Term, Vst) ->
-    case get_term_type(Term, Vst) of
-        {fragile,Type} ->
-            assert_type(WantedType, Type);
-        Type ->
-            assert_type(WantedType, Type)
+%% join(Type1, Type2) -> Type
+%%  Return the most specific type possible.
+join(Same, Same) ->
+    Same;
+join(none, Other) ->
+    Other;
+join(Other, none) ->
+    Other;
+join({literal,_}=T1, T2) ->
+    join_literal(T1, T2);
+join(T1, {literal,_}=T2) ->
+    join_literal(T2, T1);
+join({tuple,Size,EsA}, {tuple,Size,EsB}) ->
+    Es = join_tuple_elements(tuple_sz(Size), EsA, EsB),
+    {tuple, Size, Es};
+join({tuple,A,EsA}, {tuple,B,EsB}) ->
+    Size = min(tuple_sz(A), tuple_sz(B)),
+    Es = join_tuple_elements(Size, EsA, EsB),
+    {tuple, [Size], Es};
+join({Type,A}, {Type,B})
+  when Type =:= atom; Type =:= integer; Type =:= float ->
+    if A =:= B -> {Type,A};
+       true -> {Type,[]}
+    end;
+join({Type,_}, number) 
+  when Type =:= integer; Type =:= float ->
+    number;
+join(number, {Type,_}) 
+  when Type =:= integer; Type =:= float ->
+    number;
+join({integer,_}, {float,_}) ->
+    number;
+join({float,_}, {integer,_}) ->
+    number;
+join(bool, {atom,A}) ->
+    join_bool(A);
+join({atom,A}, bool) ->
+    join_bool(A);
+join({atom,A}, {atom,B}) when is_boolean(A), is_boolean(B) ->
+    bool;
+join({atom,_}, {atom,_}) ->
+    {atom,[]};
+join(#ms{id=Id1,valid=B1,slots=Slots1},
+     #ms{id=Id2,valid=B2,slots=Slots2}) ->
+    Id = if
+             Id1 =:= Id2 -> Id1;
+             true -> make_ref()
+         end,
+    #ms{id=Id,valid=B1 band B2,slots=min(Slots1, Slots2)};
+join(T1, T2) when T1 =/= T2 ->
+    %% We've exhaused all other options, so the type must either be a list or
+    %% a 'term'.
+    join_list(T1, T2).
+
+join_tuple_elements(Limit, EsA, EsB) ->
+    Es0 = join_elements(EsA, EsB),
+    maps:filter(fun({integer,Index}, _Type) -> Index =< Limit end, Es0).
+
+join_elements(Es1, Es2) ->
+    Keys = if
+               map_size(Es1) =< map_size(Es2) -> maps:keys(Es1);
+               map_size(Es1) > map_size(Es2) -> maps:keys(Es2)
+           end,
+    join_elements_1(Keys, Es1, Es2, #{}).
+
+join_elements_1([Key | Keys], Es1, Es2, Acc0) ->
+    Type = case {Es1, Es2} of
+               {#{ Key := Same }, #{ Key := Same }} -> Same;
+               {#{ Key := Type1 }, #{ Key := Type2 }} -> join(Type1, Type2);
+               {#{}, #{}} -> term
+           end,
+    Acc = set_element_type(Key, Type, Acc0),
+    join_elements_1(Keys, Es1, Es2, Acc);
+join_elements_1([], _Es1, _Es2, Acc) ->
+    Acc.
+
+%% Joins types of literals; note that the left argument must either be a
+%% literal or exactly equal to the second argument.
+join_literal(Same, Same) ->
+    Same;
+join_literal({literal,_}=Lit, T) ->
+    join_literal(T, get_literal_type(Lit));
+join_literal(T1, T2) ->
+    %% We're done extracting the types, try merging them again.
+    join(T1, T2).
+
+join_list(nil, cons) -> list;
+join_list(nil, list) -> list;
+join_list(cons, list) -> list;
+join_list(T, nil) -> join_list(nil, T);
+join_list(T, cons) -> join_list(cons, T);
+join_list(_, _) ->
+    %% Not a list, so it must be a term.
+    term.
+
+join_bool([]) -> {atom,[]};
+join_bool(true) -> bool;
+join_bool(false) -> bool;
+join_bool(_) -> {atom,[]}.
+
+%% meet(Type1, Type2) -> Type
+%%  Return the meet of two types. The meet is a more specific type.
+%%  It will be 'none' if the types are in conflict.
+
+meet(Same, Same) ->
+    Same;
+meet(term, Other) ->
+    Other;
+meet(Other, term) ->
+    Other;
+meet(#ms{}, binary) ->
+    #ms{};
+meet(binary, #ms{}) ->
+    #ms{};
+meet({literal,_}, {literal,_}) ->
+    none;
+meet(T1, {literal,_}=T2) ->
+    meet(T2, T1);
+meet({literal,_}=T1, T2) ->
+    case meet(get_literal_type(T1), T2) of
+        none -> none;
+        _ -> T1
+    end;
+meet(T1, T2) ->
+    case {erlang:min(T1, T2),erlang:max(T1, T2)} of
+        {{atom,_}=A,{atom,[]}} -> A;
+        {bool,{atom,B}=Atom} when is_boolean(B) -> Atom;
+        {bool,{atom,[]}} -> bool;
+        {cons,list} -> cons;
+        {{float,_}=T,{float,[]}} -> T;
+        {{integer,_}=T,{integer,[]}} -> T;
+        {list,nil} -> nil;
+        {number,{integer,_}=T} -> T;
+        {number,{float,_}=T} -> T;
+        {{tuple,Size1,Es1},{tuple,Size2,Es2}} ->
+            Es = meet_elements(Es1, Es2),
+            case {Size1,Size2,Es} of
+                {_, _, none} ->
+                    none;
+                {[Sz1],[Sz2],_} ->
+                    Sz = erlang:max(Sz1, Sz2),
+                    assert_tuple_elements(Sz, Es),
+                    {tuple,[Sz],Es};
+                {Sz1,[Sz2],_} when Sz2 =< Sz1 ->
+                    assert_tuple_elements(Sz1, Es),
+                    {tuple,Sz1,Es};
+                {Sz,Sz,_} ->
+                    assert_tuple_elements(Sz, Es),
+                    {tuple,Sz,Es};
+                {_,_,_} ->
+                    none
+            end;
+        {_,_} -> none
     end.
 
+meet_elements(Es1, Es2) ->
+    Keys = maps:keys(Es1) ++ maps:keys(Es2),
+    meet_elements_1(Keys, Es1, Es2, #{}).
+
+meet_elements_1([Key | Keys], Es1, Es2, Acc) ->
+    case {Es1, Es2} of
+        {#{ Key := Type1 }, #{ Key := Type2 }} ->
+            case meet(Type1, Type2) of
+                none -> none;
+                Type -> meet_elements_1(Keys, Es1, Es2, Acc#{ Key => Type })
+            end;
+        {#{ Key := Type1 }, _} ->
+            meet_elements_1(Keys, Es1, Es2, Acc#{ Key => Type1 });
+        {_, #{ Key := Type2 }} ->
+            meet_elements_1(Keys, Es1, Es2, Acc#{ Key => Type2 })
+    end;
+meet_elements_1([], _Es1, _Es2, Acc) ->
+    Acc.
+
+%% No tuple elements may have an index above the known size.
+assert_tuple_elements(Limit, Es) ->
+    true = maps:fold(fun({integer,Index}, _T, true) ->
+                             Index =< Limit
+                     end, true, Es).            %Assertion.
+
+%% subtract(Type1, Type2) -> Type
+%%  Subtract Type2 from Type2. Example:
+%%      subtract(list, nil) -> cons
+
+subtract(Same, Same) -> none;
+subtract(list, nil) -> cons;
+subtract(list, cons) -> nil;
+subtract(number, {integer,[]}) -> {float,[]};
+subtract(number, {float,[]}) -> {integer,[]};
+subtract(bool, {atom,false}) -> {atom, true};
+subtract(bool, {atom,true}) -> {atom, false};
+subtract(Type, _) -> Type.
+
+assert_type(WantedType, Term, Vst) ->
+    Type = get_term_type(Term, Vst),
+    assert_type(WantedType, Type).
+
 assert_type(Correct, Correct) -> ok;
 assert_type(float, {float,_}) -> ok;
-assert_type(tuple, {tuple,_}) -> ok;
+assert_type(tuple, {tuple,_,_}) -> ok;
 assert_type(tuple, {literal,Tuple}) when is_tuple(Tuple) -> ok;
-assert_type({tuple_element,I}, {tuple,[Sz]})
+assert_type({tuple_element,I}, {tuple,[Sz],_})
   when 1 =< I, I =< Sz ->
     ok;
-assert_type({tuple_element,I}, {tuple,Sz})
+assert_type({tuple_element,I}, {tuple,Sz,_})
   when is_integer(Sz), 1 =< I, I =< Sz ->
     ok;
 assert_type({tuple_element,I}, {literal,Lit}) when I =< tuple_size(Lit) ->
@@ -1354,141 +2195,316 @@ assert_type(cons, {literal,[_|_]}) ->
 assert_type(Needed, Actual) ->
     error({bad_type,{needed,Needed},{actual,Actual}}).
 
-%% upgrade_tuple_type(NewTupleType, OldType) -> TupleType.
-%%  upgrade_tuple_type/2 is used when linear code finds out more and
-%%  more information about a tuple type, so that the type gets more
-%%  specialized. If OldType is not a tuple type, the type information
-%%  is inconsistent, and we know that some instructions will never
-%%  be executed at run-time.
-
-upgrade_tuple_type(NewType, {fragile,OldType}) ->
-    make_fragile(upgrade_tuple_type_1(NewType, OldType));
-upgrade_tuple_type(NewType, OldType) ->
-    upgrade_tuple_type_1(NewType, OldType).
-
-upgrade_tuple_type_1({tuple,[Sz]}, {tuple,[OldSz]}=T) when Sz < OldSz ->
-    %% The old type has a higher value for the least tuple size.
-    T;
-upgrade_tuple_type_1({tuple,[Sz]}, {tuple,OldSz}=T)
-  when is_integer(Sz), is_integer(OldSz), Sz =< OldSz ->
-    %% The old size is exact, and the new size is smaller than the old size.
-    T;
-upgrade_tuple_type_1({tuple,_}=T, _) ->
-    %% The new type information is exact or has a higher value for
-    %% the least tuple size.
-    %%     Note that inconsistencies are also handled in this
-    %% clause, e.g. if the old type was an integer or a tuple accessed
-    %% outside its size; inconsistences will generally cause an exception
-    %% at run-time but are safe from our point of view.
-    T.
+get_element_type(Key, Src, Vst) ->
+    get_element_type_1(Key, get_term_type(Src, Vst)).
+
+get_element_type_1({integer,_}=Key, {tuple,_Sz,Es}) ->
+    case Es of
+        #{ Key := Type } -> Type;
+        #{} -> term
+    end;
+get_element_type_1(_Index, _Type) ->
+    term.
+
+set_element_type(_Key, none, Es) ->
+    Es;
+set_element_type(Key, term, Es) ->
+    maps:remove(Key, Es);
+set_element_type(Key, Type, Es) ->
+    Es#{ Key => Type }.
 
 get_tuple_size({integer,[]}) -> 0;
 get_tuple_size({integer,Sz}) -> Sz;
 get_tuple_size(_) -> 0.
 
 validate_src(Ss, Vst) when is_list(Ss) ->
-    foreach(fun(S) -> get_term_type(S, Vst) end, Ss).
+    _ = [assert_term(S, Vst) || S <- Ss],
+    ok.
 
-%% get_move_term_type(Src, ValidatorState) -> Type
+%% get_term_type(Src, ValidatorState) -> Type
 %%  Get the type of the source Src. The returned type Type will be
-%%  a standard Erlang type (no catch/try tags). Match contexts are OK.
+%%  a standard Erlang type (no catch/try tags or match contexts).
 
-get_move_term_type(Src, Vst) ->
-    case get_term_type_1(Src, Vst) of
-	initialized -> error({unassigned,Src});
-	{catchtag,_} -> error({catchtag,Src});
-	{trytag,_} -> error({trytag,Src});
-        tuple_in_progress -> error({tuple_in_progress,Src});
-	Type -> Type
+get_term_type(Src, Vst) ->
+    case get_movable_term_type(Src, Vst) of
+        #ms{} -> error({match_context,Src});
+        Type -> Type
     end.
 
-%% get_term_type(Src, ValidatorState) -> Type
+%% get_movable_term_type(Src, ValidatorState) -> Type
 %%  Get the type of the source Src. The returned type Type will be
-%%  a standard Erlang type (no catch/try tags or match contexts).
+%%  a standard Erlang type (no catch/try tags). Match contexts are OK.
 
-get_term_type(Src, Vst) ->
-    case get_move_term_type(Src, Vst) of
-	#ms{} -> error({match_context,Src});
-	Type -> Type
+get_movable_term_type(Src, Vst) ->
+    case get_raw_type(Src, Vst) of
+        initialized -> error({unassigned,Src});
+        uninitialized -> error({uninitialized_reg,Src});
+        {catchtag,_} -> error({catchtag,Src});
+        {trytag,_} -> error({trytag,Src});
+        tuple_in_progress -> error({tuple_in_progress,Src});
+        {literal,_}=Lit -> get_literal_type(Lit);
+        Type -> Type
     end.
 
-%% get_special_y_type(Src, ValidatorState) -> Type
-%%  Return the type for the Y register without doing any validity checks.
-
-get_special_y_type({y,_}=Reg, Vst) -> get_term_type_1(Reg, Vst);
-get_special_y_type(Src, _) -> error({source_not_y_reg,Src}).
-
-get_term_type_1(nil=T, _) -> T;
-get_term_type_1({atom,A}=T, _) when is_atom(A) -> T;
-get_term_type_1({float,F}=T, _) when is_float(F) -> T;
-get_term_type_1({integer,I}=T, _) when is_integer(I) -> T;
-get_term_type_1({literal,Map}, _) when is_map(Map) -> map;
-get_term_type_1({literal,_}=T, _) -> T;
-get_term_type_1({x,X}=Reg, #vst{current=#st{x=Xs}}) when is_integer(X) ->
-    case gb_trees:lookup(X, Xs) of
-	{value,Type} -> Type;
-	none -> error({uninitialized_reg,Reg})
+%% get_tag_type(Src, ValidatorState) -> Type
+%%  Return the tag type of a Y register, erroring out if it contains a term.
+
+get_tag_type({y,_}=Src, Vst) ->
+    case get_raw_type(Src, Vst) of
+        {catchtag, _}=Tag -> Tag;
+        {trytag, _}=Tag -> Tag;
+        uninitialized=Tag -> Tag;
+        initialized=Tag -> Tag;
+        Other -> error({invalid_tag,Src,Other})
     end;
-get_term_type_1({y,Y}=Reg, #vst{current=#st{y=Ys}}) when is_integer(Y) ->
-    case gb_trees:lookup(Y, Ys) of
- 	none -> error({uninitialized_reg,Reg});
-	{value,uninitialized} -> error({uninitialized_reg,Reg});
-	{value,Type} -> Type
+get_tag_type(Src, _) ->
+    error({invalid_tag_register,Src}).
+
+%% get_raw_type(Src, ValidatorState) -> Type
+%%  Return the type of a register without doing any validity checks or
+%%  conversions.
+get_raw_type({x,X}=Src, #vst{current=#st{xs=Xs}}=Vst) when is_integer(X) ->
+    check_limit(Src),
+    case Xs of
+        #{ Src := #value_ref{}=Ref } -> get_raw_type(Ref, Vst);
+        #{} -> uninitialized
     end;
-get_term_type_1(Src, _) -> error({bad_source,Src}).
-
+get_raw_type({y,Y}=Src, #vst{current=#st{ys=Ys}}=Vst) when is_integer(Y) ->
+    check_limit(Src),
+    case Ys of
+        #{ Src := #value_ref{}=Ref } -> get_raw_type(Ref, Vst);
+        #{ Src := Tag } -> Tag;
+        #{} -> uninitialized
+    end;
+get_raw_type(#value_ref{}=Ref, #vst{current=#st{vs=Vs}}) ->
+    case Vs of
+        #{ Ref := #value{type=Type} } -> Type;
+        #{} -> none
+    end;
+get_raw_type(Src, #vst{}) ->
+    get_literal_type(Src).
+
+get_literal_type(nil=T) -> T;
+get_literal_type({atom,A}=T) when is_atom(A) -> T;
+get_literal_type({float,F}=T) when is_float(F) -> T;
+get_literal_type({integer,I}=T) when is_integer(I) -> T;
+get_literal_type({literal,[_|_]}) -> cons;
+get_literal_type({literal,Bitstring}) when is_bitstring(Bitstring) -> binary;
+get_literal_type({literal,Map}) when is_map(Map) -> map;
+get_literal_type({literal,Tuple}) when is_tuple(Tuple) -> glt_1(Tuple);
+get_literal_type({literal,_}) -> term;
+get_literal_type(T) -> error({not_literal,T}).
+
+glt_1([]) -> nil;
+glt_1(A) when is_atom(A) -> {atom, A};
+glt_1(F) when is_float(F) -> {float, F};
+glt_1(I) when is_integer(I) -> {integer, I};
+glt_1(T) when is_tuple(T) ->
+    {Es,_} = foldl(fun(Val, {Es0, Index}) ->
+                           Type = glt_1(Val),
+                           Es = set_element_type({integer,Index}, Type, Es0),
+                           {Es, Index + 1}
+                   end, {#{}, 1}, tuple_to_list(T)),
+    {tuple, tuple_size(T), Es};
+glt_1(L) ->
+    {literal, L}.
 
-%% get_literal(Src) -> literal_value().
-get_literal(nil) -> [];
-get_literal({atom,A}) when is_atom(A) -> A;
-get_literal({float,F}) when is_float(F) -> F;
-get_literal({integer,I}) when is_integer(I) -> I;
-get_literal({literal,L}) -> L;
-get_literal(T) -> error({not_literal,T}).
+%%%
+%%% Branch tracking
+%%%
 
+%% Forks the execution flow, with the provided funs returning the new state of
+%% their respective branch; the "fail" fun returns the state where the branch
+%% is taken, and the "success" fun returns the state where it's not.
+%%
+%% If either path is known not to be taken at runtime (eg. due to a type
+%% conflict), it will simply be discarded.
+-spec branch(Lbl :: label(),
+             Original :: #vst{},
+             FailFun :: BranchFun,
+             SuccFun :: BranchFun) -> #vst{} when
+     BranchFun :: fun((#vst{}) -> #vst{}).
+branch(Lbl, Vst0, FailFun, SuccFun) ->
+    #vst{current=St0} = Vst0,
+    try FailFun(Vst0) of
+        Vst1 ->
+            Vst2 = branch_state(Lbl, Vst1),
+            Vst = Vst2#vst{current=St0},
+            try SuccFun(Vst) of
+                V -> V
+            catch
+                {type_conflict, _, _} ->
+                    %% The instruction is guaranteed to fail; kill the state.
+                    kill_state(Vst)
+            end
+    catch
+        {type_conflict, _, _} ->
+            %% This instruction is guaranteed not to fail, so we run the
+            %% success branch *without* catching type conflicts to avoid hiding
+            %% errors in the validator itself; one of the branches must
+            %% succeed.
+            SuccFun(Vst0)
+    end.
 
-branch_arities([], _, #vst{}=Vst) -> Vst;
-branch_arities([Sz,{f,L}|T], Tuple, #vst{current=St}=Vst0) 
-  when is_integer(Sz) ->
-    Vst1 = set_type_reg({tuple,Sz}, Tuple, Vst0),
-    Vst = branch_state(L, Vst1),
-    branch_arities(T, Tuple, Vst#vst{current=St}).
+%% A shorthand version of branch/4 for when the state is only altered on
+%% success.
+branch(Fail, Vst, SuccFun) ->
+    branch(Fail, Vst, fun(V) -> V end, SuccFun).
 
+%% Directly branches off the state. This is an "internal" operation that should
+%% be used sparingly.
 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.
+    %% 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
-		   false ->
-		       gb_trees:insert(L, St, B);
-		   true ->
-		       MergedSt = merge_states(L, St, B),
-		       gb_trees:update(L, MergedSt, B)
-	       end}.
-
-%% merge_states/3 is used when there are more than one way to arrive
-%% at this point, and the type states for the different paths has
-%% to be merged. The type states are downgraded to the least common
-%% subset for the subsequent code.
-
-merge_states(L, St, Branched) when L =/= 0 ->
+branch_state(L, #vst{current=St,branched=B,ref_ctr=Counter0}=Vst) ->
+    case gb_trees:is_defined(L, B) of
+        true ->
+            {MergedSt, Counter} = merge_states(L, St, B, Counter0),
+            Branched = gb_trees:update(L, MergedSt, B),
+            Vst#vst{branched=Branched,ref_ctr=Counter};
+        false ->
+            Vst#vst{branched=gb_trees:insert(L, St, B)}
+    end.
+
+%% merge_states/3 is used when there's more than one way to arrive at a
+%% certain point, requiring the states to be merged down to the least
+%% common subset for the subsequent code.
+
+merge_states(L, St, Branched, Counter) when L =/= 0 ->
     case gb_trees:lookup(L, Branched) of
-	none -> St;
-	{value,OtherSt} when St =:= none -> OtherSt;
-	{value,OtherSt} -> merge_states_1(St, OtherSt)
+        none ->
+            {St, Counter};
+        {value,OtherSt} when St =:= none ->
+            {OtherSt, Counter};
+        {value,OtherSt} ->
+             merge_states_1(St, OtherSt, Counter)
+    end.
+
+merge_states_1(#st{xs=XsA,ys=YsA,vs=VsA,fragile=FragA,numy=NumYA,h=HA,ct=CtA},
+               #st{xs=XsB,ys=YsB,vs=VsB,fragile=FragB,numy=NumYB,h=HB,ct=CtB},
+               Counter0) ->
+    %% When merging registers we drop all registers that aren't defined in both
+    %% states, and resolve conflicts by creating new values (similar to phi
+    %% nodes in SSA).
+    %%
+    %% While doing this we build a "merge map" detailing which values need to
+    %% be kept and which new values need to be created to resolve conflicts.
+    %% This map is then used to create a new value database where the types of
+    %% all values have been joined.
+    {Xs, Merge0, Counter1} = merge_regs(XsA, XsB, #{}, Counter0),
+    {Ys, Merge, Counter} = merge_regs(YsA, YsB, Merge0, Counter1),
+    Vs = merge_values(Merge, VsA, VsB),
+
+    Fragile = merge_fragility(FragA, FragB),
+    NumY = merge_stk(NumYA, NumYB),
+    Ct = merge_ct(CtA, CtB),
+
+    St = #st{xs=Xs,ys=Ys,vs=Vs,fragile=Fragile,numy=NumY,h=min(HA, HB),ct=Ct},
+    {St, Counter}.
+
+%% Merges the contents of two register maps, returning the updated "merge map"
+%% and the new registers.
+merge_regs(RsA, RsB, Merge, Counter) ->
+    Keys = if
+               map_size(RsA) =< map_size(RsB) -> maps:keys(RsA);
+               map_size(RsA) > map_size(RsB) -> maps:keys(RsB)
+           end,
+    merge_regs_1(Keys, RsA, RsB, #{}, Merge, Counter).
+
+merge_regs_1([Reg | Keys], RsA, RsB, Regs, Merge0, Counter0) ->
+    case {RsA, RsB} of
+        {#{ Reg := #value_ref{}=RefA }, #{ Reg := #value_ref{}=RefB }} ->
+            {Ref, Merge, Counter} = merge_vrefs(RefA, RefB, Merge0, Counter0),
+            merge_regs_1(Keys, RsA, RsB, Regs#{ Reg => Ref }, Merge, Counter);
+        {#{ Reg := TagA }, #{ Reg := TagB }} ->
+            %% Tags describe the state of the register rather than the value it
+            %% contains, so if a register contains a tag in one state we have
+            %% to merge it as a tag regardless of whether the other state says
+            %% it's a value.
+            {y, _} = Reg,                       %Assertion.
+            merge_regs_1(Keys, RsA, RsB, Regs#{ Reg => merge_tags(TagA,TagB) },
+                         Merge0, Counter0);
+        {#{}, #{}} ->
+            merge_regs_1(Keys, RsA, RsB, Regs, Merge0, Counter0)
+    end;
+merge_regs_1([], _, _, Regs, Merge, Counter) ->
+    {Regs, Merge, Counter}.
+
+merge_tags(Same, Same) ->
+    Same;
+merge_tags(uninitialized, _) ->
+    uninitialized;
+merge_tags(_, uninitialized) ->
+    uninitialized;
+merge_tags({catchtag,T0}, {catchtag,T1}) ->
+    {catchtag, ordsets:from_list(T0 ++ T1)};
+merge_tags({trytag,T0}, {trytag,T1}) ->
+    {trytag, ordsets:from_list(T0 ++ T1)};
+merge_tags(_A, _B) ->
+    %% All other combinations leave the register initialized. Errors arising
+    %% from this will be caught later on.
+    initialized.
+
+merge_vrefs(Ref, Ref, Merge, Counter) ->
+    %% We have two (potentially) different versions of the same value, so we
+    %% should join their types into the same value.
+    {Ref, Merge#{ Ref => Ref }, Counter};
+merge_vrefs(RefA, RefB, Merge, Counter) ->
+    %% We have two different values, so we need to create a new value from
+    %% their joined type if we haven't already done so.
+    Key = {RefA, RefB},
+    case Merge of
+        #{ Key := Ref } ->
+            {Ref, Merge, Counter};
+        #{} ->
+            Ref = #value_ref{id=Counter},
+            {Ref, Merge#{ Key => Ref }, Counter + 1}
     end.
 
-merge_states_1(#st{x=Xs0,y=Ys0,numy=NumY0,h=H0,ct=Ct0},
-	       #st{x=Xs1,y=Ys1,numy=NumY1,h=H1,ct=Ct1}) ->
-    NumY = merge_stk(NumY0, NumY1),
-    Xs = merge_regs(Xs0, Xs1),
-    Ys = merge_y_regs(Ys0, Ys1),
-    Ct = merge_ct(Ct0, Ct1),
-    #st{x=Xs,y=Ys,numy=NumY,h=min(H0, H1),ct=Ct}.
+merge_values(Merge, VsA, VsB) ->
+    maps:fold(fun(Spec, New, Acc) ->
+                      mv_1(Spec, New, VsA, VsB, Acc)
+              end, #{}, Merge).
+
+mv_1(Same, Same, VsA, VsB, Acc0) ->
+    %% We're merging different versions of the same value, so it's safe to
+    %% reuse old entries if the type's unchanged.
+    #value{type=TypeA,args=Args}=EntryA = map_get(Same, VsA),
+    #value{type=TypeB,args=Args}=EntryB = map_get(Same, VsB),
+
+    Entry = case join(TypeA, TypeB) of
+                TypeA -> EntryA;
+                TypeB -> EntryB;
+                JoinedType -> EntryA#value{type=JoinedType}
+            end,
+
+    Acc = Acc0#{ Same => Entry },
+
+    %% Type inference may depend on values that are no longer reachable from a
+    %% register, so all arguments must be merged into the new state.
+    mv_args(Args, VsA, VsB, Acc);
+mv_1({RefA, RefB}, New, VsA, VsB, Acc) ->
+    #value{type=TypeA} = map_get(RefA, VsA),
+    #value{type=TypeB} = map_get(RefB, VsB),
+    Acc#{ New => #value{op=join,args=[],type=join(TypeA, TypeB)} }.
+
+mv_args([#value_ref{}=Arg | Args], VsA, VsB, Acc0) ->
+    case Acc0 of
+        #{ Arg := _ } ->
+            mv_args(Args, VsA, VsB, Acc0);
+        #{} ->
+            Acc = mv_1(Arg, Arg, VsA, VsB, Acc0),
+            mv_args(Args, VsA, VsB, Acc)
+    end;
+mv_args([_ | Args], VsA, VsB, Acc) ->
+    mv_args(Args, VsA, VsB, Acc);
+mv_args([], _VsA, _VsB, Acc) ->
+    Acc.
+
+merge_fragility(FragileA, FragileB) ->
+    cerl_sets:union(FragileA, FragileB).
 
 merge_stk(S, S) -> S;
 merge_stk(_, _) -> undecided.
@@ -1501,135 +2517,70 @@ merge_ct_1([C0|Ct0], [C1|Ct1]) ->
 merge_ct_1([], []) -> [];
 merge_ct_1(_, _) -> undecided.
 
-merge_regs(Rs0, Rs1) ->
-    Rs = merge_regs_1(gb_trees:to_list(Rs0), gb_trees:to_list(Rs1)),
-    gb_trees_from_list(Rs).
-
-merge_regs_1([Same|Rs1], [Same|Rs2]) ->
-    [Same|merge_regs_1(Rs1, Rs2)];
-merge_regs_1([{R1,_}|Rs1], [{R2,_}|_]=Rs2) when R1 < R2 ->
-    merge_regs_1(Rs1, Rs2);
-merge_regs_1([{R1,_}|_]=Rs1, [{R2,_}|Rs2]) when R1 > R2 ->
-    merge_regs_1(Rs1, Rs2);
-merge_regs_1([{R,Type1}|Rs1], [{R,Type2}|Rs2]) ->
-    [{R,merge_types(Type1, Type2)}|merge_regs_1(Rs1, Rs2)];
-merge_regs_1([], []) -> [];
-merge_regs_1([], [_|_]) -> [];
-merge_regs_1([_|_], []) -> [].
-
-merge_y_regs(Rs0, Rs1) ->
-    case {gb_trees:size(Rs0),gb_trees:size(Rs1)} of
-	{Sz0,Sz1} when Sz0 < Sz1 ->
-	    merge_y_regs_1(Sz0-1, Rs1, Rs0);
-	{_,Sz1} ->
-	    merge_y_regs_1(Sz1-1, Rs0, Rs1)
-    end.
+tuple_sz([Sz]) -> Sz;
+tuple_sz(Sz) -> Sz.
 
-merge_y_regs_1(Y, S, Regs0) when Y >= 0 ->
-    Type0 = gb_trees:get(Y, Regs0),
-    case gb_trees:get(Y, S) of
-	Type0 ->
-	    merge_y_regs_1(Y-1, S, Regs0);
-	Type1 ->
-	    Type = merge_types(Type0, Type1),
-	    Regs = gb_trees:update(Y, Type, Regs0),
-	    merge_y_regs_1(Y-1, S, Regs)
-    end;
-merge_y_regs_1(_, _, Regs) -> Regs.
+verify_y_init(#vst{current=#st{numy=NumY,ys=Ys}}=Vst) when is_integer(NumY) ->
+    HighestY = maps:fold(fun({y,Y}, _, Acc) -> max(Y, Acc) end, -1, Ys),
+    true = NumY > HighestY,                     %Assertion.
+    verify_y_init_1(NumY - 1, Vst),
+    ok;
+verify_y_init(#vst{current=#st{numy=undecided,ys=Ys}}=Vst) ->
+    HighestY = maps:fold(fun({y,Y}, _, Acc) -> max(Y, Acc) end, -1, Ys),
+    verify_y_init_1(HighestY, Vst);
+verify_y_init(#vst{}) ->
+    ok.
 
-%% merge_types(Type1, Type2) -> Type
-%%  Return the most specific type possible.
-%%  Note: Type1 must NOT be the same as Type2.
-merge_types({fragile,Same}=Type, Same) ->
-    Type;
-merge_types({fragile,T1}, T2) ->
-    make_fragile(merge_types(T1, T2));
-merge_types(Same, {fragile,Same}=Type) ->
-    Type;
-merge_types(T1, {fragile,T2}) ->
-    make_fragile(merge_types(T1, T2));
-merge_types(uninitialized=I, _) -> I;
-merge_types(_, uninitialized=I) -> I;
-merge_types(initialized=I, _) -> I;
-merge_types(_, initialized=I) -> I;
-merge_types({catchtag,T0},{catchtag,T1}) ->
-    {catchtag,ordsets:from_list(T0++T1)};
-merge_types({trytag,T0},{trytag,T1}) ->
-    {trytag,ordsets:from_list(T0++T1)};
-merge_types({tuple,A}, {tuple,B}) ->
-    {tuple,[min(tuple_sz(A), tuple_sz(B))]};
-merge_types({Type,A}, {Type,B}) 
-  when Type =:= atom; Type =:= integer; Type =:= float ->
-    if A =:= B -> {Type,A};
-       true -> {Type,[]}
-    end;
-merge_types({Type,_}, number) 
-  when Type =:= integer; Type =:= float ->
-    number;
-merge_types(number, {Type,_}) 
-  when Type =:= integer; Type =:= float ->
-    number;
-merge_types(bool, {atom,A}) ->
-    merge_bool(A);
-merge_types({atom,A}, bool) ->
-    merge_bool(A);
-merge_types(#ms{id=Id1,valid=B1,slots=Slots1},
-	    #ms{id=Id2,valid=B2,slots=Slots2}) ->
-    Id = if
-             Id1 =:= Id2 -> Id1;
-             true -> make_ref()
-         end,
-    #ms{id=Id,valid=B1 band B2,slots=min(Slots1, Slots2)};
-merge_types(T1, T2) when T1 =/= T2 ->
-    %% Too different. All we know is that the type is a 'term'.
-    term.
+verify_y_init_1(-1, _Vst) ->
+    ok;
+verify_y_init_1(Y, Vst) ->
+    Reg = {y, Y},
+    assert_not_fragile(Reg, Vst),
+    case get_raw_type(Reg, Vst) of
+        uninitialized -> error({uninitialized_reg,Reg});
+        _ -> verify_y_init_1(Y - 1, Vst)
+    end.
 
-tuple_sz([Sz]) -> Sz;
-tuple_sz(Sz) -> Sz.
+verify_live(0, _Vst) ->
+    ok;
+verify_live(Live, Vst) when is_integer(Live), 0 < Live, Live =< 1023 ->
+    verify_live_1(Live - 1, Vst);
+verify_live(Live, _Vst) ->
+    error({bad_number_of_live_regs,Live}).
 
-merge_bool([]) -> {atom,[]};
-merge_bool(true) -> bool;
-merge_bool(false) -> bool;
-merge_bool(_) -> {atom,[]}.
-    
-verify_y_init(#vst{current=#st{y=Ys}}) ->
-    verify_y_init_1(gb_trees:to_list(Ys)).
-
-verify_y_init_1([]) -> ok;
-verify_y_init_1([{Y,uninitialized}|_]) ->
-    error({uninitialized_reg,{y,Y}});
-verify_y_init_1([{Y,{fragile,_}}|_]) ->
-    %% Unsafe. This term may be outside any heap belonging
-    %% to the process and would be corrupted by a GC.
-    error({fragile_message_reference,{y,Y}});
-verify_y_init_1([{_,_}|Ys]) ->
-    verify_y_init_1(Ys).
-
-verify_live(0, #vst{}) -> ok;
-verify_live(N, #vst{current=#st{x=Xs}}) ->
-    verify_live_1(N, Xs).
-
-verify_live_1(0, _) -> ok;
-verify_live_1(N, Xs) when is_integer(N) ->
-    X = N-1,
-    case gb_trees:is_defined(X, Xs) of
-	false -> error({{x,X},not_live});
-	true -> verify_live_1(X, Xs)
-    end;
-verify_live_1(N, _) -> error({bad_number_of_live_regs,N}).
+verify_live_1(-1, _) ->
+    ok;
+verify_live_1(X, Vst) when is_integer(X) ->
+    Reg = {x, X},
+    case get_raw_type(Reg, Vst) of
+        uninitialized -> error({Reg, not_live});
+        _ -> verify_live_1(X - 1, Vst)
+    end.
 
-verify_no_ct(#vst{current=#st{numy=none}}) -> ok;
+verify_no_ct(#vst{current=#st{numy=none}}) ->
+    ok;
 verify_no_ct(#vst{current=#st{numy=undecided}}) ->
     error(unknown_size_of_stackframe);
-verify_no_ct(#vst{current=#st{y=Ys}}) ->
-    case [Y || Y <- gb_trees:to_list(Ys), verify_no_ct_1(Y)] of
-	[] -> ok;
-	CT -> error({unfinished_catch_try,CT})
+verify_no_ct(#vst{current=St}=Vst) ->
+    case collect_try_catch_tags(St#st.numy - 1, Vst, []) of
+        [_|_]=Bad -> error({unfinished_catch_try,Bad});
+        [] -> ok
     end.
 
-verify_no_ct_1({_, {catchtag, _}}) -> true;
-verify_no_ct_1({_, {trytag, _}}) -> true;
-verify_no_ct_1({_, _}) -> false.
+%% Collects all try/catch tags, walking down from the Nth stack position.
+collect_try_catch_tags(-1, _Vst, Acc) ->
+    Acc;
+collect_try_catch_tags(Y, Vst, Acc0) ->
+    Tag = get_raw_type({y, Y}, Vst),
+    Acc = case is_try_catch_tag(Tag) of
+              true -> [{{y, Y}, Tag} | Acc0];
+              false -> Acc0
+          end,
+    collect_try_catch_tags(Y - 1, Vst, Acc).
+
+is_try_catch_tag({catchtag,_}) -> true;
+is_try_catch_tag({trytag,_}) -> true;
+is_try_catch_tag(_) -> false.
 
 eat_heap(N, #vst{current=#st{h=Heap0}=St}=Vst) ->
     case Heap0-N of
@@ -1647,89 +2598,190 @@ eat_heap_float(#vst{current=#st{hf=HeapFloats0}=St}=Vst) ->
 	    Vst#vst{current=St#st{hf=HeapFloats}}
     end.
 
-remove_fragility(#vst{current=#st{x=Xs0,y=Ys0}=St0}=Vst) ->
-    F = fun(_, {fragile,Type}) -> Type;
-           (_, Type) -> Type
-        end,
-    Xs = gb_trees:map(F, Xs0),
-    Ys = gb_trees:map(F, Ys0),
-    St = St0#st{x=Xs,y=Ys},
+%%% FRAGILITY
+%%%
+%%% The loop_rec/2 instruction may return a reference to a term that is not
+%%% part of the root set. That term or any part of it must not be included in a
+%%% garbage collection. Therefore, the term (or any part of it) must not be
+%%% passed to another function, placed in another term, or live in a Y register
+%%% over an instruction that may GC.
+%%%
+%%% Fragility is marked on a per-register (rather than per-value) basis.
+
+%% Marks Reg as fragile.
+mark_fragile(Reg, Vst) ->
+    #vst{current=#st{fragile=Fragile0}=St0} = Vst,
+    Fragile = cerl_sets:add_element(Reg, Fragile0),
+    St = St0#st{fragile=Fragile},
     Vst#vst{current=St}.
 
-propagate_fragility(Type, Ss, Vst) ->
-    F = fun(S) ->
-                case get_term_type_1(S, Vst) of
-                    {fragile,_} -> true;
-                    _ -> false
-                end
-        end,
-    case any(F, Ss) of
-        true -> make_fragile(Type);
-        false -> Type
+propagate_fragility(Reg, Args, #vst{current=St0}=Vst) ->
+    #st{fragile=Fragile0} = St0,
+
+    Sources = cerl_sets:from_list(Args),
+    Fragile = case cerl_sets:is_disjoint(Sources, Fragile0) of
+                  true -> cerl_sets:del_element(Reg, Fragile0);
+                  false -> cerl_sets:add_element(Reg, Fragile0)
+              end,
+
+    St = St0#st{fragile=Fragile},
+    Vst#vst{current=St}.
+
+%% Marks Reg as durable, must be used when assigning a newly created value to
+%% a register.
+remove_fragility(Reg, Vst) ->
+    #vst{current=#st{fragile=Fragile0}=St0} = Vst,
+    case cerl_sets:is_element(Reg, Fragile0) of
+        true ->
+            Fragile = cerl_sets:del_element(Reg, Fragile0),
+            St = St0#st{fragile=Fragile},
+            Vst#vst{current=St};
+        false ->
+            Vst
     end.
 
-bif_type('-', Src, Vst) ->
-    arith_type(Src, Vst);
-bif_type('+', Src, Vst) ->
-    arith_type(Src, Vst);
-bif_type('*', Src, Vst) ->
-    arith_type(Src, Vst);
-bif_type(abs, [Num], Vst) ->
+%% Marks all registers as durable.
+remove_fragility(#vst{current=St0}=Vst) ->
+    St = St0#st{fragile=cerl_sets:new()},
+    Vst#vst{current=St}.
+
+assert_durable_term(Src, Vst) ->
+    assert_term(Src, Vst),
+    assert_not_fragile(Src, Vst).
+
+assert_not_fragile({Kind,_}=Src, Vst) when Kind =:= x; Kind =:= y ->
+    check_limit(Src),
+    #vst{current=#st{fragile=Fragile}} = Vst,
+    case cerl_sets:is_element(Src, Fragile) of
+        true -> error({fragile_message_reference, Src});
+        false -> ok
+    end;
+assert_not_fragile(Lit, #vst{}) ->
+    assert_literal(Lit),
+    ok.
+
+%%%
+%%% Return/argument types of BIFs
+%%%
+
+bif_return_type('-', Src, Vst) ->
+    arith_return_type(Src, Vst);
+bif_return_type('+', Src, Vst) ->
+    arith_return_type(Src, Vst);
+bif_return_type('*', Src, Vst) ->
+    arith_return_type(Src, Vst);
+bif_return_type(abs, [Num], Vst) ->
     case get_term_type(Num, Vst) of
-	{float,_}=T -> T;
-	{integer,_}=T -> T;
-	_ -> number
+        {float,_}=T -> T;
+        {integer,_}=T -> T;
+        _ -> number
     end;
-bif_type(float, _, _) -> {float,[]};
-bif_type('/', _, _) -> {float,[]};
+bif_return_type(float, _, _) -> {float,[]};
+bif_return_type('/', _, _) -> {float,[]};
+%% Binary operations
+bif_return_type('binary_part', [_,_], _) -> binary;
+bif_return_type('binary_part', [_,_,_], _) -> binary;
+bif_return_type('bit_size', [_], _) -> {integer,[]};
+bif_return_type('byte_size', [_], _) -> {integer,[]};
 %% Integer operations.
-bif_type(ceil, [_], _) -> {integer,[]};
-bif_type('div', [_,_], _) -> {integer,[]};
-bif_type(floor, [_], _) -> {integer,[]};
-bif_type('rem', [_,_], _) -> {integer,[]};
-bif_type(length, [_], _) -> {integer,[]};
-bif_type(size, [_], _) -> {integer,[]};
-bif_type(trunc, [_], _) -> {integer,[]};
-bif_type(round, [_], _) -> {integer,[]};
-bif_type('band', [_,_], _) -> {integer,[]};
-bif_type('bor', [_,_], _) -> {integer,[]};
-bif_type('bxor', [_,_], _) -> {integer,[]};
-bif_type('bnot', [_], _) -> {integer,[]};
-bif_type('bsl', [_,_], _) -> {integer,[]};
-bif_type('bsr', [_,_], _) -> {integer,[]};
+bif_return_type(ceil, [_], _) -> {integer,[]};
+bif_return_type('div', [_,_], _) -> {integer,[]};
+bif_return_type(floor, [_], _) -> {integer,[]};
+bif_return_type('rem', [_,_], _) -> {integer,[]};
+bif_return_type(length, [_], _) -> {integer,[]};
+bif_return_type(size, [_], _) -> {integer,[]};
+bif_return_type(trunc, [_], _) -> {integer,[]};
+bif_return_type(round, [_], _) -> {integer,[]};
+bif_return_type('band', [_,_], _) -> {integer,[]};
+bif_return_type('bor', [_,_], _) -> {integer,[]};
+bif_return_type('bxor', [_,_], _) -> {integer,[]};
+bif_return_type('bnot', [_], _) -> {integer,[]};
+bif_return_type('bsl', [_,_], _) -> {integer,[]};
+bif_return_type('bsr', [_,_], _) -> {integer,[]};
 %% Booleans.
-bif_type('==', [_,_], _) -> bool;
-bif_type('/=', [_,_], _) -> bool;
-bif_type('=<', [_,_], _) -> bool;
-bif_type('<', [_,_], _) -> bool;
-bif_type('>=', [_,_], _) -> bool;
-bif_type('>', [_,_], _) -> bool;
-bif_type('=:=', [_,_], _) -> bool;
-bif_type('=/=', [_,_], _) -> bool;
-bif_type('not', [_], _) -> bool;
-bif_type('and', [_,_], _) -> bool;
-bif_type('or', [_,_], _) -> bool;
-bif_type('xor', [_,_], _) -> bool;
-bif_type(is_atom, [_], _) -> bool;
-bif_type(is_boolean, [_], _) -> bool;
-bif_type(is_binary, [_], _) -> bool;
-bif_type(is_float, [_], _) -> bool;
-bif_type(is_function, [_], _) -> bool;
-bif_type(is_integer, [_], _) -> bool;
-bif_type(is_list, [_], _) -> bool;
-bif_type(is_map, [_], _) -> bool;
-bif_type(is_number, [_], _) -> bool;
-bif_type(is_pid, [_], _) -> bool;
-bif_type(is_port, [_], _) -> bool;
-bif_type(is_reference, [_], _) -> bool;
-bif_type(is_tuple, [_], _) -> bool;
+bif_return_type('==', [_,_], _) -> bool;
+bif_return_type('/=', [_,_], _) -> bool;
+bif_return_type('=<', [_,_], _) -> bool;
+bif_return_type('<', [_,_], _) -> bool;
+bif_return_type('>=', [_,_], _) -> bool;
+bif_return_type('>', [_,_], _) -> bool;
+bif_return_type('=:=', [_,_], _) -> bool;
+bif_return_type('=/=', [_,_], _) -> bool;
+bif_return_type('not', [_], _) -> bool;
+bif_return_type('and', [_,_], _) -> bool;
+bif_return_type('or', [_,_], _) -> bool;
+bif_return_type('xor', [_,_], _) -> bool;
+bif_return_type(is_atom, [_], _) -> bool;
+bif_return_type(is_boolean, [_], _) -> bool;
+bif_return_type(is_binary, [_], _) -> bool;
+bif_return_type(is_float, [_], _) -> bool;
+bif_return_type(is_function, [_], _) -> bool;
+bif_return_type(is_function, [_,_], _) -> bool;
+bif_return_type(is_integer, [_], _) -> bool;
+bif_return_type(is_list, [_], _) -> bool;
+bif_return_type(is_map, [_], _) -> bool;
+bif_return_type(is_number, [_], _) -> bool;
+bif_return_type(is_pid, [_], _) -> bool;
+bif_return_type(is_port, [_], _) -> bool;
+bif_return_type(is_reference, [_], _) -> bool;
+bif_return_type(is_tuple, [_], _) -> bool;
 %% Misc.
-bif_type(node, [], _) -> {atom,[]};
-bif_type(node, [_], _) -> {atom,[]};
-bif_type(hd, [_], _) -> term;
-bif_type(tl, [_], _) -> term;
-bif_type(get, [_], _) -> term;
-bif_type(Bif, _, _) when is_atom(Bif) -> term.
+bif_return_type(tuple_size, [_], _) -> {integer,[]};
+bif_return_type(map_size, [_], _) -> {integer,[]};
+bif_return_type(node, [], _) -> {atom,[]};
+bif_return_type(node, [_], _) -> {atom,[]};
+bif_return_type(hd, [_], _) -> term;
+bif_return_type(tl, [_], _) -> term;
+bif_return_type(get, [_], _) -> term;
+bif_return_type(Bif, _, _) when is_atom(Bif) -> term.
+
+%% Generic
+bif_arg_types(tuple_size, [_]) -> [{tuple,[0],#{}}];
+bif_arg_types(map_size, [_]) -> [map];
+bif_arg_types(is_map_key, [_,_]) -> [term, map];
+bif_arg_types(map_get, [_,_]) -> [term, map];
+bif_arg_types(length, [_]) -> [list];
+bif_arg_types(hd, [_]) -> [cons];
+bif_arg_types(tl, [_]) -> [cons];
+%% Boolean
+bif_arg_types('not', [_]) -> [bool];
+bif_arg_types('and', [_,_]) -> [bool, bool];
+bif_arg_types('or', [_,_]) -> [bool, bool];
+bif_arg_types('xor', [_,_]) -> [bool, bool];
+%% Binary
+bif_arg_types('binary_part', [_,_]) ->
+    PosLen = {tuple, 2, #{ {integer,1} => {integer,[]},
+                           {integer,2} => {integer,[]} }},
+    [binary, PosLen];
+bif_arg_types('binary_part', [_,_,_]) ->
+    [binary, {integer,[]}, {integer,[]}];
+bif_arg_types('bit_size', [_]) -> [binary];
+bif_arg_types('byte_size', [_]) -> [binary];
+%% Numerical
+bif_arg_types('-', [_]) -> [number];
+bif_arg_types('-', [_,_]) -> [number,number];
+bif_arg_types('+', [_]) -> [number];
+bif_arg_types('+', [_,_]) -> [number,number];
+bif_arg_types('*', [_,_]) -> [number, number];
+bif_arg_types('/', [_,_]) -> [number, number];
+bif_arg_types(abs, [_]) -> [number];
+bif_arg_types(ceil, [_]) -> [number];
+bif_arg_types(float, [_]) -> [number];
+bif_arg_types(floor, [_]) -> [number];
+bif_arg_types(trunc, [_]) -> [number];
+bif_arg_types(round, [_]) -> [number];
+%% Integer-specific
+bif_arg_types('div', [_,_]) -> [{integer,[]}, {integer,[]}];
+bif_arg_types('rem', [_,_]) -> [{integer,[]}, {integer,[]}];
+bif_arg_types('band', [_,_]) -> [{integer,[]}, {integer,[]}];
+bif_arg_types('bor', [_,_]) -> [{integer,[]}, {integer,[]}];
+bif_arg_types('bxor', [_,_]) -> [{integer,[]}, {integer,[]}];
+bif_arg_types('bnot', [_]) -> [{integer,[]}];
+bif_arg_types('bsl', [_,_]) -> [{integer,[]}, {integer,[]}];
+bif_arg_types('bsr', [_,_]) -> [{integer,[]}, {integer,[]}];
+%% Unsafe type tests that may fail if an argument doesn't have the right type.
+bif_arg_types(is_function, [_,_]) -> [term, {integer,[]}];
+bif_arg_types(_, Args) -> [term || _Arg <- Args].
 
 is_bif_safe('/=', 2) -> true;
 is_bif_safe('<', 2) -> true;
@@ -1758,86 +2810,194 @@ is_bif_safe(self, 0) -> true;
 is_bif_safe(node, 0) -> true;
 is_bif_safe(_, _) -> false.
 
-arith_type([A,B], Vst) ->
-    case {get_term_type(A, Vst),get_term_type(B, Vst)} of
+arith_return_type([A], Vst) ->
+    %% Unary '+' or '-'.
+    case get_term_type(A, Vst) of
+	{integer,_} -> {integer,[]};
+	{float,_} -> {float,[]};
+        _ -> number
+    end;
+arith_return_type([A,B], Vst) ->
+    TypeA = get_term_type(A, Vst),
+    TypeB = get_term_type(B, Vst),
+    case {TypeA, TypeB} of
+	{{integer,_},{integer,_}} -> {integer,[]};
 	{{float,_},_} -> {float,[]};
 	{_,{float,_}} -> {float,[]};
 	{_,_} -> number
     end;
-arith_type(_, _) -> number.
+arith_return_type(_, _) -> number.
+
+%%%
+%%% Return/argument types of calls
+%%%
 
-return_type({extfunc,M,F,A}, Vst) -> return_type_1(M, F, A, Vst);
-return_type(_, _) -> term.
+call_return_type({extfunc,M,F,A}, Vst) -> call_return_type_1(M, F, A, Vst);
+call_return_type(_, _) -> term.
 
-return_type_1(erlang, setelement, 3, Vst) ->
-    Tuple = {x,1},
+call_return_type_1(erlang, setelement, 3, Vst) ->
+    IndexType = get_term_type({x,0}, Vst),
     TupleType =
-	case get_term_type(Tuple, Vst) of
-	    {tuple,_}=TT ->
-		TT;
-	    {literal,Lit} when is_tuple(Lit) ->
-		{tuple,tuple_size(Lit)};
-	    _ ->
-		{tuple,[0]}
-	end,
-    case get_term_type({x,0}, Vst) of
-	{integer,[]} -> TupleType;
-	{integer,I} -> upgrade_tuple_type({tuple,[I]}, TupleType);
-	_ -> TupleType
+        case get_term_type({x,1}, Vst) of
+            {literal,Tuple}=Lit when is_tuple(Tuple) -> get_literal_type(Lit);
+            {tuple,_,_}=TT -> TT;
+            _ -> {tuple,[0],#{}}
+        end,
+    case IndexType of
+        {integer,I} when is_integer(I) ->
+            case meet({tuple,[I],#{}}, TupleType) of
+                {tuple, Sz, Es0} ->
+                    ValueType = get_term_type({x,2}, Vst),
+                    Es = set_element_type({integer,I}, ValueType, Es0),
+                    {tuple, Sz, Es};
+                none ->
+                    TupleType
+            end;
+        _ ->
+            %% The index could point anywhere, so we must discard all element
+            %% information.
+            setelement(3, TupleType, #{})
     end;
-return_type_1(erlang, F, A, _) ->
-    return_type_erl(F, A);
-return_type_1(math, F, A, _) ->
-    return_type_math(F, A);
-return_type_1(M, F, A, _) when is_atom(M), is_atom(F), is_integer(A), A >= 0 ->
+call_return_type_1(erlang, '++', 2, Vst) ->
+    LType = get_term_type({x,0}, Vst),
+    RType = get_term_type({x,1}, Vst),
+    case LType =:= cons orelse RType =:= cons of
+        true ->
+            cons;
+        false ->
+            %% `[] ++ RHS` yields RHS, even if RHS is not a list
+            join(list, RType)
+    end;
+call_return_type_1(erlang, '--', 2, _Vst) ->
+    list;
+call_return_type_1(erlang, F, A, _) ->
+    erlang_mod_return_type(F, A);
+call_return_type_1(lists, F, A, Vst) ->
+    lists_mod_return_type(F, A, Vst);
+call_return_type_1(math, F, A, _) ->
+    math_mod_return_type(F, A);
+call_return_type_1(M, F, A, _) when is_atom(M), is_atom(F), is_integer(A), A >= 0 ->
     term.
 
-return_type_erl(exit, 1) -> exception;
-return_type_erl(throw, 1) -> exception;
-return_type_erl(error, 1) -> exception;
-return_type_erl(error, 2) -> exception;
-return_type_erl(F, A) when is_atom(F), is_integer(A), A >= 0 -> term.
-
-return_type_math(cos, 1) -> {float,[]};
-return_type_math(cosh, 1) -> {float,[]};
-return_type_math(sin, 1) -> {float,[]};
-return_type_math(sinh, 1) -> {float,[]};
-return_type_math(tan, 1) -> {float,[]};
-return_type_math(tanh, 1) -> {float,[]};
-return_type_math(acos, 1) -> {float,[]};
-return_type_math(acosh, 1) -> {float,[]};
-return_type_math(asin, 1) -> {float,[]};
-return_type_math(asinh, 1) -> {float,[]};
-return_type_math(atan, 1) -> {float,[]};
-return_type_math(atanh, 1) -> {float,[]};
-return_type_math(erf, 1) -> {float,[]};
-return_type_math(erfc, 1) -> {float,[]};
-return_type_math(exp, 1) -> {float,[]};
-return_type_math(log, 1) -> {float,[]};
-return_type_math(log2, 1) -> {float,[]};
-return_type_math(log10, 1) -> {float,[]};
-return_type_math(sqrt, 1) -> {float,[]};
-return_type_math(atan2, 2) -> {float,[]};
-return_type_math(pow, 2) -> {float,[]};
-return_type_math(ceil, 1) -> {float,[]};
-return_type_math(floor, 1) -> {float,[]};
-return_type_math(fmod, 2) -> {float,[]};
-return_type_math(pi, 0) -> {float,[]};
-return_type_math(F, A) when is_atom(F), is_integer(A), A >= 0 -> term.
-
-check_limit({x,X}) when is_integer(X), X < 1023 ->
-    %% Note: x(1023) is reserved for use by the BEAM loader.
-    ok;
-check_limit({y,Y}) when is_integer(Y), Y < 1024 ->
-    ok;
-check_limit({fr,Fr}) when is_integer(Fr), Fr < 1024 ->
-    ok;
-check_limit(_) ->
-    error(limit).
+erlang_mod_return_type(exit, 1) -> exception;
+erlang_mod_return_type(throw, 1) -> exception;
+erlang_mod_return_type(error, 1) -> exception;
+erlang_mod_return_type(error, 2) -> exception;
+erlang_mod_return_type(F, A) when is_atom(F), is_integer(A), A >= 0 -> term.
+
+math_mod_return_type(cos, 1) -> {float,[]};
+math_mod_return_type(cosh, 1) -> {float,[]};
+math_mod_return_type(sin, 1) -> {float,[]};
+math_mod_return_type(sinh, 1) -> {float,[]};
+math_mod_return_type(tan, 1) -> {float,[]};
+math_mod_return_type(tanh, 1) -> {float,[]};
+math_mod_return_type(acos, 1) -> {float,[]};
+math_mod_return_type(acosh, 1) -> {float,[]};
+math_mod_return_type(asin, 1) -> {float,[]};
+math_mod_return_type(asinh, 1) -> {float,[]};
+math_mod_return_type(atan, 1) -> {float,[]};
+math_mod_return_type(atanh, 1) -> {float,[]};
+math_mod_return_type(erf, 1) -> {float,[]};
+math_mod_return_type(erfc, 1) -> {float,[]};
+math_mod_return_type(exp, 1) -> {float,[]};
+math_mod_return_type(log, 1) -> {float,[]};
+math_mod_return_type(log2, 1) -> {float,[]};
+math_mod_return_type(log10, 1) -> {float,[]};
+math_mod_return_type(sqrt, 1) -> {float,[]};
+math_mod_return_type(atan2, 2) -> {float,[]};
+math_mod_return_type(pow, 2) -> {float,[]};
+math_mod_return_type(ceil, 1) -> {float,[]};
+math_mod_return_type(floor, 1) -> {float,[]};
+math_mod_return_type(fmod, 2) -> {float,[]};
+math_mod_return_type(pi, 0) -> {float,[]};
+math_mod_return_type(F, A) when is_atom(F), is_integer(A), A >= 0 -> term.
+
+lists_mod_return_type(all, 2, _Vst) ->
+    bool;
+lists_mod_return_type(any, 2, _Vst) ->
+    bool;
+lists_mod_return_type(keymember, 3, _Vst) ->
+    bool;
+lists_mod_return_type(member, 2, _Vst) ->
+    bool;
+lists_mod_return_type(prefix, 2, _Vst) ->
+    bool;
+lists_mod_return_type(suffix, 2, _Vst) ->
+    bool;
+lists_mod_return_type(dropwhile, 2, _Vst) ->
+    list;
+lists_mod_return_type(duplicate, 2, _Vst) ->
+    list;
+lists_mod_return_type(filter, 2, _Vst) ->
+    list;
+lists_mod_return_type(flatten, 1, _Vst) ->
+    list;
+lists_mod_return_type(map, 2, Vst) ->
+    same_length_type({x,1}, Vst);
+lists_mod_return_type(MF, 3, Vst) when MF =:= mapfoldl; MF =:= mapfoldr ->
+    ListType = same_length_type({x,2}, Vst),
+    {tuple,2,#{ {integer,1} => ListType} };
+lists_mod_return_type(partition, 2, _Vst) ->
+    two_tuple(list, list);
+lists_mod_return_type(reverse, 1, Vst) ->
+    same_length_type({x,0}, Vst);
+lists_mod_return_type(seq, 2, _Vst) ->
+    list;
+lists_mod_return_type(sort, 1, Vst) ->
+    same_length_type({x,0}, Vst);
+lists_mod_return_type(sort, 2, Vst) ->
+    same_length_type({x,1}, Vst);
+lists_mod_return_type(splitwith, 2, _Vst) ->
+    two_tuple(list, list);
+lists_mod_return_type(takewhile, 2, _Vst) ->
+    list;
+lists_mod_return_type(unzip, 1, Vst) ->
+    ListType = same_length_type({x,0}, Vst),
+    two_tuple(ListType, ListType);
+lists_mod_return_type(usort, 1, Vst) ->
+    same_length_type({x,0}, Vst);
+lists_mod_return_type(zip, 2, _Vst) ->
+    list;
+lists_mod_return_type(zipwith, 3, _Vst) ->
+    list;
+lists_mod_return_type(_, _, _) ->
+    term.
+
+two_tuple(Type1, Type2) ->
+    {tuple,2,#{ {integer,1} => Type1,
+                {integer,2} => Type2 }}.
+
+same_length_type(Reg, Vst) ->
+    case get_term_type(Reg, Vst) of
+        {literal,[_|_]} -> cons;
+        cons -> cons;
+        nil -> nil;
+        _ -> list
+    end.
+
+check_limit({x,X}=Src) when is_integer(X) ->
+    if
+        %% Note: x(1023) is reserved for use by the BEAM loader.
+        0 =< X, X < 1023 -> ok;
+        1023 =< X -> error(limit);
+        X < 0 -> error({bad_register, Src})
+    end;
+check_limit({y,Y}=Src) when is_integer(Y) ->
+    if
+        0 =< Y, Y < 1024 -> ok;
+        1024 =< Y -> error(limit);
+        Y < 0 -> error({bad_register, Src})
+    end;
+check_limit({fr,Fr}=Src) when is_integer(Fr) ->
+    if
+        0 =< Fr, Fr < 1023 -> ok;
+        1023 =< Fr -> error(limit);
+        Fr < 0 -> error({bad_register, Src})
+    end.
 
 min(A, B) when is_integer(A), is_integer(B), A < B -> A;
 min(A, B) when is_integer(A), is_integer(B) -> B.
 
-gb_trees_from_list(L) -> gb_trees:from_orddict(lists:sort(L)).
+gb_trees_from_list(L) -> gb_trees:from_orddict(sort(L)).
 
 error(Error) -> throw(Error).
diff --git a/lib/compiler/src/beam_z.erl b/lib/compiler/src/beam_z.erl
index 1c9d762eb1..415b579240 100644
--- a/lib/compiler/src/beam_z.erl
+++ b/lib/compiler/src/beam_z.erl
@@ -71,6 +71,31 @@ 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([{bs_put,_,{bs_put_binary,1,_},
+               [{atom,all},{literal,<<>>}]}|Is]) ->
+    undo_renames(Is);
+undo_renames([{bs_put,Fail,{bs_put_binary,1,_Flags},
+               [{atom,all},{literal,BinString}]}|Is0]) ->
+    Bits = bit_size(BinString),
+    Bytes = Bits div 8,
+    case Bits rem 8 of
+        0 ->
+            I = {bs_put_string,byte_size(BinString),
+                 {string,BinString}},
+            [undo_rename(I)|undo_renames(Is0)];
+        Rem ->
+            <<Binary:Bytes/bytes,Int:Rem>> = BinString,
+            PutInt = {bs_put_integer,Fail,{integer,Rem},1,
+                      {field_flags,[unsigned,big]},{integer,Int}},
+            Is = [PutInt|undo_renames(Is0)],
+            case Binary of
+                <<>> ->
+                    Is;
+                _ ->
+                    [{bs_put_string,byte_size(Binary),
+                      {string,Binary}}|Is]
+            end
+    end;
 undo_renames([I|Is]) ->
     [undo_rename(I)|undo_renames(Is)];
 undo_renames([]) -> [].
@@ -79,8 +104,6 @@ undo_rename({bs_put,F,{I,U,Fl},[Sz,Src]}) ->
     {I,F,Sz,U,Fl,Src};
 undo_rename({bs_put,F,{I,Fl},[Src]}) ->
     {I,F,Fl,Src};
-undo_rename({bs_put,{f,0},{bs_put_string,_,_}=I,[]}) ->
-    I;
 undo_rename({bif,bs_add=I,F,[Src1,Src2,{integer,U}],Dst}) ->
     {I,F,[Src1,Src2,U],Dst};
 undo_rename({bif,bs_utf8_size=I,F,[Src],Dst}) ->
@@ -101,7 +124,7 @@ undo_rename({test,bs_match_string=Op,F,[Ctx,Bin0]}) ->
 	      0 -> Bin0;
 	      Rem -> <<Bin0/bitstring,0:(8-Rem)>>
 	  end,
-    {test,Op,F,[Ctx,Bits,{string,binary_to_list(Bin)}]};
+    {test,Op,F,[Ctx,Bits,{string,Bin}]};
 undo_rename({put_map,Fail,assoc,S,D,R,L}) ->
     {put_map_assoc,Fail,S,D,R,L};
 undo_rename({put_map,Fail,exact,S,D,R,L}) ->
@@ -110,6 +133,8 @@ undo_rename({test,has_map_fields,Fail,[Src|List]}) ->
     {test,has_map_fields,Fail,Src,{list,List}};
 undo_rename({get_map_elements,Fail,Src,{list,List}}) ->
     {get_map_elements,Fail,Src,{list,List}};
+undo_rename({test,is_eq_exact,Fail,[Src,nil]}) ->
+    {test,is_nil,Fail,[Src]};
 undo_rename({select,I,Reg,Fail,List}) ->
     {I,Reg,Fail,{list,List}};
 undo_rename(I) -> I.
diff --git a/lib/compiler/src/cerl.erl b/lib/compiler/src/cerl.erl
index fce23bfd68..bc28f58712 100644
--- a/lib/compiler/src/cerl.erl
+++ b/lib/compiler/src/cerl.erl
@@ -263,7 +263,7 @@
 %% @see subtrees/1
 %% @see meta/1
 
--type ctype() :: 'alias'   | 'apply'  | 'binary' | 'bitrst' | 'call' | 'case'
+-type ctype() :: 'alias'   | 'apply'  | 'binary' | 'bitstr' | 'call' | 'case'
                | 'catch'   | 'clause' | 'cons'   | 'fun'    | 'let'  | 'letrec'
                | 'literal' | 'map'  | 'map_pair' | 'module' | 'primop'
                | 'receive' | 'seq'    | 'try'    | 'tuple'  | 'values' | 'var'.
@@ -2157,12 +2157,16 @@ values_arity(Node) ->
 
 %% @spec c_binary(Segments::[cerl()]) -> cerl()
 %%
-%% @doc Creates an abstract binary-template. A binary object is a
-%% sequence of 8-bit bytes. It is specified by zero or more bit-string
-%% template <em>segments</em> of arbitrary lengths (in number of bits),
-%% such that the sum of the lengths is evenly divisible by 8. If
-%% <code>Segments</code> is <code>[S1, ..., Sn]</code>, the result
-%% represents "<code>#{<em>S1</em>, ..., <em>Sn</em>}#</code>". All the
+
+%% @doc Creates an abstract binary-template. A binary object is in
+%% this context a sequence of an arbitrary number of bits. (The number
+%% of bits used to be evenly divisible by 8, but after the
+%% introduction of bit strings in the Erlang language, the choice was
+%% made to use the binary template for all bit strings.) It is
+%% specified by zero or more bit-string template <em>segments</em> of
+%% arbitrary lengths (in number of bits). If <code>Segments</code> is
+%% <code>[S1, ..., Sn]</code>, the result represents
+%% "<code>#{<em>S1</em>, ..., <em>Sn</em>}#</code>". All the
 %% <code>Si</code> must have type <code>bitstr</code>.
 %%
 %% @see ann_c_binary/2
diff --git a/lib/compiler/src/cerl_clauses.erl b/lib/compiler/src/cerl_clauses.erl
index fa5104c01b..3fd7ddd181 100644
--- a/lib/compiler/src/cerl_clauses.erl
+++ b/lib/compiler/src/cerl_clauses.erl
@@ -14,8 +14,8 @@
 %% @author Richard Carlsson <[email protected]>
 %% @doc Utility functions for Core Erlang case/receive clauses.
 %%
-%% <p>Syntax trees are defined in the module <a
-%% href=""><code>cerl</code></a>.</p>
+%% <p>Syntax trees are defined in the module
+%% <a href="cerl"><code>cerl</code></a>.</p>
 %%
 %% @type cerl() = cerl:cerl()
 
diff --git a/lib/compiler/src/cerl_sets.erl b/lib/compiler/src/cerl_sets.erl
index 0361186713..f489baf238 100644
--- a/lib/compiler/src/cerl_sets.erl
+++ b/lib/compiler/src/cerl_sets.erl
@@ -204,4 +204,4 @@ fold(F, Init, D) ->
       Set2 :: set(Element).
 
 filter(F, D) ->
-    maps:from_list(lists:filter(fun({K,_}) -> F(K) end, maps:to_list(D))).
+    maps:filter(fun(K,_) -> F(K) end, D).
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl
index 6510571441..0325c714d0 100644
--- a/lib/compiler/src/compile.erl
+++ b/lib/compiler/src/compile.erl
@@ -31,6 +31,9 @@
 %% Erlc interface.
 -export([compile/3,compile_beam/3,compile_asm/3,compile_core/3]).
 
+%% Utility functions for compiler passes.
+-export([run_sub_passes/2]).
+
 -export_type([option/0]).
 
 -include("erl_compile.hrl").
@@ -39,6 +42,8 @@
 -import(lists, [member/2,reverse/1,reverse/2,keyfind/3,last/1,
 		map/2,flatmap/2,foreach/2,foldr/3,any/2]).
 
+-define(SUB_PASS_TIMES, compile__sub_pass_times).
+
 %%----------------------------------------------------------------------
 
 -type abstract_code() :: [erl_parse:abstract_form()].
@@ -64,6 +69,7 @@
 -type err_ret()  :: 'error' | {'error', errors(), warnings()}.
 -type comp_ret() :: mod_ret() | bin_ret() | err_ret().
 
+
 %%----------------------------------------------------------------------
 
 %%
@@ -143,6 +149,30 @@ noenv_output_generated(Opts) ->
 
 env_compiler_options() -> env_default_opts().
 
+
+%%%
+%%% Run sub passes from a compiler pass.
+%%%
+
+-spec run_sub_passes([term()], term()) -> term().
+
+run_sub_passes(Ps, St) ->
+    case get(?SUB_PASS_TIMES) of
+        undefined ->
+            Runner = fun(_Name, Run, S) -> Run(S) end,
+            run_sub_passes_1(Ps, Runner, St);
+        Times when is_list(Times) ->
+            Runner = fun(Name, Run, S0) ->
+                             T1 = erlang:monotonic_time(),
+                             S = Run(S0),
+                             T2 = erlang:monotonic_time(),
+                             put(?SUB_PASS_TIMES,
+                                 [{Name,T2-T1}|get(?SUB_PASS_TIMES)]),
+                             S
+                     end,
+            run_sub_passes_1(Ps, Runner, St)
+    end.
+
 %%
 %%  Local functions
 %%
@@ -180,8 +210,11 @@ do_compile(Input, Opts0) ->
                               {error,Reason}
                       end
              end,
-    %% Dialyzer has already spawned workers.
-    case lists:member(dialyzer, Opts) of
+    %% Some tools, like Dialyzer, has already spawned workers
+    %% and spawning extra workers actually slow the compilation
+    %% down instead of speeding it up, so we provide a mechanism
+    %% to bypass the compiler process.
+    case lists:member(no_spawn_compiler_process, Opts) of
         true ->
             IntFun();
         false ->
@@ -218,23 +251,36 @@ expand_opt(report, Os) ->
     [report_errors,report_warnings|Os];
 expand_opt(return, Os) ->
     [return_errors,return_warnings|Os];
+expand_opt(no_bsm3, Os) ->
+    %% The new bsm pass requires bsm3 instructions.
+    [no_bsm3,no_bsm_opt|Os];
 expand_opt(r16, Os) ->
-    [no_get_hd_tl,no_record_opt,no_utf8_atoms|Os];
+    expand_opt_before_21(Os);
 expand_opt(r17, Os) ->
-    [no_get_hd_tl,no_record_opt,no_utf8_atoms|Os];
+    expand_opt_before_21(Os);
 expand_opt(r18, Os) ->
-    [no_get_hd_tl,no_record_opt,no_utf8_atoms|Os];
+    expand_opt_before_21(Os);
 expand_opt(r19, Os) ->
-    [no_get_hd_tl,no_record_opt,no_utf8_atoms|Os];
+    expand_opt_before_21(Os);
 expand_opt(r20, Os) ->
-    [no_get_hd_tl,no_record_opt,no_utf8_atoms|Os];
+    expand_opt_before_21(Os);
+expand_opt(r21, Os) ->
+    [no_put_tuple2 | expand_opt(no_bsm3, Os)];
 expand_opt({debug_info_key,_}=O, Os) ->
     [encrypt_debug_info,O|Os];
-expand_opt(no_float_opt, Os) ->
-    %%Turn off the entire type optimization pass.
-    [no_topt|Os];
+expand_opt(no_type_opt=O, Os) ->
+    %% Be sure to keep the no_type_opt option so that it will
+    %% be recorded in the BEAM file, allowing the test suites
+    %% to recompile the file with this option.
+    [O,no_ssa_opt_type_start,
+     no_ssa_opt_type_continue,
+     no_ssa_opt_type_finish | Os];
 expand_opt(O, Os) -> [O|Os].
 
+expand_opt_before_21(Os) ->
+    [no_put_tuple2, no_get_hd_tl, no_ssa_opt_record,
+     no_utf8_atoms | expand_opt(no_bsm3, Os)].
+
 %% format_error(ErrorDescriptor) -> string()
 
 -spec format_error(term()) -> iolist().
@@ -247,6 +293,10 @@ format_error(bad_crypto_key) ->
     "invalid crypto key.";
 format_error(no_crypto_key) ->
     "no crypto key supplied.";
+format_error({unimplemented_instruction,Instruction}) ->
+    io_lib:fwrite("native-code compilation failed because of an "
+                  "unimplemented instruction (~s).",
+		  [Instruction]);
 format_error({native, E}) ->
     io_lib:fwrite("native-code compilation failed with reason: ~tP.",
 		  [E, 25]);
@@ -387,17 +437,57 @@ fold_comp([{Name,Pass}|Ps], Run, Code0, St0) ->
     end;
 fold_comp([], _Run, Code, St) -> {ok,Code,St}.
 
+run_sub_passes_1([{Name,Run}|Ps], Runner, St0)
+  when is_atom(Name), is_function(Run, 1) ->
+    try Runner(Name, Run, St0) of
+        St ->
+            run_sub_passes_1(Ps, Runner, St)
+    catch
+        C:E:Stk ->
+            io:format("Sub pass ~s\n", [Name]),
+            erlang:raise(C, E, Stk)
+    end;
+run_sub_passes_1([], _, St) -> St.
+
 run_tc({Name,Fun}, Code, St) ->
+    put(?SUB_PASS_TIMES, []),
     T1 = erlang:monotonic_time(),
     Val = (catch Fun(Code, St)),
     T2 = erlang:monotonic_time(),
-    Elapsed = erlang:convert_time_unit(T2 - T1, native, millisecond),
+    Times = erase(?SUB_PASS_TIMES),
+    Elapsed = erlang:convert_time_unit(T2 - T1, native, microsecond),
     Mem0 = erts_debug:flat_size(Val)*erlang:system_info(wordsize),
     Mem = lists:flatten(io_lib:format("~.1f kB", [Mem0/1024])),
     io:format(" ~-30s: ~10.3f s ~12s\n",
-	      [Name,Elapsed/1000,Mem]),
+	      [Name,Elapsed/1000000,Mem]),
+    print_times(Times, Name),
     Val.
 
+print_times(Times0, Name) ->
+    Fam0 = sofs:relation(Times0),
+    Fam1 = sofs:rel2fam(Fam0),
+    Fam2 = sofs:to_external(Fam1),
+    Fam3 = [{W,lists:sum(Times)} || {W,Times} <- Fam2],
+    Fam = reverse(lists:keysort(2, Fam3)),
+    Total = case lists:sum([T || {_,T} <- Fam]) of
+                0 -> 1;
+                Total0 -> Total0
+            end,
+    case Fam of
+        [] ->
+            ok;
+        [_|_] ->
+            io:format("    %% Sub passes of ~s from slowest to fastest:\n", [Name]),
+            print_times_1(Fam, Total)
+    end.
+
+print_times_1([{Name,T}|Ts], Total) ->
+    Elapsed = erlang:convert_time_unit(T, native, microsecond),
+    io:format("    ~-27s: ~10.3f s ~3w %\n",
+              [Name,Elapsed/1000000,round(100*T/Total)]),
+    print_times_1(Ts, Total);
+print_times_1([], _Total) -> ok.
+
 run_eprof({Name,Fun}, Code, Name, St) ->
     io:format("~p: Running eprof\n", [Name]),
     c:appcall(tools, eprof, start_profiling, [[self()]]),
@@ -731,8 +821,6 @@ kernel_passes() ->
     %% Optimizations that must be done after all other optimizations.
     [{pass,sys_core_bsm},
      {iff,dcbsm,{listing,"core_bsm"}},
-     {pass,sys_core_dsetel},
-     {iff,dsetel,{listing,"dsetel"}},
 
      {iff,clint,?pass(core_lint_module)},
      {iff,core,?pass(save_core_code)},
@@ -741,8 +829,30 @@ kernel_passes() ->
      ?pass(v3_kernel),
      {iff,dkern,{listing,"kernel"}},
      {iff,'to_kernel',{done,"kernel"}},
-     {pass,v3_codegen},
-     {iff,dcg,{listing,"codegen"}}
+     {pass,beam_kernel_to_ssa},
+     {iff,dssa,{listing,"ssa"}},
+     {iff,ssalint,{pass,beam_ssa_lint}},
+     {delay,
+      [{unless,no_share_opt,{pass,beam_ssa_share}},
+       {iff,dssashare,{listing,"ssashare"}},
+       {iff,ssalint,{pass,beam_ssa_lint}},
+       {unless,no_bsm_opt,{pass,beam_ssa_bsm}},
+       {iff,dssabsm,{listing,"ssabsm"}},
+       {iff,ssalint,{pass,beam_ssa_lint}},
+       {unless,no_fun_opt,{pass,beam_ssa_funs}},
+       {iff,dssafuns,{listing,"ssafuns"}},
+       {iff,ssalint,{pass,beam_ssa_lint}},
+       {unless,no_ssa_opt,{pass,beam_ssa_opt}},
+       {iff,dssaopt,{listing,"ssaopt"}},
+       {iff,ssalint,{pass,beam_ssa_lint}},
+       {unless,no_recv_opt,{pass,beam_ssa_recv}},
+       {iff,drecv,{listing,"recv"}}]},
+     {pass,beam_ssa_pre_codegen},
+     {iff,dprecg,{listing,"precodegen"}},
+     {iff,ssalint,{pass,beam_ssa_lint}},
+     {pass,beam_ssa_codegen},
+     {iff,dcg,{listing,"codegen"}},
+     {iff,doldcg,{listing,"codegen"}}
      | asm_passes()].
 
 asm_passes() ->
@@ -751,34 +861,16 @@ asm_passes() ->
       [{pass,beam_a},
        {iff,da,{listing,"a"}},
        {unless,no_postopt,
-	[{unless,no_reorder,{pass,beam_reorder}},
-	 {iff,dre,{listing,"reorder"}},
-	 {pass,beam_block},
+	[{pass,beam_block},
 	 {iff,dblk,{listing,"block"}},
 	 {unless,no_except,{pass,beam_except}},
 	 {iff,dexcept,{listing,"except"}},
-	 {unless,no_bs_opt,{pass,beam_bs}},
-	 {iff,dbs,{listing,"bs"}},
-	 {unless,no_topt,{pass,beam_type}},
-	 {iff,dtype,{listing,"type"}},
-	 {pass,beam_split},
-	 {iff,dsplit,{listing,"split"}},
-	 {unless,no_dead,{pass,beam_dead}},
-	 {iff,ddead,{listing,"dead"}},
 	 {unless,no_jopt,{pass,beam_jump}},
 	 {iff,djmp,{listing,"jump"}},
 	 {unless,no_peep_opt,{pass,beam_peep}},
 	 {iff,dpeep,{listing,"peep"}},
 	 {pass,beam_clean},
 	 {iff,dclean,{listing,"clean"}},
-	 {unless,no_bsm_opt,{pass,beam_bsm}},
-	 {iff,dbsm,{listing,"bsm"}},
-	 {unless,no_recv_opt,{pass,beam_receive}},
-	 {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,7 +879,9 @@ asm_passes() ->
        %% need to do a few clean-ups to code.
        {iff,no_postopt,[{pass,beam_clean}]},
 
+       {iff,diffable,?pass(diffable)},
        {pass,beam_z},
+       {iff,diffable,{listing,"S"}},
        {iff,dz,{listing,"z"}},
        {iff,dopt,{listing,"optimize"}},
        {iff,'S',{listing,"S"}},
@@ -1360,10 +1454,6 @@ 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.
@@ -1568,18 +1658,22 @@ native_compile_1(Code, St) ->
 	    case IgnoreErrors of
 		true ->
 		    Ws = [{St#compile.ifile,[{none,?MODULE,{native,R}}]}],
-		    {ok,St#compile{warnings=St#compile.warnings ++ Ws}};
+		    {ok,Code,St#compile{warnings=St#compile.warnings ++ Ws}};
 		false ->
 		    Es = [{St#compile.ifile,[{none,?MODULE,{native,R}}]}],
 		    {error,St#compile{errors=St#compile.errors ++ Es}}
 	    end
     catch
+        exit:{unimplemented_instruction,_}=Unimplemented ->
+            Ws = [{St#compile.ifile,
+                   [{none,?MODULE,Unimplemented}]}],
+            {ok,Code,St#compile{warnings=St#compile.warnings ++ Ws}};
 	Class:R:Stack ->
 	    case IgnoreErrors of
 		true ->
 		    Ws = [{St#compile.ifile,
 			   [{none,?MODULE,{native_crash,R,Stack}}]}],
-		    {ok,St#compile{warnings=St#compile.warnings ++ Ws}};
+		    {ok,Code,St#compile{warnings=St#compile.warnings ++ Ws}};
 		false ->
 		    erlang:raise(Class, R, Stack)
 	    end
@@ -1849,6 +1943,39 @@ restore_expand_module([F|Fs]) ->
     [F|restore_expand_module(Fs)];
 restore_expand_module([]) -> [].
 
+%%%
+%%% Transform the BEAM code to make it more friendly for
+%%% diffing: using function names instead of labels for
+%%% local calls and number labels relative to each function.
+%%%
+
+diffable(Code0, St) ->
+    {Mod,Exp,Attr,Fs0,NumLabels} = Code0,
+    EntryLabels0 = [{Entry,{Name,Arity}} ||
+                       {function,Name,Arity,Entry,_} <- Fs0],
+    EntryLabels = maps:from_list(EntryLabels0),
+    Fs = [diffable_fix_function(F, EntryLabels) || F <- Fs0],
+    Code = {Mod,Exp,Attr,Fs,NumLabels},
+    {ok,Code,St}.
+
+diffable_fix_function({function,Name,Arity,Entry0,Is0}, LabelMap0) ->
+    Entry = maps:get(Entry0, LabelMap0),
+    {Is1,LabelMap} = diffable_label_map(Is0, 1, LabelMap0, []),
+    Fb = fun(Old) -> error({no_fb,Old}) end,
+    Is = beam_utils:replace_labels(Is1, [], LabelMap, Fb),
+    {function,Name,Arity,Entry,Is}.
+
+diffable_label_map([{label,Old}|Is], New, Map, Acc) ->
+    case Map of
+        #{Old:=NewLabel} ->
+            diffable_label_map(Is, New, Map, [{label,NewLabel}|Acc]);
+        #{} ->
+            diffable_label_map(Is, New+1, Map#{Old=>New}, [{label,New}|Acc])
+    end;
+diffable_label_map([I|Is], New, Map, Acc) ->
+    diffable_label_map(Is, New, Map, [I|Acc]);
+diffable_label_map([], _New, Map, Acc) ->
+    {Acc,Map}.
 
 -spec options() -> 'ok'.
 
@@ -1969,22 +2096,25 @@ pre_load() ->
     L = [beam_a,
 	 beam_asm,
 	 beam_block,
-	 beam_bs,
-	 beam_bsm,
 	 beam_clean,
-	 beam_dead,
 	 beam_dict,
 	 beam_except,
 	 beam_flatten,
 	 beam_jump,
+	 beam_kernel_to_ssa,
 	 beam_opcodes,
 	 beam_peep,
-	 beam_receive,
-         beam_record,
-	 beam_reorder,
-	 beam_split,
+	 beam_ssa,
+	 beam_ssa_bsm,
+	 beam_ssa_codegen,
+	 beam_ssa_dead,
+         beam_ssa_funs,
+	 beam_ssa_opt,
+	 beam_ssa_pre_codegen,
+	 beam_ssa_recv,
+	 beam_ssa_share,
+	 beam_ssa_type,
 	 beam_trim,
-	 beam_type,
 	 beam_utils,
 	 beam_validator,
 	 beam_z,
@@ -2001,9 +2131,7 @@ pre_load() ->
 	 erl_scan,
 	 sys_core_alias,
 	 sys_core_bsm,
-	 sys_core_dsetel,
 	 sys_core_fold,
-	 v3_codegen,
 	 v3_core,
 	 v3_kernel],
     _ = code:ensure_modules_loaded(L),
diff --git a/lib/compiler/src/compiler.app.src b/lib/compiler/src/compiler.app.src
index cf32fd251c..a086a3a8d3 100644
--- a/lib/compiler/src/compiler.app.src
+++ b/lib/compiler/src/compiler.app.src
@@ -24,24 +24,29 @@
 	     beam_a,
 	     beam_asm,
 	     beam_block,
-	     beam_bs,
-	     beam_bsm,
 	     beam_clean,
-	     beam_dead,
 	     beam_dict,
 	     beam_disasm,
 	     beam_except,
 	     beam_flatten,
 	     beam_jump,
+             beam_kernel_to_ssa,
 	     beam_listing,
 	     beam_opcodes,
 	     beam_peep,
-	     beam_receive,
-	     beam_reorder,
-	     beam_record,
-	     beam_split,
+             beam_ssa,
+             beam_ssa_bsm,
+             beam_ssa_codegen,
+             beam_ssa_dead,
+             beam_ssa_funs,
+             beam_ssa_lint,
+             beam_ssa_opt,
+             beam_ssa_pp,
+             beam_ssa_pre_codegen,
+             beam_ssa_recv,
+             beam_ssa_share,
+             beam_ssa_type,
 	     beam_trim,
-	     beam_type,
 	     beam_utils,
 	     beam_validator,
 	     beam_z,
@@ -60,12 +65,10 @@
 	     rec_env,
 	     sys_core_alias,
 	     sys_core_bsm,
-	     sys_core_dsetel,
 	     sys_core_fold,
 	     sys_core_fold_lists,
 	     sys_core_inline,
 	     sys_pre_attributes,
-	     v3_codegen,
 	     v3_core,
 	     v3_kernel,
 	     v3_kernel_pp
diff --git a/lib/compiler/src/core_parse.hrl b/lib/compiler/src/core_parse.hrl
index 83a6f0179c..90c796d3d9 100644
--- a/lib/compiler/src/core_parse.hrl
+++ b/lib/compiler/src/core_parse.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2019. 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,81 +29,82 @@
 
 %% The record definitions appear alphabetically
 
--record(c_alias, {anno=[], var,		% var :: Tree,
-		  pat}).		% pat :: Tree
+-record(c_alias, {anno=[] :: list(), var :: cerl:cerl(),
+		  pat :: cerl:cerl()}).
 
--record(c_apply, {anno=[], op,		% op :: Tree,
-		  args}).		% args :: [Tree]
+-record(c_apply, {anno=[] :: list(), op :: cerl:cerl(),
+		  args :: [cerl:cerl()]}).
 
--record(c_binary, {anno=[], segments :: [cerl:c_bitstr()]}).
+-record(c_binary, {anno=[] :: list(), segments :: [cerl:c_bitstr()]}).
 
--record(c_bitstr, {anno=[], val,        % val :: Tree,
-		   size,		% size :: Tree,
-		   unit,		% unit :: Tree,
-		   type,		% type :: Tree,
-		   flags}).		% flags :: Tree
+-record(c_bitstr, {anno=[] :: list(), val :: cerl:cerl(),
+		   size :: cerl:cerl(),
+		   unit :: cerl:cerl(),
+		   type :: cerl:cerl(),
+		   flags :: cerl:cerl()}).
 
--record(c_call, {anno=[], module,	% module :: Tree,
-		 name,			% name :: Tree,
-		 args}).		% args :: [Tree]
+-record(c_call, {anno=[] :: list(), module :: cerl:cerl(),
+		 name :: cerl:cerl(),
+		 args :: [cerl:cerl()]}).
 
--record(c_case, {anno=[], arg,		% arg :: Tree,
-		 clauses}).		% clauses :: [Tree]
+-record(c_case, {anno=[] :: list(), arg :: cerl:cerl(),
+		 clauses :: [cerl:cerl()]}).
 
--record(c_catch, {anno=[], body}).	% body :: Tree
+-record(c_catch, {anno=[] :: list(), body :: cerl:cerl()}).
 
--record(c_clause, {anno=[], pats,	% pats :: [Tree],
-		   guard,		% guard :: Tree,
-		   body}).		% body :: Tree
+-record(c_clause, {anno=[] :: list(), pats :: [cerl:cerl()],
+		   guard :: cerl:cerl(),
+		   body :: cerl:cerl() | any()}). % TODO
 
--record(c_cons, {anno=[], hd,		% hd :: Tree,
-		 tl}).			% tl :: Tree
+-record(c_cons, {anno=[] :: list(), hd :: cerl:cerl(),
+		 tl :: cerl:cerl()}).
 
--record(c_fun, {anno=[], vars,		% vars :: [Tree],
-		body}).			% body :: Tree
+-record(c_fun, {anno=[] :: list(), vars :: [cerl:cerl()],
+		body :: cerl:cerl()}).
 
--record(c_let, {anno=[], vars,		% vars :: [Tree],
-		arg,			% arg :: Tree,
-		body}).			% body :: Tree
+-record(c_let, {anno=[] :: list(), vars :: [cerl:cerl()],
+		arg :: cerl:cerl(),
+		body :: cerl:cerl()}).
 
--record(c_letrec, {anno=[], defs,	% defs :: [#c_def{}],
-		   body}).		% body :: Tree
+-record(c_letrec, {anno=[] :: list(),
+                   defs :: [{cerl:cerl(), cerl:cerl()}],
+		   body :: cerl:cerl()}).
 
--record(c_literal, {anno=[], val}).	% val :: literal()
+-record(c_literal, {anno=[] :: list(), val :: any()}).
 
--record(c_map, {anno=[],
+-record(c_map, {anno=[] :: list(),
 		arg=#c_literal{val=#{}} :: cerl:c_var() | cerl:c_literal(),
 		es :: [cerl:c_map_pair()],
 		is_pat=false :: boolean()}).
 
--record(c_map_pair, {anno=[],
+-record(c_map_pair, {anno=[] :: list(),
 	             op :: #c_literal{val::'assoc'} | #c_literal{val::'exact'},
-		     key,
-		     val}).
+		     key :: any(),              % TODO
+		     val :: any()}).            % TODO
 
--record(c_module, {anno=[], name,	% name :: Tree,
-		   exports,		% exports :: [Tree],
-		   attrs,		% attrs :: [#c_def{}],
-		   defs}).		% defs :: [#c_def{}]
+-record(c_module, {anno=[] :: list(), name :: cerl:cerl(),
+		   exports :: [cerl:cerl()],
+		   attrs :: [{cerl:cerl(), cerl:cerl()}],
+		   defs :: [{cerl:cerl(), cerl:cerl()}]}).
 
--record(c_primop, {anno=[], name,	% name :: Tree,
-		   args}).		% args :: [Tree]
+-record(c_primop, {anno=[] :: list(), name :: cerl:cerl(),
+		   args :: [cerl:cerl()]}).
 
--record(c_receive, {anno=[], clauses,	% clauses :: [Tree],
-		    timeout,		% timeout :: Tree,
-		    action}).		% action :: Tree
+-record(c_receive, {anno=[] :: list(), clauses :: [cerl:cerl()],
+		    timeout :: cerl:cerl(),
+		    action :: cerl:cerl()}).
 
--record(c_seq, {anno=[], arg,		% arg :: Tree,
-		body}).			% body :: Tree
+-record(c_seq, {anno=[] :: list(), arg :: cerl:cerl() | any(), % TODO
+		body :: cerl:cerl()}).
 
--record(c_try, {anno=[], arg,		% arg :: Tree,
-		vars,			% vars :: [Tree],
-		body,			% body :: Tree
-		evars,			% evars :: [Tree],
-		handler}).		% handler :: Tree
+-record(c_try, {anno=[] :: list(), arg :: cerl:cerl(),
+		vars :: [cerl:cerl()],
+		body :: cerl:cerl(),
+		evars :: [cerl:cerl()],
+		handler :: cerl:cerl()}).
 
--record(c_tuple, {anno=[], es}).	% es :: [Tree]
+-record(c_tuple, {anno=[] :: list(), es :: [cerl:cerl()]}).
 
--record(c_values, {anno=[], es}).	% es :: [Tree]
+-record(c_values, {anno=[] :: list(), es :: [cerl:cerl()]}).
 
--record(c_var, {anno=[], name :: cerl:var_name()}).
+-record(c_var, {anno=[] :: list(), name :: cerl:var_name()}).
diff --git a/lib/compiler/src/erl_bifs.erl b/lib/compiler/src/erl_bifs.erl
index 68489a0122..94a5dfe012 100644
--- a/lib/compiler/src/erl_bifs.erl
+++ b/lib/compiler/src/erl_bifs.erl
@@ -32,6 +32,22 @@
 %%	Returns `true' if the function `Module:Name/Arity' does not
 %%	affect the state, nor depend on the state, although its
 %%	evaluation is not guaranteed to complete normally for all input.
+%%
+%%      NOTE: There is no need to include every new pure BIF
+%%      here. Including it here means that the value of the function
+%%      will be evaluated at compile-time if the arguments are
+%%      constant. If that optimization is not useful/desired, there is
+%%      no need to include the new BIF here.
+%%
+%%      Functions whose return value could conceivably change in a
+%%      future version of the runtime system must NOT be included here.
+%%
+%%      Here are some example of functions that should not be
+%%      included: `term_to_binary/1', hashing functions, non-trivial
+%%      encode/decode functions.
+%%
+%%      When unsure whether a new BIF should be included here, the
+%%      conservative safe choice is NOT to include it.
 
 -spec is_pure(atom(), atom(), arity()) -> boolean().
 
@@ -91,6 +107,7 @@ is_pure(erlang, is_bitstring, 1) -> true;
 %% erlang:is_builtin/3 depends on the state (i.e. the version of the emulator).
 is_pure(erlang, is_float, 1) -> true;
 is_pure(erlang, is_function, 1) -> true;
+is_pure(erlang, is_function, 2) -> true;
 is_pure(erlang, is_integer, 1) -> true;
 is_pure(erlang, is_list, 1) -> true;
 is_pure(erlang, is_map, 1) -> true;
@@ -107,6 +124,7 @@ is_pure(erlang, list_to_atom, 1) -> true;
 is_pure(erlang, list_to_binary, 1) -> true;
 is_pure(erlang, list_to_float, 1) -> true;
 is_pure(erlang, list_to_integer, 1) -> true;
+is_pure(erlang, list_to_integer, 2) -> true;
 is_pure(erlang, list_to_pid, 1) -> true;
 is_pure(erlang, list_to_tuple, 1) -> true;
 is_pure(erlang, max, 2) -> true;
@@ -193,6 +211,7 @@ is_safe(erlang, is_float, 1) -> true;
 is_safe(erlang, is_function, 1) -> true;
 is_safe(erlang, is_integer, 1) -> true;
 is_safe(erlang, is_list, 1) -> true;
+is_safe(erlang, is_map, 1) -> true;
 is_safe(erlang, is_number, 1) -> true;
 is_safe(erlang, is_pid, 1) -> true;
 is_safe(erlang, is_port, 1) -> true;
diff --git a/lib/compiler/src/genop.tab b/lib/compiler/src/genop.tab
index 02dead9e92..86590fad87 100755
--- a/lib/compiler/src/genop.tab
+++ b/lib/compiler/src/genop.tab
@@ -142,8 +142,7 @@ BEAM_FORMAT_NUMBER=0
 20: send/0
 
 ## @spec remove_message
-## @doc  Unlink the current message from the message queue and store a
-##       pointer to the message in x(0). Remove any timeout.
+## @doc  Unlink the current message from the message queue. Remove any timeout.
 21: remove_message/0
 
 ## @spec timeout
@@ -574,3 +573,26 @@ BEAM_FORMAT_NUMBER=0
 ## @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
+
+# OTP 22
+
+## @spec put_tuple2  Destination Elements
+## @doc  Build a tuple with the elements in the list Elements and put it
+##       put into register Destination.
+164: put_tuple2/2
+
+## @spec bs_get_tail Ctx Dst Live
+## @doc  Sets Dst to the tail of Ctx at the current position
+165: bs_get_tail/3
+
+## @spec bs_start_match3 Fail Bin Live Dst
+## @doc  Starts a binary match sequence
+166: bs_start_match3/4
+
+## @spec bs_get_position Ctx Dst Live
+## @doc  Sets Dst to the current position of Ctx
+167: bs_get_position/3
+
+## @spec bs_set_positon Ctx Pos
+## @doc  Sets the current position of Ctx to Pos
+168: bs_set_position/2
diff --git a/lib/compiler/src/sys_core_bsm.erl b/lib/compiler/src/sys_core_bsm.erl
index 62657933ee..685e807e65 100644
--- a/lib/compiler/src/sys_core_bsm.erl
+++ b/lib/compiler/src/sys_core_bsm.erl
@@ -24,223 +24,52 @@
 -export([module/2,format_error/1]).
 
 -include("core_parse.hrl").
--import(lists, [member/2,reverse/1,usort/1]).
 
 -spec module(cerl:c_module(), [compile:option()]) -> {'ok', cerl:c_module()}.
 
-module(#c_module{defs=Ds0}=Mod, Opts) ->
-    {Ds,Ws0} = function(Ds0, [], []),
-    case member(bin_opt_info, Opts) of
-        false ->
-            {ok,Mod#c_module{defs=Ds}};
-        true ->
-            Ws1 = [make_warning(Where, What) || {Where,What} <- Ws0],
-            Ws = usort(Ws1),
-            {ok,Mod#c_module{defs=Ds},Ws}
-    end.
+module(#c_module{defs=Ds}=Mod, _Opts) ->
+    {ok,Mod#c_module{defs=function(Ds)}}.
 
-function([{#c_var{name={F,Arity}}=Name,B0}|Fs], FsAcc, Ws0) ->
-    try cerl_trees:mapfold(fun bsm_an/2, Ws0, B0) of
-        {B,Ws} ->
-            function(Fs, [{Name,B}|FsAcc], Ws)
+function([{#c_var{name={F,Arity}}=Name,B0}|Fs]) ->
+    try cerl_trees:map(fun bsm_reorder/1, B0) of
+        B -> [{Name,B} | function(Fs)]
     catch
-        throw:unsafe_bs_context_to_binary ->
-            %% Unsafe bs_context_to_binary (in the sense that the
-            %% contents of the binary will probably be wrong).
-            %% Disable binary optimizations for the entire function.
-            %% We don't generate an INFO message, because this happens
-            %% very infrequently and it would be hard to explain in
-            %% a comprehensible way in an INFO message.
-            function(Fs, [{Name,B0}|FsAcc], Ws0);
         Class:Error:Stack ->
-	    io:fwrite("Function: ~w/~w\n", [F,Arity]),
-	    erlang:raise(Class, Error, Stack)
+            io:fwrite("Function: ~w/~w\n", [F,Arity]),
+            erlang:raise(Class, Error, Stack)
     end;
-function([], Fs, Ws) ->
-    {reverse(Fs),Ws}.
+function([]) ->
+    [].
 
 -type error() :: atom().
 -spec format_error(error()) -> nonempty_string().
 
-format_error(bin_opt_alias) ->
-    "INFO: the '=' operator will prevent delayed sub binary optimization";
-format_error(bin_partition) ->
-    "INFO: matching non-variables after a previous clause matching a variable "
-	"will prevent delayed sub binary optimization";
-format_error(bin_var_used) ->
-    "INFO: using a matched out sub binary will prevent "
-	"delayed sub binary optimization";
-format_error(orig_bin_var_used_in_guard) ->
-    "INFO: using the original binary variable in a guard will prevent "
-	"delayed sub binary optimization";
-format_error(bin_var_used_in_guard) ->
-    "INFO: using a matched out sub binary in a guard will prevent "
-	"delayed sub binary optimization".
-
+format_error(_) -> error(badarg).
 
-%%%
-%%% Annotate bit syntax matching to faciliate optimization in further passes.
-%%%
+%%% Reorder bit syntax matching to faciliate optimization in further passes.
 
-bsm_an(Core0, Ws0) ->
-    case bsm_an(Core0) of
-        {ok,Core} ->
-            {Core,Ws0};
-        {ok,Core,W} ->
-            {Core,[W|Ws0]}
-    end.
+bsm_reorder(#c_case{arg=#c_var{}=V}=Case) ->
+    bsm_reorder_1([V], Case);
+bsm_reorder(#c_case{arg=#c_values{es=Es}}=Case) ->
+    bsm_reorder_1(Es, Case);
+bsm_reorder(Core) ->
+    Core.
 
-bsm_an(#c_case{arg=#c_var{}=V}=Case) ->
-    bsm_an_1([V], Case);
-bsm_an(#c_case{arg=#c_values{es=Es}}=Case) ->
-    bsm_an_1(Es, Case);
-bsm_an(Other) ->
-    {ok,Other}.
-
-bsm_an_1(Vs0, #c_case{clauses=Cs0}=Case) ->
+bsm_reorder_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_2(Vs, Cs, Case) ->
-    try
-        bsm_ensure_no_partition(Cs),
-        {ok,bsm_do_an(Vs, Cs, Case)}
-    catch
-        throw:{problem,Where,What} ->
-            {ok,Case,{Where,What}}
+        Pos when Pos > 0, Pos =/= none ->
+            Vs = core_lib:make_values(move_from_col(Pos, Vs0)),
+            Cs = [C#c_clause{pats=move_from_col(Pos, Ps)}
+                  || #c_clause{pats=Ps}=C <- Cs0],
+            Case#c_case{arg=Vs,clauses=Cs};
+        _ ->
+            Case
     end.
 
 move_from_col(Pos, L) ->
     {First,[Col|Rest]} = lists:split(Pos - 1, L),
     [Col|First] ++ Rest.
 
-bsm_do_an([#c_var{name=Vname}=V0|Vs0], Cs0, Case) ->
-    bsm_inner_context_to_binary(Cs0),
-    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_inner_context_to_binary([#c_clause{body=B}|Cs]) ->
-    %% Consider:
-    %%
-    %%   foo(<<Length, Data/binary>>) ->  %Line 1
-    %%      case {Data, Length} of        %Line 2
-    %%        {_, 0} -> Data;             %Line 3
-    %%        {<<...>>, 4} -> ...         %Line 4
-    %%      end.
-    %%
-    %% No sub binary will be created for Data in line 1. The match
-    %% context will be passed on to the `case` in line 2. In line 3,
-    %% this pass inserts a `bs_context_to_binary` instruction to
-    %% convert the match context representing Data to a binary before
-    %% returning it. The problem is that the binary created will be
-    %% the original binary (including the matched out Length field),
-    %% not the tail of the binary as it is supposed to be.
-    %%
-    %% Here follows a heuristic to disable the binary optimizations
-    %% for the entire function if this code kind of code is found.
-
-    case cerl_trees:free_variables(B) of
-        [] ->
-            %% Since there are no free variables in the body of
-            %% this clause, there can't be any troublesome
-            %% bs_context_to_binary instructions.
-            bsm_inner_context_to_binary(Cs);
-        [_|_]=Free ->
-            %% One of the free variables could refer to a match context
-            %% created by the outer binary match.
-            F = fun(#c_primop{name=#c_literal{val=bs_context_to_binary},
-                              args=[#c_var{name=V}]}, _) ->
-                        case member(V, Free) of
-                            true ->
-                                %% This bs_context_to_binary instruction will
-                                %% make a binary of the match context from an
-                                %% outer binary match. It is very likely that
-                                %% the contents of the binary will be wrong
-                                %% (the original binary as opposed to only
-                                %% the tail binary).
-                                throw(unsafe_bs_context_to_binary);
-                            false ->
-                                %% Safe. This bs_context_to_binary instruction
-                                %% will make a binary from a match context
-                                %% defined in the body of the clause.
-                                ok
-                        end;
-                   (_, _) ->
-                        ok
-                end,
-            cerl_trees:fold(F, ok, B)
-    end;
-bsm_inner_context_to_binary([]) -> ok.
-
-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);
-		false -> ok
-	    end,
-	    case core_lib:is_var_used(VarName, G) of
-		true -> bsm_problem(C0, bin_var_used_in_guard);
-		false -> ok
-	    end,
-	    B1 = bsm_maybe_ctx_to_binary(VarName, B0),
-	    B = bsm_maybe_ctx_to_binary(V, B1),
-	    C = C0#c_clause{body=B},
-            [C|bsm_do_an_var(V, Cs)];
-        #c_alias{} ->
-	    case bsm_could_match_binary(P) of
-		false ->
-		    [C0|bsm_do_an_var(V, Cs)];
-		true ->
-		    bsm_problem(C0, bin_opt_alias)
-	    end;
-        _ ->
-	    case bsm_could_match_binary(P) andalso bsm_is_var_used(V, G, B0) of
-		false ->
-		    [C0|bsm_do_an_var(V, Cs)];
-		true ->
-		    bsm_problem(C0, bin_var_used)
-	    end
-    end;
-bsm_do_an_var(_, []) -> [].
-
-bsm_annotate_for_reuse(#c_var{anno=Anno}=Var) ->
-    Var#c_var{anno=[reuse_for_context|Anno]}.
-
-bsm_is_var_used(V, G, B) ->
-    core_lib:is_var_used(V, G) orelse core_lib:is_var_used(V, B).
-
-bsm_maybe_ctx_to_binary(V, B) ->
-    case core_lib:is_var_used(V, B) andalso not previous_ctx_to_binary(V, B) of
-	false ->
-	    B;
-	true ->
-	    #c_seq{arg=#c_primop{name=#c_literal{val=bs_context_to_binary},
-				 args=[#c_var{name=V}]},
-		   body=B}
-    end.
-
-previous_ctx_to_binary(V, Core) ->
-    case Core of
-	#c_seq{arg=#c_primop{name=#c_literal{val=bs_context_to_binary},
-			     args=[#c_var{name=V}]}} ->
-	    true;
-	_ ->
-	    false
-    end.
-
 %% bsm_leftmost(Cs) -> none | ArgumentNumber
 %%  Find the leftmost argument that matches a nonempty binary.
 %%  Return either 'none' or the argument number (1-N).
@@ -262,94 +91,3 @@ 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_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:
-%%
-%%             foo(<<...>>) -> ...
-%%             foo(<Variable>) when ... -> ...
-%%             foo(<Non-variable pattern>) ->
-%%
-%%  If there is such partition, we reject the optimization.
-
-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], State0) ->
-    State = bsm_ensure_no_partition_2(Ps, G, State0),
-    case State of
-	'after' ->
-	    bsm_ensure_no_partition_after(Cs);
-	_ ->
-	    ok
-    end,
-    bsm_ensure_no_partition_1(Cs, State);
-bsm_ensure_no_partition_1([], _) -> ok.
-
-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], N, State);
-bsm_ensure_no_partition_2([_|_], _, before=State) ->
-    %% No binary matching yet - therefore no partition.
-    State;
-bsm_ensure_no_partition_2([P|_], _, State) ->
-    case bsm_could_match_binary(P) of
-	false ->
-            State;
-	true ->
-	    %% The pattern P *may* match a binary, so we must update the state.
-	    %% (P must be a variable.)
-            'after'
-    end.
-
-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_could_match_binary(#c_alias{pat=P}) -> bsm_could_match_binary(P);
-bsm_could_match_binary(#c_cons{}) -> false;
-bsm_could_match_binary(#c_tuple{}) -> false;
-bsm_could_match_binary(#c_literal{val=Lit}) -> is_bitstring(Lit);
-bsm_could_match_binary(_) -> true.
-
-bsm_real_pattern(#c_alias{pat=P}) -> bsm_real_pattern(P);
-bsm_real_pattern(P) -> P.
-
-bsm_problem(Where, What) ->
-    throw({problem,Where,What}).
-
-make_warning(Core, Term) ->
-    case should_suppress_warning(Core) of
-	true ->
-	    ok;
-	false ->
-            Anno = cerl:get_ann(Core),
-            Line = get_line(Anno),
-            File = get_file(Anno),
-            {File,[{Line,?MODULE,Term}]}
-    end.
-
-should_suppress_warning(Core) ->
-    Ann = cerl:get_ann(Core),
-    member(compiler_generated, Ann).
-
-get_line([Line|_]) when is_integer(Line) -> Line;
-get_line([_|T]) -> get_line(T);
-get_line([]) -> none.
-
-get_file([{file,File}|_]) -> File;
-get_file([_|T]) -> get_file(T);
-get_file([]) -> "no_file". % should not happen
diff --git a/lib/compiler/src/sys_core_dsetel.erl b/lib/compiler/src/sys_core_dsetel.erl
deleted file mode 100644
index 9ab83c210f..0000000000
--- a/lib/compiler/src/sys_core_dsetel.erl
+++ /dev/null
@@ -1,360 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2002-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%
-%%
-%% Purpose : Using dsetelement to make multiple-field record updates
-%% faster.
-
-%% The expansion of record field updates, when more than one field is
-%% updated, but not a majority of the fields, will create a sequence of
-%% calls to 'erlang:setelement(Index, Value, Tuple)' where Tuple in the
-%% first call is the original record tuple, and in the subsequent calls
-%% Tuple is the result of the previous call. Furthermore, all Index
-%% values are constant positive integers, and the first call to
-%% 'setelement' will have the greatest index. Thus all the following
-%% calls do not actually need to test at run-time whether Tuple has type
-%% tuple, nor that the index is within the tuple bounds.
-%%
-%% Since this introduces destructive updates in the Core Erlang code, it
-%% must be done as a last stage before going to lower-level code.
-%%
-%% NOTE: Because there are currently no write barriers in the system,
-%% this kind of optimization can only be done when we are sure that
-%% garbage collection will not be triggered between the creation of the
-%% tuple and the destructive updates - otherwise we might insert
-%% pointers from an older generation to a newer.
-%%
-%% The rewriting is done as follows:
-%%
-%%    let X1 = call 'erlang':'setelement(5, Tuple, Value1)
-%%    in call 'erlang':'setelement(3, X1, Value2)
-%%  =>
-%%    let X1 = call 'erlang':'setelement(5, Tuple, Value1)
-%%    in do primop dsetelement(3, X1, Value2)
-%%       X1
-%% and
-%%    let X1 = call 'erlang':'setelement(5, Tuple, Value1)
-%%    in let X2 = call 'erlang':'setelement(3, X1, Value2)
-%%    in ...
-%%  =>
-%%    let X2 = call 'erlang':'setelement(5, Tuple, Value1)
-%%    in do primop 'dsetelement(3, X2, Value2)
-%%       ...
-%% if X1 is used exactly once.
-%% Thus, we need to track variable usage.
-%%
-
--module(sys_core_dsetel).
-
--export([module/2]).
-
--include("core_parse.hrl").
-
--spec module(cerl:c_module(), [compile:option()]) -> {'ok', cerl:c_module()}.
-
-module(M0, _Options) ->
-    M = visit_module(M0),
-    {ok,M}.
-
-visit_module(#c_module{defs=Ds0}=R) ->
-    Env = #{},
-    Ds = visit_module_1(Ds0, Env, []),
-    R#c_module{defs=Ds}.
-
-visit_module_1([{Name,F0}|Fs], Env, Acc) ->
-    try visit(Env, F0) of
-	{F,_} ->
-	    visit_module_1(Fs, Env, [{Name,F}|Acc])
-    catch
-        Class:Error:Stack ->
-	    #c_var{name={Func,Arity}} = Name,
-	    io:fwrite("Function: ~w/~w\n", [Func,Arity]),
-	    erlang:raise(Class, Error, Stack)
-    end;
-visit_module_1([], _, Acc) ->
-    lists:reverse(Acc).
-
-visit(Env, #c_var{name={_,_}}=R) ->
-    %% Ignore local function name.
-    {R, Env};
-visit(Env0, #c_var{name=X}=R) ->
-    %% There should not be any free variables. If there are,
-    %% the case will fail with an exception.
-    case Env0 of
-	#{X:=N} ->
-	    {R, Env0#{X:=N+1}}
-    end;
-visit(Env, #c_literal{}=R) ->
-    {R, Env};
-visit(Env0, #c_tuple{es=Es0}=R) ->
-    {Es1,Env1} = visit_list(Env0, Es0),
-    {R#c_tuple{es=Es1}, Env1};
-visit(Env0, #c_map{es=Es0}=R) ->
-    {Es1,Env1} = visit_list(Env0, Es0),
-    {R#c_map{es=Es1}, Env1};
-visit(Env0, #c_map_pair{key=K0,val=V0}=R) ->
-    {K,Env1} = visit(Env0, K0),
-    {V,Env2} = visit(Env1, V0),
-    {R#c_map_pair{key=K,val=V}, Env2};
-visit(Env0, #c_cons{hd=H0,tl=T0}=R) ->
-    {H1,Env1} = visit(Env0, H0),
-    {T1,Env2} = visit(Env1, T0),
-    {R#c_cons{hd=H1,tl=T1}, Env2};
-visit(Env0, #c_binary{segments=Segs}=R) ->
-    Env = visit_bin_segs(Env0, Segs),
-    {R, Env};
-visit(Env0, #c_values{es=Es0}=R) ->
-    {Es1,Env1} = visit_list(Env0, Es0),
-    {R#c_values{es=Es1}, Env1};
-visit(Env0, #c_fun{vars=Vs, body=B0}=R) ->
-    {Xs, Env1} = bind_vars(Vs, Env0),
-    {B1,Env2} = visit(Env1, B0),
-    {R#c_fun{body=B1}, restore_vars(Xs, Env0, Env2)};
-visit(Env0, #c_let{vars=Vs, arg=A0, body=B0}=R) ->
-    {A1,Env1} = visit(Env0, A0),
-    {Xs,Env2} = bind_vars(Vs, Env1),
-    {B1,Env3} = visit(Env2, B0),
-    rewrite(R#c_let{arg=A1,body=B1}, Env3, restore_vars(Xs, Env1, Env3));
-visit(Env0, #c_seq{arg=A0, body=B0}=R) ->
-    {A1,Env1} = visit(Env0, A0),
-    {B1,Env2} = visit(Env1, B0),
-    {R#c_seq{arg=A1,body=B1}, Env2};
-visit(Env0, #c_case{arg=A0,clauses=Cs0}=R) ->
-    {A1,Env1} = visit(Env0, A0),
-    {Cs1,Env2} = visit_list(Env1, Cs0),
-    {R#c_case{arg=A1,clauses=Cs1}, Env2};
-visit(Env0, #c_clause{pats=Ps,guard=G0,body=B0}=R) ->
-    {Vs, Env1} = visit_pats(Ps, Env0),
-    {G1,Env2} = visit(Env1, G0),
-    {B1,Env3} = visit(Env2, B0),
-    {R#c_clause{guard=G1,body=B1}, restore_vars(Vs, Env0, Env3)};
-visit(Env0, #c_receive{clauses=Cs0,timeout=T0,action=A0}=R) ->
-    {T1,Env1} = visit(Env0, T0),
-    {Cs1,Env2} = visit_list(Env1, Cs0),
-    {A1,Env3} = visit(Env2, A0),
-    {R#c_receive{clauses=Cs1,timeout=T1,action=A1}, Env3};
-visit(Env0, #c_apply{op=Op0, args=As0}=R) ->
-    {Op1,Env1} = visit(Env0, Op0),
-    {As1,Env2} = visit_list(Env1, As0),
-    {R#c_apply{op=Op1,args=As1}, Env2};
-visit(Env0, #c_call{module=M0,name=N0,args=As0}=R) ->
-    {M1,Env1} = visit(Env0, M0),
-    {N1,Env2} = visit(Env1, N0),
-    {As1,Env3} = visit_list(Env2, As0),
-    {R#c_call{module=M1,name=N1,args=As1}, Env3};
-visit(Env0, #c_primop{name=N0, args=As0}=R) ->
-    {N1,Env1} = visit(Env0, N0),
-    {As1,Env2} = visit_list(Env1, As0),
-    {R#c_primop{name=N1,args=As1}, Env2};
-visit(Env0, #c_try{arg=E0, vars=Vs, body=B0, evars=Evs, handler=H0}=R) ->
-    {E1,Env1} = visit(Env0, E0),
-    {Xs, Env2} = bind_vars(Vs, Env1),
-    {B1,Env3} = visit(Env2, B0),
-    Env4 = restore_vars(Xs, Env1, Env3),
-    {Ys, Env5} = bind_vars(Evs, Env4),
-    {H1,Env6} = visit(Env5, H0),
-    {R#c_try{arg=E1,body=B1,handler=H1}, restore_vars(Ys, Env4, Env6)};
-visit(Env0, #c_catch{body=B0}=R) ->
-    {B1,Env1} = visit(Env0, B0),
-    {R#c_catch{body=B1}, Env1};
-visit(Env0, #c_letrec{defs=Ds0,body=B0}=R) ->
-    {Xs, Env1} = bind_vars([V || {V,_} <- Ds0], Env0),
-    {Ds1,Env2} = visit_def_list(Env1, Ds0),
-    {B1,Env3} = visit(Env2, B0),
-    {R#c_letrec{defs=Ds1,body=B1}, restore_vars(Xs, Env0, Env3)}.
-%% The following general code for handling modules is slow if a module
-%% contains very many functions. There is special code in visit_module/1
-%% which is much faster.
-%% visit(Env0, #c_module{defs=D0}=R) ->
-%%     {R1,Env1} = visit(Env0, #c_letrec{defs=D0,body=#c_nil{}}),
-%%     {R#c_module{defs=R1#c_letrec.defs}, Env1};
-
-visit_list(Env, L) ->
-    lists:mapfoldl(fun (E, A) -> visit(A, E) end, Env, L).
-
-visit_def_list(Env, L) ->
-    lists:mapfoldl(fun ({Name,V0}, E0) ->
-			   {V1,E1} = visit(E0, V0),
-			   {{Name,V1}, E1}
-		   end, Env, L).
-
-visit_bin_segs(Env, Segs) ->
-    lists:foldl(fun (#c_bitstr{val=Val,size=Sz}, E0) ->
-			{_, E1} = visit(E0, Val),
-			{_, E2} = visit(E1, Sz),
-			E2
-		end, Env, Segs).
-    
-bind_vars(Vs, Env) ->
-    bind_vars(Vs, Env, []).
-
-bind_vars([#c_var{name=X}|Vs], Env0, Xs)->
-    bind_vars(Vs, Env0#{X=>0}, [X|Xs]);
-bind_vars([], Env,Xs) ->
-    {Xs, Env}.
-
-visit_pats(Ps, Env) ->
-    visit_pats(Ps, Env, []).
-
-visit_pats([P|Ps], Env0, Vs0) ->
-    {Vs1, Env1} = visit_pat(Env0, P, Vs0),
-    visit_pats(Ps, Env1, Vs1);
-visit_pats([], Env, Vs) ->
-    {Vs, Env}.
-
-visit_pat(Env0, #c_var{name=V}, Vs) ->
-    {[V|Vs], Env0#{V=>0}};
-visit_pat(Env0, #c_tuple{es=Es}, Vs) ->
-    visit_pats(Es, Env0, Vs);
-visit_pat(Env0, #c_map{es=Es}, Vs) ->
-    visit_pats(Es, Env0, Vs);
-visit_pat(Env0, #c_map_pair{op=#c_literal{val=exact},key=V,val=K}, Vs0) ->
-    {Vs1, Env1} = visit_pat(Env0, V, Vs0),
-    visit_pat(Env1, K, Vs1);
-visit_pat(Env0, #c_cons{hd=H,tl=T}, Vs0) ->
-    {Vs1, Env1} = visit_pat(Env0, H, Vs0),
-    visit_pat(Env1, T, Vs1);
-visit_pat(Env0, #c_binary{segments=Segs}, Vs) ->
-    visit_pats(Segs, Env0, Vs);
-visit_pat(Env0, #c_bitstr{val=Val,size=Sz}, Vs0) ->
-    {Vs1, Env1} =
-	case Sz of
-	    #c_var{name=V} ->
-		%% We don't tolerate free variables.
-		case Env0 of
-		    #{V:=N} ->
-			{Vs0, Env0#{V:=N+1}}
-		end;
-	    _ ->
-		visit_pat(Env0, Sz, Vs0)
-	end,
-    visit_pat(Env1, Val, Vs1);
-visit_pat(Env0, #c_alias{pat=P,var=#c_var{name=V}}, Vs) ->
-    visit_pat(Env0#{V=>0}, P, [V|Vs]);
-visit_pat(Env, #c_literal{}, Vs) ->
-    {Vs, Env}.
-
-restore_vars([V|Vs], Env0, Env1) ->
-    case Env0 of
-	#{V:=N} ->
-	    restore_vars(Vs, Env0, Env1#{V=>N});
-	_ ->
-	    restore_vars(Vs, Env0, maps:remove(V, Env1))
-    end;
-restore_vars([], _, Env1) ->
-    Env1.
-
-
-%%    let X1 = call 'erlang':'setelement(5, Tuple, Value1)
-%%    in call 'erlang':'setelement(3, X1, Value2)
-%%  =>
-%%    let X1 = call 'erlang':'setelement(5, Tuple, Value1)
-%%    in do primop dsetelement(3, X1, Value2)
-%%       X1
-
-rewrite(#c_let{vars=[#c_var{name=X}=V]=Vs,
-	       arg=#c_call{module=#c_literal{val='erlang'},
-			   name=#c_literal{val='setelement'},
-			   args=[#c_literal{val=Index1}, _Tuple, _Val1]
-			  }=A,
- 	       body=#c_call{anno=Banno,module=#c_literal{val='erlang'},
- 			    name=#c_literal{val='setelement'},
-  			    args=[#c_literal{val=Index2},
-				  #c_var{name=X},
-				  Val2]
-  			   }
-	      }=R,
-	_BodyEnv, FinalEnv)
-  when is_integer(Index1), is_integer(Index2), Index2 > 0, Index1 > Index2 ->
-    case is_safe(Val2) of
-	true ->
-	    {R#c_let{vars=Vs,
-		     arg=A,
-		     body=#c_seq{arg=#c_primop{
-				   anno=Banno,
-				   name=#c_literal{val='dsetelement'},
-				   args=[#c_literal{val=Index2},
-					 V,
-					 Val2]},
-				 body=V}
-		    },
-	     FinalEnv};
-	false ->
-	    {R, FinalEnv}
-    end;
-
-%%    let X1 = call 'erlang':'setelement(5, Tuple, Value1)
-%%    in let X2 = 'erlang':'setelement(3, X1, Value2)
-%%    in ...
-%%  =>
-%%    let X2 = call 'erlang':'setelement(5, Tuple, Value1)
-%%    in do primop dsetelement(3, X2, Value2)
-%%       ...
-%% if X1 is used exactly once.
-
-rewrite(#c_let{vars=[#c_var{name=X1}],
-	       arg=#c_call{module=#c_literal{val='erlang'},
-			   name=#c_literal{val='setelement'},
-			   args=[#c_literal{val=Index1}, _Tuple, _Val1]
-			  }=A,
-	       body=#c_let{vars=[#c_var{}=V]=Vs,
-			   arg=#c_call{anno=Banno,
-				       module=#c_literal{val='erlang'},
-				       name=#c_literal{val='setelement'},
-				       args=[#c_literal{val=Index2},
-					     #c_var{name=X1},
-					     Val2]},
-			   body=B}
-	      }=R,
-	BodyEnv, FinalEnv)
-  when is_integer(Index1), is_integer(Index2), Index2 > 0, Index1 > Index2 ->
-    case is_single_use(X1, BodyEnv) andalso is_safe(Val2) of
-	true ->
-	    {R#c_let{vars=Vs,
-		     arg=A,
-		     body=#c_seq{arg=#c_primop{
-				   anno=Banno,
-				   name=#c_literal{val='dsetelement'},
-				   args=[#c_literal{val=Index2},
-					 V,
-					 Val2]},
-				 body=B}
-		    },
-	     FinalEnv};
-	false ->
-	    {R, FinalEnv}
-    end;
-
-rewrite(R, _, FinalEnv) ->
-    {R, FinalEnv}.
-
-%% is_safe(CoreExpr) -> true|false
-%%  Determines whether the Core expression can cause a GC collection at run-time.
-%%  Note: Assumes that the constant pool is turned on.
-
-is_safe(#c_var{}) -> true;
-is_safe(#c_literal{}) -> true;
-is_safe(_) -> false.
-
-is_single_use(V, Env) ->
-    case Env of
-	#{V:=1} ->
-	    true;
-	_ ->
-	    false
-    end.
diff --git a/lib/compiler/src/sys_core_fold.erl b/lib/compiler/src/sys_core_fold.erl
index 1681d97efb..4939a94a92 100644
--- a/lib/compiler/src/sys_core_fold.erl
+++ b/lib/compiler/src/sys_core_fold.erl
@@ -99,7 +99,7 @@
               t=#{} :: map(),                       %Types
               in_guard=false}).                     %In guard or not.
 
--type type_info() :: cerl:cerl() | 'bool' | 'integer'.
+-type type_info() :: cerl:cerl() | 'bool' | 'integer' | {'fun', pos_integer()}.
 -type yes_no_maybe() :: 'yes' | 'no' | 'maybe'.
 -type sub() :: #sub{}.
 
@@ -478,9 +478,20 @@ expr(#c_try{anno=A,arg=E0,vars=Vs0,body=B0,evars=Evs0,handler=H0}=Try, _, Sub0)
 	false ->
 	    {Evs1,Sub2} = var_list(Evs0, Sub0),
 	    H1 = body(H0, value, Sub2),
-	    Try#c_try{arg=E1,vars=Vs1,body=B1,evars=Evs1,handler=H1}
+	    H2 = opt_try_handler(H1, lists:last(Evs1)),
+	    Try#c_try{arg=E1,vars=Vs1,body=B1,evars=Evs1,handler=H2}
     end.
 
+%% Attempts to convert old erlang:get_stacktrace/0 calls into the new
+%% three-argument catch, with possibility of further optimisations.
+opt_try_handler(#c_call{anno=A,module=#c_literal{val=erlang},name=#c_literal{val=get_stacktrace},args=[]}, Var) ->
+    #c_primop{anno=A,name=#c_literal{val=build_stacktrace},args=[Var]};
+opt_try_handler(#c_case{clauses=Cs0} = Case, Var) ->
+    Cs = [C#c_clause{body=opt_try_handler(B, Var)} || #c_clause{body=B} = C <- Cs0],
+    Case#c_case{clauses=Cs};
+opt_try_handler(#c_let{arg=Arg} = Let, Var) ->
+    Let#c_let{arg=opt_try_handler(Arg, Var)};
+opt_try_handler(X, _) -> X.
 
 %% If a fun or its application is used as an argument, then it's unsafe to
 %% handle it in effect context as the side-effects may rely on its return
@@ -561,6 +572,7 @@ ifes_list(FVar, [E|Es], Safe) ->
 ifes_list(_FVar, [], _Safe) ->
     true.
 
+
 expr_list(Es, Ctxt, Sub) ->
     [expr(E, Ctxt, Sub) || E <- Es].
 
@@ -949,18 +961,16 @@ fold_lit_args(Call, Module, Name, Args0) ->
 %%
 fold_non_lit_args(Call, erlang, is_boolean, [Arg], Sub) ->
     eval_is_boolean(Call, Arg, Sub);
-fold_non_lit_args(Call, erlang, element, [Arg1,Arg2], Sub) ->
-    eval_element(Call, Arg1, Arg2, Sub);
 fold_non_lit_args(Call, erlang, length, [Arg], _) ->
     eval_length(Call, Arg);
 fold_non_lit_args(Call, erlang, '++', [Arg1,Arg2], _) ->
     eval_append(Call, Arg1, Arg2);
 fold_non_lit_args(Call, lists, append, [Arg1,Arg2], _) ->
     eval_append(Call, Arg1, Arg2);
-fold_non_lit_args(Call, erlang, setelement, [Arg1,Arg2,Arg3], _) ->
-    eval_setelement(Call, Arg1, Arg2, Arg3);
-fold_non_lit_args(Call, erlang, is_record, [Arg1,Arg2,Arg3], Sub) ->
-    eval_is_record(Call, Arg1, Arg2, Arg3, Sub);
+fold_non_lit_args(Call, erlang, is_function, [Arg1], Sub) ->
+    eval_is_function_1(Call, Arg1, Sub);
+fold_non_lit_args(Call, erlang, is_function, [Arg1,Arg2], Sub) ->
+    eval_is_function_2(Call, Arg1, Arg2, Sub);
 fold_non_lit_args(Call, erlang, N, Args, Sub) ->
     NumArgs = length(Args),
     case erl_internal:comp_op(N, NumArgs) of
@@ -976,6 +986,22 @@ fold_non_lit_args(Call, erlang, N, Args, Sub) ->
     end;
 fold_non_lit_args(Call, _, _, _, _) -> Call.
 
+eval_is_function_1(Call, Arg1, Sub) ->
+    case get_type(Arg1, Sub) of
+        none -> Call;
+        {'fun',_} -> #c_literal{anno=cerl:get_ann(Call),val=true};
+        _ -> #c_literal{anno=cerl:get_ann(Call),val=false}
+    end.
+
+eval_is_function_2(Call, Arg1, #c_literal{val=Arity}, Sub)
+  when is_integer(Arity), Arity > 0 ->
+    case get_type(Arg1, Sub) of
+        none -> Call;
+        {'fun',Arity} -> #c_literal{anno=cerl:get_ann(Call),val=true};
+        _ -> #c_literal{anno=cerl:get_ann(Call),val=false}
+    end;
+eval_is_function_2(Call, _Arg1, _Arg2, _Sub) -> Call.
+
 %% Evaluate a relational operation using type information.
 eval_rel_op(Call, Op, [#c_var{name=V},#c_var{name=V}], _) ->
     Bool = erlang:Op(same, same),
@@ -1109,96 +1135,6 @@ eval_append(Call, #c_cons{anno=Anno,hd=H,tl=T}, List) ->
 eval_append(Call, X, Y) ->
     Call#c_call{args=[X,Y]}.			%Rebuild call arguments.
 
-%% eval_element(Call, Pos, Tuple, Types) -> Val.
-%%  Evaluates element/2 if the position Pos is a literal and
-%%  the shape of the tuple Tuple is known.
-%%
-eval_element(Call, #c_literal{val=Pos}, Tuple, Types)
-  when is_integer(Pos) ->
-    case get_type(Tuple, Types) of
-	none ->
-	    Call;
-	Type ->
-	    Es = case cerl:is_c_tuple(Type) of
-		     false -> [];
-		     true -> cerl:tuple_es(Type)
-		 end,
-	    if
-		1 =< Pos, Pos =< length(Es) ->
-		    El = lists:nth(Pos, Es),
-		    try
-			cerl:set_ann(pat_to_expr(El), [compiler_generated])
-		    catch
-			throw:impossible ->
-			    Call
-		    end;
-		true ->
-		    %% Index outside tuple or not a tuple.
-		    eval_failure(Call, badarg)
-	    end
-    end;
-eval_element(Call, Pos, Tuple, Sub) ->
-    case is_int_type(Pos, Sub) =:= no orelse
-	is_tuple_type(Tuple, Sub) =:= no of
-	true ->
-	    eval_failure(Call, badarg);
-	false ->
-	    Call
-    end.
-
-%% eval_is_record(Call, Var, Tag, Size, Types) -> Val.
-%%  Evaluates is_record/3 using type information.
-%%
-eval_is_record(Call, Term, #c_literal{val=NeededTag},
-	       #c_literal{val=Size}, Types) ->
-    case get_type(Term, Types) of
-	none ->
-	    Call;
-	Type ->
-	    Es = case cerl:is_c_tuple(Type) of
-		     false -> [];
-		     true -> cerl:tuple_es(Type)
-		 end,
-	    case Es of
-		[#c_literal{val=Tag}|_] ->
-		    Bool = Tag =:= NeededTag andalso
-			length(Es) =:= Size,
-		    #c_literal{val=Bool};
-		_ ->
-		    #c_literal{val=false}
-	    end
-    end;
-eval_is_record(Call, _, _, _, _) -> Call.
-
-%% eval_setelement(Call, Pos, Tuple, NewVal) -> Core.
-%%  Evaluates setelement/3 if position Pos is an integer
-%%  and the shape of the tuple Tuple is known.
-%%
-eval_setelement(Call, #c_literal{val=Pos}, Tuple, NewVal)
-  when is_integer(Pos) ->
-    case cerl:is_data(Tuple) of
-	false ->
-	    Call;
-	true ->
-	    Es0 = case cerl:is_c_tuple(Tuple) of
-		      false -> [];
-		      true -> cerl:tuple_es(Tuple)
-		  end,
-	    if
-		1 =< Pos, Pos =< length(Es0) ->
-		    Es = eval_setelement_1(Pos, Es0, NewVal),
-		    cerl:update_c_tuple(Tuple, Es);
-		true ->
-		    eval_failure(Call, badarg)
-	    end
-    end;
-eval_setelement(Call, _, _, _) -> Call.
-
-eval_setelement_1(1, [_|T], NewVal) ->
-    [NewVal|T];
-eval_setelement_1(Pos, [H|T], NewVal) when Pos > 1 ->
-    [H|eval_setelement_1(Pos-1, T, NewVal)].
-
 %% eval_failure(Call, Reason) -> Core.
 %%  Warn for a call that will fail and replace the call with
 %%  a call to erlang:error(Reason).
@@ -1258,16 +1194,15 @@ clause(#c_clause{pats=Ps0}=Cl, Cexpr, Ctxt, Sub0) ->
     end.
 
 clause_1(#c_clause{guard=G0,body=B0}=Cl, Ps1, Cexpr, Ctxt, Sub1) ->
-    Sub2 = update_types(Cexpr, Ps1, Sub1),
     GSub = case {Cexpr,Ps1,G0} of
 	       {_,_,#c_literal{}} ->
 		   %% No need for substitution tricks when the guard
 		   %% does not contain any variables.
-		   Sub2;
+		   Sub1;
 	       {#c_var{name='_'},_,_} ->
 		   %% In a 'receive', Cexpr is the variable '_', which represents the
 		   %% message being matched. We must NOT do any extra substiutions.
-		   Sub2;
+		   Sub1;
 	       {#c_var{},[#c_var{}=Var],_} ->
 		   %% The idea here is to optimize expressions such as
 		   %%
@@ -1289,16 +1224,16 @@ clause_1(#c_clause{guard=G0,body=B0}=Cl, Ps1, Cexpr, Ctxt, Sub1) ->
 		   %%
 		   case cerl:is_c_fname(Cexpr) of
 		       false ->
-			   sub_set_var(Var, Cexpr, Sub2);
+			   sub_set_var(Var, Cexpr, Sub1);
 		       true ->
 			   %% We must not copy funs, and especially not into guards.
-			   Sub2
+			   Sub1
 		   end;
 	       _ ->
-		   Sub2
+		   Sub1
 	   end,
     G1 = guard(G0, GSub),
-    B1 = body(B0, Ctxt, Sub2),
+    B1 = body(B0, Ctxt, Sub1),
     Cl#c_clause{pats=Ps1,guard=G1,body=B1}.
 
 %% let_substs(LetVars, LetArg, Sub) -> {[Var],[Val],Sub}.
@@ -1382,8 +1317,7 @@ pattern(#c_binary{segments=V0}=Pat, Isub, Osub0) ->
     {Pat#c_binary{segments=V1},Osub1};
 pattern(#c_alias{var=V0,pat=P0}=Pat, Isub, Osub0) ->
     {V1,Osub1} = pattern(V0, Isub, Osub0),
-    {P1,Osub2} = pattern(P0, Isub, Osub1),
-    Osub = update_types(V1, [P1], Osub2),
+    {P1,Osub} = pattern(P0, Isub, Osub1),
     {Pat#c_alias{var=V1,pat=P1},Osub}.
 
 map_pair_pattern_list(Ps0, Isub, Osub0) ->
@@ -2063,58 +1997,22 @@ case_opt_compiler_generated(Core) ->
 
 
 %% case_expand_var(Expr0, Sub) -> Expr
-%%  If Expr0 is a variable that has been previously matched and
-%%  is known to be a tuple, return the tuple instead. Otherwise
+%%  If Expr0 is a variable that is known to be bound to a
+%%  constructed tuple, return the tuple instead. Otherwise
 %%  return Expr0 unchanged.
-%%
+
 case_expand_var(E, #sub{t=Tdb}) ->
     Key = cerl:var_name(E),
     case Tdb of
-        #{Key:=T0} ->
-	    case cerl:is_c_tuple(T0) of
-		false ->
-		    E;
-		true ->
-		    %% The pattern was a tuple. Now we must make sure
-		    %% that the elements of the tuple are suitable. In
-		    %% particular, we don't want binary or map
-		    %% construction here, since that means that the
-		    %% binary or map will be constructed in the 'case'
-		    %% argument. That is wasteful for binaries. Even
-		    %% worse is that any map pattern that use the ':='
-		    %% operator will fail when used in map
-		    %% construction (only the '=>' operator is allowed
-		    %% when constructing a map from scratch).
-		    try
-			cerl_trees:map(fun coerce_to_data/1, T0)
-		    catch
-			throw:impossible ->
-			    %% Something unsuitable was found (map or
-			    %% or binary). Keep the variable.
-			    E
-		    end
+        #{Key:=T} ->
+	    case cerl:is_c_tuple(T) of
+		false -> E;
+		true -> T
 	    end;
         _ ->
 	    E
     end.
 
-%% coerce_to_data(Core) -> Core'
-%%  Coerce an element originally from a pattern to an data item or or
-%%  variable. Throw an 'impossible' exception if non-data Core Erlang
-%%  terms such as binary construction or map construction are
-%%  encountered.
-
-coerce_to_data(C) ->
-    case cerl:is_c_alias(C) of
-	false ->
-	    case cerl:is_data(C) orelse cerl:is_c_var(C) of
-		true -> C;
-		false -> throw(impossible)
-	    end;
-	true ->
-	    coerce_to_data(cerl:alias_pat(C))
-    end.
-
 %% case_opt_nomatch(E, Clauses, LitExpr) -> Clauses'
 %%  Remove all clauses that cannot possibly match.
 
@@ -3108,14 +3006,6 @@ is_int_type(Var, Sub) ->
 	C -> yes_no(cerl:is_c_int(C))
     end.
 
--spec is_tuple_type(cerl:cerl(), sub()) -> yes_no_maybe().
-
-is_tuple_type(Var, Sub) ->
-    case get_type(Var, Sub) of
-	none -> maybe;
-	C -> yes_no(cerl:is_c_tuple(C))
-    end.
-
 yes_no(true) -> yes;
 yes_no(false) -> no.
 
@@ -3177,23 +3067,23 @@ returns_integer(_, _) -> false.
 %% update_types(Expr, Pattern, Sub) -> Sub'
 %%  Update the type database.
 
--spec update_types(cerl:cerl(), [type_info()], sub()) -> sub().
+-spec update_types(cerl:c_var(), [type_info()], sub()) -> sub().
 
-update_types(Expr, Pat, #sub{t=Tdb0}=Sub) ->
-    Tdb = update_types_1(Expr, Pat, Tdb0),
+update_types(#c_var{name=V}, Pat, #sub{t=Tdb0}=Sub) ->
+    Tdb = update_types_1(V, Pat, Tdb0),
     Sub#sub{t=Tdb}.
 
-update_types_1(#c_var{name=V}, Pat, Types) ->
-    update_types_2(V, Pat, Types);
-update_types_1(_, _, Types) -> Types.
-
-update_types_2(V, [#c_tuple{}=P], Types) ->
+update_types_1(V, [#c_tuple{}=P], Types) ->
     Types#{V=>P};
-update_types_2(V, [#c_literal{val=Bool}], Types) when is_boolean(Bool) ->
+update_types_1(V, [#c_literal{val=Bool}], Types) when is_boolean(Bool) ->
     Types#{V=>bool};
-update_types_2(V, [Type], Types) when is_atom(Type) ->
+update_types_1(V, [#c_fun{vars=Vars}], Types) ->
+    Types#{V=>{'fun',length(Vars)}};
+update_types_1(V, [#c_var{name={_,Arity}}], Types) ->
+    Types#{V=>{'fun',Arity}};
+update_types_1(V, [Type], Types) when is_atom(Type) ->
     Types#{V=>Type};
-update_types_2(_, _, Types) -> Types.
+update_types_1(_, _, Types) -> Types.
 
 %% kill_types(V, Tdb) -> Tdb'
 %%  Kill any entries that references the variable,
@@ -3209,6 +3099,8 @@ kill_types2(V, [{_,#c_tuple{}=Tuple}=Entry|Tdb]) ->
 	false -> [Entry|kill_types2(V, Tdb)];
 	true -> kill_types2(V, Tdb)
     end;
+kill_types2(V, [{_, {'fun',_}}=Entry|Tdb]) ->
+    [Entry|kill_types2(V, Tdb)];
 kill_types2(V, [{_,Atom}=Entry|Tdb]) when is_atom(Atom) ->
     [Entry|kill_types2(V, Tdb)];
 kill_types2(_, []) -> [].
diff --git a/lib/compiler/src/sys_core_fold_lists.erl b/lib/compiler/src/sys_core_fold_lists.erl
index 9867fab46a..e93b435011 100644
--- a/lib/compiler/src/sys_core_fold_lists.erl
+++ b/lib/compiler/src/sys_core_fold_lists.erl
@@ -37,22 +37,27 @@ call(#c_call{anno=Anno}, lists, all, [Arg1,Arg2]) ->
     Xs = #c_var{name='Xs'},
     X = #c_var{name='X'},
     Err1 = #c_tuple{es=[#c_literal{val='case_clause'}, X]},
-    CC1 = #c_clause{pats=[#c_literal{val=true}], guard=#c_literal{val=true},
+    CC1 = #c_clause{anno=Anno,
+                    pats=[#c_literal{val=true}], guard=#c_literal{val=true},
 		    body=#c_apply{anno=Anno, op=Loop, args=[Xs]}},
-    CC2 = #c_clause{pats=[#c_literal{val=false}], guard=#c_literal{val=true},
+    CC2 = #c_clause{anno=Anno,
+                    pats=[#c_literal{val=false}], guard=#c_literal{val=true},
 		    body=#c_literal{val=false}},
-    CC3 = #c_clause{pats=[X], guard=#c_literal{val=true},
+    CC3 = #c_clause{anno=Anno,
+                    pats=[X], guard=#c_literal{val=true},
 		    body=match_fail(Anno, Err1)},
-    C1 = #c_clause{pats=[#c_cons{hd=X, tl=Xs}], guard=#c_literal{val=true},
+    C1 = #c_clause{anno=Anno,
+                   pats=[#c_cons{hd=X, tl=Xs}], guard=#c_literal{val=true},
 		   body=#c_case{arg=#c_apply{anno=Anno, op=F, args=[X]},
 				clauses = [CC1, CC2, CC3]}},
-    C2 = #c_clause{pats=[#c_literal{val=[]}],
+    C2 = #c_clause{anno=Anno,
+                   pats=[#c_literal{val=[]}],
 		   guard=#c_call{module=#c_literal{val=erlang},
 				 name=#c_literal{val=is_function},
 				 args=[F, #c_literal{val=1}]},
 		   body=#c_literal{val=true}},
     Err2 = #c_tuple{es=[#c_literal{val='function_clause'}, F, Xs]},
-    C3 = #c_clause{pats=[Xs], guard=#c_literal{val=true},
+    C3 = #c_clause{anno=Anno, pats=[Xs], guard=#c_literal{val=true},
 		   body=match_fail([{function_name,{'lists^all',1}}|Anno], Err2)},
     Fun = #c_fun{vars=[Xs],
 		 body=#c_case{arg=Xs, clauses=[C1, C2, C3]}},
@@ -66,16 +71,21 @@ call(#c_call{anno=Anno}, lists, any, [Arg1,Arg2]) ->
     Xs = #c_var{name='Xs'},
     X = #c_var{name='X'},
     Err1 = #c_tuple{es=[#c_literal{val='case_clause'}, X]},
-    CC1 = #c_clause{pats=[#c_literal{val=true}], guard=#c_literal{val=true},
+    CC1 = #c_clause{anno=Anno,
+                    pats=[#c_literal{val=true}], guard=#c_literal{val=true},
 		    body=#c_literal{val=true}},
-    CC2 = #c_clause{pats=[#c_literal{val=false}], guard=#c_literal{val=true},
+    CC2 = #c_clause{anno=Anno,
+                    pats=[#c_literal{val=false}], guard=#c_literal{val=true},
 		    body=#c_apply{anno=Anno, op=Loop, args=[Xs]}},
-    CC3 = #c_clause{pats=[X], guard=#c_literal{val=true},
+    CC3 = #c_clause{anno=Anno,
+                    pats=[X], guard=#c_literal{val=true},
 		    body=match_fail(Anno, Err1)},
-    C1 = #c_clause{pats=[#c_cons{hd=X, tl=Xs}], guard=#c_literal{val=true},
+    C1 = #c_clause{anno=Anno,
+                   pats=[#c_cons{hd=X, tl=Xs}], guard=#c_literal{val=true},
 		   body=#c_case{arg=#c_apply{anno=Anno, op=F, args=[X]},
 				clauses = [CC1, CC2, CC3]}},
-    C2 = #c_clause{pats=[#c_literal{val=[]}],
+    C2 = #c_clause{anno=Anno,
+                   pats=[#c_literal{val=[]}],
 		   guard=#c_call{module=#c_literal{val=erlang},
 				 name=#c_literal{val=is_function},
 				 args=[F, #c_literal{val=1}]},
@@ -94,16 +104,17 @@ call(#c_call{anno=Anno}, lists, foreach, [Arg1,Arg2]) ->
     F = #c_var{name='F'},
     Xs = #c_var{name='Xs'},
     X = #c_var{name='X'},
-    C1 = #c_clause{pats=[#c_cons{hd=X, tl=Xs}], guard=#c_literal{val=true},
+    C1 = #c_clause{anno=Anno,
+                   pats=[#c_cons{hd=X, tl=Xs}], guard=#c_literal{val=true},
 		   body=#c_seq{arg=#c_apply{anno=Anno, op=F, args=[X]},
 			       body=#c_apply{anno=Anno, op=Loop, args=[Xs]}}},
-    C2 = #c_clause{pats=[#c_literal{val=[]}],
+    C2 = #c_clause{anno=Anno, pats=[#c_literal{val=[]}],
 		   guard=#c_call{module=#c_literal{val=erlang},
 				 name=#c_literal{val=is_function},
 				 args=[F, #c_literal{val=1}]},
 		   body=#c_literal{val=ok}},
     Err = #c_tuple{es=[#c_literal{val='function_clause'}, F, Xs]},
-    C3 = #c_clause{pats=[Xs], guard=#c_literal{val=true},
+    C3 = #c_clause{anno=Anno, pats=[Xs], guard=#c_literal{val=true},
 		   body=match_fail([{function_name,{'lists^foreach',1}}|Anno], Err)},
     Fun = #c_fun{vars=[Xs],
 		 body=#c_case{arg=Xs, clauses=[C1, C2, C3]}},
@@ -117,7 +128,8 @@ call(#c_call{anno=Anno}, lists, map, [Arg1,Arg2]) ->
     Xs = #c_var{name='Xs'},
     X = #c_var{name='X'},
     H = #c_var{name='H'},
-    C1 = #c_clause{pats=[#c_cons{hd=X, tl=Xs}], guard=#c_literal{val=true},
+    C1 = #c_clause{anno=Anno,
+                   pats=[#c_cons{hd=X, tl=Xs}], guard=#c_literal{val=true},
 		   body=#c_let{vars=[H], arg=#c_apply{anno=Anno,
 						      op=F,
 						      args=[X]},
@@ -126,7 +138,7 @@ call(#c_call{anno=Anno}, lists, map, [Arg1,Arg2]) ->
 					    tl=#c_apply{anno=Anno,
 							op=Loop,
 							args=[Xs]}}}},
-    C2 = #c_clause{pats=[#c_literal{val=[]}],
+    C2 = #c_clause{anno=Anno, pats=[#c_literal{val=[]}],
 		   guard=#c_call{module=#c_literal{val=erlang},
 				 name=#c_literal{val=is_function},
 				 args=[F, #c_literal{val=1}]},
@@ -146,7 +158,8 @@ call(#c_call{anno=Anno}, lists, flatmap, [Arg1,Arg2]) ->
     Xs = #c_var{name='Xs'},
     X = #c_var{name='X'},
     H = #c_var{name='H'},
-    C1 = #c_clause{pats=[#c_cons{hd=X, tl=Xs}], guard=#c_literal{val=true},
+    C1 = #c_clause{anno=Anno,
+                   pats=[#c_cons{hd=X, tl=Xs}], guard=#c_literal{val=true},
 		   body=#c_let{vars=[H],
 			       arg=#c_apply{anno=Anno, op=F, args=[X]},
 			       body=#c_call{anno=[compiler_generated|Anno],
@@ -156,13 +169,13 @@ call(#c_call{anno=Anno}, lists, flatmap, [Arg1,Arg2]) ->
 						  #c_apply{anno=Anno,
 							   op=Loop,
 							   args=[Xs]}]}}},
-    C2 = #c_clause{pats=[#c_literal{val=[]}],
+    C2 = #c_clause{anno=Anno, pats=[#c_literal{val=[]}],
 		   guard=#c_call{module=#c_literal{val=erlang},
 				 name=#c_literal{val=is_function},
 				 args=[F, #c_literal{val=1}]},
 		   body=#c_literal{val=[]}},
     Err = #c_tuple{es=[#c_literal{val='function_clause'}, F, Xs]},
-    C3 = #c_clause{pats=[Xs], guard=#c_literal{val=true},
+    C3 = #c_clause{anno=Anno, pats=[Xs], guard=#c_literal{val=true},
 		   body=match_fail([{function_name,{'lists^flatmap',1}}|Anno], Err)},
     Fun = #c_fun{vars=[Xs],
 		 body=#c_case{arg=Xs, clauses=[C1, C2, C3]}},
@@ -177,11 +190,13 @@ call(#c_call{anno=Anno}, lists, filter, [Arg1,Arg2]) ->
     X = #c_var{name='X'},
     B = #c_var{name='B'},
     Err1 = #c_tuple{es=[#c_literal{val='case_clause'}, X]},
-    CC1 = #c_clause{pats=[#c_literal{val=true}], guard=#c_literal{val=true},
+    CC1 = #c_clause{anno=Anno,
+                    pats=[#c_literal{val=true}], guard=#c_literal{val=true},
 		    body=#c_cons{anno=[compiler_generated], hd=X, tl=Xs}},
-    CC2 = #c_clause{pats=[#c_literal{val=false}], guard=#c_literal{val=true},
+    CC2 = #c_clause{anno=Anno,
+                    pats=[#c_literal{val=false}], guard=#c_literal{val=true},
 		    body=Xs},
-    CC3 = #c_clause{pats=[X], guard=#c_literal{val=true},
+    CC3 = #c_clause{anno=Anno, pats=[X], guard=#c_literal{val=true},
 		    body=match_fail(Anno, Err1)},
     Case = #c_case{arg=B, clauses = [CC1, CC2, CC3]},
     C1 = #c_clause{pats=[#c_cons{hd=X, tl=Xs}], guard=#c_literal{val=true},
@@ -192,13 +207,15 @@ call(#c_call{anno=Anno}, lists, filter, [Arg1,Arg2]) ->
 							op=Loop,
 							args=[Xs]},
 					   body=Case}}},
-    C2 = #c_clause{pats=[#c_literal{val=[]}],
+    C2 = #c_clause{anno=Anno,
+                   pats=[#c_literal{val=[]}],
 		   guard=#c_call{module=#c_literal{val=erlang},
 				 name=#c_literal{val=is_function},
 				 args=[F, #c_literal{val=1}]},
 		   body=#c_literal{val=[]}},
     Err2 = #c_tuple{es=[#c_literal{val='function_clause'}, F, Xs]},
-    C3 = #c_clause{pats=[Xs], guard=#c_literal{val=true},
+    C3 = #c_clause{anno=Anno,
+                   pats=[Xs], guard=#c_literal{val=true},
 		   body=match_fail([{function_name,{'lists^filter',1}}|Anno], Err2)},
     Fun = #c_fun{vars=[Xs],
 		 body=#c_case{arg=Xs, clauses=[C1, C2, C3]}},
@@ -212,19 +229,20 @@ call(#c_call{anno=Anno}, lists, foldl, [Arg1,Arg2,Arg3]) ->
     Xs = #c_var{name='Xs'},
     X = #c_var{name='X'},
     A = #c_var{name='A'},
-    C1 = #c_clause{pats=[#c_cons{hd=X, tl=Xs}], guard=#c_literal{val=true},
+    C1 = #c_clause{anno=Anno,
+                   pats=[#c_cons{hd=X, tl=Xs}], guard=#c_literal{val=true},
 		   body=#c_apply{anno=Anno,
 				 op=Loop,
 				 args=[Xs, #c_apply{anno=Anno,
 						    op=F,
 						    args=[X, A]}]}},
-    C2 = #c_clause{pats=[#c_literal{val=[]}],
+    C2 = #c_clause{anno=Anno, pats=[#c_literal{val=[]}],
 		   guard=#c_call{module=#c_literal{val=erlang},
 				 name=#c_literal{val=is_function},
 				 args=[F, #c_literal{val=2}]},
 		   body=A},
     Err = #c_tuple{es=[#c_literal{val='function_clause'}, F, A, Xs]},
-    C3 = #c_clause{pats=[Xs], guard=#c_literal{val=true},
+    C3 = #c_clause{anno=Anno, pats=[Xs], guard=#c_literal{val=true},
 		   body=match_fail([{function_name,{'lists^foldl',2}}|Anno], Err)},
     Fun = #c_fun{vars=[Xs, A],
 		 body=#c_case{arg=Xs, clauses=[C1, C2, C3]}},
@@ -238,19 +256,20 @@ call(#c_call{anno=Anno}, lists, foldr, [Arg1,Arg2,Arg3]) ->
     Xs = #c_var{name='Xs'},
     X = #c_var{name='X'},
     A = #c_var{name='A'},
-    C1 = #c_clause{pats=[#c_cons{hd=X, tl=Xs}], guard=#c_literal{val=true},
+    C1 = #c_clause{anno=Anno,
+                   pats=[#c_cons{hd=X, tl=Xs}], guard=#c_literal{val=true},
 		   body=#c_apply{anno=Anno,
 				 op=F,
 				 args=[X, #c_apply{anno=Anno,
 						   op=Loop,
 						   args=[Xs, A]}]}},
-    C2 = #c_clause{pats=[#c_literal{val=[]}],
+    C2 = #c_clause{anno=Anno, pats=[#c_literal{val=[]}],
 		   guard=#c_call{module=#c_literal{val=erlang},
 				 name=#c_literal{val=is_function},
 				 args=[F, #c_literal{val=2}]},
 		   body=A},
     Err = #c_tuple{es=[#c_literal{val='function_clause'}, F, A, Xs]},
-    C3 = #c_clause{pats=[Xs], guard=#c_literal{val=true},
+    C3 = #c_clause{anno=Anno, pats=[Xs], guard=#c_literal{val=true},
 		   body=match_fail([{function_name,{'lists^foldr',2}}|Anno], Err)},
     Fun = #c_fun{vars=[Xs, A],
 		 body=#c_case{arg=Xs, clauses=[C1, C2, C3]}},
@@ -266,13 +285,14 @@ call(#c_call{anno=Anno}, lists, mapfoldl, [Arg1,Arg2,Arg3]) ->
     Avar = #c_var{name='A'},
     Match =
 	fun (A, P, E) ->
-		C1 = #c_clause{pats=[P], guard=#c_literal{val=true}, body=E},
+		C1 = #c_clause{anno=Anno, pats=[P], guard=#c_literal{val=true}, body=E},
 		Err = #c_tuple{es=[#c_literal{val='badmatch'}, X]},
-		C2 = #c_clause{pats=[X], guard=#c_literal{val=true},
+		C2 = #c_clause{anno=Anno, pats=[X], guard=#c_literal{val=true},
 			       body=match_fail(Anno, Err)},
 		#c_case{arg=A, clauses=[C1, C2]}
 	end,
-    C1 = #c_clause{pats=[#c_cons{hd=X, tl=Xs}], guard=#c_literal{val=true},
+    C1 = #c_clause{anno=Anno,
+                   pats=[#c_cons{hd=X, tl=Xs}], guard=#c_literal{val=true},
 		   body=Match(#c_apply{anno=Anno, op=F, args=[X, Avar]},
 			      #c_tuple{es=[X, Avar]},
 %%% Tuple passing version
@@ -292,7 +312,7 @@ call(#c_call{anno=Anno}, lists, mapfoldl, [Arg1,Arg2,Arg3]) ->
 %%% 				     body=#c_values{es=[#c_cons{hd=X, tl=Xs},
 %%% 							A]}}
 			     )},
-    C2 = #c_clause{pats=[#c_literal{val=[]}],
+    C2 = #c_clause{anno=Anno, pats=[#c_literal{val=[]}],
 		   guard=#c_call{module=#c_literal{val=erlang},
 				 name=#c_literal{val=is_function},
 				 args=[F, #c_literal{val=2}]},
@@ -302,7 +322,7 @@ call(#c_call{anno=Anno}, lists, mapfoldl, [Arg1,Arg2,Arg3]) ->
 %%% Multiple-value version
 %%% 		   body=#c_values{es=[#c_literal{val=[]}, A]}},
     Err = #c_tuple{es=[#c_literal{val='function_clause'}, F, Avar, Xs]},
-    C3 = #c_clause{pats=[Xs], guard=#c_literal{val=true},
+    C3 = #c_clause{anno=Anno, pats=[Xs], guard=#c_literal{val=true},
 		   body=match_fail([{function_name,{'lists^mapfoldl',2}}|Anno], Err)},
     Fun = #c_fun{vars=[Xs, Avar],
 		 body=#c_case{arg=Xs, clauses=[C1, C2, C3]}},
@@ -326,13 +346,13 @@ call(#c_call{anno=Anno}, lists, mapfoldr, [Arg1,Arg2,Arg3]) ->
     Avar = #c_var{name='A'},
     Match =
 	fun (A, P, E) ->
-		C1 = #c_clause{pats=[P], guard=#c_literal{val=true}, body=E},
+		C1 = #c_clause{anno=Anno, pats=[P], guard=#c_literal{val=true}, body=E},
 		Err = #c_tuple{es=[#c_literal{val='badmatch'}, X]},
-		C2 = #c_clause{pats=[X], guard=#c_literal{val=true},
+		C2 = #c_clause{anno=Anno, pats=[X], guard=#c_literal{val=true},
 			       body=match_fail(Anno, Err)},
 		#c_case{arg=A, clauses=[C1, C2]}
 	end,
-    C1 = #c_clause{pats=[#c_cons{hd=X, tl=Xs}], guard=#c_literal{val=true},
+    C1 = #c_clause{anno=Anno, pats=[#c_cons{hd=X, tl=Xs}], guard=#c_literal{val=true},
 %%% Tuple passing version
 		   body=Match(#c_apply{anno=Anno,
 				       op=Loop,
@@ -352,7 +372,8 @@ call(#c_call{anno=Anno}, lists, mapfoldr, [Arg1,Arg2,Arg3]) ->
 %%% 					  #c_values{es=[#c_cons{hd=X, tl=Xs},
 %%% 						        A]})}
 		  },
-    C2 = #c_clause{pats=[#c_literal{val=[]}],
+    C2 = #c_clause{anno=Anno,
+                   pats=[#c_literal{val=[]}],
 		   guard=#c_call{module=#c_literal{val=erlang},
 				 name=#c_literal{val=is_function},
 				 args=[F, #c_literal{val=2}]},
@@ -362,7 +383,7 @@ call(#c_call{anno=Anno}, lists, mapfoldr, [Arg1,Arg2,Arg3]) ->
 %%% Multiple-value version
 %%% 		   body=#c_values{es=[#c_literal{val=[]}, A]}},
     Err = #c_tuple{es=[#c_literal{val='function_clause'}, F, Avar, Xs]},
-    C3 = #c_clause{pats=[Xs], guard=#c_literal{val=true},
+    C3 = #c_clause{anno=Anno, pats=[Xs], guard=#c_literal{val=true},
 		   body=match_fail([{function_name,{'lists^mapfoldr',2}}|Anno], Err)},
     Fun = #c_fun{vars=[Xs, Avar],
 		 body=#c_case{arg=Xs, clauses=[C1, C2, C3]}},
diff --git a/lib/compiler/src/sys_core_inline.erl b/lib/compiler/src/sys_core_inline.erl
index 5a6cc45e4a..3380e3f1bd 100644
--- a/lib/compiler/src/sys_core_inline.erl
+++ b/lib/compiler/src/sys_core_inline.erl
@@ -195,6 +195,9 @@ kill_id_anns(Body) ->
     cerl_trees:map(fun(#c_fun{anno=A0}=CFun) ->
 			   A = kill_id_anns_1(A0),
 			   CFun#c_fun{anno=A};
+                      (#c_var{anno=A0}=Var) ->
+			   A = kill_id_anns_1(A0),
+			   Var#c_var{anno=A};
 		      (Expr) ->
 			   %% Mark everything as compiler generated to
 			   %% suppress bogus warnings.
diff --git a/lib/compiler/src/v3_codegen.erl b/lib/compiler/src/v3_codegen.erl
deleted file mode 100644
index e9152ba88f..0000000000
--- a/lib/compiler/src/v3_codegen.erl
+++ /dev/null
@@ -1,2925 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% 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.
-%% 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 : Code generator for Beam.
-
--module(v3_codegen).
-
-%% The main interface.
--export([module/2]).
-
--import(lists, [member/2,keymember/3,keysort/2,keydelete/3,
-		append/1,flatmap/2,filter/2,foldl/3,foldr/3,mapfoldl/3,
-		sort/1,reverse/1,reverse/2,map/2]).
--import(ordsets, [add_element/2,intersection/2,union/2]).
-
--include("v3_kernel.hrl").
-
-%% These are not defined in v3_kernel.hrl.
-get_kanno(Kthing) -> element(2, Kthing).
-set_kanno(Kthing, Anno) -> setelement(2, Kthing, Anno).
-
-%% Main codegen structure.
--record(cg, {lcount=1,				%Label counter
-	     bfail,				%Fail label for BIFs
-	     break,				%Break label
-	     recv,				%Receive label
-	     is_top_block,			%Boolean: top block or not
-	     functable=#{},	                %Map of local functions: {Name,Arity}=>Label
-	     in_catch=false,			%Inside a catch or not.
-	     need_frame,			%Need a stack frame.
-	     ultimate_failure,			%Label for ultimate match failure.
-             ctx                                %Match context.
-	    }).
-
-%% Stack/register state record.
--record(sr, {reg=[],				%Register table
-	     stk=[],				%Stack table
-	     res=[]}).				%Registers to reserve
-
-%% Internal records.
--record(cg_need_heap, {anno=[] :: term(),
-                       h=0 :: integer()}).
--record(cg_block, {anno=[] :: term(),
-                   es=[] :: [term()]}).
-
--type vdb_entry() :: {atom(),non_neg_integer(),non_neg_integer()}.
-
--record(l, {i=0 :: non_neg_integer(),           %Op number
-	    vdb=[] :: [vdb_entry()],            %Variable database
-	    a=[] :: [term()]}).                 %Core annotation
-
--spec module(#k_mdef{}, [compile:option()]) -> {'ok',beam_asm:module_code()}.
-
-module(#k_mdef{name=Mod,exports=Es,attributes=Attr,body=Forms}, _Opts) ->
-    {Asm,St} = functions(Forms, {atom,Mod}),
-    {ok,{Mod,Es,Attr,Asm,St#cg.lcount}}.
-
-functions(Forms, AtomMod) ->
-    mapfoldl(fun (F, St) -> function(F, AtomMod, St) end, #cg{lcount=1}, Forms).
-
-function(#k_fdef{anno=#k{a=Anno},func=Name,arity=Arity,
-                 vars=As,body=Kb}, AtomMod, St0) ->
-    try
-        #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(Body0, 1, Vdb0),
-
-        %% Generate the BEAM assembly code.
-        {Asm,EntryLabel,St} = cg_fun(Body, As, Vdb, AtomMod,
-                                     {Name,Arity}, Anno, St0),
-        Func = {function,Name,Arity,EntryLabel,Asm},
-        {Func,St}
-    catch
-        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
-%% database, VDB, attached to each thing is only relevant internally
-%% for that thing.
-%%
-%% For nested things like matches the numbering continues locally and
-%% the VDB for that thing refers to the variable usage within that
-%% thing.  Variables which live through a such a thing are internally
-%% given a very large last index.  Internally the indexes continue
-%% after the index of that thing.  This creates no problems as the
-%% internal variable info never escapes and externally we only see
-%% variable which are alive both before or after.
-%%
-%% This means that variables never "escape" from a thing and the only
-%% way to get values from a thing is to "return" them, with 'break' or
-%% 'return'.  Externally these values become the return values of the
-%% thing.  This is no real limitation as most nested things have
-%% multiple threads so working out a common best variable usage is
-%% difficult.
-
-%% body(Kbody, I, Vdb) -> {[Expr],MaxI,Vdb}.
-%%  Handle a body.
-
-body(#k_seq{arg=Ke,body=Kb}, I, Vdb0) ->
-    %%ok = io:fwrite("life ~w:~p~n", [?LINE,{Ke,I,Vdb0}]),
-    A = get_kanno(Ke),
-    Vdb1 = use_vars(union(A#k.us, A#k.ns), I, Vdb0),
-    {Es,MaxI,Vdb2} = body(Kb, I+1, Vdb1),
-    E = expr(Ke, I, Vdb2),
-    {[E|Es],MaxI,Vdb2};
-body(Ke, I, Vdb0) ->
-    %%ok = io:fwrite("life ~w:~p~n", [?LINE,{Ke,I,Vdb0}]),
-    A = get_kanno(Ke),
-    Vdb1 = use_vars(union(A#k.us, A#k.ns), I, Vdb0),
-    E = expr(Ke, I, Vdb1),
-    {[E],I,Vdb1}.
-
-%% expr(Kexpr, I, Vdb) -> Expr.
-
-expr(#k_test{anno=A}=Test, I, _Vdb) ->
-    Test#k_test{anno=#l{i=I,a=A#k.a}};
-expr(#k_call{anno=A}=Call, I, _Vdb) ->
-    Call#k_call{anno=#l{i=I,a=A#k.a}};
-expr(#k_enter{anno=A}=Enter, I, _Vdb) ->
-    Enter#k_enter{anno=#l{i=I,a=A#k.a}};
-expr(#k_bif{anno=A}=Bif, I, _Vdb) ->
-    Bif#k_bif{anno=#l{i=I,a=A#k.a}};
-expr(#k_match{anno=A,body=Kb,ret=Rs}, I, Vdb) ->
-    %% Work out imported variables which need to be locked.
-    Mdb = vdb_sub(I, I+1, Vdb),
-    M = match(Kb, A#k.us, I+1, Mdb),
-    L = #l{i=I,vdb=use_vars(A#k.us, I+1, Mdb),a=A#k.a},
-    #k_match{anno=L,body=M,ret=Rs};
-expr(#k_guard_match{anno=A,body=Kb,ret=Rs}, I, Vdb) ->
-    %% Work out imported variables which need to be locked.
-    Mdb = vdb_sub(I, I+1, Vdb),
-    M = match(Kb, A#k.us, I+1, Mdb),
-    L = #l{i=I,vdb=use_vars(A#k.us, I+1, Mdb),a=A#k.a},
-    #k_guard_match{anno=L,body=M,ret=Rs};
-expr(#k_protected{}=Protected, I, Vdb) ->
-    protected(Protected, I, Vdb);
-expr(#k_try{anno=A,arg=Ka,vars=Vs,body=Kb,evars=Evs,handler=Kh}=Try, I, Vdb) ->
-    %% Lock variables that are alive before the catch and used afterwards.
-    %% Don't lock variables that are only used inside the try.
-    Tdb0 = vdb_sub(I, I+1, Vdb),
-    %% This is the tricky bit. Lock variables in Arg that are used in
-    %% the body and handler. Add try tag 'variable'.
-    Ab = get_kanno(Kb),
-    Ah = get_kanno(Kh),
-    Tdb1 = use_vars(union(Ab#k.us, Ah#k.us), I+3, Tdb0),
-    Tdb2 = vdb_sub(I, I+2, Tdb1),
-    Vnames = fun (Kvar) -> Kvar#k_var.name end,	%Get the variable names
-    {Aes,_,Adb} = body(Ka, I+2, add_var({catch_tag,I+1}, I+1, locked, Tdb2)),
-    {Bes,_,Bdb} = body(Kb, I+4, new_vars(sort(map(Vnames, Vs)), I+3, Tdb2)),
-    {Hes,_,Hdb} = body(Kh, I+4, new_vars(sort(map(Vnames, Evs)), I+3, Tdb2)),
-    L = #l{i=I,vdb=Tdb1,a=A#k.a},
-    Try#k_try{anno=L,
-              arg=#cg_block{es=Aes,anno=#l{i=I+1,vdb=Adb,a=[]}},
-              vars=Vs,body=#cg_block{es=Bes,anno=#l{i=I+3,vdb=Bdb,a=[]}},
-              evars=Evs,handler=#cg_block{es=Hes,anno=#l{i=I+3,vdb=Hdb,a=[]}}};
-expr(#k_try_enter{anno=A,arg=Ka,vars=Vs,body=Kb,evars=Evs,handler=Kh}, I, Vdb) ->
-    %% Lock variables that are alive before the catch and used afterwards.
-    %% Don't lock variables that are only used inside the try.
-    Tdb0 = vdb_sub(I, I+1, Vdb),
-    %% This is the tricky bit. Lock variables in Arg that are used in
-    %% the body and handler. Add try tag 'variable'.
-    Ab = get_kanno(Kb),
-    Ah = get_kanno(Kh),
-    Tdb1 = use_vars(union(Ab#k.us, Ah#k.us), I+3, Tdb0),
-    Tdb2 = vdb_sub(I, I+2, Tdb1),
-    Vnames = fun (Kvar) -> Kvar#k_var.name end,	%Get the variable names
-    {Aes,_,Adb} = body(Ka, I+2, add_var({catch_tag,I+1}, I+1, 1000000, Tdb2)),
-    {Bes,_,Bdb} = body(Kb, I+4, new_vars(sort(map(Vnames, Vs)), I+3, Tdb2)),
-    {Hes,_,Hdb} = body(Kh, I+4, new_vars(sort(map(Vnames, Evs)), I+3, Tdb2)),
-    L = #l{i=I,vdb=Tdb1,a=A#k.a},
-    #k_try_enter{anno=L,
-                 arg=#cg_block{es=Aes,anno=#l{i=I+1,vdb=Adb,a=[]}},
-                 vars=Vs,body=#cg_block{es=Bes,anno=#l{i=I+3,vdb=Bdb,a=[]}},
-                 evars=Evs,handler=#cg_block{es=Hes,anno=#l{i=I+3,vdb=Hdb,a=[]}}};
-expr(#k_catch{anno=A,body=Kb}=Catch, I, Vdb) ->
-    %% Lock variables that are alive before the catch and used afterwards.
-    %% Don't lock variables that are only used inside the catch.
-    %% Add catch tag 'variable'.
-    Cdb0 = vdb_sub(I, I+1, Vdb),
-    {Es,_,Cdb1} = body(Kb, I+1, add_var({catch_tag,I}, I, locked, Cdb0)),
-    L = #l{i=I,vdb=Cdb1,a=A#k.a},
-    Catch#k_catch{anno=L,body=#cg_block{es=Es}};
-expr(#k_receive{anno=A,var=V,body=Kb,action=Ka}=Recv, I, Vdb) ->
-    %% Work out imported variables which need to be locked.
-    Rdb = vdb_sub(I, I+1, Vdb),
-    M = match(Kb, add_element(V#k_var.name, A#k.us), I+1,
-              new_vars([V#k_var.name], I, Rdb)),
-    {Tes,_,Adb} = body(Ka, I+1, Rdb),
-    Le = #l{i=I,vdb=use_vars(A#k.us, I+1, Vdb),a=A#k.a},
-    Recv#k_receive{anno=Le,body=M,
-                   action=#cg_block{anno=#l{i=I+1,vdb=Adb,a=[]},es=Tes}};
-expr(#k_receive_accept{anno=A}, I, _Vdb) ->
-    #k_receive_accept{anno=#l{i=I,a=A#k.a}};
-expr(#k_receive_next{anno=A}, I, _Vdb) ->
-    #k_receive_next{anno=#l{i=I,a=A#k.a}};
-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) ->
-    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}}.
-
-%% protected(Kprotected, I, Vdb) -> Protected.
-%%  Only used in guards.
-
-protected(#k_protected{anno=A,arg=Ts}=Prot, I, Vdb) ->
-    %% Lock variables that are alive before try and used afterwards.
-    %% Don't lock variables that are only used inside the protected
-    %% expression.
-    Pdb0 = vdb_sub(I, I+1, Vdb),
-    {T,MaxI,Pdb1} = body(Ts, I+1, Pdb0),
-    Pdb2 = use_vars(A#k.ns, MaxI+1, Pdb1),	%Save "return" values
-    Prot#k_protected{arg=T,anno=#l{i=I,a=A#k.a,vdb=Pdb2}}.
-
-%% match(Kexpr, [LockVar], I, Vdb) -> Expr.
-%%  Convert match tree to old format.
-
-match(#k_alt{anno=A,first=Kf,then=Kt}, Ls, I, Vdb0) ->
-    Vdb1 = use_vars(union(A#k.us, 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,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),
-    Cs = [guard_clause(G, Ls, I+1, Vdb1) || G <- Kcs],
-    #k_guard{anno=[],clauses=Cs};
-match(Other, Ls, I, Vdb0) ->
-    Vdb1 = use_vars(Ls, I, Vdb0),
-    {B,_,Vdb2} = body(Other, I+1, Vdb1),
-    Le = #l{i=I,vdb=Vdb2,a=[]},
-    #cg_block{anno=Le,es=B}.
-
-type_clause(#k_type_clause{anno=A,type=T,values=Kvs}, Ls, I, Vdb0) ->
-    %%ok = io:format("life ~w: ~p~n", [?LINE,{T,Kvs}]),
-    Vdb1 = use_vars(union(A#k.us, Ls), I+1, Vdb0),
-    Vs = [val_clause(Vc, Ls, I+1, Vdb1) || Vc <- Kvs],
-    #k_type_clause{anno=[],type=T,values=Vs}.
-
-val_clause(#k_val_clause{anno=A,val=V,body=Kb}, Ls0, I, Vdb0) ->
-    New = (get_kanno(V))#k.ns,
-    Bus = (get_kanno(Kb))#k.us,
-    %%ok = io:format("Ls0 = ~p, Used=~p\n  New=~p, Bus=~p\n", [Ls0,Used,New,Bus]),
-    Ls1 = union(intersection(New, Bus), Ls0),	%Lock for safety
-    Vdb1 = use_vars(union(A#k.us, Ls1), I+1, new_vars(New, I, Vdb0)),
-    B = match(Kb, Ls1, I+1, Vdb1),
-    Le = #l{i=I,vdb=use_vars(Bus, I+1, Vdb1),a=A#k.a},
-    #k_val_clause{anno=Le,val=V,body=B}.
-
-guard_clause(#k_guard_clause{anno=A,guard=Kg,body=Kb}, Ls, I, Vdb0) ->
-    Vdb1 = use_vars(union(A#k.us, Ls), I+2, Vdb0),
-    Gdb = vdb_sub(I+1, I+2, Vdb1),
-    G = protected(Kg, I+1, Gdb),
-    B = match(Kb, Ls, I+2, Vdb1),
-    Le = #l{i=I,vdb=use_vars((get_kanno(Kg))#k.us, I+2, Vdb1),a=A#k.a},
-    #k_guard_clause{anno=Le,guard=G,body=B}.
-
-
-%% Here follows the code generator pass.
-%%
-%% The following assumptions have been made:
-%%
-%% 1. Matches, i.e. things with {match,M,Ret} wrappers, only return
-%% values; no variables are exported. If the match would have returned
-%% extra variables then these have been transformed to multiple return
-%% values.
-%%
-%% 2. All BIF's called in guards are gc-safe so there is no need to
-%% put thing on the stack in the guard.  While this would in principle
-%% work it would be difficult to keep track of the stack depth when
-%% trimming.
-%%
-%% The code generation uses variable lifetime information added by
-%% the previous pass to save variables, allocate registers and
-%% move registers to the stack when necessary.
-%%
-%% We try to use a consistent variable name scheme throughout.  The
-%% StackReg record is always called Bef,Int<n>,Aft.
-
-%% cg_fun([Lkexpr], [HeadVar], Vdb, State) -> {[Ainstr],State}
-
-cg_fun(Les, Hvs, Vdb, AtomMod, NameArity, Anno, St0) ->
-    {Fi,St1} = new_label(St0),			%FuncInfo label
-    {Fl,St2} = local_func_label(NameArity, St1),
-
-    %%
-    %% The pattern matching compiler (in v3_kernel) no longer
-    %% provides its own catch-all clause, because the 
-    %% call to erlang:exit/1 caused problem when cases were
-    %% used in guards. Therefore, there may be tests that
-    %% cannot fail (providing that there is not a bug in a
-    %% previous optimzation pass), but still need to provide
-    %% a label (there are instructions, such as is_tuple/2,
-    %% that do not allow {f,0}).
-    %%
-    %% We will generate an ultimate failure label and put it
-    %% at the end of function, followed by an 'if_end' instruction.
-    %% Note that and 'if_end' instruction does not need any
-    %% live x registers, so it will always be safe to jump to
-    %% it. (We never ever expect the jump to be taken, and in
-    %% most functions there will never be any references to
-    %% the label in the first place.)
-    %%
-
-    {UltimateMatchFail,St3} = new_label(St2),
-
-    %% Create initial stack/register state, clear unused arguments.
-    Bef = clear_dead(#sr{reg=foldl(fun (#k_var{name=V}, Reg) ->
-					   put_reg(V, Reg)
-				   end, [], Hvs),
-			 stk=[]}, 0, Vdb),
-    {B,_Aft,St} = cg_list(Les, Vdb, Bef,
-			  St3#cg{bfail=0,
-				 ultimate_failure=UltimateMatchFail,
-				 is_top_block=true}),
-    {Name,Arity} = NameArity,
-    Asm = [{label,Fi},line(Anno),{func_info,AtomMod,{atom,Name},Arity},
-	   {label,Fl}|B++[{label,UltimateMatchFail},if_end]],
-    {Asm,Fl,St}.
-
-%% cg(Lkexpr, Vdb, StackReg, State) -> {[Ainstr],StackReg,State}.
-%%  Generate code for a kexpr.
-
-cg(#cg_block{anno=Le,es=Es}, Vdb, Bef, St) ->
-    block_cg(Es, Le, Vdb, Bef, St);
-cg(#k_match{anno=Le,body=M,ret=Rs}, Vdb, Bef, St) ->
-    match_cg(M, Rs, Le, Vdb, Bef, St);
-cg(#k_guard_match{anno=Le,body=M,ret=Rs}, Vdb, Bef, St) ->
-    guard_match_cg(M, Rs, Le, Vdb, Bef, St);
-cg(#k_call{anno=Le,op=Func,args=As,ret=Rs}, Vdb, Bef, St) ->
-    call_cg(Func, As, Rs, Le, Vdb, Bef, St);
-cg(#k_enter{anno=Le,op=Func,args=As}, Vdb, Bef, St) ->
-    enter_cg(Func, As, Le, Vdb, Bef, St);
-cg(#k_bif{anno=Le}=Bif, Vdb, Bef, St) ->
-    bif_cg(Bif, Le, Vdb, Bef, St);
-cg(#k_receive{anno=Le,timeout=Te,var=Rvar,body=Rm,action=Tes,ret=Rs},
-   Vdb, Bef, St) ->
-    recv_loop_cg(Te, Rvar, Rm, Tes, Rs, Le, Vdb, Bef, St);
-cg(#k_receive_next{anno=Le}, Vdb, Bef, St) ->
-    recv_next_cg(Le, Vdb, Bef, St);
-cg(#k_receive_accept{}, _Vdb, Bef, St) ->
-    {[remove_message],Bef,St};
-cg(#k_try{anno=Le,arg=Ta,vars=Vs,body=Tb,evars=Evs,handler=Th,ret=Rs},
-   Vdb, Bef, St) ->
-    try_cg(Ta, Vs, Tb, Evs, Th, Rs, Le, Vdb, Bef, St);
-cg(#k_try_enter{anno=Le,arg=Ta,vars=Vs,body=Tb,evars=Evs,handler=Th},
-   Vdb, Bef, St) ->
-    try_enter_cg(Ta, Vs, Tb, Evs, Th, Le, Vdb, Bef, St);
-cg(#k_catch{anno=Le,body=Cb,ret=[R]}, Vdb, Bef, St) ->
-    catch_cg(Cb, R, Le, Vdb, Bef, St);
-cg(#k_put{anno=Le,arg=Con,ret=Var},  Vdb, Bef, St) ->
-    put_cg(Var, Con, Le, Vdb, Bef, St);
-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}, 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, 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)),
-    {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) ->
-    {Kes,H} = need_heap_0(reverse(Kes0), 0, []),
-
-    %% Prepend need_heap if necessary.
-    need_heap_need(H) ++ Kes.
-
-need_heap_0([Ke|Kes], H0, Acc) ->
-    {Ns,H} = need_heap_1(Ke, H0),
-    need_heap_0(Kes, H, [Ke|Ns]++Acc);
-need_heap_0([], H, Acc) ->
-    {Acc,H}.
-
-need_heap_1(#k_put{arg=#k_binary{}}, H) ->
-    {need_heap_need(H),0};
-need_heap_1(#k_put{arg=#k_map{}}, H) ->
-    {need_heap_need(H),0};
-need_heap_1(#k_put{arg=Val}, H) ->
-    %% Just pass through adding to needed heap.
-    {[],H + case Val of
-		#k_cons{} -> 2;
-		#k_tuple{es=Es} -> 1 + length(Es);
-		_Other -> 0
-	    end};
-need_heap_1(#k_bif{}=Bif, H) ->
-    case is_gc_bif(Bif) of
-        false ->
-            {[],H};
-        true ->
-            {need_heap_need(H),0}
-    end;
-need_heap_1(_Ke, H) ->
-    %% Call or call-like instruction such as set_tuple_element/3.
-    {need_heap_need(H),0}.
-
-need_heap_need(0) -> [];
-need_heap_need(H) -> [#cg_need_heap{h=H}].
-
-%% is_gc_bif(#k_bif{}) -> true|false.
-%% is_gc_bif(Name, Arity) -> true|false.
-%%  Determines whether the BIF Name/Arity might do a GC.
-
-is_gc_bif(#k_bif{op=#k_remote{name=#k_atom{val=Name}},args=Args}) ->
-    is_gc_bif(Name, length(Args));
-is_gc_bif(#k_bif{op=#k_internal{}}) ->
-    true.
-
-is_gc_bif(hd, 1) -> false;
-is_gc_bif(tl, 1) -> false;
-is_gc_bif(self, 0) -> false;
-is_gc_bif(node, 0) -> false;
-is_gc_bif(node, 1) -> false;
-is_gc_bif(element, 2) -> false;
-is_gc_bif(get, 1) -> false;
-is_gc_bif(tuple_size, 1) -> false;
-is_gc_bif(map_get, 2) -> false;
-is_gc_bif(is_map_key, 2) -> false;
-is_gc_bif(Bif, Arity) ->
-    not (erl_internal:bool_op(Bif, Arity) orelse
-	 erl_internal:new_type_test(Bif, Arity) orelse
-	 erl_internal:comp_op(Bif, Arity)).
-
-%% match_cg(Matc, [Ret], Le, Vdb, StackReg, State) ->
-%%	{[Ainstr],StackReg,State}.
-%%  Generate code for a match.  First save all variables on the stack
-%%  that are to survive after the match.  We leave saved variables in
-%%  their registers as they might actually be in the right place.
-
-match_cg(M, Rs, Le, Vdb, Bef, St0) ->
-    I = Le#l.i,
-    {Sis,Int0} = adjust_stack(Bef, I, I+1, Vdb),
-    {B,St1} = new_label(St0),
-    {Mis,Int1,St2} = match_cg(M, St1#cg.ultimate_failure,
-			      Int0, St1#cg{break=B}),
-    %% Put return values in registers.
-    Reg = load_vars(Rs, Int1#sr.reg),
-    {Sis ++ Mis ++ [{label,B}],
-     clear_dead(Int1#sr{reg=Reg}, I, Vdb),
-     St2#cg{break=St1#cg.break}}.
-
-guard_match_cg(M, Rs, Le, Vdb, Bef, St0) ->
-    I = Le#l.i,
-    {B,St1} = new_label(St0),
-    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),
-    {Mis ++ [{label,B}],
-     clear_dead(Aft#sr{reg=Reg}, I, Vdb),
-     St2#cg{break=St1#cg.break}}.
-
-guard_match_regs([{I,gbreakvar}|Rs], [#k_var{name=V}|Vs]) ->
-    [{I,V}|guard_match_regs(Rs, Vs)];
-guard_match_regs([R|Rs], Vs) ->
-    [R|guard_match_regs(Rs, Vs)];
-guard_match_regs([], []) -> [].
-    
-
-%% match_cg(Match, Fail, StackReg, State) -> {[Ainstr],StackReg,State}.
-%%  Generate code for a match tree.  N.B. there is no need pass Vdb
-%%  down as each level which uses this takes its own internal Vdb not
-%%  the outer one.
-
-match_cg(#k_alt{first=F,then=S}, Fail, Bef, St0) ->
-    {Tf,St1} = new_label(St0),
-    {Fis,Faft,St2} = match_cg(F, Tf, Bef, St1),
-    {Sis,Saft,St3} = match_cg(S, Fail, Bef, St2),
-    Aft = sr_merge(Faft, Saft),
-    {Fis ++ [{label,Tf}] ++ Sis,Aft,St3};
-match_cg(#k_select{var=#k_var{anno=Vanno,name=Vname}=V,types=Scs0}, Fail, Bef, St) ->
-    ReuseForContext = member(reuse_for_context, Vanno) andalso
-	find_reg(Vname, Bef#sr.reg) =/= error,
-    Scs = case ReuseForContext of
-	      false -> Scs0;
-	      true -> bsm_rename_ctx(Scs0, Vname)
-	  end,
-    match_fmf(fun (S, F, Sta) ->
-		      select_cg(S, V, F, Fail, Bef, Sta) end,
-	      Fail, St, Scs);
-match_cg(#k_guard{clauses=Gcs}, Fail, Bef, St) ->
-    match_fmf(fun (G, F, Sta) -> guard_clause_cg(G, F, Bef, Sta) end,
-	      Fail, St, Gcs);
-match_cg(#cg_block{anno=Le,es=Es}, _Fail, Bef, St) ->
-    %% Must clear registers and stack of dead variables.
-    Int = clear_dead(Bef, Le#l.i, Le#l.vdb),
-    block_cg(Es, Le, Int, St).
-
-%% bsm_rename_ctx([Clause], Var) -> [Clause]
-%%  We know from an annotation that the register for a binary can
-%%  be reused for the match context because the two are not truly
-%%  alive at the same time (even though the life time information
-%%  says so).
-%%
-%%  The easiest way to have those variables share the same register is
-%%  to rename the variable with the shortest life-span (the match
-%%  context) to the variable for the binary (which can have a very
-%%  long life-time because it is locked during matching). We KNOW that
-%%  the match state variable will only be alive during the matching.
-%%
-%%  We must also remove all information about the match context
-%%  variable from all life-time information databases (Vdb).
-
-bsm_rename_ctx([#k_type_clause{type=k_binary,values=Vcs}=TC|Cs], New) ->
-    [#k_val_clause{val=#k_binary{segs=#k_var{name=Old}}=Bin,
-                   body=Ke0}=VC0] = Vcs,
-    Ke = bsm_rename_ctx(Ke0, Old, New, false),
-    VC = VC0#k_val_clause{val=Bin#k_binary{segs=#k_var{name=New}},
-                          body=Ke},
-    [TC#k_type_clause{values=[VC]}|bsm_rename_ctx(Cs, New)];
-bsm_rename_ctx([C|Cs], New) ->
-    [C|bsm_rename_ctx(Cs, New)];
-bsm_rename_ctx([], _) -> [].
-
-%% bsm_rename_ctx(Ke, OldName, NewName, InProt) -> Ke'
-%%  Rename and clear OldName from life-time information. We must
-%%  recurse into any block contained in a protected, but it would
-%%  only complicatate things to recurse into blocks not in a protected
-%%  (the match context variable is not live inside them).
-
-bsm_rename_ctx(#k_select{var=#k_var{name=V},types=Cs0}=Sel,
-               Old, New, InProt) ->
-    Cs = bsm_rename_ctx_list(Cs0, Old, New, InProt),
-    Sel#k_select{var=#k_var{name=bsm_rename_var(V, Old, New)},types=Cs};
-bsm_rename_ctx(#k_type_clause{values=Cs0}=TC, Old, New, InProt) ->
-    Cs = bsm_rename_ctx_list(Cs0, Old, New, InProt),
-    TC#k_type_clause{values=Cs};
-bsm_rename_ctx(#k_val_clause{body=Ke0}=VC, Old, New, InProt) ->
-    Ke = bsm_rename_ctx(Ke0, Old, New, InProt),
-    VC#k_val_clause{body=Ke};
-bsm_rename_ctx(#k_alt{first=F0,then=S0}=Alt, Old, New, InProt) ->
-    F = bsm_rename_ctx(F0, Old, New, InProt),
-    S = bsm_rename_ctx(S0, Old, New, InProt),
-    Alt#k_alt{first=F,then=S};
-bsm_rename_ctx(#k_guard{clauses=Gcs0}=Guard, Old, New, InProt) ->
-    Gcs = bsm_rename_ctx_list(Gcs0, Old, New, InProt),
-    Guard#k_guard{clauses=Gcs};
-bsm_rename_ctx(#k_guard_clause{guard=G0,body=B0}=GC, Old, New, InProt) ->
-    G = bsm_rename_ctx(G0, Old, New, InProt),
-    B = bsm_rename_ctx(B0, Old, New, InProt),
-    %% A guard clause may cause unsaved variables to be saved on the stack.
-    %% Since the match state variable Old is an alias for New (uses the
-    %% same register), it is neither in the stack nor register descriptor
-    %% lists and we would crash when we didn't find it unless we remove
-    %% it from the database.
-    bsm_forget_var(GC#k_guard_clause{guard=G,body=B}, Old);
-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_guard_match{body=Ms0}=Match, Old, New, InProt) ->
-    Ms = bsm_rename_ctx(Ms0, Old, New, InProt),
-    Match#k_guard_match{body=Ms};
-bsm_rename_ctx(#k_test{}=Test, _, _, _) -> Test;
-bsm_rename_ctx(#k_bif{}=Bif, _, _, _) -> Bif;
-bsm_rename_ctx(#k_put{}=Put, _, _, _) -> Put;
-bsm_rename_ctx(#k_call{}=Call, _, _, _) -> Call;
-bsm_rename_ctx(#cg_block{}=Block, Old, _, false) ->
-    %% This block is not inside a protected. The match context variable cannot
-    %% possibly be live inside the block.
-    bsm_forget_var(Block, Old);
-bsm_rename_ctx(#cg_block{es=Es0}=Block, Old, New, true) ->
-    %% A block in a protected. We must recursively rename the variable
-    %% 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{}=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)|
-     bsm_rename_ctx_list(Cs, Old, New, InProt)];
-bsm_rename_ctx_list([], _, _, _) -> [].
-
-bsm_rename_var(Old, Old, New) -> New;
-bsm_rename_var(V, _, _) -> V.
-
-%% bsm_forget_var(#l{}, Variable) -> #l{}
-%%  Remove a variable from the variable life-time database.
-
-bsm_forget_var(Ke, V) ->
-    #l{vdb=Vdb} = L0 = get_kanno(Ke),
-    L = L0#l{vdb=keydelete(V, 1, Vdb)},
-    set_kanno(Ke, L).
-
-%% block_cg([Kexpr], Le, Vdb, StackReg, St) -> {[Ainstr],StackReg,St}.
-%% block_cg([Kexpr], Le, StackReg, St) -> {[Ainstr],StackReg,St}.
-
-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.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, Vdb, Bef, St0) ->
-    {Kes2,Int1,St1} =
-	case basic_block(Kes0) of
-	    {Kes1,LastI,Args,Rest} ->
-		cg_basic_block(Kes1, LastI, Args, Vdb, Bef, St0);
-	    {Kes1,Rest} ->
-		cg_list(Kes1, Vdb, Bef, St0)
-	end,
-    {Kes3,Int2,St2} = cg_block(Rest, Vdb, Int1, St1),
-    {Kes2 ++ Kes3,Int2,St2}.
-
-basic_block(Kes) -> basic_block(Kes, []).
-
-basic_block([Ke|Kes], Acc) ->
-    case collect_block(Ke) of
-	include -> basic_block(Kes, [Ke|Acc]);
-	{block_end,As} ->
-	    case Acc of
-		[] ->
-		    %% If the basic block does not contain any #k_put{} instructions,
-		    %% it serves no useful purpose to do basic block optimizations.
-		    {[Ke],Kes};
-		_ ->
-                    #l{i=I} = get_kanno(Ke),
-		    {reverse(Acc, [Ke]),I,As,Kes}
-	    end;
-	no_block -> {reverse(Acc, [Ke]),Kes}
-    end.
-
-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=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.
-
-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, Arguments, Vdb, StackReg, State) ->
-%%      {[Ainstr],StackReg,State}.
-%%
-%%  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,
-		     {Int,St0}, need_heap(Kes)),
-    {Keis,Aft,St1}.
-
-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),
-
-    %% 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_1(Rs, Regs, Stk)];
-	false -> [{I,Var}|reserve_1(Rs, Regs, Stk)]
-    end;
-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, Regs),
-	    Move = {move,SrcReg,fetch_stack(V, Stk1)},
-	    {x,_} = SrcReg,			%Assertion - must be X register.
-	    save_carefully_1(Vs, Bef#sr{stk=Stk1}, [Move|Acc])
-    end;
-save_carefully_1([], Bef, Acc) ->
-    {reverse(Acc),Bef}.
-
-%% 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;
-top_level_block(Keis, Bef, MaxRegs, _St) ->
-    %% This top block needs an allocate instruction before it, and a
-    %% deallocate instruction before each return.
-    FrameSz = length(Bef#sr.stk),
-    MaxY = FrameSz-1,
-    Keis1 = flatmap(fun ({call_only,Arity,Func}) ->
-			    [{call_last,Arity,Func,FrameSz}];
-			({call_ext_only,Arity,Func}) ->
-			    [{call_ext_last,Arity,Func,FrameSz}];
-			({apply_only,Arity}) ->
-			    [{apply_last,Arity,FrameSz}];
-			(return) ->
-			    [{deallocate,FrameSz},return];
-			(Tuple) when is_tuple(Tuple) ->
-			    [turn_yregs(Tuple, MaxY)];
-			(Other) ->
-			    [Other]
-		    end, Keis),
-    [{allocate_zero,FrameSz,MaxRegs}|Keis1].
-
-%% turn_yregs(Size, Tuple, MaxY) -> Tuple'
-%%   Renumber y register so that {y,0} becomes {y,FrameSize-1},
-%%   {y,FrameSize-1} becomes {y,0} and so on.  This is to make nested
-%%   catches work.  The code generation algorithm gives a lower register
-%%   number to the outer catch, which is wrong.
-
-turn_yregs({call,_,_}=I, _MaxY) -> I;
-turn_yregs({call_ext,_,_}=I, _MaxY) -> I;
-turn_yregs({jump,_}=I, _MaxY) -> I;
-turn_yregs({label,_}=I, _MaxY) -> I;
-turn_yregs({line,_}=I, _MaxY) -> I;
-turn_yregs({test_heap,_,_}=I, _MaxY) -> I;
-turn_yregs({bif,Op,F,A,B}, MaxY) ->
-    {bif,Op,F,turn_yreg(A, MaxY),turn_yreg(B, MaxY)};
-turn_yregs({gc_bif,Op,F,Live,A,B}, MaxY) when is_integer(Live) ->
-    {gc_bif,Op,F,Live,turn_yreg(A, MaxY),turn_yreg(B, MaxY)};
-turn_yregs({get_tuple_element,S,N,D}, MaxY) ->
-    {get_tuple_element,turn_yreg(S, MaxY),N,turn_yreg(D, MaxY)};
-turn_yregs({put_tuple,Arity,D}, MaxY) ->
-    {put_tuple,Arity,turn_yreg(D, MaxY)};
-turn_yregs({select_val,R,F,L}, MaxY) ->
-    {select_val,turn_yreg(R, MaxY),F,L};
-turn_yregs({test,Op,F,L}, MaxY) ->
-    {test,Op,F,turn_yreg(L, MaxY)};
-turn_yregs({test,Op,F,Live,A,B}, MaxY) when is_integer(Live) ->
-    {test,Op,F,Live,turn_yreg(A, MaxY),turn_yreg(B, MaxY)};
-turn_yregs({Op,A}, MaxY) ->
-    {Op,turn_yreg(A, MaxY)};
-turn_yregs({Op,A,B}, MaxY) ->
-    {Op,turn_yreg(A, MaxY),turn_yreg(B, MaxY)};
-turn_yregs({Op,A,B,C}, MaxY) ->
-    {Op,turn_yreg(A, MaxY),turn_yreg(B, MaxY),turn_yreg(C, MaxY)};
-turn_yregs(Tuple, MaxY) ->
-    turn_yregs(tuple_size(Tuple), Tuple, MaxY).
-
-turn_yregs(1, Tp, _) ->
-    Tp;
-turn_yregs(N, Tp, MaxY) ->
-    E = turn_yreg(element(N, Tp), MaxY),
-    turn_yregs(N-1, setelement(N, Tp, E), MaxY).
-
-turn_yreg({yy,YY}, MaxY) ->
-    {y,MaxY-YY};
-turn_yreg({list,Ls},MaxY) ->
-    {list,turn_yreg(Ls, MaxY)};
-turn_yreg([_|_]=Ts, MaxY) ->
-    [turn_yreg(T, MaxY) || T <- Ts];
-turn_yreg(Other, _MaxY) ->
-    Other.
-
-%% select_cg(Sclause, V, TypeFail, ValueFail, StackReg, State) ->
-%%      {Is,StackReg,State}.
-%%  Selecting type and value needs two failure labels, TypeFail is the
-%%  label to jump to of the next type test when this type fails, and
-%%  ValueFail is the label when this type is correct but the value is
-%%  wrong.  These are different as in the second case there is no need
-%%  to try the next type, it will always fail.
-
-select_cg(#k_type_clause{type=Type,values=Vs}, Var, Tf, Vf, Bef, St) ->
-    #k_var{name=V} = Var,
-    select_cg(Type, Vs, V, Tf, Vf, Bef, St).
-
-select_cg(k_cons, [S], V, Tf, Vf, Bef, St) ->
-    select_cons(S, V, Tf, Vf, Bef, St);
-select_cg(k_nil, [S], V, Tf, Vf, Bef, St) ->
-    select_nil(S, V, Tf, Vf, Bef, St);
-select_cg(k_binary, [S], V, Tf, Vf, Bef, St) ->
-    select_binary(S, V, Tf, Vf, Bef, St);
-select_cg(k_bin_seg, S, V, Tf, _Vf, Bef, St) ->
-    select_bin_segs(S, V, Tf, Bef, St);
-select_cg(k_bin_int, S, V, Tf, _Vf, Bef, St) ->
-    select_bin_segs(S, V, Tf, Bef, St);
-select_cg(k_bin_end, [S], V, Tf, _Vf, Bef, St) ->
-    select_bin_end(S, V, Tf, Bef, St);
-select_cg(k_map, S, V, Tf, Vf, Bef, St) ->
-    select_map(S, V, Tf, Vf, Bef, St);
-select_cg(k_literal, S, V, Tf, Vf, Bef, St) ->
-    select_literal(S, V, Tf, Vf, Bef, St);
-select_cg(Type, Scs, V, Tf, Vf, Bef, St0) ->
-    {Vis,{Aft,St1}} =
-	mapfoldl(fun (S, {Int,Sta}) ->
-			 {Val,Is,Inta,Stb} = select_val(S, V, Vf, Bef, Sta),
-			 {{Is,[Val]},{sr_merge(Int, Inta),Stb}}
-		 end, {void,St0}, Scs),
-    OptVls = combine(lists:sort(combine(Vis))),
-    {Vls,Sis,St2} = select_labels(OptVls, St1, [], []),
-    {select_val_cg(Type, fetch_var(V, Bef), Vls, Tf, Vf, Sis), Aft, St2}.
-
-select_val_cg(k_tuple, R, [Arity,{f,Lbl}], Tf, Vf, [{label,Lbl}|Sis]) ->
-    [{test,is_tuple,{f,Tf},[R]},{test,test_arity,{f,Vf},[R,Arity]}|Sis];
-select_val_cg(k_tuple, R, Vls, Tf, Vf, Sis) ->
-    [{test,is_tuple,{f,Tf},[R]},{select_tuple_arity,R,{f,Vf},{list,Vls}}|Sis];
-select_val_cg(Type, R, [Val, {f,Lbl}], Fail, Fail, [{label,Lbl}|Sis]) ->
-    [{test,is_eq_exact,{f,Fail},[R,{type(Type),Val}]}|Sis];
-select_val_cg(Type, R, [Val, {f,Lbl}], Tf, Vf, [{label,Lbl}|Sis]) ->
-    [{test,select_type_test(Type),{f,Tf},[R]},
-     {test,is_eq_exact,{f,Vf},[R,{type(Type),Val}]}|Sis];
-select_val_cg(Type, R, Vls0, Tf, Vf, Sis) ->
-    Vls1 = [case Value of
-                {f,_Lbl} -> Value;
-                _ -> {type(Type),Value}
-            end || Value <- Vls0],
-    [{test,select_type_test(Type),{f,Tf},[R]}, {select_val,R,{f,Vf},{list,Vls1}}|Sis].
-
-type(k_atom) -> atom;
-type(k_float) -> float;
-type(k_int) -> integer.
-
-select_type_test(k_int) -> is_integer;
-select_type_test(k_atom) -> is_atom;
-select_type_test(k_float) -> is_float.
-
-combine([{Is,Vs1}, {Is,Vs2}|Vis]) -> combine([{Is,Vs1 ++ Vs2}|Vis]);
-combine([V|Vis]) -> [V|combine(Vis)];
-combine([]) -> [].
-
-select_labels([{Is,Vs}|Vis], St0, Vls, Sis) ->
-    {Lbl,St1} = new_label(St0),
-    select_labels(Vis, St1, add_vls(Vs, Lbl, Vls), [[{label,Lbl}|Is]|Sis]);
-select_labels([], St, Vls, Sis) ->
-    {Vls,append(Sis),St}.
-
-add_vls([V|Vs], Lbl, Acc) ->
-    add_vls(Vs, Lbl, [V, {f,Lbl}|Acc]);
-add_vls([], _, Acc) -> Acc.
-
-select_literal(S, V, Tf, Vf, Bef, St) ->
-    Reg = fetch_var(V, Bef),
-    F = fun(ValClause, Fail, St0) ->
-                {Val,Is,Aft,St1} = select_val(ValClause, V, Vf, Bef, St0),
-                Test = {test,is_eq_exact,{f,Fail},[Reg,{literal,Val}]},
-                {[Test|Is],Aft,St1}
-        end,
-    match_fmf(F, Tf, St, S).
-
-select_cons(#k_val_clause{val=#k_cons{hd=Hd,tl=Tl},body=B,anno=#l{i=I,vdb=Vdb}},
-            V, Tf, Vf, Bef, St0) ->
-    Es = [Hd,Tl],
-    {Eis,Int,St1} = select_extract_cons(V, Es, I, Vdb, Bef, St0),
-    {Bis,Aft,St2} = match_cg(B, Vf, Int, St1),
-    {[{test,is_nonempty_list,{f,Tf},[fetch_var(V, Bef)]}] ++ Eis ++ Bis,Aft,St2}.
-
-select_nil(#k_val_clause{val=#k_nil{},body=B}, V, Tf, Vf, Bef, St0) ->
-    {Bis,Aft,St1} = match_cg(B, Vf, Bef, St0),
-    {[{test,is_nil,{f,Tf},[fetch_var(V, Bef)]}] ++ Bis,Aft,St1}.
-
-select_binary(#k_val_clause{val=#k_binary{segs=#k_var{name=V}},body=B,
-                            anno=#l{i=I,vdb=Vdb}}, V, Tf, Vf, Bef, St0) ->
-    #cg{ctx=OldCtx} = St0,
-    Int0 = clear_dead(Bef#sr{reg=Bef#sr.reg}, I, Vdb),
-    {Bis0,Aft,St1} = match_cg(B, Vf, Int0, St0#cg{ctx=V}),
-    CtxReg = fetch_var(V, Int0),
-    Live = max_reg(Bef#sr.reg),
-    Bis1 = [{test,bs_start_match2,{f,Tf},Live,[CtxReg,{context,V}],CtxReg},
-	    {bs_save2,CtxReg,{V,V}}|Bis0],
-    Bis = finish_select_binary(Bis1),
-    {Bis,Aft,St1#cg{ctx=OldCtx}};
-select_binary(#k_val_clause{val=#k_binary{segs=#k_var{name=Ivar}},body=B,
-                            anno=#l{i=I,vdb=Vdb}}, V, Tf, Vf, Bef, St0) ->
-    #cg{ctx=OldCtx} = St0,
-    Regs = put_reg(Ivar, Bef#sr.reg),
-    Int0 = clear_dead(Bef#sr{reg=Regs}, I, Vdb),
-    {Bis0,Aft,St1} = match_cg(B, Vf, Int0, St0#cg{ctx=Ivar}),
-    CtxReg = fetch_var(Ivar, Int0),
-    Live = max_reg(Bef#sr.reg),
-    Bis1 = [{test,bs_start_match2,{f,Tf},Live,
-             [fetch_var(V, Bef),{context,Ivar}],CtxReg},
-	    {bs_save2,CtxReg,{Ivar,Ivar}}|Bis0],
-    Bis = finish_select_binary(Bis1),
-    {Bis,Aft,St1#cg{ctx=OldCtx}}.
-
-finish_select_binary([{bs_save2,R,Point}=I,{bs_restore2,R,Point}|Is]) ->
-    [I|finish_select_binary(Is)];
-finish_select_binary([{bs_save2,R,Point}=I,{test,is_eq_exact,_,_}=Test,
-		      {bs_restore2,R,Point}|Is]) ->
-    [I,Test|finish_select_binary(Is)];
-finish_select_binary([{test,bs_match_string,F,[Ctx,BinList]}|Is])
-  when is_list(BinList) ->
-    I = {test,bs_match_string,F,[Ctx,list_to_bitstring(BinList)]},
-    [I|finish_select_binary(Is)];
-finish_select_binary([I|Is]) ->
-    [I|finish_select_binary(Is)];
-finish_select_binary([]) -> [].
-
-%% New instructions for selection of binary segments.
-
-select_bin_segs(Scs, Ivar, Tf, Bef, St) ->
-    match_fmf(fun(S, Fail, Sta) ->
-		      select_bin_seg(S, Ivar, Fail, Bef, Sta) end,
-	      Tf, St, Scs).
-
-select_bin_seg(#k_val_clause{val=#k_bin_seg{size=Size,unit=U,type=T,
-                                            seg=Seg,flags=Fs0,next=Next},
-                             body=B,
-                             anno=#l{i=I,vdb=Vdb,a=A}}, Ivar, Fail, Bef, St0) ->
-    Ctx = St0#cg.ctx,
-    Fs = [{anno,A}|Fs0],
-    Es = case Next of
-             [] -> [Seg];
-             _ -> [Seg,Next]
-         end,
-    {Mis,Int,St1} = select_extract_bin(Es, Size, U, T, Fs, Fail,
-				       I, Vdb, Bef, Ctx, B, St0),
-    {Bis,Aft,St2} = match_cg(B, Fail, Int, St1),
-    CtxReg = fetch_var(Ctx, Bef),
-    Is = if
-	     Mis =:= [] ->
-		 %% No bs_restore2 instruction needed if no match instructions.
-		 Bis;
-	     true ->
-		 [{bs_restore2,CtxReg,{Ctx,Ivar}}|Mis++Bis]
-	 end,
-    {Is,Aft,St2};
-select_bin_seg(#k_val_clause{val=#k_bin_int{size=Sz,unit=U,flags=Fs,
-                                            val=Val,next=Next},
-                             body=B,
-                             anno=#l{i=I,vdb=Vdb}}, Ivar, Fail, Bef, St0) ->
-    Ctx = St0#cg.ctx,
-    {Mis,Int,St1} = select_extract_int(Next, Val, Sz, U, Fs, Fail,
-				       I, Vdb, Bef, Ctx, St0),
-    {Bis,Aft,St2} = match_cg(B, Fail, Int, St1),
-    CtxReg = fetch_var(Ctx, Bef),
-    Is = case Mis ++ Bis of
-	     [{test,bs_match_string,F,[OtherCtx,Bin1]},
-	      {bs_save2,OtherCtx,_},
-	      {bs_restore2,OtherCtx,_},
-	      {test,bs_match_string,F,[OtherCtx,Bin2]}|Is0] ->
-		 %% We used to do this optimization later, but it
-		 %% turns out that in huge functions with many
-		 %% bs_match_string instructions, it's a big win
-		 %% to do the combination now. To avoid copying the
-		 %% binary data again and again, we'll combine bitstrings
-		 %% in a list and convert all of it to a bitstring later.
-		 [{test,bs_match_string,F,[OtherCtx,[Bin1,Bin2]]}|Is0];
-	     Is0 ->
-		 Is0
-	 end,
-    {[{bs_restore2,CtxReg,{Ctx,Ivar}}|Is],Aft,St2}.
-
-select_extract_int(#k_var{name=Tl}, Val, #k_int{val=Sz}, U, Fs, Vf,
-		   I, Vdb, Bef, Ctx, St) ->
-    Bits = U*Sz,
-    Bin = case member(big, Fs) of
-	      true ->
-		  <<Val:Bits>>;
-	      false ->
-		  true = member(little, Fs),	%Assertion.
-		  <<Val:Bits/little>>
-	  end,
-    Bits = bit_size(Bin),			%Assertion.
-    CtxReg = fetch_var(Ctx, Bef),
-    Is = if
-	     Bits =:= 0 ->
-		 [{bs_save2,CtxReg,{Ctx,Tl}}];
-	     true ->
-		 [{test,bs_match_string,{f,Vf},[CtxReg,Bin]},
-		  {bs_save2,CtxReg,{Ctx,Tl}}]
-	 end,
-    {Is,clear_dead(Bef, I, Vdb),St}.
-
-select_extract_bin([#k_var{name=Hd},#k_var{name=Tl}], Size0, Unit, Type, Flags, Vf,
-		   I, Vdb, Bef, Ctx, _Body, St) ->
-    SizeReg = get_bin_size_reg(Size0, Bef),
-    {Es,Aft} =
-	case vdb_find(Hd, Vdb) of
-	    {_,_,Lhd} when Lhd =< I ->
-		%% The extracted value will not be used.
-		CtxReg = fetch_var(Ctx, Bef),
-		Live = max_reg(Bef#sr.reg),
-		Skip = build_skip_instr(Type, Vf, CtxReg, Live,
-					SizeReg, Unit, Flags),
-		{[Skip,{bs_save2,CtxReg,{Ctx,Tl}}],Bef};
-	    {_,_,_} ->
-		Reg = put_reg(Hd, Bef#sr.reg),
-		Int1 = Bef#sr{reg=Reg},
-		Rhd = fetch_reg(Hd, Reg),
-		CtxReg = fetch_reg(Ctx, Reg),
-		Live = max_reg(Bef#sr.reg),
-		{[build_bs_instr(Type, Vf, CtxReg, Live, SizeReg,
-				 Unit, Flags, Rhd),
-		  {bs_save2,CtxReg,{Ctx,Tl}}],Int1}
-	end,
-    {Es,clear_dead(Aft, I, Vdb),St};
-select_extract_bin([#k_var{name=Hd}], Size, Unit, binary, Flags, Vf,
-		   I, Vdb, Bef, Ctx, Body, St) ->
-    %% Match the last segment of a binary. We KNOW that the size
-    %% must be 'all'.
-    #k_atom{val=all} = Size,                    %Assertion.
-    {Es,Aft} =
-	case vdb_find(Hd, Vdb) of
-	    {_,_,Lhd} when Lhd =< I ->
-		%% The result will not be used. Furthermore, since we
-		%% we are at the end of the binary, the position will
-		%% not be used again; thus, it is safe to do a cheaper
-		%% test of the unit.
-		CtxReg = fetch_var(Ctx, Bef),
-		{case Unit of
-		     1 ->
-			 [];
-		     _ ->
-			 [{test,bs_test_unit,{f,Vf},[CtxReg,Unit]}]
-		 end,Bef};
-	    {_,_,_} ->
-		case is_context_unused(Body) of
-		    false ->
-			Reg = put_reg(Hd, Bef#sr.reg),
-			Int1 = Bef#sr{reg=Reg},
-			Rhd = fetch_reg(Hd, Reg),
-			CtxReg = fetch_reg(Ctx, Reg),
-			Name = bs_get_binary2,
-			Live = max_reg(Bef#sr.reg),
-			{[{test,Name,{f,Vf},Live,
-			   [CtxReg,atomic(Size),Unit,{field_flags,Flags}],Rhd}],
-			 Int1};
-		    true ->
-			%% Since the matching context will not be used again,
-			%% we can reuse its register. Reusing the register
-			%% opens some interesting optimizations in the
-			%% run-time system.
-
-			Reg0 = Bef#sr.reg,
-			CtxReg = fetch_reg(Ctx, Reg0),
-			Reg = replace_reg_contents(Ctx, Hd, Reg0),
-			Int1 = Bef#sr{reg=Reg},
-			Name = bs_get_binary2,
-			Live = max_reg(Int1#sr.reg),
-			{[{test,Name,{f,Vf},Live,
-			   [CtxReg,atomic(Size),Unit,{field_flags,Flags}],CtxReg}],
-			 Int1}
-		end
-	end,
-    {Es,clear_dead(Aft, I, Vdb),St}.
-
-%% is_context_unused(Ke) -> true | false
-%%   Simple heurististic to determine whether the code that follows
-%%   will use the current matching context again. (The liveness
-%%   information is too conservative to be useful for this purpose.)
-%%   'true' means that the code that follows will definitely not use
-%%   the context again (because it is a block, not guard or matching
-%%   code); 'false' that we are not sure (there could be more
-%%   matching).
-
-is_context_unused(#k_alt{then=Then}) ->
-    %% #k_alt{} can be used for different purposes. If the Then part
-    %% is a block, it means that matching has finished and is used for a guard
-    %% to choose between the matched clauses.
-    is_context_unused(Then);
-is_context_unused(#cg_block{}) ->
-    true;
-is_context_unused(_) ->
-    false.
-
-select_bin_end(#k_val_clause{val=#k_bin_end{},body=B}, Ivar, Tf, Bef, St0) ->
-    Ctx = St0#cg.ctx,
-    {Bis,Aft,St2} = match_cg(B, Tf, Bef, St0),
-    CtxReg = fetch_var(Ctx, Bef),
-    {[{bs_restore2,CtxReg,{Ctx,Ivar}},
-      {test,bs_test_tail2,{f,Tf},[CtxReg,0]}|Bis],Aft,St2}.
-
-get_bin_size_reg(#k_var{name=V}, Bef) ->
-    fetch_var(V, Bef);
-get_bin_size_reg(Literal, _Bef) ->
-    atomic(Literal).
-
-build_bs_instr(Type, Vf, CtxReg, Live, SizeReg, Unit, Flags, Rhd) ->
-    {Format,Name} = case Type of
-			integer -> {plain,bs_get_integer2};
-			float ->   {plain,bs_get_float2};
-			binary ->  {plain,bs_get_binary2};
-			utf8 ->    {utf,bs_get_utf8};
-			utf16 ->   {utf,bs_get_utf16};
-			utf32 ->   {utf,bs_get_utf32}
-		   end,
-    case Format of
-	plain ->
-	    {test,Name,{f,Vf},Live,
-	     [CtxReg,SizeReg,Unit,{field_flags,Flags}],Rhd};
-	utf ->
-	    {test,Name,{f,Vf},Live,
-	     [CtxReg,{field_flags,Flags}],Rhd}
-    end.
-
-build_skip_instr(Type, Vf, CtxReg, Live, SizeReg, Unit, Flags) ->
-    {Format,Name} = case Type of
-			utf8 -> {utf,bs_skip_utf8};
-			utf16 -> {utf,bs_skip_utf16};
-			utf32 -> {utf,bs_skip_utf32};
-			_ -> {plain,bs_skip_bits2}
-		    end,
-    case Format of
-	plain ->
-	    {test,Name,{f,Vf},[CtxReg,SizeReg,Unit,{field_flags,Flags}]};
-	utf ->
-	    {test,Name,{f,Vf},[CtxReg,Live,{field_flags,Flags}]}
-    end.
-
-select_val(#k_val_clause{val=#k_tuple{es=Es},body=B,anno=#l{i=I,vdb=Vdb}},
-           V, Vf, Bef, St0) ->
-    {Eis,Int,St1} = select_extract_tuple(V, Es, I, Vdb, Bef, St0),
-    {Bis,Aft,St2} = match_cg(B, Vf, Int, St1),
-    {length(Es),Eis ++ Bis,Aft,St2};
-select_val(#k_val_clause{val=Val0,body=B}, _V, Vf, Bef, St0) ->
-    Val = case Val0 of
-              #k_atom{val=Lit} -> Lit;
-              #k_float{val=Lit} -> Lit;
-              #k_int{val=Lit} -> Lit;
-              #k_literal{val=Lit} -> Lit
-          end,
-    {Bis,Aft,St1} = match_cg(B, Vf, Bef, St0),
-    {Val,Bis,Aft,St1}.
-
-%% select_extract_tuple(Src, [V], I, Vdb, StackReg, State) ->
-%%      {[E],StackReg,State}.
-%%  Extract tuple elements, but only if they do not immediately die.
-
-select_extract_tuple(Src, Vs, I, Vdb, Bef, St) ->
-    F = fun (#k_var{name=V}, {Int0,Elem}) ->
-		case vdb_find(V, Vdb) of
-		    {V,_,L} when L =< I -> {[], {Int0,Elem+1}};
-		    _Other ->
-			Reg1 = put_reg(V, Int0#sr.reg),
-			Int1 = Int0#sr{reg=Reg1},
-			Rsrc = fetch_var(Src, Int1),
-			{[{get_tuple_element,Rsrc,Elem,fetch_reg(V, Reg1)}],
-			 {Int1,Elem+1}}
-		end
-	end,
-    {Es,{Aft,_}} = flatmapfoldl(F, {Bef,0}, Vs),
-    {Es,Aft,St}.
-
-select_map(Scs, V, Tf, Vf, Bef, St0) ->
-    Reg = fetch_var(V, Bef),
-    {Is,Aft,St1} =
-	match_fmf(fun(#k_val_clause{val=#k_map{op=exact,es=Es},
-                                    body=B,anno=#l{i=I,vdb=Vdb}}, Fail, St1) ->
-                          select_map_val(V, Es, B, Fail, I, Vdb, Bef, St1)
-                  end, Vf, St0, Scs),
-    {[{test,is_map,{f,Tf},[Reg]}|Is],Aft,St1}.
-
-select_map_val(V, Es, B, Fail, I, Vdb, Bef, St0) ->
-    {Eis,Int,St1} = select_extract_map(V, Es, Fail, I, Vdb, Bef, St0),
-    {Bis,Aft,St2} = match_cg(B, Fail, Int, St1),
-    {Eis++Bis,Aft,St2}.
-
-select_extract_map(_, [], _, _, _, Bef, St) -> {[],Bef,St};
-select_extract_map(Src, Vs, Fail, I, Vdb, Bef, St) ->
-    %% First split the instruction flow
-    %% We want one set of each
-    %% 1) has_map_fields (no target registers)
-    %% 2) get_map_elements (with target registers)
-    %% Assume keys are term-sorted
-    Rsrc = fetch_var(Src, Bef),
-
-    {{HasKs,GetVs,HasVarKs,GetVarVs},Aft} =
-        foldr(fun(#k_map_pair{key=#k_var{name=K},val=#k_var{name=V}},
-                  {{HasKsi,GetVsi,HasVarVsi,GetVarVsi},Int0}) ->
-                      case vdb_find(V, Vdb) of
-                          {V,_,L} when L =< I ->
-                              RK = fetch_var(K,Int0),
-                              {{HasKsi,GetVsi,[RK|HasVarVsi],GetVarVsi},Int0};
-                          _Other ->
-                              Reg1 = put_reg(V, Int0#sr.reg),
-                              Int1 = Int0#sr{reg=Reg1},
-                              RK = fetch_var(K,Int0),
-                              RV = fetch_reg(V,Reg1),
-                              {{HasKsi,GetVsi,HasVarVsi,[[RK,RV]|GetVarVsi]},Int1}
-                      end;
-                 (#k_map_pair{key=Key,val=#k_var{name=V}},
-                  {{HasKsi,GetVsi,HasVarVsi,GetVarVsi},Int0}) ->
-                      case vdb_find(V, Vdb) of
-                          {V,_,L} when L =< I ->
-                              {{[atomic(Key)|HasKsi],GetVsi,HasVarVsi,GetVarVsi},Int0};
-                          _Other ->
-                              Reg1 = put_reg(V, Int0#sr.reg),
-                              Int1 = Int0#sr{reg=Reg1},
-                              {{HasKsi,[atomic(Key),fetch_reg(V, Reg1)|GetVsi],
-                                HasVarVsi,GetVarVsi},Int1}
-                      end
-              end, {{[],[],[],[]},Bef}, Vs),
-
-    Code = [{test,has_map_fields,{f,Fail},Rsrc,{list,HasKs}} || HasKs =/= []] ++
-	   [{test,has_map_fields,{f,Fail},Rsrc,{list,[K]}}   || K <- HasVarKs] ++
-	   [{get_map_elements,   {f,Fail},Rsrc,{list,GetVs}} || GetVs =/= []] ++
-	   [{get_map_elements,   {f,Fail},Rsrc,{list,[K,V]}} || [K,V] <- GetVarVs],
-    {Code, 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),
-    {Bis,Aft,St} = match_cg(B, Fail, Int, St1),
-    {Gis ++ Bis,Aft,St}.
-
-%% guard_cg(Guard, Fail, Vdb, StackReg, State) ->
-%%      {[Ainstr],StackReg,State}.
-%%  A guard is a boolean expression of tests.  Tests return true or
-%%  false.  A fault in a test causes the test to return false.  Tests
-%%  never return the boolean, instead we generate jump code to go to
-%%  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{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,
-    case Inverted of
-	false ->
-	    test_cg(Test, As, Fail, I, Vdb, Bef, St0);
-	true ->
-	    {Psucc,St1} = new_label(St0),
-	    {Is,Aft,St2} = test_cg(Test, As, Psucc, I, Vdb, Bef, St1),
-	    {Is++[{jump,{f,Fail}},{label,Psucc}],Aft,St2}
-    end;
-guard_cg(G, _Fail, Vdb, Bef, St) ->
-    %%ok = io:fwrite("cg ~w: ~p~n", [?LINE,{G,Fail,Vdb,Bef}]),
-    {Gis,Aft,St1} = cg(G, 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
-%%  the next instruction and failure jumps to Fail.  If there are
-%%  return values then these must be set to 'false' on failure,
-%%  control always passes to the next instruction.
-
-protected_cg(Ts, [], Fail, Vdb, Bef, St0) ->
-    %% Protect these calls, revert when done.
-    {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, Vdb, Bef, St0) ->
-    {Pfail,St1} = new_label(St0),
-    {Psucc,St2} = new_label(St1),
-    {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.
-    Mis = [{move,{atom,false},fetch_var(V,Aft)}||#k_var{name=V} <- Rs],
-    {Tis ++ [{jump,{f,Psucc}},
-	     {label,Pfail}] ++ Mis ++ [{label,Psucc}],
-     Aft,St3#cg{bfail=St0#cg.bfail}}.    
-
-%% test_cg(TestName, Args, Fail, I, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
-%%  Generate test instruction.  Use explicit fail label here.
-
-test_cg(is_map, [A], Fail, I, Vdb, Bef, St) ->
-    %% We must avoid creating code like this:
-    %%
-    %%   move x(0) y(0)
-    %%   is_map Fail [x(0)]
-    %%   make_fun => x(0)  %% Overwrite x(0)
-    %%   put_map_assoc y(0) ...
-    %%
-    %% The code is safe, but beam_validator does not understand that.
-    %% Extending beam_validator to handle such (rare) code as the
-    %% above would make it slower for all programs. Instead, change
-    %% the code generator to always prefer the Y register for is_map()
-    %% and put_map_assoc() instructions, ensuring that they use the
-    %% same register.
-    Arg = cg_reg_arg_prefer_y(A, Bef),
-    Aft = clear_dead(Bef, I, Vdb),
-    {[{test,is_map,{f,Fail},[Arg]}],Aft,St};
-test_cg(is_boolean, [#k_atom{val=Val}], Fail, I, Vdb, Bef, St) ->
-    Aft = clear_dead(Bef, I, Vdb),
-    Is = case is_boolean(Val) of
-	     true -> [];
-	     false -> [{jump,{f,Fail}}]
-	 end,
-    {Is,Aft,St};
-test_cg(Test, As, Fail, I, Vdb, Bef, St) ->
-    Args = cg_reg_args(As, Bef),
-    Aft = clear_dead(Bef, I, Vdb),
-    {[beam_utils:bif_to_test(Test, Args, {f,Fail})],Aft,St}.
-
-%% 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
-%%  an externally generated failure label, LastFail.  N.B. We do not
-%%  know or care how the failure labels are used.
-
-match_fmf(F, LastFail, St, [H]) ->
-    F(H, LastFail, St);
-match_fmf(F, LastFail, St0, [H|T]) ->
-    {Fail,St1} = new_label(St0),
-    {R,Aft1,St2} = F(H, Fail, St1),
-    {Rs,Aft2,St3} = match_fmf(F, LastFail, St2, T),
-    {R ++ [{label,Fail}] ++ Rs,sr_merge(Aft1, Aft2),St3}.
-
-%% call_cg(Func, [Arg], [Ret], Le, Vdb, StackReg, State) ->
-%%      {[Ainstr],StackReg,State}.
-%% enter_cg(Func, [Arg], Le, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
-%%  Call and enter first put the arguments into registers and save any
-%%  other registers, then clean up and compress the stack and set the
-%%  frame size. Finally the actual call is made.  Call then needs the
-%%  return values filled in.
-
-call_cg(#k_var{}=Var, As, Rs, Le, Vdb, Bef, St0) ->
-    {Sis,Int} = cg_setup_call(As++[Var], Bef, Le#l.i, Vdb),
-    %% Put return values in registers.
-    Reg = load_vars(Rs, clear_regs(Int#sr.reg)),
-    %% Build complete code and final stack/register state.
-    Arity = length(As),
-    {Frees,Aft} = free_dead(clear_dead(Int#sr{reg=Reg}, Le#l.i, Vdb)),
-    {Sis ++ Frees ++ [line(Le),{call_fun,Arity}],Aft,
-     need_stack_frame(St0)};
-call_cg(#k_remote{mod=Mod,name=Name}, As, Rs, Le, Vdb, Bef, St0)
-  when is_record(Mod, k_var); is_record(Name, k_var) ->
-    {Sis,Int} = cg_setup_call(As++[Mod,Name], Bef, Le#l.i, Vdb),
-    %% Put return values in registers.
-    Reg = load_vars(Rs, clear_regs(Int#sr.reg)),
-    %% Build complete code and final stack/register state.
-    Arity = length(As),
-    St = need_stack_frame(St0),
-    %%{Call,St1} = build_call(Func, Arity, St0),
-    {Frees,Aft} = free_dead(clear_dead(Int#sr{reg=Reg}, Le#l.i, Vdb)),
-    {Sis ++ Frees ++ [line(Le),{apply,Arity}],Aft,St};
-call_cg(Func, As, Rs, Le, Vdb, Bef, St0) ->
-    case St0 of
-	#cg{bfail=Fail} when Fail =/= 0 ->
-	    %% Inside a guard. The only allowed function call is to
-	    %% erlang:error/1,2. We will generate the following code:
-	    %%
-	    %%     move {atom,ok} DestReg
-	    %%     jump FailureLabel
-	    #k_remote{mod=#k_atom{val=erlang},
-                      name=#k_atom{val=error}} = Func, %Assertion.
-	    [#k_var{name=DestVar}] = Rs,
-	    Int0 = clear_dead(Bef, Le#l.i, Vdb),
-	    Reg = put_reg(DestVar, Int0#sr.reg),
-	    Int = Int0#sr{reg=Reg},
-	    Dst = fetch_reg(DestVar, Reg),
-	    {[{move,{atom,ok},Dst},{jump,{f,Fail}}],
-	     clear_dead(Int, Le#l.i, Vdb),St0};
-	#cg{} ->
-	    %% Ordinary function call in a function body.
-	    {Sis,Int} = cg_setup_call(As, Bef, Le#l.i, Vdb),
-	    %% Put return values in registers.
-	    Reg = load_vars(Rs, clear_regs(Int#sr.reg)),
-	    %% Build complete code and final stack/register state.
-	    Arity = length(As),
-	    {Call,St1} = build_call(Func, Arity, St0),
-	    {Frees,Aft} = free_dead(clear_dead(Int#sr{reg=Reg}, Le#l.i, Vdb)),
-	    {Sis ++ Frees ++ [line(Le)|Call],Aft,St1}
-    end.
-
-build_call(#k_remote{mod=#k_atom{val=erlang},name=#k_atom{val='!'}}, 2, St0) ->
-    {[send],need_stack_frame(St0)};
-build_call(#k_remote{mod=#k_atom{val=Mod},name=#k_atom{val=Name}}, Arity, St0) ->
-    {[{call_ext,Arity,{extfunc,Mod,Name,Arity}}],need_stack_frame(St0)};
-build_call(#k_local{name=Name}, Arity, St0) when is_atom(Name) ->
-    {Lbl,St1} = local_func_label(Name, Arity, need_stack_frame(St0)),
-    {[{call,Arity,{f,Lbl}}],St1}.
-
-free_dead(#sr{stk=Stk0}=Aft) ->
-    {Instr,Stk} = free_dead(Stk0, 0, [], []),
-    {Instr,Aft#sr{stk=Stk}}.
-
-free_dead([dead|Stk], Y, Instr, StkAcc) ->
-    %% Note: kill/1 is equivalent to init/1 (translated by beam_asm).
-    %% We use kill/1 to help further optimisation passes.
-    free_dead(Stk, Y+1, [{kill,{yy,Y}}|Instr], [free|StkAcc]);
-free_dead([Any|Stk], Y, Instr, StkAcc) ->
-    free_dead(Stk, Y+1, Instr, [Any|StkAcc]);
-free_dead([], _, Instr, StkAcc) -> {Instr,reverse(StkAcc)}.
-
-enter_cg(#k_var{} = Var, As, Le, Vdb, Bef, St0) ->
-    {Sis,Int} = cg_setup_call(As++[Var], Bef, Le#l.i, Vdb),
-    %% Build complete code and final stack/register state.
-    Arity = length(As),
-    {Sis ++ [line(Le),{call_fun,Arity},return],
-     clear_dead(Int#sr{reg=clear_regs(Int#sr.reg)}, Le#l.i, Vdb),
-     need_stack_frame(St0)};
-enter_cg(#k_remote{mod=Mod,name=Name}, As, Le, Vdb, Bef, St0)
-  when is_record(Mod, k_var); is_record(Name, k_var) ->
-    {Sis,Int} = cg_setup_call(As++[Mod,Name], Bef, Le#l.i, Vdb),
-    %% Build complete code and final stack/register state.
-    Arity = length(As),
-    St = need_stack_frame(St0),
-    {Sis ++ [line(Le),{apply_only,Arity}],
-     clear_dead(Int#sr{reg=clear_regs(Int#sr.reg)}, Le#l.i, Vdb),
-     St};
-enter_cg(Func, As, Le, Vdb, Bef, St0) ->
-    {Sis,Int} = cg_setup_call(As, Bef, Le#l.i, Vdb),
-    %% Build complete code and final stack/register state.
-    Arity = length(As),
-    {Call,St1} = build_enter(Func, Arity, St0),
-    Line = enter_line(Func, Arity, Le),
-    {Sis ++ Line ++ Call,
-     clear_dead(Int#sr{reg=clear_regs(Int#sr.reg)}, Le#l.i, Vdb),
-     St1}.
-
-build_enter(#k_remote{mod=#k_atom{val=erlang},name=#k_atom{val='!'}}, 2, St0) ->
-    {[send,return],need_stack_frame(St0)};
-build_enter(#k_remote{mod=#k_atom{val=Mod},name=#k_atom{val=Name}}, Arity, St0) ->
-    St1 = case trap_bif(Mod, Name, Arity) of
-	      true -> need_stack_frame(St0);
-	      false -> St0
-	  end,
-    {[{call_ext_only,Arity,{extfunc,Mod,Name,Arity}}],St1};
-build_enter(#k_local{name=Name}, Arity, St0) when is_atom(Name) ->
-    {Lbl,St1} = local_func_label(Name, Arity, St0),
-    {[{call_only,Arity,{f,Lbl}}],St1}.
-
-enter_line(#k_remote{mod=#k_atom{val=Mod},name=#k_atom{val=Name}}, Arity, Le) ->
-    case erl_bifs:is_safe(Mod, Name, Arity) of
-	false ->
-	    %% Tail-recursive call, possibly to a BIF.
-	    %% We'll need a line instruction in case the
-	    %% BIF call fails.
-	    [line(Le)];
-	true ->
-	    %% Call to a safe BIF. Since it cannot fail,
-	    %% we don't need any line instruction here.
-	    []
-    end;
-enter_line(_, _, _) ->
-    %% Tail-recursive call to a local function. A line
-    %% instruction will not be useful.
-    [].
-
-%% local_func_label(Name, Arity, State) -> {Label,State'}
-%% local_func_label({Name,Arity}, State) -> {Label,State'}
-%%  Get the function entry label for a local function.
-
-local_func_label(Name, Arity, St) ->
-    local_func_label({Name,Arity}, St).
-
-local_func_label(Key, #cg{functable=Map}=St0) ->
-    case Map of
-        #{Key := Label} -> {Label,St0};
-        _ ->
-  	    {Label,St} = new_label(St0),
-	    {Label,St#cg{functable=Map#{Key => Label}}}
-    end.
-
-%% need_stack_frame(State) -> State'
-%%  Make a note in the state that this function will need a stack frame.
-
-need_stack_frame(#cg{need_frame=true}=St) -> St;
-need_stack_frame(St) -> St#cg{need_frame=true}.
-
-%% trap_bif(Mod, Name, Arity) -> true|false
-%%   Trap bifs that need a stack frame.
-
-trap_bif(erlang, link, 1) -> true;
-trap_bif(erlang, unlink, 1) -> true;
-trap_bif(erlang, monitor_node, 2) -> true;
-trap_bif(erlang, group_leader, 2) -> true;
-trap_bif(erlang, exit, 2) -> true;
-trap_bif(_, _, _) -> false.
-
-%% bif_cg(#k_bif{}, Le, Vdb, StackReg, State) ->
-%%      {[Ainstr],StackReg,State}.
-%%  Generate code a BIF.
-
-bif_cg(#k_bif{op=#k_internal{name=Name},args=As,ret=Rs}, Le, Vdb, Bef, St) ->
-    internal_cg(Name, As, Rs, Le, Vdb, Bef, St);
-bif_cg(#k_bif{op=#k_remote{mod=#k_atom{val=erlang},name=#k_atom{val=Name}},
-              args=As,ret=Rs}, Le, Vdb, Bef, St) ->
-    Ar = length(As),
-    case is_gc_bif(Name, Ar) of
-	false ->
-            bif_cg(Name, As, Rs, Le, Vdb, Bef, St);
-	true ->
-            gc_bif_cg(Name, As, Rs, Le, Vdb, Bef, St)
-    end.
-
-%% internal_cg(Bif, [Arg], [Ret], Le, Vdb, StackReg, State) ->
-%%      {[Ainstr],StackReg,State}.
-
-internal_cg(bs_context_to_binary=Instr, [Src0], [], Le, Vdb, Bef, St0) ->
-    [Src] = cg_reg_args([Src0], Bef),
-    {[{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,
-    {[{set_tuple_element,New,Tuple,Index}],
-     clear_dead(Bef, Le#l.i, Vdb), St0};
-internal_cg(make_fun, [Func0,Arity0|As], Rs, Le, Vdb, Bef, St0) ->
-    %% This behaves more like a function call.
-    #k_atom{val=Func} = Func0,
-    #k_int{val=Arity} = Arity0,
-    {Sis,Int} = cg_setup_call(As, Bef, Le#l.i, Vdb),
-    Reg = load_vars(Rs, clear_regs(Int#sr.reg)),
-    {FuncLbl,St1} = local_func_label(Func, Arity, St0),
-    MakeFun = {make_fun2,{f,FuncLbl},0,0,length(As)},
-    {Sis ++ [MakeFun],
-     clear_dead(Int#sr{reg=Reg}, Le#l.i, Vdb),
-     St1};
-internal_cg(bs_init_writable=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(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);
-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}.
-
-bif_cg(Bif, As, [#k_var{name=V}], Le, Vdb, Bef, St0) ->
-    Ars = cg_reg_args(As, Bef),
-
-    %% If we are inside a catch and in a body (not in guard) and the
-    %% BIF may fail, we must save everything that will be alive after
-    %% the catch (because the code after the code assumes that all
-    %% variables that are live are stored on the stack).
-    %%
-    %%   Currently, we are somewhat pessimistic in
-    %% that we save any variable that will be live after this BIF call.
-
-    MayFail = not erl_bifs:is_safe(erlang, Bif, length(As)),
-    {Sis,Int0} =
-	case MayFail of
-	    true ->
-		maybe_adjust_stack(Bef, Le#l.i, Le#l.i+1, Vdb, St0);
-	    false ->
-		{[],Bef}
-	end,
-    Int1 = clear_dead(Int0, Le#l.i, Vdb),
-    Reg = put_reg(V, Int1#sr.reg),
-    Int = Int1#sr{reg=Reg},
-    Dst = fetch_reg(V, Reg),
-    BifFail = {f,St0#cg.bfail},
-    %% We need a line instructions for BIFs that may fail in a body.
-    Line = case BifFail of
-	       {f,0} when MayFail ->
-		   [line(Le)];
-	       _ ->
-		   []
-	   end,
-    {Sis++Line++[{bif,Bif,BifFail,Ars,Dst}],
-     clear_dead(Int, Le#l.i, Vdb), St0}.
-
-
-%% gc_bif_cg(Bif, [Arg], [Ret], Le, Vdb, StackReg, State) ->
-%%      {[Ainstr],StackReg,State}.
-
-gc_bif_cg(Bif, As, [#k_var{name=V}], Le, Vdb, Bef, St0) ->
-    Ars = cg_reg_args(As, Bef),
-
-    %% If we are inside a catch and in a body (not in guard) and the
-    %% BIF may fail, we must save everything that will be alive after
-    %% the catch (because the code after the code assumes that all
-    %% variables that are live are stored on the stack).
-    %%
-    %%   Currently, we are somewhat pessimistic in
-    %% that we save any variable that will be live after this BIF call.
-
-    {Sis,Int0} = maybe_adjust_stack(Bef, Le#l.i, Le#l.i+1, Vdb, St0),
-
-    Int1 = clear_dead(Int0, Le#l.i, Vdb),
-    Reg = put_reg(V, Int1#sr.reg),
-    Int = Int1#sr{reg=Reg},
-    Dst = fetch_reg(V, Reg),
-    BifFail = {f,St0#cg.bfail},
-    Line = case BifFail of
-	       {f,0} -> [line(Le)];
-	       {f,_} -> []
-	   end,
-    {Sis++Line++[{gc_bif,Bif,BifFail,max_reg(Bef#sr.reg),Ars,Dst}],
-     clear_dead(Int, Le#l.i, Vdb), St0}.
-
-%% recv_loop_cg(TimeOut, ReceiveVar, ReceiveMatch, TimeOutExprs,
-%%              [Ret], Le, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
-
-recv_loop_cg(Te, Rvar, Rm, Tes, Rs, Le, Vdb, Bef, St0) ->
-    {Sis,Int0} = adjust_stack(Bef, Le#l.i, Le#l.i, Vdb),
-    Int1 = Int0#sr{reg=clear_regs(Int0#sr.reg)},
-    %% Get labels.
-    {Rl,St1} = new_label(St0),
-    {Tl,St2} = new_label(St1),
-    {Bl,St3} = new_label(St2),
-    St4 = St3#cg{break=Bl,recv=Rl},		%Set correct receive labels
-    {Ris,Raft,St5} = cg_recv_mesg(Rvar, Rm, Tl, Int1, St4),
-    {Wis,Taft,St6} = cg_recv_wait(Te, Tes, Le#l.i, Int1, St5),
-    Int2 = sr_merge(Raft, Taft),		%Merge stack/registers
-    Reg = load_vars(Rs, Int2#sr.reg),
-    {Sis ++ [line(Le)] ++ Ris ++ [{label,Tl}] ++ Wis ++ [{label,Bl}],
-     clear_dead(Int2#sr{reg=Reg}, Le#l.i, Vdb),
-     St6#cg{break=St0#cg.break,recv=St0#cg.recv}}.
-
-%% cg_recv_mesg( ) -> {[Ainstr],Aft,St}.
-
-cg_recv_mesg(#k_var{name=R}, Rm, Tl, Bef, St0) ->
-    Int0 = Bef#sr{reg=put_reg(R, Bef#sr.reg)},
-    Ret = fetch_reg(R, Int0#sr.reg),
-    %% Int1 = clear_dead(Int0, I, Rm#l.vdb),
-    Int1 = Int0,
-    {Mis,Int2,St1} = match_cg(Rm, none, Int1, St0),
-    {[{label,St1#cg.recv},{loop_rec,{f,Tl},Ret}|Mis],Int2,St1}.
-
-%% cg_recv_wait(Te, Tes, I, Vdb, Int2, St3) -> {[Ainstr],Aft,St}.
-
-cg_recv_wait(#k_atom{val=infinity}, #cg_block{anno=Le,es=Tes}, I, Bef, St0) ->
-    %% We know that the 'after' body will never be executed.
-    %% 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.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.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.vdb,
-			     Int0#sr{reg=clear_regs(Int0#sr.reg)}, St0),
-    {[{wait_timeout,{f,St1#cg.recv},Reg},timeout] ++ Tis,Int,St1}.
-
-%% recv_next_cg(Le, Vdb, StackReg, St) -> {[Ainstr],StackReg,St}.
-%%  Use adjust stack to clear stack, but only need it for Aft.
-
-recv_next_cg(Le, Vdb, Bef, St) ->
-    {Sis,Aft} = adjust_stack(Bef, Le#l.i, Le#l.i+1, Vdb),
-    {[{loop_rec_end,{f,St#cg.recv}}] ++ Sis,Aft,St}.	%Joke
-
-%% try_cg(TryBlock, [BodyVar], TryBody, [ExcpVar], TryHandler, [Ret],
-%%        Le, Vdb, StackReg, St) -> {[Ainstr],StackReg,St}.
-
-try_cg(Ta, Vs, Tb, Evs, Th, Rs, Le, Vdb, Bef, St0) ->
-    {B,St1} = new_label(St0),			%Body label
-    {H,St2} = new_label(St1),			%Handler label
-    {E,St3} = new_label(St2),			%End label
-    #l{i=TryTag} = get_kanno(Ta),
-    Int1 = Bef#sr{stk=put_catch(TryTag, Bef#sr.stk)},
-    TryReg = fetch_stack({catch_tag,TryTag}, Int1#sr.stk),
-    {Ais,Int2,St4} = cg(Ta, Vdb, Int1, St3#cg{break=B,in_catch=true}),
-    Int3 = Int2#sr{stk=drop_catch(TryTag, Int2#sr.stk)},
-    St5 = St4#cg{break=E,in_catch=St3#cg.in_catch},
-    {Bis,Baft,St6} = cg(Tb, Vdb, Int3#sr{reg=load_vars(Vs, Int3#sr.reg)}, St5),
-    {His,Haft,St7} = cg(Th, Vdb, Int3#sr{reg=load_vars(Evs, Int3#sr.reg)}, St6),
-    Int4 = sr_merge(Baft, Haft),		%Merge stack/registers
-    Aft = Int4#sr{reg=load_vars(Rs, Int4#sr.reg)},
-    {[{'try',TryReg,{f,H}}] ++ Ais ++ 
-     [{label,B},{try_end,TryReg}] ++ Bis ++
-     [{label,H},{try_case,TryReg}] ++ His ++
-     [{label,E}],
-     clear_dead(Aft, Le#l.i, Vdb),
-     St7#cg{break=St0#cg.break}}.     
-
-try_enter_cg(Ta, Vs, Tb, Evs, Th, Le, Vdb, Bef, St0) ->
-    {B,St1} = new_label(St0),			%Body label
-    {H,St2} = new_label(St1),			%Handler label
-    #l{i=TryTag} = get_kanno(Ta),
-    Int1 = Bef#sr{stk=put_catch(TryTag, Bef#sr.stk)},
-    TryReg = fetch_stack({catch_tag,TryTag}, Int1#sr.stk),
-    {Ais,Int2,St3} = cg(Ta, Vdb, Int1, St2#cg{break=B,in_catch=true}),
-    Int3 = Int2#sr{stk=drop_catch(TryTag, Int2#sr.stk)},
-    St4 = St3#cg{in_catch=St2#cg.in_catch},
-    {Bis,Baft,St5} = cg(Tb, Vdb, Int3#sr{reg=load_vars(Vs, Int3#sr.reg)}, St4),
-    {His,Haft,St6} = cg(Th, Vdb, Int3#sr{reg=load_vars(Evs, Int3#sr.reg)}, St5),
-    Int4 = sr_merge(Baft, Haft),		%Merge stack/registers
-    Aft = Int4,
-    {[{'try',TryReg,{f,H}}] ++ Ais ++ 
-     [{label,B},{try_end,TryReg}] ++ Bis ++
-     [{label,H},{try_case,TryReg}] ++ His,
-     clear_dead(Aft, Le#l.i, Vdb),
-     St6#cg{break=St0#cg.break}}.     
-
-%% catch_cg(CatchBlock, Ret, Le, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
-
-catch_cg(#cg_block{es=C}, #k_var{name=R}, Le, Vdb, Bef, St0) ->
-    {B,St1} = new_label(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.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)},
-    {[{'catch',CatchReg,{f,B}}] ++ Cis ++
-     [{label,B},{catch_end,CatchReg}],
-     clear_dead(Aft, Le#l.i, Vdb),
-     St2#cg{break=St1#cg.break,in_catch=St1#cg.in_catch}}.
-
-%% put_cg([Var], Constr, Le, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
-%%  We have to be careful how a 'put' works. First the structure is
-%%  built, then it is filled and finally things can be cleared. The
-%%  annotation must reflect this and make sure that the return
-%%  variable is allocated first.
-%%
-%%  put_list and put_map are atomic instructions, both of
-%%  which can safely resuse one of the source registers as target.
-
-put_cg([#k_var{name=R}], #k_cons{hd=Hd,tl=Tl}, Le, Vdb, Bef, St) ->
-    [S1,S2] = cg_reg_args([Hd,Tl], Bef),
-    Int0 = clear_dead(Bef, Le#l.i, Vdb),
-    Int1 = Int0#sr{reg=put_reg(R, Int0#sr.reg)},
-    Ret = fetch_reg(R, Int1#sr.reg),
-    {[{put_list,S1,S2,Ret}], Int1, St};
-put_cg([#k_var{name=R}], #k_binary{segs=Segs}, Le, Vdb, Bef,
-       #cg{bfail=Bfail}=St) ->
-    %% At run-time, binaries are constructed in three stages:
-    %% 1) First the size of the binary is calculated.
-    %% 2) Then the binary is allocated.
-    %% 3) Then each field in the binary is constructed.
-    %% For simplicity, we use the target register to also hold the
-    %% size of the binary. Therefore the target register must *not*
-    %% be one of the source registers.
-
-    %% First allocate the target register.
-    Int0 = Bef#sr{reg=put_reg(R, Bef#sr.reg)},
-    Target = fetch_reg(R, Int0#sr.reg),
-
-    %% Also allocate a scratch register for size calculations.
-    Temp = find_scratch_reg(Int0#sr.reg),
-
-    %% First generate the code that constructs each field.
-    Fail = {f,Bfail},
-    PutCode = cg_bin_put(Segs, Fail, Bef),
-    {Sis,Int1} = maybe_adjust_stack(Int0, Le#l.i, Le#l.i+1, Vdb, St),
-    MaxRegs = max_reg(Bef#sr.reg),
-    Aft = clear_dead(Int1, Le#l.i, Vdb),
-
-    %% Now generate the complete code for constructing the binary.
-    Code = cg_binary(PutCode, Target, Temp, Fail, MaxRegs, Le#l.a),
-    {Sis++Code,Aft,St};
-
-%% Map: single variable key.
-put_cg([#k_var{name=R}], #k_map{op=Op,var=Map,
-                                es=[#k_map_pair{key=#k_var{}=K,val=V}]},
-       Le, Vdb, Bef, St0) ->
-    {Sis,Int0} = maybe_adjust_stack(Bef, Le#l.i, Le#l.i+1, Vdb, St0),
-
-    SrcReg = cg_reg_arg_prefer_y(Map, Int0),
-    Line = line(Le#l.a),
-
-    List = [cg_reg_arg(K,Int0),cg_reg_arg(V,Int0)],
-
-    Live = max_reg(Bef#sr.reg),
-
-    %% The target register can reuse one of the source registers.
-    Aft0 = clear_dead(Int0, Le#l.i, Vdb),
-    Aft = Aft0#sr{reg=put_reg(R, Aft0#sr.reg)},
-    Target = fetch_reg(R, Aft#sr.reg),
-
-    {Is,St1} = put_cg_map(Line, Op, SrcReg, Target, Live, List, St0),
-    {Sis++Is,Aft,St1};
-
-%% Map: (possibly) multiple literal keys.
-put_cg([#k_var{name=R}], #k_map{op=Op,var=Map,es=Es}, Le, Vdb, Bef, St0) ->
-
-    %% assert key literals
-    [] = [Var || #k_map_pair{key=#k_var{}=Var} <- Es],
-
-    {Sis,Int0} = maybe_adjust_stack(Bef, Le#l.i, Le#l.i+1, Vdb, St0),
-    SrcReg = cg_reg_arg_prefer_y(Map, Int0),
-    Line = line(Le#l.a),
-
-    %% fetch registers for values to be put into the map
-    List = flatmap(fun(#k_map_pair{key=K,val=V}) ->
-                           [atomic(K),cg_reg_arg(V, Int0)]
-                   end, Es),
-
-    Live = max_reg(Bef#sr.reg),
-
-    %% The target register can reuse one of the source registers.
-    Aft0 = clear_dead(Int0, Le#l.i, Vdb),
-    Aft = Aft0#sr{reg=put_reg(R, Aft0#sr.reg)},
-    Target = fetch_reg(R, Aft#sr.reg),
-
-    {Is,St1} = put_cg_map(Line, Op, SrcReg, Target, Live, List, St0),
-    {Sis++Is,Aft,St1};
-
-%% Everything else.
-put_cg([#k_var{name=R}], Con, Le, Vdb, Bef, St) ->
-    %% Find a place for the return register first.
-    Int = Bef#sr{reg=put_reg(R, Bef#sr.reg)},
-    Ret = fetch_reg(R, Int#sr.reg),
-    Ais = case Con of
-	      #k_tuple{es=Es} ->
-		  [{put_tuple,length(Es),Ret}] ++ cg_build_args(Es, Bef);
-	      Other ->
-		  [{move,cg_reg_arg(Other, Int),Ret}]
-	  end,
-    {Ais,clear_dead(Int, Le#l.i, Vdb),St}.
-
-
-put_cg_map(Line, Op0, SrcReg, Target, Live, List, St0) ->
-    Bfail = St0#cg.bfail,
-    Fail = {f,St0#cg.bfail},
-    Op = case Op0 of
-	     assoc -> put_map_assoc;
-	     exact -> put_map_exact
-	 end,
-    {OkLbl,St1} = new_label(St0),
-    {BadLbl,St2} = new_label(St1),
-    Is = if
-	     Bfail =:= 0 orelse Op =:= put_map_assoc ->
-		 [Line,{Op,{f,0},SrcReg,Target,Live,{list,List}}];
-	     true ->
-		 %% Ensure that Target is always set, even if
-		 %% the map update operation fails. That is necessary
-		 %% because Target may be included in a test_heap
-		 %% instruction.
-		 [Line,
-		  {Op,{f,BadLbl},SrcReg,Target,Live,{list,List}},
-		  {jump,{f,OkLbl}},
-		  {label,BadLbl},
-		  {move,{atom,ok},Target},
-		  {jump,Fail},
-		  {label,OkLbl}]
-	 end,
-    {Is,St2}.
-
-%%%
-%%% Code generation for constructing binaries.
-%%%
-
-cg_binary([{bs_put_binary,Fail,{atom,all},U,_Flags,Src}|PutCode],
-	  Target, Temp, Fail, MaxRegs, Anno) ->
-    Line = line(Anno),
-    Live = cg_live(Target, MaxRegs),
-    SzCode = cg_bitstr_size(PutCode, Target, Temp, Fail, Live),
-    BinFlags = {field_flags,[]},
-    Code = [Line|SzCode] ++
-	[case member(single_use, Anno) of
-	     true ->
-		 {bs_private_append,Fail,Target,U,Src,BinFlags,Target};
-	     false ->
-		 {bs_append,Fail,Target,0,MaxRegs,U,Src,BinFlags,Target}
-	 end] ++ PutCode,
-    cg_bin_opt(Code);
-cg_binary(PutCode, Target, Temp, Fail, MaxRegs, Anno) ->
-    Line = line(Anno),
-    Live = cg_live(Target, MaxRegs),
-    {InitOp,SzCode} = cg_binary_size(PutCode, Target, Temp, Fail, Live),
-
-    Code = [Line|SzCode] ++ [{InitOp,Fail,Target,0,MaxRegs,
-			      {field_flags,[]},Target}|PutCode],
-    cg_bin_opt(Code).
-
-cg_live({x,X}, MaxRegs) when X =:= MaxRegs -> MaxRegs+1;
-cg_live({x,X}, MaxRegs) when X < MaxRegs -> MaxRegs.
-
-%% Generate code that calculate the size of the bitstr to be
-%% built in BITS.
-
-cg_bitstr_size(PutCode, Target, Temp, Fail, Live) ->
-    {Bits,Es} = cg_bitstr_size_1(PutCode, 0, []),
-    reverse(cg_gen_binsize(Es, Target, Temp, Fail, Live,
-			   [{move,{integer,Bits},Target}])).
-
-cg_bitstr_size_1([{bs_put_utf8,_,_,Src}|Next], Bits, Acc) ->
-    cg_bitstr_size_1(Next, Bits, [{'*',{bs_utf8_size,Src},8}|Acc]);
-cg_bitstr_size_1([{bs_put_utf16,_,_,Src}|Next], Bits, Acc) ->
-    cg_bitstr_size_1(Next, Bits, [{'*',{bs_utf16_size,Src},8}|Acc]);
-cg_bitstr_size_1([{bs_put_utf32,_,_,_}|Next], Bits, Acc) ->
-    cg_bitstr_size_1(Next, Bits+32, Acc);
-cg_bitstr_size_1([{_,_,S,U,_,Src}|Next], Bits, Acc) ->
-    case S of
-	{integer,N} -> cg_bitstr_size_1(Next, Bits+N*U, Acc);
-	{atom,all} -> cg_bitstr_size_1(Next, Bits, [{bit_size,Src}|Acc]);
-	_ when U =:= 1 -> cg_bitstr_size_1(Next, Bits, [S|Acc]);
-	_ -> cg_bitstr_size_1(Next, Bits, [{'*',S,U}|Acc])
-    end;
-cg_bitstr_size_1([], Bits, Acc) -> {Bits,Acc}.
-
-%% Generate code that calculate the size of the bitstr to be
-%% built in BYTES or BITS (depending on what is easiest).
-
-cg_binary_size(PutCode, Target, Temp, Fail, Live) ->
-    {InitInstruction,Szs} = cg_binary_size_1(PutCode, 0, []),
-    SizeExpr = reverse(cg_gen_binsize(Szs, Target, Temp, Fail, Live, [{move,{integer,0},Target}])),
-    {InitInstruction,SizeExpr}.
-
-cg_binary_size_1([{bs_put_utf8,_Fail,_Flags,Src}|T], Bits, Acc) ->
-    cg_binary_size_1(T, Bits, [{8,{bs_utf8_size,Src}}|Acc]);
-cg_binary_size_1([{bs_put_utf16,_Fail,_Flags,Src}|T], Bits, Acc) ->
-    cg_binary_size_1(T, Bits, [{8,{bs_utf16_size,Src}}|Acc]);
-cg_binary_size_1([{bs_put_utf32,_Fail,_Flags,_Src}|T], Bits, Acc) ->
-    cg_binary_size_1(T, Bits+32, Acc);
-cg_binary_size_1([{_Put,_Fail,S,U,_Flags,Src}|T], Bits, Acc) ->
-    cg_binary_size_2(S, U, Src, T, Bits, Acc);
-cg_binary_size_1([], Bits, Acc) ->
-    Bytes = Bits div 8,
-    RemBits = Bits rem 8,
-    Sizes0 = sort([{1,{integer,RemBits}},{8,{integer,Bytes}}|Acc]),
-    Sizes = filter(fun({_,{integer,0}}) -> false;
-		      (_) -> true end, Sizes0),
-    case Sizes of
-	[{1,_}|_] ->
-	    {bs_init_bits,cg_binary_bytes_to_bits(Sizes, [])};
-	[{8,_}|_] ->
-	    {bs_init2,[E || {8,E} <- Sizes]};
-	[] ->
-	    {bs_init_bits,[]}
-    end.
-
-cg_binary_size_2({integer,N}, U, _, Next, Bits, Acc) ->
-    cg_binary_size_1(Next, Bits+N*U, Acc);
-cg_binary_size_2({atom,all}, U, E, Next, Bits, Acc) ->
-    if 
-	U rem 8 =:= 0 ->
-	    cg_binary_size_1(Next, Bits, [{8,{byte_size,E}}|Acc]);
-	true ->
-	    cg_binary_size_1(Next, Bits, [{1,{bit_size,E}}|Acc])
-    end;
-cg_binary_size_2(Reg, 1, _, Next, Bits, Acc) ->
-    cg_binary_size_1(Next, Bits, [{1,Reg}|Acc]);
-cg_binary_size_2(Reg, 8, _, Next, Bits, Acc) ->
-    cg_binary_size_1(Next, Bits, [{8,Reg}|Acc]);
-cg_binary_size_2(Reg, U, _, Next, Bits, Acc) ->
-    cg_binary_size_1(Next, Bits, [{1,{'*',Reg,U}}|Acc]).
-
-cg_binary_bytes_to_bits([{8,{integer,N}}|T], Acc) ->
-    cg_binary_bytes_to_bits(T, [{integer,8*N}|Acc]);
-cg_binary_bytes_to_bits([{8,{byte_size,Reg}}|T], Acc) ->
-    cg_binary_bytes_to_bits(T, [{bit_size,Reg}|Acc]);
-cg_binary_bytes_to_bits([{8,Reg}|T], Acc) ->
-    cg_binary_bytes_to_bits(T, [{'*',Reg,8}|Acc]);
-cg_binary_bytes_to_bits([{1,Sz}|T], Acc) ->
-    cg_binary_bytes_to_bits(T, [Sz|Acc]);
-cg_binary_bytes_to_bits([], Acc) ->
-    cg_binary_bytes_to_bits_1(sort(Acc)).
-
-cg_binary_bytes_to_bits_1([{integer,I},{integer,J}|T]) ->
-    cg_binary_bytes_to_bits_1([{integer,I+J}|T]);
-cg_binary_bytes_to_bits_1([H|T]) ->
-    [H|cg_binary_bytes_to_bits_1(T)];
-cg_binary_bytes_to_bits_1([]) -> [].
-
-cg_gen_binsize([{'*',{bs_utf8_size,Src},B}|T], Target, Temp, Fail, Live, Acc) ->
-    Size = {bs_utf8_size,Fail,Src,Temp},
-    Add = {bs_add,Fail,[Target,Temp,B],Target},
-    cg_gen_binsize(T, Target, Temp, Fail, Live,
-		   [Add,Size|Acc]);
-cg_gen_binsize([{'*',{bs_utf16_size,Src},B}|T], Target, Temp, Fail, Live, Acc) ->
-    Size = {bs_utf16_size,Fail,Src,Temp},
-    Add = {bs_add,Fail,[Target,Temp,B],Target},
-    cg_gen_binsize(T, Target, Temp, Fail, Live,
-		   [Add,Size|Acc]);
-cg_gen_binsize([{'*',A,B}|T], Target, Temp, Fail, Live, Acc) ->
-    cg_gen_binsize(T, Target, Temp, Fail, Live,
-		   [{bs_add,Fail,[Target,A,B],Target}|Acc]);
-cg_gen_binsize([{bit_size,B}|T], Target, Temp, Fail, Live, Acc) ->
-    cg_gen_binsize([Temp|T], Target, Temp, Fail, Live,
-		   [{gc_bif,bit_size,Fail,Live,[B],Temp}|Acc]);
-cg_gen_binsize([{byte_size,B}|T], Target, Temp, Fail, Live, Acc) ->
-    cg_gen_binsize([Temp|T], Target, Temp, Fail, Live,
-		   [{gc_bif,byte_size,Fail,Live,[B],Temp}|Acc]);
-cg_gen_binsize([{bs_utf8_size,B}|T], Target, Temp, Fail, Live, Acc) ->
-    cg_gen_binsize([Temp|T], Target, Temp, Fail, Live,
-		   [{bs_utf8_size,Fail,B,Temp}|Acc]);
-cg_gen_binsize([{bs_utf16_size,B}|T], Target, Temp, Fail, Live, Acc) ->
-    cg_gen_binsize([Temp|T], Target, Temp, Fail, Live,
-		   [{bs_utf16_size,Fail,B,Temp}|Acc]);
-cg_gen_binsize([E0|T], Target, Temp, Fail, Live, Acc) ->
-    cg_gen_binsize(T, Target, Temp, Fail, Live,
-		   [{bs_add,Fail,[Target,E0,1],Target}|Acc]);
-cg_gen_binsize([], _, _, _, _, Acc) -> Acc.
-
-
-%% cg_bin_opt(Code0) -> Code
-%%  Optimize the size calculations for binary construction.
-
-cg_bin_opt([{move,S1,{x,X}=D},{gc_bif,Op,Fail,Live0,As,Dst}|Is]) ->
-    Live = if
-               X + 1 =:= Live0 -> X;
-               true -> Live0
-           end,
-    [{gc_bif,Op,Fail,Live,As,D}|cg_bin_opt([{move,S1,Dst}|Is])];
-cg_bin_opt([{move,_,_}=I1,{Op,_,_,_}=I2|Is])
-  when Op =:= bs_utf8_size orelse Op =:= bs_utf16_size ->
-    [I2|cg_bin_opt([I1|Is])];
-cg_bin_opt([{bs_add,_,[{integer,0},Src,1],Dst}|Is]) ->
-    cg_bin_opt_1([{move,Src,Dst}|Is]);
-cg_bin_opt([{bs_add,_,[Src,{integer,0},_],Dst}|Is]) ->
-    cg_bin_opt_1([{move,Src,Dst}|Is]);
-cg_bin_opt(Is) ->
-    cg_bin_opt_1(Is).
-
-cg_bin_opt_1([{move,Size,D},{bs_append,Fail,D,Extra,Regs,U,Bin,Flags,D}|Is]) ->
-    [{bs_append,Fail,Size,Extra,Regs,U,Bin,Flags,D}|cg_bin_opt(Is)];
-cg_bin_opt_1([{move,Size,D},{bs_private_append,Fail,D,U,Bin,Flags,D}|Is]) ->
-    [{bs_private_append,Fail,Size,U,Bin,Flags,D}|cg_bin_opt(Is)];
-cg_bin_opt_1([{move,Size,D},{Op,Fail,D,Extra,Regs,Flags,D}|Is])
-  when Op =:= bs_init2; Op =:= bs_init_bits ->
-    Bytes = case Size of
-                {integer,Int} -> Int;
-                _ -> Size
-            end,
-    [{Op,Fail,Bytes,Extra,Regs,Flags,D}|cg_bin_opt(Is)];
-cg_bin_opt_1([{move,S1,D},{bs_add,Fail,[D,S2,U],Dst}|Is]) ->
-    cg_bin_opt([{bs_add,Fail,[S1,S2,U],Dst}|Is]);
-cg_bin_opt_1([{move,S1,D},{bs_add,Fail,[S2,D,U],Dst}|Is]) ->
-    cg_bin_opt([{bs_add,Fail,[S2,S1,U],Dst}|Is]);
-cg_bin_opt_1([I|Is]) ->
-    [I|cg_bin_opt(Is)];
-cg_bin_opt_1([]) ->
-    [].
-
-cg_bin_put(#k_bin_seg{size=S0,unit=U,type=T,flags=Fs,seg=E0,next=Next},
-           Fail, Bef) ->
-    S1 = cg_reg_arg(S0, Bef),
-    E1 = cg_reg_arg(E0, Bef),
-    {Format,Op} = case T of
-		      integer -> {plain,bs_put_integer};
-		      utf8 ->    {utf,bs_put_utf8};
-		      utf16 ->   {utf,bs_put_utf16};
-		      utf32 ->   {utf,bs_put_utf32};
-		      binary  -> {plain,bs_put_binary};
-		      float   -> {plain,bs_put_float}
-		  end,
-    case Format of
-	plain ->
-	    [{Op,Fail,S1,U,{field_flags,Fs},E1}|cg_bin_put(Next, Fail, Bef)];
-	utf ->
-	    [{Op,Fail,{field_flags,Fs},E1}|cg_bin_put(Next, Fail, Bef)]
-    end;
-cg_bin_put(#k_bin_end{}, _, _) -> [].
-
-cg_build_args(As, Bef) ->
-    [{put,cg_reg_arg(A, Bef)} || A <- As].
-
-%% return_cg([Val], Le, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
-%% break_cg([Val], Le, Vdb, Bef, St) -> {[Ainstr],Aft,St}.
-%%  These are very simple, just put return/break values in registers
-%%  from 0, then return/break.  Use the call setup to clean up stack,
-%%  but must clear registers to ensure sr_merge works correctly.
-
-return_cg(Rs, Le, Vdb, Bef, St) ->
-    {Ms,Int} = cg_setup_call(Rs, Bef, Le#l.i, Vdb),
-    {Ms ++ [return],Int#sr{reg=clear_regs(Int#sr.reg)},St}.
-
-break_cg(Bs, Le, Vdb, Bef, St) ->
-    {Ms,Int} = cg_setup_call(Bs, Bef, Le#l.i, Vdb),
-    {Ms ++ [{jump,{f,St#cg.break}}],
-     Int#sr{reg=clear_regs(Int#sr.reg)},St}.
-
-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(Reg0)),
-    {BreakVars,_} = mapfoldl(fun(_, RegNum) ->
-				     {{RegNum,gbreakvar},RegNum+1}
-			     end, length(Reg2), Bs),
-    Reg = Reg2 ++ BreakVars,
-    Aft = Int#sr{reg=Reg},
-    {Moves ++ [{jump,{f,St#cg.break}}],Aft,St}.
-
-%% cg_reg_arg(Arg0, Info) -> Arg
-%% cg_reg_args([Arg0], Info) -> [Arg]
-%%  Convert argument[s] into registers. Literal values are returned unchanged.
-
-cg_reg_args(As, Bef) -> [cg_reg_arg(A, Bef) || A <- As].
-
-cg_reg_arg(#k_var{name=V}, Bef) -> fetch_var(V, Bef);
-cg_reg_arg(Literal, _) -> atomic(Literal).
-
-cg_reg_arg_prefer_y(#k_var{name=V}, Bef) -> fetch_var_prefer_y(V, Bef);
-cg_reg_arg_prefer_y(Literal, _) -> atomic(Literal).
-
-%% cg_setup_call([Arg], Bef, Cur, Vdb) -> {[Instr],Aft}.
-%%  Do the complete setup for a call/enter.
-
-cg_setup_call(As, Bef, I, Vdb) ->
-    {Ms,Int0} = cg_call_args(As, Bef, I, Vdb),
-    %% Have set up arguments, can now clean up, compress and save to stack.
-    Int1 = Int0#sr{stk=clear_dead_stk(Int0#sr.stk, I, Vdb),res=[]},
-    {Sis,Int2} = adjust_stack(Int1, I, I+1, Vdb),
-    {Ms ++ Sis,Int2}.
-
-%% cg_call_args([Arg], SrState) -> {[Instr],SrState}.
-%%  Setup the arguments to a call/enter/bif. Put the arguments into
-%%  consecutive registers starting at {x,0} moving any data which
-%%  needs to be saved. Return a modified SrState structure with the
-%%  new register contents.  N.B. the resultant register info will
-%%  contain non-variable values when there are non-variable values.
-%%
-%%  This routine is complicated by unsaved values in x registers.
-%%  We'll move away any unsaved values that are in the registers
-%%  to be overwritten by the arguments.
-
-cg_call_args(As, Bef, I, Vdb) ->
-    Regs0 = load_arg_regs(Bef#sr.reg, As),
-    Unsaved = unsaved_registers(Regs0, Bef#sr.stk, I, I+1, Vdb),
-    {UnsavedMoves,Regs} = move_unsaved(Unsaved, Bef#sr.reg, Regs0),
-    Moves0 = gen_moves(As, Bef),
-    Moves = order_moves(Moves0, find_scratch_reg(Regs)),
-    {UnsavedMoves ++ Moves,Bef#sr{reg=Regs}}.
-
-%% load_arg_regs([Reg], Arguments) -> [Reg]
-%%  Update the register descriptor to include the arguments (from {x,0}
-%%  and upwards). Values in argument register are overwritten.
-%%  Values in x registers above the arguments are preserved.
-
-load_arg_regs(Regs, As) -> load_arg_regs(Regs, As, 0).
-
-load_arg_regs([_|Rs], [#k_var{name=V}|As], I) -> [{I,V}|load_arg_regs(Rs, As, I+1)];
-load_arg_regs([_|Rs], [A|As], I) -> [{I,A}|load_arg_regs(Rs, As, I+1)];
-load_arg_regs([], [#k_var{name=V}|As], I) -> [{I,V}|load_arg_regs([], As, I+1)];
-load_arg_regs([], [A|As], I) -> [{I,A}|load_arg_regs([], As, I+1)];
-load_arg_regs(Rs, [], _) -> Rs.
-
-%% Returns the variables must be saved and are currently in the
-%% x registers that are about to be overwritten by the arguments.
-
-unsaved_registers(Regs, Stk, Fb, Lf, Vdb) ->
-    [V || {V,F,L} <- Vdb,
-	  F < Fb,
-	  L >= Lf,
-	  not on_stack(V, Stk),
-	  not in_reg(V, Regs)].
-
-in_reg(V, Regs) -> keymember(V, 2, Regs).
-
-%% Move away unsaved variables from the registers that are to be
-%% overwritten by the arguments.
-move_unsaved(Vs, OrigRegs, NewRegs) ->
-    move_unsaved(Vs, OrigRegs, NewRegs, []).
-    
-move_unsaved([V|Vs], OrigRegs, NewRegs0, Acc) ->
-    NewRegs = put_reg(V, NewRegs0),
-    Src = fetch_reg(V, OrigRegs),
-    Dst = fetch_reg(V, NewRegs),
-    move_unsaved(Vs, OrigRegs, NewRegs, [{move,Src,Dst}|Acc]);
-move_unsaved([], _, Regs, Acc) -> {Acc,Regs}.
-    
-%% gen_moves(As, Sr)
-%%  Generate the basic move instruction to move the arguments
-%%  to their proper registers. The list will be sorted on
-%%  destinations. (I.e. the move to {x,0} will be first --
-%%  see the comment to order_moves/2.)
-
-gen_moves(As, Sr) -> gen_moves(As, Sr, 0, []).
-
-gen_moves([#k_var{name=V}|As], Sr, I, Acc) ->
-    case fetch_var(V, Sr) of
-	{x,I} -> gen_moves(As, Sr, I+1, Acc);
-	Reg -> gen_moves(As, Sr, I+1, [{move,Reg,{x,I}}|Acc])
-    end;
-gen_moves([A0|As], Sr, I, Acc) ->
-    A = atomic(A0),
-    gen_moves(As, Sr, I+1, [{move,A,{x,I}}|Acc]);
-gen_moves([], _, _, Acc) -> lists:keysort(3, Acc).
-
-%% order_moves([Move], ScratchReg) -> [Move]
-%%  Orders move instruction so that source registers are not
-%%  destroyed before they are used. If there are cycles
-%%  (such as {move,{x,0},{x,1}}, {move,{x,1},{x,1}}),
-%%  the scratch register is used to break up the cycle.
-%%    If possible, the first move of the input list is placed
-%%  last in the result list (to make the move to {x,0} occur
-%%  just before the call to allow the Beam loader to coalesce
-%%  the instructions).
-
-order_moves(Ms, Scr) -> order_moves(Ms, Scr, []).
-
-order_moves([{move,_,_}=M|Ms0], ScrReg, Acc0) ->
-    {Chain,Ms} = collect_chain(Ms0, [M], ScrReg),
-    Acc = reverse(Chain, Acc0),
-    order_moves(Ms, ScrReg, Acc);
-order_moves([], _, Acc) -> Acc.
-
-collect_chain(Ms, Path, ScrReg) ->
-    collect_chain(Ms, Path, [], ScrReg).
-
-collect_chain([{move,Src,Same}=M|Ms0], [{move,Same,_}|_]=Path, Others, ScrReg) ->
-    case lists:keyfind(Src, 3, Path) of
-	false ->
-	    collect_chain(reverse(Others, Ms0), [M|Path], [], ScrReg);
-	_ ->	% We have a cycle.
-	    {break_up_cycle(M, Path, ScrReg),reverse(Others, Ms0)}
-    end;
-collect_chain([M|Ms], Path, Others, ScrReg) ->
-    collect_chain(Ms, Path, [M|Others], ScrReg);
-collect_chain([], Path, Others, _) ->
-    {Path,Others}.
-
-break_up_cycle({move,Src,_}=M, Path, ScrReg) ->
-    [{move,ScrReg,Src},M|break_up_cycle1(Src, Path, ScrReg)].
-
-break_up_cycle1(Dst, [{move,Src,Dst}|Path], ScrReg) ->
-    [{move,Src,ScrReg}|Path];
-break_up_cycle1(Dst, [M|Path], LastMove) ->
-    [M|break_up_cycle1(Dst, Path, LastMove)].
-
-%% clear_dead(Sr, Until, Vdb) -> Aft.
-%%  Remove all variables in Sr which have died AT ALL so far.
-
-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) ->
-    [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
-	    {V} = T ->
-            case vdb_find(V, Vdb) of
-                {V,_,L} when L > Until -> T;
-                _ -> dead   %Remove anything else
-            end;
-        free -> free;
-        dead -> dead
-     end || S <- Stk].
-
-
-%% sr_merge(Sr1, Sr2) -> Sr.
-%%  Merge two stack/register states keeping the longest of both stack
-%%  and register. Perform consistency check on both, elements must be
-%%  the same.  Allow frame size 'void' to make easy creation of
-%%  "empty" frame.
-
-sr_merge(#sr{reg=R1,stk=S1,res=[]}, #sr{reg=R2,stk=S2,res=[]}) ->
-    #sr{reg=longest(R1, R2),stk=longest(S1, S2),res=[]};
-sr_merge(void, S2) -> S2#sr{res=[]}.
-
-longest([H|T1], [H|T2]) -> [H|longest(T1, T2)];
-longest([dead|T1], [free|T2]) -> [dead|longest(T1, T2)];
-longest([free|T1], [dead|T2]) -> [dead|longest(T1, T2)];
-longest([dead|_] = L, []) -> L;
-longest([], [dead|_] = L) -> L;
-longest([free|_] = L, []) -> L;
-longest([], [free|_] = L) -> L;
-longest([], []) -> [].
-
-trim_free([R|Rs0]) ->
-    case {trim_free(Rs0),R} of
-	{[],free} -> [];
-	{Rs,R} -> [R|Rs]
-    end;
-trim_free([]) -> [].
-
-%% maybe_adjust_stack(Bef, FirstBefore, LastFrom, Vdb, St) -> {[Ainstr],Aft}.
-%%  Adjust the stack, but only if the code is inside a catch and not
-%%  inside a guard.  Use this funtion before instructions that may
-%%  cause an exception.
-
-maybe_adjust_stack(Bef, Fb, Lf, Vdb, St) ->
-    case St of
-	#cg{in_catch=true,bfail=0} ->
-	    adjust_stack(Bef, Fb, Lf, Vdb);
-	#cg{} ->
-	    {[],Bef}
-    end.
-
-%% adjust_stack(Bef, FirstBefore, LastFrom, Vdb) -> {[Ainstr],Aft}.
-%%  Do complete stack adjustment by compressing stack and adding
-%%  variables to be saved.  Try to optimise ordering on stack by
-%%  having reverse order to their lifetimes.
-%%
-%%  In Beam, there is a fixed stack frame and no need to do stack compression.
-
-adjust_stack(Bef, Fb, Lf, Vdb) ->
-    Stk0 = Bef#sr.stk,
-    {Stk1,Saves} = save_stack(Stk0, Fb, Lf, Vdb),
-    {saves(Saves, Bef#sr.reg, Stk1),
-     Bef#sr{stk=Stk1}}.
-
-%% save_stack(Stack, FirstBefore, LastFrom, Vdb) -> {[SaveVar],NewStack}.
-%%  Save variables which are used past current point and which are not
-%%  already on the stack.
-
-save_stack(Stk0, Fb, Lf, Vdb) ->
-    %% New variables that are in use but not on stack.
-    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.
-
-saves(Ss, Reg, Stk) ->
-    [{move,fetch_reg(V, Reg),fetch_stack(V, Stk)} || V <- Ss].
-
-%% fetch_var(VarName, StkReg) -> r{R} | sp{Sp}.
-%% find_var(VarName, StkReg) -> ok{r{R} | sp{Sp}} | error.
-%%  Fetch/find a variable in either the registers or on the
-%%  stack. Fetch KNOWS it's there.
-
-fetch_var(V, Sr) ->
-    case find_reg(V, Sr#sr.reg) of
-	{ok,R} -> R;
-	error -> fetch_stack(V, Sr#sr.stk)
-    end.
-
-fetch_var_prefer_y(V, #sr{reg=Reg,stk=Stk}) ->
-    case find_stack(V, Stk) of
-	{ok,R} -> R;
-	error -> fetch_reg(V, Reg)
-    end.
-
-load_vars(Vs, Regs) ->
-    foldl(fun (#k_var{name=V}, Rs) -> put_reg(V, Rs) end, Regs, Vs).
-
-%% put_reg(Val, Regs) -> Regs.
-%% find_reg(Val, Regs) -> {ok,r{R}} | error.
-%% fetch_reg(Val, Regs) -> r{R}.
-%%  Functions to interface the registers.
-
-% put_regs(Vs, Rs) -> foldl(fun put_reg/2, Rs, Vs).
-
-put_reg(V, Rs) -> put_reg_1(V, Rs, 0).
-
-put_reg_1(V, [free|Rs], I) -> [{I,V}|Rs];
-put_reg_1(V, [{reserved,I,V}|Rs], I) -> [{I,V}|Rs];
-put_reg_1(V, [R|Rs], I) -> [R|put_reg_1(V, Rs, I+1)];
-put_reg_1(V, [], I) -> [{I,V}].
-
-fetch_reg(V, [{I,V}|_]) -> {x,I};
-fetch_reg(V, [_|SRs]) -> fetch_reg(V, SRs).
-
-find_reg(V, [{I,V}|_]) -> {ok,{x,I}};
-find_reg(V, [_|SRs]) -> find_reg(V, SRs);
-find_reg(_, []) -> error.
-
-%% For the bit syntax, we need a scratch register if we are constructing
-%% a binary that will not be used.
-
-find_scratch_reg(Rs) -> find_scratch_reg(Rs, 0).
-    
-find_scratch_reg([free|_], I) -> {x,I};
-find_scratch_reg([_|Rs], I) -> find_scratch_reg(Rs, I+1);
-find_scratch_reg([], I) -> {x,I}.
-
-replace_reg_contents(Old, New, [{I,Old}|Rs]) -> [{I,New}|Rs];
-replace_reg_contents(Old, New, [R|Rs]) -> [R|replace_reg_contents(Old, New, Rs)].
-
-%%clear_regs(Regs) -> map(fun (R) -> free end, Regs).
-clear_regs(_) -> [].
-
-max_reg(Regs) ->
-    foldl(fun ({I,_}, _) -> I;
-	      (_, Max) -> Max end,
-	  -1, Regs) + 1.
-
-%% put_stack(Val, [{Val}]) -> [{Val}].
-%% fetch_stack(Var, Stk) -> sp{S}.
-%% find_stack(Var, Stk) -> ok{sp{S}} | error.
-%%  Functions to interface the stack.
-
-put_stack(Val, []) -> [{Val}];
-put_stack(Val, [dead|Stk]) -> [{Val}|Stk];
-put_stack(Val, [free|Stk]) -> [{Val}|Stk];
-put_stack(Val, [NotFree|Stk]) -> [NotFree|put_stack(Val, Stk)].
-
-put_stack_carefully(Val, Stk0) ->
-    try
-	put_stack_carefully1(Val, Stk0)
-    catch
-	throw:error ->
-	    error
-    end.
-
-put_stack_carefully1(_, []) -> throw(error);
-put_stack_carefully1(Val, [dead|Stk]) -> [{Val}|Stk];
-put_stack_carefully1(Val, [free|Stk]) -> [{Val}|Stk];
-put_stack_carefully1(Val, [NotFree|Stk]) ->
-    [NotFree|put_stack_carefully1(Val, Stk)].
-
-fetch_stack(Var, Stk) -> fetch_stack(Var, Stk, 0).
-
-fetch_stack(V, [{V}|_], I) -> {yy,I};
-fetch_stack(V, [_|Stk], I) -> fetch_stack(V, Stk, I+1).
-
-find_stack(Var, Stk) -> find_stack(Var, Stk, 0).
-
-find_stack(V, [{V}|_], I) -> {ok,{yy,I}};
-find_stack(V, [_|Stk], I) -> find_stack(V, Stk, I+1);
-find_stack(_, [], _) -> error.
-
-on_stack(V, Stk) -> keymember(V, 1, Stk).
-
-%% put_catch(CatchTag, Stack) -> Stack'
-%% drop_catch(CatchTag, Stack) -> Stack'
-%%  Special interface for putting and removing catch tags, to ensure that
-%%  catches nest properly. Also used for try tags.
-
-put_catch(Tag, Stk0) -> put_catch(Tag, reverse(Stk0), []).
-
-put_catch(Tag, [], Stk) ->
-    put_stack({catch_tag,Tag}, Stk);
-put_catch(Tag, [{{catch_tag,_}}|_]=RevStk, Stk) ->
-    reverse(RevStk, put_stack({catch_tag,Tag}, Stk));
-put_catch(Tag, [Other|Stk], Acc) ->
-    put_catch(Tag, Stk, [Other|Acc]).
-
-drop_catch(Tag, [{{catch_tag,Tag}}|Stk]) -> [free|Stk];
-drop_catch(Tag, [Other|Stk]) -> [Other|drop_catch(Tag, Stk)].
-
-%% atomic(Klit) -> Lit.
-%% atomic_list([Klit]) -> [Lit].
-
-atomic(#k_literal{val=V}) -> {literal,V};
-atomic(#k_int{val=I}) -> {integer,I};
-atomic(#k_float{val=F}) -> {float,F};
-atomic(#k_atom{val=A}) -> {atom,A};
-%%atomic(#k_char{val=C}) -> {char,C};
-atomic(#k_nil{}) -> nil.
-
-%% new_label(St) -> {L,St}.
-
-new_label(#cg{lcount=Next}=St) ->
-    {Next,St#cg{lcount=Next+1}}.
-
-%% line(Le) -> {line,[] | {location,File,Line}}
-%%  Create a line instruction, containing information about
-%%  the current filename and line number. A line information
-%%  instruction should be placed before any operation that could
-%%  cause an exception.
-
-line(#l{a=Anno}) ->
-    line(Anno);
-line([Line,{file,Name}]) when is_integer(Line) ->
-    line_1(Name, Line);
-line([_|_]=A) ->
-    {Name,Line} = find_loc(A, no_file, 0),
-    line_1(Name, Line);
-line([]) ->
-    {line,[]}.
-
-line_1(no_file, _) ->
-    {line,[]};
-line_1(_, 0) ->
-    %% Missing line number or line number 0.
-    {line,[]};
-line_1(Name, Line) ->
-    {line,[{location,Name,Line}]}.
-
-find_loc([Line|T], File, _) when is_integer(Line) ->
-    find_loc(T, File, Line);
-find_loc([{file,File}|T], _, Line) ->
-    find_loc(T, File, Line);
-find_loc([_|T], File, Line) ->
-    find_loc(T, File, Line);
-find_loc([], File, Line) -> {File,Line}.
-
-flatmapfoldl(F, Accu0, [Hd|Tail]) ->
-    {R,Accu1} = F(Hd, Accu0),
-    {Rs,Accu2} = flatmapfoldl(F, Accu1, Tail),
-    {R++Rs,Accu2};
-flatmapfoldl(_, Accu, []) -> {[],Accu}.
-
-%% Keep track of life time for variables.
-%%
-%% init_vars([{var,VarName}]) -> Vdb.
-%% new_vars([VarName], I, Vdb) -> Vdb.
-%% use_vars([VarName], I, Vdb) -> Vdb.
-%% add_var(VarName, F, L, Vdb) -> Vdb.
-%%
-%% The list of variable names for new_vars/3 and use_vars/3
-%% must be sorted.
-
-init_vars(Vs) ->
-    vdb_new(Vs).
-
-new_vars([], _, Vdb) -> Vdb;
-new_vars([V], I, Vdb) -> vdb_store_new(V, {V,I,I}, Vdb);
-new_vars(Vs, I, Vdb) -> vdb_update_vars(Vs, Vdb, I).
-
-use_vars([], _, Vdb) ->
-    Vdb;
-use_vars([V], I, Vdb) ->
-    case vdb_find(V, Vdb) of
-        {V,F,L} when I > L -> vdb_update(V, {V,F,I}, Vdb);
-        {V,_,_} -> Vdb;
-        error -> vdb_store_new(V, {V,I,I}, Vdb)
-    end;
-use_vars(Vs, I, Vdb) -> vdb_update_vars(Vs, Vdb, I).
-
-add_var(V, F, L, Vdb) ->
-    vdb_store_new(V, {V,F,L}, Vdb).
-
-%% vdb
-
-vdb_new(Vs) ->
-    ordsets:from_list([{V,0,0} || #k_var{name=V} <- Vs]).
-
--type var() :: atom().
-
--spec vdb_find(var(), [vdb_entry()]) -> 'error' | vdb_entry().
-
-vdb_find(V, Vdb) ->
-    case lists:keyfind(V, 1, Vdb) of
-        false -> error;
-        Vd -> Vd
-    end.
-
-vdb_update(V, Update, [{V,_,_}|Vdb]) ->
-    [Update|Vdb];
-vdb_update(V, Update, [Vd|Vdb]) ->
-    [Vd|vdb_update(V, Update, Vdb)].
-
-vdb_store_new(V, New, [{V1,_,_}=Vd|Vdb]) when V > V1 ->
-    [Vd|vdb_store_new(V, New, Vdb)];
-vdb_store_new(V, New, [{V1,_,_}|_]=Vdb) when V < V1 ->
-    [New|Vdb];
-vdb_store_new(_, New, []) -> [New].
-
-vdb_update_vars([V|_]=Vs, [{V1,_,_}=Vd|Vdb], I) when V > V1 ->
-    [Vd|vdb_update_vars(Vs, Vdb, I)];
-vdb_update_vars([V|Vs], [{V1,_,_}|_]=Vdb, I) when V < V1 ->
-    %% New variable.
-    [{V,I,I}|vdb_update_vars(Vs, Vdb, I)];
-vdb_update_vars([V|Vs], [{_,F,L}=Vd|Vdb], I) ->
-    %% Existing variable.
-    if
-        I > L -> [{V,F,I}|vdb_update_vars(Vs, Vdb, I)];
-        true ->  [Vd|vdb_update_vars(Vs, Vdb, I)]
-    end;
-vdb_update_vars([V|Vs], [], I) ->
-    %% New variable.
-    [{V,I,I}|vdb_update_vars(Vs, [], I)];
-vdb_update_vars([], Vdb, _) -> Vdb.
-
-%% vdb_sub(Min, Max, Vdb) -> Vdb.
-%%  Extract variables which are used before and after Min.  Lock
-%%  variables alive after Max.
-
-vdb_sub(Min, Max, Vdb) ->
-    [ if L >= Max -> {V,F,locked};
-         true -> Vd
-      end || {V,F,L}=Vd <- Vdb,
-             F < Min,
-             L >= Min ].
diff --git a/lib/compiler/src/v3_core.erl b/lib/compiler/src/v3_core.erl
index c9517c3e51..007a0247f4 100644
--- a/lib/compiler/src/v3_core.erl
+++ b/lib/compiler/src/v3_core.erl
@@ -228,7 +228,8 @@ function({function,_,Name,Arity,Cs0}, Ws0, File, Opts) ->
 
 body(Cs0, Name, Arity, St0) ->
     Anno = lineno_anno(element(2, hd(Cs0)), St0),
-    {Args,St1} = new_vars(Anno, Arity, St0),
+    {Args0,St1} = new_vars(Anno, Arity, St0),
+    Args = reverse(Args0),                      %Nicer order
     case clauses(Cs0, St1) of
 	{Cs1,[],St2} ->
 	    {Ps,St3} = new_vars(Arity, St2),    %Need new variables here
@@ -329,7 +330,7 @@ gexpr({protect,Line,Arg}, Bools0, St0) ->
 	    {#iprotect{anno=#a{anno=Anno},body=Eps++[E]},[],Bools0,St}
     end;
 gexpr({op,_,'andalso',_,_}=E0, Bools, St0) ->
-    {op,L,'andalso',E1,E2} = right_assoc(E0, 'andalso', St0),
+    {op,L,'andalso',E1,E2} = right_assoc(E0, 'andalso'),
     Anno = lineno_anno(L, St0),
     {#c_var{name=V0},St} = new_var(Anno, St0),
     V = {var,L,V0},
@@ -337,7 +338,7 @@ gexpr({op,_,'andalso',_,_}=E0, Bools, St0) ->
     E = make_bool_switch_guard(L, E1, V, E2, False),
     gexpr(E, Bools, St);
 gexpr({op,_,'orelse',_,_}=E0, Bools, St0) ->
-    {op,L,'orelse',E1,E2} = right_assoc(E0, 'orelse', St0),
+    {op,L,'orelse',E1,E2} = right_assoc(E0, 'orelse'),
     Anno = lineno_anno(L, St0),
     {#c_var{name=V0},St} = new_var(Anno, St0),
     V = {var,L,V0},
@@ -766,14 +767,16 @@ expr({op,_,'++',{lc,Llc,E,Qs0},More}, St0) ->
     {Qs,St2} = preprocess_quals(Llc, Qs0, St1),
     {Y,Yps,St} = lc_tq(Llc, E, Qs, Mc, St2),
     {Y,Mps++Yps,St};
-expr({op,L,'andalso',E1,E2}, St0) ->
+expr({op,_,'andalso',_,_}=E0, St0) ->
+    {op,L,'andalso',E1,E2} = right_assoc(E0, 'andalso'),
     Anno = lineno_anno(L, St0),
     {#c_var{name=V0},St} = new_var(Anno, St0),
     V = {var,L,V0},
     False = {atom,L,false},
     E = make_bool_switch(L, E1, V, E2, False, St0),
     expr(E, St);
-expr({op,L,'orelse',E1,E2}, St0) ->
+expr({op,_,'orelse',_,_}=E0, St0) ->
+    {op,L,'orelse',E1,E2} = right_assoc(E0, 'orelse'),
     Anno = lineno_anno(L, St0),
     {#c_var{name=V0},St} = new_var(Anno, St0),
     V = {var,L,V0},
@@ -1808,7 +1811,8 @@ force_safe(Ce, St0) ->
 
 is_safe(#c_cons{}) -> true;
 is_safe(#c_tuple{}) -> true;
-is_safe(#c_var{}) -> true;
+is_safe(#c_var{name={_,_}}) -> false;           %Fun. Not safe.
+is_safe(#c_var{name=_}) -> true;                %Ordinary variable.
 is_safe(#c_literal{}) -> true;
 is_safe(_) -> false.
 
@@ -2057,17 +2061,9 @@ fail_clause(Pats, Anno, Arg) ->
 			    args=[Arg]}]}.
 
 %% Optimization for Dialyzer.
-right_assoc(E, Op, St) ->
-    case member(dialyzer, St#core.opts) of
-        true ->
-            right_assoc2(E, Op);
-        false ->
-            E
-    end.
-
-right_assoc2({op,L1,Op,{op,L2,Op,E1,E2},E3}, Op) ->
-    right_assoc2({op,L2,Op,E1,{op,L1,Op,E2,E3}}, Op);
-right_assoc2(E, _Op) -> E.
+right_assoc({op,L1,Op,{op,L2,Op,E1,E2},E3}, Op) ->
+    right_assoc({op,L2,Op,E1,{op,L1,Op,E2,E3}}, Op);
+right_assoc(E, _Op) -> E.
 
 annotate_tuple(A, Es, St) ->
     case member(dialyzer, St#core.opts) of
@@ -2626,7 +2622,8 @@ cfun(#ifun{anno=A,id=Id,vars=Args,clauses=Lcs,fc=Lfc}, _As, St0) ->
      [],A#a.us,St2}.
 
 c_call_erl(Fun, Args) ->
-    cerl:c_call(cerl:c_atom(erlang), cerl:c_atom(Fun), Args).
+    As = [compiler_generated],
+    cerl:ann_c_call(As, cerl:c_atom(erlang), cerl:c_atom(Fun), Args).
 
 %% lit_vars(Literal) -> [Var].
 
diff --git a/lib/compiler/src/v3_kernel.erl b/lib/compiler/src/v3_kernel.erl
index aef0b6cc9f..e2b8787224 100644
--- a/lib/compiler/src/v3_kernel.erl
+++ b/lib/compiler/src/v3_kernel.erl
@@ -82,8 +82,7 @@
 -export([module/2,format_error/1]).
 
 -import(lists, [map/2,foldl/3,foldr/3,mapfoldl/3,splitwith/2,member/2,
-		keymember/3,keyfind/3,partition/2,droplast/1,last/1,sort/1,
-                reverse/1]).
+		keyfind/3,partition/2,droplast/1,last/1,sort/1,reverse/1]).
 -import(ordsets, [add_element/2,del_element/2,union/2,union/1,subtract/2]).
 -import(cerl, [c_tuple/1]).
 
@@ -1415,8 +1414,6 @@ is_remote_bif(_, _, _) -> false.
 %%  return multiple values.  Only used in bodies where a BIF may be
 %%  called for effect only.
 
-bif_vals(dsetelement, 3) -> 0;
-bif_vals(bs_context_to_binary, 1) -> 0;
 bif_vals(_, _) -> 1.
 
 bif_vals(_, _, _) -> 1.
@@ -1593,19 +1590,12 @@ match_var([U|Us], Cs0, Def, St) ->
 %%  constructor/constant as first argument.  Group the constructors
 %%  according to type, the order is really irrelevant but tries to be
 %%  smart.
-
-match_con(Us, Cs0, Def, St) ->
-    %% Expand literals at the top level.
-    Cs = [expand_pat_lit_clause(C) || C <- Cs0],
-    match_con_1(Us, Cs, Def, St).
-
-match_con_1([U|_Us] = L, Cs, Def, St0) ->
+match_con([U|_Us] = L, Cs, Def, St0) ->
     %% Extract clauses for different constructors (types).
     %%ok = io:format("match_con ~p~n", [Cs]),
-    Ttcs0 = select_types([k_binary], Cs) ++ select_bin_con(Cs) ++
-        select_types([k_cons,k_tuple,k_map,k_atom,k_float,
-                      k_int,k_nil], Cs),
-    Ttcs = opt_single_valued(Ttcs0),
+    Ttcs0 = select_types(Cs, [], [], [], [], [], [], [], [], []),
+    Ttcs1 = [{T, Types} || {T, [_ | _] = Types} <- Ttcs0],
+    Ttcs = opt_single_valued(Ttcs1),
     %%ok = io:format("ttcs = ~p~n", [Ttcs]),
     {Scs,St1} =
 	mapfoldl(fun ({T,Tcs}, St) ->
@@ -1616,8 +1606,41 @@ match_con_1([U|_Us] = L, Cs, Def, St0) ->
 		 St0, Ttcs),
     {build_alt_1st_no_fail(build_select(U, Scs), Def),St1}.
 
-select_types(Types, Cs) ->
-    [{T,Tcs} || T <- Types, begin Tcs = select(T, Cs), Tcs =/= [] end].
+select_types([NoExpC | Cs], Bin, BinCon, Cons, Tuple, Map, Atom, Float, Int, Nil) ->
+    C = expand_pat_lit_clause(NoExpC),
+    case clause_con(C) of
+	k_binary ->
+	    select_types(Cs, [C |Bin], BinCon, Cons, Tuple, Map, Atom, Float, Int, Nil);
+	k_bin_seg ->
+	    select_types(Cs, Bin, [C | BinCon], Cons, Tuple, Map, Atom, Float, Int, Nil);
+	k_bin_end ->
+	    select_types(Cs, Bin, [C | BinCon], Cons, Tuple, Map, Atom, Float, Int, Nil);
+	k_cons ->
+	    select_types(Cs, Bin, BinCon, [C | Cons], Tuple, Map, Atom, Float, Int, Nil);
+	k_tuple ->
+	    select_types(Cs, Bin, BinCon, Cons, [C | Tuple], Map, Atom, Float, Int, Nil);
+	k_map ->
+	    select_types(Cs, Bin, BinCon, Cons, Tuple, [C | Map], Atom, Float, Int, Nil);
+	k_atom ->
+	    select_types(Cs, Bin, BinCon, Cons, Tuple, Map, [C | Atom], Float, Int, Nil);
+	k_float ->
+	    select_types(Cs, Bin, BinCon, Cons, Tuple, Map, Atom, [C | Float], Int, Nil);
+	k_int ->
+	    select_types(Cs, Bin, BinCon, Cons, Tuple, Map, Atom, Float, [C | Int], Nil);
+	k_nil ->
+	    select_types(Cs, Bin, BinCon, Cons, Tuple, Map, Atom, Float, Int, [C | Nil])
+    end;
+select_types([], Bin, BinCon, Cons, Tuple, Map, Atom, Float, Int, Nil) ->
+    [{k_binary, reverse(Bin)}] ++ handle_bin_con(reverse(BinCon)) ++
+	[
+	    {k_cons, reverse(Cons)},
+	    {k_tuple, reverse(Tuple)},
+	    {k_map, reverse(Map)},
+	    {k_atom, reverse(Atom)},
+	    {k_float, reverse(Float)},
+	    {k_int, reverse(Int)},
+	    {k_nil, reverse(Nil)}
+	].
 
 expand_pat_lit_clause(#iclause{pats=[#ialias{pat=#k_literal{anno=A,val=Val}}=Alias|Ps]}=C) ->
     P = expand_pat_lit(Val, A),
@@ -1746,20 +1769,12 @@ combine_bin_segs(#k_bin_end{}) ->
 combine_bin_segs(_) ->
     throw(not_possible).
 
-%% select_bin_con([Clause]) -> [{Type,[Clause]}].
-%%  Extract clauses for the k_bin_seg constructor.  As k_bin_seg
+%% handle_bin_con([Clause]) -> [{Type,[Clause]}].
+%%  Handle clauses for the k_bin_seg constructor.  As k_bin_seg
 %%  matching can overlap, the k_bin_seg constructors cannot be
 %%  reordered, only grouped.
 
-select_bin_con(Cs0) ->
-    Cs1 = lists:filter(fun (C) ->
-			       Con = clause_con(C),
-			       (Con =:= k_bin_seg) or (Con =:= k_bin_end)
-		       end, Cs0),
-    select_bin_con_1(Cs1).
-
-
-select_bin_con_1(Cs) ->
+handle_bin_con(Cs) ->
     try
 	%% The usual way to match literals is to first extract the
 	%% value to a register, and then compare the register to the
@@ -1798,14 +1813,14 @@ select_bin_con_1(Cs) ->
 	end
     catch
 	throw:not_possible ->
-	    select_bin_con_2(Cs)
+	    handle_bin_con_not_possible(Cs)
     end.
 
-select_bin_con_2([C1|Cs]) ->
+handle_bin_con_not_possible([C1|Cs]) ->
     Con = clause_con(C1),
     {More,Rest} = splitwith(fun (C) -> clause_con(C) =:= Con end, Cs),
-    [{Con,[C1|More]}|select_bin_con_2(Rest)];
-select_bin_con_2([]) -> [].
+    [{Con,[C1|More]}|handle_bin_con_not_possible(Rest)];
+handle_bin_con_not_possible([]) -> [].
 
 %% select_bin_int([Clause]) -> {k_bin_int,[Clause]}
 %%  If the first pattern in each clause selects the same integer,
@@ -1905,10 +1920,6 @@ select_utf8(Val0) ->
 	    throw(not_possible)
     end.
 
-%% select(Con, [Clause]) -> [Clause].
-
-select(T, Cs) -> [ C || C <- Cs, clause_con(C) =:= T ].
-
 %% match_value([Var], Con, [Clause], Default, State) -> {SelectExpr,State}.
 %%  At this point all the clauses have the same constructor, we must
 %%  now separate them according to value.
@@ -2044,8 +2055,9 @@ get_match(#k_binary{}, St0) ->
     {[V]=Mes,St1} = new_vars(1, St0),
     {#k_binary{segs=V},Mes,St1};
 get_match(#k_bin_seg{size=#k_atom{val=all},next={k_bin_end,[]}}=Seg, St0) ->
-    {[S]=Vars,St1} = new_vars(1, St0),
-    {Seg#k_bin_seg{seg=S,next=[]},Vars,St1};
+    {[S,N0],St1} = new_vars(2, St0),
+    N = set_kanno(N0, [no_usage]),
+    {Seg#k_bin_seg{seg=S,next=N},[S],St1};
 get_match(#k_bin_seg{}=Seg, St0) ->
     {[S,N0],St1} = new_vars(2, St0),
     N = set_kanno(N0, [no_usage]),
@@ -2343,8 +2355,7 @@ uexpr(#k_bif{anno=A,op=Op,args=As}=Bif, {break,Rs}, St0) ->
     {Brs,St1} = bif_returns(Op, Rs, St0),
     {Bif#k_bif{anno=#k{us=Used,ns=lit_list_vars(Brs),a=A},ret=Brs},
      Used,St1};
-uexpr(#k_match{anno=A,vars=Vs0,body=B0}, Br, St0) ->
-    Vs = handle_reuse_annos(Vs0, St0),
+uexpr(#k_match{anno=A,vars=Vs,body=B0}, Br, St0) ->
     Rs = break_rets(Br),
     {B1,Bu,St1} = umatch(B0, Br, St0),
     case is_in_guard(St1) of
@@ -2374,9 +2385,10 @@ uexpr(#k_try{anno=A,arg=A0,vars=Vs,body=B0,evars=Evs,handler=H0},
 	true ->
 	    {[#k_var{name=X}],#k_var{name=X}} = {Vs,B0}, %Assertion.
 	    #k_atom{val=false} = H0,		%Assertion.
-	    {A1,Bu,St1} = uexpr(A0, Br, St0),
+	    {Avs,St1} = new_vars(length(Rs0), St0),
+	    {A1,Bu,St} = uexpr(A0, {break,Avs}, St1),
 	    {#k_protected{anno=#k{us=Bu,ns=lit_list_vars(Rs0),a=A},
-			  arg=A1,ret=Rs0},Bu,St1};
+			  arg=A1,ret=Rs0,inner=Avs},Bu,St};
 	false ->
 	    {Avs,St1} = new_vars(length(Vs), St0),
 	    {A1,Au,St2} = ubody(A0, {break,Avs}, St1),
@@ -2446,33 +2458,6 @@ make_fdef(Anno, Name, Arity, Vs, Body) ->
                      vars=Vs,body=Body,ret=[]},
     #k_fdef{anno=Anno,func=Name,arity=Arity,vars=Vs,body=Match}.
 
-
-%% handle_reuse_annos([#k_var{}], State) -> State.
-%%  In general, it is only safe to reuse a variable for a match context
-%%  if the original value of the variable will no longer be needed.
-%%
-%%  If a variable has been bound in an outer letrec and is therefore
-%%  free in the current function, the variable may still be used.
-%%  We don't bother to check whether the variable is actually used,
-%%  but simply clears the 'reuse_for_context' annotation for any variable
-%%  that is free.
-handle_reuse_annos(Vs, St) ->
-    [handle_reuse_anno(V, St) || V <- Vs].
-
-handle_reuse_anno(#k_var{anno=A}=V, St) ->
-    case member(reuse_for_context, A) of
-	false -> V;
-	true -> handle_reuse_anno_1(V, St)
-    end.
-
-handle_reuse_anno_1(#k_var{anno=Anno,name=Vname}=V, #kern{ff={F,A}}=St) ->
-    FreeVs = get_free(F, A, St),
-    case keymember(Vname, #k_var.name, FreeVs) of
-	true -> V#k_var{anno=Anno--[reuse_for_context]};
-	false -> V
-    end;
-handle_reuse_anno_1(V, _St) -> V.
-
 %% get_free(Name, Arity, State) -> [Free].
 %% store_free(Name, Arity, [Free], State) -> State.
 
@@ -2516,8 +2501,7 @@ umatch(#k_alt{anno=A,first=F0,then=T0}, Br, St0) ->
     Used = union(Fu, Tu),
     {#k_alt{anno=#k{us=Used,ns=[],a=A},first=F1,then=T1},
      Used,St2};
-umatch(#k_select{anno=A,var=V0,types=Ts0}, Br, St0) ->
-    V = handle_reuse_anno(V0, St0),
+umatch(#k_select{anno=A,var=V,types=Ts0}, Br, St0) ->
     {Ts1,Tus,St1} = umatch_list(Ts0, Br, St0),
     Used = case member(no_usage, get_kanno(V)) of
 	       true -> Tus;
diff --git a/lib/compiler/src/v3_kernel.hrl b/lib/compiler/src/v3_kernel.hrl
index e6f0d3c1f7..e26360a6da 100644
--- a/lib/compiler/src/v3_kernel.hrl
+++ b/lib/compiler/src/v3_kernel.hrl
@@ -66,7 +66,7 @@
 -record(k_receive_next, {anno=[]}).
 -record(k_try, {anno=[],arg,vars,body,evars,handler,ret=[]}).
 -record(k_try_enter, {anno=[],arg,vars,body,evars,handler}).
--record(k_protected, {anno=[],arg,ret=[]}).
+-record(k_protected, {anno=[],arg,ret=[],inner}).
 -record(k_catch, {anno=[],body,ret=[]}).
 
 -record(k_guard_match, {anno=[],vars,body,ret=[]}).
diff --git a/lib/compiler/test/Makefile b/lib/compiler/test/Makefile
index da5d207db9..7be23fbb93 100644
--- a/lib/compiler/test/Makefile
+++ b/lib/compiler/test/Makefile
@@ -14,6 +14,7 @@ MODULES= \
 	beam_except_SUITE \
 	beam_jump_SUITE \
 	beam_reorder_SUITE \
+	beam_ssa_SUITE \
 	beam_type_SUITE \
 	beam_utils_SUITE \
 	bif_SUITE \
@@ -52,6 +53,7 @@ NO_OPT= \
 	beam_except \
 	beam_jump \
 	beam_reorder \
+	beam_ssa \
 	beam_type \
 	beam_utils \
 	bif \
@@ -75,6 +77,7 @@ INLINE= \
 	andor \
 	apply \
 	beam_block \
+	beam_ssa \
 	beam_utils \
 	bif \
 	bs_bincomp \
@@ -94,16 +97,34 @@ INLINE= \
 	receive \
 	record
 
+R21= \
+        bs_construct \
+        bs_match
+
 CORE_MODULES = \
 	lfe_andor_SUITE \
 	lfe_guard_SUITE
 
+NO_MOD_OPT = $(NO_OPT)
+
+NO_SSA_OPT = $(NO_OPT)
+
+NO_TYPE_OPT = $(NO_OPT)
+
 NO_OPT_MODULES= $(NO_OPT:%=%_no_opt_SUITE)
 NO_OPT_ERL_FILES= $(NO_OPT_MODULES:%=%.erl)
 POST_OPT_MODULES= $(NO_OPT:%=%_post_opt_SUITE)
 POST_OPT_ERL_FILES= $(POST_OPT_MODULES:%=%.erl)
 INLINE_MODULES= $(INLINE:%=%_inline_SUITE)
 INLINE_ERL_FILES= $(INLINE_MODULES:%=%.erl)
+R21_MODULES= $(R21:%=%_r21_SUITE)
+R21_ERL_FILES= $(R21_MODULES:%=%.erl)
+NO_MOD_OPT_MODULES= $(NO_MOD_OPT:%=%_no_module_opt_SUITE)
+NO_MOD_OPT_ERL_FILES= $(NO_MOD_OPT_MODULES:%=%.erl)
+NO_SSA_OPT_MODULES= $(NO_SSA_OPT:%=%_no_ssa_opt_SUITE)
+NO_SSA_OPT_ERL_FILES= $(NO_SSA_OPT_MODULES:%=%.erl)
+NO_TYPE_OPT_MODULES= $(NO_TYPE_OPT:%=%_no_type_opt_SUITE)
+NO_TYPE_OPT_ERL_FILES= $(NO_TYPE_OPT_MODULES:%=%.erl)
 
 ERL_FILES= $(MODULES:%=%.erl)
 CORE_FILES= $(CORE_MODULES:%=%.core)
@@ -124,7 +145,7 @@ RELSYSDIR = $(RELEASE_PATH)/compiler_test
 # ----------------------------------------------------
 
 ERL_MAKE_FLAGS +=
-ERL_COMPILE_FLAGS += +clint +clint0
+ERL_COMPILE_FLAGS += +clint +clint0 +ssalint
 
 EBIN = .
 
@@ -132,17 +153,28 @@ EBIN = .
 # Targets
 # ----------------------------------------------------
 
-make_emakefile: $(NO_OPT_ERL_FILES) $(POST_OPT_ERL_FILES) $(INLINE_ERL_FILES)
+make_emakefile: $(NO_OPT_ERL_FILES) $(POST_OPT_ERL_FILES) $(NO_SSA_OPT_ERL_FILES) \
+  $(INLINE_ERL_FILES) $(R21_ERL_FILES) $(NO_MOD_OPT_ERL_FILES) $(NO_TYPE_OPT_ERL_FILES)
 	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES) \
 	> $(EMAKEFILE)
-	$(ERL_TOP)/make/make_emakefile +no_copt +no_postopt $(ERL_COMPILE_FLAGS) \
+	$(ERL_TOP)/make/make_emakefile +no_copt +no_postopt \
+	+no_ssa_opt +no_recv_opt $(ERL_COMPILE_FLAGS) \
 	-o$(EBIN) $(NO_OPT_MODULES) >> $(EMAKEFILE)
+	$(ERL_TOP)/make/make_emakefile +no_share_opt +no_bsm_opt +no_fun_opt \
+	+no_ssa_opt +no_recv_opt $(ERL_COMPILE_FLAGS) \
+	-o$(EBIN) $(NO_SSA_OPT_MODULES) >> $(EMAKEFILE)
 	$(ERL_TOP)/make/make_emakefile +no_copt $(ERL_COMPILE_FLAGS) \
 	-o$(EBIN) $(POST_OPT_MODULES) >> $(EMAKEFILE)
 	$(ERL_TOP)/make/make_emakefile +inline $(ERL_COMPILE_FLAGS) \
 	-o$(EBIN) $(INLINE_MODULES) >> $(EMAKEFILE)
+	$(ERL_TOP)/make/make_emakefile +r21 $(ERL_COMPILE_FLAGS) \
+	-o$(EBIN) $(R21_MODULES) >> $(EMAKEFILE)
+	$(ERL_TOP)/make/make_emakefile +no_module_opt $(ERL_COMPILE_FLAGS) \
+	-o$(EBIN) $(NO_MOD_OPT_MODULES) >> $(EMAKEFILE)
 	$(ERL_TOP)/make/make_emakefile +from_core $(ERL_COMPILE_FLAGS) \
 	-o$(EBIN) $(CORE_MODULES) >> $(EMAKEFILE)
+	$(ERL_TOP)/make/make_emakefile +no_type_opt $(ERL_COMPILE_FLAGS) \
+	-o$(EBIN) $(NO_TYPE_OPT_MODULES) >> $(EMAKEFILE)
 
 tests debug opt: make_emakefile
 	erl $(ERL_MAKE_FLAGS) -make
@@ -161,12 +193,25 @@ docs:
 %_no_opt_SUITE.erl: %_SUITE.erl
 	sed -e 's;-module($(basename $<));-module($(basename $@));' $< > $@
 
+%_no_ssa_opt_SUITE.erl: %_SUITE.erl
+	sed -e 's;-module($(basename $<));-module($(basename $@));' $< > $@
+
 %_post_opt_SUITE.erl: %_SUITE.erl
 	sed -e 's;-module($(basename $<));-module($(basename $@));' $< > $@
 
 %_inline_SUITE.erl: %_SUITE.erl
 	sed -e 's;-module($(basename $<));-module($(basename $@));' $< > $@
 
+%_r21_SUITE.erl: %_SUITE.erl
+	sed -e 's;-module($(basename $<));-module($(basename $@));' $< > $@
+
+%_no_module_opt_SUITE.erl: %_SUITE.erl
+	sed -e 's;-module($(basename $<));-module($(basename $@));' $< > $@
+
+%_no_type_opt_SUITE.erl: %_SUITE.erl
+	sed -e 's;-module($(basename $<));-module($(basename $@));' $< > $@
+
+
 # ----------------------------------------------------
 # Release Target
 # ---------------------------------------------------- 
@@ -179,7 +224,10 @@ release_tests_spec: make_emakefile
 	$(INSTALL_DATA) compiler.spec compiler.cover \
 		$(EMAKEFILE) $(ERL_FILES) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(NO_OPT_ERL_FILES) $(POST_OPT_ERL_FILES) \
-		$(INLINE_ERL_FILES) "$(RELSYSDIR)"
+		$(INLINE_ERL_FILES) $(R21_ERL_FILES) \
+		$(NO_MOD_OPT_ERL_FILES) \
+		$(NO_SSA_OPT_ERL_FILES) \
+	        $(NO_TYPE_OPT_ERL_FILES) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(CORE_FILES) "$(RELSYSDIR)"
 	for file in $(ERL_DUMMY_FILES); do \
 	    module=`basename $$file .erl`; \
diff --git a/lib/compiler/test/apply_SUITE.erl b/lib/compiler/test/apply_SUITE.erl
index 0f82a56fb7..2ee518b1a0 100644
--- a/lib/compiler/test/apply_SUITE.erl
+++ b/lib/compiler/test/apply_SUITE.erl
@@ -73,6 +73,7 @@ mfa(Config) when is_list(Config) ->
     {'EXIT',_} = (catch ?APPLY2(Mod, (id(bazzzzzz)), a, b)),
     {'EXIT',_} = (catch ?APPLY2({}, baz, a, b)),
     {'EXIT',_} = (catch ?APPLY2(?MODULE, [], a, b)),
+    {'EXIT',_} = (catch bad_literal_call(1)),
 
     ok = apply(Mod, foo, id([])),
     {[a,b|c]} = apply(Mod, bar, id([[a,b|c]])),
@@ -92,6 +93,13 @@ mfa(Config) when is_list(Config) ->
 
     apply(Mod, foo, []).
 
+%% The single call to this function with a literal argument caused type
+%% optimization to swap out the 'mod' field of a #b_remote{}, which was
+%% mishandled during code generation as it assumed that the module would always
+%% be an atom.
+bad_literal_call(I) ->
+    I:foo().
+
 foo() ->
     ok.
 
diff --git a/lib/compiler/test/beam_except_SUITE.erl b/lib/compiler/test/beam_except_SUITE.erl
index 2b4a780899..67947dc292 100644
--- a/lib/compiler/test/beam_except_SUITE.erl
+++ b/lib/compiler/test/beam_except_SUITE.erl
@@ -21,7 +21,8 @@
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1,
 	 init_per_group/2,end_per_group/2,
-	 multiple_allocs/1,coverage/1]).
+	 multiple_allocs/1,bs_get_tail/1,coverage/1,
+         binary_construction_allocation/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -31,7 +32,9 @@ all() ->
 groups() ->
     [{p,[parallel],
       [multiple_allocs,
-       coverage]}].
+       bs_get_tail,
+       coverage,
+       binary_construction_allocation]}].
 
 init_per_suite(Config) ->
     test_lib:recompile(?MODULE),
@@ -63,6 +66,17 @@ place(lee) ->
 conditions() ->
     (talking = going) = storage + [large = wanted].
 
+bs_get_tail(Config) ->
+    {<<"abc">>,0,0,Config} = bs_get_tail_1(id(<<0:32, "abc">>), 0, 0, Config),
+    {'EXIT',
+     {function_clause,
+      [{?MODULE,bs_get_tail_1,[<<>>,0,0,Config],_}|_]}} =
+        (catch bs_get_tail_1(id(<<>>), 0, 0, Config)),
+    ok.
+
+bs_get_tail_1(<<_:32, Rest/binary>>, Z1, Z2, F1) ->
+    {Rest,Z1,Z2,F1}.
+
 coverage(_) ->
     File = {file,"fake.erl"},
     ok = fc(a),
@@ -72,9 +86,16 @@ coverage(_) ->
     {'EXIT',{function_clause,
 	     [{?MODULE,fc,[y],[File,{line,2}]}|_]}} =
 	(catch fc(y)),
-    {'EXIT',{function_clause,
-	     [{?MODULE,fc,[[a,b,c]],[File,{line,6}]}|_]}} =
-	(catch fc([a,b,c])),
+    case ?MODULE of
+        beam_except_no_opt_SUITE ->
+            %% There will be a different stack fram in
+            %% unoptimized code.
+            ok;
+        _ ->
+            {'EXIT',{function_clause,
+                     [{?MODULE,fc,[[a,b,c]],[File,{line,6}]}|_]}} =
+                (catch fc([a,b,c]))
+    end,
 
     {'EXIT',{undef,[{erlang,error,[a,b,c],_}|_]}} =
 	(catch erlang:error(a, b, c)),
@@ -83,8 +104,38 @@ coverage(_) ->
 	(catch bar(x)),
     {'EXIT',{{case_clause,{1}},[{?MODULE,bar,1,[File,{line,9}]}|_]}} =
 	(catch bar(0)),
+
+    Self = self(),
+    {'EXIT',{{strange,Self},[{?MODULE,foo,[any],[File,{line,14}]}|_]}} =
+        (catch foo(any)),
+
+    {ok,succeed,1,2} = foobar(succeed, 1, 2),
+    {'EXIT',{function_clause,[{?MODULE,foobar,[[fail],1,2],
+                               [{file,"fake.erl"},{line,16}]}|_]}} =
+        (catch foobar([fail], 1, 2)),
+    {'EXIT',{function_clause,[{?MODULE,fake_function_clause,[{a,b},42.0],_}|_]}} =
+        (catch fake_function_clause({a,b})),
+
     ok.
 
+fake_function_clause(A) -> error(function_clause, [A,42.0]).
+
+
+binary_construction_allocation(_Config) ->
+    ok = do_binary_construction_allocation("PUT"),
+    ok.
+
+do_binary_construction_allocation(Req) ->
+    %% Allocation for building the error term was done by the
+    %% bs_init2 instruction. beam_except crashed because it expected
+    %% an explicit allocation instruction.
+    ok = case Req of
+             "POST" -> {error, <<"BAD METHOD ", Req/binary>>, Req};
+             _ -> ok
+         end.
+
+id(I) -> I.
+
 -file("fake.erl", 1).
 fc(a) ->	                                %Line 2
     ok;						%Line 3
@@ -96,3 +147,9 @@ bar(X) ->					%Line 8
     case {X+1} of				%Line 9
 	1 -> ok					%Line 10
     end.					%Line 11
+%% Cover collection code for function_clause exceptions.
+foo(A) ->                                       %Line 13
+    error({strange,self()}, [A]).               %Line 14
+%% Cover beam_except:tag_literal/1.
+foobar(A, B, C) when is_atom(A) ->              %Line 16
+    {ok,A,B,C}.                                 %Line 17
diff --git a/lib/compiler/test/beam_jump_SUITE.erl b/lib/compiler/test/beam_jump_SUITE.erl
index faedc0c1f1..a456f31d79 100644
--- a/lib/compiler/test/beam_jump_SUITE.erl
+++ b/lib/compiler/test/beam_jump_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,
 	 undefined_label/1,ambiguous_catch_try_state/1,
-         build_tuple/1]).
+         unsafe_move_elimination/1,build_tuple/1,
+         coverage/1]).
 
 suite() ->
     [{ct_hooks,[ts_install_cth]}].
@@ -34,7 +35,9 @@ groups() ->
     [{p,[parallel],
       [undefined_label,
        ambiguous_catch_try_state,
-       build_tuple
+       unsafe_move_elimination,
+       build_tuple,
+       coverage
       ]}].
 
 init_per_suite(Config) ->
@@ -75,6 +78,82 @@ checks(Wanted) ->
     %% Must be one line to cause the unsafe optimization.
     {catch case river() of sheet -> begin +Wanted, if "da" -> Wanted end end end, catch case river() of sheet -> begin + Wanted, if "da" -> Wanted end end end}.
 
+unsafe_move_elimination(_Config) ->
+    {{left,right,false},false} = unsafe_move_elimination_1(left, right, false),
+    {{false,right,false},false} = unsafe_move_elimination_1(false, right, true),
+    {{true,right,right},right} = unsafe_move_elimination_1(true, right, true),
+    [ok = unsafe_move_elimination_2(I) || I <- lists:seq(0,16)],
+    ok.
+
+unsafe_move_elimination_1(Left, Right, Simple0) ->
+    id(1),
+
+    %% The move at label 29 would be removed by beam_jump, which is unsafe because
+    %% the two select_val instructions have different source registers.
+    %%
+    %%   {select_val,{y,0},{f,25},{list,[{atom,true},{f,27},{atom,false},{f,29}]}}.
+    %%               ^^^^^                                  ^^^^^^^^^^^^^^^^^^^
+    %% {label,27}.
+    %%   {kill,{y,0}}.
+    %%   {move,{y,2},{x,0}}.
+    %%   {line,...}.
+    %%   {call,1,{f,31}}.
+    %%   {select_val,{x,0},{f,33},{list,[{atom,true},{f,35},{atom,false},{f,29}]}}.
+    %%               ^^^^^                                  ^^^^^^^^^^^^^^^^^^^
+    %% {label,29}.
+    %%   {move,{atom,false},{y,0}}.  <=== REMOVED (unsafely).
+    %%   {jump,{f,37}}.
+
+    Simple = case case Simple0 of
+                      false -> false;
+                      true -> id(Left)
+                  end
+             of
+                 false ->
+                     false;
+                 true ->
+                     id(Right)
+             end,
+    {id({Left,Right,Simple}),Simple}.
+
+unsafe_move_elimination_2(Int) ->
+    %% The type optimization pass would recognize that TagInt can only be
+    %% [0 .. 7], so the first 'case' would select_val over [0 .. 6] and swap
+    %% out the fail label with the block for 7.
+    %%
+    %% A later optimization would merge this block with 'expects_h' in the
+    %% second case, as the latter is only reachable from the former.
+    %%
+    %% ... but this broke down when the move elimination optimization didn't
+    %% take the fail label of the first select_val into account. This caused it
+    %% to believe that the only way to reach 'expects_h' was through the second
+    %% case when 'Tag' =:= 'h', which made it remove the move instruction
+    %% added in the first case, passing garbage to expects_h/2.
+    TagInt = Int band 2#111,
+    Tag = case TagInt of
+              0 -> a;
+              1 -> b;
+              2 -> c;
+              3 -> d;
+              4 -> e;
+              5 -> f;
+              6 -> g;
+              7 -> h
+          end,
+    case Tag of
+        g -> expects_g(TagInt, Tag);
+        h -> expects_h(TagInt, Tag);
+        _ -> Tag = id(Tag), ok
+    end.
+
+expects_g(6, Atom) ->
+    Atom = id(g),
+    ok.
+
+expects_h(7, Atom) ->
+    Atom = id(h),
+    ok.
+
 -record(message2, {id, p1}).
 -record(message3, {id, p1, p2}).
 
@@ -87,3 +166,45 @@ do_build_tuple(Message) ->
 	    Res = {res, rand:uniform(100)},
 	    {Message#message3.id, Res}
     end.
+
+coverage(_Config) ->
+    ok = coverage_1(ok),
+    {error,badarg} = coverage_1({error,badarg}),
+
+    gt = coverage_2(100, 42),
+    le = coverage_2(100, 999),
+    le = coverage_2([], []),
+    gt = coverage_2([], xxx),
+
+    ok.
+
+coverage_1(Var) ->
+    case id(Var) of
+	ok -> ok;
+	Error -> Error
+    end.
+
+%% Cover beam_jump:invert_test(is_ne_exact).
+coverage_2(Pre1, Pre2) ->
+    case
+        case Pre1 == [] of
+            false ->
+                false;
+            true ->
+                Pre2 /= []
+        end
+    of
+        true ->
+            gt;
+        false ->
+            case Pre1 > Pre2 of
+                true ->
+                    gt;
+                false ->
+                    le
+            end
+    end.
+
+
+id(I) ->
+    I.
diff --git a/lib/compiler/test/beam_ssa_SUITE.erl b/lib/compiler/test/beam_ssa_SUITE.erl
new file mode 100644
index 0000000000..3b510f3528
--- /dev/null
+++ b/lib/compiler/test/beam_ssa_SUITE.erl
@@ -0,0 +1,641 @@
+%%
+%% %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(beam_ssa_SUITE).
+
+-export([all/0,suite/0,groups/0,init_per_suite/1,end_per_suite/1,
+	 init_per_group/2,end_per_group/2,
+         calls/1,tuple_matching/1,recv/1,maps/1,
+         cover_ssa_dead/1,combine_sw/1,share_opt/1,
+         beam_ssa_dead_crash/1,stack_init/1]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [{group,p}].
+
+groups() ->
+    [{p,test_lib:parallel(),
+      [tuple_matching,
+       calls,
+       recv,
+       maps,
+       cover_ssa_dead,
+       combine_sw,
+       share_opt,
+       beam_ssa_dead_crash,
+       stack_init
+      ]}].
+
+init_per_suite(Config) ->
+    test_lib:recompile(?MODULE),
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+calls(Config) ->
+    Ret = {return,value,Config},
+    Ret = fun_call(fun(42) -> ok end, Ret),
+    Ret = apply_fun(fun(a, b) -> ok end, [a,b], Ret),
+    Ret = apply_mfa(test_lib, id, [anything], Ret),
+    {'EXIT',{badarg,_}} = (catch call_error()),
+    {'EXIT',{badarg,_}} = (catch call_error(42)),
+    5 = start_it([erlang,length,1,2,3,4,5]),
+    ok.
+
+fun_call(Fun, X0) ->
+    X = id(X0),
+    Fun(42),
+    X.
+
+apply_fun(Fun, Args, X0) ->
+    X = id(X0),
+    apply(Fun, Args),
+    X.
+
+apply_mfa(Mod, Name, Args, X0) ->
+    X = id(X0),
+    apply(Mod, Name, Args),
+    X.
+
+call_error() ->
+    error(badarg),
+    ok.
+
+call_error(I) ->
+    <<I:(-8)>>,
+    ok.
+
+start_it([_|_]=MFA) ->
+    case MFA of
+	[M,F|Args] -> M:F(Args)
+    end.
+
+tuple_matching(_Config) ->
+    do_tuple_matching({tag,42}),
+
+    true = is_two_tuple({a,b}),
+    false = is_two_tuple({a,b,c}),
+    false = is_two_tuple(atom),
+
+    ok.
+
+do_tuple_matching(Arg) ->
+    Res = do_tuple_matching_1(Arg),
+    Res = do_tuple_matching_2(Arg),
+    Res = do_tuple_matching_3(Arg),
+    Res.
+
+do_tuple_matching_1({tag,V}) ->
+    {ok,V}.
+
+do_tuple_matching_2(Tuple) when is_tuple(Tuple) ->
+    Size = tuple_size(Tuple),
+    if
+        Size =:= 2 ->
+            {ok,element(2, Tuple)}
+    end.
+
+do_tuple_matching_3(Tuple) when is_tuple(Tuple) ->
+    Size = tuple_size(Tuple),
+    if
+        Size =:= 2 ->
+            2 = id(Size),
+            {ok,element(2, Tuple)}
+    end.
+
+is_two_tuple(Arg) ->
+    case is_tuple(Arg) of
+        false -> false;
+        true -> tuple_size(Arg) == 2
+    end.
+
+-record(reporter_state, {res,run_config}).
+-record(run_config, {report_interval=0}).
+
+recv(_Config) ->
+    Parent = self(),
+
+    %% Test sync_wait_mon/2.
+    Succ = fun() -> Parent ! {ack,self(),{result,42}} end,
+    {result,42} = sync_wait_mon(spawn_monitor(Succ), infinity),
+
+    Down = fun() -> exit(down) end,
+    {error,down} = sync_wait_mon(spawn_monitor(Down), infinity),
+
+    Exit = fun() ->
+                   Self = self(),
+                   spawn(fun() -> exit(Self, kill_me) end),
+                   receive _ -> ok end
+           end,
+    {error,kill_me} = sync_wait_mon(spawn_monitor(Exit), infinity),
+
+    Timeout = fun() -> receive _ -> ok end end,
+    {error,timeout} = sync_wait_mon(spawn_monitor(Timeout), 0),
+
+    %% Test reporter_loop/1.
+    {a,Parent} = reporter_loop(#reporter_state{res={a,Parent},
+                                               run_config=#run_config{}}),
+
+    %% Test bad_sink/0.
+    bad_sink(),
+
+    %% Test tricky_recv_1/0.
+    self() ! 1,
+    a = tricky_recv_1(),
+    self() ! 2,
+    b = tricky_recv_1(),
+
+    %% Test tricky_recv_2/0.
+    self() ! 1,
+    {1,yes} = tricky_recv_2(),
+    self() ! 2,
+    {2,maybe} = tricky_recv_2(),
+
+    %% Test 'receive after infinity' in try/catch.
+    Pid = spawn(fun recv_after_inf_in_try/0),
+    exit(Pid, done),
+
+    %% Test tricky_recv_3().
+    self() ! {{self(),r0},{1,42,"name"}},
+    {Parent,r0,[<<1:32,1:8,42:8>>,"name",0]} = tricky_recv_3(),
+    self() ! {{self(),r1},{2,99,<<"data">>}},
+    {Parent,r1,<<1:32,2:8,99:8,"data">>} = tricky_recv_3(),
+
+    %% Test tricky_recv_4().
+    self() ! {[self(),r0],{1,42,"name"}},
+    {Parent,r0,[<<1:32,1:8,42:8>>,"name",0]} = tricky_recv_4(),
+    self() ! {[self(),r1],{2,99,<<"data">>}},
+    {Parent,r1,<<1:32,2:8,99:8,"data">>} = tricky_recv_4(),
+
+    %% Test tricky_recv_5/0.
+    self() ! 1,
+    a = tricky_recv_5(),
+    self() ! 2,
+    b = tricky_recv_5(),
+
+    %% tricky_recv_6/0 is a compile-time error.
+    tricky_recv_6(),
+
+    ok.
+
+sync_wait_mon({Pid, Ref}, Timeout) ->
+    receive
+	{ack,Pid,Return} ->
+	    erlang:demonitor(Ref, [flush]),
+	    Return;
+	{'DOWN',Ref,_Type,Pid,Reason} ->
+	    {error,Reason};
+	{'EXIT',Pid,Reason} ->
+	    erlang:demonitor(Ref, [flush]),
+	    {error,Reason}
+    after Timeout ->
+            erlang:demonitor(Ref, [flush]),
+            exit(Pid, kill),
+            {error,timeout}
+    end.
+
+reporter_loop(State) ->
+    RC = State#reporter_state.run_config,
+    receive after RC#run_config.report_interval ->
+                    State#reporter_state.res
+    end.
+
+bad_sink() ->
+    {ok,Pid} = my_spawn(self()),
+    %% The get_tuple_element instruction for the matching
+    %% above was sinked into the receive loop. That will
+    %% not work (and would be bad for performance if it
+    %% would work).
+    receive
+        {ok,Pid} ->
+            ok;
+        error ->
+            exit(failed)
+    end,
+    exit(Pid, kill).
+
+my_spawn(Parent) ->
+    Pid = spawn(fun() ->
+                        Parent ! {ok,self()},
+                        receive _ -> ok end
+                end),
+    {ok,Pid}.
+
+tricky_recv_1() ->
+    receive
+        X=1 ->
+            id(42),
+            a;
+        X=2 ->
+            b
+    end,
+    case X of
+        1 -> a;
+        2 -> b
+    end.
+
+tricky_recv_2() ->
+    receive
+        X=1 ->
+            Y = case id(X) of
+                    1 -> yes;
+                    _ -> no
+                end,
+            a;
+        X=2 ->
+            Y = maybe,
+            b
+    end,
+    {X,Y}.
+
+recv_after_inf_in_try() ->
+    try
+        %% Used to crash beam_kernel_to_ssa.
+        receive after infinity -> ok end
+    catch
+	_A:_B ->
+	    receive after infinity -> ok end
+    end.
+
+tricky_recv_3() ->
+    {Pid, R, Request} =
+	receive
+	    {{Pid0,R0}, {1, Proto0, Name0}} ->
+		{Pid0, R0,
+		 [<<1:32, 1:8, Proto0:8>>,Name0,0]};
+	    {{Pid1,R1}, {2, Proto1, Data1}}  ->
+		{Pid1, R1,
+		 <<1:32, 2:8, Proto1:8, Data1/binary>>}
+	end,
+    id({Pid,R,Request}).
+
+tricky_recv_4() ->
+    {Pid, R, Request} =
+	receive
+	    {[Pid0,R0], {1, Proto0, Name0}} ->
+		{Pid0, R0,
+		 [<<1:32, 1:8, Proto0:8>>,Name0,0]};
+	    {[Pid1,R1], {2, Proto1, Data1}}  ->
+		{Pid1, R1,
+		 <<1:32, 2:8, Proto1:8, Data1/binary>>}
+	end,
+    id({Pid,R,Request}).
+
+%% beam_ssa_pre_codegen would accidentally create phi nodes on critical edges
+%% when fixing up receives; the call to id/2 can either succeed or land in the
+%% catch block, and we added a phi node to its immediate successor.
+tricky_recv_5() ->
+    try
+        receive
+            X=1 ->
+                id(42),
+                a;
+            X=2 ->
+                b
+        end,
+        case X of
+            1 -> a;
+            2 -> b
+        end
+    catch
+        _:_ -> c
+    end.
+
+%% When fixing tricky_recv_5, we introduced a compiler crash when the common
+%% exit block was ?BADARG_BLOCK and floats were in the picture.
+tricky_recv_6() ->
+    RefA = make_ref(),
+    RefB = make_ref(),
+    receive
+        {RefA, Number} -> Number + 1.0;
+        {RefB, Number} -> Number + 2.0
+    after 0 ->
+        ok
+    end.
+
+maps(_Config) ->
+    {'EXIT',{{badmatch,#{}},_}} = (catch maps_1(any)),
+    ok.
+
+maps_1(K) ->
+    _ = id(42),
+    #{K:=V} = #{},
+    V.
+
+-record(wx_ref, {type=any_type,ref=any_ref}).
+
+cover_ssa_dead(_Config) ->
+    str = format_str(str, escapable, [], true),
+    [iolist,str] = format_str(str, escapable, iolist, true),
+    bad = format_str(str, not_escapable, [], true),
+    bad = format_str(str, not_escapable, iolist, true),
+    bad = format_str(str, escapable, [], false),
+    bad = format_str(str, escapable, [], bad),
+
+    DefWxRef = #wx_ref{},
+    {DefWxRef,77,9999,[]} = contains(#wx_ref{}, 77, 9999),
+    {DefWxRef,77.0,9999,[]} = contains(#wx_ref{}, 77.0, 9999),
+    {DefWxRef,77,9999.0,[]} = contains(#wx_ref{}, 77, 9999.0),
+    {DefWxRef,77.0,9999.0,[]} = contains(#wx_ref{}, 77.0, 9999.0),
+    {any_type,any_ref,42,43,[option]} = contains(#wx_ref{}, {42,43}, [option]),
+    {any_type,any_ref,42,43,[]} = contains(#wx_ref{}, {42,43}, []),
+    {any_type,any_ref,42.0,43,[]} = contains(#wx_ref{}, {42.0,43}, []),
+    {any_type,any_ref,42,43.0,[]} = contains(#wx_ref{}, {42,43.0}, []),
+    {any_type,any_ref,42.0,43.0,[]} = contains(#wx_ref{}, {42.0,43.0}, []),
+
+    nope = conv_alub(false, '=:='),
+    ok = conv_alub(true, '=:='),
+    ok = conv_alub(true, none),
+    error = conv_alub(false, none),
+
+    {false,false} = eval_alu(false, false, false),
+    {true,false}  = eval_alu(false, false, true),
+    {false,true}  = eval_alu(false, true, false),
+    {false,false} = eval_alu(false, true, true),
+    {false,true}  = eval_alu(true, false, false),
+    {false,false} = eval_alu(true, false, true),
+    {true,true}   = eval_alu(true, true, false),
+    {false,true}  = eval_alu(true, true, true),
+
+    100.0 = percentage(1.0, 0.0),
+    100.0 = percentage(1, 0),
+    0.0 = percentage(0, 0),
+    0.0 = percentage(0.0, 0.0),
+    40.0 = percentage(4.0, 10.0),
+    60.0 = percentage(6, 10),
+
+    %% Cover '=:=', followed by '=/='.
+    false = 'cover__=:=__=/='(41),
+    true = 'cover__=:=__=/='(42),
+    false = 'cover__=:=__=/='(43),
+
+    %% Cover '<', followed by '=/='.
+    true = 'cover__<__=/='(41),
+    false = 'cover__<__=/='(42),
+    false = 'cover__<__=/='(43),
+
+    %% Cover '=<', followed by '=/='.
+    true = 'cover__=<__=/='(41),
+    true = 'cover__=<__=/='(42),
+    false = 'cover__=<__=/='(43),
+
+    %% Cover '>=', followed by '=/='.
+    false = 'cover__>=__=/='(41),
+    true = 'cover__>=__=/='(42),
+    true = 'cover__>=__=/='(43),
+
+    %% Cover '>', followed by '=/='.
+    false = 'cover__>__=/='(41),
+    false = 'cover__>__=/='(42),
+    true = 'cover__>__=/='(43),
+
+    ok.
+
+'cover__=:=__=/='(X) when X =:= 42 -> X =/= 43;
+'cover__=:=__=/='(_) -> false.
+
+'cover__<__=/='(X) when X < 42 -> X =/= 42;
+'cover__<__=/='(_) -> false.
+
+'cover__=<__=/='(X) when X =< 42 -> X =/= 43;
+'cover__=<__=/='(_) -> false.
+
+'cover__>=__=/='(X) when X >= 42 -> X =/= 41;
+'cover__>=__=/='(_) -> false.
+
+'cover__>__=/='(X) when X > 42 -> X =/= 42;
+'cover__>__=/='(_) -> false.
+
+format_str(Str, FormatData, IoList, EscChars) ->
+    Escapable = FormatData =:= escapable,
+    case id(Str) of
+        IoStr when Escapable, EscChars, IoList == [] ->
+            id(IoStr);
+        IoStr when Escapable, EscChars ->
+            [IoList,id(IoStr)];
+        _ ->
+            bad
+    end.
+
+contains(This, X, Y) when is_record(This, wx_ref), is_number(X), is_number(Y) ->
+    {This,X,Y,[]};
+contains(#wx_ref{type=ThisT,ref=ThisRef}, {CX,CY}, Options)
+  when is_number(CX), is_number(CY), is_list(Options) ->
+    {ThisT,ThisRef,CX,CY,Options}.
+
+conv_alub(HasDst, CmpOp) ->
+    case (not HasDst) andalso CmpOp =/= none of
+        true -> nope;
+        false ->
+            case HasDst of
+                false -> error;
+                true -> ok
+            end
+    end.
+
+eval_alu(Sign1, Sign2, N) ->
+    V = (Sign1 andalso Sign2 andalso (not N))
+        or ((not Sign1) andalso (not Sign2) andalso N),
+    C = (Sign1 andalso Sign2)
+          or ((not N) andalso (Sign1 orelse Sign2)),
+    {V,C}.
+
+percentage(Divident, Divisor) ->
+    if Divisor == 0 andalso Divident /= 0 ->
+            100.0;
+       Divisor == 0 ->
+            0.0;
+       true ->
+            Divident / Divisor * 100
+    end.
+
+combine_sw(_Config) ->
+    [a] = do_comb_sw_1(a),
+    [b,b] = do_comb_sw_1(b),
+    [c] = do_comb_sw_1(c),
+    [c] = do_comb_sw_1(c),
+    [] = do_comb_sw_1(z),
+
+    [a] = do_comb_sw_2(a),
+    [b2,b1] = do_comb_sw_2(b),
+    [c] = do_comb_sw_2(c),
+    [c] = do_comb_sw_2(c),
+    [] = do_comb_sw_2(z),
+
+    ok.
+
+do_comb_sw_1(X) ->
+    put(?MODULE, []),
+    if
+        X == a; X == b ->
+            put(?MODULE, [X|get(?MODULE)]);
+        true ->
+            ok
+    end,
+    if
+        X == b; X == c ->
+            put(?MODULE, [X|get(?MODULE)]);
+        true ->
+            ok
+    end,
+    erase(?MODULE).
+
+do_comb_sw_2(X) ->
+    put(?MODULE, []),
+    case X of
+        a ->
+            put(?MODULE, [a|get(?MODULE)]);
+        b ->
+            put(?MODULE, [b1|get(?MODULE)]);
+        _ ->
+            ok
+    end,
+    case X of
+        b ->
+            put(?MODULE, [b2|get(?MODULE)]);
+        c ->
+            put(?MODULE, [c|get(?MODULE)]);
+        _ ->
+            ok
+    end,
+    erase(?MODULE).
+
+share_opt(_Config) ->
+    ok = do_share_opt_1(0),
+    ok = do_share_opt_2(),
+    ok.
+
+do_share_opt_1(A) ->
+    %% The compiler would be stuck in an infinite loop in beam_ssa_share.
+    case A of
+        0 -> a;
+        1 -> b;
+        2 -> c
+    end,
+    receive after 1 -> ok end.
+
+do_share_opt_2() ->
+    ok = sopt_2({[pointtopoint], [{dstaddr,any}]}, ok),
+    ok = sopt_2({[broadcast], [{broadaddr,any}]}, ok),
+    ok = sopt_2({[], []}, ok),
+    ok.
+
+sopt_2({Flags, Opts}, ok) ->
+    Broadcast = lists:member(broadcast, Flags),
+    P2P = lists:member(pointtopoint, Flags),
+    case Opts of
+        %% The following two clauses would be combined to one, silently
+        %% discarding the guard test of the P2P variable.
+        [{broadaddr,_}|Os] when Broadcast ->
+            sopt_2({Flags, Os}, ok);
+        [{dstaddr,_}|Os] when P2P ->
+            sopt_2({Flags, Os}, ok);
+        [] ->
+            ok
+    end.
+    
+beam_ssa_dead_crash(_Config) ->
+    not_A_B = do_beam_ssa_dead_crash(id(false), id(true)),
+    not_A_not_B = do_beam_ssa_dead_crash(false, false),
+    neither = do_beam_ssa_dead_crash(true, false),
+    neither = do_beam_ssa_dead_crash(true, true),
+    ok.
+
+do_beam_ssa_dead_crash(A, B) ->
+    %% beam_ssa_dead attempts to shortcut branches that branch other
+    %% branches. When a two-way branch is encountered, beam_ssa_dead
+    %% will simulate execution along both paths, in the hope that both
+    %% paths happens to end up in the same place.
+    %%
+    %% During the simulated execution of this function, the boolean
+    %% varible for a `br` instruction would be replaced with the
+    %% literal atom `nil`, which is not allowed, and would crash the
+    %% compiler. In practice, during the actual execution, control
+    %% would never be transferred to that `br` instruction when the
+    %% variable in question had the value `nil`.
+    %%
+    %% beam_ssa_dead has been updated to immediately abort the search
+    %% along the current path if there is an attempt to substitute a
+    %% non-boolean value into a `br` instruction.
+
+    case
+        case not A of
+            false ->
+                false;
+            true ->
+                B
+        end
+    of
+        V
+            when
+                V /= nil
+                andalso
+                V /= false ->
+            not_A_B;
+        _ ->
+            case
+                case not A of
+                    false ->
+                        false;
+                    true ->
+                        not B
+                end
+            of
+                true ->
+                    not_A_not_B;
+                false ->
+                    neither
+            end
+    end.
+
+stack_init(_Config) ->
+    6 = stack_init(a, #{a => [1,2,3]}),
+    0 = stack_init(missing, #{}),
+    ok.
+
+stack_init(Key, Map) ->
+    %% beam_ssa_codegen would wrongly assume that y(0) would always be
+    %% initialized by the `get_map_elements` instruction that follows, and
+    %% would set up the stack frame using an `allocate` instruction and
+    %% would not generate an `init` instruction to initialize y(0).
+    Res = case Map of
+              #{Key := Elements} ->
+                  %% Elements will be assigned to y(0) if the key Key exists.
+                  lists:foldl(fun(El, Acc) ->
+                                      Acc + El
+                              end, 0, Elements);
+              #{} ->
+                  %% y(0) will be left uninitialized when the key is not
+                  %% present in the map.
+                  0
+          end,
+    %% y(0) would be uninitialized here if the key was not present in the map
+    %% (if the second clause was executed).
+    id(Res).
+
+%% The identity function.
+id(I) -> I.
diff --git a/lib/compiler/test/beam_type_SUITE.erl b/lib/compiler/test/beam_type_SUITE.erl
index 061076b3ff..a99dee48aa 100644
--- a/lib/compiler/test/beam_type_SUITE.erl
+++ b/lib/compiler/test/beam_type_SUITE.erl
@@ -21,9 +21,11 @@
 
 -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,
-	 arity_checks/1,elixir_binaries/1,find_best/1]).
+	 integers/1,numbers/1,coverage/1,booleans/1,setelement/1,
+	 cons/1,tuple/1,record_float/1,binary_float/1,float_compare/1,
+	 arity_checks/1,elixir_binaries/1,find_best/1,
+         test_size/1,cover_lists_functions/1,list_append/1,bad_binary_unit/1,
+         none_argument/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -33,6 +35,7 @@ all() ->
 groups() ->
     [{p,[parallel],
       [integers,
+       numbers,
        coverage,
        booleans,
        setelement,
@@ -43,7 +46,12 @@ groups() ->
        float_compare,
        arity_checks,
        elixir_binaries,
-       find_best
+       find_best,
+       test_size,
+       cover_lists_functions,
+       list_append,
+       bad_binary_unit,
+       none_argument
       ]}].
 
 init_per_suite(Config) ->
@@ -113,8 +121,8 @@ do_integers_4(_, _, Res) ->
     Res.
 
 do_integers_5(X0, Y0) ->
-    %% X and Y will use the same register.
-    X = X0 band 1,
+    %% _X and Y will use the same register.
+    _X = X0 band 1,
     Y = Y0 band 3,
     case Y of
         0 -> zero;
@@ -123,6 +131,59 @@ do_integers_5(X0, Y0) ->
         3 -> three
     end.
 
+numbers(_Config) ->
+    Int = id(42),
+    true = is_integer(Int),
+    true = is_number(Int),
+    false = is_float(Int),
+
+    Float = id(42.0),
+    true = is_float(Float),
+    true = is_number(Float),
+    false = is_integer(Float),
+
+    Number = id(1) + id(2),
+    true = is_number(Number),
+    true = is_integer(Number),
+    false = is_float(Number),
+
+    AnotherNumber = id(99.0) + id(1),
+    true = is_float(AnotherNumber),
+    true = is_number(AnotherNumber),
+    false = is_integer(AnotherNumber),
+
+    NotNumber = id(atom),
+    true = is_atom(NotNumber),
+    false = is_number(NotNumber),
+    false = is_integer(NotNumber),
+    false = is_float(NotNumber),
+
+    true = is_number(Int),
+    true = is_number(Float),
+    true = is_number(Number),
+    true = is_number(AnotherNumber),
+
+    %% Cover beam_ssa_type:join/2.
+
+    Join1 = case id(a) of
+                a -> 3 + id(7);                 %Number.
+                b -> id(5) / id(2)              %Float.
+            end,
+    true = is_integer(Join1),
+
+    Join2 = case id(a) of
+                a -> id(5) / 2;                 %Float.
+                b -> 3 + id(7)                  %Number.
+            end,
+    true = is_float(Join2),
+
+    %% Cover beam_ssa_type:meet/2.
+
+    Meet1 = id(0) + -10.0,                       %Float.
+    10.0 = abs(Meet1),                           %Number.
+
+    ok.
+
 coverage(Config) ->
     {'EXIT',{badarith,_}} = (catch id(1) bsl 0.5),
     {'EXIT',{badarith,_}} = (catch id(2.0) bsl 2),
@@ -157,33 +218,134 @@ coverage(Config) ->
              [_|_] ->
                  ok
          end,
+
+    %% Cover beam_type:verified_type(none).
+    {'EXIT',{badarith,_}} = (catch (id(2) / id(1)) band 16#ff),
+
     ok.
 
 booleans(_Config) ->
-    {'EXIT',{{case_clause,_},_}} = (catch do_booleans(42)),
+    {'EXIT',{{case_clause,_},_}} = (catch do_booleans_1(42)),
+
+    ok = do_booleans_2(42, 41),
+    error = do_booleans_2(42, 42),
+
+    AnyAtom = id(atom),
+    true = is_atom(AnyAtom),
+    false = is_boolean(AnyAtom),
+
+    MaybeBool = id(maybe),
+    case MaybeBool of
+        true -> ok;
+        maybe -> ok;
+        false -> ok
+    end,
+    false = is_boolean(MaybeBool),
+
+    NotBool = id(a),
+    case NotBool of
+        a -> ok;
+        b -> ok;
+        c -> ok
+    end,
+    false = is_boolean(NotBool),
+
     ok.
 
-do_booleans(B) ->
+do_booleans_1(B) ->
     case is_integer(B) of
 	yes -> yes;
 	no -> no
     end.
 
+do_booleans_2(A, B) ->
+    Not = not do_booleans_cmp(A, B),
+    case Not of
+        true ->
+            case Not of
+                true -> error;
+                false -> ok
+            end;
+        false -> ok
+    end.
+
+do_booleans_cmp(A, B) -> A > B.
+
 setelement(_Config) ->
     T0 = id({a,42}),
     {a,_} = T0,
     {b,_} = setelement(1, T0, b),
+    {z,b} = do_setelement_1(<<(id(1)):32>>, {a,b}, z),
+    {new,two} = do_setelement_2(<<(id(1)):1>>, {one,two}, new),
     ok.
 
+do_setelement_1(<<N:32>>, Tuple, NewValue) ->
+    _ = element(N, Tuple),
+    %% While updating the type for Tuple, beam_ssa_type would do:
+    %%   maps:without(lists:seq(0, 4294967295), Elements)
+    setelement(N, Tuple, NewValue).
+
+do_setelement_2(<<N:1>>, Tuple, NewValue) ->
+    %% Cover the second clause in remove_element_info/2. The
+    %% type for the second element will be kept.
+    two = element(2, Tuple),
+    setelement(N, Tuple, NewValue).
+
 cons(_Config) ->
     [did] = cons(assigned, did),
+
+    true = cons_is_empty_list([]),
+    false = cons_is_empty_list([a]),
+
+    false = cons_not(true),
+    true = cons_not(false),
+
+    {$a,"bc"} = cons_hdtl(true),
+    {$d,"ef"} = cons_hdtl(false),
     ok.
 
 cons(assigned, Instrument) ->
     [Instrument] = [did].
 
+cons_is_empty_list(L) ->
+    Cons = case L of
+               [] -> "true";
+               _ -> "false"
+           end,
+    id(1),
+    case Cons of
+        "true" -> true;
+        "false" -> false
+    end.
+
+cons_not(B) ->
+    Cons = case B of
+               true -> "true";
+               false -> "false"
+           end,
+    id(1),
+    case Cons of
+        "true" -> false;
+        "false" -> true
+    end.
+
+cons_hdtl(B) ->
+    Cons = case B of
+               true -> "abc";
+               false -> "def"
+           end,
+    id(1),
+    {id(hd(Cons)),id(tl(Cons))}.
+
+-record(bird, {a=a,b=id(42)}).
+
 tuple(_Config) ->
     {'EXIT',{{badmatch,{necessary}},_}} = (catch do_tuple()),
+
+    [] = [X || X <- [], #bird{a = a} == {r,X,foo}],
+    [] = [X || X <- [], #bird{b = b} == {bird,X}],
+    [] = [X || X <- [], 3 == X#bird.a],
+
     ok.
 
 do_tuple() ->
@@ -320,6 +482,62 @@ find_best([], <<"a">>) ->
 find_best([], nil) ->
     {error,<<"should not get here">>}.
 
+test_size(_Config) ->
+    2 = do_test_size({a,b}),
+    4 = do_test_size(<<42:32>>),
+    ok.
+
+do_test_size(Term) when is_tuple(Term) ->
+    size(Term);
+do_test_size(Term) when is_binary(Term) ->
+    size(Term).
+
+cover_lists_functions(Config) ->
+    case lists:suffix([no|Config], Config) of
+        true ->
+            ct:fail(should_be_false);
+        false ->
+            ok
+    end,
+    Zipped = lists:zipwith(fun(A, B) -> {A,B} end,
+                           lists:duplicate(length(Config), zip),
+                           Config),
+    true = is_list(Zipped),
+    ok.
+
+list_append(_Config) ->
+    %% '++'/2 has a quirk where it returns the right-hand argument as-is when
+    %% the left-hand is [].
+    hello = id([]) ++ id(hello),
+    ok.
+
+%% OTP-15872: The compiler would treat the "Unit" of bs_init instructions as
+%% the unit of the result instead of the required unit of the input, causing
+%% is_binary checks to be wrongly optimized away.
+bad_binary_unit(_Config) ->
+    Bin = id(<<1,2,3>>),
+    Bitstring = <<Bin/binary,1:1>>,
+    false = is_binary(Bitstring),
+    ok.
+
+%% ERL-1013: The compiler would crash during the type optimization pass.
+none_argument(_Config) ->
+    Binary = id(<<3:16, 42>>),
+    error = id(case Binary of
+                   <<Len:16, Body/binary>> when length(Body) == Len - 2 ->
+                       %% The type for Body will be none. It means
+                       %% that this clause will never match and that
+                       %% uncompress/1 will never be called.
+                       uncompress(Body);
+                   _ ->
+                       error
+               end),
+    ok.
+
+uncompress(CompressedBinary) ->
+    %% The type for CompressedBinary is none, which beam_ssa_type
+    %% did not handle properly.
+    zlib:uncompress(CompressedBinary).
 
 id(I) ->
     I.
diff --git a/lib/compiler/test/beam_utils_SUITE.erl b/lib/compiler/test/beam_utils_SUITE.erl
index ff0f72d519..eb0af59f9d 100644
--- a/lib/compiler/test/beam_utils_SUITE.erl
+++ b/lib/compiler/test/beam_utils_SUITE.erl
@@ -197,7 +197,7 @@ do_bs_init_4(Arg1, Arg2) ->
                          id(Rewrite)
                  end/binary,
                  "/shared">>);
-        Other ->
+        _Other ->
             error
     end.
 
@@ -553,7 +553,7 @@ not_used_p(_C, S, K, L) when is_record(K, k) ->
             id(K)
     end.
 
-is_used_fr(Config) ->
+is_used_fr(_Config) ->
     1 = is_used_fr(self(), self()),
     1 = is_used_fr(self(), other),
     receive 1 -> ok end,
@@ -572,7 +572,7 @@ is_used_fr(X, Y) ->
     X ! 1.
 
 %% ERL-778.
-unsafe_is_function(Config) ->
+unsafe_is_function(_Config) ->
     {undefined,any} = unsafe_is_function(undefined, any),
     {ok,any} = unsafe_is_function(fun() -> ok end, any),
     {'EXIT',{{case_clause,_},_}} = (catch unsafe_is_function(fun(_) -> ok end, any)),
diff --git a/lib/compiler/test/beam_validator_SUITE.erl b/lib/compiler/test/beam_validator_SUITE.erl
index d3e544a9cc..20f6cb2691 100644
--- a/lib/compiler/test/beam_validator_SUITE.erl
+++ b/lib/compiler/test/beam_validator_SUITE.erl
@@ -34,7 +34,8 @@
 	 undef_label/1,illegal_instruction/1,failing_gc_guard_bif/1,
 	 map_field_lists/1,cover_bin_opt/1,
 	 val_dsetel/1,bad_tuples/1,bad_try_catch_nesting/1,
-         receive_stacked/1]).
+         receive_stacked/1,aliased_types/1,type_conflict/1,
+         infer_on_eq/1,infer_dead_value/1]).
 
 -include_lib("common_test/include/ct.hrl").
 
@@ -63,7 +64,8 @@ groups() ->
        undef_label,illegal_instruction,failing_gc_guard_bif,
        map_field_lists,cover_bin_opt,val_dsetel,
        bad_tuples,bad_try_catch_nesting,
-       receive_stacked]}].
+       receive_stacked,aliased_types,type_conflict,
+       infer_on_eq,infer_dead_value]}].
 
 init_per_suite(Config) ->
     test_lib:recompile(?MODULE),
@@ -107,13 +109,12 @@ xrange(Config) when is_list(Config) ->
     Errors = do_val(xrange, Config),
     [{{t,sum_1,2},
       {{bif,'+',{f,0},[{x,-1},{x,1}],{x,0}},4,
-       {uninitialized_reg,{x,-1}}}},
+       {bad_register,{x,-1}}}},
      {{t,sum_2,2},
-      {{bif,'+',{f,0},[{x,0},{x,1023}],{x,0}},4,
-       {uninitialized_reg,{x,1023}}}},
+      {{bif,'+',{f,0},[{x,0},{x,1023}],{x,0}},4,limit}},
      {{t,sum_3,2},
       {{bif,'+',{f,0},[{x,0},{x,1}],{x,-1}},4,
-       {invalid_store,{x,-1},number}}},
+       {bad_register,{x,-1}}}},
      {{t,sum_4,2},
       {{bif,'+',{f,0},[{x,0},{x,1}],{x,1023}},4,limit}}] = Errors,
     ok.
@@ -122,15 +123,15 @@ yrange(Config) when is_list(Config) ->
     Errors = do_val(yrange, Config),
     [{{t,sum_1,2},
       {{move,{x,1},{y,-1}},5,
-       {invalid_store,{y,-1},term}}},
+       {bad_register,{y,-1}}}},
      {{t,sum_2,2},
       {{bif,'+',{f,0},[{x,0},{y,1024}],{x,0}},7,
-       {uninitialized_reg,{y,1024}}}},
+       limit}},
      {{t,sum_3,2},
       {{move,{x,1},{y,1024}},5,limit}},
      {{t,sum_4,2},
       {{move,{x,1},{y,-1}},5,
-       {invalid_store,{y,-1},term}}}] = Errors,
+       {bad_register,{y,-1}}}}] = Errors,
     ok.
 
 stack(Config) when is_list(Config) ->
@@ -157,9 +158,9 @@ call_last(Config) when is_list(Config) ->
 merge_undefined(Config) when is_list(Config) ->
     Errors = do_val(merge_undefined, Config),
     [{{t,handle_call,2},
-      {{call_ext,1,{extfunc,erlang,exit,1}},
-       10,
-       {uninitialized_reg,{y,0}}}}] = Errors,
+      {{call_ext,2,{extfunc,debug,filter,2}},
+       22,
+       {uninitialized_reg,{y,_}}}}] = Errors,
     ok.
 
 uninit(Config) when is_list(Config) ->
@@ -178,7 +179,7 @@ unsafe_catch(Config) when is_list(Config) ->
     Errors = do_val(unsafe_catch, Config),
     [{{t,small,2},
       {{bs_put_integer,{f,0},{integer,16},1,
-	{field_flags,[unsigned,big]},{y,0}},
+        {field_flags,[unsigned,big]},{y,0}},
        20,
        {unassigned,{y,0}}}}] = Errors,
     ok.
@@ -211,19 +212,19 @@ bad_catch_try(Config) when is_list(Config) ->
     Errors = do_val(bad_catch_try, Config),
     [{{bad_catch_try,bad_1,1},
       {{'catch',{x,0},{f,3}},
-       5,{invalid_store,{x,0},{catchtag,[3]}}}},
+       5,{invalid_tag_register,{x,0}}}},
      {{bad_catch_try,bad_2,1},
       {{catch_end,{x,9}},
-       8,{source_not_y_reg,{x,9}}}},
+       8,{invalid_tag_register,{x,9}}}},
      {{bad_catch_try,bad_3,1},
-      {{catch_end,{y,1}},9,{bad_type,{atom,kalle}}}},
+      {{catch_end,{y,1}},9,{invalid_tag,{y,1},{atom,kalle}}}},
      {{bad_catch_try,bad_4,1},
-      {{'try',{x,0},{f,15}},5,{invalid_store,{x,0},{trytag,[15]}}}},
+      {{'try',{x,0},{f,15}},5,{invalid_tag_register,{x,0}}}},
      {{bad_catch_try,bad_5,1},
-      {{try_case,{y,1}},12,{bad_type,term}}},
+      {{try_case,{y,1}},12,{invalid_tag,{y,1},term}}},
      {{bad_catch_try,bad_6,1},
       {{move,{integer,1},{y,1}},7,
-       {invalid_store,{y,1},{integer,1}}}}] = Errors,
+       {invalid_store,{y,1}}}}] = Errors,
     ok.
 
 cons_guard(Config) when is_list(Config) ->
@@ -247,7 +248,7 @@ freg_range(Config) when is_list(Config) ->
      {{t,sum_3,2},
       {{bif,fadd,{f,0},[{fr,0},{fr,1}],{fr,-1}},
        7,
-       {bad_target,{fr,-1}}}},
+       {bad_register,{fr,-1}}}},
      {{t,sum_4,2},
       {{bif,fadd,{f,0},[{fr,0},{fr,1}],{fr,1024}},
        7,
@@ -539,37 +540,37 @@ receive_stacked(Config) ->
     [{{receive_stacked,f1,0},
       {{loop_rec_end,{f,3}},
        17,
-       {fragile_message_reference,{y,0}}}},
+       {fragile_message_reference,{y,_}}}},
      {{receive_stacked,f2,0},
-      {{test_heap,3,0},10,{fragile_message_reference,{y,1}}}},
+      {{test_heap,3,0},10,{fragile_message_reference,{y,_}}}},
      {{receive_stacked,f3,0},
-      {{test_heap,3,0},10,{fragile_message_reference,{y,1}}}},
+      {{test_heap,3,0},10,{fragile_message_reference,{y,_}}}},
      {{receive_stacked,f4,0},
-      {{test_heap,3,0},10,{fragile_message_reference,{y,1}}}},
+      {{test_heap,3,0},10,{fragile_message_reference,{y,_}}}},
      {{receive_stacked,f5,0},
       {{loop_rec_end,{f,23}},
        23,
-       {fragile_message_reference,{y,1}}}},
+       {fragile_message_reference,{y,_}}}},
      {{receive_stacked,f6,0},
-      {{gc_bif,byte_size,{f,29},0,[{y,0}],{x,0}},
+      {{gc_bif,byte_size,{f,29},0,[{y,_}],{x,0}},
        12,
-       {fragile_message_reference,{y,0}}}},
+       {fragile_message_reference,{y,_}}}},
      {{receive_stacked,f7,0},
       {{loop_rec_end,{f,33}},
        20,
-       {fragile_message_reference,{y,0}}}},
+       {fragile_message_reference,{y,_}}}},
      {{receive_stacked,f8,0},
       {{loop_rec_end,{f,38}},
        20,
-       {fragile_message_reference,{y,0}}}},
+       {fragile_message_reference,{y,_}}}},
      {{receive_stacked,m1,0},
       {{loop_rec_end,{f,43}},
        19,
-       {fragile_message_reference,{y,0}}}},
+       {fragile_message_reference,{y,_}}}},
      {{receive_stacked,m2,0},
       {{loop_rec_end,{f,48}},
        33,
-       {fragile_message_reference,{y,0}}}}] = Errors,
+       {fragile_message_reference,{y,_}}}}] = Errors,
 
     %% Compile the original source code as a smoke test.
     Data = proplists:get_value(data_dir, Config),
@@ -579,6 +580,148 @@ receive_stacked(Config) ->
 
     ok.
 
+aliased_types(Config) ->
+    Seq = lists:seq(1, 5),
+    1 = aliased_types_1(Seq, Config),
+
+    {1,1} = aliased_types_2(Seq),
+    {42,none} = aliased_types_2([]),
+
+    gurka = aliased_types_3([gurka]),
+    gaffel = aliased_types_3([gaffel]),
+
+    ok.
+
+%% ERL-735: validator failed to track types on aliased registers, rejecting
+%% legitimate optimizations.
+%%
+%%    move x0 y0
+%%    bif hd L1 x0
+%%    get_hd y0     %% The validator failed to see that y0 was a list
+%%
+aliased_types_1(Bug, Config) ->
+    if
+        Config =/= [gurka, gaffel] -> %% Pointless branch.
+            _ = hd(Bug),
+            lists:seq(1, 5),
+            hd(Bug)
+    end.
+
+%% ERL-832: validator failed to realize that a Y register was a cons.
+aliased_types_2(Bug) ->
+    Res = case Bug of
+              [] -> id(42);
+              _ -> hd(Bug)
+          end,
+    {Res,case Bug of
+             [] -> none;
+             _ -> hd(Bug)
+         end}.
+
+%% ERL-832 part deux; validator failed to realize that an aliased register was
+%% a cons.
+aliased_types_3(Bug) ->
+    List = [Y || Y <- Bug],
+    case List of
+        [] -> Bug;
+        _ ->
+            if
+                hd(List) -> a:a();
+                true -> ok
+            end,
+            hd(List)
+    end.
+
+
+%% ERL-867; validation proceeded after a type conflict, causing incorrect types
+%% to be joined.
+
+-record(r, { e1 = e1, e2 = e2 }).
+
+type_conflict(Config) when is_list(Config) ->
+    {e1, e2} = type_conflict_1(#r{}),
+    ok.
+
+type_conflict_1(C) ->
+    Src = id(C#r.e2),
+    TRes = try id(Src) of
+               R -> R
+           catch
+               %% C:R can never match, yet it assumed that the type of 'C' was
+               %% an atom from here on.
+               C:R -> R
+           end,
+    {C#r.e1, TRes}.
+
+%% ERL-886; validation failed to infer types on both sides of '=:='
+
+infer_on_eq(Config) when is_list(Config) ->
+    {ok, gurka} = infer_on_eq_1(id({gurka})),
+    {ok, gaffel} = infer_on_eq_2(id({gaffel})),
+    {ok, elefant} = infer_on_eq_3(id({elefant})),
+    {ok, myra} = infer_on_eq_4(id({myra})),
+    ok.
+
+infer_on_eq_1(T) ->
+    1 = erlang:tuple_size(T),
+    {ok, erlang:element(1, T)}.
+
+infer_on_eq_2(T) ->
+    Size = erlang:tuple_size(T),
+    Size = 1,
+    {ok, erlang:element(1, T)}.
+
+infer_on_eq_3(T) ->
+    true = 1 =:= erlang:tuple_size(T),
+    {ok, erlang:element(1, T)}.
+
+infer_on_eq_4(T) ->
+    true = erlang:tuple_size(T) =:= 1,
+    {ok, erlang:element(1, T)}.
+
+%% ERIERL-348; types were inferred for dead values, causing validation to fail.
+
+-record(idv, {key}).
+
+infer_dead_value(Config) when is_list(Config) ->
+    a = idv_1({a, b, c, d, e, f, g}, {0, 0, 0, 0, 0, 0, 0}),
+    b = idv_1({a, b, c, d, 0, 0, 0}, {a, b, c, d, 0, 0, 0}),
+    c = idv_1({0, 0, 0, 0, 0, f, g}, {0, 0, 0, 0, 0, f, g}),
+    error = idv_1(gurka, gaffel),
+
+    ok = idv_2(id(#idv{})),
+
+    ok.
+
+idv_1({_A, _B, _C, _D, _E, _F, _G},
+      {0, 0, 0, 0, 0, 0, 0}) ->
+    a;
+idv_1({A, B, C, D,_E, _F, _G}=_Tuple1,
+      {A, B, C, D, 0, 0, 0}=_Tuple2) ->
+    b;
+idv_1({_A, _B, _C, _D, _E, F, G},
+      {0, 0, 0, 0, 0, F, G}) ->
+    c;
+idv_1(_A, _B) ->
+    error.
+
+%% ERL-995: The first solution to ERIERL-348 was incomplete and caused
+%% validation to fail when living values depended on delayed type inference on
+%% "dead" values.
+
+idv_2(State) ->
+    Flag = (State#idv.key == undefined),
+    case id(gurka) of
+        {_} -> id([Flag]);
+        _ -> ok
+    end,
+    if
+        Flag -> idv_called_once(State);
+        true -> ok
+    end.
+
+idv_called_once(_State) -> ok.
+
 %%%-------------------------------------------------------------------------
 
 transform_remove(Remove, Module) ->
@@ -637,3 +780,6 @@ night(Turned) ->
     ok.
 
 participating(_, _, _, _) -> ok.
+
+id(I) ->
+    I.
diff --git a/lib/compiler/test/beam_validator_SUITE_data/bad_bin_match.S b/lib/compiler/test/beam_validator_SUITE_data/bad_bin_match.S
index a60ca1e89a..c7610971f1 100644
--- a/lib/compiler/test/beam_validator_SUITE_data/bad_bin_match.S
+++ b/lib/compiler/test/beam_validator_SUITE_data/bad_bin_match.S
@@ -11,5 +11,5 @@
   {label,1}.
     {func_info,{atom,t},{atom,t},1}.
   {label,2}.
-    {test,bs_start_match2,{f,1},1,[{x,0},0],{x,0}}.
+    {test,bs_start_match3,{f,1},1,[{x,0}],{x,0}}.
     return.
diff --git a/lib/compiler/test/beam_validator_SUITE_data/merge_undefined.S b/lib/compiler/test/beam_validator_SUITE_data/merge_undefined.S
index 481d55045d..aa344807e4 100644
--- a/lib/compiler/test/beam_validator_SUITE_data/merge_undefined.S
+++ b/lib/compiler/test/beam_validator_SUITE_data/merge_undefined.S
@@ -15,8 +15,9 @@
     {select_val,{x,0},{f,1},{list,[{atom,gurka},{f,3},{atom,delete},{f,4}]}}.
   {label,3}.
     {allocate_heap,2,6,2}.
-    %% The Y registers are not initialized here.
     {test,is_eq_exact,{f,5},[{x,0},{atom,ok}]}.
+    %% This is unreachable since {x,0} is known not to be 'ok'. We should not
+    %% fail with "uninitialized y registers" on erlang:exit/1
     {move,{atom,nisse},{x,0}}.
     {call_ext,1,{extfunc,erlang,exit,1}}.
   {label,4}.
@@ -29,6 +30,7 @@
     {call_ext,2,{extfunc,io,format,2}}.
     {test,is_ne_exact,{f,6},[{x,0},{atom,ok}]}.
   {label,5}.
+    %% The Y registers are not initialized here.
     {move,{atom,logReader},{x,1}}.
     {move,{atom,console},{x,0}}.
     {call_ext,2,{extfunc,debug,filter,2}}.
diff --git a/lib/compiler/test/beam_validator_SUITE_data/receive_stacked.S b/lib/compiler/test/beam_validator_SUITE_data/receive_stacked.S
index cca052a9c4..a878204d16 100644
--- a/lib/compiler/test/beam_validator_SUITE_data/receive_stacked.S
+++ b/lib/compiler/test/beam_validator_SUITE_data/receive_stacked.S
@@ -172,7 +172,7 @@
     {allocate_zero,1,0}.
   {label,28}.
     {loop_rec,{f,30},{x,0}}.
-    {test,bs_start_match2,{f,29},1,[{x,0},0],{x,0}}.
+    {test,bs_start_match3,{f,29},1,[{x,0}],{x,0}}.
     {test,bs_get_integer2,
           {f,29},
           1,
@@ -219,7 +219,7 @@
     {allocate_zero,1,0}.
   {label,33}.
     {loop_rec,{f,35},{x,0}}.
-    {test,bs_start_match2,{f,34},1,[{x,0},0],{x,0}}.
+    {test,bs_start_match3,{f,34},1,[{x,0}],{x,0}}.
     {test,bs_get_integer2,
           {f,34},
           1,
@@ -240,7 +240,7 @@
           {y,0}}.
     {'%',{no_bin_opt,{binary_used_in,{test,is_binary,{f,34},[{y,0}]}},
                      [63,{file,"receive_stacked.erl"}]}}.
-    {test,is_binary,{f,34},[{y,0}]}.
+    {test,is_eq_exact,{f,34},[{y,0},{literal,<<0,1,2,3>>}]}.
     remove_message.
     {move,{integer,42},{x,0}}.
     {line,[{location,"receive_stacked.erl",64}]}.
@@ -262,7 +262,7 @@
     {allocate_zero,1,0}.
   {label,38}.
     {loop_rec,{f,40},{x,0}}.
-    {test,bs_start_match2,{f,39},1,[{x,0},0],{x,1}}.
+    {test,bs_start_match3,{f,39},1,[{x,0}],{x,1}}.
     {test,bs_get_integer2,
           {f,39},
           2,
@@ -283,7 +283,7 @@
           {y,0}}.
     {'%',{no_bin_opt,{[{x,1},{y,0}],{loop_rec_end,{f,38}},not_handled},
                      [70,{file,"receive_stacked.erl"}]}}.
-    {test,is_binary,{f,39},[{x,0}]}.
+    {test,is_eq_exact,{f,39},[{x,0},{literal,<<0,1,2,3>>}]}.
     remove_message.
     {move,{integer,42},{x,0}}.
     {line,[{location,"receive_stacked.erl",71}]}.
diff --git a/lib/compiler/test/bif_SUITE.erl b/lib/compiler/test/bif_SUITE.erl
index 42ba5d5365..423a7666af 100644
--- a/lib/compiler/test/bif_SUITE.erl
+++ b/lib/compiler/test/bif_SUITE.erl
@@ -23,7 +23,7 @@
 
 -export([all/0,suite/0,groups/0,init_per_suite/1,end_per_suite/1,
 	 init_per_group/2,end_per_group/2,
-	 beam_validator/1,trunc_and_friends/1,cover_safe_bifs/1]).
+	 beam_validator/1,trunc_and_friends/1,cover_safe_and_pure_bifs/1]).
 
 suite() ->
     [{ct_hooks,[ts_install_cth]}].
@@ -35,7 +35,7 @@ groups() ->
     [{p,[parallel],
       [beam_validator,
        trunc_and_friends,
-       cover_safe_bifs
+       cover_safe_and_pure_bifs
       ]}].
 
 init_per_suite(Config) ->
@@ -106,7 +106,7 @@ trunc_template(Func, Bif) ->
         catch error:badarg -> ok end,
         ok.").
 
-cover_safe_bifs(Config) ->
+cover_safe_and_pure_bifs(Config) ->
     _ = get(),
     _ = get_keys(a),
     _ = group_leader(),
@@ -118,5 +118,6 @@ cover_safe_bifs(Config) ->
     _ = processes(),
     _ = registered(),
     _ = term_to_binary(Config),
+    42 = list_to_integer("2A", 16),
 
     ok.
diff --git a/lib/compiler/test/bs_construct_SUITE.erl b/lib/compiler/test/bs_construct_SUITE.erl
index ccc49df005..bccd70d6cb 100644
--- a/lib/compiler/test/bs_construct_SUITE.erl
+++ b/lib/compiler/test/bs_construct_SUITE.erl
@@ -27,6 +27,7 @@
 -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,
+         verify_highest_opcode/1,
 	 two/1,test1/1,fail/1,float_bin/1,in_guard/1,in_catch/1,
 	 nasty_literals/1,coerce_to_float/1,side_effect/1,
 	 opt/1,otp_7556/1,float_arith/1,otp_8054/1,
@@ -43,7 +44,8 @@ all() ->
 
 groups() ->
     [{p,[parallel],
-      [two,test1,fail,float_bin,in_guard,in_catch,
+      [verify_highest_opcode,
+       two,test1,fail,float_bin,in_guard,in_catch,
        nasty_literals,side_effect,opt,otp_7556,float_arith,
        otp_8054,cover]}].
 
@@ -68,6 +70,20 @@ init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
 end_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     ok.
 
+verify_highest_opcode(_Config) ->
+    case ?MODULE of
+        bs_construct_r21_SUITE ->
+            {ok,Beam} = file:read_file(code:which(?MODULE)),
+            case test_lib:highest_opcode(Beam) of
+                Highest when Highest =< 163 ->
+                    ok;
+                TooHigh ->
+                    ct:fail({too_high_opcode_for_21,TooHigh})
+            end;
+        _ ->
+            ok
+    end.
+
 two(Config) when is_list(Config) ->
     <<0,1,2,3,4,6,7,8,9>> = two_1([0], [<<1,2,3,4>>,<<6,7,8,9>>]),
     ok.
@@ -153,6 +169,8 @@ l(I_13, I_big1, I_16, Bin) ->
 	[0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0,
 	 16#77,16#FF,16#FF,16#FF,16#FF,16#FF,16#FF,16#FF,16#FF,16#FF,16#FF,
 	 16#FF,16#FF,16#FF,16#FF,16#FF,16#FF]),
+     ?T(<< (<<"abc",7:3>>):3/binary >>,
+        [$a,$b,$c]),
 
      %% Mix different units.
      ?T(<<37558955:(I_16-12)/unit:8,1:1>>,
@@ -311,6 +329,9 @@ fail(Config) when is_list(Config) ->
     {'EXIT',{badarg,_}} = (catch <<0:(-(1 bsl 100))>>),
     {'EXIT',{badarg,_}} = (catch <<Bin/binary,0:(-(1 bsl 100))>>),
 
+    %% Unaligned sizes with literal binaries.
+    {'EXIT',{badarg,_}} = (catch <<0,(<<7777:17>>)/binary>>),
+
     ok.
 
 float_bin(Config) when is_list(Config) ->
diff --git a/lib/compiler/test/bs_match_SUITE.erl b/lib/compiler/test/bs_match_SUITE.erl
index a751f6fda5..145a50f4ad 100644
--- a/lib/compiler/test/bs_match_SUITE.erl
+++ b/lib/compiler/test/bs_match_SUITE.erl
@@ -24,6 +24,7 @@
 -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,
+         verify_highest_opcode/1,
 	 size_shadow/1,int_float/1,otp_5269/1,null_fields/1,wiger/1,
 	 bin_tail/1,save_restore/1,
 	 partitioned_bs_match/1,function_clause/1,
@@ -40,8 +41,11 @@
 	 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,
-         beam_bsm/1,guard/1,is_ascii/1,non_opt_eq/1,erl_689/1,
-         bs_start_match2_defs/1]).
+         beam_bsm/1,guard/1,is_ascii/1,non_opt_eq/1,
+         expression_before_match/1,erl_689/1,restore_on_call/1,
+         restore_after_catch/1,matches_on_parameter/1,big_positions/1,
+         matching_meets_apply/1,bs_start_match2_defs/1,
+         exceptions_after_match_failure/1]).
 
 -export([coverage_id/1,coverage_external_ignore/2]).
 
@@ -57,8 +61,9 @@ all() ->
     [{group,p}].
 
 groups() -> 
-    [{p,[parallel],
-      [size_shadow,int_float,otp_5269,null_fields,wiger,
+    [{p,[],
+      [verify_highest_opcode,
+       size_shadow,int_float,otp_5269,null_fields,wiger,
        bin_tail,save_restore,
        partitioned_bs_match,function_clause,unit,
        shared_sub_bins,bin_and_float,dec_subidentifiers,
@@ -73,8 +78,11 @@ groups() ->
        map_and_binary,unsafe_branch_caching,
        bad_literals,good_literals,constant_propagation,parse_xml,
        get_payload,escape,num_slots_different,
-       beam_bsm,guard,is_ascii,non_opt_eq,erl_689,
-       bs_start_match2_defs]}].
+       beam_bsm,guard,is_ascii,non_opt_eq,
+       expression_before_match,erl_689,restore_on_call,
+       matches_on_parameter,big_positions,
+       matching_meets_apply,bs_start_match2_defs,
+       exceptions_after_match_failure]}].
 
 
 init_per_suite(Config) ->
@@ -97,6 +105,20 @@ init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
 end_per_testcase(Case, Config) when is_atom(Case), is_list(Config) ->
     ok.
 
+verify_highest_opcode(_Config) ->
+    case ?MODULE of
+        bs_match_r21_SUITE ->
+            {ok,Beam} = file:read_file(code:which(?MODULE)),
+            case test_lib:highest_opcode(Beam) of
+                Highest when Highest =< 163 ->
+                    ok;
+                TooHigh ->
+                    ct:fail({too_high_opcode_for_21,TooHigh})
+            end;
+        _ ->
+            ok
+    end.
+
 size_shadow(Config) when is_list(Config) ->
     %% Originally OTP-5270.
     7 = size_shadow_1(),
@@ -250,6 +272,12 @@ bin_tail(Config) when is_list(Config) ->
     ok = bin_tail_e(<<2:2,1:1,1:5,42:64>>),
     error = bin_tail_e(<<3:2,1:1,1:5,42:64>>),
     error = bin_tail_e(<<>>),
+
+    MD5 = erlang:md5(<<42>>),
+    <<"abc">> = bin_tail_f(<<MD5/binary,"abc">>, MD5, 3),
+    error = bin_tail_f(<<MD5/binary,"abc">>, MD5, 999),
+    {'EXIT',{_,_}} = (catch bin_tail_f(<<0:16/unit:8>>, MD5, 0)),
+
     ok.
 
 bin_tail_c(Bin, Offset) ->
@@ -306,6 +334,14 @@ bin_tail_e_var(Bin) ->
 	<<2:2,_:1,1:5,Tail/binary>> -> Tail;
 	_ -> error
     end.
+
+bin_tail_f(Bin, MD5, Size) ->
+    case Bin of
+        <<MD5:16/binary, Tail:Size/binary>> ->
+            Tail;
+        <<MD5:16/binary, _/binary>> ->
+            error
+    end.
 	    
 save_restore(Config) when is_list(Config) ->
     0 = save_restore_1(<<0:2,42:6>>),
@@ -457,6 +493,15 @@ unit(Config) when is_list(Config) ->
     127 = peek7(<<127:7>>),
     100 = peek7(<<100:7,19:7>>),
     fc(peek7, [<<1,2>>], catch peek7(<<1,2>>)),
+
+    1 = unit_opt(1, -1),
+    8 = unit_opt(8, -1),
+
+    <<1:32,"abc">> = unit_opt_2(<<1:32,"abc">>),
+    <<"def">> = unit_opt_2(<<2:32,"def">>),
+    {'EXIT',_} = (catch unit_opt_2(<<1:32,33:7>>)),
+    {'EXIT',_} = (catch unit_opt_2(<<2:32,55:7>>)),
+
     ok.
 
 peek1(<<B:8,_/bitstring>>) -> B.
@@ -467,6 +512,27 @@ peek8(<<B:8,_/binary>>) -> B.
 
 peek16(<<B:16,_/binary-unit:16>>) -> B.
 
+unit_opt(U, X) ->
+    %% Cover type analysis in beam_ssa_type.
+    Bin = case U of
+              1 -> <<X:7>>;
+              8 -> <<X>>
+          end,
+    %% The type of Bin will be set to {binary,gcd(1, 8)}.
+    case Bin of
+        <<_/binary-unit:8>> -> 8;
+        <<_/binary-unit:1>> -> 1
+    end.
+
+unit_opt_2(<<St:32,KO/binary>> = Bin0) ->
+    Bin = if
+              St =:= 1 ->
+                  Bin0;
+              St =:= 2 ->
+                  <<KO/binary>>
+          end,
+    id(Bin).
+
 shared_sub_bins(Config) when is_list(Config) ->
     {15,[<<>>,<<5>>,<<4,5>>,<<3,4,5>>,<<2,3,4,5>>]} = sum(<<1,2,3,4,5>>, [], 0),
     ok.
@@ -694,6 +760,20 @@ coverage(Config) when is_list(Config) ->
     binary = coverage_bitstring(<<7>>),
     bitstring = coverage_bitstring(<<7:4>>),
     other = coverage_bitstring([a]),
+
+    %% Cover code in beam_trim.
+
+    {done,<<17,53>>,[253,155,200]} =
+        coverage_trim(<<253,155,200,17,53>>, e0, e1, e2, e3, []),
+
+    <<"(right|linux)">> = coverage_trim_1(<<"">>, <<"right">>, <<"linux">>),
+    <<"/(right|linux)">> = coverage_trim_1(<<"/">>, <<"right">>, <<"linux">>),
+    <<"(left|linux)/(right|linux)">> =
+        coverage_trim_1(<<"left">>, <<"right">>, <<"linux">>),
+
+    {10,<<"-">>,""} = coverage_trim_2(<<"-">>, 10, []),
+    {8,<<"-">>,"aa"} = coverage_trim_2(<<"aa-">>, 10, []),
+
     ok.
 
 coverage_fold(Fun, Acc, <<H,T/binary>>) ->
@@ -788,6 +868,37 @@ coverage_bitstring(Bin) when is_binary(Bin) -> binary;
 coverage_bitstring(<<_/bitstring>>) -> bitstring;
 coverage_bitstring(_) -> other.
 
+coverage_trim(<<C:8,T/binary>> = Bin, E0, E1, E2, E3, Acc) ->
+    case id(C > 128) of
+        true ->
+            coverage_trim(T, E0, E1, E2, E3, [C|Acc]);
+        false ->
+            {done,Bin,lists:reverse(Acc)}
+    end.
+
+coverage_trim_1(<<>>, Right, OsType) ->
+    do_coverage_trim_1(Right, OsType);
+coverage_trim_1(<<"/">>, Right, OsType) ->
+    <<"/",(do_coverage_trim_1(Right, OsType))/binary>>;
+coverage_trim_1(Left, Right, OsType) ->
+    <<(do_coverage_trim_1(Left, OsType))/binary,
+      "/",
+      (do_coverage_trim_1(Right, OsType))/binary>>.
+
+do_coverage_trim_1(A, OsType) ->
+    <<"(",A/binary,"|",OsType/binary,")">>.
+
+coverage_trim_2(<<C/utf8,R/binary>> = Bin, I, L) ->
+    case printable_char(C) of
+        true ->
+            coverage_trim_2(R, I - 1, [C | L]);
+        false ->
+            {I,Bin,lists:reverse(L)}
+    end.
+
+printable_char($a) -> true;
+printable_char(_) -> false.
+
 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>>),
@@ -1754,11 +1865,10 @@ do_erl_689_2b(_, <<Length, Data/binary>>) ->
 %% ERL-753
 
 bs_start_match2_defs(_Config) ->
-    {<<"http://127.0.0.1:1234/vsaas/hello">>} = api_url(<<"hello">>, dummy),
-    {"https://127.0.0.1:4321/vsaas/hello"} = api_url({https, "hello"}, dummy).
+    {<<"http://127.0.0.1:1234/vsaas/hello">>} = api_url(<<"hello">>),
+    {"https://127.0.0.1:4321/vsaas/hello"} = api_url({https, "hello"}).
 
-api_url(URL, Auth) ->
-    Header = [],
+api_url(URL) ->
     case URL of
         <<_/binary>> -> {<<"http://127.0.0.1:1234/vsaas/",URL/binary>>};
         {https, [_|_] = URL1} -> {"https://127.0.0.1:4321/vsaas/"++URL1}
@@ -1767,4 +1877,147 @@ api_url(URL, Auth) ->
 check(F, R) ->
     R = F().
 
+%% Make sure that an expression that comes between function start and a match
+%% expression passes validation.
+expression_before_match(Config) when is_list(Config) ->
+    <<_,R/binary>> = id(<<0,1,2,3>>),
+    {1, <<2,3>>} = expression_before_match_1(R),
+    ok.
+
+expression_before_match_1(R) ->
+    A = id(1),
+    case R of
+        <<1,Bar/binary>> -> {A, Bar};
+        <<>> -> {A, baz}
+    end.
+
+%% Make sure that context positions are updated on calls.
+restore_on_call(Config) when is_list(Config) ->
+    ok = restore_on_call_plain(<<0, 1, 2>>),
+    <<"x">> = restore_on_call_match(<<0, "x">>),
+    ok.
+
+restore_on_call_plain(<<0, Rest/binary>>) ->
+    <<2>> = restore_on_call_plain_1(Rest),
+    %% {badmatch, <<>>} on missing restore.
+    <<2>> = restore_on_call_plain_1(Rest),
+    ok.
+
+restore_on_call_plain_1(<<1, Rest/binary>>) -> Rest;
+restore_on_call_plain_1(Other) -> Other.
+
+%% Calls a function that moves the match context passed to it, and then matches
+%% on its result to confuse the reposition algorithm's success/fail logic.
+restore_on_call_match(<<0, Bin/binary>>) ->
+    case skip_until_zero(Bin) of
+        {skipped, Rest} ->
+            Rest;
+        not_found ->
+            %% The match context did not get repositioned before the
+            %% bs_get_tail instruction here.
+            Bin
+    end.
+
+skip_until_zero(<<0,Rest/binary>>) ->
+    {skipped, Rest};
+skip_until_zero(<<_C,Rest/binary>>) ->
+    skip_until_zero(Rest);
+skip_until_zero(_) ->
+    not_found.
+
+%% 'catch' must invalidate positions.
+restore_after_catch(Config) when is_list(Config) ->
+    <<0, 1>> = restore_after_catch_1(<<0, 1>>),
+    ok.
+
+restore_after_catch_1(<<A/binary>>) ->
+    try throw_after_byte(A) of
+        _ -> impossible
+    catch
+        throw:_Any ->
+            %% Will equal <<1>> if the bug is present.
+            A
+    end.
+
+throw_after_byte(<<_,_/binary>>) ->
+    throw(away).
+
+matches_on_parameter(Config) when is_list(Config) ->
+    %% This improves coverage for matching on "naked" parameters.
+    {<<"urka">>, <<"a">>} = matches_on_parameter_1(<<"gurka">>),
+    ok = (catch matches_on_parameter_2(<<"10001110101">>, 0)).
+
+matches_on_parameter_1(Bin) ->
+    <<"g", A/binary>> = Bin,
+    <<_,_,"rk", B/binary>> = Bin,
+    {A, B}.
+
+matches_on_parameter_2(Bin, Offset) ->
+    <<_:Offset, Bit:1, Rest/bits>> = Bin,
+    case bit_size(Rest) of
+        0 -> throw(ok);
+        _ -> [Bit | matches_on_parameter_2(Bin, Offset + 1)]
+    end.
+
+big_positions(Config) when is_list(Config) ->
+    %% This provides coverage for when match context positions no longer fit
+    %% into an immediate on 32-bit platforms.
+
+    A = <<0:((1 bsl 27) - 8), $A, 1:1, "gurka", $A>>,
+    B = <<0:((1 bsl 27) - 8), $B, "hello", $B>>,
+
+    {a,$A} = bp_start_match(A),
+    {b,$B} = bp_start_match(B),
+    {a,$A} = bp_getpos(A),
+    {b,$B} = bp_getpos(B),
+
+    ok.
+
+%% After the first iteration the context's position will no longer fit into an
+%% immediate. To improve performance the bs_start_match3 instruction will
+%% return a new context with an updated base position so that we won't have to
+%% resort to using bigints.
+bp_start_match(<<_:(1 bsl 27),T/bits>>) -> bp_start_match(T);
+bp_start_match(<<1:1,"gurka",A>>) -> {a,A};
+bp_start_match(<<"hello",B>>) -> {b,B}.
+
+%% This is a corner case where the above didn't work perfectly; if the position
+%% was _just_ small enough to fit into an immediate when bs_start_match3 was
+%% hit, but too large at bs_get_position, then it must be saved as a bigint.
+bp_getpos(<<_:((1 bsl 27) - 8),T/bits>>) -> bp_getpos(T);
+bp_getpos(<<A,1:1,"gurka",A>>) -> {a,A};
+bp_getpos(<<B,"hello",B>>) -> {b,B}.
+
+matching_meets_apply(_Config) ->
+    <<"abc">> = do_matching_meets_apply(<<"/abc">>, []),
+    42 = do_matching_meets_apply(<<"">>, {erlang,-42}),
+    100 = do_matching_meets_apply(no_binary, {erlang,-100}),
+    ok.
+
+do_matching_meets_apply(<<$/, Rest/binary>>, _Handler) ->
+    id(Rest);
+do_matching_meets_apply(<<_/binary>>=Name, never_matches_a) ->
+    %% Used to crash the compiler because variables in a remote
+    %% were not handled properly by beam_ssa_bsm.
+    Name:foo(gurka);
+do_matching_meets_apply(<<_/binary>>=Name, never_matches_b) ->
+    %% Another case of the above.
+    foo:Name(gurka);
+do_matching_meets_apply(_Bin, {Handler, State}) ->
+    %% Another case of the above.
+    Handler:abs(State).
+
+%% Exception handling was broken on the failure path of bs_start_match as
+%% beam_ssa_bsm accidentally cloned and renamed the ?BADARG_BLOCK.
+exceptions_after_match_failure(_Config) ->
+    {'EXIT', {badarith, _}} = (catch do_exceptions_after_match_failure(atom)),
+    ok = do_exceptions_after_match_failure(<<0, 1, "gurka">>),
+    ok = do_exceptions_after_match_failure(2.0).
+
+do_exceptions_after_match_failure(<<_A, _B, "gurka">>) ->
+    ok;
+do_exceptions_after_match_failure(Other) ->
+    Other / 2.0,
+    ok.
+
 id(I) -> I.
diff --git a/lib/compiler/test/compilation_SUITE.erl b/lib/compiler/test/compilation_SUITE.erl
index 139f7af0d4..74f9dbd9b4 100644
--- a/lib/compiler/test/compilation_SUITE.erl
+++ b/lib/compiler/test/compilation_SUITE.erl
@@ -170,7 +170,7 @@ try_it(Module, Conf) ->
 			atom_to_list(Module)),
     Out = proplists:get_value(priv_dir,Conf),
     io:format("Compiling: ~s\n", [Src]),
-    CompRc0 = compile:file(Src, [clint0,clint,{outdir,Out},report,
+    CompRc0 = compile:file(Src, [clint0,clint,ssalint,{outdir,Out},report,
 				 bin_opt_info|OtherOpts]),
     io:format("Result: ~p\n",[CompRc0]),
     {ok,_Mod} = CompRc0,
@@ -189,7 +189,7 @@ try_it(Module, Conf) ->
 
     ct:timetrap(Timetrap),
     io:format("Compiling (with old inliner): ~s\n", [Src]),
-    CompRc2 = compile:file(Src, [clint,
+    CompRc2 = compile:file(Src, [clint,ssalint,
 				 {outdir,Out},report,bin_opt_info,
 				 {inline,1000}|OtherOpts]),
     io:format("Result: ~p\n",[CompRc2]),
@@ -355,7 +355,7 @@ compile_compiler(Files, OutDir, Version, InlineOpts) ->
     io:format("~ts", [code:which(compile)]),
     io:format("Compiling ~s into ~ts", [Version,OutDir]),
     Opts = [report,
-	    clint0,clint,
+	    clint0,clint,ssalint,
 	    bin_opt_info,
 	    {outdir,OutDir},
 	    {d,'COMPILER_VSN',"\""++Version++"\""},
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl
index 6b230710b3..53627b9d81 100644
--- a/lib/compiler/test/compile_SUITE.erl
+++ b/lib/compiler/test/compile_SUITE.erl
@@ -28,12 +28,12 @@
 	 init_per_group/2,end_per_group/2,
 	 app_test/1,appup_test/1,
 	 debug_info/4, custom_debug_info/1, custom_compile_info/1,
-	 file_1/1, forms_2/1, module_mismatch/1, big_file/1, outdir/1,
+	 file_1/1, forms_2/1, module_mismatch/1, outdir/1,
 	 binary/1, makedep/1, cond_and_ifdef/1, listings/1, listings_big/1,
 	 other_output/1, kernel_listing/1, encrypted_abstr/1,
 	 strict_record/1, utf8_atoms/1, utf8_functions/1, extra_chunks/1,
 	 cover/1, env/1, core_pp/1, tuple_calls/1,
-	 core_roundtrip/1, asm/1, optimized_guards/1,
+	 core_roundtrip/1, asm/1,
 	 sys_pre_attributes/1, dialyzer/1,
 	 warnings/1, pre_load_check/1, env_compiler_options/1,
          bc_options/1, deterministic_include/1, deterministic_paths/1
@@ -46,11 +46,11 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 -spec all() -> all_return_type().
 
 all() -> 
-    [app_test, appup_test, file_1, forms_2, module_mismatch, big_file, outdir,
+    [app_test, appup_test, file_1, forms_2, module_mismatch, outdir,
      binary, makedep, cond_and_ifdef, listings, listings_big,
      other_output, kernel_listing, encrypted_abstr, tuple_calls,
      strict_record, utf8_atoms, utf8_functions, extra_chunks,
-     cover, env, core_pp, core_roundtrip, asm, optimized_guards,
+     cover, env, core_pp, core_roundtrip, asm,
      sys_pre_attributes, dialyzer, warnings, pre_load_check,
      env_compiler_options, custom_debug_info, bc_options,
      custom_compile_info, deterministic_include, deterministic_paths].
@@ -104,6 +104,7 @@ file_1(Config) when is_list(Config) ->
     compile_and_verify(Simple, Target, []),
     compile_and_verify(Simple, Target, [native]),
     compile_and_verify(Simple, Target, [debug_info]),
+    compile_and_verify(Simple, Target, [no_postopt]),
     {ok,simple} = compile:file(Simple, [no_line_info]), %Coverage
 
     {ok,simple} = compile:file(Simple, [{eprof,beam_z}]), %Coverage
@@ -231,17 +232,6 @@ module_mismatch(Config) when is_list(Config) ->
 
     ok.
 
-big_file(Config) when is_list(Config) ->
-    {Big,Target} = get_files(Config, big, "big_file"),
-    ok = file:set_cwd(filename:dirname(Target)),
-    compile_and_verify(Big, Target, []),
-    compile_and_verify(Big, Target, [debug_info]),
-    compile_and_verify(Big, Target, [no_postopt]),
-
-    %% Cleanup.
-    ok = file:delete(Target),
-    ok.
-
 %% Tests that the {outdir, Dir} option works.
 
 outdir(Config) when is_list(Config) ->
@@ -370,41 +360,37 @@ do_file_listings(DataDir, PrivDir, [File|Files]) ->
     TargetDir = filename:join(PrivDir, listings),
     ok = file:make_dir(TargetDir),
 
-    %% Test all dedicated listing options.
-    do_listing(Simple, TargetDir, 'S'),
-    do_listing(Simple, TargetDir, 'E'),
-    do_listing(Simple, TargetDir, 'P'),
-    do_listing(Simple, TargetDir, dpp, ".pp"),
-    do_listing(Simple, TargetDir, dabstr, ".abstr"),
-    do_listing(Simple, TargetDir, dexp, ".expand"),
-    do_listing(Simple, TargetDir, dcore, ".core"),
-    do_listing(Simple, TargetDir, doldinline, ".oldinline"),
-    do_listing(Simple, TargetDir, dinline, ".inline"),
-    do_listing(Simple, TargetDir, dcore, ".core"),
-    do_listing(Simple, TargetDir, dcopt, ".copt"),
-    do_listing(Simple, TargetDir, dcbsm, ".core_bsm"),
-    do_listing(Simple, TargetDir, dsetel, ".dsetel"),
-    do_listing(Simple, TargetDir, dkern, ".kernel"),
-    do_listing(Simple, TargetDir, dcg, ".codegen"),
-    do_listing(Simple, TargetDir, dblk, ".block"),
-    do_listing(Simple, TargetDir, dexcept, ".except"),
-    do_listing(Simple, TargetDir, dbs, ".bs"),
-    do_listing(Simple, TargetDir, dtype, ".type"),
-    do_listing(Simple, TargetDir, ddead, ".dead"),
-    do_listing(Simple, TargetDir, djmp, ".jump"),
-    do_listing(Simple, TargetDir, dclean, ".clean"),
-    do_listing(Simple, TargetDir, dpeep, ".peep"),
-    do_listing(Simple, TargetDir, dopt, ".optimize"),
-
-    %% First clean up.
-    Listings = filename:join(PrivDir, listings),
-    lists:foreach(fun(F) -> ok = file:delete(F) end,
-	filelib:wildcard(filename:join(Listings, "*"))),
+    List = [{'S',".S"},
+            {'E',".E"},
+            {'P',".P"},
+            {dpp, ".pp"},
+            {dabstr, ".abstr"},
+            {dexp, ".expand"},
+            {dcore, ".core"},
+            {doldinline, ".oldinline"},
+            {dinline, ".inline"},
+            {dcore, ".core"},
+            {dcopt, ".copt"},
+            {dcbsm, ".core_bsm"},
+            {dkern, ".kernel"},
+            {dssa, ".ssa"},
+            {dssaopt, ".ssaopt"},
+            {dprecg, ".precodegen"},
+            {dcg, ".codegen"},
+            {dblk, ".block"},
+            {dexcept, ".except"},
+            {djmp, ".jump"},
+            {dclean, ".clean"},
+            {dpeep, ".peep"},
+            {dopt, ".optimize"},
+            {diffable, ".S"}],
+    p_listings(List, Simple, TargetDir),
 
     %% Test options that produce a listing file if 'binary' is not given.
     do_listing(Simple, TargetDir, to_pp, ".P"),
     do_listing(Simple, TargetDir, to_exp, ".E"),
     do_listing(Simple, TargetDir, to_core0, ".core"),
+    Listings = filename:join(PrivDir, listings),
     ok = file:delete(filename:join(Listings, File ++ ".core")),
     do_listing(Simple, TargetDir, to_core, ".core"),
     do_listing(Simple, TargetDir, to_kernel, ".kernel"),
@@ -420,21 +406,35 @@ do_file_listings(DataDir, PrivDir, [File|Files]) ->
 listings_big(Config) when is_list(Config) ->
     {Big,Target} = get_files(Config, big, listings_big),
     TargetDir = filename:dirname(Target),
-    do_listing(Big, TargetDir, 'S'),
-    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}]),
-
-    %% Cleanup.
-    ok = file:delete(Target),
-    lists:foreach(fun(F) -> ok = file:delete(F) end,
-		  filelib:wildcard(filename:join(TargetDir, "*"))),
-    ok = file:del_dir(TargetDir),
-    ok.
+    List = [{'S',".S"},
+            {'E',".E"},
+            {'P',".P"},
+            {dkern, ".kernel"},
+            {dssa, ".ssa"},
+            {dssaopt, ".ssaopt"},
+            {dprecg, ".precodegen"},
+            {to_dis, ".dis"}],
+    p_listings(List, Big, TargetDir).
+
+p_listings(List, File, BaseDir) ->
+    Run = fun({Option,Extension}) ->
+                  Uniq = erlang:unique_integer([positive]),
+                  Dir = filename:join(BaseDir, integer_to_list(Uniq)),
+                  ok = file:make_dir(Dir),
+                  try
+                      do_listing(File, Dir, Option, Extension),
+                      ok
+                  catch
+                      Class:Error:Stk ->
+                          io:format("~p:~p\n~p\n", [Class,Error,Stk]),
+                          error
+                  after
+                      _ = [ok = file:delete(F) ||
+                              F <- filelib:wildcard(filename:join(Dir, "*"))],
+                      ok = file:del_dir(Dir)
+                  end
+          end,
+    test_lib:p_run(Run, List).
 
 other_output(Config) when is_list(Config) ->
     {Simple,_Target} = get_files(Config, simple, "other_output"),
@@ -681,9 +681,6 @@ cover(Config) when is_list(Config) ->
     io:format("~p\n", [compile:options()]),
     ok.
 
-do_listing(Source, TargetDir, Type) ->
-    do_listing(Source, TargetDir, Type, "." ++ atom_to_list(Type)).
-
 do_listing(Source, TargetDir, Type, Ext) ->
     io:format("Source: ~p TargetDir: ~p\n  Type: ~p Ext: ~p\n",
 	      [Source, TargetDir, Type, Ext]),
@@ -920,7 +917,7 @@ do_core_pp_1(M, A, Outdir) ->
     ok = file:delete(CoreFile),
 
     %% Compile as usual (including optimizations).
-    compile_forms(M, Core, [clint,from_core,binary]),
+    compile_forms(M, Core, [clint,ssalint,from_core,binary]),
 
     %% Don't optimize to test that we are not dependent
     %% on the Core Erlang optmimization passes.
@@ -929,7 +926,7 @@ do_core_pp_1(M, A, Outdir) ->
     %% records; if sys_core_fold was run it would fix
     %% that; if sys_core_fold was not run v3_kernel would
     %% crash.)
-    compile_forms(M, Core, [clint,from_core,no_copt,binary]),
+    compile_forms(M, Core, [clint,ssalint,from_core,no_copt,binary]),
 
     ok.
 
@@ -1170,95 +1167,6 @@ do_asm(Beam, Outdir) ->
 	    error
     end.
 
-%% Make sure that guards are fully optimized. Guards should
-%% should use 'test' instructions, not 'bif' instructions.
-
-optimized_guards(_Config) ->
-    TestBeams = get_unique_beam_files(),
-    test_lib:p_run(fun(F) -> do_opt_guards(F) end, TestBeams).
-
-do_opt_guards(Beam) ->
-    {ok,{M,[{abstract_code,{raw_abstract_v1,A}}]}} =
-	beam_lib:chunks(Beam, [abstract_code]),
-    try
-	{ok,M,Asm} = compile:forms(A, ['S']),
-	do_opt_guards_mod(Asm)
-    catch Class:Error:Stk ->
-	    io:format("~p: ~p ~p\n~p\n", [M,Class,Error,Stk]),
-	    error
-    end.
-
-do_opt_guards_mod({Mod,_Exp,_Attr,Asm,_NumLabels}) ->
-    case do_opt_guards_fs(Mod, Asm) of
-	[] ->
-	    ok;
-	[_|_]=Bifs ->
-	    io:format("ERRORS FOR ~p:\n~p\n", [Mod,Bifs]),
-	    error
-    end.
-
-do_opt_guards_fs(Mod, [{function,Name,Arity,_,Is}|Fs]) ->
-    Bifs0 = do_opt_guards_fun(Is),
-
-    %% The compiler does not attempt to optimize 'xor'.
-    %% Therefore, ignore all functions that use 'xor' in
-    %% a guard.
-    Bifs = case lists:any(fun({bif,'xor',_,_,_}) -> true;
-			     (_) -> false
-			  end, Bifs0) of
-	       true -> [];
-	       false -> Bifs0
-	   end,
-
-    %% Filter out the allowed exceptions.
-    FA = {Name,Arity},
-    case {Bifs,is_exception(Mod, FA)} of
-	{[_|_],true} ->
-	    io:format("~p:~p/~p IGNORED:\n~p\n",
-		      [Mod,Name,Arity,Bifs]),
-	    do_opt_guards_fs(Mod, Fs);
-	{[_|_],false} ->
-	    [{FA,Bifs}|do_opt_guards_fs(Mod, Fs)];
-	{[],false} ->
-	    do_opt_guards_fs(Mod, Fs);
-	{[],true} ->
-	    io:format("Redundant exception for ~p:~p/~p\n",
-		      [Mod,Name,Arity]),
-	    error(redundant)
-    end;
-do_opt_guards_fs(_, []) -> [].
-
-do_opt_guards_fun([{bif,Name,{f,F},As,_}=I|Is]) when F =/= 0 ->
-    Arity = length(As),
-    case erl_internal:comp_op(Name, Arity) orelse
-	erl_internal:bool_op(Name, Arity) orelse
-	erl_internal:new_type_test(Name, Arity) of
-	true ->
-	    [I|do_opt_guards_fun(Is)];
-	false ->
-	    do_opt_guards_fun(Is)
-    end;
-do_opt_guards_fun([_|Is]) ->
-    do_opt_guards_fun(Is);
-do_opt_guards_fun([]) -> [].
-
-is_exception(bs_match_SUITE, {matching_and_andalso_2,2}) -> true;
-is_exception(bs_match_SUITE, {matching_and_andalso_3,2}) -> true;
-is_exception(guard_SUITE, {'-complex_not/1-fun-4-',1}) -> true;
-is_exception(guard_SUITE, {'-complex_not/1-fun-5-',1}) -> true;
-is_exception(guard_SUITE, {basic_andalso_orelse,1}) -> true;
-is_exception(guard_SUITE, {bad_guards,1}) -> true;
-is_exception(guard_SUITE, {bad_guards_2,2}) -> true;
-is_exception(guard_SUITE, {bad_guards_3,2}) -> true;
-is_exception(guard_SUITE, {cqlc,4}) -> true;
-is_exception(guard_SUITE, {csemi7,3}) -> true;
-is_exception(guard_SUITE, {misc,1}) -> true;
-is_exception(guard_SUITE, {nested_not_2b,4}) -> true;
-is_exception(guard_SUITE, {tricky_1,2}) -> true;
-is_exception(map_SUITE, {map_guard_update,2}) -> true;
-is_exception(map_SUITE, {map_guard_update_variables,3}) -> true;
-is_exception(_, _) -> false.
-
 sys_pre_attributes(Config) ->
     DataDir = proplists:get_value(data_dir, Config),
     File = filename:join(DataDir, "attributes.erl"),
@@ -1475,44 +1383,55 @@ env_compiler_options(_Config) ->
 bc_options(Config) ->
     DataDir = proplists:get_value(data_dir, Config),
 
-    101 = highest_opcode(DataDir, small_float, [no_get_hd_tl,no_line_info]),
-
-    103 = highest_opcode(DataDir, big,
-                         [no_get_hd_tl,no_record_opt,
-                          no_line_info,no_stack_trimming]),
-
-    125 = highest_opcode(DataDir, small_float,
-                         [no_get_hd_tl,no_line_info,no_float_opt]),
-
-    132 = highest_opcode(DataDir, small,
-                         [no_get_hd_tl,no_record_opt,no_float_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_get_hd_tl,no_record_opt]),
-    153 = highest_opcode(DataDir, big, [r16]),
-    153 = highest_opcode(DataDir, big, [r17]),
-    153 = highest_opcode(DataDir, big, [r18]),
-    153 = highest_opcode(DataDir, big, [r19]),
-    153 = highest_opcode(DataDir, small_float, [r16]),
-    153 = highest_opcode(DataDir, small_float, []),
-
-    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, []),
-
-    163 = highest_opcode(DataDir, big, []),
-
+    L = [{101, small_float, [no_get_hd_tl,no_line_info]},
+         {103, big, [no_put_tuple2,no_get_hd_tl,no_ssa_opt_record,
+                     no_line_info,no_stack_trimming]},
+         {125, small_float, [no_get_hd_tl,no_line_info,no_ssa_opt_float]},
+
+         {132, small, [no_put_tuple2,no_get_hd_tl,no_ssa_opt_record,
+                       no_ssa_opt_float,no_line_info,no_bsm3]},
+
+         {153, small, [r20]},
+         {153, small, [r21]},
+
+         {136, big, [no_put_tuple2,no_get_hd_tl,
+                     no_ssa_opt_record,no_line_info]},
+
+         {153, big, [no_put_tuple2,no_get_hd_tl, no_ssa_opt_record]},
+         {153, big, [r16]},
+         {153, big, [r17]},
+         {153, big, [r18]},
+         {153, big, [r19]},
+         {153, small_float, [r16]},
+         {153, small_float, []},
+
+         {158, small_maps, [r17]},
+         {158, small_maps, [r18]},
+         {158, small_maps, [r19]},
+         {158, small_maps, [r20]},
+         {158, small_maps, [r21]},
+
+         {164, small_maps, []},
+         {164, big, []}
+        ],
+
+    Test = fun({Expected,Mod,Options}) ->
+                   case highest_opcode(DataDir, Mod, Options) of
+                       Expected ->
+                           ok;
+                       Got ->
+                           io:format("*** module ~p, options ~p => got ~p; expected ~p\n",
+                                     [Mod,Options,Got,Expected]),
+                           error
+                   end
+           end,
+    test_lib:p_run(Test, L),
     ok.
 
 highest_opcode(DataDir, Mod, Opt) ->
     Src = filename:join(DataDir, atom_to_list(Mod)++".erl"),
     {ok,Mod,Beam} = compile:file(Src, [binary|Opt]),
-    {ok,{Mod,[{"Code",Code}]}} = beam_lib:chunks(Beam, ["Code"]),
-    <<16:32,0:32,HighestOpcode:32,_/binary>> = Code,
-    HighestOpcode.
+    test_lib:highest_opcode(Beam).
 
 deterministic_include(Config) when is_list(Config) ->
     DataDir = proplists:get_value(data_dir, Config),
diff --git a/lib/compiler/test/compiler.cover b/lib/compiler/test/compiler.cover
index 3fd7fc1937..fac0f9947c 100644
--- a/lib/compiler/test/compiler.cover
+++ b/lib/compiler/test/compiler.cover
@@ -1,5 +1,4 @@
-{incl_app,compiler,details}.
-
 %% -*- erlang -*-
+{local_only,compiler,true}.
+{incl_app,compiler,details}.
 {excl_mods,compiler,[core_scan,core_parse]}.
-
diff --git a/lib/compiler/test/core_SUITE.erl b/lib/compiler/test/core_SUITE.erl
index e5611e99d1..72016c6d76 100644
--- a/lib/compiler/test/core_SUITE.erl
+++ b/lib/compiler/test/core_SUITE.erl
@@ -29,7 +29,8 @@
 	 bs_shadowed_size_var/1,
 	 cover_v3_kernel_1/1,cover_v3_kernel_2/1,cover_v3_kernel_3/1,
 	 cover_v3_kernel_4/1,cover_v3_kernel_5/1,
-         non_variable_apply/1,name_capture/1,fun_letrec_effect/1]).
+         non_variable_apply/1,name_capture/1,fun_letrec_effect/1,
+         get_map_element/1]).
 
 -include_lib("common_test/include/ct.hrl").
 
@@ -57,7 +58,8 @@ groups() ->
        bs_shadowed_size_var,
        cover_v3_kernel_1,cover_v3_kernel_2,cover_v3_kernel_3,
        cover_v3_kernel_4,cover_v3_kernel_5,
-       non_variable_apply,name_capture,fun_letrec_effect
+       non_variable_apply,name_capture,fun_letrec_effect,
+       get_map_element
       ]}].
 
 
@@ -95,6 +97,7 @@ end_per_group(_GroupName, Config) ->
 ?comp(non_variable_apply).
 ?comp(name_capture).
 ?comp(fun_letrec_effect).
+?comp(get_map_element).
 
 try_it(Mod, Conf) ->
     Src = filename:join(proplists:get_value(data_dir, Conf),
diff --git a/lib/compiler/test/core_SUITE_data/get_map_element.core b/lib/compiler/test/core_SUITE_data/get_map_element.core
new file mode 100644
index 0000000000..092b5e71eb
--- /dev/null
+++ b/lib/compiler/test/core_SUITE_data/get_map_element.core
@@ -0,0 +1,18 @@
+module 'get_map_element' ['get_map_element'/0]
+attributes []
+
+'get_map_element'/0 =
+    fun () ->
+      apply 'match_map'/1(~{'foo'=>'bar'}~)
+
+'match_map'/1 =
+    fun (_0) ->
+	case _0 of
+	  <~{'foo':='bar'}~> when 'true' ->
+	    'ok'
+	  %% It will be undefined behaviour at runtime if no
+	  %% clause of the case can be selected. That can't
+	  %% happen for this module, because match_map/1 is
+	  %% always called with a matching map argument.
+    end
+end
diff --git a/lib/compiler/test/core_fold_SUITE.erl b/lib/compiler/test/core_fold_SUITE.erl
index 47606014c3..adfebd5158 100644
--- a/lib/compiler/test/core_fold_SUITE.erl
+++ b/lib/compiler/test/core_fold_SUITE.erl
@@ -212,9 +212,14 @@ bifs(Config) when is_list(Config) ->
     {ok,#{K:=V}} = id(list_to_tuple([ok,#{K=>V}])),
     ok.
 
--define(CMP_SAME(A0, B), (fun(A) -> true = A == B, false = A /= B end)(id(A0))).
--define(CMP_DIFF(A0, B), (fun(A) -> false = A == B, true = A /= B end)(id(A0))).
-	       
+-define(CMP_SAME0(A0, B), (fun(A) -> true = A == B, false = A /= B end)(id(A0))).
+-define(CMP_SAME1(A0, B), (fun(A) -> false = A /= B, true = A == B end)(id(A0))).
+-define(CMP_SAME(A0, B), (true = ?CMP_SAME0(A0, B) =:= not ?CMP_SAME1(A0, B))).
+
+-define(CMP_DIFF0(A0, B), (fun(A) -> false = A == B, true = A /= B end)(id(A0))).
+-define(CMP_DIFF1(A0, B), (fun(A) -> true = A /= B, false = A == B end)(id(A0))).
+-define(CMP_DIFF(A0, B), (true = ?CMP_DIFF0(A0, B) =:= not ?CMP_DIFF1(A0, B))).
+
 eq(Config) when is_list(Config) ->
     ?CMP_SAME([a,b,c], [a,b,c]),
     ?CMP_SAME([42.0], [42.0]),
@@ -278,6 +283,8 @@ coverage(Config) when is_list(Config) ->
     a = cover_remove_non_vars_alias({a,b,c}),
     error = cover_will_match_lit_list(),
     {ok,[a]} = cover_is_safe_bool_expr(a),
+    false = cover_is_safe_bool_expr2(a),
+    ok = cover_eval_is_function(fun id/1),
 
     ok = cover_opt_guard_try(#cover_opt_guard_try{list=[a]}),
     error = cover_opt_guard_try(#cover_opt_guard_try{list=[]}),
@@ -341,6 +348,15 @@ cover_is_safe_bool_expr(X) ->
 	    false
     end.
 
+cover_is_safe_bool_expr2(X) ->
+    try
+	V = [X],
+    is_function(V, 1)
+    catch
+	_:_ ->
+	    false
+    end.
+
 cover_opt_guard_try(Msg) ->
     if
 	length(Msg#cover_opt_guard_try.list) =/= 1 ->
@@ -349,6 +365,12 @@ cover_opt_guard_try(Msg) ->
 	    ok
     end.
 
+cover_eval_is_function(X) ->
+    case X of
+        {a,_} -> is_function(X);
+        _ -> ok
+    end.
+
 bsm_an_inlined(<<_:8>>, _) -> ok;
 bsm_an_inlined(_, _) -> error.
 
@@ -356,7 +378,7 @@ unused_multiple_values_error(Config) when is_list(Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
     Dir = test_lib:get_data_dir(Config),
     Core = filename:join(Dir, "unused_multiple_values_error"),
-    Opts = [no_copt,clint,return,from_core,{outdir,PrivDir}
+    Opts = [no_copt,clint,ssalint,return,from_core,{outdir,PrivDir}
 	   |test_lib:opt_opts(?MODULE)],
     {error,[{unused_multiple_values_error,
 	     [{none,core_lint,{return_mismatch,{hello,1}}}]}],
@@ -480,7 +502,7 @@ source(true, Activities) ->
 	    Activities
     end.
 
-tim(#{reduction := Emergency}) ->
+tim(#{reduction := _Emergency}) ->
     try
 	fun() -> surgery end
     catch
diff --git a/lib/compiler/test/float_SUITE.erl b/lib/compiler/test/float_SUITE.erl
index 012810aba2..0fa8070dc8 100644
--- a/lib/compiler/test/float_SUITE.erl
+++ b/lib/compiler/test/float_SUITE.erl
@@ -20,15 +20,17 @@
 -module(float_SUITE).
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,
-	 pending/1,bif_calls/1,math_functions/1,mixed_float_and_int/1]).
+	 pending/1,bif_calls/1,math_functions/1,mixed_float_and_int/1,
+         subtract_number_type/1,float_followed_by_guard/1]).
 
 -include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
-all() -> 
+all() ->
     [pending, bif_calls, math_functions,
-     mixed_float_and_int].
+     mixed_float_and_int, subtract_number_type,
+     float_followed_by_guard].
 
 groups() -> 
     [].
@@ -176,5 +178,31 @@ mixed_float_and_int(Config) when is_list(Config) ->
 pc(Cov, NotCov, X) ->
     round(Cov/(Cov+NotCov)*100) + 42 + 2.0*X.
 
+subtract_number_type(Config) when is_list(Config) ->
+    120 = fact(5).
+
+fact(N) ->
+    fact(N, 1).
+
+fact(0, P) -> P;
+fact(1, P) -> P;
+fact(N, P) -> fact(N-1, P*N).
+
+float_followed_by_guard(Config) when is_list(Config) ->
+    true = ffbg_1(5, 1),
+    false = ffbg_1(1, 5),
+    ok.
+
+ffbg_1(A, B0) ->
+    %% This is a non-guard block followed by a *guard block* that starts with a
+    %% floating point operation, and the compiler erroneously assumed that it
+    %% was safe to skip fcheckerror because the next block started with a float
+    %% op.
+    B = id(B0) / 1.0,
+    if
+        A - B > 0.0 -> true;
+        A - B =< 0.0 -> false
+    end.
+
 id(I) -> I.
 
diff --git a/lib/compiler/test/fun_SUITE.erl b/lib/compiler/test/fun_SUITE.erl
index e00885fcd6..7fc6195e31 100644
--- a/lib/compiler/test/fun_SUITE.erl
+++ b/lib/compiler/test/fun_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,
 	 test1/1,overwritten_fun/1,otp_7202/1,bif_fun/1,
-         external/1,eep37/1,eep37_dup/1,badarity/1,badfun/1]).
+         external/1,eep37/1,eep37_dup/1,badarity/1,badfun/1,
+         duplicated_fun/1]).
 
 %% Internal exports.
 -export([call_me/1,dup1/0,dup2/0]).
@@ -37,7 +38,7 @@ all() ->
 groups() ->
     [{p,[parallel],
       [test1,overwritten_fun,otp_7202,bif_fun,external,eep37,
-       eep37_dup,badarity,badfun]}].
+       eep37_dup,badarity,badfun,duplicated_fun]}].
 
 init_per_suite(Config) ->
     test_lib:recompile(?MODULE),
@@ -249,10 +250,32 @@ badfun(_Config) ->
     expect_badfun(X, catch X(put(?FUNCTION_NAME, of_course))),
     of_course = erase(?FUNCTION_NAME),
 
+    %% A literal as a Fun used to crash the code generator. This only happened
+    %% when type optimization had reduced `Fun` to a literal, hence the match.
+    Literal = fun(literal = Fun) ->
+                      Fun()
+              end,
+    expect_badfun(literal, catch Literal(literal)),
+
     ok.
 
 expect_badfun(Term, Exit) ->
     {'EXIT',{{badfun,Term},_}} = Exit.
 
+duplicated_fun(_Config) ->
+    try
+        %% The following code used to crash the compiler before
+        %% v3_core:is_safe/1 was corrected to consider fun variables
+        %% unsafe.
+        id([print_result_paths_fun = fun duplicated_fun_helper/1]),
+        ct:error(should_fail)
+    catch
+        error:{badmatch,F} when is_function(F, 1) ->
+            ok
+    end.
+
+duplicated_fun_helper(_) ->
+    ok.
+
 id(I) ->
     I.
diff --git a/lib/compiler/test/guard_SUITE.erl b/lib/compiler/test/guard_SUITE.erl
index 6ad73b46f7..cea7a374cd 100644
--- a/lib/compiler/test/guard_SUITE.erl
+++ b/lib/compiler/test/guard_SUITE.erl
@@ -36,7 +36,7 @@
 	 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,
-         cover_beam_dead/1]).
+         repeated_type_tests/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -55,7 +55,7 @@ groups() ->
        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,
-       cover_beam_dead]}].
+       repeated_type_tests]}].
 
 init_per_suite(Config) ->
     test_lib:recompile(?MODULE),
@@ -1297,6 +1297,32 @@ rel_ops(Config) when is_list(Config) ->
     Empty = id([]),
     ?T(==, [], Empty),
 
+    %% Cover beam_ssa_dead:turn_op('/=').
+    ok = (fun(A, B) when is_atom(A) ->
+                  X = id(A /= B),
+                  if
+                      X -> ok;
+                      true -> error
+                  end
+          end)(a, b),
+    ok = (fun(A, B) when is_atom(A) ->
+                  X = id(B /= A),
+                  if
+                        X -> ok;
+                        true -> error
+                    end
+            end)(a, b),
+
+    %% Cover beam_ssa_dead.
+    Arrow = fun([T1,T2]) when T1 == $>, T2 == $>;
+                              T1 == $<, T2 == $| ->  true;
+               (_) -> false
+            end,
+    true = Arrow(">>"),
+    true = Arrow("<|"),
+    false = Arrow("><"),
+    false = Arrow(""),
+
     ok.
 
 -undef(TestOp).
@@ -1330,6 +1356,9 @@ rel_op_combinations_1(N, Digits) ->
     Bool = is_digit_6(N),
     Bool = is_digit_7(N),
     Bool = is_digit_8(N),
+    Bool = is_digit_9(42, N),
+    Bool = is_digit_10(N, 0),
+    Bool = is_digit_11(N, 0),
     rel_op_combinations_1(N-1, Digits).
 
 is_digit_1(X) when 16#0660 =< X, X =< 16#0669 -> true;
@@ -1373,6 +1402,24 @@ is_digit_8(X) when X =< 16#0669, X > (16#0660-1) -> true;
 is_digit_8(16#0670) -> false;
 is_digit_8(_) -> false.
 
+is_digit_9(A, 0) when A =:= 42 -> false;
+is_digit_9(_, X) when X > 16#065F, X < 16#066A -> true;
+is_digit_9(_, X) when 16#0030 =< X, X =< 16#0039 -> true;
+is_digit_9(_, X) when 16#06F0 =< X, X =< 16#06F9 -> true;
+is_digit_9(_, _) -> false.
+
+is_digit_10(0, 0) -> false;
+is_digit_10(X, _) when X < 16#066A, 16#0660 =< X -> true;
+is_digit_10(X, _) when 16#0030 =< X, X =< 16#0039 -> true;
+is_digit_10(X, _) when 16#06F0 =< X, X =< 16#06F9 -> true;
+is_digit_10(_, _) -> false.
+
+is_digit_11(0, 0) -> false;
+is_digit_11(X, _) when X =< 16#0669, 16#0660 =< X -> true;
+is_digit_11(X, _) when 16#0030 =< X, X =< 16#0039 -> true;
+is_digit_11(X, _) when 16#06F0 =< X, X =< 16#06F9 -> true;
+is_digit_11(_, _) -> false.
+
 rel_op_combinations_2(0, _) ->
     ok;
 rel_op_combinations_2(N, Range) ->
@@ -1473,6 +1520,7 @@ rel_op_combinations_3(N, Red) ->
     Val = redundant_9(N),
     Val = redundant_10(N),
     Val = redundant_11(N),
+    Val = redundant_11(N),
     rel_op_combinations_3(N-1, Red).
 
 redundant_1(X) when X >= 51, X =< 80 -> 5*X;
@@ -1527,6 +1575,10 @@ redundant_11(X) when X =:= 10 -> 2*X;
 redundant_11(X) when X >= 51, X =< 80 -> 5*X;
 redundant_11(_) -> none.
 
+redundant_12(X) when X >= 50, X =< 80 -> 2*X;
+redundant_12(X) when X < 51 -> 5*X;
+redundant_12(_) -> none.
+
 %% Test type tests on literal values. (From emulator test suites.)
 literal_type_tests(Config) when is_list(Config) ->
     case ?MODULE of
@@ -1779,15 +1831,10 @@ t_tuple_size(Config) when is_list(Config) ->
     error = ludicrous_tuple_size({a,b,c}),
     error = ludicrous_tuple_size([a,b,c]),
 
-    %% Test the "unsafe case" - the register assigned the tuple size is
-    %% not killed.
-    DataDir = test_lib:get_data_dir(Config),
-    File = filename:join(DataDir, "guard_SUITE_tuple_size"),
-    {ok,Mod,Code} = compile:file(File, [from_asm,binary]),
-    code:load_binary(Mod, File, Code),
-    14 = Mod:t({1,2,3,4}),
-    _ = code:delete(Mod),
-    _ = code:purge(Mod),
+    good_ip({1,2,3,4}),
+    good_ip({1,2,3,4,5,6,7,8}),
+    error = validate_ip({42,11}),
+    error = validate_ip(atom),
     
     ok.
 
@@ -1805,6 +1852,16 @@ ludicrous_tuple_size(T)
   when tuple_size(T) =:= 16#FFFFFFFFFFFFFFFF -> ok;
 ludicrous_tuple_size(_) -> error.
 
+good_ip(IP) ->
+    IP = validate_ip(IP).
+
+validate_ip(Value) when is_tuple(Value) andalso
+                        ((size(Value) =:= 4) orelse (size(Value) =:= 8)) ->
+    %% size/1 (converted to tuple_size) used more than once.
+    Value;
+validate_ip(_) ->
+    error.
+
 %%
 %% The binary_part/2,3 guard BIFs
 %%
@@ -2206,32 +2263,25 @@ 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),
-
+repeated_type_tests(_Config) ->
+    binary = repeated_type_test(<<42>>),
+    bitstring = repeated_type_test(<<1:1>>),
+    other = repeated_type_test(atom),
     ok.
 
+repeated_type_test(T) ->
+    %% Test for a bug in beam_ssa_dead.
+    if is_bitstring(T) ->
+            if is_binary(T) ->                  %This test would be optimized away.
+                    binary;
+               true ->
+                    bitstring
+            end;
+       true ->
+            other
+    end.
+
+
 %% Call this function to turn off constant propagation.
 id(I) -> I.
 
diff --git a/lib/compiler/test/guard_SUITE_data/guard_SUITE_tuple_size.S b/lib/compiler/test/guard_SUITE_data/guard_SUITE_tuple_size.S
deleted file mode 100644
index cffb792920..0000000000
--- a/lib/compiler/test/guard_SUITE_data/guard_SUITE_tuple_size.S
+++ /dev/null
@@ -1,30 +0,0 @@
-{module, guard_SUITE_tuple_size}.  %% version = 0
-
-{exports, [{t,1}]}.
-
-{attributes, []}.
-
-{labels, 5}.
-
-
-{function, t, 1, 2}.
-  {label,1}.
-    {func_info,{atom,guard_SUITE_tuple_size},{atom,t},1}.
-  {label,2}.
-    {bif,tuple_size,{f,4},[{x,0}],{x,1}}.
-    {test,is_eq_exact,{f,4},[{x,1},{integer,4}]}.
-    {test,is_tuple,{f,3},[{x,0}]}.
-    {test,test_arity,{f,3},[{x,0},4]}.
-    {get_tuple_element,{x,0},0,{x,5}}.
-    {get_tuple_element,{x,0},1,{x,2}}.
-    {get_tuple_element,{x,0},2,{x,3}}.
-    {get_tuple_element,{x,0},3,{x,4}}.
-    {gc_bif,'+',{f,0},6,[{x,1},{x,2}],{x,0}}.
-    {gc_bif,'+',{f,0},6,[{x,0},{x,3}],{x,0}}.
-    {gc_bif,'+',{f,0},6,[{x,0},{x,4}],{x,0}}.
-    {gc_bif,'+',{f,0},6,[{x,0},{x,5}],{x,0}}.
-    return.
-  {label,3}.
-    {badmatch,{x,0}}.
-  {label,4}.
-    {jump,{f,1}}.
diff --git a/lib/compiler/test/inline_SUITE.erl b/lib/compiler/test/inline_SUITE.erl
index dcc703c3e1..aff1a56c47 100644
--- a/lib/compiler/test/inline_SUITE.erl
+++ b/lib/compiler/test/inline_SUITE.erl
@@ -42,13 +42,9 @@ groups() ->
 
 init_per_suite(Config) ->
     test_lib:recompile(?MODULE),
-    Pa = "-pa " ++ filename:dirname(code:which(?MODULE)),
-    {ok,Node} = start_node(compiler, Pa),
-    [{testing_node,Node}|Config].
+    Config.
 
-end_per_suite(Config) ->
-    Node = proplists:get_value(testing_node, Config),
-    test_server:stop_node(Node),
+end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
@@ -89,26 +85,26 @@ attribute(Config) when is_list(Config) ->
 ?comp(maps_inline_test).
 
 try_inline(Mod, Config) ->
-    Node = proplists:get_value(testing_node, Config),
     Src = filename:join(proplists:get_value(data_dir, Config),
 			atom_to_list(Mod)),
     Out = proplists:get_value(priv_dir,Config),
 
     %% Normal compilation.
     io:format("Compiling: ~s\n", [Src]),
-    {ok,Mod} = compile:file(Src, [{outdir,Out},report,bin_opt_info,clint]),
+    {ok,Mod} = compile:file(Src, [{outdir,Out},report,
+                                  bin_opt_info,clint,ssalint]),
 
     ct:timetrap({minutes,10}),
-    NormalResult = rpc:call(Node, ?MODULE, load_and_call, [Out,Mod]),
+    NormalResult = load_and_call(Out, Mod),
 
     %% Inlining.
     io:format("Compiling with old inliner: ~s\n", [Src]),
     {ok,Mod} = compile:file(Src, [{outdir,Out},report,bin_opt_info,
-					{inline,1000},clint]),
+                                  {inline,1000},clint,ssalint]),
 
     %% Run inlined code.
     ct:timetrap({minutes,10}),
-    OldInlinedResult = rpc:call(Node, ?MODULE, load_and_call, [Out,Mod]),
+    OldInlinedResult = load_and_call(Out, Mod),
 
     %% Compare results.
     compare(NormalResult, OldInlinedResult),
@@ -117,11 +113,11 @@ try_inline(Mod, Config) ->
     %% Inlining.
     io:format("Compiling with new inliner: ~s\n", [Src]),
     {ok,Mod} = compile:file(Src, [{outdir,Out},report,
-					bin_opt_info,inline,clint]),
+					bin_opt_info,inline,clint,ssalint]),
 
     %% Run inlined code.
     ct:timetrap({minutes,10}),
-    InlinedResult = rpc:call(Node, ?MODULE, load_and_call, [Out,Mod]),
+    InlinedResult = load_and_call(Out, Mod),
 
     %% Compare results.
     compare(NormalResult, InlinedResult),
@@ -130,6 +126,11 @@ try_inline(Mod, Config) ->
     %% Delete Beam file.
     ok = file:delete(filename:join(Out, atom_to_list(Mod)++code:objfile_extension())),
 
+    %% Delete loaded module.
+    _ = code:purge(Mod),
+    _ = code:delete(Mod),
+    _ = code:purge(Mod),
+
     ok.
 
 compare(Same, Same) -> ok;
@@ -143,12 +144,6 @@ compare([H1|_], [H2|_]) ->
     ct:fail(different);
 compare([], []) -> ok.
 
-start_node(Name, Args) ->
-    case test_server:start_node(Name, slave, [{args,Args}]) of
-	{ok,Node} -> {ok, Node};
-	Error  -> ct:fail(Error)
-    end.
-
 load_and_call(Out, Module) ->
     io:format("Loading...\n",[]),
     code:purge(Module),
@@ -349,9 +344,8 @@ otp_7223_2({a}) ->
     1.
 
 coverage(Config) when is_list(Config) ->
-    Mod = bsdecode,
+    Mod = attribute,
     Src = filename:join(proplists:get_value(data_dir, Config), Mod),
-    {ok,Mod,_} = compile:file(Src, [binary,report,{inline,0},clint]),
-    {ok,Mod,_} = compile:file(Src, [binary,report,{inline,20},
-				    verbose,clint]),
+    {ok,Mod,_} = compile:file(Src, [binary,report,{inline,0},
+                                    clint,ssalint]),
     ok.
diff --git a/lib/compiler/test/inline_SUITE_data/barnes2.erl b/lib/compiler/test/inline_SUITE_data/barnes2.erl
index a986331060..49e9bdfb6b 100644
--- a/lib/compiler/test/inline_SUITE_data/barnes2.erl
+++ b/lib/compiler/test/inline_SUITE_data/barnes2.erl
@@ -6,7 +6,7 @@
 ?MODULE() ->
     Stars = create_scenario(1000, 1.0),
     R = hd(loop(10,1000.0,Stars,0)),
-    Str = lists:flatten(io:lib_format("~s", [R])),
+    Str = lists:flatten(io_lib:format("~p", [R])),
     {R,Str =:= {1.00000,-1.92269e+4,-1.92269e+4,2.86459e-2,2.86459e-2}}.
 
 create_scenario(N, M) ->
diff --git a/lib/compiler/test/map_SUITE.erl b/lib/compiler/test/map_SUITE.erl
index 3e0ab78390..440b632381 100644
--- a/lib/compiler/test/map_SUITE.erl
+++ b/lib/compiler/test/map_SUITE.erl
@@ -70,7 +70,10 @@
 	t_bad_update/1,
 
         %% new in OTP 21
-        t_reused_key_variable/1
+        t_reused_key_variable/1,
+
+        %% new in OTP 22
+        t_mixed_clause/1,cover_beam_trim/1
     ]).
 
 suite() -> [].
@@ -124,7 +127,10 @@ all() ->
         t_bad_update,
 
         %% new in OTP 21
-        t_reused_key_variable
+        t_reused_key_variable,
+
+        %% new in OTP 22
+        t_mixed_clause,cover_beam_trim
     ].
 
 groups() -> [].
@@ -1373,22 +1379,22 @@ map_usage(Def, Used) ->
 
 
 t_guard_sequence(Config) when is_list(Config) ->
-	{1, "a"} = map_guard_sequence_1(#{seq=>1,val=>id("a")}),
-	{2, "b"} = map_guard_sequence_1(#{seq=>2,val=>id("b")}),
-	{3, "c"} = map_guard_sequence_1(#{seq=>3,val=>id("c")}),
-	{4, "d"} = map_guard_sequence_1(#{seq=>4,val=>id("d")}),
-	{5, "e"} = map_guard_sequence_1(#{seq=>5,val=>id("e")}),
-
-	{1,M1}       = map_guard_sequence_2(M1 = id(#{a=>3})),
-	{2,M2}       = map_guard_sequence_2(M2 = id(#{a=>4, b=>4})),
-	{3,gg,M3}    = map_guard_sequence_2(M3 = id(#{a=>gg, b=>4})),
-	{4,sc,sc,M4} = map_guard_sequence_2(M4 = id(#{a=>sc, b=>3, c=>sc2})),
-	{5,kk,kk,M5} = map_guard_sequence_2(M5 = id(#{a=>kk, b=>other, c=>sc2})),
-	
-	%% error case
-	{'EXIT',{function_clause,_}} = (catch map_guard_sequence_1(#{seq=>6,val=>id("e")})),
-	{'EXIT',{function_clause,_}} = (catch map_guard_sequence_2(#{b=>5})),
-	ok.
+    {1, "a"} = map_guard_sequence_1(#{seq=>1,val=>id("a")}),
+    {2, "b"} = map_guard_sequence_1(#{seq=>2,val=>id("b")}),
+    {3, "c"} = map_guard_sequence_1(#{seq=>3,val=>id("c")}),
+    {4, "d"} = map_guard_sequence_1(#{seq=>4,val=>id("d")}),
+    {5, "e"} = map_guard_sequence_1(#{seq=>5,val=>id("e")}),
+
+    {1,M1}       = map_guard_sequence_2(M1 = id(#{a=>3})),
+    {2,M2}       = map_guard_sequence_2(M2 = id(#{a=>4, b=>4})),
+    {3,gg,M3}    = map_guard_sequence_2(M3 = id(#{a=>gg, b=>4})),
+    {4,sc,sc,M4} = map_guard_sequence_2(M4 = id(#{a=>sc, b=>3, c=>sc2})),
+    {5,kk,kk,M5} = map_guard_sequence_2(M5 = id(#{a=>kk, b=>other, c=>sc2})),
+
+    %% error case
+    {'EXIT',{function_clause,_}} = (catch map_guard_sequence_1(#{seq=>6,val=>id("e")})),
+    {'EXIT',{function_clause,_}} = (catch map_guard_sequence_2(#{b=>5})),
+    ok.
 
 t_guard_sequence_large(Config) when is_list(Config) ->
     M0 = id(#{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00",03]}=>"10",
@@ -1443,21 +1449,21 @@ t_guard_sequence_large(Config) when is_list(Config) ->
                   18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
                   19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19" } => "large map key 2" }),
 
-	{1, "a"} = map_guard_sequence_1(M0#{seq=>1,val=>id("a")}),
-	{2, "b"} = map_guard_sequence_1(M0#{seq=>2,val=>id("b")}),
-	{3, "c"} = map_guard_sequence_1(M0#{seq=>3,val=>id("c")}),
-	{4, "d"} = map_guard_sequence_1(M0#{seq=>4,val=>id("d")}),
-	{5, "e"} = map_guard_sequence_1(M0#{seq=>5,val=>id("e")}),
+    {1, "a"} = map_guard_sequence_1(M0#{seq=>1,val=>id("a")}),
+    {2, "b"} = map_guard_sequence_1(M0#{seq=>2,val=>id("b")}),
+    {3, "c"} = map_guard_sequence_1(M0#{seq=>3,val=>id("c")}),
+    {4, "d"} = map_guard_sequence_1(M0#{seq=>4,val=>id("d")}),
+    {5, "e"} = map_guard_sequence_1(M0#{seq=>5,val=>id("e")}),
 
-	{1,M1}       = map_guard_sequence_2(M1 = id(M0#{a=>3})),
-	{2,M2}       = map_guard_sequence_2(M2 = id(M0#{a=>4, b=>4})),
-	{3,gg,M3}    = map_guard_sequence_2(M3 = id(M0#{a=>gg, b=>4})),
-	{4,sc,sc,M4} = map_guard_sequence_2(M4 = id(M0#{a=>sc, b=>3, c=>sc2})),
-	{5,kk,kk,M5} = map_guard_sequence_2(M5 = id(M0#{a=>kk, b=>other, c=>sc2})),
+    {1,M1}       = map_guard_sequence_2(M1 = id(M0#{a=>3})),
+    {2,M2}       = map_guard_sequence_2(M2 = id(M0#{a=>4, b=>4})),
+    {3,gg,M3}    = map_guard_sequence_2(M3 = id(M0#{a=>gg, b=>4})),
+    {4,sc,sc,M4} = map_guard_sequence_2(M4 = id(M0#{a=>sc, b=>3, c=>sc2})),
+    {5,kk,kk,M5} = map_guard_sequence_2(M5 = id(M0#{a=>kk, b=>other, c=>sc2})),
 
-	{'EXIT',{function_clause,_}} = (catch map_guard_sequence_1(M0#{seq=>6,val=>id("e")})),
-	{'EXIT',{function_clause,_}} = (catch map_guard_sequence_2(M0#{b=>5})),
-        ok.
+    {'EXIT',{function_clause,_}} = (catch map_guard_sequence_1(M0#{seq=>6,val=>id("e")})),
+    {'EXIT',{function_clause,_}} = (catch map_guard_sequence_2(M0#{b=>5})),
+    ok.
 
 map_guard_sequence_1(#{seq:=1=Seq, val:=Val}) -> {Seq,Val};
 map_guard_sequence_1(#{seq:=2=Seq, val:=Val}) -> {Seq,Val};
@@ -2079,7 +2085,7 @@ t_register_corruption(Config) when is_list(Config) ->
     {3,wanted,<<"value">>} = register_corruption_foo(wanted,M),
     ok.
 
-register_corruption_foo(A,#{a := V1, b := V2}) ->
+register_corruption_foo(_,#{a := V1, b := V2}) ->
     register_corruption_dummy_call(1,V1,V2);
 register_corruption_foo(A,#{b := V}) ->
     register_corruption_dummy_call(2,A,V);
@@ -2161,6 +2167,31 @@ t_reused_key_variable(Config) when is_list(Config) ->
             ok
     end.
 
+t_mixed_clause(_Config) ->
+    put(fool_inliner, x),
+    K = get(fool_inliner),
+    {42,100} = case #{K=>42,y=>100} of
+                   #{x:=X,y:=Y} ->
+                       {X,Y}
+               end,
+    nomatch = case #{K=>42,y=>100} of
+                  #{x:=X,y:=0} ->
+                      {X,Y};
+                  #{} ->
+                      nomatch
+              end,
+    ok.
+
+cover_beam_trim(_Config) ->
+    val = do_cover_beam_trim(id, max, max, id, #{id=>val}),
+    ok.
+
+do_cover_beam_trim(Id, OldMax, Max, Id, M) ->
+    OldMax = id(Max),
+    #{Id:=Val} = id(M),
+    Val.
+
+
 %% aux
 
 rand_terms(0) -> [];
diff --git a/lib/compiler/test/match_SUITE.erl b/lib/compiler/test/match_SUITE.erl
index e3f842b668..bc74ec4984 100644
--- a/lib/compiler/test/match_SUITE.erl
+++ b/lib/compiler/test/match_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. 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,7 +25,8 @@
 	 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,
-         unary_op/1]).
+         unary_op/1,eq_types/1,match_after_return/1,match_right_tuple/1,
+         tuple_size_in_try/1]).
 	 
 -include_lib("common_test/include/ct.hrl").
 
@@ -40,7 +41,9 @@ groups() ->
        match_in_call,untuplify,
        shortcut_boolean,letify_guard,selectify,deselectify,
        underscore,match_map,map_vars_used,coverage,
-       grab_bag,literal_binary,unary_op]}].
+       grab_bag,literal_binary,unary_op,eq_types,
+       match_after_return,match_right_tuple,
+       tuple_size_in_try]}].
 
 
 init_per_suite(Config) ->
@@ -254,6 +257,8 @@ non_matching_aliases(_Config) ->
     none = mixed_aliases([d]),
     none = mixed_aliases({a,42}),
     none = mixed_aliases(42),
+    none = mixed_aliases(<<6789:16>>),
+    none = mixed_aliases(#{key=>value}),
 
     {'EXIT',{{badmatch,42},_}} = (catch nomatch_alias(42)),
     {'EXIT',{{badmatch,job},_}} = (catch entirely()),
@@ -279,6 +284,16 @@ mixed_aliases(<<X:8>> = x) -> {a,X};
 mixed_aliases([b] = <<X:8>>) -> {b,X};
 mixed_aliases(<<X:8>> = {a,X}) -> {c,X};
 mixed_aliases([X] = <<X:8>>) -> {d,X};
+mixed_aliases(<<X:16>> = X) -> {e,X};
+mixed_aliases(X = <<X:16>>) -> {f,X};
+mixed_aliases(<<X:16,_/binary>> = X) -> {g,X};
+mixed_aliases(X = <<X:16,_/binary>>) -> {h,X};
+mixed_aliases(X = #{key:=X}) -> {i,X};
+mixed_aliases(#{key:=X} = X) -> {j,X};
+mixed_aliases([X] = #{key:=X}) -> {k,X};
+mixed_aliases(#{key:=X} = [X]) -> {l,X};
+mixed_aliases({a,X} = #{key:=X}) -> {m,X};
+mixed_aliases(#{key:=X} = {a,X}) -> {n,X};
 mixed_aliases(_) -> none.
 
 nomatch_alias(I) ->
@@ -378,6 +393,13 @@ untuplify(Config) when is_list(Config) ->
     %% We do this to cover sys_core_fold:unalias_pat/1.
     {1,2,3,4,alias,{[1,2],{3,4},alias}} = untuplify_1([1,2], {3,4}, alias),
     error = untuplify_1([1,2], {3,4}, 42),
+
+    %% Test that a previous bug in v3_codegen is gone. (The sinking of
+    %% stack frames into only the case arms that needed them was not always
+    %% safe.)
+    [33, -1, -33, 1] = untuplify_2(32, 65),
+    {33, 1, -33, -1} = untuplify_2(65, 32),
+
     ok.
 
 untuplify_1(A, B, C) ->
@@ -390,6 +412,21 @@ untuplify_1(A, B, C) ->
 	    error
     end.
 
+untuplify_2(V1, V2) ->
+    {D1,D2,D3,D4} =
+        if V1 > V2 ->
+                %% The 1 value was overwritten by the value of V2-V1.
+                {V1-V2,  1,  V2-V1, -1};
+           true ->
+                {V2-V1, -1, V1-V2,  1}
+        end,
+    if
+        D2 > D4 ->
+            {D1, D2, D3, D4};
+        true ->
+            [D1, D2, D3, D4]
+    end.
+
 %% Coverage of beam_dead:shortcut_boolean_label/4.
 shortcut_boolean(Config) when is_list(Config) ->
     false = shortcut_boolean_1([0]),
@@ -434,6 +471,7 @@ letify_guard(A, B) ->
 selectify(Config) when is_list(Config) ->
     integer = sel_different_types({r,42}),
     atom = sel_different_types({r,forty_two}),
+    float = sel_different_types({r,100.0}),
     none = sel_different_types({r,18}),
     {'EXIT',_} = (catch sel_different_types([a,b,c])),
 
@@ -444,12 +482,15 @@ selectify(Config) when is_list(Config) ->
     integer42 = sel_same_value2(42),
     integer43 = sel_same_value2(43),
     error = sel_same_value2(44),
+
     ok.
 
 sel_different_types({r,_}=T) when element(2, T) =:= forty_two ->
     atom;
 sel_different_types({r,_}=T) when element(2, T) =:= 42 ->
     integer;
+sel_different_types({r,_}=T) when element(2, T) =:= 100.0 ->
+    float;
 sel_different_types({r,_}) ->
     none.
 
@@ -467,9 +508,8 @@ sel_same_value2(V) when V =:= 42; V =:= 43 ->
 sel_same_value2(_) ->
     error.
 
-%% Test deconstruction of select_val instructions in beam_peep into
-%% regular tests with just one possible value left. Hitting proper cases
-%% in beam_peep relies on unification of labels by beam_jump.
+%% Test deconstruction of select_val instructions to regular tests
+%% with zero or one values left.
 
 deselectify(Config) when is_list(Config) ->
     one_or_other = desel_tuple_arity({1}),
@@ -490,7 +530,31 @@ deselectify(Config) when is_list(Config) ->
 
     one_or_other = dsel_atom_typecheck(one),
     two = dsel_atom_typecheck(two),
-    one_or_other = dsel_atom_typecheck(three).
+    one_or_other = dsel_atom_typecheck(three),
+
+    %% Cover deconstruction of select_val instructions in
+    %% beam_peep.
+
+    stop = dsel_peek_0(stop),
+    ignore = dsel_peek_0(ignore),
+    Config = dsel_peek_0(Config),
+
+    stop = dsel_peek_1(stop, any),
+    Config = dsel_peek_1(ignore, Config),
+    other = dsel_peek_1(other, ignored),
+
+    0 = dsel_peek_2(0, any),
+    Config = dsel_peek_2(1, Config),
+    2 = dsel_peek_2(2, ignored),
+
+    true = dsel_peek_3(true),
+    false = dsel_peek_3(false),
+    {error,Config} = dsel_peek_3(Config),
+
+    ok.
+
+%% The following will be optimized by the sharing optimizations
+%% in beam_ssa_opt.
 
 desel_tuple_arity(Tuple) when is_tuple(Tuple) ->
     case Tuple of
@@ -527,6 +591,39 @@ dsel_atom_typecheck(Val) when is_atom(Val) ->
         _ -> one_or_other
     end.
 
+%% The following functions are carefully crafted so that the sharing
+%% optimizations in beam_ssa_opt can't be applied. After applying the
+%% beam_jump:eliminate_moves/1 optimization and beam_clean:clean_labels/1
+%% has unified labels, beam_peep is able to optimize these functions.
+
+dsel_peek_0(A0) ->
+    case id(A0) of
+        stop ->   stop;
+        ignore -> ignore;
+        A ->      A
+    end.
+
+dsel_peek_1(A0, B) ->
+    case id(A0) of
+        stop ->   stop;
+        ignore -> B;
+        A ->      A
+    end.
+
+dsel_peek_2(A0, B) ->
+    case id(A0) of
+        0 -> 0;
+        1 -> B;
+        A -> A
+    end.
+
+dsel_peek_3(A0) ->
+    case id(A0) of
+        true ->  true;
+        false -> false;
+        Other -> {error,Other}
+    end.
+
 underscore(Config) when is_list(Config) ->
     case Config of
 	[] ->
@@ -569,13 +666,26 @@ do_map_vars_used(X, Y, Map) ->
 	    Val
     end.
 
+-record(coverage_id, {bool=false,id}).
 coverage(Config) when is_list(Config) ->
     %% Cover beam_dead.
     ok = coverage_1(x, a),
     ok = coverage_1(x, b),
 
     %% Cover sys_pre_expand.
-    ok = coverage_3("abc").
+    ok = coverage_3("abc"),
+
+    %% Cover beam_ssa_dead.
+    {expr,key} = coverage_4([literal,get], [[expr,key]]),
+    {expr,key} = coverage_4([expr,key], []),
+
+    a = coverage_5([8,8,8], #coverage_id{bool=true}),
+    b = coverage_5([], #coverage_id{bool=true}),
+
+    %% Cover beam_ssa_opt.
+    ok = coverage_6(),
+
+    ok.
 
 coverage_1(B, Tag) ->
     case Tag of
@@ -588,6 +698,37 @@ coverage_2(2, b, x) -> ok.
 
 coverage_3([$a]++[]++"bc") -> ok.
 
+%% Cover beam_ssa_dead:eval_type_test_1(is_nonempty_list, Arg).
+coverage_4([literal,get], [Expr]) ->
+    coverage_4(Expr, []);
+coverage_4([Expr,Key], []) ->
+    {Expr,Key}.
+
+%% Cover beam_ssa_dead:eval_type_test_1(is_tagged_tuple, Arg).
+coverage_5(Config, TermId)
+  when TermId =:= #coverage_id{bool=true},
+       Config =:= [8,8,8] ->
+    a;
+coverage_5(_Config, #coverage_id{bool=true}) ->
+    b.
+
+coverage_6() ->
+    X = 17,
+    case
+        case id(1) > 0 of
+            true ->
+                17;
+            false ->
+                42
+        end
+    of
+        X ->
+            ok;
+        V ->
+            %% Cover beam_ssa_opt:make_literal/2.
+            error([error,X,V])
+    end.
+
 grab_bag(_Config) ->
     [_|T] = id([a,b,c]),
     [b,c] = id(T),
@@ -732,5 +873,70 @@ unary_op_1(Vop@1) ->
             end
     end.
 
+eq_types(_Config) ->
+    Ref = make_ref(),
+    Ref = eq_types(Ref, any),
+    ok.
+
+eq_types(A, B) ->
+    %% {put_tuple2,{y,0},{list,[{x,0},{x,1}]}}.
+    Term0 = {A, B},
+    Term = id(Term0),
+
+    %% {test,is_eq_exact,{f,3},[{y,0},{x,0}]}.
+    %% Here beam_validator must infer that {x,0} has the
+    %% same type as {y,0}.
+    Term = Term0,
+
+    %% {get_tuple_element,{x,0},0,{x,0}}.
+    {Ref22,_} = Term,
+
+    Ref22.
+
+match_after_return(Config) when is_list(Config) ->
+    %% The return type of the following call will never match the 'wont_happen'
+    %% clauses below, and the beam_ssa_type was clever enough to see that but
+    %% didn't remove the blocks, so it crashed when trying to extract A.
+    ok = case mar_test_tuple(erlang:unique_integer()) of
+            {gurka, never_matches, A} -> {wont_happen, A};
+            _ -> ok
+         end.
+
+mar_test_tuple(I) -> {gurka, I}.
+
+match_right_tuple(Config) when is_list(Config) ->
+    %% The loader wrongly coalesced certain get_tuple_element sequences, fusing
+    %% the code below into a single i_get_tuple_element2 operating on {x,0}
+    %% even though the first one overwrites it.
+    %%
+    %%    {get_tuple_element,{x,0},0,{x,0}}.
+    %%    {get_tuple_element,{x,0},1,{x,1}}.
+
+    Inner = {id(wrong_element), id(ok)},
+    Outer = {Inner, id(wrong_tuple)},
+    ok = match_right_tuple_1(Outer).
+
+match_right_tuple_1(T) ->
+    {A, _} = T,
+    {_, B} = A,
+    %% The call ensures that A is in {x,0} and B is in {x,1}
+    id(force_succ_regs(A, B)).
+
+force_succ_regs(_A, B) -> B.
+
+tuple_size_in_try(Config) when is_list(Config) ->
+    %% The tuple_size optimization was applied outside of guards, causing
+    %% either the emulator or compiler to crash.
+    ok = tsit(gurka),
+    ok = tsit(gaffel).
+
+tsit(A) ->
+    try
+        id(ignored),
+        1 = tuple_size(A),
+        error
+    catch
+        _:_ -> ok
+    end.
 
 id(I) -> I.
diff --git a/lib/compiler/test/misc_SUITE.erl b/lib/compiler/test/misc_SUITE.erl
index a1d931b994..a0b415ceaa 100644
--- a/lib/compiler/test/misc_SUITE.erl
+++ b/lib/compiler/test/misc_SUITE.erl
@@ -161,17 +161,16 @@ md5_1(Beam) ->
 %% Cover some code that handles internal errors.
 
 silly_coverage(Config) when is_list(Config) ->
-    %% sys_core_fold, sys_core_alias, sys_core_bsm, sys_core_setel, v3_kernel
+    %% sys_core_fold, sys_core_alias, sys_core_bsm, v3_kernel
     BadCoreErlang = {c_module,[],
 		     name,[],[],
 		     [{{c_var,[],{foo,2}},seriously_bad_body}]},
     expect_error(fun() -> sys_core_fold:module(BadCoreErlang, []) end),
     expect_error(fun() -> sys_core_alias:module(BadCoreErlang, []) end),
     expect_error(fun() -> sys_core_bsm:module(BadCoreErlang, []) end),
-    expect_error(fun() -> sys_core_dsetel:module(BadCoreErlang, []) end),
     expect_error(fun() -> v3_kernel:module(BadCoreErlang, []) end),
 
-    %% v3_codegen
+    %% beam_kernel_to_ssa
     BadKernel = {k_mdef,[],?MODULE,
 		 [{foo,0}],
 		 [],
@@ -179,7 +178,38 @@ silly_coverage(Config) when is_list(Config) ->
 		   {k,[],[],[]},
 		   f,0,[],
 		   seriously_bad_body}]},
-    expect_error(fun() -> v3_codegen:module(BadKernel, []) end),
+    expect_error(fun() -> beam_kernel_to_ssa:module(BadKernel, []) end),
+
+    %% beam_ssa_lint
+    %% beam_ssa_recv
+    %% beam_ssa_share
+    %% beam_ssa_pre_codegen
+    %% beam_ssa_codegen
+    BadSSA = {b_module,#{},a,b,c,
+              [{b_function,#{func_info=>{mod,foo,0}},args,bad_blocks,0}]},
+    expect_error(fun() -> beam_ssa_lint:module(BadSSA, []) end),
+    expect_error(fun() -> beam_ssa_recv:module(BadSSA, []) end),
+    expect_error(fun() -> beam_ssa_share:module(BadSSA, []) end),
+    expect_error(fun() -> beam_ssa_pre_codegen:module(BadSSA, []) end),
+    expect_error(fun() -> beam_ssa_codegen:module(BadSSA, []) end),
+
+    %% beam_ssa_opt
+    BadSSABlocks = #{0 => {b_blk,#{},[bad_code],{b_ret,#{},arg}}},
+    BadSSAOpt = {b_module,#{},a,[],c,
+                 [{b_function,#{func_info=>{mod,foo,0}},[],
+                   BadSSABlocks,0}]},
+    expect_error(fun() -> beam_ssa_opt:module(BadSSAOpt, []) end),
+
+    %% beam_ssa_lint, beam_ssa_pp
+    {error,[{_,Errors}]} = beam_ssa_lint:module(bad_ssa_lint_input(), []),
+    _ = [io:put_chars(Mod:format_error(Reason)) ||
+            {Mod,Reason} <- Errors],
+
+    %% Cover printing of annotations in beam_ssa_pp
+    PPAnno = #{func_info=>{mod,foo,0},other_anno=>value,map_anno=>#{k=>v}},
+    PPBlocks = #{0=>{b_blk,#{},[],{b_ret,#{},{b_literal,42}}}},
+    PP = {b_function,PPAnno,[],PPBlocks,0},
+    io:put_chars(beam_ssa_pp:format_function(PP)),
 
     %% beam_a
     BeamAInput = {?MODULE,[{foo,0}],[],
@@ -189,14 +219,6 @@ silly_coverage(Config) when is_list(Config) ->
 		     {label,2}|non_proper_list]}],99},
     expect_error(fun() -> beam_a:module(BeamAInput, []) end),
 
-    %% beam_reorder
-    BlockInput = {?MODULE,[{foo,0}],[],
-		  [{function,foo,0,2,
-		    [{label,1},
-		     {func_info,{atom,?MODULE},{atom,foo},0},
-		     {label,2}|non_proper_list]}],99},
-    expect_error(fun() -> beam_reorder:module(BlockInput, []) end),
-
     %% beam_block
     BlockInput = {?MODULE,[{foo,0}],[],
 		  [{function,foo,0,2,
@@ -205,19 +227,6 @@ silly_coverage(Config) when is_list(Config) ->
 		     {label,2}|non_proper_list]}],99},
     expect_error(fun() -> beam_block:module(BlockInput, []) end),
 
-    %% beam_bs
-    BsInput = BlockInput,
-    expect_error(fun() -> beam_bs:module(BsInput, []) end),
-
-    %% beam_type
-    TypeInput = {?MODULE,[{foo,0}],[],
-		   [{function,foo,0,2,
-		     [{label,1},
-		      {line,loc},
-		      {func_info,{atom,?MODULE},{atom,foo},0},
-		      {label,2}|non_proper_list]}],99},
-    expect_error(fun() -> beam_type:module(TypeInput, []) end),
-
     %% beam_except
     ExceptInput = {?MODULE,[{foo,0}],[],
 		   [{function,foo,0,2,
@@ -227,15 +236,9 @@ silly_coverage(Config) when is_list(Config) ->
 		      {label,2}|non_proper_list]}],99},
     expect_error(fun() -> beam_except:module(ExceptInput, []) end),
 
-    %% beam_dead. This is tricky. Our function must look OK to
-    %% beam_utils:clean_labels/1, but must crash beam_dead.
-    DeadInput = {?MODULE,[{foo,0}],[],
-		  [{function,foo,0,2,
-		    [{label,1},
-		     {func_info,{atom,?MODULE},{atom,foo},0},
-		     {label,2},
-		     {test,is_eq_exact,{f,1},[bad,operands]}]}],99},
-    expect_error(fun() -> beam_dead:module(DeadInput, []) end),
+    %% beam_jump
+    JumpInput = BlockInput,
+    expect_error(fun() -> beam_jump:module(JumpInput, []) end),
 
     %% beam_clean
     CleanInput = {?MODULE,[{foo,0}],[],
@@ -246,6 +249,10 @@ silly_coverage(Config) when is_list(Config) ->
 		     {jump,{f,42}}]}],99},
     expect_error(fun() -> beam_clean:module(CleanInput, []) end),
 
+    %% beam_jump
+    TrimInput = BlockInput,
+    expect_error(fun() -> beam_trim:module(TrimInput, []) end),
+
     %% beam_peep. This is tricky. Use a select instruction with
     %% an odd number of elements in the list to crash
     %% prune_redundant_values/2 but not beam_clean:clean_labels/1.
@@ -253,48 +260,10 @@ silly_coverage(Config) when is_list(Config) ->
 		 [{function,foo,0,2,
 		   [{label,1},
 		    {func_info,{atom,?MODULE},{atom,foo},0},
-		    {label,2},{select,op,r,{f,2},[{f,2}]}]}],
+		    {label,2},{select,select_val,r,{f,2},[{f,2}]}]}],
 		 2},
     expect_error(fun() -> beam_peep:module(PeepInput, []) end),
 
-    %% beam_bsm. This is tricky. Our function must be sane enough to not crash
-    %% btb_index/1, but must crash the main optimization pass.
-    BsmInput = {?MODULE,[{foo,0}],[],
-		[{function,foo,0,2,
-		  [{label,1},
-		   {func_info,{atom,?MODULE},{atom,foo},0},
-		   {label,2},
-		   {test,bs_get_binary2,{f,99},0,[{x,0},{atom,all},1,[]],{x,0}},
-		   {block,[a|b]}]}],0},
-    expect_error(fun() -> beam_bsm:module(BsmInput, []) end),
-
-    %% beam_receive.
-    ReceiveInput = {?MODULE,[{foo,0}],[],
-		    [{function,foo,0,2,
-		      [{label,1},
-		       {func_info,{atom,?MODULE},{atom,foo},0},
-		       {label,2},
-		       {call_ext,0,{extfunc,erlang,make_ref,0}},
-		       {block,[a|b]}]}],0},
-    expect_error(fun() -> beam_receive:module(ReceiveInput, []) end),
-
-    %% beam_record.
-    RecordInput = {?MODULE,[{foo,0}],[],
-		    [{function,foo,1,2,
-		      [{label,1},
-		       {func_info,{atom,?MODULE},{atom,foo},1},
-                       {label,2},
-                       {test,is_tuple,{f,1},[{x,0}]},
-                       {test,test_arity,{f,1},[{x,0},3]},
-                       {block,[{set,[{x,1}],[{x,0}],{get_tuple_element,0}}]},
-                       {test,is_eq_exact,{f,1},[{x,1},{atom,bar}]},
-                       {block,[{set,[{x,2}],[{x,0}],{get_tuple_element,1}}|a]},
-                       {test,is_eq_exact,{f,1},[{x,2},{integer,1}]},
-                       {block,[{set,[{x,0}],[{atom,ok}],move}]},
-                       return]}],0},
-
-    expect_error(fun() -> beam_record:module(RecordInput, []) end),
-
     BeamZInput = {?MODULE,[{foo,0}],[],
 		  [{function,foo,0,2,
 		    [{label,1},
@@ -312,6 +281,31 @@ silly_coverage(Config) when is_list(Config) ->
 
     ok.
 
+bad_ssa_lint_input() ->
+    {b_module,#{},t,
+     [{foobar,1},{module_info,0},{module_info,1}],
+     [],
+     [{b_function,
+       #{func_info => {t,foobar,1},location => {"t.erl",4}},
+       [{b_var,0}],
+       #{0 => {b_blk,#{},[],{b_ret,#{},{b_var,'@undefined_var'}}}},
+       3},
+      {b_function,
+       #{func_info => {t,module_info,0}},
+       [],
+       #{0 =>
+             {b_blk,#{},
+              [{b_set,#{},
+                {b_var,{'@ssa_ret',3}},
+                call,
+                [{b_remote,
+                  {b_literal,erlang},
+                  {b_literal,get_module_info},
+                  1},
+                 {b_var,'@unknown_variable'}]}],
+              {b_ret,#{},{b_var,{'@ssa_ret',3}}}}},
+       4}]}.
+
 expect_error(Fun) ->
     try	Fun() of
 	Any ->
diff --git a/lib/compiler/test/receive_SUITE.erl b/lib/compiler/test/receive_SUITE.erl
index 4219768d6f..8cd864c59e 100644
--- a/lib/compiler/test/receive_SUITE.erl
+++ b/lib/compiler/test/receive_SUITE.erl
@@ -25,7 +25,8 @@
 	 init_per_group/2,end_per_group/2,
 	 init_per_testcase/2,end_per_testcase/2,
 	 export/1,recv/1,coverage/1,otp_7980/1,ref_opt/1,
-	 wait/1,recv_in_try/1,double_recv/1]).
+	 wait/1,recv_in_try/1,double_recv/1,receive_var_zero/1,
+         match_built_terms/1,elusive_common_exit/1]).
 
 -include_lib("common_test/include/ct.hrl").
 
@@ -45,7 +46,8 @@ all() ->
 groups() -> 
     [{p,test_lib:parallel(),
       [recv,coverage,otp_7980,ref_opt,export,wait,
-       recv_in_try,double_recv]}].
+       recv_in_try,double_recv,receive_var_zero,
+       match_built_terms,elusive_common_exit]}].
 
 
 init_per_suite(Config) ->
@@ -378,4 +380,108 @@ do_double_recv(_, Msg) ->
             error
     end.
 
+%% Test 'after Z', when Z =:= 0 been propagated as an immediate by the type
+%% optimization pass.
+receive_var_zero(Config) when is_list(Config) ->
+    self() ! x,
+    self() ! y,
+    Z = zero(),
+    timeout = receive
+                  z -> ok
+              after Z -> timeout
+              end,
+    timeout = receive
+              after Z -> timeout
+              end,
+    self() ! w,
+    receive
+	x -> ok;
+	Other ->
+	    ct:fail({bad_message,Other})
+    end.
+
+zero() -> 0.
+
+%% ERL-862; the validator would explode when a term was constructed in a
+%% receive guard.
+
+-define(MATCH_BUILT_TERM(Ref, Expr),
+        (fun() ->
+                 Ref = make_ref(),
+                 A = id($a),
+                 B = id($b),
+                 Built = id(Expr),
+                 self() ! {Ref, A, B},
+                 receive
+                     {Ref, A, B} when Expr =:= Built ->
+                         ok
+                 after 5000 ->
+                     ct:fail("Failed to match message with term built in "
+                             "receive guard.")
+                 end
+         end)()).
+
+match_built_terms(Config) when is_list(Config) ->
+    ?MATCH_BUILT_TERM(Ref, [A, B]),
+    ?MATCH_BUILT_TERM(Ref, {A, B}),
+    ?MATCH_BUILT_TERM(Ref, <<A, B>>),
+    ?MATCH_BUILT_TERM(Ref, #{ 1 => A, 2 => B}).
+
+elusive_common_exit(_Config) ->
+    self() ! {1, a},
+    self() ! {2, b},
+    {[z], [{2,b},{1,a}]} = elusive_loop([x,y,z], 2, []),
+
+    CodeServer = whereis(code_server),
+    Self = self(),
+    Self ! {Self, abc},
+    Self ! {CodeServer, []},
+    Self ! {Self, other},
+    try elusive2([]) of
+        Unexpected ->
+            ct:fail("Expected an exception; got ~p\n", [Unexpected])
+    catch
+        throw:[other, CodeServer, Self] ->
+            ok
+    end,
+
+    ok.
+
+elusive_loop(List, 0, Results) ->
+    {List, Results};
+elusive_loop(List, ToReceive, Results) ->
+    {Result, RemList} =
+        receive
+            {_Pos, _R} = Res when List =/= [] ->
+                [_H|T] = List,
+                {Res, T};
+            {_Pos, _R} = Res when List =:= [] ->
+                {Res, []}
+        end,
+    %% beam_ssa_pre_codegen:fix_receives() would fail to find
+    %% the common exit block for this receive. That would mean
+    %% that it would not insert all necessary copy instructions.
+    elusive_loop(RemList, ToReceive-1, [Result | Results]).
+
+
+elusive2(Acc) ->
+    receive
+        {Pid, abc} ->
+            ok;
+        {Pid, []} ->
+            ok;
+        {Pid, Res} ->
+            %% beam_ssa_pre_codegen:find_loop_exit/2 attempts to find
+            %% the first block of the common code after the receive
+            %% statement. It used to only look at the two last clauses
+            %% of the receive. In this function, the last two clauses
+            %% don't have any common block, so it would be assumed
+            %% that there was no common block for any of the
+            %% clauses. That would mean that copy instructions would
+            %% not be inserted as needed.
+            throw([Res | Acc])
+    end,
+    %% Common code.
+    elusive2([Pid | Acc]).
+
 id(I) -> I.
diff --git a/lib/compiler/test/receive_SUITE_data/ref_opt/no_5.erl b/lib/compiler/test/receive_SUITE_data/ref_opt/no_5.erl
new file mode 100644
index 0000000000..4fbde3a83d
--- /dev/null
+++ b/lib/compiler/test/receive_SUITE_data/ref_opt/no_5.erl
@@ -0,0 +1,38 @@
+-module(no_5).
+-compile([export_all,nowarn_export_all]).
+
+?MODULE() ->
+    ok.
+
+%% Nested receives were not handled properly.
+
+confusing_recv_mark(Pid) ->
+    Ref = make_ref(),
+    %% There would be a recv_mark here.
+    MRef = erlang:monitor(process, Pid),
+    receive
+        Ref ->
+            %% And a recv_set here.
+            receive
+                MRef -> gurka
+            end;
+        MRef ->
+            gaffel
+    end.
+
+%% The optimization could potentially be improved to
+%% handle matching of multiple refs, like this:
+
+proper_recv_mark(Pid) ->
+    %% Place the recv_mark before the creation of both refs.
+    Ref = make_ref(),
+    MRef = erlang:monitor(process, Pid),
+    %% Place the recv_set here.
+    receive
+        Ref ->
+            receive
+                MRef -> gurka
+            end;
+        MRef ->
+            gaffel
+    end.
diff --git a/lib/compiler/test/receive_SUITE_data/ref_opt/yes_14.S b/lib/compiler/test/receive_SUITE_data/ref_opt/yes_14.S
deleted file mode 100644
index fd14228135..0000000000
--- a/lib/compiler/test/receive_SUITE_data/ref_opt/yes_14.S
+++ /dev/null
@@ -1,71 +0,0 @@
-{module, yes_14}.  %% version = 0
-
-{exports, [{f,2},{module_info,0},{module_info,1},{yes_14,0}]}.
-
-{attributes, []}.
-
-{labels, 12}.
-
-
-{function, yes_14, 0, 2}.
-  {label,1}.
-    {func_info,{atom,yes_14},{atom,yes_14},0}.
-  {label,2}.
-    {move,{atom,ok},{x,0}}.
-    return.
-
-
-{function, f, 2, 4}.
-  {label,3}.
-    {func_info,{atom,yes_14},{atom,f},2}.
-  {label,4}.
-    {allocate_heap,2,3,2}.
-    {move,{x,0},{y,1}}.
-    {put_tuple,2,{y,0}}.
-    {put,{atom,data}}.
-    {put,{x,1}}.
-    {call_ext,0,{extfunc,erlang,make_ref,0}}. % Ref in [x0]
-    {test_heap,4,1}.
-    {put_tuple,3,{x,1}}.
-    {put,{atom,request}}.
-    {put,{x,0}}.
-    {put,{y,0}}.
-    {move,{x,0},{y,0}}. % Ref in [x0,y0]
-    {move,{y,1},{x,0}}. % Ref in [y0]
-    {kill,{y,1}}.
-    send.
-    {move,{y,0},{x,0}}. % Ref in [x0,y0]
-    {move,{x,0},{y,1}}. % Ref in [x0,y0,y1]
-  {label,5}.
-    {loop_rec,{f,7},{x,0}}. % Ref in [y0,y1]
-    {test,is_tuple,{f,6},[{x,0}]}.
-    {test,test_arity,{f,6},[{x,0},2]}.
-    {get_tuple_element,{x,0},0,{x,1}}.
-    {get_tuple_element,{x,0},1,{x,2}}.
-    {test,is_eq_exact,{f,6},[{x,1},{atom,reply}]}.
-    {test,is_eq_exact,{f,6},[{x,2},{y,1}]}.
-    remove_message.
-    {move,{atom,ok},{x,0}}.
-    {deallocate,2}.
-    return.
-  {label,6}.
-    {loop_rec_end,{f,5}}.
-  {label,7}.
-    {wait,{f,5}}.
-
-
-{function, module_info, 0, 9}.
-  {label,8}.
-    {func_info,{atom,yes_14},{atom,module_info},0}.
-  {label,9}.
-    {move,{atom,yes_14},{x,0}}.
-    {call_ext_only,1,{extfunc,erlang,get_module_info,1}}.
-
-
-{function, module_info, 1, 11}.
-  {label,10}.
-    {func_info,{atom,yes_14},{atom,module_info},1}.
-  {label,11}.
-    {move,{x,0},{x,1}}.
-    {move,{atom,yes_14},{x,0}}.
-    {call_ext_only,2,{extfunc,erlang,get_module_info,2}}.
diff --git a/lib/compiler/test/receive_SUITE_data/ref_opt/yes_14.erl b/lib/compiler/test/receive_SUITE_data/ref_opt/yes_14.erl
new file mode 100644
index 0000000000..aa47c02af9
--- /dev/null
+++ b/lib/compiler/test/receive_SUITE_data/ref_opt/yes_14.erl
@@ -0,0 +1,27 @@
+-module(yes_14).
+-compile(export_all).
+
+?MODULE() ->
+    ok.
+
+do_call(Process, Request) ->
+    Mref = erlang:monitor(process, Process),
+    Process ! Request,
+    Local = case node(Process) of
+                Node when Node =:= node() -> true;
+                _Node -> false
+            end,
+    id(Local),
+    receive
+	{X,Y,Z} when Mref =/= X, Z =:= 42, Mref =:= Y ->
+	    error;
+	{X,Y,_} when Mref =/= X, Mref =:= Y ->
+	    error;
+	{Mref, Reply} ->
+	    erlang:demonitor(Mref, [flush]),
+	    {ok, Reply};
+	{'DOWN', Mref, _, _, _} ->
+	    error
+    end.
+
+id(I) -> I.
diff --git a/lib/compiler/test/regressions_SUITE.erl b/lib/compiler/test/regressions_SUITE.erl
index 9b0b9b0c38..39febf060f 100644
--- a/lib/compiler/test/regressions_SUITE.erl
+++ b/lib/compiler/test/regressions_SUITE.erl
@@ -23,7 +23,7 @@
 
 -export([all/0,groups/0,init_per_testcase/2,end_per_testcase/2,
          init_per_group/2,end_per_group/2,
-	 init_per_testcase/2,end_per_testcase/2,
+	 init_per_suite/1,end_per_suite/1,
          suite/0]).
 -export([maps/1]).
 
diff --git a/lib/compiler/test/test_lib.erl b/lib/compiler/test/test_lib.erl
index 8954a9f5fb..34410e4b2a 100644
--- a/lib/compiler/test/test_lib.erl
+++ b/lib/compiler/test/test_lib.erl
@@ -22,7 +22,8 @@
 -include_lib("common_test/include/ct.hrl").
 -compile({no_auto_import,[binary_part/2]}).
 -export([id/1,recompile/1,parallel/0,uniq/0,opt_opts/1,get_data_dir/1,
-	 is_cloned_mod/1,smoke_disasm/1,p_run/2]).
+         is_cloned_mod/1,smoke_disasm/1,p_run/2,
+         highest_opcode/1]).
 
 %% Used by test case that override BIFs.
 -export([binary_part/2,binary/1]).
@@ -50,12 +51,8 @@ smoke_disasm(File) when is_list(File) ->
     Res = beam_disasm:file(File),
     {beam_file,_Mod} = {element(1, Res),element(2, Res)}.
 
-%% If we are running cover, we don't want to run test cases that
-%% invokes the compiler in parallel, as doing so would probably
-%% be slower than running them sequentially.
-
 parallel() ->
-    case test_server:is_cover() orelse erlang:system_info(schedulers) =:= 1 of
+    case erlang:system_info(schedulers) =:= 1 of
 	true -> [];
 	false -> [parallel]
     end.
@@ -70,18 +67,24 @@ uniq() ->
 opt_opts(Mod) ->
     Comp = Mod:module_info(compile),
     {options,Opts} = lists:keyfind(options, 1, Comp),
-    lists:filter(fun(no_copt) -> true;
-		    (no_postopt) -> true;
-		    (no_float_opt) -> true;
-		    (no_new_funs) -> true;
-		    (no_new_binaries) -> true;
-		    (no_new_apply) -> true;
-		    (no_gc_bifs) -> true;
-		    (no_stack_trimming) -> true;
-		    (debug_info) -> true;
-		    (inline) -> true;
-		    (_) -> false
-		 end, Opts).
+    lists:filter(fun
+                     (debug_info) -> true;
+                     (inline) -> true;
+                     (no_bsm3) -> true;
+                     (no_bsm_opt) -> true;
+                     (no_copt) -> true;
+                     (no_fun_opt) -> true;
+                     (no_module_opt) -> true;
+                     (no_postopt) -> true;
+                     (no_put_tuple2) -> true;
+                     (no_recv_opt) -> true;
+                     (no_share_opt) -> true;
+                     (no_ssa_float) -> true;
+                     (no_ssa_opt) -> true;
+                     (no_stack_trimming) -> true;
+                     (no_type_opt) -> true;
+                     (_) -> false
+                end, Opts).
 
 %% Some test suites gets cloned (e.g. to "record_SUITE" to
 %% "record_no_opt_SUITE"), but the data directory is not cloned.
@@ -91,37 +94,41 @@ get_data_dir(Config) ->
     Data0 = proplists:get_value(data_dir, Config),
     Opts = [{return,list}],
     Data1 = re:replace(Data0, "_no_opt_SUITE", "_SUITE", Opts),
-    Data = re:replace(Data1, "_post_opt_SUITE", "_SUITE", Opts),
-    re:replace(Data, "_inline_SUITE", "_SUITE", Opts).
+    Data2 = re:replace(Data1, "_post_opt_SUITE", "_SUITE", Opts),
+    Data3 = re:replace(Data2, "_inline_SUITE", "_SUITE", Opts),
+    Data4 = re:replace(Data3, "_r21_SUITE", "_SUITE", Opts),
+    Data5 = re:replace(Data4, "_no_module_opt_SUITE", "_SUITE", Opts),
+    Data = re:replace(Data5, "_no_type_opt_SUITE", "_SUITE", Opts),
+    re:replace(Data, "_no_ssa_opt_SUITE", "_SUITE", Opts).
 
 is_cloned_mod(Mod) ->
     is_cloned_mod_1(atom_to_list(Mod)).
 
 %% Test whether Mod is a cloned module.
 
-is_cloned_mod_1("no_opt_SUITE") -> true;
-is_cloned_mod_1("post_opt_SUITE") -> true;
-is_cloned_mod_1("inline_SUITE") -> true;
+is_cloned_mod_1("_no_opt_SUITE") -> true;
+is_cloned_mod_1("_no_ssa_opt_SUITE") -> true;
+is_cloned_mod_1("_post_opt_SUITE") -> true;
+is_cloned_mod_1("_inline_SUITE") -> true;
+is_cloned_mod_1("_21_SUITE") -> true;
+is_cloned_mod_1("_no_module_opt_SUITE") -> true;
 is_cloned_mod_1([_|T]) -> is_cloned_mod_1(T);
 is_cloned_mod_1([]) -> false.
 
+%% Return the highest opcode use in the BEAM module.
+
+highest_opcode(Beam) ->
+    {ok,{_Mod,[{"Code",Code}]}} = beam_lib:chunks(Beam, ["Code"]),
+    FormatNumber = 0,
+    <<16:32,FormatNumber:32,HighestOpcode:32,_/binary>> = Code,
+    HighestOpcode.
+
 %% p_run(fun(Data) -> ok|error, List) -> ok
 %%  Will fail the test case if there were any errors.
 
 p_run(Test, List) ->
     S = erlang:system_info(schedulers),
-    N = case test_server:is_cover() of
-	    false ->
-		S + 1;
-	    true ->
-		%% Cover is running. Using too many processes
-		%% could slow us down. Measurements on my computer
-		%% showed that using 4 parallel processes was
-		%% slightly faster than using 3. Using more than
-		%% 4 would not buy us much and could actually be
-		%% slower.
-		min(S, 4)
-	end,
+    N = S + 1,
     io:format("p_run: ~p parallel processes\n", [N]),
     p_run_loop(Test, List, N, [], 0, 0).
 
diff --git a/lib/compiler/test/trycatch_SUITE.erl b/lib/compiler/test/trycatch_SUITE.erl
index 8f9cd9ab1e..539f9d69fa 100644
--- a/lib/compiler/test/trycatch_SUITE.erl
+++ b/lib/compiler/test/trycatch_SUITE.erl
@@ -27,7 +27,8 @@
 	 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,
-         stacktrace/1,nested_stacktrace/1,raise/1]).
+         stacktrace/1,nested_stacktrace/1,raise/1,
+         no_return_in_try_block/1]).
 
 -include_lib("common_test/include/ct.hrl").
 
@@ -43,7 +44,8 @@ groups() ->
        nested_after,nested_horrid,last_call_optimization,
        bool,plain_catch_coverage,andalso_orelse,get_in_try,
        hockey,handle_info,catch_in_catch,grab_bag,
-       stacktrace,nested_stacktrace,raise]}].
+       stacktrace,nested_stacktrace,raise,
+       no_return_in_try_block]}].
 
 
 init_per_suite(Config) ->
@@ -1287,5 +1289,26 @@ do_test_raise_4(Expr) ->
             erlang:raise(exit, {exception,C,E,Stk}, Stk)
     end.
 
+no_return_in_try_block(Config) when is_list(Config) ->
+    1.0 = no_return_in_try_block_1(0),
+    1.0 = no_return_in_try_block_1(0.0),
+
+    gurka = no_return_in_try_block_1(gurka),
+    [] = no_return_in_try_block_1([]),
+
+    ok.
+
+no_return_in_try_block_1(H) ->
+    try
+        Float = if
+                    is_number(H) -> float(H);
+                    true -> no_return()
+                end,
+        Float + 1
+    catch
+        throw:no_return -> H
+    end.
+
+no_return() -> throw(no_return).
 
 id(I) -> I.
diff --git a/lib/compiler/test/warnings_SUITE.erl b/lib/compiler/test/warnings_SUITE.erl
index 33d55996ad..70b7100451 100644
--- a/lib/compiler/test/warnings_SUITE.erl
+++ b/lib/compiler/test/warnings_SUITE.erl
@@ -42,7 +42,7 @@
 	 comprehensions/1,maps/1,maps_bin_opt_info/1,
          redundant_boolean_clauses/1,
 	 latin1_fallback/1,underscore/1,no_warnings/1,
-	 bit_syntax/1,inlining/1]).
+	 bit_syntax/1,inlining/1,tuple_calls/1]).
 
 init_per_testcase(_Case, Config) ->
     Config.
@@ -64,7 +64,8 @@ groups() ->
        bin_opt_info,bin_construction,comprehensions,maps,
        maps_bin_opt_info,
        redundant_boolean_clauses,latin1_fallback,
-       underscore,no_warnings,bit_syntax,inlining]}].
+       underscore,no_warnings,bit_syntax,inlining,
+       tuple_calls]}].
 
 init_per_suite(Config) ->
     test_lib:recompile(?MODULE),
@@ -239,19 +240,7 @@ guard(Config) when is_list(Config) ->
 	     {4,sys_core_fold,nomatch_guard},
 	     {6,sys_core_fold,no_clause_match},
 	     {6,sys_core_fold,nomatch_guard},
-	     {6,sys_core_fold,{eval_failure,badarg}},
-	     {8,sys_core_fold,no_clause_match},
-	     {8,sys_core_fold,nomatch_guard},
-	     {8,sys_core_fold,{eval_failure,badarg}},
-	     {9,sys_core_fold,no_clause_match},
-	     {9,sys_core_fold,nomatch_guard},
-	     {9,sys_core_fold,{eval_failure,badarg}},
-	     {10,sys_core_fold,no_clause_match},
-	     {10,sys_core_fold,nomatch_guard},
-	     {10,sys_core_fold,{eval_failure,badarg}},
-	     {11,sys_core_fold,no_clause_match},
-	     {11,sys_core_fold,nomatch_guard},
-	     {11,sys_core_fold,{eval_failure,badarg}}
+	     {6,sys_core_fold,{eval_failure,badarg}}
 	    ]}}],
     [] = run(Config, Ts),
 
@@ -522,25 +511,43 @@ bin_opt_info(Config) when is_list(Config) ->
 	         <<>> -> ok
              end.
 
+             %% We use a tail in a BIF instruction, remote call, function
+             %% return, and an optimizable tail call for better coverage.
+             t2(<<A,B,T/bytes>>) ->
+                 if
+                     A > B -> t2(T);
+                     A =< B -> T
+                 end;
+             t2(<<_,T/bytes>>) when byte_size(T) < 4 ->
+                 foo;
              t2(<<_,T/bytes>>) ->
-               split_binary(T, 4).
+                 split_binary(T, 4).
            ">>,
-    Ts1 = [{bsm1,
-	    Code,
-	    [bin_opt_info],
-	    {warnings,
-	     [{4,sys_core_bsm,orig_bin_var_used_in_guard},
-	      {5,beam_bsm,{no_bin_opt,{{t1,1},no_suitable_bs_start_match}}},
-	      {9,beam_bsm,{no_bin_opt,
-			   {binary_used_in,{extfunc,erlang,split_binary,2}}}} ]}}],
-    [] = run(Config, Ts1),
+
+    Ws = (catch run_test(Config, Code, [bin_opt_info])),
+
+    %% This is an inexact match since the pass reports exact instructions as
+    %% part of the warnings, which may include annotations that vary from run
+    %% to run.
+    {warnings,
+     [{5,beam_ssa_bsm,{unsuitable_call,
+                        {{b_local,{b_literal,t1},1},
+                         {used_before_match,
+                            {b_set,_,_,{bif,byte_size},[_]}}}}},
+      {5,beam_ssa_bsm,{binary_created,_,_}},
+      {11,beam_ssa_bsm,{binary_created,_,_}}, %% A =< B -> T
+      {13,beam_ssa_bsm,context_reused},       %% A > B -> t2(T);
+      {16,beam_ssa_bsm,{binary_created,_,_}}, %% when byte_size(T) < 4 ->
+      {19,beam_ssa_bsm,{remote_call,
+                         {b_remote,
+                          {b_literal,erlang},
+                           {b_literal,split_binary},2}}},
+      {19,beam_ssa_bsm,{binary_created,_,_}}  %% split_binary(T, 4)
+     ]} = Ws,
 
     %% For coverage: don't give the bin_opt_info option.
-    Ts2 = [{bsm2,
-	    Code,
-	    [],
-	    []}],
-    [] = run(Config, Ts2),
+    [] = (catch run_test(Config, Code, [])),
+
     ok.
 
 bin_construction(Config) when is_list(Config) ->
@@ -746,7 +753,7 @@ maps_bin_opt_info(Config) when is_list(Config) ->
                  M.
            ">>,
            [bin_opt_info],
-           {warnings,[{2,beam_bsm,bin_opt}]}}],
+           {warnings,[{3,beam_ssa_bsm,context_reused}]}}],
     [] = run(Config, Ts),
     ok.
 
@@ -952,6 +959,20 @@ inlining(Config) ->
     run(Config, Ts),
     ok.
 
+tuple_calls(Config) ->
+    %% Make sure that no spurious warnings are generated.
+    Ts = [{inlining_1,
+           <<"-compile(tuple_calls).
+              dispatch(X) ->
+                (list_to_atom(\"prefix_\" ++
+                atom_to_list(suffix))):doit(X).
+           ">>,
+           [],
+           []}
+	 ],
+    run(Config, Ts),
+    ok.
+
 %%%
 %%% End of test cases.
 %%%
@@ -969,7 +990,6 @@ run(Config, Tests) ->
         end,
     lists:foldl(F, [], Tests).
 
-
 %% Compiles a test module and returns the list of errors and warnings.
 
 run_test(Conf, Test0, Warnings) ->
diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk
index 97179b7fc4..7192ddca15 100644
--- a/lib/compiler/vsn.mk
+++ b/lib/compiler/vsn.mk
@@ -1 +1 @@
-COMPILER_VSN = 7.3
+COMPILER_VSN = 7.4.4
diff --git a/lib/configure.in.src b/lib/configure.in.src
deleted file mode 100644
index d507a5c0dd..0000000000
--- a/lib/configure.in.src
+++ /dev/null
@@ -1,62 +0,0 @@
-dnl
-dnl %CopyrightBegin%
-dnl
-dnl Copyright Ericsson AB 1999-2016. All Rights Reserved.
-dnl
-dnl Licensed under the Apache License, Version 2.0 (the "License");
-dnl you may not use this file except in compliance with the License.
-dnl You may obtain a copy of the License at
-dnl
-dnl     http://www.apache.org/licenses/LICENSE-2.0
-dnl
-dnl Unless required by applicable law or agreed to in writing, software
-dnl distributed under the License is distributed on an "AS IS" BASIS,
-dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-dnl See the License for the specific language governing permissions and
-dnl limitations under the License.
-dnl
-dnl %CopyrightEnd%
-dnl
-
-dnl Turn off caching
-define([AC_CACHE_LOAD], )dnl
-define([AC_CACHE_SAVE], )dnl
-
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT
-
-dnl
-dnl This is just to run configure in all applications that need it.
-dnl
-
-if test -z "$ERL_TOP" || test ! -d $ERL_TOP ; then
-  AC_MSG_ERROR(You need to set the environment variable ERL_TOP!)
-fi
-erl_top=${ERL_TOP}
-AC_CONFIG_AUX_DIRS($erl_top/erts/autoconf)
-
-AC_ARG_ENABLE(bootstrap-only,
-[  --enable-bootstrap-only enable bootstrap only configuration],
-[ if test "X$enableval" = "Xyes"; then
-     bootstrap_only=yes
-  else
-     bootstrap_only=no  
-  fi	
-],
-bootstrap_only=no)
-
-# Multiple versions of autoconf generates code that
-# don't work on all platforms (e.g. SunOS 5.8) if
-# sub directories are soft links. Internally at Ericsson
-# some OTP application directories are soft links.
-# An added "/." solves this problem.
-
-@BOOTSTRAP_CONFIGURE_APPS@
-
-if test $bootstrap_only = no; then
-
-@NON_BOOTSTRAP_CONFIGURE_APPS@
-
-fi
-
-AC_OUTPUT
diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
index 31124ba477..f922c3fb9b 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
@@ -19,7 +19,6 @@
 #
 include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
-include $(ERL_TOP)/make/$(TARGET)/otp_ded.mk
 
 # ----------------------------------------------------
 # Application version
@@ -31,23 +30,20 @@ VSN=$(CRYPTO_VSN)
 # The following variables differ between systems.
 # Set by configure.
 # ----------------------------------------------------
-CC = $(DED_CC)
-LD = $(DED_LD)
+CC = @DED_CC@
+LD = @DED_LD@
 SHELL = /bin/sh
-LIBS = $(DED_LIBS)
-LDFLAGS += $(DED_LDFLAGS)
-CFLAGS = $(DED_CFLAGS)
+LIBS = @DED_LIBS@
+LDFLAGS += @DED_LDFLAGS@
+CFLAGS = @DED_CFLAGS@ @SSL_FLAGS@
 
 # From erts/configure
 SSL_LIBDIR = @SSL_LIBDIR@
 SSL_INCLUDE = @SSL_INCLUDE@
 SSL_CRYPTO_LIBNAME = @SSL_CRYPTO_LIBNAME@
 SSL_SSL_LIBNAME = @SSL_SSL_LIBNAME@
-SSL_FLAGS = @SSL_FLAGS@
 
-
-INCLUDES = $(SSL_INCLUDE) $(DED_INCLUDES)
-CFLAGS += $(SSL_FLAGS)
+INCLUDES = $(SSL_INCLUDE) @DED_INCLUDE@
 
 ifeq ($(TYPE),debug)
 TYPEMARKER = .debug
@@ -70,29 +66,50 @@ RELSYSDIR = $(RELEASE_PATH)/lib/crypto-$(VSN)
 # ----------------------------------------------------
 # Misc Macros
 # ----------------------------------------------------
-CRYPTO_OBJS = $(OBJDIR)/crypto$(TYPEMARKER).o
+
+PRIVDIR = ../priv
+OBJDIR = $(PRIVDIR)/obj/$(TARGET)
+LIBDIR = $(PRIVDIR)/lib/$(TARGET)
+
+CRYPTO_OBJS = $(OBJDIR)/crypto$(TYPEMARKER).o \
+	$(OBJDIR)/aead$(TYPEMARKER).o \
+	$(OBJDIR)/aes$(TYPEMARKER).o \
+	$(OBJDIR)/algorithms$(TYPEMARKER).o \
+	$(OBJDIR)/api_ng$(TYPEMARKER).o \
+	$(OBJDIR)/atoms$(TYPEMARKER).o \
+	$(OBJDIR)/bn$(TYPEMARKER).o \
+	$(OBJDIR)/cipher$(TYPEMARKER).o \
+	$(OBJDIR)/cmac$(TYPEMARKER).o \
+	$(OBJDIR)/dh$(TYPEMARKER).o \
+	$(OBJDIR)/digest$(TYPEMARKER).o \
+	$(OBJDIR)/dss$(TYPEMARKER).o \
+	$(OBJDIR)/ec$(TYPEMARKER).o \
+	$(OBJDIR)/ecdh$(TYPEMARKER).o \
+	$(OBJDIR)/eddsa$(TYPEMARKER).o \
+	$(OBJDIR)/engine$(TYPEMARKER).o \
+	$(OBJDIR)/evp$(TYPEMARKER).o \
+	$(OBJDIR)/fips$(TYPEMARKER).o \
+	$(OBJDIR)/hash$(TYPEMARKER).o \
+	$(OBJDIR)/hmac$(TYPEMARKER).o \
+	$(OBJDIR)/info$(TYPEMARKER).o \
+	$(OBJDIR)/mac$(TYPEMARKER).o \
+	$(OBJDIR)/math$(TYPEMARKER).o \
+	$(OBJDIR)/pkey$(TYPEMARKER).o \
+	$(OBJDIR)/rand$(TYPEMARKER).o \
+	$(OBJDIR)/rsa$(TYPEMARKER).o \
+	$(OBJDIR)/srp$(TYPEMARKER).o
 CALLBACK_OBJS = $(OBJDIR)/crypto_callback$(TYPEMARKER).o
 NIF_MAKEFILE = $(PRIVDIR)/Makefile
-CRYPTO_STATIC_OBJS = $(OBJDIR)/crypto_static$(TYPEMARKER).o\
-	$(OBJDIR)/crypto_callback_static$(TYPEMARKER).o
+CRYPTO_STATIC_OBJS = $(patsubst $(OBJDIR)/%$(TYPEMARKER).o,$(OBJDIR)/%_static$(TYPEMARKER).o,$(CRYPTO_OBJS) $(CALLBACK_OBJS))
 
 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
+NIF_LIB = $(LIBDIR)/crypto$(TYPEMARKER).@DED_EXT@
+CALLBACK_LIB = $(LIBDIR)/crypto_callback$(TYPEMARKER).@DED_EXT@
+TEST_ENGINE_LIB = $(LIBDIR)/otp_test_engine$(TYPEMARKER).@DED_EXT@
 
-ifeq ($(HOST_OS),)
-HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess)
-endif
 DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
 
 ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
@@ -125,7 +142,7 @@ RANLIB=true
 endif
 
 ALL_CFLAGS = $(TYPE_FLAGS) $(EXTRA_FLAGS) $(INCLUDES)
-ALL_STATIC_CFLAGS = $(DED_STATIC_CFLAGS) $(INCLUDES)
+ALL_STATIC_CFLAGS = @DED_STATIC_CFLAGS@ $(INCLUDES)
 
 # ----------------------------------------------------
 # Targets
@@ -180,32 +197,21 @@ $(LIBDIR)/crypto_callback$(TYPEMARKER).dll: $(CALLBACK_OBJS)
 endif
 
 
-clean:
-ifeq ($(findstring win32,$(TARGET)), win32)
-	rm -f $(LIBDIR)/crypto.dll
-	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
-	rm -f $(LIBDIR)/crypto.valgrind.so
-	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
-	rm -f $(OBJDIR)/crypto.debug.o
-	rm -f $(OBJDIR)/crypto_static.debug.o
-	rm -f $(OBJDIR)/crypto.valgrind.o
-	rm -f $(OBJDIR)/crypto_static.valgrind.o
-	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
+CLEAN_OBJS_RAW = $(CRYPTO_OBJS) $(CALLBACK_OBJS) $(CRYPTO_STATIC_OBJS) $(TEST_ENGINE_OBJS)
+CLEAN_OBJS_O = $(patsubst %.debug.o,%.o,$(CLEAN_OBJS_RAW:.valgrind.o=.o))
+
+CLEAN_LIBS_RAW = $(NIF_LIB) $(CALLBACK_LIB) $(TEST_ENGINE_LIB)
+CLEAN_LIBS_SO = $(patsubst %.debug.@DED_EXT@,%.@DED_EXT@,$(CLEAN_LIBS_RAW:.valgrind.@DED_EXT@=.@DED_EXT@))
+
+clean_dynamic_libs:
+	rm -f $(CLEAN_LIBS_SO)
+	rm -f $(foreach T,.valgrind.@DED_EXT@ .debug.@DED_EXT@,$(CLEAN_LIBS_SO:.@DED_EXT@=$T))
+
+clean_objs:
+	rm -f $(CLEAN_OBJS_O)
+	rm -f $(foreach T,.valgrind.o .debug.o,$(CLEAN_OBJS_O:.o=$T))
+
+clean: clean_objs clean_dynamic_libs
 	rm -f core *~
 
 docs:
diff --git a/lib/crypto/c_src/aead.c b/lib/crypto/c_src/aead.c
new file mode 100644
index 0000000000..ab0e609130
--- /dev/null
+++ b/lib/crypto/c_src/aead.c
@@ -0,0 +1,182 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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 "aead.h"
+#include "aes.h"
+#include "cipher.h"
+
+
+
+ERL_NIF_TERM aead_cipher(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/*
+   (Type,Key,Iv,AAD,In,TagLen,true)
+   (Type,Key,Iv,AAD,In,Tag,false)
+ */
+#if defined(HAVE_AEAD)
+    const struct cipher_type_t *cipherp;
+    EVP_CIPHER_CTX *ctx = NULL;
+    const EVP_CIPHER *cipher = NULL;
+    ErlNifBinary key, iv, aad, in, tag;
+    unsigned int tag_len;
+    unsigned char *outp, *tagp, *tag_data;
+    ERL_NIF_TERM type, out, out_tag, ret, encflg_arg;
+    int len, encflg;
+
+    encflg_arg = argv[6];
+
+    /* Fetch the flag telling if we are going to encrypt (=true) or decrypt (=false) */
+    if (encflg_arg == atom_true)
+        encflg = 1;
+    else if (encflg_arg == atom_false)
+        encflg = 0;
+    else if (encflg_arg == atom_undefined)
+        /* For compat funcs in crypto.erl */
+        encflg = -1;
+    else
+        {
+            ret = EXCP_BADARG(env, "Bad enc flag");
+            goto done;
+        }
+
+    type = argv[0];
+
+    if (!enif_is_atom(env, type))
+        {ret = EXCP_BADARG(env, "non-atom cipher type"); goto done;}
+    if (!enif_inspect_iolist_as_binary(env, argv[1], &key))
+        {ret = EXCP_BADARG(env, "non-binary key"); goto done;}
+    if (!enif_inspect_iolist_as_binary(env, argv[2], &iv))
+        {ret = EXCP_BADARG(env, "non-binary iv"); goto done;}
+    if (!enif_inspect_iolist_as_binary(env, argv[3], &in))
+        {ret = EXCP_BADARG(env, "non-binary text"); goto done;}
+    if (!enif_inspect_iolist_as_binary(env, argv[4], &aad))
+        {ret = EXCP_BADARG(env, "non-binary AAD"); goto done;}
+
+    if (encflg) {
+        if (!enif_get_uint(env, argv[5], &tag_len))
+            {ret = EXCP_BADARG(env, "Bad Tag length"); goto done;}
+        tag_data = NULL;
+    } else {
+        if (!enif_inspect_iolist_as_binary(env, argv[5], &tag))
+            {ret = EXCP_BADARG(env, "non-binary Tag"); goto done;}
+        tag_len = tag.size;
+        tag_data = tag.data;
+    }
+
+    if (tag_len > INT_MAX
+        || key.size > INT_MAX
+        || iv.size > INT_MAX
+        || in.size > INT_MAX
+        || aad.size > INT_MAX)
+        {ret = EXCP_BADARG(env, "binary too long"); goto done;}
+
+    if ((cipherp = get_cipher_type(type, key.size)) == NULL)
+        {ret = EXCP_BADARG(env, "Unknown cipher"); goto done;}
+    if (cipherp->flags & NON_EVP_CIPHER)
+        {ret = EXCP_BADARG(env, "Bad cipher"); goto done;}
+    if (! (cipherp->flags & AEAD_CIPHER) )
+        {ret = EXCP_BADARG(env, "Not aead cipher"); goto done;}
+    if ((cipher = cipherp->cipher.p) == NULL)
+        {ret = EXCP_NOTSUP(env, "Cipher not supported in this libcrypto version"); goto done;}
+
+#if defined(HAVE_GCM_EVP_DECRYPT_BUG)
+    if ( !encflg && (cipherp->flags & GCM_MODE))
+        return aes_gcm_decrypt_NO_EVP(env, argc, argv);
+#endif
+
+    if ((ctx = EVP_CIPHER_CTX_new()) == NULL)
+        {ret = EXCP_ERROR(env, "Can't allocate ctx"); goto done;}
+
+    if (EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, encflg) != 1)
+        {ret = EXCP_ERROR(env, "CipherInit failed"); goto done;}
+    if (EVP_CIPHER_CTX_ctrl(ctx, cipherp->extra.aead.ctx_ctrl_set_ivlen, (int)iv.size, NULL) != 1)
+        {ret = EXCP_BADARG(env, "Bad IV length"); goto done;}
+
+#if defined(HAVE_CCM)
+    if (cipherp->flags & CCM_MODE) {
+        if (EVP_CIPHER_CTX_ctrl(ctx, cipherp->extra.aead.ctx_ctrl_set_tag, (int)tag_len, tag_data) != 1)
+            {ret = EXCP_BADARG(env, "Can't set tag"); goto done;}
+        if (EVP_CipherInit_ex(ctx, NULL, NULL, key.data, iv.data, -1) != 1)
+            {ret = EXCP_BADARG(env, "Can't set key or iv"); goto done;}
+        if (EVP_CipherUpdate(ctx, NULL, &len, NULL, (int)in.size) != 1)
+            {ret = EXCP_BADARG(env, "Can't set text size"); goto done;}
+    } else
+#endif
+        {
+            if (EVP_CipherInit_ex(ctx, NULL, NULL, key.data, iv.data, -1) != 1)
+                {ret = EXCP_BADARG(env, "Can't set key or iv"); goto done;}
+        }
+
+    if (EVP_CipherUpdate(ctx, NULL, &len, aad.data, (int)aad.size) != 1)
+        {ret = EXCP_BADARG(env, "Can't set AAD"); goto done;}
+
+    if ((outp = enif_make_new_binary(env, in.size, &out)) == NULL)
+        {ret = EXCP_ERROR(env, "Can't make 'Out' binary"); goto done;}
+
+    if (EVP_CipherUpdate(ctx, outp, &len, in.data, (int)in.size) != 1)
+        {
+            if (encflg)
+                ret = EXCP_BADARG(env, "Can't set in-text");
+            else
+                /* Decrypt error */
+                ret = atom_error;
+            goto done;
+        }
+
+    if (encflg)
+        {
+            if (EVP_CipherFinal_ex(ctx, outp/*+len*/, &len) != 1)
+                {ret = EXCP_ERROR(env, "Encrypt error"); goto done;}
+
+            if ((tagp = enif_make_new_binary(env, tag_len, &out_tag)) == NULL)
+                {ret = EXCP_ERROR(env, "Can't make 'Out' binary"); goto done;}
+
+            if (EVP_CIPHER_CTX_ctrl(ctx, cipherp->extra.aead.ctx_ctrl_get_tag, (int)tag_len, tagp) != 1)
+                {ret = EXCP_ERROR(env, "Can't get Tag"); goto done;}
+
+            ret = enif_make_tuple2(env, out, out_tag);
+        }
+    else
+        {
+#if defined(HAVE_GCM)
+            if (cipherp->flags & GCM_MODE) {
+                if (EVP_CIPHER_CTX_ctrl(ctx, cipherp->extra.aead.ctx_ctrl_set_tag, (int)tag_len, tag.data) != 1)
+                    /* Decrypt error */
+                    {ret = atom_error; goto done;}
+                if (EVP_DecryptFinal_ex(ctx, outp+len, &len) != 1)
+                    /* Decrypt error */
+                    {ret = atom_error; goto done;}
+            }
+#endif
+            ret = out;
+        }
+
+    CONSUME_REDS(env, in);
+
+done:
+    if (ctx)
+        EVP_CIPHER_CTX_free(ctx);
+    return ret;
+
+#else
+    return EXCP_NOTSUP(env, "Unsupported Cipher");
+#endif
+}
+
+
diff --git a/lib/crypto/c_src/aead.h b/lib/crypto/c_src/aead.h
new file mode 100644
index 0000000000..2ec7a8a930
--- /dev/null
+++ b/lib/crypto/c_src/aead.h
@@ -0,0 +1,28 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_AEAD_H__
+#define E_AEAD_H__ 1
+
+#include "common.h"
+
+ERL_NIF_TERM aead_cipher(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+#endif /* E_AEAD_H__ */
diff --git a/lib/crypto/c_src/aes.c b/lib/crypto/c_src/aes.c
new file mode 100644
index 0000000000..4b01e629f9
--- /dev/null
+++ b/lib/crypto/c_src/aes.c
@@ -0,0 +1,302 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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 "aes.h"
+#include "cipher.h"
+
+ERL_NIF_TERM aes_cfb_8_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Key, IVec, Data, IsEncrypt) */
+     ErlNifBinary key, ivec, text;
+     AES_KEY aes_key;
+     unsigned char ivec_clone[16]; /* writable copy */
+     int new_ivlen = 0;
+     ERL_NIF_TERM ret;
+     unsigned char *outp;
+
+     CHECK_NO_FIPS_MODE();
+
+     ASSERT(argc == 4);
+
+     if (!enif_inspect_iolist_as_binary(env, argv[0], &key))
+         goto bad_arg;
+     if (key.size != 16 && key.size != 24 && key.size != 32)
+         goto bad_arg;
+     if (!enif_inspect_binary(env, argv[1], &ivec))
+         goto bad_arg;
+     if (ivec.size != 16)
+         goto bad_arg;
+     if (!enif_inspect_iolist_as_binary(env, argv[2], &text))
+         goto bad_arg;
+
+     memcpy(ivec_clone, ivec.data, 16);
+
+     /* NOTE: This function returns 0 on success unlike most OpenSSL functions */
+     if (AES_set_encrypt_key(key.data, (int)key.size * 8, &aes_key) != 0)
+         goto err;
+     if ((outp = enif_make_new_binary(env, text.size, &ret)) == NULL)
+         goto err;
+     AES_cfb8_encrypt((unsigned char *) text.data,
+                      outp,
+                      text.size, &aes_key, ivec_clone, &new_ivlen,
+                      (argv[3] == atom_true));
+     CONSUME_REDS(env,text);
+     return ret;
+
+ bad_arg:
+ err:
+     return enif_make_badarg(env);
+}
+
+ERL_NIF_TERM aes_cfb_128_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Key, IVec, Data, IsEncrypt) */
+    ErlNifBinary key, ivec, text;
+    AES_KEY aes_key;
+    unsigned char ivec_clone[16]; /* writable copy */
+    int new_ivlen = 0;
+    ERL_NIF_TERM ret;
+    unsigned char *outp;
+
+    ASSERT(argc == 4);
+
+    if (!enif_inspect_iolist_as_binary(env, argv[0], &key))
+        goto bad_arg;
+    if (key.size != 16 && key.size != 24 && key.size != 32)
+        goto bad_arg;
+    if (!enif_inspect_binary(env, argv[1], &ivec))
+        goto bad_arg;
+    if (ivec.size != 16)
+        goto bad_arg;
+    if (!enif_inspect_iolist_as_binary(env, argv[2], &text))
+        goto bad_arg;
+
+    memcpy(ivec_clone, ivec.data, 16);
+
+    /* NOTE: This function returns 0 on success unlike most OpenSSL functions */
+    if (AES_set_encrypt_key(key.data, (int)key.size * 8, &aes_key) != 0)
+        goto err;
+
+    if ((outp = enif_make_new_binary(env, text.size, &ret)) == NULL)
+        goto err;
+    AES_cfb128_encrypt((unsigned char *) text.data,
+                       outp,
+                       text.size, &aes_key, ivec_clone, &new_ivlen,
+                       (argv[3] == atom_true));
+    CONSUME_REDS(env,text);
+    return ret;
+
+ bad_arg:
+ err:
+    return enif_make_badarg(env);
+}
+
+ERL_NIF_TERM aes_ige_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Key, IVec, Data, IsEncrypt) */
+#ifdef HAVE_AES_IGE
+    ErlNifBinary key_bin, ivec_bin, data_bin;
+    AES_KEY aes_key;
+    unsigned char ivec[32];
+    int type;
+    unsigned char* ret_ptr;
+    ERL_NIF_TERM ret;
+
+    CHECK_NO_FIPS_MODE();
+
+    ASSERT(argc == 4);
+
+    if (!enif_inspect_iolist_as_binary(env, argv[0], &key_bin))
+        goto bad_arg;
+    if (key_bin.size != 16 && key_bin.size != 32)
+        goto bad_arg;
+    if (!enif_inspect_binary(env, argv[1], &ivec_bin))
+        goto bad_arg;
+    if (ivec_bin.size != 32)
+        goto bad_arg;
+    if (!enif_inspect_iolist_as_binary(env, argv[2], &data_bin))
+        goto bad_arg;
+    if (data_bin.size % 16 != 0)
+        goto bad_arg;
+
+    if (argv[3] == atom_true) {
+       type = AES_ENCRYPT;
+       /* NOTE: This function returns 0 on success unlike most OpenSSL functions */
+       if (AES_set_encrypt_key(key_bin.data, (int)key_bin.size * 8, &aes_key) != 0)
+           goto err;
+    }
+    else {
+       type = AES_DECRYPT;
+       /* NOTE: This function returns 0 on success unlike most OpenSSL functions */
+       if (AES_set_decrypt_key(key_bin.data, (int)key_bin.size * 8, &aes_key) != 0)
+           goto err;
+    }
+
+    if ((ret_ptr = enif_make_new_binary(env, data_bin.size, &ret)) == NULL)
+        goto err;
+
+    memcpy(ivec, ivec_bin.data, 32); /* writable copy */
+
+    AES_ige_encrypt(data_bin.data, ret_ptr, data_bin.size, &aes_key, ivec, type);
+
+    CONSUME_REDS(env,data_bin);
+    return ret;
+
+ bad_arg:
+ err:
+    return enif_make_badarg(env);
+
+#else
+    return atom_notsup;
+#endif
+}
+
+
+#if !defined(HAVE_EVP_AES_CTR)
+ERL_NIF_TERM aes_ctr_stream_encrypt_compat(ErlNifEnv* env, const ERL_NIF_TERM state_arg, const ERL_NIF_TERM data_arg)
+{/* ({Key, IVec, ECount, Num}, Data) */
+    ErlNifBinary key_bin, ivec_bin, text_bin, ecount_bin;
+    AES_KEY aes_key;
+    unsigned int num;
+    ERL_NIF_TERM ret, num2_term, cipher_term, ivec2_term, ecount2_term, new_state_term;
+    int state_arity;
+    const ERL_NIF_TERM *state_term;
+    unsigned char * ivec2_buf;
+    unsigned char * ecount2_buf;
+    unsigned char *outp;
+
+    if (!enif_get_tuple(env, state_arg, &state_arity, &state_term))
+        goto bad_arg;
+    if (state_arity != 4)
+        goto bad_arg;
+    if (!enif_inspect_iolist_as_binary(env, state_term[0], &key_bin))
+        goto bad_arg;
+    if (key_bin.size > INT_MAX / 8)
+        goto bad_arg;
+    if (!enif_inspect_binary(env, state_term[1], &ivec_bin))
+        goto bad_arg;
+    if (ivec_bin.size != 16)
+        goto bad_arg;
+    if (!enif_inspect_binary(env, state_term[2], &ecount_bin))
+        goto bad_arg;
+    if (ecount_bin.size != AES_BLOCK_SIZE)
+        goto bad_arg;
+    if (!enif_get_uint(env, state_term[3], &num))
+        goto bad_arg;
+    if (!enif_inspect_iolist_as_binary(env, data_arg, &text_bin))
+        goto bad_arg;
+
+    /* NOTE: This function returns 0 on success unlike most OpenSSL functions */
+    if (AES_set_encrypt_key(key_bin.data, (int)key_bin.size * 8, &aes_key) != 0)
+        goto bad_arg;
+
+    if ((ivec2_buf = enif_make_new_binary(env, ivec_bin.size, &ivec2_term)) == NULL)
+        goto err;
+    if ((ecount2_buf = enif_make_new_binary(env, ecount_bin.size, &ecount2_term)) == NULL)
+        goto err;
+
+    memcpy(ivec2_buf, ivec_bin.data, 16);
+    memcpy(ecount2_buf, ecount_bin.data, ecount_bin.size);
+
+    if ((outp = enif_make_new_binary(env, text_bin.size, &cipher_term)) == NULL)
+        goto err;
+
+    AES_ctr128_encrypt((unsigned char *) text_bin.data,
+                       outp,
+		       text_bin.size, &aes_key, ivec2_buf, ecount2_buf, &num);
+
+    num2_term = enif_make_uint(env, num);
+    new_state_term = enif_make_tuple4(env, state_term[0], ivec2_term, ecount2_term, num2_term);
+    ret = enif_make_tuple2(env, new_state_term, cipher_term);
+    CONSUME_REDS(env,text_bin);
+    return ret;
+
+ bad_arg:
+ err:
+    return enif_make_badarg(env);
+}
+#endif /* !HAVE_EVP_AES_CTR */
+
+#ifdef HAVE_GCM_EVP_DECRYPT_BUG
+ERL_NIF_TERM aes_gcm_decrypt_NO_EVP(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Type,Key,Iv,AAD,In,Tag) */
+    GCM128_CONTEXT *ctx = NULL;
+    ErlNifBinary key, iv, aad, in, tag;
+    AES_KEY aes_key;
+    unsigned char *outp;
+    ERL_NIF_TERM out, ret;
+
+    ASSERT(argc == 6);
+
+    if (!enif_inspect_iolist_as_binary(env, argv[1], &key))
+        goto bad_arg;
+    if (key.size > INT_MAX / 8)
+        goto bad_arg;
+    if (!enif_inspect_binary(env, argv[2], &iv))
+        goto bad_arg;
+    if (iv.size == 0)
+        goto bad_arg;
+    if (!enif_inspect_iolist_as_binary(env, argv[3], &aad))
+        goto bad_arg;
+    if (!enif_inspect_iolist_as_binary(env, argv[4], &in))
+        goto bad_arg;
+    if (!enif_inspect_iolist_as_binary(env, argv[5], &tag))
+        goto bad_arg;
+
+    /* NOTE: This function returns 0 on success unlike most OpenSSL functions */
+    if (AES_set_encrypt_key(key.data, (int)key.size * 8, &aes_key) != 0)
+        goto bad_arg;
+
+    if ((ctx = CRYPTO_gcm128_new(&aes_key, (block128_f)AES_encrypt)) == NULL)
+        goto err;
+
+    CRYPTO_gcm128_setiv(ctx, iv.data, iv.size);
+
+    /* NOTE: This function returns 0 on success unlike most OpenSSL functions */
+    if (CRYPTO_gcm128_aad(ctx, aad.data, aad.size) != 0)
+        goto err;
+
+    if ((outp = enif_make_new_binary(env, in.size, &out)) == NULL)
+        goto err;
+
+    /* NOTE: This function returns 0 on success unlike most OpenSSL functions */
+    if (CRYPTO_gcm128_decrypt(ctx, in.data, outp, in.size) != 0)
+        goto err;
+
+    /* calculate and check the tag */
+    /* NOTE: This function returns 0 on success unlike most OpenSSL functions */
+    if (CRYPTO_gcm128_finish(ctx, tag.data, tag.size) != 0)
+        goto err;
+
+    CONSUME_REDS(env, in);
+    ret = out;
+    goto done;
+
+ bad_arg:
+    ret = enif_make_badarg(env);
+    goto done;
+
+ err:
+    ret = atom_error;
+
+ done:
+    if (ctx)
+        CRYPTO_gcm128_release(ctx);
+    return ret;
+}
+#endif /* HAVE_GCM_EVP_DECRYPT_BUG */
+
diff --git a/lib/crypto/c_src/aes.h b/lib/crypto/c_src/aes.h
new file mode 100644
index 0000000000..c0b2b91f8d
--- /dev/null
+++ b/lib/crypto/c_src/aes.h
@@ -0,0 +1,38 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_AES_H__
+#define E_AES_H__ 1
+
+#include "common.h"
+
+ERL_NIF_TERM aes_cfb_8_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM aes_cfb_128_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM aes_ige_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+#if !defined(HAVE_EVP_AES_CTR)
+ERL_NIF_TERM aes_ctr_stream_encrypt_compat(ErlNifEnv* env, const ERL_NIF_TERM state_arg, const ERL_NIF_TERM data_arg);
+#endif
+
+#ifdef HAVE_GCM_EVP_DECRYPT_BUG
+ERL_NIF_TERM aes_gcm_decrypt_NO_EVP(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+#endif
+
+#endif /* E_AES_H__ */
diff --git a/lib/crypto/c_src/algorithms.c b/lib/crypto/c_src/algorithms.c
new file mode 100644
index 0000000000..53b8b7eaa9
--- /dev/null
+++ b/lib/crypto/c_src/algorithms.c
@@ -0,0 +1,299 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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 "algorithms.h"
+#include "cipher.h"
+#include "mac.h"
+
+static unsigned int algo_hash_cnt, algo_hash_fips_cnt;
+static ERL_NIF_TERM algo_hash[14];   /* increase when extending the list */
+static unsigned int algo_pubkey_cnt, algo_pubkey_fips_cnt;
+static ERL_NIF_TERM algo_pubkey[12]; /* increase when extending the list */
+static unsigned int algo_curve_cnt, algo_curve_fips_cnt;
+static ERL_NIF_TERM algo_curve[89]; /* increase when extending the list */
+static unsigned int algo_rsa_opts_cnt, algo_rsa_opts_fips_cnt;
+static ERL_NIF_TERM algo_rsa_opts[11]; /* increase when extending the list */
+
+void init_algorithms_types(ErlNifEnv* env)
+{
+    // Validated algorithms first
+    algo_hash_cnt = 0;
+    algo_hash[algo_hash_cnt++] = atom_sha;
+#ifdef HAVE_SHA224
+    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "sha224");
+#endif
+#ifdef HAVE_SHA256
+    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "sha256");
+#endif
+#ifdef HAVE_SHA384
+    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "sha384");
+#endif
+#ifdef HAVE_SHA512
+    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "sha512");
+#endif
+#ifdef HAVE_SHA3_224
+    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "sha3_224");
+#endif
+#ifdef HAVE_SHA3_256
+    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "sha3_256");
+#endif
+#ifdef HAVE_SHA3_384
+    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "sha3_384");
+#endif
+#ifdef HAVE_SHA3_512
+    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "sha3_512");
+#endif
+#ifdef HAVE_BLAKE2
+    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "blake2b");
+    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "blake2s");
+#endif
+
+    // Non-validated algorithms follow
+    algo_hash_fips_cnt = algo_hash_cnt;
+#ifdef HAVE_MD4
+    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "md4");
+#endif
+#ifdef HAVE_MD5
+    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "md5");
+#endif
+#ifdef HAVE_RIPEMD160
+    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "ripemd160");
+#endif
+
+    algo_pubkey_cnt = 0;
+    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "rsa");
+#ifdef HAVE_DSA
+    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "dss");
+#endif
+#ifdef HAVE_DH
+    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "dh");
+#endif
+#if defined(HAVE_EC)
+#if !defined(OPENSSL_NO_EC2M)
+    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "ec_gf2m");
+#endif
+    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "ecdsa");
+    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "ecdh");
+#endif
+    // Non-validated algorithms follow
+    algo_pubkey_fips_cnt = algo_pubkey_cnt;
+    // Don't know if Edward curves are fips validated
+#if defined(HAVE_EDDSA)
+    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "eddsa");
+#endif
+    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "srp");
+
+    // Validated algorithms first
+    algo_curve_cnt = 0;
+#if defined(HAVE_EC)
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp160k1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp160r1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp160r2");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp192r1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp192k1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp224k1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp224r1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp256k1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp256r1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp384r1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp521r1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"prime192v1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"prime192v2");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"prime192v3");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"prime239v1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"prime239v2");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"prime239v3");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"prime256v1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"wtls7");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"wtls9");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"wtls12");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP160r1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP160t1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP192r1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP192t1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP224r1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP224t1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP256r1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP256t1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP320r1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP320t1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP384r1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP384t1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP512r1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP512t1");
+#if !defined(OPENSSL_NO_EC2M)
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect163k1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect163r1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect163r2");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect193r1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect193r2");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect233k1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect233r1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect239k1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect283k1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect283r1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect409k1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect409r1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect571k1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect571r1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2pnb163v1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2pnb163v2");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2pnb163v3");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2pnb176v1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2tnb191v1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2tnb191v2");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2tnb191v3");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2pnb208w1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2tnb239v1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2tnb239v2");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2tnb239v3");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2pnb272w1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2pnb304w1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2tnb359v1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2pnb368w1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2tnb431r1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"wtls3");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"wtls5");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"wtls10");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"wtls11");
+#endif
+#endif
+    // Non-validated algorithms follow
+    algo_curve_fips_cnt = algo_curve_cnt;
+#if defined(HAVE_EC)
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp112r1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp112r2");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp128r1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp128r2");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"wtls6");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"wtls8");
+#if !defined(OPENSSL_NO_EC2M)
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect113r1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect113r2");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect131r1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect131r2");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"wtls1");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"wtls4");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"ipsec3");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"ipsec4");
+#endif
+#endif
+    //--
+#ifdef HAVE_EDDSA
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"ed25519");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"ed448");
+#endif
+#ifdef HAVE_ED_CURVE_DH
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"x25519");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"x448");
+#endif
+
+    // Validated algorithms first
+    algo_rsa_opts_cnt = 0;
+#ifdef HAS_EVP_PKEY_CTX
+# ifdef HAVE_RSA_PKCS1_PSS_PADDING
+    algo_rsa_opts[algo_rsa_opts_cnt++] = enif_make_atom(env,"rsa_pkcs1_pss_padding");
+    algo_rsa_opts[algo_rsa_opts_cnt++] = enif_make_atom(env,"rsa_pss_saltlen");
+# endif
+# ifdef HAVE_RSA_MGF1_MD
+    algo_rsa_opts[algo_rsa_opts_cnt++] = enif_make_atom(env,"rsa_mgf1_md");
+# endif
+# ifdef HAVE_RSA_OAEP_PADDING
+    algo_rsa_opts[algo_rsa_opts_cnt++] = enif_make_atom(env,"rsa_pkcs1_oaep_padding");
+# endif
+# ifdef HAVE_RSA_OAEP_MD
+    algo_rsa_opts[algo_rsa_opts_cnt++] = enif_make_atom(env,"rsa_oaep_label");
+    algo_rsa_opts[algo_rsa_opts_cnt++] = enif_make_atom(env,"rsa_oaep_md");
+# endif
+    algo_rsa_opts[algo_rsa_opts_cnt++] = enif_make_atom(env,"signature_md");
+#endif
+    algo_rsa_opts[algo_rsa_opts_cnt++] = enif_make_atom(env,"rsa_pkcs1_padding");
+    algo_rsa_opts[algo_rsa_opts_cnt++] = enif_make_atom(env,"rsa_x931_padding");
+#ifdef HAVE_RSA_SSLV23_PADDING
+    algo_rsa_opts[algo_rsa_opts_cnt++] = enif_make_atom(env,"rsa_sslv23_padding");
+#endif
+    algo_rsa_opts[algo_rsa_opts_cnt++] = enif_make_atom(env,"rsa_no_padding");
+    algo_rsa_opts_fips_cnt = algo_rsa_opts_cnt;
+
+
+    // Check that the max number of algos is updated
+    ASSERT(algo_hash_cnt <= sizeof(algo_hash)/sizeof(ERL_NIF_TERM));
+    ASSERT(algo_pubkey_cnt <= sizeof(algo_pubkey)/sizeof(ERL_NIF_TERM));
+    ASSERT(algo_curve_cnt <= sizeof(algo_curve)/sizeof(ERL_NIF_TERM));
+    ASSERT(algo_rsa_opts_cnt <= sizeof(algo_rsa_opts)/sizeof(ERL_NIF_TERM));
+}
+
+
+ERL_NIF_TERM hash_algorithms(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    unsigned int cnt  =
+#ifdef FIPS_SUPPORT
+        FIPS_mode() ? algo_hash_fips_cnt :
+#endif
+        algo_hash_cnt;
+
+    return enif_make_list_from_array(env, algo_hash, cnt);
+}
+
+ERL_NIF_TERM pubkey_algorithms(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    unsigned int cnt  =
+#ifdef FIPS_SUPPORT
+        FIPS_mode() ? algo_pubkey_fips_cnt :
+#endif
+        algo_pubkey_cnt;
+
+    return enif_make_list_from_array(env, algo_pubkey, cnt);
+}
+
+
+ERL_NIF_TERM cipher_algorithms(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    return cipher_types_as_list(env); /* Exclude old api ciphers */
+}
+
+
+ERL_NIF_TERM mac_algorithms(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    return mac_types_as_list(env);
+}
+
+ERL_NIF_TERM curve_algorithms(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    unsigned int cnt  =
+#ifdef FIPS_SUPPORT
+        FIPS_mode() ? algo_curve_fips_cnt :
+#endif
+        algo_curve_cnt;
+
+    return enif_make_list_from_array(env, algo_curve, cnt);
+}
+
+
+ERL_NIF_TERM rsa_opts_algorithms(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    unsigned int cnt  =
+#ifdef FIPS_SUPPORT
+        FIPS_mode() ? algo_rsa_opts_fips_cnt :
+#endif
+        algo_rsa_opts_cnt;
+
+    return enif_make_list_from_array(env, algo_rsa_opts, cnt);
+}
diff --git a/lib/crypto/c_src/algorithms.h b/lib/crypto/c_src/algorithms.h
new file mode 100644
index 0000000000..4ad8b56db8
--- /dev/null
+++ b/lib/crypto/c_src/algorithms.h
@@ -0,0 +1,35 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_ALGORITHMS_H__
+#define E_ALGORITHMS_H__ 1
+
+#include "common.h"
+
+void init_algorithms_types(ErlNifEnv* env);
+
+ERL_NIF_TERM hash_algorithms(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM pubkey_algorithms(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM cipher_algorithms(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM mac_algorithms(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM curve_algorithms(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM rsa_opts_algorithms(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+#endif /* E_ALGORITHMS_H__ */
diff --git a/lib/crypto/c_src/api_ng.c b/lib/crypto/c_src/api_ng.c
new file mode 100644
index 0000000000..941e03cc98
--- /dev/null
+++ b/lib/crypto/c_src/api_ng.c
@@ -0,0 +1,568 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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 "api_ng.h"
+#include "aes.h"
+#include "cipher.h"
+
+/*
+ * A unified set of functions for encryption/decryption.
+ *
+ */
+ERL_NIF_TERM ng_crypto_update(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM ng_crypto_one_time(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+#ifdef HAVE_ECB_IVEC_BUG
+    /* <= 0.9.8l returns faulty ivec length */
+# define GET_IV_LEN(Ciph) ((Ciph)->flags & ECB_BUG_0_9_8L) ? 0 : EVP_CIPHER_iv_length((Ciph)->cipher.p)
+#else
+# define GET_IV_LEN(Ciph) EVP_CIPHER_iv_length((Ciph)->cipher.p)
+#endif
+
+/*************************************************************************/
+/* Get the arguments for the initialization of the EVP_CIPHER_CTX. Check */
+/* them and initialize that context.                                     */
+/*************************************************************************/
+static int get_init_args(ErlNifEnv* env,
+                         struct evp_cipher_ctx *ctx_res,
+                         const ERL_NIF_TERM cipher_arg,
+                         const ERL_NIF_TERM key_arg, 
+                         const ERL_NIF_TERM ivec_arg,
+                         const ERL_NIF_TERM encflg_arg,
+                         const struct cipher_type_t **cipherp,
+                         ERL_NIF_TERM *return_term)
+{
+    int ivec_len;
+    ErlNifBinary key_bin;
+    ErlNifBinary ivec_bin;
+    int encflg;                    
+
+    ctx_res->ctx = NULL; /* For testing if *ctx should be freed after errors */
+
+    /* Fetch the flag telling if we are going to encrypt (=true) or decrypt (=false) */
+    if (encflg_arg == atom_true)
+        encflg = 1;
+    else if (encflg_arg == atom_false)
+        encflg = 0;
+    else if (encflg_arg == atom_undefined)
+        /* For compat funcs in crypto.erl */
+        encflg = -1;
+    else
+        {
+            *return_term = EXCP_BADARG(env, "Bad enc flag");
+            goto err;
+        }
+
+    /* Fetch the key */
+    if (!enif_inspect_iolist_as_binary(env, key_arg, &key_bin))
+        {
+            *return_term = EXCP_BADARG(env, "Bad key");
+            goto err;
+        }
+
+    /* Fetch cipher type */
+    if (!enif_is_atom(env, cipher_arg))
+        {
+            *return_term = EXCP_BADARG(env, "Cipher id is not an atom");
+            goto err;
+        }
+
+    if (!(*cipherp = get_cipher_type(cipher_arg, key_bin.size)))
+        {
+            if (!get_cipher_type_no_key(cipher_arg))
+                *return_term = EXCP_BADARG(env, "Unknown cipher");
+            else
+                *return_term = EXCP_BADARG(env, "Bad key size");
+            goto err;
+        }
+
+    if ((*cipherp)->flags &  AEAD_CIPHER)
+        {
+            *return_term = EXCP_BADARG(env, "Missing arguments for this cipher");
+            goto err;
+        }
+
+
+    if (CIPHER_FORBIDDEN_IN_FIPS(*cipherp))
+        {
+            *return_term = EXCP_NOTSUP(env, "Forbidden in FIPS");
+            goto err;
+        }
+
+    /* Get ivec_len for this cipher (if we found one) */
+#if !defined(HAVE_EVP_AES_CTR)
+    /* This code is for historic OpenSSL where EVP_aes_*_ctr is not defined.... */
+    if ((*cipherp)->cipher.p) {
+        /* Not aes_ctr compatibility code since EVP_*
+           was defined and assigned to (*cipherp)->cipher.p */
+        ivec_len = GET_IV_LEN(*cipherp);
+    } else {
+        /* No EVP_* was found */
+        if ((*cipherp)->flags & AES_CTR_COMPAT)
+            /* Use aes_ctr compatibility code later */
+            ivec_len = 16;
+        else {
+            /* Unsupported crypto */
+            *return_term = EXCP_NOTSUP(env, "Cipher not supported in this libcrypto version");
+            goto err;
+        }
+    }
+#else
+    /* Normal code */
+    if (!((*cipherp)->cipher.p)) {
+        *return_term = EXCP_NOTSUP(env, "Cipher not supported in this libcrypto version");
+        goto err;
+    }
+    ivec_len = GET_IV_LEN(*cipherp);
+#endif
+    
+    /* (*cipherp)->cipher.p != NULL and ivec_len has a value */
+
+    /* Fetch IV */
+    if (ivec_len && (ivec_arg != atom_undefined)) {
+        if (!enif_inspect_iolist_as_binary(env, ivec_arg, &ivec_bin))
+            {
+                *return_term = EXCP_BADARG(env, "Bad iv type");
+                goto err;
+            }
+
+        if (ivec_len != ivec_bin.size)
+            {
+                *return_term = EXCP_BADARG(env, "Bad iv size");
+                goto err;
+            }
+    }
+
+    ctx_res->iv_len = ivec_len;
+    
+#if !defined(HAVE_EVP_AES_CTR)
+    if (!((*cipherp)->cipher.p)
+        && ((*cipherp)->flags & AES_CTR_COMPAT)
+        ) {
+        /* Must use aes_ctr compatibility code */
+        ERL_NIF_TERM ecount_bin;
+        unsigned char *outp;
+        if ((outp = enif_make_new_binary(env, AES_BLOCK_SIZE, &ecount_bin)) == NULL) {
+            *return_term = EXCP_ERROR(env, "Can't allocate ecount_bin");
+            goto err;
+        }
+        memset(outp, 0, AES_BLOCK_SIZE);
+
+        ctx_res->env = enif_alloc_env();
+        if (!ctx_res->env) {
+            *return_term = EXCP_ERROR(env, "Can't allocate env");
+            goto err;
+        }
+        ctx_res->state =
+            enif_make_copy(ctx_res->env,
+                           enif_make_tuple4(env, key_arg, ivec_arg, ecount_bin, enif_make_int(env, 0)));
+        goto success;
+    } else {
+        /* Flag for subsequent calls that no aes_ctr compatibility code should be called */
+        ctx_res->state = atom_undefined;
+        ctx_res->env = NULL;
+    }
+#endif
+
+    /* Initialize the EVP_CIPHER_CTX */
+
+    ctx_res->ctx = EVP_CIPHER_CTX_new();
+    if (! ctx_res->ctx)
+        {
+            *return_term = EXCP_ERROR(env, "Can't allocate context");
+            goto err;
+        }
+
+    if (!EVP_CipherInit_ex(ctx_res->ctx, (*cipherp)->cipher.p, NULL, NULL, NULL, encflg))
+        {
+            *return_term = EXCP_ERROR(env, "Can't initialize context, step 1");
+            goto err;
+        }
+
+    if (!EVP_CIPHER_CTX_set_key_length(ctx_res->ctx, (int)key_bin.size))
+        {
+            *return_term = EXCP_ERROR(env, "Can't initialize context, key_length");
+            goto err;
+        }
+
+#ifdef HAVE_RC2
+    if (EVP_CIPHER_type((*cipherp)->cipher.p) == NID_rc2_cbc) {
+        if (key_bin.size > INT_MAX / 8) {
+            *return_term = EXCP_BADARG(env, "To large rc2_cbc key");
+            goto err;
+        }
+        if (!EVP_CIPHER_CTX_ctrl(ctx_res->ctx, EVP_CTRL_SET_RC2_KEY_BITS, (int)key_bin.size * 8, NULL)) {
+            *return_term = EXCP_ERROR(env, "ctrl rc2_cbc key");
+            goto err;
+        }
+    }
+#endif
+
+    if (ivec_arg == atom_undefined || ivec_len == 0)
+        {
+            if (!EVP_CipherInit_ex(ctx_res->ctx, NULL, NULL, key_bin.data, NULL, -1)) {
+                *return_term = EXCP_ERROR(env, "Can't initialize key");
+                goto err;
+            }
+        }
+    else
+        if (!EVP_CipherInit_ex(ctx_res->ctx, NULL, NULL, key_bin.data, ivec_bin.data, -1))
+            {
+                *return_term = EXCP_ERROR(env, "Can't initialize key or iv");
+                goto err;
+            }
+
+    EVP_CIPHER_CTX_set_padding(ctx_res->ctx, 0);
+
+    *return_term = atom_ok;
+
+#if !defined(HAVE_EVP_AES_CTR)
+ success:
+#endif
+    return 1;
+
+ err:
+    if (ctx_res->ctx) EVP_CIPHER_CTX_free(ctx_res->ctx);
+    return 0;
+}
+
+/*************************************************************************/
+/* Get the arguments for the EVP_CipherUpdate function, and call it.     */
+/*************************************************************************/
+
+static int get_update_args(ErlNifEnv* env,
+                           struct evp_cipher_ctx *ctx_res,
+                           const ERL_NIF_TERM indata_arg,
+                           ERL_NIF_TERM *return_term)
+{
+    ErlNifBinary in_data_bin, out_data_bin;
+    int out_len, block_size;
+
+    if (!enif_inspect_binary(env, indata_arg, &in_data_bin) )
+        {
+            *return_term = EXCP_BADARG(env, "Bad 2:nd arg");
+            goto err;
+        }
+
+    ASSERT(in_data_bin.size <= INT_MAX);
+
+#if !defined(HAVE_EVP_AES_CTR)
+    if (ctx_res->state != atom_undefined) {
+        ERL_NIF_TERM state0, newstate_and_outdata;
+        const ERL_NIF_TERM *tuple_argv;
+        int tuple_argc;
+        
+        state0 = enif_make_copy(env, ctx_res->state);
+        
+        if (enif_get_tuple(env, state0, &tuple_argc, &tuple_argv) && (tuple_argc == 4)) {
+            /* A compatibility state term */
+            /* encrypt and decrypt is performed by calling the same function */
+            newstate_and_outdata = aes_ctr_stream_encrypt_compat(env, state0, indata_arg);
+
+            if (enif_get_tuple(env, newstate_and_outdata, &tuple_argc, &tuple_argv) && (tuple_argc == 2)) {
+                /* newstate_and_outdata = {NewState, OutData} */
+                ctx_res->state = enif_make_copy(ctx_res->env, tuple_argv[0]);
+                /* Return the OutData (from the newstate_and_outdata tuple) only: */
+                *return_term = tuple_argv[1];
+            }
+        }
+    } else
+#endif
+    {
+        block_size = EVP_CIPHER_CTX_block_size(ctx_res->ctx);
+
+        if (!enif_alloc_binary((size_t)in_data_bin.size+block_size, &out_data_bin))
+            {
+                *return_term = EXCP_ERROR(env, "Can't allocate outdata");
+                goto err;
+            }
+
+        if (!EVP_CipherUpdate(ctx_res->ctx, out_data_bin.data, &out_len, in_data_bin.data, in_data_bin.size))
+            {
+                *return_term = EXCP_ERROR(env, "Can't update");
+                goto err;
+            }
+
+        if (!enif_realloc_binary(&out_data_bin, (size_t)out_len))
+            {
+                *return_term = EXCP_ERROR(env, "Can't reallocate");
+                goto err;
+            }
+
+        CONSUME_REDS(env, in_data_bin);
+        /* return the result text as a binary: */
+        *return_term = enif_make_binary(env, &out_data_bin);
+    }
+
+    /* success: */
+    return 1;
+
+ err:
+    return 0;
+}
+
+/*************************************************************************/
+/* Initialize the state for (de/en)cryption                              */
+/*************************************************************************/
+
+ERL_NIF_TERM ng_crypto_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Cipher, Key, IVec, Encrypt)  % if no IV for the Cipher, set IVec = <<>>
+ */
+    struct evp_cipher_ctx *ctx_res = NULL;
+    const struct cipher_type_t *cipherp;
+    ERL_NIF_TERM ret;
+    int encflg;
+
+    if (enif_is_atom(env, argv[0])) {
+        if ((ctx_res = enif_alloc_resource(evp_cipher_ctx_rtype, sizeof(struct evp_cipher_ctx))) == NULL)
+            return EXCP_ERROR(env, "Can't allocate resource");
+
+        if (get_init_args(env, ctx_res, argv[0], argv[1], argv[2], argv[argc-1],
+                           &cipherp, &ret))
+            ret = enif_make_resource(env, ctx_res);
+        /* else error msg in ret */
+
+        if(ctx_res) enif_release_resource(ctx_res);
+
+    } else if (enif_get_resource(env, argv[0], (ErlNifResourceType*)evp_cipher_ctx_rtype, (void**)&ctx_res)) {
+        /* Fetch the flag telling if we are going to encrypt (=true) or decrypt (=false) */
+        if (argv[3] == atom_true)
+            encflg = 1;
+        else if (argv[3] == atom_false)
+            encflg = 0;
+        else {
+            ret = EXCP_BADARG(env, "Bad enc flag");
+            goto ret;
+        }
+        if (ctx_res->ctx) {
+            /* It is *not* a ctx_res for the compatibility handling of non-EVP aes_ctr */
+            if (!EVP_CipherInit_ex(ctx_res->ctx, NULL, NULL, NULL, NULL, encflg)) {
+                ret = EXCP_ERROR(env, "Can't initialize encflag");
+                goto ret;
+            }
+        }
+        ret = argv[0];
+    } else {
+        ret = EXCP_BADARG(env, "Bad 1:st arg");
+        goto ret;
+    }
+
+ ret:
+    return ret;
+}
+
+
+/*************************************************************************/
+/* Encrypt/decrypt                                                       */
+/*************************************************************************/
+
+#if !defined(HAVE_EVP_CIPHER_CTX_COPY)
+/*
+  The EVP_CIPHER_CTX_copy is not available in older cryptolibs although
+  the function is needed.
+  Instead of implement it in-place, we have a copy here as a compatibility
+  function
+*/
+
+int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in);
+
+int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in)
+{
+    if ((in == NULL) || (in->cipher == NULL))
+        {
+            return 0;
+        }
+#ifdef HAS_ENGINE_SUPPORT
+    /* Make sure it's safe to copy a cipher context using an ENGINE */
+    if (in->engine && !ENGINE_init(in->engine))
+        return 0;
+#endif
+
+    EVP_CIPHER_CTX_cleanup(out);
+    memcpy(out,in,sizeof *out);
+
+    if (in->cipher_data && in->cipher->ctx_size)
+        {
+            out->cipher_data=OPENSSL_malloc(in->cipher->ctx_size);
+            if (!out->cipher_data)
+                return 0;
+            memcpy(out->cipher_data,in->cipher_data,in->cipher->ctx_size);
+        }
+
+#if defined(EVP_CIPH_CUSTOM_COPY) && defined(EVP_CTRL_COPY)
+    if (in->cipher->flags & EVP_CIPH_CUSTOM_COPY)
+        return in->cipher->ctrl((EVP_CIPHER_CTX *)in, EVP_CTRL_COPY, 0, out);
+#endif
+    return 1;
+}
+/****** End of compatibility function ******/
+#endif
+
+
+ERL_NIF_TERM ng_crypto_update(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Context, Data [, IV]) */
+    struct evp_cipher_ctx *ctx_res;
+    struct evp_cipher_ctx ctx_res_copy;
+    ERL_NIF_TERM ret;
+
+    ctx_res_copy.ctx = NULL;
+
+    if (!enif_get_resource(env, argv[0], (ErlNifResourceType*)evp_cipher_ctx_rtype, (void**)&ctx_res))
+        return EXCP_BADARG(env, "Bad 1:st arg");
+    
+    if (argc == 3) {
+        ErlNifBinary ivec_bin;
+
+        memcpy(&ctx_res_copy, ctx_res, sizeof ctx_res_copy);
+#if !defined(HAVE_EVP_AES_CTR)
+        if (ctx_res_copy.state == atom_undefined)
+            /* Not going to use aes_ctr compat functions */
+#endif
+            {
+                ctx_res_copy.ctx = EVP_CIPHER_CTX_new();
+
+                if (!EVP_CIPHER_CTX_copy(ctx_res_copy.ctx, ctx_res->ctx)) {
+                    ret = EXCP_ERROR(env, "Can't copy ctx_res");
+                    goto err;
+                }
+            }
+
+        ctx_res = &ctx_res_copy;
+
+        if (!enif_inspect_iolist_as_binary(env, argv[2], &ivec_bin))
+            {
+                ret = EXCP_BADARG(env, "Bad iv type");
+                goto err;
+            }
+
+        if (ctx_res_copy.iv_len != ivec_bin.size)
+            {
+                ret = EXCP_BADARG(env, "Bad iv size");
+                goto err;
+            }
+        
+#if !defined(HAVE_EVP_AES_CTR)
+        if ((ctx_res_copy.state != atom_undefined) ) {
+            /* replace the iv in state with argv[2] */
+            ERL_NIF_TERM state0;
+            const ERL_NIF_TERM *tuple_argv;
+            int tuple_argc;
+            state0 = enif_make_copy(env, ctx_res_copy.state);
+            if (enif_get_tuple(env, state0, &tuple_argc, &tuple_argv) && (tuple_argc == 4)) {
+                /* A compatibility state term */
+                ctx_res_copy.state = enif_make_tuple4(env, tuple_argv[0], argv[2], tuple_argv[2], tuple_argv[3]);
+            }
+        } else
+#endif
+            if (!EVP_CipherInit_ex(ctx_res_copy.ctx, NULL, NULL, NULL, ivec_bin.data, -1))
+                {
+                    ret = EXCP_ERROR(env, "Can't set iv");
+                    goto err;
+                }
+        
+        get_update_args(env, &ctx_res_copy, argv[1], &ret);
+    } else
+        get_update_args(env, ctx_res, argv[1], &ret);
+
+ err:
+    if (ctx_res_copy.ctx)
+        EVP_CIPHER_CTX_free(ctx_res_copy.ctx);
+
+    return ret; /* Both success and error */
+}
+
+
+ERL_NIF_TERM ng_crypto_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Context, Data [, IV]) */
+    ErlNifBinary   data_bin;
+
+    ASSERT(argc <= 3);
+
+    if (!enif_inspect_binary(env, argv[1], &data_bin))
+        return EXCP_BADARG(env, "expected binary as data");
+
+    if (data_bin.size > INT_MAX)
+        return EXCP_BADARG(env, "to long data");
+
+    /* Run long jobs on a dirty scheduler to not block the current emulator thread */
+    if (data_bin.size > MAX_BYTES_TO_NIF) {
+        return enif_schedule_nif(env, "ng_crypto_update",
+                                 ERL_NIF_DIRTY_JOB_CPU_BOUND,
+                                 ng_crypto_update, argc, argv);
+    }
+
+    return ng_crypto_update(env, argc, argv);
+}
+
+/*************************************************************************/
+/* One shot                                                              */
+/*************************************************************************/
+
+ERL_NIF_TERM ng_crypto_one_time(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Cipher, Key, IVec, Data, Encrypt) */
+    struct evp_cipher_ctx ctx_res;
+    const struct cipher_type_t *cipherp;
+    ERL_NIF_TERM ret;
+
+    ctx_res.ctx = NULL;
+#if !defined(HAVE_EVP_AES_CTR)
+    ctx_res.env = NULL;
+#endif
+
+    if (!get_init_args(env, &ctx_res, argv[0], argv[1], argv[2], argv[4], &cipherp, &ret))
+        goto ret;
+
+    get_update_args(env, &ctx_res, argv[3], &ret);
+
+ ret:
+    if (ctx_res.ctx)
+        EVP_CIPHER_CTX_free(ctx_res.ctx);
+
+#if !defined(HAVE_EVP_AES_CTR)
+    if (ctx_res.env)
+         enif_free_env(ctx_res.env);
+#endif
+
+    return ret;
+}
+
+
+ERL_NIF_TERM ng_crypto_one_time_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Cipher, Key, IVec, Data, Encrypt)  % if no IV for the Cipher, set IVec = <<>>
+  */
+    ErlNifBinary   data_bin;
+
+    ASSERT(argc == 5);
+
+    if (!enif_inspect_binary(env, argv[3], &data_bin))
+        return EXCP_BADARG(env, "expected binary as data");
+
+    if (data_bin.size > INT_MAX)
+        return EXCP_BADARG(env, "to long data");
+
+    /* Run long jobs on a dirty scheduler to not block the current emulator thread */
+    if (data_bin.size > MAX_BYTES_TO_NIF) {
+        return enif_schedule_nif(env, "ng_crypto_one_time",
+                                 ERL_NIF_DIRTY_JOB_CPU_BOUND,
+                                 ng_crypto_one_time, argc, argv);
+    }
+
+    return ng_crypto_one_time(env, argc, argv);
+}
diff --git a/lib/crypto/c_src/api_ng.h b/lib/crypto/c_src/api_ng.h
new file mode 100644
index 0000000000..aaf67524ae
--- /dev/null
+++ b/lib/crypto/c_src/api_ng.h
@@ -0,0 +1,30 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_API_NG_H__
+#define E_API_NG_H__ 1
+
+#include "common.h"
+
+ERL_NIF_TERM ng_crypto_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM ng_crypto_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM ng_crypto_one_time_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+#endif /* E_AES_H__ */
diff --git a/lib/crypto/c_src/atoms.c b/lib/crypto/c_src/atoms.c
new file mode 100644
index 0000000000..bbeb329fa2
--- /dev/null
+++ b/lib/crypto/c_src/atoms.c
@@ -0,0 +1,261 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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 "atoms.h"
+
+ERL_NIF_TERM atom_true;
+ERL_NIF_TERM atom_false;
+ERL_NIF_TERM atom_sha;
+ERL_NIF_TERM atom_error;
+ERL_NIF_TERM atom_rsa_pkcs1_padding;
+ERL_NIF_TERM atom_rsa_pkcs1_oaep_padding;
+ERL_NIF_TERM atom_rsa_no_padding;
+ERL_NIF_TERM atom_signature_md;
+ERL_NIF_TERM atom_undefined;
+
+ERL_NIF_TERM atom_hmac;
+ERL_NIF_TERM atom_cmac;
+ERL_NIF_TERM atom_poly1305;
+
+ERL_NIF_TERM atom_ok;
+ERL_NIF_TERM atom_none;
+ERL_NIF_TERM atom_notsup;
+ERL_NIF_TERM atom_badarg;
+ERL_NIF_TERM atom_digest;
+#ifdef FIPS_SUPPORT
+ERL_NIF_TERM atom_enabled;
+ERL_NIF_TERM atom_not_enabled;
+#else
+ERL_NIF_TERM atom_not_supported;
+#endif
+
+ERL_NIF_TERM atom_type;
+ERL_NIF_TERM atom_size;
+ERL_NIF_TERM atom_block_size;
+ERL_NIF_TERM atom_key_length;
+ERL_NIF_TERM atom_iv_length;
+ERL_NIF_TERM atom_mode;
+ERL_NIF_TERM atom_ecb_mode;
+ERL_NIF_TERM atom_cbc_mode;
+ERL_NIF_TERM atom_cfb_mode;
+ERL_NIF_TERM atom_ofb_mode;
+ERL_NIF_TERM atom_ctr_mode;
+ERL_NIF_TERM atom_gcm_mode;
+ERL_NIF_TERM atom_ccm_mode;
+ERL_NIF_TERM atom_xts_mode;
+ERL_NIF_TERM atom_wrap_mode;
+ERL_NIF_TERM atom_ocb_mode;
+ERL_NIF_TERM atom_stream_cipher;
+
+#if defined(HAVE_EC)
+ERL_NIF_TERM atom_prime_field;
+ERL_NIF_TERM atom_characteristic_two_field;
+ERL_NIF_TERM atom_tpbasis;
+ERL_NIF_TERM atom_ppbasis;
+ERL_NIF_TERM atom_onbasis;
+#endif
+
+ERL_NIF_TERM atom_aes_cfb8;
+ERL_NIF_TERM atom_aes_cfb128;
+ERL_NIF_TERM atom_aes_ige256;
+#ifdef HAVE_GCM
+ERL_NIF_TERM atom_aes_gcm;
+#endif
+#ifdef HAVE_CCM
+ERL_NIF_TERM atom_aes_ccm;
+#endif
+
+ERL_NIF_TERM atom_rsa;
+ERL_NIF_TERM atom_dss;
+ERL_NIF_TERM atom_ecdsa;
+
+#ifdef HAVE_ED_CURVE_DH
+ERL_NIF_TERM atom_x25519;
+ERL_NIF_TERM atom_x448;
+#endif
+
+ERL_NIF_TERM atom_eddsa;
+#ifdef HAVE_EDDSA
+ERL_NIF_TERM atom_ed25519;
+ERL_NIF_TERM atom_ed448;
+#endif
+
+ERL_NIF_TERM atom_rsa_mgf1_md;
+ERL_NIF_TERM atom_rsa_oaep_label;
+ERL_NIF_TERM atom_rsa_oaep_md;
+ERL_NIF_TERM atom_rsa_pad; /* backwards compatibility */
+ERL_NIF_TERM atom_rsa_padding;
+ERL_NIF_TERM atom_rsa_pkcs1_pss_padding;
+#ifdef HAVE_RSA_SSLV23_PADDING
+ERL_NIF_TERM atom_rsa_sslv23_padding;
+#endif
+ERL_NIF_TERM atom_rsa_x931_padding;
+ERL_NIF_TERM atom_rsa_pss_saltlen;
+
+#ifdef HAVE_BLAKE2
+ERL_NIF_TERM atom_blake2b;
+ERL_NIF_TERM atom_blake2s;
+#endif
+
+#ifdef HAS_ENGINE_SUPPORT
+
+ERL_NIF_TERM atom_engine_method_rsa;
+ERL_NIF_TERM atom_engine_method_dsa;
+ERL_NIF_TERM atom_engine_method_dh;
+ERL_NIF_TERM atom_engine_method_rand;
+ERL_NIF_TERM atom_engine_method_ecdh;
+ERL_NIF_TERM atom_engine_method_ecdsa;
+ERL_NIF_TERM atom_engine_method_ciphers;
+ERL_NIF_TERM atom_engine_method_digests;
+ERL_NIF_TERM atom_engine_method_store;
+ERL_NIF_TERM atom_engine_method_pkey_meths;
+ERL_NIF_TERM atom_engine_method_pkey_asn1_meths;
+ERL_NIF_TERM atom_engine_method_ec;
+
+ERL_NIF_TERM atom_engine;
+ERL_NIF_TERM atom_key_id;
+ERL_NIF_TERM atom_password;
+#endif
+
+int init_atoms(ErlNifEnv *env, const ERL_NIF_TERM fips_mode, const ERL_NIF_TERM load_info) {
+    atom_true  = enif_make_atom(env,"true");
+    atom_false = enif_make_atom(env,"false");
+    /* Enter FIPS mode */
+    if (fips_mode == atom_true) {
+#ifdef FIPS_SUPPORT
+        if (!FIPS_mode_set(1)) {
+#else
+        {
+#endif
+            PRINTF_ERR0("CRYPTO: Could not setup FIPS mode");
+            return 0;
+        }
+    } else if (fips_mode != atom_false) {
+        PRINTF_ERR1("CRYPTO: Invalid load_info '%T'", load_info);
+        return 0;
+    }
+
+    atom_sha = enif_make_atom(env,"sha");
+    atom_error = enif_make_atom(env,"error");
+    atom_rsa_pkcs1_padding = enif_make_atom(env,"rsa_pkcs1_padding");
+    atom_rsa_pkcs1_oaep_padding = enif_make_atom(env,"rsa_pkcs1_oaep_padding");
+    atom_rsa_no_padding = enif_make_atom(env,"rsa_no_padding");
+    atom_signature_md = enif_make_atom(env,"signature_md");
+    atom_undefined = enif_make_atom(env,"undefined");
+
+    atom_hmac = enif_make_atom(env,"hmac");
+    atom_cmac = enif_make_atom(env,"cmac");
+    atom_poly1305 = enif_make_atom(env,"poly1305");
+
+    atom_ok = enif_make_atom(env,"ok");
+    atom_none = enif_make_atom(env,"none");
+    atom_notsup = enif_make_atom(env,"notsup");
+    atom_badarg = enif_make_atom(env,"badarg");
+    atom_digest = enif_make_atom(env,"digest");
+
+    atom_type = enif_make_atom(env,"type");
+    atom_size = enif_make_atom(env,"size");
+    atom_block_size = enif_make_atom(env,"block_size");
+    atom_key_length = enif_make_atom(env,"key_length");
+    atom_iv_length = enif_make_atom(env,"iv_length");
+    atom_mode = enif_make_atom(env,"mode");
+    atom_ecb_mode = enif_make_atom(env,"ecb_mode");
+    atom_cbc_mode = enif_make_atom(env,"cbc_mode");
+    atom_cfb_mode = enif_make_atom(env,"cfb_mode");
+    atom_ofb_mode = enif_make_atom(env,"ofb_mode");
+    atom_ctr_mode = enif_make_atom(env,"ctr_mode");
+    atom_gcm_mode = enif_make_atom(env,"gcm_mode");
+    atom_ccm_mode = enif_make_atom(env,"ccm_mode");
+    atom_xts_mode = enif_make_atom(env,"xts_mode");
+    atom_wrap_mode = enif_make_atom(env,"wrap_mode");
+    atom_ocb_mode = enif_make_atom(env,"ocb_mode");
+    atom_stream_cipher = enif_make_atom(env,"stream_cipher");
+
+#if defined(HAVE_EC)
+    atom_prime_field = enif_make_atom(env,"prime_field");
+    atom_characteristic_two_field = enif_make_atom(env,"characteristic_two_field");
+    atom_tpbasis = enif_make_atom(env,"tpbasis");
+    atom_ppbasis = enif_make_atom(env,"ppbasis");
+    atom_onbasis = enif_make_atom(env,"onbasis");
+#endif
+
+    atom_aes_cfb8 = enif_make_atom(env, "aes_cfb8");
+    atom_aes_cfb128 = enif_make_atom(env, "aes_cfb128");
+    atom_aes_ige256 = enif_make_atom(env, "aes_ige256");
+#ifdef HAVE_GCM
+    atom_aes_gcm = enif_make_atom(env, "aes_gcm");
+#endif
+#ifdef HAVE_CCM
+    atom_aes_ccm = enif_make_atom(env, "aes_ccm");
+#endif
+
+#ifdef FIPS_SUPPORT
+    atom_enabled = enif_make_atom(env,"enabled");
+    atom_not_enabled = enif_make_atom(env,"not_enabled");
+#else
+    atom_not_supported = enif_make_atom(env,"not_supported");
+#endif
+    atom_rsa = enif_make_atom(env,"rsa");
+    atom_dss = enif_make_atom(env,"dss");
+    atom_ecdsa = enif_make_atom(env,"ecdsa");
+
+#ifdef HAVE_ED_CURVE_DH
+    atom_x25519 = enif_make_atom(env,"x25519");
+    atom_x448 = enif_make_atom(env,"x448");
+#endif
+    atom_eddsa = enif_make_atom(env,"eddsa");
+#ifdef HAVE_EDDSA
+    atom_ed25519 = enif_make_atom(env,"ed25519");
+    atom_ed448 = enif_make_atom(env,"ed448");
+#endif
+    atom_rsa_mgf1_md = enif_make_atom(env,"rsa_mgf1_md");
+    atom_rsa_oaep_label = enif_make_atom(env,"rsa_oaep_label");
+    atom_rsa_oaep_md = enif_make_atom(env,"rsa_oaep_md");
+    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");
+
+#ifdef HAS_ENGINE_SUPPORT
+
+    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
+
+    return 1;
+}
diff --git a/lib/crypto/c_src/atoms.h b/lib/crypto/c_src/atoms.h
new file mode 100644
index 0000000000..0e2f1a0022
--- /dev/null
+++ b/lib/crypto/c_src/atoms.h
@@ -0,0 +1,138 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_ATOMS_H__
+#define E_ATOMS_H__ 1
+
+#include <erl_nif.h>
+#include "openssl_config.h"
+
+extern ERL_NIF_TERM atom_true;
+extern ERL_NIF_TERM atom_false;
+extern ERL_NIF_TERM atom_sha;
+extern ERL_NIF_TERM atom_error;
+extern ERL_NIF_TERM atom_rsa_pkcs1_padding;
+extern ERL_NIF_TERM atom_rsa_pkcs1_oaep_padding;
+extern ERL_NIF_TERM atom_rsa_no_padding;
+extern ERL_NIF_TERM atom_signature_md;
+extern ERL_NIF_TERM atom_undefined;
+
+extern ERL_NIF_TERM atom_hmac;
+extern ERL_NIF_TERM atom_cmac;
+extern ERL_NIF_TERM atom_poly1305;
+
+extern ERL_NIF_TERM atom_ok;
+extern ERL_NIF_TERM atom_none;
+extern ERL_NIF_TERM atom_notsup;
+extern ERL_NIF_TERM atom_badarg;
+extern ERL_NIF_TERM atom_digest;
+#ifdef FIPS_SUPPORT
+extern ERL_NIF_TERM atom_enabled;
+extern ERL_NIF_TERM atom_not_enabled;
+#else
+extern ERL_NIF_TERM atom_not_supported;
+#endif
+
+extern ERL_NIF_TERM atom_type;
+extern ERL_NIF_TERM atom_size;
+extern ERL_NIF_TERM atom_block_size;
+extern ERL_NIF_TERM atom_key_length;
+extern ERL_NIF_TERM atom_iv_length;
+extern ERL_NIF_TERM atom_mode;
+extern ERL_NIF_TERM atom_ecb_mode;
+extern ERL_NIF_TERM atom_cbc_mode;
+extern ERL_NIF_TERM atom_cfb_mode;
+extern ERL_NIF_TERM atom_ofb_mode;
+extern ERL_NIF_TERM atom_ctr_mode;
+extern ERL_NIF_TERM atom_gcm_mode;
+extern ERL_NIF_TERM atom_ccm_mode;
+extern ERL_NIF_TERM atom_xts_mode;
+extern ERL_NIF_TERM atom_wrap_mode;
+extern ERL_NIF_TERM atom_ocb_mode;
+extern ERL_NIF_TERM atom_stream_cipher;
+
+#if defined(HAVE_EC)
+extern ERL_NIF_TERM atom_prime_field;
+extern ERL_NIF_TERM atom_characteristic_two_field;
+extern ERL_NIF_TERM atom_tpbasis;
+extern ERL_NIF_TERM atom_ppbasis;
+extern ERL_NIF_TERM atom_onbasis;
+#endif
+
+extern ERL_NIF_TERM atom_aes_cfb8;
+extern ERL_NIF_TERM atom_aes_cfb128;
+extern ERL_NIF_TERM atom_aes_ige256;
+#ifdef HAVE_GCM
+extern ERL_NIF_TERM atom_aes_gcm;
+#endif
+#ifdef HAVE_CCM
+extern ERL_NIF_TERM atom_aes_ccm;
+#endif
+
+extern ERL_NIF_TERM atom_rsa;
+extern ERL_NIF_TERM atom_dss;
+extern ERL_NIF_TERM atom_ecdsa;
+
+#ifdef HAVE_ED_CURVE_DH
+extern ERL_NIF_TERM atom_x25519;
+extern ERL_NIF_TERM atom_x448;
+#endif
+
+extern ERL_NIF_TERM atom_eddsa;
+#ifdef HAVE_EDDSA
+extern ERL_NIF_TERM atom_ed25519;
+extern ERL_NIF_TERM atom_ed448;
+#endif
+
+extern ERL_NIF_TERM atom_rsa_mgf1_md;
+extern ERL_NIF_TERM atom_rsa_oaep_label;
+extern ERL_NIF_TERM atom_rsa_oaep_md;
+extern ERL_NIF_TERM atom_rsa_pad; /* backwards compatibility */
+extern ERL_NIF_TERM atom_rsa_padding;
+extern ERL_NIF_TERM atom_rsa_pkcs1_pss_padding;
+#ifdef HAVE_RSA_SSLV23_PADDING
+extern ERL_NIF_TERM atom_rsa_sslv23_padding;
+#endif
+extern ERL_NIF_TERM atom_rsa_x931_padding;
+extern ERL_NIF_TERM atom_rsa_pss_saltlen;
+
+#ifdef HAS_ENGINE_SUPPORT
+
+extern ERL_NIF_TERM atom_engine_method_rsa;
+extern ERL_NIF_TERM atom_engine_method_dsa;
+extern ERL_NIF_TERM atom_engine_method_dh;
+extern ERL_NIF_TERM atom_engine_method_rand;
+extern ERL_NIF_TERM atom_engine_method_ecdh;
+extern ERL_NIF_TERM atom_engine_method_ecdsa;
+extern ERL_NIF_TERM atom_engine_method_ciphers;
+extern ERL_NIF_TERM atom_engine_method_digests;
+extern ERL_NIF_TERM atom_engine_method_store;
+extern ERL_NIF_TERM atom_engine_method_pkey_meths;
+extern ERL_NIF_TERM atom_engine_method_pkey_asn1_meths;
+extern ERL_NIF_TERM atom_engine_method_ec;
+
+extern ERL_NIF_TERM atom_engine;
+extern ERL_NIF_TERM atom_key_id;
+extern ERL_NIF_TERM atom_password;
+#endif
+
+int init_atoms(ErlNifEnv *env, const ERL_NIF_TERM fips_mode, const ERL_NIF_TERM load_info);
+
+#endif /* E_ATOMS_H__ */
diff --git a/lib/crypto/c_src/bn.c b/lib/crypto/c_src/bn.c
new file mode 100644
index 0000000000..6021d56db6
--- /dev/null
+++ b/lib/crypto/c_src/bn.c
@@ -0,0 +1,179 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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 "bn.h"
+
+
+int get_bn_from_mpint(ErlNifEnv* env, ERL_NIF_TERM term, BIGNUM** bnp)
+{
+    BIGNUM *ret;
+    ErlNifBinary bin;
+    int sz;
+
+    if (!enif_inspect_binary(env, term, &bin))
+        goto err;
+    if (bin.size > INT_MAX - 4)
+        goto err;
+
+    if (bin.size < 4)
+        goto err;
+    sz = (int)bin.size - 4;
+    if (get_int32(bin.data) != sz)
+        goto err;
+
+    if ((ret = BN_bin2bn(bin.data+4, sz, NULL)) == NULL)
+        goto err;
+
+    *bnp = ret;
+    return 1;
+
+ err:
+    return 0;
+}
+
+int get_bn_from_bin(ErlNifEnv* env, ERL_NIF_TERM term, BIGNUM** bnp)
+{
+    BIGNUM *ret;
+    ErlNifBinary bin;
+
+    if (!enif_inspect_binary(env, term, &bin))
+        goto err;
+    if (bin.size > INT_MAX)
+        goto err;
+
+    if ((ret = BN_bin2bn(bin.data, (int)bin.size, NULL)) == NULL)
+        goto err;
+
+    *bnp = ret;
+    return 1;
+
+ err:
+    return 0;
+}
+
+ERL_NIF_TERM bin_from_bn(ErlNifEnv* env, const BIGNUM *bn)
+{
+    int bn_len;
+    unsigned char *bin_ptr;
+    ERL_NIF_TERM term;
+
+    /* Copy the bignum into an erlang binary. */
+    if ((bn_len = BN_num_bytes(bn)) < 0)
+        goto err;
+    if ((bin_ptr = enif_make_new_binary(env, (size_t)bn_len, &term)) == NULL)
+        goto err;
+
+    if (BN_bn2bin(bn, bin_ptr) < 0)
+        goto err;
+
+    return term;
+
+ err:
+    return atom_error;
+}
+
+ERL_NIF_TERM mod_exp_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Base,Exponent,Modulo,bin_hdr) */
+    BIGNUM *bn_base = NULL, *bn_exponent = NULL, *bn_modulo = NULL, *bn_result = NULL;
+    BN_CTX *bn_ctx = NULL;
+    unsigned char* ptr;
+    int dlen;
+    unsigned bin_hdr; /* return type: 0=plain binary, 4: mpint */
+    unsigned extra_byte;
+    ERL_NIF_TERM ret;
+
+    if (!get_bn_from_bin(env, argv[0], &bn_base))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, argv[1], &bn_exponent))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, argv[2], &bn_modulo))
+        goto bad_arg;
+    if (!enif_get_uint(env, argv[3], &bin_hdr))
+        goto bad_arg;
+    if (bin_hdr != 0 && bin_hdr != 4)
+        goto bad_arg;
+
+    if ((bn_result = BN_new()) == NULL)
+        goto err;
+    if ((bn_ctx = BN_CTX_new()) == NULL)
+        goto err;
+
+    if (!BN_mod_exp(bn_result, bn_base, bn_exponent, bn_modulo, bn_ctx))
+        goto err;
+
+    dlen = BN_num_bytes(bn_result);
+    if (dlen < 0 || dlen > INT_MAX / 8)
+        goto bad_arg;
+    extra_byte = bin_hdr && BN_is_bit_set(bn_result, dlen * 8 - 1);
+
+    if ((ptr = enif_make_new_binary(env, bin_hdr + extra_byte + (unsigned int)dlen, &ret)) == NULL)
+        goto err;
+
+    if (bin_hdr) {
+        put_uint32(ptr, extra_byte + (unsigned int)dlen);
+        ptr[4] = 0; /* extra zeroed byte to ensure a positive mpint */
+        ptr += bin_hdr + extra_byte;
+    }
+
+    BN_bn2bin(bn_result, ptr);
+    goto done;
+
+ bad_arg:
+ err:
+    ret = enif_make_badarg(env);
+
+ done:
+    if (bn_base)
+        BN_free(bn_base);
+    if (bn_exponent)
+        BN_free(bn_exponent);
+    if (bn_modulo)
+        BN_free(bn_modulo);
+    if (bn_result)
+        BN_free(bn_result);
+    if (bn_ctx)
+        BN_CTX_free(bn_ctx);
+    return ret;
+}
+
+#ifdef HAVE_EC
+ERL_NIF_TERM bn2term(ErlNifEnv* env, const BIGNUM *bn)
+{
+    int dlen;
+    unsigned char* ptr;
+    ERL_NIF_TERM ret;
+
+    if (bn == NULL)
+        return atom_undefined;
+
+    dlen = BN_num_bytes(bn);
+    if (dlen < 0)
+        goto err;
+    if ((ptr = enif_make_new_binary(env, (size_t)dlen, &ret)) == NULL)
+        goto err;
+
+    BN_bn2bin(bn, ptr);
+
+    return ret;
+
+ err:
+    return enif_make_badarg(env);
+}
+#endif
diff --git a/lib/crypto/c_src/bn.h b/lib/crypto/c_src/bn.h
new file mode 100644
index 0000000000..332b06e79d
--- /dev/null
+++ b/lib/crypto/c_src/bn.h
@@ -0,0 +1,36 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_BN_H__
+#define E_BN_H__ 1
+
+#include "common.h"
+
+ERL_NIF_TERM bin_from_bn(ErlNifEnv* env, const BIGNUM *bn);
+ERL_NIF_TERM mod_exp_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+#ifdef HAVE_EC
+ERL_NIF_TERM bn2term(ErlNifEnv* env, const BIGNUM *bn);
+#endif
+
+int get_bn_from_mpint(ErlNifEnv* env, ERL_NIF_TERM term, BIGNUM** bnp);
+int get_bn_from_bin(ErlNifEnv* env, ERL_NIF_TERM term, BIGNUM** bnp);
+
+#endif /* E_BN_H__ */
diff --git a/lib/crypto/c_src/check_erlang.cocci b/lib/crypto/c_src/check_erlang.cocci
new file mode 100644
index 0000000000..b2a981f2ac
--- /dev/null
+++ b/lib/crypto/c_src/check_erlang.cocci
@@ -0,0 +1,196 @@
+// %CopyrightBegin%
+//
+// Copyright Doug Hogan 2019. 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%
+
+// Coccinelle script to help verify Erlang calls.
+// http://coccinelle.lip6.fr
+// https://github.com/coccinelle/coccinelle
+//
+// These work with the Erlang code because it has a rigid coding pattern.
+// $ spatch.opt --all-includes -sp_file check_erlang.cocci -dir .
+
+// Make sure resources are cleaned up properly in all paths.
+// Need 'strict' so it's also checked in error handling paths.
+@enif_alloc_resource@
+type T;
+identifier CTX, L;
+identifier virtual.enif_alloc_resource, virtual.enif_release_resource;
+position p, pr;
+@@
+
+ T *CTX = NULL;
+
+ ...
+ if ((CTX = enif_alloc_resource(...)@p) == NULL)
+   goto L;
+
+ ... when strict, forall
+ if (CTX)
+   enif_release_resource(CTX)@pr;
+
+
+// After calling enif_alloc_binary(), you must either release it with
+// enif_release_binary() or transfer ownership to Erlang via enif_make_binary().
+@enif_alloc_binary@
+expression SZ;
+identifier BIN, RET, ENV, X, L;
+identifier TUPLE =~ "^enif_make_tuple[0-9]+$";
+identifier virtual.enif_alloc_binary, virtual.enif_make_binary;
+identifier virtual.enif_release_binary;
+position pa, pm, pr;
+@@
+
+// This construct is used in engine.c
+(
+  if (!enif_alloc_binary(SZ, &BIN)@pa)
+      goto L;
+
+  ... when strict, forall
+  return
+(
+  enif_make_binary(ENV, &BIN)@pm
+|
+  TUPLE(..., enif_make_binary(ENV, &BIN)@pm)@pm
+);
+
+|
+// This is the typical way we allocate and use binaries.
+  int X = 0;
+
+  ...
+  if (!enif_alloc_binary(SZ, &BIN)@pa)
+    goto L;
+  X = 1;
+
+  ... when strict, forall
+(
+  RET = enif_make_binary(ENV, &BIN)@pm;
+  X = 0;
+|
+  if (X)
+    enif_release_binary(&BIN)@pr;
+|
+  return enif_make_binary(ENV, &BIN)@pm;
+)
+)
+
+// TODO: These don't have single checks that handle all cases.
+//
+// enif_consume_timeslice      returns 1 if exhausted or else 0
+// enif_has_pending_exception  returns true if exception pending
+
+@erlang_check_void@
+identifier FUNCVOID =~ "^(enif_mutex_destroy|enif_mutex_lock|enif_mutex_unlock|enif_rwlock_destroy|enif_rwlock_rlock|enif_rwlock_runlock|enif_rwlock_rwlock|enif_rwlock_rwunlock|enif_system_info)$";
+position p;
+@@
+
+  FUNCVOID(...)@p;
+
+
+@erlang_check_null@
+expression X;
+identifier L;
+identifier FUNCNULL =~ "^(enif_alloc|enif_alloc_resource|enif_dlopen|enif_dlsym|enif_make_new_binary|enif_mutex_create|enif_open_resource_type|enif_realloc|enif_rwlock_create)$";
+position p;
+@@
+
+(
+  if ((X = FUNCNULL(...)@p) == NULL)
+      goto L;
+|
+  X = FUNCNULL(...)@p;
+  if (X == NULL)
+      goto L;
+|
+  return FUNCNULL(...)@p;
+)
+
+
+@erlang_check_not@
+identifier L;
+identifier FUNCNOT =~ "^(enif_alloc_binary|enif_get_int|enif_get_list_cell|enif_get_list_length|enif_get_long|enif_get_map_value|enif_get_resource|enif_get_tuple|enif_get_uint|enif_get_ulong|enif_inspect_binary|enif_inspect_iolist_as_binary|enif_is_atom|enif_is_binary|enif_is_current_process_alive|enif_is_empty_list|enif_is_list|enif_is_map|enif_is_tuple|enif_realloc_binary)$";
+position p;
+@@
+
+(
+  if (!FUNCNOT(...)@p)
+      goto L;
+|
+  return FUNCNOT(...)@p;
+)
+
+
+@erlang_check_null_free@
+expression X;
+identifier FUNCFREE =~ "^(enif_free|enif_free_env|enif_free_iovec|enif_release_binary|enif_release_resource)$";
+position p;
+@@
+
+  if (
+(
+ X
+|
+ X != NULL
+)
+  )
+    FUNCFREE(X)@p;
+
+
+@erlang_check_new@
+expression RET;
+identifier FUNCNEW =~ "^(enif_make_atom|enif_make_badarg|enif_make_binary|enif_make_int|enif_make_list|enif_make_list_from_array|enif_make_resource|enif_make_tuple|enif_raise_exception|enif_schedule_nif|enif_thread_self)$";
+position p;
+@@
+
+(
+  RET = FUNCNEW(...)@p;
+|
+  return FUNCNEW(...)@p;
+)
+
+
+// Flag any calls that aren't part of the above pattern.
+@enif_alloc_not_free@
+
+identifier FUNCVOID =~ "^(enif_mutex_destroy|enif_mutex_lock|enif_mutex_unlock|enif_rwlock_destroy|enif_rwlock_rlock|enif_rwlock_runlock|enif_rwlock_rwlock|enif_rwlock_rwunlock|enif_system_info)$";
+position pvoid != {erlang_check_void.p,enif_alloc_binary.pr};
+
+identifier FUNCNULL =~ "^(enif_alloc|enif_alloc_resource|enif_dlopen|enif_dlsym|enif_make_new_binary|enif_mutex_create|enif_open_resource_type|enif_realloc|enif_rwlock_create)$";
+position pnull != {erlang_check_null.p,enif_alloc_resource.p};
+
+identifier FUNCNOT =~ "^(enif_alloc_binary|enif_get_int|enif_get_list_cell|enif_get_list_length|enif_get_long|enif_get_map_value|enif_get_resource|enif_get_tuple|enif_get_uint|enif_get_ulong|enif_inspect_binary|enif_inspect_iolist_as_binary|enif_is_atom|enif_is_binary|enif_is_current_process_alive|enif_is_empty_list|enif_is_list|enif_is_map|enif_is_tuple|enif_realloc_binary)$";
+position pnot != {erlang_check_not.p,enif_alloc_binary.pa};
+
+identifier FUNCNEW =~ "^(enif_make_atom|enif_make_badarg|enif_make_binary|enif_make_int|enif_make_list|enif_make_list_from_array|enif_make_resource|enif_make_tuple|enif_raise_exception|enif_schedule_nif|enif_thread_self)$";
+position pnew != {erlang_check_new.p,enif_alloc_binary.pm};
+
+identifier FUNCFREE =~ "^(enif_free|enif_free_env|enif_free_iovec|enif_release_binary|enif_release_resource)$";
+position pfree != {enif_alloc_resource.pr,enif_alloc_binary.pr,erlang_check_null_free.p};
+
+@@
+
+(
+* FUNCVOID(...)@pvoid
+|
+* FUNCNULL(...)@pnull
+|
+* FUNCNOT(...)@pnot
+|
+* FUNCNEW(...)@pnew
+|
+* FUNCFREE(...)@pfree
+)
diff --git a/lib/crypto/c_src/check_openssl.cocci b/lib/crypto/c_src/check_openssl.cocci
new file mode 100644
index 0000000000..75d1a6e44b
--- /dev/null
+++ b/lib/crypto/c_src/check_openssl.cocci
@@ -0,0 +1,281 @@
+// %CopyrightBegin%
+//
+// Copyright Doug Hogan 2019. 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%
+
+// Coccinelle script to help verify the subset of OpenSSL calls used by Erlang.
+// http://coccinelle.lip6.fr
+// https://github.com/coccinelle/coccinelle
+//
+// These work with the Erlang code because it has a rigid coding pattern.
+// $ spatch.opt --all-includes -sp_file check_openssl.cocci -dir .
+
+// TODO: These APIs may not have a single check that covers all cases
+// or may not be necessary to check.
+//
+// BN_GENCB_get_arg
+// BN_bn2bin
+// BN_cmp
+// BN_is_bit_set
+// BN_is_negative
+// BN_is_zero
+// BN_num_bits
+// DH_get0_key
+// DH_size
+// EC_GROUP_get_degree
+// EC_KEY_get0_group
+// EC_KEY_get0_private_key
+// EC_KEY_get0_public_key
+// EC_KEY_get_conv_form
+// EVP_CIPHER_block_size
+// EVP_CIPHER_iv_length
+// EVP_CIPHER_type
+// EVP_MD_CTX_md
+// EVP_MD_size
+// EVP_aes_128_cbc
+// EVP_aes_128_ccm
+// EVP_aes_128_cfb128
+// EVP_aes_128_cfb8
+// EVP_aes_128_ctr
+// EVP_aes_128_ecb
+// EVP_aes_128_gcm
+// EVP_aes_192_cbc
+// EVP_aes_192_ccm
+// EVP_aes_192_ctr
+// EVP_aes_192_ecb
+// EVP_aes_192_gcm
+// EVP_aes_256_cbc
+// EVP_aes_256_ccm
+// EVP_aes_256_ctr
+// EVP_aes_256_ecb
+// EVP_aes_256_gcm
+// EVP_bf_cbc
+// EVP_bf_cfb64
+// EVP_bf_ecb
+// EVP_bf_ofb
+// EVP_chacha20
+// EVP_chacha20_poly1305
+// EVP_des_cbc
+// EVP_des_cfb8
+// EVP_des_ecb
+// EVP_des_ede3_cbc
+// EVP_des_ede3_cfb8
+// EVP_md4
+// EVP_md5
+// EVP_rc2_cbc
+// EVP_ripemd160
+// EVP_sha1
+// EVP_sha224
+// EVP_sha256
+// EVP_sha384
+// EVP_sha3_224
+// EVP_sha3_256
+// EVP_sha3_384
+// EVP_sha3_512
+// EVP_sha512
+// OpenSSL_version
+// OpenSSL_version_num
+// PEM_read_PrivateKey
+// PEM_read_PUBKEY
+// RSA_size
+
+// Unusual API for OpenSSL: 0 or positive on success and negative value(s) on error.
+@openssl_check_negative@
+identifier FUNCNEG =~ "^(DH_compute_key|RSA_padding_check_SSLv23)$";
+expression X;
+identifier L;
+position p;
+@@
+
+  if (
+(
+  FUNCNEG(...)@p < 0
+|
+  (X = FUNCNEG(...)@p) < 0
+)
+  )
+      goto L;
+
+// Unusual API for OpenSSL: positive on success or else error
+@openssl_check_positive@
+identifier FUNCPOS =~ "^(ECDH_compute_key|EVP_CIPHER_asn1_to_param|EVP_CIPHER_param_to_asn1|EVP_PKEY_CTX_ctrl|RSA_pkey_ctx_ctrl)$";
+identifier L;
+expression X;
+position p;
+@@
+
+  if (
+(
+  FUNCPOS(...)@p < 1
+|
+  (X = FUNCPOS(...)@p) < 1
+)
+  )
+      goto L;
+
+// Unusual API for OpenSSL: 0=success.
+@openssl_check_0@
+identifier L;
+expression X;
+identifier FUNC0 =~ "^(AES_set_decrypt_key|AES_set_encrypt_key|CRYPTO_gcm128_aad|CRYPTO_gcm128_decrypt|CRYPTO_gcm128_finish)$";
+position p;
+@@
+
+  if (
+(
+  FUNC0(...)@p != 0
+|
+  (X = FUNC0(...)@p) != 0
+)
+  )
+      goto L;
+
+// These do not necessarily allocate resources but they may return NULL.
+@openssl_check_null@
+expression X;
+identifier L;
+identifier FUNCNULL =~ "^(BN_CTX_new|BN_GENCB_new|BN_MONT_CTX_new|BN_bin2bn|BN_dup|BN_generate_prime|BN_new|CMAC_CTX_new|CRYPTO_clear_realloc|CRYPTO_gcm128_new|CRYPTO_malloc|CRYPTO_realloc|CRYPTO_zalloc|DH_generate_parameters|DH_new|DSA_new|EC_GROUP_dup|EC_GROUP_get0_generator|EC_GROUP_method_of|EC_GROUP_new_curve_GFm|EC_GROUP_new_curve_GFp|EC_KEY_copy|EC_KEY_dup|EC_KEY_get0_engine|EC_KEY_new|EC_KEY_new_by_curve_name|EC_POINT_bn2point|EC_POINT_dup|EC_POINT_new|EC_POINT_point2bn|ENGINE_by_id|ENGINE_get_cipher_engine|ENGINE_get_default_DH|ENGINE_get_default_DSA|ENGINE_get_default_RAND|ENGINE_get_default_RSA|ENGINE_get_digest_engine|ENGINE_get_first|ENGINE_get_id|ENGINE_get_last|ENGINE_get_name|ENGINE_get_next|ENGINE_get_prev|ENGINE_load_private_key|ENGINE_load_public_key|ENGINE_new|EVP_CIPHER_CTX_new|EVP_MAC_CTX_new|EVP_MAC_CTX_new_id|EVP_MD_CTX_new|EVP_MD_meth_new|EVP_PKEY_CTX_new|EVP_PKEY_CTX_new_id|EVP_PKEY_get1_DH|EVP_PKEY_get1_DSA|EVP_PKEY_get1_EC_KEY|EVP_PKEY_get1_RSA|EVP_PKEY_new|EVP_PKEY_new_raw_private_key|EVP_PKEY_new_raw_public_key|EVP_get_cipherbyname|EVP_get_cipherbynid|EVP_get_cipherbyobj|EVP_get_macbyname|EVP_get_macbynid|EVP_get_macbyobj|HMAC|HMAC_CTX_new|OPENSSL_buf2hexstr|OPENSSL_clear_realloc|OPENSSL_hexstr2buf|OPENSSL_malloc|OPENSSL_realloc|OPENSSL_strdup|OPENSSL_strndup|OPENSSL_zalloc|RSA_meth_dup|RSA_meth_new|RSA_new)$";
+position p;
+@@
+
+(
+  if ((X = FUNCNULL(...)@p) == NULL)
+      goto L;
+|
+  X = FUNCNULL(...)@p;
+  if (X == NULL)
+      goto L;
+)
+
+// non-zero=success, 0=failure.  These can be safely used with !
+@openssl_check_not@
+expression X;
+identifier L;
+identifier FUNCNOT =~ "^(BN_add|BN_div|BN_exp|BN_from_montgomery|BN_gcd|BN_generate_prime_ex|BN_mod|BN_mod_add|BN_mod_exp|BN_mod_mul|BN_mod_mul_montgomery|BN_mod_sqr|BN_mod_sub|BN_mul|BN_nnmod|BN_priv_rand|BN_priv_rand_range|BN_pseudo_rand|BN_pseudo_rand_range|BN_rand|BN_rand_range|BN_set_bit|BN_set_word|BN_sqr|BN_sub|BN_to_montgomery|CMAC_Final|CMAC_Init|CMAC_Update|CRYPTO_set_mem_debug|CRYPTO_set_mem_functions|DH_check|DH_check_ex|DH_check_params|DH_check_pub_key_ex|DH_generate_key|DH_generate_parameters_ex|DH_set0_key|DH_set0_pqg|DH_set_length|DSA_set0_key|DSA_set0_pqg|EC_GROUP_check|EC_GROUP_check_discriminant|EC_GROUP_copy|EC_GROUP_get_curve_name|EC_GROUP_get_pentanomial_basis|EC_GROUP_get_trinomial_basis|EC_GROUP_precompute_mult|EC_GROUP_set_generator|EC_GROUP_set_seed|EC_KEY_check_key|EC_KEY_generate_key|EC_KEY_key2buf|EC_KEY_oct2key|EC_KEY_oct2priv|EC_KEY_precompute_mult|EC_KEY_priv2buf|EC_KEY_priv2oct|EC_KEY_set_group|EC_KEY_set_private_key|EC_KEY_set_public_key|EC_KEY_set_public_key_affine_coordinates|EC_KEY_up_ref|EC_POINT_add|EC_POINT_copy|EC_POINT_dbl|EC_POINT_get_Jprojective_coordinates_GFp|EC_POINT_get_affine_coordinates_GF2m|EC_POINT_get_affine_coordinates_GFp|EC_POINT_invert|EC_POINT_make_affine|EC_POINT_mul|EC_POINT_oct2point|EC_POINT_point2oct|EC_POINT_set_Jprojective_coordinates_GFp|EC_POINT_set_affine_coordinates_GF2m|EC_POINT_set_affine_coordinates_GFp|EC_POINT_set_compressed_coordinates_GF2m|EC_POINT_set_compressed_coordinates_GFp|EC_POINT_set_to_infinity|EC_POINTs_make_affine|EC_POINTs_mul|ENGINE_add|ENGINE_ctrl_cmd|ENGINE_ctrl_cmd_string|ENGINE_finish|ENGINE_free|ENGINE_init|ENGINE_register_DH|ENGINE_register_DSA|ENGINE_register_EC|ENGINE_register_RAND|ENGINE_register_RSA|ENGINE_register_all_complete|ENGINE_register_ciphers|ENGINE_register_complete|ENGINE_register_digests|ENGINE_register_pkey_asn1_meths|ENGINE_register_pkey_meths|ENGINE_remove|ENGINE_set_RSA|ENGINE_set_default|ENGINE_set_default_DH|ENGINE_set_default_DSA|ENGINE_set_default_EC|ENGINE_set_default_RAND|ENGINE_set_default_RSA|ENGINE_set_digests|ENGINE_set_id|ENGINE_set_init_function|ENGINE_set_load_privkey_function|ENGINE_set_load_pubkey_function|ENGINE_set_name|ENGINE_up_ref|HMAC_CTX_copy|HMAC_CTX_reset|HMAC_Final|HMAC_Init_ex|HMAC_Update|MD2_Init|MD2_Update|MD2_Final|MD4_Init|MD4_Update|MD4_Final|MD5_Init|MD5_Update|MD5_Final|OPENSSL_init_crypto|OPENSSL_mem_debug_pop|OPENSSL_mem_debug_push|RSA_generate_key_ex|RSA_generate_multi_prime_key|RSA_meth_set_finish|RSA_meth_set_sign|RSA_meth_set_verify|RSA_padding_add_SSLv23|RSA_set0_crt_params|RSA_set0_factors|RSA_set0_key|RSA_set0_multi_prime_params)$";
+position p;
+@@
+
+  if (
+(
+  !FUNCNOT(...)@p
+|
+  !(X = FUNCNOT)@p
+)
+  )
+      goto L;
+
+// 1=success.  These may have == 0 or <= 0 or non-one failure so we explicitly check for success.
+// Since some EVP_* functions use failure == 0 and others use <= 0, we consolidate all
+// EVP_* calls into here so it's less error prone.  In such cases, they all use 1 for success.
+@openssl_check_1@
+expression X;
+identifier L;
+identifier FUNC1 =~ "^(EVP_CIPHER_CTX_copy|EVP_CIPHER_CTX_ctrl|EVP_CIPHER_CTX_rand_key|EVP_CIPHER_CTX_reset|EVP_CIPHER_CTX_set_key_length|EVP_CIPHER_CTX_set_padding|EVP_CipherFinal_ex|EVP_CipherInit_ex|EVP_CipherUpdate|EVP_DecryptFinal_ex|EVP_DecryptInit_ex|EVP_DecryptUpdate|EVP_Digest|EVP_DigestFinal|EVP_DigestFinal_ex|EVP_DigestInit|EVP_DigestInit_ex|EVP_DigestSign|EVP_DigestSignInit|EVP_DigestSignUpdate|EVP_DigestSignaFinal|EVP_DigestUpdate|EVP_DigestVerify|EVP_DigestVerifyInit|EVP_EncryptFinal_ex|EVP_EncryptInit_ex|EVP_EncryptUpdate|EVP_MAC_CTX_copy|EVP_MAC_ctrl|EVP_MAC_ctrl_str|EVP_MAC_hex2ctrl|EVP_MAC_init|EVP_MAC_reset|EVP_MAC_str2ctrl|EVP_MAC_update|EVP_MD_CTX_copy|EVP_MD_CTX_copy_ex|EVP_MD_CTX_ctrl|EVP_MD_meth_set_app_datasize|EVP_MD_meth_set_cleanup|EVP_MD_meth_set_copy|EVP_MD_meth_set_ctrl|EVP_MD_meth_set_final|EVP_MD_meth_set_flags|EVP_MD_meth_set_init|EVP_MD_meth_set_input_blocksize|EVP_MD_meth_set_result_size|EVP_MD_meth_set_update|EVP_PKEY_CTX_set_rsa_mgf1_md|EVP_PKEY_CTX_set_rsa_padding|EVP_PKEY_CTX_set_rsa_pss_saltlen|EVP_PKEY_CTX_set_signature|EVP_PKEY_assign|EVP_PKEY_assign_DSA|EVP_PKEY_assign_EC_KEY|EVP_PKEY_assign_RSA|EVP_PKEY_decrypt|EVP_PKEY_decrypt_init|EVP_PKEY_derive|EVP_PKEY_derive_init|EVP_PKEY_derive_set_peer|EVP_PKEY_encrypt|EVP_PKEY_encrypt_init|EVP_PKEY_get1_DH|EVP_PKEY_get_raw_private_key|EVP_PKEY_get_raw_public_key|EVP_PKEY_keygen|EVP_PKEY_keygen_init|EVP_PKEY_set1_DH|EVP_PKEY_sign|EVP_PKEY_sign_init|EVP_PKEY_verify|EVP_PKEY_verify_init|EVP_PKEY_verify_recover|EVP_PKEY_verify_recover_init|EVP_add_mac|RAND_bytes|RAND_priv_bytes)$";
+position p;
+@@
+
+  if (
+(
+  FUNC1(...)@p != 1
+|
+  (X = FUNC1(...)@p) != 1
+)
+  )
+      goto L;
+
+
+// These are void but here for completeness
+@openssl_void@
+identifier FUNCVOID =~ "^(AES_cfb128_encrypt|AES_cfb8_encrypt|AES_ige_encrypt|BN_GENCB_set|DSA_get0_key|DSA_get0_pqg|EC_GROUP_set_asn1_flag|EC_GROUP_set_point_conversion_form|ENGINE_get_static_state|ENGINE_unregister_DH|ENGINE_unregister_DSA|ENGINE_unregister_EC|ENGINE_unregister_RAND|ENGINE_unregister_RSA|ENGINE_unregister_ciphers|ENGINE_unregister_digests|ENGINE_unregister_pkey_asn1_meths|ENGINE_unregister_pkey_meths|OpenSSL_add_all_ciphers|OpenSSL_add_all_digests|RAND_seed|RC4|RC4_set_key|RSA_get0_crt_params|RSA_get0_factors|RSA_get0_key)$";
+position p;
+@@
+
+  FUNCVOID(...)@p;
+
+
+// Traditionally, OpenSSL didn't adhere to the semantics of free() calls
+// allowing for NULL.  However, they have been changing it over time.
+// Since Erlang allows for unmaintained versions of OpenSSL, be conservative
+// and assume the worst.
+@openssl_free@
+expression X;
+identifier FUNCFREE =~ "^(BN_CTX_free|BN_GENCB_free|BN_clear_free|BN_free|CMAC_CTX_free|CRYPTO_free|DH_free|DSA_free|EC_GROUP_free|EC_KEY_free|EC_POINT_free|EVP_CIPHER_CTX_free|EVP_MD_CTX_free|EVP_PKEY_CTX_free|EVP_PKEY_free|HMAC_CTX_free|RSA_free|RSA_meth_free)$";
+position p;
+@@
+
+  if (
+(
+  X
+|
+  X != NULL
+)
+  )
+      FUNCFREE(X)@p;
+
+
+// NOTE: Keep these in sync with the above definitions!
+//
+// Find all of the cases that we haven't marked safe positions of.
+//
+// This will flag a few false positives because the code isn't using the
+// standard pattern.
+//
+// NOTE: You have to copy the regexps because there doesn't appear to be a way in
+// coccinelle to reference a regexp identifier from another rule properly.
+@openssl_check_NOT_SAFE@
+
+identifier FUNCNEG =~ "^(DH_compute_key|RSA_padding_check_SSLv23)$";
+position pneg != openssl_check_negative.p;
+
+identifier FUNCPOS =~ "^(ECDH_compute_key|EVP_CIPHER_asn1_to_param|EVP_CIPHER_param_to_asn1|EVP_PKEY_CTX_ctrl|RSA_pkey_ctx_ctrl)$";
+position ppos != openssl_check_positive.p;
+
+identifier FUNC0 =~ "^(AES_set_decrypt_key|AES_set_encrypt_key|CRYPTO_gcm128_aad|CRYPTO_gcm128_decrypt|CRYPTO_gcm128_finish)$";
+position p0 != openssl_check_0.p;
+
+identifier FUNCNULL =~ "^(BN_CTX_new|BN_GENCB_new|BN_MONT_CTX_new|BN_bin2bn|BN_dup|BN_generate_prime|BN_new|CMAC_CTX_new|CRYPTO_clear_realloc|CRYPTO_gcm128_new|CRYPTO_malloc|CRYPTO_realloc|CRYPTO_zalloc|DH_generate_parameters|DH_new|DSA_new|EC_GROUP_dup|EC_GROUP_get0_generator|EC_GROUP_method_of|EC_GROUP_new_curve_GFm|EC_GROUP_new_curve_GFp|EC_KEY_copy|EC_KEY_dup|EC_KEY_get0_engine|EC_KEY_new|EC_KEY_new_by_curve_name|EC_POINT_bn2point|EC_POINT_dup|EC_POINT_new|EC_POINT_point2bn|ENGINE_by_id|ENGINE_get_cipher_engine|ENGINE_get_default_DH|ENGINE_get_default_DSA|ENGINE_get_default_RAND|ENGINE_get_default_RSA|ENGINE_get_digest_engine|ENGINE_get_first|ENGINE_get_id|ENGINE_get_last|ENGINE_get_name|ENGINE_get_next|ENGINE_get_prev|ENGINE_load_private_key|ENGINE_load_public_key|ENGINE_new|EVP_CIPHER_CTX_new|EVP_MAC_CTX_new|EVP_MAC_CTX_new_id|EVP_MD_CTX_new|EVP_MD_meth_new|EVP_PKEY_CTX_new|EVP_PKEY_CTX_new_id|EVP_PKEY_get1_DH|EVP_PKEY_get1_DSA|EVP_PKEY_get1_EC_KEY|EVP_PKEY_get1_RSA|EVP_PKEY_new|EVP_PKEY_new_raw_private_key|EVP_PKEY_new_raw_public_key|EVP_get_cipherbyname|EVP_get_cipherbynid|EVP_get_cipherbyobj|EVP_get_macbyname|EVP_get_macbynid|EVP_get_macbyobj|HMAC|HMAC_CTX_new|OPENSSL_buf2hexstr|OPENSSL_clear_realloc|OPENSSL_hexstr2buf|OPENSSL_malloc|OPENSSL_realloc|OPENSSL_strdup|OPENSSL_strndup|OPENSSL_zalloc|RSA_meth_dup|RSA_meth_new|RSA_new)$";
+position pnull != openssl_check_null.p;
+
+identifier FUNCNOT =~ "^(BN_add|BN_div|BN_exp|BN_from_montgomery|BN_gcd|BN_generate_prime_ex|BN_mod|BN_mod_add|BN_mod_exp|BN_mod_mul|BN_mod_mul_montgomery|BN_mod_sqr|BN_mod_sub|BN_mul|BN_nnmod|BN_priv_rand|BN_priv_rand_range|BN_pseudo_rand|BN_pseudo_rand_range|BN_rand|BN_rand_range|BN_set_bit|BN_set_word|BN_sqr|BN_sub|BN_to_montgomery|CMAC_Final|CMAC_Init|CMAC_Update|CRYPTO_set_mem_debug|CRYPTO_set_mem_functions|DH_check|DH_check_ex|DH_check_params|DH_check_pub_key_ex|DH_generate_key|DH_generate_parameters_ex|DH_set0_key|DH_set0_pqg|DH_set_length|DSA_set0_key|DSA_set0_pqg|EC_GROUP_check|EC_GROUP_check_discriminant|EC_GROUP_copy|EC_GROUP_get_curve_name|EC_GROUP_get_pentanomial_basis|EC_GROUP_get_trinomial_basis|EC_GROUP_precompute_mult|EC_GROUP_set_generator|EC_GROUP_set_seed|EC_KEY_check_key|EC_KEY_generate_key|EC_KEY_key2buf|EC_KEY_oct2key|EC_KEY_oct2priv|EC_KEY_precompute_mult|EC_KEY_priv2buf|EC_KEY_priv2oct|EC_KEY_set_group|EC_KEY_set_private_key|EC_KEY_set_public_key|EC_KEY_set_public_key_affine_coordinates|EC_KEY_up_ref|EC_POINT_add|EC_POINT_copy|EC_POINT_dbl|EC_POINT_get_Jprojective_coordinates_GFp|EC_POINT_get_affine_coordinates_GF2m|EC_POINT_get_affine_coordinates_GFp|EC_POINT_invert|EC_POINT_make_affine|EC_POINT_mul|EC_POINT_oct2point|EC_POINT_point2oct|EC_POINT_set_Jprojective_coordinates_GFp|EC_POINT_set_affine_coordinates_GF2m|EC_POINT_set_affine_coordinates_GFp|EC_POINT_set_compressed_coordinates_GF2m|EC_POINT_set_compressed_coordinates_GFp|EC_POINT_set_to_infinity|EC_POINTs_make_affine|EC_POINTs_mul|ENGINE_add|ENGINE_ctrl_cmd|ENGINE_ctrl_cmd_string|ENGINE_finish|ENGINE_free|ENGINE_init|ENGINE_register_DH|ENGINE_register_DSA|ENGINE_register_EC|ENGINE_register_RAND|ENGINE_register_RSA|ENGINE_register_all_complete|ENGINE_register_ciphers|ENGINE_register_complete|ENGINE_register_digests|ENGINE_register_pkey_asn1_meths|ENGINE_register_pkey_meths|ENGINE_remove|ENGINE_set_RSA|ENGINE_set_default|ENGINE_set_default_DH|ENGINE_set_default_DSA|ENGINE_set_default_EC|ENGINE_set_default_RAND|ENGINE_set_default_RSA|ENGINE_set_digests|ENGINE_set_id|ENGINE_set_init_function|ENGINE_set_load_privkey_function|ENGINE_set_load_pubkey_function|ENGINE_set_name|ENGINE_up_ref|HMAC_CTX_copy|HMAC_CTX_reset|HMAC_Final|HMAC_Init_ex|HMAC_Update|MD2_Init|MD2_Update|MD2_Final|MD4_Init|MD4_Update|MD4_Final|MD5_Init|MD5_Update|MD5_Final|OPENSSL_init_crypto|OPENSSL_mem_debug_pop|OPENSSL_mem_debug_push|RSA_generate_key_ex|RSA_generate_multi_prime_key|RSA_meth_set_finish|RSA_meth_set_sign|RSA_meth_set_verify|RSA_padding_add_SSLv23|RSA_set0_crt_params|RSA_set0_factors|RSA_set0_key|RSA_set0_multi_prime_params)$";
+position pnot != openssl_check_not.p;
+
+identifier FUNC1 =~ "^(EVP_CIPHER_CTX_copy|EVP_CIPHER_CTX_ctrl|EVP_CIPHER_CTX_rand_key|EVP_CIPHER_CTX_reset|EVP_CIPHER_CTX_set_key_length|EVP_CIPHER_CTX_set_padding|EVP_CipherFinal_ex|EVP_CipherInit_ex|EVP_CipherUpdate|EVP_DecryptFinal_ex|EVP_DecryptInit_ex|EVP_DecryptUpdate|EVP_Digest|EVP_DigestFinal|EVP_DigestFinal_ex|EVP_DigestInit|EVP_DigestInit_ex|EVP_DigestSign|EVP_DigestSignInit|EVP_DigestSignUpdate|EVP_DigestSignaFinal|EVP_DigestUpdate|EVP_DigestVerify|EVP_DigestVerifyInit|EVP_EncryptFinal_ex|EVP_EncryptInit_ex|EVP_EncryptUpdate|EVP_MAC_CTX_copy|EVP_MAC_ctrl|EVP_MAC_ctrl_str|EVP_MAC_hex2ctrl|EVP_MAC_init|EVP_MAC_reset|EVP_MAC_str2ctrl|EVP_MAC_update|EVP_MD_CTX_copy|EVP_MD_CTX_copy_ex|EVP_MD_CTX_ctrl|EVP_MD_meth_set_app_datasize|EVP_MD_meth_set_cleanup|EVP_MD_meth_set_copy|EVP_MD_meth_set_ctrl|EVP_MD_meth_set_final|EVP_MD_meth_set_flags|EVP_MD_meth_set_init|EVP_MD_meth_set_input_blocksize|EVP_MD_meth_set_result_size|EVP_MD_meth_set_update|EVP_PKEY_CTX_set_rsa_mgf1_md|EVP_PKEY_CTX_set_rsa_padding|EVP_PKEY_CTX_set_rsa_pss_saltlen|EVP_PKEY_CTX_set_signature|EVP_PKEY_assign|EVP_PKEY_assign_DSA|EVP_PKEY_assign_EC_KEY|EVP_PKEY_assign_RSA|EVP_PKEY_decrypt|EVP_PKEY_decrypt_init|EVP_PKEY_derive|EVP_PKEY_derive_init|EVP_PKEY_derive_set_peer|EVP_PKEY_encrypt|EVP_PKEY_encrypt_init|EVP_PKEY_get1_DH|EVP_PKEY_get_raw_private_key|EVP_PKEY_get_raw_public_key|EVP_PKEY_keygen|EVP_PKEY_keygen_init|EVP_PKEY_set1_DH|EVP_PKEY_sign|EVP_PKEY_sign_init|EVP_PKEY_verify|EVP_PKEY_verify_init|EVP_PKEY_verify_recover|EVP_PKEY_verify_recover_init|EVP_add_mac|RAND_bytes|RAND_priv_bytes)$";
+position p1 != openssl_check_1.p;
+
+identifier FUNCVOID =~ "^(AES_cfb128_encrypt|AES_cfb8_encrypt|AES_ige_encrypt|BN_GENCB_set|DSA_get0_key|DSA_get0_pqg|EC_GROUP_set_asn1_flag|EC_GROUP_set_point_conversion_form|ENGINE_get_static_state|ENGINE_unregister_DH|ENGINE_unregister_DSA|ENGINE_unregister_EC|ENGINE_unregister_RAND|ENGINE_unregister_RSA|ENGINE_unregister_ciphers|ENGINE_unregister_digests|ENGINE_unregister_pkey_asn1_meths|ENGINE_unregister_pkey_meths|OpenSSL_add_all_ciphers|OpenSSL_add_all_digests|RAND_seed|RC4|RC4_set_key|RSA_get0_crt_params|RSA_get0_factors|RSA_get0_key)$";
+position pvoid != openssl_void.p;
+
+identifier FUNCFREE =~ "^(BN_CTX_free|BN_GENCB_free|BN_clear_free|BN_free|CMAC_CTX_free|CRYPTO_free|DH_free|DSA_free|EC_GROUP_free|EC_KEY_free|EC_POINT_free|EVP_CIPHER_CTX_free|EVP_MD_CTX_free|EVP_PKEY_CTX_free|EVP_PKEY_free|HMAC_CTX_free|RSA_free|RSA_meth_free)$";
+position pfree != openssl_free.p;
+@@
+
+(
+* FUNCNEG(...)@pneg
+|
+* FUNCPOS(...)@ppos
+|
+* FUNCNULL(...)@pnull
+|
+* FUNC0(...)@p0
+|
+* FUNC1(...)@p1
+|
+* FUNCNOT(...)@pnot
+|
+* FUNCVOID(...)@pvoid
+|
+* FUNCFREE(...)@pfree
+)
diff --git a/lib/crypto/c_src/cipher.c b/lib/crypto/c_src/cipher.c
new file mode 100644
index 0000000000..e144a891a6
--- /dev/null
+++ b/lib/crypto/c_src/cipher.c
@@ -0,0 +1,345 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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 "cipher.h"
+
+#ifdef HAVE_DES
+#define COND_NO_DES_PTR(Ptr) (Ptr)
+#else
+#define COND_NO_DES_PTR(Ptr) (NULL)
+#endif
+
+static struct cipher_type_t cipher_types[] =
+{
+#ifdef HAVE_RC2
+    {{"rc2_cbc"}, {&EVP_rc2_cbc}, 0, NO_FIPS_CIPHER},
+#else
+    {{"rc2_cbc"}, {NULL}, 0, NO_FIPS_CIPHER},
+#endif
+#ifdef HAVE_RC4
+    {{"rc4"},     {&EVP_rc4}, 0, NO_FIPS_CIPHER},
+#else
+    {{"rc4"},     {NULL}, 0, NO_FIPS_CIPHER},
+#endif
+    {{"des_cbc"}, {COND_NO_DES_PTR(&EVP_des_cbc)}, 0, NO_FIPS_CIPHER},
+    {{"des_cfb"}, {COND_NO_DES_PTR(&EVP_des_cfb8)}, 0, NO_FIPS_CIPHER},
+    {{"des_ecb"}, {COND_NO_DES_PTR(&EVP_des_ecb)}, 0, NO_FIPS_CIPHER | ECB_BUG_0_9_8L},
+
+    {{"des_ede3_cbc"}, {COND_NO_DES_PTR(&EVP_des_ede3_cbc)}, 0, 0},
+
+#ifdef HAVE_DES_ede3_cfb_encrypt
+    {{"des_ede3_cfb"}, {COND_NO_DES_PTR(&EVP_des_ede3_cfb8)}, 0, 0},
+#else
+    {{"des_ede3_cfb"}, {NULL}, 0, 0},
+#endif
+
+#ifdef HAVE_BF
+    {{"blowfish_cbc"}, {&EVP_bf_cbc}, 0, NO_FIPS_CIPHER},
+    {{"blowfish_cfb64"}, {&EVP_bf_cfb64}, 0, NO_FIPS_CIPHER},
+    {{"blowfish_ofb64"}, {&EVP_bf_ofb}, 0, NO_FIPS_CIPHER},
+    {{"blowfish_ecb"}, {&EVP_bf_ecb}, 0, NO_FIPS_CIPHER | ECB_BUG_0_9_8L},
+#else
+    {{"blowfish_cbc"}, {NULL}, 0, 0},
+    {{"blowfish_cfb64"}, {NULL}, 0, 0},
+    {{"blowfish_ofb64"}, {NULL}, 0, 0},
+    {{"blowfish_ecb"}, {NULL}, 0, 0},
+#endif
+
+    {{"aes_128_cbc"}, {&EVP_aes_128_cbc}, 16, 0},
+    {{"aes_192_cbc"}, {&EVP_aes_192_cbc}, 24, 0},
+    {{"aes_256_cbc"}, {&EVP_aes_256_cbc}, 32, 0},
+
+    {{"aes_128_cfb8"}, {&EVP_aes_128_cfb8}, 16, NO_FIPS_CIPHER | AES_CFBx},
+    {{"aes_192_cfb8"}, {&EVP_aes_192_cfb8}, 24, NO_FIPS_CIPHER | AES_CFBx},
+    {{"aes_256_cfb8"}, {&EVP_aes_256_cfb8}, 32, NO_FIPS_CIPHER | AES_CFBx},
+
+    {{"aes_128_cfb128"}, {&EVP_aes_128_cfb128}, 16, NO_FIPS_CIPHER | AES_CFBx},
+    {{"aes_192_cfb128"}, {&EVP_aes_192_cfb128}, 24, NO_FIPS_CIPHER | AES_CFBx},
+    {{"aes_256_cfb128"}, {&EVP_aes_256_cfb128}, 32, NO_FIPS_CIPHER | AES_CFBx},
+
+    {{"aes_128_ecb"}, {&EVP_aes_128_ecb}, 16, ECB_BUG_0_9_8L},
+    {{"aes_192_ecb"}, {&EVP_aes_192_ecb}, 24, ECB_BUG_0_9_8L},
+    {{"aes_256_ecb"}, {&EVP_aes_256_ecb}, 32, ECB_BUG_0_9_8L},
+
+#if defined(HAVE_EVP_AES_CTR)
+    {{"aes_128_ctr"}, {&EVP_aes_128_ctr}, 16, 0},
+    {{"aes_192_ctr"}, {&EVP_aes_192_ctr}, 24, 0},
+    {{"aes_256_ctr"}, {&EVP_aes_256_ctr}, 32, 0},
+#else
+    {{"aes_128_ctr"}, {NULL}, 16, AES_CTR_COMPAT},
+    {{"aes_192_ctr"}, {NULL}, 24, AES_CTR_COMPAT},
+    {{"aes_256_ctr"}, {NULL}, 32, AES_CTR_COMPAT},
+#endif
+
+#if defined(HAVE_CHACHA20)
+    {{"chacha20"}, {&EVP_chacha20}, 32, NO_FIPS_CIPHER},
+#else
+    {{"chacha20"}, {NULL}, 0, NO_FIPS_CIPHER},
+#endif
+
+    /*==== AEAD ciphers ====*/
+#if defined(HAVE_CHACHA20_POLY1305)
+    {{"chacha20_poly1305"}, {&EVP_chacha20_poly1305}, 0, NO_FIPS_CIPHER | AEAD_CIPHER, {{EVP_CTRL_AEAD_SET_IVLEN,EVP_CTRL_AEAD_GET_TAG,EVP_CTRL_AEAD_SET_TAG}}},
+#else
+    {{"chacha20_poly1305"}, {NULL}, 0, NO_FIPS_CIPHER | AEAD_CIPHER, {{0,0,0}}},
+#endif
+
+#if defined(HAVE_GCM)
+    {{"aes_128_gcm"}, {&EVP_aes_128_gcm}, 16, AEAD_CIPHER|GCM_MODE, {{EVP_CTRL_GCM_SET_IVLEN,EVP_CTRL_GCM_GET_TAG,EVP_CTRL_GCM_SET_TAG}}},
+    {{"aes_192_gcm"}, {&EVP_aes_192_gcm}, 24, AEAD_CIPHER|GCM_MODE, {{EVP_CTRL_GCM_SET_IVLEN,EVP_CTRL_GCM_GET_TAG,EVP_CTRL_GCM_SET_TAG}}},
+    {{"aes_256_gcm"}, {&EVP_aes_256_gcm}, 32, AEAD_CIPHER|GCM_MODE, {{EVP_CTRL_GCM_SET_IVLEN,EVP_CTRL_GCM_GET_TAG,EVP_CTRL_GCM_SET_TAG}}},
+#else
+    {{"aes_128_gcm"}, {NULL}, 16, AEAD_CIPHER|GCM_MODE, {{0,0,0}}},
+    {{"aes_192_gcm"}, {NULL}, 24, AEAD_CIPHER|GCM_MODE, {{0,0,0}}},
+    {{"aes_256_gcm"}, {NULL}, 32, AEAD_CIPHER|GCM_MODE, {{0,0,0}}},
+#endif
+
+#if defined(HAVE_CCM)
+    {{"aes_128_ccm"}, {&EVP_aes_128_ccm}, 16, AEAD_CIPHER|CCM_MODE, {{EVP_CTRL_CCM_SET_IVLEN,EVP_CTRL_CCM_GET_TAG,EVP_CTRL_CCM_SET_TAG}}},
+    {{"aes_192_ccm"}, {&EVP_aes_192_ccm}, 24, AEAD_CIPHER|CCM_MODE, {{EVP_CTRL_CCM_SET_IVLEN,EVP_CTRL_CCM_GET_TAG,EVP_CTRL_CCM_SET_TAG}}},
+    {{"aes_256_ccm"}, {&EVP_aes_256_ccm}, 32, AEAD_CIPHER|CCM_MODE, {{EVP_CTRL_CCM_SET_IVLEN,EVP_CTRL_CCM_GET_TAG,EVP_CTRL_CCM_SET_TAG}}},
+#else
+    {{"aes_128_ccm"}, {NULL}, 16, AEAD_CIPHER|CCM_MODE, {{0,0,0}}},
+    {{"aes_192_ccm"}, {NULL}, 24, AEAD_CIPHER|CCM_MODE, {{0,0,0}}},
+    {{"aes_256_ccm"}, {NULL}, 32, AEAD_CIPHER|CCM_MODE, {{0,0,0}}},
+#endif
+
+    /*==== Specialy handled ciphers, only for inclusion in algorithm's list ====*/
+#ifdef HAVE_AES_IGE
+    {{"aes_ige256"}, {NULL}, 0, NO_FIPS_CIPHER | NON_EVP_CIPHER},
+#endif
+
+    /*==== End of list ==== */
+
+    {{NULL},{NULL},0,0}
+};
+
+ErlNifResourceType* evp_cipher_ctx_rtype;
+
+static size_t num_cipher_types = 0;
+
+static void evp_cipher_ctx_dtor(ErlNifEnv* env, struct evp_cipher_ctx* ctx) {
+    if (ctx == NULL)
+        return;
+
+    if (ctx->ctx)
+        EVP_CIPHER_CTX_free(ctx->ctx);
+
+#if !defined(HAVE_EVP_AES_CTR)
+    if (ctx->env)
+        enif_free_env(ctx->env);
+#endif
+}
+
+int init_cipher_ctx(ErlNifEnv *env) {
+    evp_cipher_ctx_rtype = enif_open_resource_type(env, NULL, "EVP_CIPHER_CTX",
+                                                   (ErlNifResourceDtor*) evp_cipher_ctx_dtor,
+                                                   ERL_NIF_RT_CREATE|ERL_NIF_RT_TAKEOVER,
+                                                   NULL);
+    if (evp_cipher_ctx_rtype == NULL)
+        goto err;
+
+    return 1;
+
+ err:
+    PRINTF_ERR0("CRYPTO: Could not open resource type 'EVP_CIPHER_CTX'");
+    return 0;
+}
+
+void init_cipher_types(ErlNifEnv* env)
+{
+    struct cipher_type_t* p = cipher_types;
+
+    num_cipher_types = 0;
+    for (p = cipher_types; p->type.str; p++) {
+        num_cipher_types++;
+	p->type.atom = enif_make_atom(env, p->type.str);
+	if (p->cipher.funcp)
+	    p->cipher.p = p->cipher.funcp();
+    }
+    p->type.atom = atom_false; /* end marker */
+
+    qsort(cipher_types, num_cipher_types, sizeof(cipher_types[0]), cmp_cipher_types);
+}
+
+const struct cipher_type_t* get_cipher_type(ERL_NIF_TERM type, size_t key_len)
+{
+    struct cipher_type_t key;
+
+    key.type.atom = type;
+    key.key_len = key_len;
+
+    return bsearch(&key, cipher_types, num_cipher_types, sizeof(cipher_types[0]), cmp_cipher_types);
+}
+
+
+int cmp_cipher_types(const void *keyp, const void *elemp) {
+    const struct cipher_type_t *key  = keyp;
+    const struct cipher_type_t *elem = elemp;
+
+    if (key->type.atom < elem->type.atom) return -1;
+    else if (key->type.atom > elem->type.atom) return 1;
+    else /* key->type.atom == elem->type.atom */
+        if (!elem->key_len || key->key_len == elem->key_len) return 0;
+        else if (key->key_len < elem->key_len) return -1;
+        else return 1;
+}
+
+
+ERL_NIF_TERM cipher_info_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Type) */
+    const struct cipher_type_t *cipherp;
+    const EVP_CIPHER     *cipher;
+    ERL_NIF_TERM         ret, ret_mode;
+    unsigned             type;
+    unsigned long        mode;
+
+    if ((cipherp = get_cipher_type_no_key(argv[0])) == NULL)
+        return enif_make_badarg(env);
+
+    if (CIPHER_FORBIDDEN_IN_FIPS(cipherp))
+        return enif_raise_exception(env, atom_notsup);
+    if ((cipher = cipherp->cipher.p) == NULL)
+        return enif_raise_exception(env, atom_notsup);
+
+    ret = enif_make_new_map(env);
+
+    type = EVP_CIPHER_type(cipher);
+    enif_make_map_put(env, ret, atom_type,
+        type == NID_undef ? atom_undefined : enif_make_int(env, type),
+        &ret);
+
+    enif_make_map_put(env, ret, atom_key_length,
+        enif_make_int(env, EVP_CIPHER_key_length(cipher)), &ret);
+    enif_make_map_put(env, ret, atom_iv_length,
+        enif_make_int(env, EVP_CIPHER_iv_length(cipher)), &ret);
+    enif_make_map_put(env, ret, atom_block_size,
+        enif_make_int(env, EVP_CIPHER_block_size(cipher)), &ret);
+
+    mode = EVP_CIPHER_mode(cipher);
+    switch (mode) {
+        case EVP_CIPH_ECB_MODE:
+            ret_mode = atom_ecb_mode;
+            break;
+
+        case EVP_CIPH_CBC_MODE:
+            ret_mode = atom_cbc_mode;
+            break;
+
+        case EVP_CIPH_CFB_MODE:
+            ret_mode = atom_cfb_mode;
+            break;
+
+        case EVP_CIPH_OFB_MODE:
+            ret_mode = atom_ofb_mode;
+            break;
+
+#ifdef EVP_CIPH_CTR_MODE
+        case EVP_CIPH_CTR_MODE:
+            ret_mode = atom_ctr_mode;
+            break;
+#endif
+
+#ifdef EVP_CIPH_GCM_MODE
+        case EVP_CIPH_GCM_MODE:
+            ret_mode = atom_gcm_mode;
+            break;
+#endif
+
+#ifdef EVP_CIPH_CCM_MODE
+        case EVP_CIPH_CCM_MODE:
+            ret_mode = atom_ccm_mode;
+            break;
+#endif
+
+#ifdef EVP_CIPH_XTS_MODE
+        case EVP_CIPH_XTS_MODE:
+            ret_mode = atom_xts_mode;
+            break;
+#endif
+
+#ifdef EVP_CIPH_WRAP_MODE
+        case EVP_CIPH_WRAP_MODE:
+            ret_mode = atom_wrap_mode;
+            break;
+#endif
+
+#ifdef EVP_CIPH_OCB_MODE
+        case EVP_CIPH_OCB_MODE:
+            ret_mode = atom_ocb_mode;
+            break;
+#endif
+
+        case EVP_CIPH_STREAM_CIPHER:
+            ret_mode = atom_stream_cipher;
+            break;
+
+        default:
+            ret_mode = atom_undefined;
+            break;
+    }
+
+    enif_make_map_put(env, ret, atom_mode, ret_mode, &ret);
+
+    return ret;
+}
+
+const struct cipher_type_t* get_cipher_type_no_key(ERL_NIF_TERM type)
+{
+    struct cipher_type_t key;
+
+    key.type.atom = type;
+
+    return bsearch(&key, cipher_types, num_cipher_types, sizeof(cipher_types[0]), cmp_cipher_types_no_key);
+}
+
+int cmp_cipher_types_no_key(const void *keyp, const void *elemp) {
+    const struct cipher_type_t *key  = keyp;
+    const struct cipher_type_t *elem = elemp;
+
+    if (key->type.atom < elem->type.atom) return -1;
+    else if (key->type.atom > elem->type.atom) return 1;
+    else /* key->type.atom == elem->type.atom */ return 0;
+}
+
+
+ERL_NIF_TERM cipher_types_as_list(ErlNifEnv* env)
+{
+    struct cipher_type_t* p;
+    ERL_NIF_TERM prev, hd;
+
+    hd = enif_make_list(env, 0);
+    prev = atom_undefined;
+
+    for (p = cipher_types; (p->type.atom & (p->type.atom != atom_false)); p++) {
+        if ((prev == p->type.atom) ||
+            CIPHER_FORBIDDEN_IN_FIPS(p) )
+            continue;
+
+        if ((p->cipher.p != NULL) ||
+            (p->flags & AES_CTR_COMPAT) ||
+            (p->type.atom == atom_aes_ige256))  /* Special handling. Bad indeed... */
+            {
+                hd = enif_make_list_cell(env, p->type.atom, hd);
+            }
+    }
+
+    return hd;
+}
diff --git a/lib/crypto/c_src/cipher.h b/lib/crypto/c_src/cipher.h
new file mode 100644
index 0000000000..c23e128824
--- /dev/null
+++ b/lib/crypto/c_src/cipher.h
@@ -0,0 +1,84 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_CIPHER_H__
+#define E_CIPHER_H__ 1
+
+#include "common.h"
+
+struct cipher_type_t {
+    union {
+	const char* str;    /* before init */
+	ERL_NIF_TERM atom;  /* after init */
+    }type;
+    union {
+	const EVP_CIPHER* (*funcp)(void); /* before init, NULL if notsup */
+	const EVP_CIPHER* p;              /* after init, NULL if notsup */
+    }cipher;
+    size_t key_len;      /* != 0 to also match on key_len */
+    unsigned flags;
+    union {
+        struct aead_ctrl {int ctx_ctrl_set_ivlen, ctx_ctrl_get_tag,  ctx_ctrl_set_tag;} aead;
+    } extra;
+};
+
+/* masks in the flags field if cipher_type_t */
+#define NO_FIPS_CIPHER 1
+#define AES_CFBx 2
+#define ECB_BUG_0_9_8L 4
+#define AEAD_CIPHER 8
+#define NON_EVP_CIPHER 16
+#define AES_CTR_COMPAT 32
+#define CCM_MODE 64
+#define GCM_MODE 128
+
+
+#ifdef FIPS_SUPPORT
+/* May have FIPS support, must check dynamically if it is enabled */
+# define CIPHER_FORBIDDEN_IN_FIPS(P) (((P)->flags & NO_FIPS_CIPHER) && FIPS_mode())
+#else
+/* No FIPS support since the symbol FIPS_SUPPORT is undefined */
+# define CIPHER_FORBIDDEN_IN_FIPS(P) 0
+#endif
+
+extern ErlNifResourceType* evp_cipher_ctx_rtype;
+struct evp_cipher_ctx {
+    EVP_CIPHER_CTX* ctx;
+    int iv_len;
+#if !defined(HAVE_EVP_AES_CTR)
+    ErlNifEnv* env;
+    ERL_NIF_TERM state;
+#endif
+};
+
+ERL_NIF_TERM cipher_info_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+int init_cipher_ctx(ErlNifEnv *env);
+
+void init_cipher_types(ErlNifEnv* env);
+const struct cipher_type_t* get_cipher_type_no_key(ERL_NIF_TERM type);
+const struct cipher_type_t* get_cipher_type(ERL_NIF_TERM type, size_t key_len);
+
+int cmp_cipher_types(const void *keyp, const void *elemp);
+int cmp_cipher_types_no_key(const void *keyp, const void *elemp);
+
+ERL_NIF_TERM cipher_types_as_list(ErlNifEnv* env);
+
+#endif /* E_CIPHER_H__ */
diff --git a/lib/crypto/c_src/cmac.c b/lib/crypto/c_src/cmac.c
new file mode 100644
index 0000000000..a1564f6661
--- /dev/null
+++ b/lib/crypto/c_src/cmac.c
@@ -0,0 +1,73 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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 "common.h"
+
+/*****************************************************************
+ *
+ * This file has functions for compatibility with cryptolibs
+ * lacking the EVP_Digest API.
+ *
+ * See mac.c for the implementation using the EVP interface.
+ *
+ ****************************************************************/
+
+#if defined(HAVE_CMAC) && !defined(HAVE_EVP_PKEY_new_CMAC_key)
+
+#include "cmac.h"
+
+int cmac_low_level(ErlNifEnv* env,
+                   ErlNifBinary key_bin, const EVP_CIPHER* cipher, ErlNifBinary text,
+                   ErlNifBinary *ret_bin, int *ret_bin_alloc, ERL_NIF_TERM *return_term)
+{
+    CMAC_CTX *ctx = NULL;
+    size_t size;
+
+    if ((ctx = CMAC_CTX_new()) == NULL)
+        goto local_err;
+
+    if (!CMAC_Init(ctx, key_bin.data, key_bin.size, cipher, NULL))
+        goto local_err;
+
+    if (!CMAC_Update(ctx, text.data, text.size))
+        goto local_err;
+
+    if ((size = (size_t)EVP_CIPHER_block_size(cipher)) < 0)
+        goto local_err;
+
+    if (!enif_alloc_binary(size, ret_bin))
+        goto local_err;
+    *ret_bin_alloc = 1;
+                
+    if (!CMAC_Final(ctx, ret_bin->data, &ret_bin->size))
+        goto local_err;
+
+    CMAC_CTX_free(ctx);
+    return 1;
+
+ local_err:
+    if (ctx)
+        CMAC_CTX_free(ctx);
+
+    *return_term = EXCP_ERROR(env,"Compat cmac");
+    return 0;
+}
+
+#endif
diff --git a/lib/crypto/c_src/cmac.h b/lib/crypto/c_src/cmac.h
new file mode 100644
index 0000000000..04c742b2dc
--- /dev/null
+++ b/lib/crypto/c_src/cmac.h
@@ -0,0 +1,34 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_CMAC_H__
+#define E_CMAC_H__ 1
+
+#include "common.h"
+
+#if defined(HAVE_CMAC) && !defined(HAVE_EVP_PKEY_new_CMAC_key)
+
+int cmac_low_level(ErlNifEnv* env,
+                   ErlNifBinary key_bin, const EVP_CIPHER* cipher, ErlNifBinary text,
+                   ErlNifBinary *ret_bin, int *ret_bin_alloc, ERL_NIF_TERM *return_term);
+
+#endif
+
+#endif /* E_CMAC_H__ */
diff --git a/lib/crypto/c_src/common.h b/lib/crypto/c_src/common.h
new file mode 100644
index 0000000000..a7e59d5d01
--- /dev/null
+++ b/lib/crypto/c_src/common.h
@@ -0,0 +1,52 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_COMMON_H__
+#define E_COMMON_H__ 1
+
+#ifdef __WIN32__
+#  include <windows.h>
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <limits.h>
+#include <stdint.h>
+
+#include <erl_nif.h>
+#include "openssl_config.h"
+#include "atoms.h"
+
+
+/* All nif functions return a valid value or throws an exception */
+#define EXCP(Env, Id, Str)  enif_raise_exception((Env), \
+                                enif_make_tuple3((Env), \
+                                                 (Id),  \
+                                                 enif_make_tuple2((Env), \
+                                                                  enif_make_string((Env),__FILE__,(ERL_NIF_LATIN1)), \
+                                                                  enif_make_int((Env), __LINE__)), \
+                                                 enif_make_string((Env),(Str),(ERL_NIF_LATIN1)) ))
+
+#define EXCP_NOTSUP(Env, Str) EXCP((Env), atom_notsup, (Str))
+#define EXCP_BADARG(Env, Str) EXCP((Env), atom_badarg, (Str))
+#define EXCP_ERROR(Env, Str)  EXCP((Env), atom_error, (Str))
+
+#endif /* E_COMMON_H__ */
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index df607732bf..802818541b 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -23,982 +23,110 @@
  * Based on OpenSSL.
  */
 
-#ifdef __WIN32__
-    #include <windows.h>
-#endif
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <erl_nif.h>
-
-#define OPENSSL_THREAD_DEFINES
-#include <openssl/opensslconf.h>
-
-#include <openssl/crypto.h>
-#ifndef OPENSSL_NO_DES
-#include <openssl/des.h>
-#endif /* #ifndef OPENSSL_NO_DES */
-/* #include <openssl/idea.h> This is not supported on the openssl OTP requires */
-#include <openssl/dsa.h>
-#include <openssl/rsa.h>
-#include <openssl/aes.h>
-#include <openssl/md5.h>
-#include <openssl/md4.h>
-#include <openssl/sha.h>
-#include <openssl/ripemd.h>
-#include <openssl/bn.h>
-#include <openssl/objects.h>
-#ifndef OPENSSL_NO_RC4
-    #include <openssl/rc4.h>
-#endif /* OPENSSL_NO_RC4 */
-#ifndef OPENSSL_NO_RC2
-    #include <openssl/rc2.h>
-#endif
-#include <openssl/blowfish.h>
-#include <openssl/rand.h>
-#include <openssl/evp.h>
-#include <openssl/hmac.h>
-#include <openssl/err.h>
-
-/* Helper macro to construct a OPENSSL_VERSION_NUMBER.
- * See openssl/opensslv.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))
-
-
-/* LibreSSL was cloned from OpenSSL 1.0.1g and claims to be API and BPI compatible
- * with 1.0.1.
- *
- * LibreSSL has the same names on include files and symbols as OpenSSL, but defines
- * the OPENSSL_VERSION_NUMBER to be >= 2.0.0
- *
- * 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
- *  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
- *  true because the LibreSSL API version is "1.0.1")
- *
- */
-
-#ifdef LIBRESSL_VERSION_NUMBER
-/* A macro to test on in this file */
-#define HAS_LIBRESSL
-#endif
-
-#ifdef HAS_LIBRESSL
-/* LibreSSL dislikes FIPS */
-# ifdef FIPS_SUPPORT
-#  undef FIPS_SUPPORT
-# endif
-
-# if LIBRESSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(2,7,0)
-/* LibreSSL wants the 1.0.1 API */
-# define NEED_EVP_COMPATIBILITY_FUNCTIONS
-# endif
-#endif
-
-
-#if OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(1,1,0)
-# define NEED_EVP_COMPATIBILITY_FUNCTIONS
-#endif
-
-
-#ifndef HAS_LIBRESSL
-# if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0)
-#  define HAS_EVP_PKEY_CTX
-# endif
-#endif
-
-
-#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0)
-#include <openssl/modes.h>
-#endif
-
-#include "crypto_callback.h"
-
-#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(0,9,8)	\
-    && !defined(OPENSSL_NO_SHA224) && defined(NID_sha224) \
-    && !defined(OPENSSL_NO_SHA256) /* disabled like this in my sha.h (?) */
-# define HAVE_SHA224
-#endif
-#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(0,9,8)	\
-    && !defined(OPENSSL_NO_SHA256) && defined(NID_sha256)
-# define HAVE_SHA256
-#endif
-#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(0,9,8)	\
-    && !defined(OPENSSL_NO_SHA384) && defined(NID_sha384)\
-    && !defined(OPENSSL_NO_SHA512) /* disabled like this in my sha.h (?) */
-# define HAVE_SHA384
-#endif
-#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(0,9,8)	\
-    && !defined(OPENSSL_NO_SHA512) && defined(NID_sha512)
-# define HAVE_SHA512
-#endif
-#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,7,'e')
-# define HAVE_DES_ede3_cfb_encrypt
-#endif
-
-// SHA3:
-#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,1,1)
-// An error in beta releases of 1.1.1 fixed in production release
-# ifdef NID_sha3_224
-#  define HAVE_SHA3_224
-# endif
-# ifdef NID_sha3_256
-#  define HAVE_SHA3_256
-# endif
-#endif
-# ifdef NID_sha3_384
-#  define HAVE_SHA3_384
-# endif
-# ifdef NID_sha3_512
-#  define HAVE_SHA3_512
-# endif
-
-#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,8,'o') \
-	&& !defined(OPENSSL_NO_EC) \
-	&& !defined(OPENSSL_NO_ECDH) \
-	&& !defined(OPENSSL_NO_ECDSA)
-# define HAVE_EC
-#endif
-
-// (test for >= 1.1.1pre8)
-#if OPENSSL_VERSION_NUMBER >= (PACKED_OPENSSL_VERSION_PLAIN(1,1,1) -7) \
-    && !defined(HAS_LIBRESSL) \
-    && defined(HAVE_EC)
-# define HAVE_ED_CURVE_DH
-# if OPENSSL_VERSION_NUMBER >= (PACKED_OPENSSL_VERSION_PLAIN(1,1,1))
-#   define HAVE_EDDSA
-# endif
-#endif
-
-#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,8,'c')
-# define HAVE_AES_IGE
-#endif
-
-#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,1)
-# define HAVE_EVP_AES_CTR
-# define HAVE_AEAD
-# define HAVE_GCM
-# define HAVE_CCM
-# define HAVE_CMAC
-# if defined(RSA_PKCS1_OAEP_PADDING)
-#   define HAVE_RSA_OAEP_PADDING
-# endif
-# define HAVE_RSA_MGF1_MD
-# if OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION(1,0,1,'d')
-#  define HAVE_GCM_EVP_DECRYPT_BUG
-# endif
-#endif
-
-#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,1,0)
-# ifndef HAS_LIBRESSL
-#  define HAVE_CHACHA20
-#  define HAVE_CHACHA20_POLY1305
-#  define HAVE_RSA_OAEP_MD
-# endif
-#endif
-
-// OPENSSL_VERSION_NUMBER >= 1.1.1-pre8
-#if OPENSSL_VERSION_NUMBER >= (PACKED_OPENSSL_VERSION_PLAIN(1,1,1)-7)
-# ifndef HAS_LIBRESSL
-#  define HAVE_POLY1305
-# endif
-#endif
-
-#if OPENSSL_VERSION_NUMBER <= PACKED_OPENSSL_VERSION(0,9,8,'l')
-# define HAVE_ECB_IVEC_BUG
-#endif
-
-#ifndef HAS_LIBRESSL
-# ifdef RSA_SSLV23_PADDING
-#  define HAVE_RSA_SSLV23_PADDING
-# endif
-#endif
-
-#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0)
-# ifdef RSA_PKCS1_PSS_PADDING
-#  define HAVE_RSA_PKCS1_PSS_PADDING
-# endif
-#endif
-
-#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,8,'h') \
-    && defined(HAVE_EC)
-/* If OPENSSL_NO_EC is set, there will be an error in ec.h included from engine.h
-   So if EC is disabled, you can't use Engine either....
-*/
-# define HAS_ENGINE_SUPPORT
-#endif
-
-
-#if defined(HAS_ENGINE_SUPPORT)
-# include <openssl/engine.h>
-#endif
-
-#if defined(HAVE_CMAC)
-#include <openssl/cmac.h>
-#endif
-
-#if defined(HAVE_EC)
-#include <openssl/ec.h>
-#include <openssl/ecdh.h>
-#include <openssl/ecdsa.h>
-#endif
-
-#ifdef VALGRIND
-    #  include <valgrind/memcheck.h>
-
-/* libcrypto mixes supplied buffer contents into its entropy pool,
-   which makes valgrind complain about the use of uninitialized data.
-   We use this valgrind "request" to make sure that no such seemingly
-   undefined data is returned.
-*/
-    #  define ERL_VALGRIND_MAKE_MEM_DEFINED(ptr,size) \
-    VALGRIND_MAKE_MEM_DEFINED(ptr,size)
-
-    #   define ERL_VALGRIND_ASSERT_MEM_DEFINED(Ptr,Size)			\
-          do {								\
-              int __erl_valgrind_mem_defined = VALGRIND_CHECK_MEM_IS_DEFINED((Ptr),(Size));	\
-              if (__erl_valgrind_mem_defined != 0) {			\
-	          fprintf(stderr,"\r\n####### VALGRIND_ASSSERT(%p,%ld) failed at %s:%d\r\n", \
-		          (Ptr),(long)(Size), __FILE__, __LINE__);	\
-	          abort();						\
-              }								\
-          } while (0)
-
-#else
-    #  define ERL_VALGRIND_MAKE_MEM_DEFINED(ptr,size)
-    #  define ERL_VALGRIND_ASSERT_MEM_DEFINED(ptr,size)
-#endif
-
-#ifdef DEBUG
-    #  define ASSERT(e) \
-    ((void) ((e) ? 1 : (fprintf(stderr,"Assert '%s' failed at %s:%d\n",\
-				#e, __FILE__, __LINE__), abort(), 0)))
-#else
-    #  define ASSERT(e) ((void) 1)
-#endif
-
-#ifdef __GNUC__
-    #  define INLINE __inline__
-#elif defined(__WIN32__)
-    #  define INLINE __forceinline
-#else
-    #  define INLINE
-#endif
-
-
-#define get_int32(s) ((((unsigned char*) (s))[0] << 24) | \
-                      (((unsigned char*) (s))[1] << 16) | \
-                      (((unsigned char*) (s))[2] << 8)  | \
-                      (((unsigned char*) (s))[3]))
-
-#define put_int32(s,i) \
-{ (s)[0] = (char)(((i) >> 24) & 0xff);\
-  (s)[1] = (char)(((i) >> 16) & 0xff);\
-  (s)[2] = (char)(((i) >> 8) & 0xff);\
-  (s)[3] = (char)((i) & 0xff);\
-}
-
-/* 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 CONSUME_REDS(NifEnv, Ibin)			\
-do {							\
-    int _cost = ((Ibin).size  * 100) / MAX_BYTES_TO_NIF;\
-    if (_cost) {                                        \
-        (void) enif_consume_timeslice((NifEnv),		\
-	          (_cost > 100) ? 100 : _cost);		\
-    }                                                   \
- } while (0)
-
-
-#ifdef NEED_EVP_COMPATIBILITY_FUNCTIONS
-/*
- * In OpenSSL 1.1.0, most structs are opaque. That means that
- * the structs cannot be allocated as automatic variables on the
- * C stack (because the size is unknown) and that it is necessary
- * to use access functions.
- *
- * For backward compatibility to previous versions of OpenSSL, define
- * on our versions of the new functions defined in 1.1.0 here, so that
- * we don't have to sprinkle ifdefs throughout the code.
- */
-
-static HMAC_CTX *HMAC_CTX_new(void);
-static void HMAC_CTX_free(HMAC_CTX *ctx);
-
-static HMAC_CTX *HMAC_CTX_new()
-{
-    HMAC_CTX *ctx = CRYPTO_malloc(sizeof(HMAC_CTX), __FILE__, __LINE__);
-    HMAC_CTX_init(ctx);
-    return ctx;
-}
-
-static void HMAC_CTX_free(HMAC_CTX *ctx)
-{
-    HMAC_CTX_cleanup(ctx);
-    CRYPTO_free(ctx);
-}
-
-#define EVP_MD_CTX_new() EVP_MD_CTX_create()
-#define EVP_MD_CTX_free(ctx) EVP_MD_CTX_destroy(ctx)
-
-static INLINE void *BN_GENCB_get_arg(BN_GENCB *cb);
-
-static INLINE void *BN_GENCB_get_arg(BN_GENCB *cb)
-{
-    return cb->arg;
-}
-
-static INLINE int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d);
-static INLINE void RSA_get0_key(const RSA *r, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d);
-static INLINE int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q);
-static INLINE void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q);
-static INLINE int RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp);
-static INLINE void RSA_get0_crt_params(const RSA *r, const BIGNUM **dmp1, const BIGNUM **dmq1, const BIGNUM **iqmp);
-
-static INLINE int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
-{
-    r->n = n;
-    r->e = e;
-    r->d = d;
-    return 1;
-}
-
-static INLINE void RSA_get0_key(const RSA *r, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
-{
-    *n = r->n;
-    *e = r->e;
-    *d = r->d;
-}
-
-static INLINE int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q)
-{
-    r->p = p;
-    r->q = q;
-    return 1;
-}
-
-static INLINE void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q)
-{
-    *p = r->p;
-    *q = r->q;
-}
-
-static INLINE int RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp)
-{
-    r->dmp1 = dmp1;
-    r->dmq1 = dmq1;
-    r->iqmp = iqmp;
-    return 1;
-}
-
-static INLINE void RSA_get0_crt_params(const RSA *r, const BIGNUM **dmp1, const BIGNUM **dmq1, const BIGNUM **iqmp)
-{
-    *dmp1 = r->dmp1;
-    *dmq1 = r->dmq1;
-    *iqmp = r->iqmp;
-}
-
-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)
-{
-    d->pub_key = pub_key;
-    d->priv_key = priv_key;
-    return 1;
-}
-
-static INLINE int DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g)
-{
-    d->p = p;
-    d->q = q;
-    d->g = 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);
-static INLINE void 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);
-
-static INLINE int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key)
-{
-    dh->pub_key = pub_key;
-    dh->priv_key = priv_key;
-    return 1;
-}
-
-static INLINE int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
-{
-    dh->p = p;
-    dh->q = q;
-    dh->g = g;
-    return 1;
-}
-
-static INLINE int DH_set_length(DH *dh, long length)
-{
-    dh->length = length;
-    return 1;
-}
-
-
-
-static INLINE void
-DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
-{
-    *p = dh->p;
-    *q = dh->q;
-    *g = dh->g;
-}
-
-static INLINE void
-DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key)
-{
-    if (pub_key) *pub_key = dh->pub_key;
-    if (priv_key) *priv_key = dh->priv_key;
-}
-
-#else /* End of compatibility definitions. */
-
-#define HAVE_OPAQUE_BN_GENCB
-
-#endif
+#include "common.h"
+
+#include "aead.h"
+#include "aes.h"
+#include "algorithms.h"
+#include "api_ng.h"
+#include "bn.h"
+#include "cipher.h"
+#include "mac.h"
+#include "dh.h"
+#include "digest.h"
+#include "dss.h"
+#include "ec.h"
+#include "ecdh.h"
+#include "eddsa.h"
+#include "engine.h"
+#include "evp.h"
+#include "fips.h"
+#include "hash.h"
+#include "hmac.h"
+#include "info.h"
+#include "math.h"
+#include "pkey.h"
+#include "rand.h"
+#include "rsa.h"
+#include "srp.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);
 
-/* The NIFs: */
-static ERL_NIF_TERM info_lib(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM info_fips(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM enable_fips_mode(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM algorithms(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM hash_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM hash_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM hash_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM hash_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM hmac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM hmac_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM hmac_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM hmac_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM cmac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM block_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM aes_cfb_8_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM aes_cfb_128_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM aes_ige_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM aes_ctr_stream_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM aes_ctr_stream_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM strong_rand_bytes_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM strong_rand_range_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM rand_uniform_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM mod_exp_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM do_exor(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM rc4_set_key(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM rc4_encrypt_with_state(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM pkey_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-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_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[]);
-
-static ERL_NIF_TERM ec_key_generate(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM ecdh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-
-static ERL_NIF_TERM evp_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM evp_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-
-static ERL_NIF_TERM rand_seed_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-
-static ERL_NIF_TERM aead_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM aead_decrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-#ifdef HAVE_GCM_EVP_DECRYPT_BUG
-static ERL_NIF_TERM aes_gcm_decrypt_NO_EVP(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-#endif
-
-static ERL_NIF_TERM chacha20_stream_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM chacha20_stream_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-
-static ERL_NIF_TERM poly1305_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-
-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_name_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);
-static void init_cipher_types(ErlNifEnv* env);
-#ifdef HAVE_EC
-static EC_KEY* ec_key_new(ErlNifEnv* env, ERL_NIF_TERM curve_arg);
-static int term2point(ErlNifEnv* env, ERL_NIF_TERM term,
-		      EC_GROUP *group, EC_POINT **pptr);
-#endif
-static ERL_NIF_TERM bin_from_bn(ErlNifEnv* env, const BIGNUM *bn);
-
-#ifdef HAS_ENGINE_SUPPORT
-static int get_engine_load_cmd_list(ErlNifEnv* env, const ERL_NIF_TERM term, char **cmds, int i);
-static int zero_terminate(ErlNifBinary bin, char **buf);
-#endif
-
 static int library_refc = 0; /* number of users of this dynamic library */
 static int library_initialized = 0;
 
 static ErlNifFunc nif_funcs[] = {
-    {"info_lib", 0, info_lib},
-    {"info_fips", 0, info_fips},
-    {"enable_fips_mode", 1, enable_fips_mode},
-    {"algorithms", 0, algorithms},
-    {"hash_nif", 2, hash_nif},
-    {"hash_init_nif", 1, hash_init_nif},
-    {"hash_update_nif", 2, hash_update_nif},
-    {"hash_final_nif", 1, hash_final_nif},
-    {"hmac_nif", 3, hmac_nif},
-    {"hmac_nif", 4, hmac_nif},
-    {"hmac_init_nif", 2, hmac_init_nif},
-    {"hmac_update_nif", 2, hmac_update_nif},
-    {"hmac_final_nif", 1, hmac_final_nif},
-    {"hmac_final_nif", 2, hmac_final_nif},
-    {"cmac_nif", 3, cmac_nif},
-    {"block_crypt_nif", 5, block_crypt_nif},
-    {"block_crypt_nif", 4, block_crypt_nif},
-    {"aes_ige_crypt_nif", 4, aes_ige_crypt_nif},
-    {"aes_ctr_stream_init", 2, aes_ctr_stream_init},
-    {"aes_ctr_stream_encrypt", 2, aes_ctr_stream_encrypt},
-    {"aes_ctr_stream_decrypt", 2, aes_ctr_stream_encrypt},
-    {"strong_rand_bytes_nif", 1, strong_rand_bytes_nif},
-    {"strong_rand_range_nif", 1, strong_rand_range_nif},
-    {"rand_uniform_nif", 2, rand_uniform_nif},
-    {"mod_exp_nif", 4, mod_exp_nif},
-    {"do_exor", 2, do_exor},
-    {"rc4_set_key", 1, rc4_set_key},
-    {"rc4_encrypt_with_state", 2, rc4_encrypt_with_state},
-    {"pkey_sign_nif", 5, pkey_sign_nif},
-    {"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_key_nif", 4, dh_generate_key_nif},
-    {"dh_compute_key_nif", 3, dh_compute_key_nif},
-    {"evp_compute_key_nif", 3, evp_compute_key_nif},
-    {"evp_generate_key_nif", 1, evp_generate_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},
-
-    {"ec_key_generate", 2, ec_key_generate},
-    {"ecdh_compute_key_nif", 3, ecdh_compute_key_nif},
-
-    {"rand_seed_nif", 1, rand_seed_nif},
-
-    {"aead_encrypt", 6, aead_encrypt},
-    {"aead_decrypt", 6, aead_decrypt},
-
-    {"chacha20_stream_init",    2, chacha20_stream_init},
-    {"chacha20_stream_encrypt", 2, chacha20_stream_crypt},
-    {"chacha20_stream_decrypt", 2, chacha20_stream_crypt},
-
-    {"poly1305_nif", 2, poly1305_nif},
-
-    {"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_name_nif", 1, engine_get_name_nif},
-    {"engine_get_all_methods_nif", 0, engine_get_all_methods_nif}
-
+    {"info_lib", 0, info_lib, 0},
+    {"info_fips", 0, info_fips, 0},
+    {"enable_fips_mode", 1, enable_fips_mode, 0},
+    {"hash_algorithms", 0, hash_algorithms, 0},
+    {"pubkey_algorithms", 0, pubkey_algorithms, 0},
+    {"cipher_algorithms", 0, cipher_algorithms, 0},
+    {"mac_algorithms", 0, mac_algorithms, 0},
+    {"curve_algorithms", 0, curve_algorithms, 0},
+    {"rsa_opts_algorithms", 0, rsa_opts_algorithms, 0},
+    {"hash_info", 1, hash_info_nif, 0},
+    {"hash_nif", 2, hash_nif, 0},
+    {"hash_init_nif", 1, hash_init_nif, 0},
+    {"hash_update_nif", 2, hash_update_nif, 0},
+    {"hash_final_nif", 1, hash_final_nif, 0},
+    {"mac_nif", 4, mac_nif, 0},
+    {"mac_init_nif", 3, mac_init_nif, 0},
+    {"mac_update_nif", 2, mac_update_nif, 0},
+    {"mac_final_nif", 1, mac_final_nif, 0},
+    {"cipher_info_nif", 1, cipher_info_nif, 0},
+    {"aes_ige_crypt_nif", 4, aes_ige_crypt_nif, 0},
+    {"ng_crypto_init_nif", 4, ng_crypto_init_nif, 0},
+    {"ng_crypto_update_nif", 2, ng_crypto_update_nif, 0},
+    {"ng_crypto_update_nif", 3, ng_crypto_update_nif, 0},
+    {"ng_crypto_one_time_nif", 5, ng_crypto_one_time_nif, 0},
+    {"strong_rand_bytes_nif", 1, strong_rand_bytes_nif, 0},
+    {"strong_rand_range_nif", 1, strong_rand_range_nif, 0},
+    {"rand_uniform_nif", 2, rand_uniform_nif, 0},
+    {"mod_exp_nif", 4, mod_exp_nif, 0},
+    {"do_exor", 2, do_exor, 0},
+    {"pkey_sign_nif", 5, pkey_sign_nif, 0},
+    {"pkey_verify_nif", 6, pkey_verify_nif, 0},
+    {"pkey_crypt_nif", 6, pkey_crypt_nif, 0},
+    {"rsa_generate_key_nif", 2, rsa_generate_key_nif, 0},
+    {"dh_generate_key_nif", 4, dh_generate_key_nif, 0},
+    {"dh_compute_key_nif", 3, dh_compute_key_nif, 0},
+    {"evp_compute_key_nif", 3, evp_compute_key_nif, 0},
+    {"evp_generate_key_nif", 1, evp_generate_key_nif, 0},
+    {"privkey_to_pubkey_nif", 2, privkey_to_pubkey_nif, 0},
+    {"srp_value_B_nif", 5, srp_value_B_nif, 0},
+    {"srp_user_secret_nif", 7, srp_user_secret_nif, 0},
+    {"srp_host_secret_nif", 5, srp_host_secret_nif, 0},
+
+    {"ec_key_generate", 2, ec_key_generate, 0},
+    {"ecdh_compute_key_nif", 3, ecdh_compute_key_nif, 0},
+
+    {"rand_seed_nif", 1, rand_seed_nif, 0},
+
+    {"aead_cipher", 7, aead_cipher, 0},
+
+    {"engine_by_id_nif", 1, engine_by_id_nif, 0},
+    {"engine_init_nif", 1, engine_init_nif, 0},
+    {"engine_finish_nif", 1, engine_finish_nif, 0},
+    {"engine_free_nif", 1, engine_free_nif, 0},
+    {"engine_load_dynamic_nif", 0, engine_load_dynamic_nif, 0},
+    {"engine_ctrl_cmd_strings_nif", 3, engine_ctrl_cmd_strings_nif, 0},
+    {"engine_register_nif", 2, engine_register_nif, 0},
+    {"engine_unregister_nif", 2, engine_unregister_nif, 0},
+    {"engine_add_nif", 1, engine_add_nif, 0},
+    {"engine_remove_nif", 1, engine_remove_nif, 0},
+    {"engine_get_first_nif", 0, engine_get_first_nif, 0},
+    {"engine_get_next_nif", 1, engine_get_next_nif, 0},
+    {"engine_get_id_nif", 1, engine_get_id_nif, 0},
+    {"engine_get_name_nif", 1, engine_get_name_nif, 0},
+    {"engine_get_all_methods_nif", 0, engine_get_all_methods_nif, 0}
 };
 
 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))
-
-
-static ERL_NIF_TERM atom_true;
-static ERL_NIF_TERM atom_false;
-static ERL_NIF_TERM atom_sha;
-static ERL_NIF_TERM atom_error;
-static ERL_NIF_TERM atom_rsa_pkcs1_padding;
-static ERL_NIF_TERM atom_rsa_pkcs1_oaep_padding;
-static ERL_NIF_TERM atom_rsa_no_padding;
-static ERL_NIF_TERM atom_signature_md;
-static ERL_NIF_TERM atom_undefined;
-
-static ERL_NIF_TERM atom_ok;
-static ERL_NIF_TERM atom_not_prime;
-static ERL_NIF_TERM atom_not_strong_prime;
-static ERL_NIF_TERM atom_unable_to_check_generator;
-static ERL_NIF_TERM atom_not_suitable_generator;
-static ERL_NIF_TERM atom_check_failed;
-static ERL_NIF_TERM atom_unknown;
-static ERL_NIF_TERM atom_none;
-static ERL_NIF_TERM atom_notsup;
-static ERL_NIF_TERM atom_digest;
-#ifdef FIPS_SUPPORT
-static ERL_NIF_TERM atom_enabled;
-static ERL_NIF_TERM atom_not_enabled;
-#else
-static ERL_NIF_TERM atom_not_supported;
-#endif
-
-#if defined(HAVE_EC)
-static ERL_NIF_TERM atom_ec;
-static ERL_NIF_TERM atom_prime_field;
-static ERL_NIF_TERM atom_characteristic_two_field;
-static ERL_NIF_TERM atom_tpbasis;
-static ERL_NIF_TERM atom_ppbasis;
-static ERL_NIF_TERM atom_onbasis;
-#endif
-
-static ERL_NIF_TERM atom_aes_cfb8;
-static ERL_NIF_TERM atom_aes_cfb128;
-#ifdef HAVE_GCM
-static ERL_NIF_TERM atom_aes_gcm;
-#endif
-#ifdef HAVE_CCM
-static ERL_NIF_TERM atom_aes_ccm;
-#endif
-#ifdef HAVE_CHACHA20_POLY1305
-static ERL_NIF_TERM atom_chacha20_poly1305;
-#endif
-#ifdef HAVE_ECB_IVEC_BUG
-static ERL_NIF_TERM atom_aes_ecb;
-static ERL_NIF_TERM atom_des_ecb;
-static ERL_NIF_TERM atom_blowfish_ecb;
-#endif
-
-static ERL_NIF_TERM atom_rsa;
-static ERL_NIF_TERM atom_dss;
-static ERL_NIF_TERM atom_ecdsa;
-
-#ifdef HAVE_ED_CURVE_DH
-static ERL_NIF_TERM atom_x25519;
-static ERL_NIF_TERM atom_x448;
-#endif
-
-static ERL_NIF_TERM atom_eddsa;
-#ifdef HAVE_EDDSA
-static ERL_NIF_TERM atom_ed25519;
-static ERL_NIF_TERM atom_ed448;
-#endif
-
-static ERL_NIF_TERM atom_rsa_mgf1_md;
-static ERL_NIF_TERM atom_rsa_oaep_label;
-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;
-static ERL_NIF_TERM atom_sha256;
-static ERL_NIF_TERM atom_sha384;
-static ERL_NIF_TERM atom_sha512;
-static ERL_NIF_TERM atom_sha3_224;
-static ERL_NIF_TERM atom_sha3_256;
-static ERL_NIF_TERM atom_sha3_384;
-static ERL_NIF_TERM atom_sha3_512;
-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
-{
-    ErlNifMutex* mtx;
-    int alive;
-    HMAC_CTX* ctx;
-};
-static void hmac_context_dtor(ErlNifEnv* env, struct hmac_context*);
-
-struct digest_type_t {
-    union {
-	const char*  str;        /* before init, NULL for end-of-table */
-	ERL_NIF_TERM atom;       /* after init, 'false' for end-of-table */
-    }type;
-    union {
-	const EVP_MD* (*funcp)(void);  /* before init, NULL if notsup */
-	const EVP_MD* p;               /* after init, NULL if notsup */
-    }md;
-};
-
-static struct digest_type_t digest_types[] =
-{
-    {{"md4"}, {&EVP_md4}},
-    {{"md5"}, {&EVP_md5}},
-    {{"ripemd160"}, {&EVP_ripemd160}},
-    {{"sha"}, {&EVP_sha1}},
-    {{"sha224"},
-#ifdef HAVE_SHA224
-     {&EVP_sha224}
-#else
-     {NULL}
-#endif
-    },
-    {{"sha256"},
-#ifdef HAVE_SHA256
-     {&EVP_sha256}
-#else
-     {NULL}
-#endif
-    },
-    {{"sha384"},
-#ifdef HAVE_SHA384
-     {&EVP_sha384}
-#else
-     {NULL}
-#endif
-    },
-    {{"sha512"},
-#ifdef HAVE_SHA512
-     {&EVP_sha512}
-#else
-     {NULL}
-#endif
-    },
-    {{"sha3_224"},
-#ifdef HAVE_SHA3_224
-     {&EVP_sha3_224}
-#else
-     {NULL}
-#endif
-    },
-    {{"sha3_256"},
-#ifdef HAVE_SHA3_256
-     {&EVP_sha3_256}
-#else
-     {NULL}
-#endif
-    },
-    {{"sha3_384"},
-#ifdef HAVE_SHA3_384
-     {&EVP_sha3_384}
-#else
-     {NULL}
-#endif
-    },
-    {{"sha3_512"},
-#ifdef HAVE_SHA3_512
-     {&EVP_sha3_512}
-#else
-     {NULL}
-#endif
-    },
-
-    {{NULL}}
-};
-
-static struct digest_type_t* get_digest_type(ERL_NIF_TERM type);
-
-struct cipher_type_t {
-    union {
-	const char* str;    /* before init */
-	ERL_NIF_TERM atom;  /* after init */
-    }type;
-    union {
-	const EVP_CIPHER* (*funcp)(void); /* before init, NULL if notsup */
-	const EVP_CIPHER* p;              /* after init, NULL if notsup */
-    }cipher;
-    const size_t key_len;      /* != 0 to also match on key_len */
-};
-
-#ifdef OPENSSL_NO_DES
-#define COND_NO_DES_PTR(Ptr) (NULL)
-#else
-#define COND_NO_DES_PTR(Ptr) (Ptr)
-#endif
-
-static struct cipher_type_t cipher_types[] =
-{
-    {{"rc2_cbc"},
-#ifndef OPENSSL_NO_RC2
-     {&EVP_rc2_cbc}
-#else
-     {NULL}
-#endif
-    },
-    {{"des_cbc"}, {COND_NO_DES_PTR(&EVP_des_cbc)}},
-    {{"des_cfb"}, {COND_NO_DES_PTR(&EVP_des_cfb8)}},
-    {{"des_ecb"}, {COND_NO_DES_PTR(&EVP_des_ecb)}},
-    {{"des_ede3_cbc"}, {COND_NO_DES_PTR(&EVP_des_ede3_cbc)}},
-    {{"des_ede3_cbf"}, /* Misspelled, retained */
-#ifdef HAVE_DES_ede3_cfb_encrypt
-     {COND_NO_DES_PTR(&EVP_des_ede3_cfb8)}
-#else
-     {NULL}
-#endif
-    },
-    {{"des_ede3_cfb"},
-#ifdef HAVE_DES_ede3_cfb_encrypt
-     {COND_NO_DES_PTR(&EVP_des_ede3_cfb8)}
-#else
-     {NULL}
-#endif
-    },
-    {{"blowfish_cbc"}, {&EVP_bf_cbc}},
-    {{"blowfish_cfb64"}, {&EVP_bf_cfb64}},
-    {{"blowfish_ofb64"}, {&EVP_bf_ofb}},
-    {{"blowfish_ecb"}, {&EVP_bf_ecb}},
-    {{"aes_cbc"}, {&EVP_aes_128_cbc}, 16},
-    {{"aes_cbc"}, {&EVP_aes_192_cbc}, 24},
-    {{"aes_cbc"}, {&EVP_aes_256_cbc}, 32},
-    {{"aes_cbc128"}, {&EVP_aes_128_cbc}},
-    {{"aes_cbc256"}, {&EVP_aes_256_cbc}},
-    {{"aes_cfb8"}, {&EVP_aes_128_cfb8}},
-    {{"aes_cfb128"}, {&EVP_aes_128_cfb128}},
-    {{"aes_ecb"}, {&EVP_aes_128_ecb}, 16},
-    {{"aes_ecb"}, {&EVP_aes_192_ecb}, 24},
-    {{"aes_ecb"}, {&EVP_aes_256_ecb}, 32},
-    {{NULL}}
-};
-
-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)
-
-#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0)
-/* Define resource types for OpenSSL context structures. */
-static ErlNifResourceType* evp_md_ctx_rtype;
-struct evp_md_ctx {
-    EVP_MD_CTX* ctx;
-};
-static void evp_md_ctx_dtor(ErlNifEnv* env, struct evp_md_ctx *ctx) {
-    EVP_MD_CTX_free(ctx->ctx);
-}
-#endif
-
-#ifdef HAVE_EVP_AES_CTR
-static ErlNifResourceType* evp_cipher_ctx_rtype;
-struct evp_cipher_ctx {
-    EVP_CIPHER_CTX* ctx;
-};
-static void evp_cipher_ctx_dtor(ErlNifEnv* env, struct evp_cipher_ctx* ctx) {
-    EVP_CIPHER_CTX_free(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)
 {
@@ -1015,46 +143,6 @@ static int verify_lib_version(void)
     return 1;
 }
 
-#ifdef FIPS_SUPPORT
-/* In FIPS mode non-FIPS algorithms are disabled and return badarg. */
-#define CHECK_NO_FIPS_MODE() { if (FIPS_mode()) return atom_notsup; }
-#else
-#define CHECK_NO_FIPS_MODE()
-#endif
-
-#ifdef HAVE_DYNAMIC_CRYPTO_LIB
-
-# if defined(DEBUG)
-static char crypto_callback_name[] = "crypto_callback.debug";
-# elif defined(VALGRIND)
-static char crypto_callback_name[] = "crypto_callback.valgrind";
-# else
-static char crypto_callback_name[] = "crypto_callback";
-# endif
-
-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;
-    }
-    if (i + strlen(newfile) >= bufsz) {
-	PRINTF_ERR0("CRYPTO: lib name too long");
-	return 0;
-    }
-    memcpy(buf, bin->data, i);
-    strcpy(buf+i, newfile);
-    return 1;
-}
-
-static void error_handler(void* null, const char* errstr)
-{
-    PRINTF_ERR1("CRYPTO LOADING ERROR: '%s'", errstr);
-}
-#endif /* HAVE_DYNAMIC_CRYPTO_LIB */
-
 static int initialize(ErlNifEnv* env, ERL_NIF_TERM load_info)
 {
 #ifdef OPENSSL_THREADS
@@ -1068,59 +156,43 @@ static int initialize(ErlNifEnv* env, ERL_NIF_TERM load_info)
     int vernum;
     ErlNifBinary lib_bin;
     char lib_buf[1000];
+#ifdef HAVE_DYNAMIC_CRYPTO_LIB
+    void *handle;
+#endif
 
     if (!verify_lib_version())
 	return __LINE__;
 
     /* load_info: {302, <<"/full/path/of/this/library">>,true|false} */
-    if (!enif_get_tuple(env, load_info, &tpl_arity, &tpl_array)
-	|| tpl_arity != 3
-	|| !enif_get_int(env, tpl_array[0], &vernum)
-	|| vernum != 302
-	|| !enif_inspect_binary(env, tpl_array[1], &lib_bin)) {
+    if (!enif_get_tuple(env, load_info, &tpl_arity, &tpl_array))
+        return __LINE__;
+    if (tpl_arity != 3)
+        return __LINE__;
+    if (!enif_get_int(env, tpl_array[0], &vernum))
+        return __LINE__;
+    if (vernum != 302)
+        return __LINE__;
+    if (!enif_inspect_binary(env, tpl_array[1], &lib_bin))
+        return __LINE__;
 
-	PRINTF_ERR1("CRYPTO: Invalid load_info '%T'", load_info);
+#ifdef HAS_EVP_PKEY_CTX
+    if (!init_mac_ctx(env)) {
 	return __LINE__;
     }
-
-    hmac_context_rtype = enif_open_resource_type(env, NULL, "hmac_context",
-						 (ErlNifResourceDtor*) hmac_context_dtor,
-						 ERL_NIF_RT_CREATE|ERL_NIF_RT_TAKEOVER,
-						 NULL);
-    if (!hmac_context_rtype) {
-	PRINTF_ERR0("CRYPTO: Could not open resource type 'hmac_context'");
+#else
+    if (!init_hmac_ctx(env)) {
 	return __LINE__;
     }
-#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0)
-    evp_md_ctx_rtype = enif_open_resource_type(env, NULL, "EVP_MD_CTX",
-                                               (ErlNifResourceDtor*) evp_md_ctx_dtor,
-                                               ERL_NIF_RT_CREATE|ERL_NIF_RT_TAKEOVER,
-                                               NULL);
-    if (!evp_md_ctx_rtype) {
-        PRINTF_ERR0("CRYPTO: Could not open resource type 'EVP_MD_CTX'");
+#endif
+    if (!init_hash_ctx(env)) {
         return __LINE__;
     }
-#endif
-#ifdef HAVE_EVP_AES_CTR
-    evp_cipher_ctx_rtype = enif_open_resource_type(env, NULL, "EVP_CIPHER_CTX",
-                                                   (ErlNifResourceDtor*) evp_cipher_ctx_dtor,
-                                                   ERL_NIF_RT_CREATE|ERL_NIF_RT_TAKEOVER,
-                                                   NULL);
-    if (!evp_cipher_ctx_rtype) {
-        PRINTF_ERR0("CRYPTO: Could not open resource type 'EVP_CIPHER_CTX'");
+    if (!init_cipher_ctx(env)) {
         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'");
+    if (!init_engine_ctx(env)) {
         return __LINE__;
     }
-#endif
 
     if (library_initialized) {
 	/* Repeated loading of this library (module upgrade).
@@ -1129,149 +201,18 @@ static int initialize(ErlNifEnv* env, ERL_NIF_TERM load_info)
 	return 0;
     }
 
-    atom_true  = enif_make_atom(env,"true");
-    atom_false = enif_make_atom(env,"false");
-    /* Enter FIPS mode */
-    if (tpl_array[2] == atom_true) {
-#ifdef FIPS_SUPPORT
-        if (!FIPS_mode_set(1)) {
-#else
-        {
-#endif
-            PRINTF_ERR0("CRYPTO: Could not setup FIPS mode");
-            return 0;
-        }
-    } else if (tpl_array[2] != atom_false) {
-        PRINTF_ERR1("CRYPTO: Invalid load_info '%T'", load_info);
-        return 0;
+    if (!init_atoms(env, tpl_array[2], load_info)) {
+        return __LINE__;
     }
 
-    atom_sha = enif_make_atom(env,"sha");
-    atom_error = enif_make_atom(env,"error");
-    atom_rsa_pkcs1_padding = enif_make_atom(env,"rsa_pkcs1_padding");
-    atom_rsa_pkcs1_oaep_padding = enif_make_atom(env,"rsa_pkcs1_oaep_padding");
-    atom_rsa_no_padding = enif_make_atom(env,"rsa_no_padding");
-    atom_signature_md = enif_make_atom(env,"signature_md");
-    atom_undefined = enif_make_atom(env,"undefined");
-    atom_ok = enif_make_atom(env,"ok");
-    atom_not_prime = enif_make_atom(env,"not_prime");
-    atom_not_strong_prime = enif_make_atom(env,"not_strong_prime");
-    atom_unable_to_check_generator = enif_make_atom(env,"unable_to_check_generator");
-    atom_not_suitable_generator = enif_make_atom(env,"not_suitable_generator");
-    atom_check_failed = enif_make_atom(env,"check_failed");
-    atom_unknown = enif_make_atom(env,"unknown");
-    atom_none = enif_make_atom(env,"none");
-    atom_notsup = enif_make_atom(env,"notsup");
-    atom_digest = enif_make_atom(env,"digest");
-
-#if defined(HAVE_EC)
-    atom_ec = enif_make_atom(env,"ec");
-    atom_prime_field = enif_make_atom(env,"prime_field");
-    atom_characteristic_two_field = enif_make_atom(env,"characteristic_two_field");
-    atom_tpbasis = enif_make_atom(env,"tpbasis");
-    atom_ppbasis = enif_make_atom(env,"ppbasis");
-    atom_onbasis = enif_make_atom(env,"onbasis");
-#endif
-
-    atom_aes_cfb8 = enif_make_atom(env, "aes_cfb8");
-    atom_aes_cfb128 = enif_make_atom(env, "aes_cfb128");
-#ifdef HAVE_GCM
-    atom_aes_gcm = enif_make_atom(env, "aes_gcm");
-#endif
-#ifdef HAVE_CCM
-    atom_aes_ccm = enif_make_atom(env, "aes_ccm");
-#endif
-#ifdef HAVE_CHACHA20_POLY1305
-    atom_chacha20_poly1305 = enif_make_atom(env,"chacha20_poly1305");
-#endif
-#ifdef HAVE_ECB_IVEC_BUG
-    atom_aes_ecb = enif_make_atom(env, "aes_ecb");
-    atom_des_ecb = enif_make_atom(env, "des_ecb");
-    atom_blowfish_ecb = enif_make_atom(env, "blowfish_ecb");
-#endif
-
-#ifdef FIPS_SUPPORT
-    atom_enabled = enif_make_atom(env,"enabled");
-    atom_not_enabled = enif_make_atom(env,"not_enabled");
-#else
-    atom_not_supported = enif_make_atom(env,"not_supported");
-#endif
-    atom_rsa = enif_make_atom(env,"rsa");
-    atom_dss = enif_make_atom(env,"dss");
-    atom_ecdsa = enif_make_atom(env,"ecdsa");
-#ifdef HAVE_ED_CURVE_DH
-    atom_x25519 = enif_make_atom(env,"x25519");
-    atom_x448 = enif_make_atom(env,"x448");
-#endif
-    atom_eddsa = enif_make_atom(env,"eddsa");
-#ifdef HAVE_EDDSA
-    atom_ed25519 = enif_make_atom(env,"ed25519");
-    atom_ed448 = enif_make_atom(env,"ed448");
-#endif
-    atom_rsa_mgf1_md = enif_make_atom(env,"rsa_mgf1_md");
-    atom_rsa_oaep_label = enif_make_atom(env,"rsa_oaep_label");
-    atom_rsa_oaep_md = enif_make_atom(env,"rsa_oaep_md");
-    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");
-    atom_sha256 = enif_make_atom(env,"sha256");
-    atom_sha384 = enif_make_atom(env,"sha384");
-    atom_sha512 = enif_make_atom(env,"sha512");
-    atom_sha3_224 = enif_make_atom(env,"sha3_224");
-    atom_sha3_256 = enif_make_atom(env,"sha3_256");
-    atom_sha3_384 = enif_make_atom(env,"sha3_384");
-    atom_sha3_512 = enif_make_atom(env,"sha3_512");
-    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
-
-
 #ifdef HAVE_DYNAMIC_CRYPTO_LIB
-    {
-	void* handle;
-	if (!change_basename(&lib_bin, lib_buf, sizeof(lib_buf), crypto_callback_name)) {
-	    return __LINE__;
-	}
-	if (!(handle = enif_dlopen(lib_buf, &error_handler, NULL))) {
-	    return __LINE__;
-	}
-	if (!(funcp = (get_crypto_callbacks_t*) enif_dlsym(handle, "get_crypto_callbacks",
-							   &error_handler, NULL))) {
-	    return __LINE__;
-	}
-    }
+    if (!change_basename(&lib_bin, lib_buf, sizeof(lib_buf), crypto_callback_name))
+        return __LINE__;
+    if ((handle = enif_dlopen(lib_buf, &error_handler, NULL)) == NULL)
+        return __LINE__;
+    if ((funcp = (get_crypto_callbacks_t*) enif_dlsym(handle, "get_crypto_callbacks",
+                                                       &error_handler, NULL)) == NULL)
+        return __LINE__;
 #else /* !HAVE_DYNAMIC_CRYPTO_LIB */
     funcp = &get_crypto_callbacks;
 #endif
@@ -1291,7 +232,10 @@ static int initialize(ErlNifEnv* env, ERL_NIF_TERM load_info)
 	return __LINE__;
     }
 
-    CRYPTO_set_mem_functions(ccb->crypto_alloc, ccb->crypto_realloc, ccb->crypto_free);
+#ifdef HAS_CRYPTO_MEM_FUNCTIONS
+    if (!CRYPTO_set_mem_functions(ccb->crypto_alloc, ccb->crypto_realloc, ccb->crypto_free))
+        return __LINE__;
+#endif
 
 #ifdef OPENSSL_THREADS
     if (nlocks > 0) {
@@ -1304,6 +248,7 @@ static int initialize(ErlNifEnv* env, ERL_NIF_TERM load_info)
 #endif /* OPENSSL_THREADS */
 
     init_digest_types(env);
+    init_mac_types(env);
     init_cipher_types(env);
     init_algorithms_types(env);
 
@@ -1345,4806 +290,3 @@ static void unload(ErlNifEnv* env, void* priv_data)
 {
     --library_refc;
 }
-
-static int algo_hash_cnt, algo_hash_fips_cnt;
-static ERL_NIF_TERM algo_hash[12];   /* increase when extending the list */
-static int algo_pubkey_cnt, algo_pubkey_fips_cnt;
-static ERL_NIF_TERM algo_pubkey[12]; /* increase when extending the list */
-static int algo_cipher_cnt, algo_cipher_fips_cnt;
-static ERL_NIF_TERM algo_cipher[25]; /* increase when extending the list */
-static int algo_mac_cnt, algo_mac_fips_cnt;
-static ERL_NIF_TERM algo_mac[3]; /* increase when extending the list */
-static int algo_curve_cnt, algo_curve_fips_cnt;
-static ERL_NIF_TERM algo_curve[89]; /* increase when extending the list */
-static int algo_rsa_opts_cnt, algo_rsa_opts_fips_cnt;
-static ERL_NIF_TERM algo_rsa_opts[11]; /* increase when extending the list */
-
-static void init_algorithms_types(ErlNifEnv* env)
-{
-    // Validated algorithms first
-    algo_hash_cnt = 0;
-    algo_hash[algo_hash_cnt++] = atom_sha;
-#ifdef HAVE_SHA224
-    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "sha224");
-#endif
-#ifdef HAVE_SHA256
-    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "sha256");
-#endif
-#ifdef HAVE_SHA384
-    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "sha384");
-#endif
-#ifdef HAVE_SHA512
-    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "sha512");
-#endif
-#ifdef HAVE_SHA3_224
-    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "sha3_224");
-#endif
-#ifdef HAVE_SHA3_256
-    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "sha3_256");
-#endif
-#ifdef HAVE_SHA3_384
-    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "sha3_384");
-#endif
-#ifdef HAVE_SHA3_512
-    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "sha3_512");
-#endif
-    // Non-validated algorithms follow
-    algo_hash_fips_cnt = algo_hash_cnt;
-    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "md4");
-    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "md5");
-    algo_hash[algo_hash_cnt++] = enif_make_atom(env, "ripemd160");
-
-    algo_pubkey_cnt = 0;
-    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "rsa");
-    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "dss");
-    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "dh");
-#if defined(HAVE_EC)
-#if !defined(OPENSSL_NO_EC2M)
-    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "ec_gf2m");
-#endif
-    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "ecdsa");
-    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "ecdh");
-#endif
-    // Non-validated algorithms follow
-    algo_pubkey_fips_cnt = algo_pubkey_cnt;
-    // Don't know if Edward curves are fips validated
-#if defined(HAVE_EDDSA)
-    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "eddsa");
-#endif
-    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "srp");
-
-    // Validated algorithms first
-    algo_cipher_cnt = 0;
-#ifndef OPENSSL_NO_DES
-    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "des3_cbc");
-    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "des_ede3");
-#ifdef HAVE_DES_ede3_cfb_encrypt
-    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "des3_cbf");
-    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "des3_cfb");
-#endif
-#endif
-    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "aes_cbc");
-    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "aes_cbc128");
-    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "aes_cfb8");
-    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "aes_cfb128");
-    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "aes_cbc256");
-    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "aes_ctr");
-    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "aes_ecb");
-#if defined(HAVE_GCM)
-    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"aes_gcm");
-#endif
-#if defined(HAVE_CCM)
-    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"aes_ccm");
-#endif
-    // Non-validated algorithms follow
-    algo_cipher_fips_cnt = algo_cipher_cnt;
-#ifdef HAVE_AES_IGE
-    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"aes_ige256");
-#endif
-#ifndef OPENSSL_NO_DES
-    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"des_cbc");
-    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"des_cfb");
-    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"des_ecb");
-#endif
-    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"blowfish_cbc");
-    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"blowfish_cfb64");
-    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"blowfish_ofb64");
-    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"blowfish_ecb");
-#ifndef OPENSSL_NO_RC2
-    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"rc2_cbc");
-#endif
-#ifndef OPENSSL_NO_RC4
-    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"rc4");
-#endif
-#if defined(HAVE_CHACHA20_POLY1305)
-    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"chacha20_poly1305");
-#endif
-#if defined(HAVE_CHACHA20)
-    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"chacha20");
-#endif
- 
-    // Validated algorithms first
-    algo_mac_cnt = 0;
-    algo_mac[algo_mac_cnt++] = enif_make_atom(env,"hmac");
-#ifdef HAVE_CMAC
-    algo_mac[algo_mac_cnt++] = enif_make_atom(env,"cmac");
-#endif
-#ifdef HAVE_POLY1305
-    algo_mac[algo_mac_cnt++] = enif_make_atom(env,"poly1305");
-#endif
-    // Non-validated algorithms follow
-    algo_mac_fips_cnt = algo_mac_cnt;
-
-    // Validated algorithms first
-    algo_curve_cnt = 0;
-#if defined(HAVE_EC)
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp160k1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp160r1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp160r2");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp192r1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp192k1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp224k1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp224r1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp256k1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp256r1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp384r1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp521r1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"prime192v1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"prime192v2");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"prime192v3");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"prime239v1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"prime239v2");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"prime239v3");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"prime256v1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"wtls7");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"wtls9");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"wtls12");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP160r1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP160t1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP192r1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP192t1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP224r1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP224t1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP256r1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP256t1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP320r1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP320t1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP384r1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP384t1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP512r1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"brainpoolP512t1");
-#if !defined(OPENSSL_NO_EC2M)
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect163k1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect163r1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect163r2");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect193r1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect193r2");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect233k1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect233r1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect239k1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect283k1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect283r1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect409k1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect409r1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect571k1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect571r1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2pnb163v1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2pnb163v2");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2pnb163v3");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2pnb176v1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2tnb191v1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2tnb191v2");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2tnb191v3");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2pnb208w1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2tnb239v1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2tnb239v2");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2tnb239v3");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2pnb272w1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2pnb304w1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2tnb359v1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2pnb368w1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"c2tnb431r1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"wtls3");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"wtls5");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"wtls10");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"wtls11");
-#endif
-#endif
-    // Non-validated algorithms follow
-    algo_curve_fips_cnt = algo_curve_cnt;
-#if defined(HAVE_EC)
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp112r1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp112r2");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp128r1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"secp128r2");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"wtls6");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"wtls8");
-#if !defined(OPENSSL_NO_EC2M)
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect113r1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect113r2");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect131r1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"sect131r2");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"wtls1");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"wtls4");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"ipsec3");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"ipsec4");
-#endif
-#endif
-    //--
-#ifdef HAVE_EDDSA
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"ed25519");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"ed448");
-#endif
-#ifdef HAVE_ED_CURVE_DH
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"x25519");
-    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"x448");
-#endif
-
-    // Validated algorithms first
-    algo_rsa_opts_cnt = 0;
-#ifdef HAS_EVP_PKEY_CTX
-# ifdef HAVE_RSA_PKCS1_PSS_PADDING
-    algo_rsa_opts[algo_rsa_opts_cnt++] = enif_make_atom(env,"rsa_pkcs1_pss_padding");
-    algo_rsa_opts[algo_rsa_opts_cnt++] = enif_make_atom(env,"rsa_pss_saltlen");
-# endif
-# ifdef HAVE_RSA_MGF1_MD
-    algo_rsa_opts[algo_rsa_opts_cnt++] = enif_make_atom(env,"rsa_mgf1_md");
-# endif
-# ifdef HAVE_RSA_OAEP_PADDING
-    algo_rsa_opts[algo_rsa_opts_cnt++] = enif_make_atom(env,"rsa_pkcs1_oaep_padding");
-# endif
-# ifdef HAVE_RSA_OAEP_MD
-    algo_rsa_opts[algo_rsa_opts_cnt++] = enif_make_atom(env,"rsa_oaep_label");
-    algo_rsa_opts[algo_rsa_opts_cnt++] = enif_make_atom(env,"rsa_oaep_md");
-# endif
-    algo_rsa_opts[algo_rsa_opts_cnt++] = enif_make_atom(env,"signature_md");
-#endif
-    algo_rsa_opts[algo_rsa_opts_cnt++] = enif_make_atom(env,"rsa_pkcs1_padding");
-    algo_rsa_opts[algo_rsa_opts_cnt++] = enif_make_atom(env,"rsa_x931_padding");
-#ifdef HAVE_RSA_SSLV23_PADDING
-    algo_rsa_opts[algo_rsa_opts_cnt++] = enif_make_atom(env,"rsa_sslv23_padding");
-#endif
-    algo_rsa_opts[algo_rsa_opts_cnt++] = enif_make_atom(env,"rsa_no_padding");
-    algo_rsa_opts_fips_cnt = algo_rsa_opts_cnt;
-
-
-    // Check that the max number of algos is updated
-    ASSERT(algo_hash_cnt <= sizeof(algo_hash)/sizeof(ERL_NIF_TERM));
-    ASSERT(algo_pubkey_cnt <= sizeof(algo_pubkey)/sizeof(ERL_NIF_TERM));
-    ASSERT(algo_cipher_cnt <= sizeof(algo_cipher)/sizeof(ERL_NIF_TERM));
-    ASSERT(algo_mac_cnt <= sizeof(algo_mac)/sizeof(ERL_NIF_TERM));
-    ASSERT(algo_curve_cnt <= sizeof(algo_curve)/sizeof(ERL_NIF_TERM));
-    ASSERT(algo_rsa_opts_cnt <= sizeof(algo_rsa_opts)/sizeof(ERL_NIF_TERM));
-}
-
-static ERL_NIF_TERM algorithms(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{
-#ifdef FIPS_SUPPORT
-    int fips_mode  = FIPS_mode();
-    int hash_cnt   = fips_mode ? algo_hash_fips_cnt   : algo_hash_cnt;
-    int pubkey_cnt = fips_mode ? algo_pubkey_fips_cnt : algo_pubkey_cnt;
-    int cipher_cnt = fips_mode ? algo_cipher_fips_cnt : algo_cipher_cnt;
-    int mac_cnt    = fips_mode ? algo_mac_fips_cnt    : algo_mac_cnt;
-    int curve_cnt    = fips_mode ? algo_curve_fips_cnt    : algo_curve_cnt;
-    int rsa_opts_cnt = fips_mode ? algo_rsa_opts_fips_cnt : algo_rsa_opts_cnt;
-#else
-    int hash_cnt   = algo_hash_cnt;
-    int pubkey_cnt = algo_pubkey_cnt;
-    int cipher_cnt = algo_cipher_cnt;
-    int mac_cnt    = algo_mac_cnt;
-    int curve_cnt    = algo_curve_cnt;
-    int rsa_opts_cnt = algo_rsa_opts_cnt;
-#endif
-    return enif_make_tuple6(env,
-                            enif_make_list_from_array(env, algo_hash,   hash_cnt),
-			    enif_make_list_from_array(env, algo_pubkey, pubkey_cnt),
-			    enif_make_list_from_array(env, algo_cipher, cipher_cnt),
-                            enif_make_list_from_array(env, algo_mac,    mac_cnt),
-			    enif_make_list_from_array(env, algo_curve,  curve_cnt),
-			    enif_make_list_from_array(env, algo_rsa_opts, rsa_opts_cnt)
-                            );
-}
-
-static ERL_NIF_TERM info_lib(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{
-    /* [{<<"OpenSSL">>,9470143,<<"OpenSSL 0.9.8k 25 Mar 2009">>}] */
-
-    static const char libname[] = "OpenSSL";
-    unsigned name_sz = strlen(libname);
-    const char* ver = SSLeay_version(SSLEAY_VERSION);
-    unsigned ver_sz = strlen(ver);
-    ERL_NIF_TERM name_term, ver_term;
-    int ver_num = OPENSSL_VERSION_NUMBER;
-    /* R16:
-     * Ignore library version number from SSLeay() and instead show header
-     * version. Otherwise user might try to call a function that is implemented
-     * by a newer library but not supported by the headers used at compile time.
-     * Example: DES_ede3_cfb_encrypt in 0.9.7i but not in 0.9.7d.
-     *
-     * 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, ver_sz, &ver_term), ver, ver_sz);
-
-    return enif_make_list1(env, enif_make_tuple3(env, name_term,
-						 enif_make_int(env, ver_num),
-						 ver_term));
-}
-
-static ERL_NIF_TERM info_fips(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{
-#ifdef FIPS_SUPPORT
-    return FIPS_mode() ? atom_enabled : atom_not_enabled;
-#else
-    return atom_not_supported;
-#endif
-}
-
-static ERL_NIF_TERM enable_fips_mode(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Boolean) */
-    if (argv[0] == atom_true) {
-#ifdef FIPS_SUPPORT
-        if (FIPS_mode_set(1)) {
-            return atom_true;
-        }
-#endif
-        PRINTF_ERR0("CRYPTO: Could not setup FIPS mode");
-        return atom_false;
-    } else if (argv[0] == atom_false) {
-#ifdef FIPS_SUPPORT
-        if (!FIPS_mode_set(0)) {
-            return atom_false;
-        }
-#endif
-        return atom_true;
-    } else {
-        return enif_make_badarg(env);
-    }
-}
-
-
-#if defined(HAVE_EC)
-static ERL_NIF_TERM make_badarg_maybe(ErlNifEnv* env)
-{
-    ERL_NIF_TERM reason;
-    if (enif_has_pending_exception(env, &reason))
-	return reason; /* dummy return value ignored */
-    else
-	return enif_make_badarg(env);
-}
-#endif
-
-static ERL_NIF_TERM hash_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Type, Data) */
-    struct digest_type_t *digp = NULL;
-    const EVP_MD         *md;
-    ErlNifBinary         data;
-    ERL_NIF_TERM         ret;
-    unsigned             ret_size;
-
-    digp = get_digest_type(argv[0]);
-    if (!digp ||
-        !enif_inspect_iolist_as_binary(env, argv[1], &data)) {
-	return enif_make_badarg(env);
-    }
-    md = digp->md.p;
-    if (!md) {
-	return atom_notsup;
-    }
-
-    ret_size = (unsigned)EVP_MD_size(md);
-    ASSERT(0 < ret_size && ret_size <= EVP_MAX_MD_SIZE);
-    if (!EVP_Digest(data.data, data.size,
-                    enif_make_new_binary(env, ret_size, &ret), &ret_size,
-                    md, NULL)) {
-        return atom_notsup;
-    }
-    ASSERT(ret_size == (unsigned)EVP_MD_size(md));
-
-    CONSUME_REDS(env, data);
-    return ret;
-}
-
-#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0)
-
-static ERL_NIF_TERM hash_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Type) */
-    struct digest_type_t *digp = NULL;
-    struct evp_md_ctx    *ctx;
-    ERL_NIF_TERM         ret;
-
-    digp = get_digest_type(argv[0]);
-    if (!digp) {
-	return enif_make_badarg(env);
-    }
-    if (!digp->md.p) {
-	return atom_notsup;
-    }
-
-    ctx = enif_alloc_resource(evp_md_ctx_rtype, sizeof(struct evp_md_ctx));
-    ctx->ctx = EVP_MD_CTX_new();
-    if (!EVP_DigestInit(ctx->ctx, digp->md.p)) {
-        enif_release_resource(ctx);
-        return atom_notsup;
-    }
-    ret = enif_make_resource(env, ctx);
-    enif_release_resource(ctx);
-    return ret;
-}
-static ERL_NIF_TERM hash_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Context, Data) */
-    struct evp_md_ctx   *ctx, *new_ctx;
-    ErlNifBinary data;
-    ERL_NIF_TERM ret;
-
-    if (!enif_get_resource(env, argv[0], evp_md_ctx_rtype, (void**)&ctx) ||
-        !enif_inspect_iolist_as_binary(env, argv[1], &data)) {
-        return enif_make_badarg(env);
-    }
-
-    new_ctx = enif_alloc_resource(evp_md_ctx_rtype, sizeof(struct evp_md_ctx));
-    new_ctx->ctx = EVP_MD_CTX_new();
-    if (!EVP_MD_CTX_copy(new_ctx->ctx, ctx->ctx) ||
-        !EVP_DigestUpdate(new_ctx->ctx, data.data, data.size)) {
-        enif_release_resource(new_ctx);
-        return atom_notsup;
-    }
-
-    ret = enif_make_resource(env, new_ctx);
-    enif_release_resource(new_ctx);
-    CONSUME_REDS(env, data);
-    return ret;
-}
-static ERL_NIF_TERM hash_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Context) */
-    struct evp_md_ctx *ctx;
-    EVP_MD_CTX        *new_ctx;
-    ERL_NIF_TERM  ret;
-    unsigned      ret_size;
-
-    if (!enif_get_resource(env, argv[0], evp_md_ctx_rtype, (void**)&ctx)) {
-        return enif_make_badarg(env);
-    }
-
-    ret_size = (unsigned)EVP_MD_CTX_size(ctx->ctx);
-    ASSERT(0 < ret_size && ret_size <= EVP_MAX_MD_SIZE);
-
-    new_ctx = EVP_MD_CTX_new();
-    if (!EVP_MD_CTX_copy(new_ctx, ctx->ctx) ||
-        !EVP_DigestFinal(new_ctx,
-                         enif_make_new_binary(env, ret_size, &ret),
-                         &ret_size)) {
-	EVP_MD_CTX_free(new_ctx);
-        return atom_notsup;
-    }
-    EVP_MD_CTX_free(new_ctx);
-    ASSERT(ret_size == (unsigned)EVP_MD_CTX_size(ctx->ctx));
-
-    return ret;
-}
-
-#else /* if OPENSSL_VERSION_NUMBER < 1.0 */
-
-static ERL_NIF_TERM hash_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Type) */
-    typedef int (*init_fun)(unsigned char*);
-    struct digest_type_t *digp = NULL;
-    ERL_NIF_TERM         ctx;
-    size_t               ctx_size = 0;
-    init_fun             ctx_init = 0;
-
-    digp = get_digest_type(argv[0]);
-    if (!digp) {
-	return enif_make_badarg(env);
-    }
-    if (!digp->md.p) {
-	return atom_notsup;
-    }
-
-    switch (EVP_MD_type(digp->md.p))
-    {
-    case NID_md4:
-        ctx_size = MD4_CTX_LEN;
-        ctx_init = (init_fun)(&MD4_Init);
-        break;
-    case NID_md5:
-        ctx_size = MD5_CTX_LEN;
-        ctx_init = (init_fun)(&MD5_Init);
-        break;
-    case NID_ripemd160:
-        ctx_size = RIPEMD160_CTX_LEN;
-        ctx_init = (init_fun)(&RIPEMD160_Init);
-        break;
-    case NID_sha1:
-        ctx_size = sizeof(SHA_CTX);
-        ctx_init = (init_fun)(&SHA1_Init);
-        break;
-#ifdef HAVE_SHA224
-    case NID_sha224:
-        ctx_size = sizeof(SHA256_CTX);
-        ctx_init = (init_fun)(&SHA224_Init);
-        break;
-#endif
-#ifdef HAVE_SHA256
-    case NID_sha256:
-        ctx_size = sizeof(SHA256_CTX);
-        ctx_init = (init_fun)(&SHA256_Init);
-        break;
-#endif
-#ifdef HAVE_SHA384
-    case NID_sha384:
-        ctx_size = sizeof(SHA512_CTX);
-        ctx_init = (init_fun)(&SHA384_Init);
-        break;
-#endif
-#ifdef HAVE_SHA512
-    case NID_sha512:
-        ctx_size = sizeof(SHA512_CTX);
-        ctx_init = (init_fun)(&SHA512_Init);
-        break;
-#endif
-    default:
-        return atom_notsup;
-    }
-    ASSERT(ctx_size);
-    ASSERT(ctx_init);
-
-    ctx_init(enif_make_new_binary(env, ctx_size, &ctx));
-    return enif_make_tuple2(env, argv[0], ctx);
-}
-static ERL_NIF_TERM hash_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* ({Type, Context}, Data) */
-    typedef int (*update_fun)(unsigned char*, const unsigned char*, size_t);
-    ERL_NIF_TERM         new_ctx;
-    ErlNifBinary         ctx, data;
-    const ERL_NIF_TERM   *tuple;
-    int                  arity;
-    struct digest_type_t *digp = NULL;
-    unsigned char        *ctx_buff;
-    size_t               ctx_size   = 0;
-    update_fun           ctx_update = 0;
-
-    if (!enif_get_tuple(env, argv[0], &arity, &tuple) ||
-        arity != 2 ||
-        !(digp = get_digest_type(tuple[0])) ||
-        !enif_inspect_binary(env, tuple[1], &ctx) ||
-        !enif_inspect_iolist_as_binary(env, argv[1], &data)) {
-        return enif_make_badarg(env);
-    }
-    if (!digp->md.p) {
-	return atom_notsup;
-    }
-
-    switch (EVP_MD_type(digp->md.p))
-    {
-    case NID_md4:
-        ctx_size   = MD4_CTX_LEN;
-        ctx_update = (update_fun)(&MD4_Update);
-        break;
-    case NID_md5:
-        ctx_size   = MD5_CTX_LEN;
-        ctx_update = (update_fun)(&MD5_Update);
-        break;
-    case NID_ripemd160:
-        ctx_size   = RIPEMD160_CTX_LEN;
-        ctx_update = (update_fun)(&RIPEMD160_Update);
-        break;
-    case NID_sha1:
-        ctx_size   = sizeof(SHA_CTX);
-        ctx_update = (update_fun)(&SHA1_Update);
-        break;
-#ifdef HAVE_SHA224
-    case NID_sha224:
-        ctx_size   = sizeof(SHA256_CTX);
-        ctx_update = (update_fun)(&SHA224_Update);
-        break;
-#endif
-#ifdef HAVE_SHA256
-    case NID_sha256:
-        ctx_size   = sizeof(SHA256_CTX);
-        ctx_update = (update_fun)(&SHA256_Update);
-        break;
-#endif
-#ifdef HAVE_SHA384
-    case NID_sha384:
-        ctx_size   = sizeof(SHA512_CTX);
-        ctx_update = (update_fun)(&SHA384_Update);
-        break;
-#endif
-#ifdef HAVE_SHA512
-    case NID_sha512:
-        ctx_size   = sizeof(SHA512_CTX);
-        ctx_update = (update_fun)(&SHA512_Update);
-        break;
-#endif
-    default:
-        return atom_notsup;
-    }
-    ASSERT(ctx_size);
-    ASSERT(ctx_update);
-
-    if (ctx.size != ctx_size) {
-        return enif_make_badarg(env);
-    }
-
-    ctx_buff = enif_make_new_binary(env, ctx_size, &new_ctx);
-    memcpy(ctx_buff, ctx.data, ctx_size);
-    ctx_update(ctx_buff, data.data, data.size);
-
-    CONSUME_REDS(env, data);
-    return enif_make_tuple2(env, tuple[0], new_ctx);
-}
-static ERL_NIF_TERM hash_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* ({Type, Context}) */
-    typedef int (*final_fun)(unsigned char*, void*);
-    ERL_NIF_TERM         ret;
-    ErlNifBinary         ctx;
-    const ERL_NIF_TERM   *tuple;
-    int                  arity;
-    struct digest_type_t *digp = NULL;
-    const EVP_MD         *md;
-    void                 *new_ctx;
-    size_t               ctx_size  = 0;
-    final_fun            ctx_final = 0;
-
-    if (!enif_get_tuple(env, argv[0], &arity, &tuple) ||
-        arity != 2 ||
-        !(digp = get_digest_type(tuple[0])) ||
-        !enif_inspect_binary(env, tuple[1], &ctx)) {
-        return enif_make_badarg(env);
-    }
-    md = digp->md.p;
-    if (!md) {
-	return atom_notsup;
-    }
-
-
-    switch (EVP_MD_type(md))
-    {
-    case NID_md4:
-        ctx_size  = MD4_CTX_LEN;
-        ctx_final = (final_fun)(&MD4_Final);
-        break;
-    case NID_md5:
-        ctx_size  = MD5_CTX_LEN;
-        ctx_final = (final_fun)(&MD5_Final);
-        break;
-    case NID_ripemd160:
-        ctx_size  = RIPEMD160_CTX_LEN;
-        ctx_final = (final_fun)(&RIPEMD160_Final);
-        break;
-    case NID_sha1:
-        ctx_size  = sizeof(SHA_CTX);
-        ctx_final = (final_fun)(&SHA1_Final);
-        break;
-#ifdef HAVE_SHA224
-    case NID_sha224:
-        ctx_size  = sizeof(SHA256_CTX);
-        ctx_final = (final_fun)(&SHA224_Final);
-        break;
-#endif
-#ifdef HAVE_SHA256
-    case NID_sha256:
-        ctx_size  = sizeof(SHA256_CTX);
-        ctx_final = (final_fun)(&SHA256_Final);
-        break;
-#endif
-#ifdef HAVE_SHA384
-    case NID_sha384:
-        ctx_size  = sizeof(SHA512_CTX);
-        ctx_final = (final_fun)(&SHA384_Final);
-        break;
-#endif
-#ifdef HAVE_SHA512
-    case NID_sha512:
-        ctx_size  = sizeof(SHA512_CTX);
-        ctx_final = (final_fun)(&SHA512_Final);
-        break;
-#endif
-    default:
-        return atom_notsup;
-    }
-    ASSERT(ctx_size);
-    ASSERT(ctx_final);
-
-    if (ctx.size != ctx_size) {
-        return enif_make_badarg(env);
-    }
-
-    new_ctx = enif_alloc(ctx_size);
-    memcpy(new_ctx, ctx.data, ctx_size);
-    ctx_final(enif_make_new_binary(env, (size_t)EVP_MD_size(md), &ret),
-              new_ctx);
-    enif_free(new_ctx);
-
-    return ret;
-}
-#endif  /* OPENSSL_VERSION_NUMBER < 1.0 */
-
-
-static ERL_NIF_TERM hmac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Type, Key, Data) or (Type, Key, Data, MacSize) */
-    struct digest_type_t *digp = NULL;
-    ErlNifBinary         key, data;
-    unsigned char        buff[EVP_MAX_MD_SIZE];
-    unsigned             size = 0, req_size = 0;
-    ERL_NIF_TERM         ret;
-
-    digp = get_digest_type(argv[0]);
-    if (!digp ||
-        !enif_inspect_iolist_as_binary(env, argv[1], &key) ||
-        !enif_inspect_iolist_as_binary(env, argv[2], &data) ||
-        (argc == 4 && !enif_get_uint(env, argv[3], &req_size))) {
-        return enif_make_badarg(env);
-    }
-
-    if (!digp->md.p ||
-        !HMAC(digp->md.p,
-              key.data, key.size,
-              data.data, data.size,
-              buff, &size)) {
-        return atom_notsup;
-    }
-    ASSERT(0 < size && size <= EVP_MAX_MD_SIZE);
-    CONSUME_REDS(env, data);
-
-    if (argc == 4) {
-        if (req_size <= size) {
-            size = req_size;
-        }
-        else {
-            return enif_make_badarg(env);
-        }
-    }
-    memcpy(enif_make_new_binary(env, size, &ret), buff, size);
-    return ret;
-}
-
-static void hmac_context_dtor(ErlNifEnv* env, struct hmac_context *obj)
-{
-    if (obj->alive) {
-	HMAC_CTX_free(obj->ctx);
-	obj->alive = 0;
-    }
-    enif_mutex_destroy(obj->mtx);
-}
-
-static ERL_NIF_TERM hmac_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Type, Key) */
-    struct digest_type_t *digp = NULL;
-    ErlNifBinary         key;
-    ERL_NIF_TERM         ret;
-    struct hmac_context  *obj;
-
-    digp = get_digest_type(argv[0]);
-    if (!digp ||
-        !enif_inspect_iolist_as_binary(env, argv[1], &key)) {
-        return enif_make_badarg(env);
-    }
-    if (!digp->md.p) {
-        return atom_notsup;
-    }
-
-    obj = enif_alloc_resource(hmac_context_rtype, sizeof(struct hmac_context));
-    obj->mtx = enif_mutex_create("crypto.hmac");
-    obj->alive = 1;
-    obj->ctx = HMAC_CTX_new();
-#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0)
-    // Check the return value of HMAC_Init: it may fail in FIPS mode
-    // for disabled algorithms
-    if (!HMAC_Init_ex(obj->ctx, key.data, key.size, digp->md.p, NULL)) {
-        enif_release_resource(obj);
-        return atom_notsup;
-    }
-#else
-    HMAC_Init_ex(obj->ctx, key.data, key.size, digp->md.p, NULL);
-#endif
-
-    ret = enif_make_resource(env, obj);
-    enif_release_resource(obj);
-    return ret;
-}
-
-static ERL_NIF_TERM hmac_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (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);
-    }
-    enif_mutex_lock(obj->mtx);
-    if (!obj->alive) {
-	enif_mutex_unlock(obj->mtx);
-	return enif_make_badarg(env);
-    }
-    HMAC_Update(obj->ctx, data.data, data.size);
-    enif_mutex_unlock(obj->mtx);
-
-    CONSUME_REDS(env,data);
-    return argv[0];
-}
-
-static ERL_NIF_TERM hmac_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Context) or (Context, HashLen) */
-    ERL_NIF_TERM ret;
-    struct hmac_context* obj;
-    unsigned char mac_buf[EVP_MAX_MD_SIZE];
-    unsigned char * mac_bin;
-    unsigned int req_len = 0;
-    unsigned int mac_len;
-
-    if (!enif_get_resource(env,argv[0],hmac_context_rtype, (void**)&obj)
-	|| (argc == 2 && !enif_get_uint(env, argv[1], &req_len))) {
-	return enif_make_badarg(env);
-    }
-
-    enif_mutex_lock(obj->mtx);
-    if (!obj->alive) {
-	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) {
-        /* Only truncate to req_len bytes if asked. */
-        mac_len = req_len;
-    }
-    mac_bin = enif_make_new_binary(env, mac_len, &ret);
-    memcpy(mac_bin, mac_buf, mac_len);
-
-    return ret;
-}
-
-static ERL_NIF_TERM cmac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Type, Key, Data) */
-#if defined(HAVE_CMAC)
-    struct cipher_type_t *cipherp = NULL;
-    const EVP_CIPHER     *cipher;
-    CMAC_CTX             *ctx;
-    ErlNifBinary         key;
-    ErlNifBinary         data;
-    ERL_NIF_TERM         ret;
-    size_t               ret_size;
-
-    if (!enif_inspect_iolist_as_binary(env, argv[1], &key)
-        || !(cipherp = get_cipher_type(argv[0], key.size))
-        || !enif_inspect_iolist_as_binary(env, argv[2], &data)) {
-        return enif_make_badarg(env);
-    }
-    cipher = cipherp->cipher.p;
-    if (!cipher) {
-        return enif_raise_exception(env, atom_notsup);
-    }
-
-    ctx = CMAC_CTX_new();
-    if (!CMAC_Init(ctx, key.data, key.size, cipher, NULL)) {
-        CMAC_CTX_free(ctx);
-        return atom_notsup;
-    }
-
-    if (!CMAC_Update(ctx, data.data, data.size) ||
-        !CMAC_Final(ctx,
-                    enif_make_new_binary(env, EVP_CIPHER_block_size(cipher), &ret),
-                    &ret_size)) {
-        CMAC_CTX_free(ctx);
-        return atom_notsup;
-    }
-    ASSERT(ret_size == (unsigned)EVP_CIPHER_block_size(cipher));
-
-    CMAC_CTX_free(ctx);
-    CONSUME_REDS(env, data);
-    return ret;
-#else
-    /* The CMAC functionality was introduced in OpenSSL 1.0.1
-     * Although OTP requires at least version 0.9.8, the versions 0.9.8 and 1.0.0 are
-     * no longer maintained. */
-    return atom_notsup;
-#endif
-}
-
-/* For OpenSSL >= 1.1.1 the hmac_nif and cmac_nif could be integrated into poly1305 (with 'type' as parameter) */
-static ERL_NIF_TERM poly1305_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key, Text) */
-#ifdef HAVE_POLY1305
-    ErlNifBinary key_bin, text, ret_bin;
-    ERL_NIF_TERM ret = atom_error;
-    EVP_PKEY *key = NULL;
-    EVP_MD_CTX *mctx = NULL;
-    EVP_PKEY_CTX *pctx = NULL;
-    const EVP_MD *md = NULL;
-    size_t size;
-    int type;
-
-    type = EVP_PKEY_POLY1305;
-
-    if (!enif_inspect_binary(env, argv[0], &key_bin) ||
-        !(key_bin.size == 32) ) {
-        return enif_make_badarg(env);
-    }
-    
-    if (!enif_inspect_binary(env, argv[1], &text) ) {
-        return enif_make_badarg(env);
-    }
-
-    key = EVP_PKEY_new_raw_private_key(type, /*engine*/ NULL, key_bin.data,  key_bin.size);
-
-    if (!key ||
-        !(mctx = EVP_MD_CTX_new()) ||
-        !EVP_DigestSignInit(mctx, &pctx, md, /*engine*/ NULL, key) ||
-        !EVP_DigestSignUpdate(mctx, text.data, text.size)) {
-        goto err;
-    }
-    
-    if (!EVP_DigestSignFinal(mctx, NULL, &size) ||
-        !enif_alloc_binary(size, &ret_bin) ||
-        !EVP_DigestSignFinal(mctx, ret_bin.data, &size)) {
-        goto err;
-    }
-
-    if ((size != ret_bin.size) &&
-        !enif_realloc_binary(&ret_bin, size)) {
-        goto err;
-    }
-
-    ret = enif_make_binary(env, &ret_bin);
-
- err:
-    EVP_MD_CTX_free(mctx);
-    EVP_PKEY_free(key);
-    return ret;
-
-#else
-    return atom_notsup;
-#endif
-}
-
-static ERL_NIF_TERM block_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Type, Key, Ivec, Text, IsEncrypt) or (Type, Key, Text, IsEncrypt) */
-    struct cipher_type_t *cipherp = NULL;
-    const EVP_CIPHER     *cipher;
-    ErlNifBinary         key, ivec, text;
-    EVP_CIPHER_CTX*      ctx;
-    ERL_NIF_TERM         ret;
-    unsigned char        *out;
-    int                  ivec_size, out_size = 0;
-
-    if (!enif_inspect_iolist_as_binary(env, argv[1], &key)
-        || !(cipherp = get_cipher_type(argv[0], key.size))
-        || !enif_inspect_iolist_as_binary(env, argv[argc - 2], &text)) {
-        return enif_make_badarg(env);
-    }
-    cipher = cipherp->cipher.p;
-    if (!cipher) {
-        return enif_raise_exception(env, atom_notsup);
-    }
-
-    if (argv[0] == atom_aes_cfb8
-        && (key.size == 24 || key.size == 32)) {
-        /* Why do EVP_CIPHER_CTX_set_key_length() fail on these key sizes?
-         * Fall back on low level API
-         */
-        return aes_cfb_8_crypt(env, argc-1, argv+1);
-    }
-    else if (argv[0] == atom_aes_cfb128
-        && (key.size == 24 || key.size == 32)) {
-        /* Why do EVP_CIPHER_CTX_set_key_length() fail on these key sizes?
-         * Fall back on low level API
-         */
-        return aes_cfb_128_crypt_nif(env, argc-1, argv+1);
-   }
-
-    ivec_size  = EVP_CIPHER_iv_length(cipher);
-
-#ifdef HAVE_ECB_IVEC_BUG
-    if (argv[0] == atom_aes_ecb || argv[0] == atom_blowfish_ecb ||
-	argv[0] == atom_des_ecb)
-	ivec_size = 0; /* 0.9.8l returns faulty ivec_size */
-#endif
-
-    if (text.size % EVP_CIPHER_block_size(cipher) != 0 ||
-        (ivec_size == 0 ? argc != 4
-                      : (argc != 5 ||
-                         !enif_inspect_iolist_as_binary(env, argv[2], &ivec) ||
-                         ivec.size != ivec_size))) {
-        return enif_make_badarg(env);
-    }
-
-    out = enif_make_new_binary(env, text.size, &ret);
-
-    ctx = EVP_CIPHER_CTX_new();
-    if (!EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL,
-                           (argv[argc - 1] == atom_true)) ||
-        !EVP_CIPHER_CTX_set_key_length(ctx, key.size) ||
-        !(EVP_CIPHER_type(cipher) != NID_rc2_cbc ||
-          EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_SET_RC2_KEY_BITS, key.size * 8, NULL)) ||
-        !EVP_CipherInit_ex(ctx, NULL, NULL,
-                           key.data, ivec_size ? ivec.data : NULL, -1) ||
-        !EVP_CIPHER_CTX_set_padding(ctx, 0)) {
-
-        EVP_CIPHER_CTX_free(ctx);
-        return enif_raise_exception(env, atom_notsup);
-    }
-
-    if (text.size > 0 && /* OpenSSL 0.9.8h asserts text.size > 0 */
-        (!EVP_CipherUpdate(ctx, out, &out_size, text.data, text.size)
-         || (ASSERT(out_size == text.size), 0)
-         || !EVP_CipherFinal_ex(ctx, out + out_size, &out_size))) {
-
-        EVP_CIPHER_CTX_free(ctx);
-        return enif_raise_exception(env, atom_notsup);
-    }
-    ASSERT(out_size == 0);
-    EVP_CIPHER_CTX_free(ctx);
-    CONSUME_REDS(env, text);
-
-    return ret;
-}
-
-static ERL_NIF_TERM aes_cfb_8_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key, IVec, Data, IsEncrypt) */
-     ErlNifBinary key, ivec, text;
-     AES_KEY aes_key;
-     unsigned char ivec_clone[16]; /* writable copy */
-     int new_ivlen = 0;
-     ERL_NIF_TERM ret;
-
-     CHECK_NO_FIPS_MODE();
-
-     if (!enif_inspect_iolist_as_binary(env, argv[0], &key)
-         || !(key.size == 16 || key.size == 24 || key.size == 32)
-         || !enif_inspect_binary(env, argv[1], &ivec) || ivec.size != 16
-         || !enif_inspect_iolist_as_binary(env, argv[2], &text)) {
-         return enif_make_badarg(env);
-     }
-
-     memcpy(ivec_clone, ivec.data, 16);
-     AES_set_encrypt_key(key.data, key.size * 8, &aes_key);
-     AES_cfb8_encrypt((unsigned char *) text.data,
-                      enif_make_new_binary(env, text.size, &ret),
-                      text.size, &aes_key, ivec_clone, &new_ivlen,
-                      (argv[3] == atom_true));
-     CONSUME_REDS(env,text);
-     return ret;
-}
-
-static ERL_NIF_TERM aes_cfb_128_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key, IVec, Data, IsEncrypt) */
-    ErlNifBinary key, ivec, text;
-    AES_KEY aes_key;
-    unsigned char ivec_clone[16]; /* writable copy */
-    int new_ivlen = 0;
-    ERL_NIF_TERM ret;
-
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key)
-        || !(key.size == 16 || key.size == 24 || key.size == 32)
-        || !enif_inspect_binary(env, argv[1], &ivec) || ivec.size != 16
-        || !enif_inspect_iolist_as_binary(env, argv[2], &text)) {
-        return enif_make_badarg(env);
-    }
-
-    memcpy(ivec_clone, ivec.data, 16);
-    AES_set_encrypt_key(key.data, key.size * 8, &aes_key);
-    AES_cfb128_encrypt((unsigned char *) text.data,
-                       enif_make_new_binary(env, text.size, &ret),
-                       text.size, &aes_key, ivec_clone, &new_ivlen,
-                       (argv[3] == atom_true));
-    CONSUME_REDS(env,text);
-    return ret;
-}
-
-static ERL_NIF_TERM aes_ige_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key, IVec, Data, IsEncrypt) */
-#ifdef HAVE_AES_IGE
-    ErlNifBinary key_bin, ivec_bin, data_bin;
-    AES_KEY aes_key;
-    unsigned char ivec[32];
-    int i;
-    unsigned char* ret_ptr;
-    ERL_NIF_TERM ret;
-
-    CHECK_NO_FIPS_MODE();
-
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key_bin)
-       || (key_bin.size != 16 && key_bin.size != 32)
-       || !enif_inspect_binary(env, argv[1], &ivec_bin)
-       || ivec_bin.size != 32
-       || !enif_inspect_iolist_as_binary(env, argv[2], &data_bin)
-       || data_bin.size % 16 != 0) {
-
-       return enif_make_badarg(env);
-    }
-
-    if (argv[3] == atom_true) {
-       i = AES_ENCRYPT;
-       AES_set_encrypt_key(key_bin.data, key_bin.size*8, &aes_key);
-    }
-    else {
-       i = AES_DECRYPT;
-       AES_set_decrypt_key(key_bin.data, key_bin.size*8, &aes_key);
-    }
-
-    ret_ptr = enif_make_new_binary(env, data_bin.size, &ret);
-    memcpy(ivec, ivec_bin.data, 32); /* writable copy */
-    AES_ige_encrypt(data_bin.data, ret_ptr, data_bin.size, &aes_key, ivec, i);
-    CONSUME_REDS(env,data_bin);
-    return ret;
-#else
-    return atom_notsup;
-#endif
-}
-
-
-/* Initializes state for ctr streaming (de)encryption
-*/
-#ifdef HAVE_EVP_AES_CTR
-static ERL_NIF_TERM aes_ctr_stream_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key, IVec) */
-    ErlNifBinary     key_bin, ivec_bin;
-    struct evp_cipher_ctx *ctx;
-    const EVP_CIPHER *cipher;
-    ERL_NIF_TERM     ret;
-
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key_bin)
-        || !enif_inspect_binary(env, argv[1], &ivec_bin)
-        || ivec_bin.size != 16) {
-        return enif_make_badarg(env);
-    }
-
-    switch (key_bin.size)
-    {
-    case 16: cipher = EVP_aes_128_ctr(); break;
-    case 24: cipher = EVP_aes_192_ctr(); break;
-    case 32: cipher = EVP_aes_256_ctr(); break;
-    default: return enif_make_badarg(env);
-    }
-
-    ctx = enif_alloc_resource(evp_cipher_ctx_rtype, sizeof(struct evp_cipher_ctx));
-    ctx->ctx = EVP_CIPHER_CTX_new();
-    EVP_CipherInit_ex(ctx->ctx, cipher, NULL,
-                      key_bin.data, ivec_bin.data, 1);
-    EVP_CIPHER_CTX_set_padding(ctx->ctx, 0);
-    ret = enif_make_resource(env, ctx);
-    enif_release_resource(ctx);
-    return ret;
-}
-static ERL_NIF_TERM aes_ctr_stream_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Context, Data) */
-    struct evp_cipher_ctx *ctx, *new_ctx;
-    ErlNifBinary   data_bin;
-    ERL_NIF_TERM   ret, cipher_term;
-    unsigned char  *out;
-    int            outl = 0;
-
-    if (!enif_get_resource(env, argv[0], evp_cipher_ctx_rtype, (void**)&ctx)
-        || !enif_inspect_iolist_as_binary(env, argv[1], &data_bin)) {
-        return enif_make_badarg(env);
-    }
-    new_ctx = enif_alloc_resource(evp_cipher_ctx_rtype, sizeof(struct evp_cipher_ctx));
-    new_ctx->ctx = EVP_CIPHER_CTX_new();
-    EVP_CIPHER_CTX_copy(new_ctx->ctx, ctx->ctx);
-    out = enif_make_new_binary(env, data_bin.size, &cipher_term);
-    EVP_CipherUpdate(new_ctx->ctx, out, &outl, data_bin.data, data_bin.size);
-    ASSERT(outl == data_bin.size);
-
-    ret = enif_make_tuple2(env, enif_make_resource(env, new_ctx), cipher_term);
-    enif_release_resource(new_ctx);
-    CONSUME_REDS(env,data_bin);
-    return ret;
-}
-
-#else /* if not HAVE_EVP_AES_CTR */
-
-static ERL_NIF_TERM aes_ctr_stream_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key, IVec) */
-    ErlNifBinary key_bin, ivec_bin;
-    ERL_NIF_TERM ecount_bin;
-
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key_bin)
-        || !enif_inspect_binary(env, argv[1], &ivec_bin)
-        || !(key_bin.size == 16 || key_bin.size == 24 || key_bin.size ==32)
-        || ivec_bin.size != 16) {
-        return enif_make_badarg(env);
-    }
-
-    memset(enif_make_new_binary(env, AES_BLOCK_SIZE, &ecount_bin),
-           0, AES_BLOCK_SIZE);
-    return enif_make_tuple4(env, argv[0], argv[1], ecount_bin, enif_make_int(env, 0));
-}
-
-static ERL_NIF_TERM aes_ctr_stream_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* ({Key, IVec, ECount, Num}, Data) */
-    ErlNifBinary key_bin, ivec_bin, text_bin, ecount_bin;
-    AES_KEY aes_key;
-    unsigned int num;
-    ERL_NIF_TERM ret, num2_term, cipher_term, ivec2_term, ecount2_term, new_state_term;
-    int state_arity;
-    const ERL_NIF_TERM *state_term;
-    unsigned char * ivec2_buf;
-    unsigned char * ecount2_buf;
-
-    if (!enif_get_tuple(env, argv[0], &state_arity, &state_term)
-        || state_arity != 4
-        || !enif_inspect_iolist_as_binary(env, state_term[0], &key_bin)
-        || AES_set_encrypt_key(key_bin.data, key_bin.size*8, &aes_key) != 0
-        || !enif_inspect_binary(env, state_term[1], &ivec_bin) || ivec_bin.size != 16
-        || !enif_inspect_binary(env, state_term[2], &ecount_bin) || ecount_bin.size != AES_BLOCK_SIZE
-        || !enif_get_uint(env, state_term[3], &num)
-        || !enif_inspect_iolist_as_binary(env, argv[1], &text_bin)) {
-        return enif_make_badarg(env);
-    }
-
-    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),
-		       text_bin.size, &aes_key, ivec2_buf, ecount2_buf, &num);
-
-    num2_term = enif_make_uint(env, num);
-    new_state_term = enif_make_tuple4(env, state_term[0], ivec2_term, ecount2_term, num2_term);
-    ret = enif_make_tuple2(env, new_state_term, cipher_term);
-    CONSUME_REDS(env,text_bin);
-    return ret;
-}
-#endif /* !HAVE_EVP_AES_CTR */
-
-static ERL_NIF_TERM aead_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Type,Key,Iv,AAD,In) */
-#if defined(HAVE_AEAD)
-    EVP_CIPHER_CTX *ctx;
-    const EVP_CIPHER *cipher = NULL;
-    ErlNifBinary key, iv, aad, in;
-    unsigned int tag_len;
-    unsigned char *outp, *tagp;
-    ERL_NIF_TERM type, out, out_tag;
-    int len, ctx_ctrl_set_ivlen, ctx_ctrl_get_tag;
-
-    type = argv[0];
-
-    if (!enif_is_atom(env, type)
-        || !enif_inspect_iolist_as_binary(env, argv[1], &key)
-	|| !enif_inspect_binary(env, argv[2], &iv)
-	|| !enif_inspect_iolist_as_binary(env, argv[3], &aad)
-	|| !enif_inspect_iolist_as_binary(env, argv[4], &in)
-	|| !enif_get_uint(env, argv[5], &tag_len)) {
-	return enif_make_badarg(env);
-    }
-
-    /* Use cipher_type some day.  Must check block_encrypt|decrypt first */
-#if defined(HAVE_GCM)
-    if (type == atom_aes_gcm) {
-        if ((iv.size > 0)
-            && (1 <= tag_len && tag_len <= 16)) {
-            ctx_ctrl_set_ivlen = EVP_CTRL_GCM_SET_IVLEN;
-            ctx_ctrl_get_tag = EVP_CTRL_GCM_GET_TAG;
-            if (key.size == 16)      cipher = EVP_aes_128_gcm();
-            else if (key.size == 24) cipher = EVP_aes_192_gcm();
-            else if (key.size == 32) cipher = EVP_aes_256_gcm();
-            else enif_make_badarg(env);
-        } else
-            enif_make_badarg(env);
-    } else
-#endif
-#if defined(HAVE_CCM)
-    if (type == atom_aes_ccm) {
-        if ((7 <= iv.size && iv.size <= 13)
-            && (4 <= tag_len && tag_len <= 16)
-            && ((tag_len & 1) == 0)
-            ) {
-            ctx_ctrl_set_ivlen = EVP_CTRL_CCM_SET_IVLEN;
-            ctx_ctrl_get_tag = EVP_CTRL_CCM_GET_TAG;
-            if (key.size == 16)      cipher = EVP_aes_128_ccm();
-            else if (key.size == 24) cipher = EVP_aes_192_ccm();
-            else if (key.size == 32) cipher = EVP_aes_256_ccm();
-            else enif_make_badarg(env);
-        } else
-            enif_make_badarg(env);
-    } else
-#endif
-#if defined(HAVE_CHACHA20_POLY1305)
-    if (type == atom_chacha20_poly1305) {
-        if ((key.size == 32)
-            && (1 <= iv.size && iv.size <= 16)
-            && (tag_len == 16)
-            ) {
-            ctx_ctrl_set_ivlen = EVP_CTRL_AEAD_SET_IVLEN;
-            ctx_ctrl_get_tag = EVP_CTRL_AEAD_GET_TAG,
-                cipher = EVP_chacha20_poly1305();
-        } else enif_make_badarg(env);
-    } else
-#endif
-        return enif_raise_exception(env, atom_notsup);
- 
-    ctx = EVP_CIPHER_CTX_new();
-    if (EVP_EncryptInit_ex(ctx, cipher, NULL, NULL, NULL) != 1) goto out_err;
-    if (EVP_CIPHER_CTX_ctrl(ctx, ctx_ctrl_set_ivlen, iv.size, NULL) != 1) goto out_err;
-
-#if defined(HAVE_CCM)
-    if (type == atom_aes_ccm) {
-        if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_SET_TAG, tag_len, NULL) != 1) goto out_err;
-        if (EVP_EncryptInit_ex(ctx, NULL, NULL, key.data, iv.data) != 1) goto out_err;
-        if (EVP_EncryptUpdate(ctx, NULL, &len, NULL, in.size) != 1) goto out_err;
-    } else
-#endif
-        if (EVP_EncryptInit_ex(ctx, NULL, NULL, key.data, iv.data) != 1) goto out_err;
-
-    if (EVP_EncryptUpdate(ctx, NULL, &len, aad.data, aad.size) != 1) goto out_err;
-
-    outp = enif_make_new_binary(env, in.size, &out);
-
-    if (EVP_EncryptUpdate(ctx, outp, &len, in.data, in.size) != 1) goto out_err;
-    if (EVP_EncryptFinal_ex(ctx, outp/*+len*/, &len) != 1) goto out_err;
-
-    tagp = enif_make_new_binary(env, tag_len, &out_tag);
-
-    if (EVP_CIPHER_CTX_ctrl(ctx, ctx_ctrl_get_tag, tag_len, tagp) != 1) goto out_err;
-
-    EVP_CIPHER_CTX_free(ctx);
-    CONSUME_REDS(env, in);
-    return enif_make_tuple2(env, out, out_tag);
-
-out_err: 
-    EVP_CIPHER_CTX_free(ctx);
-    return atom_error;
-
-#else
-    return enif_raise_exception(env, atom_notsup);
-#endif
-}
-
-static ERL_NIF_TERM aead_decrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Type,Key,Iv,AAD,In,Tag) */
-#if defined(HAVE_AEAD)
-    EVP_CIPHER_CTX *ctx;
-    const EVP_CIPHER *cipher = NULL;
-    ErlNifBinary key, iv, aad, in, tag;
-    unsigned char *outp;
-    ERL_NIF_TERM type, out;
-    int len, ctx_ctrl_set_ivlen, ctx_ctrl_set_tag;
-
-    type = argv[0];
-#if defined(HAVE_GCM_EVP_DECRYPT_BUG)
-    if (type == atom_aes_gcm)
-        return aes_gcm_decrypt_NO_EVP(env, argc, argv);
-#endif
-
-    if (!enif_is_atom(env, type)
-        || !enif_inspect_iolist_as_binary(env, argv[1], &key)
-	|| !enif_inspect_binary(env, argv[2], &iv)
-	|| !enif_inspect_iolist_as_binary(env, argv[3], &aad)
-	|| !enif_inspect_iolist_as_binary(env, argv[4], &in)
-	|| !enif_inspect_iolist_as_binary(env, argv[5], &tag)) {
-	return enif_make_badarg(env);
-    }
-
-    /* Use cipher_type some day.  Must check block_encrypt|decrypt first */
-#if defined(HAVE_GCM)
-    if (type == atom_aes_gcm) {
-        if (iv.size > 0) {
-            ctx_ctrl_set_ivlen = EVP_CTRL_GCM_SET_IVLEN;
-            ctx_ctrl_set_tag = EVP_CTRL_GCM_SET_TAG;
-            if (key.size == 16)      cipher = EVP_aes_128_gcm();
-            else if (key.size == 24) cipher = EVP_aes_192_gcm();
-            else if (key.size == 32) cipher = EVP_aes_256_gcm();
-            else enif_make_badarg(env);
-        } else
-            enif_make_badarg(env);
-    } else
-#endif
-#if defined(HAVE_CCM)
-    if (type == atom_aes_ccm) {
-        if (iv.size > 0) {
-            ctx_ctrl_set_ivlen = EVP_CTRL_CCM_SET_IVLEN;
-            if (key.size == 16)      cipher = EVP_aes_128_ccm();
-            else if (key.size == 24) cipher = EVP_aes_192_ccm();
-            else if (key.size == 32) cipher = EVP_aes_256_ccm();
-            else enif_make_badarg(env);
-        } else
-            enif_make_badarg(env);
-    } else
-#endif
-#if defined(HAVE_CHACHA20_POLY1305)
-    if (type == atom_chacha20_poly1305) {
-        if ((key.size == 32)
-            && (1 <= iv.size && iv.size <= 16)
-            && tag.size == 16
-            ) {
-            ctx_ctrl_set_ivlen = EVP_CTRL_AEAD_SET_IVLEN;
-            ctx_ctrl_set_tag = EVP_CTRL_AEAD_SET_TAG;
-            cipher = EVP_chacha20_poly1305();
-        } else enif_make_badarg(env);
-    } else
-#endif
-        return enif_raise_exception(env, atom_notsup);
-
-    outp = enif_make_new_binary(env, in.size, &out);
-
-    ctx = EVP_CIPHER_CTX_new();
-    if (EVP_DecryptInit_ex(ctx, cipher, NULL, NULL, NULL) != 1) goto out_err;
-    if (EVP_CIPHER_CTX_ctrl(ctx,  ctx_ctrl_set_ivlen, iv.size, NULL) != 1) goto out_err;
-
-#if defined(HAVE_CCM)
-    if (type == atom_aes_ccm) {
-        if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_SET_TAG, tag.size, tag.data) != 1) goto out_err;
-    }
-#endif
-
-    if (EVP_DecryptInit_ex(ctx, NULL, NULL, key.data, iv.data) != 1) goto out_err;
-
-#if defined(HAVE_CCM)
-    if (type == atom_aes_ccm) {
-        if (1 != EVP_DecryptUpdate(ctx, NULL, &len, NULL, in.size)) goto out_err;
-    }
-#endif
-
-    if (EVP_DecryptUpdate(ctx, NULL, &len, aad.data, aad.size) != 1) goto out_err;
-    if (EVP_DecryptUpdate(ctx, outp, &len, in.data, in.size) != 1) goto out_err;
-
-#if defined(HAVE_GCM) || defined(HAVE_CHACHA20_POLY1305)
-    if (type == atom_aes_gcm) {
-         if (EVP_CIPHER_CTX_ctrl(ctx, ctx_ctrl_set_tag, tag.size, tag.data) != 1) goto out_err;
-         if (EVP_DecryptFinal_ex(ctx, outp+len, &len) != 1) goto out_err;
-    }
-#endif
-    EVP_CIPHER_CTX_free(ctx);
-
-    CONSUME_REDS(env, in);
-    return out;
-
-out_err:
-    EVP_CIPHER_CTX_free(ctx);
-    return atom_error;
-#else
-    return enif_raise_exception(env, atom_notsup);
-#endif
-}
-
-#ifdef HAVE_GCM_EVP_DECRYPT_BUG
-static ERL_NIF_TERM aes_gcm_decrypt_NO_EVP(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Type,Key,Iv,AAD,In,Tag) */
-    GCM128_CONTEXT *ctx;
-    ErlNifBinary key, iv, aad, in, tag;
-    AES_KEY aes_key;
-    unsigned char *outp;
-    ERL_NIF_TERM out;
-
-    if (!enif_inspect_iolist_as_binary(env, argv[1], &key)
-        || AES_set_encrypt_key(key.data, key.size*8, &aes_key) != 0
-        || !enif_inspect_binary(env, argv[2], &iv) || iv.size == 0
-        || !enif_inspect_iolist_as_binary(env, argv[3], &aad)
-        || !enif_inspect_iolist_as_binary(env, argv[4], &in)
-        || !enif_inspect_iolist_as_binary(env, argv[5], &tag)) {
-        return enif_make_badarg(env);
-    }
-
-    if (!(ctx = CRYPTO_gcm128_new(&aes_key, (block128_f)AES_encrypt)))
-        return atom_error;
-
-    CRYPTO_gcm128_setiv(ctx, iv.data, iv.size);
-
-    if (CRYPTO_gcm128_aad(ctx, aad.data, aad.size))
-        goto out_err;
-
-    outp = enif_make_new_binary(env, in.size, &out);
-
-    /* decrypt */
-    if (CRYPTO_gcm128_decrypt(ctx, in.data, outp, in.size))
-            goto out_err;
-
-    /* calculate and check the tag */
-    if (CRYPTO_gcm128_finish(ctx, tag.data, tag.size))
-            goto out_err;
-
-    CRYPTO_gcm128_release(ctx);
-    CONSUME_REDS(env, in);
-
-    return out;
-
-out_err:
-    CRYPTO_gcm128_release(ctx);
-    return atom_error;
-}
-#endif /* HAVE_GCM_EVP_DECRYPT_BUG */
-
-
-static ERL_NIF_TERM chacha20_stream_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key, IV) */
-#if defined(HAVE_CHACHA20)
-    ErlNifBinary     key_bin, ivec_bin;
-    struct evp_cipher_ctx *ctx;
-    const EVP_CIPHER *cipher;
-    ERL_NIF_TERM     ret;
-
-    if (!enif_inspect_iolist_as_binary(env, argv[0], &key_bin)
-        || !enif_inspect_binary(env, argv[1], &ivec_bin)
-        || key_bin.size != 32
-        || ivec_bin.size != 16) {
-        return enif_make_badarg(env);
-    }
-
-    cipher = EVP_chacha20();
-
-    ctx = enif_alloc_resource(evp_cipher_ctx_rtype, sizeof(struct evp_cipher_ctx));
-    ctx->ctx = EVP_CIPHER_CTX_new();
-
-
-    EVP_CipherInit_ex(ctx->ctx, cipher, NULL,
-                      key_bin.data, ivec_bin.data, 1);
-    EVP_CIPHER_CTX_set_padding(ctx->ctx, 0);
-    ret = enif_make_resource(env, ctx);
-    enif_release_resource(ctx);
-    return ret;
-#else
-    return enif_raise_exception(env, atom_notsup);
-#endif
-};
-
-static ERL_NIF_TERM chacha20_stream_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (State, Data) */
-#if defined(HAVE_CHACHA20)
-    struct evp_cipher_ctx *ctx, *new_ctx;
-    ErlNifBinary   data_bin;
-    ERL_NIF_TERM   ret, cipher_term;
-    unsigned char  *out;
-    int            outl = 0;
-
-    if (!enif_get_resource(env, argv[0], evp_cipher_ctx_rtype, (void**)&ctx)
-        || !enif_inspect_iolist_as_binary(env, argv[1], &data_bin)) {
-        return enif_make_badarg(env);
-    }
-    new_ctx = enif_alloc_resource(evp_cipher_ctx_rtype, sizeof(struct evp_cipher_ctx));
-    new_ctx->ctx = EVP_CIPHER_CTX_new();
-    EVP_CIPHER_CTX_copy(new_ctx->ctx, ctx->ctx);
-    out = enif_make_new_binary(env, data_bin.size, &cipher_term);
-    EVP_CipherUpdate(new_ctx->ctx, out, &outl, data_bin.data, data_bin.size);
-    ASSERT(outl == data_bin.size);
-
-    ret = enif_make_tuple2(env, enif_make_resource(env, new_ctx), cipher_term);
-    enif_release_resource(new_ctx);
-    CONSUME_REDS(env,data_bin);
-    return ret;
-#else
-    return enif_raise_exception(env, atom_notsup);
-#endif
-};
-
-
-static ERL_NIF_TERM strong_rand_bytes_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Bytes) */
-    unsigned bytes;
-    unsigned char* data;
-    ERL_NIF_TERM ret;
-
-    if (!enif_get_uint(env, argv[0], &bytes)) {
-	return enif_make_badarg(env);
-    }
-    data = enif_make_new_binary(env, bytes, &ret);
-    if ( RAND_bytes(data, bytes) != 1) {
-        return atom_false;
-    }
-    ERL_VALGRIND_MAKE_MEM_DEFINED(data, bytes);
-    return ret;
-}
-
-
-static int get_bn_from_mpint(ErlNifEnv* env, ERL_NIF_TERM term, BIGNUM** bnp)
-{
-    ErlNifBinary bin;
-    int sz;
-    if (!enif_inspect_binary(env,term,&bin)) {
-	return 0;
-    }
-    ERL_VALGRIND_ASSERT_MEM_DEFINED(bin.data, bin.size);
-    sz = bin.size - 4;
-    if (sz < 0 || get_int32(bin.data) != sz) {
-	return 0;
-    }
-    *bnp = BN_bin2bn(bin.data+4, sz, NULL);
-    return 1;
-}
-
-static int get_bn_from_bin(ErlNifEnv* env, ERL_NIF_TERM term, BIGNUM** bnp)
-{
-    ErlNifBinary bin;
-    if (!enif_inspect_binary(env,term,&bin)) {
-	return 0;
-    }
-    ERL_VALGRIND_ASSERT_MEM_DEFINED(bin.data, bin.size);
-    *bnp = BN_bin2bn(bin.data, bin.size, NULL);
-    return 1;
-}
-
-static ERL_NIF_TERM bin_from_bn(ErlNifEnv* env, const BIGNUM *bn)
-{
-    int bn_len;
-    unsigned char *bin_ptr;
-    ERL_NIF_TERM term;
-
-    /* Copy the bignum into an erlang binary. */
-    bn_len = BN_num_bytes(bn);
-    bin_ptr = enif_make_new_binary(env, bn_len, &term);
-    BN_bn2bin(bn, bin_ptr);
-
-    return term;
-}
-
-static ERL_NIF_TERM strong_rand_range_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Range) */
-    BIGNUM *bn_range, *bn_rand;
-    ERL_NIF_TERM ret;
-
-    if(!get_bn_from_bin(env, argv[0], &bn_range)) {
-        return enif_make_badarg(env);
-    }
-
-    bn_rand = BN_new();
-    if (BN_rand_range(bn_rand, bn_range) != 1) {
-        ret = atom_false;
-    }
-    else {
-        ret = bin_from_bn(env, bn_rand);
-    }
-    BN_free(bn_rand);
-    BN_free(bn_range);
-    return ret;
-}
-
-static ERL_NIF_TERM rand_uniform_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Lo,Hi) */
-    BIGNUM *bn_from = NULL, *bn_to, *bn_rand;
-    unsigned char* data;
-    unsigned dlen;
-    ERL_NIF_TERM ret;
-
-    if (!get_bn_from_mpint(env, argv[0], &bn_from)
-	|| !get_bn_from_mpint(env, argv[1], &bn_rand)) {
-	if (bn_from) BN_free(bn_from);
-	return enif_make_badarg(env);
-    }
-
-    bn_to = BN_new();
-    BN_sub(bn_to, bn_rand, bn_from);
-    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);
-    put_int32(data, dlen);
-    BN_bn2bin(bn_rand, data+4);
-    ERL_VALGRIND_MAKE_MEM_DEFINED(data+4, dlen);
-    BN_free(bn_rand);
-    BN_free(bn_from);
-    BN_free(bn_to);
-    return ret;
-}
-
-static ERL_NIF_TERM mod_exp_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Base,Exponent,Modulo,bin_hdr) */
-    BIGNUM *bn_base=NULL, *bn_exponent=NULL, *bn_modulo=NULL, *bn_result;
-    BN_CTX *bn_ctx;
-    unsigned char* ptr;
-    unsigned dlen;
-    unsigned bin_hdr; /* return type: 0=plain binary, 4: mpint */
-    unsigned extra_byte;
-    ERL_NIF_TERM ret;
-
-    if (!get_bn_from_bin(env, argv[0], &bn_base)
-	|| !get_bn_from_bin(env, argv[1], &bn_exponent)
-	|| !get_bn_from_bin(env, argv[2], &bn_modulo)
-	|| !enif_get_uint(env,argv[3],&bin_hdr) || (bin_hdr & ~4)) {
-
-	if (bn_base) BN_free(bn_base);
-	if (bn_exponent) BN_free(bn_exponent);
-	if (bn_modulo) BN_free(bn_modulo);
-	return enif_make_badarg(env);
-    }
-    bn_result = BN_new();
-    bn_ctx = BN_CTX_new();
-    BN_mod_exp(bn_result, bn_base, bn_exponent, bn_modulo, bn_ctx);
-    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) {
-	put_int32(ptr, extra_byte+dlen);
-	ptr[4] = 0; /* extra zeroed byte to ensure a positive mpint */
-	ptr += bin_hdr + extra_byte;
-    }
-    BN_bn2bin(bn_result, ptr);
-    BN_free(bn_result);
-    BN_CTX_free(bn_ctx);
-    BN_free(bn_modulo);
-    BN_free(bn_exponent);
-    BN_free(bn_base);
-    return ret;
-}
-
-static void init_digest_types(ErlNifEnv* env)
-{
-    struct digest_type_t* p = digest_types;
-
-    for (p = digest_types; p->type.str; p++) {
-	p->type.atom = enif_make_atom(env, p->type.str);
-	if (p->md.funcp)
-	    p->md.p = p->md.funcp();
-    }
-    p->type.atom = atom_false;  /* end marker */
-}
-
-static void init_cipher_types(ErlNifEnv* env)
-{
-    struct cipher_type_t* p = cipher_types;
-
-    for (p = cipher_types; p->type.str; p++) {
-	p->type.atom = enif_make_atom(env, p->type.str);
-	if (p->cipher.funcp)
-	    p->cipher.p = p->cipher.funcp();
-    }
-    p->type.atom = atom_false; /* end marker */
-}
-
-static struct digest_type_t* get_digest_type(ERL_NIF_TERM type)
-{
-    struct digest_type_t* p = NULL;
-    for (p = digest_types; p->type.atom != atom_false; p++) {
-	if (type == p->type.atom) {
-	    return p;
-	}
-    }
-    return NULL;
-}
-
-static struct cipher_type_t* get_cipher_type(ERL_NIF_TERM type, size_t key_len)
-{
-    struct cipher_type_t* p = NULL;
-    for (p = cipher_types; p->type.atom != atom_false; p++) {
-	if (type == p->type.atom && (!p->key_len || key_len == p->key_len)) {
-	    return p;
-	}
-    }
-    return NULL;
-}
-
-
-static ERL_NIF_TERM do_exor(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Data1, Data2) */
-    ErlNifBinary d1, d2;
-    unsigned char* ret_ptr;
-    int i;
-    ERL_NIF_TERM ret;
-
-    if (!enif_inspect_iolist_as_binary(env,argv[0], &d1)
-	|| !enif_inspect_iolist_as_binary(env,argv[1], &d2)
-	|| d1.size != d2.size) {
-	return enif_make_badarg(env);
-    }
-    ret_ptr = enif_make_new_binary(env, d1.size, &ret);
-
-    for (i=0; i<d1.size; i++) {
-	ret_ptr[i] = d1.data[i] ^ d2.data[i];
-    }
-    CONSUME_REDS(env,d1);
-    return ret;
-}
-
-static ERL_NIF_TERM rc4_set_key(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Key) */
-#ifndef OPENSSL_NO_RC4
-    ErlNifBinary key;
-    ERL_NIF_TERM ret;
-
-    CHECK_NO_FIPS_MODE();
-
-    if (!enif_inspect_iolist_as_binary(env,argv[0], &key)) {
-	return enif_make_badarg(env);
-    }
-    RC4_set_key((RC4_KEY*)enif_make_new_binary(env, sizeof(RC4_KEY), &ret),
-		key.size, key.data);
-    return ret;
-#else
-    return enif_raise_exception(env, atom_notsup);
-#endif
-}
-
-static ERL_NIF_TERM rc4_encrypt_with_state(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (State, Data) */
-#ifndef OPENSSL_NO_RC4
-    ErlNifBinary state, data;
-    RC4_KEY* rc4_key;
-    ERL_NIF_TERM new_state, new_data;
-
-    CHECK_NO_FIPS_MODE();
-
-    if (!enif_inspect_iolist_as_binary(env,argv[0], &state)
-	|| state.size != sizeof(RC4_KEY)
-	|| !enif_inspect_iolist_as_binary(env,argv[1], &data)) {
-	return enif_make_badarg(env);
-    }
-    rc4_key = (RC4_KEY*)enif_make_new_binary(env, sizeof(RC4_KEY), &new_state);
-    memcpy(rc4_key, state.data, sizeof(RC4_KEY));
-    RC4(rc4_key, data.size, data.data,
-	enif_make_new_binary(env, data.size, &new_data));
-    CONSUME_REDS(env,data);
-    return enif_make_tuple2(env,new_state,new_data);
-#else
-    return enif_raise_exception(env, atom_notsup);
-#endif
-}
-
-static int get_rsa_private_key(ErlNifEnv* env, ERL_NIF_TERM key, RSA *rsa)
-{
-    /* key=[E,N,D]|[E,N,D,P1,P2,E1,E2,C] */
-    ERL_NIF_TERM head, tail;
-    BIGNUM *e, *n, *d;
-    BIGNUM *p, *q;
-    BIGNUM *dmp1, *dmq1, *iqmp;
-
-    if (!enif_get_list_cell(env, key, &head, &tail)
-	|| !get_bn_from_bin(env, head, &e)
-	|| !enif_get_list_cell(env, tail, &head, &tail)
-	|| !get_bn_from_bin(env, head, &n)
-	|| !enif_get_list_cell(env, tail, &head, &tail)
-	|| !get_bn_from_bin(env, head, &d)) {
-	return 0;
-    }
-    (void) RSA_set0_key(rsa, n, e, d);
-    if (enif_is_empty_list(env, tail)) {
-	return 1;
-    }
-    if (!enif_get_list_cell(env, tail, &head, &tail)
-	|| !get_bn_from_bin(env, head, &p)
-	|| !enif_get_list_cell(env, tail, &head, &tail)
-	|| !get_bn_from_bin(env, head, &q)
-	|| !enif_get_list_cell(env, tail, &head, &tail)
-	|| !get_bn_from_bin(env, head, &dmp1)
-	|| !enif_get_list_cell(env, tail, &head, &tail)
-	|| !get_bn_from_bin(env, head, &dmq1)
-	|| !enif_get_list_cell(env, tail, &head, &tail)
-	|| !get_bn_from_bin(env, head, &iqmp)
-	|| !enif_is_empty_list(env, tail)) {
-	return 0;
-    }
-    (void) RSA_set0_factors(rsa, p, q);
-    (void) RSA_set0_crt_params(rsa, dmp1, dmq1, iqmp);
-    return 1;
-}
-
-
-static int get_rsa_public_key(ErlNifEnv* env, ERL_NIF_TERM key, RSA *rsa)
-{
-    /* key=[E,N] */
-    ERL_NIF_TERM head, tail;
-    BIGNUM *e, *n;
-
-    if (!enif_get_list_cell(env, key, &head, &tail)
-	|| !get_bn_from_bin(env, head, &e)
-	|| !enif_get_list_cell(env, tail, &head, &tail)
-	|| !get_bn_from_bin(env, head, &n)
-        || !enif_is_empty_list(env, tail)) {
-	return 0;
-    }
-
-    (void) RSA_set0_key(rsa, n, e, NULL);
-    return 1;
-}
-
-#ifdef HAVE_EDDSA
- static int get_eddsa_key(ErlNifEnv* env, int public, ERL_NIF_TERM key, EVP_PKEY **pkey)
-{
-    /* key=[K] */
-    ERL_NIF_TERM head, tail, tail2, algo;
-    ErlNifBinary bin;
-    int type;
-
-    if (!enif_get_list_cell(env, key, &head, &tail)
-	|| !enif_inspect_binary(env, head, &bin)
-        || !enif_get_list_cell(env, tail, &algo, &tail2)
-        || !enif_is_empty_list(env, tail2)) {
-	return 0;
-    }
-    if (algo == atom_ed25519) type = EVP_PKEY_ED25519;
-    else if (algo == atom_ed448) type = EVP_PKEY_ED448;
-    else
-        return 0;
-
-    if (public)
-        *pkey = EVP_PKEY_new_raw_public_key(type, NULL, bin.data, bin.size);
-    else 
-        *pkey = EVP_PKEY_new_raw_private_key(type, NULL, bin.data, bin.size);
-
-    if (!pkey)
-        return 0;
-    return 1;
-}
-#endif
-
-static int get_dss_private_key(ErlNifEnv* env, ERL_NIF_TERM key, DSA *dsa)
-{
-    /* key=[P,Q,G,KEY] */
-    ERL_NIF_TERM head, tail;
-    BIGNUM *dsa_p = NULL, *dsa_q = NULL, *dsa_g = NULL;
-    BIGNUM *dummy_pub_key, *priv_key = NULL;
-
-    if (!enif_get_list_cell(env, key, &head, &tail)
-	|| !get_bn_from_bin(env, head, &dsa_p)
-	|| !enif_get_list_cell(env, tail, &head, &tail)
-	|| !get_bn_from_bin(env, head, &dsa_q)
-	|| !enif_get_list_cell(env, tail, &head, &tail)
-	|| !get_bn_from_bin(env, head, &dsa_g)
-	|| !enif_get_list_cell(env, tail, &head, &tail)
-	|| !get_bn_from_bin(env, head, &priv_key)
-	|| !enif_is_empty_list(env,tail)) {
-	if (dsa_p) BN_free(dsa_p);
-	if (dsa_q) BN_free(dsa_q);
-	if (dsa_g) BN_free(dsa_g);
-	if (priv_key) BN_free(priv_key);
-	return 0;
-    }
-
-    /* Note: DSA_set0_key() does not allow setting only the
-     * private key, although DSA_sign() does not use the
-     * public key. Work around this limitation by setting
-     * the public key to a copy of the private key.
-     */
-    dummy_pub_key = BN_dup(priv_key);
-
-    DSA_set0_pqg(dsa, dsa_p, dsa_q, dsa_g);
-    DSA_set0_key(dsa, dummy_pub_key, priv_key);
-    return 1;
-}
-
-
-static int get_dss_public_key(ErlNifEnv* env, ERL_NIF_TERM key, DSA *dsa)
-{
-    /* key=[P, Q, G, Y] */
-    ERL_NIF_TERM head, tail;
-    BIGNUM *dsa_p = NULL, *dsa_q = NULL, *dsa_g = NULL, *dsa_y = NULL;
-
-    if (!enif_get_list_cell(env, key, &head, &tail)
-	|| !get_bn_from_bin(env, head, &dsa_p)
-	|| !enif_get_list_cell(env, tail, &head, &tail)
-	|| !get_bn_from_bin(env, head, &dsa_q)
-	|| !enif_get_list_cell(env, tail, &head, &tail)
-	|| !get_bn_from_bin(env, head, &dsa_g)
-	|| !enif_get_list_cell(env, tail, &head, &tail)
-	|| !get_bn_from_bin(env, head, &dsa_y)
-	|| !enif_is_empty_list(env,tail)) {
-	if (dsa_p) BN_free(dsa_p);
-	if (dsa_q) BN_free(dsa_q);
-	if (dsa_g) BN_free(dsa_g);
-	if (dsa_y) BN_free(dsa_y);
-	return 0;
-    }
-
-    DSA_set0_pqg(dsa, dsa_p, dsa_q, dsa_g);
-    DSA_set0_key(dsa, dsa_y, NULL);
-    return 1;
-}
-
-/* Creates a term which can be parsed by get_rsa_private_key(). This is a list of plain integer binaries (not mpints). */
-static ERL_NIF_TERM put_rsa_private_key(ErlNifEnv* env, const RSA *rsa)
-{
-    ERL_NIF_TERM result[8];
-    const BIGNUM *n, *e, *d, *p, *q, *dmp1, *dmq1, *iqmp;
-
-    /* Return at least [E,N,D] */
-    n = NULL; e = NULL; d = NULL;
-    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
-    result[2] = bin_from_bn(env, d);  // Exponent D
-
-    /* Check whether the optional additional parameters are available */
-    p = NULL; q = NULL;
-    RSA_get0_factors(rsa, &p, &q);
-    dmp1 = NULL; dmq1 = NULL; iqmp = NULL;
-    RSA_get0_crt_params(rsa, &dmp1, &dmq1, &iqmp);
-
-    if (p && q && dmp1 && dmq1 && iqmp) {
-	result[3] = bin_from_bn(env, p);     // Factor p
-	result[4] = bin_from_bn(env, q);     // Factor q
-	result[5] = bin_from_bn(env, dmp1);  // D mod (p-1)
-	result[6] = bin_from_bn(env, dmq1);  // D mod (q-1)
-	result[7] = bin_from_bn(env, iqmp);  // (1/q) mod p
-
-	return enif_make_list_from_array(env, result, 8);
-    } else {
-	return enif_make_list_from_array(env, result, 3);
-    }
-}
-
-static int check_erlang_interrupt(int maj, int min, BN_GENCB *ctxt)
-{
-    ErlNifEnv *env = BN_GENCB_get_arg(ctxt);
-
-    if (!enif_is_current_process_alive(env)) {
-	return 0;
-    } else {
-	return 1;
-    }
-}
-
-static ERL_NIF_TERM rsa_generate_key(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (ModulusSize, PublicExponent) */
-    int modulus_bits;
-    BIGNUM *pub_exp, *three;
-    RSA *rsa;
-    int success;
-    ERL_NIF_TERM result;
-    BN_GENCB *intr_cb;
-#ifndef HAVE_OPAQUE_BN_GENCB
-    BN_GENCB intr_cb_buf;
-#endif
-
-    if (!enif_get_int(env, argv[0], &modulus_bits) || modulus_bits < 256) {
-	return enif_make_badarg(env);
-    }
-
-    if (!get_bn_from_bin(env, argv[1], &pub_exp)) {
-	return enif_make_badarg(env);
-    }
-
-    /* Make sure the public exponent is large enough (at least 3).
-     * Without this, RSA_generate_key_ex() can run forever. */
-    three = BN_new();
-    BN_set_word(three, 3);
-    success = BN_cmp(pub_exp, three);
-    BN_free(three);
-    if (success < 0) {
-	BN_free(pub_exp);
-	return enif_make_badarg(env);
-    }
-
-    /* For large keys, prime generation can take many seconds. Set up
-     * the callback which we use to test whether the process has been
-     * interrupted. */
-#ifdef HAVE_OPAQUE_BN_GENCB
-    intr_cb = BN_GENCB_new();
-#else
-    intr_cb = &intr_cb_buf;
-#endif
-    BN_GENCB_set(intr_cb, check_erlang_interrupt, env);
-
-    rsa = RSA_new();
-    success = RSA_generate_key_ex(rsa, modulus_bits, pub_exp, intr_cb);
-    BN_free(pub_exp);
-
-#ifdef HAVE_OPAQUE_BN_GENCB
-    BN_GENCB_free(intr_cb);
-#endif
-
-    if (!success) {
-        RSA_free(rsa);
-	return atom_error;
-    }
-
-    result = put_rsa_private_key(env, rsa);
-    RSA_free(rsa);
-
-    return result;
-}
-
-static ERL_NIF_TERM rsa_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{
-    /* RSA key generation can take a long time (>1 sec for a large
-     * modulus), so schedule it as a CPU-bound operation. */
-    return enif_schedule_nif(env, "rsa_generate_key",
-			     ERL_NIF_DIRTY_JOB_CPU_BOUND,
-			     rsa_generate_key, argc, argv);
-}
-
-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 = NULL;
-    int mpint; /* 0 or 4 */
-
-    {
-        ERL_NIF_TERM head, tail;
-        BIGNUM
-            *dh_p = NULL,
-            *dh_g = NULL,
-            *priv_key_in = NULL;
-        unsigned long
-            len = 0;
-
-        if (!(get_bn_from_bin(env, argv[0], &priv_key_in)
-              || argv[0] == atom_undefined)
-            || !enif_get_list_cell(env, argv[1], &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)
-            || !enif_get_int(env, argv[2], &mpint) || (mpint & ~4)
-            || !enif_get_ulong(env, argv[3], &len)
-
-            /* Load dh_params with values to use by the generator.
-               Mem mgmnt transfered from dh_p etc to dh_params */
-            || !(dh_params = DH_new())
-            || (priv_key_in && !DH_set0_key(dh_params, NULL, priv_key_in))
-            || !DH_set0_pqg(dh_params, dh_p, NULL, dh_g)
-            ) {
-            if (priv_key_in) BN_free(priv_key_in);
-            if (dh_p) BN_free(dh_p);
-            if (dh_g) BN_free(dh_g);
-            if (dh_params) DH_free(dh_params);
-            return enif_make_badarg(env);
-        }
-
-        if (len) {
-            if (len < BN_num_bits(dh_p))
-                DH_set_length(dh_params, len);
-            else {
-                if (priv_key_in) BN_free(priv_key_in);
-                if (dh_p) BN_free(dh_p);
-                if (dh_g) BN_free(dh_g);
-                if (dh_params) DH_free(dh_params);
-                return enif_make_badarg(env);
-            }
-        }
-    }
-
-#ifdef HAS_EVP_PKEY_CTX
-    {
-        EVP_PKEY_CTX *ctx;
-        EVP_PKEY *dhkey, *params;
-        int success;
-
-        params = EVP_PKEY_new();
-        success = EVP_PKEY_set1_DH(params, dh_params);   /* set the key referenced by params to dh_params... */
-        DH_free(dh_params);                              /* ...dh_params (and params) must be freed */
-        if (!success) return atom_error;
-
-        ctx = EVP_PKEY_CTX_new(params, NULL);
-        EVP_PKEY_free(params);
-        if (!ctx) {
-            return atom_error;
-        }
-
-        if (!EVP_PKEY_keygen_init(ctx)) {
-            /* EVP_PKEY_CTX_free(ctx); */
-            return atom_error;
-        }
-
-        dhkey = EVP_PKEY_new();
-        if (!EVP_PKEY_keygen(ctx, &dhkey)) {         /* "performs a key generation operation, the ... */
-                                                     /*... generated key is written to ppkey." (=last arg) */
-             /* EVP_PKEY_CTX_free(ctx); */
-             /* EVP_PKEY_free(dhkey); */
-             return atom_error;
-        }
-
-        dh_params = EVP_PKEY_get1_DH(dhkey); /* return the referenced key. dh_params and dhkey must be freed */
-        EVP_PKEY_free(dhkey);
-        if (!dh_params) {
-            /* EVP_PKEY_CTX_free(ctx); */
-            return atom_error;
-        }
-        EVP_PKEY_CTX_free(ctx);
-    }
-#else
-    if (!DH_generate_key(dh_params)) return atom_error;
-#endif
-    {
-        unsigned char *pub_ptr, *prv_ptr;
-        int pub_len, prv_len;
-        ERL_NIF_TERM ret_pub, ret_prv;
-        const BIGNUM *pub_key_gen, *priv_key_gen;
-
-        DH_get0_key(dh_params,
-                    &pub_key_gen, &priv_key_gen); /* Get pub_key_gen and priv_key_gen.
-                                                     "The values point to the internal representation of
-                                                     the public key and private key values. This memory
-                                                     should not be freed directly." says man */
-        pub_len = BN_num_bytes(pub_key_gen);
-        prv_len = BN_num_bytes(priv_key_gen);
-        pub_ptr = enif_make_new_binary(env, pub_len+mpint, &ret_pub);
-        prv_ptr = enif_make_new_binary(env, prv_len+mpint, &ret_prv);
-        if (mpint) {
-            put_int32(pub_ptr, pub_len); pub_ptr += 4;
-            put_int32(prv_ptr, prv_len); prv_ptr += 4;
-        }
-        BN_bn2bin(pub_key_gen, pub_ptr);
-        BN_bn2bin(priv_key_gen, prv_ptr);
-        ERL_VALGRIND_MAKE_MEM_DEFINED(pub_ptr, pub_len);
-        ERL_VALGRIND_MAKE_MEM_DEFINED(prv_ptr, prv_len);
-
-        DH_free(dh_params);
-
-        return enif_make_tuple2(env, ret_pub, ret_prv);
-    }
-}
-
-static ERL_NIF_TERM dh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (OthersPublicKey, MyPrivateKey, DHParams=[P,G]) */
-    BIGNUM *other_pub_key = NULL,
-        *dh_p = NULL,
-        *dh_g = NULL;
-    DH *dh_priv = DH_new();
-
-    /* Check the arguments and get
-          my private key (dh_priv),
-          the peer's public key (other_pub_key),
-          the parameters p & q
-    */
-
-    {
-        BIGNUM *dummy_pub_key = NULL,
-               *priv_key = NULL;
-        ERL_NIF_TERM head, tail;
-
-        if (!get_bn_from_bin(env, argv[0], &other_pub_key)
-            || !get_bn_from_bin(env, argv[1], &priv_key)
-            || !enif_get_list_cell(env, argv[2], &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)
-
-            /* Note: DH_set0_key() does not allow setting only the
-             * private key, although DH_compute_key() does not use the
-             * public key. Work around this limitation by setting
-             * the public key to a copy of the private key.
-             */
-            || !(dummy_pub_key = BN_dup(priv_key))
-            || !DH_set0_key(dh_priv, dummy_pub_key, priv_key)
-            || !DH_set0_pqg(dh_priv, dh_p, NULL, dh_g)
-            ) {
-            if (dh_p) BN_free(dh_p);
-            if (dh_g) BN_free(dh_g);
-            if (other_pub_key) BN_free(other_pub_key);
-            if (dummy_pub_key) BN_free(dummy_pub_key);
-            if (priv_key) BN_free(priv_key);
-            return enif_make_badarg(env);
-        }
-    }
-    {
-        ErlNifBinary ret_bin;
-        int size;
-
-        enif_alloc_binary(DH_size(dh_priv), &ret_bin);
-        size = DH_compute_key(ret_bin.data, other_pub_key, dh_priv);
-        BN_free(other_pub_key);
-        DH_free(dh_priv);
-        if (size<=0) {
-            enif_release_binary(&ret_bin);
-            return atom_error;
-        }
-
-        if (size != ret_bin.size) enif_realloc_binary(&ret_bin, size);
-        return enif_make_binary(env, &ret_bin);
-    }
-}
-
-
-static ERL_NIF_TERM srp_value_B_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Multiplier, Verifier, Generator, Exponent, Prime) */
-    BIGNUM *bn_verifier = NULL;
-    BIGNUM *bn_exponent = NULL, *bn_generator = NULL, *bn_prime = NULL, *bn_multiplier = NULL, *bn_result;
-    BN_CTX *bn_ctx;
-    unsigned char* ptr;
-    unsigned dlen;
-    ERL_NIF_TERM ret;
-
-    CHECK_NO_FIPS_MODE();
-
-    if (!get_bn_from_bin(env, argv[0], &bn_multiplier)
-	|| !get_bn_from_bin(env, argv[1], &bn_verifier)
-	|| !get_bn_from_bin(env, argv[2], &bn_generator)
-	|| !get_bn_from_bin(env, argv[3], &bn_exponent)
-	|| !get_bn_from_bin(env, argv[4], &bn_prime)) {
-	if (bn_multiplier) BN_free(bn_multiplier);
-	if (bn_verifier) BN_free(bn_verifier);
-	if (bn_generator) BN_free(bn_generator);
-	if (bn_exponent) BN_free(bn_exponent);
-	if (bn_prime) BN_free(bn_prime);
-	return enif_make_badarg(env);
-    }
-
-    bn_result = BN_new();
-    bn_ctx = BN_CTX_new();
-
-    /* B = k*v + g^b % N */
-
-    /* k * v */
-    BN_mod_mul(bn_multiplier, bn_multiplier, bn_verifier, bn_prime, bn_ctx);
-
-    /* g^b % N */
-    BN_mod_exp(bn_result, bn_generator, bn_exponent, bn_prime, bn_ctx);
-
-    /* k*v + g^b % N */
-    BN_mod_add(bn_result, bn_result, bn_multiplier, bn_prime, bn_ctx);
-
-    /* check that B % N != 0, reuse bn_multiplier */
-    BN_nnmod(bn_multiplier, bn_result, bn_prime, bn_ctx);
-    if (BN_is_zero(bn_multiplier)) {
-	ret = atom_error;
-    } else {
-	dlen = BN_num_bytes(bn_result);
-	ptr = enif_make_new_binary(env, dlen, &ret);
-	BN_bn2bin(bn_result, ptr);
-    }
-    BN_free(bn_result);
-    BN_CTX_free(bn_ctx);
-    BN_free(bn_prime);
-    BN_free(bn_generator);
-    BN_free(bn_multiplier);
-    BN_free(bn_exponent);
-    BN_free(bn_verifier);
-    return ret;
-}
-
-static ERL_NIF_TERM srp_user_secret_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (a, u, B, Multiplier, Prime, Exponent, Generator) */
-/*
-        <premaster secret> = (B - (k * g^x)) ^ (a + (u * x)) % N
-*/
-    BIGNUM *bn_exponent = NULL, *bn_a = NULL;
-    BIGNUM *bn_u = NULL, *bn_multiplier = NULL, *bn_exp2,
-        *bn_base, *bn_prime = NULL, *bn_generator = NULL,
-        *bn_B = NULL, *bn_result;
-    BN_CTX *bn_ctx;
-    unsigned char* ptr;
-    unsigned dlen;
-    ERL_NIF_TERM ret;
-
-    CHECK_NO_FIPS_MODE();
-
-    if (!get_bn_from_bin(env, argv[0], &bn_a)
-	|| !get_bn_from_bin(env, argv[1], &bn_u)
-	|| !get_bn_from_bin(env, argv[2], &bn_B)
-	|| !get_bn_from_bin(env, argv[3], &bn_multiplier)
-	|| !get_bn_from_bin(env, argv[4], &bn_generator)
-	|| !get_bn_from_bin(env, argv[5], &bn_exponent)
-	|| !get_bn_from_bin(env, argv[6], &bn_prime))
-    {
-	if (bn_exponent) BN_free(bn_exponent);
-	if (bn_a) BN_free(bn_a);
-	if (bn_u) BN_free(bn_u);
-	if (bn_B) BN_free(bn_B);
-	if (bn_multiplier) BN_free(bn_multiplier);
-	if (bn_generator) BN_free(bn_generator);
-	if (bn_prime) BN_free(bn_prime);
-	return enif_make_badarg(env);
-    }
-
-    bn_ctx = BN_CTX_new();
-    bn_result = BN_new();
-
-    /* check that B % N != 0 */
-    BN_nnmod(bn_result, bn_B, bn_prime, bn_ctx);
-    if (BN_is_zero(bn_result)) {
-	BN_free(bn_exponent);
-	BN_free(bn_a);
-	BN_free(bn_generator);
-	BN_free(bn_prime);
-	BN_free(bn_u);
-	BN_free(bn_B);
-	BN_CTX_free(bn_ctx);
-
-	return atom_error;
-    }
-
-    /* (B - (k * g^x)) */
-    bn_base = BN_new();
-    BN_mod_exp(bn_result, bn_generator, bn_exponent, bn_prime, bn_ctx);
-    BN_mod_mul(bn_result, bn_multiplier, bn_result, bn_prime, bn_ctx);
-    BN_mod_sub(bn_base, bn_B, bn_result, bn_prime, bn_ctx);
-
-    /* a + (u * x) */
-    bn_exp2 = BN_new();
-    BN_mul(bn_result, bn_u, bn_exponent, bn_ctx);
-    BN_add(bn_exp2, bn_a, bn_result);
-
-    /* (B - (k * g^x)) ^ (a + (u * x)) % N */
-    BN_mod_exp(bn_result, bn_base, bn_exp2, bn_prime, bn_ctx);
-
-    dlen = BN_num_bytes(bn_result);
-    ptr = enif_make_new_binary(env, dlen, &ret);
-    BN_bn2bin(bn_result, ptr);
-    BN_free(bn_result);
-    BN_CTX_free(bn_ctx);
-
-    BN_free(bn_multiplier);
-    BN_free(bn_exp2);
-    BN_free(bn_u);
-    BN_free(bn_exponent);
-    BN_free(bn_a);
-    BN_free(bn_B);
-    BN_free(bn_base);
-    BN_free(bn_generator);
-    BN_free(bn_prime);
-    return ret;
-}
-
-static ERL_NIF_TERM srp_host_secret_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Verifier, b, u, A, Prime) */
-/*
-        <premaster secret> = (A * v^u) ^ b % N
-*/
-    BIGNUM *bn_b = NULL, *bn_verifier = NULL;
-    BIGNUM *bn_prime = NULL, *bn_A = NULL, *bn_u = NULL, *bn_base, *bn_result;
-    BN_CTX *bn_ctx;
-    unsigned char* ptr;
-    unsigned dlen;
-    ERL_NIF_TERM ret;
-
-    CHECK_NO_FIPS_MODE();
-
-    if (!get_bn_from_bin(env, argv[0], &bn_verifier)
-	|| !get_bn_from_bin(env, argv[1], &bn_b)
-	|| !get_bn_from_bin(env, argv[2], &bn_u)
-	|| !get_bn_from_bin(env, argv[3], &bn_A)
-	|| !get_bn_from_bin(env, argv[4], &bn_prime))
-    {
-	if (bn_verifier) BN_free(bn_verifier);
-	if (bn_b) BN_free(bn_b);
-	if (bn_u) BN_free(bn_u);
-	if (bn_A) BN_free(bn_A);
-	if (bn_prime) BN_free(bn_prime);
-	return enif_make_badarg(env);
-    }
-
-    bn_ctx = BN_CTX_new();
-    bn_result = BN_new();
-
-    /* check that A % N != 0 */
-    BN_nnmod(bn_result, bn_A, bn_prime, bn_ctx);
-    if (BN_is_zero(bn_result)) {
-	BN_free(bn_b);
-	BN_free(bn_verifier);
-	BN_free(bn_prime);
-	BN_free(bn_A);
-	BN_CTX_free(bn_ctx);
-
-	return atom_error;
-    }
-
-    /* (A * v^u) */
-    bn_base = BN_new();
-    BN_mod_exp(bn_base, bn_verifier, bn_u, bn_prime, bn_ctx);
-    BN_mod_mul(bn_base, bn_A, bn_base, bn_prime, bn_ctx);
-
-    /* (A * v^u) ^ b % N */
-    BN_mod_exp(bn_result, bn_base, bn_b, bn_prime, bn_ctx);
-
-    dlen = BN_num_bytes(bn_result);
-    ptr = enif_make_new_binary(env, dlen, &ret);
-    BN_bn2bin(bn_result, ptr);
-    BN_free(bn_result);
-    BN_CTX_free(bn_ctx);
-
-    BN_free(bn_u);
-    BN_free(bn_base);
-    BN_free(bn_verifier);
-    BN_free(bn_prime);
-    BN_free(bn_A);
-    BN_free(bn_b);
-    return ret;
-}
-
-#if defined(HAVE_EC)
-static EC_KEY* ec_key_new(ErlNifEnv* env, ERL_NIF_TERM curve_arg)
-{
-    EC_KEY *key = NULL;
-    int c_arity = -1;
-    const ERL_NIF_TERM* curve;
-    ErlNifBinary seed;
-    BIGNUM *p = NULL;
-    BIGNUM *a = NULL;
-    BIGNUM *b = NULL;
-    BIGNUM *bn_order = NULL;
-    BIGNUM *cofactor = NULL;
-    EC_GROUP *group = NULL;
-    EC_POINT *point = NULL;
-
-    /* {Field, Prime, Point, Order, CoFactor} = Curve */
-    if (enif_get_tuple(env,curve_arg,&c_arity,&curve)
-	&& c_arity == 5
-	&& get_bn_from_bin(env, curve[3], &bn_order)
-	&& (curve[4] != atom_none && get_bn_from_bin(env, curve[4], &cofactor))) {
-
-	int f_arity = -1;
-	const ERL_NIF_TERM* field;
-	int p_arity = -1;
-	const ERL_NIF_TERM* prime;
-
-	long field_bits;
-
-	/* {A, B, Seed} = Prime */
-	if (!enif_get_tuple(env,curve[1],&p_arity,&prime)
-	    || !get_bn_from_bin(env, prime[0], &a)
-	    || !get_bn_from_bin(env, prime[1], &b))
-	    goto out_err;
-
-	if (!enif_get_tuple(env,curve[0],&f_arity,&field))
-	    goto out_err;
-
-	if (f_arity == 2 && field[0] == atom_prime_field) {
-	    /* {prime_field, Prime} */
-
-	    if (!get_bn_from_bin(env, field[1], &p))
-		goto out_err;
-
-	    if (BN_is_negative(p) || BN_is_zero(p))
-		goto out_err;
-
-	    field_bits = BN_num_bits(p);
-	    if (field_bits > OPENSSL_ECC_MAX_FIELD_BITS)
-		goto out_err;
-
-	    /* create the EC_GROUP structure */
-	    group = EC_GROUP_new_curve_GFp(p, a, b, NULL);
-
-	} else if (f_arity == 3 && field[0] == atom_characteristic_two_field) {
-#if defined(OPENSSL_NO_EC2M)
-	    enif_raise_exception(env, atom_notsup);
-	    goto out_err;
-#else
-	    /* {characteristic_two_field, M, Basis} */
-
-	    int b_arity = -1;
-	    const ERL_NIF_TERM* basis;
-	    unsigned int k1, k2, k3;
-
-	    if ((p = BN_new()) == NULL)
-		goto out_err;
-
-	    if (!enif_get_long(env, field[1], &field_bits)
-		|| field_bits > OPENSSL_ECC_MAX_FIELD_BITS)
-		goto out_err;
-
-	    if (enif_get_tuple(env,field[2],&b_arity,&basis)) {
-		if (b_arity == 2
-		    && basis[0] == atom_tpbasis
-		    && enif_get_uint(env, basis[1], &k1)) {
-		    /* {tpbasis, k} = Basis */
-
-		    if (!(field_bits > k1 && k1 > 0))
-			goto out_err;
-
-		    /* create the polynomial */
-		    if (!BN_set_bit(p, (int)field_bits)
-                        || !BN_set_bit(p, (int)k1)
-                        || !BN_set_bit(p, 0))
-                                goto out_err;
-
-		} else if (b_arity == 4
-		    && basis[0] == atom_ppbasis
-		    && enif_get_uint(env, basis[1], &k1)
-		    && enif_get_uint(env, basis[2], &k2)
-		    && enif_get_uint(env, basis[3], &k3)) {
-		    /* {ppbasis, k1, k2, k3} = Basis */
-
-		    if (!(field_bits > k3 && k3 > k2 && k2 > k1 && k1 > 0))
-			goto out_err;
-
-		    /* create the polynomial */
-		    if (!BN_set_bit(p, (int)field_bits)
-			|| !BN_set_bit(p, (int)k1)
-			|| !BN_set_bit(p, (int)k2)
-			|| !BN_set_bit(p, (int)k3)
-			|| !BN_set_bit(p, 0))
-			goto out_err;
-
-		} else
-		    goto out_err;
-	    } else if (field[2] == atom_onbasis) {
-		/* onbasis = Basis */
-		/* no parameters */
-		goto out_err;
-
-	    } else
-		goto out_err;
-
-	    group = EC_GROUP_new_curve_GF2m(p, a, b, NULL);
-#endif
-	} else
-	    goto out_err;
-
-        if (!group)
-            goto out_err;
-
-	if (enif_inspect_binary(env, prime[2], &seed)) {
-	    EC_GROUP_set_seed(group, seed.data, seed.size);
-	}
-
-	if (!term2point(env, curve[2], group, &point))
-	    goto out_err;
-
-	if (BN_is_negative(bn_order)
-	    || BN_is_zero(bn_order)
-	    || BN_num_bits(bn_order) > (int)field_bits + 1)
-	    goto out_err;
-
-	if (!EC_GROUP_set_generator(group, point, bn_order, cofactor))
-	    goto out_err;
-
-	EC_GROUP_set_asn1_flag(group, 0x0);
-
-	key = EC_KEY_new();
-	if (!key)
-	    goto out_err;
-	EC_KEY_set_group(key, group);
-    }
-    else {
-	goto out_err;
-    }
-
-
-    goto out;
-
-out_err:
-    if (key) EC_KEY_free(key);
-    key = NULL;
-
-out:
-    /* some OpenSSL structures are mem-dup'ed into the key,
-       so we have to free our copies here */
-    if (p) BN_free(p);
-    if (a) BN_free(a);
-    if (b) BN_free(b);
-    if (bn_order) BN_free(bn_order);
-    if (cofactor) BN_free(cofactor);
-    if (group) EC_GROUP_free(group);
-    if (point) EC_POINT_free(point);
-
-    return key;
-}
-
-
-static ERL_NIF_TERM bn2term(ErlNifEnv* env, const BIGNUM *bn)
-{
-    unsigned dlen;
-    unsigned char* ptr;
-    ERL_NIF_TERM ret;
-
-    if (!bn)
-	    return atom_undefined;
-
-    dlen = BN_num_bytes(bn);
-    ptr = enif_make_new_binary(env, dlen, &ret);
-    BN_bn2bin(bn, ptr);
-    ERL_VALGRIND_MAKE_MEM_DEFINED(ptr, dlen);
-    return ret;
-}
-
-static ERL_NIF_TERM point2term(ErlNifEnv* env,
-			       const EC_GROUP *group,
-			       const EC_POINT *point,
-			       point_conversion_form_t form)
-{
-    unsigned dlen;
-    ErlNifBinary bin;
-
-    dlen = EC_POINT_point2oct(group, point, form, NULL, 0, NULL);
-    if (dlen == 0)
-	return atom_undefined;
-
-    if (!enif_alloc_binary(dlen, &bin))
-	return enif_make_badarg(env);
-
-    if (!EC_POINT_point2oct(group, point, form, bin.data, bin.size, NULL)) {
-	enif_release_binary(&bin);
-	return enif_make_badarg(env);
-    }
-    ERL_VALGRIND_MAKE_MEM_DEFINED(bin.data, bin.size);
-    return enif_make_binary(env, &bin);
-}
-
-static int term2point(ErlNifEnv* env, ERL_NIF_TERM term,
-		      EC_GROUP *group, EC_POINT **pptr)
-{
-    int ret = 0;
-    ErlNifBinary bin;
-    EC_POINT *point;
-
-    if (!enif_inspect_binary(env,term,&bin)) {
-        return 0;
-    }
-
-    if ((*pptr = point = EC_POINT_new(group)) == NULL) {
-	return 0;
-    }
-
-    /* set the point conversion form */
-    EC_GROUP_set_point_conversion_form(group, (point_conversion_form_t)(bin.data[0] & ~0x01));
-
-    /* extract the ec point */
-    if (!EC_POINT_oct2point(group, point, bin.data, bin.size, NULL)) {
-	EC_POINT_free(point);
-	*pptr = NULL;
-    } else
-	ret = 1;
-
-    return ret;
-}
-
-static int get_ec_key(ErlNifEnv* env,
-		      ERL_NIF_TERM curve, ERL_NIF_TERM priv, ERL_NIF_TERM pub,
-		      EC_KEY** res)
-{
-    EC_KEY *key = NULL;
-    BIGNUM *priv_key = NULL;
-    EC_POINT *pub_key = NULL;
-    EC_GROUP *group = NULL;
-
-    if (!(priv == atom_undefined || get_bn_from_bin(env, priv, &priv_key))
-	|| !(pub == atom_undefined || enif_is_binary(env, pub))) {
-	goto out_err;
-    }
-
-    key = ec_key_new(env, curve);
-
-    if (!key) {
-	goto out_err;
-    }
-
-    if (!group)
-	group = EC_GROUP_dup(EC_KEY_get0_group(key));
-
-    if (term2point(env, pub, group, &pub_key)) {
-	    if (!EC_KEY_set_public_key(key, pub_key)) {
-		    goto out_err;
-	    }
-    }
-    if (priv != atom_undefined
-	&& !BN_is_zero(priv_key)) {
-	    if (!EC_KEY_set_private_key(key, priv_key))
-		    goto out_err;
-
-	    /* calculate public key (if necessary) */
-	    if (EC_KEY_get0_public_key(key) == NULL)
-	    {
-		    /* the public key was not included in the SEC1 private
-		     * key => calculate the public key */
-		    pub_key = EC_POINT_new(group);
-		    if (pub_key == NULL
-			|| !EC_POINT_copy(pub_key, EC_GROUP_get0_generator(group))
-			|| !EC_POINT_mul(group, pub_key, priv_key, NULL, NULL, NULL)
-			|| !EC_KEY_set_public_key(key, pub_key))
-			    goto out_err;
-	    }
-    }
-
-    goto out;
-
-out_err:
-    if (key) EC_KEY_free(key);
-    key = NULL;
-
-out:
-    /* some OpenSSL structures are mem-dup'ed into the key,
-       so we have to free our copies here */
-    if (priv_key) BN_clear_free(priv_key);
-    if (pub_key) EC_POINT_free(pub_key);
-    if (group) EC_GROUP_free(group);
-    if (!key)
-	return 0;
-    *res = key;
-    return 1;
-}
-#endif /* HAVE_EC */
-
-static ERL_NIF_TERM ec_key_generate(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{
-#if defined(HAVE_EC)
-    EC_KEY *key = NULL;
-    const EC_GROUP *group;
-    const EC_POINT *public_key;
-    ERL_NIF_TERM priv_key;
-    ERL_NIF_TERM pub_key = atom_undefined;
-
-    if (!get_ec_key(env, argv[0], argv[1], atom_undefined, &key))
-	goto badarg;
-
-    if (argv[1] == atom_undefined) {
-	if (!EC_KEY_generate_key(key))
-	    goto badarg;
-    }
-
-    group = EC_KEY_get0_group(key);
-    public_key = EC_KEY_get0_public_key(key);
-
-    if (group && public_key) {
-	pub_key = point2term(env, group, public_key,
-			     EC_KEY_get_conv_form(key));
-    }
-    priv_key = bn2term(env, EC_KEY_get0_private_key(key));
-    EC_KEY_free(key);
-    return enif_make_tuple2(env, pub_key, priv_key);
-
-badarg:
-    if (key)
-	EC_KEY_free(key);
-    return make_badarg_maybe(env);
-#else
-    return atom_notsup;
-#endif
-}
-
-/*
-  (_OthersPublicKey, _MyPrivateKey)
-  (_OthersPublicKey, _MyEC_Point)
-*/
-static ERL_NIF_TERM ecdh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-/* (OtherPublicKey, Curve, My) */
-{
-#if defined(HAVE_EC)
-    ERL_NIF_TERM ret;
-    unsigned char *p;
-    EC_KEY* key = NULL;
-    int field_size = 0;
-    int i;
-    EC_GROUP *group;
-    const BIGNUM *priv_key;
-    EC_POINT *my_ecpoint = NULL;
-    EC_KEY *other_ecdh = NULL;
-
-    if (!get_ec_key(env, argv[1], argv[2], atom_undefined, &key))
-	return make_badarg_maybe(env);
-
-    group    = EC_GROUP_dup(EC_KEY_get0_group(key));
-    priv_key = EC_KEY_get0_private_key(key);
-
-    if (!term2point(env, argv[0], group, &my_ecpoint)) {
-	goto out_err;
-    }
-
-    if ((other_ecdh = EC_KEY_new()) == NULL
-	|| !EC_KEY_set_group(other_ecdh, group)
-	|| !EC_KEY_set_private_key(other_ecdh, priv_key))
-	goto out_err;
-
-    field_size = EC_GROUP_get_degree(group);
-    if (field_size <= 0)
-	goto out_err;
-
-    p = enif_make_new_binary(env, (field_size+7)/8, &ret);
-    i = ECDH_compute_key(p, (field_size+7)/8, my_ecpoint, other_ecdh, NULL);
-
-    if (i < 0)
-	    goto out_err;
-out:
-    if (group) EC_GROUP_free(group);
-    if (my_ecpoint) EC_POINT_free(my_ecpoint);
-    if (other_ecdh) EC_KEY_free(other_ecdh);
-    if (key) EC_KEY_free(key);
-
-    return ret;
-
-out_err:
-    ret = enif_make_badarg(env);
-    goto out;
-#else
-    return atom_notsup;
-#endif
-}
-
-static ERL_NIF_TERM evp_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-    /*    (Curve, PeerBin, MyBin) */
-{
-#ifdef HAVE_ED_CURVE_DH
-    int type;
-    EVP_PKEY_CTX *ctx = NULL;
-    ErlNifBinary peer_bin, my_bin, key_bin;
-    EVP_PKEY *peer_key = NULL, *my_key = NULL;
-    size_t max_size;
-
-    if (argv[0] == atom_x25519) type = EVP_PKEY_X25519;
-    else if (argv[0] == atom_x448) type = EVP_PKEY_X448;
-    else return enif_make_badarg(env);
-
-    if (!enif_inspect_binary(env, argv[1], &peer_bin) ||
-        !enif_inspect_binary(env, argv[2], &my_bin)) 
-        goto return_badarg;
-
-    if (!(my_key = EVP_PKEY_new_raw_private_key(type, NULL, my_bin.data, my_bin.size)) ||
-        !(ctx = EVP_PKEY_CTX_new(my_key, NULL))) 
-        goto return_badarg;
-
-    if (!EVP_PKEY_derive_init(ctx)) 
-        goto return_badarg;
-
-    if (!(peer_key = EVP_PKEY_new_raw_public_key(type, NULL, peer_bin.data, peer_bin.size)) ||
-        !EVP_PKEY_derive_set_peer(ctx, peer_key)) 
-        goto return_badarg;
-
-    if (!EVP_PKEY_derive(ctx, NULL, &max_size)) 
-        goto return_badarg;
-
-    if (!enif_alloc_binary(max_size, &key_bin) ||
-        !EVP_PKEY_derive(ctx, key_bin.data, &key_bin.size)) 
-        goto return_badarg;
-
-    if (key_bin.size < max_size) {
-        size_t actual_size = key_bin.size;
-        if (!enif_realloc_binary(&key_bin, actual_size)) 
-            goto return_badarg;
-    }
-
-    EVP_PKEY_free(my_key);
-    EVP_PKEY_free(peer_key);
-    EVP_PKEY_CTX_free(ctx);
-    return enif_make_binary(env, &key_bin);
-
-return_badarg:
-    if (my_key)   EVP_PKEY_free(my_key);
-    if (peer_key) EVP_PKEY_free(peer_key);
-    if (ctx)      EVP_PKEY_CTX_free(ctx);
-    return enif_make_badarg(env);
-#else
-    return atom_notsup;
-#endif
-}
-
-static ERL_NIF_TERM evp_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-/* (Curve) */
-{
-#ifdef HAVE_ED_CURVE_DH
-    int type;
-    EVP_PKEY_CTX *ctx = NULL;
-    EVP_PKEY *pkey = NULL;
-    ERL_NIF_TERM ret_pub, ret_prv;
-    size_t key_len;
-
-    if (argv[0] == atom_x25519) type = EVP_PKEY_X25519;
-    else if (argv[0] == atom_x448) type = EVP_PKEY_X448;
-    else return enif_make_badarg(env);
-
-    if (!(ctx = EVP_PKEY_CTX_new_id(type, NULL))) return enif_make_badarg(env);
-
-    if (!EVP_PKEY_keygen_init(ctx)) goto return_error;
-    if (!EVP_PKEY_keygen(ctx, &pkey)) goto return_error;
-
-    if (!EVP_PKEY_get_raw_public_key(pkey, NULL, &key_len)) goto return_error;
-    if (!EVP_PKEY_get_raw_public_key(pkey,
-                                     enif_make_new_binary(env, key_len, &ret_pub),
-                                     &key_len))
-        goto return_error;
-
-    if (!EVP_PKEY_get_raw_private_key(pkey, NULL, &key_len)) goto return_error;
-    if (!EVP_PKEY_get_raw_private_key(pkey,
-                                      enif_make_new_binary(env, key_len, &ret_prv),
-                                      &key_len))
-        goto return_error;
-
-    EVP_PKEY_free(pkey);
-    EVP_PKEY_CTX_free(ctx);
-    return enif_make_tuple2(env, ret_pub, ret_prv);
-
-return_error:
-    if (pkey) EVP_PKEY_free(pkey);
-    if (ctx)  EVP_PKEY_CTX_free(ctx);
-    return atom_error;
-
-#else
-    return atom_notsup;
-#endif
-}
-
-/*================================================================*/
-#define PKEY_BADARG -1
-#define PKEY_NOTSUP 0
-#define PKEY_OK 1
-
-typedef struct PKeyCryptOptions {
-    const EVP_MD *rsa_mgf1_md;
-    ErlNifBinary rsa_oaep_label;
-    const EVP_MD *rsa_oaep_md;
-    int rsa_padding;
-    const EVP_MD *signature_md;
-} PKeyCryptOptions;
-
-typedef struct PKeySignOptions {
-    const EVP_MD *rsa_mgf1_md;
-    int rsa_padding;
-    int rsa_pss_saltlen;
-} PKeySignOptions;
-
-static int get_pkey_digest_type(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_TERM type,
-				const EVP_MD **md)
-{
-    struct digest_type_t *digp = NULL;
-    *md = NULL;
-
-    if (type == atom_none && algorithm == atom_rsa) return PKEY_OK;
-#ifdef HAVE_EDDSA
-    if (algorithm == atom_eddsa) return PKEY_OK;
-#endif
-    digp = get_digest_type(type);
-    if (!digp) return PKEY_BADARG;
-    if (!digp->md.p) return PKEY_NOTSUP;
-
-    *md = digp->md.p;
-    return PKEY_OK;
-}
-
-
-static int get_pkey_sign_digest(ErlNifEnv *env, ERL_NIF_TERM algorithm,
-				ERL_NIF_TERM type, ERL_NIF_TERM data,
-				unsigned char *md_value, const EVP_MD **mdp,
-				unsigned char **tbsp, size_t *tbslenp)
-{
-    int i;
-    const ERL_NIF_TERM *tpl_terms;
-    int tpl_arity;
-    ErlNifBinary tbs_bin;
-    EVP_MD_CTX *mdctx;
-    const EVP_MD *md = *mdp;
-    unsigned char *tbs = *tbsp;
-    size_t tbslen = *tbslenp;
-    unsigned int tbsleni;
-
-    if ((i = get_pkey_digest_type(env, algorithm, type, &md)) != PKEY_OK) {
-	return i;
-    }
-    if (enif_get_tuple(env, data, &tpl_arity, &tpl_terms)) {
-	if (tpl_arity != 2 || tpl_terms[0] != atom_digest
-	    || !enif_inspect_binary(env, tpl_terms[1], &tbs_bin)
-	    || (md != NULL && tbs_bin.size != EVP_MD_size(md))) {
-	    return PKEY_BADARG;
-	}
-        /* We have a digest (= hashed text) in tbs_bin */
-	tbs = tbs_bin.data;
-	tbslen = tbs_bin.size;
-    } else if (md == NULL) {
-	if (!enif_inspect_binary(env, data, &tbs_bin)) {
-	    return PKEY_BADARG;
-	}
-        /* md == NULL, that is no hashing because DigestType argument was atom_none */
-	tbs = tbs_bin.data;
-	tbslen = tbs_bin.size;
-    } else {
-	if (!enif_inspect_binary(env, data, &tbs_bin)) {
-	    return PKEY_BADARG;
-	}
-        /* We have the cleartext in tbs_bin and the hash algo info in md */
-	tbs = md_value;
-	mdctx = EVP_MD_CTX_create();
-	if (!mdctx) {
-	    return PKEY_BADARG;
-	}
-        /* Looks well, now hash the plain text into a digest according to md */
-	if (EVP_DigestInit_ex(mdctx, md, NULL) <= 0) {
-	    EVP_MD_CTX_destroy(mdctx);
-	    return PKEY_BADARG;
-	}
-	if (EVP_DigestUpdate(mdctx, tbs_bin.data, tbs_bin.size) <= 0) {
-	    EVP_MD_CTX_destroy(mdctx);
-	    return PKEY_BADARG;
-	}
-	if (EVP_DigestFinal_ex(mdctx, tbs, &tbsleni) <= 0) {
-	    EVP_MD_CTX_destroy(mdctx);
-	    return PKEY_BADARG;
-	}
-	tbslen = (size_t)(tbsleni);
-	EVP_MD_CTX_destroy(mdctx);
-    }
-
-    *mdp = md;
-    *tbsp = tbs;
-    *tbslenp = tbslen;
-
-    return PKEY_OK;
-}
-
-
-static int get_pkey_sign_options(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_TERM options,
-                                 const EVP_MD *md, PKeySignOptions *opt)
-{
-    ERL_NIF_TERM head, tail;
-    const ERL_NIF_TERM *tpl_terms;
-    int tpl_arity;
-    const EVP_MD *opt_md;
-    int i;
-
-    if (!enif_is_list(env, options)) {
-	return PKEY_BADARG;
-    }
-
-    /* defaults */
-    if (algorithm == atom_rsa) {
-	opt->rsa_mgf1_md = NULL;
-	opt->rsa_padding = RSA_PKCS1_PADDING;
-	opt->rsa_pss_saltlen = -2;
-    }
-
-    if (enif_is_empty_list(env, options)) {
-	return PKEY_OK;
-    }
-
-    if (algorithm == atom_rsa) {
-	tail = options;
-	while (enif_get_list_cell(env, tail, &head, &tail)) {
-	    if (enif_get_tuple(env, head, &tpl_arity, &tpl_terms) && tpl_arity == 2) {
-		if (tpl_terms[0] == atom_rsa_mgf1_md && enif_is_atom(env, tpl_terms[1])) {
-		    i = get_pkey_digest_type(env, algorithm, tpl_terms[1], &opt_md);
-		    if (i != PKEY_OK) {
-			return i;
-		    }
-		    opt->rsa_mgf1_md = opt_md;
-		} else if (tpl_terms[0] == atom_rsa_padding) {
-		    if (tpl_terms[1] == atom_rsa_pkcs1_padding) {
-			opt->rsa_padding = RSA_PKCS1_PADDING;
-                    } else if (tpl_terms[1] == atom_rsa_pkcs1_pss_padding) {
-#ifdef HAVE_RSA_PKCS1_PSS_PADDING
-                        opt->rsa_padding = RSA_PKCS1_PSS_PADDING;
-                        if (opt->rsa_mgf1_md == NULL) {
-                            opt->rsa_mgf1_md = md;
-                        }
-#else
-                        return PKEY_NOTSUP;
-#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) {
-			opt->rsa_padding = RSA_NO_PADDING;
-		    } else {
-			return PKEY_BADARG;
-		    }
-		} else if (tpl_terms[0] == atom_rsa_pss_saltlen) {
-		    if (!enif_get_int(env, tpl_terms[1], &(opt->rsa_pss_saltlen))
-			|| opt->rsa_pss_saltlen < -2) {
-			return PKEY_BADARG;
-		    }
-		} else {
-		    return PKEY_BADARG;
-		}
-	    } else {
-		return PKEY_BADARG;
-	    }
-	}
-    } else {
-	return PKEY_BADARG;
-    }
-
-    return PKEY_OK;
-}
-
-
-#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 = NULL;
-    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 (enif_is_map(env, key)) {
-#ifdef HAS_ENGINE_SUPPORT
-        /* Use key stored in engine */
-        ENGINE *e;
-        char *id = NULL;
-        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 (password) enif_free(password);
-        enif_free(id);
-        if (!*pkey)
-            return PKEY_BADARG;
-#else
-        return PKEY_BADARG;
-#endif
-    }
-    else if (algorithm == atom_rsa) {
-	RSA *rsa = RSA_new();
-
-	if (!get_rsa_private_key(env, key, rsa)) {
-	    RSA_free(rsa);
-	    return PKEY_BADARG;
-	}
-
-	*pkey = EVP_PKEY_new();
-	if (!EVP_PKEY_assign_RSA(*pkey, rsa)) {
-	    EVP_PKEY_free(*pkey);
-	    RSA_free(rsa);
-	    return PKEY_BADARG;
-	}
-    } else if (algorithm == atom_ecdsa) {
-#if defined(HAVE_EC)
-	EC_KEY *ec = NULL;
-	const ERL_NIF_TERM *tpl_terms;
-	int tpl_arity;
-
-	if (enif_get_tuple(env, key, &tpl_arity, &tpl_terms) && tpl_arity == 2
-	    && enif_is_tuple(env, tpl_terms[0]) && enif_is_binary(env, tpl_terms[1])
-	    && get_ec_key(env, tpl_terms[0], tpl_terms[1], atom_undefined, &ec)) {
-
-	    *pkey = EVP_PKEY_new();
-	    if (!EVP_PKEY_assign_EC_KEY(*pkey, ec)) {
-		EVP_PKEY_free(*pkey);
-		EC_KEY_free(ec);
-		return PKEY_BADARG;
-	    }
-	} else {
-	    return PKEY_BADARG;
-	}
-#else
-	return PKEY_NOTSUP;
-#endif
-    } else if (algorithm == atom_eddsa) {
-#if defined(HAVE_EDDSA)
-        if (!get_eddsa_key(env, 0, key, pkey)) {
-            return PKEY_BADARG;
-        }
-#else
-     return PKEY_NOTSUP;  
-#endif
-    } else if (algorithm == atom_dss) {
-	DSA *dsa = DSA_new();
-
-	if (!get_dss_private_key(env, key, dsa)) {
-	    DSA_free(dsa);
-            return PKEY_BADARG;
-        }
-
-	*pkey = EVP_PKEY_new();
-	if (!EVP_PKEY_assign_DSA(*pkey, dsa)) {
-	    EVP_PKEY_free(*pkey);
-	    DSA_free(dsa);
-	    return PKEY_BADARG;
-	}
-    } else {
-	return PKEY_BADARG;
-    }
-
-    return PKEY_OK;
-}
-
-
-static int get_pkey_public_key(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_TERM key,
-			       EVP_PKEY **pkey)
-{
-    if (enif_is_map(env, key)) {
-#ifdef HAS_ENGINE_SUPPORT
-        /* Use key stored in engine */
-        ENGINE *e;
-        char *id = NULL;
-        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 (password) enif_free(password);
-        enif_free(id);
-        if (!pkey)
-            return PKEY_BADARG;
-#else
-        return PKEY_BADARG;
-#endif
-    } else  if (algorithm == atom_rsa) {
-	RSA *rsa = RSA_new();
-
-	if (!get_rsa_public_key(env, key, rsa)) {
-	    RSA_free(rsa);
-	    return PKEY_BADARG;
-	}
-
-	*pkey = EVP_PKEY_new();
-	if (!EVP_PKEY_assign_RSA(*pkey, rsa)) {
-	    EVP_PKEY_free(*pkey);
-	    RSA_free(rsa);
-	    return PKEY_BADARG;
-	}
-    } else if (algorithm == atom_ecdsa) {
-#if defined(HAVE_EC)
-	EC_KEY *ec = NULL;
-	const ERL_NIF_TERM *tpl_terms;
-	int tpl_arity;
-
-	if (enif_get_tuple(env, key, &tpl_arity, &tpl_terms) && tpl_arity == 2
-	    && enif_is_tuple(env, tpl_terms[0]) && enif_is_binary(env, tpl_terms[1])
-	    && get_ec_key(env, tpl_terms[0], atom_undefined, tpl_terms[1], &ec)) {
-
-	    *pkey = EVP_PKEY_new();
-	    if (!EVP_PKEY_assign_EC_KEY(*pkey, ec)) {
-		EVP_PKEY_free(*pkey);
-		EC_KEY_free(ec);
-		return PKEY_BADARG;
-	    }
-	} else {
-	    return PKEY_BADARG;
-	}
-#else
-	return PKEY_NOTSUP;
-#endif
-    } else if (algorithm == atom_eddsa) {
-#if defined(HAVE_EDDSA)
-        if (!get_eddsa_key(env, 1, key, pkey)) {
-            return PKEY_BADARG;
-        }
-#else
-     return PKEY_NOTSUP;  
-#endif
-    } else if (algorithm == atom_dss) {
-	DSA *dsa = DSA_new();
-
-	if (!get_dss_public_key(env, key, dsa)) {
-	    DSA_free(dsa);
-	    return PKEY_BADARG;
-	}
-
-	*pkey = EVP_PKEY_new();
-	if (!EVP_PKEY_assign_DSA(*pkey, dsa)) {
-	    EVP_PKEY_free(*pkey);
-	    DSA_free(dsa);
-	    return PKEY_BADARG;
-	}
-    } else {
-	return PKEY_BADARG;
-    }
-
-    return PKEY_OK;
-}
-
-static ERL_NIF_TERM pkey_sign_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
-{/* (Algorithm, Type, Data|{digest,Digest}, Key|#{}, Options) */
-    int i;
-    const EVP_MD *md = NULL;
-    unsigned char md_value[EVP_MAX_MD_SIZE];
-    EVP_PKEY *pkey;
-#ifdef HAS_EVP_PKEY_CTX
-    EVP_PKEY_CTX *ctx;
-    size_t siglen;
-#else
-    unsigned len, siglen;
-#endif
-    PKeySignOptions sig_opt;
-    ErlNifBinary sig_bin; /* signature */
-    unsigned char *tbs; /* data to be signed */
-    size_t tbslen;
-/*char buf[1024];
-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)
-	    return atom_notsup;
-	else
-	    return enif_make_badarg(env);
-    }
-
-    i = get_pkey_sign_options(env, argv[0], argv[4], md, &sig_opt);
-    if (i != PKEY_OK) {
-	if (i == PKEY_NOTSUP)
-	    return atom_notsup;
-	else
-	    return enif_make_badarg(env);
-    }
-
-    if (get_pkey_private_key(env, argv[0], argv[3], &pkey) != PKEY_OK) {
-	return enif_make_badarg(env);
-    }
-
-#ifdef HAS_EVP_PKEY_CTX
-    ctx = EVP_PKEY_CTX_new(pkey, NULL);
-    if (!ctx) goto badarg;
-
-    if (argv[0] != atom_eddsa) {
-        if (EVP_PKEY_sign_init(ctx) <= 0) goto badarg;
-        if (md != NULL && EVP_PKEY_CTX_set_signature_md(ctx, md) <= 0) goto badarg;
-    }
-
-    if (argv[0] == atom_rsa) {
-	if (EVP_PKEY_CTX_set_rsa_padding(ctx, sig_opt.rsa_padding) <= 0) goto badarg;
-# ifdef HAVE_RSA_PKCS1_PSS_PADDING
-	if (sig_opt.rsa_padding == RSA_PKCS1_PSS_PADDING) {
-            if (sig_opt.rsa_mgf1_md != NULL) {
-# ifdef HAVE_RSA_MGF1_MD
-		if (EVP_PKEY_CTX_set_rsa_mgf1_md(ctx, sig_opt.rsa_mgf1_md) <= 0) goto badarg;
-# else
-                EVP_PKEY_CTX_free(ctx);
-                EVP_PKEY_free(pkey);
-                return atom_notsup;
-# endif
-            }
-	    if (sig_opt.rsa_pss_saltlen > -2
-		&& EVP_PKEY_CTX_set_rsa_pss_saltlen(ctx, sig_opt.rsa_pss_saltlen) <= 0)
-		goto badarg;
-	}
-#endif
-    }
-
-    if (argv[0] == atom_eddsa) {
-#ifdef HAVE_EDDSA
-        EVP_MD_CTX* mdctx = EVP_MD_CTX_new();
-        if (!EVP_DigestSignInit(mdctx, NULL, NULL, NULL, pkey)) {
-            if (mdctx) EVP_MD_CTX_free(mdctx);
-            goto badarg;
-        }
-
-        if (!EVP_DigestSign(mdctx, NULL, &siglen, tbs, tbslen)) {
-            EVP_MD_CTX_free(mdctx);
-            goto badarg;
-        }
-        enif_alloc_binary(siglen, &sig_bin);
-
-        if (!EVP_DigestSign(mdctx, sig_bin.data, &siglen, tbs, tbslen)) {
-            EVP_MD_CTX_free(mdctx);
-            goto badarg;
-        }
-        EVP_MD_CTX_free(mdctx);
-#else
-        goto badarg;    
-#endif
-    }
-    else
-    {
-        if (EVP_PKEY_sign(ctx, NULL, &siglen, tbs, tbslen) <= 0) goto badarg;
-        enif_alloc_binary(siglen, &sig_bin);
-
-        if (md != NULL) {
-            ERL_VALGRIND_ASSERT_MEM_DEFINED(tbs, EVP_MD_size(md));
-        }
-        i = EVP_PKEY_sign(ctx, sig_bin.data, &siglen, tbs, tbslen);
-    }
-        
-    EVP_PKEY_CTX_free(ctx);
-#else
-/*printf("Old interface\r\n");
- */
-    if (argv[0] == atom_rsa) {
-       RSA *rsa = EVP_PKEY_get1_RSA(pkey);
-       enif_alloc_binary(RSA_size(rsa), &sig_bin);
-       len = EVP_MD_size(md);
-       ERL_VALGRIND_ASSERT_MEM_DEFINED(tbs, len);
-       i = RSA_sign(md->type, tbs, len, sig_bin.data, &siglen, rsa);
-       RSA_free(rsa);
-    } else if (argv[0] == atom_dss) {
-       DSA *dsa = EVP_PKEY_get1_DSA(pkey);
-       enif_alloc_binary(DSA_size(dsa), &sig_bin);
-       len = EVP_MD_size(md);
-       ERL_VALGRIND_ASSERT_MEM_DEFINED(tbs, len);
-       i = DSA_sign(md->type, tbs, len, sig_bin.data, &siglen, dsa);
-       DSA_free(dsa);
-    } else if (argv[0] == atom_ecdsa) {
-#if defined(HAVE_EC)
-       EC_KEY *ec = EVP_PKEY_get1_EC_KEY(pkey);
-       enif_alloc_binary(ECDSA_size(ec), &sig_bin);
-       len = EVP_MD_size(md);
-       ERL_VALGRIND_ASSERT_MEM_DEFINED(tbs, len);
-       i = ECDSA_sign(md->type, tbs, len, sig_bin.data, &siglen, ec);
-       EC_KEY_free(ec);
-#else
-       EVP_PKEY_free(pkey);
-       return atom_notsup;
-#endif
-    } else {
-	goto badarg;
-    }
-#endif
-
-    EVP_PKEY_free(pkey);
-    if (i == 1) {
-	ERL_VALGRIND_MAKE_MEM_DEFINED(sig_bin.data, siglen);
-	if (siglen != sig_bin.size) {
-	    enif_realloc_binary(&sig_bin, siglen);
-	    ERL_VALGRIND_ASSERT_MEM_DEFINED(sig_bin.data, siglen);
-	}
-	return enif_make_binary(env, &sig_bin);
-    } else {
-	enif_release_binary(&sig_bin);
-	return atom_error;
-    }
-
- badarg:
-#ifdef HAS_EVP_PKEY_CTX
-    EVP_PKEY_CTX_free(ctx);
-#endif
-    EVP_PKEY_free(pkey);
-    return enif_make_badarg(env);
-}
-
-
-static ERL_NIF_TERM pkey_verify_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
-{/* (Algorithm, Type, Data|{digest,Digest}, Signature, Key, Options) */
-    int i;
-    const EVP_MD *md = NULL;
-    unsigned char md_value[EVP_MAX_MD_SIZE];
-    EVP_PKEY *pkey;
-#ifdef HAS_EVP_PKEY_CTX
-    EVP_PKEY_CTX *ctx;
-#else
-#endif
-    PKeySignOptions sig_opt;
-    ErlNifBinary sig_bin; /* signature */
-    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);
-    }
-
-    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)
-	    return atom_notsup;
-	else
-	    return enif_make_badarg(env);
-    }
-
-    i = get_pkey_sign_options(env, argv[0], argv[5], md, &sig_opt);
-    if (i != PKEY_OK) {
-	if (i == PKEY_NOTSUP)
-	    return atom_notsup;
-	else
-	    return enif_make_badarg(env);
-    }
-
-    if (get_pkey_public_key(env, argv[0], argv[4], &pkey) != PKEY_OK) {
-	return enif_make_badarg(env);
-    }
-
-#ifdef HAS_EVP_PKEY_CTX
-/* printf("EVP interface\r\n");
- */
-    ctx = EVP_PKEY_CTX_new(pkey, NULL);
-    if (!ctx) goto badarg;
-
-    if (argv[0] != atom_eddsa) {
-        if (EVP_PKEY_verify_init(ctx) <= 0) goto badarg;
-        if (md != NULL && EVP_PKEY_CTX_set_signature_md(ctx, md) <= 0) goto badarg;
-    }
-
-    if (argv[0] == atom_rsa) {
-	if (EVP_PKEY_CTX_set_rsa_padding(ctx, sig_opt.rsa_padding) <= 0) goto badarg;
-	if (sig_opt.rsa_padding == RSA_PKCS1_PSS_PADDING) {
-            if (sig_opt.rsa_mgf1_md != NULL) {
-# ifdef HAVE_RSA_MGF1_MD
-		if (EVP_PKEY_CTX_set_rsa_mgf1_md(ctx, sig_opt.rsa_mgf1_md) <= 0) goto badarg;
-# else
-                EVP_PKEY_CTX_free(ctx);
-                EVP_PKEY_free(pkey);
-                return atom_notsup;
-# endif
-            }
-	    if (sig_opt.rsa_pss_saltlen > -2
-		&& EVP_PKEY_CTX_set_rsa_pss_saltlen(ctx, sig_opt.rsa_pss_saltlen) <= 0)
-		goto badarg;
-	}
-    }
-
-        if (argv[0] == atom_eddsa) {
-#ifdef HAVE_EDDSA
-        EVP_MD_CTX* mdctx = EVP_MD_CTX_create();
-        
-        if (!EVP_DigestVerifyInit(mdctx, NULL, NULL, NULL, pkey)) {
-            if (mdctx) EVP_MD_CTX_destroy(mdctx);
-            goto badarg;
-        }
-
-        i = EVP_DigestVerify(mdctx, sig_bin.data, sig_bin.size, tbs, tbslen);
-        EVP_MD_CTX_destroy(mdctx);
-#else
-        goto badarg;    
-#endif
-        }
-    else
-        {
-            if (md != NULL) {
-                ERL_VALGRIND_ASSERT_MEM_DEFINED(tbs, EVP_MD_size(md));
-            }
-            i = EVP_PKEY_verify(ctx, sig_bin.data, sig_bin.size, tbs, tbslen);
-        }
-
-    EVP_PKEY_CTX_free(ctx);
-#else
-/*printf("Old interface\r\n");
-*/
-    if (argv[0] == atom_rsa) {
-        RSA *rsa = EVP_PKEY_get1_RSA(pkey);
-        i = RSA_verify(md->type, tbs, tbslen, sig_bin.data, sig_bin.size, rsa);
-        RSA_free(rsa);
-    } else if (argv[0] == atom_dss) {
-        DSA *dsa = EVP_PKEY_get1_DSA(pkey);
-        i = DSA_verify(0, tbs, tbslen, sig_bin.data, sig_bin.size, dsa);
-        DSA_free(dsa);
-    } else if (argv[0] == atom_ecdsa) {
-#if defined(HAVE_EC)
-        EC_KEY *ec = EVP_PKEY_get1_EC_KEY(pkey);
-        i = ECDSA_verify(EVP_MD_type(md), tbs, tbslen, sig_bin.data, sig_bin.size, ec);
-        EC_KEY_free(ec);
-#else
-        EVP_PKEY_free(pkey);
-        return atom_notsup;
-#endif
-    } else {
-	goto badarg;
-    }
-#endif
-
-    EVP_PKEY_free(pkey);
-    if (i == 1) {
-	return atom_true;
-    } else {
-	return atom_false;
-    }
-
- badarg:
-#ifdef HAS_EVP_PKEY_CTX
-    EVP_PKEY_CTX_free(ctx);
-#endif
-    EVP_PKEY_free(pkey);
-    return enif_make_badarg(env);
-}
-
-
-/*--------------------------------*/
-
-static int get_pkey_crypt_options(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_TERM options,
-				  PKeyCryptOptions *opt)
-{
-    ERL_NIF_TERM head, tail;
-    const ERL_NIF_TERM *tpl_terms;
-    int tpl_arity;
-    const EVP_MD *opt_md;
-    int i;
-
-    if (!enif_is_list(env, options)) {
-	return PKEY_BADARG;
-    }
-
-    /* defaults */
-    if (algorithm == atom_rsa) {
-	opt->rsa_mgf1_md = NULL;
-	opt->rsa_oaep_label.data = NULL;
-	opt->rsa_oaep_label.size = 0;
-	opt->rsa_oaep_md = NULL;
-	opt->rsa_padding = RSA_PKCS1_PADDING;
-	opt->signature_md = NULL;
-    }
-
-    if (enif_is_empty_list(env, options)) {
-	return PKEY_OK;
-    }
-
-    if (algorithm == atom_rsa) {
-	tail = options;
-	while (enif_get_list_cell(env, tail, &head, &tail)) {
-	    if (enif_get_tuple(env, head, &tpl_arity, &tpl_terms) && tpl_arity == 2) {
-		if (tpl_terms[0] == atom_rsa_padding
-                    || tpl_terms[0] == atom_rsa_pad /* Compatibility */
-                    ) {
-		    if (tpl_terms[1] == atom_rsa_pkcs1_padding) {
-			opt->rsa_padding = RSA_PKCS1_PADDING;
-#ifdef HAVE_RSA_OAEP_PADDING
-		    } else if (tpl_terms[1] == atom_rsa_pkcs1_oaep_padding) {
-			opt->rsa_padding = RSA_PKCS1_OAEP_PADDING;
-#endif
-#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) {
-			opt->rsa_padding = RSA_NO_PADDING;
-		    } else {
-			return PKEY_BADARG;
-		    }
-		} else if (tpl_terms[0] == atom_signature_md && enif_is_atom(env, tpl_terms[1])) {
-		    i = get_pkey_digest_type(env, algorithm, tpl_terms[1], &opt_md);
-		    if (i != PKEY_OK) {
-			return i;
-		    }
-		    opt->signature_md = opt_md;
-		} else if (tpl_terms[0] == atom_rsa_mgf1_md && enif_is_atom(env, tpl_terms[1])) {
-#ifndef HAVE_RSA_MGF1_MD
-		    if (tpl_terms[1] != atom_sha)
-			return PKEY_NOTSUP;
-#endif
-		    i = get_pkey_digest_type(env, algorithm, tpl_terms[1], &opt_md);
-		    if (i != PKEY_OK) {
-			return i;
-		    }
-		    opt->rsa_mgf1_md = opt_md;
-		} else if (tpl_terms[0] == atom_rsa_oaep_label
-			   && enif_inspect_binary(env, tpl_terms[1], &(opt->rsa_oaep_label))) {
-#ifdef HAVE_RSA_OAEP_MD
-		    continue;
-#else
-		    return PKEY_NOTSUP;
-#endif
-		} else if (tpl_terms[0] == atom_rsa_oaep_md && enif_is_atom(env, tpl_terms[1])) {
-#ifndef HAVE_RSA_OAEP_MD
-		    if (tpl_terms[1] != atom_sha)
-			return PKEY_NOTSUP;
-#endif
-		    i = get_pkey_digest_type(env, algorithm, tpl_terms[1], &opt_md);
-		    if (i != PKEY_OK) {
-			return i;
-		    }
-		    opt->rsa_oaep_md = opt_md;
-		} else {
-		    return PKEY_BADARG;
-		}
-	    } else {
-		return PKEY_BADARG;
-	    }
-	}
-    } else {
-	return PKEY_BADARG;
-    }
-
-    return PKEY_OK;
-}
-
-static size_t size_of_RSA(EVP_PKEY *pkey) {
-    size_t tmplen;
-    RSA *rsa = EVP_PKEY_get1_RSA(pkey);
-    if (rsa == NULL) return 0;
-    tmplen = RSA_size(rsa);
-    RSA_free(rsa);
-    return tmplen;
-}
-
-static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
-{/* (Algorithm, Data, PublKey=[E,N]|[E,N,D]|[E,N,D,P1,P2,E1,E2,C], Options, IsPrivate, IsEncrypt) */
-    int i;
-    EVP_PKEY *pkey;
-#ifdef HAS_EVP_PKEY_CTX
-    EVP_PKEY_CTX *ctx;
-#else
-    RSA *rsa;
-#endif
-    PKeyCryptOptions crypt_opt;
-    ErlNifBinary in_bin, out_bin, tmp_bin;
-    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);
-    }
-
-    i = get_pkey_crypt_options(env, argv[0], argv[3], &crypt_opt);
-    if (i != PKEY_OK) {
-	if (i == PKEY_NOTSUP)
-	    return atom_notsup;
-	else
-	    return enif_make_badarg(env);
-    }
-
-    if (is_private) {
-	if (get_pkey_private_key(env, argv[0], argv[2], &pkey) != PKEY_OK) {
-	    return enif_make_badarg(env);
-	}
-    } else {
-	if (get_pkey_public_key(env, argv[0], argv[2], &pkey) != PKEY_OK) {
-	    return enif_make_badarg(env);
-	}
-    }
-
-    out_bin.data = NULL;
-    out_bin.size = 0;
-    tmp_bin.data = NULL;
-    tmp_bin.size = 0;
-
-#ifdef HAS_EVP_PKEY_CTX
-    ctx = EVP_PKEY_CTX_new(pkey, NULL);
-    if (!ctx) goto badarg;
-
-/* enif_get_atom(env,argv[0],algo,1024,ERL_NIF_LATIN1);  */
-
-    if (is_private) {
-        if (is_encrypt) {
-            /* private encrypt */
-            if ((algo_init=EVP_PKEY_sign_init(ctx)) <= 0) {
-                /* fprintf(stderr,"BADARG %s private encrypt algo_init=%d %s:%d\r\n", algo, algo_init, __FILE__, __LINE__); */
-                goto badarg;
-            }
-        } else {
-            /* private decrypt */
-            if ((algo_init=EVP_PKEY_decrypt_init(ctx)) <= 0) {
-                /* fprintf(stderr,"BADARG %s private decrypt algo_init=%d %s:%d\r\n", algo, algo_init, __FILE__, __LINE__); */
-                goto badarg;
-            }
-        }
-    } else {
-        if (is_encrypt) {
-            /* public encrypt */
-            if ((algo_init=EVP_PKEY_encrypt_init(ctx)) <= 0) {
-                /* fprintf(stderr,"BADARG %s public encrypt algo_init=%d %s:%d\r\n", algo,algo_init,__FILE__, __LINE__); */
-                goto badarg;
-            }
-        } else {
-            /* public decrypt */
-            if ((algo_init=EVP_PKEY_verify_recover_init(ctx)) <= 0) {
-                /* fprintf(stderr,"BADARG %s public decrypt algo_init=%d %s:%d\r\n", algo,algo_init,__FILE__, __LINE__); */
-                goto badarg;
-            }
-        }
-    }
-
-    if (argv[0] == atom_rsa) {
-	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) {
-                tmplen = size_of_RSA(pkey);
-                if (tmplen == 0) goto badarg;
-		if (!enif_alloc_binary(tmplen, &tmp_bin)) goto badarg;
-		if (RSA_padding_add_SSLv23(tmp_bin.data, tmplen, in_bin.data, in_bin.size) <= 0)
-		    goto badarg;
-		in_bin = tmp_bin;
-	    }
-	    if (EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_NO_PADDING) <= 0) goto badarg;
-	} 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
-		&& EVP_PKEY_CTX_set_rsa_oaep_md(ctx, crypt_opt.rsa_oaep_md) <= 0)
-		goto badarg;
-	    if (crypt_opt.rsa_mgf1_md != NULL
-		&& EVP_PKEY_CTX_set_rsa_mgf1_md(ctx, crypt_opt.rsa_mgf1_md) <= 0) goto badarg;
-	    if (crypt_opt.rsa_oaep_label.data != NULL && crypt_opt.rsa_oaep_label.size > 0) {
-		unsigned char *label_copy = NULL;
-		label_copy = OPENSSL_malloc(crypt_opt.rsa_oaep_label.size);
-		if (label_copy == NULL) goto badarg;
-		memcpy((void *)(label_copy), (const void *)(crypt_opt.rsa_oaep_label.data),
-		       crypt_opt.rsa_oaep_label.size);
-		if (EVP_PKEY_CTX_set0_rsa_oaep_label(ctx, label_copy,
-						     crypt_opt.rsa_oaep_label.size) <= 0) {
-		    OPENSSL_free(label_copy);
-		    label_copy = NULL;
-		    goto badarg;
-		}
-	    }
-	}
-#endif
-    }
-
-    if (is_private) {
-	if (is_encrypt) {
-	    /* private_encrypt */
-	    i = EVP_PKEY_sign(ctx, NULL, &outlen, in_bin.data, in_bin.size);
-	} else {
-	    /* private_decrypt */
-	    i = EVP_PKEY_decrypt(ctx, NULL, &outlen, in_bin.data, in_bin.size);
-	}
-    } else {
-	if (is_encrypt) {
-	    /* public_encrypt */
-	    i = EVP_PKEY_encrypt(ctx, NULL, &outlen, in_bin.data, in_bin.size);
-	} else {
-	    /* public_decrypt */
-	    i = EVP_PKEY_verify_recover(ctx, NULL, &outlen, in_bin.data, in_bin.size);
-	}
-    }
-    /* fprintf(stderr,"i = %d %s:%d\r\n", i, __FILE__, __LINE__); */
-
-    if (i != 1) goto badarg;
-
-    enif_alloc_binary(outlen, &out_bin);
-
-    if (is_private) {
-	if (is_encrypt) {
-	    /* private_encrypt */
-	    i = EVP_PKEY_sign(ctx, out_bin.data, &outlen, in_bin.data, in_bin.size);
-	} else {
-	    /* private_decrypt */
-	    i = EVP_PKEY_decrypt(ctx, out_bin.data, &outlen, in_bin.data, in_bin.size);
-	}
-    } else {
-	if (is_encrypt) {
-	    /* public_encrypt */
-	    i = EVP_PKEY_encrypt(ctx, out_bin.data, &outlen, in_bin.data, in_bin.size);
-	} else {
-	    /* public_decrypt */
-	    i = EVP_PKEY_verify_recover(ctx, out_bin.data, &outlen, in_bin.data, in_bin.size);
-	}
-    }
-
-#else
-    /* Non-EVP cryptolib. Only support RSA */
-
-    if (argv[0] != atom_rsa) {
-        algo_init = -2;         /* exitcode: notsup */
-        goto badarg;
-    }
-    rsa = EVP_PKEY_get1_RSA(pkey);
-    enif_alloc_binary(RSA_size(rsa), &out_bin);
-
-    if (is_private) {
-        if (is_encrypt) {
-            /* non-evp rsa private encrypt */
-            ERL_VALGRIND_ASSERT_MEM_DEFINED(in_bin.data,in_bin.size);
-            i = RSA_private_encrypt(in_bin.size, in_bin.data,
-                                    out_bin.data, rsa, crypt_opt.rsa_padding);
-            if (i > 0) {
-                ERL_VALGRIND_MAKE_MEM_DEFINED(out_bin.data, i);
-            }
-        } else {
-            /* non-evp rsa private decrypt */
-            i = RSA_private_decrypt(in_bin.size, in_bin.data,
-                                    out_bin.data, rsa, crypt_opt.rsa_padding);
-            if (i > 0) {
-                ERL_VALGRIND_MAKE_MEM_DEFINED(out_bin.data, i);
-                enif_realloc_binary(&out_bin, i);
-            }
-        }
-    } else {
-        if (is_encrypt) {
-            /* non-evp rsa public encrypt */
-            ERL_VALGRIND_ASSERT_MEM_DEFINED(in_bin.data,in_bin.size);
-            i = RSA_public_encrypt(in_bin.size, in_bin.data,
-                                   out_bin.data, rsa, crypt_opt.rsa_padding);
-            if (i > 0) {
-                ERL_VALGRIND_MAKE_MEM_DEFINED(out_bin.data, i);
-	}
-        } else {
-            /* non-evp rsa public decrypt */
-            i = RSA_public_decrypt(in_bin.size, in_bin.data,
-                                   out_bin.data, rsa, crypt_opt.rsa_padding);
-            if (i > 0) {
-                ERL_VALGRIND_MAKE_MEM_DEFINED(out_bin.data, i);
-                enif_realloc_binary(&out_bin, i);
-            }
-        }
-    }
-
-    outlen = i;
-    RSA_free(rsa);
-#endif
-
-    if ((i > 0) && argv[0] == atom_rsa && !is_encrypt) {
-#ifdef HAVE_RSA_SSLV23_PADDING
-	if (crypt_opt.rsa_padding == RSA_SSLV23_PADDING) {
-	    unsigned char *p;
-            tmplen = size_of_RSA(pkey);
-	    if (tmplen == 0) goto badarg;
-	    if (!enif_alloc_binary(tmplen, &tmp_bin))
-                goto badarg;
-	    p = out_bin.data;
-	    p++;
-	    i = RSA_padding_check_SSLv23(tmp_bin.data, tmplen, p, out_bin.size - 1, tmplen);
-	    if (i >= 0) {
-		outlen = i;
-		in_bin = out_bin;
-		out_bin = tmp_bin;
-		tmp_bin = in_bin;
-		i = 1;
-	    }
-	}
-#endif
-    }
-
-    if (tmp_bin.data != NULL) {
-	enif_release_binary(&tmp_bin);
-    }
-
-#ifdef HAS_EVP_PKEY_CTX
-    EVP_PKEY_CTX_free(ctx);
-#else
-#endif
-    EVP_PKEY_free(pkey);
-    if (i > 0) {
-	ERL_VALGRIND_MAKE_MEM_DEFINED(out_bin.data, outlen);
-	if (outlen != out_bin.size) {
-	    enif_realloc_binary(&out_bin, outlen);
-	    ERL_VALGRIND_ASSERT_MEM_DEFINED(out_bin.data, outlen);
-	}
-	return enif_make_binary(env, &out_bin);
-    } else {
-	enif_release_binary(&out_bin);
-	return atom_error;
-    }
-
- badarg:
-    if (out_bin.data != NULL) {
-	enif_release_binary(&out_bin);
-    }
-    if (tmp_bin.data != NULL) {
-	enif_release_binary(&tmp_bin);
-    }
-#ifdef HAS_EVP_PKEY_CTX
-    EVP_PKEY_CTX_free(ctx);
-#else
-#endif
-    EVP_PKEY_free(pkey);
-    if (algo_init == -2)
-        return atom_notsup;
-    else
-        return enif_make_badarg(env);
-}
-
-
-
-/*--------------------------------*/
-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
-            RSA_free(rsa);
-            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);
-	    DSA_free(dsa);
-            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);
-}
-
-/*================================================================*/
-
-static ERL_NIF_TERM rand_seed_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{
-    ErlNifBinary seed_bin;
-
-    if (!enif_inspect_binary(env, argv[0], &seed_bin))
-        return enif_make_badarg(env);
-    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_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_binary(env, &engine_id_bin);
-#else
-    return atom_notsup;
-#endif
-}
-
-static ERL_NIF_TERM engine_get_name_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Engine) */
-#ifdef HAS_ENGINE_SUPPORT
-    ErlNifBinary engine_name_bin;
-    const char *engine_name;
-    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_name = ENGINE_get_name(ctx->engine);
-    if (!engine_name) {
-        enif_alloc_binary(0, &engine_name_bin);
-        engine_name_bin.size = 0;
-        return enif_make_binary(env, &engine_name_bin);
-    }
-
-    size = strlen(engine_name);
-    enif_alloc_binary(size, &engine_name_bin);
-    engine_name_bin.size = size;
-    memcpy(engine_name_bin.data, engine_name, size);
-
-    return enif_make_binary(env, &engine_name_bin);
-#else
-    return atom_notsup;
-#endif
-}
-
-#ifdef HAS_ENGINE_SUPPORT
-static int get_engine_load_cmd_list(ErlNifEnv* env, const ERL_NIF_TERM term, char **cmds, int i)
-{
-    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;
-    }
-}
-#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/crypto_callback.c b/lib/crypto/c_src/crypto_callback.c
index 0cc7dd609d..0141ccd840 100644
--- a/lib/crypto/c_src/crypto_callback.c
+++ b/lib/crypto/c_src/crypto_callback.c
@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <openssl/opensslconf.h>
+#include <stdint.h>
 
 #include <erl_nif.h>
 #include "crypto_callback.h"
@@ -64,22 +65,36 @@ static void nomem(size_t size, const char* op)
 
 static void* crypto_alloc(size_t size CCB_FILE_LINE_ARGS)
 {
-    void *ret = enif_alloc(size);
+    void *ret;
 
-    if (!ret && size)
-	nomem(size, "allocate");
+    if ((ret = enif_alloc(size)) == NULL)
+        goto err;
     return ret;
+
+ err:
+    if (size)
+	nomem(size, "allocate");
+    return NULL;
 }
 static void* crypto_realloc(void* ptr, size_t size CCB_FILE_LINE_ARGS)
 {
-    void* ret = enif_realloc(ptr, size);
+    void* ret;
 
-    if (!ret && size)
-	nomem(size, "reallocate");
+    if ((ret = enif_realloc(ptr, size)) == NULL)
+        goto err;
     return ret;
+
+ err:
+    if (size)
+	nomem(size, "reallocate");
+    return NULL;
 }
+
 static void crypto_free(void* ptr CCB_FILE_LINE_ARGS)
 {
+    if (ptr == NULL)
+        return;
+
     enif_free(ptr);
 }
 
@@ -160,19 +175,26 @@ DLLEXPORT struct crypto_callbacks* get_crypto_callbacks(int nlocks)
 #ifdef OPENSSL_THREADS
 	if (nlocks > 0) {
 	    int i;
-	    lock_vec = enif_alloc(nlocks*sizeof(*lock_vec));
-	    if (lock_vec==NULL) return NULL;
-	    memset(lock_vec, 0, nlocks*sizeof(*lock_vec));
-	    
+
+            if ((size_t)nlocks > SIZE_MAX / sizeof(*lock_vec))
+                goto err;
+            if ((lock_vec = enif_alloc((size_t)nlocks * sizeof(*lock_vec))) == NULL)
+                goto err;
+
+            memset(lock_vec, 0, (size_t)nlocks * sizeof(*lock_vec));
+
 	    for (i=nlocks-1; i>=0; --i) {
-		lock_vec[i] = enif_rwlock_create("crypto_stat");
-		if (lock_vec[i]==NULL) return NULL;
+		if ((lock_vec[i] = enif_rwlock_create("crypto_stat")) == NULL)
+                    goto err;
 	    }
 	}
 #endif
 	is_initialized = 1;
     }
     return &the_struct;
+
+ err:
+    return NULL;
 }
 
 #ifdef HAVE_DYNAMIC_CRYPTO_LIB
diff --git a/lib/crypto/c_src/dh.c b/lib/crypto/c_src/dh.c
new file mode 100644
index 0000000000..13a2336f25
--- /dev/null
+++ b/lib/crypto/c_src/dh.c
@@ -0,0 +1,302 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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 "dh.h"
+#include "bn.h"
+
+ERL_NIF_TERM dh_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (PrivKey|undefined, DHParams=[P,G], Mpint, Len|0) */
+#ifdef HAVE_DH
+    DH *dh_params = NULL;
+    unsigned int mpint; /* 0 or 4 */
+    ERL_NIF_TERM head, tail;
+    BIGNUM *dh_p = NULL;
+    BIGNUM *dh_p_shared;
+    BIGNUM *dh_g = NULL;
+    BIGNUM *priv_key_in = NULL;
+    unsigned long len = 0;
+    unsigned char *pub_ptr, *prv_ptr;
+    int pub_len, prv_len;
+    ERL_NIF_TERM ret_pub, ret_prv, ret;
+    const BIGNUM *pub_key_gen, *priv_key_gen;
+#ifdef HAS_EVP_PKEY_CTX
+    EVP_PKEY_CTX *ctx = NULL;
+    EVP_PKEY *dhkey = NULL, *params = NULL;
+#endif
+
+    ASSERT(argc == 4);
+
+    if (argv[0] != atom_undefined) {
+        if (!get_bn_from_bin(env, argv[0], &priv_key_in))
+            goto bad_arg;
+    }
+    if (!enif_get_list_cell(env, argv[1], &head, &tail))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, head, &dh_p))
+        goto bad_arg;
+
+    if (!enif_get_list_cell(env, tail, &head, &tail))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, head, &dh_g))
+        goto bad_arg;
+
+    if (!enif_is_empty_list(env, tail))
+        goto bad_arg;
+
+    if (!enif_get_uint(env, argv[2], &mpint))
+        goto bad_arg;
+    if (mpint != 0 && mpint != 4)
+        goto bad_arg;
+
+    if (!enif_get_ulong(env, argv[3], &len))
+        goto bad_arg;
+    if (len > LONG_MAX)
+        goto bad_arg;
+
+    /* Load dh_params with values to use by the generator.
+       Mem mgmnt transfered from dh_p etc to dh_params */
+    if ((dh_params = DH_new()) == NULL)
+        goto bad_arg;
+    if (priv_key_in) {
+        if (!DH_set0_key(dh_params, NULL, priv_key_in))
+            goto bad_arg;
+        /* On success, dh_params owns priv_key_in */
+        priv_key_in = NULL;
+    }
+    if (!DH_set0_pqg(dh_params, dh_p, NULL, dh_g))
+        goto bad_arg;
+    dh_p_shared = dh_p; /* Don't free this because dh_params owns it */
+    /* On success, dh_params owns dh_p and dh_g */
+    dh_p = NULL;
+    dh_g = NULL;
+
+    if (len) {
+        int bn_len;
+
+        if ((bn_len = BN_num_bits(dh_p_shared)) < 0)
+            goto bad_arg;
+        dh_p_shared = NULL;  /* dh_params owns the reference */
+        if (len >= (size_t)bn_len)
+            goto bad_arg;
+
+        if (!DH_set_length(dh_params, (long)len))
+            goto bad_arg;
+    }
+
+#ifdef HAS_EVP_PKEY_CTX
+    if ((params = EVP_PKEY_new()) == NULL)
+        goto err;
+
+   /* set the key referenced by params to dh_params... */
+    if (EVP_PKEY_set1_DH(params, dh_params) != 1)
+        goto err;
+
+    if ((ctx = EVP_PKEY_CTX_new(params, NULL)) == NULL)
+        goto err;
+
+    if (EVP_PKEY_keygen_init(ctx) != 1)
+        goto err;
+
+    if ((dhkey = EVP_PKEY_new()) == NULL)
+        goto err;
+
+    /* key gen op, key written to ppkey (=last arg) */
+    if (EVP_PKEY_keygen(ctx, &dhkey) != 1)
+        goto err;
+
+    DH_free(dh_params);
+    if ((dh_params = EVP_PKEY_get1_DH(dhkey)) == NULL)
+        goto err;
+
+#else
+    if (!DH_generate_key(dh_params))
+        goto err;
+#endif
+
+    DH_get0_key(dh_params, &pub_key_gen, &priv_key_gen);
+
+    if ((pub_len = BN_num_bytes(pub_key_gen)) < 0)
+        goto err;
+    if ((prv_len = BN_num_bytes(priv_key_gen)) < 0)
+        goto err;
+
+    if ((pub_ptr = enif_make_new_binary(env, (size_t)pub_len+mpint, &ret_pub)) == NULL)
+        goto err;
+    if ((prv_ptr = enif_make_new_binary(env, (size_t)prv_len+mpint, &ret_prv)) == NULL)
+        goto err;
+
+    if (mpint) {
+        put_uint32(pub_ptr, (unsigned int)pub_len);
+        pub_ptr += 4;
+
+        put_uint32(prv_ptr, (unsigned int)prv_len);
+        prv_ptr += 4;
+    }
+
+    if (BN_bn2bin(pub_key_gen, pub_ptr) < 0)
+        goto err;
+    if (BN_bn2bin(priv_key_gen, prv_ptr) < 0)
+        goto err;
+
+    ERL_VALGRIND_MAKE_MEM_DEFINED(pub_ptr, pub_len);
+    ERL_VALGRIND_MAKE_MEM_DEFINED(prv_ptr, prv_len);
+
+    ret = enif_make_tuple2(env, ret_pub, ret_prv);
+    goto done;
+
+ bad_arg:
+    ret = enif_make_badarg(env);
+    goto done;
+
+ err:
+    ret = atom_error;
+
+ done:
+    if (priv_key_in)
+        BN_free(priv_key_in);
+    if (dh_p)
+        BN_free(dh_p);
+    if (dh_g)
+        BN_free(dh_g);
+    if (dh_params)
+        DH_free(dh_params);
+
+#ifdef HAS_EVP_PKEY_CTX
+    if (ctx)
+        EVP_PKEY_CTX_free(ctx);
+    if (dhkey)
+        EVP_PKEY_free(dhkey);
+    if (params)
+        EVP_PKEY_free(params);
+#endif
+
+    return ret;
+#else
+    return enif_raise_exception(env, atom_notsup);
+#endif
+}
+
+ERL_NIF_TERM dh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (OthersPublicKey, MyPrivateKey, DHParams=[P,G]) */
+#ifdef HAVE_DH
+    BIGNUM *other_pub_key = NULL;
+    BIGNUM *dh_p = NULL;
+    BIGNUM *dh_g = NULL;
+    BIGNUM *dummy_pub_key = NULL;
+    BIGNUM *priv_key = NULL;
+    DH *dh_priv = NULL;
+    ERL_NIF_TERM head, tail, ret;
+    ErlNifBinary ret_bin;
+    int size;
+    int ret_bin_alloc = 0;
+    int dh_size;
+
+    /* Check the arguments and get
+          my private key (dh_priv),
+          the peer's public key (other_pub_key),
+          the parameters p & q
+    */
+    ASSERT(argc == 3);
+
+    if (!get_bn_from_bin(env, argv[0], &other_pub_key))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, argv[1], &priv_key))
+        goto bad_arg;
+
+    if (!enif_get_list_cell(env, argv[2], &head, &tail))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, head, &dh_p))
+        goto bad_arg;
+
+    if (!enif_get_list_cell(env, tail, &head, &tail))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, head, &dh_g))
+        goto bad_arg;
+
+    if (!enif_is_empty_list(env, tail))
+        goto bad_arg;
+
+    /* Note: DH_set0_key() does not allow setting only the
+     * private key, although DH_compute_key() does not use the
+     * public key. Work around this limitation by setting
+     * the public key to a copy of the private key.
+     */
+    if ((dummy_pub_key = BN_dup(priv_key)) == NULL)
+        goto err;
+    if ((dh_priv = DH_new()) == NULL)
+        goto err;
+
+    if (!DH_set0_key(dh_priv, dummy_pub_key, priv_key))
+        goto err;
+    /* dh_priv owns dummy_pub_key and priv_key now */
+    dummy_pub_key = NULL;
+    priv_key = NULL;
+
+    if (!DH_set0_pqg(dh_priv, dh_p, NULL, dh_g))
+        goto err;
+    /* dh_priv owns dh_p and dh_g now */
+    dh_p = NULL;
+    dh_g = NULL;
+
+    if ((dh_size = DH_size(dh_priv)) < 0)
+        goto err;
+    if (!enif_alloc_binary((size_t)dh_size, &ret_bin))
+        goto err;
+    ret_bin_alloc = 1;
+
+    if ((size = DH_compute_key(ret_bin.data, other_pub_key, dh_priv)) < 0)
+        goto err;
+    if (size == 0)
+        goto err;
+
+    if ((size_t)size != ret_bin.size) {
+        if (!enif_realloc_binary(&ret_bin, (size_t)size))
+            goto err;
+    }
+
+    ret = enif_make_binary(env, &ret_bin);
+    ret_bin_alloc = 0;
+    goto done;
+
+ bad_arg:
+ err:
+    if (ret_bin_alloc)
+        enif_release_binary(&ret_bin);
+    ret = enif_make_badarg(env);
+
+ done:
+    if (other_pub_key)
+        BN_free(other_pub_key);
+    if (priv_key)
+        BN_free(priv_key);
+    if (dh_p)
+        BN_free(dh_p);
+    if (dh_g)
+        BN_free(dh_g);
+    if (dummy_pub_key)
+        BN_free(dummy_pub_key);
+    if (dh_priv)
+        DH_free(dh_priv);
+
+    return ret;
+#else
+    return enif_raise_exception(env, atom_notsup);
+#endif
+}
diff --git a/lib/crypto/c_src/dh.h b/lib/crypto/c_src/dh.h
new file mode 100644
index 0000000000..a996b0ea28
--- /dev/null
+++ b/lib/crypto/c_src/dh.h
@@ -0,0 +1,29 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_DH_H__
+#define E_DH_H__ 1
+
+#include "common.h"
+
+ERL_NIF_TERM dh_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM dh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+#endif /* E_DH_H__ */
diff --git a/lib/crypto/c_src/digest.c b/lib/crypto/c_src/digest.c
new file mode 100644
index 0000000000..0f887ab765
--- /dev/null
+++ b/lib/crypto/c_src/digest.c
@@ -0,0 +1,157 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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 "digest.h"
+
+static struct digest_type_t digest_types[] =
+{
+    {{"md4"}, NO_FIPS_DIGEST,
+#ifdef HAVE_MD4
+     {&EVP_md4}
+#else
+    {NULL}
+#endif
+    },
+
+    {{"md5"}, NO_FIPS_DIGEST,
+#ifdef HAVE_MD5
+     {&EVP_md5}
+#else
+     {NULL}
+#endif
+    },
+
+    {{"ripemd160"}, NO_FIPS_DIGEST,
+#ifdef HAVE_RIPEMD160
+     {&EVP_ripemd160}
+#else
+     {NULL}
+#endif
+    },
+
+    {{"sha"}, 0, {&EVP_sha1}},
+
+    {{"sha224"}, 0,
+#ifdef HAVE_SHA224
+     {&EVP_sha224}
+#else
+     {NULL}
+#endif
+    },
+
+    {{"sha256"}, 0,
+#ifdef HAVE_SHA256
+     {&EVP_sha256}
+#else
+     {NULL}
+#endif
+    },
+
+    {{"sha384"}, 0,
+#ifdef HAVE_SHA384
+     {&EVP_sha384}
+#else
+     {NULL}
+#endif
+    },
+
+    {{"sha512"}, 0,
+#ifdef HAVE_SHA512
+     {&EVP_sha512}
+#else
+     {NULL}
+#endif
+    },
+
+    {{"sha3_224"}, 0,
+#ifdef HAVE_SHA3_224
+     {&EVP_sha3_224}
+#else
+     {NULL}
+#endif
+    },
+
+    {{"sha3_256"}, 0,
+#ifdef HAVE_SHA3_256
+     {&EVP_sha3_256}
+#else
+     {NULL}
+#endif
+    },
+
+    {{"sha3_384"}, 0,
+#ifdef HAVE_SHA3_384
+     {&EVP_sha3_384}
+#else
+     {NULL}
+#endif
+    },
+
+    {{"sha3_512"}, 0,
+#ifdef HAVE_SHA3_512
+     {&EVP_sha3_512}
+#else
+     {NULL}
+#endif
+    },
+
+    {{"blake2b"}, 0,
+#ifdef HAVE_BLAKE2
+     {&EVP_blake2b512}
+#else
+     {NULL}
+#endif
+    },
+
+    {{"blake2s"}, 0,
+#ifdef HAVE_BLAKE2
+     {&EVP_blake2s256}
+#else
+     {NULL}
+#endif
+    },
+
+    /*==== End of list ==== */
+    {{NULL}, 0, {NULL}}
+};
+
+void init_digest_types(ErlNifEnv* env)
+{
+    struct digest_type_t* p = digest_types;
+
+    for (p = digest_types; p->type.str; p++) {
+	p->type.atom = enif_make_atom(env, p->type.str);
+	if (p->md.funcp)
+	    p->md.p = p->md.funcp();
+    }
+    p->type.atom = atom_false;  /* end marker */
+}
+
+struct digest_type_t* get_digest_type(ERL_NIF_TERM type)
+{
+    struct digest_type_t* p = NULL;
+    for (p = digest_types; p->type.atom != atom_false; p++) {
+	if (type == p->type.atom) {
+	    return p;
+	}
+    }
+    return NULL;
+}
+
diff --git a/lib/crypto/c_src/digest.h b/lib/crypto/c_src/digest.h
new file mode 100644
index 0000000000..b1f8128a1f
--- /dev/null
+++ b/lib/crypto/c_src/digest.h
@@ -0,0 +1,53 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_DIGEST_H__
+#define E_DIGEST_H__ 1
+
+#include "common.h"
+
+struct digest_type_t {
+    union {
+	const char*  str;        /* before init, NULL for end-of-table */
+	ERL_NIF_TERM atom;       /* after init, 'false' for end-of-table */
+    }type;
+    unsigned flags;
+    union {
+	const EVP_MD* (*funcp)(void);  /* before init, NULL if notsup */
+	const EVP_MD* p;               /* after init, NULL if notsup */
+    }md;
+};
+
+/* masks in the flags field if digest_type_t */
+#define NO_FIPS_DIGEST 1
+
+#ifdef FIPS_SUPPORT
+/* May have FIPS support, must check dynamically if it is enabled */
+# define DIGEST_FORBIDDEN_IN_FIPS(P) (((P)->flags & NO_FIPS_DIGEST) && FIPS_mode())
+#else
+/* No FIPS support since the symbol FIPS_SUPPORT is undefined */
+# define DIGEST_FORBIDDEN_IN_FIPS(P) 0
+#endif
+
+
+void init_digest_types(ErlNifEnv* env);
+struct digest_type_t* get_digest_type(ERL_NIF_TERM type);
+
+#endif /* E_DIGEST_H__ */
diff --git a/lib/crypto/c_src/dss.c b/lib/crypto/c_src/dss.c
new file mode 100644
index 0000000000..63268f0f2b
--- /dev/null
+++ b/lib/crypto/c_src/dss.c
@@ -0,0 +1,148 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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 "dss.h"
+#include "bn.h"
+
+#ifdef HAVE_DSA
+
+int get_dss_private_key(ErlNifEnv* env, ERL_NIF_TERM key, DSA *dsa)
+{
+    /* key=[P,Q,G,KEY] */
+    ERL_NIF_TERM head, tail;
+    BIGNUM *dsa_p = NULL, *dsa_q = NULL, *dsa_g = NULL;
+    BIGNUM *dummy_pub_key = NULL, *priv_key = NULL;
+
+    if (!enif_get_list_cell(env, key, &head, &tail))
+        goto err;
+    if (!get_bn_from_bin(env, head, &dsa_p))
+        goto err;
+
+    if (!enif_get_list_cell(env, tail, &head, &tail))
+        goto err;
+    if (!get_bn_from_bin(env, head, &dsa_q))
+        goto err;
+
+    if (!enif_get_list_cell(env, tail, &head, &tail))
+        goto err;
+    if (!get_bn_from_bin(env, head, &dsa_g))
+        goto err;
+
+    if (!enif_get_list_cell(env, tail, &head, &tail))
+        goto err;
+    if (!get_bn_from_bin(env, head, &priv_key))
+        goto err;
+
+    if (!enif_is_empty_list(env, tail))
+        goto err;
+
+    /* Note: DSA_set0_key() does not allow setting only the
+     * private key, although DSA_sign() does not use the
+     * public key. Work around this limitation by setting
+     * the public key to a copy of the private key.
+     */
+    if ((dummy_pub_key = BN_dup(priv_key)) == NULL)
+        goto err;
+
+    if (!DSA_set0_pqg(dsa, dsa_p, dsa_q, dsa_g))
+        goto err;
+    /* dsa takes ownership on success */
+    dsa_p = NULL;
+    dsa_q = NULL;
+    dsa_g = NULL;
+
+    if (!DSA_set0_key(dsa, dummy_pub_key, priv_key))
+        goto err;
+    /* dsa takes ownership on success */
+    dummy_pub_key = NULL;
+    priv_key = NULL;
+
+    return 1;
+
+ err:
+    if (dsa_p)
+        BN_free(dsa_p);
+    if (dsa_q)
+        BN_free(dsa_q);
+    if (dsa_g)
+        BN_free(dsa_g);
+    if (priv_key)
+        BN_free(priv_key);
+    if (dummy_pub_key)
+        BN_free(dummy_pub_key);
+    return 0;
+}
+
+int get_dss_public_key(ErlNifEnv* env, ERL_NIF_TERM key, DSA *dsa)
+{
+    /* key=[P, Q, G, Y] */
+    ERL_NIF_TERM head, tail;
+    BIGNUM *dsa_p = NULL, *dsa_q = NULL, *dsa_g = NULL, *dsa_y = NULL;
+
+    if (!enif_get_list_cell(env, key, &head, &tail))
+        goto err;
+    if (!get_bn_from_bin(env, head, &dsa_p))
+        goto err;
+
+    if (!enif_get_list_cell(env, tail, &head, &tail))
+        goto err;
+    if (!get_bn_from_bin(env, head, &dsa_q))
+        goto err;
+
+    if (!enif_get_list_cell(env, tail, &head, &tail))
+        goto err;
+    if (!get_bn_from_bin(env, head, &dsa_g))
+        goto err;
+
+    if (!enif_get_list_cell(env, tail, &head, &tail))
+        goto err;
+    if (!get_bn_from_bin(env, head, &dsa_y))
+        goto err;
+
+    if (!enif_is_empty_list(env,tail))
+        goto err;
+
+    if (!DSA_set0_pqg(dsa, dsa_p, dsa_q, dsa_g))
+        goto err;
+    /* dsa takes ownership on success */
+    dsa_p = NULL;
+    dsa_q = NULL;
+    dsa_g = NULL;
+
+    if (!DSA_set0_key(dsa, dsa_y, NULL))
+        goto err;
+    /* dsa takes ownership on success */
+    dsa_y = NULL;
+
+    return 1;
+
+ err:
+    if (dsa_p)
+        BN_free(dsa_p);
+    if (dsa_q)
+        BN_free(dsa_q);
+    if (dsa_g)
+        BN_free(dsa_g);
+    if (dsa_y)
+        BN_free(dsa_y);
+    return 0;
+}
+
+#endif
diff --git a/lib/crypto/c_src/dss.h b/lib/crypto/c_src/dss.h
new file mode 100644
index 0000000000..07e28ca7c5
--- /dev/null
+++ b/lib/crypto/c_src/dss.h
@@ -0,0 +1,31 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_DSS_H__
+#define E_DSS_H__ 1
+
+#include "common.h"
+
+#ifdef HAVE_DSA
+int get_dss_private_key(ErlNifEnv* env, ERL_NIF_TERM key, DSA *dsa);
+int get_dss_public_key(ErlNifEnv* env, ERL_NIF_TERM key, DSA *dsa);
+#endif
+
+#endif /* E_DSS_H__ */
diff --git a/lib/crypto/c_src/ec.c b/lib/crypto/c_src/ec.c
new file mode 100644
index 0000000000..51a3547694
--- /dev/null
+++ b/lib/crypto/c_src/ec.c
@@ -0,0 +1,414 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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 "ec.h"
+#include "bn.h"
+
+#ifdef HAVE_EC
+static EC_KEY* ec_key_new(ErlNifEnv* env, ERL_NIF_TERM curve_arg);
+static ERL_NIF_TERM point2term(ErlNifEnv* env,
+			       const EC_GROUP *group,
+			       const EC_POINT *point,
+			       point_conversion_form_t form);
+
+ERL_NIF_TERM make_badarg_maybe(ErlNifEnv* env)
+{
+    ERL_NIF_TERM reason;
+    if (enif_has_pending_exception(env, &reason))
+	return reason; /* dummy return value ignored */
+    else
+	return enif_make_badarg(env);
+}
+
+static EC_KEY* ec_key_new(ErlNifEnv* env, ERL_NIF_TERM curve_arg)
+{
+    EC_KEY *key = NULL;
+    int c_arity = -1;
+    const ERL_NIF_TERM* curve;
+    ErlNifBinary seed;
+    BIGNUM *p = NULL;
+    BIGNUM *a = NULL;
+    BIGNUM *b = NULL;
+    BIGNUM *bn_order = NULL;
+    BIGNUM *cofactor = NULL;
+    EC_GROUP *group = NULL;
+    EC_POINT *point = NULL;
+    int f_arity = -1;
+    const ERL_NIF_TERM *field;
+    int p_arity = -1;
+    const ERL_NIF_TERM *prime;
+    long field_bits;
+
+    /* {Field, Prime, Point, Order, CoFactor} = Curve */
+    if (!enif_get_tuple(env, curve_arg, &c_arity, &curve))
+        goto err;
+    if (c_arity != 5)
+        goto err;
+    if (!get_bn_from_bin(env, curve[3], &bn_order))
+        goto err;
+    if (curve[4] != atom_none) {
+        if (!get_bn_from_bin(env, curve[4], &cofactor))
+            goto err;
+    }
+
+    /* {A, B, Seed} = Prime */
+    if (!enif_get_tuple(env, curve[1], &p_arity, &prime))
+        goto err;
+    if (!get_bn_from_bin(env, prime[0], &a))
+        goto err;
+    if (!get_bn_from_bin(env, prime[1], &b))
+        goto err;
+
+    if (!enif_get_tuple(env, curve[0], &f_arity, &field))
+        goto err;
+
+    if (f_arity == 2 && field[0] == atom_prime_field) {
+        /* {prime_field, Prime} */
+        if (!get_bn_from_bin(env, field[1], &p))
+            goto err;
+        if (BN_is_negative(p))
+            goto err;
+        if (BN_is_zero(p))
+            goto err;
+
+        field_bits = BN_num_bits(p);
+        if (field_bits > OPENSSL_ECC_MAX_FIELD_BITS)
+            goto err;
+
+        /* create the EC_GROUP structure */
+        if ((group = EC_GROUP_new_curve_GFp(p, a, b, NULL)) == NULL)
+            goto err;
+
+    } else if (f_arity == 3 && field[0] == atom_characteristic_two_field) {
+#if defined(OPENSSL_NO_EC2M)
+        enif_raise_exception(env, atom_notsup);
+        goto err;
+#else
+        /* {characteristic_two_field, M, Basis} */
+        int b_arity = -1;
+        const ERL_NIF_TERM* basis;
+
+        if ((p = BN_new()) == NULL)
+            goto err;
+        if (!enif_get_long(env, field[1], &field_bits))
+            goto err;
+        if (field_bits > OPENSSL_ECC_MAX_FIELD_BITS || field_bits > INT_MAX)
+            goto err;
+
+        if (enif_get_tuple(env, field[2], &b_arity, &basis)) {
+            if (b_arity == 2) {
+                unsigned int k1;
+
+                if (basis[0] != atom_tpbasis)
+                    goto err;
+                if (!enif_get_uint(env, basis[1], &k1))
+                    goto err;
+
+                /* {tpbasis, k} = Basis */
+                if (field_bits <= k1 || k1 == 0 || k1 > INT_MAX)
+                    goto err;
+
+                /* create the polynomial */
+                if (!BN_set_bit(p, (int)field_bits))
+                    goto err;
+                if (!BN_set_bit(p, (int)k1))
+                    goto err;
+                if (!BN_set_bit(p, 0))
+                    goto err;
+
+            } else if (b_arity == 4) {
+                unsigned int k1, k2, k3;
+
+                if (basis[0] != atom_ppbasis)
+                    goto err;
+                if (!enif_get_uint(env, basis[1], &k1))
+                    goto err;
+                if (!enif_get_uint(env, basis[2], &k2))
+                    goto err;
+                if (!enif_get_uint(env, basis[3], &k3))
+                    goto err;
+
+                /* {ppbasis, k1, k2, k3} = Basis */
+                if (field_bits <= k3 || k3 <= k2 || k2 <= k1 || k1 == 0 || k3 > INT_MAX || k2 > INT_MAX || k1 > INT_MAX)
+                    goto err;
+
+                /* create the polynomial */
+                if (!BN_set_bit(p, (int)field_bits))
+                    goto err;
+                if (!BN_set_bit(p, (int)k1))
+                    goto err;
+                if (!BN_set_bit(p, (int)k2))
+                    goto err;
+                if (!BN_set_bit(p, (int)k3))
+                    goto err;
+                if (!BN_set_bit(p, 0))
+                    goto err;
+
+            } else
+                goto err;
+        } else if (field[2] == atom_onbasis) {
+            /* onbasis = Basis */
+            /* no parameters */
+            goto err;
+
+        } else
+            goto err;
+
+        if ((group = EC_GROUP_new_curve_GF2m(p, a, b, NULL)) == NULL)
+            goto err;
+#endif
+    } else
+        goto err;
+
+    if (enif_inspect_binary(env, prime[2], &seed)) {
+        if (!EC_GROUP_set_seed(group, seed.data, seed.size))
+            goto err;
+    }
+
+    if (!term2point(env, curve[2], group, &point))
+        goto err;
+
+    if (BN_is_negative(bn_order))
+        goto err;
+    if (BN_is_zero(bn_order))
+        goto err;
+    if (BN_num_bits(bn_order) > (int)field_bits + 1)
+        goto err;
+
+    if (!EC_GROUP_set_generator(group, point, bn_order, cofactor))
+        goto err;
+
+    EC_GROUP_set_asn1_flag(group, 0x0);
+
+    if ((key = EC_KEY_new()) == NULL)
+        goto err;
+
+    if (!EC_KEY_set_group(key, group))
+        goto err;
+
+    goto done;
+
+ err:
+    if (key)
+        EC_KEY_free(key);
+    key = NULL;
+
+ done:
+    /* some OpenSSL structures are mem-dup'ed into the key,
+       so we have to free our copies here */
+    if (bn_order)
+        BN_free(bn_order);
+    if (cofactor)
+        BN_free(cofactor);
+    if (a)
+        BN_free(a);
+    if (b)
+        BN_free(b);
+    if (p)
+        BN_free(p);
+    if (group)
+        EC_GROUP_free(group);
+    if (point)
+        EC_POINT_free(point);
+
+    return key;
+}
+
+static ERL_NIF_TERM point2term(ErlNifEnv* env,
+			       const EC_GROUP *group,
+			       const EC_POINT *point,
+			       point_conversion_form_t form)
+{
+    ERL_NIF_TERM ret;
+    size_t dlen;
+    ErlNifBinary bin;
+    int bin_alloc = 0;
+
+    if ((dlen = EC_POINT_point2oct(group, point, form, NULL, 0, NULL)) == 0)
+	return atom_undefined;
+
+    if (!enif_alloc_binary(dlen, &bin))
+        goto err;
+    bin_alloc = 1;
+
+    if (!EC_POINT_point2oct(group, point, form, bin.data, bin.size, NULL))
+        goto err;
+
+    ERL_VALGRIND_MAKE_MEM_DEFINED(bin.data, bin.size);
+
+    ret = enif_make_binary(env, &bin);
+    bin_alloc = 0;
+    goto done;
+
+ err:
+    if (bin_alloc)
+        enif_release_binary(&bin);
+    ret = enif_make_badarg(env);
+
+ done:
+    return ret;
+}
+
+int term2point(ErlNifEnv* env, ERL_NIF_TERM term, EC_GROUP *group, EC_POINT **pptr)
+{
+    ErlNifBinary bin;
+    EC_POINT *point = NULL;
+
+    if (!enif_inspect_binary(env, term, &bin))
+        goto err;
+
+    if ((point = EC_POINT_new(group)) == NULL)
+        goto err;
+
+    /* set the point conversion form */
+    EC_GROUP_set_point_conversion_form(group, (point_conversion_form_t)(bin.data[0] & ~0x01));
+
+    /* extract the ec point */
+    if (!EC_POINT_oct2point(group, point, bin.data, bin.size, NULL))
+        goto err;
+
+    *pptr = point;
+    return 1;
+
+ err:
+    if (point)
+        EC_POINT_free(point);
+    return 0;
+}
+
+int get_ec_key(ErlNifEnv* env,
+		      ERL_NIF_TERM curve, ERL_NIF_TERM priv, ERL_NIF_TERM pub,
+		      EC_KEY** res)
+{
+    EC_KEY *key = NULL;
+    BIGNUM *priv_key = NULL;
+    EC_POINT *pub_key = NULL;
+    EC_GROUP *group = NULL;
+
+    if (priv != atom_undefined) {
+        if (!get_bn_from_bin(env, priv, &priv_key))
+            goto err;
+    }
+    if (pub != atom_undefined) {
+        if (!enif_is_binary(env, pub))
+            goto err;
+    }
+
+    if ((key = ec_key_new(env, curve)) == NULL)
+        goto err;
+
+    if ((group = EC_GROUP_dup(EC_KEY_get0_group(key))) == NULL)
+        goto err;
+
+    if (term2point(env, pub, group, &pub_key)) {
+        if (!EC_KEY_set_public_key(key, pub_key))
+            goto err;
+    }
+
+    if (priv != atom_undefined && !BN_is_zero(priv_key)) {
+        if (!EC_KEY_set_private_key(key, priv_key))
+            goto err;
+
+        /* calculate public key (if necessary) */
+        if (EC_KEY_get0_public_key(key) == NULL) {
+            /* the public key was not included in the SEC1 private
+             * key => calculate the public key */
+            if ((pub_key = EC_POINT_new(group)) == NULL)
+                goto err;
+            if (!EC_POINT_copy(pub_key, EC_GROUP_get0_generator(group)))
+                goto err;
+            if (!EC_POINT_mul(group, pub_key, priv_key, NULL, NULL, NULL))
+                goto err;
+            if (!EC_KEY_set_public_key(key, pub_key))
+                goto err;
+        }
+    }
+    goto done;
+
+ err:
+    if (key)
+        EC_KEY_free(key);
+    key = NULL;
+
+ done:
+    /* some OpenSSL structures are mem-dup'ed into the key,
+       so we have to free our copies here */
+    if (priv_key)
+        BN_clear_free(priv_key);
+    if (group)
+        EC_GROUP_free(group);
+    if (pub_key)
+        EC_POINT_free(pub_key);
+
+    if (key == NULL)
+        return 0;
+
+    *res = key;
+    return 1;
+}
+
+#endif /* HAVE_EC */
+
+ERL_NIF_TERM ec_key_generate(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+#if defined(HAVE_EC)
+    EC_KEY *key = NULL;
+    const EC_GROUP *group;
+    const EC_POINT *public_key;
+    ERL_NIF_TERM priv_key;
+    ERL_NIF_TERM pub_key;
+    ERL_NIF_TERM ret;
+
+    if (!get_ec_key(env, argv[0], argv[1], atom_undefined, &key))
+        goto bad_arg;
+
+    if (argv[1] == atom_undefined) {
+	if (!EC_KEY_generate_key(key))
+            goto err;
+    }
+
+    group = EC_KEY_get0_group(key);
+    public_key = EC_KEY_get0_public_key(key);
+
+    if (group == NULL || public_key == NULL) {
+        pub_key = atom_undefined;
+
+    } else {
+        pub_key = point2term(env, group, public_key,
+                             EC_KEY_get_conv_form(key));
+    }
+
+    priv_key = bn2term(env, EC_KEY_get0_private_key(key));
+    ret = enif_make_tuple2(env, pub_key, priv_key);
+    goto done;
+
+ err:
+ bad_arg:
+    ret = make_badarg_maybe(env);
+
+ done:
+    if (key)
+        EC_KEY_free(key);
+    return ret;
+
+#else
+    return atom_notsup;
+#endif
+}
diff --git a/lib/crypto/c_src/ec.h b/lib/crypto/c_src/ec.h
new file mode 100644
index 0000000000..b7e1cc5a46
--- /dev/null
+++ b/lib/crypto/c_src/ec.h
@@ -0,0 +1,35 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_EC_H__
+#define E_EC_H__ 1
+
+#include "common.h"
+
+#if defined(HAVE_EC)
+int get_ec_key(ErlNifEnv* env, ERL_NIF_TERM curve, ERL_NIF_TERM priv, ERL_NIF_TERM pub,
+               EC_KEY** res);
+int term2point(ErlNifEnv* env, ERL_NIF_TERM term, EC_GROUP *group, EC_POINT **pptr);
+ERL_NIF_TERM make_badarg_maybe(ErlNifEnv* env);
+#endif
+
+ERL_NIF_TERM ec_key_generate(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+#endif /* E_EC_H__ */
diff --git a/lib/crypto/c_src/ecdh.c b/lib/crypto/c_src/ecdh.c
new file mode 100644
index 0000000000..9e3f460519
--- /dev/null
+++ b/lib/crypto/c_src/ecdh.c
@@ -0,0 +1,94 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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 "ecdh.h"
+#include "ec.h"
+
+/*
+  (_OthersPublicKey, _MyPrivateKey)
+  (_OthersPublicKey, _MyEC_Point)
+*/
+ERL_NIF_TERM ecdh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+/* (OtherPublicKey, Curve, My) */
+{
+#if defined(HAVE_EC)
+    ERL_NIF_TERM ret;
+    unsigned char *p;
+    EC_KEY* key = NULL;
+    int degree;
+    size_t field_size;
+    EC_GROUP *group = NULL;
+    const BIGNUM *priv_key;
+    EC_POINT *my_ecpoint = NULL;
+    EC_KEY *other_ecdh = NULL;
+
+    ASSERT(argc == 3);
+
+    if (!get_ec_key(env, argv[1], argv[2], atom_undefined, &key))
+        goto bad_arg;
+    if ((group = EC_GROUP_dup(EC_KEY_get0_group(key))) == NULL)
+        goto bad_arg;
+    priv_key = EC_KEY_get0_private_key(key);
+
+    if (!term2point(env, argv[0], group, &my_ecpoint)) {
+        goto err;
+    }
+
+    if ((other_ecdh = EC_KEY_new()) == NULL)
+        goto err;
+    if (!EC_KEY_set_group(other_ecdh, group))
+        goto err;
+    if (!EC_KEY_set_private_key(other_ecdh, priv_key))
+        goto err;
+
+    if ((degree = EC_GROUP_get_degree(group)) <= 0)
+        goto err;
+
+    field_size = (size_t)degree;
+    if ((p = enif_make_new_binary(env, (field_size+7)/8, &ret)) == NULL)
+        goto err;
+    if (ECDH_compute_key(p, (field_size+7)/8, my_ecpoint, other_ecdh, NULL) < 1)
+        goto err;
+
+    goto done;
+
+ bad_arg:
+    ret = make_badarg_maybe(env);
+    goto done;
+
+ err:
+    ret = enif_make_badarg(env);
+
+ done:
+    if (group)
+        EC_GROUP_free(group);
+    if (my_ecpoint)
+        EC_POINT_free(my_ecpoint);
+    if (other_ecdh)
+        EC_KEY_free(other_ecdh);
+    if (key)
+        EC_KEY_free(key);
+
+    return ret;
+
+#else
+    return atom_notsup;
+#endif
+}
diff --git a/lib/crypto/c_src/ecdh.h b/lib/crypto/c_src/ecdh.h
new file mode 100644
index 0000000000..5ed331e676
--- /dev/null
+++ b/lib/crypto/c_src/ecdh.h
@@ -0,0 +1,28 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_ECDH_H__
+#define E_ECDH_H__ 1
+
+#include "common.h"
+
+ERL_NIF_TERM ecdh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+#endif /* E_ECDH_H__ */
diff --git a/lib/crypto/c_src/eddsa.c b/lib/crypto/c_src/eddsa.c
new file mode 100644
index 0000000000..0c89f9f6db
--- /dev/null
+++ b/lib/crypto/c_src/eddsa.c
@@ -0,0 +1,63 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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 "eddsa.h"
+
+#ifdef HAVE_EDDSA
+int get_eddsa_key(ErlNifEnv* env, int public, ERL_NIF_TERM key, EVP_PKEY **pkey)
+{
+    /* key=[K] */
+    EVP_PKEY *result;
+    ERL_NIF_TERM head, tail, tail2, algo;
+    ErlNifBinary bin;
+    int type;
+
+    if (!enif_get_list_cell(env, key, &head, &tail))
+        goto err;
+    if (!enif_inspect_binary(env, head, &bin))
+        goto err;
+    if (!enif_get_list_cell(env, tail, &algo, &tail2))
+        goto err;
+    if (!enif_is_empty_list(env, tail2))
+        goto err;
+
+    if (algo == atom_ed25519) {
+        type = EVP_PKEY_ED25519;
+    } else if (algo == atom_ed448) {
+        type = EVP_PKEY_ED448;
+    } else {
+        goto err;
+    }
+
+    if (public)
+        result = EVP_PKEY_new_raw_public_key(type, NULL, bin.data, bin.size);
+    else 
+        result = EVP_PKEY_new_raw_private_key(type, NULL, bin.data, bin.size);
+
+    if (result == NULL)
+        goto err;
+
+    *pkey = result;
+    return 1;
+
+ err:
+    return 0;
+}
+#endif
diff --git a/lib/crypto/c_src/eddsa.h b/lib/crypto/c_src/eddsa.h
new file mode 100644
index 0000000000..4b30247cab
--- /dev/null
+++ b/lib/crypto/c_src/eddsa.h
@@ -0,0 +1,30 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_EDDSA_H__
+#define E_EDDSA_H__ 1
+
+#include "common.h"
+
+#ifdef HAVE_EDDSA
+int get_eddsa_key(ErlNifEnv* env, int public, ERL_NIF_TERM key, EVP_PKEY **pkey);
+#endif
+
+#endif /* E_EDDSA_H__ */
diff --git a/lib/crypto/c_src/engine.c b/lib/crypto/c_src/engine.c
new file mode 100644
index 0000000000..ea5d9a588f
--- /dev/null
+++ b/lib/crypto/c_src/engine.c
@@ -0,0 +1,840 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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 "engine.h"
+
+#ifdef HAS_ENGINE_SUPPORT
+struct engine_ctx {
+    ENGINE *engine;
+    char *id;
+};
+
+#define ERROR_Term(Env, ReasonTerm) enif_make_tuple2((Env), atom_error, (ReasonTerm))
+#define ERROR_Atom(Env, ReasonString) ERROR_Term((Env), enif_make_atom((Env),(ReasonString)))
+
+static ErlNifResourceType* engine_ctx_rtype;
+
+static int get_engine_load_cmd_list(ErlNifEnv* env, const ERL_NIF_TERM term, char **cmds, int i);
+static int zero_terminate(ErlNifBinary bin, char **buf);
+
+static void engine_ctx_dtor(ErlNifEnv* env, struct engine_ctx* ctx) {
+    if (ctx == NULL)
+        return;
+
+    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");
+}
+
+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))
+        goto err;
+    if (!enif_get_resource(env, engine_res, engine_ctx_rtype, (void**)&ctx))
+        goto err;
+    if (!enif_get_map_value(env, key, atom_key_id, &key_id_term))
+        goto err;
+    if (!enif_inspect_binary(env, key_id_term, &key_id_bin))
+        goto err;
+
+    *e = ctx->engine;
+    return zero_terminate(key_id_bin, id);
+
+ err:
+    return 0;
+}
+
+char *get_key_password(ErlNifEnv *env, ERL_NIF_TERM key) {
+    ERL_NIF_TERM tmp_term;
+    ErlNifBinary pwd_bin;
+    char *pwd = NULL;
+
+    if (!enif_get_map_value(env, key, atom_password, &tmp_term))
+        goto err;
+    if (!enif_inspect_binary(env, tmp_term, &pwd_bin))
+        goto err;
+    if (!zero_terminate(pwd_bin, &pwd))
+        goto err;
+
+    return pwd;
+
+ err:
+    return NULL;
+}
+
+static int zero_terminate(ErlNifBinary bin, char **buf) {
+    if ((*buf = enif_alloc(bin.size + 1)) == NULL)
+        goto err;
+
+    memcpy(*buf, bin.data, bin.size);
+    *(*buf + bin.size) = 0;
+
+    return 1;
+
+ err:
+    return 0;
+}
+#endif /* HAS_ENGINE_SUPPORT */
+
+int init_engine_ctx(ErlNifEnv *env) {
+#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 == NULL) {
+        PRINTF_ERR0("CRYPTO: Could not open resource type 'ENGINE_CTX'");
+        return 0;
+    }
+#endif
+
+    return 1;
+}
+
+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, result;
+    ErlNifBinary engine_id_bin;
+    char *engine_id = NULL;
+    ENGINE *engine;
+    struct engine_ctx *ctx = NULL;
+
+    // Get Engine Id
+    ASSERT(argc == 1);
+
+    if (!enif_inspect_binary(env, argv[0], &engine_id_bin))
+        goto bad_arg;
+
+    if ((engine_id = enif_alloc(engine_id_bin.size+1)) == NULL)
+        goto err;
+    (void) memcpy(engine_id, engine_id_bin.data, engine_id_bin.size);
+    engine_id[engine_id_bin.size] = '\0';
+
+    if ((engine = ENGINE_by_id(engine_id)) == NULL) {
+        PRINTF_ERR0("engine_by_id_nif Leaved: {error, bad_engine_id}");
+        ret = ERROR_Atom(env, "bad_engine_id");
+        goto done;
+    }
+
+    if ((ctx = enif_alloc_resource(engine_ctx_rtype, sizeof(struct engine_ctx))) == NULL)
+        goto err;
+    ctx->engine = engine;
+    ctx->id = engine_id;
+    /* ctx now owns engine_id */
+    engine_id = NULL;
+
+    result = enif_make_resource(env, ctx);
+    ret = enif_make_tuple2(env, atom_ok, result);
+    goto done;
+
+ bad_arg:
+ err:
+    ret = enif_make_badarg(env);
+
+ done:
+    if (engine_id)
+        enif_free(engine_id);
+    if (ctx)
+        enif_release_resource(ctx);
+    return ret;
+
+#else
+    return atom_notsup;
+#endif
+}
+
+ERL_NIF_TERM engine_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Engine) */
+#ifdef HAS_ENGINE_SUPPORT
+    struct engine_ctx *ctx;
+
+    // Get Engine
+    ASSERT(argc == 1);
+
+    if (!enif_get_resource(env, argv[0], engine_ctx_rtype, (void**)&ctx))
+        goto bad_arg;
+
+    if (!ENGINE_init(ctx->engine))
+        return ERROR_Atom(env, "engine_init_failed");
+
+    return atom_ok;
+
+ bad_arg:
+    return enif_make_badarg(env);
+
+#else
+    return atom_notsup;
+#endif
+}
+
+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
+    ASSERT(argc == 1);
+
+    if (!enif_get_resource(env, argv[0], engine_ctx_rtype, (void**)&ctx))
+        goto bad_arg;
+
+    if (!ENGINE_free(ctx->engine))
+        goto err;
+    return atom_ok;
+
+ bad_arg:
+ err:
+    return enif_make_badarg(env);
+#else
+    return atom_notsup;
+#endif
+}
+
+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
+    ASSERT(argc == 1);
+
+    if (!enif_get_resource(env, argv[0], engine_ctx_rtype, (void**)&ctx))
+        goto bad_arg;
+
+    if (!ENGINE_finish(ctx->engine))
+        goto err;
+    return atom_ok;
+
+ bad_arg:
+ err:
+    return enif_make_badarg(env);
+
+#else
+    return atom_notsup;
+#endif
+}
+
+ERL_NIF_TERM engine_load_dynamic_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* () */
+#ifdef HAS_ENGINE_SUPPORT
+    ASSERT(argc == 0);
+
+    ENGINE_load_dynamic();
+    return atom_ok;
+#else
+    return atom_notsup;
+#endif
+}
+
+ERL_NIF_TERM engine_ctrl_cmd_strings_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Engine, Commands, Optional) */
+#ifdef HAS_ENGINE_SUPPORT
+    ERL_NIF_TERM ret;
+    unsigned int cmds_len = 0;
+    char **cmds = NULL;
+    struct engine_ctx *ctx;
+    unsigned int i;
+    int optional = 0;
+    int cmds_loaded = 0;
+
+    // Get Engine
+    ASSERT(argc == 3);
+
+    if (!enif_get_resource(env, argv[0], engine_ctx_rtype, (void**)&ctx))
+        goto bad_arg;
+
+    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))
+        goto bad_arg;
+
+    if (cmds_len > (UINT_MAX / 2) - 1)
+        goto err;
+    cmds_len *= 2; // Key-Value list from erlang
+
+    if ((size_t)cmds_len + 1 > SIZE_MAX / sizeof(char*))
+        goto err;
+    if ((cmds = enif_alloc((cmds_len + 1) * sizeof(char*))) == NULL)
+        goto err;
+    if (get_engine_load_cmd_list(env, argv[1], cmds, 0))
+        goto err;
+    cmds_loaded = 1;
+    if (!enif_get_int(env, argv[2], &optional))
+        goto err;
+
+    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)");
+            goto cmd_failed;
+        }
+    }
+    ret = atom_ok;
+    goto done;
+
+ bad_arg:
+ err:
+    ret = enif_make_badarg(env);
+    goto done;
+
+ cmd_failed:
+    ret = ERROR_Atom(env, "ctrl_cmd_failed");
+
+ done:
+    if (cmds_loaded) {
+        for (i = 0; cmds != NULL && cmds[i] != NULL; i++)
+            enif_free(cmds[i]);
+    }
+
+    if (cmds != NULL)
+        enif_free(cmds);
+
+    return ret;
+
+#else
+    return atom_notsup;
+#endif
+}
+
+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
+    ASSERT(argc == 1);
+
+    if (!enif_get_resource(env, argv[0], engine_ctx_rtype, (void**)&ctx))
+        goto bad_arg;
+
+    if (!ENGINE_add(ctx->engine))
+        goto failed;
+
+    return atom_ok;
+
+ bad_arg:
+    return enif_make_badarg(env);
+
+ failed:
+    return ERROR_Atom(env, "add_engine_failed");
+
+#else
+    return atom_notsup;
+#endif
+}
+
+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
+    ASSERT(argc == 1);
+
+    if (!enif_get_resource(env, argv[0], engine_ctx_rtype, (void**)&ctx))
+        goto bad_arg;
+
+    if (!ENGINE_remove(ctx->engine))
+        goto failed;
+
+    return atom_ok;
+
+ bad_arg:
+    return enif_make_badarg(env);
+
+ failed:
+    return ERROR_Atom(env, "remove_engine_failed");
+#else
+    return atom_notsup;
+#endif
+}
+
+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
+    ASSERT(argc == 2);
+
+    if (!enif_get_resource(env, argv[0], engine_ctx_rtype, (void**)&ctx))
+        goto bad_arg;
+    if (!enif_get_uint(env, argv[1], &method))
+        goto bad_arg;
+
+    switch(method)
+    {
+#ifdef ENGINE_METHOD_RSA
+    case ENGINE_METHOD_RSA:
+        if (!ENGINE_register_RSA(ctx->engine))
+            goto failed;
+        break;
+#endif
+#ifdef ENGINE_METHOD_DSA
+    case ENGINE_METHOD_DSA:
+        if (!ENGINE_register_DSA(ctx->engine))
+            goto failed;
+        break;
+#endif
+#ifdef ENGINE_METHOD_DH
+    case ENGINE_METHOD_DH:
+        if (!ENGINE_register_DH(ctx->engine))
+            goto failed;
+        break;
+#endif
+#ifdef ENGINE_METHOD_RAND
+    case ENGINE_METHOD_RAND:
+        if (!ENGINE_register_RAND(ctx->engine))
+            goto failed;
+        break;
+#endif
+#ifdef ENGINE_METHOD_ECDH
+    case ENGINE_METHOD_ECDH:
+        if (!ENGINE_register_ECDH(ctx->engine))
+            goto failed;
+        break;
+#endif
+#ifdef ENGINE_METHOD_ECDSA
+    case ENGINE_METHOD_ECDSA:
+        if (!ENGINE_register_ECDSA(ctx->engine))
+            goto failed;
+        break;
+#endif
+#ifdef ENGINE_METHOD_STORE
+    case ENGINE_METHOD_STORE:
+        if (!ENGINE_register_STORE(ctx->engine))
+            goto failed;
+        break;
+#endif
+#ifdef ENGINE_METHOD_CIPHERS
+    case ENGINE_METHOD_CIPHERS:
+        if (!ENGINE_register_ciphers(ctx->engine))
+            goto failed;
+        break;
+#endif
+#ifdef ENGINE_METHOD_DIGESTS
+    case ENGINE_METHOD_DIGESTS:
+        if (!ENGINE_register_digests(ctx->engine))
+            goto failed;
+        break;
+#endif
+#ifdef ENGINE_METHOD_PKEY_METHS
+    case ENGINE_METHOD_PKEY_METHS:
+        if (!ENGINE_register_pkey_meths(ctx->engine))
+            goto failed;
+        break;
+#endif
+#ifdef ENGINE_METHOD_PKEY_ASN1_METHS
+    case ENGINE_METHOD_PKEY_ASN1_METHS:
+        if (!ENGINE_register_pkey_asn1_meths(ctx->engine))
+            goto failed;
+        break;
+#endif
+#ifdef ENGINE_METHOD_EC
+    case ENGINE_METHOD_EC:
+        if (!ENGINE_register_EC(ctx->engine))
+            goto failed;
+        break;
+#endif
+    default:
+        return ERROR_Atom(env, "engine_method_not_supported");
+    }
+
+    return atom_ok;
+
+ bad_arg:
+    return enif_make_badarg(env);
+
+ failed:
+    return ERROR_Atom(env, "register_engine_failed");
+
+#else
+    return atom_notsup;
+#endif
+}
+
+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
+    ASSERT(argc == 2);
+
+    if (!enif_get_resource(env, argv[0], engine_ctx_rtype, (void**)&ctx))
+        goto bad_arg;
+    if (!enif_get_uint(env, argv[1], &method))
+        goto bad_arg;
+
+    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;
+
+ bad_arg:
+    return enif_make_badarg(env);
+
+#else
+    return atom_notsup;
+#endif
+}
+
+ERL_NIF_TERM engine_get_first_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* () */
+#ifdef HAS_ENGINE_SUPPORT
+    ERL_NIF_TERM ret, result;
+    ENGINE *engine;
+    ErlNifBinary engine_bin;
+    struct engine_ctx *ctx = NULL;
+
+    ASSERT(argc == 0);
+
+    if ((engine = ENGINE_get_first()) == NULL) {
+        if (!enif_alloc_binary(0, &engine_bin))
+            goto err;
+        engine_bin.size = 0;
+        return enif_make_tuple2(env, atom_ok, enif_make_binary(env, &engine_bin));
+    }
+
+    if ((ctx = enif_alloc_resource(engine_ctx_rtype, sizeof(struct engine_ctx))) == NULL)
+        goto err;
+    ctx->engine = engine;
+    ctx->id = NULL;
+
+    result = enif_make_resource(env, ctx);
+    ret = enif_make_tuple2(env, atom_ok, result);
+    goto done;
+
+ err:
+    ret = enif_make_badarg(env);
+
+ done:
+    if (ctx)
+        enif_release_resource(ctx);
+    return ret;
+
+#else
+    return atom_notsup;
+#endif
+}
+
+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, result;
+    ENGINE *engine;
+    ErlNifBinary engine_bin;
+    struct engine_ctx *ctx, *next_ctx = NULL;
+
+    // Get Engine
+    ASSERT(argc == 1);
+
+    if (!enif_get_resource(env, argv[0], engine_ctx_rtype, (void**)&ctx))
+        goto bad_arg;
+
+    if ((engine = ENGINE_get_next(ctx->engine)) == NULL) {
+        if (!enif_alloc_binary(0, &engine_bin))
+            goto err;
+        engine_bin.size = 0;
+        return enif_make_tuple2(env, atom_ok, enif_make_binary(env, &engine_bin));
+    }
+
+    if ((next_ctx = enif_alloc_resource(engine_ctx_rtype, sizeof(struct engine_ctx))) == NULL)
+        goto err;
+    next_ctx->engine = engine;
+    next_ctx->id = NULL;
+
+    result = enif_make_resource(env, next_ctx);
+    ret = enif_make_tuple2(env, atom_ok, result);
+    goto done;
+
+ bad_arg:
+ err:
+    ret = enif_make_badarg(env);
+
+ done:
+    if (next_ctx)
+        enif_release_resource(next_ctx);
+    return ret;
+
+#else
+    return atom_notsup;
+#endif
+}
+
+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;
+    size_t size;
+    struct engine_ctx *ctx = NULL;
+
+    // Get Engine
+    ASSERT(argc == 1);
+
+    if (!enif_get_resource(env, argv[0], engine_ctx_rtype, (void**)&ctx))
+        goto bad_arg;
+
+    if ((engine_id = ENGINE_get_id(ctx->engine)) == NULL) {
+        if (!enif_alloc_binary(0, &engine_id_bin))
+            goto err;
+        engine_id_bin.size = 0;
+        return enif_make_binary(env, &engine_id_bin);
+    }
+
+    size = strlen(engine_id);
+    if (!enif_alloc_binary(size, &engine_id_bin))
+        goto err;
+    engine_id_bin.size = size;
+    memcpy(engine_id_bin.data, engine_id, size);
+
+    return enif_make_binary(env, &engine_id_bin);
+
+ bad_arg:
+ err:
+    return enif_make_badarg(env);
+
+#else
+    return atom_notsup;
+#endif
+}
+
+ERL_NIF_TERM engine_get_name_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Engine) */
+#ifdef HAS_ENGINE_SUPPORT
+    ErlNifBinary engine_name_bin;
+    const char *engine_name;
+    size_t size;
+    struct engine_ctx *ctx;
+
+    // Get Engine
+    ASSERT(argc == 1);
+
+    if (!enif_get_resource(env, argv[0], engine_ctx_rtype, (void**)&ctx))
+        goto bad_arg;
+
+    if ((engine_name = ENGINE_get_name(ctx->engine)) == NULL) {
+        if (!enif_alloc_binary(0, &engine_name_bin))
+            goto err;
+        engine_name_bin.size = 0;
+        return enif_make_binary(env, &engine_name_bin);
+    }
+
+    size = strlen(engine_name);
+    if (!enif_alloc_binary(size, &engine_name_bin))
+        goto err;
+    engine_name_bin.size = size;
+    memcpy(engine_name_bin.data, engine_name, size);
+
+    return enif_make_binary(env, &engine_name_bin);
+
+ bad_arg:
+ err:
+    return enif_make_badarg(env);
+
+#else
+    return atom_notsup;
+#endif
+}
+
+#ifdef HAS_ENGINE_SUPPORT
+static int get_engine_load_cmd_list(ErlNifEnv* env, const ERL_NIF_TERM term, char **cmds, int i)
+{
+    ERL_NIF_TERM head, tail;
+    const ERL_NIF_TERM *tmp_tuple;
+    ErlNifBinary tmpbin;
+    int arity;
+    char *tuple1 = NULL, *tuple2 = NULL;
+
+    if (enif_is_empty_list(env, term)) {
+        cmds[i] = NULL;
+        return 0;
+    }
+
+    if (!enif_get_list_cell(env, term, &head, &tail))
+        goto err;
+    if (!enif_get_tuple(env, head, &arity, &tmp_tuple))
+        goto err;
+    if (arity != 2)
+        goto err;
+    if (!enif_inspect_binary(env, tmp_tuple[0], &tmpbin))
+        goto err;
+
+    if ((tuple1 = enif_alloc(tmpbin.size + 1)) == NULL)
+        goto err;
+
+    (void) memcpy(tuple1, tmpbin.data, tmpbin.size);
+    tuple1[tmpbin.size] = '\0';
+    cmds[i] = tuple1;
+    i++;
+
+    if (!enif_inspect_binary(env, tmp_tuple[1], &tmpbin))
+        goto err;
+
+    if (tmpbin.size == 0) {
+        cmds[i] = NULL;
+    } else {
+        if ((tuple2 = enif_alloc(tmpbin.size + 1)) == NULL)
+            goto err;
+        (void) memcpy(tuple2, tmpbin.data, tmpbin.size);
+        tuple2[tmpbin.size] = '\0';
+        cmds[i] = tuple2;
+    }
+    i++;
+    return get_engine_load_cmd_list(env, tail, cmds, i);
+
+ err:
+    if (tuple1 != NULL) {
+        i--;
+        enif_free(tuple1);
+    }
+    cmds[i] = NULL;
+    return -1;
+}
+#endif /* HAS_ENGINE_SUPPORT */
+
+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];
+    unsigned int i = 0;
+
+    ASSERT(argc == 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/engine.h b/lib/crypto/c_src/engine.h
new file mode 100644
index 0000000000..4a2eed9672
--- /dev/null
+++ b/lib/crypto/c_src/engine.h
@@ -0,0 +1,49 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_ENGINE_H__
+#define E_ENGINE_H__ 1
+
+#include "common.h"
+
+#ifdef HAS_ENGINE_SUPPORT
+int get_engine_and_key_id(ErlNifEnv *env, ERL_NIF_TERM key, char ** id, ENGINE **e);
+char *get_key_password(ErlNifEnv *env, ERL_NIF_TERM key);
+#endif /* HAS_ENGINE_SUPPORT */
+
+int init_engine_ctx(ErlNifEnv *env);
+
+ERL_NIF_TERM engine_by_id_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM engine_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM engine_finish_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM engine_free_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM engine_load_dynamic_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM engine_ctrl_cmd_strings_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM engine_register_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM engine_unregister_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM engine_add_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM engine_remove_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM engine_get_first_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM engine_get_next_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM engine_get_id_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM engine_get_name_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM engine_get_all_methods_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+#endif /* E_ENGINE_H__ */
diff --git a/lib/crypto/c_src/evp.c b/lib/crypto/c_src/evp.c
new file mode 100644
index 0000000000..3bf66bfffe
--- /dev/null
+++ b/lib/crypto/c_src/evp.c
@@ -0,0 +1,164 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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 "evp.h"
+
+ERL_NIF_TERM evp_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+    /*    (Curve, PeerBin, MyBin) */
+{
+#ifdef HAVE_ED_CURVE_DH
+    ERL_NIF_TERM ret;
+    int type;
+    EVP_PKEY_CTX *ctx = NULL;
+    ErlNifBinary peer_bin, my_bin, key_bin;
+    EVP_PKEY *peer_key = NULL, *my_key = NULL;
+    size_t max_size;
+    int key_bin_alloc = 0;
+
+    ASSERT(argc == 3);
+
+    if (argv[0] == atom_x25519)
+        type = EVP_PKEY_X25519;
+    else if (argv[0] == atom_x448)
+        type = EVP_PKEY_X448;
+    else
+        goto bad_arg;
+
+    if (!enif_inspect_binary(env, argv[1], &peer_bin))
+        goto bad_arg;
+    if (!enif_inspect_binary(env, argv[2], &my_bin))
+        goto bad_arg;
+
+    if ((my_key = EVP_PKEY_new_raw_private_key(type, NULL, my_bin.data, my_bin.size)) == NULL)
+        goto err;
+    if ((ctx = EVP_PKEY_CTX_new(my_key, NULL)) == NULL)
+        goto err;
+
+    if (EVP_PKEY_derive_init(ctx) != 1)
+        goto err;
+
+    if ((peer_key = EVP_PKEY_new_raw_public_key(type, NULL, peer_bin.data, peer_bin.size)) == NULL)
+        goto err;
+    if (EVP_PKEY_derive_set_peer(ctx, peer_key) != 1)
+        goto err;
+
+    if (EVP_PKEY_derive(ctx, NULL, &max_size) != 1)
+        goto err;
+
+    if (!enif_alloc_binary(max_size, &key_bin))
+        goto err;
+    key_bin_alloc = 1;
+    if (EVP_PKEY_derive(ctx, key_bin.data, &key_bin.size) != 1)
+        goto err;
+
+    if (key_bin.size < max_size) {
+        if (!enif_realloc_binary(&key_bin, (size_t)key_bin.size))
+            goto err;
+    }
+
+    ret = enif_make_binary(env, &key_bin);
+    key_bin_alloc = 0;
+    goto done;
+
+ bad_arg:
+ err:
+    if (key_bin_alloc)
+        enif_release_binary(&key_bin);
+    ret = enif_make_badarg(env);
+
+ done:
+    if (my_key)
+        EVP_PKEY_free(my_key);
+    if (peer_key)
+        EVP_PKEY_free(peer_key);
+    if (ctx)
+        EVP_PKEY_CTX_free(ctx);
+
+    return ret;
+
+#else
+    return atom_notsup;
+#endif
+}
+
+ERL_NIF_TERM evp_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+/* (Curve) */
+{
+#ifdef HAVE_ED_CURVE_DH
+    int type;
+    EVP_PKEY_CTX *ctx = NULL;
+    EVP_PKEY *pkey = NULL;
+    ERL_NIF_TERM ret_pub, ret_prv, ret;
+    size_t key_len;
+    unsigned char *out_pub = NULL, *out_priv = NULL;
+
+    ASSERT(argc == 1);
+
+    if (argv[0] == atom_x25519)
+        type = EVP_PKEY_X25519;
+    else if (argv[0] == atom_x448)
+        type = EVP_PKEY_X448;
+    else
+        goto bad_arg;
+
+    if ((ctx = EVP_PKEY_CTX_new_id(type, NULL)) == NULL)
+        goto bad_arg;
+
+    if (EVP_PKEY_keygen_init(ctx) != 1)
+        goto err;
+    if (EVP_PKEY_keygen(ctx, &pkey) != 1)
+        goto err;
+
+    if (EVP_PKEY_get_raw_public_key(pkey, NULL, &key_len) != 1)
+        goto err;
+    if ((out_pub = enif_make_new_binary(env, key_len, &ret_pub)) == NULL)
+        goto err;
+    if (EVP_PKEY_get_raw_public_key(pkey, out_pub, &key_len) != 1)
+        goto err;
+
+    if (EVP_PKEY_get_raw_private_key(pkey, NULL, &key_len) != 1)
+        goto err;
+    if ((out_priv = enif_make_new_binary(env, key_len, &ret_prv)) == NULL)
+        goto err;
+    if (EVP_PKEY_get_raw_private_key(pkey, out_priv, &key_len) != 1)
+        goto err;
+
+    ret = enif_make_tuple2(env, ret_pub, ret_prv);
+    goto done;
+
+ bad_arg:
+    ret = enif_make_badarg(env);
+    goto done;
+
+ err:
+    ret = atom_error;
+
+ done:
+    if (pkey)
+        EVP_PKEY_free(pkey);
+    if (ctx)
+        EVP_PKEY_CTX_free(ctx);
+    return ret;
+
+#else
+    return atom_notsup;
+#endif
+}
+
diff --git a/lib/crypto/c_src/evp.h b/lib/crypto/c_src/evp.h
new file mode 100644
index 0000000000..d767260262
--- /dev/null
+++ b/lib/crypto/c_src/evp.h
@@ -0,0 +1,29 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_EVP_H__
+#define E_EVP_H__ 1
+
+#include "common.h"
+
+ERL_NIF_TERM evp_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM evp_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+#endif /* E_EVP_H__ */
diff --git a/lib/crypto/c_src/evp_compat.h b/lib/crypto/c_src/evp_compat.h
new file mode 100644
index 0000000000..dc94a61d8e
--- /dev/null
+++ b/lib/crypto/c_src/evp_compat.h
@@ -0,0 +1,210 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_EVP_COMPAT_H__
+#define E_EVP_COMPAT_H__ 1
+
+/*
+ * In OpenSSL 1.1.0, most structs are opaque. That means that
+ * the structs cannot be allocated as automatic variables on the
+ * C stack (because the size is unknown) and that it is necessary
+ * to use access functions.
+ *
+ * For backward compatibility to previous versions of OpenSSL, define
+ * on our versions of the new functions defined in 1.1.0 here, so that
+ * we don't have to sprinkle ifdefs throughout the code.
+ */
+
+static INLINE HMAC_CTX *HMAC_CTX_new(void);
+static INLINE void HMAC_CTX_free(HMAC_CTX *ctx);
+
+static INLINE HMAC_CTX *HMAC_CTX_new()
+{
+    HMAC_CTX *ctx;
+
+    if ((ctx = CRYPTO_malloc(sizeof(HMAC_CTX), __FILE__, __LINE__)) == NULL)
+        return NULL;
+
+    HMAC_CTX_init(ctx);
+    return ctx;
+}
+
+static INLINE void HMAC_CTX_free(HMAC_CTX *ctx)
+{
+    if (ctx == NULL)
+        return;
+
+    HMAC_CTX_cleanup(ctx);
+    CRYPTO_free(ctx);
+}
+
+/* Renamed in 1.1.0 */
+#define EVP_MD_CTX_new() EVP_MD_CTX_create()
+#define EVP_MD_CTX_free(ctx) EVP_MD_CTX_destroy((ctx))
+
+static INLINE void *BN_GENCB_get_arg(BN_GENCB *cb);
+
+static INLINE void *BN_GENCB_get_arg(BN_GENCB *cb)
+{
+    return cb->arg;
+}
+
+static INLINE int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d);
+static INLINE void RSA_get0_key(const RSA *r, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d);
+static INLINE int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q);
+static INLINE void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q);
+static INLINE int RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp);
+static INLINE void RSA_get0_crt_params(const RSA *r, const BIGNUM **dmp1, const BIGNUM **dmq1, const BIGNUM **iqmp);
+
+static INLINE int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
+{
+    r->n = n;
+    r->e = e;
+    r->d = d;
+    return 1;
+}
+
+static INLINE void RSA_get0_key(const RSA *r, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
+{
+    *n = r->n;
+    *e = r->e;
+    *d = r->d;
+}
+
+static INLINE int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q)
+{
+    r->p = p;
+    r->q = q;
+    return 1;
+}
+
+static INLINE void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q)
+{
+    *p = r->p;
+    *q = r->q;
+}
+
+static INLINE int RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp)
+{
+    r->dmp1 = dmp1;
+    r->dmq1 = dmq1;
+    r->iqmp = iqmp;
+    return 1;
+}
+
+static INLINE void RSA_get0_crt_params(const RSA *r, const BIGNUM **dmp1, const BIGNUM **dmq1, const BIGNUM **iqmp)
+{
+    *dmp1 = r->dmp1;
+    *dmq1 = r->dmq1;
+    *iqmp = r->iqmp;
+}
+
+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)
+{
+    d->pub_key = pub_key;
+    d->priv_key = priv_key;
+    return 1;
+}
+
+static INLINE int DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g)
+{
+    d->p = p;
+    d->q = q;
+    d->g = 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);
+static INLINE void 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);
+
+static INLINE int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key)
+{
+    dh->pub_key = pub_key;
+    dh->priv_key = priv_key;
+    return 1;
+}
+
+static INLINE int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
+{
+    dh->p = p;
+    dh->q = q;
+    dh->g = g;
+    return 1;
+}
+
+static INLINE int DH_set_length(DH *dh, long length)
+{
+    dh->length = length;
+    return 1;
+}
+
+
+
+static INLINE void
+DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
+{
+    *p = dh->p;
+    *q = dh->q;
+    *g = dh->g;
+}
+
+static INLINE void
+DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key)
+{
+    if (pub_key)
+        *pub_key = dh->pub_key;
+
+    if (priv_key)
+        *priv_key = dh->priv_key;
+}
+
+#endif /* E_EVP_COMPAT_H__ */
diff --git a/lib/crypto/c_src/fips.c b/lib/crypto/c_src/fips.c
new file mode 100644
index 0000000000..b2d892d00b
--- /dev/null
+++ b/lib/crypto/c_src/fips.c
@@ -0,0 +1,52 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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 "fips.h"
+
+ERL_NIF_TERM info_fips(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+#ifdef FIPS_SUPPORT
+    return FIPS_mode() ? atom_enabled : atom_not_enabled;
+#else
+    return atom_not_supported;
+#endif
+}
+
+ERL_NIF_TERM enable_fips_mode(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Boolean) */
+    if (argv[0] == atom_true) {
+#ifdef FIPS_SUPPORT
+        if (FIPS_mode_set(1)) {
+            return atom_true;
+        }
+#endif
+        PRINTF_ERR0("CRYPTO: Could not setup FIPS mode");
+        return atom_false;
+    } else if (argv[0] == atom_false) {
+#ifdef FIPS_SUPPORT
+        if (!FIPS_mode_set(0)) {
+            return atom_false;
+        }
+#endif
+        return atom_true;
+    } else {
+        return enif_make_badarg(env);
+    }
+}
diff --git a/lib/crypto/c_src/fips.h b/lib/crypto/c_src/fips.h
new file mode 100644
index 0000000000..9a436bd202
--- /dev/null
+++ b/lib/crypto/c_src/fips.h
@@ -0,0 +1,29 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_FIPS_H__
+#define E_FIPS_H__ 1
+
+#include "common.h"
+
+ERL_NIF_TERM info_fips(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM enable_fips_mode(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+#endif /* E_FIPS_H__ */
diff --git a/lib/crypto/c_src/hash.c b/lib/crypto/c_src/hash.c
new file mode 100644
index 0000000000..9b79258585
--- /dev/null
+++ b/lib/crypto/c_src/hash.c
@@ -0,0 +1,549 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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 "hash.h"
+#include "digest.h"
+
+#ifdef HAVE_MD5
+#  define MD5_CTX_LEN       (sizeof(MD5_CTX))
+#endif
+#ifdef HAVE_MD4
+#  define MD4_CTX_LEN       (sizeof(MD4_CTX))
+#endif
+#ifdef HAVE_RIPEMD160
+#  define RIPEMD160_CTX_LEN (sizeof(RIPEMD160_CTX))
+#endif
+
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0)
+struct evp_md_ctx {
+    EVP_MD_CTX* ctx;
+};
+
+/* Define resource types for OpenSSL context structures. */
+static ErlNifResourceType* evp_md_ctx_rtype;
+
+static void evp_md_ctx_dtor(ErlNifEnv* env, struct evp_md_ctx *ctx) {
+    if (ctx == NULL)
+        return;
+
+    if (ctx->ctx)
+        EVP_MD_CTX_free(ctx->ctx);
+}
+#endif
+
+int init_hash_ctx(ErlNifEnv* env) {
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0)
+    evp_md_ctx_rtype = enif_open_resource_type(env, NULL, "EVP_MD_CTX",
+                                               (ErlNifResourceDtor*) evp_md_ctx_dtor,
+                                               ERL_NIF_RT_CREATE|ERL_NIF_RT_TAKEOVER,
+                                               NULL);
+    if (evp_md_ctx_rtype == NULL)
+        goto err;
+#endif
+
+    return 1;
+
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0)
+ err:
+    PRINTF_ERR0("CRYPTO: Could not open resource type 'EVP_MD_CTX'");
+    return 0;
+#endif
+}
+
+ERL_NIF_TERM hash_info_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Type) */
+    struct digest_type_t *digp = NULL;
+    const EVP_MD         *md;
+    ERL_NIF_TERM         ret;
+
+    ASSERT(argc == 1);
+
+    if ((digp = get_digest_type(argv[0])) == NULL)
+        return enif_make_badarg(env);
+
+    if ((md = digp->md.p) == NULL)
+        return atom_notsup;
+
+    ret = enif_make_new_map(env);
+
+    enif_make_map_put(env, ret, atom_type,
+        enif_make_int(env, EVP_MD_type(md)), &ret);
+    enif_make_map_put(env, ret, atom_size,
+        enif_make_int(env, EVP_MD_size(md)), &ret);
+    enif_make_map_put(env, ret, atom_block_size,
+        enif_make_int(env, EVP_MD_block_size(md)), &ret);
+
+    return ret;
+}
+
+ERL_NIF_TERM hash_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Type, Data) */
+    struct digest_type_t *digp = NULL;
+    const EVP_MD         *md;
+    ErlNifBinary         data;
+    ERL_NIF_TERM         ret;
+    unsigned             ret_size;
+    unsigned char        *outp;
+
+    ASSERT(argc == 2);
+
+    if ((digp = get_digest_type(argv[0])) == NULL)
+        goto bad_arg;
+    if (!enif_inspect_iolist_as_binary(env, argv[1], &data))
+        goto bad_arg;
+
+    if ((md = digp->md.p) == NULL)
+        goto err;
+
+    ret_size = (unsigned)EVP_MD_size(md);
+    ASSERT(0 < ret_size && ret_size <= EVP_MAX_MD_SIZE);
+
+    if ((outp = enif_make_new_binary(env, ret_size, &ret)) == NULL)
+        goto err;
+    if (EVP_Digest(data.data, data.size, outp, &ret_size, md, NULL) != 1)
+        goto err;
+
+    ASSERT(ret_size == (unsigned)EVP_MD_size(md));
+
+    CONSUME_REDS(env, data);
+    return ret;
+
+ bad_arg:
+    return enif_make_badarg(env);
+
+ err:
+    return atom_notsup;
+}
+
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0)
+
+ERL_NIF_TERM hash_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Type) */
+    struct digest_type_t *digp = NULL;
+    struct evp_md_ctx    *ctx = NULL;
+    ERL_NIF_TERM         ret;
+
+    ASSERT(argc == 1);
+
+    if ((digp = get_digest_type(argv[0])) == NULL)
+        goto bad_arg;
+    if (digp->md.p == NULL)
+        goto err;
+
+    if ((ctx = enif_alloc_resource(evp_md_ctx_rtype, sizeof(struct evp_md_ctx))) == NULL)
+        goto err;
+    if ((ctx->ctx = EVP_MD_CTX_new()) == NULL)
+        goto err;
+    if (EVP_DigestInit(ctx->ctx, digp->md.p) != 1)
+        goto err;
+
+    ret = enif_make_resource(env, ctx);
+    goto done;
+
+ bad_arg:
+    return enif_make_badarg(env);
+
+ err:
+    ret = atom_notsup;
+
+ done:
+    if (ctx)
+        enif_release_resource(ctx);
+    return ret;
+}
+
+ERL_NIF_TERM hash_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Context, Data) */
+    struct evp_md_ctx   *ctx, *new_ctx = NULL;
+    ErlNifBinary data;
+    ERL_NIF_TERM ret;
+
+    ASSERT(argc == 2);
+
+    if (!enif_get_resource(env, argv[0], evp_md_ctx_rtype, (void**)&ctx))
+        goto bad_arg;
+    if (!enif_inspect_iolist_as_binary(env, argv[1], &data))
+        goto bad_arg;
+
+    if ((new_ctx = enif_alloc_resource(evp_md_ctx_rtype, sizeof(struct evp_md_ctx))) == NULL)
+        goto err;
+    if ((new_ctx->ctx = EVP_MD_CTX_new()) == NULL)
+        goto err;
+    if (EVP_MD_CTX_copy(new_ctx->ctx, ctx->ctx) != 1)
+        goto err;
+    if (EVP_DigestUpdate(new_ctx->ctx, data.data, data.size) != 1)
+        goto err;
+
+    ret = enif_make_resource(env, new_ctx);
+    CONSUME_REDS(env, data);
+    goto done;
+
+ bad_arg:
+    return enif_make_badarg(env);
+
+ err:
+    ret = atom_notsup;
+
+ done:
+    if (new_ctx)
+        enif_release_resource(new_ctx);
+    return ret;
+}
+
+ERL_NIF_TERM hash_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Context) */
+    struct evp_md_ctx *ctx;
+    EVP_MD_CTX        *new_ctx;
+    ERL_NIF_TERM  ret;
+    unsigned      ret_size;
+    unsigned char     *outp;
+
+    ASSERT(argc == 1);
+
+    if (!enif_get_resource(env, argv[0], evp_md_ctx_rtype, (void**)&ctx))
+        goto bad_arg;
+
+    ret_size = (unsigned)EVP_MD_CTX_size(ctx->ctx);
+    ASSERT(0 < ret_size && ret_size <= EVP_MAX_MD_SIZE);
+
+    if ((new_ctx = EVP_MD_CTX_new()) == NULL)
+        goto err;
+    if (EVP_MD_CTX_copy(new_ctx, ctx->ctx) != 1)
+        goto err;
+    if ((outp = enif_make_new_binary(env, ret_size, &ret)) == NULL)
+        goto err;
+    if (EVP_DigestFinal(new_ctx, outp, &ret_size) != 1)
+        goto err;
+
+    ASSERT(ret_size == (unsigned)EVP_MD_CTX_size(ctx->ctx));
+    goto done;
+
+ bad_arg:
+    return enif_make_badarg(env);
+
+ err:
+    ret = atom_notsup;
+
+ done:
+    if (new_ctx)
+        EVP_MD_CTX_free(new_ctx);
+    return ret;
+}
+
+#else /* if OPENSSL_VERSION_NUMBER < 1.0 */
+
+ERL_NIF_TERM hash_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Type) */
+    typedef int (*init_fun)(unsigned char*);
+    struct digest_type_t *digp = NULL;
+    ERL_NIF_TERM         ctx;
+    size_t               ctx_size = 0;
+    init_fun             ctx_init = 0;
+    unsigned char        *outp;
+
+    ASSERT(argc == 1);
+
+    if ((digp = get_digest_type(argv[0])) == NULL)
+        goto bad_arg;
+    if (digp->md.p == NULL)
+        goto err;
+
+    switch (EVP_MD_type(digp->md.p))
+    {
+#ifdef HAVE_MD4
+    case NID_md4:
+        ctx_size = MD4_CTX_LEN;
+        ctx_init = (init_fun)(&MD4_Init);
+        break;
+#endif
+#ifdef HAVE_MD5
+    case NID_md5:
+        ctx_size = MD5_CTX_LEN;
+        ctx_init = (init_fun)(&MD5_Init);
+        break;
+#endif
+#ifdef HAVE_RIPEMD160
+    case NID_ripemd160:
+        ctx_size = RIPEMD160_CTX_LEN;
+        ctx_init = (init_fun)(&RIPEMD160_Init);
+        break;
+#endif
+    case NID_sha1:
+        ctx_size = sizeof(SHA_CTX);
+        ctx_init = (init_fun)(&SHA1_Init);
+        break;
+#ifdef HAVE_SHA224
+    case NID_sha224:
+        ctx_size = sizeof(SHA256_CTX);
+        ctx_init = (init_fun)(&SHA224_Init);
+        break;
+#endif
+#ifdef HAVE_SHA256
+    case NID_sha256:
+        ctx_size = sizeof(SHA256_CTX);
+        ctx_init = (init_fun)(&SHA256_Init);
+        break;
+#endif
+#ifdef HAVE_SHA384
+    case NID_sha384:
+        ctx_size = sizeof(SHA512_CTX);
+        ctx_init = (init_fun)(&SHA384_Init);
+        break;
+#endif
+#ifdef HAVE_SHA512
+    case NID_sha512:
+        ctx_size = sizeof(SHA512_CTX);
+        ctx_init = (init_fun)(&SHA512_Init);
+        break;
+#endif
+    default:
+        goto err;
+    }
+    ASSERT(ctx_size);
+    ASSERT(ctx_init);
+
+    if ((outp = enif_make_new_binary(env, ctx_size, &ctx)) == NULL)
+        goto err;
+
+    if (ctx_init(outp) != 1)
+        goto err;
+
+    return enif_make_tuple2(env, argv[0], ctx);
+
+ bad_arg:
+    return enif_make_badarg(env);
+
+ err:
+    return atom_notsup;
+}
+
+ERL_NIF_TERM hash_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* ({Type, Context}, Data) */
+    typedef int (*update_fun)(unsigned char*, const unsigned char*, size_t);
+    ERL_NIF_TERM         new_ctx;
+    ErlNifBinary         ctx, data;
+    const ERL_NIF_TERM   *tuple;
+    int                  arity;
+    struct digest_type_t *digp = NULL;
+    unsigned char        *ctx_buff;
+    size_t               ctx_size   = 0;
+    update_fun           ctx_update = 0;
+
+    ASSERT(argc == 2);
+
+    if (!enif_get_tuple(env, argv[0], &arity, &tuple))
+        goto bad_arg;
+    if (arity != 2)
+        goto bad_arg;
+    if ((digp = get_digest_type(tuple[0])) == NULL)
+        goto bad_arg;
+    if (!enif_inspect_binary(env, tuple[1], &ctx))
+        goto bad_arg;
+    if (!enif_inspect_iolist_as_binary(env, argv[1], &data))
+        goto bad_arg;
+
+    if (digp->md.p == NULL)
+        goto err;
+
+    switch (EVP_MD_type(digp->md.p))
+    {
+#ifdef HAVE_MD4
+    case NID_md4:
+        ctx_size   = MD4_CTX_LEN;
+        ctx_update = (update_fun)(&MD4_Update);
+        break;
+#endif
+#ifdef HAVE_MD5
+    case NID_md5:
+        ctx_size   = MD5_CTX_LEN;
+        ctx_update = (update_fun)(&MD5_Update);
+        break;
+#endif
+#ifdef HAVE_RIPEMD160
+    case NID_ripemd160:
+        ctx_size   = RIPEMD160_CTX_LEN;
+        ctx_update = (update_fun)(&RIPEMD160_Update);
+        break;
+#endif
+    case NID_sha1:
+        ctx_size   = sizeof(SHA_CTX);
+        ctx_update = (update_fun)(&SHA1_Update);
+        break;
+#ifdef HAVE_SHA224
+    case NID_sha224:
+        ctx_size   = sizeof(SHA256_CTX);
+        ctx_update = (update_fun)(&SHA224_Update);
+        break;
+#endif
+#ifdef HAVE_SHA256
+    case NID_sha256:
+        ctx_size   = sizeof(SHA256_CTX);
+        ctx_update = (update_fun)(&SHA256_Update);
+        break;
+#endif
+#ifdef HAVE_SHA384
+    case NID_sha384:
+        ctx_size   = sizeof(SHA512_CTX);
+        ctx_update = (update_fun)(&SHA384_Update);
+        break;
+#endif
+#ifdef HAVE_SHA512
+    case NID_sha512:
+        ctx_size   = sizeof(SHA512_CTX);
+        ctx_update = (update_fun)(&SHA512_Update);
+        break;
+#endif
+    default:
+        goto err;
+    }
+    ASSERT(ctx_size);
+    ASSERT(ctx_update);
+
+    if (ctx.size != ctx_size)
+        goto bad_arg;
+
+    if ((ctx_buff = enif_make_new_binary(env, ctx_size, &new_ctx)) == NULL)
+        goto err;
+    memcpy(ctx_buff, ctx.data, ctx_size);
+
+    if (ctx_update(ctx_buff, data.data, data.size) != 1)
+        goto err;
+
+    CONSUME_REDS(env, data);
+    return enif_make_tuple2(env, tuple[0], new_ctx);
+
+ bad_arg:
+    return enif_make_badarg(env);
+
+ err:
+    return atom_notsup;
+}
+
+ERL_NIF_TERM hash_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* ({Type, Context}) */
+    typedef int (*final_fun)(unsigned char*, void*);
+    ERL_NIF_TERM         ret;
+    ErlNifBinary         ctx;
+    const ERL_NIF_TERM   *tuple;
+    int                  arity;
+    struct digest_type_t *digp = NULL;
+    const EVP_MD         *md;
+    void                 *new_ctx = NULL;
+    size_t               ctx_size  = 0;
+    final_fun            ctx_final = 0;
+    unsigned char        *outp;
+
+    ASSERT(argc == 1);
+
+    if (!enif_get_tuple(env, argv[0], &arity, &tuple))
+        goto bad_arg;
+    if (arity != 2)
+        goto bad_arg;
+    if ((digp = get_digest_type(tuple[0])) == NULL)
+        goto bad_arg;
+    if (!enif_inspect_binary(env, tuple[1], &ctx))
+        goto bad_arg;
+
+    if ((md = digp->md.p) == NULL)
+        goto err;
+
+    switch (EVP_MD_type(md))
+    {
+#ifdef HAVE_MD4
+    case NID_md4:
+        ctx_size  = MD4_CTX_LEN;
+        ctx_final = (final_fun)(&MD4_Final);
+        break;
+#endif
+#ifdef HAVE_MD5
+    case NID_md5:
+        ctx_size  = MD5_CTX_LEN;
+        ctx_final = (final_fun)(&MD5_Final);
+        break;
+#endif
+#ifdef HAVE_RIPEMD160
+   case NID_ripemd160:
+        ctx_size  = RIPEMD160_CTX_LEN;
+        ctx_final = (final_fun)(&RIPEMD160_Final);
+        break;
+#endif
+    case NID_sha1:
+        ctx_size  = sizeof(SHA_CTX);
+        ctx_final = (final_fun)(&SHA1_Final);
+        break;
+#ifdef HAVE_SHA224
+    case NID_sha224:
+        ctx_size  = sizeof(SHA256_CTX);
+        ctx_final = (final_fun)(&SHA224_Final);
+        break;
+#endif
+#ifdef HAVE_SHA256
+    case NID_sha256:
+        ctx_size  = sizeof(SHA256_CTX);
+        ctx_final = (final_fun)(&SHA256_Final);
+        break;
+#endif
+#ifdef HAVE_SHA384
+    case NID_sha384:
+        ctx_size  = sizeof(SHA512_CTX);
+        ctx_final = (final_fun)(&SHA384_Final);
+        break;
+#endif
+#ifdef HAVE_SHA512
+    case NID_sha512:
+        ctx_size  = sizeof(SHA512_CTX);
+        ctx_final = (final_fun)(&SHA512_Final);
+        break;
+#endif
+    default:
+        goto err;
+    }
+    ASSERT(ctx_size);
+    ASSERT(ctx_final);
+
+    if (ctx.size != ctx_size)
+        goto bad_arg;
+
+    if ((new_ctx = enif_alloc(ctx_size)) == NULL)
+        goto err;
+
+    memcpy(new_ctx, ctx.data, ctx_size);
+
+    if ((outp = enif_make_new_binary(env, (size_t)EVP_MD_size(md), &ret)) == NULL)
+        goto err;
+
+    if (ctx_final(outp, new_ctx) != 1)
+        goto err;
+
+    goto done;
+
+ bad_arg:
+    return enif_make_badarg(env);
+
+ err:
+    ret = atom_notsup;
+
+ done:
+    if (new_ctx)
+        enif_free(new_ctx);
+    return ret;
+}
+
+#endif  /* OPENSSL_VERSION_NUMBER < 1.0 */
diff --git a/lib/crypto/c_src/hash.h b/lib/crypto/c_src/hash.h
new file mode 100644
index 0000000000..92a25cedb7
--- /dev/null
+++ b/lib/crypto/c_src/hash.h
@@ -0,0 +1,34 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_HASH_H__
+#define E_HASH_H__ 1
+
+#include "common.h"
+
+int init_hash_ctx(ErlNifEnv *env);
+
+ERL_NIF_TERM hash_info_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM hash_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM hash_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM hash_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM hash_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+#endif /* E_HASH_H__ */
diff --git a/lib/crypto/c_src/hmac.c b/lib/crypto/c_src/hmac.c
new file mode 100644
index 0000000000..5e2c68bfee
--- /dev/null
+++ b/lib/crypto/c_src/hmac.c
@@ -0,0 +1,268 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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 file has functions for compatibility with cryptolibs
+ * lacking the EVP_Digest API.
+ *
+ * See mac.c for the implementation using the EVP interface.
+ *
+ ****************************************************************/
+
+#ifndef HAS_EVP_PKEY_CTX
+
+#include "hmac.h"
+#include "digest.h"
+
+struct hmac_context
+{
+    ErlNifMutex* mtx;
+    int alive;
+    HMAC_CTX* ctx;
+};
+
+static ErlNifResourceType* hmac_context_rtype;
+
+static void hmac_context_dtor(ErlNifEnv* env, struct hmac_context*);
+
+int init_hmac_ctx(ErlNifEnv *env) {
+    hmac_context_rtype = enif_open_resource_type(env, NULL, "hmac_context",
+						 (ErlNifResourceDtor*) hmac_context_dtor,
+						 ERL_NIF_RT_CREATE|ERL_NIF_RT_TAKEOVER,
+						 NULL);
+    if (hmac_context_rtype == NULL)
+        goto err;
+
+    return 1;
+
+ err:
+    PRINTF_ERR0("CRYPTO: Could not open resource type 'hmac_context'");
+    return 0;
+}
+
+static void hmac_context_dtor(ErlNifEnv* env, struct hmac_context *obj)
+{
+    if (obj == NULL)
+        return;
+
+    if (obj->alive) {
+        if (obj->ctx)
+            HMAC_CTX_free(obj->ctx);
+	obj->alive = 0;
+    }
+
+    if (obj->mtx != NULL)
+        enif_mutex_destroy(obj->mtx);
+}
+
+ERL_NIF_TERM hmac_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (hmac, Type, Key) */
+    struct digest_type_t *digp = NULL;
+    ErlNifBinary         key;
+    ERL_NIF_TERM         ret;
+    struct hmac_context  *obj = NULL;
+
+    ASSERT(argc == 3);
+
+    if ((digp = get_digest_type(argv[1])) == NULL)
+        goto bad_arg;
+    if (!enif_inspect_iolist_as_binary(env, argv[2], &key))
+        goto bad_arg;
+    if (key.size > INT_MAX)
+        goto bad_arg;
+
+    if (digp->md.p == NULL)
+        goto err;
+
+    if ((obj = enif_alloc_resource(hmac_context_rtype, sizeof(struct hmac_context))) == NULL)
+        goto err;
+    obj->ctx = NULL;
+    obj->mtx = NULL;
+    obj->alive = 0;
+
+    if ((obj->ctx = HMAC_CTX_new()) == NULL)
+        goto err;
+    obj->alive = 1;
+    if ((obj->mtx = enif_mutex_create("crypto.hmac")) == NULL)
+        goto err;
+
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0)
+    // Check the return value of HMAC_Init: it may fail in FIPS mode
+    // for disabled algorithms
+    if (!HMAC_Init_ex(obj->ctx, key.data, (int)key.size, digp->md.p, NULL))
+        goto err;
+#else
+    // In ancient versions of OpenSSL, this was a void function.
+    HMAC_Init_ex(obj->ctx, key.data, (int)key.size, digp->md.p, NULL);
+#endif
+
+    ret = enif_make_resource(env, obj);
+    goto done;
+
+ bad_arg:
+    return enif_make_badarg(env);
+
+ err:
+    ret = atom_notsup;
+
+ done:
+    if (obj)
+        enif_release_resource(obj);
+    return ret;
+}
+
+ERL_NIF_TERM hmac_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Context, Data) */
+    ERL_NIF_TERM ret;
+    ErlNifBinary data;
+    struct hmac_context *obj = NULL;
+
+    ASSERT(argc == 2);
+
+    if (!enif_get_resource(env, argv[0], (ErlNifResourceType*)hmac_context_rtype, (void**)&obj))
+        goto bad_arg;
+    if (!enif_inspect_iolist_as_binary(env, argv[1], &data))
+        goto bad_arg;
+
+    enif_mutex_lock(obj->mtx);
+    if (!obj->alive)
+        goto err;
+
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0)
+    if (!HMAC_Update(obj->ctx, data.data, data.size))
+        goto err;
+#else
+    // In ancient versions of OpenSSL, this was a void function.
+    HMAC_Update(obj->ctx, data.data, data.size);
+#endif
+
+    CONSUME_REDS(env,data);
+    ret = argv[0];
+    goto done;
+
+ bad_arg:
+    return enif_make_badarg(env);
+
+ err:
+    ret = enif_make_badarg(env);
+
+ done:
+    enif_mutex_unlock(obj->mtx);
+    return ret;
+}
+
+ERL_NIF_TERM hmac_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Context) or (Context, HashLen) */
+    ERL_NIF_TERM ret;
+    struct hmac_context* obj;
+    unsigned char mac_buf[EVP_MAX_MD_SIZE];
+    unsigned char * mac_bin;
+    unsigned int req_len = 0;
+    unsigned int mac_len;
+
+    ASSERT(argc == 1 || argc == 2);
+
+    if (!enif_get_resource(env, argv[0], (ErlNifResourceType*)hmac_context_rtype, (void**)&obj))
+        goto bad_arg;
+    if (argc == 2) {
+        if (!enif_get_uint(env, argv[1], &req_len))
+            goto bad_arg;
+    }
+
+    enif_mutex_lock(obj->mtx);
+    if (!obj->alive)
+        goto err;
+
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0)
+    if (!HMAC_Final(obj->ctx, mac_buf, &mac_len))
+        goto err;
+#else
+    // In ancient versions of OpenSSL, this was a void function.
+    HMAC_Final(obj->ctx, mac_buf, &mac_len);
+#endif
+
+    if (obj->ctx)
+        HMAC_CTX_free(obj->ctx);
+    obj->alive = 0;
+
+    if (argc == 2 && req_len < mac_len) {
+        /* Only truncate to req_len bytes if asked. */
+        mac_len = req_len;
+    }
+    if ((mac_bin = enif_make_new_binary(env, mac_len, &ret)) == NULL)
+        goto err;
+
+    memcpy(mac_bin, mac_buf, mac_len);
+    goto done;
+
+ bad_arg:
+    return enif_make_badarg(env);
+
+ err:
+    ret = enif_make_badarg(env);
+
+ done:
+    enif_mutex_unlock(obj->mtx);
+    return ret;
+}
+
+
+
+int hmac_low_level(ErlNifEnv* env, const EVP_MD *md,
+                   ErlNifBinary key_bin, ErlNifBinary text,
+                   ErlNifBinary *ret_bin, int *ret_bin_alloc, ERL_NIF_TERM *return_term)
+{
+    unsigned int size_int;
+    size_t size;
+
+    /* Find the needed space */
+    if (HMAC(md,
+             key_bin.data, (int)key_bin.size,
+             text.data, text.size,
+             NULL, &size_int) == NULL)
+        {
+            *return_term = EXCP_ERROR(env, "Get HMAC size failed");
+            return 0;
+        }
+
+    size = (size_t)size_int; /* Otherwise "size" is unused in 0.9.8.... */
+    if (!enif_alloc_binary(size, ret_bin))
+        {
+            *return_term = EXCP_ERROR(env, "Alloc binary");
+            return 0;
+        }
+    *ret_bin_alloc = 1;
+
+    /* And do the real HMAC calc */
+    if (HMAC(md,
+             key_bin.data, (int)key_bin.size,
+             text.data, text.size,
+             ret_bin->data, &size_int) == NULL)
+        {
+            *return_term = EXCP_ERROR(env, "HMAC sign failed");
+            return 0;
+        }
+                    
+    return 1;
+}
+
+#endif
diff --git a/lib/crypto/c_src/hmac.h b/lib/crypto/c_src/hmac.h
new file mode 100644
index 0000000000..f5805e13e5
--- /dev/null
+++ b/lib/crypto/c_src/hmac.h
@@ -0,0 +1,39 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_HMAC_H__
+#define E_HMAC_H__ 1
+
+#ifndef HAS_EVP_PKEY_CTX
+
+#include "common.h"
+
+int init_hmac_ctx(ErlNifEnv *env);
+
+ERL_NIF_TERM hmac_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM hmac_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM hmac_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+int hmac_low_level(ErlNifEnv* env, const EVP_MD *md,
+                   ErlNifBinary key_bin, ErlNifBinary text,
+                   ErlNifBinary *ret_bin, int *ret_bin_alloc, ERL_NIF_TERM *return_term);
+#endif
+
+#endif /* E_HMAC_H__ */
diff --git a/lib/crypto/c_src/info.c b/lib/crypto/c_src/info.c
new file mode 100644
index 0000000000..42f477fead
--- /dev/null
+++ b/lib/crypto/c_src/info.c
@@ -0,0 +1,107 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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 "info.h"
+
+#ifdef HAVE_DYNAMIC_CRYPTO_LIB
+
+# if defined(DEBUG)
+char *crypto_callback_name = "crypto_callback.debug";
+# elif defined(VALGRIND)
+char *crypto_callback_name = "crypto_callback.valgrind";
+# else
+char *crypto_callback_name = "crypto_callback";
+# endif
+
+int change_basename(ErlNifBinary* bin, char* buf, size_t bufsz, const char* newfile)
+{
+    size_t i;
+    size_t newlen;
+
+    for (i = bin->size; i > 0; i--) {
+	if (bin->data[i-1] == '/')
+	    break;
+    }
+
+    newlen = strlen(newfile);
+    if (i > SIZE_MAX - newlen)
+        goto err;
+
+    if (i + newlen >= bufsz)
+        goto err;
+
+    memcpy(buf, bin->data, i);
+    strcpy(buf+i, newfile);
+
+    return 1;
+
+ err:
+    return 0;
+}
+
+void error_handler(void* null, const char* errstr)
+{
+    PRINTF_ERR1("CRYPTO LOADING ERROR: '%s'", errstr);
+}
+#endif /* HAVE_DYNAMIC_CRYPTO_LIB */
+
+ERL_NIF_TERM info_lib(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
+{/* () */
+    /* [{<<"OpenSSL">>,9470143,<<"OpenSSL 0.9.8k 25 Mar 2009">>}] */
+
+    ERL_NIF_TERM name_term, ver_term;
+    static const char libname[] = "OpenSSL";
+    size_t name_sz;
+    const char* ver;
+    size_t ver_sz;
+    int ver_num;
+    unsigned char *out_name, *out_ver;
+
+    ASSERT(argc == 0);
+
+    name_sz = strlen(libname);
+    ver = SSLeay_version(SSLEAY_VERSION);
+    ver_sz = strlen(ver);
+    ver_num = OPENSSL_VERSION_NUMBER;
+
+    /* R16:
+     * Ignore library version number from SSLeay() and instead show header
+     * version. Otherwise user might try to call a function that is implemented
+     * by a newer library but not supported by the headers used at compile time.
+     * Example: DES_ede3_cfb_encrypt in 0.9.7i but not in 0.9.7d.
+     *
+     * Version string is still from library though.
+     */
+
+    if ((out_name = enif_make_new_binary(env, name_sz, &name_term)) == NULL)
+        goto err;
+    if ((out_ver = enif_make_new_binary(env, ver_sz, &ver_term)) == NULL)
+        goto err;
+
+    memcpy(out_name, libname, name_sz);
+    memcpy(out_ver, ver, ver_sz);
+
+    return enif_make_list1(env, enif_make_tuple3(env, name_term,
+						 enif_make_int(env, ver_num),
+						 ver_term));
+
+ err:
+    return enif_make_badarg(env);
+}
diff --git a/lib/crypto/c_src/info.h b/lib/crypto/c_src/info.h
new file mode 100644
index 0000000000..67690625c9
--- /dev/null
+++ b/lib/crypto/c_src/info.h
@@ -0,0 +1,35 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_INFO_H__
+#define E_INFO_H__ 1
+
+#include "common.h"
+
+#ifdef HAVE_DYNAMIC_CRYPTO_LIB
+extern char *crypto_callback_name;
+
+int change_basename(ErlNifBinary* bin, char* buf, size_t bufsz, const char* newfile);
+void error_handler(void* null, const char* errstr);
+#endif
+
+ERL_NIF_TERM info_lib(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+#endif /* E_INFO_H__ */
diff --git a/lib/crypto/c_src/mac.c b/lib/crypto/c_src/mac.c
new file mode 100644
index 0000000000..149975ba9d
--- /dev/null
+++ b/lib/crypto/c_src/mac.c
@@ -0,0 +1,751 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2010-2019. 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 "common.h"
+#include "cipher.h"
+#include "digest.h"
+#include "cmac.h"
+#include "hmac.h"
+#include "mac.h"
+
+/***************************
+     MAC type declaration
+***************************/
+
+struct mac_type_t {
+    union {
+	const char*  str;        /* before init, NULL for end-of-table */
+	ERL_NIF_TERM atom;       /* after init, 'false' for end-of-table */
+    }name;
+    unsigned flags;
+    union {
+        const int pkey_type;
+    }alg;
+    int type;
+    size_t key_len;      /* != 0 to also match on key_len */
+};
+
+/* masks in the flags field if mac_type_t */
+#define NO_FIPS_MAC 1
+
+#define NO_mac 0
+#define HMAC_mac 1
+#define CMAC_mac 2
+#define POLY1305_mac 3
+
+static struct mac_type_t mac_types[] =
+{
+    {{"poly1305"}, NO_FIPS_MAC,
+#ifdef HAVE_POLY1305
+     /* If we have POLY then we have EVP_PKEY */
+     {EVP_PKEY_POLY1305}, POLY1305_mac, 32
+#else
+     {EVP_PKEY_NONE}, NO_mac, 0
+#endif
+    },
+
+    {{"hmac"}, 0,
+#ifdef HAS_EVP_PKEY_CTX
+     {EVP_PKEY_HMAC}, HMAC_mac, 0
+#else
+     /* HMAC is always supported, but possibly with low-level routines */
+     {EVP_PKEY_NONE}, HMAC_mac, 0
+#endif
+    },
+
+    {{"cmac"}, 0,
+#ifdef HAVE_CMAC
+     /* If we have CMAC then we have EVP_PKEY */
+     {EVP_PKEY_CMAC}, CMAC_mac, 0
+#else
+     {EVP_PKEY_NONE}, NO_mac, 0
+#endif
+    },
+
+    /*==== End of list ==== */
+    {{NULL}, 0,
+     {0}, NO_mac, 0
+    }
+};
+
+
+#ifdef FIPS_SUPPORT
+/* May have FIPS support, must check dynamically if it is enabled */
+# define MAC_FORBIDDEN_IN_FIPS(P) (((P)->flags & NO_FIPS_MAC) && FIPS_mode())
+#else
+/* No FIPS support since the symbol FIPS_SUPPORT is undefined */
+# define MAC_FORBIDDEN_IN_FIPS(P) 0
+#endif
+
+
+/***************************
+ Mandatory prototypes
+***************************/
+
+struct mac_type_t* get_mac_type(ERL_NIF_TERM type, size_t key_len);
+struct mac_type_t* get_mac_type_no_key(ERL_NIF_TERM type);
+
+ERL_NIF_TERM mac_one_time(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+ERL_NIF_TERM mac_update(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+
+/********************************
+ Support functions for type array
+*********************************/
+
+void init_mac_types(ErlNifEnv* env)
+{
+    struct mac_type_t* p = mac_types;
+
+    for (p = mac_types; p->name.str; p++) {
+	p->name.atom = enif_make_atom(env, p->name.str);
+    }
+    p->name.atom = atom_false;  /* end marker */
+}
+
+
+ERL_NIF_TERM mac_types_as_list(ErlNifEnv* env)
+{
+    struct mac_type_t* p;
+    ERL_NIF_TERM prev, hd;
+
+    hd = enif_make_list(env, 0);
+    prev = atom_undefined;
+
+    for (p = mac_types; (p->name.atom & (p->name.atom != atom_false)); p++) {
+        if (prev == p->name.atom)
+            continue;
+
+        if (p->type != NO_mac)
+            {
+                hd = enif_make_list_cell(env, p->name.atom, hd);
+            }
+    }
+
+    return hd;
+}
+
+struct mac_type_t* get_mac_type(ERL_NIF_TERM type, size_t key_len)
+{
+    struct mac_type_t* p = NULL;
+    for (p = mac_types; p->name.atom != atom_false; p++) {
+	if (type == p->name.atom) {
+            if ((p->key_len == 0) || (p->key_len == key_len))
+                return p;
+	}
+    }
+    return NULL;
+}
+
+struct mac_type_t* get_mac_type_no_key(ERL_NIF_TERM type)
+{
+    struct mac_type_t* p = NULL;
+    for (p = mac_types; p->name.atom != atom_false; p++) {
+	if (type == p->name.atom) {
+	    return p;
+	}
+    }
+    return NULL;
+}
+
+/*******************************************************************
+ *
+ * Mac nif
+ *
+ ******************************************************************/
+ERL_NIF_TERM mac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (MacType, SubType, Key, Text) */
+    ErlNifBinary  text;
+
+    if (!enif_inspect_iolist_as_binary(env, argv[3], &text))
+        return EXCP_BADARG(env, "Bad text");
+
+    if (text.size > INT_MAX)
+        return EXCP_BADARG(env, "Too long text");
+
+    /* Run long jobs on a dirty scheduler to not block the current emulator thread */
+    if (text.size > MAX_BYTES_TO_NIF) {
+        return enif_schedule_nif(env, "mac_one_time",
+                                 ERL_NIF_DIRTY_JOB_CPU_BOUND,
+                                 mac_one_time, argc, argv);
+    }
+
+    return mac_one_time(env, argc, argv);
+}
+
+
+
+ERL_NIF_TERM mac_one_time(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (MacType, SubType, Key, Text) */
+
+    struct mac_type_t *macp;
+    ErlNifBinary key_bin, text;
+    int ret_bin_alloc = 0;
+    ERL_NIF_TERM return_term;
+    const EVP_MD *md = NULL;
+    ErlNifBinary ret_bin;
+#ifdef HAS_EVP_PKEY_CTX
+    size_t size;
+    EVP_PKEY *pkey = NULL;
+    EVP_MD_CTX *mctx = NULL;
+#endif
+
+    /*---------------------------------
+      Get common indata and validate it
+    */
+    if (!enif_inspect_iolist_as_binary(env, argv[2], &key_bin))
+        {
+            return_term = EXCP_BADARG(env, "Bad key");
+            goto err;
+        }
+
+    if (!enif_inspect_iolist_as_binary(env, argv[3], &text))
+        {
+            return_term = EXCP_BADARG(env, "Bad text");
+            goto err;
+        }
+
+    if (!(macp = get_mac_type(argv[0], key_bin.size)))
+        {
+            if (!get_mac_type_no_key(argv[0]))
+                return_term = EXCP_BADARG(env, "Unknown mac algorithm");
+            else
+                return_term = EXCP_BADARG(env, "Bad key length");
+            goto err;
+        }
+
+    if (MAC_FORBIDDEN_IN_FIPS(macp))
+        {
+            return_term = EXCP_NOTSUP(env, "MAC algorithm forbidden in FIPS");
+            goto err;
+        }
+
+    /*--------------------------------------------------
+      Algorithm dependent indata checking and computation.
+      If EVP_PKEY is available, only set the pkey variable
+      and do the computation after the switch statement.
+      If not available, do the low-level calls in the 
+      corresponding case part
+    */
+    switch (macp->type) {
+
+        /********
+         * HMAC *
+         ********/
+    case HMAC_mac:
+        {
+            struct digest_type_t *digp;
+
+            if ((digp = get_digest_type(argv[1])) == NULL)
+                {
+                    return_term = EXCP_BADARG(env, "Bad digest algorithm for HMAC");
+                    goto err;
+                }
+            if (digp->md.p == NULL)
+                {
+                    return_term = EXCP_NOTSUP(env, "Unsupported digest algorithm");
+                    goto err;
+                }
+            if (DIGEST_FORBIDDEN_IN_FIPS(digp))
+                {
+                    return_term = EXCP_NOTSUP(env, "Digest algorithm for HMAC forbidden in FIPS");
+                    goto err;
+                }
+            md = digp->md.p;
+
+#ifdef HAS_EVP_PKEY_CTX
+# ifdef HAVE_PKEY_new_raw_private_key
+            /* Prefered for new applications according to EVP_PKEY_new_mac_key(3) */
+            pkey = EVP_PKEY_new_raw_private_key(EVP_PKEY_HMAC, /*engine*/ NULL, key_bin.data,  key_bin.size);
+# else
+            /* Available in older versions */
+            pkey = EVP_PKEY_new_mac_key(EVP_PKEY_HMAC, /*engine*/ NULL, key_bin.data,  key_bin.size);
+# endif
+
+#else
+            if (!hmac_low_level(env, md, key_bin, text, &ret_bin, &ret_bin_alloc, &return_term))
+                goto err;
+            else
+                goto success;
+#endif
+        }
+        break;
+
+
+        /********
+         * CMAC *
+         ********/
+#ifdef HAVE_CMAC
+    case CMAC_mac:
+        {
+            const struct cipher_type_t *cipherp;
+            if (!(cipherp = get_cipher_type(argv[1], key_bin.size)))
+                { /* Something went wrong. Find out what by retrying in another way. */
+                    if (!get_cipher_type_no_key(argv[1]))
+                        return_term = EXCP_BADARG(env, "Unknown cipher");
+                    else
+                        /* Cipher exists, so it must be the key size that is wrong */
+                        return_term = EXCP_BADARG(env, "Bad key size");
+                    goto err;
+                }
+            
+            if (CIPHER_FORBIDDEN_IN_FIPS(cipherp))
+                {
+                    return_term = EXCP_NOTSUP(env, "Cipher algorithm not supported in FIPS");
+                    goto err;
+                }
+
+            if (cipherp->cipher.p == NULL)
+                {
+                    return_term = EXCP_NOTSUP(env, "Unsupported cipher algorithm");
+                    goto err;
+                }
+
+# ifdef HAVE_EVP_PKEY_new_CMAC_key
+            pkey = EVP_PKEY_new_CMAC_key(/*engine*/ NULL, key_bin.data,  key_bin.size, cipherp->cipher.p);
+# else
+            if (!cmac_low_level(env, key_bin, cipherp->cipher.p, text, &ret_bin, &ret_bin_alloc, &return_term))
+                goto err;
+            else
+                goto success;
+# endif
+        }
+        break;
+#endif /* HAVE_CMAC */
+
+
+        /************
+         * POLY1305 *
+         ************/
+#ifdef HAVE_POLY1305
+    case POLY1305_mac:
+        /* poly1305 implies that EVP_PKEY_new_raw_private_key exists */
+        pkey = EVP_PKEY_new_raw_private_key(EVP_PKEY_POLY1305, /*engine*/ NULL, key_bin.data,  key_bin.size);
+        break;
+#endif
+
+
+        /***************
+         * Unknown MAC *
+         ***************/
+    case NO_mac:
+    default:
+        /* We know that this mac is supported with some version(s) of cryptolib */
+        return_term = EXCP_NOTSUP(env, "Unsupported mac algorithm");
+        goto err;
+    }
+
+    /*-----------------------------------------
+      Common computations when we have EVP_PKEY
+    */
+#ifdef HAS_EVP_PKEY_CTX
+    if (!pkey)
+        {
+            return_term = EXCP_ERROR(env, "EVP_PKEY_key creation");
+            goto err;
+        }
+    
+    if ((mctx = EVP_MD_CTX_new()) == NULL)
+        {
+            return_term = EXCP_ERROR(env, "EVP_MD_CTX_new");
+            goto err;
+        }
+
+    if (EVP_DigestSignInit(mctx, /*&pctx*/ NULL, md, /*engine*/ NULL, pkey) != 1)
+        {
+            return_term = EXCP_ERROR(env, "EVP_DigestSign");
+            goto err;
+        }
+
+# ifdef HAVE_DigestSign_as_single_op
+    if (EVP_DigestSign(mctx, NULL, &size, text.data, text.size) != 1)
+        {
+            return_term = EXCP_ERROR(env, "Can't get sign size");
+            goto err;
+        }
+# else
+    if (EVP_DigestSignUpdate(mctx, text.data, text.size) != 1)
+        {
+            return_term = EXCP_ERROR(env, "EVP_DigestSignUpdate");
+            goto err;
+        }
+
+    if (EVP_DigestSignFinal(mctx, NULL, &size) != 1)
+        {
+            return_term = EXCP_ERROR(env, "Can't get sign size");
+            goto err;
+        }
+# endif
+   
+    if (!enif_alloc_binary(size, &ret_bin))
+        {
+            return_term = EXCP_ERROR(env, "Alloc binary");
+            goto err;
+        }
+    ret_bin_alloc = 1;
+
+# ifdef HAVE_DigestSign_as_single_op
+    if (EVP_DigestSign(mctx, ret_bin.data, &size, text.data, text.size) != 1)
+# else    
+    if (EVP_DigestSignFinal(mctx, ret_bin.data, &size) != 1)
+# endif
+        {
+            return_term = EXCP_ERROR(env, "Signing");
+            goto err;
+        }
+
+    goto success; /* The label "success:" could be left without any "goto success"
+                     in some combination of flags. This prevents a compiler warning
+                  */
+#endif /* ifdef HAS_EVP_PKEY_CTX */
+
+
+    /****************************
+     Exit when we got a signature
+    *****************************/
+ success:
+    CONSUME_REDS(env, text);
+
+    return_term = enif_make_binary(env, &ret_bin);
+    ret_bin_alloc = 0;
+
+ err:
+
+#ifdef HAS_EVP_PKEY_CTX
+    if (pkey)
+        EVP_PKEY_free(pkey);
+    if (mctx)
+        EVP_MD_CTX_free(mctx);
+#endif
+
+    if (ret_bin_alloc)
+        enif_release_binary(&ret_bin);
+
+    return return_term;
+}
+
+
+/*******************************************************************
+ *
+ * Mac ctx
+ *
+ ******************************************************************/
+
+int init_mac_ctx(ErlNifEnv *env);
+
+struct mac_context
+{
+    EVP_MD_CTX *ctx;
+};
+
+static ErlNifResourceType* mac_context_rtype;
+
+static void mac_context_dtor(ErlNifEnv* env, struct mac_context*);
+
+int init_mac_ctx(ErlNifEnv *env) {
+    mac_context_rtype = enif_open_resource_type(env, NULL, "mac_context",
+                                                (ErlNifResourceDtor*) mac_context_dtor,
+                                                ERL_NIF_RT_CREATE|ERL_NIF_RT_TAKEOVER,
+                                                NULL);
+    if (mac_context_rtype == NULL)
+        goto err;
+
+    return 1;
+
+ err:
+    PRINTF_ERR0("CRYPTO: Could not open resource type 'mac_context'");
+    return 0;
+}
+
+
+static void mac_context_dtor(ErlNifEnv* env, struct mac_context *obj)
+{
+    if (obj == NULL)
+        return;
+
+    if (obj->ctx)
+        EVP_MD_CTX_free(obj->ctx);
+}
+
+/*******************************************************************
+ *
+ * mac_init, mac_update, mac_final nifs
+ *
+ ******************************************************************/
+
+ERL_NIF_TERM mac_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (MacType, SubType, Key) */
+#ifdef HAS_EVP_PKEY_CTX
+    struct mac_context  *obj = NULL;
+    struct mac_type_t *macp;
+    ErlNifBinary key_bin;
+    ERL_NIF_TERM return_term;
+    const EVP_MD *md = NULL;
+    EVP_PKEY *pkey = NULL;
+
+    /*---------------------------------
+      Get common indata and validate it
+    */
+    if (!enif_inspect_iolist_as_binary(env, argv[2], &key_bin))
+        {
+            return_term = EXCP_BADARG(env, "Bad key");
+            goto err;
+        }
+
+    if (!(macp = get_mac_type(argv[0], key_bin.size)))
+        {
+            if (!get_mac_type_no_key(argv[0]))
+                return_term = EXCP_BADARG(env, "Unknown mac algorithm");
+            else
+                return_term = EXCP_BADARG(env, "Bad key length");
+            goto err;
+        }
+
+    if (MAC_FORBIDDEN_IN_FIPS(macp))
+        {
+            return_term = EXCP_NOTSUP(env, "MAC algorithm forbidden in FIPS");
+            goto err;
+        }
+
+    /*--------------------------------------------------
+      Algorithm dependent indata checking and computation.
+      If EVP_PKEY is available, only set the pkey variable
+      and do the computation after the switch statement.
+      If not available, do the low-level calls in the 
+      corresponding case part
+    */
+    switch (macp->type) {
+
+        /********
+         * HMAC *
+         ********/
+    case HMAC_mac:
+        {
+            struct digest_type_t *digp;
+
+            if ((digp = get_digest_type(argv[1])) == NULL)
+                {
+                    return_term = EXCP_BADARG(env, "Bad digest algorithm for HMAC");
+                    goto err;
+                }
+            if (digp->md.p == NULL)
+                {
+                    return_term = EXCP_NOTSUP(env, "Unsupported digest algorithm");
+                    goto err;
+                }
+            if (DIGEST_FORBIDDEN_IN_FIPS(digp))
+                {
+                    return_term = EXCP_NOTSUP(env, "Digest algorithm for HMAC forbidden in FIPS");
+                    goto err;
+                }
+            md = digp->md.p;
+
+# ifdef HAVE_PKEY_new_raw_private_key
+            /* Prefered for new applications according to EVP_PKEY_new_mac_key(3) */
+            pkey = EVP_PKEY_new_raw_private_key(EVP_PKEY_HMAC, /*engine*/ NULL, key_bin.data,  key_bin.size);
+# else
+            /* Available in older versions */
+            pkey = EVP_PKEY_new_mac_key(EVP_PKEY_HMAC, /*engine*/ NULL, key_bin.data,  key_bin.size);
+# endif
+        }
+        break;
+
+
+        /********
+         * CMAC *
+         ********/
+#if defined(HAVE_CMAC) && defined(HAVE_EVP_PKEY_new_CMAC_key)
+    case CMAC_mac:
+        {
+            const struct cipher_type_t *cipherp;
+            if (!(cipherp = get_cipher_type(argv[1], key_bin.size)))
+                { /* Something went wrong. Find out what by retrying in another way. */
+                    if (!get_cipher_type_no_key(argv[1]))
+                        return_term = EXCP_BADARG(env, "Unknown cipher");
+                    else
+                        /* Cipher exists, so it must be the key size that is wrong */
+                        return_term = EXCP_BADARG(env, "Bad key size");
+                    goto err;
+                }
+            
+            if (CIPHER_FORBIDDEN_IN_FIPS(cipherp))
+                {
+                    return_term = EXCP_NOTSUP(env, "Cipher algorithm not supported in FIPS");
+                    goto err;
+                }
+
+            if (cipherp->cipher.p == NULL)
+                {
+                    return_term = EXCP_NOTSUP(env, "Unsupported cipher algorithm");
+                    goto err;
+                }
+
+            pkey = EVP_PKEY_new_CMAC_key(/*engine*/ NULL, key_bin.data,  key_bin.size, cipherp->cipher.p);
+        }
+        break;
+#endif /* HAVE_CMAC && HAVE_EVP_PKEY_new_CMAC_key */
+
+
+        /************
+         * POLY1305 *
+         ************/
+#ifdef HAVE_POLY1305
+    case POLY1305_mac:
+        /* poly1305 implies that EVP_PKEY_new_raw_private_key exists */
+        pkey = EVP_PKEY_new_raw_private_key(EVP_PKEY_POLY1305, /*engine*/ NULL, key_bin.data,  key_bin.size);
+        break;
+#endif
+
+
+        /***************
+         * Unknown MAC *
+         ***************/
+    case NO_mac:
+    default:
+        /* We know that this mac is supported with some version(s) of cryptolib */
+        return_term = EXCP_NOTSUP(env, "Unsupported mac algorithm");
+        goto err;
+    }
+
+    /*-----------------------------------------
+      Common computations
+    */
+    if (!pkey)
+        {
+            return_term = EXCP_ERROR(env, "EVP_PKEY_key creation");
+            goto err;
+        }
+    
+    if ((obj = enif_alloc_resource(mac_context_rtype, sizeof(struct mac_context))) == NULL)
+        {
+            return_term = EXCP_ERROR(env, "Can't allocate mac_context_rtype");
+            goto err;
+        }
+
+    if ((obj->ctx = EVP_MD_CTX_new()) == NULL)
+        {
+            return_term = EXCP_ERROR(env, "EVP_MD_CTX_new");
+            goto err;
+        }
+
+    if (EVP_DigestSignInit(obj->ctx, /*&pctx*/ NULL, md, /*engine*/ NULL, pkey) != 1)
+        {
+            return_term = EXCP_ERROR(env, "EVP_DigestSign");
+            goto err;
+        }
+
+    return_term = enif_make_resource(env, obj);
+
+ err:
+
+    if (obj)
+        enif_release_resource(obj);
+
+    if (pkey)
+        EVP_PKEY_free(pkey);
+
+    return return_term;
+
+#else
+    if (argv[0] != atom_hmac)
+        return EXCP_NOTSUP(env, "Unsupported mac algorithm");
+
+    return hmac_init_nif(env, argc, argv);
+#endif
+}
+
+
+
+ERL_NIF_TERM mac_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Ref, Text) */
+    ErlNifBinary  text;
+
+    if (!enif_inspect_iolist_as_binary(env, argv[1], &text))
+        return EXCP_BADARG(env, "Bad text");
+
+    if (text.size > INT_MAX)
+        return EXCP_BADARG(env, "Too long text");
+
+    /* Run long jobs on a dirty scheduler to not block the current emulator thread */
+    if (text.size > MAX_BYTES_TO_NIF) {
+        return enif_schedule_nif(env, "mac_update",
+                                 ERL_NIF_DIRTY_JOB_CPU_BOUND,
+                                 mac_update, argc, argv);
+    }
+
+    return mac_update(env, argc, argv);
+}
+
+
+ERL_NIF_TERM mac_update(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Ref, Text) */
+#ifdef HAS_EVP_PKEY_CTX
+    struct mac_context *obj = NULL;
+    ErlNifBinary text;
+
+    if (!enif_get_resource(env, argv[0], (ErlNifResourceType*)mac_context_rtype, (void**)&obj))
+        return EXCP_BADARG(env, "Bad ref");
+
+    if (!enif_inspect_iolist_as_binary(env, argv[1], &text))
+        return EXCP_BADARG(env, "Bad text");
+
+    if (EVP_DigestSignUpdate(obj->ctx, text.data, text.size) != 1)
+        return EXCP_ERROR(env, "EVP_DigestSignUpdate");
+
+    CONSUME_REDS(env, text);
+    return argv[0];
+
+#else
+    return hmac_update_nif(env, argc, argv);
+#endif
+}
+
+
+
+ERL_NIF_TERM mac_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Ref) */
+#ifdef HAS_EVP_PKEY_CTX
+    struct mac_context *obj;
+    size_t size;
+    ErlNifBinary ret_bin;
+    
+    if (!enif_get_resource(env, argv[0], (ErlNifResourceType*)mac_context_rtype, (void**)&obj))
+        return EXCP_BADARG(env, "Bad ref");
+
+    if (EVP_DigestSignFinal(obj->ctx, NULL, &size) != 1)
+        return EXCP_ERROR(env, "Can't get sign size");
+   
+    if (!enif_alloc_binary(size, &ret_bin))
+        return EXCP_ERROR(env, "Alloc binary");
+
+    if (EVP_DigestSignFinal(obj->ctx, ret_bin.data, &size) != 1)
+        {
+            enif_release_binary(&ret_bin);
+            return EXCP_ERROR(env, "Signing");
+        }
+ 
+    return enif_make_binary(env, &ret_bin);
+
+#else
+    return hmac_final_nif(env, argc, argv);
+#endif
+}
+
diff --git a/lib/crypto/c_src/mac.h b/lib/crypto/c_src/mac.h
new file mode 100644
index 0000000000..053a331324
--- /dev/null
+++ b/lib/crypto/c_src/mac.h
@@ -0,0 +1,38 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_MAC_H__
+#define E_MAC_H__ 1
+
+#include "common.h"
+
+int init_mac_ctx(ErlNifEnv *env);
+
+void init_mac_types(ErlNifEnv* env);
+
+ERL_NIF_TERM mac_types_as_list(ErlNifEnv* env);
+
+ERL_NIF_TERM mac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+ERL_NIF_TERM mac_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM mac_update_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM mac_final_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+#endif /* E_MAC_H__ */
diff --git a/lib/crypto/c_src/math.c b/lib/crypto/c_src/math.c
new file mode 100644
index 0000000000..85494bbc93
--- /dev/null
+++ b/lib/crypto/c_src/math.c
@@ -0,0 +1,53 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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 "math.h"
+
+ERL_NIF_TERM do_exor(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Data1, Data2) */
+    ErlNifBinary d1, d2;
+    unsigned char* ret_ptr;
+    size_t i;
+    ERL_NIF_TERM ret;
+
+    ASSERT(argc == 2);
+
+    if (!enif_inspect_iolist_as_binary(env, argv[0], &d1))
+        goto bad_arg;
+    if (!enif_inspect_iolist_as_binary(env, argv[1], &d2))
+        goto bad_arg;
+    if (d1.size != d2.size)
+        goto bad_arg;
+
+    if ((ret_ptr = enif_make_new_binary(env, d1.size, &ret)) == NULL)
+        goto err;
+
+    for (i=0; i<d1.size; i++) {
+	ret_ptr[i] = d1.data[i] ^ d2.data[i];
+    }
+
+    CONSUME_REDS(env,d1);
+    return ret;
+
+ bad_arg:
+ err:
+    return enif_make_badarg(env);
+}
+
diff --git a/lib/crypto/c_src/math.h b/lib/crypto/c_src/math.h
new file mode 100644
index 0000000000..b8d68ea654
--- /dev/null
+++ b/lib/crypto/c_src/math.h
@@ -0,0 +1,28 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_MATH_H__
+#define E_MATH_H__ 1
+
+#include "common.h"
+
+ERL_NIF_TERM do_exor(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+#endif /* E_MATH_H__ */
diff --git a/lib/crypto/c_src/openssl_config.h b/lib/crypto/c_src/openssl_config.h
new file mode 100644
index 0000000000..32a0830717
--- /dev/null
+++ b/lib/crypto/c_src/openssl_config.h
@@ -0,0 +1,411 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_OPENSSL_CONFIG_H__
+#define E_OPENSSL_CONFIG_H__ 1
+
+#define OPENSSL_THREAD_DEFINES
+#include <openssl/opensslconf.h>
+
+#include <openssl/crypto.h>
+#include <openssl/des.h>
+
+/* #include <openssl/idea.h> This is not supported on the openssl OTP requires */
+#include <openssl/dsa.h>
+#include <openssl/rsa.h>
+#include <openssl/aes.h>
+#include <openssl/md5.h>
+#include <openssl/md4.h>
+#include <openssl/sha.h>
+#include <openssl/ripemd.h>
+#include <openssl/bn.h>
+#include <openssl/objects.h>
+#ifndef OPENSSL_NO_RC4
+    #include <openssl/rc4.h>
+#endif /* OPENSSL_NO_RC4 */
+#ifndef OPENSSL_NO_RC2
+    #include <openssl/rc2.h>
+#endif
+#include <openssl/blowfish.h>
+#include <openssl/rand.h>
+#include <openssl/evp.h>
+#include <openssl/hmac.h>
+#include <openssl/err.h>
+
+/* Helper macro to construct a OPENSSL_VERSION_NUMBER.
+ * See openssl/opensslv.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))
+
+
+/* LibreSSL was cloned from OpenSSL 1.0.1g and claims to be API and BPI compatible
+ * with 1.0.1.
+ *
+ * LibreSSL has the same names on include files and symbols as OpenSSL, but defines
+ * the OPENSSL_VERSION_NUMBER to be >= 2.0.0
+ *
+ * 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
+ *  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
+ *  true because the LibreSSL API version is "1.0.1")
+ *
+ */
+
+#ifdef LIBRESSL_VERSION_NUMBER
+/* A macro to test on in this file */
+#define HAS_LIBRESSL
+#endif
+
+#ifdef HAS_LIBRESSL
+/* LibreSSL dislikes FIPS */
+# ifdef FIPS_SUPPORT
+#  undef FIPS_SUPPORT
+# endif
+
+/* LibreSSL has never supported the custom mem functions */
+#ifndef HAS_LIBRESSL
+#  define HAS_CRYPTO_MEM_FUNCTIONS
+#endif
+
+# if LIBRESSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(2,7,0)
+/* LibreSSL wants the 1.0.1 API */
+# define NEED_EVP_COMPATIBILITY_FUNCTIONS
+# endif
+#endif
+
+
+#if OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(1,1,0)
+# define NEED_EVP_COMPATIBILITY_FUNCTIONS
+#endif
+
+
+#ifndef HAS_LIBRESSL
+# if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0)
+#  define HAS_EVP_PKEY_CTX
+#  define HAVE_EVP_CIPHER_CTX_COPY
+# endif
+
+# if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,1,1)
+#   define HAVE_PKEY_new_raw_private_key
+#   define HAVE_EVP_PKEY_new_CMAC_key
+#   define HAVE_DigestSign_as_single_op
+# endif
+#endif
+
+
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0)
+#include <openssl/modes.h>
+#endif
+
+#include "crypto_callback.h"
+
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(0,9,8)	\
+    && !defined(OPENSSL_NO_SHA224) && defined(NID_sha224) \
+    && !defined(OPENSSL_NO_SHA256) /* disabled like this in my sha.h (?) */
+# define HAVE_SHA224
+#endif
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(0,9,8)	\
+    && !defined(OPENSSL_NO_SHA256) && defined(NID_sha256)
+# define HAVE_SHA256
+#endif
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(0,9,8)	\
+    && !defined(OPENSSL_NO_SHA384) && defined(NID_sha384)\
+    && !defined(OPENSSL_NO_SHA512) /* disabled like this in my sha.h (?) */
+# define HAVE_SHA384
+#endif
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(0,9,8)	\
+    && !defined(OPENSSL_NO_SHA512) && defined(NID_sha512)
+# define HAVE_SHA512
+#endif
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,7,'e')
+# define HAVE_DES_ede3_cfb_encrypt
+#endif
+
+// SHA3:
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,1,1)
+// An error in beta releases of 1.1.1 fixed in production release
+# ifdef NID_sha3_224
+#  define HAVE_SHA3_224
+# endif
+# ifdef NID_sha3_256
+#  define HAVE_SHA3_256
+# endif
+#endif
+# ifdef NID_sha3_384
+#  define HAVE_SHA3_384
+# endif
+# ifdef NID_sha3_512
+#  define HAVE_SHA3_512
+# endif
+
+// BLAKE2:
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,1,1) \
+    && !defined(HAS_LIBRESSL) \
+    && !defined(OPENSSL_NO_BLAKE2)
+# define HAVE_BLAKE2
+#endif
+
+#ifndef OPENSSL_NO_BF
+# define HAVE_BF
+#endif
+
+#ifndef OPENSSL_NO_DES
+# define HAVE_DES
+#endif
+
+#ifndef OPENSSL_NO_DH
+# define HAVE_DH
+#endif
+
+#ifndef OPENSSL_NO_DSA
+# define HAVE_DSA
+#endif
+
+#ifndef OPENSSL_NO_MD4
+# define HAVE_MD4
+#endif
+
+#ifndef OPENSSL_NO_MD5
+# define HAVE_MD5
+#endif
+
+#ifndef OPENSSL_NO_RC2
+# define HAVE_RC2
+#endif
+
+#ifndef OPENSSL_NO_RC4
+# define HAVE_RC4
+#endif
+
+#ifndef OPENSSL_NO_RMD160
+/* Note RMD160 vs RIPEMD160 */
+# define HAVE_RIPEMD160
+#endif
+
+
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,8,'o') \
+	&& !defined(OPENSSL_NO_EC) \
+	&& !defined(OPENSSL_NO_ECDH) \
+	&& !defined(OPENSSL_NO_ECDSA)
+# define HAVE_EC
+#endif
+
+// (test for >= 1.1.1pre8)
+#if OPENSSL_VERSION_NUMBER >= (PACKED_OPENSSL_VERSION_PLAIN(1,1,1) -7) \
+    && !defined(HAS_LIBRESSL) \
+    && defined(HAVE_EC)
+# define HAVE_ED_CURVE_DH
+# if OPENSSL_VERSION_NUMBER >= (PACKED_OPENSSL_VERSION_PLAIN(1,1,1))
+#   define HAVE_EDDSA
+# endif
+#endif
+
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,8,'c')
+# define HAVE_AES_IGE
+#endif
+
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,1)
+# define HAVE_EVP_AES_CTR
+# define HAVE_AEAD
+# define HAVE_GCM
+# define HAVE_CCM
+# ifndef OPENSSL_NO_CMAC
+#   define HAVE_CMAC
+# endif
+# if defined(RSA_PKCS1_OAEP_PADDING)
+#   define HAVE_RSA_OAEP_PADDING
+# endif
+# define HAVE_RSA_MGF1_MD
+# if OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION(1,0,1,'d')
+#  define HAVE_GCM_EVP_DECRYPT_BUG
+# endif
+#endif
+
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,1,0)
+# ifndef HAS_LIBRESSL
+#  if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
+#    define HAVE_CHACHA20_POLY1305
+#  endif
+#  define HAVE_RSA_OAEP_MD
+# endif
+#endif
+
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(1,1,0,'d')
+# ifndef HAS_LIBRESSL
+#  ifndef OPENSSL_NO_CHACHA
+#    define HAVE_CHACHA20
+#  endif
+# endif
+#endif
+
+// OPENSSL_VERSION_NUMBER >= 1.1.1-pre8
+#if OPENSSL_VERSION_NUMBER >= (PACKED_OPENSSL_VERSION_PLAIN(1,1,1)-7)
+# ifndef HAS_LIBRESSL
+#  if !defined(OPENSSL_NO_POLY1305)
+#    define HAVE_POLY1305
+#  endif
+# endif
+#endif
+
+#if OPENSSL_VERSION_NUMBER <= PACKED_OPENSSL_VERSION(0,9,8,'l')
+# define HAVE_ECB_IVEC_BUG
+#endif
+
+#ifndef HAS_LIBRESSL
+# ifdef RSA_SSLV23_PADDING
+#  define HAVE_RSA_SSLV23_PADDING
+# endif
+#endif
+
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0)
+# ifdef RSA_PKCS1_PSS_PADDING
+#  define HAVE_RSA_PKCS1_PSS_PADDING
+# endif
+#endif
+
+#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,8,'h') \
+    && defined(HAVE_EC)
+/* If OPENSSL_NO_EC is set, there will be an error in ec.h included from engine.h
+   So if EC is disabled, you can't use Engine either....
+*/
+# define HAS_ENGINE_SUPPORT
+#endif
+
+
+#if defined(HAS_ENGINE_SUPPORT)
+# include <openssl/engine.h>
+#endif
+
+#if defined(HAVE_CMAC)
+#include <openssl/cmac.h>
+#endif
+
+#if defined(HAVE_EC)
+#include <openssl/ec.h>
+#include <openssl/ecdh.h>
+#include <openssl/ecdsa.h>
+#endif
+
+#ifdef VALGRIND
+    #  include <valgrind/memcheck.h>
+
+/* libcrypto mixes supplied buffer contents into its entropy pool,
+   which makes valgrind complain about the use of uninitialized data.
+   We use this valgrind "request" to make sure that no such seemingly
+   undefined data is returned.
+*/
+    #  define ERL_VALGRIND_MAKE_MEM_DEFINED(ptr,size) \
+    VALGRIND_MAKE_MEM_DEFINED(ptr,size)
+
+    #   define ERL_VALGRIND_ASSERT_MEM_DEFINED(Ptr,Size)			\
+          do {								\
+              int __erl_valgrind_mem_defined = VALGRIND_CHECK_MEM_IS_DEFINED((Ptr),(Size));	\
+              if (__erl_valgrind_mem_defined != 0) {			\
+	          fprintf(stderr,"\r\n####### VALGRIND_ASSSERT(%p,%ld) failed at %s:%d\r\n", \
+		          (Ptr),(long)(Size), __FILE__, __LINE__);	\
+	          abort();						\
+              }								\
+          } while (0)
+
+#else
+    #  define ERL_VALGRIND_MAKE_MEM_DEFINED(ptr,size)
+    #  define ERL_VALGRIND_ASSERT_MEM_DEFINED(ptr,size)
+#endif
+
+#ifdef DEBUG
+    #  define ASSERT(e) \
+    ((void) ((e) ? 1 : (fprintf(stderr,"Assert '%s' failed at %s:%d\n",\
+				#e, __FILE__, __LINE__), abort(), 0)))
+#else
+    #  define ASSERT(e) ((void) 1)
+#endif
+
+#ifdef __GNUC__
+    #  define INLINE __inline__
+#elif defined(__WIN32__)
+    #  define INLINE __forceinline
+#else
+    #  define INLINE
+#endif
+
+
+#define get_int32(s) ((((unsigned char*) (s))[0] << 24) | \
+                      (((unsigned char*) (s))[1] << 16) | \
+                      (((unsigned char*) (s))[2] << 8)  | \
+                      (((unsigned char*) (s))[3]))
+
+#define put_uint32(s,i) \
+{ (s)[0] = (unsigned char)(((i) >> 24) & 0xff);\
+  (s)[1] = (unsigned char)(((i) >> 16) & 0xff);\
+  (s)[2] = (unsigned char)(((i) >> 8) & 0xff);\
+  (s)[3] = (unsigned char)((i) & 0xff);\
+}
+
+/* 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 CONSUME_REDS(NifEnv, Ibin)			\
+do {                                                    \
+    size_t _cost = (Ibin).size;                         \
+    if (_cost > SIZE_MAX / 100)                         \
+        _cost = 100;                                    \
+    else                                                \
+        _cost = (_cost * 100) / MAX_BYTES_TO_NIF;       \
+                                                        \
+    if (_cost) {                                        \
+        (void) enif_consume_timeslice((NifEnv),		\
+                (_cost > 100) ? 100 : (int)_cost);      \
+    }                                                   \
+ } while (0)
+
+#ifdef NEED_EVP_COMPATIBILITY_FUNCTIONS
+#  include "evp_compat.h"
+#else
+#  define HAVE_OPAQUE_BN_GENCB
+#endif
+
+#if 0
+#  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)
+#else
+#  define PRINTF_ERR0(FMT)
+#  define PRINTF_ERR1(FMT,A1)
+#  define PRINTF_ERR2(FMT,A1,A2)
+#endif
+
+#ifdef FIPS_SUPPORT
+/* In FIPS mode non-FIPS algorithms are disabled and return badarg. */
+#define CHECK_NO_FIPS_MODE() { if (FIPS_mode()) return atom_notsup; }
+#else
+#define CHECK_NO_FIPS_MODE()
+#endif
+
+#endif /* E_OPENSSL_CONFIG_H__ */
diff --git a/lib/crypto/c_src/otp_test_engine.c b/lib/crypto/c_src/otp_test_engine.c
index 2c8cce094e..c3bd9dfb55 100644
--- a/lib/crypto/c_src/otp_test_engine.c
+++ b/lib/crypto/c_src/otp_test_engine.c
@@ -21,8 +21,11 @@
 #ifdef _WIN32
 #define OPENSSL_OPT_WINDLL
 #endif
+
 #include <stdio.h>
 #include <string.h>
+#include <limits.h>
+#include <stdint.h>
 
 #include <openssl/md5.h>
 #include <openssl/rsa.h>
@@ -87,13 +90,12 @@ static int test_init(ENGINE *e) {
     printf("OTP Test Engine Initializatzion!\r\n");
     
 #if defined(FAKE_RSA_IMPL)
-    if (    !RSA_meth_set_finish(test_rsa_method, test_rsa_free)
-            || !RSA_meth_set_sign(test_rsa_method, test_rsa_sign)
-            || !RSA_meth_set_verify(test_rsa_method, test_rsa_verify)
-            ) {
-        fprintf(stderr, "Setup RSA_METHOD failed\r\n");
-        return 0;
-    }
+    if (!RSA_meth_set_finish(test_rsa_method, test_rsa_free))
+        goto err;
+    if (!RSA_meth_set_sign(test_rsa_method, test_rsa_sign))
+        goto err;
+    if (!RSA_meth_set_verify(test_rsa_method, test_rsa_verify))
+        goto err;
 #endif /* if defined(FAKE_RSA_IMPL) */
 
     /* Load all digest and cipher algorithms. Needed for password protected private keys */
@@ -101,6 +103,12 @@ static int test_init(ENGINE *e) {
     OpenSSL_add_all_digests();
 
     return 111;
+
+#if defined(FAKE_RSA_IMPL)
+err:
+    fprintf(stderr, "Setup RSA_METHOD failed\r\n");
+    return 0;
+#endif
 }
 
 static void add_test_data(unsigned char *md, unsigned int len)
@@ -152,15 +160,15 @@ static int test_engine_md5_update(EVP_MD_CTX *ctx,const void *data, size_t count
 
 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", (unsigned long)sizeof(EVP_MD));
+    if (!MD5_Final(md, data(ctx)))
+        goto err;
 
-    fprintf(stderr, "MD5 final size of EVP_MD: %lu\r\n", sizeof(EVP_MD));
-    ret = MD5_Final(md, data(ctx));
+    add_test_data(md, MD5_DIGEST_LENGTH);
+    return 1;
 
-    if (ret > 0) {
-         add_test_data(md, MD5_DIGEST_LENGTH);
-    }
-    return ret;
+ err:
+    return 0;
 #else
     fprintf(stderr, "MD5 final\r\n");
     add_test_data(md, MD5_DIGEST_LENGTH);
@@ -190,7 +198,6 @@ 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);
@@ -201,64 +208,82 @@ static int test_engine_digest_selector(ENGINE *e, const EVP_MD **digest,
 #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;
-            }
+        EVP_MD *md;
+
+        if ((md = EVP_MD_meth_new(NID_md5, NID_undef)) == NULL)
+            goto err;
+        if (EVP_MD_meth_set_result_size(md, MD5_DIGEST_LENGTH) != 1)
+            goto err;
+        if (EVP_MD_meth_set_flags(md, 0) != 1)
+            goto err;
+        if (EVP_MD_meth_set_init(md, test_engine_md5_init) != 1)
+            goto err;
+        if (EVP_MD_meth_set_update(md, test_engine_md5_update) != 1)
+            goto err;
+        if (EVP_MD_meth_set_final(md, test_engine_md5_final) != 1)
+            goto err;
+        if (EVP_MD_meth_set_copy(md, NULL) != 1)
+            goto err;
+        if (EVP_MD_meth_set_cleanup(md, NULL) != 1)
+            goto err;
+        if (EVP_MD_meth_set_input_blocksize(md, MD5_CBLOCK) != 1)
+            goto err;
+        if (EVP_MD_meth_set_app_datasize(md, sizeof(EVP_MD *) + sizeof(MD5_CTX)) != 1)
+            goto err;
+        if (EVP_MD_meth_set_ctrl(md, NULL) != 1)
+            goto err;
+
+        *digest = md;
 #endif
     }
     else {
-        ok = 0;
-        *digest = NULL;
+        goto err;
     }
     
-    return ok;
+    return 1;
+
+ err:
+    *digest = NULL;
+    return 0;
 }
 
 static int bind_helper(ENGINE * e, const char *id)
 {
 #if defined(FAKE_RSA_IMPL)
-    test_rsa_method = RSA_meth_new("OTP test RSA method", 0);
-    if (test_rsa_method == NULL) {
+    if ((test_rsa_method = RSA_meth_new("OTP test RSA method", 0)) == NULL) {
         fprintf(stderr, "RSA_meth_new failed\r\n");
-        return 0;
+        goto err;
     }
 #endif /* if defined(FAKE_RSA_IMPL) */
 
-    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_privkey_load)
-        || !ENGINE_set_load_pubkey_function(e, &test_pubkey_load)
-        )
-        return 0;
+    if (!ENGINE_set_id(e, test_engine_id))
+        goto err;
+    if (!ENGINE_set_name(e, test_engine_name))
+        goto err;
+    if (!ENGINE_set_init_function(e, test_init))
+        goto err;
+    if (!ENGINE_set_digests(e, &test_engine_digest_selector))
+        goto err;
+    /* For testing of key storage in an Engine: */
+    if (!ENGINE_set_load_privkey_function(e, &test_privkey_load))
+        goto err;
+    if (!ENGINE_set_load_pubkey_function(e, &test_pubkey_load))
+        goto err;
 
 #if defined(FAKE_RSA_IMPL)
-    if ( !ENGINE_set_RSA(e, test_rsa_method) ) {
-        RSA_meth_free(test_rsa_method);
-        test_rsa_method = NULL;
-        return 0;
-    }
+    if (!ENGINE_set_RSA(e, test_rsa_method))
+        goto err;
 #endif /* if defined(FAKE_RSA_IMPL) */
 
     return 1;
+
+ err:
+#if defined(FAKE_RSA_IMPL)
+    if (test_rsa_method)
+        RSA_meth_free(test_rsa_method);
+    test_rsa_method = NULL;
+#endif
+    return 0;
 }
 
 IMPLEMENT_DYNAMIC_CHECK_FN();
@@ -304,7 +329,7 @@ EVP_PKEY* test_key_load(ENGINE *eng, const char *id, UI_METHOD *ui_method, void
         fprintf(stderr, "Contents of file \"%s\":\r\n",id);
         f = fopen(id, "r");
         { /* Print the contents of the key file */
-            char c;
+            int c;
             while (!feof(f)) {
                 switch (c=fgetc(f)) {
                 case '\n':
@@ -324,23 +349,28 @@ EVP_PKEY* test_key_load(ENGINE *eng, const char *id, UI_METHOD *ui_method, void
 
 int pem_passwd_cb_fun(char *buf, int size, int rwflag, void *password) 
 { 
-    int i;
+    size_t i;
+
+    if (size < 0)
+        return 0;
 
     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;
-    }
+    if (i >= (size_t)size || i > INT_MAX - 1)
+        goto err;
+
+    /* whole pwd (incl terminating 0) fits */
+    fprintf(stderr, "Got FULL pwd %zu(%d) chars\r\n", i, size);
+    memcpy(buf, (char*)password, i+1);
+    return (int)i+1;
+
+ err:
+    fprintf(stderr, "Got TO LONG pwd %zu(%d) chars\r\n", i, size);
+    /* meaningless with a truncated password */
+    return 0;
 }
 
 #endif
@@ -349,7 +379,7 @@ int pem_passwd_cb_fun(char *buf, int size, int rwflag, void *password)
 /* RSA sign. This returns a fixed string so the test case can test that it was called
    instead of the cryptolib default RSA sign */
 
-unsigned char fake_flag[] = {255,3,124,180,35,10,180,151,101,247,62,59,80,122,220,
+static unsigned char fake_flag[] = {255,3,124,180,35,10,180,151,101,247,62,59,80,122,220,
                              142,24,180,191,34,51,150,112,27,43,142,195,60,245,213,80,179};
 
 int test_rsa_sign(int dtype, 
@@ -360,11 +390,10 @@ int test_rsa_sign(int dtype,
                   /* The key */
                   const RSA *rsa)
 {
-    int slen;
     fprintf(stderr, "test_rsa_sign (dtype=%i) called m_len=%u *siglen=%u\r\n", dtype, m_len, *siglen);
     if (!sigret) {
         fprintf(stderr, "sigret = NULL\r\n");
-        return -1;
+        goto err;
     }
 
     /* {int i;
@@ -375,15 +404,21 @@ int test_rsa_sign(int dtype,
     } */
 
     if ((sizeof(fake_flag) == m_len)
-        && bcmp(m,fake_flag,m_len) == 0) {
+        && memcmp(m,fake_flag,m_len) == 0) {
+        int slen;
+
         printf("To be faked\r\n");
         /* To be faked */
-        slen = RSA_size(rsa);
-        add_test_data(sigret, slen); /* The signature is 0,1,2...255,0,1... */
-        *siglen = slen; /* Must set this. Why? */
+        if ((slen = RSA_size(rsa)) < 0)
+            goto err;
+        add_test_data(sigret, (unsigned int)slen); /* The signature is 0,1,2...255,0,1... */
+        *siglen = (unsigned int)slen; /* Must set this. Why? */
         return 1; /* 1 = success */
     }
     return 0;
+
+ err:
+    return -1;
 }
 
 int test_rsa_verify(int dtype, 
@@ -397,9 +432,14 @@ int test_rsa_verify(int dtype,
     printf("test_rsa_verify (dtype=%i) called m_len=%u siglen=%u\r\n", dtype, m_len, siglen);
 
     if ((sizeof(fake_flag) == m_len)
-        && bcmp(m,fake_flag,m_len) == 0) {
+        && memcmp(m,fake_flag,m_len) == 0) {
+        int size;
+
+        if ((size = RSA_size(rsa)) < 0)
+            return 0;
+
         printf("To be faked\r\n");
-        return (siglen ==  RSA_size(rsa)) 
+        return (siglen == (unsigned int)size)
             && chk_test_data(sigret, siglen);
     }
     return 0;
diff --git a/lib/crypto/c_src/pkey.c b/lib/crypto/c_src/pkey.c
new file mode 100644
index 0000000000..d53d91c25b
--- /dev/null
+++ b/lib/crypto/c_src/pkey.c
@@ -0,0 +1,1489 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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 "pkey.h"
+#include "bn.h"
+#include "digest.h"
+#include "dss.h"
+#include "ec.h"
+#include "eddsa.h"
+#include "engine.h"
+#include "rsa.h"
+
+#define PKEY_BADARG -1
+#define PKEY_NOTSUP 0
+#define PKEY_OK 1
+
+typedef struct PKeyCryptOptions {
+    const EVP_MD *rsa_mgf1_md;
+    ErlNifBinary rsa_oaep_label;
+    const EVP_MD *rsa_oaep_md;
+    int rsa_padding;
+    const EVP_MD *signature_md;
+} PKeyCryptOptions;
+
+typedef struct PKeySignOptions {
+    const EVP_MD *rsa_mgf1_md;
+    int rsa_padding;
+    int rsa_pss_saltlen;
+} PKeySignOptions;
+
+
+static int get_pkey_digest_type(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_TERM type,
+				const EVP_MD **md);
+static int get_pkey_sign_digest(ErlNifEnv *env, ERL_NIF_TERM algorithm,
+				ERL_NIF_TERM type, ERL_NIF_TERM data,
+				unsigned char *md_value, const EVP_MD **mdp,
+				unsigned char **tbsp, size_t *tbslenp);
+static int get_pkey_sign_options(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_TERM options,
+                                 const EVP_MD *md, PKeySignOptions *opt);
+static int get_pkey_private_key(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_TERM key, EVP_PKEY **pkey);
+static int get_pkey_public_key(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_TERM key,
+			       EVP_PKEY **pkey);
+static int get_pkey_crypt_options(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_TERM options,
+				  PKeyCryptOptions *opt);
+#ifdef HAVE_RSA_SSLV23_PADDING
+static size_t size_of_RSA(EVP_PKEY *pkey);
+#endif
+
+static int get_pkey_digest_type(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_TERM type,
+				const EVP_MD **md)
+{
+    struct digest_type_t *digp = NULL;
+    *md = NULL;
+
+    if (type == atom_none && algorithm == atom_rsa)
+        return PKEY_OK;
+    if (algorithm == atom_eddsa) {
+#ifdef HAVE_EDDSA
+        if (!FIPS_mode()) return PKEY_OK;
+#else
+        return PKEY_NOTSUP;
+#endif
+    }
+    if ((digp = get_digest_type(type)) == NULL)
+        return PKEY_BADARG;
+    if (digp->md.p == NULL)
+        return PKEY_NOTSUP;
+
+    *md = digp->md.p;
+    return PKEY_OK;
+}
+
+static int get_pkey_sign_digest(ErlNifEnv *env, ERL_NIF_TERM algorithm,
+				ERL_NIF_TERM type, ERL_NIF_TERM data,
+				unsigned char *md_value, const EVP_MD **mdp,
+				unsigned char **tbsp, size_t *tbslenp)
+{
+    int i, ret;
+    const ERL_NIF_TERM *tpl_terms;
+    int tpl_arity;
+    ErlNifBinary tbs_bin;
+    EVP_MD_CTX *mdctx = NULL;
+    const EVP_MD *md;
+    unsigned char *tbs;
+    size_t tbslen;
+    unsigned int tbsleni;
+
+    md = *mdp;
+    tbs = *tbsp;
+    tbslen = *tbslenp;
+
+    if ((i = get_pkey_digest_type(env, algorithm, type, &md)) != PKEY_OK)
+        return i;
+
+    if (enif_get_tuple(env, data, &tpl_arity, &tpl_terms)) {
+        if (tpl_arity != 2)
+            goto bad_arg;
+        if (tpl_terms[0] != atom_digest)
+            goto bad_arg;
+        if (!enif_inspect_iolist_as_binary(env, tpl_terms[1], &tbs_bin))
+            goto bad_arg;
+        if (tbs_bin.size > INT_MAX)
+            goto bad_arg;
+        if (md != NULL) {
+            if ((int)tbs_bin.size != EVP_MD_size(md))
+                goto bad_arg;
+        }
+
+        /* We have a digest (= hashed text) in tbs_bin */
+	tbs = tbs_bin.data;
+	tbslen = tbs_bin.size;
+    } else if (md == NULL) {
+        if (!enif_inspect_iolist_as_binary(env, data, &tbs_bin))
+            goto bad_arg;
+
+        /* md == NULL, that is no hashing because DigestType argument was atom_none */
+	tbs = tbs_bin.data;
+	tbslen = tbs_bin.size;
+    } else {
+        if (!enif_inspect_iolist_as_binary(env, data, &tbs_bin))
+            goto bad_arg;
+
+        /* We have the cleartext in tbs_bin and the hash algo info in md */
+	tbs = md_value;
+
+        if ((mdctx = EVP_MD_CTX_create()) == NULL)
+            goto err;
+
+        /* Looks well, now hash the plain text into a digest according to md */
+        if (EVP_DigestInit_ex(mdctx, md, NULL) != 1)
+            goto err;
+        if (EVP_DigestUpdate(mdctx, tbs_bin.data, tbs_bin.size) != 1)
+            goto err;
+        if (EVP_DigestFinal_ex(mdctx, tbs, &tbsleni) != 1)
+            goto err;
+
+        tbslen = (size_t)tbsleni;
+    }
+
+    *mdp = md;
+    *tbsp = tbs;
+    *tbslenp = tbslen;
+
+    ret = PKEY_OK;
+    goto done;
+
+ bad_arg:
+ err:
+    ret = PKEY_BADARG;
+
+ done:
+    if (mdctx)
+        EVP_MD_CTX_destroy(mdctx);
+    return ret;
+}
+
+static int get_pkey_sign_options(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_TERM options,
+                                 const EVP_MD *md, PKeySignOptions *opt)
+{
+    ERL_NIF_TERM head, tail;
+    const ERL_NIF_TERM *tpl_terms;
+    int tpl_arity;
+    const EVP_MD *opt_md;
+
+    if (!enif_is_list(env, options))
+        goto bad_arg;
+
+    /* defaults */
+    if (algorithm == atom_rsa) {
+	opt->rsa_mgf1_md = NULL;
+	opt->rsa_padding = RSA_PKCS1_PADDING;
+	opt->rsa_pss_saltlen = -2;
+    }
+
+    if (enif_is_empty_list(env, options))
+	return PKEY_OK;
+
+    if (algorithm != atom_rsa)
+        goto bad_arg;
+
+    tail = options;
+    while (enif_get_list_cell(env, tail, &head, &tail)) {
+        if (!enif_get_tuple(env, head, &tpl_arity, &tpl_terms))
+            goto bad_arg;
+        if (tpl_arity != 2)
+            goto bad_arg;
+
+        if (tpl_terms[0] == atom_rsa_mgf1_md && enif_is_atom(env, tpl_terms[1])) {
+            int result;
+
+            result = get_pkey_digest_type(env, algorithm, tpl_terms[1], &opt_md);
+            if (result != PKEY_OK)
+                return result;
+
+            opt->rsa_mgf1_md = opt_md;
+
+        } else if (tpl_terms[0] == atom_rsa_padding) {
+            if (tpl_terms[1] == atom_rsa_pkcs1_padding) {
+                opt->rsa_padding = RSA_PKCS1_PADDING;
+
+            } else if (tpl_terms[1] == atom_rsa_pkcs1_pss_padding) {
+#ifdef HAVE_RSA_PKCS1_PSS_PADDING
+                opt->rsa_padding = RSA_PKCS1_PSS_PADDING;
+                if (opt->rsa_mgf1_md == NULL)
+                    opt->rsa_mgf1_md = md;
+#else
+                return PKEY_NOTSUP;
+#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) {
+                opt->rsa_padding = RSA_NO_PADDING;
+
+            } else {
+                goto bad_arg;
+            }
+
+        } else if (tpl_terms[0] == atom_rsa_pss_saltlen) {
+            if (!enif_get_int(env, tpl_terms[1], &(opt->rsa_pss_saltlen)))
+                goto bad_arg;
+            if (opt->rsa_pss_saltlen < -2)
+                goto bad_arg;
+
+        } else {
+            goto bad_arg;
+        }
+    }
+
+    return PKEY_OK;
+
+ bad_arg:
+    return PKEY_BADARG;
+}
+
+static int get_pkey_private_key(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_TERM key, EVP_PKEY **pkey)
+{
+    EVP_PKEY *result = NULL;
+    RSA *rsa = NULL;
+#ifdef HAVE_DSA
+    DSA *dsa = NULL;
+#endif
+#if defined(HAVE_EC)
+    EC_KEY *ec = NULL;
+#endif
+    char *id = NULL;
+    char *password = NULL;
+
+    if (enif_is_map(env, key)) {
+#ifdef HAS_ENGINE_SUPPORT
+        /* Use key stored in engine */
+        ENGINE *e;
+
+        if (!get_engine_and_key_id(env, key, &id, &e))
+            goto err;
+
+        password = get_key_password(env, key);
+        result = ENGINE_load_private_key(e, id, NULL, password);
+
+#else
+        return PKEY_BADARG;
+#endif
+    } else if (algorithm == atom_rsa) {
+        if ((rsa = RSA_new()) == NULL)
+            goto err;
+
+        if (!get_rsa_private_key(env, key, rsa))
+            goto err;
+        if ((result = EVP_PKEY_new()) == NULL)
+            goto err;
+        if (EVP_PKEY_assign_RSA(result, rsa) != 1)
+            goto err;
+        /* On success, result owns rsa */
+        rsa = NULL;
+
+    } else if (algorithm == atom_ecdsa) {
+#if defined(HAVE_EC)
+	const ERL_NIF_TERM *tpl_terms;
+	int tpl_arity;
+
+        if (!enif_get_tuple(env, key, &tpl_arity, &tpl_terms))
+            goto err;
+        if (tpl_arity != 2)
+            goto err;
+        if (!enif_is_tuple(env, tpl_terms[0]))
+            goto err;
+        if (!enif_is_binary(env, tpl_terms[1]))
+            goto err;
+        if (!get_ec_key(env, tpl_terms[0], tpl_terms[1], atom_undefined, &ec))
+            goto err;
+
+        if ((result = EVP_PKEY_new()) == NULL)
+            goto err;
+        if (EVP_PKEY_assign_EC_KEY(result, ec) != 1)
+            goto err;
+        /* On success, result owns ec */
+        ec = NULL;
+
+#else
+	return PKEY_NOTSUP;
+#endif
+    } else if (algorithm == atom_eddsa) {
+#ifdef HAVE_EDDSA
+        if (!FIPS_mode())
+            {
+                if (!get_eddsa_key(env, 0, key, &result))
+                    goto err;
+                else
+                    goto done; // Not nice....
+            }
+#else
+            return PKEY_NOTSUP;
+#endif
+    } else if (algorithm == atom_dss) {
+#ifdef HAVE_DSA
+        if ((dsa = DSA_new()) == NULL)
+            goto err;
+        if (!get_dss_private_key(env, key, dsa))
+            goto err;
+
+        if ((result = EVP_PKEY_new()) == NULL)
+            goto err;
+        if (EVP_PKEY_assign_DSA(result, dsa) != 1)
+            goto err;
+        /* On success, result owns dsa */
+        dsa = NULL;
+
+    } else {
+#endif
+	return PKEY_BADARG;
+    }
+    goto done;
+
+ err:
+    if (result)
+        EVP_PKEY_free(result);
+    result = NULL;
+
+ done:
+    if (password)
+        enif_free(password);
+    if (id)
+        enif_free(id);
+    if (rsa)
+        RSA_free(rsa);
+#ifdef HAVE_DSA
+    if (dsa)
+        DSA_free(dsa);
+#endif
+#ifdef HAVE_EC
+    if (ec)
+        EC_KEY_free(ec);
+#endif
+
+    if (result == NULL) {
+        return PKEY_BADARG;
+    } else {
+        *pkey = result;
+        return PKEY_OK;
+    }
+}
+
+static int get_pkey_public_key(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_TERM key,
+			       EVP_PKEY **pkey)
+{
+    EVP_PKEY *result = NULL;
+    RSA *rsa = NULL;
+#ifdef HAVE_DSA
+    DSA *dsa = NULL;
+#endif
+#if defined(HAVE_EC)
+    EC_KEY *ec = NULL;
+#endif
+    char *id = NULL;
+    char *password = NULL;
+
+    if (enif_is_map(env, key)) {
+#ifdef HAS_ENGINE_SUPPORT
+        /* Use key stored in engine */
+        ENGINE *e;
+
+        if (!get_engine_and_key_id(env, key, &id, &e))
+            goto err;
+
+        password = get_key_password(env, key);
+        result = ENGINE_load_public_key(e, id, NULL, password);
+
+#else
+        return PKEY_BADARG;
+#endif
+    } else  if (algorithm == atom_rsa) {
+        if ((rsa = RSA_new()) == NULL)
+            goto err;
+
+        if (!get_rsa_public_key(env, key, rsa))
+            goto err;
+
+        if ((result = EVP_PKEY_new()) == NULL)
+            goto err;
+        if (EVP_PKEY_assign_RSA(result, rsa) != 1)
+            goto err;
+        /* On success, result owns rsa */
+        rsa = NULL;
+
+    } else if (algorithm == atom_ecdsa) {
+#if defined(HAVE_EC)
+	const ERL_NIF_TERM *tpl_terms;
+	int tpl_arity;
+
+        if (!enif_get_tuple(env, key, &tpl_arity, &tpl_terms))
+            goto err;
+        if (tpl_arity != 2)
+            goto err;
+        if (!enif_is_tuple(env, tpl_terms[0]))
+            goto err;
+        if (!enif_is_binary(env, tpl_terms[1]))
+            goto err;
+        if (!get_ec_key(env, tpl_terms[0], atom_undefined, tpl_terms[1], &ec))
+            goto err;
+
+        if ((result = EVP_PKEY_new()) == NULL)
+            goto err;
+
+        if (EVP_PKEY_assign_EC_KEY(result, ec) != 1)
+            goto err;
+        /* On success, result owns ec */
+        ec = NULL;
+
+#else
+	return PKEY_NOTSUP;
+#endif
+    } else if (algorithm == atom_eddsa) {
+#ifdef HAVE_EDDSA
+        if (!FIPS_mode()) {
+            if (!get_eddsa_key(env, 1, key, &result))
+                goto err;
+        }
+#else
+	return PKEY_NOTSUP;
+#endif
+    } else if (algorithm == atom_dss) {
+#ifdef HAVE_DSA
+        if ((dsa = DSA_new()) == NULL)
+            goto err;
+
+        if (!get_dss_public_key(env, key, dsa))
+            goto err;
+
+        if ((result = EVP_PKEY_new()) == NULL)
+            goto err;
+        if (EVP_PKEY_assign_DSA(result, dsa) != 1)
+            goto err;
+        /* On success, result owns dsa */
+        dsa = NULL;
+#else
+        return PKEY_NOTSUP;
+#endif
+    } else {
+	return PKEY_BADARG;
+    }
+
+    goto done;
+
+ err:
+    if (result)
+        EVP_PKEY_free(result);
+    result = NULL;
+
+ done:
+    if (password)
+        enif_free(password);
+    if (id)
+        enif_free(id);
+    if (rsa)
+        RSA_free(rsa);
+#ifdef HAVE_DSA
+    if (dsa)
+        DSA_free(dsa);
+#endif
+#ifdef HAVE_EC
+    if (ec)
+        EC_KEY_free(ec);
+#endif
+
+    if (result == NULL) {
+        return PKEY_BADARG;
+    } else {
+        *pkey = result;
+        return PKEY_OK;
+    }
+}
+
+ERL_NIF_TERM pkey_sign_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
+{/* (Algorithm, Type, Data|{digest,Digest}, Key|#{}, Options) */
+    int i;
+    int sig_bin_alloc = 0;
+    ERL_NIF_TERM ret;
+    const EVP_MD *md = NULL;
+    unsigned char md_value[EVP_MAX_MD_SIZE];
+    EVP_PKEY *pkey = NULL;
+#ifdef HAVE_EDDSA
+    EVP_MD_CTX *mdctx = NULL;
+#endif
+#ifdef HAS_EVP_PKEY_CTX
+    EVP_PKEY_CTX *ctx = NULL;
+    size_t siglen;
+#else
+    int len;
+    unsigned int siglen;
+#endif
+    PKeySignOptions sig_opt;
+    ErlNifBinary sig_bin; /* signature */
+    unsigned char *tbs; /* data to be signed */
+    size_t tbslen;
+    RSA *rsa = NULL;
+#ifdef HAVE_DSA
+    DSA *dsa = NULL;
+#endif
+#if defined(HAVE_EC)
+    EC_KEY *ec = NULL;
+#endif
+/*char buf[1024];
+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);
+*/
+
+#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);
+    switch (i) {
+    case PKEY_OK:
+        break;
+    case PKEY_NOTSUP:
+        goto notsup;
+    default:
+        goto bad_arg;
+    }
+
+    i = get_pkey_sign_options(env, argv[0], argv[4], md, &sig_opt);
+    switch (i) {
+    case PKEY_OK:
+        break;
+    case PKEY_NOTSUP:
+        goto notsup;
+    default:
+        goto bad_arg;
+    }
+
+    if (get_pkey_private_key(env, argv[0], argv[3], &pkey) != PKEY_OK)
+        goto bad_arg;
+
+#ifdef HAS_EVP_PKEY_CTX
+    if ((ctx = EVP_PKEY_CTX_new(pkey, NULL)) == NULL)
+        goto err;
+
+    if (argv[0] != atom_eddsa) {
+        if (EVP_PKEY_sign_init(ctx) != 1)
+            goto err;
+        if (md != NULL) {
+            if (EVP_PKEY_CTX_set_signature_md(ctx, md) != 1)
+                goto err;
+        }
+    }
+
+    if (argv[0] == atom_rsa) {
+        if (EVP_PKEY_CTX_set_rsa_padding(ctx, sig_opt.rsa_padding) != 1)
+            goto err;
+# ifdef HAVE_RSA_PKCS1_PSS_PADDING
+	if (sig_opt.rsa_padding == RSA_PKCS1_PSS_PADDING) {
+            if (sig_opt.rsa_mgf1_md != NULL) {
+# ifdef HAVE_RSA_MGF1_MD
+                if (EVP_PKEY_CTX_set_rsa_mgf1_md(ctx, sig_opt.rsa_mgf1_md) != 1)
+                    goto err;
+# else
+                goto notsup;
+# endif
+            }
+            if (sig_opt.rsa_pss_saltlen > -2) {
+                if (EVP_PKEY_CTX_set_rsa_pss_saltlen(ctx, sig_opt.rsa_pss_saltlen) != 1)
+                    goto err;
+            }
+        }
+#endif
+    }
+
+    if (argv[0] == atom_eddsa) {
+#ifdef HAVE_EDDSA
+        if (!FIPS_mode()) {
+            if ((mdctx = EVP_MD_CTX_new()) == NULL)
+                goto err;
+
+            if (EVP_DigestSignInit(mdctx, NULL, NULL, NULL, pkey) != 1)
+                goto err;
+            if (EVP_DigestSign(mdctx, NULL, &siglen, tbs, tbslen) != 1)
+                goto err;
+            if (!enif_alloc_binary(siglen, &sig_bin))
+                goto err;
+            sig_bin_alloc = 1;
+
+            if (EVP_DigestSign(mdctx, sig_bin.data, &siglen, tbs, tbslen) != 1)
+                goto bad_key;
+        }
+        else
+#endif
+            goto notsup;
+    } else {
+        if (EVP_PKEY_sign(ctx, NULL, &siglen, tbs, tbslen) != 1)
+            goto err;
+        if (!enif_alloc_binary(siglen, &sig_bin))
+            goto err;
+        sig_bin_alloc = 1;
+
+        if (md != NULL) {
+            ERL_VALGRIND_ASSERT_MEM_DEFINED(tbs, EVP_MD_size(md));
+        }
+        if (EVP_PKEY_sign(ctx, sig_bin.data, &siglen, tbs, tbslen) != 1)
+            goto bad_key;
+    }
+#else
+/*printf("Old interface\r\n");
+ */
+    if (argv[0] == atom_rsa) {
+        if ((rsa = EVP_PKEY_get1_RSA(pkey)) == NULL)
+            goto err;
+        if ((len = RSA_size(rsa)) < 0)
+            goto err;
+        if (!enif_alloc_binary((size_t)len, &sig_bin))
+            goto err;
+        sig_bin_alloc = 1;
+
+        if ((len = EVP_MD_size(md)) < 0)
+            goto err;
+        ERL_VALGRIND_ASSERT_MEM_DEFINED(tbs, len);
+
+        if (RSA_sign(md->type, tbs, (unsigned int)len, sig_bin.data, &siglen, rsa) != 1)
+            goto bad_key;
+    } else if (argv[0] == atom_dss) {
+        if ((dsa = EVP_PKEY_get1_DSA(pkey)) == NULL)
+            goto err;
+        if ((len = DSA_size(dsa)) < 0)
+            goto err;
+        if (!enif_alloc_binary((size_t)len, &sig_bin))
+            goto err;
+        sig_bin_alloc = 1;
+
+        if ((len = EVP_MD_size(md)) < 0)
+            goto err;
+        ERL_VALGRIND_ASSERT_MEM_DEFINED(tbs, len);
+
+        if (DSA_sign(md->type, tbs, len, sig_bin.data, &siglen, dsa) != 1)
+            goto bad_key;
+    } else if (argv[0] == atom_ecdsa) {
+#if defined(HAVE_EC)
+        if ((ec = EVP_PKEY_get1_EC_KEY(pkey)) == NULL)
+            goto err;
+        if ((len = ECDSA_size(ec)) < 0)
+            goto err;
+        if (!enif_alloc_binary((size_t)len, &sig_bin))
+            goto err;
+        sig_bin_alloc = 1;
+
+        len = EVP_MD_size(md);
+        ERL_VALGRIND_ASSERT_MEM_DEFINED(tbs, len);
+
+        if (ECDSA_sign(md->type, tbs, len, sig_bin.data, &siglen, ec) != 1)
+            goto bad_key;
+#else
+        goto notsup;
+#endif
+    } else {
+        goto bad_arg;
+    }
+#endif
+
+    ERL_VALGRIND_MAKE_MEM_DEFINED(sig_bin.data, siglen);
+    if (siglen != sig_bin.size) {
+        if (!enif_realloc_binary(&sig_bin, siglen))
+            goto err;
+        ERL_VALGRIND_ASSERT_MEM_DEFINED(sig_bin.data, siglen);
+    }
+    ret = enif_make_binary(env, &sig_bin);
+    sig_bin_alloc = 0;
+    goto done;
+
+ bad_key:
+    ret = atom_error;
+    goto done;
+
+ notsup:
+    ret = atom_notsup;
+    goto done;
+
+ bad_arg:
+ err:
+    ret = enif_make_badarg(env);
+    goto done;
+
+ done:
+    if (sig_bin_alloc)
+        enif_release_binary(&sig_bin);
+    if (rsa)
+        RSA_free(rsa);
+#ifdef HAVE_DSA
+    if (dsa)
+        DSA_free(dsa);
+#endif
+#ifdef HAVE_EC
+    if (ec)
+        EC_KEY_free(ec);
+#endif
+#ifdef HAS_EVP_PKEY_CTX
+    if (ctx)
+        EVP_PKEY_CTX_free(ctx);
+#endif
+    if (pkey)
+        EVP_PKEY_free(pkey);
+
+#ifdef HAVE_EDDSA
+    if (mdctx)
+        EVP_MD_CTX_free(mdctx);
+#endif
+
+    return ret;
+}
+
+ERL_NIF_TERM pkey_verify_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
+{/* (Algorithm, Type, Data|{digest,Digest}, Signature, Key, Options) */
+    int i;
+    int result;
+    const EVP_MD *md = NULL;
+    unsigned char md_value[EVP_MAX_MD_SIZE];
+    EVP_PKEY *pkey = NULL;
+#ifdef HAS_EVP_PKEY_CTX
+    EVP_PKEY_CTX *ctx = NULL;
+#else
+#endif
+    PKeySignOptions sig_opt;
+    ErlNifBinary sig_bin; /* signature */
+    unsigned char *tbs; /* data to be signed */
+    size_t tbslen;
+    ERL_NIF_TERM ret;
+    RSA *rsa = NULL;
+#ifdef HAVE_DSA
+    DSA *dsa = NULL;
+#endif
+#ifdef HAVE_EC
+    EC_KEY *ec = NULL;
+#endif
+#ifdef HAVE_EDDSA
+    EVP_MD_CTX *mdctx = NULL;
+#endif
+
+#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);
+
+    i = get_pkey_sign_digest(env, argv[0], argv[1], argv[2], md_value, &md, &tbs, &tbslen);
+    switch (i) {
+    case PKEY_OK:
+        break;
+    case PKEY_NOTSUP:
+        goto notsup;
+    default:
+        goto bad_arg;
+    }
+
+    i = get_pkey_sign_options(env, argv[0], argv[5], md, &sig_opt);
+    switch (i) {
+    case PKEY_OK:
+        break;
+    case PKEY_NOTSUP:
+        goto notsup;
+    default:
+        goto bad_arg;
+    }
+
+    if (get_pkey_public_key(env, argv[0], argv[4], &pkey) != PKEY_OK) {
+        goto bad_arg;
+    }
+
+#ifdef HAS_EVP_PKEY_CTX
+/* printf("EVP interface\r\n");
+ */
+    if ((ctx = EVP_PKEY_CTX_new(pkey, NULL)) == NULL)
+        goto err;
+
+    if (argv[0] != atom_eddsa) {
+        if (EVP_PKEY_verify_init(ctx) != 1)
+            goto err;
+        if (md != NULL) {
+            if (EVP_PKEY_CTX_set_signature_md(ctx, md) != 1)
+                goto err;
+        }
+    }
+
+    if (argv[0] == atom_rsa) {
+        if (EVP_PKEY_CTX_set_rsa_padding(ctx, sig_opt.rsa_padding) != 1)
+            goto err;
+        if (sig_opt.rsa_padding == RSA_PKCS1_PSS_PADDING) {
+            if (sig_opt.rsa_mgf1_md != NULL) {
+# ifdef HAVE_RSA_MGF1_MD
+                if (EVP_PKEY_CTX_set_rsa_mgf1_md(ctx, sig_opt.rsa_mgf1_md) != 1)
+                    goto err;
+# else
+                goto notsup;
+# endif
+            }
+            if (sig_opt.rsa_pss_saltlen > -2) {
+                if (EVP_PKEY_CTX_set_rsa_pss_saltlen(ctx, sig_opt.rsa_pss_saltlen) != 1)
+                    goto err;
+            }
+        }
+    }
+
+    if (argv[0] == atom_eddsa) {
+#ifdef HAVE_EDDSA
+        if (!FIPS_mode()) {
+            if ((mdctx = EVP_MD_CTX_new()) == NULL)
+                goto err;
+
+            if (EVP_DigestVerifyInit(mdctx, NULL, NULL, NULL, pkey) != 1)
+                goto err;
+
+            result = EVP_DigestVerify(mdctx, sig_bin.data, sig_bin.size, tbs, tbslen);
+        }
+        else
+#endif
+        goto notsup;
+    } else {
+        if (md != NULL) {
+            ERL_VALGRIND_ASSERT_MEM_DEFINED(tbs, EVP_MD_size(md));
+        }
+        result = EVP_PKEY_verify(ctx, sig_bin.data, sig_bin.size, tbs, tbslen);
+    }
+#else
+/*printf("Old interface\r\n");
+*/
+    if (tbslen > INT_MAX)
+        goto bad_arg;
+    if (sig_bin.size > INT_MAX)
+        goto bad_arg;
+    if (argv[0] == atom_rsa) {
+        if ((rsa = EVP_PKEY_get1_RSA(pkey)) == NULL)
+            goto err;
+        result = RSA_verify(md->type, tbs, (unsigned int)tbslen, sig_bin.data, (unsigned int)sig_bin.size, rsa);
+    } else if (argv[0] == atom_dss) {
+        if ((dsa = EVP_PKEY_get1_DSA(pkey)) == NULL)
+            goto err;
+        result = DSA_verify(0, tbs, (int)tbslen, sig_bin.data, (int)sig_bin.size, dsa);
+    } else if (argv[0] == atom_ecdsa) {
+#if defined(HAVE_EC)
+        if ((ec = EVP_PKEY_get1_EC_KEY(pkey)) == NULL)
+            goto err;
+        result = ECDSA_verify(EVP_MD_type(md), tbs, (int)tbslen, sig_bin.data, (int)sig_bin.size, ec);
+#else
+        goto notsup;
+#endif
+    } else {
+        goto bad_arg;
+    }
+#endif
+
+    ret = (result == 1 ? atom_true : atom_false);
+    goto done;
+
+ bad_arg:
+ err:
+    ret = enif_make_badarg(env);
+    goto done;
+
+ notsup:
+    ret = atom_notsup;
+
+ done:
+#ifdef HAS_EVP_PKEY_CTX
+    if (ctx)
+        EVP_PKEY_CTX_free(ctx);
+#endif
+#ifdef HAVE_EDDSA
+    if (mdctx)
+        EVP_MD_CTX_free(mdctx);
+#endif
+    if (pkey)
+        EVP_PKEY_free(pkey);
+    if (rsa)
+        RSA_free(rsa);
+#ifdef HAVE_DSA
+    if (dsa)
+        DSA_free(dsa);
+#endif
+#ifdef HAVE_EC
+    if (ec)
+        EC_KEY_free(ec);
+#endif
+
+    return ret;
+}
+
+static int get_pkey_crypt_options(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_TERM options,
+				  PKeyCryptOptions *opt)
+{
+    ERL_NIF_TERM head, tail;
+    const ERL_NIF_TERM *tpl_terms;
+    int tpl_arity;
+    const EVP_MD *opt_md;
+
+    if (!enif_is_list(env, options))
+        goto bad_arg;
+
+    /* defaults */
+    if (algorithm == atom_rsa) {
+	opt->rsa_mgf1_md = NULL;
+	opt->rsa_oaep_label.data = NULL;
+	opt->rsa_oaep_label.size = 0;
+	opt->rsa_oaep_md = NULL;
+	opt->rsa_padding = RSA_PKCS1_PADDING;
+	opt->signature_md = NULL;
+    }
+
+    if (enif_is_empty_list(env, options))
+        return PKEY_OK;
+
+    if (algorithm != atom_rsa)
+        goto bad_arg;
+
+    tail = options;
+    while (enif_get_list_cell(env, tail, &head, &tail)) {
+        if (!enif_get_tuple(env, head, &tpl_arity, &tpl_terms))
+            goto bad_arg;
+        if (tpl_arity != 2)
+            goto bad_arg;
+
+        if (tpl_terms[0] == atom_rsa_padding
+            || tpl_terms[0] == atom_rsa_pad /* Compatibility */
+            ) {
+            if (tpl_terms[1] == atom_rsa_pkcs1_padding) {
+                opt->rsa_padding = RSA_PKCS1_PADDING;
+
+#ifdef HAVE_RSA_OAEP_PADDING
+            } else if (tpl_terms[1] == atom_rsa_pkcs1_oaep_padding) {
+                opt->rsa_padding = RSA_PKCS1_OAEP_PADDING;
+#endif
+
+#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) {
+                opt->rsa_padding = RSA_NO_PADDING;
+
+            } else {
+                goto bad_arg;
+            }
+
+        } else if (tpl_terms[0] == atom_signature_md && enif_is_atom(env, tpl_terms[1])) {
+            int i;
+            i = get_pkey_digest_type(env, algorithm, tpl_terms[1], &opt_md);
+            if (i != PKEY_OK) {
+                return i;
+            }
+            opt->signature_md = opt_md;
+
+        } else if (tpl_terms[0] == atom_rsa_mgf1_md && enif_is_atom(env, tpl_terms[1])) {
+            int i;
+#ifndef HAVE_RSA_MGF1_MD
+            if (tpl_terms[1] != atom_sha)
+                return PKEY_NOTSUP;
+#endif
+            i = get_pkey_digest_type(env, algorithm, tpl_terms[1], &opt_md);
+            if (i != PKEY_OK) {
+                return i;
+            }
+            opt->rsa_mgf1_md = opt_md;
+
+        } else if (tpl_terms[0] == atom_rsa_oaep_label
+                   && enif_inspect_binary(env, tpl_terms[1], &(opt->rsa_oaep_label))) {
+#ifdef HAVE_RSA_OAEP_MD
+            continue;
+#else
+            return PKEY_NOTSUP;
+#endif
+
+        } else if (tpl_terms[0] == atom_rsa_oaep_md && enif_is_atom(env, tpl_terms[1])) {
+            int i;
+#ifndef HAVE_RSA_OAEP_MD
+            if (tpl_terms[1] != atom_sha)
+                return PKEY_NOTSUP;
+#endif
+            i = get_pkey_digest_type(env, algorithm, tpl_terms[1], &opt_md);
+            if (i != PKEY_OK) {
+                return i;
+            }
+            opt->rsa_oaep_md = opt_md;
+
+        } else {
+            goto bad_arg;
+        }
+    }
+
+    return PKEY_OK;
+
+ bad_arg:
+    return PKEY_BADARG;
+}
+
+#ifdef HAVE_RSA_SSLV23_PADDING
+static size_t size_of_RSA(EVP_PKEY *pkey) {
+    int ret = 0;
+    RSA *rsa = NULL;
+
+    if ((rsa = EVP_PKEY_get1_RSA(pkey)) == NULL)
+        goto err;
+    ret = RSA_size(rsa);
+
+ err:
+    if (rsa)
+        RSA_free(rsa);
+
+    return (ret < 0) ? 0 : (size_t)ret;
+}
+#endif
+
+ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
+{/* (Algorithm, Data, PublKey=[E,N]|[E,N,D]|[E,N,D,P1,P2,E1,E2,C], Options, IsPrivate, IsEncrypt) */
+    ERL_NIF_TERM ret;
+    int i;
+    int result = 0;
+    int tmp_bin_alloc = 0;
+    int out_bin_alloc = 0;
+    EVP_PKEY *pkey = NULL;
+#ifdef HAS_EVP_PKEY_CTX
+    EVP_PKEY_CTX *ctx = NULL;
+#else
+    int len;
+    RSA *rsa = NULL;
+#endif
+    PKeyCryptOptions crypt_opt;
+    ErlNifBinary in_bin, out_bin, tmp_bin;
+    size_t outlen;
+#ifdef HAVE_RSA_SSLV23_PADDING
+    size_t tmplen;
+#endif
+    int is_private, is_encrypt;
+    int algo_init = 0;
+    unsigned char *label_copy = NULL;
+
+    ASSERT(argc == 6);
+
+    is_private = (argv[4] == atom_true);
+    is_encrypt = (argv[5] == atom_true);
+
+/* 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))
+        goto bad_arg;
+
+    i = get_pkey_crypt_options(env, argv[0], argv[3], &crypt_opt);
+    switch (i) {
+    case PKEY_OK:
+        break;
+    case PKEY_NOTSUP:
+        goto notsup;
+    default:
+        goto bad_arg;
+    }
+
+    if (is_private) {
+        if (get_pkey_private_key(env, argv[0], argv[2], &pkey) != PKEY_OK)
+            goto bad_arg;
+    } else {
+        if (get_pkey_public_key(env, argv[0], argv[2], &pkey) != PKEY_OK)
+            goto bad_arg;
+    }
+
+#ifdef HAS_EVP_PKEY_CTX
+    if ((ctx = EVP_PKEY_CTX_new(pkey, NULL)) == NULL)
+        goto err;
+
+/* enif_get_atom(env,argv[0],algo,1024,ERL_NIF_LATIN1);  */
+
+    if (is_private) {
+        if (is_encrypt) {
+            /* private encrypt */
+            if ((algo_init = EVP_PKEY_sign_init(ctx)) != 1)
+                goto bad_arg;
+        } else {
+            /* private decrypt */
+            if ((algo_init = EVP_PKEY_decrypt_init(ctx)) != 1)
+                goto bad_arg;
+        }
+    } else {
+        if (is_encrypt) {
+            /* public encrypt */
+            if ((algo_init = EVP_PKEY_encrypt_init(ctx)) != 1)
+                goto bad_arg;
+        } else {
+            /* public decrypt */
+            if ((algo_init = EVP_PKEY_verify_recover_init(ctx)) != 1)
+                goto bad_arg;
+        }
+    }
+
+    if (argv[0] == atom_rsa) {
+        if (crypt_opt.signature_md != NULL) {
+            if (EVP_PKEY_CTX_set_signature_md(ctx, crypt_opt.signature_md) != 1)
+                goto bad_arg;
+        }
+
+#ifdef HAVE_RSA_SSLV23_PADDING
+        if (crypt_opt.rsa_padding == RSA_SSLV23_PADDING) {
+            if (is_encrypt) {
+                tmplen = size_of_RSA(pkey);
+                if (tmplen < 1 || tmplen > INT_MAX)
+                    goto err;
+                if (!enif_alloc_binary(tmplen, &tmp_bin))
+                    goto err;
+                tmp_bin_alloc = 1;
+                if (in_bin.size > INT_MAX)
+                    goto err;
+                if (!RSA_padding_add_SSLv23(tmp_bin.data, (int)tmplen, in_bin.data, (int)in_bin.size))
+                    goto err;
+                in_bin = tmp_bin;
+            }
+            if (EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_NO_PADDING) != 1)
+                goto err;
+        } else
+#endif
+        {
+            if (EVP_PKEY_CTX_set_rsa_padding(ctx, crypt_opt.rsa_padding) != 1)
+                goto err;
+        }
+
+#ifdef HAVE_RSA_OAEP_MD
+        if (crypt_opt.rsa_padding == RSA_PKCS1_OAEP_PADDING) {
+            if (crypt_opt.rsa_oaep_md != NULL) {
+                if (EVP_PKEY_CTX_set_rsa_oaep_md(ctx, crypt_opt.rsa_oaep_md) != 1)
+                    goto err;
+            }
+
+            if (crypt_opt.rsa_mgf1_md != NULL) {
+                if (EVP_PKEY_CTX_set_rsa_mgf1_md(ctx, crypt_opt.rsa_mgf1_md) != 1)
+                    goto err;
+            }
+
+            if (crypt_opt.rsa_oaep_label.data != NULL && crypt_opt.rsa_oaep_label.size > 0) {
+                if (crypt_opt.rsa_oaep_label.size > INT_MAX)
+                    goto err;
+                if ((label_copy = OPENSSL_malloc(crypt_opt.rsa_oaep_label.size)) == NULL)
+                    goto err;
+
+                memcpy((void *)(label_copy), (const void *)(crypt_opt.rsa_oaep_label.data),
+                       crypt_opt.rsa_oaep_label.size);
+
+                if (EVP_PKEY_CTX_set0_rsa_oaep_label(ctx, label_copy,
+                                                     (int)crypt_opt.rsa_oaep_label.size) != 1)
+                    goto err;
+                /* On success, label_copy is owned by ctx */
+                label_copy = NULL;
+            }
+        }
+#endif
+    }
+
+    if (is_private) {
+        if (is_encrypt) {
+            /* private_encrypt */
+            result = EVP_PKEY_sign(ctx, NULL, &outlen, in_bin.data, in_bin.size);
+        } else {
+            /* private_decrypt */
+            result = EVP_PKEY_decrypt(ctx, NULL, &outlen, in_bin.data, in_bin.size);
+        }
+    } else {
+        if (is_encrypt) {
+            /* public_encrypt */
+            result = EVP_PKEY_encrypt(ctx, NULL, &outlen, in_bin.data, in_bin.size);
+        } else {
+            /* public_decrypt */
+            result = EVP_PKEY_verify_recover(ctx, NULL, &outlen, in_bin.data, in_bin.size);
+        }
+    }
+    /* fprintf(stderr,"i = %d %s:%d\r\n", i, __FILE__, __LINE__); */
+
+    if (result != 1)
+        goto err;
+
+    if (!enif_alloc_binary(outlen, &out_bin))
+        goto err;
+    out_bin_alloc = 1;
+
+    if (is_private) {
+        if (is_encrypt) {
+            /* private_encrypt */
+            result = EVP_PKEY_sign(ctx, out_bin.data, &outlen, in_bin.data, in_bin.size);
+        } else {
+            /* private_decrypt */
+            result = EVP_PKEY_decrypt(ctx, out_bin.data, &outlen, in_bin.data, in_bin.size);
+        }
+    } else {
+        if (is_encrypt) {
+            /* public_encrypt */
+            result = EVP_PKEY_encrypt(ctx, out_bin.data, &outlen, in_bin.data, in_bin.size);
+        } else {
+            /* public_decrypt */
+            result = EVP_PKEY_verify_recover(ctx, out_bin.data, &outlen, in_bin.data, in_bin.size);
+        }
+    }
+
+#else
+    /* Non-EVP cryptolib. Only support RSA */
+
+    if (argv[0] != atom_rsa) {
+        algo_init = -2;         /* exitcode: notsup */
+        goto bad_arg;
+    }
+
+    if ((rsa = EVP_PKEY_get1_RSA(pkey)) == NULL)
+        goto err;
+    if ((len = RSA_size(rsa)) < 0)
+        goto err;
+    if (!enif_alloc_binary((size_t)len, &out_bin))
+        goto err;
+    out_bin_alloc = 1;
+
+    if (in_bin.size > INT_MAX)
+        goto err;
+    if (is_private) {
+        if (is_encrypt) {
+            /* non-evp rsa private encrypt */
+            ERL_VALGRIND_ASSERT_MEM_DEFINED(in_bin.data,in_bin.size);
+            result = RSA_private_encrypt((int)in_bin.size, in_bin.data,
+                                    out_bin.data, rsa, crypt_opt.rsa_padding);
+            if (result > 0) {
+                ERL_VALGRIND_MAKE_MEM_DEFINED(out_bin.data, result);
+            }
+        } else {
+            /* non-evp rsa private decrypt */
+            result = RSA_private_decrypt((int)in_bin.size, in_bin.data,
+                                    out_bin.data, rsa, crypt_opt.rsa_padding);
+            if (result > 0) {
+                ERL_VALGRIND_MAKE_MEM_DEFINED(out_bin.data, result);
+                if (!enif_realloc_binary(&out_bin, (size_t)result))
+                    goto err;
+            }
+        }
+    } else {
+        if (is_encrypt) {
+            /* non-evp rsa public encrypt */
+            ERL_VALGRIND_ASSERT_MEM_DEFINED(in_bin.data,in_bin.size);
+            result = RSA_public_encrypt((int)in_bin.size, in_bin.data,
+                                   out_bin.data, rsa, crypt_opt.rsa_padding);
+            if (result > 0) {
+                ERL_VALGRIND_MAKE_MEM_DEFINED(out_bin.data, result);
+            }
+        } else {
+            /* non-evp rsa public decrypt */
+            result = RSA_public_decrypt((int)in_bin.size, in_bin.data,
+                                   out_bin.data, rsa, crypt_opt.rsa_padding);
+            if (result > 0) {
+                ERL_VALGRIND_MAKE_MEM_DEFINED(out_bin.data, result);
+                if (!enif_realloc_binary(&out_bin, (size_t)result))
+                    goto err;
+            }
+        }
+    }
+
+    outlen = (size_t)result;
+#endif
+
+    if ((result > 0) && argv[0] == atom_rsa && !is_encrypt) {
+#ifdef HAVE_RSA_SSLV23_PADDING
+        if (crypt_opt.rsa_padding == RSA_SSLV23_PADDING) {
+            unsigned char *p;
+
+            tmplen = size_of_RSA(pkey);
+            if (tmplen < 1 || tmplen > INT_MAX)
+                goto err;
+            if (!enif_alloc_binary(tmplen, &tmp_bin))
+                goto err;
+            tmp_bin_alloc = 1;
+            if (out_bin.size > INT_MAX)
+                goto err;
+
+            p = out_bin.data;
+            p++;
+
+            result = RSA_padding_check_SSLv23(tmp_bin.data, (int)tmplen, p, (int)out_bin.size - 1, (int)tmplen);
+            if (result >= 0) {
+                outlen = (size_t)result;
+                in_bin = out_bin;
+                out_bin = tmp_bin;
+                tmp_bin = in_bin;
+                result = 1;
+            }
+        }
+#endif
+    }
+
+    if (result > 0) {
+        ERL_VALGRIND_MAKE_MEM_DEFINED(out_bin.data, outlen);
+        if (outlen != out_bin.size) {
+            if (!enif_realloc_binary(&out_bin, outlen))
+                goto err;
+            ERL_VALGRIND_ASSERT_MEM_DEFINED(out_bin.data, outlen);
+        }
+        ret = enif_make_binary(env, &out_bin);
+        out_bin_alloc = 0;
+    } else {
+        ret = atom_error;
+    }
+    goto done;
+
+ notsup:
+    ret = atom_notsup;
+    goto done;
+
+ bad_arg:
+ err:
+    if (algo_init == -2)
+        ret = atom_notsup;
+    else
+        ret = enif_make_badarg(env);
+
+ done:
+    if (out_bin_alloc)
+        enif_release_binary(&out_bin);
+    if (tmp_bin_alloc)
+        enif_release_binary(&tmp_bin);
+
+#ifdef HAS_EVP_PKEY_CTX
+    if (ctx)
+        EVP_PKEY_CTX_free(ctx);
+#else
+    if (rsa)
+        RSA_free(rsa);
+#endif
+    if (pkey)
+        EVP_PKEY_free(pkey);
+
+    if (label_copy)
+        OPENSSL_free(label_copy);
+
+    return ret;
+}
+
+ERL_NIF_TERM privkey_to_pubkey_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{ /* (Algorithm, PrivKey | KeyMap) */
+    ERL_NIF_TERM ret;
+    EVP_PKEY *pkey = NULL;
+    RSA *rsa = NULL;
+#ifdef HAVE_DSA
+    DSA *dsa = NULL;
+#endif
+    ERL_NIF_TERM result[8];
+
+    ASSERT(argc == 2);
+
+    if (get_pkey_private_key(env, argv[0], argv[1], &pkey) != PKEY_OK)
+        goto bad_arg;
+
+    if (argv[0] == atom_rsa) {
+        const BIGNUM *n = NULL, *e = NULL, *d = NULL;
+
+        if ((rsa = EVP_PKEY_get1_RSA(pkey)) == NULL)
+            goto err;
+
+        RSA_get0_key(rsa, &n, &e, &d);
+
+        // Exponent E
+        if ((result[0] = bin_from_bn(env, e)) == atom_error)
+            goto err;
+        // Modulus N = p*q
+        if ((result[1] = bin_from_bn(env, n)) == atom_error)
+            goto err;
+
+        ret = enif_make_list_from_array(env, result, 2);
+
+#ifdef HAVE_DSA
+    } else if (argv[0] == atom_dss) {
+        const BIGNUM *p = NULL, *q = NULL, *g = NULL, *pub_key = NULL;
+
+        if ((dsa = EVP_PKEY_get1_DSA(pkey)) == NULL)
+            goto err;
+
+        DSA_get0_pqg(dsa, &p, &q, &g);
+        DSA_get0_key(dsa, &pub_key, NULL);
+
+        if ((result[0] = bin_from_bn(env, p)) == atom_error)
+            goto err;
+        if ((result[1] = bin_from_bn(env, q)) == atom_error)
+            goto err;
+        if ((result[2] = bin_from_bn(env, g)) == atom_error)
+            goto err;
+        if ((result[3] = bin_from_bn(env, pub_key)) == atom_error)
+            goto err;
+
+        ret = enif_make_list_from_array(env, result, 4);
+#endif
+    } 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
+        goto bad_arg;
+    } else {
+        goto bad_arg;
+    }
+
+    goto done;
+
+ bad_arg:
+ err:
+    ret = enif_make_badarg(env);
+
+ done:
+    if (rsa)
+        RSA_free(rsa);
+#ifdef HAVE_DSA
+    if (dsa)
+        DSA_free(dsa);
+#endif
+    if (pkey)
+        EVP_PKEY_free(pkey);
+
+    return ret;
+}
diff --git a/lib/crypto/c_src/pkey.h b/lib/crypto/c_src/pkey.h
new file mode 100644
index 0000000000..f647a4a160
--- /dev/null
+++ b/lib/crypto/c_src/pkey.h
@@ -0,0 +1,31 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_PKEY_H__
+#define E_PKEY_H__ 1
+
+#include "common.h"
+
+ERL_NIF_TERM pkey_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM pkey_verify_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM privkey_to_pubkey_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+#endif /* E_PKEY_H__ */
diff --git a/lib/crypto/c_src/rand.c b/lib/crypto/c_src/rand.c
new file mode 100644
index 0000000000..3812ae0991
--- /dev/null
+++ b/lib/crypto/c_src/rand.c
@@ -0,0 +1,149 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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 "rand.h"
+#include "bn.h"
+
+ERL_NIF_TERM strong_rand_bytes_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Bytes) */
+    unsigned bytes;
+    unsigned char* data;
+    ERL_NIF_TERM ret;
+
+    ASSERT(argc == 1);
+
+    if (!enif_get_uint(env, argv[0], &bytes))
+        goto bad_arg;
+    if (bytes > INT_MAX)
+        goto bad_arg;
+
+    if ((data = enif_make_new_binary(env, bytes, &ret)) == NULL)
+        goto err;
+    if (RAND_bytes(data, (int)bytes) != 1)
+        goto err;
+
+    ERL_VALGRIND_MAKE_MEM_DEFINED(data, bytes);
+    return ret;
+
+ bad_arg:
+    return enif_make_badarg(env);
+
+ err:
+    return atom_false;
+}
+
+ERL_NIF_TERM strong_rand_range_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Range) */
+    BIGNUM *bn_range = NULL, *bn_rand = NULL;
+    ERL_NIF_TERM ret;
+
+    ASSERT(argc == 1);
+
+    if (!get_bn_from_bin(env, argv[0], &bn_range))
+        goto bad_arg;
+
+    if ((bn_rand = BN_new()) == NULL)
+        goto err;
+    if (!BN_rand_range(bn_rand, bn_range))
+        goto err;
+
+    if ((ret = bin_from_bn(env, bn_rand)) == atom_error)
+        goto err;
+    goto done;
+
+ bad_arg:
+    return enif_make_badarg(env);
+
+ err:
+    ret = atom_false;
+
+ done:
+    if (bn_rand)
+        BN_free(bn_rand);
+    if (bn_range)
+        BN_free(bn_range);
+    return ret;
+}
+
+ERL_NIF_TERM rand_uniform_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Lo,Hi) */
+    BIGNUM *bn_from = NULL, *bn_to = NULL, *bn_rand = NULL;
+    unsigned char* data;
+    int dlen;
+    ERL_NIF_TERM ret;
+
+    ASSERT(argc == 2);
+
+    if (!get_bn_from_mpint(env, argv[0], &bn_from))
+        goto bad_arg;
+    if (!get_bn_from_mpint(env, argv[1], &bn_rand))
+        goto bad_arg;
+
+    if ((bn_to = BN_new()) == NULL)
+        goto err;
+
+    if (!BN_sub(bn_to, bn_rand, bn_from))
+        goto err;
+    if (!BN_pseudo_rand_range(bn_rand, bn_to))
+        goto err;
+    if (!BN_add(bn_rand, bn_rand, bn_from))
+        goto err;
+
+    if ((dlen = BN_num_bytes(bn_rand)) < 0)
+        goto err;
+    if ((data = enif_make_new_binary(env, (size_t)dlen+4, &ret)) == NULL)
+        goto err;
+
+    put_uint32(data, (unsigned int)dlen);
+    BN_bn2bin(bn_rand, data+4);
+    ERL_VALGRIND_MAKE_MEM_DEFINED(data+4, dlen);
+    goto done;
+
+ bad_arg:
+ err:
+    ret = enif_make_badarg(env);
+
+ done:
+    if (bn_rand)
+        BN_free(bn_rand);
+    if (bn_from)
+        BN_free(bn_from);
+    if (bn_to)
+        BN_free(bn_to);
+    return ret;
+}
+
+ERL_NIF_TERM rand_seed_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Seed) */
+    ErlNifBinary seed_bin;
+
+    ASSERT(argc == 1);
+
+    if (!enif_inspect_binary(env, argv[0], &seed_bin))
+        goto bad_arg;
+    if (seed_bin.size > INT_MAX)
+        goto bad_arg;
+
+    RAND_seed(seed_bin.data, (int)seed_bin.size);
+    return atom_ok;
+
+ bad_arg:
+    return enif_make_badarg(env);
+}
diff --git a/lib/crypto/c_src/rand.h b/lib/crypto/c_src/rand.h
new file mode 100644
index 0000000000..9c23d343ec
--- /dev/null
+++ b/lib/crypto/c_src/rand.h
@@ -0,0 +1,31 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_RAND_H__
+#define E_RAND_H__ 1
+
+#include "common.h"
+
+ERL_NIF_TERM strong_rand_bytes_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM strong_rand_range_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM rand_uniform_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM rand_seed_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+#endif /* E_RAND_H__ */
diff --git a/lib/crypto/c_src/rsa.c b/lib/crypto/c_src/rsa.c
new file mode 100644
index 0000000000..e9f29aa496
--- /dev/null
+++ b/lib/crypto/c_src/rsa.c
@@ -0,0 +1,282 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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 "rsa.h"
+#include "bn.h"
+
+static ERL_NIF_TERM rsa_generate_key(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM put_rsa_private_key(ErlNifEnv* env, const RSA *rsa);
+static int check_erlang_interrupt(int maj, int min, BN_GENCB *ctxt);
+
+int get_rsa_private_key(ErlNifEnv* env, ERL_NIF_TERM key, RSA *rsa)
+{
+    /* key=[E,N,D]|[E,N,D,P1,P2,E1,E2,C] */
+    ERL_NIF_TERM head, tail;
+    BIGNUM *e = NULL, *n = NULL, *d = NULL;
+    BIGNUM *p = NULL, *q = NULL;
+    BIGNUM *dmp1 = NULL, *dmq1 = NULL, *iqmp = NULL;
+
+    if (!enif_get_list_cell(env, key, &head, &tail))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, head, &e))
+        goto bad_arg;
+    if (!enif_get_list_cell(env, tail, &head, &tail))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, head, &n))
+        goto bad_arg;
+    if (!enif_get_list_cell(env, tail, &head, &tail))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, head, &d))
+        goto bad_arg;
+
+    if (!RSA_set0_key(rsa, n, e, d))
+        goto err;
+    /* rsa now owns n, e, and d */
+    n = NULL;
+    e = NULL;
+    d = NULL;
+
+    if (enif_is_empty_list(env, tail))
+        return 1;
+
+    if (!enif_get_list_cell(env, tail, &head, &tail))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, head, &p))
+        goto bad_arg;
+    if (!enif_get_list_cell(env, tail, &head, &tail))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, head, &q))
+        goto bad_arg;
+    if (!enif_get_list_cell(env, tail, &head, &tail))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, head, &dmp1))
+        goto bad_arg;
+    if (!enif_get_list_cell(env, tail, &head, &tail))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, head, &dmq1))
+        goto bad_arg;
+    if (!enif_get_list_cell(env, tail, &head, &tail))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, head, &iqmp))
+        goto bad_arg;
+    if (!enif_is_empty_list(env, tail))
+        goto bad_arg;
+
+    if (!RSA_set0_factors(rsa, p, q))
+        goto err;
+    /* rsa now owns p and q */
+    p = NULL;
+    q = NULL;
+
+    if (!RSA_set0_crt_params(rsa, dmp1, dmq1, iqmp))
+        goto err;
+    /* rsa now owns dmp1, dmq1, and iqmp */
+    dmp1 = NULL;
+    dmq1 = NULL;
+    iqmp = NULL;
+
+    return 1;
+
+ bad_arg:
+ err:
+    if (e)
+        BN_free(e);
+    if (n)
+        BN_free(n);
+    if (d)
+        BN_free(d);
+    if (p)
+        BN_free(p);
+    if (q)
+        BN_free(q);
+    if (dmp1)
+        BN_free(dmp1);
+    if (dmq1)
+        BN_free(dmq1);
+    if (iqmp)
+        BN_free(iqmp);
+
+    return 0;
+}
+
+int get_rsa_public_key(ErlNifEnv* env, ERL_NIF_TERM key, RSA *rsa)
+{
+    /* key=[E,N] */
+    ERL_NIF_TERM head, tail;
+    BIGNUM *e = NULL, *n = NULL;
+
+    if (!enif_get_list_cell(env, key, &head, &tail))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, head, &e))
+        goto bad_arg;
+    if (!enif_get_list_cell(env, tail, &head, &tail))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, head, &n))
+        goto bad_arg;
+    if (!enif_is_empty_list(env, tail))
+        goto bad_arg;
+
+    if (!RSA_set0_key(rsa, n, e, NULL))
+        goto err;
+    /* rsa now owns n and e */
+    n = NULL;
+    e = NULL;
+
+    return 1;
+
+ bad_arg:
+ err:
+    if (e)
+        BN_free(e);
+    if (n)
+        BN_free(n);
+
+    return 0;
+}
+
+/* Creates a term which can be parsed by get_rsa_private_key(). This is a list of plain integer binaries (not mpints). */
+static ERL_NIF_TERM put_rsa_private_key(ErlNifEnv* env, const RSA *rsa)
+{
+    ERL_NIF_TERM result[8];
+    const BIGNUM *n = NULL, *e = NULL, *d = NULL, *p = NULL, *q = NULL, *dmp1 = NULL, *dmq1 = NULL, *iqmp = NULL;
+
+    /* Return at least [E,N,D] */
+    RSA_get0_key(rsa, &n, &e, &d);
+
+    if ((result[0] = bin_from_bn(env, e)) == atom_error)  // Exponent E
+        goto err;
+    if ((result[1] = bin_from_bn(env, n)) == atom_error)  // Modulus N = p*q
+        goto err;
+    if ((result[2] = bin_from_bn(env, d)) == atom_error)  // Exponent D
+        goto err;
+
+    /* Check whether the optional additional parameters are available */
+    RSA_get0_factors(rsa, &p, &q);
+    RSA_get0_crt_params(rsa, &dmp1, &dmq1, &iqmp);
+
+    if (p && q && dmp1 && dmq1 && iqmp) {
+        if ((result[3] = bin_from_bn(env, p)) == atom_error)     // Factor p
+            goto err;
+        if ((result[4] = bin_from_bn(env, q)) == atom_error)     // Factor q
+            goto err;
+        if ((result[5] = bin_from_bn(env, dmp1)) == atom_error)  // D mod (p-1)
+            goto err;
+        if ((result[6] = bin_from_bn(env, dmq1)) == atom_error)  // D mod (q-1)
+            goto err;
+        if ((result[7] = bin_from_bn(env, iqmp)) == atom_error)  // (1/q) mod p
+            goto err;
+
+	return enif_make_list_from_array(env, result, 8);
+    } else {
+	return enif_make_list_from_array(env, result, 3);
+    }
+
+ err:
+    return enif_make_badarg(env);
+}
+
+static int check_erlang_interrupt(int maj, int min, BN_GENCB *ctxt)
+{
+    ErlNifEnv *env = BN_GENCB_get_arg(ctxt);
+
+    if (!enif_is_current_process_alive(env)) {
+	return 0;
+    } else {
+	return 1;
+    }
+}
+
+static ERL_NIF_TERM rsa_generate_key(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (ModulusSize, PublicExponent) */
+    ERL_NIF_TERM ret;
+    int modulus_bits;
+    BIGNUM *pub_exp = NULL, *three = NULL;
+    RSA *rsa = NULL;
+    BN_GENCB *intr_cb = NULL;
+#ifndef HAVE_OPAQUE_BN_GENCB
+    BN_GENCB intr_cb_buf;
+#endif
+
+    ASSERT(argc == 2);
+
+    if (!enif_get_int(env, argv[0], &modulus_bits))
+        goto bad_arg;
+    if (modulus_bits < 256)
+        goto bad_arg;
+    if (!get_bn_from_bin(env, argv[1], &pub_exp))
+        goto bad_arg;
+
+    /* Make sure the public exponent is large enough (at least 3).
+     * Without this, RSA_generate_key_ex() can run forever. */
+    if ((three = BN_new()) == NULL)
+        goto err;
+    if (!BN_set_word(three, 3))
+        goto err;
+    if (BN_cmp(pub_exp, three) < 0)
+        goto err;
+
+    /* For large keys, prime generation can take many seconds. Set up
+     * the callback which we use to test whether the process has been
+     * interrupted. */
+#ifdef HAVE_OPAQUE_BN_GENCB
+    if ((intr_cb = BN_GENCB_new()) == NULL)
+        goto err;
+#else
+    intr_cb = &intr_cb_buf;
+#endif
+    BN_GENCB_set(intr_cb, check_erlang_interrupt, env);
+
+    if ((rsa = RSA_new()) == NULL)
+        goto err;
+
+    if (!RSA_generate_key_ex(rsa, modulus_bits, pub_exp, intr_cb))
+        goto err;
+
+    ret = put_rsa_private_key(env, rsa);
+    goto done;
+
+ bad_arg:
+    return enif_make_badarg(env);
+
+ err:
+    ret = atom_error;
+
+ done:
+    if (pub_exp)
+        BN_free(pub_exp);
+    if (three)
+        BN_free(three);
+#ifdef HAVE_OPAQUE_BN_GENCB
+    if (intr_cb)
+        BN_GENCB_free(intr_cb);
+#endif
+    if (rsa)
+        RSA_free(rsa);
+    return ret;
+}
+
+ERL_NIF_TERM rsa_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    /* RSA key generation can take a long time (>1 sec for a large
+     * modulus), so schedule it as a CPU-bound operation. */
+    return enif_schedule_nif(env, "rsa_generate_key",
+			     ERL_NIF_DIRTY_JOB_CPU_BOUND,
+			     rsa_generate_key, argc, argv);
+}
diff --git a/lib/crypto/c_src/rsa.h b/lib/crypto/c_src/rsa.h
new file mode 100644
index 0000000000..69c02aa2cb
--- /dev/null
+++ b/lib/crypto/c_src/rsa.h
@@ -0,0 +1,31 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_RSA_H__
+#define E_RSA_H__ 1
+
+#include "common.h"
+
+int get_rsa_public_key(ErlNifEnv* env, ERL_NIF_TERM key, RSA *rsa);
+int get_rsa_private_key(ErlNifEnv* env, ERL_NIF_TERM key, RSA *rsa);
+
+ERL_NIF_TERM rsa_generate_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+#endif /* E_RSA_H__ */
diff --git a/lib/crypto/c_src/srp.c b/lib/crypto/c_src/srp.c
new file mode 100644
index 0000000000..2979048006
--- /dev/null
+++ b/lib/crypto/c_src/srp.c
@@ -0,0 +1,307 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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 "srp.h"
+#include "bn.h"
+
+ERL_NIF_TERM srp_value_B_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Multiplier, Verifier, Generator, Exponent, Prime) */
+    BIGNUM *bn_verifier = NULL;
+    BIGNUM *bn_exponent = NULL, *bn_generator = NULL, *bn_prime = NULL, *bn_multiplier = NULL, *bn_result = NULL;
+    BN_CTX *bn_ctx = NULL;
+    unsigned char* ptr;
+    int dlen;
+    ERL_NIF_TERM ret;
+
+    CHECK_NO_FIPS_MODE();
+
+    ASSERT(argc == 5);
+
+    if (!get_bn_from_bin(env, argv[0], &bn_multiplier))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, argv[1], &bn_verifier))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, argv[2], &bn_generator))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, argv[3], &bn_exponent))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, argv[4], &bn_prime))
+        goto bad_arg;
+
+    if ((bn_result = BN_new()) == NULL)
+        goto err;
+    if ((bn_ctx = BN_CTX_new()) == NULL)
+        goto err;
+
+    /* B = k*v + g^b % N */
+
+    /* k * v */
+    if (!BN_mod_mul(bn_multiplier, bn_multiplier, bn_verifier, bn_prime, bn_ctx))
+        goto err;
+
+    /* g^b % N */
+    if (!BN_mod_exp(bn_result, bn_generator, bn_exponent, bn_prime, bn_ctx))
+        goto err;
+
+    /* k*v + g^b % N */
+    if (!BN_mod_add(bn_result, bn_result, bn_multiplier, bn_prime, bn_ctx))
+        goto err;
+
+    /* check that B % N != 0, reuse bn_multiplier */
+    if (!BN_nnmod(bn_multiplier, bn_result, bn_prime, bn_ctx))
+        goto err;
+
+    if (BN_is_zero(bn_multiplier))
+        goto err;
+
+    if ((dlen = BN_num_bytes(bn_result)) < 0)
+        goto err;
+    if ((ptr = enif_make_new_binary(env, (size_t)dlen, &ret)) == NULL)
+        goto err;
+
+    if (BN_bn2bin(bn_result, ptr) < 0)
+        goto err;
+
+    goto done;
+
+ bad_arg:
+    ret = enif_make_badarg(env);
+    goto done;
+
+ err:
+    ret = atom_error;
+
+ done:
+    if (bn_multiplier)
+        BN_free(bn_multiplier);
+    if (bn_verifier)
+        BN_free(bn_verifier);
+    if (bn_generator)
+        BN_free(bn_generator);
+    if (bn_exponent)
+        BN_free(bn_exponent);
+    if (bn_prime)
+        BN_free(bn_prime);
+    if (bn_result)
+        BN_free(bn_result);
+    if (bn_ctx)
+        BN_CTX_free(bn_ctx);
+
+    return ret;
+}
+
+ERL_NIF_TERM srp_user_secret_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (a, u, B, Multiplier, Prime, Exponent, Generator) */
+/*
+        <premaster secret> = (B - (k * g^x)) ^ (a + (u * x)) % N
+*/
+    BIGNUM *bn_exponent = NULL, *bn_a = NULL;
+    BIGNUM *bn_u = NULL, *bn_multiplier = NULL, *bn_exp2 = NULL;
+    BIGNUM *bn_base = NULL, *bn_prime = NULL, *bn_generator = NULL;
+    BIGNUM *bn_B = NULL, *bn_result = NULL;
+    BN_CTX *bn_ctx = NULL;
+    unsigned char *ptr;
+    int dlen;
+    ERL_NIF_TERM ret;
+
+    CHECK_NO_FIPS_MODE();
+
+    ASSERT(argc == 7);
+
+    if (!get_bn_from_bin(env, argv[0], &bn_a))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, argv[1], &bn_u))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, argv[2], &bn_B))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, argv[3], &bn_multiplier))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, argv[4], &bn_generator))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, argv[5], &bn_exponent))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, argv[6], &bn_prime))
+        goto bad_arg;
+
+    if ((bn_ctx = BN_CTX_new()) == NULL)
+        goto err;
+    if ((bn_result = BN_new()) == NULL)
+        goto err;
+
+    /* check that B % N != 0 */
+    if (!BN_nnmod(bn_result, bn_B, bn_prime, bn_ctx))
+        goto err;
+    if (BN_is_zero(bn_result))
+        goto err;
+
+    /* (B - (k * g^x)) */
+    if ((bn_base = BN_new()) == NULL)
+        goto err;
+    if (!BN_mod_exp(bn_result, bn_generator, bn_exponent, bn_prime, bn_ctx))
+        goto err;
+    if (!BN_mod_mul(bn_result, bn_multiplier, bn_result, bn_prime, bn_ctx))
+        goto err;
+    if (!BN_mod_sub(bn_base, bn_B, bn_result, bn_prime, bn_ctx))
+        goto err;
+
+    /* a + (u * x) */
+    if ((bn_exp2 = BN_new()) == NULL)
+        goto err;
+    if (!BN_mul(bn_result, bn_u, bn_exponent, bn_ctx))
+        goto err;
+    if (!BN_add(bn_exp2, bn_a, bn_result))
+        goto err;
+
+    /* (B - (k * g^x)) ^ (a + (u * x)) % N */
+    if (!BN_mod_exp(bn_result, bn_base, bn_exp2, bn_prime, bn_ctx))
+        goto err;
+
+    if ((dlen = BN_num_bytes(bn_result)) < 0)
+        goto err;
+    if ((ptr = enif_make_new_binary(env, (size_t)dlen, &ret)) == NULL)
+        goto err;
+
+    if (BN_bn2bin(bn_result, ptr) < 0)
+        goto err;
+
+    goto done;
+
+ bad_arg:
+    ret = enif_make_badarg(env);
+    goto done;
+
+ err:
+    ret = atom_error;
+
+ done:
+    if (bn_a)
+        BN_free(bn_a);
+    if (bn_u)
+        BN_free(bn_u);
+    if (bn_B)
+        BN_free(bn_B);
+    if (bn_multiplier)
+        BN_free(bn_multiplier);
+    if (bn_generator)
+        BN_free(bn_generator);
+    if (bn_exponent)
+        BN_free(bn_exponent);
+    if (bn_prime)
+        BN_free(bn_prime);
+    if (bn_ctx)
+        BN_CTX_free(bn_ctx);
+    if (bn_result)
+        BN_free(bn_result);
+    if (bn_base)
+        BN_free(bn_base);
+    if (bn_exp2)
+        BN_free(bn_exp2);
+
+    return ret;
+}
+
+ERL_NIF_TERM srp_host_secret_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Verifier, b, u, A, Prime) */
+/*
+        <premaster secret> = (A * v^u) ^ b % N
+*/
+    BIGNUM *bn_b = NULL, *bn_verifier = NULL;
+    BIGNUM *bn_prime = NULL, *bn_A = NULL, *bn_u = NULL, *bn_base = NULL, *bn_result = NULL;
+    BN_CTX *bn_ctx = NULL;
+    unsigned char *ptr;
+    int dlen;
+    ERL_NIF_TERM ret;
+
+    CHECK_NO_FIPS_MODE();
+
+    ASSERT(argc == 5);
+
+    if (!get_bn_from_bin(env, argv[0], &bn_verifier))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, argv[1], &bn_b))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, argv[2], &bn_u))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, argv[3], &bn_A))
+        goto bad_arg;
+    if (!get_bn_from_bin(env, argv[4], &bn_prime))
+        goto bad_arg;
+
+    if ((bn_ctx = BN_CTX_new()) == NULL)
+        goto err;
+    if ((bn_result = BN_new()) == NULL)
+        goto err;
+
+    /* check that A % N != 0 */
+    if (!BN_nnmod(bn_result, bn_A, bn_prime, bn_ctx))
+        goto err;
+    if (BN_is_zero(bn_result))
+        goto err;
+
+    /* (A * v^u) */
+    if ((bn_base = BN_new()) == NULL)
+        goto err;
+    if (!BN_mod_exp(bn_base, bn_verifier, bn_u, bn_prime, bn_ctx))
+        goto err;
+    if (!BN_mod_mul(bn_base, bn_A, bn_base, bn_prime, bn_ctx))
+        goto err;
+
+    /* (A * v^u) ^ b % N */
+    if (!BN_mod_exp(bn_result, bn_base, bn_b, bn_prime, bn_ctx))
+        goto err;
+
+    if ((dlen = BN_num_bytes(bn_result)) < 0)
+        goto err;
+    if ((ptr = enif_make_new_binary(env, (size_t)dlen, &ret)) == NULL)
+        goto err;
+
+    if (BN_bn2bin(bn_result, ptr) < 0)
+        goto err;
+
+    goto done;
+
+ bad_arg:
+    ret = enif_make_badarg(env);
+    goto done;
+
+ err:
+    ret = atom_error;
+
+ done:
+    if (bn_verifier)
+        BN_free(bn_verifier);
+    if (bn_b)
+        BN_free(bn_b);
+    if (bn_u)
+        BN_free(bn_u);
+    if (bn_A)
+        BN_free(bn_A);
+    if (bn_prime)
+        BN_free(bn_prime);
+    if (bn_ctx)
+        BN_CTX_free(bn_ctx);
+    if (bn_result)
+        BN_free(bn_result);
+    if (bn_base)
+        BN_free(bn_base);
+
+    return ret;
+}
+
diff --git a/lib/crypto/c_src/srp.h b/lib/crypto/c_src/srp.h
new file mode 100644
index 0000000000..c356690470
--- /dev/null
+++ b/lib/crypto/c_src/srp.h
@@ -0,0 +1,30 @@
+/*
+ * %CopyrightBegin%
+ *
+ * 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.
+ * 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%
+ */
+
+#ifndef E_SRP_H__
+#define E_SRP_H__ 1
+
+#include "common.h"
+
+ERL_NIF_TERM srp_value_B_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM srp_user_secret_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+ERL_NIF_TERM srp_host_secret_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+#endif /* E_SRP_H__ */
diff --git a/lib/crypto/configure.in b/lib/crypto/configure.in
new file mode 100644
index 0000000000..a3b6673f29
--- /dev/null
+++ b/lib/crypto/configure.in
@@ -0,0 +1,775 @@
+dnl Process this file with autoconf to produce a configure script. -*-m4-*-
+dnl
+dnl %CopyrightBegin%
+dnl
+dnl Copyright Ericsson AB 2018. All Rights Reserved.
+dnl
+dnl Licensed under the Apache License, Version 2.0 (the "License");
+dnl you may not use this file except in compliance with the License.
+dnl You may obtain a copy of the License at
+dnl
+dnl     http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing, software
+dnl distributed under the License is distributed on an "AS IS" BASIS,
+dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+dnl See the License for the specific language governing permissions and
+dnl limitations under the License.
+dnl
+dnl %CopyrightEnd%
+dnl
+
+dnl define([AC_CACHE_LOAD], )dnl
+dnl define([AC_CACHE_SAVE], )dnl
+
+
+AC_INIT(vsn.mk)
+
+if test -z "$ERL_TOP" || test ! -d "$ERL_TOP" ; then
+  AC_CONFIG_AUX_DIRS(autoconf)
+else
+  erl_top=${ERL_TOP}
+  AC_CONFIG_AUX_DIRS($erl_top/erts/autoconf)
+fi
+
+if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then
+    AC_CANONICAL_HOST
+else
+    host_os=win32
+fi
+
+LM_PRECIOUS_VARS
+
+if test "$cross_compiling" = "yes"; then
+    CROSS_COMPILING=yes
+else
+    CROSS_COMPILING=no
+fi
+AC_SUBST(CROSS_COMPILING)
+
+ERL_XCOMP_SYSROOT_INIT
+
+AC_PROG_CC
+LM_WINDOWS_ENVIRONMENT
+
+ERL_DED
+
+dnl
+dnl SSL, SSH and CRYPTO need the OpenSSL libraries
+dnl
+dnl Check flags --with-ssl, --without-ssl --with-ssl=PATH.
+dnl If no option is given or --with-ssl is set without a path then we
+dnl search for OpenSSL libraries and header files in the standard locations. 
+dnl If set to --without-ssl we disable the use of SSL, SSH and CRYPTO.
+dnl If set to --with-ssl=PATH we use that path as the prefix, i.e. we
+dnl use "PATH/include" and "PATH/lib".
+
+AC_CHECK_SIZEOF(void *)
+
+std_ssl_locations="/usr/local /usr/sfw /usr /opt/local /usr/pkg /usr/local/openssl /usr/lib/openssl /usr/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl /"
+
+AC_ARG_WITH(ssl-zlib,
+AS_HELP_STRING([--with-ssl-zlib=PATH],
+               [specify location of ZLib to be used by OpenSSL])
+AS_HELP_STRING([--with-ssl-zlib],
+               [link SSL with  Zlib (default if found)])
+AS_HELP_STRING([--without-ssl-zlib],
+               [don't link SSL with ZLib]))
+
+if  test "x$with_ssl_zlib" = "xno"; then
+	SSL_LINK_WITH_ZLIB=no
+	STATIC_ZLIB_LIBS=
+elif test "x$with_ssl_zlib" = "xyes" || test "x$with_ssl_zlib" = "x"; then
+	if test $erl_xcomp_without_sysroot = yes; then
+		AC_MSG_WARN([Cannot search for zlib; missing cross system root (erl_xcomp_sysroot).])
+		SSL_LINK_WITH_ZLIB=no	
+		STATIC_ZLIB_LIBS=	
+	elif  test "x$MIXED_CYGWIN" = "xyes" -o "x$MIXED_MSYS" = "xyes"; then
+		SSL_LINK_WITH_ZLIB=no	
+		STATIC_ZLIB_LIBS=	
+	else
+		SSL_LINK_WITH_ZLIB=no
+		STATIC_ZLIB_LIBS=
+		AC_MSG_CHECKING(for static ZLib to be used by SSL in standard locations) 
+		for rdir in $std_ssl_locations; do
+			dir="$erl_xcomp_sysroot$rdir"
+			if test "x$ac_cv_sizeof_void_p" = "x8"; then
+				if test -f "$dir/lib64/libz.a"; then
+					SSL_LINK_WITH_ZLIB=yes
+					STATIC_ZLIB_LIBS="$dir/lib64/libz.a"
+					break
+				elif test -f "$dir/lib/64/libz.a"; then
+					SSL_LINK_WITH_ZLIB=yes
+					STATIC_ZLIB_LIBS="$dir/lib/64/libz.a"
+					break
+				fi
+			fi
+			if test -f "$dir/lib/libz.a"; then
+					SSL_LINK_WITH_ZLIB=yes
+				STATIC_ZLIB_LIBS="$dir/lib/libz.a"
+				break
+			fi
+		done
+		if test "x$SSL_LINK_WITH_ZLIB" = "xno"; then
+		       	AC_MSG_RESULT([no])
+		else
+			AC_MSG_RESULT([$STATIC_ZLIB_LIBS])
+		fi
+	fi				
+else
+	SSL_LINK_WITH_ZLIB=no
+	STATIC_ZLIB_LIBS=
+	if test -f "$with_ssl_zlib/libz.a"; then
+		SSL_LINK_WITH_ZLIB=yes
+		STATIC_ZLIB_LIBS=$with_ssl_zlib/libz.a
+	elif test -f "$with_ssl_zlib/lib/libz.a"; then
+		SSL_LINK_WITH_ZLIB=yes
+		STATIC_ZLIB_LIBS=$with_ssl_zlib/lib/libz.a
+	fi
+	if test "x$ac_cv_sizeof_void_p" = "x8"; then
+		if test -f "$with_ssl_zlib/lib64/libz.a"; then
+			SSL_LINK_WITH_ZLIB=yes
+			STATIC_ZLIB_LIBS=$with_ssl_zlib/lib64/libz.a
+		elif test -f "$with_ssl_zlib/lib/64/libz.a"; then
+			SSL_LINK_WITH_ZLIB=yes
+			STATIC_ZLIB_LIBS=$with_ssl_zlib/lib/64/libz.a
+		fi
+	fi
+	if test "x$SSL_LINK_WITH_ZLIB" = "xno"; then
+	       	AC_MSG_ERROR(Invalid path to option --with-ssl-zlib=PATH)
+	fi
+fi
+		
+			
+AC_ARG_WITH(ssl,
+AS_HELP_STRING([--with-ssl=PATH], [specify location of OpenSSL include and lib])
+AS_HELP_STRING([--with-ssl], [use SSL (default)])
+AS_HELP_STRING([--without-ssl], [don't use SSL]))
+
+AC_ARG_WITH(ssl-incl,
+AS_HELP_STRING([--with-ssl-incl=PATH], [location of OpenSSL include dir, if different than specified by --with-ssl=PATH]),
+[
+case X$with_ssl in
+    X | Xyes | Xno) AC_MSG_ERROR([--with-ssl-incl=PATH set without --with-ssl=PATH]);;
+esac
+],
+[with_ssl_incl=$with_ssl]) #default
+
+AC_ARG_WITH(ssl-rpath,
+AS_HELP_STRING([--with-ssl-rpath=yes|no|PATHS],
+               [runtime library path for OpenSSL. Default is "yes", which equates to a
+	       number of standard locations. If "no", then no runtime
+	       library paths will be used. Anything else should be a
+	       comma separated list of paths.]),
+[
+case X$with_ssl in
+    Xno) AC_MSG_ERROR([--with-ssl-rpath set without --with-ssl]);;
+esac
+],
+[with_ssl_rpath=yes]) #default
+
+
+AC_ARG_ENABLE(dynamic-ssl-lib,
+AS_HELP_STRING([--disable-dynamic-ssl-lib],
+               [disable using dynamic openssl libraries]),
+[ case "$enableval" in
+    no) enable_dynamic_ssl=no ;;
+    *)  enable_dynamic_ssl=yes ;;
+  esac ], enable_dynamic_ssl=yes)
+
+#----------------------------------------------------------------------
+# We actually might do the SSL tests twice due to late discovery of 
+# kerberos problems with static linking, in case we redo it all trying
+# dynamic SSL libraries instead.
+#----------------------------------------------------------------------
+
+ssl_done=no
+
+while test "x$ssl_done" != "xyes"; do
+
+ssl_done=yes # Default only one run
+
+# Remove all SKIP files from previous runs
+for a in ssl crypto ssh; do
+  rm -f "$ERL_TOP/lib/$a/SKIP"
+done
+
+SSL_DYNAMIC_ONLY=$enable_dynamic_ssl
+SSL_STATIC_ONLY=no
+
+case "$erl_xcomp_without_sysroot-$with_ssl" in
+  yes-* | no-no)
+    SSL_APP=
+    CRYPTO_APP=
+    SSH_APP=
+    if test "$with_ssl" = "no"; then
+	skip="User gave --without-ssl option"
+    else
+	skip="Cannot search for ssl; missing cross system root (erl_xcomp_sysroot)."
+    fi
+    for a in ssl crypto ssh; do
+        echo "$skip" > $ERL_TOP/lib/$a/SKIP
+    done
+    ;;
+  no-yes | no- )
+    # On windows, we could try to find the installation
+    # of Shining Light OpenSSL, which can be found by poking in
+    # the uninstall section in the registry, it's worth a try...
+    extra_dir=""
+    if  test "x$MIXED_CYGWIN" = "xyes"; then
+    	AC_CHECK_PROG(REGTOOL, regtool, regtool, false)
+	if test "$ac_cv_prog_REGTOOL" != false; then
+		wrp="/machine/software/microsoft/windows/currentversion/"
+	   	if test "x$ac_cv_sizeof_void_p" = "x8"; then
+		   urp="uninstall/openssl (64-bit)_is1/inno setup: app path"
+		   regtool_subsystem=-w
+		else
+		   urp="uninstall/openssl (32-bit)_is1/inno setup: app path"
+		   regtool_subsystem=-W
+		fi	
+		rp="$wrp$urp"
+		if regtool -q $regtool_subsystem get "$rp" > /dev/null; then
+		   true
+		else
+		   # Fallback to unspecified wordlength
+		   urp="uninstall/openssl_is1/inno setup: app path"
+		   rp="$wrp$urp"
+		fi	
+		if regtool -q $regtool_subsystem get "$rp" > /dev/null; then
+			ssl_install_dir=`regtool -q $regtool_subsystem get "$rp"`
+			# Try hard to get rid of spaces...
+			if cygpath -d "$ssl_install_dir" > /dev/null 2>&1; then
+				ssl_install_dir=`cygpath -d "$ssl_install_dir"`
+			fi
+			extra_dir=`cygpath $ssl_install_dir`
+		fi
+	fi
+    elif test "x$MIXED_MSYS" = "xyes"; then
+    	AC_CHECK_PROG(REGTOOL, reg_query.sh, reg_query.sh, false)
+	if test "$ac_cv_prog_REGTOOL" != false; then
+	   	if test "x$ac_cv_sizeof_void_p" = "x8"; then
+		   rp="HKLM/SOFTWARE/Microsoft/Windows/CurrentVersion/Uninstall/OpenSSL (64-bit)_is1"
+		else
+		   rp="HKLM/SOFTWARE/Microsoft/Windows/CurrentVersion/Uninstall/OpenSSL_is1"
+		fi	
+		key="Inno Setup: App Path"
+		if "$ac_cv_prog_REGTOOL" "$rp" "$key" > /dev/null; then
+			ssl_install_dir=`"$ac_cv_prog_REGTOOL" "$rp" "$key"`
+			extra_dir=`win2msys_path.sh "$ssl_install_dir"`
+		fi
+	fi
+    fi
+    # We search for OpenSSL in the common OS standard locations.
+    SSL_APP=ssl
+    CRYPTO_APP=crypto
+    SSH_APP=ssh
+
+    SSL_CRYPTO_LIBNAME=crypto
+    SSL_SSL_LIBNAME=ssl
+    
+    if  test "x$MIXED_CYGWIN" = "xyes" -o "x$MIXED_MSYS" = "xyes"; then
+    	if test "x$ac_cv_sizeof_void_p" = "x8"; then
+	  std_win_ssl_locations="/cygdrive/c/OpenSSL-Win64 /c/OpenSSL-Win64 /opt/local64/pgm/OpenSSL"
+	else
+	  std_win_ssl_locations="/cygdrive/c/OpenSSL-Win32 /c/OpenSSL-Win32 /cygdrive/c/OpenSSL /c/OpenSSL /opt/local/pgm/OpenSSL"
+	fi
+    else
+        std_win_ssl_locations=""
+    fi
+
+
+    AC_MSG_CHECKING(for OpenSSL >= 0.9.8c in standard locations)
+    for rdir in $extra_dir $std_win_ssl_locations $std_ssl_locations; do
+	dir="$erl_xcomp_sysroot$rdir"
+	if test -f "$erl_xcomp_isysroot$rdir/include/openssl/opensslv.h"; then
+		is_real_ssl=yes
+		SSL_INCDIR="$dir"
+		if test "x$MIXED_CYGWIN" = "xyes" -o "x$MIXED_MSYS" = "xyes"; then
+			if test -f "$dir/lib/VC/libeay32.lib"; then
+				SSL_RUNTIME_LIBDIR="$rdir/lib/VC"
+				SSL_LIBDIR="$dir/lib/VC"
+				SSL_CRYPTO_LIBNAME=libeay32
+				SSL_SSL_LIBNAME=ssleay32
+			elif test -f "$dir/lib/VC/openssl.lib"; then 
+				SSL_RUNTIME_LIBDIR="$rdir/lib/VC"
+				SSL_LIBDIR="$dir/lib/VC"
+			elif test -f $dir/lib/VC/libeay32MD.lib; then
+		            SSL_CRYPTO_LIBNAME=libeay32MD
+		            SSL_SSL_LIBNAME=ssleay32MD
+			    if test "x$enable_dynamic_ssl" = "xno" && \
+	                       test -f  $dir/lib/VC/static/libeay32MD.lib; then
+				  SSL_RUNTIME_LIBDIR="$rdir/lib/VC/static"
+				  SSL_LIBDIR="$dir/lib/VC/static"
+		            else
+			          SSL_RUNTIME_LIBDIR="$rdir/lib/VC"
+				  SSL_LIBDIR="$dir/lib/VC"
+                            fi 
+			elif test -f "$dir/lib/libeay32.lib"; then
+				SSL_RUNTIME_LIBDIR="$rdir/lib"
+				SSL_LIBDIR="$dir/lib"
+				SSL_CRYPTO_LIBNAME=libeay32
+				SSL_SSL_LIBNAME=ssleay32
+			elif test -f "$dir/lib/openssl.lib"; then
+				SSL_RUNTIME_LIBDIR="$rdir/lib"
+				SSL_LIBDIR="$dir/lib"
+			else
+				is_real_ssl=no
+			fi
+		elif test -f "$dir/lib/powerpc/libsslcrypto.a"; then
+			SSL_CRYPTO_LIBNAME=sslcrypto
+			SSL_LIBDIR="$dir/lib/powerpc/"
+			SSL_RUNTIME_LIBDIR="$rdir/lib/powerpc/"
+		else
+			if test "x$ac_cv_sizeof_void_p" = "x8"; then
+				if test -f "$dir/lib64/libcrypto.a"; then
+					SSL_RUNTIME_LIBDIR="$rdir/lib64"
+					SSL_LIBDIR="$dir/lib64"
+				elif test -f "$dir/lib/64/libcrypto.a"; then
+					SSL_RUNTIME_LIBDIR="$rdir/lib/64"
+					SSL_LIBDIR="$dir/lib/64"
+				elif test -f "$dir/lib64/libcrypto.so"; then
+					SSL_RUNTIME_LIBDIR="$rdir/lib64"
+					SSL_LIBDIR="$dir/lib64"
+				elif test -f "$dir/lib/64/libcrypto.so"; then
+					SSL_RUNTIME_LIBDIR="$rdir/lib/64"
+					SSL_LIBDIR="$dir/lib/64"
+				else
+					SSL_RUNTIME_LIBDIR="$rdir/lib"
+					SSL_LIBDIR="$dir/lib"
+				fi
+			else	 
+				SSL_RUNTIME_LIBDIR="$rdir/lib"
+				SSL_LIBDIR="$dir/lib"
+			fi
+		fi
+		if test '!' -f "$SSL_LIBDIR/lib${SSL_CRYPTO_LIBNAME}.a"; then
+			SSL_DYNAMIC_ONLY=yes
+		elif test '!' -f "$SSL_LIBDIR/lib${SSL_CRYPTO_LIBNAME}.so" -a '!' -f "$SSL_LIBDIR/lib${SSL_CRYPTO_LIBNAME}.dylib"; then
+			SSL_STATIC_ONLY=yes
+		fi
+		SSL_BINDIR="$rdir/bin"
+		if test "x$is_real_ssl" = "xyes" ; then
+			SSL_INCLUDE="-I$dir/include"
+			old_CPPFLAGS=$CPPFLAGS
+			CPPFLAGS=$SSL_INCLUDE
+			AC_EGREP_CPP(^yes$,[
+#include <openssl/opensslv.h>
+#if OPENSSL_VERSION_NUMBER >= 0x0090803fL
+yes
+#endif
+			],[
+			ssl_found=yes
+			],[
+			SSL_APP=
+			ssl_found=no
+         		])
+         		CPPFLAGS=$old_CPPFLAGS
+			if test "x$ssl_found" = "xyes"; then
+			   	if test "x$MIXED_CYGWIN" = "xyes" -o "x$MIXED_MSYS" = "xyes"; then
+				   	ssl_linkable=yes
+				elif test "x${SSL_CRYPTO_LIBNAME}" = "xsslcrypto"; then
+				# This should only be triggered seen OSE
+					ssl_linkable=yes
+				else
+					saveCFLAGS="$CFLAGS"
+ 					saveLDFLAGS="$LDFLAGS"
+					saveLIBS="$LIBS"
+ 					CFLAGS="$CFLAGS $SSL_INCLUDE"
+					if test "x$SSL_STATIC_ONLY" = "xyes"; then
+						LIBS="${SSL_LIBDIR}/lib${SSL_CRYPTO_LIBNAME}.a"
+					else
+						LDFLAGS="$LDFLAGS -L$SSL_LIBDIR"
+						LIBS="$LIBS -l${SSL_CRYPTO_LIBNAME}"
+					fi
+ 					AC_TRY_LINK([
+					#include <stdio.h>
+ 					#include <openssl/hmac.h>],
+ 					[ 
+					HMAC(0, 0, 0, 0, 0, 0, 0);
+ 					],
+ 					[ssl_linkable=yes],
+ 					[ssl_linkable=no])
+ 					CFLAGS="$saveCFLAGS"
+ 					LDFLAGS="$saveLDFLAGS"
+					LIBS="$saveLIBS"
+				fi
+ 			fi
+	 		if test "x$ssl_found" = "xyes" && test "x$ssl_linkable" = "xyes"; then
+			 	AC_MSG_RESULT([$dir])
+	   			break;
+         		fi
+		fi	
+       fi
+    done
+
+    if test "x$ssl_found" != "xyes" ; then
+	dnl 
+	dnl If no SSL found above, check whether we are running on OpenBSD.
+	dnl
+	case $host_os in
+	openbsd*)
+	       if test -f "$erl_xcomp_isysroot/usr/include/openssl/opensslv.h"; then
+		  # Trust OpenBSD to have everything the in the correct locations.
+		  ssl_found=yes
+		  ssl_linkable=yes
+		  SSL_INCDIR="$erl_xcomp_sysroot/usr"
+	          AC_MSG_RESULT([$SSL_INCDIR])
+		  SSL_RUNTIME_LIB="/usr/lib"
+		  SSL_LIB="$erl_xcomp_sysroot/usr/lib"
+		  SSL_BINDIR="/usr/sbin"
+		  dnl OpenBSD requires us to link with -L and -l
+		  SSL_DYNAMIC_ONLY="yes" 
+		fi
+		;;
+	esac
+    fi
+dnl		Now, certain linuxes have a 64bit libcrypto
+dnl		that cannot build shared libraries (i.e. not PIC)
+dnl		One could argue that this is wrong, but
+dnl		so it is - be adoptable
+    if test "$ssl_found" = "yes" && test "$ssl_linkable" = "yes" && test "$SSL_DYNAMIC_ONLY" != "yes"; then
+	case $host_os in
+		linux*)
+			saveCFLAGS="$CFLAGS"
+ 			saveLDFLAGS="$LDFLAGS"
+			saveLIBS="$LIBS"
+ 			CFLAGS="$DED_CFLAGS $SSL_INCLUDE"
+ 			LDFLAGS="$DED_LDFLAGS"
+			LIBS="$SSL_LIBDIR/libcrypto.a $STATIC_ZLIB_LIBS"
+ 			AC_TRY_LINK([
+			#include <stdio.h>
+ 			#include <openssl/hmac.h>],
+ 			[ 
+			HMAC(0, 0, 0, 0, 0, 0, 0);
+ 			],
+ 			[ssl_dyn_linkable=yes],
+ 			[ssl_dyn_linkable=no])
+ 			CFLAGS="$saveCFLAGS"
+ 			LDFLAGS="$saveLDFLAGS"
+			LIBS="$saveLIBS"
+			if test "x$ssl_dyn_linkable" != "xyes"; then
+				SSL_DYNAMIC_ONLY=yes
+				AC_MSG_WARN([SSL will be linked against dynamic lib as static lib is not purely relocatable])
+			fi
+			;;
+	esac
+    fi					
+	
+				
+
+
+    if test "x$ssl_found" != "xyes" || test  "x$ssl_linkable" != "xyes"; then
+       if test "x$ssl_found" = "xyes"; then 
+       		AC_MSG_RESULT([found; but not usable])
+       else
+       		AC_MSG_RESULT([no])
+       fi
+       SSL_APP=
+       CRYPTO_APP=
+       SSH_APP=
+       AC_MSG_WARN([No (usable) OpenSSL found, skipping ssl, ssh and crypto applications])
+
+       for a in ssl crypto ssh; do
+           echo "No usable OpenSSL found" > $ERL_TOP/lib/$a/SKIP
+       done
+    fi
+    ;;
+  *)
+    # Option given with PATH to package
+    if test ! -d "$with_ssl" ; then
+       AC_MSG_ERROR(Invalid path to option --with-ssl=PATH)
+    fi
+    if test ! -d "$with_ssl_incl" ; then
+       AC_MSG_ERROR(Invalid path to option --with-ssl-incl=PATH)
+    fi
+    SSL_INCDIR="$with_ssl_incl"
+    SSL_CRYPTO_LIBNAME=crypto
+    SSL_SSL_LIBNAME=ssl
+    if test "x$MIXED_CYGWIN" = "xyes" -o "x$MIXED_MSYS" = "xyes" && test -d "$with_ssl/lib/VC"; then
+	if test -f "$with_ssl/lib/VC/libeay32.lib"; then
+	    SSL_LIBDIR="$with_ssl/lib/VC"
+	    SSL_CRYPTO_LIBNAME=libeay32
+	    SSL_SSL_LIBNAME=ssleay32
+	elif test -f "$with_ssl/lib/VC/openssl.lib"; then 
+	    SSL_LIBDIR="$with_ssl/lib/VC"
+	elif test -f $with_ssl/lib/VC/libeay32MD.lib; then
+	    SSL_CRYPTO_LIBNAME=libeay32MD
+            SSL_SSL_LIBNAME=ssleay32MD
+	    if test "x$enable_dynamic_ssl" = "xno" && \
+	       test -f  $with_ssl/lib/VC/static/libeay32MD.lib; then
+		SSL_LIBDIR="$with_ssl/lib/VC/static"
+	    else
+		SSL_LIBDIR="$with_ssl/lib/VC"
+            fi 
+	elif test -f "$with_ssl/lib/libeay32.lib"; then
+	    SSL_LIBDIR="$with_ssl/lib"
+	    SSL_CRYPTO_LIBNAME=libeay32
+	    SSL_SSL_LIBNAME=ssleay32
+	else
+	    # This probably wont work, but that's what the user said, so...
+	    SSL_LIBDIR="$with_ssl/lib"
+	fi
+    elif test -f "$dir/lib/powerpc/libsslcrypto.a"; then
+	    SSL_CRYPTO_LIBNAME=sslcrypto
+	    SSL_LIBDIR="$with_ssl/lib/powerpc/"
+    elif test "x$ac_cv_sizeof_void_p" = "x8"; then
+	if test -f "$with_ssl/lib64/libcrypto.a"; then
+		SSL_LIBDIR="$with_ssl/lib64"
+	elif test -f "$with_ssl/lib/64/libcrypto.a"; then
+		SSL_LIBDIR="$with_ssl/lib/64"
+	elif test -f "$with_ssl/lib64/libcrypto.so"; then
+		SSL_LIBDIR="$with_ssl/lib64"
+	elif test -f "$with_ssl/lib/64/libcrypto.so"; then
+		SSL_LIBDIR="$with_ssl/lib/64"
+	else
+		SSL_LIBDIR="$with_ssl/lib"
+	fi
+    else	 
+	SSL_LIBDIR="$with_ssl/lib"
+    fi
+    if test '!' -f "${SSL_LIBDIR}/lib${SSL_CRYPTO_LIBNAME}.a"; then
+	SSL_DYNAMIC_ONLY=yes
+    elif test '!' -f ${SSL_LIBDIR}/lib${SSL_CRYPTO_LIBNAME}.so -a '!' -f "$SSL_LIBDIR/lib${SSL_CRYPTO_LIBNAME}.dylib"; then
+	SSL_STATIC_ONLY=yes
+    fi
+    SSL_INCLUDE="-I$with_ssl_incl/include"
+    SSL_APP=ssl
+    CRYPTO_APP=crypto
+    SSH_APP=ssh
+    if test "$cross_compiling" = "yes"; then
+	SSL_RUNTIME_LIBDIR=`echo "$SSL_LIBDIR" | sed -n "s|^$erl_xcomp_sysroot\(/*\)\(.*\)\$|/\2|p"`
+    else
+	SSL_RUNTIME_LIBDIR="$SSL_LIBDIR"
+    fi
+esac
+
+if test "x$SSL_APP" != "x" ; then
+    dnl We found openssl, now check if we use kerberos 5 support
+    dnl FIXME: Do we still support platforms that have Kerberos?
+    AC_MSG_CHECKING(for OpenSSL kerberos 5 support)
+    old_CPPFLAGS=$CPPFLAGS
+    CPPFLAGS=$SSL_INCLUDE
+    AC_EGREP_CPP(^yes$,[
+#include <openssl/opensslv.h>
+#include <openssl/opensslconf.h>
+#if OPENSSL_VERSION_NUMBER < 0x1010000fL && !defined(OPENSSL_NO_KRB5)
+yes
+#endif
+      ],[
+      AC_MSG_RESULT([yes])
+      ssl_krb5_enabled=yes
+      if test "x$SSL_DYNAMIC_ONLY" != "xyes"; then
+          if test -f "$SSL_LIBDIR/libkrb5.a"; then
+              SSL_LINK_WITH_KERBEROS=yes
+	      STATIC_KERBEROS_LIBS="$SSL_LIBDIR/libkrb5.a"
+	      if test -f "$SSL_LIBDIR/libkrb5support.a"; then
+		  STATIC_KERBEROS_LIBS="$STATIC_KERBEROS_LIBS $SSL_LIBDIR/libkrb5support.a"
+	      fi
+	      if test -f "$SSL_LIBDIR/libk5crypto.a"; then
+		  STATIC_KERBEROS_LIBS="$STATIC_KERBEROS_LIBS $SSL_LIBDIR/libk5crypto.a"
+	      fi
+	      if test -f "$SSL_LIBDIR/libresolv.a"; then
+		  STATIC_KERBEROS_LIBS="$STATIC_KERBEROS_LIBS $SSL_LIBDIR/libresolv.a"
+	      fi
+	      if test -f "$SSL_LIBDIR/libcom_err.a"; then
+		  STATIC_KERBEROS_LIBS="$STATIC_KERBEROS_LIBS $SSL_LIBDIR/libcom_err.a"
+	      fi
+          else
+	      AC_MSG_WARN([Kerberos needed but no kerberos static libraries found])
+	      AC_MSG_WARN([Rescanning for dynamic SSL libraries])
+	      enable_dynamic_ssl=yes
+	      ssl_done=no
+	      SSL_LINK_WITH_KERBEROS=no
+	      STATIC_KERBEROS_LIBS=""
+	      ssl_krb5_enabled=no
+	      SSL_WITH_KERBEROS=no
+          fi
+      else 	
+	      SSL_LINK_WITH_KERBEROS=no
+	      STATIC_KERBEROS_LIBS=""
+      fi
+      ],[
+      AC_MSG_RESULT([no])
+      ssl_krb5_enabled=no
+      SSL_WITH_KERBEROS=no
+      ])
+    CPPFLAGS=$old_CPPFLAGS
+    SSL_KRB5_INCLUDE=
+    if test "x$ssl_krb5_enabled" = "xyes" ; then
+        AC_MSG_CHECKING(for krb5.h in standard locations)
+	for dir in $extra_dir "$SSL_INCDIR/include" "$SSL_INCDIR/include/openssl" \
+		"$SSL_INCDIR/include/kerberos" \
+		"$erl_xcomp_isysroot/cygdrive/c/kerberos/include" \
+		"$erl_xcomp_isysroot/usr/local/kerberos/include" \
+		"$erl_xcomp_isysroot/usr/kerberos/include" \
+		"$erl_xcomp_isysroot/usr/include"
+	do
+            if test -f "$dir/krb5.h" ; then
+                SSL_KRB5_INCLUDE="$dir"
+		break
+            fi
+        done
+        if test "x$SSL_KRB5_INCLUDE" = "x" ; then
+	    AC_MSG_RESULT([not found])
+	    SSL_APP=
+	    CRYPTO_APP=
+	    SSH_APP=
+	    AC_MSG_WARN([OpenSSL is configured for kerberos but no krb5.h found])
+	    for a in ssl crypto ssh ; do
+	 	echo "OpenSSL is configured for kerberos but no krb5.h found" > $ERL_TOP/lib/$a/SKIP
+	    done
+        else
+            AC_MSG_RESULT([found in $SSL_KRB5_INCLUDE])
+            SSL_INCLUDE="$SSL_INCLUDE -I$SSL_KRB5_INCLUDE"
+        fi
+    fi
+fi
+
+done # while test ssl_done != yes
+
+SSL_DED_LD_RUNTIME_LIBRARY_PATH=
+ded_ld_rflg="$DED_LD_FLAG_RUNTIME_LIBRARY_PATH"
+
+
+case "$with_ssl_rpath" in
+
+yes)   # Use standard lib locations for ssl runtime library path
+
+  if test "$SSL_APP" != "" && test "$SSL_DYNAMIC_ONLY" = "yes" && test "$ded_ld_rflg" != ""; then
+
+    AC_MSG_CHECKING(for ssl runtime library path to use)
+
+    libdirs="/lib"
+
+    if test "$ac_cv_sizeof_void_p" = "8"; then
+	dir_lib64=no
+	dir_lib_64=no
+
+	case "$SSL_RUNTIME_LIBDIR" in
+	    */lib/64 | */lib/64/ ) dir_lib_64=yes;;
+	    */lib64 | */lib64/ ) dir_lib64=yes;;
+	    *) ;;
+	esac
+
+	for dir in $std_ssl_locations; do
+	    test $dir_lib_64 = no &&
+	    	test -d "$erl_xcomp_sysroot$dir/lib/64" &&
+		    dir_lib_64=yes
+	    test $dir_lib64 = no &&
+		test -d "$erl_xcomp_sysroot$dir/lib64" &&
+		    dir_lib64=yes
+	done
+
+	test $dir_lib_64 = yes && libdirs="/lib/64 $libdirs"
+	test $dir_lib64 = yes && libdirs="/lib64 $libdirs"
+    fi
+
+    for type in std x_std curr; do
+
+        ded_ld_rpath="$ded_ld_rflg$SSL_RUNTIME_LIBDIR"
+	rpath="$SSL_RUNTIME_LIBDIR"
+
+	if test $type != curr; then
+	    for ldir in $libdirs; do
+		for dir in $std_ssl_locations; do
+		    test "$SSL_LIBDIR" != "$dir$ldir" || continue
+		    test $type != x_std || test -d "$dir$ldir" || continue
+		    if test "$dir" = "/"; then
+			libdir="$ldir"
+		    else
+			libdir="$dir$ldir"
+		    fi
+		    ded_ld_rpath="$ded_ld_rpath $ded_ld_rflg$libdir"
+		    rpath="$rpath:$libdir"
+                done
+	    done
+	fi
+
+	saveCFLAGS="$CFLAGS"
+	saveLDFLAGS="$LDFLAGS"
+	saveLIBS="$LIBS"
+	CFLAGS="$CFLAGS $SSL_INCLUDE"
+	LDFLAGS="$LDFLAGS $ld_rpath -L$SSL_LIBDIR"
+	LIBS="-lcrypto"
+	AC_TRY_LINK([
+                         #include <stdio.h>
+                         #include <openssl/hmac.h>
+                    ],
+                    [ 
+			 HMAC(0, 0, 0, 0, 0, 0, 0);
+                    ],
+                    [rpath_success=yes],
+                    [rpath_success=no])
+	CFLAGS="$saveCFLAGS"
+	LDFLAGS="$saveLDFLAGS"
+	LIBS="$saveLIBS"
+
+	test "$rpath_success" = "yes" && break
+    done
+
+    test "$rpath_success" = "yes" || { ded_ld_rpath=; rpath=; }
+
+    SSL_DED_LD_RUNTIME_LIBRARY_PATH="$ded_ld_rpath"
+
+    AC_MSG_RESULT([$rpath])
+    test "$rpath" != "" || AC_MSG_WARN([Cannot set run path during linking])
+  fi
+  ;;
+
+no)   # Use no ssl runtime library path
+  SSL_DED_LD_RUNTIME_LIBRARY_PATH=
+  ;;
+
+*)    # Use ssl runtime library paths set by --with-ssl-rpath (without any check)
+  ded_ld_rpath=
+  delimit=
+  for dir in `echo $with_ssl_rpath | sed "s/,/ /g"`; do
+      ded_ld_rpath="$ded_ld_rpath$delimit$ded_ld_rflg$dir"
+      delimit=" "
+  done
+  SSL_DED_LD_RUNTIME_LIBRARY_PATH="$ded_ld_rpath"
+  ;;
+
+esac
+
+
+AC_ARG_ENABLE(fips,
+AS_HELP_STRING([--enable-fips], [enable OpenSSL FIPS mode support])
+AS_HELP_STRING([--disable-fips], [disable OpenSSL FIPS mode support (default)]),
+[ case "$enableval" in
+    yes) enable_fips_support=yes ;;
+    *)   enable_fips_support=no ;;
+  esac ], enable_fips_support=no)
+
+if test "x$enable_fips_support" = "xyes" && test "$CRYPTO_APP" != ""; then
+   saveCFLAGS="$CFLAGS"
+   saveLDFLAGS="$LDFLAGS"
+   saveLIBS="$LIBS"
+   CFLAGS="$CFLAGS $SSL_INCLUDE"
+   LDFLAGS="$LDFLAGS $ded_ld_rpath -L$SSL_LIBDIR"
+   LIBS="-lcrypto"
+   AC_CHECK_FUNC([FIPS_mode_set],
+   [SSL_FLAGS="-DFIPS_SUPPORT"],
+   [SSL_FLAGS=])
+   CFLAGS="$saveCFLAGS"
+   LDFLAGS="$saveLDFLAGS"
+   LIBS="$saveLIBS"
+else
+   SSL_FLAGS=
+fi
+
+AC_SUBST(SSL_INCLUDE)
+AC_SUBST(SSL_INCDIR)
+AC_SUBST(SSL_LIBDIR)
+AC_SUBST(SSL_FLAGS)
+AC_SUBST(SSL_CRYPTO_LIBNAME)
+AC_SUBST(SSL_SSL_LIBNAME)
+AC_SUBST(SSL_DED_LD_RUNTIME_LIBRARY_PATH)
+AC_SUBST(SSL_DYNAMIC_ONLY)
+AC_SUBST(SSL_LINK_WITH_KERBEROS)
+AC_SUBST(STATIC_KERBEROS_LIBS)
+AC_SUBST(SSL_LINK_WITH_ZLIB)
+AC_SUBST(STATIC_ZLIB_LIBS)
+
+AC_OUTPUT(c_src/$host/Makefile:c_src/Makefile.in)
+
diff --git a/lib/crypto/doc/src/Makefile b/lib/crypto/doc/src/Makefile
index cbcafb7375..8da494dad6 100644
--- a/lib/crypto/doc/src/Makefile
+++ b/lib/crypto/doc/src/Makefile
@@ -39,7 +39,8 @@ XML_REF3_FILES = crypto.xml
 XML_REF6_FILES = crypto_app.xml
 
 XML_PART_FILES = usersguide.xml
-XML_CHAPTER_FILES = notes.xml licenses.xml fips.xml engine_load.xml engine_keys.xml algorithm_details.xml
+XML_CHAPTER_FILES = notes.xml licenses.xml fips.xml engine_load.xml engine_keys.xml \
+	algorithm_details.xml new_api.xml
 
 BOOK_FILES = book.xml
 
diff --git a/lib/crypto/doc/src/algorithm_details.xml b/lib/crypto/doc/src/algorithm_details.xml
index 854bfbb4b1..71014764c8 100644
--- a/lib/crypto/doc/src/algorithm_details.xml
+++ b/lib/crypto/doc/src/algorithm_details.xml
@@ -37,122 +37,163 @@
 
   <section>
     <title>Ciphers</title>
+    <p>A <seealso marker="crypto#type-cipher">cipher</seealso> in the
+    <seealso marker="crypto:new_api#the-new-api">new api</seealso>
+    is categorized as either
+    <seealso marker="crypto#type-cipher_no_iv">cipher_no_iv()</seealso>,
+    <seealso marker="crypto#type-cipher_iv">cipher_iv()</seealso> or
+    <seealso marker="crypto#type-cipher_aead">cipher_aead()</seealso>.
+    The letters IV are short for <i>Initialization Vector</i> and
+    AEAD is an abreviation of <i>Authenticated Encryption with Associated Data</i>.
+    </p>
+    <p>Due to irregular naming conventions, some cipher names in the old api are
+    substitued by new names in the new api. For a list of retired names, see
+    <seealso marker="crypto:new_api#retired-cipher-names">Retired cipher names</seealso>.
+    </p>
+    <p>To dynamically check availability, check that the name in the <i>Cipher and Mode</i> column is present in the
+    list returned by <seealso marker="crypto#supports-1">crypto:supports(ciphers)</seealso>.
+    </p>
+    
     <section>
-      <title>Block Ciphers</title>
-      <p>To be used in
-      <seealso marker="crypto#block_encrypt-3">block_encrypt/3</seealso>,
-      <seealso marker="crypto#block_encrypt-4">block_encrypt/4</seealso>,
-      <seealso marker="crypto#block_decrypt-3">block_decrypt/3</seealso> and
-      <seealso marker="crypto#block_decrypt-4">block_decrypt/4</seealso>.
-      </p>
-      <p>Available in all OpenSSL compatible with Erlang CRYPTO if not disabled by configuration.
+      <title>Ciphers without an IV - cipher_no_iv()</title>
+      <p>To be used with:
       </p>
-      <p>To dynamically check availability, check that the name in the <i>Cipher and Mode</i> column is present in the
-      list with the <c>cipher</c> tag in the return value of
-      <seealso marker="crypto#supports-0">crypto:supports()</seealso>.
+      <list>
+	<item><seealso marker="crypto#crypto_one_time/4">crypto_one_time/4</seealso></item>
+	<item><seealso marker="crypto#crypto_init/3">crypto_init/3</seealso></item>
+      </list>
+      <p>The ciphers are:
       </p>
       <table>
-	<row><cell><strong>Cipher and Mode</strong></cell><cell><strong>Key length</strong><br/><strong>[bytes]</strong></cell><cell><strong>IV length</strong><br/><strong>[bytes]</strong></cell><cell><strong>Block size</strong><br/><strong>[bytes]</strong></cell></row>
-	<row><cell><c>aes_cbc</c></cell>  <cell>16, 24, 32</cell><cell>16</cell><cell>16</cell></row>
-	<row><cell><c>aes_cbc128</c></cell><cell>16</cell><cell>16</cell><cell>16</cell></row>
-	<row><cell><c>aes_cbc256</c></cell><cell>32</cell><cell>16</cell><cell>16</cell></row>
-
-	<row><cell><c>aes_cfb8</c></cell>  <cell>16, 24, 32</cell><cell>16</cell><cell>any</cell></row>
-
-	<row><cell><c>aes_ecb</c></cell><cell>16, 24, 32</cell><cell> </cell><cell>16</cell></row>
-
-	<row><cell><c>aes_ige256</c></cell><cell>16</cell><cell>32</cell><cell>16</cell></row>
-	<row><cell><c>blowfish_cbc</c></cell> <cell>4-56</cell> <cell>8</cell> <cell>8</cell></row>
-	<row><cell><c>blowfish_cfb64</c></cell> <cell>&#8805;1</cell> <cell>8</cell> <cell>any</cell></row>
-	<row><cell><c>blowfish_ecb</c></cell><cell>&#8805;1</cell><cell> </cell><cell>8</cell></row>
-	<row><cell><c>blowfish_ofb64</c></cell><cell>&#8805;1</cell><cell>8</cell><cell>any</cell></row>
-
-	<row><cell><c>des3_cbc</c><br/><i>(=DES EDE3 CBC)</i></cell><cell>[8,8,8]</cell><cell>8</cell><cell>8</cell></row>
-	<row><cell><c>des3_cfb</c><br/><i>(=DES EDE3 CFB)</i></cell><cell>[8,8,8]</cell><cell>8</cell><cell>any</cell></row>
-
-	<row><cell><c>des_cbc</c></cell><cell>8</cell><cell>8</cell> <cell>8</cell></row>
-	<row><cell><c>des_cfb</c></cell><cell>8</cell><cell>8</cell><cell>any</cell></row>
-	<row><cell><c>des_ecb</c></cell><cell>8</cell><cell> </cell><cell>8</cell></row>
-	<row><cell><c>des_ede3</c><br/><i>(=DES EDE3 CBC)</i></cell><cell>[8,8,8]</cell><cell>8</cell><cell>8</cell></row>
-	<row><cell><c>rc2_cbc</c></cell><cell>&#8805;1</cell><cell>8</cell><cell>8</cell></row>
-	<tcaption>Block cipher key lengths</tcaption>
+	<row>
+	  <cell><strong>Cipher and Mode</strong></cell>
+	  <cell><strong>Key length</strong><br/><strong>[bytes]</strong></cell>
+	  <cell><strong>Block size</strong><br/><strong>[bytes]</strong></cell>
+	</row>
+	<row><cell><c>aes_128_ecb</c></cell>  <cell>16</cell>      <cell>16</cell></row>
+	<row><cell><c>aes_192_ecb</c></cell>  <cell>24</cell>      <cell>16</cell></row>
+	<row><cell><c>aes_256_ecb</c></cell>  <cell>32</cell>      <cell>16</cell></row>
+	<row><cell><c>blowfish_ecb</c></cell> <cell>16</cell>      <cell>&nbsp;8</cell></row>
+	<row><cell><c>des_ecb</c></cell>      <cell>&nbsp;8</cell> <cell>&nbsp;8</cell></row>
+	<row><cell><c>rc4</c></cell>          <cell>16</cell>      <cell>&nbsp;1</cell></row>
+	<tcaption>Ciphers without IV</tcaption>
       </table>
     </section>
 
     <section>
-      <title>AEAD Ciphers</title>
-      <p>To be used in <seealso marker="crypto#block_encrypt-4">block_encrypt/4</seealso> and
-      <seealso marker="crypto#block_decrypt-4">block_decrypt/4</seealso>.
+      <title>Ciphers with an IV - cipher_iv()</title>
+      <p>To be used with:
       </p>
-      <p>To dynamically check availability, check that the name in the <i>Cipher and Mode</i> column is present in the
-      list with the <c>cipher</c> tag in the return value of
-      <seealso marker="crypto#supports-0">crypto:supports()</seealso>.
+      <list>
+	<item><seealso marker="crypto#crypto_one_time/5">crypto_one_time/5</seealso></item>
+	<item><seealso marker="crypto#crypto_init/4">crypto_init/4</seealso></item>
+	<item><seealso marker="crypto#crypto_dyn_iv_init/3">crypto_dyn_iv_init/3</seealso></item>
+      </list>
+      <p>The ciphers are:
       </p>
       <table>
-	<row><cell><strong>Cipher and Mode</strong></cell><cell><strong>Key length</strong><br/><strong>[bytes]</strong></cell><cell><strong>IV length</strong><br/><strong>[bytes]</strong></cell><cell><strong>AAD length</strong><br/><strong>[bytes]</strong></cell><cell><strong>Tag length</strong><br/><strong>[bytes]</strong></cell><cell><strong>Block size</strong><br/><strong>[bytes]</strong></cell><cell><strong>Supported with</strong><br/><strong>OpenSSL versions</strong></cell></row>
-	<row><cell><c>aes_ccm</c></cell> <cell>16,24,32</cell> <cell>7-13</cell> <cell>any</cell> <cell>even 4-16<br/>default: 12</cell> <cell>any</cell><cell>&#8805;1.1.0</cell></row>
-	<row><cell><c>aes_gcm</c></cell> <cell>16,24,32</cell> <cell>&#8805;1</cell> <cell>any</cell> <cell>1-16<br/>default: 16</cell> <cell>any</cell><cell>&#8805;1.1.0</cell></row>
-	<row><cell><c>chacha20_poly1305</c></cell><cell>32</cell> <cell>1-16</cell> <cell>any</cell> <cell>16</cell> <cell>any</cell><cell>&#8805;1.1.0</cell></row>
-	<tcaption>AEAD cipher key lengths</tcaption>
+	<row>
+	  <cell><strong>Cipher and Mode</strong></cell>
+	  <cell><strong>Key length</strong><br/><strong>[bytes]</strong></cell>
+	  <cell><strong>IV length</strong><br/><strong>[bytes]</strong></cell>
+	  <cell><strong>Block size</strong><br/><strong>[bytes]</strong></cell>
+	  <cell><strong>Limited to</strong><br/><strong>OpenSSL versions</strong></cell>
+	</row>
+	<row><cell><c>aes_128_cbc</c></cell>   <cell>16</cell>      <cell>16</cell>      <cell>16</cell>      <cell></cell></row>
+	<row><cell><c>aes_192_cbc</c></cell>   <cell>24</cell>      <cell>16</cell>      <cell>16</cell>      <cell></cell></row>
+	<row><cell><c>aes_256_cbc</c></cell>   <cell>32</cell>      <cell>16</cell>      <cell>16</cell>      <cell></cell></row>
+	<row><cell><c>aes_128_cfb8</c></cell>  <cell>16</cell>      <cell>16</cell>      <cell>&nbsp;1</cell> <cell></cell></row>
+	<row><cell><c>aes_192_cfb8</c></cell>  <cell>24</cell>      <cell>16</cell>      <cell>&nbsp;1</cell> <cell></cell></row>
+	<row><cell><c>aes_256_cfb8</c></cell>  <cell>32</cell>      <cell>16</cell>      <cell>&nbsp;1</cell> <cell></cell></row>
+	<row><cell><c>aes_128_cfb128</c></cell><cell>16</cell>      <cell>16</cell>      <cell>&nbsp;1</cell> <cell></cell></row>
+	<row><cell><c>aes_192_cfb128</c></cell><cell>24</cell>      <cell>16</cell>      <cell>&nbsp;1</cell> <cell></cell></row>
+	<row><cell><c>aes_256_cfb128</c></cell><cell>32</cell>      <cell>16</cell>      <cell>&nbsp;1</cell> <cell></cell></row>
+	<row><cell><c>aes_128_ctr</c></cell>   <cell>16</cell>      <cell>16</cell>      <cell>&nbsp;1</cell> <cell></cell></row>
+	<row><cell><c>aes_192_ctr</c></cell>   <cell>24</cell>      <cell>16</cell>      <cell>&nbsp;1</cell> <cell></cell></row>
+	<row><cell><c>aes_256_ctr</c></cell>   <cell>32</cell>      <cell>16</cell>      <cell>&nbsp;1</cell> <cell></cell></row>
+	<row><cell><c>aes_ige256</c></cell>    <cell>16</cell>      <cell>32</cell>      <cell>16</cell>      <cell></cell></row>
+	<row><cell><c>blowfish_cbc</c></cell>  <cell>16</cell>      <cell>&nbsp;8</cell> <cell>&nbsp;8</cell> <cell></cell></row>
+	<row><cell><c>blowfish_cfb64</c></cell><cell>16</cell>      <cell>&nbsp;8</cell> <cell>&nbsp;1</cell> <cell></cell></row>
+	<row><cell><c>blowfish_ofb64</c></cell><cell>16</cell>      <cell>&nbsp;8</cell> <cell>&nbsp;1</cell> <cell></cell></row>
+	<row><cell><c>chacha20</c></cell>      <cell>32</cell>      <cell>16</cell>      <cell>&nbsp;1</cell> <cell>&#8805;1.1.0d</cell></row>
+	<row><cell><c>des_cbc</c></cell>       <cell>&nbsp;8</cell> <cell>&nbsp;8</cell> <cell>&nbsp;8</cell> <cell></cell></row>
+	<row><cell><c>des_ede3_cbc</c></cell>  <cell>24</cell>      <cell>&nbsp;8</cell> <cell>&nbsp;8</cell> <cell></cell></row>
+	<row><cell><c>des_cfb</c></cell>       <cell>&nbsp;8</cell> <cell>&nbsp;8</cell> <cell>&nbsp;1</cell> <cell></cell></row>
+	<row><cell><c>des_ede3_cfb</c></cell>  <cell>24</cell>      <cell>&nbsp;8</cell> <cell>&nbsp;1</cell> <cell></cell></row>
+	<row><cell><c>rc2_cbc</c></cell>       <cell>16</cell>      <cell>&nbsp;8</cell> <cell>&nbsp;8</cell> <cell></cell></row>
+	<tcaption>Ciphers with IV</tcaption>
       </table>
     </section>
 
     <section>
-      <title>Stream Ciphers</title>
-      <p>To be used in <seealso marker="crypto#stream_init-2">stream_init/2</seealso> and
-      <seealso marker="crypto#stream_init/3">stream_init/3</seealso>.
+      <title>Ciphers with AEAD - cipher_aead()</title>
+      <p>To be used with:
       </p>
-      <p>To dynamically check availability, check that the name in the <i>Cipher and Mode</i> column is present in the
-      list with the <c>cipher</c> tag in the return value of
-      <seealso marker="crypto#supports-0">crypto:supports()</seealso>.
+      <list>
+	<item><seealso marker="crypto#crypto_one_time_aead/6">crypto_one_time_aead/6</seealso></item>
+	<item><seealso marker="crypto#crypto_one_time_aead/7">crypto_one_time_aead/7</seealso></item>
+      </list>
+      <p>The ciphers are:
       </p>
       <table>
-	<row><cell><strong>Cipher and Mode</strong></cell><cell><strong>Key length</strong><br/><strong>[bytes]</strong></cell><cell><strong>IV length</strong><br/><strong>[bytes]</strong></cell><cell><strong>Supported with</strong><br/><strong>OpenSSL versions</strong></cell></row>
-	<row><cell><c>aes_ctr</c></cell><cell>16, 24, 32</cell><cell>16</cell><cell>&#8805;1.0.1</cell></row>
-	<row><cell><c>rc4</c></cell><cell>&#8805;1</cell><cell> </cell> <cell>all</cell></row>
-	<tcaption>Stream cipher key lengths</tcaption>
+	<row>
+	  <cell><strong>Cipher and Mode</strong></cell>
+	  <cell><strong>Key length</strong><br/><strong>[bytes]</strong></cell>
+	  <cell><strong>IV length</strong><br/><strong>[bytes]</strong></cell>
+	  <cell><strong>AAD length</strong><br/><strong>[bytes]</strong></cell>
+	  <cell><strong>Tag length</strong><br/><strong>[bytes]</strong></cell>
+	  <cell><strong>Block size</strong><br/><strong>[bytes]</strong></cell>
+	  <cell><strong>Limited to</strong><br/><strong>OpenSSL versions</strong></cell>
+	</row>
+	<row><cell><c>aes_128_ccm</c></cell> <cell>16</cell> <cell>7-13</cell> <cell>any</cell> <cell>even 4-16<br/>default: 12</cell> <cell>any</cell><cell>&#8805;1.0.1</cell></row>
+	<row><cell><c>aes_192_ccm</c></cell> <cell>24</cell> <cell>7-13</cell> <cell>any</cell> <cell>even 4-16<br/>default: 12</cell> <cell>any</cell><cell>&#8805;1.0.1</cell></row>
+	<row><cell><c>aes_256_ccm</c></cell> <cell>32</cell> <cell>7-13</cell> <cell>any</cell> <cell>even 4-16<br/>default: 12</cell> <cell>any</cell><cell>&#8805;1.0.1</cell></row>
+
+	<row><cell><c>aes_128_gcm</c></cell> <cell>16</cell> <cell>&#8805;1</cell> <cell>any</cell> <cell>1-16<br/>default: 16</cell> <cell>any</cell><cell>&#8805;1.0.1</cell></row>
+	<row><cell><c>aes_192_gcm</c></cell> <cell>24</cell> <cell>&#8805;1</cell> <cell>any</cell> <cell>1-16<br/>default: 16</cell> <cell>any</cell><cell>&#8805;1.0.1</cell></row>
+	<row><cell><c>aes_256_gcm</c></cell> <cell>32</cell> <cell>&#8805;1</cell> <cell>any</cell> <cell>1-16<br/>default: 16</cell> <cell>any</cell><cell>&#8805;1.0.1</cell></row>
+
+	<row><cell><c>chacha20_poly1305</c></cell><cell>32</cell> <cell>1-16</cell> <cell>any</cell> <cell>16</cell> <cell>any</cell><cell>&#8805;1.1.0</cell></row>
+	<tcaption>AEAD ciphers</tcaption>
       </table>
     </section>
   </section>
 
+  
   <section>
     <title>Message Authentication Codes (MACs)</title>
+    <p>To be used in <seealso marker="crypto#mac-4">mac/4</seealso> and
+    <seealso marker="crypto:new_api#macs--message-authentication-codes-">related functions</seealso>.
+    </p>
 
     <section>
       <title>CMAC</title>
-      <p>To be used in <seealso marker="crypto#cmac-3">cmac/3</seealso> and
-      <seealso marker="crypto#cmac-3">cmac/4</seealso>.
-      </p>
       <p>CMAC with the following ciphers are available with OpenSSL 1.0.1 or later if not disabled by configuration.
       </p>
 
       <p>To dynamically check availability, check that the name <c>cmac</c> is present in the
-      list with the <c>macs</c> tag in the return value of
-      <seealso marker="crypto#supports-0">crypto:supports()</seealso>.
+      list returned by <seealso marker="crypto#supports-1">crypto:supports(macs)</seealso>.
       Also check that the name in the <i>Cipher and Mode</i> column is present in the
-      list with the <c>cipher</c> tag in the return value.
+      list returned by <seealso marker="crypto#supports-1">crypto:supports(ciphers)</seealso>.
       </p>
       <table>
-	<row><cell><strong>Cipher and Mode</strong></cell><cell><strong>Key length</strong><br/><strong>[bytes]</strong></cell><cell><strong>Max Mac Length</strong><br/><strong>[bytes]</strong></cell></row>
-	<row><cell><c>aes_cbc</c></cell>  <cell>16, 24, 32</cell><cell>16</cell></row>
-	<row><cell><c>aes_cbc128</c></cell><cell>16</cell><cell>16</cell></row>
-	<row><cell><c>aes_cbc256</c></cell><cell>32</cell><cell>16</cell></row>
-
-	<row><cell><c>aes_cfb8</c></cell>  <cell>16</cell><cell>1</cell></row>
-
-	<row><cell><c>blowfish_cbc</c></cell> <cell>4-56</cell> <cell>8</cell></row>
-	<row><cell><c>blowfish_cfb64</c></cell> <cell>&#8805;1</cell> <cell>1</cell></row>
-	<row><cell><c>blowfish_ecb</c></cell><cell>&#8805;1</cell>    <cell>8</cell></row>
-	<row><cell><c>blowfish_ofb64</c></cell><cell>&#8805;1</cell>  <cell>1</cell></row>
-
-	<row><cell><c>des3_cbc</c><br/><i>(=DES EDE3 CBC)</i></cell><cell>[8,8,8]</cell><cell>8</cell></row>
-	<row><cell><c>des3_cfb</c><br/><i>(=DES EDE3 CFB)</i></cell><cell>[8,8,8]</cell><cell>1</cell></row>
-
-	<row><cell><c>des_cbc</c></cell><cell>8</cell><cell>8</cell></row>
-
-	<row><cell><c>des_cfb</c></cell><cell>8</cell><cell>1</cell></row>
-	<row><cell><c>des_ecb</c></cell><cell>8</cell><cell>1</cell></row>
-	<row><cell><c>rc2_cbc</c></cell><cell>&#8805;1</cell><cell>8</cell></row>
+	<row>
+	   <cell><strong>Cipher and Mode</strong></cell>
+	   <cell><strong>Key length</strong><br/><strong>[bytes]</strong></cell>
+	   <cell><strong>Max Mac Length</strong><br/><strong>(= default length)</strong><br/><strong>[bytes]</strong></cell>
+	</row>
+	<row><cell><c>aes_128_cbc</c></cell>  <cell>16</cell>      <cell>16</cell></row>
+	<row><cell><c>aes_192_cbc</c></cell>  <cell>24</cell>      <cell>16</cell></row>
+	<row><cell><c>aes_256_cbc</c></cell>  <cell>32</cell>      <cell>16</cell></row>
+	<row><cell><c>aes_128_ecb</c></cell>  <cell>16</cell>      <cell>16</cell></row>
+	<row><cell><c>aes_192_ecb</c></cell>  <cell>24</cell>      <cell>16</cell></row>
+	<row><cell><c>aes_256_ecb</c></cell>  <cell>32</cell>      <cell>16</cell></row>
+	<row><cell><c>blowfish_cbc</c></cell> <cell>16</cell>      <cell>&nbsp;8</cell></row>
+	<row><cell><c>blowfish_ecb</c></cell> <cell>16</cell>      <cell>&nbsp;8</cell></row>
+	<row><cell><c>des_cbc</c></cell>      <cell>&nbsp;8</cell> <cell>&nbsp;8</cell></row>
+	<row><cell><c>des_ecb</c></cell>      <cell>&nbsp;8</cell> <cell>&nbsp;8</cell></row>
+	<row><cell><c>des_ede3_cbc</c></cell> <cell>24</cell>      <cell>&nbsp;8</cell></row>
+	<row><cell><c>rc2_cbc</c></cell>      <cell>16</cell>      <cell>&nbsp;8</cell></row>
 	<tcaption>CMAC cipher key lengths</tcaption>
       </table>
     </section>
@@ -162,9 +203,34 @@
       <p>Available in all OpenSSL compatible with Erlang CRYPTO if not disabled by configuration.
       </p>
       <p>To dynamically check availability, check that the name <c>hmac</c> is present in the
-      list with the <c>macs</c> tag in the return value of
-      <seealso marker="crypto#supports-0">crypto:supports()</seealso>.
+      list returned by <seealso marker="crypto#supports-1">crypto:supports(macs)</seealso> and
+      that the hash name is present in the
+      list returned by <seealso marker="crypto#supports-1">crypto:supports(hashs)</seealso>.
       </p>
+
+      <table>
+	<row>
+	   <cell><strong>Hash</strong></cell>
+	   <cell><strong>Max Mac Length</strong><br/><strong>(= default length)</strong><br/><strong>[bytes]</strong></cell>
+	</row>
+	<row><cell><c>sha</c></cell>       <cell>20</cell></row>
+	<row><cell><c>sha224</c></cell>    <cell>28</cell></row>
+	<row><cell><c>sha256</c></cell>    <cell>32</cell></row>
+	<row><cell><c>sha384</c></cell>    <cell>48</cell></row>
+	<row><cell><c>sha512</c></cell>    <cell>64</cell></row>
+	<row><cell><c>sha3_224</c></cell>  <cell>28</cell></row>
+	<row><cell><c>sha3_256</c></cell>  <cell>32</cell></row>
+	<row><cell><c>sha3_384</c></cell>  <cell>48</cell></row>
+	<row><cell><c>sha3_512</c></cell>  <cell>64</cell></row>
+	<row><cell><c>blake2b</c></cell>   <cell>64</cell></row>
+	<row><cell><c>blake2s</c></cell>   <cell>32</cell></row>
+	<row><cell><c>md4</c></cell>       <cell>16</cell></row>
+	<row><cell><c>md5</c></cell>       <cell>16</cell></row>
+	<row><cell><c>ripemd160</c></cell> <cell>20</cell></row>
+	<tcaption>HMAC output sizes</tcaption>
+      </table>
+	
+      
     </section>
 
     <section>
@@ -172,8 +238,9 @@
       <p>POLY1305 is available with OpenSSL 1.1.1 or later if not disabled by configuration.
       </p>
       <p>To dynamically check availability, check that the name <c>poly1305</c> is present in the
-      list with the <c>macs</c> tag in the return value of
-      <seealso marker="crypto#supports-0">crypto:supports()</seealso>.
+      list returned by <seealso marker="crypto#supports-1">crypto:supports(macs)</seealso>.
+      </p>
+      <p>The poly1305 mac wants an 32 bytes key and produces a 16 byte MAC by default.
       </p>
     </section>
 
@@ -183,22 +250,20 @@
     <title>Hash</title>
 
     <p>To dynamically check availability, check that the wanted name in the <i>Names</i> column is present in the
-    list with the <c>hashs</c> tag in the return value of
-    <seealso marker="crypto#supports-0">crypto:supports()</seealso>.
+    list returned by <seealso marker="crypto#supports-1">crypto:supports(hashs)</seealso>.
     </p>
 
-
     <table>
       <row><cell><strong>Type</strong></cell>
            <cell><strong>Names</strong></cell>
-           <cell><strong>Supported with</strong><br/><strong>OpenSSL versions</strong></cell>
+           <cell><strong>Limitated to</strong><br/><strong>OpenSSL versions</strong></cell>
       </row>
-      <row><cell>SHA1</cell><cell>sha</cell><cell>all</cell></row>
-      <row><cell>SHA2</cell><cell>sha224, sha256, sha384, sha512</cell><cell>all</cell></row>
+      <row><cell>SHA1</cell><cell>sha</cell><cell></cell></row>
+      <row><cell>SHA2</cell><cell>sha224, sha256, sha384, sha512</cell><cell></cell></row>
       <row><cell>SHA3</cell><cell>sha3_224, sha3_256, sha3_384, sha3_512</cell><cell>&#8805;1.1.1</cell></row>
-      <row><cell>MD4</cell><cell>md4</cell><cell>all</cell></row>
-      <row><cell>MD5</cell><cell>md5</cell><cell>all</cell></row>
-      <row><cell>RIPEMD</cell><cell>ripemd160</cell><cell>all</cell></row>
+      <row><cell>MD4</cell><cell>md4</cell><cell></cell></row>
+      <row><cell>MD5</cell><cell>md5</cell><cell></cell></row>
+      <row><cell>RIPEMD</cell><cell>ripemd160</cell><cell></cell></row>
       <tcaption></tcaption>
     </table>
   </section>
@@ -210,8 +275,7 @@
       <title>RSA</title>
       <p>RSA is available with all OpenSSL versions compatible with Erlang CRYPTO if not disabled by configuration.
       To dynamically check availability, check that the atom <c>rsa</c> is present in the
-      list with the <c>public_keys</c> tag in the return value of
-      <seealso marker="crypto#supports-0">crypto:supports()</seealso>.
+      list returned by <seealso marker="crypto#supports-1">crypto:supports(public_keys)</seealso>.
       </p>
       <warning>
 	<!-- In RefMan rsa_opt(), rsa_sign_verify_opt() and User's man RSA -->
@@ -283,8 +347,7 @@
       <title>DSS</title>
       <p>DSS is available with OpenSSL versions compatible with Erlang CRYPTO if not disabled by configuration.
       To dynamically check availability, check that the atom <c>dss</c> is present in the
-      list with the <c>public_keys</c> tag in the return value of
-      <seealso marker="crypto#supports-0">crypto:supports()</seealso>.
+      list returned by <seealso marker="crypto#supports-1">crypto:supports(public_keys)</seealso>.
       </p>
     </section>
 
@@ -292,13 +355,11 @@
       <title>ECDSA</title>
       <p>ECDSA is available with OpenSSL 0.9.8o or later if not disabled by configuration.
       To dynamically check availability, check that the atom <c>ecdsa</c> is present in the
-      list with the <c>public_keys</c> tag in the return value of
-      <seealso marker="crypto#supports-0">crypto:supports()</seealso>.
-      If the atom <c>ec_gf2m</c> characteristic two field curves are available.
+      list returned by <seealso marker="crypto#supports-1">crypto:supports(public_keys)</seealso>.
+      If the atom <c>ec_gf2m</c> also is present, the characteristic two field curves are available.
       </p>
-      <p>The actual supported named curves could be checked by examining the list with the
-      <c>curves</c> tag in the return value of
-      <seealso marker="crypto#supports-0">crypto:supports()</seealso>.
+      <p>The actual supported named curves could be checked by examining the
+      list returned by <seealso marker="crypto#supports-1">crypto:supports(curves)</seealso>.
       </p>
     </section>
 
@@ -306,13 +367,11 @@
       <title>EdDSA</title>
       <p>EdDSA is available with OpenSSL 1.1.1 or later if not disabled by configuration.
       To dynamically check availability, check that the atom <c>eddsa</c> is present in the
-      list with the <c>public_keys</c> tag in the return value of
-      <seealso marker="crypto#supports-0">crypto:supports()</seealso>.
+      list returned by <seealso marker="crypto#supports-1">crypto:supports(public_keys)</seealso>.
       </p>
       <p>Support for the curves ed25519 and ed448 is implemented.
       The actual supported named curves could be checked by examining the list with the
-      <c>curves</c> tag in the return value of
-      <seealso marker="crypto#supports-0">crypto:supports()</seealso>.
+      list returned by <seealso marker="crypto#supports-1">crypto:supports(curves)</seealso>.
       </p>
     </section>
 
@@ -321,8 +380,7 @@
       <p>Diffie-Hellman computations are available with OpenSSL versions compatible with Erlang CRYPTO
       if not disabled by configuration.
       To dynamically check availability, check that the atom <c>dh</c> is present in the
-      list with the <c>public_keys</c> tag in the return value of
-      <seealso marker="crypto#supports-0">crypto:supports()</seealso>.
+      list returned by <seealso marker="crypto#supports-1">crypto:supports(public_keys)</seealso>.
       </p>
     </section>
 
@@ -330,17 +388,15 @@
       <title>Elliptic Curve Diffie-Hellman</title>
       <p>Elliptic Curve Diffie-Hellman is available with OpenSSL 0.9.8o or later if not disabled by configuration.
       To dynamically check availability, check that the atom <c>ecdh</c> is present in the
-      list with the <c>public_keys</c> tag in the return value of
-      <seealso marker="crypto#supports-0">crypto:supports()</seealso>.
+      list returned by <seealso marker="crypto#supports-1">crypto:supports(public_keys)</seealso>.
       </p>
 
       <p>The Edward curves <c>x25519</c> and <c>x448</c> are supported with OpenSSL 1.1.1 or later
       if not disabled by configuration.
       </p>
 
-      <p>The actual supported named curves could be checked by examining the list with the
-      <c>curves</c> tag in the return value of
-      <seealso marker="crypto#supports-0">crypto:supports()</seealso>.
+      <p>The actual supported named curves could be checked by examining the
+      list returned by <seealso marker="crypto#supports-1">crypto:supports(curves)</seealso>.
       </p>
     </section>
 
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index b33db0d6e4..3973cf3f9f 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -23,7 +22,7 @@
 
     <title>crypto</title>
   </header>
-  <module>crypto</module>
+  <module since="">crypto</module>
   <modulesummary>Crypto Functions</modulesummary>
   <description>
     <p>This module provides a set of cryptographic functions.
@@ -43,8 +42,12 @@
 	      <item>
 		<url href="https://www.nist.gov/publications/sha-3-standard-permutation-based-hash-and-extendable-output-functions?pub_id=919061">
 		  SHA-3 Standard: Permutation-Based Hash and Extendable-Output Functions [FIPS PUB 202]
-		</url>		  
+		</url>		
 	      </item>
+            <tag>BLAKE2</tag>
+              <item>
+                <url href="https://blake2.net/">BLAKE2 — fast secure hashing</url>
+              </item>
 	    <tag>MD5</tag>
 	    <item>
 	      <url href="http://www.ietf.org/rfc/rfc1321.txt">The MD5 Message Digest Algorithm [RFC 1321]</url>
@@ -187,63 +190,120 @@
   </description>
 
   <datatypes>
-    <datatype_title>Ciphers</datatype_title>
+    <datatype_title>Ciphers, new API</datatype_title>
     <datatype>
-      <name name="stream_cipher"/>
+      <name name="cipher"/>
+      <desc>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="cipher_no_iv"/>
       <desc>
-	<p>Stream ciphers for
-	<seealso marker="#stream_encrypt-2">stream_encrypt/2</seealso> and
-	<seealso marker="#stream_decrypt-2">stream_decrypt/2</seealso> .
-	</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="cipher_iv"/>
+      <desc>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="cipher_aead"/>
+      <desc>
+	<p>Ciphers known by the CRYPTO application when using the
+	<seealso marker="crypto:new_api#the-new-api">new API</seealso>.</p>
+	<p>Note that this list might be reduced if the underlying libcrypto does not support all of them.</p>
       </desc>
     </datatype>
 
+    <datatype_title>Ciphers, old API</datatype_title>
     <datatype>
       <name name="block_cipher_with_iv"/>
+      <desc>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="block_cipher_without_iv"/>
+      <desc>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="stream_cipher"/>
+      <desc>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="aead_cipher"/>
+      <desc>
+      </desc>
+    </datatype>
+    <datatype>
       <name name="cbc_cipher"/>
+      <desc>
+      </desc>
+    </datatype>
+    <datatype>
       <name name="cfb_cipher"/>
       <desc>
-	<p>Block ciphers with initialization vector for
-	<seealso marker="#block_encrypt-4">block_encrypt/4</seealso> and
-	<seealso marker="#block_decrypt-4">block_decrypt/4</seealso> .
-	</p>
       </desc>
     </datatype>
-
     <datatype>
-      <name name="block_cipher_without_iv"/>
+      <name name="ctr_cipher"/>
+      <desc>
+      </desc>
+    </datatype>
+    <datatype>
       <name name="ecb_cipher"/>
       <desc>
-	<p>Block ciphers without initialization vector for
-	<seealso marker="#block_encrypt-3">block_encrypt/3</seealso> and
-	<seealso marker="#block_decrypt-3">block_decrypt/3</seealso> .
-	</p>
+	<p>Ciphers known by the CRYPTO application when using the
+	<seealso marker="crypto:new_api#the-old-api">old API</seealso>.</p>
+	<p>Note that this list might be reduced if the underlying libcrypto does not support all of them.</p>
       </desc>
     </datatype>
 
     <datatype>
-      <name name="aead_cipher"/>
+      <name name="retired_cbc_cipher_aliases"/>
+      <desc>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="retired_cfb_cipher_aliases"/>
+      <desc>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="retired_ctr_cipher_aliases"/>
+      <desc>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="retired_ecb_cipher_aliases"/>
       <desc>
-	<p>Ciphers with simultaneous MAC-calculation or MAC-checking.
-	<seealso marker="#block_encrypt-4">block_encrypt/4</seealso> and
-	<seealso marker="#block_decrypt-4">block_decrypt/4</seealso> .
+	<p>Alternative, old names of ciphers known by the CRYPTO application when using the
+	<seealso marker="crypto:new_api#the-old-api">old API</seealso>.
+	See <seealso marker="crypto:new_api#retired-cipher-names">Retired cipher names</seealso> for names to
+	use instead to be prepared for an easy convertion to the
+	<seealso marker="crypto:new_api#the-new-api">new API</seealso>.
 	</p>
+	<p>Note that this list might be reduced if the underlying libcrypto does not support all of them.</p>
       </desc>
     </datatype>
 
-    <datatype_title>Digests</datatype_title>
+    <datatype_title>Digests and hash</datatype_title>
     <datatype>
-      <name name="sha1"/>
-      <name name="sha2"/>
-      <name name="sha3"/>
+      <name name="hash_algorithm"/>
       <desc>
       </desc>
     </datatype>
 
     <datatype>
-      <name name="compatibility_only_hash"/>
+      <name name="hmac_hash_algorithm"/>
+      <desc>
+      </desc>
+    </datatype>
+
+    <datatype>
+      <name name="cmac_cipher_algorithm"/>
       <desc>
-	<p>The <c>compatibility_only_hash()</c> algorithms are recommended only for compatibility with existing applications.</p>
       </desc>
     </datatype>
 
@@ -265,6 +325,22 @@
       </desc>
     </datatype>
 
+    <datatype>
+      <name name="sha1"/>
+      <name name="sha2"/>
+      <name name="sha3"/>
+      <name name="blake2"/>
+      <desc>
+      </desc>
+    </datatype>
+
+    <datatype>
+      <name name="compatibility_only_hash"/>
+      <desc>
+	<p>The <c>compatibility_only_hash()</c> algorithms are recommended only for compatibility with existing applications.</p>
+      </desc>
+    </datatype>
+
     <datatype_title>Elliptic Curves</datatype_title>
     <datatype>
       <name name="ec_named_curve"/>
@@ -510,100 +586,405 @@
     <datatype_title>Internal data types</datatype_title>
 
     <datatype>
-      <name name="stream_state"/>
-      <name name="hmac_state"/>
+      <name name="crypto_state"/>
       <name name="hash_state"/>
+      <name name="hmac_state"/>
+      <name name="mac_state"/>
+      <name name="stream_state"/>
       <desc>
 	<p>Contexts with an internal state that should not be manipulated but passed between function calls.
 	</p>
       </desc>
     </datatype>
 
+    <datatype_title>Error types</datatype_title>
+
+    <datatype>
+      <name name="run_time_error"/>
+      <desc>
+	<p>The exception <c>error:badarg</c> signifies that one or more arguments are of wrong data type,
+	or are otherwise badly formed.
+	</p>
+	<p>The exception <c>error:notsup</c> signifies that the algorithm is known but is not supported
+	by current underlying libcrypto or explicitly disabled when building that.
+	</p>
+	<p>For a list of supported algorithms, see <seealso marker="#supports-0">supports/0</seealso>.
+	</p>
+      </desc>
+    </datatype>
+
+    <datatype>
+      <name name="descriptive_error"/>
+      <desc>
+	<p>This is a more developed variant of the older
+	<seealso marker="#type-run_time_error">run_time_error()</seealso>.
+	</p>
+	<p>The exception is:</p>
+	<pre>
+	  {Tag, {C_FileName,LineNumber}, Description}
+
+	   Tag = badarg | notsup | error
+	   C_FileName = string()
+	   LineNumber = integer()
+	   Description = string()
+	</pre>
+
+	<p>It is like the older type an exception of the <c>error</c> class. In addition they contain
+	a descriptive text in English. That text is targeted to a developer. Examples are "Bad key size"
+	or "Cipher id is not an atom".
+	</p>
+	<p>The exception tags are:</p>
+	<taglist>
+	  <tag><c>badarg</c></tag>
+	  <item><p>Signifies that one or more arguments are of wrong data type or are otherwise badly formed.</p>
+	  </item>
+
+	  <tag><c>notsup</c></tag>
+	  <item><p>Signifies that the algorithm is known but is not supported by current underlying libcrypto
+	  or explicitly disabled when building that one.</p>
+	  </item>
+
+	  <tag><c>error</c></tag>
+	  <item><p>An error condition that should not occur, for example a memory allocation failed or
+	  the underlying cryptolib returned an error code, for example "Can't initialize context, step 1".
+	  Thoose text usually needs searching the C-code to be understood.</p>
+	  </item>
+	</taglist>
+	<p>To catch the exception, use for example:</p>
+	<code>
+	  try crypto:crypto_init(Ciph, Key, IV, true)
+	  catch
+	      error:{Tag, {C_FileName,LineNumber}, Description} ->
+	              do_something(......)
+	      .....
+	  end
+	</code>
+      </desc>
+    </datatype>
+
   </datatypes>
 
   <!--================ FUNCTIONS ================-->
+  <section>
+    <title>New API</title>
+  </section>
+
   <funcs>
     <func>
-      <name name="block_encrypt" arity="3"/>
-      <fsummary>Encrypt <c>PlainText</c> according to <c>Type</c> block cipher</fsummary>
+      <name name="crypto_init" arity="3" since="OTP 22.0"/>
+      <fsummary>Initializes a series of encryptions or decryptions</fsummary>
       <desc>
-	<p>Encrypt <c>PlainText</c> according to <c>Type</c> block cipher.</p>
-	<p>May raise exception <c>error:notsup</c> in case the chosen <c>Type</c>
-	is not supported by the underlying libcrypto implementation.</p>
-	<p>For keylengths and blocksizes see the
-	<seealso marker="crypto:algorithm_details#ciphers">User's Guide</seealso>.
+	<p>As <seealso marker="#crypto_init/4">crypto_init/4</seealso> but for ciphers without IVs.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="crypto_init" arity="4" since="OTP 22.0"/>
+      <fsummary>Initializes a series of encryptions or decryptions</fsummary>
+      <desc>
+	<p>Part of the <seealso marker="crypto:new_api#the-new-api">new API</seealso>.
+	Initializes a series of encryptions or decryptions and creates an internal state
+	with a reference that is returned.
+	The actual encryption or decryption is done by
+	<seealso marker="crypto#crypto_update/2">crypto_update/2</seealso>.
+	</p>
+	<p>For encryption, set the <c>EncryptFlag</c> to <c>true</c>. For decryption, set it to <c>false</c>.
+	</p>
+	<p>See <seealso marker="crypto:new_api#examples-of-crypto_init-4-and-crypto_update-2">
+	examples in the User's Guide.</seealso>
 	</p>
       </desc>
     </func>
 
     <func>
-      <name name="block_decrypt" arity="3"/>
-      <fsummary>Decrypt <c>CipherText</c> according to <c>Type</c> block cipher</fsummary>
+      <name name="crypto_update" arity="2" since="OTP 22.0"/>
+      <fsummary>Do an actual crypto operation on a part of the full text</fsummary>
       <desc>
-        <p>Decrypt <c>CipherText</c> according to <c>Type</c> block cipher.</p>
-	<p>May raise exception <c>error:notsup</c> in case the chosen <c>Type</c>
-	is not supported by the underlying libcrypto implementation.</p>
-	<p>For keylengths and blocksizes see the
-	<seealso marker="crypto:algorithm_details#ciphers">User's Guide</seealso>.
+	<p>Part of the <seealso marker="crypto:new_api#the-new-api">new API</seealso>.
+	It does an actual crypto operation on a part of the full text. If the part is less
+	than a number of full blocks, only the full blocks (possibly none) are encrypted 
+	or decrypted and the remaining bytes are saved to the next <c>crypto_update</c> operation.
+	The <c>State</c> should be created with
+	<seealso marker="crypto#crypto_init/3">crypto_init/3</seealso>
+	or
+	<seealso marker="crypto#crypto_init/4">crypto_init/4</seealso>.
+	</p>
+	<p>See <seealso marker="crypto:new_api#examples-of-crypto_init-4-and-crypto_update-2">
+	examples in the User's Guide.</seealso>
 	</p>
       </desc>
     </func>
 
     <func>
-      <name>block_encrypt(Type, Key, Ivec, PlainText) -> CipherText</name>
-      <name>block_encrypt(AeadType, Key, Ivec, {AAD, PlainText}) -> {CipherText, CipherTag}</name>
-      <name>block_encrypt(aes_gcm | aes_ccm, Key, Ivec, {AAD, PlainText, TagLength}) -> {CipherText, CipherTag}</name>
-      <fsummary>Encrypt <c>PlainText</c> according to <c>Type</c> block cipher</fsummary>
-      <type>
-	<v>Type = <seealso marker="#type-block_cipher_with_iv">block_cipher_with_iv()</seealso></v>
-	<v>AeadType = <seealso marker="#type-aead_cipher">aead_cipher()</seealso></v>
-	<v>Key = <seealso marker="#type-key">key()</seealso> | <seealso marker="#type-des3_key">des3_key()</seealso></v>
-        <v>PlainText = iodata()</v>
-        <v>AAD = IVec = CipherText = CipherTag = binary()</v>
-        <v>TagLength = 1..16</v>
-      </type>
+      <name name="crypto_dyn_iv_init" arity="3" since="OTP 22.0"/>
+      <fsummary>Initializes a series of encryptions or decryptions where the IV is provided later</fsummary>
       <desc>
-        <p>Encrypt <c>PlainText</c> according to <c>Type</c> block cipher.
-	<c>IVec</c> is an arbitrary initializing vector.</p>
-	<p>In AEAD (Authenticated Encryption with Associated Data) mode, encrypt
-	<c>PlainText</c>according to <c>Type</c> block cipher and calculate
-	<c>CipherTag</c> that also authenticates the <c>AAD</c> (Associated Authenticated Data).</p>
-	<p>May raise exception <c>error:notsup</c> in case the chosen <c>Type</c>
-	is not supported by the underlying libcrypto implementation.</p>
-	<p>For keylengths, iv-sizes and blocksizes see the
-	<seealso marker="crypto:algorithm_details#ciphers">User's Guide</seealso>.
+	<p>Part of the <seealso marker="crypto:new_api#the-new-api">new API</seealso>.
+	Initializes a series of encryptions or decryptions where the IV is provided later.
+	The actual encryption or decryption is done by
+	<seealso marker="crypto#crypto_dyn_iv_update/3">crypto_dyn_iv_update/3</seealso>.
+	</p>
+	<p>For encryption, set the <c>EncryptFlag</c> to <c>true</c>. For decryption, set it to <c>false</c>.
 	</p>
       </desc>
     </func>
 
     <func>
-      <name>block_decrypt(Type, Key, Ivec, CipherText) -> PlainText</name>
-      <name>block_decrypt(AeadType, Key, Ivec, {AAD, CipherText, CipherTag}) -> PlainText | error</name>
-      <fsummary>Decrypt <c>CipherText</c> according to <c>Type</c> block cipher</fsummary>
-      <type>
-	<v>Type = <seealso marker="#type-block_cipher_with_iv">block_cipher_with_iv()</seealso></v>
-	<v>AeadType = <seealso marker="#type-aead_cipher">aead_cipher()</seealso></v>
-	<v>Key = <seealso marker="#type-key">key()</seealso> | <seealso marker="#type-des3_key">des3_key()</seealso></v>
-        <v>PlainText = iodata()</v>
-        <v>AAD = IVec = CipherText = CipherTag = binary()</v>
-      </type>
+      <name name="crypto_dyn_iv_update" arity="3" since="OTP 22.0"/>
+      <fsummary>Do an actual crypto operation on a part of the full text and the IV is supplied for each part</fsummary>
       <desc>
-        <p>Decrypt <c>CipherText</c> according to <c>Type</c> block cipher.
-	<c>IVec</c> is an arbitrary initializing vector.</p>
-        <p>In AEAD (Authenticated Encryption with Associated Data) mode, decrypt
-	<c>CipherText</c>according to <c>Type</c> block cipher and check the authenticity
-	the <c>PlainText</c> and <c>AAD</c> (Associated Authenticated Data) using the
-	<c>CipherTag</c>. May return <c>error</c> if the decryption or validation fail's</p>
-	<p>May raise exception <c>error:notsup</c> in case the chosen <c>Type</c>
-	is not supported by the underlying libcrypto implementation.</p>
-	<p>For keylengths, iv-sizes and blocksizes see the
-	<seealso marker="crypto:algorithm_details#ciphers">User's Guide</seealso>.
+	<p>Part of the <seealso marker="crypto:new_api#the-new-api">new API</seealso>.
+	Do an actual crypto operation on a part of the full text and the IV is supplied for each part.
+	The <c>State</c> should be created with
+	<seealso marker="crypto#crypto_dyn_iv_init/3">crypto_dyn_iv_init/3</seealso>.
 	</p>
       </desc>
     </func>
 
-     <func>
-      <name name="bytes_to_integer" arity="1"/>
+    <func>
+      <name name="crypto_one_time" arity="4" since="OTP 22.0"/>
+      <fsummary>Do a complete encrypt or decrypt of the full text</fsummary>
+      <desc>
+	<p>As <seealso marker="#crypto_one_time/5">crypto_one_time/5</seealso> but for ciphers without IVs.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="crypto_one_time" arity="5" since="OTP 22.0"/>
+      <fsummary>Do a complete encrypt or decrypt of the full text</fsummary>
+      <desc>
+	<p>Part of the <seealso marker="crypto:new_api#the-new-api">new API</seealso>.
+	Do a complete encrypt or decrypt of the full text in the argument <c>Data</c>.
+	</p>
+	<p>For encryption, set the <c>EncryptFlag</c> to <c>true</c>. For decryption, set it to <c>false</c>.
+	</p>
+	<p>See <seealso marker="crypto:new_api#example-of-crypto_one_time-5">examples in the User's Guide.</seealso>
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="crypto_one_time_aead" arity="6" since="OTP 22.0"/>
+      <name name="crypto_one_time_aead" arity="7" since="OTP 22.0"/>
+      <fsummary>Do a complete encrypt or decrypt with an AEAD cipher of the full text</fsummary>
+      <desc>
+	<p>Part of the <seealso marker="crypto:new_api#the-new-api">new API</seealso>.
+	Do a complete encrypt or decrypt with an AEAD cipher of the full text.
+	</p>
+	<p>For encryption, set the <c>EncryptFlag</c> to <c>true</c> and set the <c>TagOrTagLength</c>
+	to the wanted size of the tag, that is, the tag length.  If the default length is wanted, the
+	<c>crypto_aead/6</c> form may be used.
+	</p>
+	<p>For decryption, set the <c>EncryptFlag</c> to <c>false</c> and put the tag to be checked
+	in the argument	<c>TagOrTagLength</c>.
+	</p>
+	<p>See <seealso marker="crypto:new_api#example-of-crypto_one_time_aead-6">examples in the User's Guide.</seealso>
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="supports" arity="1" since="OTP 22.0"/>
+      <fsummary>Provide a list of available crypto algorithms.</fsummary>
+      <desc>
+        <p> Can be used to determine which crypto algorithms that are supported
+	by the underlying libcrypto library</p>
+	<p>See <seealso marker="#hash_info-1">hash_info/1</seealso> and <seealso marker="#cipher_info-1">cipher_info/1</seealso>
+	for information about the hash and cipher algorithms.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="mac" arity="3" since="OTP @OTP-13872@"/>
+      <fsummary></fsummary>
+      <desc>
+        <p>Short for <seealso marker="#mac-4">mac(Type, undefined, Key, Data)</seealso>.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="mac" arity="4" since="OTP @OTP-13872@"/>
+      <fsummary></fsummary>
+      <desc>
+        <p>Computes a MAC (Message Authentication Code) of type <c>Type</c> from <c>Data</c>.
+	</p>
+
+	<p><c>SubType</c> depends on the MAC <c>Type</c>:
+	</p>
+	<list>
+	  <item>For <c>hmac</c> it is a hash algorithm, see
+	  <seealso marker="algorithm_details#hmac">Algorithm Details</seealso> in the User's Guide.
+	  </item>
+	  <item>For <c>cmac</c> it is a cipher suitable for cmac, see
+	  <seealso marker="algorithm_details#cmac">Algorithm Details</seealso> in the User's Guide.
+	  </item>
+	  <item>For <c>poly1305</c> it should be set to <c>undefined</c> or the
+	  <seealso marker="#mac_init-2">mac/2</seealso> function could be used instead, see
+	  <seealso marker="algorithm_details#poly1305">Algorithm Details</seealso> in the User's Guide.
+	  </item>
+	</list>
+
+	<p><c>Key</c> is the authentication key with a length according to the
+	<c>Type</c> and <c>SubType</c>.
+	The key length could be found with the
+	<seealso marker="#hash_info-1">hash_info/1</seealso> (<c>hmac</c>) for and
+	<seealso marker="#cipher_info-1">cipher_info/1</seealso> (<c>cmac</c>)
+	functions. For <c>poly1305</c> the key length is 32 bytes. Note that
+	the cryptographic quality of the key is not checked.
+	</p>
+
+	<p>The <c>Mac</c> result will have a default length depending on the <c>Type</c> and <c>SubType</c>.
+	To set a shorter length, use <seealso marker="#macN-4">macN/4</seealso> or
+	<seealso marker="#macN-5">macN/5</seealso> instead.
+	The default length is documented in
+	<seealso marker="algorithm_details#message-authentication-codes--macs-">Algorithm Details</seealso>
+	in the User's Guide.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="macN" arity="4" since="OTP @OTP-13872@"/>
+      <fsummary></fsummary>
+      <desc>
+        <p>Short for <seealso marker="#macN-5">macN(Type, undefined, Key, Data, MacLength)</seealso>.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="macN" arity="5" since="OTP @OTP-13872@"/>
+      <fsummary></fsummary>
+      <desc>
+        <p>Computes a MAC (Message Authentication Code)
+	as <seealso marker="#mac-3">mac/3</seealso> and <seealso marker="#mac-4">mac/4</seealso> but
+	<c>MacLength</c> will limit the size of the resultant <c>Mac</c> to
+	at most <c>MacLength</c> bytes.
+	Note that if <c>MacLength</c> is greater than the actual number of
+	bytes returned from the underlying hash, the returned hash will have
+	that shorter length instead.
+	</p>
+	<p>The max <c>MacLength</c> is documented in
+	<seealso marker="algorithm_details#message-authentication-codes--macs-">Algorithm Details</seealso>
+	in the User's Guide.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="mac_init" arity="2" since="OTP @OTP-13872@"/>
+      <fsummary></fsummary>
+      <desc>
+        <p>Short for <seealso marker="#mac_init-3">mac_init(Type, undefined, Key)</seealso>.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="mac_init" arity="3" since="OTP @OTP-13872@"/>
+      <fsummary></fsummary>
+      <desc>
+        <p>Initializes the context for streaming MAC operations.
+	</p>
+	<p><c>Type</c> determines which mac algorithm to use in the MAC operation.
+	</p>
+
+	<p><c>SubType</c> depends on the MAC <c>Type</c>:
+	</p>
+	<list>
+	  <item>For <c>hmac</c> it is a hash algorithm, see
+	  <seealso marker="algorithm_details#hmac">Algorithm Details</seealso> in the User's Guide.
+	  </item>
+	  <item>For <c>cmac</c> it is a cipher suitable for cmac, see
+	  <seealso marker="algorithm_details#cmac">Algorithm Details</seealso> in the User's Guide.
+	  </item>
+	  <item>For <c>poly1305</c> it should be set to <c>undefined</c> or the
+	  <seealso marker="#mac_init-2">mac/2</seealso> function could be used instead, see
+	  <seealso marker="algorithm_details#poly1305">Algorithm Details</seealso> in the User's Guide.
+	  </item>
+	</list>
+
+	<p><c>Key</c> is the authentication key with a length according to the
+	<c>Type</c> and <c>SubType</c>.
+	The key length could be found with the
+	<seealso marker="#hash_info-1">hash_info/1</seealso> (<c>hmac</c>) for and
+	<seealso marker="#cipher_info-1">cipher_info/1</seealso> (<c>cmac</c>)
+	functions. For <c>poly1305</c> the key length is 32 bytes.  Note that
+	the cryptographic quality of the key is not checked.
+	</p>
+
+	<p>The returned <c>State</c> should be used in one or more subsequent calls to
+	<seealso marker="#mac_update-2">mac_update/2</seealso>.
+	The MAC value is finally returned by calling
+	<seealso marker="#mac_final-1">mac_final/1</seealso> or
+	<seealso marker="#mac_finalN-2">mac_finalN/2</seealso>.
+	</p>
+
+	<p>See <seealso marker="crypto:new_api#example-of-mac_init-mac_update-and-mac_final">
+	examples in the User's Guide.</seealso>
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="mac_update" arity="2" since="OTP @OTP-13872@"/>
+      <fsummary></fsummary>
+      <desc>
+        <p>Updates the MAC represented by <c>State0</c> using the given <c>Data</c> which
+	could be of any length.
+	</p>
+	<p>The <c>State0</c> is the State value originally from a MAC init function, that is
+	<seealso marker="#mac_init-2">mac_init/2</seealso>,
+	<seealso marker="#mac_init-3">mac_init/3</seealso> or
+	a previous call of <c>mac_update/2</c>.
+	The value <c>State0</c> is returned unchanged by the function as <c>State</c>.
+        </p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="mac_final" arity="1" since="OTP @OTP-13872@"/>
+      <fsummary></fsummary>
+      <desc>
+        <p>Finalizes the MAC operation referenced by <c>State</c>. The <c>Mac</c> result will have
+	a default length depending on the <c>Type</c> and <c>SubType</c> in the
+	<seealso marker="#mac_init-3">mac_init/2,3</seealso> call.
+	To set a shorter length, use <seealso marker="#mac_finalN-2">mac_finalN/2</seealso> instead.
+	The default length is documented in
+	<seealso marker="algorithm_details#message-authentication-codes--macs-">Algorithm Details</seealso>
+	in the User's Guide.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="mac_finalN" arity="2" since="OTP @OTP-13872@"/>
+      <fsummary></fsummary>
+      <desc>
+        <p>Finalizes the MAC operation referenced by <c>State</c>.
+	</p>
+	<p><c>Mac</c> will be a binary with at most <c>MacLength</c> bytes.
+	Note that if <c>MacLength</c> is greater than the actual number of
+	bytes returned from the underlying hash, the returned hash will have
+	that shorter length instead.
+	</p>
+	<p>The max <c>MacLength</c> is documented in
+	<seealso marker="algorithm_details#message-authentication-codes--macs-">Algorithm Details</seealso>
+	in the User's Guide.
+	</p>
+      </desc>
+    </func>
+  </funcs>
+
+  <section>
+    <title>API kept from previous versions</title>
+  </section>
+
+  <funcs>
+    <func>
+      <name name="bytes_to_integer" arity="1" since="OTP R16B01"/>
       <fsummary>Convert binary representation, of an integer, to an Erlang integer.</fsummary>
       <desc>
         <p>Convert binary representation, of an integer, to an Erlang integer.
@@ -612,7 +993,7 @@
     </func>
 
     <func>
-      <name name="compute_key" arity="4"/>
+      <name name="compute_key" arity="4" since="OTP R16B01"/>
       <fsummary>Computes the shared secret</fsummary>
       <desc>
 	<p>Computes the shared secret from the private key and the other party's public key.
@@ -622,7 +1003,7 @@
     </func>
 
     <func>
-      <name name="exor" arity="2"/>
+      <name name="exor" arity="2" since=""/>
       <fsummary>XOR data</fsummary>
       <desc>
 	<p>Performs bit-wise XOR (exclusive or) on the data supplied.</p>
@@ -631,8 +1012,8 @@
 
 
     <func>
-      <name name="generate_key" arity="2"/>
-      <name name="generate_key" arity="3"/>
+      <name name="generate_key" arity="2" since="OTP R16B01"/>
+      <name name="generate_key" arity="3" since="OTP R16B01"/>
       <fsummary>Generates a public key of type <c>Type</c></fsummary>
       <desc>
 	<p>Generates a public key of type <c>Type</c>.
@@ -653,7 +1034,7 @@
     </func>
 
      <func>
-      <name name="hash" arity="2"/>
+      <name name="hash" arity="2" since="OTP R15B02"/>
       <fsummary></fsummary>
       <desc>
         <p>Computes a message digest of type <c>Type</c> from <c>Data</c>.</p>
@@ -663,7 +1044,7 @@
     </func>
 
     <func>
-      <name name="hash_init" arity="1"/>
+      <name name="hash_init" arity="1" since="OTP R15B02"/>
       <fsummary></fsummary>
       <desc>
         <p>Initializes the context for streaming hash operations. <c>Type</c> determines
@@ -675,7 +1056,7 @@
     </func>
 
     <func>
-      <name name="hash_update" arity="2"/>
+      <name name="hash_update" arity="2" since="OTP R15B02"/>
       <fsummary></fsummary>
       <desc>
         <p>Updates the digest represented by <c>Context</c> using the given <c>Data</c>. <c>Context</c>
@@ -687,7 +1068,7 @@
     </func>
 
     <func>
-      <name name="hash_final" arity="1"/>
+      <name name="hash_final" arity="1" since="OTP R15B02"/>
       <fsummary></fsummary>
       <desc>
         <p>Finalizes the hash operation referenced by <c>Context</c> returned
@@ -698,76 +1079,7 @@
     </func>
 
     <func>
-      <name name="hmac" arity="3"/>
-      <name name="hmac" arity="4"/>
-      <fsummary></fsummary>
-      <desc>
-        <p>Computes a HMAC of type <c>Type</c> from <c>Data</c> using
-        <c>Key</c> as the authentication key.</p> <p><c>MacLength</c>
-        will limit the size of the resultant <c>Mac</c>.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name name="hmac_init" arity="2"/>
-      <fsummary></fsummary>
-      <desc>
-        <p>Initializes the context for streaming HMAC operations. <c>Type</c> determines
-        which hash function to use in the HMAC operation. <c>Key</c> is the authentication
-        key. The key can be any length.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name name="hmac_update" arity="2"/>
-      <fsummary></fsummary>
-      <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
-        <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
-	<seealso marker="#hmac_final_n-2">hmac_final_n</seealso>
-	</p>
-	<warning><p>Do not use a <c>Context</c> as argument in more than one
-	call to	hmac_update or hmac_final. The semantics of reusing old contexts
-	in any way is undefined and could even crash the VM in earlier releases.
-	The reason for this limitation is a lack of support in the underlying
-	libcrypto	API.</p></warning>
-      </desc>
-    </func>
-
-    <func>
-      <name name="hmac_final" arity="1"/>
-      <fsummary></fsummary>
-      <desc>
-        <p>Finalizes the HMAC operation referenced by <c>Context</c>. The size of the resultant MAC is
-        determined by the type of hash function used to generate it.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name name="hmac_final_n" arity="2"/>
-      <fsummary></fsummary>
-      <desc>
-        <p>Finalizes the HMAC operation referenced by <c>Context</c>. <c>HashLen</c> must be greater than
-        zero. <c>Mac</c> will be a binary with at most <c>HashLen</c> bytes. Note that if HashLen is greater than the actual number of bytes returned from the underlying hash, the returned hash will have fewer than <c>HashLen</c> bytes.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name name="cmac" arity="3"/>
-      <name name="cmac" arity="4"/>
-      <fsummary>Calculates the Cipher-based Message Authentication Code.</fsummary>
-      <desc>
-        <p>Computes a CMAC of type <c>Type</c> from <c>Data</c> using
-        <c>Key</c> as the authentication key.</p> <p><c>MacLength</c>
-        will limit the size of the resultant <c>Mac</c>.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name name="info_fips" arity="0"/>
+      <name name="info_fips" arity="0" since="OTP 20.0"/>
       <fsummary>Provides information about the FIPS operating status.</fsummary>
       <desc>
         <p>Provides information about the FIPS operating status of
@@ -790,7 +1102,7 @@
     </func>
 
     <func>
-      <name name="enable_fips_mode" arity="1"/>
+      <name name="enable_fips_mode" arity="1" since="OTP 21.1"/>
       <fsummary>Change FIPS mode.</fsummary>
       <desc>
         <p>Enables (<c>Enable = true</c>) or disables (<c>Enable = false</c>) FIPS mode. Returns <c>true</c> if
@@ -805,7 +1117,7 @@
     </func>
 
     <func>
-      <name name="info_lib" arity="0"/>
+      <name name="info_lib" arity="0" since=""/>
       <fsummary>Provides information about the libraries used by crypto.</fsummary>
       <desc>
         <p>Provides the name and version of the libraries used by crypto.</p>
@@ -826,7 +1138,40 @@
     </func>
 
     <func>
-      <name name="mod_pow" arity="3"/>
+      <name name="hash_info" arity="1" since="OTP 22.0"/>
+      <fsummary>Information about supported hash algorithms.</fsummary>
+      <desc>
+	<p>Provides a map with information about block_size, size and possibly other properties of the
+	hash algorithm in question.
+	</p>
+	<p>For a list of supported hash algorithms, see <seealso marker="#supports-0">supports/0</seealso>.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="cipher_info" arity="1" since="OTP 22.0"/>
+      <fsummary>Information about supported ciphers.</fsummary>
+      <desc>
+	<p>Provides a map with information about block_size, key_length, iv_length and possibly other properties of the
+	cipher algorithm in question.
+	</p>
+        <note>
+	  <p>The ciphers <c>aes_cbc</c>, <c>aes_cfb8</c>, <c>aes_cfb128</c>, <c>aes_ctr</c>,
+	  <c>aes_ecb</c>, <c>aes_gcm</c> and <c>aes_ccm</c>
+	  has no keylength in the <c>Type</c> as opposed to for example <c>aes_128_ctr</c>. They adapt to the length of
+	  the key provided in the encrypt and decrypt function. Therefor it is impossible to return a valid keylength
+	  in the map.</p>
+	  <p>Always use a <c>Type</c> with an explicit key length,
+	  </p>
+	</note>
+	<p>For a list of supported cipher algorithms, see <seealso marker="#supports-0">supports/0</seealso>.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="mod_pow" arity="3" since="OTP R16B01"/>
       <fsummary>Computes the function: N^P mod M</fsummary>
       <desc>
 	<p>Computes the function <c>N^P mod M</c>.</p>
@@ -834,8 +1179,8 @@
     </func>
 
     <func>
-      <name name="next_iv" arity="2"/>
-      <name name="next_iv" arity="3"/>
+      <name name="next_iv" arity="2" since="OTP R16B01"/>
+      <name name="next_iv" arity="3" since="OTP R16B01"/>
       <fsummary></fsummary>
       <desc>
 	<p>Returns the initialization vector to be used in the next
@@ -847,16 +1192,7 @@
     </func>
 
     <func>
-      <name name="poly1305" arity="2"/>
-      <fsummary></fsummary>
-      <desc>
-        <p>Computes a POLY1305 message authentication code (<c>Mac</c>) from <c>Data</c> using
-        <c>Key</c> as the authentication key.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name name="private_decrypt" arity="4"/>
+      <name name="private_decrypt" arity="4" since="OTP R16B01"/>
       <fsummary>Decrypts CipherText using the private Key.</fsummary>
       <desc>
 	<p>Decrypts the <c>CipherText</c>, encrypted with
@@ -870,7 +1206,7 @@
     </func>
 
     <func>
-      <name name="private_encrypt" arity="4"/>
+      <name name="private_encrypt" arity="4" since="OTP R16B01"/>
       <fsummary>Encrypts PlainText using the private Key.</fsummary>
       <desc>
 	<p>Encrypts the <c>PlainText</c> using the <c>PrivateKey</c>
@@ -883,7 +1219,7 @@
     </func>
 
     <func>
-      <name name="public_decrypt" arity="4"/>
+      <name name="public_decrypt" arity="4" since="OTP R16B01"/>
       <fsummary>Decrypts CipherText using the public Key.</fsummary>
       <desc>
 	<p>Decrypts the <c>CipherText</c>, encrypted with
@@ -897,7 +1233,7 @@
     </func>
 
     <func>
-      <name name="public_encrypt" arity="4"/>
+      <name name="public_encrypt" arity="4" since="OTP R16B01"/>
       <fsummary>Encrypts PlainText using the public Key.</fsummary>
       <desc>
 	<p>Encrypts the <c>PlainText</c> (message digest) using the <c>PublicKey</c>
@@ -909,7 +1245,7 @@
     </func>
 
     <func>
-      <name name="rand_seed" arity="1"/>
+      <name name="rand_seed" arity="1" since="OTP 17.0"/>
       <fsummary>Set the seed for random bytes generation</fsummary>
       <desc>
         <p>Set the seed for PRNG to the given binary. This calls the
@@ -922,7 +1258,7 @@
     </func>
 
      <func>
-      <name>rand_uniform(Lo, Hi) -> N</name>
+      <name since="">rand_uniform(Lo, Hi) -> N</name>
       <fsummary>Generate a random number</fsummary>
       <type>
         <v>Lo, Hi, N = integer()</v>
@@ -935,7 +1271,7 @@
     </func>
 
     <func>
-      <name name="start" arity="0"/>
+      <name name="start" arity="0" since=""/>
       <fsummary> Equivalent to application:start(crypto). </fsummary>
       <desc>
         <p> Equivalent to application:start(crypto).</p>
@@ -943,7 +1279,7 @@
     </func>
 
     <func>
-      <name name="stop" arity="0"/>
+      <name name="stop" arity="0" since=""/>
       <fsummary> Equivalent to application:stop(crypto).</fsummary>
       <desc>
         <p> Equivalent to application:stop(crypto).</p>
@@ -951,7 +1287,7 @@
     </func>
 
     <func>
-      <name name="strong_rand_bytes" arity="1"/>
+      <name name="strong_rand_bytes" arity="1" since="OTP R14B03"/>
       <fsummary>Generate a binary of random bytes</fsummary>
       <desc>
         <p>Generates N bytes randomly uniform 0..255, and returns the
@@ -964,7 +1300,7 @@
     </func>
 
     <func>
-      <name name="rand_seed" arity="0"/>
+      <name name="rand_seed" arity="0" since="OTP 20.0"/>
       <fsummary>Strong random number generation plugin state</fsummary>
       <desc>
 	<p>
@@ -978,7 +1314,7 @@
 	  <seealso marker="#rand_seed_s-0">rand_seed_s/0</seealso>.
 	</p>
 	<p>
-	  When using the state object from this function the 
+	  When using the state object from this function the
 	  <seealso marker="stdlib:rand">rand</seealso> functions using it
 	  may raise exception <c>error:low_entropy</c> in case the random generator
 	  failed due to lack of secure "randomness".
@@ -992,7 +1328,7 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
     </func>
 
     <func>
-      <name name="rand_seed_s" arity="0"/>
+      <name name="rand_seed_s" arity="0" since="OTP 20.0"/>
       <fsummary>Strong random number generation plugin state</fsummary>
       <desc>
 	<p>
@@ -1004,16 +1340,16 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
 	  <seealso marker="stdlib:rand#seed_s-1">rand:seed_s/1</seealso>.
 	</p>
 	<p>
-	  When using the state object from this function the 
+	  When using the state object from this function the
 	  <seealso marker="stdlib:rand">rand</seealso> functions using it
 	  may raise exception <c>error:low_entropy</c> in case the random generator
 	  failed due to lack of secure "randomness".
 	</p>
 	<note>
 	  <p>
-	    The state returned from this function can not be used
+	    The state returned from this function cannot be used
 	    to get a reproducable random sequence as from
-	    the other 
+	    the other
 	    <seealso marker="stdlib:rand">rand</seealso>
 	    functions,
 	    since reproducability does not match cryptographically safe.
@@ -1027,7 +1363,7 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
     </func>
 
     <func>
-      <name>rand_seed_alg(Alg) -> rand:state()</name>
+      <name since="OTP 21.0">rand_seed_alg(Alg) -> rand:state()</name>
       <fsummary>Strong random number generation plugin state</fsummary>
       <type>
         <v>Alg = crypto | crypto_cache</v>
@@ -1037,23 +1373,18 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
 	<p>
           Creates state object for
 	  <seealso marker="stdlib:rand">random number generation</seealso>,
-          in order to generate cryptographically strong random numbers.
+          in order to generate cryptographically strong random numbers,
+          and saves it in the process dictionary before returning it as well.
           See also
 	  <seealso marker="stdlib:rand#seed-1">rand:seed/1</seealso> and
 	  <seealso marker="#rand_seed_alg_s-1">rand_seed_alg_s/1</seealso>.
 	</p>
 	<p>
-	  When using the state object from this function the 
+	  When using the state object from this function the
 	  <seealso marker="stdlib:rand">rand</seealso> functions using it
 	  may raise exception <c>error:low_entropy</c> in case the random generator
 	  failed due to lack of secure "randomness".
 	</p>
-	<p>
-	  The cache size can be changed from its default value using the
-	  <seealso marker="crypto_app">
-	    crypto app's
-	  </seealso> configuration parameter <c>rand_cache_size</c>.
-	</p>
         <p><em>Example</em></p>
         <pre>
 _ = crypto:rand_seed_alg(crypto_cache),
@@ -1063,7 +1394,35 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
     </func>
 
     <func>
-      <name>rand_seed_alg_s(Alg) -> rand:state()</name>
+      <name since="OTP-22.0">rand_seed_alg(Alg, Seed) -> rand:state()</name>
+      <fsummary>Strong random number generation plugin state</fsummary>
+      <type>
+        <v>Alg = crypto_aes</v>
+      </type>
+      <desc>
+	<marker id="rand_seed_alg-2" />
+	<p>
+          Creates a state object for
+	  <seealso marker="stdlib:rand">random number generation</seealso>,
+          in order to generate cryptographically unpredictable random numbers,
+          and saves it in the process dictionary before returning it as well.
+          See also
+	  <seealso marker="#rand_seed_alg_s-2">rand_seed_alg_s/2</seealso>.
+	</p>
+        <p><em>Example</em></p>
+        <pre>
+_ = crypto:rand_seed_alg(crypto_aes, "my seed"),
+IntegerValue = rand:uniform(42), % [1; 42]
+FloatValue = rand:uniform(),     % [0.0; 1.0[
+_ = crypto:rand_seed_alg(crypto_aes, "my seed"),
+IntegerValue = rand:uniform(42), % Same values
+FloatValue = rand:uniform().     % again
+	</pre>
+      </desc>
+    </func>
+
+    <func>
+      <name since="OTP 21.0">rand_seed_alg_s(Alg) -> rand:state()</name>
       <fsummary>Strong random number generation plugin state</fsummary>
       <type>
         <v>Alg = crypto | crypto_cache</v>
@@ -1088,7 +1447,7 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
 	  of 56 bits that makes calculations fast on 64 bit machines.
 	</p>
 	<p>
-	  When using the state object from this function the 
+	  When using the state object from this function the
 	  <seealso marker="stdlib:rand">rand</seealso> functions using it
 	  may raise exception <c>error:low_entropy</c> in case the random generator
 	  failed due to lack of secure "randomness".
@@ -1099,11 +1458,17 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
 	    crypto app's
 	  </seealso> configuration parameter <c>rand_cache_size</c>.
 	</p>
+	<p>
+	  When using the state object from this function the
+	  <seealso marker="stdlib:rand">rand</seealso> functions using it
+	  may throw exception <c>low_entropy</c> in case the random generator
+	  failed due to lack of secure "randomness".
+	</p>
 	<note>
 	  <p>
-	    The state returned from this function can not be used
+	    The state returned from this function cannot be used
 	    to get a reproducable random sequence as from
-	    the other 
+	    the other
 	    <seealso marker="stdlib:rand">rand</seealso>
 	    functions,
 	    since reproducability does not match cryptographically safe.
@@ -1121,69 +1486,73 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
     </func>
 
     <func>
-      <name name="stream_init" arity="2"/>
-      <fsummary></fsummary>
+      <name since="OTP 22.0">rand_seed_alg_s(Alg, Seed) -> rand:state()</name>
+      <fsummary>Strong random number generation plugin state</fsummary>
+      <type>
+        <v>Alg = crypto_aes</v>
+      </type>
       <desc>
-        <p>Initializes the state for use in RC4 stream encryption
-        <seealso marker="#stream_encrypt-2">stream_encrypt</seealso> and
-        <seealso marker="#stream_decrypt-2">stream_decrypt</seealso></p>
-	<p>For keylengths see the
-	<seealso marker="crypto:algorithm_details#stream-ciphers">User's Guide</seealso>.
+	<marker id="rand_seed_alg_s-2" />
+	<p>
+          Creates a state object for
+	  <seealso marker="stdlib:rand">random number generation</seealso>,
+          in order to generate cryptographically unpredictable random numbers.
+          See also
+	  <seealso marker="#rand_seed_alg-1">rand_seed_alg/1</seealso>.
 	</p>
-      </desc>
-    </func>
-
-   <func>
-      <name name="stream_init" arity="3"/>
-      <fsummary></fsummary>
-      <desc>
-        <p>Initializes the state for use in streaming AES encryption using Counter mode (CTR).
-        <c>Key</c> is the AES key and must be either 128, 192, or 256 bits long. <c>IVec</c> is
-        an arbitrary initializing vector of 128 bits (16 bytes). This state is for use with
-        <seealso marker="#stream_encrypt-2">stream_encrypt</seealso> and
-        <seealso marker="#stream_decrypt-2">stream_decrypt</seealso>.</p>
-	<p>For keylengths and iv-sizes see the
-	<seealso marker="crypto:algorithm_details#stream-ciphers">User's Guide</seealso>.
+	<p>
+	  To get a long period the Xoroshiro928 generator from the
+	  <seealso marker="stdlib:rand">rand</seealso>
+	  module is used as a counter (with period 2^928 - 1)
+	  and the generator states are scrambled through AES
+	  to create 58-bit pseudo random values.
 	</p>
-      </desc>
-    </func>
-
-    <func>
-      <name name="stream_encrypt" arity="2"/>
-      <fsummary></fsummary>
-      <desc>
-	<p>Encrypts <c>PlainText</c> according to the stream cipher <c>Type</c> specified in stream_init/3.
-	<c>Text</c> can be any number of bytes. The initial <c>State</c> is created using
-        <seealso marker="#stream_init-2">stream_init</seealso>.
-	<c>NewState</c> must be passed into the next call to <c>stream_encrypt</c>.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name name="stream_decrypt" arity="2"/>
-      <fsummary></fsummary>
-      <desc>
-	<p>Decrypts <c>CipherText</c> according to the stream cipher <c>Type</c> specified in stream_init/3.
-	<c>PlainText</c> can be any number of bytes. The initial <c>State</c> is created using
-        <seealso marker="#stream_init-2">stream_init</seealso>.
-	<c>NewState</c> must be passed into the next call to <c>stream_decrypt</c>.</p>
-      </desc>
-    </func>
-
-   <func>
-      <name name="supports" arity="0"/>
-      <fsummary>Provide a list of available crypto algorithms.</fsummary>
-      <desc>
-        <p> Can be used to determine which crypto algorithms that are supported
-	by the underlying libcrypto library</p>
-	<p>Note: the <c>rsa_opts</c> entry is in an experimental state and may change or be removed without notice.
-	No guarantee for the accuarcy of the rsa option's value list should be assumed.
+	<p>
+	  The result should be statistically completely unpredictable
+	  random values, since the scrambling is cryptographically strong
+	  and the period is ridiculously long.  But the generated numbers
+	  are not to be regarded as cryptographically strong since
+	  there is no re-keying schedule.
+	</p>
+	<list type="bulleted">
+	  <item>
+	    <p>
+	      If you need cryptographically strong random numbers use
+	      <seealso marker="#rand_seed_alg_s-1">rand_seed_alg_s/1</seealso>
+	      with <c>Alg =:= crypto</c> or <c>Alg =:= crypto_cache</c>.
+	    </p>
+	  </item>
+	  <item>
+	    <p>
+	      If you need to be able to repeat the sequence use this function.
+	    </p>
+	  </item>
+	  <item>
+	    <p>
+	      If you do not need the statistical quality of this function,
+	      there are faster algorithms in the
+	      <seealso marker="stdlib:rand">rand</seealso>
+	      module.
+	    </p>
+	  </item>
+	</list>
+	<p>
+	  Thanks to the used generator the state object supports the
+	  <seealso marker="stdlib:rand#jump-0"><c>rand:jump/0,1</c></seealso>
+	  function with distance 2^512.
+	</p>
+	<p>
+	  Numbers are generated in batches and cached for speed reasons.
+	  The cache size can be changed from its default value using the
+	  <seealso marker="crypto_app">
+	    crypto app's
+	  </seealso> configuration parameter <c>rand_cache_size</c>.
 	</p>
       </desc>
     </func>
 
     <func>
-      <name name="ec_curves" arity="0"/>
+      <name name="ec_curves" arity="0" since="OTP 17.0"/>
       <fsummary>Provide a list of available named elliptic curves.</fsummary>
       <desc>
         <p>Can be used to determine which named elliptic curves are supported.</p>
@@ -1191,7 +1560,7 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
     </func>
 
     <func>
-      <name name="ec_curve" arity="1"/>
+      <name name="ec_curve" arity="1" since="OTP 17.0"/>
       <fsummary>Get the defining parameters of a elliptic curve.</fsummary>
       <desc>
         <p>Return the defining parameters of a elliptic curve.</p>
@@ -1199,8 +1568,8 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
     </func>
 
     <func>
-      <name name="sign" arity="4"/>
-      <name name="sign" arity="5"/>
+      <name name="sign" arity="4" since="OTP R16B01"/>
+      <name name="sign" arity="5" since="OTP 20.1"/>
       <fsummary> Create digital signature.</fsummary>
       <desc>
 	<p>Creates a digital signature.</p>
@@ -1214,8 +1583,8 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
     </func>
 
     <func>
-      <name name="verify" arity="5"/>
-      <name name="verify" arity="6"/>
+      <name name="verify" arity="5" since="OTP R16B01"/>
+      <name name="verify" arity="6" since="OTP 20.1"/>
       <fsummary>Verifies a digital signature.</fsummary>
       <desc>
 	<p>Verifies a digital signature</p>
@@ -1229,9 +1598,15 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
       </desc>
     </func>
 
+  </funcs>
+    <section>
+      <title>Engine API</title>
+    </section>
+
+  <funcs>
     <!-- Engine functions -->
     <func>
-      <name name="privkey_to_pubkey" arity="2"/>
+      <name name="privkey_to_pubkey" arity="2" since="OTP 20.2"/>
       <fsummary>Fetches a public key from an Engine stored private key.</fsummary>
       <desc>
 	<p>Fetches the corresponding public key from a private key stored in an Engine.
@@ -1241,7 +1616,7 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
     </func>
 
     <func>
-      <name name="engine_get_all_methods" arity="0"/>
+      <name name="engine_get_all_methods" arity="0" since="OTP 20.2"/>
       <fsummary>Return list of all possible engine methods</fsummary>
       <desc>
 	<p>
@@ -1259,7 +1634,7 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
     </func>
 
     <func>
-      <name name="engine_load" arity="3"/>
+      <name name="engine_load" arity="3" since="OTP 20.2"/>
       <fsummary>Dynamical load an encryption engine</fsummary>
       <desc>
 	<p>
@@ -1281,7 +1656,7 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
     </func>
 
     <func>
-      <name name="engine_load" arity="4"/>
+      <name name="engine_load" arity="4" since="OTP 20.2"/>
       <fsummary>Dynamical load an encryption engine</fsummary>
       <desc>
 	<p>
@@ -1301,7 +1676,7 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
     </func>
 
     <func>
-      <name name="engine_unload" arity="1"/>
+      <name name="engine_unload" arity="1" since="OTP 20.2"/>
       <fsummary>Dynamical load an encryption engine</fsummary>
       <desc>
 	<p>
@@ -1321,7 +1696,7 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
     </func>
 
     <func>
-      <name name="engine_by_id" arity="1"/>
+      <name name="engine_by_id" arity="1" since="OTP 21.0.6"/>
       <fsummary>Get a reference to an already loaded engine</fsummary>
       <desc>
 	<p>
@@ -1341,7 +1716,7 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
     </func>
 
     <func>
-      <name name="engine_ctrl_cmd_string" arity="3"/>
+      <name name="engine_ctrl_cmd_string" arity="3" since="OTP 20.2"/>
       <fsummary>Sends ctrl commands to an OpenSSL engine</fsummary>
       <desc>
 	<p>
@@ -1358,7 +1733,7 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
     </func>
 
     <func>
-      <name name="engine_ctrl_cmd_string" arity="4"/>
+      <name name="engine_ctrl_cmd_string" arity="4" since="OTP 20.2"/>
       <fsummary>Sends ctrl commands to an OpenSSL engine</fsummary>
       <desc>
 	<p>
@@ -1379,7 +1754,7 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
     </func>
 
     <func>
-      <name name="engine_add" arity="1"/>
+      <name name="engine_add" arity="1" since="OTP 21.0.6"/>
       <fsummary>Add engine to OpenSSL internal list</fsummary>
       <desc>
 	<p>Add the engine to OpenSSL's internal list.</p>
@@ -1392,7 +1767,7 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
     </func>
 
     <func>
-      <name name="engine_remove" arity="1"/>
+      <name name="engine_remove" arity="1" since="OTP 21.0.6"/>
       <fsummary>Remove engine to OpenSSL internal list</fsummary>
       <desc>
 	<p>Remove the engine from OpenSSL's internal list.</p>
@@ -1405,7 +1780,7 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
     </func>
 
     <func>
-      <name name="engine_get_id" arity="1"/>
+      <name name="engine_get_id" arity="1" since="OTP 21.0.6"/>
       <fsummary>Fetch engine ID</fsummary>
       <desc>
 	<p>Return the ID for the engine, or an empty binary if there is no id set.</p>
@@ -1418,7 +1793,7 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
     </func>
 
     <func>
-      <name name="engine_get_name" arity="1"/>
+      <name name="engine_get_name" arity="1" since="OTP 21.0.6"/>
       <fsummary>Fetch engine name</fsummary>
       <desc>
 	<p>Return the name (eg a description) for the engine, or an empty binary if there is no name set.</p>
@@ -1431,7 +1806,7 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
     </func>
 
     <func>
-      <name name="engine_list" arity="0"/>
+      <name name="engine_list" arity="0" since="OTP 20.2"/>
       <fsummary>List the known engine ids</fsummary>
       <desc>
 	<p>List the id's of all engines in OpenSSL's internal list.</p>
@@ -1451,7 +1826,7 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
     </func>
 
     <func>
-      <name name="ensure_engine_loaded" arity="2"/>
+      <name name="ensure_engine_loaded" arity="2" since="OTP 21.0.6"/>
       <fsummary>Ensure encryption engine just loaded once</fsummary>
       <desc>
 	<p>
@@ -1473,7 +1848,7 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
     </func>
 
     <func>
-      <name name="ensure_engine_loaded" arity="3"/>
+      <name name="ensure_engine_loaded" arity="3" since="OTP 21.0.6"/>
       <fsummary>Ensure encryption engine just loaded once</fsummary>
       <desc>
 	<p>
@@ -1496,7 +1871,7 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
     </func>
 
     <func>
-      <name name="ensure_engine_unloaded" arity="1"/>
+      <name name="ensure_engine_unloaded" arity="1" since="OTP 21.0.6"/>
       <fsummary>Unload an engine loaded with the ensure function</fsummary>
       <desc>
 	<p>
@@ -1519,7 +1894,7 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
     </func>
 
     <func>
-      <name name="ensure_engine_unloaded" arity="2"/>
+      <name name="ensure_engine_unloaded" arity="2" since="OTP 21.0.6"/>
       <fsummary>Unload an engine loaded with the ensure function</fsummary>
       <desc>
 	<p>
@@ -1541,5 +1916,276 @@ _FloatValue = rand:uniform().     % [0.0; 1.0[</pre>
 
  </funcs>
 
+<section>
+  <title>Old API</title>
+</section>
+
+ <funcs>
+    <func>
+      <name name="block_encrypt" arity="3" since="OTP 18.0"/>
+      <fsummary>Encrypt <c>PlainText</c> according to <c>Type</c> block cipher</fsummary>
+      <desc>
+	<dont><p>Don't use this function for new programs! Use <seealso marker="crypto:new_api">the-new-api</seealso>.</p></dont>
+	<p>Encrypt <c>PlainText</c> according to <c>Type</c> block cipher.</p>
+	<p>May raise exception <c>error:notsup</c> in case the chosen <c>Type</c>
+	is not supported by the underlying libcrypto implementation.</p>
+	<p>For keylengths and blocksizes see the
+	<seealso marker="crypto:algorithm_details#ciphers">User's Guide</seealso>.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="block_decrypt" arity="3" since="OTP 18.0"/>
+      <fsummary>Decrypt <c>CipherText</c> according to <c>Type</c> block cipher</fsummary>
+      <desc>
+	<dont><p>Don't use this function for new programs! Use <seealso marker="crypto:new_api">the new api</seealso>.</p></dont>
+        <p>Decrypt <c>CipherText</c> according to <c>Type</c> block cipher.</p>
+	<p>May raise exception <c>error:notsup</c> in case the chosen <c>Type</c>
+	is not supported by the underlying libcrypto implementation.</p>
+	<p>For keylengths and blocksizes see the
+	<seealso marker="crypto:algorithm_details#ciphers">User's Guide</seealso>.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name since="OTP R16B01">block_encrypt(Type, Key, Ivec, PlainText) -> CipherText | Error</name>
+      <name since="OTP R16B01">block_encrypt(AeadType, Key, Ivec, {AAD, PlainText}) -> {CipherText, CipherTag} | Error</name>
+      <name since="OTP R16B01">block_encrypt(aes_gcm | aes_ccm, Key, Ivec, {AAD, PlainText, TagLength}) -> {CipherText, CipherTag} | Error </name>
+      <fsummary>Encrypt <c>PlainText</c> according to <c>Type</c> block cipher</fsummary>
+      <type>
+	<v>Type = <seealso marker="#type-block_cipher_with_iv">block_cipher_with_iv()</seealso></v>
+	<v>AeadType = <seealso marker="#type-aead_cipher">aead_cipher()</seealso></v>
+	<v>Key = <seealso marker="#type-key">key()</seealso> | <seealso marker="#type-des3_key">des3_key()</seealso></v>
+        <v>PlainText = iodata()</v>
+        <v>AAD = IVec = CipherText = CipherTag = binary()</v>
+        <v>TagLength = 1..16</v>
+	<v>Error = <seealso marker="#type-run_time_error">run_time_error()</seealso></v>
+      </type>
+      <desc>
+	<dont><p>Don't use this function for new programs! Use <seealso marker="crypto:new_api">the new api</seealso>.</p></dont>
+        <p>Encrypt <c>PlainText</c> according to <c>Type</c> block cipher.
+	<c>IVec</c> is an arbitrary initializing vector.</p>
+	<p>In AEAD (Authenticated Encryption with Associated Data) mode, encrypt
+	<c>PlainText</c>according to <c>Type</c> block cipher and calculate
+	<c>CipherTag</c> that also authenticates the <c>AAD</c> (Associated Authenticated Data).</p>
+	<p>May raise exception <c>error:notsup</c> in case the chosen <c>Type</c>
+	is not supported by the underlying libcrypto implementation.</p>
+	<p>For keylengths, iv-sizes and blocksizes see the
+	<seealso marker="crypto:algorithm_details#ciphers">User's Guide</seealso>.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name since="OTP R16B01">block_decrypt(Type, Key, Ivec, CipherText) -> PlainText | Error</name>
+      <name since="OTP R16B01">block_decrypt(AeadType, Key, Ivec, {AAD, CipherText, CipherTag}) -> PlainText | Error</name>
+      <fsummary>Decrypt <c>CipherText</c> according to <c>Type</c> block cipher</fsummary>
+      <type>
+	<v>Type = <seealso marker="#type-block_cipher_with_iv">block_cipher_with_iv()</seealso></v>
+	<v>AeadType = <seealso marker="#type-aead_cipher">aead_cipher()</seealso></v>
+	<v>Key = <seealso marker="#type-key">key()</seealso> | <seealso marker="#type-des3_key">des3_key()</seealso></v>
+        <v>PlainText = iodata()</v>
+        <v>AAD = IVec = CipherText = CipherTag = binary()</v>
+	<v>Error = BadTag | <seealso marker="#type-run_time_error">run_time_error()</seealso></v>
+	<v>BadTag = error</v>
+      </type>
+      <desc>
+	<dont><p>Don't use this function for new programs! Use <seealso marker="crypto:new_api">the new api</seealso>.</p></dont>
+        <p>Decrypt <c>CipherText</c> according to <c>Type</c> block cipher.
+	<c>IVec</c> is an arbitrary initializing vector.</p>
+        <p>In AEAD (Authenticated Encryption with Associated Data) mode, decrypt
+	<c>CipherText</c>according to <c>Type</c> block cipher and check the authenticity
+	the <c>PlainText</c> and <c>AAD</c> (Associated Authenticated Data) using the
+	<c>CipherTag</c>. May return <c>error</c> if the decryption or validation fail's</p>
+	<p>May raise exception <c>error:notsup</c> in case the chosen <c>Type</c>
+	is not supported by the underlying libcrypto implementation.</p>
+	<p>For keylengths, iv-sizes and blocksizes see the
+	<seealso marker="crypto:algorithm_details#ciphers">User's Guide</seealso>.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="stream_init" arity="2" since="OTP R16B01"/>
+      <fsummary></fsummary>
+      <desc>
+	<dont><p>Don't use this function for new programs! Use <seealso marker="crypto:new_api">the new api</seealso>.</p></dont>
+        <p>Initializes the state for use in RC4 stream encryption
+        <seealso marker="#stream_encrypt-2">stream_encrypt</seealso> and
+        <seealso marker="#stream_decrypt-2">stream_decrypt</seealso></p>
+	<p>For keylengths see the
+	<seealso marker="crypto:algorithm_details#ciphers">User's Guide</seealso>.
+	</p>
+      </desc>
+    </func>
+
+   <func>
+      <name name="stream_init" arity="3" since="OTP R16B01"/>
+      <fsummary></fsummary>
+      <desc>
+	<dont><p>Don't use this function for new programs! Use <seealso marker="crypto:new_api">the new api</seealso>.</p></dont>
+        <p>Initializes the state for use in streaming AES encryption using Counter mode (CTR).
+        <c>Key</c> is the AES key and must be either 128, 192, or 256 bits long. <c>IVec</c> is
+        an arbitrary initializing vector of 128 bits (16 bytes). This state is for use with
+        <seealso marker="#stream_encrypt-2">stream_encrypt</seealso> and
+        <seealso marker="#stream_decrypt-2">stream_decrypt</seealso>.</p>
+	<p>For keylengths and iv-sizes see the
+	<seealso marker="crypto:algorithm_details#ciphers">User's Guide</seealso>.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="stream_encrypt" arity="2" since="OTP R16B01"/>
+      <fsummary></fsummary>
+      <desc>
+	<dont><p>Don't use this function for new programs! Use <seealso marker="crypto:new_api">the new api</seealso>.</p></dont>
+	<p>Encrypts <c>PlainText</c> according to the stream cipher <c>Type</c> specified in stream_init/3.
+	<c>Text</c> can be any number of bytes. The initial <c>State</c> is created using
+        <seealso marker="#stream_init-2">stream_init</seealso>.
+	<c>NewState</c> must be passed into the next call to <c>stream_encrypt</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="stream_decrypt" arity="2" since="OTP R16B01"/>
+      <fsummary></fsummary>
+      <desc>
+	<dont><p>Don't use this function for new programs! Use <seealso marker="crypto:new_api">the new api</seealso>.</p></dont>
+	<p>Decrypts <c>CipherText</c> according to the stream cipher <c>Type</c> specified in stream_init/3.
+	<c>PlainText</c> can be any number of bytes. The initial <c>State</c> is created using
+        <seealso marker="#stream_init-2">stream_init</seealso>.
+	<c>NewState</c> must be passed into the next call to <c>stream_decrypt</c>.</p>
+      </desc>
+    </func>
+
+   <func>
+      <name name="supports" arity="0" since="OTP R16B01"/>
+      <fsummary>Provide a list of available crypto algorithms.</fsummary>
+      <desc>
+	<dont><p>Don't use this function for new programs! Use
+	<seealso marker="crypto#supports-1">supports/1</seealso> in
+	<seealso marker="crypto:new_api">the new api</seealso>.</p></dont>
+        <p> Can be used to determine which crypto algorithms that are supported
+	by the underlying libcrypto library</p>
+	<p>See <seealso marker="#hash_info-1">hash_info/1</seealso> and <seealso marker="#cipher_info-1">cipher_info/1</seealso>
+	for information about the hash and cipher algorithms.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="hmac" arity="3" since="OTP R16B"/>
+      <name name="hmac" arity="4" since="OTP R16B"/>
+      <fsummary></fsummary>
+      <desc>
+	<dont><p>Don't use this function for new programs! Use
+	      <seealso marker="crypto#mac-4">mac/4</seealso> or
+	      <seealso marker="crypto#macN-5">macN/5</seealso> in
+	      <seealso marker="crypto:new_api">the new api</seealso>.</p>
+	</dont>
+        <p>Computes a HMAC of type <c>Type</c> from <c>Data</c> using
+        <c>Key</c> as the authentication key.</p> <p><c>MacLength</c>
+        will limit the size of the resultant <c>Mac</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="hmac_init" arity="2" since="OTP R14B03"/>
+      <fsummary></fsummary>
+      <desc>
+	<dont><p>Don't use this function for new programs! Use
+	      <seealso marker="crypto#mac_init-3">mac_init/3</seealso> in
+	      <seealso marker="crypto:new_api">the new api</seealso>.</p>
+	</dont>
+        <p>Initializes the context for streaming HMAC operations. <c>Type</c> determines
+        which hash function to use in the HMAC operation. <c>Key</c> is the authentication
+        key. The key can be any length.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="hmac_update" arity="2" since="OTP R14B03"/>
+      <fsummary></fsummary>
+      <desc>
+	<dont><p>Don't use this function for new programs! Use
+	      <seealso marker="crypto#mac_update-2">mac_update/2</seealso> in
+	      <seealso marker="crypto:new_api">the new api</seealso>.</p>
+	</dont>
+        <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
+        <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
+	<seealso marker="#hmac_final_n-2">hmac_final_n</seealso>
+	</p>
+	<warning><p>Do not use a <c>Context</c> as argument in more than one
+	call to	hmac_update or hmac_final. The semantics of reusing old contexts
+	in any way is undefined and could even crash the VM in earlier releases.
+	The reason for this limitation is a lack of support in the underlying
+	libcrypto	API.</p></warning>
+      </desc>
+    </func>
+
+    <func>
+      <name name="hmac_final" arity="1" since="OTP R14B03"/>
+      <fsummary></fsummary>
+      <desc>
+	<dont><p>Don't use this function for new programs! Use
+	      <seealso marker="crypto#mac_final-1">mac_final/1</seealso> in
+	      <seealso marker="crypto:new_api">the new api</seealso>.</p>
+	</dont>
+        <p>Finalizes the HMAC operation referenced by <c>Context</c>. The size of the resultant MAC is
+        determined by the type of hash function used to generate it.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="hmac_final_n" arity="2" since="OTP R14B03"/>
+      <fsummary></fsummary>
+      <desc>
+	<dont><p>Don't use this function for new programs! Use
+	      <seealso marker="crypto#mac_finalN-2">mac_finalN/2</seealso> in
+	      <seealso marker="crypto:new_api">the new api</seealso>.</p>
+	</dont>
+        <p>Finalizes the HMAC operation referenced by <c>Context</c>. <c>HashLen</c> must be greater than
+        zero. <c>Mac</c> will be a binary with at most <c>HashLen</c> bytes. Note that if HashLen is greater than the actual number of bytes returned from the underlying hash, the returned hash will have fewer than <c>HashLen</c> bytes.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="cmac" arity="3" since="OTP 20.0"/>
+      <name name="cmac" arity="4" since="OTP 20.0"/>
+      <fsummary>Calculates the Cipher-based Message Authentication Code.</fsummary>
+      <desc>
+	<dont><p>Don't use this function for new programs! Use
+	      <seealso marker="crypto#mac-4">mac/4</seealso> or
+	      <seealso marker="crypto#macN-5">macN/5</seealso> in
+	      <seealso marker="crypto:new_api">the new api</seealso>.</p>
+	</dont>
+        <p>Computes a CMAC of type <c>Type</c> from <c>Data</c> using
+        <c>Key</c> as the authentication key.</p> <p><c>MacLength</c>
+        will limit the size of the resultant <c>Mac</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="poly1305" arity="2" since="OTP 21.1"/>
+      <fsummary></fsummary>
+      <desc>
+	<dont><p>Don't use this function for new programs! Use
+	      <seealso marker="crypto#mac-3">mac/3</seealso> or
+	      <seealso marker="crypto#macN-4">macN/4</seealso> in
+	      <seealso marker="crypto:new_api">the new api</seealso>.</p>
+	</dont>
+        <p>Computes a POLY1305 message authentication code (<c>Mac</c>) from <c>Data</c> using
+        <c>Key</c> as the authentication key.</p>
+      </desc>
+    </func>
+
+  </funcs>
+
 
 </erlref>
diff --git a/lib/crypto/doc/src/engine_keys.xml b/lib/crypto/doc/src/engine_keys.xml
index feeb353d1e..f78bb81bba 100644
--- a/lib/crypto/doc/src/engine_keys.xml
+++ b/lib/crypto/doc/src/engine_keys.xml
@@ -40,7 +40,7 @@
     </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 
+      private or public keys. Such a storage could be made safer than the normal file system. Those 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>
@@ -51,7 +51,7 @@
     <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
+      <seealso marker="ssl:ssl#type-key">SSL</seealso>. If using
       the crypto application directly, it is required that:
     </p>
     <list>
diff --git a/lib/crypto/doc/src/new_api.xml b/lib/crypto/doc/src/new_api.xml
new file mode 100644
index 0000000000..aacf5e4f76
--- /dev/null
+++ b/lib/crypto/doc/src/new_api.xml
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE chapter SYSTEM "chapter.dtd">
+
+<chapter>
+  <header>
+    <copyright>
+      <year>2014</year><year>2019</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>New and Old API</title>
+    <prepared>Hans Nilsson</prepared>
+    <docno></docno>
+    <date>2019-08-22</date>
+    <rev>A</rev>
+    <file>new_api.xml</file>
+  </header>
+  <p>
+    This chapter describes the new api to encryption and decryption.
+  </p>
+
+  <section>
+    <title>Background</title>
+    <p>The CRYPTO app has evolved during its lifetime. Since also the OpenSSL cryptolib has changed the
+    API several times, there are parts of the CRYPTO app that uses a very old one internally and
+    other parts that uses the latest one. The internal definitions of e.g cipher names was a bit hard
+    to maintain.
+    </p>
+    <p>It turned out that using the old api in the new way (more about that later), and still keep it
+    backwards compatible, was not possible. Specially as more precision in the error messages is desired
+    it could not be combined with the old standard.
+    </p>
+    <p>Therefore the old api (see next section) is kept for now but internally implemented with new primitives.
+    </p>
+  </section>
+
+  <section>
+    <title>The old API</title>
+    <p>The old functions - not recommended for new programs - are for chipers:</p>
+    <list>
+      <item><seealso marker="crypto#block_encrypt-3">block_encrypt/3</seealso></item>
+      <item><seealso marker="crypto#block_encrypt-4">block_encrypt/4</seealso></item>
+      <item><seealso marker="crypto#block_decrypt-3">block_decrypt/3</seealso></item>
+      <item><seealso marker="crypto#block_decrypt-4">block_decrypt/4</seealso></item>
+      <item><seealso marker="crypto#stream_init-2">stream_init/2</seealso></item>
+      <item><seealso marker="crypto#stream_init-2">stream_init/3</seealso></item>
+      <item><seealso marker="crypto#stream_encrypt-2">stream_encrypt/2</seealso></item>
+      <item><seealso marker="crypto#stream_decrypt-2">stream_decrypt/2</seealso></item>
+    </list>
+    <p>for lists of supported algorithms:</p>
+    <list>
+      <item><seealso marker="crypto#supports-0">supports/0</seealso></item>
+    </list>
+    <p>and for MACs (Message Authentication Codes):</p>
+    <list>
+      <item><seealso marker="crypto#cmac-3">cmac/3</seealso></item>
+      <item><seealso marker="crypto#cmac-4">cmac/4</seealso></item>
+      <item><seealso marker="crypto#hmac-3">hmac/3</seealso></item>
+      <item><seealso marker="crypto#hmac-4">hmac/4</seealso></item>
+      <item><seealso marker="crypto#hmac_init-2">hmac_init/2</seealso></item>
+      <item><seealso marker="crypto#hmac_update-2">hmac_update/2</seealso></item>
+      <item><seealso marker="crypto#hmac_final-1">hmac_final/1</seealso></item>
+      <item><seealso marker="crypto#hmac_final_n-2">hmac_final_n/2</seealso></item>
+      <item><seealso marker="crypto#poly1305-2">poly1305/2</seealso></item>
+    </list>
+    <p>They are not deprecated for now, but may be in a future release.
+    </p>
+  </section>
+
+  <section>
+    <title>The new API</title>
+    <section>
+      <title>Encryption and decryption</title>
+      <p>The new functions for encrypting or decrypting one single binary are:
+      </p>
+      <list>
+	<item><seealso marker="crypto#crypto_one_time/4">crypto_one_time/4</seealso></item>
+	<item><seealso marker="crypto#crypto_one_time/5">crypto_one_time/5</seealso></item>
+	<item><seealso marker="crypto#crypto_one_time_aead/6">crypto_one_time_aead/6</seealso></item>
+	<item><seealso marker="crypto#crypto_one_time_aead/7">crypto_one_time_aead/7</seealso></item>
+      </list>
+      <p>In those functions the internal crypto state is first created and initialized
+      with the cipher type, the key and possibly other data. Then the single binary is encrypted
+      or decrypted,
+      the crypto state is de-allocated and the result of the crypto operation is returned.
+      </p>
+      <p>The <c>crypto_one_time_aead</c> functions are for the ciphers of mode <c>ccm</c> or
+      <c>gcm</c>, and for the cipher <c>chacha20-poly1305</c>.
+      </p>
+      <p>For repeated encryption or decryption of a text divided in parts, where the internal
+      crypto state is initialized once, and then many binaries are encrypted or decrypted with
+      the same state, the functions are:
+      </p>
+      <list>
+	<item><seealso marker="crypto#crypto_init/4">crypto_init/4</seealso></item>
+	<item><seealso marker="crypto#crypto_init/3">crypto_init/3</seealso></item>
+	<item><seealso marker="crypto#crypto_update/2">crypto_update/2</seealso></item>
+      </list>
+      <p>The <c>crypto_init</c> initialies an internal cipher state, and one or more calls of
+      <c>crypto_update</c> does the acual encryption or decryption. Note that AEAD ciphers
+      can't be handled this way due to their nature.
+      </p>
+      <p>For repeated encryption or decryption of a text divided in parts where the
+      same cipher and same key is used, but a new initialization vector (nounce) should be applied
+      for each part, the functions are:
+      </p>
+      <list>
+	<item><seealso marker="crypto#crypto_dyn_iv_init/3">crypto_dyn_iv_init/3</seealso></item>
+	<item><seealso marker="crypto#crypto_dyn_iv_update/3">crypto_dyn_iv_update/3</seealso></item>
+      </list>
+      <p>An example of where those functions are needed, is when handling the TLS protocol.</p>
+      <p>For information about available algorithms, use:
+      </p>
+      <list>
+	<item><seealso marker="crypto#supports-1">supports/1</seealso></item>
+	<item><seealso marker="crypto#hash_info-1">hash_info/1</seealso></item>
+	<item><seealso marker="crypto#cipher_info-1">cipher_info/1</seealso></item>
+      </list>
+    </section>
+
+    <section>
+      <title>MACs (Message Authentication Codes)</title>
+      <p>The new functions for calculating a MAC of a single piece of text are:</p>
+      <list>
+        <item><seealso marker="crypto#mac-3">mac/3</seealso></item>
+        <item><seealso marker="crypto#mac-4">mac/4</seealso></item>
+        <item><seealso marker="crypto#macN-4">macN/4</seealso></item>
+        <item><seealso marker="crypto#macN-5">macN/5</seealso></item>
+      </list>
+      <p>For calculating a MAC of a text divided in parts use:</p>
+      <list>
+        <item><seealso marker="crypto#mac_init-2">mac_init/2</seealso></item>
+        <item><seealso marker="crypto#mac_init-3">mac_init/3</seealso></item>
+        <item><seealso marker="crypto#mac_update-2">mac_update/2</seealso></item>
+        <item><seealso marker="crypto#mac_final-1">mac_final/1</seealso></item>
+        <item><seealso marker="crypto#mac_finalN-2">mac_finalN/2</seealso></item>
+      </list>
+    </section>
+  </section>
+
+  <section>
+    <title>Examples of the new api</title>
+    <section>
+      <title>Examples of crypto_init/4 and crypto_update/2</title>
+      <p>The functions <seealso marker="crypto#crypto_init/4">crypto_init/4</seealso>
+      and <seealso marker="crypto#crypto_update/2">crypto_update/2</seealso> are intended
+      to be used for encrypting or decrypting a sequence of blocks. First one call of
+      <c>crypto_init/4</c> initialises the crypto context. One or more calls <c>crypto_update/2</c>
+      does the actual encryption or decryption for each block.
+      </p>
+      <p>This example shows first the encryption of two blocks and then decryptions of the cipher
+      text, but divided into three blocks just to show that it is possible to divide the plain text and
+      cipher text differently for some ciphers:</p>
+      <code type="erl">
+	1> crypto:start().
+	ok
+	2> Key = &lt;&lt;1:128>>.
+	&lt;&lt;0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1>>
+	3> IV = &lt;&lt;0:128>>.
+	&lt;&lt;0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0>>
+	4> StateEnc = crypto:crypto_init(aes_128_ctr, Key, IV, true). % encrypt -> true
+	#Ref&lt;0.3768901617.1128660993.124047>
+	5> crypto:crypto_update(StateEnc, &lt;&lt;"First bytes">>).
+	&lt;&lt;67,44,216,166,25,130,203,5,66,6,162>>
+	6> crypto:crypto_update(StateEnc, &lt;&lt;"Second bytes">>).
+	&lt;&lt;16,79,94,115,234,197,94,253,16,144,151,41>>
+	7>
+	7> StateDec = crypto:crypto_init(aes_128_ctr, Key, IV, false). % decrypt -> false
+	#Ref&lt;0.3768901617.1128660994.124255>
+	8> crypto:crypto_update(StateDec, &lt;&lt;67,44,216,166,25,130,203>>).
+	&lt;&lt;"First b">>
+	9> crypto:crypto_update(StateDec, &lt;&lt;5,66,6,162,16,79,94,115,234,197,
+        94,253,16,144,151>>).
+	&lt;&lt;"ytesSecond byte">>
+	10> crypto:crypto_update(StateDec, &lt;&lt;41>>).
+	&lt;&lt;"s">>
+	11>
+      </code>
+      <p>Note that the internal data that the <c>StateEnc</c> and <c>StateDec</c> references are
+      destructivly updated by the calls to <seealso marker="crypto#crypto_update/2">crypto_update/2</seealso>.
+      This is to gain time in the calls of the nifs interfacing the cryptolib. In a loop where the
+      state is saved in the loop's state, it also saves one update of the loop state per crypto operation.
+      </p>
+      <p>For example, a simple server receiving text parts to encrypt and send the result back to the
+      one who sent them (the <c>Requester</c>):
+      </p>
+      <code type="erl">
+	encode(Crypto, Key, IV) ->
+	crypto_loop(crypto:crypto_init(Crypto, Key, IV, true)).
+
+	crypto_loop(State) ->
+	receive
+        {Text, Requester} ->
+        Requester ! crypto:crypto_update(State, Text),
+	loop(State)
+	end.
+      </code>
+    </section>
+
+    <section>
+      <title>Example of crypto_one_time/5</title>
+      <p>The same example as in the
+      <seealso marker="#examples-of-crypto_init-4-and-crypto_update-2">previous section</seealso>,
+      but now with one call to <seealso marker="crypto#crypto_one_time/5">crypto_one_time/5</seealso>:
+      </p>
+      <code>
+	1> Key = &lt;&lt;1:128>>.
+	&lt;&lt;0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1>>
+	2> IV = &lt;&lt;0:128>>.
+	&lt;&lt;0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0>>
+	3> Txt = [&lt;&lt;"First bytes">>,&lt;&lt;"Second bytes">>].
+	[&lt;&lt;"First bytes">>,&lt;&lt;"Second bytes">>]
+	4> crypto:crypto_one_time(aes_128_ctr, Key, IV, Txt, true).
+	&lt;&lt;67,44,216,166,25,130,203,5,66,6,162,16,79,94,115,234,
+	197,94,253,16,144,151,41>>
+	5>
+      </code>
+      <p>The <c>[&lt;&lt;"First bytes">>,&lt;&lt;"Second bytes">>]</c> could of course have been one
+      single binary: <c>&lt;&lt;"First bytesSecond bytes">></c>.
+      </p>
+    </section>
+
+    <section>
+      <title>Example of crypto_one_time_aead/6</title>
+      <p>The same example as in the
+      <seealso marker="#example-of-crypto_one_time-5">previous section</seealso>,
+      but now with one call to <seealso marker="crypto#crypto_one_time_aead/6">crypto_one_time_aead/6</seealso>:
+      </p>
+      <code>
+	1> Key = &lt;&lt;1:128>>.
+	&lt;&lt;0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1>>
+	2> IV = &lt;&lt;0:128>>.
+	&lt;&lt;0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0>>
+	3> Txt = [&lt;&lt;"First bytes">>,&lt;&lt;"Second bytes">>].
+	[&lt;&lt;"First bytes">>,&lt;&lt;"Second bytes">>]
+	4> AAD = &lt;&lt;"Some bytes">>.
+	&lt;&lt;"Some bytes">>
+	5> crypto:crypto_one_time_aead(aes_128_gcm, Key, IV, Txt, AAD, true).
+	{&lt;&lt;240,130,38,96,130,241,189,52,3,190,179,213,132,1,72,
+	192,103,176,90,104,15,71,158>>,
+	&lt;&lt;131,47,45,91,142,85,9,244,21,141,214,71,31,135,2,155>>}
+	9>
+      </code>
+      <p>The <c>[&lt;&lt;"First bytes">>,&lt;&lt;"Second bytes">>]</c> could of course have been one
+      single binary: <c>&lt;&lt;"First bytesSecond bytes">></c>.
+      </p>
+    </section>
+
+    <section>
+      <title>Example of mac_init mac_update and mac_final</title>
+      <code>
+	1> Key = &lt;&lt;1:128>>.           
+	&lt;&lt;0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1>>
+	2> StateMac = crypto:mac_init(cmac, aes_128_cbc, Key).                   
+	#Ref&lt;0.2424664121.2781478916.232610>
+	3> crypto:mac_update(StateMac, &lt;&lt;"First bytes">>).
+	#Ref&lt;0.2424664121.2781478916.232610>
+	4> crypto:mac_update(StateMac, " ").              
+	#Ref&lt;0.2424664121.2781478916.232610>
+	5> crypto:mac_update(StateMac, &lt;&lt;"last bytes">>). 
+	#Ref&lt;0.2424664121.2781478916.232610>
+	6> crypto:mac_final(StateMac).
+	&lt;&lt;68,191,219,128,84,77,11,193,197,238,107,6,214,141,160,
+	249>>
+	7>
+      </code>
+      <p>and compare the result with a single calculation just for this example:</p>
+      <code>
+	7> crypto:mac(cmac, aes_128_cbc, Key, "First bytes last bytes").
+	&lt;&lt;68,191,219,128,84,77,11,193,197,238,107,6,214,141,160,
+	249>>
+	8> v(7) == v(6).
+	true
+	9> 
+      </code>
+    </section>
+
+  </section>
+
+  <section>
+    <title>Retired cipher names</title>
+    <p>This table lists the retired cipher names in the first column and suggests names to replace them with
+    in the second column.
+    </p>
+    <p>The new names follows the OpenSSL libcrypto names. The format is ALGORITM_KEYSIZE_MODE.
+    </p>
+    <p>Examples of algorithms are aes, chacha20 and des.  The keysize is the number of bits
+    and examples of the mode are cbc, ctr and gcm. The mode may be followed by a number depending
+    on the mode. An example is the ccm mode which has a variant called ccm8 where the so called tag
+    has a length of eight bits.
+    </p>
+    <p>The old names had by time lost any common naming convention which the new names now introduces. The new names include
+    the key length which improves the error checking in the lower levels of the crypto application.
+    </p>
+
+    <table>
+      <row><cell><strong>Instead of:</strong></cell> <cell><strong>Use:</strong> </cell></row>
+
+      <row><cell><c>aes_cbc128</c>   </cell> <cell> <c>aes_128_cbc</c> </cell></row>
+      <row><cell><c>aes_cbc256</c>   </cell> <cell> <c>aes_256_cbc</c> </cell></row>
+      <row><cell><c>aes_cbc</c>      </cell> <cell> <c>aes_128_cbc, aes_192_cbc, aes_256_cbc</c></cell></row>
+      <row><cell><c>aes_ccm</c>      </cell> <cell> <c>aes_128_ccm, aes_192_ccm, aes_256_ccm</c></cell></row>
+      <row><cell><c>aes_cfb128</c>   </cell> <cell> <c>aes_128_cfb128, aes_192_cfb128, aes_256_cfb128</c></cell></row>
+      <row><cell><c>aes_cfb8</c>     </cell> <cell> <c>aes_128_cfb8, aes_192_cfb8, aes_256_cfb8</c></cell></row>
+      <row><cell><c>aes_ctr</c>      </cell> <cell> <c>aes_128_ctr, aes_192_ctr, aes_256_ctr</c></cell></row>
+      <row><cell><c>aes_gcm</c>      </cell> <cell> <c>aes_128_gcm, aes_192_gcm, aes_256_gcm</c></cell></row>
+      <row><cell><c>des3_cbc</c>     </cell> <cell> <c>des_ede3_cbc</c></cell></row>
+      <row><cell><c>des3_cbf</c>     </cell> <cell> <c>des_ede3_cfb</c></cell></row>
+      <row><cell><c>des3_cfb</c>     </cell> <cell> <c>des_ede3_cfb</c></cell></row>
+      <row><cell><c>des_ede3</c>     </cell> <cell> <c>des_ede3_cbc</c></cell></row>
+      <row><cell><c>des_ede3_cbf</c> </cell> <cell> <c>des_ede3_cfb</c></cell></row>
+      <tcaption></tcaption>
+    </table>
+  </section>
+
+</chapter>
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index 0a3f68ade2..5f47981855 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -31,6 +31,202 @@
   </header>
   <p>This document describes the changes made to the Crypto application.</p>
 
+<section><title>Crypto 4.5.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The cipher aes-ctr was disabled by misstake in
+	    crypto:supports for cryptolibs before 1.0.1. It worked
+	    however in the encrypt and decrypt functions.</p>
+          <p>
+	    Own Id: OTP-15829</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Crypto 4.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed a bug in error return for <c>crypto:poly1305/2</c>.
+	    It returned the atom <c>notsup</c> instead of the
+	    exception <c>notsup</c>.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15677</p>
+        </item>
+        <item>
+          <p>
+	    The cipher chacha20 was introduced in OpenSSL 1.1.0.
+	    However, it could in a very odd situation, fail for
+	    versions less than OpenSSL 1.1.0d. It is therefore
+	    disabled for those versions.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15678</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> A new <c>rand</c> module algorithm, <c>exro928ss</c>
+	    (Xoroshiro928**), has been implemented. It has got a
+	    really long period and good statistical quality for all
+	    output bits, while still being only about 50% slower than
+	    the default algorithm. </p><p> The same generator is also
+	    used as a long period counter in a new <c>crypto</c>
+	    plugin for the <c>rand</c> module, algorithm
+	    <c>crypto_aes</c>. This plugin uses AES-256 to scramble
+	    the counter which buries any detectable statistical
+	    artifacts. Scrambling is done in chunks which are cached
+	    to get good amortized speed (about half of the default
+	    algorithm). </p>
+          <p>
+	    Own Id: OTP-14461 Aux Id: PR-1857 </p>
+        </item>
+        <item>
+          <p>
+	    Crypto's single C-file is split into multiple files. The
+	    different coding styles in the different parts are
+	    unified into a single style.</p>
+          <p>
+	    Own Id: OTP-14732 Aux Id: PR-2068, PR-2095 </p>
+        </item>
+        <item>
+          <p>
+	    Build configuration of the <c>crypto</c> application has
+	    been moved from the <c>erts</c> application into the
+	    <c>crypto</c> application.</p>
+          <p>
+	    Own Id: OTP-15129</p>
+        </item>
+        <item>
+          <p>
+	    Adds two hash functions <c>blake2b</c> and <c>blake2s</c>
+	    (64 bit hash and 32 bit hash respectively). These are
+	    modern and standard hash functions used in blockchains
+	    and encrypted communication protocols. The hash functions
+	    are available in OpenSSL since version 1.1.1.</p>
+          <p>
+	    Own Id: OTP-15564 Aux Id: PR-2129 </p>
+        </item>
+        <item>
+          <p>
+	    A new API is implemented in crypto. See the CRYPTO user's
+	    guide, chapter <i>New and Old API</i> for more
+	    information.</p>
+          <p>
+	    The old api with the <c>crypto:block_*</c> and
+	    <c>crypto:stream_*</c> interfaces are kept for
+	    compatibility, but implemented with the new api. Please
+	    note that since the error checking is more thorough,
+	    there <i>might</i> be arguments with for example faulty
+	    lengths that are no longer accepted.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15644 Aux Id: OTP-14732 , OTP-15451, PR-1857
+	    , PR-2068, PR-2095 </p>
+        </item>
+        <item>
+          <p>
+	    The new hash_info/1 and cipher_info/1 functions returns
+	    maps with information about the hash or cipher in the
+	    argument.</p>
+          <p>
+	    Own Id: OTP-15655 Aux Id: PR-2173, ERL-864, PR-2186 </p>
+        </item>
+        <item>
+          <p>
+	    Obey additional OpenSSL configure flags when compiling
+	    the C-part of the CRYPTO application: <c>no-bf</c>,
+	    <c>no-blake2</c>, <c>no-chacha</c>, <c>no-cmac</c>,
+	    <c>no-dh</c>, <c>no-dsa</c>, <c>no-md4</c>,
+	    <c>no-poly1305</c>, <c>no-rc2</c>, <c>no-rc4</c> and
+	    <c>no-rmd160</c>.</p>
+          <p>
+	    Own Id: OTP-15683</p>
+        </item>
+        <item>
+          <p>
+	    A new function <c>crypto:supports/1</c> is introduced.
+	    The single argument takes an atom as argument:
+	    <c>hashes</c>, <c>public_keys</c>, <c>ciphers</c>,
+	    <c>macs</c>, <c>curves</c> or <c>rsa_opts</c>. The return
+	    value is a list of supported algorithms.</p>
+          <p>
+	    The difference with the existing <c>crypto:supports/0</c>
+	    is, apart from the argument and the return value, that
+	    the old function reports what is supported by the old
+	    api, and the new function reports algorithms in the new
+	    api.</p>
+          <p>
+	    Own Id: OTP-15771</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Crypto 4.4.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed build link error on Windows. Unresolved symbol
+	    'bcmp'.</p>
+          <p>
+	    Own Id: OTP-15750 Aux Id: ERL-905 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Crypto 4.4.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixes a bug that caused <c>crypto:sign</c> and
+	    <c>crypto:verify</c> to return the error message
+	    <c>badarg</c> instead of <c>notsup</c> in one case. That
+	    case was when signing or verifying with eddsa keys (that
+	    is, ed15519 or ed448), but only when FIPS was supported
+	    and enabled.</p>
+          <p>
+	    Own Id: OTP-15634</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Added a crypto benchmark test suite.</p>
+          <p>
+	    Own Id: OTP-15447</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Crypto 4.4</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 2dfc966609..134f900d4c 100644
--- a/lib/crypto/doc/src/usersguide.xml
+++ b/lib/crypto/doc/src/usersguide.xml
@@ -51,4 +51,5 @@
   <xi:include href="engine_load.xml"/>
   <xi:include href="engine_keys.xml"/>
   <xi:include href="algorithm_details.xml"/>
+  <xi:include href="new_api.xml"/>
 </part>
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index 72cb9aabfd..965697578d 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -24,28 +24,50 @@
 
 -export([start/0, stop/0, info_lib/0, info_fips/0, supports/0, enable_fips_mode/1,
          version/0, bytes_to_integer/1]).
+-export([cipher_info/1, hash_info/1]).
 -export([hash/2, hash_init/1, hash_update/2, hash_final/1]).
 -export([sign/4, sign/5, verify/5, verify/6]).
 -export([generate_key/2, generate_key/3, compute_key/4]).
--export([hmac/3, hmac/4, hmac_init/2, hmac_update/2, hmac_final/1, hmac_final_n/2]).
--export([cmac/3, cmac/4]).
--export([poly1305/2]).
 -export([exor/2, strong_rand_bytes/1, mod_pow/3]).
--export([rand_seed/0, rand_seed_alg/1]).
--export([rand_seed_s/0, rand_seed_alg_s/1]).
+-export([rand_seed/0, rand_seed_alg/1, rand_seed_alg/2]).
+-export([rand_seed_s/0, rand_seed_alg_s/1, rand_seed_alg_s/2]).
 -export([rand_plugin_next/1]).
+-export([rand_plugin_aes_next/1, rand_plugin_aes_jump/1]).
 -export([rand_plugin_uniform/1]).
 -export([rand_plugin_uniform/2]).
 -export([rand_cache_plugin_next/1]).
 -export([rand_uniform/2]).
--export([block_encrypt/3, block_decrypt/3, block_encrypt/4, block_decrypt/4]).
 -export([next_iv/2, next_iv/3]).
--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([privkey_to_pubkey/2]).
 -export([ec_curve/1, ec_curves/0]).
 -export([rand_seed/1]).
+
+%% Old interface. Now implemented with the New interface
+-export([hmac/3, hmac/4, hmac_init/2, hmac_update/2, hmac_final/1, hmac_final_n/2]).
+-export([cmac/3, cmac/4]).
+-export([poly1305/2]).
+-export([stream_init/2, stream_init/3,
+         stream_encrypt/2,
+         stream_decrypt/2,
+         block_encrypt/3, block_encrypt/4,
+         block_decrypt/3, block_decrypt/4
+        ]).
+
+%% New interface
+-export([crypto_init/4, crypto_init/3,
+         crypto_update/2,
+         crypto_one_time/4, crypto_one_time/5,
+         crypto_one_time_aead/6, crypto_one_time_aead/7,
+         crypto_dyn_iv_init/3,
+         crypto_dyn_iv_update/3,
+         supports/1,
+         mac/3, mac/4, macN/4, macN/5,
+         mac_init/2, mac_init/3, mac_update/2, mac_final/1, mac_finalN/2
+        ]).
+
+
 %% Engine
 -export([
          engine_get_all_methods/0,
@@ -88,11 +110,15 @@
 -export_type([
               stream_state/0,
               hmac_state/0,
-              hash_state/0
+              hash_state/0,
+              crypto_state/0,
+              mac_state/0
              ]).
-   
+
 %% Private. For tests.
--export([packed_openssl_version/4, engine_methods_convert_to_bitmask/2, get_test_engine/0]).
+-export([packed_openssl_version/4, engine_methods_convert_to_bitmask/2,
+	 get_test_engine/0]).
+-export([rand_plugin_aes_jump_2pow20/1]).
 
 -deprecated({rand_uniform, 2, next_major_release}).
 
@@ -113,7 +139,7 @@
 -type rsa_private() :: [key_integer()] . % [E, N, D] | [E, N, D, P1, P2, E1, E2, C]
 -type rsa_params() :: {ModulusSizeInBits::integer(), PublicExponent::key_integer()} .
 
--type dss_public() :: [key_integer()] . % [P, Q, G, Y] 
+-type dss_public() :: [key_integer()] . % [P, Q, G, Y]
 -type dss_private() :: [key_integer()] . % [P, Q, G, X]
 
 -type ecdsa_public()  :: key_integer() .
@@ -255,23 +281,136 @@
 
 -type edwards_curve_ed() :: ed25519 | ed448 .
 
-%%% 
+%%%----------------------------------------------------------------
+%%% New cipher schema
+%%%
+-type cipher() :: cipher_no_iv()
+                | cipher_iv()
+                | cipher_aead() .
+
+-type cipher_no_iv() :: aes_128_ecb
+                      | aes_192_ecb
+                      | aes_256_ecb
+
+                      | blowfish_ecb
+                      | des_ecb
+                      | rc4 .
+
+-type cipher_iv() :: aes_128_cbc
+                   | aes_192_cbc
+                   | aes_256_cbc
+
+                   | aes_128_cfb128
+                   | aes_192_cfb128
+                   | aes_256_cfb128
+
+                   | aes_128_cfb8
+                   | aes_192_cfb8
+                   | aes_256_cfb8
+
+                   | aes_128_ctr
+                   | aes_192_ctr
+                   | aes_256_ctr
+
+                   | aes_ige256
+
+                   | blowfish_cbc
+                   | blowfish_cfb64
+                   | blowfish_ofb64
+                   | chacha20
+                   | des_ede3_cbc
+                   | des_ede3_cfb
+
+                   | des_cbc
+                   | des_cfb
+                   | rc2_cbc .
+
+
+-type cipher_aead() :: aes_128_ccm
+                     | aes_192_ccm
+                     | aes_256_ccm
+
+                     | aes_128_gcm
+                     | aes_192_gcm
+                     | aes_256_gcm
+
+                     | chacha20_poly1305 .
+
+
+%%%----------------------------------------------------------------
+%%% Old cipher scheme
+%%%
+%%%
+-type block_cipher_without_iv() :: ecb_cipher() .
+
 -type block_cipher_with_iv() :: cbc_cipher()
                               | cfb_cipher()
-                              | aes_cbc128
-                              | aes_cbc256
-                              | aes_ige256
                               | blowfish_ofb64
-                              | des3_cbf % cfb misspelled
-                              | des_ede3
-                              | rc2_cbc .
-
--type cbc_cipher()  :: des_cbc | des3_cbc | aes_cbc | blowfish_cbc .
+                              | aes_ige256 .
+
+-type stream_cipher() :: ctr_cipher()
+                       | chacha20
+                       | rc4 .
+
+
+%%%----
+-type cbc_cipher()  :: aes_128_cbc
+                     | aes_192_cbc
+                     | aes_256_cbc
+                     | blowfish_cbc
+                     | des_cbc
+                     | des_ede3_cbc
+                     | rc2_cbc
+                     | retired_cbc_cipher_aliases() .
+
+-type retired_cbc_cipher_aliases() :: aes_cbc      % aes_*_cbc
+                                    | aes_cbc128   % aes_128_cbc
+                                    | aes_cbc256   % aes_256_cbc
+                                    | des3_cbc     % des_ede3_cbc
+                                    | des_ede3 .   % des_ede3_cbc
+
+%%%----
+-type cfb_cipher() :: aes_128_cfb128
+                    | aes_192_cfb128
+                    | aes_256_cfb128
+                    | aes_128_cfb8
+                    | aes_192_cfb8
+                    | aes_256_cfb8
+                    | blowfish_cfb64
+                    | des_cfb
+                    | des_ede3_cfb
+                    | retired_cfb_cipher_aliases() .
+
+-type retired_cfb_cipher_aliases() :: aes_cfb8      % aes_*_cfb8
+                                    | aes_cfb128    % aes_*_cfb128
+                                    | des3_cbf      % des_ede3_cfb, cfb misspelled
+                                    | des3_cfb      % des_ede3_cfb
+                                    | des_ede3_cbf .% cfb misspelled
+
+
+%%%----
+-type ctr_cipher() :: aes_128_ctr
+                    | aes_192_ctr
+                    | aes_256_ctr
+                    | retired_ctr_cipher_aliases() .
+
+-type retired_ctr_cipher_aliases() :: aes_ctr .  % aes_*_ctr
+
+%%%----
+-type ecb_cipher() :: aes_128_ecb
+                    | aes_192_ecb
+                    | aes_256_ecb
+                    | blowfish_ecb
+                    | retired_ecb_cipher_aliases() .
+
+-type retired_ecb_cipher_aliases() :: aes_ecb .
+
+%%%----
 -type aead_cipher() :: aes_gcm | aes_ccm | chacha20_poly1305 .
--type cfb_cipher()  :: aes_cfb128 | aes_cfb8 | blowfish_cfb64 | des3_cfb | des_cfb .
 
--type block_cipher_without_iv() :: ecb_cipher() .
--type ecb_cipher()  :: des_ecb | blowfish_ecb | aes_ecb .
+
+%%%----- end old cipher schema ------------------------------------
+%%%----------------------------------------------------------------
 
 -type key() :: iodata().
 -type des3_key() :: [key()].
@@ -284,11 +423,39 @@
 -type sha1() :: sha .
 -type sha2() :: sha224 | sha256 | sha384 | sha512 .
 -type sha3() :: sha3_224 | sha3_256 | sha3_384 | sha3_512 .
+-type blake2() :: blake2b | blake2s .
 
 -type compatibility_only_hash() :: md5 | md4 .
 
 -type crypto_integer() :: binary() | integer().
 
+%%%
+%% Exceptions
+%%   error:badarg
+%%   error:notsup
+-type run_time_error() :: no_return().
+
+%% Exceptions
+%%   error:{badarg,Reason::term()}
+%%   error:{notsup,Reason::term()}
+%%   error:{error,Reason::term()}
+-type descriptive_error() :: no_return() .
+
+
+%%--------------------------------------------------------------------
+%%
+%% Make the new descriptive_error() look like the old run_time_error()
+%%
+-define(COMPAT(CALL),
+        try begin CALL end
+        catch
+            error:{error, {_File,_Line}, _Reason} ->
+                error(badarg);
+            error:{E, {_File,_Line}, _Reason} when E==notsup ; E==badarg ->
+                error(E)
+        end).
+
+%%--------------------------------------------------------------------
 -compile(no_native).
 -on_load(on_load/0).
 -define(CRYPTO_NIF_VSN,302).
@@ -326,24 +493,49 @@ stop() ->
                                       | {macs,    Macs}
                                       | {curves,  Curves}
                                       | {rsa_opts, RSAopts},
-                             Hashs :: [sha1() | sha2() | sha3() | ripemd160 | compatibility_only_hash()],
-                             Ciphers :: [stream_cipher()
-                                         | block_cipher_with_iv() | block_cipher_without_iv()
-                                         | aead_cipher()
-                                        ], 
+                             Hashs :: [sha1() | sha2() | sha3() | blake2() | ripemd160 | compatibility_only_hash()],
+                             Ciphers :: [cipher()],
                              PKs :: [rsa | dss | ecdsa | dh | ecdh | ec_gf2m],
                              Macs :: [hmac | cmac | poly1305],
                              Curves :: [ec_named_curve() | edwards_curve_dh() | edwards_curve_ed()],
                              RSAopts :: [rsa_sign_verify_opt() | rsa_opt()] .
-supports()->
-    {Hashs, PubKeys, Ciphers, Macs, Curves, RsaOpts} = algorithms(),
-    [{hashs, Hashs},
-     {ciphers, Ciphers},
-     {public_keys, PubKeys},
-     {macs, Macs},
-     {curves, Curves},
-     {rsa_opts, RsaOpts}
-    ].
+supports() ->
+     [{hashs, hash_algorithms()},
+      {ciphers, prepend_old_aliases( cipher_algorithms())},
+      {public_keys, pubkey_algorithms()},
+      {macs, mac_algorithms()},
+      {curves, curve_algorithms()},
+      {rsa_opts, rsa_opts_algorithms()}
+     ].
+
+
+-spec supports(Type) -> Support
+                        when Type :: hashs
+			           | ciphers
+                                   | public_keys
+                                   | macs
+                                   | curves
+                                   | rsa_opts,
+			     Support :: Hashs
+                                      | Ciphers
+                                      | PKs
+                                      | Macs
+                                      | Curves
+                                      | RSAopts,
+                             Hashs :: [sha1() | sha2() | sha3() | blake2() | ripemd160 | compatibility_only_hash()],
+                             Ciphers :: [cipher()],
+                             PKs :: [rsa | dss | ecdsa | dh | ecdh | ec_gf2m],
+                             Macs :: [hmac | cmac | poly1305],
+                             Curves :: [ec_named_curve() | edwards_curve_dh() | edwards_curve_ed()],
+                             RSAopts :: [rsa_sign_verify_opt() | rsa_opt()] .
+
+supports(hashs)       -> hash_algorithms();
+supports(public_keys) -> pubkey_algorithms();
+supports(ciphers)     -> cipher_algorithms();
+supports(macs)        -> mac_algorithms();
+supports(curves)      -> curve_algorithms();
+supports(rsa_opts)    -> rsa_opts_algorithms().
+
 
 -spec info_lib() -> [{Name,VerNum,VerStr}] when Name :: binary(),
                                                 VerNum :: integer(),
@@ -364,9 +556,18 @@ enable_fips_mode(_) -> ?nif_stub.
 %%%
 %%%================================================================
 
--define(HASH_HASH_ALGORITHM, sha1() | sha2() | sha3() | ripemd160 | compatibility_only_hash() ).
+-type hash_algorithm() :: sha1() | sha2() | sha3() | blake2() | ripemd160 | compatibility_only_hash() .
 
--spec hash(Type, Data) -> Digest when Type :: ?HASH_HASH_ALGORITHM,
+-spec hash_info(Type) -> Result | run_time_error()
+                             when Type :: hash_algorithm(),
+                                  Result :: #{size := integer(),
+                                              block_size := integer(),
+                                              type := integer()
+                                             } .
+hash_info(Type) ->
+    notsup_to_error(hash_info_nif(Type)).
+
+-spec hash(Type, Data) -> Digest when Type :: hash_algorithm(),
                                       Data :: iodata(),
                                       Digest :: binary().
 hash(Type, Data) ->
@@ -376,9 +577,9 @@ hash(Type, Data) ->
 
 -opaque hash_state() :: reference().
 
--spec hash_init(Type) -> State when Type :: ?HASH_HASH_ALGORITHM,
+-spec hash_init(Type) -> State when Type :: hash_algorithm(),
                                     State :: hash_state().
-hash_init(Type) -> 
+hash_init(Type) ->
     notsup_to_error(hash_init_nif(Type)).
 
 -spec hash_update(State, Data) -> NewState when State :: hash_state(),
@@ -397,71 +598,183 @@ hash_final(Context) ->
 %%%================================================================
 %%%
 %%% MACs (Message Authentication Codes)
-%%% 
+%%%
 %%%================================================================
 
-%%%---- HMAC
+-type hmac_hash_algorithm() ::  sha1() | sha2() | sha3() | compatibility_only_hash().
+
+-type cmac_cipher_algorithm() :: aes_128_cbc | aes_192_cbc | aes_256_cbc | blowfish_cbc
+                               | des_cbc | des_ede3_cbc | rc2_cbc
+                               | aes_128_cfb128 | aes_192_cfb128 | aes_256_cfb128
+                               | aes_128_cfb8 | aes_192_cfb8 | aes_256_cfb8
+                                 .
+
+%%%----------------------------------------------------------------
+%%% Calculate MAC for the whole text at once
+
+-spec mac(Type :: poly1305, Key, Data) -> Mac | descriptive_error()
+                     when Key :: iodata(),
+                          Data :: iodata(),
+                          Mac :: binary().
+
+mac(poly1305, Key, Data) -> mac(poly1305, undefined, Key, Data).
+
+
+-spec mac(Type, SubType, Key, Data) -> Mac | descriptive_error()
+                     when Type :: hmac | cmac | poly1305,
+                          SubType :: hmac_hash_algorithm() | cmac_cipher_algorithm() | undefined,
+                          Key :: iodata(),
+                          Data :: iodata(),
+                          Mac :: binary().
+
+mac(Type, SubType, Key, Data) -> mac_nif(Type, SubType, Key, Data).
+
 
--define(HMAC_HASH_ALGORITHM,  sha1() | sha2() | sha3() | compatibility_only_hash()).
 
-%%%---- hmac/3,4 
+-spec macN(Type :: poly1305, Key, Data, MacLength) -> Mac | descriptive_error()
+                     when Key :: iodata(),
+                          Data :: iodata(),
+                          Mac :: binary(),
+                          MacLength :: pos_integer().
 
--spec hmac(Type, Key, Data) -> 
-                  Mac when Type :: ?HMAC_HASH_ALGORITHM,
+macN(Type, Key, Data, MacLength) ->
+    macN(Type, undefined, Key, Data, MacLength).
+
+
+-spec macN(Type, SubType, Key, Data, MacLength) -> Mac | descriptive_error()
+                     when Type :: hmac | cmac | poly1305,
+                          SubType :: hmac_hash_algorithm() | cmac_cipher_algorithm() | undefined,
+                          Key :: iodata(),
+                          Data :: iodata(),
+                          Mac :: binary(),
+                          MacLength :: pos_integer().
+
+macN(Type, SubType, Key, Data, MacLength) ->
+    erlang:binary_part(mac(Type,SubType,Key,Data), 0, MacLength).
+
+
+%%%----------------------------------------------------------------
+%%% Calculate the MAC by uppdating by pieces of the text
+
+-opaque mac_state() :: reference() .
+
+-spec mac_init(Type :: poly1305, Key) -> State | descriptive_error()
+                          when Key :: iodata(),
+                               State :: mac_state() .
+mac_init(poly1305, Key) ->
+    mac_init_nif(poly1305, undefined, Key).
+
+
+-spec mac_init(Type, SubType, Key) -> State | descriptive_error()
+                          when Type :: hmac | cmac | poly1305,
+                               SubType :: hmac_hash_algorithm() | cmac_cipher_algorithm() | undefined,
+                               Key :: iodata(),
+                               State :: mac_state() .
+mac_init(Type, SubType, Key) ->
+    mac_init_nif(Type, SubType, Key).
+
+
+-spec mac_update(State0, Data) -> State | descriptive_error()
+                     when Data :: iodata(),
+                          State0 :: mac_state(),
+                          State :: mac_state().
+mac_update(Ref, Data) ->
+    mac_update_nif(Ref, Data).
+
+
+
+-spec mac_final(State) -> Mac | descriptive_error()
+                              when State :: mac_state(),
+                                   Mac :: binary().
+mac_final(Ref) ->
+    mac_final_nif(Ref).
+
+
+-spec mac_finalN(State, MacLength) -> Mac | descriptive_error()
+                              when State :: mac_state(),
+                                   MacLength :: pos_integer(),
+                                   Mac :: binary().
+mac_finalN(Ref, MacLength) ->
+    erlang:binary_part(mac_final(Ref), 0, MacLength).
+
+
+%%%----------------------------------------------------------------
+%%% NIFs for the functions above
+
+mac_nif(_Type, _SubType, _Key, _Data) -> ?nif_stub.
+
+mac_init_nif(_Type, _SubType, _Key) -> ?nif_stub.
+mac_update_nif(_Ref, _Data) -> ?nif_stub.
+mac_final_nif(_Ref) -> ?nif_stub.
+
+%%%================================================================
+%%%
+%%% The "Old API", kept for compatibility
+%%%
+%%%================================================================
+
+%%%----------------------------------------------------------------
+%%%----------------------------------------------------------------
+%%% Message Authentication Codes, MAC
+%%%
+
+%%%---- HMAC
+
+%%%---- hmac/3,4
+
+-spec hmac(Type, Key, Data) ->
+                  Mac when Type :: hmac_hash_algorithm(),
                            Key :: iodata(),
                            Data :: iodata(),
                            Mac :: binary() .
 hmac(Type, Key, Data) ->
-    Data1 = iolist_to_binary(Data),
-    hmac(Type, Key, Data1, undefined, erlang:byte_size(Data1), max_bytes()).
+    ?COMPAT(mac(hmac, Type, Key, Data)).
 
--spec hmac(Type, Key, Data, MacLength) -> 
-                  Mac when Type :: ?HMAC_HASH_ALGORITHM,
+-spec hmac(Type, Key, Data, MacLength) ->
+                  Mac when Type :: hmac_hash_algorithm(),
                            Key :: iodata(),
                            Data :: iodata(),
                            MacLength :: integer(),
                            Mac :: binary() .
 
 hmac(Type, Key, Data, MacLength) ->
-    Data1 = iolist_to_binary(Data),
-    hmac(Type, Key, Data1, MacLength, erlang:byte_size(Data1), max_bytes()).
+    ?COMPAT(macN(hmac, Type, Key, Data, MacLength)).
 
 %%%---- hmac_init, hamc_update, hmac_final
 
--opaque hmac_state() :: binary().
+-opaque hmac_state() :: mac_state(). % Was: binary().
 
 -spec hmac_init(Type, Key) ->
-                       State when Type :: ?HMAC_HASH_ALGORITHM,
+                       State when Type :: hmac_hash_algorithm(),
                                   Key :: iodata(),
                                   State :: hmac_state() .
 hmac_init(Type, Key) ->
-    notsup_to_error(hmac_init_nif(Type, Key)).
+    ?COMPAT(mac_init(hmac, Type, Key)).
 
 %%%---- hmac_update
 
 -spec hmac_update(State, Data) -> NewState when Data :: iodata(),
                                                 State :: hmac_state(),
                                                 NewState :: hmac_state().
-hmac_update(State, Data0) ->
-    Data = iolist_to_binary(Data0),
-    hmac_update(State, Data, erlang:byte_size(Data), max_bytes()).
+hmac_update(State, Data) ->
+    ?COMPAT(mac_update(State, Data)).
 
 %%%---- hmac_final
 
 -spec hmac_final(State) -> Mac when State :: hmac_state(),
                                     Mac :: binary().
 hmac_final(Context) ->
-    notsup_to_error(hmac_final_nif(Context)).
+    ?COMPAT(mac_final(Context)).
 
 -spec hmac_final_n(State, HashLen) -> Mac when State :: hmac_state(),
                                                HashLen :: integer(),
                                                Mac :: binary().
 hmac_final_n(Context, HashLen) ->
-    notsup_to_error(hmac_final_nif(Context, HashLen)).
+    ?COMPAT(mac_finalN(Context, HashLen)).
 
 %%%---- CMAC
 
--define(CMAC_CIPHER_ALGORITHM, cbc_cipher() | cfb_cipher() | blowfish_cbc | des_ede3 | rc2_cbc  ).
+-define(CMAC_CIPHER_ALGORITHM, cbc_cipher() | cfb_cipher() | blowfish_cbc | des_ede3 | rc2_cbc ).
 
 -spec cmac(Type, Key, Data) ->
                   Mac when Type :: ?CMAC_CIPHER_ALGORITHM,
@@ -469,117 +782,219 @@ hmac_final_n(Context, HashLen) ->
                            Data :: iodata(),
                            Mac :: binary().
 cmac(Type, Key, Data) ->
-    notsup_to_error(cmac_nif(Type, Key, Data)).
+    ?COMPAT(mac(cmac, alias(Type), Key, Data)).
 
 -spec cmac(Type, Key, Data, MacLength) ->
                   Mac when Type :: ?CMAC_CIPHER_ALGORITHM,
                            Key :: iodata(),
                            Data :: iodata(),
-                           MacLength :: integer(), 
+                           MacLength :: integer(),
                            Mac :: binary().
+
 cmac(Type, Key, Data, MacLength) ->
-    erlang:binary_part(cmac(Type, Key, Data), 0, MacLength).
+    ?COMPAT(macN(cmac, alias(Type), Key, Data, MacLength)).
 
 %%%---- POLY1305
 
 -spec poly1305(iodata(), iodata()) -> Mac when Mac ::  binary().
 
 poly1305(Key, Data) ->
-    poly1305_nif(Key, Data).
+    ?COMPAT(mac(poly1305, Key, Data)).
 
-%%%================================================================
-%%%
-%%% Encrypt/decrypt
-%%%
-%%%================================================================
+%%%----------------------------------------------------------------
+%%%----------------------------------------------------------------
+%%% Ciphers
+
+
+%%%---- Cipher info
+-spec cipher_info(Type) -> Result | run_time_error()
+                               when Type :: cipher(),
+                                    Result :: #{key_length := integer(),
+                                                iv_length := integer(),
+                                                block_size := integer(),
+                                                mode := CipherModes,
+                                                type := undefined | integer()
+                                               },
+                                    CipherModes :: undefined
+                                                 | cbc_mode
+                                                 | ccm_mode
+                                                 | cfb_mode
+                                                 | ctr_mode
+                                                 | ecb_mode
+                                                 | gcm_mode
+                                                 | ige_mode
+                                                 | ocb_mode
+                                                 | ofb_mode
+                                                 | wrap_mode
+                                                 | xts_mode
+                                                   .
+
+%% %% These ciphers are not available via the EVP interface on older cryptolibs.
+cipher_info(aes_ctr) ->
+    #{block_size => 1,iv_length => 16,key_length => 32,mode => ctr_mode,type => undefined};
+cipher_info(aes_128_ctr) ->
+    #{block_size => 1,iv_length => 16,key_length => 16,mode => ctr_mode,type => undefined};
+cipher_info(aes_192_ctr) ->
+    #{block_size => 1,iv_length => 16,key_length => 24,mode => ctr_mode,type => undefined};
+cipher_info(aes_256_ctr) ->
+    #{block_size => 1,iv_length => 16,key_length => 32,mode => ctr_mode,type => undefined};
+%% %% This cipher is handled specialy.
+cipher_info(aes_ige256) ->
+    #{block_size => 16,iv_length => 32,key_length => 16,mode => ige_mode,type => undefined};
+%% %% These ciphers belong to the "old" interface:
+%% cipher_info(aes_cbc) ->
+%%     #{block_size => 16,iv_length => 16,key_length => 24,mode => cbc_mode,type => 423};
+%% cipher_info(aes_cbc128) ->
+%%     #{block_size => 16,iv_length => 16,key_length => 16,mode => cbc_mode,type => 419};
+%% cipher_info(aes_cbc256) ->
+%%     #{block_size => 16,iv_length => 16,key_length => 32,mode => cbc_mode,type => 427};
+%% cipher_info(aes_ccm) ->
+%%     #{block_size => 1,iv_length => 12,key_length => 24,mode => ccm_mode,type => 899};
+%% cipher_info(aes_cfb128) ->
+%%     #{block_size => 1,iv_length => 16,key_length => 32,mode => cfb_mode,type => 429};
+%% cipher_info(aes_cfb8) ->
+%%     #{block_size => 1,iv_length => 16,key_length => 32,mode => cfb_mode,type => 429};
+%% cipher_info(aes_ecb) ->
+%%     #{block_size => 16,iv_length => 0,key_length => 24,mode => ecb_mode,type => 422};
+%% cipher_info(aes_gcm) ->
+%%     #{block_size => 1,iv_length => 12,key_length => 24,mode => gcm_mode,type => 898};
+%% cipher_info(des3_cbc) ->
+%%     #{block_size => 8,iv_length => 8,key_length => 24,mode => cbc_mode,type => 44};
+%% cipher_info(des3_cbf) ->
+%%     #{block_size => 1,iv_length => 8,key_length => 24,mode => cfb_mode,type => 30};
+%% cipher_info(des3_cfb) ->
+%%     #{block_size => 1,iv_length => 8,key_length => 24,mode => cfb_mode,type => 30};
+%% cipher_info(des_ede3) ->
+%%     #{block_size => 8,iv_length => 8,key_length => 24,mode => cbc_mode,type => 44};
+%% cipher_info(des_ede3_cbf) ->
+%%     #{block_size => 1,iv_length => 8,key_length => 24,mode => cfb_mode,type => 30};
+cipher_info(Type) ->
+    cipher_info_nif(alias(Type)).
 
 %%%---- Block ciphers
-
--spec block_encrypt(Type::block_cipher_with_iv(), Key::key()|des3_key(), Ivec::binary(), PlainText::iodata()) -> binary();
+%%%----------------------------------------------------------------
+-spec block_encrypt(Type::block_cipher_with_iv(), Key::key()|des3_key(), Ivec::binary(), PlainText::iodata()) ->
+                           binary() | run_time_error();
                    (Type::aead_cipher(),  Key::iodata(), Ivec::binary(), {AAD::binary(), PlainText::iodata()}) ->
-                           {binary(), binary()};
+                           {binary(), binary()} | run_time_error();
                    (aes_gcm | aes_ccm, Key::iodata(), Ivec::binary(), {AAD::binary(), PlainText::iodata(), TagLength::1..16}) ->
-                           {binary(), binary()}.
-
-block_encrypt(Type, Key, Ivec, PlainText) when Type =:= des_cbc;
-                                               Type =:= des_cfb;
-                                               Type =:= blowfish_cbc;
-                                               Type =:= blowfish_cfb64;
-                                               Type =:= blowfish_ofb64;
-                                               Type =:= aes_cbc128;
-                                               Type =:= aes_cfb8;
-                                               Type =:= aes_cfb128;
-                                               Type =:= aes_cbc256;
-                                               Type =:= aes_cbc;
-                                               Type =:= rc2_cbc ->
-    block_crypt_nif(Type, Key, Ivec, PlainText, true);
-block_encrypt(Type, Key0, Ivec, PlainText) when Type =:= des3_cbc;
-                                                Type =:= des_ede3 ->
-    Key = check_des3_key(Key0),
-    block_crypt_nif(des_ede3_cbc, Key, Ivec, PlainText, true);
-block_encrypt(des3_cbf, Key0, Ivec, PlainText) -> % cfb misspelled
-    Key = check_des3_key(Key0),
-    block_crypt_nif(des_ede3_cbf, Key, Ivec, PlainText, true);
-block_encrypt(des3_cfb, Key0, Ivec, PlainText) ->
-    Key = check_des3_key(Key0),
-    block_crypt_nif(des_ede3_cfb, Key, Ivec, PlainText, true);
+                           {binary(), binary()} | run_time_error().
+
+
 block_encrypt(aes_ige256, Key, Ivec, PlainText) ->
     notsup_to_error(aes_ige_crypt_nif(Key, Ivec, PlainText, true));
-block_encrypt(Type, Key, Ivec, {AAD, PlainText}) when Type =:= aes_gcm;
-                                                      Type =:= aes_ccm ->
-    aead_encrypt(Type, Key, Ivec, AAD, PlainText);
-block_encrypt(Type, Key, Ivec, {AAD, PlainText, TagLength}) when Type =:= aes_gcm;
-                                                                 Type =:= aes_ccm ->
-    aead_encrypt(Type, Key, Ivec, AAD, PlainText, TagLength);
-block_encrypt(chacha20_poly1305=Type, Key, Ivec, {AAD, PlainText}) ->
-    aead_encrypt(Type, Key, Ivec, AAD, PlainText, 16).
 
+block_encrypt(Type, Key0, Ivec, Data) ->
+    Key = iolist_to_binary(Key0),
+    ?COMPAT(
+       case Data of
+           {AAD, PlainText} ->
+               crypto_one_time_aead(alias(Type,Key), Key, Ivec, PlainText, AAD, true);
+           {AAD, PlainText, TagLength} ->
+               crypto_one_time_aead(alias(Type,Key), Key, Ivec, PlainText, AAD, TagLength, true);
+           PlainText ->
+               crypto_one_time(alias(Type,Key), Key, Ivec, PlainText, true)
+       end).
 
--spec block_decrypt(Type::block_cipher_with_iv(), Key::key()|des3_key(), Ivec::binary(), Data::iodata()) -> binary();
-		   (Type::aead_cipher(), Key::iodata(), Ivec::binary(),
-		    {AAD::binary(), Data::iodata(), Tag::binary()}) -> binary() | error.
-block_decrypt(Type, Key, Ivec, Data) when Type =:= des_cbc;
-                                          Type =:= des_cfb;
-                                          Type =:= blowfish_cbc;
-                                          Type =:= blowfish_cfb64;
-                                          Type =:= blowfish_ofb64;
-					  Type =:= aes_cbc;
-                                          Type =:= aes_cbc128;
-                                          Type =:= aes_cfb8;
-                                          Type =:= aes_cfb128;
-                                          Type =:= aes_cbc256;
-                                          Type =:= rc2_cbc ->
-    block_crypt_nif(Type, Key, Ivec, Data, false);
-block_decrypt(Type, Key0, Ivec, Data) when Type =:= des3_cbc;
-                                           Type =:= des_ede3 ->
-    Key = check_des3_key(Key0),
-    block_crypt_nif(des_ede3_cbc, Key, Ivec, Data, false);
-block_decrypt(des3_cbf, Key0, Ivec, Data) -> % cfb misspelled
-    Key = check_des3_key(Key0),
-    block_crypt_nif(des_ede3_cbf, Key, Ivec, Data, false);
-block_decrypt(des3_cfb, Key0, Ivec, Data) ->
-    Key = check_des3_key(Key0),
-    block_crypt_nif(des_ede3_cfb, Key, Ivec, Data, false);
-block_decrypt(aes_ige256, Key, Ivec, Data) ->
-    notsup_to_error(aes_ige_crypt_nif(Key, Ivec, Data, false));
-block_decrypt(Type, Key, Ivec, {AAD, Data, Tag}) when Type =:= aes_gcm;
-                                                      Type =:= aes_ccm;
-                                                      Type =:= chacha20_poly1305 ->
-    aead_decrypt(Type, Key, Ivec, AAD, Data, Tag).
+-spec block_encrypt(Type::block_cipher_without_iv(), Key::key(), PlainText::iodata()) ->
+                           binary() | run_time_error().
+
+block_encrypt(Type, Key0, PlainText) ->
+    Key = iolist_to_binary(Key0),
+    ?COMPAT(crypto_one_time(alias(Type,Key), Key, PlainText, true)).
 
 
--spec block_encrypt(Type::block_cipher_without_iv(), Key::key(), PlainText::iodata()) -> binary().
+%%%----------------------------------------------------------------
+%%%----------------------------------------------------------------
+-spec block_decrypt(Type::block_cipher_with_iv(), Key::key()|des3_key(), Ivec::binary(), Data::iodata()) ->
+                           binary() | run_time_error();
+		   (Type::aead_cipher(), Key::iodata(), Ivec::binary(),
+		    {AAD::binary(), Data::iodata(), Tag::binary()}) ->
+                           binary() | error | run_time_error() .
 
-block_encrypt(Type, Key, PlainText) ->
-    block_crypt_nif(Type, Key, PlainText, true).
+block_decrypt(aes_ige256, Key, Ivec, Data) ->
+    notsup_to_error(aes_ige_crypt_nif(Key, Ivec, Data, false));
 
+block_decrypt(Type, Key0, Ivec, Data) ->
+    Key = iolist_to_binary(Key0),
+    ?COMPAT(
+       case Data of
+           {AAD, CryptoText, Tag} ->
+               crypto_one_time_aead(alias(Type,Key), Key, Ivec, CryptoText, AAD, Tag, false);
+           CryptoText ->
+               crypto_one_time(alias(Type,Key), Key, Ivec, CryptoText, false)
+       end).
+
+
+-spec block_decrypt(Type::block_cipher_without_iv(), Key::key(), Data::iodata()) ->
+                           binary() | run_time_error().
+
+block_decrypt(Type, Key0, CryptoText) ->
+    Key = iolist_to_binary(Key0),
+    ?COMPAT(crypto_one_time(alias(Type,Key), Key, CryptoText, false)).
+
+%%%-------- Stream ciphers API
+
+-opaque stream_state() :: {stream_cipher(),
+                           crypto_state() | {crypto_state(),flg_undefined}
+                          }.
+
+%%%---- stream_init
+-spec stream_init(Type, Key, IVec) -> State | run_time_error()
+                                          when Type :: stream_cipher(),
+                                               Key :: iodata(),
+                                               IVec ::binary(),
+                                               State :: stream_state() .
+stream_init(Type, Key0, IVec) when is_binary(IVec) ->
+    Key = iolist_to_binary(Key0),
+    Ref = ?COMPAT(ng_crypto_init_nif(alias(Type,Key),
+                                     Key, iolist_to_binary(IVec),
+                                     undefined)
+                 ),
+    {Type, {Ref,flg_undefined}}.
+
+
+-spec stream_init(Type, Key) -> State | run_time_error()
+                                    when Type :: rc4,
+                                         Key :: iodata(),
+                                         State :: stream_state() .
+stream_init(rc4 = Type, Key0) ->
+    Key = iolist_to_binary(Key0),
+    Ref = ?COMPAT(ng_crypto_init_nif(alias(Type,Key),
+                                     Key, <<>>,
+                                     undefined)
+                 ),
+    {Type, {Ref,flg_undefined}}.
+
+%%%---- stream_encrypt
+-spec stream_encrypt(State, PlainText) -> {NewState, CipherText} | run_time_error()
+                                              when State :: stream_state(),
+                                                   PlainText :: iodata(),
+                                                   NewState :: stream_state(),
+                                                   CipherText :: iodata() .
+stream_encrypt(State, Data) ->
+    crypto_stream_emulate(State, Data, true).
 
--spec block_decrypt(Type::block_cipher_without_iv(), Key::key(), Data::iodata()) -> binary().
+%%%---- stream_decrypt
+-spec stream_decrypt(State, CipherText) -> {NewState, PlainText} | run_time_error()
+                                              when State :: stream_state(),
+                                                   CipherText :: iodata(),
+                                                   NewState :: stream_state(),
+                                                   PlainText :: iodata() .
+stream_decrypt(State, Data) ->
+    crypto_stream_emulate(State, Data, false).
 
-block_decrypt(Type, Key, Data) ->
-    block_crypt_nif(Type, Key, Data, false).
+%%%-------- helpers
+crypto_stream_emulate({Cipher,{Ref0,flg_undefined}}, Data, EncryptFlag) when is_reference(Ref0) ->
+    ?COMPAT(begin
+                Ref = ng_crypto_init_nif(Ref0, <<>>, <<>>, EncryptFlag),
+                {{Cipher,Ref}, crypto_update(Ref, Data)}
+            end);
 
+crypto_stream_emulate({Cipher,Ref}, Data, _) when is_reference(Ref) ->
+    ?COMPAT({{Cipher,Ref}, crypto_update(Ref, Data)}).
 
+%%%----------------------------------------------------------------
 -spec next_iv(Type:: cbc_cipher(), Data) -> NextIVec when % Type :: cbc_cipher(), %des_cbc | des3_cbc | aes_cbc | aes_ige,
                                            Data :: iodata(),
                                            NextIVec :: binary().
@@ -606,47 +1021,281 @@ next_iv(des_cfb, Data, IVec) ->
 next_iv(Type, Data, _Ivec) ->
     next_iv(Type, Data).
 
-%%%---- Stream ciphers
+%%%================================================================
+%%%
+%%% Encrypt/decrypt, The "New API"
+%%%
+%%%================================================================
 
--opaque stream_state() :: {stream_cipher(), reference()}.
+-opaque crypto_state() :: reference() .
 
--type stream_cipher() :: rc4 | aes_ctr | chacha20 .
 
--spec stream_init(Type, Key, IVec) -> State when Type :: aes_ctr | chacha20,
-                                                 Key :: iodata(),
-                                                 IVec :: binary(),
-                                                 State :: stream_state() .
-stream_init(aes_ctr, Key, Ivec) ->
-    {aes_ctr, aes_ctr_stream_init(Key, Ivec)};
-stream_init(chacha20, Key, Ivec) ->
-    {chacha20, chacha20_stream_init(Key,Ivec)}.
+%%%----------------------------------------------------------------
+%%%
+%%% Create and initialize a new state for encryption or decryption
+%%%
 
--spec stream_init(Type, Key) -> State when Type :: rc4,
-                                           Key :: iodata(),
-                                           State :: stream_state() .
-stream_init(rc4, Key) ->
-    {rc4, notsup_to_error(rc4_set_key(Key))}.
+-spec crypto_init(Cipher, Key, EncryptFlag) -> State | descriptive_error()
+                                                   when Cipher :: cipher_no_iv(),
+                                                        Key :: iodata(),
+                                                        EncryptFlag :: boolean(),
+                                                        State :: crypto_state() .
+crypto_init(Cipher, Key, EncryptFlag) ->
+    %% The IV is supposed to be supplied by calling crypto_update/3
+    ng_crypto_init_nif(Cipher, iolist_to_binary(Key), <<>>, EncryptFlag).
 
--spec stream_encrypt(State, PlainText) -> {NewState, CipherText}
-                                              when State :: stream_state(),
-                                                   PlainText :: iodata(),
-                                                   NewState :: stream_state(),
-                                                   CipherText :: iodata() .
-stream_encrypt(State, Data0) ->
-    Data = iolist_to_binary(Data0),
-    MaxByts = max_bytes(),
-    stream_crypt(fun do_stream_encrypt/2, State, Data, erlang:byte_size(Data), MaxByts, []).
 
--spec stream_decrypt(State, CipherText) -> {NewState, PlainText}
-                                              when State :: stream_state(),
-                                                   CipherText :: iodata(),
-                                                   NewState :: stream_state(),
-                                                   PlainText :: iodata() .
-stream_decrypt(State, Data0) ->
-    Data = iolist_to_binary(Data0),
-    MaxByts = max_bytes(),
-    stream_crypt(fun do_stream_decrypt/2, State, Data, erlang:byte_size(Data), MaxByts, []).
+-spec crypto_init(Cipher, Key, IV, EncryptFlag) -> State | descriptive_error()
+                                                       when Cipher :: cipher_iv(),
+                                                            Key :: iodata(),
+                                                            IV :: iodata(),
+                                                            EncryptFlag :: boolean(),
+                                                            State :: crypto_state() .
+crypto_init(Cipher, Key, IV, EncryptFlag) ->
+    ng_crypto_init_nif(Cipher, iolist_to_binary(Key), iolist_to_binary(IV), EncryptFlag).
+
+
+
+%%%----------------------------------------------------------------
+-spec crypto_dyn_iv_init(Cipher, Key, EncryptFlag) -> State | descriptive_error()
+                                                          when Cipher :: cipher_iv(),
+                                                               Key :: iodata(),
+                                                               EncryptFlag :: boolean(),
+                                                               State :: crypto_state() .
+crypto_dyn_iv_init(Cipher, Key, EncryptFlag) ->
+    %% The IV is supposed to be supplied by calling crypto_update/3
+    ng_crypto_init_nif(Cipher, iolist_to_binary(Key), undefined, EncryptFlag).
+
+%%%----------------------------------------------------------------
+%%%
+%%% Encrypt/decrypt a sequence of bytes.  The sum of the sizes
+%%% of all blocks must be an integer multiple of the crypto's
+%%% blocksize.
+%%%
+
+-spec crypto_update(State, Data) -> Result | descriptive_error()
+                            when State :: crypto_state(),
+                                 Data :: iodata(),
+                                 Result :: binary() .
+crypto_update(State, Data0) ->
+    case iolist_to_binary(Data0) of
+        <<>> ->
+            <<>>;                           % Known to fail on OpenSSL 0.9.8h
+        Data ->
+            ng_crypto_update_nif(State, Data)
+    end.
+
+
+%%%----------------------------------------------------------------
+-spec crypto_dyn_iv_update(State, Data, IV) -> Result | descriptive_error()
+                                                   when State :: crypto_state(),
+                                                        Data :: iodata(),
+                                                        IV :: iodata(),
+                                                        Result :: binary() .
+crypto_dyn_iv_update(State, Data0, IV) ->
+    %% When State is from State = crypto_init(Cipher, Key, undefined, EncryptFlag)
+    case iolist_to_binary(Data0) of
+        <<>> ->
+            <<>>;                           % Known to fail on OpenSSL 0.9.8h
+        Data ->
+            ng_crypto_update_nif(State, Data, iolist_to_binary(IV))
+    end.
+
+%%%----------------------------------------------------------------
+%%%
+%%% Encrypt/decrypt one set bytes.
+%%% The size must be an integer multiple of the crypto's blocksize.
+%%%
+
+-spec crypto_one_time(Cipher, Key, Data, EncryptFlag) ->
+                             Result | descriptive_error()
+                                 when Cipher :: cipher_no_iv(),
+                                      Key :: iodata(),
+                                      Data :: iodata(),
+                                      EncryptFlag :: boolean(),
+                                      Result :: binary() .
+
+crypto_one_time(Cipher, Key, Data0, EncryptFlag) ->
+    case iolist_to_binary(Data0) of
+        <<>> ->
+            <<>>;                           % Known to fail on OpenSSL 0.9.8h
+        Data ->
+            ng_crypto_one_time_nif(Cipher,
+                                   iolist_to_binary(Key), <<>>, Data,
+                                   EncryptFlag)
+    end.
+
+-spec crypto_one_time(Cipher, Key, IV, Data, EncryptFlag) ->
+                             Result | descriptive_error()
+                                 when Cipher :: cipher_iv(),
+                                      Key :: iodata(),
+                                      IV :: iodata(),
+                                      Data :: iodata(),
+                                      EncryptFlag :: boolean(),
+                                      Result :: binary() .
+
+crypto_one_time(Cipher, Key, IV, Data0, EncryptFlag) ->
+    case iolist_to_binary(Data0) of
+        <<>> ->
+            <<>>;                           % Known to fail on OpenSSL 0.9.8h
+        Data ->
+            ng_crypto_one_time_nif(Cipher,
+                                   iolist_to_binary(Key), iolist_to_binary(IV), Data,
+                                   EncryptFlag)
+    end.
+
+
+-spec crypto_one_time_aead(Cipher, Key, IV, InText, AAD, EncFlag::true) ->
+                             Result | descriptive_error()
+                                 when Cipher :: cipher_aead(),
+                                      Key :: iodata(),
+                                      IV :: iodata(),
+                                      InText :: iodata(),
+                                      AAD :: iodata(),
+                                      Result :: EncryptResult,
+                                      EncryptResult :: {OutCryptoText, OutTag},
+                                      OutCryptoText :: binary(),
+                                      OutTag :: binary().
+
+crypto_one_time_aead(Cipher, Key, IV, PlainText, AAD, true) ->
+    crypto_one_time_aead(Cipher, Key, IV, PlainText, AAD, aead_tag_len(Cipher), true).
+
+
+-spec crypto_one_time_aead(Cipher, Key, IV, InText, AAD, TagOrTagLength, EncFlag) ->
+                             Result | descriptive_error()
+                                 when Cipher :: cipher_aead(),
+                                      Key :: iodata(),
+                                      IV :: iodata(),
+                                      InText :: iodata(),
+                                      AAD :: iodata(),
+                                      TagOrTagLength :: EncryptTagLength | DecryptTag,
+                                      EncryptTagLength :: non_neg_integer(), % or pos_integer() 1..
+                                      DecryptTag :: iodata(),
+                                      EncFlag :: boolean(),
+                                      Result :: EncryptResult | DecryptResult,
+                                      EncryptResult :: {OutCryptoText, OutTag},
+                                      DecryptResult :: OutPlainText | error,
+                                      OutCryptoText :: binary(),
+                                      OutTag :: binary(),
+                                      OutPlainText :: binary().
+
+crypto_one_time_aead(Cipher, Key, IV, TextIn, AAD, TagOrTagLength, EncFlg) ->
+    aead_cipher(Cipher, Key, IV, TextIn, AAD, TagOrTagLength, EncFlg).
+
+
+aead_tag_len(chacha20_poly1305) -> 16;
+aead_tag_len(aes_ccm    ) -> 12;
+aead_tag_len(aes_128_ccm) -> 12;
+aead_tag_len(aes_192_ccm) -> 12;
+aead_tag_len(aes_256_ccm) -> 12;
+aead_tag_len(aes_gcm    ) -> 16;
+aead_tag_len(aes_128_gcm) -> 16;
+aead_tag_len(aes_192_gcm) -> 16;
+aead_tag_len(aes_256_gcm) -> 16;
+aead_tag_len(_) -> error({badarg, "Not an AEAD cipher"}).
+
+%%%----------------------------------------------------------------
+%%% NIFs
+
+-spec ng_crypto_init_nif(atom(), binary(), binary()|undefined, boolean()|undefined ) ->
+                                crypto_state() | descriptive_error()
+                      ; (crypto_state(), <<>>, <<>>, boolean())
+                        -> crypto_state() | descriptive_error().
+
+ng_crypto_init_nif(_Cipher, _Key, _IVec, _EncryptFlg) -> ?nif_stub.
+
+
+-spec ng_crypto_update_nif(crypto_state(), binary()) ->
+                                  binary() | descriptive_error() .
+ng_crypto_update_nif(_State, _Data) -> ?nif_stub.
+
+-spec ng_crypto_update_nif(crypto_state(), binary(), binary()) ->
+                                  binary() | descriptive_error() .
+ng_crypto_update_nif(_State, _Data, _IV) -> ?nif_stub.
+
+
+-spec ng_crypto_one_time_nif(atom(), binary(), binary(), binary(), boolean() ) ->
+                                    binary() | descriptive_error().
+ng_crypto_one_time_nif(_Cipher, _Key, _IVec, _Data, _EncryptFlg) -> ?nif_stub.
+
+%%%----------------------------------------------------------------
+%%% Cipher aliases
+%%%
+-define(if_also(Cipher, Ciphers, AliasCiphers),
+        case lists:member(Cipher, Ciphers) of
+            true ->
+                AliasCiphers;
+            false ->
+                Ciphers
+        end).
+
+
+prepend_old_aliases(L0) ->
+    L1 = ?if_also(des_ede3_cbc, L0,
+                  [des3_cbc, des_ede3, des_ede3_cbf, des3_cbf, des3_cfb | L0]),
+    L2 = ?if_also(aes_128_cbc, L1,
+                 [aes_cbc, aes_cbc128, aes_cbc256 | L1]),
+    L3 = ?if_also(aes_128_ctr, L2,
+                  [aes_ctr | L2]),
+    L4 = ?if_also(aes_128_ccm, L3,
+                  [aes_ccm | L3]),
+    L5 = ?if_also(aes_128_gcm, L4,
+                  [aes_gcm | L4]),
+    L6 = ?if_also(aes_128_cfb8, L5,
+                  [aes_cfb8 | L5]),
+    L7 = ?if_also(aes_128_cfb128, L6,
+                  [aes_cfb128 | L6]),
+    L8 = ?if_also(aes_128_ecb, L7,
+                  [aes_ecb | L7]),
+    L8.
+
+
+
+%%%---- des_ede3_cbc
+alias(des3_cbc)     -> des_ede3_cbc;
+alias(des_ede3)     -> des_ede3_cbc;
+%%%---- des_ede3_cfb
+alias(des_ede3_cbf) -> des_ede3_cfb;
+alias(des3_cbf)     -> des_ede3_cfb;
+alias(des3_cfb)     -> des_ede3_cfb;
+%%%---- aes_*_cbc
+alias(aes_cbc128)   -> aes_128_cbc;
+alias(aes_cbc256)   -> aes_256_cbc;
+
+alias(Alg) -> Alg.
+
+
+alias(Ciph, Key) -> alias2(alias(Ciph), Key).
+
+alias2(aes_cbc, Key) when size(Key)==16  -> aes_128_cbc;
+alias2(aes_cbc, Key) when size(Key)==24  -> aes_192_cbc;
+alias2(aes_cbc, Key) when size(Key)==32  -> aes_256_cbc;
 
+alias2(aes_cfb8, Key) when size(Key)==16  -> aes_128_cfb8;
+alias2(aes_cfb8, Key) when size(Key)==24  -> aes_192_cfb8;
+alias2(aes_cfb8, Key) when size(Key)==32  -> aes_256_cfb8;
+
+alias2(aes_cfb128, Key) when size(Key)==16  -> aes_128_cfb128;
+alias2(aes_cfb128, Key) when size(Key)==24  -> aes_192_cfb128;
+alias2(aes_cfb128, Key) when size(Key)==32  -> aes_256_cfb128;
+
+alias2(aes_ctr, Key) when size(Key)==16  -> aes_128_ctr;
+alias2(aes_ctr, Key) when size(Key)==24  -> aes_192_ctr;
+alias2(aes_ctr, Key) when size(Key)==32  -> aes_256_ctr;
+
+alias2(aes_ecb, Key) when size(Key)==16  -> aes_128_ecb;
+alias2(aes_ecb, Key) when size(Key)==24  -> aes_192_ecb;
+alias2(aes_ecb, Key) when size(Key)==32  -> aes_256_ecb;
+
+alias2(aes_gcm, Key) when size(Key)==16  -> aes_128_gcm;
+alias2(aes_gcm, Key) when size(Key)==24  -> aes_192_gcm;
+alias2(aes_gcm, Key) when size(Key)==32  -> aes_256_gcm;
+
+alias2(aes_ccm, Key) when size(Key)==16  -> aes_128_ccm;
+alias2(aes_ccm, Key) when size(Key)==24  -> aes_192_ccm;
+alias2(aes_ccm, Key) when size(Key)==32  -> aes_256_ccm;
+
+alias2(Alg, _) -> Alg.
 
 %%%================================================================
 %%%
@@ -679,34 +1328,73 @@ rand_seed_s() ->
 rand_seed_alg(Alg) ->
     rand:seed(rand_seed_alg_s(Alg)).
 
+-spec rand_seed_alg(Alg :: atom(), Seed :: term()) ->
+                           {rand:alg_handler(),
+                            atom() | rand_cache_seed()}.
+rand_seed_alg(Alg, Seed) ->
+    rand:seed(rand_seed_alg_s(Alg, Seed)).
+
 -define(CRYPTO_CACHE_BITS, 56).
+-define(CRYPTO_AES_BITS, 58).
+
 -spec rand_seed_alg_s(Alg :: atom()) ->
                              {rand:alg_handler(),
                               atom() | rand_cache_seed()}.
-rand_seed_alg_s(?MODULE) ->
-    {#{ type => ?MODULE,
-        bits => 64,
-        next => fun ?MODULE:rand_plugin_next/1,
-        uniform => fun ?MODULE:rand_plugin_uniform/1,
-        uniform_n => fun ?MODULE:rand_plugin_uniform/2},
-     no_seed};
-rand_seed_alg_s(crypto_cache) ->
+rand_seed_alg_s({AlgHandler, _AlgState} = State) when is_map(AlgHandler) ->
+    State;
+rand_seed_alg_s({Alg, AlgState}) when is_atom(Alg) ->
+    {mk_alg_handler(Alg),AlgState};
+ rand_seed_alg_s(Alg) when is_atom(Alg) ->
+    {mk_alg_handler(Alg),mk_alg_state(Alg)}.
+%%
+-spec rand_seed_alg_s(Alg :: atom(), Seed :: term()) ->
+                             {rand:alg_handler(),
+                              atom() | rand_cache_seed()}.
+rand_seed_alg_s(Alg, Seed) when is_atom(Alg) ->
+    {mk_alg_handler(Alg),mk_alg_state({Alg,Seed})}.
+
+mk_alg_handler(?MODULE = Alg) ->
+    #{ type => Alg,
+       bits => 64,
+       next => fun ?MODULE:rand_plugin_next/1,
+       uniform => fun ?MODULE:rand_plugin_uniform/1,
+       uniform_n => fun ?MODULE:rand_plugin_uniform/2};
+mk_alg_handler(crypto_cache = Alg) ->
+    #{ type => Alg,
+       bits => ?CRYPTO_CACHE_BITS,
+       next => fun ?MODULE:rand_cache_plugin_next/1};
+mk_alg_handler(crypto_aes = Alg) ->
+    #{ type => Alg,
+       bits => ?CRYPTO_AES_BITS,
+       next => fun ?MODULE:rand_plugin_aes_next/1,
+       jump => fun ?MODULE:rand_plugin_aes_jump/1}.
+
+mk_alg_state(?MODULE) ->
+    no_seed;
+mk_alg_state(crypto_cache) ->
     CacheBits = ?CRYPTO_CACHE_BITS,
-    EnvCacheSize =
-        application:get_env(
-          crypto, rand_cache_size, CacheBits * 16), % Cache 16 * 8 words
-    Bytes = (CacheBits + 7) div 8,
+    BytesPerWord = (CacheBits + 7) div 8,
+    GenBytes =
+        ((rand_cache_size() + (2*BytesPerWord - 1)) div BytesPerWord)
+        * BytesPerWord,
+    {CacheBits, GenBytes, <<>>};
+mk_alg_state({crypto_aes,Seed}) ->
+    %% 16 byte words (128 bit crypto blocks)
+    GenWords = (rand_cache_size() + 31) div 16,
+    Key = crypto:hash(sha256, Seed),
+    {F,Count} = longcount_seed(Seed),
+    {Key,GenWords,F,Count}.
+
+rand_cache_size() ->
+    DefaultCacheSize = 1024,
     CacheSize =
-        case ((EnvCacheSize + (Bytes - 1)) div Bytes) * Bytes of
-            Sz when is_integer(Sz), Bytes =< Sz ->
-                Sz;
-            _ ->
-                Bytes
-        end,
-    {#{ type => crypto_cache,
-        bits => CacheBits,
-        next => fun ?MODULE:rand_cache_plugin_next/1},
-     {CacheBits, CacheSize, <<>>}}.
+        application:get_env(crypto, rand_cache_size, DefaultCacheSize),
+    if
+        is_integer(CacheSize), 0 =< CacheSize ->
+            CacheSize;
+        true ->
+            DefaultCacheSize
+    end.
 
 rand_plugin_next(Seed) ->
     {bytes_to_integer(strong_rand_range(1 bsl 64)), Seed}.
@@ -717,12 +1405,97 @@ rand_plugin_uniform(State) ->
 rand_plugin_uniform(Max, State) ->
     {bytes_to_integer(strong_rand_range(Max)) + 1, State}.
 
-rand_cache_plugin_next({CacheBits, CacheSize, <<>>}) ->
+
+rand_cache_plugin_next({CacheBits, GenBytes, <<>>}) ->
     rand_cache_plugin_next(
-      {CacheBits, CacheSize, strong_rand_bytes(CacheSize)});
-rand_cache_plugin_next({CacheBits, CacheSize, Cache}) ->
+      {CacheBits, GenBytes, strong_rand_bytes(GenBytes)});
+rand_cache_plugin_next({CacheBits, GenBytes, Cache}) ->
     <<I:CacheBits, NewCache/binary>> = Cache,
-    {I, {CacheBits, CacheSize, NewCache}}.
+    {I, {CacheBits, GenBytes, NewCache}}.
+
+
+%% Encrypt 128 bit counter values and use the 58 lowest
+%% encrypted bits as random numbers.
+%%
+%% The 128 bit counter is handled as 4 32 bit words
+%% to avoid bignums.  Generate a bunch of numbers
+%% at the time and cache them.
+%%
+-dialyzer({no_improper_lists, rand_plugin_aes_next/1}).
+rand_plugin_aes_next([V|Cache]) ->
+    {V,Cache};
+rand_plugin_aes_next({Key,GenWords,F,Count}) ->
+    rand_plugin_aes_next(Key, GenWords, F, Count);
+rand_plugin_aes_next({Key,GenWords,F,_JumpBase,Count}) ->
+    rand_plugin_aes_next(Key, GenWords, F, Count).
+%%
+rand_plugin_aes_next(Key, GenWords, F, Count) ->
+    {Cleartext,NewCount} = aes_cleartext(<<>>, F, Count, GenWords),
+    Encrypted = crypto:block_encrypt(aes_ecb, Key, Cleartext),
+    [V|Cache] = aes_cache(Encrypted, {Key,GenWords,F,Count,NewCount}),
+    {V,Cache}.
+
+%% A jump advances the counter 2^512 steps; the jump function
+%% is applied to the jump base and then the number of used
+%% numbers from the cache has to be wasted for the jump to be correct
+%%
+rand_plugin_aes_jump({#{type := crypto_aes} = Alg, Cache}) ->
+    {Alg,rand_plugin_aes_jump(fun longcount_jump/1, 0, Cache)}.
+%% Count cached words and subtract their number from jump
+-dialyzer({no_improper_lists, rand_plugin_aes_jump/3}).
+rand_plugin_aes_jump(Jump, J, [_|Cache]) ->
+    rand_plugin_aes_jump(Jump, J + 1, Cache);
+rand_plugin_aes_jump(Jump, J, {Key,GenWords,F,JumpBase, _Count}) ->
+    rand_plugin_aes_jump(Jump, GenWords - J, Key, GenWords, F, JumpBase);
+rand_plugin_aes_jump(Jump, 0, {Key,GenWords,F,JumpBase}) ->
+    rand_plugin_aes_jump(Jump, 0, Key, GenWords, F, JumpBase).
+%%
+rand_plugin_aes_jump(Jump, Skip, Key, GenWords, F, JumpBase) ->
+    Count = longcount_next_count(Skip, Jump(JumpBase)),
+    {Key,GenWords,F,Count}.
+
+rand_plugin_aes_jump_2pow20(Cache) ->
+    rand_plugin_aes_jump(fun longcount_jump_2pow20/1, 0, Cache).
+
+
+longcount_seed(Seed) ->
+    <<X:64, _:6, F:12, S2:58, S1:58, S0:58>> =
+        crypto:hash(sha256, [Seed,<<"Xoroshiro928">>]),
+    {F,rand:exro928_seed([S0,S1,S2|rand:seed58(13, X)])}.
+
+longcount_next_count(0, Count) ->
+    Count;
+longcount_next_count(N, Count) ->
+    longcount_next_count(N - 1, rand:exro928_next_state(Count)).
+
+longcount_next(Count) ->
+    rand:exro928_next(Count).
+
+longcount_jump(Count) ->
+    rand:exro928_jump_2pow512(Count).
+
+longcount_jump_2pow20(Count) ->
+    rand:exro928_jump_2pow20(Count).
+
+
+%% Build binary with counter values to cache
+aes_cleartext(Cleartext, _F, Count, 0) ->
+    {Cleartext,Count};
+aes_cleartext(Cleartext, F, Count, GenWords) ->
+    {{S0,S1}, NewCount} = longcount_next(Count),
+    aes_cleartext(
+      <<Cleartext/binary, F:12, S1:58, S0:58>>,
+      F, NewCount, GenWords - 1).
+
+%% Parse and cache encrypted counter values aka random numbers
+-dialyzer({no_improper_lists, aes_cache/2}).
+aes_cache(<<>>, Cache) ->
+    Cache;
+aes_cache(
+  <<_:(128 - ?CRYPTO_AES_BITS), V:?CRYPTO_AES_BITS, Encrypted/binary>>,
+  Cache) ->
+    [V|aes_cache(Encrypted, Cache)].
+
 
 strong_rand_range(Range) when is_integer(Range), Range > 0 ->
     BinRange = int_to_bin(Range),
@@ -787,7 +1560,8 @@ rand_seed_nif(_Seed) -> ?nif_stub.
 -type pk_sign_verify_opts() :: [ rsa_sign_verify_opt() ] .
 
 -type rsa_sign_verify_opt() :: {rsa_padding, rsa_sign_verify_padding()}
-                             | {rsa_pss_saltlen, integer()} .
+                             | {rsa_pss_saltlen, integer()}
+                             | {rsa_mgf1_md, sha2()}.
 
 -type rsa_sign_verify_padding() :: rsa_pkcs1_padding | rsa_pkcs1_pss_padding
                                  | rsa_x931_padding | rsa_no_padding
@@ -798,12 +1572,12 @@ rand_seed_nif(_Seed) -> ?nif_stub.
 %%% Sign
 
 -spec sign(Algorithm, DigestType, Msg, Key)
-          -> Signature 
+          -> Signature
                  when Algorithm :: pk_sign_verify_algs(),
                       DigestType :: rsa_digest_type()
                                   | dss_digest_type()
                                   | ecdsa_digest_type(),
-                      Msg :: binary() | {digest,binary()},
+                      Msg :: iodata() | {digest,iodata()},
                       Key :: rsa_private()
                            | dss_private()
                            | [ecdsa_private() | ecdsa_params()]
@@ -816,13 +1590,13 @@ sign(Algorithm, Type, Data, Key) ->
 
 
 -spec sign(Algorithm, DigestType, Msg, Key, Options)
-          -> Signature 
+          -> Signature
                  when Algorithm :: pk_sign_verify_algs(),
                       DigestType :: rsa_digest_type()
                                   | dss_digest_type()
                                   | ecdsa_digest_type()
                                   | none,
-                      Msg :: binary() | {digest,binary()},
+                      Msg :: iodata() | {digest,iodata()},
                       Key :: rsa_private()
                            | dss_private()
                            | [ecdsa_private() | ecdsa_params()]
@@ -851,7 +1625,7 @@ pkey_sign_nif(_Algorithm, _Type, _Digest, _Key, _Options) -> ?nif_stub.
                                     | dss_digest_type()
                                     | ecdsa_digest_type()
                                     | none,
-                        Msg :: binary() | {digest,binary()},
+                        Msg :: iodata() | {digest,iodata()},
                         Signature :: binary(),
                         Key :: rsa_public()
                              | dss_public()
@@ -869,7 +1643,7 @@ verify(Algorithm, Type, Data, Signature, Key) ->
                         DigestType :: rsa_digest_type()
                                     | dss_digest_type()
                                     | ecdsa_digest_type(),
-                        Msg :: binary() | {digest,binary()},
+                        Msg :: iodata() | {digest,iodata()},
                         Signature :: binary(),
                         Key :: rsa_public()
                              | dss_public()
@@ -913,7 +1687,7 @@ sign_verify_compatibility(Algorithm0, Type0, _Digest) ->
                      | rsa_x931_padding
                      | rsa_no_padding.
 
--type rsa_opt() :: {rsa_padding, rsa_padding()} 
+-type rsa_opt() :: {rsa_padding, rsa_padding()}
                  | {signature_md, atom()}
                  | {rsa_mgf1_md, sha}
                  | {rsa_oaep_label, binary()}
@@ -986,7 +1760,7 @@ pkey_crypt_nif(_Algorithm, _In, _Key, _Options, _IsPrivate, _IsEncrypt) -> ?nif_
 %%%================================================================
 
 -spec generate_key(Type, Params)
-                 -> {PublicKey, PrivKeyOut} 
+                 -> {PublicKey, PrivKeyOut}
                         when Type :: dh | ecdh | rsa | srp,
                              PublicKey :: dh_public() | ecdh_public() | rsa_public() | srp_public(),
                              PrivKeyOut :: dh_private() | ecdh_private() | rsa_private() | {srp_public(),srp_private()},
@@ -996,7 +1770,7 @@ generate_key(Type, Params) ->
     generate_key(Type, Params, undefined).
 
 -spec generate_key(Type, Params, PrivKeyIn)
-                 -> {PublicKey, PrivKeyOut} 
+                 -> {PublicKey, PrivKeyOut}
                         when Type :: dh | ecdh | rsa | srp,
                              PublicKey :: dh_public() | ecdh_public() | rsa_public() | srp_public(),
                              PrivKeyIn :: undefined | dh_private() | ecdh_private() | rsa_private() | {srp_public(),srp_private()},
@@ -1147,7 +1921,7 @@ mod_pow(Base, Exponent, Prime) ->
 %%%======================================================================
 %%%
 %%% Engine functions
-%%% 
+%%%
 %%%======================================================================
 
 %%%---- Refering to keys stored in an engine:
@@ -1454,7 +2228,7 @@ ensure_engine_unloaded(Engine) ->
 %%----------------------------------------------------------------------
 %% Function: ensure_engine_unloaded/2
 %%----------------------------------------------------------------------
--spec ensure_engine_unloaded(Engine, EngineMethods) -> 
+-spec ensure_engine_unloaded(Engine, EngineMethods) ->
                                     Result when Engine :: engine_ref(),
                                                 EngineMethods :: [engine_method_type()],
                                                 Result :: ok | {error, Reason::term()}.
@@ -1536,7 +2310,7 @@ path2bin(Path) when is_list(Path) ->
 %%%================================================================
 %%%
 %%% Internal functions
-%%% 
+%%%
 %%%================================================================
 
 max_bytes() ->
@@ -1562,72 +2336,21 @@ hash_update(State0, Data, _, MaxBytes) ->
     State = notsup_to_error(hash_update_nif(State0, Increment)),
     hash_update(State, Rest, erlang:byte_size(Rest), MaxBytes).
 
+hash_info_nif(_Hash) -> ?nif_stub.
 hash_nif(_Hash, _Data) -> ?nif_stub.
 hash_init_nif(_Hash) -> ?nif_stub.
 hash_update_nif(_State, _Data) -> ?nif_stub.
 hash_final_nif(_State) -> ?nif_stub.
 
-%% HMAC --------------------------------------------------------------------
-
-hmac(Type, Key, Data, MacSize, Size, MaxBytes) when Size =< MaxBytes ->
-    notsup_to_error(
-    case MacSize of
-          undefined -> hmac_nif(Type, Key, Data);
-          _         -> hmac_nif(Type, Key, Data, MacSize)
-      end);
-hmac(Type, Key, Data, MacSize, Size, MaxBytes) ->
-    State0 = hmac_init(Type, Key),
-    State1 = hmac_update(State0, Data, Size, MaxBytes),
-    case MacSize of
-        undefined -> hmac_final(State1);
-        _         -> hmac_final_n(State1, MacSize)
-    end.
-
-hmac_update(State, Data, Size, MaxBytes)  when Size =< MaxBytes ->
-    notsup_to_error(hmac_update_nif(State, Data));
-hmac_update(State0, Data, _, MaxBytes) ->
-    <<Increment:MaxBytes/binary, Rest/binary>> = Data,
-    State = notsup_to_error(hmac_update_nif(State0, Increment)),
-    hmac_update(State, Rest, erlang:byte_size(Rest), MaxBytes).
-
-hmac_nif(_Type, _Key, _Data) -> ?nif_stub.
-hmac_nif(_Type, _Key, _Data, _MacSize) -> ?nif_stub.
-hmac_init_nif(_Type, _Key) -> ?nif_stub.
-hmac_update_nif(_Context, _Data) -> ?nif_stub.
-hmac_final_nif(_Context) -> ?nif_stub.
-hmac_final_nif(_Context, _MacSize) -> ?nif_stub.
-
-%% CMAC
-cmac_nif(_Type, _Key, _Data) -> ?nif_stub.
-
-%% POLY1305
-poly1305_nif(_Key, _Data) -> ?nif_stub.
-
-
 %% CIPHERS --------------------------------------------------------------------
 
-block_crypt_nif(_Type, _Key, _Ivec, _Text, _IsEncrypt) -> ?nif_stub.
-block_crypt_nif(_Type, _Key, _Text, _IsEncrypt) -> ?nif_stub.
-
-check_des3_key(Key) ->
-    case lists:map(fun erlang:iolist_to_binary/1, Key) of
-        ValidKey = [B1, B2, B3] when byte_size(B1) =:= 8,
-                                     byte_size(B2) =:= 8,
-                                     byte_size(B3) =:= 8 ->
-            ValidKey;
-        _ ->
-            error(badarg)
-   end.
+cipher_info_nif(_Type) -> ?nif_stub.
 
 %%
 %% AES - in Galois/Counter Mode (GCM)
 %%
 %% The default tag length is EVP_GCM_TLS_TAG_LEN(16),
-aead_encrypt(Type=aes_ccm, Key, Ivec, AAD, In) -> aead_encrypt(Type, Key, Ivec, AAD, In, 12);
-aead_encrypt(Type=aes_gcm, Key, Ivec, AAD, In) -> aead_encrypt(Type, Key, Ivec, AAD, In, 16).
-
-aead_encrypt(_Type, _Key, _Ivec, _AAD, _In, _TagLength) -> ?nif_stub.
-aead_decrypt(_Type, _Key, _Ivec, _AAD, _In, _Tag) -> ?nif_stub.
+aead_cipher(_Type, _Key, _Ivec, _AAD, _In, _TagOrTagLength, _EncFlg) -> ?nif_stub.
 
 %%
 %% AES - with 256 bit key in infinite garble extension mode (IGE)
@@ -1635,59 +2358,7 @@ aead_decrypt(_Type, _Key, _Ivec, _AAD, _In, _Tag) -> ?nif_stub.
 
 aes_ige_crypt_nif(_Key, _IVec, _Data, _IsEncrypt) -> ?nif_stub.
 
-
-%% Stream ciphers --------------------------------------------------------------------
-
-stream_crypt(Fun, State, Data, Size, MaxByts, []) when Size =< MaxByts ->
-    Fun(State, Data);
-stream_crypt(Fun, State0, Data, Size, MaxByts, Acc) when Size =< MaxByts ->
-    {State, Cipher} = Fun(State0, Data),
-    {State, list_to_binary(lists:reverse([Cipher | Acc]))};
-stream_crypt(Fun, State0, Data, _, MaxByts, Acc) ->
-    <<Increment:MaxByts/binary, Rest/binary>> = Data,
-    {State, CipherText} = Fun(State0, Increment),
-    stream_crypt(Fun, State, Rest, erlang:byte_size(Rest), MaxByts, [CipherText | Acc]).
-
-do_stream_encrypt({aes_ctr, State0}, Data) ->
-    {State, Cipher} = aes_ctr_stream_encrypt(State0, Data),
-    {{aes_ctr, State}, Cipher};
-do_stream_encrypt({rc4, State0}, Data) ->
-    {State, Cipher} = rc4_encrypt_with_state(State0, Data),
-    {{rc4, State}, Cipher};
-do_stream_encrypt({chacha20, State0}, Data) ->
-    {State, Cipher} = chacha20_stream_encrypt(State0, Data),
-    {{chacha20, State}, Cipher}.
-
-do_stream_decrypt({aes_ctr, State0}, Data) ->
-    {State, Text} = aes_ctr_stream_decrypt(State0, Data),
-    {{aes_ctr, State}, Text};
-do_stream_decrypt({rc4, State0}, Data) ->
-    {State, Text} = rc4_encrypt_with_state(State0, Data),
-    {{rc4, State}, Text};
-do_stream_decrypt({chacha20, State0}, Data) ->
-    {State, Cipher} = chacha20_stream_decrypt(State0, Data),
-    {{chacha20, State}, Cipher}.
-
-
-%%
-%% AES - in counter mode (CTR) with state maintained for multi-call streaming
-%%
-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
-%%
-rc4_set_key(_Key) -> ?nif_stub.
-rc4_encrypt_with_state(_State, _Data) -> ?nif_stub.
-
-%%
-%% CHACHA20 - stream cipher
-%%
-chacha20_stream_init(_Key, _IVec) -> ?nif_stub.
-chacha20_stream_encrypt(_State, _Data) -> ?nif_stub.
-chacha20_stream_decrypt(_State, _Data) -> ?nif_stub.
+%%%================================================================
 
 %% Secure remote password  -------------------------------------------------------------------
 
@@ -1851,7 +2522,13 @@ exor(Data1, Data2, _Size, MaxByts, Acc) ->
 
 do_exor(_A, _B) -> ?nif_stub.
 
-algorithms() -> ?nif_stub.
+hash_algorithms() -> ?nif_stub.
+pubkey_algorithms() -> ?nif_stub.
+cipher_algorithms() -> ?nif_stub.
+mac_algorithms() -> ?nif_stub.
+curve_algorithms() -> ?nif_stub.
+rsa_opts_algorithms() -> ?nif_stub.
+
 
 int_to_bin(X) when X < 0 -> int_to_bin_neg(X, []);
 int_to_bin(X) -> int_to_bin_pos(X, []).
@@ -2051,3 +2728,5 @@ check_otp_test_engine(LibDir) ->
                     {error, notexist}
             end
     end.
+
+
diff --git a/lib/crypto/test/Makefile b/lib/crypto/test/Makefile
index e046a25338..988d95a8bc 100644
--- a/lib/crypto/test/Makefile
+++ b/lib/crypto/test/Makefile
@@ -6,7 +6,7 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 # ----------------------------------------------------
 
 MODULES = \
-	blowfish_SUITE \
+	crypto_bench_SUITE \
 	crypto_SUITE \
 	engine_SUITE
 
@@ -77,7 +77,7 @@ release_spec:
 
 release_tests_spec: $(TEST_TARGET)
 	$(INSTALL_DIR) "$(RELSYSDIR)"
-	$(INSTALL_DATA) crypto.spec crypto.cover $(RELTEST_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) crypto.spec crypto_bench.spec crypto.cover $(RELTEST_FILES) "$(RELSYSDIR)"
 	@tar cfh - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 	chmod -R u+w "$(RELSYSDIR)"
 
diff --git a/lib/crypto/test/blowfish_SUITE.erl b/lib/crypto/test/blowfish_SUITE.erl
deleted file mode 100644
index a931ebb47e..0000000000
--- a/lib/crypto/test/blowfish_SUITE.erl
+++ /dev/null
@@ -1,300 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% 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(blowfish_SUITE).
-
-%% Note: This directive should only be used in test suites.
--compile(export_all).
-
--include_lib("common_test/include/ct.hrl").
-
--define(TIMEOUT, 120000). % 2 min
-
--define(KEY, to_bin("0123456789ABCDEFF0E1D2C3B4A59687")).
--define(IVEC, to_bin("FEDCBA9876543210")).
-%% "7654321 Now is the time for " (includes trailing '\0')
--define(DATA, to_bin("37363534333231204E6F77206973207468652074696D6520666F722000")).
--define(DATA_PADDED, to_bin("37363534333231204E6F77206973207468652074696D6520666F722000000000")).
-
-%% Test server callback functions
-%%--------------------------------------------------------------------
-%% Function: init_per_suite(Config) -> Config
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Initialization 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) ->
-    case catch crypto:start() of
-	ok ->
-            catch ct:comment("~s",[element(3,hd(crypto:info_lib()))]),
-            catch ct:log("crypto:info_lib() -> ~p~n"
-                         "crypto:supports() -> ~p~n"
-                         "crypto:version()  -> ~p~n"
-                        ,[crypto:info_lib(), crypto:supports(), crypto:version()]),
-	    Config;
-	_Else ->
-	    {skip,"Could not start crypto!"}
-    end.
-
-%%--------------------------------------------------------------------
-%% 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) ->
-    crypto:stop().
-
-%%--------------------------------------------------------------------
-%% Function: init_per_testcase(TestCase, 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: 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.
-%% Description: Initialization before each test case
-%%--------------------------------------------------------------------
-init_per_testcase(_TestCase, Config0) ->
-    Config = lists:keydelete(watchdog, 1, Config0),
-    Dog = test_server:timetrap(?TIMEOUT),
-    [{watchdog, Dog} | Config].
-
-%%--------------------------------------------------------------------
-%% Function: end_per_testcase(TestCase, 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(_TestCase, Config) ->
-    Dog = ?config(watchdog, Config),
-    case Dog of
-	undefined ->
-	    ok;
-	_ ->
-	    test_server:timetrap_cancel(Dog)
-    end.
-
-%%--------------------------------------------------------------------
-%% Function: all(Clause) -> TestCases
-%% Clause - atom() - suite | doc
-%% TestCases - [Case]
-%% Case - atom()
-%%   Name of a test case.
-%% Description: Returns a list of all test cases in this test suite
-%%--------------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() -> 
-[{group, fips},
- {group, non_fips}].
-
-groups() -> 
-    [{fips,     [], [no_ecb, no_cbc, no_cfb64, no_ofb64]},
-     {non_fips, [], [ecb, cbc, cfb64, ofb64]}].
-
-init_per_group(fips, Config) ->
-    case crypto:info_fips() of
-        enabled ->
-            Config;
-        not_enabled ->
-            case crypto:enable_fips_mode(true) of
-		true ->
-		    enabled = crypto:info_fips(),
-		    Config;
-		false ->
-		    {skip, "Failed to enable FIPS mode"}
-	    end;
-        not_supported ->
-            {skip, "FIPS mode not supported"}
-    end;
-init_per_group(non_fips, Config) ->
-    case crypto:info_fips() of
-        enabled ->
-            true = crypto:enable_fips_mode(false),
-            not_enabled = crypto:info_fips(),
-            Config;
-        _NotEnabled ->
-            Config
-    end;
-init_per_group(_GroupName, Config) ->
-	Config.
-
-end_per_group(_GroupName, Config) ->
-	Config.
-
-
-%% Test cases start here.
-%%--------------------------------------------------------------------
-
-ecb_test(KeyBytes, ClearBytes, CipherBytes) ->
-    {Key, Clear, Cipher} =
-	{to_bin(KeyBytes), to_bin(ClearBytes), to_bin(CipherBytes)},
-    ?line m(crypto:block_encrypt(blowfish_ecb, Key, Clear), Cipher),
-    true.
-
-ecb(doc) ->
-    "Test that ECB mode is OK";
-ecb(suite) ->
-    [];
-ecb(Config) when is_list(Config) ->
-	true = ecb_test("0000000000000000", "0000000000000000", "4EF997456198DD78"),
-	true = ecb_test("FFFFFFFFFFFFFFFF", "FFFFFFFFFFFFFFFF", "51866FD5B85ECB8A"),
-	true = ecb_test("3000000000000000", "1000000000000001", "7D856F9A613063F2"),
-	true = ecb_test("1111111111111111", "1111111111111111", "2466DD878B963C9D"),
-	true = ecb_test("0123456789ABCDEF", "1111111111111111", "61F9C3802281B096"),
-	true = ecb_test("1111111111111111", "0123456789ABCDEF", "7D0CC630AFDA1EC7"),
-	true = ecb_test("0000000000000000", "0000000000000000", "4EF997456198DD78"),
-	true = ecb_test("FEDCBA9876543210", "0123456789ABCDEF", "0ACEAB0FC6A0A28D"),
-	true = ecb_test("7CA110454A1A6E57", "01A1D6D039776742", "59C68245EB05282B"),
-	true = ecb_test("0131D9619DC1376E", "5CD54CA83DEF57DA", "B1B8CC0B250F09A0"),
-	true = ecb_test("07A1133E4A0B2686", "0248D43806F67172", "1730E5778BEA1DA4"),
-	true = ecb_test("3849674C2602319E", "51454B582DDF440A", "A25E7856CF2651EB"),
-	true = ecb_test("04B915BA43FEB5B6", "42FD443059577FA2", "353882B109CE8F1A"),
-	true = ecb_test("0113B970FD34F2CE", "059B5E0851CF143A", "48F4D0884C379918"),
-	true = ecb_test("0170F175468FB5E6", "0756D8E0774761D2", "432193B78951FC98"),
-	true = ecb_test("43297FAD38E373FE", "762514B829BF486A", "13F04154D69D1AE5"),
-	true = ecb_test("07A7137045DA2A16", "3BDD119049372802", "2EEDDA93FFD39C79"),
-	true = ecb_test("04689104C2FD3B2F", "26955F6835AF609A", "D887E0393C2DA6E3"),
-	true = ecb_test("37D06BB516CB7546", "164D5E404F275232", "5F99D04F5B163969"),
-	true = ecb_test("1F08260D1AC2465E", "6B056E18759F5CCA", "4A057A3B24D3977B"),
-	true = ecb_test("584023641ABA6176", "004BD6EF09176062", "452031C1E4FADA8E"),
-	true = ecb_test("025816164629B007", "480D39006EE762F2", "7555AE39F59B87BD"),
-	true = ecb_test("49793EBC79B3258F", "437540C8698F3CFA", "53C55F9CB49FC019"),
-	true = ecb_test("4FB05E1515AB73A7", "072D43A077075292", "7A8E7BFA937E89A3"),
-	true = ecb_test("49E95D6D4CA229BF", "02FE55778117F12A", "CF9C5D7A4986ADB5"),
-	true = ecb_test("018310DC409B26D6", "1D9D5C5018F728C2", "D1ABB290658BC778"),
-	true = ecb_test("1C587F1C13924FEF", "305532286D6F295A", "55CB3774D13EF201"),
-	true = ecb_test("0101010101010101", "0123456789ABCDEF", "FA34EC4847B268B2"),
-	true = ecb_test("1F1F1F1F0E0E0E0E", "0123456789ABCDEF", "A790795108EA3CAE"),
-	true = ecb_test("E0FEE0FEF1FEF1FE", "0123456789ABCDEF", "C39E072D9FAC631D"),
-	true = ecb_test("0000000000000000", "FFFFFFFFFFFFFFFF", "014933E0CDAFF6E4"),
-	true = ecb_test("FFFFFFFFFFFFFFFF", "0000000000000000", "F21E9A77B71C49BC"),
-	true = ecb_test("0123456789ABCDEF", "0000000000000000", "245946885754369A"),
-	true = ecb_test("FEDCBA9876543210", "FFFFFFFFFFFFFFFF", "6B5C5A9C5D9E0A5A"),
-	ok.
-
-cbc(doc) ->
-    "Test that CBC mode is OK";
-cbc(suite) ->
-    [];
-cbc(Config) when is_list(Config) ->
-	true = crypto:block_encrypt(blowfish_cbc, ?KEY, ?IVEC, ?DATA_PADDED) =:=
-		to_bin("6B77B4D63006DEE605B156E27403979358DEB9E7154616D959F1652BD5FF92CC"),
-	ok.
-
-cfb64(doc) ->
-    "Test that CFB64 mode is OK";
-cfb64(suite) ->
-    [];
-cfb64(Config) when is_list(Config) ->
-	true = crypto:block_encrypt(blowfish_cfb64, ?KEY, ?IVEC, ?DATA) =:=
-		to_bin("E73214A2822139CAF26ECF6D2EB9E76E3DA3DE04D1517200519D57A6C3"),
-	ok.
-
-ofb64(doc) ->
-    "Test that OFB64 mode is OK";
-ofb64(suite) ->
-    [];
-ofb64(Config) when is_list(Config) ->
-	true = crypto:block_encrypt(blowfish_ofb64, ?KEY, ?IVEC, ?DATA) =:=
-		to_bin("E73214A2822139CA62B343CC5B65587310DD908D0C241B2263C2CF80DA"),
-	ok.
-
-no_ecb(doc) ->
-    "Test that ECB mode is disabled";
-no_ecb(suite) ->
-    [];
-no_ecb(Config) when is_list(Config) ->
-	notsup(fun crypto:block_encrypt/3,
-               [blowfish_ecb,
-		to_bin("0000000000000000"),
-                to_bin("FFFFFFFFFFFFFFFF")]).
-
-no_cbc(doc) ->
-    "Test that CBC mode is disabled";
-no_cbc(suite) ->
-    [];
-no_cbc(Config) when is_list(Config) ->
-	notsup(fun crypto:block_encrypt/4,
-               [blowfish_cbc, ?KEY, ?IVEC, ?DATA_PADDED]).
-
-no_cfb64(doc) ->
-    "Test that CFB64 mode is disabled";
-no_cfb64(suite) ->
-    [];
-no_cfb64(Config) when is_list(Config) ->
-	notsup(fun crypto:block_encrypt/4,
-               [blowfish_cfb64, ?KEY, ?IVEC, ?DATA]),
-	ok.
-
-no_ofb64(doc) ->
-    "Test that OFB64 mode is disabled";
-no_ofb64(suite) ->
-    [];
-no_ofb64(Config) when is_list(Config) ->
-	notsup(fun crypto:block_encrypt/4,
-               [blowfish_ofb64, ?KEY, ?IVEC, ?DATA]).
-
-%% Helper functions
-
-%% Assert function fails with notsup error
-notsup(Fun, Args) ->
-    ok = try
-             {error, {return, apply(Fun, Args)}}
-         catch
-             error:notsup ->
-                 ok;
-             Class:Error ->
-                 {error, {Class, Error}}
-         end.
-
-
-%% Convert a hexadecimal string to a binary.
--spec(to_bin(L::string()) -> binary()).
-to_bin(L) ->
-    to_bin(L, []).
-
-%% @spec dehex(char()) -> integer()
-%% @doc Convert a hex digit to its integer value.
--spec(dehex(char()) -> integer()).
-dehex(C) when C >= $0, C =< $9 ->
-    C - $0;
-dehex(C) when C >= $a, C =< $f ->
-    C - $a + 10;
-dehex(C) when C >= $A, C =< $F ->
-    C - $A + 10.
-
--spec(to_bin(L::string(), list()) -> binary()).
-to_bin([], Acc) ->
-    iolist_to_binary(lists:reverse(Acc));
-to_bin([C1, C2 | Rest], Acc) ->
-    to_bin(Rest, [(dehex(C1) bsl 4) bor dehex(C2) | Acc]).
-
-m(X,X) -> ok.
diff --git a/lib/crypto/test/crypto.spec b/lib/crypto/test/crypto.spec
index cc09970cb3..4a95275687 100644
--- a/lib/crypto/test/crypto.spec
+++ b/lib/crypto/test/crypto.spec
@@ -1 +1,6 @@
 {suites,"../crypto_test",all}.
+
+{skip_suites, "../crypto_test", [crypto_bench_SUITE
+	],
+ "Benchmarks run separately"}.
+
diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index 6c6188f775..0da70d5592 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -9,7 +9,7 @@
 %%
 %%     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
@@ -40,55 +40,109 @@ all() ->
      rand_uniform,
      rand_threads,
      rand_plugin,
-     rand_plugin_s
+     rand_plugin_s,
+     cipher_info,
+     hash_info
     ].
 
+-define(NEW_CIPHER_TYPE_SCHEMA,
+        {group, des_ede3_cbc},
+        {group, des_ede3_cfb},
+        {group, aes_128_cbc},
+        {group, aes_192_cbc},
+        {group, aes_256_cbc},
+        {group, aes_128_ctr},
+        {group, aes_192_ctr},
+        {group, aes_256_ctr},
+        {group, aes_128_ccm},
+        {group, aes_192_ccm},
+        {group, aes_256_ccm},
+        {group, aes_128_ecb},
+        {group, aes_192_ecb},
+        {group, aes_256_ecb},
+        {group, aes_128_gcm},
+        {group, aes_192_gcm},
+        {group, aes_256_gcm},
+        {group, des_ede3_cbc},
+        {group, des_ede3_cfb}
+       ).
+        
+-define(RETIRED_TYPE_ALIASES,
+        {group, aes_cbc},
+        {group, aes_cbc128},
+        {group, aes_cbc256},
+        {group, aes_ccm},
+        {group, aes_ctr},
+        {group, aes_gcm},
+        {group, aes_ecb},
+        {group, des3_cfb},
+        {group, des3_cbc},
+        {group, des3_cbf},
+        {group, des_ede3}
+       ).
+
 groups() ->
-    [{non_fips, [], [{group, md4},
+    [{non_fips, [], [
+                     {group, blake2b},
+                     {group, blake2s},
+                     {group, dss},
+                     {group, ecdsa},
+                     {group, ed25519},
+                     {group, ed448},
+                     {group, rsa},
+
+                     {group, md4},
                      {group, md5},
                      {group, ripemd160},
-                     {group, sha},
                      {group, sha224},
                      {group, sha256},
                      {group, sha384},
-                     {group, sha512},
                      {group, sha3_224},
                      {group, sha3_256},
                      {group, sha3_384},
                      {group, sha3_512},
-                     {group, rsa},
-                     {group, dss},
-                     {group, ecdsa},
-                     {group, ed25519},
-                     {group, ed448},
+                     {group, sha512},
+                     {group, sha},
+                     {group, poly1305},
+
                      {group, dh},
                      {group, ecdh},
                      {group, srp},
-                     {group, des_cbc},
-                     {group, des_cfb},
-                     {group, des3_cbc},
-                     {group, des3_cbf},
-		     {group, des3_cfb},
-                     {group, des_ede3},
+
+		     {group, chacha20_poly1305},
+		     {group, chacha20},
                      {group, blowfish_cbc},
-                     {group, blowfish_ecb},
                      {group, blowfish_cfb64},
+                     {group, blowfish_ecb},
                      {group, blowfish_ofb64},
-                     {group, aes_cbc128},
-                     {group, aes_cfb8},
-                     {group, aes_cfb128},
-                     {group, aes_cbc256},
+
                      {group, aes_ige256},
+                     {group, des_cbc},
+                     {group, des_cfb},
                      {group, rc2_cbc},
                      {group, rc4},
-                     {group, aes_ctr},
-		     {group, aes_ccm},
-		     {group, aes_gcm},
-		     {group, chacha20_poly1305},
-		     {group, chacha20},
-                     {group, poly1305},
-		     {group, aes_cbc}]},
-     {fips, [], [{group, no_md4},
+
+                     ?NEW_CIPHER_TYPE_SCHEMA,
+                     {group, aes_128_cfb128},
+                     {group, aes_192_cfb128},
+                     {group, aes_256_cfb128},
+                     {group, aes_128_cfb8},
+                     {group, aes_192_cfb8},
+                     {group, aes_256_cfb8},
+                     ?RETIRED_TYPE_ALIASES,
+                     {group, aes_cfb128},
+                     {group, aes_cfb8}
+                    ]},
+     {fips, [], [
+                 {group, no_blake2b},
+                 {group, no_blake2s},
+                 {group, dss},
+                 {group, ecdsa},
+                 {group, no_ed25519},
+                 {group, no_ed448},
+                 {group, rsa},
+
+                 {group, no_md4},
                  {group, no_md5},
                  {group, no_ripemd160},
                  {group, sha},
@@ -96,109 +150,148 @@ groups() ->
                  {group, sha256},
                  {group, sha384},
                  {group, sha512},
-                 {group, rsa},
-                 {group, dss},
-                 {group, ecdsa},
+                 {group, no_poly1305},
+
                  {group, dh},
                  {group, ecdh},
                  {group, no_srp},
-                 {group, no_des_cbc},
-                 {group, no_des_cfb},
-                 {group, des3_cbc},
-                 {group, des3_cbf},
-		 {group, des3_cfb},
-                 {group, des_ede3},
+
+		 {group, no_chacha20_poly1305},
+		 {group, no_chacha20},
                  {group, no_blowfish_cbc},
-                 {group, no_blowfish_ecb},
                  {group, no_blowfish_cfb64},
+                 {group, no_blowfish_ecb},
                  {group, no_blowfish_ofb64},
-                 {group, aes_cbc128},
-                 {group, aes_cfb8},
-                 {group, aes_cfb128},
-                 {group, aes_cbc256},
+
+                 {group, no_aes_cfb128},
+                 {group, no_aes_cfb8},
                  {group, no_aes_ige256},
+                 {group, no_des_cbc},
+                 {group, no_des_cfb},
                  {group, no_rc2_cbc},
                  {group, no_rc4},
-                 {group, aes_ctr},
-		 {group, aes_ccm},
-		 {group, aes_gcm},
-		 {group, no_chacha20_poly1305},
-		 {group, no_chacha20},
-		 {group, aes_cbc}]},
-     {md4, [], [hash]},
-     {md5, [], [hash, hmac]},
-     {ripemd160, [], [hash]},
-     {sha, [], [hash, hmac]},
-     {sha224, [], [hash, hmac]},
-     {sha256, [], [hash, hmac]},
-     {sha384, [], [hash, hmac]},
-     {sha512, [], [hash, hmac]},
-     {sha3_224, [], [hash, hmac]},
-     {sha3_256, [], [hash, hmac]},
-     {sha3_384, [], [hash, hmac]},
-     {sha3_512, [], [hash, hmac]},
-     {rsa, [], [sign_verify,
-                public_encrypt,
-                private_encrypt,
-                generate
-               ]},
-     {dss, [], [sign_verify
-                %% Does not work yet:  ,public_encrypt, private_encrypt
-               ]},
-     {ecdsa, [], [sign_verify
-                %% Does not work yet:  ,public_encrypt, private_encrypt
-                 ]},
-     {ed25519, [], [sign_verify
-                %% Does not work yet:  ,public_encrypt, private_encrypt
-                 ]},
-     {ed448, [], [sign_verify
-                %% Does not work yet:  ,public_encrypt, private_encrypt
-                 ]},
-     {dh, [], [generate_compute,
-               compute_bug]},
-     {ecdh, [], [generate_all_supported, compute, generate]},
-     {srp, [], [generate_compute]},
-     {des_cbc, [], [block]},
-     {des_cfb, [], [block]},
-     {des3_cbc,[], [block]},
-     {des_ede3,[], [block]},
-     {des3_cbf,[], [block]},
-     {des3_cfb,[], [block]},
-     {rc2_cbc,[], [block]},
-     {aes_cbc128,[], [block, cmac]},
-     {aes_cfb8,[], [block]},
-     {aes_cfb128,[], [block]},
-     {aes_cbc256,[], [block, cmac]},
-     {aes_ecb,[], [block]},
-     {aes_ige256,[], [block]},
-     {blowfish_cbc, [], [block]},
-     {blowfish_ecb, [], [block]},
-     {blowfish_cfb64, [], [block]},
-     {blowfish_ofb64,[], [block]},
-     {rc4, [], [stream]},
-     {aes_ctr, [], [stream]},
-     {aes_ccm, [], [aead]},
-     {aes_gcm, [], [aead]},
-     {chacha20_poly1305, [], [aead]},
-     {chacha20, [], [stream]},
-     {poly1305, [], [poly1305]},
-     {aes_cbc, [], [block]},
-     {no_md4, [], [no_support, no_hash]},
-     {no_md5, [], [no_support, no_hash, no_hmac]},
-     {no_ripemd160, [], [no_support, no_hash]},
-     {no_srp, [], [no_support, no_generate_compute]},
-     {no_des_cbc, [], [no_support, no_block]},
-     {no_des_cfb, [], [no_support, no_block]},
-     {no_blowfish_cbc, [], [no_support, no_block]},
-     {no_blowfish_ecb, [], [no_support, no_block]},
-     {no_blowfish_cfb64, [], [no_support, no_block]},
-     {no_blowfish_ofb64, [], [no_support, no_block]},
-     {no_aes_ige256, [], [no_support, no_block]},
+
+                 ?NEW_CIPHER_TYPE_SCHEMA,
+                 ?RETIRED_TYPE_ALIASES
+                ]},
+
+     {md4,                  [], [hash]},
+     {md5,                  [], [hash, hmac, hmac_update]},
+     {ripemd160,            [], [hash]},
+     {sha,                  [], [hash, hmac, hmac_update]},
+     {sha224,               [], [hash, hmac, hmac_update]},
+     {sha256,               [], [hash, hmac, hmac_update]},
+     {sha384,               [], [hash, hmac, hmac_update]},
+     {sha512,               [], [hash, hmac, hmac_update]},
+     {sha3_224,             [], [hash, hmac, hmac_update]},
+     {sha3_256,             [], [hash, hmac, hmac_update]},
+     {sha3_384,             [], [hash, hmac, hmac_update]},
+     {sha3_512,             [], [hash, hmac, hmac_update]},
+     {blake2b,              [], [hash, hmac, hmac_update]},
+     {blake2s,              [], [hash, hmac, hmac_update]},
+     {no_blake2b,           [], [no_hash, no_hmac]},
+     {no_blake2s,           [], [no_hash, no_hmac]},
+     {rsa,                  [], [sign_verify,
+                                 public_encrypt,
+                                 private_encrypt,
+                                 generate
+                                ]},
+     {dss,                  [], [sign_verify
+                                 %% Does not work yet:  ,public_encrypt, private_encrypt
+                                ]},
+     {ecdsa,                [], [sign_verify
+                                 %% Does not work yet:  ,public_encrypt, private_encrypt
+                                ]},
+     {ed25519,              [], [sign_verify
+                                 %% Does not work yet:  ,public_encrypt, private_encrypt
+                              ]},
+     {ed448,                [], [sign_verify
+                                 %% Does not work yet:  ,public_encrypt, private_encrypt
+                                ]},
+     {dh,                   [], [generate_compute, compute_bug]},
+     {ecdh,                 [], [use_all_elliptic_curves, compute, generate]},
+     {srp,                  [], [generate_compute]},
+     {des_cbc,              [], [block, api_ng, api_ng_one_shot, api_ng_tls]},
+     {des_cfb,              [], [block, api_ng, api_ng_one_shot, api_ng_tls]},
+     {des_ede3_cbc,         [], [block, api_ng, api_ng_one_shot, api_ng_tls]},
+     {des_ede3_cfb,         [], [block, api_ng, api_ng_one_shot, api_ng_tls]},
+     {rc2_cbc,              [], [block, api_ng, api_ng_one_shot, api_ng_tls]},
+     {aes_cfb8,             [], [block]},
+     {aes_128_cfb8,         [], [block, api_ng, api_ng_one_shot, api_ng_tls]},
+     {aes_192_cfb8,         [], [block, api_ng, api_ng_one_shot, api_ng_tls]},
+     {aes_256_cfb8,         [], [block, api_ng, api_ng_one_shot, api_ng_tls]},
+     {no_aes_cfb8,          [], [no_support, no_block]},
+     {aes_cfb128,           [], [block]},
+     {aes_128_cfb128,       [], [block, api_ng, api_ng_one_shot, api_ng_tls]},
+     {aes_192_cfb128,       [], [block, api_ng, api_ng_one_shot, api_ng_tls]},
+     {aes_256_cfb128,       [], [block, api_ng, api_ng_one_shot, api_ng_tls]},
+     {no_aes_cfb128,        [], [no_support, no_block]},
+     {aes_ige256,           [], [block]},
+     {no_aes_ige256,        [], [no_support, no_block]},
+     {blowfish_cbc,         [], [block, api_ng, api_ng_one_shot, api_ng_tls]},
+     {blowfish_ecb,         [], [block, api_ng, api_ng_one_shot]},
+     {blowfish_cfb64,       [], [block, api_ng, api_ng_one_shot, api_ng_tls]},
+     {blowfish_ofb64,       [], [block, api_ng, api_ng_one_shot, api_ng_tls]},
+     {rc4,                  [], [stream, api_ng, api_ng_one_shot, api_ng_tls]},
+     {aes_ctr,              [], [stream]},
+     {chacha20_poly1305,    [], [aead]},
+     {chacha20,             [], [stream, api_ng, api_ng_one_shot, api_ng_tls]},
+     {poly1305,             [], [poly1305]},
+     {no_poly1305,          [], [no_poly1305]},
+     {no_aes_cfb128,        [], [no_support, no_block]},
+     {no_md4,               [], [no_support, no_hash]},
+     {no_md5,               [], [no_support, no_hash, no_hmac]},
+     {no_ed25519,           [], [no_support, no_sign_verify
+                                 %% Does not work yet:  ,public_encrypt, private_encrypt
+                                ]},
+     {no_ed448,             [], [no_support, no_sign_verify
+                                 %% Does not work yet:  ,public_encrypt, private_encrypt
+                                ]},
+     {no_ripemd160,         [], [no_support, no_hash]},
+     {no_srp,               [], [no_support, no_generate_compute]},
+     {no_des_cbc,           [], [no_support, no_block]},
+     {no_des_cfb,           [], [no_support, no_block]},
+     {no_blowfish_cbc,      [], [no_support, no_block]},
+     {no_blowfish_ecb,      [], [no_support, no_block]},
+     {no_blowfish_cfb64,    [], [no_support, no_block]},
+     {no_blowfish_ofb64,    [], [no_support, no_block]},
+     {no_aes_ige256,        [], [no_support, no_block]},
      {no_chacha20_poly1305, [], [no_support, no_aead]},
-     {no_chacha20, [], [no_support, no_stream_ivec]},
-     {no_rc2_cbc, [], [no_support, no_block]},
-     {no_rc4, [], [no_support, no_stream]},
-     {api_errors, [], [api_errors_ecdh]}
+     {no_chacha20,          [], [no_support, no_stream_ivec]},
+     {no_rc2_cbc,           [], [no_support, no_block]},
+     {no_rc4,               [], [no_support, no_stream]},
+     {api_errors,           [], [api_errors_ecdh]},
+
+     %% New cipher nameing schema
+     {des_ede3_cbc, [], [api_ng, api_ng_one_shot, api_ng_tls]},
+     {des_ede3_cfb, [], [api_ng, api_ng_one_shot, api_ng_tls]},
+     {aes_128_cbc,  [], [api_ng, api_ng_one_shot, api_ng_tls, cmac]},
+     {aes_192_cbc,  [], [api_ng, api_ng_one_shot, api_ng_tls]},
+     {aes_256_cbc,  [], [api_ng, api_ng_one_shot, api_ng_tls, cmac]},
+     {aes_128_ctr,  [], [api_ng, api_ng_one_shot, api_ng_tls]},
+     {aes_192_ctr,  [], [api_ng, api_ng_one_shot, api_ng_tls]},
+     {aes_256_ctr,  [], [api_ng, api_ng_one_shot, api_ng_tls]},
+     {aes_128_ccm,  [], [aead]},
+     {aes_192_ccm,  [], [aead]},
+     {aes_256_ccm,  [], [aead]},
+     {aes_128_ecb,  [], [api_ng, api_ng_one_shot]},
+     {aes_192_ecb,  [], [api_ng, api_ng_one_shot]},
+     {aes_256_ecb,  [], [api_ng, api_ng_one_shot]},
+     {aes_128_gcm,  [], [aead]},
+     {aes_192_gcm,  [], [aead]},
+     {aes_256_gcm,  [], [aead]},
+
+     %% Retired aliases
+     {aes_cbc,    [], [block]},
+     {aes_cbc128, [], [block]},
+     {aes_cbc256, [], [block]},
+     {aes_ccm,    [], [aead]},
+     {aes_ecb,    [], [block]},
+     {aes_gcm,    [], [aead]},
+     {des3_cbc,             [], [block]},
+     {des_ede3,             [], [block]},
+     {des3_cbf,             [], [block]},
+     {des3_cfb,             [], [block]}
     ].
 
 %%-------------------------------------------------------------------
@@ -251,7 +344,7 @@ init_per_group(fips, Config) ->
 		    enabled = crypto:info_fips(),
 		    FIPSConfig;
 		false ->
-		    {skip, "Failed to enable FIPS mode"}
+		    {fail, "Failed to enable FIPS mode"}
 	    end;
         not_supported ->
             {skip, "FIPS mode not supported"}
@@ -291,12 +384,11 @@ end_per_group(_GroupName, Config) ->
 init_per_testcase(info, Config) ->
     Config;
 init_per_testcase(cmac, Config) ->
-    case crypto:info_lib() of
-        [{<<"OpenSSL">>,LibVer,_}] when is_integer(LibVer), LibVer > 16#10001000 ->
-            Config;
-        _Else ->
-            % The CMAC functionality was introduced in OpenSSL 1.0.1
-            {skip, "OpenSSL is too old"}
+    case is_supported(cmac) of
+        true ->
+            configure_mac(cmac, proplists:get_value(type,Config), Config);
+        false ->
+            {skip, "CMAC is not supported"}
     end;
 init_per_testcase(generate, Config) ->
     case proplists:get_value(type, Config) of
@@ -313,6 +405,8 @@ init_per_testcase(generate, Config) ->
 	    end;
 	_ -> Config
     end;
+init_per_testcase(hmac, Config) ->
+    configure_mac(hmac, proplists:get_value(type,Config), Config);
 init_per_testcase(_Name,Config) ->
     Config.
 
@@ -360,27 +454,41 @@ no_hash(Config) when is_list(Config) ->
     notsup(fun crypto:hash_init/1, [Type]).
 %%--------------------------------------------------------------------
 hmac() ->
-     [{doc, "Test all different hmac functions"}].
+     [{doc, "Test hmac function"}].
 hmac(Config) when is_list(Config) ->
-    {Type, Keys, DataLE, Expected} = proplists:get_value(hmac, Config),
-    Data = lazy_eval(DataLE),
-    hmac(Type, Keys, Data, Expected),
-    hmac(Type, lists:map(fun iolistify/1, Keys), lists:map(fun iolistify/1, Data), Expected),
-    hmac_increment(Type).
+    Tuples = lazy_eval(proplists:get_value(hmac, Config)),
+    lists:foreach(fun hmac_check/1, Tuples),
+    lists:foreach(fun hmac_check/1, mac_listify(Tuples)).
+
 %%--------------------------------------------------------------------
 no_hmac() ->
      [{doc, "Test all disabled hmac functions"}].
 no_hmac(Config) when is_list(Config) ->
     Type = ?config(type, Config),
-    notsup(fun crypto:hmac/3, [Type, <<"Key">>, <<"Hi There">>]),
+    notsup(fun crypto:hmac/3, [Type, <<"Key">>, <<"Hi There">>]).
+
+%%--------------------------------------------------------------------
+hmac_update() ->
+     [{doc, "Test all incremental hmac functions"}].
+hmac_update(Config) ->
+    Type = ?config(type, Config),
+    hmac_increment(Type).
+
+%%--------------------------------------------------------------------
+no_hmac_update() ->
+     [{doc, "Test all disabled incremental hmac functions"}].
+no_hmac_update(Config) ->
+    Type = ?config(type, Config),
     notsup(fun crypto:hmac_init/2, [Type, <<"Key">>]).
+
 %%--------------------------------------------------------------------
 cmac() ->
      [{doc, "Test all different cmac functions"}].
 cmac(Config) when is_list(Config) ->
     Pairs = lazy_eval(proplists:get_value(cmac, Config)),
     lists:foreach(fun cmac_check/1, Pairs),
-    lists:foreach(fun cmac_check/1, cmac_iolistify(Pairs)).
+    lists:foreach(fun cmac_check/1, mac_listify(Pairs)).
+
 %%--------------------------------------------------------------------
 poly1305() ->
     [{doc, "Test poly1305 function"}].
@@ -396,23 +504,19 @@ poly1305(Config) ->
       end, proplists:get_value(poly1305, Config)).
 
 %%--------------------------------------------------------------------
+no_poly1305() ->
+    [{doc, "Test disabled poly1305 function"}].
+no_poly1305(_Config) ->
+    Key = <<133,214,190,120,87,85,109,51,127,68,82,254,66,213,6,168,1,
+            3,128,138,251,13,178,253,74,191,246,175,65,73,245,27>>,
+    Txt = <<"Cryptographic Forum Research Group">>,
+    notsup(fun crypto:poly1305/2, [Key,Txt]).
+
+%%--------------------------------------------------------------------
 block() ->
      [{doc, "Test block ciphers"}].
 block(Config) when is_list(Config) ->
-    Fips = proplists:get_bool(fips, Config),
-    Type = ?config(type, Config),
-    %% See comment about EVP_CIPHER_CTX_set_key_length in
-    %% block_crypt_nif in crypto.c.
-    case {Fips, Type} of
-	{true, aes_cfb8} ->
-	    throw({skip, "Cannot test aes_cfb8 in FIPS mode because of key length issue"});
-	{true, aes_cfb128} ->
-	    throw({skip, "Cannot test aes_cfb128 in FIPS mode because of key length issue"});
-	_ ->
-	    ok
-    end,
-
-    Blocks = lazy_eval(proplists:get_value(block, Config)),
+    [_|_] = Blocks = lazy_eval(proplists:get_value(cipher, Config)),
     lists:foreach(fun block_cipher/1, Blocks),
     lists:foreach(fun block_cipher/1, block_iolistify(Blocks)),
     lists:foreach(fun block_cipher_increment/1, block_iolistify(Blocks)).
@@ -421,7 +525,7 @@ block(Config) when is_list(Config) ->
 no_block() ->
      [{doc, "Test disabled block ciphers"}].
 no_block(Config) when is_list(Config) ->
-    Blocks = lazy_eval(proplists:get_value(block, Config)),
+    [_|_] = Blocks = lazy_eval(proplists:get_value(cipher, Config)),
     Args = case Blocks of
 	       [{_Type, _Key, _PlainText} = A | _] ->
 		   tuple_to_list(A);
@@ -434,11 +538,157 @@ no_block(Config) when is_list(Config) ->
     notsup(fun crypto:block_encrypt/N, Args),
     notsup(fun crypto:block_decrypt/N, Args).
 %%--------------------------------------------------------------------
+api_ng() ->
+     [{doc, "Test new api"}].
+
+api_ng(Config) when is_list(Config) ->
+    [_|_] = Ciphers = lazy_eval(proplists:get_value(cipher, Config, [])),
+    lists:foreach(fun api_ng_cipher_increment/1, Ciphers).
+
+api_ng_cipher_increment({Type, Key, PlainTexts}=_X) ->
+    ct:log("~p",[_X]),
+    api_ng_cipher_increment({Type, Key, <<>>, PlainTexts});
+
+api_ng_cipher_increment({Type, Key, IV, PlainTexts}=_X) ->
+    ct:log("~p",[_X]),
+    api_ng_cipher_increment({Type, Key, IV, PlainTexts, undefined});
+
+api_ng_cipher_increment({Type, Key, IV, PlainText0, ExpectedEncText}=_X) ->
+    ct:log("~p",[_X]),
+    PlainTexts = iolistify(PlainText0),
+    RefEnc = crypto:crypto_init(Type, Key, IV, true),
+    RefDec = crypto:crypto_init(Type, Key, IV, false),
+    EncTexts = api_ng_cipher_increment_loop(RefEnc, PlainTexts),
+    Enc = iolist_to_binary(EncTexts),
+    case ExpectedEncText of
+        undefined ->
+            ok;
+        Enc ->
+            ok;
+        _ ->
+            ct:log("encode~nIn: ~p~nExpected: ~p~nEnc: ~p~n", [{Type,Key,IV,PlainTexts}, ExpectedEncText, Enc]),
+            ct:fail("api_ng_cipher_increment (encode)",[])
+    end,
+    Plain = iolist_to_binary(PlainTexts),
+    case iolist_to_binary(api_ng_cipher_increment_loop(RefDec, EncTexts)) of
+        Plain ->
+            ok;
+        OtherPT ->
+            ct:log("decode~nIn: ~p~nExpected: ~p~nDec: ~p~n", [{Type,Key,IV,EncTexts}, Plain, OtherPT]),
+            ct:fail("api_ng_cipher_increment (encode)",[])
+    end.
+
+
+api_ng_cipher_increment_loop(Ref, InTexts) ->
+    lists:map(fun(Txt) ->
+                      try crypto:crypto_update(Ref, Txt)
+                      of
+                          Bin when is_binary(Bin) ->
+                              Bin
+                      catch
+                          error:Error ->
+                              ct:pal("Txt = ~p",[Txt]),
+                              ct:fail("~p",[Error])
+                      end
+              end, InTexts).
+
+%%--------------------------------------------------------------------
+api_ng_one_shot() ->
+     [{doc, "Test new api"}].
+
+api_ng_one_shot(Config) when is_list(Config) ->
+    [_|_] = Ciphers = lazy_eval(proplists:get_value(cipher, Config, [])),
+    lists:foreach(fun do_api_ng_one_shot/1, Ciphers).
+
+do_api_ng_one_shot({Type, Key, PlainTexts}=_X) ->
+    ct:log("~p",[_X]),
+    do_api_ng_one_shot({Type, Key, <<>>, PlainTexts});
+
+do_api_ng_one_shot({Type, Key, IV, PlainTexts}=_X) ->
+    ct:log("~p",[_X]),
+    do_api_ng_one_shot({Type, Key, IV, PlainTexts, undefined});
+
+do_api_ng_one_shot({Type, Key, IV, PlainText0, ExpectedEncText}=_X) ->
+    ct:log("~p",[_X]),
+    PlainText = iolist_to_binary(lazy_eval(PlainText0)),
+    EncTxt = crypto:crypto_one_time(Type, Key, IV, PlainText, true),
+    case ExpectedEncText of
+        undefined ->
+            ok;
+        EncTxt ->
+            ok;
+        _ ->
+            ct:log("encode~nIn: ~p~nExpected: ~p~nEnc: ~p~n", [{Type,Key,IV,PlainText}, ExpectedEncText, EncTxt]),
+            ct:fail("api_ng_one_time (encode)",[])
+    end,
+    case crypto:crypto_one_time(Type, Key, IV, EncTxt, false) of
+        PlainText ->
+            ok;
+        OtherPT ->
+            ct:log("decode~nIn: ~p~nExpected: ~p~nDec: ~p~n", [{Type,Key,IV,EncTxt}, PlainText, OtherPT]),
+            ct:fail("api_ng_one_time (decode)",[])
+    end.
+
+%%--------------------------------------------------------------------
+api_ng_tls() ->
+     [{doc, "Test special tls api"}].
+
+api_ng_tls(Config) when is_list(Config) ->
+    [_|_] = Ciphers = lazy_eval(proplists:get_value(cipher, Config, [])),
+    lists:foreach(fun do_api_ng_tls/1, Ciphers).
+
+
+do_api_ng_tls({Type, Key, PlainTexts}=_X) ->
+    ct:log("~p",[_X]),
+    do_api_ng_tls({Type, Key, <<>>, PlainTexts});
+
+do_api_ng_tls({Type, Key, IV, PlainTexts}=_X) ->
+    ct:log("~p",[_X]),
+    do_api_ng_tls({Type, Key, IV, PlainTexts, undefined});
+
+do_api_ng_tls({Type, Key, IV, PlainText0, ExpectedEncText}=_X) ->
+    ct:log("~p",[_X]),
+    PlainText = iolist_to_binary(lazy_eval(PlainText0)),
+    Renc = crypto:crypto_dyn_iv_init(Type, Key, true),
+    Rdec = crypto:crypto_dyn_iv_init(Type, Key, false),
+    EncTxt = crypto:crypto_dyn_iv_update(Renc, PlainText, IV),
+    case ExpectedEncText of
+        undefined ->
+            ok;
+        EncTxt ->
+            %% Now check that the state is NOT updated:
+            case crypto:crypto_dyn_iv_update(Renc, PlainText, IV) of
+                EncTxt ->
+                    ok;
+                EncTxt2 ->
+                    ct:log("2nd encode~nIn: ~p~nExpected: ~p~nEnc: ~p~n", [{Type,Key,IV,PlainText}, EncTxt, EncTxt2]),
+                    ct:fail("api_ng_tls (second encode)",[])
+            end;
+        OtherEnc ->
+            ct:log("1st encode~nIn: ~p~nExpected: ~p~nEnc: ~p~n", [{Type,Key,IV,PlainText}, ExpectedEncText, OtherEnc]),
+            ct:fail("api_ng_tls (encode)",[])
+    end,
+    case crypto:crypto_dyn_iv_update(Rdec, EncTxt, IV) of
+        PlainText ->
+            %% Now check that the state is NOT updated:
+            case crypto:crypto_dyn_iv_update(Rdec, EncTxt, IV) of
+                PlainText ->
+                    ok;
+                PlainText2 ->
+                    ct:log("2nd decode~nIn: ~p~nExpected: ~p~nDec: ~p~n", [{Type,Key,IV,EncTxt}, PlainText, PlainText2]),
+                    ct:fail("api_ng_tls (second decode)",[])
+            end;
+        OtherPT ->
+            ct:log("1st decode~nIn: ~p~nExpected: ~p~nDec: ~p~n", [{Type,Key,IV,EncTxt}, PlainText, OtherPT]),
+            ct:fail("api_ng_tlst (decode)",[])
+    end.
+
+%%--------------------------------------------------------------------
 no_aead() ->
      [{doc, "Test disabled aead ciphers"}].
 no_aead(Config) when is_list(Config) ->
     EncArg4 =
-        case lazy_eval(proplists:get_value(aead, Config)) of
+        case lazy_eval(proplists:get_value(cipher, Config)) of
             [{Type, Key, PlainText, Nonce, AAD, CipherText, CipherTag, TagLen, _Info} | _] ->
                 {AAD, PlainText, TagLen};
             [{Type, Key, PlainText, Nonce, AAD, CipherText, CipherTag, _Info} | _] ->
@@ -453,7 +703,7 @@ no_aead(Config) when is_list(Config) ->
 stream() ->
       [{doc, "Test stream ciphers"}].
 stream(Config) when is_list(Config) ->
-    Streams = lazy_eval(proplists:get_value(stream, Config)),
+    [_|_] = Streams = lazy_eval(proplists:get_value(cipher, Config)),
 
     lists:foreach(fun stream_cipher/1, Streams),
     lists:foreach(fun stream_cipher/1, stream_iolistify(Streams)),
@@ -476,8 +726,7 @@ no_stream_ivec(Config) when is_list(Config) ->
 aead() ->
       [{doc, "Test AEAD ciphers"}].
 aead(Config) when is_list(Config) ->
-    AEADs = lazy_eval(proplists:get_value(aead, Config)),
-
+    [_|_] = AEADs = lazy_eval(proplists:get_value(cipher, Config)),
     FilteredAEADs =
 	case proplists:get_bool(fips, Config) of
 	    false ->
@@ -490,7 +739,6 @@ aead(Config) when is_list(Config) ->
 			  IVLen >= 12
 		  end, AEADs)
 	end,
-
     lists:foreach(fun aead_cipher/1, FilteredAEADs).
 
 %%-------------------------------------------------------------------- 
@@ -500,6 +748,13 @@ sign_verify(Config) when is_list(Config) ->
     SignVerify = proplists:get_value(sign_verify, Config),
     lists:foreach(fun do_sign_verify/1, SignVerify).
 
+%%--------------------------------------------------------------------
+no_sign_verify() ->
+    [{doc, "Test disabled sign/verify digital signatures"}].
+no_sign_verify(Config) when is_list(Config) ->
+    [SignVerifyHd|_] = proplists:get_value(sign_verify, Config),
+    notsup(fun do_sign_verify/1, [SignVerifyHd]).
+
 %%-------------------------------------------------------------------- 
 public_encrypt() ->
      [{doc, "Test public_encrypt/decrypt "}].
@@ -563,32 +818,43 @@ compute(Config) when is_list(Config) ->
     Gen = proplists:get_value(compute, Config),
     lists:foreach(fun do_compute/1, Gen).
 %%--------------------------------------------------------------------
-generate_all_supported() ->
-    [{doc, " Test that all curves from crypto:ec_curves/0 returns two binaries"}].
-generate_all_supported(_Config) ->
+use_all_elliptic_curves() ->
+    [{doc, " Test that all curves from crypto:ec_curves/0"}].
+use_all_elliptic_curves(_Config) ->
+    Msg = <<"hello world!">>,
+    Sups = crypto:supports(),
+    Curves = proplists:get_value(curves, Sups),
+    Hashs = proplists:get_value(hashs, Sups),
+    ct:log("Lib: ~p~nFIPS: ~p~nCurves:~n~p~nHashs: ~p", [crypto:info_lib(),
+                                                         crypto:info_fips(),
+                                                         Curves,
+                                                         Hashs]),
     Results =
-        [try
-             crypto:generate_key(ecdh, C)
-         of
-             {B1,B2} when is_binary(B1) and is_binary(B2) ->
-                 %% That is, seems like it works as expected.
-                 {ok,C};
-             Err ->
-                 ct:log("ERROR: Curve ~p generated ~p", [C,Err]),
-                 {error,{C,Err}}
-         catch
-             Cls:Err:Stack ->
-                 ct:log("ERROR: Curve ~p exception ~p:~p~n~p", [C,Cls,Err,Stack]),
-                 {error,{C,{Cls,Err}}}
-         end
-         || C <- crypto:ec_curves(),
-            not lists:member(C, [ed25519, ed448])
+        [{{Curve,Hash},
+          try
+              {Pub,Priv} = crypto:generate_key(ecdh, Curve),
+              true = is_binary(Pub),
+              true = is_binary(Priv),
+              Sig = crypto:sign(ecdsa, Hash, Msg, [Priv, Curve]),
+              crypto:verify(ecdsa, Hash, Msg, Sig, [Pub, Curve])
+          catch
+              C:E ->
+                  {C,E}
+          end}
+         || Curve <- Curves -- [ed25519, ed448, x25519, x448, ipsec3, ipsec4],
+            Hash <- Hashs -- [md4, md5, ripemd160, sha3_224, sha3_256, sha3_384, sha3_512, blake2b, blake2s]
         ],
-    OK = [C || {ok,C} <- Results],
-    ct:log("Ok (len=~p): ~p", [length(OK), OK]),
-    false = lists:any(fun({error,_}) -> true;
-                         (_) -> false
-                      end, Results).
+    Fails =
+        lists:filter(fun({_,true}) -> false;
+                        (_) -> true
+                     end, Results),
+    case Fails of
+        [] ->
+            ok;
+        _ ->
+            ct:log("Fails:~n~p",[Fails]),
+            ct:fail("Bad curve(s)",[])
+    end.
 
 %%--------------------------------------------------------------------
 generate() ->
@@ -645,6 +911,41 @@ rand_plugin_s(Config) when is_list(Config) ->
     rand_plugin_aux(explicit_state).
 
 %%--------------------------------------------------------------------
+cipher_info() ->
+    [{doc, "crypto cipher_info testing"}].
+cipher_info(Config) when is_list(Config) ->
+    #{type := _,key_length := _,iv_length := _,
+        block_size := _,mode := _} = crypto:cipher_info(aes_128_cbc),
+    {'EXIT',_} = (catch crypto:cipher_info(not_a_cipher)),
+    case lists:foldl(fun(C,Ok) ->
+                             try crypto:cipher_info(C)
+                             of
+                                 _ -> Ok
+                             catch Cls:Exc ->
+                                     ct:pal("~p:~p ~p",[Cls,Exc,C]),
+                                     false
+                             end
+                     end,
+                     true,
+crypto:supports(ciphers)) of
+%%                     proplists:get_value(ciphers, crypto:supports())) of
+        true ->
+            ok;
+        false ->
+            ct:fail('Cipher unsupported',[])
+    end.
+                                                                         
+
+%%--------------------------------------------------------------------
+hash_info() ->
+    [{doc, "crypto hash_info testing"}].
+hash_info(Config) when is_list(Config) ->
+    #{type := _,size := _,block_size := _} = crypto:hash_info(sha256),
+    {'EXIT',_} = (catch crypto:hash_info(not_a_hash)),
+    lists:foreach(fun(H) -> crypto:hash_info(H) end,
+        proplists:get_value(hashs, crypto:supports())).
+
+%%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
 hash(_, [], []) ->
@@ -672,33 +973,46 @@ hash_increment(State0, [Increment | Rest]) ->
     State = crypto:hash_update(State0, Increment),
     hash_increment(State, Rest).
 
-hmac(_, [],[],[]) ->
-    ok;
-hmac(sha = Type, [Key | Keys], [ <<"Test With Truncation">> = Data| Rest], [Expected | Expects]) ->
-    call_crypto_hmac([Type, Key, Data, 20], Type, Expected),
-    hmac(Type, Keys, Rest, Expects);
-hmac(Type, [Key | Keys], [ <<"Test With Truncation">> = Data| Rest], [Expected | Expects]) ->
-    call_crypto_hmac([Type, Key, Data, 16], Type, Expected),
-    hmac(Type, Keys, Rest, Expects);
-hmac(Type, [Key | Keys], [Data| Rest], [Expected | Expects]) ->
-    call_crypto_hmac([Type, Key, Data], Type, Expected),
-    hmac(Type, Keys, Rest, Expects).
-
-call_crypto_hmac(Args, Type, Expected) ->
-    try apply(crypto, hmac, Args)
+
+%%%----------------------------------------------------------------
+hmac_check({hmac, sha=Type, Key, <<"Test With Truncation">>=Data, Expected}) ->
+    do_hmac_check(Type, Key, Data, 20, Expected);
+hmac_check({hmac, Type, Key, <<"Test With Truncation">>=Data, Expected}) ->
+    do_hmac_check(Type, Key, Data, 16, Expected);
+hmac_check({hmac, Type, Key, Data, Expected}) ->
+    do_hmac_check(Type, Key, Data, Expected).
+
+
+do_hmac_check(Type, Key, Data, Expected) ->
+    try crypto:hmac(Type, Key, Data)
+    of
+	Expected ->
+	    ok;
+	Other ->
+	    ct:fail({{crypto,hmac,[Type,Key,Data]}, {expected,Expected}, {got,Other}})
+    catch
+        error:notsup ->
+            ct:fail("HMAC ~p not supported", [Type]);
+        Class:Cause ->
+            ct:fail({{crypto,hmac,[Type,Key,Data]}, {expected,Expected}, {got,{Class,Cause}}})
+    end.
+
+do_hmac_check(Type, Key, Data, MacLength, Expected) ->
+    try crypto:hmac(Type, Key, Data, MacLength)
     of
 	Expected ->
 	    ok;
 	Other ->
-	    ct:fail({{crypto,hmac,Args}, {expected,Expected}, {got,Other}})
+	    ct:fail({{crypto,hmac,[Type,Key,Data,MacLength]}, {expected,Expected}, {got,Other}})
     catch
         error:notsup ->
             ct:fail("HMAC ~p not supported", [Type]);
         Class:Cause ->
-            ct:fail({{crypto,hmac,Args}, {expected,Expected}, {got,{Class,Cause}}})
+            ct:fail({{crypto,hmac,[Type,Key,Data,MacLength]}, {expected,Expected}, {got,{Class,Cause}}})
     end.
 
 
+%%%----------------------------------------------------------------
 hmac_increment(Type) ->
     Key = hmac_key(Type),
     Increments = hmac_inc(Type),
@@ -717,7 +1031,8 @@ hmac_increment(State0, [Increment | Rest]) ->
     State = crypto:hmac_update(State0, Increment),
     hmac_increment(State, Rest).
 
-cmac_check({Type, Key, Text, CMac}) ->
+%%%----------------------------------------------------------------
+cmac_check({cmac, Type, Key, Text, CMac}) ->
     ExpCMac = iolist_to_binary(CMac),
     case crypto:cmac(Type, Key, Text) of
         ExpCMac ->
@@ -725,7 +1040,7 @@ cmac_check({Type, Key, Text, CMac}) ->
         Other ->
             ct:fail({{crypto, cmac, [Type, Key, Text]}, {expected, ExpCMac}, {got, Other}})
     end;
-cmac_check({Type, Key, Text, Size, CMac}) ->
+cmac_check({cmac, Type, Key, Text, Size, CMac}) ->
     ExpCMac = iolist_to_binary(CMac),
     case crypto:cmac(Type, Key, Text, Size) of
         ExpCMac ->
@@ -734,6 +1049,25 @@ cmac_check({Type, Key, Text, Size, CMac}) ->
             ct:fail({{crypto, cmac, [Type, Key, Text, Size]}, {expected, ExpCMac}, {got, Other}})
     end.
 
+
+mac_check({MacType, SubType, Key, Text, Mac}) ->
+    ExpMac = iolist_to_binary(Mac),
+    case crypto:mac(MacType, SubType, Key, Text) of
+        ExpMac ->
+            ok;
+        Other ->
+            ct:fail({{crypto, mac, [MacType, SubType, Key, Text]}, {expected, ExpMac}, {got, Other}})
+    end;
+mac_check({MacType, SubType, Key, Text, Size, Mac}) ->
+    ExpMac = iolist_to_binary(Mac),
+    case crypto:mac(MacType, SubType, Key, Text, Size) of
+        ExpMac ->
+            ok;
+        Other ->
+            ct:fail({{crypto, mac, [MacType, SubType, Key, Text]}, {expected, ExpMac}, {got, Other}})
+    end.
+
+
 block_cipher({Type, Key,  PlainText}) ->
     Plain = iolist_to_binary(PlainText),
     CipherText = crypto:block_encrypt(Type, Key, PlainText),
@@ -769,13 +1103,27 @@ block_cipher({Type, Key, IV, PlainText, CipherText}) ->
 	    ct:fail({{crypto, block_decrypt, [Type, Key, IV, CipherText]}, {expected, Plain}, {got, Other1}})
     end.
 
-block_cipher_increment({Type, Key, IV, PlainTexts})
-  when Type == des_cbc; Type == aes_cbc; Type == des3_cbc ->
+block_cipher_increment({Type, Key, IV, PlainTexts}) when Type == des_cbc ;
+                                                         Type == des3_cbc ;
+                                                         Type == aes_128_cbc ;
+                                                         Type == aes_192_cbc ;
+                                                         Type == aes_256_cbc
+                                                         ->
     block_cipher_increment(Type, Key, IV, IV, PlainTexts, iolist_to_binary(PlainTexts), []);
-block_cipher_increment({Type, Key, IV, PlainTexts, CipherText})
-  when Type == des_cbc; Type == des3_cbc ->
+block_cipher_increment({Type, Key, IV, PlainTexts, CipherText}) when Type == des_cbc; 
+                                                                     Type == des_ede3_cbc ;
+                                                                     Type == des3_cbc ;
+                                                                     Type == des_ede3 ;
+                                                                     Type == des_ede3_cfb ;
+                                                                     Type == des_ede3_cbf ;
+                                                                     Type == des3_cbf ;
+                                                                     Type == des3_cfb
+                                                                     ->
     block_cipher_increment(Type, Key, IV, IV, PlainTexts, iolist_to_binary(PlainTexts), CipherText, []);
-block_cipher_increment({Type, Key, IV, PlainTexts, _CipherText}) when Type == aes_cbc ->
+block_cipher_increment({Type, Key, IV, PlainTexts, _CipherText}) when Type == aes_128_cbc ;
+                                                                      Type == aes_192_cbc ;
+                                                                      Type == aes_256_cbc 
+                                                                      ->
     Plain = iolist_to_binary(PlainTexts),
     Blocks = [iolistify(Block) || << Block:128/bitstring >> <= Plain],
     block_cipher_increment(Type, Key, IV, IV, Blocks, Plain, []);
@@ -809,48 +1157,56 @@ block_cipher_increment(Type, Key, IV0, IV, [PlainText | PlainTexts], Plain, Ciph
     NextIV = crypto:next_iv(Type, CT),
     block_cipher_increment(Type, Key, IV0, NextIV, PlainTexts, Plain, CipherText, [CT | Acc]).
 
-stream_cipher({Type, Key, PlainText}) ->
-    Plain = iolist_to_binary(PlainText),
-    State = crypto:stream_init(Type, Key),
-    {_, CipherText} = crypto:stream_encrypt(State, PlainText),
-    case crypto:stream_decrypt(State, CipherText) of
+stream_cipher({Type, Key, PlainText0}) ->
+    PlainText = lazy_eval(PlainText0),
+    Plain = iolist_to_binary(lazy_eval(PlainText)),
+    StateE = crypto:stream_init(Type, Key),
+    StateD = crypto:stream_init(Type, Key),
+    {_, CipherText} = crypto:stream_encrypt(StateE, PlainText),
+    case crypto:stream_decrypt(StateD, CipherText) of
 	{_, Plain} ->
 	    ok;
 	Other ->
-	    ct:fail({{crypto, stream_decrypt, [State, CipherText]}, {expected, PlainText}, {got, Other}})
+	    ct:fail({{crypto, stream_decrypt, [StateD, CipherText]}, {expected, PlainText}, {got, Other}})
     end;
-stream_cipher({Type, Key, IV, PlainText}) ->
+stream_cipher({Type, Key, IV, PlainText0}) ->
+    PlainText = lazy_eval(PlainText0),
     Plain = iolist_to_binary(PlainText),
-    State = crypto:stream_init(Type, Key, IV),
-    {_, CipherText} = crypto:stream_encrypt(State, PlainText),
-    case crypto:stream_decrypt(State, CipherText) of
+    StateE = crypto:stream_init(Type, Key, IV),
+    StateD = crypto:stream_init(Type, Key, IV),
+    {_, CipherText} = crypto:stream_encrypt(StateE, PlainText),
+    case crypto:stream_decrypt(StateD, CipherText) of
 	{_, Plain} ->
 	    ok;
 	Other ->
-	    ct:fail({{crypto, stream_decrypt, [State, CipherText]}, {expected, PlainText}, {got, Other}})
+	    ct:fail({{crypto, stream_decrypt, [StateD, CipherText]}, {expected, PlainText}, {got, Other}})
     end;
-stream_cipher({Type, Key, IV, PlainText, CipherText}) ->
+stream_cipher({Type, Key, IV, PlainText0, CipherText}) ->
+    PlainText = lazy_eval(PlainText0),
     Plain = iolist_to_binary(PlainText),
-    State = crypto:stream_init(Type, Key, IV),
-    case crypto:stream_encrypt(State, PlainText) of
+    StateE = crypto:stream_init(Type, Key, IV),
+    StateD = crypto:stream_init(Type, Key, IV),
+    case crypto:stream_encrypt(StateE, PlainText) of
         {_, CipherText} ->
             ok;
         {_, Other0} ->
-            ct:fail({{crypto, stream_encrypt, [State, Type, Key, IV, Plain]}, {expected, CipherText}, {got, Other0}})
+            ct:fail({{crypto, stream_encrypt, [StateE, Type, Key, IV, Plain]}, {expected, CipherText}, {got, Other0}})
     end,
-    case crypto:stream_decrypt(State, CipherText) of
+    case crypto:stream_decrypt(StateD, CipherText) of
         {_, Plain} ->
             ok;
         Other1 ->
-            ct:fail({{crypto, stream_decrypt, [State, CipherText]}, {expected, PlainText}, {got, Other1}})
+            ct:fail({{crypto, stream_decrypt, [StateD, CipherText]}, {expected, PlainText}, {got, Other1}})
     end.
 
 stream_cipher_incment({Type, Key, PlainTexts}) ->
-    State = crypto:stream_init(Type, Key),
-    stream_cipher_incment_loop(State, State, PlainTexts, [], iolist_to_binary(PlainTexts));
+    StateE = crypto:stream_init(Type, Key),
+    StateD = crypto:stream_init(Type, Key),
+    stream_cipher_incment_loop(StateE, StateD, PlainTexts, [], iolist_to_binary(PlainTexts));
 stream_cipher_incment({Type, Key, IV, PlainTexts}) ->
-    State = crypto:stream_init(Type, Key, IV),
-    stream_cipher_incment_loop(State, State, PlainTexts, [], iolist_to_binary(PlainTexts));
+    StateE = crypto:stream_init(Type, Key, IV),
+    StateD = crypto:stream_init(Type, Key, IV),
+    stream_cipher_incment_loop(StateE, StateD, PlainTexts, [], iolist_to_binary(PlainTexts));
 stream_cipher_incment({Type, Key, IV, PlainTexts, _CipherText}) ->
     stream_cipher_incment({Type, Key, IV, PlainTexts}).
 
@@ -891,7 +1247,7 @@ aead_cipher({Type, Key, PlainText, IV, AAD, CipherText, CipherTag, Info}) ->
 aead_cipher({Type, Key, PlainText, IV, AAD, CipherText, CipherTag, TagLen, Info}) ->
     <<TruncatedCipherTag:TagLen/binary, _/binary>> = CipherTag,
     Plain = iolist_to_binary(PlainText),
-    case crypto:block_encrypt(Type, Key, IV, {AAD, Plain, TagLen}) of
+    try crypto:block_encrypt(Type, Key, IV, {AAD, Plain, TagLen}) of
 	{CipherText, TruncatedCipherTag} ->
 	    ok;
 	Other0 ->
@@ -900,6 +1256,18 @@ aead_cipher({Type, Key, PlainText, IV, AAD, CipherText, CipherTag, TagLen, Info}
                       [{info,Info}, {key,Key}, {pt,PlainText}, {iv,IV}, {aad,AAD}, {ct,CipherText}, {tag,CipherTag}, {taglen,TagLen}]},
                      {expected, {CipherText, TruncatedCipherTag}},
                      {got, Other0}})
+    catch
+        error:E ->
+            ct:log("~p",[{Type, Key, PlainText, IV, AAD, CipherText, CipherTag, TagLen, Info}]),
+            try crypto:crypto_one_time_aead(Type, Key, IV, PlainText, AAD, TagLen, true)
+            of
+                RR ->
+                    ct:log("Works: ~p",[RR])
+            catch
+                CC:EE ->
+                    ct:log("~p:~p", [CC,EE])
+            end,
+            ct:fail("~p",[E])
     end,
     case crypto:block_decrypt(Type, Key, IV, {AAD, CipherText, TruncatedCipherTag}) of
 	Plain ->
@@ -970,7 +1338,7 @@ do_sign_verify({Type, Hash, Public, Private, Msg, Options}) ->
         error:notsup when NotSupLow == true,
                           is_integer(LibVer),
                           LibVer < 16#10001000 ->
-            %% Thoose opts where introduced in 1.0.1
+            %% Those opts where introduced in 1.0.1
             ct:log("notsup but OK in old cryptolib crypto:sign(~p, ~p, ..., ..., ..., ~p)",
                    [Type,Hash,Options]),
             true;
@@ -1130,17 +1498,17 @@ decstr2int(S) ->
 is_supported(Group) ->
     lists:member(Group, lists:append([Algo ||  {_, Algo}  <- crypto:supports()])). 
 
-cmac_iolistify(Blocks) ->
-    lists:map(fun do_cmac_iolistify/1, Blocks).
+mac_listify(Blocks) ->
+    lists:map(fun do_mac_listify/1, Blocks).
 block_iolistify(Blocks) ->
     lists:map(fun do_block_iolistify/1, Blocks).
 stream_iolistify(Streams) ->
     lists:map(fun do_stream_iolistify/1, Streams).
 
-do_cmac_iolistify({Type, Key, Text, CMac}) ->
-    {Type, iolistify(Key), iolistify(Text), CMac};
-do_cmac_iolistify({Type, Key, Text, Size, CMac}) ->
-    {Type, iolistify(Key), iolistify(Text), Size, CMac}.
+do_mac_listify({MType, Type, Key, Text, CMac}) ->
+    {MType, Type, iolistify(Key), iolistify(Text), CMac};
+do_mac_listify({MType, Type, Key, Text, Size, CMac}) ->
+    {MType, Type, iolistify(Key), iolistify(Text), Size, CMac}.
 
 do_stream_iolistify({Type, Key, PlainText}) ->
     {Type, iolistify(Key), iolistify(PlainText)};
@@ -1148,16 +1516,15 @@ do_stream_iolistify({Type, Key, IV, PlainText}) ->
     {Type, iolistify(Key), IV, iolistify(PlainText)};
 do_stream_iolistify({Type, Key, IV, PlainText, CipherText}) ->
     {Type, iolistify(Key), IV, iolistify(PlainText), CipherText}.
-
-do_block_iolistify({des_cbc = Type, Key, IV, PlainText}) ->
-    {Type, Key, IV, des_iolistify(PlainText)};
-do_block_iolistify({des3_cbc = Type, Key, IV, PlainText}) ->
-    {Type, Key, IV, des_iolistify(PlainText)};
-do_block_iolistify({des3_cbf = Type, Key, IV, PlainText}) ->
-    {Type, Key, IV, des_iolistify(PlainText)};
-do_block_iolistify({des3_cfb = Type, Key, IV, PlainText}) ->
-    {Type, Key, IV, des_iolistify(PlainText)};
-do_block_iolistify({des_ede3 = Type, Key, IV, PlainText}) ->
+do_block_iolistify({Type, Key, IV, PlainText}) when Type == des_cbc ;
+                                                    Type == des_ede3_cbc ;
+                                                    Type == des3_cbc ;
+                                                    Type == des_ede3 ;
+                                                    Type == des_ede3_cfb ;
+                                                    Type == des_ede3_cbf ;
+                                                    Type == des3_cbf ;
+                                                    Type == des3_cfb
+                                                    ->
     {Type, Key, IV, des_iolistify(PlainText)};
 do_block_iolistify({Type, Key, PlainText}) ->
     {Type, iolistify(Key), iolistify(PlainText)};
@@ -1166,10 +1533,13 @@ do_block_iolistify({Type, Key, IV, PlainText}) ->
 do_block_iolistify({Type, Key, IV, PlainText, CipherText}) ->
     {Type, iolistify(Key), IV, iolistify(PlainText), CipherText}.
 
-iolistify(<<"Test With Truncation">>)->
+iolistify(X) ->
+    iolistify1(lazy_eval(X)).
+
+iolistify1(<<"Test With Truncation">>)->
     %% Do not iolistify as it spoils this special case
     <<"Test With Truncation">>;
-iolistify(Msg) when is_binary(Msg) ->
+iolistify1(Msg) when is_binary(Msg) ->
     Length = erlang:byte_size(Msg),
     Split = Length div 2,
     List0 = binary_to_list(Msg),
@@ -1179,8 +1549,8 @@ iolistify(Msg) when is_binary(Msg) ->
        {List1, List2}->
 	   [List1, List2]
    end;
-iolistify(Msg) ->
-    iolistify(list_to_binary(Msg)).
+iolistify1(Msg) when is_list(Msg) ->
+    iolistify1(list_to_binary(Msg)).
 
 des_iolistify(Msg) ->    
     des_iolist(erlang:byte_size(Msg) div 8, Msg, []).
@@ -1259,7 +1629,7 @@ rand_uniform_aux_test(N) ->
     rand_uniform_aux_test(N-1).
 
 crypto_rand_uniform(L,H) ->
-    R1 = crypto:rand_uniform(L, H),
+    R1 = (L-1) + rand:uniform(H-L),
     case (R1 >= L) and (R1 < H) of
 	true  ->
 	    ok;
@@ -1372,10 +1742,7 @@ group_config(md4 = Type, Config) ->
 group_config(md5 = Type, Config) ->
     Msgs = rfc_1321_msgs(),
     Digests = rfc_1321_md5_digests(),
-    Keys = rfc_2202_md5_keys() ++ [long_hmac_key(md5)],
-    Data = rfc_2202_msgs() ++ [long_msg()],
-    Hmac = rfc_2202_hmac_md5()  ++ [long_hmac(md5)],
-    [{hash, {Type, Msgs, Digests}}, {hmac, {Type, Keys, Data, Hmac}} | Config];
+    [{hash, {Type, Msgs, Digests}} | Config];
 group_config(ripemd160 = Type, Config) ->
     Msgs = ripemd160_msgs(),
     Digests = ripemd160_digests(),
@@ -1383,50 +1750,41 @@ group_config(ripemd160 = Type, Config) ->
 group_config(sha = Type, Config) ->
     Msgs = [rfc_4634_test1(), rfc_4634_test2_1(),long_msg()],
     Digests = rfc_4634_sha_digests() ++ [long_sha_digest()],
-    Keys = rfc_2202_sha_keys() ++ [long_hmac_key(sha)],
-    Data = rfc_2202_msgs() ++ [long_msg()],
-    Hmac = rfc_2202_hmac_sha()  ++ [long_hmac(sha)],
-    [{hash, {Type, Msgs, Digests}}, {hmac, {Type, Keys, Data, Hmac}} | Config];
+    [{hash, {Type, Msgs, Digests}} | Config];
 group_config(sha224 = Type, Config) ->
     Msgs = [rfc_4634_test1(), rfc_4634_test2_1()], 
     Digests = rfc_4634_sha224_digests(),
-    Keys = rfc_4231_keys(),
-    Data = rfc_4231_msgs(),
-    Hmac = rfc4231_hmac_sha224(),
-    [{hash, {Type, Msgs, Digests}}, {hmac, {Type, Keys, Data, Hmac}}  | Config];
+    [{hash, {Type, Msgs, Digests}} | Config];
 group_config(sha256 = Type, Config) ->
     Msgs =   [rfc_4634_test1(), rfc_4634_test2_1(), long_msg()],
     Digests = rfc_4634_sha256_digests()  ++ [long_sha256_digest()],
-    Keys = rfc_4231_keys() ++ [long_hmac_key(sha256)],
-    Data = rfc_4231_msgs()  ++ [long_msg()],
-    Hmac = rfc4231_hmac_sha256()  ++ [long_hmac(sha256)],
-    [{hash, {Type, Msgs, Digests}}, {hmac, {Type, Keys, Data, Hmac}}  | Config];
+    [{hash, {Type, Msgs, Digests}} | Config];
 group_config(sha384 = Type, Config) ->
     Msgs =  [rfc_4634_test1(), rfc_4634_test2(), long_msg()],
     Digests = rfc_4634_sha384_digests()  ++ [long_sha384_digest()],
-    Keys = rfc_4231_keys() ++ [long_hmac_key(sha384)],
-    Data = rfc_4231_msgs()  ++ [long_msg()],
-    Hmac = rfc4231_hmac_sha384()  ++ [long_hmac(sha384)],
-    [{hash, {Type, Msgs, Digests}}, {hmac, {Type, Keys, Data, Hmac}}  | Config];
+    [{hash, {Type, Msgs, Digests}} | Config];
 group_config(sha512 = Type, Config) ->
     Msgs =  [rfc_4634_test1(), rfc_4634_test2(), long_msg()],
     Digests = rfc_4634_sha512_digests() ++ [long_sha512_digest()],
-    Keys = rfc_4231_keys() ++ [long_hmac_key(sha512)],
-    Data = rfc_4231_msgs() ++ [long_msg()],
-    Hmac = rfc4231_hmac_sha512() ++ [long_hmac(sha512)],
-    [{hash, {Type, Msgs, Digests}}, {hmac, {Type, Keys, Data, Hmac}}  | Config];
+    [{hash, {Type, Msgs, Digests}} | Config];
 group_config(sha3_224 = Type, Config) ->
     {Msgs,Digests} = sha3_test_vectors(Type),
-    [{hash, {Type, Msgs, Digests}}, {hmac, hmac_sha3(Type)} | Config];
+    [{hash, {Type, Msgs, Digests}} | Config];
 group_config(sha3_256 = Type, Config) ->
     {Msgs,Digests} = sha3_test_vectors(Type),
-    [{hash, {Type, Msgs, Digests}}, {hmac, hmac_sha3(Type)} | Config];
+    [{hash, {Type, Msgs, Digests}} | Config];
 group_config(sha3_384 = Type, Config) ->
     {Msgs,Digests} = sha3_test_vectors(Type),
-    [{hash, {Type, Msgs, Digests}}, {hmac, hmac_sha3(Type)} | Config];
+    [{hash, {Type, Msgs, Digests}} | Config];
 group_config(sha3_512 = Type, Config) ->
     {Msgs,Digests} = sha3_test_vectors(Type),
-    [{hash, {Type, Msgs, Digests}}, {hmac, hmac_sha3(Type)} | Config];
+    [{hash, {Type, Msgs, Digests}} | Config];
+group_config(blake2b = Type, Config) ->
+    {Msgs, Digests} = blake2_test_vectors(Type),
+    [{hash, {Type, Msgs, Digests}} | Config];
+group_config(blake2s = Type, Config) ->
+    {Msgs, Digests} = blake2_test_vectors(Type),
+    [{hash, {Type, Msgs, Digests}} | Config];
 group_config(rsa, Config) ->
     Msg = rsa_plain(),
     Public = rsa_public(),
@@ -1483,7 +1841,6 @@ group_config(dss = Type, Config) ->
     MsgPubEnc = <<"7896345786348 Asldi">>,
     PubPrivEnc = [{dss, Public, Private, MsgPubEnc, []}],
     [{sign_verify, SignVerify}, {pub_priv_encrypt, PubPrivEnc}  | Config];
-
 group_config(ecdsa = Type, Config) ->
     {Private, Public} = ec_key_named(),
     Msg = ec_msg(),
@@ -1495,12 +1852,9 @@ group_config(ecdsa = Type, Config) ->
     MsgPubEnc = <<"7896345786348 Asldi">>,
     PubPrivEnc = [{ecdsa, Public, Private, MsgPubEnc, []}],
     [{sign_verify, SignVerify}, {pub_priv_encrypt, PubPrivEnc} | Config];
-
 group_config(Type, Config) when Type == ed25519 ; Type == ed448 ->
     TestVectors = eddsa(Type),
     [{sign_verify,TestVectors} | Config]; 
-
-
 group_config(srp, Config) ->
     GenerateCompute = [srp3(), srp6(), srp6a(), srp6a_smaller_prime()],
     [{generate_compute, GenerateCompute} | Config];
@@ -1511,77 +1865,6 @@ group_config(ecdh, Config) ->
 group_config(dh, Config) ->
     GenerateCompute = [dh()],
     [{generate_compute, GenerateCompute} | Config];
-group_config(des_cbc, Config) ->
-    Block = des_cbc(),
-    [{block, Block} | Config];
-group_config(des_cfb, Config) ->
-    Block = des_cfb(),
-    [{block, Block} | Config];
-group_config(des3_cbc, Config) ->
-    Block = des3_cbc(),
-    [{block, Block} | Config];
-group_config(des3_cbf, Config) ->
-    Block = des3_cbf(),
-    [{block, Block} | Config];
-group_config(des3_cfb, Config) ->
-    Block = des3_cfb(),
-    [{block, Block} | Config];
-group_config(des_ede3, Config) ->
-    Block = des_ede3(),
-    [{block, Block} | Config];
-group_config(rc2_cbc, Config) ->
-    Block = rc2_cbc(),
-    [{block, Block} | Config];
-group_config(aes_cbc128 = Type, Config) ->
-    Block = fun() -> aes_cbc128(Config) end,
-    Pairs = fun() -> cmac_nist(Config, Type) end,
-    [{block, Block}, {cmac, Pairs} | Config];
-group_config(aes_cbc256 = Type, Config) ->
-    Block = fun() -> aes_cbc256(Config) end,
-    Pairs = fun() -> cmac_nist(Config, Type) end,
-    [{block, Block}, {cmac, Pairs} | Config];
-group_config(aes_ecb, Config) ->
-    Block = fun() -> aes_ecb(Config) end,
-    [{block, Block} | Config];
-group_config(aes_ige256, Config) ->
-    Block = aes_ige256(),
-    [{block, Block} | Config];
-group_config(aes_cfb8, Config) ->
-    Block = fun() -> aes_cfb8(Config) end,
-    [{block, Block} | Config];
-group_config(aes_cfb128, Config) ->
-    Block = fun() -> aes_cfb128(Config) end,
-    [{block, Block} | Config];
-group_config(blowfish_cbc, Config) ->
-    Block = blowfish_cbc(),
-    [{block, Block} | Config];
-group_config(blowfish_ecb, Config) ->
-    Block = blowfish_ecb(),
-    [{block, Block} | Config];
-group_config(blowfish_cfb64, Config) ->
-    Block = blowfish_cfb64(),
-    [{block, Block} | Config];
-group_config(blowfish_ofb64, Config) ->
-    Block = blowfish_ofb64(),
-    [{block, Block} | Config];
-group_config(rc4, Config) ->
-    Stream = rc4(),
-    [{stream, Stream} | Config];
-group_config(aes_ctr, Config) ->
-    Stream = aes_ctr(),
-    [{stream, Stream} | Config];
-group_config(aes_ccm, Config) ->
-    AEAD = fun() -> aes_ccm(Config) end,
-    [{aead, AEAD} | Config];
-group_config(aes_gcm, Config) ->
-    AEAD = fun() -> aes_gcm(Config) end,
-    [{aead, AEAD} | Config];
-group_config(chacha20_poly1305, Config) ->
-    AEAD = chacha20_poly1305(),
-    [{aead, AEAD} | Config];
-group_config(chacha20, Config) ->
-    Stream = chacha20(),
-    [{stream, Stream} | Config];
 group_config(poly1305, Config) ->
     V = [%% {Key, Txt, Expect}
          {%% RFC7539 2.5.2
@@ -1591,11 +1874,82 @@ group_config(poly1305, Config) ->
          }
         ],
     [{poly1305,V} | Config];
-group_config(aes_cbc, Config) ->
-    Block = aes_cbc(Config),
-    [{block, Block} | Config];
-group_config(_, Config) ->
-    Config.
+
+group_config(F, Config) ->
+    TestVectors = fun() -> ?MODULE:F(Config) end,
+    [{cipher, TestVectors} | Config].
+
+
+configure_mac(MacType, SubType, Config) ->
+    case do_configure_mac(MacType, SubType, Config) of
+        undefined ->
+            {skip, io:format("No ~p test vectors for ~p", [MacType, SubType])};
+        Pairs ->
+            [{MacType, Pairs} | Config]
+    end.
+
+do_configure_mac(hmac, Type, _Config) ->
+    case Type of
+        md5 ->
+            Keys = rfc_2202_md5_keys() ++ [long_hmac_key(md5)],
+            Data = rfc_2202_msgs() ++ [long_msg()],
+            Hmac = rfc_2202_hmac_md5()  ++ [long_hmac(md5)],
+            zip3_special(hmac, Type, Keys, Data, Hmac);
+        sha ->
+            Keys = rfc_2202_sha_keys() ++ [long_hmac_key(sha)],
+            Data = rfc_2202_msgs() ++ [long_msg()],
+            Hmac = rfc_2202_hmac_sha()  ++ [long_hmac(sha)],
+            zip3_special(hmac, Type, Keys, Data, Hmac);
+        sha224 ->
+            Keys = rfc_4231_keys(),
+            Data = rfc_4231_msgs(),
+            Hmac = rfc4231_hmac_sha224(),
+            zip3_special(hmac, Type, Keys, Data, Hmac);
+        sha256 ->
+            Keys = rfc_4231_keys() ++ [long_hmac_key(sha256)],
+            Data = rfc_4231_msgs()  ++ [long_msg()],
+            Hmac = rfc4231_hmac_sha256()  ++ [long_hmac(sha256)],
+            zip3_special(hmac, Type, Keys, Data, Hmac);
+        sha384 ->
+            Keys = rfc_4231_keys() ++ [long_hmac_key(sha384)],
+            Data = rfc_4231_msgs()  ++ [long_msg()],
+            Hmac = rfc4231_hmac_sha384()  ++ [long_hmac(sha384)],
+            zip3_special(hmac, Type, Keys, Data, Hmac);
+        sha512 ->
+            Keys = rfc_4231_keys() ++ [long_hmac_key(sha512)],
+            Data = rfc_4231_msgs() ++ [long_msg()],
+            Hmac = rfc4231_hmac_sha512() ++ [long_hmac(sha512)],
+            zip3_special(hmac, Type, Keys, Data, Hmac);
+        sha3_224 ->
+            hmac_sha3(Type);
+        sha3_256 ->
+            hmac_sha3(Type);
+        sha3_384 ->
+            hmac_sha3(Type);
+        sha3_512 ->
+            hmac_sha3(Type);
+        blake2b ->
+            blake2_hmac(Type);
+        blake2s ->
+            blake2_hmac(Type);
+        _ ->
+            undefined
+    end;
+do_configure_mac(cmac, Cipher, Config) ->
+    case Cipher of
+        aes_128_cbc ->
+            fun() -> read_rsp(Config, Cipher,  ["CMACGenAES128.rsp", "CMACVerAES128.rsp"]) end;
+        aes_256_cbc ->
+            fun() -> read_rsp(Config, Cipher,  ["CMACGenAES256.rsp", "CMACVerAES256.rsp"]) end;
+        _ ->
+            undefined
+    end.
+
+
+zip3_special(Type, SubType, As, Bs, Cs) ->
+    [{Type, SubType, A, B, C}
+     || {A,B,C} <- lists:zip3(As, Bs, Cs)].
+
 
 rsa_sign_verify_tests(Config, Msg, Public, Private, PublicS, PrivateS, OptsToTry) ->
         case ?config(fips, Config) of
@@ -1693,6 +2047,69 @@ rfc_1321_md5_digests() ->
      hexstr2bin("d174ab98d277d9f5a5611c2c9f419d9f"),
      hexstr2bin("57edf4a22be3c955ac49da2e2107b67a")].
 
+
+%% BLAKE2 re-use SHA3 test vectors.
+blake2_test_vectors(blake2b) ->
+    {sha3_msgs(),
+     [ <<186,128,165,63,152,28,77,13,106,39,151,182,159,18,246,233,76,33,47,20,104,90,196,183,75,18,187,111,219,255,162,209,125,135,197,57,42,171,121,45,194,82,213,222,69,51,204,149,24,211,138,168,219,241,146,90,185,35,134,237,212,0,153,35>>
+     , <<120,106,2,247,66,1,89,3,198,198,253,133,37,82,210,114,145,47,71,64,225,88,71,97,138,134,226,23,247,31,84,25,210,94,16,49,175,238,88,83,19,137,100,68,147,78,176,75,144,58,104,91,20,72,183,85,213,111,112,26,254,155,226,206>>
+     , <<114,133,255,62,139,215,104,214,155,230,43,59,241,135,101,163,37,145,127,169,116,74,194,245,130,162,8,80,188,43,17,65,237,27,62,69,40,89,90,204,144,119,43,223,45,55,220,138,71,19,11,68,243,58,2,232,115,14,90,216,225,102,232,136>>
+     , <<206,116,26,197,147,15,227,70,129,17,117,197,34,123,183,191,205,71,244,38,18,250,228,108,8,9,81,79,158,14,58,17,238,23,115,40,113,71,205,234,238,223,245,7,9,170,113,99,65,254,101,36,15,74,214,119,125,107,250,249,114,110,94,82>>
+     , <<152,251,62,251,114,6,253,25,235,246,155,111,49,44,247,182,78,59,148,219,225,161,113,7,145,57,117,167,147,241,119,225,208,119,96,157,127,186,54,60,187,160,13,5,247,170,78,79,168,113,93,100,40,16,76,10,117,100,59,15,243,253,62,175>>
+     ]};
+blake2_test_vectors(blake2s) ->
+    {sha3_msgs(),
+     [ <<80,140,94,140,50,124,20,226,225,167,43,163,78,235,69,47,55,69,139,32,158,214,58,41,77,153,155,76,134,103,89,130>>
+     , <<105,33,122,48,121,144,128,148,225,17,33,208,66,53,74,124,31,85,182,72,44,161,165,30,27,37,13,253,30,208,238,249>>
+     , <<111,77,245,17,106,111,51,46,218,177,217,225,14,232,125,246,85,123,234,182,37,157,118,99,243,188,213,114,44,19,241,137>>
+     , <<53,141,210,237,7,128,212,5,78,118,203,111,58,91,206,40,65,232,226,245,71,67,29,77,9,219,33,182,109,148,31,199>>
+     , <<190,192,192,230,205,229,182,122,203,115,184,31,121,166,122,64,121,174,28,96,218,201,210,102,26,241,142,159,139,80,223,165>>
+     ]}.
+
+blake2_hmac(Type) ->
+    [{hmac, Type, hexstr2bin(K), hexstr2bin(D), H}
+     || {{K, D}, H} <- lists:zip(blake2_hmac_key_data(), blake2_hmac_hmac(Type)) ].
+
+blake2_hmac_key_data() ->
+    [ {"0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b 0b0b0b0b",
+       "4869205468657265"}
+    , {"4a656665",
+      "7768617420646f2079612077616e7420 666f72206e6f7468696e673f"}
+    , {"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaa",
+      "dddddddddddddddddddddddddddddddd dddddddddddddddddddddddddddddddd dddddddddddddddddddddddddddddddd dddd"}
+    , {"0102030405060708090a0b0c0d0e0f10 111213141516171819",
+      "cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd cdcd"}
+    , {"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaa",
+      "54657374205573696e67204c61726765 72205468616e20426c6f636b2d53697a 65204b6579202d2048617368204b6579 204669727374"}
+    , {"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaa",
+      "54657374205573696e67204c61726765 72205468616e20426c6f636b2d53697a 65204b6579202d2048617368204b6579 204669727374"}
+    , {"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaa",
+      "54686973206973206120746573742075 73696e672061206c6172676572207468 616e20626c6f636b2d73697a65206b65 7920616e642061206c61726765722074 68616e20626c6f636b2d73697a652064 6174612e20546865206b6579206e6565 647320746f2062652068617368656420 6265666f7265206265696e6720757365 642062792074686520484d414320616c 676f726974686d2e"}
+    , {"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaa",
+      "54686973206973206120746573742075 73696e672061206c6172676572207468 616e20626c6f636b2d73697a65206b65 7920616e642061206c61726765722074 68616e20626c6f636b2d73697a652064 6174612e20546865206b6579206e6565 647320746f2062652068617368656420 6265666f7265206265696e6720757365 642062792074686520484d414320616c 676f726974686d2e"}
+    ].
+
+blake2_hmac_hmac(blake2b) ->
+    [ <<53,138,106,24,73,36,137,79,195,75,238,86,128,238,223,87,216,74,55,187,56,131,47,40,142,59,39,220,99,169,140,200,201,30,118,218,71,107,80,139,198,178,212,8,162,72,133,116,82,144,110,74,32,180,140,107,75,85,210,223,15,225,221,36>>
+    , <<111,248,132,248,221,194,166,88,107,60,152,164,205,110,189,241,78,193,2,4,182,113,0,115,235,88,101,173,227,122,38,67,184,128,124,19,53,209,7,236,219,159,254,174,182,130,140,70,37,186,23,44,102,55,158,252,210,34,194,222,17,114,122,180>>
+    , <<244,59,198,44,122,153,53,60,59,44,96,232,239,36,251,189,66,233,84,120,102,220,156,91,228,237,198,244,167,212,188,10,198,32,194,198,0,52,208,64,240,219,175,134,249,233,205,120,145,160,149,89,94,237,85,226,169,150,33,95,12,21,192,24>>
+    , <<229,219,182,222,47,238,66,161,202,160,110,78,123,132,206,64,143,250,92,74,157,226,99,46,202,118,156,222,136,117,1,76,114,208,114,15,234,245,63,118,230,161,128,53,127,82,141,123,244,132,250,58,20,232,204,31,15,59,173,167,23,180,52,145>>
+    , <<165,75,41,67,178,162,2,39,212,28,164,108,9,69,175,9,188,31,174,251,47,73,137,76,35,174,188,85,127,183,156,72,137,220,167,68,8,220,134,80,134,102,122,237,238,74,49,133,197,58,73,200,11,129,76,76,88,19,234,12,139,56,168,248>>
+    , <<180,214,140,139,182,82,151,170,52,132,168,110,29,51,183,138,70,159,33,234,170,158,212,218,159,236,145,218,71,23,34,61,44,15,163,134,170,47,209,241,255,207,89,23,178,103,84,96,53,237,48,238,164,178,19,162,133,148,211,211,169,179,140,170>>
+    , <<171,52,121,128,166,75,94,130,93,209,14,125,50,253,67,160,26,142,109,234,38,122,185,173,125,145,53,36,82,102,24,146,83,17,175,188,176,196,149,25,203,235,221,112,149,64,168,215,37,251,145,26,194,174,233,178,163,170,67,215,150,18,51,147>>
+    , <<97,220,242,140,166,12,169,92,130,89,147,39,171,215,169,161,152,111,242,219,211,199,73,69,198,227,35,186,203,76,159,26,94,103,82,93,20,186,141,98,36,177,98,229,102,23,21,37,83,3,69,169,178,86,8,178,125,251,163,180,146,115,213,6>>
+    ];
+blake2_hmac_hmac(blake2s) ->
+    [ <<101,168,183,197,204,145,54,212,36,232,44,55,226,112,126,116,233,19,192,101,91,153,199,95,64,237,243,135,69,58,50,96>>
+    , <<144,182,40,30,47,48,56,201,5,106,240,180,167,231,99,202,230,254,93,158,180,56,106,14,201,82,55,137,12,16,79,240>>
+    , <<252,196,245,149,41,80,46,52,195,216,218,63,253,171,130,150,106,44,182,55,255,94,155,215,1,19,92,46,148,105,231,144>>
+    , <<70,68,52,220,190,206,9,93,69,106,29,98,214,236,86,248,152,230,37,163,158,92,82,189,249,77,175,17,27,173,131,170>>
+    , <<210,61,121,57,79,83,213,54,160,150,230,81,68,71,238,170,187,5,222,208,27,227,44,25,55,218,106,143,113,3,188,78>>
+    , <<92,76,83,46,110,69,89,83,133,78,21,16,149,38,110,224,127,213,88,129,190,223,139,57,8,217,95,13,190,54,159,234>>
+    , <<203,96,246,167,145,241,64,191,138,162,229,31,243,88,205,178,204,92,3,51,4,91,127,183,122,186,122,179,176,207,178,55>>
+    , <<190,53,233,217,99,171,215,108,1,184,171,181,22,36,240,209,16,96,16,92,213,22,16,58,114,241,117,214,211,189,30,202>>
+    ].
+
 %%% https://www.di-mgt.com.au/sha_testvectors.html
 sha3_msgs() ->
     ["abc",
@@ -1750,12 +2167,8 @@ hmac_sha3(Type) ->
             sha3_384 -> 3;
             sha3_512 -> 4
         end,
-    {Keys, Datas, Hmacs} =
-        lists:unzip3(
-          [{hexstr2bin(Key), hexstr2bin(Data), hexstr2bin(element(N,Hmacs))} 
-           || {Key,Data,Hmacs} <- hmac_sha3_data()]),
-    {Type, Keys, Datas, Hmacs}.
-        
+    [{hmac, Type, hexstr2bin(Key), hexstr2bin(Data), hexstr2bin(element(N,Hmacs))} 
+     || {Key,Data,Hmacs} <- hmac_sha3_data()].
 
 hmac_sha3_data() ->    
     [
@@ -2121,19 +2534,19 @@ rfc4231_hmac_sha512() ->
 		"debd71f8867289865df5a32d20cdc944"
 		"b6022cac3c4982b10d5eeb55c3e4de15"
 		"134676fb6de0446065c97440fa8c6a58")].
-des_cbc() ->
+des_cbc(_) ->
     [{des_cbc, 
      hexstr2bin("0123456789abcdef"), 
      hexstr2bin("1234567890abcdef"),
      <<"Now is the time for all ">> }].
       
-des_cfb() ->
+des_cfb(_) ->
     [{des_cfb, 
      hexstr2bin("0123456789abcdef"),
      hexstr2bin("1234567890abcdef"),
      <<"Now is the">>}].
 
-des3_cbc() ->
+des3_cbc(_) ->
     [{des3_cbc,
      [hexstr2bin("0123456789abcdef"), 
       hexstr2bin("fedcba9876543210"),
@@ -2142,7 +2555,7 @@ des3_cbc() ->
      <<"Now is the time for all ">>
      }].
 
-des_ede3() ->
+des_ede3(_) ->
     [{des_ede3,
      [hexstr2bin("8000000000000000"),
       hexstr2bin("4000000000000000"),
@@ -2151,7 +2564,23 @@ des_ede3() ->
       hexstr2bin("0000000000000000")
      }].
 
-des3_cbf() ->
+des_ede3_cbc(_) ->
+    [{des_ede3_cbc,
+     [hexstr2bin("0123456789abcdef"), 
+      hexstr2bin("fedcba9876543210"),
+      hexstr2bin("0f2d4b6987a5c3e1")],
+     hexstr2bin("1234567890abcdef"),
+     <<"Now is the time for all ">>
+     },
+     {des_ede3_cbc,
+     [hexstr2bin("8000000000000000"),
+      hexstr2bin("4000000000000000"),
+      hexstr2bin("2000000000000000")],
+      hexstr2bin("7AD16FFB79C45926"),
+      hexstr2bin("0000000000000000")
+     }].
+
+des3_cbf(_) ->
     [{des3_cbf,
      [hexstr2bin("0123456789abcdef"),
       hexstr2bin("fedcba9876543210"),
@@ -2160,7 +2589,7 @@ des3_cbf() ->
      <<"Now is the time for all ">>
      }].
 
-des3_cfb() ->
+des3_cfb(_) ->
     [{des3_cfb,
      [hexstr2bin("0123456789abcdef"),
       hexstr2bin("fedcba9876543210"),
@@ -2169,7 +2598,16 @@ des3_cfb() ->
      <<"Now is the time for all ">>
      }].
 
-rc2_cbc() ->
+des_ede3_cfb(_) ->
+    [{des_ede3_cfb,
+     [hexstr2bin("0123456789abcdef"),
+      hexstr2bin("fedcba9876543210"),
+      hexstr2bin("0f2d4b6987a5c3e1")],
+     hexstr2bin("1234567890abcdef"),
+     <<"Now is the time for all ">>
+     }].
+
+rc2_cbc(_) ->
     [{rc2_cbc,
      <<146,210,160,124,215,227,153,239,227,17,222,140,3,93,27,191>>,
       <<72,91,135,182,25,42,35,210>>,
@@ -2178,7 +2616,8 @@ rc2_cbc() ->
 
 %% AES CBC test vectors from http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
 aes_cbc(Config) ->
-   read_rsp(Config, aes_cbc,
+    %% RETIRED aes_*_cbc
+    read_rsp(Config, aes_cbc,
             ["CBCVarTxt128.rsp", "CBCVarKey128.rsp", "CBCGFSbox128.rsp", "CBCKeySbox128.rsp",
              "CBCVarTxt192.rsp", "CBCVarKey192.rsp", "CBCGFSbox192.rsp", "CBCKeySbox192.rsp",
              "CBCVarTxt256.rsp", "CBCVarKey256.rsp", "CBCGFSbox256.rsp", "CBCKeySbox256.rsp",
@@ -2186,15 +2625,32 @@ aes_cbc(Config) ->
             ]).
 
 aes_cbc128(Config) ->
+    %% RETIRED aes_128_cbc
     read_rsp(Config, aes_cbc128,
              ["CBCVarTxt128.rsp", "CBCVarKey128.rsp", "CBCGFSbox128.rsp", "CBCKeySbox128.rsp",
               "CBCMMT128.rsp"]).
 
 aes_cbc256(Config) ->
+    %% RETIRED aes_256_cbc
     read_rsp(Config, aes_cbc256,
              ["CBCVarTxt256.rsp", "CBCVarKey256.rsp", "CBCGFSbox256.rsp", "CBCKeySbox256.rsp",
               "CBCMMT256.rsp"]).
 
+aes_128_cbc(Config) ->
+    read_rsp(Config, aes_128_cbc,
+             ["CBCVarTxt128.rsp", "CBCVarKey128.rsp", "CBCGFSbox128.rsp", "CBCKeySbox128.rsp",
+              "CBCMMT128.rsp"]).
+
+aes_192_cbc(Config) ->
+    read_rsp(Config, aes_192_cbc,
+             ["CBCVarTxt192.rsp", "CBCVarKey192.rsp", "CBCGFSbox192.rsp", "CBCKeySbox192.rsp",
+              "CBCMMT192.rsp"]).
+
+aes_256_cbc(Config) ->
+    read_rsp(Config, aes_256_cbc,
+             ["CBCVarTxt256.rsp", "CBCVarKey256.rsp", "CBCGFSbox256.rsp", "CBCKeySbox256.rsp",
+              "CBCMMT256.rsp"]).
+
 aes_ecb(Config) ->
     read_rsp(Config, aes_ecb,
              ["ECBVarTxt128.rsp", "ECBVarKey128.rsp", "ECBGFSbox128.rsp", "ECBKeySbox128.rsp",
@@ -2202,7 +2658,22 @@ aes_ecb(Config) ->
               "ECBVarTxt256.rsp", "ECBVarKey256.rsp", "ECBGFSbox256.rsp", "ECBKeySbox256.rsp",
               "ECBMMT128.rsp", "ECBMMT192.rsp", "ECBMMT256.rsp"]).
 
-aes_ige256() ->
+aes_128_ecb(Config) ->
+    read_rsp(Config, aes_128_ecb,
+             ["ECBVarTxt128.rsp", "ECBVarKey128.rsp", "ECBGFSbox128.rsp", "ECBKeySbox128.rsp",
+              "ECBMMT128.rsp"]).
+
+aes_192_ecb(Config) ->
+    read_rsp(Config, aes_192_ecb,
+             ["ECBVarTxt192.rsp", "ECBVarKey192.rsp", "ECBGFSbox192.rsp", "ECBKeySbox192.rsp",
+              "ECBMMT192.rsp"]).
+
+aes_256_ecb(Config) ->
+    read_rsp(Config, aes_256_ecb,
+             ["ECBVarTxt256.rsp", "ECBVarKey256.rsp", "ECBGFSbox256.rsp", "ECBKeySbox256.rsp",
+              "ECBMMT256.rsp"]).
+
+aes_ige256(_) ->
     [{aes_ige256,
       hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"),
       hexstr2bin("000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F"),
@@ -2228,6 +2699,22 @@ aes_cfb8(Config) ->
               "CFB8VarTxt256.rsp", "CFB8VarKey256.rsp", "CFB8GFSbox256.rsp", "CFB8KeySbox256.rsp",
               "CFB8MMT128.rsp", "CFB8MMT192.rsp", "CFB8MMT256.rsp"]).
 
+aes_128_cfb8(Config) ->
+    read_rsp(Config, aes_128_cfb8,
+             ["CFB8VarTxt128.rsp", "CFB8VarKey128.rsp", "CFB8GFSbox128.rsp", "CFB8KeySbox128.rsp",
+              "CFB8MMT128.rsp"]).
+
+aes_192_cfb8(Config) ->
+    read_rsp(Config, aes_192_cfb8,
+             ["CFB8VarTxt192.rsp", "CFB8VarKey192.rsp", "CFB8GFSbox192.rsp", "CFB8KeySbox192.rsp",
+              "CFB8MMT192.rsp"]).
+
+aes_256_cfb8(Config) ->
+    read_rsp(Config, aes_256_cfb8,
+             ["CFB8VarTxt256.rsp", "CFB8VarKey256.rsp", "CFB8GFSbox256.rsp", "CFB8KeySbox256.rsp",
+              "CFB8MMT256.rsp"]).
+
+
 aes_cfb128(Config) ->
     read_rsp(Config, aes_cfb128,
              ["CFB128VarTxt128.rsp", "CFB128VarKey128.rsp", "CFB128GFSbox128.rsp", "CFB128KeySbox128.rsp",
@@ -2235,14 +2722,30 @@ aes_cfb128(Config) ->
               "CFB128VarTxt256.rsp", "CFB128VarKey256.rsp", "CFB128GFSbox256.rsp", "CFB128KeySbox256.rsp",
               "CFB128MMT128.rsp", "CFB128MMT192.rsp", "CFB128MMT256.rsp"]).
 
-blowfish_cbc() ->
+aes_128_cfb128(Config) ->
+    read_rsp(Config, aes_128_cfb128,
+             ["CFB128VarTxt128.rsp", "CFB128VarKey128.rsp", "CFB128GFSbox128.rsp", "CFB128KeySbox128.rsp",
+              "CFB128MMT128.rsp"]).
+
+aes_192_cfb128(Config) ->
+    read_rsp(Config, aes_192_cfb128,
+             ["CFB128VarTxt192.rsp", "CFB128VarKey192.rsp", "CFB128GFSbox192.rsp", "CFB128KeySbox192.rsp",
+              "CFB128MMT192.rsp"]).
+
+aes_256_cfb128(Config) ->
+    read_rsp(Config, aes_256_cfb128,
+             ["CFB128VarTxt256.rsp", "CFB128VarKey256.rsp", "CFB128GFSbox256.rsp", "CFB128KeySbox256.rsp",
+              "CFB128MMT256.rsp"]).
+
+
+blowfish_cbc(_) ->
     [{blowfish_cbc,
       hexstr2bin("0123456789ABCDEFF0E1D2C3B4A59687"), 
       hexstr2bin("FEDCBA9876543210"),
       hexstr2bin("37363534333231204E6F77206973207468652074696D6520666F722000000000")
      }].
 
-blowfish_ecb() ->
+blowfish_ecb(_) ->
     [
      {blowfish_ecb,
       hexstr2bin("0000000000000000"), 
@@ -2339,26 +2842,26 @@ blowfish_ecb() ->
       hexstr2bin("FFFFFFFFFFFFFFFF")}
     ].
 
-blowfish_cfb64() ->
+blowfish_cfb64(_) ->
     [{blowfish_cfb64,
       hexstr2bin("0123456789ABCDEFF0E1D2C3B4A59687"), 
       hexstr2bin("FEDCBA9876543210"),
       hexstr2bin("37363534333231204E6F77206973207468652074696D6520666F722000")
      }].
-blowfish_ofb64() ->
+blowfish_ofb64(_) ->
     [{blowfish_ofb64,
       hexstr2bin("0123456789ABCDEFF0E1D2C3B4A59687"), 
       hexstr2bin("FEDCBA9876543210"),
       hexstr2bin("37363534333231204E6F77206973207468652074696D6520666F722000")
      }].
 
-rc4() ->
+rc4(_) ->
     [{rc4, <<"apaapa">>, <<"Yo baby yo">>},
      {rc4, <<"apaapa">>, list_to_binary(lists:seq(0, 255))},
      {rc4, <<"apaapa">>, long_msg()}
     ].
 
-aes_ctr() ->
+aes_ctr(_) ->
     [  %% F.5.3  CTR-AES192.Encrypt
        {aes_ctr, hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
 	hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff"), 
@@ -2407,24 +2910,109 @@ aes_ctr() ->
     ].
 
 
+aes_128_ctr(_) ->
+    [  %% F.5.3  CTR-AES192.Encrypt
+       {aes_128_ctr, hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
+	hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff"), 
+	hexstr2bin("6bc1bee22e409f96e93d7e117393172a")},
+       {aes_128_ctr, hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
+	hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdff00"), 
+	hexstr2bin("ae2d8a571e03ac9c9eb76fac45af8e51")},
+       {aes_128_ctr, hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
+	hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdff01"), 
+	hexstr2bin("30c81c46a35ce411e5fbc1191a0a52ef") },
+       {aes_128_ctr, hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
+	hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdff02"), 
+	hexstr2bin("f69f2445df4f9b17ad2b417be66c3710")}
+    ].
+       
+aes_192_ctr(_) ->
+    [ %% F.5.3  CTR-AES192.Encrypt
+      {aes_192_ctr, hexstr2bin("8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b"), 
+       hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff"), 
+       hexstr2bin("6bc1bee22e409f96e93d7e117393172a")},
+      {aes_192_ctr, hexstr2bin("8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b"), 
+       hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdff00"), 
+       hexstr2bin("ae2d8a571e03ac9c9eb76fac45af8e51")},
+      {aes_192_ctr, hexstr2bin("8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b"), 
+       hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdff01"), 
+	hexstr2bin("30c81c46a35ce411e5fbc1191a0a52ef")},
+      {aes_192_ctr, hexstr2bin("8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b"), 
+       hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdff02"), 
+       hexstr2bin("f69f2445df4f9b17ad2b417be66c3710")}
+    ].
+       
+aes_256_ctr(_) ->
+    [ %% F.5.5  CTR-AES256.Encrypt
+      {aes_256_ctr, hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"), 
+       hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff"), 
+       hexstr2bin("6bc1bee22e409f96e93d7e117393172a")},
+      {aes_256_ctr, hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"), 
+       hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdff00"), 
+       hexstr2bin("ae2d8a571e03ac9c9eb76fac45af8e51")},
+      {aes_256_ctr, hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"), 
+       hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdff01"), 
+       hexstr2bin("30c81c46a35ce411e5fbc1191a0a52ef")},
+      {aes_256_ctr, hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"), 
+       hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdff02"), 
+       hexstr2bin("f69f2445df4f9b17ad2b417be66c3710")},
+
+      {aes_256_ctr,  hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"),
+       hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff"),
+       long_msg()}
+    ].
+
+
 aes_gcm(Config) ->
-   read_rsp(Config, aes_gcm,
+    %% RETIRED aes_*_gcm
+    read_rsp(Config, aes_gcm,
+             ["gcmDecrypt128.rsp",
+              "gcmDecrypt192.rsp",
+              "gcmDecrypt256.rsp",
+              "gcmEncryptExtIV128.rsp",
+              "gcmEncryptExtIV192.rsp",
+              "gcmEncryptExtIV256.rsp"]).
+
+aes_128_gcm(Config) ->
+   read_rsp(Config, aes_128_gcm,
             ["gcmDecrypt128.rsp",
-             "gcmDecrypt192.rsp",
-             "gcmDecrypt256.rsp",
-             "gcmEncryptExtIV128.rsp",
-             "gcmEncryptExtIV192.rsp",
+             "gcmEncryptExtIV128.rsp"]).
+
+aes_192_gcm(Config) ->
+   read_rsp(Config, aes_192_gcm,
+            ["gcmDecrypt192.rsp",
+             "gcmEncryptExtIV192.rsp"]).
+
+aes_256_gcm(Config) ->
+   read_rsp(Config, aes_256_gcm,
+            ["gcmDecrypt256.rsp",
              "gcmEncryptExtIV256.rsp"]).
 
+
 aes_ccm(Config) ->
-   read_rsp(Config, aes_ccm,
-            ["VADT128.rsp", "VADT192.rsp", "VADT256.rsp",
-             "VNT128.rsp",  "VNT192.rsp",  "VNT256.rsp",
-             "VPT128.rsp",  "VPT192.rsp",  "VPT256.rsp"
-            ]).
+    %% RETIRED aes_*_ccm
+    read_rsp(Config, aes_ccm,
+             ["VADT128.rsp", "VADT192.rsp", "VADT256.rsp",
+              "VNT128.rsp",  "VNT192.rsp",  "VNT256.rsp",
+              "VPT128.rsp",  "VPT192.rsp",  "VPT256.rsp"
+             ]).
+
+aes_128_ccm(Config) ->
+    read_rsp(Config, aes_128_ccm,
+            ["VADT128.rsp", "VNT128.rsp", "VPT128.rsp"]).
+
+aes_192_ccm(Config) ->
+   read_rsp(Config, aes_192_ccm,
+            ["VADT192.rsp", "VNT192.rsp", "VPT192.rsp"]).
+
+aes_256_ccm(Config) ->
+   read_rsp(Config, aes_256_ccm,
+            ["VADT256.rsp", "VNT256.rsp", "VPT256.rsp"]).
+
+
 
 %% https://tools.ietf.org/html/rfc7539#appendix-A.5
-chacha20_poly1305() ->
+chacha20_poly1305(_) ->
     [
      {chacha20_poly1305,
       hexstr2bin("1c9240a5eb55d38af333888604f6b5f0"                      %% Key
@@ -2471,7 +3059,7 @@ chacha20_poly1305() ->
     ].
 
 
-chacha20() ->
+chacha20(_) ->
 %%% chacha20 (no mode) test vectors from RFC 7539 A.2
     [
      %% Test Vector #1:
@@ -3335,14 +3923,6 @@ ecc() ->
                  end,
                  TestCases).
 
-cmac_nist(Config, aes_cbc128 = Type) ->
-   read_rsp(Config, Type,
-            ["CMACGenAES128.rsp", "CMACVerAES128.rsp"]);
-
-cmac_nist(Config, aes_cbc256 = Type) ->
-   read_rsp(Config, Type,
-            ["CMACGenAES256.rsp", "CMACVerAES256.rsp"]).
-
 int_to_bin(X) when X < 0 -> int_to_bin_neg(X, []);
 int_to_bin(X) -> int_to_bin_pos(X, []).
 
@@ -3405,9 +3985,18 @@ parse_rsp(_Type, [], _State, Acc) ->
     Acc;
 parse_rsp(_Type, [<<"DECRYPT">>|_], _State, Acc) ->
     Acc;
+parse_rsp(_Type, [<<"ENCRYPT">>|_], _State, Acc) ->
+    Acc;
 %% AES format
 parse_rsp(Type, [<<"COUNT = ", _/binary>>,
                  <<"KEY = ", Key/binary>>,
+                 <<"PLAINTEXT = ", PlainText/binary>>,
+                 <<"CIPHERTEXT = ", CipherText/binary>>|Next], State, Acc) ->
+    parse_rsp(Type, Next, State,
+              [{Type, hexstr2bin(Key), 
+                hexstr2bin(PlainText), hexstr2bin(CipherText)}|Acc]);
+parse_rsp(Type, [<<"COUNT = ", _/binary>>,
+                 <<"KEY = ", Key/binary>>,
                  <<"IV = ", IV/binary>>,
                  <<"PLAINTEXT = ", PlainText/binary>>,
                  <<"CIPHERTEXT = ", CipherText/binary>>|Next], State, Acc) ->
@@ -3551,12 +4140,11 @@ parse_rsp_cmac(Type, Key0, Msg0, Mlen0, Tlen, MAC0, Next, State, Acc) ->
     Mlen = binary_to_integer(Mlen0),
     <<Msg:Mlen/bytes, _/binary>> = hexstr2bin(Msg0),
     MAC = hexstr2bin(MAC0),
-
     case binary_to_integer(Tlen) of
         0 ->
-            parse_rsp(Type, Next, State, [{Type, Key, Msg, MAC}|Acc]);
+            parse_rsp(Type, Next, State, [{cmac, Type, Key, Msg, MAC}|Acc]);
         I ->
-            parse_rsp(Type, Next, State, [{Type, Key, Msg, I, MAC}|Acc])
+            parse_rsp(Type, Next, State, [{cmac, Type, Key, Msg, I, MAC}|Acc])
     end.
 
 api_errors_ecdh(Config) when is_list(Config) ->
diff --git a/lib/crypto/test/crypto_bench.spec b/lib/crypto/test/crypto_bench.spec
new file mode 100644
index 0000000000..b9a26d94db
--- /dev/null
+++ b/lib/crypto/test/crypto_bench.spec
@@ -0,0 +1,3 @@
+{suites, "../crypto_test", [
+	crypto_bench_SUITE
+    ]}.
diff --git a/lib/crypto/test/crypto_bench_SUITE.erl b/lib/crypto/test/crypto_bench_SUITE.erl
new file mode 100644
index 0000000000..c66a27f0c8
--- /dev/null
+++ b/lib/crypto/test/crypto_bench_SUITE.erl
@@ -0,0 +1,400 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% 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(crypto_bench_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include_lib("common_test/include/ct_event.hrl").
+-include_lib("common_test/include/ct.hrl").
+
+suite() -> [%%{ct_hooks,[{ts_install_cth,[{nodenames,2}]}]},
+	    {timetrap,{minutes,2}}
+	   ].
+
+all() ->
+    [
+     {group, textblock_256}
+    ].
+
+groups() ->
+    [
+     {textblock_256, [], [
+                          {group, ciphers_128},
+                          {group, ciphers_256}
+                         ]},
+
+     {ciphers_128, [{repeat, 5}], [
+                                   block,
+                                   stream
+                                  ]},
+
+     {ciphers_256, [{repeat, 5}], [
+                                   block,
+                                   stream,
+                                   chacha
+                                  ]}
+    ].
+
+%%%----------------------------------------------------------------
+%%%
+init_per_suite(Config0) ->
+    try crypto:start() of
+        _ ->
+            [{_,_,Info}] = crypto:info_lib(),
+            ct:comment("~s",[Info]),
+            ct:pal("Crypto version: ~p~n~n~p",[Info,crypto:supports()]),
+            Config1 = measure_openssl_aes_cbc([128,256], Config0),
+            calibrate([{sec_goal,10} | Config1])
+
+    catch _:_ ->
+	    {fail, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    application:stop(crypto).
+
+%%%----------------------------------------------------------------
+%%%
+init_per_group(Group, Config) ->
+    case atom_to_list(Group) of
+        "ciphers_"++KeySizeStr ->
+            KeySize = list_to_integer(KeySizeStr),
+            [{key_size,KeySize} | Config];
+
+        "textblock_"++BlockSizeStr ->
+            BlockSize = list_to_integer(BlockSizeStr),
+            [{block_size,BlockSize} | Config];
+
+        _ ->
+            Config
+    end.
+
+end_per_group(_Group, Config) ->
+    Config.
+
+
+measure_openssl_aes_cbc(KeySizes, Config) ->
+    BLno_acc = [baseline(aes_cbc, KeySize, false) || KeySize <- KeySizes],
+    ct:pal("Non-accelerated baseline encryption time [µs/block]:~n~p", [BLno_acc]),
+    BLacc = [baseline(aes_cbc, KeySize, true) || KeySize <- KeySizes],
+    ct:pal("Possibly accelerated baseline encryption time [µs/block]:~n~p", [BLacc]),
+    [{acc,BLacc},
+     {no_acc,BLno_acc} | Config].
+
+calibrate(Config) ->
+    Secs = proplists:get_value(sec_goal, Config, 10),
+    {_,Empty} = data(empty, 0, 0),
+    {Ne,Te} = run1(Secs*3000, Empty),
+    report(["Overhead"], Te/Ne),
+    [{overhead,Te/Ne} | Config].
+
+%%%================================================================
+%%%
+%%%
+block(Config) ->
+    run_cryptos([aes_cbc, aes_gcm, aes_ccm],
+                Config).
+
+stream(Config) ->
+    run_cryptos([aes_ctr],
+                Config).
+    
+chacha(Config) ->
+    run_cryptos([chacha20, chacha20_poly1305],
+                Config).
+    
+
+%%%================================================================
+%%%
+%%%
+
+run_cryptos(Cryptos, Config) ->
+    KeySize = proplists:get_value(key_size, Config),
+    BlockSize = proplists:get_value(block_size, Config),
+    MilliSecGoal = 1000*proplists:get_value(sec_goal,Config),
+    OverHead = proplists:get_value(overhead, Config, 0),
+    [try
+         TimePerOpBrutto = run(Crypto,KeySize,BlockSize,MilliSecGoal),
+         %% ct:pal("Brutto: ~p Overhead: ~p (~.2f %) Netto: ~p",
+         %%        [TimePerOpBrutto, OverHead, 100*OverHead/TimePerOpBrutto,TimePerOpBrutto - OverHead]),
+         TimePerOpBrutto - OverHead
+     of
+         TimePerOp -> % µs
+             %% First, Report speed of encrypting blocks of 1000. [blocks/sec]
+             ReportUnit = 1000,
+             Label = [fmt(Crypto)," key:",KeySize," block:",BlockSize],
+             report(Label,
+                    (BlockSize/ReportUnit)*1000000/TimePerOp
+                   ),
+
+             EffCrypto = case Crypto of
+                             X -> X
+                         end,
+             %% Percent of accelerated speed
+             case find_value([acc,{EffCrypto,KeySize},BlockSize], Config) of
+                 undefined ->
+                     ok;
+                 TimePerOpBaseAcc ->
+                     report(["Percent of acc OpenSSL "|Label],
+                            100*TimePerOpBaseAcc/TimePerOp % Percent of base *speed*
+                           )
+             end,
+
+             %% Percent of non-accelerated speed
+             case find_value([no_acc,{EffCrypto,KeySize},BlockSize], Config) of
+                 undefined ->
+                     ok;
+                 TimePerOpBaseNoAcc ->
+                     report(["Percent of noacc OpenSSL "|Label],
+                            100*TimePerOpBaseNoAcc/TimePerOp % Percent of base *speed*
+                           )
+             end
+     catch
+         _:_ ->
+             ct:pal("~p unsupported",[{Crypto,KeySize,BlockSize}])
+     end
+     || Crypto <- Cryptos,
+        supported(Crypto)
+    ].
+
+
+run(Crypto, KeySize, BlockSize, MilliSecGoal) ->
+    {_Type, Funs} = data(Crypto, KeySize, BlockSize),
+    {Nc,Tc} = run1(MilliSecGoal, Funs),
+    Tc/Nc.
+
+fmt(X) -> X.
+
+
+find_value(KeyPath, PropList, Default) ->
+    try find_value(KeyPath, PropList)
+    of
+        undefined -> Default
+    catch
+        error:function_clause -> Default
+    end.
+
+find_value(KeyPath, PropList) ->
+    lists:foldl(fun(K, L) when is_list(L) -> proplists:get_value(K,L);
+                   (_, _) -> undefined
+                end, PropList, KeyPath).
+
+%%%================================================================
+%%%
+%%%
+funs({block, {Type, Key, IV, Block}}) ->
+    {fun() -> ok end,
+     fun(_) -> crypto:block_encrypt(Type, Key, IV, Block) end,
+     fun(_) -> ok end};
+
+funs({stream, {Type, Key, IV, Block}}) ->
+    {fun() -> {crypto:stream_init(Type, Key, IV),ok} end,
+     fun({Ctx,_}) -> crypto:stream_encrypt(Ctx, Block) end,
+     fun(_) -> ok end}.
+
+
+data(aes_cbc, KeySize, BlockSize) ->
+    Type = case KeySize of
+               128 -> aes_cbc128;
+               256 -> aes_cbc256
+           end,
+    Key = mk_bin(KeySize div 8),
+    IV = mk_bin(16),
+    Block = mk_bin(BlockSize),
+    {Type, funs({block, {Type, Key, IV, Block}})};
+
+data(aes_gcm, KeySize, BlockSize) ->
+    Type = aes_gcm,
+    Key = mk_bin(KeySize div 8),
+    IV = mk_bin(12),
+    Block = mk_bin(BlockSize),
+    AAD = <<01,02,03,04>>,
+    {Type, funs({block, {Type, Key, IV, {AAD,Block,16}}})};
+
+data(aes_ccm, KeySize, BlockSize) ->
+    Type = aes_ccm,
+    Key = mk_bin(KeySize div 8),
+    IV = mk_bin(12),
+    Block = mk_bin(BlockSize),
+    AAD = <<01,02,03,04>>,
+    {Type, funs({block, {Type, Key, IV, {AAD,Block,12}}})};
+
+data(aes_ctr, KeySize, BlockSize) ->
+    Type = aes_ctr,
+    Key = mk_bin(KeySize div 8),
+    IV = mk_bin(16),
+    Block = mk_bin(BlockSize),
+    {Type, funs({stream, {Type, Key, IV, Block}})};
+
+data(chacha20_poly1305, 256=KeySize, BlockSize) ->
+    Type = chacha20_poly1305,
+    Key = mk_bin(KeySize div 8),
+    IV = mk_bin(16),
+    AAD = <<01,02,03,04>>,
+    Block = mk_bin(BlockSize),
+    {Type, funs({block, {Type, Key, IV, {AAD,Block}}})};
+
+data(chacha20, 256=KeySize, BlockSize) ->
+    Type = chacha20,
+    Key = mk_bin(KeySize div 8),
+    IV = mk_bin(16),
+    Block = mk_bin(BlockSize),
+    {Type, funs({stream, {Type, Key, IV, Block}})};
+
+data(empty, 0, 0) ->
+    {undefined,
+     {fun() -> ok end,
+      fun(X) -> X end,
+      fun(_) -> ok end}}.
+
+%%%================================================================
+%%%
+%%%
+run1(MilliSecGoal, Funs) ->
+    Parent = self(),
+    Pid = spawn(fun() ->
+                        {Fi,Fu,Ff} = Funs,
+                        Ctx0 = Fi(),
+                        erlang:garbage_collect(),
+                        T0 = start_time(),
+                        {N,Ctx} = loop(Fu, Ctx0, 0),
+                        T = elapsed_time(T0),
+                        Ff(Ctx),
+                        Parent ! {result,N,microseconds(T)}
+                end),
+    Pid ! go,
+    receive
+    after MilliSecGoal ->
+            Pid ! stop
+    end,
+    receive
+        {result,N,MicroSecs} ->
+            {N,MicroSecs}
+    end.
+
+
+loop(F, Ctx, N) ->
+    receive
+        stop ->
+            {N, Ctx}
+    after 0 ->
+            loop(F, F(Ctx), N+1)
+    end.
+
+%%%----------------------------------------------------------------
+report(LabelList, Value) ->
+    Label = report_chars(lists:concat(LabelList)),
+    ct:pal("ct_event:notify ~p: ~p", [Label, Value]),
+    ct_event:notify(
+      #event{name = benchmark_data,
+             data = [{name, Label},
+                     {value,Value}]}).
+    
+report_chars(Cs) ->
+    [case C of
+         $- -> $_;
+         _ -> C
+     end || C <- Cs].
+
+%%%----------------------------------------------------------------
+supported(Algorithm) ->
+    lists:member(Algorithm,
+                 [A || {_,As} <- crypto:supports(), A <- As]
+                ).
+
+%%%----------------------------------------------------------------
+start_time() ->
+    erlang:system_time().
+
+elapsed_time(StartTime) ->
+    erlang:system_time() - StartTime.
+
+microseconds(Time) ->
+    erlang:convert_time_unit(Time, native, microsecond).
+
+%%%----------------------------------------------------------------
+
+%% Example output:
+%% +DT:aes-128-cbc:3:16
+%% +R:135704772:aes-128-cbc:2.980000
+%% +DT:aes-128-cbc:3:64
+%% +R:36835089:aes-128-cbc:3.000000
+%% +DT:aes-128-cbc:3:256
+%% +R:9398616:aes-128-cbc:3.000000
+%% +DT:aes-128-cbc:3:1024
+%% +R:2355683:aes-128-cbc:2.990000
+%% +DT:aes-128-cbc:3:8192
+%% +R:294508:aes-128-cbc:2.990000
+%% +H:16:64:256:1024:8192
+%% +F:22:aes-128-cbc:728616225.50:785815232.00:802015232.00:806762338.46:806892821.40
+
+baseline(Crypto, KeySize, EVP) ->
+    Spec=
+        case {Crypto,KeySize} of
+            {aes_cbc, 128} -> "aes-128-cbc";
+            {aes_cbc, 256} -> "aes-256-cbc"
+        end,
+    {{Crypto,KeySize}, baseline(Spec, EVP)}.
+
+baseline(Spec, EVP) ->
+    Cmd =
+        case EVP of
+            true -> "openssl speed -mr -evp " ++ Spec;
+            false-> "openssl speed -mr      " ++ Spec
+        end,
+    get_base_values(string:tokens(os:cmd(Cmd),"\n"), Spec, []).
+
+
+get_base_values(["+DT:"++Sdt,
+                 "+R:"++Sr
+                 |T], Crypto, Acc) ->
+    [Crypto0,_GoalSecs0,BlockSize0] = string:tokens(Sdt, ":"),
+    [Nblocks0,Crypto0,RealSecs0] = string:tokens(Sr, ":"),
+    Crypto = fix_possible_space_bug(Crypto0),
+    RealSecs = list_to_float(RealSecs0),
+    BlockSize = list_to_integer(BlockSize0),
+    Nblocks = list_to_integer(Nblocks0),
+    get_base_values(T, Crypto, [{BlockSize, 1000000*RealSecs/Nblocks} | Acc]);
+
+get_base_values([_|T], Crypto, Acc) ->
+    get_base_values(T, Crypto, Acc);
+
+get_base_values([], _, Acc) ->
+    lists:sort(Acc).
+    
+fix_possible_space_bug(S) -> lists:concat(lists:join("-",string:tokens(S,"- "))).
+
+%%%----------------------------------------------------------------
+mk_bin(Size) when Size =< 256 ->
+    list_to_binary(lists:seq(0,Size-1));
+
+mk_bin(Size) when 1024 =< Size ->
+    B = mk_bin(Size div 4),
+    Brest = mk_bin(Size rem 4),
+    <<B/binary, B/binary, B/binary, B/binary, Brest/binary>>;
+
+mk_bin(Size) when 256 < Size ->
+    B = mk_bin(Size div 2),
+    Brest = mk_bin(Size rem 2),
+    <<B/binary, B/binary, Brest/binary>>.
+
diff --git a/lib/crypto/test/engine_SUITE.erl b/lib/crypto/test/engine_SUITE.erl
index 8a45fc9076..41cd132734 100644
--- a/lib/crypto/test/engine_SUITE.erl
+++ b/lib/crypto/test/engine_SUITE.erl
@@ -148,8 +148,21 @@ end_per_group(_, Config) ->
     end.
 
 %%--------------------------------------------------------------------
-init_per_testcase(_Case, Config) ->
-    Config.
+init_per_testcase(Case, Config) ->
+    case string:tokens(atom_to_list(Case),"_") of
+        ["sign","verify",Type|_] ->
+            skip_if_unsup(list_to_atom(Type), Config);
+
+        ["priv","encrypt","pub","decrypt",Type|_] ->
+            skip_if_unsup(list_to_atom(Type), Config);
+
+        ["get","pub","from","priv","key",Type|_] ->
+            skip_if_unsup(list_to_atom(Type), Config);
+
+        _ ->
+            Config
+    end.
+
 end_per_testcase(_Case, _Config) ->
     ok.
 
@@ -345,13 +358,13 @@ engine_list(Config) when is_list(Config) ->
             {skip, "OTP Test engine not found"};
         {ok, Engine} ->
             try
-                EngineList0 = crypto:engine_list(),
                 case crypto:engine_load(<<"dynamic">>,
                                         [{<<"SO_PATH">>, Engine},
                                          <<"LOAD">>],
                                         []) of
                     {ok, E} ->
                         EngineList0 = crypto:engine_list(),
+                        false = lists:member(<<"MD5">>, EngineList0),
                         ok = crypto:engine_add(E),
                         [<<"MD5">>] = lists:subtract(crypto:engine_list(), EngineList0),
                         ok = crypto:engine_remove(E),
@@ -674,7 +687,7 @@ ensure_load(Config) when is_list(Config) ->
     end.
 
 %%%----------------------------------------------------------------
-%%% Pub/priv key storage tests.  Thoose are for testing the crypto.erl
+%%% Pub/priv key storage tests.  Those are for testing the crypto.erl
 %%% support for using priv/pub keys stored in an engine.
 
 sign_verify_rsa(Config) ->
@@ -851,6 +864,19 @@ get_pub_from_priv_key_ecdsa(Config) ->
 %%%================================================================
 %%% Help for engine_stored_pub_priv_keys* test cases
 %%%
+skip_if_unsup(Type, Config) ->
+    case pkey_supported(Type) of
+        false ->
+            {skip, "Unsupported in this cryptolib"};
+        true ->
+            Config
+    end.
+
+
+pkey_supported(Type) ->
+    lists:member(Type, proplists:get_value(public_keys, crypto:supports(), [])).
+
+
 load_storage_engine(Config) ->
     load_storage_engine(Config, []).
 
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index 6a91244715..2315cb3c48 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 4.4
+CRYPTO_VSN = 4.5.1
diff --git a/lib/debugger/doc/src/Makefile b/lib/debugger/doc/src/Makefile
index 56d6085e9c..49b5a4be57 100644
--- a/lib/debugger/doc/src/Makefile
+++ b/lib/debugger/doc/src/Makefile
@@ -114,8 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_docs_spec: docs
 	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
 	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
-	($(CP) -rf  $(HTMLDIR) "$(RELSYSDIR)/doc")
+	$(INSTALL_DIR_DATA) $(HTMLDIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
 	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
 	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
diff --git a/lib/debugger/doc/src/debugger.xml b/lib/debugger/doc/src/debugger.xml
index 1ecdbcd064..77285095e7 100644
--- a/lib/debugger/doc/src/debugger.xml
+++ b/lib/debugger/doc/src/debugger.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>debugger</module>
+  <module since="">debugger</module>
   <modulesummary>Erlang Debugger.</modulesummary>
   <description>
     <p>Erlang Debugger for debugging and testing of Erlang programs.</p>
@@ -36,10 +36,10 @@
 
   <funcs>
     <func>
-      <name>start()</name>
-      <name>start(File)</name>
-      <name>start(Mode)</name>
-      <name>start(Mode, File)</name>
+      <name since="">start()</name>
+      <name since="">start(File)</name>
+      <name since="">start(Mode)</name>
+      <name since="">start(Mode, File)</name>
       <fsummary>Start Debugger.</fsummary>
       <type>
 	<v>Mode = local | global</v>
@@ -60,7 +60,7 @@
     </func>
 
     <func>
-      <name>quick(Module, Name, Args)</name>
+      <name since="">quick(Module, Name, Args)</name>
       <fsummary>Debug a process.</fsummary>
       <type>
 	<v>Module = Name = atom()</v>
diff --git a/lib/debugger/doc/src/i.xml b/lib/debugger/doc/src/i.xml
index 628b91e9e4..06b0eb876a 100644
--- a/lib/debugger/doc/src/i.xml
+++ b/lib/debugger/doc/src/i.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>i</module>
+  <module since="">i</module>
   <modulesummary>Debugger/Interpreter Interface.</modulesummary>
   <description>
     <p>The <c>i</c> module provides short forms for some of
@@ -51,7 +51,7 @@
 
   <funcs>
     <func>
-      <name>im() -> pid()</name>
+      <name since="">im() -> pid()</name>
       <fsummary>Start a graphical monitor.</fsummary>
       <desc>
 	<p>Starts a new graphical monitor. This is the Monitor window,
@@ -63,10 +63,10 @@
     </func>
 
     <func>
-      <name>ii(AbsModules) -> ok</name>
-      <name>ii(AbsModule) -> {module, Module} | error</name>
-      <name>ini(AbsModules) -> ok</name>
-      <name>ini(AbsModule) -> {module, Module} | error</name>
+      <name since="">ii(AbsModules) -> ok</name>
+      <name since="">ii(AbsModule) -> {module, Module} | error</name>
+      <name since="">ini(AbsModules) -> ok</name>
+      <name since="">ini(AbsModule) -> {module, Module} | error</name>
       <fsummary>Interpret a module.</fsummary>
       <type>
 	<v>AbsModules = [AbsModule]</v>
@@ -84,8 +84,8 @@
     </func>
 
     <func>
-      <name>iq(AbsModule) -> ok</name>
-      <name>inq(AbsModule) -> ok</name>
+      <name since="">iq(AbsModule) -> ok</name>
+      <name since="">inq(AbsModule) -> ok</name>
       <fsummary>Stop interpreting a module.</fsummary>
       <type>
 	<v>AbsModule = Module | File</v>
@@ -100,7 +100,7 @@
     </func>
 
     <func>
-      <name>il() -> ok</name>
+      <name since="">il() -> ok</name>
       <fsummary>Make a printout of all interpreted modules</fsummary>
       <desc>
 	<p>Makes a printout of all interpreted modules.
@@ -110,7 +110,7 @@
     </func>
 
     <func>
-      <name>ip() -> ok</name>
+      <name since="">ip() -> ok</name>
       <fsummary>Print the current status of all interpreted
 	processes.</fsummary>
       <desc>
@@ -119,7 +119,7 @@
     </func>
 
     <func>
-      <name>ic() -> ok</name>
+      <name since="">ic() -> ok</name>
       <fsummary>Clear information about processes executing interpreted
 	code.</fsummary>
       <desc>
@@ -129,8 +129,8 @@
     </func>
 
     <func>
-      <name>iaa(Flags) -> true</name>
-      <name>iaa(Flags, Function) -> true</name>
+      <name since="">iaa(Flags) -> true</name>
+      <name since="">iaa(Flags, Function) -> true</name>
       <fsummary>Set when and how to attach to a process.</fsummary>
       <type>
 	<v>Flags = [init | break | exit]</v>
@@ -148,7 +148,7 @@
     </func>
 
     <func>
-      <name>ist(Flag) -> true</name>
+      <name since="">ist(Flag) -> true</name>
       <fsummary>Set how to save call frames.</fsummary>
       <type>
 	<v>Flag = all | no_tail | false</v>
@@ -160,7 +160,7 @@
     </func>
 
     <func>
-      <name>ia(Pid) -> ok | no_proc</name>
+      <name since="">ia(Pid) -> ok | no_proc</name>
       <fsummary>Attache to a process.</fsummary>
       <type>
 	<v>Pid = pid()</v>
@@ -172,7 +172,7 @@
     </func>
 
     <func>
-      <name>ia(X,Y,Z) -> ok | no_proc</name>
+      <name since="">ia(X,Y,Z) -> ok | no_proc</name>
       <fsummary>Attache to a process.</fsummary>
       <type>
 	<v>X = Y = Z = int()</v>
@@ -184,7 +184,7 @@
     </func>
 
     <func>
-      <name>ia(Pid, Function) -> ok | no_proc</name>
+      <name since="">ia(Pid, Function) -> ok | no_proc</name>
       <fsummary>Attache to a process.</fsummary>
       <type>
 	<v>Pid = pid()</v>
@@ -199,7 +199,7 @@
     </func>
 
     <func>
-      <name>ia(X,Y,Z, Function) -> ok | no_proc</name>
+      <name since="">ia(X,Y,Z, Function) -> ok | no_proc</name>
       <fsummary>Attache to a process.</fsummary>
       <type>
 	<v>X = Y = Z = int()</v>
@@ -217,7 +217,7 @@
     </func>
 
     <func>
-      <name>ib(Module, Line) -> ok | {error, break_exists}</name>
+      <name since="">ib(Module, Line) -> ok | {error, break_exists}</name>
       <fsummary>Create a breakpoint.</fsummary>
       <type>
 	<v>Module = atom()</v>
@@ -229,7 +229,7 @@
     </func>
 
     <func>
-      <name>ib(Module, Name, Arity) -> ok | {error, function_not_found}
+      <name since="">ib(Module, Name, Arity) -> ok | {error, function_not_found}
       </name>
       <fsummary>Create breakpoints in the specified function.</fsummary>
       <type>
@@ -243,7 +243,7 @@
     </func>
 
     <func>
-      <name>ir() -> ok</name>
+      <name since="">ir() -> ok</name>
       <fsummary>Delete all breakpoints.</fsummary>
       <desc>
 	<p>Deletes all breakpoints.</p>
@@ -251,7 +251,7 @@
     </func>
 
     <func>
-      <name>ir(Module) -> ok</name>
+      <name since="">ir(Module) -> ok</name>
       <fsummary>Delete all breakpoints in a module.</fsummary>
       <type>
 	<v>Module = atom()</v>
@@ -262,7 +262,7 @@
     </func>
 
     <func>
-      <name>ir(Module, Line) -> ok</name>
+      <name since="">ir(Module, Line) -> ok</name>
       <fsummary>Delete a breakpoint.</fsummary>
       <type>
 	<v>Module = atom()</v>
@@ -274,7 +274,7 @@
     </func>
 
     <func>
-      <name>ir(Module, Name, Arity) -> ok | {error, function_not_found}
+      <name since="">ir(Module, Name, Arity) -> ok | {error, function_not_found}
       </name>
       <fsummary>Delete breakpoints from the specified function.</fsummary>
       <type>
@@ -288,7 +288,7 @@
     </func>
 
     <func>
-      <name>ibd(Module, Line) -> ok</name>
+      <name since="">ibd(Module, Line) -> ok</name>
       <fsummary>Make a breakpoint inactive.</fsummary>
       <type>
 	<v>Module = atom()</v>
@@ -300,7 +300,7 @@
     </func>
 
     <func>
-      <name>ibe(Module, Line) -> ok</name>
+      <name since="">ibe(Module, Line) -> ok</name>
       <fsummary>Make a breakpoint active.</fsummary>
       <type>
 	<v>Module = atom()</v>
@@ -312,7 +312,7 @@
     </func>
 
     <func>
-      <name>iba(Module, Line, Action) -> ok</name>
+      <name since="">iba(Module, Line, Action) -> ok</name>
       <fsummary>Set the trigger action of a breakpoint.</fsummary>
       <type>
 	<v>Module = atom()</v>
@@ -326,7 +326,7 @@
     </func>
 
     <func>
-      <name>ibc(Module, Line, Function) -> ok</name>
+      <name since="">ibc(Module, Line, Function) -> ok</name>
       <fsummary>Set the conditional test of a breakpoint.</fsummary>
       <type>
 	<v>Module = atom()</v>
@@ -348,7 +348,7 @@
     </func>
 
     <func>
-      <name>ipb() -> ok</name>
+      <name since="">ipb() -> ok</name>
       <fsummary>Print all existing breakpoints.</fsummary>
       <desc>
 	<p>Prints all existing breakpoints.</p>
@@ -356,7 +356,7 @@
     </func>
 
     <func>
-      <name>ipb(Module) -> ok</name>
+      <name since="">ipb(Module) -> ok</name>
       <fsummary>Print all existing breakpoints in a module.</fsummary>
       <type>
 	<v>Module = atom()</v>
@@ -367,7 +367,7 @@
     </func>
 
     <func>
-      <name>iv() -> atom()</name>
+      <name since="">iv() -> atom()</name>
       <fsummary>Return the current version number of the interpreter.
       </fsummary>
       <desc>
@@ -377,7 +377,7 @@
     </func>
 
     <func>
-      <name>help() -> ok</name>
+      <name since="">help() -> ok</name>
       <fsummary>Print help text.</fsummary>
       <desc>
 	<p>Prints help text.</p>
diff --git a/lib/debugger/doc/src/int.xml b/lib/debugger/doc/src/int.xml
index 31e9dfe923..a0078714e6 100644
--- a/lib/debugger/doc/src/int.xml
+++ b/lib/debugger/doc/src/int.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>int</module>
+  <module since="">int</module>
   <modulesummary>Interpreter Interface.</modulesummary>
   <description>
     <p>The Erlang interpreter provides mechanisms for breakpoints and
@@ -94,10 +94,10 @@
 
   <funcs>
     <func>
-      <name>i(AbsModule) -> {module,Module} | error</name>
-      <name>i(AbsModules) -> ok</name>
-      <name>ni(AbsModule) -> {module,Module} | error</name>
-      <name>ni(AbsModules) -> ok</name>
+      <name since="">i(AbsModule) -> {module,Module} | error</name>
+      <name since="">i(AbsModules) -> ok</name>
+      <name since="">ni(AbsModule) -> {module,Module} | error</name>
+      <name since="">ni(AbsModules) -> ok</name>
       <fsummary>Interpret a module.</fsummary>
       <type>
 	<v>AbsModules = [AbsModule]</v>
@@ -144,8 +144,8 @@
     </func>
 	
     <func>
-      <name>n(AbsModule) -> ok</name>
-      <name>nn(AbsModule) -> ok</name>
+      <name since="">n(AbsModule) -> ok</name>
+      <name since="">nn(AbsModule) -> ok</name>
       <fsummary>Stop interpreting a module.</fsummary>
       <type>
 	<v>AbsModule = Module | File | [Module | File]</v>
@@ -163,7 +163,7 @@
     </func>
 
     <func>
-      <name>interpreted() -> [Module]</name>
+      <name since="">interpreted() -> [Module]</name>
       <fsummary>Get all interpreted modules.</fsummary>
       <type>
 	<v>Module = atom()</v>
@@ -174,7 +174,7 @@
     </func>
 
     <func>
-      <name>file(Module) -> File | {error,not_loaded}</name>
+      <name since="">file(Module) -> File | {error,not_loaded}</name>
       <fsummary>Get the filename for an interpreted module.</fsummary>
       <type>
 	<v>Module = atom()</v>
@@ -187,7 +187,7 @@
     </func>
 
     <func>
-      <name>interpretable(AbsModule) -> true | {error,Reason}</name>
+      <name since="">interpretable(AbsModule) -> true | {error,Reason}</name>
       <fsummary>Check if a module can be interpreted.</fsummary>
       <type>
 	<v>AbsModule = Module | File</v>
@@ -255,9 +255,9 @@
     </func>
 
     <func>
-      <name>auto_attach() -> false | {Flags,Function}</name>
-      <name>auto_attach(false)</name>
-      <name>auto_attach(Flags, Function)</name>
+      <name since="">auto_attach() -> false | {Flags,Function}</name>
+      <name since="">auto_attach(false)</name>
+      <name since="">auto_attach(Flags, Function)</name>
       <fsummary>Get and set when and how to attach to a process.</fsummary>
       <type>
 	<v>Flags = [init | break | exit]</v>
@@ -290,8 +290,8 @@ spawn(Module, Name, [Pid | Args])</pre>
     </func>
 
     <func>
-      <name>stack_trace() -> Flag</name>
-      <name>stack_trace(Flag)</name>
+      <name since="">stack_trace() -> Flag</name>
+      <name since="">stack_trace(Flag)</name>
       <fsummary>Get and set if and how to save call frames.</fsummary>
       <type>
 	<v>Flag = all | no_tail | false</v>
@@ -322,7 +322,7 @@ spawn(Module, Name, [Pid | Args])</pre>
     </func>
 
     <func>
-      <name>break(Module, Line) -> ok | {error,break_exists}</name>
+      <name since="">break(Module, Line) -> ok | {error,break_exists}</name>
       <fsummary>Create a breakpoint.</fsummary>
       <type>
 	<v>Module = atom()</v>
@@ -334,7 +334,7 @@ spawn(Module, Name, [Pid | Args])</pre>
     </func>
 
     <func>
-      <name>delete_break(Module, Line) -> ok</name>
+      <name since="">delete_break(Module, Line) -> ok</name>
       <fsummary>Delete a breakpoint.</fsummary>
       <type>
 	<v>Module = atom()</v>
@@ -346,7 +346,7 @@ spawn(Module, Name, [Pid | Args])</pre>
     </func>
 
     <func>
-      <name>break_in(Module, Name, Arity) -> ok
+      <name since="">break_in(Module, Name, Arity) -> ok
 	| {error,function_not_found}</name>
       <fsummary>Create breakpoints in the specified function.</fsummary>
       <type>
@@ -360,7 +360,7 @@ spawn(Module, Name, [Pid | Args])</pre>
     </func>
 
     <func>
-      <name>del_break_in(Module, Name, Arity) -> ok
+      <name since="">del_break_in(Module, Name, Arity) -> ok
 	| {error,function_not_found}</name>
       <fsummary>Delete breakpoints from the specified function.</fsummary>
       <type>
@@ -374,8 +374,8 @@ spawn(Module, Name, [Pid | Args])</pre>
     </func>
 
     <func>
-      <name>no_break() -> ok</name>
-      <name>no_break(Module) -> ok</name>
+      <name since="">no_break() -> ok</name>
+      <name since="">no_break(Module) -> ok</name>
       <fsummary>Delete all breakpoints.</fsummary>
       <desc>
 	<p>Deletes all breakpoints, or all breakpoints in <c>Module</c>.</p>
@@ -383,7 +383,7 @@ spawn(Module, Name, [Pid | Args])</pre>
     </func>
 
     <func>
-      <name>disable_break(Module, Line) -> ok</name>
+      <name since="">disable_break(Module, Line) -> ok</name>
       <fsummary>Make a breakpoint inactive.</fsummary>
       <type>
 	<v>Module = atom()</v>
@@ -395,7 +395,7 @@ spawn(Module, Name, [Pid | Args])</pre>
     </func>
 
     <func>
-      <name>enable_break(Module, Line) -> ok</name>
+      <name since="">enable_break(Module, Line) -> ok</name>
       <fsummary>Make a breakpoint active.</fsummary>
       <type>
 	<v>Module = atom()</v>
@@ -407,7 +407,7 @@ spawn(Module, Name, [Pid | Args])</pre>
     </func>
 
     <func>
-      <name>action_at_break(Module, Line, Action) -> ok</name>
+      <name since="">action_at_break(Module, Line, Action) -> ok</name>
       <fsummary>Set the trigger action of a breakpoint.</fsummary>
       <type>
 	<v>Module = atom()</v>
@@ -421,7 +421,7 @@ spawn(Module, Name, [Pid | Args])</pre>
     </func>
 
     <func>
-      <name>test_at_break(Module, Line, Function) -> ok</name>
+      <name since="">test_at_break(Module, Line, Function) -> ok</name>
       <fsummary>Set the conditional test of a breakpoint.</fsummary>
       <type>
 	<v>Module = atom()</v>
@@ -438,7 +438,7 @@ spawn(Module, Name, [Pid | Args])</pre>
     </func>
 
     <func>
-      <name>get_binding(Var, Bindings) -> {value,Value} | unbound</name>
+      <name since="">get_binding(Var, Bindings) -> {value,Value} | unbound</name>
       <fsummary>Retrieve a variable binding.</fsummary>
       <type>
 	<v>Var = atom()</v>
@@ -453,8 +453,8 @@ spawn(Module, Name, [Pid | Args])</pre>
     </func>
 
     <func>
-      <name>all_breaks() -> [Break]</name>
-      <name>all_breaks(Module) -> [Break]</name>
+      <name since="">all_breaks() -> [Break]</name>
+      <name since="">all_breaks(Module) -> [Break]</name>
       <fsummary>Get all breakpoints.</fsummary>
       <type>
 	<v>Break = {Point,Options}</v>
@@ -474,7 +474,7 @@ spawn(Module, Name, [Pid | Args])</pre>
     </func>
 
     <func>
-      <name>snapshot() -> [Snapshot]</name>
+      <name since="">snapshot() -> [Snapshot]</name>
       <fsummary>Get information about all processes executing interpreted
 	code.</fsummary>
       <type>
@@ -519,7 +519,7 @@ spawn(Module, Name, [Pid | Args])</pre>
     </func>
 
     <func>
-      <name>clear() -> ok</name>
+      <name since="">clear() -> ok</name>
       <fsummary>Clear information about processes executing interpreted
 	code.</fsummary>
       <desc>
@@ -529,8 +529,8 @@ spawn(Module, Name, [Pid | Args])</pre>
     </func>
 
     <func>
-      <name>continue(Pid) -> ok | {error,not_interpreted}</name>
-      <name>continue(X,Y,Z) -> ok | {error,not_interpreted}</name>
+      <name since="">continue(Pid) -> ok | {error,not_interpreted}</name>
+      <name since="">continue(X,Y,Z) -> ok | {error,not_interpreted}</name>
       <fsummary>Resume process execution.</fsummary>
       <type>
 	<v>Pid = pid()</v>
diff --git a/lib/debugger/doc/src/notes.xml b/lib/debugger/doc/src/notes.xml
index 395b69973d..795b46d467 100644
--- a/lib/debugger/doc/src/notes.xml
+++ b/lib/debugger/doc/src/notes.xml
@@ -33,6 +33,23 @@
   <p>This document describes the changes made to the Debugger
     application.</p>
 
+<section><title>Debugger 4.2.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    All incorrect (that is, all) uses of "can not" has been
+	    corrected to "cannot" in source code comments,
+	    documentation, examples, and so on.</p>
+          <p>
+	    Own Id: OTP-14282 Aux Id: PR-1891 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Debugger 4.2.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/debugger/src/dbg_icmd.erl b/lib/debugger/src/dbg_icmd.erl
index ac901c5469..0eb258567f 100644
--- a/lib/debugger/src/dbg_icmd.erl
+++ b/lib/debugger/src/dbg_icmd.erl
@@ -248,7 +248,7 @@ handle_int_msg({attached, AttPid}, Status, _Bs,
 	    tell_attached({attached, M, Line, get(trace)}),
 
 	    %% Give info about status and call level as well
-	    %% In this case, Status can not be exit_at
+	    %% In this case, Status cannot be exit_at
 	    Msg = case Status of
 		      idle -> {func_at,M,Line,Le};
 		      break -> {break_at,M,Line,Le};
diff --git a/lib/debugger/test/int_eval_SUITE.erl b/lib/debugger/test/int_eval_SUITE.erl
index 0542e45142..324a44bad8 100644
--- a/lib/debugger/test/int_eval_SUITE.erl
+++ b/lib/debugger/test/int_eval_SUITE.erl
@@ -285,7 +285,10 @@ do_eval(Config, Mod) ->
     DataDir = proplists:get_value(data_dir, Config),
     ok = file:set_cwd(DataDir),
 
-    {ok,Mod} = compile:file(Mod, [report,debug_info]),
+    %% Turn off type-based optimizations across function calls, as it
+    %% would turn many body-recursive calls into tail-recursive calls,
+    %% which would change the stacktrace.
+    {ok,Mod} = compile:file(Mod, [no_module_opt,report,debug_info]),
     {module,Mod} = code:load_file(Mod),
     CompiledRes = Mod:Mod(),
     ok = io:format("Compiled:\n~p", [CompiledRes]),
diff --git a/lib/debugger/vsn.mk b/lib/debugger/vsn.mk
index a3cbb497f8..daecc7594c 100644
--- a/lib/debugger/vsn.mk
+++ b/lib/debugger/vsn.mk
@@ -1 +1 @@
-DEBUGGER_VSN = 4.2.6
+DEBUGGER_VSN = 4.2.7
diff --git a/lib/dialyzer/doc/src/dialyzer.xml b/lib/dialyzer/doc/src/dialyzer.xml
index e34ffd6def..8dd814982d 100644
--- a/lib/dialyzer/doc/src/dialyzer.xml
+++ b/lib/dialyzer/doc/src/dialyzer.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2006</year><year>2017</year>
+      <year>2006</year><year>2019</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -29,7 +29,7 @@
     <rev></rev>
     <file>dialyzer.xml</file>
   </header>
-  <module>dialyzer</module>
+  <module since="">dialyzer</module>
   <modulesummary>Dialyzer, a DIscrepancy AnaLYZer for ERlang programs.
   </modulesummary>
   <description>
@@ -85,7 +85,7 @@ dialyzer --help</code>
 dialyzer [--add_to_plt] [--apps applications] [--build_plt]
          [--check_plt] [-Ddefine]* [-Dname] [--dump_callgraph file]
          [files_or_dirs] [--fullpath] [--get_warnings] [--gui] [--help]
-         [-I include_dir]* [--no_check_plt] [--no_native]
+         [-I include_dir]* [--no_check_plt] [--no_indentation] [--no_native]
          [--no_native_cache] [-o outfile] [--output_plt file] [-pa dir]*
          [--plt plt] [--plt_info] [--plts plt*] [--quiet] [-r dirs]
          [--raw] [--remove_from_plt] [--shell] [--src] [--statistics]
@@ -181,6 +181,11 @@ dialyzer --apps inets ssl ./ebin ../other_lib/ebin/my_module.beam</code>
         <p>Skip the PLT check when running Dialyzer. This is useful when
           working with installed PLTs that never change.</p>
       </item>
+      <tag><c>--no_indentation</c></tag>
+      <item>
+	<p>Do not insert line breaks in types, contracts, and Erlang
+	  Code when formatting warnings.</p>
+      </item>
       <tag><c>--no_native</c> (or <c>-nn</c>)</tag>
       <item>
         <p>Bypass the native code compilation of some key files that
@@ -472,21 +477,38 @@ dialyzer --plts plt_1 ... plt_n -- files_to_analyze</code>
 
   <funcs>
     <func>
-      <name>format_warning(Msg) -> string()</name>
+      <name since="">format_warning(Msg) -> string()</name>
+      <fsummary>Get the string version of a warning message.</fsummary>
+      <type>
+        <v>Msg = {Tag, Id, msg()}</v>
+        <d>See <c>run/1</c>.</d>
+      </type>
+      <desc>
+        <p>Get a string from warnings as returned by
+          <seealso marker="#run/1"><c>run/1</c></seealso>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name since="">format_warning(Msg, Options) -> string()</name>
       <fsummary>Get the string version of a warning message.</fsummary>
       <type>
         <v>Msg = {Tag, Id, msg()}</v>
         <d>See <c>run/1</c>.</d>
+        <v>Options = [{indent_opt, boolean()}]</v>
       </type>
       <desc>
         <p>Get a string from warnings as returned by
           <seealso marker="#run/1"><c>run/1</c></seealso>.</p>
+	<p>If <c>indent_opt</c> is set to <c>true</c> (default),
+          line breaks are inserted in types, contracts, and Erlang
+	  code to improve readability.</p>
       </desc>
     </func>
 
     <func>
-      <name>gui() -> ok | {error, Msg}</name>
-      <name>gui(OptList) -> ok | {error, Msg}</name>
+      <name since="">gui() -> ok | {error, Msg}</name>
+      <name since="">gui(OptList) -> ok | {error, Msg}</name>
       <fsummary>Dialyzer GUI version.</fsummary>
       <type>
         <v>OptList</v>
@@ -515,7 +537,10 @@ Option   :: {files,          [Filename :: string()]}
                              'plt_check' |
                              'plt_remove'}
           | {warnings,       [WarnOpts]}
-          | {get_warnings,   bool()}
+          | {get_warnings,   boolean()}
+          | {native,         boolean()}
+                               %% Defaults to false when invoked from Erlang
+          | {native_cache,   boolean()}
 
 WarnOpts :: error_handling
           | no_behaviours
@@ -539,7 +564,7 @@ WarnOpts :: error_handling
     </func>
 
     <func>
-      <name>plt_info(string()) -> {'ok', [{atom(), any()}]} | {'error', atom()}</name>
+      <name since="">plt_info(string()) -> {'ok', [{atom(), any()}]} | {'error', atom()}</name>
       <fsummary>Return information about the specified PLT.</fsummary>
       <desc>
         <p>Returns information about the specified PLT.</p>
@@ -547,7 +572,7 @@ WarnOpts :: error_handling
     </func>
 
     <func>
-      <name>run(OptList) -> Warnings</name>
+      <name since="">run(OptList) -> Warnings</name>
       <fsummary>Dialyzer command-line version.</fsummary>
       <type>
         <v>OptList</v>
diff --git a/lib/dialyzer/doc/src/notes.xml b/lib/dialyzer/doc/src/notes.xml
index 3cf776e566..dad9fd18c7 100644
--- a/lib/dialyzer/doc/src/notes.xml
+++ b/lib/dialyzer/doc/src/notes.xml
@@ -32,6 +32,134 @@
   <p>This document describes the changes made to the Dialyzer
     application.</p>
 
+<section><title>Dialyzer 4.0.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>The HiPE compiler would badly miscompile certain
+	    try/catch expressions, so it will now refuse to compile
+	    modules containing try or catch.</p> <p>As a consequence
+	    of this, <c>dialyzer</c> will no longer compile key
+	    modules to native code.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15949</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Dialyzer 4.0.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Make sure Dialyzer does not crash if the formatting
+	    of results fails. Instead of crashing, an unformatted
+	    version of the results is returned. </p>
+          <p>
+	    Own Id: OTP-15922 Aux Id: PR-2240, ERL-949 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Dialyzer 4.0.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fix a bug that caused a crash when indenting a
+	    Dialyzer warning mentioning more than one record field.
+	    </p>
+          <p>
+	    Own Id: OTP-15861 Aux Id: ERL-953 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Dialyzer 4.0</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    All incorrect (that is, all) uses of "can not" has been
+	    corrected to "cannot" in source code comments,
+	    documentation, examples, and so on.</p>
+          <p>
+	    Own Id: OTP-14282 Aux Id: PR-1891 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> By default Dialyzer inserts line breaks in types,
+	    contracts, and Erlang Code when formatting results. Use
+	    the new <c>--no_indentation</c> option to get the old
+	    behavior of not inserting line breaks. </p>
+          <p>
+	    Own Id: OTP-15135</p>
+        </item>
+        <item>
+	    <p> Use bit syntax in warnings instead of Core Erlang
+	    syntax, for readability. </p>
+          <p>
+	    Own Id: OTP-15752</p>
+        </item>
+        <item>
+	    <p> The format of the raw analysis result tagged with
+	    <c>fun_app_args</c> is changed to <c>{fun_app_args,
+	    [ArgNs, Args, Type]}</c>. </p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15779</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Dialyzer 3.3.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fix a bug that caused Dialyzer to crash when
+	    analyzing a contract with a module name differing from
+	    the analyzed module's name. The bug was introduced in
+	    Erlang/OTP 18. </p>
+          <p>
+	    Own Id: OTP-15562 Aux Id: ERL-845 </p>
+        </item>
+        <item>
+	    <p> Fix a bug in the handling of the <c>Key</c> argument
+	    of <c>lists:{keysearch, keyfind, keymember}</c>. </p>
+          <p>
+	    Own Id: OTP-15570</p>
+        </item>
+        <item>
+	    <p>Optimize (again) Dialyzer's handling of
+	    left-associative use of <c>andalso</c> and <c>orelse</c>
+	    in guards.</p>
+          <p>
+	    Own Id: OTP-15577 Aux Id: ERL-851, PR-2141, PR-1944 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Dialyzer 3.3.1</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile
index fc08e7ca2f..bddd761705 100644
--- a/lib/dialyzer/src/Makefile
+++ b/lib/dialyzer/src/Makefile
@@ -90,8 +90,10 @@ APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
 
 ifeq ($(NATIVE_LIBS_ENABLED),yes)
 ERL_COMPILE_FLAGS += +native
+else
+ERL_COMPILE_FLAGS += -Werror
 endif
-ERL_COMPILE_FLAGS += +warn_export_vars +warn_unused_import +warn_untyped_record +warn_missing_spec +warnings_as_errors
+ERL_COMPILE_FLAGS += +warn_export_vars +warn_unused_import +warn_untyped_record +warn_missing_spec
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/dialyzer/src/dialyzer.erl b/lib/dialyzer/src/dialyzer.erl
index 185c8c9ae6..c1bc5ff597 100644
--- a/lib/dialyzer/src/dialyzer.erl
+++ b/lib/dialyzer/src/dialyzer.erl
@@ -280,20 +280,23 @@ cl_check_log(Output) ->
 format_warning(W) ->
   format_warning(W, basename).
 
--spec format_warning(raw_warning() | dial_warning(), fopt()) -> string().
-
-format_warning({Tag, {File, Line, _MFA}, Msg}, FOpt) ->
-  format_warning({Tag, {File, Line}, Msg}, FOpt);
-format_warning({_Tag, {File, Line}, Msg}, FOpt) when is_list(File),
+-spec format_warning(raw_warning() | dial_warning(),
+                     fopt() | proplists:proplist()) -> string().
+
+format_warning(RawWarning, FOpt) when is_atom(FOpt) ->
+  format_warning(RawWarning, [{filename_opt, FOpt}]);
+format_warning({Tag, {File, Line, _MFA}, Msg}, Opts) ->
+  format_warning({Tag, {File, Line}, Msg}, Opts);
+format_warning({_Tag, {File, Line}, Msg}, Opts) when is_list(File),
                                                      is_integer(Line) ->
-  F = case FOpt of
+  F = case proplists:get_value(filename_opt, Opts, basename) of
 	fullpath -> File;
 	basename -> filename:basename(File)
       end,
-  String = lists:flatten(message_to_string(Msg)),
+  Indent = proplists:get_value(indent_opt, Opts, ?INDENT_OPT),
+  String = message_to_string(Msg, Indent),
   lists:flatten(io_lib:format("~ts:~w: ~ts", [F, Line, String])).
 
-
 %%-----------------------------------------------------------------------------
 %% Message classification and pretty-printing below. Messages appear in
 %% categories and in more or less alphabetical ordering within each category.
@@ -301,52 +304,60 @@ format_warning({_Tag, {File, Line}, Msg}, FOpt) when is_list(File),
 
 %%----- Warnings for general discrepancies ----------------
 message_to_string({apply, [Args, ArgNs, FailReason,
-			   SigArgs, SigRet, Contract]}) ->
-  io_lib:format("Fun application with arguments ~ts ", [Args]) ++
-    call_or_apply_to_string(ArgNs, FailReason, SigArgs, SigRet, Contract);
-message_to_string({app_call, [M, F, Args, Culprit, ExpectedType, FoundType]}) ->
+			   SigArgs, SigRet, Contract]}, I) ->
+  io_lib:format("Fun application with arguments ~ts ", [a(Args, I)]) ++
+    call_or_apply_to_string(ArgNs, FailReason, SigArgs, SigRet, Contract, I);
+message_to_string({app_call, [M, F, Args, Culprit, ExpectedType, FoundType]},
+                  I) ->
   io_lib:format("The call ~s:~ts~ts requires that ~ts is of type ~ts not ~ts\n",
-		[M, F, Args, Culprit, ExpectedType, FoundType]);
-message_to_string({bin_construction, [Culprit, Size, Seg, Type]}) ->
+		[M, F, a(Args, I), c(Culprit, I),
+                 t(ExpectedType, I), t(FoundType, I)]);
+message_to_string({bin_construction, [Culprit, Size, Seg, Type]}, I) ->
   io_lib:format("Binary construction will fail since the ~s field ~s in"
-		" segment ~s has type ~s\n", [Culprit, Size, Seg, Type]);
+		" segment ~s has type ~s\n",
+                [Culprit, c(Size, I), c(Seg, I), t(Type, I)]);
 message_to_string({call, [M, F, Args, ArgNs, FailReason,
-			  SigArgs, SigRet, Contract]}) ->
-  io_lib:format("The call ~w:~tw~ts ", [M, F, Args]) ++
-    call_or_apply_to_string(ArgNs, FailReason, SigArgs, SigRet, Contract);
-message_to_string({call_to_missing, [M, F, A]}) ->
+			  SigArgs, SigRet, Contract]}, I) ->
+  io_lib:format("The call ~w:~tw~ts ", [M, F, a(Args, I)]) ++
+    call_or_apply_to_string(ArgNs, FailReason, SigArgs, SigRet, Contract, I);
+message_to_string({call_to_missing, [M, F, A]}, _I) ->
   io_lib:format("Call to missing or unexported function ~w:~tw/~w\n",
                 [M, F, A]);
-message_to_string({exact_eq, [Type1, Op, Type2]}) ->
+message_to_string({exact_eq, [Type1, Op, Type2]}, I) ->
   io_lib:format("The test ~ts ~s ~ts can never evaluate to 'true'\n",
-		[Type1, Op, Type2]);
-message_to_string({fun_app_args, [Args, Type]}) ->
+		[t(Type1, I), Op, t(Type2, I)]);
+message_to_string({fun_app_args, [ArgNs, Args, Type]}, I) ->
+  PositionString = form_position_string(ArgNs),
   io_lib:format("Fun application with arguments ~ts will fail"
-		" since the function has type ~ts\n", [Args, Type]);
-message_to_string({fun_app_no_fun, [Op, Type, Arity]}) ->
+		" since the function has type ~ts,"
+                " which differs in the ~s argument\n",
+                [a(Args, I), t(Type, I), PositionString]);
+message_to_string({fun_app_no_fun, [Op, Type, Arity]}, I) ->
   io_lib:format("Fun application will fail since ~ts :: ~ts"
-		" is not a function of arity ~w\n", [Op, Type, Arity]);
-message_to_string({guard_fail, []}) ->
+		" is not a function of arity ~w\n", [Op, t(Type, I), Arity]);
+message_to_string({guard_fail, []}, _I) ->
   "Clause guard cannot succeed.\n";
-message_to_string({guard_fail, [Arg1, Infix, Arg2]}) ->
-  io_lib:format("Guard test ~ts ~s ~ts can never succeed\n", [Arg1, Infix, Arg2]);
-message_to_string({map_update, [Type, Key]}) ->
+message_to_string({guard_fail, [Arg1, Infix, Arg2]}, I) ->
+  io_lib:format("Guard test ~ts ~s ~ts can never succeed\n",
+                [a(Arg1, I), Infix, a(Arg2, I)]); % a/2 rather than c/2
+message_to_string({map_update, [Type, Key]}, I) ->
   io_lib:format("A key of type ~ts cannot exist "
-		"in a map of type ~ts\n", [Key, Type]);
-message_to_string({neg_guard_fail, [Arg1, Infix, Arg2]}) ->
+		"in a map of type ~ts\n", [t(Key, I), t(Type, I)]);
+message_to_string({neg_guard_fail, [Arg1, Infix, Arg2]}, I) ->
   io_lib:format("Guard test not(~ts ~s ~ts) can never succeed\n",
-		[Arg1, Infix, Arg2]);
-message_to_string({guard_fail, [Guard, Args]}) ->
-  io_lib:format("Guard test ~w~ts can never succeed\n", [Guard, Args]);
-message_to_string({neg_guard_fail, [Guard, Args]}) ->
-  io_lib:format("Guard test not(~w~ts) can never succeed\n", [Guard, Args]);
-message_to_string({guard_fail_pat, [Pat, Type]}) ->
+		[a(Arg1, I), Infix, a(Arg2, I)]); % a/2 rather than c/2
+message_to_string({guard_fail, [Guard, Args]}, I) ->
+  io_lib:format("Guard test ~s~ts can never succeed\n", [Guard, a(Args, I)]);
+message_to_string({neg_guard_fail, [Guard, Args]}, I) ->
+  io_lib:format("Guard test not(~s~ts) can never succeed\n",
+                [Guard, a(Args, I)]);
+message_to_string({guard_fail_pat, [Pat, Type]}, I) ->
   io_lib:format("Clause guard cannot succeed. The ~ts was matched"
-		" against the type ~ts\n", [Pat, Type]);
-message_to_string({improper_list_constr, [TlType]}) ->
+		" against the type ~ts\n", [ps(Pat, I), t(Type, I)]);
+message_to_string({improper_list_constr, [TlType]}, I) ->
   io_lib:format("Cons will produce an improper list"
-		" since its 2nd argument is ~ts\n", [TlType]);
-message_to_string({no_return, [Type|Name]}) ->
+		" since its 2nd argument is ~ts\n", [t(TlType, I)]);
+message_to_string({no_return, [Type|Name]}, _I) ->
   NameString =
     case Name of
       [] -> "The created fun ";
@@ -358,135 +369,150 @@ message_to_string({no_return, [Type|Name]}) ->
     only_normal -> NameString ++ "has no local return\n";
     both -> NameString ++ "has no local return\n"
   end;
-message_to_string({record_constr, [RecConstr, FieldDiffs]}) ->
+message_to_string({record_constr, [RecConstr, FieldDiffs]}, I) ->
   io_lib:format("Record construction ~ts violates the"
-		" declared type of field ~ts\n", [RecConstr, FieldDiffs]);
-message_to_string({record_constr, [Name, Field, Type]}) ->
+		" declared type of field ~ts\n",
+                [t(RecConstr, I), field_diffs(FieldDiffs, I)]);
+message_to_string({record_constr, [Name, Field, Type]}, I) ->
   io_lib:format("Record construction violates the declared type for #~tw{}"
-		" since ~ts cannot be of type ~ts\n", [Name, Field, Type]);
-message_to_string({record_matching, [String, Name]}) ->
+		" since ~ts cannot be of type ~ts\n",
+                [Name, ps(Field, I), t(Type, I)]);
+message_to_string({record_matching, [String, Name]}, I) ->
   io_lib:format("The ~ts violates the"
-		" declared type for #~tw{}\n", [String, Name]);
-message_to_string({record_match, [Pat, Type]}) ->
+		" declared type for #~tw{}\n", [rec_type(String, I), Name]);
+message_to_string({record_match, [Pat, Type]}, I) ->
   io_lib:format("Matching of ~ts tagged with a record name violates"
-                " the declared type of ~ts\n", [Pat, Type]);
-message_to_string({pattern_match, [Pat, Type]}) ->
-  io_lib:format("The ~ts can never match the type ~ts\n", [Pat, Type]);
-message_to_string({pattern_match_cov, [Pat, Type]}) ->
+                " the declared type of ~ts\n", [ps(Pat, I), t(Type, I)]);
+message_to_string({pattern_match, [Pat, Type]}, I) ->
+  io_lib:format("The ~ts can never match the type ~ts\n",
+                [ps(Pat, I), t(Type, I)]);
+message_to_string({pattern_match_cov, [Pat, Type]}, I) ->
   io_lib:format("The ~ts can never match since previous"
 		" clauses completely covered the type ~ts\n",
-		[Pat, Type]);
-message_to_string({unmatched_return, [Type]}) ->
+		[ps(Pat, I), t(Type, I)]);
+message_to_string({unmatched_return, [Type]}, I) ->
   io_lib:format("Expression produces a value of type ~ts,"
-		" but this value is unmatched\n", [Type]);
-message_to_string({unused_fun, [F, A]}) ->
+		" but this value is unmatched\n", [t(Type, I)]);
+message_to_string({unused_fun, [F, A]}, _I) ->
   io_lib:format("Function ~tw/~w will never be called\n", [F, A]);
 %%----- Warnings for specs and contracts -------------------
-message_to_string({contract_diff, [M, F, _A, Contract, Sig]}) ->
-  io_lib:format("Type specification ~w:~tw~ts"
-		" is not equal to the success typing: ~w:~tw~ts\n",
-		[M, F, Contract, M, F, Sig]);
-message_to_string({contract_subtype, [M, F, _A, Contract, Sig]}) ->
-  io_lib:format("Type specification ~w:~tw~ts"
-		" is a subtype of the success typing: ~w:~tw~ts\n",
-		[M, F, Contract, M, F, Sig]);
-message_to_string({contract_supertype, [M, F, _A, Contract, Sig]}) ->
-  io_lib:format("Type specification ~w:~tw~ts"
-		" is a supertype of the success typing: ~w:~tw~ts\n",
-		[M, F, Contract, M, F, Sig]);
-message_to_string({contract_range, [Contract, M, F, ArgStrings, Line, CRet]}) ->
-  io_lib:format("The contract ~w:~tw~ts cannot be right because the inferred"
+message_to_string({contract_diff, [M, F, _A, Contract, Sig]}, I) ->
+  io_lib:format("Type specification ~ts"
+		" is not equal to the success typing: ~ts\n",
+		[con(M, F, Contract, I), con(M, F, Sig, I)]);
+message_to_string({contract_subtype, [M, F, _A, Contract, Sig]}, I) ->
+  io_lib:format("Type specification ~ts"
+		" is a subtype of the success typing: ~ts\n",
+		[con(M, F, Contract, I), con(M, F, Sig, I)]);
+message_to_string({contract_supertype, [M, F, _A, Contract, Sig]}, I) ->
+  io_lib:format("Type specification ~ts"
+		" is a supertype of the success typing: ~ts\n",
+		[con(M, F, Contract, I), con(M, F, Sig, I)]);
+message_to_string({contract_range, [Contract, M, F, ArgStrings, Line, CRet]},
+                 I) ->
+  io_lib:format("The contract ~ts cannot be right because the inferred"
 		" return for ~tw~ts on line ~w is ~ts\n",
-		[M, F, Contract, F, ArgStrings, Line, CRet]);
-message_to_string({invalid_contract, [M, F, A, Sig]}) ->
+		[con(M, F, Contract, I), F, a(ArgStrings, I), Line, t(CRet, I)]);
+message_to_string({invalid_contract, [M, F, A, Sig]}, I) ->
   io_lib:format("Invalid type specification for function ~w:~tw/~w."
-		" The success typing is ~ts\n", [M, F, A, Sig]);
-message_to_string({contract_with_opaque, [M, F, A, OpaqueType, SigType]}) ->
+		" The success typing is ~ts\n", [M, F, A, sig(Sig, I)]);
+message_to_string({contract_with_opaque, [M, F, A, OpaqueType, SigType]},
+                 I) ->
   io_lib:format("The specification for ~w:~tw/~w"
                 " has an opaque subtype ~ts which is violated by the"
-                " success typing ~ts\n", [M, F, A, OpaqueType, SigType]);
-message_to_string({extra_range, [M, F, A, ExtraRanges, SigRange]}) ->
+                " success typing ~ts\n",
+                [M, F, A, t(OpaqueType, I), sig(SigType, I)]);
+message_to_string({extra_range, [M, F, A, ExtraRanges, SigRange]}, I) ->
   io_lib:format("The specification for ~w:~tw/~w states that the function"
 		" might also return ~ts but the inferred return is ~ts\n",
-		[M, F, A, ExtraRanges, SigRange]);
-message_to_string({missing_range, [M, F, A, ExtraRanges, ContrRange]}) ->
+		[M, F, A, t(ExtraRanges, I), t(SigRange, I)]);
+message_to_string({missing_range, [M, F, A, ExtraRanges, ContrRange]}, I) ->
   io_lib:format("The success typing for ~w:~tw/~w implies that the function"
 		" might also return ~ts but the specification return is ~ts\n",
-		[M, F, A, ExtraRanges, ContrRange]);
-message_to_string({overlapping_contract, [M, F, A]}) ->
+		[M, F, A, t(ExtraRanges, I), t(ContrRange, I)]);
+message_to_string({overlapping_contract, [M, F, A]}, _I) ->
   io_lib:format("Overloaded contract for ~w:~tw/~w has overlapping domains;"
 		" such contracts are currently unsupported and are simply ignored\n",
 		[M, F, A]);
-message_to_string({spec_missing_fun, [M, F, A]}) ->
+message_to_string({spec_missing_fun, [M, F, A]}, _I) ->
   io_lib:format("Contract for function that does not exist: ~w:~tw/~w\n",
 		[M, F, A]);
 %%----- Warnings for opaque type violations -------------------
-message_to_string({call_with_opaque, [M, F, Args, ArgNs, ExpArgs]}) ->
+message_to_string({call_with_opaque, [M, F, Args, ArgNs, ExpArgs]}, I) ->
   io_lib:format("The call ~w:~tw~ts contains ~ts when ~ts\n",
-		[M, F, Args, form_positions(ArgNs), form_expected(ExpArgs)]);
-message_to_string({call_without_opaque, [M, F, Args, ExpectedTriples]}) ->
+		[M, F, a(Args, I), form_positions(ArgNs),
+                 form_expected(ExpArgs, I)]);
+message_to_string({call_without_opaque, [M, F, Args, ExpectedTriples]}, I) ->
   io_lib:format("The call ~w:~tw~ts does not have ~ts\n",
-		[M, F, Args, form_expected_without_opaque(ExpectedTriples)]);
-message_to_string({opaque_eq, [Type, _Op, OpaqueType]}) ->
+		[M, F, a(Args, I),
+                 form_expected_without_opaque(ExpectedTriples, I)]);
+message_to_string({opaque_eq, [Type, _Op, OpaqueType]}, I) ->
   io_lib:format("Attempt to test for equality between a term of type ~ts"
-		" and a term of opaque type ~ts\n", [Type, OpaqueType]);
-message_to_string({opaque_guard, [Arg1, Infix, Arg2, ArgNs]}) ->
+		" and a term of opaque type ~ts\n",
+                [t(Type, I), t(OpaqueType, I)]);
+message_to_string({opaque_guard, [Arg1, Infix, Arg2, ArgNs]}, I) ->
   io_lib:format("Guard test ~ts ~s ~ts contains ~s\n",
-		[Arg1, Infix, Arg2, form_positions(ArgNs)]);
-message_to_string({opaque_guard, [Guard, Args]}) ->
+		[a(Arg1, I), Infix, a(Arg2, I), form_positions(ArgNs)]);
+message_to_string({opaque_guard, [Guard, Args]}, I) ->
   io_lib:format("Guard test ~w~ts breaks the opacity of its argument\n",
-		[Guard, Args]);
-message_to_string({opaque_match, [Pat, OpaqueType, OpaqueTerm]}) ->
+		[Guard, a(Args, I)]);
+message_to_string({opaque_match, [Pat, OpaqueType, OpaqueTerm]}, I) ->
   Term = if OpaqueType =:= OpaqueTerm -> "the term";
-	    true -> OpaqueTerm
+	    true -> t(OpaqueTerm, I)
 	 end,
-  io_lib:format("The attempt to match a term of type ~s against the ~ts"
-		" breaks the opacity of ~ts\n", [OpaqueType, Pat, Term]);
-message_to_string({opaque_neq, [Type, _Op, OpaqueType]}) ->
+  io_lib:format("The attempt to match a term of type ~ts against the ~ts"
+		" breaks the opacity of ~ts\n",
+                [t(OpaqueType, I), ps(Pat, I), Term]);
+message_to_string({opaque_neq, [Type, _Op, OpaqueType]}, I) ->
   io_lib:format("Attempt to test for inequality between a term of type ~ts"
-		" and a term of opaque type ~ts\n", [Type, OpaqueType]);
-message_to_string({opaque_type_test, [Fun, Args, Arg, ArgType]}) ->
+		" and a term of opaque type ~ts\n",
+                [t(Type, I), t(OpaqueType, I)]);
+message_to_string({opaque_type_test, [Fun, Args, Arg, ArgType]}, I) ->
   io_lib:format("The type test ~ts~ts breaks the opacity of the term ~ts~ts\n",
-                [Fun, Args, Arg, ArgType]);
-message_to_string({opaque_size, [SizeType, Size]}) ->
+                [Fun, a(Args, I), Arg, t(ArgType, I)]);
+message_to_string({opaque_size, [SizeType, Size]}, I) ->
   io_lib:format("The size ~ts breaks the opacity of ~ts\n",
-                [SizeType, Size]);
-message_to_string({opaque_call, [M, F, Args, Culprit, OpaqueType]}) ->
+                [t(SizeType, I), c(Size, I)]);
+message_to_string({opaque_call, [M, F, Args, Culprit, OpaqueType]}, I) ->
   io_lib:format("The call ~s:~ts~ts breaks the opacity of the term ~ts :: ~ts\n",
-                [M, F, Args, Culprit, OpaqueType]);
+                [M, F, a(Args, I), c(Culprit, I), t(OpaqueType, I)]);
 %%----- Warnings for concurrency errors --------------------
-message_to_string({race_condition, [M, F, Args, Reason]}) ->
-  io_lib:format("The call ~w:~tw~ts ~ts\n", [M, F, Args, Reason]);
+message_to_string({race_condition, [M, F, Args, Reason]}, I) ->
+  %% There is a possibly huge type in Reason.
+  io_lib:format("The call ~w:~tw~ts ~ts\n", [M, F, a(Args, I), Reason]);
 %%----- Warnings for behaviour errors --------------------
-message_to_string({callback_type_mismatch, [B, F, A, ST, CT]}) ->
-  io_lib:format("The inferred return type of ~tw/~w (~ts) has nothing in"
+message_to_string({callback_type_mismatch, [B, F, A, ST, CT]}, I) ->
+  io_lib:format("The inferred return type of ~tw/~w ~ts has nothing in"
                 " common with ~ts, which is the expected return type for"
-                " the callback of the ~w behaviour\n", [F, A, ST, CT, B]);
-message_to_string({callback_arg_type_mismatch, [B, F, A, N, ST, CT]}) ->
+                " the callback of the ~w behaviour\n",
+                [F, A, t("("++ST++")", I), t(CT, I), B]);
+message_to_string({callback_arg_type_mismatch, [B, F, A, N, ST, CT]}, I) ->
   io_lib:format("The inferred type for the ~s argument of ~tw/~w (~ts) is"
 		" not a supertype of ~ts, which is expected type for this"
 		" argument in the callback of the ~w behaviour\n",
-		[ordinal(N), F, A, ST, CT, B]);
-message_to_string({callback_spec_type_mismatch, [B, F, A, ST, CT]}) ->
+		[ordinal(N), F, A, t(ST, I), t(CT, I), B]);
+message_to_string({callback_spec_type_mismatch, [B, F, A, ST, CT]}, I) ->
   io_lib:format("The return type ~ts in the specification of ~tw/~w is not a"
 		" subtype of ~ts, which is the expected return type for the"
-		" callback of the ~w behaviour\n", [ST, F, A, CT, B]);
-message_to_string({callback_spec_arg_type_mismatch, [B, F, A, N, ST, CT]}) ->
+		" callback of the ~w behaviour\n",
+                [t(ST, I), F, A, t(CT, I), B]);
+message_to_string({callback_spec_arg_type_mismatch, [B, F, A, N, ST, CT]},
+                  I) ->
   io_lib:format("The specified type for the ~ts argument of ~tw/~w (~ts) is"
 		" not a supertype of ~ts, which is expected type for this"
 		" argument in the callback of the ~w behaviour\n",
-		[ordinal(N), F, A, ST, CT, B]);
-message_to_string({callback_missing, [B, F, A]}) ->
+		[ordinal(N), F, A, t(ST, I), t(CT, I), B]);
+message_to_string({callback_missing, [B, F, A]}, _I) ->
   io_lib:format("Undefined callback function ~tw/~w (behaviour ~w)\n",
 		[F, A, B]);
-message_to_string({callback_info_missing, [B]}) ->
+message_to_string({callback_info_missing, [B]}, _I) ->
   io_lib:format("Callback info about the ~w behaviour is not available\n", [B]);
 %%----- Warnings for unknown functions, types, and behaviours -------------
-message_to_string({unknown_type, {M, F, A}}) ->
+message_to_string({unknown_type, {M, F, A}}, _I) ->
   io_lib:format("Unknown type ~w:~tw/~w", [M, F, A]);
-message_to_string({unknown_function, {M, F, A}}) ->
+message_to_string({unknown_function, {M, F, A}}, _I) ->
   io_lib:format("Unknown function ~w:~tw/~w", [M, F, A]);
-message_to_string({unknown_behaviour, B}) ->
+message_to_string({unknown_behaviour, B}, _I) ->
   io_lib:format("Unknown behaviour ~w", [B]).
 
 %%-----------------------------------------------------------------------------
@@ -494,7 +520,7 @@ message_to_string({unknown_behaviour, B}) ->
 %%-----------------------------------------------------------------------------
 
 call_or_apply_to_string(ArgNs, FailReason, SigArgs, SigRet,
-			{IsOverloaded, Contract}) ->
+			{IsOverloaded, Contract}, I) ->
   PositionString = form_position_string(ArgNs),
   case FailReason of
     only_sig ->
@@ -502,24 +528,25 @@ call_or_apply_to_string(ArgNs, FailReason, SigArgs, SigRet,
 	true ->
 	  %% We do not know which argument(s) caused the failure
 	  io_lib:format("will never return since the success typing arguments"
-			" are ~ts\n", [SigArgs]);
+			" are ~ts\n", [t(SigArgs, I)]);
         false ->
 	  io_lib:format("will never return since it differs in the ~s argument"
 			" from the success typing arguments: ~ts\n",
-			[PositionString, SigArgs])
+			[PositionString, t(SigArgs, I)])
       end;
     only_contract ->
       case (ArgNs =:= []) orelse IsOverloaded of
 	true ->
 	  %% We do not know which arguments caused the failure
-	  io_lib:format("breaks the contract ~ts\n", [Contract]);
+	  io_lib:format("breaks the contract ~ts\n", [sig(Contract, I)]);
 	false ->
 	  io_lib:format("breaks the contract ~ts in the ~s argument\n",
-			[Contract, PositionString])
+			[sig(Contract, I), PositionString])
       end;
     both ->
       io_lib:format("will never return since the success typing is ~ts -> ~ts"
-		    " and the contract is ~ts\n", [SigArgs, SigRet, Contract])
+		    " and the contract is ~ts\n",
+                    [t(SigArgs, I), t(SigRet, I), sig(Contract, I)])
   end.
 
 form_positions(ArgNs) ->
@@ -534,24 +561,27 @@ form_positions(ArgNs) ->
 
 %% We know which positions N are to blame;
 %% the list of triples will never be empty.
-form_expected_without_opaque([{N, T, TStr}]) ->
+form_expected_without_opaque([{N, T, TStr}], I) ->
   case erl_types:t_is_opaque(T) of
     true  ->
-      io_lib:format("an opaque term of type ~ts as ", [TStr]);
+      io_lib:format("an opaque term of type ~ts as ", [t(TStr, I)]);
     false ->
-      io_lib:format("a term of type ~ts (with opaque subterms) as ", [TStr])
+      io_lib:format("a term of type ~ts (with opaque subterms) as ",
+                    [t(TStr, I)])
   end ++ form_position_string([N]) ++ " argument";
-form_expected_without_opaque(ExpectedTriples) -> %% TODO: can do much better here
+form_expected_without_opaque(ExpectedTriples, _I) -> %% TODO: can do much better here
   {ArgNs, _Ts, _TStrs} = lists:unzip3(ExpectedTriples),
   "opaque terms as " ++ form_position_string(ArgNs) ++ " arguments".
 
-form_expected(ExpectedArgs) ->
+form_expected(ExpectedArgs, I) ->
   case ExpectedArgs of
     [T] ->
       TS = erl_types:t_to_string(T),
       case erl_types:t_is_opaque(T) of
-	true  -> io_lib:format("an opaque term of type ~ts is expected", [TS]);
-	false -> io_lib:format("a structured term of type ~ts is expected", [TS])
+	true  -> io_lib:format("an opaque term of type ~ts is expected",
+                               [t(TS, I)]);
+	false -> io_lib:format("a structured term of type ~ts is expected",
+                               [t(TS, I)])
       end;
     [_,_|_] -> "terms of different types are expected in these positions"
   end.
@@ -571,3 +601,155 @@ ordinal(1) -> "1st";
 ordinal(2) -> "2nd";
 ordinal(3) -> "3rd";
 ordinal(N) when is_integer(N) -> io_lib:format("~wth", [N]).
+
+%% Functions that parse type strings, literal strings, and contract
+%% strings. Return strings formatted by erl_pp.
+
+%% Note we always have to catch any error when trying to parse
+%% the syntax because other BEAM languages may not emit an
+%% Erlang AST that transforms into valid Erlang Source Code.
+
+-define(IND, 10).
+
+con(M, F, Src, I) ->
+  S = sig(Src, I),
+  io_lib:format("~w:~tw~ts", [M, F, S]).
+
+sig(Src, false) ->
+  Src;
+sig(Src, true) ->
+  try
+    Str = lists:flatten(io_lib:format("-spec ~w:~tw~ts.", [a, b, Src])),
+    {ok, Tokens, _EndLocation} = erl_scan:string(Str),
+    {ok, {attribute, _, spec, {_MFA, Types}}} =
+      erl_parse:parse_form(Tokens),
+    indentation(?IND) ++ pp_spec(Types)
+  catch
+    _:_ -> Src
+  end.
+
+%% Argument(list)s are a mix of types and Erlang code. Note: sometimes
+%% (contract_range, call_without_opaque, opaque_type_test), the initial
+%% newline is a bit out of place.
+a(""=Args, _I) ->
+  Args;
+a(Args, I) ->
+  t(Args, I).
+
+c(Cerl, _I) ->
+  Cerl.
+
+field_diffs(Src, false) ->
+  Src;
+field_diffs(Src, true) ->
+  Fields = string:split(Src, " and ", all),
+  lists:join(" and ", [field_diff(Field) || Field <- Fields]).
+
+field_diff(Field) ->
+  [F | Ts] = string:split(Field, "::", all),
+  F ++ " ::" ++ t(lists:flatten(lists:join("::", Ts)), true).
+
+rec_type("record "++Src, I) ->
+  "record " ++ t(Src, I).
+
+%% "variable"/"pattern" ++ cerl
+ps("pattern "++Src, I) ->
+  "pattern " ++ t(Src, I);
+ps("variable "++_=Src, _I) ->
+  Src;
+ps("record field"++Rest, I) ->
+  [S, TypeStr] = string:split(Rest, "of type ", all),
+  "record field" ++ S ++ "of type " ++ t(TypeStr, I).
+
+%% Scan and parse a type or a literal, and pretty-print it using erl_pp.
+t(Src, false) ->
+  Src;
+t("("++_=Src, true) ->
+  ts(Src);
+t(Src, true) ->
+  %% Binary types and products both start with a $<.
+  try parse_type_or_literal(Src) of
+    TypeOrLiteral ->
+      indentation(?IND) ++ pp_type(TypeOrLiteral)
+  catch
+    _:_ ->
+      ts(Src)
+  end.
+
+ts(Src) ->
+  Ind = indentation(?IND),
+  [C1|Src1] = Src, % $< (product) or $( (arglist)
+  [C2|RevSrc2] = lists:reverse(Src1),
+  Src2 = lists:reverse(RevSrc2),
+  try
+    Types = parse_types_and_literals(Src2),
+    CommaInd = [$, | Ind],
+    (indentation(?IND-1) ++
+     [C1 | lists:join(CommaInd, [pp_type(Type) || Type <- Types])] ++
+     [C2])
+  catch
+    _:_ -> Src
+  end.
+
+indentation(I) ->
+  [$\n | lists:duplicate(I, $\s)].
+
+pp_type(Type) ->
+  Form = {attribute, erl_anno:new(0), type, {t, Type, []}},
+  TypeDef = erl_pp:form(Form, [{quote_singleton_atom_types, true}]),
+  {match, [S]} = re:run(TypeDef, <<"::\\s*(.*)\\.\\n*">>,
+                        [{capture, all_but_first, list}, dotall]),
+  S.
+
+pp_spec(Spec) ->
+  Form = {attribute, erl_anno:new(0), spec, {{a,b,0}, Spec}},
+  Sig = erl_pp:form(Form, [{quote_singleton_atom_types, true}]),
+  {match, [S]} = re:run(Sig, <<"-spec a:b\\s*(.*)\\.\\n*">>,
+                        [{capture, all_but_first, list}, dotall]),
+  S.
+
+parse_types_and_literals(Src) ->
+  {ok, Tokens, _EndLocation} = erl_scan:string(Src),
+  [parse_a_type_or_literal(Ts) || Ts <- types(Tokens)].
+
+parse_type_or_literal(Src) ->
+  {ok, Tokens, _EndLocation} = erl_scan:string(Src),
+  parse_a_type_or_literal(Tokens).
+
+parse_a_type_or_literal(Ts0) ->
+  L = erl_anno:new(1),
+  Ts = Ts0 ++ [{dot,L}],
+  Tokens = [{'-',L}, {atom,L,type}, {atom,L,t}, {'(',L}, {')',L},
+            {'::',L}] ++ Ts,
+  case erl_parse:parse_form(Tokens) of
+      {ok, {attribute, _, type, {t, Type, []}}} ->
+          Type;
+      {error, _} ->
+          %% literal
+          {ok, [T]} = erl_parse:parse_exprs(Ts),
+          T
+  end.
+
+types([]) -> [];
+types(Ts) ->
+    {Ts0, Ts1} = one_type(Ts, [], []),
+    [Ts0 | types(Ts1)].
+
+one_type([], [], Ts) ->
+    {lists:reverse(Ts), []};
+one_type([{',', _Lc}|Toks], [], Ts0) ->
+    {lists:reverse(Ts0), Toks};
+one_type([{')', Lrp}|Toks], [], Ts0) ->
+    {lists:reverse(Ts0), [{')', Lrp}|Toks]};
+one_type([{'(', Llp}|Toks], E, Ts0) ->
+    one_type(Toks, [')'|E], [{'(', Llp}|Ts0]);
+one_type([{'<<', Lls}|Toks], E, Ts0) ->
+    one_type(Toks, ['>>'|E], [{'<<', Lls}|Ts0]);
+one_type([{'[', Lls}|Toks], E, Ts0) ->
+    one_type(Toks, [']'|E], [{'[', Lls}|Ts0]);
+one_type([{'{', Llc}|Toks], E, Ts0) ->
+    one_type(Toks, ['}'|E], [{'{', Llc}|Ts0]);
+one_type([{Rb, Lrb}|Toks], [Rb|E], Ts0) ->
+    one_type(Toks, E, [{Rb, Lrb}|Ts0]);
+one_type([T|Toks], E, Ts0) ->
+    one_type(Toks, E, [T|Ts0]).
diff --git a/lib/dialyzer/src/dialyzer.hrl b/lib/dialyzer/src/dialyzer.hrl
index e7cf2860b7..e1821f10eb 100644
--- a/lib/dialyzer/src/dialyzer.hrl
+++ b/lib/dialyzer/src/dialyzer.hrl
@@ -108,6 +108,7 @@
 -type dial_options()  :: [dial_option()].
 -type fopt()          :: 'basename' | 'fullpath'.
 -type format()        :: 'formatted' | 'raw'.
+-type iopt()          :: boolean().
 -type label()	      :: non_neg_integer().
 -type dial_warn_tags():: ordsets:ordset(dial_warn_tag()).
 -type rep_mode()      :: 'quiet' | 'normal' | 'verbose'.
@@ -119,6 +120,8 @@
 %% Record declarations used by various files
 %%--------------------------------------------------------------------
 
+-define(INDENT_OPT, true).
+
 -type doc_plt() :: 'undefined' | dialyzer_plt:plt().
 
 -record(analysis, {analysis_pid			   :: pid() | 'undefined',
@@ -154,9 +157,12 @@
 		  output_file     = none	   :: 'none' | file:filename(),
 		  output_format   = formatted      :: format(),
 		  filename_opt	  = basename       :: fopt(),
+                  indent_opt      = ?INDENT_OPT    :: iopt(),
 		  callgraph_file  = ""             :: file:filename(),
 		  check_plt       = true           :: boolean(),
-                  solvers         = []             :: [solver()]}).
+                  solvers         = []             :: [solver()],
+                  native          = maybe          :: boolean() | 'maybe',
+                  native_cache    = true           :: boolean()}).
 
 -record(contract, {contracts	  = []		   :: [contract_pair()],
 		   args		  = []		   :: [erl_types:erl_type()],
diff --git a/lib/dialyzer/src/dialyzer_cl.erl b/lib/dialyzer/src/dialyzer_cl.erl
index 1e06d6e974..5e680062fb 100644
--- a/lib/dialyzer/src/dialyzer_cl.erl
+++ b/lib/dialyzer/src/dialyzer_cl.erl
@@ -40,6 +40,7 @@
 	 output          = standard_io	  :: io:device(),
 	 output_format   = formatted      :: format(),
 	 filename_opt    = basename       :: fopt(),
+         indent_opt      = ?INDENT_OPT    :: iopt(),
 	 output_plt      = none           :: 'none' | file:filename(),
 	 plt_info        = none           :: 'none' | dialyzer_plt:plt_info(),
 	 report_mode     = normal         :: rep_mode(),
@@ -319,12 +320,6 @@ report_analysis_start(#options{analysis_type = Type,
       end
   end.
 
-report_native_comp(#options{report_mode = ReportMode}) ->
-  case ReportMode of
-    quiet -> ok;
-    _ -> io:format("  Compiling some key modules to native code...")
-  end.
-
 report_elapsed_time(T1, T2, #options{report_mode = ReportMode}) ->
   case ReportMode of
     quiet -> ok;
@@ -374,7 +369,6 @@ do_analysis(Options) ->
   
 do_analysis(Files, Options, Plt, PltInfo) ->
   assert_writable(Options#options.output_plt),
-  hipe_compile(Files, Options),
   report_analysis_start(Options),
   State0 = new_state(),
   State1 = init_output(State0, Options),
@@ -483,113 +477,16 @@ expand_dependent_modules_1([Mod|Mods], Included, ModDeps) ->
 expand_dependent_modules_1([], Included, _ModDeps) ->
   Included.
 
--define(MIN_PARALLELISM, 7).
--define(MIN_FILES_FOR_NATIVE_COMPILE, 20).
-
--spec hipe_compile([file:filename()], #options{}) -> 'ok'.
-
-hipe_compile(Files, #options{erlang_mode = ErlangMode} = Options) ->
-  NoNative = (get(dialyzer_options_native) =:= false),
-  FewFiles = (length(Files) < ?MIN_FILES_FOR_NATIVE_COMPILE),
-  case NoNative orelse FewFiles orelse ErlangMode of
-    true -> ok;
-    false ->
-      case erlang:system_info(hipe_architecture) of
-	undefined -> ok;
-	_ ->
-	  Mods = [lists, dict, digraph, digraph_utils, ets,
-		  gb_sets, gb_trees, ordsets, sets, sofs,
-		  cerl, erl_types, cerl_trees, erl_bif_types,
-		  dialyzer_analysis_callgraph, dialyzer, dialyzer_behaviours,
-		  dialyzer_codeserver, dialyzer_contracts,
-		  dialyzer_coordinator, dialyzer_dataflow, dialyzer_dep,
-		  dialyzer_plt, dialyzer_succ_typings, dialyzer_typesig,
-		  dialyzer_worker],
-	  report_native_comp(Options),
-	  {T1, _} = statistics(wall_clock),
-	  Cache = (get(dialyzer_options_native_cache) =/= false),
-	  native_compile(Mods, Cache),
-	  {T2, _} = statistics(wall_clock),
-	  report_elapsed_time(T1, T2, Options)
-      end
-  end.
-
-native_compile(Mods, Cache) ->
-  case dialyzer_utils:parallelism() > ?MIN_PARALLELISM of
-    true ->
-      Parent = self(),
-      Pids = [spawn(fun () -> Parent ! {self(), hc(M, Cache)} end) || M <- Mods],
-      lists:foreach(fun (Pid) -> receive {Pid, Res} -> Res end end, Pids);
-    false ->
-      lists:foreach(fun (Mod) -> hc(Mod, Cache) end, Mods)
-  end.
-
-hc(Mod, Cache) ->
-  {module, Mod} = code:ensure_loaded(Mod),
-  case code:is_module_native(Mod) of
-    true -> ok;
-    false ->
-      %% io:format(" ~w", [Mod]),
-      case Cache of
-	false ->
-	  {ok, Mod} = hipe:c(Mod),
-	  ok;
-	true ->
-	  hc_cache(Mod)
-      end
-  end.
-
-hc_cache(Mod) ->
-  CacheBase = cache_base_dir(),
-  %% Use HiPE architecture, version and erts checksum in directory name,
-  %% to avoid clashes between incompatible binaries.
-  HipeArchVersion =
-    lists:concat(
-      [erlang:system_info(hipe_architecture), "-",
-       hipe:version(), "-",
-       hipe:erts_checksum()]),
-  CacheDir = filename:join(CacheBase, HipeArchVersion),
-  OrigBeamFile = code:which(Mod),
-  {ok, {Mod, <<Checksum:128>>}} = beam_lib:md5(OrigBeamFile),
-  CachedBeamFile = filename:join(CacheDir, lists:concat([Mod, "-", Checksum, ".beam"])),
-  ok = filelib:ensure_dir(CachedBeamFile),
-  ModBin =
-    case filelib:is_file(CachedBeamFile) of
-      true ->
-	{ok, BinFromFile} = file:read_file(CachedBeamFile),
-	BinFromFile;
-      false ->
-	{ok, Mod, CompiledBin} = compile:file(OrigBeamFile, [from_beam, native, binary]),
-	ok = file:write_file(CachedBeamFile, CompiledBin),
-	CompiledBin
-    end,
-  code:unstick_dir(filename:dirname(OrigBeamFile)),
-  {module, Mod} = code:load_binary(Mod, CachedBeamFile, ModBin),
-  true = code:is_module_native(Mod),
-  ok.
-
-cache_base_dir() ->
-  %% http://standards.freedesktop.org/basedir-spec/basedir-spec-0.7.html
-  %% If XDG_CACHE_HOME is set to an absolute path, use it as base.
-  XdgCacheHome = os:getenv("XDG_CACHE_HOME"),
-  CacheHome =
-    case is_list(XdgCacheHome) andalso filename:pathtype(XdgCacheHome) =:= absolute of
-      true ->
-	XdgCacheHome;
-      false ->
-	%% Otherwise, the default is $HOME/.cache.
-	{ok, [[Home]]} = init:get_argument(home),
-	filename:join(Home, ".cache")
-    end,
-  filename:join([CacheHome, "dialyzer_hipe_cache"]).
-
 new_state() ->
   #cl_state{}.
 
 init_output(State0, #options{output_file = OutFile,
 			     output_format = OutFormat,
-			     filename_opt = FOpt}) ->
-  State = State0#cl_state{output_format = OutFormat, filename_opt = FOpt},
+			     filename_opt = FOpt,
+                             indent_opt = IOpt}) ->
+  State = State0#cl_state{output_format = OutFormat,
+                          filename_opt = FOpt,
+                          indent_opt = IOpt},
   case OutFile =:= none of
     true ->
       State;
@@ -818,6 +715,7 @@ print_warnings(#cl_state{stored_warnings = []}) ->
 print_warnings(#cl_state{output = Output,
 			 output_format = Format,
 			 filename_opt = FOpt,
+                         indent_opt = IOpt,
 			 stored_warnings = Warnings}) ->
   PrWarnings = process_warnings(Warnings),
   case PrWarnings of
@@ -825,7 +723,8 @@ print_warnings(#cl_state{output = Output,
     [_|_] ->
       S = case Format of
 	    formatted ->
-	      [dialyzer:format_warning(W, FOpt) || W <- PrWarnings];
+              Opts = [{filename_opt, FOpt}, {indent_opt, IOpt}],
+	      [dialyzer:format_warning(W, Opts) || W <- PrWarnings];
 	    raw ->
 	      [io_lib:format("~tp. \n",
                              [W]) || W <- set_warning_id(PrWarnings)]
diff --git a/lib/dialyzer/src/dialyzer_cl_parse.erl b/lib/dialyzer/src/dialyzer_cl_parse.erl
index f21eaed087..cadc2116b0 100644
--- a/lib/dialyzer/src/dialyzer_cl_parse.erl
+++ b/lib/dialyzer/src/dialyzer_cl_parse.erl
@@ -134,6 +134,9 @@ cl(["--raw"|T]) ->
 cl(["--fullpath"|T]) ->
   put(dialyzer_filename_opt, fullpath),
   cl(T);
+cl(["--no_indentation"|T]) ->
+  put(dialyzer_indent_opt, false),
+  cl(T);
 cl(["-pa", Path|T]) ->
   case code:add_patha(Path) of
     true -> cl(T);
@@ -254,6 +257,7 @@ init() ->
   put(dialyzer_options_files,     DefaultOpts#options.files),
   put(dialyzer_output_format,     formatted),
   put(dialyzer_filename_opt,      basename),
+  put(dialyzer_indent_opt,        ?INDENT_OPT),
   put(dialyzer_options_check_plt, DefaultOpts#options.check_plt),
   put(dialyzer_timing,            DefaultOpts#options.timing),
   put(dialyzer_solvers,           DefaultOpts#options.solvers),
@@ -295,6 +299,7 @@ cl_options() ->
    {output_file, get(dialyzer_output)},
    {output_format, get(dialyzer_output_format)},
    {filename_opt, get(dialyzer_filename_opt)},
+   {indent_opt, get(dialyzer_indent_opt)},
    {analysis_type, get(dialyzer_options_analysis_type)},
    {get_warnings, get(dialyzer_options_get_warnings)},
    {timing, get(dialyzer_timing)},
@@ -311,7 +316,9 @@ common_options() ->
    {use_spec, get(dialyzer_options_use_contracts)},
    {warnings, get(dialyzer_warnings)},
    {check_plt, get(dialyzer_options_check_plt)},
-   {solvers, get(dialyzer_solvers)}].
+   {solvers, get(dialyzer_solvers)},
+   {native, get(dialyzer_options_native)},
+   {native_cache, get(dialyzer_options_native_cache)}].
 
 %%-----------------------------------------------------------------------
 
@@ -361,7 +368,7 @@ help_message() ->
 		[--build_plt] [--add_to_plt] [--remove_from_plt]
 		[--check_plt] [--no_check_plt] [--plt_info] [--get_warnings]
                 [--dump_callgraph file] [--no_native] [--fullpath]
-                [--statistics] [--no_native_cache]
+                [--no_indentation] [--statistics] [--no_native_cache]
 Options:
   files_or_dirs (for backwards compatibility also as: -c files_or_dirs)
       Use Dialyzer from the command line to detect defects in the
@@ -473,6 +480,9 @@ Options:
       caching.
   --fullpath
       Display the full path names of files for which warnings are emitted.
+  --no_indentation
+      Do not indent contracts and success typings. Note that this option has
+      no effect when combined with the --raw option.
   --gui
       Use the GUI.
 
diff --git a/lib/dialyzer/src/dialyzer_codeserver.erl b/lib/dialyzer/src/dialyzer_codeserver.erl
index 5587cf2bdf..c4e3c322e5 100644
--- a/lib/dialyzer/src/dialyzer_codeserver.erl
+++ b/lib/dialyzer/src/dialyzer_codeserver.erl
@@ -347,13 +347,11 @@ get_file_contract(Key, ContDict) ->
 lookup_mfa_contract(MFA, #codeserver{contracts = ContDict}) ->
   ets_dict_find(MFA, ContDict).
 
--spec lookup_meta_info(module() | mfa(), codeserver()) -> meta_info().
+-spec lookup_meta_info(module() | mfa(), codeserver()) ->
+                          {'ok', meta_info()} | 'error'.
 
 lookup_meta_info(MorMFA, #codeserver{fun_meta_info = FunMetaInfo}) ->
-  case ets_dict_find(MorMFA, FunMetaInfo) of
-    error -> [];
-    {ok, PropList} -> PropList
-  end.
+  ets_dict_find(MorMFA, FunMetaInfo).
 
 -spec get_contracts(codeserver()) ->
                        dict:dict(mfa(), dialyzer_contracts:file_contract()).
diff --git a/lib/dialyzer/src/dialyzer_contracts.erl b/lib/dialyzer/src/dialyzer_contracts.erl
index af7f4385ad..17b2168852 100644
--- a/lib/dialyzer/src/dialyzer_contracts.erl
+++ b/lib/dialyzer/src/dialyzer_contracts.erl
@@ -25,7 +25,7 @@
 	 %% get_contract_signature/1,
 	 is_overloaded/1,
 	 process_contract_remote_types/1,
-	 store_tmp_contract/5]).
+	 store_tmp_contract/6]).
 
 -export_type([file_contract/0, plt_contracts/0]).
 
@@ -146,18 +146,18 @@ process_contract_remote_types(CodeServer) ->
   Mods = dialyzer_codeserver:all_temp_modules(CodeServer),
   RecordTable = dialyzer_codeserver:get_records_table(CodeServer),
   ExpTypes = dialyzer_codeserver:get_exported_types(CodeServer),
-  ContractFun =
-    fun({{_M, _F, _A}=MFA, {File, TmpContract, Xtra}}, C0) ->
-        #tmp_contract{contract_funs = CFuns, forms = Forms} = TmpContract,
-        {NewCs, C2} = lists:mapfoldl(fun(CFun, C1) ->
-                                         CFun(ExpTypes, RecordTable, C1)
-                                     end, C0, CFuns),
-        Args = general_domain(NewCs),
-        Contract = #contract{contracts = NewCs, args = Args, forms = Forms},
-        {{MFA, {File, Contract, Xtra}}, C2}
-    end,
   ModuleFun =
     fun(ModuleName) ->
+        ContractFun =
+          fun({MFA, {File, TmpContract, Xtra}}, C0) ->
+              #tmp_contract{contract_funs = CFuns, forms = Forms} = TmpContract,
+              {NewCs, C2} = lists:mapfoldl(fun(CFun, C1) ->
+                                               CFun(ExpTypes, RecordTable, C1)
+                                           end, C0, CFuns),
+              Args = general_domain(NewCs),
+              Contract = #contract{contracts = NewCs, args = Args, forms = Forms},
+              {{MFA, {File, Contract, Xtra}}, C2}
+          end,
         Cache = erl_types:cache__new(),
         {ContractMap, CallbackMap} =
           dialyzer_codeserver:get_temp_contracts(ModuleName, CodeServer),
@@ -474,26 +474,29 @@ insert_constraints([], Map) -> Map.
 
 -type spec_data() :: {TypeSpec :: [_], Xtra:: [_]}.
 
--spec store_tmp_contract(mfa(), file_line(), spec_data(), contracts(), types()) ->
-        contracts().
+-spec store_tmp_contract(module(), mfa(), file_line(), spec_data(),
+                         contracts(), types()) -> contracts().
 
-store_tmp_contract(MFA, FileLine, {TypeSpec, Xtra}, SpecMap, RecordsDict) ->
+store_tmp_contract(Module, MFA, FileLine, {TypeSpec, Xtra}, SpecMap,
+                   RecordsDict) ->
   %% io:format("contract from form: ~tp\n", [TypeSpec]),
-  TmpContract = contract_from_form(TypeSpec, MFA, RecordsDict, FileLine),
+  TmpContract = contract_from_form(TypeSpec, Module, MFA, RecordsDict, FileLine),
   %% io:format("contract: ~tp\n", [TmpContract]),
   maps:put(MFA, {FileLine, TmpContract, Xtra}, SpecMap).
 
-contract_from_form(Forms, MFA, RecDict, FileLine) ->
-  {CFuns, Forms1} = contract_from_form(Forms, MFA, RecDict, FileLine, [], []),
+contract_from_form(Forms, Module, MFA, RecDict, FileLine) ->
+  {CFuns, Forms1} =
+    contract_from_form(Forms, Module, MFA, RecDict, FileLine, [], []),
   #tmp_contract{contract_funs = CFuns, forms = Forms1}.
 
-contract_from_form([{type, _, 'fun', [_, _]} = Form | Left], MFA, RecDict,
-		   FileLine, TypeAcc, FormAcc) ->
+contract_from_form([{type, _, 'fun', [_, _]} = Form | Left], Module, MFA,
+                   RecDict, FileLine, TypeAcc, FormAcc) ->
   TypeFun =
     fun(ExpTypes, RecordTable, Cache) ->
 	{NewType, NewCache} =
 	  try
-            from_form_with_check(Form, ExpTypes, MFA, RecordTable, Cache)
+            from_form_with_check(Form, ExpTypes, Module, MFA, RecordTable,
+                                 Cache)
 	  catch
 	    throw:{error, Msg} ->
 	      {File, Line} = FileLine,
@@ -506,68 +509,74 @@ contract_from_form([{type, _, 'fun', [_, _]} = Form | Left], MFA, RecDict,
     end,
   NewTypeAcc = [TypeFun | TypeAcc],
   NewFormAcc = [{Form, []} | FormAcc],
-  contract_from_form(Left, MFA, RecDict, FileLine, NewTypeAcc, NewFormAcc);
+  contract_from_form(Left, Module, MFA, RecDict, FileLine, NewTypeAcc,
+                     NewFormAcc);
 contract_from_form([{type, _L1, bounded_fun,
 		     [{type, _L2, 'fun', [_, _]} = Form, Constr]}| Left],
-		   MFA, RecDict, FileLine, TypeAcc, FormAcc) ->
+		   Module, MFA, RecDict, FileLine, TypeAcc, FormAcc) ->
   TypeFun =
     fun(ExpTypes, RecordTable, Cache) ->
 	{Constr1, VarTable, Cache1} =
-	  process_constraints(Constr, MFA, RecDict, ExpTypes, RecordTable,
-                              Cache),
+	  process_constraints(Constr, Module, MFA, RecDict, ExpTypes,
+                              RecordTable, Cache),
         {NewType, NewCache} =
-          from_form_with_check(Form, ExpTypes, MFA, RecordTable,
+          from_form_with_check(Form, ExpTypes, Module, MFA, RecordTable,
                                VarTable, Cache1),
         NewTypeNoVars = erl_types:subst_all_vars_to_any(NewType),
 	{{NewTypeNoVars, Constr1}, NewCache}
     end,
   NewTypeAcc = [TypeFun | TypeAcc],
   NewFormAcc = [{Form, Constr} | FormAcc],
-  contract_from_form(Left, MFA, RecDict, FileLine, NewTypeAcc, NewFormAcc);
-contract_from_form([], _MFA, _RecDict, _FileLine, TypeAcc, FormAcc) ->
+  contract_from_form(Left, Module, MFA, RecDict, FileLine, NewTypeAcc,
+                     NewFormAcc);
+contract_from_form([], _Mod, _MFA, _RecDict, _FileLine, TypeAcc, FormAcc) ->
   {lists:reverse(TypeAcc), lists:reverse(FormAcc)}.
 
-process_constraints(Constrs, MFA, RecDict, ExpTypes, RecordTable, Cache) ->
-  {Init0, NewCache} = initialize_constraints(Constrs, MFA, RecDict, ExpTypes,
-                                             RecordTable, Cache),
+process_constraints(Constrs, Module, MFA, RecDict, ExpTypes, RecordTable,
+                    Cache) ->
+  {Init0, NewCache} = initialize_constraints(Constrs, Module, MFA, RecDict,
+                                             ExpTypes, RecordTable, Cache),
   Init = remove_cycles(Init0),
-  constraints_fixpoint(Init, MFA, RecDict, ExpTypes, RecordTable, NewCache).
+  constraints_fixpoint(Init, Module, MFA, RecDict, ExpTypes, RecordTable,
+                       NewCache).
 
-initialize_constraints(Constrs, MFA, RecDict, ExpTypes, RecordTable, Cache) ->
-  initialize_constraints(Constrs, MFA, RecDict, ExpTypes, RecordTable,
+initialize_constraints(Constrs, Module, MFA, RecDict, ExpTypes, RecordTable,
+                       Cache) ->
+  initialize_constraints(Constrs, Module, MFA, RecDict, ExpTypes, RecordTable,
                          Cache, []).
 
-initialize_constraints([], _MFA, _RecDict, _ExpTypes, _RecordTable,
+initialize_constraints([], _Module, _MFA, _RecDict, _ExpTypes, _RecordTable,
                        Cache, Acc) ->
   {Acc, Cache};
-initialize_constraints([Constr|Rest], MFA, RecDict, ExpTypes, RecordTable,
-                       Cache, Acc) ->
+initialize_constraints([Constr|Rest], Module, MFA, RecDict, ExpTypes,
+                       RecordTable, Cache, Acc) ->
   case Constr of
     {type, _, constraint, [{atom, _, is_subtype}, [Type1, Type2]]} ->
       VarTable = erl_types:var_table__new(),
       {T1, NewCache} =
-        final_form(Type1, ExpTypes, MFA, RecordTable, VarTable, Cache),
+       final_form(Type1, ExpTypes, Module, MFA, RecordTable, VarTable, Cache),
       Entry = {T1, Type2},
-      initialize_constraints(Rest, MFA, RecDict, ExpTypes, RecordTable,
-                             NewCache, [Entry|Acc]);
+      initialize_constraints(Rest, Module, MFA, RecDict, ExpTypes,
+                             RecordTable, NewCache, [Entry|Acc]);
     {type, _, constraint, [{atom,_,Name}, List]} ->
       N = length(List),
       throw({error,
 	     io_lib:format("Unsupported type guard ~tw/~w\n", [Name, N])})
   end.
 
-constraints_fixpoint(Constrs, MFA, RecDict, ExpTypes, RecordTable, Cache) ->
+constraints_fixpoint(Constrs, Module, MFA, RecDict, ExpTypes, RecordTable,
+                     Cache) ->
   VarTable = erl_types:var_table__new(),
   {VarTab, NewCache} =
-    constraints_to_dict(Constrs, MFA, RecDict, ExpTypes, RecordTable,
+    constraints_to_dict(Constrs, Module, MFA, RecDict, ExpTypes, RecordTable,
                         VarTable, Cache),
-  constraints_fixpoint(VarTab, MFA, Constrs, RecDict, ExpTypes,
+  constraints_fixpoint(VarTab, Module, MFA, Constrs, RecDict, ExpTypes,
                        RecordTable, NewCache).
 
-constraints_fixpoint(OldVarTab, MFA, Constrs, RecDict, ExpTypes,
+constraints_fixpoint(OldVarTab, Module, MFA, Constrs, RecDict, ExpTypes,
                      RecordTable, Cache) ->
   {NewVarTab, NewCache} =
-    constraints_to_dict(Constrs, MFA, RecDict, ExpTypes, RecordTable,
+    constraints_to_dict(Constrs, Module, MFA, RecDict, ExpTypes, RecordTable,
                         OldVarTab, Cache),
   case NewVarTab of
     OldVarTab ->
@@ -578,19 +587,23 @@ constraints_fixpoint(OldVarTab, MFA, Constrs, RecDict, ExpTypes,
       FinalConstrs = maps:fold(Fun, [], NewVarTab),
       {FinalConstrs, NewVarTab, NewCache};
     _Other ->
-      constraints_fixpoint(NewVarTab, MFA, Constrs, RecDict, ExpTypes,
+      constraints_fixpoint(NewVarTab, Module, MFA, Constrs, RecDict, ExpTypes,
                            RecordTable, NewCache)
   end.
 
-final_form(Form, ExpTypes, MFA, RecordTable, VarTable, Cache) ->
-  from_form_with_check(Form, ExpTypes, MFA, RecordTable, VarTable, Cache).
+final_form(Form, ExpTypes, Module, MFA, RecordTable, VarTable, Cache) ->
+  from_form_with_check(Form, ExpTypes, Module, MFA, RecordTable, VarTable,
+                       Cache).
 
-from_form_with_check(Form, ExpTypes, MFA, RecordTable, Cache) ->
+from_form_with_check(Form, ExpTypes, Module, MFA, RecordTable, Cache) ->
   VarTable = erl_types:var_table__new(),
-  from_form_with_check(Form, ExpTypes, MFA, RecordTable, VarTable, Cache).
+  from_form_with_check(Form, ExpTypes, Module, MFA, RecordTable, VarTable,
+                       Cache).
 
-from_form_with_check(Form, ExpTypes, MFA, RecordTable, VarTable, Cache) ->
-  Site = {spec, MFA},
+from_form_with_check(Form, ExpTypes, Module, MFA, RecordTable, VarTable,
+                     Cache) ->
+  {_, F, A} = MFA,
+  Site = {spec, {Module, F, A}},
   C1 = erl_types:t_check_record_fields(Form, ExpTypes, Site, RecordTable,
                                        VarTable, Cache),
   %% The check costs some time, and with the assumption that contracts
@@ -598,22 +611,22 @@ from_form_with_check(Form, ExpTypes, MFA, RecordTable, VarTable, Cache) ->
   %% erl_types:t_from_form_check_remote(Form, ExpTypes, MFA, RecordTable),
   erl_types:t_from_form(Form, ExpTypes, Site, RecordTable, VarTable, C1).
 
-constraints_to_dict(Constrs, MFA, RecDict, ExpTypes, RecordTable,
+constraints_to_dict(Constrs, Module, MFA, RecDict, ExpTypes, RecordTable,
                     VarTab, Cache) ->
   {Subtypes, NewCache} =
-    constraints_to_subs(Constrs, MFA, RecDict, ExpTypes, RecordTable,
+    constraints_to_subs(Constrs, Module, MFA, RecDict, ExpTypes, RecordTable,
                         VarTab, Cache, []),
   {insert_constraints(Subtypes), NewCache}.
 
-constraints_to_subs([], _MFA, _RecDict, _ExpTypes, _RecordTable,
+constraints_to_subs([], _Module, _MFA, _RecDict, _ExpTypes, _RecordTable,
                     _VarTab, Cache, Acc) ->
   {Acc, Cache};
-constraints_to_subs([{T1, Form2}|Rest], MFA, RecDict, ExpTypes, RecordTable,
-                    VarTab, Cache, Acc) ->
+constraints_to_subs([{T1, Form2}|Rest], Module, MFA, RecDict, ExpTypes,
+                    RecordTable, VarTab, Cache, Acc) ->
   {T2, NewCache} =
-    final_form(Form2, ExpTypes, MFA, RecordTable, VarTab, Cache),
+    final_form(Form2, ExpTypes, Module, MFA, RecordTable, VarTab, Cache),
   NewAcc = [{subtype, T1, T2}|Acc],
-  constraints_to_subs(Rest, MFA, RecDict, ExpTypes, RecordTable,
+  constraints_to_subs(Rest, Module, MFA, RecDict, ExpTypes, RecordTable,
                       VarTab, NewCache, NewAcc).
 
 %% Replaces variables with '_' when necessary to break up cycles among
diff --git a/lib/dialyzer/src/dialyzer_dataflow.erl b/lib/dialyzer/src/dialyzer_dataflow.erl
index 45b4abb253..55c77814f8 100644
--- a/lib/dialyzer/src/dialyzer_dataflow.erl
+++ b/lib/dialyzer/src/dialyzer_dataflow.erl
@@ -405,8 +405,13 @@ handle_apply(Tree, Map, State) ->
                                     t_fun_args(OpType1, 'universe')),
 	      case any_none(NewArgs) of
 		true ->
+                  EnumNewArgs = lists:zip(lists:seq(1, length(NewArgs)),
+                                          NewArgs),
+                  ArgNs = [Arg ||
+                            {Arg, Type} <- EnumNewArgs, t_is_none(Type)],
 		  Msg = {fun_app_args,
-			 [format_args(Args, ArgTypes, State),
+			 [ArgNs,
+			  format_args(Args, ArgTypes, State),
 			  format_type(OpType, State)]},
 		  State3 = state__add_warning(State2, ?WARN_FAILING_CALL,
 					      Tree, Msg),
@@ -3639,14 +3644,15 @@ format_args(ArgList0, TypeList, State) ->
   "(" ++ format_args_1(ArgList, TypeList, State) ++ ")".
 
 format_args_1([Arg], [Type], State) ->
-  format_arg(Arg) ++ format_type(Type, State);
+  format_arg_1(Arg, Type, State);
 format_args_1([Arg|Args], [Type|Types], State) ->
-  String =
-    case cerl:is_literal(Arg) of
-      true -> format_cerl(Arg);
-      false -> format_arg(Arg) ++ format_type(Type, State)
-    end,
-  String ++ "," ++ format_args_1(Args, Types, State).
+  format_arg_1(Arg, Type, State) ++ "," ++ format_args_1(Args, Types, State).
+
+format_arg_1(Arg, Type, State) ->
+  case cerl:is_literal(Arg) of
+    true -> format_cerl(Arg);
+    false -> format_arg(Arg) ++ format_type(Type, State)
+  end.
 
 format_arg(Arg) ->
   Default = "",
diff --git a/lib/dialyzer/src/dialyzer_gui_wx.erl b/lib/dialyzer/src/dialyzer_gui_wx.erl
index b8414b7d8b..f47d90b91f 100644
--- a/lib/dialyzer/src/dialyzer_gui_wx.erl
+++ b/lib/dialyzer/src/dialyzer_gui_wx.erl
@@ -1135,7 +1135,9 @@ handle_help(State, Title, Txt) ->
 add_warnings(#gui_state{warnings_box = WarnBox,
 			rawWarnings = RawWarns} = State, Warnings) ->
   NewRawWarns = RawWarns ++ Warnings,
-  WarnList = [dialyzer:format_warning(W) -- "\n" || W <- NewRawWarns],
+  %% The indentation cannot be turned off.
+  WarnList = [string:trim(dialyzer:format_warning(W), trailing) ||
+               W <- NewRawWarns],
   wxListBox:set(WarnBox, WarnList),
   State#gui_state{rawWarnings = NewRawWarns}.
   
diff --git a/lib/dialyzer/src/dialyzer_options.erl b/lib/dialyzer/src/dialyzer_options.erl
index 03040f8e38..f88f4f8ea2 100644
--- a/lib/dialyzer/src/dialyzer_options.erl
+++ b/lib/dialyzer/src/dialyzer_options.erl
@@ -177,6 +177,8 @@ build_options([{OptionName, Value} = Term|Rest], Options) ->
     filename_opt ->
       assert_filename_opt(Value),
       build_options(Rest, Options#options{filename_opt = Value});
+    indent_opt ->
+      build_options(Rest, Options#options{indent_opt = Value});
     output_plt ->
       assert_filename(Value),
       build_options(Rest, Options#options{output_plt = Value});
@@ -195,6 +197,10 @@ build_options([{OptionName, Value} = Term|Rest], Options) ->
     solvers ->
       assert_solvers(Value),
       build_options(Rest, Options#options{solvers = Value});
+    native ->
+      build_options(Rest, Options#options{native = Value});
+    native_cache ->
+      build_options(Rest, Options#options{native_cache = Value});
     _ ->
       bad_option("Unknown dialyzer command line option", Term)
   end;
diff --git a/lib/dialyzer/src/dialyzer_utils.erl b/lib/dialyzer/src/dialyzer_utils.erl
index abd89034f3..245c099fef 100644
--- a/lib/dialyzer/src/dialyzer_utils.erl
+++ b/lib/dialyzer/src/dialyzer_utils.erl
@@ -46,6 +46,7 @@
 	]).
 
 -include("dialyzer.hrl").
+-include("../../compiler/src/core_parse.hrl").
 
 %%-define(DEBUG, true).
 
@@ -450,8 +451,9 @@ get_spec_info([{Contract, Ln, [{Id, TypeSpec}]}|Left],
     error ->
       SpecData = {TypeSpec, Xtra},
       NewActiveMap =
-	dialyzer_contracts:store_tmp_contract(MFA, {File, Ln}, SpecData,
-					      ActiveMap, RecordsMap),
+	dialyzer_contracts:store_tmp_contract(ModName, MFA, {File, Ln},
+                                              SpecData, ActiveMap,
+                                              RecordsMap),
       {NewSpecMap, NewCallbackMap} =
 	case Contract of
 	  spec     -> {NewActiveMap, CallbackMap};
@@ -599,24 +601,32 @@ collect_attribute([], _Tag, _File) ->
 -spec is_suppressed_fun(mfa(), codeserver()) -> boolean().
 
 is_suppressed_fun(MFA, CodeServer) ->
-  lookup_fun_property(MFA, nowarn_function, CodeServer).
+  lookup_fun_property(MFA, nowarn_function, CodeServer, false).
 
 -spec is_suppressed_tag(mfa() | module(), dial_warn_tag(), codeserver()) ->
                            boolean().
 
 is_suppressed_tag(MorMFA, Tag, Codeserver) ->
-  not lookup_fun_property(MorMFA, Tag, Codeserver).
-
-lookup_fun_property({M, _F, _A}=MFA, Property, CodeServer) ->
-  MFAPropList = dialyzer_codeserver:lookup_meta_info(MFA, CodeServer),
-  case proplists:get_value(Property, MFAPropList, no) of
-    mod -> false; % suppressed in function
-    func -> true; % requested in function
-    no -> lookup_fun_property(M, Property, CodeServer)
+  not lookup_fun_property(MorMFA, Tag, Codeserver, true).
+
+lookup_fun_property({M, _F, _A}=MFA, Property, CodeServer, NoInfoReturn) ->
+  case dialyzer_codeserver:lookup_meta_info(MFA, CodeServer) of
+    error ->
+      lookup_fun_property(M, Property, CodeServer, NoInfoReturn);
+    {ok, MFAPropList} ->
+      case proplists:get_value(Property, MFAPropList, no) of
+        mod -> false; % suppressed in function
+        func -> true; % requested in function
+        no -> lookup_fun_property(M, Property, CodeServer, NoInfoReturn)
+      end
   end;
-lookup_fun_property(M, Property, CodeServer) when is_atom(M) ->
-  MPropList = dialyzer_codeserver:lookup_meta_info(M, CodeServer),
-  proplists:is_defined(Property, MPropList).
+lookup_fun_property(M, Property, CodeServer, NoInfoReturn) when is_atom(M) ->
+  case dialyzer_codeserver:lookup_meta_info(M, CodeServer) of
+    error ->
+      NoInfoReturn;
+    {ok, MPropList} ->
+      proplists:is_defined(Property, MPropList)
+  end.
 
 %% ============================================================================
 %%
@@ -643,7 +653,7 @@ sets_filter([Mod|Mods], ExpTypes) ->
 src_compiler_opts() ->
   [no_copt, to_core, binary, return_errors,
    no_inline, strict_record_tests, strict_record_updates,
-   dialyzer].
+   dialyzer, no_spawn_compiler_process].
 
 -spec format_errors([{module(), string()}]) -> [string()].
 
@@ -742,9 +752,13 @@ pp_hook(Node, Ctxt, Cont) ->
     map ->
       pp_map(Node, Ctxt, Cont);
     literal ->
-      case is_map(cerl:concrete(Node)) of
-	true -> pp_map(Node, Ctxt, Cont);
-	false -> Cont(Node, Ctxt)
+      case cerl:concrete(Node) of
+        Map when is_map(Map) ->
+          pp_map(Node, Ctxt, Cont);
+        Bitstr when is_bitstring(Bitstr) ->
+          pp_binary(Node, Ctxt, Cont);
+        _ ->
+          Cont(Node, Ctxt)
       end;
     _ ->
       Cont(Node, Ctxt)
@@ -752,7 +766,7 @@ pp_hook(Node, Ctxt, Cont) ->
 
 pp_binary(Node, Ctxt, Cont) ->
   prettypr:beside(prettypr:text("<<"),
-		  prettypr:beside(pp_segments(cerl:binary_segments(Node),
+		  prettypr:beside(pp_segments(cerl_binary_segments(Node),
 					      Ctxt, Cont),
 				  prettypr:text(">>"))).
 
@@ -771,10 +785,29 @@ pp_segment(Node, Ctxt, Cont) ->
   Unit = cerl:bitstr_unit(Node),
   Type = cerl:bitstr_type(Node),
   Flags = cerl:bitstr_flags(Node),
-  prettypr:beside(Cont(Val, Ctxt),
-		  prettypr:beside(pp_size(Size, Ctxt, Cont),
-				  prettypr:beside(pp_opts(Type, Flags),
-						  pp_unit(Unit, Ctxt, Cont)))).
+  RestPP =
+    case {concrete(Unit), concrete(Type), concrete(Flags)} of
+      {1, integer, [unsigned, big]} -> % Simplify common cases.
+        case concrete(Size) of
+          8 -> prettypr:text("");
+          _ -> pp_size(Size, Ctxt, Cont)
+        end;
+      {8, binary, [unsigned, big]} ->
+        SizePP = pp_size(Size, Ctxt, Cont),
+        prettypr:beside(SizePP,
+                        prettypr:beside(prettypr:text("/"), pp_atom(Type)));
+      _What ->
+        SizePP = pp_size(Size, Ctxt, Cont),
+        UnitPP = pp_unit(Unit, Ctxt, Cont),
+        OptsPP = pp_opts(Type, Flags),
+        prettypr:beside(SizePP, prettypr:beside(OptsPP, UnitPP))
+    end,
+  prettypr:beside(Cont(Val, Ctxt), RestPP).
+
+concrete(Cerl) ->
+  try cerl:concrete(Cerl)
+  catch _:_ -> anything_unexpected
+  end.
 
 pp_size(Size, Ctxt, Cont) ->
   case cerl:is_c_atom(Size) of
@@ -850,6 +883,31 @@ seq([H | T], Separator, Ctxt, Fun) ->
 seq([], _, _, _) ->
   [prettypr:empty()].
 
+cerl_binary_segments(#c_literal{val = B}) when is_bitstring(B) ->
+  segs_from_bitstring(B);
+cerl_binary_segments(CBinary) ->
+  cerl:binary_segments(CBinary).
+
+%% Copied from core_pp. The function cerl:binary_segments/2 should/could
+%% be extended to handle literals, but then the cerl module cannot be
+%% HiPE-compiled as of Erlang/OTP 22.0 (due to <<I:N>>).
+segs_from_bitstring(<<H,T/bitstring>>) ->
+    [#c_bitstr{val=#c_literal{val=H},
+	       size=#c_literal{val=8},
+	       unit=#c_literal{val=1},
+	       type=#c_literal{val=integer},
+	       flags=#c_literal{val=[unsigned,big]}}|segs_from_bitstring(T)];
+segs_from_bitstring(<<>>) ->
+    [];
+segs_from_bitstring(Bitstring) ->
+    N = bit_size(Bitstring),
+    <<I:N>> = Bitstring,
+    [#c_bitstr{val=#c_literal{val=I},
+	      size=#c_literal{val=N},
+	      unit=#c_literal{val=1},
+	      type=#c_literal{val=integer},
+	      flags=#c_literal{val=[unsigned,big]}}].
+
 %%------------------------------------------------------------------------------
 
 -spec refold_pattern(cerl:cerl()) -> cerl:cerl().
diff --git a/lib/dialyzer/src/typer.erl b/lib/dialyzer/src/typer.erl
index 4b99f5f72e..5a1b8619c9 100644
--- a/lib/dialyzer/src/typer.erl
+++ b/lib/dialyzer/src/typer.erl
@@ -980,7 +980,7 @@ fatal_error(Slogan) ->
 
 mode_error(OldMode, NewMode) ->
   Msg = io_lib:format("Mode was previously set to '~s'; "
-		      "can not set it to '~s' now",
+		      "cannot set it to '~s' now",
 		      [OldMode, NewMode]),
   fatal_error(Msg).
 
diff --git a/lib/dialyzer/test/behaviour_SUITE_data/dialyzer_options b/lib/dialyzer/test/behaviour_SUITE_data/dialyzer_options
index 365b4798c5..83d4a0ec35 100644
--- a/lib/dialyzer/test/behaviour_SUITE_data/dialyzer_options
+++ b/lib/dialyzer/test/behaviour_SUITE_data/dialyzer_options
@@ -1,2 +1,2 @@
-{dialyzer_options, []}.
+{dialyzer_options, [{indent_opt, false}]}.
 {time_limit, 5}.
diff --git a/lib/dialyzer/test/callgraph_SUITE_data/dialyzer_options b/lib/dialyzer/test/callgraph_SUITE_data/dialyzer_options
index 50991c9bc5..8413436b67 100644
--- a/lib/dialyzer/test/callgraph_SUITE_data/dialyzer_options
+++ b/lib/dialyzer/test/callgraph_SUITE_data/dialyzer_options
@@ -1 +1 @@
-{dialyzer_options, []}.
+{dialyzer_options, [{indent_opt, false}]}.
diff --git a/lib/dialyzer/test/dialyzer_common.erl b/lib/dialyzer/test/dialyzer_common.erl
index 1a8403f486..beaf126344 100644
--- a/lib/dialyzer/test/dialyzer_common.erl
+++ b/lib/dialyzer/test/dialyzer_common.erl
@@ -147,7 +147,8 @@ check(TestCase, Opts, Dir, OutDir) ->
     try dialyzer:run([{files, Files},{from, src_code},{init_plt, PltFilename},
 		      {check_plt, false}|ProperOpts]) of
 	RawWarns ->
-	    Warns = lists:sort([dialyzer:format_warning(W) || W <- RawWarns]),
+	    Warns = lists:sort([dialyzer:format_warning(W, ProperOpts) ||
+                                   W <- RawWarns]),
 	    case Warns of
 		[] -> ok;
 		_  ->
diff --git a/lib/dialyzer/test/indent2_SUITE_data/dialyzer_options b/lib/dialyzer/test/indent2_SUITE_data/dialyzer_options
new file mode 100644
index 0000000000..ee07090337
--- /dev/null
+++ b/lib/dialyzer/test/indent2_SUITE_data/dialyzer_options
@@ -0,0 +1 @@
+{dialyzer_options, [{warnings, [no_unused, no_return, specdiffs]}]}.
diff --git a/lib/dialyzer/test/indent2_SUITE_data/results/arr b/lib/dialyzer/test/indent2_SUITE_data/results/arr
new file mode 100644
index 0000000000..77e67f0cab
--- /dev/null
+++ b/lib/dialyzer/test/indent2_SUITE_data/results/arr
@@ -0,0 +1,15 @@
+
+arr.erl:14: Type specification arr:test2
+          (array:array(T), non_neg_integer(), T) -> array:array(T) is a supertype of the success typing: arr:test2
+          (array:array(_), pos_integer(), _) -> array:array(_)
+arr.erl:24: Type specification arr:test4
+          (array:array(T), non_neg_integer(), _) -> array:array(T) is a supertype of the success typing: arr:test4
+          (array:array(_), pos_integer(), _) -> array:array(_)
+arr.erl:29: Type specification arr:test5
+          (array:array(T), non_neg_integer(), T) -> array:array(T) is a supertype of the success typing: arr:test5
+          (array:array(_), non_neg_integer(), integer()) ->
+             array:array(_)
+arr.erl:37: Type specification arr:test6
+          (array:array(integer()), non_neg_integer(), integer()) ->
+             array:array(any()) is not equal to the success typing: arr:test6
+          (array:array(_), non_neg_integer(), _) -> array:array(_)
diff --git a/lib/dialyzer/test/indent2_SUITE_data/results/iodata b/lib/dialyzer/test/indent2_SUITE_data/results/iodata
new file mode 100644
index 0000000000..d95551d330
--- /dev/null
+++ b/lib/dialyzer/test/indent2_SUITE_data/results/iodata
@@ -0,0 +1,24 @@
+
+iodata.erl:7: The specification for iodata:encode/2 states that the function might also return 
+          binary() but the inferred return is 
+          nonempty_maybe_improper_list(<<_:8, _:_*8>> |
+                                       nonempty_maybe_improper_list(<<_:8,
+                                                                      _:_*8>> |
+                                                                    nonempty_maybe_improper_list(any(),
+                                                                                                 <<_:8,
+                                                                                                   _:_*8>> |
+                                                                                                 []) |
+                                                                    byte(),
+                                                                    <<_:8,
+                                                                      _:_*8>> |
+                                                                    []) |
+                                       integer(),
+                                       <<_:8, _:_*8>> | []) |
+          integer()
+iodata.erl:7: The success typing for iodata:encode/2 implies that the function might also return 
+          integer() but the specification return is 
+          binary() |
+          maybe_improper_list(binary() |
+                              maybe_improper_list(any(), binary() | []) |
+                              byte(),
+                              binary() | [])
diff --git a/lib/dialyzer/test/indent2_SUITE_data/results/remote b/lib/dialyzer/test/indent2_SUITE_data/results/remote
new file mode 100644
index 0000000000..6decec6c6a
--- /dev/null
+++ b/lib/dialyzer/test/indent2_SUITE_data/results/remote
@@ -0,0 +1,25 @@
+
+remotes1.erl:17: The specification for remotes1:foo5/1 states that the function might also return 
+          'ko' but the inferred return is 
+          'ok'
+remotes1.erl:20: Type specification remotes1:foo6
+          ('ok' | 'ko') -> 'ok' is a supertype of the success typing: remotes1:foo6
+          ('ok') -> 'ok'
+remotes1.erl:25: The specification for remotes1:foo7/1 states that the function might also return 
+          'ko' but the inferred return is 
+          'ok'
+remotes1.erl:28: Type specification remotes1:foo8
+          (local_type_42()) -> 'ok' is a supertype of the success typing: remotes1:foo8
+          ('ok') -> 'ok'
+remotes1.erl:33: The specification for remotes1:foo9/1 states that the function might also return 
+          'ko' but the inferred return is 
+          'ok'
+remotes1.erl:36: Type specification remotes1:foo10
+          (local_and_known_remote_type_42()) -> 'ok' is a supertype of the success typing: remotes1:foo10
+          ('ok') -> 'ok'
+remotes1.erl:49: Type specification remotes1:foo13
+          ('ok') -> local_and_unknown_remote_type_42() is a supertype of the success typing: remotes1:foo13
+          ('ok') -> 'ok'
+remotes1.erl:52: Type specification remotes1:foo14
+          (local_and_unknown_remote_type_42()) -> 'ok' is a supertype of the success typing: remotes1:foo14
+          ('ok') -> 'ok'
diff --git a/lib/dialyzer/test/indent2_SUITE_data/src/arr.erl b/lib/dialyzer/test/indent2_SUITE_data/src/arr.erl
new file mode 100644
index 0000000000..3b265ccec2
--- /dev/null
+++ b/lib/dialyzer/test/indent2_SUITE_data/src/arr.erl
@@ -0,0 +1,41 @@
+-module(arr).
+
+%% http://erlang.org/pipermail/erlang-questions/2014-August/080445.html
+
+-define(A, array).
+
+-export([test/3, test2/3, test3/3, test4/3, test5/3, test6/3]).
+
+-spec test(?A:array(T), non_neg_integer(), T) -> ?A:array(T).
+
+test(Array, N, Value) ->
+    ?A:set(N, Value, Array).
+
+-spec test2(?A:array(T), non_neg_integer(), T) -> ?A:array(T).
+
+test2(Array, N, Value) when N > 0 ->
+    ?A:set(N, Value, Array).
+
+-spec test3(?A:array(T), non_neg_integer(), _) -> ?A:array(T).
+
+test3(Array, N, Value) ->
+    ?A:set(N, Value, Array).
+
+-spec test4(?A:array(T), non_neg_integer(), _) -> ?A:array(T).
+
+test4(Array, N, Value) when N > 0 ->
+    ?A:set(N, Value, Array).
+
+-spec test5(?A:array(T), non_neg_integer(), T) -> ?A:array(T).
+
+test5(Array, N, Value) when is_integer(Value) ->
+    ?A:set(N, Value, Array).
+
+%% One would ideally want a warning also for test6(), but the current
+%% analysis of parametrized opaque types is not strong enough to
+%% discover this.
+-spec test6(?A:array(integer()), non_neg_integer(), integer()) ->
+                   ?A:array(any()).
+
+test6(Array, N, Value) ->
+     ?A:set(N, Value, Array).
diff --git a/lib/dialyzer/test/indent2_SUITE_data/src/iodata.erl b/lib/dialyzer/test/indent2_SUITE_data/src/iodata.erl
new file mode 100644
index 0000000000..caa44f6c91
--- /dev/null
+++ b/lib/dialyzer/test/indent2_SUITE_data/src/iodata.erl
@@ -0,0 +1,41 @@
+-module(iodata).
+
+%% A small part of beam_asm.
+
+-export([encode/2]).
+
+-spec encode(non_neg_integer(), integer()) -> iodata(). % extra range binary()
+
+encode(Tag, N) when Tag >= 0, N < 0 ->
+    encode1(Tag, negative_to_bytes(N));
+encode(Tag, N) when Tag >= 0, N < 16 ->
+    (N bsl 4) bor Tag; % not in the specification
+encode(Tag, N) when Tag >= 0, N < 16#800  ->
+    [((N bsr 3) band 2#11100000) bor Tag bor 2#00001000, N band 16#ff];
+encode(Tag, N) when Tag >= 0 ->
+    encode1(Tag, to_bytes(N)).
+
+encode1(Tag, Bytes) ->
+    case iolist_size(Bytes) of
+	Num when 2 =< Num, Num =< 8 ->
+	    [((Num-2) bsl 5) bor 2#00011000 bor Tag| Bytes];
+	Num when 8 < Num ->
+	    [2#11111000 bor Tag, encode(0, Num-9)| Bytes]
+    end.
+
+to_bytes(N) ->
+    Bin = binary:encode_unsigned(N),
+    case Bin of
+	<<0:1,_/bits>> -> Bin;
+	<<1:1,_/bits>> -> [0,Bin]
+    end.
+
+negative_to_bytes(N) when N >= -16#8000 ->
+    <<N:16>>;
+negative_to_bytes(N) ->
+    Bytes = byte_size(binary:encode_unsigned(-N)),
+    Bin = <<N:Bytes/unit:8>>,
+    case Bin of
+	<<0:1,_/bits>> -> [16#ff,Bin];
+	<<1:1,_/bits>> -> Bin
+    end.
diff --git a/lib/dialyzer/test/indent2_SUITE_data/src/remote/remotes1.erl b/lib/dialyzer/test/indent2_SUITE_data/src/remote/remotes1.erl
new file mode 100644
index 0000000000..b722495095
--- /dev/null
+++ b/lib/dialyzer/test/indent2_SUITE_data/src/remote/remotes1.erl
@@ -0,0 +1,61 @@
+-module(remotes1).
+
+-compile(export_all).
+
+-spec foo1(some_unknown_remote:type42()) -> ok.
+foo1(ok) -> ok.
+
+-spec foo2(ok) -> some_unknown_remote:type42().
+foo2(ok) -> ok.
+
+-spec foo3(some_known_remote:type42()) -> ok.
+foo3(ok) -> ok.
+
+-spec foo4(ok) -> some_known_remote:type42().
+foo4(ok) -> ok.
+
+-spec foo5(ok|ko) -> ok|ko.
+foo5(ok) -> ok.
+
+-spec foo6(ok|ko) -> ok.
+foo6(ok) -> ok.
+
+-type local_type_42() :: ok | ko.
+
+-spec foo7(ok) -> local_type_42().
+foo7(ok) -> ok.
+
+-spec foo8(local_type_42()) -> ok.
+foo8(ok) -> ok.
+
+-type local_and_known_remote_type_42() :: some_known_remote:type42() | ok | ko.
+
+-spec foo9(ok) -> local_and_known_remote_type_42().
+foo9(ok) -> ok.
+
+-spec foo10(local_and_known_remote_type_42()) -> ok.
+foo10(ok) -> ok.
+
+-type local_and_ok_known_remote_type_42() :: some_known_remote:type42() | ok.
+
+-spec foo11(ok) -> local_and_ok_known_remote_type_42().
+foo11(ok) -> ok.
+
+-spec foo12(local_and_ok_known_remote_type_42()) -> ok.
+foo12(ok) -> ok.
+
+-type local_and_unknown_remote_type_42() :: some_unknown_remote:type42() | ok | ko.
+
+-spec foo13(ok) -> local_and_unknown_remote_type_42().
+foo13(ok) -> ok.
+
+-spec foo14(local_and_unknown_remote_type_42()) -> ok.
+foo14(ok) -> ok.
+
+-type local_and_ok_unknown_remote_type_42() :: some_unknown_remote:type42() | ok.
+
+-spec foo15(ok) -> local_and_ok_unknown_remote_type_42().
+foo15(ok) -> ok.
+
+-spec foo16(local_and_ok_unknown_remote_type_42()) -> ok.
+foo16(ok) -> ok.
diff --git a/lib/dialyzer/test/indent2_SUITE_data/src/remote/some_known_remote.erl b/lib/dialyzer/test/indent2_SUITE_data/src/remote/some_known_remote.erl
new file mode 100644
index 0000000000..437f1e7826
--- /dev/null
+++ b/lib/dialyzer/test/indent2_SUITE_data/src/remote/some_known_remote.erl
@@ -0,0 +1,5 @@
+-module(some_known_remote).
+
+-export_type([type42/0]).
+
+-type type42() :: ok | ko.
diff --git a/lib/dialyzer/test/indent_SUITE_data/dialyzer_options b/lib/dialyzer/test/indent_SUITE_data/dialyzer_options
new file mode 100644
index 0000000000..7c088f9a65
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/dialyzer_options
@@ -0,0 +1 @@
+{dialyzer_options, [{warnings, [no_unused, no_return, race_conditions]}]}.
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/abs b/lib/dialyzer/test/indent_SUITE_data/results/abs
new file mode 100644
index 0000000000..ac663a4e80
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/abs
@@ -0,0 +1,13 @@
+
+abs.erl:16: The pattern 
+          'true' can never match the type 
+          'false'
+abs.erl:27: The pattern 
+          'true' can never match the type 
+          'false'
+abs.erl:37: The pattern 
+          'true' can never match the type 
+          'false'
+abs.erl:49: The pattern 
+          'true' can never match the type 
+          'false'
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/app_call b/lib/dialyzer/test/indent_SUITE_data/results/app_call
new file mode 100644
index 0000000000..729587b5c6
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/app_call
@@ -0,0 +1,9 @@
+
+app_call.erl:6: The call M:'foo'
+         () requires that M is of type 
+          atom() not 
+          42
+app_call.erl:9: The call 'mod':F
+         () requires that F is of type 
+          atom() not 
+          {'gazonk', []}
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/arr b/lib/dialyzer/test/indent_SUITE_data/results/arr
new file mode 100644
index 0000000000..9497d12eec
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/arr
@@ -0,0 +1,4 @@
+
+arr.erl:14: Type specification arr:test2(array:array(T),non_neg_integer(),T) -> array:array(T) is a supertype of the success typing: arr:test2(array:array(_),pos_integer(),_) -> array:array(_)
+arr.erl:24: Type specification arr:test4(array:array(T),non_neg_integer(),_) -> array:array(T) is a supertype of the success typing: arr:test4(array:array(_),pos_integer(),_) -> array:array(_)
+arr.erl:29: Type specification arr:test5(array:array(T),non_neg_integer(),T) -> array:array(T) is a supertype of the success typing: arr:test5(array:array(_),non_neg_integer(),integer()) -> array:array(_)
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/blame_contract_range b/lib/dialyzer/test/indent_SUITE_data/results/blame_contract_range
new file mode 100644
index 0000000000..287d23d91f
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/blame_contract_range
@@ -0,0 +1,8 @@
+
+blame_contract_range.erl:14: The contract blame_contract_range:bar
+          (atom()) -> 'a' cannot be right because the inferred return for bar
+         ('b') on line 12 is 
+          'b'
+blame_contract_range.erl:15: The pattern 
+          'a' can never match the type 
+          'b'
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/bs_fail_constr b/lib/dialyzer/test/indent_SUITE_data/results/bs_fail_constr
new file mode 100644
index 0000000000..86f1329bf3
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/bs_fail_constr
@@ -0,0 +1,9 @@
+
+bs_fail_constr.erl:12: Binary construction will fail since the size field S in segment 42:S has type 
+          neg_integer()
+bs_fail_constr.erl:15: Binary construction will fail since the value field V in segment V/utf32 has type 
+          float()
+bs_fail_constr.erl:6: Binary construction will fail since the value field V in segment V has type 
+          float()
+bs_fail_constr.erl:9: Binary construction will fail since the value field V in segment V/binary has type 
+          atom()
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/callbacks_and_specs b/lib/dialyzer/test/indent_SUITE_data/results/callbacks_and_specs
new file mode 100644
index 0000000000..dd9d3397d2
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/callbacks_and_specs
@@ -0,0 +1,23 @@
+
+my_callbacks_wrong.erl:26: The return type 
+          #state{parent :: pid(),
+                 status :: 'closed' | 'init' | 'open',
+                 subscribe :: [{pid(), integer()}],
+                 counter :: integer()} in the specification of callback_init/1 is not a subtype of 
+          {'ok', _}, which is the expected return type for the callback of the my_behaviour behaviour
+my_callbacks_wrong.erl:28: The inferred return type of callback_init/1 
+         (#state{parent :: pid(),
+                 status :: 'init',
+                 subscribe :: [],
+                 counter :: 1}) has nothing in common with 
+          {'ok', _}, which is the expected return type for the callback of the my_behaviour behaviour
+my_callbacks_wrong.erl:30: The return type 
+          {'reply',
+           #state{parent :: pid(),
+                  status :: 'closed' | 'init' | 'open',
+                  subscribe :: [{pid(), integer()}],
+                  counter :: integer()}} in the specification of callback_cast/3 is not a subtype of 
+          {'noreply', _}, which is the expected return type for the callback of the my_behaviour behaviour
+my_callbacks_wrong.erl:39: The specified type for the 2nd argument of callback_call/3 (
+          atom()) is not a supertype of 
+          pid(), which is expected type for this argument in the callback of the my_behaviour behaviour
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/contract3 b/lib/dialyzer/test/indent_SUITE_data/results/contract3
new file mode 100644
index 0000000000..6e111f87d9
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/contract3
@@ -0,0 +1,3 @@
+
+contract3.erl:17: Overloaded contract for contract3:t1/1 has overlapping domains; such contracts are currently unsupported and are simply ignored
+contract3.erl:29: Overloaded contract for contract3:t3/3 has overlapping domains; such contracts are currently unsupported and are simply ignored
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/contracts_with_subtypes b/lib/dialyzer/test/indent_SUITE_data/results/contracts_with_subtypes
new file mode 100644
index 0000000000..737959a49d
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/contracts_with_subtypes
@@ -0,0 +1,142 @@
+
+contracts_with_subtypes.erl:106: The call contracts_with_subtypes:rec_arg
+         ({'a', 'b'}) breaks the contract 
+          (Arg) -> 'ok'
+             when
+                 Arg :: {'a', A} | {'b', B},
+                 A :: 'a' | {'b', B},
+                 B :: 'b' | {'a', A}
+contracts_with_subtypes.erl:107: The call contracts_with_subtypes:rec_arg
+         ({'b', 'a'}) breaks the contract 
+          (Arg) -> 'ok'
+             when
+                 Arg :: {'a', A} | {'b', B},
+                 A :: 'a' | {'b', B},
+                 B :: 'b' | {'a', A}
+contracts_with_subtypes.erl:109: The call contracts_with_subtypes:rec_arg
+         ({'b', {'a', 'b'}}) breaks the contract 
+          (Arg) -> 'ok'
+             when
+                 Arg :: {'a', A} | {'b', B},
+                 A :: 'a' | {'b', B},
+                 B :: 'b' | {'a', A}
+contracts_with_subtypes.erl:135: The call contracts_with_subtypes:rec2
+         ({'a', 'b'}) breaks the contract 
+          (Arg) -> 'ok' when Arg :: ab()
+contracts_with_subtypes.erl:136: The call contracts_with_subtypes:rec2
+         ({'b', 'a'}) breaks the contract 
+          (Arg) -> 'ok' when Arg :: ab()
+contracts_with_subtypes.erl:137: The call contracts_with_subtypes:rec2
+         ({'a', {'b', 'a'}}) breaks the contract 
+          (Arg) -> 'ok' when Arg :: ab()
+contracts_with_subtypes.erl:138: The call contracts_with_subtypes:rec2
+         ({'b', {'a', 'b'}}) breaks the contract 
+          (Arg) -> 'ok' when Arg :: ab()
+contracts_with_subtypes.erl:139: The call contracts_with_subtypes:rec2
+         ({'a', {'b', {'a', 'b'}}}) breaks the contract 
+          (Arg) -> 'ok' when Arg :: ab()
+contracts_with_subtypes.erl:140: The call contracts_with_subtypes:rec2
+         ({'b', {'a', {'b', 'a'}}}) breaks the contract 
+          (Arg) -> 'ok' when Arg :: ab()
+contracts_with_subtypes.erl:141: The call contracts_with_subtypes:rec2
+         ({'a', {'b', {'a', {'b', 'a'}}}}) breaks the contract 
+          (Arg) -> 'ok' when Arg :: ab()
+contracts_with_subtypes.erl:142: The call contracts_with_subtypes:rec2
+         ({'b', {'a', {'b', {'a', 'b'}}}}) breaks the contract 
+          (Arg) -> 'ok' when Arg :: ab()
+contracts_with_subtypes.erl:175: The pattern 
+          1 can never match the type 
+          string()
+contracts_with_subtypes.erl:178: The pattern 
+          'alpha' can never match the type 
+          {'ok', _} | {'ok', _, string()}
+contracts_with_subtypes.erl:180: The pattern 
+          42 can never match the type 
+          {'ok', _} | {'ok', _, string()}
+contracts_with_subtypes.erl:196: The pattern 
+          'alpha' can never match the type 
+          {'ok', _}
+contracts_with_subtypes.erl:198: The pattern 
+          42 can never match the type 
+          {'ok', _}
+contracts_with_subtypes.erl:216: The pattern 
+          'alpha' can never match the type 
+          {'ok', _}
+contracts_with_subtypes.erl:218: The pattern 
+          42 can never match the type 
+          {'ok', _}
+contracts_with_subtypes.erl:235: The pattern 
+          1 can never match the type 
+          string()
+contracts_with_subtypes.erl:238: The pattern 
+          {'ok', _} can never match the type 
+          {'ok', _, string()}
+contracts_with_subtypes.erl:239: The pattern 
+          'alpha' can never match the type 
+          {'ok', _, string()}
+contracts_with_subtypes.erl:23: Invalid type specification for function contracts_with_subtypes:extract2/0. The success typing is 
+          () -> 'something'
+contracts_with_subtypes.erl:240: The pattern 
+          {'ok', 42} can never match the type 
+          {'ok', _, string()}
+contracts_with_subtypes.erl:241: The pattern 
+          42 can never match the type 
+          {'ok', _, string()}
+contracts_with_subtypes.erl:268: The call contracts_with_subtypes:flat_ets_new
+         (12,
+          []) breaks the contract 
+          (Name, Options) -> atom()
+             when
+                 Name :: atom(),
+                 Options :: [Option],
+                 Option ::
+                     'set' | 'ordered_set' | 'bag' | 'duplicate_bag' |
+                     'public' | 'protected' | 'private' |
+                     'named_table' |
+                     {'keypos', integer()} |
+                     {'heir', pid(), term()} |
+                     {'heir', 'none'} |
+                     {'write_concurrency', boolean()} |
+                     {'read_concurrency', boolean()} |
+                     'compressed'
+contracts_with_subtypes.erl:295: The call contracts_with_subtypes:factored_ets_new
+         (12,
+          []) breaks the contract 
+          (Name, Options) -> atom()
+             when
+                 Name :: atom(),
+                 Options :: [Option],
+                 Option ::
+                     Type | Access | 'named_table' |
+                     {'keypos', Pos} |
+                     {'heir', Pid :: pid(), HeirData} |
+                     {'heir', 'none'} |
+                     Tweaks,
+                 Type :: type(),
+                 Access :: access(),
+                 Tweaks ::
+                     {'write_concurrency', boolean()} |
+                     {'read_concurrency', boolean()} |
+                     'compressed',
+                 Pos :: pos_integer(),
+                 HeirData :: term()
+contracts_with_subtypes.erl:77: The call contracts_with_subtypes:foo1
+         (5) breaks the contract 
+          (Arg1) -> Res when Arg1 :: atom(), Res :: atom()
+contracts_with_subtypes.erl:78: The call contracts_with_subtypes:foo2
+         (5) breaks the contract 
+          (Arg1) -> Res when Arg1 :: Arg2, Arg2 :: atom(), Res :: atom()
+contracts_with_subtypes.erl:79: The call contracts_with_subtypes:foo3
+         (5) breaks the contract 
+          (Arg1) -> Res when Arg2 :: atom(), Arg1 :: Arg2, Res :: atom()
+contracts_with_subtypes.erl:7: Invalid type specification for function contracts_with_subtypes:extract/0. The success typing is 
+          () -> 'something'
+contracts_with_subtypes.erl:80: The call contracts_with_subtypes:foo4
+         (5) breaks the contract 
+          (Type) -> Type when Type :: atom()
+contracts_with_subtypes.erl:81: The call contracts_with_subtypes:foo5
+         (5) breaks the contract 
+          (Type :: atom()) -> Type :: atom()
+contracts_with_subtypes.erl:82: The call contracts_with_subtypes:foo6
+         (5) breaks the contract 
+          (Type) -> Type when Type :: atom()
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/dict_use b/lib/dialyzer/test/indent_SUITE_data/results/dict_use
new file mode 100644
index 0000000000..c6863d057e
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/dict_use
@@ -0,0 +1,48 @@
+
+dict_use.erl:41: The attempt to match a term of type 
+          dict:dict(_, _) against the pattern 
+          'gazonk' breaks the opacity of the term
+dict_use.erl:45: The attempt to match a term of type 
+          dict:dict(_, _) against the pattern 
+          [] breaks the opacity of the term
+dict_use.erl:46: The attempt to match a term of type 
+          dict:dict(_, _) against the pattern 
+          42 breaks the opacity of the term
+dict_use.erl:51: The attempt to match a term of type 
+          dict:dict(_, _) against the pattern 
+          [] breaks the opacity of the term
+dict_use.erl:52: The attempt to match a term of type 
+          dict:dict(_, _) against the pattern 
+          42 breaks the opacity of the term
+dict_use.erl:58: Attempt to test for equality between a term of type 
+          maybe_improper_list() and a term of opaque type 
+          dict:dict(_, _)
+dict_use.erl:60: Attempt to test for inequality between a term of type 
+          atom() and a term of opaque type 
+          dict:dict(_, _)
+dict_use.erl:64: Guard test length
+         (D :: dict:dict(_, _)) breaks the opacity of its argument
+dict_use.erl:65: Guard test is_atom
+         (D :: dict:dict(_, _)) breaks the opacity of its argument
+dict_use.erl:66: Guard test is_list
+         (D :: dict:dict(_, _)) breaks the opacity of its argument
+dict_use.erl:70: The type test is_list
+         (dict:dict(_, _)) breaks the opacity of the term 
+          dict:dict(_, _)
+dict_use.erl:73: The call dict:fetch
+         ('foo',
+          [1, 2, 3]) does not have an opaque term of type 
+          dict:dict(_, _) as 2nd argument
+dict_use.erl:76: The call dict:merge
+         (Fun :: any(),
+          42,
+          [1, 2]) does not have opaque terms as 2nd and 3rd arguments
+dict_use.erl:79: The call dict:store
+         (42,
+          'elli',
+          {'dict', 0, 16, 16, 8, 80, 48,
+           {[], [], [], [], [], [], [], [], [], [], [], [], [], [], [],
+            []},
+           {{[], [], [], [], [], [], [], [], [], [], [], [], [], [], [],
+             []}}}) does not have an opaque term of type 
+          dict:dict(_, _) as 3rd argument
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/fun_app b/lib/dialyzer/test/indent_SUITE_data/results/fun_app
new file mode 100644
index 0000000000..d4a3caf749
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/fun_app
@@ -0,0 +1,7 @@
+
+fun_app.erl:37: Fun application will fail since F :: 
+          fun((_, _, _) -> 'ok' | 'true') is not a function of arity 1
+fun_app.erl:38: Fun application will fail since F :: 
+          fun((_, _, _) -> 'ok' | 'true') is not a function of arity 2
+fun_app.erl:40: Fun application will fail since F :: 
+          fun((_, _, _) -> 'ok' | 'true') is not a function of arity 4
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/fun_app_args b/lib/dialyzer/test/indent_SUITE_data/results/fun_app_args
new file mode 100644
index 0000000000..ac1bbb62b8
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/fun_app_args
@@ -0,0 +1,5 @@
+
+fun_app_args.erl:12: Fun application with arguments 
+         ('b',
+          []) will fail since the function has type 
+          'c' | fun(('a', []) -> any()), which differs in the 1st argument
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/guard_update b/lib/dialyzer/test/indent_SUITE_data/results/guard_update
new file mode 100644
index 0000000000..bd0e8cd5dd
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/guard_update
@@ -0,0 +1,6 @@
+
+guard_update.erl:6: The call guard_update:f
+         (#{'a' => 2}) will never return since it differs in the 1st argument from the success typing arguments: 
+         (#{'b' := _, _ => _})
+guard_update.erl:8: Clause guard cannot succeed. The variable M was matched against the type 
+          #{'a' := 2}
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/guard_warnings b/lib/dialyzer/test/indent_SUITE_data/results/guard_warnings
new file mode 100644
index 0000000000..a6cb54ff9c
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/guard_warnings
@@ -0,0 +1,134 @@
+
+guard_warnings.erl:100: Guard test not
+         ('true') can never succeed
+guard_warnings.erl:102: Guard test 
+          X :: 'true' =:= 
+          'false' can never succeed
+guard_warnings.erl:104: Guard test 
+          X :: 'true' == 
+          'false' can never succeed
+guard_warnings.erl:106: Guard test 
+          X :: 'true' =/= 
+          'true' can never succeed
+guard_warnings.erl:12: Guard test 
+          X :: 'true' =:= 
+          'false' can never succeed
+guard_warnings.erl:14: Guard test 
+          X :: 'false' =:= 
+          'true' can never succeed
+guard_warnings.erl:16: Guard test not
+         (X :: 'true') can never succeed
+guard_warnings.erl:18: Guard test and
+         ('true',
+          X :: none()) can never succeed
+guard_warnings.erl:20: Guard test not
+         (X :: 'true') can never succeed
+guard_warnings.erl:22: Guard test and
+         ('true',
+          X :: none()) can never succeed
+guard_warnings.erl:28: Guard test not(not
+         (X :: 'false')) can never succeed
+guard_warnings.erl:30: Guard test not(or
+         ('false',
+          X :: none())) can never succeed
+guard_warnings.erl:32: Guard test not(not
+         (X :: 'false')) can never succeed
+guard_warnings.erl:34: Guard test not(or
+         ('false',
+          X :: none())) can never succeed
+guard_warnings.erl:36: Guard test and
+         ('true',
+          'false') can never succeed
+guard_warnings.erl:38: Guard test and
+         ('false',
+          any()) can never succeed
+guard_warnings.erl:40: Guard test and
+         (X :: 'true',
+          'false') can never succeed
+guard_warnings.erl:42: Guard test and
+         ('false',
+          X :: any()) can never succeed
+guard_warnings.erl:44: Guard test and
+         (X :: 'true',
+          'false') can never succeed
+guard_warnings.erl:46: Guard test and
+         ('false',
+          X :: any()) can never succeed
+guard_warnings.erl:48: Guard test not(or
+         ('true',
+          any())) can never succeed
+guard_warnings.erl:50: Guard test not(or
+         ('false',
+          'true')) can never succeed
+guard_warnings.erl:52: Guard test not(or
+         ('true',
+          X :: any())) can never succeed
+guard_warnings.erl:54: Guard test not(or
+         (X :: 'false',
+          'true')) can never succeed
+guard_warnings.erl:56: Guard test not(or
+         ('true',
+          X :: any())) can never succeed
+guard_warnings.erl:58: Guard test not(or
+         (X :: 'false',
+          'true')) can never succeed
+guard_warnings.erl:60: Guard test and
+         ('false',
+          any()) can never succeed
+guard_warnings.erl:62: Guard test and
+         ('true',
+          'false') can never succeed
+guard_warnings.erl:64: Guard test and
+         ('false',
+          X :: any()) can never succeed
+guard_warnings.erl:66: Guard test and
+         (X :: 'true',
+          'false') can never succeed
+guard_warnings.erl:68: Guard test and
+         ('false',
+          X :: any()) can never succeed
+guard_warnings.erl:70: Guard test and
+         (X :: 'true',
+          'false') can never succeed
+guard_warnings.erl:72: Guard test and
+         ('false',
+          'false') can never succeed
+guard_warnings.erl:74: Guard test and
+         ('false',
+          'false') can never succeed
+guard_warnings.erl:76: Guard test not(and
+         ('true',
+          'true')) can never succeed
+guard_warnings.erl:78: Guard test and
+         ('false',
+          'false') can never succeed
+guard_warnings.erl:80: Guard test not(and
+         ('true',
+          'true')) can never succeed
+guard_warnings.erl:82: Guard test or
+         ('false',
+          'false') can never succeed
+guard_warnings.erl:84: Guard test or
+         ('false',
+          'false') can never succeed
+guard_warnings.erl:86: Guard test or
+         ('false',
+          'false') can never succeed
+guard_warnings.erl:88: Guard test or
+         ('false',
+          'false') can never succeed
+guard_warnings.erl:90: Guard test or
+         ('false',
+          'false') can never succeed
+guard_warnings.erl:92: Guard test 
+          'true' =:= 
+          'false' can never succeed
+guard_warnings.erl:94: Guard test 
+          'true' == 
+          'false' can never succeed
+guard_warnings.erl:96: Guard test 
+          'true' =:= 
+          'false' can never succeed
+guard_warnings.erl:98: Guard test not(
+          'true' == 
+          'true') can never succeed
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/map_galore b/lib/dialyzer/test/indent_SUITE_data/results/map_galore
new file mode 100644
index 0000000000..1b63e28ace
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/map_galore
@@ -0,0 +1,713 @@
+
+map_galore.erl:1000: A key of type 
+          42 cannot exist in a map of type 
+          #{1 := 'a',
+            2 := 'b',
+            4 := 'd',
+            5 := 'e',
+            float() => 'c' | 'v'}
+map_galore.erl:1080: A key of type 
+          'nonexisting' cannot exist in a map of type 
+          #{10 := 'a0',
+            11 := 'a1',
+            12 := 'a2',
+            13 := 'a3',
+            14 := 'a4',
+            15 := 'a5',
+            16 := 'a6',
+            17 := 'a7',
+            18 := 'a8',
+            19 := 'a9',
+            20 := 'b0',
+            21 := 'b1',
+            22 := 'b2',
+            23 := 'b3',
+            24 := 'b4',
+            25 := 'b5',
+            26 := 'b6',
+            27 := 'b7',
+            28 := 'b8',
+            29 := 'b9',
+            30 := [48 | 99, ...],
+            31 := [49 | 99, ...],
+            32 := [50 | 99, ...],
+            33 := [51 | 99, ...],
+            34 := [52 | 99, ...],
+            35 := [53 | 99, ...],
+            36 := [54 | 99, ...],
+            37 := [55 | 99, ...],
+            38 := [56 | 99, ...],
+            39 := [57 | 99, ...],
+            <<_:16>> |
+            [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57, ...] |
+            float() |
+            {[[48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57, ...],
+              ...]} |
+            #{'k16' => 'a6',
+              'k26' => 'b6',
+              'k36' => [54 | 99, ...],
+              'map' => 'key',
+              'one' => 'small',
+              'second' => 'small',
+              'third' => 'small',
+              10 => 'a0',
+              11 => 'a1',
+              12 => 'a2',
+              13 => 'a3',
+              14 => 'a4',
+              15 => 'a5',
+              16 => 'a6',
+              17 => 'a7',
+              18 => 'a8',
+              19 => 'a9',
+              20 => 'b0',
+              21 => 'b1',
+              22 => 'b2',
+              23 => 'b3',
+              24 => 'b4',
+              25 => 'b5',
+              26 => 'b6',
+              27 => 'b7',
+              28 => 'b8',
+              29 => 'b9',
+              30 => [48 | 99, ...],
+              31 => [49 | 99, ...],
+              32 => [50 | 99, ...],
+              33 => [51 | 99, ...],
+              34 => [52 | 99, ...],
+              35 => [53 | 99, ...],
+              36 => [54 | 99, ...],
+              37 => [55 | 99, ...],
+              38 => [56 | 99, ...],
+              39 => [57 | 99, ...],
+              <<_:16>> |
+              [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57, ...] |
+              {[[48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57, ...],
+                ...]} =>
+                  [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 |
+                   100 | 101,
+                   ...]} =>
+                atom() | [1..255, ...]}
+map_galore.erl:1082: A key of type 
+          42 cannot exist in a map of type 
+          #{10 := 'a0',
+            11 := 'a1',
+            12 := 'a2',
+            13 := 'a3',
+            14 := 'a4',
+            15 := 'a5',
+            16 := 'a6',
+            17 := 'a7',
+            18 := 'a8',
+            19 := 'a9',
+            20 := 'b0',
+            21 := 'b1',
+            22 := 'b2',
+            23 := 'b3',
+            24 := 'b4',
+            25 := 'b5',
+            26 := 'b6',
+            27 := 'b7',
+            28 := 'b8',
+            29 := 'b9',
+            30 := [48 | 99, ...],
+            31 := [49 | 99, ...],
+            32 := [50 | 99, ...],
+            33 := [51 | 99, ...],
+            34 := [52 | 99, ...],
+            35 := [53 | 99, ...],
+            36 := [54 | 99, ...],
+            37 := [55 | 99, ...],
+            38 := [56 | 99, ...],
+            39 := [57 | 99, ...],
+            <<_:16>> |
+            [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57, ...] |
+            float() |
+            {[[48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57, ...],
+              ...]} |
+            #{'k16' => 'a6',
+              'k26' => 'b6',
+              'k36' => [54 | 99, ...],
+              'map' => 'key',
+              'one' => 'small',
+              'second' => 'small',
+              'third' => 'small',
+              10 => 'a0',
+              11 => 'a1',
+              12 => 'a2',
+              13 => 'a3',
+              14 => 'a4',
+              15 => 'a5',
+              16 => 'a6',
+              17 => 'a7',
+              18 => 'a8',
+              19 => 'a9',
+              20 => 'b0',
+              21 => 'b1',
+              22 => 'b2',
+              23 => 'b3',
+              24 => 'b4',
+              25 => 'b5',
+              26 => 'b6',
+              27 => 'b7',
+              28 => 'b8',
+              29 => 'b9',
+              30 => [48 | 99, ...],
+              31 => [49 | 99, ...],
+              32 => [50 | 99, ...],
+              33 => [51 | 99, ...],
+              34 => [52 | 99, ...],
+              35 => [53 | 99, ...],
+              36 => [54 | 99, ...],
+              37 => [55 | 99, ...],
+              38 => [56 | 99, ...],
+              39 => [57 | 99, ...],
+              <<_:16>> |
+              [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57, ...] |
+              {[[48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57, ...],
+                ...]} =>
+                  [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 |
+                   100 | 101,
+                   ...]} =>
+                atom() | [1..255, ...]}
+map_galore.erl:1140: The call map_galore:map_guard_sequence_1
+         (#{seq => 6, val => "e"}) will never return since it differs in the 1st argument from the success typing arguments: 
+         (#{'seq' := 1 | 2 | 3 | 4 | 5,
+            'val' := [97 | 98 | 99 | 100 | 101, ...],
+            10 => 'a0',
+            11 => 'a1',
+            12 => 'a2',
+            13 => 'a3',
+            14 => 'a4',
+            15 => 'a5',
+            16 => 'a6',
+            17 => 'a7',
+            18 => 'a8',
+            19 => 'a9',
+            20 => 'b0',
+            21 => 'b1',
+            22 => 'b2',
+            23 => 'b3',
+            24 => 'b4',
+            25 => 'b5',
+            26 => 'b6',
+            27 => 'b7',
+            28 => 'b8',
+            29 => 'b9',
+            30 => [48 | 99, ...],
+            31 => [49 | 99, ...],
+            32 => [50 | 99, ...],
+            33 => [51 | 99, ...],
+            34 => [52 | 99, ...],
+            35 => [53 | 99, ...],
+            36 => [54 | 99, ...],
+            37 => [55 | 99, ...],
+            38 => [56 | 99, ...],
+            39 => [57 | 99, ...],
+            <<_:16>> |
+            [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57, ...] |
+            float() |
+            {[any(), ...]} |
+            #{'k16' => 'a6',
+              'k26' => 'b6',
+              'k36' => [any(), ...],
+              'map' => 'key',
+              'one' => 'small',
+              'second' => 'small',
+              'third' => 'small',
+              10 => 'a0',
+              11 => 'a1',
+              12 => 'a2',
+              13 => 'a3',
+              14 => 'a4',
+              15 => 'a5',
+              16 => 'a6',
+              17 => 'a7',
+              18 => 'a8',
+              19 => 'a9',
+              20 => 'b0',
+              21 => 'b1',
+              22 => 'b2',
+              23 => 'b3',
+              24 => 'b4',
+              25 => 'b5',
+              26 => 'b6',
+              27 => 'b7',
+              28 => 'b8',
+              29 => 'b9',
+              30 => [any(), ...],
+              31 => [any(), ...],
+              32 => [any(), ...],
+              33 => [any(), ...],
+              34 => [any(), ...],
+              35 => [any(), ...],
+              36 => [any(), ...],
+              37 => [any(), ...],
+              38 => [any(), ...],
+              39 => [any(), ...],
+              <<_:16>> | [any(), ...] | {_} => [any(), ...]} =>
+                atom() | [1..255, ...]})
+map_galore.erl:1141: The call map_galore:map_guard_sequence_2
+         (#{'b' => 5}) will never return since it differs in the 1st argument from the success typing arguments: 
+         (#{'a' := 'gg' | 'kk' | 'sc' | 3 | 4,
+            'b' => 'other' | 3 | 4 | 5,
+            'c' => 'sc2',
+            10 => 'a0',
+            11 => 'a1',
+            12 => 'a2',
+            13 => 'a3',
+            14 => 'a4',
+            15 => 'a5',
+            16 => 'a6',
+            17 => 'a7',
+            18 => 'a8',
+            19 => 'a9',
+            20 => 'b0',
+            21 => 'b1',
+            22 => 'b2',
+            23 => 'b3',
+            24 => 'b4',
+            25 => 'b5',
+            26 => 'b6',
+            27 => 'b7',
+            28 => 'b8',
+            29 => 'b9',
+            30 => [48 | 99, ...],
+            31 => [49 | 99, ...],
+            32 => [50 | 99, ...],
+            33 => [51 | 99, ...],
+            34 => [52 | 99, ...],
+            35 => [53 | 99, ...],
+            36 => [54 | 99, ...],
+            37 => [55 | 99, ...],
+            38 => [56 | 99, ...],
+            39 => [57 | 99, ...],
+            <<_:16>> |
+            [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57, ...] |
+            float() |
+            {[any(), ...]} |
+            #{'k16' => 'a6',
+              'k26' => 'b6',
+              'k36' => [any(), ...],
+              'map' => 'key',
+              'one' => 'small',
+              'second' => 'small',
+              'third' => 'small',
+              10 => 'a0',
+              11 => 'a1',
+              12 => 'a2',
+              13 => 'a3',
+              14 => 'a4',
+              15 => 'a5',
+              16 => 'a6',
+              17 => 'a7',
+              18 => 'a8',
+              19 => 'a9',
+              20 => 'b0',
+              21 => 'b1',
+              22 => 'b2',
+              23 => 'b3',
+              24 => 'b4',
+              25 => 'b5',
+              26 => 'b6',
+              27 => 'b7',
+              28 => 'b8',
+              29 => 'b9',
+              30 => [any(), ...],
+              31 => [any(), ...],
+              32 => [any(), ...],
+              33 => [any(), ...],
+              34 => [any(), ...],
+              35 => [any(), ...],
+              36 => [any(), ...],
+              37 => [any(), ...],
+              38 => [any(), ...],
+              39 => [any(), ...],
+              <<_:16>> | [any(), ...] | {_} => [any(), ...]} =>
+                atom() | [1..255, ...]})
+map_galore.erl:1209: The call map_galore:map_guard_sequence_1
+         (#{'seq' := 6,
+            'val' := [101, ...],
+            10 := 'a0',
+            11 := 'a1',
+            12 := 'a2',
+            13 := 'a3',
+            14 := 'a4',
+            15 := 'a5',
+            16 := 'a6',
+            17 := 'a7',
+            18 := 'a8',
+            19 := 'a9',
+            20 := 'b0',
+            21 := 'b1',
+            22 := 'b2',
+            23 := 'b3',
+            24 := 'b4',
+            25 := 'b5',
+            26 := 'b6',
+            27 := 'b7',
+            28 := 'b8',
+            29 := 'b9',
+            30 := [48 | 99, ...],
+            31 := [49 | 99, ...],
+            32 := [50 | 99, ...],
+            33 := [51 | 99, ...],
+            34 := [52 | 99, ...],
+            35 := [53 | 99, ...],
+            36 := [54 | 99, ...],
+            37 := [55 | 99, ...],
+            38 := [56 | 99, ...],
+            39 := [57 | 99, ...],
+            <<_:16>> |
+            [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57, ...] |
+            float() |
+            {[[48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57, ...] | 3,
+              ...]} |
+            #{'k16' => 'a6',
+              'k26' => 'b6',
+              'k36' => [54 | 99, ...],
+              'map' => 'key',
+              'one' => 'small',
+              'second' => 'small',
+              'third' => 'small',
+              10 => 'a0',
+              11 => 'a1',
+              12 => 'a2',
+              13 => 'a3',
+              14 => 'a4',
+              15 => 'a5',
+              16 => 'a6',
+              17 => 'a7',
+              18 => 'a8',
+              19 => 'a9',
+              20 => 'b0',
+              21 => 'b1',
+              22 => 'b2',
+              23 => 'b3',
+              24 => 'b4',
+              25 => 'b5',
+              26 => 'b6',
+              27 => 'b7',
+              28 => 'b8',
+              29 => 'b9',
+              30 => [48 | 99, ...],
+              31 => [49 | 99, ...],
+              32 => [50 | 99, ...],
+              33 => [51 | 99, ...],
+              34 => [52 | 99, ...],
+              35 => [53 | 99, ...],
+              36 => [54 | 99, ...],
+              37 => [55 | 99, ...],
+              38 => [56 | 99, ...],
+              39 => [57 | 99, ...],
+              <<_:16>> |
+              [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57, ...] |
+              {[[48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57, ...],
+                ...]} =>
+                  [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 |
+                   100 | 101,
+                   ...]} =>
+                atom() | [1..255, ...]}) will never return since it differs in the 1st argument from the success typing arguments: 
+         (#{'seq' := 1 | 2 | 3 | 4 | 5,
+            'val' := [97 | 98 | 99 | 100 | 101, ...],
+            10 => 'a0',
+            11 => 'a1',
+            12 => 'a2',
+            13 => 'a3',
+            14 => 'a4',
+            15 => 'a5',
+            16 => 'a6',
+            17 => 'a7',
+            18 => 'a8',
+            19 => 'a9',
+            20 => 'b0',
+            21 => 'b1',
+            22 => 'b2',
+            23 => 'b3',
+            24 => 'b4',
+            25 => 'b5',
+            26 => 'b6',
+            27 => 'b7',
+            28 => 'b8',
+            29 => 'b9',
+            30 => [48 | 99, ...],
+            31 => [49 | 99, ...],
+            32 => [50 | 99, ...],
+            33 => [51 | 99, ...],
+            34 => [52 | 99, ...],
+            35 => [53 | 99, ...],
+            36 => [54 | 99, ...],
+            37 => [55 | 99, ...],
+            38 => [56 | 99, ...],
+            39 => [57 | 99, ...],
+            <<_:16>> |
+            [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57, ...] |
+            float() |
+            {[any(), ...]} |
+            #{'k16' => 'a6',
+              'k26' => 'b6',
+              'k36' => [any(), ...],
+              'map' => 'key',
+              'one' => 'small',
+              'second' => 'small',
+              'third' => 'small',
+              10 => 'a0',
+              11 => 'a1',
+              12 => 'a2',
+              13 => 'a3',
+              14 => 'a4',
+              15 => 'a5',
+              16 => 'a6',
+              17 => 'a7',
+              18 => 'a8',
+              19 => 'a9',
+              20 => 'b0',
+              21 => 'b1',
+              22 => 'b2',
+              23 => 'b3',
+              24 => 'b4',
+              25 => 'b5',
+              26 => 'b6',
+              27 => 'b7',
+              28 => 'b8',
+              29 => 'b9',
+              30 => [any(), ...],
+              31 => [any(), ...],
+              32 => [any(), ...],
+              33 => [any(), ...],
+              34 => [any(), ...],
+              35 => [any(), ...],
+              36 => [any(), ...],
+              37 => [any(), ...],
+              38 => [any(), ...],
+              39 => [any(), ...],
+              <<_:16>> | [any(), ...] | {_} => [any(), ...]} =>
+                atom() | [1..255, ...]})
+map_galore.erl:1210: The call map_galore:map_guard_sequence_2
+         (#{'b' := 5,
+            10 := 'a0',
+            11 := 'a1',
+            12 := 'a2',
+            13 := 'a3',
+            14 := 'a4',
+            15 := 'a5',
+            16 := 'a6',
+            17 := 'a7',
+            18 := 'a8',
+            19 := 'a9',
+            20 := 'b0',
+            21 := 'b1',
+            22 := 'b2',
+            23 := 'b3',
+            24 := 'b4',
+            25 := 'b5',
+            26 := 'b6',
+            27 := 'b7',
+            28 := 'b8',
+            29 := 'b9',
+            30 := [48 | 99, ...],
+            31 := [49 | 99, ...],
+            32 := [50 | 99, ...],
+            33 := [51 | 99, ...],
+            34 := [52 | 99, ...],
+            35 := [53 | 99, ...],
+            36 := [54 | 99, ...],
+            37 := [55 | 99, ...],
+            38 := [56 | 99, ...],
+            39 := [57 | 99, ...],
+            <<_:16>> |
+            [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57, ...] |
+            float() |
+            {[[48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57, ...] | 3,
+              ...]} |
+            #{'k16' => 'a6',
+              'k26' => 'b6',
+              'k36' => [54 | 99, ...],
+              'map' => 'key',
+              'one' => 'small',
+              'second' => 'small',
+              'third' => 'small',
+              10 => 'a0',
+              11 => 'a1',
+              12 => 'a2',
+              13 => 'a3',
+              14 => 'a4',
+              15 => 'a5',
+              16 => 'a6',
+              17 => 'a7',
+              18 => 'a8',
+              19 => 'a9',
+              20 => 'b0',
+              21 => 'b1',
+              22 => 'b2',
+              23 => 'b3',
+              24 => 'b4',
+              25 => 'b5',
+              26 => 'b6',
+              27 => 'b7',
+              28 => 'b8',
+              29 => 'b9',
+              30 => [48 | 99, ...],
+              31 => [49 | 99, ...],
+              32 => [50 | 99, ...],
+              33 => [51 | 99, ...],
+              34 => [52 | 99, ...],
+              35 => [53 | 99, ...],
+              36 => [54 | 99, ...],
+              37 => [55 | 99, ...],
+              38 => [56 | 99, ...],
+              39 => [57 | 99, ...],
+              <<_:16>> |
+              [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57, ...] |
+              {[[48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57, ...],
+                ...]} =>
+                  [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 |
+                   100 | 101,
+                   ...]} =>
+                atom() | [1..255, ...]}) will never return since it differs in the 1st argument from the success typing arguments: 
+         (#{'a' := 'gg' | 'kk' | 'sc' | 3 | 4,
+            'b' => 'other' | 3 | 4 | 5,
+            'c' => 'sc2',
+            10 => 'a0',
+            11 => 'a1',
+            12 => 'a2',
+            13 => 'a3',
+            14 => 'a4',
+            15 => 'a5',
+            16 => 'a6',
+            17 => 'a7',
+            18 => 'a8',
+            19 => 'a9',
+            20 => 'b0',
+            21 => 'b1',
+            22 => 'b2',
+            23 => 'b3',
+            24 => 'b4',
+            25 => 'b5',
+            26 => 'b6',
+            27 => 'b7',
+            28 => 'b8',
+            29 => 'b9',
+            30 => [48 | 99, ...],
+            31 => [49 | 99, ...],
+            32 => [50 | 99, ...],
+            33 => [51 | 99, ...],
+            34 => [52 | 99, ...],
+            35 => [53 | 99, ...],
+            36 => [54 | 99, ...],
+            37 => [55 | 99, ...],
+            38 => [56 | 99, ...],
+            39 => [57 | 99, ...],
+            <<_:16>> |
+            [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57, ...] |
+            float() |
+            {[any(), ...]} |
+            #{'k16' => 'a6',
+              'k26' => 'b6',
+              'k36' => [any(), ...],
+              'map' => 'key',
+              'one' => 'small',
+              'second' => 'small',
+              'third' => 'small',
+              10 => 'a0',
+              11 => 'a1',
+              12 => 'a2',
+              13 => 'a3',
+              14 => 'a4',
+              15 => 'a5',
+              16 => 'a6',
+              17 => 'a7',
+              18 => 'a8',
+              19 => 'a9',
+              20 => 'b0',
+              21 => 'b1',
+              22 => 'b2',
+              23 => 'b3',
+              24 => 'b4',
+              25 => 'b5',
+              26 => 'b6',
+              27 => 'b7',
+              28 => 'b8',
+              29 => 'b9',
+              30 => [any(), ...],
+              31 => [any(), ...],
+              32 => [any(), ...],
+              33 => [any(), ...],
+              34 => [any(), ...],
+              35 => [any(), ...],
+              36 => [any(), ...],
+              37 => [any(), ...],
+              38 => [any(), ...],
+              39 => [any(), ...],
+              <<_:16>> | [any(), ...] | {_} => [any(), ...]} =>
+                atom() | [1..255, ...]})
+map_galore.erl:1418: Fun application with arguments 
+         (#{'s' => 'none', 'v' => 'none'}) will never return since it differs in the 1st argument from the success typing arguments: 
+         (#{'s' := 'l' | 't' | 'v',
+            'v' :=
+                'none' |
+                <<_:16>> |
+                [<<_:16>>, ...] |
+                {<<_:16>>, <<_:16>>}})
+map_galore.erl:1491: The test 
+          #{} =:= 
+          #{'a' := 1} can never evaluate to 'true'
+map_galore.erl:1492: The test 
+          #{'a' := 1} =:= 
+          #{} can never evaluate to 'true'
+map_galore.erl:1495: The test 
+          #{'a' := 1} =:= 
+          #{'a' := 2} can never evaluate to 'true'
+map_galore.erl:1496: The test 
+          #{'a' := 2} =:= 
+          #{'a' := 1} can never evaluate to 'true'
+map_galore.erl:1497: The test 
+          #{'a' := 2, 'b' := 1} =:= 
+          #{'a' := 1, 'b' := 3} can never evaluate to 'true'
+map_galore.erl:1498: The test 
+          #{'a' := 1, 'b' := 1} =:= 
+          #{'a' := 1, 'b' := 3} can never evaluate to 'true'
+map_galore.erl:1762: The call maps:get
+         ({1, 1},
+          #{{1, float()} => [101 | 108 | 112 | 116 | 117, ...]}) will never return since the success typing arguments are 
+         (any(),
+          map())
+map_galore.erl:1763: The call maps:get
+         ('a',
+          #{}) will never return since the success typing arguments are 
+         (any(),
+          map())
+map_galore.erl:1765: The call maps:get
+         ('a',
+          #{'b' => 1, 'c' => 2}) will never return since the success typing arguments are 
+         (any(),
+          map())
+map_galore.erl:186: The pattern 
+          #{'x' := 2} can never match the type 
+          #{'x' := 3}
+map_galore.erl:187: The pattern 
+          #{'x' := 3} can never match the type 
+          {'a', 'b', 'c'}
+map_galore.erl:188: The pattern 
+          #{'x' := 3} can never match the type 
+          #{'y' := 3}
+map_galore.erl:189: The pattern 
+          #{'x' := 3} can never match the type 
+          #{'x' := [101 | 104 | 114 | 116, ...]}
+map_galore.erl:2280: Cons will produce an improper list since its 2nd argument is 
+          {'b', 'a'}
+map_galore.erl:2280: The call maps:from_list
+         ([{'a', 'b'} | {'b', 'a'}]) will never return since it differs in the 1st argument from the success typing arguments: 
+         ([{_, _}])
+map_galore.erl:2281: The call maps:from_list
+         ('a') will never return since it differs in the 1st argument from the success typing arguments: 
+         ([{_, _}])
+map_galore.erl:2282: The call maps:from_list
+         (42) will never return since it differs in the 1st argument from the success typing arguments: 
+         ([{_, _}])
+map_galore.erl:997: A key of type 
+          'nonexisting' cannot exist in a map of type 
+          #{}
+map_galore.erl:998: A key of type 
+          'nonexisting' cannot exist in a map of type 
+          #{1 := 'a', 2 := 'b', 4 := 'd', 5 := 'e', float() => 'c'}
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/order b/lib/dialyzer/test/indent_SUITE_data/results/order
new file mode 100644
index 0000000000..5b0030d7b1
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/order
@@ -0,0 +1,23 @@
+
+order.erl:14: Guard test is_integer
+         (Int :: 'b') can never succeed
+order.erl:16: The variable _Else can never match since previous clauses completely covered the type 
+          'b'
+order.erl:21: Guard test is_integer
+         (Int :: 'b') can never succeed
+order.erl:23: The variable _Else can never match since previous clauses completely covered the type 
+          'b'
+order.erl:30: The variable _Else can never match since previous clauses completely covered the type 
+          'b' | 1
+order.erl:36: The variable Atom can never match since previous clauses completely covered the type 
+          1
+order.erl:37: The variable _Else can never match since previous clauses completely covered the type 
+          1
+order.erl:42: Guard test is_integer
+         (Int :: 'b') can never succeed
+order.erl:44: The variable _Else can never match since previous clauses completely covered the type 
+          'b'
+order.erl:7: Guard test is_integer
+         (Int :: 'b') can never succeed
+order.erl:9: The variable _Else can never match since previous clauses completely covered the type 
+          'b'
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/queue_use b/lib/dialyzer/test/indent_SUITE_data/results/queue_use
new file mode 100644
index 0000000000..b6604e5320
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/queue_use
@@ -0,0 +1,34 @@
+
+queue_use.erl:18: The call queue:is_empty
+         ({[], []}) does not have an opaque term of type 
+          queue:queue(_) as 1st argument
+queue_use.erl:22: The call queue:in
+         (42,
+          Q0 :: {[], []}) does not have an opaque term of type 
+          queue:queue(_) as 2nd argument
+queue_use.erl:27: The attempt to match a term of type 
+          queue:queue(_) against the pattern 
+          {"*", Q2} breaks the opacity of the term
+queue_use.erl:33: Attempt to test for equality between a term of type 
+          {[42, ...], []} and a term of opaque type 
+          queue:queue(_)
+queue_use.erl:36: The attempt to match a term of type 
+          queue:queue(_) against the pattern 
+          {F, _R} breaks the opacity of the term
+queue_use.erl:40: The call queue:out
+         ({"*", []}) does not have an opaque term of type 
+          queue:queue(_) as 1st argument
+queue_use.erl:51: The call queue_use:is_in_queue
+         (E :: 42,
+          DB :: #db{p :: [], q :: queue:queue(_)}) contains an opaque term as 2nd argument when terms of different types are expected in these positions
+queue_use.erl:56: The attempt to match a term of type 
+          #db{p :: [], q :: queue:queue(_)} against the pattern 
+          {'db', _, {L1, L2}} breaks the opacity of 
+          queue:queue(_)
+queue_use.erl:62: The call queue_use:tuple_queue
+         ({42, 'gazonk'}) does not have a term of type 
+          {_, queue:queue(_)} (with opaque subterms) as 1st argument
+queue_use.erl:65: The call queue:in
+         (F :: 42,
+          Q :: 'gazonk') does not have an opaque term of type 
+          queue:queue(_) as 2nd argument
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/rec b/lib/dialyzer/test/indent_SUITE_data/results/rec
new file mode 100644
index 0000000000..5938b18be0
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/rec
@@ -0,0 +1,15 @@
+
+rec_use.erl:17: The attempt to match a term of type 
+          rec_adt:rec() against the pattern 
+          {'rec', _, 42} breaks the opacity of the term
+rec_use.erl:18: Guard test tuple_size
+         (R :: rec_adt:rec()) breaks the opacity of its argument
+rec_use.erl:23: The call rec_adt:get_a
+         (R :: tuple()) does not have an opaque term of type 
+          rec_adt:rec() as 1st argument
+rec_use.erl:27: Attempt to test for equality between a term of type 
+          {'rec', 'gazonk', 42} and a term of opaque type 
+          rec_adt:rec()
+rec_use.erl:30: The call erlang:tuple_size
+         (rec_adt:rec()) contains an opaque term as 1st argument when a structured term of type 
+          tuple() is expected
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/record_construct b/lib/dialyzer/test/indent_SUITE_data/results/record_construct
new file mode 100644
index 0000000000..a1268de690
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/record_construct
@@ -0,0 +1,11 @@
+
+record_construct.erl:16: Record construction 
+          #r_opa{b :: gb_sets:set(_), c :: 42, e :: 'false'} violates the declared type of field c ::
+          boolean()
+record_construct.erl:21: Record construction 
+          #r_rem{a :: 'gazonk'} violates the declared type of field a ::
+          string()
+record_construct.erl:7: Record construction 
+          #r_loc{a :: 'gazonk', b :: 42} violates the declared type of field a ::
+          integer() and b ::
+          atom()
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/record_creation_diffs b/lib/dialyzer/test/indent_SUITE_data/results/record_creation_diffs
new file mode 100644
index 0000000000..9b5f9489db
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/record_creation_diffs
@@ -0,0 +1,4 @@
+
+record_creation_diffs.erl:11: Record construction 
+          #bar{some_list :: {'this', 'is', 'a', 'tuple'}} violates the declared type of field some_list ::
+          [any()]
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/record_match b/lib/dialyzer/test/indent_SUITE_data/results/record_match
new file mode 100644
index 0000000000..4738a4b0c9
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/record_match
@@ -0,0 +1,4 @@
+
+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/indent_SUITE_data/results/record_pat b/lib/dialyzer/test/indent_SUITE_data/results/record_pat
new file mode 100644
index 0000000000..cf9247d5a8
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/record_pat
@@ -0,0 +1,4 @@
+
+record_pat.erl:14: Matching of pattern 
+          {'foo', 'baz'} tagged with a record name violates the declared type of 
+          #foo{bar :: integer()}
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/record_send_test b/lib/dialyzer/test/indent_SUITE_data/results/record_send_test
new file mode 100644
index 0000000000..51d8e1a852
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/record_send_test
@@ -0,0 +1,6 @@
+
+record_send_test.erl:30: The call erlang:'!'
+         (Rec1 :: #rec1{a :: 'a', b :: 'b', c :: 'c'},
+          'hello_again') will never return since it differs in the 1st argument from the success typing arguments: 
+         (atom() | pid() | port() | {atom(), atom()},
+          any())
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/record_test b/lib/dialyzer/test/indent_SUITE_data/results/record_test
new file mode 100644
index 0000000000..1574459578
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/record_test
@@ -0,0 +1,6 @@
+
+record_test.erl:19: Matching of pattern 
+          {'foo', _} tagged with a record name violates the declared type of 
+          'foo'
+record_test.erl:21: The variable _ can never match since previous clauses completely covered the type 
+          'foo'
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/record_update b/lib/dialyzer/test/indent_SUITE_data/results/record_update
new file mode 100644
index 0000000000..6e4124552e
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/record_update
@@ -0,0 +1,3 @@
+
+record_update.erl:7: Invalid type specification for function record_update:quux/2. The success typing is 
+          (#foo{bar :: atom()}, atom()) -> #foo{bar :: atom()}
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/sample_behaviour b/lib/dialyzer/test/indent_SUITE_data/results/sample_behaviour
new file mode 100644
index 0000000000..f0e41d024a
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/sample_behaviour
@@ -0,0 +1,23 @@
+
+sample_callback_wrong.erl:16: The inferred return type of sample_callback_2/0 
+         (42) has nothing in common with 
+          atom(), which is the expected return type for the callback of the sample_behaviour behaviour
+sample_callback_wrong.erl:17: The inferred return type of sample_callback_3/0 
+         ('fair') has nothing in common with 
+          'fail' | {'ok', 1..255}, which is the expected return type for the callback of the sample_behaviour behaviour
+sample_callback_wrong.erl:18: The inferred return type of sample_callback_4/1 
+         ('fail') has nothing in common with 
+          'ok', which is the expected return type for the callback of the sample_behaviour behaviour
+sample_callback_wrong.erl:20: The inferred return type of sample_callback_5/1 
+         (string()) has nothing in common with 
+          'fail' | 'ok', which is the expected return type for the callback of the sample_behaviour behaviour
+sample_callback_wrong.erl:20: The inferred type for the 1st argument of sample_callback_5/1 (
+          atom()) is not a supertype of 
+          1..255, which is expected type for this argument in the callback of the sample_behaviour behaviour
+sample_callback_wrong.erl:22: The inferred return type of sample_callback_6/3 
+         ({'okk', number()}) has nothing in common with 
+          'fail' | {'ok', 1..255}, which is the expected return type for the callback of the sample_behaviour behaviour
+sample_callback_wrong.erl:22: The inferred type for the 3rd argument of sample_callback_6/3 (
+          atom()) is not a supertype of 
+          string(), which is expected type for this argument in the callback of the sample_behaviour behaviour
+sample_callback_wrong.erl:4: Undefined callback function sample_callback_1/0 (behaviour sample_behaviour)
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/simple b/lib/dialyzer/test/indent_SUITE_data/results/simple
new file mode 100644
index 0000000000..bafe334405
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/simple
@@ -0,0 +1,289 @@
+
+exact_api.erl:17: The call exact_api:set_type
+         (A ::
+              #digraph{vtab :: 'notable',
+                       etab :: 'notable',
+                       ntab :: 'notable',
+                       cyclic :: 'true'}) does not have an opaque term of type 
+          digraph:graph() as 1st argument
+exact_api.erl:23: The call digraph:delete
+         (G ::
+              #digraph{vtab :: 'notable',
+                       etab :: 'notable',
+                       ntab :: 'notable',
+                       cyclic :: 'true'}) does not have an opaque term of type 
+          digraph:graph() as 1st argument
+exact_api.erl:55: The attempt to match a term of type 
+          exact_adt:exact_adt() against the pattern 
+          {'exact_adt'} breaks the opacity of the term
+exact_api.erl:59: The call exact_adt:exact_adt_set_type2
+         (A :: #exact_adt{}) does not have an opaque term of type 
+          exact_adt:exact_adt() as 1st argument
+is_rec.erl:10: The call erlang:is_record
+         (simple1_adt:d1(),
+          'r',
+          2) contains an opaque term as 1st argument when terms of different types are expected in these positions
+is_rec.erl:15: The call erlang:is_record
+         (A :: simple1_adt:d1(),
+          'r',
+          I :: 1 | 2 | 3) contains an opaque term as 1st argument when terms of different types are expected in these positions
+is_rec.erl:19: Guard test is_record
+         (A :: simple1_adt:d1(),
+          'r',
+          2) breaks the opacity of its argument
+is_rec.erl:23: Guard test is_record
+         ({simple1_adt:d1(), 1},
+          'r',
+          2) breaks the opacity of its argument
+is_rec.erl:41: The call erlang:is_record
+         (A :: simple1_adt:d1(),
+          R :: 'a') contains an opaque term as 1st argument when terms of different types are expected in these positions
+is_rec.erl:45: The call erlang:is_record
+         (A :: simple1_adt:d1(),
+          A :: simple1_adt:d1(),
+          1) contains an opaque term as 2nd argument when terms of different types are expected in these positions
+is_rec.erl:49: The call erlang:is_record
+         (A :: simple1_adt:d1(),
+          any(),
+          1) contains an opaque term as 1st argument when terms of different types are expected in these positions
+is_rec.erl:53: The call erlang:is_record
+         (A :: simple1_adt:d1(),
+          A :: simple1_adt:d1(),
+          any()) contains an opaque term as 2nd argument when terms of different types are expected in these positions
+is_rec.erl:57: Guard test is_record
+         (A :: simple1_adt:d1(),
+          'r',
+          2) breaks the opacity of its argument
+is_rec.erl:61: The record 
+          #r{f1 :: simple1_adt:d1()} violates the declared type for #r{}
+is_rec.erl:65: The call erlang:is_record
+         ({simple1_adt:d1(), 1},
+          'r',
+          2) contains an opaque term as 1st argument when terms of different types are expected in these positions
+rec_api.erl:104: Matching of pattern 
+          {'r2', 10} tagged with a record name violates the declared type of 
+          #r2{f1 :: 10}
+rec_api.erl:113: The attempt to match a term of type 
+          #r3{f1 :: queue:queue(_)} against the pattern 
+          {'r3', 'a'} breaks the opacity of 
+          queue:queue(_)
+rec_api.erl:118: Record construction 
+          #r3{f1 :: 10} violates the declared type of field f1 ::
+          queue:queue(_)
+rec_api.erl:123: The attempt to match a term of type 
+          #r3{f1 :: 10} against the pattern 
+          {'r3', 10} breaks the opacity of 
+          queue:queue(_)
+rec_api.erl:24: Record construction 
+          #r1{f1 :: 10} violates the declared type of field f1 ::
+          rec_api:a()
+rec_api.erl:29: Matching of pattern 
+          {'r1', 10} tagged with a record name violates the declared type of 
+          #r1{f1 :: 10}
+rec_api.erl:33: The attempt to match a term of type 
+          rec_adt:r1() against the pattern 
+          {'r1', 'a'} breaks the opacity of the term
+rec_api.erl:35: Invalid type specification for function rec_api:adt_t1/1. The success typing is 
+          (#r1{f1 :: 'a'}) -> #r1{f1 :: 'a'}
+rec_api.erl:40: The specification for rec_api:adt_r1/0 has an opaque subtype 
+          rec_adt:r1() which is violated by the success typing 
+          () -> #r1{f1 :: 'a'}
+rec_api.erl:85: The attempt to match a term of type 
+          rec_adt:f() against the record field 'f' declared to be of type 
+          rec_api:f() breaks the opacity of the term
+rec_api.erl:99: Record construction 
+          #r2{f1 :: 10} violates the declared type of field f1 ::
+          rec_api:a()
+simple1_api.erl:113: The test 
+          simple1_api:d1() =:= 
+          simple1_api:d2() can never evaluate to 'true'
+simple1_api.erl:118: Guard test 
+          simple1_api:d2() =:= 
+          A :: simple1_api:d1() can never succeed
+simple1_api.erl:142: Attempt to test for equality between a term of type 
+          simple1_adt:o2() and a term of opaque type 
+          simple1_adt:o1()
+simple1_api.erl:148: Guard test 
+          simple1_adt:o2() =:= 
+          A :: simple1_adt:o1() contains opaque terms as 1st and 2nd arguments
+simple1_api.erl:154: Attempt to test for inequality between a term of type 
+          simple1_adt:o2() and a term of opaque type 
+          simple1_adt:o1()
+simple1_api.erl:160: Attempt to test for inequality between a term of type 
+          simple1_adt:o2() and a term of opaque type 
+          simple1_adt:o1()
+simple1_api.erl:165: Attempt to test for equality between a term of type 
+          simple1_adt:c2() and a term of opaque type 
+          simple1_adt:c1()
+simple1_api.erl:181: Guard test 
+          A :: simple1_adt:d1() =< 
+          B :: simple1_adt:d2() contains opaque terms as 1st and 2nd arguments
+simple1_api.erl:185: Guard test 
+          'a' =< 
+          B :: simple1_adt:d2() contains an opaque term as 2nd argument
+simple1_api.erl:189: Guard test 
+          A :: simple1_adt:d1() =< 
+          'd' contains an opaque term as 1st argument
+simple1_api.erl:197: The type test is_integer
+         (A :: simple1_adt:d1()) breaks the opacity of the term A::
+          simple1_adt:d1()
+simple1_api.erl:221: Guard test 
+          A :: simple1_api:i1() > 
+          3 can never succeed
+simple1_api.erl:225: Guard test 
+          A :: simple1_adt:i1() > 
+          3 contains an opaque term as 1st argument
+simple1_api.erl:233: Guard test 
+          A :: simple1_adt:i1() < 
+          3 contains an opaque term as 1st argument
+simple1_api.erl:239: Guard test 
+          A :: 1 > 
+          3 can never succeed
+simple1_api.erl:243: Guard test 
+          A :: 1 > 
+          3 can never succeed
+simple1_api.erl:257: Guard test is_function
+         (T :: simple1_api:o1()) can never succeed
+simple1_api.erl:265: Guard test is_function
+         (T :: simple1_adt:o1()) breaks the opacity of its argument
+simple1_api.erl:269: The type test is_function
+         (T :: simple1_adt:o1()) breaks the opacity of the term T::
+          simple1_adt:o1()
+simple1_api.erl:274: Guard test is_function
+         (T :: simple1_api:o1(),
+          A :: simple1_api:i1()) can never succeed
+simple1_api.erl:284: Guard test is_function
+         (T :: simple1_adt:o1(),
+          A :: simple1_adt:i1()) breaks the opacity of its argument
+simple1_api.erl:289: The type test is_function
+         (T :: simple1_adt:o1(),
+          A :: simple1_adt:i1()) breaks the opacity of the term T::
+          simple1_adt:o1()
+simple1_api.erl:294: The call erlang:is_function
+         (T :: simple1_api:o1(),
+          A :: simple1_adt:i1()) contains an opaque term as 2nd argument when terms of different types are expected in these positions
+simple1_api.erl:300: The type test is_function
+         (T :: simple1_adt:o1(),
+          A :: simple1_api:i1()) breaks the opacity of the term T::
+          simple1_adt:o1()
+simple1_api.erl:306: Guard test 
+          B :: simple1_api:b2() =:= 
+          'true' can never succeed
+simple1_api.erl:315: Guard test 
+          A :: simple1_api:b1() =:= 
+          'false' can never succeed
+simple1_api.erl:319: Guard test not(and
+         ('true',
+          'true')) can never succeed
+simple1_api.erl:337: Clause guard cannot succeed.
+simple1_api.erl:342: Guard test 
+          B :: simple1_adt:b2() =:= 
+          'true' contains an opaque term as 1st argument
+simple1_api.erl:347: Guard test 
+          A :: simple1_adt:b1() =:= 
+          'true' contains an opaque term as 1st argument
+simple1_api.erl:355: Invalid type specification for function simple1_api:bool_adt_t6/1. The success typing is 
+          ('true') -> 1
+simple1_api.erl:365: Clause guard cannot succeed.
+simple1_api.erl:368: Invalid type specification for function simple1_api:bool_adt_t8/2. The success typing is 
+          (boolean(), boolean()) -> 1
+simple1_api.erl:378: Clause guard cannot succeed.
+simple1_api.erl:381: Invalid type specification for function simple1_api:bool_adt_t9/2. The success typing is 
+          ('false', 'false') -> 1
+simple1_api.erl:407: The size 
+          simple1_adt:i1() breaks the opacity of A
+simple1_api.erl:418: The attempt to match a term of type 
+          non_neg_integer() against the variable A breaks the opacity of 
+          simple1_adt:i1()
+simple1_api.erl:425: The attempt to match a term of type 
+          non_neg_integer() against the variable B breaks the opacity of 
+          simple1_adt:i1()
+simple1_api.erl:432: The pattern 
+          <<_:B>> can never match the type 
+          any()
+simple1_api.erl:448: The attempt to match a term of type 
+          non_neg_integer() against the variable Sz breaks the opacity of 
+          simple1_adt:i1()
+simple1_api.erl:460: The attempt to match a term of type 
+          simple1_adt:bit1() against the pattern 
+          <<_/binary>> breaks the opacity of the term
+simple1_api.erl:478: The call 'foo':A
+         (A :: simple1_adt:a()) breaks the opacity of the term A :: 
+          simple1_adt:a()
+simple1_api.erl:486: The call A:'foo'
+         (A :: simple1_adt:a()) breaks the opacity of the term A :: 
+          simple1_adt:a()
+simple1_api.erl:499: The call 'foo':A
+         (A :: simple1_api:i()) requires that A is of type 
+          atom() not 
+          simple1_api:i()
+simple1_api.erl:503: The call 'foo':A
+         (A :: simple1_adt:i()) requires that A is of type 
+          atom() not 
+          simple1_adt:i()
+simple1_api.erl:507: The call A:'foo'
+         (A :: simple1_api:i()) requires that A is of type 
+          atom() not 
+          simple1_api:i()
+simple1_api.erl:511: The call A:'foo'
+         (A :: simple1_adt:i()) requires that A is of type 
+          atom() not 
+          simple1_adt:i()
+simple1_api.erl:519: Guard test 
+          A :: simple1_adt:d2() == 
+          B :: simple1_adt:d1() contains opaque terms as 1st and 2nd arguments
+simple1_api.erl:534: Guard test 
+          A :: simple1_adt:d1() >= 
+          3 contains an opaque term as 1st argument
+simple1_api.erl:536: Guard test 
+          A :: simple1_adt:d1() == 
+          3 contains an opaque term as 1st argument
+simple1_api.erl:538: Guard test 
+          A :: simple1_adt:d1() =:= 
+          3 contains an opaque term as 1st argument
+simple1_api.erl:548: The call erlang:'<'
+         (A :: simple1_adt:d1(),
+          3) contains an opaque term as 1st argument when terms of different types are expected in these positions
+simple1_api.erl:558: The call erlang:'=<'
+         (A :: simple1_adt:d1(),
+          B :: simple1_adt:d2()) contains opaque terms as 1st and 2nd arguments when terms of different types are expected in these positions
+simple1_api.erl:565: Guard test 
+          {digraph:graph(), 3} > 
+          {digraph:graph(), atom() | ets:tid()} contains an opaque term as 2nd argument
+simple1_api.erl:91: The specification for simple1_api:tup/0 has an opaque subtype 
+          simple1_adt:tuple1() which is violated by the success typing 
+          () -> {'a', 'b'}
+simple2_api.erl:100: The call lists:flatten
+         (A :: simple1_adt:tuple1()) contains an opaque term as 1st argument when a structured term of type 
+          [any()] is expected
+simple2_api.erl:116: The call lists:flatten
+         ({simple1_adt:tuple1()}) will never return since it differs in the 1st argument from the success typing arguments: 
+         ([any()])
+simple2_api.erl:121: Guard test 
+          {simple1_adt:d1(), 3} > 
+          {simple1_adt:d1(), simple1_adt:tuple1()} contains an opaque term as 2nd argument
+simple2_api.erl:125: The call erlang:tuple_to_list
+         (B :: simple1_adt:tuple1()) contains an opaque term as 1st argument when a structured term of type 
+          tuple() is expected
+simple2_api.erl:31: The call erlang:'!'
+         (A :: simple1_adt:d1(),
+          'foo') contains an opaque term as 1st argument when terms of different types are expected in these positions
+simple2_api.erl:35: The call erlang:send
+         (A :: simple1_adt:d1(),
+          'foo') contains an opaque term as 1st argument when terms of different types are expected in these positions
+simple2_api.erl:51: The call erlang:'<'
+         (A :: simple1_adt:d1(),
+          3) contains an opaque term as 1st argument when terms of different types are expected in these positions
+simple2_api.erl:59: The call lists:keysearch
+         (1,
+          A :: simple1_adt:d1(),
+          []) contains an opaque term as 2nd argument when terms of different types are expected in these positions
+simple2_api.erl:67: The call lists:keysearch
+         ('key',
+          1,
+          A :: simple1_adt:tuple1()) contains an opaque term as 3rd argument when terms of different types are expected in these positions
+simple2_api.erl:96: The call lists:keyreplace
+         ('a',
+          1,
+          [{1, 2}],
+          A :: simple1_adt:tuple1()) contains an opaque term as 4th argument when terms of different types are expected in these positions
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/suppress_request b/lib/dialyzer/test/indent_SUITE_data/results/suppress_request
new file mode 100644
index 0000000000..c08f1798c1
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/suppress_request
@@ -0,0 +1,11 @@
+
+suppress_request.erl:21: Expression produces a value of type 
+          {'a', 'b'}, but this value is unmatched
+suppress_request.erl:25: Expression produces a value of type 
+          {'a', 'b'}, but this value is unmatched
+suppress_request.erl:39: Guard test 
+          2 =:= 
+          A :: fun((none()) -> no_return()) can never succeed
+suppress_request.erl:7: Type specification suppress_request:test1
+          ('a' | 'b') -> 'ok' is a subtype of the success typing: suppress_request:test1
+          ('a' | 'b' | 'c') -> 'ok'
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/trec b/lib/dialyzer/test/indent_SUITE_data/results/trec
new file mode 100644
index 0000000000..f19f728750
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/trec
@@ -0,0 +1,10 @@
+
+trec.erl:29: The call trec:mk_foo_loc
+         (42,
+          any()) will never return since it differs in the 1st argument from the success typing arguments: 
+         ('undefined',
+          atom())
+trec.erl:32: Record construction violates the declared type for #foo{} since variable A cannot be of type 
+          atom()
+trec.erl:39: Record construction violates the declared type for #foo{} since variable A cannot be of type 
+          atom()
diff --git a/lib/dialyzer/test/indent_SUITE_data/results/whereis_control_flow1 b/lib/dialyzer/test/indent_SUITE_data/results/whereis_control_flow1
new file mode 100644
index 0000000000..0e733fced6
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/results/whereis_control_flow1
@@ -0,0 +1,4 @@
+
+whereis_control_flow1.erl:13: The call erlang:register
+         (AnAtom :: atom(),
+          Pid :: pid()) might fail due to a possible race condition caused by its combination with the erlang:whereis(AnAtom::any()) call in whereis_control_flow1.erl on line 8
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/abs.erl b/lib/dialyzer/test/indent_SUITE_data/src/abs.erl
new file mode 100644
index 0000000000..0e38c3dbb7
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/abs.erl
@@ -0,0 +1,78 @@
+-module(abs).
+
+%% OTP-12948. erlang:abs/1 bug fix.
+
+-export([t/0]).
+
+t() ->
+    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.
+
+i1() ->
+    A = int(),
+    I1 = i1(A),
+    true = I1 < 2,
+    true = I1 < 1. % can never match
+
+-spec i1(neg_integer()) -> non_neg_integer().
+
+i1(A) when is_integer(A), A < 0 ->
+    abs(A).
+
+i2() ->
+    A = int(),
+    I2 = i2(A),
+    true = I2 < 1,
+    true = I2 < 0. % can never match
+
+-spec i2(non_neg_integer()) -> non_neg_integer().
+
+i2(A) when is_integer(A), A >= 0 ->
+    abs(A).
+
+i3() ->
+    A = int(),
+    I3 = i3(A),
+    true = I3 < -1,
+    true = I3 < 0. % can never match
+
+-spec i3(integer()) -> non_neg_integer().
+
+i3(A) when is_integer(A) ->
+    abs(A).
+
+i4() ->
+    A = int(),
+    I4 = i4(A),
+    true = I4 =:= 0 orelse I4 =:= 1,
+    true = I4 < 0 orelse I4 > 1. % can never match
+
+-spec i4(integer()) -> number().
+
+i4(A) when A =:= -1; A =:= 0; A =:= 1 ->
+    abs(A).
+
+f1() ->
+    F1 = f1(float()),
+    math:sqrt(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() ->
+    foo:bar().
+
+-spec float() -> float().
+
+float() ->
+    math:sqrt(1.0).
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/app_call.erl b/lib/dialyzer/test/indent_SUITE_data/src/app_call.erl
new file mode 100644
index 0000000000..54d178d29a
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/app_call.erl
@@ -0,0 +1,17 @@
+-module(app_call).
+-export([test/1]).
+
+test(m) ->
+  M = get_mod(),
+  M:foo();
+test(f) ->
+  F = get_fun(),
+  mod:F();
+test(_) ->
+  ok.
+
+get_mod() ->
+  42.
+
+get_fun() ->
+  {gazonk, []}.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/blame_contract_range.erl b/lib/dialyzer/test/indent_SUITE_data/src/blame_contract_range.erl
new file mode 100644
index 0000000000..efd3332b44
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/blame_contract_range.erl
@@ -0,0 +1,16 @@
+%%-----------------------------------------------------------------------
+%% A test where the contract is wrongly specified by the programmer;
+%% however, this is found only by refinement.
+%% Dialyzer in R14B01 and prior gave a confusing (if not bogus) warning
+%% for this case.  Corrected in R14B02.
+%%-----------------------------------------------------------------------
+-module(blame_contract_range).
+
+-export([foo/0]).
+
+foo() ->
+  bar(b).
+
+-spec bar(atom()) -> a.
+bar(a) -> a;
+bar(b) -> b.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/bs_fail_constr.erl b/lib/dialyzer/test/indent_SUITE_data/src/bs_fail_constr.erl
new file mode 100644
index 0000000000..8c1f8c009a
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/bs_fail_constr.erl
@@ -0,0 +1,15 @@
+-module(bs_fail_constr).
+
+-export([w1/1, w2/1, w3/1, w4/1]).
+
+w1(V) when is_float(V) ->
+  <<V/integer>>.
+
+w2(V) when is_atom(V) ->
+  <<V/binary>>.
+
+w3(S) when is_integer(S), S < 0 ->
+  <<42:S/integer>>.
+
+w4(V) when is_float(V) ->
+  <<V/utf32>>.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/callbacks_and_specs/my_behaviour.erl b/lib/dialyzer/test/indent_SUITE_data/src/callbacks_and_specs/my_behaviour.erl
new file mode 100644
index 0000000000..c4e5203448
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/callbacks_and_specs/my_behaviour.erl
@@ -0,0 +1,11 @@
+-module(my_behaviour).
+
+-callback callback_init(Parent :: pid()) -> {'ok', State::term()}.
+
+-callback callback_cast(State::term(), From::pid(), Msg::term()) ->
+    {'noreply', NewState::term()}.
+
+-callback callback_call(State::term(), From::pid(), Msg::term()) ->
+    {'reply', NewState::term(), Reply::term()}.
+
+-callback callback_exit(State::term()) -> 'ok'.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/callbacks_and_specs/my_callbacks_correct.erl b/lib/dialyzer/test/indent_SUITE_data/src/callbacks_and_specs/my_callbacks_correct.erl
new file mode 100644
index 0000000000..041b4ac56c
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/callbacks_and_specs/my_callbacks_correct.erl
@@ -0,0 +1,59 @@
+-module(my_callbacks_correct).
+
+-export([
+	 callback_init/1
+	 , callback_call/3
+	 , callback_cast/3
+	 , callback_exit/1
+	]).
+
+-record(state, {
+	  parent           :: pid(),
+	  status    = init :: 'init' | 'open' | 'closed',
+	  subscribe = []   :: list({pid(), integer()}),
+	  counter   = 1    :: integer()
+	 }).
+
+-type state()        :: #state{}.
+
+-type cast_message() :: 'open' | 'closed'.
+
+-type call_message() :: 'subscribe' | 'unsubscribe'.
+-type call_reply()   :: 'accepted' | 'rejected'.
+
+-spec callback_init(Parent::pid()) -> {'ok', state()}.
+
+callback_init(Parent) ->
+    {ok, #state{parent = Parent}}.
+
+-spec callback_cast(state(), pid(), cast_message()) -> {'noreply', state()}.
+
+callback_cast(#state{parent = Pid} = State, Pid, Message)
+  when Message =:= 'open'; Message =:= 'close' ->
+    {noreply, State#state{status = Message}};
+callback_cast(State, _Pid, _Message) ->
+    {noreply, State}.
+
+-spec callback_call(state(), pid(), call_message()) ->
+			   {'reply', state(), call_reply()}.
+
+callback_call(#state{status = open, subscribe = Subscribers} = State,
+	      Pid, Message)
+  when Message =:= 'subscribe';
+       Message =:= 'unsubscribe' ->
+    NewState =
+	case Message of
+	    subscribe ->
+		N = State#state.counter,
+		State#state{subscribe = [{Pid, N}|Subscribers], counter = N+1};
+	    unsubscribe ->
+		State#state{subscribe = lists:keydelete(Pid, 1, Subscribers)}
+	end,
+    {reply, NewState, accepted};
+callback_call(State, _Pid, _Message) ->
+    {reply, State, rejected}.
+
+-spec callback_exit(state()) -> 'ok'.
+
+callback_exit(_State) ->
+    ok.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/callbacks_and_specs/my_callbacks_wrong.erl b/lib/dialyzer/test/indent_SUITE_data/src/callbacks_and_specs/my_callbacks_wrong.erl
new file mode 100644
index 0000000000..0459622dc1
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/callbacks_and_specs/my_callbacks_wrong.erl
@@ -0,0 +1,61 @@
+-module(my_callbacks_wrong).
+
+-export([
+	 callback_init/1
+	 , callback_call/3
+	 , callback_cast/3
+	 , callback_exit/1
+	]).
+
+-behaviour(my_behaviour).
+
+-record(state, {
+	  parent           :: pid(),
+	  status    = init :: 'init' | 'open' | 'closed',
+	  subscribe = []   :: list({pid(), integer()}),
+	  counter   = 1    :: integer()
+	 }).
+
+-type state()        :: #state{}.
+
+-type cast_message() :: 'open' | 'closed'.
+
+-type call_message() :: 'subscribe' | 'unsubscribe'.
+-type call_reply()   :: 'accepted' | 'rejected'.
+
+-spec callback_init(Parent::pid()) -> state().    %% Wrong return spec
+
+callback_init(Parent) -> #state{parent = Parent}. %% Wrong return
+
+-spec callback_cast(state(), pid() | atom(), cast_message()) ->
+			   {'noreply' | 'reply', state()}. %% More generic spec
+
+callback_cast(#state{parent = Pid} = State, Pid, Message)
+  when Message =:= 'open'; Message =:= 'close' ->
+    {noreply, State#state{status = Message}};
+callback_cast(State, _Pid, _Message) ->
+    {noreply, State}.
+
+-spec callback_call(state(), atom(), call_message()) ->      %% Wrong arg spec
+			   {'reply', state(), call_reply()}.
+
+callback_call(#state{status = open, subscribe = Subscribers} = State,
+	      Pid, Message)
+  when Message =:= 'subscribe';
+       Message =:= 'unsubscribe' ->
+    NewState =
+	case Message of
+	    subscribe ->
+		N = State#state.counter,
+		State#state{subscribe = [{Pid, N}|Subscribers], counter = N+1};
+	    unsubscribe ->
+		State#state{subscribe = lists:keydelete(Pid, 1, Subscribers)}
+	end,
+    {reply, NewState, accepted};
+callback_call(State, _Pid, _Message) ->
+    {reply, State, rejected}.
+
+-spec callback_exit(state()) -> ok.
+
+callback_exit(_State) ->
+    ok.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/contract3.erl b/lib/dialyzer/test/indent_SUITE_data/src/contract3.erl
new file mode 100644
index 0000000000..a6ce91882e
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/contract3.erl
@@ -0,0 +1,40 @@
+%%%-------------------------------------------------------------------
+%%% File    : contract3.erl
+%%% Author  : Tobias Lindahl <[email protected]>
+%%% Description : Check overloaded domains
+%%%
+%%% Created :  2 Nov 2007 by Tobias Lindahl <[email protected]>
+%%%-------------------------------------------------------------------
+-module(contract3).
+
+-export([t/3]).
+
+t(X, Y, Z) ->
+  t1(X),
+  t2(X, Y),
+  t3(X, Y, Z).
+
+-spec t1(atom()|integer()) -> integer();
+        (atom()|list()) -> atom().
+
+t1(X) ->
+  f(X).
+
+-spec t2(atom(), integer()) -> integer();
+        (atom(), list()) -> atom().
+
+t2(X, Y) ->
+  g(X, Y).
+
+-spec t3(atom(), integer(), list()) -> integer();
+        (X, integer(), list()) -> X.
+
+t3(X, Y, Z) ->
+  X.
+
+%% dummy functions below
+
+f(X) -> X.
+
+g(X, Y) when is_atom(X), is_integer(Y) -> Y;
+g(X, Y) when is_atom(X), is_list(Y) -> X.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/contracts_with_subtypes.erl b/lib/dialyzer/test/indent_SUITE_data/src/contracts_with_subtypes.erl
new file mode 100644
index 0000000000..dbabd904c2
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/contracts_with_subtypes.erl
@@ -0,0 +1,300 @@
+-module(contracts_with_subtypes).
+
+-compile(export_all).
+
+%===============================================================================
+
+-spec extract() -> 'ok'.
+
+extract() ->
+   case dz_extract() of
+       {ok, Val} -> Val;
+       error -> exit(boom)
+   end.
+
+-spec dz_extract() -> RetValue when
+     FileList :: something,
+     RetValue :: {ok, FileList} | error.
+
+dz_extract() -> get(foo).
+
+%-------------------------------------------------------------------------------
+
+-spec extract2() -> 'ok'.
+
+extract2() ->
+   case dz_extract2() of
+       {ok, Val} -> Val;
+       error -> exit(boom)
+   end.
+
+-spec dz_extract2() -> RetValue when
+     RetValue :: {ok, FileList} | error,
+     FileList :: something.
+
+dz_extract2() -> get(foo).
+
+%===============================================================================
+
+-spec foo1(Arg1) -> Res when
+      Arg1 :: atom(),
+      Res  :: atom().
+
+foo1(X) -> X.
+
+-spec foo2(Arg1) -> Res when
+      Arg1 :: Arg2,
+      Arg2 :: atom(),
+      Res  :: atom().
+
+foo2(X) -> X.
+
+-spec foo3(Arg1) -> Res when
+      Arg2 :: atom(),
+      Arg1 :: Arg2,
+      Res  :: atom().
+
+foo3(X) -> X.
+
+-spec foo4(Type) -> Type when is_subtype(Type, atom()).
+
+foo4(X) -> X.
+
+-spec foo5(Type :: atom()) -> Type :: atom().
+
+foo5(X) -> X.
+
+-spec foo6(Type) -> Type when Type :: atom().
+
+foo6(X) -> X.
+
+-spec foo7(Type) -> Type.
+
+foo7(X) -> X.
+
+%-------------------------------------------------------------------------------
+
+bar(1) -> foo1(5);
+bar(2) -> foo2(5);
+bar(3) -> foo3(5);
+bar(4) -> foo4(5);
+bar(5) -> foo5(5);
+bar(6) -> foo6(5);
+bar(7) -> foo7(5).
+
+wrong_foo6() ->
+    b = foo6(a).
+
+%===============================================================================
+
+-spec rec_arg(Arg) -> ok when
+      Arg :: {a, A} | {b, B},
+      A   :: a | {b, B},
+      B   :: b | {a, A}.
+
+rec_arg(X) -> get(X).
+
+c(aa) -> rec_arg({a, a});
+c(bb) -> rec_arg({b, b});
+c(abb) -> rec_arg({a, {b, b}});
+c(baa) -> rec_arg({b, {a, a}});
+c(abaa) -> rec_arg({a, {b, {a, a}}});
+c(babb) -> rec_arg({b, {a, {b, b}}});
+c(ababb) -> rec_arg({a, {b, {a, {b, b}}}});
+c(babaa) -> rec_arg({b, {a, {b, {a, a}}}}).
+
+w(ab) -> rec_arg({a, b}); % breaks the contract
+w(ba) -> rec_arg({b, a}); % breaks the contract
+w(aba) -> rec_arg({a, {b, a}}); % no longer breaks the contract
+w(bab) -> rec_arg({b, {a, b}}); % breaks the contract
+w(abab) -> rec_arg({a, {b, {a, b}}}); % no longer breaks the contract
+w(baba) -> rec_arg({b, {a, {b, a}}}); % no longer breaks the contract
+w(ababa) -> rec_arg({a, {b, {a, {b, a}}}});
+w(babab) -> rec_arg({b, {a, {b, {a, b}}}}).
+
+%% For comparison: the same thing with types
+
+-type ab() :: {a, a()} | {b, b()}.
+-type a() :: a | {b, b()}.
+-type b() :: b | {a, a()}.
+
+-spec rec2(Arg) -> ok when
+      Arg :: ab().
+
+rec2(X) -> get(X).
+
+d(aa) -> rec2({a, a});
+d(bb) -> rec2({b, b});
+d(abb) -> rec2({a, {b, b}});
+d(baa) -> rec2({b, {a, a}});
+d(abaa) -> rec2({a, {b, {a, a}}});
+d(babb) -> rec2({b, {a, {b, b}}});
+d(ababb) -> rec2({a, {b, {a, {b, b}}}});
+d(babaa) -> rec2({b, {a, {b, {a, a}}}}).
+
+q(ab) -> rec2({a, b}); % breaks the contract
+q(ba) -> rec2({b, a}); % breaks the contract
+q(aba) -> rec2({a, {b, a}}); % breaks the contract
+q(bab) -> rec2({b, {a, b}}); % breaks the contract
+q(abab) -> rec2({a, {b, {a, b}}}); % breaks the contract
+q(baba) -> rec2({b, {a, {b, a}}}); % breaks the contract
+q(ababa) -> rec2({a, {b, {a, {b, a}}}}); % breaks the contract
+q(babab) -> rec2({b, {a, {b, {a, b}}}}); % breaks the contract
+q(ababab) -> rec2({a, {b, {a, {b, {a, b}}}}});
+q(bababa) -> rec2({b, {a, {b, {a, {b, a}}}}});
+q(abababa) -> rec2({a, {b, {a, {b, {a, {b, a}}}}}});
+q(bababab) -> rec2({b, {a, {b, {a, {b, {a, b}}}}}}).
+
+%===============================================================================
+
+-type dublo(X) :: {X, X}.
+
+-type weird(X,Y) :: {X, Y, X, X}.
+
+-spec forfun(dublo(Var)) -> ok when Var :: atom().
+
+forfun(_) -> ok.
+
+-spec forfun2(weird(Var, Var)) -> ok when Var :: atom().
+
+forfun2(_) -> ok.
+
+%===============================================================================
+
+-spec shallow(X) -> {ok, X} | {ok, X, file:filename()} | err1 | err2.
+
+shallow(X) -> get(X).
+
+st(X) when is_atom(X) ->
+    case shallow(X) of
+	err1 -> ok;
+	err2 -> ok;
+	{ok, X} -> ok;
+	{ok, X, Res} ->
+	    case Res of
+		1      -> bad;
+		_Other -> ok
+	    end;
+	alpha -> bad;
+	{ok, 42} -> ok;
+	42 -> bad
+    end.
+
+%-------------------------------------------------------------------------------
+
+-spec deep(X) -> Ret when
+      Ret :: {ok, X} | Err,
+      Err :: err1 | err2.
+
+deep(X) -> get(X).
+
+dt(X) when is_atom(X) ->
+    case deep(X) of
+	err1 -> ok;
+	err2 -> ok;
+	{ok, X} -> ok;
+	alpha -> bad;
+	{ok, 42} -> ok;
+	42 -> bad
+    end.
+
+%-------------------------------------------------------------------------------
+
+-type local_errors() :: err1 | err2.
+
+-spec deep2(X) -> Ret when
+      Ret :: {ok, X} | Err,
+      Err :: local_errors().
+
+deep2(X) -> get(X).
+
+dt2(X) when is_atom(X) ->
+    case deep2(X) of
+	err1 -> ok;
+	err2 -> ok;
+	{ok, X} -> ok;
+	alpha -> bad;
+	{ok, 42} -> ok;
+	42 -> bad
+    end.
+
+%-------------------------------------------------------------------------------
+
+-spec deep3(X) -> Ret when
+      Ret :: {ok, X, file:filename()} | Err,
+      Err :: local_errors().
+
+deep3(X) -> get(X).
+
+dt3(X) when is_atom(X) ->
+    case deep3(X) of
+	err1 -> ok;
+	err2 -> ok;
+	{ok, X, Res} ->
+	    case Res of
+		1      -> bad;
+		_Other -> ok
+	    end;
+	{ok, X} -> bad;
+	alpha -> bad;
+	{ok, 42} -> bad;
+	42 -> bad
+    end.
+
+%===============================================================================
+
+-spec flat_ets_new(Name, Options) -> atom() when
+      Name :: atom(),
+      Options :: [Option],
+      Option :: set
+              | ordered_set
+              | bag
+              | duplicate_bag
+              | public
+              | protected
+              | private
+              | named_table
+              | {keypos, integer()}
+              | {heir, pid(), term()}
+              | {heir, none}
+              | {write_concurrency, boolean()}
+              | {read_concurrency, boolean()}
+              | compressed.
+
+flat_ets_new(Name, Options) ->
+    get({Name, Options}).
+
+flat_ets_new_t() ->
+    flat_ets_new(12,[]),
+    flat_ets_new({a,b},[]),
+    flat_ets_new(name,[foo]),
+    flat_ets_new(name,{bag}),
+    flat_ets_new(name,bag),
+    ok.
+
+-type access()     :: public | protected | private.
+-type type()       :: set | ordered_set | bag | duplicate_bag.
+
+-spec factored_ets_new(Name, Options) -> atom() when
+      Name :: atom(),
+      Options :: [Option],
+      Option :: Type | Access | named_table | {keypos,Pos}
+              | {heir, Pid :: pid(), HeirData} | {heir, none} | Tweaks,
+      Type :: type(),
+      Access :: access(),
+      Tweaks :: {write_concurrency, boolean()}
+              | {read_concurrency, boolean()}
+              | compressed,
+      Pos :: pos_integer(),
+      HeirData :: term().
+
+factored_ets_new(Name, Options) ->
+    get({Name, Options}).
+
+factored_ets_new_t() ->
+    factored_ets_new(12,[]),
+    factored_ets_new({a,b},[]),
+    factored_ets_new(name,[foo]),
+    factored_ets_new(name,{bag}),
+    factored_ets_new(name,bag),
+    ok.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/dict_use.erl b/lib/dialyzer/test/indent_SUITE_data/src/dict_use.erl
new file mode 100644
index 0000000000..2527f166f2
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/dict_use.erl
@@ -0,0 +1,82 @@
+-module(dict_use).
+
+-export([ok1/0, ok2/0, ok3/0, ok4/0, ok5/0, ok6/0]).
+-export([middle/0]).
+-export([w1/0, w2/0, w3/0, w4/1, w5/0, w6/0, w7/0, w8/1, w9/0]).
+
+-define(DICT, dict).
+
+%%---------------------------------------------------------------------
+%% Cases that are OK
+%%---------------------------------------------------------------------
+
+ok1() ->
+  dict:new().
+
+ok2() ->
+  case dict:new() of X -> X end.
+
+ok3() ->
+  Dict1 = dict:new(),
+  Dict2 = dict:new(),
+  Dict1 =:= Dict2.
+
+ok4() ->
+  dict:fetch(foo, dict:new()).
+
+ok5() ->  % this is OK since some_mod:new/0 might be returning a dict:dict()
+  dict:fetch(foo, some_mod:new()).
+
+ok6() ->
+  dict:store(42, elli, dict:new()).
+
+middle() ->
+  {w1(), w2()}.
+
+%%---------------------------------------------------------------------
+%% Cases that are problematic w.r.t. opacity of types
+%%---------------------------------------------------------------------
+
+w1() ->
+  gazonk = dict:new().
+
+w2() ->
+  case dict:new() of
+    [] -> nil;
+    42 -> weird
+  end.
+
+w3() ->
+  try dict:new() of
+    [] -> nil;
+    42 -> weird
+  catch
+    _:_ -> exception
+  end.
+
+w4(Dict) when is_list(Dict) ->
+  Dict =:= dict:new();
+w4(Dict) when is_atom(Dict) ->
+  Dict =/= dict:new().
+
+w5() ->
+  case dict:new() of
+    D when length(D) =/= 42 -> weird;
+    D when is_atom(D) -> weirder;
+    D when is_list(D) -> gazonk
+  end.
+
+w6() ->
+  is_list(dict:new()).
+
+w7() ->
+  dict:fetch(foo, [1,2,3]).
+
+w8(Fun) ->
+  dict:merge(Fun, 42, [1,2]).
+
+w9() ->
+  dict:store(42, elli,
+	     {dict,0,16,16,8,80,48,
+	           {[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]},
+	           {{[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]}}}).
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/fun_app.erl b/lib/dialyzer/test/indent_SUITE_data/src/fun_app.erl
new file mode 100644
index 0000000000..20b6138d26
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/fun_app.erl
@@ -0,0 +1,41 @@
+%% This is taken from the code of distel.
+
+-module(fun_app).
+-export([html_index/2]). % , lines/3, curry/2]).
+
+html_index(file,Dir) ->
+  fold_file(curry(fun lines/3,Dir),[],filename:join([Dir,"doc","man_index.html"])).
+
+fold_file(Fun,Acc0,File) ->
+  {ok, FD} = file:open(File, [read]),
+  Acc = fold_file_lines(FD,Fun,Acc0),
+  file:close(FD),
+  Acc.
+
+fold_file_lines(FD,Fun,Acc) ->
+  case io:get_line(FD, "") of
+    eof -> Acc;
+    Line -> fold_file_lines(FD,Fun,Fun(trim_nl(Line),Acc))
+  end.
+
+trim_nl(Str) -> lists:reverse(tl(lists:reverse(Str))).
+
+lines(Line,_,Dir) ->
+  case string:tokens(Line, "<> \"") of
+    ["TD", "A", "HREF=", "../"++Href, M|_] ->
+      case filename:basename(Href, ".html") of
+	"index" -> ok;
+	M -> e_set({file,M}, filename:join([Dir,Href]))
+      end;
+    _ -> ok
+  end.
+
+e_set(Key,Val) -> ets:insert(?MODULE, {Key,Val}).
+
+curry(F, Arg) ->
+  case erlang:fun_info(F,arity) of
+    {_,1} -> fun() -> F(Arg) end;
+    {_,2} -> fun(A) -> F(A,Arg) end;
+    {_,3} -> fun(A,B) -> F(A,B,Arg) end;
+    {_,4} -> fun(A,B,C) -> F(A,B,C,Arg) end
+  end.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/fun_app_args.erl b/lib/dialyzer/test/indent_SUITE_data/src/fun_app_args.erl
new file mode 100644
index 0000000000..b4409bc550
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/fun_app_args.erl
@@ -0,0 +1,12 @@
+-module(fun_app_args).
+
+-export([t/1]).
+
+-type ft() :: fun((a, []) -> any()).
+
+-record(r, {
+    h = c :: c | ft()
+}).
+
+t(#r{h = H}) ->
+    fun(_) -> (H)(b, []) end.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/guard_update.erl b/lib/dialyzer/test/indent_SUITE_data/src/guard_update.erl
new file mode 100644
index 0000000000..19d0089401
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/guard_update.erl
@@ -0,0 +1,18 @@
+-module(guard_update).
+
+-export([t/0, t2/0]).
+
+t() ->
+    f(#{a=>2}). %% Illegal
+
+f(M)
+  when M#{b := 7} =/= q
+       -> ok.
+
+t2() ->
+    f2(#{a=>2}). %% Legal!
+
+f2(M)
+  when M#{b := 7} =/= q;
+       M =/= p
+       -> ok.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/guard_warnings.erl b/lib/dialyzer/test/indent_SUITE_data/src/guard_warnings.erl
new file mode 100644
index 0000000000..6ab13eef9a
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/guard_warnings.erl
@@ -0,0 +1,118 @@
+%%
+%% A couple of tests for booleans in guards.
+%% Tests with suffix w have incomplete results due to weak dataflow.
+%% Tests with suffix ww have incomplete results due to weak dialyzer.
+%% Tests with suffix x should not give warnings.
+%%
+
+-module(and_bug).
+
+-compile(export_all).
+
+test1(X) when X and not X -> never.
+
+test2(X) when not X and X -> never.
+
+test3(X) when (X and not X) =:= true -> never.
+
+test4(X) when (not X and X) =:= true -> never.
+
+test5(X) when (X and not X) == true -> never.
+
+test6(X) when (not X and X) == true -> never.
+
+test7_w(X) when not (X or not X) -> never.
+
+test8_w(X) when not (not X or X) -> never.
+
+test9(X) when (X or not X) =:= false -> never.
+
+test10(X) when (not X or X) =:= false -> never.
+
+test11(X) when (X or not X) == false -> never.
+
+test12(X) when (not X or X) == false -> never.
+
+test13(X) when X and false -> never.
+
+test14(X) when false and X -> never.
+
+test15(X) when (X and false) =:= true -> never.
+
+test16(X) when (false and X) =:= true -> never.
+
+test17(X) when (X and false) == true -> never.
+
+test18(X) when (false and X) == true -> never.
+
+test19(X) when not (true or X) -> never.
+
+test20(X) when not (X or true) -> never.
+
+test21(X) when (true or X) =:= false -> never.
+
+test22(X) when (X or true) =:= false -> never.
+
+test23(X) when (true or X) == false -> never.
+
+test24(X) when (X or true) == false -> never.
+
+test25(X) when (false and X) -> never.
+
+test26(X) when (X and false) -> never.
+
+test27(X) when (false and X) =:= true -> never.
+
+test28(X) when (X and false) =:= true -> never.
+
+test29(X) when (false and X) == true -> never.
+
+test30(X) when (X and false) == true -> never.
+
+test31() when false and false -> never.
+
+test32() when (false and false) =:= true -> never.
+
+test33() when not (true and true) =:= true -> never.
+
+test34() when (false and false) == true -> never.
+
+test35() when not (true and true) == true -> never.
+
+test36() when false or false -> never.
+
+test37() when (false or false) =:= true -> never.
+
+test38() when not (false or false) =:= false -> never.
+
+test39() when (false or false) == true -> never.
+
+test40() when not (false or false) == false -> never.
+
+test41() when true =:= false -> never.
+
+test42() when true == false -> never.
+
+test43() when not (true =:= true) -> never.
+
+test44() when not (true == true) -> never.
+
+test45() when not (not (not (not (not (not (not true)))))) -> never.
+
+test46(X) when (X =:= true) and (X =:= false) -> never.
+
+test47(X) when (X == true) and (X == false) -> never.
+
+test48(X) when is_boolean(X) and (X =:= true) and (X =/= true) -> never.
+
+test49_x(X) when not (X or X) -> maybe.
+
+test50_x(X) when not (X and X) -> maybe.
+
+test51_x(X) when not (not X) -> maybe.
+
+test52_w(X) when is_boolean(X) and (X =/= true) and (X =:= true) -> never.
+
+test53_ww(X) when is_boolean(X) and (X =/= true) and (X =/= false) -> never.
+
+test54_w(X) when is_boolean(X) and not ((X =:= true) or (X =:= false)) -> never.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/map_galore.erl b/lib/dialyzer/test/indent_SUITE_data/src/map_galore.erl
new file mode 100644
index 0000000000..99eb73a5f6
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/map_galore.erl
@@ -0,0 +1,2800 @@
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2013. 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(map_galore).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	init_per_group/2,end_per_group/2
+    ]).
+
+-export([
+	t_build_and_match_literals/1, t_build_and_match_literals_large/1,
+	t_update_literals/1, t_update_literals_large/1,
+        t_match_and_update_literals/1, t_match_and_update_literals_large/1,
+	t_update_map_expressions/1,
+	t_update_assoc/1, t_update_assoc_large/1,
+        t_update_exact/1, t_update_exact_large/1,
+	t_guard_bifs/1,
+        t_guard_sequence/1, t_guard_sequence_large/1,
+        t_guard_update/1, t_guard_update_large/1,
+	t_guard_receive/1, t_guard_receive_large/1,
+        t_guard_fun/1,
+        t_update_deep/1,
+	t_list_comprehension/1,
+	t_map_sort_literals/1,
+	t_map_equal/1,
+	t_map_compare/1,
+	t_map_size/1,
+	t_is_map/1,
+
+	%% Specific Map BIFs
+	t_bif_map_get/1,
+	t_bif_map_find/1,
+	t_bif_map_is_key/1,
+	t_bif_map_keys/1,
+	t_bif_map_merge/1,
+	t_bif_map_new/1,
+	t_bif_map_put/1,
+	t_bif_map_remove/1,
+	t_bif_map_update/1,
+	t_bif_map_values/1,
+	t_bif_map_to_list/1,
+	t_bif_map_from_list/1,
+
+	%% erlang
+	t_erlang_hash/1,
+	t_map_encode_decode/1,
+
+	%% non specific BIF related
+	t_bif_build_and_check/1,
+	t_bif_merge_and_check/1,
+
+	%% maps module not bifs
+	t_maps_fold/1,
+	t_maps_map/1,
+	t_maps_size/1,
+	t_maps_without/1,
+
+	%% misc
+	t_erts_internal_order/1,
+        t_erts_internal_hash/1,
+	t_pdict/1,
+	t_ets/1,
+	t_dets/1,
+	t_tracing/1,
+
+	%% instruction-level tests
+	t_has_map_fields/1,
+	y_regs/1
+    ]).
+
+-include_lib("stdlib/include/ms_transform.hrl").
+
+-define(CHECK(Cond,Term),
+	case (catch (Cond)) of
+	    true -> true;
+	    _ -> io:format("###### CHECK FAILED ######~nINPUT:  ~p~n", [Term]),
+		 exit(Term)
+	end).
+
+suite() -> [].
+
+all() -> [
+	t_build_and_match_literals, t_build_and_match_literals_large,
+	t_update_literals, t_update_literals_large,
+        t_match_and_update_literals, t_match_and_update_literals_large,
+	t_update_map_expressions,
+	t_update_assoc, t_update_assoc_large,
+        t_update_exact, t_update_exact_large,
+	t_guard_bifs,
+        t_guard_sequence, t_guard_sequence_large,
+        t_guard_update, t_guard_update_large,
+	t_guard_receive, t_guard_receive_large,
+        t_guard_fun, t_list_comprehension,
+        t_update_deep,
+	t_map_equal, t_map_compare,
+	t_map_sort_literals,
+
+	%% Specific Map BIFs
+	t_bif_map_get,t_bif_map_find,t_bif_map_is_key,
+	t_bif_map_keys, t_bif_map_merge, t_bif_map_new,
+	t_bif_map_put,
+	t_bif_map_remove, t_bif_map_update,
+	t_bif_map_values,
+	t_bif_map_to_list, t_bif_map_from_list,
+
+	%% erlang
+	t_erlang_hash, t_map_encode_decode,
+	t_map_size, t_is_map,
+
+	%% non specific BIF related
+	t_bif_build_and_check,
+	t_bif_merge_and_check,
+
+	%% maps module
+	t_maps_fold, t_maps_map,
+	t_maps_size, t_maps_without,
+
+
+        %% Other functions
+	t_erts_internal_order,
+        t_erts_internal_hash,
+	t_pdict,
+	t_ets,
+	t_tracing,
+
+	%% instruction-level tests
+	t_has_map_fields,
+	y_regs
+    ].
+
+groups() -> [].
+
+init_per_suite(Config) -> Config.
+end_per_suite(_Config) -> ok.
+
+init_per_group(_GroupName, Config) -> Config.
+end_per_group(_GroupName, Config) -> Config.
+
+%% tests
+
+t_build_and_match_literals(Config) when is_list(Config) ->
+    #{} = #{},
+    #{1:=a} = #{1=>a},
+    #{1:=a,2:=b} = #{1=>a,2=>b},
+    #{1:=a,2:=b,3:="c"} = #{1=>a,2=>b,3=>"c"},
+    #{1:=a,2:=b,3:="c","4":="d"} = #{1=>a,2=>b,3=>"c","4"=>"d"},
+    #{1:=a,2:=b,3:="c","4":="d",<<"5">>:=<<"e">>} =
+	#{1=>a,2=>b,3=>"c","4"=>"d",<<"5">>=><<"e">>},
+    #{1:=a,2:=b,3:="c","4":="d",<<"5">>:=<<"e">>,{"6",7}:="f"} =
+	#{1=>a,2=>b,3=>"c","4"=>"d",<<"5">>=><<"e">>,{"6",7}=>"f"},
+    #{1:=a,2:=b,3:="c","4":="d",<<"5">>:=<<"e">>,{"6",7}:="f",8:=g} =
+	#{1=>a,2=>b,3=>"c","4"=>"d",<<"5">>=><<"e">>,{"6",7}=>"f",8=>g},
+
+    #{[]:=a,42.0:=b,x:={x,y},[a,b]:=list} =
+         #{[]=>a,42.0=>b,x=>{x,y},[a,b]=>list},
+
+    #{<<"hi all">> := 1} = #{<<"hi",32,"all">> => 1},
+
+    #{a:=X,a:=X=3,b:=4} = #{a=>3,b=>4}, % weird but ok =)
+
+    #{ a:=#{ b:=#{c := third, b:=second}}, b:=first} =
+	#{ b=>first, a=>#{ b=>#{c => third, b=> second}}},
+
+    M = #{ map_1=>#{ map_2=>#{value_3 => third}, value_2=> second}, value_1=>first},
+    M = #{ map_1:=#{ map_2:=#{value_3 := third}, value_2:= second}, value_1:=first} =
+	 #{ map_1=>#{ map_2=>#{value_3 => third}, value_2=> second}, value_1=>first},
+
+    %% error case
+    %V = 32,
+    %{'EXIT',{{badmatch,_},_}} = (catch (#{<<"hi all">> => 1} = #{<<"hi",V,"all">> => 1})),
+    {'EXIT',{{badmatch,_},_}} = (catch (#{x:=3,x:=2} = #{x=>3})),
+    {'EXIT',{{badmatch,_},_}} = (catch (#{x:=2} = #{x=>3})),
+    {'EXIT',{{badmatch,_},_}} = (catch (#{x:=3} = {a,b,c})),
+    {'EXIT',{{badmatch,_},_}} = (catch (#{x:=3} = #{y=>3})),
+    {'EXIT',{{badmatch,_},_}} = (catch (#{x:=3} = #{x=>"three"})),
+    ok.
+
+t_build_and_match_literals_large(Config) when is_list(Config) ->
+    % normal non-repeating
+    M0 = #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+               11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+               12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+               13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+               14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+               15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+               16=>a6,26=>b6,36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+               17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+               18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+               19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19" },
+
+    #{10:=a0,20:=b0,30:="c0","40":="d0",<<"50">>:="e0",{["00"]}:="10"} = M0,
+    #{11:=a1,21:=b1,31:="c1","41":="d1",<<"51">>:="e1",{["01"]}:="11"} = M0,
+    #{12:=a2,22:=b2,32:="c2","42":="d2",<<"52">>:="e2",{["02"]}:="12"} = M0,
+    #{13:=a3,23:=b3,33:="c3","43":="d3",<<"53">>:="e3",{["03"]}:="13"} = M0,
+    #{14:=a4,24:=b4,34:="c4","44":="d4",<<"54">>:="e4",{["04"]}:="14"} = M0,
+
+    #{15:=a5,25:=b5,35:="c5","45":="d5",<<"55">>:="e5",{["05"]}:="15"} = M0,
+    #{16:=a6,26:=b6,36:="c6","46":="d6",<<"56">>:="e6",{["06"]}:="16"} = M0,
+    #{17:=a7,27:=b7,37:="c7","47":="d7",<<"57">>:="e7",{["07"]}:="17"} = M0,
+    #{18:=a8,28:=b8,38:="c8","48":="d8",<<"58">>:="e8",{["08"]}:="18"} = M0,
+    #{19:=a9,29:=b9,39:="c9","49":="d9",<<"59">>:="e9",{["09"]}:="19"} = M0,
+
+    60 = map_size(M0),
+    60 = maps:size(M0),
+
+    % with repeating
+    M1 = #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+               11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+               12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+               13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+               14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+               10=>na0,20=>nb0,30=>"nc0","40"=>"nd0",<<"50">>=>"ne0",{["00"]}=>"n10",
+               11=>na1,21=>nb1,31=>"nc1","41"=>"nd1",<<"51">>=>"ne1",{["01"]}=>"n11",
+               12=>na2,22=>nb2,32=>"nc2","42"=>"nd2",<<"52">>=>"ne2",{["02"]}=>"n12",
+
+               15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+               16=>a6,26=>b6,36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+               17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+
+               13=>na3,23=>nb3,33=>"nc3","43"=>"nd3",<<"53">>=>"ne3",{["03"]}=>"n13",
+               14=>na4,24=>nb4,34=>"nc4","44"=>"nd4",<<"54">>=>"ne4",{["04"]}=>"n14",
+
+               18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+               19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19" },
+
+    #{10:=na0,20:=nb0,30:="nc0","40":="nd0",<<"50">>:="ne0",{["00"]}:="n10"} = M1,
+    #{11:=na1,21:=nb1,31:="nc1","41":="nd1",<<"51">>:="ne1",{["01"]}:="n11"} = M1,
+    #{12:=na2,22:=nb2,32:="nc2","42":="nd2",<<"52">>:="ne2",{["02"]}:="n12"} = M1,
+    #{13:=na3,23:=nb3,33:="nc3","43":="nd3",<<"53">>:="ne3",{["03"]}:="n13"} = M1,
+    #{14:=na4,24:=nb4,34:="nc4","44":="nd4",<<"54">>:="ne4",{["04"]}:="n14"} = M1,
+
+    #{15:=a5,25:=b5,35:="c5","45":="d5",<<"55">>:="e5",{["05"]}:="15"} = M1,
+    #{16:=a6,26:=b6,36:="c6","46":="d6",<<"56">>:="e6",{["06"]}:="16"} = M1,
+    #{17:=a7,27:=b7,37:="c7","47":="d7",<<"57">>:="e7",{["07"]}:="17"} = M1,
+    #{18:=a8,28:=b8,38:="c8","48":="d8",<<"58">>:="e8",{["08"]}:="18"} = M1,
+    #{19:=a9,29:=b9,39:="c9","49":="d9",<<"59">>:="e9",{["09"]}:="19"} = M1,
+
+    60 = map_size(M1),
+    60 = maps:size(M1),
+
+    % with floats
+
+    M2 = #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+               11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+               12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+               13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+               14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+               15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+               16=>a6,26=>b6,36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+               17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+               18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+               19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19",
+
+               10.0=>fa0,20.0=>fb0,30.0=>"fc0",
+               11.0=>fa1,21.0=>fb1,31.0=>"fc1",
+               12.0=>fa2,22.0=>fb2,32.0=>"fc2",
+               13.0=>fa3,23.0=>fb3,33.0=>"fc3",
+               14.0=>fa4,24.0=>fb4,34.0=>"fc4",
+
+               15.0=>fa5,25.0=>fb5,35.0=>"fc5",
+               16.0=>fa6,26.0=>fb6,36.0=>"fc6",
+               17.0=>fa7,27.0=>fb7,37.0=>"fc7",
+               18.0=>fa8,28.0=>fb8,38.0=>"fc8",
+               19.0=>fa9,29.0=>fb9,39.0=>"fc9"},
+
+    #{10:=a0,20:=b0,30:="c0","40":="d0",<<"50">>:="e0",{["00"]}:="10"} = M2,
+    #{11:=a1,21:=b1,31:="c1","41":="d1",<<"51">>:="e1",{["01"]}:="11"} = M2,
+    #{12:=a2,22:=b2,32:="c2","42":="d2",<<"52">>:="e2",{["02"]}:="12"} = M2,
+    #{13:=a3,23:=b3,33:="c3","43":="d3",<<"53">>:="e3",{["03"]}:="13"} = M2,
+    #{14:=a4,24:=b4,34:="c4","44":="d4",<<"54">>:="e4",{["04"]}:="14"} = M2,
+
+    #{15:=a5,25:=b5,35:="c5","45":="d5",<<"55">>:="e5",{["05"]}:="15"} = M2,
+    #{16:=a6,26:=b6,36:="c6","46":="d6",<<"56">>:="e6",{["06"]}:="16"} = M2,
+    #{17:=a7,27:=b7,37:="c7","47":="d7",<<"57">>:="e7",{["07"]}:="17"} = M2,
+    #{18:=a8,28:=b8,38:="c8","48":="d8",<<"58">>:="e8",{["08"]}:="18"} = M2,
+    #{19:=a9,29:=b9,39:="c9","49":="d9",<<"59">>:="e9",{["09"]}:="19"} = M2,
+
+    #{10.0:=fa0,20.0:=fb0,30.0:="fc0","40":="d0",<<"50">>:="e0",{["00"]}:="10"} = M2,
+    #{11.0:=fa1,21.0:=fb1,31.0:="fc1","41":="d1",<<"51">>:="e1",{["01"]}:="11"} = M2,
+    #{12.0:=fa2,22.0:=fb2,32.0:="fc2","42":="d2",<<"52">>:="e2",{["02"]}:="12"} = M2,
+    #{13.0:=fa3,23.0:=fb3,33.0:="fc3","43":="d3",<<"53">>:="e3",{["03"]}:="13"} = M2,
+    #{14.0:=fa4,24.0:=fb4,34.0:="fc4","44":="d4",<<"54">>:="e4",{["04"]}:="14"} = M2,
+
+    #{15.0:=fa5,25.0:=fb5,35.0:="fc5","45":="d5",<<"55">>:="e5",{["05"]}:="15"} = M2,
+    #{16.0:=fa6,26.0:=fb6,36.0:="fc6","46":="d6",<<"56">>:="e6",{["06"]}:="16"} = M2,
+    #{17.0:=fa7,27.0:=fb7,37.0:="fc7","47":="d7",<<"57">>:="e7",{["07"]}:="17"} = M2,
+    #{18.0:=fa8,28.0:=fb8,38.0:="fc8","48":="d8",<<"58">>:="e8",{["08"]}:="18"} = M2,
+    #{19.0:=fa9,29.0:=fb9,39.0:="fc9","49":="d9",<<"59">>:="e9",{["09"]}:="19"} = M2,
+
+    90 = map_size(M2),
+    90 = maps:size(M2),
+
+    % with bignums
+    M3 = #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+               11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+               12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+               13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+               14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+               15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+               16=>a6,26=>b6,36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+               17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+               18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+               19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19",
+
+               10.0=>fa0,20.0=>fb0,30.0=>"fc0",
+               11.0=>fa1,21.0=>fb1,31.0=>"fc1",
+               12.0=>fa2,22.0=>fb2,32.0=>"fc2",
+               13.0=>fa3,23.0=>fb3,33.0=>"fc3",
+               14.0=>fa4,24.0=>fb4,34.0=>"fc4",
+
+               15.0=>fa5,25.0=>fb5,35.0=>"fc5",
+               16.0=>fa6,26.0=>fb6,36.0=>"fc6",
+               17.0=>fa7,27.0=>fb7,37.0=>"fc7",
+               18.0=>fa8,28.0=>fb8,38.0=>"fc8",
+               19.0=>fa9,29.0=>fb9,39.0=>"fc9",
+
+               36893488147419103232=>big1,  73786976294838206464=>big2,
+               147573952589676412928=>big3, 18446744073709551616=>big4,
+               4294967296=>big5,            8589934592=>big6,
+               4294967295=>big7,            67108863=>big8
+             },
+
+    #{10:=a0,20:=b0,30:="c0","40":="d0",<<"50">>:="e0",{["00"]}:="10"} = M3,
+    #{11:=a1,21:=b1,31:="c1","41":="d1",<<"51">>:="e1",{["01"]}:="11"} = M3,
+    #{12:=a2,22:=b2,32:="c2","42":="d2",<<"52">>:="e2",{["02"]}:="12"} = M3,
+    #{13:=a3,23:=b3,33:="c3","43":="d3",<<"53">>:="e3",{["03"]}:="13"} = M3,
+    #{14:=a4,24:=b4,34:="c4","44":="d4",<<"54">>:="e4",{["04"]}:="14"} = M3,
+
+    #{15:=a5,25:=b5,35:="c5","45":="d5",<<"55">>:="e5",{["05"]}:="15"} = M3,
+    #{16:=a6,26:=b6,36:="c6","46":="d6",<<"56">>:="e6",{["06"]}:="16"} = M3,
+    #{17:=a7,27:=b7,37:="c7","47":="d7",<<"57">>:="e7",{["07"]}:="17"} = M3,
+    #{18:=a8,28:=b8,38:="c8","48":="d8",<<"58">>:="e8",{["08"]}:="18"} = M3,
+    #{19:=a9,29:=b9,39:="c9","49":="d9",<<"59">>:="e9",{["09"]}:="19"} = M3,
+
+    #{10.0:=fa0,20.0:=fb0,30.0:="fc0","40":="d0",<<"50">>:="e0",{["00"]}:="10"} = M3,
+    #{11.0:=fa1,21.0:=fb1,31.0:="fc1","41":="d1",<<"51">>:="e1",{["01"]}:="11"} = M3,
+    #{12.0:=fa2,22.0:=fb2,32.0:="fc2","42":="d2",<<"52">>:="e2",{["02"]}:="12"} = M3,
+    #{13.0:=fa3,23.0:=fb3,33.0:="fc3","43":="d3",<<"53">>:="e3",{["03"]}:="13"} = M3,
+    #{14.0:=fa4,24.0:=fb4,34.0:="fc4","44":="d4",<<"54">>:="e4",{["04"]}:="14"} = M3,
+
+    #{15.0:=fa5,25.0:=fb5,35.0:="fc5","45":="d5",<<"55">>:="e5",{["05"]}:="15"} = M3,
+    #{16.0:=fa6,26.0:=fb6,36.0:="fc6","46":="d6",<<"56">>:="e6",{["06"]}:="16"} = M3,
+    #{17.0:=fa7,27.0:=fb7,37.0:="fc7","47":="d7",<<"57">>:="e7",{["07"]}:="17"} = M3,
+    #{18.0:=fa8,28.0:=fb8,38.0:="fc8","48":="d8",<<"58">>:="e8",{["08"]}:="18"} = M3,
+    #{19.0:=fa9,29.0:=fb9,39.0:="fc9","49":="d9",<<"59">>:="e9",{["09"]}:="19"} = M3,
+
+    #{36893488147419103232:=big1,67108863:=big8,"45":="d5",<<"55">>:="e5",{["05"]}:="15"} = M3,
+    #{147573952589676412928:=big3,8589934592:=big6,"46":="d6",<<"56">>:="e6",{["06"]}:="16"} = M3,
+    #{4294967296:=big5,18446744073709551616:=big4,"47":="d7",<<"57">>:="e7",{["07"]}:="17"} = M3,
+    #{4294967295:=big7,73786976294838206464:=big2,"48":="d8",<<"58">>:="e8",{["08"]}:="18"} = M3,
+
+    98 = map_size(M3),
+    98 = maps:size(M3),
+
+    %% with maps
+
+    M4 = #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+               11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+               12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+               13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+               14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+               15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+               16=>a6,26=>b6,36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+               17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+               18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+               19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19",
+
+               10.0=>fa0,20.0=>fb0,30.0=>"fc0",
+               11.0=>fa1,21.0=>fb1,31.0=>"fc1",
+               12.0=>fa2,22.0=>fb2,32.0=>"fc2",
+               13.0=>fa3,23.0=>fb3,33.0=>"fc3",
+               14.0=>fa4,24.0=>fb4,34.0=>"fc4",
+
+               15.0=>fa5,25.0=>fb5,35.0=>"fc5",
+               16.0=>fa6,26.0=>fb6,36.0=>"fc6",
+               17.0=>fa7,27.0=>fb7,37.0=>"fc7",
+               18.0=>fa8,28.0=>fb8,38.0=>"fc8",
+               19.0=>fa9,29.0=>fb9,39.0=>"fc9",
+
+               #{ one => small, map => key } => "small map key 1",
+               #{ second => small, map => key } => "small map key 2",
+               #{ third => small, map => key } => "small map key 3",
+
+               #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+                  11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+                  12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+                  13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+                  14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+                  15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+                  16=>a6,26=>b6,36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+                  17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+                  18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+                  19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19" } => "large map key 1",
+
+               #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+                  11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+                  12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+                  13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+                  14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+                  15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+                  k16=>a6,k26=>b6,k36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+                  17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+                  18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+                  19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19" } => "large map key 2" },
+
+    #{10:=a0,20:=b0,30:="c0","40":="d0",<<"50">>:="e0",{["00"]}:="10"} = M4,
+    #{11:=a1,21:=b1,31:="c1","41":="d1",<<"51">>:="e1",{["01"]}:="11"} = M4,
+    #{12:=a2,22:=b2,32:="c2","42":="d2",<<"52">>:="e2",{["02"]}:="12"} = M4,
+    #{13:=a3,23:=b3,33:="c3","43":="d3",<<"53">>:="e3",{["03"]}:="13"} = M4,
+    #{14:=a4,24:=b4,34:="c4","44":="d4",<<"54">>:="e4",{["04"]}:="14"} = M4,
+
+    #{15:=a5,25:=b5,35:="c5","45":="d5",<<"55">>:="e5",{["05"]}:="15"} = M4,
+    #{16:=a6,26:=b6,36:="c6","46":="d6",<<"56">>:="e6",{["06"]}:="16"} = M4,
+    #{17:=a7,27:=b7,37:="c7","47":="d7",<<"57">>:="e7",{["07"]}:="17"} = M4,
+    #{18:=a8,28:=b8,38:="c8","48":="d8",<<"58">>:="e8",{["08"]}:="18"} = M4,
+    #{19:=a9,29:=b9,39:="c9","49":="d9",<<"59">>:="e9",{["09"]}:="19"} = M4,
+
+    #{ #{ one => small, map => key }    := "small map key 1",
+       #{ second => small, map => key } := "small map key 2",
+       #{ third => small, map => key }  := "small map key 3" } = M4,
+
+    #{ #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+          11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+          12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+          13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+          14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+          15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+          16=>a6,26=>b6,36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+          17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+          18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+          19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19" } := "large map key 1",
+
+       #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+          11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+          12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+          13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+          14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+          15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+          k16=>a6,k26=>b6,k36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+          17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+          18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+          19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19" } := "large map key 2" } = M4,
+
+
+    #{ 15:=V1,25:=b5,35:=V2,"45":="d5",<<"55">>:=V3,{["05"]}:="15",
+       #{ one => small, map => key }    := "small map key 1",
+       #{ second => small, map => key } := V4,
+       #{ third => small, map => key }  := "small map key 3",
+       #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+          11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+          12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+          13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+          14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+          15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+          16=>a6,26=>b6,36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+          17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+          18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+          19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19" } := V5 } = M4,
+
+    a5   = V1,
+    "c5" = V2,
+    "e5" = V3,
+    "small map key 2" = V4,
+    "large map key 1" = V5,
+
+    95 = map_size(M4),
+    95 = maps:size(M4),
+
+    % call for value
+
+    M5 = #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+               11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+               12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+               13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+               14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+               15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+               16=>a6,26=>b6,36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+               17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+               18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+               19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19",
+
+               10.0=>fa0,20.0=>fb0,30.0=>"fc0",
+               11.0=>fa1,21.0=>fb1,31.0=>"fc1",
+               12.0=>fa2,22.0=>fb2,32.0=>"fc2",
+               13.0=>fa3,23.0=>fb3,33.0=>"fc3",
+               14.0=>fa4,24.0=>fb4,34.0=>"fc4",
+
+               15.0=>fa5,25.0=>fb5,35.0=>"fc5",
+               16.0=>fa6,26.0=>fb6,36.0=>"fc6",
+               17.0=>fa7,27.0=>fb7,37.0=>"fc7",
+               18.0=>fa8,28.0=>fb8,38.0=>"fc8",
+               19.0=>fa9,29.0=>fb9,39.0=>"fc9",
+
+               #{ one => small, map => key } => "small map key 1",
+               #{ second => small, map => key } => "small map key 2",
+               #{ third => small, map => key } => "small map key 3",
+
+               #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+                  11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+                  12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+                  13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+                  14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+                  15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+                  16=>a6,26=>b6,36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+                  17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+                  18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+                  19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19" } => "large map key 1",
+
+               #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+                  11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+                  12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+                  13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+                  14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+                  15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+                  k16=>a6,k26=>b6,k36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+                  17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+                  18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+                  19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19" } => "large map key 2" },
+
+    #{10:=a0,20:=b0,30:="c0","40":="d0",<<"50">>:="e0",{["00"]}:="10"} = M5,
+    #{11:=a1,21:=b1,31:="c1","41":="d1",<<"51">>:="e1",{["01"]}:="11"} = M5,
+    #{12:=a2,22:=b2,32:="c2","42":="d2",<<"52">>:="e2",{["02"]}:="12"} = M5,
+    #{13:=a3,23:=b3,33:="c3","43":="d3",<<"53">>:="e3",{["03"]}:="13"} = M5,
+    #{14:=a4,24:=b4,34:="c4","44":="d4",<<"54">>:="e4",{["04"]}:="14"} = M5,
+
+    #{15:=a5,25:=b5,35:="c5","45":="d5",<<"55">>:="e5",{["05"]}:="15"} = M5,
+    #{16:=a6,26:=b6,36:="c6","46":="d6",<<"56">>:="e6",{["06"]}:="16"} = M5,
+    #{17:=a7,27:=b7,37:="c7","47":="d7",<<"57">>:="e7",{["07"]}:="17"} = M5,
+    #{18:=a8,28:=b8,38:="c8","48":="d8",<<"58">>:="e8",{["08"]}:="18"} = M5,
+    #{19:=a9,29:=b9,39:="c9","49":="d9",<<"59">>:="e9",{["09"]}:="19"} = M5,
+
+    #{ #{ one => small, map => key }    := "small map key 1",
+       #{ second => small, map => key } := "small map key 2",
+       #{ third => small, map => key }  := "small map key 3" } = M5,
+
+    #{ #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+          11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+          12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+          13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+          14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+          15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+          16=>a6,26=>b6,36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+          17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+          18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+          19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19" } := "large map key 1",
+
+       #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+          11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+          12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+          13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+          14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+          15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+          k16=>a6,k26=>b6,k36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+          17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+          18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+          19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19" } := "large map key 2" } = M5,
+
+    95 = map_size(M5),
+    95 = maps:size(M5),
+
+    %% remember
+
+    #{10:=a0,20:=b0,30:="c0","40":="d0",<<"50">>:="e0",{["00"]}:="10"} = M0,
+    #{11:=a1,21:=b1,31:="c1","41":="d1",<<"51">>:="e1",{["01"]}:="11"} = M0,
+    #{12:=a2,22:=b2,32:="c2","42":="d2",<<"52">>:="e2",{["02"]}:="12"} = M0,
+    #{13:=a3,23:=b3,33:="c3","43":="d3",<<"53">>:="e3",{["03"]}:="13"} = M0,
+    #{14:=a4,24:=b4,34:="c4","44":="d4",<<"54">>:="e4",{["04"]}:="14"} = M0,
+
+    #{10:=na0,20:=nb0,30:="nc0","40":="nd0",<<"50">>:="ne0",{["00"]}:="n10"} = M1,
+    #{11:=na1,21:=nb1,31:="nc1","41":="nd1",<<"51">>:="ne1",{["01"]}:="n11"} = M1,
+    #{12:=na2,22:=nb2,32:="nc2","42":="nd2",<<"52">>:="ne2",{["02"]}:="n12"} = M1,
+    #{13:=na3,23:=nb3,33:="nc3","43":="nd3",<<"53">>:="ne3",{["03"]}:="n13"} = M1,
+    #{14:=na4,24:=nb4,34:="nc4","44":="nd4",<<"54">>:="ne4",{["04"]}:="n14"} = M1,
+
+    #{15:=a5,25:=b5,35:="c5","45":="d5",<<"55">>:="e5",{["05"]}:="15"} = M1,
+    #{16:=a6,26:=b6,36:="c6","46":="d6",<<"56">>:="e6",{["06"]}:="16"} = M1,
+    #{17:=a7,27:=b7,37:="c7","47":="d7",<<"57">>:="e7",{["07"]}:="17"} = M1,
+    #{18:=a8,28:=b8,38:="c8","48":="d8",<<"58">>:="e8",{["08"]}:="18"} = M1,
+    #{19:=a9,29:=b9,39:="c9","49":="d9",<<"59">>:="e9",{["09"]}:="19"} = M1,
+
+    #{15:=a5,25:=b5,35:="c5","45":="d5",<<"55">>:="e5",{["05"]}:="15"} = M2,
+    #{16:=a6,26:=b6,36:="c6","46":="d6",<<"56">>:="e6",{["06"]}:="16"} = M2,
+    #{17:=a7,27:=b7,37:="c7","47":="d7",<<"57">>:="e7",{["07"]}:="17"} = M2,
+    #{18:=a8,28:=b8,38:="c8","48":="d8",<<"58">>:="e8",{["08"]}:="18"} = M2,
+    #{19:=a9,29:=b9,39:="c9","49":="d9",<<"59">>:="e9",{["09"]}:="19"} = M2,
+
+    #{10.0:=fa0,20.0:=fb0,30.0:="fc0","40":="d0",<<"50">>:="e0",{["00"]}:="10"} = M2,
+    #{11.0:=fa1,21.0:=fb1,31.0:="fc1","41":="d1",<<"51">>:="e1",{["01"]}:="11"} = M2,
+    #{12.0:=fa2,22.0:=fb2,32.0:="fc2","42":="d2",<<"52">>:="e2",{["02"]}:="12"} = M2,
+    #{13.0:=fa3,23.0:=fb3,33.0:="fc3","43":="d3",<<"53">>:="e3",{["03"]}:="13"} = M2,
+    #{14.0:=fa4,24.0:=fb4,34.0:="fc4","44":="d4",<<"54">>:="e4",{["04"]}:="14"} = M2,
+
+    #{15:=a5,25:=b5,35:="c5","45":="d5",<<"55">>:="e5",{["05"]}:="15"} = M3,
+    #{16:=a6,26:=b6,36:="c6","46":="d6",<<"56">>:="e6",{["06"]}:="16"} = M3,
+    #{17:=a7,27:=b7,37:="c7","47":="d7",<<"57">>:="e7",{["07"]}:="17"} = M3,
+    #{18:=a8,28:=b8,38:="c8","48":="d8",<<"58">>:="e8",{["08"]}:="18"} = M3,
+    #{19:=a9,29:=b9,39:="c9","49":="d9",<<"59">>:="e9",{["09"]}:="19"} = M3,
+
+    #{10.0:=fa0,20.0:=fb0,30.0:="fc0","40":="d0",<<"50">>:="e0",{["00"]}:="10"} = M3,
+    #{11.0:=fa1,21.0:=fb1,31.0:="fc1","41":="d1",<<"51">>:="e1",{["01"]}:="11"} = M3,
+    #{12.0:=fa2,22.0:=fb2,32.0:="fc2","42":="d2",<<"52">>:="e2",{["02"]}:="12"} = M3,
+    #{13.0:=fa3,23.0:=fb3,33.0:="fc3","43":="d3",<<"53">>:="e3",{["03"]}:="13"} = M3,
+    #{14.0:=fa4,24.0:=fb4,34.0:="fc4","44":="d4",<<"54">>:="e4",{["04"]}:="14"} = M3,
+
+    #{15.0:=fa5,25.0:=fb5,35.0:="fc5","45":="d5",<<"55">>:="e5",{["05"]}:="15"} = M3,
+    #{16.0:=fa6,26.0:=fb6,36.0:="fc6","46":="d6",<<"56">>:="e6",{["06"]}:="16"} = M3,
+    #{17.0:=fa7,27.0:=fb7,37.0:="fc7","47":="d7",<<"57">>:="e7",{["07"]}:="17"} = M3,
+    #{18.0:=fa8,28.0:=fb8,38.0:="fc8","48":="d8",<<"58">>:="e8",{["08"]}:="18"} = M3,
+    #{19.0:=fa9,29.0:=fb9,39.0:="fc9","49":="d9",<<"59">>:="e9",{["09"]}:="19"} = M3,
+
+    #{36893488147419103232:=big1,67108863:=big8,"45":="d5",<<"55">>:="e5",{["05"]}:="15"} = M3,
+    #{147573952589676412928:=big3,8589934592:=big6,"46":="d6",<<"56">>:="e6",{["06"]}:="16"} = M3,
+    #{4294967296:=big5,18446744073709551616:=big4,"47":="d7",<<"57">>:="e7",{["07"]}:="17"} = M3,
+    #{4294967295:=big7,73786976294838206464:=big2,"48":="d8",<<"58">>:="e8",{["08"]}:="18"} = M3,
+
+    ok.
+
+
+t_map_size(Config) when is_list(Config) ->
+    0 = map_size(#{}),
+    1 = map_size(#{a=>1}),
+    1 = map_size(#{a=>"wat"}),
+    2 = map_size(#{a=>1, b=>2}),
+    3 = map_size(#{a=>1, b=>2, b=>"3","33"=><<"n">>}),
+
+    true = map_is_size(#{a=>1}, 1),
+    true = map_is_size(#{a=>1, a=>2}, 1),
+    M = #{ "a" => 1, "b" => 2},
+    true  = map_is_size(M, 2),
+    false = map_is_size(M, 3),
+    true  = map_is_size(M#{ "a" => 2}, 2),
+    false = map_is_size(M#{ "c" => 2}, 2),
+
+    Ks = [build_key(fun(K) -> <<1,K:32,1>> end,I)||I<-lists:seq(1,100)],
+    ok = build_and_check_size(Ks,0,#{}),
+
+    %% try deep collisions
+    %% statistically we get another subtree at 50k -> 100k elements
+    %% Try to be nice and don't use too much memory in the testcase,
+
+    N  = 500000,
+    Is = lists:seq(1,N),
+    N  = map_size(maps:from_list([{I,I}||I<-Is])),
+    N  = map_size(maps:from_list([{<<I:32>>,I}||I<-Is])),
+    N  = map_size(maps:from_list([{integer_to_list(I),I}||I<-Is])),
+    N  = map_size(maps:from_list([{float(I),I}||I<-Is])),
+
+    %% Error cases.
+    do_badmap(fun(T) ->
+                    {'EXIT',{{badmap,T},_}} =
+                      (catch map_size(T))
+              end),
+    ok.
+
+build_and_check_size([K|Ks],N,M0) ->
+    N = map_size(M0),
+    M1 = M0#{ K => K },
+    build_and_check_size(Ks,N + 1,M1);
+build_and_check_size([],N,M) ->
+    N = map_size(M),
+    ok.
+
+map_is_size(M,N) when map_size(M) =:= N -> true;
+map_is_size(_,_) -> false.
+
+t_is_map(Config) when is_list(Config) ->
+    true = is_map(#{}),
+    true = is_map(#{a=>1}),
+    false = is_map({a,b}),
+    false = is_map(x),
+    if is_map(#{}) -> ok end,
+    if is_map(#{b=>1}) -> ok end,
+    if not is_map([1,2,3]) -> ok end,
+    if not is_map(x) -> ok end,
+    ok.
+
+% test map updates without matching
+t_update_literals_large(Config) when is_list(Config) ->
+    Map = #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+                11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+                12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+                13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+                14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+                15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+                16=>a6,26=>b6,36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+                17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+                18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+                19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19",
+
+                10.0=>fa0,20.0=>fb0,30.0=>"fc0",
+                11.0=>fa1,21.0=>fb1,31.0=>"fc1",
+                12.0=>fa2,22.0=>fb2,32.0=>"fc2",
+                13.0=>fa3,23.0=>fb3,33.0=>"fc3",
+                14.0=>fa4,24.0=>fb4,34.0=>"fc4",
+
+                15.0=>fa5,25.0=>fb5,35.0=>"fc5",
+                16.0=>fa6,26.0=>fb6,36.0=>"fc6",
+                17.0=>fa7,27.0=>fb7,37.0=>"fc7",
+                18.0=>fa8,28.0=>fb8,38.0=>"fc8",
+                19.0=>fa9,29.0=>fb9,39.0=>"fc9",
+
+                #{ one => small, map => key } => "small map key 1",
+                #{ second => small, map => key } => "small map key 2",
+                #{ third => small, map => key } => "small map key 3",
+
+                #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+                   11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+                   12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+                   13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+                   14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+                   15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+                   16=>a6,26=>b6,36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+                   17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+                   18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+                   19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19" } => "large map key 1",
+
+                #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+                   11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+                   12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+                   13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+                   14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+                   15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+                   k16=>a6,k26=>b6,k36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+                   17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+                   18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+                   19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19" } => "large map key 2" },
+
+    #{x:="d",q:="4"} = loop_update_literals_x_q(Map, [
+		{"a","1"},{"b","2"},{"c","3"},{"d","4"}
+	]),
+    ok.
+
+t_update_literals(Config) when is_list(Config) ->
+    Map = #{x=>1,y=>2,z=>3,q=>4},
+    #{x:="d",q:="4"} = loop_update_literals_x_q(Map, [
+		{"a","1"},{"b","2"},{"c","3"},{"d","4"}
+	]),
+    ok.
+
+
+loop_update_literals_x_q(Map, []) -> Map;
+loop_update_literals_x_q(Map, [{X,Q}|Vs]) ->
+    loop_update_literals_x_q(Map#{q=>Q,x=>X},Vs).
+
+% test map updates with matching
+t_match_and_update_literals(Config) when is_list(Config) ->
+    Map = #{ x=>0,y=>"untouched",z=>"also untouched",q=>1,
+             #{ "one" => small, map => key } => "small map key 1" },
+    #{x:=16,q:=21,y:="untouched",z:="also untouched"} = loop_match_and_update_literals_x_q(Map, [
+	    {1,2},{3,4},{5,6},{7,8}
+	]),
+    M0 = #{ "hi" => "hello", int => 3, <<"key">> => <<"value">>,
+	    4 => number, 18446744073709551629 => wat},
+    M1 = #{},
+    M2 = M1#{ "hi" => "hello", int => 3, <<"key">> => <<"value">>,
+	4 => number, 18446744073709551629 => wat},
+    M0 = M2,
+
+    #{ 4 := another_number, int := 3 } = M2#{ 4 => another_number },
+    ok.
+
+t_match_and_update_literals_large(Config) when is_list(Config) ->
+    Map = #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+                11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+                12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+                13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+                14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+                15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+                16=>a6,26=>b6,36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+                17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+                18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+                19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19",
+
+                10.0=>fa0,20.0=>fb0,30.0=>"fc0",
+                11.0=>fa1,21.0=>fb1,31.0=>"fc1",
+                12.0=>fa2,22.0=>fb2,32.0=>"fc2",
+                13.0=>fa3,23.0=>fb3,33.0=>"fc3",
+                14.0=>fa4,24.0=>fb4,34.0=>"fc4",
+
+                15.0=>fa5,25.0=>fb5,35.0=>"fc5",
+                16.0=>fa6,26.0=>fb6,36.0=>"fc6",
+                17.0=>fa7,27.0=>fb7,37.0=>"fc7",
+                18.0=>fa8,28.0=>fb8,38.0=>"fc8",
+                19.0=>fa9,29.0=>fb9,39.0=>"fc9",
+
+                x=>0,y=>"untouched",z=>"also untouched",q=>1,
+
+                #{ "one" => small, map => key } => "small map key 1",
+                #{ second => small, map => key } => "small map key 2",
+                #{ third => small, map => key } => "small map key 3",
+
+                #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+                   11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+                   12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+                   13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+                   14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+                   15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+                   16=>a6,26=>b6,36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+                   17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+                   18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+                   19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19" } => "large map key 1",
+
+                #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+                   11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+                   12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+                   13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+                   14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+                   15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+                   k16=>a6,k26=>b6,k36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+                   17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+                   18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+                   19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19" } => "large map key 2" },
+
+    #{x:=16,q:=21,y:="untouched",z:="also untouched"} = loop_match_and_update_literals_x_q(Map, [
+	    {1,2},{3,4},{5,6},{7,8}
+	]),
+    M0 = Map#{ "hi" => "hello", int => 3, <<"key">> => <<"value">>,
+                  4 => number, 18446744073709551629 => wat},
+    M1 = Map#{},
+    M2 = M1#{ "hi" => "hello", int => 3, <<"key">> => <<"value">>,
+              4 => number, 18446744073709551629 => wat},
+    M0 = M2,
+
+    #{ 4 := another_number, int := 3 } = M2#{ 4 => another_number },
+    ok.
+
+
+loop_match_and_update_literals_x_q(Map, []) -> Map;
+loop_match_and_update_literals_x_q(#{ q:=Q0, x:=X0,
+                                     #{ "one" => small, map => key } := "small map key 1" } = Map, [{X,Q}|Vs]) ->
+    loop_match_and_update_literals_x_q(Map#{q=>Q0+Q,x=>X0+X},Vs).
+
+
+t_update_map_expressions(Config) when is_list(Config) ->
+    M = maps:new(),
+    #{ a := 1 } = M#{a => 1},
+
+    #{ b := 2 } = (maps:new())#{ b => 2 },
+
+    #{ a :=42, b:=42, c:=42 } = (maps:from_list([{a,1},{b,2},{c,3}]))#{ a := 42, b := 42, c := 42 },
+    #{ "a" :=1, "b":=42, "c":=42 } = (maps:from_list([{"a",1},{"b",2}]))#{ "b" := 42, "c" => 42 },
+    Ks = lists:seq($a,$z),
+    #{ "aa" := {$a,$a}, "ac":=41, "dc":=42 } =
+        (maps:from_list([{[K1,K2],{K1,K2}}|| K1 <- Ks, K2 <- Ks]))#{ "ac" := 41, "dc" => 42 },
+
+    %% Error cases.
+    do_badmap(fun(T) ->
+		      {'EXIT',{{badmap,T},_}} =
+			  (catch (T)#{a:=42,b=>2})
+	      end),
+    ok.
+
+t_update_assoc(Config) when is_list(Config) ->
+    M0 = #{1=>a,2=>b,3.0=>c,4=>d,5=>e},
+
+    M1 = M0#{1=>42,2=>100,4=>[a,b,c]},
+    #{1:=42,2:=100,3.0:=c,4:=[a,b,c],5:=e} = M1,
+    #{1:=42,2:=b,4:=d,5:=e,2.0:=100,3.0:=c,4.0:=[a,b,c]} = M0#{1.0=>float,1:=42,2.0=>wrong,2.0=>100,4.0=>[a,b,c]},
+
+    M2 = M0#{3.0=>new},
+    #{1:=a,2:=b,3.0:=new,4:=d,5:=e} = M2,
+    M2 = M0#{3.0:=wrong,3.0=>new},
+
+    %% Errors cases.
+    do_badmap(fun(T) ->
+		      {'EXIT',{{badmap,T},_}} =
+			  (catch T#{nonexisting=>val})
+	      end),
+    ok.
+
+
+t_update_assoc_large(Config) when is_list(Config) ->
+    M0 = #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+               11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+               12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+               13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+               14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+               15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+               16=>a6,26=>b6,36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+               17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+               18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+               19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19",
+
+               10.0=>fa0,20.0=>fb0,30.0=>"fc0",
+               11.0=>fa1,21.0=>fb1,31.0=>"fc1",
+               12.0=>fa2,22.0=>fb2,32.0=>"fc2",
+               13.0=>fa3,23.0=>fb3,33.0=>"fc3",
+               14.0=>fa4,24.0=>fb4,34.0=>"fc4",
+
+               15.0=>fa5,25.0=>fb5,35.0=>"fc5",
+               16.0=>fa6,26.0=>fb6,36.0=>"fc6",
+               17.0=>fa7,27.0=>fb7,37.0=>"fc7",
+               18.0=>fa8,28.0=>fb8,38.0=>"fc8",
+               19.0=>fa9,29.0=>fb9,39.0=>"fc9",
+
+               #{ one => small, map => key } => "small map key 1",
+               #{ second => small, map => key } => "small map key 2",
+               #{ third => small, map => key } => "small map key 3",
+
+               #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+                  11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+                  12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+                  13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+                  14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+                  15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+                  16=>a6,26=>b6,36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+                  17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+                  18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+                  19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19" } => "large map key 1",
+
+               #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+                  11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+                  12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+                  13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+                  14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+                  15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+                  k16=>a6,k26=>b6,k36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+                  17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+                  18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+                  19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19" } => "large map key 2" },
+
+
+    M1 = M0#{1=>42,2=>100,4=>[a,b,c]},
+    #{1:=42,2:=100,10.0:=fa0,4:=[a,b,c],25:=b5} = M1,
+    #{ 10:=43, 24:=b4, 15:=a5, 35:="c5", 2.0:=100, 13.0:=fa3, 4.0:=[a,b,c]} =
+        M0#{1.0=>float,10:=43,2.0=>wrong,2.0=>100,4.0=>[a,b,c]},
+
+    M2 = M0#{13.0=>new},
+    #{10:=a0,20:=b0,13.0:=new,"40":="d0",<<"50">>:="e0"} = M2,
+    M2 = M0#{13.0:=wrong,13.0=>new},
+
+    ok.
+
+t_update_exact(Config) when is_list(Config) ->
+    M0 = #{1=>a,2=>b,3.0=>c,4=>d,5=>e},
+
+    M1 = M0#{1:=42,2:=100,4:=[a,b,c]},
+    #{1:=42,2:=100,3.0:=c,4:=[a,b,c],5:=e} = M1,
+    M1 = M0#{1:=wrong,1=>42,2=>wrong,2:=100,4:=[a,b,c]},
+
+    M2 = M0#{3.0:=new},
+    #{1:=a,2:=b,3.0:=new,4:=d,5:=e} = M2,
+    M2 = M0#{3.0=>wrong,3.0:=new},
+    true = M2 =/= M0#{3=>right,3.0:=new},
+    #{ 3 := right, 3.0 := new } = M0#{3=>right,3.0:=new},
+
+    M3 = #{ 1 => val},
+    #{1 := update2,1.0 := new_val4} = M3#{
+	1.0 => new_val1, 1 := update, 1=> update3,
+	1 := update2, 1.0 := new_val2, 1.0 => new_val3,
+	1.0 => new_val4 },
+
+    %% Errors cases.
+    do_badmap(fun(T) ->
+		      {'EXIT',{{badmap,T},_}} =
+			  (catch T#{nonexisting=>val})
+	      end),
+    Empty = #{},
+    {'EXIT',{{badkey,nonexisting},_}} = (catch Empty#{nonexisting:=val}),
+    {'EXIT',{{badkey,nonexisting},_}} = (catch M0#{nonexisting:=val}),
+    {'EXIT',{{badkey,1.0},_}} = (catch M0#{1.0:=v,1.0=>v2}),
+    {'EXIT',{{badkey,42},_}} = (catch M0#{42.0:=v,42:=v2}),
+    {'EXIT',{{badkey,42.0},_}} = (catch M0#{42=>v1,42.0:=v2,42:=v3}),
+
+    ok.
+
+t_update_exact_large(Config) when is_list(Config) ->
+    M0 = #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+               11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+               12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+               13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+               14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+               15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+               16=>a6,26=>b6,36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+               17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+               18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+               19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19",
+
+               10.0=>fa0,20.0=>fb0,30.0=>"fc0",
+               11.0=>fa1,21.0=>fb1,31.0=>"fc1",
+               12.0=>fa2,22.0=>fb2,32.0=>"fc2",
+               13.0=>fa3,23.0=>fb3,33.0=>"fc3",
+               14.0=>fa4,24.0=>fb4,34.0=>"fc4",
+
+               15.0=>fa5,25.0=>fb5,35.0=>"fc5",
+               16.0=>fa6,26.0=>fb6,36.0=>"fc6",
+               17.0=>fa7,27.0=>fb7,37.0=>"fc7",
+               18.0=>fa8,28.0=>fb8,38.0=>"fc8",
+               19.0=>fa9,29.0=>fb9,39.0=>"fc9",
+
+               #{ one => small, map => key } => "small map key 1",
+               #{ second => small, map => key } => "small map key 2",
+               #{ third => small, map => key } => "small map key 3",
+
+               #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+                  11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+                  12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+                  13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+                  14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+                  15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+                  16=>a6,26=>b6,36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+                  17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+                  18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+                  19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19" } => "large map key 1",
+
+               #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+                  11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+                  12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+                  13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+                  14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+                  15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+                  k16=>a6,k26=>b6,k36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+                  17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+                  18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+                  19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19" } => "large map key 2" },
+
+
+    M1 = M0#{10:=42,<<"55">>:=100,10.0:=[a,b,c]},
+    #{ 10:=42,<<"55">>:=100,{["05"]}:="15",10.0:=[a,b,c],
+       #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+          11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+          12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+          13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+          14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+          15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+          16=>a6,26=>b6,36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+          17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+          18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+          19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19" } := "large map key 1" } = M1,
+
+    M1 = M0#{10:=wrong,10=>42,<<"55">>=>wrong,<<"55">>:=100,10.0:=[a,b,c]},
+
+    M2 = M0#{13.0:=new},
+    #{10:=a0,20:=b0,13.0:=new} = M2,
+    M2 = M0#{13.0=>wrong,13.0:=new},
+
+    %% Errors cases.
+    {'EXIT',{{badkey,nonexisting},_}} = (catch M0#{nonexisting:=val}),
+    {'EXIT',{{badkey,1.0},_}} = (catch M0#{1.0:=v,1.0=>v2}),
+    {'EXIT',{{badkey,42},_}} = (catch M0#{42.0:=v,42:=v2}),
+    {'EXIT',{{badkey,42.0},_}} = (catch M0#{42=>v1,42.0:=v2,42:=v3}),
+
+    ok.
+
+t_update_deep(Config) when is_list(Config) ->
+    N = 250000,
+    M0 = maps:from_list([{integer_to_list(I),a}||I<-lists:seq(1,N)]),
+    #{ "1" := a, "10" := a, "100" := a, "1000" := a, "10000" := a } = M0,
+
+    M1 = M0#{ "1" := b, "10" := b, "100" := b, "1000" := b, "10000" := b },
+    #{ "1" := a, "10" := a, "100" := a, "1000" := a, "10000" := a } = M0,
+    #{ "1" := b, "10" := b, "100" := b, "1000" := b, "10000" := b } = M1,
+
+    M2 = M0#{ "1" => c, "10" => c, "100" => c, "1000" => c, "10000" => c },
+    #{ "1" := a, "10" := a, "100" := a, "1000" := a, "10000" := a } = M0,
+    #{ "1" := b, "10" := b, "100" := b, "1000" := b, "10000" := b } = M1,
+    #{ "1" := c, "10" := c, "100" := c, "1000" := c, "10000" := c } = M2,
+
+    M3 = M2#{ "n1" => d, "n10" => d, "n100" => d, "n1000" => d, "n10000" => d },
+    #{  "1" := a,  "10" := a,  "100" := a,  "1000" := a,  "10000" := a } = M0,
+    #{  "1" := b,  "10" := b,  "100" := b,  "1000" := b,  "10000" := b } = M1,
+    #{  "1" := c,  "10" := c,  "100" := c,  "1000" := c,  "10000" := c } = M2,
+    #{  "1" := c,  "10" := c,  "100" := c,  "1000" := c,  "10000" := c } = M3,
+    #{ "n1" := d, "n10" := d, "n100" := d, "n1000" := d, "n10000" := d } = M3,
+    ok.
+
+t_guard_bifs(Config) when is_list(Config) ->
+    true   = map_guard_head(#{a=>1}),
+    false  = map_guard_head([]),
+    true   = map_guard_body(#{a=>1}),
+    false  = map_guard_body({}),
+    true   = map_guard_pattern(#{a=>1, <<"hi">> => "hi" }),
+    false  = map_guard_pattern("list"),
+    ok.
+
+map_guard_head(M) when is_map(M) -> true;
+map_guard_head(_) -> false.
+
+map_guard_body(M) -> is_map(M).
+
+map_guard_pattern(#{}) -> true;
+map_guard_pattern(_)   -> false.
+
+t_guard_sequence(Config) when is_list(Config) ->
+	{1, "a"} = map_guard_sequence_1(#{seq=>1,val=>"a"}),
+	{2, "b"} = map_guard_sequence_1(#{seq=>2,val=>"b"}),
+	{3, "c"} = map_guard_sequence_1(#{seq=>3,val=>"c"}),
+	{4, "d"} = map_guard_sequence_1(#{seq=>4,val=>"d"}),
+	{5, "e"} = map_guard_sequence_1(#{seq=>5,val=>"e"}),
+
+	{1,M1}       = map_guard_sequence_2(M1 = #{a=>3}),
+	{2,M2}       = map_guard_sequence_2(M2 = #{a=>4, b=>4}),
+	{3,gg,M3}    = map_guard_sequence_2(M3 = #{a=>gg, b=>4}),
+	{4,sc,sc,M4} = map_guard_sequence_2(M4 = #{a=>sc, b=>3, c=>sc2}),
+	{5,kk,kk,M5} = map_guard_sequence_2(M5 = #{a=>kk, b=>other, c=>sc2}),
+
+	%% error case
+	{'EXIT',{function_clause,_}} = (catch map_guard_sequence_1(#{seq=>6,val=>"e"})),
+	{'EXIT',{function_clause,_}} = (catch map_guard_sequence_2(#{b=>5})),
+	ok.
+
+t_guard_sequence_large(Config) when is_list(Config) ->
+    M0 = #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00",03]}=>"10",
+               11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01",03]}=>"11",
+               12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02",03]}=>"12",
+               13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03",03]}=>"13",
+               14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04",03]}=>"14",
+
+               15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05",03]}=>"15",
+               16=>a6,26=>b6,36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06",03]}=>"16",
+               17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07",03]}=>"17",
+               18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08",03]}=>"18",
+               19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09",03]}=>"19",
+
+               10.0=>fa0,20.0=>fb0,30.0=>"fc0",
+               11.0=>fa1,21.0=>fb1,31.0=>"fc1",
+               12.0=>fa2,22.0=>fb2,32.0=>"fc2",
+               13.0=>fa3,23.0=>fb3,33.0=>"fc3",
+               14.0=>fa4,24.0=>fb4,34.0=>"fc4",
+
+               15.0=>fa5,25.0=>fb5,35.0=>"fc5",
+               16.0=>fa6,26.0=>fb6,36.0=>"fc6",
+               17.0=>fa7,27.0=>fb7,37.0=>"fc7",
+               18.0=>fa8,28.0=>fb8,38.0=>"fc8",
+               19.0=>fa9,29.0=>fb9,39.0=>"fc9",
+
+               #{ one => small, map => key } => "small map key 1",
+               #{ second => small, map => key } => "small map key 2",
+               #{ third => small, map => key } => "small map key 3",
+
+               #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+                  11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+                  12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+                  13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+                  14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+                  15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+                  16=>a6,26=>b6,36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+                  17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+                  18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+                  19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19" } => "large map key 1",
+
+               #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+                  11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+                  12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+                  13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+                  14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+                  15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+                  k16=>a6,k26=>b6,k36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+                  17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+                  18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+                  19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19" } => "large map key 2" },
+
+	{1, "a"} = map_guard_sequence_1(M0#{seq=>1,val=>"a"}),
+	{2, "b"} = map_guard_sequence_1(M0#{seq=>2,val=>"b"}),
+	{3, "c"} = map_guard_sequence_1(M0#{seq=>3,val=>"c"}),
+	{4, "d"} = map_guard_sequence_1(M0#{seq=>4,val=>"d"}),
+	{5, "e"} = map_guard_sequence_1(M0#{seq=>5,val=>"e"}),
+
+	{1,M1}       = map_guard_sequence_2(M1 = M0#{a=>3}),
+	{2,M2}       = map_guard_sequence_2(M2 = M0#{a=>4, b=>4}),
+	{3,gg,M3}    = map_guard_sequence_2(M3 = M0#{a=>gg, b=>4}),
+	{4,sc,sc,M4} = map_guard_sequence_2(M4 = M0#{a=>sc, b=>3, c=>sc2}),
+	{5,kk,kk,M5} = map_guard_sequence_2(M5 = M0#{a=>kk, b=>other, c=>sc2}),
+
+	{'EXIT',{function_clause,_}} = (catch map_guard_sequence_1(M0#{seq=>6,val=>"e"})),
+	{'EXIT',{function_clause,_}} = (catch map_guard_sequence_2(M0#{b=>5})),
+        ok.
+
+
+map_guard_sequence_1(#{seq:=1=Seq, val:=Val}) -> {Seq,Val};
+map_guard_sequence_1(#{seq:=2=Seq, val:=Val}) -> {Seq,Val};
+map_guard_sequence_1(#{seq:=3=Seq, val:=Val}) -> {Seq,Val};
+map_guard_sequence_1(#{seq:=4=Seq, val:=Val}) -> {Seq,Val};
+map_guard_sequence_1(#{seq:=5=Seq, val:=Val}) -> {Seq,Val}.
+
+map_guard_sequence_2(#{ a:=3 }=M) -> {1, M};
+map_guard_sequence_2(#{ a:=4 }=M) -> {2, M};
+map_guard_sequence_2(#{ a:=X, a:=X, b:=4 }=M) -> {3,X,M};
+map_guard_sequence_2(#{ a:=X, a:=Y, b:=3 }=M) when X =:= Y -> {4,X,Y,M};
+map_guard_sequence_2(#{ a:=X, a:=Y }=M) when X =:= Y -> {5,X,Y,M}.
+
+
+t_guard_update(Config) when is_list(Config) ->
+    error  = map_guard_update(#{},#{}),
+    first  = map_guard_update(#{}, #{x=>first}),
+    second = map_guard_update(#{y=>old}, #{x=>second,y=>old}),
+    ok.
+
+t_guard_update_large(Config) when is_list(Config) ->
+    M0 = #{ 70=>a0,80=>b0,90=>"c0","40"=>"d0",<<"50">>=>"e0",{["00",03]}=>"10",
+               71=>a1,81=>b1,91=>"c1","41"=>"d1",<<"51">>=>"e1",{["01",03]}=>"11",
+               72=>a2,82=>b2,92=>"c2","42"=>"d2",<<"52">>=>"e2",{["02",03]}=>"12",
+               73=>a3,83=>b3,93=>"c3","43"=>"d3",<<"53">>=>"e3",{["03",03]}=>"13",
+               74=>a4,84=>b4,94=>"c4","44"=>"d4",<<"54">>=>"e4",{["04",03]}=>"14",
+
+               75=>a5,85=>b5,95=>"c5","45"=>"d5",<<"55">>=>"e5",{["05",03]}=>"15",
+               76=>a6,86=>b6,96=>"c6","46"=>"d6",<<"56">>=>"e6",{["06",03]}=>"16",
+               77=>a7,87=>b7,97=>"c7","47"=>"d7",<<"57">>=>"e7",{["07",03]}=>"17",
+               78=>a8,88=>b8,98=>"c8","48"=>"d8",<<"58">>=>"e8",{["08",03]}=>"18",
+               79=>a9,89=>b9,99=>"c9","49"=>"d9",<<"59">>=>"e9",{["09",03]}=>"19",
+
+               70.0=>fa0,80.0=>fb0,90.0=>"fc0",
+               71.0=>fa1,81.0=>fb1,91.0=>"fc1",
+               72.0=>fa2,82.0=>fb2,92.0=>"fc2",
+               73.0=>fa3,83.0=>fb3,93.0=>"fc3",
+               74.0=>fa4,84.0=>fb4,94.0=>"fc4",
+
+               75.0=>fa5,85.0=>fb5,95.0=>"fc5",
+               76.0=>fa6,86.0=>fb6,96.0=>"fc6",
+               77.0=>fa7,87.0=>fb7,97.0=>"fc7",
+               78.0=>fa8,88.0=>fb8,98.0=>"fc8",
+               79.0=>fa9,89.0=>fb9,99.0=>"fc9",
+
+               #{ one => small, map => key } => "small map key 1",
+               #{ second => small, map => key } => "small map key 2",
+               #{ third => small, map => key } => "small map key 3",
+
+               #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+                  11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+                  12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+                  13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+                  14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+                  15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+                  16=>a6,26=>b6,36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+                  17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+                  18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+                  19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19" } => "large map key 1",
+
+               #{ 10=>a0,20=>b0,30=>"c0","40"=>"d0",<<"50">>=>"e0",{["00"]}=>"10",
+                  11=>a1,21=>b1,31=>"c1","41"=>"d1",<<"51">>=>"e1",{["01"]}=>"11",
+                  12=>a2,22=>b2,32=>"c2","42"=>"d2",<<"52">>=>"e2",{["02"]}=>"12",
+                  13=>a3,23=>b3,33=>"c3","43"=>"d3",<<"53">>=>"e3",{["03"]}=>"13",
+                  14=>a4,24=>b4,34=>"c4","44"=>"d4",<<"54">>=>"e4",{["04"]}=>"14",
+
+                  15=>a5,25=>b5,35=>"c5","45"=>"d5",<<"55">>=>"e5",{["05"]}=>"15",
+                  k16=>a6,k26=>b6,k36=>"c6","46"=>"d6",<<"56">>=>"e6",{["06"]}=>"16",
+                  17=>a7,27=>b7,37=>"c7","47"=>"d7",<<"57">>=>"e7",{["07"]}=>"17",
+                  18=>a8,28=>b8,38=>"c8","48"=>"d8",<<"58">>=>"e8",{["08"]}=>"18",
+                  19=>a9,29=>b9,39=>"c9","49"=>"d9",<<"59">>=>"e9",{["09"]}=>"19" } => "large map key 2" },
+
+
+    error  = map_guard_update(M0#{},M0#{}),
+    first  = map_guard_update(M0#{},M0#{x=>first}),
+    second = map_guard_update(M0#{y=>old}, M0#{x=>second,y=>old}),
+    ok.
+
+
+map_guard_update(M1, M2) when M1#{x=>first}  =:= M2 -> first;
+map_guard_update(M1, M2) when M1#{x=>second} =:= M2 -> second;
+map_guard_update(_, _) -> error.
+
+t_guard_receive(Config) when is_list(Config) ->
+    M0  = #{ id => 0 },
+    Pid = spawn_link(fun() -> guard_receive_loop() end),
+    Big = 36893488147419103229,
+    B1  = <<"some text">>,
+    B2  = <<"was appended">>,
+    B3  = <<B1/binary, B2/binary>>,
+
+    #{id:=1, res:=Big} = M1 = call(Pid, M0#{op=>sub,in=>{1 bsl 65, 3}}),
+    #{id:=2, res:=26}  = M2 = call(Pid, M1#{op=>idiv,in=>{53,2}}),
+    #{id:=3, res:=832} = M3 = call(Pid, M2#{op=>imul,in=>{26,32}}),
+    #{id:=4, res:=4}   = M4 = call(Pid, M3#{op=>add,in=>{1,3}}),
+    #{id:=5, res:=Big} = M5 = call(Pid, M4#{op=>sub,in=>{1 bsl 65, 3}}),
+    #{id:=6, res:=B3}  = M6 = call(Pid, M5#{op=>"append",in=>{B1,B2}}),
+    #{id:=7, res:=4}   = _  = call(Pid, M6#{op=>add,in=>{1,3}}),
+
+
+    %% update old maps and check id update
+    #{id:=2, res:=B3} = call(Pid, M1#{op=>"append",in=>{B1,B2}}),
+    #{id:=5, res:=99} = call(Pid, M4#{op=>add,in=>{33, 66}}),
+
+    %% cleanup
+    done = call(Pid, done),
+    ok.
+
+-define(t_guard_receive_large_procs, 1500).
+
+t_guard_receive_large(Config) when is_list(Config) ->
+    M = lists:foldl(fun(_,#{procs := Ps } = M) ->
+                            M#{ procs := Ps#{ spawn_link(fun() -> grecv_loop() end) => 0 }}
+                    end, #{procs => #{}, done => 0}, lists:seq(1,?t_guard_receive_large_procs)),
+    lists:foreach(fun(Pid) ->
+                          Pid ! {self(), hello}
+                  end, maps:keys(maps:get(procs,M))),
+    ok = guard_receive_large_loop(M),
+    ok.
+
+guard_receive_large_loop(#{done := ?t_guard_receive_large_procs}) ->
+    ok;
+guard_receive_large_loop(M) ->
+    receive
+        #{pid := Pid, msg := hello} ->
+            case M of
+                #{done := Count, procs := #{Pid := 150}} ->
+                    Pid ! {self(), done},
+                    guard_receive_large_loop(M#{done := Count + 1});
+                #{procs := #{Pid := Count} = Ps} ->
+                    Pid ! {self(), hello},
+                    guard_receive_large_loop(M#{procs := Ps#{Pid := Count + 1}})
+            end
+    end.
+
+grecv_loop() ->
+    receive
+        {_, done} ->
+            ok;
+        {Pid, hello} ->
+            Pid ! #{pid=>self(), msg=>hello},
+            grecv_loop()
+    end.
+
+call(Pid, M) ->
+    Pid ! {self(), M}, receive {Pid, Res} -> Res end.
+
+guard_receive_loop() ->
+    receive
+	{Pid, #{ id:=Id, op:="append", in:={X,Y}}=M} when is_binary(X), is_binary(Y) ->
+	    Pid ! {self(), M#{ id=>Id+1, res=><<X/binary,Y/binary>>}},
+	    guard_receive_loop();
+	{Pid, #{ id:=Id, op:=add, in:={X,Y}}} ->
+	    Pid ! {self(), #{ id=>Id+1, res=>X+Y}},
+	    guard_receive_loop();
+	{Pid, #{ id:=Id, op:=sub,  in:={X,Y}}=M} ->
+	    Pid ! {self(), M#{ id=>Id+1, res=>X-Y}},
+	    guard_receive_loop();
+	{Pid, #{ id:=Id, op:=idiv, in:={X,Y}}=M} ->
+	    Pid ! {self(), M#{ id=>Id+1, res=>X div Y}},
+	    guard_receive_loop();
+	{Pid, #{ id:=Id, op:=imul, in:={X,Y}}=M} ->
+	    Pid ! {self(), M#{ id=>Id+1, res=>X * Y}},
+	    guard_receive_loop();
+	{Pid, done} ->
+	    Pid ! {self(), done};
+	{Pid, Other} ->
+	    Pid ! {error, Other},
+	    guard_receive_loop()
+    end.
+
+
+t_list_comprehension(Config) when is_list(Config) ->
+    [#{k:=1},#{k:=2},#{k:=3}] = [#{k=>I} || I <- [1,2,3]],
+
+    Ks = lists:seq($a,$z),
+    Ms = [#{[K1,K2]=>{K1,K2}} || K1 <- Ks, K2 <- Ks],
+    [#{"aa" := {$a,$a}},#{"ab":={$a,$b}}|_] = Ms,
+    [#{"zz" := {$z,$z}},#{"zy":={$z,$y}}|_] = lists:reverse(Ms),
+    ok.
+
+t_guard_fun(Config) when is_list(Config) ->
+    F1 = fun
+	    (#{s:=v,v:=V})     -> {v,V};
+	    (#{s:=t,v:={V,V}}) -> {t,V};
+	    (#{s:=l,v:=[V,V]}) -> {l,V}
+    end,
+    
+    F2 = fun
+	    (#{s:=T,v:={V,V}}) -> {T,V};
+	    (#{s:=T,v:=[V,V]}) -> {T,V};
+	    (#{s:=T,v:=V})     -> {T,V}
+    end,
+    V = <<"hi">>,
+
+    {v,V} = F1(#{s=>v,v=>V}),
+    {t,V} = F1(#{s=>t,v=>{V,V}}),
+    {l,V} = F1(#{s=>l,v=>[V,V]}),
+
+    {v,V} = F2(#{s=>v,v=>V}),
+    {t,V} = F2(#{s=>t,v=>{V,V}}),
+    {l,V} = F2(#{s=>l,v=>[V,V]}),
+
+    %% error case
+    {'EXIT', {function_clause,[{?MODULE,_,[#{s:=none,v:=none}],_}|_]}} = (catch F1(#{s=>none,v=>none})),
+    ok.
+
+
+t_map_sort_literals(Config) when is_list(Config) ->
+    % test relation
+
+    %% size order
+    true  = #{ a => 1, b => 2} < #{ a => 1, b => 1, c => 1},
+    true  = #{ b => 1, a => 1} < #{ c => 1, a => 1, b => 1},
+    false = #{ c => 1, b => 1, a => 1} < #{ c => 1, a => 1},
+
+    %% key order
+    true  = #{ a => 1 } < #{ b => 1},
+    false = #{ b => 1 } < #{ a => 1},
+    true  = #{ a => 1, b => 1, c => 1 } < #{ b => 1, c => 1, d => 1},
+    true  = #{ b => 1, c => 1, d => 1 } > #{ a => 1, b => 1, c => 1},
+    true  = #{ c => 1, b => 1, a => 1 } < #{ b => 1, c => 1, d => 1},
+    true  = #{ "a" => 1 } < #{ <<"a">> => 1},
+    false = #{ <<"a">> => 1 } < #{ "a" => 1},
+    true  = #{ 1 => 1 } < #{ 1.0 => 1},
+    false = #{ 1.0 => 1 } < #{ 1 => 1},
+
+    %% value order
+    true  = #{ a => 1 } < #{ a => 2},
+    false = #{ a => 2 } < #{ a => 1},
+    false = #{ a => 2, b => 1 } < #{ a => 1, b => 3},
+    true  = #{ a => 1, b => 1 } < #{ a => 1, b => 3},
+    false = #{ a => 1 } < #{ a => 1.0},
+    false = #{ a => 1.0 } < #{ a => 1},
+
+    true  = #{ "a" => "hi", b => 134 } == #{ b => 134,"a" => "hi"},
+
+    %% large maps
+
+    M = maps:from_list([{I,I}||I <- lists:seq(1,500)]),
+
+    %% size order
+    true  = M#{ a => 1, b => 2} < M#{ a => 1, b => 1, c => 1},
+    true  = M#{ b => 1, a => 1} < M#{ c => 1, a => 1, b => 1},
+    false = M#{ c => 1, b => 1, a => 1} < M#{ c => 1, a => 1},
+
+    %% key order
+    true  = M#{ a => 1 } < M#{ b => 1},
+    false = M#{ b => 1 } < M#{ a => 1},
+    true  = M#{ a => 1, b => 1, c => 1 } < M#{ b => 1, c => 1, d => 1},
+    true  = M#{ b => 1, c => 1, d => 1 } > M#{ a => 1, b => 1, c => 1},
+    true  = M#{ c => 1, b => 1, a => 1 } < M#{ b => 1, c => 1, d => 1},
+    true  = M#{ "a" => 1 } < M#{ <<"a">> => 1},
+    false = M#{ <<"a">> => 1 } < #{ "a" => 1},
+    true  = M#{ 1 => 1 } < maps:remove(1,M#{ 1.0 => 1}),
+    false = M#{ 1.0 => 1 } < M#{ 1 => 1},
+
+    %% value order
+    true  = M#{ a => 1 } < M#{ a => 2},
+    false = M#{ a => 2 } < M#{ a => 1},
+    false = M#{ a => 2, b => 1 } < M#{ a => 1, b => 3},
+    true  = M#{ a => 1, b => 1 } < M#{ a => 1, b => 3},
+    false = M#{ a => 1 } < M#{ a => 1.0},
+    false = M#{ a => 1.0 } < M#{ a => 1},
+
+    true  = M#{ "a" => "hi", b => 134 } == M#{ b => 134,"a" => "hi"},
+
+    %% lists:sort
+
+    SortVs = [#{"a"=>1},#{a=>2},#{1=>3},#{<<"a">>=>4}],
+    [#{1:=ok},#{a:=ok},#{"a":=ok},#{<<"a">>:=ok}] = lists:sort([#{"a"=>ok},#{a=>ok},#{1=>ok},#{<<"a">>=>ok}]),
+    [#{1:=3},#{a:=2},#{"a":=1},#{<<"a">>:=4}] = lists:sort(SortVs),
+    [#{1:=3},#{a:=2},#{"a":=1},#{<<"a">>:=4}] = lists:sort(lists:reverse(SortVs)),
+    ok.
+
+t_map_equal(Config) when is_list(Config) ->
+    true  = #{} =:= #{},
+    false = #{} =:= #{a=>1},
+    false = #{a=>1} =:= #{},
+    true  = #{ "a" => "hi", b => 134 } =:= #{ b => 134,"a" => "hi"},
+
+    false = #{ a => 1 } =:= #{ a => 2},
+    false = #{ a => 2 } =:= #{ a => 1},
+    false = #{ a => 2, b => 1 } =:= #{ a => 1, b => 3},
+    false = #{ a => 1, b => 1 } =:= #{ a => 1, b => 3},
+
+    true = #{ a => 1 } =:= #{ a => 1},
+    true = #{ "a" => 2 } =:= #{ "a" => 2},
+    true = #{ "a" => 2, b => 3 } =:= #{ "a" => 2, b => 3},
+    true = #{ a => 1, b => 3, c => <<"wat">> } =:= #{ a => 1, b => 3, c=><<"wat">>},
+    ok.
+
+
+t_map_compare(Config) when is_list(Config) ->
+    Seed = {erlang:monotonic_time(),
+	    erlang:time_offset(),
+	    erlang:unique_integer()},
+    io:format("seed = ~p\n", [Seed]),
+    random:seed(Seed),
+    repeat(100, fun(_) -> float_int_compare() end, []),
+    repeat(100, fun(_) -> recursive_compare() end, []),
+    ok.
+
+float_int_compare() ->
+    Terms = numeric_keys(3),
+    %%io:format("Keys to use: ~p\n", [Terms]),
+    Pairs = lists:map(fun(K) -> list_to_tuple([{K,V} || V <- Terms]) end, Terms),
+    lists:foreach(fun(Size) ->
+			  MapGen = fun() -> map_gen(list_to_tuple(Pairs), Size) end,
+			  repeat(100, fun do_compare/1, [MapGen, MapGen])
+		  end,
+		  lists:seq(1,length(Terms))),
+    ok.
+
+numeric_keys(N) ->
+    lists:foldl(fun(_,Acc) ->
+			Int = random:uniform(N*4) - N*2,
+			Float = float(Int),
+			[Int, Float, Float * 0.99, Float * 1.01 | Acc]
+		end,
+		[],
+		lists:seq(1,N)).
+
+
+repeat(0, _, _) ->
+    ok;
+repeat(N, Fun, Arg) ->
+    Fun(Arg),
+    repeat(N-1, Fun, Arg).
+
+copy_term(T) ->
+    Papa = self(),
+    P = spawn_link(fun() -> receive Msg -> Papa ! Msg end end),
+    P ! T,
+    receive R -> R end.
+
+do_compare([Gen1, Gen2]) ->
+    M1 = Gen1(),
+    M2 = Gen2(),
+    %%io:format("Maps to compare: ~p AND ~p\n", [M1, M2]),
+    C = (M1 < M2),
+    Erlang = maps_lessthan(M1, M2),
+    C = Erlang,
+    ?CHECK(M1==M1, M1),
+
+    %% Change one key from int to float (or vice versa) and check compare
+    ML1 = maps:to_list(M1),
+    {K1,V1} = lists:nth(random:uniform(length(ML1)), ML1),
+    case K1 of
+	I when is_integer(I) ->
+	    case maps:find(float(I),M1) of
+		error ->
+		    M1f = maps:remove(I, maps:put(float(I), V1, M1)),
+		    ?CHECK(M1f > M1, [M1f, M1]);
+		_ -> ok
+	    end;
+
+	F when is_float(F), round(F) == F ->
+	    case maps:find(round(F),M1) of
+		error ->
+		    M1i = maps:remove(F, maps:put(round(F), V1, M1)),
+		    ?CHECK(M1i < M1, [M1i, M1]);
+		_ -> ok
+	    end;
+
+	_ -> ok   % skip floats with decimals
+    end,
+
+    ?CHECK(M2 == M2, [M2]).
+
+
+maps_lessthan(M1, M2) ->
+  case {maps:size(M1),maps:size(M2)} of
+      {_S,_S} ->
+	  {K1,V1} = lists:unzip(term_sort(maps:to_list(M1))),
+	  {K2,V2} = lists:unzip(term_sort(maps:to_list(M2))),
+
+	  case erts_internal:cmp_term(K1,K2) of
+	      -1 -> true;
+	      0 -> (V1 < V2);
+	      1 -> false
+	  end;
+
+      {S1, S2} ->
+	  S1 < S2
+  end.
+
+term_sort(L) ->
+    lists:sort(fun(A,B) -> erts_internal:cmp_term(A,B) =< 0 end,
+	       L).
+
+
+cmp(T1, T2, Exact) when is_tuple(T1) and is_tuple(T2) ->
+    case {size(T1),size(T2)} of
+	{_S,_S} -> cmp(tuple_to_list(T1), tuple_to_list(T2), Exact);
+	{S1,S2} when S1 < S2 -> -1;
+	{S1,S2} when S1 > S2 -> 1
+    end;
+
+cmp([H1|T1], [H2|T2], Exact) ->
+    case cmp(H1,H2, Exact) of
+	0 -> cmp(T1,T2, Exact);
+	C -> C
+    end;
+
+cmp(M1, M2, Exact) when is_map(M1) andalso is_map(M2) ->
+    cmp_maps(M1,M2,Exact);
+cmp(M1, M2, Exact) ->
+    cmp_others(M1, M2, Exact).
+
+cmp_maps(M1, M2, Exact) ->
+    case {maps:size(M1),maps:size(M2)} of
+	{_S,_S} ->
+	    {K1,V1} = lists:unzip(term_sort(maps:to_list(M1))),
+	    {K2,V2} = lists:unzip(term_sort(maps:to_list(M2))),
+
+	    case cmp(K1, K2, true) of
+		0 -> cmp(V1, V2, Exact);
+		C -> C
+	    end;
+
+	{S1,S2} when S1 < S2 -> -1;
+	{S1,S2} when S1 > S2 -> 1
+    end.
+
+cmp_others(I, F, true) when is_integer(I), is_float(F) ->
+    -1;
+cmp_others(F, I, true) when is_float(F), is_integer(I) ->
+    1;
+cmp_others(T1, T2, _) ->
+    case {T1<T2, T1==T2} of
+	{true,false} -> -1;
+	{false,true} -> 0;
+	{false,false} -> 1
+    end.
+
+map_gen(Pairs, Size) ->
+    {_,L} = lists:foldl(fun(_, {Keys, Acc}) ->
+				KI = random:uniform(size(Keys)),
+				K = element(KI,Keys),
+				KV = element(random:uniform(size(K)), K),
+				{erlang:delete_element(KI,Keys), [KV | Acc]}
+			end,
+			{Pairs, []},
+			lists:seq(1,Size)),
+
+    maps:from_list(L).
+
+
+recursive_compare() ->
+    Leafs = {atom, 17, 16.9, 17.1, [], self(), spawn(fun() -> ok end), make_ref(), make_ref()},
+    {A, B} = term_gen_recursive(Leafs, 0, 0),
+    %%io:format("Recursive term A = ~p\n", [A]),
+    %%io:format("Recursive term B = ~p\n", [B]),
+
+    ?CHECK({true,false} =:=  case do_cmp(A, B, false) of
+				 -1 -> {A<B, A>=B};
+				 0 -> {A==B, A/=B};
+				 1 -> {A>B, A=<B}
+			     end,
+	   {A,B}),
+    A2 = copy_term(A),
+    ?CHECK(A == A2, {A,A2}),
+    ?CHECK(0 =:= cmp(A, A2, false), {A,A2}),
+
+    B2 = copy_term(B),
+    ?CHECK(B == B2, {B,B2}),
+    ?CHECK(0 =:= cmp(B, B2, false), {B,B2}),
+    ok.
+
+do_cmp(A, B, Exact) ->
+    C = cmp(A, B, Exact),
+    C.
+
+%% Generate two terms {A,B} that may only differ
+%% at float vs integer types.
+term_gen_recursive(Leafs, Flags, Depth) ->
+    MaxDepth = 10,
+    Rnd = case {Flags, Depth} of
+	      {_, MaxDepth} -> % Only leafs
+		  random:uniform(size(Leafs)) + 3;
+	      {0, 0} ->        % Only containers
+		  random:uniform(3);
+	      {0,_} ->         % Anything
+		  random:uniform(size(Leafs)+3)
+	  end,
+    case Rnd of
+	1 -> % Make map
+	    Size = random:uniform(size(Leafs)),
+	    lists:foldl(fun(_, {Acc1,Acc2}) ->
+				{K1,K2} = term_gen_recursive(Leafs, Flags,
+							     Depth+1),
+				{V1,V2} = term_gen_recursive(Leafs, Flags, Depth+1),
+				{maps:put(K1,V1, Acc1), maps:put(K2,V2, Acc2)}
+			end,
+			{maps:new(), maps:new()},
+			lists:seq(1,Size));
+	2 -> % Make cons
+	    {Car1,Car2} = term_gen_recursive(Leafs, Flags, Depth+1),
+	    {Cdr1,Cdr2} = term_gen_recursive(Leafs, Flags, Depth+1),
+	    {[Car1 | Cdr1], [Car2 | Cdr2]};
+	3 -> % Make tuple
+	    Size = random:uniform(size(Leafs)),
+	    L = lists:map(fun(_) -> term_gen_recursive(Leafs, Flags, Depth+1) end,
+			  lists:seq(1,Size)),
+	    {L1, L2} = lists:unzip(L),
+	    {list_to_tuple(L1), list_to_tuple(L2)};
+
+	N -> % Make leaf
+	    case element(N-3, Leafs) of
+		I when is_integer(I) ->
+		    case random:uniform(4) of
+			1 -> {I, float(I)};
+			2 -> {float(I), I};
+			_ -> {I,I}
+		    end;
+		T -> {T,T}
+	    end
+    end.
+
+%% BIFs
+t_bif_map_get(Config) when is_list(Config) ->
+    %% small map
+    1    = maps:get(a, #{ a=> 1}),
+    2    = maps:get(b, #{ a=> 1, b => 2}),
+    "hi" = maps:get("hello", #{ a=>1, "hello" => "hi"}),
+    "tuple hi" = maps:get({1,1.0}, #{ a=>a, {1,1.0} => "tuple hi"}),
+
+    M0    = #{ k1=>"v1", <<"k2">> => <<"v3">> },
+    "v4" = maps:get(<<"k2">>, M0#{<<"k2">> => "v4"}),
+
+    %% large map
+    M1   = maps:from_list([{I,I}||I<-lists:seq(1,100)] ++
+			  [{a,1},{b,2},{"hello","hi"},{{1,1.0},"tuple hi"},
+			   {k1,"v1"},{<<"k2">>,"v3"}]),
+    1    = maps:get(a, M1),
+    2    = maps:get(b, M1),
+    "hi" = maps:get("hello", M1),
+    "tuple hi" = maps:get({1,1.0}, M1),
+    "v3" = maps:get(<<"k2">>, M1),
+
+    %% error cases
+    do_badmap(fun(T) ->
+		      {'EXIT',{{badmap,T},[{maps,get,_,_}|_]}} =
+			  (catch maps:get(a, T))
+	      end),
+
+    {'EXIT',{{badkey,{1,1}},[{maps,get,_,_}|_]}} =
+	(catch maps:get({1,1}, #{{1,1.0} => "tuple"})),
+    {'EXIT',{{badkey,a},[{maps,get,_,_}|_]}} = (catch maps:get(a, #{})),
+    {'EXIT',{{badkey,a},[{maps,get,_,_}|_]}} =
+	(catch maps:get(a, #{b=>1, c=>2})),
+    ok.
+
+t_bif_map_find(Config) when is_list(Config) ->
+    %% small map
+    {ok, 1}     = maps:find(a, #{ a=> 1}),
+    {ok, 2}     = maps:find(b, #{ a=> 1, b => 2}),
+    {ok, "int"} = maps:find(1, #{ 1   => "int"}),
+    {ok, "float"} = maps:find(1.0, #{ 1.0=> "float"}),
+
+    {ok, "hi"} = maps:find("hello", #{ a=>1, "hello" => "hi"}),
+    {ok, "tuple hi"} = maps:find({1,1.0}, #{ a=>a, {1,1.0} => "tuple hi"}),
+
+    M0 = #{ k1=>"v1", <<"k2">> => <<"v3">> },
+    {ok, "v4"} = maps:find(<<"k2">>, M0#{ <<"k2">> => "v4" }),
+
+    %% large map
+    M1   = maps:from_list([{I,I}||I<-lists:seq(1,100)] ++
+			  [{a,1},{b,2},{"hello","hi"},{{1,1.0},"tuple hi"},
+			   {k1,"v1"},{<<"k2">>,"v3"}]),
+    {ok, 1}    = maps:find(a, M1),
+    {ok, 2}    = maps:find(b, M1),
+    {ok, "hi"} = maps:find("hello", M1),
+    {ok, "tuple hi"} = maps:find({1,1.0}, M1),
+    {ok, "v3"} = maps:find(<<"k2">>, M1),
+
+    %% error case
+    error = maps:find(a,#{}),
+    error = maps:find(a,#{b=>1, c=>2}),
+    error = maps:find(1.0, #{ 1 => "int"}),
+    error = maps:find(1, #{ 1.0  => "float"}),
+    error = maps:find({1.0,1}, #{ a=>a, {1,1.0} => "tuple hi"}), % reverse types in tuple key
+
+    do_badmap(fun(T) ->
+		      {'EXIT',{{badmap,T},[{maps,find,_,_}|_]}} =
+			  (catch maps:find(a, T))
+	      end),
+    ok.
+
+
+t_bif_map_is_key(Config) when is_list(Config) ->
+    M1 = #{ "hi" => "hello", int => 3, <<"key">> => <<"value">>, 4 => number},
+
+    true  = maps:is_key("hi", M1),
+    true  = maps:is_key(int, M1),
+    true  = maps:is_key(<<"key">>, M1),
+    true  = maps:is_key(4, M1),
+
+    false = maps:is_key(5, M1),
+    false = maps:is_key(<<"key2">>, M1),
+    false = maps:is_key("h", M1),
+    false = maps:is_key("hello", M1),
+    false = maps:is_key(atom, M1),
+    false = maps:is_key(any, #{}),
+
+    false = maps:is_key("hi", maps:remove("hi", M1)),
+    true  = maps:is_key("hi", M1),
+    true  = maps:is_key(1, maps:put(1, "number", M1)),
+    false = maps:is_key(1.0, maps:put(1, "number", M1)),
+
+    %% error case
+    do_badmap(fun(T) ->
+		      {'EXIT',{{badmap,T},[{maps,is_key,_,_}|_]}} =
+			  (catch maps:is_key(a, T))
+	      end),
+    ok.
+
+t_bif_map_keys(Config) when is_list(Config) ->
+    [] = maps:keys(#{}),
+
+    [1,2,3,4,5] = lists:sort(maps:keys(#{ 1 => a, 2 => b, 3 => c, 4 => d, 5 => e})),
+    [1,2,3,4,5] = lists:sort(maps:keys(#{ 4 => d, 5 => e, 1 => a, 2 => b, 3 => c})),
+
+    % values in key order: [4,int,"hi",<<"key">>]
+    M1 = #{ "hi" => "hello", int => 3, <<"key">> => <<"value">>, 4 => number},
+    [4,int,"hi",<<"key">>] = lists:sort(maps:keys(M1)),
+
+    %% error case
+    do_badmap(fun(T) ->
+		      {'EXIT',{{badmap,T},[{maps,keys,_,_}|_]}} =
+			  (catch maps:keys(T))
+	      end),
+    ok.
+
+t_bif_map_new(Config) when is_list(Config) ->
+    #{} = maps:new(),
+    0   = erlang:map_size(maps:new()),
+    ok.
+
+t_bif_map_merge(Config) when is_list(Config) ->
+    0   = erlang:map_size(maps:merge(#{},#{})),
+
+    M0 = #{ "hi" => "hello", int => 3, <<"key">> => <<"value">>,
+	4 => number, 18446744073709551629 => wat},
+
+    #{ "hi" := "hello", int := 3, <<"key">> := <<"value">>,
+	4 := number, 18446744073709551629 := wat} = maps:merge(#{}, M0),
+
+    #{ "hi" := "hello", int := 3, <<"key">> := <<"value">>,
+	4 := number, 18446744073709551629 := wat} = maps:merge(M0, #{}),
+
+    M1 = #{ "hi" => "hello again", float => 3.3, {1,2} => "tuple", 4 => integer },
+
+    #{4 := number, 18446744073709551629 := wat, float := 3.3, int := 3,
+	{1,2} := "tuple", "hi" := "hello", <<"key">> := <<"value">>} = maps:merge(M1,M0),
+
+    #{4 := integer, 18446744073709551629 := wat, float := 3.3, int := 3,
+	{1,2} := "tuple", "hi" := "hello again", <<"key">> := <<"value">>} = maps:merge(M0,M1),
+
+    %% try deep collisions
+    N  = 150000,
+    Is = lists:seq(1,N),
+    M2 = maps:from_list([{I,I}||I<-Is]),
+    150000 = maps:size(M2),
+    M3 = maps:from_list([{<<I:32>>,I}||I<-Is]),
+    150000 = maps:size(M3),
+    M4 = maps:merge(M2,M3),
+    300000 = maps:size(M4),
+    M5 = maps:from_list([{integer_to_list(I),I}||I<-Is]),
+    150000 = maps:size(M5),
+    M6 = maps:merge(M4,M5),
+    450000 = maps:size(M6),
+    M7 = maps:from_list([{float(I),I}||I<-Is]),
+    150000 = maps:size(M7),
+    M8 = maps:merge(M7,M6),
+    600000 = maps:size(M8),
+
+    #{      1 := 1,           "1" := 1,           <<1:32>> := 1      } = M8,
+    #{     10 := 10,         "10" := 10,         <<10:32>> := 10     } = M8,
+    #{    100 := 100,       "100" := 100,       <<100:32>> := 100    } = M8,
+    #{   1000 := 1000,     "1000" := 1000,     <<1000:32>> := 1000   } = M8,
+    #{  10000 := 10000,   "10000" := 10000,   <<10000:32>> := 10000  } = M8,
+    #{ 100000 := 100000, "100000" := 100000, <<100000:32>> := 100000 } = M8,
+
+    %% overlapping
+    M8 = maps:merge(M2,M8),
+    M8 = maps:merge(M3,M8),
+    M8 = maps:merge(M4,M8),
+    M8 = maps:merge(M5,M8),
+    M8 = maps:merge(M6,M8),
+    M8 = maps:merge(M7,M8),
+    M8 = maps:merge(M8,M8),
+
+    %% maps:merge/2 and mixed
+
+    Ks1 = [764492191,2361333849], %% deep collision
+    Ks2 = lists:seq(1,33),
+    M9  = maps:from_list([{K,K}||K <- Ks1]),
+    M10 = maps:from_list([{K,K}||K <- Ks2]),
+    M11 = maps:merge(M9,M10),
+    ok = check_keys_exist(Ks1 ++ Ks2, M11),
+
+    %% error case
+    do_badmap(fun(T) ->
+		      {'EXIT',{{badmap,T},[{maps,merge,_,_}|_]}} =
+			  (catch maps:merge(#{}, T)),
+		      {'EXIT',{{badmap,T},[{maps,merge,_,_}|_]}} =
+			  (catch maps:merge(T, #{})),
+		      {'EXIT',{{badmap,T},[{maps,merge,_,_}|_]}} =
+			  (catch maps:merge(T, T))
+	      end),
+    ok.
+
+
+t_bif_map_put(Config) when is_list(Config) ->
+    M0 = #{ "hi" => "hello", int => 3, <<"key">> => <<"value">>,
+	4 => number, 18446744073709551629 => wat},
+
+    M1 = #{ "hi" := "hello"} = maps:put("hi", "hello", #{}),
+
+    true = is_members(["hi"],maps:keys(M1)),
+    true = is_members(["hello"],maps:values(M1)),
+
+    M2 = #{ int := 3 } = maps:put(int, 3, M1),
+
+    true = is_members([int,"hi"],maps:keys(M2)),
+    true = is_members([3,"hello"],maps:values(M2)),
+
+    M3 = #{ <<"key">> := <<"value">> } = maps:put(<<"key">>, <<"value">>, M2),
+
+    true = is_members([int,"hi",<<"key">>],maps:keys(M3)),
+    true = is_members([3,"hello",<<"value">>],maps:values(M3)),
+
+    M4 = #{ 18446744073709551629 := wat } = maps:put(18446744073709551629, wat, M3),
+
+    true = is_members([18446744073709551629,int,"hi",<<"key">>],maps:keys(M4)),
+    true = is_members([wat,3,"hello",<<"value">>],maps:values(M4)),
+
+    M0 = #{ 4 := number } = M5 = maps:put(4, number, M4),
+
+    true = is_members([4,18446744073709551629,int,"hi",<<"key">>],maps:keys(M5)),
+    true = is_members([number,wat,3,"hello",<<"value">>],maps:values(M5)),
+
+    M6 = #{ <<"key">> := <<"other value">> } = maps:put(<<"key">>, <<"other value">>, M5),
+
+    true = is_members([4,18446744073709551629,int,"hi",<<"key">>],maps:keys(M6)),
+    true = is_members([number,wat,3,"hello",<<"other value">>],maps:values(M6)),
+
+    %% error case
+    do_badmap(fun(T) ->
+		      {'EXIT',{{badmap,T},[{maps,put,_,_}|_]}} =
+			  (catch maps:put(1, a, T))
+	      end),
+    ok.
+
+is_members(Ks,Ls) when length(Ks) =/= length(Ls) -> false;
+is_members(Ks,Ls) -> is_members_do(Ks,Ls).
+
+is_members_do([],[]) -> true;
+is_members_do([],_) -> false;
+is_members_do([K|Ks],Ls) ->
+    is_members_do(Ks, lists:delete(K,Ls)).
+
+t_bif_map_remove(Config) when is_list(Config) ->
+    0  = erlang:map_size(maps:remove(some_key, #{})),
+
+    M0 = #{ "hi" => "hello", int => 3, <<"key">> => <<"value">>,
+	4 => number, 18446744073709551629 => wat},
+
+    M1 = maps:remove("hi", M0),
+    true = is_members([4,18446744073709551629,int,<<"key">>],maps:keys(M1)),
+    true = is_members([number,wat,3,<<"value">>],maps:values(M1)),
+
+    M2 = maps:remove(int, M1),
+    true = is_members([4,18446744073709551629,<<"key">>],maps:keys(M2)),
+    true = is_members([number,wat,<<"value">>],maps:values(M2)),
+
+    M3 = maps:remove(<<"key">>, M2),
+    true = is_members([4,18446744073709551629],maps:keys(M3)),
+    true = is_members([number,wat],maps:values(M3)),
+
+    M4 = maps:remove(18446744073709551629, M3),
+    true = is_members([4],maps:keys(M4)),
+    true = is_members([number],maps:values(M4)),
+
+    M5 = maps:remove(4, M4),
+    [] = maps:keys(M5),
+    [] = maps:values(M5),
+
+    M0 = maps:remove(5,M0),
+    M0 = maps:remove("hi there",M0),
+
+    #{ "hi" := "hello", int := 3, 4 := number} = maps:remove(18446744073709551629,maps:remove(<<"key">>,M0)),
+
+    %% error case
+    do_badmap(fun(T) ->
+		      {'EXIT',{{badmap,T},[{maps,remove,_,_}|_]}} =
+	(catch maps:remove(a, T))
+	      end),
+     ok.
+
+t_bif_map_update(Config) when is_list(Config) ->
+    M0 = #{ "hi" => "hello", int => 3, <<"key">> => <<"value">>,
+	4 => number, 18446744073709551629 => wat},
+
+    #{ "hi" := "hello again", int := 3, <<"key">> := <<"value">>,
+	4 := number, 18446744073709551629 := wat} = maps:update("hi", "hello again", M0),
+
+    #{ "hi" := "hello", int := 1337, <<"key">> := <<"value">>,
+	4 := number, 18446744073709551629 := wat} = maps:update(int, 1337, M0),
+
+    #{ "hi" := "hello", int := 3, <<"key">> := <<"new value">>,
+	4 := number, 18446744073709551629 := wat} = maps:update(<<"key">>, <<"new value">>, M0),
+
+    #{ "hi" := "hello", int := 3, <<"key">> := <<"value">>,
+	4 := integer, 18446744073709551629 := wat} = maps:update(4, integer, M0),
+
+    #{ "hi" := "hello", int := 3, <<"key">> := <<"value">>,
+	4 := number, 18446744073709551629 := wazzup} = maps:update(18446744073709551629, wazzup, M0),
+
+    %% error case
+    do_badmap(fun(T) ->
+		      {'EXIT',{{badmap,T},[{maps,update,_,_}|_]}} =
+			  (catch maps:update(1, none, T))
+	      end),
+    ok.
+
+
+
+t_bif_map_values(Config) when is_list(Config) ->
+
+    [] = maps:values(#{}),
+    [1] = maps:values(#{a=>1}),
+
+    true = is_members([a,b,c,d,e],maps:values(#{ 1 => a, 2 => b, 3 => c, 4 => d, 5 => e})),
+    true = is_members([a,b,c,d,e],maps:values(#{ 4 => d, 5 => e, 1 => a, 2 => b, 3 => c})),
+
+    M1 = #{ "hi" => "hello", int => 3, <<"key">> => <<"value">>, 4 => number},
+    M2 = M1#{ "hi" => "hello2", <<"key">> => <<"value2">> },
+    true = is_members([number,3,"hello2",<<"value2">>],maps:values(M2)),
+    true = is_members([number,3,"hello",<<"value">>],maps:values(M1)),
+
+    Vs = lists:seq(1000,20000),
+    M3 = maps:from_list([{K,K}||K<-Vs]),
+    M4 = maps:merge(M1,M3),
+    M5 = maps:merge(M2,M3),
+    true = is_members(Vs,maps:values(M3)),
+    true = is_members([number,3,"hello",<<"value">>]++Vs,maps:values(M4)),
+    true = is_members([number,3,"hello2",<<"value2">>]++Vs,maps:values(M5)),
+
+    %% error case
+    do_badmap(fun(T) ->
+		      {'EXIT',{{badmap,T},[{maps,values,_,_}|_]}} =
+			  (catch maps:values(T))
+	      end),
+    ok.
+
+t_erlang_hash(Config) when is_list(Config) ->
+    ok = t_bif_erlang_phash2(),
+    ok = t_bif_erlang_phash(),
+    ok.
+
+t_bif_erlang_phash2() ->
+
+    39679005 = erlang:phash2(#{}),
+    33667975 = erlang:phash2(#{ a => 1, "a" => 2, <<"a">> => 3, {a,b} => 4 }), % 78942764
+    95332690 = erlang:phash2(#{ 1 => a, 2 => "a", 3 => <<"a">>, 4 => {a,b} }), % 37338230
+    108954384 = erlang:phash2(#{ 1 => a }), % 14363616
+    59617982 = erlang:phash2(#{ a => 1 }), % 51612236
+
+    42770201 = erlang:phash2(#{{} => <<>>}), % 37468437
+    71687700 = erlang:phash2(#{<<>> => {}}), % 44049159
+
+    M0 = #{ a => 1, "key" => <<"value">> },
+    M1 = maps:remove("key",M0),
+    M2 = M1#{ "key" => <<"value">> },
+
+    70249457 = erlang:phash2(M0), % 118679416
+    59617982 = erlang:phash2(M1), % 51612236
+    70249457 = erlang:phash2(M2), % 118679416
+    ok.
+
+t_bif_erlang_phash() ->
+    Sz = 1 bsl 32,
+    1113425985 = erlang:phash(#{},Sz), % 268440612
+    1510068139 = erlang:phash(#{ a => 1, "a" => 2, <<"a">> => 3, {a,b} => 4 },Sz), % 1196461908
+    3182345590 = erlang:phash(#{ 1 => a, 2 => "a", 3 => <<"a">>, 4 => {a,b} },Sz), % 3944426064
+    2927531828 = erlang:phash(#{ 1 => a },Sz), % 1394238263
+    1670235874 = erlang:phash(#{ a => 1 },Sz), % 4066388227
+
+    3935089469 = erlang:phash(#{{} => <<>>},Sz), % 1578050717
+    71692856   = erlang:phash(#{<<>> => {}},Sz), % 1578050717
+
+    M0 = #{ a => 1, "key" => <<"value">> },
+    M1 = maps:remove("key",M0),
+    M2 = M1#{ "key" => <<"value">> },
+
+    2620391445 = erlang:phash(M0,Sz), % 3590546636
+    1670235874 = erlang:phash(M1,Sz), % 4066388227
+    2620391445 = erlang:phash(M2,Sz), % 3590546636
+    ok.
+
+t_map_encode_decode(Config) when is_list(Config) ->
+    <<131,116,0,0,0,0>> = erlang:term_to_binary(#{}),
+    Pairs = [
+	{a,b},{"key","values"},{<<"key">>,<<"value">>},
+	{1,b},{[atom,1],{<<"wat">>,1,2,3}},
+	{aa,"values"},
+	{1 bsl 64 + (1 bsl 50 - 1), sc1},
+	{99, sc2},
+	{1 bsl 65 + (1 bsl 51 - 1), sc3},
+	{88, sc4},
+	{1 bsl 66 + (1 bsl 52 - 1), sc5},
+	{77, sc6},
+	{1 bsl 67 + (1 bsl 53 - 1), sc3},
+	{75, sc6}, {-10,sc8},
+	{<<>>, sc9}, {3.14158, sc10},
+	{[3.14158], sc11}, {more_atoms, sc12},
+	{{more_tuples}, sc13}, {self(), sc14},
+	{{},{}},{[],[]}
+    ],
+    ok = map_encode_decode_and_match(Pairs,[],#{}),
+
+    %% check sorting
+
+    %% literally #{ b=>2, a=>1 } in the internal order
+    #{ a:=1, b:=2 } =
+	erlang:binary_to_term(<<131,116,0,0,0,2,100,0,1,98,97,2,100,0,1,97,97,1>>),
+
+
+    %% literally #{ "hi" => "value", a=>33, b=>55 } in the internal order
+    #{ a:=33, b:=55, "hi" := "value"} = erlang:binary_to_term(<<131,116,0,0,0,3,
+	107,0,2,104,105,            % "hi" :: list()
+	107,0,5,118,97,108,117,101, % "value" :: list()
+	100,0,1,97,                 % a :: atom()
+	97,33,                      % 33 :: integer()
+	100,0,1,98,                 % b :: atom()
+	97,55                       % 55 :: integer()
+	>>),
+
+    %% Maps of different sizes
+    lists:foldl(fun(Key, M0) ->
+			M1 = M0#{Key => Key},
+			case Key rem 17 of
+			    0 ->
+				M1 = binary_to_term(term_to_binary(M1));
+			    _ ->
+				ok
+			end,
+			M1
+		end,
+		#{},
+		lists:seq(1,10000)),
+
+    %% many maps in same binary
+    MapList = lists:foldl(fun(K, [M|_]=Acc) -> [M#{K => K} | Acc] end,
+			  [#{}],
+			  lists:seq(1,100)),
+    MapList = binary_to_term(term_to_binary(MapList)),
+    MapListR = lists:reverse(MapList),
+    MapListR = binary_to_term(term_to_binary(MapListR)),
+
+    %% error cases
+    %% template: <<131,116,0,0,0,2,100,0,1,97,100,0,1,98,97,1,97,1>>
+    %% which is: #{ a=>1, b=>1 }
+
+    %% uniqueness violation
+    %% literally #{ a=>1, "hi"=>"value", a=>2 }
+    {'EXIT',{badarg,[{_,_,_,_}|_]}} = (catch
+	erlang:binary_to_term(<<131,116,0,0,0,3,
+			       100,0,1,97,
+			       97,1,
+			       107,0,2,104,105,
+			       107,0,5,118,97,108,117,101,
+			       100,0,1,97,
+			       97,2>>)),
+
+    %% bad size (too large)
+    {'EXIT',{badarg,[{_,_,_,_}|_]}} = (catch
+	erlang:binary_to_term(<<131,116,0,0,0,12,100,0,1,97,97,1,100,0,1,98,97,1>>)),
+
+    %% bad size (too small) .. should fail just truncate it .. weird.
+    %% possibly change external format so truncated will be #{a:=1}
+    #{ a:=b } =
+	erlang:binary_to_term(<<131,116,0,0,0,1,100,0,1,97,100,0,1,98,97,1,97,1>>),
+
+    ok.
+
+map_encode_decode_and_match([{K,V}|Pairs], EncodedPairs, M0) ->
+    M1 = maps:put(K,V,M0),
+    B0 = erlang:term_to_binary(M1),
+    Ls = [{erlang:term_to_binary(K), erlang:term_to_binary(V)}|EncodedPairs],
+    ok = match_encoded_map(B0, length(Ls), Ls),
+    %% decode and match it
+    M1 = erlang:binary_to_term(B0),
+    map_encode_decode_and_match(Pairs,Ls,M1);
+map_encode_decode_and_match([],_,_) -> ok.
+
+match_encoded_map(<<131,116,Size:32,Encoded/binary>>,Size,Items) ->
+    match_encoded_map_stripped_size(Encoded,Items,Items);
+match_encoded_map(_,_,_) -> no_match_size.
+
+match_encoded_map_stripped_size(<<>>,_,_) -> ok;
+match_encoded_map_stripped_size(B0,[{<<131,K/binary>>,<<131,V/binary>>}|Items],Ls) ->
+    Ksz = byte_size(K),
+    Vsz = byte_size(V),
+    case B0 of
+	<<K:Ksz/binary,V:Vsz/binary,B1/binary>> ->
+	    match_encoded_map_stripped_size(B1,Ls,Ls);
+	_ ->
+	    match_encoded_map_stripped_size(B0,Items,Ls)
+    end;
+match_encoded_map_stripped_size(_,[],_) -> fail.
+
+
+t_bif_map_to_list(Config) when is_list(Config) ->
+    [] = maps:to_list(#{}),
+    [{a,1},{b,2}] = lists:sort(maps:to_list(#{a=>1,b=>2})),
+    [{a,1},{b,2},{c,3}] = lists:sort(maps:to_list(#{c=>3,a=>1,b=>2})),
+    [{a,1},{b,2},{g,3}] = lists:sort(maps:to_list(#{g=>3,a=>1,b=>2})),
+    [{a,1},{b,2},{g,3},{"c",4}] = lists:sort(maps:to_list(#{g=>3,a=>1,b=>2,"c"=>4})),
+    [{3,v2},{hi,v4},{{hi,3},v5},{"hi",v3},{<<"hi">>,v1}] =
+	lists:sort(maps:to_list(#{<<"hi">>=>v1,3=>v2,"hi"=>v3,hi=>v4,{hi,3}=>v5})),
+
+    [{3,v7},{hi,v9},{{hi,3},v10},{"hi",v8},{<<"hi">>,v6}] =
+	lists:sort(maps:to_list(#{<<"hi">>=>v1,3=>v2,"hi"=>v3,hi=>v4,{hi,3}=>v5,
+				  <<"hi">>=>v6,3=>v7,"hi"=>v8,hi=>v9,{hi,3}=>v10})),
+
+    %% error cases
+    do_badmap(fun(T) ->
+		      {'EXIT', {{badmap,T},_}} =
+			  (catch maps:to_list(T))
+	      end),
+    ok.
+
+
+t_bif_map_from_list(Config) when is_list(Config) ->
+    #{} = maps:from_list([]),
+    A   = maps:from_list([]),
+    0   = erlang:map_size(A),
+
+    #{a:=1,b:=2}      = maps:from_list([{a,1},{b,2}]),
+    #{c:=3,a:=1,b:=2} = maps:from_list([{a,1},{b,2},{c,3}]),
+    #{g:=3,a:=1,b:=2} = maps:from_list([{a,1},{b,2},{g,3}]),
+
+    #{a:=2} = maps:from_list([{a,1},{a,3},{a,2}]),
+
+    #{ <<"hi">>:=v1,3:=v3,"hi":=v6,hi:=v4,{hi,3}:=v5} =
+	maps:from_list([{3,v3},{"hi",v6},{hi,v4},{{hi,3},v5},{<<"hi">>,v1}]),
+
+    #{<<"hi">>:=v6,3:=v8,"hi":=v11,hi:=v9,{hi,3}:=v10} =
+	maps:from_list([ {{hi,3},v3}, {"hi",v0},{3,v1}, {<<"hi">>,v4}, {hi,v2},
+	    {<<"hi">>,v6}, {{hi,3},v10},{"hi",v11}, {hi,v9}, {3,v8}]),
+
+    %% repeated keys (large -> small)
+    Ps1 = [{a,I}|| I <- lists:seq(1,32)],
+    Ps2 = [{a,I}|| I <- lists:seq(33,64)],
+
+    M = maps:from_list(Ps1 ++ [{b,1},{c,1}] ++ Ps2),
+    #{ a := 64, b := 1, c := 1 } = M,
+
+    %% error cases
+    {'EXIT', {badarg,_}} = (catch maps:from_list([{a,b},b])),
+    {'EXIT', {badarg,_}} = (catch maps:from_list([{a,b},{b,b,3}])),
+    {'EXIT', {badarg,_}} = (catch maps:from_list([{a,b},<<>>])),
+    {'EXIT', {badarg,_}} = (catch maps:from_list([{a,b}|{b,a}])),
+    {'EXIT', {badarg,_}} = (catch maps:from_list(a)),
+    {'EXIT', {badarg,_}} = (catch maps:from_list(42)),
+    ok.
+
+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,
+				      fun(K) -> K end,
+				      fun(K) -> {1,K} end,
+				      fun(K) -> {K} end,
+				      fun(K) -> [K|K] end,
+				      fun(K) -> [K,1,2,3,4] end,
+				      fun(K) -> {K,atom} end,
+				      fun(K) -> float(K) end,
+				      fun(K) -> integer_to_list(K) end,
+				      fun(K) -> list_to_atom(integer_to_list(K)) end,
+				      fun(K) -> [K,{K,[K,{K,[K]}]}] end,
+				      fun(K) -> <<K:32>> end
+			      ]),
+
+    ok.
+
+check_build_and_remove(_,[]) -> ok;
+check_build_and_remove(N,[F|Fs]) ->
+    {M,Ks} = build_and_check(N, maps:new(), F, []),
+    ok     = remove_and_check(Ks,M),
+    check_build_and_remove(N,Fs).
+
+build_and_check(0, M0, _, Ks) -> {M0, Ks};
+build_and_check(N, M0, F, Ks) ->
+    K  = build_key(F,N),
+    M1 = maps:put(K,K,M0),
+    ok = check_keys_exist([I||{I,_} <- [{K,M1}|Ks]], M1),
+    M2 = maps:update(K,v,M1),
+    v  = maps:get(K,M2),
+    build_and_check(N-1,M1,F,[{K,M1}|Ks]).
+
+remove_and_check([],_) -> ok;
+remove_and_check([{K,Mc}|Ks], M0) ->
+    K     = maps:get(K,M0),
+    true  = maps:is_key(K,M0),
+    true  = Mc =:= M0,
+    true  = M0 == Mc,
+    M1    = maps:remove(K,M0),
+    false = M1 =:= Mc,
+    false = Mc == M1,
+    false = maps:is_key(K,M1),
+    true  = maps:is_key(K,M0),
+    ok    = check_keys_exist([I||{I,_} <- Ks],M1),
+    error = maps:find(K,M1),
+    remove_and_check(Ks, M1).
+
+build_key(F,N) when N rem 3 =:= 0 -> F(N);
+build_key(F,N) when N rem 3 =:= 1 -> K = F(N), {K,K};
+build_key(F,N) when N rem 3 =:= 2 -> K = F(N), [K,K].
+
+check_keys_exist([], _) -> ok;
+check_keys_exist([K|Ks],M) ->
+    true = maps:is_key(K,M),
+    check_keys_exist(Ks,M).
+
+t_bif_merge_and_check(Config) when is_list(Config) ->
+
+    io:format("rand:export_seed() -> ~p\n",[rand:export_seed()]),
+
+    %% simple disjunct ones
+    %% make sure all keys are unique
+    Kss = [[a,b,c,d],
+	   [1,2,3,4],
+	   [],
+	   ["hi"],
+	   [e],
+	   [build_key(fun(K) -> {small,K} end, I) || I <- lists:seq(1,32)],
+	   lists:seq(5, 28),
+	   lists:seq(29, 59),
+	   [build_key(fun(K) -> integer_to_list(K) end, I) || I <- lists:seq(2000,10000)],
+	   [build_key(fun(K) -> <<K:32>> end, I) || I <- lists:seq(1,80)],
+	   [build_key(fun(K) -> {<<K:32>>} end, I) || I <- lists:seq(100,1000)]],
+
+
+    KsMs = build_keys_map_pairs(Kss),
+    Cs   = [{CKs1,CM1,CKs2,CM2} || {CKs1,CM1} <- KsMs, {CKs2,CM2} <- KsMs],
+    ok   = merge_and_check_combo(Cs),
+
+    %% overlapping ones
+
+    KVs1 = [{a,1},{b,2},{c,3}],
+    KVs2 = [{b,3},{c,4},{d,5}],
+    KVs  = [{I,I} || I <- lists:seq(1,32)],
+    KVs3 = KVs1 ++ KVs,
+    KVs4 = KVs2 ++ KVs,
+
+    M1  = maps:from_list(KVs1),
+    M2  = maps:from_list(KVs2),
+    M3  = maps:from_list(KVs3),
+    M4  = maps:from_list(KVs4),
+
+    M12 = maps:merge(M1,M2),
+    ok  = check_key_values(KVs2 ++ [{a,1}], M12),
+    M21 = maps:merge(M2,M1),
+    ok  = check_key_values(KVs1 ++ [{d,5}], M21),
+
+    M34 = maps:merge(M3,M4),
+    ok  = check_key_values(KVs4 ++ [{a,1}], M34),
+    M43 = maps:merge(M4,M3),
+    ok  = check_key_values(KVs3 ++ [{d,5}], M43),
+
+    M14 = maps:merge(M1,M4),
+    ok  = check_key_values(KVs4 ++ [{a,1}], M14),
+    M41 = maps:merge(M4,M1),
+    ok  = check_key_values(KVs1 ++ [{d,5}] ++ KVs, M41),
+
+    [begin Ma = random_map(SzA, a),
+	   Mb = random_map(SzB, b),
+	   ok = merge_maps(Ma, Mb)
+     end || SzA <- [3,10,20,100,200,1000], SzB <- [3,10,20,100,200,1000]],
+
+    ok.
+
+% Generate random map with an average of Sz number of pairs: K -> {V,K}
+random_map(Sz, V) ->
+    random_map_insert(#{}, 0, V, Sz*2).
+
+random_map_insert(M0, K0, _, Sz) when K0 > Sz ->
+    M0;
+random_map_insert(M0, K0, V, Sz) ->
+    Key = K0 + rand:uniform(3),
+    random_map_insert(M0#{Key => {V,Key}}, Key, V, Sz).
+
+
+merge_maps(A, B) ->
+    AB = maps:merge(A, B),
+    %%io:format("A=~p\nB=~p\n",[A,B]),
+    maps_foreach(fun(K,VB) -> VB = maps:get(K, AB)
+		 end, B),
+    maps_foreach(fun(K,VA) ->
+			 case {maps:get(K, AB),maps:find(K, B)} of
+			     {VA, error} -> ok;
+			     {VB, {ok, VB}} -> ok
+			 end
+		 end, A),
+
+    maps_foreach(fun(K,V) ->
+			 case {maps:find(K, A),maps:find(K, B)} of
+			     {{ok, V}, error} -> ok;
+			     {error, {ok, V}} -> ok;
+			     {{ok,_}, {ok, V}} -> ok
+			 end
+		 end, AB),
+    ok.
+
+maps_foreach(Fun, Map) ->
+    maps:fold(fun(K,V,_) -> Fun(K,V) end, void, Map).
+
+
+check_key_values([],_) -> ok;
+check_key_values([{K,V}|KVs],M) ->
+    V = maps:get(K,M),
+    check_key_values(KVs,M).
+
+merge_and_check_combo([]) -> ok;
+merge_and_check_combo([{Ks1,M1,Ks2,M2}|Cs]) ->
+    M12 = maps:merge(M1,M2),
+    ok  = check_keys_exist(Ks1 ++ Ks2, M12),
+    M21 = maps:merge(M2,M1),
+    ok  = check_keys_exist(Ks1 ++ Ks2, M21),
+
+    true = M12 =:= M21,
+    M12  = M21,
+
+    merge_and_check_combo(Cs).
+
+build_keys_map_pairs([]) -> [];
+build_keys_map_pairs([Ks|Kss]) ->
+    M  = maps:from_list(keys_to_pairs(Ks)),
+    ok = check_keys_exist(Ks, M),
+    [{Ks,M}|build_keys_map_pairs(Kss)].
+
+keys_to_pairs(Ks) -> [{K,K} || K <- Ks].
+
+
+%% Maps module, not BIFs
+t_maps_fold(_Config) ->
+    Vs = lists:seq(1,100),
+    M  = maps:from_list([{{k,I},{v,I}}||I<-Vs]),
+
+    %% fold
+    5050 = maps:fold(fun({k,_},{v,V},A) -> V + A end, 0, M),
+
+    ok.
+
+t_maps_map(_Config) ->
+    Vs = lists:seq(1,100),
+    M1 = maps:from_list([{I,I}||I<-Vs]),
+    M2 = maps:from_list([{I,{token,I}}||I<-Vs]),
+
+    M2 = maps:map(fun(_K,V) -> {token,V} end, M1),
+    ok.
+
+t_maps_size(_Config) ->
+    Vs = lists:seq(1,100),
+    lists:foldl(fun(I,M) ->
+		M1 = maps:put(I,I,M),
+		I  = maps:size(M1),
+		M1
+	end, #{}, Vs),
+    ok.
+
+
+t_maps_without(_Config) ->
+    Ki = [11,22,33,44,55,66,77,88,99],
+    M0 = maps:from_list([{{k,I},{v,I}}||I<-lists:seq(1,100)]),
+    M1 = maps:from_list([{{k,I},{v,I}}||I<-lists:seq(1,100) -- Ki]),
+    M1 = maps:without([{k,I}||I <- Ki],M0),
+    ok.
+
+t_erts_internal_order(_Config) when is_list(_Config) ->
+    M = #{0 => 0,2147483648 => 0},
+    true = M =:= binary_to_term(term_to_binary(M)),
+
+    F1 = fun(_, _) -> 0 end,
+    F2 = fun(_, _) -> 1 end,
+    M0 = maps:from_list( [{-2147483649, 0}, {0,0}, {97, 0}, {false, 0}, {flower, 0}, {F1, 0}, {F2, 0}, {<<>>, 0}]),
+    M1 = maps:merge(M0, #{0 => 1}),
+    8  = maps:size(M1),
+    1  = maps:get(0,M1),
+    ok.
+
+t_erts_internal_hash(_Config) when is_list(_Config) ->
+    K1 = 0.0,
+    K2 = 0.0/-1,
+    M  = maps:from_list([{I,I}||I<-lists:seq(1,32)]),
+
+    M1 = M#{ K1 => a, K2 => b },
+    b  = maps:get(K2,M1),
+
+    M2 = M#{ K2 => a, K1 => b },
+    b  = maps:get(K1,M2),
+
+    %% test previously faulty hash list optimization
+
+    M3 = M#{[0] => a, [0,0] => b, [0,0,0] => c, [0,0,0,0] => d},
+    a  = maps:get([0],M3),
+    b  = maps:get([0,0],M3),
+    c  = maps:get([0,0,0],M3),
+    d  = maps:get([0,0,0,0],M3),
+
+    M4 = M#{{[0]} => a, {[0,0]} => b, {[0,0,0]} => c, {[0,0,0,0]} => d},
+    a  = maps:get({[0]},M4),
+    b  = maps:get({[0,0]},M4),
+    c  = maps:get({[0,0,0]},M4),
+    d  = maps:get({[0,0,0,0]},M4),
+
+    M5 = M3#{[0,0,0] => e, [0,0,0,0] => f, [0,0,0,0,0] => g,
+             [0,0,0,0,0,0] => h, [0,0,0,0,0,0,0] => i,
+             [0,0,0,0,0,0,0,0] => j, [0,0,0,0,0,0,0,0,0] => k},
+
+    a  = maps:get([0],M5),
+    b  = maps:get([0,0],M5),
+    e  = maps:get([0,0,0],M5),
+    f  = maps:get([0,0,0,0],M5),
+    g  = maps:get([0,0,0,0,0],M5),
+    h  = maps:get([0,0,0,0,0,0],M5),
+    i  = maps:get([0,0,0,0,0,0,0],M5),
+    j  = maps:get([0,0,0,0,0,0,0,0],M5),
+    k  = maps:get([0,0,0,0,0,0,0,0,0],M5),
+
+    M6 = M4#{{[0,0,0]} => e, {[0,0,0,0]} => f, {[0,0,0,0,0]} => g,
+             {[0,0,0,0,0,0]} => h, {[0,0,0,0,0,0,0]} => i,
+             {[0,0,0,0,0,0,0,0]} => j, {[0,0,0,0,0,0,0,0,0]} => k},
+
+    a  = maps:get({[0]},M6),
+    b  = maps:get({[0,0]},M6),
+    e  = maps:get({[0,0,0]},M6),
+    f  = maps:get({[0,0,0,0]},M6),
+    g  = maps:get({[0,0,0,0,0]},M6),
+    h  = maps:get({[0,0,0,0,0,0]},M6),
+    i  = maps:get({[0,0,0,0,0,0,0]},M6),
+    j  = maps:get({[0,0,0,0,0,0,0,0]},M6),
+    k  = maps:get({[0,0,0,0,0,0,0,0,0]},M6),
+
+    M7 = maps:merge(M5,M6),
+
+    a  = maps:get([0],M7),
+    b  = maps:get([0,0],M7),
+    e  = maps:get([0,0,0],M7),
+    f  = maps:get([0,0,0,0],M7),
+    g  = maps:get([0,0,0,0,0],M7),
+    h  = maps:get([0,0,0,0,0,0],M7),
+    i  = maps:get([0,0,0,0,0,0,0],M7),
+    j  = maps:get([0,0,0,0,0,0,0,0],M7),
+    k  = maps:get([0,0,0,0,0,0,0,0,0],M7),
+    a  = maps:get({[0]},M7),
+    b  = maps:get({[0,0]},M7),
+    e  = maps:get({[0,0,0]},M7),
+    f  = maps:get({[0,0,0,0]},M7),
+    g  = maps:get({[0,0,0,0,0]},M7),
+    h  = maps:get({[0,0,0,0,0,0]},M7),
+    i  = maps:get({[0,0,0,0,0,0,0]},M7),
+    j  = maps:get({[0,0,0,0,0,0,0,0]},M7),
+    k  = maps:get({[0,0,0,0,0,0,0,0,0]},M7),
+    ok.
+
+t_pdict(_Config) ->
+
+    put(#{ a => b, b => a},#{ c => d}),
+    put(get(#{ a => b, b => a}),1),
+    1 = get(#{ c => d}),
+    #{ c := d } = get(#{ a => b, b => a}).
+
+t_ets(_Config) ->
+
+    Tid = ets:new(map_table,[]),
+
+    [ets:insert(Tid,{maps:from_list([{I,-I}]),I}) || I <- lists:seq(1,100)],
+
+
+    [{#{ 2 := -2},2}] = ets:lookup(Tid,#{ 2 => -2 }),
+
+    %% Test equal
+    [3,4] = lists:sort(
+	      ets:select(Tid,[{{'$1','$2'},
+			       [{'or',{'==','$1',#{ 3 => -3 }},
+				 {'==','$1',#{ 4 => -4 }}}],
+			       ['$2']}])),
+    %% Test match
+    [30,50] = lists:sort(
+		ets:select(Tid,
+			   [{{#{ 30 => -30}, '$1'},[],['$1']},
+			    {{#{ 50 => -50}, '$1'},[],['$1']}]
+			  )),
+
+    ets:insert(Tid,{#{ a => b, b => c, c => a},transitivity}),
+
+    %% Test equal with map of different size
+    [] = ets:select(Tid,[{{'$1','_'},[{'==','$1',#{ b => c }}],['$_']}]),
+
+    %% Test match with map of different size
+    %[{#{ a := b },_}] = ets:select(Tid,[{{#{ b => c },'_'},[],['$_']}]),
+
+    %%% Test match with don't care value
+    %[{#{ a := b },_}] = ets:select(Tid,[{{#{ b => '_' },'_'},[],['$_']}]),
+
+    %% Test is_map bif
+    101 = length(ets:select(Tid,[{'$1',[{is_map,{element,1,'$1'}}],['$1']}])),
+    ets:insert(Tid,{not_a_map,2}),
+    101 = length(ets:select(Tid,[{'$1',[{is_map,{element,1,'$1'}}],['$1']}])),
+    ets:insert(Tid,{{nope,a,tuple},2}),
+    101 = length(ets:select(Tid,[{'$1',[{is_map,{element,1,'$1'}}],['$1']}])),
+
+    %% Test map_size bif
+    [3] = ets:select(Tid,[{{'$1','_'},[{'==',{map_size,'$1'},3}],
+			   [{map_size,'$1'}]}]),
+
+    true = ets:delete(Tid,#{50 => -50}),
+    [] = ets:lookup(Tid,#{50 => -50}),
+
+    ets:delete(Tid),
+    ok.
+
+t_dets(_Config) ->
+    ok.
+
+t_tracing(_Config) ->
+
+    dbg:stop_clear(),
+    {ok,Tracer} = dbg:tracer(process,{fun trace_collector/2, self()}),
+    dbg:p(self(),c),
+
+    %% Test basic map call
+    {ok,_} = dbg:tpl(?MODULE,id,x),
+    #{ a => b },
+    {trace,_,call,{?MODULE,id,[#{ a := b }]}} = getmsg(Tracer),
+    {trace,_,return_from,{?MODULE,id,1},#{ a := b }} = getmsg(Tracer),
+    dbg:ctpl(),
+
+    %% Test equals in argument list
+    {ok,_} = dbg:tpl(?MODULE,id,[{['$1'],[{'==','$1',#{ b => c}}],
+				  [{return_trace}]}]),
+    #{ a => b },
+    #{ b => c },
+    {trace,_,call,{?MODULE,id,[#{ b := c }]}} = getmsg(Tracer),
+    {trace,_,return_from,{?MODULE,id,1},#{ b := c }} = getmsg(Tracer),
+    dbg:ctpl(),
+
+    %% Test match in head
+    {ok,_} = dbg:tpl(?MODULE,id,[{[#{b => c}],[],[]}]),
+    #{ a => b },
+    #{ b => c },
+    {trace,_,call,{?MODULE,id,[#{ b := c }]}} = getmsg(Tracer),
+    dbg:ctpl(),
+
+    % Test map guard bifs
+    {ok,_} = dbg:tpl(?MODULE,id,[{['$1'],[{is_map,{element,1,'$1'}}],[]}]),
+    #{ a => b },
+    {1,2},
+    {#{ a => b},2},
+    {trace,_,call,{?MODULE,id,[{#{ a := b },2}]}} = getmsg(Tracer),
+    dbg:ctpl(),
+
+    {ok,_} = dbg:tpl(?MODULE,id,[{['$1'],[{'==',{map_size,{element,1,'$1'}},2}],[]}]),
+    #{ a => b },
+    {1,2},
+    {#{ a => b},2},
+    {#{ a => b, b => c},atom},
+    {trace,_,call,{?MODULE,id,[{#{ a := b, b := c },atom}]}} = getmsg(Tracer),
+    dbg:ctpl(),
+
+    %MS = dbg:fun2ms(fun([A]) when A == #{ a => b} -> ok end),
+    %dbg:tpl(?MODULE,id,MS),
+    %#{ a => b },
+    %#{ b => c },
+    %{trace,_,call,{?MODULE,id,[#{ a := b }]}} = getmsg(Tracer),
+    %dbg:ctpl(),
+
+    %% Check to extra messages
+    timeout = getmsg(Tracer),
+
+    dbg:stop_clear(),
+    ok.
+
+getmsg(_Tracer) ->
+    receive V -> V after 100 -> timeout end.
+
+trace_collector(Msg,Parent) ->
+    io:format("~p~n",[Msg]),
+    Parent ! Msg,
+    Parent.
+
+t_has_map_fields(Config) when is_list(Config) ->
+    true = has_map_fields_1(#{one=>1}),
+    true = has_map_fields_1(#{one=>1,two=>2}),
+    false = has_map_fields_1(#{two=>2}),
+    false = has_map_fields_1(#{}),
+
+    true = has_map_fields_2(#{c=>1,b=>2,a=>3}),
+    true = has_map_fields_2(#{c=>1,b=>2,a=>3,x=>42}),
+    false = has_map_fields_2(#{b=>2,c=>1}),
+    false = has_map_fields_2(#{x=>y}),
+    false = has_map_fields_2(#{}),
+
+    true = has_map_fields_3(#{c=>1,b=>2,a=>3}),
+    true = has_map_fields_3(#{c=>1,b=>2,a=>3,[]=>42}),
+    true = has_map_fields_3(#{b=>2,a=>3,[]=>42,42.0=>43}),
+    true = has_map_fields_3(#{a=>3,[]=>42,42.0=>43}),
+    true = has_map_fields_3(#{[]=>42,42.0=>43}),
+    false = has_map_fields_3(#{b=>2,c=>1}),
+    false = has_map_fields_3(#{[]=>y}),
+    false = has_map_fields_3(#{42.0=>x,a=>99}),
+    false = has_map_fields_3(#{}),
+
+    ok.
+
+has_map_fields_1(#{one:=_}) -> true;
+has_map_fields_1(#{}) -> false.
+
+has_map_fields_2(#{a:=_,b:=_,c:=_}) -> true;
+has_map_fields_2(#{}) -> false.
+
+has_map_fields_3(#{a:=_,b:=_}) -> true;
+has_map_fields_3(#{[]:=_,42.0:=_}) -> true;
+has_map_fields_3(#{}) -> false.
+
+y_regs(Config) when is_list(Config) ->
+    Val = [length(Config)],
+    Map0 = y_regs_update(#{}, Val),
+    Map2 = y_regs_update(Map0, Val),
+
+    Map3 = maps:from_list([{I,I*I} || I <- lists:seq(1, 100)]),
+    Map4 = y_regs_update(Map3, Val),
+
+    true = is_map(Map2) andalso is_map(Map4),
+
+    ok.
+
+y_regs_update(Map0, Val0) ->
+    Val1 = {t,Val0},
+    K1 = {key,1},
+    K2 = {key,2},
+    Map1 = Map0#{K1=>K1,
+		 a=>Val0,b=>Val0,c=>Val0,d=>Val0,e=>Val0,
+		 f=>Val0,g=>Val0,h=>Val0,i=>Val0,j=>Val0,
+		 k=>Val0,l=>Val0,m=>Val0,n=>Val0,o=>Val0,
+		 p=>Val0,q=>Val0,r=>Val0,s=>Val0,t=>Val0,
+		 u=>Val0,v=>Val0,w=>Val0,x=>Val0,y=>Val0,
+		 z=>Val0,
+		 aa=>Val0,ab=>Val0,ac=>Val0,ad=>Val0,ae=>Val0,
+		 af=>Val0,ag=>Val0,ah=>Val0,ai=>Val0,aj=>Val0,
+		 ak=>Val0,al=>Val0,am=>Val0,an=>Val0,ao=>Val0,
+		 ap=>Val0,aq=>Val0,ar=>Val0,as=>Val0,at=>Val0,
+		 au=>Val0,av=>Val0,aw=>Val0,ax=>Val0,ay=>Val0,
+		 az=>Val0,
+		 K2=>[a,b,c]},
+    Map2 = Map1#{K1=>K1,
+		 a:=Val1,b:=Val1,c:=Val1,d:=Val1,e:=Val1,
+		 f:=Val1,g:=Val1,h:=Val1,i:=Val1,j:=Val1,
+		 k:=Val1,l:=Val1,m:=Val1,n:=Val1,o:=Val1,
+		 p:=Val1,q:=Val1,r:=Val1,s:=Val1,t:=Val1,
+		 u:=Val1,v:=Val1,w:=Val1,x:=Val1,y:=Val1,
+		 z:=Val1,
+		 aa:=Val1,ab:=Val1,ac:=Val1,ad:=Val1,ae:=Val1,
+		 af:=Val1,ag:=Val1,ah:=Val1,ai:=Val1,aj:=Val1,
+		 ak:=Val1,al:=Val1,am:=Val1,an:=Val1,ao:=Val1,
+		 ap:=Val1,aq:=Val1,ar:=Val1,as:=Val1,at:=Val1,
+		 au:=Val1,av:=Val1,aw:=Val1,ax:=Val1,ay:=Val1,
+		 az:=Val1,
+		 K2=>[a,b,c]},
+
+    %% Traverse the maps to validate them.
+    _ = erlang:phash2({Map1,Map2}, 100000),
+
+    _ = {K1,K2,Val0,Val1},			%Force use of Y registers.
+    Map2.
+
+do_badmap(Test) ->
+    Terms = [Test,fun erlang:abs/1,make_ref(),self(),0.0/-1,
+	     <<0:1024>>,<<1:1>>,<<>>,<<1,2,3>>,
+	     [],{a,b,c},[a,b],atom,10.0,42,(1 bsl 65) + 3],
+    [Test(T) || T <- Terms].
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/order.erl b/lib/dialyzer/test/indent_SUITE_data/src/order.erl
new file mode 100644
index 0000000000..51868d7e94
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/order.erl
@@ -0,0 +1,56 @@
+-module(order).
+
+-export([t1/0, t2/0, t3/0, t4/0, t5/0, t6/0]).
+
+t1() ->
+    case maps:get(a, #{a=>1, a=>b}) of
+	Int when is_integer(Int) -> fail;
+	Atom when is_atom(Atom) -> error(ok);
+	_Else -> fail
+    end.
+
+t2() ->
+    case maps:get(a, #{a=>id_1(1), a=>id_b(b)}) of
+	Int when is_integer(Int) -> fail;
+	Atom when is_atom(Atom) -> error(ok);
+	_Else -> fail
+    end.
+
+t3() ->
+    case maps:get(a, #{a=>id_1(1), id_a(a)=>id_b(b)}) of
+	Int when is_integer(Int) -> fail;
+	Atom when is_atom(Atom) -> error(ok);
+	_Else -> fail
+    end.
+
+t4() ->
+    case maps:get(a, #{a=>id_1(1), a_or_b()=>id_b(b)}) of
+	Int when is_integer(Int) -> ok;
+	Atom when is_atom(Atom) -> ok;
+	_Else -> fail
+    end.
+
+t5() ->
+    case maps:get(c, #{c=>id_1(1), a_or_b()=>id_b(b)}) of
+	Int when is_integer(Int) -> error(ok);
+	Atom when is_atom(Atom) -> fail;
+	_Else -> fail
+    end.
+
+t6() ->
+    case maps:get(a, #{a_or_b()=>id_1(1), id_a(a)=>id_b(b)}) of
+	Int when is_integer(Int) -> fail;
+	Atom when is_atom(Atom) -> error(ok);
+	_Else -> fail
+    end.
+
+id_1(X) -> X.
+
+id_a(X) -> X.
+
+id_b(X) -> X.
+
+any() -> binary_to_term(<<>>).
+
+-spec a_or_b() -> a | b.
+a_or_b() -> any().
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/queue_use.erl b/lib/dialyzer/test/indent_SUITE_data/src/queue_use.erl
new file mode 100644
index 0000000000..8d46bdb989
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/queue_use.erl
@@ -0,0 +1,65 @@
+-module(queue_use).
+
+-export([ok1/0, ok2/0]).
+-export([wrong1/0, wrong2/0, wrong3/0, wrong4/0, wrong5/0, wrong6/0, wrong7/0, wrong8/0]).
+
+ok1() ->
+    queue:is_empty(queue:new()).
+
+ok2() ->
+    Q0 = queue:new(),
+    Q1 = queue:in(42, Q0),
+    {{value, 42}, Q2} = queue:out(Q1),
+    queue:is_empty(Q2).
+
+%%--------------------------------------------------
+
+wrong1() ->
+    queue:is_empty({[],[]}).
+
+wrong2() ->
+    Q0 = {[],[]},
+    queue:in(42, Q0).
+
+wrong3() ->
+    Q0 = queue:new(),
+    Q1 = queue:in(42, Q0),
+    {[42],Q2} = Q1,
+    Q2.
+
+wrong4() ->
+    Q0 = queue:new(),
+    Q1 = queue:in(42, Q0),
+    Q1 =:= {[42],[]}.
+
+wrong5() ->
+    {F, _R} = queue:new(),
+    F.
+
+wrong6() ->
+    {{value, 42}, Q2} = queue:out({[42],[]}),
+    Q2.
+
+%%--------------------------------------------------
+
+-record(db, {p, q}).
+
+wrong7() ->
+    add_unique(42, #db{p = [], q = queue:new()}).
+
+add_unique(E, DB) ->
+    case is_in_queue(E, DB) of
+	true -> DB;
+	false -> DB#db{q = queue:in(E, DB#db.q)}
+    end.
+
+is_in_queue(P, #db{q = {L1,L2}}) ->
+    lists:member(P, L1) orelse lists:member(P, L2).
+
+%%--------------------------------------------------
+
+wrong8() ->
+    tuple_queue({42, gazonk}).
+
+tuple_queue({F, Q}) ->
+    queue:in(F, Q).
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/rec/rec_adt.erl b/lib/dialyzer/test/indent_SUITE_data/src/rec/rec_adt.erl
new file mode 100644
index 0000000000..f01cc5e519
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/rec/rec_adt.erl
@@ -0,0 +1,22 @@
+-module(rec_adt).
+
+-export([new/0, get_a/1, get_b/1, set_a/2, set_b/2]).
+
+-record(rec, {a :: atom(), b = 0 :: integer()}).
+
+-opaque rec() :: #rec{}.
+
+-spec new() -> rec().
+new() -> #rec{a = gazonk, b = 42}.
+
+-spec get_a(rec()) -> atom().
+get_a(#rec{a = A}) -> A.
+
+-spec get_b(rec()) -> integer().
+get_b(#rec{b = B}) -> B.
+
+-spec set_a(rec(), atom()) -> rec().
+set_a(R, A) -> R#rec{a = A}.
+
+-spec set_b(rec(), integer()) -> rec().
+set_b(R, B) -> R#rec{b = B}.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/rec/rec_use.erl b/lib/dialyzer/test/indent_SUITE_data/src/rec/rec_use.erl
new file mode 100644
index 0000000000..358e9f918c
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/rec/rec_use.erl
@@ -0,0 +1,30 @@
+-module(rec_use).
+
+-export([ok1/0, ok2/0, wrong1/0, wrong2/0, wrong3/0, wrong4/0]).
+
+ok1() ->
+    rec_adt:set_a(rec_adt:new(), foo).
+
+ok2() ->
+    R1 = rec_adt:new(),
+    B1 = rec_adt:get_b(R1),
+    R2 = rec_adt:set_b(R1, 42),
+    B2 = rec_adt:get_b(R2),
+    B1 =:= B2.
+
+wrong1() ->
+    case rec_adt:new() of
+	{rec, _, 42} -> weird1;
+	R when tuple_size(R) =:= 3 -> weird2
+    end.
+
+wrong2() ->
+    R = list_to_tuple([rec, a, 42]),
+    rec_adt:get_a(R).
+
+wrong3() ->
+    R = rec_adt:new(),
+    R =:= {rec, gazonk, 42}.
+
+wrong4() ->
+    tuple_size(rec_adt:new()).
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/record_construct.erl b/lib/dialyzer/test/indent_SUITE_data/src/record_construct.erl
new file mode 100644
index 0000000000..b250c6ee65
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/record_construct.erl
@@ -0,0 +1,21 @@
+-module(record_construct).
+-export([t_loc/0, t_opa/0, t_rem/0]).
+
+-record(r_loc, {a = gazonk :: integer(), b = 42 :: atom()}).
+
+t_loc() ->
+  #r_loc{}.
+
+-record(r_opa, {a                 :: atom(),
+		b = gb_sets:new() :: gb_sets:set(),
+		c = 42            :: boolean(),
+		d,	% untyped on purpose
+		e = false         :: boolean()}).
+
+t_opa() ->
+  #r_opa{}.
+
+-record(r_rem, {a = gazonk :: string()}).
+
+t_rem() ->
+  #r_rem{}.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/record_creation_diffs.erl b/lib/dialyzer/test/indent_SUITE_data/src/record_creation_diffs.erl
new file mode 100644
index 0000000000..e813459f8e
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/record_creation_diffs.erl
@@ -0,0 +1,11 @@
+-module(record_creation_diffs).
+
+-export([foo/1]).
+
+-record(bar, {
+          some_atom :: atom(),
+          some_list :: list()
+         }).
+
+foo(Input) ->
+    #bar{some_atom = Input, some_list = {this,is,a,tuple}}.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/record_match.erl b/lib/dialyzer/test/indent_SUITE_data/src/record_match.erl
new file mode 100644
index 0000000000..8e9b91937f
--- /dev/null
+++ b/lib/dialyzer/test/indent_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/indent_SUITE_data/src/record_pat.erl b/lib/dialyzer/test/indent_SUITE_data/src/record_pat.erl
new file mode 100644
index 0000000000..3308641571
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/record_pat.erl
@@ -0,0 +1,15 @@
+%%%-------------------------------------------------------------------
+%%% File    : record_pat.erl
+%%% Author  : Tobias Lindahl <>
+%%% Description : Emit warning if a pattern violates the record type
+%%%
+%%% Created : 21 Oct 2008 by Tobias Lindahl <>
+%%%-------------------------------------------------------------------
+-module(record_pat).
+
+-export([t/1]).
+
+-record(foo, {bar :: integer()}).
+
+t(#foo{bar=baz}) -> no_way;
+t(#foo{bar=1}) -> ok.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/record_send_test.erl b/lib/dialyzer/test/indent_SUITE_data/src/record_send_test.erl
new file mode 100644
index 0000000000..87cd97bd85
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/record_send_test.erl
@@ -0,0 +1,32 @@
+%%-------------------------------------------------------------------
+%% File    : record_send_test.erl
+%% Author  : Kostis Sagonas <[email protected]>
+%% Description : A test inspired by a post of Mkcael Remond to the
+%%		 Erlang mailing list suggesting thst Dialyzer should
+%%		 be reporting sends to records rather than to pids.
+%%		 Dialyzer v1.3.0 indeed reports one of the dicrepancies
+%%		 (the one with the 4-tuple) but not the one where the
+%%		 message is sent to a pair which is a record.
+%%		 This should be fixed.
+%%
+%% Created : 10 Apr 2005 by Kostis Sagonas <[email protected]>
+%%-------------------------------------------------------------------
+-module(record_send_test).
+
+-export([t/0]).
+
+-record(rec1, {a=a, b=b, c=c}).
+-record(rec2, {a}).
+
+t() ->
+  t(#rec1{}).
+
+t(Rec1 = #rec1{b=B}) ->
+  Rec2 = some_mod:some_function(),
+  if
+    is_record(Rec2, rec2) ->
+      Rec2 ! hello;	%% currently this one is not found
+    true ->
+      Rec1 ! hello_again
+  end,
+  B.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/record_test.erl b/lib/dialyzer/test/indent_SUITE_data/src/record_test.erl
new file mode 100644
index 0000000000..48a00b172e
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/record_test.erl
@@ -0,0 +1,22 @@
+%%%-------------------------------------------------------------------
+%%% File    : record_test.erl
+%%% Author  : Tobias Lindahl <[email protected]>
+%%% Description :
+%%%
+%%% Created : 22 Oct 2004 by Tobias Lindahl <[email protected]>
+%%%-------------------------------------------------------------------
+-module(record_test).
+
+-export([t/0]).
+
+-record(foo, {bar}).
+
+t() ->
+  doit(foo).
+
+doit(X) ->
+  case X of
+    #foo{} -> error1;
+    foo -> ok;
+    _ -> error2
+  end.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/record_update.erl b/lib/dialyzer/test/indent_SUITE_data/src/record_update.erl
new file mode 100644
index 0000000000..bad7a0a929
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/record_update.erl
@@ -0,0 +1,10 @@
+-module(record_update).
+
+-export([quux/2]).
+
+-record(foo, {bar :: atom()}).
+
+-spec quux(#foo{}, string()) -> #foo{}.
+
+quux(Foo, NotBar) ->
+  Foo#foo{ bar = NotBar }.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/sample_behaviour/sample_behaviour.erl b/lib/dialyzer/test/indent_SUITE_data/src/sample_behaviour/sample_behaviour.erl
new file mode 100644
index 0000000000..116980986b
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/sample_behaviour/sample_behaviour.erl
@@ -0,0 +1,13 @@
+-module(sample_behaviour).
+
+-type custom() :: 1..42.
+
+-callback sample_callback_1() -> term().
+-callback sample_callback_2() -> atom().
+-callback sample_callback_3() -> {'ok', custom()} | 'fail'.
+
+-callback sample_callback_4(term()) -> 'ok'.
+-callback sample_callback_5(custom()) -> 'ok' | 'fail'.
+
+-callback sample_callback_6(custom(), custom(), string()) ->
+    {'ok', custom()} | 'fail'.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/sample_behaviour/sample_callback_correct.erl b/lib/dialyzer/test/indent_SUITE_data/src/sample_behaviour/sample_callback_correct.erl
new file mode 100644
index 0000000000..ab0378e6f0
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/sample_behaviour/sample_callback_correct.erl
@@ -0,0 +1,32 @@
+-module(sample_callback_correct).
+
+-behaviour(sample_behaviour).
+
+-export([
+	 sample_callback_1/0,
+	 sample_callback_2/0,
+	 sample_callback_3/0,
+	 sample_callback_4/1,
+	 sample_callback_5/1,
+	 sample_callback_6/3
+	]).
+
+sample_callback_1() -> 42.       % This is a valid return.
+sample_callback_2() -> foo.      % This is a valid return.
+sample_callback_3() -> {ok, 17}. % This is a valid return.
+sample_callback_4(Input) ->
+    put(mine, Input+1),          % This is valid handling of the input
+    ok.                          % This is a valid return.
+sample_callback_5(Input) ->
+    case Input - 1 < 22 of       % This is valid handling of the input
+	true  -> ok;             % This is a valid return.
+	false -> fail            % This is a valid return.
+    end.
+sample_callback_6(OldNr, NewNr, Reason) ->
+    Diff = NewNr - OldNr,                         % This is valid handling of the input
+    Msg = string:join(["Reason: ", Reason], ","), % This is valid handling of the input
+    case Diff > 0 of
+	true -> put(mine, {NewNr, Msg}),
+		{ok, NewNr};                      % This is a valid return.
+	false -> fail                             % This is a valid return.
+    end.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/sample_behaviour/sample_callback_correct_2.erl b/lib/dialyzer/test/indent_SUITE_data/src/sample_behaviour/sample_callback_correct_2.erl
new file mode 100644
index 0000000000..c218174e58
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/sample_behaviour/sample_callback_correct_2.erl
@@ -0,0 +1,38 @@
+-module(sample_callback_correct_2).
+
+-behaviour(sample_behaviour).
+
+-export([
+	 sample_callback_1/0,
+	 sample_callback_2/0,
+	 sample_callback_3/0,
+	 sample_callback_4/1,
+	 sample_callback_5/1,
+	 sample_callback_6/3,
+	 common_infrastructure/1
+	]).
+
+sample_callback_1() -> 42.       % This is a valid return.
+sample_callback_2() -> halt().   % Crashes are also allowed.
+sample_callback_3() -> {ok, 17}. % This is a valid return.
+sample_callback_4(Input) ->
+    case Input of
+	1 -> common_infrastructure(Input); % This is 'correct' input for
+	_ -> ok                            % common_infrastructure.
+    end.
+sample_callback_5(Input) ->
+    case get(Input) of % This is valid handling of a more generic input
+	true  -> ok;   % This is a valid return.
+	false -> fail  % This is a valid return.
+    end.
+sample_callback_6(OldNr, NewNr, Reason) ->
+    Diff = NewNr - OldNr,                         % This is valid handling of the input
+    Msg = string:join(["Reason: ", Reason], ","), % This is valid handling of the input
+    case Diff > 0 of
+	true -> put(mine, {NewNr, Msg}),
+		{ok, NewNr};                 % This is a valid return.
+	false -> fail                        % This is a valid return.
+    end.
+
+common_infrastructure( 1) ->   'ok';
+common_infrastructure(42) -> 'fail'.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/sample_behaviour/sample_callback_wrong.erl b/lib/dialyzer/test/indent_SUITE_data/src/sample_behaviour/sample_callback_wrong.erl
new file mode 100644
index 0000000000..430494c48c
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/sample_behaviour/sample_callback_wrong.erl
@@ -0,0 +1,26 @@
+-module(sample_callback_wrong).
+
+%% This attribute uses the american spelling of 'behaviour'.
+-behavior(sample_behaviour).
+
+-export([
+%	 sample_callback_1/0,
+	 sample_callback_2/0,
+	 sample_callback_3/0,
+	 sample_callback_4/1,
+	 sample_callback_5/1,
+	 sample_callback_6/3
+	]).
+
+% sample_callback_1() -> 41.  % We can't really break this contract so: missing!
+sample_callback_2() -> 42.    % This is not an atom().
+sample_callback_3() -> fair.  % This is probably a typo.
+sample_callback_4(_) ->       % We cannot break the input.
+    fail.                     % We can definitely return a wrong value however. :)
+sample_callback_5(Input) ->   % Input is treated as an atom, result is a list.
+    atom_to_list(Input).      % Both violate the contract.
+sample_callback_6(OldNr, NewNr, Reason) ->
+    Diff = NewNr - OldNr, % This is valid handling of the input
+    %% Reason should have been treated as a string.
+    Msg = string:join(["Reason: ", atom_to_list(Reason)], ","),
+    {okk, NewNr}. %% This, too, is a typo.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/simple/exact_adt.erl b/lib/dialyzer/test/indent_SUITE_data/src/simple/exact_adt.erl
new file mode 100644
index 0000000000..7103847ae7
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/simple/exact_adt.erl
@@ -0,0 +1,17 @@
+-module(exact_adt).
+
+-export([exact_adt_set_type/1, exact_adt_set_type2/1]).
+
+-export_type([exact_adt/0]).
+
+-record(exact_adt, {}).
+
+-opaque exact_adt() :: #exact_adt{}.
+
+-spec exact_adt_set_type(_) -> exact_adt().
+
+exact_adt_set_type(G) -> G.
+
+-spec exact_adt_set_type2(exact_adt()) -> exact_adt().
+
+exact_adt_set_type2(G) -> G.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/simple/exact_api.erl b/lib/dialyzer/test/indent_SUITE_data/src/simple/exact_api.erl
new file mode 100644
index 0000000000..597460ce77
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/simple/exact_api.erl
@@ -0,0 +1,60 @@
+-module(exact_api).
+
+-export([new/0, exact_api_test/1, exact_api_new/1,
+         exact_adt_test/1, exact_adt_new/1]).
+
+-export_type([exact_api/0]).
+
+-record(digraph, {vtab = notable :: ets:tab(),
+		  etab = notable :: ets:tab(),
+		  ntab = notable :: ets:tab(),
+	          cyclic = true  :: boolean()}).
+
+-spec new() -> digraph:graph().
+
+new() ->
+    A = #digraph{},
+    set_type(A), % does not have an opaque term as 1st argument
+    A.
+
+-spec set_type(digraph:graph()) -> true.
+
+set_type(G) ->
+    digraph:delete(G).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%% The derived spec of exact_api_new() is
+%%% -spec exact_api_new(exact_api:exact_api()) -> exact_api:exact_api().
+%%% This won't happen unless dialyzer_typesig uses
+%%% t_is_exactly_equal() rather than t_is_equal().
+%%% [As of R17B the latter considers two types equal if nothing but
+%%%  their ?opaque tags differ.]
+
+-record(exact_api, {}).
+
+-opaque exact_api() :: #exact_api{}.
+
+exact_api_test(X) ->
+    #exact_api{} = exact_api_set_type(X). % OK
+
+exact_api_new(A) ->
+    A = #exact_api{},
+    _ = exact_api_set_type(A), % OK (the opaque type is local)
+    A.
+
+-spec exact_api_set_type(exact_api()) -> exact_api().
+
+exact_api_set_type(#exact_api{}=E) -> E.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-record(exact_adt, {}).
+
+exact_adt_test(X) ->
+    #exact_adt{} = exact_adt:exact_adt_set_type(X). % breaks the opacity
+
+exact_adt_new(A) ->
+    A = #exact_adt{},
+    _ = exact_adt:exact_adt_set_type2(A), % does not have an opaque term as 1st argument
+    A.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/simple/is_rec.erl b/lib/dialyzer/test/indent_SUITE_data/src/simple/is_rec.erl
new file mode 100644
index 0000000000..b906431b44
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/simple/is_rec.erl
@@ -0,0 +1,65 @@
+-module(is_rec).
+
+-export([ri1/0, ri11/0, ri13/0, ri14/0, ri2/0, ri3/0, ri4/0, ri5/0,
+         ri6/0, ri7/0, ri8/0]).
+
+-record(r, {f1 :: integer()}).
+
+ri1() ->
+    A = simple1_adt:d1(),
+    is_record(A, r). % opaque term 1
+
+ri11() ->
+    A = simple1_adt:d1(),
+    I = '1-3'(),
+    is_record(A, r, I). % opaque term 1
+
+ri13() ->
+    A = simple1_adt:d1(),
+    if is_record(A, r) -> true end. % breaks the opacity
+
+ri14() ->
+    A = simple1_adt:d1(),
+    if is_record({A, 1}, r) -> true end. % breaks the opacity
+
+-type '1-3-t'() :: 1..3.
+
+-spec '1-3'() -> '1-3-t'().
+
+'1-3'() ->
+    random:uniform(3).
+
+
+-spec 'Atom'() -> atom().
+
+'Atom'() ->
+    a.
+
+ri2() ->
+    A = simple1_adt:d1(),
+    R = 'Atom'(),
+    is_record(A, R). % opaque term 1
+
+ri3() ->
+    A = simple1_adt:d1(),
+    is_record(A, A, 1). % opaque term 2
+
+ri4() ->
+    A = simple1_adt:d1(),
+    is_record(A, hipp:hopp(), 1). % opaque term 1
+
+ri5() ->
+    A = simple1_adt:d1(),
+    is_record(A, A, hipp:hopp()). % opaque term 2
+
+ri6() ->
+    A = simple1_adt:d1(),
+    if is_record(A, r) -> true end. % breaks opacity
+
+ri7() ->
+    A = simple1_adt:d1(),
+    if is_record({r, A}, r) -> true end. % A violates #r{}
+
+ri8() ->
+    A = simple1_adt:d1(),
+    is_record({A, 1}, r). % opaque term 1
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/simple/rec_adt.erl b/lib/dialyzer/test/indent_SUITE_data/src/simple/rec_adt.erl
new file mode 100644
index 0000000000..ff80d6e99b
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/simple/rec_adt.erl
@@ -0,0 +1,28 @@
+-module(rec_adt).
+
+-export([f/0, r1/0]).
+
+-export_type([r1/0]).
+
+-export_type([f/0, op_t/0, a/0]).
+
+-opaque a() :: a | b.
+
+-record(r1,
+        {f1 :: a()}).
+
+-opaque r1() :: #r1{}.
+
+-opaque f() :: fun((_) -> _).
+
+-opaque op_t() :: integer().
+
+-spec f() -> f().
+
+f() ->
+    fun(_) -> 3 end.
+
+-spec r1() -> r1().
+
+r1() ->
+    #r1{f1 = a}.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/simple/rec_api.erl b/lib/dialyzer/test/indent_SUITE_data/src/simple/rec_api.erl
new file mode 100644
index 0000000000..59b9e0fec4
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/simple/rec_api.erl
@@ -0,0 +1,123 @@
+-module(rec_api).
+
+-export([t1/0, t2/0, t3/0, adt_t1/0, adt_t1/1, adt_r1/0,
+         t/1, t_adt/0, r/0, r_adt/0, u1/0, u2/0, u3/0, v1/0, v2/0, v3/0]).
+
+-export_type([{a,0},{r1,0}, r2/0, r3/0]).
+
+-export_type([f/0, op_t/0, r/0, tup/0]).
+
+-opaque a() :: a | b.
+
+-record(r1,
+        {f1 :: a()}).
+
+-opaque r1() :: #r1{}.
+
+t1() ->
+    A = #r1{f1 = a},
+    {r1, a} = A.
+
+t2() ->
+    A = {r1, 10},
+    {r1, 10} = A,
+    A = #r1{f1 = 10}, % violates the type of field f1
+    #r1{f1 = 10} = A.
+
+t3() ->
+    A = {r1, 10},
+    #r1{f1 = 10} = A. % violates the type of #r1{}
+
+adt_t1() ->
+    R = rec_adt:r1(),
+    {r1, a} = R. % breaks the opacity
+
+-spec adt_t1(rec_adt:r1()) -> rec_adt:r1(). % invalid type spec
+
+adt_t1(R) ->
+    {r1, a} = R.
+
+-spec adt_r1() -> rec_adt:r1(). % invalid type spec
+
+adt_r1() ->
+    #r1{f1 = a}.
+
+-opaque f() :: fun((_) -> _).
+
+-opaque op_t() :: integer().
+
+-spec t(f()) -> _.
+
+t(A) ->
+    T = term(),
+    %% 3(T), % cannot test this: dialyzer_dep deliberately crashes
+    A(T).
+
+-spec term() -> op_t().
+
+term() ->
+    3.
+
+t_adt() ->
+    A = rec_adt:f(),
+    T = term(),
+    A(T).
+
+-record(r, {f = fun(_) -> 3 end :: f(), o = 1 :: op_t()}).
+
+-opaque r() :: #r{}.
+
+-opaque tup() :: {'r', f(), op_t()}.
+
+-spec r() -> _.
+
+r() ->
+    {{r, f(), 2},
+     #r{f = f(), o = 2}}. % OK, f() is a local opaque type
+
+-spec f() -> f().
+
+f() ->
+    fun(_) -> 3 end.
+
+r_adt() ->
+    {{r, rec_adt:f(), 2},
+     #r{f = rec_adt:f(), o = 2}}. % breaks the opacity
+
+-record(r2, % like #r1{}, but with initial value
+        {f1 = a :: a()}).
+
+-opaque r2() :: #r2{}.
+
+u1() ->
+    A = #r2{f1 = a},
+    {r2, a} = A.
+
+u2() ->
+    A = {r2, 10},
+    {r2, 10} = A,
+    A = #r2{f1 = 10}, % violates the type of field f1
+    #r2{f1 = 10} = A.
+
+u3() ->
+    A = {r2, 10},
+    #r2{f1 = 10} = A. % violates the type of #r2{}
+
+-record(r3, % like #r1{}, but an opaque type
+        {f1 = queue:new():: queue:queue()}).
+
+-opaque r3() :: #r3{}.
+
+v1() ->
+    A = #r3{f1 = queue:new()},
+    {r3, a} = A. % breaks the opacity
+
+v2() ->
+    A = {r3, 10},
+    {r3, 10} = A,
+    A = #r3{f1 = 10}, % violates the type of field f1
+    #r3{f1 = 10} = A.
+
+v3() ->
+    A = {r3, 10},
+    #r3{f1 = 10} = A. % breaks the opacity
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/simple/simple1_adt.erl b/lib/dialyzer/test/indent_SUITE_data/src/simple/simple1_adt.erl
new file mode 100644
index 0000000000..21a277c1e9
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/simple/simple1_adt.erl
@@ -0,0 +1,138 @@
+-module(simple1_adt).
+
+-export([d1/0, d2/0, i/0, n1/0, n2/0, o1/0, o2/0,
+         c1/0, c2/0, bit1/0, a/0, i1/0, tuple/0,
+         b1/0, b2/0, ty_i1/0]).
+
+-export_type([o1/0, o2/0, d1/0, d2/0]).
+
+-export_type([i1/0, i2/0, di1/0, di2/0]).
+
+-export_type([ty_i1/0, c1/0, c2/0]).
+
+-export_type([b1/0, b2/0]).
+
+-export_type([bit1/0]).
+
+-export_type([tuple1/0, a/0, i/0]).
+
+%% Equal:
+
+-opaque o1() :: a | b | c.
+
+-opaque o2() :: a | b | c.
+
+%% Disjoint:
+
+-opaque d1() :: a | b | c.
+
+-opaque d2() :: d | e | f.
+
+%% One common element:
+
+-opaque c1() :: a | b | c.
+
+-opaque c2() :: c | e | f.
+
+%% Equal integer range:
+
+-opaque i1() :: 1 | 2.
+
+-opaque i2() :: 1 | 2.
+
+%% Disjoint integer range:
+
+-opaque di1() :: 1 | 2.
+
+-opaque di2() :: 3 | 4.
+
+
+-type ty_i1() :: 1 | 2.
+
+%% Boolean types
+
+-opaque b1() :: boolean().
+
+-opaque b2() :: boolean().
+
+%% Binary types
+
+-opaque bit1() :: binary().
+
+%% Tuple types
+
+-opaque tuple1() :: tuple().
+
+%% Atom type
+
+-opaque a() :: atom().
+
+-opaque i() :: integer().
+
+-spec d1() -> d1().
+
+d1() -> a.
+
+-spec d2() -> d2().
+
+d2() -> d.
+
+-spec i() -> i().
+
+i() ->
+    1.
+
+-spec n1() -> o1().
+
+n1() -> a.
+
+-spec n2() -> o2().
+
+n2() -> a.
+
+-spec o1() -> o1().
+
+o1() -> a.
+
+-spec o2() -> o2().
+
+o2() -> a.
+
+-spec c1() -> c1().
+
+c1() -> a.
+
+-spec c2() -> c2().
+
+c2() -> e.
+
+-spec bit1() -> bit1().
+
+bit1() ->
+    <<"hej">>.
+
+-spec a() -> a().
+
+a() ->
+    e.
+
+-spec i1() -> i1().
+
+i1() -> 1.
+
+-spec tuple() -> tuple1().
+
+tuple() -> {1,2}.
+
+-spec b1() -> b1().
+
+b1() -> true.
+
+-spec b2() -> b2().
+
+b2() -> false.
+
+-spec ty_i1() -> ty_i1().
+
+ty_i1() ->
+    1.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/simple/simple1_api.erl b/lib/dialyzer/test/indent_SUITE_data/src/simple/simple1_api.erl
new file mode 100644
index 0000000000..d67aa913d8
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/simple/simple1_api.erl
@@ -0,0 +1,571 @@
+-module(simple1_api).
+
+-export([t1/1, adt_t1/1, t2/1, adt_t2/1, tup/0, t3/0, t4/0, t5/0, t6/0, t7/0,
+         t8/0, adt_t3/0, adt_t4/0, adt_t7/0, adt_t8/0, adt_t5/0,
+         c1/2, c2/2, c2/0, c3/0, c4/0, tt1/0, tt2/0,
+         cmp1/0, cmp2/0, cmp3/0, cmp4/0,
+         ty_cmp1/0, ty_cmp2/0, ty_cmp3/0, ty_cmp4/0,
+         f1/0, f2/0, adt_f1/0, adt_f2/0, f3/0, f4/0, adt_f3/0, adt_f4/0,
+         adt_f4_a/0, adt_f4_b/0,
+         bool_t1/0, bool_t2/0, bool_t3/0, bool_t4/0, bool_t5/1, bool_t6/1,
+         bool_t7/0, bool_adt_t1/0, bool_adt_t2/0, bool_adt_t5/1,
+         bool_adt_t6/1, bool_t8/0, bool_adt_t8/2, bool_t9/0, bool_adt_t9/2,
+         bit_t1/0, bit_adt_t1/0, bit_t3/1, bit_adt_t2/0, bit_adt_t3/1,
+         bit_t5/1, bit_t4/1, bit_adt_t4/1, bit_t5/0, bit_adt_t5/0,
+         call_f/1, call_f_adt/1, call_m_adt/1, call_m/1, call_f_i/1,
+         call_m_i/1, call_m_adt_i/1, call_f_adt_i/1,
+         eq1/0, eq2/0, c5/0, c6/2, c7/2, c8/0]).
+
+%%% Equal opaque types
+
+-export_type([o1/0, o2/0]).
+
+-export_type([d1/0, d2/0]).
+
+-opaque o1() :: a | b | c.
+
+-opaque o2() :: a | b | c.
+
+-export_type([i1/0, i2/0, di1/0, di2/0]).
+
+-export_type([b1/0, b2/0]).
+
+-export_type([bit1/0]).
+
+-export_type([a/0, i/0]).
+
+%% The derived spec is
+%%  -spec t1('a' | 'b') -> simple1_api:o1('a') | simple1_api:o2('a').
+%% but that is not tested...
+
+t1(a) ->
+    o1();
+t1(b) ->
+    o2().
+
+-spec o1() -> o1().
+
+o1() -> a.
+
+-spec o2() -> o2().
+
+o2() -> a.
+
+%% The derived spec is
+%% -spec adt_t1('a' | 'b') -> simple1_adt:o1('a') | simple1_adt:o2('a').
+%% but that is not tested...
+
+adt_t1(a) ->
+    simple1_adt:o1();
+adt_t1(b) ->
+    simple1_adt:o2().
+
+%%% Disjunct opaque types
+
+-opaque d1() :: a | b | c.
+
+-opaque d2() :: d | e | f.
+
+%% -spec t2('a' | 'b') -> simple1_api:d1('a') | simple1_api:d2('d').
+
+t2(a) ->
+    d1();
+t2(b) ->
+    d2().
+
+-spec d1() -> d1().
+
+d1() -> a.
+
+-spec d2() -> d2().
+
+d2() -> d.
+
+%% -spec adt_t2('a' | 'b') -> simple1_adt:d1('a') | simple1_adt:d2('d').
+
+adt_t2(a) ->
+    simple1_adt:d1();
+adt_t2(b) ->
+    simple1_adt:d2().
+
+-spec tup() -> simple1_adt:tuple1(). % invalid type spec
+
+tup() ->
+    {a, b}.
+
+%%% Matching equal opaque types with different names
+
+t3() ->
+    A = n1(),
+    B = n2(),
+    A = A, % OK, of course
+    A = B. % OK since o1() and o2() are local opaque types
+
+t4() ->
+    A = n1(),
+    B = n2(),
+    true = A =:= A, % OK, of course
+    A =:= B. % OK since o1() and o2() are local opaque types
+
+t5() ->
+    A = d1(),
+    B = d2(),
+    A =:= B. % can never evaluate to true
+
+t6() ->
+    A = d1(),
+    B = d2(),
+    A = B. % can never succeed
+
+t7() ->
+    A = d1(),
+    B = d2(),
+    A =/= B. % OK (always true?)
+
+t8() ->
+    A = d1(),
+    B = d2(),
+    A /= B. % OK (always true?)
+
+-spec n1() -> o1().
+
+n1() -> a.
+
+-spec n2() -> o2().
+
+n2() -> a.
+
+adt_t3() ->
+    A = simple1_adt:n1(),
+    B = simple1_adt:n2(),
+    true = A =:= A, % OK.
+    A =:= B. % opaque test, not OK
+
+adt_t4() ->
+    A = simple1_adt:n1(),
+    B = simple1_adt:n2(),
+    A = A, % OK
+    A = B. % opaque terms
+
+adt_t7() ->
+    A = simple1_adt:n1(),
+    B = simple1_adt:n2(),
+    false = A =/= A, % OK
+    A =/= B. % opaque test, not OK
+
+adt_t8() ->
+    A = simple1_adt:n1(),
+    B = simple1_adt:n2(),
+    false = A /= A, % OK
+    A /= B. % opaque test, not OK
+
+adt_t5() ->
+    A = simple1_adt:c1(),
+    B = simple1_adt:c2(),
+    A =:= B. % opaque test, not OK
+
+%% Comparison in guard
+
+-spec c1(simple1_adt:d1(), simple1_adt:d2()) -> boolean().
+
+c1(A, B) when A =< B -> true. % succ type of A and B is any() (type spec is OK)
+
+-spec c2(simple1_adt:d1(), simple1_adt:d2()) -> boolean().
+
+c2(A, B) ->
+    if A =< B -> true end. % succ type of A and B is any() (type spec is OK)
+
+c2() ->
+    A = simple1_adt:d1(),
+    B = simple1_adt:d2(),
+    if A =< B -> ok end. % opaque terms
+
+c3() ->
+    B = simple1_adt:d2(),
+    if a =< B -> ok end. % opaque term
+
+c4() ->
+    A = simple1_adt:d1(),
+    if A =< d -> ok end. % opaque term
+
+tt1() ->
+    A = o1(),
+    is_integer(A). % OK
+
+tt2() ->
+    A = simple1_adt:d1(),
+    is_integer(A). % breaks the opacity
+
+%% Comparison with integers
+
+-opaque i1() :: 1 | 2.
+
+-opaque i2() :: 1 | 2.
+
+-opaque di1() :: 1 | 2.
+
+-opaque di2() :: 3 | 4.
+
+-spec i1() -> i1().
+
+i1() -> 1.
+
+-type ty_i1() :: 1 | 2.
+
+-spec ty_i1() -> ty_i1().
+
+ty_i1() -> 1.
+
+cmp1() ->
+    A = i1(),
+    if A > 3 -> ok end. % can never succeed
+
+cmp2() ->
+    A = simple1_adt:i1(),
+    if A > 3 -> ok end. % opaque term
+
+cmp3() ->
+    A = i1(),
+    if A < 3 -> ok end.
+
+cmp4() ->
+    A = simple1_adt:i1(),
+    if A < 3 -> ok end. % opaque term
+
+%% -type
+
+ty_cmp1() ->
+    A = ty_i1(),
+    if A > 3 -> ok end. % can never succeed
+
+ty_cmp2() ->
+    A = simple1_adt:ty_i1(),
+    if A > 3 -> ok end. % can never succeed
+
+ty_cmp3() ->
+    A = ty_i1(),
+    if A < 3 -> ok end.
+
+ty_cmp4() ->
+    A = simple1_adt:ty_i1(),
+    if A < 3 -> ok end.
+
+%% is_function
+
+f1() ->
+    T = n1(),
+    if is_function(T) -> ok end. % can never succeed
+
+f2() ->
+    T = n1(),
+    is_function(T). % ok
+
+adt_f1() ->
+    T = simple1_adt:n1(),
+    if is_function(T) -> ok end. % breaks the opacity
+
+adt_f2() ->
+    T = simple1_adt:n1(),
+    is_function(T). % breaks the opacity
+
+f3() ->
+    A = i1(),
+    T = n1(),
+    if is_function(T, A) -> ok end. % can never succeed
+
+f4() ->
+    A = i1(),
+    T = n1(),
+    is_function(T, A). % ok
+
+adt_f3() ->
+    A = simple1_adt:i1(),
+    T = simple1_adt:n1(),
+    if is_function(T, A) -> ok end. % breaks the opacity
+
+adt_f4() ->
+    A = simple1_adt:i1(),
+    T = simple1_adt:n1(),
+    is_function(T, A). % breaks the opacity
+
+adt_f4_a() ->
+    A = simple1_adt:i1(),
+    T = n1(),
+    is_function(T, A). % opaque term
+
+
+adt_f4_b() ->
+    A = i1(),
+    T = simple1_adt:n1(),
+    is_function(T, A). % breaks the opacity
+
+%% A few Boolean examples
+
+bool_t1() ->
+    B = b2(),
+    if B -> ok end. % B =:= true can never succeed
+
+bool_t2() ->
+    A = b1(),
+    B = b2(),
+    if A and not B -> ok end.
+
+bool_t3() ->
+    A = b1(),
+    if not A -> ok end. % can never succeed
+
+bool_t4() ->
+    A = n1(),
+    if not ((A >= 1) and not (A < 1)) -> ok end. % can never succeed
+
+-spec bool_t5(i1()) -> integer().
+
+bool_t5(A) ->
+    if [not (A > 1)] =:=
+       [false]-> 1 end.
+
+-spec bool_t6(b1()) -> integer().
+
+bool_t6(A) ->
+    if [not A] =:=
+       [false]-> 1 end.
+
+-spec bool_t7() -> integer().
+
+bool_t7() ->
+    A = i1(),
+    if [not A] =:= % cannot succeed
+       [false]-> 1 end.
+
+bool_adt_t1() ->
+    B = simple1_adt:b2(),
+    if B -> ok end. % opaque term
+
+bool_adt_t2() ->
+    A = simple1_adt:b1(),
+    B = simple1_adt:b2(),
+    if A and not B -> ok end. % opaque term
+
+-spec bool_adt_t5(simple1_adt:i1()) -> integer().
+
+bool_adt_t5(A) ->
+    if [not (A > 1)] =:= % succ type of A is any() (type spec is OK)
+       [false]-> 1 end.
+
+-spec bool_adt_t6(simple1_adt:b1()) -> integer(). % invalid type spec
+
+bool_adt_t6(A) ->
+    if [not A] =:= % succ type of A is 'true'
+       [false]-> 1 end.
+
+-spec bool_t8() -> integer().
+
+bool_t8() ->
+    A = i1(),
+    if [A and A] =:= % cannot succeed
+       [false]-> 1 end.
+
+-spec bool_adt_t8(simple1_adt:b1(), simple1_adt:b2()) -> integer(). % invalid
+
+bool_adt_t8(A, B) ->
+    if [A and B] =:=
+       [false]-> 1 end.
+
+-spec bool_t9() -> integer().
+
+bool_t9() ->
+    A = i1(),
+    if [A or A] =:= % cannot succeed
+       [false]-> 1 end.
+
+-spec bool_adt_t9(simple1_adt:b1(), simple1_adt:b2()) -> integer(). % invalid
+
+bool_adt_t9(A, B) ->
+    if [A or B] =:=
+       [false]-> 1 end.
+
+-opaque b1() :: boolean().
+
+-opaque b2() :: boolean().
+
+-spec b1() -> b1().
+
+b1() -> true.
+
+-spec b2() -> b2().
+
+b2() -> false.
+
+%% Few (very few...) examples with bit syntax
+
+bit_t1() ->
+    A = i1(),
+    <<100:(A)>>.
+
+bit_adt_t1() ->
+    A = simple1_adt:i1(),
+    <<100:(A)>>. % breaks the opacity
+
+bit_t3(A) ->
+    B = i1(),
+    case none:none() of
+        <<A:B>> -> 1
+    end.
+
+bit_adt_t2() ->
+    A = simple1_adt:i1(),
+    case <<"hej">> of
+        <<_:A>> -> ok % breaks the opacity (but the message is strange)
+    end.
+
+
+bit_adt_t3(A) ->
+    B = simple1_adt:i1(),
+    case none:none() of
+        <<A:  % breaks the opacity (the message is less than perfect)
+          B>> -> 1
+    end.
+
+bit_t5(A) ->
+    B = o1(),
+    case none:none() of % the type is any(); should fix that XXX
+        <<A:B>> -> 1 % can never match (local opaque type is OK)
+    end.
+
+-spec bit_t4(<<_:1>>) -> integer().
+
+bit_t4(A) ->
+    Sz = i1(),
+    case A of
+        <<_:Sz>> -> 1
+    end.
+
+-spec bit_adt_t4(<<_:1>>) -> integer().
+
+bit_adt_t4(A) ->
+    Sz = simple1_adt:i1(),
+    case A of
+        <<_:Sz>> -> 1 % breaks the opacity
+    end.
+
+bit_t5() ->
+    A = bit1(),
+    case A of
+        <<_/binary>> -> 1
+    end.
+
+bit_adt_t5() ->
+    A = simple1_adt:bit1(),
+    case A of
+        <<_/binary>> -> 1 % breaks the opacity
+    end.
+
+-opaque bit1() :: binary().
+
+-spec bit1() -> bit1().
+
+bit1() ->
+    <<"hej">>.
+
+%% Calls with variable module or function
+
+call_f(A) ->
+    A = a(),
+    foo:A(A).
+
+call_f_adt(A) ->
+    A = simple1_adt:a(),
+    foo:A(A). % breaks the opacity
+
+call_m(A) ->
+    A = a(),
+    A:foo(A).
+
+call_m_adt(A) ->
+    A = simple1_adt:a(),
+    A:foo(A). % breaks the opacity
+
+-opaque a() :: atom().
+
+-opaque i() :: integer().
+
+-spec a() -> a().
+
+a() ->
+    e.
+
+call_f_i(A) ->
+    A = i(),
+    foo:A(A). % A is not atom() but i()
+
+call_f_adt_i(A) ->
+    A = simple1_adt:i(),
+    foo:A(A). % A is not atom() but simple1_adt:i()
+
+call_m_i(A) ->
+    A = i(),
+    A:foo(A). % A is not atom() but i()
+
+call_m_adt_i(A) ->
+    A = simple1_adt:i(),
+    A:foo(A). % A is not atom() but simple1_adt:i()
+
+-spec eq1() -> integer().
+
+eq1() ->
+    A = simple1_adt:d2(),
+    B = simple1_adt:d1(),
+    if
+        A == B -> % opaque terms
+            0;
+        A == A ->
+            1;
+        A =:= A -> % compiler finds this one cannot match
+            2;
+        true -> % compiler finds this one cannot match
+            3
+    end.
+
+eq2() ->
+    A = simple1_adt:d1(),
+    if
+        {A} >= {A} ->
+            1;
+        A >= 3 -> % opaque term
+            2;
+        A == 3 -> % opaque term
+            3;
+        A =:= 3 -> % opaque term
+            4;
+        A == A ->
+            5;
+        A =:= A -> % compiler finds this one cannot match
+            6
+    end.
+
+c5() ->
+    A = simple1_adt:d1(),
+    A < 3. % opaque term
+
+c6(A, B) ->
+    A = simple1_adt:d1(),
+    B = simple1_adt:d1(),
+    A =< B. % same type - no warning
+
+c7(A, B) ->
+    A = simple1_adt:d1(),
+    B = simple1_adt:d2(),
+    A =< B. % opaque terms
+
+c8() ->
+    D = digraph:new(),
+    E = ets:new(foo, []),
+    if {D, a} > {D, E} -> true; % OK
+       {1.0, 2} > {{D}, {E}} -> true; % OK
+       {D, 3} > {D, E} -> true  % opaque term 2
+    end.
+
+-spec i() -> i().
+
+i() ->
+    1.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/simple/simple2_api.erl b/lib/dialyzer/test/indent_SUITE_data/src/simple/simple2_api.erl
new file mode 100644
index 0000000000..c86f6fd0b5
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/simple/simple2_api.erl
@@ -0,0 +1,125 @@
+-module(simple2_api).
+
+-export([c1/2, c2/0, c3/0, c4/1, c5/1, c6/0, c6_b/0, c7/0, c7_b/0,
+         c7_c/0, c8/0, c9/0, c10/0, c11/0, c12/0, c13/0, c14/0, c15/0,
+         c16/0, c17/0, c18/0, c19/0, c20/0, c21/0, c22/0, c23/0,
+         c24/0, c25/0, c26/0]).
+
+-spec c1(simple1_adt:d1(), simple1_adt:d2()) -> boolean().
+
+c1(A, B) ->
+    {A} =< {B}. % succ type of A and B is any()
+
+c2() ->
+    A = simple1_adt:d1(),
+    erlang:make_tuple(1, A). % ok
+
+c3() ->
+    A = simple1_adt:d1(),
+    setelement(1, {A}, A). % ok
+
+c4(_) ->
+    A = simple1_adt:d1(),
+    halt(A). % ok (BIF fails...)
+
+c5(_) ->
+    A = simple1_adt:d1(),
+    [A] -- [A]. % ok
+
+c6() ->
+    A = simple1_adt:d1(),
+    A ! foo. % opaque term
+
+c6_b() ->
+    A = simple1_adt:d1(),
+    erlang:send(A, foo). % opaque term
+
+c7() ->
+    A = simple1_adt:d1(),
+    foo ! A. % ok
+
+c7_b() ->
+    A = simple1_adt:d1(),
+    erlang:send(foo, A). % ok
+
+c7_c() ->
+    A = simple1_adt:d1(),
+    erlang:send(foo, A, []). % ok
+
+c8() ->
+    A = simple1_adt:d1(),
+    A < 3. % opaque term
+
+c9() ->
+    A = simple1_adt:d1(),
+    lists:keysearch(A, 1, []). % ok
+
+c10() ->
+    A = simple1_adt:d1(),
+    lists:keysearch(1, A, []). % opaque term 2
+
+c11() ->
+    A = simple1_adt:tuple(),
+    lists:keysearch(key, 1, [A]). % ok
+
+c12() ->
+    A = simple1_adt:tuple(),
+    lists:keysearch(key, 1, A). % opaque term 3
+
+c13() ->
+    A = simple1_adt:tuple(),
+    lists:keysearch(key, 1, [{A,2}]). % ok
+
+c14() ->
+    A = simple1_adt:tuple(),
+    lists:keysearch(key, 1, [{2,A}]). % ok
+
+c15() ->
+    A = simple1_adt:d1(),
+    lists:keysearch(key, 1, [A]). % ok
+
+c16() ->
+    A = simple1_adt:tuple(),
+    erlang:send(foo, A). % ok
+
+c17() ->
+    A = simple1_adt:tuple(),
+    lists:reverse([A]). % ok
+
+c18() ->
+    A = simple1_adt:tuple(),
+    lists:keyreplace(a, 1, [A], {1,2}). % ok
+
+c19() ->
+    A = simple1_adt:tuple(),
+    %% Problem. The spec says argument 4 is a tuple(). Fix that!
+    lists:keyreplace(a, 1, [{1,2}], A). % opaque term 4
+
+c20() ->
+    A = simple1_adt:tuple(),
+    lists:flatten(A). % opaque term 1
+
+c21() ->
+    A = simple1_adt:tuple(),
+    lists:flatten([[{A}]]). % ok
+
+c22() ->
+    A = simple1_adt:tuple(),
+    lists:flatten([[A]]). % ok
+
+c23() ->
+    A = simple1_adt:tuple(),
+    lists:flatten([A]). % ok
+
+c24() ->
+    A = simple1_adt:tuple(),
+    lists:flatten({A}). % will never return
+
+c25() ->
+    A = simple1_adt:d1(),
+    B = simple1_adt:tuple(),
+    if {A,3} > {A,B} -> true end. % opaque 2nd argument
+
+c26() ->
+    B = simple1_adt:tuple(),
+    tuple_to_list(B). % opaque term 1
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/suppress_request.erl b/lib/dialyzer/test/indent_SUITE_data/src/suppress_request.erl
new file mode 100644
index 0000000000..c4275fa110
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/suppress_request.erl
@@ -0,0 +1,50 @@
+-module(suppress_request).
+
+-export([test1/1, test1_b/1, test2/0, test2_b/0,
+         test3/0, test3_b/0, test4/0, test4_b/0]).
+
+-dialyzer({[specdiffs], test1/1}).
+-spec test1(a | b) -> ok. % spec is subtype
+test1(A) ->
+    ok = test1_1(A).
+
+-spec test1_b(a | b) -> ok. % spec is subtype (suppressed by default)
+test1_b(A) ->
+    ok = test1_1(A).
+
+-spec test1_1(a | b | c) -> ok.
+test1_1(_) ->
+    ok.
+
+-dialyzer(unmatched_returns).
+test2() ->
+    tuple(), % unmatched
+    ok.
+
+test2_b() ->
+    tuple(), % unmatched
+    ok.
+
+-dialyzer({[no_return, no_match], [test3/0]}).
+test3() -> % no local return (suppressed)
+    A = fun(_) ->
+                1
+        end,
+    A = 2. % can never succeed (suppressed)
+
+test3_b() -> % no local return (requested by default)
+    A = fun(_) ->
+                1
+        end,
+    A = 2. % can never succeed (requested by default)
+
+-dialyzer(no_improper_lists).
+test4() ->
+    [1 | 2]. % improper list (suppressed)
+
+-dialyzer({no_improper_lists, test4_b/0}).
+test4_b() ->
+    [1 | 2]. % improper list (suppressed)
+
+tuple() ->
+    {a, b}.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/trec.erl b/lib/dialyzer/test/indent_SUITE_data/src/trec.erl
new file mode 100644
index 0000000000..516358f7c6
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/trec.erl
@@ -0,0 +1,39 @@
+%%
+%% The current treatment of typed records leaves much to be desired.
+%% These are not made up examples; I have cases like that the branch
+%% of the HiPE compiler with types in records. I get very confusing
+%% warnings which require a lot of effort to find their cause and why
+%% a function has no local return.
+%%
+-module(trec).
+-export([test/0, mk_foo_exp/2]).
+
+-record(foo, {a :: integer() | 'undefined', b :: [atom()]}).
+
+%%
+%% For these functions we currently get the following warnings:
+%%   1. Function test/0 has no local return
+%%   2. The call trec:mk_foo_loc(42,any()) will fail since it differs
+%%      in argument position 1 from the success typing arguments:
+%%      ('undefined',atom())
+%%   3. Function mk_foo_loc/2 has no local return
+%%
+%% Arguably, the second warning is not what most users have in mind when
+%% they wrote the type declarations in the 'foo' record, so no doubt
+%% they'll find it confusing. But note that it is also quite confusing!
+%% Many users may be wondering: How come there is a success typing for a
+%% function that has no local return? Running typer on this module
+%% reveals a success typing for this function that is interesting indeed.
+%%
+test() ->
+   mk_foo_loc(42, some_mod:some_function()).
+
+mk_foo_loc(A, B) ->
+    #foo{a = A, b = [A,B]}.
+
+%%
+%% For this function we used to get a "has no local return" warning
+%% but we got no reason. This has now been fixed.
+%%
+mk_foo_exp(A, B) when is_integer(A) ->
+    #foo{a = A, b = [A,B]}.
diff --git a/lib/dialyzer/test/indent_SUITE_data/src/whereis_control_flow1.erl b/lib/dialyzer/test/indent_SUITE_data/src/whereis_control_flow1.erl
new file mode 100644
index 0000000000..e65f6c3e23
--- /dev/null
+++ b/lib/dialyzer/test/indent_SUITE_data/src/whereis_control_flow1.erl
@@ -0,0 +1,17 @@
+%% This tests the presence of possible races due to a whereis/register
+%% combination. It takes into account control flow that might exist.
+
+-module(whereis_control_flow1).
+-export([start/2]).
+
+start(AnAtom, Fun) ->
+  case whereis(AnAtom) of
+    undefined ->
+      Pid = spawn(Fun),
+      case Pid =:= self() of
+        true -> ok;
+        false -> register(AnAtom, Pid)
+      end;
+    P when is_pid(P) ->
+      ok
+  end.
diff --git a/lib/dialyzer/test/map_SUITE_data/dialyzer_options b/lib/dialyzer/test/map_SUITE_data/dialyzer_options
index 02425c33f2..1ddeb02c27 100644
--- a/lib/dialyzer/test/map_SUITE_data/dialyzer_options
+++ b/lib/dialyzer/test/map_SUITE_data/dialyzer_options
@@ -1,2 +1,2 @@
-{dialyzer_options, []}.
+{dialyzer_options, [{indent_opt, false}]}.
 {time_limit, 30}.
diff --git a/lib/dialyzer/test/map_SUITE_data/results/contract b/lib/dialyzer/test/map_SUITE_data/results/contract
index 0f6e1d0c65..620ec8e6b1 100644
--- a/lib/dialyzer/test/map_SUITE_data/results/contract
+++ b/lib/dialyzer/test/map_SUITE_data/results/contract
@@ -1,7 +1,7 @@
 
 contract.erl:10: Function t2/0 has no local return
-contract.erl:10: The call missing:f(#{'a':=1, 'c':=4}) breaks the contract (#{'a':=1,'b'=>2,'c'=>3}) -> 'ok'
+contract.erl:10: The call missing:f(#{'a'=>1, 'c'=>4}) breaks the contract (#{'a':=1,'b'=>2,'c'=>3}) -> 'ok'
 contract.erl:12: Function t3/0 has no local return
-contract.erl:12: The call missing:f(#{'a':=1, 'b':=2, 'e':=3}) breaks the contract (#{'a':=1,'b'=>2,'c'=>3}) -> 'ok'
+contract.erl:12: The call missing:f(#{'a'=>1, 'b'=>2, 'e'=>3}) breaks the contract (#{'a':=1,'b'=>2,'c'=>3}) -> 'ok'
 contract.erl:8: Function t1/0 has no local return
-contract.erl:8: The call missing:f(#{'b':=2}) breaks the contract (#{'a':=1,'b'=>2,'c'=>3}) -> 'ok'
+contract.erl:8: The call missing:f(#{'b'=>2}) breaks the contract (#{'a':=1,'b'=>2,'c'=>3}) -> 'ok'
diff --git a/lib/dialyzer/test/map_SUITE_data/results/guard_update b/lib/dialyzer/test/map_SUITE_data/results/guard_update
index 98df23907f..f6de2158fc 100644
--- a/lib/dialyzer/test/map_SUITE_data/results/guard_update
+++ b/lib/dialyzer/test/map_SUITE_data/results/guard_update
@@ -1,5 +1,5 @@
 
 guard_update.erl:5: Function t/0 has no local return
-guard_update.erl:6: The call guard_update:f(#{'a':=2}) will never return since it differs in the 1st argument from the success typing arguments: (#{'b':=_, _=>_})
+guard_update.erl:6: The call guard_update:f(#{'a'=>2}) will never return since it differs in the 1st argument from the success typing arguments: (#{'b':=_, _=>_})
 guard_update.erl:8: Clause guard cannot succeed. The variable M was matched against the type #{'a':=2}
 guard_update.erl:8: Function f/1 has no local return
diff --git a/lib/dialyzer/test/map_SUITE_data/results/map_galore b/lib/dialyzer/test/map_SUITE_data/results/map_galore
index 9a140de255..6d1f4ff2bf 100644
--- a/lib/dialyzer/test/map_SUITE_data/results/map_galore
+++ b/lib/dialyzer/test/map_SUITE_data/results/map_galore
@@ -2,11 +2,11 @@
 map_galore.erl:1000: A key of type 42 cannot exist in a map of type #{1:='a', 2:='b', 4:='d', 5:='e', float()=>'c' | 'v'}
 map_galore.erl:1080: A key of type 'nonexisting' cannot exist in a map of type #{10:='a0', 11:='a1', 12:='a2', 13:='a3', 14:='a4', 15:='a5', 16:='a6', 17:='a7', 18:='a8', 19:='a9', 20:='b0', 21:='b1', 22:='b2', 23:='b3', 24:='b4', 25:='b5', 26:='b6', 27:='b7', 28:='b8', 29:='b9', 30:=[48 | 99,...], 31:=[49 | 99,...], 32:=[50 | 99,...], 33:=[51 | 99,...], 34:=[52 | 99,...], 35:=[53 | 99,...], 36:=[54 | 99,...], 37:=[55 | 99,...], 38:=[56 | 99,...], 39:=[57 | 99,...], <<_:16>> | [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57,...] | float() | {[[48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57,...],...]} | #{'k16'=>'a6', 'k26'=>'b6', 'k36'=>[54 | 99,...], 'map'=>'key', 'one'=>'small', 'second'=>'small', 'third'=>'small', 10=>'a0', 11=>'a1', 12=>'a2', 13=>'a3', 14=>'a4', 15=>'a5', 16=>'a6', 17=>'a7', 18=>'a8', 19=>'a9', 20=>'b0', 21=>'b1', 22=>'b2', 23=>'b3', 24=>'b4', 25=>'b5', 26=>'b6', 27=>'b7', 28=>'b8', 29=>'b9', 30=>[48 | 99,...], 31=>[49 | 99,...], 32=>[50 | 99,...], 33=>[51 | 99,...], 34=>[52 | 99,...], 35=>[53 | 99,...], 36=>[54 | 99,...], 37=>[55 | 99,...], 38=>[56 | 99,...], 39=>[57 | 99,...], <<_:16>> | [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57,...] | {[[48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57,...],...]}=>[48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 | 100 | 101,...]}=>atom() | [1..255,...]}
 map_galore.erl:1082: A key of type 42 cannot exist in a map of type #{10:='a0', 11:='a1', 12:='a2', 13:='a3', 14:='a4', 15:='a5', 16:='a6', 17:='a7', 18:='a8', 19:='a9', 20:='b0', 21:='b1', 22:='b2', 23:='b3', 24:='b4', 25:='b5', 26:='b6', 27:='b7', 28:='b8', 29:='b9', 30:=[48 | 99,...], 31:=[49 | 99,...], 32:=[50 | 99,...], 33:=[51 | 99,...], 34:=[52 | 99,...], 35:=[53 | 99,...], 36:=[54 | 99,...], 37:=[55 | 99,...], 38:=[56 | 99,...], 39:=[57 | 99,...], <<_:16>> | [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57,...] | float() | {[[48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57,...],...]} | #{'k16'=>'a6', 'k26'=>'b6', 'k36'=>[54 | 99,...], 'map'=>'key', 'one'=>'small', 'second'=>'small', 'third'=>'small', 10=>'a0', 11=>'a1', 12=>'a2', 13=>'a3', 14=>'a4', 15=>'a5', 16=>'a6', 17=>'a7', 18=>'a8', 19=>'a9', 20=>'b0', 21=>'b1', 22=>'b2', 23=>'b3', 24=>'b4', 25=>'b5', 26=>'b6', 27=>'b7', 28=>'b8', 29=>'b9', 30=>[48 | 99,...], 31=>[49 | 99,...], 32=>[50 | 99,...], 33=>[51 | 99,...], 34=>[52 | 99,...], 35=>[53 | 99,...], 36=>[54 | 99,...], 37=>[55 | 99,...], 38=>[56 | 99,...], 39=>[57 | 99,...], <<_:16>> | [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57,...] | {[[48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57,...],...]}=>[48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 | 100 | 101,...]}=>atom() | [1..255,...]}
-map_galore.erl:1140: The call map_galore:map_guard_sequence_1(#{'seq':=6, 'val':=[101,...]}) will never return since it differs in the 1st argument from the success typing arguments: (#{'seq':=1 | 2 | 3 | 4 | 5, 'val':=[97 | 98 | 99 | 100 | 101,...], 10=>'a0', 11=>'a1', 12=>'a2', 13=>'a3', 14=>'a4', 15=>'a5', 16=>'a6', 17=>'a7', 18=>'a8', 19=>'a9', 20=>'b0', 21=>'b1', 22=>'b2', 23=>'b3', 24=>'b4', 25=>'b5', 26=>'b6', 27=>'b7', 28=>'b8', 29=>'b9', 30=>[48 | 99,...], 31=>[49 | 99,...], 32=>[50 | 99,...], 33=>[51 | 99,...], 34=>[52 | 99,...], 35=>[53 | 99,...], 36=>[54 | 99,...], 37=>[55 | 99,...], 38=>[56 | 99,...], 39=>[57 | 99,...], <<_:16>> | [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57,...] | float() | {[any(),...]} | #{'k16'=>'a6', 'k26'=>'b6', 'k36'=>[any(),...], 'map'=>'key', 'one'=>'small', 'second'=>'small', 'third'=>'small', 10=>'a0', 11=>'a1', 12=>'a2', 13=>'a3', 14=>'a4', 15=>'a5', 16=>'a6', 17=>'a7', 18=>'a8', 19=>'a9', 20=>'b0', 21=>'b1', 22=>'b2', 23=>'b3', 24=>'b4', 25=>'b5', 26=>'b6', 27=>'b7', 28=>'b8', 29=>'b9', 30=>[any(),...], 31=>[any(),...], 32=>[any(),...], 33=>[any(),...], 34=>[any(),...], 35=>[any(),...], 36=>[any(),...], 37=>[any(),...], 38=>[any(),...], 39=>[any(),...], <<_:16>> | [any(),...] | {_}=>[any(),...]}=>atom() | [1..255,...]})
-map_galore.erl:1141: The call map_galore:map_guard_sequence_2(#{'b':=5}) will never return since it differs in the 1st argument from the success typing arguments: (#{'a':='gg' | 'kk' | 'sc' | 3 | 4, 'b'=>'other' | 3 | 4 | 5, 'c'=>'sc2', 10=>'a0', 11=>'a1', 12=>'a2', 13=>'a3', 14=>'a4', 15=>'a5', 16=>'a6', 17=>'a7', 18=>'a8', 19=>'a9', 20=>'b0', 21=>'b1', 22=>'b2', 23=>'b3', 24=>'b4', 25=>'b5', 26=>'b6', 27=>'b7', 28=>'b8', 29=>'b9', 30=>[48 | 99,...], 31=>[49 | 99,...], 32=>[50 | 99,...], 33=>[51 | 99,...], 34=>[52 | 99,...], 35=>[53 | 99,...], 36=>[54 | 99,...], 37=>[55 | 99,...], 38=>[56 | 99,...], 39=>[57 | 99,...], <<_:16>> | [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57,...] | float() | {[any(),...]} | #{'k16'=>'a6', 'k26'=>'b6', 'k36'=>[any(),...], 'map'=>'key', 'one'=>'small', 'second'=>'small', 'third'=>'small', 10=>'a0', 11=>'a1', 12=>'a2', 13=>'a3', 14=>'a4', 15=>'a5', 16=>'a6', 17=>'a7', 18=>'a8', 19=>'a9', 20=>'b0', 21=>'b1', 22=>'b2', 23=>'b3', 24=>'b4', 25=>'b5', 26=>'b6', 27=>'b7', 28=>'b8', 29=>'b9', 30=>[any(),...], 31=>[any(),...], 32=>[any(),...], 33=>[any(),...], 34=>[any(),...], 35=>[any(),...], 36=>[any(),...], 37=>[any(),...], 38=>[any(),...], 39=>[any(),...], <<_:16>> | [any(),...] | {_}=>[any(),...]}=>atom() | [1..255,...]})
+map_galore.erl:1140: The call map_galore:map_guard_sequence_1(#{'seq'=>6, 'val'=>"e"}) will never return since it differs in the 1st argument from the success typing arguments: (#{'seq':=1 | 2 | 3 | 4 | 5, 'val':=[97 | 98 | 99 | 100 | 101,...], 10=>'a0', 11=>'a1', 12=>'a2', 13=>'a3', 14=>'a4', 15=>'a5', 16=>'a6', 17=>'a7', 18=>'a8', 19=>'a9', 20=>'b0', 21=>'b1', 22=>'b2', 23=>'b3', 24=>'b4', 25=>'b5', 26=>'b6', 27=>'b7', 28=>'b8', 29=>'b9', 30=>[48 | 99,...], 31=>[49 | 99,...], 32=>[50 | 99,...], 33=>[51 | 99,...], 34=>[52 | 99,...], 35=>[53 | 99,...], 36=>[54 | 99,...], 37=>[55 | 99,...], 38=>[56 | 99,...], 39=>[57 | 99,...], <<_:16>> | [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57,...] | float() | {[any(),...]} | #{'k16'=>'a6', 'k26'=>'b6', 'k36'=>[any(),...], 'map'=>'key', 'one'=>'small', 'second'=>'small', 'third'=>'small', 10=>'a0', 11=>'a1', 12=>'a2', 13=>'a3', 14=>'a4', 15=>'a5', 16=>'a6', 17=>'a7', 18=>'a8', 19=>'a9', 20=>'b0', 21=>'b1', 22=>'b2', 23=>'b3', 24=>'b4', 25=>'b5', 26=>'b6', 27=>'b7', 28=>'b8', 29=>'b9', 30=>[any(),...], 31=>[any(),...], 32=>[any(),...], 33=>[any(),...], 34=>[any(),...], 35=>[any(),...], 36=>[any(),...], 37=>[any(),...], 38=>[any(),...], 39=>[any(),...], <<_:16>> | [any(),...] | {_}=>[any(),...]}=>atom() | [1..255,...]})
+map_galore.erl:1141: The call map_galore:map_guard_sequence_2(#{'b'=>5}) will never return since it differs in the 1st argument from the success typing arguments: (#{'a':='gg' | 'kk' | 'sc' | 3 | 4, 'b'=>'other' | 3 | 4 | 5, 'c'=>'sc2', 10=>'a0', 11=>'a1', 12=>'a2', 13=>'a3', 14=>'a4', 15=>'a5', 16=>'a6', 17=>'a7', 18=>'a8', 19=>'a9', 20=>'b0', 21=>'b1', 22=>'b2', 23=>'b3', 24=>'b4', 25=>'b5', 26=>'b6', 27=>'b7', 28=>'b8', 29=>'b9', 30=>[48 | 99,...], 31=>[49 | 99,...], 32=>[50 | 99,...], 33=>[51 | 99,...], 34=>[52 | 99,...], 35=>[53 | 99,...], 36=>[54 | 99,...], 37=>[55 | 99,...], 38=>[56 | 99,...], 39=>[57 | 99,...], <<_:16>> | [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57,...] | float() | {[any(),...]} | #{'k16'=>'a6', 'k26'=>'b6', 'k36'=>[any(),...], 'map'=>'key', 'one'=>'small', 'second'=>'small', 'third'=>'small', 10=>'a0', 11=>'a1', 12=>'a2', 13=>'a3', 14=>'a4', 15=>'a5', 16=>'a6', 17=>'a7', 18=>'a8', 19=>'a9', 20=>'b0', 21=>'b1', 22=>'b2', 23=>'b3', 24=>'b4', 25=>'b5', 26=>'b6', 27=>'b7', 28=>'b8', 29=>'b9', 30=>[any(),...], 31=>[any(),...], 32=>[any(),...], 33=>[any(),...], 34=>[any(),...], 35=>[any(),...], 36=>[any(),...], 37=>[any(),...], 38=>[any(),...], 39=>[any(),...], <<_:16>> | [any(),...] | {_}=>[any(),...]}=>atom() | [1..255,...]})
 map_galore.erl:1209: The call map_galore:map_guard_sequence_1(#{'seq':=6, 'val':=[101,...], 10:='a0', 11:='a1', 12:='a2', 13:='a3', 14:='a4', 15:='a5', 16:='a6', 17:='a7', 18:='a8', 19:='a9', 20:='b0', 21:='b1', 22:='b2', 23:='b3', 24:='b4', 25:='b5', 26:='b6', 27:='b7', 28:='b8', 29:='b9', 30:=[48 | 99,...], 31:=[49 | 99,...], 32:=[50 | 99,...], 33:=[51 | 99,...], 34:=[52 | 99,...], 35:=[53 | 99,...], 36:=[54 | 99,...], 37:=[55 | 99,...], 38:=[56 | 99,...], 39:=[57 | 99,...], <<_:16>> | [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57,...] | float() | {[[48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57,...] | 3,...]} | #{'k16'=>'a6', 'k26'=>'b6', 'k36'=>[54 | 99,...], 'map'=>'key', 'one'=>'small', 'second'=>'small', 'third'=>'small', 10=>'a0', 11=>'a1', 12=>'a2', 13=>'a3', 14=>'a4', 15=>'a5', 16=>'a6', 17=>'a7', 18=>'a8', 19=>'a9', 20=>'b0', 21=>'b1', 22=>'b2', 23=>'b3', 24=>'b4', 25=>'b5', 26=>'b6', 27=>'b7', 28=>'b8', 29=>'b9', 30=>[48 | 99,...], 31=>[49 | 99,...], 32=>[50 | 99,...], 33=>[51 | 99,...], 34=>[52 | 99,...], 35=>[53 | 99,...], 36=>[54 | 99,...], 37=>[55 | 99,...], 38=>[56 | 99,...], 39=>[57 | 99,...], <<_:16>> | [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57,...] | {[[48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57,...],...]}=>[48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 | 100 | 101,...]}=>atom() | [1..255,...]}) will never return since it differs in the 1st argument from the success typing arguments: (#{'seq':=1 | 2 | 3 | 4 | 5, 'val':=[97 | 98 | 99 | 100 | 101,...], 10=>'a0', 11=>'a1', 12=>'a2', 13=>'a3', 14=>'a4', 15=>'a5', 16=>'a6', 17=>'a7', 18=>'a8', 19=>'a9', 20=>'b0', 21=>'b1', 22=>'b2', 23=>'b3', 24=>'b4', 25=>'b5', 26=>'b6', 27=>'b7', 28=>'b8', 29=>'b9', 30=>[48 | 99,...], 31=>[49 | 99,...], 32=>[50 | 99,...], 33=>[51 | 99,...], 34=>[52 | 99,...], 35=>[53 | 99,...], 36=>[54 | 99,...], 37=>[55 | 99,...], 38=>[56 | 99,...], 39=>[57 | 99,...], <<_:16>> | [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57,...] | float() | {[any(),...]} | #{'k16'=>'a6', 'k26'=>'b6', 'k36'=>[any(),...], 'map'=>'key', 'one'=>'small', 'second'=>'small', 'third'=>'small', 10=>'a0', 11=>'a1', 12=>'a2', 13=>'a3', 14=>'a4', 15=>'a5', 16=>'a6', 17=>'a7', 18=>'a8', 19=>'a9', 20=>'b0', 21=>'b1', 22=>'b2', 23=>'b3', 24=>'b4', 25=>'b5', 26=>'b6', 27=>'b7', 28=>'b8', 29=>'b9', 30=>[any(),...], 31=>[any(),...], 32=>[any(),...], 33=>[any(),...], 34=>[any(),...], 35=>[any(),...], 36=>[any(),...], 37=>[any(),...], 38=>[any(),...], 39=>[any(),...], <<_:16>> | [any(),...] | {_}=>[any(),...]}=>atom() | [1..255,...]})
 map_galore.erl:1210: The call map_galore:map_guard_sequence_2(#{'b':=5, 10:='a0', 11:='a1', 12:='a2', 13:='a3', 14:='a4', 15:='a5', 16:='a6', 17:='a7', 18:='a8', 19:='a9', 20:='b0', 21:='b1', 22:='b2', 23:='b3', 24:='b4', 25:='b5', 26:='b6', 27:='b7', 28:='b8', 29:='b9', 30:=[48 | 99,...], 31:=[49 | 99,...], 32:=[50 | 99,...], 33:=[51 | 99,...], 34:=[52 | 99,...], 35:=[53 | 99,...], 36:=[54 | 99,...], 37:=[55 | 99,...], 38:=[56 | 99,...], 39:=[57 | 99,...], <<_:16>> | [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57,...] | float() | {[[48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57,...] | 3,...]} | #{'k16'=>'a6', 'k26'=>'b6', 'k36'=>[54 | 99,...], 'map'=>'key', 'one'=>'small', 'second'=>'small', 'third'=>'small', 10=>'a0', 11=>'a1', 12=>'a2', 13=>'a3', 14=>'a4', 15=>'a5', 16=>'a6', 17=>'a7', 18=>'a8', 19=>'a9', 20=>'b0', 21=>'b1', 22=>'b2', 23=>'b3', 24=>'b4', 25=>'b5', 26=>'b6', 27=>'b7', 28=>'b8', 29=>'b9', 30=>[48 | 99,...], 31=>[49 | 99,...], 32=>[50 | 99,...], 33=>[51 | 99,...], 34=>[52 | 99,...], 35=>[53 | 99,...], 36=>[54 | 99,...], 37=>[55 | 99,...], 38=>[56 | 99,...], 39=>[57 | 99,...], <<_:16>> | [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57,...] | {[[48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57,...],...]}=>[48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 | 100 | 101,...]}=>atom() | [1..255,...]}) will never return since it differs in the 1st argument from the success typing arguments: (#{'a':='gg' | 'kk' | 'sc' | 3 | 4, 'b'=>'other' | 3 | 4 | 5, 'c'=>'sc2', 10=>'a0', 11=>'a1', 12=>'a2', 13=>'a3', 14=>'a4', 15=>'a5', 16=>'a6', 17=>'a7', 18=>'a8', 19=>'a9', 20=>'b0', 21=>'b1', 22=>'b2', 23=>'b3', 24=>'b4', 25=>'b5', 26=>'b6', 27=>'b7', 28=>'b8', 29=>'b9', 30=>[48 | 99,...], 31=>[49 | 99,...], 32=>[50 | 99,...], 33=>[51 | 99,...], 34=>[52 | 99,...], 35=>[53 | 99,...], 36=>[54 | 99,...], 37=>[55 | 99,...], 38=>[56 | 99,...], 39=>[57 | 99,...], <<_:16>> | [48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57,...] | float() | {[any(),...]} | #{'k16'=>'a6', 'k26'=>'b6', 'k36'=>[any(),...], 'map'=>'key', 'one'=>'small', 'second'=>'small', 'third'=>'small', 10=>'a0', 11=>'a1', 12=>'a2', 13=>'a3', 14=>'a4', 15=>'a5', 16=>'a6', 17=>'a7', 18=>'a8', 19=>'a9', 20=>'b0', 21=>'b1', 22=>'b2', 23=>'b3', 24=>'b4', 25=>'b5', 26=>'b6', 27=>'b7', 28=>'b8', 29=>'b9', 30=>[any(),...], 31=>[any(),...], 32=>[any(),...], 33=>[any(),...], 34=>[any(),...], 35=>[any(),...], 36=>[any(),...], 37=>[any(),...], 38=>[any(),...], 39=>[any(),...], <<_:16>> | [any(),...] | {_}=>[any(),...]}=>atom() | [1..255,...]})
-map_galore.erl:1418: Fun application with arguments (#{'s':='none', 'v':='none'}) will never return since it differs in the 1st argument from the success typing arguments: (#{'s':='l' | 't' | 'v', 'v':='none' | <<_:16>> | [<<_:16>>,...] | {<<_:16>>,<<_:16>>}})
+map_galore.erl:1418: Fun application with arguments (#{'s'=>'none', 'v'=>'none'}) will never return since it differs in the 1st argument from the success typing arguments: (#{'s':='l' | 't' | 'v', 'v':='none' | <<_:16>> | [<<_:16>>,...] | {<<_:16>>,<<_:16>>}})
 map_galore.erl:1491: The test #{} =:= #{'a':=1} can never evaluate to 'true'
 map_galore.erl:1492: The test #{'a':=1} =:= #{} can never evaluate to 'true'
 map_galore.erl:1495: The test #{'a':=1} =:= #{'a':=2} can never evaluate to 'true'
@@ -15,13 +15,13 @@ map_galore.erl:1497: The test #{'a':=2, 'b':=1} =:= #{'a':=1, 'b':=3} can never
 map_galore.erl:1498: The test #{'a':=1, 'b':=1} =:= #{'a':=1, 'b':=3} can never evaluate to 'true'
 map_galore.erl:1762: The call maps:get({1, 1},#{{1,float()}=>[101 | 108 | 112 | 116 | 117,...]}) will never return since the success typing arguments are (any(),map())
 map_galore.erl:1763: The call maps:get('a',#{}) will never return since the success typing arguments are (any(),map())
-map_galore.erl:1765: The call maps:get('a',#{'b':=1, 'c':=2}) will never return since the success typing arguments are (any(),map())
+map_galore.erl:1765: The call maps:get('a',#{'b'=>1, 'c'=>2}) will never return since the success typing arguments are (any(),map())
 map_galore.erl:186: The pattern #{'x':=2} can never match the type #{'x':=3}
 map_galore.erl:187: The pattern #{'x':=3} can never match the type {'a','b','c'}
 map_galore.erl:188: The pattern #{'x':=3} can never match the type #{'y':=3}
 map_galore.erl:189: The pattern #{'x':=3} can never match the type #{'x':=[101 | 104 | 114 | 116,...]}
 map_galore.erl:2280: Cons will produce an improper list since its 2nd argument is {'b','a'}
-map_galore.erl:2280: The call maps:from_list(nonempty_improper_list({'a','b'},{'b','a'})) will never return since it differs in the 1st argument from the success typing arguments: ([{_,_}])
+map_galore.erl:2280: The call maps:from_list([{'a', 'b'} | {'b', 'a'}]) will never return since it differs in the 1st argument from the success typing arguments: ([{_,_}])
 map_galore.erl:2281: The call maps:from_list('a') will never return since it differs in the 1st argument from the success typing arguments: ([{_,_}])
 map_galore.erl:2282: The call maps:from_list(42) will never return since it differs in the 1st argument from the success typing arguments: ([{_,_}])
 map_galore.erl:997: A key of type 'nonexisting' cannot exist in a map of type #{}
diff --git a/lib/dialyzer/test/map_SUITE_data/results/typesig b/lib/dialyzer/test/map_SUITE_data/results/typesig
index fb2f851a7d..6a79fe35f1 100644
--- a/lib/dialyzer/test/map_SUITE_data/results/typesig
+++ b/lib/dialyzer/test/map_SUITE_data/results/typesig
@@ -1,5 +1,5 @@
 
 typesig.erl:5: Function t1/0 has no local return
-typesig.erl:5: The call typesig:test(#{'a':=1}) will never return since it differs in the 1st argument from the success typing arguments: (#{'a':={number()}, _=>_})
+typesig.erl:5: The call typesig:test(#{'a'=>1}) will never return since it differs in the 1st argument from the success typing arguments: (#{'a':={number()}, _=>_})
 typesig.erl:6: Function t2/0 has no local return
 typesig.erl:6: The call typesig:test(#{'a':={'b'}}) will never return since it differs in the 1st argument from the success typing arguments: (#{'a':={number()}, _=>_})
diff --git a/lib/dialyzer/test/opaque_SUITE_data/dialyzer_options b/lib/dialyzer/test/opaque_SUITE_data/dialyzer_options
index cb301ff6a1..8551a47541 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/dialyzer_options
+++ b/lib/dialyzer/test/opaque_SUITE_data/dialyzer_options
@@ -1,2 +1,2 @@
-{dialyzer_options, [{warnings, [no_unused, no_return]}]}.
+{dialyzer_options, [{indent_opt, false}, {warnings, [no_unused, no_return]}]}.
 {time_limit, 40}.
diff --git a/lib/dialyzer/test/opaque_SUITE_data/results/dict b/lib/dialyzer/test/opaque_SUITE_data/results/dict
index 3f8242c72d..bda9bfc09f 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/results/dict
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/dict
@@ -10,6 +10,6 @@ dict_use.erl:64: Guard test length(D::dict:dict(_,_)) breaks the opacity of its
 dict_use.erl:65: Guard test is_atom(D::dict:dict(_,_)) breaks the opacity of its argument
 dict_use.erl:66: Guard test is_list(D::dict:dict(_,_)) breaks the opacity of its argument
 dict_use.erl:70: The type test is_list(dict:dict(_,_)) breaks the opacity of the term dict:dict(_,_)
-dict_use.erl:73: The call dict:fetch('foo',[1 | 2 | 3,...]) does not have an opaque term of type dict:dict(_,_) as 2nd argument
-dict_use.erl:76: The call dict:merge(Fun::any(),42,[1 | 2,...]) does not have opaque terms as 2nd and 3rd arguments
-dict_use.erl:79: The call dict:store(42,'elli',{'dict',0,16,16,8,80,48,{[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]},{{[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]}}}) does not have an opaque term of type dict:dict(_,_) as 3rd argument
+dict_use.erl:73: The call dict:fetch('foo',[1, 2, 3]) does not have an opaque term of type dict:dict(_,_) as 2nd argument
+dict_use.erl:76: The call dict:merge(Fun::any(),42,[1, 2]) does not have opaque terms as 2nd and 3rd arguments
+dict_use.erl:79: The call dict:store(42,'elli',{'dict', 0, 16, 16, 8, 80, 48, {[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []}, {{[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []}}}) does not have an opaque term of type dict:dict(_,_) as 3rd argument
diff --git a/lib/dialyzer/test/opaque_SUITE_data/results/para b/lib/dialyzer/test/opaque_SUITE_data/results/para
index 37b5b7b44e..eca445315c 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/results/para
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/para
@@ -29,5 +29,6 @@ para4.erl:74: Attempt to test for equality between a term of type para4_adt:int(
 para4.erl:79: Attempt to test for equality between a term of type para4_adt:int(2 | 3 | 4) and a term of opaque type para4_adt:int(5 | 6 | 7)
 para4.erl:84: Attempt to test for equality between a term of type para4_adt:un(3 | 4) and a term of opaque type para4_adt:un(1 | 2)
 para4.erl:89: Attempt to test for equality between a term of type para4_adt:tup({_,_}) and a term of opaque type para4_adt:tup(tuple())
+para4.erl:94: Attempt to test for equality between a term of type para4_adt:t(#{1=>'a'}) and a term of opaque type para4_adt:t(#{2=>'b'})
 para5.erl:13: Attempt to test for inequality between a term of type para5_adt:dd(atom()) and a term of opaque type para5_adt:d()
 para5.erl:8: The test para5_adt:d() =:= para5_adt:d() can never evaluate to 'true'
diff --git a/lib/dialyzer/test/opaque_SUITE_data/results/queue b/lib/dialyzer/test/opaque_SUITE_data/results/queue
index 9822b7168f..8f9373e8e4 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/results/queue
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/queue
@@ -1,11 +1,11 @@
 
-queue_use.erl:18: The call queue:is_empty({[],[]}) does not have an opaque term of type queue:queue(_) as 1st argument
+queue_use.erl:18: The call queue:is_empty({[], []}) does not have an opaque term of type queue:queue(_) as 1st argument
 queue_use.erl:22: The call queue:in(42,Q0::{[],[]}) does not have an opaque term of type queue:queue(_) as 2nd argument
 queue_use.erl:27: The attempt to match a term of type queue:queue(_) against the pattern {"*", Q2} breaks the opacity of the term
 queue_use.erl:33: Attempt to test for equality between a term of type {[42,...],[]} and a term of opaque type queue:queue(_)
 queue_use.erl:36: The attempt to match a term of type queue:queue(_) against the pattern {F, _R} breaks the opacity of the term
-queue_use.erl:40: The call queue:out({[42,...],[]}) does not have an opaque term of type queue:queue(_) as 1st argument
+queue_use.erl:40: The call queue:out({"*", []}) does not have an opaque term of type queue:queue(_) as 1st argument
 queue_use.erl:51: The call queue_use:is_in_queue(E::42,DB::#db{p::[],q::queue:queue(_)}) contains an opaque term as 2nd argument when terms of different types are expected in these positions
 queue_use.erl:56: The attempt to match a term of type #db{p::[],q::queue:queue(_)} against the pattern {'db', _, {L1, L2}} breaks the opacity of queue:queue(_)
-queue_use.erl:62: The call queue_use:tuple_queue({42,'gazonk'}) does not have a term of type {_,queue:queue(_)} (with opaque subterms) as 1st argument
+queue_use.erl:62: The call queue_use:tuple_queue({42, 'gazonk'}) does not have a term of type {_,queue:queue(_)} (with opaque subterms) as 1st argument
 queue_use.erl:65: The call queue:in(F::42,Q::'gazonk') does not have an opaque term of type queue:queue(_) as 2nd argument
diff --git a/lib/dialyzer/test/opaque_SUITE_data/results/simple b/lib/dialyzer/test/opaque_SUITE_data/results/simple
index 5cd8916aee..5d13b56970 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/results/simple
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/simple
@@ -51,7 +51,7 @@ simple1_api.erl:294: The call erlang:is_function(T::simple1_api:o1(),A::simple1_
 simple1_api.erl:300: The type test is_function(T::simple1_adt:o1(),A::simple1_api:i1()) breaks the opacity of the term T::simple1_adt:o1()
 simple1_api.erl:306: Guard test B::simple1_api:b2() =:= 'true' can never succeed
 simple1_api.erl:315: Guard test A::simple1_api:b1() =:= 'false' can never succeed
-simple1_api.erl:319: Guard test not('and'('true','true')) can never succeed
+simple1_api.erl:319: Guard test not(and('true','true')) can never succeed
 simple1_api.erl:337: Clause guard cannot succeed.
 simple1_api.erl:342: Guard test B::simple1_adt:b2() =:= 'true' contains an opaque term as 1st argument
 simple1_api.erl:347: Guard test A::simple1_adt:b1() =:= 'true' contains an opaque term as 1st argument
@@ -63,9 +63,9 @@ simple1_api.erl:381: Invalid type specification for function simple1_api:bool_ad
 simple1_api.erl:407: The size simple1_adt:i1() breaks the opacity of A
 simple1_api.erl:418: The attempt to match a term of type non_neg_integer() against the variable A breaks the opacity of simple1_adt:i1()
 simple1_api.erl:425: The attempt to match a term of type non_neg_integer() against the variable B breaks the opacity of simple1_adt:i1()
-simple1_api.erl:432: The pattern <<_:B/integer-unit:1>> can never match the type any()
+simple1_api.erl:432: The pattern <<_:B>> can never match the type any()
 simple1_api.erl:448: The attempt to match a term of type non_neg_integer() against the variable Sz breaks the opacity of simple1_adt:i1()
-simple1_api.erl:460: The attempt to match a term of type simple1_adt:bit1() against the pattern <<_/binary-unit:8>> breaks the opacity of the term
+simple1_api.erl:460: The attempt to match a term of type simple1_adt:bit1() against the pattern <<_/binary>> breaks the opacity of the term
 simple1_api.erl:478: The call 'foo':A(A::simple1_adt:a()) breaks the opacity of the term A :: simple1_adt:a()
 simple1_api.erl:486: The call A:'foo'(A::simple1_adt:a()) breaks the opacity of the term A :: simple1_adt:a()
 simple1_api.erl:499: The call 'foo':A(A::simple1_api:i()) requires that A is of type atom() not simple1_api:i()
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/para/para4.erl b/lib/dialyzer/test/opaque_SUITE_data/src/para/para4.erl
index b9794672a9..8cd049169d 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/src/para/para4.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/para/para4.erl
@@ -88,6 +88,11 @@ adt_tt13() ->
     I2 = adt_tup2(),
     I1 =:= I2. % opaque attempt
 
+adt_tt14() ->
+    I1 = adt_map(),
+    I2 = adt_map2(),
+    I1 =:= I2.
+
 y3() ->
     {a, 3}.
 
@@ -132,3 +137,9 @@ adt_tup() ->
 
 adt_tup2() ->
     para4_adt:tup2().
+
+adt_map() ->
+    para4_adt:map().
+
+adt_map2() ->
+    para4_adt:map2().
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/para/para4_adt.erl b/lib/dialyzer/test/opaque_SUITE_data/src/para/para4_adt.erl
index 407dd198a7..06a6c22677 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/src/para/para4_adt.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/para/para4_adt.erl
@@ -8,6 +8,8 @@
 
 -export([tup/0, tup2/0]).
 
+-export([map/0, map2/0]).
+
 -export_type([t/1, y/1, int/1, tup/1, un/1]).
 
 -type ai() :: atom() | integer().
@@ -106,3 +108,13 @@ tup() ->
 
 tup2() ->
     foo:tup2().
+
+-spec map() -> t(#{2 => b}).
+
+map() ->
+    foo:map().
+
+-spec map2() -> t(#{1 => a}).
+
+map2() ->
+    foo:map2().
diff --git a/lib/dialyzer/test/options1_SUITE_data/dialyzer_options b/lib/dialyzer/test/options1_SUITE_data/dialyzer_options
index c612e77d3e..ef5887a1eb 100644
--- a/lib/dialyzer/test/options1_SUITE_data/dialyzer_options
+++ b/lib/dialyzer/test/options1_SUITE_data/dialyzer_options
@@ -1,2 +1,2 @@
-{dialyzer_options, [{include_dirs, ["my_include"]}, {defines, [{'COMPILER_VSN', 42}]}, {warnings, [no_improper_lists]}]}.
+{dialyzer_options, [{indent_opt, false}, {include_dirs, ["my_include"]}, {defines, [{'COMPILER_VSN', 42}]}, {warnings, [no_improper_lists]}]}.
 {time_limit, 30}.
diff --git a/lib/dialyzer/test/options1_SUITE_data/results/compiler b/lib/dialyzer/test/options1_SUITE_data/results/compiler
index e1dc038800..121163d7ca 100644
--- a/lib/dialyzer/test/options1_SUITE_data/results/compiler
+++ b/lib/dialyzer/test/options1_SUITE_data/results/compiler
@@ -6,8 +6,8 @@ beam_disasm.erl:537: The variable X can never match since previous clauses compl
 beam_type.erl:284: The pattern <'pi', 0> can never match the type <_,1 | 2>
 beam_validator.erl:396: Matching of pattern {'vst', 'none', _} tagged with a record name violates the declared type of #vst{current::#st{ct::[]}}
 beam_validator.erl:690: The pattern <'term', OldT> can never match the type <{'tuple',[any(),...]},_>
-beam_validator.erl:693: Guard test 'or'('false','false') can never succeed
-beam_validator.erl:700: Guard test 'or'('false','false') can never succeed
+beam_validator.erl:693: Guard test or('false','false') can never succeed
+beam_validator.erl:700: Guard test or('false','false') can never succeed
 beam_validator.erl:702: The pattern <'number', OldT = {Type, _}> can never match the type <{'tuple',[any(),...]},_>
 beam_validator.erl:705: The pattern <'bool', {'atom', A}> can never match the type <{'tuple',[any(),...]},_>
 beam_validator.erl:707: The pattern <{'atom', A}, 'bool'> can never match the type <{'tuple',[any(),...]},_>
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 ea92613781..3606b21932 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
@@ -272,7 +272,7 @@ valfun_1(if_end, Vst) ->
 valfun_1({try_case_end,Src}, Vst) ->
     assert_term(Src, Vst),
     kill_state(Vst);
-%% Instructions that can not cause exceptions
+%% Instructions that cannot cause exceptions
 valfun_1({move,Src,Dst}, Vst) ->
     Type = get_term_type(Src, Vst),
     set_type_reg(Type, Dst, Vst);
diff --git a/lib/dialyzer/test/options2_SUITE_data/dialyzer_options b/lib/dialyzer/test/options2_SUITE_data/dialyzer_options
index be57e2de72..6492098d01 100644
--- a/lib/dialyzer/test/options2_SUITE_data/dialyzer_options
+++ b/lib/dialyzer/test/options2_SUITE_data/dialyzer_options
@@ -1 +1 @@
-{dialyzer_options, [{defines, [{'vsn', 4}]}, {warnings, [unknown, no_return]}]}.
+{dialyzer_options, [{indent_opt, false}, {defines, [{'vsn', 4}]}, {warnings, [unknown, no_return]}]}.
diff --git a/lib/dialyzer/test/overspecs_SUITE_data/dialyzer_options b/lib/dialyzer/test/overspecs_SUITE_data/dialyzer_options
index ff4517e59d..f581ad6607 100644
--- a/lib/dialyzer/test/overspecs_SUITE_data/dialyzer_options
+++ b/lib/dialyzer/test/overspecs_SUITE_data/dialyzer_options
@@ -1 +1 @@
-{dialyzer_options, [{warnings, [overspecs]}]}.
+{dialyzer_options, [{indent_opt, false}, {warnings, [overspecs]}]}.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/dialyzer_options b/lib/dialyzer/test/r9c_SUITE_data/dialyzer_options
index e00e23bb66..ab6c9439ad 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/dialyzer_options
+++ b/lib/dialyzer/test/r9c_SUITE_data/dialyzer_options
@@ -1,2 +1,2 @@
-{dialyzer_options, [{defines, [{vsn, 42}]}]}.
+{dialyzer_options, [{indent_opt, false}, {defines, [{vsn, 42}]}]}.
 {time_limit, 20}.
diff --git a/lib/dialyzer/test/r9c_SUITE_data/results/asn1 b/lib/dialyzer/test/r9c_SUITE_data/results/asn1
index 1cf03346ee..6e51b972af 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/results/asn1
+++ b/lib/dialyzer/test/r9c_SUITE_data/results/asn1
@@ -87,7 +87,7 @@ asn1rt_per_bin.erl:2127: Cons will produce an improper list since its 2nd argume
 asn1rt_per_bin.erl:2129: Cons will produce an improper list since its 2nd argument is integer()
 asn1rt_per_bin.erl:446: The variable _ can never match since previous clauses completely covered the type integer()
 asn1rt_per_bin.erl:467: The variable _ can never match since previous clauses completely covered the type integer()
-asn1rt_per_bin.erl:474: The pattern <{_N, <<_:8/integer-unit:1,Bs/binary-unit:8>>}, C> can never match since previous clauses completely covered the type <{0,_},integer()>
+asn1rt_per_bin.erl:474: The pattern <{_N, <<_,Bs/binary>>}, C> can never match since previous clauses completely covered the type <{0,_},integer()>
 asn1rt_per_bin.erl:487: The variable _ can never match since previous clauses completely covered the type integer()
 asn1rt_per_bin.erl:498: The variable _ can never match since previous clauses completely covered the type integer()
 asn1rt_per_bin_rt2ct.erl:152: The call asn1rt_per_bin_rt2ct:getbit({0,maybe_improper_list()}) will never return since it differs in the 1st argument from the success typing arguments: (<<_:8,_:_*8>> | {non_neg_integer(),<<_:1,_:_*1>>})
@@ -95,7 +95,7 @@ asn1rt_per_bin_rt2ct.erl:1533: The pattern {'BMPString', {'octets', Ol}} can nev
 asn1rt_per_bin_rt2ct.erl:1875: The pattern {Name, Val} can never match since previous clauses completely covered the type any()
 asn1rt_per_bin_rt2ct.erl:443: The variable _ can never match since previous clauses completely covered the type integer()
 asn1rt_per_bin_rt2ct.erl:464: The variable _ can never match since previous clauses completely covered the type integer()
-asn1rt_per_bin_rt2ct.erl:471: The pattern <{_N, <<_B:8/integer-unit:1,Bs/binary-unit:8>>}, C> can never match since previous clauses completely covered the type <{0,_},integer()>
+asn1rt_per_bin_rt2ct.erl:471: The pattern <{_N, <<_B,Bs/binary>>}, C> can never match since previous clauses completely covered the type <{0,_},integer()>
 asn1rt_per_bin_rt2ct.erl:484: The variable _ can never match since previous clauses completely covered the type integer()
 asn1rt_per_bin_rt2ct.erl:495: The variable _ can never match since previous clauses completely covered the type integer()
 asn1rt_per_v1.erl:1209: The pattern <_, 'true', _> can never match the type <_,'false',_>
diff --git a/lib/dialyzer/test/r9c_SUITE_data/results/inets b/lib/dialyzer/test/r9c_SUITE_data/results/inets
index d377f34978..31e9f031ce 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/results/inets
+++ b/lib/dialyzer/test/r9c_SUITE_data/results/inets
@@ -21,9 +21,9 @@ httpd_manager.erl:885: The pattern {'EXIT', Reason} can never match since previo
 httpd_manager.erl:919: Function auth_status/1 will never be called
 httpd_manager.erl:926: Function sec_status/1 will never be called
 httpd_manager.erl:933: Function acceptor_status/1 will never be called
-httpd_request_handler.erl:374: The call httpd_response:send_status(Info::#mod{parsed_header::maybe_improper_list()},417,[32 | 66 | 98 | 100 | 103 | 105 | 111 | 116 | 121,...]) will never return since it differs in the 2nd argument from the success typing arguments: (#mod{socket_type::'ip_comm' | {'ssl',_}},100 | 301 | 304 | 400 | 401 | 403 | 404 | 412 | 414 | 416 | 500 | 501 | 503,any())
-httpd_request_handler.erl:378: The call httpd_response:send_status(Info::#mod{parsed_header::maybe_improper_list()},417,[32 | 77 | 97 | 100 | 101 | 104 | 108 | 110 | 111 | 116 | 119,...]) will never return since it differs in the 2nd argument from the success typing arguments: (#mod{socket_type::'ip_comm' | {'ssl',_}},100 | 301 | 304 | 400 | 401 | 403 | 404 | 412 | 414 | 416 | 500 | 501 | 503,any())
-httpd_request_handler.erl:401: The call httpd_response:send_status(Info::#mod{parsed_header::maybe_improper_list()},417,[32 | 77 | 97 | 100 | 101 | 104 | 108 | 110 | 111 | 116 | 119,...]) will never return since it differs in the 2nd argument from the success typing arguments: (#mod{socket_type::'ip_comm' | {'ssl',_}},100 | 301 | 304 | 400 | 401 | 403 | 404 | 412 | 414 | 416 | 500 | 501 | 503,any())
+httpd_request_handler.erl:374: The call httpd_response:send_status(Info::#mod{parsed_header::maybe_improper_list()},417,"Body to big") will never return since it differs in the 2nd argument from the success typing arguments: (#mod{socket_type::'ip_comm' | {'ssl',_}},100 | 301 | 304 | 400 | 401 | 403 | 404 | 412 | 414 | 416 | 500 | 501 | 503,any())
+httpd_request_handler.erl:378: The call httpd_response:send_status(Info::#mod{parsed_header::maybe_improper_list()},417,"Method not allowed") will never return since it differs in the 2nd argument from the success typing arguments: (#mod{socket_type::'ip_comm' | {'ssl',_}},100 | 301 | 304 | 400 | 401 | 403 | 404 | 412 | 414 | 416 | 500 | 501 | 503,any())
+httpd_request_handler.erl:401: The call httpd_response:send_status(Info::#mod{parsed_header::maybe_improper_list()},417,"Method not allowed") will never return since it differs in the 2nd argument from the success typing arguments: (#mod{socket_type::'ip_comm' | {'ssl',_}},100 | 301 | 304 | 400 | 401 | 403 | 404 | 412 | 414 | 416 | 500 | 501 | 503,any())
 httpd_request_handler.erl:649: Guard test [{_,_}] =:= Trailers::nonempty_string() can never succeed
 httpd_sup.erl:63: The variable Else can never match since previous clauses completely covered the type {'error',_} | {'ok',[any()],_,_}
 httpd_sup.erl:88: The pattern {'error', Reason} can never match the type {'ok',_,_}
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen_ber.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen_ber.erl
index 1d065b3723..88b464a721 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen_ber.erl
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen_ber.erl
@@ -300,7 +300,7 @@ gen_encode_prim(_Erules,D,DoTag,Value) when record(D,type) ->
 	'ASN1_OPEN_TYPE' ->
 	    emit_encode_func('open_type', Value,DoTag);
 	XX ->
-	    exit({'can not encode' ,XX})
+	    exit({'cannot encode' ,XX})
     end.
 
 
@@ -562,7 +562,7 @@ gen_dec_prim(Erules,Att,BytesVar,DoTag,TagIn,Length,_Form,OptOrMand) ->
 		      BytesVar,","]),
 		false;
 	    Other ->
-		exit({'can not decode' ,Other})
+		exit({'cannot decode' ,Other})
 	end,
 
     NewLength = case DoLength of
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen_ber_bin_v2.erl b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen_ber_bin_v2.erl
index 9164ec6551..573bb15c92 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen_ber_bin_v2.erl
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/asn1/asn1ct_gen_ber_bin_v2.erl
@@ -290,7 +290,7 @@ gen_encode_prim(_Erules,D,DoTag,Value) when record(D,type) ->
 	'ASN1_OPEN_TYPE' ->
 	    emit_encode_func('open_type', Value,DoTag);
 	XX ->
-	    exit({'can not encode' ,XX})
+	    exit({'cannot encode' ,XX})
     end.
 
 
@@ -602,7 +602,7 @@ gen_dec_prim(_Erules,Att,BytesVar,DoTag,_TagIn,_Form,_OptOrMand) ->
 		  BytesVar,","]),
 	    add_func({decode_open_type_as_binary,2});
 	Other ->
-	    exit({'can not decode' ,Other})
+	    exit({'cannot decode' ,Other})
     end,
 
     case {DoTag,NewTypeName} of
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_responsecontrol.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_responsecontrol.erl
index a997db6880..53eeedc29f 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_responsecontrol.erl
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_responsecontrol.erl
@@ -71,7 +71,7 @@ do_responsecontrol(Info) ->
 
 
 %% If a client sends more then one of the if-XXXX fields in a request
-%% The standard says it does not specify the behaviuor so I specified it :-)
+%% The standard says it does not specify the behaviour so I specified it :-)
 %% The priority between the fields is
 %% 1.If-modified
 %% 2.If-Unmodified
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_lib.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_lib.erl
index 4008f8d789..9e0cdac2dc 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_lib.erl
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_lib.erl
@@ -779,7 +779,7 @@ error_desc(no_transaction) -> "Operation not allowed outside transactions";
 error_desc(combine_error)  -> "Table options were ilegally combined";
 error_desc(bad_index)  -> "Index already exists or was out of bounds";
 error_desc(already_exists) -> "Some schema option we try to set is already on";
-error_desc(index_exists)-> "Some ops can not  be performed on tabs with index";
+error_desc(index_exists)-> "Some ops cannot  be performed on tabs with index";
 error_desc(no_exists)-> "Tried to perform op on non-existing (non alive) item";
 error_desc(system_limit) -> "Some system_limit was exhausted";
 error_desc(mnesia_down) -> "A transaction involving objects at some remote "
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_tm.erl b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_tm.erl
index af49ceff72..b4e9edb7ce 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_tm.erl
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_tm.erl
@@ -1529,7 +1529,7 @@ commit_participant(Coord, Tid, Bin, C0, DiscNs, _RamNs) ->
     ?eval_debug_fun({?MODULE, commit_participant, pre}, [{tid, Tid}]),
     case catch mnesia_schema:prepare_commit(Tid, C0, {part, Coord}) of
 	{Modified, C, DumperMode} when record(C, commit) ->
-	    %% If we can not find any local unclear decision
+	    %% If we cannot find any local unclear decision
 	    %% we should presume abort at startup recovery
 	    case lists:member(node(), DiscNs) of
 		false ->
diff --git a/lib/dialyzer/test/race_SUITE_data/dialyzer_options b/lib/dialyzer/test/race_SUITE_data/dialyzer_options
index 44e1720715..2be2f47dda 100644
--- a/lib/dialyzer/test/race_SUITE_data/dialyzer_options
+++ b/lib/dialyzer/test/race_SUITE_data/dialyzer_options
@@ -1 +1 @@
-{dialyzer_options, [{warnings, [race_conditions]}]}.
+{dialyzer_options, [{indent_opt, false}, {warnings, [race_conditions]}]}.
diff --git a/lib/dialyzer/test/race_SUITE_data/results/ets_insert_double1 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_double1
index b640b91271..2473bf5d01 100644
--- a/lib/dialyzer/test/race_SUITE_data/results/ets_insert_double1
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_double1
@@ -1,4 +1,4 @@
 
 ets_insert_double1.erl:15: The call ets:insert('foo',[{'pass',[number()]} | {'random',integer()},...]) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup('foo','random') call in ets_insert_double1.erl on line 10, the ets:lookup('foo','pass') call in ets_insert_double1.erl on line 27
 ets_insert_double1.erl:19: The call ets:insert('foo',[{'pass',[number()]} | {'random',integer()},...]) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup('foo','random') call in ets_insert_double1.erl on line 10, the ets:lookup('foo','pass') call in ets_insert_double1.erl on line 27
-ets_insert_double1.erl:24: The call ets:insert('foo',{'pass','empty'}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup('foo','pass') call in ets_insert_double1.erl on line 22
+ets_insert_double1.erl:24: The call ets:insert('foo',{'pass', 'empty'}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup('foo','pass') call in ets_insert_double1.erl on line 22
diff --git a/lib/dialyzer/test/small_SUITE_data/dialyzer_options b/lib/dialyzer/test/small_SUITE_data/dialyzer_options
index 50991c9bc5..8413436b67 100644
--- a/lib/dialyzer/test/small_SUITE_data/dialyzer_options
+++ b/lib/dialyzer/test/small_SUITE_data/dialyzer_options
@@ -1 +1 @@
-{dialyzer_options, []}.
+{dialyzer_options, [{indent_opt, false}]}.
diff --git a/lib/dialyzer/test/small_SUITE_data/results/bs_fail_constr b/lib/dialyzer/test/small_SUITE_data/results/bs_fail_constr
index dbc8241971..797f83956d 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/bs_fail_constr
+++ b/lib/dialyzer/test/small_SUITE_data/results/bs_fail_constr
@@ -1,9 +1,9 @@
 
 bs_fail_constr.erl:11: Function w3/1 has no local return
-bs_fail_constr.erl:12: Binary construction will fail since the size field S in segment 42:S/integer-unit:1 has type neg_integer()
+bs_fail_constr.erl:12: Binary construction will fail since the size field S in segment 42:S has type neg_integer()
 bs_fail_constr.erl:14: Function w4/1 has no local return
 bs_fail_constr.erl:15: Binary construction will fail since the value field V in segment V/utf32 has type float()
 bs_fail_constr.erl:5: Function w1/1 has no local return
-bs_fail_constr.erl:6: Binary construction will fail since the value field V in segment V:8/integer-unit:1 has type float()
+bs_fail_constr.erl:6: Binary construction will fail since the value field V in segment V has type float()
 bs_fail_constr.erl:8: Function w2/1 has no local return
-bs_fail_constr.erl:9: Binary construction will fail since the value field V in segment V/binary-unit:8 has type atom()
+bs_fail_constr.erl:9: Binary construction will fail since the value field V in segment V/binary has type atom()
diff --git a/lib/dialyzer/test/small_SUITE_data/results/chars b/lib/dialyzer/test/small_SUITE_data/results/chars
index 72fbdb4528..02797f2a59 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: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'
+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/contracts_with_subtypes b/lib/dialyzer/test/small_SUITE_data/results/contracts_with_subtypes
index d2a3ebb766..04336f43aa 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/contracts_with_subtypes
+++ b/lib/dialyzer/test/small_SUITE_data/results/contracts_with_subtypes
@@ -1,15 +1,15 @@
 
-contracts_with_subtypes.erl:106: The call contracts_with_subtypes:rec_arg({'a','b'}) breaks the contract (Arg) -> 'ok' when Arg :: {'a',A} | {'b',B}, A :: 'a' | {'b',B}, B :: 'b' | {'a',A}
-contracts_with_subtypes.erl:107: The call contracts_with_subtypes:rec_arg({'b','a'}) breaks the contract (Arg) -> 'ok' when Arg :: {'a',A} | {'b',B}, A :: 'a' | {'b',B}, B :: 'b' | {'a',A}
-contracts_with_subtypes.erl:109: The call contracts_with_subtypes:rec_arg({'b',{'a','b'}}) breaks the contract (Arg) -> 'ok' when Arg :: {'a',A} | {'b',B}, A :: 'a' | {'b',B}, B :: 'b' | {'a',A}
-contracts_with_subtypes.erl:135: The call contracts_with_subtypes:rec2({'a','b'}) breaks the contract (Arg) -> 'ok' when Arg :: ab()
-contracts_with_subtypes.erl:136: The call contracts_with_subtypes:rec2({'b','a'}) breaks the contract (Arg) -> 'ok' when Arg :: ab()
-contracts_with_subtypes.erl:137: The call contracts_with_subtypes:rec2({'a',{'b','a'}}) breaks the contract (Arg) -> 'ok' when Arg :: ab()
-contracts_with_subtypes.erl:138: The call contracts_with_subtypes:rec2({'b',{'a','b'}}) breaks the contract (Arg) -> 'ok' when Arg :: ab()
-contracts_with_subtypes.erl:139: The call contracts_with_subtypes:rec2({'a',{'b',{'a','b'}}}) breaks the contract (Arg) -> 'ok' when Arg :: ab()
-contracts_with_subtypes.erl:140: The call contracts_with_subtypes:rec2({'b',{'a',{'b','a'}}}) breaks the contract (Arg) -> 'ok' when Arg :: ab()
-contracts_with_subtypes.erl:141: The call contracts_with_subtypes:rec2({'a',{'b',{'a',{'b','a'}}}}) breaks the contract (Arg) -> 'ok' when Arg :: ab()
-contracts_with_subtypes.erl:142: The call contracts_with_subtypes:rec2({'b',{'a',{'b',{'a','b'}}}}) breaks the contract (Arg) -> 'ok' when Arg :: ab()
+contracts_with_subtypes.erl:106: The call contracts_with_subtypes:rec_arg({'a', 'b'}) breaks the contract (Arg) -> 'ok' when Arg :: {'a',A} | {'b',B}, A :: 'a' | {'b',B}, B :: 'b' | {'a',A}
+contracts_with_subtypes.erl:107: The call contracts_with_subtypes:rec_arg({'b', 'a'}) breaks the contract (Arg) -> 'ok' when Arg :: {'a',A} | {'b',B}, A :: 'a' | {'b',B}, B :: 'b' | {'a',A}
+contracts_with_subtypes.erl:109: The call contracts_with_subtypes:rec_arg({'b', {'a', 'b'}}) breaks the contract (Arg) -> 'ok' when Arg :: {'a',A} | {'b',B}, A :: 'a' | {'b',B}, B :: 'b' | {'a',A}
+contracts_with_subtypes.erl:135: The call contracts_with_subtypes:rec2({'a', 'b'}) breaks the contract (Arg) -> 'ok' when Arg :: ab()
+contracts_with_subtypes.erl:136: The call contracts_with_subtypes:rec2({'b', 'a'}) breaks the contract (Arg) -> 'ok' when Arg :: ab()
+contracts_with_subtypes.erl:137: The call contracts_with_subtypes:rec2({'a', {'b', 'a'}}) breaks the contract (Arg) -> 'ok' when Arg :: ab()
+contracts_with_subtypes.erl:138: The call contracts_with_subtypes:rec2({'b', {'a', 'b'}}) breaks the contract (Arg) -> 'ok' when Arg :: ab()
+contracts_with_subtypes.erl:139: The call contracts_with_subtypes:rec2({'a', {'b', {'a', 'b'}}}) breaks the contract (Arg) -> 'ok' when Arg :: ab()
+contracts_with_subtypes.erl:140: The call contracts_with_subtypes:rec2({'b', {'a', {'b', 'a'}}}) breaks the contract (Arg) -> 'ok' when Arg :: ab()
+contracts_with_subtypes.erl:141: The call contracts_with_subtypes:rec2({'a', {'b', {'a', {'b', 'a'}}}}) breaks the contract (Arg) -> 'ok' when Arg :: ab()
+contracts_with_subtypes.erl:142: The call contracts_with_subtypes:rec2({'b', {'a', {'b', {'a', 'b'}}}}) breaks the contract (Arg) -> 'ok' when Arg :: ab()
 contracts_with_subtypes.erl:175: The pattern 1 can never match the type string()
 contracts_with_subtypes.erl:178: The pattern 'alpha' can never match the type {'ok',_} | {'ok',_,string()}
 contracts_with_subtypes.erl:180: The pattern 42 can never match the type {'ok',_} | {'ok',_,string()}
diff --git a/lib/dialyzer/test/small_SUITE_data/results/contracts_with_subtypes2 b/lib/dialyzer/test/small_SUITE_data/results/contracts_with_subtypes2
index 1a8aeb13d0..6d611db568 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/contracts_with_subtypes2
+++ b/lib/dialyzer/test/small_SUITE_data/results/contracts_with_subtypes2
@@ -1,3 +1,3 @@
 
 contracts_with_subtypes2.erl:18: Function t/0 has no local return
-contracts_with_subtypes2.erl:19: The call contracts_with_subtypes2:t({'a',{'b',{'c',{'d',{'e',{'g',3}}}}}}) breaks the contract (Arg) -> 'ok' when Arg :: {'a',A}, A :: {'b',B}, B :: {'c',C}, C :: {'d',D}, D :: {'e',E}, E :: {'f',_}
+contracts_with_subtypes2.erl:19: The call contracts_with_subtypes2:t({'a', {'b', {'c', {'d', {'e', {'g', 3}}}}}}) breaks the contract (Arg) -> 'ok' when Arg :: {'a',A}, A :: {'b',B}, B :: {'c',C}, C :: {'d',D}, D :: {'e',E}, E :: {'f',_}
diff --git a/lib/dialyzer/test/small_SUITE_data/results/failing_guard1 b/lib/dialyzer/test/small_SUITE_data/results/failing_guard1
index 5bdd13093a..09fe076a6f 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/failing_guard1
+++ b/lib/dialyzer/test/small_SUITE_data/results/failing_guard1
@@ -1,4 +1,4 @@
 
 failing_guard1.erl:12: Guard test float() =:= 2 can never succeed
-failing_guard1.erl:13: Guard test integer() =:= float() can never succeed
-failing_guard1.erl:14: Guard test -2 | -1 | 0 | 1 | 2 =:= float() can never succeed
+failing_guard1.erl:13: Guard test integer() =:= 2.0 can never succeed
+failing_guard1.erl:14: Guard test -2 | -1 | 0 | 1 | 2 =:= 2.0 can never succeed
diff --git a/lib/dialyzer/test/small_SUITE_data/results/fun_app_args b/lib/dialyzer/test/small_SUITE_data/results/fun_app_args
new file mode 100644
index 0000000000..ac153a6fb2
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/fun_app_args
@@ -0,0 +1,3 @@
+
+fun_app_args.erl:12: Fun application with arguments ('b',[]) will fail since the function has type 'c' | fun(('a',[]) -> any()), which differs in the 1st argument
+fun_app_args.erl:12: The created fun has no local return
diff --git a/lib/dialyzer/test/small_SUITE_data/results/guard_warnings b/lib/dialyzer/test/small_SUITE_data/results/guard_warnings
index 0ff998bf50..14b7a9052c 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/guard_warnings
+++ b/lib/dialyzer/test/small_SUITE_data/results/guard_warnings
@@ -1,6 +1,6 @@
 
 guard_warnings.erl:100: Function test45/0 has no local return
-guard_warnings.erl:100: Guard test 'not'('true') can never succeed
+guard_warnings.erl:100: Guard test not('true') can never succeed
 guard_warnings.erl:102: Function test46/1 has no local return
 guard_warnings.erl:102: Guard test X::'true' =:= 'false' can never succeed
 guard_warnings.erl:104: Function test47/1 has no local return
@@ -14,79 +14,79 @@ guard_warnings.erl:12: Guard test X::'true' =:= 'false' can never succeed
 guard_warnings.erl:14: Function test2/1 has no local return
 guard_warnings.erl:14: Guard test X::'false' =:= 'true' can never succeed
 guard_warnings.erl:16: Function test3/1 has no local return
-guard_warnings.erl:16: Guard test 'not'(X::'true') can never succeed
+guard_warnings.erl:16: Guard test not(X::'true') can never succeed
 guard_warnings.erl:18: Function test4/1 has no local return
-guard_warnings.erl:18: Guard test 'and'('true',X::none()) can never succeed
+guard_warnings.erl:18: Guard test and('true',X::none()) can never succeed
 guard_warnings.erl:20: Function test5/1 has no local return
-guard_warnings.erl:20: Guard test 'not'(X::'true') can never succeed
+guard_warnings.erl:20: Guard test not(X::'true') can never succeed
 guard_warnings.erl:22: Function test6/1 has no local return
-guard_warnings.erl:22: Guard test 'and'('true',X::none()) can never succeed
+guard_warnings.erl:22: Guard test and('true',X::none()) can never succeed
 guard_warnings.erl:24: Function test7_w/1 has no local return
 guard_warnings.erl:26: Function test8_w/1 has no local return
 guard_warnings.erl:28: Function test9/1 has no local return
-guard_warnings.erl:28: Guard test not('not'(X::'false')) can never succeed
+guard_warnings.erl:28: Guard test not(not(X::'false')) can never succeed
 guard_warnings.erl:30: Function test10/1 has no local return
-guard_warnings.erl:30: Guard test not('or'('false',X::none())) can never succeed
+guard_warnings.erl:30: Guard test not(or('false',X::none())) can never succeed
 guard_warnings.erl:32: Function test11/1 has no local return
-guard_warnings.erl:32: Guard test not('not'(X::'false')) can never succeed
+guard_warnings.erl:32: Guard test not(not(X::'false')) can never succeed
 guard_warnings.erl:34: Function test12/1 has no local return
-guard_warnings.erl:34: Guard test not('or'('false',X::none())) can never succeed
+guard_warnings.erl:34: Guard test not(or('false',X::none())) can never succeed
 guard_warnings.erl:36: Function test13/1 has no local return
-guard_warnings.erl:36: Guard test 'and'('true','false') can never succeed
+guard_warnings.erl:36: Guard test and('true','false') can never succeed
 guard_warnings.erl:38: Function test14/1 has no local return
-guard_warnings.erl:38: Guard test 'and'('false',any()) can never succeed
+guard_warnings.erl:38: Guard test and('false',any()) can never succeed
 guard_warnings.erl:40: Function test15/1 has no local return
-guard_warnings.erl:40: Guard test 'and'(X::'true','false') can never succeed
+guard_warnings.erl:40: Guard test and(X::'true','false') can never succeed
 guard_warnings.erl:42: Function test16/1 has no local return
-guard_warnings.erl:42: Guard test 'and'('false',X::any()) can never succeed
+guard_warnings.erl:42: Guard test and('false',X::any()) can never succeed
 guard_warnings.erl:44: Function test17/1 has no local return
-guard_warnings.erl:44: Guard test 'and'(X::'true','false') can never succeed
+guard_warnings.erl:44: Guard test and(X::'true','false') can never succeed
 guard_warnings.erl:46: Function test18/1 has no local return
-guard_warnings.erl:46: Guard test 'and'('false',X::any()) can never succeed
+guard_warnings.erl:46: Guard test and('false',X::any()) can never succeed
 guard_warnings.erl:48: Function test19/1 has no local return
-guard_warnings.erl:48: Guard test not('or'('true',any())) can never succeed
+guard_warnings.erl:48: Guard test not(or('true',any())) can never succeed
 guard_warnings.erl:50: Function test20/1 has no local return
-guard_warnings.erl:50: Guard test not('or'('false','true')) can never succeed
+guard_warnings.erl:50: Guard test not(or('false','true')) can never succeed
 guard_warnings.erl:52: Function test21/1 has no local return
-guard_warnings.erl:52: Guard test not('or'('true',X::any())) can never succeed
+guard_warnings.erl:52: Guard test not(or('true',X::any())) can never succeed
 guard_warnings.erl:54: Function test22/1 has no local return
-guard_warnings.erl:54: Guard test not('or'(X::'false','true')) can never succeed
+guard_warnings.erl:54: Guard test not(or(X::'false','true')) can never succeed
 guard_warnings.erl:56: Function test23/1 has no local return
-guard_warnings.erl:56: Guard test not('or'('true',X::any())) can never succeed
+guard_warnings.erl:56: Guard test not(or('true',X::any())) can never succeed
 guard_warnings.erl:58: Function test24/1 has no local return
-guard_warnings.erl:58: Guard test not('or'(X::'false','true')) can never succeed
+guard_warnings.erl:58: Guard test not(or(X::'false','true')) can never succeed
 guard_warnings.erl:60: Function test25/1 has no local return
-guard_warnings.erl:60: Guard test 'and'('false',any()) can never succeed
+guard_warnings.erl:60: Guard test and('false',any()) can never succeed
 guard_warnings.erl:62: Function test26/1 has no local return
-guard_warnings.erl:62: Guard test 'and'('true','false') can never succeed
+guard_warnings.erl:62: Guard test and('true','false') can never succeed
 guard_warnings.erl:64: Function test27/1 has no local return
-guard_warnings.erl:64: Guard test 'and'('false',X::any()) can never succeed
+guard_warnings.erl:64: Guard test and('false',X::any()) can never succeed
 guard_warnings.erl:66: Function test28/1 has no local return
-guard_warnings.erl:66: Guard test 'and'(X::'true','false') can never succeed
+guard_warnings.erl:66: Guard test and(X::'true','false') can never succeed
 guard_warnings.erl:68: Function test29/1 has no local return
-guard_warnings.erl:68: Guard test 'and'('false',X::any()) can never succeed
+guard_warnings.erl:68: Guard test and('false',X::any()) can never succeed
 guard_warnings.erl:70: Function test30/1 has no local return
-guard_warnings.erl:70: Guard test 'and'(X::'true','false') can never succeed
+guard_warnings.erl:70: Guard test and(X::'true','false') can never succeed
 guard_warnings.erl:72: Function test31/0 has no local return
-guard_warnings.erl:72: Guard test 'and'('false',any()) can never succeed
+guard_warnings.erl:72: Guard test and('false','false') can never succeed
 guard_warnings.erl:74: Function test32/0 has no local return
-guard_warnings.erl:74: Guard test 'and'('false',any()) can never succeed
+guard_warnings.erl:74: Guard test and('false','false') can never succeed
 guard_warnings.erl:76: Function test33/0 has no local return
-guard_warnings.erl:76: Guard test not('and'('true','true')) can never succeed
+guard_warnings.erl:76: Guard test not(and('true','true')) can never succeed
 guard_warnings.erl:78: Function test34/0 has no local return
-guard_warnings.erl:78: Guard test 'and'('false',any()) can never succeed
+guard_warnings.erl:78: Guard test and('false','false') can never succeed
 guard_warnings.erl:80: Function test35/0 has no local return
-guard_warnings.erl:80: Guard test not('and'('true','true')) can never succeed
+guard_warnings.erl:80: Guard test not(and('true','true')) can never succeed
 guard_warnings.erl:82: Function test36/0 has no local return
-guard_warnings.erl:82: Guard test 'or'('false','false') can never succeed
+guard_warnings.erl:82: Guard test or('false','false') can never succeed
 guard_warnings.erl:84: Function test37/0 has no local return
-guard_warnings.erl:84: Guard test 'or'('false','false') can never succeed
+guard_warnings.erl:84: Guard test or('false','false') can never succeed
 guard_warnings.erl:86: Function test38/0 has no local return
-guard_warnings.erl:86: Guard test 'or'('false','false') can never succeed
+guard_warnings.erl:86: Guard test or('false','false') can never succeed
 guard_warnings.erl:88: Function test39/0 has no local return
-guard_warnings.erl:88: Guard test 'or'('false','false') can never succeed
+guard_warnings.erl:88: Guard test or('false','false') can never succeed
 guard_warnings.erl:90: Function test40/0 has no local return
-guard_warnings.erl:90: Guard test 'or'('false','false') can never succeed
+guard_warnings.erl:90: Guard test or('false','false') can never succeed
 guard_warnings.erl:92: Function test41/0 has no local return
 guard_warnings.erl:92: Guard test 'true' =:= 'false' can never succeed
 guard_warnings.erl:94: Function test42/0 has no local return
diff --git a/lib/dialyzer/test/small_SUITE_data/results/maps_sum b/lib/dialyzer/test/small_SUITE_data/results/maps_sum
index b29ac77d88..daa099e490 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 (maps:iterator() | 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/pretty_bitstring b/lib/dialyzer/test/small_SUITE_data/results/pretty_bitstring
index e148e5cf22..dc3620fcf0 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/pretty_bitstring
+++ b/lib/dialyzer/test/small_SUITE_data/results/pretty_bitstring
@@ -1,3 +1,3 @@
 
 pretty_bitstring.erl:7: Function t/0 has no local return
-pretty_bitstring.erl:8: The call binary:copy(#{#<1>(8, 1, 'integer', ['unsigned', 'big']), #<2>(8, 1, 'integer', ['unsigned', 'big']), #<3>(3, 1, 'integer', ['unsigned', 'big'])}#,2) breaks the contract (Subject,N) -> binary() when Subject :: binary(), N :: non_neg_integer()
+pretty_bitstring.erl:8: The call binary:copy(<<1,2,3:3>>,2) breaks the contract (Subject,N) -> binary() when Subject :: binary(), N :: non_neg_integer()
diff --git a/lib/dialyzer/test/small_SUITE_data/results/tuple_set_crash b/lib/dialyzer/test/small_SUITE_data/results/tuple_set_crash
index 8c9df56a4b..7fd1f304cb 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/tuple_set_crash
+++ b/lib/dialyzer/test/small_SUITE_data/results/tuple_set_crash
@@ -3,12 +3,12 @@ tuple_set_crash.erl:103: Invalid type specification for function tuple_set_crash
 tuple_set_crash.erl:123: Invalid type specification for function tuple_set_crash:parse_video_target_info/1. The success typing is (<<_:48>>) -> [{'status',byte()} | {'target_id',non_neg_integer()},...]
 tuple_set_crash.erl:127: Invalid type specification for function tuple_set_crash:parse_audio_target_info/1. The success typing is (<<_:48>>) -> [{'master_volume',char()} | {'status',byte()} | {'target_id',non_neg_integer()},...]
 tuple_set_crash.erl:138: Invalid type specification for function tuple_set_crash:parse_av_device_info/1. The success typing is (<<_:48>>) -> [{'address',byte()} | {'device_id',non_neg_integer()} | {'model',binary()} | {'status',byte()},...]
-tuple_set_crash.erl:143: The pattern <<TargetId:32/integer-little-unit:1,Rest1/binary-unit:8>> can never match the type <<_:8>>
+tuple_set_crash.erl:143: The pattern <<TargetId:32/integer-little-unit:1,Rest1/binary>> can never match the type <<_:8>>
 tuple_set_crash.erl:155: Invalid type specification for function tuple_set_crash:parse_video_output_info/1. The success typing is (<<_:48>>) -> [{'audio_volume',char()} | {'display_type',binary()} | {'output_id',non_neg_integer()},...]
-tuple_set_crash.erl:160: The pattern <<DeviceId:32/integer-little-unit:1,Rest1/binary-unit:8>> can never match the type <<_:8>>
+tuple_set_crash.erl:160: The pattern <<DeviceId:32/integer-little-unit:1,Rest1/binary>> can never match the type <<_:8>>
 tuple_set_crash.erl:171: Invalid type specification for function tuple_set_crash:parse_audio_output_info/1. The success typing is (<<_:48>>) -> [{'output_id',non_neg_integer()},...]
-tuple_set_crash.erl:176: The pattern <<DeviceId:32/integer-little-unit:1,Rest1/binary-unit:8>> can never match the type <<_:8>>
-tuple_set_crash.erl:179: The pattern <<AudioVolume:16/integer-little-unit:1,Rest2/binary-unit:8>> can never match the type <<_:8>>
-tuple_set_crash.erl:182: The pattern <<Delay:16/integer-little-unit:1,_Padding/binary-unit:8>> can never match the type <<_:8>>
+tuple_set_crash.erl:176: The pattern <<DeviceId:32/integer-little-unit:1,Rest1/binary>> can never match the type <<_:8>>
+tuple_set_crash.erl:179: The pattern <<AudioVolume:16/integer-little-unit:1,Rest2/binary>> can never match the type <<_:8>>
+tuple_set_crash.erl:182: The pattern <<Delay:16/integer-little-unit:1,_Padding/binary>> can never match the type <<_:8>>
 tuple_set_crash.erl:62: The pattern {'play_list', _Playlist} can never match the type 'ok' | {'device_properties',[{atom(),_}]} | {'error',[{atom(),_}]}
 tuple_set_crash.erl:64: The pattern {'error', 17} can never match the type 'ok' | {'device_properties',[{atom(),_}]} | {'error',[{atom(),_}]}
diff --git a/lib/dialyzer/test/small_SUITE_data/results/union_paren b/lib/dialyzer/test/small_SUITE_data/results/union_paren
new file mode 100644
index 0000000000..1766773f2d
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/union_paren
@@ -0,0 +1,25 @@
+
+union_paren.erl:20: Function r1/0 has no local return
+union_paren.erl:21: Record construction #r1{f1::[4,...],f2::'undefined',f3::'undefined',f8::float()} violates the declared type of field f2::[atom() | pid() | integer()] and f3::[atom() | pid() | integer()] and f8::[atom() | pid() | integer()]
+union_paren.erl:23: Function t1/0 has no local return
+union_paren.erl:24: The call union_paren:t1(3.14) breaks the contract ((A::integer()) | (B::atom())) -> integer()
+union_paren.erl:30: Function t2/0 has no local return
+union_paren.erl:31: The call union_paren:t2(3.14) breaks the contract (integer() | atom()) -> integer()
+union_paren.erl:37: Function t3/0 has no local return
+union_paren.erl:38: The pattern 3.14 can never match the type atom() | integer()
+union_paren.erl:44: Function c1/0 has no local return
+union_paren.erl:45: The call union_paren:c1({'r0', 'a', 'undefined', 'undefined'}) breaks the contract (#r0{f1::integer() | pid()}) -> atom()
+union_paren.erl:51: Function c2/0 has no local return
+union_paren.erl:52: The call union_paren:c2({'r0', 'a', 'undefined', 'undefined'}) breaks the contract (#r0{f1::A::integer() | pid()}) -> atom()
+union_paren.erl:58: Function c3/0 has no local return
+union_paren.erl:59: The call union_paren:c3({'r0', 'a', 'undefined', 'undefined'}) breaks the contract (#r0{f1::(A::integer()) | (B::pid())}) -> atom()
+union_paren.erl:65: Function c4/0 has no local return
+union_paren.erl:66: The call union_paren:c4({'r0', 'a', 'undefined', 'undefined'}) breaks the contract (#r0{f1::X::(A::integer()) | (B::pid())}) -> atom()
+union_paren.erl:72: Function c5/0 has no local return
+union_paren.erl:73: The call union_paren:c5({'r1', ['a'], [1], ['a'], ['u']}) breaks the contract (#r1{f1::[integer()] | [pid()]}) -> atom()
+union_paren.erl:79: Function c6/0 has no local return
+union_paren.erl:80: The call union_paren:c6({'r1', ['a'], [1], ['a'], ['u']}) breaks the contract (#r1{f1::A::[integer()] | [pid()]}) -> atom()
+union_paren.erl:86: Function c7/0 has no local return
+union_paren.erl:87: The call union_paren:c7({'r1', ['a'], [1], ['a'], ['u']}) breaks the contract (#r1{f1::(A::[integer()]) | (B::[pid()])}) -> atom()
+union_paren.erl:93: Function c8/0 has no local return
+union_paren.erl:94: The call union_paren:c8({'r1', ['a'], [1], ['a'], ['u']}) breaks the contract (#r1{f1::X::(A::[integer()]) | (B::[pid()])}) -> atom()
diff --git a/lib/dialyzer/test/small_SUITE_data/src/fun_app_args.erl b/lib/dialyzer/test/small_SUITE_data/src/fun_app_args.erl
new file mode 100644
index 0000000000..b4409bc550
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/fun_app_args.erl
@@ -0,0 +1,12 @@
+-module(fun_app_args).
+
+-export([t/1]).
+
+-type ft() :: fun((a, []) -> any()).
+
+-record(r, {
+    h = c :: c | ft()
+}).
+
+t(#r{h = H}) ->
+    fun(_) -> (H)(b, []) end.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/lists_key_bug.erl b/lib/dialyzer/test/small_SUITE_data/src/lists_key_bug.erl
new file mode 100644
index 0000000000..ad5cf3c503
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/lists_key_bug.erl
@@ -0,0 +1,75 @@
+-module(lists_key_bug).
+
+%% OTP-15570
+
+-export([is_1/1, is_2/1, i/1, t1/0, t2/0, im/0]).
+
+%% int_set([3])
+is_1(V) ->
+    K = ikey(V),
+    case lists:keyfind(K, 1, [{<<"foo">>, bar}]) of
+        false ->
+            a;
+        {_, _} ->
+            b
+    end.
+
+ikey(1) ->
+    3;
+ikey(2) ->
+    <<"foo">>.
+
+%% int_set([3, 5])
+is_2(V) ->
+    K = iskey(V),
+    case lists:keyfind(K, 1, [{<<"foo">>, bar}]) of
+        false ->
+            a;
+        {_, _} ->
+            b
+    end.
+
+iskey(1) ->
+    12;
+iskey(2) ->
+    14;
+iskey(3) ->
+    <<"foo">>.
+
+%% integer()
+i(V) ->
+    K = intkey(V),
+    case lists:keyfind(K, 1, [{9.0, foo}]) of
+        false ->
+            a;
+        {_, _} ->
+            b
+    end.
+
+intkey(K) when is_integer(K) ->
+    K + 9999.
+
+t1() ->
+    case lists:keyfind({17}, 1, [{{17.0}, true}]) of
+        false ->
+            a;
+        {_, _} ->
+            b
+    end.
+
+t2() ->
+    case lists:keyfind({17.0}, 1, [{{17}, true}]) of
+        false ->
+            a;
+        {_, _} ->
+            b
+    end.
+
+%% Note: #{1.0 => a} =/= #{1 => a}.
+im() ->
+    case lists:keyfind(#{1.0 => a}, 1, [{#{1 => a}, foo}]) of
+        false ->
+            a;
+        {_, _} ->
+            b
+    end.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/union_paren.erl b/lib/dialyzer/test/small_SUITE_data/src/union_paren.erl
new file mode 100644
index 0000000000..65bda1876e
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/union_paren.erl
@@ -0,0 +1,98 @@
+-module(union_paren).
+
+-compile(export_all).
+
+-record(r0,
+        {
+         f1 = 4 :: atom () | integer() | pid(),
+         f2 :: atom() | integer() | pid(),
+         f3 :: A :: atom() | integer() | pid
+        }).
+
+-record(r1,
+        {
+         f1 = [4] :: [atom ()] | [integer()] | [pid()],
+         f2 :: [atom()] | [integer()] | [pid()],
+         f3 :: A :: [atom()] | [integer()] | [pid()],
+         f8 = [u] :: X :: [A :: atom()] | [B :: integer()] | (C :: [pid()])
+        }).
+
+r1() ->
+    #r1{f8 = 3.14}.
+
+t1() ->
+    t1(3.14).
+
+-spec t1((A :: integer()) | (B :: atom())) -> integer().
+t1(A) ->
+    fy:bar(A).
+
+t2() ->
+    t2(3.14).
+
+-spec t2(integer() | atom()) -> integer().
+t2(A) ->
+    fy:bar(A).
+
+t3() ->
+    3.14 = t3(foo).
+
+-spec t3(_) -> (I :: integer()) | (A :: atom()).
+t3(A) when is_atom(A) -> A;
+t3(I) when is_integer(I) -> I.
+
+c1() ->
+    c1(#r0{f1 = a}).
+
+-spec c1(#r0{f1 :: integer() | pid()}) -> atom().
+c1(_) ->
+    a.
+
+c2() ->
+    c2(#r0{f1 = a}).
+
+-spec c2(#r0{f1 :: A :: integer() | pid()}) -> atom().
+c2(_) ->
+    a.
+
+c3() ->
+    c3(#r0{f1 = a}).
+
+-spec c3(#r0{f1 :: (A :: integer()) | (B :: pid())}) -> atom().
+c3(_) ->
+    a.
+
+c4() ->
+    c4(#r0{f1 = a}).
+
+-spec c4(#r0{f1 :: X :: (A :: integer()) | (B :: pid())}) -> atom().
+c4(_) ->
+    a.
+
+c5() ->
+    c5(#r1{f1 = [a], f2 = [1], f3 = [a]}).
+
+-spec c5(#r1{f1 :: [integer()] | [pid()]}) -> atom().
+c5(_) ->
+    a.
+
+c6() ->
+    c6(#r1{f1 = [a], f2 = [1], f3 = [a]}).
+
+-spec c6(#r1{f1 :: A :: [integer()] | [pid()]}) -> atom().
+c6(_) ->
+    a.
+
+c7() ->
+    c7(#r1{f1 = [a], f2 = [1], f3 = [a]}).
+
+-spec c7(#r1{f1 :: (A :: [integer()]) | (B :: [pid()])}) -> atom().
+c7(_) ->
+    a.
+
+c8() ->
+    c8(#r1{f1 = [a], f2 = [1], f3 = [a]}).
+
+-spec c8(#r1{f1 :: X :: (A :: [integer()]) | (B :: [pid()])}) -> atom().
+c8(_) ->
+    a.
diff --git a/lib/dialyzer/test/specdiffs_SUITE_data/dialyzer_options b/lib/dialyzer/test/specdiffs_SUITE_data/dialyzer_options
index 56b36f2ed4..f7076e34da 100644
--- a/lib/dialyzer/test/specdiffs_SUITE_data/dialyzer_options
+++ b/lib/dialyzer/test/specdiffs_SUITE_data/dialyzer_options
@@ -1 +1 @@
-{dialyzer_options, [{warnings, [specdiffs]}]}.
+{dialyzer_options, [{indent_opt, false}, {warnings, [specdiffs]}]}.
diff --git a/lib/dialyzer/test/underspecs_SUITE_data/dialyzer_options b/lib/dialyzer/test/underspecs_SUITE_data/dialyzer_options
index f7197ac30f..1a9734deb2 100644
--- a/lib/dialyzer/test/underspecs_SUITE_data/dialyzer_options
+++ b/lib/dialyzer/test/underspecs_SUITE_data/dialyzer_options
@@ -1 +1 @@
-{dialyzer_options, [{warnings, [underspecs]}]}.
+{dialyzer_options, [{indent_opt, false}, {warnings, [underspecs]}]}.
diff --git a/lib/dialyzer/test/unmatched_returns_SUITE_data/dialyzer_options b/lib/dialyzer/test/unmatched_returns_SUITE_data/dialyzer_options
index 49ac917f61..7de9d6f962 100644
--- a/lib/dialyzer/test/unmatched_returns_SUITE_data/dialyzer_options
+++ b/lib/dialyzer/test/unmatched_returns_SUITE_data/dialyzer_options
@@ -1 +1 @@
-{dialyzer_options, [{warnings, [unmatched_returns]}]}.
+{dialyzer_options, [{indent_opt, false}, {warnings, [unmatched_returns]}]}.
diff --git a/lib/dialyzer/test/user_SUITE_data/dialyzer_options b/lib/dialyzer/test/user_SUITE_data/dialyzer_options
index 513ed7752b..0a944966f0 100644
--- a/lib/dialyzer/test/user_SUITE_data/dialyzer_options
+++ b/lib/dialyzer/test/user_SUITE_data/dialyzer_options
@@ -1,2 +1,2 @@
-{dialyzer_options, []}.
+{dialyzer_options, [{indent_opt, false}]}.
 {time_limit, 3}.
\ No newline at end of file
diff --git a/lib/dialyzer/vsn.mk b/lib/dialyzer/vsn.mk
index 98ab533a58..a77c74c717 100644
--- a/lib/dialyzer/vsn.mk
+++ b/lib/dialyzer/vsn.mk
@@ -1 +1 @@
-DIALYZER_VSN = 3.3.1
+DIALYZER_VSN = 4.0.3
diff --git a/lib/diameter/doc/src/diameter.xml b/lib/diameter/doc/src/diameter.xml
index dfa4c803ed..85522c99b2 100644
--- a/lib/diameter/doc/src/diameter.xml
+++ b/lib/diameter/doc/src/diameter.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd" [
-  <!ENTITY spawn_opt
+  <!ENTITY spawn_opt2
   '<seealso marker="erts:erlang#spawn_opt-2">erlang:spawn_opt/2</seealso>'>
+  <!ENTITY spawn_opt5
+  '<seealso marker="erts:erlang#spawn_opt-5">erlang:spawn_opt/5</seealso>'>
   <!ENTITY nodes
   '<seealso marker="erts:erlang#nodes-0">erlang:nodes/0</seealso>'>
   <!ENTITY make_ref
@@ -21,7 +23,7 @@
 
 <copyright>
 <year>2011</year>
-<year>2017</year>
+<year>2019</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -55,7 +57,7 @@ limitations under the License.
 <!-- ===================================================================== -->
 <!-- ===================================================================== -->
 
-<module>diameter</module>
+<module since="OTP R14B03">diameter</module>
 <modulesummary>Main API of the diameter application.</modulesummary>
 
 <description>
@@ -1384,12 +1386,22 @@ the same peer.</p>
 </item>
 
 <tag>
-<marker id="spawn_opt"/><c>{spawn_opt, [term()]}</c></tag>
+<marker id="spawn_opt"/><c>{spawn_opt, [term()] | {M,F,A}}</c></tag>
 <item>
 <p>
-Options passed to &spawn_opt; when spawning a process for an
-incoming Diameter request.
-Options <c>monitor</c> and <c>link</c> are ignored.</p>
+An options list passed to &spawn_opt2; to spawn a handler process for an
+incoming Diameter request on the local node, or an MFA that returns
+the pid of a handler process.</p>
+
+<p>
+Options <c>monitor</c> and <c>link</c> are ignored in the list-valued
+case.
+An MFA is applied with an additional term prepended to its argument
+list, and should return either the pid of the handler process that
+invokes <c>diameter_traffic:request/1</c> on the term in order to
+process the request, or the atom <c>discard</c>.
+The handler process need not be local, but diameter must be started on
+the remote node.</p>
 
 <p>
 Defaults to the empty list.</p>
@@ -1574,7 +1586,7 @@ identifies the configuration.</p>
 <!-- ===================================================================== -->
 
 <func>
-<name>add_transport(SvcName, {connect|listen, [Opt]})
+<name since="OTP R14B03">add_transport(SvcName, {connect|listen, [Opt]})
         -> {ok, Ref} | {error, Reason}</name>
 <fsummary>Add transport capability to a service.</fsummary>
 <type>
@@ -1624,7 +1636,7 @@ its transports.</p>
 <!-- ===================================================================== -->
 
 <func>
-<name>call(SvcName, App, Request, [Opt]) -> Answer | ok | {error, Reason}</name>
+<name since="OTP R14B03">call(SvcName, App, Request, [Opt]) -> Answer | ok | {error, Reason}</name>
 <fsummary>Send a Diameter request message.</fsummary>
 <type>
 <v>SvcName = &service_name;</v>
@@ -1730,7 +1742,7 @@ transport connection.</p>
 <!-- ===================================================================== -->
 
 <func>
-<name>origin_state_id() -> &dict_Unsigned32;</name>
+<name since="OTP R14B03">origin_state_id() -> &dict_Unsigned32;</name>
 <fsummary>Returns a reasonable Origin-State-Id.</fsummary>
 <desc>
 <p>
@@ -1748,7 +1760,7 @@ at the time the diameter application was started.</p>
 <!-- ===================================================================== -->
 
 <func>
-<name>remove_transport(SvcName, Pred) -> ok | {error, Reason}</name>
+<name since="OTP R14B03">remove_transport(SvcName, Pred) -> ok | {error, Reason}</name>
 <fsummary>Remove previously added transports.</fsummary>
 <type>
 <v>SvcName = &service_name;</v>
@@ -1795,7 +1807,7 @@ configured on the transport.</p>
 <!-- ===================================================================== -->
 
 <func>
-<name>service_info(SvcName, Info) -> term()</name>
+<name since="OTP R14B03">service_info(SvcName, Info) -> term()</name>
 <fsummary>Return information about a started service.</fsummary>
 <type>
 <v>SvcName = &service_name;</v>
@@ -2114,7 +2126,7 @@ For example:</p>
 <!-- ===================================================================== -->
 
 <func>
-<name>services() -> [SvcName]</name>
+<name since="OTP R14B03">services() -> [SvcName]</name>
 <fsummary>Return the list of started services.</fsummary>
 <type>
 <v>SvcName = &service_name;</v>
@@ -2129,7 +2141,7 @@ Return the list of started services.</p>
 <!-- ===================================================================== -->
 
 <func>
-<name>session_id(Ident) -> &dict_OctetString;</name>
+<name since="OTP R14B03">session_id(Ident) -> &dict_OctetString;</name>
 <fsummary>Return a value for a Session-Id AVP.</fsummary>
 <type>
 <v>Ident = &dict_DiameterIdentity;</v>
@@ -2148,7 +2160,7 @@ the message containing the returned value will be sent.</p>
 
 <!-- ===================================================================== -->
 <func>
-<name>start() -> ok | {error, Reason}</name>
+<name since="OTP R14B03">start() -> ok | {error, Reason}</name>
 <fsummary>Start the diameter application.</fsummary>
 <desc>
 <p>
@@ -2164,7 +2176,7 @@ file, not by calling <c>start/0</c> explicitly.</p>
 
 <!-- ===================================================================== -->
 <func>
-<name>start_service(SvcName, Options) -> ok | {error, Reason}</name>
+<name since="OTP R14B03">start_service(SvcName, Options) -> ok | {error, Reason}</name>
 <fsummary>Start a Diameter service.</fsummary>
 <type>
 <v>SvcName = &service_name;</v>
@@ -2194,7 +2206,7 @@ necessarily the case.</p>
 
 <!-- ===================================================================== -->
 <func>
-<name>stop() -> ok | {error, Reason}</name>
+<name since="OTP R14B03">stop() -> ok | {error, Reason}</name>
 <fsummary>Stop the diameter application.</fsummary>
 <desc>
 <p>
@@ -2208,7 +2220,7 @@ Stop the diameter application.</p>
 
 <!-- ===================================================================== -->
 <func>
-<name>stop_service(SvcName) -> ok | {error, Reason}</name>
+<name since="OTP R14B03">stop_service(SvcName) -> ok | {error, Reason}</name>
 <fsummary>Stop a Diameter service.</fsummary>
 <type>
 <v>SvcName = &service_name;</v>
@@ -2236,7 +2248,7 @@ be called to remove transport configuration.</p>
 <!-- ===================================================================== -->
 
 <func>
-<name>subscribe(SvcName) -> true</name>
+<name since="OTP R14B03">subscribe(SvcName) -> true</name>
 <fsummary>Subscribe to event messages.</fsummary>
 <type>
 <v>SvcName = &service_name;</v>
@@ -2258,7 +2270,7 @@ reception of all transport-related events.</p>
 <!-- ===================================================================== -->
 
 <func>
-<name>unsubscribe(SvcName) -> true</name>
+<name since="OTP R14B03">unsubscribe(SvcName) -> true</name>
 <fsummary>Unsubscribe to event messages.</fsummary>
 <type>
 <v>SvcName = &service_name;</v>
diff --git a/lib/diameter/doc/src/diameter_app.xml b/lib/diameter/doc/src/diameter_app.xml
index aa334beb21..82e3d449ef 100644
--- a/lib/diameter/doc/src/diameter_app.xml
+++ b/lib/diameter/doc/src/diameter_app.xml
@@ -44,7 +44,7 @@ limitations under the License.
 
 </header>
 
-<module>diameter_app</module>
+<module since="OTP R14B03">diameter_app</module>
 <modulesummary>
 Callback module of a Diameter application.</modulesummary>
 
@@ -180,7 +180,7 @@ process.</p>
 <funcs>
 
 <func>
-<name>Mod:peer_up(SvcName, Peer, State) -> NewState</name>
+<name since="OTP R14B03">Mod:peer_up(SvcName, Peer, State) -> NewState</name>
 <fsummary>Invoked when a transport connection has been established</fsummary>
 <type>
 <v>SvcName = &mod_service_name;</v>
@@ -215,7 +215,7 @@ handled independently of &peer_up; and &peer_down;.</p>
 </func>
 
 <func>
-<name>Mod:peer_down(SvcName, Peer, State) -> NewState</name>
+<name since="OTP R14B03">Mod:peer_down(SvcName, Peer, State) -> NewState</name>
 <fsummary>Invoked when a transport connection has been lost.</fsummary>
 <type>
 <v>SvcName = &mod_service_name;</v>
@@ -234,7 +234,7 @@ candidate in &pick_peer; callbacks.</p>
 </func>
 
 <func>
-<name>Mod:pick_peer(LocalCandidates, RemoteCandidates, SvcName, State)
+<name since="OTP R14B03">Mod:pick_peer(LocalCandidates, RemoteCandidates, SvcName, State)
       -> Selection | false</name>
 <fsummary>Select a target peer for an outgoing request.</fsummary>
 <type>
@@ -311,7 +311,7 @@ or &peer_down; callback.</p>
 </func>
 
 <func>
-<name>Mod:prepare_request(Packet, SvcName, Peer) -> Action</name>
+<name since="OTP R14B03">Mod:prepare_request(Packet, SvcName, Peer) -> Action</name>
 <fsummary>Return a request for encoding and transport.</fsummary>
 <type>
 <v>Packet = &packet;</v>
@@ -363,7 +363,7 @@ discarded}</c>.</p>
 </func>
 
 <func>
-<name>Mod:prepare_retransmit(Packet, SvcName, Peer) -> Action</name>
+<name since="OTP R14B03">Mod:prepare_retransmit(Packet, SvcName, Peer) -> Action</name>
 <fsummary>Return a request for encoding and retransmission.</fsummary>
 <type>
 <v>Packet  = &packet;</v>
@@ -393,7 +393,7 @@ discarded}</c>.</p>
 </func>
 
 <func>
-<name>Mod:handle_answer(Packet, Request, SvcName, Peer) -> Result</name>
+<name since="OTP R14B03">Mod:handle_answer(Packet, Request, SvcName, Peer) -> Result</name>
 <fsummary>Receive an answer message from a peer.</fsummary>
 <type>
 <v>Packet  = &packet;</v>
@@ -437,7 +437,7 @@ The &mod_application_opt;
 </func>
 
 <func>
-<name>Mod:handle_error(Reason, Request, SvcName, Peer) -> Result</name>
+<name since="OTP R14B03">Mod:handle_error(Reason, Request, SvcName, Peer) -> Result</name>
 <fsummary>Return an error from a outgoing request.</fsummary>
 <type>
 <v>Reason  = timeout | failover | term()</v>
@@ -465,7 +465,7 @@ not selected.</p>
 </func>
 
 <func>
-<name>Mod:handle_request(Packet, SvcName, Peer) -> Action</name>
+<name since="OTP R14B03">Mod:handle_request(Packet, SvcName, Peer) -> Action</name>
 <fsummary>Receive an incoming request.</fsummary>
 <type>
 <v>Packet  = &packet;</v>
diff --git a/lib/diameter/doc/src/diameter_codec.xml b/lib/diameter/doc/src/diameter_codec.xml
index 0a34dd7ec7..0384ad2913 100644
--- a/lib/diameter/doc/src/diameter_codec.xml
+++ b/lib/diameter/doc/src/diameter_codec.xml
@@ -46,7 +46,7 @@ limitations under the License.
 <file>diameter_codec.xml</file>
 </header>
 
-<module>diameter_codec</module>
+<module since="OTP R15B03">diameter_codec</module>
 <modulesummary>Decode and encode of Diameter messages.</modulesummary>
 
 <description>
@@ -346,7 +346,7 @@ question, as documented in &man_transport;.</p>
 <funcs>
 
 <func>
-<name>decode(Mod, Bin) -> Pkt</name>
+<name since="OTP R15B03">decode(Mod, Bin) -> Pkt</name>
 <fsummary>Decode a Diameter message.</fsummary>
 <type>
 <v>Mod = &dictionary;</v>
@@ -362,7 +362,7 @@ Decode a Diameter message.</p>
 </func>
 
 <func>
-<name>encode(Mod, Msg) -> Pkt</name>
+<name since="OTP R15B03">encode(Mod, Msg) -> Pkt</name>
 <fsummary>Encode a Diameter message.</fsummary>
 <type>
 <v>Mod = &dictionary;</v>
diff --git a/lib/diameter/doc/src/diameter_make.xml b/lib/diameter/doc/src/diameter_make.xml
index 112355816f..57e83bbca1 100644
--- a/lib/diameter/doc/src/diameter_make.xml
+++ b/lib/diameter/doc/src/diameter_make.xml
@@ -45,7 +45,7 @@ limitations under the License.
 <file>diameter_make.xml</file>
 </header>
 
-<module>diameter_make</module>
+<module since="OTP R14B03">diameter_make</module>
 <modulesummary>Diameter dictionary compilation.</modulesummary>
 
 <description>
@@ -67,7 +67,7 @@ interface.</p>
 <funcs>
 
 <func>
-<name>codec(File :: iolist() | binary(), [Opt]) -> ok
+<name since="OTP R15B">codec(File :: iolist() | binary(), [Opt]) -> ok
                                                  | {ok, [Out]}
                                                  | {error, Reason}</name>
 <fsummary>Compile a dictionary file into Erlang source.</fsummary>
@@ -186,7 +186,7 @@ A returned error reason can be converted into a readable string using
 <!-- ===================================================================== -->
 
 <func>
-<name>format(Parsed) -> iolist()</name>
+<name since="OTP R16B03">format(Parsed) -> iolist()</name>
 <fsummary>Format a parsed dictionary.</fsummary>
 <desc>
 <p>
@@ -198,7 +198,7 @@ dictionary format.</p>
 <!-- ===================================================================== -->
 
 <func>
-<name>flatten(Parsed) -> term()</name>
+<name since="OTP R16B03">flatten(Parsed) -> term()</name>
 <fsummary>Flatten a parsed dictionary.</fsummary>
 <desc>
 
@@ -214,7 +214,7 @@ The return value is also a parsed dictionary.</p>
 <!-- ===================================================================== -->
 
 <func>
-<name>format_error(Reason) -> string()</name>
+<name since="OTP 17.0">format_error(Reason) -> string()</name>
 <fsummary>Turn an error reason into a readable string.</fsummary>
 <desc>
 
diff --git a/lib/diameter/doc/src/diameter_sctp.xml b/lib/diameter/doc/src/diameter_sctp.xml
index 62e958870e..2cf924ee6b 100644
--- a/lib/diameter/doc/src/diameter_sctp.xml
+++ b/lib/diameter/doc/src/diameter_sctp.xml
@@ -47,7 +47,7 @@ limitations under the License.
 <file>diameter_sctp.xml</file>
 </header>
 
-<module>diameter_sctp</module>
+<module since="OTP R14B03">diameter_sctp</module>
 <modulesummary>Diameter transport over SCTP.</modulesummary>
 
 <description>
@@ -67,7 +67,7 @@ and implements the behaviour documented in
 <funcs>
 
 <func>
-<name>start({Type, Ref}, Svc, [Opt])
+<name since="OTP R14B03">start({Type, Ref}, Svc, [Opt])
          -> {ok, Pid, [LAddr]} | {error, Reason}</name>
 <fsummary>Start a transport process.</fsummary>
 <type>
diff --git a/lib/diameter/doc/src/diameter_tcp.xml b/lib/diameter/doc/src/diameter_tcp.xml
index 9f84eeb9fd..fe0cb2d067 100644
--- a/lib/diameter/doc/src/diameter_tcp.xml
+++ b/lib/diameter/doc/src/diameter_tcp.xml
@@ -57,7 +57,7 @@ limitations under the License.
 <file>diameter_tcp.xml</file>
 </header>
 
-<module>diameter_tcp</module>
+<module since="OTP R14B03">diameter_tcp</module>
 <modulesummary>Diameter transport over TCP.</modulesummary>
 
 <description>
@@ -83,7 +83,7 @@ before configuring TLS capability on diameter transports.</p>
 <funcs>
 
 <func>
-<name>start({Type, Ref}, Svc, [Opt])
+<name since="OTP R14B03">start({Type, Ref}, Svc, [Opt])
          -> {ok, Pid}
           | {ok, Pid, [LAddr]}
           | {error, Reason}</name>
diff --git a/lib/diameter/doc/src/diameter_transport.xml b/lib/diameter/doc/src/diameter_transport.xml
index 294e8a8864..0a8ef321c6 100644
--- a/lib/diameter/doc/src/diameter_transport.xml
+++ b/lib/diameter/doc/src/diameter_transport.xml
@@ -14,7 +14,8 @@
 <erlref>
 <header>
 <copyright>
-<year>2011</year><year>2016</year>
+<year>2011</year>
+<year>2019</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -43,7 +44,7 @@ limitations under the License.
 <file>diameter_transport.xml</file>
 </header>
 
-<module>diameter_transport</module>
+<module since="OTP R14B03">diameter_transport</module>
 <modulesummary>Diameter transport interface.</modulesummary>
 
 <description>
@@ -94,7 +95,7 @@ and has the binary() to send in its <c>bin</c> field.</p>
 <funcs>
 
 <func>
-<name>Mod:start({Type, Ref}, Svc, Config)
+<name since="OTP R14B03">Mod:start({Type, Ref}, Svc, Config)
          -> {ok, Pid}
           | {ok, Pid, LAddrs}
           | {error, Reason}</name>
@@ -174,10 +175,13 @@ its parent.</p>
 
 <taglist>
 
-<tag><c>{diameter, {send, &message;}}</c></tag>
+<tag><c>{diameter, {send, &message; | false}}</c></tag>
 <item>
 <p>
-An outbound Diameter message.</p>
+An outbound Diameter message.
+The atom <c>false</c> can only be received when request
+acknowledgements have been requests: see the <c>ack</c> message
+below.</p>
 </item>
 
 <tag><c>{diameter, {close, Pid}}</c></tag>
@@ -246,6 +250,27 @@ A <c>LocalAddr</c> list has the same semantics as one returned from
 &start;.</p>
 </item>
 
+<tag><c>{diameter, ack}</c></tag>
+<item>
+<p>
+Request acknowledgements of unanswered requests.
+A transport process should send this once before passing incoming
+Diameter messages into diameter.
+As a result, every Diameter request passed into diameter with a
+<c>recv</c> message (below) will be answered with a
+<c>send</c> message (above), either a &message; for the transport
+process to send or the atom <c>false</c> if the request has been
+discarded or otherwise not answered.</p>
+
+<p>
+This is to allow a transport process to keep count of the number
+of incoming request messages that have not yet been answered or
+discarded, to allow it to regulate the amount of incoming traffic.
+Both diameter_tcp and diameter_sctp request acknowledgements when a
+<c>message_cb</c> is configured, turning send/recv message into
+callbacks that can be used to regulate traffic.</p>
+</item>
+
 <tag><c>{diameter, {recv, &message;}}</c></tag>
 <item>
 <p>
diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml
index 4bfc98de40..8dcba93273 100644
--- a/lib/diameter/doc/src/notes.xml
+++ b/lib/diameter/doc/src/notes.xml
@@ -43,6 +43,58 @@ first.</p>
 
 <!-- ===================================================================== -->
 
+<section><title>diameter 2.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix inadvertently broad monitor that resulted in
+	    gen_server cast messages to hidden nodes from module
+	    diameter_dist.</p>
+          <p>
+	    Own Id: OTP-15768</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>diameter 2.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix failure of incoming answer message with faulty
+	    Experimental-Result-Code. Failure to decode the AVP
+	    resulted in an uncaught exception, with no no
+	    handle_answer/error callback as a consequence.</p>
+          <p>
+	    Own Id: OTP-15569 Aux Id: ERIERL-302 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add spawn_opt MFA configuration to allow a callback to
+	    spawn a handler process for an incoming Diameter request
+	    on an an arbitrary node. Module diameter_dist provides a
+	    route_session/2 that can be used to distribute requests
+	    based on Session-Id, although this module is currently
+	    only documented in the module itself and may change.</p>
+          <p>
+	    Own Id: OTP-15398</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>diameter 2.1.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -78,6 +130,24 @@ first.</p>
 
 </section>
 
+<section><title>diameter 2.1.4.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix failure of incoming answer message with faulty
+	    Experimental-Result-Code. Failure to decode the AVP
+	    resulted in an uncaught exception, with no no
+	    handle_answer/error callback as a consequence.</p>
+          <p>
+	    Own Id: OTP-15569 Aux Id: ERIERL-302 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>diameter 2.1.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/diameter/src/base/diameter.erl b/lib/diameter/src/base/diameter.erl
index b90b794611..7f172e1fa1 100644
--- a/lib/diameter/src/base/diameter.erl
+++ b/lib/diameter/src/base/diameter.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2019. 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.
@@ -365,7 +365,7 @@ call(SvcName, App, Message) ->
     | {connect_timer, 'Unsigned32'()}
     | {watchdog_timer, 'Unsigned32'() | {module(), atom(), list()}}
     | {watchdog_config, [{okay|suspect, non_neg_integer()}]}
-    | {spawn_opt, list()}.
+    | {spawn_opt, list() | mfa()}.
 
 %% Options passed to start_service/2
 
diff --git a/lib/diameter/src/base/diameter_callback.erl b/lib/diameter/src/base/diameter_callback.erl
index d04a416bef..3bcf550cd8 100644
--- a/lib/diameter/src/base/diameter_callback.erl
+++ b/lib/diameter/src/base/diameter_callback.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2019. 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.
@@ -70,7 +70,7 @@
 
 -module(diameter_callback).
 
-%% Default callbacks when no aleternate is specified.
+%% Default callbacks when no alternate is specified.
 -export([peer_up/3,
          peer_down/3,
          pick_peer/4,
diff --git a/lib/diameter/src/base/diameter_dist.erl b/lib/diameter/src/base/diameter_dist.erl
new file mode 100644
index 0000000000..ed23152b8b
--- /dev/null
+++ b/lib/diameter/src/base/diameter_dist.erl
@@ -0,0 +1,535 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019. 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(diameter_dist).
+
+-behaviour(gen_server).
+
+%%
+%% Implements callbacks that can be configured as a spawn_opt
+%% transport configuration, to be able to distribute incoming Diameter
+%% requests to handler processes (local or remote) in various ways.
+%%
+
+%% spawn_opt callbacks
+-export([spawn_local/2,
+         spawn_local/1,
+         route_session/2,
+         route_session/1]).
+
+%% signal availability for handling incoming requests to route_sesssion/2
+-export([attach/1,
+         detach/1]).
+
+%% consistent hashing
+-export([hash/3,   %% for use as default MFA in route_session/2 options map
+         hash/2]). %% arbitrary key/values
+
+-include_lib("diameter/include/diameter.hrl").
+
+%% server start
+-export([start_link/0]).
+
+%% gen_server callbacks
+-export([init/1,
+         handle_info/2,
+         handle_cast/2,
+         handle_call/3,
+         code_change/3,
+         terminate/2]).
+
+-type request() :: tuple().  %% callback argument from diameter_traffic
+
+-define(SERVER, ?MODULE).  %% server monitoring node connections
+
+%% Maps a node name binary to the corresponding atom. Used by
+%% route_session/2 to map the optional value of a Session-Id to
+%% node().
+-define(NODE_TABLE, diameter_dist_node).
+
+%% Maps a diameter:service_name() to a node() that has called attach/1
+%% to declare its willingness to handle incoming requests for the
+%% service. Use by route_session/2 in case the optional value mapping
+%% has failed.
+-define(SERVICE_TABLE, diameter_dist_service).
+
+-define(B(A), atom_to_binary(A, utf8)).
+-define(ORCOND(List), list_to_tuple(['orelse', false | List])).
+-define(HASH(T), erlang:phash2(T, 16#100000000)).
+
+%% spawn_local/2
+%%
+%% Callback that is equivalent to an options list. That is, the
+%% following are equivalent when passed as options to
+%% diameter:add_transport/2.
+%%
+%%   {spawn_opt, Opts}
+%%   {spawn_opt, {diameter_dist, spawn_local, [Opts]}}
+
+-spec spawn_local(ReqT :: request(), Opts :: list())
+   -> pid().
+
+spawn_local(ReqT, Opts) ->
+    spawn_opt(diameter_traffic, request, [ReqT], Opts).
+
+%% spawn_local/1
+
+spawn_local(ReqT) ->
+    spawn_local(ReqT, []).
+
+%% route_session/2
+%%
+%% Callback that maps the Session-Id of an incoming request to a
+%% handler node.
+%%
+%% With an options list, maps an id whose optional value is the name
+%% of a connected node to the same node, to handle the case that the
+%% session id has been returned from diameter:session_id/1; otherwise
+%% to a node that has called diameter_dist:attach/1 using the
+%% consistent hashing provided by hash/3, or to the local node() if a
+%% session id could not be extracted or there are no attached nodes. A
+%% handler process is spawned on the selected node using
+%% erlang:spawn_opt/4.
+%%
+%% Different behaviour can be configured by supplying an options map
+%% of the following form:
+%%
+%%   #{search => non_neg_integer(),
+%%     id => [binary()],
+%%     default => discard | local | mfa(),
+%%     dispatch => list() | mfa()}
+%%
+%% The search member limits the number of AVPs that are examined in
+%% the message (from the front), to avoid searching entire message in
+%% case it's known that peers follow RFC 6733's recommendation that
+%% Session-Id be placed at the head of a message. The default is to
+%% search the entire message.
+%%
+%% The id member restricts the optional value mapping to session ids
+%% whose DiamterIdentity is one of those specified. Set this to the
+%% list of Diameter identities advertised by the service in question
+%% (typically one) to ensure that only locally generated session ids
+%% are mapped; or to the empty list to disable the mapping.
+%%
+%% The default member determines where to handle a message whose
+%% Session-Id isn't found or whose optional value isn't mapped to the
+%% name of a connected node. The atom local says the local node, an
+%% MFA is invoked on Session-Id | false, the name of the diameter
+%% service, and the message binary, and should return either a node()
+%% or false to discard the message. Defaults to {diameter_dist, hash, []}.
+%%
+%% The dispatch member determines how the pid() of the request handler
+%% process is retrieved. An MFA is applied to a previously selected
+%% node(), and the module, function, and arguments list to apply in
+%% the handler process to handle the request, the MFA being supplied
+%% by diameter, and returns pid() | discard. A list is equivalent to
+%% {erlang, spawn_opt, []}. Defaults to [].
+%%
+%% This can be used with search = 0 to route on something other than
+%% Session-Id, but this is probably no simpler than just implementing
+%% an own spawn_opt callback. (Except with the default dispatch possibly.)
+%%
+%% Note that if the peer is also implemented with OTP diameter and
+%% generating session ids with diameter:session_id/1 then
+%% route_session/2 can map an optional value to a local node that
+%% happens to have the same name as one of the peer's nodes. This
+%% could lead to an uneven distribution; for example, if the peer
+%% nodes are a subset of the local nodes. In practice, it's typically
+%% known if it's peers or the local node originating sessions; if the
+%% former then setting id = [] disables the optional value mapping, if
+%% the latter then setting default = local disables the hashing.
+-spec route_session(ReqT :: request(), Opts)
+   -> discard
+    | pid()
+ when Opts :: pos_integer()   %% aka #{search => N}
+            | list()          %% aka #{dispatch => Opts}
+            | #{search => non_neg_integer(), %% limit number of examined AVPs
+                id => [binary()],   %% restrict optional value map on DiamIdent
+                default => local    %% handle locally
+                         | discard
+                         | mfa(),   %% return node() | false
+                dispatch => list()  %% spawn options
+                          | mfa()}. %% (Node, M, F, A) -> pid() | discard
+
+route_session(ReqT, Opts) ->
+    {_, Bin} = Info = diameter_traffic:request_info(ReqT),
+    Sid = session_id(avps(Bin), search(Opts)),
+    Node = default(node_of_session_id(Sid, Opts), Sid, Opts, Info),
+    dispatch(Node, ReqT, dispatch(Opts)).
+
+%% avps/1
+
+avps(<<_:20/binary, Bin/binary>>) ->
+    Bin;
+
+avps(_) ->
+    false.
+
+%% dispatch/3
+
+dispatch(false, _, _) ->
+    discard;
+
+dispatch(Node, ReqT, {M,F,A}) ->
+    apply(M, F, [Node, diameter_traffic, request, [ReqT] | A]);
+
+dispatch(Node, ReqT, Opts) ->
+    spawn_opt(Node, diameter_traffic, request, [ReqT], Opts).
+
+%% route_session/1
+
+route_session(ReqT) ->
+    route_session(ReqT, []).
+
+%% node_of_session_id/2
+%%
+%% Return the node name encoded as optional value in a Session-Id,
+%% assuming the id has been created with diameter:session_id/0. Lookup
+%% the node name to ensure we don't convert arbitrary binaries to
+%% atom.
+
+node_of_session_id([Id, _, _, Bin], #{id := Ids}) ->
+    lists:member(Id, Ids) andalso nodemap(Bin);
+
+node_of_session_id([_, _, _, Bin], _) ->
+    nodemap(Bin);
+
+node_of_session_id(_, _) ->
+    false.
+
+%% nodemap/1
+
+nodemap(Bin) ->
+    try
+        ets:lookup_element(?NODE_TABLE, Bin, 2)
+    catch
+        error: badarg -> false
+    end.
+
+%% session_id/2
+
+session_id(_, 0) ->  %% give up
+    false;
+
+%% Session-Id = Command Code 263, V-bit = 0.
+session_id(<<263:32, 0:1, _:7, Len:24, _/binary>> = Bin, _) ->
+    case Bin of
+        <<Avp:Len/binary, _/binary>> ->
+            <<_:8/binary, Sid/binary>> = Avp,
+            split(Sid);
+        _ ->
+            false
+    end;
+
+%% Jump to the next AVP. This is potentially costly for a message with
+%% many AVPs and no Session-Id, which an attacker is prone to send.
+%% 8.8 or RFC 6733 says that Session-Id SHOULD (but not MUST) appear
+%% immediately following the Diameter Header, so there is no
+%% guarantee.
+session_id(<<_:40, Len:24, _/binary>> = Bin, N) ->
+    Pad = (4 - (Len rem 4)) rem 4,
+    case Bin of
+        <<_:Len/binary, _:Pad/binary, Rest/binary>> ->
+            session_id(Rest, if N == infinity -> N; true -> N-1 end);
+        _ ->
+            false
+    end;
+
+session_id(_, _) ->
+    false.
+
+%% split/1
+%%
+%% Split a Session-Id at no more than three semicolons: the optional
+%% value (if any) follows the third. binary:split/2 does better than
+%% matching character by character, especially when the pattern is
+%% compiled.
+
+split(Bin) ->
+    split(3, Bin, pattern()).
+
+%% split/3
+
+split(0, Bin, _) ->
+    [Bin];
+
+split(N, Bin, Pattern) ->
+    [H|T] = binary:split(Bin, Pattern),
+    [H | case T of
+             [] ->
+                 T;
+             [Rest] ->
+                 split(N-1, Rest, Pattern)
+         end].
+
+%% pattern/0
+%%
+%% Since this is being called in a watchdog process, compile the
+%% pattern once and maintain it in the process dictionary.
+
+pattern() ->
+    case get(?MODULE) of
+        undefined ->
+            CP = binary:compile_pattern(<<$;>>), %% tuple
+            put(?MODULE, CP),
+            CP;
+        CP ->
+            CP
+    end.
+
+%% dispatch/1
+
+dispatch(#{} = Opts) ->
+    maps:get(dispatch, Opts, []);
+
+dispatch(Opts)
+  when is_list(Opts) ->
+    Opts;
+
+dispatch(_) ->
+    [].
+
+%% search/1
+%%
+%% Bound number of AVPs examined when looking for Session-Id.
+
+search(#{search := N})
+  when is_integer(N), 0 =< N ->
+    N;
+
+search(N)
+  when is_integer(N), 0 =< N ->
+    N;
+
+search(_) ->
+    infinity.
+
+%% default/3
+%%
+%% Choose a node when Session-Id lookup has failed.
+
+default(false, _, #{default := discard}, _) ->
+    false;
+
+default(false, _, #{default := local}, _) ->
+    node();
+
+default(false, Sid, #{default := {M,F,A}}, Info) ->
+    {ServiceName, Bin} = Info,
+    apply(M, F, [Sid, ServiceName, Bin | A]);  %% node() | false
+
+default(false, Sid, _, Info) -> %% aka {?MODULE, hash, []}
+    {ServiceName, Bin} = Info,
+    hash(Sid, ServiceName, Bin);
+
+default(Node, _, _, _) ->
+    Node.
+
+%% ===========================================================================
+
+%% hash/3
+%%
+%% Consistent hashing of Session-Id to an attached node, or the local
+%% node if Session-Id = false or no attached nodes.
+
+hash(Sid, ServiceName, _) ->
+    case false /= Sid andalso attached(ServiceName) of
+        [_|_] = Nodes ->
+            hash(Sid, Nodes);
+        _ ->
+            node()
+    end.
+
+%% hash/2
+%%
+%% Consistent hashing on arbitrary key/values. Returns false if the
+%% list is empty.
+
+%% No key or no values.
+hash(_, []) ->
+    false;
+
+%% Not much choice.
+hash(_, [Value]) ->
+    Value;
+
+%% Hash on a circle and choose the closest predecessor.
+hash(Key, Values) ->
+    Hash = ?HASH(Key),
+    tl(lists:foldl(fun(V,A) ->
+                           choose(Hash, [?HASH({Key, V}) | V], A)
+                   end,
+                   false,  %% < list()
+                   Values)).
+
+%% choose/3
+
+choose(Hash, [Hash1 | _] = T, [Hash2 | _])
+  when Hash1 =< Hash, Hash < Hash2 ->
+    T;
+
+choose(Hash, [Hash1 | _], [Hash2 | _] = T)
+  when Hash2 =< Hash, Hash < Hash1 ->
+    T;
+
+choose(_, T1, T2) ->
+    max(T1, T2).
+
+%% ===========================================================================
+
+%% attach/1
+%%
+%% Register the local node as a handler of incoming requests for the
+%% specified services when using the route_session/2 spawn_opt
+%% callback.
+
+attach(ServiceNames) ->
+    abcast({attach, node(), ServiceNames}).
+
+%% detach/1
+%%
+%% Deregister the local node as a handler of incoming requests.
+
+detach(ServiceNames) ->
+    abcast({detach, node(), ServiceNames}).
+
+%% abcast/1
+
+abcast(T) ->
+    gen_server:abcast([node() | nodes()], ?SERVER, T),
+    ok.
+
+%% attached/1
+
+attached(ServiceName) ->
+    try
+        ets:lookup_element(?SERVICE_TABLE, ServiceName, 2)
+    catch
+        error: badarg -> []
+    end.
+
+%% cast/2
+
+cast(Node, T) ->
+    gen_server:cast({?SERVER, Node}, T).
+
+%% attach/2
+
+attach(Node, S) ->
+    case sets:to_list(S) of
+        [] ->
+            ok;
+        Services ->
+            cast(Node, {attach, node(), Services})
+    end.
+
+%% ===========================================================================
+
+start_link() ->
+    gen_server:start_link({local, ?SERVER}, ?MODULE, _Args = [], _Opts  = []).
+
+%% init/1
+%%
+%% Maintain [node() | nodes()] in a table that maps from binary-valued
+%% names, so we can lookup the corresponding atoms rather than convert
+%% binaries that aren't necessarily node names.
+
+init([]) ->
+    ets:new(?NODE_TABLE,    [set, named_table]),
+    ets:new(?SERVICE_TABLE, [bag, named_table]),
+    ok = net_kernel:monitor_nodes(true, [{node_type, visible},
+                                         nodedown_reason]),
+    ets:insert(?NODE_TABLE, [{?B(N), N} || N <- [node() | nodes()]]),
+    abcast({attach, node()}),
+    {ok, sets:new()}.
+
+%% handle_call/3
+
+handle_call(_, _From, S) ->
+    {reply, nok, S}.
+
+%% handle_cast/2
+
+%% Remote node is asking which services the local node wants to handle.
+handle_cast({attach, Node}, S)
+  when Node /= node() ->
+    attach(Node, S),
+    {noreply, S};
+
+%% Node wants to handle incoming requests ...
+handle_cast({attach, Node, ServiceNames}, S) ->
+    ets:insert(?SERVICE_TABLE, [{N, Node} || N <- ServiceNames]),
+    {noreply, case node() of
+                  Node ->
+                      sets:union(S, sets:from_list(ServiceNames));
+                  _ ->
+                      S
+              end};
+
+%% ... or not.
+handle_cast({detach, Node, ServiceNames}, S) ->
+    ets:select_delete(?SERVICE_TABLE, [{{'$1', Node},
+                                        [?ORCOND([{'==', '$1', {const, N}}
+                                                  || N <- ServiceNames])],
+                                        [true]}]),
+    {noreply, case node() of
+                  Node ->
+                      sets:subtract(S, sets:from_list(ServiceNames));
+                  _ ->
+                      S
+              end};
+
+handle_cast(_, S) ->
+    {noreply, S}.
+
+%% handle_info/2
+
+handle_info({nodeup, Node, _}, S) ->
+    ets:insert(?NODE_TABLE, {?B(Node), Node}),
+    cast(Node, {attach, node()}),  %% ask which services remote node handles
+    attach(Node, S),               %% say which service local node handles
+    {noreply, S};
+
+handle_info({nodedown, Node, _}, S) ->
+    ets:delete(?NODE_TABLE, ?B(Node)),
+    ets:select_delete(?SERVICE_TABLE, [{{'_', Node}, [], [true]}]),
+    {noreply, S};
+
+handle_info(_, S) ->
+    {noreply, S}.
+
+%% terminate/2
+
+terminate(_, _) ->
+    ok.
+
+%% code_change/3
+
+%% Old code inadvertently monitored all nodes: start a new
+%% subscription and remove the old one.
+code_change(_OldVsn, State, "2.2") ->
+    ok = net_kernel:monitor_nodes(true, [{node_type, visible},
+                                         nodedown_reason]),
+    ok = net_kernel:monitor_nodes(false, [{node_type, all},
+                                          nodedown_reason]),
+    {ok, State};
+
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
diff --git a/lib/diameter/src/base/diameter_gen.erl b/lib/diameter/src/base/diameter_gen.erl
index d110a3015e..564448de48 100644
--- a/lib/diameter/src/base/diameter_gen.erl
+++ b/lib/diameter/src/base/diameter_gen.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2019. 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.
diff --git a/lib/diameter/src/base/diameter_misc_sup.erl b/lib/diameter/src/base/diameter_misc_sup.erl
index 343688be23..fec5a41b5c 100644
--- a/lib/diameter/src/base/diameter_misc_sup.erl
+++ b/lib/diameter/src/base/diameter_misc_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2019. 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,6 +35,7 @@
                    diameter_stats,     %% statistics counter management
                    diameter_reg,       %% service/property publishing
                    diameter_peer,      %% remote peer manager
+                   diameter_dist,      %% request distribution
                    diameter_config]).  %% configuration/restart
 
 %% start_link/0
diff --git a/lib/diameter/src/base/diameter_traffic.erl b/lib/diameter/src/base/diameter_traffic.erl
index d2856ae530..8423e30269 100644
--- a/lib/diameter/src/base/diameter_traffic.erl
+++ b/lib/diameter/src/base/diameter_traffic.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2019. 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.
@@ -42,8 +42,12 @@
          peer_up/1,
          peer_down/1]).
 
+%% towards diameter_dist
+-export([request_info/1]).
+
 %% internal
 -export([send/1,    %% send from remote node
+         request/1, %% process request in handler process
          init/1]).  %% monitor process start
 
 -include_lib("diameter/include/diameter.hrl").
@@ -232,7 +236,7 @@ incr_rc(Dir, Pkt, TPid, MsgDict, AppDict, Dict0) ->
 -spec receive_message(pid(), Route, #diameter_packet{}, module(), RecvData)
    -> pid()     %% request handler
     | boolean() %% answer, known request or not
-    | discard   %% request discarded by MFA
+    | discard   %% request discarded
  when Route :: {Handler, RequestRef, TPid}
              | Ack,
       RecvData :: {[SpawnOpt], #recvdata{}},
@@ -252,7 +256,8 @@ receive_message(TPid, Route, Pkt, Dict0, RecvData) ->
 recv(true, Ack, TPid, Pkt, Dict0, T)
   when is_boolean(Ack) ->
     {Opts, RecvData} = T,
-    spawn_request(Ack, TPid, Pkt, Dict0, RecvData, Opts);
+    AppT = find_app(TPid, Pkt, RecvData),
+    ack(Ack, TPid, spawn_request(AppT, Opts, Ack, TPid, Pkt, Dict0, RecvData));
 
 %% ... answer to known request ...
 recv(false, {Pid, Ref, TPid}, _, Pkt, Dict0, _) ->
@@ -274,58 +279,73 @@ recv(false, false, TPid, Pkt, _, _) ->
     incr(TPid, {{unknown, 0}, recv, discarded}),
     false.
 
-%% spawn_request/6
+%% spawn_request/7
+
+spawn_request(false, _, _, _, _, _, _) ->  %% no transport
+    discard;
 
-%% An MFA should return a pid() or the atom 'discard'. The latter
-%% results in an acknowledgment back to the transport process when
-%% appropriate, to ensure that send/recv callbacks can count
-%% outstanding requests. Acknowledgement is implicit if the
+%% An MFA should return the pid() of a process in which the argument
+%% fun in applied, or the atom 'discard' if the fun is not applied.
+%% The latter results in an acknowledgment back to the transport
+%% process when appropriate, to ensure that send/recv callbacks can
+%% count outstanding requests. Acknowledgement is implicit if the
 %% handler process dies (in a handle_request callback for example).
-spawn_request(Ack, TPid, Pkt, Dict0, RecvData, {M,F,A}) ->
-    ReqF = fun() ->
-                   ack(Ack, TPid, recv_request(Ack, TPid, Pkt, Dict0, RecvData))
-           end,
-    ack(Ack, TPid, apply(M, F, [ReqF | A]));
+spawn_request(AppT, {M,F,A}, Ack, TPid, Pkt, Dict0, RecvData) ->
+    %% Term to pass to request/1 in an appropriate process. Module
+    %% diameter_dist implements callbacks.
+    ReqT = {Pkt, AppT, Ack, TPid, Dict0, RecvData},
+    apply(M, F, [ReqT | A]);
 
 %% A spawned process acks implicitly when it dies, so there's no need
 %% to handle 'discard'.
-spawn_request(Ack, TPid, Pkt, Dict0, RecvData, Opts) ->
+spawn_request(AppT, Opts, Ack, TPid, Pkt, Dict0, RecvData) ->
     spawn_opt(fun() ->
-                      recv_request(Ack, TPid, Pkt, Dict0, RecvData)
+                      recv_request(Ack, TPid, Pkt, Dict0, RecvData, AppT)
               end,
               Opts).
 
+%% request_info/1
+%%
+%% Limited request information for diameter_dist.
+
+request_info({Pkt, _AppT, _Ack, _TPid, _Dict0, RecvData} = _ReqT) ->
+    {RecvData#recvdata.service_name, Pkt#diameter_packet.bin}.
+
+%% request/1
+%%
+%% Called from a handler process chosen by a transport spawn_opt MFA
+%% to process an incoming request.
+
+request({Pkt, AppT, Ack, TPid, Dict0, RecvData} = _ReqT) ->
+    ack(Ack, TPid, recv_request(Ack, TPid, Pkt, Dict0, RecvData, AppT)).
+
 %% ack/3
 
 ack(Ack, TPid, RC) ->
-    RC == discard andalso Ack andalso (TPid ! {send, false}),
+    RC == discard
+        andalso Ack
+        andalso (TPid ! {send, false}),
     RC.
 
 %% ---------------------------------------------------------------------------
-%% recv_request/5
+%% recv_request/6
 %% ---------------------------------------------------------------------------
 
 -spec recv_request(Ack :: boolean(),
                    TPid :: pid(),
                    #diameter_packet{},
                    Dict0 :: module(),
-                   #recvdata{})
+                   #recvdata{},
+                   AppT :: {#diameter_app{}, #diameter_caps{}}
+                         | #diameter_caps{}) %% no suitable app
    -> ok        %% answer was sent
-    | discard   %% or not
-    | false.    %% no transport
-
-recv_request(Ack,
-             TPid,
-             #diameter_packet{header = #diameter_header{application_id = Id}}
-             = Pkt,
-             Dict0,
-             #recvdata{peerT = PeerT,
-                       apps = Apps,
-                       counters = Count}
-             = RecvData) ->
+    | discard.  %% or not
+
+recv_request(Ack, TPid, Pkt, Dict0, RecvData, AppT) ->
     Ack andalso (TPid ! {handler, self()}),
-    case diameter_service:find_incoming_app(PeerT, TPid, Id, Apps) of
+    case AppT of
         {#diameter_app{id = Aid, dictionary = AppDict} = App, Caps} ->
+            Count = RecvData#recvdata.counters,
             Count andalso incr(recv, Pkt, TPid, AppDict),
             DecPkt = decode(Aid, AppDict, RecvData, Pkt),
             Count andalso incr_error(recv, DecPkt, TPid, AppDict),
@@ -349,11 +369,20 @@ recv_request(Ack,
                         Dict0,
                         RecvData,
                         DecPkt,
-                        [[]]);
-        false = No ->  %% transport has gone down
-            No
+                        [[]])
     end.
 
+%% find_app/3
+%%
+%% Lookup the application of a received Diameter request on the node
+%% on which it's received.
+
+find_app(TPid,
+         #diameter_packet{header = #diameter_header{application_id = Id}},
+         #recvdata{peerT = PeerT,
+                   apps = Apps}) ->
+    diameter_service:find_incoming_app(PeerT, TPid, Id, Apps).
+
 %% decode/4
 
 decode(Id, Dict, #recvdata{codec = Opts}, Pkt) ->
@@ -1925,6 +1954,8 @@ get_avp(Dict, Name, [#diameter_header{} | Avps]) ->
         A = find_avp(Code, Vid, Avps),
         avp_decode(Dict, Name, ungroup(A))
     catch
+        {diameter_gen, _} ->  %% faulty Grouped AVP
+            undefined;
         error: _ ->
             undefined
     end;
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index 51830f5276..bb2a4a8e92 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2019. 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.
@@ -59,7 +59,10 @@
   {"2.1.2",   [{restart_application, diameter}]},  %% 20.1.3
   {"2.1.3",   [{restart_application, diameter}]},  %% 20.2
   {"2.1.4",   [{restart_application, diameter}]},  %% 20.3
-  {"2.1.5",   [{update, diameter_peer_fsm}]}       %% 21.0
+  {"2.1.4.1", [{restart_application, diameter}]},  %% 20.3.8.19
+  {"2.1.5",   [{restart_application, diameter}]},  %% 21.0
+  {"2.1.6",   [{restart_application, diameter}]},  %% 21.1
+  {"2.2",     [{update, diameter_dist, {advanced, "2.2"}}]} %% 21.3
  ],
  [
   {"0.9",     [{restart_application, diameter}]},
@@ -100,6 +103,9 @@
   {"2.1.2",   [{restart_application, diameter}]},
   {"2.1.3",   [{restart_application, diameter}]},
   {"2.1.4",   [{restart_application, diameter}]},
-  {"2.1.5",   [{update, diameter_peer_fsm}]}
+  {"2.1.4.1", [{restart_application, diameter}]},
+  {"2.1.5",   [{restart_application, diameter}]},
+  {"2.1.6",   [{restart_application, diameter}]},
+  {"2.2",     [{restart_application, diameter}]}
  ]
 }.
diff --git a/lib/diameter/src/modules.mk b/lib/diameter/src/modules.mk
index bb86de016a..d16292bb88 100644
--- a/lib/diameter/src/modules.mk
+++ b/lib/diameter/src/modules.mk
@@ -1,7 +1,7 @@
 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2010-2017. All Rights Reserved.
+# Copyright Ericsson AB 2010-2019. 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 @@ RT_MODULES = \
 	base/diameter_config \
 	base/diameter_config_sup \
 	base/diameter_codec \
+	base/diameter_dist \
 	base/diameter_gen \
 	base/diameter_lib \
 	base/diameter_misc_sup \
diff --git a/lib/diameter/src/transport/diameter_tcp.erl b/lib/diameter/src/transport/diameter_tcp.erl
index da059fa7d6..e5e766d2a0 100644
--- a/lib/diameter/src/transport/diameter_tcp.erl
+++ b/lib/diameter/src/transport/diameter_tcp.erl
@@ -92,9 +92,9 @@
 
 -type connect_option() :: {raddr, inet:ip_address()}
                         | {rport, pos_integer()}
-                        | {ssl_options, true | [ssl:connect_option()]}
+                        | {ssl_options, true | [ssl:tls_client_option()]}
                         | option()
-                        | ssl:connect_option()
+                        | ssl:tls_client_option()
                         | gen_tcp:connect_option().
 
 -type match() :: inet:ip_address()
@@ -102,9 +102,9 @@
                | [match()].
 
 -type listen_option() :: {accept, match()}
-                       | {ssl_options, true | [ssl:listen_option()]}
+                       | {ssl_options, true | [ssl:tls_server_option()]}
                        | option()
-                       | ssl:listen_option()
+                       | ssl:tls_server_option()
                        | gen_tcp:listen_option().
 
 -type option() :: {port, non_neg_integer()}
diff --git a/lib/diameter/test/diameter_dist_SUITE.erl b/lib/diameter/test/diameter_dist_SUITE.erl
new file mode 100644
index 0000000000..b2e4c35b9a
--- /dev/null
+++ b/lib/diameter/test/diameter_dist_SUITE.erl
@@ -0,0 +1,332 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019. 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 of traffic between two Diameter nodes, the server being
+%% spread across three Erlang nodes.
+%%
+
+-module(diameter_dist_SUITE).
+
+-export([suite/0,
+         all/0]).
+
+%% testcases
+-export([enslave/1, enslave/0,
+         ping/1,
+         start/1,
+         connect/1,
+         send/1,
+         stop/1, stop/0]).
+
+%% diameter callbacks
+-export([peer_up/3,
+         peer_down/3,
+         pick_peer/4,
+         prepare_request/3,
+         prepare_retransmit/3,
+         handle_answer/4,
+         handle_error/4,
+         handle_request/3]).
+
+-export([call/1]).
+
+-include("diameter.hrl").
+-include("diameter_gen_base_rfc6733.hrl").
+
+%% ===========================================================================
+
+-define(util, diameter_util).
+
+-define(CLIENT, 'CLIENT').
+-define(SERVER, 'SERVER').
+-define(REALM, "erlang.org").
+-define(DICT, diameter_gen_base_rfc6733).
+-define(ADDR, {127,0,0,1}).
+
+%% Config for diameter:start_service/2.
+-define(SERVICE(Host),
+        [{'Origin-Host', Host ++ [$.|?REALM]},
+         {'Origin-Realm', ?REALM},
+         {'Host-IP-Address', [?ADDR]},
+         {'Vendor-Id', 12345},
+         {'Product-Name', "OTP/diameter"},
+         {'Auth-Application-Id', [?DICT:id()]},
+         {'Origin-State-Id', origin()},
+         {spawn_opt, {diameter_dist, route_session, [#{id => []}]}},
+         {sequence, fun sequence/0},
+         {string_decode, false},
+         {application, [{dictionary, ?DICT},
+                        {module, ?MODULE},
+                        {request_errors, callback},
+                        {answer_errors, callback}]}]).
+
+-define(SUCCESS, 2001).
+-define(BUSY,    3004).
+-define(LOGOUT,  ?'DIAMETER_BASE_TERMINATION-CAUSE_LOGOUT').
+-define(MOVED,   ?'DIAMETER_BASE_TERMINATION-CAUSE_USER_MOVED').
+-define(TIMEOUT, ?'DIAMETER_BASE_TERMINATION-CAUSE_SESSION_TIMEOUT').
+
+-define(L, atom_to_list).
+-define(A, list_to_atom).
+
+%% The order here is significant and causes the server to listen
+%% before the clients connect. The server listens on the first node,
+%% and distributes requests to the other two.
+-define(NODES, [{server0, ?SERVER},
+                {server1, ?SERVER},
+                {server2, ?SERVER},
+                {client, ?CLIENT}]).
+
+%% Options to ct_slave:start/2.
+-define(TIMEOUTS, [{T, 15000} || T <- [boot_timeout,
+                                       init_timeout,
+                                       start_timeout]]).
+
+%% ===========================================================================
+
+suite() ->
+    [{timetrap, {seconds, 60}}].
+
+all() ->
+    [enslave,
+     ping,
+     start,
+     connect,
+     send,
+     stop].
+
+%% ===========================================================================
+%% start/stop testcases
+
+%% enslave/1
+%%
+%% Start four slave nodes, three to implement a Diameter server,
+%% one to implement a client.
+
+enslave() ->
+    [{timetrap, {seconds, 30*length(?NODES)}}].
+
+enslave(Config) ->
+    Here = filename:dirname(code:which(?MODULE)),
+    Ebin = filename:join([Here, "..", "ebin"]),
+    Dirs = [Here, Ebin],
+    Nodes = [{N,S} || {M,S} <- ?NODES, N <- [slave(M, Dirs)]],
+    ?util:write_priv(Config, nodes, [{N,S} || {{N,ok},S} <- Nodes]),
+    [] = [{T,S} || {{_,E} = T, S} <- Nodes, E /= ok].
+
+slave(Name, Dirs) ->
+    add_pathsa(Dirs, ct_slave:start(Name, ?TIMEOUTS)).
+
+add_pathsa(Dirs, {ok, Node}) ->
+    {Node, rpc:call(Node, code, add_pathsa, [Dirs])};
+add_pathsa(_, No) ->
+    {No, error}.
+
+%% ping/1
+%%
+%% Ensure the server nodes are connected so that diameter_dist can attach.
+
+ping({S, Nodes}) ->
+    ?SERVER = S,
+    [N || {N,_} <- Nodes,
+          node() /= N,
+          pang <- [net_adm:ping(N)]];
+
+ping(Config) ->
+    Nodes = lists:droplast(?util:read_priv(Config, nodes)),
+    [] = [{N,RC} || {N,S} <- Nodes,
+                    RC <- [rpc:call(N, ?MODULE, ping, [{S,Nodes}])],
+                    RC /= []].
+
+%% start/1
+%%
+%% Start diameter services.
+
+start(SvcName)
+  when is_atom(SvcName) ->
+    ok = diameter:start(),
+    ok = diameter:start_service(SvcName, ?SERVICE((?L(SvcName))));
+
+start(Config) ->
+    Nodes = ?util:read_priv(Config, nodes),
+    [] = [{N,RC} || {N,S} <- Nodes,
+                    RC <- [rpc:call(N, ?MODULE, start, [S])],
+                    RC /= ok].
+
+sequence() ->
+    sequence(sname()).
+
+sequence(client) ->
+    {0,32};
+sequence(Server) ->
+    "server" ++ N = ?L(Server),
+    {list_to_integer(N), 30}.
+
+origin() ->
+    origin(sname()).
+
+origin(client) ->
+    99;
+origin(Server) ->
+    "server" ++ N = ?L(Server),
+    list_to_integer(N).
+
+%% connect/1
+%%
+%% Establish one connection from the client, terminated on the first
+%% server node, the others handling requests.
+
+connect({?SERVER, Config, [{Node, _} | _]}) ->
+    if Node == node() ->  %% server0
+            ?util:write_priv(Config, lref, {Node, ?util:listen(?SERVER, tcp)});
+       true ->
+            diameter_dist:attach([?SERVER])
+    end,
+    ok;
+
+connect({?CLIENT, Config, _}) ->
+    ?util:connect(?CLIENT, tcp, ?util:read_priv(Config, lref)),
+    ok;
+
+connect(Config) ->
+    Nodes = ?util:read_priv(Config, nodes),
+    [] = [{N,RC} || {N,S} <- Nodes,
+                    RC <- [rpc:call(N, ?MODULE, connect, [{S, Config, Nodes}])],
+                    RC /= ok].
+
+%% stop/1
+%%
+%% Stop the slave nodes.
+
+stop() ->
+    [{timetrap, {seconds, 30*length(?NODES)}}].
+
+stop(_Config) ->
+    [] = [{N,E} || {N,_} <- ?NODES,
+                   {error, _, _} = E <- [ct_slave:stop(N)]].
+
+%% ===========================================================================
+%% traffic testcases
+
+%% send/1
+%%
+%% Send 100 requests and ensure the node name sent as User-Name isn't
+%% the node terminating transport.
+
+send(Config) ->
+    send(Config, 100, dict:new()).
+
+%% send/2
+
+send(Config, 0, Dict) ->
+    [{Server0, _} | _] = ?util:read_priv(Config, nodes) ,
+    Node = atom_to_binary(Server0, utf8),
+    {false, _} = {dict:is_key(Node, Dict), dict:to_list(Dict)};
+
+send(Config, N, Dict) ->
+    #diameter_base_STA{'Result-Code' = ?SUCCESS,
+                       'User-Name' = [ServerNode]}
+        = send(Config, str(?LOGOUT)),
+    true = is_binary(ServerNode),
+    send(Config, N-1, dict:update_counter(ServerNode, 1, Dict)).
+
+%% ===========================================================================
+
+str(Cause) ->
+    #diameter_base_STR{'Destination-Realm'   = ?REALM,
+                       'Auth-Application-Id' = ?DICT:id(),
+                       'Termination-Cause'   = Cause}.
+
+%% send/2
+
+send(Config, Req) ->
+    {Node, _} = lists:last(?util:read_priv(Config, nodes)),
+    rpc:call(Node, ?MODULE, call, [Req]).
+
+%% call/1
+
+call(Req) ->
+    diameter:call(?CLIENT, ?DICT, Req, []).
+
+%% sname/0
+
+sname() ->
+    ?A(hd(string:tokens(?L(node()), "@"))).
+
+%% ===========================================================================
+%% diameter callbacks
+
+%% peer_up/3
+
+peer_up(_SvcName, _Peer, State) ->
+    State.
+
+%% peer_down/3
+
+peer_down(_SvcName, _Peer, State) ->
+    State.
+
+%% pick_peer/4
+
+pick_peer([Peer], [], ?CLIENT, _State) ->
+    {ok, Peer}.
+
+%% prepare_request/3
+
+prepare_request(Pkt, ?CLIENT, {_Ref, Caps}) ->
+    #diameter_packet{msg = Req}
+        = Pkt,
+    #diameter_caps{origin_host  = {OH, _},
+                   origin_realm = {OR, _}}
+        = Caps,
+    {send, Req#diameter_base_STR{'Origin-Host' = OH,
+                                 'Origin-Realm' = OR,
+                                 'Session-Id' = diameter:session_id(OH)}}.
+
+%% prepare_retransmit/3
+
+prepare_retransmit(_, ?CLIENT, _) ->
+    discard.
+
+%% handle_answer/5
+
+handle_answer(Pkt, _Req, ?CLIENT, _Peer) ->
+    #diameter_packet{msg = Rec, errors = []} = Pkt,
+    Rec.
+
+%% handle_error/5
+
+handle_error(Reason, _Req, ?CLIENT, _Peer) ->
+    {error, Reason}.
+
+%% handle_request/3
+
+handle_request(Pkt, ?SERVER, {_, Caps}) ->
+    #diameter_packet{msg = #diameter_base_STR{'Session-Id' = SId}}
+        = Pkt,
+    #diameter_caps{origin_host  = {OH, _},
+                   origin_realm = {OR, _}}
+        = Caps,
+    {reply, #diameter_base_STA{'Result-Code' = ?SUCCESS,
+                               'Session-Id' = SId,
+                               'Origin-Host' = OH,
+                               'Origin-Realm' = OR,
+                               'User-Name' = [atom_to_binary(node(), utf8)]}}.
diff --git a/lib/diameter/test/diameter_distribution_SUITE.erl b/lib/diameter/test/diameter_distribution_SUITE.erl
index 5146f68ff1..5fe02284ae 100644
--- a/lib/diameter/test/diameter_distribution_SUITE.erl
+++ b/lib/diameter/test/diameter_distribution_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2019. 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.
@@ -76,6 +76,7 @@
          {share_peers, peers()},
          {use_shared_peers, peers()},
          {restrict_connections, false},
+         {spawn_opt, {diameter_dist, spawn_local, []}},
          {sequence, fun sequence/0},
          {application, [{dictionary, ?DICT},
                         {module, ?MODULE},
@@ -125,7 +126,7 @@ all() ->
 %% enslave/1
 %%
 %% Start four slave nodes, one to implement a Diameter server,
-%% two three to implement a client.
+%% three to implement a client.
 
 enslave() ->
     [{timetrap, {seconds, 30*length(?NODES)}}].
@@ -331,6 +332,8 @@ prepare_request(Pkt, ?CLIENT, {_Ref, Caps}, {_, client0}) ->
                                  'Origin-Realm' = OR,
                                  'Session-Id' = diameter:session_id(OH)}}.
 
+%% prepare_retransmit/4
+
 prepare_retransmit(Pkt, ?CLIENT, _, {_, client0}) ->
     #diameter_packet{msg = #diameter_base_STR{'Termination-Cause' = ?MOVED}}
         = Pkt,  %% assert
diff --git a/lib/diameter/test/diameter_pool_SUITE.erl b/lib/diameter/test/diameter_pool_SUITE.erl
index 97c16940ff..a36a4fa17a 100644
--- a/lib/diameter/test/diameter_pool_SUITE.erl
+++ b/lib/diameter/test/diameter_pool_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2015-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2015-2019. 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.
@@ -51,6 +51,7 @@
          {'Auth-Application-Id', [0]},  %% common
          {'Acct-Application-Id', [3]},  %% accounting
          {restrict_connections, false},
+         {spawn_opt, {diameter_dist, route_session, []}},
          {application, [{alias, common},
                         {dictionary, diameter_gen_base_rfc6733},
                         {module, diameter_callback}]},
diff --git a/lib/diameter/test/diameter_traffic_SUITE.erl b/lib/diameter/test/diameter_traffic_SUITE.erl
index 434aef01dd..47b00c25a2 100644
--- a/lib/diameter/test/diameter_traffic_SUITE.erl
+++ b/lib/diameter/test/diameter_traffic_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2019. 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.
@@ -539,8 +539,7 @@ add_transports(Config) ->
                         ++ [{unordered, unordered()} || T == sctp],
                         [{capabilities_cb, fun capx/2},
                          {pool_size, 8}
-                         | server_apps()]
-                        ++ [{spawn_opt, {erlang, spawn, []}} || CS]),
+                         | server_apps()]),
     Cs = [?util:connect(CN,
                         [T, {sender, CS} | client_opts(T)],
                         LRef,
diff --git a/lib/diameter/test/modules.mk b/lib/diameter/test/modules.mk
index 0c73adca12..90b0a25d5f 100644
--- a/lib/diameter/test/modules.mk
+++ b/lib/diameter/test/modules.mk
@@ -1,7 +1,7 @@
 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2010-2017. All Rights Reserved.
+# Copyright Ericsson AB 2010-2019. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@ MODULES = \
 	diameter_codec_test \
 	diameter_config_SUITE \
 	diameter_compiler_SUITE \
+	diameter_dist_SUITE \
 	diameter_distribution_SUITE \
 	diameter_dpr_SUITE \
 	diameter_event_SUITE \
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index 8c75c9e55e..a8fbca5bc8 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -17,5 +17,5 @@
 # %CopyrightEnd%
 
 APPLICATION  = diameter
-DIAMETER_VSN = 2.1.6
+DIAMETER_VSN = 2.2.1
 APP_VSN      = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)
diff --git a/lib/edoc/doc/edoc.dtd b/lib/edoc/doc/edoc.dtd
new file mode 120000
index 0000000000..43f4b27db6
--- /dev/null
+++ b/lib/edoc/doc/edoc.dtd
@@ -0,0 +1 @@
+../priv/edoc.dtd
\ No newline at end of file
diff --git a/lib/edoc/doc/edoc_doclet.hrl b/lib/edoc/doc/edoc_doclet.hrl
new file mode 120000
index 0000000000..4623b18bb4
--- /dev/null
+++ b/lib/edoc/doc/edoc_doclet.hrl
@@ -0,0 +1 @@
+../include/edoc_doclet.hrl
\ No newline at end of file
diff --git a/lib/edoc/doc/src/Makefile b/lib/edoc/doc/src/Makefile
index aba94a6802..3e53e75c75 100644
--- a/lib/edoc/doc/src/Makefile
+++ b/lib/edoc/doc/src/Makefile
@@ -79,6 +79,11 @@ HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
+INCLUDES_DIR = ../../include
+INCLUDES = $(INCLUDES_DIR)/edoc_doclet.hrl
+
+DTDS_DIR = ../../priv
+DTDS = $(DTDS_DIR)/edoc.dtd
 
 # ----------------------------------------------------
 # FLAGS
@@ -135,5 +140,6 @@ release_docs_spec: docs
 	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
 	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
 	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DATA) $(INCLUDES) $(DTDS) "$(RELSYSDIR)/doc/html"
 
 release_spec:
diff --git a/lib/edoc/doc/src/notes.xml b/lib/edoc/doc/src/notes.xml
index e818887eb8..48bc5d9c74 100644
--- a/lib/edoc/doc/src/notes.xml
+++ b/lib/edoc/doc/src/notes.xml
@@ -32,6 +32,36 @@
   <p>This document describes the changes made to the EDoc
     application.</p>
 
+<section><title>Edoc 0.11</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Correct links in the documentation. </p>
+          <p>
+	    Own Id: OTP-15761</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Edoc 0.10</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Print a helpful message explaining that adding
+	    <c>{preprocess, true}</c> can help if reading a source
+	    file fails. </p>
+          <p>
+	    Own Id: OTP-15605 Aux Id: ERL-841 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Edoc 0.9.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/edoc/include/edoc_doclet.hrl b/lib/edoc/include/edoc_doclet.hrl
index 1429ee5971..a05a9cb2bc 100644
--- a/lib/edoc/include/edoc_doclet.hrl
+++ b/lib/edoc/include/edoc_doclet.hrl
@@ -43,7 +43,7 @@
 %% @type no_app().
 %%    A value used to mark absence of an Erlang application
 %%    context. Use the macro `NO_APP' defined in
-%%    <a href="../include/edoc_doclet.hrl">`edoc_doclet.hrl'</a>
+%%    <a href="edoc_doclet.hrl">`edoc_doclet.hrl'</a>
 %%    to produce this value.
 
 %% @type doclet_gen() = #doclet_gen{sources = [string()],
diff --git a/lib/edoc/src/edoc.erl b/lib/edoc/src/edoc.erl
index b641118c5d..62483602aa 100644
--- a/lib/edoc/src/edoc.erl
+++ b/lib/edoc/src/edoc.erl
@@ -578,7 +578,7 @@ read_source(Name, Opts0) ->
     Opts = expand_opts(Opts0),
     case read_source_1(Name, Opts) of
 	{ok, Forms} ->
-	    check_forms(Forms, Name),
+	    check_forms(Forms, Name, Opts),
 	    Forms;
 	{error, R} ->
 	    edoc_report:error({"error reading file '~ts'.",
@@ -692,13 +692,19 @@ fll([T | L], LastLine, Ts) ->
 fll(L, _LastLine, Ts) ->
     lists:reverse(L, Ts).
 
-check_forms(Fs, Name) ->
+check_forms(Fs, Name, Opts) ->
     Fun = fun (F) ->
 	     case erl_syntax:type(F) of
 		 error_marker ->
 		     case erl_syntax:error_marker_info(F) of
 			 {L, M, D} ->
-			     edoc_report:error(L, Name, {format_error, M, D});
+                             edoc_report:error(L, Name, {format_error, M, D}),
+                             case proplists:get_bool(preprocess, Opts) of
+                                 true ->
+                                     ok;
+                                 false ->
+                                     helpful_message(Name)
+                             end;
 			 Other ->
 			     edoc_report:report(Name, "unknown error in "
                                                 "source code: ~w.", [Other])
@@ -710,6 +716,11 @@ check_forms(Fs, Name) ->
 	  end,
     lists:foreach(Fun, Fs).
 
+helpful_message(Name) ->
+    Ms = ["If the error is caused by too exotic macro",
+          "definitions or uses of macros, adding option",
+          "{preprocess, true} can help. See also edoc(3)."],
+    lists:foreach(fun(M) -> edoc_report:report(Name, M, []) end, Ms).
 
 %% @spec get_doc(File::filename()) -> {ModuleName, edoc_module()}
 %% @equiv get_doc(File, [])
@@ -723,7 +734,7 @@ get_doc(File) ->
 %%
 %% @type edoc_module(). The EDoc documentation data for a module,
 %% expressed as an XML document in {@link //xmerl. XMerL} format. See
-%% the file <a href="../priv/edoc.dtd">`edoc.dtd'</a> for details.
+%% the file <a href="edoc.dtd">`edoc.dtd'</a> for details.
 %%
 %% @doc Reads a source code file and extracts EDoc documentation data.
 %% Note that without an environment parameter (see {@link get_doc/3}),
diff --git a/lib/edoc/src/edoc_data.erl b/lib/edoc/src/edoc_data.erl
index 7c077d3acd..a8373d6536 100644
--- a/lib/edoc/src/edoc_data.erl
+++ b/lib/edoc/src/edoc_data.erl
@@ -345,6 +345,8 @@ deprecated(Repl, Env) ->
 deprecated(Desc) ->
     [{deprecated, description(Desc)}].
 
+-dialyzer({no_match, replacement_function/2}).
+
 replacement_function(M0, {M,F,A}) when is_list(A) ->
     %% refer to the largest listed arity - the most general version
     replacement_function(M0, {M,F,lists:last(lists:sort(A))});
diff --git a/lib/edoc/src/edoc_doclet.erl b/lib/edoc/src/edoc_doclet.erl
index 6cb3095507..604291374a 100644
--- a/lib/edoc/src/edoc_doclet.erl
+++ b/lib/edoc/src/edoc_doclet.erl
@@ -62,7 +62,7 @@
 
 %% @spec (Command::doclet_gen() | doclet_toc(), edoc_context()) -> ok
 %% @doc Main doclet entry point. See the file <a
-%% href="../include/edoc_doclet.hrl">`edoc_doclet.hrl'</a> for the data
+%% href="edoc_doclet.hrl">`edoc_doclet.hrl'</a> for the data
 %% structures used for passing parameters.
 %%
 %% Also see {@link edoc:layout/2} for layout-related options, and
diff --git a/lib/edoc/vsn.mk b/lib/edoc/vsn.mk
index 0b3636f030..3510fdfccf 100644
--- a/lib/edoc/vsn.mk
+++ b/lib/edoc/vsn.mk
@@ -1 +1 @@
-EDOC_VSN = 0.9.4
+EDOC_VSN = 0.11
diff --git a/lib/eldap/README b/lib/eldap/README
index e1bde9d658..238f140e93 100644
--- a/lib/eldap/README
+++ b/lib/eldap/README
@@ -23,7 +23,7 @@ system has been configured with SSL.
 In the test directory there are some hints and examples
 on how to test the code and how to setup and populate 
 an OpenLDAP server. The 'eldap' code has been tested
-agains OpenLDAP, IPlanet and ActiveDirectory servers.
+against OpenLDAP, IPlanet and ActiveDirectory servers.
 
 If you plan to incorporate this code into your system
 I suggest that you build a server/supervisor harnesk
diff --git a/lib/eldap/doc/src/eldap.xml b/lib/eldap/doc/src/eldap.xml
index f2c7889e58..790a2f4e26 100644
--- a/lib/eldap/doc/src/eldap.xml
+++ b/lib/eldap/doc/src/eldap.xml
@@ -28,7 +28,7 @@
     <date>2000-06-20</date>
     <rev>B</rev>
   </header>
-  <module>eldap</module>
+  <module since="OTP R15B01">eldap</module>
   <modulesummary>LDAP Client</modulesummary>
   <description>
     <p>This module provides a client api to the Lightweight Directory Access Protocol (LDAP).
@@ -103,7 +103,7 @@
 
   <funcs>
     <func>
-      <name>open([Host]) -> {ok, Handle} | {error, Reason}</name>
+      <name since="OTP R15B01">open([Host]) -> {ok, Handle} | {error, Reason}</name>
       <fsummary>Open a connection to an LDAP server.</fsummary>
       <type>
 	<v>Handle = handle()</v>
@@ -113,7 +113,7 @@
       </desc>
     </func>
     <func>
-      <name>open([Host], [Option]) -> {ok, Handle} | {error, Reason}</name>
+      <name since="OTP R15B01">open([Host], [Option]) -> {ok, Handle} | {error, Reason}</name>
       <fsummary>Open a connection to an LDAP server.</fsummary>
       <type>
 	<v>Handle = handle()</v>
@@ -129,7 +129,7 @@
       </desc>
     </func>
     <func>
-      <name>close(Handle) -> ok</name>
+      <name since="OTP R15B01">close(Handle) -> ok</name>
       <fsummary>Shutdown the connection.</fsummary>
       <type>
 	<v>Handle = handle()</v>
@@ -140,14 +140,14 @@
       </desc>
     </func>
     <func>
-      <name>start_tls(Handle, Options) -> return_value()</name>
+      <name since="OTP R16B03">start_tls(Handle, Options) -> return_value()</name>
       <fsummary>Upgrade a connection to TLS.</fsummary>
       <desc>
         <p>Same as start_tls(Handle, Options, infinity)</p>
       </desc>
     </func>
     <func>
-      <name>start_tls(Handle, Options, Timeout) -> return_value()</name>
+      <name since="OTP R16B03">start_tls(Handle, Options, Timeout) -> return_value()</name>
       <fsummary>Upgrade a connection to TLS.</fsummary>
       <type>
 	<v>Handle = handle()</v>
@@ -176,7 +176,7 @@
       </desc>
     </func>
     <func>
-      <name>simple_bind(Handle, Dn, Password) -> return_value()</name>
+      <name since="OTP R15B01">simple_bind(Handle, Dn, Password) -> return_value()</name>
       <fsummary>Authenticate the connection.</fsummary>
       <type>
 	<v>Handle = handle()</v>
@@ -188,7 +188,7 @@
       </desc>
     </func>
     <func>
-      <name>add(Handle, Dn, [Attribute]) -> return_value()</name>
+      <name since="OTP R15B01">add(Handle, Dn, [Attribute]) -> return_value()</name>
       <fsummary>Add an entry.</fsummary>
       <type>
 	<v>Handle = handle()</v>
@@ -209,7 +209,7 @@
       </desc>
     </func>
     <func>
-      <name>delete(Handle, Dn) -> return_value()</name>
+      <name since="OTP R15B01">delete(Handle, Dn) -> return_value()</name>
       <fsummary>Delete an entry.</fsummary>
       <type>
         <v>Dn = string()</v>
@@ -223,7 +223,7 @@
     </func>
 
     <func>
-      <name>mod_add(Type, [Value]) -> modify_op()</name>
+      <name since="OTP R15B01">mod_add(Type, [Value]) -> modify_op()</name>
       <fsummary>Create a modification operation.</fsummary>
       <type>
         <v>Type = string()</v>
@@ -232,7 +232,7 @@
       <desc> <p> Create an add modification operation.</p> </desc>
     </func>
     <func>
-      <name>mod_delete(Type, [Value]) -> modify_op()</name>
+      <name since="OTP R15B01">mod_delete(Type, [Value]) -> modify_op()</name>
       <fsummary>Create a modification operation.</fsummary>
       <type>
         <v>Type = string()</v>
@@ -241,7 +241,7 @@
       <desc> <p> Create a delete modification operation.</p> </desc>
     </func>
     <func>
-      <name>mod_replace(Type, [Value]) -> modify_op()</name>
+      <name since="OTP R15B01">mod_replace(Type, [Value]) -> modify_op()</name>
       <fsummary>Create a modification operation.</fsummary>
       <type>
         <v>Type = string()</v>
@@ -251,7 +251,7 @@
     </func>
 
     <func>
-      <name>modify(Handle, Dn, [ModifyOp]) -> return_value()</name>
+      <name since="OTP R15B01">modify(Handle, Dn, [ModifyOp]) -> return_value()</name>
       <fsummary>Modify an entry.</fsummary>
       <type>
         <v>Dn = string()</v>
@@ -267,7 +267,7 @@
       </desc>
     </func>
     <func>
-      <name>modify_password(Handle, Dn, NewPasswd) -> return_value() | {ok, GenPasswd}</name>
+      <name since="OTP 18.0">modify_password(Handle, Dn, NewPasswd) -> return_value() | {ok, GenPasswd}</name>
       <fsummary>Modify the password of a user.</fsummary>
       <type>
         <v>Dn = string()</v>
@@ -278,7 +278,7 @@
       </desc>
     </func>
     <func>
-      <name>modify_password(Handle, Dn, NewPasswd, OldPasswd) -> return_value() | {ok, GenPasswd}</name>
+      <name since="OTP 18.0">modify_password(Handle, Dn, NewPasswd, OldPasswd) -> return_value() | {ok, GenPasswd}</name>
       <fsummary>Modify the password of a user.</fsummary>
       <type>
         <v>Dn = string()</v>
@@ -307,7 +307,7 @@
       </desc>
     </func>
     <func>
-      <name>modify_dn(Handle, Dn, NewRDN, DeleteOldRDN, NewSupDN) -> return_value()</name>
+      <name since="OTP R15B01">modify_dn(Handle, Dn, NewRDN, DeleteOldRDN, NewSupDN) -> return_value()</name>
       <fsummary>Modify the DN of an entry.</fsummary>
       <type>
         <v>Dn = string()</v>
@@ -327,7 +327,7 @@
       </desc>
     </func>
     <func>
-      <name>search(Handle, SearchOptions) -> {ok, #eldap_search_result{}} | {ok, {referral,referrals()}} | {error, Reason}</name>
+      <name since="OTP R15B01">search(Handle, SearchOptions) -> {ok, #eldap_search_result{}} | {ok, {referral,referrals()}} | {error, Reason}</name>
       <fsummary>Search the Directory</fsummary>
       <type>
         <v>SearchOptions = #eldap_search{} | [SearchOption]</v>
@@ -354,44 +354,44 @@
     </func>
 
     <func>
-      <name>baseObject() -> scope()</name>
+      <name since="OTP R15B01">baseObject() -> scope()</name>
       <fsummary>Create search scope.</fsummary>
       <desc> <p> Search baseobject only.</p> </desc>
     </func>
     <func>
-      <name>singleLevel() -> scope()</name>
+      <name since="OTP R15B01">singleLevel() -> scope()</name>
       <fsummary>Create search scope.</fsummary>
       <desc> <p> Search the specified level only, i.e. do not recurse.</p> </desc>
     </func>
     <func>
-      <name>wholeSubtree() -> scope()</name>
+      <name since="OTP R15B01">wholeSubtree() -> scope()</name>
       <fsummary>Create search scope.</fsummary>
       <desc> <p> Search the entire subtree.</p> </desc>
     </func>
 
     <func>
-      <name>neverDerefAliases() -> dereference()</name>
+      <name since="OTP R15B01">neverDerefAliases() -> dereference()</name>
       <fsummary>Create search option.</fsummary>
       <desc> <p>Never derefrence aliases, treat aliases as entries.</p> </desc>
     </func>
     <func>
-      <name>derefAlways() -> dereference()</name>
+      <name since="OTP R15B01">derefAlways() -> dereference()</name>
       <fsummary>Create search option.</fsummary>
       <desc> <p>Always derefrence aliases.</p> </desc>
     </func>
     <func>
-      <name>derefInSearching() -> dereference()</name>
+      <name since="OTP R15B01">derefInSearching() -> dereference()</name>
       <fsummary>Create search option.</fsummary>
       <desc> <p>Derefrence aliases only when searching.</p> </desc>
     </func>
     <func>
-      <name>derefFindingBaseObj() -> dereference()</name>
+      <name since="OTP R15B01">derefFindingBaseObj() -> dereference()</name>
       <fsummary>Create search option.</fsummary>
       <desc> <p>Derefrence aliases only in finding the base.</p> </desc>
     </func>
 
     <func>
-      <name>present(Type) -> filter()</name>
+      <name since="OTP R15B01">present(Type) -> filter()</name>
       <fsummary>Create search filter option.</fsummary>
       <type>
 	<v>Type = string()</v>
@@ -399,7 +399,7 @@
       <desc> <p>Create a filter which filters on attribute type presence.</p> </desc>
     </func>
     <func>
-      <name>substrings(Type, [SubString]) -> filter()</name>
+      <name since="OTP R15B01">substrings(Type, [SubString]) -> filter()</name>
       <fsummary>Create search filter option.</fsummary>
       <type>
 	<v>Type = string()</v>
@@ -409,7 +409,7 @@
       <desc> <p>Create a filter which filters on substrings.</p> </desc>
     </func>
     <func>
-      <name>equalityMatch(Type, Value) -> filter()</name>
+      <name since="OTP R15B01">equalityMatch(Type, Value) -> filter()</name>
       <fsummary>Create search filter option.</fsummary>
       <type>
 	<v>Type = string()</v>
@@ -418,7 +418,7 @@
       <desc> <p>Create a equality filter.</p> </desc>
     </func>
     <func>
-      <name>greaterOrEqual(Type, Value) -> filter()</name>
+      <name since="OTP R15B01">greaterOrEqual(Type, Value) -> filter()</name>
       <fsummary>Create search filter option.</fsummary>
       <type>
 	<v>Type = string()</v>
@@ -427,7 +427,7 @@
       <desc> <p>Create a greater or equal filter.</p> </desc>
     </func>
     <func>
-      <name>lessOrEqual(Type, Value) -> filter()</name>
+      <name since="OTP R15B01">lessOrEqual(Type, Value) -> filter()</name>
       <fsummary>Create search filter option.</fsummary>
       <type>
 	<v>Type = string()</v>
@@ -436,7 +436,7 @@
       <desc> <p>Create a less or equal filter.</p> </desc>
     </func>
     <func>
-      <name>approxMatch(Type, Value) -> filter()</name>
+      <name since="OTP R15B01">approxMatch(Type, Value) -> filter()</name>
       <fsummary>Create search filter option.</fsummary>
       <type>
 	<v>Type = string()</v>
@@ -445,7 +445,7 @@
       <desc> <p>Create a approximation match filter.</p> </desc>
     </func>
     <func>
-      <name>extensibleMatch(MatchValue, OptionalAttrs) -> filter()</name>
+      <name since="OTP 17.4">extensibleMatch(MatchValue, OptionalAttrs) -> filter()</name>
       <fsummary>Create search filter option.</fsummary>
       <type>
 	<v>MatchValue = string()</v>
@@ -459,7 +459,7 @@
       <p>creates a filter which performs a <c>caseExactMatch</c> on the attribute <c>sn</c> and matches with the value <c>"Bar"</c>. The default value of <c>dnAttributes</c> is <c>false</c>.</p> </desc>
     </func>
     <func>
-      <name>'and'([Filter]) -> filter()</name>
+      <name since="OTP R15B01">'and'([Filter]) -> filter()</name>
       <fsummary>Create search filter option.</fsummary>
       <type>
 	<v>Filter = filter()</v>
@@ -467,7 +467,7 @@
       <desc> <p>Creates a filter where all <c>Filter</c> must be true.</p> </desc>
     </func>
     <func>
-      <name>'or'([Filter]) -> filter()</name>
+      <name since="OTP R15B01">'or'([Filter]) -> filter()</name>
       <fsummary>Create search filter option.</fsummary>
       <type>
 	<v>Filter = filter()</v>
@@ -475,7 +475,7 @@
       <desc> <p>Create a filter where at least one of the <c>Filter</c> must be true.</p> </desc>
     </func>
     <func>
-      <name>'not'(Filter) -> filter()</name>
+      <name since="OTP R15B01">'not'(Filter) -> filter()</name>
       <fsummary>Create search filter option.</fsummary>
       <type>
 	<v>Filter = filter()</v>
diff --git a/lib/eldap/doc/src/notes.xml b/lib/eldap/doc/src/notes.xml
index bf9358c4d1..946db5b93d 100644
--- a/lib/eldap/doc/src/notes.xml
+++ b/lib/eldap/doc/src/notes.xml
@@ -31,6 +31,42 @@
   </header>
   <p>This document describes the changes made to the Eldap application.</p>
 
+<section><title>Eldap 1.2.8</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix dialyzer warnings in eldap when not matching the
+	    return value of ssl:close/1.</p>
+          <p>
+	    Own Id: OTP-15775</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Eldap 1.2.7</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Back port of bug fix ERL-893 from OTP-22 and document
+	    enhancements that will solve dialyzer warnings for users
+	    of the ssl application.</p>
+          <p>
+	    This change also affects public_key, eldap (and inet
+	    doc).</p>
+          <p>
+	    Own Id: OTP-15785 Aux Id: ERL-929, ERL-893, PR-2215 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Eldap 1.2.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/eldap/src/eldap.erl b/lib/eldap/src/eldap.erl
index 6497922852..9b7e254dfe 100644
--- a/lib/eldap/src/eldap.erl
+++ b/lib/eldap/src/eldap.erl
@@ -957,20 +957,20 @@ do_modify_dn_0(Data, Entry, NewRDN, DelOldRDN, NewSup, Controls) ->
 do_unbind(Data) ->
     Req = "",
     log2(Data, "unbind request = ~p (has no reply)~n", [Req]),
-    case Data#eldap.using_tls of
-	true ->
-            send_request(Data#eldap.fd, Data, Data#eldap.id, {unbindRequest, Req}),
-            ssl:close(Data#eldap.fd);
-	false ->
-            OldTrapExit = process_flag(trap_exit, true),
-            catch send_request(Data#eldap.fd, Data, Data#eldap.id, {unbindRequest, Req}),
-            catch gen_tcp:close(Data#eldap.fd),
-            receive
-                {'EXIT', _From, _Reason} -> ok
-            after 0 -> ok
-            end,
-            process_flag(trap_exit, OldTrapExit)
-    end,
+    _ = case Data#eldap.using_tls of
+            true ->
+                send_request(Data#eldap.fd, Data, Data#eldap.id, {unbindRequest, Req}),
+                ssl:close(Data#eldap.fd);
+            false ->
+                OldTrapExit = process_flag(trap_exit, true),
+                catch send_request(Data#eldap.fd, Data, Data#eldap.id, {unbindRequest, Req}),
+                catch gen_tcp:close(Data#eldap.fd),
+                receive
+                    {'EXIT', _From, _Reason} -> ok
+                after 0 -> ok
+                end,
+                process_flag(trap_exit, OldTrapExit)
+        end,
     {no_reply, Data#eldap{binddn = (#eldap{})#eldap.binddn,
 			  passwd = (#eldap{})#eldap.passwd,
 			  fd     = (#eldap{})#eldap.fd,
@@ -1130,7 +1130,7 @@ ldap_closed_p(Data, Emsg) when Data#eldap.using_tls == true ->
     %% Check if the SSL socket seems to be alive or not
     case catch ssl:sockname(Data#eldap.fd) of
 	{error, _} ->
-	    ssl:close(Data#eldap.fd),
+	    _ = ssl:close(Data#eldap.fd),
 	    {error, ldap_closed};
 	{ok, _} ->
 	    {error, Emsg};
diff --git a/lib/eldap/test/make_certs.erl b/lib/eldap/test/make_certs.erl
index cfa43289e1..e8a13ae113 100644
--- a/lib/eldap/test/make_certs.erl
+++ b/lib/eldap/test/make_certs.erl
@@ -348,7 +348,7 @@ req_cnf(C) ->
      "default_bits	= ", integer_to_list(C#config.default_bits), "\n"
      "RANDFILE		= $ROOTDIR/RAND\n"
      "encrypt_key	= no\n"
-     "default_md	= md5\n"
+     "default_md	= sha1\n"
      "#string_mask	= pkix\n"
      "x509_extensions	= ca_ext\n"
      "prompt		= no\n"
@@ -394,7 +394,7 @@ ca_cnf(C) ->
      ["crl_extensions = crl_ext\n" || C#config.v2_crls],
      "unique_subject  = no\n"
      "default_days	= 3600\n"
-     "default_md	= md5\n"
+     "default_md	= sha1\n"
      "preserve	        = no\n"
      "policy		= policy_match\n"
      "\n"
diff --git a/lib/eldap/vsn.mk b/lib/eldap/vsn.mk
index 6d541e4689..8f969e6945 100644
--- a/lib/eldap/vsn.mk
+++ b/lib/eldap/vsn.mk
@@ -1 +1 @@
-ELDAP_VSN = 1.2.6
+ELDAP_VSN = 1.2.8
diff --git a/lib/erl_docgen/doc/src/doc-build.xml b/lib/erl_docgen/doc/src/doc-build.xml
index 3ea8798639..17e13bff81 100644
--- a/lib/erl_docgen/doc/src/doc-build.xml
+++ b/lib/erl_docgen/doc/src/doc-build.xml
@@ -178,7 +178,7 @@
     </section>
 
     <section>
-      <title>Upcomming changes</title>
+      <title>Upcoming changes</title>
       <p>
 	The output from the <c>erl_docgen</c> documentation build process is now just the OTP style. 
 	But in a near future we will for example add the possibility to change logo, color in the PDF and 
diff --git a/lib/erl_docgen/doc/src/docgen_xml_check.xml b/lib/erl_docgen/doc/src/docgen_xml_check.xml
index 68253edef7..8d6dceef43 100644
--- a/lib/erl_docgen/doc/src/docgen_xml_check.xml
+++ b/lib/erl_docgen/doc/src/docgen_xml_check.xml
@@ -30,7 +30,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>docgen_xml_check</module>
+  <module since="OTP R15B">docgen_xml_check</module>
   <modulesummary>Validate XML documentation source code</modulesummary>
   <description>
     <p><c>docgen_xml_check</c> contains functions for validating XML
@@ -39,7 +39,7 @@
 
   <funcs>
     <func>
-      <name>validate(File) -> ok | error | {error, badfile}</name>
+      <name since="OTP R15B">validate(File) -> ok | error | {error, badfile}</name>
       <fsummary>Validate XML source code.</fsummary>
       <type>
 	<v>File = string()</v>
diff --git a/lib/erl_docgen/doc/src/notes.xml b/lib/erl_docgen/doc/src/notes.xml
index 97c842a324..f25361a202 100644
--- a/lib/erl_docgen/doc/src/notes.xml
+++ b/lib/erl_docgen/doc/src/notes.xml
@@ -31,7 +31,48 @@
   </header>
   <p>This document describes the changes made to the <em>erl_docgen</em> application.</p>
 
-  <section><title>Erl_Docgen 0.8.1</title>
+  <section><title>Erl_Docgen 0.9.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    All incorrect (that is, all) uses of "can not" has been
+	    corrected to "cannot" in source code comments,
+	    documentation, examples, and so on.</p>
+          <p>
+	    Own Id: OTP-14282 Aux Id: PR-1891 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Docgen 0.9</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The HTML reference documentation shows the OTP version
+	    where modules and functions were first introduced.
+	    Versions older than R13B04 are not shown.</p>
+          <p>
+	    Own Id: OTP-15460</p>
+        </item>
+        <item>
+          <p>
+	    Make html documentation of C functions with many
+	    arguments more readable.</p>
+          <p>
+	    Own Id: OTP-15637 Aux Id: PR-2160 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Docgen 0.8.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/erl_docgen/priv/css/otp_doc.css b/lib/erl_docgen/priv/css/otp_doc.css
index 34c6befb0e..17d9f8dd56 100644
--- a/lib/erl_docgen/priv/css/otp_doc.css
+++ b/lib/erl_docgen/priv/css/otp_doc.css
@@ -71,6 +71,39 @@ a:visited      { color: #1b6ec2; text-decoration: none }
 }
 
 .bold_code   { font-family: mono, Courier, monospace; font-weight: bold }
+
+/* Invisible table for function specs,
+ * just to get since-version out in right margin */
+.func-table, .func-tr, .func-td, .cfunc-td, .func-since-td {
+    width: 200%;
+    border: 0;
+    padding: 0;
+    margin: 0;
+}
+
+.func-tr:nth-child(n) {
+    background: inherit  /* turn off zebra striped rows */
+}
+
+.func-td {
+    width: 50%;
+}
+
+.cfunc-td {
+    width: 50%;
+    padding-left: 100px;
+    text-indent: -100px;
+}
+
+.func-since-td {
+    width: 50%;
+    padding-left: 1em
+}
+
+.func-td:hover {
+ background-color: #f5f5f5;
+}
+
 .code        {
  font-family: mono, Courier, monospace;
  font-weight: normal;
@@ -283,3 +316,9 @@ a > .code {
 .func-types-title{
  font-size: 1em;
 }
+
+.since{
+    color: gray;
+    font-weight: normal;
+    font-size: small;
+}
\ No newline at end of file
diff --git a/lib/erl_docgen/priv/dtd/book.dtd b/lib/erl_docgen/priv/dtd/book.dtd
index aa07d38658..326bf3369a 100644
--- a/lib/erl_docgen/priv/dtd/book.dtd
+++ b/lib/erl_docgen/priv/dtd/book.dtd
@@ -30,7 +30,7 @@
 			       insidecover?,
 			       pagetext,
 			       preamble,
-			       (applications|parts|headline|pagetext)+,
+			       (applications|parts|internals|headline|pagetext)+,
 				(listoffigures?,
 				 listoftables?,
 				 listofterms?,
@@ -56,6 +56,7 @@
 <!ELEMENT applications        (include)* >
 <!ELEMENT parts               (title?,description?,(include|onepart)*) >
 <!ATTLIST parts               lift (yes|no) "no" >
+<!ELEMENT internals           (include)* >
 <!ELEMENT headline            (#PCDATA) >
 <!ELEMENT index               EMPTY >
 <!ELEMENT listoffigures       EMPTY >
diff --git a/lib/erl_docgen/priv/dtd/common.dtd b/lib/erl_docgen/priv/dtd/common.dtd
index b1578ad9d4..0ccd52068b 100644
--- a/lib/erl_docgen/priv/dtd/common.dtd
+++ b/lib/erl_docgen/priv/dtd/common.dtd
@@ -25,7 +25,7 @@
 <!ENTITY % block              "p|pre|code|list|taglist|codeinclude|
                                erleval" >
 <!ENTITY % inline             "#PCDATA|c|i|em|strong|term|cite|br|path|seealso|
-                               url|marker|anno" >
+                               url|marker|anno|image" >
 <!-- XXX --> 
 <!ELEMENT p                   (%inline;)* >
 <!ELEMENT pre                 (#PCDATA|seealso|url|input|anno)* >
diff --git a/lib/erl_docgen/priv/dtd/cref.dtd b/lib/erl_docgen/priv/dtd/cref.dtd
index 5ccd98ed89..d392081807 100644
--- a/lib/erl_docgen/priv/dtd/cref.dtd
+++ b/lib/erl_docgen/priv/dtd/cref.dtd
@@ -30,6 +30,8 @@
 <!-- `name' is used in common.refs.dtd and must therefore 
       be defined in each *ref. dtd -->
 <!ELEMENT name                (ret,nametext) >
+<!ATTLIST name                 since CDATA #IMPLIED>
+
 <!ELEMENT ret                 (#PCDATA) >
 <!ELEMENT nametext            (#PCDATA) >
 
diff --git a/lib/erl_docgen/priv/dtd/erlref.dtd b/lib/erl_docgen/priv/dtd/erlref.dtd
index 78d6771f52..8202ea5a4d 100644
--- a/lib/erl_docgen/priv/dtd/erlref.dtd
+++ b/lib/erl_docgen/priv/dtd/erlref.dtd
@@ -25,6 +25,7 @@
 <!ELEMENT erlref              (header,module,modulesummary,description, 
 			       (section|funcs|datatypes)*,authors?) >
 <!ELEMENT module              (#PCDATA) >
+<!ATTLIST module               since CDATA #IMPLIED>
 <!ELEMENT modulesummary       (#PCDATA) >
 
 <!-- `name' is used in common.refs.dtd and must therefore 
@@ -34,4 +35,5 @@
                                arity CDATA #IMPLIED
 	                       clause_i CDATA #IMPLIED
                                anchor CDATA #IMPLIED
+	                       since 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 a0a922216b..18bc8cd1cf 100644
--- a/lib/erl_docgen/priv/xsl/db_html.xsl
+++ b/lib/erl_docgen/priv/xsl/db_html.xsl
@@ -191,6 +191,7 @@
     <xsl:variable name="name" select="@name"/>
     <xsl:variable name="arity" select="@arity"/>
     <xsl:variable name="anchor" select="@anchor"/>
+    <xsl:variable name="since" select="@since"/>
     <xsl:variable name="spec0">
       <xsl:call-template name="find_spec"/>
     </xsl:variable>
@@ -225,11 +226,12 @@
         <xsl:variable name="global_types" select="ancestor::erlref/datatypes"/>
 	<xsl:variable name="local_types"
 		      select="../type[string-length(@name) > 0]"/>
-	<xsl:apply-templates select="$spec/contract/clause/head">
+	  <xsl:apply-templates select="$spec/contract/clause/head">
           <xsl:with-param name="ghlink" select="ancestor-or-self::*[@ghlink]/@ghlink"/>
 	  <xsl:with-param name="local_types" select="$local_types"/>
 	  <xsl:with-param name="global_types" select="$global_types"/>
-	</xsl:apply-templates>
+	  <xsl:with-param name="since" select="$since"/>
+	  </xsl:apply-templates>
       </xsl:when>
     </xsl:choose>
   </xsl:template>
@@ -238,19 +240,32 @@
     <xsl:param name="ghlink"/>
     <xsl:param name="local_types"/>
     <xsl:param name="global_types"/>
+    <xsl:param name="since"/>
     <xsl:variable name="id" select="concat(concat(concat(concat(../../../name,'-'),../../../arity),'-'),generate-id(.))"/>
-    <div class="bold_code func-head"
-         onMouseOver="document.getElementById('ghlink-{$id}').style.visibility = 'visible';"
-         onMouseOut="document.getElementById('ghlink-{$id}').style.visibility = 'hidden';">
-      <xsl:call-template name="ghlink">
-        <xsl:with-param name="ghlink" select="$ghlink"/>
-        <xsl:with-param name="id" select="$id"/>
-      </xsl:call-template>
-      <xsl:apply-templates mode="local_type">
-        <xsl:with-param name="local_types" select="$local_types"/>
-        <xsl:with-param name="global_types" select="$global_types"/>
-      </xsl:apply-templates>
-    </div>
+    <table class="func-table">
+    <tr class="func-tr">
+    <td class="func-td">
+      <div class="bold_code func-head"
+           onMouseOver="document.getElementById('ghlink-{$id}').style.visibility = 'visible';"
+           onMouseOut="document.getElementById('ghlink-{$id}').style.visibility = 'hidden';">
+	<xsl:call-template name="ghlink">
+          <xsl:with-param name="ghlink" select="$ghlink"/>
+          <xsl:with-param name="id" select="$id"/>
+	</xsl:call-template>
+	<xsl:apply-templates mode="local_type">
+	  <xsl:with-param name="local_types" select="$local_types"/>
+	  <xsl:with-param name="global_types" select="$global_types"/>
+	</xsl:apply-templates>
+      </div>
+    </td>
+    <td class="func-since-td">
+      <xsl:if test="string-length($since) > 0">
+	<span class="since"><xsl:value-of select="$since"/>
+	</span>
+      </xsl:if>
+    </td>
+    </tr>
+    </table>
   </xsl:template>
 
   <!-- The *last* <name name="..." arity=".."/> -->
@@ -821,6 +836,10 @@
       <!-- .../part -->
       <xsl:call-template name="part.content" />
     </xsl:if>
+    <xsl:if test="$lname = 'internal'">
+      <!-- .../internals -->
+      <xsl:call-template name="internal.content" />
+    </xsl:if>
     <xsl:if test="$lname = 'chapter'">
       <!-- .../part/chapter -->
       <xsl:call-template name="chapter.content">
@@ -844,12 +863,24 @@
     <xsl:param name="chapnum"/>
     <xsl:param name="curModule"/>
     <xsl:if test="(local-name() = 'part') or ((local-name() = 'chapter') and ancestor::part)">
-      <!-- .../part or.../part/chapter  -->
+      <!-- .../part or .../part/chapter  -->
       <xsl:call-template name="menu.ug">
         <xsl:with-param name="chapnum" select="$chapnum"/>
       </xsl:call-template>
     </xsl:if>
-    <xsl:if test="(local-name() = 'application') or (local-name() = 'erlref')or (local-name() = 'comref')or (local-name() = 'cref')or (local-name() = 'fileref')or (local-name() = 'appref')">
+    <xsl:if test="(local-name() = 'internal' and descendant::chapter) or ((local-name() = 'chapter') and ancestor::internal)">
+      <!-- .../internal or .../internal/chapter  -->
+      <xsl:call-template name="menu.internal.ug">
+        <xsl:with-param name="chapnum" select="$chapnum"/>
+      </xsl:call-template>
+    </xsl:if>
+    <xsl:if test="(local-name() = 'internal' and descendant::erlref) or (((local-name() = 'erlref') or (local-name() = 'comref') or (local-name() = 'cref') or (local-name() = 'fileref') or (local-name() = 'appref')) and ancestor::internal)">
+      <!-- .../internal,.../internal/erlref, .../internal/comref or .../internal/cref  or .../internal/fileref or .../internal/appref -->
+      <xsl:call-template name="menu.internal.ref">
+        <xsl:with-param name="curModule" select="$curModule"/>
+      </xsl:call-template>
+    </xsl:if>
+    <xsl:if test="(local-name() = 'application') or (((local-name() = 'erlref') or (local-name() = 'comref') or (local-name() = 'cref') or (local-name() = 'fileref') or (local-name() = 'appref')) and ancestor::application)">
       <!-- .../application,.../application/erlref, .../application/comref or .../application/cref  or .../application/fileref or .../application/appref -->
       <xsl:call-template name="menu.ref">
         <xsl:with-param name="curModule" select="$curModule"/>
@@ -887,6 +918,9 @@
       <xsl:if test="boolean(/book/applications)">
           <li><a href="index.html">Reference Manual</a></li>
       </xsl:if>
+      <xsl:if test="boolean(/book/internals)">
+          <li><a href="internal_docs.html">Internal Documentation</a></li>
+      </xsl:if>
       <xsl:if test="boolean(/book/releasenotes)">
           <li><a href="release_notes.html">Release Notes</a></li>
       </xsl:if>
@@ -927,6 +961,7 @@
   <xsl:template match="/book">
     <xsl:apply-templates select="parts"/>
     <xsl:apply-templates select="applications"/>
+    <xsl:apply-templates select="internals"/>
     <xsl:apply-templates select="releasenotes"/>
   </xsl:template>
 
@@ -940,6 +975,11 @@
     <xsl:apply-templates select="application"/>
   </xsl:template>
 
+  <!-- Internals -->
+  <xsl:template match="internals">
+    <xsl:apply-templates select="internal"/>
+  </xsl:template>
+
  <!-- Header -->
  <xsl:template match="header"/>
 
@@ -1296,6 +1336,90 @@
   </xsl:template>
 
 
+  <!-- Internal Docs -->
+
+  <!-- Part -->
+  <xsl:template match="internal">
+
+    <xsl:document href="{$outdir}/internal_docs.html" method="html"  encoding="UTF-8" indent="yes" doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN">
+      <xsl:call-template name="pagelayout"/>
+    </xsl:document>
+  </xsl:template>
+
+
+  <!-- Part content-->
+  <xsl:template name="internal.content">
+    <div class="frontpage"/>
+
+    <center><h1><xsl:value-of select="/book/header/title"/> Internal Docs</h1></center>
+
+    <center><h4>Version <xsl:value-of select="$appver"/></h4></center>
+    <center><h4><xsl:value-of select="$gendate"/></h4></center>
+    <div class="extrafrontpageinfo">
+    <center><xsl:value-of select="$extra_front_page_info"/></center>
+    </div>
+
+    <xsl:apply-templates select="chapter|erlref"/>
+
+  </xsl:template>
+
+  <!-- Menu.internal.chapter -->
+  <xsl:template name="menu.internal.ug">
+    <xsl:param name="chapnum"/>
+
+    <div id="leftnav">
+      <div class="innertube">
+
+        <xsl:call-template name="erlang_logo"/>
+
+        <p class="section-title"><xsl:value-of select="/book/header/title"/></p>
+        <p class="section-subtitle">Internal Documentation</p>
+        <p class="section-version">Version <xsl:value-of select="$appver"/></p>
+
+        <xsl:call-template name="menu_top"/>
+
+        <xsl:call-template name="menu_middle"/>
+
+        <h3>Chapters</h3>
+
+        <ul class="flipMenu" imagepath="{$topdocdir}/js/flipmenu">
+          <xsl:call-template name="menu.chapter">
+            <xsl:with-param name="entries" select="/book/internals/internal/chapter[header/title]"/>
+            <xsl:with-param name="chapnum" select="$chapnum"/>
+          </xsl:call-template>
+        </ul>
+      </div>
+    </div>
+  </xsl:template>
+
+    <!-- Menu.internal.ref -->
+  <xsl:template name="menu.internal.ref">
+      <xsl:param name="curModule"/>
+      <div id="leftnav">
+      <div class="innertube">
+
+        <xsl:call-template name="erlang_logo"/>
+
+        <p class="section-title"><xsl:value-of select="/book/header/title"/></p>
+        <p class="section-subtitle">Reference Manual</p>
+        <p class="section-version">Version <xsl:value-of select="$appver"/></p>
+
+        <xsl:call-template name="menu_top"/>
+
+        <xsl:call-template name="menu_middle"/>
+
+        <h3>Table of Contents</h3>
+
+        <ul class="flipMenu">
+          <xsl:call-template name="menu.ref2">
+            <xsl:with-param name="entries" select="/book/internals/internal/erlref[module]|/book/internals/internal/cref[lib]|/book/internals/internal/comref[com]|/book/internals/internal/fileref[file]|/book/internals/internal/appref[app]"/>
+            <!--xsl:with-param name="genFuncMenu" select="true"/-->
+            <xsl:with-param name="curModule" select="$curModule"/>
+          </xsl:call-template>
+        </ul>
+      </div>
+    </div>
+  </xsl:template>
 
 
   <!--Users Guide -->
@@ -1884,6 +2008,16 @@
         <xsl:with-param name="partnum" select="$partnum"/>
       </xsl:apply-templates>
     </div>
+    <!-- Since -->
+    <xsl:if test="string-length(../module/@since) > 0">
+      <xsl:call-template name="h3_title_link">
+	<xsl:with-param name="title">Since</xsl:with-param>
+      </xsl:call-template>
+      <div class="REFBODY module-since">
+	Module <xsl:value-of select="../module"/> was introduced in
+	<xsl:value-of select="../module/@since"/>.
+      </div>
+    </xsl:if>
   </xsl:template>
 
   <!-- Lib -->
@@ -2030,11 +2164,10 @@
   <xsl:template match="func">
     <xsl:param name="partnum"/>
 
-    <p><xsl:apply-templates select="name"/>
-       <xsl:apply-templates
-           select="name[string-length(@arity) > 0 and position()=last()]"
-           mode="types"/>
-    </p>
+    <xsl:apply-templates select="name"/>
+    <xsl:apply-templates
+        select="name[string-length(@arity) > 0 and position()=last()]"
+        mode="types"/>
 
     <xsl:apply-templates select="fsummary|type|desc">
       <xsl:with-param name="partnum" select="$partnum"/>
@@ -2093,19 +2226,22 @@
 
     <xsl:choose>
       <xsl:when test="ancestor::cref">
-        <span class="bold_code bc-7">
-          <xsl:call-template name="title_link">
-            <xsl:with-param name="link" select="substring-before(nametext, '(')"/>
-            <xsl:with-param name="title">
-              <xsl:value-of select="ret"/>
-              <xsl:call-template name="maybe-space-after-ret">
-                <xsl:with-param name="s" select="ret"/>
-              </xsl:call-template>
-              <xsl:value-of select="nametext"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </span>
-        <br/>
+	<table class="func-table">
+	  <tr class="func-tr">
+	    <td class="cfunc-td">
+              <span class="bold_code bc-7">
+		<xsl:call-template name="title_link">
+		  <xsl:with-param name="link" select="substring-before(nametext, '(')"/>
+		</xsl:call-template>
+              </span>
+	    </td>
+	    <td class="func-since-td">
+	      <xsl:if test="string-length(@since) > 0">
+		<span class="since"><xsl:value-of select="@since"/></span>
+	      </xsl:if>
+	    </td>
+	  </tr>
+	</table>
       </xsl:when>
       <xsl:when test="ancestor::erlref">
         <xsl:variable name="fname">
@@ -2136,14 +2272,25 @@
             </div>
 	  </xsl:when>
           <xsl:otherwise>
-            <div class="bold_code fun-type">
-              <xsl:call-template name="title_link">
-                <xsl:with-param name="link" select="concat(concat($fname,'-'),$arity)"/>
-                <xsl:with-param name="title">
-                  <xsl:apply-templates/>
-                </xsl:with-param>
-              </xsl:call-template>
-            </div>
+	    <table class="func-table">
+	      <tr class="func-tr">
+	      <td class="func-td">
+		<div class="bold_code fun-type">
+		  <xsl:call-template name="title_link">
+                    <xsl:with-param name="link" select="concat(concat($fname,'-'),$arity)"/>
+                    <xsl:with-param name="title">
+                      <xsl:apply-templates/>
+                    </xsl:with-param>
+		  </xsl:call-template>
+		</div>
+	      </td>
+	      <td class="func-since-td">
+		<xsl:if test="string-length(@since) > 0">
+		  <span class="since"><xsl:value-of select="@since"/></span>
+		</xsl:if>
+	      </td>
+	      </tr>
+	    </table>
           </xsl:otherwise>
 	</xsl:choose>
       </xsl:when>
@@ -2154,18 +2301,6 @@
 
   </xsl:template>
 
-  <xsl:template name="maybe-space-after-ret">
-    <xsl:param name="s"/>
-    <xsl:variable name="last_char"
-	          select="substring($s, string-length($s), 1)"/>
-    <xsl:choose>
-      <xsl:when test="$last_char != '*'">
-        <xsl:text> </xsl:text>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:template>
-
-
   <!-- Type -->
   <xsl:template match="type">
     <xsl:param name="partnum"/>
@@ -2219,7 +2354,7 @@
   </xsl:template>
 
   <xsl:template name="title_link">
-    <xsl:param name="title"/>
+    <xsl:param name="title" select="'APPLY'"/>
     <xsl:param name="link" select="erl:to-link(title)"/>
     <xsl:param name="ghlink" select="ancestor-or-self::*[@ghlink][position() = 1]/@ghlink"/>
     <xsl:variable name="id" select="concat(concat($link,'-'), generate-id(.))"/>
@@ -2229,7 +2364,16 @@
           <xsl:with-param name="id" select="$id"/>
           <xsl:with-param name="ghlink" select="$ghlink"/>
       </xsl:call-template>
-      <a class="title_link" name="{$link}" href="#{$link}"><xsl:value-of select="$title"/></a>
+      <a class="title_link" name="{$link}" href="#{$link}">
+	<xsl:choose>
+	  <xsl:when test="$title = 'APPLY'">
+	    <xsl:apply-templates/>   <!-- like <ret> and <nametext> -->
+	  </xsl:when>
+	  <xsl:otherwise>
+	    <xsl:value-of select="$title"/>
+	  </xsl:otherwise>
+	</xsl:choose>
+      </a>
     </span>
   </xsl:template>
 
@@ -2659,4 +2803,46 @@
     <xsl:value-of select="normalize-space(.)"/>
   </xsl:template>
 
+  <xsl:template match="ret">
+    <xsl:value-of select="."/>
+    <xsl:variable name="last_char" select="substring(., string-length(.), 1)"/>
+    <xsl:if test="$last_char != '*'">
+      <xsl:text> </xsl:text>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="nametext">
+    <xsl:value-of select="substring-before(.,'(')"/>
+    <xsl:text>(</xsl:text>
+    <xsl:variable name="arglist" select="substring-after(.,'(')"/>
+    <xsl:choose>
+      <xsl:when test="$arglist = ')' or $arglist = 'void)'">
+	<xsl:value-of select="$arglist"/>
+      </xsl:when>
+      <xsl:otherwise>
+	<br/>
+	<xsl:call-template name="cfunc-arglist">
+	  <xsl:with-param name="text" select="$arglist"/>
+	</xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <!-- Format C function argument list with <br> after comma -->
+  <xsl:template name="cfunc-arglist">
+    <xsl:param name="text"/>
+    <xsl:variable name="line" select="normalize-space($text)"/>
+    <xsl:choose>
+      <xsl:when test="contains($line,',')">
+	<xsl:value-of select="substring-before($line,',')"/>,<br/>
+        <xsl:call-template name="cfunc-arglist">
+          <xsl:with-param name="text" select="substring-after($line,',')"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$line"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
 </xsl:stylesheet>
diff --git a/lib/erl_docgen/src/docgen_edoc_xml_cb.erl b/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
index b065c18cda..5342d02947 100644
--- a/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
+++ b/lib/erl_docgen/src/docgen_edoc_xml_cb.erl
@@ -182,7 +182,7 @@ chapter_title(#xmlElement{content=Es}) -> % name = h3 | h4
 %% otp_xmlify(Es1) -> Es2
 %%   Es1 = Es2 = [#xmlElement{} | #xmlText{}]
 %% Fix things that are allowed in XHTML but not in chapter/erlref DTDs.
-%% 1)  lists (<ul>, <ol>, <dl>) and code snippets (<pre>) can not occur
+%% 1)  lists (<ul>, <ol>, <dl>) and code snippets (<pre>) cannot occur
 %%     within a <p>, such a <p> must be splitted into a sequence of <p>,
 %%     <ul>, <ol>, <dl> and <pre>.
 %% 2)  <a> must only have either a href attribute (corresponds to a
@@ -1260,11 +1260,14 @@ get_text(#xmlElement{content=[E]}) ->
 
 %% text_and_name_only(Es) -> {N, Ts}
 text_and_a_name_only(Es) ->
-    [Name|_] = [Name ||
-                   #xmlElement{
-                      name = a,
-                      attributes = [#xmlAttribute{name=name}]}=Name <- Es],
-    {Name#xmlElement{content = []}, text_only(Es)}.
+    case [Name || #xmlElement{
+                     name = a,
+                     attributes = [#xmlAttribute{name=name}]}=Name <- Es] of
+        [Name|_] ->
+            {Name#xmlElement{content = []}, text_only(Es)};
+        [] ->
+            {"", text_only(Es)}
+    end.
 
 %% text_only(Es) -> Ts
 %% Takes a list of xmlElement and xmlText and return a lists of xmlText.
diff --git a/lib/erl_docgen/src/docgen_xmerl_xml_cb.erl b/lib/erl_docgen/src/docgen_xmerl_xml_cb.erl
index 59d4dccfb7..9d69143c3c 100644
--- a/lib/erl_docgen/src/docgen_xmerl_xml_cb.erl
+++ b/lib/erl_docgen/src/docgen_xmerl_xml_cb.erl
@@ -87,6 +87,7 @@ convert_tag(underline, Attrs)  -> {em, Attrs};
 convert_tag(Tag, Attrs)        -> {Tag, Attrs}.
 
 is_url("http:"++_) -> true;
+is_url("https:"++_) -> true;
 is_url("../"++_) -> true;
 is_url(FileRef) ->
     case filename:extension(FileRef) of
diff --git a/lib/erl_docgen/vsn.mk b/lib/erl_docgen/vsn.mk
index 3b2f6db6a1..fece2456c1 100644
--- a/lib/erl_docgen/vsn.mk
+++ b/lib/erl_docgen/vsn.mk
@@ -1 +1 @@
-ERL_DOCGEN_VSN = 0.8.1
+ERL_DOCGEN_VSN = 0.9.1
diff --git a/lib/erl_interface/configure.in b/lib/erl_interface/configure.in
index a155ceef7e..f0e9b2eb3f 100644
--- a/lib/erl_interface/configure.in
+++ b/lib/erl_interface/configure.in
@@ -29,11 +29,6 @@ dnl m4_define(EI_VERSION,regexp(m4_include(VERSION),[version \([-.0-9A-Za-z]+\)]
 
 AC_INIT()
 
-if test "x$no_recursion" != "xyes" -a "x$OVERRIDE_CONFIG_CACHE" = "x"; then
-    # We do not want to use a common cache!
-    cache_file=/dev/null
-fi
-
 dnl How to set srcdir absolute is taken from the GNU Emacs distribution
 #### Make srcdir absolute, if it isn't already.  It's important to
 #### avoid running the path through pwd unnecessary, since pwd can
@@ -82,6 +77,15 @@ AC_ARG_ENABLE(threads,
   esac ],
 [ threads_disabled=maybe ])
 
+AC_ARG_ENABLE(mask-real-errno,
+[  --disable-mask-real-errno do not mask real 'errno'],
+[ case "$enableval" in
+    no) mask_real_errno=no ;;
+    *)  mask_real_errno=yes ;;
+  esac ],
+[ mask_real_errno=yes ])
+
+
 dnl ----------------------------------------------------------------------
 dnl Checks for programs
 dnl ----------------------------------------------------------------------
@@ -100,6 +104,10 @@ AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(void *)
 AC_CHECK_SIZEOF(long long)
 
+if test $mask_real_errno = yes; then
+   AC_DEFINE(EI_HIDE_REAL_ERRNO, 1, [Define if 'errno' should not be exposed as is in 'erl_errno'])
+fi
+
 dnl We set EI_64BIT mode when long is 8 bytes, this makes things
 dnl work on windows and unix correctly
 if test $ac_cv_sizeof_long = 8; then
@@ -158,7 +166,7 @@ AC_CHECK_LIB([socket], [getpeername])
 # Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h malloc.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/param.h sys/socket.h sys/select.h sys/time.h unistd.h sys/types.h])
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h malloc.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/param.h sys/socket.h sys/select.h sys/time.h unistd.h sys/types.h sys/uio.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 # fixme AC_C_CONST & AC_C_VOLATILE needed for Windows?
@@ -193,7 +201,7 @@ AC_CHECK_FUNCS([dup2 gethostbyaddr gethostbyname \
 	gethostbyaddr_r \
 	gethostbyname_r gethostname writev \
 	gethrtime gettimeofday inet_ntoa memchr memmove memset select \
-	socket strchr strerror strrchr strstr uname])
+	socket strchr strerror strrchr strstr uname sysconf])
 AC_CHECK_FUNC(res_gethostbyname, [],
     AC_CHECK_LIB(resolv, res_gethostbyname)
 )
@@ -255,6 +263,7 @@ AC_SUBST(EI_THREADS)
 case "$threads_disabled" in
     no|maybe)
 	LM_CHECK_THR_LIB
+        ETHR_CHK_GCC_ATOMIC_OPS([])
 
 	case "$THR_LIB_NAME" in
 	    "")
@@ -268,7 +277,7 @@ case "$threads_disabled" in
 		EI_THREADS="true"	
 		THR_DEFS="$THR_DEFS -D_WIN32_WINNT=0x0600 -DWINVER=0x0600"
 		;;
-	    pthread)	
+	    pthread)
 		EI_THREADS="true"
 		;;
 	    *)
@@ -351,6 +360,7 @@ LDFLAGS="$LDFLAGS $sanitizers"
 # XXX
 # ---------------------------------------------------------------------------
 
+
 AC_OUTPUT(
 	src/$host/Makefile:src/Makefile.in
 	src/$host/eidefs.mk:src/eidefs.mk.in
diff --git a/lib/erl_interface/doc/src/ei.xml b/lib/erl_interface/doc/src/ei.xml
index 9502fb1ee7..70af5642da 100644
--- a/lib/erl_interface/doc/src/ei.xml
+++ b/lib/erl_interface/doc/src/ei.xml
@@ -35,6 +35,9 @@
   <lib>ei</lib>
   <libsummary>Routines for handling the Erlang binary term format.</libsummary>
   <description>
+    <note><p>The support for VxWorks is deprecated as of OTP 22, and
+    will be removed in OTP 23.</p></note>
+    
     <p>The library <c>ei</c> contains macros and functions to encode
       and decode the Erlang binary term format.</p>
 
@@ -124,7 +127,7 @@ typedef enum {
 
   <funcs>
       <func>
-          <name><ret>int</ret><nametext>ei_decode_atom(const char *buf, int *index, char *p)</nametext></name>
+          <name since=""><ret>int</ret><nametext>ei_decode_atom(const char *buf, int *index, char *p)</nametext></name>
           <fsummary>Decode an atom.</fsummary>
           <desc>
               <p>Decodes an atom from the binary format. The <c>NULL</c>-terminated
@@ -134,7 +137,7 @@ typedef enum {
       </func>
 
       <func>
-          <name><ret>int</ret><nametext>ei_decode_atom_as(const char *buf, int *index, char *p, int plen, erlang_char_encoding want, erlang_char_encoding* was, erlang_char_encoding* result)</nametext></name>
+          <name since="OTP R16B"><ret>int</ret><nametext>ei_decode_atom_as(const char *buf, int *index, char *p, int plen, erlang_char_encoding want, erlang_char_encoding* was, erlang_char_encoding* result)</nametext></name>
           <fsummary>Decode an atom.</fsummary>
           <desc>
               <p>Decodes an atom from the binary format. The <c>NULL</c>-terminated
@@ -158,7 +161,7 @@ typedef enum {
       </func>
 
       <func>
-          <name><ret>int</ret><nametext>ei_decode_bignum(const char *buf, int *index, mpz_t obj)</nametext></name>
+          <name since=""><ret>int</ret><nametext>ei_decode_bignum(const char *buf, int *index, mpz_t obj)</nametext></name>
           <fsummary>Decode a GMP arbitrary precision integer.</fsummary>
           <desc>
               <p>Decodes an integer in the binary format to a GMP
@@ -168,7 +171,7 @@ typedef enum {
       </func>
 
       <func>
-          <name><ret>int</ret><nametext>ei_decode_binary(const char *buf, int *index, void *p, long *len)</nametext></name>
+          <name since=""><ret>int</ret><nametext>ei_decode_binary(const char *buf, int *index, void *p, long *len)</nametext></name>
           <fsummary>Decode a binary.</fsummary>
           <desc>
               <p>Decodes a binary from the binary format. Parameter
@@ -180,7 +183,44 @@ typedef enum {
       </func>
 
       <func>
-          <name><ret>int</ret><nametext>ei_decode_boolean(const char *buf, int *index, int *p)</nametext></name>
+          <name since="OTP 22.0"><ret>int</ret><nametext>ei_decode_bitstring(const char *buf, int *index, const char **pp, unsigned int *bitoffsp, size_t *nbitsp)</nametext></name>
+          <fsummary>Decode a bitstring.</fsummary>
+          <desc>
+            <p>Decodes a bit string from the binary format.</p>
+	    <taglist>
+	      <tag><c>pp</c></tag>
+	      <item><p>Either <c>NULL</c> or <c>*pp</c> returns a pointer to
+	       the first byte of the bit string. The returned bit string is
+	       readable as long as the buffer pointed to by <c>buf</c> is
+	       readable and not written to.</p>
+	      </item>
+	      <tag><c>bitoffsp</c></tag>
+	      <item><p>Either <c>NULL</c> or <c>*bitoffsp</c> returns the
+	       number of unused bits in the first byte pointed to by
+	       <c>*pp</c>. The value of <c>*bitoffsp</c> is between 0 and 7.
+	       Unused bits in the first byte are the most significant bits.</p>
+	      </item>
+	      <tag><c>nbitsp</c></tag>
+	      <item><p>Either <c>NULL</c> or <c>*nbitsp</c> returns the length
+	       of the bit string in <em>bits</em>.</p>
+	      </item>
+	    </taglist>
+	    <p>Returns <c>0</c> if it was a bit string term.</p>
+	    <p>The number of <em>bytes</em> pointed to by <c>*pp</c>, which are
+	      part of the bit string, is <c>(*bitoffsp + *nbitsp + 7)/8</c>. If
+	      <c>(*bitoffsp + *bitsp)%8 > 0</c> then only <c>(*bitoffsp +
+	      *bitsp)%8</c> bits of the last byte are used. Unused bits in
+	      the last byte are the least significant bits.</p>
+	    <p>The values of unused bits in the first and last byte are undefined
+	      and cannot be relied on.</p>
+	    <p>Number of bits may be divisible by 8, which means a binary
+	      decodable by <c>ei_decode_binary</c> is also decodable by
+	      <c>ei_decode_bitstring</c>.</p>
+          </desc>
+      </func>
+
+      <func>
+          <name since=""><ret>int</ret><nametext>ei_decode_boolean(const char *buf, int *index, int *p)</nametext></name>
           <fsummary>Decode a boolean.</fsummary>
           <desc>
               <p>Decodes a boolean value from the binary format.
@@ -190,7 +230,7 @@ typedef enum {
       </func>
 
       <func>
-          <name><ret>int</ret><nametext>ei_decode_char(const char *buf, int *index, char *p)</nametext></name>
+          <name since=""><ret>int</ret><nametext>ei_decode_char(const char *buf, int *index, char *p)</nametext></name>
           <fsummary>Decode an 8-bit integer between 0-255.</fsummary>
           <desc>
               <p>Decodes a char (8-bit) integer between 0-255 from the binary format.
@@ -203,7 +243,7 @@ typedef enum {
       </func>
 
       <func>
-          <name><ret>int</ret><nametext>ei_decode_double(const char *buf, int *index, double *p)</nametext></name>
+          <name since=""><ret>int</ret><nametext>ei_decode_double(const char *buf, int *index, double *p)</nametext></name>
           <fsummary>Decode a double.</fsummary>
           <desc>
               <p>Decodes a double-precision (64-bit) floating
@@ -212,7 +252,7 @@ typedef enum {
       </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_decode_ei_term(const char* buf, int* index, ei_term* term)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_decode_ei_term(const char* buf, int* index, ei_term* term)</nametext></name>
       <fsummary>Decode a term, without previous knowledge of type.</fsummary>
       <desc>
         <p>Decodes any term, or at least tries to. If the term
@@ -233,8 +273,8 @@ typedef enum {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_decode_fun(const char *buf, int *index, erlang_fun *p)</nametext></name>
-      <name><ret>void</ret><nametext>free_fun(erlang_fun* f)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_decode_fun(const char *buf, int *index, erlang_fun *p)</nametext></name>
+      <name since=""><ret>void</ret><nametext>free_fun(erlang_fun* f)</nametext></name>
       <fsummary>Decode a fun.</fsummary>
       <desc>
         <p>Decodes a fun from the binary format. Parameter
@@ -248,7 +288,7 @@ typedef enum {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_decode_list_header(const char *buf, int *index, int *arity)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_decode_list_header(const char *buf, int *index, int *arity)</nametext></name>
       <fsummary>Decode a list.</fsummary>
       <desc>
         <p>Decodes a list header from the binary
@@ -265,7 +305,7 @@ typedef enum {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_decode_long(const char *buf, int *index, long *p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_decode_long(const char *buf, int *index, long *p)</nametext></name>
       <fsummary>Decode integer.</fsummary>
       <desc>
         <p>Decodes a long integer from the binary format.
@@ -275,7 +315,7 @@ typedef enum {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_decode_longlong(const char *buf, int *index, long long *p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_decode_longlong(const char *buf, int *index, long long *p)</nametext></name>
       <fsummary>Decode integer.</fsummary>
       <desc>
         <p>Decodes a GCC <c>long long</c> or Visual C++
@@ -286,7 +326,7 @@ typedef enum {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_decode_map_header(const char *buf, int *index, int *arity)</nametext></name>
+      <name since="OTP 17.0"><ret>int</ret><nametext>ei_decode_map_header(const char *buf, int *index, int *arity)</nametext></name>
       <fsummary>Decode a map.</fsummary>
       <desc>
         <p>Decodes a map header from the binary
@@ -299,7 +339,7 @@ typedef enum {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_decode_pid(const char *buf, int *index, erlang_pid *p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_decode_pid(const char *buf, int *index, erlang_pid *p)</nametext></name>
       <fsummary>Decode a <c>pid</c>.</fsummary>
       <desc>
         <p>Decodes a process identifier (pid) from the binary format.</p>
@@ -307,7 +347,7 @@ typedef enum {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_decode_port(const char *buf, int *index, erlang_port *p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_decode_port(const char *buf, int *index, erlang_port *p)</nametext></name>
       <fsummary>Decode a port.</fsummary>
       <desc>
         <p>Decodes a port identifier from the binary format.</p>
@@ -315,7 +355,7 @@ typedef enum {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_decode_ref(const char *buf, int *index, erlang_ref *p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_decode_ref(const char *buf, int *index, erlang_ref *p)</nametext></name>
       <fsummary>Decode a reference.</fsummary>
       <desc>
         <p>Decodes a reference from the binary format.</p>
@@ -323,7 +363,7 @@ typedef enum {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_decode_string(const char *buf, int *index, char *p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_decode_string(const char *buf, int *index, char *p)</nametext></name>
       <fsummary>Decode a string.</fsummary>
       <desc>
         <p>Decodes a string from the binary format. A
@@ -338,7 +378,7 @@ typedef enum {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_decode_term(const char *buf, int *index, void *t)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_decode_term(const char *buf, int *index, void *t)</nametext></name>
       <fsummary>Decode a <c>ETERM</c>.</fsummary>
       <desc>
         <p>Decodes a term from the binary format. The term
@@ -346,13 +386,15 @@ typedef enum {
           <c>t</c> is actually an <c>ETERM**</c> (see
           <seealso marker="erl_eterm"><c>erl_eterm</c></seealso>).
           The term is later to be deallocated.</p>
-        <p>Notice that this function is located in the <c>Erl_Interface</c>
-          library.</p>
+	<note><p>This function is deprecated as of OTP 22 and will be removed in
+	  OTP 23 together with the old legacy <c>erl_interface</c> library (functions
+	  with prefix <c>erl_</c>).</p>
+	</note>
       </desc>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_decode_trace(const char *buf, int *index, erlang_trace *p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_decode_trace(const char *buf, int *index, erlang_trace *p)</nametext></name>
       <fsummary>Decode a trace token.</fsummary>
       <desc>
         <p>Decodes an Erlang trace token from the binary format.</p>
@@ -360,7 +402,7 @@ typedef enum {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_decode_tuple_header(const char *buf, int *index, int *arity)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_decode_tuple_header(const char *buf, int *index, int *arity)</nametext></name>
       <fsummary>Decode a tuple.</fsummary>
       <desc>
         <p>Decodes a tuple header, the number of elements
@@ -370,7 +412,7 @@ typedef enum {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_decode_ulong(const char *buf, int *index, unsigned long *p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_decode_ulong(const char *buf, int *index, unsigned long *p)</nametext></name>
       <fsummary>Decode unsigned integer.</fsummary>
       <desc>
         <p>Decodes an unsigned long integer from the binary format.
@@ -380,7 +422,7 @@ typedef enum {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_decode_ulonglong(const char *buf, int *index, unsigned long long *p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_decode_ulonglong(const char *buf, int *index, unsigned long long *p)</nametext></name>
       <fsummary>Decode unsigned integer.</fsummary>
       <desc>
         <p>Decodes a GCC <c>unsigned long long</c> or Visual C++
@@ -390,7 +432,7 @@ typedef enum {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_decode_version(const char *buf, int *index, int *version)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_decode_version(const char *buf, int *index, int *version)</nametext></name>
       <fsummary>Decode an empty list (<c>nil</c>).</fsummary>
       <desc>
         <p>Decodes the version magic number for the
@@ -400,10 +442,10 @@ typedef enum {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_encode_atom(char *buf, int *index, const char *p)</nametext></name>
-      <name><ret>int</ret><nametext>ei_encode_atom_len(char *buf, int *index, const char *p, int len)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_atom(ei_x_buff* x, const char *p)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_atom_len(ei_x_buff* x, const char *p, int len)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_encode_atom(char *buf, int *index, const char *p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_encode_atom_len(char *buf, int *index, const char *p, int len)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_encode_atom(ei_x_buff* x, const char *p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_encode_atom_len(ei_x_buff* x, const char *p, int len)</nametext></name>
       <fsummary>Encode an atom.</fsummary>
       <desc>
         <p>Encodes an atom in the binary format. Parameter <c>p</c>
@@ -415,10 +457,10 @@ typedef enum {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_encode_atom_as(char *buf, int *index, const char *p, erlang_char_encoding from_enc, erlang_char_encoding to_enc)</nametext></name>
-      <name><ret>int</ret><nametext>ei_encode_atom_len_as(char *buf, int *index, const char *p, int len, erlang_char_encoding from_enc, erlang_char_encoding to_enc)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_atom_as(ei_x_buff* x, const char *p, erlang_char_encoding from_enc, erlang_char_encoding to_enc)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_atom_len_as(ei_x_buff* x, const char *p, int len, erlang_char_encoding from_enc, erlang_char_encoding to_enc)</nametext></name>
+      <name since="OTP R16B"><ret>int</ret><nametext>ei_encode_atom_as(char *buf, int *index, const char *p, erlang_char_encoding from_enc, erlang_char_encoding to_enc)</nametext></name>
+      <name since="OTP R16B"><ret>int</ret><nametext>ei_encode_atom_len_as(char *buf, int *index, const char *p, int len, erlang_char_encoding from_enc, erlang_char_encoding to_enc)</nametext></name>
+      <name since="OTP R16B"><ret>int</ret><nametext>ei_x_encode_atom_as(ei_x_buff* x, const char *p, erlang_char_encoding from_enc, erlang_char_encoding to_enc)</nametext></name>
+      <name since="OTP R16B"><ret>int</ret><nametext>ei_x_encode_atom_len_as(ei_x_buff* x, const char *p, int len, erlang_char_encoding from_enc, erlang_char_encoding to_enc)</nametext></name>
       <fsummary>Encode an atom.</fsummary>
       <desc>
         <p>Encodes an atom in the binary format. Parameter <c>p</c> is the name of the atom with
@@ -435,8 +477,8 @@ typedef enum {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_encode_bignum(char *buf, int *index, mpz_t obj)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_bignum(ei_x_buff *x, mpz_t obj)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_encode_bignum(char *buf, int *index, mpz_t obj)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_encode_bignum(ei_x_buff *x, mpz_t obj)</nametext></name>
       <fsummary>Encode an arbitrary precision integer.</fsummary>
       <desc>
         <p>Encodes a GMP <c>mpz_t</c> integer to binary format.
@@ -446,8 +488,8 @@ typedef enum {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_encode_binary(char *buf, int *index, const void *p, long len)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_binary(ei_x_buff* x, const void *p, long len)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_encode_binary(char *buf, int *index, const void *p, long len)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_encode_binary(ei_x_buff* x, const void *p, long len)</nametext></name>
       <fsummary>Encode a binary.</fsummary>
       <desc>
         <p>Encodes a binary in the binary format. The data is at
@@ -456,8 +498,30 @@ typedef enum {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_encode_boolean(char *buf, int *index, int p)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_boolean(ei_x_buff* x, int p)</nametext></name>
+      <name since="OTP 22.0"><ret>int</ret>
+      <nametext>ei_encode_bitstring(char *buf, int *index, const char *p, size_t bitoffs, size_t nbits)</nametext></name>
+      <name since="OTP 22.0"><ret>int</ret>
+      <nametext>ei_x_encode_bitstring(ei_x_buff* x, const char *p, size_t bitoffs, size_t nbits)</nametext></name>
+      <fsummary>Encode a bitstring.</fsummary>
+      <desc>
+        <p>Encodes a bit string in the binary format.</p>
+	<p>The data is at <c>p</c>. The length of the bit string is <c>nbits</c>
+	  bits. The first <c>bitoffs</c> bits of the data at <c>p</c> are unused.
+	  The first byte which is part of the bit string is
+	  <c>p[bitoffs/8]</c>. The <c>bitoffs%8</c> most significant bits of
+	  the first byte <c>p[bitoffs/8]</c> are unused.</p>
+	<p>The number of bytes which is part of the bit string is <c>(bitoffs +
+	  nbits + 7)/8</c>. If <c>(bitoffs + nbits)%8 > 0</c> then only <c>(bitoffs +
+	  nbits)%8</c> bits of the last byte are used. Unused bits in
+	  the last byte are the least significant bits.</p>
+	<p>The values of unused bits are disregarded and does not need to be
+	  cleared.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name since=""><ret>int</ret><nametext>ei_encode_boolean(char *buf, int *index, int p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_encode_boolean(ei_x_buff* x, int p)</nametext></name>
       <fsummary>Encode a boolean.</fsummary>
       <desc>
         <p>Encodes a boolean value as the atom <c>true</c> if
@@ -467,8 +531,8 @@ typedef enum {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_encode_char(char *buf, int *index, char p)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_char(ei_x_buff* x, char p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_encode_char(char *buf, int *index, char p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_encode_char(ei_x_buff* x, char p)</nametext></name>
       <fsummary>Encode an 8-bit integer between 0-255.</fsummary>
       <desc>
         <p>Encodes a char (8-bit) as an integer between 0-255 in the binary
@@ -481,8 +545,8 @@ typedef enum {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_encode_double(char *buf, int *index, double p)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_double(ei_x_buff* x, double p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_encode_double(char *buf, int *index, double p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_encode_double(ei_x_buff* x, double p)</nametext></name>
       <fsummary>Encode a double float.</fsummary>
       <desc>
         <p>Encodes a double-precision (64-bit) floating point number in
@@ -493,8 +557,8 @@ typedef enum {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_encode_empty_list(char* buf, int* index)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_empty_list(ei_x_buff* x)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_encode_empty_list(char* buf, int* index)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_encode_empty_list(ei_x_buff* x)</nametext></name>
       <fsummary>Encode an empty list (<c>nil</c>).</fsummary>
       <desc>
         <p>Encodes an empty list. It is often used at the tail of a list.</p>
@@ -502,8 +566,8 @@ typedef enum {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_encode_fun(char *buf, int *index, const erlang_fun *p)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_fun(ei_x_buff* x, const erlang_fun* fun)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_encode_fun(char *buf, int *index, const erlang_fun *p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_encode_fun(ei_x_buff* x, const erlang_fun* fun)</nametext></name>
       <fsummary>Encode a fun.</fsummary>
       <desc>
         <p>Encodes a fun in the binary format. Parameter <c>p</c>
@@ -515,8 +579,8 @@ typedef enum {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_encode_list_header(char *buf, int *index, int arity)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_list_header(ei_x_buff* x, int arity)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_encode_list_header(char *buf, int *index, int arity)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_encode_list_header(ei_x_buff* x, int arity)</nametext></name>
       <fsummary>Encode a list.</fsummary>
       <desc>
         <p>Encodes a list header, with a specified
@@ -552,8 +616,8 @@ ei_x_encode_empty_list(&amp;x);</pre>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_encode_long(char *buf, int *index, long p)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_long(ei_x_buff* x, long p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_encode_long(char *buf, int *index, long p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_encode_long(ei_x_buff* x, long p)</nametext></name>
       <fsummary>Encode integer.</fsummary>
       <desc>
         <p>Encodes a long integer in the binary format.
@@ -563,8 +627,8 @@ ei_x_encode_empty_list(&amp;x);</pre>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_encode_longlong(char *buf, int *index, long long p)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_longlong(ei_x_buff* x, long long p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_encode_longlong(char *buf, int *index, long long p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_encode_longlong(ei_x_buff* x, long long p)</nametext></name>
       <fsummary>Encode integer.</fsummary>
       <desc>
         <p>Encodes a GCC <c>long long</c> or Visual C++
@@ -574,8 +638,8 @@ ei_x_encode_empty_list(&amp;x);</pre>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_encode_map_header(char *buf, int *index, int arity)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_map_header(ei_x_buff* x, int arity)</nametext></name>
+      <name since="OTP 17.0"><ret>int</ret><nametext>ei_encode_map_header(char *buf, int *index, int arity)</nametext></name>
+      <name since="OTP 17.0"><ret>int</ret><nametext>ei_x_encode_map_header(ei_x_buff* x, int arity)</nametext></name>
       <fsummary>Encode a map.</fsummary>
       <desc>
         <p>Encodes a map header, with a specified arity. The next
@@ -595,8 +659,8 @@ ei_x_encode_string(&amp;x, "Banana");</pre>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_encode_pid(char *buf, int *index, const erlang_pid *p)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_pid(ei_x_buff* x, const erlang_pid *p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_encode_pid(char *buf, int *index, const erlang_pid *p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_encode_pid(ei_x_buff* x, const erlang_pid *p)</nametext></name>
       <fsummary>Encode a pid.</fsummary>
       <desc>
         <p>Encodes an Erlang process identifier (pid) in the binary
@@ -607,8 +671,8 @@ ei_x_encode_string(&amp;x, "Banana");</pre>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_encode_port(char *buf, int *index, const erlang_port *p)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_port(ei_x_buff* x, const erlang_port *p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_encode_port(char *buf, int *index, const erlang_port *p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_encode_port(ei_x_buff* x, const erlang_port *p)</nametext></name>
       <fsummary>Encode a port.</fsummary>
       <desc>
         <p>Encodes an Erlang port in the binary format. Parameter
@@ -619,8 +683,8 @@ ei_x_encode_string(&amp;x, "Banana");</pre>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_encode_ref(char *buf, int *index, const erlang_ref *p)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_ref(ei_x_buff* x, const erlang_ref *p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_encode_ref(char *buf, int *index, const erlang_ref *p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_encode_ref(ei_x_buff* x, const erlang_ref *p)</nametext></name>
       <fsummary>Encode a ref.</fsummary>
       <desc>
         <p>Encodes an Erlang reference in the binary format. Parameter
@@ -631,10 +695,10 @@ ei_x_encode_string(&amp;x, "Banana");</pre>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_encode_string(char *buf, int *index, const char *p)</nametext></name>
-      <name><ret>int</ret><nametext>ei_encode_string_len(char *buf, int *index, const char *p, int len)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_string(ei_x_buff* x, const char *p)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_string_len(ei_x_buff* x, const char* s, int len)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_encode_string(char *buf, int *index, const char *p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_encode_string_len(char *buf, int *index, const char *p, int len)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_encode_string(ei_x_buff* x, const char *p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_encode_string_len(ei_x_buff* x, const char* s, int len)</nametext></name>
       <fsummary>Encode a string.</fsummary>
       <desc>
         <p>Encodes a string in the binary format. (A string in Erlang
@@ -645,19 +709,23 @@ ei_x_encode_string(&amp;x, "Banana");</pre>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_encode_term(char *buf, int *index, void *t)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_term(ei_x_buff* x, void *t)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_encode_term(char *buf, int *index, void *t)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_encode_term(ei_x_buff* x, void *t)</nametext></name>
       <fsummary>Encode an <c>erl_interface</c> term.</fsummary>
       <desc>
         <p>Encodes an <c>ETERM</c>, as obtained from
           <c>erl_interface</c>. Parameter <c>t</c> is
           actually an <c>ETERM</c> pointer. This function
           does not free the <c>ETERM</c>.</p>
+	<note><p>These functions are deprecated as of OTP 22 and will be removed in
+	  OTP 23 together with the old legacy <c>erl_interface</c> library
+	  (functions with prefix <c>erl_</c>).</p>
+	</note>
       </desc>
     </func>
     <func>
-      <name><ret>int</ret><nametext>ei_encode_trace(char *buf, int *index, const erlang_trace *p)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_trace(ei_x_buff* x, const erlang_trace *p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_encode_trace(char *buf, int *index, const erlang_trace *p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_encode_trace(ei_x_buff* x, const erlang_trace *p)</nametext></name>
       <fsummary>Encode a trace token.</fsummary>
       <desc>
         <p>Encodes an Erlang trace token in the binary format.
@@ -668,8 +736,8 @@ ei_x_encode_string(&amp;x, "Banana");</pre>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_encode_tuple_header(char *buf, int *index, int arity)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_tuple_header(ei_x_buff* x, int arity)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_encode_tuple_header(char *buf, int *index, int arity)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_encode_tuple_header(ei_x_buff* x, int arity)</nametext></name>
       <fsummary>Encode a tuple.</fsummary>
       <desc>
         <p>Encodes a tuple header, with a specified
@@ -687,8 +755,8 @@ ei_encode_tuple_header(buf, &amp;i, 0);</pre>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_encode_ulong(char *buf, int *index, unsigned long p)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_ulong(ei_x_buff* x, unsigned long p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_encode_ulong(char *buf, int *index, unsigned long p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_encode_ulong(ei_x_buff* x, unsigned long p)</nametext></name>
       <fsummary>Encode unsigned integer.</fsummary>
       <desc>
         <p>Encodes an unsigned long integer in the binary format.
@@ -698,8 +766,8 @@ ei_encode_tuple_header(buf, &amp;i, 0);</pre>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_encode_ulonglong(char *buf, int *index, unsigned long long p)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_ulonglong(ei_x_buff* x, unsigned long long p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_encode_ulonglong(char *buf, int *index, unsigned long long p)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_encode_ulonglong(ei_x_buff* x, unsigned long long p)</nametext></name>
       <fsummary>Encode unsigned integer.</fsummary>
       <desc>
         <p>Encodes a GCC <c>unsigned long long</c> or Visual C++
@@ -709,8 +777,8 @@ ei_encode_tuple_header(buf, &amp;i, 0);</pre>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_encode_version(char *buf, int *index)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_encode_version(ei_x_buff* x)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_encode_version(char *buf, int *index)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_encode_version(ei_x_buff* x)</nametext></name>
       <fsummary>Encode version.</fsummary>
       <desc>
         <p>Encodes a version magic number for the binary format. Must
@@ -719,22 +787,37 @@ ei_encode_tuple_header(buf, &amp;i, 0);</pre>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_get_type(const char *buf, const int *index, int *type, int *size)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_get_type(const char *buf, const int *index, int *type, int *size)</nametext></name>
       <fsummary>Fetch the type and size of an encoded term.</fsummary>
       <desc>
-        <p>Returns the type in <c>type</c> and size in
-          <c>size</c> of the encoded term. For strings and atoms,
+        <p>Returns the type in <c>*type</c> and size in
+          <c>*size</c> of the encoded term. For strings and atoms,
           size is the number of characters <em>not</em> including the
-          terminating <c>NULL</c>. For binaries, <c>size</c> is the number of
-          bytes. For lists and tuples, <c>size</c> is the arity of
-          the object. For other types, <c>size</c> is 0. In all
+          terminating <c>NULL</c>. For binaries and bitstrings, <c>*size</c> is
+	  the number of bytes. For lists, tuples and maps, <c>*size</c> is the
+	  arity of the object. For other types, <c>*size</c> is 0. In all
           cases, <c>index</c> is left unchanged.</p>
       </desc>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_print_term(FILE* fp, const char* buf, int* index)</nametext></name>
-      <name><ret>int</ret><nametext>ei_s_print_term(char** s, const char* buf, int* index)</nametext></name>
+      <name since="OTP 21.3"><ret>int</ret><nametext>ei_init(void)</nametext></name>
+      <fsummary>Initialize the ei library.</fsummary>
+      <desc>
+        <p>Initialize the <c>ei</c> library. This function should be called once
+	(and only once) before calling any other functionality in the <c>ei</c>
+	library. However, note the exception below.</p>
+	<p>If the <c>ei</c> library is used together with the <c>erl_interface</c>
+	library, this function should <em>not</em> be called directly. It will be
+	called by the <c>erl_init()</c> function which should be used to initialize
+	the combination of the two libraries instead.</p>
+	<p>On success zero is returned. On failure a posix error code is returned.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name since=""><ret>int</ret><nametext>ei_print_term(FILE* fp, const char* buf, int* index)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_s_print_term(char** s, const char* buf, int* index)</nametext></name>
       <fsummary>Print a term in clear text.</fsummary>
       <desc>
         <p>Prints a term, in clear text, to the file
@@ -759,42 +842,60 @@ ei_encode_tuple_header(buf, &amp;i, 0);</pre>
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>ei_set_compat_rel(release_number)</nametext></name>
+      <name since=""><ret>void</ret><nametext>ei_set_compat_rel(release_number)</nametext></name>
       <fsummary>Set the ei library in compatibility mode.</fsummary>
       <type>
         <v>unsigned release_number;</v>
       </type>
       <desc>
         <marker id="ei_set_compat_rel"></marker>
-        <p>By default, the <c>ei</c> library is only guaranteed
-          to be compatible with other Erlang/OTP components from the same
-          release as the <c>ei</c> library itself. For example,
-          <c>ei</c> from
-          Erlang/OTP R10 is not compatible with an Erlang emulator
-          from Erlang/OTP R9 by default.</p>
-        <p>A call to <c>ei_set_compat_rel(release_number)</c> sets
-          the <c>ei</c> library in compatibility mode of release
-          <c>release_number</c>. Valid range of
-          <c>release_number</c>
-          is <c>[7, current release]</c>. This makes it possible to
-          communicate with Erlang/OTP components from earlier releases.</p>
+        <p>In general, the <c>ei</c> library is guaranteed
+          to be compatible with other Erlang/OTP components that are 2 major
+	  releases older or newer than the <c>ei</c> library itself.</p>
+        <p>Sometimes an exception to the above rule has to be made to make new
+	  features (or even bug fixes) possible. A call to
+	  <c>ei_set_compat_rel(release_number)</c> sets
+          the <c>ei</c> library in compatibility mode of OTP release
+          <c>release_number</c>.</p>
+	<p>The only useful value for <c>release_number</c> is currently
+	  <c>21</c>. This will only be useful and have an effect if <em>bit
+	  strings</em> or <em>export funs</em> are received from a connected
+	  node. Before OTP 22, bit strings and export funs were not supported by
+	  <c>ei</c>. They were instead encoded using an undocumented fallback
+	  tuple format when sent from the emulator to <c>ei</c>:</p>
+	<taglist>
+	  <tag><c>Bit string</c></tag>
+	  <item><p>The term <c>&lt;&lt;42, 1:1>></c> was encoded as
+	    <c>{&lt;&lt;42, 128>>, 1}</c>. The first element of the tuple is a
+	    binary and the second element denotes how many bits of the last bytes
+	    are part of the bit string. In this example only the most significant
+	    bit of the last byte (128) is part of the bit string.</p>
+	  </item>
+	  <tag><c>Export fun</c></tag>
+	  <item><p>The term <c>fun lists:map/2</c> was encoded as
+	    <c>{lists,map}</c>. A tuple with the module, function and a missing
+	    arity.</p>
+	  </item>
+	</taglist>
+	<p>If <c>ei_set_compat_rel(21)</c> is <em>not</em> called then a connected
+	  emulator will send bit strings and export funs correctly encoded. The
+	  functions <seealso marker="#ei_decode_bitstring"><c>ei_decode_bitstring</c></seealso>
+	  and <seealso marker="#ei_decode_fun"><c>ei_decode_fun</c></seealso>
+	  has to be used to decode such terms. Calling
+	  <c>ei_set_compat_rel(21)</c> should only be done as a workaround to
+	  keep an old implementation alive, which expects to receive the
+	  undocumented tuple formats for bit strings and/or export funs.
+	</p>
         <note>
           <p>If this function is called, it can only be called once
             and must be called before any other functions in the
             <c>ei</c> library are called.</p>
         </note>
-        <warning>
-          <p>You can run into trouble if this feature is used
-            carelessly. Always ensure that all communicating
-            components are either from the same Erlang/OTP release, or
-            from release X and release Y where all components
-            from release Y are in compatibility mode of release X.</p>
-        </warning>
       </desc>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_skip_term(const char* buf, int* index)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_skip_term(const char* buf, int* index)</nametext></name>
       <fsummary>Skip a term.</fsummary>
       <desc>
         <p>Skips a term in the specified buffer;
@@ -815,8 +916,8 @@ ei_encode_tuple_header(buf, &amp;i, 0);</pre>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_x_append(ei_x_buff* x, const ei_x_buff* x2)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_append_buf(ei_x_buff* x, const char* buf, int len)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_append(ei_x_buff* x, const ei_x_buff* x2)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_append_buf(ei_x_buff* x, const char* buf, int len)</nametext></name>
       <fsummary>Append a buffer at the end.</fsummary>
       <desc>
         <p>Appends data at the end of buffer <c>x</c>.</p>
@@ -824,8 +925,8 @@ ei_encode_tuple_header(buf, &amp;i, 0);</pre>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_x_format(ei_x_buff* x, const char* fmt, ...)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_format_wo_ver(ei_x_buff* x, const char *fmt, ... )</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_format(ei_x_buff* x, const char* fmt, ...)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_format_wo_ver(ei_x_buff* x, const char *fmt, ... )</nametext></name>
       <fsummary>Format a term from a format string and parameters.</fsummary>
       <desc>
         <p>Formats a term, given as a string, to a buffer.
@@ -853,7 +954,7 @@ encodes the tuple {numbers,12,3.14159}</pre>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_x_free(ei_x_buff* x)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_free(ei_x_buff* x)</nametext></name>
       <fsummary>Free a buffer.</fsummary>
       <desc>
         <p>Frees an <c>ei_x_buff</c> buffer.
@@ -862,8 +963,8 @@ encodes the tuple {numbers,12,3.14159}</pre>
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_x_new(ei_x_buff* x)</nametext></name>
-      <name><ret>int</ret><nametext>ei_x_new_with_version(ei_x_buff* x)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_new(ei_x_buff* x)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_x_new_with_version(ei_x_buff* x)</nametext></name>
       <fsummary>Allocate a new buffer.</fsummary>
       <desc>
         <p>Allocates a new <c>ei_x_buff</c> buffer. The
diff --git a/lib/erl_interface/doc/src/ei_connect.xml b/lib/erl_interface/doc/src/ei_connect.xml
index 607a7cbff4..795f1249b3 100644
--- a/lib/erl_interface/doc/src/ei_connect.xml
+++ b/lib/erl_interface/doc/src/ei_connect.xml
@@ -34,6 +34,9 @@
   <lib>ei_connect</lib>
   <libsummary>Communicate with distributed Erlang.</libsummary>
   <description>
+    <note><p>The support for VxWorks is deprecated as of OTP 22, and
+    will be removed in OTP 23.</p></note>
+    
     <p>This module enables C-programs to communicate with Erlang nodes,
       using the Erlang distribution over TCP/IP.</p>
 
@@ -85,20 +88,288 @@
       the <c>_tmo</c> suffix.</p>
   </section>
 
+  <section>
+    <marker id="ussi"/>
+    <title>User Supplied Socket Implementation</title>
+    <p>By default <c>ei</c> supplies a TCP/IPv4 socket interface
+    that is used when communicating. The user can however plug in
+    his/her own IPv4 socket implementation. This, for example, in order
+    to communicate over TLS. A user supplied socket implementation
+    is plugged in by passing a
+    <seealso marker="#ei_socket_callbacks">callback structure</seealso>
+    to either
+    <seealso marker="#ei_connect_init"><c>ei_connect_init_ussi()</c></seealso>
+    or
+    <seealso marker="#ei_connect_init"><c>ei_connect_xinit_ussi()</c></seealso>.</p>
+    
+    <p>All callbacks in the <c>ei_socket_callbacks</c> structure
+    <em>should</em> return zero on success; and a posix error
+    code on failure.</p>
+    
+    <p>The <c>addr</c> argument of the <c>listen</c>, <c>accept</c>,
+    and <c>connect</c> callbacks refer to appropriate address
+    structure for currently used protocol. Currently <c>ei</c>
+    only supports IPv4. That is, at this time <c>addr</c> always
+    points to a <c>struct sockaddr_in</c> structure.</p>
+
+    <p>The <c>ei_socket_callbacks</c> structure may be enlarged in
+    the future. All fields not set, <em>needs</em> to be zeroed out.</p>
+
+    <marker id="ei_socket_callbacks"/>
+    <code type="none"><![CDATA[
+typedef struct {
+    int flags;
+    int (*socket)(void **ctx, void *setup_ctx);
+    int	(*close)(void *ctx);
+    int (*listen)(void *ctx, void *addr, int *len, int backlog);
+    int (*accept)(void **ctx, void *addr, int *len, unsigned tmo);
+    int (*connect)(void *ctx, void *addr, int len, unsigned tmo);
+    int (*writev)(void *ctx, const void *iov, int iovcnt, ssize_t *len, unsigned tmo);
+    int (*write)(void *ctx, const char *buf, ssize_t *len, unsigned tmo);
+    int (*read)(void *ctx, char *buf, ssize_t *len, unsigned tmo);
+    int (*handshake_packet_header_size)(void *ctx, int *sz);
+    int (*connect_handshake_complete)(void *ctx);
+    int (*accept_handshake_complete)(void *ctx);
+    int (*get_fd)(void *ctx, int *fd);
+} ei_socket_callbacks;
+        ]]></code>
+
+    <taglist>
+      
+      <tag><c>flags</c></tag>
+      <item>
+	<p>Flags informing <c>ei</c> about the behaviour of the
+	callbacks. Flags should be bitwise or:ed together. If no flag,
+	is set, the <c>flags</c> field should contain <c>0</c>. Currently,
+	supported flags:</p>
+	<taglist>
+	  <tag><c>EI_SCLBK_FLG_FULL_IMPL</c></tag>
+	  <item>
+	    <p>
+	      If set, the <c>accept()</c>, <c>connect()</c>,
+	      <c>writev()</c>, <c>write()</c>, and <c>read()</c> callbacks
+	      implements timeouts. The timeout is passed in the <c>tmo</c>
+	      argument and is given in milli seconds. Note that the
+	      <c>tmo</c> argument to these callbacks differ from the
+	      timeout arguments in the <c>ei</c> API. Zero means a zero
+	      timeout. That is, poll and timeout immediately unless the
+	      operation is successful. <c>EI_SCLBK_INF_TMO</c>
+	      (max <c>unsigned</c>) means infinite timeout. The file
+	      descriptor is in blocking mode when a callback is called,
+	      and it must be in blocking mode when the callback returns.
+	    </p>
+	    <p>
+	      If not set, <c>ei</c> will implement the timeout using
+	      <c>select()</c> in order to determine when to call the
+	      callbacks and when to time out. The <c>tmo</c> arguments
+	      of the <c>accept()</c>, <c>connect()</c>, <c>writev()</c>,
+	      <c>write()</c>, and <c>read()</c> callbacks should be
+	      ignored. The callbacks may be called in non-blocking mode.
+	      The callbacks are not allowed to change between blocking
+	      and non-blocking mode. In order for this to work,
+	      <c>select()</c> needs to interact with the socket primitives
+	      used the same way as it interacts with the ordinary socket
+	      primitives. If this is not the case, the callbacks
+	      <em>need</em> to implement timeouts and this flag should
+	      be set.
+	    </p>
+	  </item>
+	</taglist>
+	<p>More flags may be introduced in the future.</p>
+      </item>
+
+      <tag><c>int (*socket)(void **ctx, void *setup_ctx)</c></tag>
+      <item>
+	<p>Create a socket and a context for the socket.</p>
+	
+	<p>On success it should set <c>*ctx</c> to point to a context for
+	the created socket. This context will be passed to all other
+	socket callbacks. This function will be passed the same
+	<c>setup_context</c> as passed to the preceeding
+	<seealso marker="#ei_connect_init"><c>ei_connect_init_ussi()</c></seealso>
+	or
+	<seealso marker="#ei_connect_init"><c>ei_connect_xinit_ussi()</c></seealso>
+	call.</p>
+	
+	<note><p>During the lifetime of a socket, the pointer <c>*ctx</c>
+	<em>has</em> to remain the same. That is, it cannot later be
+	relocated.</p></note>
+	
+	<p>This callback is mandatory.</p>
+      </item>
+      
+      <tag><c>int (*close)(void *ctx)</c></tag>
+      <item>
+	<p>Close the socket identified by <c>ctx</c> and destroy the context.</p>
+	
+	<p>This callback is mandatory.</p>
+      </item>
+      
+      <tag><c>int (*listen)(void *ctx, void *addr, int *len, int backlog)</c></tag>
+      <item>
+	<p>Bind the socket identified by <c>ctx</c> to a local interface
+	and then listen on it.</p>
+	
+	<p>The <c>addr</c> and <c>len</c> arguments are both input and output
+	arguments. When called <c>addr</c> points to an address structure of
+	lenght <c>*len</c> containing information on how to bind the socket.
+	Uppon return this callback should have updated the structure referred
+	by <c>addr</c> with information on how the socket actually was bound.
+	<c>*len</c> should be updated to reflect the size of <c>*addr</c>
+	updated. <c>backlog</c> identifies the size of the backlog for the
+	listen socket.</p>
+	
+	<p>This callback is mandatory.</p>
+      </item>
+      
+      <tag><c>int (*accept)(void **ctx, void *addr, int *len, unsigned tmo)</c></tag>
+      <item>
+	<p>Accept connections on the listen socket identified by
+	<c>*ctx</c>.</p>
+
+	<p>When a connection is accepted, a new context for the accepted
+	connection should be created and <c>*ctx</c> should be updated
+	to point to the new context for the accepted connection. When
+	called <c>addr</c> points to an uninitialized address structure
+	of lenght <c>*len</c>. Uppon return this callback should have
+	updated this structure with information about the client address.
+	<c>*len</c> should be updated to reflect the size of <c>*addr</c>
+	updated.
+	</p>
+
+	<p>If the <c>EI_SCLBK_FLG_FULL_IMPL</c> flag has been set,
+	<c>tmo</c> contains timeout time in milliseconds.</p>
+
+	<note><p>During the lifetime of a socket, the pointer <c>*ctx</c>
+	<em>has</em> to remain the same. That is, it cannot later be
+	relocated.</p></note>
+
+	<p>This callback is mandatory.</p>
+      </item>
+      
+      <tag><c>int (*connect)(void *ctx, void *addr, int len, unsigned tmo)</c></tag>
+      <item>
+	<p>Connect the socket identified by <c>ctx</c> to the address
+	identified by <c>addr</c>.</p>
+
+	<p>When called <c>addr</c> points to an address structure of
+	lenght <c>len</c> containing information on where to connect.</p>
+
+	<p>If the <c>EI_SCLBK_FLG_FULL_IMPL</c> flag has been set,
+	<c>tmo</c> contains timeout time in milliseconds.</p>
+	
+	<p>This callback is mandatory.</p>
+      </item>
+      
+      <tag><c>int (*writev)(void *ctx, const void *iov, long iovcnt, ssize_t *len, unsigned tmo)</c></tag>
+      <item>
+	<p>Write data on the connected socket identified by <c>ctx</c>.</p>
+
+	<p><c>iov</c> points to an array of <c>struct iovec</c> structures of
+	length <c>iovcnt</c> containing data to write to the socket. On success,
+	this callback should set <c>*len</c> to the amount of bytes successfully
+	written on the socket.</p>
+	
+	<p>If the <c>EI_SCLBK_FLG_FULL_IMPL</c> flag has been set,
+	<c>tmo</c> contains timeout time in milliseconds.</p>
+	
+	<p>This callback is optional. Set the <c>writev</c> field
+	in the the <c>ei_socket_callbacks</c> structure to <c>NULL</c> if not
+	implemented.</p>
+      </item>
+      
+      <tag><c>int (*write)(void *ctx, const char *buf, ssize_t *len, unsigned tmo)</c></tag>
+      <item>
+	<p>Write data on the connected socket identified by <c>ctx</c>.</p>
+	
+	<p>When called <c>buf</c> points to a buffer of length <c>*len</c>
+	containing the data to write on the socket. On success, this callback
+	should set <c>*len</c> to the amount of bytes successfully written on
+	the socket.</p>
+
+	<p>If the <c>EI_SCLBK_FLG_FULL_IMPL</c> flag has been set,
+	<c>tmo</c> contains timeout time in milliseconds.</p>
+	
+	<p>This callback is mandatory.</p>
+      </item>
+      
+      <tag><c>int (*read)(void *ctx, char *buf, ssize_t *len, unsigned tmo)</c></tag>
+      <item>
+	<p>Read data on the connected socket identified by <c>ctx</c>.</p>
+	
+	<p><c>buf</c> points to a buffer of length <c>*len</c> where the
+	read data should be placed. On success, this callback should update
+	<c>*len</c> to the amount of bytes successfully read on the socket.</p>
+	
+	<p>If the <c>EI_SCLBK_FLG_FULL_IMPL</c> flag has been set,
+	<c>tmo</c> contains timeout time in milliseconds.</p>
+	
+	<p>This callback is mandatory.</p>
+      </item>
+      
+      <tag><c>int (*handshake_packet_header_size)(void *ctx, int *sz)</c></tag>
+      <item>
+	<p>Inform about handshake packet header size to use during the Erlang
+	distribution handshake.</p>
+
+	<p>On success, <c>*sz</c> should be set to the handshake packet header
+	size to use. Valid values are <c>2</c> and <c>4</c>. Erlang TCP
+	distribution use a handshake packet size of <c>2</c> and Erlang TLS
+	distribution use a handshake packet size of <c>4</c>.</p>
+
+	<p>This callback is mandatory.</p>
+      </item>
+      
+      <tag><c>int (*connect_handshake_complete)(void *ctx)</c></tag>
+      <item>
+	<p>Called when a locally started handshake has completed successfully.</p>
+	
+	<p>This callback is optional. Set the <c>connect_handshake_complete</c> field
+	in the <c>ei_socket_callbacks</c> structure to <c>NULL</c> if not implemented.</p>	
+      </item>
+      
+      <tag><c>int (*accept_handshake_complete)(void *ctx)</c></tag>
+      <item>
+	<p>Called when a remotely started handshake has completed successfully.</p>
+
+	<p>This callback is optional. Set the <c>accept_handshake_complete</c> field in
+	the <c>ei_socket_callbacks</c> structure to <c>NULL</c> if not implemented.</p>
+      </item>
+      
+      <tag><c>int (*get_fd)(void *ctx, int *fd)</c></tag>
+      <item>
+	<p>Inform about file descriptor used by the socket which is identified
+	by <c>ctx</c>.</p>
+
+	<note><p>During the lifetime of a socket, the file descriptor
+	<em>has</em> to remain the same. That is, repeated calls to this
+	callback with the same context <c>should</c> always report the same
+	file descriptor.</p>
+	<p>The file descriptor <em>has</em> to be a real file descriptor.
+	That is, no other operation should be able to get the same file
+	descriptor until it has been released by the <c>close()</c>
+	callback.</p>
+	</note>
+
+	<p>This callback is mandatory.</p>
+      </item>
+    </taglist>
+  </section>
   <funcs>
     <func>
-      <name><ret>struct hostent</ret><nametext>*ei_gethostbyaddr(const char *addr, int len, int type)</nametext></name>
-      <name><ret>struct hostent</ret><nametext>*ei_gethostbyaddr_r(const char *addr, int length,  int type,  struct hostent *hostp, char *buffer,   int buflen,  int *h_errnop)</nametext></name>
-      <name><ret>struct hostent</ret><nametext>*ei_gethostbyname(const char *name)</nametext></name>
-      <name><ret>struct hostent</ret><nametext>*ei_gethostbyname_r(const char *name,  struct hostent *hostp,  char *buffer,  int buflen,  int *h_errnop)</nametext></name>
+      <name since=""><ret>struct hostent *</ret><nametext>ei_gethostbyaddr(const char *addr, int len, int type)</nametext></name>
+      <name since=""><ret>struct hostent *</ret><nametext>ei_gethostbyaddr_r(const char *addr, int length,  int type,  struct hostent *hostp, char *buffer,   int buflen,  int *h_errnop)</nametext></name>
+      <name since=""><ret>struct hostent *</ret><nametext>ei_gethostbyname(const char *name)</nametext></name>
+      <name since=""><ret>struct hostent *</ret><nametext>ei_gethostbyname_r(const char *name,  struct hostent *hostp,  char *buffer,  int buflen,  int *h_errnop)</nametext></name>
       <fsummary>Name lookup functions.</fsummary>
       <desc>
         <p>Convenience functions for some common name lookup functions.</p>
       </desc>
     </func>
+    
 
     <func>
-      <name><ret>int</ret><nametext>ei_accept(ei_cnode *ec, int listensock, ErlConnect *conp)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_accept(ei_cnode *ec, int listensock, ErlConnect *conp)</nametext></name>
       <fsummary>Accept a connection from another node.</fsummary>
       <desc>
         <p>Used by a server process to accept a
@@ -130,7 +401,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_accept_tmo(ei_cnode *ec, int listensock, ErlConnect *conp, unsigned timeout_ms)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_accept_tmo(ei_cnode *ec, int listensock, ErlConnect *conp, unsigned timeout_ms)</nametext></name>
       <fsummary>Accept a connection from another node with optional
         time-out.</fsummary>
       <desc>
@@ -141,8 +412,16 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_connect(ei_cnode* ec, char *nodename)</nametext></name>
-      <name><ret>int</ret><nametext>ei_xconnect(ei_cnode* ec, Erl_IpAddr adr, char *alivename)</nametext></name>
+      <name since="OTP 21.3"><ret>int</ret><nametext>ei_close_connection(int fd)</nametext></name>
+      <fsummary>Close a connection.</fsummary>
+      <desc>
+        <p>Closes a previously opened connection or listen socket.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name since=""><ret>int</ret><nametext>ei_connect(ei_cnode* ec, char *nodename)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_xconnect(ei_cnode* ec, Erl_IpAddr adr, char *alivename)</nametext></name>
       <fsummary>Establish a connection to an Erlang node.</fsummary>
       <desc>
         <p>Sets up a connection to an Erlang node.</p>
@@ -192,8 +471,10 @@ fd = ei_xconnect(&ec, &addr, ALIVE);
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_connect_init(ei_cnode* ec, const char* this_node_name, const char *cookie, short creation)</nametext></name>
-      <name><ret>int</ret><nametext>ei_connect_xinit(ei_cnode* ec, const char *thishostname, const char *thisalivename, const char *thisnodename, Erl_IpAddr thisipaddr, const char *cookie, short creation)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_connect_init(ei_cnode* ec, const char* this_node_name, const char *cookie, short creation)</nametext></name>
+      <name since="OTP 21.3"><ret>int</ret><nametext>ei_connect_init_ussi(ei_cnode* ec, const char* this_node_name, const char *cookie, short creation, ei_socket_callbacks *cbs, int cbs_sz, void *setup_context)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_connect_xinit(ei_cnode* ec, const char *thishostname, const char *thisalivename, const char *thisnodename, Erl_IpAddr thisipaddr, const char *cookie, short creation)</nametext></name>
+      <name since="OTP 21.3"><ret>int</ret><nametext>ei_connect_xinit_ussi(ei_cnode* ec, const char *thishostname, const char *thisalivename, const char *thisnodename, Erl_IpAddr thisipaddr, const char *cookie, short creation, ei_socket_callbacks *cbs, int cbs_sz, void *setup_context)</nametext></name>
       <fsummary>Initialize for a connection.</fsummary>
       <desc>
         <p>Initializes the <c>ec</c> structure, to
@@ -236,6 +517,21 @@ fd = ei_xconnect(&ec, &addr, ALIVE);
           <item>
             <p><c>thispaddr</c> if the IP address of the host.</p>
           </item>
+	  <item>
+	    <p><c>cbs</c> is a pointer to a
+	    <seealso marker="#ei_socket_callbacks">callback structure</seealso>
+	    implementing and alternative socket interface.</p>
+	  </item>
+	  <item>
+	    <p><c>cbs_sz</c> is the size of the structure
+	    pointed to by <c>cbs</c>.</p>
+	  </item>
+	  <item>
+	    <p><c>setup_context</c> is a pointer to a structure that
+	    will be passed as second argument to the <c>socket</c> callback
+	    in the <c>cbs</c> structure.</p>
+	  </item>
+
         </list>
         <p>A C-node acting as a server is assigned a creation
           number when it calls <c>ei_publish()</c>.</p>
@@ -273,8 +569,8 @@ if (ei_connect_init(&ec, "madonna", "cookie...", n++) < 0) {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_connect_tmo(ei_cnode* ec, char *nodename, unsigned timeout_ms)</nametext></name>
-      <name><ret>int</ret><nametext>ei_xconnect_tmo(ei_cnode* ec, Erl_IpAddr adr, char *alivename, unsigned timeout_ms)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_connect_tmo(ei_cnode* ec, char *nodename, unsigned timeout_ms)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_xconnect_tmo(ei_cnode* ec, Erl_IpAddr adr, char *alivename, unsigned timeout_ms)</nametext></name>
       <fsummary>Establish a connection to an Erlang node with optional
         time-out.</fsummary>
       <desc>
@@ -286,8 +582,8 @@ if (ei_connect_init(&ec, "madonna", "cookie...", n++) < 0) {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_get_tracelevel(void)</nametext></name>
-      <name><ret>void</ret><nametext>ei_set_tracelevel(int level)</nametext></name>
+      <name since="OTP R13B04"><ret>int</ret><nametext>ei_get_tracelevel(void)</nametext></name>
+      <name since="OTP R13B04"><ret>void</ret><nametext>ei_set_tracelevel(int level)</nametext></name>
       <fsummary>Get and set functions for tracing.</fsummary>
       <desc>
         <p>Used to set tracing on the distribution. The levels are different
@@ -299,7 +595,46 @@ if (ei_connect_init(&ec, "madonna", "cookie...", n++) < 0) {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_publish(ei_cnode *ec, int port)</nametext></name>
+      <name since="OTP 21.3"><ret>int</ret><nametext>ei_listen(ei_cnode *ec, int *port, int backlog)</nametext></name>
+      <name since="OTP 21.3"><ret>int</ret><nametext>ei_xlisten(ei_cnode *ec, Erl_IpAddr adr, int *port, int backlog)</nametext></name>
+      <fsummary>Create a listen socket.</fsummary>
+      <desc>
+        <p>Used by a server process to setup a listen socket which
+	later can be used for accepting connections from client processes.
+	</p>
+        <list type="bulleted">
+          <item>
+            <p><c>ec</c> is the C-node structure.</p>
+          </item>
+	  <item>
+	    <p><c>adr</c> is local interface to bind to.</p>
+	  </item>
+          <item>
+            <p><c>port</c> is a pointer to an integer containing the
+	    port number to bind to. If <c>*port</c> equals <c>0</c>
+	    when calling <c>ei_listen()</c>, the socket will be bound to
+	    an ephemeral port. On success, <c>ei_listen()</c> will update
+	    the value of <c>*port</c> to the port actually bound to.
+	    </p>
+          </item>
+          <item>
+            <p><c>backlog</c> is maximum backlog of pending connections.</p>
+          </item>
+        </list>
+	<p><c>ei_listen</c> will create a socket, bind to a port on the
+	local interface identified by <c>adr</c> (or all local interfaces if
+	<c>ei_listen()</c> is called), and mark the socket as a passive socket
+	(that is, a socket that will be used for accepting incoming connections).
+	</p>
+	<p>
+	  On success, a file descriptor is returned which can be used in a call to
+	  <c>ei_accept()</c>. On failure, <c>ERL_ERROR</c> is returned and
+        <c>erl_errno</c> is set to <c>EIO</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name since=""><ret>int</ret><nametext>ei_publish(ei_cnode *ec, int port)</nametext></name>
       <fsummary>Publish a node name.</fsummary>
       <desc>
         <p>Used by a server process to register
@@ -336,7 +671,7 @@ if (ei_connect_init(&ec, "madonna", "cookie...", n++) < 0) {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_publish_tmo(ei_cnode *ec, int port, unsigned timeout_ms)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_publish_tmo(ei_cnode *ec, int port, unsigned timeout_ms)</nametext></name>
       <fsummary>Publish a node name with optional time-out.</fsummary>
       <desc>
         <p>Equivalent to
@@ -346,7 +681,7 @@ if (ei_connect_init(&ec, "madonna", "cookie...", n++) < 0) {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_receive(int fd, unsigned char* bufp, int bufsize)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_receive(int fd, unsigned char* bufp, int bufsize)</nametext></name>
       <fsummary>Receive a message.</fsummary>
       <desc>
         <p>Receives a message consisting of a sequence
@@ -387,7 +722,7 @@ if (ei_connect_init(&ec, "madonna", "cookie...", n++) < 0) {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_receive_encoded(int fd, char **mbufp, int *bufsz,  erlang_msg *msg, int *msglen)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_receive_encoded(int fd, char **mbufp, int *bufsz,  erlang_msg *msg, int *msglen)</nametext></name>
       <fsummary>Obsolete function for receiving a message.</fsummary>
       <desc>
         <p>This function is retained for compatibility with code
@@ -417,7 +752,7 @@ if (ei_connect_init(&ec, "madonna", "cookie...", n++) < 0) {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_receive_encoded_tmo(int fd, char **mbufp, int *bufsz,  erlang_msg *msg, int *msglen, unsigned timeout_ms)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_receive_encoded_tmo(int fd, char **mbufp, int *bufsz,  erlang_msg *msg, int *msglen, unsigned timeout_ms)</nametext></name>
       <fsummary>Obsolete function for receiving a message with time-out.
       </fsummary>
       <desc>
@@ -428,8 +763,8 @@ if (ei_connect_init(&ec, "madonna", "cookie...", n++) < 0) {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_receive_msg(int fd, erlang_msg* msg, ei_x_buff* x)</nametext></name>
-      <name><ret>int</ret><nametext>ei_xreceive_msg(int fd, erlang_msg* msg, ei_x_buff* x)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_receive_msg(int fd, erlang_msg* msg, ei_x_buff* x)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_xreceive_msg(int fd, erlang_msg* msg, ei_x_buff* x)</nametext></name>
       <fsummary>Receive a message.</fsummary>
       <desc>
         <p>Receives a message to the buffer in <c>x</c>.
@@ -493,8 +828,8 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_receive_msg_tmo(int fd, erlang_msg* msg, ei_x_buff* x, unsigned imeout_ms)</nametext></name>
-      <name><ret>int</ret><nametext>ei_xreceive_msg_tmo(int fd, erlang_msg* msg, ei_x_buff* x, unsigned timeout_ms)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_receive_msg_tmo(int fd, erlang_msg* msg, ei_x_buff* x, unsigned imeout_ms)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_xreceive_msg_tmo(int fd, erlang_msg* msg, ei_x_buff* x, unsigned timeout_ms)</nametext></name>
       <fsummary>Receive a message with optional time-out.</fsummary>
       <desc>
         <p>Equivalent to <c>ei_receive_msg</c> and <c>ei_xreceive_msg</c>
@@ -504,7 +839,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_receive_tmo(int fd, unsigned char* bufp, int bufsize, unsigned timeout_ms)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_receive_tmo(int fd, unsigned char* bufp, int bufsize, unsigned timeout_ms)</nametext></name>
       <fsummary>Receive a message with optional time-out.</fsummary>
       <desc>
         <p>Equivalent to
@@ -514,7 +849,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_reg_send(ei_cnode* ec, int fd, char* server_name, char* buf, int len)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_reg_send(ei_cnode* ec, int fd, char* server_name, char* buf, int len)</nametext></name>
       <fsummary>Send a message to a registered name.</fsummary>
       <desc>
         <p>Sends an Erlang term to a registered process.</p>
@@ -546,7 +881,7 @@ if (ei_reg_send(&ec, fd, x.buff, x.index) < 0)
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_reg_send_tmo(ei_cnode* ec, int fd, char* server_name, char* buf, int len, unsigned timeout_ms)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_reg_send_tmo(ei_cnode* ec, int fd, char* server_name, char* buf, int len, unsigned timeout_ms)</nametext></name>
       <fsummary>Send a message to a registered name with optional time-out
       </fsummary>
       <desc>
@@ -557,9 +892,9 @@ if (ei_reg_send(&ec, fd, x.buff, x.index) < 0)
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_rpc(ei_cnode *ec, int fd, char *mod, char *fun, const char *argbuf, int argbuflen, ei_x_buff *x)</nametext></name>
-      <name><ret>int</ret><nametext>ei_rpc_to(ei_cnode *ec, int fd, char *mod, char *fun, const char *argbuf, int argbuflen)</nametext></name>
-      <name><ret>int</ret><nametext>ei_rpc_from(ei_cnode *ec, int fd, int timeout, erlang_msg *msg, ei_x_buff *x)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_rpc(ei_cnode *ec, int fd, char *mod, char *fun, const char *argbuf, int argbuflen, ei_x_buff *x)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_rpc_to(ei_cnode *ec, int fd, char *mod, char *fun, const char *argbuf, int argbuflen)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_rpc_from(ei_cnode *ec, int fd, int timeout, erlang_msg *msg, ei_x_buff *x)</nametext></name>
       <fsummary>Remote Procedure Call from C to Erlang.</fsummary>
       <desc>
         <p>Supports calling Erlang functions on remote nodes.
@@ -658,7 +993,7 @@ if (ei_decode_version(result.buff, &index) < 0
     </func>
 
     <func>
-      <name><ret>erlang_pid *</ret><nametext>ei_self(ei_cnode *ec)</nametext></name>
+      <name since=""><ret>erlang_pid *</ret><nametext>ei_self(ei_cnode *ec)</nametext></name>
       <fsummary>Retrieve the pid of the C-node.</fsummary>
       <desc>
         <p>Retrieves the pid of the C-node. Every C-node
@@ -671,7 +1006,7 @@ if (ei_decode_version(result.buff, &index) < 0
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_send(int fd, erlang_pid* to, char* buf, int len)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_send(int fd, erlang_pid* to, char* buf, int len)</nametext></name>
       <fsummary>Send a message.</fsummary>
       <desc>
         <p>Sends an Erlang term to a process.</p>
@@ -692,7 +1027,7 @@ if (ei_decode_version(result.buff, &index) < 0
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_send_encoded(int fd, erlang_pid* to, char* buf, int len)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_send_encoded(int fd, erlang_pid* to, char* buf, int len)</nametext></name>
       <fsummary>Obsolete function to send a message.</fsummary>
       <desc>
         <p>Works exactly as <c>ei_send</c>, the alternative name is retained for
@@ -702,7 +1037,7 @@ if (ei_decode_version(result.buff, &index) < 0
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_send_encoded_tmo(int fd, erlang_pid* to, char* buf, int len, unsigned timeout_ms)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_send_encoded_tmo(int fd, erlang_pid* to, char* buf, int len, unsigned timeout_ms)</nametext></name>
       <fsummary>Obsolete function to send a message with optional time-out.
       </fsummary>
       <desc>
@@ -713,7 +1048,7 @@ if (ei_decode_version(result.buff, &index) < 0
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_send_reg_encoded(int fd, const erlang_pid *from, const char *to, const char *buf, int len)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_send_reg_encoded(int fd, const erlang_pid *from, const char *to, const char *buf, int len)</nametext></name>
       <fsummary>Obsolete function to send a message to a registered name.
       </fsummary>
       <desc>
@@ -741,7 +1076,7 @@ self->num = fd;
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_send_reg_encoded_tmo(int fd, const erlang_pid *from, const char *to, const char *buf, int len)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_send_reg_encoded_tmo(int fd, const erlang_pid *from, const char *to, const char *buf, int len)</nametext></name>
       <fsummary>Obsolete function to send a message to a registered name with
         time-out.</fsummary>
       <desc>
@@ -752,7 +1087,7 @@ self->num = fd;
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_send_tmo(int fd, erlang_pid* to, char* buf, int len, unsigned timeout_ms)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_send_tmo(int fd, erlang_pid* to, char* buf, int len, unsigned timeout_ms)</nametext></name>
       <fsummary>Send a message with optional time-out.</fsummary>
       <desc>
         <p>Equivalent to
@@ -762,9 +1097,9 @@ self->num = fd;
     </func>
 
     <func>
-      <name><ret>const char *</ret><nametext>ei_thisnodename(ei_cnode *ec)</nametext></name>
-      <name><ret>const char *</ret><nametext>ei_thishostname(ei_cnode *ec)</nametext></name>
-      <name><ret>const char *</ret><nametext>ei_thisalivename(ei_cnode *ec)</nametext></name>
+      <name since=""><ret>const char *</ret><nametext>ei_thisnodename(ei_cnode *ec)</nametext></name>
+      <name since=""><ret>const char *</ret><nametext>ei_thishostname(ei_cnode *ec)</nametext></name>
+      <name since=""><ret>const char *</ret><nametext>ei_thisalivename(ei_cnode *ec)</nametext></name>
       <fsummary>Retrieve some values.</fsummary>
       <desc>
         <p>Can be used to retrieve information about
@@ -779,7 +1114,7 @@ self->num = fd;
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_unpublish(ei_cnode *ec)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_unpublish(ei_cnode *ec)</nametext></name>
       <fsummary>Forcefully unpublish a node name.</fsummary>
       <desc>
         <p>Can be called by a process to unregister a
@@ -802,7 +1137,7 @@ self->num = fd;
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_unpublish_tmo(ei_cnode *ec, unsigned timeout_ms)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_unpublish_tmo(ei_cnode *ec, unsigned timeout_ms)</nametext></name>
       <fsummary>Unpublish a node name with optional time-out.</fsummary>
       <desc>
         <p>Equivalent to
diff --git a/lib/erl_interface/doc/src/ei_users_guide.xml b/lib/erl_interface/doc/src/ei_users_guide.xml
index 0eed50b50b..7ca10d1a99 100644
--- a/lib/erl_interface/doc/src/ei_users_guide.xml
+++ b/lib/erl_interface/doc/src/ei_users_guide.xml
@@ -34,6 +34,18 @@
   </header>
 
   <section>
+    <title>Deprecation and Removal</title>
+    <note><p>The support for VxWorks is deprecated as of OTP 22, and
+    will be removed in OTP 23.</p></note>
+    <note><p>The old legacy <c>erl_interface</c> library (functions
+    with prefix <c>erl_</c>) is deprecated as of OTP 22, and will be
+    removed in OTP 23. This does not apply to the <c>ei</c>
+    library. Reasonably new <c>gcc</c> compilers will issue deprecation
+    warnings. In order to disable these warnings, define the macro
+    <c>EI_NO_DEPR_WARN</c>.</p></note>
+  </section>
+
+  <section>
     <title>Introduction</title>
     <p>The <c>Erl_Interface</c> library contains functions that help you
       integrate programs written in C and Erlang. The functions in
@@ -162,12 +174,20 @@ $ ld -L/usr/local/otp/lib/erl_interface-3.2.3/
   </section>
 
   <section>
-    <title>Initializing the Erl_Interface Library</title>
-    <p>Before calling any of the other <c>Erl_Interface</c> functions, call
-      <c>erl_init()</c> exactly once to initialize the library.
+    <title>Initializing the Libraries</title>
+    <p>
+      Before calling any of the other functions in the <c>erl_interface</c>
+      and <c>ei</c> libraries, call <c>erl_init()</c> exactly once to initialize
+      both libraries.
       <c>erl_init()</c> takes two arguments. However, the arguments
-      are no longer used by <c>Erl_Interface</c> and are therefore to be
-      specified as <c>erl_init(NULL,0)</c>.</p>
+      are no longer used by <c>erl_interface</c> and are therefore to be
+      specified as <c>erl_init(NULL,0)</c>.
+    </p>
+    <p>
+      If you only use the <c>ei</c> library, instead initialize it by calling
+      <c>ei_init()</c> exactly once before calling any other functions in
+      the <c>ei</c> library.
+    </p>
   </section>
 
   <section>
diff --git a/lib/erl_interface/doc/src/erl_connect.xml b/lib/erl_interface/doc/src/erl_connect.xml
index 76ef6588c2..9492a82864 100644
--- a/lib/erl_interface/doc/src/erl_connect.xml
+++ b/lib/erl_interface/doc/src/erl_connect.xml
@@ -35,6 +35,15 @@
   <lib>erl_connect</lib>
   <libsummary>Communicate with distributed Erlang.</libsummary>
   <description>
+    <note><p>The support for VxWorks is deprecated as of OTP 22, and
+    will be removed in OTP 23.</p></note>
+    <note><p>The old legacy <c>erl_interface</c> library (functions
+    with prefix <c>erl_</c>) is deprecated as of OTP 22, and will be
+    removed in OTP 23. This does not apply to the <c>ei</c>
+    library. Reasonably new <c>gcc</c> compilers will issue deprecation
+    warnings. In order to disable these warnings, define the macro
+    <c>EI_NO_DEPR_WARN</c>.</p></note>
+    
     <p>This module provides support for communication between distributed
       Erlang nodes and C-nodes, in a manner that is transparent to Erlang
       processes.</p>
@@ -49,7 +58,7 @@
 
   <funcs>
     <func>
-      <name><ret>int</ret><nametext>erl_accept(listensock, conp)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_accept(listensock, conp)</nametext></name>
       <fsummary>Accept a connection.</fsummary>
       <type>
         <v>int listensock;</v>
@@ -78,7 +87,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_close_connection(fd)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_close_connection(fd)</nametext></name>
       <fsummary>Close a connection to an Erlang node.</fsummary>
       <type>
         <v>int fd;</v>
@@ -95,8 +104,8 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_connect(node)</nametext></name>
-      <name><ret>int</ret><nametext>erl_xconnect(addr, alive)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_connect(node)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_xconnect(addr, alive)</nametext></name>
       <fsummary>Establish a connection to an Erlang node.</fsummary>
       <type>
         <v>char *node, *alive;</v>
@@ -149,8 +158,8 @@ erl_xconnect( &addr , ALIVE );
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_connect_init(number, cookie, creation)</nametext></name>
-      <name><ret>int</ret><nametext>erl_connect_xinit(host, alive, node, addr, cookie, creation)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_connect_init(number, cookie, creation)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_connect_xinit(host, alive, node, addr, cookie, creation)</nametext></name>
       <fsummary>Initialize communication.</fsummary>
       <type>
         <v>int number;</v>
@@ -246,7 +255,7 @@ if (!erl_connect_init(17, "samplecookiestring...", 0))
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_publish(port)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_publish(port)</nametext></name>
       <fsummary>Publish a node name.</fsummary>
       <type>
         <v>int port;</v>
@@ -277,7 +286,7 @@ if (!erl_connect_init(17, "samplecookiestring...", 0))
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_receive(fd, bufp, bufsize)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_receive(fd, bufp, bufsize)</nametext></name>
       <fsummary>Receive a message.</fsummary>
       <type>
         <v>int fd;</v>
@@ -316,7 +325,7 @@ if (!erl_connect_init(17, "samplecookiestring...", 0))
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_receive_msg(fd, bufp, bufsize, emsg)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_receive_msg(fd, bufp, bufsize, emsg)</nametext></name>
       <fsummary>Receive and decode a message.</fsummary>
       <type>
         <v>int fd;</v>
@@ -411,7 +420,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_reg_send(fd, to, msg)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_reg_send(fd, to, msg)</nametext></name>
       <fsummary>Send a message to a registered name.</fsummary>
       <type>
         <v>int fd;</v>
@@ -439,9 +448,9 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_rpc(fd, mod, fun, args)</nametext></name>
-      <name><ret>int</ret><nametext>erl_rpc_from(fd, timeout, emsg)</nametext></name>
-      <name><ret>int</ret><nametext>erl_rpc_to(fd, mod, fun, args)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_rpc(fd, mod, fun, args)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_rpc_from(fd, timeout, emsg)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_rpc_to(fd, mod, fun, args)</nametext></name>
       <fsummary>Remote Procedure Call.</fsummary>
       <type>
         <v>int fd, timeout;</v>
@@ -511,7 +520,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_send(fd, to, msg)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_send(fd, to, msg)</nametext></name>
       <fsummary>Send a message.</fsummary>
       <type>
         <v>int fd;</v>
@@ -541,11 +550,11 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>const char *</ret><nametext>erl_thisalivename()</nametext></name>
-      <name><ret>const char *</ret><nametext>erl_thiscookie()</nametext></name>
-      <name><ret>short</ret><nametext>erl_thiscreation()</nametext></name>
-      <name><ret>const char *</ret><nametext>erl_thishostname()</nametext></name>
-      <name><ret>const char *</ret><nametext>erl_thisnodename()</nametext></name>
+      <name since=""><ret>const char *</ret><nametext>erl_thisalivename()</nametext></name>
+      <name since=""><ret>const char *</ret><nametext>erl_thiscookie()</nametext></name>
+      <name since=""><ret>short</ret><nametext>erl_thiscreation()</nametext></name>
+      <name since=""><ret>const char *</ret><nametext>erl_thishostname()</nametext></name>
+      <name since=""><ret>const char *</ret><nametext>erl_thisnodename()</nametext></name>
       <fsummary>Retrieve some values.</fsummary>
       <desc>
         <p>Retrieves information about
@@ -556,7 +565,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_unpublish(alive)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_unpublish(alive)</nametext></name>
       <fsummary>Forcefully unpublish a node name.</fsummary>
       <type>
         <v>char *alive;</v>
@@ -583,7 +592,7 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_xreceive_msg(fd, bufpp, bufsizep, emsg)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_xreceive_msg(fd, bufpp, bufsizep, emsg)</nametext></name>
       <fsummary>Receive and decode a message.</fsummary>
       <type>
         <v>int fd;</v>
@@ -616,10 +625,10 @@ typedef struct {
     </func>
 
     <func>
-      <name><ret>struct hostent</ret><nametext>*erl_gethostbyaddr(addr, length, type)</nametext></name>
-      <name><ret>struct hostent</ret><nametext>*erl_gethostbyaddr_r(addr, length, type, hostp, buffer, buflen, h_errnop)</nametext></name>
-      <name><ret>struct hostent</ret><nametext>*erl_gethostbyname(name)</nametext></name>
-      <name><ret>struct hostent</ret><nametext>*erl_gethostbyname_r(name, hostp, buffer, buflen, h_errnop)</nametext></name>
+      <name since=""><ret>struct hostent *</ret><nametext>erl_gethostbyaddr(addr, length, type)</nametext></name>
+      <name since=""><ret>struct hostent *</ret><nametext>erl_gethostbyaddr_r(addr, length, type, hostp, buffer, buflen, h_errnop)</nametext></name>
+      <name since=""><ret>struct hostent *</ret><nametext>erl_gethostbyname(name)</nametext></name>
+      <name since=""><ret>struct hostent *</ret><nametext>erl_gethostbyname_r(name, hostp, buffer, buflen, h_errnop)</nametext></name>
 
       <fsummary>Name lookup functions.</fsummary>
       <type>
diff --git a/lib/erl_interface/doc/src/erl_error.xml b/lib/erl_interface/doc/src/erl_error.xml
index 8139c9b343..6fac94e442 100644
--- a/lib/erl_interface/doc/src/erl_error.xml
+++ b/lib/erl_interface/doc/src/erl_error.xml
@@ -47,7 +47,7 @@
 
   <funcs>
     <func>
-      <name><ret>void</ret><nametext>erl_err_msg(FormatStr, ... )</nametext></name>
+      <name since=""><ret>void</ret><nametext>erl_err_msg(FormatStr, ... )</nametext></name>
       <fsummary>Non-fatal error, and not system call error.</fsummary>
       <type>
         <v>const char *FormatStr;</v>
@@ -59,7 +59,7 @@
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_err_quit(FormatStr, ... )</nametext></name>
+      <name since=""><ret>void</ret><nametext>erl_err_quit(FormatStr, ... )</nametext></name>
       <fsummary>Fatal error, but not system call error.</fsummary>
       <type>
         <v>const char *FormatStr;</v>
@@ -73,7 +73,7 @@
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_err_ret(FormatStr, ... )</nametext></name>
+      <name since=""><ret>void</ret><nametext>erl_err_ret(FormatStr, ... )</nametext></name>
       <fsummary>Non-fatal system call error.</fsummary>
       <type>
         <v>const char *FormatStr;</v>
@@ -86,7 +86,7 @@
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_err_sys(FormatStr, ... )</nametext></name>
+      <name since=""><ret>void</ret><nametext>erl_err_sys(FormatStr, ... )</nametext></name>
       <fsummary>Fatal system call error.</fsummary>
       <type>
         <v>const char *FormatStr;</v>
@@ -113,7 +113,7 @@
 
   <funcs>
     <func>
-      <name><ret>volatile int</ret><nametext>erl_errno</nametext></name>
+      <name since=""><ret>volatile int</ret><nametext>erl_errno</nametext></name>
       <fsummary>Variable <c>erl_errno</c> contains the
         Erl_Interface error number. You can change the value if you wish.
       </fsummary>
diff --git a/lib/erl_interface/doc/src/erl_eterm.xml b/lib/erl_interface/doc/src/erl_eterm.xml
index 9a05196a70..295760b4e6 100644
--- a/lib/erl_interface/doc/src/erl_eterm.xml
+++ b/lib/erl_interface/doc/src/erl_eterm.xml
@@ -35,6 +35,15 @@
   <lib>erl_eterm</lib>
   <libsummary>Functions for Erlang term construction.</libsummary>
   <description>
+    <note><p>The support for VxWorks is deprecated as of OTP 22, and
+    will be removed in OTP 23.</p></note>
+    <note><p>The old legacy <c>erl_interface</c> library (functions
+    with prefix <c>erl_</c>) is deprecated as of OTP 22, and will be
+    removed in OTP 23. This does not apply to the <c>ei</c>
+    library. Reasonably new <c>gcc</c> compilers will issue deprecation
+    warnings. In order to disable these warnings, define the macro
+    <c>EI_NO_DEPR_WARN</c>.</p></note>
+    
     <p>This module provides functions for creating and manipulating
       Erlang terms.</p>
 
@@ -142,7 +151,7 @@
 
   <funcs>
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_cons(head, tail)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_cons(head, tail)</nametext></name>
       <fsummary>Prepend a term to the head of a list.</fsummary>
       <type>
         <v>ETERM *head;</v>
@@ -181,7 +190,7 @@ erl_free_compound(list);
     </func>
 
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_copy_term(term)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_copy_term(term)</nametext></name>
       <fsummary>Create a copy of an Erlang term.</fsummary>
       <type>
         <v>ETERM *term;</v>
@@ -193,7 +202,7 @@ erl_free_compound(list);
     </func>
 
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_element(position, tuple)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_element(position, tuple)</nametext></name>
       <fsummary>Extract an element from an Erlang tuple.</fsummary>
       <type>
         <v>int position;</v>
@@ -215,7 +224,7 @@ erl_free_compound(list);
     </func>
 
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_hd(list)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_hd(list)</nametext></name>
       <fsummary>Extract the first element from a list.</fsummary>
       <type>
         <v>ETERM *list;</v>
@@ -230,7 +239,7 @@ erl_free_compound(list);
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_init(NULL, 0)</nametext></name>
+      <name since=""><ret>void</ret><nametext>erl_init(NULL, 0)</nametext></name>
       <fsummary>Initialization routine.</fsummary>
       <type>
         <v>void *NULL;</v>
@@ -245,7 +254,7 @@ erl_free_compound(list);
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_iolist_length(list)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_iolist_length(list)</nametext></name>
       <fsummary>Return the length of an I/O list.</fsummary>
       <type>
         <v>ETERM *list;</v>
@@ -262,7 +271,7 @@ erl_free_compound(list);
     </func>
 
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_iolist_to_binary(term)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_iolist_to_binary(term)</nametext></name>
       <fsummary>Convert an I/O list to a binary.</fsummary>
       <type>
         <v>ETERM *list;</v>
@@ -289,7 +298,7 @@ iohead ::= Binary
     </func>
 
     <func>
-      <name><ret>char *</ret><nametext>erl_iolist_to_string(list)</nametext></name>
+      <name since=""><ret>char *</ret><nametext>erl_iolist_to_string(list)</nametext></name>
       <fsummary>Convert an I/O list to a <c>NULL</c>-terminated string.</fsummary>
       <type>
         <v>ETERM *list;</v>
@@ -312,7 +321,7 @@ iohead ::= Binary
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_length(list)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_length(list)</nametext></name>
       <fsummary>Determine the length of a list.</fsummary>
       <type>
         <v>ETERM *list;</v>
@@ -328,7 +337,7 @@ iohead ::= Binary
     </func>
 
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_mk_atom(string)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_mk_atom(string)</nametext></name>
       <fsummary>Create an atom.</fsummary>
       <type>
         <v>const char *string;</v>
@@ -355,7 +364,7 @@ iohead ::= Binary
     </func>
 
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_mk_binary(bptr, size)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_mk_binary(bptr, size)</nametext></name>
       <fsummary>Create a binary object.</fsummary>
       <type>
         <v>char *bptr;</v>
@@ -378,7 +387,7 @@ iohead ::= Binary
     </func>
 
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_mk_empty_list()</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_mk_empty_list()</nametext></name>
       <fsummary>Create an empty Erlang list.</fsummary>
       <desc>
         <p>Creates and returns an empty Erlang list.
@@ -388,7 +397,7 @@ iohead ::= Binary
     </func>
 
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_mk_estring(string, len)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_mk_estring(string, len)</nametext></name>
       <fsummary>Create an Erlang string.</fsummary>
       <type>
         <v>char *string;</v>
@@ -408,7 +417,7 @@ iohead ::= Binary
     </func>
 
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_mk_float(f)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_mk_float(f)</nametext></name>
       <fsummary>Create an Erlang float.</fsummary>
       <type>
         <v>double f;</v>
@@ -426,7 +435,7 @@ iohead ::= Binary
     </func>
 
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_mk_int(n)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_mk_int(n)</nametext></name>
       <fsummary>Create an Erlang integer.</fsummary>
       <type>
         <v>int n;</v>
@@ -443,7 +452,7 @@ iohead ::= Binary
     </func>
 
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_mk_list(array, arrsize)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_mk_list(array, arrsize)</nametext></name>
       <fsummary>Create a list from an array.</fsummary>
       <type>
         <v>ETERM **array;</v>
@@ -465,7 +474,7 @@ iohead ::= Binary
     </func>
 
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_mk_long_ref(node, n1, n2, n3, creation)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_mk_long_ref(node, n1, n2, n3, creation)</nametext></name>
       <fsummary>Create an Erlang reference.</fsummary>
       <type>
         <v>const char *node;</v>
@@ -495,7 +504,7 @@ iohead ::= Binary
     </func>
 
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_mk_pid(node, number, serial, creation)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_mk_pid(node, number, serial, creation)</nametext></name>
       <fsummary>Create a process identifier.</fsummary>
       <type>
         <v>const char *node;</v>
@@ -525,7 +534,7 @@ iohead ::= Binary
     </func>
 
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_mk_port(node, number, creation)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_mk_port(node, number, creation)</nametext></name>
       <fsummary>Create a port identifier.</fsummary>
       <type>
         <v>const char *node;</v>
@@ -550,7 +559,7 @@ iohead ::= Binary
     </func>
 
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_mk_ref(node, number, creation)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_mk_ref(node, number, creation)</nametext></name>
       <fsummary>Create an old Erlang reference.</fsummary>
       <type>
         <v>const char *node;</v>
@@ -578,7 +587,7 @@ iohead ::= Binary
     </func>
 
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_mk_string(string)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_mk_string(string)</nametext></name>
       <fsummary>Create a string.</fsummary>
       <type>
         <v>char *string;</v>
@@ -593,7 +602,7 @@ iohead ::= Binary
     </func>
 
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_mk_tuple(array, arrsize)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_mk_tuple(array, arrsize)</nametext></name>
       <fsummary>Create an Erlang tuple from an array.</fsummary>
       <type>
         <v>ETERM **array;</v>
@@ -621,7 +630,7 @@ iohead ::= Binary
     </func>
 
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_mk_uint(n)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_mk_uint(n)</nametext></name>
       <fsummary>Create an unsigned integer.</fsummary>
       <type>
         <v>unsigned int n;</v>
@@ -638,7 +647,7 @@ iohead ::= Binary
     </func>
 
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_mk_var(name)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_mk_var(name)</nametext></name>
       <fsummary>Create an Erlang variable.</fsummary>
       <type>
         <v>char *name;</v>
@@ -653,7 +662,7 @@ iohead ::= Binary
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_print_term(stream, term)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_print_term(stream, term)</nametext></name>
       <fsummary>Print an Erlang term.</fsummary>
       <type>
         <v>FILE *stream;</v>
@@ -672,7 +681,7 @@ iohead ::= Binary
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_set_compat_rel(release_number)</nametext></name>
+      <name since=""><ret>void</ret><nametext>erl_set_compat_rel(release_number)</nametext></name>
       <fsummary>Set the Erl_Interface library in compatibility mode.</fsummary>
       <type>
         <v>unsigned release_number;</v>
@@ -706,7 +715,7 @@ iohead ::= Binary
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_size(term)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_size(term)</nametext></name>
       <fsummary>Return the arity of a tuple or binary.</fsummary>
       <type>
         <v>ETERM *term;</v>
@@ -723,7 +732,7 @@ iohead ::= Binary
     </func>
 
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_tl(list)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_tl(list)</nametext></name>
       <fsummary>Extract the tail from a list.</fsummary>
       <type>
         <v>ETERM *list;</v>
@@ -738,7 +747,7 @@ iohead ::= Binary
     </func>
 
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_var_content(term, name)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_var_content(term, name)</nametext></name>
       <fsummary>Extract the content of a variable.</fsummary>
       <type>
         <v>ETERM *term;</v>
diff --git a/lib/erl_interface/doc/src/erl_format.xml b/lib/erl_interface/doc/src/erl_format.xml
index 5b8b7b5e78..b5e895c720 100644
--- a/lib/erl_interface/doc/src/erl_format.xml
+++ b/lib/erl_interface/doc/src/erl_format.xml
@@ -41,7 +41,7 @@
 
   <funcs>
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_format(FormatStr, ...)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_format(FormatStr, ...)</nametext></name>
       <fsummary>Create an Erlang term.</fsummary>
       <type>
         <v>char *FormatStr;</v>
@@ -81,7 +81,7 @@ erl_format("[{name,~a},{age,~i},{data,~w}]",
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_match(Pattern, Term)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_match(Pattern, Term)</nametext></name>
       <fsummary>Perform pattern matching.</fsummary>
       <type>
         <v>ETERM *Pattern,*Term;</v>
diff --git a/lib/erl_interface/doc/src/erl_global.xml b/lib/erl_interface/doc/src/erl_global.xml
index 2fa0045adf..39085b46f0 100644
--- a/lib/erl_interface/doc/src/erl_global.xml
+++ b/lib/erl_interface/doc/src/erl_global.xml
@@ -35,6 +35,15 @@
   <lib>erl_global</lib>
   <libsummary>Access globally registered names.</libsummary>
   <description>
+    <note><p>The support for VxWorks is deprecated as of OTP 22, and
+    will be removed in OTP 23.</p></note>
+    <note><p>The old legacy <c>erl_interface</c> library (functions
+    with prefix <c>erl_</c>) is deprecated as of OTP 22, and will be
+    removed in OTP 23. This does not apply to the <c>ei</c>
+    library. Reasonably new <c>gcc</c> compilers will issue deprecation
+    warnings. In order to disable these warnings, define the macro
+    <c>EI_NO_DEPR_WARN</c>.</p></note>
+    
     <p>This module provides support for registering, looking
       up, and unregistering names in the <c>global</c> module.
       For more information, see
@@ -48,7 +57,7 @@
 
   <funcs>
     <func>
-      <name><ret>char **</ret><nametext>erl_global_names(fd,count)</nametext></name>
+      <name since=""><ret>char **</ret><nametext>erl_global_names(fd,count)</nametext></name>
       <fsummary>Obtain list of global names.</fsummary>
       <type>
         <v>int fd;</v>
@@ -79,7 +88,7 @@
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_global_register(fd,name,pid)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_global_register(fd,name,pid)</nametext></name>
       <fsummary>Register a name in global.</fsummary>
       <type>
         <v>int fd;</v>
@@ -103,7 +112,7 @@
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_global_unregister(fd,name)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_global_unregister(fd,name)</nametext></name>
       <fsummary>Unregister a name from global.</fsummary>
       <type>
         <v>int fd;</v>
@@ -122,7 +131,7 @@
     </func>
 
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_global_whereis(fd,name,node)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_global_whereis(fd,name,node)</nametext></name>
       <fsummary>Look up a name in global.</fsummary>
       <type>
         <v>int fd;</v>
diff --git a/lib/erl_interface/doc/src/erl_interface.xml b/lib/erl_interface/doc/src/erl_interface.xml
index 4e66655b39..decd66046a 100644
--- a/lib/erl_interface/doc/src/erl_interface.xml
+++ b/lib/erl_interface/doc/src/erl_interface.xml
@@ -58,6 +58,18 @@
   </list>
 
   <section>
+    <title>Deprecation and Removal</title>
+    <note><p>The support for VxWorks is deprecated as of OTP 22, and
+    will be removed in OTP 23.</p></note>
+    <note><p>The old legacy <c>erl_interface</c> library (functions
+    with prefix <c>erl_</c>) is deprecated as of OTP 22, and will be
+    removed in OTP 23. This does not apply to the <c>ei</c>
+    library. Reasonably new <c>gcc</c> compilers will issue deprecation
+    warnings. In order to disable these warnings, define the macro
+    <c>EI_NO_DEPR_WARN</c>.</p></note>
+  </section>
+
+  <section>
     <title>Compiling and Linking Your Code</title>
     <p>In order to use any of the Erl_Interface functions, include the
       following lines in your code:</p>
diff --git a/lib/erl_interface/doc/src/erl_malloc.xml b/lib/erl_interface/doc/src/erl_malloc.xml
index c0eebc29e9..6650620064 100644
--- a/lib/erl_interface/doc/src/erl_malloc.xml
+++ b/lib/erl_interface/doc/src/erl_malloc.xml
@@ -35,13 +35,21 @@
   <lib>erl_malloc</lib>
   <libsummary>Memory allocation functions.</libsummary>
   <description>
+    <note><p>The support for VxWorks is deprecated as of OTP 22, and
+    will be removed in OTP 23.</p></note>
+    <note><p>The old legacy <c>erl_interface</c> library (functions
+    with prefix <c>erl_</c>) is deprecated as of OTP 22, and will be
+    removed in OTP 23. This does not apply to the <c>ei</c>
+    library. Reasonably new <c>gcc</c> compilers will issue deprecation
+    warnings. In order to disable these warnings, define the macro
+    <c>EI_NO_DEPR_WARN</c>.</p></note>
     <p>This module provides functions for allocating and deallocating
       memory.</p>
   </description>
 
   <funcs>
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_alloc_eterm(etype)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_alloc_eterm(etype)</nametext></name>
       <fsummary>Allocate an ETERM structure.</fsummary>
       <type>
         <v>unsigned char etype;</v>
@@ -89,7 +97,7 @@
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_eterm_release(void)</nametext></name>
+      <name since=""><ret>void</ret><nametext>erl_eterm_release(void)</nametext></name>
       <fsummary>Clear the ETERM freelist.</fsummary>
       <desc>
         <p>Clears the freelist, where blocks are placed when they are
@@ -99,7 +107,7 @@
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_eterm_statistics(allocated, freed)</nametext></name>
+      <name since=""><ret>void</ret><nametext>erl_eterm_statistics(allocated, freed)</nametext></name>
       <fsummary>Report term allocation statistics.</fsummary>
       <type>
         <v>long *allocated;</v>
@@ -127,7 +135,7 @@
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_free(ptr)</nametext></name>
+      <name since=""><ret>void</ret><nametext>erl_free(ptr)</nametext></name>
       <fsummary>Free some memory.</fsummary>
       <type>
         <v>void *ptr;</v>
@@ -139,7 +147,7 @@
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_free_array(array, size)</nametext></name>
+      <name since=""><ret>void</ret><nametext>erl_free_array(array, size)</nametext></name>
       <fsummary>Free an array of ETERM structures.</fsummary>
       <type>
         <v>ETERM **array;</v>
@@ -156,7 +164,7 @@
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_free_compound(t)</nametext></name>
+      <name since=""><ret>void</ret><nametext>erl_free_compound(t)</nametext></name>
       <fsummary>Free an array of ETERM structures.</fsummary>
       <type>
         <v>ETERM *t;</v>
@@ -179,7 +187,7 @@
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_free_term(t)</nametext></name>
+      <name since=""><ret>void</ret><nametext>erl_free_term(t)</nametext></name>
       <fsummary>Free an ETERM structure.</fsummary>
       <type>
         <v>ETERM *t;</v>
@@ -190,7 +198,7 @@
     </func>
 
     <func>
-      <name><ret>void</ret><nametext>erl_malloc(size)</nametext></name>
+      <name since=""><ret>void</ret><nametext>erl_malloc(size)</nametext></name>
       <fsummary>Allocate some memory.</fsummary>
       <type>
         <v>long size;</v>
diff --git a/lib/erl_interface/doc/src/erl_marshal.xml b/lib/erl_interface/doc/src/erl_marshal.xml
index 2ad658f78b..33d359d871 100644
--- a/lib/erl_interface/doc/src/erl_marshal.xml
+++ b/lib/erl_interface/doc/src/erl_marshal.xml
@@ -35,6 +35,14 @@
   <lib>erl_marshal</lib>
   <libsummary>Encoding and decoding of Erlang terms.</libsummary>
   <description>
+    <note><p>The support for VxWorks is deprecated as of OTP 22, and
+    will be removed in OTP 23.</p></note>
+    <note><p>The old legacy <c>erl_interface</c> library (functions
+    with prefix <c>erl_</c>) is deprecated as of OTP 22, and will be
+    removed in OTP 23. This does not apply to the <c>ei</c>
+    library. Reasonably new <c>gcc</c> compilers will issue deprecation
+    warnings. In order to disable these warnings, define the macro
+    <c>EI_NO_DEPR_WARN</c>.</p></note>
     <p>This module contains functions for encoding Erlang terms into
       a sequence of bytes, and for decoding Erlang terms from a
       sequence of bytes.</p>
@@ -42,7 +50,7 @@
 
   <funcs>
     <func>
-      <name><ret>int</ret><nametext>erl_compare_ext(bufp1, bufp2)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_compare_ext(bufp1, bufp2)</nametext></name>
       <fsummary>Compare encoded byte sequences.</fsummary>
       <type>
         <v>unsigned char *bufp1,*bufp2;</v>
@@ -62,8 +70,8 @@
     </func>
 
     <func>
-      <name><ret>ETERM *</ret><nametext>erl_decode(bufp)</nametext></name>
-      <name><ret>ETERM *</ret><nametext>erl_decode_buf(bufpp)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_decode(bufp)</nametext></name>
+      <name since=""><ret>ETERM *</ret><nametext>erl_decode_buf(bufpp)</nametext></name>
       <fsummary>Convert a term from Erlang external format.</fsummary>
       <type>
         <v>unsigned char *bufp;</v>
@@ -102,8 +110,8 @@
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_encode(term, bufp)</nametext></name>
-      <name><ret>int</ret><nametext>erl_encode_buf(term, bufpp)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_encode(term, bufp)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_encode_buf(term, bufpp)</nametext></name>
       <fsummary>Convert a term into Erlang external format.</fsummary>
       <type>
         <v>ETERM *term;</v>
@@ -179,7 +187,7 @@
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_ext_size(bufp)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_ext_size(bufp)</nametext></name>
       <fsummary>Count elements in encoded term.</fsummary>
       <type>
         <v>unsigned char *bufp;</v>
@@ -190,7 +198,7 @@
     </func>
 
     <func>
-      <name><ret>unsigned char</ret><nametext>erl_ext_type(bufp)</nametext></name>
+      <name since=""><ret>unsigned char</ret><nametext>erl_ext_type(bufp)</nametext></name>
       <fsummary>Determine type of an encoded byte sequence.</fsummary>
       <type>
         <v>unsigned char *bufp;</v>
@@ -228,7 +236,7 @@
     </func>
 
     <func>
-      <name><ret>unsigned char *</ret><nametext>erl_peek_ext(bufp, pos)</nametext></name>
+      <name since=""><ret>unsigned char *</ret><nametext>erl_peek_ext(bufp, pos)</nametext></name>
       <fsummary>Step over encoded term.</fsummary>
       <type>
         <v>unsigned char *bufp;</v>
@@ -252,7 +260,7 @@
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>erl_term_len(t)</nametext></name>
+      <name since=""><ret>int</ret><nametext>erl_term_len(t)</nametext></name>
       <fsummary>Determine encoded size of term.</fsummary>
       <type>
         <v>ETERM *t;</v>
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml
index 07ddd82718..c47f0d2bd1 100644
--- a/lib/erl_interface/doc/src/notes.xml
+++ b/lib/erl_interface/doc/src/notes.xml
@@ -31,6 +31,201 @@
   </header>
   <p>This document describes the changes made to the Erl_interface application.</p>
 
+<section><title>Erl_Interface 3.12</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The vxworks configure has been updated to respect the
+	    environment CFLAGS.</p>
+          <p>
+	    Own Id: OTP-15773</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Minor adjustments made to build system for parallel
+	    configure.</p>
+          <p>
+	    Own Id: OTP-15340 Aux Id: OTP-14625 </p>
+        </item>
+        <item>
+          <p>
+	    The limited support for VxWorks is deprecated as of OTP
+	    22, and will be removed in OTP 23.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15621</p>
+        </item>
+        <item>
+	    <p>The old legacy <c>erl_interface</c> library (functions
+	    with prefix <c>erl_</c>) is deprecated as of OTP 22, and
+	    will be removed in OTP 23. This does not apply to the
+	    <c>ei</c> library. Reasonably new <c>gcc</c> compilers
+	    will issue deprecation warnings. In order to disable
+	    these warnings, define the macro
+	    <c>EI_NO_DEPR_WARN</c>.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15622</p>
+        </item>
+        <item>
+	    <p>Added support to receive, decode, encode and send both
+	    bit strings and export funs (<c>fun M:F/A</c>).</p>
+	    <p>New functions <c>ei_decode_bitstring</c> and
+	    <c>ei_encode_bitstring</c> have been added in order to
+	    decode and encode bit strings where the number of bits is
+	    not necessary divisible by 8 (a whole number of bytes).
+	    The existing functions <c>ei_decode_fun</c> and
+	    <c>ei_encode_fun</c> can now also handle export funs.</p>
+	    <p>Before this change, bit strings and export funs sent
+	    to an erl_interface c-node were encoded using an
+	    undocumented fallback tuple format. For bit strings
+	    <c>{Binary,BitsInLastByte}</c> and for export funs
+	    <c>{M,F}</c>. Existing c-node implementations expecting
+	    these tuples must be changed to instead use
+	    <c>ei_decode_bitstring</c> and <c>ei_decode_fun</c>. As a
+	    temporary solution you can also build erl_interface with
+	    macro <c>EI_COMPAT=21</c> or call
+	    <c>ei_set_compat_rel(21)</c> to receive the old fallback
+	    tuples.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15712 Aux Id: OTP-15774 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Interface 3.11.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    <c>erl_interface</c>/<c>ei</c> refused to use node names
+	    with an alive name (the part of the node name preceding
+	    the @ sign) longer than 63 characters and a host name
+	    longer than 64 characters. The total amount of characters
+	    allowed in a node name (alivename@hostname) was thus
+	    limited to 128 characters. These limits applied both to
+	    the own node name as well as node names of other nodes.
+	    Ordinary Erlang nodes limit the node name length to 256
+	    characters, which meant that you could not communicate
+	    with certain Erlang nodes due to their node name used.</p>
+          <p>
+	    <c>erl_interface</c>/<c>ei</c> now allow the total amount
+	    of characters in a node name to be up to 256 characters.
+	    These characters may be distributed between alive name
+	    and host name in whatever way needed. That is, the
+	    maximum amount of characters in the alive name may be 254
+	    and the maximum amount of characters in the host name may
+	    be 254, but in total the node name must not exceed 256
+	    characters.</p>
+          <p>
+	    Own Id: OTP-15781 Aux Id: ERIERL-356 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Interface 3.11.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    <c>erl_interface</c>/<c>ei</c> refused to use node names
+	    with an alive name (the part of the node name preceding
+	    the @ sign) longer than 63 characters and a host name
+	    longer than 64 characters. The total amount of characters
+	    allowed in a node name (alivename@hostname) was thus
+	    limited to 128 characters. These limits applied both to
+	    the own node name as well as node names of other nodes.
+	    Ordinary Erlang nodes limit the node name length to 256
+	    characters, which meant that you could not communicate
+	    with certain Erlang nodes due to their node name used.</p>
+          <p>
+	    <c>erl_interface</c>/<c>ei</c> now allow the total amount
+	    of characters in a node name to be up to 256 characters.
+	    These characters may be distributed between alive name
+	    and host name in whatever way needed. That is, the
+	    maximum amount of characters in the alive name may be 254
+	    and the maximum amount of characters in the host name may
+	    be 254, but in total the node name must not exceed 256
+	    characters.</p>
+          <p>
+	    Own Id: OTP-15781 Aux Id: ERIERL-356 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Interface 3.11.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix handling of Makefile dependencies so that parallel
+	    make works properly.</p>
+          <p>
+	    Own Id: OTP-15757</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Interface 3.11.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed two bugs in the <c>erl_call</c> program. A missing
+	    initialization (introduced in <c>erl_interface-3.11</c>)
+	    which either caused a crash or failure to connect to or
+	    start a node, and an incorrectly calculated timeout which
+	    could cause failure to start an erlang node. These bugs
+	    only caused failures on some platforms.</p>
+          <p>
+	    Own Id: OTP-15676 Aux Id: OTP-15442, ERL-881 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Interface 3.11</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Support for plugin of a <seealso
+	    marker="ei_connect#ussi">user supplied socket
+	    implementation</seealso> has been added.</p>
+          <p>
+	    Own Id: OTP-15442 Aux Id: ERIERL-258 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erl_Interface 3.10.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -116,6 +311,22 @@
 
 </section>
 
+<section><title>Erl_Interface 3.10.2.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix handling of Makefile dependencies so that parallel
+	    make works properly.</p>
+          <p>
+	    Own Id: OTP-15757</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erl_Interface 3.10.2.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -1566,4 +1777,3 @@
     </section>
   </section>
 </chapter>
-
diff --git a/lib/erl_interface/doc/src/ref_man.xml b/lib/erl_interface/doc/src/ref_man.xml
index 1e20637cb7..a4f947c79f 100644
--- a/lib/erl_interface/doc/src/ref_man.xml
+++ b/lib/erl_interface/doc/src/ref_man.xml
@@ -29,6 +29,14 @@
     <file>ref_man.xml</file>
   </header>
   <description>
+    <note><p>The support for VxWorks is deprecated as of OTP 22, and
+    will be removed in OTP 23.</p></note>
+    <note><p>The old legacy <c>erl_interface</c> library (functions
+    with prefix <c>erl_</c>) is deprecated as of OTP 22, and will be
+    removed in OTP 23. This does not apply to the <c>ei</c>
+    library. Reasonably new <c>gcc</c> compilers will issue deprecation
+    warnings. In order to disable these warnings, define the macro
+    <c>EI_NO_DEPR_WARN</c>.</p></note>
   </description>
   <xi:include href="ei.xml"/>
   <xi:include href="ei_connect.xml"/>
diff --git a/lib/erl_interface/doc/src/ref_man_ei.xml b/lib/erl_interface/doc/src/ref_man_ei.xml
index 92ff9ed328..d8d1deaea1 100644
--- a/lib/erl_interface/doc/src/ref_man_ei.xml
+++ b/lib/erl_interface/doc/src/ref_man_ei.xml
@@ -30,8 +30,14 @@
     <file>ref_man_ei.xml</file>
   </header>
   <description>
-    <p>The <c>ei</c> library is a <c>C</c> interface library for
-      communication with <c>Erlang</c>.</p>
+    <note><p>The support for VxWorks is deprecated as of OTP 22, and
+    will be removed in OTP 23.</p></note>
+    <note><p>The old legacy <c>erl_interface</c> library (functions
+    with prefix <c>erl_</c>) is deprecated as of OTP 22, and will be
+    removed in OTP 23. This does not apply to the <c>ei</c>
+    library. Reasonably new <c>gcc</c> compilers will issue deprecation
+    warnings. In order to disable these warnings, define the macro
+    <c>EI_NO_DEPR_WARN</c>.</p></note>
     <note>
       <p>By default, the <c>ei</c> library is only guaranteed
         to be compatible with other Erlang/OTP components from the same
diff --git a/lib/erl_interface/doc/src/ref_man_erl_interface.xml b/lib/erl_interface/doc/src/ref_man_erl_interface.xml
index 4b1d0e9981..2b69d0fa74 100644
--- a/lib/erl_interface/doc/src/ref_man_erl_interface.xml
+++ b/lib/erl_interface/doc/src/ref_man_erl_interface.xml
@@ -30,6 +30,14 @@
     <file>ref_man_erl_interface.xml</file>
   </header>
   <description>
+    <note><p>The support for VxWorks is deprecated as of OTP 22, and
+    will be removed in OTP 23.</p></note>
+    <note><p>The old legacy <c>erl_interface</c> library (functions
+    with prefix <c>erl_</c>) is deprecated as of OTP 22, and will be
+    removed in OTP 23. This does not apply to the <c>ei</c>
+    library. Reasonably new <c>gcc</c> compilers will issue deprecation
+    warnings. In order to disable these warnings, define the macro
+    <c>EI_NO_DEPR_WARN</c>.</p></note>    
     <p>The <c>erl_interface</c> library is a <c>C</c> interface library
       for communication with <c>Erlang</c>.</p>
     <note>
diff --git a/lib/erl_interface/doc/src/registry.xml b/lib/erl_interface/doc/src/registry.xml
index 6d70fb3475..1c90c5c9dd 100644
--- a/lib/erl_interface/doc/src/registry.xml
+++ b/lib/erl_interface/doc/src/registry.xml
@@ -44,7 +44,7 @@
 
   <funcs>
     <func>
-      <name><ret>int</ret><nametext>ei_reg_close(reg)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_reg_close(reg)</nametext></name>
       <fsummary>Close a registry.</fsummary>
       <type>
         <v>ei_reg *reg;</v>
@@ -59,7 +59,7 @@
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_reg_delete(reg,key)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_reg_delete(reg,key)</nametext></name>
       <fsummary>Delete an object from the registry.</fsummary>
       <type>
         <v>ei_reg *reg;</v>
@@ -85,7 +85,7 @@
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_reg_dump(fd,reg,mntab,flags)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_reg_dump(fd,reg,mntab,flags)</nametext></name>
       <fsummary>Back up a registry to Mnesia.</fsummary>
       <type>
         <v>int fd;</v>
@@ -125,7 +125,7 @@
     </func>
 
     <func>
-      <name><ret>double</ret><nametext>ei_reg_getfval(reg,key)</nametext></name>
+      <name since=""><ret>double</ret><nametext>ei_reg_getfval(reg,key)</nametext></name>
       <fsummary>Get a floating point object.</fsummary>
       <type>
         <v>ei_reg *reg;</v>
@@ -151,7 +151,7 @@
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_reg_getival(reg,key)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_reg_getival(reg,key)</nametext></name>
       <fsummary>Get an integer object.</fsummary>
       <type>
         <v>ei_reg *reg;</v>
@@ -177,7 +177,7 @@
     </func>
 
     <func>
-      <name><ret>const void *</ret><nametext>ei_reg_getpval(reg,key,size)</nametext></name>
+      <name since=""><ret>const void *</ret><nametext>ei_reg_getpval(reg,key,size)</nametext></name>
       <fsummary>Get a binary object.</fsummary>
       <type>
         <v>ei_reg *reg;</v>
@@ -207,7 +207,7 @@
     </func>
 
     <func>
-      <name><ret>const char *</ret><nametext>ei_reg_getsval(reg,key)</nametext></name>
+      <name since=""><ret>const char *</ret><nametext>ei_reg_getsval(reg,key)</nametext></name>
       <fsummary>Get a string object.</fsummary>
       <type>
         <v>ei_reg *reg;</v>
@@ -232,7 +232,7 @@
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_reg_getval(reg,key,flags,v,...)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_reg_getval(reg,key,flags,v,...)</nametext></name>
       <fsummary>Get any object.</fsummary>
       <type>
         <v>ei_reg *reg;</v>
@@ -278,7 +278,7 @@
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_reg_markdirty(reg,key)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_reg_markdirty(reg,key)</nametext></name>
       <fsummary>Mark an object as dirty.</fsummary>
       <type>
         <v>ei_reg *reg;</v>
@@ -305,7 +305,7 @@
     </func>
 
     <func>
-      <name><ret>ei_reg *</ret><nametext>ei_reg_open(size)</nametext></name>
+      <name since=""><ret>ei_reg *</ret><nametext>ei_reg_open(size)</nametext></name>
       <fsummary>Create and open a registry.</fsummary>
       <type>
         <v>int size;</v>
@@ -326,7 +326,7 @@
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_reg_purge(reg)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_reg_purge(reg)</nametext></name>
       <fsummary>Remove deleted objects.</fsummary>
       <type>
         <v>ei_reg *reg;</v>
@@ -346,7 +346,7 @@
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_reg_resize(reg,newsize)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_reg_resize(reg,newsize)</nametext></name>
       <fsummary>Resize a registry.</fsummary>
       <type>
         <v>ei_reg *reg;</v>
@@ -363,7 +363,7 @@
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_reg_restore(fd,reg,mntab)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_reg_restore(fd,reg,mntab)</nametext></name>
       <fsummary>Restore a registry from Mnesia.</fsummary>
       <type>
         <v>int fd;</v>
@@ -399,7 +399,7 @@
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_reg_setfval(reg,key,f)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_reg_setfval(reg,key,f)</nametext></name>
       <fsummary>Assign a floating point object.</fsummary>
       <type>
         <v>ei_reg *reg;</v>
@@ -424,7 +424,7 @@
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_reg_setival(reg,key,i)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_reg_setival(reg,key,i)</nametext></name>
       <fsummary>Assign an integer object.</fsummary>
       <type>
         <v>ei_reg *reg;</v>
@@ -448,7 +448,7 @@
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_reg_setpval(reg,key,p,size)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_reg_setpval(reg,key,p,size)</nametext></name>
       <fsummary>Assign a binary object.</fsummary>
       <type>
         <v>ei_reg *reg;</v>
@@ -479,7 +479,7 @@
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_reg_setsval(reg,key,s)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_reg_setsval(reg,key,s)</nametext></name>
       <fsummary>Assign a string object.</fsummary>
       <type>
         <v>ei_reg *reg;</v>
@@ -507,7 +507,7 @@
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_reg_setval(reg,key,flags,v,...)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_reg_setval(reg,key,flags,v,...)</nametext></name>
       <fsummary>Assign a value to any object type.</fsummary>
       <type>
         <v>ei_reg *reg;</v>
@@ -552,7 +552,7 @@
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_reg_stat(reg,key,obuf)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_reg_stat(reg,key,obuf)</nametext></name>
       <fsummary>Get object information.</fsummary>
       <type>
         <v>ei_reg *reg;</v>
@@ -590,7 +590,7 @@ struct ei_reg_stat {
     </func>
 
     <func>
-      <name><ret>int</ret><nametext>ei_reg_tabstat(reg,obuf)</nametext></name>
+      <name since=""><ret>int</ret><nametext>ei_reg_tabstat(reg,obuf)</nametext></name>
       <fsummary>Get registry information.</fsummary>
       <type>
         <v>ei_reg *reg;</v>
diff --git a/lib/erl_interface/include/ei.h b/lib/erl_interface/include/ei.h
index 948f89be85..b138118f04 100644
--- a/lib/erl_interface/include/ei.h
+++ b/lib/erl_interface/include/ei.h
@@ -35,6 +35,9 @@
 #include <winsock2.h>
 #include <windows.h>
 #include <winbase.h>
+typedef LONG_PTR ssize_t; /* Sigh... */
+#else
+#include <sys/types.h>          /* ssize_t */
 #endif
 
 #include <stdio.h>		/* Need type FILE */
@@ -44,6 +47,25 @@
 # include <netdb.h>
 #endif
 
+#ifdef __has_attribute
+#if __has_attribute(deprecated)
+#define EI_HAVE_DEPRECATED_ATTR__ 1
+#else
+#undef EI_HAVE_DEPRECATED_ATTR__
+#endif
+#endif
+
+#ifdef EI_NO_DEPR_WARN
+#undef EI_HAVE_DEPRECATED_ATTR__
+#endif
+
+#ifdef EI_HAVE_DEPRECATED_ATTR__
+#define EI_DEPRECATED_ATTR_NAME deprecated
+#define EI_DEPRECATED_ATTR __attribute__((EI_DEPRECATED_ATTR_NAME))
+#else
+#define EI_DEPRECATED_ATTR_NAME
+#define EI_DEPRECATED_ATTR
+#endif
 
 /* -------------------------------------------------------------------- */
 /*                      Defines part of API                             */
@@ -132,11 +154,14 @@
 #define ERL_STRING_EXT        'k'
 #define ERL_LIST_EXT          'l'
 #define ERL_BINARY_EXT        'm'
+#define ERL_BIT_BINARY_EXT    'M'
 #define ERL_SMALL_BIG_EXT     'n'
 #define ERL_LARGE_BIG_EXT     'o'
 #define ERL_NEW_FUN_EXT	      'p'
 #define ERL_MAP_EXT           't'
 #define ERL_FUN_EXT	      'u'
+#define ERL_EXPORT_EXT        'q'
+
  
 #define ERL_NEW_CACHE         'N' /* c nodes don't know these two */
 #define ERL_CACHED_ATOM       'C'
@@ -188,12 +213,12 @@ extern volatile int __erl_errno;
  * library and when using the library we set a value that we use
  */
 
-#define EI_MAXHOSTNAMELEN 64
-#define EI_MAXALIVELEN 63
 #define EI_MAX_COOKIE_SIZE 512
 #define MAXATOMLEN (255 + 1)
 #define MAXATOMLEN_UTF8 (255*4 + 1)
-#define MAXNODELEN EI_MAXALIVELEN+1+EI_MAXHOSTNAMELEN
+#define EI_MAXHOSTNAMELEN (MAXATOMLEN - 2)
+#define EI_MAXALIVELEN (MAXATOMLEN - 2)
+#define MAXNODELEN MAXATOMLEN
 
 typedef enum { 
     ERLANG_ASCII = 1,
@@ -247,15 +272,23 @@ typedef struct {
 typedef struct {
     long arity;
     char module[MAXATOMLEN_UTF8];
-    erlang_char_encoding module_org_enc;
-    char md5[16];
-    long index;
-    long old_index;
-    long uniq;
-    long n_free_vars;
-    erlang_pid pid;
-    long free_var_len;
-    char* free_vars;
+    enum { EI_FUN_CLOSURE, EI_FUN_EXPORT } type;
+    union {
+        struct {
+            char md5[16];
+            long index;
+            long old_index;
+            long uniq;
+            long n_free_vars;
+            erlang_pid pid;
+            long free_var_len;
+            char* free_vars;
+        } closure;
+        struct {
+            char* func;
+            int func_allocated;
+        } exprt;
+    } u;
 } erlang_fun;
 
 /* a big */
@@ -286,6 +319,31 @@ typedef struct {
   char nodename[MAXNODELEN+1];
 } ErlConnect;
 
+#define EI_SCLBK_INF_TMO (~((unsigned) 0))
+
+#define EI_SCLBK_FLG_FULL_IMPL (1 << 0)
+
+typedef struct {
+    int flags;
+
+    int (*socket)(void **ctx, void *setup_ctx);
+    int	(*close)(void *ctx);
+    int (*listen)(void *ctx, void *addr, int *len, int backlog);
+    int (*accept)(void **ctx, void *addr, int *len, unsigned tmo);
+    int (*connect)(void *ctx, void *addr, int len, unsigned tmo);
+    int (*writev)(void *ctx, const void *iov, int iovcnt, ssize_t *len, unsigned tmo);
+    int (*write)(void *ctx, const char *buf, ssize_t *len, unsigned tmo);
+    int (*read)(void *ctx, char *buf, ssize_t *len, unsigned tmo);
+
+    int (*handshake_packet_header_size)(void *ctx, int *sz);
+    int (*connect_handshake_complete)(void *ctx);
+    int (*accept_handshake_complete)(void *ctx);
+    int (*get_fd)(void *ctx, int *fd);
+
+    /* end of version 1 */
+    
+} ei_socket_callbacks;
+
 typedef struct ei_cnode_s {
     char thishostname[EI_MAXHOSTNAMELEN+1];
     char thisnodename[MAXNODELEN+1];
@@ -295,6 +353,8 @@ typedef struct ei_cnode_s {
     char ei_connect_cookie[EI_MAX_COOKIE_SIZE+1];
     short creation;
     erlang_pid self;
+    ei_socket_callbacks *cbs;
+    void *setup_context;
 } ei_cnode;
 
 typedef struct in_addr *Erl_IpAddr; 
@@ -308,7 +368,6 @@ typedef struct ei_x_buff_TAG {
     int index;
 } ei_x_buff;
 
-
 /* -------------------------------------------------------------------- */
 /*    Function definitions (listed in same order as documentation)      */
 /* -------------------------------------------------------------------- */
@@ -322,6 +381,16 @@ int ei_connect_xinit (ei_cnode* ec, const char *thishostname,
 		      Erl_IpAddr thisipaddr, const char *cookie,
 		      const short creation);
 
+int ei_connect_init_ussi(ei_cnode* ec, const char* this_node_name,
+                         const char *cookie, short creation,
+                         ei_socket_callbacks *cbs, int cbs_sz,
+                         void *setup_context);
+int ei_connect_xinit_ussi(ei_cnode* ec, const char *thishostname,
+                          const char *thisalivename, const char *thisnodename,
+                          Erl_IpAddr thisipaddr, const char *cookie,
+                          const short creation, ei_socket_callbacks *cbs,
+                          int cbs_sz, void *setup_context);
+
 int ei_connect(ei_cnode* ec, char *nodename);
 int ei_connect_tmo(ei_cnode* ec, char *nodename, unsigned ms);
 int ei_xconnect(ei_cnode* ec, Erl_IpAddr adr, char *alivename);
@@ -348,11 +417,15 @@ int ei_rpc_from(ei_cnode* ec, int fd, int timeout, erlang_msg* msg,
 
 int ei_publish(ei_cnode* ec, int port);
 int ei_publish_tmo(ei_cnode* ec, int port, unsigned ms);
+int ei_listen(ei_cnode *ec, int *port, int backlog);
+int ei_xlisten(ei_cnode *ec, Erl_IpAddr adr, int *port, int backlog);    
 int ei_accept(ei_cnode* ec, int lfd, ErlConnect *conp);
 int ei_accept_tmo(ei_cnode* ec, int lfd, ErlConnect *conp, unsigned ms);
 int ei_unpublish(ei_cnode* ec);
 int ei_unpublish_tmo(const char *alive, unsigned ms);
 
+int ei_close_connection(int fd);
+
 const char *ei_thisnodename(const ei_cnode* ec);
 const char *ei_thishostname(const ei_cnode* ec);
 const char *ei_thisalivename(const ei_cnode* ec);
@@ -453,7 +526,9 @@ int ei_x_encode_atom_len(ei_x_buff* x, const char* s, int len);
 int ei_x_encode_atom_len_as(ei_x_buff* x, const char* s, int len,
 			  erlang_char_encoding from, erlang_char_encoding to);
 int ei_encode_binary(char *buf, int *index, const void *p, long len);
+int ei_encode_bitstring(char *buf, int *index, const char *p, size_t bitoffs, size_t bits);
 int ei_x_encode_binary(ei_x_buff* x, const void* s, int len);
+int ei_x_encode_bitstring(ei_x_buff* x, const char* p, size_t bitoffs, size_t bits);
 int ei_encode_pid(char *buf, int *index, const erlang_pid *p);
 int ei_x_encode_pid(ei_x_buff* x, const erlang_pid* pid);
 int ei_encode_fun(char* buf, int* index, const erlang_fun* p);
@@ -462,8 +537,8 @@ int ei_encode_port(char *buf, int *index, const erlang_port *p);
 int ei_x_encode_port(ei_x_buff* x, const erlang_port *p);
 int ei_encode_ref(char *buf, int *index, const erlang_ref *p);
 int ei_x_encode_ref(ei_x_buff* x, const erlang_ref *p);
-int ei_encode_term(char *buf, int *index, void *t); /* ETERM* actually */
-int ei_x_encode_term(ei_x_buff* x, void* t);
+int ei_encode_term(char *buf, int *index, void *t) EI_DEPRECATED_ATTR;
+int ei_x_encode_term(ei_x_buff* x, void* t) EI_DEPRECATED_ATTR;
 int ei_encode_trace(char *buf, int *index, const erlang_trace *p);
 int ei_x_encode_trace(ei_x_buff* x, const erlang_trace *p);
 int ei_encode_tuple_header(char *buf, int *index, int arity);
@@ -485,8 +560,6 @@ int ei_x_encode_map_header(ei_x_buff* x, long n);
  */
 
 int ei_get_type(const char *buf, const int *index, int *type, int *size);
-int ei_get_type_internal(const char *buf, const int *index, int *type,
-			 int *size);
 
 /* Step through buffer, decoding the given type into the buffer
  * provided. On success, 0 is returned and index is updated to point
@@ -505,12 +578,15 @@ int ei_decode_string(const char *buf, int *index, char *p);
 int ei_decode_atom(const char *buf, int *index, char *p);
 int ei_decode_atom_as(const char *buf, int *index, char *p, int destlen, erlang_char_encoding want, erlang_char_encoding* was, erlang_char_encoding* result);
 int ei_decode_binary(const char *buf, int *index, void *p, long *len);
+int ei_decode_bitstring(const char *buf, int *index, const char** pp,
+                        unsigned int* bitoffsp, size_t *nbitsp);
+
 int ei_decode_fun(const char* buf, int* index, erlang_fun* p);
 void free_fun(erlang_fun* f);
 int ei_decode_pid(const char *buf, int *index, erlang_pid *p);
 int ei_decode_port(const char *buf, int *index, erlang_port *p);
 int ei_decode_ref(const char *buf, int *index, erlang_ref *p);
-int ei_decode_term(const char *buf, int *index, void *t); /* ETERM** actually */
+int ei_decode_term(const char *buf, int *index, void *t) EI_DEPRECATED_ATTR;
 int ei_decode_trace(const char *buf, int *index, erlang_trace *p);
 int ei_decode_tuple_header(const char *buf, int *index, int *arity);
 int ei_decode_list_header(const char *buf, int *index, int *arity);
@@ -626,6 +702,8 @@ struct ei_reg_tabstat {
 };
 
 
+int ei_init(void);
+
 /* -------------------------------------------------------------------- */
 /*                               XXXXXXXXXXX                            */
 /* -------------------------------------------------------------------- */
diff --git a/lib/erl_interface/include/erl_interface.h b/lib/erl_interface/include/erl_interface.h
index c22f21af2b..7c87223a38 100644
--- a/lib/erl_interface/include/erl_interface.h
+++ b/lib/erl_interface/include/erl_interface.h
@@ -25,8 +25,6 @@
 /*      Note: the 'ei' interface is the prefered C API.                 */
 /************************************************************************/
 
-/* FIXME only include if needed? */
- 
 #include "ei.h"			/* ei is the base */
 
 /* -------------------------------------------------------------------- */
@@ -195,11 +193,11 @@ typedef struct {
   int lenL;
 } Erl_Atom_data;
 
-char* erl_atom_ptr_latin1(Erl_Atom_data*);
-char* erl_atom_ptr_utf8(Erl_Atom_data*);
-int erl_atom_size_latin1(Erl_Atom_data*);
-int erl_atom_size_utf8(Erl_Atom_data*);
-char* erl_atom_init_latin1(Erl_Atom_data*, const char*);
+char* erl_atom_ptr_latin1(Erl_Atom_data*) EI_DEPRECATED_ATTR;
+char* erl_atom_ptr_utf8(Erl_Atom_data*) EI_DEPRECATED_ATTR;
+int erl_atom_size_latin1(Erl_Atom_data*) EI_DEPRECATED_ATTR;
+int erl_atom_size_utf8(Erl_Atom_data*) EI_DEPRECATED_ATTR;
+char* erl_atom_init_latin1(Erl_Atom_data*, const char*) EI_DEPRECATED_ATTR;
 
 typedef struct {
   Erl_Header h;
@@ -324,110 +322,117 @@ typedef unsigned char Erl_Heap;
 /*                          The functions                               */
 /* -------------------------------------------------------------------- */
 
-void   erl_init(void *x, long y);
-void   erl_set_compat_rel(unsigned);
-int    erl_connect_init(int, char*,short);
-int    erl_connect_xinit(char*,char*,char*,struct in_addr*,char*,short);
-int    erl_connect(char*); 
-int    erl_xconnect(struct in_addr*,char *);
-int    erl_close_connection(int);
-int    erl_receive(int, unsigned char*, int);
-int    erl_receive_msg(int, unsigned char*, int, ErlMessage*);
-int    erl_xreceive_msg(int, unsigned char**, int*, ErlMessage*);
-int    erl_send(int, ETERM*, ETERM*);
-int    erl_reg_send(int, char*, ETERM*);
-ETERM *erl_rpc(int,char*,char*,ETERM*);
-int    erl_rpc_to(int,char*,char*,ETERM*);
-int    erl_rpc_from(int,int,ErlMessage*);
+void   erl_init(void *x, long y) EI_DEPRECATED_ATTR;
+void   erl_set_compat_rel(unsigned) EI_DEPRECATED_ATTR;
+int    erl_connect_init(int, char*,short) EI_DEPRECATED_ATTR;
+int    erl_connect_xinit(char*,char*,char*,struct in_addr*,char*,short) EI_DEPRECATED_ATTR;
+int    erl_connect(char*) EI_DEPRECATED_ATTR; 
+int    erl_xconnect(struct in_addr*,char *) EI_DEPRECATED_ATTR;
+int    erl_close_connection(int) EI_DEPRECATED_ATTR;
+int    erl_receive(int, unsigned char*, int) EI_DEPRECATED_ATTR;
+int    erl_receive_msg(int, unsigned char*, int, ErlMessage*) EI_DEPRECATED_ATTR;
+int    erl_xreceive_msg(int, unsigned char**, int*, ErlMessage*) EI_DEPRECATED_ATTR;
+int    erl_send(int, ETERM*, ETERM*) EI_DEPRECATED_ATTR;
+int    erl_reg_send(int, char*, ETERM*) EI_DEPRECATED_ATTR;
+ETERM *erl_rpc(int,char*,char*,ETERM*) EI_DEPRECATED_ATTR;
+int    erl_rpc_to(int,char*,char*,ETERM*) EI_DEPRECATED_ATTR;
+int    erl_rpc_from(int,int,ErlMessage*) EI_DEPRECATED_ATTR;
 
 /* erl_publish returns open descriptor on success, or -1 */
-int    erl_publish(int port);
-int    erl_accept(int,ErlConnect*);
+int    erl_publish(int port) EI_DEPRECATED_ATTR;
+int    erl_accept(int,ErlConnect*) EI_DEPRECATED_ATTR;
 
-const char *erl_thiscookie(void);
-const char *erl_thisnodename(void);
-const char *erl_thishostname(void);
-const char *erl_thisalivename(void);
-short       erl_thiscreation(void);
+const char *erl_thiscookie(void) EI_DEPRECATED_ATTR;
+const char *erl_thisnodename(void) EI_DEPRECATED_ATTR;
+const char *erl_thishostname(void) EI_DEPRECATED_ATTR;
+const char *erl_thisalivename(void) EI_DEPRECATED_ATTR;
+short       erl_thiscreation(void) EI_DEPRECATED_ATTR;
 
 /* returns 0 on success, -1 if node not known to epmd or epmd not reached */
-int    erl_unpublish(const char *alive);
+int    erl_unpublish(const char *alive) EI_DEPRECATED_ATTR;
+
+#ifdef EI_HAVE_DEPRECATED_ATTR__
+#define EI_DEPR_ATTR_EXTRA , EI_DEPRECATED_ATTR_NAME
+#else
+#define EI_DEPR_ATTR_EXTRA
+#endif
+
 
 /* Report generic error to stderr. */
 void   erl_err_msg(const char * __template, ...)
-       __attribute__ ((__format__ (printf, 1, 2)));
+       __attribute__ ((__format__ (printf, 1, 2) EI_DEPR_ATTR_EXTRA)) ;
 /* Report generic error to stderr and die. */
 void   erl_err_quit(const char * __template, ...)
-       __attribute__ ((__format__ (printf, 1, 2), __noreturn__));
+       __attribute__ ((__format__ (printf, 1, 2), __noreturn__ EI_DEPR_ATTR_EXTRA));
 /* Report system/libc error to stderr. */
 void   erl_err_ret(const char * __template, ...)
-       __attribute__ ((__format__ (printf, 1, 2)));
+       __attribute__ ((__format__ (printf, 1, 2) EI_DEPR_ATTR_EXTRA));
 /* Report system/libc error to stderr and die. */
 void   erl_err_sys(const char * __template, ...)
-       __attribute__ ((__format__ (printf, 1, 2), __noreturn__));
-
-ETERM *erl_cons(ETERM*,ETERM*);
-ETERM *erl_copy_term(const ETERM*);
-ETERM *erl_element(int,const ETERM*);
-
-ETERM *erl_hd(const ETERM*);
-ETERM* erl_iolist_to_binary(const ETERM* term);
-char*  erl_iolist_to_string(const ETERM* term);
-int    erl_iolist_length(const ETERM*);
-int    erl_length(const ETERM*);
-ETERM *erl_mk_atom(const char*);
-ETERM *erl_mk_binary(const char*,int);
-ETERM *erl_mk_empty_list(void);
-ETERM *erl_mk_estring(const char*, int);
-ETERM *erl_mk_float(double);
-ETERM *erl_mk_int(int);
-ETERM *erl_mk_longlong(long long);
-ETERM *erl_mk_list(ETERM**,int);
-ETERM *erl_mk_pid(const char*,unsigned int,unsigned int,unsigned char);
-ETERM *erl_mk_port(const char*,unsigned int,unsigned char);
-ETERM *erl_mk_ref(const char*,unsigned int,unsigned char);
+       __attribute__ ((__format__ (printf, 1, 2), __noreturn__ EI_DEPR_ATTR_EXTRA));
+
+ETERM *erl_cons(ETERM*,ETERM*) EI_DEPRECATED_ATTR;
+ETERM *erl_copy_term(const ETERM*) EI_DEPRECATED_ATTR;
+ETERM *erl_element(int,const ETERM*) EI_DEPRECATED_ATTR;
+
+ETERM *erl_hd(const ETERM*) EI_DEPRECATED_ATTR;
+ETERM* erl_iolist_to_binary(const ETERM* term) EI_DEPRECATED_ATTR;
+char*  erl_iolist_to_string(const ETERM* term) EI_DEPRECATED_ATTR;
+int    erl_iolist_length(const ETERM*) EI_DEPRECATED_ATTR;
+int    erl_length(const ETERM*) EI_DEPRECATED_ATTR;
+ETERM *erl_mk_atom(const char*) EI_DEPRECATED_ATTR;
+ETERM *erl_mk_binary(const char*,int) EI_DEPRECATED_ATTR;
+ETERM *erl_mk_empty_list(void) EI_DEPRECATED_ATTR;
+ETERM *erl_mk_estring(const char*, int) EI_DEPRECATED_ATTR;
+ETERM *erl_mk_float(double) EI_DEPRECATED_ATTR;
+ETERM *erl_mk_int(int) EI_DEPRECATED_ATTR;
+ETERM *erl_mk_longlong(long long) EI_DEPRECATED_ATTR;
+ETERM *erl_mk_list(ETERM**,int) EI_DEPRECATED_ATTR;
+ETERM *erl_mk_pid(const char*,unsigned int,unsigned int,unsigned char) EI_DEPRECATED_ATTR;
+ETERM *erl_mk_port(const char*,unsigned int,unsigned char) EI_DEPRECATED_ATTR;
+ETERM *erl_mk_ref(const char*,unsigned int,unsigned char) EI_DEPRECATED_ATTR;
 ETERM *erl_mk_long_ref(const char*,unsigned int,unsigned int,
-		       unsigned int,unsigned char);
-ETERM *erl_mk_string(const char*);
-ETERM *erl_mk_tuple(ETERM**,int);
-ETERM *erl_mk_uint(unsigned int);
-ETERM *erl_mk_ulonglong(unsigned long long);
-ETERM *erl_mk_var(const char*);
-int    erl_print_term(FILE*,const ETERM*);
-/* int    erl_sprint_term(char*,const ETERM*); */
-int    erl_size(const ETERM*);
-ETERM *erl_tl(const ETERM*);
-ETERM *erl_var_content(const ETERM*, const char*);
-
-ETERM *erl_format(char*, ... );
-int    erl_match(ETERM*, ETERM*);
-
-char **erl_global_names(int fd, int *count);
-int    erl_global_register(int fd, const char *name, ETERM *pid);
-int    erl_global_unregister(int fd, const char *name);
-ETERM *erl_global_whereis(int fd, const char *name, char *node);
-
-void   erl_init_malloc(Erl_Heap*,long);
-ETERM *erl_alloc_eterm(unsigned char);
-void   erl_eterm_release(void);
-void   erl_eterm_statistics(unsigned long*,unsigned long*);
-void   erl_free_array(ETERM**,int);
-void   erl_free_term(ETERM*);
-void   erl_free_compound(ETERM*);
-void  *erl_malloc(long);
-void   erl_free(void*);
-
-int    erl_compare_ext(unsigned char*, unsigned char*);
-ETERM *erl_decode(unsigned char*);
-ETERM *erl_decode_buf(unsigned char**);
-int    erl_encode(ETERM*,unsigned char*t);
-int    erl_encode_buf(ETERM*,unsigned char**);
-int    erl_ext_size(unsigned char*);
-unsigned char erl_ext_type(unsigned char*); /* Note: returned 'char' before R9C */
-unsigned char *erl_peek_ext(unsigned char*,int);
-int    erl_term_len(ETERM*);
-
-int cmp_latin1_vs_utf8(const char* sL, int lenL, const char* sU, int lenU);
+		       unsigned int,unsigned char) EI_DEPRECATED_ATTR;
+ETERM *erl_mk_string(const char*) EI_DEPRECATED_ATTR;
+ETERM *erl_mk_tuple(ETERM**,int) EI_DEPRECATED_ATTR;
+ETERM *erl_mk_uint(unsigned int) EI_DEPRECATED_ATTR;
+ETERM *erl_mk_ulonglong(unsigned long long) EI_DEPRECATED_ATTR;
+ETERM *erl_mk_var(const char*) EI_DEPRECATED_ATTR;
+int    erl_print_term(FILE*,const ETERM*) EI_DEPRECATED_ATTR;
+/* int    erl_sprint_term(char*,const ETERM*) EI_DEPRECATED_ATTR; */
+int    erl_size(const ETERM*) EI_DEPRECATED_ATTR;
+ETERM *erl_tl(const ETERM*) EI_DEPRECATED_ATTR;
+ETERM *erl_var_content(const ETERM*, const char*) EI_DEPRECATED_ATTR;
+
+ETERM *erl_format(char*, ... ) EI_DEPRECATED_ATTR;
+int    erl_match(ETERM*, ETERM*) EI_DEPRECATED_ATTR;
+
+char **erl_global_names(int fd, int *count) EI_DEPRECATED_ATTR;
+int    erl_global_register(int fd, const char *name, ETERM *pid) EI_DEPRECATED_ATTR;
+int    erl_global_unregister(int fd, const char *name) EI_DEPRECATED_ATTR;
+ETERM *erl_global_whereis(int fd, const char *name, char *node) EI_DEPRECATED_ATTR;
+
+void   erl_init_malloc(Erl_Heap*,long) EI_DEPRECATED_ATTR;
+ETERM *erl_alloc_eterm(unsigned char) EI_DEPRECATED_ATTR;
+void   erl_eterm_release(void) EI_DEPRECATED_ATTR;
+void   erl_eterm_statistics(unsigned long*,unsigned long*) EI_DEPRECATED_ATTR;
+void   erl_free_array(ETERM**,int) EI_DEPRECATED_ATTR;
+void   erl_free_term(ETERM*) EI_DEPRECATED_ATTR;
+void   erl_free_compound(ETERM*) EI_DEPRECATED_ATTR;
+void  *erl_malloc(long) EI_DEPRECATED_ATTR;
+void   erl_free(void*) EI_DEPRECATED_ATTR;
+
+int    erl_compare_ext(unsigned char*, unsigned char*) EI_DEPRECATED_ATTR;
+ETERM *erl_decode(unsigned char*) EI_DEPRECATED_ATTR;
+ETERM *erl_decode_buf(unsigned char**) EI_DEPRECATED_ATTR;
+int    erl_encode(ETERM*,unsigned char*t) EI_DEPRECATED_ATTR;
+int    erl_encode_buf(ETERM*,unsigned char**) EI_DEPRECATED_ATTR;
+int    erl_ext_size(unsigned char*) EI_DEPRECATED_ATTR;
+unsigned char erl_ext_type(unsigned char*) EI_DEPRECATED_ATTR; /* Note: returned 'char' before R9C */
+unsigned char *erl_peek_ext(unsigned char*,int) EI_DEPRECATED_ATTR;
+int    erl_term_len(ETERM*) EI_DEPRECATED_ATTR;
+
+int cmp_latin1_vs_utf8(const char* sL, int lenL, const char* sU, int lenU) EI_DEPRECATED_ATTR;
 
 /* -------------------------------------------------------------------- */
 /*                      Wrappers around ei functions                    */
@@ -437,29 +442,29 @@ int cmp_latin1_vs_utf8(const char* sL, int lenL, const char* sU, int lenU);
  * Undocumented before R9C, included for compatibility with old code
  */
 
-struct hostent *erl_gethostbyname(const char *name);
-struct hostent *erl_gethostbyaddr(const char *addr, int len, int type);
+struct hostent *erl_gethostbyname(const char *name) EI_DEPRECATED_ATTR;
+struct hostent *erl_gethostbyaddr(const char *addr, int len, int type) EI_DEPRECATED_ATTR;
 struct hostent *erl_gethostbyname_r(const char *name, 
 				    struct hostent *hostp, 
 				    char *buffer, 
 				    int buflen, 
-				    int *h_errnop);
+				    int *h_errnop) EI_DEPRECATED_ATTR;
 struct hostent *erl_gethostbyaddr_r(const char *addr,
 				    int length, 
 				    int type, 
 				    struct hostent *hostp,
 				    char *buffer,  
 				    int buflen, 
-				    int *h_errnop);
+				    int *h_errnop) EI_DEPRECATED_ATTR;
 
 /* 
  * Undocumented, included for compatibility with old code
  */
 
-void erl_init_resolve(void);
-int erl_distversion(int fd);
-int erl_epmd_connect(struct in_addr *inaddr);
-int erl_epmd_port(struct in_addr *inaddr, const char *alive, int *dist);
+void erl_init_resolve(void) EI_DEPRECATED_ATTR;
+int erl_distversion(int fd) EI_DEPRECATED_ATTR;
+int erl_epmd_connect(struct in_addr *inaddr) EI_DEPRECATED_ATTR;
+int erl_epmd_port(struct in_addr *inaddr, const char *alive, int *dist) EI_DEPRECATED_ATTR;
 
 #ifdef __cplusplus
 }
diff --git a/lib/erl_interface/src/INSTALL b/lib/erl_interface/src/INSTALL
index b42a17ac46..bf3ca8b6a5 100644
--- a/lib/erl_interface/src/INSTALL
+++ b/lib/erl_interface/src/INSTALL
@@ -122,10 +122,10 @@ you can use the `configure' options `--x-includes=DIR' and
 Specifying the System Type
 ==========================
 
-   There may be some features `configure' can not figure out
+   There may be some features `configure' cannot figure out
 automatically, but needs to determine by the type of host the package
 will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
+a message saying it cannot guess the host type, give it the
 `--host=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name with three fields:
      CPU-COMPANY-SYSTEM
diff --git a/lib/erl_interface/src/Makefile b/lib/erl_interface/src/Makefile
index 800557fbfe..00c49f1622 100644
--- a/lib/erl_interface/src/Makefile
+++ b/lib/erl_interface/src/Makefile
@@ -27,7 +27,9 @@ include $(ERL_TOP)/make/output.mk
 include $(ERL_TOP)/make/target.mk
 
 debug opt shared purify quantify purecov gcov:
+ifndef TERTIARY_BOOTSTRAP
 	$(make_verbose)$(MAKE) -f $(TARGET)/Makefile TYPE=$@
+endif
 
 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 614e7325a9..6e0d3476c7 100644
--- a/lib/erl_interface/src/Makefile.in
+++ b/lib/erl_interface/src/Makefile.in
@@ -31,12 +31,13 @@
 
 .PHONY : debug opt release clean distclean depend
 
-TARGET = @TARGET@
+include $(ERL_TOP)/make/target.mk
 
 # ----------------------------------------------------
 # Application version and release dir specification
 # ----------------------------------------------------
 include ../vsn.mk
+include $(ERL_TOP)/make/target.mk
 include $(TARGET)/eidefs.mk
 
 include $(ERL_TOP)/make/output.mk
@@ -126,6 +127,8 @@ else
 WARNFLAGS = @WFLAGS@
 endif
 
+WARNFLAGS += -DEI_NO_DEPR_WARN
+
 CFLAGS = @LIB_CFLAGS@ $(WARNFLAGS) $(INCFLAGS) $(TYPE_FLAGS)
 PROG_CFLAGS = @CFLAGS@ $(WARNFLAGS) $(INCFLAGS) $(TYPE_FLAGS) -Ilegacy
 
@@ -417,7 +420,8 @@ MISCSRC = \
 	misc/eimd5.c \
 	misc/get_type.c \
 	misc/show_msg.c \
-	misc/ei_compat.c
+	misc/ei_compat.c \
+	misc/ei_init.c
 
 REGISTRYSRC = \
 	registry/hash_dohash.c \
@@ -780,29 +784,31 @@ $(MDD_OBJDIR)/ei_fake_prog_mdd_cxx$(EXE): prog/ei_fake_prog.c $(MDD_EILIB)
 #  Create dependency file using gcc -MM
 ###########################################################################
 
-depend:
+depend: $(TARGET)/depend.mk
+
+$(TARGET)/depend.mk: $(TARGET)/config.h
 	$(gen_verbose)
-	$(V_colon)@echo "Generating dependency file depend.mk..."
-	@echo "# Generated dependency rules" > depend.mk;		\
-	$(V_CC) $(CFLAGS) -MM $(SOURCES) | 			\
+	$(V_colon)echo "Generating dependency file depend.mk..."
+	@echo "# Generated dependency rules" > $@
+	$(V_CC) $(CFLAGS) -MM $(SOURCES) | 				\
 		sed 's&$(TARGET)&\$$\(TARGET\)&g' |			\
-		sed 's/^.*:/\$$\(ST_OBJDIR\)\/&/' >> depend.mk;		\
-	echo >> depend.mk;						\
-	$(CC) $(CFLAGS) -MM $(SOURCES) |				\
+		sed 's/^.*:/\$$\(ST_OBJDIR\)\/&/' >> $@
+	@echo >> $@
+	$(V_CC) $(CFLAGS) -MM $(SOURCES) | 				\
 		sed 's&$(TARGET)&\$$\(TARGET\)&g' |			\
-		sed 's/^.*:/\$$\(MT_OBJDIR\)\/&/' >> depend.mk;		\
-	echo >> depend.mk;						\
-	$(CC) $(CFLAGS) -MM $(SOURCES) |				\
+		sed 's/^.*:/\$$\(MT_OBJDIR\)\/&/' >> $@
+	@echo >> $@
+	$(V_CC) $(CFLAGS) -MM $(SOURCES) |				\
 		sed 's&$(TARGET)&\$$\(TARGET\)&g' |			\
-		sed 's/^.*:/\$$\(MD_OBJDIR\)\/&/' >> depend.mk;		\
-	echo >> depend.mk;						\
-	$(CC) $(CFLAGS) -MM $(SOURCES) |				\
+		sed 's/^.*:/\$$\(MD_OBJDIR\)\/&/' >> $@
+	@echo >> $@
+	$(V_CC) $(CFLAGS) -MM $(SOURCES) |				\
 		sed 's&$(TARGET)&\$$\(TARGET\)&g' |			\
-		sed 's/^.*:/\$$\(MDD_OBJDIR\)\/&/' >> depend.mk;	\
-	echo >> depend.mk
+		sed 's/^.*:/\$$\(MDD_OBJDIR\)\/&/' >> $@
+	@echo >> $@
 
 # For some reason this has to be after 'opt' target
-include depend.mk
+-include $(TARGET)/depend.mk
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/erl_interface/src/README.internal b/lib/erl_interface/src/README.internal
index c1f2d6863f..42c45b46a9 100644
--- a/lib/erl_interface/src/README.internal
+++ b/lib/erl_interface/src/README.internal
@@ -167,12 +167,12 @@ NOTE!!!! Sending a "char" to macros like isupper(), isalpha() where
 the character is > 127 will cause serios problems on some
 machines/OS. The reason is that
 
-   'char' may be unsigned, i.e. the Swedish char '�' will 
+   'char' may be unsigned, i.e. the Swedish char 'ä' will 
    as a number be negativ.
 
    The implementation of isupper() and others will on some
    machines use an array that is indexed with the incoming
-   character code. The Swedish '�' will then create an access
+   character code. The Swedish 'ä' will then create an access
    on memory outside the array!
 
 This may give a random value as a result or a segmentation
@@ -219,7 +219,7 @@ There are some functions in the 'ei' library that uses the GCC and
 VC++ "long long" type. Unfortunately this can lead to some trouble.
 
 When user code is linked with the "libei.a" the linker will extract
-all objects files needed for resolving all symbol referenses
+all objects files needed for resolving all symbol references
 found. This means that you want to follow the rule that
 
  * To reduce executable code size we use resonably small C source
@@ -252,7 +252,7 @@ example is that in plain R9C the ei_x_encode_longlong() function is
 located in the file "ei_x_encode.c". So if any "long long" ei_x
 function is used we have an unessesary dependency on
 "ei_encode_longlong.o" and then need to link with GNU ld on with the
-user code or explicitely link with "libgcc.a". The situation can be
+user code or explicitly link with "libgcc.a". The situation can be
 visible in in plain R9C using
 
      % nm -A erl_interface-3.4/lib/libei.a | \
diff --git a/lib/erl_interface/src/connect/ei_connect.c b/lib/erl_interface/src/connect/ei_connect.c
index 9df4fa3b6c..1b1479d2e9 100644
--- a/lib/erl_interface/src/connect/ei_connect.c
+++ b/lib/erl_interface/src/connect/ei_connect.c
@@ -42,10 +42,8 @@
 #include <inetLib.h>
 
 #include <unistd.h>
-#include <sys/types.h>
 #include <sys/times.h>
 #include <unistd.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h> 
@@ -55,7 +53,6 @@
 
 #else /* some other unix */
 #include <unistd.h>
-#include <sys/types.h>
 #include <sys/times.h>
 
 #if TIME_WITH_SYS_TIME
@@ -84,6 +81,7 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
+#include <stddef.h>
 
 #include "eiext.h"
 #include "ei_portio.h"
@@ -98,11 +96,16 @@
 #include "ei_epmd.h"
 #include "ei_internal.h"
 
+static int ei_connect_initialized = 0;
 int ei_tracelevel = 0;
 
 #define COOKIE_FILE "/.erlang.cookie"
 #define EI_MAX_HOME_PATH 1024
 
+#define EI_SOCKET_CALLBACKS_SZ_V1                       \
+    (offsetof(ei_socket_callbacks, get_fd)              \
+     + sizeof(int (*)(void *)))
+
 /* FIXME why not macro? */
 static char *null_cookie = "";
 
@@ -113,35 +116,51 @@ static int get_home(char *buf, int size);
 static unsigned gen_challenge(void);
 static void gen_digest(unsigned challenge, char cookie[], 
 		       unsigned char digest[16]);
-static int send_status(int fd, char *status, unsigned ms);
-static int recv_status(int fd, unsigned ms);
-static int send_challenge(int fd, char *nodename, 
-			  unsigned challenge, unsigned version, unsigned ms);
-static int recv_challenge(int fd, unsigned *challenge, 
-			  unsigned *version,
-			  unsigned *flags, ErlConnect *namebuf, unsigned ms);
-static int send_challenge_reply(int fd, unsigned char digest[16], 
+static int send_status(ei_socket_callbacks *cbs, void *ctx,
+                       int pkt_sz, char *status, unsigned ms);
+static int recv_status(ei_socket_callbacks *cbs, void *ctx,
+                       int pkt_sz, unsigned ms);
+static int send_challenge(ei_socket_callbacks *cbs, void *ctx, int pkt_sz,
+                          char *nodename, unsigned challenge,
+                          unsigned version, unsigned ms);
+static int recv_challenge(ei_socket_callbacks *cbs, void *ctx, int pkt_sz,
+                          unsigned *challenge, unsigned *version,
+			  unsigned *flags, char *namebuf, unsigned ms);
+static int send_challenge_reply(ei_socket_callbacks *cbs, void *ctx,
+                                int pkt_sz, unsigned char digest[16], 
 				unsigned challenge, unsigned ms);
-static int recv_challenge_reply(int fd, 
-				unsigned our_challenge,
+static int recv_challenge_reply(ei_socket_callbacks *cbs, void *ctx,
+                                int pkt_sz, unsigned our_challenge,
 				char cookie[], 
 				unsigned *her_challenge, unsigned ms);
-static int send_challenge_ack(int fd, unsigned char digest[16], unsigned ms);
-static int recv_challenge_ack(int fd, 
-			      unsigned our_challenge,
+static int send_challenge_ack(ei_socket_callbacks *cbs, void *ctx,
+                              int pkt_sz, unsigned char digest[16],
+                              unsigned ms);
+static int recv_challenge_ack(ei_socket_callbacks *cbs, void *ctx, 
+			      int pkt_sz, unsigned our_challenge,
 			      char cookie[], unsigned ms);
-static int send_name(int fd, char *nodename, 
-		     unsigned version, unsigned ms); 
+static int send_name(ei_socket_callbacks *cbs, void *ctx, int pkt_sz,
+                     char *nodename, unsigned version, unsigned ms); 
 
-/* Common for both handshake types */
-static int recv_name(int fd, 
-		     unsigned *version,
-		     unsigned *flags, ErlConnect *namebuf, unsigned ms);
+static int recv_name(ei_socket_callbacks *cbs, void *ctx, int pkt_sz,
+                     unsigned *version, unsigned *flags, char *namebuf,
+                     unsigned ms);
 
 static struct hostent*
 dyn_gethostbyname_r(const char *name, struct hostent *hostp, char **buffer_p,
                     int buflen, int *h_errnop);
 
+static void abort_connection(ei_socket_callbacks *cbs, void *ctx);
+static int close_connection(ei_socket_callbacks *cbs, void *ctx, int fd);
+
+static char *
+estr(int e)
+{
+    char *str = strerror(e);
+    if (!str)
+        return "unknown error";
+    return str;
+}
 
 
 /***************************************************************************
@@ -154,25 +173,208 @@ dyn_gethostbyname_r(const char *name, struct hostent *hostp, char **buffer_p,
 
 typedef struct ei_socket_info_s {
     int socket;
+    ei_socket_callbacks *cbs;
+    void *ctx;
     int dist_version;
     ei_cnode cnode;	/* A copy, not a pointer. We don't know when freed */
     char cookie[EI_MAX_COOKIE_SIZE+1];
 } ei_socket_info;
 
+/***************************************************************************
+ *
+ *  XXX
+ *
+ ***************************************************************************/
+
+#ifndef ETHR_HAVE___atomic_compare_exchange_n
+#  define ETHR_HAVE___atomic_compare_exchange_n 0
+#endif
+#ifndef ETHR_HAVE___atomic_load_n
+#  define ETHR_HAVE___atomic_load_n 0
+#endif
+#ifndef ETHR_HAVE___atomic_store_n
+#  define ETHR_HAVE___atomic_store_n 0
+#endif
+
+#if defined(_REENTRANT)                                                 \
+    && (!(ETHR_HAVE___atomic_compare_exchange_n & SIZEOF_VOID_P)        \
+        || !(ETHR_HAVE___atomic_load_n & SIZEOF_VOID_P)                 \
+        || !(ETHR_HAVE___atomic_store_n & SIZEOF_VOID_P))
+#  undef EI_DISABLE_SEQ_SOCKET_INFO
+#  define EI_DISABLE_SEQ_SOCKET_INFO
+#endif
+
+#ifdef __WIN32__
+#  undef EI_DISABLE_SEQ_SOCKET_INFO
+#  define EI_DISABLE_SEQ_SOCKET_INFO
+#endif
+
+#ifndef EI_DISABLE_SEQ_SOCKET_INFO
+
+#ifdef _REENTRANT
+
+#define EI_ATOMIC_CMPXCHG_ACQ_REL(VARP, XCHGP, NEW) \
+    __atomic_compare_exchange_n((VARP), (XCHGP), (NEW), 0, \
+                                __ATOMIC_ACQ_REL, __ATOMIC_ACQUIRE)
+#define EI_ATOMIC_LOAD_ACQ(VARP) \
+    __atomic_load_n((VARP), __ATOMIC_ACQUIRE)
+#define EI_ATOMIC_STORE_REL(VARP, NEW) \
+    __atomic_store_n((VARP), (NEW), __ATOMIC_RELEASE)
+
+#else /* ! _REENTRANT */
+
+#define EI_ATOMIC_CMPXCHG_ACQ_REL(VARP, XCHGP, NEW)    \
+    (*(VARP) == *(XCHGP)                               \
+     ? ((*(VARP) = (NEW)), !0)                         \
+     : ((*(XCHGP) = *(VARP)), 0))
+#define EI_ATOMIC_LOAD_ACQ(VARP) (*(VARP))
+#define EI_ATOMIC_STORE_REL(VARP, NEW) (*(VARP) = (NEW))
+
+#endif /* ! _REENTRANT */
+
+#define EI_SOCKET_INFO_SEG_BITS 5
+#define EI_SOCKET_INFO_SEG_SIZE (1 << EI_SOCKET_INFO_SEG_BITS)
+#define EI_SOCKET_INFO_SEG_MASK (EI_SOCKET_INFO_SEG_SIZE - 1)
+
+typedef struct {
+    int max_fds;
+    ei_socket_info *segments[1]; /* Larger in reality... */
+} ei_socket_info_data__;
+
+static ei_socket_info_data__ *socket_info_data = NULL;
+
+static int init_socket_info(int late)
+{
+    int max_fds;
+    int i;
+    size_t segments_len;
+    ei_socket_info_data__ *info_data, *xchg;
+
+    if (EI_ATOMIC_LOAD_ACQ(&socket_info_data) != NULL)
+        return 0; /* Already initialized... */
+    
+#if defined(HAVE_SYSCONF) && defined(_SC_OPEN_MAX)
+    max_fds = sysconf(_SC_OPEN_MAX);
+#else
+    max_fds = 1024;
+#endif
+
+    if (max_fds < 0)
+        return EIO;
+
+    segments_len = ((max_fds-1)/EI_SOCKET_INFO_SEG_SIZE + 1);
+    
+    info_data = malloc(sizeof(ei_socket_info_data__)
+                       + (sizeof(ei_socket_info *)*(segments_len-1)));
+    if (!info_data)
+        return ENOMEM;
+
+    info_data->max_fds = max_fds;
+    for (i = 0; i < segments_len; i++)
+        info_data->segments[i] = NULL;
+
+    xchg = NULL;
+    if (!EI_ATOMIC_CMPXCHG_ACQ_REL(&socket_info_data, &xchg, info_data))
+        free(info_data); /* Already initialized... */
+
+    return 0;
+}
+
+static int put_ei_socket_info(int fd, int dist_version, char* cookie, ei_cnode *ec,
+                              ei_socket_callbacks *cbs, void *ctx)
+{
+    int six;
+    ei_socket_info *seg, *si;
+    int socket;
+
+    if (fd < 0 || socket_info_data->max_fds <= fd)
+        return -1;
+
+    socket = fd;
+    six = fd >> EI_SOCKET_INFO_SEG_BITS;
+    seg = EI_ATOMIC_LOAD_ACQ(&socket_info_data->segments[six]);
+    
+    if (!seg) {
+        ei_socket_info *xchg;
+        int i;
+        seg = malloc(sizeof(ei_socket_info)*EI_SOCKET_INFO_SEG_SIZE);
+        if (!seg)
+            return -1;
+        for (i = 0; i < EI_SOCKET_INFO_SEG_SIZE; i++) {
+            seg[i].socket = -1;
+        }
+
+        xchg = NULL;
+        if (!EI_ATOMIC_CMPXCHG_ACQ_REL(&socket_info_data->segments[six], &xchg, seg)) {
+            free(seg);
+            seg = xchg;
+        }
+    }
+
+    si = &seg[fd & EI_SOCKET_INFO_SEG_MASK];
+
+    if (dist_version < 0) {
+        socket = -1;
+        si->cbs = NULL;
+        si->ctx = NULL;
+    }
+    else {
+        si->dist_version = dist_version;
+        si->cnode = *ec;
+        si->cbs = cbs;
+        si->ctx = ctx;
+        strcpy(si->cookie, cookie);
+    }
+
+    EI_ATOMIC_STORE_REL(&si->socket, socket);
+
+    return 0;
+}
+
+static ei_socket_info* get_ei_socket_info(int fd)
+{
+    int six, socket;
+    ei_socket_info *seg, *si;
+    
+    if (fd < 0 || socket_info_data->max_fds <= fd)
+        return NULL;
+    
+    six = fd >> EI_SOCKET_INFO_SEG_BITS;
+    seg = EI_ATOMIC_LOAD_ACQ(&socket_info_data->segments[six]);
+
+    if (!seg)
+        return NULL;
+    
+    si = &seg[fd & EI_SOCKET_INFO_SEG_MASK];
+    socket = EI_ATOMIC_LOAD_ACQ(&si->socket);
+    if (socket != fd)
+        return NULL;
+    return si;
+}
+    
+#else /* EI_DISABLE_SEQ_SOCKET_INFO */
+
 int ei_n_sockets = 0, ei_sz_sockets = 0;
 ei_socket_info *ei_sockets = NULL;
+
 #ifdef _REENTRANT
 ei_mutex_t* ei_sockets_lock = NULL;
 #endif /* _REENTRANT */
 
+static int init_socket_info(int late)
+{
+#ifdef _REENTRANT
+    if (late)
+        return ENOTSUP; /* Refuse doing unsafe initialization... */
+    ei_sockets_lock = ei_mutex_create();
+    if (!ei_sockets_lock)
+        return ENOMEM;
+#endif /* _REENTRANT */
+    return 0;
+}
 
-/***************************************************************************
- *
- *  XXX
- *
- ***************************************************************************/
-
-static int put_ei_socket_info(int fd, int dist_version, char* cookie, ei_cnode *ec)
+static int put_ei_socket_info(int fd, int dist_version, char* cookie, ei_cnode *ec,
+                              ei_socket_callbacks *cbs, void *ctx)
 {
     int i;
 
@@ -182,11 +384,13 @@ static int put_ei_socket_info(int fd, int dist_version, char* cookie, ei_cnode *
     for (i = 0; i < ei_n_sockets; ++i) {
 	if (ei_sockets[i].socket == fd) {
 	    if (dist_version == -1) {
-		memmove(&ei_sockets[i], &ei_sockets[i+1],
+                memmove(&ei_sockets[i], &ei_sockets[i+1],
 			sizeof(ei_sockets[0])*(ei_n_sockets-i-1));
 	    } else {
 		ei_sockets[i].dist_version = dist_version;
 		/* Copy the content, see ei_socket_info */
+                ei_sockets[i].cbs = cbs;
+                ei_sockets[i].ctx = ctx;
 		ei_sockets[i].cnode = *ec;
 		strcpy(ei_sockets[i].cookie, cookie);
 	    }
@@ -209,7 +413,9 @@ static int put_ei_socket_info(int fd, int dist_version, char* cookie, ei_cnode *
 	}
 	ei_sockets[ei_n_sockets].socket = fd;
 	ei_sockets[ei_n_sockets].dist_version = dist_version;
-	ei_sockets[i].cnode = *ec;
+	ei_sockets[ei_n_sockets].cnode = *ec;
+        ei_sockets[ei_n_sockets].cbs = cbs;
+        ei_sockets[ei_n_sockets].ctx = ctx;
 	strcpy(ei_sockets[ei_n_sockets].cookie, cookie);
 	++ei_n_sockets;
     }
@@ -219,14 +425,6 @@ static int put_ei_socket_info(int fd, int dist_version, char* cookie, ei_cnode *
     return 0;
 }
 
-#if 0
-/* FIXME not used ?! */
-static int remove_ei_socket_info(int fd, int dist_version, char* cookie)
-{
-    return put_ei_socket_info(fd, -1, NULL);
-}
-#endif
-
 static ei_socket_info* get_ei_socket_info(int fd)
 {
     int i;
@@ -248,6 +446,13 @@ static ei_socket_info* get_ei_socket_info(int fd)
     return NULL;
 }
 
+#endif /* EI_DISABLE_SEQ_SOCKET_INFO */
+
+static int remove_ei_socket_info(int fd)
+{
+    return put_ei_socket_info(fd, -1, NULL, NULL, NULL, NULL);
+}
+
 ei_cnode *ei_fd_to_cnode(int fd)
 {
     ei_socket_info *sockinfo = get_ei_socket_info(fd);
@@ -255,6 +460,19 @@ ei_cnode *ei_fd_to_cnode(int fd)
     return &sockinfo->cnode;
 }
 
+int ei_get_cbs_ctx__(ei_socket_callbacks **cbs, void **ctx, int fd)
+{
+    ei_socket_info *sockinfo = get_ei_socket_info(fd);
+    if (sockinfo) {
+        *cbs = sockinfo->cbs;
+        *ctx = sockinfo->ctx;
+        return 0;
+    }
+
+    *cbs = NULL;
+    *ctx = NULL;
+    return EBADF;
+}
 
 /***************************************************************************
  *  Get/Set tracelevel
@@ -333,21 +551,6 @@ const char *ei_getfdcookie(int fd)
     return r;
 }
 
-/* call with cookie to set value to use on descriptor fd,
-* or specify NULL to use default
-*/
-/* FIXME why defined but not used? */
-#if 0
-static int ei_setfdcookie(ei_cnode* ec, int fd, char *cookie)
-{
-    int dist_version = ei_distversion(fd);
-
-    if (cookie == NULL)
-	cookie = ec->ei_connect_cookie;
-    return put_ei_socket_info(fd, dist_version, cookie);
-}
-#endif
-
 static int get_int32(unsigned char *s)
 {
     return ((s[0] << 24) | (s[1] << 16) | (s[2] << 8) | (s[3] ));
@@ -400,34 +603,62 @@ static int initWinSock(void)
 }
 #endif
 
+static int init_connect(int late)
+{
+    int error;
+
+    /*
+     * 'late' is non-zero when not called via ei_init(). Such a
+     * call is not supported, but we for now save the day if
+     * it easy to do so; otherwise, return ENOTSUP.
+     */
+
+#ifdef __WIN32__
+    if (!initWinSock()) {
+	EI_TRACE_ERR0("ei_init_connect","can't initiate winsock");
+	return EIO;
+    }
+#endif /* win32 */
+
+    error = init_socket_info(late);
+    if (error) {
+        EI_TRACE_ERR0("ei_init_connect","can't initiate socket info");
+        return error;
+    }
+
+    ei_connect_initialized = !0;
+    return 0;
+}
+
+int ei_init_connect(void)
+{
+    return init_connect(0);
+}
+
 /*
 * Perhaps run this routine instead of ei_connect_init/2 ?
 * Initailize by setting:
 * thishostname, thisalivename, thisnodename and thisipaddr
 */
-int ei_connect_xinit(ei_cnode* ec, const char *thishostname,
-		     const char *thisalivename, const char *thisnodename,
-		     Erl_IpAddr thisipaddr, const char *cookie,
-		     const short creation)
+int ei_connect_xinit_ussi(ei_cnode* ec, const char *thishostname,
+                          const char *thisalivename, const char *thisnodename,
+                          Erl_IpAddr thisipaddr, const char *cookie,
+                          const short creation, ei_socket_callbacks *cbs,
+                          int cbs_sz, void *setup_context)
 {
     char *dbglevel;
-    
-/* FIXME this code was enabled for 'erl'_connect_xinit(), why not here? */
-#if 0    
-#ifdef __WIN32__
-    if (!initWinSock()) {
-	EI_TRACE_ERR0("ei_connect_xinit","can't initiate winsock");
-	return ERL_ERROR;
-    }
-#endif
-#endif
 
-#ifdef _REENTRANT
-    if (ei_sockets_lock == NULL) {
-	ei_sockets_lock = ei_mutex_create();
-    }
-#endif /* _REENTRANT */
+    if (!ei_connect_initialized)
+        init_connect(!0);
 
+    if (cbs != &ei_default_socket_callbacks)
+        EI_SET_HAVE_PLUGIN_SOCKET_IMPL__;
+    
+    if (cbs_sz < EI_SOCKET_CALLBACKS_SZ_V1) {
+	EI_TRACE_ERR0("ei_connect_xinit","invalid size of ei_socket_callbacks struct");
+        return ERL_ERROR;
+    }
+    
     ec->creation = creation & 0x3; /* 2 bits */
     
     if (cookie) {
@@ -469,6 +700,9 @@ int ei_connect_xinit(ei_cnode* ec, const char *thishostname,
     ec->self.serial = 0;
     ec->self.creation = creation & 0x3; /* 2 bits */
 
+    ec->cbs = cbs;
+    ec->setup_context = setup_context;
+
     if ((dbglevel = getenv("EI_TRACELEVEL")) != NULL ||
 	(dbglevel = getenv("ERL_DEBUG_DIST")) != NULL)
 	ei_tracelevel = atoi(dbglevel);
@@ -476,14 +710,27 @@ int ei_connect_xinit(ei_cnode* ec, const char *thishostname,
     return 0;
 }
 
+int ei_connect_xinit(ei_cnode* ec, const char *thishostname,
+                     const char *thisalivename, const char *thisnodename,
+                     Erl_IpAddr thisipaddr, const char *cookie,
+                     const short creation)
+{
+    return ei_connect_xinit_ussi(ec, thishostname, thisalivename, thisnodename,
+                                 thisipaddr, cookie, creation,
+                                 &ei_default_socket_callbacks,
+                                 sizeof(ei_default_socket_callbacks),
+                                 NULL);
+}
 
 /*
 * Initialize by set: thishostname, thisalivename, 
 * thisnodename and thisipaddr. At success return 0,
 * otherwise return -1.
 */
-int ei_connect_init(ei_cnode* ec, const char* this_node_name,
-		    const char *cookie, short creation)
+int ei_connect_init_ussi(ei_cnode* ec, const char* this_node_name,
+                         const char *cookie, short creation,
+                         ei_socket_callbacks *cbs, int cbs_sz,
+                         void *setup_context)
 {
     char thishostname[EI_MAXHOSTNAMELEN+1];
     char thisnodename[MAXNODELEN+1];
@@ -494,17 +741,8 @@ int ei_connect_init(ei_cnode* ec, const char* this_node_name,
     int ei_h_errno;
     int res;
 
-#ifdef __WIN32__
-    if (!initWinSock()) {
-	EI_TRACE_ERR0("ei_connect_xinit","can't initiate winsock");
-	return ERL_ERROR;
-    }
-#endif /* win32 */
-#ifdef _REENTRANT
-    if (ei_sockets_lock == NULL) {
-	ei_sockets_lock = ei_mutex_create();
-    }
-#endif /* _REENTRANT */
+    if (!ei_connect_initialized)
+        init_connect(!0);
     
     /* gethostname requires len to be max(hostname) + 1 */
     if (gethostname(thishostname, EI_MAXHOSTNAMELEN+1) == -1) {
@@ -553,51 +791,33 @@ int ei_connect_init(ei_cnode* ec, const char* this_node_name,
 	if (strcmp(hp->h_name, "localhost") == 0) {
 	    /* We use a short node name */    
 	    if ((ct = strchr(thishostname, '.')) != NULL) *ct = '\0';
-	    sprintf(thisnodename, "%s@%s", this_node_name, thishostname);
 	} else {
 	    /* We use a short node name */    
 	    if ((ct = strchr(hp->h_name, '.')) != NULL) *ct = '\0';
 	    strcpy(thishostname, hp->h_name);
-	    sprintf(thisnodename, "%s@%s", this_node_name, hp->h_name);
 	}
     }
-    res = ei_connect_xinit(ec, thishostname, thisalivename, thisnodename,
-                           (struct in_addr *)*hp->h_addr_list, cookie, creation);
+    if (strlen(this_node_name) + 1 + strlen(thishostname) > MAXNODELEN) {
+        EI_TRACE_ERR0("ei_connect_init_ussi","this node name is too long");
+        return ERL_ERROR;
+    }
+    sprintf(thisnodename, "%s@%s", this_node_name, thishostname);
+    res = ei_connect_xinit_ussi(ec, thishostname, thisalivename, thisnodename,
+                                (struct in_addr *)*hp->h_addr_list, cookie, creation,
+                                cbs, cbs_sz, setup_context);
     if (buf != buffer)
         free(buf);
     return res;
 }
 
-
-/* connects to port at ip-address ip_addr 
-* and returns fd to socket 
-* port has to be in host byte order 
-*/
-static int cnct(uint16 port, struct in_addr *ip_addr, int addr_len, unsigned ms)
+int ei_connect_init(ei_cnode* ec, const char* this_node_name,
+                    const char *cookie, short creation)
 {
-    int s, res;
-    struct sockaddr_in iserv_addr;
-    
-    if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
-	erl_errno = errno;
-	return ERL_ERROR;
-    }
-    
-    memset((char*)&iserv_addr, 0, sizeof(struct sockaddr_in));
-    memcpy((char*)&iserv_addr.sin_addr, (char*)ip_addr, addr_len);
-    iserv_addr.sin_family = AF_INET;
-    iserv_addr.sin_port = htons(port);
-    
-    if ((res = ei_connect_t(s, (struct sockaddr*)&iserv_addr, 
-		      sizeof(iserv_addr),ms)) < 0) {
-	erl_errno = (res == -2) ? ETIMEDOUT : EIO;
-	closesocket(s);
-	return ERL_ERROR;
-    }
-    
-    return s;
-} /* cnct */
-
+    return ei_connect_init_ussi(ec, this_node_name, cookie, creation,
+                                &ei_default_socket_callbacks,
+                                sizeof(ei_default_socket_callbacks),
+                                NULL);
+}
 
 /*
  * Same as ei_gethostbyname_r, but also handles ERANGE error
@@ -672,6 +892,11 @@ int ei_connect_tmo(ei_cnode* ec, char *nodename, unsigned ms)
     int ei_h_errno;
 #endif /* !win32 */
     int res;
+
+    if (strlen(nodename) > MAXNODELEN) {
+	EI_TRACE_ERR0("ei_connect","Too long nodename");
+	return ERL_ERROR;
+    }
     
     /* extract the host and alive parts from nodename */
     if (!(hostname = strchr(nodename,'@'))) {
@@ -758,91 +983,218 @@ int ei_connect(ei_cnode* ec, char *nodename)
   *  the node through epmd at that host 
   *
 */
-int ei_xconnect_tmo(ei_cnode* ec, Erl_IpAddr adr, char *alivename, unsigned ms)
+int ei_xconnect_tmo(ei_cnode* ec, Erl_IpAddr ip_addr, char *alivename, unsigned ms)
 {
-    struct in_addr *ip_addr=(struct in_addr *) adr;
+    ei_socket_callbacks *cbs = ec->cbs;
+    void *ctx;
     int rport = 0; /*uint16 rport = 0;*/
     int sockd;
-    int one = 1;
     int dist = 0;
-    ErlConnect her_name;
     unsigned her_flags, her_version;
-
+    unsigned our_challenge, her_challenge;
+    unsigned char our_digest[16];
+    int err;
+    int pkt_sz;
+    struct sockaddr_in addr;
+    unsigned tmo = ms == 0 ? EI_SCLBK_INF_TMO : ms;
+    
     erl_errno = EIO;		/* Default error code */
     
     EI_TRACE_CONN1("ei_xconnect","-> CONNECT attempt to connect to %s",
 		   alivename);
     
-    if ((rport = ei_epmd_port_tmo(ip_addr,alivename,&dist, ms)) < 0) {
+    if ((rport = ei_epmd_port_tmo(ip_addr,alivename,&dist, tmo)) < 0) {
 	EI_TRACE_ERR0("ei_xconnect","-> CONNECT can't get remote port");
 	/* ei_epmd_port_tmo() has set erl_errno */
 	return ERL_NO_PORT;
     }
-    
-    /* we now have port number to enode, try to connect */
-    if((sockd = cnct((uint16)rport, ip_addr, sizeof(struct in_addr),ms)) < 0) {
-	EI_TRACE_ERR0("ei_xconnect","-> CONNECT socket connect failed");
-	/* cnct() has set erl_errno */
-	return ERL_CONNECT_FAIL;
-    }
-    
-    EI_TRACE_CONN0("ei_xconnect","-> CONNECT connected to remote");
 
-    /* FIXME why connect before checking 'dist' output from ei_epmd_port() ?! */
     if (dist <= 4) {
 	EI_TRACE_ERR0("ei_xconnect","-> CONNECT remote version not compatible");
-	goto error;
+	return ERL_ERROR;
     }
-    else {
-	unsigned our_challenge, her_challenge;
-	unsigned char our_digest[16];
-	
-	if (send_name(sockd, ec->thisnodename, (unsigned) dist, ms))
-	    goto error;
-	if (recv_status(sockd, ms))
-	    goto error;
-	if (recv_challenge(sockd, &her_challenge, &her_version,
-	    &her_flags, &her_name, ms))
-	    goto error;
-	our_challenge = gen_challenge();
-	gen_digest(her_challenge, ec->ei_connect_cookie, our_digest);
-	if (send_challenge_reply(sockd, our_digest, our_challenge, ms))
-	    goto error;
-	if (recv_challenge_ack(sockd, our_challenge, 
-	    ec->ei_connect_cookie, ms))
-	    goto error;
-	put_ei_socket_info(sockd, dist, null_cookie, ec); /* FIXME check == 0 */
+
+    err = ei_socket_ctx__(cbs, &ctx, ec->setup_context);
+    if (err) {
+        EI_TRACE_ERR2("ei_xconnect","-> SOCKET failed: %s (%d)",
+                      estr(err), err);
+        erl_errno = err;
+        return ERL_CONNECT_FAIL;
+    }
+
+    memset((void *) &addr, 0, sizeof(struct sockaddr_in));
+    memcpy((void *) &addr.sin_addr, (void *) ip_addr, sizeof(addr.sin_addr));
+    addr.sin_family = AF_INET;
+    addr.sin_port = htons(rport);
+
+    err = ei_connect_ctx_t__(cbs, ctx, (void *) &addr, sizeof(addr), tmo);
+    if (err) {
+        EI_TRACE_ERR2("ei_xconnect","-> CONNECT socket connect failed: %s (%d)",
+                      estr(err), err);
+        abort_connection(cbs, ctx);
+        erl_errno = err;
+        return ERL_CONNECT_FAIL;
     }
     
-    setsockopt(sockd, IPPROTO_TCP, TCP_NODELAY, (char *)&one, sizeof(one));
-    setsockopt(sockd, SOL_SOCKET, SO_KEEPALIVE, (char *)&one, sizeof(one));
+    EI_TRACE_CONN0("ei_xconnect","-> CONNECT connected to remote");
 
-    EI_TRACE_CONN1("ei_xconnect","-> CONNECT (ok) remote = %s",alivename);
+    err = EI_GET_FD__(cbs, ctx, &sockd);
+    if (err) {
+        EI_CONN_SAVE_ERRNO__(err);
+        goto error;
+    }
+
+    err = cbs->handshake_packet_header_size(ctx, &pkt_sz);
+    if (err) {
+        EI_CONN_SAVE_ERRNO__(err);
+        goto error;
+    }
+        
+    if (send_name(cbs, ctx, pkt_sz, ec->thisnodename, (unsigned) dist, tmo))
+        goto error;
+    if (recv_status(cbs, ctx, pkt_sz, tmo))
+        goto error;
+    if (recv_challenge(cbs, ctx, pkt_sz, &her_challenge,
+                       &her_version, &her_flags, NULL, tmo))
+        goto error;
+    our_challenge = gen_challenge();
+    gen_digest(her_challenge, ec->ei_connect_cookie, our_digest);
+    if (send_challenge_reply(cbs, ctx, pkt_sz, our_digest, our_challenge, tmo))
+        goto error;
+    if (recv_challenge_ack(cbs, ctx, pkt_sz, our_challenge, 
+                           ec->ei_connect_cookie, tmo))
+        goto error;
+    if (put_ei_socket_info(sockd, dist, null_cookie, ec, cbs, ctx) != 0)
+        goto error;
+
+    if (cbs->connect_handshake_complete) {
+        err = cbs->connect_handshake_complete(ctx);
+        if (err) {
+            EI_TRACE_ERR2("ei_xconnect","-> CONNECT failed: %s (%d)",
+                          estr(err), err);
+            close_connection(cbs, ctx, sockd);
+            EI_CONN_SAVE_ERRNO__(err);
+            return ERL_ERROR;
+        }
+    }    
     
+    EI_TRACE_CONN1("ei_xconnect","-> CONNECT (ok) remote = %s",alivename);
+
     erl_errno = 0;
     return sockd;
     
 error:
     EI_TRACE_ERR0("ei_xconnect","-> CONNECT failed");
-    closesocket(sockd);
+    abort_connection(cbs, ctx);
     return ERL_ERROR;
 } /* ei_xconnect */
 
-int ei_xconnect(ei_cnode* ec, Erl_IpAddr adr, char *alivename)
+int ei_xconnect(ei_cnode* ec, Erl_IpAddr ip_addr, char *alivename)
 {
-    return ei_xconnect_tmo(ec, adr, alivename, 0);
+    return ei_xconnect_tmo(ec, ip_addr, alivename, 0);
 }
 
+int ei_listen(ei_cnode *ec, int *port, int backlog)
+{
+    struct in_addr ip_addr;
+    ip_addr.s_addr = htonl(INADDR_ANY);
+    return ei_xlisten(ec, &ip_addr, port, backlog);
+}
+
+int ei_xlisten(ei_cnode *ec, struct in_addr *ip_addr, int *port, int backlog)
+{
+    ei_socket_callbacks *cbs = ec->cbs;
+    struct sockaddr_in sock_addr;
+    void *ctx;
+    int fd, err, len;
+
+    err = ei_socket_ctx__(cbs, &ctx, ec->setup_context);
+    if (err) {
+        EI_TRACE_ERR2("ei_xlisten","-> SOCKET failed: %s (%d)",
+                      estr(err), err);
+        erl_errno = err;
+        return ERL_ERROR;
+    }
+
+    memset((void *) &sock_addr, 0, sizeof(struct sockaddr_in));
+    memcpy((void *) &sock_addr.sin_addr, (void *) ip_addr, sizeof(*ip_addr));
+    sock_addr.sin_family = AF_INET;
+    sock_addr.sin_port = htons((short) *port);
+
+    len = sizeof(sock_addr);
+    err = ei_listen_ctx__(cbs, ctx, (void *) &sock_addr, &len, backlog);
+    if (err) {
+        EI_TRACE_ERR2("ei_xlisten","-> listen failed: %s (%d)",
+                      estr(err), err);
+        erl_errno = err;
+        goto error;
+    }
+
+    if (len != sizeof(sock_addr)) {
+        if (len < offsetof(struct sockaddr_in, sin_addr) + sizeof(sock_addr.sin_addr)
+            || len < offsetof(struct sockaddr_in, sin_port) + sizeof(sock_addr.sin_port)) {
+            erl_errno = EIO;
+            EI_TRACE_ERR0("ei_xlisten","-> get info failed");
+            goto error;
+        }
+    }
+
+    memcpy((void *) ip_addr, (void *) &sock_addr.sin_addr, sizeof(*ip_addr));
+    *port = (int) ntohs(sock_addr.sin_port);
+    
+    err = EI_GET_FD__(cbs, ctx, &fd);
+    if (err) {
+        erl_errno = err;
+        goto error;
+    }
+
+    if (put_ei_socket_info(fd, 0, null_cookie, ec, cbs, ctx) != 0) {
+        EI_TRACE_ERR0("ei_xlisten","-> save socket info failed");
+        erl_errno = EIO;
+        goto error;
+    }
+    
+    erl_errno = 0;
+
+    return fd;
+    
+error:
+    abort_connection(cbs, ctx);
+    return ERL_ERROR;
+}
+    
+static int close_connection(ei_socket_callbacks *cbs, void *ctx, int fd)
+{
+    int err;
+    remove_ei_socket_info(fd);
+    err = ei_close_ctx__(cbs, ctx);
+    if (err) {
+        erl_errno = err;
+        return ERL_ERROR;
+    }
+    return 0;
+}
 
-  /* 
-  * For symmetry reasons
-*/
-#if 0
 int ei_close_connection(int fd)
 {
-    return closesocket(fd);
+    ei_socket_callbacks *cbs;
+    void *ctx;
+    int err = EI_GET_CBS_CTX__(&cbs, &ctx, fd);
+    if (err)
+        erl_errno = err;
+    else {
+        if (close_connection(cbs, ctx, fd) == 0)
+            return 0;
+    }
+    EI_TRACE_ERR2("ei_close_connection","<- CLOSE socket close failed: %s (%d)",
+                  estr(erl_errno), erl_errno);
+    return ERL_ERROR;
 } /* ei_close_connection */
-#endif
+
+static void abort_connection(ei_socket_callbacks *cbs, void *ctx)
+{
+    (void) ei_close_ctx__(cbs, ctx);
+}
 
   /*
   * Accept and initiate a connection from another
@@ -857,25 +1209,71 @@ int ei_accept(ei_cnode* ec, int lfd, ErlConnect *conp)
 int ei_accept_tmo(ei_cnode* ec, int lfd, ErlConnect *conp, unsigned ms)
 {
     int fd;
-    struct sockaddr_in cli_addr;
-    int cli_addr_len=sizeof(struct sockaddr_in);
     unsigned her_version, her_flags;
-    ErlConnect her_name;
+    char tmp_nodename[MAXNODELEN+1];
+    char *her_name;
+    int pkt_sz, err;
+    struct sockaddr_in addr;
+    int addr_len = sizeof(struct sockaddr_in);
+    ei_socket_callbacks *cbs;
+    void *ctx;
+    unsigned tmo = ms == 0 ? EI_SCLBK_INF_TMO : ms;
 
     erl_errno = EIO;		/* Default error code */
+    
+    err = EI_GET_CBS_CTX__(&cbs, &ctx, lfd);
+    if (err) {
+        EI_CONN_SAVE_ERRNO__(err);
+        return ERL_ERROR;
+    }
+
 
     EI_TRACE_CONN0("ei_accept","<- ACCEPT waiting for connection");
+
+    if (conp) {
+        her_name = &conp->nodename[0];
+    }
+    else {
+        her_name = &tmp_nodename[0];
+    }
     
-    if ((fd = ei_accept_t(lfd, (struct sockaddr*) &cli_addr, 
-	&cli_addr_len, ms )) < 0) {
-	EI_TRACE_ERR0("ei_accept","<- ACCEPT socket accept failed");
-	erl_errno = (fd == -2) ? ETIMEDOUT : EIO;
-	goto error;
+    /*
+     * ei_accept_ctx_t__() replaces the pointer to the listen context
+     * with a pointer to the accepted connection context on success.
+     */
+    err = ei_accept_ctx_t__(cbs, &ctx, (void *) &addr, &addr_len, tmo);
+    if (err) {
+	EI_TRACE_ERR2("ei_accept","<- ACCEPT socket accept failed: %s (%d)",
+                      estr(err), err);
+        EI_CONN_SAVE_ERRNO__(err);
+        return ERL_ERROR;
+    }
+
+    err = EI_GET_FD__(cbs, ctx, &fd);
+    if (err) {
+	EI_TRACE_ERR2("ei_accept","<- ACCEPT get fd failed: %s (%d)",
+                      estr(err), err);
+        EI_CONN_SAVE_ERRNO__(err);
+    }
+
+    if (addr_len != sizeof(struct sockaddr_in)) {
+        if (addr_len < (offsetof(struct sockaddr_in, sin_addr)
+                        + sizeof(addr.sin_addr))) {
+            EI_TRACE_ERR0("ei_accept","<- ACCEPT get addr failed");
+            goto error;
+        }
+    }
+
+    err = cbs->handshake_packet_header_size(ctx, &pkt_sz);
+    if (err) {
+	EI_TRACE_ERR2("ei_accept","<- ACCEPT get packet size failed: %s (%d)",
+                      estr(err), err);
+        EI_CONN_SAVE_ERRNO__(err);
     }
     
     EI_TRACE_CONN0("ei_accept","<- ACCEPT connected to remote");
     
-    if (recv_name(fd, &her_version, &her_flags, &her_name, ms)) {
+    if (recv_name(cbs, ctx, pkt_sz, &her_version, &her_flags, her_name, tmo)) {
 	EI_TRACE_ERR0("ei_accept","<- ACCEPT initial ident failed");
 	goto error;
     }
@@ -888,34 +1286,45 @@ int ei_accept_tmo(ei_cnode* ec, int lfd, ErlConnect *conp, unsigned ms)
 	unsigned our_challenge;
 	unsigned her_challenge;
 	unsigned char our_digest[16];
-	
-	if (send_status(fd,"ok", ms))
+        
+	if (send_status(cbs, ctx, pkt_sz, "ok", tmo))
 	    goto error;
 	our_challenge = gen_challenge();
-	if (send_challenge(fd, ec->thisnodename, 
-	    our_challenge, her_version, ms))
+	if (send_challenge(cbs, ctx, pkt_sz, ec->thisnodename, 
+                           our_challenge, her_version, tmo))
 	    goto error;
-	if (recv_challenge_reply(fd, our_challenge, 
-	    ec->ei_connect_cookie, 
-	    &her_challenge, ms))
+	if (recv_challenge_reply(cbs, ctx, pkt_sz, our_challenge, 
+                                 ec->ei_connect_cookie, &her_challenge, tmo))
 	    goto error;
 	gen_digest(her_challenge, ec->ei_connect_cookie, our_digest);
-	if (send_challenge_ack(fd, our_digest, ms))
+	if (send_challenge_ack(cbs, ctx, pkt_sz, our_digest, tmo))
 	    goto error;
-	put_ei_socket_info(fd, her_version, null_cookie, ec);
+	if (put_ei_socket_info(fd, her_version, null_cookie, ec, cbs, ctx) != 0)
+            goto error;
+    }
+    if (conp) {
+        memcpy((void *) conp->ipadr, (void *) &addr.sin_addr, sizeof(conp->ipadr));
+    }
+
+    if (cbs->accept_handshake_complete) {
+        err = cbs->accept_handshake_complete(ctx);
+        if (err) {
+            EI_TRACE_ERR2("ei_xconnect","-> ACCEPT handshake failed: %s (%d)",
+                          estr(err), err);
+            close_connection(cbs, ctx, fd);
+            EI_CONN_SAVE_ERRNO__(err);
+            return ERL_ERROR;
+        }
     }
-    if (conp) 
-	*conp = her_name;
     
-    EI_TRACE_CONN1("ei_accept","<- ACCEPT (ok) remote = %s",her_name.nodename);
+    EI_TRACE_CONN1("ei_accept","<- ACCEPT (ok) remote = %s",her_name);
 
     erl_errno = 0;		/* No error */
     return fd;
     
 error:
     EI_TRACE_ERR0("ei_accept","<- ACCEPT failed");
-    if (fd>=0)
-      closesocket(fd);
+    abort_connection(cbs, ctx);
     return ERL_ERROR;
 } /* ei_accept */
 
@@ -927,36 +1336,57 @@ error:
  */
 int ei_receive_tmo(int fd, unsigned char *bufp, int bufsize, unsigned ms) 
 {
-    int len;
+    ssize_t len;
     unsigned char fourbyte[4]={0,0,0,0};
-    int res;
- 
-    if ((res = ei_read_fill_t(fd, (char *) bufp, 4, ms))  != 4) {
-	erl_errno = (res == -2) ? ETIMEDOUT : EIO;
+    int err;
+    ei_socket_callbacks *cbs;
+    void *ctx;
+    unsigned tmo = ms == 0 ? EI_SCLBK_INF_TMO : ms;
+
+    err = EI_GET_CBS_CTX__(&cbs, &ctx, fd);
+    if (err) {
+        EI_CONN_SAVE_ERRNO__(err);
+        return ERL_ERROR;
+    }
+
+    len = (ssize_t) 4;
+    err = ei_read_fill_ctx_t__(cbs, ctx, (char *) bufp, &len, tmo);
+    if (!err && len != (ssize_t) 4)
+        err = EIO;
+    if (err) {
+        EI_CONN_SAVE_ERRNO__(err);
 	return ERL_ERROR;
     }
     
     /* Tick handling */
-    if ((len = get_int32(bufp)) == ERL_TICK) 
-    {
-	ei_write_fill_t(fd, (char *) fourbyte, 4, ms);
+    len = get_int32(bufp);
+    if (len == ERL_TICK) {
+        len = 4;
+	ei_write_fill_ctx_t__(cbs, ctx, (char *) fourbyte, &len, tmo);
 	/* FIXME ok to ignore error or timeout? */
 	erl_errno = EAGAIN;
 	return ERL_TICK;
     }
-    else if (len > bufsize) 
-    {
+    
+    if (len > bufsize) {
 	/* FIXME: We should drain the message. */
 	erl_errno = EMSGSIZE;
 	return ERL_ERROR;
     }
-    else if ((res = ei_read_fill_t(fd, (char *) bufp, len, ms)) != len)
-    {
-	erl_errno = (res == -2) ? ETIMEDOUT : EIO;
-	return ERL_ERROR;
+    else {
+        ssize_t need = len;
+        err = ei_read_fill_ctx_t__(cbs, ctx, (char *) bufp, &len, tmo);
+        if (err) {
+            EI_CONN_SAVE_ERRNO__(err);
+            return ERL_ERROR;
+        }
+        if (len != need) {
+            erl_errno = EIO;
+            return ERL_ERROR;
+        }
     }
     
-    return len;
+    return (int) len;
     
 }
 
@@ -1112,36 +1542,11 @@ int ei_rpc_to(ei_cnode *ec, int fd, char *mod, char *fun,
 int ei_rpc_from(ei_cnode *ec, int fd, int timeout, erlang_msg *msg,
 		ei_x_buff *x) 
 {
-    fd_set readmask;
-    struct timeval tv;
-    struct timeval *t = NULL;
-    
-    if (timeout >= 0) {
-	tv.tv_sec = timeout / 1000;
-	tv.tv_usec = (timeout % 1000) * 1000;
-	t = &tv;
-    }
-    
-    FD_ZERO(&readmask);
-    FD_SET(fd,&readmask);
-    
-    switch (select(fd+1, &readmask, NULL, NULL, t)) {
-    case -1: 
-	erl_errno = EIO;
-	return ERL_ERROR;
-	
-    case 0:
-	erl_errno = ETIMEDOUT;
-	return ERL_TIMEOUT;
-	
-    default:
-	if (FD_ISSET(fd, &readmask)) {
-	    return ei_xreceive_msg(fd, msg, x);
-	} else {
-	    erl_errno = EIO;
-	    return ERL_ERROR;
-	}
-    }
+    unsigned tmo = timeout < 0 ? EI_SCLBK_INF_TMO : (unsigned) timeout;
+    int res = ei_xreceive_msg_tmo(fd, msg, x, tmo);
+    if (res < 0 && erl_errno == ETIMEDOUT)
+        return ERL_TIMEOUT;
+    return res;
 } /* rpc_from */
 
   /*
@@ -1295,19 +1700,34 @@ static char *hex(char digest[16], char buff[33])
     return buff;
 }
 
-static int read_2byte_package(int fd, char **buf, int *buflen, 
-			      int *is_static, unsigned ms)
+static int read_hs_package(ei_socket_callbacks *cbs, void *ctx,
+                           int pkt_sz, char **buf, int *buflen, 
+                           int *is_static, unsigned ms)
 {
-    unsigned char nbuf[2];
+    unsigned char nbuf[4];
     unsigned char *x = nbuf;
-    unsigned len;
-    int res;
-    
-    if((res = ei_read_fill_t(fd, (char *)nbuf, 2, ms)) != 2) {
-	erl_errno = (res == -2) ? ETIMEDOUT : EIO;
+    ssize_t len, need;
+    int err;
+
+    len = (ssize_t) pkt_sz;
+    err = ei_read_fill_ctx_t__(cbs, ctx, (char *)nbuf, &len, ms);
+    if (!err && len != (ssize_t) pkt_sz)
+        err = EIO;
+    if (err) {
+        EI_CONN_SAVE_ERRNO__(err);
 	return -1;
     }
-    len = get16be(x);
+    
+    switch (pkt_sz) {
+    case 2:
+        len = get16be(x);
+        break;
+    case 4:
+        len = get32be(x);
+        break;
+    default:
+        return -1;
+    }
     
     if (len > *buflen) {
 	if (*is_static) {
@@ -1329,20 +1749,26 @@ static int read_2byte_package(int fd, char **buf, int *buflen,
 	    *buflen = len;
 	}
     }
-    if ((res = ei_read_fill_t(fd, *buf, len, ms)) != len) {
-	erl_errno = (res == -2) ? ETIMEDOUT : EIO;
+    need = len;
+    err = ei_read_fill_ctx_t__(cbs, ctx, *buf, &len, ms);
+    if (!err && len != need)
+        err = EIO;
+    if (err) {
+        EI_CONN_SAVE_ERRNO__(err);
 	return -1;
     }
     return len;
 }
 
 
-static int send_status(int fd, char *status, unsigned ms)
+static int send_status(ei_socket_callbacks *cbs, void *ctx,
+                       int pkt_sz, char *status, unsigned ms)
 {
     char *buf, *s;
     char dbuf[DEFBUF_SIZ];
-    int siz = strlen(status) + 1 + 2;
-    int res;
+    int siz = strlen(status) + 1 + pkt_sz;
+    int err;
+    ssize_t len;
 
     buf = (siz > DEFBUF_SIZ) ? malloc(siz) : dbuf;
     if (!buf) {
@@ -1350,14 +1776,28 @@ static int send_status(int fd, char *status, unsigned ms)
 	return -1;
     }
     s = buf;
-    put16be(s,siz - 2);
+    switch (pkt_sz) {
+    case 2:
+        put16be(s,siz - 2);
+        break;
+    case 4:
+        put32be(s,siz - 4);
+        break;
+    default:
+        return -1;
+    }
     put8(s, 's');
     memcpy(s, status, strlen(status));
-    if ((res = ei_write_fill_t(fd, buf, siz, ms)) != siz) {
-	EI_TRACE_ERR0("send_status","-> SEND_STATUS socket write failed");
+    len = (ssize_t) siz;
+    err = ei_write_fill_ctx_t__(cbs, ctx, buf, &len, ms);
+    if (!err && len != (ssize_t) siz)
+        err = EIO;
+    if (err) {
+	EI_TRACE_ERR2("send_status","-> SEND_STATUS socket write failed: %s (%d)",
+                      estr(err), err);
 	if (buf != dbuf)
-	    free(buf);
-	erl_errno = (res == -2) ? ETIMEDOUT : EIO;
+	    free(buf);        
+        EI_CONN_SAVE_ERRNO__(err);
 	return -1;
     }
     EI_TRACE_CONN1("send_status","-> SEND_STATUS (%s)",status);
@@ -1367,7 +1807,8 @@ static int send_status(int fd, char *status, unsigned ms)
     return 0;
 }
 
-static int recv_status(int fd, unsigned ms)
+static int recv_status(ei_socket_callbacks *cbs, void *ctx,
+                       int pkt_sz, unsigned ms)
 {
     char dbuf[DEFBUF_SIZ];
     char *buf = dbuf;
@@ -1375,7 +1816,8 @@ static int recv_status(int fd, unsigned ms)
     int buflen = DEFBUF_SIZ;
     int rlen;
     
-    if ((rlen = read_2byte_package(fd, &buf, &buflen, &is_static, ms)) <= 0) {
+    if ((rlen = read_hs_package(cbs, ctx, pkt_sz,
+                                &buf, &buflen, &is_static, ms)) <= 0) {
 	EI_TRACE_ERR1("recv_status",
 		      "<- RECV_STATUS socket read failed (%d)", rlen);
 	goto error;
@@ -1396,7 +1838,10 @@ error:
     return -1;
 }
 
-static int send_name_or_challenge(int fd, char *nodename,
+static int send_name_or_challenge(ei_socket_callbacks *cbs,
+                                  void *ctx,
+                                  int pkt_sz,
+                                  char *nodename,
 				  int f_chall,
 				  unsigned challenge,
 				  unsigned version,
@@ -1405,9 +1850,11 @@ static int send_name_or_challenge(int fd, char *nodename,
     char *buf;
     unsigned char *s;
     char dbuf[DEFBUF_SIZ];
-    int siz = 2 + 1 + 2 + 4 + strlen(nodename);
+    int siz = pkt_sz + 1 + 2 + 4 + strlen(nodename);
     const char* function[] = {"SEND_NAME", "SEND_CHALLENGE"};
-    int res;
+    int err;
+    ssize_t len;
+    unsigned int flags;
 
     if (f_chall)
 	siz += 4;
@@ -1417,10 +1864,19 @@ static int send_name_or_challenge(int fd, char *nodename,
 	return -1;
     }
     s = (unsigned char *)buf;
-    put16be(s,siz - 2);
+    switch (pkt_sz) {
+    case 2:
+        put16be(s,siz - 2);
+        break;
+    case 4:
+        put32be(s,siz - 4);
+        break;
+    default:
+        return -1;
+    }
     put8(s, 'n');
     put16be(s, version);
-    put32be(s, (DFLAG_EXTENDED_REFERENCES
+    flags = (DFLAG_EXTENDED_REFERENCES
 		| DFLAG_DIST_MONITOR
 		| DFLAG_EXTENDED_PIDS_PORTS
 		| DFLAG_FUN_TAGS
@@ -1429,17 +1885,27 @@ static int send_name_or_challenge(int fd, char *nodename,
 		| DFLAG_SMALL_ATOM_TAGS
 		| DFLAG_UTF8_ATOMS
 		| DFLAG_MAP_TAG
-		| DFLAG_BIG_CREATION));
+		| DFLAG_BIG_CREATION
+                | DFLAG_EXPORT_PTR_TAG
+                | DFLAG_BIT_BINARIES);
+    if (ei_internal_use_21_bitstr_expfun()) {
+        flags &= ~(DFLAG_EXPORT_PTR_TAG
+                   | DFLAG_BIT_BINARIES);
+    }
+    put32be(s, flags);
     if (f_chall)
 	put32be(s, challenge);
     memcpy(s, nodename, strlen(nodename));
-    
-    if ((res = ei_write_fill_t(fd, buf, siz, ms)) != siz) {
+    len = (ssize_t) siz;
+    err = ei_write_fill_ctx_t__(cbs, ctx, buf, &len, ms);
+    if (!err && len != (ssize_t) siz)
+        err = EIO;
+    if (err) {
 	EI_TRACE_ERR1("send_name_or_challenge",
 		      "-> %s socket write failed", function[f_chall]);
 	if (buf != dbuf)
 	    free(buf);
-	erl_errno = (res == -2) ? ETIMEDOUT : EIO;
+        EI_CONN_SAVE_ERRNO__(err);
 	return -1;
     }
     
@@ -1448,9 +1914,9 @@ static int send_name_or_challenge(int fd, char *nodename,
     return 0;
 }
 
-static int recv_challenge(int fd, unsigned *challenge, 
-			  unsigned *version,
-			  unsigned *flags, ErlConnect *namebuf, unsigned ms)
+static int recv_challenge(ei_socket_callbacks *cbs, void *ctx,
+                          int pkt_sz, unsigned *challenge, unsigned *version,
+			  unsigned *flags, char *namebuf, unsigned ms)
 {
     char dbuf[DEFBUF_SIZ];
     char *buf = dbuf;
@@ -1458,13 +1924,13 @@ static int recv_challenge(int fd, unsigned *challenge,
     int buflen = DEFBUF_SIZ;
     int rlen;
     char *s;
-    struct sockaddr_in sin;
-    socklen_t sin_len = sizeof(sin);
     char tag;
-    
+    char tmp_nodename[MAXNODELEN+1];
+
     erl_errno = EIO;		/* Default */
 
-    if ((rlen = read_2byte_package(fd, &buf, &buflen, &is_static, ms)) <= 0) {
+    if ((rlen = read_hs_package(cbs, ctx, pkt_sz, &buf, &buflen,
+                                &is_static, ms)) <= 0) {
 	EI_TRACE_ERR1("recv_challenge",
 		      "<- RECV_CHALLENGE socket read failed (%d)",rlen);
 	goto error;
@@ -1491,8 +1957,7 @@ static int recv_challenge(int fd, unsigned *challenge,
 	goto error;
     }
 
-    if (!(*flags & DFLAG_EXTENDED_PIDS_PORTS)
-	&& !ei_internal_use_r9_pids_ports()) {
+    if (!(*flags & DFLAG_EXTENDED_PIDS_PORTS)) {
 	EI_TRACE_ERR0("recv_challenge","<- RECV_CHALLENGE peer cannot "
 		      "handle extended pids and ports");
 	erl_errno = EIO;
@@ -1505,22 +1970,19 @@ static int recv_challenge(int fd, unsigned *challenge,
 	goto error;
     }
 
-    if (getpeername(fd, (struct sockaddr *) &sin, &sin_len) < 0) {
-	EI_TRACE_ERR0("recv_challenge","<- RECV_CHALLENGE can't get peername");
-	erl_errno = errno;
-	goto error;
-    }
-    memcpy(namebuf->ipadr, &(sin.sin_addr.s_addr), 
-	sizeof(sin.sin_addr.s_addr));
-    memcpy(namebuf->nodename, s, rlen - 11);
-    namebuf->nodename[rlen - 11] = '\0';
+    if (!namebuf)
+        namebuf = &tmp_nodename[0];
+    
+    memcpy(namebuf, s, rlen - 11);
+    namebuf[rlen - 11] = '\0';
+    
     if (!is_static)
 	free(buf);
     EI_TRACE_CONN4("recv_challenge","<- RECV_CHALLENGE (ok) node = %s, "
 	    "version = %u, "
 	    "flags = %u, "
 	    "challenge = %d",
-	    namebuf->nodename,
+	    namebuf,
 	    *version,
 	    *flags,
 	    *challenge
@@ -1533,24 +1995,40 @@ error:
     return -1;
 }
 
-static int send_challenge_reply(int fd, unsigned char digest[16], 
+static int send_challenge_reply(ei_socket_callbacks *cbs, void *ctx,
+                                int pkt_sz, unsigned char digest[16], 
 				unsigned challenge, unsigned ms) 
 {
     char *s;
     char buf[DEFBUF_SIZ];
-    int siz = 2 + 1 + 4 + 16;
-    int res;
+    int siz = pkt_sz + 1 + 4 + 16;
+    int err;
+    ssize_t len;
 
     s = buf;
-    put16be(s,siz - 2);
+    switch (pkt_sz) {
+    case 2:
+        put16be(s,siz - 2);
+        break;
+    case 4:
+        put32be(s,siz - 4);
+        break;
+    default:
+        return -1;
+    }
     put8(s, 'r');
     put32be(s, challenge);
     memcpy(s, digest, 16);
-    
-    if ((res = ei_write_fill_t(fd, buf, siz, ms)) != siz) {
-	EI_TRACE_ERR0("send_challenge_reply",
-		      "-> SEND_CHALLENGE_REPLY socket write failed");
-	erl_errno = (res == -2) ? ETIMEDOUT : EIO;
+
+    len = (ssize_t) siz;
+    err = ei_write_fill_ctx_t__(cbs, ctx, buf, &len, ms);
+    if (!err && len != (ssize_t) siz)
+        err = EIO;
+    if (err) {
+	EI_TRACE_ERR2("send_challenge_reply",
+		      "-> SEND_CHALLENGE_REPLY socket write failed: %s (%d)",
+                      estr(err), err);
+        EI_CONN_SAVE_ERRNO__(err);
 	return -1;
     }
     
@@ -1563,11 +2041,13 @@ static int send_challenge_reply(int fd, unsigned char digest[16],
     return 0;
 }
 
-static int recv_challenge_reply (int fd, 
-				 unsigned our_challenge,
-				 char cookie[], 
-				 unsigned *her_challenge,
-				 unsigned ms)
+static int recv_challenge_reply(ei_socket_callbacks *cbs,
+                                void *ctx,
+                                int pkt_sz,
+                                unsigned our_challenge,
+                                char cookie[], 
+                                unsigned *her_challenge,
+                                unsigned ms)
 {
     char dbuf[DEFBUF_SIZ];
     char *buf = dbuf;
@@ -1580,7 +2060,7 @@ static int recv_challenge_reply (int fd,
     
     erl_errno = EIO;		/* Default */
 
-    if ((rlen = read_2byte_package(fd, &buf, &buflen, &is_static, ms)) != 21) {
+    if ((rlen = read_hs_package(cbs, ctx, pkt_sz, &buf, &buflen, &is_static, ms)) != 21) {
 	EI_TRACE_ERR1("recv_challenge_reply",
 		      "<- RECV_CHALLENGE_REPLY socket read failed (%d)",rlen);
 	goto error;
@@ -1620,23 +2100,38 @@ error:
     return -1;
 }
 
-static int send_challenge_ack(int fd, unsigned char digest[16], unsigned ms) 
+static int send_challenge_ack(ei_socket_callbacks *cbs, void *ctx, int pkt_sz,
+                              unsigned char digest[16], unsigned ms) 
 {
     char *s;
     char buf[DEFBUF_SIZ];
-    int siz = 2 + 1 + 16;
-    int res;
+    int siz = pkt_sz + 1 + 16;
+    int err;
+    ssize_t len;
 
     s = buf;
-    
-    put16be(s,siz - 2);
+    switch (pkt_sz) {
+    case 2:
+        put16be(s,siz - 2);
+        break;
+    case 4:
+        put32be(s,siz - 4);
+        break;
+    default:
+        return -1;
+    }
     put8(s, 'a');
     memcpy(s, digest, 16);
 
-    if ((res = ei_write_fill_t(fd, buf, siz, ms)) != siz) {
-	EI_TRACE_ERR0("recv_challenge_reply",
-		      "-> SEND_CHALLENGE_ACK socket write failed");
-	erl_errno = (res == -2) ? ETIMEDOUT : EIO;
+    len = (ssize_t) siz;
+    err = ei_write_fill_ctx_t__(cbs, ctx, buf, &len, ms);
+    if (!err && len != (ssize_t) siz)
+        err = EIO;
+    if (err) {
+	EI_TRACE_ERR2("recv_challenge_reply",
+		      "-> SEND_CHALLENGE_ACK socket write failed: %s (%d)",
+                      estr(err), err);
+        EI_CONN_SAVE_ERRNO__(err);
 	return -1;
     }
     
@@ -1649,8 +2144,8 @@ static int send_challenge_ack(int fd, unsigned char digest[16], unsigned ms)
     return 0;
 }
 
-static int recv_challenge_ack(int fd, 
-			      unsigned our_challenge,
+static int recv_challenge_ack(ei_socket_callbacks *cbs, void *ctx,
+			      int pkt_sz, unsigned our_challenge,
 			      char cookie[], unsigned ms)
 {
     char dbuf[DEFBUF_SIZ];
@@ -1664,7 +2159,7 @@ static int recv_challenge_ack(int fd,
     
     erl_errno = EIO;		/* Default */
 
-    if ((rlen = read_2byte_package(fd, &buf, &buflen, &is_static, ms)) != 17) {
+    if ((rlen = read_hs_package(cbs, ctx, pkt_sz, &buf, &buflen, &is_static, ms)) != 17) {
 	EI_TRACE_ERR1("recv_challenge_ack",
 		      "<- RECV_CHALLENGE_ACK socket read failed (%d)",rlen);
 	goto error;
@@ -1701,20 +2196,24 @@ error:
     return -1;
 }
 
-static int send_name(int fd, char *nodename, unsigned version, unsigned ms) 
+static int send_name(ei_socket_callbacks *cbs, void *ctx, int pkt_sz,
+                     char *nodename, unsigned version, unsigned ms) 
 {
-    return send_name_or_challenge(fd, nodename, 0, 0, version, ms);
+    return send_name_or_challenge(cbs, ctx, pkt_sz, nodename, 0,
+                                  0, version, ms);
 }
 
-static int send_challenge(int fd, char *nodename, 
-			  unsigned challenge, unsigned version, unsigned ms)
+static int send_challenge(ei_socket_callbacks *cbs, void *ctx, int pkt_sz,
+                          char *nodename, unsigned challenge, unsigned version,
+                          unsigned ms)
 {
-    return send_name_or_challenge(fd, nodename, 1, challenge, version, ms);
+    return send_name_or_challenge(cbs, ctx, pkt_sz, nodename, 1,
+                                  challenge, version, ms);
 }
 
-static int recv_name(int fd, 
-		     unsigned *version,
-		     unsigned *flags, ErlConnect *namebuf, unsigned ms)
+static int recv_name(ei_socket_callbacks *cbs, void *ctx,
+                     int pkt_sz, unsigned *version,
+		     unsigned *flags, char *namebuf, unsigned ms)
 {
     char dbuf[DEFBUF_SIZ];
     char *buf = dbuf;
@@ -1722,13 +2221,13 @@ static int recv_name(int fd,
     int buflen = DEFBUF_SIZ;
     int rlen;
     char *s;
-    struct sockaddr_in sin;
-    socklen_t sin_len = sizeof(sin);
+    char tmp_nodename[MAXNODELEN+1];
     char tag;
     
     erl_errno = EIO;		/* Default */
 
-    if ((rlen = read_2byte_package(fd, &buf, &buflen, &is_static, ms)) <= 0) {
+    if ((rlen = read_hs_package(cbs, ctx, pkt_sz, &buf, &buflen,
+                                &is_static, ms)) <= 0) {
 	EI_TRACE_ERR1("recv_name","<- RECV_NAME socket read failed (%d)",rlen);
 	goto error;
     }
@@ -1752,28 +2251,24 @@ static int recv_name(int fd,
 	goto error;
     }
 
-    if (!(*flags & DFLAG_EXTENDED_PIDS_PORTS)
-	&& !ei_internal_use_r9_pids_ports()) {
+    if (!(*flags & DFLAG_EXTENDED_PIDS_PORTS)) {
 	EI_TRACE_ERR0("recv_name","<- RECV_NAME peer cannot "
 		      "handle extended pids and ports");
 	erl_errno = EIO;
 	goto error;
     }
-	  
-    if (getpeername(fd, (struct sockaddr *) &sin, &sin_len) < 0) {
-	EI_TRACE_ERR0("recv_name","<- RECV_NAME can't get peername");
-	erl_errno = errno;
-	goto error;
-    }
-    memcpy(namebuf->ipadr, &(sin.sin_addr.s_addr), 
-	sizeof(sin.sin_addr.s_addr));
-    memcpy(namebuf->nodename, s, rlen - 7);
-    namebuf->nodename[rlen - 7] = '\0';
+
+    if (!namebuf)
+        namebuf = &tmp_nodename[0];
+    
+    memcpy(namebuf, s, rlen - 7);
+    namebuf[rlen - 7] = '\0';
+
     if (!is_static)
 	free(buf);
     EI_TRACE_CONN3("recv_name",
 		   "<- RECV_NAME (ok) node = %s, version = %u, flags = %u",
-		   namebuf->nodename,*version,*flags);
+		   namebuf,*version,*flags);
     erl_errno = 0;
     return 0;
     
@@ -1867,3 +2362,4 @@ static int get_cookie(char *buf, int bufsize)
 
     return 1;			/* Success! */
 }
+
diff --git a/lib/erl_interface/src/connect/ei_connect_int.h b/lib/erl_interface/src/connect/ei_connect_int.h
index 0bcccaa84b..b41a5f2b23 100644
--- a/lib/erl_interface/src/connect/ei_connect_int.h
+++ b/lib/erl_interface/src/connect/ei_connect_int.h
@@ -102,6 +102,8 @@ extern int h_errno;
 #define DFLAG_FUN_TAGS            16
 #define DFLAG_NEW_FUN_TAGS        0x80
 #define DFLAG_EXTENDED_PIDS_PORTS 0x100
+#define DFLAG_EXPORT_PTR_TAG      0x200
+#define DFLAG_BIT_BINARIES        0x400
 #define DFLAG_NEW_FLOATS          0x800
 #define DFLAG_SMALL_ATOM_TAGS     0x4000
 #define DFLAG_UTF8_ATOMS          0x10000
diff --git a/lib/erl_interface/src/connect/ei_resolve.c b/lib/erl_interface/src/connect/ei_resolve.c
index 022a43d255..225fddc784 100644
--- a/lib/erl_interface/src/connect/ei_resolve.c
+++ b/lib/erl_interface/src/connect/ei_resolve.c
@@ -57,9 +57,9 @@
 
 #ifdef HAVE_GETHOSTBYNAME_R
 
-void ei_init_resolve(void)
+int ei_init_resolve(void)
 {
-    return;			/* Do nothing */
+    return 0;			/* Do nothing */
 }
 
 #else /* !HAVE_GETHOSTBYNAME_R */
@@ -103,7 +103,7 @@ static int verify_dns_configuration(void);
  * our own, which are just wrappers around hostGetByName() and
  * hostGetByAddr(). Here we look up the functions.
  */
-void ei_init_resolve(void)
+int ei_init_resolve(void)
 {
 
 #ifdef VXWORKS
@@ -134,9 +134,12 @@ void ei_init_resolve(void)
 
 #ifdef _REENTRANT
   ei_gethost_sem = ei_mutex_create();
+  if (!ei_gethost_sem)
+      return ENOMEM;
 #endif /* _REENTRANT */
 
   ei_resolve_initialized = 1;
+  return 0;
 }
 
 #ifdef VXWORKS
@@ -312,9 +315,11 @@ static struct hostent *my_gethostbyname_r(const char *name,
   struct hostent *src;
   struct hostent *rval = NULL;
 
-  /* FIXME this should have been done in 'erl'_init()? */
-  if (!ei_resolve_initialized) ei_init_resolve(); 
-
+  if (!ei_resolve_initialized) {
+    *h_errnop = NO_RECOVERY;
+    return NULL;
+  }
+  
 #ifdef _REENTRANT
   /* === BEGIN critical section === */
   if (ei_mutex_lock(ei_gethost_sem,0) != 0) {
@@ -377,7 +382,10 @@ static struct hostent *my_gethostbyaddr_r(const char *addr,
   struct hostent *rval = NULL;
 
   /* FIXME this should have been done in 'erl'_init()? */
-  if (!ei_resolve_initialized) ei_init_resolve();
+  if (!ei_resolve_initialized) {
+    *h_errnop = NO_RECOVERY;
+    return NULL;
+  }
 
 #ifdef _REENTRANT
   /* === BEGIN critical section === */
diff --git a/lib/erl_interface/src/connect/ei_resolve.h b/lib/erl_interface/src/connect/ei_resolve.h
index 10a49ffbc6..5711d7da76 100644
--- a/lib/erl_interface/src/connect/ei_resolve.h
+++ b/lib/erl_interface/src/connect/ei_resolve.h
@@ -20,6 +20,6 @@
 #ifndef _EI_RESOLVE_H
 #define _EI_RESOLVE_H
 
-void ei_init_resolve(void);
+int ei_init_resolve(void);
 
 #endif /* _EI_RESOLVE_H */
diff --git a/lib/erl_interface/src/connect/eirecv.c b/lib/erl_interface/src/connect/eirecv.c
index 7b9dbfc387..47eea06ced 100644
--- a/lib/erl_interface/src/connect/eirecv.c
+++ b/lib/erl_interface/src/connect/eirecv.c
@@ -60,22 +60,36 @@ ei_recv_internal (int fd,
   int arity;
   int version;
   int index = 0;
-  int i = 0;
-  int res;
+  int err;
   int show_this_msg = 0;
+  ei_socket_callbacks *cbs;
+  void *ctx;
+  ssize_t rlen;
+  unsigned tmo = ms == 0 ? EI_SCLBK_INF_TMO : ms;
+
+  err = EI_GET_CBS_CTX__(&cbs, &ctx, fd);
+  if (err) {
+      EI_CONN_SAVE_ERRNO__(err);
+      return -1;
+  }
 
   /* get length field */
-  if ((res = ei_read_fill_t(fd, header, 4, ms)) != 4) 
-  {
-      erl_errno = (res == -2) ? ETIMEDOUT : EIO;
+  rlen = 4;
+  err = ei_read_fill_ctx_t__(cbs, ctx, header, &rlen, tmo);
+  if (!err && rlen != 4)
+      err = EIO;
+  if (err) {
+      EI_CONN_SAVE_ERRNO__(err);
       return -1;
   }
+  
   len = get32be(s);
 
   /* got tick - respond and return */
   if (!len) {
     char tock[] = {0,0,0,0};
-    ei_write_fill_t(fd, tock, sizeof(tock), ms); /* Failure no problem */
+    ssize_t wlen = sizeof(tock);
+    ei_write_fill_ctx_t__(cbs, ctx, tock, &wlen, tmo); /* Failure no problem */
     *msglenp = 0;
     return 0;			/* maybe flag ERL_EAGAIN [sverkerw] */
   }
@@ -86,9 +100,12 @@ ei_recv_internal (int fd,
   ei_trace(-1,NULL);
   
   /* read enough to get at least entire header */
-  bytesread = (len > EIRECVBUF ? EIRECVBUF : len); 
-  if ((i = ei_read_fill_t(fd,header,bytesread,ms)) != bytesread) {
-      erl_errno = (i == -2) ? ETIMEDOUT : EIO;
+  rlen = bytesread = (len > EIRECVBUF ? EIRECVBUF : len);
+  err = ei_read_fill_ctx_t__(cbs, ctx, header, &rlen, tmo);
+  if (!err && rlen != bytesread)
+      err = EIO;
+  if (err) {
+      EI_CONN_SAVE_ERRNO__(err);
       return -1;
   }
 
@@ -212,12 +229,17 @@ ei_recv_internal (int fd,
    */
   if (msglen > *bufsz) {
     if (staticbufp) {
-      int sz = EIRECVBUF;
       /* flush in rest of packet */
       while (remain > 0) {
-	if (remain < sz) sz = remain;
-	if ((i=ei_read_fill_t(fd,header,sz,ms)) <= 0) break;
-	remain -= i;
+          rlen = remain > EIRECVBUF ? EIRECVBUF : remain;
+          err = ei_read_fill_ctx_t__(cbs, ctx, header, &rlen, tmo);
+          if (err) {
+              EI_CONN_SAVE_ERRNO__(err);
+              return -1;
+          }
+          if (rlen == 0)
+              break;
+          remain -= rlen;
       }
       erl_errno = EMSGSIZE;
       return -1;
@@ -247,11 +269,15 @@ ei_recv_internal (int fd,
 
   /* read the rest of the message into callers buffer */
   if (remain > 0) {
-    if ((i = ei_read_fill_t(fd,mbuf+bytesread-index,remain,ms)) != remain) {
-      *msglenp = bytesread-index+1; /* actual bytes in users buffer */
-      erl_errno = (i == -2) ? ETIMEDOUT : EIO;
-      return -1;
-    }
+      rlen = remain;
+      err = ei_read_fill_ctx_t__(cbs, ctx, mbuf+bytesread-index, &rlen, tmo);
+      if (!err && rlen != remain)
+          err = EIO;
+      if (err) {
+          *msglenp = bytesread-index+1; /* actual bytes in users buffer */
+          EI_CONN_SAVE_ERRNO__(err);
+          return -1;
+      }
   }
 
   if (show_this_msg)
diff --git a/lib/erl_interface/src/connect/send.c b/lib/erl_interface/src/connect/send.c
index 37d7db6d68..d97532d123 100644
--- a/lib/erl_interface/src/connect/send.c
+++ b/lib/erl_interface/src/connect/send.c
@@ -58,10 +58,17 @@ int ei_send_encoded_tmo(int fd, const erlang_pid *to,
     char *s, header[1200]; /* see size calculation below */
     erlang_trace *token = NULL;
     int index = 5; /* reserve 5 bytes for control message */
-    int res;
-#ifdef HAVE_WRITEV
-    struct iovec v[2];
-#endif
+    int err;
+    ei_socket_callbacks *cbs;
+    void *ctx;
+    ssize_t len, tot_len;
+    unsigned tmo = ms == 0 ? EI_SCLBK_INF_TMO : ms;
+
+    err = EI_GET_CBS_CTX__(&cbs, &ctx, fd);
+    if (err) {
+        EI_CONN_SAVE_ERRNO__(err);
+        return ERL_ERROR;
+    }
 
     /* are we tracing? */
     /* check that he can receive trace tokens first */
@@ -91,30 +98,47 @@ int ei_send_encoded_tmo(int fd, const erlang_pid *to,
     if (ei_tracelevel >= 4)
 	ei_show_sendmsg(stderr,header,msg);
 
-#ifdef HAVE_WRITEV
-    
-    v[0].iov_base = (char *)header;
-    v[0].iov_len = index;
-    v[1].iov_base = (char *)msg;
-    v[1].iov_len = msglen;
-    
-    if ((res = ei_writev_fill_t(fd,v,2,ms)) != index+msglen) {
-	erl_errno = (res == -2) ? ETIMEDOUT : EIO;
-	return -1;
-    }
-  
-#else  /* !HAVE_WRITEV */
-  
-    if ((res = ei_write_fill_t(fd,header,index,ms)) != index) { 
-	erl_errno = (res == -2) ? ETIMEDOUT : EIO;
-	return -1;
+
+#ifdef EI_HAVE_STRUCT_IOVEC__
+    if (ei_socket_callbacks_have_writev__(cbs)) {
+        struct iovec v[2];
+
+        v[0].iov_base = (char *)header;
+        v[0].iov_len = index;
+        v[1].iov_base = (char *)msg;
+        v[1].iov_len = msglen;
+
+        len = tot_len = (ssize_t) index+msglen;
+        err = ei_writev_fill_ctx_t__(cbs, ctx, v, 2, &len, tmo);
+        if (!err && len != tot_len)
+            err = EIO;
+        if (err) {
+            EI_CONN_SAVE_ERRNO__(err);
+            return -1;
+        }
+
+        return 0;
     }
-    if ((res = ei_write_fill_t(fd,msg,msglen,ms)) != msglen) { 
-	erl_errno = (res == -2) ? ETIMEDOUT : EIO;
-	return -1;
+#endif /* EI_HAVE_STRUCT_IOVEC__ */
+
+    /* no writev() */
+    len = tot_len = (ssize_t) index;
+    err = ei_write_fill_ctx_t__(cbs, ctx, header, &len, tmo);
+    if (!err && len != tot_len)
+        err = EIO;
+    if (err) {
+        EI_CONN_SAVE_ERRNO__(err);
+        return -1;
     }
 
-#endif  /* !HAVE_WRITEV */
+    len = tot_len = (ssize_t) msglen;
+    err = ei_write_fill_ctx_t__(cbs, ctx, msg, &len, tmo);
+    if (!err && len != tot_len)
+        err = EIO;
+    if (err) {
+        EI_CONN_SAVE_ERRNO__(err);
+        return -1;
+    }
 
     return 0;
 }
diff --git a/lib/erl_interface/src/connect/send_exit.c b/lib/erl_interface/src/connect/send_exit.c
index 2e298e3221..b4f7e14c7f 100644
--- a/lib/erl_interface/src/connect/send_exit.c
+++ b/lib/erl_interface/src/connect/send_exit.c
@@ -55,6 +55,17 @@ int ei_send_exit_tmo(int fd, const erlang_pid *from, const erlang_pid *to,
   char *s;
   int index = 0;
   int len = strlen(reason) + 1080; /* see below */
+  ei_socket_callbacks *cbs;
+  void *ctx;
+  int err;
+  ssize_t wlen;
+  unsigned tmo = ms == 0 ? EI_SCLBK_INF_TMO : ms;
+  
+  err = EI_GET_CBS_CTX__(&cbs, &ctx, fd);
+  if (err) {
+      EI_CONN_SAVE_ERRNO__(err);
+      return ERL_ERROR;
+  }
 
   if (len > EISMALLBUF)
     if (!(dbuf = malloc(len)))
@@ -92,10 +103,16 @@ int ei_send_exit_tmo(int fd, const erlang_pid *from, const erlang_pid *to,
   if (ei_tracelevel >= 4)
       ei_show_sendmsg(stderr,msgbuf,NULL);
 
-  ei_write_fill_t(fd,msgbuf,index,ms); 
-  /* FIXME ignore timeout etc? erl_errno?! */
-
-  if (dbuf) free(dbuf);
+  wlen = (ssize_t) index;
+  err = ei_write_fill_ctx_t__(cbs, ctx, msgbuf, &wlen, tmo);
+  if (!err && wlen != (ssize_t) index)
+      err = EIO;
+  if (dbuf)
+      free(dbuf);
+  if (err) {
+      EI_CONN_SAVE_ERRNO__(err);
+      return ERL_ERROR;
+  }
   return 0;
 }
 
diff --git a/lib/erl_interface/src/connect/send_reg.c b/lib/erl_interface/src/connect/send_reg.c
index 62478f042d..80d61e57b5 100644
--- a/lib/erl_interface/src/connect/send_reg.c
+++ b/lib/erl_interface/src/connect/send_reg.c
@@ -51,11 +51,17 @@ int ei_send_reg_encoded_tmo(int fd, const erlang_pid *from,
     char *s, header[1400]; /* see size calculation below */
     erlang_trace *token = NULL;
     int index = 5; /* reserve 5 bytes for control message */
-    int res;
+    int err;
+    ei_socket_callbacks *cbs;
+    void *ctx;
+    ssize_t len, tot_len;
+    unsigned tmo = ms == 0 ? EI_SCLBK_INF_TMO : ms;
 
-#ifdef HAVE_WRITEV
-    struct iovec v[2];
-#endif
+    err = EI_GET_CBS_CTX__(&cbs, &ctx, fd);
+    if (err) {
+        EI_CONN_SAVE_ERRNO__(err);
+        return ERL_ERROR;
+    }
     
     /* are we tracing? */
     /* check that he can receive trace tokens first */
@@ -86,29 +92,45 @@ int ei_send_reg_encoded_tmo(int fd, const erlang_pid *from,
     if (ei_tracelevel >= 4) 
 	ei_show_sendmsg(stderr,header,msg);
 
-#ifdef HAVE_WRITEV
+#ifdef EI_HAVE_STRUCT_IOVEC__
+    if (ei_socket_callbacks_have_writev__(cbs)) {
+        struct iovec v[2];
 
-    v[0].iov_base = (char *)header;
-    v[0].iov_len = index;
-    v[1].iov_base = (char *)msg;
-    v[1].iov_len = msglen;
+        v[0].iov_base = (char *)header;
+        v[0].iov_len = index;
+        v[1].iov_base = (char *)msg;
+        v[1].iov_len = msglen;
     
-    if ((res = ei_writev_fill_t(fd,v,2,ms)) != index+msglen) {
-	erl_errno = (res == -2) ? ETIMEDOUT : EIO;
-	return -1;
+        len = tot_len = (ssize_t) index+msglen;
+        err = ei_writev_fill_ctx_t__(cbs, ctx, v, 2, &len, tmo);
+        if (!err && len != tot_len)
+            err = EIO;
+        if (err) {
+            EI_CONN_SAVE_ERRNO__(err);
+            return -1;
+        }
+        return 0;
     }
-#else
-    
+#endif /* EI_HAVE_STRUCT_IOVEC__ */
+
     /* no writev() */
-    if ((res = ei_write_fill_t(fd,header,index,ms)) != index) {
-	erl_errno = (res == -2) ? ETIMEDOUT : EIO;
-	return -1;
+    len = tot_len = (ssize_t) index;
+    err = ei_write_fill_ctx_t__(cbs, ctx, header, &len, tmo);
+    if (!err && len != tot_len)
+        err = EIO;
+    if (err) {
+        EI_CONN_SAVE_ERRNO__(err);
+        return -1;
     }
-    if ((res = ei_write_fill_t(fd,msg,msglen,ms)) != msglen) {
-	erl_errno = (res == -2) ? ETIMEDOUT : EIO;
-	return -1;
+
+    len = tot_len = (ssize_t) msglen;
+    err = ei_write_fill_ctx_t__(cbs, ctx, msg, &len, tmo);
+    if (!err && len != tot_len)
+        err = EIO;
+    if (err) {
+        EI_CONN_SAVE_ERRNO__(err);
+        return -1;
     }
-#endif
     
     return 0;
 }
diff --git a/lib/erl_interface/src/decode/decode_binary.c b/lib/erl_interface/src/decode/decode_binary.c
index 5b8d234984..0d28c67230 100644
--- a/lib/erl_interface/src/decode/decode_binary.c
+++ b/lib/erl_interface/src/decode/decode_binary.c
@@ -40,4 +40,41 @@ int ei_decode_binary(const char *buf, int *index, void *p, long *lenp)
   return 0; 
 }
 
+int ei_decode_bitstring(const char *buf, int *index,
+                        const char** pp,
+                        unsigned int* bitoffsp,
+                        size_t *nbitsp)
+{
+    const char *s = buf + *index;
+    const char *s0 = s;
+    unsigned char last_bits;
+    const unsigned char tag = get8(s);
+    size_t len = get32be(s);
+
+    switch(tag) {
+    case ERL_BINARY_EXT:
+        if (nbitsp)
+            *nbitsp = len * 8;
+        break;
+    case ERL_BIT_BINARY_EXT:
+        last_bits = get8(s);
+        if (((last_bits==0) != (len==0)) || last_bits > 8)
+            return -1;
+
+        if (nbitsp)
+            *nbitsp = (len == 0) ? 0 : ((len-1) * 8) + last_bits;
+        break;
+    default:
+        return -1;
+    }
+
+    if (pp)
+        *pp = s;
+    if (bitoffsp)
+        *bitoffsp = 0;
+
+    s += len;
+    *index += s-s0;
+    return 0;
+}
 
diff --git a/lib/erl_interface/src/decode/decode_fun.c b/lib/erl_interface/src/decode/decode_fun.c
index f944c028af..db71007505 100644
--- a/lib/erl_interface/src/decode/decode_fun.c
+++ b/lib/erl_interface/src/decode/decode_fun.c
@@ -33,22 +33,20 @@ int ei_decode_fun(const char *buf, int *index, erlang_fun *p)
     int i, ix, ix0, n;
     erlang_pid* p_pid;
     char* p_module;
-    erlang_char_encoding* p_module_org_enc;
     long* p_index;
     long* p_uniq;
     long* p_old_index;
 
     if (p != NULL) {
-	p_pid = &p->pid;
+	p_pid = &p->u.closure.pid;
 	p_module = &p->module[0];
-	p_module_org_enc = &p->module_org_enc;
-	p_index = &p->index;
-	p_uniq = &p->uniq;
-	p_old_index = &p->old_index;
+	p_index = &p->u.closure.index;
+	p_uniq = &p->u.closure.uniq;
+	p_old_index = &p->u.closure.old_index;
     }
     else {
-	p_pid = NULL; p_module = NULL; p_module_org_enc = NULL;
 	p_index = NULL; p_uniq = NULL; p_old_index = NULL;
+	p_pid = NULL; p_module = NULL;
     }
 
     switch (get8(s)) {
@@ -63,7 +61,7 @@ int ei_decode_fun(const char *buf, int *index, erlang_fun *p)
 	    return -1;
 	/* then the module (atom) */
 	if (ei_decode_atom_as(s, &ix, p_module, MAXATOMLEN_UTF8, ERLANG_UTF8,
-			      p_module_org_enc, NULL) < 0)
+                              NULL, NULL) < 0)
 	    return -1;
 	/* then the index */
 	if (ei_decode_long(s, &ix, p_index) < 0)
@@ -78,11 +76,13 @@ int ei_decode_fun(const char *buf, int *index, erlang_fun *p)
 		return -1;
 	}
 	if (p != NULL) {
-	    p->n_free_vars = n;
-	    p->free_var_len = ix - ix0;
-	    p->free_vars = ei_malloc(ix - ix0);
-	    if (!(p->free_vars)) return -1;
-	    memcpy(p->free_vars, s + ix0, ix - ix0);
+	    p->u.closure.n_free_vars = n;
+            p->u.closure.free_var_len = ix - ix0;
+            if (p->u.closure.free_var_len > 0) {
+                p->u.closure.free_vars = ei_malloc(p->u.closure.free_var_len);
+                if (!(p->u.closure.free_vars)) return -1;
+                memcpy(p->u.closure.free_vars, s + ix0, p->u.closure.free_var_len);
+            }
 	}
 	s += ix;
 	*index += s-s0;
@@ -93,20 +93,23 @@ int ei_decode_fun(const char *buf, int *index, erlang_fun *p)
 	n = get32be(s);
 	/* then the arity */
 	i = get8(s);
-	if (p != NULL) p->arity = i;
-	/* then md5 */
-	if (p != NULL) memcpy(p->md5, s, 16);
+	if (p != NULL) {
+            p->type = EI_FUN_CLOSURE;
+            p->arity = i;
+            /* then md5 */
+            memcpy(p->u.closure.md5, s, 16);
+        }
 	s += 16;
 	/* then index */
 	i = get32be(s);
-	if (p != NULL) p->index = i;
+	if (p != NULL) p->u.closure.index = i;
 	/* then the number of free vars (environment) */
 	i = get32be(s);
-	if (p != NULL) p->n_free_vars = i;
+	if (p != NULL) p->u.closure.n_free_vars = i;
 	/* then the module (atom) */
 	ix = 0;
 	if (ei_decode_atom_as(s, &ix, p_module, MAXATOMLEN_UTF8, ERLANG_UTF8,
-			      p_module_org_enc, NULL) < 0)
+                              NULL, NULL) < 0)
 	    return -1;
 	/* then the old_index */
 	if (ei_decode_long(s, &ix, p_old_index) < 0)
@@ -122,17 +125,59 @@ int ei_decode_fun(const char *buf, int *index, erlang_fun *p)
 	n = n - (s - s0) + 1;
 	if (n < 0) return -1;
 	if (p != NULL) {
-	    p->free_var_len = n;
+	    p->u.closure.free_var_len = n;
 	    if (n > 0) {
-		p->free_vars = malloc(n);
-		if (!(p->free_vars)) return -1;
-		memcpy(p->free_vars, s, n);
+		p->u.closure.free_vars = malloc(n);
+		if (!(p->u.closure.free_vars)) return -1;
+		memcpy(p->u.closure.free_vars, s, n);
 	    }
 	}
 	s += n;
 	*index += s-s0;
         return 0;
 	break;
+    case ERL_EXPORT_EXT: {
+        char* p_func;
+        long* p_arity;
+        int used;
+
+        if (p) {
+            p->type = EI_FUN_EXPORT;
+            p_arity = &p->arity;
+        }
+        else {
+            p_arity = NULL;
+        }
+	ix = 0;
+        if (ei_decode_atom_as(s, &ix, p_module, MAXATOMLEN_UTF8, ERLANG_UTF8,
+                              NULL, NULL) < 0)
+            return -1;
+        if (p) {
+            /* try use module buffer for function name */
+            used = strlen(p->module) + 1;
+            p_func = p->module + used;
+            p->u.exprt.func = p_func;
+            p->u.exprt.func_allocated = 0;
+        }
+        else {
+            used = 0;
+            p_func = NULL;
+        }
+        while (ei_decode_atom_as(s, &ix, p_func, MAXATOMLEN_UTF8-used,
+                                 ERLANG_UTF8, NULL, NULL) < 0) {
+            if (!used)
+                return -1;
+            p_func = malloc(MAXATOMLEN_UTF8);
+            p->u.exprt.func = p_func;
+            p->u.exprt.func_allocated = 1;
+            used = 0;
+        }
+        if (ei_decode_long(s, &ix, p_arity) < 0)
+            return -1;
+	s += ix;
+	*index += s - s0;
+        return 0;
+    }
     default:
 	return -1;
     }
@@ -140,6 +185,14 @@ int ei_decode_fun(const char *buf, int *index, erlang_fun *p)
 
 void free_fun(erlang_fun* f)
 {
-  if (f->free_var_len > 0)
-      ei_free(f->free_vars);
+    switch (f->type) {
+    case EI_FUN_CLOSURE:
+        if (f->u.closure.free_var_len > 0)
+            ei_free(f->u.closure.free_vars);
+        break;
+    case EI_FUN_EXPORT:
+        if (f->u.exprt.func_allocated)
+            ei_free(f->u.exprt.func);
+        break;
+    }
 }
diff --git a/lib/erl_interface/src/decode/decode_skip.c b/lib/erl_interface/src/decode/decode_skip.c
index 0db315f09b..0622ce7d59 100644
--- a/lib/erl_interface/src/decode/decode_skip.c
+++ b/lib/erl_interface/src/decode/decode_skip.c
@@ -27,7 +27,7 @@ int ei_skip_term(const char* buf, int* index)
 
     /* ASSERT(ep != NULL); */
 
-    ei_get_type_internal(buf, index, &ty, &n);
+    ei_get_type(buf, index, &ty, &n);
     switch (ty) {
     case ERL_ATOM_EXT:
 	/* FIXME: what if some weird locale is in use? */
@@ -54,7 +54,7 @@ int ei_skip_term(const char* buf, int* index)
 	if (ei_decode_list_header(buf, index, &n) < 0) return -1;
 	for (i = 0; i < n; ++i)
 	    ei_skip_term(buf, index);
-	if (ei_get_type_internal(buf, index, &ty, &n) < 0) return -1;
+	if (ei_get_type(buf, index, &ty, &n) < 0) return -1;
 	if (ty != ERL_NIL_EXT)
 	    ei_skip_term(buf, index);
 	else
@@ -79,6 +79,10 @@ int ei_skip_term(const char* buf, int* index)
 	if (ei_decode_binary(buf, index, NULL, NULL) < 0)
 	    return -1;
 	break;
+    case ERL_BIT_BINARY_EXT:
+        if (ei_decode_bitstring(buf, index, NULL, NULL, NULL) < 0)
+            return -1;
+        break;
     case ERL_SMALL_INTEGER_EXT:
     case ERL_INTEGER_EXT:
 	if (ei_decode_long(buf, index, NULL) < 0) return -1;
@@ -93,6 +97,7 @@ int ei_skip_term(const char* buf, int* index)
 	break;
     case ERL_FUN_EXT:
     case ERL_NEW_FUN_EXT:
+    case ERL_EXPORT_EXT:
 	if (ei_decode_fun(buf, index, NULL) < 0) return -1;
 	break;
     default:
diff --git a/lib/erl_interface/src/depend.mk b/lib/erl_interface/src/depend.mk
deleted file mode 100644
index af753046e5..0000000000
--- a/lib/erl_interface/src/depend.mk
+++ /dev/null
@@ -1,1133 +0,0 @@
-# Generated dependency rules
-$(ST_OBJDIR)/ei_connect.o: connect/ei_connect.c $(TARGET)/config.h \
-  misc/eidef.h ../include/ei.h misc/eiext.h misc/ei_portio.h \
-  misc/ei_internal.h connect/ei_connect_int.h misc/ei_locking.h \
-  connect/eisend.h connect/eirecv.h misc/eimd5.h misc/putget.h \
-  connect/ei_resolve.h epmd/ei_epmd.h
-$(ST_OBJDIR)/ei_resolve.o: connect/ei_resolve.c $(TARGET)/config.h \
-  misc/eidef.h ../include/ei.h connect/ei_resolve.h misc/ei_locking.h
-$(ST_OBJDIR)/eirecv.o: connect/eirecv.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/eiext.h connect/eirecv.h misc/ei_portio.h \
-  misc/ei_internal.h misc/putget.h misc/ei_trace.h misc/show_msg.h
-$(ST_OBJDIR)/send.o: connect/send.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/eiext.h connect/eisend.h misc/putget.h \
-  connect/ei_connect_int.h misc/ei_internal.h misc/ei_trace.h \
-  misc/show_msg.h
-$(ST_OBJDIR)/send_exit.o: connect/send_exit.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  connect/eisend.h connect/ei_connect_int.h misc/ei_trace.h \
-  misc/ei_internal.h misc/putget.h misc/show_msg.h
-$(ST_OBJDIR)/send_reg.o: connect/send_reg.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/eiext.h connect/eisend.h misc/putget.h \
-  connect/ei_connect_int.h misc/ei_internal.h misc/ei_trace.h \
-  misc/show_msg.h
-$(ST_OBJDIR)/decode_atom.o: decode/decode_atom.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/decode_big.o: decode/decode_big.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/decode_bignum.o: decode/decode_bignum.c $(TARGET)/config.h
-$(ST_OBJDIR)/decode_binary.o: decode/decode_binary.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/decode_boolean.o: decode/decode_boolean.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/decode_char.o: decode/decode_char.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/decode_double.o: decode/decode_double.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/decode_fun.o: decode/decode_fun.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/ei_malloc.h decode/decode_skip.h misc/putget.h
-$(ST_OBJDIR)/decode_intlist.o: decode/decode_intlist.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/decode_list_header.o: decode/decode_list_header.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/decode_long.o: decode/decode_long.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/decode_pid.o: decode/decode_pid.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/decode_port.o: decode/decode_port.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/decode_ref.o: decode/decode_ref.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/decode_skip.o: decode/decode_skip.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  decode/decode_skip.h
-$(ST_OBJDIR)/decode_string.o: decode/decode_string.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/decode_trace.o: decode/decode_trace.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/putget.h
-$(ST_OBJDIR)/decode_tuple_header.o: decode/decode_tuple_header.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/decode_ulong.o: decode/decode_ulong.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/decode_version.o: decode/decode_version.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/decode_longlong.o: decode/decode_longlong.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/decode_ulonglong.o: decode/decode_ulonglong.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/encode_atom.o: encode/encode_atom.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/encode_bignum.o: encode/encode_bignum.c $(TARGET)/config.h
-$(ST_OBJDIR)/encode_binary.o: encode/encode_binary.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/encode_boolean.o: encode/encode_boolean.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/encode_char.o: encode/encode_char.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/encode_double.o: encode/encode_double.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/encode_fun.o: encode/encode_fun.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/encode_list_header.o: encode/encode_list_header.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/encode_long.o: encode/encode_long.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/encode_pid.o: encode/encode_pid.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/encode_port.o: encode/encode_port.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/encode_ref.o: encode/encode_ref.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/encode_string.o: encode/encode_string.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/encode_trace.o: encode/encode_trace.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/putget.h
-$(ST_OBJDIR)/encode_tuple_header.o: encode/encode_tuple_header.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/encode_ulong.o: encode/encode_ulong.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/encode_version.o: encode/encode_version.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(ST_OBJDIR)/encode_longlong.o: encode/encode_longlong.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h misc/ei_x_encode.h
-$(ST_OBJDIR)/encode_ulonglong.o: encode/encode_ulonglong.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h misc/ei_x_encode.h
-$(ST_OBJDIR)/epmd_port.o: epmd/epmd_port.c misc/ei_internal.h epmd/ei_epmd.h \
-  misc/putget.h
-$(ST_OBJDIR)/epmd_publish.o: epmd/epmd_publish.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/ei_internal.h \
-  misc/putget.h ../include/erl_interface.h epmd/ei_epmd.h
-$(ST_OBJDIR)/epmd_unpublish.o: epmd/epmd_unpublish.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/ei_internal.h \
-  misc/putget.h ../include/erl_interface.h epmd/ei_epmd.h
-$(ST_OBJDIR)/ei_decode_term.o: misc/ei_decode_term.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/ei_decode_term.h misc/putget.h
-$(ST_OBJDIR)/ei_format.o: misc/ei_format.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/ei_malloc.h misc/ei_format.h
-$(ST_OBJDIR)/ei_locking.o: misc/ei_locking.c $(TARGET)/config.h \
-  misc/ei_malloc.h misc/ei_locking.h
-$(ST_OBJDIR)/ei_malloc.o: misc/ei_malloc.c misc/ei_malloc.h
-$(ST_OBJDIR)/ei_portio.o: misc/ei_portio.c misc/ei_portio.h misc/ei_internal.h
-$(ST_OBJDIR)/ei_printterm.o: misc/ei_printterm.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/ei_printterm.h misc/ei_malloc.h
-$(ST_OBJDIR)/ei_pthreads.o: misc/ei_pthreads.c $(TARGET)/config.h \
-  ../include/ei.h misc/ei_locking.h
-$(ST_OBJDIR)/ei_trace.o: misc/ei_trace.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/ei_trace.h
-$(ST_OBJDIR)/ei_x_encode.o: misc/ei_x_encode.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/ei_x_encode.h \
-  misc/ei_malloc.h
-$(ST_OBJDIR)/eimd5.o: misc/eimd5.c misc/eimd5.h
-$(ST_OBJDIR)/get_type.o: misc/get_type.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/eiext.h misc/putget.h
-$(ST_OBJDIR)/show_msg.o: misc/show_msg.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/eiext.h misc/putget.h misc/ei_printterm.h \
-  misc/ei_internal.h misc/show_msg.h
-$(ST_OBJDIR)/ei_compat.o: misc/ei_compat.c ../include/ei.h misc/ei_internal.h
-$(ST_OBJDIR)/hash_dohash.o: registry/hash_dohash.c registry/hash.h ../include/ei.h
-$(ST_OBJDIR)/hash_foreach.o: registry/hash_foreach.c registry/hash.h ../include/ei.h
-$(ST_OBJDIR)/hash_freetab.o: registry/hash_freetab.c registry/hash.h ../include/ei.h
-$(ST_OBJDIR)/hash_insert.o: registry/hash_insert.c registry/hash.h ../include/ei.h
-$(ST_OBJDIR)/hash_isprime.o: registry/hash_isprime.c registry/hash.h ../include/ei.h
-$(ST_OBJDIR)/hash_lookup.o: registry/hash_lookup.c registry/hash.h ../include/ei.h
-$(ST_OBJDIR)/hash_newtab.o: registry/hash_newtab.c registry/hash.h ../include/ei.h
-$(ST_OBJDIR)/hash_remove.o: registry/hash_remove.c registry/hash.h ../include/ei.h
-$(ST_OBJDIR)/hash_resize.o: registry/hash_resize.c registry/hash.h ../include/ei.h
-$(ST_OBJDIR)/hash_rlookup.o: registry/hash_rlookup.c registry/hash.h ../include/ei.h
-$(ST_OBJDIR)/reg_close.o: registry/reg_close.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(ST_OBJDIR)/reg_delete.o: registry/reg_delete.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(ST_OBJDIR)/reg_dirty.o: registry/reg_dirty.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(ST_OBJDIR)/reg_dump.o: registry/reg_dump.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  registry/reg.h registry/hash.h connect/eisend.h connect/eirecv.h \
-  connect/ei_connect_int.h
-$(ST_OBJDIR)/reg_free.o: registry/reg_free.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(ST_OBJDIR)/reg_get.o: registry/reg_get.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(ST_OBJDIR)/reg_getf.o: registry/reg_getf.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(ST_OBJDIR)/reg_geti.o: registry/reg_geti.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(ST_OBJDIR)/reg_getp.o: registry/reg_getp.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(ST_OBJDIR)/reg_gets.o: registry/reg_gets.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(ST_OBJDIR)/reg_make.o: registry/reg_make.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(ST_OBJDIR)/reg_open.o: registry/reg_open.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(ST_OBJDIR)/reg_purge.o: registry/reg_purge.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(ST_OBJDIR)/reg_resize.o: registry/reg_resize.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(ST_OBJDIR)/reg_restore.o: registry/reg_restore.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  registry/reg.h registry/hash.h connect/eisend.h connect/eirecv.h \
-  connect/ei_connect_int.h
-$(ST_OBJDIR)/reg_set.o: registry/reg_set.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(ST_OBJDIR)/reg_setf.o: registry/reg_setf.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(ST_OBJDIR)/reg_seti.o: registry/reg_seti.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(ST_OBJDIR)/reg_setp.o: registry/reg_setp.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(ST_OBJDIR)/reg_sets.o: registry/reg_sets.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(ST_OBJDIR)/reg_stat.o: registry/reg_stat.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(ST_OBJDIR)/reg_tabstat.o: registry/reg_tabstat.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(ST_OBJDIR)/decode_term.o: legacy/decode_term.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h ../include/erl_interface.h
-$(ST_OBJDIR)/encode_term.o: legacy/encode_term.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h misc/ei_x_encode.h ../include/erl_interface.h \
-  legacy/erl_marshal.h legacy/erl_eterm.h legacy/portability.h
-$(ST_OBJDIR)/erl_connect.o: legacy/erl_connect.c $(TARGET)/config.h \
-  ../include/erl_interface.h ../include/ei.h legacy/erl_config.h \
-  legacy/erl_connect.h legacy/erl_eterm.h legacy/portability.h \
-  legacy/erl_malloc.h misc/putget.h connect/ei_connect_int.h \
-  misc/ei_locking.h epmd/ei_epmd.h misc/ei_internal.h
-$(ST_OBJDIR)/erl_error.o: legacy/erl_error.c $(TARGET)/config.h \
-  ../include/erl_interface.h ../include/ei.h legacy/erl_error.h
-$(ST_OBJDIR)/erl_eterm.o: legacy/erl_eterm.c misc/ei_locking.h \
-  $(TARGET)/config.h connect/ei_resolve.h \
-  ../include/erl_interface.h ../include/ei.h legacy/erl_eterm.h \
-  legacy/portability.h legacy/erl_malloc.h legacy/erl_marshal.h \
-  legacy/erl_error.h legacy/erl_internal.h misc/ei_internal.h
-$(ST_OBJDIR)/erl_fix_alloc.o: legacy/erl_fix_alloc.c $(TARGET)/config.h \
-  misc/ei_locking.h ../include/erl_interface.h ../include/ei.h \
-  legacy/erl_error.h legacy/erl_malloc.h legacy/erl_fix_alloc.h \
-  legacy/erl_eterm.h legacy/portability.h
-$(ST_OBJDIR)/erl_format.o: legacy/erl_format.c ../include/erl_interface.h \
-  ../include/ei.h legacy/erl_eterm.h legacy/portability.h \
-  legacy/erl_malloc.h legacy/erl_error.h legacy/erl_internal.h
-$(ST_OBJDIR)/erl_malloc.o: legacy/erl_malloc.c ../include/erl_interface.h \
-  ../include/ei.h legacy/erl_fix_alloc.h legacy/erl_malloc.h \
-  legacy/erl_internal.h legacy/erl_eterm.h legacy/portability.h \
-  misc/ei_malloc.h
-$(ST_OBJDIR)/erl_marshal.o: legacy/erl_marshal.c $(TARGET)/config.h \
-  ../include/erl_interface.h ../include/ei.h legacy/erl_marshal.h \
-  legacy/erl_eterm.h legacy/portability.h legacy/erl_malloc.h \
-  legacy/erl_error.h legacy/erl_internal.h misc/eiext.h misc/putget.h
-$(ST_OBJDIR)/erl_timeout.o: legacy/erl_timeout.c $(TARGET)/config.h \
-  legacy/erl_timeout.h
-$(ST_OBJDIR)/global_names.o: legacy/global_names.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  connect/eisend.h connect/eirecv.h connect/ei_connect_int.h \
-  ../include/erl_interface.h legacy/erl_connect.h
-$(ST_OBJDIR)/global_register.o: legacy/global_register.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  connect/eisend.h connect/eirecv.h ../include/erl_interface.h
-$(ST_OBJDIR)/global_unregister.o: legacy/global_unregister.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  connect/eisend.h connect/eirecv.h connect/ei_connect_int.h \
-  ../include/erl_interface.h legacy/erl_connect.h
-$(ST_OBJDIR)/global_whereis.o: legacy/global_whereis.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  connect/eisend.h connect/eirecv.h connect/ei_connect_int.h \
-  ../include/erl_interface.h legacy/erl_connect.h
-
-$(MT_OBJDIR)/ei_connect.o: connect/ei_connect.c $(TARGET)/config.h \
-  misc/eidef.h ../include/ei.h misc/eiext.h misc/ei_portio.h \
-  misc/ei_internal.h connect/ei_connect_int.h misc/ei_locking.h \
-  connect/eisend.h connect/eirecv.h misc/eimd5.h misc/putget.h \
-  connect/ei_resolve.h epmd/ei_epmd.h
-$(MT_OBJDIR)/ei_resolve.o: connect/ei_resolve.c $(TARGET)/config.h \
-  misc/eidef.h ../include/ei.h connect/ei_resolve.h misc/ei_locking.h
-$(MT_OBJDIR)/eirecv.o: connect/eirecv.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/eiext.h connect/eirecv.h misc/ei_portio.h \
-  misc/ei_internal.h misc/putget.h misc/ei_trace.h misc/show_msg.h
-$(MT_OBJDIR)/send.o: connect/send.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/eiext.h connect/eisend.h misc/putget.h \
-  connect/ei_connect_int.h misc/ei_internal.h misc/ei_trace.h \
-  misc/show_msg.h
-$(MT_OBJDIR)/send_exit.o: connect/send_exit.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  connect/eisend.h connect/ei_connect_int.h misc/ei_trace.h \
-  misc/ei_internal.h misc/putget.h misc/show_msg.h
-$(MT_OBJDIR)/send_reg.o: connect/send_reg.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/eiext.h connect/eisend.h misc/putget.h \
-  connect/ei_connect_int.h misc/ei_internal.h misc/ei_trace.h \
-  misc/show_msg.h
-$(MT_OBJDIR)/decode_atom.o: decode/decode_atom.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/decode_big.o: decode/decode_big.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/decode_bignum.o: decode/decode_bignum.c $(TARGET)/config.h
-$(MT_OBJDIR)/decode_binary.o: decode/decode_binary.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/decode_boolean.o: decode/decode_boolean.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/decode_char.o: decode/decode_char.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/decode_double.o: decode/decode_double.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/decode_fun.o: decode/decode_fun.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/ei_malloc.h decode/decode_skip.h misc/putget.h
-$(MT_OBJDIR)/decode_intlist.o: decode/decode_intlist.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/decode_list_header.o: decode/decode_list_header.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/decode_long.o: decode/decode_long.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/decode_pid.o: decode/decode_pid.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/decode_port.o: decode/decode_port.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/decode_ref.o: decode/decode_ref.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/decode_skip.o: decode/decode_skip.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  decode/decode_skip.h
-$(MT_OBJDIR)/decode_string.o: decode/decode_string.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/decode_trace.o: decode/decode_trace.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/putget.h
-$(MT_OBJDIR)/decode_tuple_header.o: decode/decode_tuple_header.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/decode_ulong.o: decode/decode_ulong.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/decode_version.o: decode/decode_version.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/decode_longlong.o: decode/decode_longlong.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/decode_ulonglong.o: decode/decode_ulonglong.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/encode_atom.o: encode/encode_atom.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/encode_bignum.o: encode/encode_bignum.c $(TARGET)/config.h
-$(MT_OBJDIR)/encode_binary.o: encode/encode_binary.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/encode_boolean.o: encode/encode_boolean.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/encode_char.o: encode/encode_char.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/encode_double.o: encode/encode_double.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/encode_fun.o: encode/encode_fun.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/encode_list_header.o: encode/encode_list_header.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/encode_long.o: encode/encode_long.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/encode_pid.o: encode/encode_pid.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/encode_port.o: encode/encode_port.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/encode_ref.o: encode/encode_ref.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/encode_string.o: encode/encode_string.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/encode_trace.o: encode/encode_trace.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/putget.h
-$(MT_OBJDIR)/encode_tuple_header.o: encode/encode_tuple_header.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/encode_ulong.o: encode/encode_ulong.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/encode_version.o: encode/encode_version.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MT_OBJDIR)/encode_longlong.o: encode/encode_longlong.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h misc/ei_x_encode.h
-$(MT_OBJDIR)/encode_ulonglong.o: encode/encode_ulonglong.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h misc/ei_x_encode.h
-$(MT_OBJDIR)/epmd_port.o: epmd/epmd_port.c misc/ei_internal.h epmd/ei_epmd.h \
-  misc/putget.h
-$(MT_OBJDIR)/epmd_publish.o: epmd/epmd_publish.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/ei_internal.h \
-  misc/putget.h ../include/erl_interface.h epmd/ei_epmd.h
-$(MT_OBJDIR)/epmd_unpublish.o: epmd/epmd_unpublish.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/ei_internal.h \
-  misc/putget.h ../include/erl_interface.h epmd/ei_epmd.h
-$(MT_OBJDIR)/ei_decode_term.o: misc/ei_decode_term.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/ei_decode_term.h misc/putget.h
-$(MT_OBJDIR)/ei_format.o: misc/ei_format.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/ei_malloc.h misc/ei_format.h
-$(MT_OBJDIR)/ei_locking.o: misc/ei_locking.c $(TARGET)/config.h \
-  misc/ei_malloc.h misc/ei_locking.h
-$(MT_OBJDIR)/ei_malloc.o: misc/ei_malloc.c misc/ei_malloc.h
-$(MT_OBJDIR)/ei_portio.o: misc/ei_portio.c misc/ei_portio.h misc/ei_internal.h
-$(MT_OBJDIR)/ei_printterm.o: misc/ei_printterm.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/ei_printterm.h misc/ei_malloc.h
-$(MT_OBJDIR)/ei_pthreads.o: misc/ei_pthreads.c $(TARGET)/config.h \
-  ../include/ei.h misc/ei_locking.h
-$(MT_OBJDIR)/ei_trace.o: misc/ei_trace.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/ei_trace.h
-$(MT_OBJDIR)/ei_x_encode.o: misc/ei_x_encode.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/ei_x_encode.h \
-  misc/ei_malloc.h
-$(MT_OBJDIR)/eimd5.o: misc/eimd5.c misc/eimd5.h
-$(MT_OBJDIR)/get_type.o: misc/get_type.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/eiext.h misc/putget.h
-$(MT_OBJDIR)/show_msg.o: misc/show_msg.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/eiext.h misc/putget.h misc/ei_printterm.h \
-  misc/ei_internal.h misc/show_msg.h
-$(MT_OBJDIR)/ei_compat.o: misc/ei_compat.c ../include/ei.h misc/ei_internal.h
-$(MT_OBJDIR)/hash_dohash.o: registry/hash_dohash.c registry/hash.h ../include/ei.h
-$(MT_OBJDIR)/hash_foreach.o: registry/hash_foreach.c registry/hash.h ../include/ei.h
-$(MT_OBJDIR)/hash_freetab.o: registry/hash_freetab.c registry/hash.h ../include/ei.h
-$(MT_OBJDIR)/hash_insert.o: registry/hash_insert.c registry/hash.h ../include/ei.h
-$(MT_OBJDIR)/hash_isprime.o: registry/hash_isprime.c registry/hash.h ../include/ei.h
-$(MT_OBJDIR)/hash_lookup.o: registry/hash_lookup.c registry/hash.h ../include/ei.h
-$(MT_OBJDIR)/hash_newtab.o: registry/hash_newtab.c registry/hash.h ../include/ei.h
-$(MT_OBJDIR)/hash_remove.o: registry/hash_remove.c registry/hash.h ../include/ei.h
-$(MT_OBJDIR)/hash_resize.o: registry/hash_resize.c registry/hash.h ../include/ei.h
-$(MT_OBJDIR)/hash_rlookup.o: registry/hash_rlookup.c registry/hash.h ../include/ei.h
-$(MT_OBJDIR)/reg_close.o: registry/reg_close.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MT_OBJDIR)/reg_delete.o: registry/reg_delete.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MT_OBJDIR)/reg_dirty.o: registry/reg_dirty.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MT_OBJDIR)/reg_dump.o: registry/reg_dump.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  registry/reg.h registry/hash.h connect/eisend.h connect/eirecv.h \
-  connect/ei_connect_int.h
-$(MT_OBJDIR)/reg_free.o: registry/reg_free.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MT_OBJDIR)/reg_get.o: registry/reg_get.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MT_OBJDIR)/reg_getf.o: registry/reg_getf.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MT_OBJDIR)/reg_geti.o: registry/reg_geti.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MT_OBJDIR)/reg_getp.o: registry/reg_getp.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MT_OBJDIR)/reg_gets.o: registry/reg_gets.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MT_OBJDIR)/reg_make.o: registry/reg_make.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MT_OBJDIR)/reg_open.o: registry/reg_open.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MT_OBJDIR)/reg_purge.o: registry/reg_purge.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MT_OBJDIR)/reg_resize.o: registry/reg_resize.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MT_OBJDIR)/reg_restore.o: registry/reg_restore.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  registry/reg.h registry/hash.h connect/eisend.h connect/eirecv.h \
-  connect/ei_connect_int.h
-$(MT_OBJDIR)/reg_set.o: registry/reg_set.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MT_OBJDIR)/reg_setf.o: registry/reg_setf.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MT_OBJDIR)/reg_seti.o: registry/reg_seti.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MT_OBJDIR)/reg_setp.o: registry/reg_setp.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MT_OBJDIR)/reg_sets.o: registry/reg_sets.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MT_OBJDIR)/reg_stat.o: registry/reg_stat.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MT_OBJDIR)/reg_tabstat.o: registry/reg_tabstat.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MT_OBJDIR)/decode_term.o: legacy/decode_term.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h ../include/erl_interface.h
-$(MT_OBJDIR)/encode_term.o: legacy/encode_term.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h misc/ei_x_encode.h ../include/erl_interface.h \
-  legacy/erl_marshal.h legacy/erl_eterm.h legacy/portability.h
-$(MT_OBJDIR)/erl_connect.o: legacy/erl_connect.c $(TARGET)/config.h \
-  ../include/erl_interface.h ../include/ei.h legacy/erl_config.h \
-  legacy/erl_connect.h legacy/erl_eterm.h legacy/portability.h \
-  legacy/erl_malloc.h misc/putget.h connect/ei_connect_int.h \
-  misc/ei_locking.h epmd/ei_epmd.h misc/ei_internal.h
-$(MT_OBJDIR)/erl_error.o: legacy/erl_error.c $(TARGET)/config.h \
-  ../include/erl_interface.h ../include/ei.h legacy/erl_error.h
-$(MT_OBJDIR)/erl_eterm.o: legacy/erl_eterm.c misc/ei_locking.h \
-  $(TARGET)/config.h connect/ei_resolve.h \
-  ../include/erl_interface.h ../include/ei.h legacy/erl_eterm.h \
-  legacy/portability.h legacy/erl_malloc.h legacy/erl_marshal.h \
-  legacy/erl_error.h legacy/erl_internal.h misc/ei_internal.h
-$(MT_OBJDIR)/erl_fix_alloc.o: legacy/erl_fix_alloc.c $(TARGET)/config.h \
-  misc/ei_locking.h ../include/erl_interface.h ../include/ei.h \
-  legacy/erl_error.h legacy/erl_malloc.h legacy/erl_fix_alloc.h \
-  legacy/erl_eterm.h legacy/portability.h
-$(MT_OBJDIR)/erl_format.o: legacy/erl_format.c ../include/erl_interface.h \
-  ../include/ei.h legacy/erl_eterm.h legacy/portability.h \
-  legacy/erl_malloc.h legacy/erl_error.h legacy/erl_internal.h
-$(MT_OBJDIR)/erl_malloc.o: legacy/erl_malloc.c ../include/erl_interface.h \
-  ../include/ei.h legacy/erl_fix_alloc.h legacy/erl_malloc.h \
-  legacy/erl_internal.h legacy/erl_eterm.h legacy/portability.h \
-  misc/ei_malloc.h
-$(MT_OBJDIR)/erl_marshal.o: legacy/erl_marshal.c $(TARGET)/config.h \
-  ../include/erl_interface.h ../include/ei.h legacy/erl_marshal.h \
-  legacy/erl_eterm.h legacy/portability.h legacy/erl_malloc.h \
-  legacy/erl_error.h legacy/erl_internal.h misc/eiext.h misc/putget.h
-$(MT_OBJDIR)/erl_timeout.o: legacy/erl_timeout.c $(TARGET)/config.h \
-  legacy/erl_timeout.h
-$(MT_OBJDIR)/global_names.o: legacy/global_names.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  connect/eisend.h connect/eirecv.h connect/ei_connect_int.h \
-  ../include/erl_interface.h legacy/erl_connect.h
-$(MT_OBJDIR)/global_register.o: legacy/global_register.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  connect/eisend.h connect/eirecv.h ../include/erl_interface.h
-$(MT_OBJDIR)/global_unregister.o: legacy/global_unregister.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  connect/eisend.h connect/eirecv.h connect/ei_connect_int.h \
-  ../include/erl_interface.h legacy/erl_connect.h
-$(MT_OBJDIR)/global_whereis.o: legacy/global_whereis.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  connect/eisend.h connect/eirecv.h connect/ei_connect_int.h \
-  ../include/erl_interface.h legacy/erl_connect.h
-
-$(MD_OBJDIR)/ei_connect.o: connect/ei_connect.c $(TARGET)/config.h \
-  misc/eidef.h ../include/ei.h misc/eiext.h misc/ei_portio.h \
-  misc/ei_internal.h connect/ei_connect_int.h misc/ei_locking.h \
-  connect/eisend.h connect/eirecv.h misc/eimd5.h misc/putget.h \
-  connect/ei_resolve.h epmd/ei_epmd.h
-$(MD_OBJDIR)/ei_resolve.o: connect/ei_resolve.c $(TARGET)/config.h \
-  misc/eidef.h ../include/ei.h connect/ei_resolve.h misc/ei_locking.h
-$(MD_OBJDIR)/eirecv.o: connect/eirecv.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/eiext.h connect/eirecv.h misc/ei_portio.h \
-  misc/ei_internal.h misc/putget.h misc/ei_trace.h misc/show_msg.h
-$(MD_OBJDIR)/send.o: connect/send.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/eiext.h connect/eisend.h misc/putget.h \
-  connect/ei_connect_int.h misc/ei_internal.h misc/ei_trace.h \
-  misc/show_msg.h
-$(MD_OBJDIR)/send_exit.o: connect/send_exit.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  connect/eisend.h connect/ei_connect_int.h misc/ei_trace.h \
-  misc/ei_internal.h misc/putget.h misc/show_msg.h
-$(MD_OBJDIR)/send_reg.o: connect/send_reg.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/eiext.h connect/eisend.h misc/putget.h \
-  connect/ei_connect_int.h misc/ei_internal.h misc/ei_trace.h \
-  misc/show_msg.h
-$(MD_OBJDIR)/decode_atom.o: decode/decode_atom.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/decode_big.o: decode/decode_big.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/decode_bignum.o: decode/decode_bignum.c $(TARGET)/config.h
-$(MD_OBJDIR)/decode_binary.o: decode/decode_binary.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/decode_boolean.o: decode/decode_boolean.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/decode_char.o: decode/decode_char.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/decode_double.o: decode/decode_double.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/decode_fun.o: decode/decode_fun.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/ei_malloc.h decode/decode_skip.h misc/putget.h
-$(MD_OBJDIR)/decode_intlist.o: decode/decode_intlist.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/decode_list_header.o: decode/decode_list_header.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/decode_long.o: decode/decode_long.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/decode_pid.o: decode/decode_pid.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/decode_port.o: decode/decode_port.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/decode_ref.o: decode/decode_ref.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/decode_skip.o: decode/decode_skip.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  decode/decode_skip.h
-$(MD_OBJDIR)/decode_string.o: decode/decode_string.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/decode_trace.o: decode/decode_trace.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/putget.h
-$(MD_OBJDIR)/decode_tuple_header.o: decode/decode_tuple_header.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/decode_ulong.o: decode/decode_ulong.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/decode_version.o: decode/decode_version.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/decode_longlong.o: decode/decode_longlong.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/decode_ulonglong.o: decode/decode_ulonglong.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/encode_atom.o: encode/encode_atom.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/encode_bignum.o: encode/encode_bignum.c $(TARGET)/config.h
-$(MD_OBJDIR)/encode_binary.o: encode/encode_binary.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/encode_boolean.o: encode/encode_boolean.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/encode_char.o: encode/encode_char.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/encode_double.o: encode/encode_double.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/encode_fun.o: encode/encode_fun.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/encode_list_header.o: encode/encode_list_header.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/encode_long.o: encode/encode_long.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/encode_pid.o: encode/encode_pid.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/encode_port.o: encode/encode_port.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/encode_ref.o: encode/encode_ref.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/encode_string.o: encode/encode_string.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/encode_trace.o: encode/encode_trace.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/putget.h
-$(MD_OBJDIR)/encode_tuple_header.o: encode/encode_tuple_header.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/encode_ulong.o: encode/encode_ulong.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/encode_version.o: encode/encode_version.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MD_OBJDIR)/encode_longlong.o: encode/encode_longlong.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h misc/ei_x_encode.h
-$(MD_OBJDIR)/encode_ulonglong.o: encode/encode_ulonglong.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h misc/ei_x_encode.h
-$(MD_OBJDIR)/epmd_port.o: epmd/epmd_port.c misc/ei_internal.h epmd/ei_epmd.h \
-  misc/putget.h
-$(MD_OBJDIR)/epmd_publish.o: epmd/epmd_publish.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/ei_internal.h \
-  misc/putget.h ../include/erl_interface.h epmd/ei_epmd.h
-$(MD_OBJDIR)/epmd_unpublish.o: epmd/epmd_unpublish.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/ei_internal.h \
-  misc/putget.h ../include/erl_interface.h epmd/ei_epmd.h
-$(MD_OBJDIR)/ei_decode_term.o: misc/ei_decode_term.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/ei_decode_term.h misc/putget.h
-$(MD_OBJDIR)/ei_format.o: misc/ei_format.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/ei_malloc.h misc/ei_format.h
-$(MD_OBJDIR)/ei_locking.o: misc/ei_locking.c $(TARGET)/config.h \
-  misc/ei_malloc.h misc/ei_locking.h
-$(MD_OBJDIR)/ei_malloc.o: misc/ei_malloc.c misc/ei_malloc.h
-$(MD_OBJDIR)/ei_portio.o: misc/ei_portio.c misc/ei_portio.h misc/ei_internal.h
-$(MD_OBJDIR)/ei_printterm.o: misc/ei_printterm.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/ei_printterm.h misc/ei_malloc.h
-$(MD_OBJDIR)/ei_pthreads.o: misc/ei_pthreads.c $(TARGET)/config.h \
-  ../include/ei.h misc/ei_locking.h
-$(MD_OBJDIR)/ei_trace.o: misc/ei_trace.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/ei_trace.h
-$(MD_OBJDIR)/ei_x_encode.o: misc/ei_x_encode.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/ei_x_encode.h \
-  misc/ei_malloc.h
-$(MD_OBJDIR)/eimd5.o: misc/eimd5.c misc/eimd5.h
-$(MD_OBJDIR)/get_type.o: misc/get_type.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/eiext.h misc/putget.h
-$(MD_OBJDIR)/show_msg.o: misc/show_msg.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/eiext.h misc/putget.h misc/ei_printterm.h \
-  misc/ei_internal.h misc/show_msg.h
-$(MD_OBJDIR)/ei_compat.o: misc/ei_compat.c ../include/ei.h misc/ei_internal.h
-$(MD_OBJDIR)/hash_dohash.o: registry/hash_dohash.c registry/hash.h ../include/ei.h
-$(MD_OBJDIR)/hash_foreach.o: registry/hash_foreach.c registry/hash.h ../include/ei.h
-$(MD_OBJDIR)/hash_freetab.o: registry/hash_freetab.c registry/hash.h ../include/ei.h
-$(MD_OBJDIR)/hash_insert.o: registry/hash_insert.c registry/hash.h ../include/ei.h
-$(MD_OBJDIR)/hash_isprime.o: registry/hash_isprime.c registry/hash.h ../include/ei.h
-$(MD_OBJDIR)/hash_lookup.o: registry/hash_lookup.c registry/hash.h ../include/ei.h
-$(MD_OBJDIR)/hash_newtab.o: registry/hash_newtab.c registry/hash.h ../include/ei.h
-$(MD_OBJDIR)/hash_remove.o: registry/hash_remove.c registry/hash.h ../include/ei.h
-$(MD_OBJDIR)/hash_resize.o: registry/hash_resize.c registry/hash.h ../include/ei.h
-$(MD_OBJDIR)/hash_rlookup.o: registry/hash_rlookup.c registry/hash.h ../include/ei.h
-$(MD_OBJDIR)/reg_close.o: registry/reg_close.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MD_OBJDIR)/reg_delete.o: registry/reg_delete.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MD_OBJDIR)/reg_dirty.o: registry/reg_dirty.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MD_OBJDIR)/reg_dump.o: registry/reg_dump.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  registry/reg.h registry/hash.h connect/eisend.h connect/eirecv.h \
-  connect/ei_connect_int.h
-$(MD_OBJDIR)/reg_free.o: registry/reg_free.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MD_OBJDIR)/reg_get.o: registry/reg_get.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MD_OBJDIR)/reg_getf.o: registry/reg_getf.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MD_OBJDIR)/reg_geti.o: registry/reg_geti.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MD_OBJDIR)/reg_getp.o: registry/reg_getp.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MD_OBJDIR)/reg_gets.o: registry/reg_gets.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MD_OBJDIR)/reg_make.o: registry/reg_make.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MD_OBJDIR)/reg_open.o: registry/reg_open.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MD_OBJDIR)/reg_purge.o: registry/reg_purge.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MD_OBJDIR)/reg_resize.o: registry/reg_resize.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MD_OBJDIR)/reg_restore.o: registry/reg_restore.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  registry/reg.h registry/hash.h connect/eisend.h connect/eirecv.h \
-  connect/ei_connect_int.h
-$(MD_OBJDIR)/reg_set.o: registry/reg_set.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MD_OBJDIR)/reg_setf.o: registry/reg_setf.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MD_OBJDIR)/reg_seti.o: registry/reg_seti.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MD_OBJDIR)/reg_setp.o: registry/reg_setp.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MD_OBJDIR)/reg_sets.o: registry/reg_sets.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MD_OBJDIR)/reg_stat.o: registry/reg_stat.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MD_OBJDIR)/reg_tabstat.o: registry/reg_tabstat.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MD_OBJDIR)/decode_term.o: legacy/decode_term.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h ../include/erl_interface.h
-$(MD_OBJDIR)/encode_term.o: legacy/encode_term.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h misc/ei_x_encode.h ../include/erl_interface.h \
-  legacy/erl_marshal.h legacy/erl_eterm.h legacy/portability.h
-$(MD_OBJDIR)/erl_connect.o: legacy/erl_connect.c $(TARGET)/config.h \
-  ../include/erl_interface.h ../include/ei.h legacy/erl_config.h \
-  legacy/erl_connect.h legacy/erl_eterm.h legacy/portability.h \
-  legacy/erl_malloc.h misc/putget.h connect/ei_connect_int.h \
-  misc/ei_locking.h epmd/ei_epmd.h misc/ei_internal.h
-$(MD_OBJDIR)/erl_error.o: legacy/erl_error.c $(TARGET)/config.h \
-  ../include/erl_interface.h ../include/ei.h legacy/erl_error.h
-$(MD_OBJDIR)/erl_eterm.o: legacy/erl_eterm.c misc/ei_locking.h \
-  $(TARGET)/config.h connect/ei_resolve.h \
-  ../include/erl_interface.h ../include/ei.h legacy/erl_eterm.h \
-  legacy/portability.h legacy/erl_malloc.h legacy/erl_marshal.h \
-  legacy/erl_error.h legacy/erl_internal.h misc/ei_internal.h
-$(MD_OBJDIR)/erl_fix_alloc.o: legacy/erl_fix_alloc.c $(TARGET)/config.h \
-  misc/ei_locking.h ../include/erl_interface.h ../include/ei.h \
-  legacy/erl_error.h legacy/erl_malloc.h legacy/erl_fix_alloc.h \
-  legacy/erl_eterm.h legacy/portability.h
-$(MD_OBJDIR)/erl_format.o: legacy/erl_format.c ../include/erl_interface.h \
-  ../include/ei.h legacy/erl_eterm.h legacy/portability.h \
-  legacy/erl_malloc.h legacy/erl_error.h legacy/erl_internal.h
-$(MD_OBJDIR)/erl_malloc.o: legacy/erl_malloc.c ../include/erl_interface.h \
-  ../include/ei.h legacy/erl_fix_alloc.h legacy/erl_malloc.h \
-  legacy/erl_internal.h legacy/erl_eterm.h legacy/portability.h \
-  misc/ei_malloc.h
-$(MD_OBJDIR)/erl_marshal.o: legacy/erl_marshal.c $(TARGET)/config.h \
-  ../include/erl_interface.h ../include/ei.h legacy/erl_marshal.h \
-  legacy/erl_eterm.h legacy/portability.h legacy/erl_malloc.h \
-  legacy/erl_error.h legacy/erl_internal.h misc/eiext.h misc/putget.h
-$(MD_OBJDIR)/erl_timeout.o: legacy/erl_timeout.c $(TARGET)/config.h \
-  legacy/erl_timeout.h
-$(MD_OBJDIR)/global_names.o: legacy/global_names.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  connect/eisend.h connect/eirecv.h connect/ei_connect_int.h \
-  ../include/erl_interface.h legacy/erl_connect.h
-$(MD_OBJDIR)/global_register.o: legacy/global_register.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  connect/eisend.h connect/eirecv.h ../include/erl_interface.h
-$(MD_OBJDIR)/global_unregister.o: legacy/global_unregister.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  connect/eisend.h connect/eirecv.h connect/ei_connect_int.h \
-  ../include/erl_interface.h legacy/erl_connect.h
-$(MD_OBJDIR)/global_whereis.o: legacy/global_whereis.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  connect/eisend.h connect/eirecv.h connect/ei_connect_int.h \
-  ../include/erl_interface.h legacy/erl_connect.h
-
-$(MDD_OBJDIR)/ei_connect.o: connect/ei_connect.c $(TARGET)/config.h \
-  misc/eidef.h ../include/ei.h misc/eiext.h misc/ei_portio.h \
-  misc/ei_internal.h connect/ei_connect_int.h misc/ei_locking.h \
-  connect/eisend.h connect/eirecv.h misc/eimd5.h misc/putget.h \
-  connect/ei_resolve.h epmd/ei_epmd.h
-$(MDD_OBJDIR)/ei_resolve.o: connect/ei_resolve.c $(TARGET)/config.h \
-  misc/eidef.h ../include/ei.h connect/ei_resolve.h misc/ei_locking.h
-$(MDD_OBJDIR)/eirecv.o: connect/eirecv.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/eiext.h connect/eirecv.h misc/ei_portio.h \
-  misc/ei_internal.h misc/putget.h misc/ei_trace.h misc/show_msg.h
-$(MDD_OBJDIR)/send.o: connect/send.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/eiext.h connect/eisend.h misc/putget.h \
-  connect/ei_connect_int.h misc/ei_internal.h misc/ei_trace.h \
-  misc/show_msg.h
-$(MDD_OBJDIR)/send_exit.o: connect/send_exit.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  connect/eisend.h connect/ei_connect_int.h misc/ei_trace.h \
-  misc/ei_internal.h misc/putget.h misc/show_msg.h
-$(MDD_OBJDIR)/send_reg.o: connect/send_reg.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/eiext.h connect/eisend.h misc/putget.h \
-  connect/ei_connect_int.h misc/ei_internal.h misc/ei_trace.h \
-  misc/show_msg.h
-$(MDD_OBJDIR)/decode_atom.o: decode/decode_atom.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/decode_big.o: decode/decode_big.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/decode_bignum.o: decode/decode_bignum.c $(TARGET)/config.h
-$(MDD_OBJDIR)/decode_binary.o: decode/decode_binary.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/decode_boolean.o: decode/decode_boolean.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/decode_char.o: decode/decode_char.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/decode_double.o: decode/decode_double.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/decode_fun.o: decode/decode_fun.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/ei_malloc.h decode/decode_skip.h misc/putget.h
-$(MDD_OBJDIR)/decode_intlist.o: decode/decode_intlist.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/decode_list_header.o: decode/decode_list_header.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/decode_long.o: decode/decode_long.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/decode_pid.o: decode/decode_pid.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/decode_port.o: decode/decode_port.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/decode_ref.o: decode/decode_ref.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/decode_skip.o: decode/decode_skip.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  decode/decode_skip.h
-$(MDD_OBJDIR)/decode_string.o: decode/decode_string.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/decode_trace.o: decode/decode_trace.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/putget.h
-$(MDD_OBJDIR)/decode_tuple_header.o: decode/decode_tuple_header.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/decode_ulong.o: decode/decode_ulong.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/decode_version.o: decode/decode_version.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/decode_longlong.o: decode/decode_longlong.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/decode_ulonglong.o: decode/decode_ulonglong.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/encode_atom.o: encode/encode_atom.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/encode_bignum.o: encode/encode_bignum.c $(TARGET)/config.h
-$(MDD_OBJDIR)/encode_binary.o: encode/encode_binary.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/encode_boolean.o: encode/encode_boolean.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/encode_char.o: encode/encode_char.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/encode_double.o: encode/encode_double.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/encode_fun.o: encode/encode_fun.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/encode_list_header.o: encode/encode_list_header.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/encode_long.o: encode/encode_long.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/encode_pid.o: encode/encode_pid.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/encode_port.o: encode/encode_port.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/encode_ref.o: encode/encode_ref.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/encode_string.o: encode/encode_string.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/encode_trace.o: encode/encode_trace.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/putget.h
-$(MDD_OBJDIR)/encode_tuple_header.o: encode/encode_tuple_header.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/encode_ulong.o: encode/encode_ulong.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/encode_version.o: encode/encode_version.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h
-$(MDD_OBJDIR)/encode_longlong.o: encode/encode_longlong.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h misc/ei_x_encode.h
-$(MDD_OBJDIR)/encode_ulonglong.o: encode/encode_ulonglong.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h misc/ei_x_encode.h
-$(MDD_OBJDIR)/epmd_port.o: epmd/epmd_port.c misc/ei_internal.h epmd/ei_epmd.h \
-  misc/putget.h
-$(MDD_OBJDIR)/epmd_publish.o: epmd/epmd_publish.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/ei_internal.h \
-  misc/putget.h ../include/erl_interface.h epmd/ei_epmd.h
-$(MDD_OBJDIR)/epmd_unpublish.o: epmd/epmd_unpublish.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/ei_internal.h \
-  misc/putget.h ../include/erl_interface.h epmd/ei_epmd.h
-$(MDD_OBJDIR)/ei_decode_term.o: misc/ei_decode_term.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/ei_decode_term.h misc/putget.h
-$(MDD_OBJDIR)/ei_format.o: misc/ei_format.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/ei_malloc.h misc/ei_format.h
-$(MDD_OBJDIR)/ei_locking.o: misc/ei_locking.c $(TARGET)/config.h \
-  misc/ei_malloc.h misc/ei_locking.h
-$(MDD_OBJDIR)/ei_malloc.o: misc/ei_malloc.c misc/ei_malloc.h
-$(MDD_OBJDIR)/ei_portio.o: misc/ei_portio.c misc/ei_portio.h misc/ei_internal.h
-$(MDD_OBJDIR)/ei_printterm.o: misc/ei_printterm.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/ei_printterm.h misc/ei_malloc.h
-$(MDD_OBJDIR)/ei_pthreads.o: misc/ei_pthreads.c $(TARGET)/config.h \
-  ../include/ei.h misc/ei_locking.h
-$(MDD_OBJDIR)/ei_trace.o: misc/ei_trace.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/ei_trace.h
-$(MDD_OBJDIR)/ei_x_encode.o: misc/ei_x_encode.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/ei_x_encode.h \
-  misc/ei_malloc.h
-$(MDD_OBJDIR)/eimd5.o: misc/eimd5.c misc/eimd5.h
-$(MDD_OBJDIR)/get_type.o: misc/get_type.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/eiext.h misc/putget.h
-$(MDD_OBJDIR)/show_msg.o: misc/show_msg.c misc/eidef.h $(TARGET)/config.h \
-  ../include/ei.h misc/eiext.h misc/putget.h misc/ei_printterm.h \
-  misc/ei_internal.h misc/show_msg.h
-$(MDD_OBJDIR)/ei_compat.o: misc/ei_compat.c ../include/ei.h misc/ei_internal.h
-$(MDD_OBJDIR)/hash_dohash.o: registry/hash_dohash.c registry/hash.h ../include/ei.h
-$(MDD_OBJDIR)/hash_foreach.o: registry/hash_foreach.c registry/hash.h ../include/ei.h
-$(MDD_OBJDIR)/hash_freetab.o: registry/hash_freetab.c registry/hash.h ../include/ei.h
-$(MDD_OBJDIR)/hash_insert.o: registry/hash_insert.c registry/hash.h ../include/ei.h
-$(MDD_OBJDIR)/hash_isprime.o: registry/hash_isprime.c registry/hash.h ../include/ei.h
-$(MDD_OBJDIR)/hash_lookup.o: registry/hash_lookup.c registry/hash.h ../include/ei.h
-$(MDD_OBJDIR)/hash_newtab.o: registry/hash_newtab.c registry/hash.h ../include/ei.h
-$(MDD_OBJDIR)/hash_remove.o: registry/hash_remove.c registry/hash.h ../include/ei.h
-$(MDD_OBJDIR)/hash_resize.o: registry/hash_resize.c registry/hash.h ../include/ei.h
-$(MDD_OBJDIR)/hash_rlookup.o: registry/hash_rlookup.c registry/hash.h ../include/ei.h
-$(MDD_OBJDIR)/reg_close.o: registry/reg_close.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MDD_OBJDIR)/reg_delete.o: registry/reg_delete.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MDD_OBJDIR)/reg_dirty.o: registry/reg_dirty.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MDD_OBJDIR)/reg_dump.o: registry/reg_dump.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  registry/reg.h registry/hash.h connect/eisend.h connect/eirecv.h \
-  connect/ei_connect_int.h
-$(MDD_OBJDIR)/reg_free.o: registry/reg_free.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MDD_OBJDIR)/reg_get.o: registry/reg_get.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MDD_OBJDIR)/reg_getf.o: registry/reg_getf.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MDD_OBJDIR)/reg_geti.o: registry/reg_geti.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MDD_OBJDIR)/reg_getp.o: registry/reg_getp.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MDD_OBJDIR)/reg_gets.o: registry/reg_gets.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MDD_OBJDIR)/reg_make.o: registry/reg_make.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MDD_OBJDIR)/reg_open.o: registry/reg_open.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MDD_OBJDIR)/reg_purge.o: registry/reg_purge.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MDD_OBJDIR)/reg_resize.o: registry/reg_resize.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MDD_OBJDIR)/reg_restore.o: registry/reg_restore.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  registry/reg.h registry/hash.h connect/eisend.h connect/eirecv.h \
-  connect/ei_connect_int.h
-$(MDD_OBJDIR)/reg_set.o: registry/reg_set.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MDD_OBJDIR)/reg_setf.o: registry/reg_setf.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MDD_OBJDIR)/reg_seti.o: registry/reg_seti.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MDD_OBJDIR)/reg_setp.o: registry/reg_setp.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MDD_OBJDIR)/reg_sets.o: registry/reg_sets.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MDD_OBJDIR)/reg_stat.o: registry/reg_stat.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MDD_OBJDIR)/reg_tabstat.o: registry/reg_tabstat.c registry/reg.h ../include/ei.h \
-  registry/hash.h
-$(MDD_OBJDIR)/decode_term.o: legacy/decode_term.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h ../include/erl_interface.h
-$(MDD_OBJDIR)/encode_term.o: legacy/encode_term.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  misc/putget.h misc/ei_x_encode.h ../include/erl_interface.h \
-  legacy/erl_marshal.h legacy/erl_eterm.h legacy/portability.h
-$(MDD_OBJDIR)/erl_connect.o: legacy/erl_connect.c $(TARGET)/config.h \
-  ../include/erl_interface.h ../include/ei.h legacy/erl_config.h \
-  legacy/erl_connect.h legacy/erl_eterm.h legacy/portability.h \
-  legacy/erl_malloc.h misc/putget.h connect/ei_connect_int.h \
-  misc/ei_locking.h epmd/ei_epmd.h misc/ei_internal.h
-$(MDD_OBJDIR)/erl_error.o: legacy/erl_error.c $(TARGET)/config.h \
-  ../include/erl_interface.h ../include/ei.h legacy/erl_error.h
-$(MDD_OBJDIR)/erl_eterm.o: legacy/erl_eterm.c misc/ei_locking.h \
-  $(TARGET)/config.h connect/ei_resolve.h \
-  ../include/erl_interface.h ../include/ei.h legacy/erl_eterm.h \
-  legacy/portability.h legacy/erl_malloc.h legacy/erl_marshal.h \
-  legacy/erl_error.h legacy/erl_internal.h misc/ei_internal.h
-$(MDD_OBJDIR)/erl_fix_alloc.o: legacy/erl_fix_alloc.c $(TARGET)/config.h \
-  misc/ei_locking.h ../include/erl_interface.h ../include/ei.h \
-  legacy/erl_error.h legacy/erl_malloc.h legacy/erl_fix_alloc.h \
-  legacy/erl_eterm.h legacy/portability.h
-$(MDD_OBJDIR)/erl_format.o: legacy/erl_format.c ../include/erl_interface.h \
-  ../include/ei.h legacy/erl_eterm.h legacy/portability.h \
-  legacy/erl_malloc.h legacy/erl_error.h legacy/erl_internal.h
-$(MDD_OBJDIR)/erl_malloc.o: legacy/erl_malloc.c ../include/erl_interface.h \
-  ../include/ei.h legacy/erl_fix_alloc.h legacy/erl_malloc.h \
-  legacy/erl_internal.h legacy/erl_eterm.h legacy/portability.h \
-  misc/ei_malloc.h
-$(MDD_OBJDIR)/erl_marshal.o: legacy/erl_marshal.c $(TARGET)/config.h \
-  ../include/erl_interface.h ../include/ei.h legacy/erl_marshal.h \
-  legacy/erl_eterm.h legacy/portability.h legacy/erl_malloc.h \
-  legacy/erl_error.h legacy/erl_internal.h misc/eiext.h misc/putget.h
-$(MDD_OBJDIR)/erl_timeout.o: legacy/erl_timeout.c $(TARGET)/config.h \
-  legacy/erl_timeout.h
-$(MDD_OBJDIR)/global_names.o: legacy/global_names.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  connect/eisend.h connect/eirecv.h connect/ei_connect_int.h \
-  ../include/erl_interface.h legacy/erl_connect.h
-$(MDD_OBJDIR)/global_register.o: legacy/global_register.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  connect/eisend.h connect/eirecv.h ../include/erl_interface.h
-$(MDD_OBJDIR)/global_unregister.o: legacy/global_unregister.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  connect/eisend.h connect/eirecv.h connect/ei_connect_int.h \
-  ../include/erl_interface.h legacy/erl_connect.h
-$(MDD_OBJDIR)/global_whereis.o: legacy/global_whereis.c misc/eidef.h \
-  $(TARGET)/config.h ../include/ei.h misc/eiext.h \
-  connect/eisend.h connect/eirecv.h connect/ei_connect_int.h \
-  ../include/erl_interface.h legacy/erl_connect.h
-
diff --git a/lib/erl_interface/src/encode/encode_binary.c b/lib/erl_interface/src/encode/encode_binary.c
index 4471c51769..0562979417 100644
--- a/lib/erl_interface/src/encode/encode_binary.c
+++ b/lib/erl_interface/src/encode/encode_binary.c
@@ -22,6 +22,10 @@
 #include "eiext.h"
 #include "putget.h"
 
+static void copy_bits(const unsigned char* src, size_t soffs,
+                      unsigned char* dst, size_t n);
+
+
 int ei_encode_binary(char *buf, int *index, const void *p, long len)
 {
   char *s = buf + *index;
@@ -40,3 +44,106 @@ int ei_encode_binary(char *buf, int *index, const void *p, long len)
   return 0; 
 }
 
+int ei_encode_bitstring(char *buf, int *index,
+                        const char *p,
+                        size_t bitoffs,
+                        size_t bits)
+{
+  char *s = buf + *index;
+  char *s0 = s;
+  size_t bytes = (bits + 7) / 8;
+  char last_bits = bits % 8;
+
+  if (!buf) s += last_bits ? 6 : 5;
+  else {
+      char* tagp = s++;
+      put32be(s, bytes);
+      if (last_bits) {
+          *tagp = ERL_BIT_BINARY_EXT;
+          put8(s, last_bits);
+      }
+      else
+          *tagp = ERL_BINARY_EXT;
+
+      copy_bits((const unsigned char*)p, bitoffs, (unsigned char*)s, bits);
+  }
+  s += bytes;
+
+  *index += s-s0;
+
+  return 0;
+}
+
+
+/*
+ * MAKE_MASK(n) constructs a mask with n bits.
+ * Example: MAKE_MASK(3) returns the binary number 00000111.
+ */
+#define MAKE_MASK(n) ((((unsigned) 1) << (n))-1)
+
+
+static
+void copy_bits(const unsigned char* src, /* Base pointer to source. */
+	       size_t soffs,	         /* Bit offset for source relative to src. */
+	       unsigned char* dst,	 /* Destination. */
+	       size_t n)	         /* Number of bits to copy. */
+{
+    unsigned rmask;
+    unsigned count;
+    unsigned deoffs;
+    unsigned bits;
+    unsigned bits1;
+    unsigned rshift;
+
+    if (n == 0)
+        return;
+
+    deoffs = n & 7;
+    rmask = deoffs ? (MAKE_MASK(deoffs) << (8-deoffs)) : 0;
+
+    if (soffs == 0) {
+        unsigned nbytes = (n + 7) / 8;
+        memcpy(dst, src, nbytes);
+        if (rmask)
+            dst[nbytes-1] &= rmask;
+        return;
+    }
+
+    src += soffs / 8;
+    soffs &= 7;
+
+    if (n < 8) {     /* Less than one byte */
+        bits = (*src << soffs);
+        if (soffs+n > 8) {
+            src++;
+            bits |= (*src >> (8 - soffs));
+        }
+        *dst = bits & rmask;
+	return;
+    }
+
+    count = n >> 3;
+
+    rshift = 8 - soffs;
+    bits = *src;
+    if (soffs + n > 8) {
+        src++;
+    }
+
+    while (count--) {
+        bits1 = bits << soffs;
+        bits = *src;
+        src++;
+        *dst = bits1 | (bits >> rshift);
+        dst++;
+    }
+
+    if (rmask) {
+        bits1 = bits << soffs;
+        if ((rmask << rshift) & 0xff) {
+            bits = *src;
+            bits1 |= (bits >> rshift);
+        }
+        *dst = bits1 & rmask;
+    }
+}
diff --git a/lib/erl_interface/src/encode/encode_fun.c b/lib/erl_interface/src/encode/encode_fun.c
index 3bfc7530d1..e29424f9f4 100644
--- a/lib/erl_interface/src/encode/encode_fun.c
+++ b/lib/erl_interface/src/encode/encode_fun.c
@@ -26,56 +26,72 @@ int ei_encode_fun(char *buf, int *index, const erlang_fun *p)
 {
     int ix = *index;
 
-    if (p->arity == -1) {
-	/* ERL_FUN_EXT */
-	if (buf != NULL) {
-	    char* s = buf + ix;
-	    put8(s, ERL_FUN_EXT);
-	    put32be(s, p->n_free_vars);
-	}
-	ix += sizeof(char) + 4;
-	if (ei_encode_pid(buf, &ix, &p->pid) < 0)
-	    return -1;
-	if (ei_encode_atom_as(buf, &ix, p->module, ERLANG_UTF8, p->module_org_enc) < 0)
-	    return -1;
-	if (ei_encode_long(buf, &ix, p->index) < 0)
-	    return -1;
-	if (ei_encode_long(buf, &ix, p->uniq) < 0)
-	    return -1;
-	if (buf != NULL)
-	    memcpy(buf + ix, p->free_vars, p->free_var_len);
-	ix += p->free_var_len;
-    } else {
-	char *size_p;
-	/* ERL_NEW_FUN_EXT */
-	if (buf != NULL) {
-	    char* s = buf + ix;
-	    put8(s, ERL_NEW_FUN_EXT);
-	    size_p = s;
-	    s += 4;
-	    put8(s, p->arity);
-	    memcpy(s, p->md5, sizeof(p->md5));
-	    s += sizeof(p->md5);
-	    put32be(s, p->index);
-	    put32be(s, p->n_free_vars);
-	} else
-	    size_p = NULL;
-	ix += 1 + 4 + 1 + sizeof(p->md5) + 4 + 4;
-	if (ei_encode_atom_as(buf, &ix, p->module, ERLANG_UTF8, p->module_org_enc) < 0)
-	    return -1;
-	if (ei_encode_long(buf, &ix, p->old_index) < 0)
-	    return -1;
-	if (ei_encode_long(buf, &ix, p->uniq) < 0)
-	    return -1;
-	if (ei_encode_pid(buf, &ix, &p->pid) < 0)
-	    return -1;
-	if (buf != NULL)
-	    memcpy(buf + ix, p->free_vars, p->free_var_len);
-	ix += p->free_var_len;
-	if (size_p != NULL) {
-	    int sz = buf + ix - size_p;
-	    put32be(size_p, sz);
+    switch (p->type) {
+    case EI_FUN_CLOSURE:
+	if (p->arity == -1) {
+	    /* ERL_FUN_EXT */
+	    if (buf != NULL) {
+		char* s = buf + ix;
+		put8(s, ERL_FUN_EXT);
+		put32be(s, p->u.closure.n_free_vars);
+	    }
+	    ix += sizeof(char) + 4;
+	    if (ei_encode_pid(buf, &ix, &p->u.closure.pid) < 0)
+		return -1;
+	    if (ei_encode_atom_as(buf, &ix, p->module, ERLANG_UTF8, ERLANG_UTF8) < 0)
+		return -1;
+	    if (ei_encode_long(buf, &ix, p->u.closure.index) < 0)
+		return -1;
+	    if (ei_encode_long(buf, &ix, p->u.closure.uniq) < 0)
+		return -1;
+	    if (buf != NULL)
+		memcpy(buf + ix, p->u.closure.free_vars, p->u.closure.free_var_len);
+	    ix += p->u.closure.free_var_len;
+	} else {
+	    char *size_p;
+	    if (buf != NULL) {
+		char* s = buf + ix;
+		put8(s, ERL_NEW_FUN_EXT);
+		size_p = s;
+		s += 4;
+		put8(s, p->arity);
+		memcpy(s, p->u.closure.md5, sizeof(p->u.closure.md5));
+		s += sizeof(p->u.closure.md5);
+		put32be(s, p->u.closure.index);
+		put32be(s, p->u.closure.n_free_vars);
+	    } else
+		size_p = NULL;
+	    ix += 1 + 4 + 1 + sizeof(p->u.closure.md5) + 4 + 4;
+	    if (ei_encode_atom_as(buf, &ix, p->module, ERLANG_UTF8, ERLANG_UTF8) < 0)
+		return -1;
+	    if (ei_encode_long(buf, &ix, p->u.closure.old_index) < 0)
+		return -1;
+	    if (ei_encode_long(buf, &ix, p->u.closure.uniq) < 0)
+		return -1;
+	    if (ei_encode_pid(buf, &ix, &p->u.closure.pid) < 0)
+		return -1;
+	    if (buf != NULL)
+		memcpy(buf + ix, p->u.closure.free_vars, p->u.closure.free_var_len);
+	    ix += p->u.closure.free_var_len;
+	    if (size_p != NULL) {
+		int sz = buf + ix - size_p;
+		put32be(size_p, sz);
+	    }
 	}
+	break;
+    case EI_FUN_EXPORT:
+        if (buf != NULL) {
+            char* s = buf + ix;
+            put8(s, ERL_EXPORT_EXT);
+        }
+        ix++;
+        if (ei_encode_atom_as(buf, &ix, p->module, ERLANG_UTF8, ERLANG_UTF8) < 0)
+            return -1;
+        if (ei_encode_atom_as(buf, &ix, p->u.exprt.func, ERLANG_UTF8, ERLANG_UTF8) < 0)
+            return -1;
+        if (ei_encode_long(buf, &ix, p->arity) < 0)
+            return -1;
+        break;
     }
     *index = ix;
     return 0;
diff --git a/lib/erl_interface/src/epmd/epmd_port.c b/lib/erl_interface/src/epmd/epmd_port.c
index 2ec418b24a..492c3fb3aa 100644
--- a/lib/erl_interface/src/epmd/epmd_port.c
+++ b/lib/erl_interface/src/epmd/epmd_port.c
@@ -62,31 +62,38 @@
 int ei_epmd_connect_tmo(struct in_addr *inaddr, unsigned ms)
 {
   static unsigned int epmd_port = 0;
-  struct sockaddr_in saddr;
-  int sd;
-  int res;
+  int port, sd, err;
+  struct in_addr ip_addr;
+  struct sockaddr_in addr;
+  unsigned tmo = ms == 0 ? EI_SCLBK_INF_TMO : ms;
+
+  err = ei_socket__(&sd);
+  if (err) {
+      erl_errno = err;
+      return -1;
+  }
 
   if (epmd_port == 0) {
       char* port_str = getenv("ERL_EPMD_PORT");
       epmd_port = (port_str != NULL) ? atoi(port_str) : EPMD_PORT;
   }
-  memset(&saddr, 0, sizeof(saddr)); 
-  saddr.sin_port = htons(epmd_port);
-  saddr.sin_family = AF_INET;
 
-  if (!inaddr) saddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-  else memmove(&saddr.sin_addr,inaddr,sizeof(saddr.sin_addr));
+  port = (int) epmd_port;
 
-  if (((sd = socket(PF_INET, SOCK_STREAM, 0)) < 0))
-  {
-      erl_errno = errno;
-      return -1;
+  if (!inaddr) {      
+      ip_addr.s_addr = htonl(INADDR_LOOPBACK);
+      inaddr = &ip_addr;
   }
+  
+  memset((void *) &addr, 0, sizeof(struct sockaddr_in));
+  memcpy((void *) &addr.sin_addr, (void *) inaddr, sizeof(addr.sin_addr));
+  addr.sin_family = AF_INET;
+  addr.sin_port = htons(port);
 
-  if ((res = ei_connect_t(sd,(struct sockaddr *)&saddr,sizeof(saddr),ms)) < 0) 
-  {
-      erl_errno = (res == -2) ? ETIMEDOUT : errno;
-      closesocket(sd);
+  err = ei_connect_t__(sd, (void *) &addr, sizeof(addr), tmo);
+  if (err) {
+      erl_errno = err;
+      ei_close__(sd);
       return -1;
   }
 
@@ -104,6 +111,9 @@ static int ei_epmd_r4_port (struct in_addr *addr, const char *alive,
   int port;
   int dist_high, dist_low, proto;
   int res;
+  int err;
+  ssize_t dlen;
+  unsigned tmo = ms == 0 ? EI_SCLBK_INF_TMO : ms;
 #if defined(VXWORKS)
   char ntoabuf[32];
 #endif
@@ -124,10 +134,14 @@ static int ei_epmd_r4_port (struct in_addr *addr, const char *alive,
       return -1;
   }
 
-  if ((res = ei_write_fill_t(fd, buf, len+2, ms)) != len+2) {
-    closesocket(fd);
-    erl_errno = (res == -2) ? ETIMEDOUT : EIO;
-    return -1;
+  dlen = len + 2;
+  err = ei_write_fill_t__(fd, buf, &dlen, tmo);
+  if (!err && dlen != (ssize_t) len + 2)
+      erl_errno = EIO;
+  if (err) {
+      ei_close__(fd);
+      EI_CONN_SAVE_ERRNO__(err);
+      return -1;
   }
 
 #ifdef VXWORKS
@@ -142,12 +156,15 @@ static int ei_epmd_r4_port (struct in_addr *addr, const char *alive,
 		 "-> PORT2_REQ alive=%s ip=%s",alive,inet_ntoa(*addr));
 #endif
 
-  /* read first two bytes (response type, response) */
-  if ((res = ei_read_fill_t(fd, buf, 2, ms)) != 2) {
-    EI_TRACE_ERR0("ei_epmd_r4_port","<- CLOSE");
-    erl_errno = (res == -2) ? ETIMEDOUT : EIO;
-    closesocket(fd);
-    return -2;			/* version mismatch */
+  dlen = (ssize_t) 2;
+  err = ei_read_fill_t__(fd, buf, &dlen, tmo);
+  if (!err && dlen != (ssize_t) 2)
+      erl_errno = EIO;
+  if (err) {
+      EI_TRACE_ERR0("ei_epmd_r4_port","<- CLOSE");
+      ei_close__(fd);
+      EI_CONN_SAVE_ERRNO__(err);
+      return -2;
   }
 
   s = buf;
@@ -156,7 +173,7 @@ static int ei_epmd_r4_port (struct in_addr *addr, const char *alive,
   if (res != EI_EPMD_PORT2_RESP) { /* response type */
     EI_TRACE_ERR1("ei_epmd_r4_port","<- unknown (%d)",res);
     EI_TRACE_ERR0("ei_epmd_r4_port","-> CLOSE");
-    closesocket(fd);
+    ei_close__(fd);
     erl_errno = EIO;
     return -1;
   }
@@ -167,7 +184,7 @@ static int ei_epmd_r4_port (struct in_addr *addr, const char *alive,
   if ((res = get8(s))) {
     /* got negative response */
     EI_TRACE_ERR1("ei_epmd_r4_port","<- PORT2_RESP result=%d (failure)",res);
-    closesocket(fd);
+    ei_close__(fd);
     erl_errno = EIO;
     return -1;
   }
@@ -175,14 +192,18 @@ static int ei_epmd_r4_port (struct in_addr *addr, const char *alive,
   EI_TRACE_CONN1("ei_epmd_r4_port","<- PORT2_RESP result=%d (ok)",res);
 
   /* expecting remaining 8 bytes */
-  if ((res = ei_read_fill_t(fd,buf,8,ms)) != 8) {
+  dlen = (ssize_t) 8;
+  err = ei_read_fill_t__(fd, buf, &dlen, tmo);
+  if (!err && dlen != (ssize_t) 8)
+      err = EIO;
+  if (err) {
     EI_TRACE_ERR0("ei_epmd_r4_port","<- CLOSE");
-    erl_errno = (res == -2) ? ETIMEDOUT : EIO;
-    closesocket(fd);
+    ei_close__(fd);
+    EI_CONN_SAVE_ERRNO__(err);
     return -1;
   }
   
-  closesocket(fd);
+  ei_close__(fd);
   s = buf;
 
   port = get16be(s);
diff --git a/lib/erl_interface/src/epmd/epmd_publish.c b/lib/erl_interface/src/epmd/epmd_publish.c
index 47d68a6db0..20b8e867e8 100644
--- a/lib/erl_interface/src/epmd/epmd_publish.c
+++ b/lib/erl_interface/src/epmd/epmd_publish.c
@@ -68,8 +68,10 @@ static int ei_epmd_r4_publish (int port, const char *alive, unsigned ms)
   int nlen = strlen(alive);
   int len = elen + nlen + 13; /* hard coded: be careful! */
   int n;
-  int res, creation;
-  
+  int err, res, creation;
+  ssize_t dlen;
+  unsigned tmo = ms == 0 ? EI_SCLBK_INF_TMO : ms;
+
   if (len > sizeof(buf)-2)
   {
     erl_errno = ERANGE;
@@ -93,29 +95,39 @@ static int ei_epmd_r4_publish (int port, const char *alive, unsigned ms)
 
   if ((fd = ei_epmd_connect_tmo(NULL,ms)) < 0) return fd;
 
-  if ((res = ei_write_fill_t(fd, buf, len+2, ms)) != len+2) {
-    closesocket(fd);
-    erl_errno = (res == -2) ? ETIMEDOUT : EIO;
-    return -1;
+  dlen = (ssize_t) len+2;
+  err = ei_write_fill_t__(fd, buf, &dlen, tmo);
+  if (!err && dlen != (ssize_t) len + 2)
+      erl_errno = EIO;
+  if (err) {
+      ei_close__(fd);
+      EI_CONN_SAVE_ERRNO__(err);
+      return -1;
   }
 
   EI_TRACE_CONN6("ei_epmd_r4_publish",
 		 "-> ALIVE2_REQ alive=%s port=%d ntype=%d "
 		 "proto=%d dist-high=%d dist-low=%d",
 		 alive,port,'H',EI_MYPROTO,EI_DIST_HIGH,EI_DIST_LOW);
-  
-  if ((n = ei_read_fill_t(fd, buf, 4, ms)) != 4) {
+
+  dlen = (ssize_t) 4;
+  err = ei_read_fill_t__(fd, buf, &dlen, tmo);
+  n = (int) dlen;
+  if (!err && n != 4)
+      err = EIO;
+  if (err) {
     EI_TRACE_ERR0("ei_epmd_r4_publish","<- CLOSE");
-    closesocket(fd);
-    erl_errno = (n == -2) ? ETIMEDOUT : EIO;
+    ei_close__(fd);
+    EI_CONN_SAVE_ERRNO__(err);
     return -2;			/* version mismatch */
   }
+
   /* Don't close fd here! It keeps us registered with epmd */
   s = buf;
   if (((res=get8(s)) != EI_EPMD_ALIVE2_RESP)) {  /* response */
     EI_TRACE_ERR1("ei_epmd_r4_publish","<- unknown (%d)",res);
     EI_TRACE_ERR0("ei_epmd_r4_publish","-> CLOSE");
-    closesocket(fd);
+    ei_close__(fd);
     erl_errno = EIO;
     return -1;
   }
@@ -124,7 +136,7 @@ static int ei_epmd_r4_publish (int port, const char *alive, unsigned ms)
 
   if (((res=get8(s)) != 0)) {           /* 0 == success */
       EI_TRACE_ERR1("ei_epmd_r4_publish"," result=%d (fail)",res);
-    closesocket(fd);
+    ei_close__(fd);
     erl_errno = EIO;
     return -1;
   }
diff --git a/lib/erl_interface/src/epmd/epmd_unpublish.c b/lib/erl_interface/src/epmd/epmd_unpublish.c
index 255d0ffb59..c112f74147 100644
--- a/lib/erl_interface/src/epmd/epmd_unpublish.c
+++ b/lib/erl_interface/src/epmd/epmd_unpublish.c
@@ -58,7 +58,9 @@ int ei_unpublish_tmo(const char *alive, unsigned ms)
     char buf[EPMDBUF];
     char *s = (char*)buf;
     int len = 1 + strlen(alive);
-    int fd, res;
+    int fd, err;
+    ssize_t dlen;
+    unsigned tmo = ms == 0 ? EI_SCLBK_INF_TMO : ms;
 
     if (len > sizeof(buf)-3) {
 	erl_errno = ERANGE;
@@ -72,20 +74,29 @@ int ei_unpublish_tmo(const char *alive, unsigned ms)
     /* FIXME can't connect, return success?! At least commen whats up */
     if ((fd = ei_epmd_connect_tmo(NULL,ms)) < 0) return fd;
 
-    if ((res = ei_write_fill_t(fd, buf, len+2,ms)) != len+2) {
-	closesocket(fd);
-	erl_errno = (res == -2) ? ETIMEDOUT : EIO;
-	return -1;
+    dlen = (ssize_t) len+2;
+    err = ei_write_fill_t__(fd, buf, &dlen, tmo);
+    if (!err && dlen != (ssize_t) len + 2)
+        erl_errno = EIO;
+    if (err) {
+        ei_close__(fd);
+        EI_CONN_SAVE_ERRNO__(err);
+        return -1;
     }
 
     EI_TRACE_CONN1("ei_unpublish_tmo","-> STOP %s",alive);
-  
-    if ((res = ei_read_fill_t(fd, buf, 7, ms)) != 7) {
-	closesocket(fd);
-	erl_errno = (res == -2) ? ETIMEDOUT : EIO;
-	return -1; 
+
+    dlen = (ssize_t) 7;
+    err = ei_read_fill_t__(fd, buf, &dlen, tmo);
+    if (!err && dlen != (ssize_t) 7)
+        erl_errno = EIO;
+    if (err) {
+        ei_close__(fd);
+        EI_CONN_SAVE_ERRNO__(err);
+        return -1;
     }
-    closesocket(fd);
+    
+    ei_close__(fd);
     buf[7]=(char)0;		/* terminate the string */
   
     if (!strcmp("STOPPED",(char *)buf)) {
diff --git a/lib/erl_interface/src/legacy/erl_connect.c b/lib/erl_interface/src/legacy/erl_connect.c
index 7ffd545d3e..e2fd4611c0 100644
--- a/lib/erl_interface/src/legacy/erl_connect.c
+++ b/lib/erl_interface/src/legacy/erl_connect.c
@@ -179,15 +179,13 @@ int erl_xconnect(Erl_IpAddr addr, char *alivename)
  *
  *  API: erl_close_connection()
  *
- *  Close a connection. FIXME call ei_close_connection() later. 
- *
  *  Returns 0 on success and -1 on failure.
  *
  ***************************************************************************/
 
 int erl_close_connection(int fd)
 {
-    return closesocket(fd);
+    return ei_close_connection(fd);
 }
 
 /*
@@ -220,7 +218,10 @@ int erl_reg_send(int fd, char *server_name, ETERM *msg)
     ei_x_buff x;
     int r;
 
-    ei_x_new_with_version(&x);
+    if (ei_x_new_with_version(&x) < 0) {
+        erl_errno = ENOMEM;
+        return 0;
+    }
     if (ei_x_encode_term(&x, msg) < 0) {
 	erl_errno = EINVAL;
 	r = 0;
diff --git a/lib/erl_interface/src/legacy/erl_eterm.c b/lib/erl_interface/src/legacy/erl_eterm.c
index 9ad92121f4..7ecea83b1a 100644
--- a/lib/erl_interface/src/legacy/erl_eterm.c
+++ b/lib/erl_interface/src/legacy/erl_eterm.c
@@ -65,7 +65,7 @@ void erl_init(void *hp,long heap_size)
 {
     erl_init_malloc(hp, heap_size);
     erl_init_marshal();
-    ei_init_resolve();
+    (void) ei_init();
 }
 
 void erl_set_compat_rel(unsigned rel)
@@ -299,12 +299,7 @@ void erl_mk_pid_helper(ETERM *ep, unsigned int number,
 		       unsigned int serial, unsigned int creation)
 {
     ERL_PID_NUMBER(ep)   = number & 0x7fff; /* 15 bits */
-    if (ei_internal_use_r9_pids_ports()) {
-	ERL_PID_SERIAL(ep)   = serial & 0x07;  /* 3 bits */
-    }
-    else {
-	ERL_PID_SERIAL(ep)   = serial & 0x1fff;  /* 13 bits */
-    }
+    ERL_PID_SERIAL(ep)   = serial & 0x1fff;  /* 13 bits */
     ERL_PID_CREATION(ep) = creation; /* 32 bits */
 }
 
@@ -334,12 +329,7 @@ ETERM *erl_mk_port(const char *node,
 
 void erl_mk_port_helper(ETERM* ep, unsigned number, unsigned int creation)
 {
-    if (ei_internal_use_r9_pids_ports()) {
-	ERL_PORT_NUMBER(ep)   = number & 0x3ffff; /* 18 bits */
-    }
-    else {
-	ERL_PORT_NUMBER(ep)   = number & 0x0fffffff; /* 18 bits */
-    }
+    ERL_PORT_NUMBER(ep)   = number & 0x0fffffff; /* 18 bits */
     ERL_PORT_CREATION(ep) = creation; /* 32 bits */
 }
 
diff --git a/lib/erl_interface/src/misc/ei_compat.c b/lib/erl_interface/src/misc/ei_compat.c
index 93d7dbfb83..787895992e 100644
--- a/lib/erl_interface/src/misc/ei_compat.c
+++ b/lib/erl_interface/src/misc/ei_compat.c
@@ -22,19 +22,22 @@
 #include "ei.h"
 #include "ei_internal.h"
 
-#define EI_COMPAT_NO_REL (~((unsigned) 0))
+#include <limits.h>
 
-static unsigned compat_rel = EI_COMPAT_NO_REL;
+#ifndef EI_COMPAT
+#  define EI_COMPAT UINT_MAX
+#endif
+
+static unsigned compat_rel = EI_COMPAT;
 
 void
 ei_set_compat_rel(unsigned rel)
 {
-    if (compat_rel == EI_COMPAT_NO_REL)
-	compat_rel = rel;
+    compat_rel = rel;
 }
 
-int
-ei_internal_use_r9_pids_ports(void)
+int ei_internal_use_21_bitstr_expfun(void)
 {
-    return compat_rel < 10;
+    return compat_rel < 22;
 }
+
diff --git a/lib/erl_interface/src/misc/ei_decode_term.c b/lib/erl_interface/src/misc/ei_decode_term.c
index 63a7034508..8a4f7cc30d 100644
--- a/lib/erl_interface/src/misc/ei_decode_term.c
+++ b/lib/erl_interface/src/misc/ei_decode_term.c
@@ -87,6 +87,14 @@ int ei_decode_ei_term(const char* buf, int* index, ei_term* term)
     case ERL_BINARY_EXT:
 	term->size = get32be(s);
 	return 0;
+    case ERL_BIT_BINARY_EXT: {
+        int bytes = get32be(s);
+        int last_bits = get8(s);
+        if (((last_bits==0) != (bytes==0)) || last_bits > 8)
+            return -1;
+        term->size = bytes;
+        return 0;
+    }
     case ERL_SMALL_BIG_EXT:
 	if ((term->arity = get8(s)) != 4) return -1;
 	sign = get8(s);
diff --git a/lib/erl_interface/src/misc/ei_init.c b/lib/erl_interface/src/misc/ei_init.c
new file mode 100644
index 0000000000..5357968657
--- /dev/null
+++ b/lib/erl_interface/src/misc/ei_init.c
@@ -0,0 +1,32 @@
+/*
+ * %CopyrightBegin%
+ * 
+ * Copyright Ericsson AB 2019. 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 "ei.h"
+#include "ei_resolve.h"
+#include "ei_internal.h"
+
+int
+ei_init(void)
+{
+    int error = ei_init_connect();
+    if (error)
+        return error;
+    return ei_init_resolve();
+}
diff --git a/lib/erl_interface/src/misc/ei_internal.h b/lib/erl_interface/src/misc/ei_internal.h
index aa6aacd703..ab12597c86 100644
--- a/lib/erl_interface/src/misc/ei_internal.h
+++ b/lib/erl_interface/src/misc/ei_internal.h
@@ -22,19 +22,20 @@
 #ifndef _EI_INTERNAL_H
 #define _EI_INTERNAL_H
 
+#ifdef EI_HIDE_REAL_ERRNO
+#  define EI_CONN_SAVE_ERRNO__(E) \
+    ((E) == ETIMEDOUT ? (erl_errno = ETIMEDOUT) : (erl_errno = EIO))
+#else
+#  define EI_CONN_SAVE_ERRNO__(E) \
+    (erl_errno = (E))
+#endif
+
 /* 
  * Some useful stuff not to be exported to users.
  */
 
 #ifdef __WIN32__
 #define MAXPATHLEN 256
-#define writesocket(sock,buf,nbyte) send(sock,buf,nbyte,0)
-#define  readsocket(sock,buf,nbyte) recv(sock,buf,nbyte,0)
-#else /* not __WIN32__ */
-#define writesocket write
-#define readsocket  read
-#define closesocket close
-#define ioctlsocket ioctl
 #endif
 
 /* 
@@ -152,7 +153,12 @@
 
 extern int ei_tracelevel;
 
+int ei_init_connect(void);
+
 void ei_trace_printf(const char *name, int level, const char *format, ...);
 
-int ei_internal_use_r9_pids_ports(void);
+int ei_internal_use_21_bitstr_expfun(void);
+
+int ei_get_cbs_ctx__(ei_socket_callbacks **cbs, void **ctx, int fd);
+
 #endif /* _EI_INTERNAL_H */
diff --git a/lib/erl_interface/src/misc/ei_portio.c b/lib/erl_interface/src/misc/ei_portio.c
index 8cd35bf2e5..bccc86c1b1 100644
--- a/lib/erl_interface/src/misc/ei_portio.c
+++ b/lib/erl_interface/src/misc/ei_portio.c
@@ -19,9 +19,13 @@
  *
 
  */
+
+#include "eidef.h"
+
 #ifdef __WIN32__
 #include <winsock2.h>
 #include <windows.h>
+#include <winbase.h>
 #include <process.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -35,10 +39,6 @@ static unsigned long param_one = 1;
 #define SET_BLOCKING(Sock) ioctlsocket((Sock),FIONBIO,&param_zero)
 #define SET_NONBLOCKING(Sock) ioctlsocket((Sock),FIONBIO,&param_one)
 
-#define ERROR_WOULDBLOCK WSAEWOULDBLOCK
-#define ERROR_TIMEDOUT WSAETIMEDOUT 
-#define ERROR_INPROGRESS WSAEINPROGRESS
-#define GET_SOCKET_ERROR() WSAGetLastError()
 #define MEANS_SOCKET_ERROR(Ret) ((Ret == SOCKET_ERROR))
 #define IS_INVALID_SOCKET(Sock) ((Sock) == INVALID_SOCKET)
 
@@ -50,125 +50,414 @@ static unsigned long param_one = 1;
 #include <taskLib.h>
 #include <inetLib.h>
 #include <selectLib.h>
-#include <sys/types.h>
 #include <ioLib.h>
 #include <unistd.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h> 
+#include <timers.h>
 
 static unsigned long param_zero = 0;
 static unsigned long param_one = 1;
 #define SET_BLOCKING(Sock) ioctl((Sock),FIONBIO,(int)&param_zero)
 #define SET_NONBLOCKING(Sock) ioctl((Sock),FIONBIO,(int)&param_one)
-#define ERROR_WOULDBLOCK EWOULDBLOCK
-#define ERROR_TIMEDOUT ETIMEDOUT 
-#define ERROR_INPROGRESS EINPROGRESS
-#define GET_SOCKET_ERROR() (errno)
 #define MEANS_SOCKET_ERROR(Ret) ((Ret) == ERROR)
 #define IS_INVALID_SOCKET(Sock) ((Sock) < 0)
 
 #else /* other unix */
 #include <stdlib.h>
-#include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/uio.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h> 
+#include <arpa/inet.h>
+#include <netdb.h>
 
-#ifndef EWOULDBLOCK
-#define ERROR_WOULDBLOCK EAGAIN
-#else
-#define ERROR_WOULDBLOCK EWOULDBLOCK
-#endif
 #define SET_BLOCKING(fd)  fcntl((fd), F_SETFL, \
 				fcntl((fd), F_GETFL, 0) & ~O_NONBLOCK)
 #define SET_NONBLOCKING(fd) fcntl((fd), F_SETFL, \
 				  fcntl((fd), F_GETFL, 0) | O_NONBLOCK)
-#define ERROR_TIMEDOUT ETIMEDOUT 
-#define ERROR_INPROGRESS EINPROGRESS
-#define GET_SOCKET_ERROR() (errno)
 #define MEANS_SOCKET_ERROR(Ret) ((Ret) < 0)
 #define IS_INVALID_SOCKET(Sock) ((Sock) < 0)
 
 #endif
 
 /* common includes */
-#include "eidef.h"
 
+#include <sys/types.h>
 #include <stdio.h> 
 #include <stdlib.h>
 #include <string.h>
-#include "ei_portio.h"
-#include "ei_internal.h"
-
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #else
 #include <time.h>
 #endif
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+#include "ei_portio.h"
+#include "ei_internal.h"
+
+#ifdef __WIN32__
 
-#ifdef HAVE_WRITEV
-static int ei_writev_t(int fd,  struct  iovec  *iov,  int iovcnt, unsigned ms)
+#define writesocket(sock,buf,nbyte) send(sock,buf,nbyte,0)
+#define readsocket(sock,buf,nbyte) recv(sock,buf,nbyte,0)
+
+static int get_error(void)
 {
-    int res;
-    if (ms != 0) {
-	fd_set writemask;
-	struct timeval tv;
-	tv.tv_sec = (time_t) (ms / 1000U);
-	ms %= 1000U;
-	tv.tv_usec = (time_t) (ms * 1000U);
-	FD_ZERO(&writemask);
-	FD_SET(fd,&writemask);
-	switch (select(fd+1, NULL, &writemask, NULL, &tv)) {
-	case -1 : 
-	    return -1; /* i/o error */
-	case 0:
-	    return -2; /* timeout */
-	default:
-	    if (!FD_ISSET(fd, &writemask)) {
-		return -1; /* Other error */
-	    }
-	}
+    switch (WSAGetLastError()) {
+    case WSAEWOULDBLOCK: return EWOULDBLOCK;
+    case WSAETIMEDOUT: return ETIMEDOUT;
+    case WSAEINPROGRESS: return EINPROGRESS;
+    case WSA_NOT_ENOUGH_MEMORY: return ENOMEM;
+    case WSA_INVALID_PARAMETER: return EINVAL;
+    case WSAEBADF: return EBADF;
+    case WSAEINVAL: return EINVAL;
+    case WSAEADDRINUSE: return EADDRINUSE;
+    case WSAENETUNREACH: return ENETUNREACH;
+    case WSAECONNABORTED: return ECONNABORTED;
+    case WSAECONNRESET: return ECONNRESET;
+    case WSAECONNREFUSED: return ECONNREFUSED;
+    case WSAEHOSTUNREACH: return EHOSTUNREACH;
+    case WSAEMFILE: return EMFILE;
+    case WSAEALREADY: return EALREADY;
+    default: return EIO;
     }
+}
+
+#else /* not __WIN32__ */
+
+#define writesocket write
+#define readsocket  read
+#define closesocket close
+#define ioctlsocket ioctl
+
+static int get_error(void)
+{
+    int err = errno;
+    if (err == 0)
+        return EIO; /* Make sure never to return 0 as error code... */
+    return err;
+}
+
+#endif
+
+int ei_plugin_socket_impl__ = 0;
+
+/*
+ * Callbacks for communication over TCP/IPv4
+ */
+
+static int tcp_get_fd(void *ctx, int *fd)
+{
+    return EI_DFLT_CTX_TO_FD__(ctx, fd);
+}
+
+static int tcp_hs_packet_header_size(void *ctx, int *sz)
+{
+    int fd;
+    *sz = 2;
+    return EI_DFLT_CTX_TO_FD__(ctx, &fd);
+}
+
+static int tcp_handshake_complete(void *ctx)
+{
+    int res, fd, one = 1;
+
+    res = EI_DFLT_CTX_TO_FD__(ctx, &fd);
+    if (res)
+        return res;
+
+    res = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char *)&one, sizeof(one));
+    if (MEANS_SOCKET_ERROR(res))
+        return get_error();
+    
+    res = setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (char *)&one, sizeof(one));
+    if (MEANS_SOCKET_ERROR(res))
+        return get_error();
+
+    return 0;
+}
+
+static int tcp_socket(void **ctx, void *setup_ctx)
+{
+    int fd = socket(AF_INET, SOCK_STREAM, 0);
+    if (MEANS_SOCKET_ERROR(fd))
+        return get_error();
+
+    *ctx = EI_FD_AS_CTX__(fd);
+    return 0;
+}
+
+static int tcp_close(void *ctx)
+{
+    int fd, res;
+
+    res = EI_DFLT_CTX_TO_FD__(ctx, &fd);
+    if (res)
+        return res;
+
+    res = closesocket(fd);
+    if (MEANS_SOCKET_ERROR(res))
+        return get_error();
+
+    return 0;
+}
+
+static int tcp_listen(void *ctx, void *addr, int *len, int backlog)
+{
+    int res, fd;
+    socklen_t sz = (socklen_t) *len;
+    int on = 1;
+
+    res = EI_DFLT_CTX_TO_FD__(ctx, &fd);
+    if (res)
+        return res;
+
+    res = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *) &on, sizeof(on));
+    if (MEANS_SOCKET_ERROR(res))
+        return get_error();
+
+    res = bind(fd, (struct sockaddr *) addr, sz);
+    if (MEANS_SOCKET_ERROR(res))
+        return get_error();
+
+    res = getsockname(fd, (struct sockaddr *) addr, (socklen_t *) &sz);
+    if (MEANS_SOCKET_ERROR(res))
+        return get_error();
+    *len = (int) sz;
+    
+    res = listen(fd, backlog);
+    if (MEANS_SOCKET_ERROR(res))
+        return get_error();
+
+    return 0;
+}
+
+static int tcp_accept(void **ctx, void *addr, int *len, unsigned unused)
+{
+    int fd, res;
+    socklen_t addr_len = (socklen_t) *len;
+
+    if (!ctx)
+        return EINVAL;
+
+    res = EI_DFLT_CTX_TO_FD__(*ctx, &fd);
+    if (res)
+        return res;
+    
+    res = accept(fd, (struct sockaddr*) addr, &addr_len);
+    if (MEANS_SOCKET_ERROR(res))
+        return get_error();
+
+    *len = (int) addr_len;
+
+    *ctx = EI_FD_AS_CTX__(res);
+    return 0;
+}
+
+static int tcp_connect(void *ctx, void *addr, int len, unsigned unused)
+{
+    int res, fd;
+
+    res = EI_DFLT_CTX_TO_FD__(ctx, &fd);
+    if (res)
+        return res;
+
+    res = connect(fd, (struct sockaddr *) addr, len);
+    if (MEANS_SOCKET_ERROR(res))
+        return get_error();
+    
+    return 0;
+}
+
+#if defined(EI_HAVE_STRUCT_IOVEC__) && defined(HAVE_WRITEV)
+
+static int tcp_writev(void *ctx, const void *viov, int iovcnt, ssize_t *len, unsigned unused)
+{
+    const struct iovec *iov = (const struct iovec *) viov;
+    int fd, error;
+    ssize_t res;
+
+    error = EI_DFLT_CTX_TO_FD__(ctx, &fd);
+    if (error)
+        return error;
+
     res = writev(fd, iov, iovcnt);
-    return (res < 0) ? -1 : res;
+    if (MEANS_SOCKET_ERROR(res))
+        return get_error();
+    *len = res;
+    return 0;
+}
+
+#endif
+
+static int tcp_write(void *ctx, const char* buf, ssize_t *len, unsigned unused)
+{
+    int error, fd;
+    ssize_t res;
+
+    error = EI_DFLT_CTX_TO_FD__(ctx, &fd);
+    if (error)
+        return error;
+
+    res = writesocket(fd, buf, *len);
+    if (MEANS_SOCKET_ERROR(res))
+        return get_error();
+    *len = res;
+    return 0;
+}
+
+static int tcp_read(void *ctx, char* buf, ssize_t *len, unsigned unused)
+{
+    int error, fd;
+    ssize_t res;
+
+    error = EI_DFLT_CTX_TO_FD__(ctx, &fd);
+    if (error)
+        return error;
+
+    res = readsocket(fd, buf, *len);
+    if (MEANS_SOCKET_ERROR(res))
+        return get_error();
+    *len = res;
+    return 0;
+}
+
+ei_socket_callbacks ei_default_socket_callbacks = {
+    0, /* flags */
+    tcp_socket,
+    tcp_close,
+    tcp_listen,
+    tcp_accept,
+    tcp_connect,
+#if defined(EI_HAVE_STRUCT_IOVEC__) && defined(HAVE_WRITEV)
+    tcp_writev,
+#else
+    NULL,
+#endif
+    tcp_write,
+    tcp_read,
+
+    tcp_hs_packet_header_size,
+    tcp_handshake_complete,
+    tcp_handshake_complete,
+    tcp_get_fd
+
+};
+
+
+/*
+ *
+ */
+
+#if defined(EI_HAVE_STRUCT_IOVEC__)
+
+int ei_socket_callbacks_have_writev__(ei_socket_callbacks *cbs)
+{
+    return !!cbs->writev;
 }
 
-int ei_writev_fill_t(int fd,  const  struct  iovec  *iov,  int iovcnt, unsigned ms)
+static int writev_ctx_t__(ei_socket_callbacks *cbs, void *ctx,
+                          const struct iovec *iov, int iovcnt,
+                          ssize_t *len,
+                          unsigned ms)
 {
-    int i;
-    int done;
+    int error;
+
+    if (!(cbs->flags & EI_SCLBK_FLG_FULL_IMPL) && ms != EI_SCLBK_INF_TMO) {
+        int fd;
+
+        error = EI_GET_FD__(cbs, ctx, &fd);
+        if (error)
+            return error;
+
+        do {
+            fd_set writemask;
+            struct timeval tv;
+            
+            tv.tv_sec = (time_t) (ms / 1000U);
+            ms %= 1000U;
+            tv.tv_usec = (time_t) (ms * 1000U);
+            FD_ZERO(&writemask);
+            FD_SET(fd,&writemask);
+            switch (select(fd+1, NULL, &writemask, NULL, &tv)) {
+            case -1 : 
+                error = get_error();
+                if (error != EINTR)
+                    return error;
+                break;
+            case 0:
+                return ETIMEDOUT; /* timeout */
+            default:
+                if (!FD_ISSET(fd, &writemask)) {
+                    return EIO; /* Other error */
+                }
+                error = 0;
+                break;
+            }
+        } while (error == EINTR);
+    }
+    do {
+        error = cbs->writev(ctx, (const void *) iov, iovcnt, len, ms);
+    } while (error == EINTR);
+    return error;
+}
+
+int ei_writev_fill_ctx_t__(ei_socket_callbacks *cbs, void *ctx,
+                           const struct iovec *iov, int iovcnt,
+                           ssize_t *len,
+                           unsigned ms)
+{
+    ssize_t i, done, sum;
     struct iovec *iov_base = NULL;
     struct iovec *current_iov;
     int current_iovcnt;
-    int sum;
+    int fd, error;
+    int basic;
+
+    if (!cbs->writev)
+        return ENOTSUP;
+    
+    error = EI_GET_FD__(cbs, ctx, &fd);
+    if (error)
+        return error;
 
+    basic = !(cbs->flags & EI_SCLBK_FLG_FULL_IMPL);
+    
     for (sum = 0, i = 0; i < iovcnt; ++i) {
 	sum += iov[i].iov_len;
     }
-    if (ms != 0U) {
+    if (basic && ms != 0U) {
 	SET_NONBLOCKING(fd);
     } 
     current_iovcnt = iovcnt;
     current_iov = (struct iovec *) iov;
     done = 0;
     for (;;) {
-	i = ei_writev_t(fd, current_iov, current_iovcnt, ms);
-	if (i <= 0) { /* ei_writev_t should always return at least 1 */ 
+        
+	error = writev_ctx_t__(cbs, ctx, current_iov, current_iovcnt, &i, ms);
+        if (error) {
+            *len = done;
 	    if (ms != 0U) {
 		SET_BLOCKING(fd);
 	    }    
 	    if (iov_base != NULL) {
 		free(iov_base);
 	    }
-	    return (i);
-	}
+	    return error;
+        }
 	done += i;
 
 	if (done < sum) {
 	    if (iov_base == NULL) {
 		iov_base = malloc(sizeof(struct iovec) * iovcnt);
 		if (iov_base == NULL) {
-		return -1;
+                    *len = done;
+                    return ENOMEM;
 		}
 		memcpy(iov_base, iov, sizeof(struct iovec) * iovcnt);
 		current_iov = iov_base;
@@ -189,195 +478,383 @@ int ei_writev_fill_t(int fd,  const  struct  iovec  *iov,  int iovcnt, unsigned
 	    break;
 	}
     } 
-    if (ms != 0U) {
+    if (basic && ms != 0U) {
 	SET_BLOCKING(fd);
     }
     if (iov_base != NULL) {
 	free(iov_base);
     }
-    return (sum);
+    *len = done;
+    return 0;
 }
 
+#endif /* defined(EI_HAVE_STRUCT_IOVEC__) */
 
-#endif
-
-int ei_connect_t(int fd, void *sinp, int sin_siz, unsigned ms)
+int ei_socket_ctx__(ei_socket_callbacks *cbs, void **ctx, void *setup_ctx)
 {
     int res;
-    int error;
-    int s_res;
-    struct timeval tv;
-    fd_set writefds;
-    fd_set exceptfds;
-
-    if (ms == 0) {
-	res = connect(fd, sinp, sin_siz);
-	return (res < 0) ? -1 : res;
-    } else {
-	SET_NONBLOCKING(fd);
-	res = connect(fd, sinp, sin_siz);
-	error = GET_SOCKET_ERROR();
-	SET_BLOCKING(fd);
-	if (!MEANS_SOCKET_ERROR(res)) {
-	    return (res < 0) ? -1 : res;
-	} else {
-	    if (error != ERROR_WOULDBLOCK && 
-		error != ERROR_INPROGRESS) {
-		return -1;
-	    } else {
-		tv.tv_sec = (long) (ms/1000U);
-		ms %= 1000U;
-		tv.tv_usec = (long) (ms * 1000U);
-		FD_ZERO(&writefds);
-		FD_SET(fd,&writefds);
-		FD_ZERO(&exceptfds);
-		FD_SET(fd,&exceptfds);
-		s_res = select(fd + 1, NULL, &writefds, &exceptfds, &tv);
-		switch (s_res) {
-		case 0:
-		    return -2;
-		case 1:
-		    if (FD_ISSET(fd, &exceptfds)) {
-			return  -1;
-		    } else {
-			return 0; /* Connect completed */
-		    }
-		default:
-		    return -1;
-		}
-	    }
-	} 
-    }
+
+    do {
+        res = cbs->socket(ctx, setup_ctx);
+    } while (res == EINTR);
+
+    return res;
 }
 
-int ei_accept_t(int fd, void  *addr,   void  *addrlen, unsigned ms)
+int ei_close_ctx__(ei_socket_callbacks *cbs, void *ctx)
 {
-    int res;
-    if (ms != 0) {
-	fd_set readmask;
-	struct timeval tv;
-	tv.tv_sec = (time_t) (ms / 1000U);
-	ms %= 1000U;
-	tv.tv_usec = (time_t) (ms * 1000U);
-	FD_ZERO(&readmask);
-	FD_SET(fd,&readmask);
-	switch (select(fd+1, &readmask, NULL, NULL, &tv)) {
-	case -1 : 
-	    return -1; /* i/o error */
-	case 0:
-	    return -2; /* timeout */
-	default:
-	    if (!FD_ISSET(fd, &readmask)) {
-		return -1; /* Other error */
-	    }
-	}
-    }
-    res = (int) accept(fd,addr,addrlen);
-    return (res < 0) ? -1 : res;
+    return cbs->close(ctx);
 }
+
+int ei_connect_ctx_t__(ei_socket_callbacks *cbs, void *ctx,
+                       void *addr, int len, unsigned ms)
+{
+    int res, fd;
+
+    if ((cbs->flags & EI_SCLBK_FLG_FULL_IMPL) || ms == EI_SCLBK_INF_TMO) {
+        do {
+            res = cbs->connect(ctx, addr, len, ms);
+        } while (res == EINTR);
+        return res;
+    }
+
+    res = EI_GET_FD__(cbs, ctx, &fd);
+    if (res)
+        return res;
     
+    SET_NONBLOCKING(fd);
+    do {
+        res = cbs->connect(ctx, addr, len, 0);
+    } while (res == EINTR);
+    SET_BLOCKING(fd);
 
+    switch (res) {
+    case EINPROGRESS:
+    case EAGAIN:
+#ifdef EWOULDBLOCK
+#if EWOULDBLOCK != EAGAIN
+    case EWOULDBLOCK:
+#endif
+#endif
+        break;
+    default:
+        return res;
+    }
 
-static int ei_read_t(int fd, char* buf, int len, unsigned  ms)
+    while (1) {
+        struct timeval tv;
+        fd_set writefds;
+        fd_set exceptfds;
+        
+        tv.tv_sec = (long) (ms/1000U);
+        ms %= 1000U;
+        tv.tv_usec = (long) (ms * 1000U);
+        FD_ZERO(&writefds);
+        FD_SET(fd,&writefds);
+        FD_ZERO(&exceptfds);
+        FD_SET(fd,&exceptfds);
+        res = select(fd + 1, NULL, &writefds, &exceptfds, &tv);
+        switch (res) {
+        case -1:
+            res = get_error();
+            if (res != EINTR)
+                return res;
+            break;
+        case 0:
+            return ETIMEDOUT;
+        case 1:
+            if (!FD_ISSET(fd, &exceptfds))
+                return 0; /* Connect completed */
+            /* fall through... */
+        default:
+            return EIO;
+        }
+    }
+}
+
+int ei_listen_ctx__(ei_socket_callbacks *cbs, void *ctx,
+                    void *adr, int *len, int backlog)
 {
     int res;
-    if (ms != 0) {
-	fd_set readmask;
-	struct timeval tv;
-	tv.tv_sec = (time_t) (ms / 1000U);
-	ms %= 1000U;
-	tv.tv_usec = (time_t) (ms * 1000U);
-	FD_ZERO(&readmask);
-	FD_SET(fd,&readmask);
-	switch (select(fd+1, &readmask, NULL, NULL, &tv)) {
-	case -1 : 
-	    return -1; /* i/o error */
-	case 0:
-	    return -2; /* timeout */
-	default:
-	    if (!FD_ISSET(fd, &readmask)) {
-		return -1; /* Other error */
-	    }
-	}
+
+    do {
+        res = cbs->listen(ctx, adr, len, backlog);
+    } while (res == EINTR);
+    return res;
+}
+
+int ei_accept_ctx_t__(ei_socket_callbacks *cbs, void **ctx,
+                      void *addr, int *len, unsigned ms)
+{
+    int error;
+
+    if (!(cbs->flags & EI_SCLBK_FLG_FULL_IMPL) && ms != EI_SCLBK_INF_TMO) {
+        int fd;
+
+        error = EI_GET_FD__(cbs, *ctx, &fd);
+        if (error)
+            return error;
+
+        do {
+            fd_set readmask;
+            struct timeval tv;
+            
+            tv.tv_sec = (time_t) (ms / 1000U);
+            ms %= 1000U;
+            tv.tv_usec = (time_t) (ms * 1000U);
+            FD_ZERO(&readmask);
+            FD_SET(fd,&readmask);
+            switch (select(fd+1, &readmask, NULL, NULL, &tv)) {
+            case -1 : 
+                error = get_error();
+                if (error != EINTR)
+                    return error;
+                break;
+            case 0:
+                return ETIMEDOUT; /* timeout */
+            default:
+                if (!FD_ISSET(fd, &readmask)) {
+                    return EIO; /* Other error */
+                }
+                error = 0;
+                break;
+            }
+        } while (error == EINTR);
     }
-    res = readsocket(fd, buf, len);
-    return (res < 0) ? -1 : res;
+    do {
+        error = cbs->accept(ctx, addr, len, ms);
+    } while (error == EINTR);
+    return error;
 }
 
-static int ei_write_t(int fd, const char* buf, int len, unsigned  ms)
+static int read_ctx_t__(ei_socket_callbacks *cbs, void *ctx,
+                        char* buf, ssize_t *len, unsigned  ms)
 {
-    int res;
-    if (ms != 0) {
-	fd_set writemask;
-	struct timeval tv;
-	tv.tv_sec = (time_t) (ms / 1000U);
-	ms %= 1000U;
-	tv.tv_usec = (time_t) (ms * 1000U);
-	FD_ZERO(&writemask);
-	FD_SET(fd,&writemask);
-	switch (select(fd+1, NULL, &writemask, NULL, &tv)) {
-	case -1 : 
-	    return -1; /* i/o error */
-	case 0:
-	    return -2; /* timeout */
-	default:
-	    if (!FD_ISSET(fd, &writemask)) {
-		return -1; /* Other error */
-	    }
-	}
+    int error;
+
+    if (!(cbs->flags & EI_SCLBK_FLG_FULL_IMPL) && ms != EI_SCLBK_INF_TMO) {
+        int fd;
+
+        error = EI_GET_FD__(cbs, ctx, &fd);
+        if (error)
+            return error;
+        
+        do {
+            fd_set readmask;
+            struct timeval tv;
+            
+            tv.tv_sec = (time_t) (ms / 1000U);
+            ms %= 1000U;
+            tv.tv_usec = (time_t) (ms * 1000U);
+            FD_ZERO(&readmask);
+            FD_SET(fd,&readmask);
+            switch (select(fd+1, &readmask, NULL, NULL, &tv)) {
+            case -1 :
+                error = get_error();
+                if (error != EINTR)
+                    return error;
+                break;
+            case 0:
+                return ETIMEDOUT; /* timeout */
+            default:
+                if (!FD_ISSET(fd, &readmask)) {
+                    return EIO; /* Other error */
+                }
+                error = 0;
+                break;
+            }
+        } while (error == EINTR);
+    }
+    do {
+        error = cbs->read(ctx, buf, len, ms);
+    } while (error == EINTR);
+    return error;
+}
+
+static int write_ctx_t__(ei_socket_callbacks *cbs, void *ctx, const char* buf, ssize_t *len, unsigned  ms)
+{
+    int error;
+    
+    if (!(cbs->flags & EI_SCLBK_FLG_FULL_IMPL) && ms != EI_SCLBK_INF_TMO) {
+        int fd;
+
+        error = EI_GET_FD__(cbs, ctx, &fd);
+        if (error)
+            return error;
+
+        do {
+            fd_set writemask;
+            struct timeval tv;
+            
+            tv.tv_sec = (time_t) (ms / 1000U);
+            ms %= 1000U;
+            tv.tv_usec = (time_t) (ms * 1000U);
+            FD_ZERO(&writemask);
+            FD_SET(fd,&writemask);
+            switch (select(fd+1, NULL, &writemask, NULL, &tv)) {
+            case -1 : 
+                error = get_error();
+                if (error != EINTR)
+                    return error;
+                break;
+            case 0:
+                return ETIMEDOUT; /* timeout */
+            default:
+                if (!FD_ISSET(fd, &writemask)) {
+                    return EIO; /* Other error */
+                }
+                error = 0;
+                break;
+            }
+        } while (error == EINTR);
     }
-    res =  writesocket(fd, buf, len);
-    return (res < 0) ? -1 : res;
+    do {
+        error = cbs->write(ctx, buf, len, ms);
+    } while (error == EINTR);
+    return error;
 }
 	
 /* 
  * Fill buffer, return buffer length, 0 for EOF, < 0 (and sets errno)
  * for error.  */
-int ei_read_fill_t(int fd, char* buf, int len, unsigned  ms)
+int ei_read_fill_ctx_t__(ei_socket_callbacks *cbs, void *ctx, char* buf, ssize_t *len, unsigned  ms)
 {
-    int i,got=0;
+    ssize_t got = 0;
+    ssize_t want = *len;
 
     do {
-	i = ei_read_t(fd, buf+got, len-got, ms);
-	if (i <= 0)
-	    return (i);
-	got += i;
-    } while (got < len);
-    return (len);
-    
+        ssize_t read_len = want-got;
+        int error;
+
+        do {
+            error = read_ctx_t__(cbs, ctx, buf+got, &read_len, ms);
+        } while (error == EINTR);
+        if (error)
+            return error;
+        if (read_len == 0) {
+            *len = got;
+            return 0;
+        }
+	got += read_len;
+    } while (got < want);
+
+    *len = got;
+    return 0;
 } /* read_fill */
 
-int ei_read_fill(int fd, char* buf, int len)
+int ei_read_fill_ctx__(ei_socket_callbacks *cbs, void *ctx, char* buf, ssize_t *len)
 {
-    return ei_read_fill_t(fd, buf, len, 0);
+    return ei_read_fill_ctx_t__(cbs, ctx, buf, len, 0);
 }
 
 /* write entire buffer on fd  or fail (setting errno)
  */
-int ei_write_fill_t(int fd, const char *buf, int len, unsigned ms)
+int ei_write_fill_ctx_t__(ei_socket_callbacks *cbs, void *ctx, const char *buf, ssize_t *len, unsigned ms)
 {
-    int i,done=0;
-    if (ms != 0U) {
+    ssize_t tot = *len, done = 0;
+    int error, fd = -1, basic = !(cbs->flags & EI_SCLBK_FLG_FULL_IMPL);
+    
+    if (basic && ms != 0U) {
+        error = EI_GET_FD__(cbs, ctx, &fd);
+        if (error)
+            return error;
 	SET_NONBLOCKING(fd);
     }    
     do {
-	i = ei_write_t(fd, buf+done, len-done, ms);
-	if (i <= 0) {
-	    if (ms != 0U) {
+        ssize_t write_len = tot-done;
+	error = write_ctx_t__(cbs, ctx, buf+done, &write_len, ms);
+        if (error) {
+            *len = done;
+	    if (basic && ms != 0U) {
 		SET_BLOCKING(fd);
 	    }    
-	    return (i);
+	    return error;
 	}
-	done += i;
-    } while (done < len);
-    if (ms != 0U) {
+	done += write_len;
+    } while (done < tot);
+    if (basic && ms != 0U) {
 	SET_BLOCKING(fd);
     }
-    return (len);
+    *len = done;
+    return 0;
+}
+
+int ei_write_fill_ctx__(ei_socket_callbacks *cbs, void *ctx, const char *buf, ssize_t *len) 
+{
+    return ei_write_fill_ctx_t__(cbs, ctx, buf, len, 0);
+}
+
+/*
+ * Internal API for TCP/IPv4
+ */
+
+int ei_connect_t__(int fd, void *addr, int len, unsigned ms)
+{
+    return ei_connect_ctx_t__(&ei_default_socket_callbacks, EI_FD_AS_CTX__(fd),
+                              addr, len, ms);
 }
 
-int ei_write_fill(int fd, const char *buf, int len) 
+int ei_socket__(int *fd)
 {
-    return ei_write_fill_t(fd, buf, len, 0);
+    void *ctx;
+    int error = ei_socket_ctx__(&ei_default_socket_callbacks, &ctx, NULL);
+    if (error)
+        return error;
+    return EI_GET_FD__(&ei_default_socket_callbacks, ctx, fd);
 }
 
+int ei_close__(int fd)
+{
+    return ei_close_ctx__(&ei_default_socket_callbacks, EI_FD_AS_CTX__(fd));
+}
+
+int ei_listen__(int fd, void *adr, int *len, int backlog)
+{
+    return ei_listen_ctx__(&ei_default_socket_callbacks, EI_FD_AS_CTX__(fd),
+                           adr, len, backlog);
+}
+
+int ei_accept_t__(int *fd, void *addr, int *len, unsigned ms)
+{
+    void *ctx = EI_FD_AS_CTX__(*fd);
+    int error = ei_accept_ctx_t__(&ei_default_socket_callbacks, &ctx,
+                                  addr, len, ms);
+    if (error)
+        return error;
+    return EI_GET_FD__(&ei_default_socket_callbacks, ctx, fd);
+}
+
+int ei_read_fill_t__(int fd, char* buf, ssize_t *len, unsigned  ms)
+{
+    return ei_read_fill_ctx_t__(&ei_default_socket_callbacks, EI_FD_AS_CTX__(fd),
+                                buf, len, ms);
+}
+
+int ei_read_fill__(int fd, char* buf, ssize_t *len)
+{
+    return ei_read_fill_ctx_t__(&ei_default_socket_callbacks, EI_FD_AS_CTX__(fd),
+                                buf, len, 0);
+}
+
+int ei_write_fill_t__(int fd, const char *buf, ssize_t *len, unsigned ms)
+{
+    return ei_write_fill_ctx_t__(&ei_default_socket_callbacks, EI_FD_AS_CTX__(fd),
+                                 buf, len, ms);
+}
+
+int ei_write_fill__(int fd, const char *buf, ssize_t *len) 
+{
+    return ei_write_fill_ctx_t__(&ei_default_socket_callbacks, EI_FD_AS_CTX__(fd),
+                                 buf, len, 0);
+}
+
+#if defined(EI_HAVE_STRUCT_IOVEC__) && defined(HAVE_WRITEV)
+
+int ei_writev_fill_t__(int fd, const struct iovec  *iov,  int iovcnt, ssize_t *len, unsigned ms)
+{
+    return ei_writev_fill_ctx_t__(&ei_default_socket_callbacks, EI_FD_AS_CTX__(fd),
+                                  iov, iovcnt, len, ms);
+}
+
+#endif
+
diff --git a/lib/erl_interface/src/misc/ei_portio.h b/lib/erl_interface/src/misc/ei_portio.h
index bded811a35..a84b5ca09c 100644
--- a/lib/erl_interface/src/misc/ei_portio.h
+++ b/lib/erl_interface/src/misc/ei_portio.h
@@ -21,21 +21,94 @@
  */
 #ifndef _EI_PORTIO_H
 #define _EI_PORTIO_H
-#if !defined(__WIN32__) && !defined(VXWORKS)
-#ifdef HAVE_WRITEV
+
+#undef EI_HAVE_STRUCT_IOVEC__
+#if !defined(__WIN32__) && !defined(VXWORKS) && defined(HAVE_SYS_UIO_H)
 /* Declaration of struct iovec *iov should be visible in this scope. */
-#include <sys/uio.h>
+#  include <sys/uio.h>
+#  define EI_HAVE_STRUCT_IOVEC__
 #endif
+
+/*
+ * Internal API. Should not be used outside of the erl_interface application...
+ */
+
+int ei_socket_ctx__(ei_socket_callbacks *cbs, void **ctx, void *setup);
+int ei_close_ctx__(ei_socket_callbacks *cbs, void *ctx);
+int ei_listen_ctx__(ei_socket_callbacks *cbs, void *ctx, void *adr, int *len, int backlog);
+int ei_accept_ctx_t__(ei_socket_callbacks *cbs, void **ctx, void *addr, int *len, unsigned ms);
+int ei_connect_ctx_t__(ei_socket_callbacks *cbs, void *ctx, void *addr, int len, unsigned ms);
+int ei_read_fill_ctx__(ei_socket_callbacks *cbs, void *ctx, char* buf, ssize_t *len);
+int ei_write_fill_ctx__(ei_socket_callbacks *cbs, void *ctx, const char *buf, ssize_t *len);
+int ei_read_fill_ctx_t__(ei_socket_callbacks *cbs, void *ctx, char* buf, ssize_t *len, unsigned  ms);
+int ei_write_fill_ctx_t__(ei_socket_callbacks *cbs, void *ctx, const char *buf, ssize_t *len, unsigned ms);
+#if defined(EI_HAVE_STRUCT_IOVEC__)
+int ei_writev_fill_ctx_t__(ei_socket_callbacks *cbs, void *ctx, const struct iovec *iov, int iovcnt, ssize_t *len, unsigned ms);
+int ei_socket_callbacks_have_writev__(ei_socket_callbacks *cbs);
 #endif
 
-int ei_accept_t(int fd, void   *addr,   void  *addrlen, unsigned ms);
-int ei_connect_t(int fd, void *sinp, int sin_siz, unsigned ms);
-int ei_read_fill(int fd, char* buf, int len);
-int ei_write_fill(int fd, const char *buf, int len);
-int ei_read_fill_t(int fd, char* buf, int len, unsigned ms);
-int ei_write_fill_t(int fd, const char *buf, int len, unsigned ms);
-#ifdef HAVE_WRITEV
-int ei_writev_fill_t(int fd,  const  struct  iovec  *iov,  int iovcnt, unsigned ms);
+ei_socket_callbacks ei_default_socket_callbacks;
+
+#define EI_FD_AS_CTX__(FD)                                              \
+    ((void *) (long) (FD))
+
+#define EI_DFLT_CTX_TO_FD__(CTX, FD)                                    \
+    ((int) (long) (CTX) < 0                                             \
+     ? EBADF                                                            \
+     : (*(FD) = (int) (long) (CTX), 0))
+
+#define EI_GET_FD__(CBS, CTX, FD)                                       \
+    ((CBS) == &ei_default_socket_callbacks                              \
+     ? EI_DFLT_CTX_TO_FD__((CTX), FD)                                   \
+     : (CBS)->get_fd((CTX), (FD)))
+
+extern int ei_plugin_socket_impl__;
+
+#if !defined(_REENTRANT)
+
+#define EI_HAVE_PLUGIN_SOCKET_IMPL__                                    \
+    ei_plugin_socket_impl__
+#define EI_SET_HAVE_PLUGIN_SOCKET_IMPL__                                \
+    ei_plugin_socket_impl__ = 1
+
+#elif ((ETHR_HAVE___atomic_load_n & SIZEOF_INT)                         \
+       && (ETHR_HAVE___atomic_store_n & SIZEOF_INT))
+
+#define EI_HAVE_PLUGIN_SOCKET_IMPL__                                    \
+    __atomic_load_n(&ei_plugin_socket_impl__, __ATOMIC_ACQUIRE)
+#define EI_SET_HAVE_PLUGIN_SOCKET_IMPL__                                \
+    __atomic_store_n(&ei_plugin_socket_impl__, 1, __ATOMIC_RELEASE)
+
+#else
+
+/* No gcc atomics; always lookup using ei_get_cbs_ctx()... */
+#define EI_HAVE_PLUGIN_SOCKET_IMPL__ 0
+#define EI_SET_HAVE_PLUGIN_SOCKET_IMPL__ (void) 0
+
+#endif
+
+#define EI_GET_CBS_CTX__(CBS, CTX, FD)                                  \
+    (EI_HAVE_PLUGIN_SOCKET_IMPL__                                       \
+     ? ei_get_cbs_ctx__((CBS), (CTX), (FD))                             \
+     : ((FD) < 0                                                        \
+        ? EBADF                                                         \
+        : (*(CBS) = &ei_default_socket_callbacks,                       \
+           *(CTX) = EI_FD_AS_CTX__((FD)),                               \
+           0)))
+/*      
+ * The following uses our own TCP/IPv4 socket implementation...
+ */
+int ei_socket__(int *fd);
+int ei_close__(int fd);
+int ei_listen__(int fd, void *adr, int *len, int backlog);
+int ei_accept_t__(int *fd, void *addr, int *len, unsigned ms);
+int ei_connect_t__(int fd, void *addr, int len, unsigned ms);
+int ei_read_fill__(int fd, char* buf, ssize_t *len);
+int ei_write_fill__(int fd, const char *buf, ssize_t *len);
+int ei_read_fill_t__(int fd, char* buf, ssize_t *len, unsigned ms);
+int ei_write_fill_t__(int fd, const char *buf, ssize_t *len, unsigned ms);
+#if defined(EI_HAVE_STRUCT_IOVEC__) && defined(HAVE_WRITEV)
+int ei_writev_fill_t__(int fd, const struct iovec *iov, int iovcnt, ssize_t *len, unsigned ms);
 #endif
 
 #endif /* _EI_PORTIO_H */
diff --git a/lib/erl_interface/src/misc/ei_printterm.c b/lib/erl_interface/src/misc/ei_printterm.c
index 058de00de5..aee7f7eeb0 100644
--- a/lib/erl_interface/src/misc/ei_printterm.c
+++ b/lib/erl_interface/src/misc/ei_printterm.c
@@ -121,8 +121,10 @@ static int print_term(FILE* fp, ei_x_buff* x,
     erlang_pid pid;
     erlang_port port;
     erlang_ref ref;
+    erlang_fun fun;
     double d;
     long l;
+    const char* delim;
 
     int tindex = *index;
 
@@ -131,7 +133,7 @@ static int print_term(FILE* fp, ei_x_buff* x,
     if (fp == NULL && x == NULL) return -1;
 
     doquote = 0;
-    ei_get_type_internal(buf, index, &ty, &n);
+    ei_get_type(buf, index, &ty, &n);
     switch (ty) {
     case ERL_ATOM_EXT:   
     case ERL_ATOM_UTF8_EXT:
@@ -189,7 +191,7 @@ static int print_term(FILE* fp, ei_x_buff* x,
 		xputs(", ", fp, x); ch_written += 2;
 	    }
 	}
-	if (ei_get_type_internal(buf, &tindex, &ty, &n) < 0) goto err;
+	if (ei_get_type(buf, &tindex, &ty, &n) < 0) goto err;
 	if (ty != ERL_NIL_EXT) {
 	    xputs(" | ", fp, x); ch_written += 3;
 	    r = print_term(fp, x, buf, &tindex);
@@ -239,16 +241,50 @@ static int print_term(FILE* fp, ei_x_buff* x,
 	    m = BINPRINTSIZE;
 	else
 	    m = l;
-	--m;
+        delim = "";
 	for (i = 0; i < m; ++i) {
-	    ch_written += xprintf(fp, x, "%d,", p[i]);
+	    ch_written += xprintf(fp, x, "%s%u", delim, (unsigned char)p[i]);
+            delim = ",";
 	}
-	ch_written += xprintf(fp, x, "%d", p[i]);
 	if (l > BINPRINTSIZE)
 	    ch_written += xprintf(fp, x, ",...");
 	xputc('>', fp, x); ++ch_written;
 	ei_free(p);
 	break;
+    case ERL_BIT_BINARY_EXT: {
+        const unsigned char* cp;
+        size_t bits;
+        unsigned int bitoffs;
+        int trunc = 0;
+
+        if (ei_decode_bitstring(buf, index, (const char**)&cp, &bitoffs, &bits) < 0
+            || bitoffs != 0) {
+            goto err;
+        }
+        ch_written += xprintf(fp, x, "#Bits<");
+        if ((bits+7) / 8 > BINPRINTSIZE) {
+            m = BINPRINTSIZE;
+            trunc = 1;
+        }
+        else
+            m = bits / 8;
+
+        delim = "";
+        for (i = 0; i < m; ++i) {
+            ch_written += xprintf(fp, x, "%s%u", delim, cp[i]);
+            delim = ",";
+        }
+        if (trunc)
+            ch_written += xprintf(fp, x, ",...");
+        else {
+            bits %= 8;
+            if (bits)
+                ch_written += xprintf(fp, x, "%s%u:%u", delim,
+                                      (cp[i] >> (8-bits)), bits);
+        }
+        xputc('>', fp, x); ++ch_written;
+        break;
+    }
     case ERL_SMALL_INTEGER_EXT:
     case ERL_INTEGER_EXT:
 	if (ei_decode_long(buf, index, &l) < 0) goto err;
@@ -278,12 +314,46 @@ static int print_term(FILE* fp, ei_x_buff* x,
             
         }
         break;
-
     case ERL_FLOAT_EXT:
     case NEW_FLOAT_EXT:
 	if (ei_decode_double(buf, index, &d) < 0) goto err;
 	ch_written += xprintf(fp, x, "%f", d);
 	break;
+    case ERL_MAP_EXT:
+	if (ei_decode_map_header(buf, &tindex, &n) < 0) goto err;
+        ch_written += xprintf(fp, x, "#{");
+	for (i = 0; i < n; ++i) {
+	    r = print_term(fp, x, buf, &tindex);
+	    if (r < 0) goto err;
+	    ch_written += r;
+            ch_written += xprintf(fp, x, " => ");
+	    r = print_term(fp, x, buf, &tindex);
+	    if (r < 0) goto err;
+	    ch_written += r;
+	    if (i < n-1) {
+		xputs(", ", fp, x); ch_written += 2;
+	    }
+	}
+	*index = tindex;
+	xputc('}', fp, x); ch_written++;
+	break;
+    case ERL_FUN_EXT:
+    case ERL_NEW_FUN_EXT:
+    case ERL_EXPORT_EXT:
+	if (ei_decode_fun(buf, &tindex, &fun) < 0) goto err;
+        if (fun.type == EI_FUN_EXPORT) {
+            ch_written += xprintf(fp, x, "fun %s:%s/%ld",
+                                  fun.module,
+                                  fun.u.exprt.func,
+                                  fun.arity);
+        } else {
+            ch_written += xprintf(fp, x, "#Fun{%s.%ld.%lu}",
+                                  fun.module,
+                                  fun.u.closure.index,
+                                  fun.u.closure.uniq);
+        }
+	*index = tindex;
+	break;
     default:
 	goto err;
     }
diff --git a/lib/erl_interface/src/misc/ei_pthreads.c b/lib/erl_interface/src/misc/ei_pthreads.c
index ec1c8d956f..c6d07a9a0a 100644
--- a/lib/erl_interface/src/misc/ei_pthreads.c
+++ b/lib/erl_interface/src/misc/ei_pthreads.c
@@ -78,7 +78,7 @@ static void tls_init_once(void)
 	errno_tls_index = TlsAlloc();
 	if (errno_tls_index == TLS_OUT_OF_INDEXES) {
 	    fprintf(stderr, 
-		    "FATAL ERROR: can not allocate TLS index for "
+		    "FATAL ERROR: cannot allocate TLS index for "
 		    "erl_errno (error code = %d)!\n",GetLastError());
 	    exit(1);
 	}
diff --git a/lib/erl_interface/src/misc/ei_x_encode.c b/lib/erl_interface/src/misc/ei_x_encode.c
index 4ff5974663..8e77679d2a 100644
--- a/lib/erl_interface/src/misc/ei_x_encode.c
+++ b/lib/erl_interface/src/misc/ei_x_encode.c
@@ -117,6 +117,16 @@ int ei_x_encode_binary(ei_x_buff* x, const void* p, int len)
     return ei_encode_binary(x->buff, &x->index, p, len);
 }
 
+int ei_x_encode_bitstring(ei_x_buff* x, const char* p, size_t bitoffs, size_t bits)
+{
+    int i = x->index;
+    if (ei_encode_bitstring(NULL, &i, p, bitoffs, bits) == -1)
+      return -1;
+    if (!x_fix_buff(x, i))
+	return -1;
+    return ei_encode_bitstring(x->buff, &x->index, p, bitoffs, bits);
+}
+
 int ei_x_encode_long(ei_x_buff* x, long n)
 {
     int i = x->index;
diff --git a/lib/erl_interface/src/misc/get_type.c b/lib/erl_interface/src/misc/get_type.c
index aa69cd4d60..eef58a9363 100644
--- a/lib/erl_interface/src/misc/get_type.c
+++ b/lib/erl_interface/src/misc/get_type.c
@@ -27,17 +27,8 @@
 /* for types with meaningful length attributes, return the length too.
    In other cases, return length 0 */
 
-/* FIXME working on this one.... */
-
 int ei_get_type(const char *buf, const int *index, int *type, int *len)
 {
-    return ei_get_type_internal(buf, index, type, len);
-}
-
-   
-int ei_get_type_internal(const char *buf, const int *index,
-			 int *type, int *len)
-{
   const char *s = buf + *index;
 
   *type = get8(s);
@@ -64,7 +55,9 @@ int ei_get_type_internal(const char *buf, const int *index,
 
   case ERL_LARGE_TUPLE_EXT:
   case ERL_LIST_EXT:
+  case ERL_MAP_EXT:
   case ERL_BINARY_EXT:
+  case ERL_BIT_BINARY_EXT:
     *len = get32be(s);
     break;
     
diff --git a/lib/erl_interface/src/misc/show_msg.c b/lib/erl_interface/src/misc/show_msg.c
index 5868cccba6..805d69e9b3 100644
--- a/lib/erl_interface/src/misc/show_msg.c
+++ b/lib/erl_interface/src/misc/show_msg.c
@@ -342,7 +342,7 @@ static void show_term(const char *termbuf, int *index, FILE *stream)
     int i, len;
     char *s;
 
-    ei_get_type_internal(termbuf,index,&type,&len);
+    ei_get_type(termbuf,index,&type,&len);
   
     switch (type) {
     case ERL_VERSION_MAGIC:
@@ -455,6 +455,12 @@ static void show_term(const char *termbuf, int *index, FILE *stream)
 	fprintf(stream,"#Bin<%ld>",num);
 	break;
     
+    case ERL_BIT_BINARY_EXT: {
+        size_t bits;
+        ei_decode_bitstring(termbuf, index, NULL, NULL, &bits);
+        fprintf(stream, "#Bits<%lu>", (unsigned long)bits);
+        break;
+    }
     case ERL_LARGE_BIG_EXT:
 	/* doesn't actually decode - just skip over it */
 	/* FIXME if GMP, what to do here?? */
diff --git a/lib/erl_interface/src/not_used/send_link.c b/lib/erl_interface/src/not_used/send_link.c
index 7be476fd93..38fae27df4 100644
--- a/lib/erl_interface/src/not_used/send_link.c
+++ b/lib/erl_interface/src/not_used/send_link.c
@@ -50,6 +50,7 @@ static int link_unlink(int fd, const erlang_pid *from, const erlang_pid *to,
   char *s;
   int index = 0;
   int n;
+  unsigned tmo = ms == 0 ? EI_SCLBK_INF_TMO : ms;
 
   index = 5;                                     /* max sizes: */
   ei_encode_version(msgbuf,&index);                     /*   1 */
@@ -69,7 +70,7 @@ static int link_unlink(int fd, const erlang_pid *from, const erlang_pid *to,
   if (ei_trace_distribution > 1) ei_show_sendmsg(stderr,msgbuf,NULL);
 #endif
 
-  n = ei_write_fill_t(fd,msgbuf,index,ms); 
+  n = ei_write_fill_t__(fd,msgbuf,index,tmo); 
 
   return (n==index ? 0 : -1);
 }
diff --git a/lib/erl_interface/src/prog/ei_fake_prog.c b/lib/erl_interface/src/prog/ei_fake_prog.c
index c7a16dc7c4..6f58c9833d 100644
--- a/lib/erl_interface/src/prog/ei_fake_prog.c
+++ b/lib/erl_interface/src/prog/ei_fake_prog.c
@@ -98,11 +98,18 @@ int main(void)
   EI_ULONGLONG ulonglongx = 0;
 #endif
   erlang_char_encoding enc;
+  ei_socket_callbacks cbs;
 
   intx = erl_errno;
 
+  ei_init();
+
+  ei_close_connection(intx);
+  
   ei_connect_init(&xec, charp, charp, creation);
+  ei_connect_init_ussi(&xec, charp, charp, creation, &cbs, sizeof(cbs), NULL);
   ei_connect_xinit (&xec, charp, charp, charp, thisipaddr, charp, creation);
+  ei_connect_xinit_ussi(&xec, charp, charp, charp, thisipaddr, charp, creation, &cbs, sizeof(cbs), NULL);
 
   ei_connect(&xec, charp);
   ei_xconnect (&xec, thisipaddr, charp);
@@ -121,6 +128,8 @@ int main(void)
   ei_publish(&xec, intx);
   ei_accept(&xec, intx, &conp);
   ei_unpublish(&xec);
+  ei_listen(&xec, intp, intx);
+  ei_xlisten(&xec, thisipaddr, intp, intx);
 
   ei_thisnodename(&xec);
   ei_thishostname(&xec);
@@ -177,7 +186,6 @@ int main(void)
   ei_x_encode_empty_list(&eix);
 
   ei_get_type(charp, intp, intp, intp);
-  ei_get_type_internal(charp, intp, intp, intp);
 
   ei_decode_version(charp, intp, intp);
   ei_decode_long(charp, intp, longp);
@@ -187,7 +195,7 @@ int main(void)
   ei_decode_char(charp, intp, charp);
   ei_decode_string(charp, intp, charp);
   ei_decode_atom(charp, intp, charp);
-  ei_decode_atom_as(charp, intp, charp, MAXATOMLEN_UTF8, ERLANG_WHATEVER, &enc, &enc);
+  ei_decode_atom_as(charp, intp, charp, MAXATOMLEN_UTF8, ERLANG_UTF8, &enc, &enc);
   ei_decode_binary(charp, intp, (void *)0, longp);
   ei_decode_fun(charp, intp, &efun);
   free_fun(&efun);
diff --git a/lib/erl_interface/src/prog/erl_call.c b/lib/erl_interface/src/prog/erl_call.c
index 52ad6885e8..ab91157035 100644
--- a/lib/erl_interface/src/prog/erl_call.c
+++ b/lib/erl_interface/src/prog/erl_call.c
@@ -88,10 +88,6 @@
 #include "ei_resolve.h"
 #include "erl_start.h"		/* FIXME remove dependency */
 
-#ifdef __WIN32__
-static void initWinSock(void);
-#endif
-
 /*
  * Some nice global variables
  * (I don't think "nice" is the right word actually... -gordon)
@@ -157,6 +153,8 @@ int erl_call(int argc, char **argv)
     char* progname = argv[0];
     ei_cnode ec;
 
+    ei_init();
+
     /* Get the command line options */
     while (i < argc) {
 	if (argv[i][0] != '-') {
@@ -317,14 +315,6 @@ int erl_call(int argc, char **argv)
       struct in_addr h_ipadr;
       char* ct;
 
-#ifdef __WIN32__
-      /*
-       * FIXME Extremly ugly, but needed to get ei_gethostbyname() below
-       * to work.
-       */
-      initWinSock();
-#endif
-
       /* gethostname requires len to be max(hostname) + 1 */
       if (gethostname(h_hostname, EI_MAXHOSTNAMELEN+1) < 0) {
 	  fprintf(stderr,"erl_call: failed to get host name: %d\n", errno);
@@ -857,46 +847,6 @@ static void usage(const char *progname) {
   exit(0);
 }
 
-
-/***************************************************************************
- *
- *  OS specific functions
- *
- ***************************************************************************/
-
-#ifdef __WIN32__
-/*
- * FIXME This should not be here.  This is a quick fix to make erl_call
- * work at all on Windows NT.
- */
-static void initWinSock(void)
-{
-    WORD wVersionRequested;  
-    WSADATA wsaData; 
-    int err; 
-    static int initialized;
-
-    wVersionRequested = MAKEWORD(1, 1); 
-    if (!initialized) {
-	initialized = 1;
-	err = WSAStartup(wVersionRequested, &wsaData); 
- 
-	if (err != 0) {
-	    fprintf(stderr,"erl_call: "
-		    "Can't initialize windows sockets: %d\n", err);
-	}
-  
-	if ( LOBYTE( wsaData.wVersion ) != 1 || 
-	    HIBYTE( wsaData.wVersion ) != 1 ) { 
-	    fprintf(stderr,"erl_call: This version of "
-		    "windows sockets not supported\n");
-	    WSACleanup(); 
-	}
-    }
-}
-#endif
-
-
 /***************************************************************************
  *
  *  Utility functions
diff --git a/lib/erl_interface/src/prog/erl_start.c b/lib/erl_interface/src/prog/erl_start.c
index 670a5900c9..b7aa451946 100644
--- a/lib/erl_interface/src/prog/erl_start.c
+++ b/lib/erl_interface/src/prog/erl_start.c
@@ -97,7 +97,7 @@
 #endif
 
 #ifndef RSH
-#define RSH "/usr/bin/rsh"
+#define RSH "/usr/bin/ssh"
 #endif
 
 #ifndef HAVE_SOCKLEN_T
@@ -657,7 +657,7 @@ static int wait_for_erlang(int sockd, int magic, struct timeval *timeout)
     gettimeofday(&now,NULL);
     to.tv_sec = stop_time.tv_sec - now.tv_sec;
     to.tv_usec = stop_time.tv_usec - now.tv_usec;
-    while ((to.tv_usec <= 0) && (to.tv_sec >= 0)) {
+    while ((to.tv_usec < 0) && (to.tv_sec > 0)) {
       to.tv_usec += 1000000;
       to.tv_sec--;
     }
diff --git a/lib/erl_interface/src/registry/reg_dump.c b/lib/erl_interface/src/registry/reg_dump.c
index 43c9824433..da0413e6e6 100644
--- a/lib/erl_interface/src/registry/reg_dump.c
+++ b/lib/erl_interface/src/registry/reg_dump.c
@@ -90,7 +90,7 @@ static int mn_start_dump(int fd, const erlang_pid *self,
 	    || (arity != 2) 
 	    || ei_decode_atom(buf,&index,tmpbuf) 
 	    || strcmp(tmpbuf,"rex")
-	    || ei_get_type_internal(buf,&index,&type,&arity) 
+	    || ei_get_type(buf,&index,&type,&arity)
 	    || (type != ERL_PID_EXT))
 	  return -1; /* bad response from other side */
       
diff --git a/lib/erl_interface/test/Makefile b/lib/erl_interface/test/Makefile
index 94f4b422d6..f8f2ef0156 100644
--- a/lib/erl_interface/test/Makefile
+++ b/lib/erl_interface/test/Makefile
@@ -33,6 +33,7 @@ MODULES= \
 	ei_format_SUITE \
 	ei_print_SUITE \
 	ei_tmo_SUITE \
+	erl_call_SUITE \
 	erl_connect_SUITE \
 	erl_global_SUITE \
 	erl_eterm_SUITE \
diff --git a/lib/erl_interface/test/all_SUITE_data/ei_runner.h b/lib/erl_interface/test/all_SUITE_data/ei_runner.h
index 2608661303..7c874ac82e 100644
--- a/lib/erl_interface/test/all_SUITE_data/ei_runner.h
+++ b/lib/erl_interface/test/all_SUITE_data/ei_runner.h
@@ -53,6 +53,7 @@ void free_packet(char*);
 
 #define fail(reason) do_fail(__FILE__, __LINE__, reason)
 #define fail1(reason, a1) do_fail(__FILE__, __LINE__, reason, a1)
+#define fail2(reason, a1, a2) do_fail(__FILE__, __LINE__, reason, a1, a2)
 #define report(ok) do_report(__FILE__, __LINE__, ok)
 
 void do_report(char* file, int line, int ok);
diff --git a/lib/erl_interface/test/ei_accept_SUITE.erl b/lib/erl_interface/test/ei_accept_SUITE.erl
index 78a433d21b..f40c67375b 100644
--- a/lib/erl_interface/test/ei_accept_SUITE.erl
+++ b/lib/erl_interface/test/ei_accept_SUITE.erl
@@ -43,8 +43,12 @@ init_per_testcase(Case, Config) ->
     runner:init_per_testcase(?MODULE, Case, Config).
 
 ei_accept(Config) when is_list(Config) ->
+    ei_accept_do(Config, 0),   % default
+    ei_accept_do(Config, 21).  % ei_set_compat_rel
+
+ei_accept_do(Config, CompatRel) ->
     P = runner:start(Config, ?interpret),
-    0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
+    0 = ei_connect_init(P, 42, erlang:get_cookie(), 0, CompatRel),
 
     Myname = hd(tl(string:tokens(atom_to_list(node()), "@"))),
     io:format("Myname ~p ~n",  [Myname]),
@@ -52,15 +56,18 @@ ei_accept(Config) when is_list(Config) ->
     io:format("EINode ~p ~n",  [EINode]),
 
     %% We take this opportunity to also test export-funs and bit-strings
-    %% with (ugly) tuple fallbacks.
+    %% with (ugly) tuple fallbacks in OTP 21 and older.
     %% Test both toward pending connection and established connection.
     RealTerms = [<<1:1>>,     fun lists:map/2],
-    Fallbacks = [{<<128>>,1}, {lists,map}],
+    EncTerms = case CompatRel of
+                   0 -> RealTerms;
+                   21 -> [{<<128>>,1}, {lists,map}]
+                end,
 
     Self = self(),
     Funny = fun() -> hello end,
     TermToSend = {call, Self, "Test", Funny, RealTerms},
-    TermToGet  = {call, Self, "Test", Funny, Fallbacks},
+    TermToGet  = {call, Self, "Test", Funny, EncTerms},
     Port = 6543,
     {ok, ListenFd} = ei_publish(P, Port),
     {any, EINode} ! TermToSend,
@@ -81,12 +88,10 @@ ei_accept(Config) when is_list(Config) ->
 
 ei_threaded_accept(Config) when is_list(Config) ->
     Einode = filename:join(proplists:get_value(data_dir, Config), "eiaccnode"),
-    N = 1, % 3,
+    N = 3,
     Host = atom_to_list(node()),
-    Port = 6767,
-    start_einode(Einode, N, Host, Port),
+    start_einode(Einode, N, Host),
     io:format("started eiaccnode"),
-    %%spawn_link(fun() -> start_einode(Einode, N, Host, Port) end),
     TestServerPid = self(),
     [spawn_link(fun() -> send_rec_einode(I, TestServerPid) end) || I <- lists:seq(0, N-1)],
     [receive I -> ok end || I <- lists:seq(0, N-1) ],
@@ -96,7 +101,7 @@ ei_threaded_accept(Config) when is_list(Config) ->
 %% Test erlang:monitor toward erl_interface "processes"
 monitor_ei_process(Config) when is_list(Config) ->
     P = runner:start(Config, ?interpret),
-    0 = ei_connect_init(P, 42, erlang:get_cookie(), 0),
+    0 = ei_connect_init(P, 42, erlang:get_cookie(), 0, 0),
 
     Myname = hd(tl(string:tokens(atom_to_list(node()), "@"))),
     io:format("Myname ~p ~n",  [Myname]),
@@ -159,10 +164,9 @@ send_rec_einode(N, TestServerPid) ->
               ct:fail(EINode)
     end.
 
-start_einode(Einode, N, Host, Port) ->
+start_einode(Einode, N, Host) ->
     Einodecmd = Einode ++ " " ++ atom_to_list(erlang:get_cookie())
-    ++ " " ++ integer_to_list(N) ++ " " ++ Host ++ " "
-    ++ integer_to_list(Port) ++ " nothreads",
+    ++ " " ++ integer_to_list(N) ++ " " ++ Host,
     io:format("Einodecmd  ~p ~n", [Einodecmd]),      
     open_port({spawn, Einodecmd}, []),
     ok.
@@ -170,8 +174,8 @@ start_einode(Einode, N, Host, Port) ->
 
 %%% Interface functions for ei (erl_interface) functions.
 
-ei_connect_init(P, Num, Cookie, Creation) ->
-    send_command(P, ei_connect_init, [Num,Cookie,Creation]),
+ei_connect_init(P, Num, Cookie, Creation, Compat) ->
+    send_command(P, ei_connect_init, [Num,Cookie,Creation,Compat]),
     case get_term(P) of
         {term,Int} when is_integer(Int) -> Int
     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 50df848b69..09b0b5440b 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
@@ -58,7 +58,7 @@ static struct {
     int num_args;		/* Number of arguments. */
     void (*func)(char* buf, int len);
 } commands[] = {
-    "ei_connect_init",  3, cmd_ei_connect_init,
+    "ei_connect_init",  4, cmd_ei_connect_init,
     "ei_publish", 	1, cmd_ei_publish,
     "ei_accept", 	1, cmd_ei_accept,
     "ei_receive",  	1, cmd_ei_receive,
@@ -74,6 +74,8 @@ TESTCASE(interpret)
     int i;
     ei_term term;
 
+    ei_init();
+
     ei_x_new(&x);
     while (get_bin_term(&x, &term) == 0) {
 	    char* buf = x.buff, func[MAXATOMLEN];
@@ -104,66 +106,51 @@ TESTCASE(interpret)
 static void cmd_ei_connect_init(char* buf, int len)
 {
     int index = 0, r = 0;
-    int type, size;
-    long l;
-    char b[100];
+    long num, creation;
+    unsigned long compat;
+    char node_name[100];
     char cookie[MAXATOMLEN], * cp = cookie;
     ei_x_buff res;
-    if (ei_decode_long(buf, &index, &l) < 0)
+    if (ei_decode_long(buf, &index, &num) < 0)
 	fail("expected int");
-    sprintf(b, "c%d", l);
-    /* FIXME don't use internal and maybe use skip?! */
-    ei_get_type_internal(buf, &index, &type, &size);
+    sprintf(node_name, "c%d", num);
     if (ei_decode_atom(buf, &index, cookie) < 0)
 	fail("expected atom (cookie)");
     if (cookie[0] == '\0')
 	cp = NULL;
-    r = ei_connect_init(&ec, b, cp, 0);
+    if (ei_decode_long(buf, &index, &creation) < 0)
+	fail("expected int");
+    if (ei_decode_long(buf, &index, &compat) < 0)
+	fail("expected uint");
+    if (compat)
+        ei_set_compat_rel(compat);
+    r = ei_connect_init(&ec, node_name, cp, creation);
     ei_x_new_with_version(&res);
     ei_x_encode_long(&res, r);
     send_bin_term(&res);
     ei_x_free(&res);
 }
 
-static int my_listen(int port)
-{
-    int listen_fd;
-    struct sockaddr_in addr;
-    const char *on = "1";
-    
-    if ((listen_fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-	return -1;
-    
-    setsockopt(listen_fd, SOL_SOCKET, SO_REUSEADDR, on, sizeof(on));
-    
-    memset((void*) &addr, 0, (size_t) sizeof(addr));
-    addr.sin_family = AF_INET;
-    addr.sin_port = htons(port);
-    addr.sin_addr.s_addr = htonl(INADDR_ANY);
-    
-    if (bind(listen_fd, (struct sockaddr*) &addr, sizeof(addr)) < 0)
-	return -1;
-
-    listen(listen_fd, 5);
-    return listen_fd;
-}
-
 static void cmd_ei_publish(char* buf, int len)
 {
     int index = 0;
-    int listen, r;
-    long port;
+    int iport, lfd, r;
+    long lport;
     ei_x_buff x;
     int i;
 
     /* get port */
-    if (ei_decode_long(buf, &index, &port) < 0)
+    if (ei_decode_long(buf, &index, &lport) < 0)
 	fail("expected int (port)");
     /* Make a listen socket */
-    if ((listen = my_listen(port)) <= 0)
+
+    iport = (int) lport;
+    lfd = ei_listen(&ec, &iport, 5);
+    if (lfd < 0)
 	fail("listen");
+    lport = (long) iport;
     
-    if ((i = ei_publish(&ec, port)) == -1)
+    if ((i = ei_publish(&ec, lport)) == -1)
 	fail("ei_publish");
 #ifdef VXWORKS
     save_fd(i);
@@ -171,7 +158,7 @@ static void cmd_ei_publish(char* buf, int len)
     /* 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, (long) lfd);
     ei_x_encode_long(&x, i);
     ei_x_encode_long(&x, erl_errno);
     send_bin_term(&x);
diff --git a/lib/erl_interface/test/ei_accept_SUITE_data/eiaccnode.c b/lib/erl_interface/test/ei_accept_SUITE_data/eiaccnode.c
index 308f843530..90c7a2259f 100644
--- a/lib/erl_interface/test/ei_accept_SUITE_data/eiaccnode.c
+++ b/lib/erl_interface/test/ei_accept_SUITE_data/eiaccnode.c
@@ -47,8 +47,6 @@
 #define MAIN main
 #endif
 
-static int my_listen(int port);
-
 /*
    A small einode.
    To be called from the test case ei_accept_SUITE:multi_thread
@@ -64,7 +62,6 @@ static int my_listen(int port);
 */
 
 static const char* cookie, * desthost;
-static int port; /* actually base port */
 
 #ifndef SD_SEND
 #ifdef SHUTWR
@@ -74,10 +71,6 @@ static int port; /* actually base port */
 #endif
 #endif
 
-#ifndef __WIN32__
-#define closesocket(fd) close(fd)
-#endif
-
 #ifdef __WIN32__
 static DWORD WINAPI
 #else
@@ -86,26 +79,32 @@ static void*
     einode_thread(void* num)
 {
     int n = (int)num;
+    int port;
     ei_cnode ec;
-    char myname[100], destname[100];
+    char myname[100], destname[100], filename[100];
     int r, fd, listen;
     ErlConnect conn;
     erlang_msg msg;
-/*    FILE* f;*/
+    FILE* file;
 
-    sprintf(myname, "eiacc%d", n);
-    printf("thread %d (%s) listening\n", n, myname, destname);
+    sprintf(filename, "eiacc%d_trace.txt", n);
+    file = fopen(filename, "w");
+
+    sprintf(myname, "eiacc%d", n); fflush(file);
     r = ei_connect_init(&ec, myname, cookie, 0);
-    if ((listen = my_listen(port+n)) <= 0) {
-	printf("listen err\n");
+    port = 0;
+    listen = ei_listen(&ec, &port, 5);
+    if (listen <= 0) {
+	fprintf(file, "listen err\n"); fflush(file);
 	exit(7);
     }
-    if (ei_publish(&ec, port + n) == -1) {
-	printf("ei_publish port %d\n", port+n);
+    fprintf(file, "thread %d (%s:%s) listening on port %d\n", n, myname, destname, port);
+    if (ei_publish(&ec, port) == -1) {
+	fprintf(file, "ei_publish port %d\n", port+n); fflush(file);
 	exit(8);
     }
     fd = ei_accept(&ec, listen, &conn);
-    printf("ei_accept %d\n", fd);
+    fprintf(file, "ei_accept %d\n", fd); fflush(file);
     if (fd >= 0) {
 	ei_x_buff x, xs;
 	int index, version;
@@ -117,37 +116,38 @@ static void*
 	    if (got == ERL_TICK)
 		continue;
 	    if (got == ERL_ERROR) {
-		printf("receive error %d\n", n);
+		fprintf(file, "receive error %d\n", n); fflush(file);
 		return 0;
 	    }
-	    printf("received %d\n", got);
+	    fprintf(file, "received %d\n", got); fflush(file);
 	    break;
 	}
 	index = 0;
 	if (ei_decode_version(x.buff, &index, &version) != 0) {
-	    printf("ei_decode_version %d\n", n);
+	    fprintf(file, "ei_decode_version %d\n", n); fflush(file);
 	    return 0;
 	}
 	if (ei_decode_pid(x.buff, &index, &pid) != 0) {
-	    printf("ei_decode_pid %d\n", n);
+	    fprintf(file, "ei_decode_pid %d\n", n); fflush(file);
 	    return 0;
 	}
-/*	fprintf(f, "got pid from %s \n", pid.node);*/
+	fprintf(file, "got pid from %s \n", pid.node); fflush(file);
 	ei_x_new_with_version(&xs);
 	ei_x_encode_tuple_header(&xs, 2);
 	ei_x_encode_long(&xs, n);
 	ei_x_encode_pid(&xs, &pid);
 	r = ei_send(fd, &pid, xs.buff, xs.index);
-/*	fprintf(f, "sent %d bytes %d\n", xs.index, r);*/
+	fprintf(file, "sent %d bytes %d\n", xs.index, r); fflush(file);
 	shutdown(fd, SD_SEND);
-	closesocket(fd);
+        ei_close_connection(fd);
 	ei_x_free(&x);
 	ei_x_free(&xs);
     } else {
-	printf("coudn't connect fd %d r %d\n", fd, r);
+	fprintf(file, "coudn't connect fd %d r %d\n", fd, r); fflush(file);
     }
-    printf("done thread %d\n", n);
-/*    fclose(f);*/
+    ei_close_connection(listen);
+    fprintf(file, "done thread %d\n", n);
+    fclose(file);
     return 0;
 }
 
@@ -170,12 +170,16 @@ MAIN(int argc, char *argv[])
     if (n > 100)
 	exit(2);
     desthost = argv[3];
-    port = atoi(argv[4]);
-#ifndef VXWORKS	   
-    no_threads = argv[5] != NULL && strcmp(argv[5], "nothreads") == 0;
-#else
+    if (argc == 3)
+        no_threads = 0;
+    else
+        no_threads = argv[4] != NULL && strcmp(argv[4], "nothreads") == 0;
+#ifdef VXWORKS
     no_threads = 1;
 #endif
+
+    ei_init();
+
     for (i = 0; i < n; ++i) {
 	if (!no_threads) {
 #ifndef VXWORKS
@@ -209,27 +213,3 @@ MAIN(int argc, char *argv[])
     printf("ok\n");
     return 0;
 }
-
-static int my_listen(int port)
-{
-    int listen_fd;
-    struct sockaddr_in addr;
-    const char *on = "1";
-    
-    if ((listen_fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-	return -1;
-    
-    setsockopt(listen_fd, SOL_SOCKET, SO_REUSEADDR, on, sizeof(on));
-    
-    memset((void*) &addr, 0, (size_t) sizeof(addr));
-    addr.sin_family = AF_INET;
-    addr.sin_port = htons(port);
-    addr.sin_addr.s_addr = htonl(INADDR_ANY);
-    
-    if (bind(listen_fd, (struct sockaddr*) &addr, sizeof(addr)) < 0)
-	return -1;
-
-    listen(listen_fd, 5);
-    return listen_fd;
-}
-
diff --git a/lib/erl_interface/test/ei_connect_SUITE.erl b/lib/erl_interface/test/ei_connect_SUITE.erl
index 75b6bf18da..6184ce801b 100644
--- a/lib/erl_interface/test/ei_connect_SUITE.erl
+++ b/lib/erl_interface/test/ei_connect_SUITE.erl
@@ -79,9 +79,10 @@ ei_send_funs(Config) when is_list(Config) ->
     {ok,Fd} = ei_connect(P, node()),
 
     Fun1 = fun ei_send/1,
-    Fun2 = fun(X) -> P, X, Fd, Fun1 end,
+    Fun2 = fun(X) -> {P, X, Fd, Fun1} end,
+    Bits = <<1,2,3:5>>,
 
-    AMsg={Fun1,Fun2},
+    AMsg={Fun1,Fun2,Bits},
     %%AMsg={wait_with_funs, new_dist_format},
     ok = ei_send_funs(P, Fd, self(), AMsg),
     EIMsg = receive M -> M end,
diff --git a/lib/erl_interface/test/ei_connect_SUITE_data/ei_connect_test.c b/lib/erl_interface/test/ei_connect_SUITE_data/ei_connect_test.c
index 29c03d7604..385bcdd422 100644
--- a/lib/erl_interface/test/ei_connect_SUITE_data/ei_connect_test.c
+++ b/lib/erl_interface/test/ei_connect_SUITE_data/ei_connect_test.c
@@ -73,6 +73,8 @@ TESTCASE(interpret)
     int i;
     ei_term term;
 
+    ei_init();
+
     ei_x_new(&x);
     while (get_bin_term(&x, &term) == 0) {
 	    char* buf = x.buff, func[MAXATOMLEN];
@@ -105,7 +107,6 @@ TESTCASE(interpret)
 static void cmd_ei_connect_init(char* buf, int len)
 {
     int index = 0, r = 0;
-    int type, size;
     long l;
     char b[100];
     char cookie[MAXATOMLEN], * cp = cookie;
@@ -113,8 +114,6 @@ static void cmd_ei_connect_init(char* buf, int len)
     if (ei_decode_long(buf, &index, &l) < 0)
 	fail("expected int");
     sprintf(b, "c%ld", l);
-    /* FIXME don't use internal and maybe use skip?! */
-    ei_get_type_internal(buf, &index, &type, &size);
     if (ei_decode_atom(buf, &index, cookie) < 0)
 	fail("expected atom (cookie)");
     if (cookie[0] == '\0')
@@ -210,6 +209,9 @@ static void cmd_ei_send_funs(char* buf, int len)
     erlang_pid pid;
     ei_x_buff x;
     erlang_fun fun1, fun2;
+    char* bitstring;
+    size_t bits;
+    int bitoffs;
 
     if (ei_decode_long(buf, &index, &fd) < 0)
 	fail("expected long");
@@ -217,20 +219,24 @@ static void cmd_ei_send_funs(char* buf, int len)
 	fail("expected pid (node)");
     if (ei_decode_tuple_header(buf, &index, &n) < 0)
 	fail("expected tuple");
-    if (n != 2)
+    if (n != 3)
 	fail("expected tuple");
     if (ei_decode_fun(buf, &index, &fun1) < 0)
 	fail("expected Fun1");
     if (ei_decode_fun(buf, &index, &fun2) < 0)
 	fail("expected Fun2");
+    if (ei_decode_bitstring(buf, &index, &bitstring, &bitoffs, &bits) < 0)
+	fail("expected bitstring");
     if (ei_x_new_with_version(&x) < 0)
 	fail("ei_x_new_with_version");
-    if (ei_x_encode_tuple_header(&x, 2) < 0)
+    if (ei_x_encode_tuple_header(&x, 3) < 0)
 	fail("encode tuple header");
     if (ei_x_encode_fun(&x, &fun1) < 0)
 	fail("encode fun1");
     if (ei_x_encode_fun(&x, &fun2) < 0)
 	fail("encode fun2");
+    if (ei_x_encode_bitstring(&x, bitstring, bitoffs, bits) < 0)
+	fail("encode bitstring");
     free_fun(&fun1);
     free_fun(&fun2);
     send_errno_result(ei_send(fd, &pid, x.buff, x.index));
diff --git a/lib/erl_interface/test/ei_decode_SUITE.erl b/lib/erl_interface/test/ei_decode_SUITE.erl
index 75560ea7c9..e005ec89c7 100644
--- a/lib/erl_interface/test/ei_decode_SUITE.erl
+++ b/lib/erl_interface/test/ei_decode_SUITE.erl
@@ -194,6 +194,9 @@ test_ei_decode_misc(Config) when is_list(Config) ->
     send_term_as_binary(P,<<>>),
     send_term_as_binary(P,<<"ÅÄÖåäö">>),
 
+    send_term_as_binary(P,<<1, 2, 3:5>>),
+    send_term_as_binary(P,<<1:1>>),
+
     %    send_term_as_binary(P,{}),
     %    send_term_as_binary(P,[]),
 
diff --git a/lib/erl_interface/test/ei_decode_SUITE_data/ei_decode_test.c b/lib/erl_interface/test/ei_decode_SUITE_data/ei_decode_test.c
index f945a7d378..46d6b8f2af 100644
--- a/lib/erl_interface/test/ei_decode_SUITE_data/ei_decode_test.c
+++ b/lib/erl_interface/test/ei_decode_SUITE_data/ei_decode_test.c
@@ -256,71 +256,141 @@ int ei_decode_my_string(const char *buf, int *index, char *to,
 
 //#define EI_DECODE_UTF8_STRING(FUNC,SIZE,VAL) 
 
-#define EI_DECODE_BIN(FUNC,SIZE,VAL,LEN) \
-  { \
-    char p[1024]; \
-    char *buf; \
-    long len; \
-    int size1 = 0; \
-    int size2 = 0; \
-    int err; \
-    message("ei_" #FUNC " should be " #VAL); \
-    buf = read_packet(NULL); \
-    err = ei_ ## FUNC(buf+1, &size1, NULL, &len); \
+static void decode_bin(int exp_size, const char* val, int exp_len)
+{
+    char p[1024];
+    char *buf;
+    long len;
+    int size1 = 0;
+    int size2 = 0;
+    int err;
+    message("ei_decode_binary should be %s", val);
+    buf = read_packet(NULL);
+    err = ei_decode_binary(buf+1, &size1, NULL, &len);
     message("err = %d, size = %d, len = %d, expected size = %d, expected len = %d\n",\
-            err,size1,len,SIZE,LEN); \
-    if (err != 0) { \
-      if (err != -1) { \
-	fail("returned non zero but not -1 if NULL pointer"); \
-      } else { \
-	fail("returned non zero"); \
-      } \
-      return; \
-    } \
-\
-    if (len != LEN) { \
-      fail("size is not correct"); \
-      return; \
-    } \
-\
-    err = ei_ ## FUNC(buf+1, &size2, p, &len); \
+            err,size1,len, exp_size, exp_len);
+    if (err != 0) {
+      if (err != -1) {
+	fail("returned non zero but not -1 if NULL pointer");
+      } else {
+	fail("returned non zero");
+      }
+      return;
+    }
+
+    if (len != exp_len) {
+      fail("size is not correct");
+      return;
+    }
+
+    err = ei_decode_binary(buf+1, &size2, p, &len);
     message("err = %d, size = %d, len = %d, expected size = %d, expected len = %d\n",\
-            err,size2,len,SIZE,LEN); \
-    if (err != 0) { \
-      if (err != -1) { \
-	fail("returned non zero but not -1 if NULL pointer"); \
-      } else { \
-	fail("returned non zero"); \
-      } \
-      return; \
-    } \
-\
-    if (len != LEN) { \
-      fail("size is not correct"); \
-      return; \
-    } \
-\
-    if (strncmp(p,VAL,LEN) != 0) { \
-      fail("value is not correct"); \
-      return; \
-    } \
-\
-    if (size1 != size2) { \
-      fail("size with and without pointer differs"); \
-      return; \
-    } \
-\
-    if (size1 != SIZE) { \
-      fail("size of encoded data is incorrect"); \
-      return; \
-    } \
-    free_packet(buf); \
-  } \
+            err,size2,len, exp_size, exp_len);
+    if (err != 0) {
+      if (err != -1) {
+	fail("returned non zero but not -1 if NULL pointer");
+      } else {
+	fail("returned non zero");
+      }
+      return;
+    }
+
+    if (len != exp_len) {
+      fail("size is not correct");
+      return;
+    }
+
+    if (strncmp(p,val,exp_len) != 0) {
+      fail("value is not correct");
+      return;
+    }
+
+    if (size1 != size2) {
+      fail("size with and without pointer differs");
+      return;
+    }
+
+    if (size1 != exp_size) {
+      fail("size of encoded data is incorrect");
+      return;
+    }
+    free_packet(buf);
+}
+
+static void decode_bits(int exp_size, const char* val, size_t exp_bits)
+{
+    const char* p;
+    char *buf;
+    size_t bits;
+    int bitoffs;
+    int size1 = 0;
+    int size2 = 0;
+    int err;
+    message("ei_decode_bitstring should be %d bits", (int)exp_bits);
+    buf = read_packet(NULL);
+    err = ei_decode_bitstring(buf+1, &size1, NULL, &bitoffs, &bits);
+    message("err = %d, size = %d, bitoffs = %d, bits = %d, expected size = %d, expected bits = %d\n",\
+            err,size1, bitoffs, (int)bits, exp_size, (int)exp_bits);
+
+    if (err != 0) {
+        if (err != -1) {
+            fail("returned non zero but not -1 if NULL pointer");
+        } else {
+            fail("returned non zero");
+        }
+        return;
+    }
+
+    if (bits != exp_bits) {
+        fail("number of bits is not correct");
+        return;
+    }
+    if (bitoffs != 0) {
+        fail("non zero bit offset");
+        return;
+    }
+
+    err = ei_decode_bitstring(buf+1, &size2, &p, NULL, &bits);
+    message("err = %d, size = %d, len = %d, expected size = %d, expected len = %d\n",\
+            err,size2, (int)bits, exp_size, (int)exp_bits);
+    if (err != 0) {
+        if (err != -1) {
+            fail("returned non zero but not -1 if NULL pointer");
+        } else {
+            fail("returned non zero");
+        }
+        return;
+    }
+
+    if (bits != exp_bits) {
+        fail("bits is not correct");
+        return;
+    }
+
+    if (memcmp(p, val, (exp_bits+7)/8) != 0) {
+        fail("value is not correct");
+        return;
+    }
+
+    if (size1 != size2) {
+        fail("size with and without pointer differs");
+        return;
+    }
+
+    if (size1 != exp_size) {
+        fail2("size of encoded data is incorrect %d != %d", size1, exp_size);
+        return;
+    }
+    free_packet(buf);
+}
+
 
 /* ******************************************************************** */
 
 TESTCASE(test_ei_decode_long)
 {
+    ei_init();
+
     EI_DECODE_2     (decode_long,  2, long, 0);
     EI_DECODE_2     (decode_long,  2, long, 255);
     EI_DECODE_2     (decode_long,  5, long, 256);
@@ -363,6 +433,8 @@ TESTCASE(test_ei_decode_long)
 
 TESTCASE(test_ei_decode_ulong)
 {
+    ei_init();
+
     EI_DECODE_2     (decode_ulong,  2, unsigned long, 0);
     EI_DECODE_2     (decode_ulong,  2, unsigned long, 255);
     EI_DECODE_2     (decode_ulong,  5, unsigned long, 256);
@@ -409,6 +481,8 @@ TESTCASE(test_ei_decode_ulong)
 
 TESTCASE(test_ei_decode_longlong)
 {
+    ei_init();
+
 #ifndef VXWORKS
     EI_DECODE_2     (decode_longlong,  2, EI_LONGLONG, 0);
     EI_DECODE_2     (decode_longlong,  2, EI_LONGLONG, 255);
@@ -443,6 +517,8 @@ TESTCASE(test_ei_decode_longlong)
 
 TESTCASE(test_ei_decode_ulonglong)
 {
+    ei_init();
+
 #ifndef VXWORKS
     EI_DECODE_2     (decode_ulonglong, 2, EI_ULONGLONG, 0);
     EI_DECODE_2     (decode_ulonglong, 2, EI_ULONGLONG, 255);
@@ -478,6 +554,8 @@ TESTCASE(test_ei_decode_ulonglong)
 
 TESTCASE(test_ei_decode_char)
 {
+    ei_init();
+
     EI_DECODE_2(decode_char, 2, char, 0);
     EI_DECODE_2(decode_char, 2, char, 0x7f);
     EI_DECODE_2(decode_char, 2, char, 0xff);
@@ -491,6 +569,8 @@ TESTCASE(test_ei_decode_char)
 
 TESTCASE(test_ei_decode_nonoptimal)
 {
+    ei_init();
+
     EI_DECODE_2(decode_char,  2, char, 42);
     EI_DECODE_2(decode_char,  5, char, 42);
     EI_DECODE_2(decode_char,  4, char, 42);
@@ -612,6 +692,8 @@ TESTCASE(test_ei_decode_nonoptimal)
 
 TESTCASE(test_ei_decode_misc)
 {
+    ei_init();
+
 /*
     EI_DECODE_0(decode_version);
 */
@@ -630,9 +712,17 @@ TESTCASE(test_ei_decode_misc)
     EI_DECODE_STRING(decode_my_string, 1, "");
     EI_DECODE_STRING(decode_my_string, 9, "������");
 
-    EI_DECODE_BIN(decode_binary,  8, "foo", 3);
-    EI_DECODE_BIN(decode_binary,  5, "", 0);
-    EI_DECODE_BIN(decode_binary, 11, "������", 6);
+    decode_bin(8, "foo", 3);
+    decode_bin(5, "", 0);
+    decode_bin(11, "������", 6);
+
+#define LAST_BYTE(V, BITS) ((V) << (8-(BITS)))
+    {
+        unsigned char bits1[] = {1, 2, LAST_BYTE(3,5) };
+        unsigned char bits2[] = {LAST_BYTE(1,1) };
+        decode_bits(9, bits1, 21);
+        decode_bits(7, bits2, 1);
+    }
 
     /* FIXME check \0 in strings and atoms? */
 /*
@@ -647,6 +737,7 @@ TESTCASE(test_ei_decode_misc)
 
 TESTCASE(test_ei_decode_utf8_atom)
 {
+    ei_init();
 
   EI_DECODE_STRING_4(decode_my_atom_as, 4, P99({229,0}), /* LATIN1 "�" */
 		   P99({ERLANG_ANY,ERLANG_LATIN1,ERLANG_LATIN1}));
diff --git a/lib/erl_interface/test/ei_decode_encode_SUITE.erl b/lib/erl_interface/test/ei_decode_encode_SUITE.erl
index 0f23cdfbb9..0204b4cfd6 100644
--- a/lib/erl_interface/test/ei_decode_encode_SUITE.erl
+++ b/lib/erl_interface/test/ei_decode_encode_SUITE.erl
@@ -48,7 +48,8 @@ init_per_testcase(Case, Config) ->
 test_ei_decode_encode(Config) when is_list(Config) ->
     P = runner:start(Config, ?test_ei_decode_encode),
 
-    Fun   = fun (X) -> {X,true} end,
+    Fun1  = fun (X) -> {X,true} end,
+    Fun2  = fun runner:init_per_testcase/3,
     Pid   = self(),
     Port  = case os:type() of
                 {win32,_} ->
@@ -70,7 +71,8 @@ test_ei_decode_encode(Config) when is_list(Config) ->
     BigLargeB = 1 bsl 11112 + BigSmallB,
     BigLargeC = BigSmallA * BigSmallB * BigSmallC * BigSmallA,
 
-    send_rec(P, Fun),
+    send_rec(P, Fun1),
+    send_rec(P, Fun2),
     send_rec(P, Pid),
     send_rec(P, Port),
     send_rec(P, Ref),
@@ -115,14 +117,36 @@ test_ei_decode_encode(Config) when is_list(Config) ->
     send_rec(P, {}),
     send_rec(P, {atom, Pid, Port, Ref}),
     send_rec(P, [atom, Pid, Port, Ref]),
-    send_rec(P, [atom | Fun]),
+    send_rec(P, [atom | Fun1]),
     send_rec(P, #{}),
     send_rec(P, #{key => value}),
     send_rec(P, maps:put(Port, Ref, #{key => value, key2 => Pid})),
 
+    [send_rec(P, <<16#dec0deb175:B/little>>) || B <- lists:seq(0,48)],
+
+    % And last an ugly duckling to test ei_encode_bitstring with bitoffs != 0
+    encode_bitstring(P),
+
     runner:recv_eot(P),
     ok.
 
+encode_bitstring(P) ->
+    %% Send one bitstring to c-node
+    Bits = <<16#18f6d4b2907e5c3a1:66>>,
+    P ! {self(), {command, term_to_binary(Bits, [{minor_version, 2}])}},
+
+    %% and then receive and verify a number of different sub-bitstrings
+    receive_sub_bitstring(P, Bits, 0, bit_size(Bits)).
+
+receive_sub_bitstring(_, _, _, NBits) when NBits < 0 ->
+    ok;
+receive_sub_bitstring(P, Bits, BitOffs, NBits) ->
+    <<_:BitOffs, Sub:NBits/bits, _/bits>> = Bits,
+    %%io:format("expecting term_to_binary(~p) = ~p\n", [Sub, term_to_binary(Sub)]),
+    {_B,Sub} = get_buf_and_term(P),
+    receive_sub_bitstring(P, Bits, BitOffs+1, NBits - ((NBits div 20)+1)).
+
+
 
 %% ######################################################################## %%
 
diff --git a/lib/erl_interface/test/ei_decode_encode_SUITE_data/ei_decode_encode_test.c b/lib/erl_interface/test/ei_decode_encode_SUITE_data/ei_decode_encode_test.c
index 9977683d59..512f9ed0c7 100644
--- a/lib/erl_interface/test/ei_decode_encode_SUITE_data/ei_decode_encode_test.c
+++ b/lib/erl_interface/test/ei_decode_encode_SUITE_data/ei_decode_encode_test.c
@@ -40,6 +40,13 @@ typedef struct
     erlang_char_encoding enc;
 }my_atom;
 
+typedef struct
+{
+    const char* bytes;
+    unsigned int bitoffs;
+    size_t nbits;
+}my_bitstring;
+
 struct my_obj {
     union {
 	erlang_fun fun;
@@ -49,6 +56,7 @@ struct my_obj {
 	erlang_trace trace;
 	erlang_big big;
 	my_atom atom;
+        my_bitstring bits;
 
 	int arity;
     }u;
@@ -119,6 +127,26 @@ struct Type my_atom_type = {
     (encodeFT*)ei_encode_my_atom, (x_encodeFT*)ei_x_encode_my_atom
 };
 
+int ei_decode_my_bits(const char *buf, int *index, my_bitstring* a)
+{
+    return ei_decode_bitstring(buf, index, (a ? &a->bytes : NULL),
+                               (a ? &a->bitoffs : NULL),
+                               (a ? &a->nbits : NULL));
+}
+int ei_encode_my_bits(char *buf, int *index, my_bitstring* a)
+{
+    return ei_encode_bitstring(buf, index, a->bytes, a->bitoffs, a->nbits);
+}
+int ei_x_encode_my_bits(ei_x_buff* x, my_bitstring* a)
+{
+    return ei_x_encode_bitstring(x, a->bytes, a->bitoffs, a->nbits);
+}
+
+struct Type my_bitstring_type = {
+    "bits", "my_bitstring", (decodeFT*)ei_decode_my_bits,
+    (encodeFT*)ei_encode_my_bits, (x_encodeFT*)ei_x_encode_my_bits
+};
+
 
 int my_decode_tuple_header(const char *buf, int *index, struct my_obj* obj)
 {
@@ -237,11 +265,7 @@ void decode_encode(struct Type** tv, int nobj)
 	size1 = 0;
 	err = t->ei_decode_fp(inp, &size1, NULL);
 	if (err != 0) {
-	    if (err != -1) {
-		fail("decode returned non zero but not -1");
-	    } else {
-		fail1("decode '%s' returned non zero", t->name);
-	    }
+            fail2("decode '%s' returned non zero %d", t->name, err);
 	    return;
 	}
 	if (size1 < 1) {
@@ -470,6 +494,66 @@ void decode_encode_big(struct Type* t)
 }
 
 
+void encode_bitstring(void)
+{
+    char* packet;
+    char* inp;
+    char out_buf[BUFSZ];
+    int size;
+    int err, i;
+    ei_x_buff arg;
+    const char* p;
+    unsigned int bitoffs;
+    size_t nbits, org_nbits;
+
+    packet = read_packet(NULL);
+    inp = packet+1;
+
+    size = 0;
+    err = ei_decode_bitstring(inp, &size, &p, &bitoffs, &nbits);
+    if (err != 0) {
+        fail1("ei_decode_bitstring returned non zero %d", err);
+        return;
+    }
+
+    /*
+     * Now send a bunch of different sub-bitstrings back
+     * encoded both with ei_encode_ and ei_x_encode_.
+     */
+    org_nbits = nbits;
+    do {
+        size = 0;
+        err = ei_encode_bitstring(out_buf, &size, p, bitoffs, nbits);
+        if (err != 0) {
+            fail1("ei_encode_bitstring returned non zero %d", err);
+            return;
+        }
+
+        ei_x_new(&arg);
+        err = ei_x_encode_bitstring(&arg, p, bitoffs, nbits);
+        if (err != 0) {
+            fail1("ei_x_encode_bitstring returned non zero %d", err);
+            ei_x_free(&arg);
+            return;
+        }
+
+        if (arg.index < 1) {
+            fail("size is < 1");
+            ei_x_free(&arg);
+            return;
+        }
+
+        send_buffer(out_buf, size);
+        send_buffer(arg.buff, arg.index);
+        ei_x_free(&arg);
+
+        bitoffs++;
+        nbits -= (nbits / 20) + 1;
+    } while (nbits < org_nbits);
+
+    free_packet(packet);
+}
+
 
 /* ******************************************************************** */
 
@@ -477,6 +561,9 @@ TESTCASE(test_ei_decode_encode)
 {
     int i;
 
+    ei_init();
+
+    decode_encode_one(&fun_type);
     decode_encode_one(&fun_type);
     decode_encode_one(&pid_type);
     decode_encode_one(&port_type);
@@ -535,6 +622,12 @@ TESTCASE(test_ei_decode_encode)
 	decode_encode(map, 7);
     }
 
+    for (i=0; i <= 48; i++) {
+        decode_encode_one(&my_bitstring_type);
+    }
+
+    encode_bitstring();
+
     report(1);
 }
 
diff --git a/lib/erl_interface/test/ei_encode_SUITE_data/ei_encode_test.c b/lib/erl_interface/test/ei_encode_SUITE_data/ei_encode_test.c
index 32811fdf22..6f63cc5d7e 100644
--- a/lib/erl_interface/test/ei_encode_SUITE_data/ei_encode_test.c
+++ b/lib/erl_interface/test/ei_encode_SUITE_data/ei_encode_test.c
@@ -403,6 +403,8 @@
 
 TESTCASE(test_ei_encode_long)
 {
+    ei_init();
+
     EI_ENCODE_1(encode_long, 0);
 
     EI_ENCODE_1(encode_long, 255);
@@ -430,6 +432,8 @@ TESTCASE(test_ei_encode_long)
 
 TESTCASE(test_ei_encode_ulong)
 {
+    ei_init();
+
     EI_ENCODE_1(encode_ulong, 0);
 
     EI_ENCODE_1(encode_ulong, 255);
@@ -454,6 +458,7 @@ TESTCASE(test_ei_encode_ulong)
 
 TESTCASE(test_ei_encode_longlong)
 {
+    ei_init();
 
 #ifndef VXWORKS
 
@@ -494,6 +499,7 @@ TESTCASE(test_ei_encode_longlong)
 
 TESTCASE(test_ei_encode_ulonglong)
 {
+    ei_init();
 
 #ifndef VXWORKS
 
@@ -527,6 +533,8 @@ TESTCASE(test_ei_encode_ulonglong)
 
 TESTCASE(test_ei_encode_char)
 {
+    ei_init();
+
     EI_ENCODE_1(encode_char, 0);
 
     EI_ENCODE_1(encode_char, 0x7f);
@@ -540,6 +548,8 @@ TESTCASE(test_ei_encode_char)
 
 TESTCASE(test_ei_encode_misc)
 {
+    ei_init();
+
     EI_ENCODE_0(encode_version);
 
     EI_ENCODE_1(encode_double, 0.0);
@@ -594,6 +604,8 @@ TESTCASE(test_ei_encode_fails)
     char buf[1024];
     int index;
 
+    ei_init();
+
     /* FIXME the ei_x versions are not tested */
 
     index = 0;
@@ -660,6 +672,7 @@ TESTCASE(test_ei_encode_fails)
 
 TESTCASE(test_ei_encode_utf8_atom)
 {
+    ei_init();
 
   EI_ENCODE_3(encode_atom_as, "�", ERLANG_LATIN1, ERLANG_UTF8);
   EI_ENCODE_3(encode_atom_as, "�", ERLANG_LATIN1, ERLANG_LATIN1);
@@ -686,6 +699,7 @@ TESTCASE(test_ei_encode_utf8_atom)
 
 TESTCASE(test_ei_encode_utf8_atom_len)
 {
+    ei_init();
 
   EI_ENCODE_4(encode_atom_len_as, "���", 1, ERLANG_LATIN1, ERLANG_UTF8);
   EI_ENCODE_4(encode_atom_len_as, "���", 2, ERLANG_LATIN1, ERLANG_LATIN1);
diff --git a/lib/erl_interface/test/ei_format_SUITE_data/ei_format_test.c b/lib/erl_interface/test/ei_format_SUITE_data/ei_format_test.c
index 8450332b28..1c0443c0f4 100644
--- a/lib/erl_interface/test/ei_format_SUITE_data/ei_format_test.c
+++ b/lib/erl_interface/test/ei_format_SUITE_data/ei_format_test.c
@@ -48,6 +48,8 @@ send_format(char* format)
 
 TESTCASE(atoms)
 {
+    ei_init();
+
     send_format("''");
     send_format("'a'");
     send_format("'A'");
@@ -82,6 +84,8 @@ TESTCASE(atoms)
 
 TESTCASE(tuples)
 {
+    ei_init();
+
     send_format("{}");
     send_format("{a}");
     send_format("{a, b}");
@@ -108,6 +112,8 @@ TESTCASE(lists)
     ei_x_buff x;
     static char str[65537];
 
+    ei_init();
+
     send_format("[]");
     send_format("[a]");
     send_format("[a, b]");
@@ -177,6 +183,8 @@ TESTCASE(format_wo_ver) {
  */
     ei_x_buff x;
     
+    ei_init();
+
     ei_x_new (&x);
     ei_x_format(&x, "[-1, +2, ~c, {~a,~s},{~a,~i}]", 'c', "a", "b", "c", 10);
     send_bin_term(&x);
diff --git a/lib/erl_interface/test/ei_print_SUITE.erl b/lib/erl_interface/test/ei_print_SUITE.erl
index c75ce55a7d..8a35b22ae5 100644
--- a/lib/erl_interface/test/ei_print_SUITE.erl
+++ b/lib/erl_interface/test/ei_print_SUITE.erl
@@ -26,7 +26,8 @@
 
 -export([all/0, suite/0,
          init_per_testcase/2,
-         atoms/1, tuples/1, lists/1, strings/1]).
+         atoms/1, tuples/1, lists/1, strings/1,
+         maps/1, funs/1, binaries/1, bitstrings/1]).
 
 -import(runner, [get_term/1]).
 
@@ -36,8 +37,8 @@
 suite() ->
     [{ct_hooks,[ts_install_cth]}].
 
-all() -> 
-    [atoms, tuples, lists, strings].
+all() ->
+    [atoms, tuples, lists, strings, maps, funs, binaries, bitstrings].
 
 init_per_testcase(Case, Config) ->
     runner:init_per_testcase(?MODULE, Case, Config).
@@ -142,3 +143,64 @@ strings(Config) when is_list(Config) ->
 
     runner:recv_eot(P),
     ok.
+
+maps(Config) ->
+    P = runner:start(Config, ?maps),
+
+    {term, "#{}"} = get_term(P),
+    {term, "#{key => value}"} = get_term(P),
+    {term, "#{key => value, another_key => {ok, 42}}"} = get_term(P),
+
+    runner:recv_eot(P),
+    ok.
+
+funs(Config) ->
+    P = runner:start(Config, ?funs),
+
+    {term, "#Fun{some_module.42.3735928559}"} = get_term(P),
+    {term, "#Fun{some_module.37.195935983}"} = get_term(P),
+    {term, "fun erlang:abs/1"} = get_term(P),
+
+    runner:recv_eot(P),
+    ok.
+
+binaries(Config) ->
+    P = runner:start(Config, ?binaries),
+
+    "#Bin<>" = send_term_get_printed(P, <<>>),
+    "#Bin<1,2,3>" = send_term_get_printed(P, <<1,2,3>>),
+    "#Bin<0,127,128,255>" = send_term_get_printed(P, <<0,127,128,255>>),
+    Bin30 = <<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>>,
+    "#Bin<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>"
+        = send_term_get_printed(P, Bin30),
+    "#Bin<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,...>"
+        = send_term_get_printed(P, <<Bin30/binary,31>>),
+
+    runner:recv_eot(P),
+    ok.
+
+bitstrings(Config) ->
+    P = runner:start(Config, ?bitstrings),
+
+    "#Bits<1:1>" = send_term_get_printed(P, <<1:1>>),
+    "#Bits<123:7>" = send_term_get_printed(P, <<123:7>>),
+    "#Bits<1,2,3:4>" = send_term_get_printed(P, <<1,2,3:4>>),
+    "#Bits<0,127,128,255,126:7>" = send_term_get_printed(P, <<0,127,128,255,-2:7>>),
+    Bits30 = <<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:5>>,
+    "#Bits<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:5>"
+        = send_term_get_printed(P, Bits30),
+    "#Bin<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,241>"
+        = send_term_get_printed(P, <<Bits30/bits,1:3>>),
+    "#Bits<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,240,...>"
+        = send_term_get_printed(P, <<Bits30/bits,1:4>>),
+
+    runner:recv_eot(P),
+    ok.
+
+
+
+send_term_get_printed(Port, Term) ->
+    Port ! {self(), {command, term_to_binary(Term)}},
+    {term, String} = get_term(Port),
+    String.
diff --git a/lib/erl_interface/test/ei_print_SUITE_data/ei_print_test.c b/lib/erl_interface/test/ei_print_SUITE_data/ei_print_test.c
index 15cfbcae34..27d4153250 100644
--- a/lib/erl_interface/test/ei_print_SUITE_data/ei_print_test.c
+++ b/lib/erl_interface/test/ei_print_SUITE_data/ei_print_test.c
@@ -29,6 +29,46 @@
  */
 
 static void
+send_printed_buf(ei_x_buff* x)
+{
+    char* b = NULL;
+    char fn[256];
+    char *tmp = getenv("temp");
+    FILE* f;
+    int n, index = 0, ver;
+
+#ifdef VXWORKS
+    tmp = ".";
+#else
+    if (tmp == NULL) {
+        tmp = "/tmp";
+    }
+#endif
+    strcpy(fn, tmp);
+    strcat(fn, "/ei_print_test.txt");
+    f = fopen(fn, "w+");
+    ei_decode_version(x->buff, &index, &ver);
+    n = ei_print_term(f, x->buff, &index);
+    if (n < 0) {
+        fclose(f);
+        x->index = 0;
+        ei_x_format(x, "~s", "ERROR: term decoding failed");
+        send_bin_term(x);
+    } else {
+        fseek(f, 0, SEEK_SET);
+        b = malloc(n+1);
+        fread(b, 1, n, f);
+        b[n] = '\0';
+        fclose(f);
+        x->index = 0;
+        ei_x_format(x, "~s", b);
+        send_bin_term(x);
+        free(b);
+    }
+}
+
+
+static void
 send_printed3(char* format, char* p1, char* p2, int fl)
 {
     char* b = NULL;
@@ -43,25 +83,7 @@ send_printed3(char* format, char* p1, char* p2, int fl)
     } else {
 	ei_x_format(&x, format, p1, p2);
     }
-#ifdef VXWORKS
-    tmp = ".";
-#else
-    if (tmp == NULL) tmp = "/tmp";
-#endif
-    strcpy(fn, tmp);
-    strcat(fn, "/ei_print_test.txt");
-    f = fopen(fn, "w+");
-    ei_decode_version(x.buff, &index, &ver);
-    n = ei_print_term(f, x.buff, &index);
-    fseek(f, 0, SEEK_SET);
-    b = malloc(n+1);
-    fread(b, 1, n, f);
-    b[n] = '\0';
-    fclose(f);
-    x.index = 0;
-    ei_x_format(&x, "~s", b);
-    send_bin_term(&x);
-    free(b);
+    send_printed_buf(&x);
     ei_x_free(&x);
 }
 
@@ -84,6 +106,8 @@ static void send_printed3f(char* format, float f1, float f2)
 
 TESTCASE(atoms)
 {
+    ei_init();
+
     send_printed("''");
     send_printed("'a'");
     send_printed("'A'");
@@ -118,6 +142,8 @@ TESTCASE(atoms)
 
 TESTCASE(tuples)
 {
+    ei_init();
+
     send_printed("{}");
     send_printed("{a}");
     send_printed("{a, b}");
@@ -138,6 +164,8 @@ TESTCASE(lists)
 {
     ei_x_buff x;
 
+    ei_init();
+
     send_printed("[]");
     send_printed("[a]");
     send_printed("[a, b]");
@@ -164,6 +192,8 @@ TESTCASE(strings)
 {
     ei_x_buff x;
 
+    ei_init();
+
     send_printed("\"\n\"");
     send_printed("\"\r\n\"");
     send_printed("\"a\"");
@@ -176,4 +206,146 @@ TESTCASE(strings)
     report(1);
 }
 
+TESTCASE(maps)
+{
+    ei_x_buff x;
+
+    ei_init();
+
+    ei_x_new_with_version(&x);
+    ei_x_encode_map_header(&x, 0);
+    send_printed_buf(&x);
+    ei_x_free(&x);
+
+    ei_x_new_with_version(&x);
+    ei_x_encode_map_header(&x, 1);
+    ei_x_encode_atom(&x, "key");
+    ei_x_encode_atom(&x, "value");
+    send_printed_buf(&x);
+    ei_x_free(&x);
+
+    ei_x_new_with_version(&x);
+    ei_x_encode_map_header(&x, 2);
+    ei_x_encode_atom(&x, "key");
+    ei_x_encode_atom(&x, "value");
+    ei_x_encode_atom(&x, "another_key");
+    ei_x_encode_tuple_header(&x, 2);
+    ei_x_encode_atom(&x, "ok");
+    ei_x_encode_long(&x, 42L);
+    send_printed_buf(&x);
+    ei_x_free(&x);
+
+    report(1);
+}
+
+TESTCASE(funs)
+{
+    ei_x_buff x;
+    erlang_pid self;
+    erlang_fun fun;
+
+    strcpy(self.node, "node@host");
+    self.num = 9;
+    self.serial = 99;
+    self.creation = 1;
+
+    ei_init();
+
+    ei_x_new_with_version(&x);
+    fun.arity = -1;             /* Will encode as FUN_EXT */
+    strcpy(fun.module, "some_module");
+    fun.type = EI_FUN_CLOSURE;
+    fun.u.closure.pid = self;
+    fun.u.closure.index = fun.u.closure.old_index = 42;
+    fun.u.closure.uniq = 0xDEADBEEF;
+    fun.u.closure.n_free_vars = 0;
+    fun.u.closure.free_var_len = 0;
+    ei_x_encode_fun(&x, &fun);
+    send_printed_buf(&x);
+    ei_x_free(&x);
+
+    ei_x_new_with_version(&x);
+    fun.arity = 0;              /* Will encode as NEW_FUN_EXT */
+    strcpy(fun.module, "some_module");
+    fun.type = EI_FUN_CLOSURE;
+    fun.u.closure.pid = self;
+    fun.u.closure.index = fun.u.closure.old_index = 37;
+    fun.u.closure.uniq = 0xBADBEEF;
+    fun.u.closure.n_free_vars = 0;
+    fun.u.closure.free_var_len = 0;
+    ei_x_encode_fun(&x, &fun);
+    send_printed_buf(&x);
+    ei_x_free(&x);
+
+    ei_x_new_with_version(&x);
+    fun.arity = 1;
+    strcpy(fun.module, "erlang");
+    fun.type = EI_FUN_EXPORT;
+    fun.u.exprt.func = "abs";
+    ei_x_encode_fun(&x, &fun);
+    send_printed_buf(&x);
+    ei_x_free(&x);
+
+    report(1);
+}
+
 
+TESTCASE(binaries)
+{
+    char *buf;
+    long len;
+    int err, n, index;
+    ei_x_buff x;
+
+    ei_init();
+
+    for (n = 5; n; n--) {
+        buf = read_packet(NULL);
+
+        index = 0;
+        err = ei_decode_version(buf, &index, NULL);
+        if (err != 0)
+            fail1("ei_decode_version returned %d", err);
+        err = ei_decode_binary(buf, &index, NULL, &len);
+        if (err != 0)
+            fail1("ei_decode_binary returned %d", err);
+
+        ei_x_new(&x);
+        ei_x_append_buf(&x, buf, index);
+        send_printed_buf(&x);
+        ei_x_free(&x);
+
+        free_packet(buf);
+    }
+    report(1);
+}
+
+TESTCASE(bitstrings)
+{
+    char *buf;
+    long len;
+    int err, n, index;
+    ei_x_buff x;
+
+    ei_init();
+
+    for (n = 7; n; n--) {
+        buf = read_packet(NULL);
+
+        index = 0;
+        err = ei_decode_version(buf, &index, NULL);
+        if (err != 0)
+            fail1("ei_decode_version returned %d", err);
+        err = ei_decode_bitstring(buf, &index, NULL, NULL, NULL);
+        if (err != 0)
+            fail1("ei_decode_bitstring returned %d", err);
+
+        ei_x_new(&x);
+        ei_x_append_buf(&x, buf, index);
+        send_printed_buf(&x);
+        ei_x_free(&x);
+
+        free_packet(buf);
+    }
+    report(1);
+}
diff --git a/lib/erl_interface/test/ei_tmo_SUITE_data/ei_tmo_test.c b/lib/erl_interface/test/ei_tmo_SUITE_data/ei_tmo_test.c
index 39846e4a58..693e405f75 100644
--- a/lib/erl_interface/test/ei_tmo_SUITE_data/ei_tmo_test.c
+++ b/lib/erl_interface/test/ei_tmo_SUITE_data/ei_tmo_test.c
@@ -96,6 +96,8 @@ TESTCASE(framework_check)
     int i;
 #endif
 
+    ei_init();
+
     OPEN_DEBUGFILE(1);
     
     DEBUGF(("B�rjar... \n"));
@@ -340,6 +342,7 @@ TESTCASE(recv_tmo)
     int com_sock = -1;
     ei_cnode nodeinfo;
 
+    ei_init();
 
     OPEN_DEBUGFILE(5);
 
@@ -450,6 +453,7 @@ TESTCASE(send_tmo)
     int com_sock = -1;
     ei_cnode nodeinfo;
 
+    ei_init();
 
     OPEN_DEBUGFILE(4);
 
@@ -591,7 +595,7 @@ TESTCASE(connect_tmo)
     int com_sock = -1;
     ei_cnode nodeinfo;
     
-
+    ei_init();
 
     OPEN_DEBUGFILE(3);
 
@@ -680,7 +684,7 @@ TESTCASE(accept_tmo)
     ErlConnect peer;
     ei_cnode nodeinfo;
     
-
+    ei_init();
 
     OPEN_DEBUGFILE(2);
 
diff --git a/lib/erl_interface/test/erl_call_SUITE.erl b/lib/erl_interface/test/erl_call_SUITE.erl
new file mode 100644
index 0000000000..9e2b2e4251
--- /dev/null
+++ b/lib/erl_interface/test/erl_call_SUITE.erl
@@ -0,0 +1,96 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2019. 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_call_SUITE).
+
+-include_lib("common_test/include/ct.hrl").
+
+-export([all/0, smoke/1]).
+
+all() -> 
+    [smoke].
+
+smoke(Config) when is_list(Config) ->
+    ErlCall = find_erl_call(),
+    NameSwitch = case net_kernel:longnames() of
+                     true ->
+                         "-name";
+                     false ->
+                         "-sname"
+                 end,
+    Name = atom_to_list(?MODULE)
+        ++ "-"
+        ++ integer_to_list(erlang:system_time(microsecond)),
+
+    ArgsList = ["-s", "-a", "erlang node", NameSwitch, Name],
+    io:format("erl_call: \"~ts\"\n~nargs list: ~p~n", [ErlCall, ArgsList]),
+    CmdRes = get_smoke_port_res(open_port({spawn_executable, ErlCall},
+                                          [{args, ArgsList}, eof]), []),
+    io:format("CmdRes: ~p~n", [CmdRes]),
+
+    [_, Hostname] = string:lexemes(atom_to_list(node()), "@"),
+    NodeName = list_to_atom(Name ++ "@" ++ Hostname),
+    io:format("NodeName: ~p~n~n", [NodeName]),
+
+    pong = net_adm:ping(NodeName),
+    rpc:cast(NodeName, erlang, halt, []),
+    NodeName = list_to_atom(string:trim(CmdRes, both, "'")),
+    ok.
+
+%
+% Utility functions...
+%
+
+find_erl_call() ->
+    ErlCallName = case os:type() of
+                      {win32, _} -> "erl_call.exe";
+                      _ -> "erl_call"
+                  end,
+    LibDir = code:lib_dir(erl_interface),
+    InstalledErlCall = filename:join([LibDir, "bin", ErlCallName]),
+    TargetDir = erlang:system_info(system_architecture),
+    TargetErlCall = filename:join([LibDir, "bin", TargetDir, ErlCallName]),
+    
+    try
+        lists:foreach(fun (F) ->
+                              io:format("Checking: \"~ts\"~n", [F]),
+                              case file:read_file_info(F) of
+                                  {ok, _} ->
+                                      throw(F);
+                                  _ ->
+                                      ok
+                              end
+                      end,
+                      [InstalledErlCall, TargetErlCall]),
+        exit({missing, erl_call})
+    catch
+        throw:ErlCall ->
+            ErlCall
+    end.
+
+get_smoke_port_res(Port, Acc) when is_port(Port) ->
+    receive
+        {Port, {data, Data}} ->
+            get_smoke_port_res(Port, [Acc|Data]);
+        {Port, eof} ->
+            lists:flatten(Acc)
+    end.
+            
diff --git a/lib/erl_interface/test/erl_eterm_SUITE_data/cnode.c b/lib/erl_interface/test/erl_eterm_SUITE_data/cnode.c
index bead0f8413..b87feb9dfc 100644
--- a/lib/erl_interface/test/erl_eterm_SUITE_data/cnode.c
+++ b/lib/erl_interface/test/erl_eterm_SUITE_data/cnode.c
@@ -20,7 +20,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-
+#include <string.h>
 #include "ei.h"
 #include "erl_interface.h"
 
@@ -68,6 +68,7 @@ MAIN(int argc, char **argv)
     char host[80];
     int number;
     ETERM *ref, *ref1, *ref2;
+    FILE *dfile = fopen("cnode_debug_printout", "w");
 
     erl_init(NULL, 0);
 
@@ -80,28 +81,30 @@ MAIN(int argc, char **argv)
     gethostname(host, sizeof(host));
     sprintf(node, "c%d@%s", number, host);
 
-    printf("s = %d\n", s);
+    fprintf(dfile, "s = %d\n", s); fflush(dfile);
 
     sprintf(server, "test_server@%s", host);
     fd = erl_connect(server);
-    printf("fd = %d\n", fd);
+    fprintf(dfile, "fd = %d\n", fd);
 
-/*    printf("dist = %d\n", erl_distversion(fd)); */
+/*    fprintf(dfile, "dist = %d\n", erl_distversion(fd)); */
 
 #if 1
     ref = erl_mk_long_ref(node, 4711, 113, 98, 0);
 #else
     ref = erl_mk_ref(node, 4711, 0);
 #endif
-    printf("ref = %d\n", ref);
+    fprintf(dfile, "ref = %p\n", ref); fflush(dfile);
 
     s = erl_reg_send(fd, "mip", ref);
-    printf("s = %d\n", s);
+    fprintf(dfile, "s = %d\n", s); fflush(dfile);
 
     {
       ETERM* emsg;
       emsg = SELF(fd);
-      erl_reg_send(fd,"mip",emsg);
+      fprintf(dfile, "pid = %p\n", emsg); fflush(dfile);
+      s = erl_reg_send(fd,"mip",emsg);
+      fprintf(dfile, "s2 = %d\n", s); fflush(dfile);
       erl_free_term(emsg);
     }
 
@@ -116,28 +119,29 @@ MAIN(int argc, char **argv)
 #endif
 	switch (s) {
 	  case ERL_TICK:
-	    printf("tick\n");
+	    fprintf(dfile, "tick\n");
 	    break;
 	  case ERL_ERROR:
-	    printf("error\n");
+            fprintf(dfile, "error: %s (%d)\n", strerror(erl_errno), erl_errno);
 	    break;
 	  case ERL_MSG:
-	    printf("msg %d\n", msgsize);
+	    fprintf(dfile, "msg %d\n", msgsize);
 	    break;
 	  default:
-	    printf("unknown result %d\n", s);
+	    fprintf(dfile, "unknown result %d\n", s);
 	    break;
 	}
+        fflush(dfile);
     } while (s == ERL_TICK);
 
     s = erl_reg_send(fd, "mip", msg.msg);
-    printf("s = %d\n", s);
+    fprintf(dfile, "s = %d\n", s); fflush(dfile);
     s = erl_reg_send(fd, "mip", msg.to);
-    printf("s = %d\n", s);
+    fprintf(dfile, "s = %d\n", s); fflush(dfile);
 #if 0
     /* from = NULL! */
     s = erl_reg_send(fd, "mip", msg.from);
-    printf("s = %d\n", s);
+    fprintf(dfile, "s = %d\n", s); fflush(dfile);
 #endif
 
 #if 0
@@ -150,17 +154,19 @@ MAIN(int argc, char **argv)
     ref1 = erl_mk_long_ref(node, 4711, 113, 98, 0);
     ref2 = erl_mk_ref(node, 4711, 0);
     s = erl_encode(ref1, buf1);
-    printf("enc1 s = %d\n", s);
+    fprintf(dfile, "enc1 s = %d\n", s); fflush(dfile);
     s = erl_encode(ref2, buf2);
-    printf("enc2 s = %d\n", s);
+    fprintf(dfile, "enc2 s = %d\n", s); fflush(dfile);
     s = erl_compare_ext(buf1, buf2);
-    printf("comp s = %d\n", s);
+    fprintf(dfile, "comp s = %d\n", s); fflush(dfile);
     
     /* Compare, in another way */
     s = erl_match(ref1, ref2);
-    printf("match s = %d\n", s);
+    fprintf(dfile, "match s = %d\n", s); fflush(dfile);
 #endif
 
+    fclose(dfile);
+
     erl_close_connection(fd);
 
     return 0;
diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk
index 06ef907d6c..cc72ed639a 100644
--- a/lib/erl_interface/vsn.mk
+++ b/lib/erl_interface/vsn.mk
@@ -1,2 +1,2 @@
-EI_VSN = 3.10.4
+EI_VSN = 3.12
 ERL_INTERFACE_VSN = $(EI_VSN)
diff --git a/lib/et/doc/src/et.xml b/lib/et/doc/src/et.xml
index 3009b559e1..a362d00b3e 100644
--- a/lib/et/doc/src/et.xml
+++ b/lib/et/doc/src/et.xml
@@ -32,14 +32,14 @@
     <rev>%VSN%</rev>
     <file>et</file>
   </header>
-  <module>et</module>
+  <module since="">et</module>
   <modulesummary>Main API of the Event Trace (ET) application</modulesummary>
   <description>
     <p>Interface module for the Event Trace (ET) application</p>
   </description>
   <funcs>
     <func>
-      <name>trace_me(DetailLevel, From, To, Label, Contents) -> hopefully_traced</name>
+      <name since="OTP R13B04">trace_me(DetailLevel, From, To, Label, Contents) -> hopefully_traced</name>
       <fsummary>A function that is intended to be traced.</fsummary>
       <type>
         <v>DetailLevel = integer(X) when X =&lt; 0, X >= 100</v>
@@ -70,7 +70,7 @@
     </func>
 
     <func>
-      <name>trace_me(DetailLevel, FromTo, Label, Contents) -> hopefully_traced</name>
+      <name since="OTP R13B04">trace_me(DetailLevel, FromTo, Label, Contents) -> hopefully_traced</name>
       <fsummary>A function that is intended to be traced.</fsummary>
       <desc>
        <p>Invokes <c>et:trace_me/5</c> with both <c>From</c> and <c>To</c>
@@ -79,8 +79,8 @@
     </func>
 
     <func>
-      <name>phone_home(DetailLevel, FromTo, Label, Contents) -> hopefully_traced</name>
-      <name>phone_home(DetailLevel, From, To, Label, Contents) -> hopefully_traced</name>
+      <name since="">phone_home(DetailLevel, FromTo, Label, Contents) -> hopefully_traced</name>
+      <name since="">phone_home(DetailLevel, From, To, Label, Contents) -> hopefully_traced</name>
       <fsummary>Send a signal to the outer space</fsummary>
       <desc>
         <p>These functions sends a signal to the outer space and the
@@ -90,8 +90,8 @@
       </desc>
     </func>
     <func>
-      <name>report_event(DetailLevel, FromTo, Label, Contents) -> hopefully_traced</name>
-      <name>report_event(DetailLevel, From, To, Label, Contents) -> hopefully_traced</name>
+      <name since="">report_event(DetailLevel, FromTo, Label, Contents) -> hopefully_traced</name>
+      <name since="">report_event(DetailLevel, From, To, Label, Contents) -> hopefully_traced</name>
       <fsummary>Deprecated functions</fsummary>
       <desc>
         <p>Deprecated functions which for the time being are kept for
diff --git a/lib/et/doc/src/et_collector.xml b/lib/et/doc/src/et_collector.xml
index fd90ecfc41..f908612797 100644
--- a/lib/et/doc/src/et_collector.xml
+++ b/lib/et/doc/src/et_collector.xml
@@ -32,14 +32,14 @@
     <rev>%VSN%</rev>
     <file>et_collector.xml</file>
   </header>
-  <module>et_collector</module>
+  <module since="">et_collector</module>
   <modulesummary>Collect trace events and provide a backing storage appropriate for iteration </modulesummary>
   <description>
     <p>Interface module for the Event Trace (ET) application</p>
   </description>
   <funcs>
     <func>
-      <name>start_link(Options) -> {ok, CollectorPid} | {error, Reason}</name>
+      <name since="">start_link(Options) -> {ok, CollectorPid} | {error, Reason}</name>
       <fsummary>Start a collector process</fsummary>
       <type>
         <v>Options = [option()]</v>
@@ -105,7 +105,7 @@
       </desc>
     </func>
     <func>
-      <name>stop(CollectorPid) -> ok</name>
+      <name since="">stop(CollectorPid) -> ok</name>
       <fsummary>Stop a collector process</fsummary>
       <type>
         <v>CollectorPid = pid()</v>
@@ -115,7 +115,7 @@
       </desc>
     </func>
     <func>
-      <name>save_event_file(CollectorPid, FileName, Options) -> ok | {error, Reason}</name>
+      <name since="">save_event_file(CollectorPid, FileName, Options) -> ok | {error, Reason}</name>
       <fsummary>Save the events to a file</fsummary>
       <type>
         <v>CollectorPid = pid()</v>
@@ -139,7 +139,7 @@
       </desc>
     </func>
     <func>
-      <name>load_event_file(CollectorPid, FileName) -> {ok, BadBytes} | exit(Reason)</name>
+      <name since="">load_event_file(CollectorPid, FileName) -> {ok, BadBytes} | exit(Reason)</name>
       <fsummary>Load the event table from a file</fsummary>
       <type>
         <v>CollectorPid = pid()</v>
@@ -152,9 +152,9 @@
       </desc>
     </func>
     <func>
-      <name>report(Handle, TraceOrEvent) -> {ok, Continuation} | exit(Reason)</name>
-      <name>report_event(Handle, DetailLevel, FromTo, Label, Contents) -> {ok, Continuation} | exit(Reason)</name>
-      <name>report_event(Handle, DetailLevel, From, To, Label, Contents) -> {ok, Continuation} | exit(Reason)</name>
+      <name since="">report(Handle, TraceOrEvent) -> {ok, Continuation} | exit(Reason)</name>
+      <name since="">report_event(Handle, DetailLevel, FromTo, Label, Contents) -> {ok, Continuation} | exit(Reason)</name>
+      <name since="">report_event(Handle, DetailLevel, From, To, Label, Contents) -> {ok, Continuation} | exit(Reason)</name>
       <fsummary>Report an event to the collector</fsummary>
       <type>
         <v>Handle = Initial | Continuation</v>
@@ -181,7 +181,7 @@
       </desc>
     </func>
     <func>
-      <name>make_key(Type, Stuff) -> Key</name>
+      <name since="">make_key(Type, Stuff) -> Key</name>
       <fsummary>Make a key out of an event record or an old key</fsummary>
       <type>
         <v>Type = record(table_handle) | trace_ts | event_ts</v>
@@ -193,7 +193,7 @@
       </desc>
     </func>
     <func>
-      <name>get_table_handle(CollectorPid) -> Handle</name>
+      <name since="">get_table_handle(CollectorPid) -> Handle</name>
       <fsummary>Return a table handle</fsummary>
       <type>
         <v>CollectorPid = pid()</v>
@@ -204,7 +204,7 @@
       </desc>
     </func>
     <func>
-      <name>get_global_pid() -> CollectorPid | exit(Reason)</name>
+      <name since="">get_global_pid() -> CollectorPid | exit(Reason)</name>
       <fsummary>Return a the identity of the globally registered collector if there is any</fsummary>
       <type>
         <v>CollectorPid = pid()</v>
@@ -216,7 +216,7 @@
       </desc>
     </func>
     <func>
-      <name>change_pattern(CollectorPid, RawPattern) -> {old_pattern, TracePattern}</name>
+      <name since="">change_pattern(CollectorPid, RawPattern) -> {old_pattern, TracePattern}</name>
       <fsummary>Change active trace pattern globally on all trace nodes</fsummary>
       <type>
         <v>CollectorPid = pid()</v>
@@ -232,9 +232,9 @@
       </desc>
     </func>
     <func>
-      <name>dict_insert(CollectorPid, {filter, collector}, FilterFun) -> ok</name>
-      <name>dict_insert(CollectorPid, {subscriber, SubscriberPid}, Void) -> ok</name>
-      <name>dict_insert(CollectorPid, Key, Val) -> ok</name>
+      <name since="">dict_insert(CollectorPid, {filter, collector}, FilterFun) -> ok</name>
+      <name since="">dict_insert(CollectorPid, {subscriber, SubscriberPid}, Void) -> ok</name>
+      <name since="">dict_insert(CollectorPid, Key, Val) -> ok</name>
       <fsummary>Insert a dictionary entry and send a {et, {dict_insert, Key, Val}} tuple to all registered subscribers.</fsummary>
       <type>
         <v>CollectorPid = pid()</v>
@@ -259,7 +259,7 @@
       </desc>
     </func>
     <func>
-      <name>dict_lookup(CollectorPid, Key) -> [Val]</name>
+      <name since="">dict_lookup(CollectorPid, Key) -> [Val]</name>
       <fsummary>Lookup a dictionary entry and return zero or one value</fsummary>
       <type>
         <v>CollectorPid = pid()</v>
@@ -273,7 +273,7 @@
       </desc>
     </func>
     <func>
-      <name>dict_delete(CollectorPid, Key) -> ok</name>
+      <name since="">dict_delete(CollectorPid, Key) -> ok</name>
       <fsummary>Delete a dictionary entry and send a {et, {dict_delete, Key}} tuple to all registered subscribers.</fsummary>
       <type>
         <v>CollectorPid = pid()</v>
@@ -290,7 +290,7 @@
       </desc>
     </func>
     <func>
-      <name>dict_match(CollectorPid, Pattern) -> [Match]</name>
+      <name since="">dict_match(CollectorPid, Pattern) -> [Match]</name>
       <fsummary>Match some dictionary entries</fsummary>
       <type>
         <v>CollectorPid = pid()</v>
@@ -306,7 +306,7 @@
       </desc>
     </func>
     <func>
-      <name>multicast(_CollectorPid, Msg) -> ok</name>
+      <name since="">multicast(_CollectorPid, Msg) -> ok</name>
       <fsummary>Sends a message to all registered subscribers</fsummary>
       <type>
         <v>CollectorPid = pid()</v>
@@ -318,7 +318,7 @@
       </desc>
     </func>
     <func>
-      <name>start_trace_client(CollectorPid, Type, Parameters) -> file_loaded | {trace_client_pid, pid()} | exit(Reason)</name>
+      <name since="">start_trace_client(CollectorPid, Type, Parameters) -> file_loaded | {trace_client_pid, pid()} | exit(Reason)</name>
       <fsummary>Load raw Erlang trace from a file, port or process.</fsummary>
       <type>
         <v>Type       = dbg_trace_client_type()</v>
@@ -330,14 +330,14 @@
       </desc>
     </func>
     <func>
-      <name>iterate(Handle, Prev, Limit) -> NewAcc</name>
+      <name since="">iterate(Handle, Prev, Limit) -> NewAcc</name>
       <fsummary>Iterates over the currently stored events</fsummary>
       <desc>
         <p>Short for iterate(Handle, Prev, Limit, undefined, Prev) -&gt; NewAcc</p>
       </desc>
     </func>
     <func>
-      <name>iterate(Handle, Prev, Limit, Fun, Acc) -> NewAcc</name>
+      <name since="">iterate(Handle, Prev, Limit, Fun, Acc) -> NewAcc</name>
       <fsummary>Iterate over the currently stored events</fsummary>
       <type>
         <v>Handle = collector_pid() | table_handle()</v>
@@ -361,7 +361,7 @@
       </desc>
     </func>
     <func>
-      <name>clear_table(Handle) -> ok</name>
+      <name since="">clear_table(Handle) -> ok</name>
       <fsummary>Clear the event table</fsummary>
       <type>
         <v>Handle = collector_pid() | table_handle()</v>
diff --git a/lib/et/doc/src/et_selector.xml b/lib/et/doc/src/et_selector.xml
index 30ca74c872..3c766cafb7 100644
--- a/lib/et/doc/src/et_selector.xml
+++ b/lib/et/doc/src/et_selector.xml
@@ -32,7 +32,7 @@
     <rev>%VSN%</rev>
     <file>et_selector.xml</file>
   </header>
-  <module>et_selector</module>
+  <module since="">et_selector</module>
   <modulesummary>Define event transforms and trace patterns</modulesummary>
   <description>
     <p></p>
@@ -40,7 +40,7 @@
   
   <funcs>
     <func>
-      <name>make_pattern(RawPattern) -> TracePattern</name>
+      <name since="">make_pattern(RawPattern) -> TracePattern</name>
       <fsummary>Makes a trace pattern suitable to feed change_pattern/1</fsummary>
 
       <type>
@@ -61,7 +61,7 @@
     </func>
 
     <func>
-      <name>change_pattern(Pattern) -> ok</name>
+      <name since="">change_pattern(Pattern) -> ok</name>
 
       <fsummary>Activates/deactivates tracing by changing the current trace pattern</fsummary>
 
@@ -85,7 +85,7 @@
       </desc>
     </func>
     <func>
-      <name>parse_event(Mod, ValidTraceData) -> false | true | {true, Event}</name>
+      <name since="">parse_event(Mod, ValidTraceData) -> false | true | {true, Event}</name>
 
       <fsummary>Transforms trace data and makes an event record out of it</fsummary>
 
diff --git a/lib/et/doc/src/et_viewer.xml b/lib/et/doc/src/et_viewer.xml
index e0b39636e9..9d59eef668 100644
--- a/lib/et/doc/src/et_viewer.xml
+++ b/lib/et/doc/src/et_viewer.xml
@@ -32,14 +32,14 @@
     <rev>%VSN%</rev>
     <file>et_viewer.xml</file>
   </header>
-  <module>et_viewer</module>
+  <module since="">et_viewer</module>
   <modulesummary>Displays a sequence chart for trace events (messages/actions)</modulesummary>
   <description>
     <p></p>
   </description>
   <funcs>
     <func>
-      <name>file(FileName) -> {ok, ViewerPid} | {error, Reason}</name>
+      <name since="">file(FileName) -> {ok, ViewerPid} | {error, Reason}</name>
       <fsummary>Start a new event viewer and a corresponding collector and load them with trace events from a trace file.</fsummary>
       <type>
         <v>FileName() = string()</v>
@@ -52,7 +52,7 @@
       </desc>
     </func>
     <func>
-      <name>start() -> ok</name>
+      <name since="">start() -> ok</name>
       <fsummary>Simplified start of a sequence chart viewer with global tracing activated.</fsummary>
       <desc>
         <p>Simplified start of a sequence chart viewer with
@@ -62,7 +62,7 @@
       </desc>
     </func>
     <func>
-      <name>start(Options) -> ok</name>
+      <name since="">start(Options) -> ok</name>
       <fsummary>Start of a sequence chart viewer without linking to the parent process.</fsummary>
       <desc>
         <p>Start of a sequence chart viewer without linking
@@ -70,7 +70,7 @@
       </desc>
     </func>
     <func>
-      <name>start_link(Options) -> {ok, ViewerPid} | {error, Reason}</name>
+      <name since="">start_link(Options) -> {ok, ViewerPid} | {error, Reason}</name>
       <fsummary>Start a sequence chart viewer for trace events (messages/actions)</fsummary>
       <type>
         <v>Options = [option() | collector_option()]</v>
@@ -125,7 +125,7 @@
       </desc>
     </func>
     <func>
-      <name>get_collector_pid(ViewerPid) -> CollectorPid</name>
+      <name since="">get_collector_pid(ViewerPid) -> CollectorPid</name>
       <fsummary>Returns the identifier of the collector process</fsummary>
       <type>
         <v>ViewerPid = pid()</v>
@@ -136,7 +136,7 @@
       </desc>
     </func>
     <func>
-      <name>stop(ViewerPid) -> ok</name>
+      <name since="">stop(ViewerPid) -> ok</name>
       <fsummary>Stops a viewer</fsummary>
       <type>
         <v>ViewerPid = pid()</v>
diff --git a/lib/ftp/doc/src/ftp.xml b/lib/ftp/doc/src/ftp.xml
index 34e3ff84b0..9645b03364 100644
--- a/lib/ftp/doc/src/ftp.xml
+++ b/lib/ftp/doc/src/ftp.xml
@@ -29,7 +29,7 @@
     <rev>B</rev>
     <file>ftp.xml</file>
   </header>
-  <module>ftp</module>
+  <module since="">ftp</module>
   <modulesummary>A File Transfer Protocol client.</modulesummary>
 
   <description>
@@ -272,7 +272,7 @@
   <funcs>
 
     <func>
-      <name>account(Pid, Account) -> ok | {error, Reason}</name>
+      <name since="">account(Pid, Account) -> ok | {error, Reason}</name>
       <fsummary>Specifies which account to use.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -289,8 +289,8 @@
     </func>
 
     <func>
-      <name>append(Pid, LocalFile) -> </name>
-      <name>append(Pid, LocalFile, RemoteFile) -> ok | {error, Reason}</name>
+      <name since="">append(Pid, LocalFile) -> </name>
+      <name since="">append(Pid, LocalFile, RemoteFile) -> ok | {error, Reason}</name>
       <fsummary>Transfers a file to remote server, and appends it to 
       <c>Remotefile</c>.</fsummary>
       <type>
@@ -310,7 +310,7 @@
     </func>
 
     <func>
-      <name>append_bin(Pid, Bin, RemoteFile) -> ok | {error, Reason}</name>
+      <name since="">append_bin(Pid, Bin, RemoteFile) -> ok | {error, Reason}</name>
       <fsummary>Transfers a binary into a remote file.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -328,7 +328,7 @@
     </func>
 
     <func>
-      <name>append_chunk(Pid, Bin) -> ok | {error, Reason}</name>
+      <name since="">append_chunk(Pid, Bin) -> ok | {error, Reason}</name>
       <fsummary>Appends a chunk to the remote file.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -348,7 +348,7 @@
     </func>
 
     <func>
-      <name>append_chunk_start(Pid, File) -> ok | {error, Reason}</name>
+      <name since="">append_chunk_start(Pid, File) -> ok | {error, Reason}</name>
       <fsummary>Starts transfer of file chunks for appending to <c>File</c>.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -365,7 +365,7 @@
     </func>
 
     <func>
-      <name>append_chunk_end(Pid) -> ok | {error, Reason}</name>
+      <name since="">append_chunk_end(Pid) -> ok | {error, Reason}</name>
       <fsummary>Stops transfer of chunks for appending.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -381,7 +381,7 @@
     </func>
 
     <func>
-      <name>cd(Pid, Dir) -> ok | {error, Reason}</name>
+      <name since="">cd(Pid, Dir) -> ok | {error, Reason}</name>
       <fsummary>Changes remote working directory.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -397,7 +397,7 @@
     </func>
     
     <func>
-      <name>close(Pid) -> ok</name>
+      <name since="">close(Pid) -> ok</name>
       <fsummary>Ends the FTP session.</fsummary>
       <type>
 	<v>Pid = pid()</v>
@@ -411,7 +411,7 @@
     </func>
 
     <func>
-      <name>delete(Pid, File) -> ok | {error, Reason}</name>
+      <name since="">delete(Pid, File) -> ok | {error, Reason}</name>
       <fsummary>Deletes a file at the remote server.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -426,7 +426,7 @@
     </func>
 
     <func>
-      <name>formaterror(Tag) -> string()</name>
+      <name since="">formaterror(Tag) -> string()</name>
       <fsummary>Returns error diagnostics.</fsummary>
       <type>
         <v>Tag = {error, atom()} | atom()</v>
@@ -440,7 +440,7 @@
     </func>
 
     <func>
-      <name>lcd(Pid, Dir) -> ok | {error, Reason}</name>
+      <name since="">lcd(Pid, Dir) -> ok | {error, Reason}</name>
       <fsummary>Changes local working directory.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -455,7 +455,7 @@
     </func>
 
     <func>
-      <name>lpwd(Pid) -> {ok, Dir}</name>
+      <name since="">lpwd(Pid) -> {ok, Dir}</name>
       <fsummary>Gets local current working directory.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -470,8 +470,8 @@
     </func>
 
     <func>
-      <name>ls(Pid) -> </name>
-      <name>ls(Pid, Pathname) -> {ok, Listing} | {error, Reason}</name>
+      <name since="">ls(Pid) -> </name>
+      <name since="">ls(Pid, Pathname) -> {ok, Listing} | {error, Reason}</name>
       <fsummary>List of files.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -493,7 +493,7 @@
     </func>
 
     <func>
-      <name>mkdir(Pid, Dir) -> ok | {error, Reason}</name>
+      <name since="">mkdir(Pid, Dir) -> ok | {error, Reason}</name>
       <fsummary>Creates a remote directory.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -510,8 +510,8 @@
     </func>
 
     <func>
-      <name>nlist(Pid) -> </name>
-      <name>nlist(Pid, Pathname) -> {ok, Listing} | {error, Reason}</name>
+      <name since="">nlist(Pid) -> </name>
+      <name since="">nlist(Pid, Pathname) -> {ok, Listing} | {error, Reason}</name>
       <fsummary>List of files.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -535,8 +535,8 @@
     </func>
 
     <func>
-      <name>open(Host) -> {ok, Pid} | {error, Reason}</name>
-      <name>open(Host, Opts) -> {ok, Pid} | {error, Reason}</name>
+      <name since="">open(Host) -> {ok, Pid} | {error, Reason}</name>
+      <name since="">open(Host, Opts) -> {ok, Pid} | {error, Reason}</name>
       <fsummary>Starts a standalone FTP client.</fsummary>
       <type>
 	<v>Host = string() | ip_address()</v>
@@ -550,7 +550,7 @@
 	<v>ipfamily() = inet | inet6 | inet6fb4 (default is inet)</v>
 	<v>port() = integer() > 0 (default is 21)</v>
 	<v>mode() = active | passive (default is passive)</v>
-	<v>tls_options() = [<seealso marker="ssl:ssl#type-ssloption">ssl:ssloption()</seealso>]</v>
+	<v>tls_options() = [<seealso marker="ssl:ssl#type-tls_option">ssl:tls_option()</seealso>]</v>
 	<v>sock_opts() = [<seealso marker="kernel:gen_tcp#type-option">gen_tcp:option()</seealso> except for ipv6_v6only, active, packet, mode, packet_size and header</v>
 	<v>timeout() = integer() > 0 (default is 60000 milliseconds)</v>
 	<v>dtimeout() = integer() > 0 | infinity (default is infinity)</v>
@@ -587,7 +587,7 @@
     </func>
 
     <func>
-      <name>pwd(Pid) -> {ok, Dir} | {error, Reason}</name>
+      <name since="">pwd(Pid) -> {ok, Dir} | {error, Reason}</name>
       <fsummary>Gets the remote current working directory.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -603,8 +603,8 @@
     </func>
 
     <func>
-      <name>recv(Pid, RemoteFile) -> </name>
-      <name>recv(Pid, RemoteFile, LocalFile) -> ok | {error, Reason}</name>
+      <name since="">recv(Pid, RemoteFile) -> </name>
+      <name since="">recv(Pid, RemoteFile, LocalFile) -> ok | {error, Reason}</name>
       <fsummary>Transfers a file from remote server.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -627,7 +627,7 @@
     </func>
 
     <func>
-      <name>recv_bin(Pid, RemoteFile) -> {ok, Bin} | {error, Reason}</name>
+      <name since="">recv_bin(Pid, RemoteFile) -> {ok, Bin} | {error, Reason}</name>
       <fsummary>Transfers a file from remote server as a binary.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -644,7 +644,7 @@
     </func>
 
     <func>
-      <name>recv_chunk_start(Pid, RemoteFile) -> ok | {error, Reason}</name>
+      <name since="">recv_chunk_start(Pid, RemoteFile) -> ok | {error, Reason}</name>
       <fsummary>Starts chunk-reading of the remote file.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -660,7 +660,7 @@
     </func>
 
     <func>
-      <name>recv_chunk(Pid) -> ok | {ok, Bin} | {error, Reason}</name>
+      <name since="">recv_chunk(Pid) -> ok | {ok, Bin} | {error, Reason}</name>
       <fsummary>Receives a chunk of the remote file.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -682,7 +682,7 @@
     </func>
 
     <func>
-      <name>rename(Pid, Old, New) -> ok | {error, Reason}</name>
+      <name since="">rename(Pid, Old, New) -> ok | {error, Reason}</name>
       <fsummary>Renames a file at the remote server.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -697,7 +697,7 @@
     </func>
 
     <func>
-      <name>rmdir(Pid, Dir) -> ok | {error, Reason}</name>
+      <name since="">rmdir(Pid, Dir) -> ok | {error, Reason}</name>
       <fsummary>Removes a remote directory.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -714,8 +714,8 @@
     </func>
 
     <func>
-      <name>send(Pid, LocalFile) -></name>
-      <name>send(Pid, LocalFile, RemoteFile) -> ok | {error, Reason}</name>
+      <name since="">send(Pid, LocalFile) -></name>
+      <name since="">send(Pid, LocalFile, RemoteFile) -> ok | {error, Reason}</name>
       <fsummary>Transfers a file to the remote server.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -732,7 +732,7 @@
     </func>
 
     <func>
-      <name>send_bin(Pid, Bin, RemoteFile) -> ok | {error, Reason}</name>
+      <name since="">send_bin(Pid, Bin, RemoteFile) -> ok | {error, Reason}</name>
       <fsummary>Transfers a binary into a remote file.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -749,7 +749,7 @@
     </func>
 
     <func>
-      <name>send_chunk(Pid, Bin) -> ok | {error, Reason}</name>
+      <name since="">send_chunk(Pid, Bin) -> ok | {error, Reason}</name>
       <fsummary>Writes a chunk to the remote file.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -769,7 +769,7 @@
     </func>
 
     <func>
-      <name>send_chunk_start(Pid, File) -> ok | {error, Reason}</name>
+      <name since="">send_chunk_start(Pid, File) -> ok | {error, Reason}</name>
       <fsummary>Starts transfer of file chunks.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -785,7 +785,7 @@
     </func>
 
     <func>
-      <name>send_chunk_end(Pid) -> ok | {error, Reason}</name>
+      <name since="">send_chunk_end(Pid) -> ok | {error, Reason}</name>
       <fsummary>Stops transfer of chunks.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -801,7 +801,7 @@
     </func>
 
     <func>
-      <name>start_service(ServiceConfig) -> {ok, Pid} | {error, Reason}</name>
+      <name since="OTP 21.0">start_service(ServiceConfig) -> {ok, Pid} | {error, Reason}</name>
       <fsummary>Dynamically starts an <c>FTP</c>
       session after the <c>ftp</c> application has been started.</fsummary>
       <type>
@@ -820,7 +820,7 @@
     </func>
 
     <func>
-      <name>stop_service(Reference) -> ok | {error, Reason} </name>
+      <name since="OTP 21.0">stop_service(Reference) -> ok | {error, Reason} </name>
       <fsummary>Stops an FTP session.</fsummary>
       <type>
 	<v>Reference = pid() | term() - service-specified reference</v>
@@ -832,7 +832,7 @@
     </func>
 
     <func>
-      <name>type(Pid, Type) -> ok | {error, Reason}</name>
+      <name since="">type(Pid, Type) -> ok | {error, Reason}</name>
       <fsummary>Sets transfer type to <c>ascii</c>or <c>binary</c>.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -849,7 +849,7 @@
     </func>
 
     <func>
-      <name>user(Pid, User, Password) -> ok | {error, Reason}</name>
+      <name since="">user(Pid, User, Password) -> ok | {error, Reason}</name>
       <fsummary>User login.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -864,7 +864,7 @@
     </func>
 
     <func>
-      <name>user(Pid, User, Password, Account) -> ok | {error, Reason}</name>
+      <name since="">user(Pid, User, Password, Account) -> ok | {error, Reason}</name>
       <fsummary>User login.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -880,7 +880,7 @@
     </func>
 
     <func>
-      <name>quote(Pid, Command) -> [FTPLine]</name>
+      <name since="">quote(Pid, Command) -> [FTPLine]</name>
       <fsummary>Sends an arbitrary FTP command.</fsummary>
       <type>
         <v>Pid = pid()</v>
diff --git a/lib/ftp/doc/src/notes.xml b/lib/ftp/doc/src/notes.xml
index 01c1f88cf1..61da079900 100644
--- a/lib/ftp/doc/src/notes.xml
+++ b/lib/ftp/doc/src/notes.xml
@@ -33,7 +33,23 @@
     <file>notes.xml</file>
   </header>
   
-  <section><title>Ftp 1.0.1</title>
+  <section><title>Ftp 1.0.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed timing related bug that could make ftp functions
+	    behave badly.</p>
+          <p>
+	    Own Id: OTP-15659 Aux Id: ERIERL-316 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Ftp 1.0.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/ftp/src/ftp.erl b/lib/ftp/src/ftp.erl
index 40f6b53fa3..18cd8c7524 100644
--- a/lib/ftp/src/ftp.erl
+++ b/lib/ftp/src/ftp.erl
@@ -1065,9 +1065,9 @@ handle_call({_, {open, ip_comm, Opts, {CtrlOpts, DataPassOpts, DataActOpts}}}, F
 	    end
     end;	
 
-handle_call({_, {open, tls_upgrade, TLSOptions}}, From, State) ->
-    _ = send_ctrl_message(State, mk_cmd("AUTH TLS", [])), 
-    activate_ctrl_connection(State),
+handle_call({_, {open, tls_upgrade, TLSOptions}}, From, State0) ->
+    _ = send_ctrl_message(State0, mk_cmd("AUTH TLS", [])), 
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{client = From, caller = open, tls_options = TLSOptions}};
 
 handle_call({_, {user, User, Password}}, From, 
@@ -1081,17 +1081,17 @@ handle_call({_, {user, User, Password, Acc}}, From,
 handle_call({_, {account, Acc}}, From, State)->
     handle_user_account(Acc, State#state{client = From});
 
-handle_call({_, pwd}, From, #state{chunk = false} = State) ->
-    _ = send_ctrl_message(State, mk_cmd("PWD", [])), 
-    activate_ctrl_connection(State),
+handle_call({_, pwd}, From, #state{chunk = false} = State0) ->
+    _ = send_ctrl_message(State0, mk_cmd("PWD", [])), 
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{client = From, caller = pwd}};
 
 handle_call({_, lpwd}, From,  #state{ldir = LDir} = State) ->
     {reply, {ok, LDir}, State#state{client = From}};
 
-handle_call({_, {cd, Dir}}, From,  #state{chunk = false} = State) ->
-    _ = send_ctrl_message(State, mk_cmd("CWD ~s", [Dir])), 
-    activate_ctrl_connection(State),
+handle_call({_, {cd, Dir}}, From,  #state{chunk = false} = State0) ->
+    _ = send_ctrl_message(State0, mk_cmd("CWD ~s", [Dir])), 
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{client = From, caller = cd}};
 
 handle_call({_,{lcd, Dir}}, _From, #state{ldir = LDir0} = State) ->
@@ -1108,41 +1108,41 @@ handle_call({_, {dir, Len, Dir}}, {_Pid, _} = From,
     setup_data_connection(State#state{caller = {dir, Dir, Len},
 				      client = From});
 handle_call({_, {rename, CurrFile, NewFile}}, From,
-	    #state{chunk = false} = State) ->
-    _ = send_ctrl_message(State, mk_cmd("RNFR ~s", [CurrFile])),
-    activate_ctrl_connection(State),
+	    #state{chunk = false} = State0) ->
+    _ = send_ctrl_message(State0, mk_cmd("RNFR ~s", [CurrFile])),
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{caller = {rename, NewFile}, client = From}};
 
 handle_call({_, {delete, File}}, {_Pid, _} = From, 
-	    #state{chunk = false} = State) ->
-    _ = send_ctrl_message(State, mk_cmd("DELE ~s", [File])),
-    activate_ctrl_connection(State),
+	    #state{chunk = false} = State0) ->
+    _ = send_ctrl_message(State0, mk_cmd("DELE ~s", [File])),
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{client = From}};
 
-handle_call({_, {mkdir, Dir}}, From,  #state{chunk = false} = State) ->
-    _ = send_ctrl_message(State, mk_cmd("MKD ~s", [Dir])),
-    activate_ctrl_connection(State),
+handle_call({_, {mkdir, Dir}}, From,  #state{chunk = false} = State0) ->
+    _ = send_ctrl_message(State0, mk_cmd("MKD ~s", [Dir])),
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{client = From}};
 
-handle_call({_,{rmdir, Dir}}, From, #state{chunk = false} = State) ->
-    _ = send_ctrl_message(State, mk_cmd("RMD ~s", [Dir])),
-    activate_ctrl_connection(State),
+handle_call({_,{rmdir, Dir}}, From, #state{chunk = false} = State0) ->
+    _ = send_ctrl_message(State0, mk_cmd("RMD ~s", [Dir])),
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{client = From}};
 
-handle_call({_,{type, Type}}, From, #state{chunk = false} = State) ->  
+handle_call({_,{type, Type}}, From, #state{chunk = false} = State0) ->  
     case Type of
 	ascii ->
-	    _ = send_ctrl_message(State, mk_cmd("TYPE A", [])),
-	    activate_ctrl_connection(State),
+	    _ = send_ctrl_message(State0, mk_cmd("TYPE A", [])),
+	    State = activate_ctrl_connection(State0),
 	    {noreply, State#state{caller = type, type = ascii, 
 				  client = From}};
 	binary ->
-	    _ = send_ctrl_message(State, mk_cmd("TYPE I", [])),
-	    activate_ctrl_connection(State),
+	    _ = send_ctrl_message(State0, mk_cmd("TYPE I", [])),
+	    State = activate_ctrl_connection(State0),
 	    {noreply, State#state{caller = type, type = binary, 
 				  client = From}};
 	_ ->
-	    {reply, {error, etype}, State}
+	    {reply, {error, etype}, State0}
     end;
 
 handle_call({_,{recv, RemoteFile, LocalFile}}, From, 
@@ -1181,8 +1181,8 @@ handle_call({_, recv_chunk}, _From, #state{chunk = true,
                                           } = State0) ->
     %% The ftp:recv_chunk call was the last event we waited for, finnish and clean up
     ?DBG("recv_chunk_closing ftp:recv_chunk, last event",[]),
-    activate_ctrl_connection(State0),
-    {reply, ok, State0#state{caller = undefined,
+    State = activate_ctrl_connection(State0),
+    {reply, ok, State#state{caller = undefined,
                              chunk = false,
                              client = undefined}};
     
@@ -1238,18 +1238,18 @@ handle_call({_, {transfer_chunk, Bin}}, _, #state{chunk = true} = State) ->
 handle_call({_, {transfer_chunk, _}}, _, #state{chunk = false} = State) ->
     {reply, {error, echunk}, State};
 
-handle_call({_, chunk_end}, From, #state{chunk = true} = State) ->
-    close_data_connection(State),
-    activate_ctrl_connection(State),
+handle_call({_, chunk_end}, From, #state{chunk = true} = State0) ->
+    close_data_connection(State0),
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{client = From, dsock = undefined, 
 			  caller = end_chunk_transfer, chunk = false}};
 
 handle_call({_, chunk_end}, _, #state{chunk = false} = State) ->
     {reply, {error, echunk}, State};
 
-handle_call({_, {quote, Cmd}}, From, #state{chunk = false} = State) ->
-    _ = send_ctrl_message(State, mk_cmd(Cmd, [])),
-    activate_ctrl_connection(State),
+handle_call({_, {quote, Cmd}}, From, #state{chunk = false} = State0) ->
+    _ = send_ctrl_message(State0, mk_cmd(Cmd, [])),
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{client = From, caller = quote}};
 
 handle_call({_, _Req}, _From, #state{csock = CSock} = State) 
@@ -1325,38 +1325,38 @@ handle_info({Trpt, Socket, Data}, #state{dsock = {Trpt,Socket}} = State0) when T
 				  Data/binary>>}};
 
 handle_info({Cls, Socket}, #state{dsock = {Trpt,Socket},
-				  caller = {recv_file, Fd}} = State)
+				  caller = {recv_file, Fd}} = State0)
   when {Cls,Trpt}=={tcp_closed,tcp} ; {Cls,Trpt}=={ssl_closed,ssl} ->
     file_close(Fd),
-    progress_report({transfer_size, 0}, State),
-    activate_ctrl_connection(State),
+    progress_report({transfer_size, 0}, State0),
+    State = activate_ctrl_connection(State0),
     ?DBG("Data channel close",[]),
     {noreply, State#state{dsock = undefined, data = <<>>}};
 
 handle_info({Cls, Socket}, #state{dsock = {Trpt,Socket},
                                   client = Client,
-				  caller = recv_chunk} = State)
+				  caller = recv_chunk} = State0)
   when {Cls,Trpt}=={tcp_closed,tcp} ; {Cls,Trpt}=={ssl_closed,ssl} ->
     ?DBG("Data channel close recv_chunk",[]),
-    activate_ctrl_connection(State),
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{dsock = undefined,
                           caller = #recv_chunk_closing{dconn_closed     =  true,
                                                        client_called_us =  Client =/= undefined}
                          }};
 
 handle_info({Cls, Socket}, #state{dsock = {Trpt,Socket}, caller = recv_bin, 
-					 data = Data} = State)
+					 data = Data} = State0)
   when {Cls,Trpt}=={tcp_closed,tcp} ; {Cls,Trpt}=={ssl_closed,ssl} ->
     ?DBG("Data channel close",[]),
-    activate_ctrl_connection(State),
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{dsock = undefined, data = <<>>, 
 			  caller = {recv_bin, Data}}};
 
 handle_info({Cls, Socket}, #state{dsock = {Trpt,Socket}, data = Data,
-					 caller = {handle_dir_result, Dir}} 
-	    = State) when {Cls,Trpt}=={tcp_closed,tcp} ; {Cls,Trpt}=={ssl_closed,ssl} ->
+                                  caller = {handle_dir_result, Dir}} 
+	    = State0) when {Cls,Trpt}=={tcp_closed,tcp} ; {Cls,Trpt}=={ssl_closed,ssl} ->
     ?DBG("Data channel close",[]),
-    activate_ctrl_connection(State),
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{dsock = undefined, 
 			  caller = {handle_dir_result, Dir, Data},
 %			  data = <<?CR,?LF>>}};
@@ -1377,7 +1377,7 @@ handle_info({Transport, Socket, Data}, #state{csock = {Transport, Socket},
 					      client = From,
 					      ctrl_data = {CtrlData, AccLines, 
 							   LineStatus}} 
-	    = State) ->    
+	    = State0) ->    
     ?DBG('--ctrl ~p ----> ~s~p~n',[Socket,<<CtrlData/binary, Data/binary>>,State]),
     case ftp_response:parse_lines(<<CtrlData/binary, Data/binary>>, 
 				  AccLines, LineStatus) of
@@ -1387,21 +1387,21 @@ handle_info({Transport, Socket, Data}, #state{csock = {Transport, Socket},
 	    case Caller of
 		quote ->
 		    gen_server:reply(From, string:tokens(Lines, [?CR, ?LF])),
-		    {noreply, State#state{client = undefined, 
-					  caller = undefined,
-					  latest_ctrl_response = Lines,
-					  ctrl_data = {NextMsgData, [], 
-						       start}}};
+		    {noreply, State0#state{client = undefined, 
+                                           caller = undefined,
+                                           latest_ctrl_response = Lines,
+                                           ctrl_data = {NextMsgData, [], 
+                                                        start}}};
 		_ ->
 		    ?DBG('   ...handle_ctrl_result(~p,...) ctrl_data=~p~n',[CtrlResult,{NextMsgData, [], start}]),
 		    handle_ctrl_result(CtrlResult,
-				       State#state{latest_ctrl_response = Lines,
-						   ctrl_data = 
-						       {NextMsgData, [], start}})
+				       State0#state{latest_ctrl_response = Lines,
+                                                    ctrl_data = 
+                                                        {NextMsgData, [], start}})
 	    end;
 	{continue, NewCtrlData} ->
 	    ?DBG('   ...Continue... ctrl_data=~p~n',[NewCtrlData]),
-	    activate_ctrl_connection(State),
+	    State = activate_ctrl_connection(State0),
 	    {noreply, State#state{ctrl_data = NewCtrlData}}
     end;
 
@@ -1567,19 +1567,19 @@ start_link(Opts, GenServerOptions) ->
 %%% Help functions to handle_call and/or handle_ctrl_result
 %%--------------------------------------------------------------------------
 %% User handling 
-handle_user(User, Password, Acc, State) ->
-    _ = send_ctrl_message(State, mk_cmd("USER ~s", [User])),
-    activate_ctrl_connection(State),
+handle_user(User, Password, Acc, State0) ->
+    _ = send_ctrl_message(State0, mk_cmd("USER ~s", [User])),
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{caller = {handle_user, Password, Acc}}}.
 
-handle_user_passwd(Password, Acc, State) ->
-    _ = send_ctrl_message(State, mk_cmd("PASS ~s", [Password])),
-    activate_ctrl_connection(State),
+handle_user_passwd(Password, Acc, State0) ->
+    _ = send_ctrl_message(State0, mk_cmd("PASS ~s", [Password])),
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{caller = {handle_user_passwd, Acc}}}.
 
-handle_user_account(Acc, State) ->
-    _ = send_ctrl_message(State, mk_cmd("ACCT ~s", [Acc])),
-    activate_ctrl_connection(State),
+handle_user_account(Acc, State0) ->
+    _ = send_ctrl_message(State0, mk_cmd("ACCT ~s", [Acc])),
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{caller = handle_user_account}}.
 
 
@@ -1594,9 +1594,9 @@ handle_ctrl_result({tls_upgrade, _}, #state{csock = {tcp, Socket},
     ?DBG('<--ctrl ssl:connect(~p, ~p)~n~p~n',[Socket,TLSOptions,State0]),
     case ssl:connect(Socket, TLSOptions, Timeout) of
 	{ok, TLSSocket} ->
-	    State = State0#state{csock = {ssl,TLSSocket}},
-	    _ = send_ctrl_message(State, mk_cmd("PBSZ 0", [])),
-	    activate_ctrl_connection(State),
+	    State1 = State0#state{csock = {ssl,TLSSocket}},
+	    _ = send_ctrl_message(State1, mk_cmd("PBSZ 0", [])),
+	    State = activate_ctrl_connection(State1),
 	    {noreply, State#state{tls_upgrading_data_connection = {true, pbsz}} };
 	{error, _} = Error ->
 	    gen_server:reply(From,  {Error, self()}),
@@ -1605,9 +1605,9 @@ handle_ctrl_result({tls_upgrade, _}, #state{csock = {tcp, Socket},
 					tls_upgrading_data_connection = false}}
     end;	
 
-handle_ctrl_result({pos_compl, _}, #state{tls_upgrading_data_connection = {true, pbsz}} = State) ->
-    _ = send_ctrl_message(State, mk_cmd("PROT P", [])),
-    activate_ctrl_connection(State),
+handle_ctrl_result({pos_compl, _}, #state{tls_upgrading_data_connection = {true, pbsz}} = State0) ->
+    _ = send_ctrl_message(State0, mk_cmd("PROT P", [])),
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{tls_upgrading_data_connection = {true, prot}}};
 
 handle_ctrl_result({pos_compl, _}, #state{tls_upgrading_data_connection = {true, prot},
@@ -1801,10 +1801,10 @@ handle_ctrl_result({pos_compl, _}, #state{caller = {handle_dir_result, Dir,
 
 handle_ctrl_result({pos_compl, Lines}, 
 		   #state{caller = {handle_dir_data, Dir, DirData}} = 
-		   State) ->
+		   State0) ->
     OldDir = pwd_result(Lines),    
-    _ = send_ctrl_message(State, mk_cmd("CWD ~s", [Dir])),
-    activate_ctrl_connection(State),
+    _ = send_ctrl_message(State0, mk_cmd("CWD ~s", [Dir])),
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{caller = {handle_dir_data_second_phase, OldDir,
 				    DirData}}};
 handle_ctrl_result({Status, _},
@@ -1818,9 +1818,9 @@ handle_ctrl_result(S={_Status, _},
 
 handle_ctrl_result({pos_compl, _},
 		   #state{caller = {handle_dir_data_second_phase, OldDir, 
-				    DirData}} = State) ->
-    _ = send_ctrl_message(State, mk_cmd("CWD ~s", [OldDir])),
-    activate_ctrl_connection(State),
+				    DirData}} = State0) ->
+    _ = send_ctrl_message(State0, mk_cmd("CWD ~s", [OldDir])),
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{caller = {handle_dir_data_third_phase, DirData}}};
 handle_ctrl_result({Status, _}, 
 		   #state{caller = {handle_dir_data_second_phase, _, _}} 
@@ -1840,9 +1840,9 @@ handle_ctrl_result(Status={epath, _}, #state{caller = {dir,_}} = State) ->
 %%--------------------------------------------------------------------------
 %% File renaming
 handle_ctrl_result({pos_interm, _}, #state{caller = {rename, NewFile}} 
-		   = State) ->
-    _ = send_ctrl_message(State, mk_cmd("RNTO ~s", [NewFile])),
-    activate_ctrl_connection(State),
+		   = State0) ->
+    _ = send_ctrl_message(State0, mk_cmd("RNTO ~s", [NewFile])),
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{caller = rename_second_phase}}; 
 
 handle_ctrl_result({Status, _}, 
@@ -1916,10 +1916,10 @@ handle_ctrl_result({pos_compl, _}, #state{client = From,
     %% The pos_compl was the last event we waited for, finnish and clean up
     ?DBG("recv_chunk_closing pos_compl, last event",[]),
     gen_server:reply(From, ok),
-    activate_ctrl_connection(State0),
-    {noreply, State0#state{caller = undefined,
-                           chunk = false,
-                           client = undefined}};
+    State = activate_ctrl_connection(State0),
+    {noreply, State#state{caller = undefined,
+                          chunk = false,
+                          client = undefined}};
 
 handle_ctrl_result({pos_compl, _}, #state{caller = #recv_chunk_closing{}=R}
 		   = State0) ->
@@ -2013,71 +2013,71 @@ ctrl_result_response(_, #state{client = From} = State, ErrorMsg) ->
     {noreply, State#state{client = undefined, caller = undefined}}.
 
 %%--------------------------------------------------------------------------
-handle_caller(#state{caller = {dir, Dir, Len}} = State) ->
+handle_caller(#state{caller = {dir, Dir, Len}} = State0) ->
     Cmd = case Len of
 	      short -> "NLST";
 	      long -> "LIST"
 	  end,
     _ = case Dir of
             "" ->
-                send_ctrl_message(State, mk_cmd(Cmd, ""));
+                send_ctrl_message(State0, mk_cmd(Cmd, ""));
             _ ->
-                send_ctrl_message(State, mk_cmd(Cmd ++ " ~s", [Dir]))
+                send_ctrl_message(State0, mk_cmd(Cmd ++ " ~s", [Dir]))
         end,
-    activate_ctrl_connection(State),
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{caller = {dir, Dir}}};
      
-handle_caller(#state{caller = {recv_bin, RemoteFile}} = State) ->
-    _ = send_ctrl_message(State, mk_cmd("RETR ~s", [RemoteFile])),
-    activate_ctrl_connection(State),
+handle_caller(#state{caller = {recv_bin, RemoteFile}} = State0) ->
+    _ = send_ctrl_message(State0, mk_cmd("RETR ~s", [RemoteFile])),
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{caller = recv_bin}};
 
 handle_caller(#state{caller = {start_chunk_transfer, Cmd, RemoteFile}} = 
-	      State) ->
-    _ = send_ctrl_message(State, mk_cmd("~s ~s", [Cmd, RemoteFile])),
-    activate_ctrl_connection(State),
+	      State0) ->
+    _ = send_ctrl_message(State0, mk_cmd("~s ~s", [Cmd, RemoteFile])),
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{caller = start_chunk_transfer}};
 
-handle_caller(#state{caller = {recv_file, RemoteFile, Fd}} = State) ->
-    _ = send_ctrl_message(State, mk_cmd("RETR ~s", [RemoteFile])), 
-    activate_ctrl_connection(State),
+handle_caller(#state{caller = {recv_file, RemoteFile, Fd}} = State0) ->
+    _ = send_ctrl_message(State0, mk_cmd("RETR ~s", [RemoteFile])), 
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{caller = {recv_file, Fd}}};
 
 handle_caller(#state{caller = {transfer_file, {Cmd, LocalFile, RemoteFile}},
-		     ldir = LocalDir, client = From} = State) ->
+		     ldir = LocalDir, client = From} = State0) ->
     case file_open(filename:absname(LocalFile, LocalDir), read) of
 	{ok, Fd} ->
-	    _ = send_ctrl_message(State, mk_cmd("~s ~s", [Cmd, RemoteFile])),
-	    activate_ctrl_connection(State),
+	    _ = send_ctrl_message(State0, mk_cmd("~s ~s", [Cmd, RemoteFile])),
+	    State = activate_ctrl_connection(State0),
 	    {noreply, State#state{caller = {transfer_file, Fd}}};
 	{error, _} ->
 	    gen_server:reply(From, {error, epath}),
-	    {noreply, State#state{client = undefined, caller = undefined,
-				  dsock = undefined}} 
+	    {noreply, State0#state{client = undefined, caller = undefined,
+                                   dsock = undefined}} 
     end;
 
 handle_caller(#state{caller = {transfer_data, {Cmd, Bin, RemoteFile}}} = 
-	      State) ->
-    _ = send_ctrl_message(State, mk_cmd("~s ~s", [Cmd, RemoteFile])),
-    activate_ctrl_connection(State),
+	      State0) ->
+    _ = send_ctrl_message(State0, mk_cmd("~s ~s", [Cmd, RemoteFile])),
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{caller = {transfer_data, Bin}}}.
 
 %%  ----------- FTP SERVER COMMUNICATION  ------------------------- 
 
 %% Connect to FTP server at Host (default is TCP port 21) 
 %% in order to establish a control connection.
-setup_ctrl_connection(Host, Port, Timeout, #state{sockopts_ctrl = SockOpts} = State) ->
+setup_ctrl_connection(Host, Port, Timeout, #state{sockopts_ctrl = SockOpts} = State0) ->
     MsTime = erlang:monotonic_time(),
-    case connect(Host, Port, SockOpts, Timeout, State) of
+    case connect(Host, Port, SockOpts, Timeout, State0) of
 	{ok, IpFam, CSock} ->
-	    NewState = State#state{csock = {tcp, CSock}, ipfamily = IpFam},
-	    activate_ctrl_connection(NewState),
+	    State1 = State0#state{csock = {tcp, CSock}, ipfamily = IpFam},
+	    State = activate_ctrl_connection(State1),
 	    case Timeout - millisec_passed(MsTime) of
 		Timeout2 when (Timeout2 >= 0) ->
-		    {ok, NewState#state{caller = open}, Timeout2};
+		    {ok, State#state{caller = open}, Timeout2};
 		_ ->
                     %% Oups: Simulate timeout
-		    {ok, NewState#state{caller = open}, 0}
+		    {ok, State#state{caller = open}, 0}
 	    end;
 	Error ->
 	    Error
@@ -2087,7 +2087,7 @@ setup_data_connection(#state{mode   = active,
 			     caller = Caller, 
 			     csock  = CSock,
                              sockopts_data_active = SockOpts,
-			     ftp_extension = FtpExt} = State) ->    
+			     ftp_extension = FtpExt} = State0) ->    
     case (catch sockname(CSock)) of
 	{ok, {{_, _, _, _, _, _, _, _} = IP0, _}} ->
             IP = proplists:get_value(ip, SockOpts, IP0),
@@ -2098,8 +2098,8 @@ setup_data_connection(#state{mode   = active,
 	    {ok, {_, Port}} = sockname({tcp,LSock}),
 	    IpAddress = inet_parse:ntoa(IP),
 	    Cmd = mk_cmd("EPRT |2|~s|~p|", [IpAddress, Port]),
-	    _ = send_ctrl_message(State, Cmd),
-	    activate_ctrl_connection(State),  
+	    _ = send_ctrl_message(State0, Cmd),
+	    State = activate_ctrl_connection(State0),  
 	    {noreply, State#state{caller = {setup_data_connection, 
 					    {LSock, Caller}}}};
 	{ok, {{_,_,_,_} = IP0, _}} ->
@@ -2112,37 +2112,37 @@ setup_data_connection(#state{mode   = active,
                     false ->
                         {IP1, IP2, IP3, IP4} = IP,
                         {Port1, Port2} = {Port div 256, Port rem 256},
-                        send_ctrl_message(State,
+                        send_ctrl_message(State0,
                                           mk_cmd("PORT ~w,~w,~w,~w,~w,~w",
                                                  [IP1, IP2, IP3, IP4, Port1, Port2]));
                     true ->
                         IpAddress = inet_parse:ntoa(IP),
                         Cmd = mk_cmd("EPRT |1|~s|~p|", [IpAddress, Port]),
-                        send_ctrl_message(State, Cmd)
+                        send_ctrl_message(State0, Cmd)
                 end,
-	    activate_ctrl_connection(State),
+	    State = activate_ctrl_connection(State0),
 	    {noreply, State#state{caller = {setup_data_connection, 
 					    {LSock, Caller}}}}
     end;
 
 setup_data_connection(#state{mode = passive, ipfamily = inet6,
-			     caller = Caller} = State) ->
-    _ = send_ctrl_message(State, mk_cmd("EPSV", [])),
-    activate_ctrl_connection(State),
+			     caller = Caller} = State0) ->
+    _ = send_ctrl_message(State0, mk_cmd("EPSV", [])),
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{caller = {setup_data_connection, Caller}}};
 
 setup_data_connection(#state{mode = passive, ipfamily = inet,
 			     caller = Caller,
-			     ftp_extension = false} = State) ->
-    _ = send_ctrl_message(State, mk_cmd("PASV", [])),
-    activate_ctrl_connection(State),
+			     ftp_extension = false} = State0) ->
+    _ = send_ctrl_message(State0, mk_cmd("PASV", [])),
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{caller = {setup_data_connection, Caller}}};    
 
 setup_data_connection(#state{mode = passive, ipfamily = inet,
 			     caller = Caller,
-			     ftp_extension = true} = State) ->
-    _ = send_ctrl_message(State, mk_cmd("EPSV", [])),
-    activate_ctrl_connection(State),
+			     ftp_extension = true} = State0) ->
+    _ = send_ctrl_message(State0, mk_cmd("EPSV", [])),
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{caller = {setup_data_connection, Caller}}}.
 
 connect(Host, Port, SockOpts, Timeout, #state{ipfamily = inet = IpFam}) ->
@@ -2248,14 +2248,15 @@ send_message({tcp, Socket}, Message) ->
 send_message({ssl, Socket}, Message) ->
     ssl:send(Socket, Message).
 
-activate_ctrl_connection(#state{csock = CSock, ctrl_data = {<<>>, _, _}}) ->
-    activate_connection(CSock);
-activate_ctrl_connection(#state{csock = CSock}) ->
+activate_ctrl_connection(#state{csock = CSock, ctrl_data = {<<>>, _, _}} = State) ->
+    activate_connection(CSock),
+    State;
+activate_ctrl_connection(#state{csock = CSock} = State0) ->
     activate_connection(CSock),
     %% We have already received at least part of the next control message,
     %% that has been saved in ctrl_data, process this first.
-    self() ! {socket_type(CSock), unwrap_socket(CSock), <<>>},
-    ok.
+    {noreply, State} = handle_info({socket_type(CSock), unwrap_socket(CSock), <<>>}, State0),
+    State.
 
 activate_data_connection(#state{dsock = DSock} = State) ->
     activate_connection(DSock),
@@ -2290,22 +2291,22 @@ close_connection({ssl, Socket})  -> ignore_return_value( ssl:close(Socket) ).
 %%  ------------ FILE HANDLING  ----------------------------------------   
 send_file(#state{tls_upgrading_data_connection = {true, CTRL, _}} = State, Fd) ->
     {noreply, State#state{tls_upgrading_data_connection = {true, CTRL, ?MODULE, send_file, Fd}}};
-send_file(State, Fd) ->
+send_file(State0, Fd) ->
     case file_read(Fd) of
 	{ok, N, Bin} when N > 0 ->
-	    send_data_message(State, Bin),
-	    progress_report({binary, Bin}, State),
-	    send_file(State, Fd);
+	    send_data_message(State0, Bin),
+	    progress_report({binary, Bin}, State0),
+	    send_file(State0, Fd);
 	{ok, _, _} ->
 	    file_close(Fd),
-	    close_data_connection(State),
-	    progress_report({transfer_size, 0}, State),
-	    activate_ctrl_connection(State),
+	    close_data_connection(State0),
+	    progress_report({transfer_size, 0}, State0),
+	    State = activate_ctrl_connection(State0),
 	    {noreply, State#state{caller = transfer_file_second_phase,
 				  dsock = undefined}};
         {error, Reason} ->
-	    gen_server:reply(State#state.client, {error, Reason}),
-	    {stop, normal, State#state{client = undefined}}
+	    gen_server:reply(State0#state.client, {error, Reason}),
+	    {stop, normal, State0#state{client = undefined}}
     end.
 
 file_open(File, Option) ->
@@ -2347,10 +2348,10 @@ cast(GenServer, Msg) ->
 
 send_bin(#state{tls_upgrading_data_connection = {true, CTRL, _}} = State, Bin) ->
     State#state{tls_upgrading_data_connection = {true, CTRL, ?MODULE, send_bin, Bin}};
-send_bin(State, Bin) ->
-    send_data_message(State, Bin),
-    close_data_connection(State),
-    activate_ctrl_connection(State),
+send_bin(State0, Bin) ->
+    send_data_message(State0, Bin),
+    close_data_connection(State0),
+    State = activate_ctrl_connection(State0),
     {noreply, State#state{caller = transfer_data_second_phase,
 			  dsock = undefined}}.
 
diff --git a/lib/ftp/test/ftp_SUITE.erl b/lib/ftp/test/ftp_SUITE.erl
index 7c87d5cbdb..0b070ee8cb 100644
--- a/lib/ftp/test/ftp_SUITE.erl
+++ b/lib/ftp/test/ftp_SUITE.erl
@@ -96,6 +96,7 @@ ftp_tests()->
      recv_chunk, 
      recv_chunk_twice,
      recv_chunk_three_times,
+     recv_chunk_delay,
      type, 
      quote, 
      error_elogin,
@@ -669,9 +670,9 @@ recv_chunk(Config0) ->
     Contents = list_to_binary( lists:duplicate(1000, lists:seq(0,255)) ),
     Config = set_state([reset, {mkfile,File,Contents}], Config0),
     Pid = proplists:get_value(ftp, Config),
-    {{error, "ftp:recv_chunk_start/2 not called"},_} = recv_chunk(Pid, <<>>),
+    {error, "ftp:recv_chunk_start/2 not called"} = do_recv_chunk(Pid),
     ok = ftp:recv_chunk_start(Pid, id2ftp(File,Config)),
-    {ok, ReceivedContents, _Ncunks} = recv_chunk(Pid, <<>>),
+    {ok, ReceivedContents} = do_recv_chunk(Pid),
     find_diff(ReceivedContents, Contents).
 
 recv_chunk_twice() ->
@@ -683,11 +684,11 @@ recv_chunk_twice(Config0) ->
     Contents2 = crypto:strong_rand_bytes(1200),
     Config = set_state([reset, {mkfile,File1,Contents1}, {mkfile,File2,Contents2}], Config0),
     Pid = proplists:get_value(ftp, Config),
-    {{error, "ftp:recv_chunk_start/2 not called"},_} = recv_chunk(Pid, <<>>),
+    {error, "ftp:recv_chunk_start/2 not called"} = do_recv_chunk(Pid),
     ok = ftp:recv_chunk_start(Pid, id2ftp(File1,Config)),
-    {ok, ReceivedContents1, _Ncunks1} = recv_chunk(Pid, <<>>),
+    {ok, ReceivedContents1} = do_recv_chunk(Pid),
     ok = ftp:recv_chunk_start(Pid, id2ftp(File2,Config)),
-    {ok, ReceivedContents2, _Ncunks2} = recv_chunk(Pid, <<>>),
+    {ok, ReceivedContents2} = do_recv_chunk(Pid),
     find_diff(ReceivedContents1, Contents1),
     find_diff(ReceivedContents2, Contents2).
 
@@ -704,46 +705,56 @@ recv_chunk_three_times(Config0) ->
 
     Config = set_state([reset, {mkfile,File1,Contents1}, {mkfile,File2,Contents2}, {mkfile,File3,Contents3}], Config0),
     Pid = proplists:get_value(ftp, Config),
-    {{error, "ftp:recv_chunk_start/2 not called"},_} = recv_chunk(Pid, <<>>),
+    {error, "ftp:recv_chunk_start/2 not called"} = do_recv_chunk(Pid),
 
+    ok = ftp:recv_chunk_start(Pid, id2ftp(File3,Config)),
+    {ok, ReceivedContents3} = do_recv_chunk(Pid),
+    
     ok = ftp:recv_chunk_start(Pid, id2ftp(File1,Config)),
-    {ok, ReceivedContents1, Nchunks1} = recv_chunk(Pid, <<>>),
+    {ok, ReceivedContents1} = do_recv_chunk(Pid),
 
     ok = ftp:recv_chunk_start(Pid, id2ftp(File2,Config)),
-    {ok, ReceivedContents2, _Nchunks2} = recv_chunk(Pid, <<>>),
-
-    ok = ftp:recv_chunk_start(Pid, id2ftp(File3,Config)),
-    {ok, ReceivedContents3, _Nchunks3} = recv_chunk(Pid, <<>>, 10000, 0, Nchunks1),
+    {ok, ReceivedContents2} = do_recv_chunk(Pid),
 
     find_diff(ReceivedContents1, Contents1),
     find_diff(ReceivedContents2, Contents2),
     find_diff(ReceivedContents3, Contents3).
 
 
-
+do_recv_chunk(Pid) -> 
+    recv_chunk(Pid, <<>>).
 recv_chunk(Pid, Acc) -> 
-    recv_chunk(Pid, Acc, 0, 0, undefined).
-
-
-
-%% ExpectNchunks :: integer() | undefined
-recv_chunk(Pid, Acc, DelayMilliSec, N, ExpectNchunks) when N+1 < ExpectNchunks ->
-    %% for all I in integer(), I < undefined
-    recv_chunk1(Pid, Acc, DelayMilliSec, N, ExpectNchunks);
-
-recv_chunk(Pid, Acc, DelayMilliSec, N, ExpectNchunks) ->
-    %% N >= ExpectNchunks-1
-    timer:sleep(DelayMilliSec),
-    recv_chunk1(Pid, Acc, DelayMilliSec, N, ExpectNchunks).
+    case ftp:recv_chunk(Pid) of
+	ok -> 
+            {ok, Acc};
+	{ok, Bin} -> 
+            recv_chunk(Pid, <<Acc/binary, Bin/binary>>);
+	Error -> 
+            Error
+    end.
 
+recv_chunk_delay(Config0) when is_list(Config0) ->
+    File1 = "big_file1.txt",
+    Contents = list_to_binary(lists:duplicate(1000, lists:seq(0,255))),
+    Config = set_state([reset, {mkfile,File1,Contents}], Config0),
+    Pid = proplists:get_value(ftp, Config),
+    ok = ftp:recv_chunk_start(Pid, id2ftp(File1,Config)),
+    {ok, ReceivedContents} = delay_recv_chunk(Pid),
+    find_diff(ReceivedContents, Contents).
 
-recv_chunk1(Pid, Acc, DelayMilliSec, N, ExpectNchunks) ->
-    ct:log("Call ftp:recv_chunk",[]),
+delay_recv_chunk(Pid) -> 
+     delay_recv_chunk(Pid, <<>>).
+delay_recv_chunk(Pid, Acc) -> 
+    ct:pal("Recived size ~p", [byte_size(Acc)]),
     case ftp:recv_chunk(Pid) of
-	ok -> {ok, Acc, N};
-	{ok, Bin} -> recv_chunk(Pid, <<Acc/binary, Bin/binary>>, DelayMilliSec, N+1, ExpectNchunks);
-	Error -> {Error, N}
-    end.
+ 	ok -> 
+             {ok, Acc};
+ 	{ok, Bin} -> 
+            ct:sleep(100),
+            delay_recv_chunk(Pid, <<Acc/binary, Bin/binary>>);
+	Error -> 
+            Error
+     end.
 
 %%-------------------------------------------------------------------------
 type() -> 
diff --git a/lib/ftp/vsn.mk b/lib/ftp/vsn.mk
index d5d6c45b28..9f14658099 100644
--- a/lib/ftp/vsn.mk
+++ b/lib/ftp/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = ftp
-FTP_VSN   = 1.0.1
+FTP_VSN   = 1.0.2
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(FTP_VSN)$(PRE_VSN)"
diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile
index f653dce36f..5c367b5b77 100644
--- a/lib/hipe/cerl/Makefile
+++ b/lib/hipe/cerl/Makefile
@@ -66,7 +66,10 @@ DOC_FILES= $(MODULES:%=$(DOCS)/%.html)
 
 include ../native.mk
 
-ERL_COMPILE_FLAGS += +inline -Werror +warn_export_vars +warn_unused_import +warn_missing_spec #+warn_untyped_record
+ERL_COMPILE_FLAGS += +inline +warn_export_vars +warn_unused_import +warn_missing_spec #+warn_untyped_record
+ifneq ($(NATIVE_LIBS_ENABLED),yes)
+ERL_COMPILE_FLAGS += -Werror
+endif
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index 48ce641ab9..8ae1cd4ab7 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -2225,10 +2225,7 @@ type_order() ->
    t_map(), t_list(), t_bitstr()].
 
 key_comparisons_fail(X0, KeyPos, TupleList, Opaques) ->
-  X = case t_is_number(t_inf(X0, t_number(), Opaques), Opaques) of
-	false -> X0;
-	true -> t_number()
-      end,
+  X = erl_types:t_widen_to_number(X0),
   lists:all(fun(Tuple) ->
 		Key = type(erlang, element, 2, [KeyPos, Tuple]),
 		t_is_none(t_inf(Key, X, Opaques))
diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl
index 9abb4d31d9..badf58936f 100644
--- a/lib/hipe/cerl/erl_types.erl
+++ b/lib/hipe/cerl/erl_types.erl
@@ -66,7 +66,6 @@
 	 t_find_opaque_mismatch/3,
          t_find_unknown_opaque/3,
 	 t_fixnum/0,
-	 t_map/2,
 	 t_non_neg_fixnum/0,
 	 t_pos_fixnum/0,
 	 t_float/0,
@@ -205,6 +204,7 @@
 	 t_unopaque/1, t_unopaque/2,
 	 t_var/1,
 	 t_var_name/1,
+         t_widen_to_number/1,
 	 %% t_assign_variables_to_subtype/2,
 	 type_is_defined/4,
 	 record_field_diffs_to_string/2,
@@ -1594,6 +1594,50 @@ lift_list_to_pos_empty(?nil) -> ?nil;
 lift_list_to_pos_empty(?list(Content, Termination, _)) -> 
   ?list(Content, Termination, ?unknown_qual).
 
+-spec t_widen_to_number(erl_type()) -> erl_type().
+
+%% Widens integers and floats to t_number().
+%% Used by erl_bif_types:key_comparison_fail().
+
+t_widen_to_number(?any) -> ?any;
+t_widen_to_number(?none) -> ?none;
+t_widen_to_number(?unit) -> ?unit;
+t_widen_to_number(?atom(_Set) = T) -> T;
+t_widen_to_number(?bitstr(_Unit, _Base) = T) -> T;
+t_widen_to_number(?float) -> t_number();
+t_widen_to_number(?function(Domain, Range)) ->
+  ?function(t_widen_to_number(Domain), t_widen_to_number(Range));
+t_widen_to_number(?identifier(_Types) = T) -> T;
+t_widen_to_number(?int_range(_From, _To)) -> t_number();
+t_widen_to_number(?int_set(_Set)) -> t_number();
+t_widen_to_number(?integer(_Types)) -> t_number();
+t_widen_to_number(?list(Type, Tail, Size)) ->
+  ?list(t_widen_to_number(Type), t_widen_to_number(Tail), Size);
+t_widen_to_number(?map(Pairs, DefK, DefV)) ->
+  L = [{t_widen_to_number(K), MNess, t_widen_to_number(V)} ||
+        {K, MNess, V} <- Pairs],
+  t_map(L, t_widen_to_number(DefK), t_widen_to_number(DefV));
+t_widen_to_number(?matchstate(_P, _Slots) = T) -> T;
+t_widen_to_number(?nil) -> ?nil;
+t_widen_to_number(?number(_Set, _Tag)) -> t_number();
+t_widen_to_number(?opaque(Set)) ->
+  L = [Opaque#opaque{struct = t_widen_to_number(S)} ||
+        #opaque{struct = S} = Opaque <- set_to_list(Set)],
+  ?opaque(ordsets:from_list(L));
+t_widen_to_number(?product(Types)) ->
+  ?product(list_widen_to_number(Types));
+t_widen_to_number(?tuple(?any, _, _) = T) -> T;
+t_widen_to_number(?tuple(Types, Arity, Tag)) ->
+  ?tuple(list_widen_to_number(Types), Arity, Tag);
+t_widen_to_number(?tuple_set(_) = Tuples) ->
+  t_sup([t_widen_to_number(T) || T <- t_tuple_subtypes(Tuples)]);
+t_widen_to_number(?union(List)) ->
+  ?union(list_widen_to_number(List));
+t_widen_to_number(?var(_Id)= T) -> T.
+
+list_widen_to_number(List) ->
+  [t_widen_to_number(E) || E <- List].
+
 %%-----------------------------------------------------------------------------
 %% Maps
 %%
@@ -3104,9 +3148,18 @@ is_compat_arg(?list(Contents1, Termination1, Size1),
 is_compat_arg(?product(Types1), ?product(Types2)) ->
   is_compat_list(Types1, Types2);
 is_compat_arg(?map(Pairs1, DefK1, DefV1), ?map(Pairs2, DefK2, DefV2)) ->
-  (is_compat_list(Pairs1, Pairs2) andalso
-   is_compat_arg(DefK1, DefK2) andalso
-   is_compat_arg(DefV1, DefV2));
+  {Ks1, _, Vs1} = lists:unzip3(Pairs1),
+  {Ks2, _, Vs2} = lists:unzip3(Pairs2),
+  Key1 = t_sup([DefK1 | Ks1]),
+  Key2 = t_sup([DefK2 | Ks2]),
+  case is_compat_arg(Key1, Key2) of
+    true ->
+      Value1 = t_sup([DefV1 | Vs1]),
+      Value2 = t_sup([DefV2 | Vs2]),
+      is_compat_arg(Value1, Value2);
+    false ->
+      false
+  end;
 is_compat_arg(?tuple(?any, ?any, ?any), ?tuple(_, _, _)) -> false;
 is_compat_arg(?tuple(_, _, _), ?tuple(?any, ?any, ?any)) -> false;
 is_compat_arg(?tuple(Elements1, Arity, _),
@@ -4156,39 +4209,6 @@ t_abstract_records(?opaque(_)=Type, RecDict) ->
 t_abstract_records(T, _RecDict) -> 
   T.
 
-%% Map over types. Depth first. Used by the contract checker. ?list is
-%% not fully implemented so take care when changing the type in Termination.
-
--spec t_map(fun((erl_type()) -> erl_type()), erl_type()) -> erl_type().
-
-t_map(Fun, ?list(Contents, Termination, Size)) ->
-  Fun(?list(t_map(Fun, Contents), t_map(Fun, Termination), Size));
-t_map(Fun, ?function(Domain, Range)) ->
-  Fun(?function(t_map(Fun, Domain), t_map(Fun, Range)));
-t_map(Fun, ?product(Types)) -> 
-  Fun(?product([t_map(Fun, T) || T <- Types]));
-t_map(Fun, ?union(Types)) ->
-  Fun(t_sup([t_map(Fun, T) || T <- Types]));
-t_map(Fun, ?tuple(?any, ?any, ?any) = T) ->
-  Fun(T);
-t_map(Fun, ?tuple(Elements, _Arity, _Tag)) ->
-  Fun(t_tuple([t_map(Fun, E) || E <- Elements]));
-t_map(Fun, ?tuple_set(_) = Tuples) ->
-  Fun(t_sup([t_map(Fun, T) || T <- t_tuple_subtypes(Tuples)]));
-t_map(Fun, ?opaque(Set)) ->
-  L = [Opaque#opaque{struct = NewS} ||
-        #opaque{struct = S} = Opaque <- set_to_list(Set),
-        not t_is_none(NewS = t_map(Fun, S))],
-  Fun(case L of
-        [] -> ?none;
-        _ -> ?opaque(ordsets:from_list(L))
-      end);
-t_map(Fun, ?map(Pairs,DefK,DefV)) ->
-  %% TODO:
-  Fun(t_map(Pairs, Fun(DefK), Fun(DefV)));
-t_map(Fun, T) ->
-  Fun(T).
-
 %%=============================================================================
 %%
 %% Prettyprinter
@@ -5318,7 +5338,15 @@ t_form_to_string({type, _L, tuple, any}) -> "tuple()";
 t_form_to_string({type, _L, tuple, Args}) ->
   "{" ++ flat_join(t_form_to_string_list(Args), ",") ++ "}";
 t_form_to_string({type, _L, union, Args}) ->
-  flat_join(t_form_to_string_list(Args), " | ");
+  flat_join(lists:map(fun(Arg) ->
+                          case Arg of
+                            {ann_type, _AL, _} ->
+                              "(" ++ t_form_to_string(Arg) ++ ")";
+                            _ ->
+                              t_form_to_string(Arg)
+                          end
+                      end, Args),
+            " | ");
 t_form_to_string({type, _L, Name, []} = T) ->
    try
      M = mod,
diff --git a/lib/hipe/doc/src/hipe_app.xml b/lib/hipe/doc/src/hipe_app.xml
index 63bc6ea2d7..5ac445ac58 100644
--- a/lib/hipe/doc/src/hipe_app.xml
+++ b/lib/hipe/doc/src/hipe_app.xml
@@ -62,6 +62,15 @@
       and the runtime system that have limited or no support for HiPE compiled modules.
     </p>
     <taglist>
+      <tag>Binary matching</tag>
+      <item><p>The HiPE compiler will crash on modules containing binary
+      matching.</p>
+      </item>
+      <tag>try/catch</tag>
+      <item><p>The HiPE compiler will crash on modules containing 'try' or
+      'catch'.</p>
+      </item>
+
       <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
@@ -78,12 +87,12 @@
       </item>
 
       <tag>NIFs</tag>
-      <item><p>Modules compiled with HiPE can not call <seealso marker="erts:erlang#load_nif-2">
+      <item><p>Modules compiled with HiPE cannot 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
+      <item><p>Modules compiled with HiPE cannot use
       <seealso marker="doc/reference_manual:code_loading#on_load"><c>-on_load()</c></seealso>
       directives.</p>
       </item>
diff --git a/lib/hipe/doc/src/notes.xml b/lib/hipe/doc/src/notes.xml
index e9cdf42018..3fad2ac53a 100644
--- a/lib/hipe/doc/src/notes.xml
+++ b/lib/hipe/doc/src/notes.xml
@@ -31,6 +31,87 @@
   </header>
   <p>This document describes the changes made to HiPE.</p>
 
+<section><title>Hipe 3.19.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>The HiPE compiler would badly miscompile certain
+	    try/catch expressions, so it will now refuse to compile
+	    modules containing try or catch.</p> <p>As a consequence
+	    of this, <c>dialyzer</c> will no longer compile key
+	    modules to native code.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15949</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Hipe 3.19</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Add function <c>hipe:erllvm_is_supported</c> to check for
+	    the presences of a suitable version of the LLVM tool
+	    chain as well as supported hardware architecture. The old
+	    <c>hipe:llvm_support_available</c> has been removed.</p>
+          <p>
+	    Own Id: OTP-15385 Aux Id: PR-1986 </p>
+        </item>
+        <item>
+          <p>
+	    Fix hipe LLVM for FreeBSD and other non-linux unix to use
+	    /tmp/ instead of /dev/shm/.</p>
+          <p>
+	    Own Id: OTP-15386 Aux Id: PR-1963 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>In OTP 22, HiPE (the native code compiler) is not
+	    fully functional. The reasons for this are:</p>
+	    <p>There are new BEAM instructions for binary matching
+	    that the HiPE native code compiler does not support.</p>
+	    <p>The new optimizations in the Erlang compiler create
+	    new combination of instructions that HiPE currently does
+	    not handle correctly.</p>
+	    <p>If erlc is invoked with the <c>+native</c> option, and
+	    if any of the new binary matching instructions are used,
+	    the compiler will issue a warning and produce a BEAM file
+	    without native code.</p>
+          <p>
+	    Own Id: OTP-15596</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Hipe 3.18.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fix a bug in the handling of the <c>Key</c> argument
+	    of <c>lists:{keysearch, keyfind, keymember}</c>. </p>
+          <p>
+	    Own Id: OTP-15570</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Hipe 3.18.2</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/hipe/icode/hipe_beam_to_icode.erl b/lib/hipe/icode/hipe_beam_to_icode.erl
index f429d40272..995c961e09 100644
--- a/lib/hipe/icode/hipe_beam_to_icode.erl
+++ b/lib/hipe/icode/hipe_beam_to_icode.erl
@@ -557,32 +557,21 @@ trans_fun([{move,Src,Dst}|Instructions], Env) ->
   Dst1 = mk_var(Dst),
   Src1 = trans_arg(Src),
   [hipe_icode:mk_move(Dst1,Src1) | trans_fun(Instructions,Env)];
-%%--- catch --- ITS PROCESSING IS POSTPONED
-trans_fun([{'catch',N,{_,EndLabel}}|Instructions], Env) ->
-  NewContLbl = mk_label(new),
-  [{'catch',N,EndLabel},NewContLbl | trans_fun(Instructions,Env)];
-%%--- catch_end --- ITS PROCESSING IS POSTPONED
-trans_fun([{catch_end,_N}=I|Instructions], Env) ->
-  [I | trans_fun(Instructions,Env)];
-%%--- try --- ITS PROCESSING IS POSTPONED
-trans_fun([{'try',N,{_,EndLabel}}|Instructions], Env) ->
-  NewContLbl = mk_label(new),
-  [{'try',N,EndLabel},NewContLbl | trans_fun(Instructions,Env)];
-%%--- try_end ---
-trans_fun([{try_end,_N}|Instructions], Env) ->
-  [hipe_icode:mk_end_try() | trans_fun(Instructions,Env)];
-%%--- try_case --- ITS PROCESSING IS POSTPONED
-trans_fun([{try_case,_N}=I|Instructions], Env) ->
-  [I | trans_fun(Instructions,Env)];
-%%--- try_case_end ---
-trans_fun([{try_case_end,Arg}|Instructions], Env) ->
-  BadArg = trans_arg(Arg),
-  ErrVar = mk_var(new),
-  Vs = [mk_var(new)],
-  Atom = hipe_icode:mk_move(ErrVar,hipe_icode:mk_const(try_clause)),
-  Tuple = hipe_icode:mk_primop(Vs,mktuple,[ErrVar,BadArg]),
-  Fail = hipe_icode:mk_fail(Vs,error),
-  [Atom,Tuple,Fail | trans_fun(Instructions,Env)];
+%%
+%% try/catch -- THESE ARE KNOWN TO MISCOMPILE, SEE OTP-15949
+%%
+trans_fun([{'catch'=Name,_,_}|_], _Env) ->
+  nyi(Name);
+trans_fun([{catch_end=Name,_}|_], _Env) ->
+  nyi(Name);
+trans_fun([{'try'=Name,_,_}|_], _Env) ->
+  nyi(Name);
+trans_fun([{try_end=Name,_}|_], _Env) ->
+  nyi(Name);
+trans_fun([{try_case=Name,_}|_], _Env) ->
+  nyi(Name);
+trans_fun([{try_case_end=Name,_}|_], _Env) ->
+  nyi(Name);
 %%--- raise ---
 trans_fun([{raise,{f,0},[Reg1,Reg2],{x,0}}|Instructions], Env) ->
   V1 = trans_arg(Reg1),
@@ -647,6 +636,13 @@ trans_fun([{put_tuple,_Size,Reg}|Instructions], Env) ->
   Primop = hipe_icode:mk_primop(Dest,mktuple,Src),
   Moves ++ [Primop | trans_fun(Instructions2,Env2)];
 %%--- put --- SHOULD NOT REALLY EXIST HERE; put INSTRUCTIONS ARE HANDLED ABOVE.
+%%--- put_tuple2 ---
+trans_fun([{put_tuple2,Reg,{list,Elements}}|Instructions], Env) ->
+  Dest = [mk_var(Reg)],
+  {Moves,Vars,Env2} = trans_elements(Elements, [], [], Env),
+  Src = lists:reverse(Vars),
+  Primop = hipe_icode:mk_primop(Dest, mktuple, Src),
+  Moves ++ [Primop | trans_fun(Instructions, Env2)];
 %%--- badmatch ---
 trans_fun([{badmatch,Arg}|Instructions], Env) ->
   BadVar = trans_arg(Arg),
@@ -1139,9 +1135,10 @@ trans_fun([{test,has_map_fields,{f,Lbl},Map,{list,Keys}}|Instructions], Env) ->
 		    lists:flatten([[K, {r, 0}] || K <- Keys])),
   [MapMove, TestInstructions | trans_fun(Instructions, Env2)];
 trans_fun([{get_map_elements,{f,Lbl},Map,{list,KVPs}}|Instructions], Env) ->
+  KVPs1 = overwrite_map_last(Map, KVPs),
   {MapMove, MapVar, Env1} = mk_move_and_var(Map, Env),
   {TestInstructions, GetInstructions, Env2} =
-    trans_map_query(MapVar, map_label(Lbl), Env1, KVPs),
+    trans_map_query(MapVar, map_label(Lbl), Env1, KVPs1),
   [MapMove, TestInstructions, GetInstructions | trans_fun(Instructions, Env2)];
 %%--- put_map_assoc ---
 trans_fun([{put_map_assoc,{f,Lbl},Map,Dst,_N,{list,Pairs}}|Instructions], Env) ->
@@ -1181,6 +1178,21 @@ trans_fun([raw_raise|Instructions], Env) ->
   [hipe_icode:mk_primop(Dst,raw_raise,Vars) |
    trans_fun(Instructions, Env)];
 %%--------------------------------------------------------------------
+%% New binary matching added in OTP 22.
+%%--------------------------------------------------------------------
+%%--- bs_get_tail ---
+trans_fun([{bs_get_tail=Name,_,_,_}|_Instructions], _Env) ->
+  nyi(Name);
+%%--- bs_start_match3 ---
+trans_fun([{bs_start_match3=Name,_,_,_,_}|_Instructions], _Env) ->
+  nyi(Name);
+%%--- bs_get_position ---
+trans_fun([{bs_get_position=Name,_,_,_}|_Instructions], _Env) ->
+  nyi(Name);
+%%--- bs_set_position ---
+trans_fun([{bs_set_position=Name,_,_}|_Instructions], _Env) ->
+  nyi(Name);
+%%--------------------------------------------------------------------
 %%--- ERROR HANDLING ---
 %%--------------------------------------------------------------------
 trans_fun([X|_], _) ->
@@ -1188,6 +1200,9 @@ trans_fun([X|_], _) ->
 trans_fun([], _) ->
   [].
 
+nyi(Name) ->
+  throw({unimplemented_instruction,Name}).
+
 %%--------------------------------------------------------------------
 %% trans_call and trans_enter generate correct Icode calls/tail-calls,
 %% recognizing explicit fails.
@@ -1563,6 +1578,21 @@ trans_type_test2(function2, Lbl, Arg, Arity, Env) ->
 			 hipe_icode:label_name(True), map_label(Lbl)),
   {[Move1,Move2,I,True],Env2}.
 
+
+%%
+%% Makes sure that if a get_map_elements instruction will overwrite
+%% the map source, it will be done last.
+%%
+overwrite_map_last(Map, KVPs) ->
+  overwrite_map_last2(Map, KVPs, []).
+
+overwrite_map_last2(Map, [Key,Map|KVPs], _Last) ->
+  overwrite_map_last2(Map, KVPs, [Key,Map]);
+overwrite_map_last2(Map, [Key,Val|KVPs], Last) ->
+  [Key,Val|overwrite_map_last2(Map, KVPs, Last)];
+overwrite_map_last2(_Map, [], Last) ->
+  Last.
+
 %%
 %% Handles the get_map_elements instruction and the has_map_fields
 %% test instruction.
@@ -1683,6 +1713,19 @@ trans_puts([{put,X}|Code], Vars, Moves, Env) ->
 trans_puts(Code, Vars, Moves, Env) ->    %% No more put operations
   {Moves, Code, Vars, Env}.
 
+trans_elements([X|Code], Vars, Moves, Env) ->
+  case type(X) of
+    var ->
+      Var = mk_var(X),
+      trans_elements(Code, [Var|Vars], Moves, Env);
+    #beam_const{value=C} ->
+      Var = mk_var(new),
+      Move = hipe_icode:mk_move(Var, hipe_icode:mk_const(C)),
+      trans_elements(Code, [Var|Vars], [Move|Moves], Env)
+  end;
+trans_elements([], Vars, Moves, Env) ->
+  {Moves, Vars, Env}.
+
 %%-----------------------------------------------------------------------
 %% The code for this instruction is a bit large because we are treating
 %% different cases differently.  We want to use the icode `type' 
diff --git a/lib/hipe/icode/hipe_icode_range.erl b/lib/hipe/icode/hipe_icode_range.erl
index 34b18acccd..098a7a8d8c 100644
--- a/lib/hipe/icode/hipe_icode_range.erl
+++ b/lib/hipe/icode/hipe_icode_range.erl
@@ -1633,7 +1633,7 @@ inf_bsl(_, pos_inf) -> neg_inf;
 inf_bsl(Number, neg_inf) when is_integer(Number), Number >= 0 -> 0;
 inf_bsl(_Number, neg_inf) -> -1;
 inf_bsl(Number1, Number2) when is_integer(Number1), is_integer(Number2) ->
-  %% We can not shift left with a number which is not a fixnum. We
+  %% We cannot shift left with a number which is not a fixnum. We
   %% don't have enough memory.
   Bits = ?BITS,
   if Number2 > (Bits bsl 1) -> inf_bsl(Number1, pos_inf);
diff --git a/lib/hipe/llvm/Makefile b/lib/hipe/llvm/Makefile
index 817ff67dcd..9f7a2def6d 100644
--- a/lib/hipe/llvm/Makefile
+++ b/lib/hipe/llvm/Makefile
@@ -70,7 +70,10 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
 include ../native.mk
 
-ERL_COMPILE_FLAGS += -Werror +inline +warn_export_vars #+warn_missing_spec
+ERL_COMPILE_FLAGS += +inline +warn_export_vars #+warn_missing_spec
+ifneq ($(NATIVE_LIBS_ENABLED),yes)
+ERL_COMPILE_FLAGS += -Werror
+endif
 
 # if in 32 bit backend define BIT32 symbol
 ifneq ($(BITS64),yes)
diff --git a/lib/hipe/llvm/hipe_llvm_main.erl b/lib/hipe/llvm/hipe_llvm_main.erl
index 54c435c127..44f0566379 100644
--- a/lib/hipe/llvm/hipe_llvm_main.erl
+++ b/lib/hipe/llvm/hipe_llvm_main.erl
@@ -526,8 +526,8 @@ unique_folder(FunName, Arity, Options) ->
     case proplists:get_bool(llvm_save_temps, Options) of
       true ->  %% Store folder in current directory
         DirName;
-      false -> %% Temporarily store folder in tempfs (/dev/shm/)
-        "/dev/shm/" ++ DirName
+      false -> %% Temporarily store folder in tempfs or tmp dir
+        tmpfs_folder() ++ DirName
     end,
   %% Make sure it does not exist
   case dir_exists(Dir) of
@@ -537,6 +537,14 @@ unique_folder(FunName, Arity, Options) ->
       Dir
   end.
 
+tmpfs_folder() ->
+  case os:type() of
+    {unix, linux} ->
+      "/dev/shm/";
+    {unix, _} -> %% Fallback to tmp dir. e.g. FreeBSD
+      "/tmp/"
+  end.
+
 %% @doc Function that checks that a given Filename is an existing Directory
 %%      Name (from http://rosettacode.org/wiki/Ensure_that_a_file_exists#Erlang)
 dir_exists(Filename) ->
diff --git a/lib/hipe/main/hipe.erl b/lib/hipe/main/hipe.erl
index e2cb9c0f0b..094b7bc508 100644
--- a/lib/hipe/main/hipe.erl
+++ b/lib/hipe/main/hipe.erl
@@ -196,7 +196,7 @@
  	 file/1,
 	 file/2,
 	 get_llvm_version/0,
-	 llvm_support_available/0,
+	 erllvm_is_supported/0,
 	 load/1,
 	 help/0,
 	 help_hiper/0,
@@ -218,12 +218,11 @@
 %% Basic type declaration for exported functions of the 'hipe' module
 %%-------------------------------------------------------------------
 
--type mod() :: atom().
--type f_unit() :: mod() | binary().
+-type mod() :: module().
+-type file_or_bin() :: file:filename() | binary().
 -type ret_rtl() :: [_].
 -type c_ret() :: {'ok', mod()} | {'error', term()} |
                  {'ok', mod(), ret_rtl()}. %% The last for debugging only
--type compile_file() :: atom() | string() | binary().
 -type compile_ret() :: {hipe_architecture(), binary()} | list().
 
 %%-------------------------------------------------------------------
@@ -233,26 +232,26 @@
 
 %%-------------------------------------------------------------------
 
-%% @spec load(Mod) -> {module, Mod} | {error, Reason}
-%%     Mod = mod()
+%% @spec load(Module) -> {module, Module} | {error, Reason}
+%%     Module = mod()
 %%     Reason = term()
 %% 
 %% @doc Like load/2, but tries to locate a BEAM file automatically.
 %%
 %% @see load/2
 
--spec load(Mod) -> {'module', Mod} | {'error', term()} when Mod :: mod().
+-spec load(Module) -> {'module', Module} | {'error', Reason :: term()}
+                   when Module :: mod().
 
-load(Mod) ->
-  load(Mod, beam_file(Mod)).
+load(Module) ->
+  load(Module, beam_file(Module)).
 
-%% @spec load(Mod, BeamFileName) -> {module, Mod} | {error, Reason}
-%%     Mod = mod()
+%% @spec load(Module, BeamFileName) -> {module, Module} | {error, Reason}
+%%     Module = mod()
+%%     BeamFileName = file:filename()
 %%     Reason = term()
-%%     BeamFileName = string()
-%%     filename() = term()
 %%
-%% @type mod() = atom(). A module name.
+%% @type mod() = module(). A module name.
 %% 
 %% @doc User interface for loading code into memory. The code can be
 %% given as a native code binary or as the file name of a BEAM file
@@ -262,8 +261,8 @@ load(Mod) ->
 %%
 %% @see load/1
 
--spec load(Mod, string()) -> {'module', Mod} | {'error', term()}
-				   when Mod :: mod().
+-spec load(Module, file:filename()) -> {'module', Module} | {'error', term()}
+				    when Module :: mod().
 
 load(Mod, BeamFileName) when is_list(BeamFileName) ->
   Architecture = erlang:system_info(hipe_architecture),
@@ -273,26 +272,22 @@ load(Mod, BeamFileName) when is_list(BeamFileName) ->
     Error -> {error, Error}
   end.
 
-%% @spec c(Name) -> {ok, Name} | {error, Reason}
-%%       Name = mod()
+%% @spec c(Mod) -> {ok, Mod} | {error, Reason}
+%%       Mod = mod()
 %%       Reason = term()
 %%
-%% @equiv c(Name, [])
+%% @equiv c(Mod, [])
 
 -spec c(mod()) -> c_ret().
 
-c(Name) ->
-  c(Name, []).
+c(Mod) ->
+  c(Mod, []).
 
-%% @spec c(Name, options()) -> {ok, Name} | {error, Reason}
-%%     Name = mod()
+%% @spec c(Module, options()) -> {ok, Module} | {error, Reason}
+%%     Module = mod()
 %%     options() = [option()]
 %%     option() = term()
 %%     Reason = term()
-%%
-%% @type fun() = atom(). A function identifier.
-%%
-%% @type arity() = integer(). A function arity; always nonnegative.
 %% 
 %% @doc User-friendly native code compiler interface. Reads BEAM code
 %% from the corresponding "Module<code>.beam</code>" file in the
@@ -307,12 +302,12 @@ c(Name) ->
 
 -spec c(mod(), comp_options()) -> c_ret().
 
-c(Name, Options) ->
-  c(Name, beam_file(Name), Options).
+c(Module, Options) ->
+  c(Module, beam_file(Module), Options).
 
-%% @spec c(Name, File, options()) -> {ok, Name} | {error, Reason}
-%%     Name = mod()
-%%     File = filename() | binary()
+%% @spec c(Module, File, options()) -> {ok, Module} | {error, Reason}
+%%     Module = mod()
+%%     File = file:filename() | binary()
 %%     Reason = term()
 %%
 %% @doc Like <code>c/2</code>, but reads BEAM code from the specified
@@ -321,32 +316,32 @@ c(Name, Options) ->
 %% @see c/2
 %% @see f/2
 
-c(Name, File, Opts) ->
+c(Module, File, Opts) ->
   Opts1 = user_compile_opts(Opts),
-  case compile(Name, File, Opts1) of
+  case compile(Module, File, Opts1) of
     {ok, Res} ->
       case proplists:get_bool(to_rtl, Opts1) of
-	true -> {ok, Name, Res};
-	false -> {ok, Name}
+	true  -> {ok, Module, Res};
+	false -> {ok, Module}
       end;
     Other ->
       Other
   end.
 
 %% @spec f(File) -> {ok, Name} | {error, Reason}
-%%     File = filename() | binary()
+%%     File = file:filename() | binary()
 %%     Name = mod()
 %%     Reason = term()
 %%
 %% @equiv f(File, [])
 
--spec f(f_unit()) -> {'ok', mod()} | {'error', term()}.
+-spec f(file_or_bin()) -> {'ok', mod()} | {'error', term()}.
 
 f(File) ->
   f(File, []).
 
 %% @spec f(File, options()) -> {ok, Name} | {error, Reason}
-%%     File = filename() | binary()
+%%     File = file:filename() | binary()
 %%     Name = mod()
 %%     Reason = term()
 %%
@@ -355,7 +350,7 @@ f(File) ->
 %%
 %% @see c/3
 
--spec f(f_unit(), comp_options()) -> {'ok', mod()} | {'error', term()}.
+-spec f(file_or_bin(), comp_options()) -> {'ok', mod()} | {'error', term()}.
 
 f(File, Opts) ->
   case file(File, user_compile_opts(Opts)) of
@@ -371,20 +366,20 @@ user_compile_opts(Opts) ->
   Opts ++ ?USER_DEFAULTS.
 
 
-%% @spec compile(Name) -> {ok, {Target,Binary}} | {error, Reason}
-%%       Name = mod()
+%% @spec compile(Module) -> {ok, {Target,Binary}} | {error, Reason}
+%%       Module = mod()
 %%       Binary = binary()
 %%       Reason = term()
 %% 
-%% @equiv compile(Name, [])
+%% @equiv compile(Module, [])
 
 -spec compile(mod()) -> {'ok', compile_ret()} | {'error', term()}.
 
-compile(Name) ->
-  compile(Name, []).
+compile(Module) ->
+  compile(Module, []).
 
-%% @spec compile(Name, options()) -> {ok, {Target,Binary}} | {error, Reason}
-%%       Name = mod()
+%% @spec compile(Module, options()) -> {ok, {Target,Binary}} | {error, Reason}
+%%       Module = mod()
 %%       Binary = binary()
 %%       Reason = term()
 %%
@@ -403,26 +398,26 @@ compile(Name) ->
 %% @see file/2
 %% @see load/2
 
--spec compile(mod(), comp_options()) -> {'ok', compile_ret()} | {'error', _}.
+-spec compile(mod(), comp_options()) -> {'ok', compile_ret()} | {'error', term()}.
 
-compile(Name, Options) ->
-  compile(Name, beam_file(Name), Options).
+compile(Module, Options) ->
+  compile(Module, beam_file(Module), Options).
 
--spec beam_file(mod()) -> string().
+-spec beam_file(mod()) -> file:filename().
 
 beam_file(Module) when is_atom(Module) ->
   case code:which(Module) of
     non_existing ->
-      ?error_msg("Cannot find ~w.beam file.",[Module]),
+      ?error_msg("Cannot find ~w.beam file.", [Module]),
       ?EXIT({cant_find_beam_file,Module});
-    File -> % string()
+    File when is_list(File) ->
       File
   end.
 
 %% @spec compile(Name, File, options()) ->
 %%           {ok, {Target, Binary}} | {error, Reason}
 %%       Name = mod()
-%%       File = filename() | binary()
+%%       File = file:filename() | binary()
 %%       Binary = binary()
 %%       Reason = term()
 %% 
@@ -431,7 +426,7 @@ beam_file(Module) when is_atom(Module) ->
 %%
 %% @see compile/2
 
--spec compile(mod(), compile_file(), comp_options()) ->
+-spec compile(mod(), file_or_bin(), comp_options()) ->
 	 {'ok', compile_ret()} | {'error', term()}.
 
 compile(Name, File, Opts0) when is_atom(Name) ->
@@ -475,18 +470,18 @@ compile(Name, File, Opts0) when is_atom(Name) ->
       run_compiler(Name, DisasmFun, IcodeFun, Opts)
   end.
 
--spec compile_core(mod(), cerl:c_module(), compile_file(), comp_options()) ->
+-spec compile_core(mod(), cerl:c_module(), file_or_bin(), comp_options()) ->
 	 {'ok', compile_ret()} | {'error', term()}.
 
 compile_core(Name, Core0, File, Opts) ->
   Core = cerl:from_records(Core0),
   compile(Name, Core, File, Opts).
 
-%% @spec compile(Name, Core, File, options()) ->
+%% @spec compile(Module, Core, File, options()) ->
 %%           {ok, {Target, Binary}} | {error, Reason}
-%%       Name = mod()
+%%       Module = mod()
 %%       Core = coreErlang() | []
-%%       File = filename() | binary()
+%%       File = file:filename() | binary()
 %%       Binary = binary()
 %%       Reason = term()
 %% 
@@ -499,7 +494,7 @@ compile_core(Name, Core0, File, Opts) ->
 %%
 %% @see compile/3
 
--spec compile(mod(), cerl:c_module() | [], compile_file(), comp_options()) ->
+-spec compile(mod(), cerl:c_module() | [], file_or_bin(), comp_options()) ->
 	 {'ok', compile_ret()} | {'error', term()}.
 
 compile(Name, [], File, Opts) ->
@@ -511,38 +506,36 @@ compile(Name, Core, File, Opts) when is_atom(Name) ->
 	     end,
   run_compiler(Name, DisasmFun, IcodeFun, Opts).
 
-%% @spec file(File) -> {ok, Name, {Target, Binary}} | {error, Reason}
-%%       File = filename() | binary()
-%%       Name = mod() | mfa()
+%% @spec file(File) -> {ok, Mod, {Target, Binary}} | {error, Reason}
+%%       File = file:filename()
+%%       Mod = mod()
 %%       Binary = binary()
 %%       Reason = term()
 %% 
 %% @equiv file(File, [])
 
--spec file(Mod) -> {'ok', Mod, compile_ret()} | {'error', term()}
-		     when Mod :: mod().
+-spec file(file:filename()) -> {'ok', mod(), compile_ret()} | {'error', term()}.
 
 file(File) ->
   file(File, []).
 
-%% @spec file(File, options()) -> {ok, Name, {Target,Binary}} | {error, Reason}
-%%       File = filename()
-%%       Name = mod() | mfa()
+%% @spec file(File, options()) -> {ok, Mod, {Target, Binary}} | {error, Reason}
+%%       File = file:filename()
+%%       Mod = mod()
 %%       Binary = binary()
 %%       Reason = term()
 %% 
 %% @doc Like <code>compile/2</code>, but takes the module name from the
-%% specified <code>File</code>. Returns both the name and the final
+%% specified <code>File</code>. Returns both the module name and the final
 %% binary if successful.
 %%
 %% @see file/1
 %% @see compile/2
 
--spec file(Mod, comp_options()) -> {'ok', Mod, compile_ret()}
-				|  {'error', term()}
-				     when Mod :: mod().
-file(File, Options) when is_atom(File) ->
-  case beam_lib:info(atom_to_list(File)) of
+-spec file(file:filename(), comp_options()) -> {'ok', mod(), compile_ret()}
+				             | {'error', Reason :: term()}.
+file(File, Options) when is_list(File) ->
+  case beam_lib:info(File) of
     L when is_list(L) ->
       {module, Mod} = lists:keyfind(module, 1, L),
       case compile(Mod, File, Options) of
@@ -590,9 +583,8 @@ fix_beam_exports([], Exports) ->
   Exports.
 
 get_beam_icode(Mod, {BeamCode, Exports}, File, Options) ->
-  {ok, Icode} =
-    ?option_time((catch {ok, hipe_beam_to_icode:module(BeamCode, Options)}),
-	         "BEAM-to-Icode", Options),
+  Icode = ?option_time(hipe_beam_to_icode:module(BeamCode, Options),
+                       "BEAM-to-Icode", Options),
   BeamBin = get_beam_code(File),
   {{Mod, Exports, Icode}, BeamBin}.
 
@@ -653,7 +645,7 @@ run_compiler_1(Name, DisasmFun, IcodeFun, Options) ->
 				   get(hipe_target_arch)),
 	    Opts =
 	      case proplists:get_bool(to_llvm, Opts0) andalso
-		not llvm_support_available() of
+		not llvm_version_is_OK() of
 		true ->
 		  ?error_msg("No LLVM version 3.9 or greater "
 			     "found in $PATH; aborting "
@@ -669,9 +661,12 @@ run_compiler_1(Name, DisasmFun, IcodeFun, Options) ->
 	    {Icode, WholeModule} = IcodeFun(Code, Opts),
 	    CompRes = compile_finish(Icode, WholeModule, Opts),
 	    compiler_return(CompRes, Parent)
-	  catch error:Error:StackTrace ->
+	  catch
+            error:Error:StackTrace ->
 	      print_crash_message(Name, Error, StackTrace),
-	      exit(Error)
+	      exit(Error);
+            throw:{unimplemented_instruction,_Instruction}=Error ->
+              exit(Error)
 	  end
       end),
   Timeout = case proplists:get_value(timeout, Options) of
@@ -1607,9 +1602,15 @@ check_options(Opts) ->
       ok
   end.
 
--spec llvm_support_available() -> boolean().
+-spec erllvm_is_supported() -> boolean().
+erllvm_is_supported() ->
+  %% XXX: The test should really check the _target_ architecture,
+  %%      (hipe_target_arch), but there's no guarantee it's set.
+  Arch = erlang:system_info(hipe_architecture),
+  lists:member(Arch, [amd64, x86]) andalso llvm_version_is_OK().
 
-llvm_support_available() ->
+-spec llvm_version_is_OK() -> boolean().
+llvm_version_is_OK() ->
   get_llvm_version() >= {3,9}.
 
 -type llvm_version() :: {Major :: integer(), Minor :: integer()}.
diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile
index becdd0b7d8..0c0f6e24f5 100644
--- a/lib/hipe/rtl/Makefile
+++ b/lib/hipe/rtl/Makefile
@@ -75,7 +75,10 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
 include ../native.mk
 
-ERL_COMPILE_FLAGS += -Werror +inline +warn_unused_import +warn_export_vars
+ERL_COMPILE_FLAGS += +inline +warn_unused_import +warn_export_vars
+ifneq ($(NATIVE_LIBS_ENABLED),yes)
+ERL_COMPILE_FLAGS += -Werror
+endif
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/hipe/rtl/hipe_icode2rtl.erl b/lib/hipe/rtl/hipe_icode2rtl.erl
index 6da8a76d34..1ab41f4deb 100644
--- a/lib/hipe/rtl/hipe_icode2rtl.erl
+++ b/lib/hipe/rtl/hipe_icode2rtl.erl
@@ -215,7 +215,7 @@ gen_enter(I, VarMap, ConstTab) ->
   {Code1, ConstTab2} =
     case hipe_icode:enter_type(I) of
       primop ->
-	IsGuard = false, % enter can not happen in a guard
+	IsGuard = false, % enter cannot happen in a guard
 	hipe_rtl_primops:gen_enter_primop({Fun, Args}, IsGuard, ConstTab1);
       Type ->
 	Call = gen_enter_1(Fun, Args, Type),
diff --git a/lib/hipe/rtl/hipe_rtl_arith.inc b/lib/hipe/rtl/hipe_rtl_arith.inc
index c05b7aa160..575f10b542 100644
--- a/lib/hipe/rtl/hipe_rtl_arith.inc
+++ b/lib/hipe/rtl/hipe_rtl_arith.inc
@@ -118,8 +118,8 @@ eval_alu(Op, Arg1, Arg2) ->
 
 %% Björn & Bjarni:
 %% We need to be able to do evaluations based only on the bits, since
-%% there are cases where we can evaluate a subset of the bits, but can
-%% not do a full eval-alub call (eg. a + 0 gives no carry)
+%% there are cases where we can evaluate a subset of the bits, but
+%% cannot do a full eval-alub call (eg. a + 0 gives no carry)
 %%
 -spec eval_cond_bits(hipe_rtl:alub_cond(), boolean(),
 		     boolean(), boolean(), boolean()) -> boolean().
diff --git a/lib/hipe/rtl/hipe_rtl_ssa_const_prop.erl b/lib/hipe/rtl/hipe_rtl_ssa_const_prop.erl
index cad43e2df5..72373e536d 100644
--- a/lib/hipe/rtl/hipe_rtl_ssa_const_prop.erl
+++ b/lib/hipe/rtl/hipe_rtl_ssa_const_prop.erl
@@ -31,11 +31,11 @@
 %%
 %% Some things to note:
 %%
-%% 1. All precoloured registers are assumed to contain bottom. We can not
+%% 1. All precoloured registers are assumed to contain bottom. We cannot
 %%    do anything with them since they are not in SSA-form. This might be
 %%    possible to resolve in some way, but we decided to not go there.
 %%
-%% 2. const_labels are assumed to be bottom, we can not find the address
+%% 2. const_labels are assumed to be bottom, we cannot find the address
 %%    in any nice way (that I know of, maybe someone can help ?). I
 %%    suppose they don't get a value until linking (or some step that
 %%    resembles it). They are only affecting bignums and floats (at least
@@ -579,7 +579,7 @@ visit_multimove(Inst, Env) ->
 %% Procedure : visit_call/2
 %% Purpose   : execute a call-instruction. All calls return bottom. We make 
 %%             this assumption since the icode-leel have taken care of BIF's
-%%             and we belive that we are left with the things that can not be
+%%             and we belive that we are left with the things that cannot be
 %%             done att compile time.
 %% Arguments : Inst - The instruction
 %%             Env  - The environment
diff --git a/lib/hipe/test/Makefile b/lib/hipe/test/Makefile
index efeb0887ab..3650cda663 100644
--- a/lib/hipe/test/Makefile
+++ b/lib/hipe/test/Makefile
@@ -13,7 +13,6 @@ MODULES= \
 # .erl files for these modules are automatically generated
 GEN_MODULES= \
 	basic_SUITE \
-	bs_SUITE \
 	maps_SUITE \
 	sanity_SUITE
 
diff --git a/lib/hipe/test/basic_SUITE_data/basic_inline_function.erl b/lib/hipe/test/basic_SUITE_data/basic_inline_function.erl
deleted file mode 100644
index 4c08064670..0000000000
--- a/lib/hipe/test/basic_SUITE_data/basic_inline_function.erl
+++ /dev/null
@@ -1,73 +0,0 @@
-%%% -*- erlang-indent-level: 2 -*-
-%%%-------------------------------------------------------------------
-%%% Author: Kostis Sagonas
-%%%
-%%% Contains tests that depend on the compiler inliner being turned on.
-%%%-------------------------------------------------------------------
--module(basic_inline_function).
-
--export([test/0]).
-
--compile({inline, [{to_objects, 3}]}).
-
-test() ->
-  ok = test_inline_match(),
-  ok.
-
-%%--------------------------------------------------------------------
-
-test_inline_match() ->
-  bad_object = test1(a, {binary, foo, set}, c),
-  bad_object = test2(a, {binary, foo, set}, c),
-  bad_object = test3(a, {binary, foo, set}, c),
-  ok.
-
-%% Inlined
-test1(KeysObjs, C, Ts) ->
-  case catch to_objects(KeysObjs, C, Ts) of
-    {'EXIT', _} ->
-      bad_object;
-    ok ->
-      ok
-  end.
-
-%% "Inlined" by hand
-test2(KeysObjs, C, _Ts) ->
-  case catch (case C of
-		{binary, _, set} ->
-		  <<_ObjSz0:32, _T/binary>> = KeysObjs;
-		_ -> ok
-	      end) of
-    {'EXIT', _} ->
-      bad_object;
-    ok ->
-      ok
-  end.
-
-%% Not inlined
-test3(KeysObjs, C, Ts) ->
-  case catch fto_objects(KeysObjs, C, Ts) of
-    {'EXIT', _} ->
-      bad_object;
-    ok ->
-      ok
-  end.
-
-%% Inlined.
-to_objects(Bin, {binary, _, set}, _Ts) ->
-  <<_ObjSz0:32, _T/binary>> = Bin,
-  ok;
-to_objects(<<_ObjSz0:32, _T/binary>> ,_, _) ->
-  ok;
-to_objects(_Bin, _, _Ts) ->
-  ok.
-
-%% Not Inlined.
-fto_objects(Bin, {binary, _, set}, _Ts) ->
-  <<_ObjSz0:32, _T/binary>> = Bin,
-  ok;
-fto_objects(<<_ObjSz0:32, _T/binary>> ,_,_) ->
-  ok;
-fto_objects(_Bin, _, _Ts) ->
-  ok.
-
diff --git a/lib/hipe/test/hipe_testsuite_driver.erl b/lib/hipe/test/hipe_testsuite_driver.erl
index 8813af5dfc..c506dd5e1d 100644
--- a/lib/hipe/test/hipe_testsuite_driver.erl
+++ b/lib/hipe/test/hipe_testsuite_driver.erl
@@ -170,7 +170,7 @@ run(TestCase, Dir, _OutDir) ->
     {ok, TestCase} = hipe:c(TestCase, [o0|HiPEOpts]),
     ok = TestCase:test(),
     ToLLVM = try TestCase:to_llvm() catch error:undef -> true end,
-    case ToLLVM andalso hipe:llvm_support_available() of
+    case ToLLVM andalso hipe:erllvm_is_supported() of
 	true ->
 	    {ok, TestCase} = hipe:c(TestCase, [to_llvm|HiPEOpts]),
 	    ok = TestCase:test();
diff --git a/lib/hipe/vsn.mk b/lib/hipe/vsn.mk
index 12d621bf01..3a22e07f57 100644
--- a/lib/hipe/vsn.mk
+++ b/lib/hipe/vsn.mk
@@ -1 +1 @@
-HIPE_VSN = 3.18.2
+HIPE_VSN = 3.19.1
diff --git a/lib/inets/doc/src/http_uri.xml b/lib/inets/doc/src/http_uri.xml
index 2dec5acbf9..6d3547f4fe 100644
--- a/lib/inets/doc/src/http_uri.xml
+++ b/lib/inets/doc/src/http_uri.xml
@@ -30,7 +30,7 @@
     <rev></rev>
   </header>
 
-  <module>http_uri</module>
+  <module since="OTP R15B01">http_uri</module>
   <modulesummary>URI utility module</modulesummary>
 
   <description>
@@ -79,7 +79,7 @@
   
   <funcs>
     <func>
-      <name>decode(HexEncodedURI) -> URI</name>
+      <name since="OTP R15B01">decode(HexEncodedURI) -> URI</name>
       
       <fsummary>Decodes a hexadecimal encoded URI.</fsummary>
       <type>
@@ -93,7 +93,7 @@
       </desc>
     </func>
     <func>
-      <name>encode(URI) -> HexEncodedURI</name>
+      <name since="OTP R15B01">encode(URI) -> HexEncodedURI</name>
       
       <fsummary>Encodes a hexadecimal encoded URI.</fsummary>
       <type>
@@ -109,8 +109,8 @@
     </func>
 
     <func>
-      <name>parse(URI) -> {ok, Result} | {error, Reason}</name>
-      <name>parse(URI, Options) -> {ok, Result} | {error, Reason}</name>
+      <name since="OTP R15B01">parse(URI) -> {ok, Result} | {error, Reason}</name>
+      <name since="OTP R15B01">parse(URI, Options) -> {ok, Result} | {error, Reason}</name>
       <fsummary>Parses a URI.</fsummary>
       <type>
         <v>URI = uri()</v> 
@@ -165,7 +165,7 @@ fun(SchemeStr :: string() | binary()) ->
     </func>
 
     <func>
-      <name>scheme_defaults() -> SchemeDefaults</name>
+      <name since="OTP R15B01">scheme_defaults() -> SchemeDefaults</name>
       <fsummary>A list of the scheme and their default ports.</fsummary>
       <type>
         <v>SchemeDefaults = [{scheme(), default_scheme_port_number()}] </v> 
diff --git a/lib/inets/doc/src/httpc.xml b/lib/inets/doc/src/httpc.xml
index a2871f3b95..7451b314ec 100644
--- a/lib/inets/doc/src/httpc.xml
+++ b/lib/inets/doc/src/httpc.xml
@@ -30,7 +30,7 @@
     <rev></rev>
   </header>
 
-  <module>httpc</module>
+  <module since="OTP R13B04">httpc</module>
   <modulesummary>An HTTP/1.1 client</modulesummary>
 
   <description>
@@ -151,8 +151,8 @@
   <funcs>
    
     <func>
-      <name>cancel_request(RequestId) -></name>
-      <name>cancel_request(RequestId, Profile) -> ok</name>
+      <name since="OTP R13B04">cancel_request(RequestId) -></name>
+      <name since="OTP R13B04">cancel_request(RequestId, Profile) -> ok</name>
       <fsummary>Cancels an asynchronous HTTP request.</fsummary>
       <type>
         <v>RequestId = request_id() - A unique identifier as returned
@@ -169,9 +169,9 @@
     </func>
 
     <func>
-      <name>cookie_header(Url) -> </name>
-      <name>cookie_header(Url, Profile | Opts) -> header() | {error, Reason}</name>
-      <name>cookie_header(Url, Opts, Profile) -> header() | {error, Reason}</name>
+      <name since="OTP R13B04">cookie_header(Url) -> </name>
+      <name since="OTP R13B04">cookie_header(Url, Profile | Opts) -> header() | {error, Reason}</name>
+      <name since="OTP R15B">cookie_header(Url, Opts, Profile) -> header() | {error, Reason}</name>
       <fsummary>Returns the cookie header that would have been sent when
       making a request to URL using the profile <c>Profile</c>.</fsummary>
       <type>
@@ -193,8 +193,8 @@
     </func>
 
      <func>
-      <name>get_options(OptionItems) -> {ok, Values} | {error, Reason}</name>
-      <name>get_options(OptionItems, Profile) -> {ok, Values} | {error, Reason}</name>
+      <name since="OTP R15B01">get_options(OptionItems) -> {ok, Values} | {error, Reason}</name>
+      <name since="OTP R15B01">get_options(OptionItems, Profile) -> {ok, Values} | {error, Reason}</name>
       <fsummary>Gets the currently used options.</fsummary>
       <type>
         <v>OptionItems = all | [option_item()]</v>
@@ -223,8 +223,8 @@
     </func>
 
     <func>
-      <name>info() -> list()</name>
-      <name>info(Profile) -> list()</name>
+      <name since="OTP R15B02">info() -> list()</name>
+      <name since="OTP R15B02">info(Profile) -> list()</name>
       <fsummary>Produces a list of miscellaneous information.</fsummary>
       <type>
 	<v>Profile = profile() | pid()</v>
@@ -239,8 +239,8 @@
 
     
     <func>
-      <name>reset_cookies() -> void()</name>
-      <name>reset_cookies(Profile) -> void()</name>
+      <name since="OTP R13B04">reset_cookies() -> void()</name>
+      <name since="OTP R13B04">reset_cookies(Profile) -> void()</name>
       <fsummary>Resets the cookie database.</fsummary>
       <type>
 	<v>Profile = profile() | pid()</v>
@@ -254,8 +254,8 @@
     </func>
     
     <func>
-      <name>request(Url) -> </name>
-      <name>request(Url, Profile) -> {ok, Result} | {error, Reason}</name>
+      <name since="OTP R13B04">request(Url) -> </name>
+      <name since="OTP R13B04">request(Url, Profile) -> {ok, Result} | {error, Reason}</name>
       <fsummary>Sends a get HTTP request.</fsummary>
       <type>
         <v>Url = url()</v> 
@@ -272,8 +272,8 @@
     </func>
 
     <func>
-      <name>request(Method, Request, HTTPOptions, Options) -></name>
-      <name>request(Method, Request, HTTPOptions, Options, Profile) -> {ok, Result} | {ok, saved_to_file} | {error, Reason}</name>
+      <name since="OTP R13B04">request(Method, Request, HTTPOptions, Options) -></name>
+      <name since="OTP R13B04">request(Method, Request, HTTPOptions, Options, Profile) -> {ok, Result} | {ok, saved_to_file} | {error, Reason}</name>
       
       <fsummary>Sends an HTTP request.</fsummary>
       <type>
@@ -521,8 +521,8 @@
 
   
     <func>
-      <name>set_options(Options) -> </name>
-      <name>set_options(Options, Profile) -> ok | {error, Reason}</name>
+      <name since="OTP R13B04">set_options(Options) -> </name>
+      <name since="OTP R13B04">set_options(Options, Profile) -> ok | {error, Reason}</name>
       <fsummary>Sets options to be used for subsequent requests.</fsummary>
       <type>
         <v>Options = [Option]</v>
@@ -639,8 +639,8 @@
     </func>
      
     <func>
-      <name>store_cookies(SetCookieHeaders, Url) -> </name>
-      <name>store_cookies(SetCookieHeaders, Url, Profile) -> ok | {error, Reason}</name>
+      <name since="OTP R14B02">store_cookies(SetCookieHeaders, Url) -> </name>
+      <name since="OTP R14B02">store_cookies(SetCookieHeaders, Url, Profile) -> ok | {error, Reason}</name>
       <fsummary>Saves the cookies defined in <c>SetCookieHeaders</c> in the 
       client profile cookie database.</fsummary>
       <type>
@@ -658,7 +658,7 @@
     </func>
 
     <func>
-      <name>stream_next(Pid) -> ok</name>
+      <name since="OTP R13B04">stream_next(Pid) -> ok</name>
       <fsummary>Triggers the next message to be streamed, that is,
 	the same behavior as active one for sockets.
       </fsummary>
@@ -676,8 +676,8 @@
     </func>
     
     <func>
-      <name>which_cookies() -> cookies()</name>
-      <name>which_cookies(Profile) -> cookies()</name>
+      <name since="OTP R13B04">which_cookies() -> cookies()</name>
+      <name since="OTP R13B04">which_cookies(Profile) -> cookies()</name>
       <fsummary>Dumps the entire cookie database.</fsummary>
       <type>
 	<v>Profile = profile() | pid()</v>
@@ -695,8 +695,8 @@
     </func>
 
     <func>
-      <name>which_sessions() -> session_info()</name>
-      <name>which_sessions(Profile) -> session_info()</name>
+      <name since="OTP R15B02">which_sessions() -> session_info()</name>
+      <name since="OTP R15B02">which_sessions(Profile) -> session_info()</name>
       <fsummary>Produces a slightly processed dump of the sessions database.</fsummary>
       <type>
 	<v>Profile = profile() | pid()</v>
diff --git a/lib/inets/doc/src/httpd.xml b/lib/inets/doc/src/httpd.xml
index 2c70c2b050..1750078db0 100644
--- a/lib/inets/doc/src/httpd.xml
+++ b/lib/inets/doc/src/httpd.xml
@@ -29,7 +29,7 @@
     <rev>2.2</rev>
     <file>httpd.sgml</file>
   </header>
-  <module>httpd</module> 
+  <module since="">httpd</module> 
   <modulesummary>
     HTTP server API
   </modulesummary>
@@ -173,7 +173,7 @@
       <item>
 	<p>For <c>ip_comm</c> configuration options, see 
 	<seealso marker="kernel:gen_tcp#listen-2">gen_tcp:listen/2</seealso>, some options
-	that are used internally by httpd can not be set.</p>
+	that are used internally by httpd cannot be set.</p>
 	<p>For <c>SSL</c> configuration options, see 
 	<seealso marker="ssl:ssl#listen-2">ssl:listen/2</seealso>.</p>
 	<p>Default is <c>ip_comm</c>.</p> 
@@ -874,8 +874,8 @@ text/plain	asc txt</pre>
 
   <funcs>
     <func>
-      <name>info(Pid) -></name>
-      <name>info(Pid, Properties) -> [{Option, Value}]</name>
+      <name since="">info(Pid) -></name>
+      <name since="">info(Pid, Properties) -> [{Option, Value}]</name>
       <fsummary>Fetches information about the HTTP server.</fsummary>
       <type>
         <v>Properties = [property()]</v>
@@ -899,10 +899,10 @@ text/plain	asc txt</pre>
     </func>
 
     <func>
-      <name>info(Address, Port) ->  </name>
-      <name>info(Address, Port, Profile) ->  </name>
-      <name>info(Address, Port, Profile, Properties) -> [{Option, Value}] </name>
-      <name>info(Address, Port, Properties) -> [{Option, Value}] </name>
+      <name since="">info(Address, Port) ->  </name>
+      <name since="">info(Address, Port, Profile) ->  </name>
+      <name since="OTP 18.0">info(Address, Port, Profile, Properties) -> [{Option, Value}] </name>
+      <name since="">info(Address, Port, Properties) -> [{Option, Value}] </name>
       <fsummary>Fetches information about the HTTP server.</fsummary>
       <type>
 	<v>Address = ip_address()</v>
@@ -927,7 +927,7 @@ text/plain	asc txt</pre>
     </func>
     
     <func>
-      <name>reload_config(Config, Mode) -> ok | {error, Reason}</name>
+      <name since="">reload_config(Config, Mode) -> ok | {error, Reason}</name>
       <fsummary>Reloads the HTTP server configuration without
 	restarting the server.</fsummary>
       <type>
@@ -1051,7 +1051,7 @@ text/plain	asc txt</pre>
   </section>
   <funcs>
     <func>
-      <name>Module:do(ModData)-> {proceed, OldData} | {proceed, NewData} | {break, NewData} | done</name>
+      <name since="">Module:do(ModData)-> {proceed, OldData} | {proceed, NewData} | {break, NewData} | done</name>
       <fsummary>Called for each request to the web server.</fsummary>
       <type>
         <v>OldData = list()</v>
@@ -1105,7 +1105,7 @@ text/plain	asc txt</pre>
     </func>
 
     <func>
-      <name>Module:load(Line, AccIn)-> eof | ok | {ok, AccOut} | {ok, AccOut, {Option, Value}} | {ok, AccOut, [{Option, Value}]} | {error, Reason}</name>
+      <name since="">Module:load(Line, AccIn)-> eof | ok | {ok, AccOut} | {ok, AccOut, {Option, Value}} | {ok, AccOut, [{Option, Value}]} | {error, Reason}</name>
       <fsummary>Converts a line in an Apache-like config 
 	file to an <c>{Option, Value}</c> tuple.</fsummary>
       <type>
@@ -1128,7 +1128,7 @@ text/plain	asc txt</pre>
     </func>
     
     <func>
-      <name>Module:remove(ConfigDB) -> ok | {error, Reason} </name>
+      <name since="">Module:remove(ConfigDB) -> ok | {error, Reason} </name>
       <fsummary>Callback function that is called when the web server is closed.</fsummary>
       <type>
         <v>ConfigDB = ets_table()</v>
@@ -1143,7 +1143,7 @@ text/plain	asc txt</pre>
     </func>
     
     <func>
-      <name>Module:store({Option, Value}, Config)-> {ok, {Option, NewValue}} | {error, Reason}</name>
+      <name since="">Module:store({Option, Value}, Config)-> {ok, {Option, NewValue}} | {error, Reason}</name>
       <fsummary>Checks the validity of the configuration options.</fsummary>
       <type>
         <v>Line = string()</v>
@@ -1171,7 +1171,7 @@ text/plain	asc txt</pre>
   </section>
   <funcs>
     <func>
-      <name>parse_query(QueryString) -> [{Key,Value}]</name>
+      <name since="">parse_query(QueryString) -> [{Key,Value}]</name>
       <fsummary>Parses incoming data to <c>erl</c> and <c>eval</c> scripts.</fsummary>
       <type>
         <v>QueryString = string()</v>
diff --git a/lib/inets/doc/src/httpd_custom_api.xml b/lib/inets/doc/src/httpd_custom_api.xml
index d2e5441895..2c0f92ff83 100644
--- a/lib/inets/doc/src/httpd_custom_api.xml
+++ b/lib/inets/doc/src/httpd_custom_api.xml
@@ -25,7 +25,7 @@
     <title>httpd_custom_api</title>
     <file>httpd_custom_api.xml</file>
   </header>
-  <module>httpd_custom_api</module>
+  <module since="OTP 17.5.6">httpd_custom_api</module>
   <modulesummary>Behaviour with optional callbacks to customize the inets HTTP server.</modulesummary>
   <description>
     <p> The module implementing this behaviour shall be supplied to to the servers
@@ -34,7 +34,7 @@
   </description>  
   <funcs>
      <func>
-      <name>response_default_headers() -> [Header] </name>
+      <name since="OTP 18.1.1">response_default_headers() -> [Header] </name>
       <fsummary>Provide default headers for the HTTP servers responses.</fsummary>
       <type>
         <v>Header = {HeaderName :: string(), HeaderValue::string()}</v>
@@ -48,7 +48,7 @@
     </func>
     
     <func>
-      <name>response_header({HeaderName, HeaderValue}) ->  {true, Header} | false </name>
+      <name since="OTP 17.5.6">response_header({HeaderName, HeaderValue}) ->  {true, Header} | false </name>
       <fsummary>Filter and possible alter HTTP response headers.</fsummary>
       <type>
         <v>Header = {HeaderName :: string(), HeaderValue::string()}</v>
@@ -61,7 +61,7 @@
     </func>
    
     <func>
-      <name>request_header({HeaderName, HeaderValue}) ->   {true, Header} | false </name>
+      <name since="OTP 17.5.6">request_header({HeaderName, HeaderValue}) ->   {true, Header} | false </name>
       <fsummary>Filter and possible alter HTTP request headers.</fsummary>
       <type>
 	<v>Header = {HeaderName :: string(), HeaderValue::string()}</v>
diff --git a/lib/inets/doc/src/httpd_socket.xml b/lib/inets/doc/src/httpd_socket.xml
index d3aa82a540..22ead06f38 100644
--- a/lib/inets/doc/src/httpd_socket.xml
+++ b/lib/inets/doc/src/httpd_socket.xml
@@ -29,7 +29,7 @@
     <rev>2.2</rev>
     <file>httpd_socket.sgml</file>
   </header>
-  <module>httpd_socket</module>
+  <module since="">httpd_socket</module>
   <modulesummary>Communication utility functions to be used by the Erlang
     web server API programmer.</modulesummary>
   <description>
@@ -43,7 +43,7 @@
 
   <funcs>
     <func>
-      <name>deliver(SocketType, Socket, Data) -> Result</name>
+      <name since="">deliver(SocketType, Socket, Data) -> Result</name>
       <fsummary>Sends binary data over socket.</fsummary>
       <type>
         <v>SocketType = socket_type()</v>
@@ -63,7 +63,7 @@
     </func>
 
     <func>
-      <name>peername(SocketType,Socket) -> {Port,IPAddress}</name>
+      <name since="">peername(SocketType,Socket) -> {Port,IPAddress}</name>
       <fsummary>Returns the port and IP address of the remote socket.</fsummary>
       <type>
         <v>SocketType = socket_type()</v>
@@ -81,7 +81,7 @@
     </func>
 
     <func>
-      <name>resolve() -> HostName</name>
+      <name since="">resolve() -> HostName</name>
       <fsummary>Returns the official name of the current host.</fsummary>
       <type>
         <v>HostName = string()</v>
diff --git a/lib/inets/doc/src/httpd_util.xml b/lib/inets/doc/src/httpd_util.xml
index 220a2ede35..e0f947f860 100644
--- a/lib/inets/doc/src/httpd_util.xml
+++ b/lib/inets/doc/src/httpd_util.xml
@@ -29,7 +29,7 @@
     <rev>2.2</rev>
     <file>httpd_util.sgml</file>
   </header>
-  <module>httpd_util</module>
+  <module since="">httpd_util</module>
   <modulesummary>Miscellaneous utility functions to be used when implementing 
   Erlang web server API modules.</modulesummary>
   <description>
@@ -41,12 +41,11 @@
 
   <funcs>
     <func>
-      <name>convert_request_date(DateString) -> ErlDate|bad_date</name>
+      <name since="">convert_request_date(DateString) -> ErlDate|bad_date</name>
       <fsummary>Converts the date to the Erlang date format.</fsummary>
       <type>
         <v>DateString = string()</v>
-        <v>ErlDate = {{Year,Month,Date},{Hour,Min,Sec}}</v>
-        <v>Year = Month = Date = Hour = Min = Sec = integer()</v>
+        <v>ErlDate = calendar:datetime() </v>
       </type>
       <desc>
         <p><c>convert_request_date/1</c> converts <c>DateString</c> to 
@@ -57,7 +56,7 @@
     </func>
 
     <func>
-      <name>create_etag(FileInfo) -> Etag</name>
+      <name since="">create_etag(FileInfo) -> Etag</name>
       <fsummary>Calculates the Etag for a file.</fsummary>
       <type>
         <v>FileInfo = file_info()</v>
@@ -71,7 +70,7 @@
     </func>
     
     <func>
-      <name>day(NthDayOfWeek) -> DayOfWeek</name>
+      <name since="">day(NthDayOfWeek) -> DayOfWeek</name>
       <fsummary>Converts the day of the week 
       (integer [1-7]) to an abbreviated string.</fsummary>
       <type>
@@ -87,7 +86,7 @@
     </func>
 
     <func>
-      <name>decode_hex(HexValue) -> DecValue</name>
+      <name since="">decode_hex(HexValue) -> DecValue</name>
       <fsummary>Converts a hexadecimal value into its decimal equivalent.</fsummary>
       <type>
         <v>HexValue = DecValue = string()</v>
@@ -99,7 +98,7 @@
     </func>
     
     <func>
-      <name>flatlength(NestedList) -> Size</name>
+      <name since="">flatlength(NestedList) -> Size</name>
       <fsummary>Computes the size of a possibly nested list.</fsummary>
       <type>
         <v>NestedList = list()</v>
@@ -112,7 +111,7 @@
     </func>
 
     <func>
-      <name>hexlist_to_integer(HexString) -> Number</name>
+      <name since="">hexlist_to_integer(HexString) -> Number</name>
       <fsummary>Converts a hexadecimal string to an integer.</fsummary>
       <type>
         <v>Number = integer()</v>
@@ -125,7 +124,7 @@
     </func>
 
     <func>
-      <name>integer_to_hexlist(Number) -> HexString</name>
+      <name since="">integer_to_hexlist(Number) -> HexString</name>
       <fsummary>Converts an integer to a hexadecimal string.</fsummary>
       <type>
         <v>Number = integer()</v>
@@ -138,8 +137,8 @@
     </func>
 
     <func>
-      <name>lookup(ETSTable,Key) -> Result</name>
-      <name>lookup(ETSTable,Key,Undefined) -> Result</name>
+      <name since="">lookup(ETSTable,Key) -> Result</name>
+      <name since="">lookup(ETSTable,Key,Undefined) -> Result</name>
       <fsummary>Extracts the first value associated with a <c>Key</c> 
       in an ETS table.</fsummary>
       <type>
@@ -160,8 +159,8 @@
     </func>
 
     <func>
-      <name>lookup_mime(ConfigDB,Suffix)</name>
-      <name>lookup_mime(ConfigDB,Suffix,Undefined) -> MimeType</name>
+      <name since="">lookup_mime(ConfigDB,Suffix)</name>
+      <name since="">lookup_mime(ConfigDB,Suffix,Undefined) -> MimeType</name>
       <fsummary>Returns the MIME type associated with a specific file suffix.</fsummary>
       <type>
         <v>ConfigDB = ets_table()</v>
@@ -179,8 +178,8 @@
     </func>
 
     <func>
-      <name>lookup_mime_default(ConfigDB,Suffix)</name>
-      <name>lookup_mime_default(ConfigDB,Suffix,Undefined) -> MimeType</name>
+      <name since="">lookup_mime_default(ConfigDB,Suffix)</name>
+      <name since="">lookup_mime_default(ConfigDB,Suffix,Undefined) -> MimeType</name>
       <fsummary>Returns the MIME type associated with a specific file suffix 
       or the value of the DefaultType.</fsummary>
       <type>
@@ -201,7 +200,7 @@
     </func>
 
     <func>
-      <name>message(StatusCode,PhraseArgs,ConfigDB) -> Message</name>
+      <name since="">message(StatusCode,PhraseArgs,ConfigDB) -> Message</name>
       <fsummary>Returns an informative HTTP 1.1 status string in HTML.</fsummary>
       <type>
         <v>StatusCode = 301 | 400 | 403 | 404 | 500 | 501 | 504</v>
@@ -236,7 +235,7 @@
     </func>
 
     <func>
-      <name>month(NthMonth) -> Month</name>
+      <name since="">month(NthMonth) -> Month</name>
       <fsummary>Converts the month as an integer (1-12) to an abbreviated string.</fsummary>
       <type>
         <v>NthMonth = 1-12</v>
@@ -250,7 +249,7 @@
     </func>
 
     <func>
-      <name>multi_lookup(ETSTable,Key) -> Result</name>
+      <name since="">multi_lookup(ETSTable,Key) -> Result</name>
       <fsummary>Extracts the values associated with a key in an ETS table.</fsummary>
       <type>
         <v>ETSTable = ets_table()</v>
@@ -265,7 +264,7 @@
     </func>
 
     <func>
-      <name>reason_phrase(StatusCode) -> Description</name>
+      <name since="">reason_phrase(StatusCode) -> Description</name>
       <fsummary>Returns the description of an HTTP 1.1 status code.</fsummary>
       <type>
         <v>StatusCode = 100| 200 | 201 | 202 | 204 | 205 | 206 | 300 | 301 | 302 | 303 | 304 | 400 | 401 | 402 | 403 | 404 | 405 | 406 | 410 411 | 412 | 413 | 414 415 | 416 | 417 | 500 | 501 | 502 | 503 | 504 | 505</v>
@@ -280,11 +279,11 @@
     </func>
 
     <func>
-      <name>rfc1123_date() -> RFC1123Date</name>
-      <name>rfc1123_date({{YYYY,MM,DD},{Hour,Min,Sec}}) -> RFC1123Date</name>
+      <name since="">rfc1123_date() -> RFC1123Date</name>
+      <name since="">rfc1123_date(Date) -> RFC1123Date</name>
       <fsummary>Returns the current date in RFC 1123 format.</fsummary>
       <type>
-        <v>YYYY = MM = DD = Hour = Min = Sec = integer()</v>
+        <v> Date = calendar:datetime()</v>
         <v>RFC1123Date = string()</v>
       </type>
       <desc>
@@ -295,7 +294,7 @@
     </func>
 
     <func>
-      <name>split(String,RegExp,N) -> SplitRes</name>
+      <name since="">split(String,RegExp,N) -> SplitRes</name>
       <fsummary>Splits a string in N chunks using a regular expression.</fsummary>
       <type>
         <v>String = RegExp = string()</v>
@@ -313,7 +312,7 @@
     </func>
 
     <func>
-      <name>split_script_path(RequestLine) -> Splitted</name>
+      <name since="">split_script_path(RequestLine) -> Splitted</name>
       <fsummary>Splits a <c>RequestLine</c> in a file reference to an executable, 
       and a <c>QueryString</c> or a <c>PathInfo</c>string.</fsummary>
       <type>
@@ -330,7 +329,7 @@
     </func>
 
     <func>
-      <name>split_path(RequestLine) -> {Path,QueryStringOrPathInfo}</name>
+      <name since="">split_path(RequestLine) -> {Path,QueryStringOrPathInfo}</name>
       <fsummary>Splits a <c>RequestLine</c> in a file reference, and a 
       <c>QueryString</c> or a <c>PathInfo</c> string.</fsummary>
       <type>
@@ -356,7 +355,7 @@
     </func>
 
     <func>
-      <name>strip(String) -> Stripped</name>
+      <name since="">strip(String) -> Stripped</name>
       <fsummary>Returns <c>String</c> where the leading and trailing space 
       tabs are removed.</fsummary>
       <type>
@@ -370,7 +369,7 @@
     </func>
 
     <func>
-      <name>suffix(FileName) -> Suffix</name>
+      <name since="">suffix(FileName) -> Suffix</name>
       <fsummary>Extracts the file suffix from a given filename.</fsummary>
       <type>
         <v>FileName = Suffix = string()</v>
diff --git a/lib/inets/doc/src/inets.xml b/lib/inets/doc/src/inets.xml
index 9b0ffaad5e..176af3137a 100644
--- a/lib/inets/doc/src/inets.xml
+++ b/lib/inets/doc/src/inets.xml
@@ -29,7 +29,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>inets</module>
+  <module since="">inets</module>
   <modulesummary>The Inets services API.</modulesummary>
   <description>
     <p>This module provides the most basic API to the 
@@ -51,7 +51,7 @@
 
   <funcs>
     <func>
-      <name>services() -> [{Service, Pid}]</name>
+      <name since="">services() -> [{Service, Pid}]</name>
       <fsummary>Returns a list of currently running services.</fsummary>
       <type>
         <v>Service = service()</v>
@@ -68,7 +68,7 @@
     </func>
 
     <func>
-      <name>services_info() -> [{Service, Pid, Info}]</name>
+      <name since="">services_info() -> [{Service, Pid, Info}]</name>
       <fsummary>Returns a list of currently running services where
       each service is described by an <c>[{Option, Value}]</c>
       list.</fsummary>
@@ -91,7 +91,7 @@
     </func>
     
     <func>
-      <name>service_names() -> [Service] </name>
+      <name since="">service_names() -> [Service] </name>
       <fsummary>Returns a list of available service names.</fsummary>
       <type>
 	<v>Service = service()</v>
@@ -104,8 +104,8 @@
     </func>
     
     <func>
-      <name>start() -> </name>
-      <name>start(Type) -> ok | {error, Reason}</name>
+      <name since="">start() -> </name>
+      <name since="">start(Type) -> ok | {error, Reason}</name>
       <fsummary>Starts the <c>Inets</c> application.</fsummary>
       <type>
         <v>Type = permanent | transient | temporary</v>
@@ -120,8 +120,8 @@
     </func>
 
     <func>
-      <name>start(Service, ServiceConfig) -> {ok, Pid} | {error, Reason}</name>
-      <name>start(Service, ServiceConfig, How) -> {ok, Pid} | {error, Reason}</name>
+      <name since="">start(Service, ServiceConfig) -> {ok, Pid} | {error, Reason}</name>
+      <name since="">start(Service, ServiceConfig, How) -> {ok, Pid} | {error, Reason}</name>
       <fsummary>Dynamically starts an <c>Inets</c>
       service after the <c>Inets</c> application has been started.</fsummary>
       <type>
@@ -156,7 +156,7 @@
     </func>
 
      <func>
-      <name>stop() -> ok </name>
+      <name since="">stop() -> ok </name>
       <fsummary>Stops the <c>Inets</c> application.</fsummary>
       <desc>
         <p>Stops the <c>Inets</c> application. See also
@@ -167,7 +167,7 @@
     </func>
     
     <func>
-      <name>stop(Service, Reference) -> ok | {error, Reason} </name>
+      <name since="">stop(Service, Reference) -> ok | {error, Reason} </name>
       <fsummary>Stops a started service of the <c>Inets</c> application or takes
           down a <c>stand_alone </c>service gracefully.</fsummary>
       <type>
diff --git a/lib/inets/doc/src/mod_alias.xml b/lib/inets/doc/src/mod_alias.xml
index 6ae19700a5..ff57d49d08 100644
--- a/lib/inets/doc/src/mod_alias.xml
+++ b/lib/inets/doc/src/mod_alias.xml
@@ -29,7 +29,7 @@
     <rev>2.2</rev>
     <file>mod_alias.sgml</file>
   </header>
-  <module>mod_alias</module>
+  <module since="">mod_alias</module>
   <modulesummary>URL aliasing.</modulesummary>
   <description>
     <p>Erlang web server internal API for handling of, for example,
@@ -40,7 +40,7 @@
 
   <funcs>
     <func>
-      <name>default_index(ConfigDB, Path) -> NewPath</name>
+      <name since="">default_index(ConfigDB, Path) -> NewPath</name>
       <fsummary>Returns a new path with the default resource or file appended.</fsummary>
       <type>
         <v>ConfigDB = config_db()</v>
@@ -64,7 +64,7 @@
     </func>
 
     <func>
-      <name>path(PathData, ConfigDB, RequestURI) -> Path</name>
+      <name since="">path(PathData, ConfigDB, RequestURI) -> Path</name>
       <fsummary>Returns the file path to a URL.</fsummary>
       <type>
         <v>PathData = interaction_data()</v>
@@ -89,7 +89,7 @@
     </func>
 
     <func>
-      <name>real_name(ConfigDB, RequestURI, Aliases) -> Ret</name>
+      <name since="">real_name(ConfigDB, RequestURI, Aliases) -> Ret</name>
       <fsummary>Expands a request URI using <c>Aliases</c> config directives.</fsummary>
       <type>
         <v>ConfigDB = config_db()</v>
@@ -120,7 +120,7 @@
     </func>
 
     <func>
-      <name>real_script_name(ConfigDB, RequestURI, ScriptAliases) -> Ret</name>
+      <name since="">real_script_name(ConfigDB, RequestURI, ScriptAliases) -> Ret</name>
       <fsummary>Expands a request URI using <c>ScriptAliases</c> 
       config directives.</fsummary>
       <type>
diff --git a/lib/inets/doc/src/mod_auth.xml b/lib/inets/doc/src/mod_auth.xml
index c4f844622b..ad864ca4d1 100644
--- a/lib/inets/doc/src/mod_auth.xml
+++ b/lib/inets/doc/src/mod_auth.xml
@@ -29,7 +29,7 @@
     <rev>2.3</rev>
     <file>mod_auth.sgml</file>
   </header>
-  <module>mod_auth</module>
+  <module since="">mod_auth</module>
   <modulesummary>User authentication using text files, Dets, or Mnesia database.</modulesummary>
   <description>
     <p>This module provides for basic user authentication using
@@ -38,9 +38,9 @@
 
   <funcs>
      <func>
-      <name>add_group_member(GroupName, UserName, Options) -> true | {error, Reason}</name>
-      <name>add_group_member(GroupName, UserName, Port, Dir) -> true | {error, Reason}</name>
-      <name>add_group_member(GroupName, UserName, Address, Port, Dir) -> true | {error, Reason}</name>
+      <name since="">add_group_member(GroupName, UserName, Options) -> true | {error, Reason}</name>
+      <name since="">add_group_member(GroupName, UserName, Port, Dir) -> true | {error, Reason}</name>
+      <name since="">add_group_member(GroupName, UserName, Address, Port, Dir) -> true | {error, Reason}</name>
       <fsummary>Adds a user to a group.</fsummary>
       <type>
         <v>GroupName = string()</v>
@@ -65,9 +65,9 @@
     </func>
     
     <func>
-      <name>add_user(UserName, Options) -> true| {error, Reason}</name>
-      <name>add_user(UserName, Password, UserData, Port, Dir) -> true | {error, Reason}</name>
-      <name>add_user(UserName, Password, UserData, Address, Port, Dir) -> true | {error, Reason}</name>
+      <name since="">add_user(UserName, Options) -> true| {error, Reason}</name>
+      <name since="">add_user(UserName, Password, UserData, Port, Dir) -> true | {error, Reason}</name>
+      <name since="">add_user(UserName, Password, UserData, Address, Port, Dir) -> true | {error, Reason}</name>
       <fsummary>Adds a user to the user database.</fsummary>
       <type>
         <v>UserName = string()</v>
@@ -92,8 +92,8 @@
     </func>
 
      <func>
-      <name>delete_group(GroupName, Options) -> true | {error,Reason} &lt;name>delete_group(GroupName, Port, Dir) -> true | {error, Reason}</name>
-      <name>delete_group(GroupName, Address, Port, Dir) -> true | {error, Reason}</name>
+      <name since="">delete_group(GroupName, Options) -> true | {error,Reason} &lt;name>delete_group(GroupName, Port, Dir) -> true | {error, Reason}</name>
+      <name since="">delete_group(GroupName, Address, Port, Dir) -> true | {error, Reason}</name>
       <fsummary>Deletes a group.</fsummary>
       <type>
         <v>Options = [Option]</v>
@@ -115,9 +115,9 @@
     </func>
 
      <func>
-      <name>delete_group_member(GroupName, UserName, Options) -> true | {error, Reason}</name>
-      <name>delete_group_member(GroupName, UserName, Port, Dir) -> true | {error, Reason}</name>
-      <name>delete_group_member(GroupName, UserName, Address, Port, Dir) -> true | {error, Reason}</name>
+      <name since="">delete_group_member(GroupName, UserName, Options) -> true | {error, Reason}</name>
+      <name since="">delete_group_member(GroupName, UserName, Port, Dir) -> true | {error, Reason}</name>
+      <name since="">delete_group_member(GroupName, UserName, Address, Port, Dir) -> true | {error, Reason}</name>
       <fsummary>Removes a user from a group.</fsummary>
       <type>
         <v>GroupName = string()</v>
@@ -141,9 +141,9 @@
     </func>
     
     <func>
-      <name>delete_user(UserName,Options) -> true | {error, Reason}</name>
-      <name>delete_user(UserName, Port, Dir) -> true | {error, Reason}</name>
-      <name>delete_user(UserName, Address, Port, Dir) -> true | {error, Reason}</name>
+      <name since="">delete_user(UserName,Options) -> true | {error, Reason}</name>
+      <name since="">delete_user(UserName, Port, Dir) -> true | {error, Reason}</name>
+      <name since="">delete_user(UserName, Address, Port, Dir) -> true | {error, Reason}</name>
       <fsummary>Deletes a user from the user database.</fsummary>
       <type>
         <v>UserName = string()</v>
@@ -166,9 +166,9 @@
     </func>
 
     <func>
-      <name>get_user(UserName,Options) -> {ok, #httpd_user} |{error, Reason}</name>
-      <name>get_user(UserName, Port, Dir) -> {ok, #httpd_user} | {error, Reason}</name>
-      <name>get_user(UserName, Address, Port, Dir) -> {ok, #httpd_user} | {error, Reason}</name>
+      <name since="">get_user(UserName,Options) -> {ok, #httpd_user} |{error, Reason}</name>
+      <name since="">get_user(UserName, Port, Dir) -> {ok, #httpd_user} | {error, Reason}</name>
+      <name since="">get_user(UserName, Address, Port, Dir) -> {ok, #httpd_user} | {error, Reason}</name>
       <fsummary>Returns a user from the user database.</fsummary>
       <type>
         <v>UserName = string()</v>
@@ -190,9 +190,9 @@
     </func>
 
      <func>
-      <name>list_groups(Options) -> {ok, Groups} | {error, Reason}</name>
-      <name>list_groups(Port, Dir) -> {ok, Groups} | {error, Reason}</name>
-      <name>list_groups(Address, Port, Dir) -> {ok, Groups} | {error, Reason}</name>
+      <name since="">list_groups(Options) -> {ok, Groups} | {error, Reason}</name>
+      <name since="">list_groups(Port, Dir) -> {ok, Groups} | {error, Reason}</name>
+      <name since="">list_groups(Address, Port, Dir) -> {ok, Groups} | {error, Reason}</name>
       <fsummary>Lists all the groups.</fsummary>
       <type>
         <v>Options = [Option]</v>
@@ -214,9 +214,9 @@
     </func>
    
     <func>
-      <name>list_group_members(GroupName, Options) -> {ok, Users} | {error, Reason}</name>
-      <name>list_group_members(GroupName, Port, Dir) -> {ok, Users} | {error, Reason}</name>
-      <name>list_group_members(GroupName, Address, Port, Dir) -> {ok, Users} | {error, Reason}</name>
+      <name since="">list_group_members(GroupName, Options) -> {ok, Users} | {error, Reason}</name>
+      <name since="">list_group_members(GroupName, Port, Dir) -> {ok, Users} | {error, Reason}</name>
+      <name since="">list_group_members(GroupName, Address, Port, Dir) -> {ok, Users} | {error, Reason}</name>
       <fsummary>Lists the members of a group.</fsummary>
       <type>
         <v>GroupName = string()</v>
@@ -240,9 +240,9 @@
     </func>
 
      <func>
-      <name>list_users(Options) -> {ok, Users} | {error, Reason}</name>
-      <name>list_users(Port, Dir) -> {ok, Users} | {error, Reason}</name>
-      <name>list_users(Address, Port, Dir) -> {ok, Users} | {error, Reason}</name>
+      <name since="">list_users(Options) -> {ok, Users} | {error, Reason}</name>
+      <name since="OTP R14B01">list_users(Port, Dir) -> {ok, Users} | {error, Reason}</name>
+      <name since="">list_users(Address, Port, Dir) -> {ok, Users} | {error, Reason}</name>
       <fsummary>Lists users in the user database.</fsummary>
       <type>
         <v>Options = [Option]</v>
@@ -264,8 +264,8 @@
     </func>
     
     <func>
-      <name>update_password(Port, Dir, OldPassword, NewPassword, NewPassword) -> ok | {error, Reason}</name>
-      <name>update_password(Address,Port, Dir, OldPassword, NewPassword, NewPassword) -> ok | {error, Reason}</name>
+      <name since="">update_password(Port, Dir, OldPassword, NewPassword, NewPassword) -> ok | {error, Reason}</name>
+      <name since="">update_password(Address,Port, Dir, OldPassword, NewPassword, NewPassword) -> ok | {error, Reason}</name>
       <fsummary>Changes <c>AuthAcessPassword</c>.</fsummary>
       <type>
         <v>Port = integer()</v>
diff --git a/lib/inets/doc/src/mod_esi.xml b/lib/inets/doc/src/mod_esi.xml
index ede7dc8f7d..bc5f98068f 100644
--- a/lib/inets/doc/src/mod_esi.xml
+++ b/lib/inets/doc/src/mod_esi.xml
@@ -25,7 +25,7 @@
     <title>mod_esi</title>
     <file>mod_esi.sgml</file>
   </header>
-  <module>mod_esi</module>
+  <module since="">mod_esi</module>
   <modulesummary>Erlang Server Interface</modulesummary>
   <description>
     <p>This module defines the Erlang Server Interface (ESI) API.
@@ -88,7 +88,7 @@
 
  <funcs>
    <func>
-     <name>deliver(SessionID, Data) -> ok | {error, Reason}</name>
+     <name since="">deliver(SessionID, Data) -> ok | {error, Reason}</name>
      <fsummary>Sends <c>Data</c> back to client.</fsummary>
      <type>
         <v>SessionID = term()</v>
@@ -121,7 +121,7 @@
 
  <funcs>
    <func>
-     <name>Module:Function(SessionID, Env, Input)-> {continue, State} | _ </name>
+     <name since="">Module:Function(SessionID, Env, Input)-> {continue, State} | _ </name>
      <fsummary>Creates a dynamic web page and returns it chunk by chunk 
      to the server process by calling <c>mod_esi:deliver/2</c>.</fsummary>
      <type>
@@ -179,7 +179,7 @@
    </func>
 
    <func>
-     <name>Module:Function(Env, Input)-> Response </name>
+     <name since="">Module:Function(Env, Input)-> Response </name>
      <fsummary>Creates a dynamic web page and returns it as a list. 
      This function is deprecated and is only kept for backwards compatibility.</fsummary>
      <type>
diff --git a/lib/inets/doc/src/mod_security.xml b/lib/inets/doc/src/mod_security.xml
index 6f3f3c048a..c26d7468c2 100644
--- a/lib/inets/doc/src/mod_security.xml
+++ b/lib/inets/doc/src/mod_security.xml
@@ -29,7 +29,7 @@
     <rev>1.0</rev>
     <file>mod_security.sgml</file>
   </header>
-  <module>mod_security</module>
+  <module since="">mod_security</module>
   <modulesummary>Security Audit and Trailing Functionality</modulesummary>
   <description>
     <p>Security Audit and Trailing Functionality</p>
@@ -37,8 +37,8 @@
   <funcs>
 
       <func>
-      <name>block_user(User, Port, Dir, Seconds) -> true | {error, Reason}</name>
-      <name>block_user(User, Address, Port, Dir, Seconds) -> true | {error, Reason}</name>
+      <name since="">block_user(User, Port, Dir, Seconds) -> true | {error, Reason}</name>
+      <name since="">block_user(User, Address, Port, Dir, Seconds) -> true | {error, Reason}</name>
       <fsummary>Blocks a user from access to a directory for a certain amount of time.</fsummary>
       <type>
         <v>User = string()</v>
@@ -56,10 +56,10 @@
     </func>
     
     <func>
-      <name>list_auth_users(Port) -> Users | []</name>
-      <name>list_auth_users(Address, Port) -> Users | []</name>
-      <name>list_auth_users(Port, Dir) -> Users | []</name>
-      <name>list_auth_users(Address, Port, Dir) -> Users | []</name>
+      <name since="">list_auth_users(Port) -> Users | []</name>
+      <name since="">list_auth_users(Address, Port) -> Users | []</name>
+      <name since="">list_auth_users(Port, Dir) -> Users | []</name>
+      <name since="">list_auth_users(Address, Port, Dir) -> Users | []</name>
       <fsummary>Lists users that have authenticated within the <c>SecurityAuthTimeout</c> 
       time for a given address (if specified), port number, and directory 
       (if specified).</fsummary>
@@ -77,10 +77,10 @@
       </desc>
     </func>
     <func>
-      <name>list_blocked_users(Port) -> Users | []</name>
-      <name>list_blocked_users(Address, Port) -> Users | []</name>
-      <name>list_blocked_users(Port, Dir) -> Users | []</name>
-      <name>list_blocked_users(Address, Port, Dir) -> Users | []</name>
+      <name since="">list_blocked_users(Port) -> Users | []</name>
+      <name since="">list_blocked_users(Address, Port) -> Users | []</name>
+      <name since="">list_blocked_users(Port, Dir) -> Users | []</name>
+      <name since="">list_blocked_users(Address, Port, Dir) -> Users | []</name>
       <fsummary>Lists users that are currently blocked from access to a 
       specified port number, for a given address (if specified).</fsummary>
       <type>
@@ -97,10 +97,10 @@
     </func>
   
     <func>
-      <name>unblock_user(User, Port) -> true | {error, Reason}</name>
-      <name>unblock_user(User, Address, Port) -> true | {error, Reason}</name>
-      <name>unblock_user(User, Port, Dir) -> true | {error, Reason}</name>
-      <name>unblock_user(User, Address, Port, Dir) -> true | {error, Reason}</name>
+      <name since="">unblock_user(User, Port) -> true | {error, Reason}</name>
+      <name since="">unblock_user(User, Address, Port) -> true | {error, Reason}</name>
+      <name since="">unblock_user(User, Port, Dir) -> true | {error, Reason}</name>
+      <name since="">unblock_user(User, Address, Port, Dir) -> true | {error, Reason}</name>
       <fsummary>Removes a blocked user from the block list.</fsummary>
       <type>
         <v>User = string()</v>
@@ -129,8 +129,8 @@
 
   <funcs>
     <func>
-      <name>Module:event(What, Port, Dir, Data) -> ignored</name>
-      <name>Module:event(What, Address, Port, Dir, Data) -> ignored</name>
+      <name since="OTP 18.1">Module:event(What, Port, Dir, Data) -> ignored</name>
+      <name since="OTP 18.1">Module:event(What, Address, Port, Dir, Data) -> ignored</name>
       <fsummary>Called whenever an event occurs in <c>mod_security</c>.</fsummary>
       <type>
         <v>What = atom()</v>
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 12f5acb2e9..45533c4f4b 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,7 +33,138 @@
     <file>notes.xml</file>
   </header>
   
-  <section><title>Inets 7.0.3</title>
+  <section><title>Inets 7.0.9</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix a regression in http client that causes a crash when
+	    request URI has no scheme.</p>
+          <p>
+	    Own Id: OTP-15930 Aux Id: ERL-969 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 7.0.8</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    All incorrect (that is, all) uses of "can not" has been
+	    corrected to "cannot" in source code comments,
+	    documentation, examples, and so on.</p>
+          <p>
+	    Own Id: OTP-14282 Aux Id: PR-1891 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 7.0.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix the internal handling of the option
+	    erl_script_timeout in httpd. If explicit
+	    erl_script_timeout value was supplied in seconds it was
+	    not correctly converted to millisecond units for internal
+	    usage.</p>
+          <p>
+	    This change fixes the handling of erl_script_timeout in
+	    all possible configuration scenarios.</p>
+          <p>
+	    Own Id: OTP-15769 Aux Id: ERIERL-345 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 7.0.6</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix the internal handling of the option
+	    erl_script_timeout in httpd. When httpd was started with
+	    explicit erl_script_timeout, the value of the option was
+	    converted to milliseconds before storage. Subsequent
+	    calls to httpd:info/1 returned the input value multiplied
+	    by 1000.</p>
+          <p>
+	    This change fixes the handing of erl_script_timeout by
+	    storing the timeout in seconds and converting to
+	    milliseconds before usage.</p>
+          <p>
+	    Own Id: OTP-15669 Aux Id: ERIERL-321 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Enhance documentation</p>
+          <p>
+	    Own Id: OTP-15508 Aux Id: ERL-816 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 7.0.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed bug that causes a crash in http client when using
+	    hostnames (e.g. localhost) with the the option
+	    ipv6_host_with_brackets set to true.</p>
+          <p>
+	    This change also fixes a regression: httpc:request fails
+	    with connection error (nxdomain) if option
+	    ipv6_host_with_brackets set to true and host component of
+	    the URI is an IPv6 address.</p>
+          <p>
+	    Own Id: OTP-15554 Aux Id: ERIERL-289 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 7.0.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Make sure ipv6 addresses with brackets in URIs are
+	    converted correctly before passing to lower level
+	    functions like gen_tcp and ssl functions. Could cause
+	    connection to fail.</p>
+          <p>
+	    Own Id: OTP-15544 Aux Id: ERIERL-289 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 7.0.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
@@ -1301,7 +1432,7 @@
 	    Add option {ftp_extension, boolean} to enable use of
 	    extended commands EPSV and EPRT, as specified in RFC
 	    2428, for IPv4 instead of using the legacy commands. Ipv6
-	    can not be supported without the extended commands.</p>
+	    cannot be supported without the extended commands.</p>
           <p>
 	    Own Id: OTP-12255</p>
         </item>
diff --git a/lib/inets/doc/src/notes_history.xml b/lib/inets/doc/src/notes_history.xml
index c12899e614..1523827db9 100644
--- a/lib/inets/doc/src/notes_history.xml
+++ b/lib/inets/doc/src/notes_history.xml
@@ -1149,8 +1149,8 @@
     <list type="bulleted">
       <item>
 	<p>When further testing the functionality of https requests
-	  that goes through a proxy. We realised that alas this can
-	  not currently be supported as it requires features from
+	  that goes through a proxy. We realised that alas this
+	  cannot currently be supported as it requires features from
 	  the ssl implementation that is not currently available.
 	  So for now an error message will be returned when trying
 	  to use this functionality.</p>
diff --git a/lib/inets/examples/httpd_load_test/hdlt_slave.erl b/lib/inets/examples/httpd_load_test/hdlt_slave.erl
index 5ee005629d..30ddfd76af 100644
--- a/lib/inets/examples/httpd_load_test/hdlt_slave.erl
+++ b/lib/inets/examples/httpd_load_test/hdlt_slave.erl
@@ -44,18 +44,17 @@
 %% this to work is that the 'erl' program can be found in PATH.
 %%
 %% If the master and slave are on different hosts, start/N uses
-%% the 'rsh' program to spawn an Erlang node on the other host.
+%% the 'ssh' program to spawn an Erlang node on the other host.
 %% Alternative, if the master was started as
 %% 'erl -sname xxx -rsh my_rsh...', then 'my_rsh' will be used instead
-%% of 'rsh' (this is useful for systems where the rsh program is named
-%% 'remsh').
+%% of 'ssh' (this is useful for systems still using rsh or remsh).
 %%
 %% For this to work, the following conditions must be fulfilled:
 %%
-%% 1. There must be an Rsh program on computer; if not an error
+%% 1. There must be an ssh program on computer; if not an error
 %%    is returned.
 %%
-%% 2. The hosts must be configured to allowed 'rsh' access without
+%% 2. The hosts must be configured to allow 'ssh' access without
 %%    prompts for password.
 %%
 %% The slave node will have its filer and user server redirected
@@ -244,7 +243,7 @@ register_unique_name(Number) ->
 
 %% Makes up the command to start the nodes.
 %% If the node should run on the local host, there is
-%% no need to use rsh.
+%% no need to use ssh.
 
 mk_cmd(Host, Name, Paths, Args, Waiter, Prog) ->
     PaPaths = [[" -pa ", Path] || Path <- Paths], 
diff --git a/lib/inets/src/http_client/httpc.erl b/lib/inets/src/http_client/httpc.erl
index 24a205ced9..9967488f61 100644
--- a/lib/inets/src/http_client/httpc.erl
+++ b/lib/inets/src/http_client/httpc.erl
@@ -317,7 +317,7 @@ store_cookies(SetCookieHeaders, Url, Profile)
         {error, Bad, _} ->
             {error, {parse_failed, Bad}};
         URI ->
-            Scheme = scheme_to_atom(maps:get(scheme, URI, '')),
+            Scheme = scheme_to_atom(maps:get(scheme, URI, undefined)),
             Host = maps:get(host, URI, ""),
             Port = maps:get(port, URI, default_port(Scheme)),
             Path = uri_string:recompose(#{path => maps:get(path, URI, "")}),
@@ -536,7 +536,7 @@ handle_request(Method, Url,
             BracketedHost = proplists:get_value(ipv6_host_with_brackets,
                                                 Options),
 
-            Scheme        = scheme_to_atom(maps:get(scheme, URI, '')),
+            Scheme        = scheme_to_atom(maps:get(scheme, URI, undefined)),
             Userinfo      = maps:get(userinfo, URI, ""),
             Host          = http_util:maybe_add_brackets(maps:get(host, URI, ""), BracketedHost),
             Port          = maps:get(port, URI, default_port(Scheme)),
@@ -591,8 +591,8 @@ scheme_to_atom("http") ->
     http;
 scheme_to_atom("https") ->
     https;
-scheme_to_atom('') ->
-    '';
+scheme_to_atom(undefined) ->
+    throw({error, {no_scheme}});
 scheme_to_atom(Scheme) ->
     throw({error, {bad_scheme, Scheme}}).
 
diff --git a/lib/inets/src/http_client/httpc_cookie.erl b/lib/inets/src/http_client/httpc_cookie.erl
index cbf428ab3e..2e647a1438 100644
--- a/lib/inets/src/http_client/httpc_cookie.erl
+++ b/lib/inets/src/http_client/httpc_cookie.erl
@@ -271,7 +271,7 @@ lookup_cookies(CookieDb, Host, Path) ->
 lookup_domain_cookies(_CookieDb, [], AccCookies) ->
     lists:flatten(AccCookies);
 
-%% Top domains can not have cookies
+%% Top domains cannot have cookies
 lookup_domain_cookies(_CookieDb, [_], AccCookies) ->
     lists:flatten(AccCookies);
 
diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl
index 1bf5d25c98..8d443a1477 100644
--- a/lib/inets/src/http_client/httpc_handler.erl
+++ b/lib/inets/src/http_client/httpc_handler.erl
@@ -809,7 +809,7 @@ connect_and_send_first_request(Address, Request, #state{options = Options0} = St
     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
+    case connect(SocketType, format_address(Address), Options, ConnTimeout) of
         {ok, Socket} ->
             ClientClose =
 		httpc_request:is_client_closing(
@@ -1738,4 +1738,8 @@ update_session(ProfileName, #session{id = SessionId} = Session, Pos, Value) ->
                      {stacktrace, Stacktrace}]}}
     end.
 
-
+format_address({[$[|T], Port}) ->
+    {ok, Address} = inet:parse_address(string:strip(T, right, $])),
+    {Address, Port};
+format_address(HostPort) ->
+    HostPort.
diff --git a/lib/inets/src/http_client/httpc_manager.erl b/lib/inets/src/http_client/httpc_manager.erl
index 0333442bf2..0dc0483fa9 100644
--- a/lib/inets/src/http_client/httpc_manager.erl
+++ b/lib/inets/src/http_client/httpc_manager.erl
@@ -863,7 +863,7 @@ select_session(Candidates, _, Max, pipeline) ->
     select_session(Candidates, Max).
 
 select_session([] = _Candidates, _Max) ->
-    ?hcrd("select session - no candicate", []),
+    ?hcrd("select session - no candidate", []),
     no_connection; 
 select_session(Candidates, Max) ->
     NewCandidates = 
diff --git a/lib/inets/src/http_client/httpc_response.erl b/lib/inets/src/http_client/httpc_response.erl
index 78d6b4ed24..bb6b76da89 100644
--- a/lib/inets/src/http_client/httpc_response.erl
+++ b/lib/inets/src/http_client/httpc_response.erl
@@ -398,7 +398,7 @@ redirect(Response = {_, Headers, _}, Request) ->
                     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, ""),
+                    TQuery = add_question_mark(maps:get(query, URIMap, "")),
                     NewURI = uri_string:normalize(
                                uri_string:recompose(URIMap)),
                     HostPort = http_request:normalize_host(TScheme, THost, TPort),
@@ -417,6 +417,14 @@ redirect(Response = {_, Headers, _}, Request) ->
             end
     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].
 
 %% RFC3986 - 5.2.2.  Transform References
 resolve_uri(Scheme, Host, Port, Path, Query, URI) ->
diff --git a/lib/inets/src/http_server/httpd_example.erl b/lib/inets/src/http_server/httpd_example.erl
index 37e4f97bc0..aaa7e428c2 100644
--- a/lib/inets/src/http_server/httpd_example.erl
+++ b/lib/inets/src/http_server/httpd_example.erl
@@ -24,7 +24,7 @@
 
 -export([newformat/3, post_chunked/3, post_204/3]).
 %% These are used by the inets test-suite
--export([delay/1, chunk_timeout/3]).
+-export([delay/1, chunk_timeout/3, get_chunks/3]).
 
 
 print(String) ->
@@ -196,3 +196,22 @@ chunk_timeout(SessionID, _, _StrInt) ->
     mod_esi:deliver(SessionID, top("Test chunk encoding timeout")),
     timer:sleep(20000),
     mod_esi:deliver(SessionID, footer()).
+
+get_chunks(Sid, _Env, In) ->
+    Tokens = string:tokens(In, [$&]),
+    PropList = lists:map(fun(E) ->
+                                 list_to_tuple(string:tokens(E,[$=])) end,
+                         Tokens),
+    HeaderDelay =
+        list_to_integer(proplists:get_value("header_delay", PropList, "0")),
+    ChunkDelay =
+        list_to_integer(proplists:get_value("chunk_delay", PropList, "0")),
+    BadChunkDelay =
+        list_to_integer(proplists:get_value("bad_chunk_delay", PropList, "0")),
+    timer:sleep(HeaderDelay),
+    mod_esi:deliver(Sid, ["Content-Type: text/plain\r\n\r\n"]),
+    mod_esi:deliver(Sid, "Chunk 0 ms\r\n"),
+    timer:sleep(ChunkDelay),
+    mod_esi:deliver(Sid, io_lib:format("Chunk ~p ms\r\n", [ChunkDelay])),
+    timer:sleep(ChunkDelay + BadChunkDelay),
+    mod_esi:deliver(Sid, "BAD Chunk\r\n").
diff --git a/lib/inets/src/http_server/httpd_request.erl b/lib/inets/src/http_server/httpd_request.erl
index 9d7538a13d..f3e24263b8 100644
--- a/lib/inets/src/http_server/httpd_request.erl
+++ b/lib/inets/src/http_server/httpd_request.erl
@@ -196,9 +196,9 @@ parse_headers(<<?CR,?LF,?LF,Body/binary>>, [], [], Current, Max, Options, Result
     parse_headers(<<?CR,?LF,?CR,?LF,Body/binary>>, [], [], Current, Max,  
 		  Options, Result);
 
-parse_headers(<<?LF,?LF,Body/binary>>, [], [], Current, Max,  Options, Result) ->
+parse_headers(<<?LF,?LF,Body/binary>>, Header, Headers, Current, Max,  Options, Result) ->
     %% If ?CR is is missing RFC2616 section-19.3 
-    parse_headers(<<?CR,?LF,?CR,?LF,Body/binary>>, [], [], Current, Max, 
+    parse_headers(<<?CR,?LF,?CR,?LF,Body/binary>>, Header, Headers, Current, Max, 
 		  Options, Result);
 
 parse_headers(<<?CR,?LF,?CR,?LF,Body/binary>>, [], [], _, _,  _, Result) ->
diff --git a/lib/inets/src/http_server/mod_esi.erl b/lib/inets/src/http_server/mod_esi.erl
index 443b7ee564..8cbd9798e6 100644
--- a/lib/inets/src/http_server/mod_esi.erl
+++ b/lib/inets/src/http_server/mod_esi.erl
@@ -33,7 +33,7 @@
 -include("httpd_internal.hrl").
 
 -define(VMODULE,"ESI").
--define(DEFAULT_ERL_TIMEOUT,15000).
+-define(DEFAULT_ERL_TIMEOUT,15).
 
 
 %%%=========================================================================
@@ -119,7 +119,7 @@ load("EvalScriptAlias " ++ EvalScriptAlias, []) ->
 load("ErlScriptTimeout " ++ Timeout, [])->
     case catch list_to_integer(string:strip(Timeout)) of
 	TimeoutSec when is_integer(TimeoutSec)  ->
-	   {ok, [], {erl_script_timeout, TimeoutSec * 1000}};
+	   {ok, [], {erl_script_timeout, TimeoutSec}};
 	_ ->
 	   {error, ?NICE(string:strip(Timeout) ++
 			 " is an invalid ErlScriptTimeout")}
@@ -174,7 +174,7 @@ store({erl_script_alias, Value}, _) ->
     {error, {wrong_type, {erl_script_alias, Value}}};
 store({erl_script_timeout, TimeoutSec}, _) 
   when is_integer(TimeoutSec) andalso (TimeoutSec >= 0) ->
-    {ok, {erl_script_timeout, TimeoutSec * 1000}};
+    {ok, {erl_script_timeout, TimeoutSec}};
 store({erl_script_timeout, Value}, _) ->
     {error, {wrong_type, {erl_script_timeout, Value}}};
 store({erl_script_nocache, Value} = Conf, _) 
@@ -500,7 +500,7 @@ kill_esi_delivery_process(Pid) ->
 	
 
 erl_script_timeout(Db) ->
-    httpd_util:lookup(Db, erl_script_timeout, ?DEFAULT_ERL_TIMEOUT).
+    httpd_util:lookup(Db, erl_script_timeout, ?DEFAULT_ERL_TIMEOUT) * 1000.
 
 script_elements(FuncAndInput, Input) ->
     case input_type(FuncAndInput) of
diff --git a/lib/inets/src/http_server/mod_responsecontrol.erl b/lib/inets/src/http_server/mod_responsecontrol.erl
index 07129940a5..a32ba65c22 100644
--- a/lib/inets/src/http_server/mod_responsecontrol.erl
+++ b/lib/inets/src/http_server/mod_responsecontrol.erl
@@ -71,7 +71,7 @@ do_responsecontrol(Info) ->
 
 
 %% If a client sends more then one of the if-XXXX fields in a request
-%% The standard says it does not specify the behaviuor so I specified it :-)
+%% The standard says it does not specify the behaviour so I specified it :-)
 %% The priority between the fields is 
 %% 1.If-modified
 %% 2.If-Unmodified
diff --git a/lib/inets/test/http_format_SUITE.erl b/lib/inets/test/http_format_SUITE.erl
index d6b0e5f9f5..3ff3ed4e97 100644
--- a/lib/inets/test/http_format_SUITE.erl
+++ b/lib/inets/test/http_format_SUITE.erl
@@ -414,6 +414,19 @@ http_request(Config) when is_list(Config) ->
 				      {max_content_length, ?HTTP_MAX_CONTENT_LENGTH}
 				     ]], HttpHead2),
 
+    %% If ?CR is is missing RFC2616 section-19.3
+    HttpHead3 = ["GET http://www.erlang.org HTTP/1.1", [?LF],
+                 "Accept: text/html", [?LF, ?LF]],
+    {"GET",
+     "http://www.erlang.org",
+     "HTTP/1.1",
+     {#http_request_h{}, [{"accept","text/html"}]}, <<>>} =
+	parse(httpd_request, parse, [[{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}
+				     ]], HttpHead3),
+
     %% Note the following body is not related to the headers above
     HttpBody = ["<HTML>\n<HEAD>\n<TITLE> dummy </TITLE>\n</HEAD>\n<BODY>\n",
 		"<H1>dummy</H1>\n</BODY>\n</HTML>\n"],
@@ -435,7 +448,7 @@ http_request(Config) when is_list(Config) ->
 			[<<>>, Length1], HttpBody1)).
 %%-------------------------------------------------------------------------
 validate_request_line() ->
-    [{doc, "Test httpd_request:validate/3. Makes sure you can not get past"
+    [{doc, "Test httpd_request:validate/3. Makes sure you cannot get past"
      " the server_root and that the request is recognized by the server"
      " and protcol version."}].
 validate_request_line(Config) when is_list(Config) ->
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index 8357e02014..8ca4f21928 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -106,7 +106,8 @@ real_requests()->
      streaming_error,
      inet_opts,
      invalid_headers,
-     invalid_body
+     invalid_body,
+     no_scheme
     ].
 
 real_requests_esi() ->
@@ -339,14 +340,6 @@ end_per_testcase(Case, Config)
 end_per_testcase(_Case, _Config) ->
     ok.
 
-is_ipv6_supported() ->
-    case gen_udp:open(0, [inet6]) of
-        {ok, Socket} ->
-            gen_udp:close(Socket),
-            true;
-        _ ->
-            false
-    end.
 
 
 %%--------------------------------------------------------------------
@@ -1239,6 +1232,16 @@ invalid_body(Config) ->
 	    ok
     end.
 
+
+%%-------------------------------------------------------------------------
+
+no_scheme(_Config) ->
+    {error,{bad_scheme,"ftp"}} = httpc:request("ftp://foobar"),
+    {error,{no_scheme}} = httpc:request("//foobar"),
+    {error,{no_scheme}} = httpc:request("foobar"),
+    ok.
+
+
 %%-------------------------------------------------------------------------
 remote_socket_close(Config) when is_list(Config) ->
     URL = url(group_name(Config), "/just_close.html", Config),
@@ -1612,7 +1615,8 @@ post_with_content_type(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 request_options() ->
-    [{doc, "Test http get request with socket options against local server (IPv6)"}].
+    [{require, ipv6_hosts},
+     {doc, "Test http get request with socket options against local server (IPv6)"}].
 request_options(Config) when is_list(Config) ->
     Request  = {url(group_name(Config), "/dummy.html", Config), []},
     {ok, {{_,200,_}, [_ | _], _ = [_ | _]}} = httpc:request(get, Request, [],
@@ -2187,7 +2191,7 @@ check_cookie([_Head | Tail]) ->
 
 content_length([]) ->
     0;
-content_length(["content-length:" ++ Value | _]) ->
+content_length([{"content-length", Value}|_]) ->
     list_to_integer(string:strip(Value));
 content_length([_Head | Tail]) ->
    content_length(Tail).
@@ -2945,3 +2949,12 @@ receive_stream_n(Ref, N) ->
 	    ct:pal("Data:  ~p", [Data]),
 	    receive_stream_n(Ref, N-1)
     end.
+
+is_ipv6_supported() ->
+    {ok, Hostname0} = inet:gethostname(),
+    try 
+        lists:member(list_to_atom(Hostname0), ct:get_config(ipv6_hosts))
+    catch
+         _: _ ->
+            false
+    end.
diff --git a/lib/inets/test/httpc_proxy_SUITE.erl b/lib/inets/test/httpc_proxy_SUITE.erl
index 198b245399..3ee7981660 100644
--- a/lib/inets/test/httpc_proxy_SUITE.erl
+++ b/lib/inets/test/httpc_proxy_SUITE.erl
@@ -534,7 +534,7 @@ init_local_proxy(Config) ->
 		    ct:fail({local_proxy_start_failed,Error})
 	    end;
 	_ ->
-	    {skip,"Platform can not run local proxy start script"}
+	    {skip,"Platform cannot run local proxy start script"}
     end.
 
 init_local_proxy_string(String, Config) ->
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl
index 5b6740fba3..fc5ca14dcd 100644
--- a/lib/inets/test/httpd_SUITE.erl
+++ b/lib/inets/test/httpd_SUITE.erl
@@ -78,7 +78,11 @@ all() ->
      {group, http_rel_path_script_alias},
      {group, http_not_sup},
      {group, https_not_sup},
-     mime_types_format
+     mime_types_format,
+     erl_script_timeout_default,
+     erl_script_timeout_option,
+     erl_script_timeout_proplist,
+     erl_script_timeout_apache
     ].
 
 groups() ->
@@ -383,6 +387,10 @@ init_per_testcase(disk_log_bad_file, Config0) ->
     ct:timetrap({seconds, 20}),
     dbg(disk_log_internal, Config1, init);
 
+init_per_testcase(erl_script_timeout_default, Config) ->
+    ct:timetrap({seconds, 60}),
+    dbg(erl_script_timeout_default, Config, init);
+
 init_per_testcase(Case, Config) ->
     ct:timetrap({seconds, 20}),
     dbg(Case, Config, init).
@@ -1776,6 +1784,130 @@ mime_types_format(Config) when is_list(Config) ->
      {"cpt","application/mac-compactpro"},
      {"hqx","application/mac-binhex40"}]} = httpd_conf:load_mime_types(MimeTypes).
 
+erl_script_timeout_default(Config) when is_list(Config) ->
+    inets:start(),
+    {ok, Pid} =	inets:start(httpd,
+                            [{port, 0},
+                             {server_name,"localhost"},
+                             {server_root,"./"},
+                             {document_root,"./"},
+                             {bind_address, any},
+                             {mimetypes, [{"html", "text/html"}]},
+                             {modules,[mod_esi]},
+                             {erl_script_alias, {"/erl", [httpd_example]}}
+                            ]),
+    Info = httpd:info(Pid),
+
+    Port = proplists:get_value(port, Info),
+
+    %% Default erl_script_timeout is 15.
+    %% Verify:  13 =< erl_script_timeout =< 17
+    Url = http_get_url(Port, 500, 13000, 4000),
+
+    {ok, {_, _, Body}} = httpc:request(get, {Url, []}, [{timeout, 45000}], []),
+    ct:log("Response: ~p~n", [Body]),
+    verify_body(Body, 13000),
+    inets:stop().
+
+erl_script_timeout_option(Config) when is_list(Config) ->
+    inets:start(),
+    {ok, Pid} =	inets:start(httpd,
+                            [{port, 0},
+                             {server_name,"localhost"},
+                             {server_root,"./"},
+                             {document_root,"./"},
+                             {bind_address, any},
+                             {mimetypes, [{"html", "text/html"}]},
+                             {modules,[mod_esi]},
+                             {erl_script_timeout, 2},
+                             {erl_script_alias, {"/erl", [httpd_example]}}
+                            ]),
+    Info = httpd:info(Pid),
+    verify_timeout(Info, 2),
+
+    Port = proplists:get_value(port, Info),
+
+    %% Verify:  1 =< erl_script_timeout =< 3
+    Url = http_get_url(Port, 500, 1000, 2000),
+
+    {ok, {_, _, Body}} = httpc:request(Url),
+    ct:log("Response: ~p~n", [Body]),
+    verify_body(Body, 1000),
+    inets:stop().
+
+erl_script_timeout_proplist(Config) when is_list(Config) ->
+    HttpdConf = filename:join(get_tmp_dir(Config),
+                              "httpd_erl_script_timeout_proplist.conf"),
+    ServerConfig =
+        "[{port, 0},\n" ++
+        " {server_name,\"localhost\"},\n" ++
+        " {server_root,\"./\"},\n" ++
+        " {document_root,\"./\"},\n" ++
+        " {bind_address, any},\n" ++
+        " {mimetypes, [{\"html\", \"text/html\"}]},\n" ++
+        " {modules,[mod_esi]},\n" ++
+        " {erl_script_timeout, 5},\n" ++
+        " {erl_script_alias, {\"/erl\", [httpd_example]}}\n" ++
+        "].",
+    ok = file:write_file(HttpdConf, ServerConfig),
+
+    inets:start(),
+    {ok, Pid} =	inets:start(httpd,
+                            [{proplist_file, HttpdConf}]),
+    Info = httpd:info(Pid),
+    verify_timeout(Info, 5),
+
+    Port = proplists:get_value(port, Info),
+
+    %% Verify:  3 =< erl_script_timeout =< 7
+    Url = http_get_url(Port, 500, 3000, 4000),
+
+    {ok, {_, _, Body}} = httpc:request(Url),
+    ct:log("Response: ~p~n", [Body]),
+    verify_body(Body, 3000),
+    inets:stop().
+
+erl_script_timeout_apache(Config) when is_list(Config) ->
+    HttpdConf = filename:join(get_tmp_dir(Config),
+                              "httpd_erl_script_timeout.conf"),
+    MimeTypes = filename:join(get_tmp_dir(Config),
+                              "erl_script_timeout_mime_types.conf"),
+
+    MimeTypesConf =
+        "html\n" ++
+        "text/html\n",
+
+    ok = file:write_file(MimeTypes, MimeTypesConf),
+
+    ServerConfig =
+        "Port 0\n" ++
+        "ServerName localhost\n" ++
+        "ServerRoot ./\n" ++
+        "DocumentRoot ./\n" ++
+        "BindAddress 0.0.0.0\n" ++
+        "MimeTypes " ++ MimeTypes ++ "\n" ++
+        "Modules mod_esi\n" ++
+        "ErlScriptTimeout 8\n" ++
+        "ErlScriptAlias /erl httpd_example\n",
+
+    ok = file:write_file(HttpdConf, ServerConfig),
+
+    inets:start(),
+    {ok, Pid} =	inets:start(httpd,
+                            [{file, HttpdConf}]),
+    Info = httpd:info(Pid),
+    verify_timeout(Info, 8),
+
+    Port = proplists:get_value(port, Info),
+
+    %% Verify:  6 =< erl_script_timeout =< 10
+    Url = http_get_url(Port, 500, 6000, 4000),
+
+    {ok, {_, _, Body}} = httpc:request(Url),
+    ct:log("Response: ~p~n", [Body]),
+    verify_body(Body, 6000),
+    inets:stop().
+
 
 %%--------------------------------------------------------------------
 %% Internal functions -----------------------------------
@@ -1785,6 +1917,38 @@ url(http, End, Config) ->
     {ok,Host} = inet:gethostname(),
     ?URL_START ++ Host ++ ":" ++ integer_to_list(Port) ++ End.
 
+http_get_url(Port0, HeaderDelay, ChunkDelay, BadChunkDelay) ->
+    {ok, Host} = inet:gethostname(),
+    Port = integer_to_list(Port0),
+    HD = integer_to_list(HeaderDelay),
+    CD = integer_to_list(ChunkDelay),
+    BD = integer_to_list(BadChunkDelay),
+    "http://" ++ Host ++ ":" ++ Port ++
+        "/erl/httpd_example/get_chunks?header_delay=" ++ HD ++
+        "&chunk_delay=" ++ CD ++
+        "&bad_chunk_delay=" ++ BD.
+
+verify_body(Body, Timeout0) ->
+    Timeout = integer_to_list(Timeout0),
+    Res = string:find(Body, Timeout),
+    ct:log("Result: ~p~n", [Res]),
+    %% Fail if BAD chunk is found.
+    case Res =:= Timeout ++ " ms\r\n" of
+        true ->
+            ok;
+        false ->
+            ct:fail("Unexpected chunk received!")
+    end.
+
+verify_timeout(Info, Expected) ->
+    Timeout = proplists:get_value(erl_script_timeout, Info),
+    case Timeout =:= Expected of
+        true ->
+            ok;
+        false ->
+            ct:fail("Bad Timeout - Expected: ~p Got: ~p", [Expected, Timeout])
+    end.
+
 do_max_clients(Config) ->
     Version = proplists:get_value(http_version, Config),
     Host    = proplists:get_value(host, Config),
diff --git a/lib/inets/test/httpd_bench_SUITE.erl b/lib/inets/test/httpd_bench_SUITE.erl
index 4b549dcb5b..087516f56c 100644
--- a/lib/inets/test/httpd_bench_SUITE.erl
+++ b/lib/inets/test/httpd_bench_SUITE.erl
@@ -37,7 +37,8 @@
 %% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
 suite() -> 
-    [{ct_hooks,[{ts_install_cth,[{nodenames,2}]}]}].
+    [{timetrap, {minutes, 1}},
+     {ct_hooks,[{ts_install_cth,[{nodenames,2}]}]}].
 
 all() -> 
     [
@@ -499,8 +500,8 @@ start_dummy("http"= Protocol, 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)}},
+	    {big, {gen,  crypto:strong_rand_bytes(1000000)}},
+	    {small, {gen,  crypto:strong_rand_bytes(1000)}},
 	    {http_version, HTTPVersion},
 	    {keep_alive,  ?config(keep_alive, Config)}
 	   ],
@@ -519,8 +520,8 @@ start_dummy("https" = Protocol, 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)}},
+	    {big, {gen, crypto:strong_rand_bytes(1000000)}},
+	    {small, {gen, crypto:strong_rand_bytes(1000)}},
 	    {http_version, HTTPVersion},
 	    {keep_alive, ?config(keep_alive, Config)}
 	   ],
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index 52c05a7974..d948204618 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = inets
-INETS_VSN   = 7.0.3
+INETS_VSN   = 7.0.9
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
diff --git a/lib/jinterface/doc/src/Makefile b/lib/jinterface/doc/src/Makefile
index d80bb38ec1..f5cba9d074 100644
--- a/lib/jinterface/doc/src/Makefile
+++ b/lib/jinterface/doc/src/Makefile
@@ -137,6 +137,7 @@ clean clean_docs:
 jdoc:$(JAVA_SRC_FILES)
 	(cd ../../java_src;$(JAVADOC) -sourcepath . -d $(JAVADOC_DEST) \
 		-windowtitle $(JAVADOC_TITLE) $(JAVADOC_PKGS))
+	touch jdoc
 
 man:
 
@@ -152,15 +153,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_docs_spec: docs
 	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
 	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html/java/$(JAVA_PKG_PATH)"
 	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
-	($(CP) -rf  ../html "$(RELSYSDIR)/doc")
-
-#	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \
-#		"$(RELSYSDIR)/doc/html"
-#	$(INSTALL_DATA) $(JAVA_EXTRA_FILES) "$(RELSYSDIR)/doc/html/java"
-#	$(INSTALL_DATA) $(TOP_HTML_FILES) "$(RELSYSDIR)/doc"
+	$(INSTALL_DIR_DATA) $(HTMLDIR) "$(RELSYSDIR)/doc/html"
 
 
 release_spec:
diff --git a/lib/jinterface/doc/src/jinterface_users_guide.xml b/lib/jinterface/doc/src/jinterface_users_guide.xml
index 56f88124bf..504c77f339 100644
--- a/lib/jinterface/doc/src/jinterface_users_guide.xml
+++ b/lib/jinterface/doc/src/jinterface_users_guide.xml
@@ -366,20 +366,20 @@ OtpNode node = new OtpNode("gurka");    </code>
       <seealso marker="java/com/ericsson/otp/erlang/OtpEpmd">OtpEpmd</seealso> class.
       Nodes wishing to contact other nodes must first request information 
       from Epmd before a connection can be set up, however this is done automatically 
-      by <seealso marker="java/com/ericsson/otp/erlang/OtpSelf#connect(com.ericsson.otp.erlang.OtpPeer)">OtpSelf.connect()</seealso> when necessary. </p>
-    <p>When you use <seealso marker="java/com/ericsson/otp/erlang/OtpSelf#connect(com.ericsson.otp.erlang.OtpPeer)">OtpSelf.connect()</seealso> to connect to an Erlang node, 
+      by <seealso marker="java/com/ericsson/otp/erlang/OtpSelf#connect-com.ericsson.otp.erlang.OtpPeer-">OtpSelf.connect()</seealso> when necessary. </p>
+    <p>When you use <seealso marker="java/com/ericsson/otp/erlang/OtpSelf#connect-com.ericsson.otp.erlang.OtpPeer-">OtpSelf.connect()</seealso> to connect to an Erlang node, 
       a connection is first made to epmd and, if the node is known, a
       connection is then made to the Erlang node.</p>
     <p>Java nodes can also register themselves with epmd if they want other
       nodes in the system to be able to find and connect to them.
-      This is done by call to method <seealso marker="java/com/ericsson/otp/erlang/OtpEpmd#publishPort(com.ericsson.otp.erlang.OtpLocalNode)">OtpEpmd.publishPort()</seealso>.</p>
+      This is done by call to method <seealso marker="java/com/ericsson/otp/erlang/OtpEpmd#publishPort-com.ericsson.otp.erlang.OtpLocalNode-">OtpEpmd.publishPort()</seealso>.</p>
     <p>Be aware that on some systems (such as VxWorks), a failed node will
       not be detected by this mechanism since the operating system does not
       automatically close descriptors that were left open when the node
       failed. If a node has failed in this way, epmd will prevent you from
       registering a new node with the old name, since it thinks that the old
       name is still in use. In this case, you must unregister the name
-      explicitly, by using <seealso marker="java/com/ericsson/otp/erlang/OtpEpmd#unPublishPort(com.ericsson.otp.erlang.OtpLocalNode)">OtpEpmd.unPublishPort()</seealso></p>
+      explicitly, by using <seealso marker="java/com/ericsson/otp/erlang/OtpEpmd#unPublishPort-com.ericsson.otp.erlang.OtpLocalNode-">OtpEpmd.unPublishPort()</seealso></p>
     <p>This will cause epmd to close the connection from the far end. Note
       that if the name was in fact still in use by a node, the results of
       this operation are unpredictable. Also, doing this does not cause the
diff --git a/lib/jinterface/doc/src/notes.xml b/lib/jinterface/doc/src/notes.xml
index 75a2364384..e79ada47f1 100644
--- a/lib/jinterface/doc/src/notes.xml
+++ b/lib/jinterface/doc/src/notes.xml
@@ -31,6 +31,42 @@
   </header>
   <p>This document describes the changes made to the Jinterface application.</p>
 
+<section><title>Jinterface 1.10</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    All incorrect (that is, all) uses of "can not" has been
+	    corrected to "cannot" in source code comments,
+	    documentation, examples, and so on.</p>
+          <p>
+	    Own Id: OTP-14282 Aux Id: PR-1891 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>Added support to receive export funs (<c>fun
+	    M:F/A</c>).</p>
+	    <p>Before this change, export funs sent to a jinterface
+	    node were encoded using an undocumented fallback tuple
+	    format <c>{M,F}</c>. Existing jinterface implementations
+	    expecting these tuples must be changed to instead use the
+	    existing <c>OtpErlangExternalFun</c> class.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15774 Aux Id: OTP-15712 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Jinterface 1.9.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -720,7 +756,7 @@
         <item>
           <p><c>OtpMbox.receive()</c> and <c>OtpMbox.receive(long timeout)</c> can now throw
             <c>OtpErlangDecodeException</c> if the received message
-            can not be decoded. <c>null</c> is now only returned from
+            cannot be decoded. <c>null</c> is now only returned from
             <c>OtpMbox.receive(long timeout)</c> if a timeout occurs.
             <c>OtpMbox.receive()</c> will never return <c>null</c>.</p>
           <p>*** POTENTIAL INCOMPATIBILITY ***</p>
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java
index 222330654a..c3f71a84f0 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java
@@ -89,7 +89,7 @@ public class AbstractNode implements OtpTransportFactory {
     static final int dFlagHiddenAtomCache = 0x40; // NOT SUPPORTED
     static final int dflagNewFunTags = 0x80;
     static final int dFlagExtendedPidsPorts = 0x100;
-    static final int dFlagExportPtrTag = 0x200; // NOT SUPPORTED
+    static final int dFlagExportPtrTag = 0x200;
     static final int dFlagBitBinaries = 0x400;
     static final int dFlagNewFloats = 0x800;
     static final int dFlagUnicodeIo = 0x1000;
@@ -105,6 +105,7 @@ public class AbstractNode implements OtpTransportFactory {
     int flags = dFlagExtendedReferences | dFlagExtendedPidsPorts
             | dFlagBitBinaries | dFlagNewFloats | dFlagFunTags
             | dflagNewFunTags | dFlagUtf8Atoms | dFlagMapTag
+            | dFlagExportPtrTag
 	    | dFlagBigCreation;
 
     /* initialize hostname and default cookie */
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpEpmd.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpEpmd.java
index 363fdb950a..fffb8475d3 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpEpmd.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpEpmd.java
@@ -102,7 +102,7 @@ public class OtpEpmd {
     /**
      * Set the port number to be used to contact the epmd process. Only needed
      * when the default port is not desired and system environment variable
-     * ERL_EPMD_PORT can not be read (applet).
+     * ERL_EPMD_PORT cannot be read (applet).
      */
     public static void useEpmdPort(final int port) {
         EpmdPort.set(port);
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpInputStream.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpInputStream.java
index ded8f6e1e5..6d81ce630b 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpInputStream.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpInputStream.java
@@ -601,7 +601,7 @@ public class OtpInputStream extends ByteArrayInputStream {
      * @return the integer value.
      *
      * @exception OtpErlangDecodeException
-     *                if the next term in the stream can not be represented as a
+     *                if the next term in the stream cannot be represented as a
      *                positive integer.
      */
     public int read_uint() throws OtpErlangDecodeException {
@@ -622,7 +622,7 @@ public class OtpInputStream extends ByteArrayInputStream {
      * @return the integer value.
      *
      * @exception OtpErlangDecodeException
-     *                if the next term in the stream can not be represented as
+     *                if the next term in the stream cannot be represented as
      *                an integer.
      */
     public int read_int() throws OtpErlangDecodeException {
@@ -643,7 +643,7 @@ public class OtpInputStream extends ByteArrayInputStream {
      * @return the short value.
      *
      * @exception OtpErlangDecodeException
-     *                if the next term in the stream can not be represented as a
+     *                if the next term in the stream cannot be represented as a
      *                positive short.
      */
     public short read_ushort() throws OtpErlangDecodeException {
@@ -664,7 +664,7 @@ public class OtpInputStream extends ByteArrayInputStream {
      * @return the short value.
      *
      * @exception OtpErlangDecodeException
-     *                if the next term in the stream can not be represented as a
+     *                if the next term in the stream cannot be represented as a
      *                short.
      */
     public short read_short() throws OtpErlangDecodeException {
@@ -685,7 +685,7 @@ public class OtpInputStream extends ByteArrayInputStream {
      * @return the long value.
      *
      * @exception OtpErlangDecodeException
-     *                if the next term in the stream can not be represented as a
+     *                if the next term in the stream cannot be represented as a
      *                positive long.
      */
     public long read_ulong() throws OtpErlangDecodeException {
@@ -698,7 +698,7 @@ public class OtpInputStream extends ByteArrayInputStream {
      * @return the long value.
      *
      * @exception OtpErlangDecodeException
-     *                if the next term in the stream can not be represented as a
+     *                if the next term in the stream cannot be represented as a
      *                long.
      */
     public long read_long() throws OtpErlangDecodeException {
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMbox.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMbox.java
index 42e178c3f6..29a8bc1540 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMbox.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpMbox.java
@@ -156,7 +156,7 @@ public class OtpMbox {
      *         of the next message waiting in this mailbox.
      *
      * @exception OtpErlangDecodeException
-     *                if the message can not be decoded.
+     *                if the message cannot be decoded.
      *
      * @exception OtpErlangExit
      *                if a linked {@link OtpErlangPid pid} has exited or has
@@ -184,7 +184,7 @@ public class OtpMbox {
      *         of the next message waiting in this mailbox.
      *
      * @exception OtpErlangDecodeException
-     *                if the message can not be decoded.
+     *                if the message cannot be decoded.
      *
      * @exception OtpErlangExit
      *                if a linked {@link OtpErlangPid pid} has exited or has
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java
index 187705a0b5..5e777c1164 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java
@@ -106,9 +106,9 @@ public class OtpOutputStream extends ByteArrayOutputStream {
     }
 
     /**
-     * Trims the capacity of this <tt>OtpOutputStream</tt> instance to be the
+     * Trims the capacity of this <code>OtpOutputStream</code> instance to be the
      * buffer's current size. An application can use this operation to minimize
-     * the storage of an <tt>OtpOutputStream</tt> instance.
+     * the storage of an <code>OtpOutputStream</code> instance.
      */
     public void trimToSize() {
         resize(super.count);
@@ -125,7 +125,7 @@ public class OtpOutputStream extends ByteArrayOutputStream {
     }
 
     /**
-     * Increases the capacity of this <tt>OtpOutputStream</tt> instance, if
+     * Increases the capacity of this <code>OtpOutputStream</code> instance, if
      * necessary, to ensure that it can hold at least the number of elements
      * specified by the minimum capacity argument.
      *
@@ -939,7 +939,7 @@ public class OtpOutputStream extends ByteArrayOutputStream {
      * @param o
      *            the Erlang term to write.
      * @param level
-     *            the compression level (<tt>0..9</tt>)
+     *            the compression level (<code>0..9</code>)
      */
     public void write_compressed(final OtpErlangObject o, final int level) {
         @SuppressWarnings("resource")
diff --git a/lib/jinterface/test/nc_SUITE.erl b/lib/jinterface/test/nc_SUITE.erl
index 4f225a396e..7833d070b7 100644
--- a/lib/jinterface/test/nc_SUITE.erl
+++ b/lib/jinterface/test/nc_SUITE.erl
@@ -142,7 +142,8 @@ fun_roundtrip(Config) when is_list(Config)->
     do_echo([fun(A, B) -> A + B end,
 	     fun(A) -> lists:reverse(A) end,
 	     fun() -> ok end,
-	     fun fun_roundtrip/1],
+	     fun fun_roundtrip/1,
+             fun ?MODULE:fun_roundtrip/1],
 	    Config).
 
 port_roundtrip(doc) -> [];
diff --git a/lib/jinterface/vsn.mk b/lib/jinterface/vsn.mk
index a8dc815145..95c7c95726 100644
--- a/lib/jinterface/vsn.mk
+++ b/lib/jinterface/vsn.mk
@@ -1 +1 @@
-JINTERFACE_VSN = 1.9.1
+JINTERFACE_VSN = 1.10
diff --git a/lib/kernel/doc/src/Makefile b/lib/kernel/doc/src/Makefile
index f8867ccf25..70623ab9aa 100644
--- a/lib/kernel/doc/src/Makefile
+++ b/lib/kernel/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2018. All Rights Reserved.
+# Copyright Ericsson AB 1997-2019. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -36,6 +36,18 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 # Target Specs
 # ----------------------------------------------------
 XML_APPLICATION_FILES = ref_man.xml
+
+# The doc build has problems with if-defing out modules...
+ifeq ($(USE_ESOCK),yes)
+XML_REF3_ESOCK_FILES = net.xml
+ESOCK_USE_NET_XML=<xi:include href="net.xml"\/>
+ESOCK_USE_NET_SPECS_XML=<xi:include href="../specs/specs_net.xml"/>
+else
+XML_REF3_ESOCK_FILES =
+ESOCK_USE_NET_SPECS_XML =
+ESOCK_USE_NET_XML =
+endif
+
 XML_REF3_FILES = application.xml \
 	auth.xml \
 	code.xml \
@@ -62,6 +74,7 @@ XML_REF3_FILES = application.xml \
         logger_disk_log_h.xml \
         logger_filters.xml \
         logger_formatter.xml \
+	$(XML_REF3_ESOCK_FILES) \
 	net_adm.xml \
 	net_kernel.xml \
 	os.xml \
@@ -112,6 +125,7 @@ SPECS_FILES = $(XML_REF3_FILES:%.xml=$(SPECDIR)/specs_%.xml)
 
 TOP_SPECS_FILE = specs.xml
 
+
 # ----------------------------------------------------
 # FIGURES
 # ----------------------------------------------------
@@ -138,7 +152,7 @@ SPECS_FLAGS = -I../../include
 $(HTMLDIR)/%: %
 	$(INSTALL_DATA) $< $@
 
-docs: man pdf html
+docs: ref_man specs man pdf html
 
 $(TOP_PDF_FILE): $(XML_FILES)
 
@@ -148,19 +162,32 @@ html: images $(HTML_REF_MAN_FILE)
 
 man: $(MAN3_FILES) $(MAN4_FILES) $(MAN6_FILES)
 
+ref_man: ref_man.xml
+specs: specs.xml
+
 images: $(IMAGE_FILES:%=$(HTMLDIR)/%)
 
+info:
+	@echo "XML_APPLICATION_FILES: $(XML_APPLICATION_FILES)"
+	@echo "XML_REF3_ESOCK_FILES:  $(XML_REF3_ESOCK_FILES)"
+	@echo "XML_REF3_FILES:        $(XML_REF3_FILES)"
+	@echo "XML_REF4_FILES:        $(XML_REF4_FILES)"
+	@echo "XML_REF6_FILES:        $(XML_REF6_FILES)"
+	@echo "XML_PART_FILES:        $(XML_PART_FILES)"
+	@echo "XML_CHAPTER_FILES:     $(XML_CHAPTER_FILES)"
+	@echo "BOOK_FILES:            $(BOOK_FILES)"
+
 debug opt:
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
 	rm -rf $(XMLDIR)
-	rm -f $(MAN3DIR)/*
-	rm -f $(MAN4DIR)/*
-	rm -f $(MAN6DIR)/*
-	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
-	rm -f $(SPECDIR)/*
-	rm -f errs core *~ *.eps
+	rm -f  $(MAN3DIR)/*
+	rm -f  $(MAN4DIR)/*
+	rm -f  $(MAN6DIR)/*
+	rm -f  $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
+	rm -f  $(SPECDIR)/*
+	rm -f  errs core *~ *.eps
 
 $(SPECDIR)/specs_erl_prim_loader_stub.xml:
 	$(gen_verbose)escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
@@ -175,6 +202,14 @@ $(SPECDIR)/specs_zlib_stub.xml:
 	$(gen_verbose)escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) \
                 -o$(dir $@) -module zlib_stub
 
+ref_man.xml: ref_man.xml.src
+	($(PERL) -p -e 's?%ESOCK_USE_NET_XML%?$(ESOCK_USE_NET_XML)?' \
+            $<) > $@
+specs.xml: specs.xml.src
+	($(PERL) -p -e 's?%ESOCK_USE_NET_SPECS_XML%?$(ESOCK_USE_NET_SPECS_XML)?' \
+            $<) > $@
+
+
 # ----------------------------------------------------
 # Release Target
 # ----------------------------------------------------
diff --git a/lib/kernel/doc/src/application.xml b/lib/kernel/doc/src/application.xml
index 38c7b5acf1..f4ec2c610f 100644
--- a/lib/kernel/doc/src/application.xml
+++ b/lib/kernel/doc/src/application.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>application</module>
+  <module since="">application</module>
   <modulesummary>Generic OTP application functions</modulesummary>
   <description>
     <p>In OTP, <em>application</em> denotes a component implementing
@@ -67,8 +67,8 @@
   </datatypes>
   <funcs>
     <func>
-        <name name="ensure_all_started" arity="1"/>
-        <name name="ensure_all_started" arity="2"/>
+        <name name="ensure_all_started" arity="1" since="OTP R16B02"/>
+        <name name="ensure_all_started" arity="2" since="OTP R16B02"/>
         <fsummary>Load and start an application and its dependencies, recursively.</fsummary>
         <desc>
           <p>Equivalent to calling
@@ -85,8 +85,8 @@
         </desc>
     </func>
     <func>
-      <name name="ensure_started" arity="1"/>
-      <name name="ensure_started" arity="2"/>
+      <name name="ensure_started" arity="1" since="OTP R16B01"/>
+      <name name="ensure_started" arity="2" since="OTP R16B01"/>
       <fsummary>Load and start an application.</fsummary>
       <desc>
 	<p>Equivalent to
@@ -95,8 +95,8 @@
       </desc>
     </func>
     <func>
-      <name name="get_all_env" arity="0"/>
-      <name name="get_all_env" arity="1"/>
+      <name name="get_all_env" arity="0" since=""/>
+      <name name="get_all_env" arity="1" since=""/>
       <fsummary>Get the configuration parameters for an application.</fsummary>
       <desc>
         <p>Returns the configuration parameters and their values for
@@ -108,8 +108,8 @@
       </desc>
     </func>
     <func>
-      <name name="get_all_key" arity="0"/>
-      <name name="get_all_key" arity="1"/>
+      <name name="get_all_key" arity="0" since=""/>
+      <name name="get_all_key" arity="1" since=""/>
       <fsummary>Get the application specification keys.</fsummary>
       <desc>
         <p>Returns the application specification keys and their values
@@ -122,8 +122,8 @@
       </desc>
     </func>
     <func>
-      <name name="get_application" arity="0"/>
-      <name name="get_application" arity="1"/>
+      <name name="get_application" arity="0" since=""/>
+      <name name="get_application" arity="1" since=""/>
       <fsummary>Get the name of an application containing a certain process or module.</fsummary>
       <desc>
         <p>Returns the name of the application to which the process
@@ -136,8 +136,8 @@
       </desc>
     </func>
     <func>
-      <name name="get_env" arity="1"/>
-      <name name="get_env" arity="2"/>
+      <name name="get_env" arity="1" since=""/>
+      <name name="get_env" arity="2" since=""/>
       <fsummary>Get the value of a configuration parameter.</fsummary>
       <desc>
         <p>Returns the value of configuration parameter <c><anno>Par</anno></c>
@@ -153,7 +153,7 @@
       </desc>
     </func>
     <func>
-      <name name="get_env" arity="3"/>
+      <name name="get_env" arity="3" since="OTP R16B"/>
       <fsummary>Get the value of a configuration parameter using a default.</fsummary>
       <desc>
         <p>Works like <seealso marker="#get_env/2"><c>get_env/2</c></seealso> but returns
@@ -162,8 +162,8 @@
       </desc>
     </func>
     <func>
-      <name name="get_key" arity="1"/>
-      <name name="get_key" arity="2"/>
+      <name name="get_key" arity="1" since=""/>
+      <name name="get_key" arity="2" since=""/>
       <fsummary>Get the value of an application specification key.</fsummary>
       <desc>
         <p>Returns the value of the application specification key
@@ -180,8 +180,8 @@
       </desc>
     </func>
     <func>
-      <name name="load" arity="1"/>
-      <name name="load" arity="2"/>
+      <name name="load" arity="1" since=""/>
+      <name name="load" arity="2" since=""/>
       <fsummary>Load an application.</fsummary>
       <type name="application_spec"/>
       <type name="application_opt"/>
@@ -226,7 +226,7 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       </desc>
     </func>
     <func>
-      <name name="loaded_applications" arity="0"/>
+      <name name="loaded_applications" arity="0" since=""/>
       <fsummary>Get the currently loaded applications.</fsummary>
       <desc>
         <p>Returns a list with information about the applications, and included
@@ -238,7 +238,42 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       </desc>
     </func>
     <func>
-      <name name="permit" arity="2"/>
+      <name name="set_env" arity="1" since="OTP 21.3"/>
+      <name name="set_env" arity="2" since="OTP 21.3"/>
+      <fsummary>Sets the configuration parameters of multiple applications.</fsummary>
+      <desc>
+        <p>Sets the configuration <c><anno>Config</anno></c> for multiple
+          applications. It is equivalent to calling <c>set_env/4</c> on
+          each application individially, except it is more efficient.
+          The given <c><anno>Config</anno></c> is validated before the
+          configuration is set.</p>
+        <p><c>set_env/2</c> uses the standard <c>gen_server</c> time-out
+          value (5000 ms). Option <c>timeout</c> can be specified
+          if another time-out value is useful, for example, in situations
+          where the application controller is heavily loaded.</p>
+        <p>Option <c>persistent</c> can be set to <c>true</c>
+          to guarantee that parameters set with <c>set_env/2</c>
+          are not overridden by those defined in the application resource
+          file on load. This means that persistent values will stick after the application
+          is loaded and also on application reload.</p>
+        <p>If an application is given more than once or if an application
+          has the same key given more than once, the behaviour is undefined
+          and a warning message will be logged. In future releases, an error
+          will be raised.</p>
+        <p><c>set_env/1</c> is equivalent to <c>set_env(Config, [])</c>.</p>
+        <warning>
+          <p>Use this function only if you know what you are doing,
+            that is, on your own applications. It is very
+            application-dependent and
+            configuration parameter-dependent when and how often
+            the value is read by the application. Careless use
+            of this function can put the application in a
+            weird, inconsistent, and malfunctioning state.</p>
+        </warning>
+      </desc>
+    </func>
+    <func>
+      <name name="permit" arity="2" since=""/>
       <fsummary>Change the permission for an application to run at a node.</fsummary>
       <desc>
         <p>Changes the permission for <c><anno>Application</anno></c> to run at
@@ -271,8 +306,8 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       </desc>
     </func>
     <func>
-      <name name="set_env" arity="3"/>
-      <name name="set_env" arity="4"/>
+      <name name="set_env" arity="3" since=""/>
+      <name name="set_env" arity="4" since=""/>
       <fsummary>Set the value of a configuration parameter.</fsummary>
       <desc>
         <p>Sets the value of configuration parameter <c><anno>Par</anno></c> for
@@ -302,8 +337,8 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       </desc>
     </func>
     <func>
-      <name name="start" arity="1"/>
-      <name name="start" arity="2"/>
+      <name name="start" arity="1" since=""/>
+      <name name="start" arity="2" since=""/>
       <fsummary>Load and start an application.</fsummary>
        <desc>
         <p>Starts <c><anno>Application</anno></c>. If it is not loaded,
@@ -353,7 +388,7 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       </desc>
     </func>
     <func>
-      <name name="start_type" arity="0"/>
+      <name name="start_type" arity="0" since=""/>
       <fsummary>Get the start type of an ongoing application startup.</fsummary>
       <desc>
         <p>This function is intended to be called by a process belonging
@@ -370,7 +405,7 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       </desc>
     </func>
     <func>
-      <name name="stop" arity="1"/>
+      <name name="stop" arity="1" since=""/>
       <fsummary>Stop an application.</fsummary>
       <desc>
         <p>Stops <c><anno>Application</anno></c>. The application master calls
@@ -399,7 +434,7 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       </desc>
     </func>
     <func>
-      <name name="takeover" arity="2"/>
+      <name name="takeover" arity="2" since=""/>
       <fsummary>Take over a distributed application.</fsummary>
       <desc>
         <p>Takes over the distributed application
@@ -424,7 +459,7 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       </desc>
     </func>
     <func>
-      <name name="unload" arity="1"/>
+      <name name="unload" arity="1" since=""/>
       <fsummary>Unload an application.</fsummary>
       <desc>
         <p>Unloads the application specification for <c><anno>Application</anno></c>
@@ -435,8 +470,8 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       </desc>
     </func>
     <func>
-      <name name="unset_env" arity="2"/>
-      <name name="unset_env" arity="3"/>
+      <name name="unset_env" arity="2" since=""/>
+      <name name="unset_env" arity="3" since=""/>
       <fsummary>Unset the value of a configuration parameter.</fsummary>
       <desc>
         <p>Removes the configuration parameter <c><anno>Par</anno></c> and its value
@@ -459,8 +494,8 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       </desc>
     </func>
     <func>
-      <name name="which_applications" arity="0"/>
-      <name name="which_applications" arity="1"/>
+      <name name="which_applications" arity="0" since=""/>
+      <name name="which_applications" arity="1" since=""/>
       <fsummary>Get the currently running applications.</fsummary>
       <desc>
         <p>Returns a list with information about the applications that
@@ -484,7 +519,7 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
   </section>
   <funcs>
     <func>
-      <name>Module:start(StartType, StartArgs) -> {ok, Pid} | {ok, Pid, State} | {error, Reason}</name>
+      <name since="">Module:start(StartType, StartArgs) -> {ok, Pid} | {ok, Pid, State} | {error, Reason}</name>
       <fsummary>Start an application.</fsummary>
       <type>
         <v>StartType = <seealso marker="#type-start_type"><c>start_type()</c></seealso></v>
@@ -526,7 +561,7 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       </desc>
     </func>
     <func>
-      <name>Module:start_phase(Phase, StartType, PhaseArgs) -> ok | {error, Reason}</name>
+      <name since="">Module:start_phase(Phase, StartType, PhaseArgs) -> ok | {error, Reason}</name>
       <fsummary>Extended start of an application.</fsummary>
       <type>
         <v>Phase = atom()</v>
@@ -547,11 +582,11 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
           the primary application) for the primary application and all
           included applications, for which the start phase is defined.</p>
         <p>For a description of <c>StartType</c>, see
-	<seealso marker="Module:start/2"><c>Module:start/2</c></seealso>.</p>
+	<seealso marker="#Module:start/2"><c>Module:start/2</c></seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>Module:prep_stop(State) -> NewState</name>
+      <name since="">Module:prep_stop(State) -> NewState</name>
       <fsummary>Prepare an application for termination.</fsummary>
       <type>
         <v>State = NewState = term()</v>
@@ -569,7 +604,7 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       </desc>
     </func>
     <func>
-      <name>Module:stop(State)</name>
+      <name since="">Module:stop(State)</name>
       <fsummary>Clean up after termination of an application.</fsummary>
       <type>
         <v>State = term()</v>
@@ -585,7 +620,7 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       </desc>
     </func>
     <func>
-      <name>Module:config_change(Changed, New, Removed) -> ok</name>
+      <name since="">Module:config_change(Changed, New, Removed) -> ok</name>
       <fsummary>Update the configuration parameters for an application.</fsummary>
       <type>
         <v>Changed = [{Par,Val}]</v>
diff --git a/lib/kernel/doc/src/auth.xml b/lib/kernel/doc/src/auth.xml
index 5901446960..c735d02fed 100644
--- a/lib/kernel/doc/src/auth.xml
+++ b/lib/kernel/doc/src/auth.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>auth</module>
+  <module since="">auth</module>
   <modulesummary>Erlang network authentication server.</modulesummary>
   <description>
     <p>This module is deprecated. For a description of the Magic
@@ -42,28 +42,28 @@
   </datatypes>
   <funcs>
     <func>
-      <name name="cookie" arity="0"/>
+      <name name="cookie" arity="0" since=""/>
       <fsummary>Magic cookie for local node (deprecated).</fsummary>
       <desc>
         <p>Use
-          <seealso marker="erts:erlang#erlang:get_cookie/0"><c>erlang:get_cookie()</c></seealso>
+          <seealso marker="erts:erlang#get_cookie/0"><c>erlang:get_cookie()</c></seealso>
           in ERTS instead.</p>
       </desc>
     </func>
     <func>
-      <name name="cookie" arity="1"/>
+      <name name="cookie" arity="1" since=""/>
       <fsummary>Set the magic for the local node (deprecated).</fsummary>
       <type_desc variable="TheCookie">
         The cookie can also be specified as a list with a single atom element.
       </type_desc>
       <desc>
         <p>Use
-          <seealso marker="erts:erlang#erlang:set_cookie/2"><c>erlang:set_cookie(node(), <anno>Cookie</anno>)</c>
+          <seealso marker="erts:erlang#set_cookie/2"><c>erlang:set_cookie(node(), <anno>Cookie</anno>)</c>
 	  in ERTS</seealso> instead.</p>
       </desc>
     </func>
     <func>
-      <name name="is_auth" arity="1"/>
+      <name name="is_auth" arity="1" since=""/>
       <fsummary>Status of communication authorization (deprecated).</fsummary>
       <desc>
         <p>Returns <c>yes</c> if communication with <c><anno>Node</anno></c> is
@@ -76,7 +76,7 @@
       </desc>
     </func>
     <func>
-      <name>node_cookie([Node, Cookie]) -> yes | no</name>
+      <name since="">node_cookie([Node, Cookie]) -> yes | no</name>
       <fsummary>Set the magic cookie for a node and verify authorization (deprecated).</fsummary>
       <type>
         <v>Node = node()</v>
@@ -88,13 +88,13 @@
       </desc>
     </func>
     <func>
-      <name name="node_cookie" arity="2"/>
+      <name name="node_cookie" arity="2" since=""/>
       <fsummary>Set the magic cookie for a node and verify authorization (deprecated).</fsummary>
       <desc>
         <p>Sets the magic cookie of <c><anno>Node</anno></c> to
 	<c><anno>Cookie</anno></c> and verifies the status of the authorization.
           Equivalent to calling
-          <seealso marker="erts:erlang#erlang:set_cookie/2"><c>erlang:set_cookie(<anno>Node</anno>, <anno>Cookie</anno>)</c></seealso>, followed by
+          <seealso marker="erts:erlang#set_cookie/2"><c>erlang:set_cookie(<anno>Node</anno>, <anno>Cookie</anno>)</c></seealso>, followed by
           <seealso marker="#is_auth/1"><c>auth:is_auth(<anno>Node</anno>)</c></seealso>.</p>
       </desc>
     </func>
diff --git a/lib/kernel/doc/src/code.xml b/lib/kernel/doc/src/code.xml
index aff3e8133c..4aa9e8b9d2 100644
--- a/lib/kernel/doc/src/code.xml
+++ b/lib/kernel/doc/src/code.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>code</module>
+  <module since="">code</module>
   <modulesummary>Erlang code server.</modulesummary>
   <description>
     <p>This module contains the interface to the Erlang
@@ -322,7 +322,7 @@ zip:create("mnesia-4.4.7.ez",
 
   <funcs>
     <func>
-      <name name="set_path" arity="1"/>
+      <name name="set_path" arity="1" since=""/>
       <fsummary>Set the code server search path.</fsummary>
       <desc>
         <p>Sets the code path to the list of directories <c><anno>Path</anno></c>.</p>
@@ -336,15 +336,15 @@ zip:create("mnesia-4.4.7.ez",
       </desc>
     </func>
     <func>
-      <name name="get_path" arity="0"/>
+      <name name="get_path" arity="0" since=""/>
       <fsummary>Return the code server search path.</fsummary>
       <desc>
         <p>Returns the code path.</p>
       </desc>
     </func>
     <func>
-      <name name="add_path" arity="1"/>
-      <name name="add_pathz" arity="1"/>
+      <name name="add_path" arity="1" since=""/>
+      <name name="add_pathz" arity="1" since=""/>
       <fsummary>Add a directory to the end of the code path.</fsummary>
       <type name="add_path_ret"/>
       <desc>
@@ -357,7 +357,7 @@ zip:create("mnesia-4.4.7.ez",
       </desc>
     </func>
     <func>
-      <name name="add_patha" arity="1"/>
+      <name name="add_patha" arity="1" since=""/>
       <fsummary>Add a directory to the beginning of the code path.</fsummary>
       <type name="add_path_ret"/>
       <desc>
@@ -370,8 +370,8 @@ zip:create("mnesia-4.4.7.ez",
       </desc>
     </func>
     <func>
-      <name name="add_paths" arity="1"/>
-      <name name="add_pathsz" arity="1"/>
+      <name name="add_paths" arity="1" since=""/>
+      <name name="add_pathsz" arity="1" since=""/>
       <fsummary>Add directories to the end of the code path.</fsummary>
       <desc>
         <p>Adds the directories in <c><anno>Dirs</anno></c> to the end of the code
@@ -381,7 +381,7 @@ zip:create("mnesia-4.4.7.ez",
       </desc>
     </func>
     <func>
-      <name name="add_pathsa" arity="1"/>
+      <name name="add_pathsa" arity="1" since=""/>
       <fsummary>Add directories to the beginning of the code path.</fsummary>
       <desc>
 	<p>Traverses <c><anno>Dirs</anno></c> and adds
@@ -397,7 +397,7 @@ zip:create("mnesia-4.4.7.ez",
       </desc>
     </func>
     <func>
-      <name name="del_path" arity="1"/>
+      <name name="del_path" arity="1" since=""/>
       <fsummary>Delete a directory from the code path.</fsummary>
       <desc>
         <p>Deletes a directory from the code path. The argument can be
@@ -417,7 +417,7 @@ zip:create("mnesia-4.4.7.ez",
       </desc>
     </func>
     <func>
-      <name name="replace_path" arity="2"/>
+      <name name="replace_path" arity="2" since=""/>
       <fsummary>Replace a directory with another in the code path.</fsummary>
       <desc>
         <p>Replaces an old occurrence of a directory
@@ -441,7 +441,7 @@ zip:create("mnesia-4.4.7.ez",
       </desc>
     </func>
     <func>
-      <name name="load_file" arity="1"/>
+      <name name="load_file" arity="1" since=""/>
       <fsummary>Load a module.</fsummary>
       <type name="load_ret"/>
       <desc>
@@ -460,7 +460,7 @@ zip:create("mnesia-4.4.7.ez",
       </desc>
     </func>
     <func>
-      <name name="load_abs" arity="1"/>
+      <name name="load_abs" arity="1" since=""/>
       <fsummary>Load a module, residing in a specified file.</fsummary>
       <type name="load_ret"/>
       <type name="loaded_filename"/>
@@ -477,7 +477,7 @@ zip:create("mnesia-4.4.7.ez",
       </desc>
     </func>
     <func>
-      <name name="ensure_loaded" arity="1"/>
+      <name name="ensure_loaded" arity="1" since=""/>
       <fsummary>Ensure that a module is loaded.</fsummary>
       <desc>
         <p>Tries to load a module in the same way as
@@ -489,7 +489,7 @@ zip:create("mnesia-4.4.7.ez",
       </desc>
     </func>
     <func>
-      <name name="load_binary" arity="3"/>
+      <name name="load_binary" arity="3" since=""/>
       <fsummary>Load object code for a module.</fsummary>
       <type name="loaded_filename"/>
       <type name="loaded_ret_atoms"/>
@@ -507,7 +507,7 @@ zip:create("mnesia-4.4.7.ez",
       </desc>
     </func>
     <func>
-      <name name="atomic_load" arity="1"/>
+      <name name="atomic_load" arity="1" since="OTP 19.0"/>
       <fsummary>Load a list of modules atomically</fsummary>
       <desc>
         <p>Tries to load all of the modules in the list
@@ -538,7 +538,7 @@ zip:create("mnesia-4.4.7.ez",
 	  </item>
 	  <tag><c>not_purged</c></tag>
 	  <item>
-	    <p>The object code can not be loaded because an old version
+	    <p>The object code cannot be loaded because an old version
 	    of the code already exists.</p>
 	  </item>
 	  <tag><c>sticky_directory</c></tag>
@@ -566,7 +566,7 @@ ok = code:finish_loading(Prepared),
       </desc>
     </func>
     <func>
-      <name name="prepare_loading" arity="1"/>
+      <name name="prepare_loading" arity="1" since="OTP 19.0"/>
       <fsummary>Prepare a list of modules atomically</fsummary>
       <desc>
         <p>Prepares to load the modules in the list
@@ -598,7 +598,7 @@ ok = code:finish_loading(Prepared),
       </desc>
     </func>
     <func>
-      <name name="finish_loading" arity="1"/>
+      <name name="finish_loading" arity="1" since="OTP 19.0"/>
       <fsummary>Finish loading a list of prepared modules atomically</fsummary>
       <desc>
         <p>Tries to load code for all modules that have been previously
@@ -611,7 +611,7 @@ ok = code:finish_loading(Prepared),
 	<taglist>
 	  <tag><c>not_purged</c></tag>
 	  <item>
-	    <p>The object code can not be loaded because an old version
+	    <p>The object code cannot be loaded because an old version
 	    of the code already exists.</p>
 	  </item>
 	  <tag><c>sticky_directory</c></tag>
@@ -627,7 +627,7 @@ ok = code:finish_loading(Prepared),
       </desc>
     </func>
     <func>
-      <name name="ensure_modules_loaded" arity="1"/>
+      <name name="ensure_modules_loaded" arity="1" since="OTP 19.0"/>
       <fsummary>Ensure that a list of modules is loaded</fsummary>
       <desc>
         <p>Tries to load any modules not already loaded in the list
@@ -639,7 +639,7 @@ ok = code:finish_loading(Prepared),
       </desc>
     </func>
     <func>
-      <name name="delete" arity="1"/>
+      <name name="delete" arity="1" since=""/>
       <fsummary>Remove current code for a module.</fsummary>
       <desc>
         <p>Removes the current code for <c><anno>Module</anno></c>, that is,
@@ -652,7 +652,7 @@ ok = code:finish_loading(Prepared),
       </desc>
     </func>
     <func>
-      <name name="purge" arity="1"/>
+      <name name="purge" arity="1" since=""/>
       <fsummary>Remove old code for a module.</fsummary>
       <desc>
         <p>Purges the code for <c><anno>Module</anno></c>, that is, removes code
@@ -668,7 +668,7 @@ ok = code:finish_loading(Prepared),
       </desc>
     </func>
     <func>
-      <name name="soft_purge" arity="1"/>
+      <name name="soft_purge" arity="1" since=""/>
       <fsummary>Remove old code for a module, unless no process uses it.</fsummary>
       <desc>
         <p>Purges the code for <c><anno>Module</anno></c>, that is, removes code
@@ -683,7 +683,7 @@ ok = code:finish_loading(Prepared),
       </desc>
     </func>
     <func>
-      <name name="is_loaded" arity="1"/>
+      <name name="is_loaded" arity="1" since=""/>
       <fsummary>Check if a module is loaded.</fsummary>
       <type name="loaded_filename"/>
       <type name="loaded_ret_atoms"/>
@@ -702,7 +702,7 @@ ok = code:finish_loading(Prepared),
       </desc>
     </func>
     <func>
-      <name name="all_loaded" arity="0"/>
+      <name name="all_loaded" arity="0" since=""/>
       <fsummary>Get all loaded modules.</fsummary>
       <type name="loaded_filename"/>
       <type name="loaded_ret_atoms"/>
@@ -716,7 +716,7 @@ ok = code:finish_loading(Prepared),
       </desc>
     </func>
     <func>
-      <name name="which" arity="1"/>
+      <name name="which" arity="1" since=""/>
       <fsummary>The object code file of a module.</fsummary>
       <type name="loaded_ret_atoms"/>
       <desc>
@@ -731,7 +731,7 @@ ok = code:finish_loading(Prepared),
       </desc>
     </func>
     <func>
-      <name name="get_object_code" arity="1"/>
+      <name name="get_object_code" arity="1" since=""/>
       <fsummary>Gets the object code for a module.</fsummary>
       <desc>
         <p>Searches the code path for the object code of module
@@ -750,7 +750,7 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
       </desc>
     </func>
     <func>
-      <name name="root_dir" arity="0"/>
+      <name name="root_dir" arity="0" since=""/>
       <fsummary>Root directory of Erlang/OTP.</fsummary>
       <desc>
         <p>Returns the root directory of Erlang/OTP, which is
@@ -762,7 +762,7 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
       </desc>
     </func>
     <func>
-      <name name="lib_dir" arity="0"/>
+      <name name="lib_dir" arity="0" since=""/>
       <fsummary>Library directory of Erlang/OTP.</fsummary>
       <desc>
         <p>Returns the library directory, <c>$OTPROOT/lib</c>, where
@@ -774,7 +774,7 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
       </desc>
     </func>
     <func>
-      <name name="lib_dir" arity="1"/>
+      <name name="lib_dir" arity="1" since=""/>
       <fsummary>Library directory for an application.</fsummary>
       <desc>
         <p>Returns the path
@@ -807,7 +807,7 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
       </desc>
     </func>
     <func>
-      <name name="lib_dir" arity="2"/>
+      <name name="lib_dir" arity="2" since=""/>
       <fsummary>Subdirectory for an application.</fsummary>
       <desc>
         <p>Returns the path to a subdirectory directly under the top
@@ -827,7 +827,7 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
       </desc>
     </func>
     <func>
-      <name name="compiler_dir" arity="0"/>
+      <name name="compiler_dir" arity="0" since=""/>
       <fsummary>Library directory for the compiler.</fsummary>
       <desc>
         <p>Returns the compiler library directory. Equivalent to
@@ -835,7 +835,7 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
       </desc>
     </func>
     <func>
-      <name name="priv_dir" arity="1"/>
+      <name name="priv_dir" arity="1" since=""/>
       <fsummary>Priv directory for an application.</fsummary>
       <desc>
         <p>Returns the path to the <c>priv</c> directory in an
@@ -846,7 +846,7 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
       </desc>
     </func>
     <func>
-      <name name="objfile_extension" arity="0"/>
+      <name name="objfile_extension" arity="0" since=""/>
       <fsummary>Object code file extension.</fsummary>
       <desc>
         <p>Returns the object code file extension corresponding to
@@ -854,7 +854,7 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
       </desc>
     </func>
     <func>
-      <name name="stick_dir" arity="1"/>
+      <name name="stick_dir" arity="1" since=""/>
       <fsummary>Mark a directory as sticky.</fsummary>
       <desc>
         <p>Marks <c><anno>Dir</anno></c> as sticky.</p>
@@ -862,7 +862,7 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
       </desc>
     </func>
     <func>
-      <name name="unstick_dir" arity="1"/>
+      <name name="unstick_dir" arity="1" since=""/>
       <fsummary>Remove a sticky directory mark.</fsummary>
       <desc>
         <p>Unsticks a directory that is marked as
@@ -871,7 +871,7 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
       </desc>
     </func>
     <func>
-      <name name="is_sticky" arity="1"/>
+      <name name="is_sticky" arity="1" since=""/>
       <fsummary>Test if a module is sticky.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Module</anno></c> is the
@@ -882,7 +882,7 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
       </desc>
     </func>
     <func>
-      <name name="where_is_file" arity="1"/>
+      <name name="where_is_file" arity="1" since=""/>
       <fsummary>Full name of a file located in the code path.</fsummary>
       <desc>
         <p>Searches the code path for <c><anno>Filename</anno></c>, a file of
@@ -893,7 +893,7 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
       </desc>
     </func>
     <func>
-      <name name="clash" arity="0"/>
+      <name name="clash" arity="0" since=""/>
       <fsummary>Search for modules with identical names.</fsummary>
       <desc>
         <p>Searches all directories in the code path for module names with
@@ -901,7 +901,7 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
       </desc>
     </func>
     <func>
-      <name name="module_status" arity="1"/>
+      <name name="module_status" arity="1" since="OTP 20.0"/>
       <fsummary>Return the status of the module in relation to object file on disk.</fsummary>
       <desc>
 	<p>Returns:</p>
@@ -934,7 +934,7 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
       </desc>
     </func>
     <func>
-      <name name="modified_modules" arity="0"/>
+      <name name="modified_modules" arity="0" since="OTP 20.0"/>
       <fsummary>Return a list of all modules modified on disk.</fsummary>
       <desc>
         <p>Returns the list of all currently loaded modules for which
@@ -943,7 +943,7 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
       </desc>
     </func>
     <func>
-      <name name="is_module_native" arity="1"/>
+      <name name="is_module_native" arity="1" since=""/>
       <fsummary>Test if a module has native code.</fsummary>
       <desc>
 	<p>Returns:</p>
@@ -961,7 +961,7 @@ rpc:call(Node, code, load_binary, [Module, Filename, Binary]),
     </func>
 
     <func>
-      <name name="get_mode" arity="0"/>
+      <name name="get_mode" arity="0" since="OTP R16B"/>
       <fsummary>The mode of the code server.</fsummary>
       <desc>
         <p>Returns an atom describing the mode of the code server:
diff --git a/lib/kernel/doc/src/disk_log.xml b/lib/kernel/doc/src/disk_log.xml
index 884cb32c0c..e308b06f3c 100644
--- a/lib/kernel/doc/src/disk_log.xml
+++ b/lib/kernel/doc/src/disk_log.xml
@@ -34,7 +34,7 @@
     <rev>D</rev>
     <file>disk_log.sgml</file>
   </header>
-  <module>disk_log</module>
+  <module since="">disk_log</module>
   <modulesummary>A disk-based term logging facility.</modulesummary>
   <description>
     <p><c>disk_log</c> is a disk-based term logger that enables
@@ -238,7 +238,7 @@
   </datatypes>
   <funcs>
     <func>
-      <name name="accessible_logs" arity="0"/>
+      <name name="accessible_logs" arity="0" since=""/>
       <fsummary>Return the accessible disk logs on the current node.</fsummary>
       <desc>
         <p>Returns the names of the disk logs accessible on the current node.
@@ -248,8 +248,8 @@
       </desc>
     </func>
     <func>
-      <name name="alog" arity="2"/>
-      <name name="balog" arity="2"/>
+      <name name="alog" arity="2" since=""/>
+      <name name="balog" arity="2" since=""/>
       <fsummary>Asynchronously log an item on to a disk log.</fsummary>
       <type variable="Log"/>
       <type variable="Term" name_i="1"/>
@@ -275,8 +275,8 @@
       </desc>
     </func>
     <func>
-      <name name="alog_terms" arity="2"/>
-      <name name="balog_terms" arity="2"/>
+      <name name="alog_terms" arity="2" since=""/>
+      <name name="balog_terms" arity="2" since=""/>
       <fsummary>Asynchronously log many items on to a disk log.</fsummary>
       <type variable="Log"/>
       <type variable="TermList" name_i="1"/>
@@ -303,8 +303,8 @@
       </desc>
     </func>
     <func>
-      <name name="block" arity="1"/>
-      <name name="block" arity="2"/>
+      <name name="block" arity="1" since=""/>
+      <name name="block" arity="2" since=""/>
       <fsummary>Block a disk log.</fsummary>
       <type name="block_error_rsn"/>
       <desc>
@@ -330,21 +330,21 @@
       </desc>
     </func>
     <func>
-      <name name="change_header" arity="2"/>
+      <name name="change_header" arity="2" since=""/>
       <fsummary>Change option head or head_func for an owner of a disk log.</fsummary>
       <desc>
         <p>Changes the value of option <c>head</c> or <c>head_func</c> for an owner of a disk log.</p>
       </desc>
     </func>
     <func>
-      <name name="change_notify" arity="3"/>
+      <name name="change_notify" arity="3" since=""/>
       <fsummary>Change option notify for an owner of a disk log.</fsummary>
       <desc>
         <p>Changes the value of option <c>notify</c> for an owner of a disk log. </p>
       </desc>
     </func>
     <func>
-      <name name="change_size" arity="2"/>
+      <name name="change_size" arity="2" since=""/>
       <fsummary>Change the size of an open disk log.</fsummary>
       <desc>
         <p>Changes the size of an open log.
@@ -384,10 +384,10 @@
       </desc>
     </func>
     <func>
-      <name name="chunk" arity="2"/>
-      <name name="chunk" arity="3"/>
-      <name name="bchunk" arity="2"/>
-      <name name="bchunk" arity="3"/>
+      <name name="chunk" arity="2" since=""/>
+      <name name="chunk" arity="3" since=""/>
+      <name name="bchunk" arity="2" since=""/>
+      <name name="bchunk" arity="3" since=""/>
       <fsummary>Read a chunk of items written to a disk log.</fsummary>
       <type variable="Log"/>
       <type variable="Continuation"/>
@@ -447,7 +447,7 @@
       </desc>
     </func>
     <func>
-      <name name="chunk_info" arity="1"/>
+      <name name="chunk_info" arity="1" since=""/>
       <fsummary>Return information about a chunk continuation of a disk log.</fsummary>
       <desc>
         <p>Returns the pair <c>{node, <anno>Node</anno>}</c>,
@@ -457,7 +457,7 @@
       </desc>
     </func>
     <func>
-      <name name="chunk_step" arity="3"/>
+      <name name="chunk_step" arity="3" since=""/>
       <fsummary>Step forward or backward among the wrap log files of a disk log.</fsummary>
       <desc>
         <p>Can be used with <c>chunk/2,3</c> and <c>bchunk/2,3</c>
@@ -480,7 +480,7 @@
       </desc>
     </func>
     <func>
-      <name name="close" arity="1"/>
+      <name name="close" arity="1" since=""/>
       <fsummary>Close a disk log.</fsummary>
       <type name="close_error_rsn"/>
       <desc>
@@ -505,7 +505,7 @@
       </desc>
     </func>
     <func>
-      <name name="format_error" arity="1"/>
+      <name name="format_error" arity="1" since=""/>
       <fsummary>Return an English description of a disk log error reply.</fsummary>
       <desc>
         <p>Given the error returned by any function in this module, 
@@ -517,7 +517,7 @@
       </desc>
     </func>
     <func>
-      <name name="inc_wrap_file" arity="1"/>
+      <name name="inc_wrap_file" arity="1" since=""/>
       <fsummary>Change to the next wrap log file of a disk log.</fsummary>
       <type name="inc_wrap_error_rsn"/>
       <type name="invalid_header"/>
@@ -534,7 +534,7 @@
       </desc>
     </func>
     <func>
-      <name name="info" arity="1"/>
+      <name name="info" arity="1" since=""/>
       <fsummary>Return information about a disk log.</fsummary>
       <type name="dlog_info"/>
       <desc>
@@ -685,8 +685,8 @@
       </desc>
     </func>
     <func>
-      <name name="lclose" arity="1"/>
-      <name name="lclose" arity="2"/>
+      <name name="lclose" arity="1" since=""/>
+      <name name="lclose" arity="2" since=""/>
       <fsummary>Close a disk log on one node.</fsummary>
       <type name="lclose_error_rsn"/>
       <desc>
@@ -704,8 +704,8 @@
       </desc>
     </func>
     <func>
-      <name name="log" arity="2"/>
-      <name name="blog" arity="2"/>
+      <name name="log" arity="2" since=""/>
+      <name name="blog" arity="2" since=""/>
       <fsummary>Log an item onto a disk log.</fsummary>
       <type variable="Log"/>
       <type variable="Term" name_i="1"/>
@@ -739,8 +739,8 @@
       </desc>
     </func>
     <func>
-      <name name="log_terms" arity="2"/>
-      <name name="blog_terms" arity="2"/>
+      <name name="log_terms" arity="2" since=""/>
+      <name name="blog_terms" arity="2" since=""/>
       <fsummary>Log many items onto a disk log.</fsummary>
       <type variable="Log"/>
       <type variable="TermList" name_i="1"/>
@@ -768,7 +768,7 @@
       </desc>
     </func>
     <func>
-      <name name="open" arity="1"/>
+      <name name="open" arity="1" since=""/>
       <fsummary>Open a disk log file.</fsummary>
       <type name="dlog_options"/>
       <type name="dlog_option"/>
@@ -1041,7 +1041,7 @@
       </desc>
     </func>
     <func>
-      <name name="pid2name" arity="1"/>
+      <name name="pid2name" arity="1" since=""/>
       <fsummary>Return the name of the disk log handled by a pid.</fsummary>
       <desc>
         <p>Returns the log name
@@ -1053,9 +1053,9 @@
       </desc>
     </func>
     <func>
-      <name name="reopen" arity="2"/>
-      <name name="reopen" arity="3"/>
-      <name name="breopen" arity="3"/>
+      <name name="reopen" arity="2" since=""/>
+      <name name="reopen" arity="3" since=""/>
+      <name name="breopen" arity="3" since=""/>
       <fsummary>Reopen a disk log and save the old log.</fsummary>
       <type variable="Log"/>
       <type variable="File" name_i="1"/>
@@ -1087,7 +1087,7 @@
       </desc>
     </func>
     <func>
-      <name name="sync" arity="1"/>
+      <name name="sync" arity="1" since=""/>
       <fsummary>Flush the contents of a disk log to the disk.</fsummary>
       <type name="sync_error_rsn"/>
       <desc>
@@ -1097,9 +1097,9 @@
       </desc>
     </func>
     <func>
-      <name name="truncate" arity="1"/>
-      <name name="truncate" arity="2"/>
-      <name name="btruncate" arity="2"/>
+      <name name="truncate" arity="1" since=""/>
+      <name name="truncate" arity="2" since=""/>
+      <name name="btruncate" arity="2" since=""/>
       <fsummary>Truncate a disk log.</fsummary>
       <type variable="Log"/>
       <type variable="Head" name_i="2"/>
@@ -1129,7 +1129,7 @@
       </desc>
     </func>
     <func>
-      <name name="unblock" arity="1"/>
+      <name name="unblock" arity="1" since=""/>
       <fsummary>Unblock a disk log.</fsummary>
       <type name="unblock_error_rsn"/>
       <desc>
diff --git a/lib/kernel/doc/src/erl_boot_server.xml b/lib/kernel/doc/src/erl_boot_server.xml
index 4109251387..89f9855c49 100644
--- a/lib/kernel/doc/src/erl_boot_server.xml
+++ b/lib/kernel/doc/src/erl_boot_server.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>erl_boot_server</module>
+  <module since="">erl_boot_server</module>
   <modulesummary>Boot server for other Erlang machines.</modulesummary>
   <description>
     <p>This server is used to assist diskless Erlang nodes that fetch
@@ -52,14 +52,14 @@
   </description>
   <funcs>
     <func>
-      <name name="add_slave" arity="1"/>
+      <name name="add_slave" arity="1" since=""/>
       <fsummary>Add a slave to the list of allowed slaves.</fsummary>
       <desc>
         <p>Adds a <c><anno>Slave</anno></c> node to the list of allowed slave hosts.</p>
       </desc>
     </func>
     <func>
-      <name name="delete_slave" arity="1"/>
+      <name name="delete_slave" arity="1" since=""/>
       <fsummary>Delete a slave from the list of allowed slaves.</fsummary>
       <desc>
         <p>Deletes a <c><anno>Slave</anno></c> node from the list of allowed slave
@@ -67,7 +67,7 @@
       </desc>
     </func>
     <func>
-      <name name="start" arity="1"/>
+      <name name="start" arity="1" since=""/>
       <fsummary>Start the boot server.</fsummary>
       <desc>
         <p>Starts the boot server. <c><anno>Slaves</anno></c> is a list of
@@ -76,7 +76,7 @@
       </desc>
     </func>
     <func>
-      <name name="start_link" arity="1"/>
+      <name name="start_link" arity="1" since=""/>
       <fsummary>Start the boot server and link to the the caller.</fsummary>
       <desc>
         <p>Starts the boot server and links to the caller. This function
@@ -85,7 +85,7 @@
       </desc>
     </func>
     <func>
-      <name name="which_slaves" arity="0"/>
+      <name name="which_slaves" arity="0" since=""/>
       <fsummary>Return the current list of allowed slave hosts.</fsummary>
       <desc>
         <p>Returns the current list of allowed slave hosts.</p>
diff --git a/lib/kernel/doc/src/erl_ddll.xml b/lib/kernel/doc/src/erl_ddll.xml
index 75114e015c..52d5bcd079 100644
--- a/lib/kernel/doc/src/erl_ddll.xml
+++ b/lib/kernel/doc/src/erl_ddll.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>erl_ddll</module>
+  <module since="">erl_ddll</module>
   <modulesummary>Dynamic driver loader and linker.</modulesummary>
   <description>
     <p>This module provides an interface for loading
@@ -196,11 +196,11 @@
   </datatypes>
   <funcs>
     <func>
-      <name name="demonitor" arity="1"/>
+      <name name="demonitor" arity="1" since=""/>
       <fsummary>Remove a monitor for a driver.</fsummary>
       <desc>
         <p>Removes a driver monitor in much the same way as 
-          <seealso marker="erts:erlang#erlang:demonitor/1"><c>erlang:demonitor/1</c></seealso>
+          <seealso marker="erts:erlang#demonitor/1"><c>erlang:demonitor/1</c></seealso>
 	  in ERTS
 	  does with process monitors. For details about how to create
 	  driver monitors, see
@@ -212,7 +212,7 @@
       </desc>
     </func>
     <func>
-      <name name="format_error" arity="1"/>
+      <name name="format_error" arity="1" since=""/>
       <fsummary>Format an error descriptor.</fsummary>
       <desc>
         <p>Takes an <c><anno>ErrorDesc</anno></c> returned by load, unload, or
@@ -229,7 +229,7 @@
       </desc>
     </func>
     <func>
-      <name name="info" arity="0"/>
+      <name name="info" arity="0" since=""/>
       <fsummary>Retrieve information about all drivers.</fsummary>
       <desc>
         <p>Returns a list of tuples <c>{<anno>DriverName</anno>, <anno>InfoList</anno>}</c>,
@@ -240,7 +240,7 @@
       </desc>
     </func>
     <func>
-      <name name="info" arity="1"/>
+      <name name="info" arity="1" since=""/>
       <fsummary>Retrieve information about one driver.</fsummary>
       <desc>
         <p>Returns a list of tuples <c>{<anno>Tag</anno>, <anno>Value</anno>}</c>,
@@ -266,7 +266,7 @@
       </desc>
     </func>
     <func>
-      <name name="info" arity="2"/>
+      <name name="info" arity="2" since=""/>
       <fsummary>Retrieve specific information about one driver.</fsummary>
       <desc>
         <p>Returns specific information about one aspect of a driver.
@@ -328,7 +328,7 @@
       </desc>
     </func>
     <func>
-      <name name="load" arity="2"/>
+      <name name="load" arity="2" since=""/>
       <fsummary>Load a driver.</fsummary>
       <desc>
         <p>Loads and links the dynamic driver <c><anno>Name</anno></c>.
@@ -390,7 +390,7 @@
       </desc>
     </func>
     <func>
-      <name name="load_driver" arity="2"/>
+      <name name="load_driver" arity="2" since=""/>
       <fsummary>Load a driver.</fsummary>
       <desc>
         <p>Works essentially as <c>load/2</c>, but loads the driver
@@ -413,7 +413,7 @@
       </desc>
     </func>
     <func>
-      <name name="loaded_drivers" arity="0"/>
+      <name name="loaded_drivers" arity="0" since=""/>
       <fsummary>List loaded drivers.</fsummary>
       <desc>
         <p>Returns a list of all the available drivers, both
@@ -425,12 +425,12 @@
       </desc>
     </func>
     <func>
-      <name name="monitor" arity="2"/>
+      <name name="monitor" arity="2" since=""/>
       <fsummary>Create a monitor for a driver.</fsummary>
       <desc>
         <p>Creates a driver monitor and works in many
           ways as
-	  <seealso marker="erts:erlang#erlang:monitor/2"><c>erlang:monitor/2</c></seealso>
+	  <seealso marker="erts:erlang#monitor/2"><c>erlang:monitor/2</c></seealso>
 	  in ERTS,
           does for processes. When a driver changes state, the monitor
           results in a monitor message that is sent to the calling
@@ -588,7 +588,7 @@
       </desc>
     </func>
     <func>
-      <name name="reload" arity="2"/>
+      <name name="reload" arity="2" since=""/>
       <fsummary>Replace a driver.</fsummary>
       <desc>
         <p>Reloads the driver named <c><anno>Name</anno></c> from a possibly
@@ -626,7 +626,7 @@
       </desc>
     </func>
     <func>
-      <name name="reload_driver" arity="2"/>
+      <name name="reload_driver" arity="2" since=""/>
       <fsummary>Replace a driver.</fsummary>
       <desc>
         <p>Works exactly as <seealso marker="#reload/2"><c>reload/2</c></seealso>,
@@ -644,7 +644,7 @@
       </desc>
     </func>
     <func>
-      <name name="try_load" arity="3"/>
+      <name name="try_load" arity="3" since=""/>
       <fsummary>Load a driver.</fsummary>
       <desc>
         <p>Provides more control than the
@@ -931,7 +931,7 @@
       </desc>
     </func>
     <func>
-      <name name="try_unload" arity="2"/>
+      <name name="try_unload" arity="2" since=""/>
       <fsummary>Unload a driver.</fsummary>
       <desc>
         <p>This is the low-level function to unload (or decrement
@@ -1116,7 +1116,7 @@
       </desc>
     </func>
     <func>
-      <name name="unload" arity="1"/>
+      <name name="unload" arity="1" since=""/>
       <fsummary>Unload a driver.</fsummary>
       <desc>
         <p>Unloads, or at least dereferences the driver named
@@ -1143,7 +1143,7 @@
       </desc>
     </func>
     <func>
-      <name name="unload_driver" arity="1"/>
+      <name name="unload_driver" arity="1" since=""/>
       <fsummary>Unload a driver.</fsummary>
       <desc>
         <p>Unloads, or at least dereferences the driver named
diff --git a/lib/kernel/doc/src/erl_epmd.xml b/lib/kernel/doc/src/erl_epmd.xml
index 8b076cd2d7..2adbf11a28 100644
--- a/lib/kernel/doc/src/erl_epmd.xml
+++ b/lib/kernel/doc/src/erl_epmd.xml
@@ -28,7 +28,7 @@
     <date>2018-02-19</date>
     <rev>A</rev>
   </header>
-  <module>erl_epmd</module>
+  <module since="OTP R14B">erl_epmd</module>
   <modulesummary>
     Erlang interface towards epmd
   </modulesummary>
@@ -41,7 +41,7 @@
 
   <funcs>
     <func>
-      <name name="start_link" arity="0"/>
+      <name name="start_link" arity="0" since="OTP 21.0"/>
       <fsummary>Callback for erl_distribution supervisor.</fsummary>
       <desc>
         <p>This function is invoked as this module is added as a child of the
@@ -50,8 +50,8 @@
     </func>
 
     <func>
-      <name name="register_node" arity="2"/>
-      <name name="register_node" arity="3"/>
+      <name name="register_node" arity="2" since="OTP 21.0"/>
+      <name name="register_node" arity="3" since="OTP 21.0"/>
       <fsummary>Registers the node with <c>epmd</c>.</fsummary>
       <desc>
         <p>Registers the node with <c>epmd</c> and tells epmd what port will be
@@ -62,8 +62,8 @@
     </func>
 
     <func>
-      <name name="port_please" arity="2"/>
-      <name name="port_please" arity="3"/>
+      <name name="port_please" arity="2" since="OTP 21.0"/>
+      <name name="port_please" arity="3" since="OTP 21.0"/>
       <fsummary>Returns the port number for a given node.</fsummary>
       <desc>
         <p>Requests the distribution port for the given node of an EPMD
@@ -73,7 +73,7 @@
     </func>
 
     <func>
-      <name name="address_please" arity="3"/>
+      <name name="address_please" arity="3" since="OTP 21.0"/>
       <fsummary>Returns address and port.</fsummary>
       <desc>
         <p>Called by the distribution module. Resolves the <c>Host</c> to an IP
@@ -84,7 +84,7 @@
     </func>
 
     <func>
-      <name name="names" arity="1"/>
+      <name name="names" arity="1" since="OTP 21.0"/>
       <fsummary>Names of Erlang nodes at a host.</fsummary>
       <desc>
         <p>Called by <seealso marker="net_adm"><c>net_adm:names/0</c></seealso>.
diff --git a/lib/kernel/doc/src/error_handler.xml b/lib/kernel/doc/src/error_handler.xml
index e5639487dc..eb01e87aee 100644
--- a/lib/kernel/doc/src/error_handler.xml
+++ b/lib/kernel/doc/src/error_handler.xml
@@ -30,7 +30,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>error_handler</module>
+  <module since="">error_handler</module>
   <modulesummary>Default system error handler.</modulesummary>
   <description>
     <p>This module defines what happens when certain types
@@ -38,7 +38,7 @@
   </description>
   <funcs>
     <func>
-      <name name="raise_undef_exception" arity="3"/>
+      <name name="raise_undef_exception" arity="3" since="OTP R16B"/>
       <fsummary>Raise an undef exception.</fsummary>
       <type_desc variable="Args">
         A (possibly empty) list of arguments <c>Arg1,..,ArgN</c>
@@ -51,7 +51,7 @@
       </desc>
     </func>
     <func>
-      <name name="undefined_function" arity="3"/>
+      <name name="undefined_function" arity="3" since=""/>
       <fsummary>Called when an undefined function is encountered.</fsummary>
       <type_desc variable="Args">
         A (possibly empty) list of arguments <c>Arg1,..,ArgN</c>
@@ -93,7 +93,7 @@
       </desc>
     </func>
     <func>
-      <name name="undefined_lambda" arity="3"/>
+      <name name="undefined_lambda" arity="3" since=""/>
       <fsummary>Called when an undefined lambda (fun) is encountered.</fsummary>
       <type_desc variable="Args">
         A (possibly empty) list of arguments <c>Arg1,..,ArgN</c>
diff --git a/lib/kernel/doc/src/error_logger.xml b/lib/kernel/doc/src/error_logger.xml
index c3d68fd79f..c170b4fa34 100644
--- a/lib/kernel/doc/src/error_logger.xml
+++ b/lib/kernel/doc/src/error_logger.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>error_logger</module>
+  <module since="">error_logger</module>
   <modulesummary>Erlang error logger.</modulesummary>
   <description>
 
@@ -76,8 +76,8 @@
   </datatypes>
   <funcs>
     <func>
-      <name name="add_report_handler" arity="1"/>
-      <name name="add_report_handler" arity="2"/>
+      <name name="add_report_handler" arity="1" since=""/>
+      <name name="add_report_handler" arity="2" since=""/>
       <fsummary>Add an event handler to the error logger.</fsummary>
       <desc>
         <p>Adds a new event handler to the error logger. The event
@@ -96,7 +96,7 @@
       </desc>
     </func>
     <func>
-      <name name="delete_report_handler" arity="1"/>
+      <name name="delete_report_handler" arity="1" since=""/>
       <fsummary>Delete an event handler from the error logger.</fsummary>
       <desc>
         <p>Deletes an event handler from the error logger by calling
@@ -108,9 +108,9 @@
       </desc>
     </func>
     <func>
-      <name name="error_msg" arity="1"/>
-      <name name="error_msg" arity="2"/>
-      <name name="format" arity="2"/>
+      <name name="error_msg" arity="1" since=""/>
+      <name name="error_msg" arity="2" since=""/>
+      <name name="format" arity="2" since=""/>
       <fsummary>Log a standard error event.</fsummary>
       <desc>
         <p>Log a standard error event. The <c><anno>Format</anno></c>
@@ -142,7 +142,7 @@ ok</pre>
       </desc>
     </func>
     <func>
-      <name name="error_report" arity="1"/>
+      <name name="error_report" arity="1" since=""/>
       <fsummary>Log a standard error event.</fsummary>
       <desc>
         <p>Log a standard error event. Error logger forwards the event
@@ -169,7 +169,7 @@ ok</pre>
       </desc>
     </func>
     <func>
-      <name name="error_report" arity="2"/>
+      <name name="error_report" arity="2" since=""/>
       <fsummary>Log a user-defined error event.</fsummary>
       <desc>
         <p>Log a user-defined error event. Error logger forwards the
@@ -191,7 +191,7 @@ ok</pre>
       </desc>
     </func>
     <func>
-      <name name="get_format_depth" arity="0"/>
+      <name name="get_format_depth" arity="0" since="OTP 20.0"/>
       <fsummary>Get the value of the Kernel application variable
                 <c>error_logger_format_depth</c>.</fsummary>
       <desc>
@@ -211,8 +211,8 @@ ok</pre>
       </desc>
     </func>
     <func>
-      <name name="info_msg" arity="1"/>
-      <name name="info_msg" arity="2"/>
+      <name name="info_msg" arity="1" since=""/>
+      <name name="info_msg" arity="2" since=""/>
       <fsummary>Log a standard information event.</fsummary>
       <desc>
         <p>Log a standard information event. The <c><anno>Format</anno></c>
@@ -244,7 +244,7 @@ ok</pre>
       </desc>
     </func>
     <func>
-      <name name="info_report" arity="1"/>
+      <name name="info_report" arity="1" since=""/>
       <fsummary>Log a standard information event.</fsummary>
       <desc>
         <p>Log a standard information event. Error logger forwards the
@@ -271,7 +271,7 @@ ok</pre>
       </desc>
     </func>
     <func>
-      <name name="info_report" arity="2"/>
+      <name name="info_report" arity="2" since=""/>
       <fsummary>Log a user-defined information event.</fsummary>
       <desc>
         <p>Log a user-defined information event. Error logger forwards
@@ -294,9 +294,9 @@ ok</pre>
       </desc>
     </func>
     <func>
-      <name name="logfile" arity="1" clause_i="1"/>
-      <name name="logfile" arity="1" clause_i="2"/>
-      <name name="logfile" arity="1" clause_i="3"/>
+      <name name="logfile" arity="1" clause_i="1" since=""/>
+      <name name="logfile" arity="1" clause_i="2" since=""/>
+      <name name="logfile" arity="1" clause_i="3" since=""/>
       <fsummary>Enable or disable error printouts to a file.</fsummary>
       <type variable="Filename"/>
       <type variable="OpenReason" name_i="1"/>
@@ -346,7 +346,7 @@ ok</pre>
       </desc>
     </func>
     <func>
-      <name name="tty" arity="1"/>
+      <name name="tty" arity="1" since=""/>
       <fsummary>Enable or disable printouts to the terminal.</fsummary>
       <desc>
         <p>Enables (<c><anno>Flag</anno> == true</c>) or disables
@@ -363,7 +363,7 @@ ok</pre>
       </desc>
     </func>
     <func>
-      <name name="warning_map" arity="0"/>
+      <name name="warning_map" arity="0" since=""/>
       <fsummary>Return the current mapping for warning events.</fsummary>
       <desc>
         <p>Returns the current mapping for warning events. Events sent
@@ -400,8 +400,8 @@ ok</pre>
       </desc>
     </func>
     <func>
-      <name name="warning_msg" arity="1"/>
-      <name name="warning_msg" arity="2"/>
+      <name name="warning_msg" arity="1" since=""/>
+      <name name="warning_msg" arity="2" since=""/>
       <fsummary>Log a standard warning event.</fsummary>
       <desc>
         <p>Log a standard warning event. The <c><anno>Format</anno></c>
@@ -429,7 +429,7 @@ ok</pre>
       </desc>
     </func>
     <func>
-      <name name="warning_report" arity="1"/>
+      <name name="warning_report" arity="1" since=""/>
       <fsummary>Log a standard warning event.</fsummary>
       <desc>
         <p>Log a standard warning event. Error logger forwards the event
@@ -446,7 +446,7 @@ ok</pre>
       </desc>
     </func>
     <func>
-      <name name="warning_report" arity="2"/>
+      <name name="warning_report" arity="2" since=""/>
       <fsummary>Log a user-defined warning event.</fsummary>
       <desc>
         <p>Log a user-defined warning event. Error logger forwards the
diff --git a/lib/kernel/doc/src/file.xml b/lib/kernel/doc/src/file.xml
index 9acaf6b41e..fc25e83d40 100644
--- a/lib/kernel/doc/src/file.xml
+++ b/lib/kernel/doc/src/file.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>file</module>
+  <module since="">file</module>
   <modulesummary>File interface module.</modulesummary>
   <description>
     <p>This module provides an interface to the file system.</p>
@@ -186,7 +186,7 @@
 
   <funcs>
     <func>
-      <name name="advise" arity="4"/>
+      <name name="advise" arity="4" since="OTP R14B"/>
       <fsummary>Predeclare an access pattern for file data.</fsummary>
       <type name="posix_file_advise"/>
       <desc>
@@ -197,7 +197,7 @@
       </desc>
     </func>
     <func>
-      <name name="allocate" arity="3"/>
+      <name name="allocate" arity="3" since="OTP R16B"/>
       <fsummary>Allocate file space.</fsummary>
       <desc>
         <p><c>allocate/3</c> can be used to preallocate space for a file.</p>
@@ -209,7 +209,7 @@
       </desc>
     </func>
     <func>
-      <name name="change_group" arity="2"/>
+      <name name="change_group" arity="2" since=""/>
       <fsummary>Change group of a file.</fsummary>
       <desc>
         <p>Changes group of a file. See
@@ -217,7 +217,7 @@
       </desc>
     </func>
     <func>
-      <name name="change_mode" arity="2"/>
+      <name name="change_mode" arity="2" since="OTP R14B"/>
       <fsummary>Change permissions of a file.</fsummary>
       <desc>
         <p>Changes permissions of a file. See
@@ -225,7 +225,7 @@
       </desc>
     </func>
     <func>
-      <name name="change_owner" arity="2"/>
+      <name name="change_owner" arity="2" since=""/>
       <fsummary>Change owner of a file.</fsummary>
       <desc>
         <p>Changes owner of a file. See
@@ -233,7 +233,7 @@
       </desc>
     </func>
     <func>
-      <name name="change_owner" arity="3"/>
+      <name name="change_owner" arity="3" since=""/>
       <fsummary>Change owner and group of a file.</fsummary>
       <desc>
         <p>Changes owner and group of a file. See
@@ -241,7 +241,7 @@
       </desc>
     </func>
     <func>
-      <name name="change_time" arity="2"/>
+      <name name="change_time" arity="2" since=""/>
       <fsummary>Change the modification time of a file.</fsummary>
       <desc>
         <p>Changes the modification and access times of a file. See
@@ -249,7 +249,7 @@
       </desc>
     </func>
     <func>
-      <name name="change_time" arity="3"/>
+      <name name="change_time" arity="3" since=""/>
       <fsummary>Change the modification and last access time of a file.</fsummary>
       <desc>
         <p>Changes the modification and last access times of a file. See
@@ -257,7 +257,7 @@
       </desc>
     </func>
     <func>
-      <name name="close" arity="1"/>
+      <name name="close" arity="1" since=""/>
       <fsummary>Close a file.</fsummary>
       <desc>
         <p>Closes the file referenced by <c><anno>IoDevice</anno></c>. It mostly
@@ -270,7 +270,7 @@
       </desc>
     </func>
     <func>
-      <name name="consult" arity="1"/>
+      <name name="consult" arity="1" since=""/>
       <fsummary>Read Erlang terms from a file.</fsummary>
       <desc>
         <p>Reads Erlang terms, separated by '.', from
@@ -308,8 +308,8 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="copy" arity="2"/>
-      <name name="copy" arity="3"/>
+      <name name="copy" arity="2" since=""/>
+      <name name="copy" arity="3" since=""/>
       <fsummary>Copy file contents.</fsummary>
       <desc>
         <p>Copies <c><anno>ByteCount</anno></c> bytes from
@@ -346,7 +346,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="datasync" arity="1"/>
+      <name name="datasync" arity="1" since="OTP R14B"/>
       <fsummary>Synchronize the in-memory data of a file, ignoring most of its metadata, with that on the physical medium.</fsummary>
       <desc>
         <p>Ensures that any buffers kept by the operating system
@@ -369,7 +369,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="del_dir" arity="1"/>
+      <name name="del_dir" arity="1" since=""/>
       <fsummary>Delete a directory.</fsummary>
       <desc>
         <p>Tries to delete directory <c><anno>Dir</anno></c>.
@@ -405,7 +405,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="delete" arity="1"/>
+      <name name="delete" arity="1" since=""/>
       <fsummary>Delete a file.</fsummary>
       <desc>
         <p>Tries to delete file <c><anno>Filename</anno></c>.
@@ -442,7 +442,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="eval" arity="1"/>
+      <name name="eval" arity="1" since=""/>
       <fsummary>Evaluate Erlang expressions in a file.</fsummary>
       <desc>
         <p>Reads and evaluates Erlang expressions, separated by '.' (or
@@ -476,7 +476,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="eval" arity="2"/>
+      <name name="eval" arity="2" since=""/>
       <fsummary>Evaluate Erlang expressions in a file.</fsummary>
       <desc>
         <p>The same as <c>eval/1</c>, but the variable bindings
@@ -486,7 +486,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="format_error" arity="1"/>
+      <name name="format_error" arity="1" since=""/>
       <fsummary>Return a descriptive string for an error reason.</fsummary>
       <desc>
         <p>Given the error reason returned by any function in this
@@ -494,7 +494,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="get_cwd" arity="0"/>
+      <name name="get_cwd" arity="0" since=""/>
       <fsummary>Get the current working directory.</fsummary>
       <desc>
         <p>Returns <c>{ok, <anno>Dir</anno>}</c>, where <c><anno>Dir</anno></c>
@@ -516,7 +516,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="get_cwd" arity="1"/>
+      <name name="get_cwd" arity="1" since=""/>
       <fsummary>Get the current working directory for the specified drive.</fsummary>
       <desc>
 	<p>Returns <c>{ok, <anno>Dir</anno>}</c> or
@@ -547,7 +547,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="list_dir" arity="1"/>
+      <name name="list_dir" arity="1" since=""/>
       <fsummary>List files in a directory.</fsummary>
       <desc>
         <p>Lists all files in a directory, <em>except</em> files
@@ -578,7 +578,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="list_dir_all" arity="1"/>
+      <name name="list_dir_all" arity="1" since="OTP R16B"/>
       <fsummary>List all files in a directory.</fsummary>
       <desc>
         <p><marker id="list_dir_all"/>Lists all the files in a directory,
@@ -603,7 +603,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="make_dir" arity="1"/>
+      <name name="make_dir" arity="1" since=""/>
       <fsummary>Make a directory.</fsummary>
       <desc>
         <p>Tries to create directory <c><anno>Dir</anno></c>. Missing parent
@@ -637,7 +637,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="make_link" arity="2"/>
+      <name name="make_link" arity="2" since=""/>
       <fsummary>Make a hard link to a file.</fsummary>
       <desc>
         <p>Makes a hard link from <c><anno>Existing</anno></c> to
@@ -666,7 +666,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="make_symlink" arity="2"/>
+      <name name="make_symlink" arity="2" since=""/>
       <fsummary>Make a symbolic link to a file or directory.</fsummary>
       <desc>
         <p>Creates a symbolic link <c><anno>New</anno></c> to
@@ -702,7 +702,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="native_name_encoding" arity="0"/>
+      <name name="native_name_encoding" arity="0" since="OTP R14B01"/>
       <fsummary>Return the configured filename encoding of the VM.</fsummary>
       <desc>
 	<p><marker id="native_name_encoding"/>Returns
@@ -714,7 +714,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="open" arity="2"/>
+      <name name="open" arity="2" since=""/>
       <fsummary>Open a file.</fsummary>
       <desc>
         <p>Opens file <c><anno>File</anno></c> in the mode determined
@@ -997,7 +997,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="path_consult" arity="2"/>
+      <name name="path_consult" arity="2" since=""/>
       <fsummary>Read Erlang terms from a file.</fsummary>
       <desc>
         <p>Searches the path <c><anno>Path</anno></c> (a list of directory
@@ -1039,7 +1039,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="path_eval" arity="2"/>
+      <name name="path_eval" arity="2" since=""/>
       <fsummary>Evaluate Erlang expressions in a file.</fsummary>
       <desc>
         <p>Searches the path <c><anno>Path</anno></c> (a list of directory
@@ -1085,7 +1085,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="path_open" arity="3"/>
+      <name name="path_open" arity="3" since=""/>
       <fsummary>Open a file.</fsummary>
       <desc>
         <p>Searches the path <c><anno>Path</anno></c> (a list of directory
@@ -1114,7 +1114,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="path_script" arity="2"/>
+      <name name="path_script" arity="2" since=""/>
       <fsummary>Evaluate and return the value of Erlang expressions in a file.</fsummary>
       <desc>
         <p>Searches the path <c><anno>Path</anno></c> (a list of directory
@@ -1158,7 +1158,7 @@ f.txt:  {person, "kalle", 25}.
    </desc>
     </func>
     <func>
-      <name name="path_script" arity="3"/>
+      <name name="path_script" arity="3" since=""/>
       <fsummary>Evaluate and return the value of Erlang expressions in a file.</fsummary>
       <desc>
         <p>The same as <c>path_script/2</c> but the variable bindings
@@ -1168,7 +1168,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="pid2name" arity="1"/>
+      <name name="pid2name" arity="1" since=""/>
       <fsummary>Return the name of the file handled by a pid.</fsummary>
       <desc>
         <p>If <c><anno>Pid</anno></c> is an I/O device, that is, a pid returned from
@@ -1193,7 +1193,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="position" arity="2"/>
+      <name name="position" arity="2" since=""/>
       <fsummary>Set position in a file.</fsummary>
       <desc>
         <p>Sets the position of the file referenced by <c><anno>IoDevice</anno></c>
@@ -1245,7 +1245,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="pread" arity="2"/>
+      <name name="pread" arity="2" since=""/>
       <fsummary>Read from a file at certain positions.</fsummary>
       <desc>
         <p>Performs a sequence of <c>pread/3</c> in one operation, 
@@ -1263,7 +1263,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="pread" arity="3"/>
+      <name name="pread" arity="3" since=""/>
       <fsummary>Read from a file at a certain position.</fsummary>
       <desc>
         <p>Combines <c>position/2</c> and <c>read/2</c> in one
@@ -1283,7 +1283,7 @@ f.txt:  {person, "kalle", 25}.
         </desc>
     </func>
     <func>
-      <name name="pwrite" arity="2"/>
+      <name name="pwrite" arity="2" since=""/>
       <fsummary>Write to a file at certain positions.</fsummary>
       <desc>
         <p>Performs a sequence of <c>pwrite/3</c> in one operation, 
@@ -1298,7 +1298,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="pwrite" arity="3"/>
+      <name name="pwrite" arity="3" since=""/>
       <fsummary>Write to a file at a certain position.</fsummary>
       <desc>
         <p>Combines <c>position/2</c> and <c>write/2</c> in one
@@ -1317,7 +1317,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="read" arity="2"/>
+      <name name="read" arity="2" since=""/>
       <fsummary>Read from a file.</fsummary>
       <desc>
         <p>Reads <c><anno>Number</anno></c> bytes/characters from the file
@@ -1371,7 +1371,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="read_file" arity="1"/>
+      <name name="read_file" arity="1" since=""/>
       <fsummary>Read a file.</fsummary>
       <desc>
         <p>Returns <c>{ok, <anno>Binary</anno>}</c>, where
@@ -1407,8 +1407,8 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="read_file_info" arity="1"/>
-      <name name="read_file_info" arity="2"/>
+      <name name="read_file_info" arity="1" since=""/>
+      <name name="read_file_info" arity="2" since="OTP R15B"/>
       <fsummary>Retrieve information about a file.</fsummary>
       <desc>
         <p>Retrieves information about a file. Returns
@@ -1562,7 +1562,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="read_line" arity="1"/>
+      <name name="read_line" arity="1" since=""/>
       <fsummary>Read a line from a file.</fsummary>
       <desc>
         <p>Reads a line of bytes/characters from the file referenced by
@@ -1619,7 +1619,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="read_link" arity="1"/>
+      <name name="read_link" arity="1" since=""/>
       <fsummary>See what a link is pointing to.</fsummary>
       <desc>
         <p><marker id="read_link_all"/>Returns
@@ -1649,7 +1649,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="read_link_all" arity="1"/>
+      <name name="read_link_all" arity="1" since="OTP R16B"/>
       <fsummary>See what a link is pointing to.</fsummary>
       <desc>
         <p>Returns <c>{ok, <anno>Filename</anno>}</c> if
@@ -1677,8 +1677,8 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="read_link_info" arity="1"/>
-      <name name="read_link_info" arity="2"/>
+      <name name="read_link_info" arity="1" since=""/>
+      <name name="read_link_info" arity="2" since="OTP R15B"/>
       <fsummary>Retrieve information about a link or file.</fsummary>
       <desc>
 	<p>Works like
@@ -1699,7 +1699,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="rename" arity="2"/>
+      <name name="rename" arity="2" since=""/>
       <fsummary>Rename a file.</fsummary>
       <desc>
         <p>Tries to rename the file <c><anno>Source</anno></c> to
@@ -1762,7 +1762,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="script" arity="1"/>
+      <name name="script" arity="1" since=""/>
       <fsummary>Evaluate and return the value of Erlang expressions in a file.</fsummary>
       <desc>
         <p>Reads and evaluates Erlang expressions, separated by '.' (or
@@ -1797,7 +1797,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="script" arity="2"/>
+      <name name="script" arity="2" since=""/>
       <fsummary>Evaluate and return the value of Erlang expressions in a file.</fsummary>
       <desc>
         <p>The same as <c>script/1</c> but the variable bindings
@@ -1807,7 +1807,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="sendfile" arity="2"/>
+      <name name="sendfile" arity="2" since="OTP R15B"/>
       <fsummary>Send a file to a socket.</fsummary>
       <desc>
         <p>Sends the file <c>Filename</c> to <c>Socket</c>.
@@ -1816,7 +1816,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="sendfile" arity="5"/>
+      <name name="sendfile" arity="5" since="OTP R15B"/>
       <fsummary>Send a file to a socket.</fsummary>
       <type name="sendfile_option"/>
       <desc>
@@ -1843,7 +1843,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="set_cwd" arity="1"/>
+      <name name="set_cwd" arity="1" since=""/>
       <fsummary>Set the current working directory.</fsummary>
       <desc>
         <p>Sets the current working directory of the file server to
@@ -1890,7 +1890,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="sync" arity="1"/>
+      <name name="sync" arity="1" since=""/>
       <fsummary>Synchronize the in-memory state of a file with that on the physical medium.</fsummary>
       <desc>
         <p>Ensures that any buffers kept by the operating system
@@ -1906,7 +1906,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="truncate" arity="1"/>
+      <name name="truncate" arity="1" since=""/>
       <fsummary>Truncate a file.</fsummary>
       <desc>
         <p>Truncates the file referenced by <c><anno>IoDevice</anno></c> at
@@ -1915,7 +1915,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="write" arity="2"/>
+      <name name="write" arity="2" since=""/>
       <fsummary>Write to a file.</fsummary>
       <desc>
         <p>Writes <c><anno>Bytes</anno></c> to the file referenced by
@@ -1941,7 +1941,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="write_file" arity="2"/>
+      <name name="write_file" arity="2" since=""/>
       <fsummary>Write a file.</fsummary>
       <desc>
         <p>Writes the contents of the <c>iodata</c> term <c><anno>Bytes</anno></c>
@@ -1978,7 +1978,7 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="write_file" arity="3"/>
+      <name name="write_file" arity="3" since=""/>
       <fsummary>Write a file.</fsummary>
       <desc>
         <p>Same as <c>write_file/2</c>, but takes a third argument
@@ -1989,8 +1989,8 @@ f.txt:  {person, "kalle", 25}.
       </desc>
     </func>
     <func>
-      <name name="write_file_info" arity="2"/>
-      <name name="write_file_info" arity="3"/>
+      <name name="write_file_info" arity="2" since=""/>
+      <name name="write_file_info" arity="3" since="OTP R15B"/>
       <fsummary>Change file information.</fsummary>
       <desc>
         <p>Changes file information. Returns <c>ok</c> if successful,
diff --git a/lib/kernel/doc/src/gen_sctp.xml b/lib/kernel/doc/src/gen_sctp.xml
index 1e08b25f66..61ac1485c1 100644
--- a/lib/kernel/doc/src/gen_sctp.xml
+++ b/lib/kernel/doc/src/gen_sctp.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>gen_sctp.xml</file>
   </header>
-  <module>gen_sctp</module>
+  <module since="">gen_sctp</module>
   <modulesummary>Functions for communicating with sockets using the SCTP
     protocol.</modulesummary>
   <description>
@@ -100,7 +100,7 @@
 
   <funcs>
     <func>
-      <name name="abort" arity="2"/>
+      <name name="abort" arity="2" since=""/>
       <fsummary>Abnormally terminate the association specified by
         <c>Assoc</c>, without flushing of unsent data.</fsummary>
       <desc>
@@ -113,7 +113,7 @@
     </func>
 
     <func>
-      <name name="close" arity="1"/>
+      <name name="close" arity="1" since=""/>
       <fsummary>Close the socket and all associations on it.</fsummary>
       <desc>
         <p>Closes the socket and all associations on it. The unsent
@@ -128,7 +128,7 @@
     </func>
 
     <func>
-      <name name="connect" arity="4"/>
+      <name name="connect" arity="4" since=""/>
       <fsummary>Same as <c>connect(Socket, Addr, Port, Opts, infinity)</c>.</fsummary>
       <desc>
         <p>Same as <c>connect(<anno>Socket</anno>, <anno>Addr</anno>,
@@ -137,7 +137,7 @@
     </func>
 
     <func>
-      <name name="connect" arity="5"/>
+      <name name="connect" arity="5" since=""/>
       <fsummary>Establish a new association for socket <c>Socket</c>, with a
         peer (SCTP server socket).</fsummary>
       <desc>
@@ -213,7 +213,7 @@ connect(Socket, Ip, Port>,
     </func>
 
     <func>
-      <name name="connect_init" arity="4"/>
+      <name name="connect_init" arity="4" since="OTP R13B04"/>
       <fsummary>Same as <c>connect_init(Socket, Addr, Port, Opts, infinity)</c>..</fsummary>
       <desc>
         <p>Same as <c>connect_init(<anno>Socket</anno>, <anno>Addr</anno>,
@@ -222,7 +222,7 @@ connect(Socket, Ip, Port>,
     </func>
 
     <func>
-      <name name="connect_init" arity="5"/>
+      <name name="connect_init" arity="5" since="OTP R13B04"/>
       <fsummary>Initiate a new association for socket <c>Socket</c>, with a
         peer (SCTP server socket).</fsummary>
       <desc>
@@ -248,18 +248,18 @@ connect(Socket, Ip, Port>,
     </func>
 
     <func>
-      <name name="controlling_process" arity="2"/>
+      <name name="controlling_process" arity="2" since=""/>
       <fsummary>Assign a new controlling process pid to the socket.</fsummary>
       <desc>
         <p>Assigns a new controlling process <c><anno>Pid</anno></c> to
           <c><anno>Socket</anno></c>. Same implementation as
-          <seealso marker="gen_udp:controlling_process/2"><c>gen_udp:controlling_process/2</c></seealso>.
+          <seealso marker="gen_udp#controlling_process/2"><c>gen_udp:controlling_process/2</c></seealso>.
         </p>
       </desc>
     </func>
 
     <func>
-      <name name="eof" arity="2"/>
+      <name name="eof" arity="2" since=""/>
       <fsummary>Gracefully terminate the association specified by <c>Assoc</c>,
         with flushing of all unsent data.</fsummary>
       <desc>
@@ -272,7 +272,7 @@ connect(Socket, Ip, Port>,
     </func>
 
     <func>
-      <name name="error_string" arity="1"/>
+      <name name="error_string" arity="1" since=""/>
       <fsummary>Translate an SCTP error number into a string.</fsummary>
       <desc>
         <p>Translates an SCTP error number from, for example,
@@ -283,8 +283,8 @@ connect(Socket, Ip, Port>,
     </func>
 
     <func>
-      <name name="listen" arity="2" clause_i="1"/>
-      <name name="listen" arity="2" clause_i="2"/>
+      <name name="listen" arity="2" clause_i="1" since=""/>
+      <name name="listen" arity="2" clause_i="2" since="OTP R15B"/>
       <fsummary>Set up a socket to listen.</fsummary>
       <desc>
         <p>Sets up a socket to listen on the IP address and port number
@@ -300,10 +300,10 @@ connect(Socket, Ip, Port>,
     </func>
 
     <func>
-      <name name="open" arity="0"/>
-      <name name="open" arity="1" clause_i="1"/>
-      <name name="open" arity="1" clause_i="2"/>
-      <name name="open" arity="2"/>
+      <name name="open" arity="0" since=""/>
+      <name name="open" arity="1" clause_i="1" since=""/>
+      <name name="open" arity="1" clause_i="2" since=""/>
+      <name name="open" arity="2" since=""/>
       <fsummary>Create an SCTP socket and binds it to local addresses.</fsummary>
       <desc>
         <p>Creates an SCTP socket and binds it to the local addresses
@@ -366,7 +366,7 @@ connect(Socket, Ip, Port>,
     </func>
 
     <func>
-      <name name="peeloff" arity="2"/>
+      <name name="peeloff" arity="2" since="OTP R15B"/>
       <fsummary>Peel off a type <c>stream</c> socket from a type
         <c>seqpacket</c> one.</fsummary>
       <desc>
@@ -387,8 +387,8 @@ connect(Socket, Ip, Port>,
     </func>
 
     <func>
-      <name name="recv" arity="1"/>
-      <name name="recv" arity="2"/>
+      <name name="recv" arity="1" since=""/>
+      <name name="recv" arity="2" since=""/>
       <fsummary>Receive a message from a socket.</fsummary>
       <desc>
         <p>Receives the <c><anno>Data</anno></c> message from any association
@@ -532,7 +532,7 @@ connect(Socket, Ip, Port>,
     </func>
 
     <func>
-      <name name="send" arity="3"/>
+      <name name="send" arity="3" since=""/>
       <fsummary>Send a message using an <c>#sctp_sndrcvinfo{}</c>record.</fsummary>
       <desc>
         <p>Sends the <c><anno>Data</anno></c> message with all sending
@@ -547,7 +547,7 @@ connect(Socket, Ip, Port>,
     </func>
 
     <func>
-      <name name="send" arity="4"/>
+      <name name="send" arity="4" since=""/>
       <fsummary>Send a message over an existing association and specified
         stream.</fsummary>
       <desc>
diff --git a/lib/kernel/doc/src/gen_tcp.xml b/lib/kernel/doc/src/gen_tcp.xml
index 24d63693fd..f8b41d24e2 100644
--- a/lib/kernel/doc/src/gen_tcp.xml
+++ b/lib/kernel/doc/src/gen_tcp.xml
@@ -27,7 +27,7 @@
     <date>1997-10-24</date>
     <rev>A</rev>
   </header>
-  <module>gen_tcp</module>
+  <module since="">gen_tcp</module>
   <modulesummary>Interface to TCP/IP sockets.</modulesummary>
   <description>
     <p>This module provides functions for communicating
@@ -116,8 +116,8 @@ do_recv(Sock, Bs) ->
 
   <funcs>
     <func>
-      <name name="accept" arity="1"/>
-      <name name="accept" arity="2"/>
+      <name name="accept" arity="1" since=""/>
+      <name name="accept" arity="2" since=""/>
       <fsummary>Accept an incoming connection request on a listening socket.</fsummary>
       <type_desc variable="ListenSocket">Returned by
         <seealso marker="#listen/2"><c>listen/2</c></seealso>.
@@ -163,7 +163,7 @@ do_recv(Sock, Bs) ->
     </func>
 
     <func>
-      <name name="close" arity="1"/>
+      <name name="close" arity="1" since=""/>
       <fsummary>Close a TCP socket.</fsummary>
       <desc>
         <p>Closes a TCP socket.</p>
@@ -188,8 +188,8 @@ do_recv(Sock, Bs) ->
     </func>
 
     <func>
-      <name name="connect" arity="3"/>
-      <name name="connect" arity="4"/>
+      <name name="connect" arity="3" since=""/>
+      <name name="connect" arity="4" since=""/>
       <fsummary>Connect to a TCP port.</fsummary>
       <desc>
         <p>Connects to a server on TCP port <c><anno>Port</anno></c> on the host
@@ -259,6 +259,12 @@ do_recv(Sock, Bs) ->
         <p>The optional <c><anno>Timeout</anno></c> parameter specifies a
           time-out in milliseconds. Defaults to <c>infinity</c>.</p>
         <note>
+          <p>Keep in mind that if the underlying OS <c>connect()</c> call returns
+            a timeout, <c>gen_tcp:connect</c> will also return a timeout
+            (i.e. <c>{error, etimedout}</c>), even if a larger <c>Timeout</c> was
+            specified.</p>
+        </note>
+        <note>
           <p>The default values for options specified to <c>connect</c> can
             be affected by the Kernel configuration parameter
             <c>inet_default_connect_options</c>. For details, see
@@ -268,7 +274,7 @@ do_recv(Sock, Bs) ->
     </func>
 
     <func>
-      <name name="controlling_process" arity="2"/>
+      <name name="controlling_process" arity="2" since=""/>
       <fsummary>Change controlling process of a socket.</fsummary>
       <desc>
         <p>Assigns a new controlling process <c><anno>Pid</anno></c> to
@@ -292,7 +298,7 @@ do_recv(Sock, Bs) ->
     </func>
 
     <func>
-      <name name="listen" arity="2"/>
+      <name name="listen" arity="2" since=""/>
       <fsummary>Set up a socket to listen on a port.</fsummary>
       <desc>
         <p>Sets up a socket to listen on port <c><anno>Port</anno></c> on
@@ -349,8 +355,8 @@ do_recv(Sock, Bs) ->
     </func>
 
     <func>
-      <name name="recv" arity="2"/>
-      <name name="recv" arity="3"/>
+      <name name="recv" arity="2" since=""/>
+      <name name="recv" arity="3" since=""/>
       <fsummary>Receive a packet from a passive socket.</fsummary>
       <type_desc variable="HttpPacket">See the description of
         <c>HttpPacket</c> in
@@ -375,7 +381,7 @@ do_recv(Sock, Bs) ->
     </func>
 
     <func>
-      <name name="send" arity="2"/>
+      <name name="send" arity="2" since=""/>
       <fsummary>Send a packet.</fsummary>
       <desc>
         <p>Sends a packet on a socket.</p>
@@ -386,7 +392,7 @@ do_recv(Sock, Bs) ->
     </func>
 
     <func>
-      <name name="shutdown" arity="2"/>
+      <name name="shutdown" arity="2" since=""/>
       <fsummary>Asynchronously close a socket.</fsummary>
       <desc>
         <p>Closes a socket in one or two directions.</p>
diff --git a/lib/kernel/doc/src/gen_udp.xml b/lib/kernel/doc/src/gen_udp.xml
index 840ca3c188..6c0d072fed 100644
--- a/lib/kernel/doc/src/gen_udp.xml
+++ b/lib/kernel/doc/src/gen_udp.xml
@@ -28,7 +28,7 @@
     <date>1997-12-03</date>
     <rev>A</rev>
   </header>
-  <module>gen_udp</module>
+  <module since="">gen_udp</module>
   <modulesummary>Interface to UDP sockets.</modulesummary>
   <description>
     <p>This module provides functions for communicating
@@ -53,7 +53,7 @@
 
   <funcs>
     <func>
-      <name name="close" arity="1"/>
+      <name name="close" arity="1" since=""/>
       <fsummary>Close a UDP socket.</fsummary>
       <desc>
         <p>Closes a UDP socket.</p>
@@ -61,7 +61,7 @@
     </func>
 
     <func>
-      <name name="controlling_process" arity="2"/>
+      <name name="controlling_process" arity="2" since=""/>
       <fsummary>Change controlling process of a socket.</fsummary>
       <desc>
         <p>Assigns a new controlling process <c><anno>Pid</anno></c> to
@@ -77,8 +77,8 @@
     </func>
 
     <func>
-      <name name="open" arity="1"/>
-      <name name="open" arity="2"/>
+      <name name="open" arity="1" since=""/>
+      <name name="open" arity="2" since=""/>
       <fsummary>Associate a UDP port number with the process calling it.</fsummary>
       <desc>
         <p>Associates a UDP port number (<c><anno>Port</anno></c>) with the
@@ -189,8 +189,8 @@
     </func>
 
     <func>
-      <name name="recv" arity="2"/>
-      <name name="recv" arity="3"/>
+      <name name="recv" arity="2" since=""/>
+      <name name="recv" arity="3" since=""/>
       <fsummary>Receive a packet from a passive socket.</fsummary>
       <desc>
         <p>
@@ -213,12 +213,93 @@
     </func>
 
     <func>
-      <name name="send" arity="4"/>
+      <name name="send" arity="3" since="OTP @OTP-15747@"/>
       <fsummary>Send a packet.</fsummary>
       <desc>
         <p>
-	  Sends a packet to the specified address and port. Argument
-          <c><anno>Address</anno></c> can be a hostname or a socket address.
+	  Sends a packet to the specified <c><anno>Destination</anno></c>.
+	</p>
+	<p>
+	  This function is equivalent to
+	  <seealso marker="#send-4-AncData"><c>send(<anno>Socket</anno>, <anno>Destination</anno>, [], <anno>Packet</anno>)</c></seealso>.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="send" arity="4" clause_i="1" since=""/>
+      <fsummary>Send a packet.</fsummary>
+      <desc>
+        <p>
+	  Sends a packet to the specified <c><anno>Host</anno></c>
+	  and <c><anno>Port</anno></c>.
+	</p>
+	<p>
+	  This clause is equivalent to
+	  <seealso marker="#send/5"><c>send(<anno>Socket</anno>, <anno>Host</anno>, <anno>Port</anno>, [], <anno>Packet</anno>)</c></seealso>.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="send" arity="4" clause_i="2" anchor="send-4-AncData" since="OTP @OTP-15747@"/>
+      <fsummary>Send a packet.</fsummary>
+      <desc>
+        <p>
+	  Sends a packet to the specified <c><anno>Destination</anno></c>
+	  with ancillary data <c><anno>AncData</anno></c>.
+	</p>
+	<note>
+	  <p>
+	    The ancillary data <c><anno>AncData</anno></c>
+	    contains options that for this single message
+	    override the default options for the socket,
+	    an operation that may not be supported on all platforms,
+	    and if so return <c>{error, einval}</c>.
+	    Using more than one of an ancillary data item type
+	    may also not be supported.
+	    <c><anno>AncData</anno> =:= []</c> is always supported.
+	  </p>
+	</note>
+      </desc>
+    </func>
+
+    <func>
+      <name name="send" arity="4" clause_i="3" since="OTP @OTP-15747@"/>
+      <fsummary>Send a packet.</fsummary>
+      <desc>
+        <p>
+	  Sends a packet to the specified <c><anno>Destination</anno></c>.
+	  Since <c><anno>Destination</anno></c> is complete,
+	  <c><anno>PortZero</anno></c> is redundant and has to be <c>0</c>.
+	</p>
+	<p>
+	  This is a legacy clause mostly for
+	  <c><anno>Destination</anno> = {local, Binary}</c>
+	  where <c><anno>PortZero</anno></c> is superfluous.
+	  It is equivalent to
+	  <seealso marker="#send-4-AncData"><c>send(<anno>Socket</anno>, <anno>Destination</anno>, [], <anno>Packet</anno>)</c></seealso>, the clause right above here.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="send" arity="5" since="OTP @OTP-15747@"/>
+      <fsummary>Send a packet.</fsummary>
+      <desc>
+        <p>
+	  Sends a packet to the specified <c><anno>Host</anno></c>
+	  and <c><anno>Port</anno></c>,
+	  with ancillary data <c><anno>AncData</anno></c>.
+	</p>
+	<p>
+	  Argument <c><anno>Host</anno></c> can be
+	  a hostname or a socket address,
+	  and <c><anno>Port</anno></c> can be a port number
+	  or a service name atom.
+	  These are resolved into a <c>Destination</c> and after that
+	  this function is equivalent to
+	  <seealso marker="#send-4-AncData"><c>send(<anno>Socket</anno>, Destination, <anno>AncData</anno>, <anno>Packet</anno>)</c></seealso>, read there about ancillary data.
 	</p>
       </desc>
     </func>
diff --git a/lib/kernel/doc/src/global.xml b/lib/kernel/doc/src/global.xml
index 4442741f54..dfe71de5ce 100644
--- a/lib/kernel/doc/src/global.xml
+++ b/lib/kernel/doc/src/global.xml
@@ -28,7 +28,7 @@
     <date>1997-11-17</date>
     <rev></rev>
   </header>
-  <module>global</module>
+  <module since="">global</module>
   <modulesummary>A global name registration facility.</modulesummary>
   <description>
     <p>This module consists of the following services:</p>
@@ -100,8 +100,8 @@
 
   <funcs>
     <func>
-      <name name="del_lock" arity="1"/>
-      <name name="del_lock" arity="2"/>
+      <name name="del_lock" arity="1" since=""/>
+      <name name="del_lock" arity="2" since=""/>
       <fsummary>Delete a lock.</fsummary>
       <desc>
         <p>Deletes the lock <c><anno>Id</anno></c> synchronously.</p>
@@ -109,7 +109,7 @@
     </func>
 
     <func>
-      <name name="notify_all_name" arity="3"/>
+      <name name="notify_all_name" arity="3" since=""/>
       <fsummary>Name resolving function that notifies both pids.</fsummary>
       <desc>
         <p>Can be used as a name resolving function for
@@ -123,7 +123,7 @@
     </func>
 
     <func>
-      <name name="random_exit_name" arity="3"/>
+      <name name="random_exit_name" arity="3" since=""/>
       <fsummary>Name resolving function that kills one pid.</fsummary>
       <desc>
         <p>Can be used as a name resolving function for
@@ -136,7 +136,7 @@
     </func>
 
     <func>
-      <name name="random_notify_name" arity="3"/>
+      <name name="random_notify_name" arity="3" since=""/>
       <fsummary>Name resolving function that notifies one pid.</fsummary>
       <desc>
         <p>Can be used as a name resolving function for
@@ -150,8 +150,8 @@
     </func>
 
     <func>
-      <name name="re_register_name" arity="2"/>
-      <name name="re_register_name" arity="3"/>
+      <name name="re_register_name" arity="2" since=""/>
+      <name name="re_register_name" arity="3" since=""/>
       <fsummary>Atomically re-register a name.</fsummary>
       <type name="method"/>
       <type_desc name="method">{<c>Module</c>, <c>Function</c>}
@@ -167,8 +167,8 @@
     </func>
 
     <func>
-      <name name="register_name" arity="2"/>
-      <name name="register_name" arity="3"/>
+      <name name="register_name" arity="2" since=""/>
+      <name name="register_name" arity="3" since=""/>
       <fsummary>Globally register a name for a pid.</fsummary>
       <type name="method"/>
       <type_desc name="method">{<c>Module</c>, <c>Function</c>} is also
@@ -221,7 +221,7 @@
     </func>
 
     <func>
-      <name name="registered_names" arity="0"/>
+      <name name="registered_names" arity="0" since=""/>
       <fsummary>All globally registered names.</fsummary>
       <desc>
         <p>Returns a list of all globally registered names.</p>
@@ -229,7 +229,7 @@
     </func>
 
     <func>
-      <name name="send" arity="2"/>
+      <name name="send" arity="2" since=""/>
       <fsummary>Send a message to a globally registered pid.</fsummary>
       <desc>
         <p>Sends message <c><anno>Msg</anno></c> to the pid globally registered
@@ -241,9 +241,9 @@
     </func>
 
     <func>
-      <name name="set_lock" arity="1"/>
-      <name name="set_lock" arity="2"/>
-      <name name="set_lock" arity="3"/>
+      <name name="set_lock" arity="1" since=""/>
+      <name name="set_lock" arity="2" since=""/>
+      <name name="set_lock" arity="3" since=""/>
       <fsummary>Set a lock on the specified nodes.</fsummary>
       <type name="id"/>
       <type name="retries"/>
@@ -287,7 +287,7 @@
     </func>
 
     <func>
-      <name name="sync" arity="0"/>
+      <name name="sync" arity="0" since=""/>
       <fsummary>Synchronize the global name server.</fsummary>
       <desc>
         <p>Synchronizes the global name server with all nodes known to
@@ -302,9 +302,9 @@
     </func>
 
     <func>
-      <name name="trans" arity="2"/>
-      <name name="trans" arity="3"/>
-      <name name="trans" arity="4"/>
+      <name name="trans" arity="2" since=""/>
+      <name name="trans" arity="3" since=""/>
+      <name name="trans" arity="4" since=""/>
       <fsummary>Micro transaction facility.</fsummary>
       <type name="retries"/>
       <type name="trans_fun"/>
@@ -322,7 +322,7 @@
     </func>
 
     <func>
-      <name name="unregister_name" arity="1"/>
+      <name name="unregister_name" arity="1" since=""/>
       <fsummary>Remove a globally registered name for a pid.</fsummary>
       <desc>
         <p>Removes the globally registered name <c><anno>Name</anno></c> from
@@ -331,7 +331,7 @@
     </func>
 
     <func>
-      <name name="whereis_name" arity="1"/>
+      <name name="whereis_name" arity="1" since=""/>
       <fsummary>Get the pid with a specified globally registered name.</fsummary>
       <desc>
         <p>Returns the pid with the globally registered name
diff --git a/lib/kernel/doc/src/global_group.xml b/lib/kernel/doc/src/global_group.xml
index 8f947b9adf..74d15cd476 100644
--- a/lib/kernel/doc/src/global_group.xml
+++ b/lib/kernel/doc/src/global_group.xml
@@ -28,7 +28,7 @@
     <date>1998-12-18</date>
     <rev>B</rev>
   </header>
-  <module>global_group</module>
+  <module since="">global_group</module>
   <modulesummary>Grouping nodes to global name registration groups.</modulesummary>
   <description>
     <p>This module makes it possible to partition the nodes of a
@@ -105,7 +105,7 @@
 
   <funcs>
     <func>
-      <name name="global_groups" arity="0"/>
+      <name name="global_groups" arity="0" since=""/>
       <fsummary>Return the global group names.</fsummary>
       <desc>
         <p>Returns a tuple containing the name of the global group that
@@ -116,7 +116,7 @@
     </func>
 
     <func>
-      <name name="info" arity="0"/>
+      <name name="info" arity="0" since=""/>
       <fsummary>Information about global groups.</fsummary>
       <type name="info_item"/>
       <type name="sync_state"/>
@@ -173,7 +173,7 @@
     </func>
 
     <func>
-      <name name="monitor_nodes" arity="1"/>
+      <name name="monitor_nodes" arity="1" since=""/>
       <fsummary>Subscribe to node status changes.</fsummary>
       <desc>
         <p>Depending on <c><anno>Flag</anno></c>, the calling process
@@ -187,7 +187,7 @@
     </func>
 
     <func>
-      <name name="own_nodes" arity="0"/>
+      <name name="own_nodes" arity="0" since=""/>
       <fsummary>Return the group nodes.</fsummary>
       <desc>
         <p>Returns the names of all group nodes, regardless of their
@@ -196,7 +196,7 @@
     </func>
 
     <func>
-      <name name="registered_names" arity="1"/>
+      <name name="registered_names" arity="1" since=""/>
       <fsummary>Return globally registered names.</fsummary>
       <desc>
         <p>Returns a list of all names that are globally registered
@@ -205,8 +205,8 @@
     </func>
 
     <func>
-      <name name="send" arity="2"/>
-      <name name="send" arity="3"/>
+      <name name="send" arity="2" since=""/>
+      <name name="send" arity="3" since=""/>
       <fsummary>Send a message to a globally registered pid.</fsummary>
       <desc>
         <p>Searches for <c><anno>Name</anno></c>, globally registered on
@@ -224,7 +224,7 @@
     </func>
 
     <func>
-      <name name="sync" arity="0"/>
+      <name name="sync" arity="0" since=""/>
       <fsummary>Synchronize the group nodes.</fsummary>
       <desc>
         <p>Synchronizes the group nodes, that is, the global name
@@ -242,8 +242,8 @@
     </func>
 
     <func>
-      <name name="whereis_name" arity="1"/>
-      <name name="whereis_name" arity="2"/>
+      <name name="whereis_name" arity="1" since=""/>
+      <name name="whereis_name" arity="2" since=""/>
       <fsummary>Get the pid with a specified globally registered name.</fsummary>
       <desc>
         <p>Searches for <c><anno>Name</anno></c>, globally registered on
diff --git a/lib/kernel/doc/src/heart.xml b/lib/kernel/doc/src/heart.xml
index ad1a2ffeb9..4243b1ffe8 100644
--- a/lib/kernel/doc/src/heart.xml
+++ b/lib/kernel/doc/src/heart.xml
@@ -28,7 +28,7 @@
     <date>1998-01-28</date>
     <rev>A</rev>
   </header>
-  <module>heart</module>
+  <module since="">heart</module>
   <modulesummary>Heartbeat monitoring of an Erlang runtime system.</modulesummary>
   <description>
     <p>This modules contains the interface to the <c>heart</c> process.
@@ -119,7 +119,7 @@
 
   <funcs>
     <func>
-      <name name="set_cmd" arity="1"/>
+      <name name="set_cmd" arity="1" since=""/>
       <fsummary>Set a temporary reboot command.</fsummary>
       <desc>
         <p>Sets a temporary reboot command. This command is used if
@@ -136,7 +136,7 @@
     </func>
 
     <func>
-      <name name="clear_cmd" arity="0"/>
+      <name name="clear_cmd" arity="0" since=""/>
       <fsummary>Clear the temporary boot command.</fsummary>
       <desc>
         <p>Clears the temporary boot command. If the system terminates,
@@ -145,7 +145,7 @@
     </func>
 
     <func>
-      <name name="get_cmd" arity="0"/>
+      <name name="get_cmd" arity="0" since=""/>
       <fsummary>Get the temporary reboot command.</fsummary>
       <desc>
         <p>Gets the temporary reboot command. If the command is cleared,
@@ -154,7 +154,7 @@
     </func>
 
     <func>
-      <name name="set_callback" arity="2"/>
+      <name name="set_callback" arity="2" since="OTP 18.3"/>
       <fsummary>Set a validation callback</fsummary>
       <desc>
           <p> This validation callback will be executed before any
@@ -166,14 +166,14 @@
       </desc>
     </func>
     <func>
-      <name name="clear_callback" arity="0"/>
+      <name name="clear_callback" arity="0" since="OTP 18.3"/>
       <fsummary>Clear the validation callback</fsummary>
       <desc>
           <p>Removes the validation callback call before heartbeats.</p>
       </desc>
     </func>
     <func>
-      <name name="get_callback" arity="0"/>
+      <name name="get_callback" arity="0" since="OTP 18.3"/>
       <fsummary>Get the validation callback</fsummary>
       <desc>
           <p>Get the validation callback. If the callback is cleared, <c>none</c> will be returned.</p>
@@ -181,7 +181,7 @@
     </func>
 
     <func>
-        <name name="set_options" arity="1"/>
+        <name name="set_options" arity="1" since="OTP 18.3"/>
         <fsummary>Set a list of options</fsummary>
         <desc>
             <p> Valid options <c>set_options</c> are: </p>
@@ -199,7 +199,7 @@
         </desc>
     </func>
     <func>
-      <name name="get_options" arity="0"/>
+      <name name="get_options" arity="0" since="OTP 18.3"/>
       <fsummary>Get the temporary reboot command</fsummary>
       <desc>
           <p>Returns <c>{ok, Options}</c> where <c>Options</c> is a list of current options enabled for heart.
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index 87b08e4e36..1011befca0 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -28,7 +28,7 @@
     <date>1998-02-04</date>
     <rev>A</rev>
   </header>
-  <module>inet</module>
+  <module since="">inet</module>
   <modulesummary>Access to TCP/IP protocols.</modulesummary>
   <description>
     <p>This module provides access to TCP/IP protocols.</p>
@@ -118,6 +118,42 @@ fe80::204:acff:fe17:bf38
       <name name="port_number"/>
     </datatype>
     <datatype>
+      <name name="family_address" since="OTP @OTP-15747@"/>
+      <desc>
+	<p>
+	  A general address format on the form <c>{Family, Destination}</c>
+	  where <c>Family</c> is an atom such as <c>local</c>
+	  and the format of <c>Destination</c> depends on <c>Family</c>,
+	  and is a complete address
+	  (for example an IP address including port number).
+	</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="inet_address" since="OTP @OTP-15747@"/>
+      <desc>
+	<warning>
+	  <p>
+	    This address format is for now experimental
+	    and for completeness to make all address families have a
+	    <c>{Family, Destination}</c> representation.
+	  </p>
+	</warning>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="inet6_address" since="OTP @OTP-15747@"/>
+      <desc>
+	<warning>
+	  <p>
+	    This address format is for now experimental
+	    and for completeness to make all address families have a
+	    <c>{Family, Destination}</c> representation.
+	  </p>
+	</warning>
+      </desc>
+    </datatype>
+    <datatype>
       <name name="local_address"/>
       <desc>
 	<p>
@@ -180,12 +216,16 @@ fe80::204:acff:fe17:bf38
       <name name="ancillary_data"/>
       <desc>
 	<p>
-	  Ancillary data received with the data packet
-	  or read with the socket option
+	  Ancillary data received with the data packet,
+	  read with the socket option
 	  <seealso marker="gen_tcp#type-pktoptions_value">
 	    <c>pktoptions</c>
 	  </seealso>
-	  from a TCP socket.
+	  from a TCP socket,
+	  or to set in a call to
+	  <seealso marker="gen_udp#send-4-AncData"><c>gen_udp:send/4</c></seealso>
+	  or
+	  <seealso marker="gen_udp#send/5"><c>gen_udp:send/5</c></seealso>.
 	</p>
 	<p>
 	  The value(s) correspond to the currently active socket
@@ -193,7 +233,9 @@ fe80::204:acff:fe17:bf38
 	  <seealso marker="inet#option-recvtos"><c>recvtos</c></seealso>,
 	  <seealso marker="inet#option-recvtclass"><c>recvtclass</c></seealso>
 	  and
-	  <seealso marker="inet#option-recvttl"><c>recvttl</c></seealso>.
+	  <seealso marker="inet#option-recvttl"><c>recvttl</c></seealso>,
+	  or for a single send operation the option(s) to override
+	  the currently active socket option(s).
 	</p>
       </desc>
     </datatype>
@@ -294,11 +336,14 @@ fe80::204:acff:fe17:bf38
     <datatype>
       <name name="socket_protocol"/>
     </datatype>
+    <datatype>
+      <name name="stat_option"/>
+    </datatype>
   </datatypes>
 
   <funcs>
     <func>
-      <name name="close" arity="1"/>
+      <name name="close" arity="1" since=""/>
       <fsummary>Close a socket of any type.</fsummary>
       <desc>
         <p>Closes a socket of any type.</p>
@@ -306,7 +351,7 @@ fe80::204:acff:fe17:bf38
     </func>
 
     <func>
-      <name name="format_error" arity="1"/>
+      <name name="format_error" arity="1" since=""/>
       <fsummary>Return a descriptive string for an error reason.</fsummary>
       <desc>
         <p>Returns a diagnostic error string. For possible POSIX values and
@@ -316,7 +361,7 @@ fe80::204:acff:fe17:bf38
     </func>
 
     <func>
-      <name name="get_rc" arity="0"/>
+      <name name="get_rc" arity="0" since=""/>
       <fsummary>Return a list of IP configuration parameters.</fsummary>
       <desc>
         <p>
@@ -335,7 +380,7 @@ fe80::204:acff:fe17:bf38
     </func>
 
     <func>
-      <name name="getaddr" arity="2"/>
+      <name name="getaddr" arity="2" since=""/>
       <fsummary>Return the IP address for a host.</fsummary>
       <desc>
         <p>Returns the IP address for <c><anno>Host</anno></c> as a tuple of
@@ -345,7 +390,7 @@ fe80::204:acff:fe17:bf38
     </func>
 
     <func>
-      <name name="getaddrs" arity="2"/>
+      <name name="getaddrs" arity="2" since=""/>
       <fsummary>Return the IP addresses for a host.</fsummary>
       <desc>
         <p>Returns a list of all IP addresses for <c><anno>Host</anno></c>.
@@ -355,7 +400,7 @@ fe80::204:acff:fe17:bf38
     </func>
 
     <func>
-      <name name="gethostbyaddr" arity="1"/>
+      <name name="gethostbyaddr" arity="1" since=""/>
       <fsummary>Return a hostent record for the host with the specified
         address.</fsummary>
       <desc>
@@ -364,7 +409,7 @@ fe80::204:acff:fe17:bf38
     </func>
 
     <func>
-      <name name="gethostbyname" arity="1"/>
+      <name name="gethostbyname" arity="1" since=""/>
       <fsummary>Return a hostent record for the host with the specified name.
       </fsummary>
       <desc>
@@ -376,7 +421,7 @@ fe80::204:acff:fe17:bf38
     </func>
 
     <func>
-      <name name="gethostbyname" arity="2"/>
+      <name name="gethostbyname" arity="2" since=""/>
       <fsummary>Return a hostent record for the host with the specified name.
       </fsummary>
       <desc>
@@ -386,7 +431,7 @@ fe80::204:acff:fe17:bf38
     </func>
 
     <func>
-      <name name="gethostname" arity="0"/>
+      <name name="gethostname" arity="0" since=""/>
       <fsummary>Return the local hostname.</fsummary>
       <desc>
         <p>Returns the local hostname. Never fails.</p>
@@ -394,7 +439,7 @@ fe80::204:acff:fe17:bf38
     </func>
 
     <func>
-      <name name="getifaddrs" arity="0"/>
+      <name name="getifaddrs" arity="0" since="OTP R14B01"/>
       <fsummary>Return a list of interfaces and their addresses.</fsummary>
       <desc>
         <p>
@@ -416,7 +461,7 @@ fe80::204:acff:fe17:bf38
     </func>
 
     <func>
-      <name>getifaddrs(Opts) ->
+      <name since="OTP 21.2">getifaddrs(Opts) ->
         {ok, [{Ifname, Ifopts}]} | {error, Posix}
       </name>
       <fsummary>Return a list of interfaces and their addresses.</fsummary>
@@ -459,7 +504,7 @@ fe80::204:acff:fe17:bf38
     </func>
 
     <func>
-      <name name="getopts" arity="2"/>
+      <name name="getopts" arity="2" since=""/>
       <fsummary>Get one or more options for a socket.</fsummary>
       <desc>
         <p>Gets one or more options for a socket. For a list of available
@@ -529,8 +574,8 @@ get_tcpi_sacked(Sock) ->
     </func>
 
     <func>
-      <name name="getstat" arity="1"/>
-      <name name="getstat" arity="2"/>
+      <name name="getstat" arity="1" since=""/>
+      <name name="getstat" arity="2" since=""/>
       <fsummary>Get one or more statistic options for a socket.</fsummary>
       <type name="stat_option"/>
       <desc>
@@ -586,9 +631,9 @@ get_tcpi_sacked(Sock) ->
     </func>
 
     <func>
-      <name name="i" arity="0" />
-      <name name="i" arity="1" />
-      <name name="i" arity="2" />
+      <name name="i" arity="0"  since="OTP 21.0"/>
+      <name name="i" arity="1"  since="OTP 21.0"/>
+      <name name="i" arity="2"  since="OTP 21.0"/>
       <fsummary>Displays information and statistics about sockets on the terminal</fsummary>
       <desc>
         <p>
@@ -641,7 +686,7 @@ get_tcpi_sacked(Sock) ->
     </func>
 
     <func>
-      <name name="ntoa" arity="1" />
+      <name name="ntoa" arity="1"  since="OTP R16B02"/>
       <fsummary>Convert IPv6/IPV4 address to ASCII.</fsummary>
       <desc>
 	<p>Parses an
@@ -651,7 +696,7 @@ get_tcpi_sacked(Sock) ->
     </func>
 
     <func>
-      <name name="parse_address" arity="1" />
+      <name name="parse_address" arity="1"  since="OTP R16B"/>
       <fsummary>Parse an IPv4 or IPv6 address.</fsummary>
       <desc>
 	<p>Parses an IPv4 or IPv6 address string and returns an
@@ -662,7 +707,7 @@ get_tcpi_sacked(Sock) ->
     </func>
 
     <func>
-      <name name="parse_ipv4_address" arity="1" />
+      <name name="parse_ipv4_address" arity="1"  since="OTP R16B"/>
       <fsummary>Parse an IPv4 address.</fsummary>
       <desc>
 	<p>Parses an IPv4 address string and returns an
@@ -672,7 +717,7 @@ get_tcpi_sacked(Sock) ->
     </func>
 
     <func>
-      <name name="parse_ipv4strict_address" arity="1" />
+      <name name="parse_ipv4strict_address" arity="1"  since="OTP R16B"/>
       <fsummary>Parse an IPv4 address strict.</fsummary>
       <desc>
 	<p>Parses an IPv4 address string containing four fields, that is,
@@ -683,7 +728,7 @@ get_tcpi_sacked(Sock) ->
     </func>
 
     <func>
-      <name name="parse_ipv6_address" arity="1" />
+      <name name="parse_ipv6_address" arity="1"  since="OTP R16B"/>
       <fsummary>Parse an IPv6 address.</fsummary>
       <desc>
 	<p>Parses an IPv6 address string and returns an
@@ -694,7 +739,7 @@ get_tcpi_sacked(Sock) ->
     </func>
 
     <func>
-      <name name="parse_ipv6strict_address" arity="1" />
+      <name name="parse_ipv6strict_address" arity="1"  since="OTP R16B"/>
       <fsummary>Parse an IPv6 address strict.</fsummary>
       <desc>
 	<p>Parses an IPv6 address string and returns an
@@ -704,7 +749,7 @@ get_tcpi_sacked(Sock) ->
     </func>
 
     <func>
-      <name name="ipv4_mapped_ipv6_address" arity="1" />
+      <name name="ipv4_mapped_ipv6_address" arity="1"  since="OTP 21.0"/>
       <fsummary>Convert to and from IPv4-mapped IPv6 address.</fsummary>
       <desc>
 	<p>
@@ -717,7 +762,7 @@ get_tcpi_sacked(Sock) ->
     </func>
 
     <func>
-      <name name="parse_strict_address" arity="1" />
+      <name name="parse_strict_address" arity="1"  since="OTP R16B"/>
       <fsummary>Parse an IPv4 or IPv6 address strict.</fsummary>
       <desc>
 	<p>Parses an IPv4 or IPv6 address string and returns an
@@ -728,7 +773,7 @@ get_tcpi_sacked(Sock) ->
     </func>
 
     <func>
-      <name name="peername" arity="1"/>
+      <name name="peername" arity="1" since=""/>
       <fsummary>Return the address and port for the other end of a connection.
       </fsummary>
       <desc>
@@ -741,7 +786,7 @@ get_tcpi_sacked(Sock) ->
     </func>
 
     <func>
-      <name name="peernames" arity="1"/>
+      <name name="peernames" arity="1" since="OTP R16B03"/>
       <fsummary>Return all address/port numbers for the other end of a
         connection.</fsummary>
       <desc>
@@ -755,7 +800,7 @@ get_tcpi_sacked(Sock) ->
     </func>
 
     <func>
-      <name name="peernames" arity="2"/>
+      <name name="peernames" arity="2" since="OTP R16B03"/>
       <fsummary>Return all address/port numbers for the other end of a
         connection.</fsummary>
       <desc>
@@ -774,7 +819,7 @@ get_tcpi_sacked(Sock) ->
     </func>
 
     <func>
-      <name name="port" arity="1"/>
+      <name name="port" arity="1" since=""/>
       <fsummary>Return the local port number for a socket.</fsummary>
       <desc>
         <p>Returns the local port number for a socket.</p>
@@ -782,7 +827,7 @@ get_tcpi_sacked(Sock) ->
     </func>
 
     <func>
-      <name name="setopts" arity="2"/>
+      <name name="setopts" arity="2" since=""/>
       <fsummary>Set one or more options for a socket.</fsummary>
       <desc>
         <p>Sets one or more options for a socket.</p>
@@ -1007,13 +1052,34 @@ get_tcpi_sacked(Sock) ->
             <marker id="option-linger"></marker>
           </item>
           <tag><c>{linger, {true|false, Seconds}}</c></tag>
-          <item>
+	  <item>
             <p>Determines the time-out, in seconds, for flushing unsent data
-              in the <c>close/1</c> socket call. If the first component of
-              the value tuple is <c>false</c>, the second is ignored. This
-              means that <c>close/1</c> returns immediately, not waiting
-              for data to be flushed. Otherwise, the second component is
-              the flushing time-out, in seconds.</p>
+              in the <c>close/1</c> socket call. </p>
+	    <p>The first component is if linger is enabled, the second component
+	    is the flushing time-out, in seconds. There are 3 alternatives:</p>
+	    <taglist>
+	      <tag><c>{false, _}</c></tag>
+	      <item>
+		<p>close/1 or shutdown/2 returns immediately,
+		not waiting for data to be flushed, with closing
+		happening in the background.</p>
+	      </item>
+	      <tag><c>{true, 0}</c></tag>
+	      <item>
+		<p>Aborts the connection when it is closed.
+		Discards any data still remaining in the send buffers
+		and sends RST to the peer.</p>
+		<p>This avoids TCP's TIME_WAIT state, but leaves open
+		the possibility that another "incarnation" of this connection
+		being created.</p>
+	      </item>
+	      <tag><c>{true, Time} when Time > 0</c></tag>
+	      <item>
+		<p>close/1 or shutdown/2 will not return until
+		all queued messages for the socket have been successfully
+		sent or the linger timeout (Time) has been reached.</p>
+	      </item>
+	    </taglist>
           </item>
           <tag><c>{low_msgq_watermark, Size}</c></tag>
           <item>
@@ -1486,7 +1552,7 @@ inet:setopts(Sock,[{raw,6,8,<<30:32/native>>}]),]]></code>
     </func>
 
     <func>
-      <name name="sockname" arity="1"/>
+      <name name="sockname" arity="1" since=""/>
       <fsummary>Return the local address and port number for a socket.
       </fsummary>
       <desc>
@@ -1499,7 +1565,7 @@ inet:setopts(Sock,[{raw,6,8,<<30:32/native>>}]),]]></code>
     </func>
 
     <func>
-      <name name="socknames" arity="1"/>
+      <name name="socknames" arity="1" since="OTP R16B03"/>
       <fsummary>Return all local address/port numbers for a socket.</fsummary>
       <desc>
 	<p>Equivalent to
@@ -1509,7 +1575,7 @@ inet:setopts(Sock,[{raw,6,8,<<30:32/native>>}]),]]></code>
     </func>
 
     <func>
-      <name name="socknames" arity="2"/>
+      <name name="socknames" arity="2" since="OTP R16B03"/>
       <fsummary>Return all local address/port numbers for a socket.</fsummary>
       <desc>
 	<p>Returns a list of all local address/port number pairs for a socket
diff --git a/lib/kernel/doc/src/inet_res.xml b/lib/kernel/doc/src/inet_res.xml
index 351d86a93a..1904e371f7 100644
--- a/lib/kernel/doc/src/inet_res.xml
+++ b/lib/kernel/doc/src/inet_res.xml
@@ -28,7 +28,7 @@
     <date>2009-09-11</date>
     <rev>A</rev>
   </header>
-  <module>inet_res</module>
+  <module since="">inet_res</module>
   <modulesummary>A rudimentary DNS client.</modulesummary>
   <description>
     <p>This module performs DNS name resolving to recursive name servers.</p>
@@ -185,8 +185,8 @@ inet_dns:record_type(_) -> undefined.</pre>
 
   <funcs>
     <func>
-      <name name="getbyname" arity="2"/>
-      <name name="getbyname" arity="3"/>
+      <name name="getbyname" arity="2" since=""/>
+      <name name="getbyname" arity="3" since=""/>
       <fsummary>Resolve a DNS record of the specified type for the specified
       host.</fsummary>
       <desc>
@@ -205,8 +205,8 @@ inet_dns:record_type(_) -> undefined.</pre>
     </func>
 
     <func>
-      <name name="gethostbyaddr" arity="1"/>
-      <name name="gethostbyaddr" arity="2"/>
+      <name name="gethostbyaddr" arity="1" since=""/>
+      <name name="gethostbyaddr" arity="2" since=""/>
       <fsummary>Return a hostent record for the host with the specified
         address.</fsummary>
       <desc>
@@ -217,9 +217,9 @@ inet_dns:record_type(_) -> undefined.</pre>
     </func>
 
     <func>
-      <name name="gethostbyname" arity="1"/>
-      <name name="gethostbyname" arity="2"/>
-      <name name="gethostbyname" arity="3"/>
+      <name name="gethostbyname" arity="1" since=""/>
+      <name name="gethostbyname" arity="2" since=""/>
+      <name name="gethostbyname" arity="3" since=""/>
       <fsummary>Return a hostent record for the host with the specified name.
       </fsummary>
       <desc>
@@ -235,9 +235,9 @@ inet_dns:record_type(_) -> undefined.</pre>
     </func>
 
     <func>
-      <name name="lookup" arity="3"/>
-      <name name="lookup" arity="4"/>
-      <name name="lookup" arity="5"/>
+      <name name="lookup" arity="3" since=""/>
+      <name name="lookup" arity="4" since=""/>
+      <name name="lookup" arity="5" since=""/>
       <fsummary>Resolve the DNS data for the record of the specified type
         and class for the specified name.</fsummary>
       <desc>
@@ -257,9 +257,9 @@ inet_dns:record_type(_) -> undefined.</pre>
     </func>
 
     <func>
-      <name name="resolve" arity="3"/>
-      <name name="resolve" arity="4"/>
-      <name name="resolve" arity="5"/>
+      <name name="resolve" arity="3" since=""/>
+      <name name="resolve" arity="4" since=""/>
+      <name name="resolve" arity="5" since=""/>
       <fsummary>Resolve a DNS record of the specified type and class
         for the specified name.</fsummary>
       <desc>
@@ -326,9 +326,9 @@ example_lookup(Name, Class, Type) ->
 
   <funcs>
     <func>
-      <name name="nslookup" arity="3"/>
-      <name name="nslookup" arity="4" clause_i="1"/>
-      <name name="nslookup" arity="4" clause_i="2"/>
+      <name name="nslookup" arity="3" since=""/>
+      <name name="nslookup" arity="4" clause_i="1" since=""/>
+      <name name="nslookup" arity="4" clause_i="2" since=""/>
       <fsummary>Resolve a DNS record of the specified type and class for the
         specified name.</fsummary>
       <type variable="Name"/>
@@ -344,8 +344,8 @@ example_lookup(Name, Class, Type) ->
     </func>
 
     <func>
-      <name name="nnslookup" arity="4"/>
-      <name name="nnslookup" arity="5"/>
+      <name name="nnslookup" arity="4" since=""/>
+      <name name="nnslookup" arity="5" since=""/>
       <fsummary>Resolve a DNS record of the specified type and class
         for the specified name.</fsummary>
       <desc>
diff --git a/lib/kernel/doc/src/kernel_app.xml b/lib/kernel/doc/src/kernel_app.xml
index 15dbdb47dc..7f9609d5c1 100644
--- a/lib/kernel/doc/src/kernel_app.xml
+++ b/lib/kernel/doc/src/kernel_app.xml
@@ -369,6 +369,14 @@ MaxT = TickTime + TickTime / 4</code>
           performed. This option ensures that <c>global</c> is
           synchronized.</p>
       </item>
+      <tag><c>start_distribution = true | false</c></tag>
+      <item>
+        <p>Starts all distribution services, such as <c>rpc</c>,
+          <c>global</c>, and <c>net_kernel</c> if the parameter is
+          <c>true</c>. This parameter is to be set to <c>false</c>
+          for systems who want to disable all distribution functionality.</p>
+        <p>Defaults to <c>true</c>.</p>
+      </item>
       <tag><c>start_dist_ac = true | false</c></tag>
       <item>
         <p>Starts the <c>dist_ac</c> server if the parameter is
@@ -510,11 +518,13 @@ MaxT = TickTime + TickTime / 4</code>
       parameters for Logger are not set.</p>
     <taglist>
       <tag><c>error_logger</c></tag>
-      <item>Replaced by setting the type of the default
-      <seealso marker="logger_std_h#type"><c>logger_std_h</c></seealso>
-      to the same value. Example:
+      <item>Replaced by setting the <seealso
+      marker="logger_std_h#type"><c>type</c></seealso>, and possibly
+      <seealso marker="logger_std_h#file"><c>file</c></seealso> and
+      <seealso marker="logger_std_h#modes"><c>modes</c></seealso>
+      parameters of the default <c>logger_std_h</c> handler. Example:
       <code type="none">
-erl -kernel logger '[{handler,default,logger_std_h,#{config=>#{type=>{file,"/tmp/erlang.log"}}}}]'
+erl -kernel logger '[{handler,default,logger_std_h,#{config=>#{file=>"/tmp/erlang.log"}}}]'
       </code>
       </item>
       <tag><c>error_logger_format_depth</c></tag>
diff --git a/lib/kernel/doc/src/logger.xml b/lib/kernel/doc/src/logger.xml
index 556f25f96a..2a060ce1f9 100644
--- a/lib/kernel/doc/src/logger.xml
+++ b/lib/kernel/doc/src/logger.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>logger.xml</file>
   </header>
-  <module>logger</module>
+  <module since="OTP 21.0">logger</module>
   <modulesummary>API module for Logger, the standard logging facility
     in Erlang/OTP.</modulesummary>
 
@@ -66,7 +66,7 @@ logger:error("error happened because: ~p", [Reason]). % Without macro
 [{kernel,
   [{logger,
     [{handler, default, logger_std_h,
-      #{config => #{type => {file, "path/to/file.log"}}}}]}]}].
+      #{config => #{file => "path/to/file.log"}}}]}]}].
       </code>
     <p>
       For more information about:
@@ -190,7 +190,7 @@ logger:error("error happened because: ~p", [Reason]). % Without macro
 	<list>
 	  <item><c>pid  => self()</c></item>
 	  <item><c>gl   => group_leader()</c></item>
-	  <item><c>time => erlang:system_time(microsecond)</c></item>
+	  <item><c>time => logger:timestamp()</c></item>
 	</list>
 	<p>When a log macro is used, Logger also inserts location
 	  information:</p>
@@ -245,6 +245,12 @@ logger:error("error happened because: ~p", [Reason]). % Without macro
       </desc>
     </datatype>
     <datatype>
+      <name name="olp_config"/>
+      <desc>
+	<p></p>
+      </desc>
+    </datatype>
+    <datatype>
       <name name="primary_config"/>
       <desc>
 	<p>Primary configuration data for Logger. The following
@@ -282,8 +288,8 @@ logger:error("error happened because: ~p", [Reason]). % Without macro
       <name name="timestamp"/>
       <desc>
 	<p>A timestamp produced
-	  with <seealso marker="erts:erlang#system_time-1">
-	    <c>erlang:system_time(microsecond)</c></seealso>.</p>
+	  with <seealso marker="#timestamp-0">
+	    <c>logger:timestamp()</c></seealso>.</p>
       </desc>
     </datatype>
   </datatypes>
@@ -334,9 +340,9 @@ logger:error("error happened because: ~p", [Reason]). % Without macro
   </section>
   <funcs>
     <func>
-      <name>emergency(StringOrReport[,Metadata])</name>
-      <name>emergency(Format,Args[,Metadata])</name>
-      <name>emergency(Fun,FunArgs[,Metadata])</name>
+      <name since="OTP 21.0">emergency(StringOrReport[,Metadata])</name>
+      <name since="OTP 21.0">emergency(Format,Args[,Metadata])</name>
+      <name since="OTP 21.0">emergency(Fun,FunArgs[,Metadata])</name>
       <fsummary>Logs the given message as level <c>emergency</c>.</fsummary>
       <desc>
         <p>Equivalent to
@@ -345,9 +351,9 @@ logger:error("error happened because: ~p", [Reason]). % Without macro
     </func>
 
     <func>
-      <name>alert(StringOrReport[,Metadata])</name>
-      <name>alert(Format,Args[,Metadata])</name>
-      <name>alert(Fun,FunArgs[,Metadata])</name>
+      <name since="OTP 21.0">alert(StringOrReport[,Metadata])</name>
+      <name since="OTP 21.0">alert(Format,Args[,Metadata])</name>
+      <name since="OTP 21.0">alert(Fun,FunArgs[,Metadata])</name>
       <fsummary>Logs the given message as level <c>alert</c>.</fsummary>
       <desc>
         <p>Equivalent to
@@ -356,9 +362,9 @@ logger:error("error happened because: ~p", [Reason]). % Without macro
     </func>
 
     <func>
-      <name>critical(StringOrReport[,Metadata])</name>
-      <name>critical(Format,Args[,Metadata])</name>
-      <name>critical(Fun,FunArgs[,Metadata])</name>
+      <name since="OTP 21.0">critical(StringOrReport[,Metadata])</name>
+      <name since="OTP 21.0">critical(Format,Args[,Metadata])</name>
+      <name since="OTP 21.0">critical(Fun,FunArgs[,Metadata])</name>
       <fsummary>Logs the given message as level <c>critical</c>.</fsummary>
       <desc>
         <p>Equivalent to
@@ -367,9 +373,9 @@ logger:error("error happened because: ~p", [Reason]). % Without macro
     </func>
 
     <func>
-      <name>error(StringOrReport[,Metadata])</name>
-      <name>error(Format,Args[,Metadata])</name>
-      <name>error(Fun,FunArgs[,Metadata])</name>
+      <name since="OTP 21.0">error(StringOrReport[,Metadata])</name>
+      <name since="OTP 21.0">error(Format,Args[,Metadata])</name>
+      <name since="OTP 21.0">error(Fun,FunArgs[,Metadata])</name>
       <fsummary>Logs the given message as level <c>error</c>.</fsummary>
       <desc>
         <p>Equivalent to
@@ -378,9 +384,9 @@ logger:error("error happened because: ~p", [Reason]). % Without macro
     </func>
 
     <func>
-      <name>warning(StringOrReport[,Metadata])</name>
-      <name>warning(Format,Args[,Metadata])</name>
-      <name>warning(Fun,FunArgs[,Metadata])</name>
+      <name since="OTP 21.0">warning(StringOrReport[,Metadata])</name>
+      <name since="OTP 21.0">warning(Format,Args[,Metadata])</name>
+      <name since="OTP 21.0">warning(Fun,FunArgs[,Metadata])</name>
       <fsummary>Logs the given message as level <c>warning</c>.</fsummary>
       <desc>
         <p>Equivalent to
@@ -389,9 +395,9 @@ logger:error("error happened because: ~p", [Reason]). % Without macro
     </func>
 
     <func>
-      <name>notice(StringOrReport[,Metadata])</name>
-      <name>notice(Format,Args[,Metadata])</name>
-     <name>notice(Fun,FunArgs[,Metadata])</name>
+      <name since="OTP 21.0">notice(StringOrReport[,Metadata])</name>
+      <name since="OTP 21.0">notice(Format,Args[,Metadata])</name>
+     <name since="OTP 21.0">notice(Fun,FunArgs[,Metadata])</name>
       <fsummary>Logs the given message as level <c>notice</c>.</fsummary>
       <desc>
         <p>Equivalent to
@@ -400,9 +406,9 @@ logger:error("error happened because: ~p", [Reason]). % Without macro
     </func>
 
     <func>
-      <name>info(StringOrReport[,Metadata])</name>
-      <name>info(Format,Args[,Metadata])</name>
-      <name>info(Fun,FunArgs[,Metadata])</name>
+      <name since="OTP 21.0">info(StringOrReport[,Metadata])</name>
+      <name since="OTP 21.0">info(Format,Args[,Metadata])</name>
+      <name since="OTP 21.0">info(Fun,FunArgs[,Metadata])</name>
       <fsummary>Logs the given message as level <c>info</c>.</fsummary>
       <desc>
         <p>Equivalent to
@@ -411,9 +417,9 @@ logger:error("error happened because: ~p", [Reason]). % Without macro
     </func>
 
     <func>
-      <name>debug(StringOrReport[,Metadata])</name>
-      <name>debug(Format,Args[,Metadata])</name>
-      <name>debug(Fun,FunArgs[,Metadata])</name>
+      <name since="OTP 21.0">debug(StringOrReport[,Metadata])</name>
+      <name since="OTP 21.0">debug(Format,Args[,Metadata])</name>
+      <name since="OTP 21.0">debug(Fun,FunArgs[,Metadata])</name>
       <fsummary>Logs the given message as level <c>debug</c>.</fsummary>
       <desc>
         <p>Equivalent to
@@ -422,12 +428,12 @@ logger:error("error happened because: ~p", [Reason]). % Without macro
     </func>
 
     <func>
-      <name name="log" arity="2"/>
-      <name name="log" arity="3" clause_i="1"/>
-      <name name="log" arity="3" clause_i="2"/>
-      <name name="log" arity="3" clause_i="3"/>
-      <name name="log" arity="4" clause_i="1"/>
-      <name name="log" arity="4" clause_i="2"/>
+      <name name="log" arity="2" since="OTP 21.0"/>
+      <name name="log" arity="3" clause_i="1" since="OTP 21.0"/>
+      <name name="log" arity="3" clause_i="2" since="OTP 21.0"/>
+      <name name="log" arity="3" clause_i="3" since="OTP 21.0"/>
+      <name name="log" arity="4" clause_i="1" since="OTP 21.0"/>
+      <name name="log" arity="4" clause_i="2" since="OTP 21.0"/>
       <fsummary>Logs the given message.</fsummary>
       <type variable="Level"/>
       <type variable="StringOrReport" name_i="1"/>
@@ -448,7 +454,7 @@ logger:error("error happened because: ~p", [Reason]). % Without macro
   </section>
   <funcs>
     <func>
-      <name name="add_handler" arity="3"/>
+      <name name="add_handler" arity="3" since="OTP 21.0"/>
       <fsummary>Add a handler with the given configuration.</fsummary>
       <desc>
         <p>Add a handler with the given configuration.</p>
@@ -459,7 +465,7 @@ logger:error("error happened because: ~p", [Reason]). % Without macro
     </func>
 
     <func>
-      <name name="add_handler_filter" arity="3"/>
+      <name name="add_handler_filter" arity="3" since="OTP 21.0"/>
       <fsummary>Add a filter to the specified handler.</fsummary>
       <desc>
         <p>Add a filter to the specified handler.</p>
@@ -500,7 +506,7 @@ logger:error("error happened because: ~p", [Reason]). % Without macro
     </func>
 
     <func>
-      <name name="add_handlers" arity="1" clause_i="1"/>
+      <name name="add_handlers" arity="1" clause_i="1" since="OTP 21.0"/>
       <fsummary>Set up log handlers from the application's
 	configuration parameters.</fsummary>
       <desc>
@@ -510,7 +516,7 @@ logger:error("error happened because: ~p", [Reason]). % Without macro
     </func>
 
     <func>
-      <name name="add_handlers" arity="1" clause_i="2"/>
+      <name name="add_handlers" arity="1" clause_i="2" since="OTP 21.0"/>
       <fsummary>Setup logger handlers.</fsummary>
       <type name="config_handler"/>
       <desc>
@@ -553,7 +559,7 @@ start(_, []) ->
     </func>
 
     <func>
-      <name name="add_primary_filter" arity="2"/>
+      <name name="add_primary_filter" arity="2" since="OTP 21.0"/>
       <fsummary>Add a primary filter to Logger.</fsummary>
       <desc>
         <p>Add a primary filter to Logger.</p>
@@ -594,16 +600,16 @@ start(_, []) ->
     </func>
 
     <func>
-      <name name="get_config" arity="0"/>
+      <name name="get_config" arity="0" since="OTP 21.0"/>
       <fsummary>Look up the current Logger configuration</fsummary>
       <desc>
-        <p>Look up all current Logger configuration, including primary
-          and handler configuration, and module level settings.</p>
+        <p>Look up all current Logger configuration, including primary,
+          handler, and proxy configuration, and module level settings.</p>
       </desc>
     </func>
 
     <func>
-      <name name="get_handler_config" arity="0"/>
+      <name name="get_handler_config" arity="0" since="OTP 21.0"/>
       <fsummary>Look up the current configuration for all handlers.</fsummary>
       <desc>
         <p>Look up the current configuration for all handlers.</p>
@@ -611,7 +617,7 @@ start(_, []) ->
     </func>
 
     <func>
-      <name name="get_handler_config" arity="1"/>
+      <name name="get_handler_config" arity="1" since="OTP 21.0"/>
       <fsummary>Look up the current configuration for the given
 	handler.</fsummary>
       <desc>
@@ -620,7 +626,7 @@ start(_, []) ->
     </func>
 
     <func>
-      <name name="get_handler_ids" arity="0"/>
+      <name name="get_handler_ids" arity="0" since="OTP 21.0"/>
       <fsummary>Look up the identities for all installed handlers.</fsummary>
       <desc>
         <p>Look up the identities for all installed handlers.</p>
@@ -628,7 +634,7 @@ start(_, []) ->
     </func>
 
     <func>
-      <name name="get_primary_config" arity="0"/>
+      <name name="get_primary_config" arity="0" since="OTP 21.0"/>
       <fsummary>Look up the current primary configuration for Logger.</fsummary>
       <desc>
         <p>Look up the current primary configuration for Logger.</p>
@@ -636,7 +642,18 @@ start(_, []) ->
     </func>
 
     <func>
-      <name name="get_module_level" arity="0"/>
+      <name name="get_proxy_config" arity="0" since="OTP 21.3"/>
+      <fsummary>Look up the current configuration for the Logger proxy.</fsummary>
+      <desc>
+        <p>Look up the current configuration for the Logger proxy.</p>
+	<p>For more information about the proxy, see
+	  section <seealso marker="logger_chapter#proxy">Logger
+	  Proxy</seealso> in the Kernel User's Guide.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="get_module_level" arity="0" since="OTP 21.0"/>
       <fsummary>Look up all current module levels.</fsummary>
       <desc>
         <p>Look up all current module levels. Returns a list
@@ -648,7 +665,7 @@ start(_, []) ->
     </func>
 
     <func>
-      <name name="get_module_level" arity="1"/>
+      <name name="get_module_level" arity="1" since="OTP 21.0"/>
       <fsummary>Look up the current level for the given modules.</fsummary>
       <desc>
         <p>Look up the current level for the given modules. Returns a
@@ -660,7 +677,7 @@ start(_, []) ->
     </func>
 
     <func>
-      <name name="get_process_metadata" arity="0"/>
+      <name name="get_process_metadata" arity="0" since="OTP 21.0"/>
       <fsummary>Retrieve data set with set_process_metadata/1.</fsummary>
       <desc>
         <p>Retrieve data set
@@ -672,7 +689,16 @@ start(_, []) ->
     </func>
 
     <func>
-      <name name="remove_handler" arity="1"/>
+      <name name="i" arity="0" since="OTP 21.3"/>
+      <name name="i" arity="1" since="OTP 21.3"/>
+      <fsummary>Pretty print the Logger configuration.</fsummary>
+      <desc>
+        <p>Pretty print the Logger configuration.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="remove_handler" arity="1" since="OTP 21.0"/>
       <fsummary>Remove the handler with the specified identity.</fsummary>
       <desc>
         <p>Remove the handler identified by <c><anno>HandlerId</anno></c>.</p>
@@ -680,7 +706,7 @@ start(_, []) ->
     </func>
 
     <func>
-      <name name="remove_handler_filter" arity="2"/>
+      <name name="remove_handler_filter" arity="2" since="OTP 21.0"/>
       <fsummary>Remove a filter from the specified handler.</fsummary>
       <desc>
         <p>Remove the filter identified
@@ -690,7 +716,7 @@ start(_, []) ->
     </func>
 
     <func>
-      <name name="remove_primary_filter" arity="1"/>
+      <name name="remove_primary_filter" arity="1" since="OTP 21.0"/>
       <fsummary>Remove a primary filter from Logger.</fsummary>
       <desc>
         <p>Remove the primary filter identified
@@ -699,7 +725,7 @@ start(_, []) ->
     </func>
 
     <func>
-      <name name="set_application_level" arity="2"/>
+      <name name="set_application_level" arity="2" since="OTP 21.1"/>
       <fsummary>Set the log level for all modules in the specified application.</fsummary>
       <desc>
         <p>Set the log level for all the modules of the specified application.</p>
@@ -710,7 +736,7 @@ start(_, []) ->
     </func>
 
     <func>
-      <name name="set_handler_config" arity="2"/>
+      <name name="set_handler_config" arity="2" since="OTP 21.0"/>
       <fsummary>Set configuration data for the specified handler.</fsummary>
       <desc>
         <p>Set configuration data for the specified handler. This
@@ -731,11 +757,11 @@ start(_, []) ->
     </func>
 
     <func>
-      <name name="set_handler_config" arity="3" clause_i="1"/>
-      <name name="set_handler_config" arity="3" clause_i="2"/>
-      <name name="set_handler_config" arity="3" clause_i="3"/>
-      <name name="set_handler_config" arity="3" clause_i="4"/>
-      <name name="set_handler_config" arity="3" clause_i="5"/>
+      <name name="set_handler_config" arity="3" clause_i="1" since="OTP 21.0"/>
+      <name name="set_handler_config" arity="3" clause_i="2" since="OTP 21.0"/>
+      <name name="set_handler_config" arity="3" clause_i="3" since="OTP 21.0"/>
+      <name name="set_handler_config" arity="3" clause_i="4" since="OTP 21.0"/>
+      <name name="set_handler_config" arity="3" clause_i="5" since="OTP 21.0"/>
       <fsummary>Add or update configuration data for the specified
         handler.</fsummary>
       <type variable="HandlerId"/>
@@ -767,7 +793,7 @@ start(_, []) ->
     </func>
 
     <func>
-      <name name="set_primary_config" arity="1"/>
+      <name name="set_primary_config" arity="1" since="OTP 21.0"/>
       <fsummary>Set primary configuration data for Logger.</fsummary>
       <desc>
         <p>Set primary configuration data for Logger. This
@@ -785,9 +811,9 @@ start(_, []) ->
     </func>
 
     <func>
-      <name name="set_primary_config" arity="2" clause_i="1"/>
-      <name name="set_primary_config" arity="2" clause_i="2"/>
-      <name name="set_primary_config" arity="2" clause_i="3"/>
+      <name name="set_primary_config" arity="2" clause_i="1" since="OTP 21.0"/>
+      <name name="set_primary_config" arity="2" clause_i="2" since="OTP 21.0"/>
+      <name name="set_primary_config" arity="2" clause_i="3" since="OTP 21.0"/>
       <fsummary>Add or update primary configuration data for Logger.</fsummary>
       <type variable="Level" name_i="1"/>
       <type variable="FilterDefault" name_i="2"/>
@@ -801,7 +827,28 @@ start(_, []) ->
     </func>
 
     <func>
-      <name name="set_module_level" arity="2"/>
+      <name name="set_proxy_config" arity="1" since="OTP 21.3"/>
+      <fsummary>Set configuration data for the Logger proxy.</fsummary>
+      <desc>
+        <p>Set configuration data for the Logger proxy. This
+          overwrites the current proxy configuration. Keys that are not
+          specified in the <c><anno>Config</anno></c> map gets default
+          values.</p>
+	<p>To modify the existing configuration,
+	  use <seealso marker="#update_proxy_config-1">
+	    <c>update_proxy_config/1</c></seealso>, or, if a more
+	  complex merge is needed, read the current configuration
+	  with <seealso marker="#get_proxy_config-0"><c>get_proxy_config/0</c>
+	  </seealso>, then do the merge before writing the new
+	  configuration back with this function.</p>
+	<p>For more information about the proxy, see
+	  section <seealso marker="logger_chapter#proxy">Logger
+	  Proxy</seealso> in the Kernel User's Guide.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="set_module_level" arity="2" since="OTP 21.0"/>
       <fsummary>Set the log level for the specified modules.</fsummary>
       <desc>
         <p>Set the log level for the specified modules.</p>
@@ -841,7 +888,7 @@ start(_, []) ->
     </func>
 
     <func>
-      <name name="set_process_metadata" arity="1"/>
+      <name name="set_process_metadata" arity="1" since="OTP 21.0"/>
       <fsummary>Set metadata to use when logging from current process.</fsummary>
       <desc>
         <p>Set metadata which Logger shall automatically insert in
@@ -860,7 +907,7 @@ start(_, []) ->
     </func>
 
     <func>
-      <name name="unset_application_level" arity="1"/>
+      <name name="unset_application_level" arity="1" since="OTP 21.1"/>
       <fsummary>Unset the log level for all modules in the specified application.</fsummary>
       <desc>
         <p>Unset the log level for all the modules of the specified application.</p>
@@ -871,7 +918,7 @@ start(_, []) ->
     </func>
 
     <func>
-      <name name="unset_module_level" arity="0"/>
+      <name name="unset_module_level" arity="0" since="OTP 21.0"/>
       <fsummary>Remove module specific log settings for all modules.</fsummary>
       <desc>
         <p>Remove module specific log settings. After this, the
@@ -880,7 +927,7 @@ start(_, []) ->
     </func>
 
     <func>
-      <name name="unset_module_level" arity="1"/>
+      <name name="unset_module_level" arity="1" since="OTP 21.0"/>
       <fsummary>Remove module specific log settings for the given
 	modules.</fsummary>
       <desc>
@@ -890,7 +937,7 @@ start(_, []) ->
     </func>
 
     <func>
-      <name name="unset_process_metadata" arity="0"/>
+      <name name="unset_process_metadata" arity="0" since="OTP 21.0"/>
       <fsummary>Delete data set with set_process_metadata/1.</fsummary>
       <desc>
         <p>Delete data set
@@ -902,7 +949,7 @@ start(_, []) ->
     </func>
 
     <func>
-      <name name="update_formatter_config" arity="2"/>
+      <name name="update_formatter_config" arity="2" since="OTP 21.0"/>
       <fsummary>Update the formatter configuration for the specified handler.</fsummary>
       <desc>
         <p>Update the formatter configuration for the specified handler.</p>
@@ -917,7 +964,7 @@ start(_, []) ->
     </func>
 
     <func>
-      <name name="update_formatter_config" arity="3"/>
+      <name name="update_formatter_config" arity="3" since="OTP 21.0"/>
       <fsummary>Update the formatter configuration for the specified handler.</fsummary>
       <desc>
         <p>Update the formatter configuration for the specified handler.</p>
@@ -928,7 +975,7 @@ start(_, []) ->
     </func>
 
     <func>
-      <name name="update_handler_config" arity="2"/>
+      <name name="update_handler_config" arity="2" since="OTP 21.0"/>
       <fsummary>Update configuration data for the specified handler.</fsummary>
       <desc>
         <p>Update configuration data for the specified handler. This function
@@ -944,11 +991,11 @@ logger:set_handler_config(HandlerId, maps:merge(Old, Config)).
     </func>
 
     <func>
-      <name name="update_handler_config" arity="3" clause_i="1"/>
-      <name name="update_handler_config" arity="3" clause_i="2"/>
-      <name name="update_handler_config" arity="3" clause_i="3"/>
-      <name name="update_handler_config" arity="3" clause_i="4"/>
-      <name name="update_handler_config" arity="3" clause_i="5"/>
+      <name name="update_handler_config" arity="3" clause_i="1" since="OTP 21.2"/>
+      <name name="update_handler_config" arity="3" clause_i="2" since="OTP 21.2"/>
+      <name name="update_handler_config" arity="3" clause_i="3" since="OTP 21.2"/>
+      <name name="update_handler_config" arity="3" clause_i="4" since="OTP 21.2"/>
+      <name name="update_handler_config" arity="3" clause_i="5" since="OTP 21.2"/>
       <fsummary>Add or update configuration data for the specified
         handler.</fsummary>
       <type variable="HandlerId"/>
@@ -980,7 +1027,7 @@ logger:set_handler_config(HandlerId, maps:merge(Old, Config)).
     </func>
 
     <func>
-      <name name="update_primary_config" arity="1"/>
+      <name name="update_primary_config" arity="1" since="OTP 21.0"/>
       <fsummary>Update primary configuration data for Logger.</fsummary>
       <desc>
         <p>Update primary configuration data for Logger. This function
@@ -996,7 +1043,7 @@ logger:set_primary_config(maps:merge(Old, Config)).
     </func>
 
     <func>
-      <name name="update_process_metadata" arity="1"/>
+      <name name="update_process_metadata" arity="1" since="OTP 21.0"/>
       <fsummary>Set or update metadata to use when logging from
 	current process.</fsummary>
       <desc>
@@ -1013,6 +1060,25 @@ logger:set_process_metadata(maps:merge(logger:get_process_metadata(), Meta)).
 	  </seealso>.</p>
       </desc>
     </func>
+
+    <func>
+      <name name="update_proxy_config" arity="1" since="OTP 21.3"/>
+      <fsummary>Update configuration data for the Logger proxy.</fsummary>
+      <desc>
+        <p>Update configuration data for the Logger proxy. This function
+          behaves as if it was implemented as follows:</p>
+	<code type="erl">
+Old = logger:get_proxy_config(),
+logger:set_proxy_config(maps:merge(Old, Config)).
+	</code>
+	<p>To overwrite the existing configuration without any merge,
+	  use <seealso marker="#set_proxy_config-1"><c>set_proxy_config/1</c>
+	  </seealso>.</p>
+	<p>For more information about the proxy, see
+	  section <seealso marker="logger_chapter#proxy">Logger
+	  Proxy</seealso> in the Kernel User's Guide.</p>
+      </desc>
+    </func>
   </funcs>
 
   <section>
@@ -1021,7 +1087,7 @@ logger:set_process_metadata(maps:merge(logger:get_process_metadata(), Meta)).
   </section>
   <funcs>
     <func>
-      <name name="compare_levels" arity="2"/>
+      <name name="compare_levels" arity="2" since="OTP 21.0"/>
       <fsummary>Compare the severity of two log levels.</fsummary>
       <desc>
         <p>Compare the severity of two log levels. Returns <c>gt</c>
@@ -1032,7 +1098,7 @@ logger:set_process_metadata(maps:merge(logger:get_process_metadata(), Meta)).
     </func>
 
     <func>
-      <name name="format_report" arity="1"/>
+      <name name="format_report" arity="1" since="OTP 21.0"/>
       <fsummary>Convert a log message on report form to {Format, Args}.</fsummary>
       <desc>
         <p>Convert a log message on report form to <c>{Format,
@@ -1051,6 +1117,24 @@ logger:set_process_metadata(maps:merge(logger:get_process_metadata(), Meta)).
 	  a key-value list before formatting as such.</p>
       </desc>
     </func>
+
+    <func>
+      <name name="timestamp" arity="0" since="OTP 21.3"/>
+      <fsummary>Return a timestamp to insert in meta data for a log
+	event.</fsummary>
+      <desc>
+        <p>Return a timestamp that can be inserted as the <c>time</c>
+          field in the meta data for a log event. It is produced with
+	  <seealso marker="kernel:os#system_time-1">
+            <c>os:system_time(microsecond)</c></seealso>.</p>
+	<p>Notice that Logger automatically inserts a timestamp in the
+	  meta data unless it already exists. This function is
+	  exported for the rare case when the timestamp must be taken
+	  at a different point in time than when the log event is
+	  issued.</p>
+      </desc>
+    </func>
+
   </funcs>
 
   <section>
@@ -1062,7 +1146,7 @@ logger:set_process_metadata(maps:merge(logger:get_process_metadata(), Meta)).
 
   <funcs>
     <func>
-      <name>HModule:adding_handler(Config1) -> {ok, Config2} | {error,
+      <name since="OTP 21.0">HModule:adding_handler(Config1) -> {ok, Config2} | {error,
 	Reason}</name>
       <fsummary>An instance of this handler is about to be added.</fsummary>
       <type>
@@ -1088,7 +1172,7 @@ logger:set_process_metadata(maps:merge(logger:get_process_metadata(), Meta)).
     </func>
 
     <func>
-      <name>HModule:changing_config(SetOrUpdate, OldConfig, NewConfig) -> {ok, Config} | {error, Reason}</name>
+      <name since="OTP 21.2">HModule:changing_config(SetOrUpdate, OldConfig, NewConfig) -> {ok, Config} | {error, Reason}</name>
       <fsummary>The configuration for this handler is about to change.</fsummary>
       <type>
 	<v>SetOrUpdate = set | update</v>
@@ -1126,7 +1210,7 @@ logger:set_process_metadata(maps:merge(logger:get_process_metadata(), Meta)).
     </func>
 
     <func>
-      <name>HModule:filter_config(Config) -> FilteredConfig</name>
+      <name since="OTP 21.2">HModule:filter_config(Config) -> FilteredConfig</name>
       <fsummary>Remove internal data from configuration.</fsummary>
       <type>
 	<v>Config = FilteredConfig =
@@ -1146,7 +1230,7 @@ logger:set_process_metadata(maps:merge(logger:get_process_metadata(), Meta)).
     </func>
 
     <func>
-      <name>HModule:log(LogEvent, Config) -> void()</name>
+      <name since="OTP 21.0">HModule:log(LogEvent, Config) -> void()</name>
       <fsummary>Log the given log event.</fsummary>
       <type>
 	<v>LogEvent =
@@ -1169,7 +1253,7 @@ logger:set_process_metadata(maps:merge(logger:get_process_metadata(), Meta)).
     </func>
 
     <func>
-      <name>HModule:removing_handler(Config) -> ok</name>
+      <name since="OTP 21.0">HModule:removing_handler(Config) -> ok</name>
       <fsummary>The given handler is about to be removed.</fsummary>
       <type>
 	<v>Config =
@@ -1197,7 +1281,7 @@ logger:set_process_metadata(maps:merge(logger:get_process_metadata(), Meta)).
 
   <funcs>
     <func>
-      <name>FModule:check_config(FConfig) -> ok | {error, Reason}</name>
+      <name since="OTP 21.0">FModule:check_config(FConfig) -> ok | {error, Reason}</name>
       <fsummary>Validate the given formatter configuration.</fsummary>
       <type>
 	<v>FConfig =
@@ -1228,7 +1312,7 @@ logger:set_process_metadata(maps:merge(logger:get_process_metadata(), Meta)).
       </desc>
     </func>
     <func>
-      <name>FModule:format(LogEvent, FConfig) -> FormattedLogEntry</name>
+      <name since="OTP 21.0">FModule:format(LogEvent, FConfig) -> FormattedLogEntry</name>
       <fsummary>Format the given log event.</fsummary>
       <type>
 	<v>LogEvent =
@@ -1267,5 +1351,3 @@ logger:set_process_metadata(maps:merge(logger:get_process_metadata(), Meta)).
     </p>
   </section>
 </erlref>
-
-
diff --git a/lib/kernel/doc/src/logger_chapter.xml b/lib/kernel/doc/src/logger_chapter.xml
index 458e61cef5..5aa2caadf0 100644
--- a/lib/kernel/doc/src/logger_chapter.xml
+++ b/lib/kernel/doc/src/logger_chapter.xml
@@ -89,8 +89,8 @@
     <p>Filter functions can be used for more sophisticated filtering
       than the log level check provides. A filter function can stop or
       pass a log event, based on any of the event's contents. It can
-      also modify all parts of the log event. See see
-      section <seealso marker="#filters">Filters</seealso> for more
+      also modify all parts of the log event. See section
+      <seealso marker="#filters">Filters</seealso> for more
       details.</p>
     <p>If a log event passes through all primary filters and all
       handler filters for a specific handler, Logger forwards the
@@ -212,13 +212,13 @@
       <pre>fun((<seealso marker="logger#type-report"><c>logger:report()</c></seealso>,<seealso marker="logger#type-report_cb_config"><c>logger:report_cb_config()</c></seealso>) -> <seealso marker="stdlib:unicode#type-chardata"><c>unicode:chardata()</c></seealso>)
       </pre>
       <p>The fun must obey the <c>depth</c> and <c>chars_limit</c>
-      parameters provided in the second argument, as the formatter can
-      not do anything useful of these parameters with the returned
-      string. The extra data also contains a field named
-      <c>single_line</c>, indicating if the printed log message may
-      contain line breaks or not. This variant is used when the
-      formatting of the report depends on the size or single line
-      parameters.</p>
+	parameters provided in the second argument, as the formatter
+	cannot do anything useful of these parameters with the
+	returned string. The extra data also contains a field named
+	<c>single_line</c>, indicating if the printed log message may
+	contain line breaks or not. This variant is used when the
+	formatting of the report depends on the size or single line
+	parameters.</p>
       <p>Example, format string and arguments:</p>
       <code>logger:error("The file does not exist: ~ts",[Filename])</code>
       <p>Example, string:</p>
@@ -693,8 +693,10 @@ logger:debug(#{got => connection_request, id => Id, state => State},
 	  with <seealso marker="#logger_sasl_compatible">
 	    <c>logger_sasl_compatible</c></seealso>.</p>
 	<p>With this parameter, you can modify or disable the default
-	  handler, add custom handlers and primary logger filters, and
-	  set log levels per module.</p>
+	  handler, add custom handlers and primary logger filters, set
+	  log levels per module, and modify
+	  the <seealso marker="#proxy">proxy</seealso>
+	  configuration.</p>
 	<p><c>Config</c> is any (zero or more) of the following:</p>
 	<taglist>
           <tag><c>{handler, default, undefined}</c></tag>
@@ -716,7 +718,7 @@ logger:debug(#{got => connection_request, id => Id, state => State},
 	    </seealso></pre>
 	    <p>For all other values of <c>HandlerId</c>, this entry
 	      adds a new handler, equivalent to calling</p>
-	    <pre><seealso marker="logger:add_handler/3">
+	    <pre><seealso marker="logger#add_handler/3">
 		logger:add_handler(HandlerId, Module, HandlerConfig)
 	    </seealso></pre>
 	    <p>Multiple entries of this type are allowed.</p></item>
@@ -746,6 +748,14 @@ logger:debug(#{got => connection_request, id => Id, state => State},
 	    <p>for each <c>Module</c>.</p>
 	    <p>Multiple entries of this type are allowed.</p>
 	  </item>
+	  <tag><c>{proxy, ProxyConfig}</c></tag>
+	  <item>
+	    <p>Sets the proxy configuration, equivalent to calling</p>
+	    <pre><seealso marker="logger#set_proxy_config/1">
+		logger:set_proxy_config(ProxyConfig)
+	    </seealso></pre>
+	    <p>Only one entry of this type is allowed.</p>
+	  </item>
 	</taglist>
 	<p>See
 	  section <seealso marker="#config_examples">Configuration
@@ -791,7 +801,7 @@ logger:debug(#{got => connection_request, id => Id, state => State},
 [{kernel,
   [{logger,
     [{handler, default, logger_std_h,  % {handler, HandlerId, Module,
-      #{config => #{type => {file,"log/erlang.log"}}}}  % Config}
+      #{config => #{file => "log/erlang.log"}}}  % Config}
     ]}]}].
       </code>
       <p>Modify the default handler to print each log event as a
@@ -821,10 +831,10 @@ logger:debug(#{got => connection_request, id => Id, state => State},
   [{logger,
     [{handler, default, logger_std_h,
       #{level => error,
-        config => #{type => {file, "log/erlang.log"}}}},
+        config => #{file => "log/erlang.log"}}},
      {handler, info, logger_std_h,
       #{level => debug,
-        config => #{type => {file, "log/debug.log"}}}}
+        config => #{file => "log/debug.log"}}}
     ]}]}].
       </code>
     </section>
@@ -994,10 +1004,10 @@ ok</pre>
     <p>Then, add a new handler which prints to file. You can use the
       handler
       module <seealso marker="logger_std_h"><c>logger_std_h</c></seealso>,
-      and specify type <c>{file,File}</c>.:</p>
+      and configure it to log to file:</p>
     <pre>
-4> <input>Config = #{config => #{type => {file,"./info.log"}}, level => info}.</input>
-#{config => #{type => {file,"./info.log"}},level => info}
+4> <input>Config = #{config => #{file => "./info.log"}, level => info}.</input>
+#{config => #{file => "./info.log"},level => info}
 5> <input>logger:add_handler(myhandler, logger_std_h, Config).</input>
 ok</pre>
     <p>Since <c>filter_default</c> defaults to <c>log</c>, this
@@ -1236,7 +1246,7 @@ do_log(Fd, LogEvent, #{formatter := {FModule, FConfig}}) ->
       <p>A configuration example:</p>
       <code type="none">
 logger:add_handler(my_standard_h, logger_std_h,
-                   #{config => #{type => {file,"./system_info.log"},
+                   #{config => #{file => "./system_info.log",
                                  sync_mode_qlen => 100,
                                  drop_mode_qlen => 1000,
                                  flush_qlen => 2000}}).
@@ -1334,9 +1344,50 @@ logger:add_handler(my_disk_log_h, logger_disk_log_h,
   </section>
 
   <section>
+    <marker id="proxy"/>
+    <title>Logger Proxy</title>
+    <p>The Logger proxy is an Erlang process which is part of the
+      Kernel application's supervision tree. During startup, the proxy
+      process registers itself as the <c>system_logger</c>, meaning
+      that log events produced by the emulator are sent to this
+      process.</p>
+    <p>When a log event is issued on a process which has its group
+      leader on a remote node, Logger automatically forwards the log
+      event to the group leader's node. To achieve this, it first
+      sends the log event as an Erlang message from the original
+      client process to the proxy on the local node, and the proxy in
+      turn forwards the event to the proxy on the remote node.</p>
+    <p>When receiving a log event, either from the emulator or from a
+      remote node, the proxy calls the Logger API to log the event.</p>
+    <p>The proxy process is overload protected in the same way as
+      described in
+      section <seealso marker="#overload_protection">Protecting the
+      Handler from Overload</seealso>, but with the following default
+      values:</p>
+    <code>
+    #{sync_mode_qlen => 500,
+      drop_mode_qlen => 1000,
+      flush_qlen => 5000,
+      burst_limit_enable => false,
+      overload_kill_enable => false}</code>
+    <p>For log events from the emulator, synchronous message passing
+      mode is not applicable, since all messages are passed
+      asynchronously by the emulator. Drop mode is achieved by setting
+      the <c>system_logger</c> to <c>undefined</c>, forcing the
+      emulator to drop events until it is set back to the proxy pid
+      again.</p>
+    <p>The proxy uses <seealso marker="erts:erlang#send_nosuspend/2">
+	<c>erlang:send_nosuspend/2</c></seealso> when sending log
+      events to a remote node. If the message could not be sent
+      without suspending the sender, it is dropped. This is to avoid
+      blocking the proxy process.</p>
+  </section>
+
+  <section>
     <title>See Also</title>
     <p>
       <seealso marker="disk_log"><c>disk_log(3)</c></seealso>,
+      <seealso marker="erts:erlang"><c>erlang(3)</c></seealso>,
       <seealso marker="error_logger"><c>error_logger(3)</c></seealso>,
       <seealso marker="logger"><c>logger(3)</c></seealso>,
       <seealso marker="logger_disk_log_h"><c>logger_disk_log_h(3)</c></seealso>,
diff --git a/lib/kernel/doc/src/logger_disk_log_h.xml b/lib/kernel/doc/src/logger_disk_log_h.xml
index d9b941a0a9..3d8e82ce7c 100644
--- a/lib/kernel/doc/src/logger_disk_log_h.xml
+++ b/lib/kernel/doc/src/logger_disk_log_h.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>logger_disk_log_h.xml</file>
   </header>
-  <module>logger_disk_log_h</module>
+  <module since="OTP 21.0">logger_disk_log_h</module>
   <modulesummary>A disk_log based handler for Logger</modulesummary>
 
   <description>
@@ -66,7 +66,7 @@
 	corresponds to the <c>name</c> property in the
 	<seealso marker="disk_log#open-1"><c>dlog_option()</c></seealso>
 	datatype.</p>
-	<p>The value is set when the handler is added, and it can not
+	<p>The value is set when the handler is added, and it cannot
 	  be changed in runtime.</p>
 	<p>Defaults to the same name as the handler identity, in the
 	  current directory.</p>
@@ -77,7 +77,7 @@
 	corresponds to the <c>type</c> property in the
 	<seealso marker="disk_log#open-1"><c>dlog_option()</c></seealso>
 	datatype.</p>
-	<p>The value is set when the handler is added, and it can not
+	<p>The value is set when the handler is added, and it cannot
 	  be changed in runtime.</p>
 	<p>Defaults to <c>wrap</c>.</p>
       </item>
@@ -88,7 +88,7 @@
 	corresponds to the <c>MaxNoFiles</c> element in the <c>size</c> property in the
 	<seealso marker="disk_log#open-1"><c>dlog_option()</c></seealso>
 	datatype.</p>
-	<p>The value is set when the handler is added, and it can not
+	<p>The value is set when the handler is added, and it cannot
 	  be changed in runtime.</p>
 	<p>Defaults to <c>10</c>.</p>
 	<p>The setting has no effect on a halt log.</p>
@@ -101,7 +101,7 @@
 	corresponds to the <c>MaxNoBytes</c> element in the <c>size</c> property in the
 	<seealso marker="disk_log#open-1"><c>dlog_option()</c></seealso>
 	datatype.</p>
-	<p>The value is set when the handler is added, and it can not
+	<p>The value is set when the handler is added, and it cannot
 	  be changed in runtime.</p>
 	<p>Defaults to <c>1048576</c> bytes for a wrap log, and
 	<c>infinity</c> for a halt log.</p>
@@ -133,7 +133,7 @@ logger:add_handler(my_disk_log_h, logger_disk_log_h,
                    #{config => #{file => "./my_disk_log",
                                  type => wrap,
                                  max_no_files => 4,
-                                 max_no_bytes => 10000},
+                                 max_no_bytes => 10000,
                                  filesync_repeat_interval => 1000}}).
     </code>
     <p>To use the disk_log handler instead of the default standard
@@ -148,7 +148,7 @@ erl -kernel logger '[{handler,default,logger_disk_log_h,
   <funcs>
 
     <func>
-      <name name="filesync" arity="1" clause_i="1"/>
+      <name name="filesync" arity="1" clause_i="1" since="OTP 21.0"/>
       <fsummary>Writes buffered data to disk.</fsummary>
       <desc>
         <p>Write buffered data to disk.</p>
diff --git a/lib/kernel/doc/src/logger_filters.xml b/lib/kernel/doc/src/logger_filters.xml
index 90f1fcc270..0a02342864 100644
--- a/lib/kernel/doc/src/logger_filters.xml
+++ b/lib/kernel/doc/src/logger_filters.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>logger_filters.xml</file>
   </header>
-  <module>logger_filters</module>
+  <module since="OTP 21.0">logger_filters</module>
   <modulesummary>Filters to use with Logger.</modulesummary>
 
   <description>
@@ -51,7 +51,7 @@
 
   <funcs>
     <func>
-      <name name="domain" arity="2"/>
+      <name name="domain" arity="2" since="OTP 21.0"/>
       <fsummary>Filter log events based on the domain field in
 	metadata.</fsummary>
       <desc>
@@ -152,7 +152,7 @@ ok</code>
     </func>
 
     <func>
-      <name name="level" arity="2"/>
+      <name name="level" arity="2" since="OTP 21.0"/>
       <fsummary>Filter log events based on the log level.</fsummary>
       <desc>
 	  <p>This filter provides a way of filtering log events based
@@ -212,7 +212,7 @@ ok</code>
     </func>
 
     <func>
-      <name name="progress" arity="2"/>
+      <name name="progress" arity="2" since="OTP 21.0"/>
       <fsummary>Filter progress reports from supervisor and application_controller.</fsummary>
       <desc>
 	  <p>This filter matches all progress reports
@@ -227,7 +227,7 @@ ok</code>
     </func>
 
     <func>
-      <name name="remote_gl" arity="2"/>
+      <name name="remote_gl" arity="2" since="OTP 21.0"/>
       <fsummary>Filter events with group leader on remote node.</fsummary>
       <desc>
 	  <p>This filter matches all events originating from a process
diff --git a/lib/kernel/doc/src/logger_formatter.xml b/lib/kernel/doc/src/logger_formatter.xml
index d066e263df..6dc83d24e1 100644
--- a/lib/kernel/doc/src/logger_formatter.xml
+++ b/lib/kernel/doc/src/logger_formatter.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>logger_formatter.xml</file>
   </header>
-  <module>logger_formatter</module>
+  <module since="OTP 21.0">logger_formatter</module>
   <modulesummary>Default formatter for Logger.</modulesummary>
 
   <description>
@@ -289,7 +289,7 @@ exit_reason: "It crashed"</code>
 
   <funcs>
     <func>
-      <name name="check_config" arity="1"/>
+      <name name="check_config" arity="1" since="OTP 21.0"/>
       <fsummary>Validates the given formatter configuration.</fsummary>
       <desc>
 	<p>The function is called by Logger when the formatter
@@ -310,7 +310,7 @@ exit_reason: "It crashed"</code>
       </desc>
     </func>
     <func>
-      <name name="format" arity="2"/>
+      <name name="format" arity="2" since="OTP 21.0"/>
       <fsummary>Formats the given message.</fsummary>
       <desc>
 	<p>This the formatter callback function to be called from
diff --git a/lib/kernel/doc/src/logger_std_h.xml b/lib/kernel/doc/src/logger_std_h.xml
index e156f5719b..5ac4f58d12 100644
--- a/lib/kernel/doc/src/logger_std_h.xml
+++ b/lib/kernel/doc/src/logger_std_h.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>logger_std_h.xml</file>
   </header>
-  <module>logger_std_h</module>
+  <module since="OTP 21.0">logger_std_h</module>
   <modulesummary>Standard handler for Logger.</modulesummary>
 
   <description>
@@ -55,30 +55,105 @@
        is stored in a sub map with the key <c>config</c>, and can contain the
        following parameters:</p>
     <taglist>
-      <tag><marker id="type"/><c>type</c></tag>
+      <tag><marker id="type"/><c>type = standard_io | standard_error | file</c></tag>
       <item>
-	<p>This has the value <c>standard_io</c>, <c>standard_error</c>,
-	<c>{file,LogFileName}</c>, or <c>{file,LogFileName,LogFileOpts}</c>.</p>
-	<p>If <c>LogFileOpts</c> is specified, it replaces the default
-	  list of options used when opening the log file. The default
-	  list is <c>[raw,append,delayed_write]</c>. One reason to do
-	  so can be to change <c>append</c> to, for
-	  example, <c>write</c>, ensuring that the old log is
-	  truncated when a node is restarted. See the reference manual
-	  for <seealso marker="file#open-2"><c>file:open/2</c></seealso>
-	  for more information about file options.</p>
-	<p>Log files are always UTF-8 encoded. The encoding can not be
-	  changed by setting the option <c>{encoding,Encoding}</c>
-	  in <c>LogFileOpts</c>.</p>
-	<p>Notice that the standard handler does not have support for
-	  circular logging. Use the disk_log handler,
-	  <seealso marker="logger_disk_log_h"><c>logger_disk_log_h</c></seealso>,
-	  for this.</p>
-	<p>The value is set when the handler is added, and it can not
+	<p>Specifies the log destination.</p>
+	<p>The value is set when the handler is added, and it cannot
 	  be changed in runtime.</p>
-	<p>Defaults to <c>standard_io</c>.</p>
+	<p>Defaults to <c>standard_io</c>, unless
+	  parameter <seealso marker="#file"><c>file</c></seealso> is
+	  given, in which case it defaults to <c>file</c>.</p>
       </item>
-      <tag><c>filesync_repeat_interval</c></tag>
+      <tag><marker id="file"/><c>file = </c><seealso marker="file#type-filename"><c>file:filename()</c></seealso></tag>
+      <item>
+	<p>This specifies the name of the log file when the handler is
+	  of type <c>file</c>.</p>
+	<p>The value is set when the handler is added, and it cannot
+	  be changed in runtime.</p>
+	<p>Defaults to the same name as the handler identity, in the
+	  current directory.</p>
+      </item>
+      <tag><marker id="modes"/><c>modes = [</c><seealso marker="file#type-mode"><c>file:mode()</c></seealso><c>]</c></tag>
+      <item>
+	<p>This specifies the file modes to use when opening the log
+	  file,
+	  see <seealso marker="file#open-2"><c>file:open/2</c></seealso>.
+	  If <c>modes</c> are not specified, the default list used
+	  is <c>[raw,append,delayed_write]</c>. If <c>modes</c> are
+	  specified, the list replaces the default modes list with the
+	  following adjustments:</p>
+	<list>
+	  <item>
+	    If <c>raw</c> is not found in the list, it is added.
+	  </item>
+	  <item>
+	    If none of <c>write</c>, <c>append</c> or <c>exclusive</c> is
+	    found in the list, <c>append</c> is added.</item>
+	  <item>If none of <c>delayed_write</c>
+	    or <c>{delayed_write,Size,Delay}</c> is found in the
+	    list, <c>delayed_write</c> is added.</item>
+	</list>
+	<p>Log files are always UTF-8 encoded. The encoding cannot be
+	  changed by setting the mode <c>{encoding,Encoding}</c>.</p>
+	<p>The value is set when the handler is added, and it cannot
+	  be changed in runtime.</p>
+	<p>Defaults to <c>[raw,append,delayed_write]</c>.</p>
+      </item>
+      <tag><marker id="max_no_bytes"/><c>max_no_bytes = pos_integer() | infinity</c></tag>
+      <item>
+	<p>This parameter specifies if the log file should be rotated
+	  or not. The value <c>infinity</c> means the log file will
+	  grow indefinitely, while an integer value specifies at which
+	  file size (bytes) the file is rotated.</p>
+	<p>Defaults to <c>infinity</c>.</p>
+      </item>
+      <tag><marker id="max_no_files"/><c>max_no_files = non_neg_integer()</c></tag>
+      <item>
+	<p>This parameter specifies the number of rotated log file
+	  archives to keep. This has meaning only
+	  if <seealso marker="#max_no_bytes"><c>max_no_bytes</c></seealso>
+	  is set to an integer value.</p>
+	<p>The log archives are
+	  named <c>FileName.0</c>, <c>FileName.1</c>,
+	  ... <c>FileName.N</c>, where <c>FileName</c> is the name of
+	  the current log file. <c>FileName.0</c> is the newest of the
+	  archives. The maximum value for <c>N</c> is the value
+	  of <c>max_no_files</c> minus 1.</p>
+	<p>Notice that setting this value to <c>0</c> does not turn of
+	  rotation. It only specifies that no archives are kept.</p>
+	<p>Defaults to <c>0</c>.</p>
+      </item>
+      <tag><marker id="compress_on_rotate"/><c>compress_on_rotate = boolean()</c></tag>
+      <item>
+	<p>This parameter specifies if the rotated log file archives
+	  shall be compressed or not. If set to <c>true</c>, all
+	  archives are compressed with <c>gzip</c>, and renamed
+	  to <c>FileName.N.gz</c></p>
+	<p><c>compress_on_rotate</c> has no meaning if <seealso
+	marker="#max_no_bytes"><c>max_no_bytes</c></seealso> has the
+	value <c>infinity</c>.</p>
+	<p>Defaults to <c>false</c>.</p>
+      </item>
+      <tag><marker id="file_check"/><c>file_check = non_neg_integer()</c></tag>
+      <item>
+	<p>When <c>logger_std_h</c> logs to a file, it reads the file
+	  information of the log file prior to each write
+	  operation. This is to make sure the file still exists and
+	  has the same inode as when it was opened. This implies some
+	  performance loss, but ensures that no log events are lost in
+	  the case when the file has been removed or renamed by an
+	  external actor.</p>
+	<p>In order to allow minimizing the performance loss, the
+	  <c>file_check</c> parameter can be set to a positive integer
+	  value, <c>N</c>. The handler will then skip reading the file
+	  information prior to writing, as long as no more
+	  than <c>N</c> milliseconds have passed since it was last
+	  read.</p>
+	<p>Notice that the risk of loosing log events grows when
+	  the <c>file_check</c> value grows.</p>
+	<p>Defaults to 0.</p>
+      </item>
+      <tag><c>filesync_repeat_interval = pos_integer() | no_repeat</c></tag>
       <item>
 	<p>This value, in milliseconds, specifies how often the handler does
 	a file sync operation to write buffered data to disk. The handler attempts
@@ -97,12 +172,13 @@
     standard handler and the disk_log handler, and are documented in the
     <seealso marker="logger_chapter#overload_protection"><c>User's Guide</c>
     </seealso>.</p>
-    <p>Notice that if changing the configuration of the handler in runtime,
-    the <c>type</c> parameter must not be modified.</p>
+    <p>Notice that if changing the configuration of the handler in
+    runtime, the <c>type</c>, <c>file</c>, or <c>modes</c> parameters
+    must not be modified.</p>
     <p>Example of adding a standard handler:</p>
     <code type="none">
 logger:add_handler(my_standard_h, logger_std_h,
-                   #{config => #{type => {file,"./system_info.log"},
+                   #{config => #{file => "./system_info.log",
                                  filesync_repeat_interval => 1000}}).
     </code>
     <p>To set the default handler, that starts initially with
@@ -110,7 +186,7 @@ logger:add_handler(my_standard_h, logger_std_h,
     change the Kernel default logger configuration. Example:</p>
     <code type="none">
 erl -kernel logger '[{handler,default,logger_std_h,
-                      #{config => #{type => {file,"./log.log"}}}}]'
+                      #{config => #{file => "./log.log"}}}]'
     </code>
     <p>An example of how to replace the standard handler with a disk_log handler
     at startup is found in the
@@ -121,7 +197,7 @@ erl -kernel logger '[{handler,default,logger_std_h,
   <funcs>
 
     <func>
-      <name name="filesync" arity="1" clause_i="1"/>
+      <name name="filesync" arity="1" clause_i="1" since="OTP 21.0"/>
       <fsummary>Writes buffered data to disk.</fsummary>
       <desc>
         <p>Write buffered data to disk.</p>
diff --git a/lib/kernel/doc/src/net.xml b/lib/kernel/doc/src/net.xml
new file mode 100644
index 0000000000..6fbc37076c
--- /dev/null
+++ b/lib/kernel/doc/src/net.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2018</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>net</title>
+    <prepared></prepared>
+    <docno></docno>
+    <date></date>
+    <rev></rev>
+    <file>net.xml</file>
+  </header>
+  <module since="OTP 22.0">net</module>
+  <modulesummary>Network interface.</modulesummary>
+  <description>
+    <p>This module provides an API for the network interface.</p>
+    <note>
+      <p>There is currently <em>no</em> support for Windows. </p>
+    </note>
+  </description>
+
+  <datatypes>
+    <datatype>
+      <name name="address_info"/>
+    </datatype>
+    <datatype>
+      <name name="name_info"/>
+    </datatype>
+    <datatype>
+      <name name="name_info_flags"/>
+    </datatype>
+    <datatype>
+      <name name="name_info_flag"/>
+    </datatype>
+    <datatype>
+      <name name="name_info_flag_ext"/>
+    </datatype>
+    <datatype>
+      <name name="network_interface_name"/>
+    </datatype>
+    <datatype>
+      <name name="network_interface_index"/>
+    </datatype>
+  </datatypes>
+
+  <funcs>
+    <func>
+      <name name="gethostname" arity="0"/>
+      <fsummary>Get hostname.</fsummary>
+      <desc>
+        <p>Returns the name of the current host.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="getnameinfo" arity="1" since="OTP 22.0"/>
+      <name name="getnameinfo" arity="2" since="OTP 22.0"/>
+      <fsummary>Address-to-name transaltion.</fsummary>
+      <desc>
+        <p>Address-to-name translation in a protocol-independant manner.</p>
+	<p>This function is the inverse of
+	<seealso marker="#getaddrinfo/1"><c>getaddrinfo</c></seealso>.
+	It converts a socket address to a corresponding host and service.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="getaddrinfo" arity="1" since="OTP 22.0"/>
+      <name name="getaddrinfo" arity="2" clause_i="1" since="OTP 22.0"/>
+      <name name="getaddrinfo" arity="2" clause_i="2" since="OTP 22.0"/>
+      <name name="getaddrinfo" arity="2" clause_i="3" since="OTP 22.0"/>
+      <fsummary>Network address and service transation.</fsummary>
+      <desc>
+	<p>Network address and service translation.</p>
+	<p>This function is the inverse of
+	<seealso marker="#getnameinfo/1"><c>getnameinfo</c></seealso>.
+	It converts host and service to a corresponding socket address.</p>
+	<p>One of the <c>Host</c> and <c>Service</c> may be <c>undefined</c>
+	but <em>not</em> both.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="if_name2index" arity="1" since="OTP 22.0"/>
+      <fsummary>Mappings between network interface names and indexes.</fsummary>
+      <desc>
+        <p>Mappings between network interface names and indexes.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="if_index2name" arity="1" since="OTP 22.0"/>
+      <fsummary>Mappings between network interface index and names.</fsummary>
+      <desc>
+        <p>Mappings between network interface index and names.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="if_names" arity="0" since="OTP 22.0"/>
+      <fsummary>Get network interface names and indexes.</fsummary>
+      <desc>
+        <p>Get network interface names and indexes.</p>
+      </desc>
+    </func>
+
+  </funcs>
+
+</erlref>
+
diff --git a/lib/kernel/doc/src/net_adm.xml b/lib/kernel/doc/src/net_adm.xml
index 6957a3b5e4..c3e1619f1b 100644
--- a/lib/kernel/doc/src/net_adm.xml
+++ b/lib/kernel/doc/src/net_adm.xml
@@ -28,7 +28,7 @@
     <date>1996-09-10</date>
     <rev>A</rev>
   </header>
-  <module>net_adm</module>
+  <module since="">net_adm</module>
   <modulesummary>Various Erlang net administration routines.</modulesummary>
   <description>
     <p>This module contains various network utility functions.</p>
@@ -36,7 +36,7 @@
 
   <funcs>
     <func>
-      <name name="dns_hostname" arity="1"/>
+      <name name="dns_hostname" arity="1" since=""/>
       <fsummary>Official name of a host.</fsummary>
       <desc>
         <p>Returns the official name of <c><anno>Host</anno></c>, or
@@ -46,7 +46,7 @@
     </func>
 
     <func>
-      <name name="host_file" arity="0"/>
+      <name name="host_file" arity="0" since=""/>
       <fsummary>Read file <c>.hosts.erlang</c>.</fsummary>
       <desc>
         <p>Reads file <c>.hosts.erlang</c>, see section
@@ -58,7 +58,7 @@
     </func>
 
     <func>
-      <name name="localhost" arity="0"/>
+      <name name="localhost" arity="0" since=""/>
       <fsummary>Name of the local host.</fsummary>
       <desc>
         <p>Returns the name of the local host. If Erlang was started
@@ -68,8 +68,8 @@
     </func>
 
     <func>
-      <name name="names" arity="0"/>
-      <name name="names" arity="1"/>
+      <name name="names" arity="0" since=""/>
+      <name name="names" arity="1" since=""/>
       <fsummary>Names of Erlang nodes at a host.</fsummary>
       <desc>
         <p>Similar to <c>epmd -names</c>, see
@@ -86,7 +86,7 @@
     </func>
 
     <func>
-      <name name="ping" arity="1"/>
+      <name name="ping" arity="1" since=""/>
       <fsummary>Set up a connection to a node.</fsummary>
       <desc>
         <p>Sets up a connection to <c><anno>Node</anno></c>. Returns
@@ -95,8 +95,8 @@
     </func>
 
     <func>
-      <name name="world" arity="0"/>
-      <name name="world" arity="1"/>
+      <name name="world" arity="0" since=""/>
+      <name name="world" arity="1" since=""/>
       <fsummary>Lookup and connect to all nodes at all hosts in
         <c>.hosts.erlang</c>.</fsummary>
       <type name="verbosity"/>
@@ -117,8 +117,8 @@
     </func>
 
     <func>
-      <name name="world_list" arity="1"/>
-      <name name="world_list" arity="2"/>
+      <name name="world_list" arity="1" since=""/>
+      <name name="world_list" arity="2" since=""/>
       <fsummary>Lookup and connect to all nodes at specified hosts.</fsummary>
       <type name="verbosity"/>
       <desc>
diff --git a/lib/kernel/doc/src/net_kernel.xml b/lib/kernel/doc/src/net_kernel.xml
index bfbe7a6470..419d3cad84 100644
--- a/lib/kernel/doc/src/net_kernel.xml
+++ b/lib/kernel/doc/src/net_kernel.xml
@@ -28,7 +28,7 @@
     <date>1996-09-10</date>
     <rev>A</rev>
   </header>
-  <module>net_kernel</module>
+  <module since="">net_kernel</module>
   <modulesummary>Erlang networking kernel.</modulesummary>
   <description>
     <p>The net kernel is a system process, registered as
@@ -81,7 +81,7 @@ $ <input>erl -sname foobar</input></pre>
 
   <funcs>
     <func>
-      <name name="allow" arity="1"/>
+      <name name="allow" arity="1" since=""/>
       <fsummary>Permit access to a specified set of nodes</fsummary>
       <desc>
         <p>Permits access to the specified set of nodes.</p>
@@ -98,7 +98,7 @@ $ <input>erl -sname foobar</input></pre>
     </func>
 
     <func>
-      <name name="connect_node" arity="1"/>
+      <name name="connect_node" arity="1" since=""/>
       <fsummary>Establish a connection to a node.</fsummary>
       <desc>
         <p>Establishes a connection to <c><anno>Node</anno></c>. Returns
@@ -110,7 +110,7 @@ $ <input>erl -sname foobar</input></pre>
     </func>
 
     <func>
-      <name name="get_net_ticktime" arity="0"/>
+      <name name="get_net_ticktime" arity="0" since=""/>
       <fsummary>Get <c>net_ticktime</c>.</fsummary>
       <desc>
         <p>Gets <c>net_ticktime</c> (see
@@ -131,7 +131,7 @@ $ <input>erl -sname foobar</input></pre>
     </func>
 
     <func>
-      <name name="getopts" arity="2"/>
+      <name name="getopts" arity="2" since="OTP 19.1"/>
       <fsummary>Get distribution socket options.</fsummary>
       <desc>
         <p>Get one or more options for the distribution socket
@@ -146,8 +146,8 @@ $ <input>erl -sname foobar</input></pre>
     </func>
 
     <func>
-      <name name="monitor_nodes" arity="1"/>
-      <name name="monitor_nodes" arity="2"/>
+      <name name="monitor_nodes" arity="1" since=""/>
+      <name name="monitor_nodes" arity="2" since=""/>
       <fsummary>Subscribe to node status change messages.</fsummary>
       <desc>
         <p>The calling process subscribes or unsubscribes to node
@@ -267,8 +267,8 @@ $ <input>erl -sname foobar</input></pre>
     </func>
 
     <func>
-      <name name="set_net_ticktime" arity="1"/>
-      <name name="set_net_ticktime" arity="2"/>
+      <name name="set_net_ticktime" arity="1" since=""/>
+      <name name="set_net_ticktime" arity="2" since=""/>
       <fsummary>Set <c>net_ticktime</c>.</fsummary>
       <desc>
         <p>Sets <c>net_ticktime</c> (see
@@ -324,7 +324,7 @@ $ <input>erl -sname foobar</input></pre>
     </func>
 
     <func>
-      <name name="setopts" arity="2"/>
+      <name name="setopts" arity="2" since="OTP 19.1"/>
       <fsummary>Set distribution socket options.</fsummary>
       <desc>
         <p>Set one or more options for distribution sockets.
@@ -345,9 +345,9 @@ $ <input>erl -sname foobar</input></pre>
     </func>
 
     <func>
-      <name>start([Name]) -> {ok, pid()} | {error, Reason}</name>
-      <name>start([Name, NameType]) -> {ok, pid()} | {error, Reason}</name>
-      <name>start([Name, NameType, Ticktime]) -> {ok, pid()} | {error, Reason}</name>
+      <name since="">start([Name]) -> {ok, pid()} | {error, Reason}</name>
+      <name since="">start([Name, NameType]) -> {ok, pid()} | {error, Reason}</name>
+      <name since="">start([Name, NameType, Ticktime]) -> {ok, pid()} | {error, Reason}</name>
       <fsummary>Turn an Erlang runtime system into a distributed node.</fsummary>
       <type>
         <v>Name = atom()</v>
@@ -364,7 +364,7 @@ $ <input>erl -sname foobar</input></pre>
     </func>
 
     <func>
-      <name name="stop" arity="0"/>
+      <name name="stop" arity="0" since=""/>
       <fsummary>Turn a node into a non-distributed Erlang runtime system.</fsummary>
       <desc>
         <p>Turns a distributed node into a non-distributed node. For
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index 021ecfa40d..4d31eeea3d 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -31,6 +31,366 @@
   </header>
   <p>This document describes the changes made to the Kernel application.</p>
 
+<section><title>Kernel 6.4.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p><c>user</c>/<c>user_drv</c> could respond to io
+	    requests before they had been processed, which could
+	    cause data to be dropped if the emulator was halted soon
+	    after a call to <c>io:format/2</c>, such as in an
+	    escript.</p>
+          <p>
+	    Own Id: OTP-15805</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Kernel 6.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix so that when multiple <c>-sname</c> or <c>-name</c>
+	    are given to <c>erl</c> the first one is chosen. Before
+	    this fix distribution was not started at all when
+	    multiple name options were given.</p>
+          <p>
+	    Own Id: OTP-15786 Aux Id: ERL-918 </p>
+        </item>
+        <item>
+          <p>
+	    Fix <c>inet_res</c> configuration pointing to
+	    non-existing files to work again. This was broken in
+	    KERNEL-6.3 (OTP-21.3).</p>
+          <p>
+	    Own Id: OTP-15806</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    A simple socket API is provided through the socket
+	    module. This is a low level API that does *not* replace
+	    gen_[tcp|udp|sctp]. It is intended to *eventually*
+	    replace the inet driver, but not the high level
+	    gen-modules (gen_tcp, gen_udp and gen_sctp). It also
+	    provides a basic API that facilitates the implementation
+	    of other protocols, that is TCP, UDP and SCTP. </p>
+          <p>
+	    Known issues are; No support for the Windows OS
+	    (currently).</p>
+          <p>
+	    Own Id: OTP-14831</p>
+        </item>
+        <item>
+          <p>
+	    Improved the documentation for the linger option.</p>
+          <p>
+	    Own Id: OTP-15491 Aux Id: PR-2019 </p>
+        </item>
+        <item>
+	    <p> Global no longer tries more than once when connecting
+	    to other nodes. </p>
+          <p>
+	    Own Id: OTP-15607 Aux Id: ERIERL-280 </p>
+        </item>
+        <item>
+          <p>
+	    The dist messages EXIT, EXIT2 and MONITOR_DOWN have been
+	    updated with new versions that send the reason term as
+	    part of the payload of the message instead of as part of
+	    the control message.</p>
+          <p>
+	    The old versions are still present and can be used when
+	    communicating with nodes that don't support the new
+	    versions.</p>
+          <p>
+	    Own Id: OTP-15611</p>
+        </item>
+        <item>
+          <p>
+	    Kernel configuration parameter <c>start_distribution =
+	    boolean()</c> is added. If set to <c>false</c>, the
+	    system is started with all distribution functionality
+	    disabled. Defaults to <c>true</c>.</p>
+          <p>
+	    Own Id: OTP-15668 Aux Id: PR-2088 </p>
+        </item>
+        <item>
+          <p>
+	    In OTP-21.3, a warning was introduced for duplicated
+	    applications/keys in configuration. This warning would be
+	    displayed both when the configuration was given as a file
+	    on system start, and during runtime via
+	    <c>application:set_env/1,2</c>.</p>
+          <p>
+	    The warning is now changed to a <c>badarg</c> exception
+	    in <c>application:set_env/1,2</c>. If the faulty
+	    configuration is given in a configuration file on system
+	    start, the startup will fail.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15692 Aux Id: PR-2170 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Kernel 6.3.1.2</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The possibility to send ancillary data, in particular the
+	    TOS field, has been added to <c>gen_udp:send/4,5</c>.</p>
+          <p>
+	    Own Id: OTP-15747 Aux Id: ERIERL-294 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Kernel 6.3.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix type spec for <c>seq_trace:set_token/2</c>.</p>
+          <p>
+	    Own Id: OTP-15858 Aux Id: ERL-700 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Kernel 6.3.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixed a performance regression when reading files
+	    opened with the <c>compressed</c> flag.</p>
+          <p>
+	    Own Id: OTP-15706 Aux Id: ERIERL-336 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Kernel 6.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    If for example the <c>/etc/hosts</c> did not come into
+	    existence until after the kernel application had started,
+	    its content was never read. This bug has now been
+	    corrected.</p>
+          <p>
+	    Own Id: OTP-14702 Aux Id: PR-2066 </p>
+        </item>
+        <item>
+          <p>
+	    Fix bug where doing <c>seq_trace:reset_trace()</c> while
+	    another process was doing a garbage collection could
+	    cause the run-time system to segfault.</p>
+          <p>
+	    Own Id: OTP-15490</p>
+        </item>
+        <item>
+          <p>
+	    Fix <c>erl_epmd:port_please</c> spec to include
+	    <c>atom()</c> and <c>string()</c>.</p>
+          <p>
+	    Own Id: OTP-15557 Aux Id: PR-2117 </p>
+        </item>
+        <item>
+          <p>
+	    The Logger handler logger_std_h now keeps track of the
+	    inode of its log file in order to re-open the file if the
+	    inode changes. This may happen, for instance, if the log
+	    file is opened and saved by an editor.</p>
+          <p>
+	    Own Id: OTP-15578 Aux Id: ERL-850 </p>
+        </item>
+        <item>
+          <p>
+	    When user specific file modes are given to the logger
+	    handler <c>logger_std_h</c>, they were earlier accepted
+	    without any control. This is now changes, so Logger will
+	    adjust the file modes as follows:</p>
+          <p>
+	    - If <c>raw</c> is not found in the list, it is
+	    added.<br/> - If none of <c>write</c>, <c>append</c> or
+	    <c>exclusive</c> are found in the list, <c>append</c> is
+	    added.<br/> - If none of <c>delayed_write</c> or
+	    <c>{delayed_write,Size,Delay}</c> are found in the list,
+	    <c>delayed_write</c> is added.</p>
+          <p>
+	    Own Id: OTP-15602</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The standard logger handler, <c>logger_std_h</c>, now has
+	    a new internal feature for log rotation. The rotation
+	    scheme is as follows:</p>
+          <p>
+	    The log file to which the handler currently writes always
+	    has the same name, i.e. the name which is configured for
+	    the handler. The archived files have the same name, but
+	    with extension ".N", where N is an integer. The newest
+	    archive has extension ".0", and the oldest archive has
+	    the highest number. </p>
+          <p>
+	    The size at which the log file is rotated, and the number
+	    of archive files that are kept, is specified with the
+	    handler specific configuration parameters
+	    <c>max_no_bytes</c> and <c>max_no_files</c> respectively. </p>
+          <p>
+	    Archives can be compressed, in which case they get a
+	    ".gz" file extension after the integer. Compression is
+	    specified with the handler specific configuration
+	    parameter <c>compress_on_rotate</c>.</p>
+          <p>
+	    Own Id: OTP-15479</p>
+        </item>
+        <item>
+          <p>
+	    The new functions <c>logger:i/0</c> and <c>logger:i/1</c>
+	    are added. These provide the same information as
+	    <c>logger:get_config/0</c> and other
+	    <c>logger:get_*_config</c> functions, but the information
+	    is more logically sorted and more readable.</p>
+          <p>
+	    Own Id: OTP-15600</p>
+        </item>
+        <item>
+          <p>
+	    Logger is now protected against overload due to massive
+	    amounts of log events from the emulator or from remote
+	    nodes.</p>
+          <p>
+	    Own Id: OTP-15601</p>
+        </item>
+        <item>
+          <p>
+	    Logger now uses os:system_time/1 instead of
+	    erlang:system_time/1 to generate log event timestamps.</p>
+          <p>
+	    Own Id: OTP-15625</p>
+        </item>
+        <item>
+          <p>
+	    Add functions <c>application:set_env/1,2</c> and
+	    <c>application:set_env/2</c>. These take a list of
+	    application configuration parameters, and the behaviour
+	    is equivalent to calling <c>application:set_env/4</c>
+	    individually for each application/key combination, except
+	    it is more efficient.</p>
+          <p>
+	    <c>set_env/1,2</c> warns about duplicated applications or
+	    keys. The warning is also emitted during boot, if
+	    applications or keys are duplicated within one
+	    configuration file, e.g. sys.config.</p>
+          <p>
+	    Own Id: OTP-15642 Aux Id: PR-2164 </p>
+        </item>
+        <item>
+          <p>
+	    Handler specific configuration parameters for the
+	    standard handler <c>logger_std_h</c> are changed to be
+	    more intuitive and more similar to the disk_log handler.</p>
+          <p>
+	    Earlier there was only one parameter, <c>type</c>, which
+	    could have the values <c>standard_io</c>,
+	    <c>standard_error</c>, <c>{file,FileName}</c> or
+	    <c>{file,FileName,Modes}</c>.</p>
+          <p>
+	    This is now changed, so the following parameters are
+	    allowed:</p>
+          <p>
+	    <c>type = standard_io | standard_error | file</c><br/>
+	    <c>file = file:filename()</c><br/> <c>modes =
+	    [file:mode()]</c></p>
+          <p>
+	    All parameters are optional. <c>type</c> defaults to
+	    <c>standard_io</c>, unless a file name is given, in which
+	    case it defaults to <c>file</c>. If <c>type</c> is set to
+	    <c>file</c>, the file name defaults to the same as the
+	    handler id.</p>
+          <p>
+	    The potential incompatibility is that
+	    <c>logger:get_config/0</c> and
+	    <c>logger:get_handler_config/1</c> now returns the new
+	    parameters, even if the configuration was set with the
+	    old variant, e.g. <c>#{type=>{file,FileName}}</c>.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15662</p>
+        </item>
+        <item>
+          <p>
+	    The new configuration parameter <c>file_check</c> is
+	    added to the Logger handler <c>logger_std_h</c>. This
+	    parameter specifies how long (in milliseconds) the
+	    handler may wait before checking if the log file still
+	    exists and the inode is the same as when it was opened.</p>
+          <p>
+	    The default value is 0, which means that this check is
+	    done prior to each write operation. Setting a higher
+	    number may improve performance, but adds the risk of
+	    loosing log events.</p>
+          <p>
+	    Own Id: OTP-15663</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Kernel 6.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Setting the <c>recbuf</c> size of an inet socket the
+	    <c>buffer</c> is also automatically increased. Fix a bug
+	    where the auto adjustment of inet buffer size would be
+	    triggered even if an explicit inet buffer size had
+	    already been set.</p>
+          <p>
+	    Own Id: OTP-15651 Aux Id: ERIERL-304 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Kernel 6.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -5716,4 +6076,3 @@
     </section>
   </section>
 </chapter>
-
diff --git a/lib/kernel/doc/src/os.xml b/lib/kernel/doc/src/os.xml
index c95e615c6b..0500e4cfb3 100644
--- a/lib/kernel/doc/src/os.xml
+++ b/lib/kernel/doc/src/os.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>os</module>
+  <module since="">os</module>
   <modulesummary>Operating system-specific functions.</modulesummary>
   <description>
     <p>The functions in this module are operating system-specific.
@@ -134,8 +134,8 @@
 
   <funcs>
     <func>
-      <name name="cmd" arity="1"/>
-      <name name="cmd" arity="2"/>
+      <name name="cmd" arity="1" since=""/>
+      <name name="cmd" arity="2" since="OTP 20.2.3"/>
       <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
@@ -173,8 +173,8 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
     </func>
 
     <func>
-      <name name="find_executable" arity="1"/>
-      <name name="find_executable" arity="2"/>
+      <name name="find_executable" arity="1" since=""/>
+      <name name="find_executable" arity="2" since=""/>
       <fsummary>Absolute filename of a program.</fsummary>
       <desc>
         <p>These two functions look up an executable program, with the
@@ -190,7 +190,7 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
     </func>
 
     <func>
-      <name name="getenv" arity="0"/>
+      <name name="getenv" arity="0" since=""/>
       <fsummary>List all environment variables.</fsummary>
       <desc>
         <p>Returns a list of all environment variables.
@@ -205,7 +205,7 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
     </func>
 
     <func>
-      <name name="getenv" arity="1"/>
+      <name name="getenv" arity="1" since=""/>
       <fsummary>Get the value of an environment variable.</fsummary>
       <desc>
         <p>Returns the <c><anno>Value</anno></c> of the environment variable
@@ -220,7 +220,7 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
     </func>
 
     <func>
-      <name name="getenv" arity="2"/>
+      <name name="getenv" arity="2" since="OTP 18.0"/>
       <fsummary>Get the value of an environment variable.</fsummary>
       <desc>
         <p>Returns the <c><anno>Value</anno></c> of the environment variable
@@ -235,7 +235,7 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
     </func>
 
     <func>
-      <name name="getpid" arity="0"/>
+      <name name="getpid" arity="0" since=""/>
       <fsummary>Return the process identifier of the emulator
         process.</fsummary>
       <desc>
@@ -251,7 +251,7 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
     </func>
 
     <func>
-      <name name="putenv" arity="2"/>
+      <name name="putenv" arity="2" since=""/>
       <fsummary>Set a new value for an environment variable.</fsummary>
       <desc>
         <p>Sets a new <c><anno>Value</anno></c> for environment variable
@@ -277,7 +277,7 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
     </func>
 
     <func>
-      <name name="set_signal" arity="2"/>
+      <name name="set_signal" arity="2" since="OTP 20.0"/>
       <fsummary>Enables or disables handling of OS signals.</fsummary>
       <desc>
           <p>Enables or disables OS signals.</p>
@@ -304,7 +304,7 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
     </func>
 
     <func>
-      <name name="system_time" arity="0"/>
+      <name name="system_time" arity="0" since="OTP 18.0"/>
       <fsummary>Current OS system time.</fsummary>
       <desc>
 	<p>Returns the current
@@ -317,7 +317,7 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
     </func>
 
     <func>
-      <name name="system_time" arity="1"/>
+      <name name="system_time" arity="1" since="OTP 18.0"/>
       <fsummary>Current OS system time.</fsummary>
       <desc>
 	<p>Returns the current
@@ -332,7 +332,7 @@ DirOut = os:cmd("dir"), % on Win32 platform</code>
     </func>
 
     <func>
-      <name name="timestamp" arity="0"/>
+      <name name="timestamp" arity="0" since=""/>
       <fsummary>Current OS system time on the <c>erlang:timestamp/0</c> format.</fsummary>
       <type_desc variable="Timestamp">Timestamp = {MegaSecs, Secs, MicroSecs}</type_desc>
       <desc>
@@ -373,7 +373,7 @@ calendar:now_to_universal_time(TS),
     </func>
 
     <func>
-      <name name="perf_counter" arity="0"/>
+      <name name="perf_counter" arity="0" since="OTP 19.0"/>
       <fsummary>Returns a performance counter</fsummary>
       <desc>
         <p>Returns the current performance counter value in <c>perf_counter</c>
@@ -383,7 +383,7 @@ calendar:now_to_universal_time(TS),
       </desc>
     </func>
     <func>
-      <name name="perf_counter" arity="1"/>
+      <name name="perf_counter" arity="1" since="OTP 19.0"/>
       <fsummary>Returns a performance counter</fsummary>
       <desc><p>Returns a performance counter that can be used as a very fast and
       high resolution timestamp. This counter is read directly from the hardware or operating
@@ -397,7 +397,7 @@ calendar:now_to_universal_time(TS),
       </desc>
     </func>
     <func>
-      <name name="type" arity="0"/>
+      <name name="type" arity="0" since=""/>
       <fsummary>Return the OS family and, in some cases, the OS name of the
         current OS.</fsummary>
       <desc>
@@ -417,7 +417,7 @@ calendar:now_to_universal_time(TS),
     </func>
 
     <func>
-      <name name="unsetenv" arity="1"/>
+      <name name="unsetenv" arity="1" since="OTP R16B03"/>
       <fsummary>Delete an environment variable.</fsummary>
       <desc>
 	<p>Deletes the environment variable <c><anno>VarName</anno></c>.</p>
@@ -429,7 +429,7 @@ calendar:now_to_universal_time(TS),
     </func>
 
     <func>
-      <name name="version" arity="0"/>
+      <name name="version" arity="0" since=""/>
       <fsummary>Return the OS versions.</fsummary>
       <desc>
         <p>Returns the OS version.
diff --git a/lib/kernel/doc/src/pg2.xml b/lib/kernel/doc/src/pg2.xml
index 0631b317b4..058d711756 100644
--- a/lib/kernel/doc/src/pg2.xml
+++ b/lib/kernel/doc/src/pg2.xml
@@ -32,7 +32,7 @@
     <rev>A2</rev>
     <file>pg2.xml</file>
   </header>
-  <module>pg2</module>
+  <module since="">pg2</module>
   <modulesummary>Distributed named process groups.</modulesummary>
   <description>
     <p>This module implements process groups. Each message can be sent
@@ -66,7 +66,7 @@
 
   <funcs>
     <func>
-      <name name="create" arity="1"/>
+      <name name="create" arity="1" since=""/>
       <fsummary>Create a new, empty process group.</fsummary>
       <desc>
         <p>Creates a new, empty process group. The group is globally
@@ -75,7 +75,7 @@
     </func>
 
     <func>
-      <name name="delete" arity="1"/>
+      <name name="delete" arity="1" since=""/>
       <fsummary>Delete a process group.</fsummary>
       <desc>
         <p>Deletes a process group.</p>
@@ -83,7 +83,7 @@
     </func>
 
     <func>
-      <name name="get_closest_pid" arity="1"/>
+      <name name="get_closest_pid" arity="1" since=""/>
       <fsummary>Common dispatch function.</fsummary>
       <desc>
         <p>A useful dispatch function that can be used from
@@ -93,7 +93,7 @@
     </func>
 
     <func>
-      <name name="get_local_members" arity="1"/>
+      <name name="get_local_members" arity="1" since=""/>
       <fsummary>Return all local processes in a group.</fsummary>
       <desc>
         <p>Returns all processes running on the local node in the
@@ -104,7 +104,7 @@
     </func>
 
     <func>
-      <name name="get_members" arity="1"/>
+      <name name="get_members" arity="1" since=""/>
       <fsummary>Return all processes in a group.</fsummary>
       <desc>
         <p>Returns all processes in the group <c>Name</c>. This
@@ -114,7 +114,7 @@
     </func>
 
     <func>
-      <name name="join" arity="2"/>
+      <name name="join" arity="2" since=""/>
       <fsummary>Join a process to a group.</fsummary>
       <desc>
         <p>Joins the process <c>Pid</c> to the group <c>Name</c>.
@@ -124,7 +124,7 @@
     </func>
 
     <func>
-      <name name="leave" arity="2"/>
+      <name name="leave" arity="2" since=""/>
       <fsummary>Make a process leave a group.</fsummary>
       <desc>
         <p>Makes the process <c>Pid</c> leave the group <c>Name</c>.
@@ -134,8 +134,8 @@
     </func>
 
     <func>
-      <name name="start" arity="0"/>
-      <name name="start_link" arity="0"/>
+      <name name="start" arity="0" since=""/>
+      <name name="start_link" arity="0" since=""/>
       <fsummary>Start the <c>pg2</c> server.</fsummary>
       <desc>
         <p>Starts the <c>pg2</c> server. Normally, the server does not need
@@ -149,7 +149,7 @@
     </func>
 
     <func>
-      <name name="which_groups" arity="0"/>
+      <name name="which_groups" arity="0" since=""/>
       <fsummary>Return a list of all known groups.</fsummary>
       <desc>
         <p>Returns a list of all known groups.</p>
diff --git a/lib/kernel/doc/src/ref_man.xml b/lib/kernel/doc/src/ref_man.xml.src
index d3b947527f..72e3409123 100644
--- a/lib/kernel/doc/src/ref_man.xml
+++ b/lib/kernel/doc/src/ref_man.xml.src
@@ -4,7 +4,7 @@
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1996</year><year>2018</year>
+      <year>1996</year><year>2019</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -60,6 +60,7 @@
   <xi:include href="logger_formatter.xml"/>
   <xi:include href="logger_std_h.xml"/>
   <xi:include href="logger_disk_log_h.xml"/>
+  %ESOCK_USE_NET_XML%
   <xi:include href="net_adm.xml"/>
   <xi:include href="net_kernel.xml"/>
   <xi:include href="os.xml"/>
diff --git a/lib/kernel/doc/src/rpc.xml b/lib/kernel/doc/src/rpc.xml
index fab616e630..c55454506e 100644
--- a/lib/kernel/doc/src/rpc.xml
+++ b/lib/kernel/doc/src/rpc.xml
@@ -28,7 +28,7 @@
     <date>1996-09-10</date>
     <rev>A</rev>
   </header>
-  <module>rpc</module>
+  <module since="">rpc</module>
   <modulesummary>Remote Procedure Call services.</modulesummary>
   <description>
     <p>This module contains services similar to Remote
@@ -51,7 +51,7 @@
 
   <funcs>
     <func>
-      <name name="abcast" arity="2"/>
+      <name name="abcast" arity="2" since=""/>
       <fsummary>Broadcast a message asynchronously to a registered process on
         all nodes.</fsummary>
       <desc>
@@ -61,7 +61,7 @@
     </func>
 
     <func>
-      <name name="abcast" arity="3"/>
+      <name name="abcast" arity="3" since=""/>
       <fsummary>Broadcast a message asynchronously to a registered process on
         specific nodes.</fsummary>
       <desc>
@@ -72,7 +72,7 @@
     </func>
 
     <func>
-      <name name="async_call" arity="4"/>
+      <name name="async_call" arity="4" since=""/>
       <fsummary>Evaluate a function call on a node, asynchronous
       version.</fsummary>
       <desc>
@@ -98,7 +98,7 @@
     </func>
 
     <func>
-      <name name="block_call" arity="4"/>
+      <name name="block_call" arity="4" since=""/>
       <fsummary>Evaluate a function call on a node in the RPC server's
         context.</fsummary>
       <desc>
@@ -115,7 +115,7 @@
     </func>
 
     <func>
-      <name name="block_call" arity="5"/>
+      <name name="block_call" arity="5" since=""/>
       <fsummary>Evaluate a function call on a node in the RPC server's
         context.</fsummary>
       <desc>
@@ -127,7 +127,7 @@
     </func>
 
     <func>
-      <name name="call" arity="4"/>
+      <name name="call" arity="4" since=""/>
       <fsummary>Evaluate a function call on a node.</fsummary>
       <desc>
         <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>,
@@ -138,7 +138,7 @@
     </func>
 
     <func>
-      <name name="call" arity="5"/>
+      <name name="call" arity="5" since=""/>
       <fsummary>Evaluate a function call on a node.</fsummary>
       <desc>
         <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>,
@@ -158,7 +158,7 @@
     </func>
 
     <func>
-      <name name="cast" arity="4"/>
+      <name name="cast" arity="4" since=""/>
       <fsummary>Run a function on a node ignoring the result.</fsummary>
       <desc>
         <p>Evaluates <c>apply(<anno>Module</anno>, <anno>Function</anno>,
@@ -171,7 +171,7 @@
     </func>
 
     <func>
-      <name name="eval_everywhere" arity="3"/>
+      <name name="eval_everywhere" arity="3" since=""/>
       <fsummary>Run a function on all nodes, ignoring the result.</fsummary>
       <desc>
         <p>Equivalent to <c>eval_everywhere([node()|nodes()],
@@ -181,7 +181,7 @@
     </func>
 
     <func>
-      <name name="eval_everywhere" arity="4"/>
+      <name name="eval_everywhere" arity="4" since=""/>
       <fsummary>Run a function on specific nodes, ignoring the
         result.</fsummary>
       <desc>
@@ -192,7 +192,7 @@
     </func>
 
     <func>
-      <name name="multi_server_call" arity="2"/>
+      <name name="multi_server_call" arity="2" since=""/>
       <fsummary>Interact with the servers on a number of nodes.</fsummary>
       <desc>
         <p>Equivalent to <c>multi_server_call([node()|nodes()],
@@ -201,7 +201,7 @@
     </func>
 
     <func>
-      <name name="multi_server_call" arity="3"/>
+      <name name="multi_server_call" arity="3" since=""/>
       <fsummary>Interact with the servers on a number of nodes.</fsummary>
       <desc>
         <p>Can be used when interacting with servers called
@@ -224,7 +224,7 @@
     </func>
 
     <func>
-      <name name="multicall" arity="3"/>
+      <name name="multicall" arity="3" since=""/>
       <fsummary>Evaluate a function call on a number of nodes.</fsummary>
       <desc>
         <p>Equivalent to <c>multicall([node()|nodes()], <anno>Module</anno>,
@@ -233,7 +233,7 @@
     </func>
 
     <func>
-      <name name="multicall" arity="4" clause_i="1"/>
+      <name name="multicall" arity="4" clause_i="1" since=""/>
       <fsummary>Evaluate a function call on a number of nodes.</fsummary>
       <desc>
         <p>Equivalent to <c>multicall(<anno>Nodes</anno>, <anno>Module</anno>,
@@ -242,7 +242,7 @@
     </func>
 
     <func>
-      <name name="multicall" arity="4" clause_i="2"/>
+      <name name="multicall" arity="4" clause_i="2" since=""/>
       <fsummary>Evaluate a function call on a number of nodes.</fsummary>
       <desc>
         <p>Equivalent to <c>multicall([node()|nodes()], <anno>Module</anno>,
@@ -252,7 +252,7 @@
     </func>
 
     <func>
-      <name name="multicall" arity="5"/>
+      <name name="multicall" arity="5" since=""/>
       <fsummary>Evaluate a function call on a number of nodes.</fsummary>
       <desc>
         <p>In contrast to an RPC, a multicall is an RPC that is sent
@@ -288,7 +288,7 @@
     </func>
 
     <func>
-      <name name="nb_yield" arity="1"/>
+      <name name="nb_yield" arity="1" since=""/>
       <fsummary>Deliver the result of evaluating a function call on a node
         (non-blocking).</fsummary>
       <desc>
@@ -297,7 +297,7 @@
     </func>
 
     <func>
-      <name name="nb_yield" arity="2"/>
+      <name name="nb_yield" arity="2" since=""/>
       <fsummary>Deliver the result of evaluating a function call on a node
         (non-blocking).</fsummary>
       <desc>
@@ -315,7 +315,7 @@
     </func>
 
     <func>
-      <name name="parallel_eval" arity="1"/>
+      <name name="parallel_eval" arity="1" since=""/>
       <fsummary>Evaluate many function calls on all nodes in
         parallel.</fsummary>
       <desc>
@@ -328,7 +328,7 @@
     </func>
 
     <func>
-      <name name="pinfo" arity="1"/>
+      <name name="pinfo" arity="1" since=""/>
       <fsummary>Information about a process.</fsummary>
       <desc>
         <p>Location transparent version of the BIF
@@ -337,8 +337,8 @@
     </func>
 
     <func>
-      <name name="pinfo" arity="2" clause_i="1"/>
-      <name name="pinfo" arity="2" clause_i="2"/>
+      <name name="pinfo" arity="2" clause_i="1" since=""/>
+      <name name="pinfo" arity="2" clause_i="2" since=""/>
       <fsummary>Information about a process.</fsummary>
       <desc>
         <p>Location transparent version of the BIF
@@ -347,7 +347,7 @@
     </func>
 
     <func>
-      <name name="pmap" arity="3"/>
+      <name name="pmap" arity="3" since=""/>
       <fsummary>Parallel evaluation of mapping a function over a
         list.</fsummary>
       <desc>
@@ -360,7 +360,7 @@
     </func>
 
     <func>
-      <name name="sbcast" arity="2"/>
+      <name name="sbcast" arity="2" since=""/>
       <fsummary>Broadcast a message synchronously to a registered process on
         all nodes.</fsummary>
       <desc>
@@ -370,7 +370,7 @@
     </func>
 
     <func>
-      <name name="sbcast" arity="3"/>
+      <name name="sbcast" arity="3" since=""/>
       <fsummary>Broadcast a message synchronously to a registered process on
         specific nodes.</fsummary>
       <desc>
@@ -391,7 +391,7 @@
     </func>
 
     <func>
-      <name name="server_call" arity="4"/>
+      <name name="server_call" arity="4" since=""/>
       <fsummary>Interact with a server on a node.</fsummary>
       <desc>
         <p>Can be used when interacting with a server called
@@ -410,7 +410,7 @@
     </func>
 
     <func>
-      <name name="yield" arity="1"/>
+      <name name="yield" arity="1" since=""/>
       <fsummary>Deliver the result of evaluating a function call on a node
         (blocking).</fsummary>
       <desc>
diff --git a/lib/kernel/doc/src/seq_trace.xml b/lib/kernel/doc/src/seq_trace.xml
index 1a4a74419a..aa29223dd0 100644
--- a/lib/kernel/doc/src/seq_trace.xml
+++ b/lib/kernel/doc/src/seq_trace.xml
@@ -28,7 +28,7 @@
     <date>1998-04-16</date>
     <rev>A</rev>
   </header>
-  <module>seq_trace</module>
+  <module since="">seq_trace</module>
   <modulesummary>Sequential tracing of messages.</modulesummary>
   <description>
     <p>Sequential tracing makes it possible to trace all messages
@@ -51,7 +51,7 @@
   </datatypes>
   <funcs>
     <func>
-      <name name="set_token" arity="1"/>
+      <name name="set_token" arity="1" since=""/>
       <fsummary>Set the trace token</fsummary>
       <desc>
         <p>Sets the trace token for the calling process to <c><anno>Token</anno></c>.
@@ -71,7 +71,7 @@ seq_trace:set_token(OldToken), % activate the trace token again
       </desc>
     </func>
     <func>
-      <name name="set_token" arity="2"/>
+      <name name="set_token" arity="2" since=""/>
       <fsummary>Set a component of the trace token</fsummary>
       <type name="component"/>
       <type name="flag"/>
@@ -158,7 +158,7 @@ seq_trace:set_token(OldToken), % activate the trace token again
       </desc>
     </func>
     <func>
-      <name name="get_token" arity="0"/>
+      <name name="get_token" arity="0" since=""/>
       <fsummary>Return the value of the trace token</fsummary>
       <desc>
         <p>Returns the value of the trace token for the calling process.
@@ -169,7 +169,7 @@ seq_trace:set_token(OldToken), % activate the trace token again
       </desc>
     </func>
     <func>
-      <name name="get_token" arity="1"/>
+      <name name="get_token" arity="1" since=""/>
       <fsummary>Return the value of a trace token component</fsummary>
       <type name="component"/>
       <type name="flag"/>
@@ -182,7 +182,7 @@ seq_trace:set_token(OldToken), % activate the trace token again
       </desc>
     </func>
     <func>
-      <name name="print" arity="1"/>
+      <name name="print" arity="1" since=""/>
       <fsummary>Put the Erlang term <c>TraceInfo</c>into the sequential trace output</fsummary>
       <desc>
         <p>Puts the Erlang term <c><anno>TraceInfo</anno></c> into the sequential
@@ -192,7 +192,7 @@ seq_trace:set_token(OldToken), % activate the trace token again
       </desc>
     </func>
     <func>
-      <name name="print" arity="2"/>
+      <name name="print" arity="2" since=""/>
       <fsummary>Put the Erlang term <c>TraceInfo</c>into the sequential trace output</fsummary>
       <desc>
         <p>Same as <c>print/1</c> with the additional condition that
@@ -201,7 +201,7 @@ seq_trace:set_token(OldToken), % activate the trace token again
       </desc>
     </func>
     <func>
-      <name name="reset_trace" arity="0"/>
+      <name name="reset_trace" arity="0" since=""/>
       <fsummary>Stop all sequential tracing on the local node</fsummary>
       <desc>
         <p>Sets the trace token to empty for all processes on the
@@ -213,7 +213,7 @@ seq_trace:set_token(OldToken), % activate the trace token again
       </desc>
     </func>
     <func>
-      <name name="set_system_tracer" arity="1"/>
+      <name name="set_system_tracer" arity="1" since=""/>
       <fsummary>Set the system tracer</fsummary>
       <type name="tracer"/>
       <desc>
@@ -227,7 +227,7 @@ seq_trace:set_token(OldToken), % activate the trace token again
       </desc>
     </func>
     <func>
-      <name name="get_system_tracer" arity="0"/>
+      <name name="get_system_tracer" arity="0" since=""/>
       <fsummary>Return the pid() or port() of the current system tracer.</fsummary>
       <type name="tracer"/>
       <desc>
diff --git a/lib/kernel/doc/src/specs.xml b/lib/kernel/doc/src/specs.xml.src
index b8c25ca53b..ccb26b9458 100644
--- a/lib/kernel/doc/src/specs.xml
+++ b/lib/kernel/doc/src/specs.xml.src
@@ -26,6 +26,7 @@
   <xi:include href="../specs/specs_logger_formatter.xml"/>
   <xi:include href="../specs/specs_logger_std_h.xml"/>
   <xi:include href="../specs/specs_logger_disk_log_h.xml"/>
+  %ESOCK_USE_NET_SPECS_XML%
   <xi:include href="../specs/specs_net_adm.xml"/>
   <xi:include href="../specs/specs_net_kernel.xml"/>
   <xi:include href="../specs/specs_os.xml"/>
diff --git a/lib/kernel/doc/src/wrap_log_reader.xml b/lib/kernel/doc/src/wrap_log_reader.xml
index 7fb9c1c023..5f37e7ec5f 100644
--- a/lib/kernel/doc/src/wrap_log_reader.xml
+++ b/lib/kernel/doc/src/wrap_log_reader.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>wrap_log_reader.sgml</file>
   </header>
-  <module>wrap_log_reader</module>
+  <module since="">wrap_log_reader</module>
   <modulesummary>A service to read internally formatted wrap disk logs.
   </modulesummary>
   <description>
@@ -65,8 +65,8 @@
 
   <funcs>
     <func>
-      <name name="chunk" arity="1"/>
-      <name name="chunk" arity="2"/>
+      <name name="chunk" arity="1" since=""/>
+      <name name="chunk" arity="2" since=""/>
       <fsummary>Read a chunk of objects written to a wrap log.</fsummary>
       <type name="chunk_ret"/>
       <desc>
@@ -105,7 +105,7 @@
     </func>
 
     <func>
-      <name name="close" arity="1"/>
+      <name name="close" arity="1" since=""/>
       <fsummary>Close a log.</fsummary>
       <desc>
         <p>Closes a log file properly.</p>
@@ -113,8 +113,8 @@
     </func>
 
     <func>
-      <name name="open" arity="1"/>
-      <name name="open" arity="2"/>
+      <name name="open" arity="1" since=""/>
+      <name name="open" arity="2" since=""/>
       <fsummary>Open a log file.</fsummary>
       <type name="open_ret"/>
       <desc>
diff --git a/lib/kernel/examples/gen_tcp_dist/Makefile b/lib/kernel/examples/gen_tcp_dist/Makefile
index 65513a1729..0c916835ea 100644
--- a/lib/kernel/examples/gen_tcp_dist/Makefile
+++ b/lib/kernel/examples/gen_tcp_dist/Makefile
@@ -2,9 +2,7 @@ RM=rm -f
 CP=cp
 EBIN=ebin
 ERLC=erlc
-# Works if building in open source source tree
-KERNEL_INCLUDE=$(ERL_TOP)/lib/kernel/include
-ERLCFLAGS+= -W -I$(KERNEL_INCLUDE)
+ERLCFLAGS+= -W
 
 MODULES=gen_tcp_dist
 
diff --git a/lib/kernel/examples/gen_tcp_dist/src/gen_tcp_dist.erl b/lib/kernel/examples/gen_tcp_dist/src/gen_tcp_dist.erl
index 98554ed805..cda4c470f9 100644
--- a/lib/kernel/examples/gen_tcp_dist/src/gen_tcp_dist.erl
+++ b/lib/kernel/examples/gen_tcp_dist/src/gen_tcp_dist.erl
@@ -53,10 +53,10 @@
 
 -import(error_logger,[error_msg/2]).
 
--include("net_address.hrl").
+-include_lib("kernel/include/net_address.hrl").
 
--include("dist.hrl").
--include("dist_util.hrl").
+-include_lib("kernel/include/dist.hrl").
+-include_lib("kernel/include/dist_util.hrl").
 
 %% ------------------------------------------------------------
 %%  Select this protocol based on node name
@@ -679,7 +679,14 @@ dist_cntrlr_setup_loop(Socket, TickHandler, Sup) ->
             %% From now on we execute on normal priority
             process_flag(priority, normal),
             erlang:dist_ctrl_get_data_notification(DHandle),
-            dist_cntrlr_output_loop(DHandle, Socket)
+            case init:get_argument(gen_tcp_dist_output_loop) of
+                error ->
+                    dist_cntrlr_output_loop(DHandle, Socket);
+                {ok, [[ModStr, FuncStr]]} -> % For testing...
+                    apply(list_to_atom(ModStr),
+                          list_to_atom(FuncStr),
+                          [DHandle, Socket])
+            end
     end.
 
 %% We use active 10 for good throughput while still
diff --git a/lib/kernel/include/dist.hrl b/lib/kernel/include/dist.hrl
index 003852f1b0..f06fc328d7 100644
--- a/lib/kernel/include/dist.hrl
+++ b/lib/kernel/include/dist.hrl
@@ -42,6 +42,9 @@
 -define(DFLAG_BIG_CREATION, 16#40000).
 -define(DFLAG_SEND_SENDER, 16#80000).
 -define(DFLAG_BIG_SEQTRACE_LABELS, 16#100000).
+%% -define(DFLAG_NO_MAGIC, 16#200000). %% Used internally only
+-define(DFLAG_EXIT_PAYLOAD, 16#400000).
+-define(DFLAG_FRAGMENTS, 16#800000).
 
 %% Also update dflag2str() in ../src/dist_util.erl
 %% when adding flags...
diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile
index 57f17defc8..88752431eb 100644
--- a/lib/kernel/src/Makefile
+++ b/lib/kernel/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1996-2018. All Rights Reserved.
+# Copyright Ericsson AB 1996-2019. 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.
@@ -118,6 +118,8 @@ MODULES = \
 	logger_h_common \
 	logger_filters \
         logger_formatter \
+	logger_olp \
+	logger_proxy \
         logger_server \
         logger_simple_h \
         logger_sup \
@@ -151,7 +153,7 @@ INTERNAL_HRL_FILES= application_master.hrl disk_log.hrl \
         inet_dns.hrl inet_res.hrl \
         inet_boot.hrl inet_config.hrl inet_int.hrl \
 	inet_dns_record_adts.hrl \
-	logger_internal.hrl logger_h_common.hrl
+	logger_internal.hrl logger_olp.hrl logger_h_common.hrl
 
 ERL_FILES= $(MODULES:%=%.erl)
 
@@ -174,8 +176,11 @@ APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
 
 ifeq ($(NATIVE_LIBS_ENABLED),yes)
 ERL_COMPILE_FLAGS += +native
+else
+ERL_COMPILE_FLAGS += -Werror
 endif
-ERL_COMPILE_FLAGS += -I../include -Werror
+ERL_COMPILE_FLAGS += -I../include
+
 
 # ----------------------------------------------------
 # Targets
@@ -279,6 +284,8 @@ $(EBIN)/logger_config.beam: logger_internal.hrl ../include/logger.hrl
 $(EBIN)/logger_disk_log_h.beam: logger_h_common.hrl logger_internal.hrl ../include/logger.hrl ../include/file.hrl
 $(EBIN)/logger_filters.beam: logger_internal.hrl ../include/logger.hrl
 $(EBIN)/logger_formatter.beam: logger_internal.hrl ../include/logger.hrl
+$(EBIN)/logger_olp.beam: logger_olp.hrl logger_internal.hrl
+$(EBIN)/logger_proxy.beam: logger_internal.hrl
 $(EBIN)/logger_server.beam: logger_internal.hrl ../include/logger.hrl
 $(EBIN)/logger_simple_h.beam: logger_internal.hrl ../include/logger.hrl
 $(EBIN)/logger_std_h.beam: logger_h_common.hrl logger_internal.hrl ../include/logger.hrl ../include/file.hrl
diff --git a/lib/kernel/src/application.erl b/lib/kernel/src/application.erl
index bc6be2f8f5..5c2e981e4b 100644
--- a/lib/kernel/src/application.erl
+++ b/lib/kernel/src/application.erl
@@ -25,7 +25,7 @@
 	 which_applications/0, which_applications/1,
 	 loaded_applications/0, permit/2]).
 -export([ensure_started/1, ensure_started/2]).
--export([set_env/3, set_env/4, unset_env/2, unset_env/3]).
+-export([set_env/1, set_env/2, set_env/3, set_env/4, unset_env/2, unset_env/3]).
 -export([get_env/1, get_env/2, get_env/3, get_all_env/0, get_all_env/1]).
 -export([get_key/1, get_key/2, get_all_key/0, get_all_key/1]).
 -export([get_application/0, get_application/1, info/0]).
@@ -279,6 +279,26 @@ loaded_applications() ->
 info() -> 
     application_controller:info().
 
+-spec set_env(Config) -> 'ok' when
+      Config :: [{Application, Env}],
+      Application :: atom(),
+      Env :: [{Par :: atom(), Val :: term()}].
+
+set_env(Config) when is_list(Config) ->
+    set_env(Config, []).
+
+-spec set_env(Config, Opts) -> 'ok' when
+      Config :: [{Application, Env}],
+      Application :: atom(),
+      Env :: [{Par :: atom(), Val :: term()}],
+      Opts :: [{timeout, timeout()} | {persistent, boolean()}].
+
+set_env(Config, Opts) when is_list(Config), is_list(Opts) ->
+    case application_controller:set_env(Config, Opts) of
+	ok -> ok;
+	{error, Msg} -> erlang:error({badarg, Msg}, [Config, Opts])
+    end.
+
 -spec set_env(Application, Par, Val) -> 'ok' when
       Application :: atom(),
       Par :: atom(),
diff --git a/lib/kernel/src/application_controller.erl b/lib/kernel/src/application_controller.erl
index a074d2e74b..7715dca7c6 100644
--- a/lib/kernel/src/application_controller.erl
+++ b/lib/kernel/src/application_controller.erl
@@ -26,7 +26,7 @@
 	 control_application/1,
 	 change_application_data/2, prep_config_change/0, config_change/1,
 	 which_applications/0, which_applications/1,
-	 loaded_applications/0, info/0,
+	 loaded_applications/0, info/0, set_env/2,
 	 get_pid_env/2, get_env/2, get_pid_all_env/1, get_all_env/1,
 	 get_pid_key/2, get_key/2, get_pid_all_key/1, get_all_key/1,
 	 get_master/1, get_application/1, get_application_module/1,
@@ -345,9 +345,6 @@ get_all_env(AppName) ->
     map(fun([Key, Val]) -> {Key, Val} end,
 	ets:match(ac_tab, {{env, AppName, '$1'}, '$2'})).
 
-
-
-
 get_pid_key(Master, Key) ->
     case ets:match(ac_tab, {{application_master, '$1'}, Master}) of
 	[[AppName]] -> get_key(AppName, Key);
@@ -461,6 +458,15 @@ permit_application(ApplName, Flag) ->
 		    {permit_application, ApplName, Flag},
 		    infinity).
 
+set_env(Config, Opts) ->
+    case check_conf_data(Config) of
+	ok ->
+	    Timeout = proplists:get_value(timeout, Opts, 5000),
+	    gen_server:call(?AC, {set_env, Config, Opts}, Timeout);
+
+	{error, _} = Error ->
+	    Error
+    end.
 
 set_env(AppName, Key, Val) ->
     gen_server:call(?AC, {set_env, AppName, Key, Val, []}).
@@ -528,19 +534,15 @@ check_conf_data([]) ->
 check_conf_data(ConfData) when is_list(ConfData) ->
     [Application | ConfDataRem] = ConfData,
     case Application of
-	{kernel, List} when is_list(List) ->
-	    case check_para_kernel(List) of
-		ok ->
-		    check_conf_data(ConfDataRem);
-		Error1 ->
-		    Error1
-	    end;
 	{AppName, List} when is_atom(AppName), is_list(List) ->
-	    case check_para(List, atom_to_list(AppName)) of
-		ok ->
-		    check_conf_data(ConfDataRem);
-		Error2 ->
-		    Error2
+	    case lists:keymember(AppName, 1, ConfDataRem) of
+		true ->
+		    {error, "duplicate application config: " ++ atom_to_list(AppName)};
+		false ->
+		    case check_para(List, AppName) of
+			ok -> check_conf_data(ConfDataRem);
+			Error -> Error
+		    end
 	    end;
 	{AppName, List} when is_list(List)  ->
 	    ErrMsg = "application: "
@@ -553,36 +555,39 @@ check_conf_data(ConfData) when is_list(ConfData) ->
 		++ "; parameters must be a list",
 	    {error, ErrMsg};
 	Else ->
-	    ErrMsg = "invalid application name: " ++ 
-		lists:flatten(io_lib:format(" ~tp",[Else])),
+	    ErrMsg = "invalid application config: "
+		++ lists:flatten(io_lib:format("~tp",[Else])),
 	    {error, ErrMsg}
     end;
 check_conf_data(_ConfData) ->
-    {error, 'configuration must be a list ended by <dot><whitespace>'}.
-    
+    {error, "configuration must be a list ended by <dot><whitespace>"}.
 
-%% Special check of distributed parameter for kernel
-check_para_kernel([]) ->
+
+check_para([], _AppName) ->
     ok;
-check_para_kernel([{distributed, Apps} | ParaList]) when is_list(Apps) ->
-    case check_distributed(Apps) of
-	{error, _ErrorMsg} = Error ->
-	    Error;
-	_ ->
-	    check_para_kernel(ParaList)
+check_para([{Para, Val} | ParaList], AppName) when is_atom(Para) ->
+    case lists:keymember(Para, 1, ParaList) of
+	true ->
+	    ErrMsg =  "application: " ++ atom_to_list(AppName)
+		++ "; duplicate parameter: " ++ atom_to_list(Para),
+	    {error, ErrMsg};
+	false ->
+	    case check_para_value(Para, Val, AppName) of
+		ok -> check_para(ParaList, AppName);
+		{error, _} = Error -> Error
+	    end
     end;
-check_para_kernel([{distributed, _Apps} | _ParaList]) ->
-    {error, "application: kernel; erroneous parameter: distributed"};
-check_para_kernel([{Para, _Val} | ParaList]) when is_atom(Para) ->
-    check_para_kernel(ParaList);
-check_para_kernel([{Para, _Val} | _ParaList]) ->
-    {error, "application: kernel; invalid parameter: " ++ 
+check_para([{Para, _Val} | _ParaList], AppName) ->
+    {error, "application: " ++ atom_to_list(AppName) ++ "; invalid parameter name: " ++
      lists:flatten(io_lib:format("~tp",[Para]))};
-check_para_kernel(Else) ->
-    {error, "application: kernel; invalid parameter list: " ++ 
+check_para([Else | _ParaList], AppName) ->
+    {error, "application: " ++ atom_to_list(AppName) ++ "; invalid parameter: " ++
      lists:flatten(io_lib:format("~tp",[Else]))}.
-    
 
+check_para_value(distributed, Apps, kernel) -> check_distributed(Apps);
+check_para_value(_Para, _Val, _AppName) -> ok.
+
+%% Special check of distributed parameter for kernel
 check_distributed([]) ->
     ok;
 check_distributed([{App, List} | Apps]) when is_atom(App), is_list(List) ->
@@ -595,18 +600,6 @@ check_distributed(_Else) ->
     {error, "application: kernel; erroneous parameter: distributed"}.
 
 
-check_para([], _AppName) ->
-    ok;
-check_para([{Para, _Val} | ParaList], AppName) when is_atom(Para) ->
-    check_para(ParaList, AppName);
-check_para([{Para, _Val} | _ParaList], AppName) ->
-    {error, "application: " ++ AppName ++ "; invalid parameter: " ++ 
-     lists:flatten(io_lib:format("~tp",[Para]))};
-check_para([Else | _ParaList], AppName) ->
-    {error, "application: " ++ AppName ++ "; invalid parameter: " ++ 
-     lists:flatten(io_lib:format("~tp",[Else]))}.
-
-
 -type calls() :: 'info' | 'prep_config_change' | 'which_applications'
                | {'config_change' | 'control_application' |
 		  'load_application' | 'start_type' | 'stop_application' |
@@ -863,6 +856,16 @@ handle_call(which_applications, _From, S) ->
 	       end, S#state.running),
     {reply, Reply, S};
 
+handle_call({set_env, Config, Opts}, _From, S) ->
+    _ = [add_env(AppName, Env) || {AppName, Env} <- Config],
+
+    case proplists:get_value(persistent, Opts, false) of
+	true ->
+	    {reply, ok, S#state{conf_data = merge_env(S#state.conf_data, Config)}};
+	false ->
+	    {reply, ok, S}
+    end;
+
 handle_call({set_env, AppName, Key, Val, Opts}, _From, S) ->
     ets:insert(ac_tab, {{env, AppName, Key}, Val}),
     case proplists:get_value(persistent, Opts, false) of
diff --git a/lib/kernel/src/code.erl b/lib/kernel/src/code.erl
index 7faef93609..964ede9bc9 100644
--- a/lib/kernel/src/code.erl
+++ b/lib/kernel/src/code.erl
@@ -19,6 +19,8 @@
 %%
 -module(code).
 
+-include_lib("kernel/include/logger.hrl").
+
 %% This is the interface module to the code server. It also contains
 %% some implementation details.  See also related modules: code_*.erl
 %% in this directory.
@@ -707,8 +709,20 @@ do_s(Lib) ->
 
 start_get_mode() ->
     case init:get_argument(mode) of
-	{ok,[["embedded"]]} ->
-	    embedded;
+	{ok, [FirstMode | Rest]} ->
+	    case Rest of
+		[] ->
+		    ok;
+		_ ->
+		    ?LOG_WARNING("Multiple -mode given to erl, using the first, ~p",
+				 [FirstMode])
+	    end,
+	    case FirstMode of
+		["embedded"] ->
+		    embedded;
+		_ ->
+		    interactive
+	    end;
 	_ ->
 	    interactive
     end.
diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl
index 1b4a67ecb7..68e1205301 100644
--- a/lib/kernel/src/code_server.erl
+++ b/lib/kernel/src/code_server.erl
@@ -1434,19 +1434,25 @@ all_loaded(Db) ->
 
 -spec error_msg(io:format(), [term()]) -> 'ok'.
 error_msg(Format, Args) ->
+    %% This is equal to calling logger:error/3 which we don't want to
+    %% do from code_server. We don't want to call logger:timestamp()
+    %% either.
     logger ! {log,error,Format,Args,
               #{pid=>self(),
                 gl=>group_leader(),
-                time=>erlang:system_time(microsecond),
+                time=>os:system_time(microsecond),
                 error_logger=>#{tag=>error}}},
     ok.
 
 -spec info_msg(io:format(), [term()]) -> 'ok'.
 info_msg(Format, Args) ->
+    %% This is equal to calling logger:info/3 which we don't want to
+    %% do from code_server. We don't want to call logger:timestamp()
+    %% either.
     logger ! {log,info,Format,Args,
               #{pid=>self(),
                 gl=>group_leader(),
-                time=>erlang:system_time(microsecond),
+                time=>os:system_time(microsecond),
                 error_logger=>#{tag=>info_msg}}},
     ok.
 
diff --git a/lib/kernel/src/dist_util.erl b/lib/kernel/src/dist_util.erl
index ecc022b28d..09ed31f10c 100644
--- a/lib/kernel/src/dist_util.erl
+++ b/lib/kernel/src/dist_util.erl
@@ -116,6 +116,10 @@ dflag2str(?DFLAG_SEND_SENDER) ->
     "SEND_SENDER";
 dflag2str(?DFLAG_BIG_SEQTRACE_LABELS) ->
     "BIG_SEQTRACE_LABELS";
+dflag2str(?DFLAG_EXIT_PAYLOAD) ->
+    "EXIT_PAYLOAD";
+dflag2str(?DFLAG_FRAGMENTS) ->
+    "FRAGMENTS";
 dflag2str(_) ->
     "UNKNOWN".
 
diff --git a/lib/kernel/src/erl_distribution.erl b/lib/kernel/src/erl_distribution.erl
index 0bec78e938..cdb2d2f1f6 100644
--- a/lib/kernel/src/erl_distribution.erl
+++ b/lib/kernel/src/erl_distribution.erl
@@ -21,6 +21,8 @@
 
 -behaviour(supervisor).
 
+-include_lib("kernel/include/logger.hrl").
+
 -export([start_link/0,start_link/2,init/1,start/1,stop/0]).
 
 -define(DBG,erlang:display([?MODULE,?LINE])).
@@ -83,6 +85,10 @@ do_start_link([{Arg,Flag}|T]) ->
     case init:get_argument(Arg) of
 	{ok,[[Name]]} ->
 	    start_link([list_to_atom(Name),Flag|ticktime()], true);
+        {ok,[[Name]|_Rest]} ->
+            ?LOG_WARNING("Multiple -~p given to erl, using the first, ~p",
+                         [Arg, Name]),
+	    start_link([list_to_atom(Name),Flag|ticktime()], true);
 	_ ->
 	    do_start_link(T)
     end;
diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl
index b7e8868911..7a14e2635c 100644
--- a/lib/kernel/src/erl_epmd.erl
+++ b/lib/kernel/src/erl_epmd.erl
@@ -77,8 +77,8 @@ stop() ->
 %%
 
 -spec port_please(Name, Host) -> {ok, Port, Version} | noport when
-	  Name :: string(),
-	  Host :: inet:ip_address(),
+	  Name :: atom() | string(),
+	  Host :: atom() | string() | inet:ip_address(),
 	  Port :: non_neg_integer(),
 	  Version :: non_neg_integer().
 
@@ -86,8 +86,8 @@ port_please(Node, Host) ->
   port_please(Node, Host, infinity).
 
 -spec port_please(Name, Host, Timeout) -> {ok, Port, Version} | noport when
-	  Name :: string(),
-	  Host :: inet:ip_address(),
+	  Name :: atom() | string(),
+	  Host :: atom() | string() | inet:ip_address(),
 	  Timeout :: non_neg_integer() | infinity,
 	  Port :: non_neg_integer(),
 	  Version :: non_neg_integer().
diff --git a/lib/kernel/src/erts_debug.erl b/lib/kernel/src/erts_debug.erl
index 1270de4144..e6a30d0b92 100644
--- a/lib/kernel/src/erts_debug.erl
+++ b/lib/kernel/src/erts_debug.erl
@@ -33,10 +33,12 @@
 
 -export([breakpoint/2, disassemble/1, display/1, dist_ext_to_term/2,
          flat_size/1, get_internal_state/1, instructions/0,
+         interpreter_size/0,
          map_info/1, same/2, set_internal_state/2,
          size_shared/1, copy_shared/1, dirty_cpu/2, dirty_io/2, dirty/3,
          lcnt_control/1, lcnt_control/2, lcnt_collect/0, lcnt_clear/0,
-         lc_graph/0, lc_graph_to_dot/2, lc_graph_merge/2]).
+         lc_graph/0, lc_graph_to_dot/2, lc_graph_merge/2,
+         alloc_blocks_size/1]).
 
 -spec breakpoint(MFA, Flag) -> non_neg_integer() when
       MFA :: {Module :: module(),
@@ -117,6 +119,11 @@ get_internal_state(_) ->
 instructions() ->
     erlang:nif_error(undef).
 
+-spec interpreter_size() -> pos_integer().
+
+interpreter_size() ->
+    erlang:nif_error(undef).
+
 -spec ic(F) -> Result when
       F :: function(),
       Result :: term().
@@ -495,3 +502,58 @@ lcg_print_locks(Out, [LastLock]) ->
 lcg_print_locks(Out, [Lock | Rest]) ->
     io:format(Out, "~w,\n", [Lock]),
     lcg_print_locks(Out, Rest).
+
+
+%% Returns the amount of memory allocated by the given allocator type.
+-spec alloc_blocks_size(Type) -> non_neg_integer() | undefined when
+      Type :: atom().
+
+alloc_blocks_size(Type) ->
+    Allocs = erlang:system_info(alloc_util_allocators),
+    Sizes = erlang:system_info({allocator_sizes, Allocs}),
+    alloc_blocks_size_1(Sizes, Type, 0).
+
+alloc_blocks_size_1([], _Type, 0) ->
+    undefined;
+alloc_blocks_size_1([{_Type, false} | Rest], Type, Acc) ->
+    alloc_blocks_size_1(Rest, Type, Acc);
+alloc_blocks_size_1([{Type, Instances} | Rest], Type, Acc0) ->
+    F = fun ({instance, _, L}, Acc) ->
+                MBCSPool = case lists:keyfind(mbcs_pool, 1, L) of
+                               {_, Pool} -> Pool;
+                               false -> []
+                           end,
+                {_,MBCS} = lists:keyfind(mbcs, 1, L),
+                {_,SBCS} = lists:keyfind(sbcs, 1, L),
+                Acc +
+                    sum_block_sizes(MBCSPool) +
+                    sum_block_sizes(MBCS) +
+                    sum_block_sizes(SBCS)
+        end,
+    alloc_blocks_size_1(Rest, Type, lists:foldl(F, Acc0, Instances));
+alloc_blocks_size_1([{_Type, Instances} | Rest], Type, Acc0) ->
+    F = fun ({instance, _, L}, Acc) ->
+                Acc + sum_foreign_sizes(Type, L)
+        end,
+    alloc_blocks_size_1(Rest, Type, lists:foldl(F, Acc0, Instances));
+alloc_blocks_size_1([], _Type, Acc) ->
+    Acc.
+
+sum_foreign_sizes(Type, L) ->
+    case lists:keyfind(mbcs_pool, 1, L) of
+        {_,Pool} ->
+            {_,ForeignBlocks} = lists:keyfind(foreign_blocks, 1, Pool),
+            case lists:keyfind(Type, 1, ForeignBlocks) of
+                {_,TypeSizes} -> sum_block_sizes(TypeSizes);
+                false -> 0
+            end;
+        _ ->
+            0
+    end.
+
+sum_block_sizes(Blocks) ->
+    lists:foldl(
+      fun({blocks_size, Sz,_,_}, Sz0) -> Sz0+Sz;
+         ({blocks_size, Sz}, Sz0) -> Sz0+Sz;
+         (_, Sz) -> Sz
+      end, 0, Blocks).
diff --git a/lib/kernel/src/gen_sctp.erl b/lib/kernel/src/gen_sctp.erl
index d893d44079..a63df54ff9 100644
--- a/lib/kernel/src/gen_sctp.erl
+++ b/lib/kernel/src/gen_sctp.erl
@@ -217,24 +217,29 @@ peeloff(S, AssocId) when is_port(S), is_integer(AssocId) ->
 	Error -> Error
     end.
 
--spec connect(Socket, Addr, Port, Opts) -> {ok, Assoc} | {error, inet:posix()} when
+-spec connect(Socket, Addr, Port, Opts) ->
+                     {ok, #sctp_assoc_change{state :: 'comm_up'}} |
+                     {error, #sctp_assoc_change{state :: 'cant_assoc'}} |
+                     {error, inet:posix()}
+                         when
       Socket :: sctp_socket(),
       Addr :: inet:ip_address() | inet:hostname(),
       Port :: inet:port_number(),
-      Opts :: [Opt :: option()],
-      Assoc :: #sctp_assoc_change{}.
+      Opts :: [Opt :: option()].
 
 connect(S, Addr, Port, Opts) ->
     connect(S, Addr, Port, Opts, infinity).
 
 -spec connect(Socket, Addr, Port, Opts, Timeout) ->
-                     {ok, Assoc} | {error, inet:posix()} when
+                     {ok, #sctp_assoc_change{state :: 'comm_up'}} |
+                     {error, #sctp_assoc_change{state :: 'cant_assoc'}} |
+                     {error, inet:posix()}
+                         when
       Socket :: sctp_socket(),
       Addr :: inet:ip_address() | inet:hostname(),
       Port :: inet:port_number(),
       Opts :: [Opt :: option()],
-      Timeout :: timeout(),
-      Assoc :: #sctp_assoc_change{}.
+      Timeout :: timeout().
 
 connect(S, Addr, Port, Opts, Timeout) ->
     case do_connect(S, Addr, Port, Opts, Timeout, true) of
diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl
index 7f7833ec23..5d4764f8ff 100644
--- a/lib/kernel/src/gen_tcp.erl
+++ b/lib/kernel/src/gen_tcp.erl
@@ -156,7 +156,7 @@ connect(Address, Port, Opts) ->
       Options :: [connect_option()],
       Timeout :: timeout(),
       Socket :: socket(),
-      Reason :: inet:posix().
+      Reason :: timeout | inet:posix().
 
 connect(Address, Port, Opts, Time) ->
     Timer = inet:start_timer(Time),
@@ -220,7 +220,7 @@ listen(Port, Opts0) ->
 -spec accept(ListenSocket) -> {ok, Socket} | {error, Reason} when
       ListenSocket :: socket(),
       Socket :: socket(),
-      Reason :: closed | timeout | system_limit | inet:posix().
+      Reason :: closed | system_limit | inet:posix().
 
 accept(S) ->
     case inet_db:lookup_socket(S) of
@@ -312,7 +312,7 @@ recv(S, Length) when is_port(S) ->
       Length :: non_neg_integer(),
       Timeout :: timeout(),
       Packet :: string() | binary() | HttpPacket,
-      Reason :: closed | inet:posix(),
+      Reason :: closed | timeout | inet:posix(),
       HttpPacket :: term().
 
 recv(S, Length, Time) when is_port(S) ->
diff --git a/lib/kernel/src/gen_udp.erl b/lib/kernel/src/gen_udp.erl
index d6e8652e77..3001948209 100644
--- a/lib/kernel/src/gen_udp.erl
+++ b/lib/kernel/src/gen_udp.erl
@@ -20,7 +20,7 @@
 -module(gen_udp).
 
 -export([open/1, open/2, close/1]).
--export([send/2, send/4, recv/2, recv/3, connect/3]).
+-export([send/2, send/3, send/4, send/5, recv/2, recv/3, connect/3]).
 -export([controlling_process/2]).
 -export([fdopen/2]).
 
@@ -95,7 +95,7 @@
 -spec open(Port) -> {ok, Socket} | {error, Reason} when
       Port :: inet:port_number(),
       Socket :: socket(),
-      Reason :: inet:posix().
+      Reason :: system_limit | inet:posix().
 
 open(Port) -> 
     open(Port, []).
@@ -112,7 +112,7 @@ open(Port) ->
               | {bind_to_device, binary()}
               | option(),
       Socket :: socket(),
-      Reason :: inet:posix().
+      Reason :: system_limit | inet:posix().
 
 open(Port, Opts0) ->
     {Mod, Opts} = inet:udp_module(Opts0),
@@ -125,20 +125,80 @@ open(Port, Opts0) ->
 close(S) ->
     inet:udp_close(S).
 
--spec send(Socket, Address, Port, Packet) -> ok | {error, Reason} when
+-spec send(Socket, Destination, Packet) -> ok | {error, Reason} when
       Socket :: socket(),
-      Address :: inet:socket_address() | inet:hostname(),
-      Port :: inet:port_number(),
+      Destination :: {inet:ip_address(), inet:port_number()} |
+                     inet:family_address(),
       Packet :: iodata(),
       Reason :: not_owner | inet:posix().
+%%%
+send(Socket, Destination, Packet) ->
+    send(Socket, Destination, [], Packet).
 
-send(S, Address, Port, Packet) when is_port(S) ->
+-spec send(Socket, Host, Port, Packet) -> ok | {error, Reason} when
+      Socket :: socket(),
+      Host :: inet:hostname() | inet:ip_address(),
+      Port :: inet:port_number() | atom(),
+      Packet :: iodata(),
+      Reason :: not_owner | inet:posix();
+%%%
+          (Socket, Destination, AncData, Packet) -> ok | {error, Reason} when
+      Socket :: socket(),
+      Destination :: {inet:ip_address(), inet:port_number()} |
+                     inet:family_address(),
+      AncData :: inet:ancillary_data(),
+      Packet :: iodata(),
+      Reason :: not_owner | inet:posix();
+%%%
+          (Socket, Destination, PortZero, Packet) -> ok | {error, Reason} when
+      Socket :: socket(),
+      Destination :: {inet:ip_address(), inet:port_number()} |
+                     inet:family_address(),
+      PortZero :: inet:port_number(),
+      Packet :: iodata(),
+      Reason :: not_owner | inet:posix().
+%%%
+send(S, {_,_} = Destination, PortZero = AncData, Packet) when is_port(S) ->
+    %% Destination is {Family,Addr} | {IP,Port},
+    %% so it is complete - argument PortZero is redundant
+    if
+        PortZero =:= 0 ->
+            case inet_db:lookup_socket(S) of
+                {ok, Mod} ->
+                    Mod:send(S, Destination, [], Packet);
+                Error ->
+                    Error
+            end;
+        is_integer(PortZero) ->
+            %% Redundant PortZero; must be 0
+            {error, einval};
+        is_list(AncData) ->
+            case inet_db:lookup_socket(S) of
+                {ok, Mod} ->
+                    Mod:send(S, Destination, AncData, Packet);
+                Error ->
+                    Error
+            end
+    end;
+send(S, Host, Port, Packet) when is_port(S) ->
+    send(S, Host, Port, [], Packet).
+
+-spec send(Socket, Host, Port, AncData, Packet) -> ok | {error, Reason} when
+      Socket :: socket(),
+      Host :: inet:hostname() | inet:ip_address() | inet:local_address(),
+      Port :: inet:port_number() | atom(),
+      AncData :: inet:ancillary_data(),
+      Packet :: iodata(),
+      Reason :: not_owner | inet:posix().
+%%%
+send(S, Host, Port, AncData, Packet)
+  when is_port(S), is_list(AncData) ->
     case inet_db:lookup_socket(S) of
 	{ok, Mod} ->
-	    case Mod:getaddr(Address) of
+	    case Mod:getaddr(Host) of
 		{ok,IP} ->
 		    case Mod:getserv(Port) of
-			{ok,UP} -> Mod:send(S, IP, UP, Packet);
+			{ok,P} -> Mod:send(S, {IP,P}, AncData, Packet);
 			{error,einval} -> exit(badarg);
 			Error -> Error
 		    end;
@@ -149,6 +209,7 @@ send(S, Address, Port, Packet) when is_port(S) ->
 	    Error
     end.
 
+%% Connected send
 send(S, Packet) when is_port(S) ->
     case inet_db:lookup_socket(S) of
 	{ok, Mod} ->
@@ -186,7 +247,7 @@ recv(S,Len) when is_port(S), is_integer(Len) ->
       Port :: inet:port_number(),
       AncData :: inet:ancillary_data(),
       Packet :: string() | binary(),
-      Reason :: not_owner | inet:posix().
+      Reason :: not_owner | timeout | inet:posix().
 
 recv(S,Len,Time) when is_port(S) ->
     case inet_db:lookup_socket(S) of
diff --git a/lib/kernel/src/global.erl b/lib/kernel/src/global.erl
index a38522eb5c..3875074d74 100644
--- a/lib/kernel/src/global.erl
+++ b/lib/kernel/src/global.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. 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.
@@ -50,10 +50,9 @@
 %% This is for backward compatibility only; the functionality is broken.
 -define(WARN_DUPLICATED_NAME, global_multi_name_action).
 
-%% Undocumented Kernel variable. Set this to 0 (zero) to get the old
-%% behaviour.
+%% Undocumented Kernel variable.
 -define(N_CONNECT_RETRIES, global_connect_retries).
--define(DEFAULT_N_CONNECT_RETRIES, 5).
+-define(DEFAULT_N_CONNECT_RETRIES, 0).
 
 %%% In certain places in the server, calling io:format hangs everything,
 %%% so we'd better use erlang:display/1.
@@ -125,16 +124,12 @@
 %%% There are also ETS tables used for bookkeeping of locks and names
 %%% (the first position is the key):
 %%%
-%%% global_locks (set): {ResourceId, LockRequesterId, [{Pid,RPid,ref()]}
+%%% global_locks (set): {ResourceId, LockRequesterId, [{Pid,ref()]}
 %%%   Pid is locking ResourceId, ref() is the monitor ref.
-%%%   RPid =/= Pid if there is an extra process calling erlang:monitor().
-%%% global_names (set):  {Name, Pid, Method, RPid, ref()}
+%%% global_names (set):  {Name, Pid, Method, ref()}
 %%%   Registered names. ref() is the monitor ref.
-%%%   RPid =/= Pid if there is an extra process calling erlang:monitor().
 %%% global_names_ext (set): {Name, Pid, RegNode}
 %%%   External registered names (C-nodes).
-%%%   (The RPid:s can be removed when/if erlang:monitor() returns before 
-%%%    trying to connect to the other node.)
 %%% 
 %%% Helper tables:
 %%% global_pid_names (bag): {Pid, Name} | {ref(), Name}
@@ -310,7 +305,7 @@ re_register_name(Name, Pid, Method0) when is_pid(Pid) ->
 -spec registered_names() -> [Name] when
       Name :: term().
 registered_names() ->
-    MS = ets:fun2ms(fun({Name,_Pid,_M,_RP,_R}) -> Name end),
+    MS = ets:fun2ms(fun({Name,_Pid,_M,_R}) -> Name end),
     ets:select(global_names, MS).
 
 %%-----------------------------------------------------------------
@@ -1235,7 +1230,7 @@ ins_name_ext(Name, Pid, Method, RegNode, FromPidOrNode, ExtraInfo, S0) ->
 
 where(Name) ->
     case ets:lookup(global_names, Name) of
-	[{_Name, Pid, _Method, _RPid, _Ref}] ->
+	[{_Name, Pid, _Method, _Ref}] ->
 	    if node(Pid) == node() ->
 		    case is_process_alive(Pid) of
 			true  -> Pid;
@@ -1272,10 +1267,10 @@ can_set_lock({ResourceId, LockRequesterId}) ->
     end.
 
 insert_lock({ResourceId, LockRequesterId}=Id, Pid, PidRefs, S) ->
-    {RPid, Ref} = do_monitor(Pid),
+    Ref = erlang:monitor(process, Pid),
     true = ets:insert(global_pid_ids, {Pid, ResourceId}),
     true = ets:insert(global_pid_ids, {Ref, ResourceId}),
-    Lock = {ResourceId, LockRequesterId, [{Pid,RPid,Ref} | PidRefs]},
+    Lock = {ResourceId, LockRequesterId, [{Pid,Ref} | PidRefs]},
     true = ets:insert(global_locks, Lock),
     trace_message(S, {ins_lock, node(Pid)}, [Id, Pid]).
 
@@ -1293,10 +1288,9 @@ handle_del_lock({ResourceId, LockReqId}, Pid, S0) ->
 	_ -> S0
     end.
 
-remove_lock(ResourceId, LockRequesterId, Pid, [{Pid,RPid,Ref}], Down, S0) ->
+remove_lock(ResourceId, LockRequesterId, Pid, [{Pid,Ref}], Down, S0) ->
     ?trace({remove_lock_1, {id,ResourceId},{pid,Pid}}),
     true = erlang:demonitor(Ref, [flush]),
-    kill_monitor_proc(RPid, Pid),
     true = ets:delete(global_locks, ResourceId),
     true = ets:delete_object(global_pid_ids, {Pid, ResourceId}),
     true = ets:delete_object(global_pid_ids, {Ref, ResourceId}),
@@ -1309,9 +1303,8 @@ remove_lock(ResourceId, LockRequesterId, Pid, [{Pid,RPid,Ref}], Down, S0) ->
 remove_lock(ResourceId, LockRequesterId, Pid, PidRefs0, _Down, S) ->
     ?trace({remove_lock_2, {id,ResourceId},{pid,Pid}}),
     PidRefs = case lists:keyfind(Pid, 1, PidRefs0) of
-                  {Pid, RPid, Ref} ->
+                  {Pid, Ref} ->
                       true = erlang:demonitor(Ref, [flush]),
-                      kill_monitor_proc(RPid, Pid),
                       true = ets:delete_object(global_pid_ids, 
                                                {Ref, ResourceId}),
                       lists:keydelete(Pid, 1, PidRefs0);
@@ -1324,11 +1317,6 @@ remove_lock(ResourceId, LockRequesterId, Pid, PidRefs0, _Down, S) ->
     trace_message(S, {rem_lock, node(Pid)}, 
                   [{ResourceId, LockRequesterId}, Pid]).
 
-kill_monitor_proc(Pid, Pid) ->
-    ok;
-kill_monitor_proc(RPid, _Pid) ->
-    exit(RPid, kill).
-
 do_ops(Ops, ConnNode, Names_ext, ExtraInfo, S0) ->
     ?trace({do_ops, {ops,Ops}}),
 
@@ -1394,8 +1382,8 @@ sync_other(Node, N) ->
     % exit(normal).
 
 insert_global_name(Name, Pid, Method, FromPidOrNode, ExtraInfo, S) ->
-    {RPid, Ref} = do_monitor(Pid),
-    true = ets:insert(global_names, {Name, Pid, Method, RPid, Ref}),
+    Ref = erlang:monitor(process, Pid),
+    true = ets:insert(global_names, {Name, Pid, Method, Ref}),
     true = ets:insert(global_pid_names, {Pid, Name}),
     true = ets:insert(global_pid_names, {Ref, Name}),
     case lock_still_set(FromPidOrNode, ExtraInfo, S) of
@@ -1437,7 +1425,7 @@ extra_info(Tag, ExtraInfo) ->
 del_name(Ref, S) ->
     NameL = [Name || 
                 {_, Name} <- ets:lookup(global_pid_names, Ref),
-                {_, _Pid, _Method, _RPid, Ref1} <- 
+                {_, _Pid, _Method, Ref1} <-
                     ets:lookup(global_names, Name),
                 Ref1 =:= Ref],
     case NameL of
@@ -1450,24 +1438,23 @@ del_name(Ref, S) ->
 %% Keeps the entry in global_names for whereis_name/1.
 delete_global_name_keep_pid(Name, S) ->
     case ets:lookup(global_names, Name) of
-        [{Name, Pid, _Method, RPid, Ref}] ->
-            delete_global_name2(Name, Pid, RPid, Ref, S);
+        [{Name, Pid, _Method, Ref}] ->
+            delete_global_name2(Name, Pid, Ref, S);
         [] ->
             S
     end.
 
 delete_global_name2(Name, S) ->
     case ets:lookup(global_names, Name) of
-        [{Name, Pid, _Method, RPid, Ref}] ->
+        [{Name, Pid, _Method, Ref}] ->
             true = ets:delete(global_names, Name),
-            delete_global_name2(Name, Pid, RPid, Ref, S);
+            delete_global_name2(Name, Pid, Ref, S);
         [] ->
             S
     end.
 
-delete_global_name2(Name, Pid, RPid, Ref, S) ->
+delete_global_name2(Name, Pid, Ref, S) ->
     true = erlang:demonitor(Ref, [flush]),
-    kill_monitor_proc(RPid, Pid),
     delete_global_name(Name, Pid),
     ?trace({delete_global_name,{item,Name},{pid,Pid}}),
     true = ets:delete_object(global_pid_names, {Pid, Name}),
@@ -1929,9 +1916,9 @@ reset_node_state(Node) ->
 %% from the same partition.
 exchange_names([{Name, Pid, Method} | Tail], Node, Ops, Res) ->
     case ets:lookup(global_names, Name) of
-	[{Name, Pid, _Method, _RPid2, _Ref2}] ->
+	[{Name, Pid, _Method, _Ref2}] ->
 	    exchange_names(Tail, Node, Ops, Res);
-	[{Name, Pid2, Method2, _RPid2, _Ref2}] when node() < Node ->
+	[{Name, Pid2, Method2, _Ref2}] when node() < Node ->
 	    %% Name clash!  Add the result of resolving to Res(olved).
 	    %% We know that node(Pid) =/= node(), so we don't
 	    %% need to link/unlink to Pid.
@@ -1960,7 +1947,7 @@ exchange_names([{Name, Pid, Method} | Tail], Node, Ops, Res) ->
 		    Op = {delete, Name},
 		    exchange_names(Tail, Node, [Op | Ops], [Op | Res])
 	    end;
-	[{Name, _Pid2, _Method, _RPid, _Ref}] ->
+	[{Name, _Pid2, _Method, _Ref}] ->
 	    %% The other node will solve the conflict.
 	    exchange_names(Tail, Node, Ops, Res);
 	_ ->
@@ -2036,7 +2023,7 @@ pid_is_locking(Pid, PidRefs) ->
 delete_lock(Ref, S0) ->
     Locks = pid_locks(Ref),
     F = fun({ResourceId, LockRequesterId, PidRefs}, S) -> 
-                {Pid, _RPid, Ref} = lists:keyfind(Ref, 3, PidRefs),
+                {Pid, Ref} = lists:keyfind(Ref, 2, PidRefs),
                 remove_lock(ResourceId, LockRequesterId, Pid, PidRefs, true, S)
         end,
     lists:foldl(F, S0, Locks).
@@ -2046,10 +2033,10 @@ pid_locks(Ref) ->
                               ets:lookup(global_locks, ResourceId)
                       end, ets:lookup(global_pid_ids, Ref)),
     [Lock || Lock = {_Id, _Req, PidRefs} <- L, 
-             rpid_is_locking(Ref, PidRefs)].
+             ref_is_locking(Ref, PidRefs)].
 
-rpid_is_locking(Ref, PidRefs) ->
-    lists:keyfind(Ref, 3, PidRefs) =/= false.
+ref_is_locking(Ref, PidRefs) ->
+    lists:keyfind(Ref, 2, PidRefs) =/= false.
 
 handle_nodedown(Node, S) ->
     %% DOWN signals from monitors have removed locks and registered names.
@@ -2062,7 +2049,7 @@ handle_nodedown(Node, S) ->
 
 get_names() ->
     ets:select(global_names, 
-               ets:fun2ms(fun({Name, Pid, Method, _RPid, _Ref}) -> 
+               ets:fun2ms(fun({Name, Pid, Method, _Ref}) ->
                                   {Name, Pid, Method} 
                           end)).
 
@@ -2205,24 +2192,6 @@ unexpected_message(Message, What) ->
 
 %%% Utilities
 
-%% When/if erlang:monitor() returns before trying to connect to the
-%% other node this function can be removed.
-do_monitor(Pid) ->
-    case (node(Pid) =:= node()) orelse lists:member(node(Pid), nodes()) of
-        true ->
-            %% Assume the node is still up
-            {Pid, erlang:monitor(process, Pid)};
-        false ->
-            F = fun() -> 
-                        Ref = erlang:monitor(process, Pid),
-                        receive 
-                            {'DOWN', Ref, process, Pid, _Info} ->
-                                exit(normal)
-                        end
-                end,
-            erlang:spawn_monitor(F)
-    end.
-
 intersection(_, []) -> 
     [];
 intersection(L1, L2) ->
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl
index 9f22eb6aaa..24aff83fbd 100644
--- a/lib/kernel/src/inet.erl
+++ b/lib/kernel/src/inet.erl
@@ -75,7 +75,8 @@
 
 -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,
+	      family_address/0, local_address/0,
+              socket_address/0, returned_non_ip_address/0,
 	      socket_setopt/0, socket_getopt/0, ancillary_data/0,
 	      posix/0, socket/0, stat_option/0]).
 %% imports
@@ -100,11 +101,16 @@
 			0..65535,0..65535,0..65535,0..65535}.
 -type ip_address() :: ip4_address() | ip6_address().
 -type port_number() :: 0..65535.
--type local_address() :: {local, File :: binary() | string()}.
+-type family_address() :: inet_address() | inet6_address() | local_address().
+-type inet_address() ::
+        {'inet', {ip4_address() | 'any' | 'loopback', port_number()}}.
+-type inet6_address() ::
+        {'inet6', {ip6_address() | 'any' | 'loopback', port_number()}}.
+-type local_address() :: {'local', File :: binary() | string()}.
 -type returned_non_ip_address() ::
-	{local, binary()} |
-	{unspec, <<>>} |
-	{undefined, any()}.
+	{'local', binary()} |
+	{'unspec', <<>>} |
+	{'undefined', any()}.
 -type posix() ::
         'eaddrinuse' | 'eaddrnotavail' | 'eafnosupport' | 'ealready' |
         'econnaborted' | 'econnrefused' | 'econnreset' |
@@ -1639,6 +1645,7 @@ fmt_addr({ok,Addr}, Proto) ->
 	{{0,0,0,0,0,0,0,0},Port} -> "*:" ++ fmt_port(Port, Proto);
 	{{127,0,0,1},Port} -> "localhost:" ++ fmt_port(Port, Proto);
 	{{0,0,0,0,0,0,0,1},Port} -> "localhost:" ++ fmt_port(Port, Proto);
+	{local, Path} -> "local:" ++ binary_to_list(Path);
 	{IP,Port} -> inet_parse:ntoa(IP) ++ ":" ++ fmt_port(Port, Proto)
     end.
 
diff --git a/lib/kernel/src/inet6_udp.erl b/lib/kernel/src/inet6_udp.erl
index 71db0357cd..cb95a69798 100644
--- a/lib/kernel/src/inet6_udp.erl
+++ b/lib/kernel/src/inet6_udp.erl
@@ -65,16 +65,25 @@ open(Port, Opts) ->
 	{ok, _} -> exit(badarg)
     end.
 
-send(S, Addr = {A,B,C,D,E,F,G,H}, P, Data)
-  when ?ip6(A,B,C,D,E,F,G,H), ?port(P) ->
-    prim_inet:sendto(S, Addr, P, Data).
+send(S, {A,B,C,D,E,F,G,H} = IP, Port, Data)
+  when ?ip6(A,B,C,D,E,F,G,H), ?port(Port) ->
+    prim_inet:sendto(S, {IP, Port}, [], Data);
+send(S, {{A,B,C,D,E,F,G,H}, Port} = Addr, AncData, Data)
+  when ?ip6(A,B,C,D,E,F,G,H), ?port(Port), is_list(AncData) ->
+    prim_inet:sendto(S, Addr, AncData, Data);
+send(S, {?FAMILY, {{A,B,C,D,E,F,G,H}, Port}} = Address, AncData, Data)
+  when ?ip6(A,B,C,D,E,F,G,H), ?port(Port), is_list(AncData) ->
+    prim_inet:sendto(S, Address, AncData, Data);
+send(S, {?FAMILY, {loopback, Port}} = Address, AncData, Data)
+  when ?port(Port), is_list(AncData) ->
+    prim_inet:sendto(S, Address, AncData, Data).
 
 send(S, Data) ->
-    prim_inet:sendto(S, {0,0,0,0,0,0,0,0}, 0, Data).
+    prim_inet:sendto(S, {any, 0}, [], Data).
     
-connect(S, Addr = {A,B,C,D,E,F,G,H}, P) 
-  when ?ip6(A,B,C,D,E,F,G,H), ?port(P) ->
-    prim_inet:connect(S, Addr, P).
+connect(S, Addr = {A,B,C,D,E,F,G,H}, Port) 
+  when ?ip6(A,B,C,D,E,F,G,H), ?port(Port) ->
+    prim_inet:connect(S, Addr, Port).
 
 recv(S, Len) ->
     prim_inet:recvfrom(S, Len).
diff --git a/lib/kernel/src/inet_config.erl b/lib/kernel/src/inet_config.erl
index 9f76360b8b..e771461b65 100644
--- a/lib/kernel/src/inet_config.erl
+++ b/lib/kernel/src/inet_config.erl
@@ -98,7 +98,7 @@ init() ->
 			      {win32,WinType} ->
 				  win32_load_from_registry(WinType);
 			      _ ->
-				  error("can not read win32 system registry~n", [])
+				  error("cannot read win32 system registry~n", [])
 			  end
 		  end, CfgFiles),
 
diff --git a/lib/kernel/src/inet_db.erl b/lib/kernel/src/inet_db.erl
index 6cbb6ac2da..630ef5d2f7 100644
--- a/lib/kernel/src/inet_db.erl
+++ b/lib/kernel/src/inet_db.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2019. 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.
@@ -1223,7 +1223,11 @@ handle_set_file(Option, Fname, TagTm, TagInfo, ParseFun, From,
 			    {ok, B, _} -> B;
 			    _ -> <<>>
 			end;
-		    _ -> <<>>
+		    _ ->
+                        ets:insert(Db, {TagInfo, undefined}),
+                        TimeZero = - (?RES_FILE_UPDATE_TM + 1), % Early enough
+                        ets:insert(Db, {TagTm, TimeZero}),
+                        <<>>
 		end,
 	    handle_set_file(ParseFun, Bin, From, State);
 	false -> {reply,error,State}
diff --git a/lib/kernel/src/inet_dns.erl b/lib/kernel/src/inet_dns.erl
index f1f58bc872..6c98d2aab7 100644
--- a/lib/kernel/src/inet_dns.erl
+++ b/lib/kernel/src/inet_dns.erl
@@ -699,7 +699,7 @@ encode_labels(Bin, Comp0, Pos, [L|Ls]=Labels)
 	none ->
 	    Comp = if Pos < (3 bsl 14) ->
 			   %% Just in case - compression
-			   %% pointers can not reach further
+			   %% pointers cannot reach further
 			   gb_trees:insert(Labels, Pos, Comp0);
 		      true -> Comp0
 		   end,
diff --git a/lib/kernel/src/inet_tcp_dist.erl b/lib/kernel/src/inet_tcp_dist.erl
index c37212b0f9..c5a114a9ef 100644
--- a/lib/kernel/src/inet_tcp_dist.erl
+++ b/lib/kernel/src/inet_tcp_dist.erl
@@ -212,6 +212,7 @@ do_accept(Driver, Kernel, AcceptPid, Socket, MyNode, Allowed, SetupTime) ->
 					   [{active, true},
 					    {deliver, port},
 					    {packet, 4},
+                                            binary,
 					    nodelay()])
 		      end,
 		      f_getll = fun(S) ->
diff --git a/lib/kernel/src/inet_udp.erl b/lib/kernel/src/inet_udp.erl
index 1e624b9e90..083059a2dc 100644
--- a/lib/kernel/src/inet_udp.erl
+++ b/lib/kernel/src/inet_udp.erl
@@ -66,16 +66,25 @@ open(Port, Opts) ->
 	{ok, _} -> exit(badarg)
     end.
 
-send(S, {A,B,C,D} = Addr, P, Data)
-  when ?ip(A,B,C,D), ?port(P) ->
-    prim_inet:sendto(S, Addr, P, Data).
+send(S, {A,B,C,D} = IP, Port, Data)
+  when ?ip(A,B,C,D), ?port(Port) ->
+    prim_inet:sendto(S, {IP, Port}, [], Data);
+send(S, {{A,B,C,D}, Port} = Addr, AncData, Data)
+  when ?ip(A,B,C,D), ?port(Port), is_list(AncData) ->
+    prim_inet:sendto(S, Addr, AncData, Data);
+send(S, {?FAMILY, {{A,B,C,D}, Port}} = Address, AncData, Data)
+  when ?ip(A,B,C,D), ?port(Port), is_list(AncData) ->
+    prim_inet:sendto(S, Address, AncData, Data);
+send(S, {?FAMILY, {loopback, Port}} = Address, AncData, Data)
+  when ?port(Port), is_list(AncData) ->
+    prim_inet:sendto(S, Address, AncData, Data).
 
 send(S, Data) ->
-    prim_inet:sendto(S, {0,0,0,0}, 0, Data).
+    prim_inet:sendto(S, {any, 0}, [], Data).
     
-connect(S, Addr = {A,B,C,D}, P)
-  when ?ip(A,B,C,D), ?port(P) ->
-    prim_inet:connect(S, Addr, P).
+connect(S, Addr = {A,B,C,D}, Port)
+  when ?ip(A,B,C,D), ?port(Port) ->
+    prim_inet:connect(S, Addr, Port).
 
 recv(S, Len) ->
     prim_inet:recvfrom(S, Len).
diff --git a/lib/kernel/src/kernel.app.src b/lib/kernel/src/kernel.app.src
index fe073621c8..c2ff6b63e9 100644
--- a/lib/kernel/src/kernel.app.src
+++ b/lib/kernel/src/kernel.app.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. 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.
@@ -68,6 +68,8 @@
              logger_formatter,
              logger_h_common,
              logger_handler_watcher,
+             logger_olp,
+             logger_proxy,
              logger_server,
              logger_simple_h,
              logger_std_h,
@@ -146,6 +148,6 @@
          {logger_sasl_compatible, false}
         ]},
   {mod, {kernel, []}},
-  {runtime_dependencies, ["erts-10.1", "stdlib-3.5", "sasl-3.0"]}
+  {runtime_dependencies, ["erts-10.2.5", "stdlib-3.5", "sasl-3.0"]}
  ]
 }.
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index ccf0a82ced..95853a7a8f 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -19,39 +19,39 @@
 %%
 %% We allow upgrade from, and downgrade to all previous
 %% versions from the following OTP releases:
-%% - OTP 20
 %% - OTP 21
+%% - OTP 22
 %%
 %% We also allow upgrade from, and downgrade to all
 %% versions that have branched off from the above
 %% stated previous versions.
 %%
 {"%VSN%",
- [{<<"^5\\.3$">>,[restart_new_emulator]},
-  {<<"^5\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^5\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^5\\.4$">>,[restart_new_emulator]},
-  {<<"^5\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^5\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^5\\.4\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^5\\.4\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^6\\.0$">>,[restart_new_emulator]},
+ [{<<"^6\\.0$">>,[restart_new_emulator]},
   {<<"^6\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^6\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^6\\.1$">>,[restart_new_emulator]},
   {<<"^6\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^6\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
- [{<<"^5\\.3$">>,[restart_new_emulator]},
-  {<<"^5\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^5\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^5\\.4$">>,[restart_new_emulator]},
-  {<<"^5\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^5\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^5\\.4\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^5\\.4\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^6\\.0$">>,[restart_new_emulator]},
+  {<<"^6\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^6\\.2$">>,[restart_new_emulator]},
+  {<<"^6\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^6\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^6\\.3$">>,[restart_new_emulator]},
+  {<<"^6\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^6\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^6\\.4$">>,[restart_new_emulator]},
+  {<<"^6\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
+ [{<<"^6\\.0$">>,[restart_new_emulator]},
   {<<"^6\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^6\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^6\\.1$">>,[restart_new_emulator]},
   {<<"^6\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^6\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
+  {<<"^6\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^6\\.2$">>,[restart_new_emulator]},
+  {<<"^6\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^6\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^6\\.3$">>,[restart_new_emulator]},
+  {<<"^6\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^6\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^6\\.4$">>,[restart_new_emulator]},
+  {<<"^6\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
diff --git a/lib/kernel/src/kernel.erl b/lib/kernel/src/kernel.erl
index c68d04e279..c8c631ab23 100644
--- a/lib/kernel/src/kernel.erl
+++ b/lib/kernel/src/kernel.erl
@@ -68,7 +68,7 @@ config_change(Changed, New, Removed) ->
 %%%          	      auth, ...)     ...)
 %%%
 %%% The rectangular boxes are supervisors.  All supervisors except
-%%% for kernel_safe_sup terminates the enitre erlang node if any of
+%%% for kernel_safe_sup terminates the entire erlang node if any of
 %%% their children dies.  Any child that can't be restarted in case
 %%% of failure must be placed under one of these supervisors.  Any
 %%% other child must be placed under safe_sup.  These children may
@@ -116,7 +116,7 @@ init([]) ->
                  restart => temporary,
                  shutdown => 2000,
                  type => supervisor,
-                 modules => [user_sup]},
+                 modules => [standard_error]},
 
     User = #{id => user,
              start => {user_sup, start, []},
@@ -141,30 +141,15 @@ init([]) ->
                   modules => [logger_sup]},
 
     case init:get_argument(mode) of
-        {ok, [["minimal"]]} ->
+        {ok, [["minimal"]|_]} ->
             {ok, {SupFlags,
                   [Code, File, StdError, User, LoggerSup, Config, RefC, SafeSup]}};
         _ ->
-            Rpc = #{id => rex,
-                    start => {rpc, start_link, []},
-                    restart => permanent,
-                    shutdown => 2000,
-                    type => worker,
-                    modules => [rpc]},
-
-            Global = #{id => global_name_server,
-                       start => {global, start_link, []},
-                       restart => permanent,
-                       shutdown => 2000,
-                       type => worker,
-                       modules => [global]},
-
-            GlGroup = #{id => global_group,
-                        start => {global_group,start_link,[]},
-                        restart => permanent,
-                        shutdown => 2000,
-                        type => worker,
-                        modules => [global_group]},
+            DistChildren =
+		case application:get_env(kernel, start_distribution) of
+		    {ok, false} -> [];
+		    _ -> start_distribution()
+		end,
 
             InetDb = #{id => inet_db,
                        start => {inet_db, start_link, []},
@@ -173,13 +158,6 @@ init([]) ->
                        type => worker,
                        modules => [inet_db]},
 
-            NetSup = #{id => net_sup,
-                       start => {erl_distribution, start_link, []},
-                       restart => permanent,
-                       shutdown => infinity,
-                       type => supervisor,
-                       modules => [erl_distribution]},
-
             SigSrv = #{id => erl_signal_server,
                        start => {gen_event, start_link, [{local, erl_signal_server}]},
                        restart => permanent,
@@ -187,14 +165,11 @@ init([]) ->
                        type => worker,
                        modules => dynamic},
 
-            DistAC = start_dist_ac(),
-
             Timer = start_timer(),
 
             {ok, {SupFlags,
-                  [Code, Rpc, Global, InetDb | DistAC] ++
-                  [NetSup, GlGroup, File, SigSrv,
-                   StdError, User, Config, RefC, SafeSup, LoggerSup] ++ Timer}}
+                  [Code, InetDb | DistChildren] ++
+                  [File, SigSrv, StdError, User, Config, RefC, SafeSup, LoggerSup] ++ Timer}}
     end;
 init(safe) ->
     SupFlags = #{strategy => one_for_one,
@@ -213,6 +188,39 @@ init(safe) ->
 
     {ok, {SupFlags, Boot ++ DiskLog ++ Pg2}}.
 
+start_distribution() ->
+    Rpc = #{id => rex,
+            start => {rpc, start_link, []},
+            restart => permanent,
+            shutdown => 2000,
+            type => worker,
+            modules => [rpc]},
+
+    Global = #{id => global_name_server,
+               start => {global, start_link, []},
+               restart => permanent,
+               shutdown => 2000,
+               type => worker,
+               modules => [global]},
+
+    DistAC = start_dist_ac(),
+
+    NetSup = #{id => net_sup,
+               start => {erl_distribution, start_link, []},
+               restart => permanent,
+               shutdown => infinity,
+               type => supervisor,
+               modules => [erl_distribution]},
+
+    GlGroup = #{id => global_group,
+                start => {global_group,start_link,[]},
+                restart => permanent,
+                shutdown => 2000,
+                type => worker,
+                modules => [global_group]},
+
+    [Rpc, Global | DistAC] ++ [NetSup, GlGroup].
+
 start_dist_ac() ->
     Spec = [#{id => dist_ac,
               start => {dist_ac,start_link,[]},
diff --git a/lib/kernel/src/local_udp.erl b/lib/kernel/src/local_udp.erl
index 481a8c4910..933e56228b 100644
--- a/lib/kernel/src/local_udp.erl
+++ b/lib/kernel/src/local_udp.erl
@@ -70,11 +70,13 @@ open(0, Opts) ->
 	{ok, _} -> exit(badarg)
     end.
 
-send(S, Addr = {?FAMILY,_}, 0, Data) ->
-    prim_inet:sendto(S, Addr, 0, Data).
+send(S, {?FAMILY,_} = Addr, 0, Data) ->
+    prim_inet:sendto(S, Addr, [], Data);
+send(S, {?FAMILY,_} = Addr, AncData, Data) when is_list(AncData) ->
+    prim_inet:sendto(S, Addr, AncData, Data).
 %%
 send(S, Data) ->
-    prim_inet:sendto(S, {?FAMILY,<<>>}, 0, Data).
+    prim_inet:sendto(S, {?FAMILY,<<>>}, [], Data).
 
 connect(S, Addr = {?FAMILY,_}, 0) ->
     prim_inet:connect(S, Addr, 0).
diff --git a/lib/kernel/src/logger.erl b/lib/kernel/src/logger.erl
index 6762998d4f..38bd2f481c 100644
--- a/lib/kernel/src/logger.erl
+++ b/lib/kernel/src/logger.erl
@@ -43,11 +43,14 @@
          get_module_level/0, get_module_level/1,
          set_primary_config/1, set_primary_config/2,
          set_handler_config/2, set_handler_config/3,
+         set_proxy_config/1,
          update_primary_config/1,
          update_handler_config/2, update_handler_config/3,
+         update_proxy_config/1,
          update_formatter_config/2, update_formatter_config/3,
          get_primary_config/0, get_handler_config/1,
          get_handler_config/0, get_handler_ids/0, get_config/0,
+         get_proxy_config/0,
          add_handlers/1]).
 
 %% Private configuration
@@ -57,6 +60,8 @@
 -export([compare_levels/2]).
 -export([set_process_metadata/1, update_process_metadata/1,
          unset_process_metadata/0, get_process_metadata/0]).
+-export([i/0, i/1]).
+-export([timestamp/0]).
 
 %% Basic report formatting
 -export([format_report/1, format_otp_report/1]).
@@ -122,6 +127,18 @@
                           {filters,log | stop,[{filter_id(),filter()}]} |
                           {module_level,level(),[module()]}].
 
+-type olp_config() :: #{sync_mode_qlen => non_neg_integer(),
+                        drop_mode_qlen => pos_integer(),
+                        flush_qlen => pos_integer(),
+                        burst_limit_enable => boolean(),
+                        burst_limit_max_count => pos_integer(),
+                        burst_limit_window_time => pos_integer(),
+                        overload_kill_enable => boolean(),
+                        overload_kill_qlen => pos_integer(),
+                        overload_kill_mem_size => pos_integer(),
+                        overload_kill_restart_after =>
+                            non_neg_integer() | infinity}.
+
 -export_type([log_event/0,
               level/0,
               report/0,
@@ -137,7 +154,9 @@
               filter_arg/0,
               filter_return/0,
               config_handler/0,
-              formatter_config/0]).
+              formatter_config/0,
+              olp_config/0,
+              timestamp/0]).
 
 %%%-----------------------------------------------------------------
 %%% API
@@ -337,6 +356,10 @@ internal_log(Level,Term) when is_atom(Level) ->
     erlang:display_string("Logger - "++ atom_to_list(Level) ++ ": "),
     erlang:display(Term).
 
+-spec timestamp() -> timestamp().
+timestamp() ->
+    os:system_time(microsecond).
+
 %%%-----------------------------------------------------------------
 %%% Configuration
 -spec add_primary_filter(FilterId,Filter) -> ok | {error,term()} when
@@ -390,6 +413,7 @@ set_primary_config(Key,Value) ->
 set_primary_config(Config) ->
     logger_server:set_config(primary,Config).
 
+
 -spec set_handler_config(HandlerId,level,Level) -> Return when
       HandlerId :: handler_id(),
       Level :: level() | all | none,
@@ -419,6 +443,11 @@ set_handler_config(HandlerId,Key,Value) ->
 set_handler_config(HandlerId,Config) ->
     logger_server:set_config(HandlerId,Config).
 
+-spec set_proxy_config(Config) -> ok | {error,term()} when
+      Config :: olp_config().
+set_proxy_config(Config) ->
+    logger_server:set_config(proxy,Config).
+
 -spec update_primary_config(Config) -> ok | {error,term()} when
       Config :: primary_config().
 update_primary_config(Config) ->
@@ -453,6 +482,11 @@ update_handler_config(HandlerId,Key,Value) ->
 update_handler_config(HandlerId,Config) ->
     logger_server:update_config(HandlerId,Config).
 
+-spec update_proxy_config(Config) -> ok | {error,term()} when
+      Config :: olp_config().
+update_proxy_config(Config) ->
+    logger_server:update_config(proxy,Config).
+
 -spec get_primary_config() -> Config when
       Config :: primary_config().
 get_primary_config() ->
@@ -486,6 +520,12 @@ get_handler_ids() ->
     {ok,#{handlers:=HandlerIds}} = logger_config:get(?LOGGER_TABLE,primary),
     HandlerIds.
 
+-spec get_proxy_config() -> Config when
+      Config :: olp_config().
+get_proxy_config() ->
+    {ok,Config} = logger_config:get(?LOGGER_TABLE,proxy),
+    Config.
+
 -spec update_formatter_config(HandlerId,FormatterConfig) ->
                                      ok | {error,term()} when
       HandlerId :: handler_id(),
@@ -606,12 +646,150 @@ unset_process_metadata() ->
 
 -spec get_config() -> #{primary=>primary_config(),
                         handlers=>[handler_config()],
+                        proxy=>olp_config(),
                         module_levels=>[{module(),level() | all | none}]}.
 get_config() ->
     #{primary=>get_primary_config(),
       handlers=>get_handler_config(),
+      proxy=>get_proxy_config(),
       module_levels=>lists:keysort(1,get_module_level())}.
 
+-spec i() -> ok.
+i() ->
+    #{primary := Primary,
+      handlers := HandlerConfigs,
+      proxy := Proxy,
+      module_levels := Modules} = get_config(),
+    M = modifier(),
+    i_primary(Primary,M),
+    i_handlers(HandlerConfigs,M),
+    i_proxy(Proxy,M),
+    i_modules(Modules,M).
+
+-spec i(What) -> ok when
+      What :: primary | handlers | proxy | modules | handler_id().
+i(primary) ->
+    i_primary(get_primary_config(),modifier());
+i(handlers) ->
+    i_handlers(get_handler_config(),modifier());
+i(proxy) ->
+    i_proxy(get_proxy_config(),modifier());
+i(modules) ->
+    i_modules(get_module_level(),modifier());
+i(HandlerId) when is_atom(HandlerId) ->
+    case get_handler_config(HandlerId) of
+        {ok,HandlerConfig} ->
+            i_handlers([HandlerConfig],modifier());
+        Error ->
+            Error
+    end;
+i(What) ->
+    erlang:error(badarg,[What]).
+
+
+i_primary(#{level := Level,
+            filters := Filters,
+            filter_default := FilterDefault},
+          M) ->
+    io:format("Primary configuration: ~n",[]),
+    io:format("    Level: ~p~n",[Level]),
+    io:format("    Filter Default: ~p~n", [FilterDefault]),
+    io:format("    Filters: ~n", []),
+    print_filters("        ",Filters,M).
+
+i_handlers(HandlerConfigs,M) ->
+    io:format("Handler configuration: ~n", []),
+    print_handlers(HandlerConfigs,M).
+
+i_proxy(Proxy,M) ->
+    io:format("Proxy configuration: ~n", []),
+    print_custom("    ",Proxy,M).
+
+i_modules(Modules,M) ->
+    io:format("Level set per module: ~n", []),
+    print_module_levels(Modules,M).
+
+encoding() ->
+    case lists:keyfind(encoding, 1, io:getopts()) of
+	false -> latin1;
+	{encoding, Enc} -> Enc
+    end.
+
+modifier() ->
+    modifier(encoding()).
+
+modifier(latin1) -> "";
+modifier(_) -> "t".
+
+print_filters(Indent, {Id, {Fun, Arg}}, M) ->
+    io:format("~sId: ~"++M++"p~n"
+              "~s    Fun: ~"++M++"p~n"
+              "~s    Arg: ~"++M++"p~n",
+              [Indent, Id, Indent, Fun, Indent, Arg]);
+print_filters(Indent,[],_M) ->
+    io:format("~s(none)~n",[Indent]);
+print_filters(Indent,Filters,M) ->
+    [print_filters(Indent,Filter,M) || Filter <- Filters],
+    ok.
+
+print_handlers(#{id := Id,
+                 module := Module,
+                 level := Level,
+                 filters := Filters, filter_default := FilterDefault,
+                 formatter := {FormatterModule,FormatterConfig}} = Config, M) ->
+    io:format("    Id: ~"++M++"p~n"
+              "        Module: ~p~n"
+              "        Level:  ~p~n"
+              "        Formatter:~n"
+              "            Module: ~p~n"
+              "            Config:~n",
+              [Id, Module, Level, FormatterModule]),
+    print_custom("                ",FormatterConfig,M),
+    io:format("        Filter Default: ~p~n"
+              "        Filters:~n",
+              [FilterDefault]),
+    print_filters("            ",Filters,M),
+    case maps:find(config,Config) of
+        {ok,HandlerConfig} ->
+            io:format("        Handler Config:~n"),
+            print_custom("            ",HandlerConfig,M);
+        error ->
+            ok
+    end,
+    MyKeys = [filter_default, filters, formatter, level, module, id, config],
+    case maps:without(MyKeys,Config) of
+        Empty when Empty==#{} ->
+            ok;
+        Unhandled ->
+            io:format("        Custom Config:~n"),
+            print_custom("            ",Unhandled,M)
+    end;
+print_handlers([], _M) ->
+    io:format("    (none)~n");
+print_handlers(HandlerConfigs, M) ->
+    [print_handlers(HandlerConfig, M) || HandlerConfig <- HandlerConfigs],
+    ok.
+
+print_custom(Indent, {Key, Value}, M) ->
+    io:format("~s~"++M++"p: ~"++M++"p~n",[Indent,Key,Value]);
+print_custom(Indent, Map, M) when is_map(Map) ->
+    print_custom(Indent,lists:keysort(1,maps:to_list(Map)), M);
+print_custom(Indent, List, M) when is_list(List), is_tuple(hd(List)) ->
+    [print_custom(Indent, X, M) || X <- List],
+    ok;
+print_custom(Indent, Value, M) ->
+    io:format("~s~"++M++"p~n",[Indent,Value]).
+
+print_module_levels({Module,Level},M) ->
+    io:format("    Module: ~"++M++"p~n"
+              "        Level: ~p~n",
+              [Module,Level]);
+print_module_levels([],_M) ->
+    io:format("    (none)~n");
+print_module_levels(Modules,M) ->
+    [print_module_levels(Module,M) || Module <- Modules],
+    ok.
+
 -spec internal_init_logger() -> ok | {error,term()}.
 %% This function is responsible for config of the logger
 %% This is done before add_handlers because we want the
@@ -672,6 +850,17 @@ init_kernel_handlers(Env) ->
 %% This function is responsible for resolving the handler config
 %% and then starting the correct handlers. This is done after the
 %% kernel supervisor tree has been started as it needs the logger_sup.
+add_handlers(kernel) ->
+    Env = get_logger_env(kernel),
+    case get_proxy_opts(Env) of
+        undefined ->
+            add_handlers(kernel,Env);
+        Opts ->
+            case set_proxy_config(Opts) of
+                ok -> add_handlers(kernel,Env);
+                {error, Reason} -> {error,{bad_proxy_config,Reason}}
+            end
+    end;
 add_handlers(App) when is_atom(App) ->
     add_handlers(App,get_logger_env(App));
 add_handlers(HandlerConfig) ->
@@ -729,6 +918,8 @@ check_logger_config(kernel,[{filters,_,_}|Env]) ->
     check_logger_config(kernel,Env);
 check_logger_config(kernel,[{module_level,_,_}|Env]) ->
     check_logger_config(kernel,Env);
+check_logger_config(kernel,[{proxy,_}|Env]) ->
+    check_logger_config(kernel,Env);
 check_logger_config(_,Bad) ->
     throw(Bad).
 
@@ -784,6 +975,13 @@ get_primary_filters(Env) ->
         _ -> throw({multiple_filters,Env})
     end.
 
+get_proxy_opts(Env) ->
+    case [P || P={proxy,_} <- Env] of
+        [{proxy,Opts}] -> Opts;
+        [] -> undefined;
+        _ -> throw({multiple_proxies,Env})
+    end.
+
 %% This function looks at the kernel logger environment
 %% and updates it so that the correct logger is configured
 init_default_config(Type,Env) when Type==standard_io;
@@ -880,30 +1078,30 @@ log_allowed(Location,Level,Msg,Meta0) when is_map(Meta0) ->
              maps:merge(Location,maps:merge(proc_meta(),Meta0))),
     case node(maps:get(gl,Meta)) of
         Node when Node=/=node() ->
-            log_remote(Node,Level,Msg,Meta),
-            do_log_allowed(Level,Msg,Meta);
+            log_remote(Node,Level,Msg,Meta);
         _ ->
-            do_log_allowed(Level,Msg,Meta)
-    end.
+            ok
+    end,
+    do_log_allowed(Level,Msg,Meta,tid()).
 
-do_log_allowed(Level,{Format,Args}=Msg,Meta)
+do_log_allowed(Level,{Format,Args}=Msg,Meta,Tid)
   when ?IS_LEVEL(Level),
        is_list(Format),
        is_list(Args),
        is_map(Meta) ->
-    logger_backend:log_allowed(#{level=>Level,msg=>Msg,meta=>Meta},tid());
-do_log_allowed(Level,Report,Meta)
+    logger_backend:log_allowed(#{level=>Level,msg=>Msg,meta=>Meta},Tid);
+do_log_allowed(Level,Report,Meta,Tid)
   when ?IS_LEVEL(Level),
        ?IS_REPORT(Report),
        is_map(Meta) ->
     logger_backend:log_allowed(#{level=>Level,msg=>{report,Report},meta=>Meta},
-                               tid());
-do_log_allowed(Level,String,Meta)
+                               Tid);
+do_log_allowed(Level,String,Meta,Tid)
   when ?IS_LEVEL(Level),
        ?IS_STRING(String),
        is_map(Meta) ->
     logger_backend:log_allowed(#{level=>Level,msg=>{string,String},meta=>Meta},
-                               tid()).
+                               Tid).
 tid() ->
     ets:whereis(?LOGGER_TABLE).
 
@@ -913,7 +1111,7 @@ log_remote(Node,Level,Msg,Meta) ->
     log_remote(Node,{log,Level,Msg,Meta}).
 
 log_remote(Node,Request) ->
-    {logger,Node} ! Request,
+    logger_proxy:log({remote,Node,Request}),
     ok.
 
 add_default_metadata(Meta) ->
@@ -937,7 +1135,7 @@ proc_meta() ->
 
 default(pid) -> self();
 default(gl) -> group_leader();
-default(time) -> erlang:system_time(microsecond).
+default(time) -> timestamp().
 
 %% Remove everything upto and including this module from the stacktrace
 filter_stacktrace(Module,[{Module,_,_,_}|_]) ->
diff --git a/lib/kernel/src/logger_config.erl b/lib/kernel/src/logger_config.erl
index 5e9faf332c..5024d20cfe 100644
--- a/lib/kernel/src/logger_config.erl
+++ b/lib/kernel/src/logger_config.erl
@@ -66,6 +66,8 @@ get(Tid,What) ->
     case ets:lookup(Tid,table_key(What)) of
         [{_,_,Config}] ->
             {ok,Config};
+        [{_,Config}] when What=:=proxy ->
+            {ok,Config};
         [] ->
             {error,{not_found,What}}
     end.
@@ -79,10 +81,15 @@ get(Tid,What,Level) ->
         [Data] -> {ok,Data}
     end.
 
+create(Tid,proxy,Config) ->
+    ets:insert(Tid,{table_key(proxy),Config});
 create(Tid,What,Config) ->
     LevelInt = level_to_int(maps:get(level,Config)),
     ets:insert(Tid,{table_key(What),LevelInt,Config}).
 
+set(Tid,proxy,Config) ->
+    ets:insert(Tid,{table_key(proxy),Config}),
+    ok;
 set(Tid,What,Config) ->
     LevelInt = level_to_int(maps:get(level,Config)),
     %% Should do this only if the level has actually changed. Possibly
@@ -148,5 +155,6 @@ int_to_level(?LOG_ALL) -> all.
 %%%-----------------------------------------------------------------
 %%% Internal
 
+table_key(proxy) -> ?PROXY_KEY;
 table_key(primary) -> ?PRIMARY_KEY;
 table_key(HandlerId) -> {?HANDLER_KEY,HandlerId}.
diff --git a/lib/kernel/src/logger_disk_log_h.erl b/lib/kernel/src/logger_disk_log_h.erl
index 41e0d51a9d..47b39da900 100644
--- a/lib/kernel/src/logger_disk_log_h.erl
+++ b/lib/kernel/src/logger_disk_log_h.erl
@@ -24,7 +24,7 @@
 -include("logger_h_common.hrl").
 
 %%% API
--export([info/1, filesync/1, reset/1]).
+-export([filesync/1]).
 
 %% logger_h_common callbacks
 -export([init/2, check_config/4, reset_state/2,
@@ -47,25 +47,6 @@
 filesync(Name) ->
     logger_h_common:filesync(?MODULE,Name).
 
-%%%-----------------------------------------------------------------
-%%%
--spec info(Name) -> Info | {error,Reason} when
-      Name :: atom(),
-      Info :: term(),
-      Reason :: handler_busy | {badarg,term()}.
-
-info(Name) ->
-    logger_h_common:info(?MODULE,Name).
-
-%%%-----------------------------------------------------------------
-%%%
--spec reset(Name) -> ok | {error,Reason} when
-      Name :: atom(),
-      Reason :: handler_busy | {badarg,term()}.
-
-reset(Name) ->
-    logger_h_common:reset(?MODULE,Name).
-
 %%%===================================================================
 %%% logger callbacks
 %%%===================================================================
diff --git a/lib/kernel/src/logger_formatter.erl b/lib/kernel/src/logger_formatter.erl
index ded89bac9f..8696adbd72 100644
--- a/lib/kernel/src/logger_formatter.erl
+++ b/lib/kernel/src/logger_formatter.erl
@@ -64,7 +64,7 @@ format(#{level:=Level,msg:=Msg0,meta:=Meta},Config0)
                             Config;
                         Size0 ->
                             Size =
-                                case Size0 - string:length([B,A]) of
+                                case Size0 - io_lib:chars_length([B,A]) of
                                     S when S>=0 -> S;
                                     _ -> 0
                                 end,
@@ -75,7 +75,11 @@ format(#{level:=Level,msg:=Msg0,meta:=Meta},Config0)
                     true ->
                         %% Trim leading and trailing whitespaces, and replace
                         %% newlines with ", "
-                        re:replace(string:trim(MsgStr0),",?\r?\n\s*",", ",
+                        T = lists:reverse(
+                              trim(
+                                lists:reverse(
+                                  trim(MsgStr0,false)),true)),
+                        re:replace(T,",?\r?\n\s*",", ",
                                    [{return,list},global,unicode]);
                     _false ->
                         MsgStr0
@@ -83,7 +87,26 @@ format(#{level:=Level,msg:=Msg0,meta:=Meta},Config0)
            true ->
                 ""
         end,
-    truncate([B,MsgStr,A],maps:get(max_size,Config)).
+    truncate(B,MsgStr,A,maps:get(max_size,Config)).
+
+trim([H|T],Rev) when H==$\s; H==$\r; H==$\n ->
+    trim(T,Rev);
+trim([H|T],false) when is_list(H) ->
+    case trim(H,false) of
+        [] ->
+            trim(T,false);
+        TrimmedH ->
+            [TrimmedH|T]
+    end;
+trim([H|T],true) when is_list(H) ->
+    case trim(lists:reverse(H),true) of
+        [] ->
+            trim(T,true);
+        TrimmedH ->
+            [lists:reverse(TrimmedH)|T]
+    end;
+trim(String,_) ->
+    String.
 
 do_format(Level,Data,[level|Format],Config) ->
     [to_string(level,Level,Config)|do_format(Level,Data,Format,Config)];
@@ -239,21 +262,47 @@ chardata_to_list(Chardata) ->
             throw(Error)
     end.
 
-truncate(String,unlimited) ->
-    String;
-truncate(String,Size) ->
-    Length = string:length(String),
+truncate(B,Msg,A,unlimited) ->
+    [B,Msg,A];
+truncate(B,Msg,A,Size) ->
+    String = [B,Msg,A],
+    Length = io_lib:chars_length(String),
     if Length>Size ->
-            case lists:reverse(lists:flatten(String)) of
-                [$\n|_] ->
-                    string:slice(String,0,Size-4)++"...\n";
+            {Last,FlatString} =
+                case A of
+                    [] ->
+                        case Msg of
+                            [] ->
+                                {get_last(B),lists:flatten(B)};
+                            _ ->
+                                {get_last(Msg),lists:flatten([B,Msg])}
+                        end;
+                    _ ->
+                        {get_last(A),lists:flatten(String)}
+                end,
+            case Last of
+                $\n->
+                    lists:sublist(FlatString,1,Size-4)++"...\n";
                 _ ->
-                    string:slice(String,0,Size-3)++"..."
+                    lists:sublist(FlatString,1,Size-3)++"..."
             end;
        true ->
             String
     end.
 
+get_last(L) ->
+    get_first(lists:reverse(L)).
+
+get_first([]) ->
+    error;
+get_first([C|_]) when is_integer(C) ->
+    C;
+get_first([L|Rest]) when is_list(L) ->
+    case get_last(L) of
+        error -> get_first(Rest);
+        First -> First
+    end.
+
 %% SysTime is the system time in microseconds
 format_time(SysTime,#{time_offset:=Offset,time_designator:=Des})
   when is_integer(SysTime) ->
diff --git a/lib/kernel/src/logger_h_common.erl b/lib/kernel/src/logger_h_common.erl
index 74a2d158fc..16946ff97c 100644
--- a/lib/kernel/src/logger_h_common.erl
+++ b/lib/kernel/src/logger_h_common.erl
@@ -24,11 +24,11 @@
 -include("logger_internal.hrl").
 
 %% API
--export([start_link/1, info/2, filesync/2, reset/2]).
+-export([filesync/2]).
 
-%% gen_server and proc_lib callbacks
--export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-         terminate/2, code_change/3]).
+%% logger_olp callbacks
+-export([init/1, handle_load/2, handle_call/3, handle_cast/2, handle_info/2,
+         terminate/2, code_change/3, notify/2, reset_state/1]).
 
 %% logger callbacks
 -export([log/2, adding_handler/1, removing_handler/1, changing_config/3,
@@ -37,52 +37,45 @@
 %% Library functions for handlers
 -export([error_notify/1]).
 
-%%%-----------------------------------------------------------------
--define(CONFIG_KEYS,[sync_mode_qlen,
-                     drop_mode_qlen,
-                     flush_qlen,
-                     burst_limit_enable,
-                     burst_limit_max_count,
-                     burst_limit_window_time,
-                     overload_kill_enable,
-                     overload_kill_qlen,
-                     overload_kill_mem_size,
-                     overload_kill_restart_after,
-                     filesync_repeat_interval]).
--define(READ_ONLY_KEYS,[handler_pid,mode_tab]).
+-define(OLP_KEYS,[sync_mode_qlen,
+                  drop_mode_qlen,
+                  flush_qlen,
+                  burst_limit_enable,
+                  burst_limit_max_count,
+                  burst_limit_window_time,
+                  overload_kill_enable,
+                  overload_kill_qlen,
+                  overload_kill_mem_size,
+                  overload_kill_restart_after]).
+
+-define(COMMON_KEYS,[filesync_repeat_interval]).
+
+-define(READ_ONLY_KEYS,[olp]).
 
 %%%-----------------------------------------------------------------
 %%% API
 
 %% This function is called by the logger_sup supervisor
-start_link(Args) ->
-    proc_lib:start_link(?MODULE,init,[Args]).
-
 filesync(Module, Name) ->
     call(Module, Name, filesync).
 
-info(Module, Name) ->
-    call(Module, Name, info).
-
-reset(Module, Name) ->
-    call(Module, Name, reset).
-
 %%%-----------------------------------------------------------------
 %%% Handler being added
 adding_handler(#{id:=Name,module:=Module}=Config) ->
     HConfig0 = maps:get(config, Config, #{}),
-    HandlerConfig0 = maps:without(?CONFIG_KEYS,HConfig0),
+    HandlerConfig0 = maps:without(?OLP_KEYS++?COMMON_KEYS,HConfig0),
     case Module:check_config(Name,set,undefined,HandlerConfig0) of
         {ok,HandlerConfig} ->
-            ModifiedCommon = maps:with(?CONFIG_KEYS,HandlerConfig),
-            CommonConfig0 = maps:with(?CONFIG_KEYS,HConfig0),
+            ModifiedCommon = maps:with(?COMMON_KEYS,HandlerConfig),
+            CommonConfig0 = maps:with(?COMMON_KEYS,HConfig0),
             CommonConfig = maps:merge(
                              maps:merge(get_default_config(), CommonConfig0),
                              ModifiedCommon),
             case check_config(CommonConfig) of
                 ok ->
                     HConfig = maps:merge(CommonConfig,HandlerConfig),
-                    start(Config#{config => HConfig});
+                    OlpOpts = maps:with(?OLP_KEYS,HConfig0),
+                    start(OlpOpts, Config#{config => HConfig});
                 {error,Faulty} ->
                     {error,{invalid_config,Module,Faulty}}
             end;
@@ -92,11 +85,11 @@ adding_handler(#{id:=Name,module:=Module}=Config) ->
 
 %%%-----------------------------------------------------------------
 %%% Handler being removed
-removing_handler(#{id:=Name, module:=Module}) ->
+removing_handler(#{id:=Name, module:=Module, config:=#{olp:=Olp}}) ->
     case whereis(?name_to_reg_name(Module,Name)) of
         undefined ->
             ok;
-        Pid ->
+        _Pid ->
             %% We don't want to do supervisor:terminate_child here
             %% since we need to distinguish this explicit stop from a
             %% system termination in order to avoid circular attempts
@@ -106,7 +99,7 @@ removing_handler(#{id:=Name, module:=Module}) ->
             %% the restart type is temporary, which means that the
             %% child specification is automatically removed from the
             %% supervisor when the process dies.
-            _ = gen_server:call(Pid, stop),
+            _ = logger_olp:stop(Olp),
             ok
     end.
 
@@ -116,34 +109,53 @@ changing_config(SetOrUpdate,
                 #{id:=Name,config:=OldHConfig,module:=Module},
                 NewConfig0) ->
     NewHConfig0 = maps:get(config, NewConfig0, #{}),
-    OldHandlerConfig = maps:without(?CONFIG_KEYS++?READ_ONLY_KEYS,OldHConfig),
-    NewHandlerConfig0 = maps:without(?CONFIG_KEYS++?READ_ONLY_KEYS,NewHConfig0),
+    NoHandlerKeys = ?OLP_KEYS++?COMMON_KEYS++?READ_ONLY_KEYS,
+    OldHandlerConfig = maps:without(NoHandlerKeys,OldHConfig),
+    NewHandlerConfig0 = maps:without(NoHandlerKeys,NewHConfig0),
     case Module:check_config(Name, SetOrUpdate,
                              OldHandlerConfig,NewHandlerConfig0) of
         {ok, NewHandlerConfig} ->
-            ModifiedCommon = maps:with(?CONFIG_KEYS,NewHandlerConfig),
-            NewCommonConfig0 = maps:with(?CONFIG_KEYS,NewHConfig0),
+            ModifiedCommon = maps:with(?COMMON_KEYS,NewHandlerConfig),
+            NewCommonConfig0 = maps:with(?COMMON_KEYS,NewHConfig0),
+            OldCommonConfig = maps:with(?COMMON_KEYS,OldHConfig),
             CommonDefault =
                 case SetOrUpdate of
                     set ->
                         get_default_config();
                     update ->
-                        maps:with(?CONFIG_KEYS,OldHConfig)
+                        OldCommonConfig
                 end,
             NewCommonConfig = maps:merge(
                                 maps:merge(CommonDefault,NewCommonConfig0),
                                 ModifiedCommon),
             case check_config(NewCommonConfig) of
                 ok ->
-                    ReadOnly = maps:with(?READ_ONLY_KEYS,OldHConfig),
-                    NewHConfig = maps:merge(
-                                   maps:merge(NewCommonConfig,NewHandlerConfig),
-                                   ReadOnly),
-                    NewConfig = NewConfig0#{config=>NewHConfig},
-                    HPid = maps:get(handler_pid,OldHConfig),
-                    case call(HPid, {change_config,NewConfig}) of
-                        ok      -> {ok,NewConfig};
-                        Error  -> Error
+                    OlpDefault =
+                        case SetOrUpdate of
+                            set ->
+                                logger_olp:get_default_opts();
+                            update ->
+                                maps:with(?OLP_KEYS,OldHConfig)
+                        end,
+                    Olp = maps:get(olp,OldHConfig),
+                    NewOlpOpts = maps:merge(OlpDefault,
+                                            maps:with(?OLP_KEYS,NewHConfig0)),
+                    case logger_olp:set_opts(Olp,NewOlpOpts) of
+                        ok ->
+                            logger_olp:cast(Olp, {config_changed,
+                                                  NewCommonConfig,
+                                                  NewHandlerConfig}),
+                            ReadOnly = maps:with(?READ_ONLY_KEYS,OldHConfig),
+                            NewHConfig =
+                                maps:merge(
+                                  maps:merge(
+                                    maps:merge(NewCommonConfig,NewHandlerConfig),
+                                    ReadOnly),
+                                  NewOlpOpts),
+                            NewConfig = NewConfig0#{config=>NewHConfig},
+                            {ok,NewConfig};
+                        Error  ->
+                            Error
                     end;
                 {error,Faulty} ->
                     {error,{invalid_config,Module,Faulty}}
@@ -158,14 +170,12 @@ changing_config(SetOrUpdate,
       LogEvent :: logger:log_event(),
       Config :: logger:handler_config().
 
-log(LogEvent, Config = #{id := Name,
-                         config := #{handler_pid := HPid,
-                                     mode_tab := ModeTab}}) ->
+log(LogEvent, Config = #{config := #{olp:=Olp}}) ->
     %% if the handler has crashed, we must drop this event
     %% and hope the handler restarts so we can try again
-    true = is_process_alive(HPid),
+    true = is_process_alive(logger_olp:get_pid(Olp)),
     Bin = log_to_binary(LogEvent, Config),
-    call_cast_or_drop(Name, HPid, ModeTab, Bin).
+    logger_olp:load(Olp,Bin).
 
 %%%-----------------------------------------------------------------
 %%% Remove internal fields from configuration
@@ -180,18 +190,23 @@ filter_config(#{config:=HConfig}=Config) ->
 %%%
 %%% The handler process is linked to logger_sup, which is part of the
 %%% kernel application's supervision tree.
-start(#{id := Name} = Config0) ->
+start(OlpOpts0, #{id := Name, module:=Module, config:=HConfig} = Config0) ->
+    RegName = ?name_to_reg_name(Module,Name),
     ChildSpec =
         #{id       => Name,
-          start    => {?MODULE, start_link, [Config0]},
+          start    => {logger_olp, start_link, [RegName,?MODULE,
+                                                Config0, OlpOpts0]},
           restart  => temporary,
           shutdown => 2000,
           type     => worker,
           modules  => [?MODULE]},
     case supervisor:start_child(logger_sup, ChildSpec) of
-        {ok,Pid,Config} ->
+        {ok,Pid,Olp} ->
             ok = logger_handler_watcher:register_handler(Name,Pid),
-            {ok,Config};
+            OlpOpts = logger_olp:get_opts(Olp),
+            {ok,Config0#{config=>(maps:merge(HConfig,OlpOpts))#{olp=>Olp}}};
+        {error,{Reason,Ch}} when is_tuple(Ch), element(1,Ch)==child ->
+            {error,Reason};
         Error ->
             Error
     end.
@@ -200,103 +215,50 @@ start(#{id := Name} = Config0) ->
 %%% gen_server callbacks
 %%%===================================================================
 
-init(#{id := Name, module := Module,
-       formatter := Formatter, config := HConfig0} = Config0) ->
-    RegName = ?name_to_reg_name(Module,Name),
-    register(RegName, self()),
+init(#{id := Name, module := Module, config := HConfig}) ->
     process_flag(trap_exit, true),
-    process_flag(message_queue_data, off_heap),
 
     ?init_test_hooks(),
-    ?start_observation(Name),
 
-    case Module:init(Name, HConfig0) of
+    case Module:init(Name, HConfig) of
         {ok,HState} ->
-            try ets:new(Name, [public]) of
-                ModeTab ->
-                    ?set_mode(ModeTab, async),
-                    T0 = ?timestamp(),
-                    HConfig = HConfig0#{handler_pid => self(),
-                                        mode_tab => ModeTab},
-                    Config = Config0#{config => HConfig},
-                    proc_lib:init_ack({ok,self(),Config}),
-                    %% Storing common config in state to avoid copying
-                    %% (sending) the config data for each log message
-                    CommonConfig = maps:with(?CONFIG_KEYS,HConfig),
-                    State =
-                        ?merge_with_stats(
-                           CommonConfig#{id => Name,
-                                         module => Module,
-                                         mode_tab => ModeTab,
-                                         mode => async,
-                                         ctrl_sync_count =>
-                                             ?CONTROLLER_SYNC_INTERVAL,
-                                         last_qlen => 0,
-                                         last_log_ts => T0,
-                                         last_op => sync,
-                                         burst_win_ts => T0,
-                                         burst_msg_count => 0,
-                                         formatter => Formatter,
-                                         handler_state => HState}),
-                    State1 = set_repeated_filesync(State),
-                    unset_restart_flag(State1),
-                    gen_server:enter_loop(?MODULE, [], State1)
-            catch
-                _:Error ->
-                    unregister(RegName),
-                    error_notify({init_handler,Name,Error}),
-                    proc_lib:init_ack(Error)
-            end;
+            %% Storing common config in state to avoid copying
+            %% (sending) the config data for each log message
+            CommonConfig = maps:with(?COMMON_KEYS,HConfig),
+            State = CommonConfig#{id => Name,
+                                  module => Module,
+                                  ctrl_sync_count =>
+                                      ?CONTROLLER_SYNC_INTERVAL,
+                                  last_op => sync,
+                                  handler_state => HState},
+            State1 = set_repeated_filesync(State),
+            {ok,State1};
         Error ->
-            unregister(RegName),
-            error_notify({init_handler,Name,Error}),
-            proc_lib:init_ack(Error)
+            Error
     end.
 
-%% This is the synchronous log event.
-handle_call({log, Bin}, _From, State) ->
-    {Result,State1} = do_log(Bin, call, State),
-    %% Result == ok | dropped
-    {reply,Result, State1};
+%% This is the log event.
+handle_load(Bin, #{id:=Name,
+                   module:=Module,
+                   handler_state:=HandlerState,
+                   ctrl_sync_count := CtrlSync}=State) ->
+    if CtrlSync==0 ->
+            {_,HS1} = Module:write(Name, sync, Bin, HandlerState),
+            State#{handler_state => HS1,
+                   ctrl_sync_count => ?CONTROLLER_SYNC_INTERVAL,
+                   last_op=>write};
+       true ->
+            {_,HS1} = Module:write(Name, async, Bin, HandlerState),
+            State#{handler_state => HS1,
+                   ctrl_sync_count => CtrlSync-1,
+                   last_op=>write}
+    end.
 
 handle_call(filesync, _From, State = #{id := Name,
                                        module := Module,
                                        handler_state := HandlerState}) ->
     {Result,HandlerState1} = Module:filesync(Name,sync,HandlerState),
-    {reply, Result, State#{handler_state=>HandlerState1, last_op=>sync}};
-
-handle_call({change_config, #{formatter:=Formatter, config:=NewHConfig}}, _From,
-            State = #{filesync_repeat_interval := FSyncInt0}) ->
-    %% In the future, if handler_state must be updated due to config
-    %% change, then we need to add a callback to Module here.
-    CommonConfig = maps:with(?CONFIG_KEYS,NewHConfig),
-    State1 = maps:merge(State, CommonConfig),
-    State2 =
-        case maps:get(filesync_repeat_interval, NewHConfig) of
-            FSyncInt0 ->
-                State1;
-            _FSyncInt1 ->
-                set_repeated_filesync(cancel_repeated_filesync(State1))
-        end,
-    {reply, ok, State2#{formatter:=Formatter}};
-
-handle_call(info, _From, State) ->
-    {reply, State, State};
-
-handle_call(reset, _From,
-            #{id:=Name,module:=Module,handler_state:=HandlerState}=State) ->
-    State1 = ?merge_with_stats(State),
-    {reply, ok, State1#{last_qlen => 0,
-                        last_log_ts => ?timestamp(),
-                        handler_state => Module:reset_state(Name,HandlerState)}};
-
-handle_call(stop, _From, State) ->
-    {stop, {shutdown,stopped}, ok, State}.
-
-%% This is the asynchronous log event.
-handle_cast({log, Bin}, State) ->
-    {_,State1} = do_log(Bin, cast, State),
-    {noreply, State1};
+    {reply, Result, State#{handler_state=>HandlerState1, last_op=>sync}}.
 
 %% If FILESYNC_REPEAT_INTERVAL is set to a millisec value, this
 %% clause gets called repeatedly by the handler. In order to
@@ -319,168 +281,96 @@ handle_cast(repeated_filesync,
                 {_,HS} = Module:filesync(Name, async, HandlerState),
                 State#{handler_state => HS, last_op => sync}
         end,
-    {noreply,set_repeated_filesync(State1)}.
+    {noreply,set_repeated_filesync(State1)};
+handle_cast({config_changed, CommonConfig, HConfig},
+            State = #{id := Name,
+                      module := Module,
+                      handler_state := HandlerState,
+                      filesync_repeat_interval := OldFSyncInt}) ->
+    State1 =
+        case maps:get(filesync_repeat_interval,CommonConfig) of
+            OldFSyncInt ->
+                State;
+            FSyncInt ->
+                set_repeated_filesync(
+                  cancel_repeated_filesync(
+                    State#{filesync_repeat_interval=>FSyncInt}))
+        end,
+    HS = try Module:config_changed(Name, HConfig, HandlerState)
+         catch error:undef -> HandlerState
+         end,
+    {noreply, State1#{handler_state => HS}}.
 
 handle_info(Info, #{id := Name, module := Module,
                     handler_state := HandlerState} = State) ->
     {noreply,State#{handler_state => Module:handle_info(Name,Info,HandlerState)}}.
 
-terminate(Reason, State = #{id := Name,
-                            module := Module,
-                            handler_state := HandlerState}) ->
+terminate(overloaded=Reason, #{id:=Name}=State) ->
+    _ = log_handler_info(Name,"Handler ~p overloaded and stopping",[Name],State),
+    do_terminate(Reason,State),
+    ConfigResult = logger:get_handler_config(Name),
+    case ConfigResult of
+        {ok,#{module:=Module}=HConfig0} ->
+            spawn(fun() -> logger:remove_handler(Name) end),
+            HConfig = try Module:filter_config(HConfig0)
+                      catch _:_ -> HConfig0
+                      end,
+            {ok,fun() -> logger:add_handler(Name,Module,HConfig) end};
+        Error ->
+            error_notify({Name,restart_impossible,Error}),
+            Error
+    end;
+terminate(Reason, State) ->
+    do_terminate(Reason, State).
+
+do_terminate(Reason, State = #{id := Name,
+                               module := Module,
+                               handler_state := HandlerState}) ->
     _ = cancel_repeated_filesync(State),
     _ = Module:terminate(Name, Reason, HandlerState),
-    ok = stop_or_restart(Name, Reason, State),
-    unregister(?name_to_reg_name(Module, Name)),
     ok.
 
 code_change(_OldVsn, State, _Extra) ->
     {ok, State}.
 
+reset_state(#{id:=Name, module:=Module, handler_state:=HandlerState} = State) ->
+    State#{handler_state=>Module:reset_state(Name, HandlerState)}.
 
 %%%-----------------------------------------------------------------
 %%% Internal functions
 call(Module, Name, Op) when is_atom(Name) ->
-    call(?name_to_reg_name(Module,Name), Op);
+    case logger_olp:call(?name_to_reg_name(Module,Name), Op) of
+        {error,busy} -> {error,handler_busy};
+        Other -> Other
+    end;
 call(_, Name, Op) ->
     {error,{badarg,{Op,[Name]}}}.
 
-call(Server, Msg) ->
-    try
-        gen_server:call(Server, Msg, ?DEFAULT_CALL_TIMEOUT)
-    catch
-        _:{timeout,_} -> {error,handler_busy}
-    end.
-
-%% check for overload between every event (and set Mode to async,
-%% sync or drop accordingly), but never flush the whole mailbox
-%% before LogWindowSize events have been handled
-do_log(Bin, CallOrCast, State = #{id:=Name, mode:=Mode0}) ->
-    T1 = ?timestamp(),
-
-    %% check if the handler is getting overloaded, or if it's
-    %% recovering from overload (the check must be done for each
-    %% event to react quickly to large bursts of events and
-    %% to ensure that the handler can never end up in drop mode
-    %% with an empty mailbox, which would stop operation)
-    {Mode1,QLen,Mem,State1} = check_load(State),
-
-    if (Mode1 == drop) andalso (Mode0 =/= drop) ->
-            log_handler_info(Name, "Handler ~p switched to drop mode",
-                             [Name], State);
-       (Mode0 == drop) andalso ((Mode1 == async) orelse (Mode1 == sync)) ->
-            log_handler_info(Name, "Handler ~p switched to ~w mode",
-                             [Name,Mode1], State);
-       true ->
-            ok
-    end,
-
-    %% kill the handler if it can't keep up with the load
-    kill_if_choked(Name, QLen, Mem, State),
-
-    if Mode1 == flush ->
-            flush(Name, QLen, T1, State1);
-       true ->
-            write(Name, Mode1, T1, Bin, CallOrCast, State1)
-    end.
-
-%% this clause is called by do_log/3 after an overload check
-%% has been performed, where QLen > FlushQLen
-flush(Name, _QLen0, T1, State=#{last_log_ts := _T0, mode_tab := ModeTab}) ->
-    %% flush messages in the mailbox (a limited number in
-    %% order to not cause long delays)
-    NewFlushed = flush_log_events(?FLUSH_MAX_N),
-
-    %% write info in log about flushed messages
+notify({mode_change,Mode0,Mode1},#{id:=Name}=State) ->
+    log_handler_info(Name,"Handler ~p switched from  ~p to ~p mode",
+                     [Name,Mode0,Mode1], State);
+notify({flushed,Flushed},#{id:=Name}=State) ->
     log_handler_info(Name, "Handler ~p flushed ~w log events",
-                     [Name,NewFlushed], State),
-
-    %% because of the receive loop when flushing messages, the
-    %% handler will be scheduled out often and the mailbox could
-    %% grow very large, so we'd better check the queue again here
-    {_,_QLen1} = process_info(self(), message_queue_len),
-    ?observe(Name,{max_qlen,_QLen1}),
-
-    %% Add 1 for the current log event
-    ?observe(Name,{flushed,NewFlushed+1}),
-
-    State1 = ?update_max_time(?diff_time(T1,_T0),State),
-    State2 = ?update_max_qlen(_QLen1,State1),
-    {dropped,?update_other(flushed,FLUSHED,NewFlushed,
-                           State2#{mode => ?set_mode(ModeTab,async),
-                                   last_qlen => 0,
-                                   last_log_ts => T1})}.
-
-%% this clause is called to write to file
-write(Name, Mode, T1, Bin, _CallOrCast,
-      State = #{module := Module,
-                handler_state := HandlerState,
-                mode_tab := ModeTab,
-                ctrl_sync_count := CtrlSync,
-                last_qlen := LastQLen,
-                last_log_ts := T0}) ->
-    %% check if we need to limit the number of writes
-    %% during a burst of log events
-    {DoWrite,State1} = limit_burst(State),
-
-    %% only log synhrounously every ?CONTROLLER_SYNC_INTERVAL time, to
-    %% give the handler time between writes so it can keep up with
-    %% incoming messages
-    {Result,LastQLen1,HandlerState1} =
-        if DoWrite, CtrlSync == 0 ->
-                ?observe(Name,{_CallOrCast,1}),
-                {_,HS1} = Module:write(Name, sync, Bin, HandlerState),
-                {ok,element(2, process_info(self(), message_queue_len)),HS1};
-           DoWrite ->
-                ?observe(Name,{_CallOrCast,1}),
-                {_,HS1} = Module:write(Name, async, Bin, HandlerState),
-                {ok,LastQLen,HS1};
-           not DoWrite ->
-                ?observe(Name,{flushed,1}),
-                {dropped,LastQLen,HandlerState}
-        end,
-
-    %% Check if the time since the previous log event is long enough -
-    %% and the queue length small enough - to assume the mailbox has
-    %% been emptied, and if so, do filesync operation and reset mode to
-    %% async. Note that this is the best we can do to detect an idle
-    %% handler without setting a timer after each log call/cast. If the
-    %% time between two consecutive log events is fast and no new
-    %% event comes in after the last one, idle state won't be detected!
-    Time = ?diff_time(T1,T0),
-    State2 =
-        if (LastQLen1 < ?FILESYNC_OK_QLEN) andalso
-           (Time > ?IDLE_DETECT_TIME_USEC) ->
-                {_,HS2} = Module:filesync(Name,async,HandlerState),
-                State1#{mode => ?change_mode(ModeTab, Mode, async),
-                        burst_msg_count => 0,
-                        handler_state => HS2};
-           true ->
-                State1#{mode => Mode, handler_state => HandlerState1}
-        end,
-    State3 = ?update_calls_or_casts(_CallOrCast,1,State2),
-    State4 = ?update_max_qlen(LastQLen1,State3),
-    State5 =
-        ?update_max_time(Time,
-                         State4#{last_qlen := LastQLen1,
-                                 last_log_ts => T1,
-                                 last_op => write,
-                                 ctrl_sync_count =>
-                                     if CtrlSync==0 -> ?CONTROLLER_SYNC_INTERVAL;
-                                        true -> CtrlSync-1
-                                     end}),
-    {Result,State5}.
+                     [Name,Flushed], State);
+notify(restart,#{id:=Name}=State) ->
+    log_handler_info(Name, "Handler ~p restarted", [Name], State);
+notify(idle,#{id:=Name,module:=Module,handler_state:=HandlerState}=State) ->
+    {_,HS} = Module:filesync(Name,async,HandlerState),
+    State#{handler_state=>HS, last_op=>sync}.
 
 log_handler_info(Name, Format, Args, #{module:=Module,
-                                       formatter:=Formatter,
-                                       handler_state:=HandlerState}) ->
-    Config = #{formatter=>Formatter},
-    Meta = #{time=>erlang:system_time(microsecond)},
+                                       handler_state:=HandlerState}=State) ->
+    Config =
+        case logger:get_handler_config(Name) of
+            {ok,Conf} -> Conf;
+            _ -> #{formatter=>{?DEFAULT_FORMATTER,?DEFAULT_FORMAT_CONFIG}}
+        end,
+    Meta = #{time=>logger:timestamp()},
     Bin = log_to_binary(#{level => notice,
                           msg => {Format,Args},
                           meta => Meta}, Config),
-    _ = Module:write(Name, async, Bin, HandlerState),
-    ok.
+    {_,HS} = Module:write(Name, async, Bin, HandlerState),
+    State#{handler_state=>HS, last_op=>write}.
 
 %%%-----------------------------------------------------------------
 %%% Convert log data on any form to binary
@@ -540,42 +430,8 @@ string_to_binary(String) ->
 %%%-----------------------------------------------------------------
 %%% Check that the configuration term is valid
 check_config(Config) when is_map(Config) ->
-    case check_common_config(maps:to_list(Config)) of
-        ok ->
-            case overload_levels_ok(Config) of
-                true ->
-                    ok;
-                false ->
-                    Faulty = maps:with([sync_mode_qlen,
-                                        drop_mode_qlen,
-                                        flush_qlen],Config),
-                    {error,{invalid_levels,Faulty}}
-            end;
-        Error ->
-            Error
-    end.
+    check_common_config(maps:to_list(Config)).
 
-check_common_config([{sync_mode_qlen,N}|Config]) when is_integer(N) ->
-    check_common_config(Config);
-check_common_config([{drop_mode_qlen,N}|Config]) when is_integer(N) ->
-    check_common_config(Config);
-check_common_config([{flush_qlen,N}|Config]) when is_integer(N) ->
-    check_common_config(Config);
-check_common_config([{burst_limit_enable,Bool}|Config]) when is_boolean(Bool) ->
-    check_common_config(Config);
-check_common_config([{burst_limit_max_count,N}|Config]) when is_integer(N) ->
-    check_common_config(Config);
-check_common_config([{burst_limit_window_time,N}|Config]) when is_integer(N) ->
-    check_common_config(Config);
-check_common_config([{overload_kill_enable,Bool}|Config]) when is_boolean(Bool) ->
-    check_common_config(Config);
-check_common_config([{overload_kill_qlen,N}|Config]) when is_integer(N) ->
-    check_common_config(Config);
-check_common_config([{overload_kill_mem_size,N}|Config]) when is_integer(N) ->
-    check_common_config(Config);
-check_common_config([{overload_kill_restart_after,NorA}|Config])
-  when is_integer(NorA); NorA == infinity ->
-    check_common_config(Config);
 check_common_config([{filesync_repeat_interval,NorA}|Config])
   when is_integer(NorA); NorA == no_repeat ->
     check_common_config(Config);
@@ -585,156 +441,7 @@ check_common_config([]) ->
     ok.
 
 get_default_config() ->
-    #{sync_mode_qlen              => ?SYNC_MODE_QLEN,
-      drop_mode_qlen              => ?DROP_MODE_QLEN,
-      flush_qlen                  => ?FLUSH_QLEN,
-      burst_limit_enable          => ?BURST_LIMIT_ENABLE,
-      burst_limit_max_count       => ?BURST_LIMIT_MAX_COUNT,
-      burst_limit_window_time     => ?BURST_LIMIT_WINDOW_TIME,
-      overload_kill_enable        => ?OVERLOAD_KILL_ENABLE,
-      overload_kill_qlen          => ?OVERLOAD_KILL_QLEN,
-      overload_kill_mem_size      => ?OVERLOAD_KILL_MEM_SIZE,
-      overload_kill_restart_after => ?OVERLOAD_KILL_RESTART_AFTER,
-      filesync_repeat_interval    => ?FILESYNC_REPEAT_INTERVAL}.
-
-%%%-----------------------------------------------------------------
-%%% Overload Protection
-call_cast_or_drop(_Name, HandlerPid, ModeTab, Bin) ->
-    %% If the handler process is getting overloaded, the log event
-    %% will be synchronous instead of asynchronous (slows down the
-    %% logging tempo of a process doing lots of logging. If the
-    %% handler is choked, drop mode is set and no event will be sent.
-    try ?get_mode(ModeTab) of
-        async ->
-            gen_server:cast(HandlerPid, {log,Bin});
-        sync ->
-            case call(HandlerPid, {log,Bin}) of
-                ok ->
-                    ok;
-                _Other ->
-                    %% dropped or {error,handler_busy}
-                    ?observe(_Name,{dropped,1}),
-                    ok
-            end;
-        drop ->
-            ?observe(_Name,{dropped,1})
-    catch
-        %% if the ETS table doesn't exist (maybe because of a
-        %% handler restart), we can only drop the event
-        _:_ -> ?observe(_Name,{dropped,1})
-    end,
-    ok.
-
-set_restart_flag(#{id := Name, module := Module} = State) ->
-    log_handler_info(Name, "Handler ~p overloaded and stopping", [Name], State),
-    Flag = list_to_atom(lists:concat([Module,"_",Name,"_restarting"])),
-    spawn(fun() ->
-                  register(Flag, self()),
-                  timer:sleep(infinity)
-          end),
-    ok.
-
-unset_restart_flag(#{id := Name, module := Module} = State) ->
-    Flag = list_to_atom(lists:concat([Module,"_",Name,"_restarting"])),
-    case whereis(Flag) of
-        undefined ->
-            ok;
-        Pid ->
-            exit(Pid, kill),
-            log_handler_info(Name, "Handler ~p restarted", [Name], State)
-    end.
-
-check_load(State = #{id:=_Name, mode_tab := ModeTab, mode := Mode,
-                     sync_mode_qlen := SyncModeQLen,
-                     drop_mode_qlen := DropModeQLen,
-                     flush_qlen := FlushQLen}) ->
-    {_,Mem} = process_info(self(), memory),
-    ?observe(_Name,{max_mem,Mem}),
-    {_,QLen} = process_info(self(), message_queue_len),
-    ?observe(_Name,{max_qlen,QLen}),
-    %% When the handler process gets scheduled in, it's impossible
-    %% to predict the QLen. We could jump "up" arbitrarily from say
-    %% async to sync, async to drop, sync to flush, etc. However, when
-    %% the handler process manages the log events (without flushing),
-    %% one after the other, we will move "down" from drop to sync and
-    %% from sync to async. This way we don't risk getting stuck in
-    %% drop or sync mode with an empty mailbox.
-    {Mode1,_NewDrops,_NewFlushes} =
-        if
-            QLen >= FlushQLen ->
-                {flush, 0,1};
-            QLen >= DropModeQLen ->
-                %% Note that drop mode will force log events to
-                %% be dropped on the client side (never sent get to
-                %% the handler).
-                IncDrops = if Mode == drop -> 0; true -> 1 end,
-                {?change_mode(ModeTab, Mode, drop), IncDrops,0};
-            QLen >= SyncModeQLen ->
-                {?change_mode(ModeTab, Mode, sync), 0,0};
-            true ->
-                {?change_mode(ModeTab, Mode, async), 0,0}
-        end,
-    State1 = ?update_other(drops,DROPS,_NewDrops,State),
-    {Mode1, QLen, Mem,
-     ?update_other(flushes,FLUSHES,_NewFlushes,
-                   State1#{last_qlen => QLen})}.
-
-limit_burst(#{burst_limit_enable := false}=State) ->
-     {true,State};
-limit_burst(#{burst_win_ts := BurstWinT0,
-              burst_msg_count := BurstMsgCount,
-              burst_limit_window_time := BurstLimitWinTime,
-              burst_limit_max_count := BurstLimitMaxCnt} = State) ->
-    if (BurstMsgCount >= BurstLimitMaxCnt) -> 
-            %% the limit for allowed messages has been reached
-            BurstWinT1 = ?timestamp(),
-            case ?diff_time(BurstWinT1,BurstWinT0) of
-                BurstCheckTime when BurstCheckTime < (BurstLimitWinTime*1000) ->
-                    %% we're still within the burst time frame
-                    {false,?update_other(burst_drops,BURSTS,1,State)};
-                _BurstCheckTime ->
-                    %% burst time frame passed, reset counters
-                    {true,State#{burst_win_ts => BurstWinT1,
-                                 burst_msg_count => 0}}
-            end;
-       true ->
-            %% the limit for allowed messages not yet reached
-            {true,State#{burst_win_ts => BurstWinT0,
-                         burst_msg_count => BurstMsgCount+1}}
-    end.
-
-kill_if_choked(Name, QLen, Mem, State = #{overload_kill_enable   := KillIfOL,
-                                          overload_kill_qlen     := OLKillQLen,
-                                          overload_kill_mem_size := OLKillMem}) ->
-    if KillIfOL andalso
-       ((QLen > OLKillQLen) orelse (Mem > OLKillMem)) ->
-            set_restart_flag(State),
-            exit({shutdown,{overloaded,Name,QLen,Mem}});
-       true ->
-            ok
-    end.
-
-flush_log_events(Limit) ->
-    process_flag(priority, high),
-    Flushed = flush_log_events(0, Limit),
-    process_flag(priority, normal),
-    Flushed.
-
-flush_log_events(Limit, Limit) ->
-    Limit;
-flush_log_events(N, Limit) ->
-    %% flush log events but leave other events, such as
-    %% filesync, info and change_config, so that these
-    %% have a chance to be processed even under heavy load
-    receive
-        {'$gen_cast',{log,_}} ->
-            flush_log_events(N+1, Limit);
-        {'$gen_call',{Pid,MRef},{log,_}} ->
-            Pid ! {MRef, dropped},
-            flush_log_events(N+1, Limit)
-    after
-        0 -> N
-    end.
+    #{filesync_repeat_interval => ?FILESYNC_REPEAT_INTERVAL}.
 
 set_repeated_filesync(#{filesync_repeat_interval:=FSyncInt} = State)
   when is_integer(FSyncInt) ->
@@ -752,51 +459,5 @@ cancel_repeated_filesync(State) ->
         error ->
             State
     end.
-
-stop_or_restart(Name, {shutdown,Reason={overloaded,_Name,_QLen,_Mem}},
-                #{overload_kill_restart_after := RestartAfter}) ->
-    %% If we're terminating because of an overload situation (see
-    %% kill_if_choked/4), we need to remove the handler and set a
-    %% restart timer. A separate process must perform this in order to
-    %% avoid deadlock.
-    HandlerPid = self(),
-    ConfigResult = logger:get_handler_config(Name),
-    RemoveAndRestart =
-        fun() ->
-                MRef = erlang:monitor(process, HandlerPid),
-                receive
-                    {'DOWN',MRef,_,_,_} ->
-                        ok
-                after 30000 ->
-                        error_notify(Reason),
-                        exit(HandlerPid, kill)
-                end,
-                case ConfigResult of
-                    {ok,#{module:=HMod}=HConfig0} when is_integer(RestartAfter) ->
-                        _ = logger:remove_handler(Name),
-                        HConfig = try HMod:filter_config(HConfig0)
-                                  catch _:_ -> HConfig0
-                                  end,
-                        _ = timer:apply_after(RestartAfter, logger, add_handler,
-                                              [Name,HMod,HConfig]);
-                    {ok,_} ->
-                        _ = logger:remove_handler(Name);
-                    {error,CfgReason} when is_integer(RestartAfter) ->
-                        error_notify({Name,restart_impossible,CfgReason});
-                    {error,_} ->
-                        ok
-                end
-        end,
-    spawn(RemoveAndRestart),
-    ok;
-stop_or_restart(_Name, _Reason, _State) ->
-    ok.
-
-overload_levels_ok(HandlerConfig) ->
-    SMQL = maps:get(sync_mode_qlen, HandlerConfig, ?SYNC_MODE_QLEN),
-    DMQL = maps:get(drop_mode_qlen, HandlerConfig, ?DROP_MODE_QLEN),
-    FQL = maps:get(flush_qlen, HandlerConfig, ?FLUSH_QLEN),
-    (DMQL > 1) andalso (SMQL =< DMQL) andalso (DMQL =< FQL).
-
 error_notify(Term) ->
     ?internal_log(error, Term).
diff --git a/lib/kernel/src/logger_h_common.hrl b/lib/kernel/src/logger_h_common.hrl
index 261b0a6246..004a61d9d9 100644
--- a/lib/kernel/src/logger_h_common.hrl
+++ b/lib/kernel/src/logger_h_common.hrl
@@ -1,50 +1,22 @@
-
-%%%-----------------------------------------------------------------
-%%% Overload protection configuration
-
-%%! *** NOTE *** 
-%%! It's important that:
-%%! SYNC_MODE_QLEN =< DROP_MODE_QLEN =< FLUSH_QLEN
-%%! and that DROP_MODE_QLEN >= 2.
-%%! Otherwise the handler could end up in drop mode with no new
-%%! log requests to process. This would cause all future requests
-%%! to be dropped (no switch to async mode would ever take place).
-
-%% This specifies the message_queue_len value where the log
-%% requests switch from asynchronous casts to synchronous calls.
--define(SYNC_MODE_QLEN, 10).
-%% Above this message_queue_len, log requests will be dropped,
-%% i.e. no log requests get sent to the handler process.
--define(DROP_MODE_QLEN, 200).
-%% Above this message_queue_len, the handler process will flush
-%% its mailbox and only leave this number of messages in it.
--define(FLUSH_QLEN, 1000).
-
-%% Never flush more than this number of messages in one go,
-%% or the handler will be unresponsive for seconds (keep this
-%% number as large as possible or the mailbox could grow large).
--define(FLUSH_MAX_N, 5000).
-
-%% BURST_LIMIT_MAX_COUNT is the max number of log requests allowed
-%% to be written within a BURST_LIMIT_WINDOW_TIME time frame.
--define(BURST_LIMIT_ENABLE, true).
--define(BURST_LIMIT_MAX_COUNT, 500).
--define(BURST_LIMIT_WINDOW_TIME, 1000).
-
-%% This enables/disables the feature to automatically get the
-%% handler terminated if it gets too loaded (and can't keep up).
--define(OVERLOAD_KILL_ENABLE, false).
-%% If the message_queue_len goes above this size even after
-%% flushing has been performed, the handler is terminated.
--define(OVERLOAD_KILL_QLEN, 20000).
-%% If the memory usage exceeds this level
--define(OVERLOAD_KILL_MEM_SIZE, 3000000).
-
-%% This is the default time that the handler will wait before
-%% restarting and accepting new requests. The value 'infinity'
-%% disables restarts.
--define(OVERLOAD_KILL_RESTART_AFTER, 5000).
-%%-define(OVERLOAD_KILL_RESTART_AFTER, infinity).
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1997-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%
+%%
 
 %% The handler sends asynchronous write requests to the process
 %% controlling the i/o device, but every once in this interval
@@ -65,12 +37,6 @@
 -define(FILESYNC_REPEAT_INTERVAL, 5000).
 %%-define(FILESYNC_REPEAT_INTERVAL, no_repeat).
 
-%% This is the time after last message received that we think/hope
-%% that the handler has an empty mailbox (no new log request has
-%% come in).
--define(IDLE_DETECT_TIME_MSEC, 100).
--define(IDLE_DETECT_TIME_USEC, 100000).
-
 %% Default disk log option values
 -define(DISK_LOG_TYPE, wrap).
 -define(DISK_LOG_MAX_NO_FILES, 10).
@@ -83,43 +49,6 @@
         list_to_atom(lists:concat([MODULE,"_",Name]))).
 
 %%%-----------------------------------------------------------------
-%%% Overload protection macros
-
--define(timestamp(), erlang:monotonic_time(microsecond)).
-
--define(get_mode(Tid),
-        case ets:lookup(Tid, mode) of
-            [{mode,M}] -> M;
-            _          -> async
-        end).
-
--define(set_mode(Tid, M),
-        begin ets:insert(Tid, {mode,M}), M end).
-
--define(change_mode(Tid, M0, M1),
-        if M0 == M1 ->
-                M0;
-           true ->
-                ets:insert(Tid, {mode,M1}),
-                M1
-        end).
-
--define(min(X1, X2),
-        if X2 == undefined -> X1;
-           X2 < X1 -> X2;
-           true -> X1
-        end).
-
--define(max(X1, X2),
-        if 
-            X2 == undefined -> X1;
-            X2 > X1 -> X2;
-            true -> X1
-        end).
-
--define(diff_time(OS_T1, OS_T0), OS_T1-OS_T0).
-
-%%%-----------------------------------------------------------------
 %%% The test hook macros make it possible to observe and manipulate
 %%% internal handler functionality. When enabled, these macros will
 %%% slow down execution and therefore should not be include in code
@@ -183,7 +112,6 @@
               [{_,ERROR}] -> ERROR
           catch _:_       -> disk_log:sync(LOG) end).
 
-  -define(DEFAULT_CALL_TIMEOUT, 5000).
 
 -else.                                          % DEFAULTS!
   -define(TEST_HOOKS_TAB, undefined).
@@ -196,68 +124,4 @@
   -define(file_datasync(DEVICE), file:datasync(DEVICE)).
   -define(disk_log_write(LOG, MODE, DATA), disk_log_write(LOG, MODE, DATA)).
   -define(disk_log_sync(LOG), disk_log:sync(LOG)).
-  -define(DEFAULT_CALL_TIMEOUT, 10000).
--endif.
-
-%%%-----------------------------------------------------------------
-%%% These macros enable statistics counters in the state of the
-%%% handler which is useful for analysing the overload protection
-%%% behaviour. These counters should not be included in code to be
-%%% officially released (as some counters will grow very large
-%%% over time).
-
-%%-define(SAVE_STATS, true).
--ifdef(SAVE_STATS).
-  -define(merge_with_stats(STATE),
-          STATE#{flushes => 0, flushed => 0, drops => 0,
-                 burst_drops => 0, casts => 0, calls => 0,
-                 max_qlen => 0, max_time => 0}).
-
-  -define(update_max_qlen(QLEN, STATE),
-          begin #{max_qlen := QLEN0} = STATE,
-                STATE#{max_qlen => ?max(QLEN0,QLEN)} end).
-
-  -define(update_calls_or_casts(CALL_OR_CAST, INC, STATE),
-          case CALL_OR_CAST of
-              cast ->
-                  #{casts := CASTS0} = STATE,
-                  STATE#{casts => CASTS0+INC};
-              call ->
-                  #{calls := CALLS0} = STATE,
-                  STATE#{calls => CALLS0+INC}
-          end).
-
-  -define(update_max_time(TIME, STATE),
-          begin #{max_time := TIME0} = STATE,
-                STATE#{max_time => ?max(TIME0,TIME)} end).
-
-  -define(update_other(OTHER, VAR, INCVAL, STATE),
-          begin #{OTHER := VAR} = STATE,
-                STATE#{OTHER => VAR+INCVAL} end).
-          
--else.                                          % DEFAULT!
-  -define(merge_with_stats(STATE), STATE).
-  -define(update_max_qlen(_QLEN, STATE), STATE).
-  -define(update_calls_or_casts(_CALL_OR_CAST, _INC, STATE), STATE).
-  -define(update_max_time(_TIME, STATE), STATE).
-  -define(update_other(_OTHER, _VAR, _INCVAL, STATE), STATE).
--endif.
-
-%%%-----------------------------------------------------------------
-%%% These macros enable callbacks that make it possible to analyse
-%%% the overload protection behaviour from outside the handler
-%%% process (including dropped requests on the client side).
-%%% An external callback module (?OBSERVER_MOD) is required which
-%%% is not part of the kernel application. For this reason, these
-%%% callbacks should not be included in code to be officially released.
-
-%%-define(OBSERVER_MOD, logger_test).
--ifdef(OBSERVER_MOD).
-  -define(start_observation(NAME), ?OBSERVER:start_observation(NAME)).
-  -define(observe(NAME,EVENT), ?OBSERVER:observe(NAME,EVENT)).
-
--else.                                          % DEFAULT!
-  -define(start_observation(_NAME), ok).
-  -define(observe(_NAME,_EVENT), ok).
 -endif.
-%%! <---
diff --git a/lib/kernel/src/logger_internal.hrl b/lib/kernel/src/logger_internal.hrl
index d96a4ac78b..e53922e5d3 100644
--- a/lib/kernel/src/logger_internal.hrl
+++ b/lib/kernel/src/logger_internal.hrl
@@ -19,6 +19,7 @@
 %%
 -include_lib("kernel/include/logger.hrl").
 -define(LOGGER_TABLE,logger).
+-define(PROXY_KEY,'$proxy_config$').
 -define(PRIMARY_KEY,'$primary_config$').
 -define(HANDLER_KEY,'$handler_config$').
 -define(LOGGER_META_KEY,'$logger_metadata$').
@@ -40,12 +41,14 @@
 
 -define(DEFAULT_LOGGER_CALL_TIMEOUT, infinity).
 
--define(LOG_INTERNAL(Level,Report),
+-define(LOG_INTERNAL(Level,Report),?DO_LOG_INTERNAL(Level,[Report])).
+-define(LOG_INTERNAL(Level,Format,Args),?DO_LOG_INTERNAL(Level,[Format,Args])).
+-define(DO_LOG_INTERNAL(Level,Data),
         case logger:allow(Level,?MODULE) of
             true ->
                 %% Spawn this to avoid deadlocks
-                _ = spawn(logger,macro_log,[?LOCATION,Level,Report,
-                                            logger:add_default_metadata(#{})]),
+                _ = spawn(logger,macro_log,[?LOCATION,Level|Data]++
+                              [logger:add_default_metadata(#{})]),
                 ok;
             false ->
                 ok
diff --git a/lib/kernel/src/logger_olp.erl b/lib/kernel/src/logger_olp.erl
new file mode 100644
index 0000000000..8365383fe2
--- /dev/null
+++ b/lib/kernel/src/logger_olp.erl
@@ -0,0 +1,627 @@
+%%
+%% %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(logger_olp).
+-behaviour(gen_server).
+
+-include("logger_olp.hrl").
+-include("logger_internal.hrl").
+
+%% API
+-export([start_link/4, load/2, info/1, reset/1, stop/1, restart/1,
+         set_opts/2, get_opts/1, get_default_opts/0, get_pid/1,
+         call/2, cast/2, get_ref/0, get_ref/1]).
+
+%% gen_server and proc_lib callbacks
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+         terminate/2, code_change/3]).
+
+-define(OPT_KEYS,[sync_mode_qlen,
+                  drop_mode_qlen,
+                  flush_qlen,
+                  burst_limit_enable,
+                  burst_limit_max_count,
+                  burst_limit_window_time,
+                  overload_kill_enable,
+                  overload_kill_qlen,
+                  overload_kill_mem_size,
+                  overload_kill_restart_after]).
+
+-export_type([olp_ref/0, options/0]).
+
+-opaque olp_ref() :: {atom(),pid(),ets:tid()}.
+
+-type options() :: logger:olp_config().
+
+%%%-----------------------------------------------------------------
+%%% API
+
+-spec start_link(Name,Module,Args,Options) -> {ok,Pid,Olp} | {error,Reason} when
+      Name :: atom(),
+      Module :: module(),
+      Args :: term(),
+      Options :: options(),
+      Pid :: pid(),
+      Olp :: olp_ref(),
+      Reason :: term().
+start_link(Name,Module,Args,Options0) when is_map(Options0) ->
+    Options = maps:merge(get_default_opts(),Options0),
+    case check_opts(Options) of
+        ok ->
+            proc_lib:start_link(?MODULE,init,[[Name,Module,Args,Options]]);
+        Error ->
+            Error
+    end.
+
+-spec load(Olp, Msg) -> ok when
+      Olp :: olp_ref(),
+      Msg :: term().
+load({_Name,Pid,ModeRef},Msg) ->
+    %% If the process is getting overloaded, the message will be
+    %% synchronous instead of asynchronous (slows down the tempo of a
+    %% process causing much load). If the process is choked, drop mode
+    %% is set and no message is sent.
+    try ?get_mode(ModeRef) of
+        async ->
+            gen_server:cast(Pid, {'$olp_load',Msg});
+        sync ->
+            case call(Pid, {'$olp_load',Msg}) of
+                ok ->
+                    ok;
+                _Other ->
+                    %% dropped or {error,busy}
+                    ?observe(_Name,{dropped,1}),
+                    ok
+            end;
+        drop ->
+            ?observe(_Name,{dropped,1})
+    catch
+        %% if the ETS table doesn't exist (maybe because of a
+        %% process restart), we can only drop the event
+        _:_ -> ?observe(_Name,{dropped,1})
+    end,
+    ok.    
+
+-spec info(Olp) -> map() | {error, busy} when
+      Olp :: atom() | pid() | olp_ref().
+info(Olp) ->
+    call(Olp, info).
+
+-spec reset(Olp) -> ok | {error, busy} when
+      Olp :: atom() | pid() | olp_ref().
+reset(Olp) ->
+    call(Olp, reset).
+
+-spec stop(Olp) -> ok when
+      Olp :: atom() | pid() | olp_ref().
+stop({_Name,Pid,_ModRef}) ->
+    stop(Pid);
+stop(Pid) ->
+    _ = gen_server:call(Pid, stop),
+    ok.
+
+-spec set_opts(Olp, Opts) -> ok | {error,term()} | {error, busy} when
+      Olp :: atom() | pid() | olp_ref(),
+      Opts :: options().
+set_opts(Olp, Opts) ->
+    call(Olp, {set_opts,Opts}).
+
+-spec get_opts(Olp) -> options() | {error, busy} when
+      Olp :: atom() | pid() | olp_ref().
+get_opts(Olp) ->
+    call(Olp, get_opts).
+
+-spec get_default_opts() -> options().
+get_default_opts() ->
+    #{sync_mode_qlen              => ?SYNC_MODE_QLEN,
+      drop_mode_qlen              => ?DROP_MODE_QLEN,
+      flush_qlen                  => ?FLUSH_QLEN,
+      burst_limit_enable          => ?BURST_LIMIT_ENABLE,
+      burst_limit_max_count       => ?BURST_LIMIT_MAX_COUNT,
+      burst_limit_window_time     => ?BURST_LIMIT_WINDOW_TIME,
+      overload_kill_enable        => ?OVERLOAD_KILL_ENABLE,
+      overload_kill_qlen          => ?OVERLOAD_KILL_QLEN,
+      overload_kill_mem_size      => ?OVERLOAD_KILL_MEM_SIZE,
+      overload_kill_restart_after => ?OVERLOAD_KILL_RESTART_AFTER}.
+
+-spec restart(fun(() -> any())) -> ok.
+restart(Fun) ->
+    Result =
+        try Fun()
+        catch C:R:S ->
+                {error,{restart_failed,Fun,C,R,S}}
+        end,
+    ?LOG_INTERNAL(debug,[{logger_olp,restart},
+                         {result,Result}]),
+    ok.
+
+-spec get_ref() -> olp_ref().
+get_ref() ->
+    get(olp_ref).
+
+-spec get_ref(PidOrName) -> olp_ref() | {error, busy} when
+      PidOrName :: pid() | atom().
+get_ref(PidOrName) ->
+    call(PidOrName,get_ref).
+
+-spec get_pid(olp_ref()) -> pid().
+get_pid({_Name,Pid,_ModeRef}) ->
+    Pid.
+
+%%%===================================================================
+%%% gen_server callbacks
+%%%===================================================================
+
+init([Name,Module,Args,Options]) ->
+    register(Name, self()),
+    process_flag(message_queue_data, off_heap),
+
+    ?start_observation(Name),
+
+    try ets:new(Name, [public]) of
+        ModeRef ->
+            OlpRef = {Name,self(),ModeRef},
+            put(olp_ref,OlpRef),
+            try Module:init(Args) of
+                {ok,CBState} ->
+                    ?set_mode(ModeRef, async),
+                    T0 = ?timestamp(),
+                    proc_lib:init_ack({ok,self(),OlpRef}),
+                    %% Storing options in state to avoid copying
+                    %% (sending) the option data with each message
+                    State0 = ?merge_with_stats(
+                                Options#{id => Name,
+                                         idle=> true,
+                                         module => Module,
+                                         mode_ref => ModeRef,
+                                         mode => async,
+                                         last_qlen => 0,
+                                         last_load_ts => T0,
+                                         burst_win_ts => T0,
+                                         burst_msg_count => 0,
+                                         cb_state => CBState}),
+                    State = reset_restart_flag(State0),
+                    gen_server:enter_loop(?MODULE, [], State);
+                Error ->
+                    _ = ets:delete(ModeRef),
+                    unregister(Name),
+                    proc_lib:init_ack(Error)
+            catch
+                _:Error ->
+                    _ = ets:delete(ModeRef),
+                    unregister(Name),
+                    proc_lib:init_ack(Error)
+            end
+    catch
+        _:Error ->
+            unregister(Name),
+            proc_lib:init_ack(Error)
+    end.
+
+%% This is the synchronous load event.
+handle_call({'$olp_load', Msg}, _From, State) ->
+    {Result,State1} = do_load(Msg, call, State#{idle=>false}),
+    %% Result == ok | dropped
+    reply_return(Result,State1);
+
+handle_call(get_ref,_From,#{id:=Name,mode_ref:=ModeRef}=State) ->
+    reply_return({Name,self(),ModeRef},State);
+
+handle_call({set_opts,Opts0},_From,State) ->
+    Opts = maps:merge(maps:with(?OPT_KEYS,State),Opts0),
+    case check_opts(Opts) of
+        ok ->
+            reply_return(ok, maps:merge(State,Opts));
+        Error ->
+            reply_return(Error, State)
+    end;
+
+handle_call(get_opts,_From,State) ->
+    reply_return(maps:with(?OPT_KEYS,State), State);
+
+handle_call(info, _From, State) ->
+    reply_return(State, State);
+
+handle_call(reset, _From, #{module:=Module,cb_state:=CBState}=State) ->
+    State1 = ?merge_with_stats(State),
+    CBState1 = try_callback_call(Module,reset_state,[CBState],CBState),
+    reply_return(ok, State1#{idle => true,
+                             last_qlen => 0,
+                             last_load_ts => ?timestamp(),
+                             cb_state => CBState1});
+
+handle_call(stop, _From, State) ->
+    {stop, {shutdown,stopped}, ok, State};
+
+handle_call(Msg, From, #{module:=Module,cb_state:=CBState}=State) ->
+    case try_callback_call(Module,handle_call,[Msg, From, CBState]) of
+        {reply,Reply,CBState1} ->
+            reply_return(Reply,State#{cb_state=>CBState1});
+        {noreply,CBState1} ->
+            noreply_return(State#{cb_state=>CBState1});
+        {stop, Reason, Reply, CBState1} ->
+            {stop, Reason, Reply, State#{cb_state=>CBState1}};
+        {stop, Reason, CBState1} ->
+            {stop, Reason, State#{cb_state=>CBState1}}
+    end.
+
+%% This is the asynchronous load event.
+handle_cast({'$olp_load', Msg}, State) ->
+    {_Result,State1} = do_load(Msg, cast, State#{idle=>false}),
+    noreply_return(State1);
+
+handle_cast(Msg, #{module:=Module, cb_state:=CBState} = State) ->
+    case try_callback_call(Module,handle_cast,[Msg, CBState]) of
+        {noreply,CBState1} ->
+            noreply_return(State#{cb_state=>CBState1});
+        {stop, Reason, CBState1} ->
+            {stop, Reason, State#{cb_state=>CBState1}}
+    end.
+
+handle_info(timeout, #{mode_ref:=_ModeRef, mode:=Mode} = State) ->
+    State1 = notify(idle,State),
+    State2 = maybe_notify_mode_change(async,State1),
+    {noreply, State2#{idle => true,
+                      mode => ?change_mode(_ModeRef, Mode, async),
+                      burst_msg_count => 0}};
+handle_info(Msg, #{module := Module, cb_state := CBState} = State) ->
+    case try_callback_call(Module,handle_info,[Msg, CBState]) of
+        {noreply,CBState1} ->
+            noreply_return(State#{cb_state=>CBState1});
+        {stop, Reason, CBState1} ->
+            {stop, Reason, State#{cb_state=>CBState1}};
+        {load,CBState1} ->
+            {_,State1} = do_load(Msg, cast, State#{idle=>false,
+                                                   cb_state=>CBState1}),
+            noreply_return(State1)
+    end.
+
+terminate({shutdown,{overloaded,_QLen,_Mem}},
+          #{id:=Name, module := Module, cb_state := CBState,
+            overload_kill_restart_after := RestartAfter} = State) ->
+    %% We're terminating because of an overload situation (see
+    %% kill_if_choked/3).
+    unregister(Name), %%!!!! to avoid error printout of callback crashed on stop
+    case try_callback_call(Module,terminate,[overloaded,CBState],ok) of
+        {ok,Fun} when is_function(Fun,0), is_integer(RestartAfter) ->
+            set_restart_flag(State),
+            _ = timer:apply_after(RestartAfter,?MODULE,restart,[Fun]),
+            ok;
+        _ ->
+            ok
+    end;
+terminate(Reason, #{id:=Name, module:=Module, cb_state:=CBState}) ->
+    _ = try_callback_call(Module,terminate,[Reason,CBState],ok),
+    unregister(Name),
+    ok.
+
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+
+%%%-----------------------------------------------------------------
+%%% Internal functions
+-spec call(Olp, term()) -> term() | {error,busy} when
+      Olp :: atom() | pid() | olp_ref().
+call({_Name, Pid, _ModeRef},Msg) ->
+    call(Pid, Msg);
+call(Server, Msg) ->
+    try
+        gen_server:call(Server, Msg)
+    catch
+        _:{timeout,_} -> {error,busy}
+    end.
+
+-spec cast(olp_ref(),term()) -> ok.
+cast({_Name, Pid, _ModeRef},Msg) ->
+    gen_server:cast(Pid, Msg).
+
+%% check for overload between every event (and set Mode to async,
+%% sync or drop accordingly), but never flush the whole mailbox
+%% before LogWindowSize events have been handled
+do_load(Msg, CallOrCast, State) ->
+    T1 = ?timestamp(),
+    State1 = ?update_time(T1,State),
+
+    %% check if the process is getting overloaded, or if it's
+    %% recovering from overload (the check must be done for each
+    %% event to react quickly to large bursts of events and
+    %% to ensure that the handler can never end up in drop mode
+    %% with an empty mailbox, which would stop operation)
+    {Mode1,QLen,Mem,State2} = check_load(State1),
+
+    %% kill the handler if it can't keep up with the load
+    kill_if_choked(QLen, Mem, State2),
+
+    if Mode1 == flush ->
+            flush(T1, State2);
+       true ->
+            handle_load(Mode1, T1, Msg, CallOrCast, State2)
+    end.
+
+%% this function is called by do_load/3 after an overload check
+%% has been performed, where QLen > FlushQLen
+flush(T1, State=#{id := _Name, mode := Mode, last_load_ts := _T0, mode_ref := ModeRef}) ->
+    %% flush load messages in the mailbox (a limited number in order
+    %% to not cause long delays)
+    NewFlushed = flush_load(?FLUSH_MAX_N),
+
+    %% write info in log about flushed messages
+    State1=notify({flushed,NewFlushed},State),
+
+    %% because of the receive loop when flushing messages, the
+    %% handler will be scheduled out often and the mailbox could
+    %% grow very large, so we'd better check the queue again here
+    {_,QLen1} = process_info(self(), message_queue_len),
+    ?observe(_Name,{max_qlen,QLen1}),
+
+    %% Add 1 for the current log event
+    ?observe(_Name,{flushed,NewFlushed+1}),
+
+    State2 = ?update_max_time(?diff_time(T1,_T0),State1),
+    State3 = ?update_max_qlen(QLen1,State2),
+    State4 = maybe_notify_mode_change(async,State3),
+    {dropped,?update_other(flushed,FLUSHED,NewFlushed,
+                           State4#{mode => ?change_mode(ModeRef,Mode,async),
+                                   last_qlen => QLen1,
+                                   last_load_ts => T1})}.
+
+%% this function is called to actually handle the message
+handle_load(Mode, T1, Msg, _CallOrCast,
+      State = #{id := _Name,
+                module := Module,
+                cb_state := CBState,
+                last_qlen := LastQLen,
+                last_load_ts := _T0}) ->
+    %% check if we need to limit the number of writes
+    %% during a burst of log events
+    {DoWrite,State1} = limit_burst(State),
+
+    {Result,LastQLen1,CBState1} =
+        if DoWrite ->
+                ?observe(_Name,{_CallOrCast,1}),
+                CBS = try_callback_call(Module,handle_load,[Msg,CBState]),
+                {ok,element(2, process_info(self(), message_queue_len)),CBS};
+           true ->
+                ?observe(_Name,{flushed,1}),
+                {dropped,LastQLen,CBState}
+        end,
+    State2 = State1#{cb_state=>CBState1},
+
+    State3 = State2#{mode => Mode},
+    State4 = ?update_calls_or_casts(_CallOrCast,1,State3),
+    State5 = ?update_max_qlen(LastQLen1,State4),
+    State6 =
+        ?update_max_time(?diff_time(T1,_T0),
+                         State5#{last_qlen := LastQLen1,
+                                 last_load_ts => T1}),
+    State7 = case Result of
+                 ok ->
+                     S = ?update_freq(T1,State6),
+                     ?update_other(writes,WRITES,1,S);
+                 _ ->
+                     State6
+             end,
+    {Result,State7}.
+
+
+%%%-----------------------------------------------------------------
+%%% Check that the options are valid
+check_opts(Options) when is_map(Options) ->
+    case do_check_opts(maps:to_list(Options)) of
+        ok ->
+            case overload_levels_ok(Options) of
+                true ->
+                    ok;
+                false ->
+                    Faulty = maps:with([sync_mode_qlen,
+                                        drop_mode_qlen,
+                                        flush_qlen],Options),
+                    {error,{invalid_olp_levels,Faulty}}
+            end;
+        {error,Key,Value} ->
+            {error,{invalid_olp_config,#{Key=>Value}}}
+    end.
+
+do_check_opts([{sync_mode_qlen,N}|Options]) when is_integer(N) ->
+    do_check_opts(Options);
+do_check_opts([{drop_mode_qlen,N}|Options]) when is_integer(N) ->
+    do_check_opts(Options);
+do_check_opts([{flush_qlen,N}|Options]) when is_integer(N) ->
+    do_check_opts(Options);
+do_check_opts([{burst_limit_enable,Bool}|Options]) when is_boolean(Bool) ->
+    do_check_opts(Options);
+do_check_opts([{burst_limit_max_count,N}|Options]) when is_integer(N) ->
+    do_check_opts(Options);
+do_check_opts([{burst_limit_window_time,N}|Options]) when is_integer(N) ->
+    do_check_opts(Options);
+do_check_opts([{overload_kill_enable,Bool}|Options]) when is_boolean(Bool) ->
+    do_check_opts(Options);
+do_check_opts([{overload_kill_qlen,N}|Options]) when is_integer(N) ->
+    do_check_opts(Options);
+do_check_opts([{overload_kill_mem_size,N}|Options]) when is_integer(N) ->
+    do_check_opts(Options);
+do_check_opts([{overload_kill_restart_after,NorA}|Options])
+  when is_integer(NorA); NorA == infinity ->
+    do_check_opts(Options);
+do_check_opts([{Key,Value}|_]) ->
+    {error,Key,Value};
+do_check_opts([]) ->
+    ok.
+
+set_restart_flag(#{id := Name, module := Module}) ->
+    Flag = list_to_atom(lists:concat([Module,"_",Name,"_restarting"])),
+    spawn(fun() ->
+                  register(Flag, self()),
+                  timer:sleep(infinity)
+          end),
+    ok.
+
+reset_restart_flag(#{id := Name, module := Module} = State) ->
+    Flag = list_to_atom(lists:concat([Module,"_",Name,"_restarting"])),
+    case whereis(Flag) of
+        undefined ->
+            State;
+        Pid ->
+            exit(Pid, kill),
+            notify(restart,State)
+    end.
+
+check_load(State = #{id:=_Name, mode_ref := ModeRef, mode := Mode,
+                     sync_mode_qlen := SyncModeQLen,
+                     drop_mode_qlen := DropModeQLen,
+                     flush_qlen := FlushQLen}) ->
+    {_,Mem} = process_info(self(), memory),
+    ?observe(_Name,{max_mem,Mem}),
+    {_,QLen} = process_info(self(), message_queue_len),
+    ?observe(_Name,{max_qlen,QLen}),
+    %% When the handler process gets scheduled in, it's impossible
+    %% to predict the QLen. We could jump "up" arbitrarily from say
+    %% async to sync, async to drop, sync to flush, etc. However, when
+    %% the handler process manages the log events (without flushing),
+    %% one after the other, we will move "down" from drop to sync and
+    %% from sync to async. This way we don't risk getting stuck in
+    %% drop or sync mode with an empty mailbox.
+    {Mode1,_NewDrops,_NewFlushes} =
+        if
+            QLen >= FlushQLen ->
+                {flush, 0,1};
+            QLen >= DropModeQLen ->
+                %% Note that drop mode will force load messages to
+                %% be dropped on the client side (never sent to
+                %% the olp process).
+                IncDrops = if Mode == drop -> 0; true -> 1 end,
+                {?change_mode(ModeRef, Mode, drop), IncDrops,0};
+            QLen >= SyncModeQLen ->
+                {?change_mode(ModeRef, Mode, sync), 0,0};
+            true ->
+                {?change_mode(ModeRef, Mode, async), 0,0}
+        end,
+    State1 = ?update_other(drops,DROPS,_NewDrops,State),
+    State2 = ?update_max_qlen(QLen,State1),
+    State3 = ?update_max_mem(Mem,State2),
+    State4 = maybe_notify_mode_change(Mode1,State3),
+    {Mode1, QLen, Mem,
+     ?update_other(flushes,FLUSHES,_NewFlushes,
+                   State4#{last_qlen => QLen})}.
+
+limit_burst(#{burst_limit_enable := false}=State) ->
+     {true,State};
+limit_burst(#{burst_win_ts := BurstWinT0,
+              burst_msg_count := BurstMsgCount,
+              burst_limit_window_time := BurstLimitWinTime,
+              burst_limit_max_count := BurstLimitMaxCnt} = State) ->
+    if (BurstMsgCount >= BurstLimitMaxCnt) -> 
+            %% the limit for allowed messages has been reached
+            BurstWinT1 = ?timestamp(),
+            case ?diff_time(BurstWinT1,BurstWinT0) of
+                BurstCheckTime when BurstCheckTime < (BurstLimitWinTime*1000) ->
+                    %% we're still within the burst time frame
+                    {false,?update_other(burst_drops,BURSTS,1,State)};
+                _BurstCheckTime ->
+                    %% burst time frame passed, reset counters
+                    {true,State#{burst_win_ts => BurstWinT1,
+                                 burst_msg_count => 0}}
+            end;
+       true ->
+            %% the limit for allowed messages not yet reached
+            {true,State#{burst_win_ts => BurstWinT0,
+                         burst_msg_count => BurstMsgCount+1}}
+    end.
+
+kill_if_choked(QLen, Mem, #{overload_kill_enable   := KillIfOL,
+                            overload_kill_qlen     := OLKillQLen,
+                            overload_kill_mem_size := OLKillMem}) ->
+    if KillIfOL andalso
+       ((QLen > OLKillQLen) orelse (Mem > OLKillMem)) ->
+            exit({shutdown,{overloaded,QLen,Mem}});
+       true ->
+            ok
+    end.
+
+flush_load(Limit) ->
+    process_flag(priority, high),
+    Flushed = flush_load(0, Limit),
+    process_flag(priority, normal),
+    Flushed.
+
+flush_load(Limit, Limit) ->
+    Limit;
+flush_load(N, Limit) ->
+    %% flush log events but leave other events, such as info, reset
+    %% and stop, so that these have a chance to be processed even
+    %% under heavy load
+    receive
+        {'$gen_cast',{'$olp_load',_}} ->
+            flush_load(N+1, Limit);
+        {'$gen_call',{Pid,MRef},{'$olp_load',_}} ->
+            Pid ! {MRef, dropped},
+            flush_load(N+1, Limit);
+        {log,_,_,_,_} ->
+            flush_load(N+1, Limit);
+        {log,_,_,_} ->
+            flush_load(N+1, Limit)            
+    after
+        0 -> N
+    end.
+
+overload_levels_ok(Options) ->
+    SMQL = maps:get(sync_mode_qlen, Options, ?SYNC_MODE_QLEN),
+    DMQL = maps:get(drop_mode_qlen, Options, ?DROP_MODE_QLEN),
+    FQL = maps:get(flush_qlen, Options, ?FLUSH_QLEN),
+    (DMQL > 1) andalso (SMQL =< DMQL) andalso (DMQL =< FQL).
+
+maybe_notify_mode_change(drop,#{mode:=Mode0}=State)
+  when Mode0=/=drop ->
+    notify({mode_change,Mode0,drop},State);
+maybe_notify_mode_change(Mode1,#{mode:=drop}=State)
+  when Mode1==async; Mode1==sync ->
+    notify({mode_change,drop,Mode1},State);
+maybe_notify_mode_change(_,State) ->
+    State.
+
+notify(Note,#{module:=Module,cb_state:=CBState}=State) ->
+    CBState1 = try_callback_call(Module,notify,[Note,CBState],CBState),
+    State#{cb_state=>CBState1}.
+
+try_callback_call(Module, Function, Args) ->
+    try_callback_call(Module, Function, Args, '$no_default_return').
+
+try_callback_call(Module, Function, Args, DefRet) ->
+    try apply(Module, Function, Args)
+    catch
+        throw:R -> R;
+        error:undef:S when DefRet=/='$no_default_return' ->
+            case S of
+                [{Module,Function,Args,_}|_] ->
+                    DefRet;
+                _ ->
+                    erlang:raise(error,undef,S)
+            end
+    end.
+
+noreply_return(#{idle:=true}=State) ->
+    {noreply,State};
+noreply_return(#{idle:=false}=State) ->
+    {noreply,State,?IDLE_DETECT_TIME}.
+
+reply_return(Reply,#{idle:=true}=State) ->
+    {reply,Reply,State};
+reply_return(Reply,#{idle:=false}=State) ->
+    {reply,Reply,State,?IDLE_DETECT_TIME}.
diff --git a/lib/kernel/src/logger_olp.hrl b/lib/kernel/src/logger_olp.hrl
new file mode 100644
index 0000000000..d68b5c048d
--- /dev/null
+++ b/lib/kernel/src/logger_olp.hrl
@@ -0,0 +1,185 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1997-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%
+%%
+
+%%%-----------------------------------------------------------------
+%%% Overload protection configuration
+
+%%! *** NOTE *** 
+%%! It's important that:
+%%! SYNC_MODE_QLEN =< DROP_MODE_QLEN =< FLUSH_QLEN
+%%! and that DROP_MODE_QLEN >= 2.
+%%! Otherwise the process could end up in drop mode with no new
+%%! log requests to process. This would cause all future requests
+%%! to be dropped (no switch to async mode would ever take place).
+
+%% This specifies the message_queue_len value where the log
+%% requests switch from asynchronous casts to synchronous calls.
+-define(SYNC_MODE_QLEN, 10).
+%% Above this message_queue_len, log requests will be dropped,
+%% i.e. no log requests get sent to the process.
+-define(DROP_MODE_QLEN, 200).
+%% Above this message_queue_len, the process will flush its mailbox
+%% and only leave this number of messages in it.
+-define(FLUSH_QLEN, 1000).
+
+%% Never flush more than this number of messages in one go, or the
+%% process will be unresponsive for seconds (keep this number as large
+%% as possible or the mailbox could grow large).
+-define(FLUSH_MAX_N, 5000).
+
+%% BURST_LIMIT_MAX_COUNT is the max number of log requests allowed
+%% to be written within a BURST_LIMIT_WINDOW_TIME time frame.
+-define(BURST_LIMIT_ENABLE, true).
+-define(BURST_LIMIT_MAX_COUNT, 500).
+-define(BURST_LIMIT_WINDOW_TIME, 1000).
+
+%% This enables/disables the feature to automatically terminate the
+%% process if it gets too loaded (and can't keep up).
+-define(OVERLOAD_KILL_ENABLE, false).
+%% If the message_queue_len goes above this size even after
+%% flushing has been performed, the process is terminated.
+-define(OVERLOAD_KILL_QLEN, 20000).
+%% If the memory usage exceeds this level, the process is terminated.
+-define(OVERLOAD_KILL_MEM_SIZE, 3000000).
+
+%% This is the default time to wait before restarting and accepting
+%% new requests. The value 'infinity' disables restarts.
+-define(OVERLOAD_KILL_RESTART_AFTER, 5000).
+
+%% This is the time in milliseconds after last load message received
+%% that we notify the callback about being idle.
+-define(IDLE_DETECT_TIME, 100).
+
+%%%-----------------------------------------------------------------
+%%% Overload protection macros
+
+-define(timestamp(), erlang:monotonic_time(microsecond)).
+
+-define(get_mode(Tid),
+        case ets:lookup(Tid, mode) of
+            [{mode,M}] -> M;
+            _          -> async
+        end).
+
+-define(set_mode(Tid, M),
+        begin ets:insert(Tid, {mode,M}), M end).
+
+-define(change_mode(Tid, M0, M1),
+        if M0 == M1 ->
+                M0;
+           true ->
+                ets:insert(Tid, {mode,M1}),
+                M1
+        end).
+
+-define(max(X1, X2),
+        if 
+            X2 == undefined -> X1;
+            X2 > X1 -> X2;
+            true -> X1
+        end).
+
+-define(diff_time(OS_T1, OS_T0), OS_T1-OS_T0).
+
+%%%-----------------------------------------------------------------
+%%% These macros enable statistics counters in the state of the
+%%% process, which is useful for analysing the overload protection
+%%% behaviour. These counters should not be included in code to be
+%%% officially released (as some counters will grow very large over
+%%% time).
+
+%% -define(SAVE_STATS, true).
+-ifdef(SAVE_STATS).
+  -define(merge_with_stats(STATE),
+          begin
+              TIME = ?timestamp(),
+              STATE#{start => TIME, time => {TIME,0},
+                     flushes => 0, flushed => 0, drops => 0,
+                     burst_drops => 0, casts => 0, calls => 0,
+                     writes => 0, max_qlen => 0, max_time => 0,
+                     max_mem => 0, freq => {TIME,0,0}} end).
+
+  -define(update_max_qlen(QLEN, STATE),
+          begin #{max_qlen := QLEN0} = STATE,
+                STATE#{max_qlen => ?max(QLEN0,QLEN)} end).
+
+  -define(update_max_mem(MEM, STATE),
+          begin #{max_mem := MEM0} = STATE,
+                STATE#{max_mem => ?max(MEM0,MEM)} end).
+
+  -define(update_calls_or_casts(CALL_OR_CAST, INC, STATE),
+          case CALL_OR_CAST of
+              cast ->
+                  #{casts := CASTS0} = STATE,
+                  STATE#{casts => CASTS0+INC};
+              call ->
+                  #{calls := CALLS0} = STATE,
+                  STATE#{calls => CALLS0+INC}
+          end).
+
+  -define(update_max_time(TIME, STATE),
+          begin #{max_time := TIME0} = STATE,
+                STATE#{max_time => ?max(TIME0,TIME)} end).
+
+  -define(update_other(OTHER, VAR, INCVAL, STATE),
+          begin #{OTHER := VAR} = STATE,
+                STATE#{OTHER => VAR+INCVAL} end).
+
+  -define(update_freq(TIME,STATE),
+          begin
+              case STATE of
+                  #{freq := {START, 49, _}} ->
+                      STATE#{freq => {TIME, 0, trunc(1000000*50/(?diff_time(TIME,START)))}};
+                  #{freq := {START, N, FREQ}} ->
+                      STATE#{freq => {START, N+1, FREQ}}
+              end end).
+
+  -define(update_time(TIME,STATE),
+          begin #{start := START} = STATE,
+                STATE#{time => {TIME,trunc((?diff_time(TIME,START))/1000000)}} end).
+
+-else.                                          % DEFAULT!
+  -define(merge_with_stats(STATE), STATE).
+  -define(update_max_qlen(_QLEN, STATE), STATE).
+  -define(update_max_mem(_MEM, STATE), STATE).
+  -define(update_calls_or_casts(_CALL_OR_CAST, _INC, STATE), STATE).
+  -define(update_max_time(_TIME, STATE), STATE).
+  -define(update_other(_OTHER, _VAR, _INCVAL, STATE), STATE).
+  -define(update_freq(_TIME, STATE), STATE).
+  -define(update_time(_TIME, STATE), STATE).
+-endif.
+
+%%%-----------------------------------------------------------------
+%%% These macros enable callbacks that make it possible to analyse the
+%%% overload protection behaviour from outside the process (including
+%%% dropped requests on the client side). An external callback module
+%%% (?OBSERVER_MOD) is required which is not part of the kernel
+%%% application. For this reason, these callbacks should not be
+%%% included in code to be officially released.
+
+%%-define(OBSERVER_MOD, logger_test).
+-ifdef(OBSERVER_MOD).
+  -define(start_observation(NAME), ?OBSERVER:start_observation(NAME)).
+  -define(observe(NAME,EVENT), ?OBSERVER:observe(NAME,EVENT)).
+
+-else.                                          % DEFAULT!
+  -define(start_observation(_NAME), ok).
+  -define(observe(_NAME,_EVENT), ok).
+-endif.
diff --git a/lib/kernel/src/logger_proxy.erl b/lib/kernel/src/logger_proxy.erl
new file mode 100644
index 0000000000..24b293805c
--- /dev/null
+++ b/lib/kernel/src/logger_proxy.erl
@@ -0,0 +1,165 @@
+%%
+%% %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(logger_proxy).
+
+%% API
+-export([start_link/0, restart/0, log/1, child_spec/0, get_default_config/0]).
+
+%% logger_olp callbacks
+-export([init/1, handle_load/2, handle_info/2, terminate/2,
+         notify/2]).
+
+-include("logger_internal.hrl").
+
+-define(SERVER,?MODULE).
+
+%%%-----------------------------------------------------------------
+%%% API
+-spec log(RemoteLog) -> ok when
+      RemoteLog :: {remote,node(),LogEvent},
+      LogEvent :: {log,Level,Format,Args,Meta} |
+                  {log,Level,StringOrReport,Meta},
+      Level :: logger:level(),
+      Format :: io:format(),
+      Args :: list(term()),
+      StringOrReport :: unicode:chardata() | logger:report(),
+      Meta :: logger:metadata().
+log(RemoteLog) ->
+    Olp = persistent_term:get(?MODULE),
+    case logger_olp:get_pid(Olp) =:= self() of
+        true ->
+            %% This happens when the log event comes from the
+            %% emulator, and the group leader is on a remote node.
+            _ = handle_load(RemoteLog, no_state),
+            ok;
+        false ->
+            logger_olp:load(Olp, RemoteLog)
+    end.
+
+%% Called by supervisor
+-spec start_link() -> {ok,pid(),logger_olp:olp_ref()} | {error,term()}.
+start_link() ->
+    %% Notice that sync_mode is only used when logging to remote node,
+    %% i.e. when the log/2 API function is called.
+    %%
+    %% When receiving log events from the emulator or from a remote
+    %% node, the log event is sent as a message to this process, and
+    %% thus received directly in handle_info/2. This means that the
+    %% mode (async/sync/drop) is not read before the message is
+    %% sent. Thus sync mode is never entered, and drop mode is
+    %% implemented by setting the system_logger flag to undefined (see
+    %% notify/2)
+    %%
+    %% Burst limit is disabled, since this is only a proxy and we
+    %% don't want to limit bursts twice (here and in the handler).
+    logger_olp:start_link(?SERVER,?MODULE,[],logger:get_proxy_config()).
+
+%% Fun used for restarting this process after it has been killed due
+%% to overload (must set overload_kill_enable=>true in opts)
+restart() ->
+    case supervisor:start_child(logger_sup, child_spec()) of
+        {ok,_Pid,Olp} ->
+            {ok,Olp};
+        {error,{Reason,Ch}} when is_tuple(Ch), element(1,Ch)==child ->
+            {error,Reason};
+        Error ->
+            Error
+    end.
+
+%% Called internally and by logger_sup
+child_spec() ->
+    Name = ?SERVER,
+    #{id       => Name,
+      start    => {?MODULE, start_link, []},
+      restart  => temporary,
+      shutdown => 2000,
+      type     => worker,
+      modules  => [?MODULE]}.
+
+get_default_config() ->
+    OlpDefault = logger_olp:get_default_opts(),
+    OlpDefault#{sync_mode_qlen=>500,
+                drop_mode_qlen=>1000,
+                flush_qlen=>5000,
+                burst_limit_enable=>false}.
+
+%%%===================================================================
+%%% gen_server callbacks
+%%%===================================================================
+
+init([]) ->
+    process_flag(trap_exit, true),
+    _ = erlang:system_flag(system_logger,self()),
+    persistent_term:put(?MODULE,logger_olp:get_ref()),
+    {ok,no_state}.
+
+%% Log event to send to the node where the group leader of it's client resides
+handle_load({remote,Node,Log},State) ->
+    %% If the connection is overloaded (send_nosuspend returns false),
+    %% we drop the message.
+    _ = erlang:send_nosuspend({?SERVER,Node},Log),
+    State;
+%% Log event to log on this node
+handle_load({log,Level,Format,Args,Meta},State) ->
+    try_log([Level,Format,Args,Meta]),
+    State;
+handle_load({log,Level,Report,Meta},State) ->
+    try_log([Level,Report,Meta]),
+    State.
+
+%% Log event sent to this process e.g. from the emulator - it is really load
+handle_info(Log,State) when is_tuple(Log), element(1,Log)==log ->
+    {load,State}.
+
+terminate(overloaded, _State) ->
+    _ = erlang:system_flag(system_logger,undefined),
+    {ok,fun ?MODULE:restart/0};
+terminate(_Reason, _State) ->
+    _ = erlang:system_flag(system_logger,whereis(logger)),
+    ok.
+
+notify({mode_change,Mode0,Mode1},State) ->
+    _ = if Mode1=:=drop -> % entering drop mode
+                erlang:system_flag(system_logger,undefined);
+           Mode0=:=drop -> % leaving drop mode
+                erlang:system_flag(system_logger,self());
+           true ->
+                ok
+        end,
+    ?LOG_INTERNAL(notice,"~w switched from ~w to ~w mode",[?MODULE,Mode0,Mode1]),
+    State;
+notify({flushed,Flushed},State) ->
+    ?LOG_INTERNAL(notice, "~w flushed ~w log events",[?MODULE,Flushed]),
+    State;
+notify(restart,State) ->
+    ?LOG_INTERNAL(notice, "~w restarted", [?MODULE]),
+    State;
+notify(_Note,State) ->
+    State.
+
+%%%-----------------------------------------------------------------
+%%% Internal functions
+try_log(Args) ->
+    try apply(logger,log,Args)
+    catch C:R:S ->
+            ?LOG_INTERNAL(debug,[{?MODULE,log_failed},
+                                 {log,Args},
+                                 {reason,{C,R,S}}])
+    end.
diff --git a/lib/kernel/src/logger_server.erl b/lib/kernel/src/logger_server.erl
index b7735dbcf7..722246e82c 100644
--- a/lib/kernel/src/logger_server.erl
+++ b/lib/kernel/src/logger_server.erl
@@ -22,8 +22,7 @@
 -behaviour(gen_server).
 
 %% API
--export([start_link/0,
-         add_handler/3, remove_handler/1,
+-export([start_link/0, add_handler/3, remove_handler/1,
          add_filter/2, remove_filter/2,
          set_module_level/2, unset_module_level/0,
          unset_module_level/1, cache_module_level/1,
@@ -43,7 +42,7 @@
 -define(SERVER, logger).
 -define(LOGGER_SERVER_TAG, '$logger_cb_process').
 
--record(state, {tid, async_req, async_req_queue}).
+-record(state, {tid, async_req, async_req_queue, remote_logger}).
 
 %%%===================================================================
 %%% API
@@ -155,6 +154,8 @@ init([]) ->
     process_flag(trap_exit, true),
     put(?LOGGER_SERVER_TAG,true),
     Tid = logger_config:new(?LOGGER_TABLE),
+    %% Store initial proxy config. logger_proxy reads config from here at startup.
+    logger_config:create(Tid,proxy,logger_proxy:get_default_config()),
     PrimaryConfig = maps:merge(default_config(primary),
                               #{handlers=>[simple]}),
     logger_config:create(Tid,primary,PrimaryConfig),
@@ -221,6 +222,24 @@ handle_call({add_filter,Id,Filter}, _From,#state{tid=Tid}=State) ->
 handle_call({remove_filter,Id,FilterId}, _From, #state{tid=Tid}=State) ->
     Reply = do_remove_filter(Tid,Id,FilterId),
     {reply,Reply,State};
+handle_call({change_config,SetOrUpd,proxy,Config0},_From,#state{tid=Tid}=State) ->
+    Default =
+        case SetOrUpd of
+            set ->
+                logger_proxy:get_default_config();
+            update ->
+                {ok,OldConfig} = logger_config:get(Tid,proxy),
+                OldConfig
+        end,
+    Config = maps:merge(Default,Config0),
+    Reply =
+        case logger_olp:set_opts(logger_proxy,Config) of
+            ok ->
+                logger_config:set(Tid,proxy,Config);
+            Error ->
+                Error
+        end,
+    {reply,Reply,State};
 handle_call({change_config,SetOrUpd,primary,Config0}, _From,
             #state{tid=Tid}=State) ->
     {ok,#{handlers:=Handlers}=OldConfig} = logger_config:get(Tid,primary),
@@ -357,7 +376,7 @@ terminate(_Reason, _State) ->
 %%%===================================================================
 %%% Internal functions
 %%%===================================================================
-call(Request) ->
+call(Request) when is_tuple(Request) ->
     Action = element(1,Request),
     case get(?LOGGER_SERVER_TAG) of
         true when
@@ -369,6 +388,7 @@ call(Request) ->
             gen_server:call(?SERVER,Request,?DEFAULT_LOGGER_CALL_TIMEOUT)
     end.
 
+
 do_add_filter(Tid,Id,{FId,_} = Filter) ->
     case logger_config:get(Tid,Id) of
         {ok,Config} ->
@@ -413,11 +433,13 @@ default_config(Id,Module) ->
 sanity_check(Owner,Key,Value) ->
     sanity_check_1(Owner,[{Key,Value}]).
 
-sanity_check(HandlerId,Config) when is_map(Config) ->
-    sanity_check_1(HandlerId,maps:to_list(Config));
+sanity_check(Owner,Config) when is_map(Config) ->
+    sanity_check_1(Owner,maps:to_list(Config));
 sanity_check(_,Config) ->
     {error,{invalid_config,Config}}.
 
+sanity_check_1(proxy,_Config) ->
+    ok; % Details are checked by logger_olp:set_opts/2
 sanity_check_1(Owner,Config) when is_list(Config) ->
     try
         Type = get_type(Owner),
diff --git a/lib/kernel/src/logger_simple_h.erl b/lib/kernel/src/logger_simple_h.erl
index fe181722f3..a0d51dba25 100644
--- a/lib/kernel/src/logger_simple_h.erl
+++ b/lib/kernel/src/logger_simple_h.erl
@@ -69,7 +69,7 @@ log(#{msg:=_,meta:=#{time:=_}}=Log,_Config) ->
                 do_log(
                   #{level=>error,
                     msg=>{report,{error,simple_handler_process_dead}},
-                    meta=>#{time=>erlang:system_time(microsecond)}}),
+                    meta=>#{time=>logger:timestamp()}}),
                 do_log(Log);
             _ ->
                 ?MODULE ! {log,Log}
@@ -129,7 +129,7 @@ drop_msg(0) ->
 drop_msg(N) ->
     [#{level=>info,
        msg=>{"Simple handler buffer full, dropped ~w messages",[N]},
-       meta=>#{time=>erlang:system_time(microsecond)}}].
+       meta=>#{time=>logger:timestamp()}}].
 
 %%%-----------------------------------------------------------------
 %%% Internal
diff --git a/lib/kernel/src/logger_std_h.erl b/lib/kernel/src/logger_std_h.erl
index 63d1dbaba2..2b078ef091 100644
--- a/lib/kernel/src/logger_std_h.erl
+++ b/lib/kernel/src/logger_std_h.erl
@@ -26,16 +26,18 @@
 -include_lib("kernel/include/file.hrl").
 
 %% API
--export([info/1, filesync/1, reset/1]).
+-export([filesync/1]).
 
 %% logger_h_common callbacks
--export([init/2, check_config/4, reset_state/2,
+-export([init/2, check_config/4, config_changed/3, reset_state/2,
          filesync/3, write/4, handle_info/3, terminate/3]).
 
 %% logger callbacks
 -export([log/2, adding_handler/1, removing_handler/1, changing_config/3,
          filter_config/1]).
 
+-define(DEFAULT_CALL_TIMEOUT, 5000).
+
 %%%===================================================================
 %%% API
 %%%===================================================================
@@ -49,25 +51,6 @@
 filesync(Name) ->
     logger_h_common:filesync(?MODULE,Name).
 
-%%%-----------------------------------------------------------------
-%%%
--spec info(Name) -> Info | {error,Reason} when
-      Name :: atom(),
-      Info :: term(),
-      Reason :: handler_busy | {badarg,term()}.
-
-info(Name) ->
-    logger_h_common:info(?MODULE,Name).
-
-%%%-----------------------------------------------------------------
-%%%
--spec reset(Name) -> ok | {error,Reason} when
-      Name :: atom(),
-      Reason :: handler_busy | {badarg,term()}.
-
-reset(Name) ->
-    logger_h_common:reset(?MODULE,Name).
-
 %%%===================================================================
 %%% logger callbacks - just forward to logger_h_common
 %%%===================================================================
@@ -122,85 +105,171 @@ filter_config(Config) ->
 %%%===================================================================
 %%% logger_h_common callbacks
 %%%===================================================================
-init(Name, #{type := Type}) ->
-    case open_log_file(Name, Type) of
+init(Name, Config) ->
+    MyConfig = maps:with([type,file,modes,file_check,max_no_bytes,
+                          max_no_files,compress_on_rotate],Config),
+    case file_ctrl_start(Name, MyConfig) of
         {ok,FileCtrlPid} ->
-            {ok,#{type=>Type,file_ctrl_pid=>FileCtrlPid}};
+            {ok,MyConfig#{file_ctrl_pid=>FileCtrlPid}};
         Error ->
             Error
     end.
 
-check_config(_Name,set,undefined,NewHConfig) ->
-    check_config(maps:merge(get_default_config(),NewHConfig));
-check_config(_Name,SetOrUpdate,OldHConfig,NewHConfig0) ->
-    WriteOnce = maps:with([type],OldHConfig),
+check_config(Name,set,undefined,NewHConfig) ->
+    check_h_config(merge_default_config(Name,normalize_config(NewHConfig)));
+check_config(Name,SetOrUpdate,OldHConfig,NewHConfig0) ->
+    WriteOnce = maps:with([type,file,modes],OldHConfig),
     Default =
         case SetOrUpdate of
             set ->
                 %% Do not reset write-once fields to defaults
-                maps:merge(get_default_config(),WriteOnce);
+                merge_default_config(Name,WriteOnce);
             update ->
                 OldHConfig
         end,
 
-    NewHConfig = maps:merge(Default, NewHConfig0),
+    NewHConfig = maps:merge(Default, normalize_config(NewHConfig0)),
 
     %% Fail if write-once fields are changed
-    case maps:with([type],NewHConfig) of
+    case maps:with([type,file,modes],NewHConfig) of
         WriteOnce ->
-            check_config(NewHConfig);
+            check_h_config(NewHConfig);
         Other ->
             {error,{illegal_config_change,?MODULE,WriteOnce,Other}}
     end.
 
-check_config(#{type:=Type}=HConfig) ->
-    case check_h_config(maps:to_list(HConfig)) of
-        ok when is_atom(Type) ->
-            {ok,HConfig#{filesync_repeat_interval=>no_repeat}};
+check_h_config(HConfig) ->
+    case check_h_config(maps:get(type,HConfig),maps:to_list(HConfig)) of
         ok ->
-            {ok,HConfig};
+            {ok,fix_file_opts(HConfig)};
         {error,{Key,Value}} ->
             {error,{invalid_config,?MODULE,#{Key=>Value}}}
     end.
 
-check_h_config([{type,Type} | Config]) when Type == standard_io;
-                                            Type == standard_error ->
-    check_h_config(Config);
-check_h_config([{type,{file,File}} | Config]) when is_list(File) ->
-    check_h_config(Config);
-check_h_config([{type,{file,File,Modes}} | Config]) when is_list(File),
-                                                         is_list(Modes) ->
-    check_h_config(Config);
-check_h_config([Other | _]) ->
+check_h_config(Type,[{type,Type} | Config]) when Type =:= standard_io;
+                                                 Type =:= standard_error;
+                                                 Type =:= file ->
+    check_h_config(Type,Config);
+check_h_config(file,[{file,File} | Config]) when is_list(File) ->
+    check_h_config(file,Config);
+check_h_config(file,[{modes,Modes} | Config]) when is_list(Modes) ->
+    check_h_config(file,Config);
+check_h_config(file,[{max_no_bytes,Size} | Config])
+  when (is_integer(Size) andalso Size>0) orelse Size=:=infinity ->
+    check_h_config(file,Config);
+check_h_config(file,[{max_no_files,Num} | Config]) when is_integer(Num), Num>=0 ->
+    check_h_config(file,Config);
+check_h_config(file,[{compress_on_rotate,Bool} | Config]) when is_boolean(Bool) ->
+    check_h_config(file,Config);
+check_h_config(file,[{file_check,FileCheck} | Config])
+  when is_integer(FileCheck), FileCheck>=0 ->
+    check_h_config(file,Config);
+check_h_config(_Type,[Other | _]) ->
     {error,Other};
-check_h_config([]) ->
+check_h_config(_Type,[]) ->
     ok.
 
-get_default_config() ->
-     #{type => standard_io}.
+normalize_config(#{type:={file,File}}=HConfig) ->
+    normalize_config(HConfig#{type=>file,file=>File});
+normalize_config(#{type:={file,File,Modes}}=HConfig) ->
+    normalize_config(HConfig#{type=>file,file=>File,modes=>Modes});
+normalize_config(#{file:=File}=HConfig) ->
+    HConfig#{file=>filename:absname(File)};
+normalize_config(HConfig) ->
+    HConfig.
+
+merge_default_config(Name,#{type:=Type}=HConfig) ->
+    merge_default_config(Name,Type,HConfig);
+merge_default_config(Name,#{file:=_}=HConfig) ->
+    merge_default_config(Name,file,HConfig);
+merge_default_config(Name,HConfig) ->
+    merge_default_config(Name,standard_io,HConfig).
+
+merge_default_config(Name,Type,HConfig) ->
+    maps:merge(get_default_config(Name,Type),HConfig).
+
+get_default_config(Name,file) ->
+     #{type => file,
+       file => filename:absname(atom_to_list(Name)),
+       modes => [raw,append],
+       file_check => 0,
+       max_no_bytes => infinity,
+       max_no_files => 0,
+       compress_on_rotate => false};
+get_default_config(_Name,Type) ->
+     #{type => Type}.
+
+fix_file_opts(#{modes:=Modes}=HConfig) ->
+    HConfig#{modes=>fix_modes(Modes)};
+fix_file_opts(HConfig) ->
+    HConfig#{filesync_repeat_interval=>no_repeat}.
+
+fix_modes(Modes) ->
+    %% Ensure write|append|exclusive
+    Modes1 =
+        case [M || M <- Modes,
+                   lists:member(M,[write,append,exclusive])] of
+            [] -> [append|Modes];
+            _ -> Modes
+        end,
+    %% Ensure raw
+    Modes2 =
+        case lists:member(raw,Modes) of
+            false -> [raw|Modes1];
+            true -> Modes1
+        end,
+    %% Ensure delayed_write
+    case lists:partition(fun(delayed_write) -> true;
+                            ({delayed_write,_,_}) -> true;
+                            (_) -> false
+                         end, Modes2) of
+        {[],_} ->
+            [delayed_write|Modes2];
+        _ ->
+            Modes2
+    end.
+
+config_changed(_Name,
+               #{file_check:=FileCheck,
+                 max_no_bytes:=Size,
+                 max_no_files:=Count,
+                 compress_on_rotate:=Compress},
+               #{file_check:=FileCheck,
+                 max_no_bytes:=Size,
+                 max_no_files:=Count,
+                 compress_on_rotate:=Compress}=State) ->
+    State;
+config_changed(_Name,
+               #{file_check:=FileCheck,
+                 max_no_bytes:=Size,
+                 max_no_files:=Count,
+                 compress_on_rotate:=Compress},
+               #{file_ctrl_pid := FileCtrlPid} = State) ->
+    FileCtrlPid ! {update_config,#{file_check=>FileCheck,
+                                   max_no_bytes=>Size,
+                                   max_no_files=>Count,
+                                   compress_on_rotate=>Compress}},
+    State#{file_check:=FileCheck,
+           max_no_bytes:=Size,
+           max_no_files:=Count,
+           compress_on_rotate:=Compress};
+config_changed(_Name,_NewHConfig,State) ->
+    State.
 
-filesync(_Name, _Mode, #{type := Type}=State) when is_atom(Type) ->
-    {ok,State};
-filesync(_Name, async, #{file_ctrl_pid := FileCtrlPid} = State) ->
-    ok = file_ctrl_filesync_async(FileCtrlPid),
-    {ok,State};
-filesync(_Name, sync, #{file_ctrl_pid := FileCtrlPid} = State) ->
-    Result = file_ctrl_filesync_sync(FileCtrlPid),
+filesync(_Name, SyncAsync, #{file_ctrl_pid := FileCtrlPid} = State) ->
+    Result = file_ctrl_filesync(SyncAsync, FileCtrlPid),
     {Result,State}.
 
-write(_Name, async, Bin, #{file_ctrl_pid:=FileCtrlPid} = State) ->
-    ok = file_write_async(FileCtrlPid, Bin),
-    {ok,State};
-write(_Name, sync, Bin, #{file_ctrl_pid:=FileCtrlPid} = State) ->
-    Result = file_write_sync(FileCtrlPid, Bin),
+write(_Name, SyncAsync, Bin, #{file_ctrl_pid:=FileCtrlPid} = State) ->
+    Result = file_write(SyncAsync, FileCtrlPid, Bin),
     {Result,State}.
 
 reset_state(_Name, State) ->
     State.
 
-handle_info(_Name, {'EXIT',Pid,Why}, #{type := FileInfo, file_ctrl_pid := Pid}) ->
+handle_info(_Name, {'EXIT',Pid,Why}, #{file_ctrl_pid := Pid}=State) ->
     %% file_ctrl_pid died, file error, terminate handler
-    exit({error,{write_failed,FileInfo,Why}});
+    exit({error,{write_failed,maps:with([type,file,modes],State),Why}});
 handle_info(_, _, State) ->
     State.
 
@@ -228,23 +297,36 @@ terminate(_Name, _Reason, #{file_ctrl_pid:=FWPid}) ->
 
 %%%-----------------------------------------------------------------
 %%%
-open_log_file(HandlerName, FileInfo) ->
-    case file_ctrl_start(HandlerName, FileInfo) of
-        OK = {ok,_FileCtrlPid} -> OK;
-        Error -> Error
-    end.
-
-do_open_log_file({file,File}) ->
-    do_open_log_file({file,File,[raw,append,delayed_write]});
-
-do_open_log_file({file,File,[]}) ->
-    do_open_log_file({file,File,[raw,append,delayed_write]});
-
-do_open_log_file({file,File,Modes}) ->
+open_log_file(HandlerName,#{type:=file,
+                            file:=FileName,
+                            modes:=Modes,
+                            file_check:=FileCheck,
+                            max_no_bytes:=Size,
+                            max_no_files:=Count,
+                            compress_on_rotate:=Compress}) ->
     try
-        case filelib:ensure_dir(File) of
+        case filelib:ensure_dir(FileName) of
             ok ->
-                file:open(File, Modes);
+                case file:open(FileName, Modes) of
+                    {ok, Fd} ->
+                        {ok,#file_info{inode=INode}} =
+                            file:read_file_info(FileName,[raw]),
+                        UpdateModes = [append | Modes--[write,append,exclusive]],
+                        State0 = #{handler_name=>HandlerName,
+                                   file_name=>FileName,
+                                   modes=>UpdateModes,
+                                   file_check=>FileCheck,
+                                   fd=>Fd,
+                                   inode=>INode,
+                                   last_check=>timestamp(),
+                                   synced=>false,
+                                   write_res=>ok,
+                                   sync_res=>ok},
+                        State = update_rotation({Size,Count,Compress},State0),
+                        {ok,State};
+                    Error ->
+                        Error
+                end;
             Error ->
                 Error
         end
@@ -252,21 +334,23 @@ do_open_log_file({file,File,Modes}) ->
         _:Reason -> {error,Reason}
     end.
 
-close_log_file(Std) when Std == standard_io; Std == standard_error ->
-    ok;
-close_log_file(Fd) ->
+close_log_file(#{fd:=Fd}) ->
     _ = file:datasync(Fd),
-    _ = file:close(Fd).
+    _ = file:close(Fd),
+    ok;
+close_log_file(_) ->
+    ok.
+
 
 
 %%%-----------------------------------------------------------------
 %%% File control process
 
-file_ctrl_start(HandlerName, FileInfo) ->
+file_ctrl_start(HandlerName, HConfig) ->
     Starter = self(),
     FileCtrlPid =
         spawn_link(fun() ->
-                           file_ctrl_init(HandlerName, FileInfo, Starter)
+                           file_ctrl_init(HandlerName, HConfig, Starter)
                    end),
     receive
         {FileCtrlPid,ok} ->
@@ -281,18 +365,16 @@ file_ctrl_start(HandlerName, FileInfo) ->
 file_ctrl_stop(Pid) ->
     Pid ! stop.
 
-file_write_async(Pid, Bin) ->
+file_write(async, Pid, Bin) ->
     Pid ! {log,Bin},
-    ok.
-
-file_write_sync(Pid, Bin) ->
+    ok;
+file_write(sync, Pid, Bin) ->
     file_ctrl_call(Pid, {log,Bin}).
 
-file_ctrl_filesync_async(Pid) ->
+file_ctrl_filesync(async, Pid) ->
     Pid ! filesync,
-    ok.
-
-file_ctrl_filesync_sync(Pid) ->
+    ok;
+file_ctrl_filesync(sync, Pid) ->
     file_ctrl_call(Pid, filesync).
 
 file_ctrl_call(Pid, Msg) ->
@@ -309,94 +391,255 @@ file_ctrl_call(Pid, Msg) ->
             {error,{no_response,Pid}}
     end.    
 
-file_ctrl_init(HandlerName, FileInfo, Starter) when is_tuple(FileInfo) ->
+file_ctrl_init(HandlerName,
+               #{type:=file,
+                 file:=FileName} = HConfig,
+               Starter) ->
     process_flag(message_queue_data, off_heap),
-    FileName = element(2, FileInfo),
-    case do_open_log_file(FileInfo) of
-        {ok,Fd} ->
+    case open_log_file(HandlerName,HConfig) of
+        {ok,State} ->
             Starter ! {self(),ok},
-            file_ctrl_loop(Fd, FileName, false, ok, ok, HandlerName);
+            file_ctrl_loop(State);
         {error,Reason} ->
             Starter ! {self(),{error,{open_failed,FileName,Reason}}}
     end;
-file_ctrl_init(HandlerName, StdDev, Starter) ->
+file_ctrl_init(HandlerName, #{type:=StdDev}, Starter) ->
     Starter ! {self(),ok},
-    file_ctrl_loop(StdDev, StdDev, false, ok, ok, HandlerName).
+    file_ctrl_loop(#{handler_name=>HandlerName,dev=>StdDev}).
 
-file_ctrl_loop(Fd, DevName, Synced,
-               PrevWriteResult, PrevSyncResult, HandlerName) ->
+file_ctrl_loop(State) ->
     receive
         %% asynchronous event
         {log,Bin} ->
-            Fd1 = ensure(Fd, DevName),
-            Result = write_to_dev(Fd1, Bin, DevName, PrevWriteResult, HandlerName),
-            file_ctrl_loop(Fd1, DevName, false,
-                           Result, PrevSyncResult, HandlerName);
+            State1 = write_to_dev(Bin,State),
+            file_ctrl_loop(State1);
 
         %% synchronous event
         {{log,Bin},{From,MRef}} ->
-            Fd1 = ensure(Fd, DevName),
-            Result = write_to_dev(Fd1, Bin, DevName, PrevWriteResult, HandlerName),
+            State1 = ensure_file(State),
+            State2 = write_to_dev(Bin,State1),
             From ! {MRef,ok},
-            file_ctrl_loop(Fd1, DevName, false,
-                           Result, PrevSyncResult, HandlerName);
+            file_ctrl_loop(State2);
 
         filesync ->
-            Fd1 = ensure(Fd, DevName),
-            Result = sync_dev(Fd1, DevName, Synced, PrevSyncResult, HandlerName),
-            file_ctrl_loop(Fd1, DevName, true,
-                           PrevWriteResult, Result, HandlerName);
+            State1 = sync_dev(State),
+            file_ctrl_loop(State1);
 
         {filesync,{From,MRef}} ->
-            Fd1 = ensure(Fd, DevName),
-            Result = sync_dev(Fd1, DevName, Synced, PrevSyncResult, HandlerName),
+            State1 = ensure_file(State),
+            State2 = sync_dev(State1),
             From ! {MRef,ok},
-            file_ctrl_loop(Fd1, DevName, true,
-                           PrevWriteResult, Result, HandlerName);
+            file_ctrl_loop(State2);
+
+        {update_config,#{file_check:=FileCheck,
+                         max_no_bytes:=Size,
+                         max_no_files:=Count,
+                         compress_on_rotate:=Compress}} ->
+            State1 = update_rotation({Size,Count,Compress},State),
+            file_ctrl_loop(State1#{file_check=>FileCheck});
 
         stop ->
-            _ = close_log_file(Fd),
+            close_log_file(State),
             stopped
     end.
 
+maybe_ensure_file(#{file_check:=0}=State) ->
+    ensure_file(State);
+maybe_ensure_file(#{last_check:=T0,file_check:=CheckInt}=State)
+  when is_integer(CheckInt) ->
+    T = timestamp(),
+    if T-T0 > CheckInt -> ensure_file(State);
+       true -> State
+    end;
+maybe_ensure_file(State) ->
+    State.
+
 %% In order to play well with tools like logrotate, we need to be able
 %% to re-create the file if it has disappeared (e.g. if rotated by
 %% logrotate)
-ensure(Fd,DevName) when is_atom(DevName) ->
-    Fd;
-ensure(Fd,FileName) ->
-    case file:read_file_info(FileName) of
-        {ok,_} ->
-            Fd;
+ensure_file(#{fd:=Fd0,inode:=INode0,file_name:=FileName,modes:=Modes}=State) ->
+    case file:read_file_info(FileName,[raw]) of
+        {ok,#file_info{inode=INode0}} ->
+            State#{last_check=>timestamp()};
         _ ->
-            _ = file:close(Fd),
-            _ = file:close(Fd), % delayed_write cause close not to close
-            case do_open_log_file({file,FileName}) of
-                {ok,Fd1} ->
-                    Fd1;
+            close_log_file(Fd0),
+            case file:open(FileName,Modes) of
+                {ok,Fd} ->
+                    {ok,#file_info{inode=INode}} =
+                        file:read_file_info(FileName,[raw]),
+                    State#{fd=>Fd,inode=>INode,
+                           last_check=>timestamp(),
+                           synced=>true,sync_res=>ok};
                 Error ->
                     exit({could_not_reopen_file,Error})
             end
-    end.
+    end;
+ensure_file(State) ->
+    State.
 
-write_to_dev(DevName, Bin, _DevName, _PrevWriteResult, _HandlerName)
-  when is_atom(DevName) ->
-    io:put_chars(DevName, Bin);
-write_to_dev(Fd, Bin, FileName, PrevWriteResult, HandlerName) ->
+write_to_dev(Bin,#{dev:=DevName}=State) ->
+    io:put_chars(DevName, Bin),
+    State;
+write_to_dev(Bin, State) ->
+    State1 = #{fd:=Fd} = maybe_ensure_file(State),
     Result = ?file_write(Fd, Bin),
-    maybe_notify_error(write,Result,PrevWriteResult,FileName,HandlerName).
+    State2 = maybe_rotate_file(Bin,State1),
+    maybe_notify_error(write,Result,State2),
+    State2#{synced=>false,write_res=>Result}.
 
-sync_dev(_Fd, _FileName, true, PrevSyncResult, _HandlerName) ->
-    PrevSyncResult;
-sync_dev(Fd, FileName, false, PrevSyncResult, HandlerName) ->
+sync_dev(#{synced:=false}=State) ->
+    State1 = #{fd:=Fd} = maybe_ensure_file(State),
     Result = ?file_datasync(Fd),
-    maybe_notify_error(filesync,Result,PrevSyncResult,FileName,HandlerName).
+    maybe_notify_error(filesync,Result,State1),
+    State1#{synced=>true,sync_res=>Result};
+sync_dev(State) ->
+    State.
+
+update_rotation({infinity,_,_},State) ->
+    maybe_remove_archives(0,State),
+    maps:remove(rotation,State);
+update_rotation({Size,Count,Compress},#{file_name:=FileName} = State) ->
+    maybe_remove_archives(Count,State),
+    {ok,#file_info{size=CurrSize}} = file:read_file_info(FileName,[raw]),
+    State1 = State#{rotation=>#{size=>Size,
+                                count=>Count,
+                                compress=>Compress,
+                                curr_size=>CurrSize}},
+    maybe_update_compress(0,State1),
+    maybe_rotate_file(0,State1).
+
+maybe_remove_archives(Count,#{file_name:=FileName}=State) ->
+    Archive = rot_file_name(FileName,Count,false),
+    CompressedArchive = rot_file_name(FileName,Count,true),
+    case {file:read_file_info(Archive,[raw]),
+          file:read_file_info(CompressedArchive,[raw])} of
+        {{error,enoent},{error,enoent}} ->
+            ok;
+        _ ->
+            _ = file:delete(Archive),
+            _ = file:delete(CompressedArchive),
+            maybe_remove_archives(Count+1,State)
+    end.
+
+maybe_update_compress(Count,#{rotation:=#{count:=Count}}) ->
+    ok;
+maybe_update_compress(N,#{file_name:=FileName,
+                          rotation:=#{compress:=Compress}}=State) ->
+    Archive = rot_file_name(FileName,N,not Compress),
+    case file:read_file_info(Archive,[raw]) of
+        {ok,_} when Compress ->
+            compress_file(Archive);
+        {ok,_} ->
+            decompress_file(Archive);
+        _ ->
+            ok
+    end,
+    maybe_update_compress(N+1,State).
+
+maybe_rotate_file(Bin,#{rotation:=_}=State) when is_binary(Bin) ->
+    maybe_rotate_file(byte_size(Bin),State);
+maybe_rotate_file(AddSize,#{rotation:=#{size:=RotSize,
+                                        curr_size:=CurrSize}=Rotation}=State) ->
+    NewSize = CurrSize + AddSize,
+    if NewSize>RotSize ->
+            rotate_file(State#{rotation=>Rotation#{curr_size=>NewSize}});
+       true ->
+            State#{rotation=>Rotation#{curr_size=>NewSize}}
+    end;
+maybe_rotate_file(_Bin,State) ->
+    State.
+
+rotate_file(#{fd:=Fd0,file_name:=FileName,modes:=Modes,rotation:=Rotation}=State) ->
+    State1 = sync_dev(State),
+    _ = file:close(Fd0),
+    _ = file:close(Fd0),
+    rotate_files(FileName,maps:get(count,Rotation),maps:get(compress,Rotation)),
+    case file:open(FileName,Modes) of
+        {ok,Fd} ->
+            {ok,#file_info{inode=INode}} = file:read_file_info(FileName,[raw]),
+            State1#{fd=>Fd,inode=>INode,rotation=>Rotation#{curr_size=>0}};
+        Error ->
+            exit({could_not_reopen_file,Error})
+    end.
+
+rotate_files(FileName,0,_Compress) ->
+    _ = file:delete(FileName),
+    ok;
+rotate_files(FileName,1,Compress) ->
+    FileName0 = FileName++".0",
+    _ = file:rename(FileName,FileName0),
+    if Compress -> compress_file(FileName0);
+       true -> ok
+    end,
+    ok;
+rotate_files(FileName,Count,Compress) ->
+    _ = file:rename(rot_file_name(FileName,Count-2,Compress),
+                    rot_file_name(FileName,Count-1,Compress)),
+    rotate_files(FileName,Count-1,Compress).
+
+rot_file_name(FileName,Count,false) ->
+    FileName ++ "." ++ integer_to_list(Count);
+rot_file_name(FileName,Count,true) ->
+    rot_file_name(FileName,Count,false) ++ ".gz".
+
+compress_file(FileName) ->
+    {ok,In} = file:open(FileName,[read,binary]),
+    {ok,Out} = file:open(FileName++".gz",[write]),
+    Z = zlib:open(),
+    zlib:deflateInit(Z, default, deflated, 31, 8, default),
+    compress_data(Z,In,Out),
+    zlib:deflateEnd(Z),
+    zlib:close(Z),
+    _ = file:close(In),
+    _ = file:close(Out),
+    _ = file:delete(FileName),
+    ok.
+
+compress_data(Z,In,Out) ->
+    case file:read(In,100000) of
+        {ok,Data} ->
+            Compressed = zlib:deflate(Z, Data),
+            _ = file:write(Out,Compressed),
+            compress_data(Z,In,Out);
+        eof ->
+            Compressed = zlib:deflate(Z, <<>>, finish),
+            _ = file:write(Out,Compressed),
+            ok
+    end.
+
+decompress_file(FileName) ->
+    {ok,In} = file:open(FileName,[read,binary]),
+    {ok,Out} = file:open(filename:rootname(FileName,".gz"),[write]),
+    Z = zlib:open(),
+    zlib:inflateInit(Z, 31),
+    decompress_data(Z,In,Out),
+    zlib:inflateEnd(Z),
+    zlib:close(Z),
+    _ = file:close(In),
+    _ = file:close(Out),
+    _ = file:delete(FileName),
+    ok.
 
-maybe_notify_error(_Op, ok, _PrevResult, _FileName, _HandlerName) ->
+decompress_data(Z,In,Out) ->
+    case file:read(In,1000) of
+        {ok,Data} ->
+            Decompressed = zlib:inflate(Z, Data),
+            _ = file:write(Out,Decompressed),
+            decompress_data(Z,In,Out);
+        eof ->
+            ok
+    end.
+
+maybe_notify_error(_Op, ok, _State) ->
     ok;
-maybe_notify_error(_Op, PrevResult, PrevResult, _FileName, _HandlerName) ->
+maybe_notify_error(Op, Result, #{write_res:=WR,sync_res:=SR})
+  when (Op==write andalso Result==WR) orelse
+       (Op==filesync andalso Result==SR) ->
     %% don't report same error twice
-    PrevResult;
-maybe_notify_error(Op, Error, _PrevResult, FileName, HandlerName) ->
+    ok;
+maybe_notify_error(Op, Error, #{handler_name:=HandlerName,file_name:=FileName}) ->
     logger_h_common:error_notify({HandlerName,Op,FileName,Error}),
-    Error.
+    ok.
+
+timestamp() ->
+    erlang:monotonic_time(millisecond).
diff --git a/lib/kernel/src/logger_sup.erl b/lib/kernel/src/logger_sup.erl
index 3d6f482e20..9ea8558a16 100644
--- a/lib/kernel/src/logger_sup.erl
+++ b/lib/kernel/src/logger_sup.erl
@@ -50,7 +50,9 @@ init([]) ->
                 start => {logger_handler_watcher, start_link, []},
                 shutdown => brutal_kill},
 
-    {ok, {SupFlags, [Watcher]}}.
+    Proxy = logger_proxy:child_spec(),
+
+    {ok, {SupFlags, [Watcher,Proxy]}}.
 
 %%%===================================================================
 %%% Internal functions
diff --git a/lib/kernel/src/net.erl b/lib/kernel/src/net.erl
index 2d0ae2ed0c..b8ffa64043 100644
--- a/lib/kernel/src/net.erl
+++ b/lib/kernel/src/net.erl
@@ -1,8 +1,8 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2019-2019. 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
@@ -14,13 +14,36 @@
 %% 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(net).
 
-%% Various network functions, kept here for compatibility
+%% We should really ifdef this module depending on if we actually built
+%% the system with esock support (socket and prim_net), but our doc-building
+%% can't handle the "variables" we need (USE_ESOCK). So instead, we just
+%% leave everything hanging...
+%% If one of the "hanging" functions is called when esock has been disabled,
+%% the function will through a 'notsup' error (erlang:error/1).
+
+%% Administrative and utility functions
+-export([
+	 info/0,
+         command/1
+        ]).
 
+-export([
+         gethostname/0,
+         getnameinfo/1, getnameinfo/2,
+         getaddrinfo/1, getaddrinfo/2,
+
+         if_name2index/1,
+         if_index2name/1,
+         if_names/0
+        ]).
+
+%% Deprecated functions from the "old" net module
 -export([call/4,
 	 cast/4,
 	 broadcast/3,
@@ -28,7 +51,52 @@
 	 relay/1,
 	 sleep/1]).
 
--deprecated(module).
+%% Should we define these here or refer to the prim_net module
+-export_type([
+              address_info/0,
+              name_info/0,
+
+              name_info_flags/0,
+              name_info_flag/0,
+              name_info_flag_ext/0,
+
+              network_interface_name/0,
+              network_interface_index/0
+             ]).
+
+
+-deprecated({call,      4, eventually}).
+-deprecated({cast,      4, eventually}).
+-deprecated({broadcast, 3, eventually}).
+-deprecated({ping,      1, eventually}).
+-deprecated({relay,     1, eventually}).
+-deprecated({sleep,     1, eventually}).
+
+
+-type name_info_flags()         :: [name_info_flag()|name_info_flag_ext()].
+-type name_info_flag()          :: namereqd |
+                                   dgram |
+                                   nofqdn |
+                                   numerichost |
+                                   nomericserv.
+-type name_info_flag_ext()      :: idn |
+                                   idna_allow_unassigned |
+                                   idna_use_std3_ascii_rules.
+-type name_info()               :: #{host    := string(),
+                                     service := string()}.
+-type address_info()            :: #{family   := socket:domain(),
+                                     socktype := socket:type(),
+                                     protocol := socket:protocol(),
+                                     address  := socket:sockaddr()}.
+-type network_interface_name()  :: string().
+-type network_interface_index() :: non_neg_integer().
+
+
+%% ===========================================================================
+%%
+%% D E P R E C A T E D   F U N C T I O N S
+%%
+%% ===========================================================================
 
 call(N,M,F,A) -> rpc:call(N,M,F,A).
 cast(N,M,F,A) -> rpc:cast(N,M,F,A).
@@ -38,3 +106,219 @@ sleep(T) -> receive after T -> ok end.
 relay(X) -> slave:relay(X).
 
 
+%% ===========================================================================
+%%
+%% Administrative and utility API
+%%
+%% ===========================================================================
+
+-spec info() -> list().
+
+-ifdef(USE_ESOCK).
+info() ->
+    prim_net:info().
+-else.
+-dialyzer({nowarn_function, info/0}).
+info() ->
+    erlang:error(notsup).
+-endif.
+
+
+-spec command(Cmd :: term()) -> term().
+
+-ifdef(USE_ESOCK).
+command(Cmd) ->
+    prim_net:command(Cmd).
+-else.
+-dialyzer({nowarn_function, command/1}).
+command(_Cmd) ->
+    erlang:error(notsup).
+-endif.
+
+
+
+%% ===========================================================================
+%%
+%% The proper net API
+%%
+%% ===========================================================================
+
+%% ===========================================================================
+%%
+%% gethostname - Get the name of the current host.
+%%
+%%
+
+-spec gethostname() -> {ok, HostName} | {error, Reason} when
+      HostName :: string(),
+      Reason   :: term().
+
+-ifdef(USE_ESOCK).
+gethostname() ->
+    prim_net:gethostname().
+-else.
+-dialyzer({nowarn_function, gethostname/0}).
+gethostname() ->
+    erlang:error(notsup).
+-endif.
+
+
+%% ===========================================================================
+%%
+%% getnameinfo - Address-to-name translation in protocol-independent manner.
+%%
+%%
+
+-spec getnameinfo(SockAddr) -> {ok, Info} | {error, Reason} when
+      SockAddr :: socket:sockaddr(),
+      Info     :: name_info(),
+      Reason   :: term().
+
+getnameinfo(SockAddr) ->
+    getnameinfo(SockAddr, undefined).
+
+-spec getnameinfo(SockAddr, Flags) -> {ok, Info} | {error, Reason} when
+      SockAddr :: socket:sockaddr(),
+      Flags    :: name_info_flags() | undefined,
+      Info     :: name_info(),
+      Reason   :: term().
+
+-ifdef(USE_ESOCK).
+getnameinfo(SockAddr, [] = _Flags) ->
+    getnameinfo(SockAddr, undefined);
+getnameinfo(#{family := Fam, addr := _Addr} = SockAddr, Flags)
+  when ((Fam =:= inet) orelse (Fam =:= inet6)) andalso 
+       (is_list(Flags) orelse (Flags =:= undefined)) ->
+    prim_net:getnameinfo(socket:ensure_sockaddr(SockAddr), Flags);
+getnameinfo(#{family := Fam, path := _Path} = SockAddr, Flags)
+  when (Fam =:= local) andalso (is_list(Flags) orelse (Flags =:= undefined)) ->
+    prim_net:getnameinfo(SockAddr, Flags).
+-else.
+-dialyzer({nowarn_function, getnameinfo/2}).
+getnameinfo(SockAddr, [] = _Flags) ->
+    getnameinfo(SockAddr, undefined);
+getnameinfo(#{family := Fam, addr := _Addr} = _SockAddr, Flags)
+  when ((Fam =:= inet) orelse (Fam =:= inet6)) andalso 
+       (is_list(Flags) orelse (Flags =:= undefined)) ->
+    erlang:error(notsup);
+getnameinfo(#{family := Fam, path := _Path} = _SockAddr, Flags)
+  when (Fam =:= local) andalso (is_list(Flags) orelse (Flags =:= undefined)) ->
+    erlang:error(notsup).
+-endif.
+
+
+%% ===========================================================================
+%%
+%% getaddrinfo - Network address and service translation
+%%
+%% There is also a "hint" argument that we "at some point" should implement.
+
+-spec getaddrinfo(Host) -> {ok, Info} | {error, Reason} when
+      Host    :: string(),
+      Info    :: [address_info()],
+      Reason  :: term().
+
+getaddrinfo(Host) when is_list(Host) ->
+    getaddrinfo(Host, undefined).
+
+
+-spec getaddrinfo(Host, undefined) -> {ok, Info} | {error, Reason} when
+      Host    :: string(),
+      Info    :: [address_info()],
+      Reason  :: term()
+                 ; (undefined, Service) -> {ok, Info} | {error, Reason} when
+      Service :: string(),
+      Info    :: [address_info()],
+      Reason  :: term()
+                 ; (Host, Service) -> {ok, Info} | {error, Reason} when
+      Host    :: string(),
+      Service :: string(),
+      Info    :: [address_info()],
+      Reason  :: term().
+
+-ifdef(USE_ESOCK).
+getaddrinfo(Host, Service)
+  when (is_list(Host) orelse (Host =:= undefined)) andalso
+       (is_list(Service) orelse (Service =:= undefined)) andalso
+       (not ((Service =:= undefined) andalso (Host =:= undefined))) ->
+    prim_net:getaddrinfo(Host, Service).
+-else.
+-dialyzer({nowarn_function, getaddrinfo/2}).
+getaddrinfo(Host, Service)
+  when (is_list(Host) orelse (Host =:= undefined)) andalso
+       (is_list(Service) orelse (Service =:= undefined)) andalso
+       (not ((Service =:= undefined) andalso (Host =:= undefined))) ->
+    erlang:error(notsup).
+-endif.
+
+
+
+
+%% ===========================================================================
+%%
+%% if_name2index - Mappings between network interface names and indexes:
+%%                 name -> idx
+%%
+%%
+
+-spec if_name2index(Name) -> {ok, Idx} | {error, Reason} when
+      Name   :: network_interface_name(),
+      Idx    :: network_interface_index(),
+      Reason :: term().
+
+-ifdef(USE_ESOCK).
+if_name2index(If) when is_list(If) ->
+    prim_net:if_name2index(If).
+-else.
+-dialyzer({nowarn_function, if_name2index/1}).
+if_name2index(If) when is_list(If) ->
+    erlang:error(notsup).
+-endif.
+
+
+
+%% ===========================================================================
+%%
+%% if_index2name - Mappings between network interface index and names:
+%%                 idx -> name
+%%
+%%
+
+-spec if_index2name(Idx) -> {ok, Name} | {error, Reason} when
+      Idx    :: network_interface_index(),
+      Name   :: network_interface_name(),
+      Reason :: term().
+
+-ifdef(USE_ESOCK).
+if_index2name(Idx) when is_integer(Idx) ->
+    prim_net:if_index2name(Idx).
+-else.
+-dialyzer({nowarn_function, if_index2name/1}).
+if_index2name(Idx) when is_integer(Idx) ->
+    erlang:error(notsup).
+-endif.
+
+
+
+%% ===========================================================================
+%%
+%% if_names - Get network interface names and indexes
+%%
+%%
+
+-spec if_names() -> Names | {error, Reason} when
+      Names  :: [{Idx, If}],
+      Idx    :: network_interface_index(),
+      If     :: network_interface_name(),
+      Reason :: term().
+
+-ifdef(USE_ESOCK).
+if_names() ->
+    prim_net:if_names().
+-else.
+-dialyzer({nowarn_function, if_names/0}).
+if_names() ->
+    erlang:error(notsup).
+-endif.
+
+
diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl
index a9dc77837e..83d3b4b5e1 100644
--- a/lib/kernel/src/net_kernel.erl
+++ b/lib/kernel/src/net_kernel.erl
@@ -1126,14 +1126,22 @@ do_disconnect(Node, State) ->
 	    {false, State}
     end.
 
-
 disconnect_pid(Pid, State) ->
     exit(Pid, disconnect),
+
+    %% This code used to only use exit + recv 'EXIT' to sync,
+    %% but since OTP-22 links are no longer broken atomically
+    %% so the exit message below can arrive before any remaining
+    %% exit messages have killed the distribution port
+    Ref = erlang:monitor(process, Pid),
     %% Sync wait for connection to die!!!
     receive
-	{'EXIT',Pid,Reason} ->
-	    {_,State1} = handle_exit(Pid, Reason, State),
-	    {true, State1}
+        {'DOWN',Ref,_,_,_} ->
+            receive
+                {'EXIT',Pid,Reason} ->
+                    {_,State1} = handle_exit(Pid, Reason, State),
+                    {true, State1}
+            end
     end.
 
 %%
@@ -1433,7 +1441,7 @@ validate_hostname([$@|HostPart] = Host) ->
     end.
 
 valid_name_head(Head) ->
-    {ok, MP} = re:compile("^[0-9A-Za-z_\\-]*$", [unicode]),
+    {ok, MP} = re:compile("^[0-9A-Za-z_\\-]+$", [unicode]),
         case re:run(Head, MP) of
             {match, _} ->
                 true;
diff --git a/lib/kernel/src/raw_file_io_inflate.erl b/lib/kernel/src/raw_file_io_inflate.erl
index 7e9780310c..d3ed02dd03 100644
--- a/lib/kernel/src/raw_file_io_inflate.erl
+++ b/lib/kernel/src/raw_file_io_inflate.erl
@@ -26,7 +26,7 @@
 
 -include("file_int.hrl").
 
--define(INFLATE_CHUNK_SIZE, (1 bsl 10)).
+-define(INFLATE_CHUNK_SIZE, (8 bsl 10)).
 -define(GZIP_WBITS, (16 + 15)).
 
 callback_mode() -> state_functions.
diff --git a/lib/kernel/src/seq_trace.erl b/lib/kernel/src/seq_trace.erl
index 14fe21e9de..f0bd1fabe9 100644
--- a/lib/kernel/src/seq_trace.erl
+++ b/lib/kernel/src/seq_trace.erl
@@ -59,7 +59,7 @@ set_token({Flags,Label,Serial,_From,Lastcnt}) ->
     F = decode_flags(Flags),
     set_token2([{label,Label},{serial,{Lastcnt, Serial}} | F]).
 
--spec set_token(Component, Val) -> {Component, OldVal} when
+-spec set_token(Component, Val) -> OldVal when
       Component :: component(),
       Val :: value(),
       OldVal :: value().
@@ -98,7 +98,7 @@ print(Label, Term) ->
 -spec reset_trace() -> 'true'.
 
 reset_trace() ->
-    erlang:system_flag(1, 0).
+    erlang:system_flag(reset_seq_trace, true).
 
 %% reset_trace(Pid) -> % this might be a useful function too
 
diff --git a/lib/kernel/src/standard_error.erl b/lib/kernel/src/standard_error.erl
index 5d649e5f94..ef5b532960 100644
--- a/lib/kernel/src/standard_error.erl
+++ b/lib/kernel/src/standard_error.erl
@@ -27,7 +27,8 @@
 -define(PROCNAME_SUP, standard_error_sup).
 
 %% Defines for control ops
--define(CTRL_OP_GET_WINSIZE,100).
+-define(ERTS_TTYSL_DRV_CONTROL_MAGIC_NUMBER, 16#018b0900).
+-define(CTRL_OP_GET_WINSIZE, (100 + ?ERTS_TTYSL_DRV_CONTROL_MAGIC_NUMBER)).
 
 %%
 %% The basic server and start-up.
diff --git a/lib/kernel/src/user.erl b/lib/kernel/src/user.erl
index 872e63ab53..5a3487a9ba 100644
--- a/lib/kernel/src/user.erl
+++ b/lib/kernel/src/user.erl
@@ -28,7 +28,8 @@
 -define(NAME, user).
 
 %% Defines for control ops
--define(CTRL_OP_GET_WINSIZE,100).
+-define(ERTS_TTYSL_DRV_CONTROL_MAGIC_NUMBER, 16#018b0900).
+-define(CTRL_OP_GET_WINSIZE, (100 + ?ERTS_TTYSL_DRV_CONTROL_MAGIC_NUMBER)).
 
 %%
 %% The basic server and start-up.
@@ -295,7 +296,8 @@ io_requests([], Stat, _) ->
 %%  port.
 
 put_port(List, Port) ->
-    send_port(Port, {command, List}).
+    true = port_command(Port, List),
+    ok.
 
 %% send_port(Port, Command)
 
diff --git a/lib/kernel/src/user_drv.erl b/lib/kernel/src/user_drv.erl
index 9f914aa222..644aa752b6 100644
--- a/lib/kernel/src/user_drv.erl
+++ b/lib/kernel/src/user_drv.erl
@@ -32,9 +32,10 @@
 -define(OP_BEEP,4).
 -define(OP_PUTC_SYNC,5).
 % Control op
--define(CTRL_OP_GET_WINSIZE,100).
--define(CTRL_OP_GET_UNICODE_STATE,101).
--define(CTRL_OP_SET_UNICODE_STATE,102).
+-define(ERTS_TTYSL_DRV_CONTROL_MAGIC_NUMBER, 16#018b0900).
+-define(CTRL_OP_GET_WINSIZE, (100 + ?ERTS_TTYSL_DRV_CONTROL_MAGIC_NUMBER)).
+-define(CTRL_OP_GET_UNICODE_STATE, (101 + ?ERTS_TTYSL_DRV_CONTROL_MAGIC_NUMBER)).
+-define(CTRL_OP_SET_UNICODE_STATE, (102 + ?ERTS_TTYSL_DRV_CONTROL_MAGIC_NUMBER)).
 
 %% start()
 %% start(ArgumentList)
@@ -119,7 +120,7 @@ server1(Iport, Oport, Shell) ->
     {Curr,Shell1} =
 	case init:get_argument(remsh) of
 	    {ok,[[Node]]} ->
-		ANode = list_to_atom(Node),
+		ANode = list_to_atom(append_hostname(Node)),
 		RShell = {ANode,shell,start,[]},
 		RGr = group:start(self(), RShell, rem_sh_opts(ANode)),
 		{RGr,RShell};
@@ -138,6 +139,12 @@ server1(Iport, Oport, Shell) ->
     %% Enter the server loop.
     server_loop(Iport, Oport, Curr, User, Gr, {false, queue:new()}).
 
+append_hostname(Node) ->
+    case string:find(Node, "@") of
+	nomatch -> Node ++ string:find(atom_to_list(node()), "@");
+	_ -> Node
+    end.
+
 rem_sh_opts(Node) ->
     [{expand_fun,fun(B)-> rpc:call(Node,edlin_expand,expand,[B]) end}].
 
@@ -536,19 +543,14 @@ set_unicode_state(Iport, Bool) ->
 %% io_request(Request, InPort, OutPort)
 %% io_requests(Requests, InPort, OutPort)
 %% Note: InPort is unused.
-
-io_request(Request, Iport, Oport) ->
-    try io_command(Request) of
-        {command,_} = Command ->
-            Oport ! {self(),Command},
-            ok;
-        {Command,Reply} ->
-            Oport ! {self(),Command},
-            Reply
-    catch
-        {requests,Rs} ->
-            io_requests(Rs, Iport, Oport);
-        _ ->
+io_request({requests,Rs}, Iport, Oport) ->
+    io_requests(Rs, Iport, Oport);
+io_request(Request, _Iport, Oport) ->
+    case io_command(Request) of
+        {Data, Reply} ->
+            true = port_command(Oport, Data),
+            Reply;
+        unhandled ->
             ok
     end.
 
@@ -568,19 +570,19 @@ put_int16(N, Tail) ->
 %% to the console before the vm stops when calling erlang:halt(integer()).
 -dialyzer({no_improper_lists, io_command/1}).
 io_command({put_chars_sync, unicode,Cs,Reply}) ->
-    {{command,[?OP_PUTC_SYNC|unicode:characters_to_binary(Cs,utf8)]},Reply};
+    {[?OP_PUTC_SYNC|unicode:characters_to_binary(Cs,utf8)], Reply};
 io_command({put_chars, unicode,Cs}) ->
-    {command,[?OP_PUTC|unicode:characters_to_binary(Cs,utf8)]};
+    {[?OP_PUTC|unicode:characters_to_binary(Cs,utf8)], ok};
 io_command({move_rel,N}) ->
-    {command,[?OP_MOVE|put_int16(N, [])]};
+    {[?OP_MOVE|put_int16(N, [])], ok};
 io_command({insert_chars,unicode,Cs}) ->
-    {command,[?OP_INSC|unicode:characters_to_binary(Cs,utf8)]};
+    {[?OP_INSC|unicode:characters_to_binary(Cs,utf8)], ok};
 io_command({delete_chars,N}) ->
-    {command,[?OP_DELC|put_int16(N, [])]};
+    {[?OP_DELC|put_int16(N, [])], ok};
 io_command(beep) ->
-    {command,[?OP_BEEP]};
-io_command(Else) ->
-    throw(Else).
+    {[?OP_BEEP], ok};
+io_command(_) ->
+    unhandled.
 
 %% gr_new()
 %% gr_get_num(Group, Index)
diff --git a/lib/kernel/test/Makefile b/lib/kernel/test/Makefile
index 4a86265a4a..6763a04d9f 100644
--- a/lib/kernel/test/Makefile
+++ b/lib/kernel/test/Makefile
@@ -57,6 +57,7 @@ MODULES= \
 	prim_file_SUITE \
 	ram_file_SUITE \
 	gen_tcp_api_SUITE \
+	gen_tcp_dist \
 	gen_tcp_echo_SUITE \
 	gen_tcp_misc_SUITE \
 	gen_udp_SUITE \
@@ -76,8 +77,11 @@ MODULES= \
 	logger_filters_SUITE \
 	logger_formatter_SUITE \
 	logger_legacy_SUITE \
+	logger_olp_SUITE \
+	logger_proxy_SUITE \
 	logger_simple_h_SUITE \
 	logger_std_h_SUITE \
+	logger_stress_SUITE \
 	logger_test_lib \
 	os_SUITE \
 	pg2_SUITE \
@@ -127,11 +131,17 @@ ERL_COMPILE_FLAGS +=
 
 EBIN = .
 
+TARGETS = $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+
+
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
 
-make_emakefile:
+gen_tcp_dist.erl: ../examples/gen_tcp_dist/src/gen_tcp_dist.erl
+	cp $< $@
+
+make_emakefile: $(ERL_FILES)
 	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) '*_SUITE_make' \
 	> $(EMAKEFILE)
 	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES) \
@@ -147,6 +157,9 @@ clean:
 
 docs:
 
+targets: $(TARGETS)
+
+
 # ----------------------------------------------------
 # Release Target
 # ---------------------------------------------------- 
diff --git a/lib/kernel/test/application_SUITE.erl b/lib/kernel/test/application_SUITE.erl
index 5c35b82207..1ab554db7c 100644
--- a/lib/kernel/test/application_SUITE.erl
+++ b/lib/kernel/test/application_SUITE.erl
@@ -31,6 +31,7 @@
 	 otp_3002/1, otp_3184/1, otp_4066/1, otp_4227/1, otp_5363/1,
 	 otp_5606/1,
 	 start_phases/1, get_key/1, get_env/1,
+	 set_env/1, set_env_persistent/1, set_env_errors/1,
 	 permit_false_start_local/1, permit_false_start_dist/1, script_start/1, 
 	 nodedown_start/1, init2973/0, loop2973/0, loop5606/1]).
 
@@ -55,6 +56,7 @@ all() ->
      load_use_cache, ensure_started, {group, reported_bugs}, start_phases,
      script_start, nodedown_start, permit_false_start_local,
      permit_false_start_dist, get_key, get_env, ensure_all_started,
+     set_env, set_env_persistent, set_env_errors,
      {group, distr_changed}, config_change, shutdown_func, shutdown_timeout,
      shutdown_deadlock, config_relative_paths,
      persistent_env].
@@ -1944,6 +1946,94 @@ get_appls([_ | T], Res) ->
 get_appls([], Res) ->
     Res.
 
+%% Test set_env/1.
+set_env(Conf) when is_list(Conf) ->
+    ok = application:set_env([{appinc, [{own2, persist}, {not_in_app, persist}]},
+			      {unknown_app, [{key, persist}]}]),
+
+    %% own_env1 and own2 are set in appinc
+    undefined = application:get_env(appinc, own_env1),
+    {ok, persist} = application:get_env(appinc, own2),
+    {ok, persist} = application:get_env(appinc, not_in_app),
+    {ok, persist} = application:get_env(unknown_app, key),
+
+    ok = application:load(appinc()),
+    {ok, value1} = application:get_env(appinc, own_env1),
+    {ok, val2} = application:get_env(appinc, own2),
+    {ok, persist} = application:get_env(appinc, not_in_app),
+    {ok, persist} = application:get_env(unknown_app, key),
+
+    %% On reload, values are lost
+    ok = application:unload(appinc),
+    ok = application:load(appinc()),
+    {ok, value1} = application:get_env(appinc, own_env1),
+    {ok, val2} = application:get_env(appinc, own2),
+    undefined = application:get_env(appinc, not_in_app),
+
+    %% Clean up
+    ok = application:unload(appinc).
+
+%% Test set_env/2 with persistent true.
+set_env_persistent(Conf) when is_list(Conf) ->
+    Opts = [{persistent, true}],
+    ok = application:set_env([{appinc, [{own2, persist}, {not_in_app, persist}]},
+			      {unknown_app, [{key, persist}]}], Opts),
+
+    %% own_env1 and own2 are set in appinc
+    undefined = application:get_env(appinc, own_env1),
+    {ok, persist} = application:get_env(appinc, own2),
+    {ok, persist} = application:get_env(appinc, not_in_app),
+    {ok, persist} = application:get_env(unknown_app, key),
+
+    ok = application:load(appinc()),
+    {ok, value1} = application:get_env(appinc, own_env1),
+    {ok, persist} = application:get_env(appinc, own2),
+    {ok, persist} = application:get_env(appinc, not_in_app),
+    {ok, persist} = application:get_env(unknown_app, key),
+
+    %% On reload, values are not lost
+    ok = application:unload(appinc),
+    ok = application:load(appinc()),
+    {ok, value1} = application:get_env(appinc, own_env1),
+    {ok, persist} = application:get_env(appinc, own2),
+    {ok, persist} = application:get_env(appinc, not_in_app),
+
+    %% Clean up
+    ok = application:unload(appinc).
+
+set_env_errors(Conf) when is_list(Conf) ->
+    "application: 1; application name must be an atom" =
+	badarg_msg(fun() -> application:set_env([{1, []}]) end),
+
+    "application: foo; parameters must be a list" =
+	badarg_msg(fun() -> application:set_env([{foo, bar}]) end),
+
+    "invalid application config: foo_bar" =
+	badarg_msg(fun() -> application:set_env([foo_bar]) end),
+
+    "application: foo; invalid parameter name: 1" =
+	badarg_msg(fun() -> application:set_env([{foo, [{1, 2}]}]) end),
+
+    "application: foo; invalid parameter: config" =
+	badarg_msg(fun() -> application:set_env([{foo, [config]}]) end),
+
+    "application: kernel; erroneous parameter: distributed" =
+	badarg_msg(fun() -> application:set_env([{kernel, [{distributed, config}]}]) end),
+
+    "duplicate application config: foo" =
+	badarg_msg(fun() -> application:set_env([{foo, []}, {foo, []}]) end),
+
+    "application: foo; duplicate parameter: bar" =
+	badarg_msg(fun() -> application:set_env([{foo, [{bar, baz}, {bar, bat}]}]) end),
+
+    ok.
+
+badarg_msg(Fun) ->
+    try Fun() of
+	_ -> ct:fail(try_succeeded)
+    catch
+	error:{badarg, Msg} -> Msg
+    end.
 
 %% Test set_env/4 and unset_env/3 with persistent true.
 persistent_env(Conf) when is_list(Conf) ->
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index 1314316c13..6b133f8d6b 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -25,8 +25,8 @@
 -export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 -export([set_path/1, get_path/1, add_path/1, add_paths/1, del_path/1,
 	 replace_path/1, load_file/1, load_abs/1, ensure_loaded/1,
-	 delete/1, purge/1, purge_many_exits/1, soft_purge/1, is_loaded/1,
-	 all_loaded/1,
+	 delete/1, purge/1, purge_many_exits/0, purge_many_exits/1,
+         soft_purge/1, is_loaded/1, all_loaded/1,
 	 load_binary/1, dir_req/1, object_code/1, set_path_file/1,
 	 upgrade/1,
 	 sticky_dir/1, pa_pz_option/1, add_del_path/1,
@@ -41,7 +41,7 @@
 	 big_boot_embedded/1,
          module_status/1,
 	 native_early_modules/1, get_mode/1,
-	 normalized_paths/1]).
+	 normalized_paths/1, mult_embedded_flags/1]).
 
 -export([init_per_testcase/2, end_per_testcase/2,
 	 init_per_suite/1, end_per_suite/1]).
@@ -55,7 +55,7 @@
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
-     {timetrap,{minutes,5}}].
+     {timetrap,{seconds,30}}].
 
 all() ->
     [set_path, get_path, add_path, add_paths, del_path,
@@ -72,7 +72,8 @@ all() ->
      on_load_purge, on_load_self_call, on_load_pending,
      on_load_deleted,
      module_status,
-     big_boot_embedded, native_early_modules, get_mode, normalized_paths].
+     big_boot_embedded, native_early_modules, get_mode, normalized_paths,
+     mult_embedded_flags].
 
 %% These need to run in order
 groups() -> [{sequence, [sequence], [on_load_update,
@@ -140,6 +141,11 @@ end_per_testcase(on_load_embedded, Config) ->
     LinkName = proplists:get_value(link_name, Config),
     _ = del_link(LinkName),
     end_per_testcase(Config);
+end_per_testcase(upgrade, Config) ->
+    %% Make sure tracing is turned off even if the test times out.
+    erlang:trace_pattern({error_handler,undefined_function,3}, false, [global]),
+    erlang:trace(self(), false, [call]),
+    end_per_testcase(Config);
 end_per_testcase(_Func, Config) ->
     end_per_testcase(Config).
 
@@ -349,7 +355,7 @@ load_abs(Config) when is_list(Config) ->
 ensure_loaded(Config) when is_list(Config) ->
     {module, lists} = code:ensure_loaded(lists),
     case init:get_argument(mode) of
-	{ok, [["embedded"]]} ->
+	{ok, [["embedded"] | _]} ->
 	    {error, embedded} = code:ensure_loaded(code_b_test),
 	    {error, badarg} = code:ensure_loaded(34),
 	    ok;
@@ -391,6 +397,9 @@ purge(Config) when is_list(Config) ->
     process_flag(trap_exit, OldFlag),
     ok.
 
+purge_many_exits() ->
+    [{timetrap, {minutes, 2}}].
+
 purge_many_exits(Config) when is_list(Config) ->
     OldFlag = process_flag(trap_exit, true),
 
@@ -525,7 +534,7 @@ upgrade(Config) ->
             T = [beam, hipe],
             [upgrade_do(DataDir, Client, T) || Client <- T],
 
-            case hipe:llvm_support_available() of
+            case hipe:erllvm_is_supported() of
                 false -> ok;
                 true  ->
                     T2 = [beam, hipe_llvm],
@@ -1021,6 +1030,13 @@ mult_lib_remove_prefix([H|T1], [H|T2]) ->
 mult_lib_remove_prefix([$/|T], []) -> T.
 
 bad_erl_libs(Config) when is_list(Config) ->
+    %% Preserve ERL_LIBS if set.
+    BadLibs0 = "/no/such/dir",
+    BadLibs =
+         case os:getenv("ERL_LIBS") of
+             false -> BadLibs0;
+             Libs -> BadLibs0 ++ ":" ++ Libs
+         end,
     {ok,Node} =
 	test_server:start_node(bad_erl_libs, slave, []),
     Code = rpc:call(Node,code,get_path,[]),
@@ -1028,10 +1044,9 @@ bad_erl_libs(Config) when is_list(Config) ->
 
     {ok,Node2} =
 	test_server:start_node(bad_erl_libs, slave,
-			       [{args,"-env ERL_LIBS /no/such/dir"}]),
+			       [{args,"-env ERL_LIBS " ++ BadLibs}]),
     Code2 = rpc:call(Node,code,get_path,[]),
     test_server:stop_node(Node2),
-
     %% Test that code path is not affected by the faulty ERL_LIBS
     Code = Code2,
 
@@ -1550,6 +1565,11 @@ on_load_update_code_1(3, Mod) ->
 
 %% Test -on_load while trace feature 'on_load' is enabled (OTP-14612)
 on_load_trace_on_load(Config) ->
+    %% 'on_load' enables tracing for all newly loaded modules, so we make a dry
+    %% run to ensure that ancillary modules like 'merl' won't be loaded during
+    %% the actual test.
+    on_load_update(Config),
+
     Papa = self(),
     Tracer = spawn_link(fun F() -> receive M -> Papa ! M end, F() end),
     {tracer,[]} = erlang:trace_info(self(),tracer),
@@ -1817,6 +1837,28 @@ do_normalized_paths([M|Ms]) ->
 do_normalized_paths([]) ->
     ok.
 
+%% Make sure that the extra -mode flags are ignored
+mult_embedded_flags(_Config) ->
+    Modes = [{" -mode embedded", embedded},
+	     {" -mode interactive", interactive},
+	     {" -mode invalid", interactive}],
+
+    [ begin
+	  {ArgMode, ExpectedMode} = Mode,
+	  {ok, Node} = start_node(mode_test, ArgMode),
+	  ExpectedMode = rpc:call(Node, code, get_mode, []),
+	  true = stop_node(Node)
+      end || Mode <- Modes],
+
+    [ begin
+	  {ArgIgnoredMode, _} = IgnoredMode,
+	  {ArgRelevantMode, ExpectedMode} = RelevantMode,
+	  {ok, Node} = start_node(mode_test, ArgRelevantMode ++ ArgIgnoredMode),
+	  ExpectedMode = rpc:call(Node, code, get_mode, []),
+	  true = stop_node(Node)
+      end || IgnoredMode <- Modes, RelevantMode <- Modes],
+    ok.
+
 %% Test that module_status/1 behaves as expected
 module_status(_Config) ->
     case test_server:is_cover() of
diff --git a/lib/kernel/test/erl_distribution_SUITE.erl b/lib/kernel/test/erl_distribution_SUITE.erl
index 5a8bbd56c4..c3a022df0a 100644
--- a/lib/kernel/test/erl_distribution_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_SUITE.erl
@@ -40,7 +40,8 @@
 	 monitor_nodes_errors/1,
 	 monitor_nodes_combinations/1,
 	 monitor_nodes_cleanup/1,
-	 monitor_nodes_many/1]).
+	 monitor_nodes_many/1,
+         dist_ctrl_proc_smoke/1]).
 
 %% Performs the test at another node.
 -export([get_socket_priorities/0,
@@ -52,7 +53,7 @@
 
 -export([init_per_testcase/2, end_per_testcase/2]).
 
--export([start_node/2]).
+-export([dist_cntrlr_output_test/2]).
 
 -export([pinger/1]).
 
@@ -67,10 +68,11 @@
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
-     {timetrap,{minutes,4}}].
+     {timetrap,{minutes,12}}].
 
 all() -> 
-    [tick, tick_change, nodenames, hostnames, illegal_nodenames,
+    [dist_ctrl_proc_smoke,
+     tick, tick_change, nodenames, hostnames, illegal_nodenames,
      connect_node,
      hidden_node, setopts,
      table_waste, net_setuptime, inet_dist_options_options,
@@ -116,10 +118,12 @@ connect_node(Config) when is_list(Config) ->
     ok.
 
 tick(Config) when is_list(Config) ->
-    PaDir = filename:dirname(code:which(erl_distribution_SUITE)),
+    run_dist_configs(fun tick/2, Config).
 
+tick(DCfg, _Config) ->
     %% First check that the normal case is OK!
-    {ok, Node} = start_node(dist_test, "-pa " ++ PaDir),
+    [Name1, Name2] = get_nodenames(2, dist_test),
+    {ok, Node} = start_node(DCfg, Name1),
     rpc:call(Node, erl_distribution_SUITE, tick_cli_test, [node()]),
 
     erlang:monitor_node(Node, true),
@@ -143,14 +147,12 @@ tick(Config) when is_list(Config) ->
     %% Set the ticktime on the server node to 100 secs so the server
     %% node doesn't tick the client node within the interval ...
 
-    {ok, ServNode} = start_node(dist_test_server,
-				"-kernel net_ticktime 100 "
-				"-pa " ++ PaDir),
+    {ok, ServNode} = start_node(DCfg, Name2,
+				"-kernel net_ticktime 100"),
     rpc:call(ServNode, erl_distribution_SUITE, tick_serv_test, [Node, node()]),
 
-    {ok, _} = start_node(dist_test,
-			 "-kernel net_ticktime 12 "
-			 "-pa " ++ PaDir),
+    {ok, Node} = start_node(DCfg, Name1,
+			 "-kernel net_ticktime 12"),
     rpc:call(Node, erl_distribution_SUITE, tick_cli_test, [ServNode]),
 
     spawn_link(erl_distribution_SUITE, keep_conn, [Node]),
@@ -180,6 +182,9 @@ tick(Config) when is_list(Config) ->
 
 %% Checks that pinging nonexistyent nodes does not waste space in distribution table.
 table_waste(Config) when is_list(Config) ->
+    run_dist_configs(fun table_waste/2, Config).
+
+table_waste(DCfg, _Config) ->
     {ok, HName} = inet:gethostname(),
     F = fun(0,_F) -> [];
 	   (N,F) -> 
@@ -189,7 +194,7 @@ table_waste(Config) when is_list(Config) ->
 		F(N-1,F)
 	end,
     F(256,F),
-    {ok, N} = start_node(erl_distribution_300,""),
+    {ok, N} = start_node(DCfg, erl_distribution_300),
     stop_node(N),
     ok.
 
@@ -200,6 +205,9 @@ nodenames(Config) when is_list(Config) ->
     legal("a-1@b"),
     legal("a_1@b"),
 
+    %% Test that giving two -sname works as it should
+    test_node("a_1@b", false, long_or_short() ++ "a_0@b"),
+
     illegal("cdé@a"),
     illegal("te欢st@a").
 
@@ -253,8 +261,11 @@ illegal(Name) ->
 test_node(Name) ->
     test_node(Name, false).
 test_node(Name, Illigal) ->
+    test_node(Name, Illigal, "").
+test_node(Name, Illigal, ExtraArgs) ->
     ProgName = ct:get_progname(),
-    Command = ProgName ++ " -noinput " ++ long_or_short() ++ Name ++
+    Command = ProgName ++ " -noinput " ++ ExtraArgs ++
+        long_or_short() ++ Name ++
         " -eval \"net_adm:ping('" ++ atom_to_list(node()) ++ "')\"" ++
         case Illigal of
             true ->
@@ -295,13 +306,16 @@ gethostname() ->
 
 %% Test that pinging an illegal nodename does not kill the node.
 illegal_nodenames(Config) when is_list(Config) ->
-    PaDir = filename:dirname(code:which(erl_distribution_SUITE)),
-    {ok, Node}=start_node(illegal_nodenames, "-pa " ++ PaDir),
+    run_dist_configs(fun illegal_nodenames/2, Config).
+
+illegal_nodenames(DCfg, _Config) ->
+    {ok, Node}=start_node(DCfg, illegal_nodenames),
     monitor_node(Node, true),
     RPid=rpc:call(Node, erlang, spawn,
 		  [?MODULE, pinger, [self()]]),
     receive
 	{RPid, pinged} ->
+            monitor_node(Node, false),
 	    ok;
 	{nodedown, Node} ->
 	    ct:fail("Remote node died.")
@@ -318,22 +332,25 @@ pinger(Starter) ->
 
 %% Test that you can set the net_setuptime properly.
 net_setuptime(Config) when is_list(Config) ->
+    run_dist_configs(fun net_setuptime/2, Config).
+
+net_setuptime(DCfg, _Config) ->
+
     %% In this test case, we reluctantly accept shorter times than the given
     %% setup time, because the connection attempt can end in a
     %% "Host unreachable" error before the timeout fires.
 
-    Res0 = do_test_setuptime("2"),
+    Res0 = do_test_setuptime(DCfg, "2"),
     io:format("Res0 = ~p", [Res0]),
     true = (Res0 =< 4000),
-    Res1 = do_test_setuptime("0.3"),
+    Res1 = do_test_setuptime(DCfg, "0.3"),
     io:format("Res1 = ~p", [Res1]),
     true = (Res1 =< 500),
     ok.
 
-do_test_setuptime(Setuptime) when is_list(Setuptime) ->
-    PaDir = filename:dirname(code:which(?MODULE)),
-    {ok, Node} = start_node(dist_setuptime_test, "-pa " ++ PaDir ++
-				" -kernel net_setuptime " ++ Setuptime),
+do_test_setuptime(DCfg, Setuptime) when is_list(Setuptime) ->
+    {ok, Node} = start_node(DCfg, dist_setuptime_test,
+                            "-kernel net_setuptime " ++ Setuptime),
     Res = rpc:call(Node,?MODULE,time_ping,[?DUMMY_NODE]),
     stop_node(Node),
     Res.
@@ -399,32 +416,36 @@ tick_cli_test1(Node) ->
     end.
 
 setopts(Config) when is_list(Config) ->
+    run_dist_configs(fun setopts/2, Config).
+
+setopts(DCfg, _Config) ->
     register(setopts_regname, self()),
     [N1,N2,N3,N4] = get_nodenames(4, setopts),
 
-    {_N1F,Port1} = start_node_unconnected(N1, ?MODULE, run_remote_test,
+    {_N1F,Port1} = start_node_unconnected(DCfg, N1, ?MODULE, run_remote_test,
 					["setopts_do", atom_to_list(node()), "1", "ping"]),
     0 = wait_for_port_exit(Port1),
 
-    {_N2F,Port2} = start_node_unconnected(N2, ?MODULE, run_remote_test,
+    {_N2F,Port2} = start_node_unconnected(DCfg, N2, ?MODULE, run_remote_test,
 				 ["setopts_do", atom_to_list(node()), "2", "ping"]),
     0 = wait_for_port_exit(Port2),
 
     {ok, LSock} = gen_tcp:listen(0, [{packet,2}, {active,false}]),
     {ok, LTcpPort} = inet:port(LSock),
 
-    {N3F,Port3} = start_node_unconnected(N3, ?MODULE, run_remote_test,
+    {N3F,Port3} = start_node_unconnected(DCfg, N3, ?MODULE, run_remote_test,
 					["setopts_do", atom_to_list(node()),
 					 "1", integer_to_list(LTcpPort)]),
     wait_and_connect(LSock, N3F, Port3),
     0 = wait_for_port_exit(Port3),
 
-    {N4F,Port4} = start_node_unconnected(N4, ?MODULE, run_remote_test,
+    {N4F,Port4} = start_node_unconnected(DCfg, N4, ?MODULE, run_remote_test,
 					["setopts_do", atom_to_list(node()),
 					 "2", integer_to_list(LTcpPort)]),
     wait_and_connect(LSock, N4F, Port4),
     0 = wait_for_port_exit(Port4),
 
+    unregister(setopts_regname),
     ok.
 
 wait_and_connect(LSock, NodeName, NodePort) ->
@@ -518,9 +539,9 @@ opt_from_nr("2") -> {nodelay, false}.
 change_val(true)  -> false;
 change_val(false) -> true.
 
-start_node_unconnected(Name, Mod, Func, Args) ->
+start_node_unconnected(DCfg, Name, Mod, Func, Args) ->
     FullName = full_node_name(Name),
-    CmdLine = mk_node_cmdline(Name,Mod,Func,Args),
+    CmdLine = mk_node_cmdline(DCfg, Name,Mod,Func,Args),
     io:format("Starting node ~p: ~s~n", [FullName, CmdLine]),
     case open_port({spawn, CmdLine}, [exit_status]) of
 	Port when is_port(Port) ->
@@ -534,7 +555,7 @@ full_node_name(PreName) ->
 				 atom_to_list(node())),
     list_to_atom(atom_to_list(PreName) ++ HostSuffix).
 
-mk_node_cmdline(Name,Mod,Func,Args) ->
+mk_node_cmdline(DCfg, Name,Mod,Func,Args) ->
     Static = "-noinput",
     Pa = filename:dirname(code:which(?MODULE)),
     Prog = case catch init:get_argument(progname) of
@@ -551,6 +572,7 @@ mk_node_cmdline(Name,Mod,Func,Args) ->
     Prog ++ " "
 	++ Static ++ " "
 	++ NameSw ++ " " ++ NameStr
+        ++ " " ++ DCfg
 	++ " -pa " ++ Pa
 	++ " -env ERL_CRASH_DUMP " ++ Pwd ++ "/erl_crash_dump." ++ NameStr
 	++ " -setcookie " ++ atom_to_list(erlang:get_cookie())
@@ -560,7 +582,9 @@ mk_node_cmdline(Name,Mod,Func,Args) ->
 
 %% OTP-4255.
 tick_change(Config) when is_list(Config) ->
-    PaDir = filename:dirname(code:which(?MODULE)),
+    run_dist_configs(fun tick_change/2, Config).
+
+tick_change(DCfg, _Config) ->
     [BN, CN] = get_nodenames(2, tick_change),
     DefaultTT = net_kernel:get_net_ticktime(),
     unchanged = net_kernel:set_net_ticktime(DefaultTT, 60),
@@ -577,14 +601,13 @@ tick_change(Config) when is_list(Config) ->
     end,
 
     wait_until(fun () -> 10 == net_kernel:get_net_ticktime() end),
-    {ok, B} = start_node(BN, "-kernel net_ticktime 10 -pa " ++ PaDir),
-    {ok, C} = start_node(CN, "-kernel net_ticktime 10 -hidden -pa "
-			 ++ PaDir),
+    {ok, B} = start_node(DCfg, BN, "-kernel net_ticktime 10"),
+    {ok, C} = start_node(DCfg, CN, "-kernel net_ticktime 10 -hidden"),
 
     OTE = process_flag(trap_exit, true),
     case catch begin
-		   run_tick_change_test(B, C, 10, 1, PaDir),
-		   run_tick_change_test(B, C, 1, 10, PaDir)
+		   run_tick_change_test(DCfg, B, C, 10, 1),
+		   run_tick_change_test(DCfg, B, C, 1, 10)
 	       end of
 	{'EXIT', Reason} ->
 	    stop_node(B),
@@ -626,7 +649,7 @@ wait_for_nodedowns(Tester, Ref) ->
     end,
     wait_for_nodedowns(Tester, Ref).
 
-run_tick_change_test(B, C, PrevTT, TT, PaDir) ->
+run_tick_change_test(DCfg, B, C, PrevTT, TT) ->
     [DN, EN] = get_nodenames(2, tick_change),
 
     Tester = self(),
@@ -640,8 +663,8 @@ run_tick_change_test(B, C, PrevTT, TT, PaDir) ->
 			   wait_for_nodedowns(Tester, Ref)
 		   end,
 
-    {ok, D} = start_node(DN, "-kernel net_ticktime "
-			 ++ integer_to_list(PrevTT) ++ " -pa " ++ PaDir),
+    {ok, D} = start_node(DCfg, DN, "-kernel net_ticktime "
+			 ++ integer_to_list(PrevTT)),
 
     NMA = spawn_link(fun () -> MonitorNodes([B, C, D]) end),
     NMB = spawn_link(B, fun () -> MonitorNodes([node(), C, D]) end),
@@ -674,8 +697,8 @@ run_tick_change_test(B, C, PrevTT, TT, PaDir) ->
     sleep(7),
     change_initiated = rpc:call(C,net_kernel,set_net_ticktime,[TT,10]),
 
-    {ok, E} = start_node(EN, "-kernel net_ticktime "
-			 ++ integer_to_list(TT) ++ " -pa " ++ PaDir),
+    {ok, E} = start_node(DCfg, EN, "-kernel net_ticktime "
+			 ++ integer_to_list(TT)),
     NME  = spawn_link(E, fun () -> MonitorNodes([node(), B, C, D]) end),
     NMA2 = spawn_link(fun () -> MonitorNodes([E]) end),
     NMB2 = spawn_link(B, fun () -> MonitorNodes([E]) end),
@@ -735,12 +758,13 @@ run_tick_change_test(B, C, PrevTT, TT, PaDir) ->
 %%
 %% Basic test of hidden node.
 hidden_node(Config) when is_list(Config) ->
-    PaDir = filename:dirname(code:which(?MODULE)),
-    VArgs = "-pa " ++ PaDir,
-    HArgs = "-hidden -pa " ++ PaDir,
-    {ok, V} = start_node(visible_node, VArgs),
+    run_dist_configs(fun hidden_node/2, Config).
+
+hidden_node(DCfg, _Config) ->
+    HArgs = "-hidden",
+    {ok, V} = start_node(DCfg, visible_node),
     VMN = start_monitor_nodes_proc(V),
-    {ok, H} = start_node(hidden_node, HArgs),
+    {ok, H} = start_node(DCfg, hidden_node, HArgs),
     %% Connect visible_node -> hidden_node
     connect_nodes(V, H),
     test_nodes(V, H),
@@ -748,9 +772,9 @@ hidden_node(Config) when is_list(Config) ->
     sleep(5),
     check_monitor_nodes_res(VMN, H),
     stop_node(V),
-    {ok, H} = start_node(hidden_node, HArgs),
+    {ok, H} = start_node(DCfg, hidden_node, HArgs),
     HMN = start_monitor_nodes_proc(H),
-    {ok, V} = start_node(visible_node, VArgs),
+    {ok, V} = start_node(DCfg, visible_node),
     %% Connect hidden_node -> visible_node
     connect_nodes(H, V),
     test_nodes(V, H),
@@ -850,9 +874,9 @@ do_inet_dist_options_options(Prio) ->
 	"-kernel inet_dist_connect_options "++PriorityString++" "
 	"-kernel inet_dist_listen_options "++PriorityString,
     {ok,Node1} =
-	start_node(inet_dist_options_1, InetDistOptions),
+	start_node("", inet_dist_options_1, InetDistOptions),
     {ok,Node2} =
-	start_node(inet_dist_options_2, InetDistOptions),
+	start_node("", inet_dist_options_2, InetDistOptions),
     %%
     pong =
 	rpc:call(Node1, net_adm, ping, [Node2]),
@@ -885,6 +909,9 @@ get_socket_priorities() ->
 %%
 
 monitor_nodes_nodedown_reason(Config) when is_list(Config) ->
+    run_dist_configs(fun monitor_nodes_nodedown_reason/2, Config).
+
+monitor_nodes_nodedown_reason(DCfg, _Config) ->
     MonNodeState = monitor_node_state(),
     ok = net_kernel:monitor_nodes(true),
     ok = net_kernel:monitor_nodes(true, [nodedown_reason]),
@@ -892,10 +919,10 @@ monitor_nodes_nodedown_reason(Config) when is_list(Config) ->
     Names = get_numbered_nodenames(5, node),
     [NN1, NN2, NN3, NN4, NN5] = Names,
 
-    {ok, N1} = start_node(NN1),
-    {ok, N2} = start_node(NN2),
-    {ok, N3} = start_node(NN3),
-    {ok, N4} = start_node(NN4, "-hidden"),
+    {ok, N1} = start_node(DCfg, NN1),
+    {ok, N2} = start_node(DCfg, NN2),
+    {ok, N3} = start_node(DCfg, NN3),
+    {ok, N4} = start_node(DCfg, NN4, "-hidden"),
 
     receive {nodeup, N1} -> ok end,
     receive {nodeup, N2} -> ok end,
@@ -925,7 +952,7 @@ monitor_nodes_nodedown_reason(Config) when is_list(Config) ->
 
     ok = net_kernel:monitor_nodes(false, [nodedown_reason]),
 
-    {ok, N5} = start_node(NN5),
+    {ok, N5} = start_node(DCfg, NN5),
     stop_node(N5),
 
     receive {nodeup, N5} -> ok end,
@@ -938,11 +965,14 @@ monitor_nodes_nodedown_reason(Config) when is_list(Config) ->
 
 
 monitor_nodes_complex_nodedown_reason(Config) when is_list(Config) ->
+    run_dist_configs(fun monitor_nodes_complex_nodedown_reason/2, Config).
+
+monitor_nodes_complex_nodedown_reason(DCfg, _Config) ->
     MonNodeState = monitor_node_state(),
     Me = self(),
     ok = net_kernel:monitor_nodes(true, [nodedown_reason]),
     [Name] = get_nodenames(1, monitor_nodes_complex_nodedown_reason),
-    {ok, Node} = start_node(Name, ""),
+    {ok, Node} = start_node(DCfg, Name, ""),
     Pid = spawn(Node,
 		fun() ->
 			Me ! {stuff,
@@ -981,16 +1011,19 @@ monitor_nodes_complex_nodedown_reason(Config) when is_list(Config) ->
 %%
 
 monitor_nodes_node_type(Config) when is_list(Config) ->
+    run_dist_configs(fun monitor_nodes_node_type/2, Config).
+
+monitor_nodes_node_type(DCfg, _Config) ->
     MonNodeState = monitor_node_state(),
     ok = net_kernel:monitor_nodes(true),
     ok = net_kernel:monitor_nodes(true, [{node_type, all}]),
     Names = get_numbered_nodenames(9, node),
     [NN1, NN2, NN3, NN4, NN5, NN6, NN7, NN8, NN9] = Names,
 
-    {ok, N1} = start_node(NN1),
-    {ok, N2} = start_node(NN2),
-    {ok, N3} = start_node(NN3, "-hidden"),
-    {ok, N4} = start_node(NN4, "-hidden"),
+    {ok, N1} = start_node(DCfg, NN1),
+    {ok, N2} = start_node(DCfg, NN2),
+    {ok, N3} = start_node(DCfg, NN3, "-hidden"),
+    {ok, N4} = start_node(DCfg, NN4, "-hidden"),
 
     receive {nodeup, N1} -> ok end,
     receive {nodeup, N2} -> ok end,
@@ -1014,15 +1047,15 @@ monitor_nodes_node_type(Config) when is_list(Config) ->
     receive {nodedown, N4, [{node_type, hidden}]} -> ok end,
 
     ok = net_kernel:monitor_nodes(false, [{node_type, all}]),
-    {ok, N5} = start_node(NN5),
+    {ok, N5} = start_node(DCfg, NN5),
 
     receive {nodeup, N5} -> ok end,
     stop_node(N5),
     receive {nodedown, N5} -> ok end,
 
     ok = net_kernel:monitor_nodes(true, [{node_type, hidden}]),
-    {ok, N6} = start_node(NN6),
-    {ok, N7} = start_node(NN7, "-hidden"),
+    {ok, N6} = start_node(DCfg, NN6),
+    {ok, N7} = start_node(DCfg, NN7, "-hidden"),
 
 
     receive {nodeup, N6} -> ok end,
@@ -1037,8 +1070,8 @@ monitor_nodes_node_type(Config) when is_list(Config) ->
     ok = net_kernel:monitor_nodes(false, [{node_type, hidden}]),
     ok = net_kernel:monitor_nodes(false),
 
-    {ok, N8} = start_node(NN8),
-    {ok, N9} = start_node(NN9, "-hidden"),
+    {ok, N8} = start_node(DCfg, NN8),
+    {ok, N9} = start_node(DCfg, NN9, "-hidden"),
 
     receive {nodeup, N8, [{node_type, visible}]} -> ok end,
     stop_node(N8),
@@ -1058,6 +1091,9 @@ monitor_nodes_node_type(Config) when is_list(Config) ->
 %%
 
 monitor_nodes_misc(Config) when is_list(Config) ->
+    run_dist_configs(fun monitor_nodes_misc/2, Config).
+
+monitor_nodes_misc(DCfg, _Config) ->
     MonNodeState = monitor_node_state(),
     ok = net_kernel:monitor_nodes(true),
     ok = net_kernel:monitor_nodes(true, [{node_type, all}, nodedown_reason]),
@@ -1065,8 +1101,8 @@ monitor_nodes_misc(Config) when is_list(Config) ->
     Names = get_numbered_nodenames(3, node),
     [NN1, NN2, NN3] = Names,
 
-    {ok, N1} = start_node(NN1),
-    {ok, N2} = start_node(NN2, "-hidden"),
+    {ok, N1} = start_node(DCfg, NN1),
+    {ok, N2} = start_node(DCfg, NN2, "-hidden"),
 
     receive {nodeup, N1} -> ok end,
 
@@ -1092,7 +1128,7 @@ monitor_nodes_misc(Config) when is_list(Config) ->
 
     ok = net_kernel:monitor_nodes(false, [{node_type, all}, nodedown_reason]),
 
-    {ok, N3} = start_node(NN3),
+    {ok, N3} = start_node(DCfg, NN3),
     receive {nodeup, N3} -> ok end,
     stop_node(N3),
     receive {nodedown, N3} -> ok end,
@@ -1107,15 +1143,18 @@ monitor_nodes_misc(Config) when is_list(Config) ->
 %% messages from Node and that {nodedown, Node} messages are
 %% received after messages from Node.
 monitor_nodes_otp_6481(Config) when is_list(Config) ->
+    run_dist_configs(fun monitor_nodes_otp_6481/2, Config).
+
+monitor_nodes_otp_6481(DCfg, Config) ->
     io:format("Testing nodedown...~n"),
-    monitor_nodes_otp_6481_test(Config, nodedown),
+    monitor_nodes_otp_6481_test(DCfg, Config, nodedown),
     io:format("ok~n"),
     io:format("Testing nodeup...~n"),
-    monitor_nodes_otp_6481_test(Config, nodeup),
+    monitor_nodes_otp_6481_test(DCfg, Config, nodeup),
     io:format("ok~n"),
     ok.
 
-monitor_nodes_otp_6481_test(Config, TestType) when is_list(Config) ->
+monitor_nodes_otp_6481_test(DCfg, Config, TestType) when is_list(Config) ->
     MonNodeState = monitor_node_state(),
     NodeMsg = make_ref(),
     Me = self(),
@@ -1164,7 +1203,7 @@ monitor_nodes_otp_6481_test(Config, TestType) when is_list(Config) ->
 	   end
 	++ MonNodeState,
 
-    {ok, Node} = start_node(Name, "", this),
+    {ok, Node} = start_node(DCfg, Name, "", this),
     receive {nodeup, Node} -> ok end,
 
     RemotePid = spawn(Node,
@@ -1249,17 +1288,20 @@ monitor_nodes_errors(Config) when is_list(Config) ->
     ok.
 
 monitor_nodes_combinations(Config) when is_list(Config) ->
+    run_dist_configs(fun monitor_nodes_combinations/2, Config).
+
+monitor_nodes_combinations(DCfg, _Config) ->
     MonNodeState = monitor_node_state(),
     monitor_nodes_all_comb(true),
     [VisibleName, HiddenName] = get_nodenames(2,
 					      monitor_nodes_combinations),
-    {ok, Visible} = start_node(VisibleName, ""),
+    {ok, Visible} = start_node(DCfg, VisibleName, ""),
     receive_all_comb_nodeup_msgs(visible, Visible),
     no_msgs(),
     stop_node(Visible),
     receive_all_comb_nodedown_msgs(visible, Visible, connection_closed),
     no_msgs(),
-    {ok, Hidden} = start_node(HiddenName, "-hidden"),
+    {ok, Hidden} = start_node(DCfg, HiddenName, "-hidden"),
     receive_all_comb_nodeup_msgs(hidden, Hidden),
     no_msgs(),
     stop_node(Hidden),
@@ -1395,6 +1437,9 @@ monitor_nodes_cleanup(Config) when is_list(Config) ->
     ok.
 
 monitor_nodes_many(Config) when is_list(Config) ->
+    run_dist_configs(fun monitor_nodes_many/2, Config).
+
+monitor_nodes_many(DCfg, _Config) ->
     MonNodeState = monitor_node_state(),
     [Name] = get_nodenames(1, monitor_nodes_many),
     %% We want to perform more than 2^16 net_kernel:monitor_nodes
@@ -1402,7 +1447,7 @@ monitor_nodes_many(Config) when is_list(Config) ->
     No = (1 bsl 16) + 17,
     repeat(fun () -> ok = net_kernel:monitor_nodes(true) end, No),
     No = length(monitor_node_state()) - length(MonNodeState),
-    {ok, Node} = start_node(Name),
+    {ok, Node} = start_node(DCfg, Name),
     repeat(fun () -> receive {nodeup, Node} -> ok end end, No),
     stop_node(Node),
     repeat(fun () -> receive {nodedown, Node} -> ok end end, No),
@@ -1411,8 +1456,118 @@ monitor_nodes_many(Config) when is_list(Config) ->
     MonNodeState = monitor_node_state(),
     ok.
 
+dist_ctrl_proc_smoke(Config) when is_list(Config) ->
+    ThisNode = node(),
+    [Name1, Name2] = get_nodenames(2, dist_ctrl_proc_example_smoke),
+    GetSizeArg = " -gen_tcp_dist_output_loop "
+        ++ atom_to_list(?MODULE) ++ " "
+        ++ "dist_cntrlr_output_test",
+    {ok, Node1} = start_node("", Name1, "-proto_dist gen_tcp"),
+    {ok, Node2} = start_node("", Name2, "-proto_dist gen_tcp" ++ GetSizeArg),
+    pong = rpc:call(Node1, net_adm, ping, [Node2]),
+    NL1 = lists:sort([ThisNode, Node2]),
+    NL2 = lists:sort([ThisNode, Node1]),
+    NL1 = lists:sort(rpc:call(Node1, erlang, nodes, [])),
+    NL2 = lists:sort(rpc:call(Node2, erlang, nodes, [])),
+
+    %% Verify that we actually are executing the distribution
+    %% module we expect and also massage message passing over
+    %% it a bit...
+    Ps1 = rpc:call(Node1, erlang, processes, []),
+    try
+        lists:foreach(
+          fun (P) ->
+                  case rpc:call(Node1, erlang, process_info, [P, current_stacktrace]) of
+                      undefined ->
+                          ok;
+                      {current_stacktrace, StkTrace} ->
+                          lists:foreach(fun ({gen_tcp_dist,
+                                              dist_cntrlr_output_loop,
+                                              2, _}) ->
+                                                io:format("~p ~p~n", [P, StkTrace]),
+                                                throw(found_it);
+                                            (_) ->
+                                                ok
+                                        end, StkTrace)
+                  end
+          end, Ps1),
+        exit({missing, dist_cntrlr_output_loop})
+    catch
+        throw:found_it -> ok
+    end,
+
+    Ps2 = rpc:call(Node2, erlang, processes, []),
+    try
+        lists:foreach(
+          fun (P) ->
+                  case rpc:call(Node2, erlang, process_info, [P, current_stacktrace]) of
+                      undefined ->
+                          ok;
+                      {current_stacktrace, StkTrace} ->
+                          lists:foreach(fun ({erl_distribution_SUITE,
+                                              dist_cntrlr_output_loop,
+                                              2, _}) ->
+                                                io:format("~p ~p~n", [P, StkTrace]),
+                                                throw(found_it);
+                                            (_) ->
+                                                ok
+                                        end, StkTrace)
+                  end
+          end, Ps2),
+        exit({missing, dist_cntrlr_output_loop})
+    catch
+        throw:found_it -> ok
+    end,
+
+    stop_node(Node1),
+    stop_node(Node2),
+    ok.
+
 %% Misc. functions
 
+run_dist_configs(Func, Config) ->
+    GetSizeArg = " -gen_tcp_dist_output_loop "
+        ++ atom_to_list(?MODULE) ++ " "
+        ++ "dist_cntrlr_output_test",
+    lists:map(fun ({DCfgName, DCfg}) ->
+                      io:format("~n~n=== Running ~s configuration ===~n~n",
+                                [DCfgName]),
+                      Func(DCfg, Config)
+              end,
+              [{"default", ""},
+               {"gen_tcp_dist", "-proto_dist gen_tcp"},
+               {"gen_tcp_dist (get_size)", "-proto_dist gen_tcp" ++ GetSizeArg}]).
+
+dist_cntrlr_output_test(DHandle, Socket) ->
+    false = erlang:dist_ctrl_get_opt(DHandle, get_size),
+    false = erlang:dist_ctrl_set_opt(DHandle, get_size, true),
+    true = erlang:dist_ctrl_get_opt(DHandle, get_size),
+    true = erlang:dist_ctrl_set_opt(DHandle, get_size, false),
+    false = erlang:dist_ctrl_get_opt(DHandle, get_size),
+    false = erlang:dist_ctrl_set_opt(DHandle, get_size, true),
+    true = erlang:dist_ctrl_get_opt(DHandle, get_size),
+    dist_cntrlr_output_loop(DHandle, Socket).
+    
+dist_cntrlr_send_data(DHandle, Socket) ->
+    case erlang:dist_ctrl_get_data(DHandle) of
+        none ->
+            erlang:dist_ctrl_get_data_notification(DHandle);
+        {Size, Data} ->
+            Size = erlang:iolist_size(Data),
+            ok = gen_tcp:send(Socket, Data),
+            dist_cntrlr_send_data(DHandle, Socket)
+    end.
+
+dist_cntrlr_output_loop(DHandle, Socket) ->
+    receive
+        dist_data ->
+            %% Outgoing data from this node...
+            dist_cntrlr_send_data(DHandle, Socket);
+        _ ->
+            ok %% Drop garbage message...
+    end,
+    dist_cntrlr_output_loop(DHandle, Socket).
+
 monitor_node_state() ->
     erts_debug:set_internal_state(available_internal_state, true),
     MonitoringNodes = erts_debug:get_internal_state(monitoring_nodes),
@@ -1438,25 +1593,25 @@ print_my_messages() ->
 
 sleep(T) -> receive after T * 1000 -> ok end.	
 
-start_node(Name, Param, this) ->
+start_node(DCfg, Name, Param, this) ->
     NewParam = Param ++ " -pa " ++ filename:dirname(code:which(?MODULE)),
     test_server:start_node(Name, peer, [{args, NewParam}, {erl, [this]}]);
-start_node(Name, Param, "this") ->
-    NewParam = Param ++ " -pa " ++ filename:dirname(code:which(?MODULE)),
+start_node(DCfg, Name, Param, "this") ->
+    NewParam = Param ++ " -pa " ++ filename:dirname(code:which(?MODULE)) ++ " " ++ DCfg,
     test_server:start_node(Name, peer, [{args, NewParam}, {erl, [this]}]);
-start_node(Name, Param, Rel) when is_atom(Rel) ->
-    NewParam = Param ++ " -pa " ++ filename:dirname(code:which(?MODULE)),
+start_node(DCfg, Name, Param, Rel) when is_atom(Rel) ->
+    NewParam = Param ++ " -pa " ++ filename:dirname(code:which(?MODULE)) ++ " " ++ DCfg,
     test_server:start_node(Name, peer, [{args, NewParam}, {erl, [{release, atom_to_list(Rel)}]}]);
-start_node(Name, Param, Rel) when is_list(Rel) ->
-    NewParam = Param ++ " -pa " ++ filename:dirname(code:which(?MODULE)),
+start_node(DCfg, Name, Param, Rel) when is_list(Rel) ->
+    NewParam = Param ++ " -pa " ++ filename:dirname(code:which(?MODULE)) ++ " " ++ DCfg,
     test_server:start_node(Name, peer, [{args, NewParam}, {erl, [{release, Rel}]}]).
 
-start_node(Name, Param) ->
-    NewParam = Param ++ " -pa " ++ filename:dirname(code:which(?MODULE)),
+start_node(DCfg, Name, Param) ->
+    NewParam = Param ++ " -pa " ++ filename:dirname(code:which(?MODULE)) ++ " " ++ DCfg,
     test_server:start_node(Name, slave, [{args, NewParam}]).
 
-start_node(Name) ->
-    start_node(Name, "").
+start_node(DCfg, Name) ->
+    start_node(DCfg, Name, "").
 
 stop_node(Node) ->
     test_server:stop_node(Node).
diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl
index a51025cba6..3bc8e6e828 100644
--- a/lib/kernel/test/file_SUITE.erl
+++ b/lib/kernel/test/file_SUITE.erl
@@ -2191,6 +2191,9 @@ unc_paths(Config) when is_list(Config) ->
             {ok, _} = file:read_file_info("C:\\Windows\\explorer.exe"),
             {ok, _} = file:read_file_info("\\\\localhost\\c$\\Windows\\explorer.exe"),
 
+            {ok, Files} = file:list_dir("C:\\Windows\\"),
+            {ok, Files} = file:list_dir("\\\\localhost\\c$\\Windows\\"),
+
             {ok, Cwd} = file:get_cwd(),
 
             try
@@ -3741,19 +3744,33 @@ otp_10852(Config) when is_list(Config) ->
     ok = rpc_call(Node, read_file, [B]),
     ok = rpc_call(Node, make_link, [B,B]),
     case rpc_call(Node, make_symlink, [B,B]) of
-	ok -> ok;
-	{error, E} when (E =:= enotsup) or (E =:= eperm) ->
-	    {win32,_} = os:type()
+        {error, eilseq} ->
+            %% Some versions of OS X refuse to create files with illegal names.
+            {unix,darwin} = os:type();
+        {error, eperm} ->
+            %% The test user might not have permission to create symlinks.
+            {win32,_} = os:type();
+        ok ->
+            ok
     end,
     ok = rpc_call(Node, delete, [B]),
-    ok = rpc_call(Node, make_dir, [B]),
+    case rpc_call(Node, make_dir, [B]) of
+        {error, eilseq} ->
+            {unix,darwin} = os:type();
+        ok ->
+            ok
+    end,
     ok = rpc_call(Node, del_dir, [B]),
-    ok = rpc_call(Node, write_file, [B,B]),
-    {ok, Fd} = rpc_call(Node, open, [B,[read]]),
-    ok = rpc_call(Node, close, [Fd]),
-    {ok,0} = rpc_call(Node, copy, [B,B]),
-    {ok, Fd2, B} = rpc_call(Node, path_open, [["."], B, [read]]),
-    ok = rpc_call(Node, close, [Fd2]),
+    case rpc_call(Node, write_file, [B,B]) of
+        {error, eilseq} ->
+            {unix,darwin} = os:type();
+        ok ->
+            {ok, Fd} = rpc_call(Node, open, [B,[read]]),
+            ok = rpc_call(Node, close, [Fd]),
+            {ok,0} = rpc_call(Node, copy, [B,B]),
+            {ok, Fd2, B} = rpc_call(Node, path_open, [["."], B, [read]]),
+            ok = rpc_call(Node, close, [Fd2])
+    end,
     true = test_server:stop_node(Node),
     ok.
 
@@ -4497,15 +4514,18 @@ run_large_file_test(Config, Run, Name) ->
 	{{unix,sunos},OsVersion} when OsVersion < {5,5,1} ->
 	    {skip,"Only supported on Win32, Unix or SunOS >= 5.5.1"};
 	{{unix,_},_} ->
-	    N = disc_free(proplists:get_value(priv_dir, Config)),
-	    io:format("Free disk: ~w KByte~n", [N]),
-	    if N < 5 * (1 bsl 20) ->
-		    %% Less than 5 GByte free
-		    {skip,"Less than 5 GByte free"};
-	       true ->
-		    do_run_large_file_test(Config, Run, Name)
-	    end;
-	_ -> 
+            case disc_free(proplists:get_value(priv_dir, Config)) of
+                error ->
+                    {skip, "Failed to query disk space for priv_dir. "
+                           "Is it on a remote file system?~n"};
+                N when N >= 5 * (1 bsl 20) ->
+                    ct:pal("Free disk: ~w KByte~n", [N]),
+                    do_run_large_file_test(Config, Run, Name);
+                N when N < 5 * (1 bsl 20) ->
+                    ct:pal("Free disk: ~w KByte~n", [N]),
+                    {skip,"Less than 5 GByte free"}
+            end;
+	_ ->
 	    {skip,"Only supported on Win32, Unix or SunOS >= 5.5.1"}
     end.
 
@@ -4539,12 +4559,18 @@ do_run_large_file_test(Config, Run, Name0) ->
 
 disc_free(Path) ->
     Data = disksup:get_disk_data(),
-    {_,Tot,Perc} = hd(lists:filter(
-			fun({P,_Size,_Full}) ->
-				lists:prefix(filename:nativename(P),
-					     filename:nativename(Path))
-			end, lists:reverse(lists:sort(Data)))),
-    round(Tot * (1-(Perc/100))).
+
+    %% What partitions could Data be mounted on?
+    Partitions =
+        [D || {P, _Tot, _Perc}=D <- Data,
+         lists:prefix(filename:nativename(P), filename:nativename(Path))],
+
+    %% Sorting in descending order places the partition with the most specific
+    %% path first.
+    case lists:sort(fun erlang:'>='/2, Partitions) of
+        [{_,Tot, Perc} | _] -> round(Tot * (1-(Perc/100)));
+        [] -> error
+    end.
 
 memsize() ->
     {Tot,_Used,_}  = memsup:get_memory_data(),
diff --git a/lib/kernel/test/file_name_SUITE.erl b/lib/kernel/test/file_name_SUITE.erl
index 3afc647081..26cfd187c7 100644
--- a/lib/kernel/test/file_name_SUITE.erl
+++ b/lib/kernel/test/file_name_SUITE.erl
@@ -632,10 +632,13 @@ make_icky_dir(Mod, IckyDirName) ->
 
 hopeless_darwin() ->
     case {os:type(),os:version()} of
-	{{unix,darwin},{Major,_,_}} when Major < 9 ->
-	    true;
-	_ ->
-	    false
+        {{unix,darwin},{Major,_,_}} ->
+            %% icky file names worked between 10 and 17, but started returning
+            %% EILSEQ in 18. The check against 18 is exact in case newer
+            %% versions of Darwin support them again.
+            Major < 9 orelse Major =:= 18;
+        _ ->
+            false
     end.
 
 make_very_icky_dir(Mod, DirName) ->
diff --git a/lib/kernel/test/gen_sctp_SUITE.erl b/lib/kernel/test/gen_sctp_SUITE.erl
index a0ae792ba9..e4c489bd10 100644
--- a/lib/kernel/test/gen_sctp_SUITE.erl
+++ b/lib/kernel/test/gen_sctp_SUITE.erl
@@ -1459,11 +1459,11 @@ do_open_and_connect(ServerAddresses, AddressToConnectTo) ->
     do_open_and_connect(ServerAddresses, AddressToConnectTo, Fun).
 %%
 do_open_and_connect(ServerAddresses, AddressToConnectTo, Fun) ->
-    ServerFamily = get_family_by_addrs(ServerAddresses),
+    {ServerFamily, ServerOpts} = get_family_by_addrs(ServerAddresses),
     io:format("Serving ~p addresses: ~p~n",
 	      [ServerFamily, ServerAddresses]),
     S1 = ok(gen_sctp:open(0, [{ip,Addr} || Addr <- ServerAddresses] ++
-			      [ServerFamily])),
+			      [ServerFamily|ServerOpts])),
     ok = gen_sctp:listen(S1, true),
     P1 = ok(inet:port(S1)),
     ClientFamily = get_family_by_addr(AddressToConnectTo),
@@ -1493,9 +1493,9 @@ do_open_and_connect(ServerAddresses, AddressToConnectTo, Fun) ->
 %% If at least one of the addresses is an ipv6 address, return inet6, else inet.
 get_family_by_addrs(Addresses) ->
     case lists:usort([get_family_by_addr(Addr) || Addr <- Addresses]) of
-	[inet, inet6] -> inet6;
-	[inet]        -> inet;
-	[inet6]       -> inet6
+	[inet, inet6] -> {inet6, [{ipv6_v6only, false}]};
+	[inet]        -> {inet,  []};
+	[inet6]       -> {inet6, []}
     end.
 
 get_family_by_addr(Addr) when tuple_size(Addr) =:= 4 -> inet;
diff --git a/lib/kernel/test/gen_tcp_api_SUITE_data/gen_tcp_api_SUITE.c b/lib/kernel/test/gen_tcp_api_SUITE_data/gen_tcp_api_SUITE.c
index b91dca61d4..96938f9071 100644
--- a/lib/kernel/test/gen_tcp_api_SUITE_data/gen_tcp_api_SUITE.c
+++ b/lib/kernel/test/gen_tcp_api_SUITE_data/gen_tcp_api_SUITE.c
@@ -30,6 +30,7 @@
 #define sock_close(s) closesocket(s)
 #else
 #include <sys/socket.h>
+#include <unistd.h>
 #define sock_close(s) close(s)
 #endif
 
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index 244bd7e2a0..de87bd9472 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2019. 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,7 @@
 	 init_per_group/2,end_per_group/2, 
 	 controlling_process/1, controlling_process_self/1,
 	 no_accept/1, close_with_pending_output/1, active_n/1,
+         active_n_closed/1,
 	 data_before_close/1,
 	 iter_max_socks/0, iter_max_socks/1,
 	 get_status/1,
@@ -36,7 +37,8 @@
 	 show_econnreset_passive/1, econnreset_after_sync_send/1,
 	 econnreset_after_async_send_active/1,
 	 econnreset_after_async_send_active_once/1,
-	 econnreset_after_async_send_passive/1, linger_zero/1,
+	 econnreset_after_async_send_passive/1,
+         linger_zero/1, linger_zero_sndbuf/1,
 	 default_options/1, http_bad_packet/1, 
 	 busy_send/1, busy_disconnect_passive/1, busy_disconnect_active/1,
 	 fill_sendq/1, partial_recv_and_close/1, 
@@ -53,7 +55,7 @@
 	 active_once_closed/1, send_timeout/1, send_timeout_active/1,
          otp_7731/1, zombie_sockets/1, otp_7816/1, otp_8102/1,
          wrapping_oct/0, wrapping_oct/1, otp_9389/1, otp_13939/1,
-         otp_12242/1]).
+         otp_12242/1, delay_send_error/1]).
 
 %% Internal exports.
 -export([sender/3, not_owner/1, passive_sockets_server/2, priority_server/1, 
@@ -73,14 +75,15 @@ suite() ->
 all() -> 
     [controlling_process, controlling_process_self, no_accept,
      close_with_pending_output, data_before_close,
-     iter_max_socks, passive_sockets, active_n,
+     iter_max_socks, passive_sockets, active_n, active_n_closed,
      accept_closed_by_other_process, otp_3924, closed_socket,
      shutdown_active, shutdown_passive, shutdown_pending,
      show_econnreset_active, show_econnreset_active_once,
      show_econnreset_passive, econnreset_after_sync_send,
      econnreset_after_async_send_active,
      econnreset_after_async_send_active_once,
-     econnreset_after_async_send_passive, linger_zero,
+     econnreset_after_async_send_passive,
+     linger_zero, linger_zero_sndbuf,
      default_options, http_bad_packet, busy_send,
      busy_disconnect_passive, busy_disconnect_active,
      fill_sendq, partial_recv_and_close,
@@ -97,7 +100,7 @@ all() ->
      active_once_closed, send_timeout, send_timeout_active, otp_7731,
      wrapping_oct,
      zombie_sockets, otp_7816, otp_8102, otp_9389,
-     otp_12242].
+     otp_12242, delay_send_error].
 
 groups() -> 
     [].
@@ -1356,7 +1359,42 @@ linger_zero(Config) when is_list(Config) ->
     ok = gen_tcp:close(Client),
     ok = ct:sleep(1),
     undefined = erlang:port_info(Client, connected),
-    {error, econnreset} = gen_tcp:recv(S, PayloadSize).
+    {error, econnreset} = gen_tcp:recv(S, PayloadSize),
+    ok.
+
+
+linger_zero_sndbuf(Config) when is_list(Config) ->
+    %% All the econnreset tests will prove that {linger, {true, 0}} aborts
+    %% a connection when the driver queue is empty. We will test here
+    %% that it also works when the driver queue is not empty
+    %% and the linger zero option is set on the listen socket.
+    {OS, _} = os:type(),
+    {ok, Listen} =
+        gen_tcp:listen(0, [{active, false},
+                           {recbuf, 4096},
+                           {show_econnreset, true},
+                           {linger, {true, 0}}]),
+    {ok, Port} = inet:port(Listen),
+    {ok, Client} =
+        gen_tcp:connect(localhost, Port,
+				   [{active, false},
+				    {sndbuf, 4096}]),
+    {ok, Server} = gen_tcp:accept(Listen),
+    ok = gen_tcp:close(Listen),
+    PayloadSize = 1024 * 1024,
+    Payload = binary:copy(<<"0123456789ABCDEF">>, 256 * 1024), % 1 MB
+    ok = gen_tcp:send(Server, Payload),
+    case erlang:port_info(Server, queue_size) of
+	{queue_size, N} when N > 0 -> ok;
+	{queue_size, 0} when OS =:= win32 -> ok;
+	{queue_size, 0} = T -> ct:fail(T)
+    end,
+    {ok, [{linger, {true, 0}}]} = inet:getopts(Server, [linger]),
+    ok = gen_tcp:close(Server),
+    ok = ct:sleep(1),
+    undefined = erlang:port_info(Server, connected),
+    {error, closed} = gen_tcp:recv(Client, PayloadSize),
+    ok.
 
 
 %% Thanks to Luke Gorrie. Tests for a very specific problem with 
@@ -1981,10 +2019,10 @@ recvtclass(_Config) ->
 %% platforms - change {unix,_} to false?
 
 %% pktoptions is not supported for IPv4
-recvtos_ok({unix,openbsd}, OSVer) -> not semver_lt(OSVer, {6,4,0});
+recvtos_ok({unix,openbsd}, OSVer) -> not semver_lt(OSVer, {6,6,0});
 recvtos_ok({unix,darwin}, OSVer) -> not semver_lt(OSVer, {19,0,0});
 %% Using the option returns einval, so it is not implemented.
-recvtos_ok({unix,freebsd}, OSVer) -> not semver_lt(OSVer, {11,2,0});
+recvtos_ok({unix,freebsd}, OSVer) -> not semver_lt(OSVer, {12,1,0});
 recvtos_ok({unix,sunos}, OSVer) -> not semver_lt(OSVer, {5,12,0});
 %% Does not return any value - not implemented for pktoptions
 recvtos_ok({unix,linux}, OSVer) -> not semver_lt(OSVer, {3,1,0});
@@ -1993,10 +2031,10 @@ recvtos_ok({unix,_}, _) -> true;
 recvtos_ok(_, _) -> false.
 
 %% pktoptions is not supported for IPv4
-recvttl_ok({unix,openbsd}, OSVer) -> not semver_lt(OSVer, {6,4,0});
+recvttl_ok({unix,openbsd}, OSVer) -> not semver_lt(OSVer, {6,6,0});
 recvttl_ok({unix,darwin}, OSVer) -> not semver_lt(OSVer, {19,0,0});
 %% Using the option returns einval, so it is not implemented.
-recvttl_ok({unix,freebsd}, OSVer) -> not semver_lt(OSVer, {11,2,0});
+recvttl_ok({unix,freebsd}, OSVer) -> not semver_lt(OSVer, {12,1,0});
 recvttl_ok({unix,sunos}, OSVer) -> not semver_lt(OSVer, {5,12,0});
 %% Does not return any value - not implemented for pktoptions
 recvttl_ok({unix,linux}, OSVer) -> not semver_lt(OSVer, {2,7,0});
@@ -2005,11 +2043,11 @@ recvttl_ok({unix,_}, _) -> true;
 recvttl_ok(_, _) -> false.
 
 %% pktoptions is not supported for IPv6
-recvtclass_ok({unix,openbsd}, OSVer) -> not semver_lt(OSVer, {6,4,0});
+recvtclass_ok({unix,openbsd}, OSVer) -> not semver_lt(OSVer, {6,6,0});
 recvtclass_ok({unix,darwin}, OSVer) -> not semver_lt(OSVer, {19,0,0});
 recvtclass_ok({unix,sunos}, OSVer) -> not semver_lt(OSVer, {5,12,0});
 %% Using the option returns einval, so it is not implemented.
-recvtclass_ok({unix,freebsd}, OSVer) -> not semver_lt(OSVer, {11,2,0});
+recvtclass_ok({unix,freebsd}, OSVer) -> not semver_lt(OSVer, {12,1,0});
 %% Does not return any value - not implemented for pktoptions
 recvtclass_ok({unix,linux}, OSVer) -> not semver_lt(OSVer, {3,1,0});
 %%
@@ -2086,8 +2124,39 @@ test_pktoptions(Family, Spec, CheckConnect, OSType, OSVer) ->
 %%%    {ok,<<"hi">>} = gen_tcp:recv(S1, 2, Timeout),
     %%
     %% Verify returned remote options
-    {ok,[{pktoptions,OptsVals1}]} = inet:getopts(S1, [pktoptions]),
-    {ok,[{pktoptions,OptsVals2}]} = inet:getopts(S2, [pktoptions]),
+    VerifyRemOpts =
+        fun(S, Role) ->
+                case inet:getopts(S, [pktoptions]) of
+                    {ok, [{pktoptions, PktOpts1}]} ->
+                        PktOpts1;
+                    {ok, UnexpOK1} ->
+                        io:format("Unexpected OK (~w): "
+                                  "~n   ~p"
+                                  "~n", [Role, UnexpOK1]),
+                        exit({unexpected_getopts_ok,
+                              Role,
+                              Spec,
+                              TrueRecvOpts,
+                              OptsVals,
+                              OptsValsDefault,
+                              UnexpOK1});
+                    {error, UnexpERR1} ->
+                        io:format("Unexpected ERROR (~w): "
+                                  "~n   ~p"
+                                  "~n", [Role, UnexpERR1]),
+                        exit({unexpected_getopts_failure,
+                              Role,
+                              Spec,
+                              TrueRecvOpts,
+                              OptsVals,
+                              OptsValsDefault,
+                              UnexpERR1})
+                end
+        end,
+    OptsVals1 = VerifyRemOpts(S1, dest),
+    OptsVals2 = VerifyRemOpts(S2, orig),
+    %% {ok,[{pktoptions,OptsVals1}]} = inet:getopts(S1, [pktoptions]),
+    %% {ok,[{pktoptions,OptsVals2}]} = inet:getopts(S2, [pktoptions]),
     (Result1 = sets_eq(OptsVals1, OptsVals))
         orelse io:format(
                  "Accept differs: ~p neq ~p~n", [OptsVals1,OptsVals]),
@@ -2155,18 +2224,19 @@ collect_accepts(N,Tmo) ->
     A = millis(),
     receive
 	{accepted,P,Msg} ->
-	    [{P,Msg}] ++ collect_accepts(N-1,Tmo-(millis() - A))
+            NextN = if N =:= infinity -> N; true -> N - 1 end,
+	    [{P,Msg}] ++ collect_accepts(NextN, Tmo - (millis()-A))
     after Tmo ->
 	    []
     end.
    
 -define(EXPECT_ACCEPTS(Pattern,N,Timeout),
 	(fun() ->
-                 case collect_accepts(if N =:= infinity -> -1; true -> N end,Timeout) of
+                 case collect_accepts((N), (Timeout)) of
 		     Pattern ->
 			 ok;
-		     Other ->
-			 {error,{unexpected,{Other,process_info(self(),messages)}}}
+		     Other__ ->
+			 {error,{unexpected,{Other__,process_info(self(),messages)}}}
 		 end
 	 end)()).
 	
@@ -2551,7 +2621,51 @@ active_once_closed(Config) when is_list(Config) ->
 	     ok = inet:setopts(A,[{active,once}]),
 	     ok = receive {tcp_closed, A} -> ok after 1000 -> error end
      end)().
-   
+
+%% Check that active n and tcp_close messages behave as expected.
+active_n_closed(Config) when is_list(Config) ->
+    {ok, L} = gen_tcp:listen(0, [binary, {active, false}]),
+
+    P = self(),
+
+    {ok,Port} = inet:port(L),
+
+    spawn_link(fun() ->
+                       Payload = <<0:50000/unit:8>>,
+                       Cnt = 10000,
+                       P ! {size,Cnt * byte_size(Payload)},
+                       {ok, S} = gen_tcp:connect("localhost", Port, [binary, {active, false}]),
+                       _ = [gen_tcp:send(S, Payload) || _ <- lists:seq(1, Cnt)],
+                       gen_tcp:close(S)
+          end),
+
+    receive {size,SendSize} -> SendSize end,
+    {ok, S} = gen_tcp:accept(L),
+    inet:setopts(S, [{active, 10}]),
+    RecvSize =
+        (fun Server(Size) ->
+                 receive
+                     {tcp, S, Bin} ->
+                         Server(byte_size(Bin) + Size);
+                     {tcp_closed, S} ->
+                         Size;
+                     {tcp_passive, S} ->
+                         inet:setopts(S, [{active, 10}]),
+                         Server(Size);
+                     Msg ->
+                         io:format("~p~n", [Msg]),
+                         Server(Size)
+                 end
+         end)(0),
+
+    gen_tcp:close(L),
+
+    if SendSize =:= RecvSize ->
+            ok;
+       true ->
+            ct:fail("Send and Recv size not equal: ~p ~p",[SendSize, RecvSize])
+    end.
+
 %% Test the send_timeout socket option.
 send_timeout(Config) when is_list(Config) ->
     Dir = filename:dirname(code:which(?MODULE)),
@@ -3427,3 +3541,32 @@ otp_12242(Addr) when tuple_size(Addr) =:= 4 ->
 
 wait(Mref) ->
     receive {'DOWN',Mref,_,_,Reason} -> Reason end.
+
+%% OTP-15536
+%% Test that send error works correctly for delay_send
+delay_send_error(_Config) ->
+    {ok, LS} = gen_tcp:listen(0, [{reuseaddr, true}, {packet, 1}, {active, false}]),
+    {ok,{{0,0,0,0},PortNum}}=inet:sockname(LS),
+    P = spawn_link(
+          fun() ->
+                  {ok, S} = gen_tcp:accept(LS),
+                  receive die -> gen_tcp:close(S) end
+          end),
+    erlang:monitor(process, P),
+    {ok, S} = gen_tcp:connect("localhost", PortNum,
+                              [{packet, 1}, {active, false}, {delay_send, true}]),
+
+    %% Do a couple of sends first to see that it works
+    ok = gen_tcp:send(S, "hello"),
+    ok = gen_tcp:send(S, "hello"),
+    ok = gen_tcp:send(S, "hello"),
+
+    %% Make the receiver close
+    P ! die,
+    receive _Down -> ok end,
+
+    ok = gen_tcp:send(S, "hello"),
+    timer:sleep(500), %% Sleep in order for delay_send to have time to trigger
+
+    %% This used to result in a double free
+    {error, closed} = gen_tcp:send(S, "hello").
diff --git a/lib/kernel/test/gen_udp_SUITE.erl b/lib/kernel/test/gen_udp_SUITE.erl
index af9985de45..70d8caf478 100644
--- a/lib/kernel/test/gen_udp_SUITE.erl
+++ b/lib/kernel/test/gen_udp_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@
 	 buffer_size/1, binary_passive_recv/1, max_buffer_size/1, bad_address/1,
 	 read_packets/1, open_fd/1, connect/1, implicit_inet6/1,
          recvtos/1, recvtosttl/1, recvttl/1, recvtclass/1,
+         sendtos/1, sendtosttl/1, sendttl/1, sendtclass/1,
 	 local_basic/1, local_unbound/1,
 	 local_fdopen/1, local_fdopen_unbound/1, local_abstract/1]).
 
@@ -49,6 +50,7 @@ all() ->
      bad_address, read_packets, open_fd, connect,
      implicit_inet6, active_n,
      recvtos, recvtosttl, recvttl, recvtclass,
+     sendtos, sendtosttl, sendttl, sendtclass,
      {group, local}].
 
 groups() -> 
@@ -312,7 +314,6 @@ read_packets(Config) when is_list(Config) ->
     {ok,R} = gen_udp:open(0, [{read_packets,N1}]),
     {ok,RP} = inet:port(R),
     {ok,Node} = start_node(gen_udp_SUITE_read_packets),
-    Die = make_ref(),
     %%
     {V1, Trace1} = read_packets_test(R, RP, Msgs, Node),
     {ok,[{read_packets,N1}]} = inet:getopts(R, [read_packets]),
@@ -324,7 +325,7 @@ read_packets(Config) when is_list(Config) ->
     stop_node(Node),
     ct:log("N1=~p, V1=~p vs N2=~p, V2=~p",[N1,V1,N2,V2]),
 
-    dump_terms(Config, "trace1.terms", Trace2),
+    dump_terms(Config, "trace1.terms", Trace1),
     dump_terms(Config, "trace2.terms", Trace2),
 
     %% Because of the inherit racy-ness of the feature it is
@@ -348,15 +349,6 @@ dump_terms(Config, Name, Terms) ->
     file:write_file(FName, term_to_binary(Terms)),
     ct:log("Logged terms to ~s",[FName]).
 
-infinite_loop(Die) ->
-    receive 
-	Die ->
-	    ok
-    after
-	0 ->
-	    infinite_loop(Die)
-    end.
-
 read_packets_test(R, RP, Msgs, Node) ->
     Receiver = self(),
     Tracer =
@@ -577,19 +569,19 @@ active_n(Config) when is_list(Config) ->
 
 recvtos(_Config) ->
     test_recv_opts(
-      inet, [{recvtos,tos,96}],
+      inet, [{recvtos,tos,96}], false,
       fun recvtos_ok/2).
 
 recvtosttl(_Config) ->
     test_recv_opts(
-      inet, [{recvtos,tos,96},{recvttl,ttl,33}],
+      inet, [{recvtos,tos,96},{recvttl,ttl,33}], false,
       fun (OSType, OSVer) ->
               recvtos_ok(OSType, OSVer) andalso recvttl_ok(OSType, OSVer)
       end).
 
 recvttl(_Config) ->
     test_recv_opts(
-      inet, [{recvttl,ttl,33}],
+      inet, [{recvttl,ttl,33}], false,
       fun recvttl_ok/2).
 
 recvtclass(_Config) ->
@@ -601,15 +593,48 @@ recvtclass(_Config) ->
     of
         [_] ->
             test_recv_opts(
-              inet6, [{recvtclass,tclass,224}],
+              inet6, [{recvtclass,tclass,224}], false,
               fun recvtclass_ok/2);
         [] ->
             {skip,ipv6_not_supported,IFs}
     end.
 
+
+sendtos(_Config) ->
+    test_recv_opts(
+      inet, [{recvtos,tos,96}], true,
+      fun sendtos_ok/2).
+
+sendtosttl(_Config) ->
+    test_recv_opts(
+      inet, [{recvtos,tos,96},{recvttl,ttl,33}], true,
+      fun (OSType, OSVer) ->
+              sendtos_ok(OSType, OSVer) andalso sendttl_ok(OSType, OSVer)
+      end).
+
+sendttl(_Config) ->
+    test_recv_opts(
+      inet, [{recvttl,ttl,33}], true,
+      fun sendttl_ok/2).
+
+sendtclass(_Config) ->
+    {ok,IFs} = inet:getifaddrs(),
+    case
+        [Name ||
+            {Name,Opts} <- IFs,
+            lists:member({addr,{0,0,0,0,0,0,0,1}}, Opts)]
+    of
+        [_] ->
+            test_recv_opts(
+              inet6, [{recvtclass,tclass,224}], true,
+              fun sendtclass_ok/2);
+        [] ->
+            {skip,ipv6_not_supported,IFs}
+    end.
+
 %% These version numbers are just above the highest noted in daily tests
 %% where the test fails for a plausible reason, that is the lowest
-%% where we can expect that the test mighe succeed, so
+%% where we can expect that the test might succeed, so
 %% skip on platforms lower than this.
 %%
 %% On newer versions it might be fixed, but we'll see about that
@@ -621,23 +646,65 @@ recvtclass(_Config) ->
 %% Using the option returns einval, so it is not implemented.
 recvtos_ok({unix,darwin}, OSVer) -> not semver_lt(OSVer, {17,6,0});
 %% Using the option returns einval, so it is not implemented.
-recvtos_ok({unix,openbsd}, OSVer) -> not semver_lt(OSVer, {6,4,0});
+recvtos_ok({unix,openbsd}, OSVer) -> not semver_lt(OSVer, {6,6,0});
 %% Using the option returns einval, so it is not implemented.
 recvtos_ok({unix,sunos}, OSVer) -> not semver_lt(OSVer, {5,12,0});
 %%
 recvtos_ok({unix,_}, _) -> true;
 recvtos_ok(_, _) -> false.
 
+%% Option has no effect
+recvttl_ok({unix,sunos}, OSVer) -> not semver_lt(OSVer, {5,12,0});
+%%
 recvttl_ok({unix,_}, _) -> true;
 recvttl_ok(_, _) -> false.
 
 %% Using the option returns einval, so it is not implemented.
 recvtclass_ok({unix,darwin}, OSVer) -> not semver_lt(OSVer, {9,9,0});
 recvtclass_ok({unix,linux}, OSVer) -> not semver_lt(OSVer, {2,6,11});
+%% Option has no effect
+recvtclass_ok({unix,sunos}, OSVer) -> not semver_lt(OSVer, {5,12,0});
 %%
 recvtclass_ok({unix,_}, _) -> true;
 recvtclass_ok(_, _) -> false.
 
+
+%% To send ancillary data seems to require much higher version numbers
+%% than receiving it...
+%%
+
+%% Using the option returns einval, so it is not implemented.
+sendtos_ok({unix,darwin}, OSVer) -> not semver_lt(OSVer, {19,0,0});
+sendtos_ok({unix,openbsd}, OSVer) -> not semver_lt(OSVer, {6,6,0});
+sendtos_ok({unix,sunos}, OSVer) -> not semver_lt(OSVer, {5,12,0});
+sendtos_ok({unix,linux}, OSVer) -> not semver_lt(OSVer, {4,0,0});
+sendtos_ok({unix,freebsd}, OSVer) -> not semver_lt(OSVer, {12,1,0});
+%%
+sendtos_ok({unix,_}, _) -> true;
+sendtos_ok(_, _) -> false.
+
+%% Using the option returns einval, so it is not implemented.
+sendttl_ok({unix,darwin}, OSVer) -> not semver_lt(OSVer, {19,0,0});
+sendttl_ok({unix,linux}, OSVer) -> not semver_lt(OSVer, {4,0,0});
+%% Using the option returns enoprotoopt, so it is not implemented.
+sendttl_ok({unix,freebsd}, OSVer) -> not semver_lt(OSVer, {12,1,0});
+%% Option has no effect
+sendttl_ok({unix,sunos}, OSVer) -> not semver_lt(OSVer, {5,12,0});
+sendttl_ok({unix,openbsd}, OSVer) -> not semver_lt(OSVer, {6,6,0});
+%%
+sendttl_ok({unix,_}, _) -> true;
+sendttl_ok(_, _) -> false.
+
+%% Using the option returns einval, so it is not implemented.
+sendtclass_ok({unix,darwin}, OSVer) -> not semver_lt(OSVer, {9,9,0});
+sendtclass_ok({unix,linux}, OSVer) -> not semver_lt(OSVer, {2,6,11});
+%% Option has no effect
+sendtclass_ok({unix,sunos}, OSVer) -> not semver_lt(OSVer, {5,12,0});
+%%
+sendtclass_ok({unix,_}, _) -> true;
+sendtclass_ok(_, _) -> false.
+
+
 semver_lt({X1,Y1,Z1}, {X2,Y2,Z2}) ->
     if
         X1 > X2 -> false;
@@ -650,18 +717,18 @@ semver_lt({X1,Y1,Z1}, {X2,Y2,Z2}) ->
     end;
 semver_lt(_, {_,_,_}) -> false.
 
-test_recv_opts(Family, Spec, OSFilter) ->
+test_recv_opts(Family, Spec, TestSend, OSFilter) ->
     OSType = os:type(),
     OSVer = os:version(),
     case OSFilter(OSType, OSVer) of
         true ->
             io:format("Os: ~p, ~p~n", [OSType,OSVer]),
-            test_recv_opts(Family, Spec, OSType, OSVer);
+            test_recv_opts(Family, Spec, TestSend, OSType, OSVer);
         false ->
             {skip,{not_supported_for_os_version,{OSType,OSVer}}}
     end.
 %%
-test_recv_opts(Family, Spec, _OSType, _OSVer) ->
+test_recv_opts(Family, Spec, TestSend, _OSType, _OSVer) ->
     Timeout = 5000,
     RecvOpts = [RecvOpt || {RecvOpt,_,_} <- Spec],
     TrueRecvOpts = [{RecvOpt,true} || {RecvOpt,_,_} <- Spec],
@@ -686,16 +753,33 @@ test_recv_opts(Family, Spec, _OSType, _OSVer) ->
     ok = inet:setopts(S1, TrueRecvOpts_OptsVals),
     {ok,TrueRecvOpts_OptsVals} = inet:getopts(S1, RecvOpts ++ Opts),
     %%
+    %% S1 now has true receive options and set option values
+    %%
     {ok,S2} =
         gen_udp:open(0, [Family,binary,{active,true}|FalseRecvOpts]),
     {ok,P2} = inet:port(S2),
     {ok,FalseRecvOpts_OptsVals2} = inet:getopts(S2, RecvOpts ++ Opts),
     OptsVals2 = FalseRecvOpts_OptsVals2 -- FalseRecvOpts,
     %%
-    ok = gen_udp:send(S2, Addr, P1, <<"abcde">>),
+    %% S2 now has false receive options and default option values,
+    %% OptsVals2 contains the default option values
+    %%
+    ok = gen_udp:send(S2, {Addr,P1}, <<"abcde">>),
     ok = gen_udp:send(S1, Addr, P2, <<"fghij">>),
+    TestSend andalso
+        begin
+            ok = gen_udp:send(S2, Addr, P1, OptsVals, <<"ABCDE">>),
+            ok = gen_udp:send(S2, {Addr,P1}, OptsVals, <<"12345">>)
+        end,
     {ok,{_,P2,OptsVals3,<<"abcde">>}} = gen_udp:recv(S1, 0, Timeout),
     verify_sets_eq(OptsVals3, OptsVals2),
+    TestSend andalso
+        begin
+            {ok,{_,P2,OptsVals0,<<"ABCDE">>}} = gen_udp:recv(S1, 0, Timeout),
+            {ok,{_,P2,OptsVals1,<<"12345">>}} = gen_udp:recv(S1, 0, Timeout),
+            verify_sets_eq(OptsVals0, OptsVals),
+            verify_sets_eq(OptsVals1, OptsVals)
+        end,
     receive
         {udp,S2,_,P1,<<"fghij">>} ->
             ok;
@@ -710,8 +794,16 @@ test_recv_opts(Family, Spec, _OSType, _OSVer) ->
     ok = inet:setopts(S2, TrueRecvOpts),
     {ok,TrueRecvOpts} = inet:getopts(S2, RecvOpts),
     %%
-    ok = gen_udp:send(S2, Addr, P1, <<"klmno">>),
-    ok = gen_udp:send(S1, Addr, P2, <<"pqrst">>),
+    %% S1 now has false receive options and set option values
+    %%
+    %% S2 now has true receive options and default option values
+    %%
+    ok = gen_udp:send(S2, {Addr,P1}, [], <<"klmno">>),
+    ok = gen_udp:send(S1, {Family,{loopback,P2}}, <<"pqrst">>),
+    TestSend andalso
+        begin
+            ok = gen_udp:send(S1, {Family,{loopback,P2}}, OptsVals2, <<"PQRST">>)
+        end,
     {ok,{_,P2,<<"klmno">>}} = gen_udp:recv(S1, 0, Timeout),
     receive
         {udp,S2,_,P1,OptsVals4,<<"pqrst">>} ->
@@ -721,9 +813,18 @@ test_recv_opts(Family, Spec, _OSType, _OSVer) ->
     after Timeout ->
             exit(timeout)
     end,
+    TestSend andalso
+        receive
+            {udp,S2,_,P1,OptsVals5,<<"PQRST">>} ->
+                verify_sets_eq(OptsVals5, OptsVals2);
+            Other3 ->
+                exit({unexpected,Other3})
+        after Timeout ->
+                exit(timeout)
+        end,
     ok = gen_udp:close(S1),
     ok = gen_udp:close(S2),
-%%    exit({{OSType,OSVer},success}), % In search for the truth
+%%%    exit({{_OSType,_OSVer},success}), % In search for the truth
     ok.
 
 verify_sets_eq(L1, L2) ->
@@ -877,6 +978,10 @@ connect(Config) when is_list(Config) ->
 implicit_inet6(Config) when is_list(Config) ->
     Host = ok(inet:gethostname()),
     case inet:getaddr(Host, inet6) of
+	{ok,{16#fe80,0,0,0,_,_,_,_} = Addr} ->
+	    {skip,
+	     "Got link local IPv6 address: "
+	     ++inet:ntoa(Addr)};
 	{ok,Addr} ->
 	    implicit_inet6(Host, Addr);
 	{error,Reason} ->
@@ -927,11 +1032,12 @@ ok({ok,V}) -> V;
 ok(NotOk) ->
     try throw(not_ok)
     catch
-	throw:Thrown:Stacktrace ->
-	    erlang:raise(
-	      error, {Thrown, NotOk}, tl(Stacktrace))
+	throw:not_ok:Stacktrace ->
+	    raise_error({not_ok, NotOk}, tl(Stacktrace))
     end.
 
+raise_error(Reason, Stacktrace) ->
+    erlang:raise(error, Reason, Stacktrace).
 
 local_filename(Tag) ->
     "/tmp/" ?MODULE_STRING "_" ++ os:getpid() ++ "_" ++ atom_to_list(Tag).
diff --git a/lib/kernel/test/inet_SUITE.erl b/lib/kernel/test/inet_SUITE.erl
index f436eafad3..44ec7e7076 100644
--- a/lib/kernel/test/inet_SUITE.erl
+++ b/lib/kernel/test/inet_SUITE.erl
@@ -21,6 +21,7 @@
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/inet.hrl").
+-include_lib("kernel/src/inet_res.hrl").
 -include_lib("kernel/src/inet_dns.hrl").
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
@@ -34,7 +35,7 @@
 	 ipv4_to_ipv6/0, ipv4_to_ipv6/1,
 	 host_and_addr/0, host_and_addr/1,
 	 t_gethostnative/1, 
-	 gethostnative_parallell/1, cname_loop/1, 
+	 gethostnative_parallell/1, cname_loop/1, missing_hosts_reload/1,
          gethostnative_soft_restart/0, gethostnative_soft_restart/1,
 	 gethostnative_debug_level/0, gethostnative_debug_level/1,
 	 lookup_bad_search_option/1,
@@ -56,7 +57,7 @@ all() ->
     [t_gethostbyaddr, t_gethostbyname, t_getaddr,
      t_gethostbyaddr_v6, t_gethostbyname_v6, t_getaddr_v6,
      ipv4_to_ipv6, host_and_addr, {group, parse},
-     t_gethostnative, gethostnative_parallell, cname_loop,
+     t_gethostnative, gethostnative_parallell, cname_loop, missing_hosts_reload,
      gethostnative_debug_level, gethostnative_soft_restart,
      lookup_bad_search_option,
      getif, getif_ifr_name_overflow, getservbyname_overflow,
@@ -97,7 +98,7 @@ end_per_group(_GroupName, Config) ->
 init_per_testcase(lookup_bad_search_option, Config) ->
     Db = inet_db,
     Key = res_lookup,
-    %% The bad option can not enter through inet_db:set_lookup/1,
+    %% The bad option cannot enter through inet_db:set_lookup/1,
     %% but through e.g .inetrc.
     Prev = ets:lookup(Db, Key),
     ets:delete(Db, Key),
@@ -840,6 +841,32 @@ cname_loop(Config) when is_list(Config) ->
     ok.
 
 
+%% Test that hosts file gets reloaded correctly in case when it
+% was missing during initial startup
+missing_hosts_reload(Config) when is_list(Config) ->
+    RootDir = proplists:get_value(priv_dir,Config),
+    HostsFile = filename:join(RootDir, atom_to_list(?MODULE) ++ ".hosts"),
+    InetRc = filename:join(RootDir, "inetrc"),
+    ok = file:write_file(InetRc, "{hosts_file, \"" ++ HostsFile ++ "\"}.\n"),
+    {error, enoent} = file:read_file_info(HostsFile),
+    % start a node
+    Pa = filename:dirname(code:which(?MODULE)),
+    {ok, TestNode} = test_server:start_node(?MODULE, slave,
+        [{args, "-pa " ++ Pa ++ " -kernel inetrc '\"" ++ InetRc ++ "\"'"}]),
+    % ensure it has our RC
+    Rc = rpc:call(TestNode, inet_db, get_rc, []),
+    {hosts_file, HostsFile} = lists:keyfind(hosts_file, 1, Rc),
+    % ensure it does not resolve
+    {error, nxdomain} = rpc:call(TestNode, inet_hosts, gethostbyname, ["somehost"]),
+    % write hosts file
+    ok = file:write_file(HostsFile, "1.2.3.4 somehost"),
+    % wait for cached timestamp to expire
+    timer:sleep(?RES_FILE_UPDATE_TM * 1000 + 100),
+    % ensure it DOES resolve
+    {ok,{hostent,"somehost",[],inet,4,[{1,2,3,4}]}} =
+        rpc:call(TestNode, inet_hosts, gethostbyname, ["somehost"]),
+    % cleanup
+    true = test_server:stop_node(TestNode).
 
 %% These must be run in the whole suite since they need
 %% the host list and require inet_gethost_native to be started.
diff --git a/lib/kernel/test/inet_res_SUITE.erl b/lib/kernel/test/inet_res_SUITE.erl
index df6e48abae..6b545fa414 100644
--- a/lib/kernel/test/inet_res_SUITE.erl
+++ b/lib/kernel/test/inet_res_SUITE.erl
@@ -46,15 +46,16 @@
 %% a temporary local nameserver BIND 8 or 9 that must be installed
 %% on your machine.
 %%
-%% For example, on Ubuntu 14.04, as root:
+%% For example, on Ubuntu 16.04 / 18.04, as root:
 %%     apt-get install bind9
 %% Now, that is not enough since Apparmor will not allow
 %% the nameserver daemon /usr/sbin/named to read from the test directory.
 %% Assuming that you run tests in /ldisk/daily_build, and still on
-%% Ubuntu 14.04, make /usr/apparmor.d/local/usr.sbin.named contain:
+%% Ubuntu 14.04, make /etc/apparmor.d/local/usr.sbin.named contain:
 %%     /ldisk/daily_build/** r,
 %% And yes; the trailing comma must be there...
-
+%% And yes; create the file if it does not exist.
+%% And yes; restart the apparmor daemon using "service apparmor restart"
 
 
 suite() ->
@@ -531,7 +532,7 @@ edns0(Config) when is_list(Config) ->
 		    case os:version() of
 			{M,V,_} when M < 5;  M == 5, V =< 8 ->
 			    %% In our test park only known platform
-			    %% with an DNS resolver that can not do
+			    %% with an DNS resolver that cannot do
 			    %% EDNS0.
 			    {comment,"No EDNS0"}
 		    end
diff --git a/lib/kernel/test/init_SUITE.erl b/lib/kernel/test/init_SUITE.erl
index 6a006cdc01..a0154b2694 100644
--- a/lib/kernel/test/init_SUITE.erl
+++ b/lib/kernel/test/init_SUITE.erl
@@ -295,7 +295,7 @@ is_real_system(KernelVsn, StdlibVsn) ->
 %% before restart.
 %% ------------------------------------------------
 many_restarts() ->
-    [{timetrap,{minutes,8}}].
+    [{timetrap,{minutes,16}}].
 
 many_restarts(Config) when is_list(Config) ->
     {ok, Node} = loose_node:start(init_test, "", ?DEFAULT_TIMEOUT_SEC),
@@ -315,7 +315,7 @@ loop_restart(N,Node,EHPid) ->
 	    loose_node:stop(Node),
 	    ct:fail(not_stopping)
     end,
-    ok = wait_for(30, Node, EHPid),
+    ok = wait_for(60, Node, EHPid),
     loop_restart(N-1,Node,rpc:call(Node,erlang,whereis,[logger])).
 
 wait_for(0,Node,_) ->
@@ -367,7 +367,8 @@ restart(Config) when is_list(Config) ->
     SysProcs0 = rpc:call(Node, ?MODULE, find_system_processes, []),
     io:format("SysProcs0=~p~n", [SysProcs0]),
     [InitPid, PurgerPid, LitCollectorPid,
-     DirtySigNPid, DirtySigHPid, DirtySigMPid] = SysProcs0,
+     DirtySigNPid, DirtySigHPid, DirtySigMPid,
+     PrimFilePid] = SysProcs0,
     InitPid = rpc:call(Node, erlang, whereis, [init]),
     PurgerPid = rpc:call(Node, erlang, whereis, [erts_code_purger]),
     Procs = rpc:call(Node, erlang, processes, []),
@@ -385,7 +386,8 @@ restart(Config) when is_list(Config) ->
     SysProcs1 = rpc:call(Node, ?MODULE, find_system_processes, []),
     io:format("SysProcs1=~p~n", [SysProcs1]),
     [InitPid1, PurgerPid1, LitCollectorPid1,
-     DirtySigNPid1, DirtySigHPid1, DirtySigMPid1] = SysProcs1,
+     DirtySigNPid1, DirtySigHPid1, DirtySigMPid1,
+     PrimFilePid1] = SysProcs1,
 
     %% Still the same init process!
     InitPid1 = rpc:call(Node, erlang, whereis, [init]),
@@ -411,6 +413,10 @@ restart(Config) when is_list(Config) ->
     DirtySigMP = pid_to_list(DirtySigMPid),
     DirtySigMP = pid_to_list(DirtySigMPid1),
 
+    %% and same prim_file helper process!
+    PrimFileP = pid_to_list(PrimFilePid),
+    PrimFileP = pid_to_list(PrimFilePid1),
+
     NewProcs0 = rpc:call(Node, erlang, processes, []),
     NewProcs = NewProcs0 -- SysProcs1,
     case check_processes(NewProcs, MaxPid) of
@@ -437,7 +443,8 @@ restart(Config) when is_list(Config) ->
 		    literal_collector,
 		    dirty_sig_handler_normal,
 		    dirty_sig_handler_high,
-		    dirty_sig_handler_max}).
+		    dirty_sig_handler_max,
+                    prim_file}).
 
 find_system_processes() ->
     find_system_procs(processes(), #sys_procs{}).
@@ -448,10 +455,11 @@ find_system_procs([], SysProcs) ->
      SysProcs#sys_procs.literal_collector,
      SysProcs#sys_procs.dirty_sig_handler_normal,
      SysProcs#sys_procs.dirty_sig_handler_high,
-     SysProcs#sys_procs.dirty_sig_handler_max];
+     SysProcs#sys_procs.dirty_sig_handler_max,
+     SysProcs#sys_procs.prim_file];
 find_system_procs([P|Ps], SysProcs) ->
     case process_info(P, [initial_call, priority]) of
-	[{initial_call,{otp_ring0,start,2}},_] ->
+	[{initial_call,{erl_init,start,2}},_] ->
 	    undefined = SysProcs#sys_procs.init,
 	    find_system_procs(Ps, SysProcs#sys_procs{init = P});
 	[{initial_call,{erts_code_purger,start,0}},_] ->
@@ -472,6 +480,9 @@ find_system_procs([P|Ps], SysProcs) ->
          {priority,max}] ->
 	    undefined = SysProcs#sys_procs.dirty_sig_handler_max,
 	    find_system_procs(Ps, SysProcs#sys_procs{dirty_sig_handler_max = P});
+        [{initial_call,{prim_file,start,0}},_] ->
+	    undefined = SysProcs#sys_procs.prim_file,
+	    find_system_procs(Ps, SysProcs#sys_procs{prim_file = P});
 	_ ->
 	    find_system_procs(Ps, SysProcs)
     end.
diff --git a/lib/kernel/test/interactive_shell_SUITE.erl b/lib/kernel/test/interactive_shell_SUITE.erl
index 298a364a91..173e25c520 100644
--- a/lib/kernel/test/interactive_shell_SUITE.erl
+++ b/lib/kernel/test/interactive_shell_SUITE.erl
@@ -23,7 +23,8 @@
 	 init_per_group/2,end_per_group/2, 
 	 get_columns_and_rows/1, exit_initial/1, job_control_local/1, 
 	 job_control_remote/1,
-	 job_control_remote_noshell/1,ctrl_keys/1]).
+	 job_control_remote_noshell/1,ctrl_keys/1,
+         get_columns_and_rows_escript/1]).
 
 -export([init_per_testcase/2, end_per_testcase/2]).
 %% For spawn
@@ -40,7 +41,8 @@ suite() ->
      {timetrap,{minutes,3}}].
 
 all() -> 
-    [get_columns_and_rows, exit_initial, job_control_local,
+    [get_columns_and_rows_escript,get_columns_and_rows,
+     exit_initial, job_control_local,
      job_control_remote, job_control_remote_noshell,
      ctrl_keys].
 
@@ -72,6 +74,60 @@ end_per_group(_GroupName, Config) ->
 -define(dbg(Data),noop).
 -endif.
 
+string_to_term(Str) ->
+    {ok,Tokens,_EndLine} = erl_scan:string(Str ++ "."),
+    {ok,AbsForm} = erl_parse:parse_exprs(Tokens),
+    {value,Value,_Bs} = erl_eval:exprs(AbsForm, erl_eval:new_bindings()),
+    Value.
+
+run_unbuffer_escript(Rows, Columns, EScript, NoTermStdIn, NoTermStdOut) ->
+    DataDir = filename:join(filename:dirname(code:which(?MODULE)), "interactive_shell_SUITE_data"),
+    TmpFile = filename:join(DataDir, "tmp"),
+    ok = file:write_file(TmpFile, <<>>),
+    CommandModifier =
+        case {NoTermStdIn, NoTermStdOut} of
+            {false, false} -> "";
+            {true, false} -> io_lib:format(" < ~s", [TmpFile]);
+            {false, true} -> io_lib:format(" > ~s ; cat ~s", [TmpFile, TmpFile]);
+            {true, true} -> io_lib:format(" > ~s < ~s ; cat ~s", [TmpFile, TmpFile, TmpFile])
+        end,
+    Command = io_lib:format("unbuffer -p bash -c \"stty rows ~p; stty columns ~p; escript ~s ~s\"",
+                               [Rows, Columns, EScript, CommandModifier]),
+    %% io:format("Command: ~s ~n", [Command]),
+    Out = os:cmd(Command),
+    %% io:format("Out: ~p ~n", [Out]),
+    string_to_term(Out).
+
+get_columns_and_rows_escript(Config) when is_list(Config) ->
+    ExpectUnbufferInstalled =
+        try
+            "79" = string:trim(os:cmd("unbuffer -p bash -c \"stty columns 79 ; tput cols\"")),
+            true
+        catch
+            _:_ -> false
+        end,
+    case ExpectUnbufferInstalled of
+        false ->
+            {skip,
+             "The unbuffer tool (https://core.tcl-lang.org/expect/index) does not seem to be installed.~n"
+             "On Ubuntu/Debian: \"sudo apt-get install expect\""};
+        true ->
+            DataDir = filename:join(filename:dirname(code:which(?MODULE)), "interactive_shell_SUITE_data"),
+            IoColumnsErl = filename:join(DataDir, "io_columns.erl"),
+            IoRowsErl = filename:join(DataDir, "io_rows.erl"),
+            [
+             begin
+                 {ok, 42} = run_unbuffer_escript(99, 42, IoColumnsErl, NoTermStdIn, NoTermStdOut),
+                 {ok, 99} = run_unbuffer_escript(99, 42, IoRowsErl, NoTermStdIn, NoTermStdOut)
+             end
+             ||
+                {NoTermStdIn, NoTermStdOut} <- [{false, false}, {true, false}, {false, true}]
+            ],
+            {error,enotsup} = run_unbuffer_escript(99, 42, IoRowsErl, true, true),
+            {error,enotsup} = run_unbuffer_escript(99, 42, IoColumnsErl, true, true),
+            ok
+    end.
+
 %% Test that the shell can access columns and rows.
 get_columns_and_rows(Config) when is_list(Config) ->
     case proplists:get_value(default_shell,Config) of
diff --git a/lib/kernel/test/interactive_shell_SUITE_data/.gitignore b/lib/kernel/test/interactive_shell_SUITE_data/.gitignore
new file mode 100644
index 0000000000..1c2f433de1
--- /dev/null
+++ b/lib/kernel/test/interactive_shell_SUITE_data/.gitignore
@@ -0,0 +1 @@
+tmp
\ No newline at end of file
diff --git a/lib/kernel/test/interactive_shell_SUITE_data/io_columns.erl b/lib/kernel/test/interactive_shell_SUITE_data/io_columns.erl
new file mode 100644
index 0000000000..32d0cf25df
--- /dev/null
+++ b/lib/kernel/test/interactive_shell_SUITE_data/io_columns.erl
@@ -0,0 +1,6 @@
+-module(io_columns).
+
+-export([main/1]).
+
+main(_) ->
+    io:format("~p",[io:columns()]).
diff --git a/lib/kernel/test/interactive_shell_SUITE_data/io_rows.erl b/lib/kernel/test/interactive_shell_SUITE_data/io_rows.erl
new file mode 100644
index 0000000000..53ceb464b0
--- /dev/null
+++ b/lib/kernel/test/interactive_shell_SUITE_data/io_rows.erl
@@ -0,0 +1,6 @@
+-module(io_rows).
+
+-export([main/1]).
+
+main(_) ->
+    io:format("~p",[io:rows()]).
diff --git a/lib/kernel/test/kernel.spec b/lib/kernel/test/kernel.spec
index 62afc9f97b..eaa17f3a59 100644
--- a/lib/kernel/test/kernel.spec
+++ b/lib/kernel/test/kernel.spec
@@ -2,3 +2,4 @@
 {config, "../test_server/ts.unix.config"}.
 
 {suites,"../kernel_test", all}.
+{skip_suites,"../kernel_test",[logger_stress_SUITE],"Benchmarks only"}.
diff --git a/lib/kernel/test/kernel_bench.spec b/lib/kernel/test/kernel_bench.spec
index 4de133f21b..898ceb59e0 100644
--- a/lib/kernel/test/kernel_bench.spec
+++ b/lib/kernel/test/kernel_bench.spec
@@ -1,2 +1,3 @@
 {groups,"../kernel_test",zlib_SUITE,[bench]}.
 {groups,"../kernel_test",file_SUITE,[bench]}.
+{suites,"../kernel_test",[logger_stress_SUITE]}.
diff --git a/lib/kernel/test/kernel_config_SUITE.erl b/lib/kernel/test/kernel_config_SUITE.erl
index 9207025a2c..57c44c2498 100644
--- a/lib/kernel/test/kernel_config_SUITE.erl
+++ b/lib/kernel/test/kernel_config_SUITE.erl
@@ -21,7 +21,8 @@
 
 -include_lib("common_test/include/ct.hrl").
 
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, sync/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
+	 start_distribution_false/1, sync/1]).
 
 -export([init_per_suite/1, end_per_suite/1]).
 
@@ -30,7 +31,7 @@ suite() ->
      {timetrap,{minutes,2}}].
 
 all() -> 
-    [sync].
+    [sync, start_distribution_false].
 
 groups() -> 
     [].
@@ -59,12 +60,9 @@ from(H, [H | T]) -> T;
 from(H, [_ | T]) -> from(H, T);
 from(_, []) -> [].
 
-%%-----------------------------------------------------------------
-%% Test suite for sync_nodes.   This is quite tricky.
-%%
+%% Test sync_nodes. This is quite tricky.
 %% Should be started in a CC view with:
 %% erl -sname XXX where XX not in [cp1, cp2]
-%%-----------------------------------------------------------------
 sync(Conf) when is_list(Conf) ->
     %% Write a config file
     Dir = proplists:get_value(priv_dir,Conf),
@@ -106,9 +104,18 @@ wait_for_node(Node) ->
 	_Other -> wait_for_node(Node)
     end.
 
-
 stop_node(Node) ->
     M = list_to_atom(lists:concat([Node,
 				   [$@],
 				   from($@,atom_to_list(node()))])),
     rpc:cast(M, erlang, halt, []).
+
+start_distribution_false(Config) when is_list(Config) ->
+    %% When distribution is disabled, -sname/-name has no effect
+    Str = os:cmd(ct:get_progname()
+		 ++ " -kernel start_distribution false"
+		 ++ " -sname no_distribution"
+		 ++ " -eval \"erlang:display(node())\""
+		 ++ " -noshell -s erlang halt"),
+    "'nonode@nohost'" ++ _ = Str,
+    ok.
diff --git a/lib/kernel/test/logger.cover b/lib/kernel/test/logger.cover
index 960bc0abff..9691aa295e 100644
--- a/lib/kernel/test/logger.cover
+++ b/lib/kernel/test/logger.cover
@@ -4,9 +4,12 @@
             logger_backend,
             logger_config,
             logger_disk_log_h,
-            logger_h_common,
             logger_filters,
             logger_formatter,
+            logger_handler_watcher,
+            logger_h_common,
+            logger_olp,
+            logger_proxy,
             logger_server,
             logger_simple_h,
             logger_std_h,
diff --git a/lib/kernel/test/logger.spec b/lib/kernel/test/logger.spec
index 1ab90b3e93..3aec37951d 100644
--- a/lib/kernel/test/logger.spec
+++ b/lib/kernel/test/logger.spec
@@ -7,5 +7,7 @@
                            logger_filters_SUITE,
                            logger_formatter_SUITE,
                            logger_legacy_SUITE,
+                           logger_olp_SUITE,
+                           logger_proxy_SUITE,
                            logger_simple_h_SUITE,
                            logger_std_h_SUITE]}.
diff --git a/lib/kernel/test/logger_SUITE.erl b/lib/kernel/test/logger_SUITE.erl
index d831d0d108..035e5d8974 100644
--- a/lib/kernel/test/logger_SUITE.erl
+++ b/lib/kernel/test/logger_SUITE.erl
@@ -101,7 +101,8 @@ all() ->
      compare_levels,
      process_metadata,
      app_config,
-     kernel_config].
+     kernel_config,
+     pretty_print].
 
 start_stop(_Config) ->
     S = whereis(logger),
@@ -898,14 +899,14 @@ process_metadata(_Config) ->
     undefined = logger:get_process_metadata(),
     {error,badarg} = ?TRY(logger:set_process_metadata(bad)),
     ok = logger:add_handler(h1,?MODULE,#{level=>notice,filter_default=>log}),
-    Time = erlang:system_time(microsecond),
+    Time = logger:timestamp(),
     ProcMeta = #{time=>Time,line=>0,custom=>proc},
     ok = logger:set_process_metadata(ProcMeta),
     S1 = ?str,
     ?LOG_NOTICE(S1,#{custom=>macro}),
     check_logged(notice,S1,#{time=>Time,line=>0,custom=>macro}),
 
-    Time2 = erlang:system_time(microsecond),
+    Time2 = logger:timestamp(),
     S2 = ?str,
     ?LOG_NOTICE(S2,#{time=>Time2,line=>1,custom=>macro}),
     check_logged(notice,S2,#{time=>Time2,line=>1,custom=>macro}),
@@ -1047,8 +1048,11 @@ kernel_config(Config) ->
     ok = rpc:call(Node,logger,internal_init_logger,[]),
     ok = rpc:call(Node,logger,add_handlers,[kernel]),
     #{primary:=#{filter_default:=log,filters:=[]},
-      handlers:=[#{id:=default,filters:=DF,config:=#{type:={file,F}}}],
+      handlers:=[#{id:=default,filters:=DF,
+                   config:=#{type:=file,file:=F,modes:=Modes}}],
       module_levels:=[]} = rpc:call(Node,logger,get_config,[]),
+    [append,delayed_write,raw] = lists:sort(Modes),
+
 
     %% Same, but using 'logger' parameter instead of 'error_logger'
     ok = rpc:call(Node,logger,remove_handler,[default]),% so it can be added again
@@ -1059,26 +1063,27 @@ kernel_config(Config) ->
     ok = rpc:call(Node,logger,internal_init_logger,[]),
     ok = rpc:call(Node,logger,add_handlers,[kernel]),
     #{primary:=#{filter_default:=log,filters:=[]},
-      handlers:=[#{id:=default,filters:=DF,config:=#{type:={file,F}}}],
+      handlers:=[#{id:=default,filters:=DF,
+                   config:=#{type:=file,file:=F,modes:=Modes}}],
       module_levels:=[]} = rpc:call(Node,logger,get_config,[]),
 
     %% Same, but with type={file,File,Modes}
     ok = rpc:call(Node,logger,remove_handler,[default]),% so it can be added again
     ok = rpc:call(Node,application,unset_env,[kernel,error_logger]),
-    M = [raw,write,delayed_write],
+    M = [raw,write],
     ok = rpc:call(Node,application,set_env,[kernel,logger,
                                             [{handler,default,logger_std_h,
                                               #{config=>#{type=>{file,F,M}}}}]]),
     ok = rpc:call(Node,logger,internal_init_logger,[]),
     ok = rpc:call(Node,logger,add_handlers,[kernel]),
     #{primary:=#{filter_default:=log,filters:=[]},
-      handlers:=[#{id:=default,filters:=DF,config:=#{type:={file,F,M}}}],
+      handlers:=[#{id:=default,filters:=DF,
+                   config:=#{type:=file,file:=F,modes:=[delayed_write|M]}}],
       module_levels:=[]} = rpc:call(Node,logger,get_config,[]),
 
     %% Same, but with disk_log handler
     ok = rpc:call(Node,logger,remove_handler,[default]),% so it can be added again
     ok = rpc:call(Node,application,unset_env,[kernel,error_logger]),
-    M = [raw,write,delayed_write],
     ok = rpc:call(Node,application,set_env,[kernel,logger,
                                             [{handler,default,logger_disk_log_h,
                                               #{config=>#{file=>F}}}]]),
@@ -1141,6 +1146,61 @@ kernel_config(Config) ->
 
     ok.
 
+pretty_print(Config) ->
+    ok = logger:add_handler(?FUNCTION_NAME,logger_std_h,#{}),
+    ok = logger:set_module_level([module1,module2],debug),
+
+    ct:capture_start(),
+    logger:i(),
+    ct:capture_stop(),
+    I0 = ct:capture_get(),
+
+    ct:capture_start(),
+    logger:i(primary),
+    ct:capture_stop(),
+    IPrim = ct:capture_get(),
+
+    ct:capture_start(),
+    logger:i(handlers),
+    ct:capture_stop(),
+    IHs = ct:capture_get(),
+
+    ct:capture_start(),
+    logger:i(proxy),
+    ct:capture_stop(),
+    IProxy = ct:capture_get(),
+
+    ct:capture_start(),
+    logger:i(modules),
+    ct:capture_stop(),
+    IMs = ct:capture_get(),
+
+    I02 = lists:append([IPrim,IHs,IProxy,IMs]),
+    %% ct:log("~p~n",[I0]),
+    %% ct:log("~p~n",[I02]),
+    I0 = I02,
+
+    ct:capture_start(),
+    logger:i(handlers),
+    ct:capture_stop(),
+    IHs = ct:capture_get(),
+
+    Ids = logger:get_handler_ids(),
+    IHs2 =
+        lists:append(
+          [begin
+               ct:capture_start(),
+               logger:i(Id),
+               ct:capture_stop(),
+               [_|IH] = ct:capture_get(),
+               IH
+           end || Id <- Ids]),
+
+    %% ct:log("~p~n",[IHs]),
+    %% ct:log("~p~n",[["Handler configuration: \n"|IHs2]]),
+    IHs = ["Handler configuration: \n"|IHs2],
+    ok.
+
 %%%-----------------------------------------------------------------
 %%% Internal
 check_logged(Level,Format,Args,Meta) ->
diff --git a/lib/kernel/test/logger_disk_log_h_SUITE.erl b/lib/kernel/test/logger_disk_log_h_SUITE.erl
index 87b8250781..36d98eaa25 100644
--- a/lib/kernel/test/logger_disk_log_h_SUITE.erl
+++ b/lib/kernel/test/logger_disk_log_h_SUITE.erl
@@ -24,6 +24,7 @@
 -include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/logger.hrl").
 -include_lib("kernel/src/logger_internal.hrl").
+-include_lib("kernel/src/logger_olp.hrl").
 -include_lib("kernel/src/logger_h_common.hrl").
 -include_lib("stdlib/include/ms_transform.hrl").
 -include_lib("kernel/include/file.hrl").
@@ -97,7 +98,6 @@ all() ->
      formatter_fail,
      config_fail,
      bad_input,
-     info_and_reset,
      reconfig,
      sync,
      disk_log_full,
@@ -293,7 +293,7 @@ logging(Config) ->
     ok = start_and_add(Name, #{filter_default=>log,
                                formatter=>{?MODULE,self()}},
                        #{file => LogFile}),
-    MsgFormatter = fun(Term) -> {io_lib:format("Term:~p",[Term]),[]} end,
+    MsgFormatter = fun(Term) -> {"Term:~p",[Term]} end,
     logger:notice([{x,y}], #{report_cb => MsgFormatter}),
     logger:notice([{x,y}], #{}),
     ct:pal("Checking contents of ~p", [?log_no(LogFile,1)]),   
@@ -306,9 +306,9 @@ logging(cleanup, _Config) ->
 filter_config(_Config) ->
     ok = logger:add_handler(?MODULE,logger_disk_log_h,#{}),
     {ok,#{config:=HConfig}=Config} = logger:get_handler_config(?MODULE),
-    HConfig = maps:without([handler_pid,mode_tab],HConfig),
+    HConfig = maps:without([olp],HConfig),
 
-    FakeFullHConfig = HConfig#{handler_pid=>self(),mode_tab=>erlang:make_ref()},
+    FakeFullHConfig = HConfig#{olp=>{regname,self(),erlang:make_ref()}},
     #{config:=HConfig} =
         logger_disk_log_h:filter_config(Config#{config=>FakeFullHConfig}),
     ok.
@@ -351,9 +351,7 @@ errors(Config) ->
     %% Read-only fields may (accidentially) be included in the change,
     %% but it won't take effect
     {ok,C} = logger:get_handler_config(Name1),
-    ok = logger:set_handler_config(Name1,config,
-                                   #{handler_pid=>self(),
-                                     mode_tab=>erlang:make_ref()}),
+    ok = logger:set_handler_config(Name1,config,#{olp=>dummyvalue}),
     {ok,C} = logger:get_handler_config(Name1),
 
 
@@ -419,19 +417,16 @@ config_fail(_Config) ->
                              filter_default=>log,
                              formatter=>{?MODULE,self()}}),
 
-    {error,{handler_not_added,{invalid_config,logger_disk_log_h,
-                               {invalid_levels,#{drop_mode_qlen:=1}}}}} =
+    {error,{handler_not_added,{invalid_olp_levels,#{drop_mode_qlen:=1}}}} =
         logger:add_handler(?MODULE,logger_disk_log_h,
                            #{config => #{drop_mode_qlen=>1}}),
-    {error,{handler_not_added,{invalid_config,logger_disk_log_h,
-                               {invalid_levels,#{sync_mode_qlen:=43,
-                                                 drop_mode_qlen:=42}}}}} =
+    {error,{handler_not_added,{invalid_olp_levels,#{sync_mode_qlen:=43,
+                                                drop_mode_qlen:=42}}}} =
         logger:add_handler(?MODULE,logger_disk_log_h,
                            #{config => #{sync_mode_qlen=>43,
                                          drop_mode_qlen=>42}}),
-    {error,{handler_not_added,{invalid_config,logger_disk_log_h,
-                               {invalid_levels,#{drop_mode_qlen:=43,
-                                                 flush_qlen:=42}}}}} =
+    {error,{handler_not_added,{invalid_olp_levels,#{drop_mode_qlen:=43,
+                                                flush_qlen:=42}}}} =
         logger:add_handler(?MODULE,logger_disk_log_h,
                            #{config => #{drop_mode_qlen=>43,
                                          flush_qlen=>42}}),
@@ -445,7 +440,7 @@ config_fail(_Config) ->
                                      #{max_no_files=>2}),
     %% incorrect values of OP params
     {ok,#{config := HConfig}} = logger:get_handler_config(?MODULE),
-    {error,{invalid_config,logger_disk_log_h,{invalid_levels,_}}} =
+    {error,{invalid_olp_levels,_}} =
         logger:update_handler_config(?MODULE,config,
                                      HConfig#{sync_mode_qlen=>100,
                                               flush_qlen=>99}),
@@ -459,18 +454,7 @@ config_fail(cleanup,_Config) ->
 
 bad_input(_Config) ->
     {error,{badarg,{filesync,["BadType"]}}} =
-        logger_disk_log_h:filesync("BadType"),
-    {error,{badarg,{info,["BadType"]}}} = logger_disk_log_h:info("BadType"),
-    {error,{badarg,{reset,["BadType"]}}} = logger_disk_log_h:reset("BadType").
-
-info_and_reset(_Config) ->
-    ok = logger:add_handler(?MODULE,logger_disk_log_h,
-                            #{filter_default=>log,
-                              formatter=>{?MODULE,self()}}),
-    #{id := ?MODULE} = logger_disk_log_h:info(?MODULE),
-    ok = logger_disk_log_h:reset(?MODULE).
-info_and_reset(cleanup,_Config) ->
-    logger:remove_handler(?MODULE).
+        logger_disk_log_h:filesync("BadType").
 
 reconfig(Config) ->
     Dir = ?config(priv_dir,Config),
@@ -479,7 +463,7 @@ reconfig(Config) ->
                             #{filter_default=>log,
                               filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
                               formatter=>{?MODULE,self()}}),
-    #{id := ?MODULE,
+    #{%id := ?MODULE,
       sync_mode_qlen := ?SYNC_MODE_QLEN,
       drop_mode_qlen := ?DROP_MODE_QLEN,
       flush_qlen := ?FLUSH_QLEN,
@@ -490,13 +474,14 @@ reconfig(Config) ->
       overload_kill_qlen := ?OVERLOAD_KILL_QLEN,
       overload_kill_mem_size := ?OVERLOAD_KILL_MEM_SIZE,
       overload_kill_restart_after := ?OVERLOAD_KILL_RESTART_AFTER,
-      filesync_repeat_interval := ?FILESYNC_REPEAT_INTERVAL,
-      handler_state :=
-          #{log_opts := #{type := ?DISK_LOG_TYPE,
-                          max_no_files := ?DISK_LOG_MAX_NO_FILES,
-                          max_no_bytes := ?DISK_LOG_MAX_NO_BYTES,
-                          file := DiskLogFile}}} =
-        logger_disk_log_h:info(?MODULE),
+      cb_state :=
+          #{handler_state :=
+                #{log_opts := #{type := ?DISK_LOG_TYPE,
+                                max_no_files := ?DISK_LOG_MAX_NO_FILES,
+                                max_no_bytes := ?DISK_LOG_MAX_NO_BYTES,
+                                file := DiskLogFile}},
+            filesync_repeat_interval := ?FILESYNC_REPEAT_INTERVAL}} =
+        logger_olp:info(h_proc_name()),
     {ok,#{config :=
               #{sync_mode_qlen := ?SYNC_MODE_QLEN,
                 drop_mode_qlen := ?DROP_MODE_QLEN,
@@ -527,7 +512,7 @@ reconfig(Config) ->
                          overload_kill_restart_after => infinity,
                          filesync_repeat_interval => no_repeat},
     ok = logger:set_handler_config(?MODULE, config, HConfig1),
-    #{id := ?MODULE,
+    #{%id := ?MODULE,
       sync_mode_qlen := 1,
       drop_mode_qlen := 2,
       flush_qlen := 3,
@@ -538,8 +523,8 @@ reconfig(Config) ->
       overload_kill_qlen := 100000,
       overload_kill_mem_size := 10000000,
       overload_kill_restart_after := infinity,
-      filesync_repeat_interval := no_repeat} =
-        logger_disk_log_h:info(?MODULE),
+      cb_state := #{filesync_repeat_interval := no_repeat}} =
+        logger_olp:info(h_proc_name()),
     {ok,#{config:=HConfig1}} = logger:get_handler_config(?MODULE),
 
     ok = logger:update_handler_config(?MODULE, config,
@@ -577,12 +562,13 @@ reconfig(Config) ->
                                     max_no_files => 1,
                                     max_no_bytes => 1024,
                                     file => File}}),
-    #{handler_state :=
-          #{log_opts := #{type := halt,
-                          max_no_files := 1,
-                          max_no_bytes := 1024,
-                          file := File}}} =
-        logger_disk_log_h:info(?MODULE),
+    #{cb_state :=
+          #{handler_state :=
+                #{log_opts := #{type := halt,
+                                max_no_files := 1,
+                                max_no_bytes := 1024,
+                                file := File}}}} =
+        logger_olp:info(h_proc_name()),
     {ok,#{config :=
               #{type := halt,
                 max_no_files := 1,
@@ -650,13 +636,8 @@ sync(Config) ->
     {ok,#{config := HConfig}} = logger:get_handler_config(?MODULE),
     HConfig1 = HConfig#{filesync_repeat_interval => no_repeat},
     ok = logger:update_handler_config(?MODULE, config, HConfig1),
-
     no_repeat = maps:get(filesync_repeat_interval,
-                         logger_disk_log_h:info(?MODULE)),
-    %% The following timer is to make sure the time from last log
-    %% ("first") to next ("second") is long enough, so the a flush is
-    %% triggered by the idle timeout between "fourth" and "fifth".
-    timer:sleep(?IDLE_DETECT_TIME_MSEC*2),
+                         maps:get(cb_state,logger_olp:info(h_proc_name()))),
 
     start_tracer([{logger_disk_log_h,disk_log_write,3},
                   {disk_log,sync,1}],
@@ -666,10 +647,10 @@ sync(Config) ->
                   {disk_log,sync}]),
 
     logger:notice("second", ?domain),
-    timer:sleep(?IDLE_DETECT_TIME_MSEC*2),
+    timer:sleep(?IDLE_DETECT_TIME*2),
     logger:notice("third", ?domain),
     %% wait for automatic disk_log_sync
-    check_tracer(?IDLE_DETECT_TIME_MSEC*2),
+    check_tracer(?IDLE_DETECT_TIME*2),
 
     try_read_file(Log, {ok,<<"first\nsecond\nthird\n">>}, 1000),
     
@@ -678,14 +659,15 @@ sync(Config) ->
     WaitT = 4500,
     OneSync = {logger_h_common,handle_cast,repeated_filesync},
     %% receive 1 repeated_filesync per sec
-    start_tracer([{logger_h_common,handle_cast,2}],
+    start_tracer([{{logger_h_common,handle_cast,2},
+                   [{[repeated_filesync,'_'],[],[{message,{caller}}]}]}],
                  [OneSync || _ <- lists:seq(1, trunc(WaitT/SyncInt))]),
 
     HConfig2 = HConfig#{filesync_repeat_interval => SyncInt},
     ok = logger:update_handler_config(?MODULE, config, HConfig2),
                       
     SyncInt = maps:get(filesync_repeat_interval,
-                       logger_disk_log_h:info(?MODULE)),
+                       maps:get(cb_state,logger_olp:info(h_proc_name()))),
     timer:sleep(WaitT),
     HConfig3 = HConfig#{filesync_repeat_interval => no_repeat},
     ok = logger:update_handler_config(?MODULE, config, HConfig3),
@@ -803,7 +785,7 @@ disk_log_full(cleanup, _Config) ->
     dbg:stop_clear(),
     logger:remove_handler(?MODULE).    
 
-disk_log_events(Config) ->
+disk_log_events(_Config) ->
     Node = node(),
     Log = ?MODULE,
     ok = logger:add_handler(?MODULE,
@@ -860,10 +842,12 @@ write_failure(Config) ->
     rpc:call(Node, ets, insert, [?TEST_HOOKS_TAB,{tester,self()}]),
     rpc:call(Node, ?MODULE, set_internal_log, [?MODULE,internal_log]),
     rpc:call(Node, ?MODULE, set_result, [disk_log_write,ok]),
-    HState = rpc:call(Node, logger_disk_log_h, info, [?STANDARD_HANDLER]),
-    ct:pal("LogOpts = ~p", [LogOpts = maps:get(log_opts,
-                                               maps:get(handler_state,HState))]),
-
+    HState = rpc:call(Node, logger_olp, info, [h_proc_name(?STANDARD_HANDLER)]),
+    LogOpts = maps:get(log_opts,
+                       maps:get(handler_state,
+                                maps:get(cb_state,HState))),
+    ct:pal("LogOpts = ~p", [LogOpts]),
+           
     %% ?check and ?check_no_log in this test only check for internal log events
     ok = log_on_remote_node(Node, "Logged1"),
     rpc:call(Node, logger_disk_log_h, filesync, [?STANDARD_HANDLER]),
@@ -914,15 +898,16 @@ sync_failure(Config) ->
     rpc:call(Node, ets, insert, [?TEST_HOOKS_TAB,{tester,self()}]),
     rpc:call(Node, ?MODULE, set_internal_log, [?MODULE,internal_log]),
     rpc:call(Node, ?MODULE, set_result, [disk_log_sync,ok]),
-    HState = rpc:call(Node, logger_disk_log_h, info, [?STANDARD_HANDLER]),
-    LogOpts = maps:get(log_opts, maps:get(handler_state,HState)),
+    HState = rpc:call(Node, logger_olp, info, [h_proc_name(?STANDARD_HANDLER)]),
+    LogOpts = maps:get(log_opts, maps:get(handler_state,
+                                          maps:get(cb_state,HState))),
     
     SyncInt = 500,
     ok = rpc:call(Node, logger, update_handler_config,
                   [?STANDARD_HANDLER, config,
                    #{filesync_repeat_interval => SyncInt}]),
-    Info = rpc:call(Node, logger_disk_log_h, info, [?STANDARD_HANDLER]),
-    SyncInt = maps:get(filesync_repeat_interval, Info),
+    Info = rpc:call(Node, logger_olp, info, [h_proc_name(?STANDARD_HANDLER)]),
+    SyncInt = maps:get(filesync_repeat_interval, maps:get(cb_state, Info)),
     
     ok = log_on_remote_node(Node, "Logged1"),
     ?check_no_log,
@@ -1198,7 +1183,7 @@ qlen_kill_new(Config) ->
     receive
         {'DOWN', MRef, _, _, Info} ->
            case Info of
-                {shutdown,{overloaded,?MODULE,QLen,Mem}} ->
+                {shutdown,{overloaded,QLen,Mem}} ->
                     ct:pal("Terminated with qlen = ~w, mem = ~w", [QLen,Mem]);
                 killed ->
                     ct:pal("Slow shutdown, handler process was killed!", [])
@@ -1208,7 +1193,7 @@ qlen_kill_new(Config) ->
             ok
     after
         5000 ->
-            Info = logger_disk_log_h:info(?MODULE),
+            Info = logger_olp:info(h_proc_name()),
             ct:pal("Handler state = ~p", [Info]),
             ct:fail("Handler not dead! It should not have survived this!")
     end.
@@ -1235,7 +1220,7 @@ mem_kill_new(Config) ->
     receive
         {'DOWN', MRef, _, _, Info} ->
             case Info of
-                {shutdown,{overloaded,?MODULE,QLen,Mem}} ->
+                {shutdown,{overloaded,QLen,Mem}} ->
                     ct:pal("Terminated with qlen = ~w, mem = ~w", [QLen,Mem]);
                 killed ->
                     ct:pal("Slow shutdown, handler process was killed!", [])
@@ -1245,7 +1230,7 @@ mem_kill_new(Config) ->
             ok
     after
         5000 ->
-            Info = logger_disk_log_h:info(?MODULE),
+            Info = logger_olp:info(h_proc_name()),
             ct:pal("Handler state = ~p", [Info]),
             ct:fail("Handler not dead! It should not have survived this!")
     end.
@@ -1258,12 +1243,12 @@ restart_after(Config) ->
     {Log,HConfig,DLHConfig} = start_handler(?MODULE, ?FUNCTION_NAME, Config),
     NewHConfig1 =
         HConfig#{config=>DLHConfig#{overload_kill_enable=>true,
-                                    overload_kill_qlen=>10,
+                                    overload_kill_qlen=>4,
                                     overload_kill_restart_after=>infinity}},
     ok = logger:update_handler_config(?MODULE, NewHConfig1),
     MRef1 = erlang:monitor(process, whereis(h_proc_name())),
     %% kill handler
-    send_burst({n,100}, {spawn,4,0}, {chars,79}, notice),
+    send_burst({n,100}, {spawn,5,0}, {chars,79}, notice),
     receive
         {'DOWN', MRef1, _, _, _Reason1} ->
             file_delete(Log),
@@ -1271,7 +1256,7 @@ restart_after(Config) ->
             ok
     after
         5000 ->
-            Info1 = logger_std_h:info(?MODULE),
+            Info1 = logger_olp:info(h_proc_name()),
             ct:pal("Handler state = ~p", [Info1]),
             ct:fail("Handler not dead! It should not have survived this!")
     end,
@@ -1280,13 +1265,13 @@ restart_after(Config) ->
     RestartAfter = ?OVERLOAD_KILL_RESTART_AFTER,
     NewHConfig2 =
         HConfig#{config=>DLHConfig#{overload_kill_enable=>true,
-                                    overload_kill_qlen=>10,
+                                    overload_kill_qlen=>4,
                                     overload_kill_restart_after=>RestartAfter}},
     ok = logger:update_handler_config(?MODULE, NewHConfig2),
     Pid0 = whereis(h_proc_name()),
     MRef2 = erlang:monitor(process, Pid0),
     %% kill handler
-    send_burst({n,100}, {spawn,4,0}, {chars,79}, notice),
+    send_burst({n,100}, {spawn,5,0}, {chars,79}, notice),
     receive
         {'DOWN', MRef2, _, _, _Reason2} ->
             file_delete(Log),
@@ -1295,7 +1280,7 @@ restart_after(Config) ->
             ok
     after
         5000 ->
-            Info2 = logger_std_h:info(?MODULE),
+            Info2 = logger_olp:info(h_proc_name()),
             ct:pal("Handler state = ~p", [Info2]),
             ct:fail("Handler not dead! It should not have survived this!")
     end,
@@ -1316,11 +1301,15 @@ handler_requests_under_load(Config) ->
                                       flush_qlen => 2000,
                                       burst_limit_enable => false}},
     ok = logger:update_handler_config(?MODULE, NewHConfig),
-    Pid = spawn_link(fun() -> send_requests(?MODULE, 1, [{filesync,[]},
-                                                         {info,[]},
-                                                         {reset,[]},
-                                                         {change_config,[]}])
-                     end),
+    Pid = spawn_link(
+            fun() -> send_requests(1,[{logger_disk_log_h,filesync,[?MODULE],[]},
+                                      {logger_olp,info,[h_proc_name()],[]},
+                                      {logger_olp,reset,[h_proc_name()],[]},
+                                      {logger,update_handler_config,
+                                       [?MODULE, config,
+                                        #{overload_kill_enable => false}],
+                                       []}])
+            end),
     Procs = 100,
     Sent = Procs * send_burst({n,5000}, {spawn,Procs,10}, {chars,79}, notice),
     Pid ! {self(),finish},
@@ -1332,29 +1321,22 @@ handler_requests_under_load(Config) ->
                         [E || E <- Res,
                               is_tuple(E) andalso (element(1,E) == error)]
                 end,
-    Errors = [{Req,FindError(Res)} || {Req,Res} <- ReqResult],
-    NoOfReqs = lists:foldl(fun({_,Res}, N) -> N + length(Res) end, 0, ReqResult),
+    Errors = [{Func,FindError(Res)} || {_,Func,_,Res} <- ReqResult],
+    NoOfReqs = lists:foldl(fun({_,_,_,Res}, N) -> N + length(Res) end,
+                           0, ReqResult),
     ct:pal("~w requests made. Errors: ~n~p", [NoOfReqs,Errors]),
     ok = file_delete(Log).
 handler_requests_under_load(cleanup, _Config) ->
     ok = stop_handler(?MODULE).
 
-send_requests(HName, TO, Reqs = [{Req,Res}|Rs]) ->
+send_requests(TO, Reqs = [{Mod,Func,Args,Res}|Rs]) ->
     receive
         {From,finish} ->
             From ! {self(),Reqs}
     after
         TO ->
-            Result =
-                case Req of
-                    change_config ->
-                        logger:update_handler_config(HName, logger_disk_log_h,
-                                                     #{overload_kill_enable =>
-                                                           false});
-                    Func ->
-                        logger_disk_log_h:Func(HName)
-                end,
-            send_requests(HName, TO, Rs ++ [{Req,[Result|Res]}])
+            Result = apply(Mod,Func,Args),
+            send_requests(TO, Rs ++ [{Mod,Func,Args,[Result|Res]}])
     end.
 
 %%%-----------------------------------------------------------------
@@ -1472,15 +1454,6 @@ format(Msg,Tag) ->
     erlang:display(Error),
     exit(Error).
 
-remove(Handler, LogName) ->
-    logger_disk_log_h:remove(Handler, LogName),
-    HState = #{log_names := Logs} = logger_disk_log_h:info(),
-    false = maps:is_key(LogName, HState),
-    false = lists:member(LogName, Logs),
-    false = logger_config:exist(?LOGGER_TABLE, LogName),
-    {error,no_such_log} = disk_log:info(LogName),
-    ok.
-
 start_and_add(Name, Config, LogOpts) ->
     HConfig = maps:get(config, Config, #{}),
     HConfig1 = maps:merge(HConfig, LogOpts),
@@ -1607,7 +1580,9 @@ start_tracer(Trace,Expected) ->
     ok.
 
 tpl([{M,F,A}|Trace]) ->
-    {ok,Match} = dbg:tpl(M,F,A,c),
+    tpl([{{M,F,A},c}|Trace]);
+tpl([{{M,F,A},MS}|Trace]) ->
+    {ok,Match} = dbg:tpl(M,F,A,MS),
     case lists:keyfind(matched,1,Match) of
         {_,_,1} ->
             ok;
diff --git a/lib/kernel/test/logger_env_var_SUITE.erl b/lib/kernel/test/logger_env_var_SUITE.erl
index e8d1a313dc..9d2ad11be8 100644
--- a/lib/kernel/test/logger_env_var_SUITE.erl
+++ b/lib/kernel/test/logger_env_var_SUITE.erl
@@ -59,7 +59,8 @@ groups() ->
                  logger_undefined,
                  logger_many_handlers_default_first,
                  logger_many_handlers_default_last,
-                 logger_many_handlers_default_last_broken_filter
+                 logger_many_handlers_default_last_broken_filter,
+                 logger_proxy
                 ]},
      {bad,[],[bad_error_logger,
               bad_level,
@@ -541,6 +542,19 @@ logger_many_handlers(Config, Env, LogErr, LogInfo, NumProgress) ->
 
     ok.
 
+logger_proxy(Config) ->
+    %% assume current node runs with default settings
+    DefOpts = logger_olp:get_opts(logger_proxy),
+    {ok,_,Node} = setup(Config,
+                        [{logger,[{proxy,#{sync_mode_qlen=>0,
+                                           drop_mode_qlen=>2}}]}]),
+    Expected = DefOpts#{sync_mode_qlen:=0,
+                        drop_mode_qlen:=2},
+    Expected = rpc:call(Node,logger_olp,get_opts,[logger_proxy]),
+    Expected = rpc:call(Node,logger,get_proxy_config,[]),
+
+    ok.
+
 sasl_compatible_false(Config) ->
     Log = file(Config,?FUNCTION_NAME),
     {ok,_,Node} = setup(Config,
diff --git a/lib/kernel/test/logger_formatter_SUITE.erl b/lib/kernel/test/logger_formatter_SUITE.erl
index 8c13f0f908..83e3e6c40a 100644
--- a/lib/kernel/test/logger_formatter_SUITE.erl
+++ b/lib/kernel/test/logger_formatter_SUITE.erl
@@ -867,7 +867,7 @@ my_try(Fun) ->
     try Fun() catch C:R:S -> {C,R,hd(S)} end.
 
 timestamp() ->
-    erlang:system_time(microsecond).
+    logger:timestamp().
 
 %% necessary?
 add_time(#{time:=_}=Meta) ->
diff --git a/lib/kernel/test/logger_olp_SUITE.erl b/lib/kernel/test/logger_olp_SUITE.erl
new file mode 100644
index 0000000000..ea3eec89f5
--- /dev/null
+++ b/lib/kernel/test/logger_olp_SUITE.erl
@@ -0,0 +1,90 @@
+%%
+%% %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(logger_olp_SUITE).
+
+-compile(export_all).
+
+-include_lib("kernel/src/logger_olp.hrl").
+
+suite() ->
+    [{timetrap,{seconds,30}}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_Group, Config) ->
+    Config.
+
+end_per_group(_Group, _Config) ->
+    ok.
+
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+end_per_testcase(Case, Config) ->
+    try apply(?MODULE,Case,[cleanup,Config])
+    catch error:undef -> ok
+    end,
+    ok.
+
+groups() ->
+    [].
+
+all() -> 
+    [idle_timer].
+
+%%%-----------------------------------------------------------------
+%%% Test cases
+idle_timer(_Config) ->
+    {ok,_Pid,Olp} = logger_olp:start_link(?MODULE,?MODULE,self(),#{}),
+    [logger_olp:load(Olp,{msg,N}) || N<-lists:seq(1,3)],
+    timer:sleep(?IDLE_DETECT_TIME*2),
+    [{load,{msg,1}},
+     {load,{msg,2}},
+     {load,{msg,3}},
+     {notify,idle}] = test_server:messages_get(),
+    logger_olp:cast(Olp,hello),
+    timer:sleep(?IDLE_DETECT_TIME*2),
+    [{cast,hello}] = test_server:messages_get(),
+    ok.
+idle_timer(cleanup,_Config) ->
+    unlink(whereis(?MODULE)),
+    logger_olp:stop(?MODULE),
+    ok.
+
+%%%-----------------------------------------------------------------
+%%% Olp callbacks
+init(P) ->
+    {ok,P}.
+
+handle_load(M,P) ->
+    P ! {load,M},
+    P.
+
+handle_cast(M,P) ->
+    P ! {cast,M},
+    {noreply,P}.
+
+notify(N,P) ->
+    P ! {notify,N},
+    P.
diff --git a/lib/kernel/test/logger_proxy_SUITE.erl b/lib/kernel/test/logger_proxy_SUITE.erl
new file mode 100644
index 0000000000..777531e4ed
--- /dev/null
+++ b/lib/kernel/test/logger_proxy_SUITE.erl
@@ -0,0 +1,274 @@
+%%
+%% %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(logger_proxy_SUITE).
+
+-compile(export_all).
+
+%% -include_lib("common_test/include/ct.hrl").
+%% -include_lib("kernel/include/logger.hrl").
+%% -include_lib("kernel/src/logger_internal.hrl").
+
+%% -define(str,"Log from "++atom_to_list(?FUNCTION_NAME)++
+%%             ":"++integer_to_list(?LINE)).
+%% -define(map_rep,#{function=>?FUNCTION_NAME, line=>?LINE}).
+%% -define(keyval_rep,[{function,?FUNCTION_NAME}, {line,?LINE}]).
+
+%% -define(MY_LOC(N),#{mfa=>{?MODULE,?FUNCTION_NAME,?FUNCTION_ARITY},
+%%                     file=>?FILE, line=>?LINE-N}).
+
+%% -define(TRY(X), my_try(fun() -> X end)).
+
+
+-define(HNAME,list_to_atom(lists:concat([?MODULE,"_",?FUNCTION_NAME]))).
+-define(LOC,#{mfa=>{?MODULE,?FUNCTION_NAME,?FUNCTION_ARITY},line=>?LINE}).
+-define(ENSURE_TIME,5000).
+
+suite() ->
+    [{timetrap,{seconds,30}},
+     {ct_hooks,[logger_test_lib]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_Group, Config) ->
+    Config.
+
+end_per_group(_Group, _Config) ->
+    ok.
+
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+end_per_testcase(Case, Config) ->
+    try apply(?MODULE,Case,[cleanup,Config])
+    catch error:undef -> ok
+    end,
+    ok.
+
+groups() ->
+    [].
+
+all() -> 
+    [basic,
+     emulator,
+     remote,
+     remote_emulator,
+     config,
+     restart_after,
+     terminate].
+
+%%%-----------------------------------------------------------------
+%%% Test cases
+basic(_Config) ->
+    ok = logger:add_handler(?HNAME,?MODULE,#{config=>self()}),
+    logger_proxy ! {log,notice,"Log from: ~p; ~p",[?FUNCTION_NAME,?LINE],L1=?LOC},
+    ok = ensure(L1),
+    logger_proxy ! {log,notice,[{test_case,?FUNCTION_NAME},{line,?LINE}],L2=?LOC},
+    ok = ensure(L2),
+    logger_proxy:log({remote,node(),{log,notice,
+                                     "Log from: ~p; ~p",
+                                     [?FUNCTION_NAME,?LINE],
+                                     L3=?LOC}}),
+    ok = ensure(L3),
+    logger_proxy:log({remote,node(),{log,notice,
+                                     [{test_case,?FUNCTION_NAME},
+                                      {line,?LINE}],
+                                     L4=?LOC}}),
+    ok = ensure(L4),
+    ok.
+basic(cleanup,_Config) ->
+    ok = logger:remove_handler(?HNAME).
+
+emulator(_Config) ->
+    ok = logger:add_handler(?HNAME,?MODULE,#{config=>self()}),
+    Pid = spawn(fun() -> erlang:error(some_reason) end),
+    ok = ensure(#{pid=>Pid}),
+    ok.
+emulator(cleanup,_Config) ->
+    ok = logger:remove_handler(?HNAME).
+
+remote(Config) ->
+    {ok,_,Node} = logger_test_lib:setup(Config,[{logger,[{proxy,#{}}]}]),
+    ok = logger:add_handler(?HNAME,?MODULE,#{config=>self()}),
+    L1 = ?LOC, spawn(Node,fun() -> logger:notice("Log from ~p; ~p",[?FUNCTION_NAME,?LINE],L1) end),
+    ok = ensure(L1),
+    L2 = ?LOC, spawn(Node,fun() -> logger:notice([{test_case,?FUNCTION_NAME},{line,?LINE}],L2) end),
+    ok = ensure(L2),
+    ok.
+remote(cleanup,_Config) ->
+    ok = logger:remove_handler(?HNAME).
+
+remote_emulator(Config) ->
+    {ok,_,Node} = logger_test_lib:setup(Config,[{logger,[{proxy,#{}}]}]),
+    ok = logger:add_handler(?HNAME,?MODULE,#{config=>self()}),
+    Pid = spawn(Node,fun() -> erlang:error(some_reason) end),
+    ok = ensure(#{pid=>Pid}),
+    ok.
+remote_emulator(cleanup,_Config) ->
+    ok = logger:remove_handler(?HNAME).
+
+config(_Config) ->
+    C1 = #{sync_mode_qlen:=SQ,
+           drop_mode_qlen:=DQ} = logger:get_proxy_config(),
+    C1 = logger_olp:get_opts(logger_proxy),
+
+    %% Update the existing config with these two values
+    SQ1 = SQ+1,
+    DQ1 = DQ+1,
+    ok = logger:update_proxy_config(#{sync_mode_qlen=>SQ1,
+                                      drop_mode_qlen=>DQ1}),
+    C2 = logger:get_proxy_config(), % reads from ets table
+    C2 = logger_olp:get_opts(logger_proxy), % ensure consistency with process opts
+    C2 = C1#{sync_mode_qlen:=SQ1,
+             drop_mode_qlen:=DQ1},
+
+    %% Update the existing again with only one value
+    SQ2 = SQ+2,
+    ok = logger:update_proxy_config(#{sync_mode_qlen=>SQ2}),
+    C3 = logger:get_proxy_config(),
+    C3 = logger_olp:get_opts(logger_proxy),
+    C3 = C2#{sync_mode_qlen:=SQ2},
+
+    %% Set the config, i.e. merge with defaults
+    ok = logger:set_proxy_config(#{sync_mode_qlen=>SQ1}),
+    C4 = logger:get_proxy_config(),
+    C4 = logger_olp:get_opts(logger_proxy),
+    C4 = C1#{sync_mode_qlen:=SQ1},
+
+    %% Reset to default
+    ok = logger:set_proxy_config(#{}),
+    C5 = logger:get_proxy_config(),
+    C5 = logger_olp:get_opts(logger_proxy),
+    C5 = logger_proxy:get_default_config(),
+
+    %% Errors
+    {error,{invalid_olp_config,_}} =
+        logger:set_proxy_config(#{faulty_key=>1}),
+    {error,{invalid_olp_config,_}} =
+        logger:set_proxy_config(#{sync_mode_qlen=>infinity}),
+    {error,{invalid_config,[]}} = logger:set_proxy_config([]),
+
+    {error,{invalid_olp_config,_}} =
+        logger:update_proxy_config(#{faulty_key=>1}),
+    {error,{invalid_olp_config,_}} =
+        logger:update_proxy_config(#{sync_mode_qlen=>infinity}),
+    {error,{invalid_config,[]}} = logger:update_proxy_config([]),
+
+    C5 = logger:get_proxy_config(),
+    C5 = logger_olp:get_opts(logger_proxy),
+
+    ok.
+config(cleanup,_Config) ->
+    _ = logger:set_logger_proxy(logger_proxy:get_default_config()),
+    ok.
+
+restart_after(_Config) ->
+    Restart = 3000,
+    ok = logger:update_proxy_config(#{overload_kill_enable => true,
+                                      overload_kill_qlen => 10,
+                                      overload_kill_restart_after => Restart}),
+    Proxy = whereis(logger_proxy),
+    Proxy = erlang:system_info(system_logger),
+    ProxyConfig = logger:get_proxy_config(),
+    ProxyConfig = logger_olp:get_opts(logger_proxy),
+
+    Ref = erlang:monitor(process,Proxy),
+    spawn(fun() ->
+                  [logger_proxy ! {log,debug,
+                                   [{test_case,?FUNCTION_NAME},
+                                    {line,?LINE}],
+                                   ?LOC} || _ <- lists:seq(1,100)]
+          end),
+    receive
+        {'DOWN',Ref,_,_,_Reason} ->
+            undefined = erlang:system_info(system_logger),
+            timer:sleep(Restart),
+            poll_restarted(10)
+    after 5000 ->
+            ct:fail(proxy_not_terminated)
+    end,
+
+    Proxy1 = whereis(logger_proxy),
+    Proxy1 = erlang:system_info(system_logger),
+    ProxyConfig = logger:get_proxy_config(),
+    ProxyConfig = logger_olp:get_opts(logger_proxy),
+
+    ok.
+restart_after(cleanup,_Config) ->
+    _ = logger:set_logger_proxy(logger_proxy:get_default_config()),
+    ok.
+
+%% Test that system_logger flag is set to logger process if
+%% logger_proxy terminates for other reason than overloaded.
+terminate(_Config) ->
+    Logger = whereis(logger),
+    Proxy = whereis(logger_proxy),
+    Proxy = erlang:system_info(system_logger),
+    ProxyConfig = logger:get_proxy_config(),
+    ProxyConfig = logger_olp:get_opts(logger_proxy),
+
+    Ref = erlang:monitor(process,Proxy),
+    ok = logger_olp:stop(Proxy),
+    receive
+        {'DOWN',Ref,_,_,_Reason} ->
+            Logger = erlang:system_info(system_logger),
+            logger_proxy:restart(),
+            poll_restarted(10)
+    after 5000 ->
+            ct:fail(proxy_not_terminated)
+    end,
+
+    Proxy1 = whereis(logger_proxy),
+    Proxy1 = erlang:system_info(system_logger),
+    ProxyConfig = logger:get_proxy_config(),
+    ProxyConfig = logger_olp:get_opts(logger_proxy),
+
+    ok.
+
+%%%-----------------------------------------------------------------
+%%% Internal functions
+
+poll_restarted(0) ->
+    ct:fail(proxy_not_restarted);
+poll_restarted(N) ->
+    timer:sleep(1000),
+    case whereis(logger_proxy) of
+        undefined ->
+            poll_restarted(N-1);
+        _Pid ->
+            ok
+    end.
+
+%% Logger handler callback
+log(#{meta:=Meta},#{config:=Pid}) ->
+    Pid ! {logged,Meta}.
+
+%% Check that the log from the logger callback function log/2 is received
+ensure(Match) ->
+    receive {logged,Meta} ->
+            case maps:with(maps:keys(Match),Meta) of
+                Match -> ok;
+                _NoMatch -> {error,Match,Meta,test_server:messages_get()}
+            end
+    after ?ENSURE_TIME -> {error,Match,test_server:messages_get()}
+    end.
diff --git a/lib/kernel/test/logger_std_h_SUITE.erl b/lib/kernel/test/logger_std_h_SUITE.erl
index eb17a6d857..2b2d509860 100644
--- a/lib/kernel/test/logger_std_h_SUITE.erl
+++ b/lib/kernel/test/logger_std_h_SUITE.erl
@@ -25,10 +25,15 @@
 -include_lib("kernel/include/logger.hrl").
 -include_lib("kernel/src/logger_internal.hrl").
 -include_lib("kernel/src/logger_h_common.hrl").
+-include_lib("kernel/src/logger_olp.hrl").
 -include_lib("stdlib/include/ms_transform.hrl").
 -include_lib("kernel/include/file.hrl").
 
--define(check_no_log, [] = test_server:messages_get()).
+-define(check_no_log,
+        begin
+            timer:sleep(?IDLE_DETECT_TIME*2),
+            [] = test_server:messages_get()
+        end).
 -define(check(Expected),
         receive
             {log,Expected} ->
@@ -66,6 +71,14 @@ init_per_group(_Group, Config) ->
 end_per_group(_Group, _Config) ->
     ok.
 
+init_per_testcase(reopen_changed_log=TC, Config) ->
+    case os:type() of
+        {win32,_} ->
+            {skip,"This test can only work with inodes, i.e. not on Windows"};
+        _ ->
+            ct:print("********** ~w **********", [TC]),
+            Config
+    end;
 init_per_testcase(TestHooksCase, Config) when
       TestHooksCase == write_failure;
       TestHooksCase == sync_failure ->
@@ -107,6 +120,8 @@ all() ->
      add_remove_instance_standard_error,
      add_remove_instance_file1,
      add_remove_instance_file2,
+     add_remove_instance_file3,
+     add_remove_instance_file4,
      default_formatter,
      filter_config,
      errors,
@@ -115,9 +130,9 @@ all() ->
      crash_std_h_to_file,
      crash_std_h_to_disk_log,
      bad_input,
-     info_and_reset,
      reconfig,
      file_opts,
+     relative_file_path,
      sync,
      write_failure,
      sync_failure,
@@ -137,7 +152,13 @@ all() ->
      mem_kill_std,
      restart_after,
      handler_requests_under_load,
-     recreate_deleted_log
+     recreate_deleted_log,
+     reopen_changed_log,
+     rotate_size,
+     rotate_size_compressed,
+     rotate_size_reopen,
+     rotation_opts,
+     rotation_opts_restart_handler
     ].
 
 add_remove_instance_tty(_Config) ->
@@ -174,10 +195,27 @@ add_remove_instance_file2(Config) ->
 add_remove_instance_file2(cleanup,_Config) ->
     logger_std_h_remove().
 
-add_remove_instance_file(Log, Type) ->
+add_remove_instance_file3(_Config) ->
+    Log = atom_to_list(?MODULE),
+    StdHConfig = #{type=>file},
+    add_remove_instance_file(Log, StdHConfig).
+add_remove_instance_file3(cleanup,_Config) ->
+    logger_std_h_remove().
+
+add_remove_instance_file4(Config) ->
+    Dir = ?config(priv_dir,Config),
+    Log = filename:join(Dir,"stdlog4.txt"),
+    StdHConfig = #{file=>Log,modes=>[]},
+    add_remove_instance_file(Log, StdHConfig).
+add_remove_instance_file4(cleanup,_Config) ->
+    logger_std_h_remove().
+
+add_remove_instance_file(Log, Type) when not is_map(Type) ->
+    add_remove_instance_file(Log,#{type=>Type});
+add_remove_instance_file(Log, StdHConfig) when is_map(StdHConfig) ->
     ok = logger:add_handler(?MODULE,
                             logger_std_h,
-                            #{config => #{type => Type},
+                            #{config => StdHConfig,
                               filter_default=>stop,
                               filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
                               formatter=>{?MODULE,self()}}),
@@ -209,9 +247,9 @@ default_formatter(_Config) ->
 filter_config(_Config) ->
     ok = logger:add_handler(?MODULE,logger_std_h,#{}),
     {ok,#{config:=HConfig}=Config} = logger:get_handler_config(?MODULE),
-    HConfig = maps:without([handler_pid,mode_tab],HConfig),
+    HConfig = maps:without([olp],HConfig),
 
-    FakeFullHConfig = HConfig#{handler_pid=>self(),mode_tab=>erlang:make_ref()},
+    FakeFullHConfig = HConfig#{olp=>{regname,self(),erlang:make_ref()}},
     #{config:=HConfig} =
         logger_std_h:filter_config(Config#{config=>FakeFullHConfig}),
     ok.
@@ -246,15 +284,16 @@ errors(Config) ->
         _ ->
             NoDir = lists:concat(["/",?MODULE,"_dir"]),
             {error,
-             {handler_not_added,{{open_failed,NoDir,eacces},_}}} =
+             {handler_not_added,{open_failed,NoDir,eacces}}} =
                 logger:add_handler(myh2,logger_std_h,
                                    #{config=>#{type=>{file,NoDir}}})
     end,
 
     {error,
-     {handler_not_added,{{open_failed,Log,_},_}}} =
+     {handler_not_added,
+      {invalid_config,logger_std_h,#{modes:=bad_file_opt}}}} =
         logger:add_handler(myh3,logger_std_h,
-                           #{config=>#{type=>{file,Log,[bad_file_opt]}}}),
+                           #{config=>#{type=>{file,Log,bad_file_opt}}}),
 
     ok = logger:notice(?msg).
 
@@ -320,19 +359,16 @@ config_fail(_Config) ->
                            #{config => #{restart_type => bad},
                              filter_default=>log,
                              formatter=>{?MODULE,self()}}),
-    {error,{handler_not_added,{invalid_config,logger_std_h,
-                               {invalid_levels,#{drop_mode_qlen:=1}}}}} =
+    {error,{handler_not_added,{invalid_olp_levels,#{drop_mode_qlen:=1}}}} =
         logger:add_handler(?MODULE,logger_std_h,
                            #{config => #{drop_mode_qlen=>1}}),
-    {error,{handler_not_added,{invalid_config,logger_std_h,
-                               {invalid_levels,#{sync_mode_qlen:=43,
-                                                 drop_mode_qlen:=42}}}}} =
+    {error,{handler_not_added,{invalid_olp_levels,#{sync_mode_qlen:=43,
+                                                    drop_mode_qlen:=42}}}} =
         logger:add_handler(?MODULE,logger_std_h,
                            #{config => #{sync_mode_qlen=>43,
                                          drop_mode_qlen=>42}}),
-    {error,{handler_not_added,{invalid_config,logger_std_h,
-                               {invalid_levels,#{drop_mode_qlen:=43,
-                                                 flush_qlen:=42}}}}} =
+    {error,{handler_not_added,{invalid_olp_levels,#{drop_mode_qlen:=43,
+                                                    flush_qlen:=42}}}} =
         logger:add_handler(?MODULE,logger_std_h,
                            #{config => #{drop_mode_qlen=>43,
                                          flush_qlen=>42}}),
@@ -344,7 +380,7 @@ config_fail(_Config) ->
         logger:set_handler_config(?MODULE,config,
                                   #{type=>{file,"file"}}),
 
-    {error,{invalid_config,logger_std_h,{invalid_levels,_}}} =
+    {error,{invalid_olp_levels,_}} =
         logger:set_handler_config(?MODULE,config,
                                   #{sync_mode_qlen=>100,
                                     flush_qlen=>99}),
@@ -355,9 +391,7 @@ config_fail(_Config) ->
     %% Read-only fields may (accidentially) be included in the change,
     %% but it won't take effect
     {ok,C} = logger:get_handler_config(?MODULE),
-    ok = logger:set_handler_config(?MODULE,config,
-                                   #{handler_pid=>self(),
-                                     mode_tab=>erlang:make_ref()}),
+    ok = logger:set_handler_config(?MODULE,config,#{olp=>dummyvalue}),
     {ok,C} = logger:get_handler_config(?MODULE),
 
     ok.
@@ -425,10 +459,13 @@ crash_std_h(Config,Func,Var,Type,Log) ->
 %% logger would send the log event to the logger process here instead
 %% of logging it itself.
 log_on_remote_node(Node,Msg) ->
+    Pid = self(),
     _ = spawn_link(Node,
                    fun() -> erlang:group_leader(whereis(user),self()),
-                            logger:notice(Msg)
+                            logger:notice(Msg),
+                            Pid ! done
                    end),
+    receive done -> ok end,
     ok.
 
 
@@ -456,14 +493,7 @@ sync_and_read(Node,file,Log) ->
     end.
 
 bad_input(_Config) ->
-    {error,{badarg,{filesync,["BadType"]}}} = logger_std_h:filesync("BadType"),
-    {error,{badarg,{info,["BadType"]}}} = logger_std_h:info("BadType"),
-    {error,{badarg,{reset,["BadType"]}}} = logger_std_h:reset("BadType").
-
-
-info_and_reset(_Config) ->
-    #{id := ?STANDARD_HANDLER} = logger_std_h:info(?STANDARD_HANDLER),
-    ok = logger_std_h:reset(?STANDARD_HANDLER).
+    {error,{badarg,{filesync,["BadType"]}}} = logger_std_h:filesync("BadType").
 
 reconfig(Config) ->
     Dir = ?config(priv_dir,Config),
@@ -473,9 +503,10 @@ reconfig(Config) ->
                               filter_default=>log,
                               filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
                               formatter=>{?MODULE,self()}}),
-    #{id := ?MODULE,
-      handler_state := #{type := standard_io,
-                         file_ctrl_pid := FileCtrlPid},
+    #{%id := ?MODULE,
+      cb_state:=#{handler_state := #{type := standard_io,
+                                     file_ctrl_pid := FileCtrlPid},
+                  filesync_repeat_interval := no_repeat},
       sync_mode_qlen := ?SYNC_MODE_QLEN,
       drop_mode_qlen := ?DROP_MODE_QLEN,
       flush_qlen := ?FLUSH_QLEN,
@@ -485,9 +516,8 @@ reconfig(Config) ->
       overload_kill_enable := ?OVERLOAD_KILL_ENABLE,
       overload_kill_qlen := ?OVERLOAD_KILL_QLEN,
       overload_kill_mem_size := ?OVERLOAD_KILL_MEM_SIZE,
-      overload_kill_restart_after := ?OVERLOAD_KILL_RESTART_AFTER,
-      filesync_repeat_interval := no_repeat} = DefaultInfo =
-        logger_std_h:info(?MODULE),
+      overload_kill_restart_after := ?OVERLOAD_KILL_RESTART_AFTER} =
+        logger_olp:info(h_proc_name()),
 
     {ok,
      #{config:=
@@ -518,9 +548,10 @@ reconfig(Config) ->
                                      overload_kill_mem_size => 10000000,
                                      overload_kill_restart_after => infinity,
                                      filesync_repeat_interval => 5000}),
-    #{id := ?MODULE,
-      handler_state := #{type := standard_io,
-                         file_ctrl_pid := FileCtrlPid},
+    #{%id := ?MODULE,
+      cb_state := #{handler_state := #{type := standard_io,
+                                       file_ctrl_pid := FileCtrlPid},
+                    filesync_repeat_interval := no_repeat},
       sync_mode_qlen := 1,
       drop_mode_qlen := 2,
       flush_qlen := 3,
@@ -530,8 +561,7 @@ reconfig(Config) ->
       overload_kill_enable := true,
       overload_kill_qlen := 100000,
       overload_kill_mem_size := 10000000,
-      overload_kill_restart_after := infinity,
-      filesync_repeat_interval := no_repeat} = Info = logger_std_h:info(?MODULE),
+      overload_kill_restart_after := infinity} = logger_olp:info(h_proc_name()),
 
     {ok,#{config :=
               #{type := standard_io,
@@ -611,22 +641,51 @@ reconfig(cleanup, _Config) ->
 file_opts(Config) ->
     Dir = ?config(priv_dir,Config),
     Log = filename:join(Dir, lists:concat([?FUNCTION_NAME,".log"])),
-    BadFileOpts = [raw],
-    BadType = {file,Log,BadFileOpts},
-    {error,{handler_not_added,{{open_failed,Log,enoent},_}}} =
-        logger:add_handler(?MODULE, logger_std_h,
-                           #{config => #{type => BadType}}),
+    MissingOpts = [raw],
+    Type1 = {file,Log,MissingOpts},
+    ok = logger:add_handler(?MODULE, logger_std_h,
+                            #{config => #{type => Type1}}),
+    {ok,#{config:=#{type:=file,file:=Log,modes:=Modes1}}} =
+        logger:get_handler_config(?MODULE),
+    [append,delayed_write,raw] = lists:sort(Modes1),
+    ok = logger:remove_handler(?MODULE),
 
     OkFileOpts = [raw,append],
     OkType = {file,Log,OkFileOpts},
     ok = logger:add_handler(?MODULE,
                             logger_std_h,
-                            #{config => #{type => OkType},
+                            #{config => #{type => OkType}, % old format
+                              filter_default=>log,
+                              filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
+                              formatter=>{?MODULE,self()}}),
+
+    ModOpts = [delayed_write|OkFileOpts],
+    #{cb_state := #{handler_state := #{type:=file,
+                                       file:=Log,
+                                       modes:=ModOpts}}} =
+        logger_olp:info(h_proc_name()),
+    {ok,#{config := #{type:=file,
+                      file:=Log,
+                      modes:=ModOpts}}} = logger:get_handler_config(?MODULE),
+    ok = logger:remove_handler(?MODULE),
+
+    ok = logger:add_handler(?MODULE,
+                            logger_std_h,
+                            #{config => #{type => file,
+                                          file => Log,
+                                          modes => OkFileOpts}, % new format
                               filter_default=>log,
                               filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
                               formatter=>{?MODULE,self()}}),
 
-    #{handler_state := #{type := OkType}} = logger_std_h:info(?MODULE),
+    #{cb_state := #{handler_state := #{type:=file,
+                                       file:=Log,
+                                       modes:=ModOpts}}} =
+        logger_olp:info(h_proc_name()),
+    {ok,#{config := #{type:=file,
+                      file:=Log,
+                      modes:=ModOpts}}} =
+        logger:get_handler_config(?MODULE),
     logger:notice(M1=?msg,?domain),
     ?check(M1),
     B1 = ?bin(M1),
@@ -635,6 +694,54 @@ file_opts(Config) ->
 file_opts(cleanup, _Config) ->
     logger:remove_handler(?MODULE).
 
+relative_file_path(_Config) ->
+    {ok,Dir} = file:get_cwd(),
+    AbsName1 = filename:join(Dir,?MODULE),
+    ok = logger:add_handler(?MODULE,
+                            logger_std_h,
+                            #{config => #{type=>file},
+                              filter_default=>log,
+                              filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
+                              formatter=>{?MODULE,self()}}),
+    #{cb_state := #{handler_state := #{file:=AbsName1}}} =
+        logger_olp:info(h_proc_name()),
+    {ok,#{config := #{file:=AbsName1}}} =
+        logger:get_handler_config(?MODULE),
+    ok = logger:remove_handler(?MODULE),
+
+    RelName2 = filename:join(atom_to_list(?FUNCTION_NAME),
+                             lists:concat([?FUNCTION_NAME,".log"])),
+    AbsName2 = filename:join(Dir,RelName2),
+    ok = logger:add_handler(?MODULE,
+                            logger_std_h,
+                            #{config => #{file => RelName2},
+                              filter_default=>log,
+                              filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
+                              formatter=>{?MODULE,self()}}),
+    #{cb_state := #{handler_state := #{file:=AbsName2}}} =
+        logger_olp:info(h_proc_name()),
+    {ok,#{config := #{file:=AbsName2}}} =
+        logger:get_handler_config(?MODULE),
+    logger:notice(M1=?msg,?domain),
+    ?check(M1),
+    B1 = ?bin(M1),
+    try_read_file(AbsName2, {ok,B1}, filesync_rep_int()),
+
+    ok = file:set_cwd(".."),
+    logger:notice(M2=?msg,?domain),
+    ?check(M2),
+    B20 = ?bin(M2),
+    B2 = <<B1/binary,B20/binary>>,
+    try_read_file(AbsName2, {ok,B2}, filesync_rep_int()),
+
+    {error,_} = logger:update_handler_config(?MODULE,config,#{file=>RelName2}),
+    ok = logger:update_handler_config(?MODULE,config,#{file=>AbsName2}),
+    ok = file:set_cwd(Dir),
+    ok = logger:update_handler_config(?MODULE,config,#{file=>RelName2}),
+    ok.
+relative_file_path(cleanup,_Config) ->
+    logger:remove_handler(?MODULE).
+
 
 sync(Config) ->
     Dir = ?config(priv_dir,Config),
@@ -642,13 +749,14 @@ sync(Config) ->
     Type = {file,Log},
     ok = logger:add_handler(?MODULE,
                             logger_std_h,
-                            #{config => #{type => Type},
+                            #{config => #{type => Type,
+                                          file_check => 10000},
                               filter_default=>log,
                               filters=>?DEFAULT_HANDLER_FILTERS([?MODULE]),
                               formatter=>{?MODULE,nl}}),
 
     %% check repeated filesync happens
-    start_tracer([{logger_std_h, write_to_dev, 5},
+    start_tracer([{logger_std_h, write_to_dev, 2},
                   {file, datasync, 1}],
                  [{logger_std_h, write_to_dev, <<"first\n">>},
                   {file,datasync}]),
@@ -658,7 +766,7 @@ sync(Config) ->
     check_tracer(filesync_rep_int()*2),
 
     %% check that explicit filesync is only done once
-    start_tracer([{logger_std_h, write_to_dev, 5},
+    start_tracer([{logger_std_h, write_to_dev, 2},
                   {file, datasync, 1}],
                  [{logger_std_h, write_to_dev, <<"second\n">>},
                   {file,datasync},
@@ -675,12 +783,9 @@ sync(Config) ->
     %% a filesync is still performed when handler goes idle
     ok = logger:update_handler_config(?MODULE, config,
                                       #{filesync_repeat_interval => no_repeat}),
-    no_repeat = maps:get(filesync_repeat_interval, logger_std_h:info(?MODULE)),
-    %% The following timer is to make sure the time from last log
-    %% ("second") to next ("third") is long enough, so the a flush is
-    %% triggered by the idle timeout between "thrid" and "fourth".
-    timer:sleep(?IDLE_DETECT_TIME_MSEC*2),
-    start_tracer([{logger_std_h, write_to_dev, 5},
+    no_repeat = maps:get(filesync_repeat_interval,
+                         maps:get(cb_state, logger_olp:info(h_proc_name()))),
+    start_tracer([{logger_std_h, write_to_dev, 2},
                   {file, datasync, 1}],
                  [{logger_std_h, write_to_dev, <<"third\n">>},
                   {file,datasync},
@@ -688,22 +793,24 @@ sync(Config) ->
                   {file,datasync}]),
     logger:notice("third", ?domain),
     %% wait for automatic filesync
-    timer:sleep(?IDLE_DETECT_TIME_MSEC*2),
+    timer:sleep(?IDLE_DETECT_TIME*2),
     logger:notice("fourth", ?domain),
     %% wait for automatic filesync
-    check_tracer(?IDLE_DETECT_TIME_MSEC*2),
+    check_tracer(?IDLE_DETECT_TIME*2),
 
     %% switch repeated filesync on and verify that the looping works
     SyncInt = 1000,
     WaitT = 4500,
     OneSync = {logger_h_common,handle_cast,repeated_filesync},
     %% receive 1 repeated_filesync per sec
-    start_tracer([{logger_h_common,handle_cast,2}],
+    start_tracer([{{logger_h_common,handle_cast,2},
+                   [{[repeated_filesync,'_'],[],[]}]}],
                  [OneSync || _ <- lists:seq(1, trunc(WaitT/SyncInt))]),
 
     ok = logger:update_handler_config(?MODULE, config,
                                       #{filesync_repeat_interval => SyncInt}),
-    SyncInt = maps:get(filesync_repeat_interval, logger_std_h:info(?MODULE)),
+    SyncInt = maps:get(filesync_repeat_interval,
+                       maps:get(cb_state,logger_olp:info(h_proc_name()))),
     timer:sleep(WaitT),
     ok = logger:update_handler_config(?MODULE, config,
                                       #{filesync_repeat_interval => no_repeat}),
@@ -764,8 +871,6 @@ sync_failure(Config) ->
     ok = rpc:call(Node, logger, update_handler_config,
                   [?STANDARD_HANDLER, config,
                    #{filesync_repeat_interval => SyncInt}]),
-    Info = rpc:call(Node, logger_std_h, info, [?STANDARD_HANDLER]),
-    SyncInt = maps:get(filesync_repeat_interval, Info),
     
     ok = log_on_remote_node(Node, "Logged1"),
     ?check_no_log,
@@ -1095,7 +1200,7 @@ qlen_kill_new(Config) ->
     receive
         {'DOWN', MRef, _, _, Info} ->
            case Info of
-                {shutdown,{overloaded,?MODULE,QLen,Mem}} ->
+                {shutdown,{overloaded,QLen,Mem}} ->
                     ct:pal("Terminated with qlen = ~w, mem = ~w", [QLen,Mem]);
                 killed ->
                     ct:pal("Slow shutdown, handler process was killed!", [])
@@ -1105,7 +1210,7 @@ qlen_kill_new(Config) ->
             ok
     after
         5000 ->
-            Info = logger_std_h:info(?MODULE),
+            Info = logger_olp:info(h_proc_name()),
             ct:pal("Handler state = ~p", [Info]),
             ct:fail("Handler not dead! It should not have survived this!")
     end.
@@ -1146,7 +1251,7 @@ mem_kill_new(Config) ->
     receive
         {'DOWN', MRef, _, _, Info} ->
             case Info of
-                {shutdown,{overloaded,?MODULE,QLen,Mem}} ->
+                {shutdown,{overloaded,QLen,Mem}} ->
                     ct:pal("Terminated with qlen = ~w, mem = ~w", [QLen,Mem]);
                 killed ->
                     ct:pal("Slow shutdown, handler process was killed!", [])
@@ -1156,7 +1261,7 @@ mem_kill_new(Config) ->
             ok
     after
         5000 ->
-            Info = logger_std_h:info(?MODULE),
+            Info = logger_olp:info(h_proc_name()),
             ct:pal("Handler state = ~p", [Info]),
             ct:fail("Handler not dead! It should not have survived this!")
     end.
@@ -1187,7 +1292,7 @@ restart_after(Config) ->
             ok
     after
         5000 ->
-            Info1 = logger_std_h:info(?MODULE),
+            Info1 = logger_olp:info(h_proc_name()),
             ct:pal("Handler state = ~p", [Info1]),
             ct:fail("Handler not dead! It should not have survived this!")
     end,
@@ -1212,7 +1317,7 @@ restart_after(Config) ->
             ok
     after
         5000 ->
-            Info2 = logger_std_h:info(?MODULE),
+            Info2 = logger_olp:info(h_proc_name()),
             ct:pal("Handler state = ~p", [Info2]),
             ct:fail("Handler not dead! It should not have survived this!")
     end,
@@ -1234,11 +1339,15 @@ handler_requests_under_load(Config) ->
                                        flush_qlen => 2000,
                                        burst_limit_enable => false}},
     ok = logger:update_handler_config(?MODULE, NewHConfig),
-    Pid = spawn_link(fun() -> send_requests(?MODULE, 1, [{filesync,[]},
-                                                         {info,[]},
-                                                         {reset,[]},
-                                                         {change_config,[]}])
-                     end),
+    Pid = spawn_link(
+            fun() -> send_requests(1,[{logger_std_h,filesync,[?MODULE],[]},
+                                      {logger_olp,info,[h_proc_name()],[]},
+                                      {logger_olp,reset,[h_proc_name()],[]},
+                                      {logger,update_handler_config,
+                                       [?MODULE, config,
+                                        #{overload_kill_enable => false}],
+                                       []}])
+            end),
     Sent = send_burst({t,10000}, seq, {chars,79}, notice),
     Pid ! {self(),finish},
     ReqResult = receive {Pid,Result} -> Result end,
@@ -1249,8 +1358,9 @@ handler_requests_under_load(Config) ->
                         [E || E <- Res,
                               is_tuple(E) andalso (element(1,E) == error)]
                 end,
-    Errors = [{Req,FindError(Res)} || {Req,Res} <- ReqResult],
-    NoOfReqs = lists:foldl(fun({_,Res}, N) -> N + length(Res) end, 0, ReqResult),
+    Errors = [{Func,FindError(Res)} || {_,Func,_,Res} <- ReqResult],
+    NoOfReqs = lists:foldl(fun({_,_,_,Res}, N) -> N + length(Res) end,
+                           0, ReqResult),
     ct:pal("~w requests made. Errors: ~n~p", [NoOfReqs,Errors]),
     ok = file_delete(Log).
 handler_requests_under_load(cleanup, _Config) ->
@@ -1270,24 +1380,356 @@ recreate_deleted_log(Config) ->
 recreate_deleted_log(cleanup, _Config) ->
     ok = stop_handler(?MODULE).
 
+reopen_changed_log(Config) ->
+    {Log,_HConfig,_StdHConfig} =
+        start_handler(?MODULE, ?FUNCTION_NAME, Config),
+    logger:notice("first",?domain),
+    logger_std_h:filesync(?MODULE),
+    ok = file:rename(Log,Log++".old"),
+    ok = file:write_file(Log,""),
+    logger:notice("second",?domain),
+    logger_std_h:filesync(?MODULE),
+    {ok,<<"first\n">>} = file:read_file(Log++".old"),
+    {ok,<<"second\n">>} = file:read_file(Log),
+    ok.
+reopen_changed_log(cleanup, _Config) ->
+    ok = stop_handler(?MODULE).
+
+rotate_size(Config) ->
+    {Log,_HConfig,_StdHConfig} =
+        start_handler(?MODULE, ?FUNCTION_NAME, Config),
+    ok = logger:update_handler_config(?MODULE,#{config=>#{max_no_bytes=>1000,
+                                                          max_no_files=>2}}),
+
+    Str = lists:duplicate(19,$a),
+    [logger:notice(Str,?domain) || _ <- lists:seq(1,50)],
+    logger_std_h:filesync(?MODULE),
+    {ok,#file_info{size=1000}} = file:read_file_info(Log),
+    {error,enoent} = file:read_file_info(Log++".0"),
+
+    logger:notice(Str,?domain),
+    logger_std_h:filesync(?MODULE),
+    {ok,#file_info{size=0}} = file:read_file_info(Log),
+    {ok,#file_info{size=1020}} = file:read_file_info(Log++".0"),
+    {error,enoent} = file:read_file_info(Log++".1"),
+
+    [logger:notice(Str,?domain) || _ <- lists:seq(1,51)],
+    logger_std_h:filesync(?MODULE),
+    {ok,#file_info{size=0}} = file:read_file_info(Log),
+    {ok,#file_info{size=1020}} = file:read_file_info(Log++".0"),
+    {ok,#file_info{size=1020}} = file:read_file_info(Log++".1"),
+    {error,enoent} = file:read_file_info(Log++".2"),
+
+    [logger:notice(Str,?domain) || _ <- lists:seq(1,50)],
+    logger_std_h:filesync(?MODULE),
+    {ok,#file_info{size=1000}} = file:read_file_info(Log),
+    {ok,#file_info{size=1020}} = file:read_file_info(Log++".0"),
+    {ok,#file_info{size=1020}} = file:read_file_info(Log++".1"),
+    {error,enoent} = file:read_file_info(Log++".2"),
+
+    logger:notice("bbbb",?domain),
+    logger_std_h:filesync(?MODULE),
+    {ok,#file_info{size=0}} = file:read_file_info(Log),
+    {ok,#file_info{size=1005}} = file:read_file_info(Log++".0"),
+    {ok,#file_info{size=1020}} = file:read_file_info(Log++".1"),
+    {error,enoent} = file:read_file_info(Log++".2"),
+
+    ok.
+rotate_size(cleanup,_Config) ->
+    ok = stop_handler(?MODULE).
+
+rotate_size_compressed(Config) ->
+    {Log,_HConfig,_StdHConfig} =
+        start_handler(?MODULE, ?FUNCTION_NAME, Config),
+    ok = logger:update_handler_config(?MODULE,
+                                      #{config=>#{max_no_bytes=>1000,
+                                                  max_no_files=>2,
+                                                  compress_on_rotate=>true}}),
+    Str = lists:duplicate(19,$a),
+    [logger:notice(Str,?domain) || _ <- lists:seq(1,50)],
+    logger_std_h:filesync(?MODULE),
+    {ok,#file_info{size=1000}} = file:read_file_info(Log),
+    {error,enoent} = file:read_file_info(Log++".0"),
+    {error,enoent} = file:read_file_info(Log++".0.gz"),
+
+    logger:notice(Str,?domain),
+    logger_std_h:filesync(?MODULE),
+    {ok,#file_info{size=0}} = file:read_file_info(Log),
+    {error,enoent} = file:read_file_info(Log++".0"),
+    {ok,#file_info{size=35}} = file:read_file_info(Log++".0.gz"),
+    {error,enoent} = file:read_file_info(Log++".1"),
+    {error,enoent} = file:read_file_info(Log++".1.gz"),
+
+    [logger:notice(Str,?domain) || _ <- lists:seq(1,51)],
+    logger_std_h:filesync(?MODULE),
+    {ok,#file_info{size=0}} = file:read_file_info(Log),
+    {error,enoent} = file:read_file_info(Log++".0"),
+    {ok,#file_info{size=35}} = file:read_file_info(Log++".0.gz"),
+    {error,enoent} = file:read_file_info(Log++".1"),
+    {ok,#file_info{size=35}} = file:read_file_info(Log++".1.gz"),
+    {error,enoent} = file:read_file_info(Log++".2"),
+    {error,enoent} = file:read_file_info(Log++".2.gz"),
+
+    [logger:notice(Str,?domain) || _ <- lists:seq(1,50)],
+    logger_std_h:filesync(?MODULE),
+    {ok,#file_info{size=1000}} = file:read_file_info(Log),
+    {error,enoent} = file:read_file_info(Log++".0"),
+    {ok,#file_info{size=35}} = file:read_file_info(Log++".0.gz"),
+    {error,enoent} = file:read_file_info(Log++".1"),
+    {ok,#file_info{size=35}} = file:read_file_info(Log++".1.gz"),
+    {error,enoent} = file:read_file_info(Log++".2"),
+    {error,enoent} = file:read_file_info(Log++".2.gz"),
+
+    logger:notice("bbbb",?domain),
+    logger_std_h:filesync(?MODULE),
+    {ok,#file_info{size=0}} = file:read_file_info(Log),
+    {error,enoent} = file:read_file_info(Log++".0"),
+    {ok,#file_info{size=38}} = file:read_file_info(Log++".0.gz"),
+    {error,enoent} = file:read_file_info(Log++".1"),
+    {ok,#file_info{size=35}} = file:read_file_info(Log++".1.gz"),
+    {error,enoent} = file:read_file_info(Log++".2"),
+    {error,enoent} = file:read_file_info(Log++".2.gz"),
+
+    ok.
+rotate_size_compressed(cleanup,_Config) ->
+    ok = stop_handler(?MODULE).
+
+rotate_size_reopen(Config) ->
+    {Log,_HConfig,_StdHConfig} =
+        start_handler(?MODULE, ?FUNCTION_NAME, Config),
+    ok = logger:update_handler_config(?MODULE,#{config=>#{max_no_bytes=>1000,
+                                                          max_no_files=>2}}),
+
+    Str = lists:duplicate(19,$a),
+    [logger:notice(Str,?domain) || _ <- lists:seq(1,40)],
+    logger_std_h:filesync(?MODULE),
+    {ok,#file_info{size=800}} = file:read_file_info(Log),
+
+    {ok,HConfig} = logger:get_handler_config(?MODULE),
+    ok = logger:remove_handler(?MODULE),
+    ok = logger:add_handler(?MODULE,maps:get(module,HConfig),HConfig),
+    {ok,#file_info{size=800}} = file:read_file_info(Log),
+
+    [logger:notice(Str,?domain) || _ <- lists:seq(1,40)],
+    logger_std_h:filesync(?MODULE),
+    {ok,#file_info{size=580}} = file:read_file_info(Log),
+    {ok,#file_info{size=1020}} = file:read_file_info(Log++".0"),
+    ok.
+rotate_size_reopen(cleanup,_Config) ->
+    ok = stop_handler(?MODULE).
+
+rotation_opts(Config) ->
+    {Log,_HConfig,StdHConfig} =
+        start_handler(?MODULE, ?FUNCTION_NAME, Config),
+    #{max_no_bytes:=infinity,
+      max_no_files:=0,
+      compress_on_rotate:=false} = StdHConfig,
+
+    %% Test bad rotation config
+    {error,{invalid_config,_,_}} =
+        logger:update_handler_config(?MODULE,config,#{max_no_bytes=>0}),
+    {error,{invalid_config,_,_}} =
+        logger:update_handler_config(?MODULE,config,#{max_no_files=>infinity}),
+    {error,{invalid_config,_,_}} =
+        logger:update_handler_config(?MODULE,config,
+                                     #{compress_on_rotate=>undefined}),
+
+
+    %% Test good rotation config - start with no rotation
+    Str = lists:duplicate(19,$a),
+    [logger:notice(Str,?domain) || _ <- lists:seq(1,10)],
+    logger_std_h:filesync(?MODULE),
+    {ok,#file_info{size=200}} = file:read_file_info(Log),
+    [] = filelib:wildcard(Log++".*"),
+
+    %% Turn on rotation, check that existing file is rotated since its
+    %% size exceeds max_no_bytes
+    ok = logger:update_handler_config(?MODULE,
+                                      config,
+                                      #{max_no_bytes=>100,
+                                        max_no_files=>2}),
+    timer:sleep(100), % give some time to execute config_changed
+    {ok,#file_info{size=0}} = file:read_file_info(Log),
+    Log0 = Log++".0",
+    {ok,#file_info{size=200}} = file:read_file_info(Log0),
+    [Log0] = filelib:wildcard(Log++".*"),
+
+    %% Fill all logs
+    [logger:notice(Str,?domain) || _ <- lists:seq(1,13)],
+    logger_std_h:filesync(?MODULE),
+    {ok,#file_info{size=20}} = file:read_file_info(Log),
+    {ok,#file_info{size=120}} = file:read_file_info(Log0),
+    {ok,#file_info{size=120}} = file:read_file_info(Log++".1"),
+    [_,_] = filelib:wildcard(Log++".*"),
+
+    %% Extend size and count and check that nothing changes with existing files
+    ok = logger:update_handler_config(?MODULE,
+                                      config,
+                                      #{max_no_bytes=>200,
+                                        max_no_files=>3}),
+    timer:sleep(100), % give some time to execute config_changed
+    {ok,#file_info{size=20}} = file:read_file_info(Log),
+    {ok,#file_info{size=120}} = file:read_file_info(Log0),
+    {ok,#file_info{size=120}} = file:read_file_info(Log++".1"),
+    [_,_] = filelib:wildcard(Log++".*"),
+
+    %% Add more log events and see that extended size and count works
+    [logger:notice(Str,?domain) || _ <- lists:seq(1,10)],
+    logger_std_h:filesync(?MODULE),
+    {ok,#file_info{size=0}} = file:read_file_info(Log),
+    {ok,#file_info{size=220}} = file:read_file_info(Log0),
+    {ok,#file_info{size=120}} = file:read_file_info(Log++".1"),
+    {ok,#file_info{size=120}} = file:read_file_info(Log++".2"),
+    [_,_,_] = filelib:wildcard(Log++".*"),
+
+    %% Reduce count and check that archive files that exceed the new
+    %% count are moved
+    ok = logger:update_handler_config(?MODULE,
+                                      config,
+                                      #{max_no_files=>1}),
+    timer:sleep(100), % give some time to execute config_changed
+    {ok,#file_info{size=0}} = file:read_file_info(Log),
+    {ok,#file_info{size=220}} = file:read_file_info(Log0),
+    [Log0] = filelib:wildcard(Log++".*"),
+
+    %% Extend size and count again, and turn on compression. Check
+    %% that archives are compressed
+    ok = logger:update_handler_config(?MODULE,
+                                      config,
+                                      #{max_no_bytes=>100,
+                                        max_no_files=>2,
+                                        compress_on_rotate=>true}),
+    timer:sleep(100), % give some time to execute config_changed
+    {ok,#file_info{size=0}} = file:read_file_info(Log),
+    Log0gz = Log0++".gz",
+    {ok,#file_info{size=29}} = file:read_file_info(Log0gz),
+    [Log0gz] = filelib:wildcard(Log++".*"),
+
+    %% Fill all logs
+    [logger:notice(Str,?domain) || _ <- lists:seq(1,13)],
+    logger_std_h:filesync(?MODULE),
+    {ok,#file_info{size=20}} = file:read_file_info(Log),
+    {ok,#file_info{size=29}} = file:read_file_info(Log0gz),
+    {ok,#file_info{size=29}} = file:read_file_info(Log++".1.gz"),
+    [_,_] = filelib:wildcard(Log++".*"),
+
+    %% Reduce count and turn off compression. Check that archives that
+    %% exceeds the new count are removed, and the rest are
+    %% uncompressed.
+    ok = logger:update_handler_config(?MODULE,
+                                      config,
+                                      #{max_no_files=>1,
+                                        compress_on_rotate=>false}),
+    timer:sleep(100), % give some time to execute config_changed
+    {ok,#file_info{size=20}} = file:read_file_info(Log),
+    {ok,#file_info{size=120}} = file:read_file_info(Log0),
+    [Log0] = filelib:wildcard(Log++".*"),
+
+    %% Check that config and handler state agree on the current rotation settings
+    {ok,#{config:=#{max_no_bytes:=100,
+                    max_no_files:=1,
+                    compress_on_rotate:=false}}} =
+         logger:get_handler_config(?MODULE),
+    #{cb_state:=#{handler_state:=#{max_no_bytes:=100,
+                                   max_no_files:=1,
+                                   compress_on_rotate:=false}}} =
+        logger_olp:info(h_proc_name()),
+    ok.
+rotation_opts(cleanup,_Config) ->
+    ok = stop_handler(?MODULE).
+
+rotation_opts_restart_handler(Config) ->
+    {Log,_HConfig,_StdHConfig} =
+        start_handler(?MODULE, ?FUNCTION_NAME, Config),
+    ok = logger:update_handler_config(?MODULE,
+                                      config,
+                                      #{max_no_bytes=>100,
+                                        max_no_files=>2}),
+
+    %% Fill all logs
+    Str = lists:duplicate(19,$a),
+    [logger:notice(Str,?domain) || _ <- lists:seq(1,15)],
+    logger_std_h:filesync(?MODULE),
+    {ok,#file_info{size=60}} = file:read_file_info(Log),
+    {ok,#file_info{size=120}} = file:read_file_info(Log++".0"),
+    {ok,#file_info{size=120}} = file:read_file_info(Log++".1"),
+    [_,_] = filelib:wildcard(Log++".*"),
+
+    %% Stop/start handler and turn off rotation. Check that archives are removed.
+    {ok,#{config:=StdHConfig1}=HConfig1} = logger:get_handler_config(?MODULE),
+    ok = logger:remove_handler(?MODULE),
+    ok = logger:add_handler(
+           ?MODULE,logger_std_h,
+           HConfig1#{config=>StdHConfig1#{max_no_bytes=>infinity}}),
+    timer:sleep(100),
+    {ok,#file_info{size=60}} = file:read_file_info(Log),
+    [] = filelib:wildcard(Log++".*"),
+
+    %% Add some log events and check that file is no longer rotated.
+    [logger:notice(Str,?domain) || _ <- lists:seq(1,10)],
+    logger_std_h:filesync(?MODULE),
+    {ok,#file_info{size=260}} = file:read_file_info(Log),
+    [] = filelib:wildcard(Log++".*"),
+
+    %% Stop/start handler and trun on rotation. Check that file is rotated.
+    {ok,#{config:=StdHConfig2}=HConfig2} = logger:get_handler_config(?MODULE),
+    ok = logger:remove_handler(?MODULE),
+    ok = logger:add_handler(
+           ?MODULE,logger_std_h,
+           HConfig2#{config=>StdHConfig2#{max_no_bytes=>100,
+                                          max_no_files=>2}}),
+    timer:sleep(100),
+    {ok,#file_info{size=0}} = file:read_file_info(Log),
+    {ok,#file_info{size=260}} = file:read_file_info(Log++".0"),
+    [_] = filelib:wildcard(Log++".*"),
+
+    %% Fill all logs
+    [logger:notice(Str,?domain) || _ <- lists:seq(1,10)],
+    logger_std_h:filesync(?MODULE),
+    {ok,#file_info{size=80}} = file:read_file_info(Log),
+    {ok,#file_info{size=120}} = file:read_file_info(Log++".0"),
+    {ok,#file_info{size=260}} = file:read_file_info(Log++".1"),
+
+    %% Stop/start handler, reduce count and turn on compression. Check
+    %% that excess archives are removed, and the rest compressed.
+    {ok,#{config:=StdHConfig3}=HConfig3} = logger:get_handler_config(?MODULE),
+    ok = logger:remove_handler(?MODULE),
+    ok = logger:add_handler(
+           ?MODULE,logger_std_h,
+           HConfig3#{config=>StdHConfig3#{max_no_bytes=>75,
+                                          max_no_files=>1,
+                                          compress_on_rotate=>true}}),
+    timer:sleep(100),
+    {ok,#file_info{size=0}} = file:read_file_info(Log),
+    {ok,#file_info{size=29}} = file:read_file_info(Log++".0.gz"),
+    [_] = filelib:wildcard(Log++".*"),
+
+    %% Stop/start handler and turn off compression. Check that achives
+    %% are decompressed.
+    {ok,#{config:=StdHConfig4}=HConfig4} = logger:get_handler_config(?MODULE),
+    ok = logger:remove_handler(?MODULE),
+    ok = logger:add_handler(
+           ?MODULE,logger_std_h,
+           HConfig4#{config=>StdHConfig4#{compress_on_rotate=>false}}),
+    timer:sleep(100),
+    {ok,#file_info{size=0}} = file:read_file_info(Log),
+    {ok,#file_info{size=80}} = file:read_file_info(Log++".0"),
+    [_] = filelib:wildcard(Log++".*"),
+
+    ok.
+rotation_opts_restart_handler(cleanup,_Config) ->
+    ok = stop_handler(?MODULE).
+
 %%%-----------------------------------------------------------------
 %%%
-send_requests(HName, TO, Reqs = [{Req,Res}|Rs]) ->
+send_requests(TO, Reqs = [{Mod,Func,Args,Res}|Rs]) ->
     receive
         {From,finish} ->
             From ! {self(),Reqs}
     after
         TO ->
-            Result =
-                case Req of
-                    change_config ->
-                        logger:update_handler_config(HName, config,
-                                                     #{overload_kill_enable =>
-                                                           false});
-                    Func ->
-                        logger_std_h:Func(HName)
-                end,
-            send_requests(HName, TO, Rs ++ [{Req,[Result|Res]}])
+            Result = apply(Mod,Func,Args),
+            send_requests(TO, Rs ++ [{Mod,Func,Args,[Result|Res]}])
     end.
             
 
@@ -1298,8 +1740,8 @@ start_handler(Name, TTY, _Config) when TTY == standard_io;
     ok = logger:add_handler(Name,
                             logger_std_h,
                             #{config => #{type => TTY},
-                              filter_default=>log,
-                              filters=>?DEFAULT_HANDLER_FILTERS([Name]),
+                              filter_default=>stop,
+                              filters=>filter_only_this_domain(Name),
                               formatter=>{?MODULE,op}}),
     {ok,HConfig = #{config := StdHConfig}} = logger:get_handler_config(Name),
     {HConfig,StdHConfig};
@@ -1313,12 +1755,17 @@ start_handler(Name, FuncName, Config) ->
     ok = logger:add_handler(Name,
                             logger_std_h,
                             #{config => #{type => Type},
-                              filter_default=>log,
-                              filters=>?DEFAULT_HANDLER_FILTERS([Name]),
+                              filter_default=>stop,
+                              filters=>filter_only_this_domain(Name),
                               formatter=>{?MODULE,op}}),
     {ok,HConfig = #{config := StdHConfig}} = logger:get_handler_config(Name),
     {Log,HConfig,StdHConfig}.
+
+filter_only_this_domain(Name) ->
+    [{remote_gl,{fun logger_filters:remote_gl/2,stop}},
+     {domain,{fun logger_filters:domain/2,{log,super,[Name]}}}].
     
+
 stop_handler(Name) ->
     R = logger:remove_handler(Name),
     ct:pal("Handler ~p stopped! Result: ~p", [Name,R]),
@@ -1624,7 +2071,8 @@ start_tracer(Trace,Expected) ->
     Pid = self(),
     FileCtrlPid = maps:get(file_ctrl_pid,
                            maps:get(handler_state,
-                                    logger_std_h:info(?MODULE))),
+                                    maps:get(cb_state,
+                                             logger_olp:info(h_proc_name())))),
     dbg:tracer(process,{fun tracer/2,{Pid,Expected}}),
     dbg:p(whereis(h_proc_name()),[c]),
     dbg:p(FileCtrlPid,[c]),
@@ -1632,7 +2080,9 @@ start_tracer(Trace,Expected) ->
     ok.
 
 tpl([{M,F,A}|Trace]) ->
-    {ok,Match} = dbg:tpl(M,F,A,[]),
+    tpl([{{M,F,A},[]}|Trace]);
+tpl([{{M,F,A},MS}|Trace]) ->
+    {ok,Match} = dbg:tpl(M,F,A,MS),
     case lists:keyfind(matched,1,Match) of
         {_,_,1} ->
             ok;
@@ -1648,7 +2098,7 @@ tpl([]) ->
 tracer({trace,_,call,{logger_h_common,handle_cast,[Op|_]}},
        {Pid,[{Mod,Func,Op}|Expected]}) ->
     maybe_tracer_done(Pid,Expected,{Mod,Func,Op});
-tracer({trace,_,call,{Mod=logger_std_h,Func=write_to_dev,[_,Data,_,_,_]}},
+tracer({trace,_,call,{Mod=logger_std_h,Func=write_to_dev,[Data,_]}},
        {Pid,[{Mod,Func,Data}|Expected]}) ->
     maybe_tracer_done(Pid,Expected,{Mod,Func,Data});
 tracer({trace,_,call,{Mod,Func,_}}, {Pid,[{Mod,Func}|Expected]}) ->
@@ -1732,4 +2182,3 @@ filesync_rep_int() ->
 
 file_delete(Log) ->
    file:delete(Log).
-
diff --git a/lib/kernel/test/logger_stress_SUITE.erl b/lib/kernel/test/logger_stress_SUITE.erl
new file mode 100644
index 0000000000..1a278fb1b2
--- /dev/null
+++ b/lib/kernel/test/logger_stress_SUITE.erl
@@ -0,0 +1,550 @@
+%%
+%% %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(logger_stress_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct_event.hrl").
+-include_lib("kernel/include/logger.hrl").
+-include_lib("kernel/src/logger_h_common.hrl").
+
+-ifdef(SAVE_STATS).
+  -define(COLLECT_STATS(_All_,_Procs_),
+          ct:pal("~p",[stats(_All_,_Procs_)])).
+-else.
+  -define(COLLECT_STATS(_All_,_Procs__), ok).
+-endif.
+
+-define(TEST_DURATION,120). % seconds
+
+suite() ->
+    [{timetrap,{minutes,3}},
+     {ct_hooks,[logger_test_lib]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_Group, Config) ->
+    Config.
+
+end_per_group(_Group, _Config) ->
+    ok.
+
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+end_per_testcase(Case, Config) ->
+    try apply(?MODULE,Case,[cleanup,Config])
+    catch error:undef -> ok
+    end,
+    ok.
+
+groups() ->
+    [].
+
+all() -> 
+    [allow_events,
+     reject_events,
+     std_handler,
+     disk_log_handler,
+     std_handler_time,
+     std_handler_time_big,
+     disk_log_handler_time,
+     disk_log_handler_time_big,
+     emulator_events,
+     remote_events,
+     remote_to_disk_log,
+     remote_emulator_events,
+     remote_emulator_to_disk_log].
+
+%%%-----------------------------------------------------------------
+%%% Test cases
+%%%-----------------------------------------------------------------
+%% Time from log macro call to handler callback
+allow_events(Config) ->
+    {ok,_,Node} =
+        logger_test_lib:setup(Config,
+                              [{logger,
+                                [{handler,default,?MODULE,#{}}]},
+                               {logger_level,notice}]),
+    N = 100000,
+    {T,_} = timer:tc(fun() -> rpc:call(Node,?MODULE,nlogs,[N]) end),
+    IOPS = N * 1000/T, % log events allowed per millisecond
+    ct_event:notify(#event{name = benchmark_data,
+                           data = [{value,IOPS}]}),
+    {comment,io_lib:format("~.2f accepted events pr millisecond",
+                           [IOPS])}.
+
+%% Time from log macro call to reject (log level)
+reject_events(Config) ->
+    {ok,_,Node} =
+        logger_test_lib:setup(Config,
+                              [{logger,
+                                [{handler,default,?MODULE,#{}}]},
+                               {logger_level,error}]),
+    N = 1000000,
+    {T,_} = timer:tc(fun() -> rpc:call(Node,?MODULE,nlogs,[N]) end),
+    IOPS = N * 1000/T, % log events rejected per millisecond
+    ct_event:notify(#event{name = benchmark_data,
+                           data = [{value,IOPS}]}),
+    {comment,io_lib:format("~.2f rejected events pr millisecond",
+                           [IOPS])}.
+
+%% Cascading failure that produce gen_server and proc_lib reports -
+%% how many of the produced log events are actually written to a log
+%% with logger_std_h file handler.
+std_handler(Config) ->
+    {ok,_,Node} =
+        logger_test_lib:setup(Config,
+                              [{logger,
+                                [{handler,default,logger_std_h,
+                                  #{config=>#{type=>{file,"default.log"}}}}]}]),
+
+    cascade({Node,{logger_backend,log_allowed,2},[]},
+            {Node,{logger_std_h,write,4},[{default,logger_std_h_default}]},
+            fun otp_cascading/0).
+std_handler(cleanup,_Config) ->
+    _ = file:delete("default.log"),
+    ok.
+
+%% Disable overload protection and just print a lot - measure time.
+%% The IOPS reported is the number of log events written per millisecond.
+std_handler_time(Config) ->
+    measure_handler_time(logger_std_h,#{type=>{file,"default.log"}},Config).
+std_handler_time(cleanup,_Config) ->
+    _ = file:delete("default.log"),
+    ok.
+
+std_handler_time_big(Config) ->
+    measure_handler_time_big(logger_std_h,#{type=>{file,"default.log"}},Config).
+std_handler_time_big(cleanup,_Config) ->
+    _ = file:delete("default.log"),
+    ok.
+
+%% Cascading failure that produce gen_server and proc_lib reports -
+%% how many of the produced log events are actually written to a log
+%% with logger_disk_log_h wrap file handler.
+disk_log_handler(Config) ->
+    {ok,_,Node} =
+        logger_test_lib:setup(Config,
+                              [{logger,
+                                [{handler,default,logger_disk_log_h,#{}}]}]),
+    cascade({Node,{logger_backend,log_allowed,2},[]},
+            {Node,{logger_disk_log_h,write,4},
+             [{default,logger_disk_log_h_default}]},
+            fun otp_cascading/0).
+disk_log_handler(cleanup,_Config) ->
+    Files = filelib:wildcard("default.log.*"),
+    [_ = file:delete(F) || F <- Files],
+    ok.
+
+%% Disable overload protection and just print a lot - measure time.
+%% The IOPS reported is the number of log events written per millisecond.
+disk_log_handler_time(Config) ->
+    measure_handler_time(logger_disk_log_h,#{type=>halt},Config).
+disk_log_handler_time(cleanup,_Config) ->
+    _ = file:delete("default"),
+    ok.
+
+disk_log_handler_time_big(Config) ->
+    measure_handler_time_big(logger_disk_log_h,#{type=>halt},Config).
+disk_log_handler_time_big(cleanup,_Config) ->
+    _ = file:delete("default"),
+    ok.
+
+%% Cascading failure that produce log events from the emulator - how
+%% many of the produced log events pass through the proxy.
+emulator_events(Config) ->
+    {ok,_,Node} =
+        logger_test_lib:setup(Config,
+                              [{logger,
+                                [{handler,default,?MODULE,#{}}]}]),
+    cascade({Node,{?MODULE,producer,0},[]},
+            {Node,{?MODULE,log,2},[{proxy,logger_proxy}]},
+            fun em_cascading/0).
+
+%% Cascading failure that produce gen_server and proc_lib reports on
+%% remote node - how many of the produced log events pass through the
+%% proxy.
+remote_events(Config) ->
+    {ok,_,Node1} =
+        logger_test_lib:setup([{postfix,1}|Config],
+                              [{logger,
+                                [{handler,default,?MODULE,#{}}]}]),
+    {ok,_,Node2} =
+        logger_test_lib:setup([{postfix,2}|Config],[]),
+    cascade({Node2,{logger_backend,log_allowed,2},[{remote_proxy,logger_proxy}]},
+            {Node1,{?MODULE,log,2},[{local_proxy,logger_proxy}]},
+            fun otp_cascading/0).
+
+%% Cascading failure that produce gen_server and proc_lib reports on
+%% remote node - how many of the produced log events are actually
+%% written to a log with logger_disk_log_h wrap file handler.
+remote_to_disk_log(Config) ->
+    {ok,_,Node1} =
+        logger_test_lib:setup([{postfix,1}|Config],
+                              [{logger,
+                                [{handler,default,logger_disk_log_h,#{}}]}]),
+    {ok,_,Node2} =
+        logger_test_lib:setup([{postfix,2}|Config],[]),
+    cascade({Node2,{logger_backend,log_allowed,2},[{remote_proxy,logger_proxy}]},
+            {Node1,{logger_disk_log_h,write,4},
+             [{local_proxy,logger_proxy},
+              {local_default,logger_disk_log_h_default}]},
+            fun otp_cascading/0).
+remote_to_disk_log(cleanup,_Config) ->
+    Files = filelib:wildcard("default.log.*"),
+    [_ = file:delete(F) || F <- Files],
+    ok.
+
+%% Cascading failure that produce log events from the emulator on
+%% remote node - how many of the produced log events pass through the
+%% proxy.
+remote_emulator_events(Config) ->
+    {ok,_,Node1} =
+        logger_test_lib:setup([{postfix,1}|Config],
+                              [{logger,
+                                [{handler,default,?MODULE,#{}}]}]),
+    {ok,_,Node2} =
+        logger_test_lib:setup([{postfix,2}|Config],[]),
+    cascade({Node2,{?MODULE,producer,0},[{remote_proxy,logger_proxy}]},
+            {Node1,{?MODULE,log,2},[{local_proxy,logger_proxy}]},
+            fun em_cascading/0).
+
+%% Cascading failure that produce log events from the emulator on
+%% remote node - how many of the produced log events are actually
+%% written to a log with logger_disk_log_h wrap file handler.
+remote_emulator_to_disk_log(Config) ->
+    {ok,_,Node1} =
+        logger_test_lib:setup([{postfix,1}|Config],
+                              [{logger,
+                                [{handler,default,logger_disk_log_h,#{}}]}]),
+    {ok,_,Node2} =
+        logger_test_lib:setup([{postfix,2}|Config],[]),
+    cascade({Node2,{?MODULE,producer,0},[{remote_proxy,logger_proxy}]},
+            {Node1,{logger_disk_log_h,write,4},
+             [{local_proxy,logger_proxy},
+              {local_default,logger_disk_log_h_default}]},
+            fun em_cascading/0).
+remote_emulator_to_disk_log(cleanup,_Config) ->
+    Files = filelib:wildcard("default.log.*"),
+    [_ = file:delete(F) || F <- Files],
+    ok.
+
+%%%-----------------------------------------------------------------
+%%% Internal functions
+measure_handler_time(Module,HCfg,Config) ->
+    measure_handler_time(Module,100000,small_fa(),millisecond,HCfg,#{},Config).
+
+measure_handler_time_big(Module,HCfg,Config) ->
+    FCfg = #{chars_limit=>4096, max_size=>1024},
+    measure_handler_time(Module,100,big_fa(),second,HCfg,FCfg,Config).
+
+measure_handler_time(Module,N,FA,Unit,HCfg,FCfg,Config) ->
+    {ok,_,Node} =
+        logger_test_lib:setup(
+          Config,
+          [{logger,
+            [{handler,default,Module,
+              #{formatter => {logger_formatter,
+                              maps:merge(#{legacy_header=>false,
+                                           single_line=>true},FCfg)},
+                config=>maps:merge(#{sync_mode_qlen => N+1,
+                                     drop_mode_qlen => N+1,
+                                     flush_qlen => N+1,
+                                     burst_limit_enable => false,
+                                     filesync_repeat_interval => no_repeat},
+                                   HCfg)}}]}]),
+    %% HPid = rpc:call(Node,erlang,whereis,[?name_to_reg_name(Module,default)]),
+    %% {links,[_,FCPid]} = rpc:call(Node,erlang,process_info,[HPid,links]),
+    T0 = erlang:monotonic_time(millisecond),
+    ok = rpc:call(Node,?MODULE,nlogs_wait,[N,FA,Module]),
+    %% ok = rpc:call(Node,fprof,apply,[fun ?MODULE:nlogs_wait/2,[N div 10,FA,Module],[{procs,[HPid,FCPid]}]]),
+    T1 = erlang:monotonic_time(millisecond),
+    T = T1-T0,
+    M = case Unit of
+            millisecond -> 1;
+            second -> 1000
+        end,
+    IOPS = M*N/T,
+    ct:pal("N: ~p~nT: ~p~nIOPS: ~.2f events pr ~w",[N,T,IOPS,Unit]),
+    %% Stats = rpc:call(Node,logger_olp,info,[?name_to_reg_name(Module,default)]),
+    %% ct:pal("Stats: ~p",[Stats]),
+    ct_event:notify(#event{name = benchmark_data,
+                           data = [{value,IOPS}]}),
+    {comment,io_lib:format("~.2f events written pr ~w",[IOPS,Unit])}.
+
+nlogs_wait(N,{F,A},Module) ->
+    group_leader(whereis(user),self()),
+    [?LOG_NOTICE(F,A) || _ <- lists:seq(1,N)],
+    wait(Module).
+
+wait(Module) ->
+    case Module:filesync(default) of
+        {error,handler_busy} ->
+            wait(Module);
+        ok ->
+            ok
+    end.
+
+small_fa() ->
+    Str = "\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        "[\\]^_`abcdefghijklmnopqr",
+    {"~ts",[Str]}.
+
+big_fa() ->
+    {"~p",[lists:duplicate(1048576,"a")]}.
+
+nlogs(N) ->
+    group_leader(whereis(user),self()),
+    Str = "\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        "[\\]^_`abcdefghijklmnopqr",
+    [?LOG_NOTICE(Str) || _ <- lists:seq(1,N)],
+    ok.
+
+%% cascade(ProducerInfo,ConsumerInfo,TestFun)
+cascade({PNode,PMFA,_PStatProcs},{CNode,CMFA,_CStatProcs},TestFun) ->
+    Tab  = ets:new(counter,[set,public]),
+    ets:insert(Tab,{producer,0}),
+    ets:insert(Tab,{consumer,0}),
+    dbg:tracer(process,{fun tracer/2,{Tab,PNode,CNode}}),
+    dbg:n(PNode),
+    dbg:n(CNode),
+    dbg:cn(node()),
+    dbg:p(all,[call,arity]),
+    dbg:tpl(PMFA,[]),
+    dbg:tpl(CMFA,[]),
+
+    Pid = rpc:call(CNode,?MODULE,wrap_test,[PNode,TestFun]),
+    MRef = erlang:monitor(process,Pid),
+    TO = ?TEST_DURATION*1000,
+    receive {'DOWN',MRef,_,_,Reason} ->
+            ct:fail({remote_pid_down,Reason})
+    after TO ->
+            All = ets:lookup_element(Tab,producer,2),
+            Written = ets:lookup_element(Tab,consumer,2),
+            dbg:stop_clear(),
+            ?COLLECT_STATS(All,
+                           [{PNode,P,Id} || {Id,P} <- _PStatProcs] ++
+                               [{CNode,P,Id} || {Id,P} <- _CStatProcs]),
+            Ratio = Written/All * 100,
+            ct_event:notify(#event{name = benchmark_data,
+                                   data = [{value,Ratio}]}),
+            {comment,io_lib:format("~p % (~p written, ~p produced)",
+                                   [round(Ratio),Written,All])}
+    end.
+
+wrap_test(Fun) ->
+    wrap_test(node(),Fun).
+wrap_test(Node,Fun) ->
+    reset(),
+    group_leader(whereis(user),self()),
+    rpc:call(Node,?MODULE,do_fun,[Fun]).
+
+do_fun(Fun) ->
+    reset(),
+    Fun().
+
+reset() ->
+    reset([logger_std_h_default, logger_disk_log_h_default, logger_proxy]).
+reset([P|Ps]) ->
+    is_pid(whereis(P)) andalso logger_olp:reset(P),
+    reset(Ps);
+reset([]) ->
+    ok.
+
+
+tracer({trace,_,call,{?MODULE,producer,_}},{Tab,_PNode,_CNode}=S) ->
+    ets:update_counter(Tab,producer,1),
+    S;
+tracer({trace,Pid,call,{logger_backend,log_allowed,_}},{Tab,PNode,_CNode}=S) when node(Pid)=:=PNode ->
+    ets:update_counter(Tab,producer,1),
+    S;
+tracer({trace,_,call,{?MODULE,log,_}},{Tab,_PNode,_CNode}=S) ->
+    ets:update_counter(Tab,consumer,1),
+    S;
+tracer({trace,_,call,{_,write,_}},{Tab,_PNode,_CNode}=S) ->
+    ets:update_counter(Tab,consumer,1),
+    S;
+tracer(_,S) ->
+    S.
+
+
+%%%-----------------------------------------------------------------
+%%% Collect statistics
+-define(STAT_KEYS,
+        [burst_drops,
+         calls,
+         casts,
+         drops,
+         flushed,
+         flushes,
+         freq,
+         last_qlen,
+         max_qlen,
+         time,
+         writes]).
+-define(EVENT_KEYS,
+        [calls,casts,flushed]).
+
+stats(All,Procs) ->
+    NI = [{Id,rpc:call(N,logger_olp,info,[P])} || {N,P,Id}<-Procs],
+    [{all,All}|[stats(Id,I,All) || {Id,I} <- NI]].
+
+stats(Id,Info,All) ->
+    S = maps:with(?STAT_KEYS,Info),
+    AllOnProc = lists:sum(maps:values(maps:with(?EVENT_KEYS,S))),
+    if All>0 ->
+            Writes = maps:get(writes,S),
+            {_,ActiveTime} = maps:get(time,S),
+            Rate = round(100*Writes/All),
+            RateOnProc =
+                if AllOnProc>0 ->
+                        round(100*Writes/AllOnProc);
+                   true ->
+                        0
+                end,
+            AvFreq =
+                if ActiveTime>0 ->
+                        round(Writes/ActiveTime);
+                   true ->
+                        0
+                end,
+            {Id,
+             {stats,S},
+             {rate,Rate},
+             {rate_on_proc,RateOnProc},
+             {av_freq,AvFreq}};
+       true ->
+            {Id,none}
+    end.
+
+%%%-----------------------------------------------------------------
+%%% Spawn a lot of processes that crash repeatedly, causing a lot of
+%%% error reports from the emulator.
+em_cascading() ->
+    spawn(fun() -> super() end).
+
+super() ->
+    process_flag(trap_exit,true),
+    spawn_link(fun server/0),
+    [spawn_link(fun client/0) || _<-lists:seq(1,10000)],
+    super_loop().
+
+super_loop() ->
+    receive
+        {'EXIT',_,server} ->
+            spawn_link(fun server/0),
+            super_loop();
+        {'EXIT',_,_} ->
+            _L = lists:sum(lists:seq(1,10000)),
+            spawn_link(fun client/0),
+            super_loop()
+    end.
+
+client() ->
+    receive
+    after 1 ->
+            case whereis(server) of
+                Pid when is_pid(Pid) ->
+                    ok;
+                undefined ->
+                    producer(),
+                    erlang:error(some_exception)
+            end
+    end,
+    client().
+
+server() ->
+    register(server,self()),
+    receive
+    after 3000 ->
+            exit(server)
+    end.
+        
+
+%%%-----------------------------------------------------------------
+%%% Create a supervisor tree with processes that crash repeatedly,
+%%% causing a lot of supervisor reports and crashreports
+otp_cascading() ->
+    {ok,Pid} = supervisor:start_link({local,otp_super}, ?MODULE, [otp_super]),
+    unlink(Pid),
+    Pid.
+
+otp_server_sup() ->
+    supervisor:start_link({local,otp_server_sup},?MODULE,[otp_server_sup]).
+
+otp_client_sup(N) ->
+    supervisor:start_link({local,otp_client_sup},?MODULE,[otp_client_sup,N]).
+
+otp_server() ->
+    gen_server:start_link({local,otp_server},?MODULE,[otp_server],[]).
+
+otp_client() ->
+    gen_server:start_link(?MODULE,[otp_client],[]).
+
+init([otp_super]) ->
+    {ok, {{one_for_one, 200, 10},
+            [{client_sup,
+                    {?MODULE, otp_client_sup, [10000]},
+                    permanent, 1000, supervisor, [?MODULE]},
+             {server_sup,
+                    {?MODULE, otp_server_sup, []},
+                    permanent, 1000, supervisor, [?MODULE]}
+            ]}};
+init([otp_server_sup]) ->
+    {ok, {{one_for_one, 2, 10},
+            [{server,
+                    {?MODULE, otp_server, []},
+                    permanent, 1000, worker, [?MODULE]}
+            ]}};
+init([otp_client_sup,N]) ->
+    spawn(fun() ->
+                  [supervisor:start_child(otp_client_sup,[])
+                   || _ <- lists:seq(1,N)]
+          end),
+    {ok, {{simple_one_for_one, N*10, 1},
+            [{client,
+                    {?MODULE, otp_client, []},
+                    permanent, 1000, worker, [?MODULE]}
+            ]}};
+init([otp_server]) ->
+    {ok, server, 10000};
+init([otp_client]) ->
+    {ok, client,1}.
+
+handle_info(timeout, client) ->
+    true = is_pid(whereis(otp_server)),
+    {noreply,client,1};
+handle_info(timeout, server) ->
+    exit(self(), some_error).
+
+%%%-----------------------------------------------------------------
+%%% Logger callbacks
+log(_LogEvent,_Config) ->
+    ok.
+
+%%%-----------------------------------------------------------------
+%%% Function to trace on for counting produced emulator messages
+producer() ->
+    ok.
diff --git a/lib/kernel/test/logger_test_lib.erl b/lib/kernel/test/logger_test_lib.erl
index 81eb9ce5eb..be4bc427fb 100644
--- a/lib/kernel/test/logger_test_lib.erl
+++ b/lib/kernel/test/logger_test_lib.erl
@@ -28,11 +28,17 @@
          post_end_per_testcase/5, post_end_per_suite/3]).
 
 setup(Config,Vars) ->
+    Postfix = case proplists:get_value(postfix, Config) of
+                  undefined -> "";
+                  P -> ["_",P]
+              end,
     FuncStr = lists:concat([proplists:get_value(suite, Config), "_",
-                            proplists:get_value(tc, Config)]),
+                            proplists:get_value(tc, Config)|
+                            Postfix]),
     ConfigFileName = filename:join(proplists:get_value(priv_dir, Config), FuncStr),
     file:write_file(ConfigFileName ++ ".config", io_lib:format("[{kernel, ~p}].",[Vars])),
-    case test_server:start_node(proplists:get_value(tc, Config), slave,
+    Sname = lists:concat([proplists:get_value(tc,Config)|Postfix]),
+    case test_server:start_node(Sname, slave,
                                 [{args, ["-pa ",filename:dirname(code:which(?MODULE)),
                                          " -boot start_sasl -kernel start_timer true "
                                          "-config ",ConfigFileName]}]) of
diff --git a/lib/kernel/test/seq_trace_SUITE.erl b/lib/kernel/test/seq_trace_SUITE.erl
index ee8f4e94f8..83a94ab087 100644
--- a/lib/kernel/test/seq_trace_SUITE.erl
+++ b/lib/kernel/test/seq_trace_SUITE.erl
@@ -19,10 +19,14 @@
 %%
 -module(seq_trace_SUITE).
 
+%% label_capability_mismatch needs to run a part of the test on an OTP 20 node.
+-compile(r20).
+
 -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]).
 -export([token_set_get/1, tracer_set_get/1, print/1,
+         old_heap_token/1,
 	 send/1, distributed_send/1, recv/1, distributed_recv/1,
 	 trace_exit/1, distributed_exit/1, call/1, port/1,
 	 match_set_seq_token/1, gc_seq_token/1, label_capability_mismatch/1,
@@ -47,6 +51,7 @@ suite() ->
 all() -> 
     [token_set_get, tracer_set_get, print, send, send_literal,
      distributed_send, recv, distributed_recv, trace_exit,
+     old_heap_token,
      distributed_exit, call, port, match_set_seq_token,
      gc_seq_token, label_capability_mismatch].
 
@@ -146,17 +151,19 @@ tracer_set_get(Config) when is_list(Config) ->
     ok.
 
 print(Config) when is_list(Config) ->
-    lists:foreach(fun do_print/1, ?TIMESTAMP_MODES).
+    [do_print(TsType, Label) || TsType <- ?TIMESTAMP_MODES,
+                                Label <- [17, "label"]].
     
-do_print(TsType) ->
+do_print(TsType, Label) ->
     start_tracer(),
+    seq_trace:set_token(label, Label),
     set_token_flags([print, TsType]),
-    seq_trace:print(0,print1),
+    seq_trace:print(Label,print1),
     seq_trace:print(1,print2),
     seq_trace:print(print3),
     seq_trace:reset_trace(),
-    [{0,{print,_,_,[],print1}, Ts0},
-	   {0,{print,_,_,[],print3}, Ts1}] = stop_tracer(2),
+    [{Label,{print,_,_,[],print1}, Ts0},
+     {Label,{print,_,_,[],print3}, Ts1}] = stop_tracer(2),
     check_ts(TsType, Ts0),
     check_ts(TsType, Ts1).
 
@@ -358,7 +365,7 @@ do_incompatible_labels(Rel) ->
     Mdir = filename:dirname(Dir),
     true = rpc:call(Node,code,add_patha,[Mdir]),
     seq_trace:reset_trace(),
-    rpc:call(Node,?MODULE,start_tracer,[]),
+    true = is_pid(rpc:call(Node,?MODULE,start_tracer,[])),
     Receiver = spawn(Node,?MODULE,one_time_receiver,[]),
 
     %% This node does not support arbitrary labels, so it must fail with a
@@ -385,7 +392,7 @@ do_compatible_labels(Rel) ->
     Mdir = filename:dirname(Dir),
     true = rpc:call(Node,code,add_patha,[Mdir]),
     seq_trace:reset_trace(),
-    rpc:call(Node,?MODULE,start_tracer,[]),
+    true = is_pid(rpc:call(Node,?MODULE,start_tracer,[])),
     Receiver = spawn(Node,?MODULE,one_time_receiver,[]),
 
     %% This node does not support arbitrary labels, but small integers should
@@ -560,6 +567,24 @@ get_port_message(Port) ->
     end.
 
 
+%% OTP-15849 ERL-700
+%% Verify changing label on existing token when it resides on old heap.
+%% Bug caused faulty ref from old to new heap.
+old_heap_token(Config) when is_list(Config) ->
+    seq_trace:set_token(label, 1),
+    erlang:garbage_collect(self(), [{type, minor}]),
+    erlang:garbage_collect(self(), [{type, minor}]),
+    %% Now token tuple should be on old-heap.
+    %% Set a new non-literal label which should reside on new-heap.
+    NewLabel = {self(), "new label"},
+    1 = seq_trace:set_token(label, NewLabel),
+
+    %% If bug, we now have a ref from old to new heap. Yet another minor gc
+    %% will make that a ref to deallocated memory.
+    erlang:garbage_collect(self(), [{type, minor}]),
+    {label,NewLabel} = seq_trace:get_token(label),
+    ok.
+
 
 match_set_seq_token(doc) ->
     ["Tests that match spec function set_seq_token does not "
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index 4b43c6ae9d..e5188aa9b5 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 6.2
+KERNEL_VSN = 6.4.1
diff --git a/lib/megaco/Makefile b/lib/megaco/Makefile
index 1d0bb6778c..f385df6a5c 100644
--- a/lib/megaco/Makefile
+++ b/lib/megaco/Makefile
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1999-2016. All Rights Reserved.
+# Copyright Ericsson AB 1999-2019. 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.
@@ -206,11 +206,18 @@ $(APP_TAR_FILE): $(APP_DIR)
 
 dialyzer_plt: $(DIA_PLT)
 
-$(DIA_PLT): 
+$(DIA_PLT): Makefile
 	@echo "Building $(APPLICATION) plt file"
 	@dialyzer --build_plt \
                   --output_plt $@ \
                   -r ../$(APPLICATION)/ebin \
+                     ../../lib/kernel/ebin \
+                     ../../lib/stdlib/ebin \
+                     ../../lib/runtime_tools/ebin \
+                     ../../lib/asn1/ebin \
+                     ../../lib/debugger/ebin \
+                     ../../lib/et/ebin \
+                     ../../erts/preloaded/ebin \
                   --output $(DIA_ANALYSIS) \
                   --verbose
 
diff --git a/lib/megaco/configure.in b/lib/megaco/configure.in
index eaa875d0a3..bae6144abe 100644
--- a/lib/megaco/configure.in
+++ b/lib/megaco/configure.in
@@ -22,10 +22,6 @@ dnl
 dnl define([AC_CACHE_LOAD], )dnl
 dnl define([AC_CACHE_SAVE], )dnl
 
-if test "x$no_recursion" != "xyes" -a "x$OVERRIDE_CONFIG_CACHE" = "x"; then
-    # We do not want to use a common cache!
-    cache_file=/dev/null
-fi
 
 AC_INIT(vsn.mk)
 
@@ -42,11 +38,14 @@ else
     host_os=win32
 fi
 
-
 dnl ----------------------------------------------------------------------
 dnl Checks for programs.
 dnl ----------------------------------------------------------------------
 
+AC_PROG_CC
+
+LM_WINDOWS_ENVIRONMENT
+
 AC_DEFUN(ERL_REENTRANT_FLEX,
 [flex_compile='$LEX -R -Pconftest -oconftest.c conftest.flex 1>&AC_FD_CC'
 changequote(253, 273)dnl
@@ -188,111 +187,7 @@ CFLAGS="$CFLAGS $sanitizers"
 LDFLAGS="$LDFLAGS $sanitizers"
 ])
 
-dnl
-dnl If ${ERL_TOP}/make/otp_ded.mk.in exists and contains DED_MK_VSN > 0,
-dnl every thing releted to compiling Dynamic Erlang Drivers can be found
-dnl in $(ERL_TOP)/make/$(TARGET)/ded.mk at compile time. If not, try to
-dnl figure these things out.
-dnl
-
-AC_MSG_CHECKING([for usable Dynamic Erlang Driver configuration])
-[
-  ded_mk_in="${ERL_TOP}/make/otp_ded.mk.in"
-  ded_mk_vsn=
-  test -r "$ded_mk_in" &&
-    ded_mk_vsn=`sed -n "s/^DED_MK_VSN[	 ]*=[	 ]*\(.*\)/\1/p" < "$ded_mk_in"`
-  test "$ded_mk_vsn" != "" || ded_mk_vsn=0
-]
-
-if test $ded_mk_vsn -gt 0; then
-
-HAVE_USABLE_OTP_DED_MK=yes
-AC_MSG_RESULT([yes])
-
-CC=false
-AC_SUBST(CC)
-DED_LD=false
-AC_SUBST(DED_LD)
-
-else dnl --- begin no usable otp_ded.mk.in ---
-
-HAVE_USABLE_OTP_DED_MK=no
-AC_MSG_RESULT([no])
-
-dnl
-dnl C compiler (related) defs
-dnl
-
-AC_PROG_CC
-
-dnl
-dnl Flags to the C compiler
-dnl
-
-if test "X$host" = "Xwin32"; then
-  DED_CFLAGS="$CFLAGS"
-else
-  case $host_os in
-    darwin*)
-	CFLAGS="$CFLAGS -fno-common"
-	;;
-  esac
-
-  if test "x$GCC" = xyes; then
-	DED_CFLAGS="$CFLAGS -fPIC $DED_CFLAGS"
-  else
-	DED_CFLAGS="$CFLAGS $DED_CFLAGS"
-  fi
-fi
-
-dnl emulator includes needed
-DED_INCLUDES="-I${ERL_TOP}/erts/emulator/beam -I${ERL_TOP}/erts/include -I${ERL_TOP}/erts/include/$host -I${ERL_TOP}/erts/include/internal -I${ERL_TOP}/erts/include/internal/$host -I${ERL_TOP}/erts/emulator/sys/$ERLANG_OSTYPE"
-
-DED_THR_DEFS="-D_THREAD_SAFE -D_REENTRANT"
-
-case $host_os in
-	win32)
-		DED_LDFLAGS="-dll"
-	;;
-	solaris2*|sysv4*)
-		DED_LDFLAGS="-G"
-	;;
-	aix4*)
-		DED_LDFLAGS="-G -bnoentry -bexpall"
-	;;
-	freebsd2*)
-		# Non-ELF GNU linker
-		DED_LDFLAGS="-Bshareable"
-	;;
-	darwin*)
-		# Mach-O linker, a shared lib and a loadable
-		# object file is not the same thing.
-		DED_LDFLAGS="-bundle -flat_namespace -undefined suppress"
-		DED_LD="$CC"
-	;;
-	*)
-		# assume GNU linker and ELF
-		DED_LDFLAGS="-shared"
-	;;
-esac
-
-AC_CHECK_PROGS(DED_LD, [$LD ld.sh])
-AC_CHECK_TOOL(DED_LD, ld, no_ld)
-if test "$DED_LD" = no_ld; then
-  AC_MSG_ERROR([ld is required to build the flex scanner!])
-fi
-
-AC_MSG_CHECKING(for linker flags for loadable drivers)
-DED_LDFLAGS="$LDFLAGS $DED_LDFLAGS"
-AC_MSG_RESULT([$DED_LDFLAGS])
-
-fi dnl --- end no usable otp_ded.mk.in ---
-
-AC_SUBST(HAVE_USABLE_OTP_DED_MK)
-AC_SUBST(DED_CFLAGS)
-AC_SUBST(DED_INCLUDES)
-AC_SUBST(DED_THR_DEFS)
-AC_SUBST(DED_LDFLAGS)
+ERL_DED
 
 AC_CHECK_PROG(PERL, perl, perl, no_perl)
 if test "$PERL" = no_perl; then
diff --git a/lib/megaco/doc/src/megaco.xml b/lib/megaco/doc/src/megaco.xml
index d4a7451bfc..c7bcdfcd6f 100644
--- a/lib/megaco/doc/src/megaco.xml
+++ b/lib/megaco/doc/src/megaco.xml
@@ -32,7 +32,7 @@
     <rev>%VSN%</rev>
     <file>megaco.xml</file>
   </header>
-  <module>megaco</module>
+  <module since="">megaco</module>
   <modulesummary>Main API of the Megaco application</modulesummary>
   <description>
     <p>Interface module for the Megaco application</p>
@@ -135,7 +135,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
 
   <funcs>
     <func>
-      <name>start() -> ok | {error, Reason}</name>
+      <name since="">start() -> ok | {error, Reason}</name>
       <fsummary>Starts the Megaco application</fsummary>
       <type>
         <v>Reason = term()</v>
@@ -153,7 +153,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>stop() -> ok | {error, Reason}</name>
+      <name since="">stop() -> ok | {error, Reason}</name>
       <fsummary>Stops the Megaco application</fsummary>
       <type>
         <v>Reason = term()</v>
@@ -166,7 +166,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>start_user(UserMid, Config) -> ok | {error, Reason}</name>
+      <name since="">start_user(UserMid, Config) -> ok | {error, Reason}</name>
       <fsummary>Initial configuration of a user</fsummary>
       <type>
         <v>UserMid = megaco_mid()</v>
@@ -188,7 +188,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>stop_user(UserMid) -> ok | {error, Reason}</name>
+      <name since="">stop_user(UserMid) -> ok | {error, Reason}</name>
       <fsummary>Delete the configuration of a user</fsummary>
       <type>
         <v>UserMid = megaco_mid()</v>
@@ -203,8 +203,8 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>user_info(UserMid) -> [{Item, Value}]</name>
-      <name>user_info(UserMid, Item) -> Value | exit(Reason)</name>
+      <name since="">user_info(UserMid) -> [{Item, Value}]</name>
+      <name since="">user_info(UserMid, Item) -> Value | exit(Reason)</name>
       <fsummary>Lookup user information</fsummary>
       <type>
         <v>Handle  = user_info_handle()</v>
@@ -703,7 +703,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>update_user_info(UserMid, Item, Value) -> ok | {error, Reason}</name>
+      <name since="">update_user_info(UserMid, Item, Value) -> ok | {error, Reason}</name>
       <fsummary>Update information about a user</fsummary>
       <type>
         <v>UserMid = megaco_mid() </v>
@@ -721,8 +721,8 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>conn_info(ConnHandle) -> [{Item, Value}]</name>
-      <name>conn_info(ConnHandle, Item) -> Value | exit(Reason)</name>
+      <name since="">conn_info(ConnHandle) -> [{Item, Value}]</name>
+      <name since="">conn_info(ConnHandle, Item) -> Value | exit(Reason)</name>
       <fsummary>Lookup information about an active connection</fsummary>
       <type>
         <v>ConnHandle = #megaco_conn_handle{}</v>
@@ -1222,7 +1222,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>update_conn_info(ConnHandle, Item, Value) -> ok | {error, Reason}</name>
+      <name since="">update_conn_info(ConnHandle, Item, Value) -> ok | {error, Reason}</name>
       <fsummary>Update information about an active connection</fsummary>
       <type>
         <v>ConnHandle = #megaco_conn_handle{}</v>
@@ -1241,8 +1241,8 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>system_info() -> [{Item, Value}] | exit(Reason)</name>
-      <name>system_info(Item) -> Value | exit(Reason)</name>
+      <name since="">system_info() -> [{Item, Value}] | exit(Reason)</name>
+      <name since="">system_info(Item) -> Value | exit(Reason)</name>
       <fsummary>Lookup system information</fsummary>
       <type>
         <v>Item = system_info_item()</v>
@@ -1289,7 +1289,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>info() -> Info</name>
+      <name since="">info() -> Info</name>
       <fsummary>All the information of the application</fsummary>
       <type>
         <v>Info = [{Key, Value}]</v>
@@ -1311,8 +1311,8 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>connect(ReceiveHandle, RemoteMid, SendHandle, ControlPid) -> {ok, ConnHandle} | {error, Reason}</name>
-      <name>connect(ReceiveHandle, RemoteMid, SendHandle, ControlPid, Extra) -> {ok, ConnHandle} | {error, Reason}</name>
+      <name since="">connect(ReceiveHandle, RemoteMid, SendHandle, ControlPid) -> {ok, ConnHandle} | {error, Reason}</name>
+      <name since="">connect(ReceiveHandle, RemoteMid, SendHandle, ControlPid, Extra) -> {ok, ConnHandle} | {error, Reason}</name>
       <fsummary>Establish a "virtual" connection</fsummary>
       <type>
         <v>ReceiveHandle = #megaco_receive_handle{}</v>
@@ -1436,7 +1436,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>disconnect(ConnHandle, DiscoReason) -> ok | {error, ErrReason}</name>
+      <name since="">disconnect(ConnHandle, DiscoReason) -> ok | {error, ErrReason}</name>
       <fsummary>Tear down a "virtual" connection</fsummary>
       <type>
         <v>ConnHandle  = conn_handle()</v>
@@ -1454,7 +1454,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>call(ConnHandle, Actions, Options) -> {ProtocolVersion, UserReply}</name>
+      <name since="">call(ConnHandle, Actions, Options) -> {ProtocolVersion, UserReply}</name>
       <fsummary>Sends one or more transaction request(s) and waits for the reply</fsummary>
       <type>
         <v>ConnHandle     = conn_handle()</v>
@@ -1545,7 +1545,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>cast(ConnHandle, Actions, Options) -> ok | {error, Reason}</name>
+      <name since="">cast(ConnHandle, Actions, Options) -> ok | {error, Reason}</name>
       <fsummary>Sends one or more transaction request(s) but does NOT wait for a reply</fsummary>
       <type>
         <v>ConnHandle     = conn_handle()</v>
@@ -1582,7 +1582,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>encode_actions(ConnHandle, Actions, Options) -> {ok, BinOrBins} | {error, Reason}</name>
+      <name since="">encode_actions(ConnHandle, Actions, Options) -> {ok, BinOrBins} | {error, Reason}</name>
       <fsummary>Encode action requests for one or more transaction request(s)</fsummary>
       <type>
         <v>ConnHandle     = conn_handle()</v>
@@ -1607,9 +1607,9 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>token_tag2string(Tag) -> Result</name>
-      <name>token_tag2string(Tag, EncoderMod) -> Result</name>
-      <name>token_tag2string(Tag, EncoderMod, Version) -> Result</name>
+      <name since="">token_tag2string(Tag) -> Result</name>
+      <name since="">token_tag2string(Tag, EncoderMod) -> Result</name>
+      <name since="">token_tag2string(Tag, EncoderMod, Version) -> Result</name>
       <fsummary>Convert a token tag to a string</fsummary>
       <type>
         <v>Tag = atom()</v>
@@ -1635,7 +1635,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>cancel(ConnHandle, CancelReason) -> ok | {error, ErrReason}</name>
+      <name since="">cancel(ConnHandle, CancelReason) -> ok | {error, ErrReason}</name>
       <fsummary>Cancel all outstanding messages for this connection</fsummary>
       <type>
         <v>ConnHandle   = conn_handle()</v>
@@ -1655,8 +1655,8 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>process_received_message(ReceiveHandle, ControlPid, SendHandle, BinMsg) -> ok</name>
-      <name>process_received_message(ReceiveHandle, ControlPid, SendHandle, BinMsg, Extra) -> ok</name>
+      <name since="">process_received_message(ReceiveHandle, ControlPid, SendHandle, BinMsg) -> ok</name>
+      <name since="">process_received_message(ReceiveHandle, ControlPid, SendHandle, BinMsg, Extra) -> ok</name>
       <fsummary>Process a received message</fsummary>
       <type>
         <v>ReceiveHandle = #megaco_receive_handle{}</v>
@@ -1755,8 +1755,8 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>receive_message(ReceiveHandle, ControlPid, SendHandle, BinMsg) -> ok</name>
-      <name>receive_message(ReceiveHandle, ControlPid, SendHandle, BinMsg, Extra) -> ok</name>
+      <name since="">receive_message(ReceiveHandle, ControlPid, SendHandle, BinMsg) -> ok</name>
+      <name since="">receive_message(ReceiveHandle, ControlPid, SendHandle, BinMsg, Extra) -> ok</name>
       <fsummary>Process a received message</fsummary>
       <type>
         <v>ReceiveHandle = #megaco_receive_handle{}</v>
@@ -1783,7 +1783,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>parse_digit_map(DigitMapBody) -> {ok, ParsedDigitMap} | {error, Reason}</name>
+      <name since="">parse_digit_map(DigitMapBody) -> {ok, ParsedDigitMap} | {error, Reason}</name>
       <fsummary>Parses a digit map body</fsummary>
       <type>
         <v>DigitMapBody       = string()</v>
@@ -1802,8 +1802,8 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>eval_digit_map(DigitMap) -> {ok, MatchResult} | {error, Reason}</name>
-      <name>eval_digit_map(DigitMap, Timers) -> {ok, MatchResult} | {error, Reason}</name>
+      <name since="">eval_digit_map(DigitMap) -> {ok, MatchResult} | {error, Reason}</name>
+      <name since="">eval_digit_map(DigitMap, Timers) -> {ok, MatchResult} | {error, Reason}</name>
       <fsummary>Collect digit map letters according to the digit map</fsummary>
       <type>
         <v>DigitMap           = #'DigitMapValue'{} | parsed_digit_map()</v>
@@ -1839,7 +1839,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>report_digit_event(DigitMapEvalPid, Events) -> ok | {error, Reason}</name>
+      <name since="">report_digit_event(DigitMapEvalPid, Events) -> ok | {error, Reason}</name>
       <fsummary>Send one or more events to the event collector process</fsummary>
       <type>
         <v>DigitMapEvalPid = pid()</v>
@@ -1866,7 +1866,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>test_digit_event(DigitMap, Events) -> {ok, Kind, Letters} | {error, Reason}</name>
+      <name since="">test_digit_event(DigitMap, Events) -> {ok, Kind, Letters} | {error, Reason}</name>
       <fsummary>Feed digit map collector with events and return the result</fsummary>
       <type>
         <v>DigitMap           = #'DigitMapValue'{} | parsed_digit_map()</v>
@@ -1900,7 +1900,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>encode_sdp(SDP) -> {ok, PP} | {error, Reason}</name>
+      <name since="">encode_sdp(SDP) -> {ok, PP} | {error, Reason}</name>
       <fsummary>Encode an SDP construct</fsummary>
       <type>
         <v>SDP = sdp_property_parm() | sdp_property_group() | sdp_property_groups() | asn1_NOVALUE</v>
@@ -1929,7 +1929,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>decode_sdp(PP) -> {ok, SDP} | {error, Reason}</name>
+      <name since="">decode_sdp(PP) -> {ok, SDP} | {error, Reason}</name>
       <fsummary>Decode an property parameter construct</fsummary>
       <type>
 	<v>PP = property_parm() | property_group() | property_groups() | asn1_NOVALUE</v>
@@ -1969,7 +1969,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>get_sdp_record_from_PropertGroup(Type, PG) -> [sdp()]</name>
+      <name since="">get_sdp_record_from_PropertGroup(Type, PG) -> [sdp()]</name>
       <fsummary>Get all sdp records of a certain type from a property group</fsummary>
       <type>
         <v>Type = v | c | m | o | a | b | t | r | z | k | s | i | u | e | p</v>
@@ -1986,8 +1986,8 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>versions1() -> {ok, VersionInfo} | {error, Reason}</name>
-      <name>versions2() -> {ok, Info} | {error, Reason}</name>
+      <name since="">versions1() -> {ok, VersionInfo} | {error, Reason}</name>
+      <name since="">versions2() -> {ok, Info} | {error, Reason}</name>
       <fsummary>Retreive various system and application info</fsummary>
       <type>
         <v>VersionInfo = [version_info()]</v>
@@ -2007,8 +2007,8 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>print_version_info() -> void()</name>
-      <name>print_version_info(VersionInfo) -> void()</name>
+      <name since="">print_version_info() -> void()</name>
+      <name since="">print_version_info(VersionInfo) -> void()</name>
       <fsummary>Formated print of result of the versions functions</fsummary>
       <type>
         <v>VersionInfo = [version_info()]</v>
@@ -2029,7 +2029,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>enable_trace(Level, Destination) -> void()</name>
+      <name since="">enable_trace(Level, Destination) -> void()</name>
       <fsummary>Start megaco tracing</fsummary>
       <type>
         <v>Level       = max | min | 0 &lt;= integer() &lt;= 100</v>
@@ -2057,7 +2057,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>disable_trace() -> void()</name>
+      <name since="">disable_trace() -> void()</name>
       <fsummary>Stop megaco tracing</fsummary>
       <desc>
         <p>This function is used to stop megaco tracing.</p>
@@ -2065,7 +2065,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
       </desc>
     </func>
     <func>
-      <name>set_trace(Level) -> void()</name>
+      <name since="">set_trace(Level) -> void()</name>
       <fsummary>Change megaco trace level</fsummary>
       <type>
         <v>Level = max | min | 0 &lt;= integer() &lt;= 100</v>
@@ -2081,10 +2081,10 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>get_stats() -> {ok, TotalStats} | {error, Reason}</name>
-      <name>get_stats(GlobalCounter) -> {ok, CounterStats} | {error, Reason}</name>
-      <name>get_stats(ConnHandle) -> {ok, ConnHandleStats} | {error, Reason}</name>
-      <name>get_stats(ConnHandle, Counter) -> {ok, integer()} | {error, Reason}</name>
+      <name since="">get_stats() -> {ok, TotalStats} | {error, Reason}</name>
+      <name since="">get_stats(GlobalCounter) -> {ok, CounterStats} | {error, Reason}</name>
+      <name since="">get_stats(ConnHandle) -> {ok, ConnHandleStats} | {error, Reason}</name>
+      <name since="">get_stats(ConnHandle, Counter) -> {ok, integer()} | {error, Reason}</name>
       <fsummary></fsummary>
       <type>
         <v>TotalStats = [total_stats()]</v>
@@ -2110,8 +2110,8 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>reset_stats() -> void()</name>
-      <name>reset_stats(ConnHandle) -> void()</name>
+      <name since="">reset_stats() -> void()</name>
+      <name since="">reset_stats(ConnHandle) -> void()</name>
       <fsummary></fsummary>
       <type>
         <v>ConnHandle = conn_handle()</v>
@@ -2123,7 +2123,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>test_request(ConnHandle, Version, EncodingMod, EncodingConfig, Actions) -> {MegaMsg, EncodeRes}</name>
+      <name since="">test_request(ConnHandle, Version, EncodingMod, EncodingConfig, Actions) -> {MegaMsg, EncodeRes}</name>
       <fsummary>Tests if the Actions argument is correct</fsummary>
       <type>
         <v>ConnHandle     = conn_handle()</v>
@@ -2150,7 +2150,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
     </func>
 
     <func>
-      <name>test_reply(ConnHandle, Version, EncodingMod, EncodingConfig, Reply) -> {MegaMsg, EncodeRes}</name>
+      <name since="">test_reply(ConnHandle, Version, EncodingMod, EncodingConfig, Reply) -> {MegaMsg, EncodeRes}</name>
       <fsummary>Tests if the Reply argument is correct</fsummary>
       <type>
         <v>ConnHandle     = conn_handle()</v>
diff --git a/lib/megaco/doc/src/megaco_codec_meas.xml b/lib/megaco/doc/src/megaco_codec_meas.xml
index 13cc3eb834..5184fe392e 100644
--- a/lib/megaco/doc/src/megaco_codec_meas.xml
+++ b/lib/megaco/doc/src/megaco_codec_meas.xml
@@ -32,7 +32,7 @@
     <rev>%VSN%</rev>
     <file>megaco_codec_meas.xml</file>
   </header>
-  <module>megaco_codec_meas</module>
+  <module since="">megaco_codec_meas</module>
   <modulesummary>This module implements a simple megaco codec measurement tool.</modulesummary>
   <description>
     <p>This module implements a simple megaco codec measurement tool.</p>
@@ -43,8 +43,8 @@
 
   <funcs>
     <func>
-      <name>start() -> void()</name>
-      <name>start(MessagePackage) -> void()</name>
+      <name since="">start() -> void()</name>
+      <name since="">start(MessagePackage) -> void()</name>
       <fsummary></fsummary>
       <type>
         <v>MessagePackageRaw = message_package()</v>
diff --git a/lib/megaco/doc/src/megaco_codec_mstone1.xml b/lib/megaco/doc/src/megaco_codec_mstone1.xml
index 2ff959a648..507a790c71 100644
--- a/lib/megaco/doc/src/megaco_codec_mstone1.xml
+++ b/lib/megaco/doc/src/megaco_codec_mstone1.xml
@@ -32,7 +32,7 @@
     <rev>%VSN%</rev>
     <file>megaco_codec_mstone1.xml</file>
   </header>
-  <module>megaco_codec_mstone1</module>
+  <module since="">megaco_codec_mstone1</module>
   <modulesummary>This module implements a simple megaco codec-based performance tool.</modulesummary>
   <description>
     <p>This module implements the <em>mstone1</em> tool, 
@@ -44,9 +44,9 @@
 
   <funcs>
     <func>
-      <name>start() -> void()</name>
-      <name>start(MessagePackage) -> void()</name>
-      <name>start(MessagePackage, Factor) -> void()</name>
+      <name since="">start() -> void()</name>
+      <name since="">start(MessagePackage) -> void()</name>
+      <name since="">start(MessagePackage, Factor) -> void()</name>
       <fsummary></fsummary>
       <type>
         <v>MessagePackage = message_package()</v>
@@ -63,9 +63,9 @@
     </func>
 
     <func>
-      <name>start_flex() -> void()</name>
-      <name>start_flex(MessagePackage) -> void()</name>
-      <name>start_flex(MessagePackage, Factor) -> void()</name>
+      <name since="">start_flex() -> void()</name>
+      <name since="">start_flex(MessagePackage) -> void()</name>
+      <name since="">start_flex(MessagePackage, Factor) -> void()</name>
       <fsummary></fsummary>
       <type>
         <v>MessagePackage = message_package()</v>
@@ -83,9 +83,9 @@
     </func>
 
     <func>
-      <name>start_only_drv() -> void()</name>
-      <name>start_only_drv(MessagePackage) -> void()</name>
-      <name>start_only_drv(MessagePackage, Factor) -> void()</name>
+      <name since="">start_only_drv() -> void()</name>
+      <name since="">start_only_drv(MessagePackage) -> void()</name>
+      <name since="">start_only_drv(MessagePackage, Factor) -> void()</name>
       <fsummary></fsummary>
       <type>
         <v>MessagePackage = message_package()</v>
@@ -105,9 +105,9 @@
     </func>
 
     <func>
-      <name>start_no_drv() -> void()</name>
-      <name>start_no_drv(MessagePackage) -> void()</name>
-      <name>start_no_drv(MessagePackage, Factor) -> void()</name>
+      <name since="">start_no_drv() -> void()</name>
+      <name since="">start_no_drv(MessagePackage) -> void()</name>
+      <name since="">start_no_drv(MessagePackage, Factor) -> void()</name>
       <fsummary></fsummary>
       <type>
         <v>MessagePackage = message_package()</v>
diff --git a/lib/megaco/doc/src/megaco_codec_mstone2.xml b/lib/megaco/doc/src/megaco_codec_mstone2.xml
index 3da30d4f99..03990f5c3d 100644
--- a/lib/megaco/doc/src/megaco_codec_mstone2.xml
+++ b/lib/megaco/doc/src/megaco_codec_mstone2.xml
@@ -32,7 +32,7 @@
     <rev>%VSN%</rev>
     <file>megaco_codec_mstone2.xml</file>
   </header>
-  <module>megaco_codec_mstone2</module>
+  <module since="">megaco_codec_mstone2</module>
   <modulesummary>This module implements a simple megaco codec-based performance tool.</modulesummary>
   <description>
     <p>This module implements the <em>mstone2</em> tool, 
@@ -44,8 +44,8 @@
 
   <funcs>
     <func>
-      <name>start() -> void()</name>
-      <name>start(MessagePackage) -> void()</name>
+      <name since="">start() -> void()</name>
+      <name since="">start(MessagePackage) -> void()</name>
       <fsummary></fsummary>
       <type>
         <v>MessagePackage = message_package()</v>
diff --git a/lib/megaco/doc/src/megaco_codec_transform.xml b/lib/megaco/doc/src/megaco_codec_transform.xml
index 26b83c3799..392868fdfa 100644
--- a/lib/megaco/doc/src/megaco_codec_transform.xml
+++ b/lib/megaco/doc/src/megaco_codec_transform.xml
@@ -32,7 +32,7 @@
     <rev>%VSN%</rev>
     <file>megaco_codec_transform.xml</file>
   </header>
-  <module>megaco_codec_transform</module>
+  <module since="">megaco_codec_transform</module>
   <modulesummary>Megaco message transformation utility.</modulesummary>
 
   <description>
@@ -45,8 +45,8 @@
 
   <funcs>
     <func>
-      <name>export_messages() -> void()</name>
-      <name>export_messages(MessagePackage) -> void()</name>
+      <name since="">export_messages() -> void()</name>
+      <name since="">export_messages(MessagePackage) -> void()</name>
       <fsummary></fsummary>
       <type>
         <v>MessagePackage = atom()</v>
diff --git a/lib/megaco/doc/src/megaco_edist_compress.xml b/lib/megaco/doc/src/megaco_edist_compress.xml
index d5c7c7224d..8461c59a00 100644
--- a/lib/megaco/doc/src/megaco_edist_compress.xml
+++ b/lib/megaco/doc/src/megaco_edist_compress.xml
@@ -32,7 +32,7 @@
     <rev>%VSN%</rev>
     <file>megaco_edist_compress.xml</file>
   </header>
-  <module>megaco_edist_compress</module>
+  <module since="">megaco_edist_compress</module>
   <modulesummary>Megaco erlang dist compress behaviour.</modulesummary>
   <description>
     <p>The following functions should be exported from a 
@@ -40,11 +40,11 @@
   </description>
   <funcs>
     <func>
-      <name>Module:encode(R, Version) -> T</name>
+      <name since="">Module:encode(R, Version) -> T</name>
       <fsummary>Encode (compress) a megaco component.</fsummary>
       <type>
-        <v>R = megaco_message() | transaction() | action_reply() | action_request() | command_request()</v>
-        <v>Version = integer()</v>
+	<v>R = megaco_encoder:megaco_message() | megaco_encoder:transaction() | megaco_encoder:action_reply() | megaco_encoder:action_request() | megaco_encoder:command_request()</v>
+        <v>Version = megaco_encoder:protocol_version()</v>
         <v>T = term()</v>
       </type>
       <desc>
@@ -53,12 +53,12 @@
       </desc>
     </func>
     <func>
-      <name>Module:decode(T, Version) -> R</name>
+      <name since="">Module:decode(T, Version) -> R</name>
       <fsummary>Decode (decompress) a megaco component.</fsummary>
       <type>
         <v>T = term()</v>
-        <v>Version = integer()</v>
-        <v>R = megaco_message() | transaction() | action_reply() | action_request() | command_request()</v>
+        <v>Version = megaco_encoder:protocol_version()</v>
+        <v>R = megaco_encoder:megaco_message() | megaco_encoder:transaction() | megaco_encoder:action_reply() | megaco_encoder:action_request() | megaco_encoder:command_request()</v>
       </type>
       <desc>
         <p>Decompress a megaco component. </p>
diff --git a/lib/megaco/doc/src/megaco_encoder.xml b/lib/megaco/doc/src/megaco_encoder.xml
index 13c6ed324b..0632a55d48 100644
--- a/lib/megaco/doc/src/megaco_encoder.xml
+++ b/lib/megaco/doc/src/megaco_encoder.xml
@@ -32,7 +32,7 @@
     <rev>%VSN%</rev>
     <file>megaco_encoder.xml</file>
   </header>
-  <module>megaco_encoder</module>
+  <module since="">megaco_encoder</module>
   <modulesummary>Megaco encoder behaviour.</modulesummary>
   <description>
     <p>The following functions should be exported from a 
@@ -42,7 +42,16 @@
 
   <section>
     <title>DATA TYPES</title>
+    <note>
+      <p>Note that the actual definition of (some of) these records depend on
+      the megaco protocol version used. For instance, the
+      <c>'TransactionReply'</c> record
+      has two more fields in version 3, so a simple erlang type definition
+      cannot be made here. </p>
+    </note>
     <code type="none"><![CDATA[
+protocol_version() = integer()
+segment_no()       = integer()
 megaco_message() = #'MegacoMessage{}'
 transaction() = {transactionRequest,     transaction_request()}      |
                 {transactionPending,     transaction_reply()}        |
@@ -57,6 +66,8 @@ transaction_ack() = #'TransactionAck'{}
 segment_reply() = #'SegmentReply'{}
 action_request() = #'ActionRequest'{}
 action_reply() = #'ActionReply'{}
+command_request() = #'CommandRequest'{}
+error_desc()   = #'ErrorDescriptor'{}
     ]]></code>
 
     <marker id="encode_message"></marker>
@@ -64,7 +75,7 @@ action_reply() = #'ActionReply'{}
 
   <funcs>
     <func>
-      <name>Module:encode_message(EncodingConfig, Version, Message) -> {ok, Bin} | Error</name>
+      <name since="">Module:encode_message(EncodingConfig, Version, Message) -> {ok, Bin} | Error</name>
       <fsummary>Encode a megaco message.</fsummary>
       <type>
         <v>EncodingConfig = list()</v>
@@ -81,7 +92,7 @@ action_reply() = #'ActionReply'{}
     </func>
 
     <func>
-      <name>Module:decode_message(EncodingConfig, Version, Bin) -> {ok, Message} | Error</name>
+      <name since="">Module:decode_message(EncodingConfig, Version, Bin) -> {ok, Message} | Error</name>
       <fsummary>Decode a megaco message.</fsummary>
       <type>
         <v>EncodingConfig = list()</v>
@@ -104,7 +115,7 @@ action_reply() = #'ActionReply'{}
     </func>
 
     <func>
-      <name>Module:decode_mini_message(EncodingConfig, Version, Bin) -> {ok, Message} | Error</name>
+      <name since="">Module:decode_mini_message(EncodingConfig, Version, Bin) -> {ok, Message} | Error</name>
       <fsummary>Perform a minimal decode of a megaco message.</fsummary>
       <type>
         <v>EncodingConfig = list()</v>
@@ -129,7 +140,7 @@ action_reply() = #'ActionReply'{}
     </func>
 
     <func>
-      <name>Module:encode_transaction(EncodingConfig, Version, Transaction) -> OK | Error</name>
+      <name since="">Module:encode_transaction(EncodingConfig, Version, Transaction) -> OK | Error</name>
       <fsummary>Encode a megaco transaction.</fsummary>
       <type>
         <v>EncodingConfig = list()</v>
@@ -155,7 +166,7 @@ action_reply() = #'ActionReply'{}
     </func>
 
     <func>
-      <name>Module:encode_action_requests(EncodingConfig, Version, ARs) -> OK | Error</name>
+      <name since="">Module:encode_action_requests(EncodingConfig, Version, ARs) -> OK | Error</name>
       <fsummary>Encode megaco action requests.</fsummary>
       <type>
         <v>EncodingConfig = list()</v>
@@ -181,7 +192,7 @@ action_reply() = #'ActionReply'{}
     </func>
 
     <func>
-      <name>Module:encode_action_reply(EncodingConfig, Version, AR) -> OK | Error</name>
+      <name since="">Module:encode_action_reply(EncodingConfig, Version, AR) -> OK | Error</name>
       <fsummary>Encode a megaco action reply.</fsummary>
       <type>
         <v>EncodingConfig = list()</v>
diff --git a/lib/megaco/doc/src/megaco_flex_scanner.xml b/lib/megaco/doc/src/megaco_flex_scanner.xml
index 0856f3f429..121a7fbcff 100644
--- a/lib/megaco/doc/src/megaco_flex_scanner.xml
+++ b/lib/megaco/doc/src/megaco_flex_scanner.xml
@@ -32,7 +32,7 @@
     <rev>%VSN%</rev>
     <file>megaco_flex_scanner.xml</file>
   </header>
-  <module>megaco_flex_scanner</module>
+  <module since="">megaco_flex_scanner</module>
   <modulesummary>Interface module to the flex scanner linked in driver.</modulesummary>
   <description>
     <p>This module contains the public interface to the flex scanner 
@@ -72,7 +72,7 @@ megaco_version() = integer() >= 1
 
   <funcs>
     <func>
-      <name>start() -> {ok, PortOrPorts} | {error, Reason}</name>
+      <name since="">start() -> {ok, PortOrPorts} | {error, Reason}</name>
       <fsummary></fsummary>
       <type>
         <v>PortOrPorts = megaco_ports()</v>
@@ -94,7 +94,7 @@ megaco_version() = integer() >= 1
     </func>
 
     <func>
-      <name>stop(PortOrPorts) -> stopped</name>
+      <name since="">stop(PortOrPorts) -> stopped</name>
       <fsummary></fsummary>
       <type>
         <v>PortOrPorts = megaco_ports()</v>
@@ -108,7 +108,7 @@ megaco_version() = integer() >= 1
     </func>
 
     <func>
-      <name>is_reentrant_enabled() -> Boolean</name>
+      <name since="">is_reentrant_enabled() -> Boolean</name>
       <fsummary></fsummary>
       <type>
         <v>Boolean = boolean()</v>
@@ -121,7 +121,7 @@ megaco_version() = integer() >= 1
     </func>
 
     <func>
-      <name>is_scanner_port(Port, PortOrPorts) -> Boolean</name>
+      <name since="">is_scanner_port(Port, PortOrPorts) -> Boolean</name>
       <fsummary></fsummary>
       <type>
         <v>Port = port()</v>
@@ -137,7 +137,7 @@ megaco_version() = integer() >= 1
     </func>
 
     <func>
-      <name>scan(Binary, PortOrPorts) -> {ok, Tokens, Version, LatestLine} | {error, Reason, LatestLine} </name>
+      <name since="">scan(Binary, PortOrPorts) -> {ok, Tokens, Version, LatestLine} | {error, Reason, LatestLine} </name>
       <fsummary></fsummary>
       <type>
         <v>Binary = binary()</v>
diff --git a/lib/megaco/doc/src/megaco_tcp.xml b/lib/megaco/doc/src/megaco_tcp.xml
index 77aee32f6c..63713b2c56 100644
--- a/lib/megaco/doc/src/megaco_tcp.xml
+++ b/lib/megaco/doc/src/megaco_tcp.xml
@@ -32,7 +32,7 @@
     <rev>%VSN%</rev>
     <file>megaco_tcp.xml</file>
   </header>
-  <module>megaco_tcp</module>
+  <module since="">megaco_tcp</module>
   <modulesummary>Interface module to TPKT transport protocol for Megaco/H.248.</modulesummary>
   <description>
     <p>This module contains the public interface to the TPKT (TCP/IP) version
@@ -40,7 +40,7 @@
   </description>
   <funcs>
     <func>
-      <name>start_transport() -> {ok, TransportRef}</name>
+      <name since="">start_transport() -> {ok, TransportRef}</name>
       <fsummary></fsummary>
       <type>
         <v>TransportRef = pid()</v>
@@ -51,7 +51,7 @@
       </desc>
     </func>
     <func>
-      <name>listen(TransportRef, ListenPortSpecList) -> ok</name>
+      <name since="">listen(TransportRef, ListenPortSpecList) -> ok</name>
       <fsummary></fsummary>
       <type>
         <v>TransportRef = pid() | regname()</v>
@@ -65,7 +65,7 @@
       </desc>
     </func>
     <func>
-      <name>connect(TransportRef, OptionList) -> {ok, Handle, ControlPid} |  {error, Reason}</name>
+      <name since="">connect(TransportRef, OptionList) -> {ok, Handle, ControlPid} |  {error, Reason}</name>
       <fsummary></fsummary>
       <type>
         <v>TransportRef = pid() | regname()</v>
@@ -86,7 +86,7 @@
       </desc>
     </func>
     <func>
-      <name>close(Handle) -> ok</name>
+      <name since="">close(Handle) -> ok</name>
       <fsummary></fsummary>
       <type>
         <v>Handle = socket_handle()</v>
@@ -96,7 +96,7 @@
       </desc>
     </func>
     <func>
-      <name>socket(Handle) -> Socket</name>
+      <name since="">socket(Handle) -> Socket</name>
       <fsummary></fsummary>
       <type>
         <v>Handle = socket_handle()</v>
@@ -109,7 +109,7 @@
       </desc>
     </func>
     <func>
-      <name>send_message(Handle, Message) -> ok</name>
+      <name since="">send_message(Handle, Message) -> ok</name>
       <fsummary></fsummary>
       <type>
         <v>Handle = socket_handle()</v>
@@ -120,7 +120,7 @@
       </desc>
     </func>
     <func>
-      <name>block(Handle) -> ok</name>
+      <name since="">block(Handle) -> ok</name>
       <fsummary></fsummary>
       <type>
         <v>Handle = socket_handle()</v>
@@ -130,7 +130,7 @@
       </desc>
     </func>
     <func>
-      <name>unblock(Handle) -> ok</name>
+      <name since="">unblock(Handle) -> ok</name>
       <fsummary></fsummary>
       <type>
         <v>Handle = socket_handle()</v>
@@ -141,7 +141,7 @@
       </desc>
     </func>
     <func>
-      <name>upgrade_receive_handle(ControlPid) -> ok</name>
+      <name since="">upgrade_receive_handle(ControlPid) -> ok</name>
       <fsummary></fsummary>
       <type>
         <v>ControlPid = pid()</v>
@@ -153,9 +153,9 @@
       </desc>
     </func>
     <func>
-      <name>get_stats() -> {ok, TotalStats} | {error, Reason}</name>
-      <name>get_stats(SendHandle) -> {ok, SendHandleStats} | {error, Reason}</name>
-      <name>get_stats(SendHandle, Counter) -> {ok, CounterStats} | {error, Reason}</name>
+      <name since="">get_stats() -> {ok, TotalStats} | {error, Reason}</name>
+      <name since="">get_stats(SendHandle) -> {ok, SendHandleStats} | {error, Reason}</name>
+      <name since="">get_stats(SendHandle, Counter) -> {ok, CounterStats} | {error, Reason}</name>
       <fsummary></fsummary>
       <type>
         <v>TotalStats = [send_handle_stats()]</v>
@@ -173,8 +173,8 @@
       </desc>
     </func>
     <func>
-      <name>reset_stats() -> void()</name>
-      <name>reset_stats(SendHandle) -> void()</name>
+      <name since="">reset_stats() -> void()</name>
+      <name since="">reset_stats(SendHandle) -> void()</name>
       <fsummary></fsummary>
       <type>
         <v>SendHandle = send_handle()</v>
diff --git a/lib/megaco/doc/src/megaco_transport.xml b/lib/megaco/doc/src/megaco_transport.xml
index 3002e9b74e..ba8c794750 100644
--- a/lib/megaco/doc/src/megaco_transport.xml
+++ b/lib/megaco/doc/src/megaco_transport.xml
@@ -32,7 +32,7 @@
     <rev>%VSN%</rev>
     <file>megaco_transport.xml</file>
   </header>
-  <module>megaco_transport</module>
+  <module since="">megaco_transport</module>
   <modulesummary>Megaco transport behaviour.</modulesummary>
   <description>
     <p>The following functions should be exported from a 
@@ -54,8 +54,8 @@
   </description>
   <funcs>
     <func>
-      <name>Module:send_message(Handle, Msg) -> ok | {cancel, Reason} | Error</name>
-      <name>Module:send_message(Handle, Msg, Resend) -> ok | {cancel, Reason} | Error</name>
+      <name since="">Module:send_message(Handle, Msg) -> ok | {cancel, Reason} | Error</name>
+      <name since="">Module:send_message(Handle, Msg, Resend) -> ok | {cancel, Reason} | Error</name>
       <fsummary>Send a megaco message.</fsummary>
       <type>
         <v>Handle = term()</v>
@@ -99,7 +99,7 @@
     </func>
 
     <func>
-      <name>Module:resend_message(Handle, Msg) -> ok | {cancel, Reason} | Error</name>
+      <name since="">Module:resend_message(Handle, Msg) -> ok | {cancel, Reason} | Error</name>
       <fsummary>Re-send a megaco message.</fsummary>
       <type>
         <v>Handle = term()</v>
diff --git a/lib/megaco/doc/src/megaco_udp.xml b/lib/megaco/doc/src/megaco_udp.xml
index b2559c77d5..3d776c19b6 100644
--- a/lib/megaco/doc/src/megaco_udp.xml
+++ b/lib/megaco/doc/src/megaco_udp.xml
@@ -32,7 +32,7 @@
     <rev>%VSN%</rev>
     <file>megaco_udp.xml</file>
   </header>
-  <module>megaco_udp</module>
+  <module since="">megaco_udp</module>
   <modulesummary>Interface module to UDP transport protocol for Megaco/H.248.</modulesummary>
   <description>
     <p>This module contains the public interface to the UDP/IP version
@@ -40,7 +40,7 @@
   </description>
   <funcs>
     <func>
-      <name>start_transport() -> {ok, TransportRef}</name>
+      <name since="">start_transport() -> {ok, TransportRef}</name>
       <fsummary></fsummary>
       <type>
         <v>TransportRef = pid()</v>
@@ -51,7 +51,7 @@
       </desc>
     </func>
     <func>
-      <name>open(TransportRef, OptionList) ->  {ok, Handle, ControlPid} |  {error, Reason}</name>
+      <name since="">open(TransportRef, OptionList) ->  {ok, Handle, ControlPid} |  {error, Reason}</name>
       <fsummary></fsummary>
       <type>
         <v>TransportRef = pid() | regname()</v>
@@ -73,7 +73,7 @@
       </desc>
     </func>
     <func>
-      <name>close(Handle, Msg) -> ok</name>
+      <name since="">close(Handle, Msg) -> ok</name>
       <fsummary></fsummary>
       <type>
         <v>Handle = socket_handle()</v>
@@ -84,7 +84,7 @@
       </desc>
     </func>
     <func>
-      <name>socket(Handle) -> Socket</name>
+      <name since="">socket(Handle) -> Socket</name>
       <fsummary></fsummary>
       <type>
         <v>Handle = socket_handle()</v>
@@ -97,7 +97,7 @@
       </desc>
     </func>
     <func>
-      <name>create_send_handle(Handle, Host, Port) -> send_handle()</name>
+      <name since="">create_send_handle(Handle, Host, Port) -> send_handle()</name>
       <fsummary></fsummary>
       <type>
         <v>Handle = socket_handle()</v>
@@ -110,7 +110,7 @@
       </desc>
     </func>
     <func>
-      <name>send_message(SendHandle, Msg) -> ok</name>
+      <name since="">send_message(SendHandle, Msg) -> ok</name>
       <fsummary></fsummary>
       <type>
         <v>SendHandle = send_handle()</v>
@@ -125,7 +125,7 @@
       </desc>
     </func>
     <func>
-      <name>block(Handle) -> ok</name>
+      <name since="">block(Handle) -> ok</name>
       <fsummary></fsummary>
       <type>
         <v>Handle = socket_handle()</v>
@@ -135,7 +135,7 @@
       </desc>
     </func>
     <func>
-      <name>unblock(Handle) -> ok</name>
+      <name since="">unblock(Handle) -> ok</name>
       <fsummary></fsummary>
       <type>
         <v>Handle = socket_handle()</v>
@@ -146,7 +146,7 @@
       </desc>
     </func>
     <func>
-      <name>upgrade_receive_handle(ControlPid, NewHandle) -> ok</name>
+      <name since="">upgrade_receive_handle(ControlPid, NewHandle) -> ok</name>
       <fsummary></fsummary>
       <type>
         <v>ControlPid = pid()</v>
@@ -160,9 +160,9 @@
       </desc>
     </func>
     <func>
-      <name>get_stats() -> {ok, TotalStats} | {error, Reason}</name>
-      <name>get_stats(SendHandle) -> {ok, SendHandleStats} | {error, Reason}</name>
-      <name>get_stats(SendHandle, Counter) -> {ok, CounterStats} | {error, Reason}</name>
+      <name since="">get_stats() -> {ok, TotalStats} | {error, Reason}</name>
+      <name since="">get_stats(SendHandle) -> {ok, SendHandleStats} | {error, Reason}</name>
+      <name since="">get_stats(SendHandle, Counter) -> {ok, CounterStats} | {error, Reason}</name>
       <fsummary></fsummary>
       <type>
         <v>TotalStats = [total_stats()]</v>
@@ -180,8 +180,8 @@
       </desc>
     </func>
     <func>
-      <name>reset_stats() -> void()</name>
-      <name>reset_stats(SendHandle) -> void()</name>
+      <name since="">reset_stats() -> void()</name>
+      <name since="">reset_stats(SendHandle) -> void()</name>
       <fsummary></fsummary>
       <type>
         <v>SendHandle = send_handle()</v>
diff --git a/lib/megaco/doc/src/megaco_user.xml b/lib/megaco/doc/src/megaco_user.xml
index 067be15fe0..56d4d51cde 100644
--- a/lib/megaco/doc/src/megaco_user.xml
+++ b/lib/megaco/doc/src/megaco_user.xml
@@ -32,7 +32,7 @@
     <rev>%VSN%</rev>
     <file>megaco_user.xml</file>
   </header>
-  <module>megaco_user</module>
+  <module since="">megaco_user</module>
   <modulesummary>Callback module for users of the Megaco application</modulesummary>
   <description>
     <p>This module defines the callback behaviour of Megaco users.  A
@@ -164,8 +164,8 @@ protocol_version() = integer()    ]]></code>
 
   <funcs>
     <func>
-      <name>handle_connect(ConnHandle, ProtocolVersion) -> ok | error | {error,ErrorDescr}</name>
-      <name>handle_connect(ConnHandle, ProtocolVersion, Extra]) -> ok | error | {error,ErrorDescr}</name>
+      <name since="">handle_connect(ConnHandle, ProtocolVersion) -> ok | error | {error,ErrorDescr}</name>
+      <name since="">handle_connect(ConnHandle, ProtocolVersion, Extra) -> ok | error | {error,ErrorDescr}</name>
       <fsummary>Invoked when a new connection is established</fsummary>
       <type>
         <v>ConnHandle      = conn_handle()</v>
@@ -202,7 +202,7 @@ protocol_version() = integer()    ]]></code>
     </func>
 
     <func>
-      <name>handle_disconnect(ConnHandle, ProtocolVersion, Reason) -> ok</name>
+      <name since="">handle_disconnect(ConnHandle, ProtocolVersion, Reason) -> ok</name>
       <fsummary>Invoked when a connection is teared down</fsummary>
       <type>
         <v>ConnHandle      = conn_handle()</v>
@@ -220,8 +220,8 @@ protocol_version() = integer()    ]]></code>
     </func>
 
     <func>
-      <name>handle_syntax_error(ReceiveHandle, ProtocolVersion, DefaultED) -> reply | {reply, ED} | no_reply | {no_reply, ED} </name>
-      <name>handle_syntax_error(ReceiveHandle, ProtocolVersion, DefaultED, Extra) -> reply | {reply, ED} | no_reply | {no_reply, ED} </name>
+      <name since="">handle_syntax_error(ReceiveHandle, ProtocolVersion, DefaultED) -> reply | {reply, ED} | no_reply | {no_reply, ED} </name>
+      <name since="">handle_syntax_error(ReceiveHandle, ProtocolVersion, DefaultED, Extra) -> reply | {reply, ED} | no_reply | {no_reply, ED} </name>
       <fsummary>Invoked when a received message had syntax errors</fsummary>
       <type>
         <v>ReceiveHandle    = receive_handle()</v>
@@ -258,8 +258,8 @@ protocol_version() = integer()    ]]></code>
     </func>
 
     <func>
-      <name>handle_message_error(ConnHandle, ProtocolVersion, ErrorDescr) -> ok</name>
-      <name>handle_message_error(ConnHandle, ProtocolVersion, ErrorDescr, Extra) -> ok</name>
+      <name since="">handle_message_error(ConnHandle, ProtocolVersion, ErrorDescr) -> ok</name>
+      <name since="">handle_message_error(ConnHandle, ProtocolVersion, ErrorDescr, Extra) -> ok</name>
       <fsummary>Invoked when a received message just contains an error</fsummary>
       <type>
         <v>ConnHandle      = conn_handle()</v>
@@ -291,8 +291,8 @@ protocol_version() = integer()    ]]></code>
 
 <!--
     <func>
-      <name>handle_segment_error(ConnHandle, ProtocolVersion, TransId, SegmentError) -> ok</name>
-      <name>handle_segment_error(ConnHandle, ProtocolVersion, TransId, SegmentError, Extra) -> ok</name>
+      <name since="">handle_segment_error(ConnHandle, ProtocolVersion, TransId, SegmentError) -> ok</name>
+      <name since="">handle_segment_error(ConnHandle, ProtocolVersion, TransId, SegmentError, Extra) -> ok</name>
       <fsummary>Invoked when a segment error has been detected</fsummary>
       <type>
         <v>ConnHandle      = conn_handle()</v>
@@ -316,8 +316,8 @@ protocol_version() = integer()    ]]></code>
 -->
 
     <func>
-      <name>handle_trans_request(ConnHandle, ProtocolVersion, ActionRequests) -> pending() | reply() | ignore_trans_request</name>
-      <name>handle_trans_request(ConnHandle, ProtocolVersion, ActionRequests, Extra) -> pending() | reply() | ignore_trans_request</name>
+      <name since="">handle_trans_request(ConnHandle, ProtocolVersion, ActionRequests) -> pending() | reply() | ignore_trans_request</name>
+      <name since="">handle_trans_request(ConnHandle, ProtocolVersion, ActionRequests, Extra) -> pending() | reply() | ignore_trans_request</name>
       <fsummary>Invoked for each transaction request</fsummary>
       <type>
         <v>ConnHandle      = conn_handle()</v>
@@ -420,8 +420,8 @@ protocol_version() = integer()    ]]></code>
     </func>
 
     <func>
-      <name>handle_trans_long_request(ConnHandle, ProtocolVersion, ReqData) -> reply()</name>
-      <name>handle_trans_long_request(ConnHandle, ProtocolVersion, ReqData, Extra) -> reply()</name>
+      <name since="">handle_trans_long_request(ConnHandle, ProtocolVersion, ReqData) -> reply()</name>
+      <name since="">handle_trans_long_request(ConnHandle, ProtocolVersion, ReqData, Extra) -> reply()</name>
       <fsummary>Optionally invoked for a time consuming transaction request</fsummary>
       <type>
         <v>ConnHandle      = conn_handle()</v>
@@ -460,8 +460,8 @@ protocol_version() = integer()    ]]></code>
     </func>
 
     <func>
-      <name>handle_trans_reply(ConnHandle, ProtocolVersion, UserReply, ReplyData) -> ok</name>
-      <name>handle_trans_reply(ConnHandle, ProtocolVersion, UserReply, ReplyData, Extra) -> ok</name>
+      <name since="">handle_trans_reply(ConnHandle, ProtocolVersion, UserReply, ReplyData) -> ok</name>
+      <name since="">handle_trans_reply(ConnHandle, ProtocolVersion, UserReply, ReplyData, Extra) -> ok</name>
       <fsummary>Optionally invoked for a transaction reply</fsummary>
       <type>
         <v>ConnHandle      = conn_handle()</v>
@@ -593,8 +593,8 @@ protocol_version() = integer()    ]]></code>
     </func>
 
     <func>
-      <name>handle_trans_ack(ConnHandle, ProtocolVersion, AckStatus, AckData) -> ok</name>
-      <name>handle_trans_ack(ConnHandle, ProtocolVersion, AckStatus, AckData, Extra) -> ok</name>
+      <name since="">handle_trans_ack(ConnHandle, ProtocolVersion, AckStatus, AckData) -> ok</name>
+      <name since="">handle_trans_ack(ConnHandle, ProtocolVersion, AckStatus, AckData, Extra) -> ok</name>
       <fsummary>Optionally invoked for a transaction acknowledgement</fsummary>
       <type>
         <v>ConnHandle      = conn_handle()</v>
@@ -658,8 +658,8 @@ protocol_version() = integer()    ]]></code>
     </func>
 
     <func>
-      <name>handle_unexpected_trans(ConnHandle, ProtocolVersion, Trans) -> ok</name>
-      <name>handle_unexpected_trans(ConnHandle, ProtocolVersion, Trans, Extra) -> ok</name>
+      <name since="">handle_unexpected_trans(ConnHandle, ProtocolVersion, Trans) -> ok</name>
+      <name since="">handle_unexpected_trans(ConnHandle, ProtocolVersion, Trans, Extra) -> ok</name>
       <fsummary>Invoked when an unexpected message is received</fsummary>
       <type>
         <v>ConnHandle      = conn_handle()</v>
@@ -685,8 +685,8 @@ protocol_version() = integer()    ]]></code>
     </func>
 
     <func>
-      <name>handle_trans_request_abort(ConnHandle, ProtocolVersion, TransNo, Pid) -> ok</name>
-      <name>handle_trans_request_abort(ConnHandle, ProtocolVersion, TransNo, Pid, Extra) -> ok</name>
+      <name since="">handle_trans_request_abort(ConnHandle, ProtocolVersion, TransNo, Pid) -> ok</name>
+      <name since="">handle_trans_request_abort(ConnHandle, ProtocolVersion, TransNo, Pid, Extra) -> ok</name>
       <fsummary>Invoked when an transaction request has been aborted</fsummary>
       <type>
         <v>ConnHandle      = conn_handle()</v>
@@ -710,8 +710,8 @@ protocol_version() = integer()    ]]></code>
     </func>
 
     <func>
-      <name>handle_segment_reply(ConnHandle, ProtocolVersion, TransNo, SegNo, SegCompl) -> ok</name>
-      <name>handle_segment_reply(ConnHandle, ProtocolVersion, TransNo, SegNo, SegCompl, Extra) -> ok</name>
+      <name since="">handle_segment_reply(ConnHandle, ProtocolVersion, TransNo, SegNo, SegCompl) -> ok</name>
+      <name since="">handle_segment_reply(ConnHandle, ProtocolVersion, TransNo, SegNo, SegCompl, Extra) -> ok</name>
       <fsummary>Segment Reply Indication</fsummary>
       <type>
         <v>ConnHandle      = conn_handle()</v>
diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml
index b697c3f631..6f33ae390c 100644
--- a/lib/megaco/doc/src/notes.xml
+++ b/lib/megaco/doc/src/notes.xml
@@ -37,7 +37,30 @@
   section is the version number of Megaco.</p>
 
 
-  <section><title>Megaco 3.18.4</title>
+  <section><title>Megaco 3.18.5</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Minor updates to build system necessary due to move of
+	    configuration of <c>crypto</c> application.</p>
+          <p>
+	    Own Id: OTP-15262 Aux Id: OTP-15129 </p>
+        </item>
+        <item>
+          <p>
+	    Minor adjustments made to build system for parallel
+	    configure.</p>
+          <p>
+	    Own Id: OTP-15340 Aux Id: OTP-14625 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Megaco 3.18.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/megaco/examples/simple/megaco_simple_mgc.erl b/lib/megaco/examples/simple/megaco_simple_mgc.erl
index f324e17a3a..8a78262b86 100644
--- a/lib/megaco/examples/simple/megaco_simple_mgc.erl
+++ b/lib/megaco/examples/simple/megaco_simple_mgc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2019. 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.
@@ -193,15 +193,17 @@ stop(Mid) ->
     d("stop -> entry with~n   Mid: ~p", [Mid]),
     Disco = fun(CH) ->
 		    d("stop -> CH: ~p", [CH]),
-		    Reason = stopped_by_user, 
-		    Pid = megaco:conn_info(CH, control_pid),
-		    SendMod = megaco:conn_info(CH, send_mod),
+		    Reason     = stopped_by_user, 
+		    Pid        = megaco:conn_info(CH, control_pid),
+		    SendMod    = megaco:conn_info(CH, send_mod),
 		    SendHandle = megaco:conn_info(CH, send_handle),
 
 		    d("stop -> disconnect", []),
 		    megaco:disconnect(CH, Reason),
+
 		    d("stop -> cancel", []),
-		    megaco:cancel(CH, Reason),
+		    megaco:cancel(CH, Reason), % see handle_disconnect
+
 		    d("stop -> close transport"
 		      "~n   SendMod:    ~p"
 		      "~n   SendHandle: ~p", [SendMod, SendHandle]),
@@ -247,6 +249,7 @@ handle_disconnect(ConnHandle, ProtocolVersion, Reason) ->
       "~n   ProtocolVersion: ~p"
       "~n   Reason:          ~p"
       "", [ConnHandle, ProtocolVersion, Reason]),
+    info_msg("handle_disconnect - cancel outstanding messages~n"),
     megaco:cancel(ConnHandle, Reason), % Cancel the outstanding messages
     ok.
 
@@ -443,6 +446,12 @@ get_arg(Key, Args) ->
 %% DEBUGGING
 %%----------------------------------------------------------------------
 
+info_msg(F) ->
+    info_msg(F, []).
+info_msg(F, A) ->
+    io:format("~p MGC: " ++ F ++ "~n", [self()|A]).
+
+     
 d(F) ->
     d(F, []).
 
diff --git a/lib/megaco/src/app/megaco.app.src b/lib/megaco/src/app/megaco.app.src
index c54c80351c..5fb7273b4a 100644
--- a/lib/megaco/src/app/megaco.app.src
+++ b/lib/megaco/src/app/megaco.app.src
@@ -107,6 +107,7 @@
 	megaco_udp,
 	megaco_udp_server,
 	megaco_udp_sup,
+	megaco_user,
 	megaco_user_default
        ]},
   {registered, [megaco_config, megaco_monitor, 
diff --git a/lib/megaco/src/app/megaco.erl b/lib/megaco/src/app/megaco.erl
index f0c209fd6c..9ed042401b 100644
--- a/lib/megaco/src/app/megaco.erl
+++ b/lib/megaco/src/app/megaco.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -94,6 +94,11 @@
 %% This is for XREF
 -deprecated([{format_versions, 1, eventually}]).
 
+-export_type([
+              void/0
+             ]).
+
+-type void() :: term().
 
 -include("megaco_internal.hrl").
 
@@ -686,13 +691,8 @@ sys_info() ->
     [{arch, SysArch}, {ver, SysVer}].
 
 os_info() ->
-    V = os:version(),
-    case os:type() of
-        {OsFam, OsName} ->
-            [{fam, OsFam}, {name, OsName}, {ver, V}];
-        OsFam ->
-            [{fam, OsFam}, {ver, V}]
-    end.
+    {OsFam, OsName} = os:type(),
+    [{fam, OsFam}, {name, OsName}, {ver, os:version()}].
     
 ms() ->    
     ms1().
diff --git a/lib/megaco/src/binary/megaco_binary_encoder_lib.erl b/lib/megaco/src/binary/megaco_binary_encoder_lib.erl
index 5e9836dc48..fdbb42c2f8 100644
--- a/lib/megaco/src/binary/megaco_binary_encoder_lib.erl
+++ b/lib/megaco/src/binary/megaco_binary_encoder_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2019. 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.
@@ -141,6 +141,7 @@ encode_transaction(_EC, T, _AsnMod, _TransMod, _Type) ->
 			    TransMod :: atom(),
 			    Type :: atom()) ->
     {'ok', binary()} | {'error', any()}.
+-dialyzer({nowarn_function, do_encode_transaction/5}). % Future compat
 do_encode_transaction([native], _Trans, _AsnMod, _TransMod, binary) ->
     %% asn1rt:encode(AsnMod, element(1, T), T);
     {error, not_implemented};
@@ -173,6 +174,7 @@ do_encode_transaction(EC, _Trans, _AsnMod, _TransMod, _Type) ->
 			     TransMod :: atom(),
 			     Type :: atom()) ->
     {'ok', binary()} | {'error', any()}.
+-dialyzer({nowarn_function, encode_action_requests/5}). % Future compat
 encode_action_requests([native], _ARs, _AsnMod, _TransMod, binary) ->
     %% asn1rt:encode(AsnMod, element(1, T), T);
     {error, not_implemented};
@@ -203,6 +205,7 @@ encode_action_requests(EC, _ARs, _AsnMod, _TransMod, _Type) ->
 			    TransMod :: atom(),
 			    Type :: atom()) ->
     {'ok', binary()} | {'error', any()}.
+-dialyzer({nowarn_function, encode_action_request/5}). % Future compat
 encode_action_request([native], _AR, _AsnMod, _TransMod, binary) ->
     %% asn1rt:encode(AsnMod, element(1, T), T);
     {error, not_implemented};
@@ -226,6 +229,8 @@ encode_action_request(EC, _AR, _AsnMod, _TransMod, _Type) ->
 %% Convert a ActionReply record into a binary
 %% Return {ok, DeepIoList} | {error, Reason}
 %%----------------------------------------------------------------------
+
+-dialyzer({nowarn_function, encode_action_reply/5}). % Future compat
 encode_action_reply([native], _ARs, _AsnMod, _TransMod, binary) ->
     %% asn1rt:encode(AsnMod, element(1, T), T);
     {error, not_implemented};
diff --git a/lib/megaco/src/binary/megaco_binary_name_resolver_prev3a.erl b/lib/megaco/src/binary/megaco_binary_name_resolver_prev3a.erl
index af97056d5d..f9e3fe39e3 100644
--- a/lib/megaco/src/binary/megaco_binary_name_resolver_prev3a.erl
+++ b/lib/megaco/src/binary/megaco_binary_name_resolver_prev3a.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. 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.
@@ -1715,7 +1715,7 @@ decode_nt({event_parameter, Item}, SubItem) ->
                 [16#00, 16#01] -> "cs"
             end;
         [16#00, 16#06] -> % Event qualert
-            case Item of
+            case SubItem of
                 [16#00, 16#01] -> "th"
             end
 	end;
diff --git a/lib/megaco/src/binary/megaco_binary_name_resolver_prev3b.erl b/lib/megaco/src/binary/megaco_binary_name_resolver_prev3b.erl
index b543abe7c8..141225f501 100644
--- a/lib/megaco/src/binary/megaco_binary_name_resolver_prev3b.erl
+++ b/lib/megaco/src/binary/megaco_binary_name_resolver_prev3b.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2019. 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.
@@ -1715,7 +1715,7 @@ decode_nt({event_parameter, Item}, SubItem) ->
                 [16#00, 16#01] -> "cs"
             end;
         [16#00, 16#06] -> % Event qualert
-            case Item of
+            case SubItem of
                 [16#00, 16#01] -> "th"
             end
 	end;
diff --git a/lib/megaco/src/binary/megaco_binary_name_resolver_prev3c.erl b/lib/megaco/src/binary/megaco_binary_name_resolver_prev3c.erl
index 827cb3920b..b27a0be26e 100644
--- a/lib/megaco/src/binary/megaco_binary_name_resolver_prev3c.erl
+++ b/lib/megaco/src/binary/megaco_binary_name_resolver_prev3c.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2019. 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.
@@ -1716,7 +1716,7 @@ decode_nt({event_parameter, Item}, SubItem) ->
                 [16#00, 16#01] -> "cs"
             end;
         [16#00, 16#06] -> % Event qualert
-            case Item of
+            case SubItem of
                 [16#00, 16#01] -> "th"
             end
 	end;
diff --git a/lib/megaco/src/binary/megaco_binary_name_resolver_v1.erl b/lib/megaco/src/binary/megaco_binary_name_resolver_v1.erl
index 1fba60fed6..aba64bb9f2 100644
--- a/lib/megaco/src/binary/megaco_binary_name_resolver_v1.erl
+++ b/lib/megaco/src/binary/megaco_binary_name_resolver_v1.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2019. 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.
@@ -1325,7 +1325,7 @@ decode_nt({event_parameter, Item}, SubItem) ->
                 [16#00, 16#01] -> "cs"
             end;
         [16#00, 16#06] -> % Event qualert
-            case Item of
+            case SubItem of
                 [16#00, 16#01] -> "th"
             end
 	end;
diff --git a/lib/megaco/src/binary/megaco_binary_name_resolver_v2.erl b/lib/megaco/src/binary/megaco_binary_name_resolver_v2.erl
index 45b9b32772..dd07f8b404 100644
--- a/lib/megaco/src/binary/megaco_binary_name_resolver_v2.erl
+++ b/lib/megaco/src/binary/megaco_binary_name_resolver_v2.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2019. 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.
@@ -1393,7 +1393,7 @@ decode_nt({event_parameter, Item}, SubItem) ->
                 [16#00, 16#01] -> "cs"
             end;
         [16#00, 16#06] -> % Event qualert
-            case Item of
+            case SubItem of
                 [16#00, 16#01] -> "th"
             end
 	end;
diff --git a/lib/megaco/src/binary/megaco_binary_name_resolver_v3.erl b/lib/megaco/src/binary/megaco_binary_name_resolver_v3.erl
index f1482bc252..a8c4211235 100644
--- a/lib/megaco/src/binary/megaco_binary_name_resolver_v3.erl
+++ b/lib/megaco/src/binary/megaco_binary_name_resolver_v3.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2019. 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.
@@ -1728,7 +1728,7 @@ decode_nt({event_parameter, Item}, SubItem) ->
                 [16#00, 16#01] -> "cs"
             end;
         [16#00, 16#06] -> % Event qualert
-            case Item of
+            case SubItem of
                 [16#00, 16#01] -> "th"
             end
 	end;
diff --git a/lib/megaco/src/engine/depend.mk b/lib/megaco/src/engine/depend.mk
index 96ee337e3a..ba919659db 100644
--- a/lib/megaco/src/engine/depend.mk
+++ b/lib/megaco/src/engine/depend.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2003-2016. All Rights Reserved.
+# Copyright Ericsson AB 2003-2019. 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,6 +78,10 @@ $(EBIN)/megaco_transport.$(EMULATOR): megaco_transport.erl
 
 $(EBIN)/megaco_user.$(EMULATOR): megaco_user.erl
 
+$(EBIN)/megaco_user.$(EMULATOR): megaco_user.erl \
+	../../include/megaco.hrl \
+	../../include/megaco_message_v1.hrl
+
 $(EBIN)/megaco_user_default.$(EMULATOR): megaco_user_default.erl \
 	../../include/megaco.hrl \
 	../../include/megaco_message_v1.hrl
diff --git a/lib/megaco/src/engine/megaco_edist_compress.erl b/lib/megaco/src/engine/megaco_edist_compress.erl
index 987a5ec717..968ab6f16e 100644
--- a/lib/megaco/src/engine/megaco_edist_compress.erl
+++ b/lib/megaco/src/engine/megaco_edist_compress.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2019. 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,10 +25,21 @@
 
 -module(megaco_edist_compress).
 
--export([behaviour_info/1]).
+-callback encode(R, Version) -> T when
+      R       :: megaco_encoder:megaco_message() |
+                 megaco_encoder:transaction() | 
+                 megaco_encoder:action_reply() | 
+                 megaco_encoder:action_request() | 
+                 megaco_encoder:command_request(),
+      Version :: megaco_encoder:protocol_version(),
+      T       :: term().
+
+-callback decode(T, Version) -> R when
+      T       :: term(),
+      Version :: megaco_encoder:protocol_version() | dynamic,
+      R       :: megaco_encoder:megaco_message() |
+                 megaco_encoder:transaction() | 
+                 megaco_encoder:action_reply() | 
+                 megaco_encoder:action_request() | 
+                 megaco_encoder:command_request().
 
-behaviour_info(callbacks) ->
-    [{encode,2}, 
-     {decode,2}];
-behaviour_info(_) ->
-    undefined.
diff --git a/lib/megaco/src/engine/megaco_encoder.erl b/lib/megaco/src/engine/megaco_encoder.erl
index 7ade349083..dd5a3458fc 100644
--- a/lib/megaco/src/engine/megaco_encoder.erl
+++ b/lib/megaco/src/engine/megaco_encoder.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2019. 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,14 +25,108 @@
 
 -module(megaco_encoder).
 
--export([behaviour_info/1]).
-
-behaviour_info(callbacks) ->
-    [{encode_message,         3}, 
-     {decode_message,         3},
-     {decode_mini_message,    3},
-     {encode_transaction,     3},
-     {encode_action_requests, 3},
-     {encode_action_reply,    3}];
-behaviour_info(_) ->
-    undefined.
+-export_type([
+              protocol_version/0,
+              segment_no/0,
+              megaco_message/0,
+              transaction/0,
+              transaction_request/0,
+              transaction_pending/0,
+              transaction_reply/0,
+              transaction_response_ack/0,
+              transaction_ack/0,
+              segment_reply/0,
+              action_request/0,
+              action_reply/0,
+              command_request/0,
+              error_desc/0
+             ]).
+
+
+-include("megaco_message_internal.hrl").
+
+-type protocol_version() :: integer().
+-type segment_no()       :: integer().
+-type megaco_message() :: #'MegacoMessage'{}.
+-type transaction()    :: {transactionRequest,     transaction_request()}      |
+                          {transactionPending,     transaction_reply()}        |
+                          {transactionReply,       transaction_pending()}      |
+                          {transactionResponseAck, transaction_response_ack()} |
+                          {segmentReply,           segment_reply()}.
+-type transaction_request()      :: #'TransactionRequest'{}.
+-type transaction_pending()      :: #'TransactionPending'{}.
+%% The problem with TransactionReply is that its definition depend
+%% on which version of the protocol we are using. As of version 3,
+%% it has two more fields.
+%% -type transaction_reply()        :: #'TransactionReply'{}.
+-type transaction_reply()        :: {'TransactionReply', _, _} |
+                                    {'TransactionReply', _, _, _, _}.
+-type transaction_response_ack() :: [transaction_ack()].
+-type transaction_ack()          :: #'TransactionAck'{}.
+-type segment_reply()            :: #'SegmentReply'{}.
+%% -type action_request()           :: #'ActionRequest'{}.
+-type action_request()           :: {'ActionRequest', _, _, _, _}.
+%% -type action_reply()             :: #'ActionReply'{}.
+-type action_reply()             :: {'ActionReply', _, _, _}.
+%% -type command_request()           :: #'CommandRequest'{}.
+-type command_request()          :: {'CommandRequest', _, _, _}.
+-type error_desc()               :: #'ErrorDescriptor'{}.
+
+-callback encode_message(EncodingConfig,
+                         Version,
+                         Message) -> {ok, Bin} | Error when
+      EncodingConfig :: list(),
+      Version        :: protocol_version(),
+      Message        :: megaco_message(),
+      Bin            :: binary(),
+      Error          :: term().
+
+-callback decode_message(EncodingConfig,
+                         Version,
+                         Bin) -> {ok, Message} | Error when
+      EncodingConfig :: list(),
+      Version        :: protocol_version() | dynamic,
+      Bin            :: binary(),
+      Message        :: megaco_message(),
+      Error          :: term().
+
+-callback decode_mini_message(EncodingConfig,
+                              Version,
+                              Bin) -> {ok, Message} | Error when
+      EncodingConfig :: list(),
+      Version        :: protocol_version() | dynamic,
+      Bin            :: binary(),
+      Message        :: megaco_message(),
+      Error          :: term().
+
+-callback encode_transaction(EncodingConfig,
+                             Version,
+                             Transaction) -> {ok, Bin} | {error, Reason} when
+      EncodingConfig :: list(),
+      Version        :: protocol_version(),
+      Transaction    :: transaction(),
+      Bin            :: binary(),
+      Reason         :: not_implemented | term().
+
+-callback encode_action_requests(EncodingConfig,
+                                 Version,
+                                 ARs) -> {ok, Bin} | {error, Reason} when
+      EncodingConfig :: list(),
+      Version        :: protocol_version(),
+      ARs            :: [action_request()],
+      Bin            :: binary(),
+      Reason         :: not_implemented | term().
+
+-callback encode_action_reply(EncodingConfig,
+                              Version,
+                              AR) -> {ok, Bin} | {error, Reason} when
+      EncodingConfig :: list(),
+      Version        :: protocol_version(),
+      AR             :: action_reply(),
+      Bin            :: binary(),
+      Reason         :: not_implemented | term().
+
+-optional_callbacks(
+   [
+    encode_action_reply/3 % Only used if segementation is used
+   ]).
diff --git a/lib/megaco/src/engine/megaco_messenger.erl b/lib/megaco/src/engine/megaco_messenger.erl
index 1d462b2140..2a9ecee2a7 100644
--- a/lib/megaco/src/engine/megaco_messenger.erl
+++ b/lib/megaco/src/engine/megaco_messenger.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2019. 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.
@@ -1391,7 +1391,7 @@ prepare_request(ConnData, T, Rest, AckList, ReqList, Extra) ->
             %% don't restart the reply_timer.
             ConnData2 = ConnData#conn_data{protocol_version = Version},
             ?report_trace(ConnData2, 
-			  "re-send trans reply", [T | {bytes, Bin}]),
+			  "re-send trans reply", [T, {bytes, Bin}]),
             case megaco_messenger_misc:send_message(ConnData2, true, Bin) of
 		{ok, _} ->
 		    ok;
diff --git a/lib/megaco/src/engine/megaco_user.erl b/lib/megaco/src/engine/megaco_user.erl
new file mode 100644
index 0000000000..47fb1a119d
--- /dev/null
+++ b/lib/megaco/src/engine/megaco_user.erl
@@ -0,0 +1,386 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2019-2019. 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: Megaco user behaviour module
+%%
+%% This callback functions are the default! Its possible for the user to
+%% provide a arbitrary number of "extra" arguments via the user_args
+%% config option.
+%% So, for instance, the handle_connect/2 could instead become
+%% handle_connect/4 if the user sets the user_args option to [foo, bar].
+%% This means that its impossible to define a proper behaviour.
+%% So what we do here is to define a behaviour with the "default interface"
+%% (the user_args option has the [] as the default value) and set them
+%% all to be optional!
+%%-------------------------------------------------------------------------
+
+-module(megaco_user).
+
+-export_type([
+              receive_handle/0,
+              conn_handle/0,
+              megaco_timer/0
+             ]).
+
+-include_lib("megaco/include/megaco.hrl").
+%% -include_lib("megaco/include/megaco_message_v1.hrl").
+
+-type receive_handle() :: #megaco_receive_handle{}.
+-type conn_handle()    :: #megaco_conn_handle{}.
+-type megaco_timer()   :: infinity | non_neg_integer() | #megaco_incr_timer{}.
+
+-callback handle_connect(ConnHandle, ProtocolVersion) -> 
+    ok | error | {error, ErrorDescr} when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      ErrorDescr      :: megaco_encoder:error_desc().
+-callback handle_connect(ConnHandle, ProtocolVersion, Extra) -> 
+    ok | error | {error, ErrorDescr} when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      Extra           :: term(),
+      ErrorDescr      :: megaco_encoder:error_desc().
+
+-callback handle_disconnect(ConnHandle, ProtocolVersion, Reason) ->
+    megaco:void() when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      Reason          :: term().
+
+-callback handle_syntax_error(ReceiveHandle, ProtocolVersion, DefaultED) -> 
+    reply | {reply, ED} | no_reply | {no_reply, ED} when
+      ReceiveHandle   :: receive_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      DefaultED       :: megaco_encoder:error_desc(),
+      ED              :: megaco_encoder:error_desc().
+-callback handle_syntax_error(ReceiveHandle, ProtocolVersion, DefaultED, Extra) -> 
+    reply | {reply, ED} | no_reply | {no_reply, ED} when
+      ReceiveHandle   :: receive_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      DefaultED       :: megaco_encoder:error_desc(),
+      ED              :: megaco_encoder:error_desc(),
+      Extra           :: term().
+
+-callback handle_message_error(ConnHandle, ProtocolVersion, ErrorDescr) ->
+    megaco:void() when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      ErrorDescr      :: megaco_encoder:error_desc().
+-callback handle_message_error(ConnHandle, ProtocolVersion, ErrorDescr, Extra) ->
+    megaco:void() when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      ErrorDescr      :: megaco_encoder:error_desc(),
+      Extra           :: term().
+
+-callback handle_trans_request(ConnHandle, ProtocolVersion, ActionRequests) ->
+    Pending | Reply | ignore_trans_request when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      ActionRequests  :: [megaco_encoder:action_request()],
+      Pending         :: {pending, ReqData},
+      ReqData         :: term(),
+      Reply           :: {AckAction, ActualReply} |
+                         {AckAction, ActualReply, SendOptions},
+      AckAction       :: discard_ack |
+                         {handle_ack,         AckData} |
+                         {handle_pending_ack, AckData} |
+                         {handle_sloppy_ack,  AckData},
+      ActualReply     :: [megaco_encoder:action_reply()] |
+                         megaco_encoder:error_desc(),
+      AckData         :: term(),
+      SendOptions     :: [SendOption],
+      SendOption      :: {reply_timer,      megaco_timer()} |
+                         {send_handle,      term()} |
+                         {protocol_version, integer()}.
+-callback handle_trans_request(ConnHandle,
+                               ProtocolVersion,
+                               ActionRequests,
+                               Extra) ->
+    Pending | Reply | ignore_trans_request when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      ActionRequests  :: [megaco_encoder:action_request()],
+      Extra           :: term(),
+      Pending         :: {pending, ReqData},
+      ReqData         :: term(),
+      Reply           :: {AckAction, ActualReply} |
+                         {AckAction, ActualReply, SendOptions},
+      AckAction       :: discard_ack |
+                         {handle_ack,         AckData} |
+                         {handle_pending_ack, AckData} |
+                         {handle_sloppy_ack,  AckData},
+      ActualReply     :: [megaco_encoder:action_reply()] |
+                         megaco_encoder:error_desc(),
+      AckData         :: term(),
+      SendOptions     :: [SendOption],
+      SendOption      :: {reply_timer,      megaco_timer()} |
+                         {send_handle,      term()} |
+                         {protocol_version, integer()}.
+
+-callback handle_trans_long_request(ConnHandle, ProtocolVersion, ReqData) ->
+    Reply when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      ReqData         :: term(),
+      Reply           :: {AckAction, ActualReply} |
+                         {AckAction, ActualReply, SendOptions},
+      AckAction       :: discard_ack |
+                         {handle_ack, AckData} |
+                         {handle_sloppy_ack, AckData},
+      ActualReply     :: [megaco_encoder:action_reply()] |
+                         megaco_encoder:error_desc(),
+      AckData         :: term(),
+      SendOptions     :: [SendOption],
+      SendOption      :: {reply_timer, megaco_timer()} |
+                         {send_handle, term()} |
+                         {protocol_version, megaco_encoder:protocol_version()}.
+-callback handle_trans_long_request(ConnHandle, ProtocolVersion, ReqData, Extra) ->
+    Reply when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      ReqData         :: term(),
+      Extra           :: term(),
+      Reply           :: {AckAction, ActualReply} |
+                         {AckAction, ActualReply, SendOptions},
+      AckAction       :: discard_ack |
+                         {handle_ack, AckData} |
+                         {handle_sloppy_ack, AckData},
+      ActualReply     :: [megaco_encoder:action_reply()] |
+                         megaco_encoder:error_desc(),
+      AckData         :: term(),
+      SendOptions     :: [SendOption],
+      SendOption      :: {reply_timer, megaco_timer()} |
+                         {send_handle, term()} |
+                         {protocol_version, megaco_encoder:protocol_version()}.
+
+-callback handle_trans_reply(ConnHandle,
+                             ProtocolVersion,
+                             UserReply,
+                             ReplyData) ->
+    ok when
+      ConnHandle           :: conn_handle(),
+      ProtocolVersion      :: megaco_encoder:protocol_version(),
+      UserReply            :: Success | Failure,
+      ReplyData            :: term(),
+      Success              :: {ok, Result},
+      Result               :: TransactionResult | SegmentResult,
+      TransactionResult    :: [megaco_encoder:action_reply()],
+      SegmentResult        :: {megaco_encoder:segment_no(),
+                               LastSegment,
+                               [megaco_encoder:action_reply()]},
+      Failure              :: {error, Reason} |
+                              {error, ReplyNo, Reason},
+      Reason               :: TransactionReason |
+                              SegmentReason |
+                              UserCancelReason |
+                              SendReason |
+                              OtherReason,
+      TransactionReason    :: megaco_encoder:error_desc(),
+      SegmentReason        :: {megaco_encoder:segment_no(),
+                               LastSegment,
+                               megaco_encoder:error_desc()},
+      OtherReason          :: timeout |
+                              {segment_timeout, MissingSegments} |
+                              exceeded_recv_pending_limit | term(),
+      LastSegment          :: boolean(),
+      MissingSegments      :: [megaco_encoder:segment_no()],
+      UserCancelReason     :: {user_cancel, ReasonForUserCancel},
+      ReasonForUserCancel  :: term(),
+      SendReason           :: SendCancelledReason | SendFailedReason,
+      SendCancelledReason  :: {send_message_cancelled,
+                               ReasonForSendCancel},
+      ReasonForSendCancel  :: term(),
+      SendFailedReason     :: {send_message_failed, ReasonForSendFailure},
+      ReasonForSendFailure :: term(),
+      ReplyNo              :: pos_integer().
+-callback handle_trans_reply(ConnHandle,
+                             ProtocolVersion,
+                             UserReply,
+                             ReplyData,
+                             Extra) ->
+    ok when
+      ConnHandle           :: conn_handle(),
+      ProtocolVersion      :: megaco_encoder:protocol_version(),
+      UserReply            :: Success | Failure,
+      ReplyData            :: term(),
+      Extra                :: term(),
+      Success              :: {ok, Result},
+      Result               :: TransactionResult | SegmentResult,
+      TransactionResult    :: [megaco_encoder:action_reply()],
+      SegmentResult        :: {megaco_encoder:segment_no(),
+                               LastSegment,
+                               [megaco_encoder:action_reply()]},
+      Failure              :: {error, Reason} |
+                              {error, ReplyNo, Reason},
+      Reason               :: TransactionReason |
+                              SegmentReason |
+                              UserCancelReason |
+                              SendReason |
+                              OtherReason,
+      TransactionReason    :: megaco_encoder:error_desc(),
+      SegmentReason        :: {megaco_encoder:segment_no(),
+                               LastSegment,
+                               megaco_encoder:error_desc()},
+      OtherReason          :: timeout |
+                              {segment_timeout, MissingSegments} |
+                              exceeded_recv_pending_limit | term(),
+      LastSegment          :: boolean(),
+      MissingSegments      :: [megaco_encoder:segment_no()],
+      UserCancelReason     :: {user_cancel, ReasonForUserCancel},
+      ReasonForUserCancel  :: term(),
+      SendReason           :: SendCancelledReason | SendFailedReason,
+      SendCancelledReason  :: {send_message_cancelled,
+                               ReasonForSendCancel},
+      ReasonForSendCancel  :: term(),
+      SendFailedReason     :: {send_message_failed, ReasonForSendFailure},
+      ReasonForSendFailure :: term(),
+      ReplyNo              :: pos_integer().
+
+
+-callback handle_trans_ack(ConnHandle,
+                           ProtocolVersion,
+                           AckStatus,
+                           AckData) ->
+    ok when
+      ConnHandle           :: conn_handle(),
+      ProtocolVersion      :: megaco_encoder:protocol_version(),
+      AckStatus            :: ok | {error, Reason},
+      AckData              :: term(),
+      Reason               :: UserCancelReason | SendReason | OtherReason,
+      UserCancelReason     :: {user_cancel, ReasonForUserCancel},
+      ReasonForUserCancel  :: term(),
+      SendReason           :: SendCancelledReason | SendFailedReason,
+      SendCancelledReason  :: {send_message_cancelled, ReasonForSendCancel},
+      ReasonForSendCancel  :: term(),
+      SendFailedReason     :: {send_message_failed, ReasonForSendFailure},
+      ReasonForSendFailure :: term(),
+      OtherReason          :: term().
+-callback handle_trans_ack(ConnHandle,
+                           ProtocolVersion,
+                           AckStatus,
+                           AckData,
+                           Extra) ->
+    ok when
+      ConnHandle           :: conn_handle(),
+      ProtocolVersion      :: megaco_encoder:protocol_version(),
+      AckStatus            :: ok | {error, Reason},
+      AckData              :: term(),
+      Extra                :: term(),
+      Reason               :: UserCancelReason | SendReason | OtherReason,
+      UserCancelReason     :: {user_cancel, ReasonForUserCancel},
+      ReasonForUserCancel  :: term(),
+      SendReason           :: SendCancelledReason | SendFailedReason,
+      SendCancelledReason  :: {send_message_cancelled, ReasonForSendCancel},
+      ReasonForSendCancel  :: term(),
+      SendFailedReason     :: {send_message_failed, ReasonForSendFailure},
+      ReasonForSendFailure :: term(),
+      OtherReason          :: term().
+
+-callback handle_unexpected_trans(ConnHandle, ProtocolVersion, Trans) ->
+    ok when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      Trans           :: megaco_encoder:transaction_pending() |
+                         megaco_encoder:transaction_reply() |
+                         megaco_encoder:transaction_response_ack().
+-callback handle_unexpected_trans(ConnHandle, ProtocolVersion, Trans, Extra) ->
+    ok when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      Trans           :: megaco_encoder:transaction_pending() |
+                         megaco_encoder:transaction_reply() |
+                         megaco_encoder:transaction_response_ack(),
+      Extra           :: term().
+
+-callback handle_trans_request_abort(ConnHandle,
+                                     ProtocolVersion,
+                                     TransNo,
+                                     Pid) ->
+    ok when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      TransNo         :: integer(),
+      Pid             :: undefined | pid().
+-callback handle_trans_request_abort(ConnHandle,
+                                     ProtocolVersion,
+                                     TransNo,
+                                     Pid,
+                                     Extra) ->
+    ok when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      TransNo         :: integer(),
+      Pid             :: undefined | pid(),
+      Extra           :: term().
+
+-callback handle_segment_reply(ConnHandle,
+                               ProtocolVersion,
+                               TransNo,
+                               SegNo,
+                               SegCompl) ->
+    ok when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      TransNo         :: integer(),
+      SegNo           :: integer(),
+      SegCompl        :: asn1_NOVALUE | 'NULL'.
+-callback handle_segment_reply(ConnHandle,
+                               ProtocolVersion,
+                               TransNo,
+                               SegNo,
+                               SegCompl,
+                               Extra) ->
+    ok when
+      ConnHandle      :: conn_handle(),
+      ProtocolVersion :: megaco_encoder:protocol_version(),
+      TransNo         :: integer(),
+      SegNo           :: megaco_encoder:segment_no(),
+      SegCompl        :: asn1_NOVALUE | 'NULL',
+      Extra           :: term().
+
+-optional_callbacks(
+   [
+    %% The actual number of arguments to *all* functions,
+    %% depend of the user_args config option.
+    handle_connect/2,
+    handle_connect/3,
+    handle_disconnect/3,
+    handle_syntax_error/3,
+    handle_syntax_error/4,
+    handle_message_error/3,
+    handle_message_error/4,
+    handle_trans_request/3,
+    handle_trans_request/4,
+    handle_trans_long_request/3,
+    handle_trans_long_request/4,
+    handle_trans_reply/4,
+    handle_trans_reply/5,
+    handle_trans_ack/4,
+    handle_trans_ack/5,
+    handle_unexpected_trans/3,
+    handle_unexpected_trans/4,
+    handle_trans_request_abort/4,
+    handle_trans_request_abort/5,
+    handle_segment_reply/5,
+    handle_segment_reply/6
+   ]).
diff --git a/lib/megaco/src/engine/modules.mk b/lib/megaco/src/engine/modules.mk
index b74a096e40..a7f82c1836 100644
--- a/lib/megaco/src/engine/modules.mk
+++ b/lib/megaco/src/engine/modules.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2016. All Rights Reserved.
+# Copyright Ericsson AB 2001-2019. 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 @@
 BEHAVIOUR_MODULES = \
 	megaco_edist_compress \
 	megaco_encoder \
+	megaco_user \
 	megaco_transport
 
 MODULES = \
diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in
index c37ad4d702..26d2ddd44c 100644
--- a/lib/megaco/src/flex/Makefile.in
+++ b/lib/megaco/src/flex/Makefile.in
@@ -31,25 +31,6 @@ include ../../vsn.mk
 VSN=$(MEGACO_VSN)
 
 # ----------------------------------------------------
-# Dynamic Erlang Driver
-# ----------------------------------------------------
-HAVE_USABLE_OTP_DED_MK = @HAVE_USABLE_OTP_DED_MK@
-
-ifeq ($(HAVE_USABLE_OTP_DED_MK),yes)
-# otp_ded.mk will be used on R13B04 and later
-include $(ERL_TOP)/make/$(TARGET)/otp_ded.mk
-else
-# megacos configure provide the info instead
-DED_CC				= @CC@
-DED__NOWARN_NOTHR_CFLAGS	= @DED_CFLAGS@
-DED_THR_DEFS			= @DED_THR_DEFS@
-DED_LD				= @DED_LD@
-DED_LDFLAGS			= @DED_LDFLAGS@
-DED_INCLUDES			= @DED_INCLUDES@
-DED_EXT				= so
-endif
-
-# ----------------------------------------------------
 # The following variables differ on different systems, we set
 # reasonable defaults, if something different is needed it should
 # be set for that system only.
@@ -57,20 +38,19 @@ endif
 
 FLEX_VSN = $(shell flex --version)
 
-TMP_CFLAGS  = $(DED__NOWARN_NOTHR_CFLAGS) @OTP_EXTRA_FLAGS@
+TMP_CFLAGS  = @DED_BASIC_CFLAGS@ @OTP_EXTRA_FLAGS@
 ifeq ($(TYPE),valgrind)
 CFLAGS = $(subst -O2, , $(TMP_CFLAGS)) -DVALGRIND
 else
 CFLAGS = $(TMP_CFLAGS)
 endif
-CC      = $(DED_CC)
-CFLAGS_MT = $(CFLAGS) $(DED_THR_DEFS)
-LD      = $(DED_LD)
-LDFLAGS = $(DED_LDFLAGS)
+CC      = @DED_CC@
+CFLAGS_MT = $(CFLAGS) @DED_THR_DEFS@
+LD      = @DED_LD@
+LDFLAGS = @DED_LDFLAGS@
 LEX     = @LEX@
 LEXLIB  = @LEXLIB@
 PERL    = @PERL@
-ERLANG_OSTYPE = @ERLANG_OSTYPE@
 
 # Shall we build the flex scanner or not.
 # We assume that it does not exist on windows...
@@ -143,8 +123,8 @@ ifeq ($(findstring win32,$(TARGET)), win32)
 FLEX_SCANNER_SO = 
 SOLIBS = $(FLEX_SCANNER_SO)
 else
-FLEX_SCANNER_SO = $(LIBDIR)/$(STD_DRV).$(DED_EXT) 
-FLEX_SCANNER_MT_SO = $(LIBDIR)/$(MT_DRV).$(DED_EXT) 
+FLEX_SCANNER_SO = $(LIBDIR)/$(STD_DRV).@DED_EXT@ 
+FLEX_SCANNER_MT_SO = $(LIBDIR)/$(MT_DRV).@DED_EXT@ 
 SOLIBS = $(FLEX_SCANNER_SO) $(FLEX_SCANNER_MT_SO) 
 endif
 
@@ -179,7 +159,7 @@ else
 CFLAGS += -DMFS_FLEX_DEBUG=0
 endif
 
-CFLAGS += $(DED_INCLUDES) -I$(ERL_TOP)/erts/$(TARGET) $(DRV_FLAGS) -funroll-loops -Wall
+CFLAGS += @DED_INCLUDE@ -I$(ERL_TOP)/erts/$(TARGET) $(DRV_FLAGS) -funroll-loops -Wall
 
 #ifneq ($(FLEX_VSN),)
 #CFLAGS += -DFLEX_VERSION="$(FLEX_VSN)"
@@ -398,10 +378,10 @@ $(OBJDIR)/$(MT_DRV).o: $(MT_DRV).c
 
 # No need to link with -lfl as we have also defined %option noyywrap - 
 # and having -lfl doesn't work under Darwin for some reason. - Sean
-$(LIBDIR)/$(STD_DRV).$(DED_EXT): $(OBJDIR)/$(STD_DRV).o
+$(LIBDIR)/$(STD_DRV).@DED_EXT@: $(OBJDIR)/$(STD_DRV).o
 	$(V_colon)@echo "linking std driver:"
 	$(V_LD) $(LDFLAGS) -o $@ $<
 
-$(LIBDIR)/$(MT_DRV).$(DED_EXT): $(OBJDIR)/$(MT_DRV).o
+$(LIBDIR)/$(MT_DRV).@DED_EXT@: $(OBJDIR)/$(MT_DRV).o
 	$(V_colon)@echo "linking multi-threaded driver:"
 	$(V_LD) $(LDFLAGS) -o $@ $<
diff --git a/lib/megaco/src/text/megaco_text_gen_prev3a.hrl b/lib/megaco/src/text/megaco_text_gen_prev3a.hrl
index db7507fd27..4f3c83c6c5 100644
--- a/lib/megaco/src/text/megaco_text_gen_prev3a.hrl
+++ b/lib/megaco/src/text/megaco_text_gen_prev3a.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. 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.
@@ -2841,6 +2841,7 @@ enc_integer(Val, _State, Min, Max) ->
 enc_list(List, State) ->
     enc_list(List, State, fun(_S) -> ?COMMA_INDENT(_S) end, false).
 
+-dialyzer({nowarn_function, enc_list/4}). % Future compat
 enc_list([], _State, _SepEncoder, _NeedsSep) ->
     [];
 enc_list([{Elems, ElemEncoder} | Tail], State, SepEncoder, NeedsSep) ->
diff --git a/lib/megaco/src/text/megaco_text_gen_prev3b.hrl b/lib/megaco/src/text/megaco_text_gen_prev3b.hrl
index d5f29025c8..de64f8bbdf 100644
--- a/lib/megaco/src/text/megaco_text_gen_prev3b.hrl
+++ b/lib/megaco/src/text/megaco_text_gen_prev3b.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2019. 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.
@@ -2862,6 +2862,7 @@ enc_integer(Val, _State, Min, Max) ->
 enc_list(List, State) ->
     enc_list(List, State, fun(_S) -> ?COMMA_INDENT(_S) end, false).
 
+-dialyzer({nowarn_function, enc_list/4}). % Future compat
 enc_list([], _State, _SepEncoder, _NeedsSep) ->
     [];
 enc_list([{Elems, ElemEncoder} | Tail], State, SepEncoder, NeedsSep) ->
diff --git a/lib/megaco/src/text/megaco_text_gen_prev3c.hrl b/lib/megaco/src/text/megaco_text_gen_prev3c.hrl
index 6452be25d0..f73318161f 100644
--- a/lib/megaco/src/text/megaco_text_gen_prev3c.hrl
+++ b/lib/megaco/src/text/megaco_text_gen_prev3c.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2019. 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.
@@ -3338,6 +3338,7 @@ enc_integer(Val, _State, Min, Max) ->
 enc_list(List, State) ->
     enc_list(List, State, fun(_S) -> ?COMMA_INDENT(_S) end, false).
 
+-dialyzer({nowarn_function, enc_list/4}). % Future compat
 enc_list([], _State, _SepEncoder, _NeedsSep) ->
     [];
 enc_list([{Elems, ElemEncoder} | Tail], State, SepEncoder, NeedsSep) ->
diff --git a/lib/megaco/src/text/megaco_text_gen_v1.hrl b/lib/megaco/src/text/megaco_text_gen_v1.hrl
index 38a0f6fd6b..6da9ea94ff 100644
--- a/lib/megaco/src/text/megaco_text_gen_v1.hrl
+++ b/lib/megaco/src/text/megaco_text_gen_v1.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2019. 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.
@@ -2303,6 +2303,7 @@ enc_integer(Val, _State, Min, Max) ->
 enc_list(List, State) ->
     enc_list(List, State, fun(_S) -> ?COMMA_INDENT(_S) end, false).
 
+-dialyzer({nowarn_function, enc_list/4}). % Future compat
 enc_list([], _State, _SepEncoder, _NeedsSep) ->
     [];
 enc_list([{Elems, ElemEncoder} | Tail], State, SepEncoder, NeedsSep) ->
diff --git a/lib/megaco/src/text/megaco_text_gen_v2.hrl b/lib/megaco/src/text/megaco_text_gen_v2.hrl
index d9443fb2e1..23afa85800 100644
--- a/lib/megaco/src/text/megaco_text_gen_v2.hrl
+++ b/lib/megaco/src/text/megaco_text_gen_v2.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2019. 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.
@@ -2689,6 +2689,7 @@ enc_integer(Val, _State, Min, Max) ->
 enc_list(List, State) ->
     enc_list(List, State, fun(_S) -> ?COMMA_INDENT(_S) end, false).
 
+-dialyzer({nowarn_function, enc_list/4}). % Future compat
 enc_list([], _State, _SepEncoder, _NeedsSep) ->
     [];
 enc_list([{Elems, ElemEncoder} | Tail], State, SepEncoder, NeedsSep) ->
diff --git a/lib/megaco/src/text/megaco_text_gen_v3.hrl b/lib/megaco/src/text/megaco_text_gen_v3.hrl
index dc1f2b9665..e440ec6651 100644
--- a/lib/megaco/src/text/megaco_text_gen_v3.hrl
+++ b/lib/megaco/src/text/megaco_text_gen_v3.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2019. 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.
@@ -3353,6 +3353,7 @@ enc_integer(Val, _State, Min, Max) ->
 enc_list(List, State) ->
     enc_list(List, State, fun(_S) -> ?COMMA_INDENT(_S) end, false).
 
+-dialyzer({nowarn_function, enc_list/4}). % Future compat
 enc_list([], _State, _SepEncoder, _NeedsSep) ->
     [];
 enc_list([{Elems, ElemEncoder} | Tail], State, SepEncoder, NeedsSep) ->
diff --git a/lib/megaco/src/text/megaco_text_mini_parser.hrl b/lib/megaco/src/text/megaco_text_mini_parser.hrl
index 487958af08..72d8168abf 100644
--- a/lib/megaco/src/text/megaco_text_mini_parser.hrl
+++ b/lib/megaco/src/text/megaco_text_mini_parser.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. 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.
@@ -1167,6 +1167,7 @@ ensure_pathName({_TokenTag, _Line, Text}) ->
 %     #'PropertyParm'{name  = lists:reverse(Name),
 %                     value = [lists:reverse(Value)]}.
 
+-dialyzer({nowarn_function, ensure_uint/3}). % Future compat
 ensure_uint({_TokenTag, Line, Val}, Min, Max) when is_integer(Val) ->
     if
         is_integer(Min) andalso (Val >= Min) ->
diff --git a/lib/megaco/src/text/megaco_text_parser_prev3a.hrl b/lib/megaco/src/text/megaco_text_parser_prev3a.hrl
index edda850c3a..d7e847993a 100644
--- a/lib/megaco/src/text/megaco_text_parser_prev3a.hrl
+++ b/lib/megaco/src/text/megaco_text_parser_prev3a.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. 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.
@@ -1589,6 +1589,7 @@ ensure_uint(Token, Min, Max) ->
 -ifdef(megaco_parser_inline).
 -compile({inline,[{ensure_uint,4}]}).
 -endif.
+-dialyzer({nowarn_function, ensure_uint/4}). % Future compat
 ensure_uint(Val, Min, Max, Line) ->
     if 
 	is_integer(Min) andalso (Val >= Min) ->
diff --git a/lib/megaco/src/text/megaco_text_parser_prev3b.hrl b/lib/megaco/src/text/megaco_text_parser_prev3b.hrl
index 4eaa3733c4..479f963c70 100644
--- a/lib/megaco/src/text/megaco_text_parser_prev3b.hrl
+++ b/lib/megaco/src/text/megaco_text_parser_prev3b.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2019. 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.
@@ -1635,6 +1635,7 @@ ensure_uint(Token, Min, Max) ->
 -ifdef(megaco_parser_inline).
 -compile({inline,[{ensure_uint,4}]}).
 -endif.
+-dialyzer({nowarn_function, ensure_uint/4}). % Future compat
 ensure_uint(Val, Min, Max, Line) ->
     if 
 	is_integer(Min) andalso (Val >= Min) ->
diff --git a/lib/megaco/src/text/megaco_text_parser_prev3c.hrl b/lib/megaco/src/text/megaco_text_parser_prev3c.hrl
index d2faad09d9..3ed9582308 100644
--- a/lib/megaco/src/text/megaco_text_parser_prev3c.hrl
+++ b/lib/megaco/src/text/megaco_text_parser_prev3c.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2019. 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.
@@ -1898,6 +1898,7 @@ ensure_uint(Token, Min, Max) ->
 -ifdef(megaco_parser_inline).
 -compile({inline,[{ensure_uint,4}]}).
 -endif.
+-dialyzer({nowarn_function, ensure_uint/4}). % Future compat
 ensure_uint(Val, Min, Max, Line) ->
     if 
 	is_integer(Min) andalso (Val >= Min) ->
diff --git a/lib/megaco/src/text/megaco_text_parser_v1.hrl b/lib/megaco/src/text/megaco_text_parser_v1.hrl
index f48ac745f0..3a19debba0 100644
--- a/lib/megaco/src/text/megaco_text_parser_v1.hrl
+++ b/lib/megaco/src/text/megaco_text_parser_v1.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2019. 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.
@@ -1337,6 +1337,7 @@ ensure_uint(Token, Min, Max) ->
 -ifdef(megaco_parser_inline).
 -compile({inline,[{ensure_uint,4}]}).
 -endif.
+-dialyzer({nowarn_function, ensure_uint/4}). % Future compat
 ensure_uint(Val, Min, Max, Line) ->
     if 
 	is_integer(Min) andalso (Val >= Min) ->
diff --git a/lib/megaco/src/text/megaco_text_parser_v2.hrl b/lib/megaco/src/text/megaco_text_parser_v2.hrl
index f3c2f69193..270541d111 100644
--- a/lib/megaco/src/text/megaco_text_parser_v2.hrl
+++ b/lib/megaco/src/text/megaco_text_parser_v2.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2019. 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.
@@ -1563,6 +1563,7 @@ ensure_uint(Token, Min, Max) ->
 -ifdef(megaco_parser_inline).
 -compile({inline,[{ensure_uint,4}]}).
 -endif.
+-dialyzer({nowarn_function, ensure_uint/4}). % Future compat
 ensure_uint(Val, Min, Max, Line) ->
     if 
 	is_integer(Min) andalso (Val >= Min) ->
diff --git a/lib/megaco/src/text/megaco_text_parser_v3.hrl b/lib/megaco/src/text/megaco_text_parser_v3.hrl
index 38822e4952..7b8fff2080 100644
--- a/lib/megaco/src/text/megaco_text_parser_v3.hrl
+++ b/lib/megaco/src/text/megaco_text_parser_v3.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2019. 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.
@@ -1920,6 +1920,7 @@ ensure_uint(Token, Min, Max) ->
 -ifdef(megaco_parser_inline).
 -compile({inline,[{ensure_uint,4}]}).
 -endif.
+-dialyzer({nowarn_function, ensure_uint/4}). % Future compat
 ensure_uint(Val, Min, Max, Line) ->
     if 
 	is_integer(Min) andalso (Val >= Min) ->
diff --git a/lib/megaco/test/Makefile b/lib/megaco/test/Makefile
index 4ddd73eea1..b4e31765b8 100644
--- a/lib/megaco/test/Makefile
+++ b/lib/megaco/test/Makefile
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1999-2016. All Rights Reserved.
+# Copyright Ericsson AB 1999-2019. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -102,6 +102,9 @@ endif
 
 ERL_COMPILE_FLAGS += $(MEGACO_ERL_COMPILE_FLAGS)
 
+# We have a behaviour in the test catalog (megaco_test_generator)
+ERL_COMPILE_FLAGS += -pa ../../megaco/test
+
 ERL_PATH = -pa ../../megaco/examples/simple \
            -pa ../../megaco/ebin \
            -pa ../../et/ebin
diff --git a/lib/megaco/test/megaco_SUITE.erl b/lib/megaco/test/megaco_SUITE.erl
index 38590f9fee..f7b8ffe032 100644
--- a/lib/megaco/test/megaco_SUITE.erl
+++ b/lib/megaco/test/megaco_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2019. 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,7 +25,21 @@
 
 -module(megaco_SUITE).
 
--compile(export_all).
+-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,
+
+         t/0, t/1,
+         init/0
+        ]).
 
 -include("megaco_test_lib.hrl").
 -include_lib("megaco/include/megaco.hrl").
@@ -96,6 +110,20 @@ groups() ->
      {flex,           [], [{megaco_flex_test,           all}]}].
 
 init_per_suite(Config) ->
+    io:format("~w:init_per_suite -> entry with"
+	      "~n   Config:     ~p"
+              "~n   OS Type:    ~p"
+              "~n   OS Version: ~s"
+	      "~n", 
+              [?MODULE, 
+               Config, 
+               os:type(), 
+               case os:version() of
+                   {Major, Minor, Release} ->
+                       ?F("~w.~w.~w", [Major, Minor, Release]);
+                   Str when is_list(Str) ->
+                       Str
+               end]),
     Config.
 
 end_per_suite(_Config) ->
diff --git a/lib/megaco/test/megaco_actions_test.erl b/lib/megaco/test/megaco_actions_test.erl
index fcbe4f12fa..498e5c91cb 100644
--- a/lib/megaco/test/megaco_actions_test.erl
+++ b/lib/megaco/test/megaco_actions_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -20,13 +20,30 @@
 
 %%
 %%----------------------------------------------------------------------
-%% Purpose: Verify that it is possible to separatelly encode 
+%% Purpose: Verify that it is possible to separately encode 
 %%          the action requests list. Do this with all codec's
 %%          that supports partial encode.
 %%----------------------------------------------------------------------
 -module(megaco_actions_test).
 
--compile(export_all).
+-export([
+         all/0,
+         groups/0,
+
+         init_per_group/2,
+         end_per_group/2,
+         init_per_testcase/2,
+         end_per_testcase/2,
+
+         t/0, t/1,
+
+         pretty_text/1,
+         flex_pretty_text/1,
+         compact_text/1,
+         flex_compact_text/1,
+         erl_dist/1, 
+         erl_dist_mc/1
+        ]).
 
 -include("megaco_test_lib.hrl").
 -include_lib("megaco/include/megaco.hrl").
@@ -364,9 +381,6 @@ sleep(X) ->
     receive after X -> ok end.
 
 
-error_msg(F,A) -> error_logger:error_msg(F ++ "~n",A).
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 i(F) ->
@@ -376,8 +390,8 @@ i(F, A) ->
     print(info, get(verbosity), "", F, A).
 
 
-d(F) ->
-    d(F, []).
+%% d(F) ->
+%%     d(F, []).
 
 d(F, A) ->
     print(debug, get(verbosity), "DBG: ", F, A).
@@ -391,20 +405,10 @@ print(Severity, Verbosity, P, F, A) ->
     print(printable(Severity,Verbosity), P, F, A).
 
 print(true, P, F, A) ->
-    io:format("~s~p:~s: " ++ F ++ "~n", [P, self(), get(sname) | A]);
+    io:format("*** [~s] ~s ~p ~s ***"
+	      "~n   " ++ F ++ "~n", 
+	      [?FTS(), P, self(), get(sname) | A]);
 print(_, _, _, _) ->
     ok.
 
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-random_init() ->
-    {A,B,C} = now(),
-    random:seed(A,B,C).
-
-random() ->
-    10 * random:uniform(50).
-
-apply_load_timer() ->
-    erlang:send_after(random(), self(), apply_load_timeout).
-
diff --git a/lib/megaco/test/megaco_app_test.erl b/lib/megaco/test/megaco_app_test.erl
index 981d93f5dd..fff2d8c7d4 100644
--- a/lib/megaco/test/megaco_app_test.erl
+++ b/lib/megaco/test/megaco_app_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2019. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -20,29 +20,42 @@
 %%----------------------------------------------------------------------
 %% Purpose: Verify the application specifics of the Megaco application
 %%----------------------------------------------------------------------
+
 -module(megaco_app_test).
 
--compile(export_all).
+-export([
+         all/0,
+
+         app/0,   app/1,
+         appup/0, appup/1
+        ]).
 
 -include_lib("common_test/include/ct.hrl").
 
+
 %%--------------------------------------------------------------------
 %% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
+
 all() -> 
     [
      app, 
      appup
     ].
 
+
 %%--------------------------------------------------------------------
 %% Test Cases --------------------------------------------------------
 %%--------------------------------------------------------------------
+
 app() ->
     [{doc, "Test that the megaco app file is ok"}].
 app(Config) when is_list(Config) ->
     ok = test_server:app_test(megaco).
+
+
 %%--------------------------------------------------------------------
+
 appup() ->
     [{doc, "Test that the megaco appup file is ok"}].
 appup(Config) when is_list(Config) ->
diff --git a/lib/megaco/test/megaco_appup_test.erl b/lib/megaco/test/megaco_appup_test.erl
index 8dc3ad51a0..a06d274844 100644
--- a/lib/megaco/test/megaco_appup_test.erl
+++ b/lib/megaco/test/megaco_appup_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2019. 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,8 +22,23 @@
 %%----------------------------------------------------------------------
 -module(megaco_appup_test).
 
--compile(export_all).
--compile({no_auto_import,[error/1]}).
+-export([
+         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,
+
+         appup_file/1
+        ]).
+
+-compile({no_auto_import, [error/1]}).
 
 -include_lib("common_test/include/ct.hrl").
 -include("megaco_test_lib.hrl").
@@ -76,6 +91,10 @@ end_per_testcase(_Case, Config) when is_list(Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %% Perform a simple check of the appup file
+appup_file(suite) ->
+    [];
+appup_file(doc) ->
+    ["Perform a simple check of the appup file"];
 appup_file(Config) when is_list(Config) ->
     ok = ?t:appup_test(megaco).
 
diff --git a/lib/megaco/test/megaco_call_flow_test.erl b/lib/megaco/test/megaco_call_flow_test.erl
index eb4574862d..03caf705ba 100644
--- a/lib/megaco/test/megaco_call_flow_test.erl
+++ b/lib/megaco/test/megaco_call_flow_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2019. 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,85 @@
 
 -module(megaco_call_flow_test).
 
--compile(export_all).
+-export([
+         all/0,
+         groups/0,
+
+         init_per_group/2,
+         end_per_group/2,
+         init_per_testcase/2,
+         end_per_testcase/2,
+
+         pretty/1,
+         compact/1,
+         pretty_flex/1,
+         compact_flex/1,
+         bin/1,
+         ber/1,
+         per/1,
+         standard_erl/1,
+         compressed_erl/1,
+
+         t/0, t/1
+
+        ]).
+
+-export([
+         msg1/0,   msg1/1,
+         msg2/0,   msg2/1,
+         msg3/0,   msg3/1,
+         msg4/0,   msg4/1,
+         msg5a/0,  msg5a/1,
+         msg5b/0,  msg5b/1,
+         msg6/0,   msg6/1,
+         msg7/0,   msg7/1,
+         msg9/0,   msg9/1,
+         msg10/0,  msg10/1,
+         msg11/0,  msg11/1,
+         msg12/0,  msg12/1,
+         msg13/0,  msg13/1,
+         msg14/0,  msg14/1,
+         msg15/0,  msg15/1,
+         msg16/0,  msg16/1,
+         msg17a/0, msg17a/1,
+         msg17b/0, msg17b/1,
+         msg18a/0, msg18a/1,
+         msg18b/0, msg18b/1,
+         msg18c/0, msg18c/1,
+         msg18d/0, msg18d/1,
+         msg19a/0, msg19a/1,
+         msg19b/0, msg19b/1,
+         msg20/0,  msg20/1,
+         msg21/0,  msg21/1,
+         msg22a/0, msg22a/1,
+         msg22b/0, msg22b/1,
+         msg23a/0, msg23a/1,
+         msg23b/0, msg23b/1
+         
+        ]).
+
+-export([
+         encoders/0,
+         msg_sizes/0,
+         coding_times/0,
+         encoding_times/0,
+         decoding_times/0,
+         coding_times_stat/0,
+         encoding_times_stat/0,
+         decoding_times_stat/0,
+         size_stat/0,
+         gnuplot_gif/0,
+         gnuplot_size_gif/0,
+
+         gen_byte_msg/2,
+         gen_header_file_binary/1,
+         gen_ber_header/0,
+         gen_ber_bin_header/0,
+         gen_per_header/0,
+         single_meter/4,
+         count/2
+        ]).
+
 -include_lib("megaco/include/megaco.hrl").
 -include_lib("megaco/include/megaco_message_v1.hrl").
 -include("megaco_test_lib.hrl").
@@ -53,16 +131,20 @@ init_per_testcase(Case, Config) ->
 end_per_testcase(Case, Config) ->
     megaco_test_lib:end_per_testcase(Case, Config).
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Top test case
 
 all() -> 
-    [{group, text}, {group, binary}].
+    [{group, text}, {group, binary}, {group, erl}].
 
 groups() -> 
-    [{text, [], [pretty, compact]},
-     {flex, [], [pretty_flex, compact_flex]},
-     {binary, [], [bin, ber, per]}].
+    [
+     {text,   [], [pretty, compact]},
+     {flex,   [], [pretty_flex, compact_flex]},
+     {binary, [], [bin, ber, per]},
+     {erl,    [], [standard_erl, compressed_erl]}
+    ].
 
 init_per_group(_GroupName, Config) ->
     Config.
diff --git a/lib/megaco/test/megaco_codec_test.erl b/lib/megaco/test/megaco_codec_test.erl
index 007136f83e..0dfbabcc81 100644
--- a/lib/megaco/test/megaco_codec_test.erl
+++ b/lib/megaco/test/megaco_codec_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2019. 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,7 +25,18 @@
 
 -module(megaco_codec_test).
 
--compile(export_all).
+-export([
+         all/0,
+         groups/0,
+
+         init_per_group/2,
+         end_per_group/2,
+         init_per_testcase/2,
+         end_per_testcase/2,
+
+         t/0, t/1,
+         init/0
+        ]).
 
 -include("megaco_test_lib.hrl").
 -include_lib("megaco/include/megaco.hrl").
diff --git a/lib/megaco/test/megaco_codec_test_lib.erl b/lib/megaco/test/megaco_codec_test_lib.erl
index 6eee5caaaa..7a3d4e6cf8 100644
--- a/lib/megaco/test/megaco_codec_test_lib.erl
+++ b/lib/megaco/test/megaco_codec_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. 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.
@@ -993,15 +993,15 @@ expect_exec([#expect_instruction{description = Desc,
 
 skip({What, Why}) when is_atom(What) andalso is_list(Why) ->
     Reason = lists:flatten(io_lib:format("~p: ~s", [What, Why])),
-    exit({skipped, Reason});
+    ?SKIP(Reason);
 skip({What, Why}) ->
     Reason = lists:flatten(io_lib:format("~p: ~p", [What, Why])),
-    exit({skipped, Reason});
+    ?SKIP(Reason);
 skip(Reason) when is_list(Reason) ->
-    exit({skipped, Reason});
+    ?SKIP(Reason);
 skip(Reason1) ->
     Reason2 = lists:flatten(io_lib:format("~p", [Reason1])),
-    exit({skipped, Reason2}).
+    ?SKIP(Reason2).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/megaco/test/megaco_config_test.erl b/lib/megaco/test/megaco_config_test.erl
index 02e06a722a..d46806927a 100644
--- a/lib/megaco/test/megaco_config_test.erl
+++ b/lib/megaco/test/megaco_config_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2019. 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,7 +25,24 @@
 
 -module(megaco_config_test).
 
--compile(export_all).
+-export([
+         all/0,
+         groups/0,
+
+         init_per_group/2,
+         end_per_group/2,
+         init_per_testcase/2,
+         end_per_testcase/2,
+
+         config/1,
+         transaction_id_counter_mg/1,
+         transaction_id_counter_mgc/1,
+         otp_7216/1,
+         otp_8167/1,
+         otp_8183/1,
+
+         t/0, t/1
+        ]).
 
 -include("megaco_test_lib.hrl").
 -include_lib("megaco/include/megaco.hrl").
@@ -37,6 +54,19 @@ t(Case) -> megaco_test_lib:t({?MODULE, Case}).
 min(M) -> timer:minutes(M).
 
 %% Test server callbacks
+init_per_testcase(Case, Config) when (Case =:= otp_7216) orelse
+                                     (Case =:= otp_8167) orelse
+                                     (Case =:= otp_8183) ->
+    i("try starting megaco_config"),
+    case megaco_config:start_link() of
+        {ok, _} ->
+            C = lists:keydelete(tc_timeout, 1, Config),
+            do_init_per_testcase(Case, [{tc_timeout, min(3)}|C]);
+        {error, Reason} ->
+            i("Failed starting megaco_config: "
+              "~n   ~p", [Reason]),
+            {skip, ?F("Failed starting config: ~p", [Reason])}
+    end;
 init_per_testcase(Case, Config) ->
     C = lists:keydelete(tc_timeout, 1, Config),
     do_init_per_testcase(Case, [{tc_timeout, min(3)}|C]).
@@ -45,6 +75,12 @@ do_init_per_testcase(Case, Config) ->
     process_flag(trap_exit, true),
     megaco_test_lib:init_per_testcase(Case, Config).
 
+end_per_testcase(Case, Config) when (Case =:= otp_7216) orelse
+                                     (Case =:= otp_8167) orelse
+                                     (Case =:= otp_8183) ->
+    (catch megaco_config:stop()),
+    process_flag(trap_exit, false),
+    megaco_test_lib:end_per_testcase(Case, Config);
 end_per_testcase(Case, Config) ->
     process_flag(trap_exit, false),
     megaco_test_lib:end_per_testcase(Case, Config).
@@ -60,14 +96,17 @@ end_per_testcase(Case, Config) ->
 %% Top test case
 
 all() -> 
-    [config, {group, transaction_id_counter},
-     {group, tickets}].
+    [
+     config,
+     {group, transaction_id_counter},
+     {group, tickets}
+    ].
 
 groups() -> 
-    [{transaction_id_counter, [],
-      [transaction_id_counter_mg,
-       transaction_id_counter_mgc]},
-     {tickets, [], [otp_7216, otp_8167, otp_8183]}].
+    [
+     {transaction_id_counter, [], transaction_id_counter_cases()},
+     {tickets,                [], tickets_cases()}
+    ].
 
 init_per_group(_GroupName, Config) ->
     Config.
@@ -75,6 +114,19 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
+transaction_id_counter_cases() ->
+    [
+     transaction_id_counter_mg,
+     transaction_id_counter_mgc
+    ].
+
+tickets_cases() ->
+    [
+     otp_7216,
+     otp_8167,
+     otp_8183
+    ].
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Config test case
@@ -736,9 +788,6 @@ otp_7216(Config) when is_list(Config) ->
     put(tc, otp_7216),
     p("start"),
 
-    p("start the megaco config process"),
-    megaco_config:start_link(),
-
     LocalMid1 = {deviceName, "local-mid-1"},
     %% LocalMid2 = {deviceName, "local-mid-2"},
     RemoteMid1 = {deviceName, "remote-mid-1"},
@@ -859,9 +908,6 @@ otp_8167(Config) when is_list(Config) ->
     put(tc, otp8167),
     p("start"),
 
-    p("start the megaco config process"),
-    megaco_config:start_link(),
-
     LocalMid1  = {deviceName, "local-mid-1"},
     LocalMid2  = {deviceName, "local-mid-2"},
     RemoteMid1 = {deviceName, "remote-mid-1"},
@@ -981,9 +1027,6 @@ otp_8183(Config) when is_list(Config) ->
     put(tc, otp8183),
     p("start"),
 
-    p("start the megaco config process"),
-    megaco_config:start_link(),
-
     LocalMid1  = {deviceName, "local-mid-1"},
     LocalMid2  = {deviceName, "local-mid-2"},
     RemoteMid1 = {deviceName, "remote-mid-1"},
@@ -1122,28 +1165,18 @@ i(F) ->
     i(F, []).
 
 i(F, A) ->
-    print(info, get(verbosity), now(), get(tc), "INF", F, A).
+    print(info, get(verbosity), get(tc), "INF", F, A).
 
 printable(_, debug)   -> true;
 printable(info, info) -> true;
 printable(_,_)        -> false.
 
-print(Severity, Verbosity, Ts, Tc, P, F, A) ->
-    print(printable(Severity,Verbosity), Ts, Tc, P, F, A).
+print(Severity, Verbosity, Tc, P, F, A) ->
+    print(printable(Severity,Verbosity), Tc, P, F, A).
 
-print(true, Ts, Tc, P, F, A) ->
+print(true, Tc, P, F, A) ->
     io:format("*** [~s] ~s ~p ~s:~w ***"
               "~n   " ++ F ++ "~n",
-              [format_timestamp(Ts), P, self(), get(sname), Tc | A]);
-print(_, _, _, _, _, _) ->
+              [?FTS(), P, self(), get(sname), Tc | A]);
+print(_, _, _, _, _) ->
     ok.
-
-format_timestamp({_N1, _N2, N3} = Now) ->
-    {Date, Time}   = calendar:now_to_datetime(Now),
-    {YYYY,MM,DD}   = Date,
-    {Hour,Min,Sec} = Time,
-    FormatDate =
-        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w",
-                      [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),
-    lists:flatten(FormatDate).
-
diff --git a/lib/megaco/test/megaco_digit_map_test.erl b/lib/megaco/test/megaco_digit_map_test.erl
index 998e829b67..e03d38497c 100644
--- a/lib/megaco/test/megaco_digit_map_test.erl
+++ b/lib/megaco/test/megaco_digit_map_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -24,7 +24,27 @@
 %%----------------------------------------------------------------------
 -module(megaco_digit_map_test).
 
--compile(export_all).
+-export([
+         all/0,
+         groups/0,
+
+         init_per_group/2,
+         end_per_group/2,
+         init_per_testcase/2,
+         end_per_testcase/2,
+
+         otp_5750_01/1,
+         otp_5750_02/1,
+         otp_5799_01/1,
+         otp_5826_01/1,
+         otp_5826_02/1,
+         otp_5826_03/1,
+         otp_7449_1/1,
+         otp_7449_2/1,
+
+         t/0, t/1
+        ]).
+
 
 -include("megaco_test_lib.hrl").
 
@@ -44,16 +64,18 @@ end_per_testcase(Case, Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 all() -> 
-    [{group, tickets}].
+    [
+     {group, tickets}
+    ].
 
 groups() -> 
-    [{tickets, [],
-      [{group, otp_5750}, {group, otp_5799},
-       {group, otp_5826}, {group, otp_7449}]},
-     {otp_5750, [], [otp_5750_01, otp_5750_02]},
-     {otp_5799, [], [otp_5799_01]},
-     {otp_5826, [], [otp_5826_01, otp_5826_02, otp_5826_03]},
-     {otp_7449, [], [otp_7449_1, otp_7449_2]}].
+    [
+     {tickets,  [], tickets_cases()},
+     {otp_5750, [], otp_5750_cases()},
+     {otp_5799, [], otp_5799_cases()},
+     {otp_5826, [], otp_5826_cases()},
+     {otp_7449, [], otp_7449_cases()}
+    ].
 
 init_per_group(_GroupName, Config) ->
 	Config.
@@ -62,6 +84,38 @@ end_per_group(_GroupName, Config) ->
 	Config.
 
 
+tickets_cases() ->
+    [
+     {group, otp_5750},
+     {group, otp_5799},
+     {group, otp_5826},
+     {group, otp_7449}
+    ].
+
+otp_5750_cases() ->
+    [
+     otp_5750_01,
+     otp_5750_02
+    ].
+
+otp_5799_cases() ->
+    [
+     otp_5799_01
+    ].
+
+otp_5826_cases() ->
+    [
+     otp_5826_01,
+     otp_5826_02,
+     otp_5826_03
+    ].
+
+otp_7449_cases() ->
+    [
+     otp_7449_1,
+     otp_7449_2
+    ].
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
diff --git a/lib/megaco/test/megaco_examples_test.erl b/lib/megaco/test/megaco_examples_test.erl
index 45a6c5011a..fdf9fe29ff 100644
--- a/lib/megaco/test/megaco_examples_test.erl
+++ b/lib/megaco/test/megaco_examples_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2019. 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,12 +25,27 @@
 
 -module(megaco_examples_test).
 
--compile(export_all).
+-export([
+         all/0,
+         groups/0,
+
+         init_per_group/2,
+         end_per_group/2,
+         init_per_testcase/2,
+         end_per_testcase/2,
+
+         simple/1,
+
+         t/0, t/1
+        ]).
+
 
 -include("megaco_test_lib.hrl").
 -include_lib("megaco/include/megaco.hrl").
 -include_lib("megaco/include/megaco_message_v1.hrl").
 
+-define(LIB, megaco_test_lib).
+
 t()     -> megaco_test_lib:t(?MODULE).
 t(Case) -> megaco_test_lib:t({?MODULE, Case}).
 
@@ -56,9 +71,19 @@ load_examples() ->
 	{error, Reason} ->
 	    {error, Reason};
 	Dir ->
-	    [code:load_abs(filename:join([Dir, examples, simple, M])) || M <- example_modules()]
+	    SimpleDir = filename:join([Dir, examples, simple]),
+	    case code:add_path(SimpleDir) of
+		true ->
+		    ok;
+		{error, What} ->
+		    error_logger:error_msg("failed adding examples path: "
+					   "~n   ~p"
+					   "~n", [What]),
+		    {error, {failed_add_path, What}}
+	    end
     end.
 
+
 purge_examples() ->
     case code:lib_dir(megaco) of
 	{error, Reason} ->
@@ -67,6 +92,7 @@ purge_examples() ->
 	    [code:purge(M) || M <- example_modules()]
     end.
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Top test case
 
@@ -87,94 +113,263 @@ end_per_group(_GroupName, Config) ->
 simple(suite) ->
     [];
 simple(Config) when is_list(Config) ->
-    ?ACQUIRE_NODES(1, Config),
-    d("simple -> proxy start",[]),
-    ProxyPid = megaco_test_lib:proxy_start({?MODULE, ?LINE}),
+    process_flag(trap_exit, true),
+    d("simple -> create node name(s)"),
+    [_Local, MGC, MG] = ?LIB:mk_nodes(3), %% Grrr
+    Nodes = [MGC, MG],
 
-    d("simple -> start megaco",[]),
-    ?VERIFY(ok, megaco:start()),
+    d("simple -> start nodes"),
+    ok = ?LIB:start_nodes(Nodes, ?MODULE, ?LINE),
     
-    d("simple -> start mgc",[]),
-    ?APPLY(ProxyPid, fun() -> megaco_simple_mgc:start() end),
+    MGCId = "MGC",
+    MGId  = "MG",
+
+    d("simple -> MGC proxy start (on ~p)", [MGC]),
+    MGCProxy = megaco_test_lib:proxy_start(MGC, "MGC"),
+    ?SLEEP(1000),
+
+    d("simple -> MG proxy start (on ~p)", [MG]),
+    MGProxy  = megaco_test_lib:proxy_start(MG, "MG"),
+    ?SLEEP(1000),
+
+    MegacoStart       = fun() -> megaco:start() end,
+    MegacoStartVerify =
+	 fun(_, ok)    -> ok;
+	    (Id, Else) -> ?ERROR({failed_starting_megaco, Id, Else})
+	 end,
+
+    d("simple -> start MGC megaco"),
+    exec(MGCProxy, MGCId, MegacoStart,
+	 fun(Res) -> MegacoStartVerify(MGCId, Res) end),
+    %% ?APPLY(MGCProxy, fun() -> ok = megaco:start() end),
+    ?SLEEP(1000),
+    
+    d("simple -> start MG megaco"),
+    exec(MGProxy, MGId, MegacoStart,
+	 fun(Res) -> MegacoStartVerify(MGId, Res) end),
+    %% ?APPLY(MGProxy, fun() -> ok = megaco:start() end),
+    ?SLEEP(1000),
+    
+    d("simple -> start mgc"),
+    start_mgc(MGCProxy),
+    ?SLEEP(1000),
+
+    d("simple -> verify MGC info (no mg)"),
+    info(MGCProxy),
+    ?SLEEP(1000),
+
+    d("simple -> verify MGC system_info(users) (no mg)"),
+    users(MGCProxy),
+    ?SLEEP(1000),
+
+    d("simple -> start mg"),
+    start_mg(MGProxy),
+    ?SLEEP(1000),
+
+    d("simple -> verify MGC info (mg)"),
+    info(MGCProxy),
+    ?SLEEP(1000),
+
+    d("simple -> verify MGC system_info(users) (mg)"),
+    users(MGCProxy),
+    ?SLEEP(1000),
+
+    d("simple -> verify MG info"),
+    info(MGProxy),
+    ?SLEEP(1000),
+
+    d("simple -> verify MG system_info(users)"),
+    users(MGProxy),
+    ?SLEEP(1000),
+
+    d("simple -> stop mgc"),
+    exec(MGCProxy, MGCId,
+	 fun() -> megaco_simple_mgc:stop() end,
+	 fun([_]) -> ok;
+	    (L) when is_list(L) ->
+		 ?ERROR({invalid_users, L});
+	    (X) ->
+		 ?ERROR({invalid_result, X})
+	 end),
+    %% ?VERIFY(5, length()),
+    ?SLEEP(1000),
+
+    d("simple -> verify MGC info (no mgc)"),
+    info(MGCProxy),
+    ?SLEEP(1000),
+
+    d("simple -> verify MG info (no mgc)"),
+    info(MGProxy),
+    ?SLEEP(1000),
+
+    d("simple -> verify MGC system_info(users) (no mgc)",[]),
+    users(MGCProxy),
+    ?SLEEP(1000),
+
+    d("simple -> verify MG system_info(users) (no mgc)",[]),
+    users(MGProxy),
+    ?SLEEP(1000),
+
+    MegacoStop       = fun() -> megaco:stop() end,
+    MegacoStopVerify =
+	 fun(_, ok)    -> ok;
+	    (Id, Else) -> ?ERROR({failed_stop_megaco, Id, Else})
+	 end,
+
+    d("simple -> stop MG megaco",[]),
+    exec(MGProxy, MGId, MegacoStop,
+	 fun(Res) -> MegacoStopVerify(MGId, Res) end),
+    %% ?VERIFY(ok, megaco:stop()),
+    ?SLEEP(1000),
+
+    d("simple -> stop MGC megaco",[]),
+    exec(MGCProxy, MGCId, MegacoStop,
+	 fun(Res) -> MegacoStopVerify(MGCId, Res) end),
+    %% ?VERIFY(ok, megaco:stop()),
+    ?SLEEP(1000),
+
+    d("simple -> kill (exit) MG Proxy: ~p", [MGProxy]),
+    MGProxy ! {stop, self(), normal},
+    receive
+	{'EXIT', MGProxy, _} ->
+	    d("simple -> MG Proxy terminated"),
+	    ok
+    end,
+
+    d("simple -> kill (exit) MGC Proxy: ~p", [MGCProxy]),
+    MGCProxy ! {stop, self(), normal},
+    receive
+	{'EXIT', MGCProxy, _} ->
+	    d("simple -> MGC Proxy terminated"),
+	    ok
+    end,
+
+    d("simple -> stop ~p", [MGC]),
+    slave:stop(MGC),
+
+    d("simple -> stop ~p", [MG]),
+    slave:stop(MG),
+
+    d("simple -> done", []),
+    ok.
+
+
+exec(Proxy, Id, Cmd, Verify) ->
+    ?APPLY(Proxy, Cmd),
+    receive
+	{res, Id, Res} ->
+	    Verify(Res)
+    end.
+
+
+start_mgc(Proxy) ->
+    ?APPLY(Proxy,
+	   fun() ->
+		   try megaco_simple_mgc:start() of
+		       Res ->
+			   Res
+		   catch
+		       C:E:S ->
+			   {error, {{catched, C, E, S}}, code:get_path()}
+		   end
+	   end),
     receive
 	{res, _, {ok, MgcAll}} when is_list(MgcAll) ->
 	    MgcBad = [MgcRes || MgcRes <- MgcAll, element(1, MgcRes) /= ok],
 	    ?VERIFY([], MgcBad),
-	    %% MgcGood = MgcAll -- MgcBad,
-	    %% MgcRecHandles = [MgcRH || {ok, _MgcPort, MgcRH} <- MgcGood],
-
-	    d("simple -> start mg",[]),
-	    ?APPLY(ProxyPid, fun() -> megaco_simple_mg:start() end),
-	    receive
-		{res, _, MgList} when is_list(MgList) andalso (length(MgList) =:= 4) ->
-		    d("simple -> received res: ~p",[MgList]),		    
-		    Verify = 
-			fun({_MgMid, {TransId, Res}}) when TransId =:= 1 ->
-				case Res of
-				    {ok, [AR]} when is_record(AR, 'ActionReply') ->
-					case AR#'ActionReply'.commandReply of
-					    [{serviceChangeReply, SCR}] ->
-						case SCR#'ServiceChangeReply'.serviceChangeResult of
-						    {serviceChangeResParms, MgcMid} when MgcMid /= asn1_NOVALUE ->
-							ok;
-						    Error ->
-							?ERROR(Error)
-						end;
-					    Error ->
-						?ERROR(Error)
-					end;
-				    Error ->
-					?ERROR(Error)
-				end;
-			   (Error) ->
-				?ERROR(Error)
-			end,
-		    lists:map(Verify, MgList);
-		Error ->
-		    ?ERROR(Error)
-	    end;
+	    ok;
 	Error ->
 	    ?ERROR(Error)
-    end,
-    d("simple -> verify info()",[]),
-    info(),
-    d("simple -> verify system_info(users)",[]),
-    users(),
-    d("simple -> stop mgc",[]),
-    ?VERIFY(5, length(megaco_simple_mgc:stop())),
-    d("simple -> verify system_info(users)",[]),
-    users(),
-    d("simple -> stop megaco",[]),
-    ?VERIFY(ok, megaco:stop()),
-    d("simple -> kill (exit) ProxyPid: ~p",[ProxyPid]),
-    exit(ProxyPid, shutdown), % Controlled kill of transport supervisors
+    end.
 
-    ok.
 
+start_mg(Proxy) ->
+    ?APPLY(Proxy, fun() -> 
+			  try megaco_simple_mg:start() of
+			      Res ->
+				  Res
+			  catch
+			      C:E:S ->
+				  {error, {{catched, C, E, S}}, code:get_path()}
+			  end
+		  end),
+    receive
+	{res, _, MGs} when is_list(MGs) andalso (length(MGs) =:= 4) ->
+	    verify_mgs(MGs);
+	Error ->
+	    ?ERROR(Error)
+    end.
 
-info() ->
-    case (catch megaco:info()) of
-	{'EXIT', _} = Error ->
-	    ?ERROR(Error);
-	Info ->
-	    ?LOG("Ok, ~p~n", [Info])
+verify_mgs(MGs) ->
+    Verify = 
+	fun({_MgMid, {TransId, Res}}) when (TransId =:= 1) ->
+		case Res of
+		    {ok, [AR]} when is_record(AR, 'ActionReply') ->
+			case AR#'ActionReply'.commandReply of
+			    [{serviceChangeReply, SCR}] ->
+				case SCR#'ServiceChangeReply'.serviceChangeResult of
+				    {serviceChangeResParms, MgcMid} 
+				      when (MgcMid =/= asn1_NOVALUE) ->
+					ok;
+				    Error ->
+					?ERROR(Error)
+				end;
+			    Error ->
+				?ERROR(Error)
+			end;
+		    Error ->
+			?ERROR(Error)
+		end;
+	   (Error) ->
+		?ERROR(Error)
+	end,
+    lists:map(Verify, MGs).
+    
+    
+info(Proxy) ->
+    ?APPLY(Proxy,
+	   fun() ->
+		   try megaco:info() of
+		       I -> I
+		   catch
+		       C:E:S ->
+			   {error, {C, E, S}}
+		   end
+	   end),
+    receive
+	{res, _, Info} when is_list(Info) ->
+	    ?LOG("Ok, ~p~n", [Info]);
+	{res, _, Error} ->
+	    ?ERROR(Error)
     end.
 
-users() ->
-    case (catch megaco:system_info(users)) of
-	{'EXIT', _} = Error ->
-	    ?ERROR(Error);
-	Users ->
-	    ?LOG("Ok, ~p~n", [Users])
+
+users(Proxy) ->
+    ?APPLY(Proxy,
+	   fun() ->
+		   try megaco:system_info(users) of
+		       I -> I
+		   catch
+		       C:E:S ->
+			   {error, {C, E, S}}
+		   end
+	   end),
+    receive
+	{res, _, Info} when is_list(Info) ->
+	    ?LOG("Ok, ~p~n", [Info]);
+	{res, _, Error} ->
+	    ?ERROR(Error)
     end.
 
 
 
 
-d(F,A) ->
-    d(get(dbg),F,A).
+d(F) ->
+    d(F, []).
+d(F, A) ->
+    d(get(dbg), F, A).
 
-d(true,F,A) ->
-    io:format("DBG: " ++ F ++ "~n",A);
+d(true, F, A) ->
+    io:format("DBG: ~s " ++ F ++ "~n", [?FTS() | A]);
 d(_, _F, _A) ->
     ok.
diff --git a/lib/megaco/test/megaco_flex_test.erl b/lib/megaco/test/megaco_flex_test.erl
index 999d1abc6c..27c46a3b47 100644
--- a/lib/megaco/test/megaco_flex_test.erl
+++ b/lib/megaco/test/megaco_flex_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2019. 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.
@@ -219,18 +219,5 @@ p(F, A) ->
     TC = get(tc),
     io:format("*** [~s] ~p ~w ***"
               "~n   " ++ F ++ "~n",
-              [formated_timestamp(), self(), TC | A]).
-
-formated_timestamp() ->
-    format_timestamp(erlang:now()).
-
-format_timestamp({_N1, _N2, N3} = Now) ->
-    {Date, Time}     = calendar:now_to_datetime(Now),
-    {YYYY, MM, DD}   = Date,
-    {Hour, Min, Sec} = Time,
-    FormatDate =
-        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w",
-                      [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),
-    lists:flatten(FormatDate).
-
+              [?FTS(), self(), TC | A]).
 
diff --git a/lib/megaco/test/megaco_load_test.erl b/lib/megaco/test/megaco_load_test.erl
index 511e5a2e8e..9cce9e70ce 100644
--- a/lib/megaco/test/megaco_load_test.erl
+++ b/lib/megaco/test/megaco_load_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -24,7 +24,33 @@
 %%----------------------------------------------------------------------
 -module(megaco_load_test).
 
--compile(export_all).
+-export([
+         all/0,
+         groups/0,
+
+         init_per_group/2,
+         end_per_group/2,
+         init_per_testcase/2,
+         end_per_testcase/2,
+
+         single_user_light_load/1,
+         single_user_medium_load/1,
+         single_user_heavy_load/1,
+         single_user_extreme_load/1,
+
+         multi_user_light_load/1,
+         multi_user_medium_load/1,
+         multi_user_heavy_load/1,
+         multi_user_extreme_load/1,
+
+         t/0, t/1
+        ]).
+
+-export([
+         do_multi_load/3,
+         multi_load_collector/7
+        ]).
+
 
 -include("megaco_test_lib.hrl").
 -include_lib("megaco/include/megaco.hrl").
@@ -66,8 +92,6 @@
 t()     -> megaco_test_lib:t(?MODULE).
 t(Case) -> megaco_test_lib:t({?MODULE, Case}).
 
-min(M) -> timer:minutes(M).
-
 %% Test server callbacks
 init_per_testcase(single_user_light_load = Case, Config) ->
     C = lists:keydelete(tc_timeout, 1, Config),
@@ -108,15 +132,33 @@ end_per_testcase(Case, Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 all() -> 
-    [single_user_light_load,
-     single_user_medium_load, single_user_heavy_load,
-     single_user_extreme_load, multi_user_light_load,
-     multi_user_medium_load, multi_user_heavy_load,
-     multi_user_extreme_load].
+    [
+     {group, single},
+     {group, multi}
+    ].
 
 groups() -> 
-    [].
-
+    [
+     {single, [], single_cases()},
+     {multi,  [], multi_cases()}
+    ].
+
+single_cases() ->
+    [
+     single_user_light_load,
+     single_user_medium_load,
+     single_user_heavy_load,
+     single_user_extreme_load
+    ].
+
+multi_cases() ->
+    [
+     multi_user_light_load,
+     multi_user_medium_load,
+     multi_user_heavy_load,
+     multi_user_extreme_load
+    ].
+    
 init_per_group(_GroupName, Config) ->
     Config.
 
@@ -326,6 +368,17 @@ load_controller(Config, Fun) when is_list(Config) and is_function(Fun) ->
 	    d("load_controller -> "
 	      "loader [~p] terminated with ok~n", [Loader]),
 	    ok;
+	{'EXIT', Loader, {skipped, {fatal, Reason, File, Line}}} ->
+	    i("load_controller -> "
+	      "loader [~p] terminated with fatal skip"
+	      "~n   Reason: ~p"
+	      "~n   At:     ~p:~p", [Loader, Reason, File, Line]),
+	    ?SKIP(Reason);
+	{'EXIT', Loader, {skipped, Reason}} ->
+	    i("load_controller -> "
+	      "loader [~p] terminated with skip"
+	      "~n   Reason: ~p", [Loader, Reason]),
+	    ?SKIP(Reason);
 	{'EXIT', Loader, Reason} ->
 	    i("load_controller -> "
 	      "loader [~p] terminated with"
@@ -629,14 +682,6 @@ make_mids([MgNode|MgNodes], Mids) ->
 	    exit("Test node must be started with '-sname'")
     end.
 
-tim() ->
-    {A,B,C} = erlang:now(),
-    A*1000000000+B*1000+(C div 1000).
-
-sleep(X) -> receive after X -> ok end.
-
-error_msg(F,A) -> error_logger:error_msg(F ++ "~n",A).
-
 maybe_display_system_info(NumLoaders) when NumLoaders > 50 ->
     [{display_system_info, timer:seconds(2)}];
 maybe_display_system_info(NumLoaders) when NumLoaders > 10 ->
@@ -647,50 +692,32 @@ maybe_display_system_info(_) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+min(M) -> timer:minutes(M).
+
 i(F) ->
     i(F, []).
 
 i(F, A) ->
-    print(info, get(verbosity), now(), get(tc), "INF", F, A).
+    print(info, get(verbosity), get(tc), "INF", F, A).
 
 d(F) ->
     d(F, []).
 
 d(F, A) ->
-    print(debug, get(verbosity), now(), get(tc), "DBG", F, A).
+    print(debug, get(verbosity), get(tc), "DBG", F, A).
 
 printable(_, debug)   -> true;
 printable(info, info) -> true;
 printable(_,_)        -> false.
 
-print(Severity, Verbosity, Ts, Tc, P, F, A) ->
-    print(printable(Severity,Verbosity), Ts, Tc, P, F, A).
+print(Severity, Verbosity, Tc, P, F, A) ->
+    print(printable(Severity,Verbosity), Tc, P, F, A).
 
-print(true, Ts, Tc, P, F, A) ->
+print(true, Tc, P, F, A) ->
     io:format("*** [~s] ~s ~p ~s:~w ***"
               "~n   " ++ F ++ "~n", 
-              [format_timestamp(Ts), P, self(), get(sname), Tc | A]);
-print(_, _, _, _, _, _) ->
+              [?FTS(), P, self(), get(sname), Tc | A]);
+print(_, _, _, _, _) ->
     ok.
 
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-random_init() ->
-    {A,B,C} = now(),
-    random:seed(A,B,C).
-
-random() ->
-    10 * random:uniform(50).
-
-apply_load_timer() ->
-    erlang:send_after(random(), self(), apply_load_timeout).
-
-format_timestamp({_N1, _N2, N3} = Now) ->
-    {Date, Time}   = calendar:now_to_datetime(Now),
-    {YYYY,MM,DD}   = Date,
-    {Hour,Min,Sec} = Time,
-    FormatDate = 
-        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w",
-                      [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),  
-    lists:flatten(FormatDate).
diff --git a/lib/megaco/test/megaco_mess_test.erl b/lib/megaco/test/megaco_mess_test.erl
index 7af6f26bf1..3fd39a9e58 100644
--- a/lib/megaco/test/megaco_mess_test.erl
+++ b/lib/megaco/test/megaco_mess_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2019. 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.
@@ -281,6 +281,8 @@
 
 -define(VERSION, 1).
 
+-define(USER_MOD, megaco_mess_user_test).
+
 -define(TEST_VERBOSITY, debug).
 -define(MGC_VERBOSITY,  debug).
 -define(MG_VERBOSITY,   debug).
@@ -303,26 +305,48 @@
 -define(MG_NOTIF_RAR(Pid), megaco_test_mg:notify_request_and_reply(Pid)).
 
 -define(SEND(Expr), 
-	?VERIFY(ok, megaco_mess_user_test:apply_proxy(fun() -> Expr end))).
+	?VERIFY(ok, ?USER_MOD:apply_proxy(fun() -> Expr end))).
 
 -define(USER(Expected, Reply),
-	megaco_mess_user_test:reply(?MODULE,
-				    ?LINE,
-				    fun(Actual) ->
-				       case ?VERIFY(Expected, Actual) of
-					   Expected   -> {ok, Reply};
-					   UnExpected -> {error, {reply_verify,
-								  ?MODULE,
-								  ?LINE,
-								  UnExpected}}
-				       end
-				    end)).
-	
-%% t()     -> megaco_test_lib:t(?MODULE).
-%% t(Case) -> megaco_test_lib:t({?MODULE, Case}).
-
-
-min(M) -> timer:minutes(M).
+	?USER_MOD:reply(?MODULE,
+                        ?LINE,
+                        fun(Actual) ->
+                                case ?VERIFY(Expected, Actual) of
+                                    Expected   -> {ok, Reply};
+                                    UnExpected -> {error, {reply_verify,
+                                                           ?MODULE,
+                                                           ?LINE,
+                                                           UnExpected}}
+                                end
+                        end)).
+
+%% Some generator (utility) macros
+-define(GM_START(),              megaco_start).
+-define(GM_STOP(),               megaco_stop).
+-define(GM_START_USER(M, RI, C), {megaco_start_user, M, RI, C}).
+-define(GM_START_USER(M, RI),    ?GM_START_USER(M, RI, [])).
+-define(GM_STOP_USER(),          megaco_stop_user).
+-define(GMSI(I),                 {megaco_system_info, I}).
+-define(GMSI_USERS(),            ?GMSI(users)).
+-define(GMSI_CONNS(),            ?GMSI(connections)).
+-define(GMCAST(Reqs, Opts),      {megaco_cast, Reqs, Opts}).
+-define(GMCAST(Reqs),            ?GMCAST(Reqs, [])).
+-define(GMCB(CB, VF),            {megaco_callback, CB, VF}).
+-define(GMCB_CONNECT(VF),        ?GMCB(handle_connect, VF)).
+-define(GMCB_TRANS_REP(VF),      ?GMCB(handle_trans_reply, VF)).
+-define(GMT(T),                  {megaco_trace, T}).
+-define(GMT_ENABLE(),            ?GMT(enable)).
+-define(GMT_DISABLE(),           ?GMT(disable)).
+-define(GD(D),                   {debug, D}).
+-define(GD_ENABLE(),             ?GD(true)).
+-define(GD_DISABLE(),            ?GD(false)).
+-define(GS(T),                   {sleep, T}).
+
+-define(GSND(T, D),              {send, T, D}).
+-define(GERCV(T, VF, TO),        {expect_receive, T, {VF, TO}}).
+
+
+min(M) -> ?MINS(M).
 
 %% Test server callbacks
 init_per_testcase(otp_7189 = Case, Config) ->
@@ -396,8 +420,19 @@ groups() ->
 
 init_per_suite(Config) ->
     io:format("~w:init_per_suite -> entry with"
-	      "~n   Config: ~p"
-	      "~n", [?MODULE, Config]),
+	      "~n   Config:     ~p"
+              "~n   OS Type:    ~p"
+              "~n   OS Version: ~s"
+	      "~n", 
+              [?MODULE, 
+               Config, 
+               os:type(), 
+               case os:version() of
+                   {Major, Minor, Release} ->
+                       ?F("~w.~w.~w", [Major, Minor, Release]);
+                   Str when is_list(Str) ->
+                       Str
+               end]),
     Config.
 
 end_per_suite(_Config) ->
@@ -491,12 +526,12 @@ request_and_reply_plain(suite) ->
 request_and_reply_plain(Config) when is_list(Config) ->
     ?ACQUIRE_NODES(1, Config),
     d("request_and_reply_plain -> start proxy",[]),
-    megaco_mess_user_test:start_proxy(),
+    ?USER_MOD:start_proxy(),
 
     PrelMid = preliminary_mid,
     MgMid   = ipv4_mid(4711),
     MgcMid  = ipv4_mid(),
-    UserMod = megaco_mess_user_test,
+    UserMod = ?USER_MOD,
     d("request_and_reply_plain -> start megaco app",[]),
     ?VERIFY(ok, application:start(megaco)),
     UserConfig = [{user_mod, UserMod}, {send_mod, UserMod},
@@ -564,6 +599,7 @@ request_and_reply_plain(Config) when is_list(Config) ->
     ok.
 
 
+    
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %% OTP-4760
@@ -597,6 +633,7 @@ request_and_no_reply(Config) when is_list(Config) ->
     ET = [{text,tcp}, {text,udp}, {binary,tcp}, {binary,udp}],
     {ok, Mgc} = 
 	?MGC_START(MgcNode, {deviceName, "ctrl"}, ET, [], ?MGC_VERBOSITY),
+    ?SLEEP(?SECONDS(1)),
 
     i("[MG] start"),    
     Mg1Mid = {deviceName, "mg1"},
@@ -621,9 +658,13 @@ request_and_no_reply(Config) when is_list(Config) ->
 		{pending_timer,      PendingTmr},
 		{reply_timer,        ReplyTmr}],
     {ok, Mg1} = ?MG_START(Mg1Node, Mg1Mid, text, tcp, MgConfig, ?MG_VERBOSITY),
+    ?SLEEP(?SECONDS(1)),
     {ok, Mg2} = ?MG_START(Mg2Node, Mg2Mid, text, udp, MgConfig, ?MG_VERBOSITY),
+    ?SLEEP(?SECONDS(1)),
     {ok, Mg3} = ?MG_START(Mg3Node, Mg3Mid, binary, tcp, MgConfig, ?MG_VERBOSITY),
+    ?SLEEP(?SECONDS(1)),
     {ok, Mg4} = ?MG_START(Mg4Node, Mg4Mid, binary, udp, MgConfig, ?MG_VERBOSITY),
+    ?SLEEP(?SECONDS(1)),
 
     d("MG1 user info: ~p", [?MG_USER_INFO(Mg1, all)]),
     d("MG1 conn info: ~p", [?MG_CONN_INFO(Mg1, all)]),
@@ -639,55 +680,68 @@ request_and_no_reply(Config) when is_list(Config) ->
     d("service change result: ~p", [ServChRes1]),
     d("MG1 user info: ~p", [?MG_USER_INFO(Mg1, all)]),
     d("MG1 conn info: ~p", [?MG_CONN_INFO(Mg1, all)]),
+    ?SLEEP(?SECONDS(1)),
 
     i("[MG2] connect to the MGC (service change)"),    
     ServChRes2 = ?MG_SERV_CHANGE(Mg2),
     d("service change result: ~p", [ServChRes2]),
     d("MG2 user info: ~p", [?MG_USER_INFO(Mg2, all)]),
     d("MG2 conn info: ~p", [?MG_CONN_INFO(Mg2, all)]),
+    ?SLEEP(?SECONDS(1)),
 
     i("[MG3] connect to the MGC (service change)"),    
     ServChRes3 = ?MG_SERV_CHANGE(Mg3),
     d("service change result: ~p", [ServChRes3]),
     d("MG3 user info: ~p", [?MG_USER_INFO(Mg3, all)]),
     d("MG3 conn info: ~p", [?MG_CONN_INFO(Mg3, all)]),
+    ?SLEEP(?SECONDS(1)),
 
     i("[MG4] connect to the MGC (service change)"),    
     ServChRes4 = ?MG_SERV_CHANGE(Mg4),
     d("service change result: ~p", [ServChRes4]),
     d("MG4 user info: ~p", [?MG_USER_INFO(Mg4, all)]),
     d("MG4 conn info: ~p", [?MG_CONN_INFO(Mg4, all)]),
+    ?SLEEP(?SECONDS(1)),
 
     d("tell the MGC to ignore requests"),
     ?MGC_REQ_PEND(Mgc, infinity),
+    ?SLEEP(?SECONDS(1)),
 
     d("[MG1] send the notify"),
     ?MG_NOTIF_REQ(Mg1),
+    ?SLEEP(?SECONDS(1)),
 
     d("[MG2] send the notify"),
     ?MG_NOTIF_REQ(Mg2),
+    ?SLEEP(?SECONDS(1)),
 
     d("[MG3] send the notify"),
     ?MG_NOTIF_REQ(Mg3),
+    ?SLEEP(?SECONDS(1)),
 
     d("[MG4] send the notify"),
     ?MG_NOTIF_REQ(Mg4),
+    ?SLEEP(?SECONDS(1)),
 
     d("[MG1] await notify reply"),
     {ok, {_Vsn1, {error, timeout}}} = ?MG_AWAIT_NOTIF_REP(Mg1),
     d("[MG1] received expected reply"),
+    ?SLEEP(?SECONDS(1)),
 
     d("[MG2] await notify reply"),
     {ok, {_Vsn2, {error, timeout}}} = ?MG_AWAIT_NOTIF_REP(Mg2),
     d("[MG2] received expected reply"),
+    ?SLEEP(?SECONDS(1)),
 
     d("[MG3] await notify reply"),
     {ok, {_Vsn3, {error, timeout}}} = ?MG_AWAIT_NOTIF_REP(Mg3),
     d("[MG3] received expected reply"),
+    ?SLEEP(?SECONDS(1)),
 
     d("[MG4] await notify reply"),
     {ok, {_Vsn4, {error, timeout}}} = ?MG_AWAIT_NOTIF_REP(Mg4),
     d("[MG4] received expected reply"),
+    ?SLEEP(?SECONDS(1)),
 
     d("MG1 user info: ~p", [?MG_USER_INFO(Mg1, all)]),
     d("MG1 conn info: ~p", [?MG_CONN_INFO(Mg1, all)]),
@@ -1697,9 +1751,6 @@ rarpaop_mg_event_sequence(Port, EncMod, EncConf) ->
     ScrVerifyFun  = ?rarpaop_mg_verify_service_change_rep_msg_fun(),
     PendVerifyFun = ?rarpaop_mg_verify_pending_msg_fun(TransId),
     NrVerifyFun   = ?rarpaop_mg_verify_notify_rep_msg_fun(TransId, TermId),
-%%     ScrVerifyFun  = rarpaop_mg_verify_service_change_rep_msg_fun(),
-%%     PendVerifyFun = rarpaop_mg_verify_pending_msg_fun(TransId),
-%%     NrVerifyFun   = rarpaop_mg_verify_notify_rep_msg_fun(TransId, TermId),
     EvSeq = [{debug,  true},
              {decode, DecodeFun},
              {encode, EncodeFun},
@@ -2341,9 +2392,6 @@ strar_mg_event_sequence(text, tcp) ->
     ConnectVerify            = ?strar_mg_verify_handle_connect_fun(), 
     ServiceChangeReplyVerify = ?strar_mg_verify_service_change_reply_fun(), 
     NotifyReplyVerify        = ?strar_mg_verify_notify_reply_fun(), 
-%%     ConnectVerify            = strar_mg_verify_handle_connect_fun(), 
-%%     ServiceChangeReplyVerify = strar_mg_verify_service_change_reply_fun(), 
-%%     NotifyReplyVerify        = fun strar_mg_verify_notify_reply/1, 
     EvSeq = [
 	     {debug, true},
 	     megaco_start,
@@ -3419,9 +3467,6 @@ raraa_mg_event_sequence(text, tcp) ->
     ScrVerifyFun = ?raraa_mg_verify_service_change_rep_msg_fun(),
     NrVerifyFun  = ?raraa_mg_verify_notify_rep_msg_fun(TermId, 
 						       TransId, ReqId, CtxId),
-%%     ScrVerifyFun = raraa_mg_verify_service_change_rep_msg_fun(),
-%%     NrVerifyFun = raraa_mg_verify_notify_rep_msg_fun(TermId, 
-%% 						     TransId, ReqId, CtxId),
     EvSeq = [{debug,  true},
              {decode, DecodeFun},
              {encode, EncodeFun},
@@ -4030,9 +4075,6 @@ rarana_mg_event_sequence(text, tcp) ->
     ScrVerifyFun = ?rarana_mg_verify_service_change_rep_msg_fun(),
     NrVerifyFun  = ?rarana_mg_verify_notify_rep_msg_fun(TermId, 
 							TransId, ReqId, CtxId),
-%%     ScrVerifyFun = rarana_mg_verify_service_change_rep_msg_fun(),
-%%     NrVerifyFun  = rarana_mg_verify_notify_rep_msg_fun(TermId, 
-%% 			 			          TransId, ReqId, CtxId),
     EvSeq = [{debug,  true},
              {decode, DecodeFun},
              {encode, EncodeFun},
@@ -4645,9 +4687,6 @@ rarala_mg_event_sequence(text, tcp) ->
     ScrVerifyFun = ?rarala_mg_verify_service_change_rep_msg_fun(),
     NrVerifyFun  = ?rarala_mg_verify_notify_rep_msg_fun(TermId, 
 							TransId, ReqId, CtxId),
-%%     ScrVerifyFun = rarala_mg_verify_service_change_rep_msg_fun(),
-%%     NrVerifyFun  = rarala_mg_verify_notify_rep_msg_fun(TermId, 
-%% 						       TransId, ReqId, CtxId),
     EvSeq = [{debug,  true},
              {decode, DecodeFun},
              {encode, EncodeFun},
@@ -5280,15 +5319,6 @@ trarar_mg_event_sequence(text, tcp) ->
 	?trarar_mg_verify_notify_rep_msg_fun(TermId, 2, 3, 3),
     NrVerifyFun4 = 
 	?trarar_mg_verify_notify_rep_msg_fun(TermId, 2, 4, 4),
-%%     ScrVerifyFun = trarar_mg_verify_service_change_rep_msg_fun(),
-%%     NrVerifyFun1 = 
-%% 	trarar_mg_verify_notify_rep_msg_fun(TermId, 2, 1, 1),
-%%     NrVerifyFun2 = 
-%% 	trarar_mg_verify_notify_rep_msg_fun(TermId, 2, 2, 2),
-%%     NrVerifyFun3 = 
-%% 	trarar_mg_verify_notify_rep_msg_fun(TermId, 2, 3, 3),
-%%     NrVerifyFun4 = 
-%% 	trarar_mg_verify_notify_rep_msg_fun(TermId, 2, 4, 4),
     EvSeq = [{debug,  true},
              {decode, DecodeFun},
              {encode, EncodeFun},
@@ -5965,11 +5995,6 @@ pap_mg_event_sequence(text, tcp) ->
 	?pap_mg_verify_pending_msg_fun(TransId),
     NrVerifyFun = 
 	?pap_mg_verify_notify_rep_msg_fun(TermId, TransId, ReqId, CtxId),
-%%     ScrVerifyFun = pap_mg_verify_service_change_rep_msg_fun(),
-%%     PendingVerifyFun = 
-%% 	pap_mg_verify_pending_msg_fun(TransId),
-%%     NrVerifyFun = 
-%% 	pap_mg_verify_notify_rep_msg_fun(TermId, TransId, ReqId, CtxId),
     EvSeq = [{debug,  true},
              {decode, DecodeFun},
              {encode, EncodeFun},
@@ -6362,10 +6387,6 @@ rapalr_mgc_event_sequence(text, tcp) ->
     NrVerifyFun  = 
 	?rapalr_mgc_verify_notify_req_msg_fun(TermId, TransId, ReqId, CtxId),
     AckVerifyFun = ?rapalr_mgc_verify_trans_ack_msg_fun(TransId),
-%%     ScrVerifyFun     = rapalr_mgc_verify_service_change_req_msg_fun(),
-%%     NrVerifyFun  = 
-%% 	rapalr_mgc_verify_notify_req_msg_fun(TermId, TransId, ReqId, CtxId),
-%%     AckVerifyFun = rapalr_mgc_verify_trans_ack_msg_fun(TransId),
     EvSeq = [{debug,  false},
              {decode, DecodeFun},
              {encode, EncodeFun},
@@ -6848,12 +6869,12 @@ dist(Config) when is_list(Config) ->
     ?SKIP("Needs a re-write..."),
     [_Local, Dist] = ?ACQUIRE_NODES(2, Config),
     d("dist -> start proxy",[]),
-    megaco_mess_user_test:start_proxy(),
+    ?USER_MOD:start_proxy(),
 
     PrelMid = preliminary_mid,
     MgMid   = ipv4_mid(4711),
     MgcMid  = ipv4_mid(),
-    UserMod = megaco_mess_user_test,
+    UserMod = ?USER_MOD,
     d("dist -> start megaco app",[]),
     ?VERIFY(ok, application:start(megaco)),
     UserConfig = [{user_mod, UserMod}, {send_mod, UserMod},
@@ -6959,7 +6980,7 @@ dist(Config) when is_list(Config) ->
     ?RECEIVE([]),
 
     d("dist -> stop proxy",[]),
-    megaco_mess_user_test:stop_proxy(),
+    ?USER_MOD:stop_proxy(),
 
     d("dist -> done", []),
     ok.
@@ -7426,9 +7447,6 @@ otp_5805_mg_event_sequence(text, tcp) ->
 	?otp_5805_mg_verify_service_change_rep_msg_fun(),
     EDVerify = 
 	?otp_5805_mg_verify_error_descriptor_msg_fun(),
-%%     ServiceChangeReplyVerifyFun = 
-%% 	otp_5805_mg_verify_service_change_rep_msg_fun(),
-%%     EDVerify = otp_5805_mg_verify_error_descriptor_msg_fun(),
     MgEvSeq = [{debug,  true},
 	       {decode, DecodeFun},
 	       {encode, EncodeFun},
@@ -7921,8 +7939,6 @@ otp_5881_mgc_event_sequence(text, tcp) ->
     %% Pending = otp_5881_pending_msg(Mid,2),
     ServiceChangeVerifyFun = ?otp_5881_mgc_verify_service_change_req_msg_fun(),
     NotifyReqVerifyFun     = ?otp_5881_mgc_verify_notify_req_msg_fun(),
-%%     ServiceChangeVerifyFun = otp_5881_verify_service_change_req_msg_fun(),
-%%     NotifyReqVerifyFun     = otp_5881_verify_notify_request_fun(),
     MgcEvSeq = [{debug,  true},
 		{decode, DecodeFun},
 		{encode, EncodeFun},
@@ -8193,8 +8209,6 @@ otp_5887_mgc_event_sequence(text, tcp) ->
     NotifyReply = otp_5887_notify_reply_msg(Mid, 2, 0, TermId),
     ServiceChangeVerifyFun = ?otp_5887_mgc_verify_service_change_req_msg_fun(),
     NotifyReqVerifyFun     = ?otp_5887_mgc_verify_notify_req_msg_fun(),
-%%     ServiceChangeVerifyFun = otp_5887_verify_service_change_req_msg_fun(),
-%%     NotifyReqVerifyFun     = otp_5887_verify_notify_request_fun(),
     MgcEvSeq = [{debug,  true},
 		{decode, DecodeFun},
 		{encode, EncodeFun},
@@ -8344,7 +8358,7 @@ otp_6253(Config) when is_list(Config) ->
     MgMid   = ipv4_mid(4711),
 
     ?VERIFY(ok, application:start(megaco)),
-    ?VERIFY(ok,	megaco:start_user(MgMid, [{send_mod, megaco_mess_user_test},
+    ?VERIFY(ok,	megaco:start_user(MgMid, [{send_mod, ?USER_MOD},
 	                                  {request_timer, infinity},
 	                                  {reply_timer, infinity}])),
 
@@ -8650,8 +8664,6 @@ otp_6275_mgc_event_sequence(text, tcp) ->
     NotifyReq = otp_6275_mgc_notify_request_msg(Mid, 2, 1, TermId, 1),
     SCRVerifyFun         = ?otp_6275_mgc_verify_service_change_req_msg_fun(),
     NotifyReplyVerifyFun = ?otp_6275_mgc_verify_notify_rep_msg_fun(),
-%%     SCRVerifyFun         = otp_6275_mgc_verify_service_change_req_fun(),
-%%     NotifyReplyVerifyFun = otp_6275_mgc_verify_notify_reply_fun(),
     MgcEvSeq = 
 	[{debug,  true},
 	 {decode, DecodeFun},
@@ -10997,12 +11009,12 @@ otp_6865_request_and_reply_plain_extra1(Config) when is_list(Config) ->
     ok = megaco_tc_controller:insert(extra_transport_info, ExtraInfo),
 
     d("start proxy",[]),
-    megaco_mess_user_test:start_proxy(),
+    ?USER_MOD:start_proxy(),
 
     PrelMid = preliminary_mid,
     MgMid   = ipv4_mid(4711),
     MgcMid  = ipv4_mid(),
-    UserMod = megaco_mess_user_test,
+    UserMod = ?USER_MOD,
     d("start megaco app",[]),
     ?VERIFY(ok, application:start(megaco)),
     UserConfig = [{user_mod, UserMod}, {send_mod, UserMod},
@@ -12268,15 +12280,15 @@ otp_7189_mg_event_sequence(text, tcp) ->
 	?otp_7189_mg_verify_service_change_rep_msg_fun(),
     NotifyReqVerify = ?otp_7189_mg_verify_notify_req_msg_fun(TermId, TransId, ReqId, CtxId),
     EvSeq = [
-	     {debug,  true},
+	     ?GD_ENABLE(),
 	     {decode, DecodeFun},
 	     {encode, EncodeFun},
 	     {connect, 2944},
-	     {send, "service-change-request", ServiceChangeReq}, 
-	     {expect_receive, "service-change-reply", {ServiceChangeReplyVerifyFun, 2000}}, 
-	     {expect_receive, "notify request", {NotifyReqVerify, 2000}},
-	     {sleep, 100},
-	     {send, "pending", Pending}, 
+	     ?GSND("service-change-request", ServiceChangeReq), 
+	     ?GERCV("service-change-reply", ServiceChangeReplyVerifyFun, ?SECS(5)), 
+	     ?GERCV("notify request",       NotifyReqVerify,             ?SECS(5)),
+	     ?GS(100),
+	     ?GSND("pending", Pending), 
 	     {expect_closed, timer:seconds(120)},
 	     disconnect
 	    ],
@@ -12514,7 +12526,7 @@ otp_7259(Config) when is_list(Config) ->
     megaco_test_generic_transport:incomming_message(Pid, NotifyReply),
 
     d("[MG] await the generator reply"),
-    await_completion([MgId], 5000),
+    await_completion([MgId], 7000),
 
     %% Tell Mg to stop
     i("[MG] stop generator"),
@@ -12814,13 +12826,13 @@ otp_7713(Config) when is_list(Config) ->
     i("starting"),
 
     d("start proxy",[]),
-    megaco_mess_user_test:start_proxy(),
+    ?USER_MOD:start_proxy(),
 
     Extra = otp7713_extra, 
     PrelMid = preliminary_mid,
     MgMid   = ipv4_mid(4711),
     MgcMid  = ipv4_mid(),
-    UserMod = megaco_mess_user_test,
+    UserMod = ?USER_MOD,
     d("start megaco app",[]),
     ?VERIFY(ok, application:start(megaco)),
     UserConfig = [{user_mod, UserMod}, {send_mod, UserMod},
@@ -12936,10 +12948,11 @@ otp_8183_request1(Config) when is_list(Config) ->
     i("wait some before issuing the notify reply (twice)"),
     sleep(500),
 
-    i("send the notify reply, twice times"),
+    i("send the notify reply - twice"),
     NotifyReply = 
 	otp_8183_r1_mgc_notify_reply_msg(MgcMid, TransId2, Cid2, TermId2),
     megaco_test_generic_transport:incomming_message(Pid, NotifyReply),
+    sleep(100), %% This is to "make sure" the events come in the "right" order
     megaco_test_generic_transport:incomming_message(Pid, NotifyReply),
 
     d("await the generator reply"),
@@ -13210,13 +13223,33 @@ otp_8183_r1_mg_verify_notify_rep_fun(Nr) ->
     end.
 -endif.
 
-otp_8183_r1_mg_verify_notify_rep(Nr, 
+otp_8183_r1_mg_verify_notify_rep(
+  Nr, 
   {handle_trans_reply, _CH, ?VERSION, {ok, Nr, [AR]}, _}) ->
     io:format("otp_8183_r1_mg_verify_notify_rep -> ok"
 	      "~n   Nr: ~p"
 	      "~n   AR: ~p"
 	      "~n", [Nr, AR]),
     {ok, AR, ok};
+otp_8183_r1_mg_verify_notify_rep(
+  ExpNr, 
+  {handle_trans_reply, _CH, ?VERSION, {ok, ActNr, [AR]}, _}) ->
+    io:format("otp_8183_r1_mg_verify_notify_rep -> error"
+	      "~n   Expected Nr: ~p"
+	      "~n   Actual Nr:   ~p"
+	      "~n   AR:          ~p"
+	      "~n", [ExpNr, ActNr, AR]),
+    Error = {unexpected_nr, ExpNr, ActNr},
+    {error, Error, ok};
+otp_8183_r1_mg_verify_notify_rep(
+  Nr, 
+  {handle_trans_reply, _CH, ?VERSION, Res, _}) ->
+    io:format("otp_8183_r1_mg_verify_notify_rep -> error"
+	      "~n   Nr:  ~p"
+	      "~n   Res: ~p"
+	      "~n", [Nr, Res]),
+    Error = {unexpected_result, Nr, Res},
+    {error, Error, ok};
 otp_8183_r1_mg_verify_notify_rep(Nr, Else) ->
     io:format("otp_8183_r1_mg_verify_notify_rep -> unknown"
 	      "~n   Nr:   ~p"
@@ -13711,38 +13744,36 @@ i(F) ->
     i(F, []).
 
 i(F, A) ->
-    print(info, get(verbosity), now(), get(tc), "INF", F, A).
+    print(info, "INF", F, A).
 
 
 d(F) ->
     d(F, []).
 
 d(F, A) ->
-    print(debug, get(verbosity), now(), get(tc), "DBG", F, A).
+    print(debug, "DBG", F, A).
 
 
-printable(_, debug)   -> true;
-printable(info, info) -> true;
-printable(_,_)        -> false.
+print(Severity, PRE, FMT, ARGS) ->
+    print(Severity, get(verbosity), erlang:timestamp(), get(tc), PRE, FMT, ARGS).
 
 print(Severity, Verbosity, Ts, Tc, P, F, A) ->
     print(printable(Severity,Verbosity), Ts, Tc, P, F, A).
 
-print(true, Ts, Tc, P, F, A) ->
-    io:format("*** [~s] ~s ~p ~s:~w ***"
-	      "~n   " ++ F ++ "~n", 
-	      [format_timestamp(Ts), P, self(), get(sname), Tc | A]);
+print(true, TS, TC, P, F, A) ->
+    S = ?F("*** [~s] ~s ~p ~s:~w ***"
+           "~n   " ++ F ++ "~n", 
+           [megaco:format_timestamp(TS), P, self(), get(sname), TC | A]),
+    io:format("~s", [S]),
+    io:format(user, "~s", [S]);
 print(_, _, _, _, _, _) ->
     ok.
 
-format_timestamp({_N1, _N2, N3} = Now) ->
-    {Date, Time}   = calendar:now_to_datetime(Now),
-    {YYYY,MM,DD}   = Date,
-    {Hour,Min,Sec} = Time,
-    FormatDate = 
-        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w",
-                      [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),  
-    lists:flatten(FormatDate).
+
+printable(_, debug)   -> true;
+printable(info, info) -> true;
+printable(_,_)        -> false.
+
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13752,13 +13783,6 @@ to(To, Start) ->
 
 %% Time in milli seconds
 mtime() ->
-    {A,B,C} = erlang:now(),
+    {A,B,C} = erlang:timestamp(),
     A*1000000000+B*1000+(C div 1000).
 
-%% random_init() ->
-%%     {A,B,C} = now(),
-%%     random:seed(A,B,C).
-
-%% random() ->
-%%     10 * random:uniform(50).
-
diff --git a/lib/megaco/test/megaco_mess_user_test.erl b/lib/megaco/test/megaco_mess_user_test.erl
index b5a554112e..d2a9c0f290 100644
--- a/lib/megaco/test/megaco_mess_user_test.erl
+++ b/lib/megaco/test/megaco_mess_user_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2019. 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.
@@ -86,13 +86,13 @@ reply(Mod, Line, Fun) when is_function(Fun) ->
 	{?MODULE, Pid, UserCallback} ->
 	    UserReply = Fun(UserCallback),
 	    Pid ! {?MODULE, self(), UserReply},
-	    UserReply;
-	Other ->
-	    megaco_test_lib:error(Other, Mod, Line),
-	    {error, Other}
-%%     after 1000 ->
-%% 	       megaco_test_lib:error(timeout, Mod, Line),
-%% 	       {error, timeout}
+	    UserReply%% ;
+	%% Other ->
+	%%     megaco_test_lib:error(Other, Mod, Line),
+	%%     {error, Other}
+     after 10000 ->
+ 	       megaco_test_lib:error(timeout, Mod, Line),
+ 	       {error, timeout}
     end.
   
 call(UserCallback) ->
diff --git a/lib/megaco/test/megaco_mib_test.erl b/lib/megaco/test/megaco_mib_test.erl
index d644d6bc09..9d1d408f18 100644
--- a/lib/megaco/test/megaco_mib_test.erl
+++ b/lib/megaco/test/megaco_mib_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -24,7 +24,32 @@
 %%----------------------------------------------------------------------
 -module(megaco_mib_test).
 
--compile(export_all).
+-export([
+         t/0, t/1,
+
+         all/0,
+         groups/0,
+         init_per_testcase/2,
+         end_per_testcase/2,
+         init_per_group/2,
+         end_per_group/2,
+
+         plain/1,
+         connect/1,
+         traffic/1,
+
+         mg/3,
+         mgc/3,
+
+         handle_connect/3,
+         handle_disconnect/4,
+         handle_syntax_error/4,
+         handle_message_error/4,
+         handle_trans_request/4,
+         handle_trans_long_request/4,
+         handle_trans_reply/5,
+         handle_trans_ack/5
+        ]).
 
 -include("megaco_test_lib.hrl").
 -include_lib("megaco/include/megaco.hrl").
@@ -54,6 +79,7 @@ t(Case) -> megaco_test_lib:t({?MODULE, Case}).
 
 %% Test server callbacks
 init_per_testcase(Case, Config) ->
+    progress("init_per_testcase -> ~w", [Case]),
     process_flag(trap_exit, true),
     case Case of
 	traffic ->
@@ -65,6 +91,7 @@ init_per_testcase(Case, Config) ->
     end.
 
 end_per_testcase(Case, Config) ->
+    progress("end_per_testcase -> ~w", [Case]),
     process_flag(trap_exit, false),
     megaco_test_lib:end_per_testcase(Case, Config).
 
@@ -197,6 +224,7 @@ connect(Config) when is_list(Config) ->
     put(verbosity, ?TEST_VERBOSITY),
     put(sname,     "TEST"),
     i("connect -> starting"),
+    progress("start nodes"),
     MgcNode = make_node_name(mgc),
     Mg1Node = make_node_name(mg1),
     Mg2Node = make_node_name(mg2),
@@ -209,67 +237,85 @@ connect(Config) when is_list(Config) ->
 
     %% Start the MGC and MGs
     ET = [{text,tcp}, {text,udp}, {binary,tcp}, {binary,udp}],
+    progress("start MGC"),
     {ok, Mgc} = 
 	start_mgc(MgcNode, {deviceName, "ctrl"}, ET, ?MGC_VERBOSITY),
+    progress("start MG1"),
     {ok, Mg1} = 
 	start_mg(Mg1Node,  {deviceName, "mg1"}, text,   tcp, ?MG_VERBOSITY),
+    progress("start MG2"),
     {ok, Mg2} = 
 	start_mg(Mg2Node,  {deviceName, "mg2"}, binary, udp, ?MG_VERBOSITY),
 
     %% Collect the initial statistics (should be zero if anything)
+    progress("collect initial MG1 stats"),
     {ok, Mg1Stats0} = get_stats(Mg1, 1),
     d("connect  -> stats for Mg1: ~n~p", [Mg1Stats0]),
+    progress("collect initial MG2 stats"),
     {ok, Mg2Stats0} = get_stats(Mg2, 1),
     d("connect  -> stats for Mg2: ~n~p", [Mg2Stats0]),
+    progress("collect initial MGC stats"),
     {ok, MgcStats0} = get_stats(Mgc, 1),
     d("connect  -> stats for Mgc: ~n~p", [MgcStats0]),
 
     %% Ask Mg1 to do a service change
+    progress("perform MG1 service change"),
     {ok, Res1} = service_change(Mg1),
     d("connect -> (Mg1) service change result: ~p", [Res1]),
 
     %% Collect the statistics
+    progress("collect MG1 statistics (after service change)"),
     {ok, Mg1Stats1} = get_stats(Mg1, 1),
     d("connect  -> stats for Mg1: ~n~p", [Mg1Stats1]),
+    progress("collect MGC statistics (after MG1 service change)"),
     {ok, MgcStats1} = get_stats(Mgc, 1),
     d("connect  -> stats (1) for Mgc: ~n~p", [MgcStats1]),
     {ok, MgcStats2} = get_stats(Mgc, 2),
     d("connect  -> stats (2) for Mgc: ~n~p", [MgcStats2]),
 
     %% Ask Mg2 to do a service change
+    progress("perform MG2 service change"),
     {ok, Res2} = service_change(Mg2),
     d("connect -> (Mg2) service change result: ~p", [Res2]),
 
     %% Collect the statistics
+    progress("collect MG2 statistics (after service change)"),
     {ok, Mg2Stats1} = get_stats(Mg2, 1),
     d("connect  -> stats for Mg1: ~n~p", [Mg2Stats1]),
+    progress("collect MGC statistics (after MG2 service change)"),
     {ok, MgcStats3} = get_stats(Mgc, 1),
     d("connect  -> stats (1) for Mgc: ~n~p", [MgcStats3]),
     {ok, MgcStats4} = get_stats(Mgc, 2),
     d("connect  -> stats (2) for Mgc: ~n~p", [MgcStats4]),
 
     %% Tell Mg1 to stop
+    progress("stop MG1"),
     stop(Mg1),
 
     %% Collect the statistics
+    progress("collect MGC statistics (after MG1 stop)"),
     {ok, MgcStats5} = get_stats(Mgc, 1),
     d("connect  -> stats (1) for Mgc: ~n~p", [MgcStats5]),
     {ok, MgcStats6} = get_stats(Mgc, 2),
     d("connect  -> stats (2) for Mgc: ~n~p", [MgcStats6]),
 
     %% Tell Mg2 to stop
+    progress("stop MG2"),
     stop(Mg2),
 
     %% Collect the statistics
+    progress("collect MGC statistics (after MG2 stop)"),
     {ok, MgcStats7} = get_stats(Mgc, 1),
     d("connect  -> stats (1) for Mgc: ~n~p", [MgcStats7]),
     {ok, MgcStats8} = get_stats(Mgc, 2),
     d("connect  -> stats (2) for Mgc: ~n~p", [MgcStats8]),
 
     %% Tell Mgc to stop
+    progress("stop MGC"),
     stop(Mgc),
 
     i("connect -> done", []),
+    progress("done"),
     ok.
 
 
@@ -284,6 +330,7 @@ traffic(Config) when is_list(Config) ->
     put(verbosity, ?TEST_VERBOSITY),
     put(sname,     "TEST"),
     i("traffic -> starting"),
+    progress("start nodes"),
     MgcNode = make_node_name(mgc),
     Mg1Node = make_node_name(mg1),
     Mg2Node = make_node_name(mg2),
@@ -302,11 +349,13 @@ traffic(Config) when is_list(Config) ->
 
     %% Start the MGC and MGs
     i("traffic -> start the MGC"),    
+    progress("start MGC"),
     ET = [{text,tcp}, {text,udp}, {binary,tcp}, {binary,udp}],
     {ok, Mgc} = 
 	start_mgc(MgcNode, {deviceName, "ctrl"}, ET, ?MGC_VERBOSITY),
 
     i("traffic -> start and connect the MGs"),    
+    progress("start and connect MGs"),
     MgConf0 = [{Mg1Node, "mg1", text,   tcp},
 	       {Mg2Node, "mg2", text,   udp},
 	       {Mg3Node, "mg3", binary, tcp},
@@ -315,36 +364,42 @@ traffic(Config) when is_list(Config) ->
 
     %% Collect and check the MGs statistics
     i("traffic -> collect and check the MGs stats"),    
+    progress("collect and verify MGs (initial) stats"),
     traffic_verify_mg_stats(MgConf, 1, 1),
 
     %% Collect and check the MGC statistics
-    i("traffic -> collect and check the MGC stats"),    
+    i("traffic -> collect and check the MGC (initial) stats"),    
+    progress("collect and verify MGC stats"),
     {ok, MgcStats1} = get_stats(Mgc, 1),
     d("traffic  -> stats (1) for Mgc: ~n~p~n", [MgcStats1]),
     traffic_verify_mgc_stats(Mgc, 1, 1),
 
 
-    sleep(1000),
+    ?SLEEP(1000),
 
 
     %% And apply some load 
-    i("traffic -> apply traffic load"),
+    i("traffic -> apply traffic load (1)"),
+    progress("apply some load (1)"),
     ok = traffic_apply_load(MgConf),
 
     %% Await completion of load part and the collect traffic
-    i("traffic -> await load competion"),
+    i("traffic -> await load (1) competion"),
+    progress("await load (1) completion"),
     ok = traffic_await_load_complete(MgConf),
 
 
-    sleep(1000),
+    ?SLEEP(1000),
 
 
     i("traffic -> collect and check the MGs statistics"),
+    progress("collect and verify MGs (after load 1) stats"),
     traffic_verify_mg_stats(MgConf, 
 			    1 + ?LOAD_COUNTER_START, 
 			    1 + ?LOAD_COUNTER_START),
 
     i("traffic -> collect and check the MGC statistics"),
+    progress("collect and verify MGC (after load 1) stats"),
     {ok, MgcStats3} = get_stats(Mgc, 1),
     d("traffic  -> stats (1) for Mgc: ~n~p~n", [MgcStats3]),
     traffic_verify_mgc_stats(Mgc, 
@@ -352,60 +407,70 @@ traffic(Config) when is_list(Config) ->
 			     1 + ?LOAD_COUNTER_START),
 
 
-    sleep(1000),
+    ?SLEEP(1000),
 
 
     %% Reset counters
     i("traffic -> reset the MGs statistics"),
+    progress("reset MGs stats"),
     traffic_reset_mg_stats(MgConf),
     i("traffic -> collect and check the MGs statistics"),
+    progress("collect and verify MGs (after reset) stats"),
     traffic_verify_mg_stats(MgConf, 0, 0),
 
     i("traffic -> reset the MGC statistics"),
+    progress("reset MGC stats"),
     traffic_reset_mgc_stats(Mgc),
     i("traffic -> collect and check the MGC statistics"),
+    progress("collect and verify MGC (after reset) stats"),
     traffic_verify_mgc_stats(Mgc, 0, 0),
 
 
-    sleep(1000),
+    ?SLEEP(1000),
 
 
     %% And apply some load 
-    i("traffic -> apply traffic load"),
+    i("traffic -> apply traffic load (2)"),
+    progress("apply some load (2)"),
     ok = traffic_apply_load(MgConf),
 
     %% Await completion of load part and the collect traffic
-    i("traffic -> await load competion"),
+    i("traffic -> await load (2) competion"),
+    progress("await load (2) completion"),
     ok = traffic_await_load_complete(MgConf),
 
 
-    sleep(1000),
+    ?SLEEP(1000),
 
 
     i("traffic -> collect and check the MGs statistics"),
+    progress("collect and verify MGs (after load 2) stats"),
     traffic_verify_mg_stats(MgConf, 
 			    ?LOAD_COUNTER_START, 
 			    ?LOAD_COUNTER_START),
 
     i("traffic -> collect and check the MGC statistics"),
+    progress("collect and verify MGC (after load 2) stats"),
     traffic_verify_mgc_stats(Mgc, 
 			     ?LOAD_COUNTER_START, 
 			     ?LOAD_COUNTER_START),
 
 
-    sleep(1000),
+    ?SLEEP(1000),
 
 
     %% Tell MGs to stop
     i("traffic -> stop the MGs"),
+    progress("stop MGs"),
     traffic_stop_mg(MgConf),
 
 
-    sleep(1000),
+    ?SLEEP(1000),
 
 
     %% Collect the statistics
     i("traffic -> collect the MGC statistics"),
+    progress("collect and verify MGC (after MGs stop) stats"),
     {ok, MgcStats7} = get_stats(Mgc, 1),
     d("traffic -> stats (1) for Mgc: ~n~p~n", [MgcStats7]),
     {ok, MgcStats8} = get_stats(Mgc, 2),
@@ -413,9 +478,11 @@ traffic(Config) when is_list(Config) ->
 
     %% Tell Mgc to stop
     i("traffic -> stop the MGC"),
+    progress("stop MGC"),
     stop(Mgc),
 
     i("traffic -> done", []),
+    progress("done"),
     ok.
 
 
@@ -516,10 +583,15 @@ traffic_verify_get_stats(S, Stats) ->
 traffic_verify_counter(Name, Counter, Counters, Expected) ->
     case lists:keysearch(Counter, 1, Counters) of
 	{value, {Counter, Expected}} ->
+            i("counter ~w verified for ~p", [Counter, Name]),
 	    ok;
 	{value, {Counter, Val}} ->
+            i("counter ~w *not* verified for ~p: "
+              "~n   Expected: ~w"
+              "~n   Actual:   ~w", [Counter, Name, Expected, Val]),
 	    exit({illegal_counter_value, Counter, Val, Expected, Name});
 	false ->
+            i("counter ~w *not* found for ~p", [Counter, Name]),
 	    exit({not_found, Counter, Counters, Name, Expected})
     end.
     
@@ -536,8 +608,7 @@ traffic_connect_mg(Node, Name, Coding, Trans) ->
 
     %% Ask the MGs to do a service change
     {ok, Res} = service_change(Pid),
-    d("traffic_connect_mg -> (~s) service change result: ~p", [Name,Res]),
-
+    d("traffic_connect_mg -> (~s) service change result: ~p", [Name, Res]),
     Pid.
 
 
@@ -549,7 +620,9 @@ traffic_get_mg_stats([], Acc) ->
     lists:reverse(Acc);
 traffic_get_mg_stats([{Name, Pid}|Mgs], Acc) ->
     {ok, Stats} = get_stats(Pid, 1),
-    d("traffic_get_mg_stats -> stats for ~s: ~n~p~n", [Name, Stats]),
+    d("traffic_get_mg_stats -> stats for ~s: "
+      "~n   ~p"
+      "~n", [Name, Stats]),
     traffic_get_mg_stats(Mgs, [{Name, Stats}|Acc]).
 
 
@@ -678,7 +751,7 @@ mgc_init(Config) ->
     d("mgc_init -> entry"),
     Mid = get_conf(local_mid, Config),
     RI  = get_conf(receive_info, Config),
-    d("mgc_init -> start megaco"),
+    i("mgc_init -> start megaco"),
     application:start(megaco),
     d("mgc_init -> start megaco user"),
     megaco:start_user(Mid, []),
@@ -690,7 +763,7 @@ mgc_init(Config) ->
     RH = megaco:user_info(Mid,receive_handle),
     d("mgc_init -> parse receive info"),
     ListenTo = mgc_parse_receive_info(RI, RH),
-    d("mgc_init -> start transports"),
+    i("mgc_init -> start transport(s)"),
     {Tcp, Udp} = mgc_start_transports(ListenTo),
     {Mid, Tcp, Udp}.
     
@@ -875,7 +948,7 @@ mgc_start_transports([{_Port, RH}|_ListenTo], _TcpSup, _UdpSup) ->
 
 
 mgc_start_tcp(RH, Port, undefined) ->
-    d("start tcp transport"),
+    i("start tcp transport"),
     case megaco_tcp:start_transport() of
 	{ok, Sup} ->
 	    mgc_start_tcp(RH, Port, Sup);
@@ -883,7 +956,7 @@ mgc_start_tcp(RH, Port, undefined) ->
 	    throw({error, {failed_starting_tcp_transport, Else}})
     end;
 mgc_start_tcp(RH, Port, Sup) when is_pid(Sup) ->
-    d("tcp listen on ~p", [Port]),
+    i("tcp listen on ~p", [Port]),
     Opts = [{port,           Port}, 
 	    {receive_handle, RH}, 
 	    {tcp_options,    [{nodelay, true}]}],
@@ -903,7 +976,7 @@ mgc_tcp_create_listen(Sup, Opts, MaxN, N, _InitialReason)
 	ok ->
 	    Sup;
 	{error, {could_not_start_listener, {gen_tcp_listen, eaddrinuse} = Reason}} ->
-	    sleep(N * 200),
+	    ?SLEEP(N * 200),
 	    mgc_tcp_create_listen(Sup, Opts, MaxN, N + 1, Reason);
 	{error, Reason} ->
 	    throw({error, {failed_starting_tcp_listen, Reason}});
@@ -913,7 +986,7 @@ mgc_tcp_create_listen(Sup, Opts, MaxN, N, _InitialReason)
 
 
 mgc_start_udp(RH, Port, undefined) ->
-    d("start udp transport"),
+    i("start udp transport"),
     case megaco_udp:start_transport() of
 	{ok, Sup} ->
 	    mgc_start_udp(RH, Port, Sup);
@@ -921,7 +994,7 @@ mgc_start_udp(RH, Port, undefined) ->
 	    throw({error, {failed_starting_udp_transport, Else}})
     end;
 mgc_start_udp(RH, Port, Sup) ->
-    d("open udp ~p", [Port]),
+    i("open udp ~p", [Port]),
     Opts = [{port, Port}, {receive_handle, RH}],
     case megaco_udp:open(Sup, Opts) of
 	{ok, _SendHandle, _ControlPid} ->
@@ -1044,10 +1117,9 @@ mg(Parent, Verbosity, Config) ->
 
 mg_init(Config) ->
     d("mg_init -> entry"),
-    random_init(),
     Mid = get_conf(local_mid, Config),
     RI  = get_conf(receive_info, Config),
-    d("mg_init -> start megaco"),
+    i("mg_init -> start megaco"),
     application:start(megaco),
     d("mg_init -> start megaco user"),
     megaco:start_user(Mid, []),
@@ -1059,7 +1131,7 @@ mg_init(Config) ->
     RH = megaco:user_info(Mid,receive_handle),
     d("mg_init -> parse receive info"),
     {MgcPort,RH1} = mg_parse_receive_info(RI, RH),
-    d("mg_init -> start transport with"),
+    i("mg_init -> start transport(s)"),
     ConnHandle = mg_start_transport(MgcPort, RH1),
     {Mid, ConnHandle}.
 
@@ -1088,12 +1160,12 @@ mg_loop(#mg{state = State} = S) ->
 	%% Give me statistics
 	{statistics, 1, Parent} when S#mg.parent == Parent ->
 	    i("mg_loop(~p) -> got request for statistics 1", [State]),
-	    {ok, Gen} = megaco:get_stats(),
-	    CH = S#mg.conn_handle,
-	    Reason = {statistics, CH}, 
-	    Pid = megaco:conn_info(CH, control_pid),
-	    SendMod    = megaco:conn_info(CH, send_mod),
-	    SendHandle = megaco:conn_info(CH, send_handle),
+	    {ok, Gen}   = megaco:get_stats(),
+	    CH          = S#mg.conn_handle,
+	    Reason      = {statistics, CH}, 
+	    Pid         = megaco:conn_info(CH, control_pid),
+	    SendMod     = megaco:conn_info(CH, send_mod),
+	    SendHandle  = megaco:conn_info(CH, send_handle),
 	    {ok, Trans} = 
 		case SendMod of
 		    megaco_tcp -> megaco_tcp:get_stats(SendHandle);
@@ -1183,16 +1255,6 @@ mg_close_conn(CH) ->
 	SendMod    -> exit(Pid, Reason)
     end.
 
-% display_tuple(T) when tuple(T), size(T) > 0 ->
-%     i("size(T): ~p", [size(T)]),
-%     display_tuple(T,1).
-
-% display_tuple(T,P) when P > size(T) ->
-%     ok;
-% display_tuple(T,P) ->
-%     i("T[~p]: ~p", [P,element(P,T)]),
-%     display_tuple(T,P+1).
-
 
 mg_parse_receive_info(RI, RH) ->
     d("mg_parse_receive_info -> get encoding module"),
@@ -1220,7 +1282,7 @@ mg_start_transport(_, #megaco_receive_handle{send_mod = Mod}) ->
 
 
 mg_start_tcp(MgcPort, RH) ->
-    d("start tcp transport"),
+    i("start tcp transport"),
     case megaco_tcp:start_transport() of
 	{ok, Sup} ->
 	    {ok, LocalHost} = inet:gethostname(),
@@ -1244,16 +1306,19 @@ mg_start_tcp(MgcPort, RH) ->
 
 
 mg_start_udp(MgcPort, RH) ->
-    d("start udp transport"),
+    i("start udp transport"),
     case megaco_udp:start_transport() of
 	{ok, Sup} ->
-	    {ok, LocalHost} = inet:gethostname(),
+            %% Some linux (Ubuntu) has "crap" in their /etc/hosts, that 
+            %% causes problem for us in this case (UDP). So we can't use
+            %% local host. Try instead to "figure out" tha actual address...
+            LocalAddr = which_local_addr(),
 	    Opts = [{port, 0}, {receive_handle, RH}],
 	    case megaco_udp:open(Sup, Opts) of
 		{ok, Handle, ControlPid} ->
                     MgcMid = preliminary_mid,
                     SendHandle = megaco_udp:create_send_handle(Handle, 
-							       LocalHost, 
+							       LocalAddr, 
 							       MgcPort),
 		    {ok, ConnHandle} = 
 			megaco:connect(RH, MgcMid, 
@@ -1528,10 +1593,6 @@ request(Pid, Request) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-sleep(X) ->
-    receive after X -> ok end.
-
-
 error_msg(F,A) -> error_logger:error_msg(F ++ "~n",A).
 
 
@@ -1583,6 +1644,44 @@ get_conf(Key, Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+which_local_addr() ->
+    case inet:getifaddrs() of
+        {ok, IFs} ->
+            which_local_addr(IFs);
+        {error, Reason} ->
+            i("Failed get local address: "
+              "~n   ~p", [Reason]),
+            ?SKIP({failed_get_local_addr, Reason})
+    end.
+
+which_local_addr([]) ->
+    ?SKIP(failed_get_local_addr);
+which_local_addr([{"lo" = _IfName, _IfOpts}|IFs]) ->
+    which_local_addr(IFs);
+which_local_addr([{"br-" ++ _ = _IfName, _IfOpts}|IFs]) ->
+    which_local_addr(IFs);
+which_local_addr([{"docker" ++ _ = _IfName, _IfOpts}|IFs]) ->
+    which_local_addr(IFs);
+which_local_addr([{_IfName, IfOpts}|IFs]) ->
+    case which_local_addr2(IfOpts) of
+        {ok, Addr} ->
+            Addr;
+        error ->
+            which_local_addr(IFs)
+    end.
+
+
+which_local_addr2([]) ->
+    error;
+which_local_addr2([{addr, Addr}|_]) 
+  when (size(Addr) =:= 4) andalso (element(1, Addr) =/= 127) ->
+    {ok, Addr};
+which_local_addr2([_|T]) ->
+    which_local_addr2(T).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 i(F) ->
     i(F, []).
 
@@ -1605,19 +1704,23 @@ print(Severity, Verbosity, P, F, A) ->
     print(printable(Severity,Verbosity), P, F, A).
 
 print(true, P, F, A) ->
-    io:format("~s~p:~s: " ++ F ++ "~n", [P, self(), get(sname) | A]);
+    io:format("~s~p:~s:~s: " ++ F ++ "~n", [P, self(), get(sname), ?FTS() | A]);
 print(_, _, _, _) ->
     ok.
 
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+progress(F) ->
+    progress(F, []).
+
+progress(F, A) ->
+    io:format("~s " ++ F ++ "~n", [?FTS()|A]),
+    io:format(user, "~s " ++ F ++ "~n", [?FTS()|A]).
 
-random_init() ->
-    {A,B,C} = now(),
-    random:seed(A,B,C).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 random() ->
-    10 * random:uniform(50).
+    10 * rand:uniform(50).
 
 apply_load_timer() ->
     erlang:send_after(random(), self(), apply_load_timeout).
diff --git a/lib/megaco/test/megaco_mreq_test.erl b/lib/megaco/test/megaco_mreq_test.erl
index e6a5ed3181..ba20329ab3 100644
--- a/lib/megaco/test/megaco_mreq_test.erl
+++ b/lib/megaco/test/megaco_mreq_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -24,7 +24,21 @@
 %%----------------------------------------------------------------------
 -module(megaco_mreq_test).
 
--compile(export_all).
+-export([
+         all/0,
+         groups/0,
+
+         init_per_group/2,
+         end_per_group/2,
+         init_per_testcase/2,
+         end_per_testcase/2,
+
+         req_and_rep/1,
+         req_and_pending/1,
+         req_and_cancel/1,
+
+         t/0, t/1
+        ]).
 
 -include("megaco_test_lib.hrl").
 -include_lib("megaco/include/megaco.hrl").
@@ -51,16 +65,19 @@
 
 -define(MG_START(Pid, Mid, Enc, Transp, Verb), 
 	megaco_test_mg:start(Pid, Mid, Enc, Transp, Verb)).
--define(MG_STOP(Pid), megaco_test_mg:stop(Pid)).
--define(MG_GET_STATS(Pid, No), megaco_test_mg:get_stats(Pid, No)).
--define(MG_RESET_STATS(Pid), megaco_test_mg:reset_stats(Pid)).
--define(MG_SERV_CHANGE(Pid), megaco_test_mg:service_change(Pid)).
--define(MG_NOTIF_RAR(Pid), megaco_test_mg:notify_request_and_reply(Pid)).
--define(MG_NOTIF_REQ(Pid), megaco_test_mg:notify_request(Pid)).
--define(MG_NOTIF_AR(Pid),  megaco_test_mg:await_notify_reply(Pid)).
--define(MG_CANCEL(Pid,R),  megaco_test_mg:cancel_request(Pid,R)).
+-define(MG_STOP(Pid),                megaco_test_mg:stop(Pid)).
+-define(MG_GET_STATS(Pid),           megaco_test_mg:get_stats(Pid)).
+-define(MG_RESET_STATS(Pid),         megaco_test_mg:reset_stats(Pid)).
+-define(MG_SERV_CHANGE(Pid),         megaco_test_mg:service_change(Pid)).
+-define(MG_NOTIF_RAR(Pid),           megaco_test_mg:notify_request_and_reply(Pid)).
+-define(MG_NOTIF_REQ(Pid),           megaco_test_mg:notify_request(Pid)).
+-define(MG_NOTIF_AR(Pid),            megaco_test_mg:await_notify_reply(Pid)).
+-define(MG_CANCEL(Pid,R),            megaco_test_mg:cancel_request(Pid,R)).
 -define(MG_APPLY_LOAD(Pid,CntStart), megaco_test_mg:apply_load(Pid,CntStart)).
 
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 t()     -> megaco_test_lib:t(?MODULE).
 t(Case) -> megaco_test_lib:t({?MODULE, Case}).
 
@@ -74,6 +91,7 @@ end_per_testcase(Case, Config) ->
     process_flag(trap_exit, false),
     megaco_test_lib:end_per_testcase(Case, Config).
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 all() -> 
@@ -228,7 +246,7 @@ req_and_rep_stop_mg(MGs) ->
 req_and_rep_get_mg_stats([], Acc) ->
     lists:reverse(Acc);
 req_and_rep_get_mg_stats([{Name, Pid}|Mgs], Acc) ->
-    {ok, Stats} = ?MG_GET_STATS(Pid, 1),
+    {ok, Stats} = ?MG_GET_STATS(Pid),
     d("req_and_rep_get_mg_stats -> stats for ~s: ~n~p~n", [Name, Stats]),
     req_and_rep_get_mg_stats(Mgs, [{Name, Stats}|Acc]).
 
@@ -399,11 +417,13 @@ req_and_cancel(Config) when is_list(Config) ->
 
 
 req_and_cancel_analyze_result({ok,{_PV,Res}}) ->
-    d("req_and_cancel -> notify request result: ~n   ~p", [Res]),
+    i("req_and_cancel -> notify request result: ~n   ~p", [Res]),
     req_and_cancel_analyze_result2(Res);
 req_and_cancel_analyze_result(Unexpected) ->
     exit({unexpected_result,Unexpected}).
 
+req_and_cancel_analyze_result2({error,{user_cancel,req_and_cancel}}) ->
+    ok;
 req_and_cancel_analyze_result2([]) ->
     ok;
 req_and_cancel_analyze_result2([{error,{user_cancel,req_and_cancel}}|Res]) ->
@@ -429,9 +449,6 @@ sleep(X) ->
     receive after X -> ok end.
 
 
-error_msg(F,A) -> error_logger:error_msg(F ++ "~n",A).
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 i(F) ->
@@ -441,8 +458,8 @@ i(F, A) ->
     print(info, get(verbosity), "", F, A).
 
 
-d(F) ->
-    d(F, []).
+%% d(F) ->
+%%     d(F, []).
 
 d(F, A) ->
     print(debug, get(verbosity), "DBG: ", F, A).
@@ -456,20 +473,9 @@ print(Severity, Verbosity, P, F, A) ->
     print(printable(Severity,Verbosity), P, F, A).
 
 print(true, P, F, A) ->
-    io:format("~s~p:~s: " ++ F ++ "~n", [P, self(), get(sname) | A]);
+    io:format("*** [~s] ~s ~p ~s ***"
+	      "~n   " ++ F ++ "~n", 
+	      [?FTS(), P, self(), get(sname) | A]);
 print(_, _, _, _) ->
     ok.
 
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-random_init() ->
-    {A,B,C} = now(),
-    random:seed(A,B,C).
-
-random() ->
-    10 * random:uniform(50).
-
-apply_load_timer() ->
-    erlang:send_after(random(), self(), apply_load_timeout).
-
diff --git a/lib/megaco/test/megaco_pending_limit_test.erl b/lib/megaco/test/megaco_pending_limit_test.erl
index ef3b7e51cf..e0c0468d99 100644
--- a/lib/megaco/test/megaco_pending_limit_test.erl
+++ b/lib/megaco/test/megaco_pending_limit_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2019. 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.
@@ -2065,23 +2065,12 @@ await_completion(Ids) ->
 	    ?ERROR({failed, Reply})
     end.
 
-%% await_completion(Ids, Timeout) ->
-%%     case megaco_test_generator_lib:await_completion(Ids, Timeout) of
-%% 	{ok, Reply} ->
-%% 	    d("OK => Reply: ~n~p", [Reply]),
-%% 	    ok;
-%% 	{error, Reply} ->
-%% 	    d("ERROR => Reply: ~n~p", [Reply]),
-%% 	    ?ERROR({failed, Reply})
-%%     end.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 sleep(X) -> receive after X -> ok end.
 
-%% error_msg(F,A) -> error_logger:error_msg(F ++ "~n",A).
-
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -2089,49 +2078,30 @@ i(F) ->
     i(F, []).
 
 i(F, A) ->
-    print(info, get(verbosity), now(), get(tc), "INF", F, A).
+    print(info, get(verbosity), get(tc), "INF", F, A).
 
 
 d(F) ->
     d(F, []).
 
 d(F, A) ->
-    print(debug, get(verbosity), now(), get(tc), "DBG", F, A).
+    print(debug, get(verbosity), get(tc), "DBG", F, A).
 
 
 printable(_, debug)   -> true;
 printable(info, info) -> true;
 printable(_,_)        -> false.
 
-print(Severity, Verbosity, Ts, Tc, P, F, A) ->
-    print(printable(Severity,Verbosity), Ts, Tc, P, F, A).
+print(Severity, Verbosity, Tc, P, F, A) ->
+    print(printable(Severity,Verbosity), Tc, P, F, A).
 
-print(true, Ts, Tc, P, F, A) ->
+print(true, Tc, P, F, A) ->
     io:format("*** [~s] ~s ~p ~s:~w ***"
 	      "~n   " ++ F ++ "~n", 
-	      [format_timestamp(Ts), P, self(), get(sname), Tc | A]);
-print(_, _, _, _, _, _) ->
+	      [?FTS(), P, self(), get(sname), Tc | A]);
+print(_, _, _, _, _) ->
     ok.
 
-%% print(F, A) ->
-%%     io:format("*** [~s] ***"
-%% 	      "~n   " ++ F ++ "~n", 
-%% 	      [format_timestamp(now()) | A]).
-
-format_timestamp(Now) -> megaco:format_timestamp(Now).
-
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%% random_init() ->
-%%     {A,B,C} = now(),
-%%     random:seed(A,B,C).
-
-%% random() ->
-%%     10 * random:uniform(50).
-
-%% apply_load_timer() ->
-%%     erlang:send_after(random(), self(), apply_load_timeout).
-
-
-
diff --git a/lib/megaco/test/megaco_segment_test.erl b/lib/megaco/test/megaco_segment_test.erl
index ddb8b9f06b..47f708a14b 100644
--- a/lib/megaco/test/megaco_segment_test.erl
+++ b/lib/megaco/test/megaco_segment_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2019. 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.
@@ -7718,29 +7718,9 @@ await_completion(Ids) ->
 	    ?ERROR({failed, Reply})
     end.
 
-%% await_completion(Ids, Timeout) ->
-%%     case megaco_test_generator_lib:await_completion(Ids, Timeout) of
-%% 	{ok, Reply} ->
-%% 	    d("OK => Reply: ~n~p", [Reply]),
-%% 	    ok;
-%% 	{error, {OK, ERROR}} ->
-%% 	    d("ERROR => "
-%% 	      "~n   OK:    ~p"
-%% 	      "~n   ERROR: ~p", [OK, ERROR]),
-%% 	    ?ERROR({failed, ERROR});
-%% 	{error, Reply} ->
-%% 	    d("ERROR => Reply: ~n~p", [Reply]),
-%% 	    ?ERROR({failed, Reply})
-%%     end.
-
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%% tim() ->
-%%     {A,B,C} = erlang:now(),
-%%     A*1000000000+B*1000+(C div 1000).
-
-
 make_node_name(Name) ->
     case string:tokens(atom_to_list(node()), [$@]) of
 	[_,Host] ->
@@ -7754,8 +7734,6 @@ make_node_name(Name) ->
 
 sleep(X) -> receive after X -> ok end.
 
-%% error_msg(F,A) -> error_logger:error_msg(F ++ "~n",A).
-
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -7763,44 +7741,31 @@ i(F) ->
     i(F, []).
 
 i(F, A) ->
-    print(info, get(verbosity), now(), get(tc), "INF", F, A).
+    print(info, get(verbosity), get(tc), "INF", F, A).
 
 
 d(F) ->
     d(F, []).
 
 d(F, A) ->
-    print(debug, get(verbosity), now(), get(tc), "DBG", F, A).
+    print(debug, get(verbosity), get(tc), "DBG", F, A).
 
 
 printable(_, debug)   -> true;
 printable(info, info) -> true;
 printable(_,_)        -> false.
 
-print(Severity, Verbosity, Ts, Tc, P, F, A) ->
-    print(printable(Severity,Verbosity), Ts, Tc, P, F, A).
+print(Severity, Verbosity, Tc, P, F, A) ->
+    print(printable(Severity, Verbosity), Tc, P, F, A).
 
-print(true, Ts, Tc, P, F, A) ->
+print(true, Tc, P, F, A) ->
     io:format("*** [~s] ~s ~p ~s:~w ***"
 	      "~n   " ++ F ++ "~n", 
-	      [format_timestamp(Ts), P, self(), get(sname), Tc | A]);
-print(_, _, _, _, _, _) ->
+	      [?FTS(), P, self(), get(sname), Tc | A]);
+print(_, _, _, _, _) ->
     ok.
 
-format_timestamp(Now) -> megaco:format_timestamp(Now).
-
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%% random_init() ->
-%%     {A,B,C} = now(),
-%%     random:seed(A,B,C).
-
-%% random() ->
-%%     10 * random:uniform(50).
-
-%% apply_load_timer() ->
-%%     erlang:send_after(random(), self(), apply_load_timeout).
-
-
 
diff --git a/lib/megaco/test/megaco_tcp_test.erl b/lib/megaco/test/megaco_tcp_test.erl
index a1865ad690..cc66a40f43 100644
--- a/lib/megaco/test/megaco_tcp_test.erl
+++ b/lib/megaco/test/megaco_tcp_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2019. 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.
@@ -117,15 +117,39 @@ end_per_testcase(Case, Config) ->
 %% Test case definitions
 %%======================================================================
 all() -> 
-    [{group, start}, {group, sending}, {group, errors}].
+    [
+     {group, start},
+     {group, sending},
+     {group, errors}
+    ].
 
 groups() -> 
-    [{start, [],
-      [start_normal, start_invalid_opt, start_and_stop]},
-     {sending, [], [sendreceive, block_unblock]},
-     {errors, [],
-      [socket_failure, accept_process, accept_supervisor,
-       connection_supervisor, tcp_server]}].
+    [{start,   [], start_cases()},
+     {sending, [], sending_cases()},
+     {errors,  [], errors_cases()}].
+
+start_cases() ->
+    [
+     start_normal,
+     start_invalid_opt,
+     start_and_stop
+    ].
+
+sending_cases() ->
+    [
+     sendreceive,
+     block_unblock
+    ].
+
+errors_cases() ->
+    [
+     socket_failure,
+     accept_process,
+     accept_supervisor,
+     connection_supervisor,
+     tcp_server
+    ].
+
 
 init_per_group(_GroupName, Config) ->
     Config.
@@ -196,17 +220,8 @@ start_and_stop(Config) when is_list(Config) ->
     Client = client_start_command_handler(ClientNode, ClientCmds),
     p("client command handler started: ~p", [Client]),
 
-    ok = 
-	receive
-	    {listening, Server} ->
-		p("received listening message from server [~p] => "
-		  "send continue to client [~p]~n", [Server, Client]),
-		Client ! {continue, self()},
-		ok
-	after 5000 ->
-		{error, server_timeout}
-	end,
-    
+    await_server_listening(Server, Client),
+
     await_command_handler_completion([Server, Client], timer:seconds(20)),
     p("done"),
     ok.
@@ -335,16 +350,7 @@ sendreceive(Config) when is_list(Config) ->
     Client = client_start_command_handler(ClientNode, ClientCmds),
     p("client command handler started: ~p", [Client]),
 
-    ok = 
-	receive
-	    {listening, Server} ->
-		p("received listening message from server [~p] => "
-		  "send continue to client [~p]~n", [Server, Client]),
-		Client ! {continue, self()},
-		ok
-	after 5000 ->
-		{error, server_timeout}
-	end,
+    await_server_listening(Server, Client),
     
     await_command_handler_completion([Server, Client], timer:seconds(20)),
     p("done"),
@@ -544,27 +550,9 @@ block_unblock(Config) when is_list(Config) ->
     Client = client_start_command_handler(ClientNode, ClientCmds),
     p("client command handler started: ~p", [Client]),
 
-    ok = 
-	receive
-	    {listening, Server} ->
-		p("received listening message from server [~p] => "
-		  "send continue to client [~p]~n", [Server, Client]),
-		Client ! {continue, self()},
-		ok
-	after 5000 ->
-		{error, server_timeout}
-	end,
-
-    ok = 
-	receive
-	    {blocked, Client} ->
-		p("received blocked message from client [~p] => "
-		  "send continue to server [~p]~n", [Client, Server]),
-		Server ! {continue, self()},
-		ok
-	after 5000 ->
-		{error, timeout}
-	end,
+    await_server_listening(Server, Client),
+
+    await_client_blocked(Server, Client),
 
     await_command_handler_completion([Server, Client], timer:seconds(30)),
     p("done"),
@@ -908,6 +896,42 @@ process_received_message(ReceiveHandle, ControlPid, SendHandle, BinMsg)
 %% Internal functions
 %%======================================================================
 
+await_server_listening(Server, Client) ->
+    receive
+        {listening, Server} ->
+            p("received listening message from server [~p] => "
+              "send continue to client [~p]"
+              "~n", [Server, Client]),
+            Client ! {continue, self()},
+            ok
+    after 5000 ->
+            %% There is no normal reason why this should take any time.
+            %% Normally, this takes a few milli seconds. So, if we are not
+            %% up and running after 5 seconds, we give up and skip!!
+            exit(Server, kill),
+            exit(Client, kill),
+            ?SKIP("Server timeout (listen)")
+    end.
+
+
+await_client_blocked(Server, Client) ->
+    receive
+        {blocked, Client} ->
+            p("received blocked message from client [~p] => "
+              "send continue to server [~p]~n", [Client, Server]),
+            Server ! {continue, self()},
+            ok
+    after 5000 ->
+            %% There is no normal reason why this should take any time.
+            %% Normally, this takes a few milli seconds. So, if we are not
+            %% up and running after 5 seconds, we give up and skip!!
+            exit(Client, kill),
+            exit(Server, kill),
+            ?SKIP("Client timeout (blocked)")
+    end.
+
+    
+
 %% -------  Server command handler and utility functions ----------
 
 server_start_command_handler(Node, Commands) ->
@@ -1214,23 +1238,14 @@ p(F, A) ->
 p(S, F, A) when is_list(S) ->
     io:format("*** [~s] ~p ~s ***" 
 	      "~n   " ++ F ++ "~n", 
-	      [format_timestamp(now()), self(), S | A]);
+	      [?FTS(), self(), S | A]);
 p(_S, F, A) ->
     io:format("*** [~s] ~p ~s *** "
 	      "~n   " ++ F ++ "~n", 
-	      [format_timestamp(now()), self(), "undefined" | A]).
+	      [?FTS(), self(), "undefined" | A]).
 
 
 ms() ->
-    {A,B,C} = erlang:now(),
-    A*1000000000+B*1000+(C div 1000).
-    
+    erlang:monotonic_time(milli_seconds).
+
 
-format_timestamp({_N1, _N2, N3} = Now) ->
-    {Date, Time}   = calendar:now_to_datetime(Now),
-    {YYYY,MM,DD}   = Date,
-    {Hour,Min,Sec} = Time,
-    FormatDate =
-        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w",
-                      [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),
-    lists:flatten(FormatDate).
diff --git a/lib/megaco/test/megaco_test_deliver.erl b/lib/megaco/test/megaco_test_deliver.erl
index 78033f0e36..c042d9c9a7 100644
--- a/lib/megaco/test/megaco_test_deliver.erl
+++ b/lib/megaco/test/megaco_test_deliver.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2019. 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.
@@ -186,4 +186,4 @@ i(F) ->
     i(F, []).
 
 i(F, A) ->
-    io:format("~p ~w:" ++ F ++ "~n", [self(), ?MODULE | A]).
+    io:format("*** [~s] ~p ~w:" ++ F ++ "~n", [?FTS(), self(), ?MODULE | A]).
diff --git a/lib/megaco/test/megaco_test_generator.erl b/lib/megaco/test/megaco_test_generator.erl
index 63f66bda07..8ea7f5ddf7 100644
--- a/lib/megaco/test/megaco_test_generator.erl
+++ b/lib/megaco/test/megaco_test_generator.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2019. 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,7 +47,6 @@
 	 print/3, print/4
 	]).
 
--export([behaviour_info/1]).
 
 %% Internal exports
 -export([start/4]).
@@ -65,6 +64,7 @@
 
 
 -include_lib("megaco/include/megaco.hrl").
+-include("megaco_test_lib.hrl").
 
 
 %%----------------------------------------------------------------------
@@ -90,15 +90,32 @@
 %%%  API
 %%%=========================================================================
 
-behaviour_info(callbacks) ->
-    [
-     {init,         1}, 
-     {handle_parse, 2},
-     {handle_exec,  2},
-     {terminate,    2}
-    ];
-behaviour_info(_Other) ->
-    undefined.
+-callback init(Args) -> {ok, State} | {error, Reason} when
+      Args :: term(),
+      State :: term(),
+      Reason :: term().
+
+-callback handle_parse(Instruction, State) -> 
+    {ok, NewInstruction, NewState} |
+    {error, Reason} when
+      Instruction    :: term(),
+      State          :: term(),
+      NewInstruction :: term(),
+      NewState       :: term(),
+      Reason         :: term().
+
+-callback handle_exec(Instruction, State) -> 
+    {ok, NewState} |
+    {error, Reason} when
+      Instruction :: term(),
+      State       :: term(),
+      NewState    :: term(),
+      Reason      :: term().
+
+-callback terminate(Reason, State) -> 
+    megaco:void() when
+      Reason :: term(),
+      State :: term().
 
 
 %%----------------------------------------------------------------------
@@ -533,22 +550,13 @@ print(P, F, A) ->
 print([], undefined, F, A) ->
     io:format("*** [~s] ~p *** " ++ 
 	      "~n   " ++ F ++ "~n", 
-	      [format_timestamp(now()),self()|A]);
+	      [?FTS(), self() | A]);
 print(P, undefined, F, A) ->
     io:format("*** [~s] ~p ~s *** " ++ 
 	      "~n   " ++ F ++ "~n", 
-	      [format_timestamp(now()),self(),P|A]);
+	      [?FTS(), self(), P | A]);
 print(P, N, F, A) ->
     io:format("*** [~s] ~p ~s~s *** " ++ 
 	      "~n   " ++ F ++ "~n", 
-	      [format_timestamp(now()),self(),N,P|A]).
-
+	      [?FTS(), self(), N, P | A]).
 
-format_timestamp({_N1, _N2, N3} = Now) ->
-    {Date, Time}     = calendar:now_to_datetime(Now),
-    {YYYY, MM, DD}   = Date,
-    {Hour, Min, Sec} = Time,
-    FormatDate = 
-        io_lib:format("~.4w-~.2.0w-~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w",
-                      [YYYY, MM, DD, Hour, Min, Sec, round(N3/1000)]),  
-    lists:flatten(FormatDate).
diff --git a/lib/megaco/test/megaco_test_generic_transport.erl b/lib/megaco/test/megaco_test_generic_transport.erl
index 3185e4c6b6..cd387f748a 100644
--- a/lib/megaco/test/megaco_test_generic_transport.erl
+++ b/lib/megaco/test/megaco_test_generic_transport.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2019. 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.
@@ -59,7 +59,7 @@
 		receive_handle}).
 
 -include_lib("megaco/include/megaco.hrl").
-%% -include("megaco_test_lib.hrl").
+-include("megaco_test_lib.hrl").
 -define(SERVER, ?MODULE).
 
 
@@ -335,21 +335,11 @@ d(F) ->
     d(F, []).
 
 d(F, A) ->
-    print(now(), F, A).
+    print(F, A).
 
 
-print(Ts, F, A) ->
+print(F, A) ->
     io:format("*** [~s] GENERIC TRANSPORT [~p] ***"
 	      "~n   " ++ F ++ "~n", 
-	      [format_timestamp(Ts), self() | A]).
-
-format_timestamp({_N1, _N2, N3} = Now) ->
-    {Date, Time}   = calendar:now_to_datetime(Now),
-    {YYYY,MM,DD}   = Date,
-    {Hour,Min,Sec} = Time,
-    FormatDate = 
-        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w",
-                      [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),  
-    lists:flatten(FormatDate).
-
+	      [?FTS(), self() | A]).
 
diff --git a/lib/megaco/test/megaco_test_lib.erl b/lib/megaco/test/megaco_test_lib.erl
index 3934a3a957..7c8c287e7c 100644
--- a/lib/megaco/test/megaco_test_lib.erl
+++ b/lib/megaco/test/megaco_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2019. 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,7 +26,47 @@
 
 -module(megaco_test_lib).
 
--compile(export_all).
+%% -compile(export_all).
+
+-export([
+         log/4,
+         error/3,
+
+         sleep/1,
+         hours/1, minutes/1, seconds/1,
+         formated_timestamp/0, format_timestamp/1,
+
+         skip/3,
+         non_pc_tc_maybe_skip/4,
+         os_based_skip/1,
+
+         flush/0,
+         still_alive/1,
+         watchdog/2,
+
+         display_alloc_info/0,
+         display_system_info/1, display_system_info/2, display_system_info/3,
+
+         tickets/1,
+         prepare_test_case/5,
+
+         t/1,
+         groups/1,
+         init_suite/2,
+         end_suite/2,
+         init_group/3,
+         end_group/3,
+         t/2,
+         init_per_testcase/2,
+         end_per_testcase/2,
+
+         proxy_start/1, proxy_start/2,
+
+         mk_nodes/1,
+         start_nodes/3
+        ]).
+
+-export([do_eval/4, proxy_init/2]).
 
 -include("megaco_test_lib.hrl").
 
@@ -53,6 +93,13 @@ minutes(N) -> trunc(N * 1000 * 60).
 seconds(N) -> trunc(N * 1000).
 
 
+formated_timestamp() ->
+    format_timestamp(os:timestamp()).
+
+format_timestamp(TS) ->
+    megaco:format_timestamp(TS).
+
+
 %% ----------------------------------------------------------------
 %% Conditional skip of testcases
 %%
@@ -271,9 +318,9 @@ t({Mod, {group, Name} = Group, Groups}, Config)
 			      [Name, Error]),
 		    [{failed, {Mod, Group}, Error}]
 	    catch
-		exit:{skipped, SkipReason} ->
+		exit:{skip, SkipReason} ->
 		    io:format(" => skipping group: ~p~n", [SkipReason]),
-		    [{skipped, {Mod, Group}, SkipReason, 0}];
+		    [{skip, {Mod, Group}, SkipReason, 0}];
 		error:undef ->
 		    [t({Mod, Case, Groups}, Config) || 
 			      Case <- GroupsAndCases];
@@ -336,9 +383,9 @@ t(Mod, Config) when is_atom(Mod) ->
 		    io:format(" => suite init failed: ~p~n", [Error]),
 		    [{failed, {Mod, init_per_suite}, Error}]
 	    catch 
-		exit:{skipped, SkipReason} ->
+		exit:{skip, SkipReason} ->
 		    io:format(" => skipping suite: ~p~n", [SkipReason]),
-		    [{skipped, {Mod, init_per_suite}, SkipReason, 0}];
+		    [{skip, {Mod, init_per_suite}, SkipReason, 0}];
 		error:undef ->
 		    [t({Mod, Case, Groups}, Config) || Case <- Cases];
 		T:E ->
@@ -367,7 +414,7 @@ eval(Mod, Fun, Config) ->
     Flag = process_flag(trap_exit, true),
     put(megaco_test_server, true),
     Config2 = Mod:init_per_testcase(Fun, Config),
-    Pid = spawn_link(?MODULE, do_eval, [self(), Mod, Fun, Config2]),
+    Pid = spawn_link(fun() -> do_eval(self(), Mod, Fun, Config2) end),
     R = wait_for_evaluator(Pid, Mod, Fun, Config2, []),
     Mod:end_per_testcase(Fun, Config2),
     erase(megaco_test_server),    
@@ -411,10 +458,10 @@ wait_for_evaluator(Pid, Mod, Fun, Config, Errors, AccTime) ->
 	    megaco:report_event(20, Mod, ?MODULE, Label ++ " failed",
 				[TestCase, Config, {return, Fail}, Errors]),
 	    {failed, {Mod,Fun}, Fail, Time};
-	{'EXIT', Pid, {skipped, Reason}, Time} -> 
+	{'EXIT', Pid, {skip, Reason}, Time} -> 
 	    megaco:report_event(20, Mod, ?MODULE, Label ++ " skipped",
-				[TestCase, Config, {skipped, Reason}]),
-	    {skipped, {Mod, Fun}, Errors, Time};
+				[TestCase, Config, {skip, Reason}]),
+	    {skip, {Mod, Fun}, Errors, Time};
 	{'EXIT', Pid, Reason, Time} -> 
 	    megaco:report_event(20, Mod, ?MODULE, Label ++ " crashed",
 				[TestCase, Config, {'EXIT', Reason}]),
@@ -445,14 +492,14 @@ do_eval(ReplyTo, Mod, Fun, Config) ->
 	error:undef ->
 	    %% p("do_eval -> error - undef", []),
 	    ReplyTo ! {'EXIT', self(), undef, 0};
-	exit:{skipped, Reason} ->
+	exit:{skip, Reason} ->
 	    %% p("do_eval -> exit - skipped"
 	    %%   "~n   Reason: ~p", [Reason]),
 	    T2   = os:timestamp(), 
 	    Time = timer:now_diff(T2, T1), 
 	    display_tc_time(Time),
 	    display_system_info("after (skipped)", Mod, Fun),
-	    ReplyTo ! {'EXIT', self(), {skipped, Reason}, Time};
+	    ReplyTo ! {'EXIT', self(), {skip, Reason}, Time};
 	exit:{suite_failed, Reason} ->
 	    %% p("do_eval -> exit - suite-failed"
 	    %%   "~n   Reason: ~p", [Reason]),
@@ -569,9 +616,9 @@ display_result(Res) when is_list(Res) ->
     Ok           = [{MF, Time} || {ok,  MF, _, Time}  <- Res],
     Nyi          = [MF || {nyi, MF, _, _Time} <- Res],
     SkippedGrps  = [{{M,G}, Reason} || 
-		       {skipped, {M, {group, G}}, Reason, _Time} <- Res],
+		       {skip, {M, {group, G}}, Reason, _Time} <- Res],
     SkippedCases = [{MF, Reason} || 
-		       {skipped, {_M, F} = MF, Reason, _Time} <- Res, 
+		       {skip, {_M, F} = MF, Reason, _Time} <- Res, 
 		       is_atom(F)],
     FailedGrps   = [{{M,G}, Reason} || 
 		       {failed,  {M, {group, G}}, Reason, _Time} <- Res],
@@ -683,15 +730,18 @@ log(Format, Args, Mod, Line) ->
 		      [self(), Mod, Line] ++ Args)
     end.
 
+skip(Reason) ->
+    exit({skip, Reason}).
+
 skip(Actual, File, Line) ->
-    log("Skipping test case~n", [], File, Line),
-    String = lists:flatten(io_lib:format("Skipping test case ~p(~p): ~p~n",
-					 [File, Line, Actual])),
-    exit({skipped, String}).
+    log("Skipping test case: ~p~n", [Actual], File, Line),
+    String = f("~p(~p): ~p~n", [File, Line, Actual]),
+    skip(String).
 
 fatal_skip(Actual, File, Line) ->
     error(Actual, File, Line),
-    exit({skipped, {fatal, Actual, File, Line}}).
+    skip({fatal, Actual, File, Line}).
+
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -703,7 +753,8 @@ flush() ->
     after 1000 ->
 	    []
     end.
-	    
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Check if process is alive and kicking
 still_alive(Pid) ->   
@@ -719,6 +770,7 @@ still_alive(Pid) ->
 	    end 
     end.
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% The proxy process
 
@@ -730,32 +782,51 @@ proxy_start(Node, ProxyId) ->
 
 proxy_init(ProxyId, Controller) ->
     process_flag(trap_exit, true),
-    ?LOG("[~p] proxy started by ~p~n",[ProxyId, Controller]),
+    IdStr = proxyid2string(ProxyId),
+    put(id, IdStr),
+    ?LOG("[~s] proxy started by ~p~n", [IdStr, Controller]),
     proxy_loop(ProxyId, Controller).
 
 proxy_loop(OwnId, Controller) ->
     receive
 	{'EXIT', Controller, Reason} ->
-	    p("proxy_loop -> received exit from controller"
+	    pprint("proxy_loop -> received exit from controller"
+                   "~n   Reason: ~p", [Reason]),
+	    exit(Reason);
+	{stop, Controller, Reason} ->
+	    p("proxy_loop -> received stop from controller"
 	      "~n   Reason: ~p"
 	      "~n", [Reason]),
 	    exit(Reason);
+	
 	{apply, Fun} ->
-	    p("proxy_loop -> received apply request~n", []),
+            pprint("proxy_loop -> received apply request"),
 	    Res = Fun(),
-	    p("proxy_loop -> apply result: "
-	      "~n   ~p"
-	      "~n", [Res]),
+            pprint("proxy_loop -> apply result: "
+                   "~n   ~p", [Res]),
 	    Controller ! {res, OwnId, Res},
 	    proxy_loop(OwnId, Controller);
 	OtherMsg ->
-	    p("proxy_loop -> received unknown message: "
-	      "~n  OtherMsg: ~p"
-	      "~n", [OtherMsg]),
+	    pprint("proxy_loop -> received unknown message: "
+                   "~n  ~p", [OtherMsg]),
 	    Controller ! {msg, OwnId, OtherMsg},
 	    proxy_loop(OwnId, Controller)
     end.
 
+proxyid2string(Id) when is_list(Id) ->
+    Id;
+proxyid2string(Id) when is_atom(Id) ->
+    atom_to_list(Id);
+proxyid2string(Id) ->
+    f("~p", [Id]).
+
+pprint(F) ->
+    pprint(F, []).
+
+pprint(F, A) ->
+    io:format("[~s] ~p ~s " ++ F ++ "~n",
+              [get(id), self(), formated_timestamp() | A]).
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Test server callbacks
@@ -837,7 +908,7 @@ reset_kill_timer(Config) ->
     end.
 
 watchdog(Pid, Time) ->
-    erlang:now(),
+    _ = os:timestamp(),
     receive
 	stop ->
 	    ok
@@ -897,7 +968,10 @@ default_config() ->
     [{nodes, default_nodes()}, {ts, megaco}].
 
 default_nodes() ->    
-    mk_nodes(2, []).
+    mk_nodes(3, []).
+
+mk_nodes(N) when (N > 0) ->
+    mk_nodes(N, []).
 
 mk_nodes(0, Nodes) ->
     Nodes;
@@ -918,11 +992,14 @@ node_to_name_and_host(Node) ->
 start_nodes([Node | Nodes], File, Line) ->
     case net_adm:ping(Node) of
 	pong ->
+            p("node ~p already running", [Node]),
 	    start_nodes(Nodes, File, Line);
 	pang ->
 	    [Name, Host] = node_to_name_and_host(Node),
+            p("try start node ~p", [Node]),
 	    case slave:start_link(Host, Name) of
 		{ok, NewNode} when NewNode =:= Node ->
+                    p("node ~p started - now set path, cwd and sync", [Node]),
 		    Path = code:get_path(),
 		    {ok, Cwd} = file:get_cwd(),
 		    true = rpc:call(Node, code, set_path, [Path]),
@@ -931,11 +1008,18 @@ start_nodes([Node | Nodes], File, Line) ->
 		    {_, []} = rpc:multicall(global, sync, []),
 		    start_nodes(Nodes, File, Line);
 		Other ->
+                    p("failed starting node ~p: ~p", [Node, Other]),
 		    fatal_skip({cannot_start_node, Node, Other}, File, Line)
 	    end
     end;
 start_nodes([], _File, _Line) ->
     ok.
 
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+f(F, A) ->
+    lists:flatten(io_lib:format(F, A)).
+
 p(F, A) ->
-    io:format("~p~w:" ++ F ++ "~n", [self(), ?MODULE |A]).
+    io:format("~s ~p " ++ F ++ "~n", [?FTS(), self() | A]).
diff --git a/lib/megaco/test/megaco_test_lib.hrl b/lib/megaco/test/megaco_test_lib.hrl
index 79a1493c40..546ecaab9a 100644
--- a/lib/megaco/test/megaco_test_lib.hrl
+++ b/lib/megaco/test/megaco_test_lib.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -80,9 +80,11 @@
 
 
 -define(SLEEP(MSEC),    megaco_test_lib:sleep(MSEC)).
--define(M(),            megaco_test_lib:millis()).
--define(MDIFF(A,B),     megaco_test_lib:millis_diff(A,B)).
-
 -define(HOURS(T),       megaco_test_lib:hours(T)).
--define(MINUTES(T),     megaco_test_lib:minutes(T)).
--define(SECONDS(T),     megaco_test_lib:seconds(T)).
+-define(MINS(T),        megaco_test_lib:minutes(T)).
+-define(MINUTES(T),     ?MINS(T)).
+-define(SECS(T),        megaco_test_lib:seconds(T)).
+-define(SECONDS(T),     ?SECS(T)).
+-define(FTS(),          megaco:format_timestamp(erlang:timestamp())).
+-define(FTS(TS),        megaco:format_timestamp(TS)).
+-define(F(F,A),         lists:flatten(io_lib:format(F, A))).
diff --git a/lib/megaco/test/megaco_test_megaco_generator.erl b/lib/megaco/test/megaco_test_megaco_generator.erl
index 8a37fa33fe..4e0f2e334c 100644
--- a/lib/megaco/test/megaco_test_megaco_generator.erl
+++ b/lib/megaco/test/megaco_test_megaco_generator.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2019. 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.
@@ -118,7 +118,7 @@ init([]) ->
 %% ----- instruction parser -----
 
 handle_parse({debug, Debug} = Instruction, State)
-  when (Debug == true) orelse (Debug == false) ->
+  when is_boolean(Debug) ->
     {ok, Instruction, State};
 
 handle_parse({expect_nothing, To} = Instruction, State)
@@ -126,9 +126,9 @@ handle_parse({expect_nothing, To} = Instruction, State)
     {ok, Instruction, State};
 
 handle_parse({megaco_trace, Level} = Instruction, State)
-  when (Level == disable) orelse 
-       (Level == max)     orelse 
-       (Level == min)     orelse
+  when (Level =:= disable) orelse 
+       (Level =:= max)     orelse 
+       (Level =:= min)     orelse
        is_integer(Level) ->
     {ok, Instruction, State};
 
@@ -1096,11 +1096,10 @@ handle_megaco_callback_reply(_, _, _, _) ->
 %%----------------------------------------------------------------------
 
 random_init() ->
-    {A,B,C} = now(),
-    random:seed(A,B,C).
+    ok.
 
 random(N) ->
-    random:uniform(N).
+    rand:uniform(N).
 
 
 get_config(Key, Opts) ->
diff --git a/lib/megaco/test/megaco_test_mg.erl b/lib/megaco/test/megaco_test_mg.erl
index d6a9a8c314..38883c94f0 100644
--- a/lib/megaco/test/megaco_test_mg.erl
+++ b/lib/megaco/test/megaco_test_mg.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2019. 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.
@@ -79,7 +79,10 @@
 	     reply_counter   = 0,
 	     mload_info      = undefined,
 	     parent          = undefined,
-	     dsi_timer}).
+	     dsi_timer,
+             evs             = []}).
+
+-define(EVS_MAX, 10).
 
 
 %%% --------------------------------------------------------------------
@@ -364,7 +367,7 @@ mg(Parent, Verbosity, Config) ->
 	    MG = #mg{parent = Parent, mid = Mid, dsi_timer = DSITimer},
 	    i("mg -> started"),
 	    put(verbosity, Verbosity),
-	    case (catch loop(MG)) of
+	    case (catch loop(evs(MG, started))) of
 		{'EXIT', normal} ->
 		    exit(normal);
 		{'EXIT', Reason} ->
@@ -438,12 +441,12 @@ loop(#mg{parent = Parent, mid = Mid} = S) ->
 	{display_system_info, Time} ->
 	    display_system_info(S#mg.mid),
 	    NewTimer = create_timer(Time, display_system_info),
-	    loop(S#mg{dsi_timer = NewTimer});
+	    loop(evs(S#mg{dsi_timer = NewTimer}, {dsi, Time}));
 
 	{verbosity, V, Parent} ->
 	    i("loop -> received new verbosity: ~p", [V]),
 	    put(verbosity,V),
-	    loop(S);
+	    loop(evs(S, {verb, V}));
 
 
 	{stop, Parent} ->
@@ -453,7 +456,7 @@ loop(#mg{parent = Parent, mid = Mid} = S) ->
 	    Res = do_stop(Mid),
 	    d("loop -> stop result: ~p", [Res]),
 	    server_reply(Parent, stopped, {ok, Res}),
-	    exit(normal);
+	    done(evs(S, stop), normal);
 
 	{{enable_test_code, Tag, Fun}, Parent} ->
 	    i("loop -> enable_test_code: ~p, ~p", [Tag, Fun]),
@@ -463,52 +466,52 @@ loop(#mg{parent = Parent, mid = Mid} = S) ->
 	      "~n   ets:tab2list(megaco_test_data): ~p", 
 	      [Reply,ets:tab2list(megaco_test_data)]),
 	    server_reply(Parent, enable_test_code_reply, Reply),
-	    loop(S);
+	    loop(evs(S, {enable_test_code, Tag}));
 
 	{{encode_ar_first, EAF}, Parent} ->
 	    i("loop -> encode_ar_first: ~p", [EAF]),
 	    {Reply, S1} = handle_encode_ar_first(S, EAF),
 	    server_reply(Parent, encode_ar_first_reply, Reply),
-	    loop(S1#mg{encode_ar_first = EAF});
+	    loop(evs(S1#mg{encode_ar_first = EAF}, {enc_arf, EAF}));
 
 	%% Give me statistics
 	{statistics, Parent} ->
 	    i("loop -> got request for statistics", []),
 	    Stats = do_get_statistics(Mid),
 	    server_reply(Parent, statistics_reply, {ok, Stats}),
-	    loop(S); 
+	    loop(evs(S, stats)); 
 
 	{reset_stats, Parent} ->
 	    i("loop -> got request to reset stats counters", []),
 	    do_reset_stats(Mid),
 	    server_reply(Parent, reset_stats_ack, ok),
-	    loop(S);
+	    loop(evs(S, rst_stats));
 
 	{{user_info, Tag}, Parent} ->
 	    i("loop -> got user_info request for ~w", [Tag]),
 	    Res = do_get_user_info(Mid, Tag),
 	    d("loop -> Res: ~p", [Res]),
 	    server_reply(Parent, user_info_ack, Res),
-	    loop(S);
+	    loop(evs(S, {ui, Tag}));
 
 	{{update_user_info, Tag, Val}, Parent} ->
 	    i("loop -> got update_user_info: ~w -> ~p", [Tag, Val]),
 	    Res = do_update_user_info(Mid, Tag, Val),
 	    d("loop -> Res: ~p", [Res]),
 	    server_reply(Parent, update_user_info_ack, Res),
-	    loop(S);
+	    loop(evs(S, {uui, {Tag, Val}}));
 
 	{{conn_info, Tag}, Parent} ->
 	    i("loop -> got conn_info request for ~w", [Tag]),
 	    Res = do_get_conn_info(Mid, Tag),
 	    server_reply(Parent, conn_info_ack, Res),
-	    loop(S);
+	    loop(evs(S, {ci, Tag}));
 
 	{{update_conn_info, Tag, Val}, Parent} ->
 	    i("loop -> got update_conn_info: ~w -> ~p", [Tag, Val]),
 	    Res = do_update_conn_info(Mid, Tag, Val),
 	    server_reply(Parent, update_conn_info_ack, Res),
-	    loop(S);
+	    loop(evs(S, {uci, {Tag, Val}}));
 
 
 	%% Do a service change
@@ -526,28 +529,28 @@ loop(#mg{parent = Parent, mid = Mid} = S) ->
 			server_reply(Parent, service_change_reply, Error),
 			S
 		end,
-	    loop(S1); 
+	    loop(evs(S1, svc_ch)); 
 
 	{{group_requests, N}, Parent} when N > 0 ->
 	    i("loop -> received group_requests ~p", [N]),
 	    Reply = {ok, S#mg.group_size}, 
 	    server_reply(Parent, group_requests_reply, Reply),
-	    loop(S#mg{group_size = N}); 
+	    loop(evs(S#mg{group_size = N}, {grp_reqs, N})); 
 
 	{{ack_info, To}, Parent} ->
 	    i("loop -> received request to inform about received ack's ", []),
-	    loop(S#mg{ack_info = To});
+	    loop(evs(S#mg{ack_info = To}, {acki, To}));
 
 	{{rep_info, To}, Parent} ->
 	    i("loop -> received request to inform about received rep's ", []),
-	    loop(S#mg{rep_info = To});
+	    loop(evs(S#mg{rep_info = To}, {repi, To}));
 
 	%% Make a sync-call
 	{notify_request, Parent} ->
 	    i("loop -> received request to send notify request ", []),
 	    {Res, S1} = do_handle_notify_request(S),
 	    d("loop -> notify request result: ~p", [Res]),
-	    loop(S1);
+	    loop(evs(S1, not_req));
 
 	%% sync-call complete
 	{notify_request_complete, NotifyReply, Pid} ->
@@ -556,7 +559,7 @@ loop(#mg{parent = Parent, mid = Mid} = S) ->
 	      "~n   NotifyReply: ~p", 
 	      [Pid, NotifyReply]),
 	    server_reply(Parent, notify_request_reply, NotifyReply),
-	    loop(S#mg{req_handler = undefined});
+	    loop(evs(S#mg{req_handler = undefined}, {not_reqc, NotifyReply}));
 
 
 	%% cancel requests
@@ -564,14 +567,14 @@ loop(#mg{parent = Parent, mid = Mid} = S) ->
 	    i("loop -> received request to cancel (all) megaco requests ", []),
 	    Res = do_cancel_requests(Mid, Reason),
 	    server_reply(Parent, cancel_request_reply, Res),
-	    loop(S);
+	    loop(evs(S, {creq, Reason}));
 
 
 	%% Apply multi-load
 	{apply_multi_load, {NL, NR}, Parent} -> 
 	    i("loop -> received apply_multi_load request: ~w, ~w", [NL, NR]),
 	    S1 = start_loaders(S, NL, NR),
-	    loop(S1);
+	    loop(evs(S1, {apply_mload, {NL, NR}}));
 
 
 	%% Apply some load
@@ -587,12 +590,12 @@ loop(#mg{parent = Parent, mid = Mid} = S) ->
 			server_reply(Parent, apply_load_ack, Error),
 			S
 		end,
-	    loop(S1);
+	    loop(evs(S1, {apply_load, Times}));
 
 	{apply_load_timeout, _} ->
 	    d("loop -> received apply_load timeout", []),
 	    S1 = do_apply_load(S),
-	    loop(S1);
+	    loop(evs(S1, apply_loadto));
 
 
 	%% Megaco callback messages
@@ -604,22 +607,35 @@ loop(#mg{parent = Parent, mid = Mid} = S) ->
 	    {Reply, S1} = handle_megaco_request(S, Request),
 	    d("loop -> send (megaco callback) request reply: ~n~p", [Reply]),
 	    From ! {reply, Reply, self()},
-	    loop(S1);
+	    loop(evs(S1, {req, {Request, Mid, From}}));
 
 
 	{'EXIT', Pid, Reason} -> 
-	    i("loop -> received exit signal from ~p: ~n~p", [Pid, Reason]),
+	    i("loop -> received exit signal from ~p: "
+              "~n   ~p", [Pid, Reason]),
 	    S1 = handle_exit(S, Pid, Reason),
-	    loop(S1);
+	    loop(evs(S1, {exit, {Pid, Reason}}));
 
 
 	Invalid ->
 	    error_msg("received invalid request: ~n~p", [Invalid]),
-	    loop(S)
+	    loop(evs(S, {invalid, Invalid}))
 
     end.
 
 
+evs(#mg{evs = EVS} = S, Ev) when (length(EVS) < ?EVS_MAX) ->
+    S#mg{evs = [{?FTS(), Ev}|EVS]};
+evs(#mg{evs = EVS} = S, Ev) ->
+    S#mg{evs = [{?FTS(), Ev}|lists:droplast(EVS)]}.
+
+done(#mg{evs = EVS}, Reason) ->
+    info_msg("Exiting with latest event(s): "
+             "~n   ~p"
+             "~n", [EVS]),
+    exit(Reason).
+
+
 handle_encode_ar_first(#mg{encode_ar_first = Old} = MG, New) 
   when (New =:= true) orelse (New =:= false) ->
     {{ok, Old}, MG#mg{encode_ar_first = New}};
@@ -776,7 +792,7 @@ do_service_change(#mg{state = State} = MG) ->
     {{error, {invalid_state, State}}, MG}.
 
 do_service_change(ConnHandle, Method, EAF, Reason) ->
-    d("sending service change using:"
+    d("send service change using:"
       "~n   ConnHandle: ~p"
       "~n   Method:     ~p"
       "~n   EAF:        ~p"
@@ -844,10 +860,10 @@ loader_main(EAF, N, CH) ->
 
 
 
-handle_exit(#mg{parent = Pid}, Pid, Reason) ->
+handle_exit(#mg{parent = Pid} = S, Pid, Reason) ->
     error_msg("received exit from the parent:"
 	      "~n   ~p", [Reason]),
-    exit({parent_terminated, Reason});
+    done(S, {parent_terminated, Reason});
 
 handle_exit(#mg{parent = Parent, req_handler = Pid} = MG, Pid, Reason) ->
     error_msg("received unexpected exit from the request handler:"
@@ -1423,6 +1439,7 @@ sleep(X) ->
     receive after X -> ok end.
 
 
+info_msg(F,A)  -> error_logger:info_msg("MG: " ++ F ++ "~n",A).
 error_msg(F,A) -> error_logger:error_msg("MG: " ++ F ++ "~n",A).
 
 
@@ -1536,37 +1553,28 @@ print(Severity, Verbosity, P, F, A) ->
 print(true, P, F, A) ->
     io:format("*** [~s] ~s ~p ~s ***"
               "~n   " ++ F ++ "~n~n", 
-              [format_timestamp(now()), P, self(), get(sname) | A]);
+              [?FTS(), P, self(), get(sname) | A]);
 print(_, _, _, _) ->
     ok.
 
-format_timestamp({_N1, _N2, N3} = Now) ->
-    {Date, Time}   = calendar:now_to_datetime(Now),
-    {YYYY,MM,DD}   = Date,
-    {Hour,Min,Sec} = Time,
-    FormatDate = 
-        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w",
-                      [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),  
-    lists:flatten(FormatDate).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 random_init() ->
-    {A,B,C} = now(),
-    random:seed(A,B,C).
+    ok.
 
 random() ->
     random(50).
 random(N) ->
-    random:uniform(N).
+    rand:uniform(N).
 
 
 display_system_info(Mid) ->
     display_system_info(Mid, "").
 
 display_system_info(Mid, Pre) ->
-    TimeStr = format_timestamp(now()),
+    TimeStr = ?FTS(),
     MibStr  = lists:flatten(io_lib:format("~p ", [Mid])), 
     megaco_test_lib:display_system_info(MibStr ++ Pre ++ TimeStr).
 
diff --git a/lib/megaco/test/megaco_test_mgc.erl b/lib/megaco/test/megaco_test_mgc.erl
index 045bc7c9fd..a9027ca68e 100644
--- a/lib/megaco/test/megaco_test_mgc.erl
+++ b/lib/megaco/test/megaco_test_mgc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2019. 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.
@@ -75,7 +75,10 @@
 	      abort_info  = undefined,
 	      req_info    = undefined,
 	      mg          = [],
-	      dsi_timer}).
+	      dsi_timer,
+              evs         = []}).
+
+-define(EVS_MAX, 10).
 
 
 %%% ------------------------------------------------------------------
@@ -297,7 +300,7 @@ mgc(Parent, Verbosity, Config) ->
 		     dsi_timer = DSITimer},
 	    i("mgc -> started"),
 	    display_system_info("at start "),
-	    loop(S)
+	    loop(evs(S, started))
     end.
 
 init(Config) ->
@@ -359,7 +362,7 @@ loop(S) ->
 	{display_system_info, Time} ->
 	    display_system_info(S#mgc.mid),
 	    NewTimer = create_timer(Time, display_system_info),
-	    loop(S#mgc{dsi_timer = NewTimer});
+	    loop(evs(S#mgc{dsi_timer = NewTimer}, {dsi, Time}));
 
 	{stop, Parent} when S#mgc.parent =:= Parent ->
 	    i("loop -> stopping", []),
@@ -371,7 +374,7 @@ loop(S) ->
 	    application:stop(megaco),
 	    i("loop -> stopped", []),
 	    server_reply(Parent, stopped, ok),
-	    exit(normal);
+	    done(evs(S, stop), normal);
 
 	{{disconnect, Reason}, Parent} when S#mgc.parent == Parent ->
 	    i("loop -> disconnecting", []),
@@ -379,22 +382,22 @@ loop(S) ->
 	    [Conn|_] = megaco:user_info(Mid, connections),
 	    Res = megaco:disconnect(Conn, {self(), Reason}),
 	    server_reply(Parent, disconnected, Res),
-	    loop(S);
+	    loop(evs(S, {disconnect, Reason}));
 
 	{{update_user_info, Tag, Val}, Parent} when S#mgc.parent == Parent ->
 	    i("loop -> got update_user_info: ~w -> ~p", [Tag, Val]),
 	    Res = (catch megaco:update_user_info(S#mgc.mid, Tag, Val)),
 	    d("loop -> Res: ~p", [Res]),
 	    server_reply(Parent, update_user_info_ack, Res),
-	    loop(S);
-
-	{{user_info, Tag}, Parent} when S#mgc.parent == Parent ->
-	    i("loop -> got user_info request for ~w", [Tag]),
-	    Res = (catch megaco:user_info(S#mgc.mid, Tag)),
-	    d("loop -> Res: ~p", [Res]),
-	    server_reply(Parent, user_info_ack, Res),
-	    loop(S);
-
+	    loop(evs(S, {uui, {Tag, Val}}));
+
+        {{user_info, Tag}, Parent} when S#mgc.parent == Parent ->
+            i("loop -> got user_info request for ~w", [Tag]),
+            Res = (catch megaco:user_info(S#mgc.mid, Tag)),
+            d("loop -> Res: ~p", [Res]),
+            server_reply(Parent, user_info_ack, Res),
+            loop(evs(S, {ui, Tag}));
+                     
 	{{update_conn_info, Tag, Val}, Parent} when S#mgc.parent == Parent ->
 	    i("loop -> got update_conn_info: ~w -> ~p", [Tag, Val]),
 	    Conns = megaco:user_info(S#mgc.mid, connections), 
@@ -404,7 +407,7 @@ loop(S) ->
 	    Res = lists:map(Fun, Conns),
 	    d("loop -> Res: ~p", [Res]),
 	    server_reply(Parent, update_conn_info_ack, Res),
-	    loop(S);
+            loop(evs(S, {uci, {Tag, Val}}));
 
 	{{conn_info, Tag}, Parent} when S#mgc.parent == Parent ->
 	    i("loop -> got conn_info request for ~w", [Tag]),
@@ -415,11 +418,11 @@ loop(S) ->
 	    Res = lists:map(Fun, Conns),
 	    d("loop -> Res: ~p", [Res]),
 	    server_reply(Parent, conn_info_ack, Res),
-	    loop(S);
+	    loop(evs(S, {ci, Tag}));
 
 
 	%% 
-	{request_action, {Action, To}, Parent} when S#mgc.parent == Parent ->
+        {request_action, {Action, To}, Parent} when S#mgc.parent == Parent ->
 	    i("loop -> got new request_action: ~p:~w", [Action,To]),
 	    {Reply, S1} = 
 		case lists:member(Action, ?valid_actions) of
@@ -432,7 +435,7 @@ loop(S) ->
 			{{error, {invalid_action, Action}}, S}
 		end,
 	    server_reply(Parent, request_action_ack, Reply),
-	    loop(S1);
+            loop(evs(S1, {req_act, {Action, To}}));
 
 
 	%% Reset stats
@@ -440,7 +443,7 @@ loop(S) ->
 	    i("loop -> got request to reset stats counters"),
 	    do_reset_stats(S#mgc.mid),
 	    server_reply(Parent, reset_stats_ack, ok),
-	    loop(S);
+	    loop(evs(S, rst_stats));
 
 
 	%% Give me statistics
@@ -466,7 +469,7 @@ loop(S) ->
 		lists:map(GetTrans, megaco:user_info(Mid, connections)),
 	    Reply = {ok, [{gen, Gen}, {trans, Trans}]},
 	    server_reply(Parent, {statistics_reply, 1}, Reply),
-	    loop(S);
+	    loop(evs(S, {stats, 1}));
 
 
 	{{statistics, 2}, Parent} when S#mgc.parent == Parent ->
@@ -477,7 +480,7 @@ loop(S) ->
 	    UdpStats = get_trans_stats(UdpSup, megaco_udp),
 	    Reply = {ok, [{gen, Gen}, {trans, [TcpStats, UdpStats]}]},
 	    server_reply(Parent, {statistics_reply, 2}, Reply),
-	    loop(S);
+	    loop(evs(S, {stats, 2}));
 
 
 	%% Megaco callback messages
@@ -487,28 +490,28 @@ loop(S) ->
 	    {Reply, S1} = handle_megaco_request(Request, S),
 	    d("loop -> send request reply: ~n~p", [Reply]),
 	    reply(From, Reply),
-	    loop(S1);
+	    loop(evs(S1, {req, Request}));
 
 
 	{ack_info, To, Parent} when S#mgc.parent == Parent ->
 	    i("loop -> received request to inform about received ack's ", []),
-	    loop(S#mgc{ack_info = To});
+	    loop(evs(S#mgc{ack_info = To}, {acki, To}));
 
 
 	{abort_info, To, Parent} when S#mgc.parent == Parent ->
 	    i("loop -> received request to inform about received aborts ", []),
-	    loop(S#mgc{abort_info = To});
+	    loop(evs(S#mgc{abort_info = To}, {abi, To}));
 
 
 	{req_info, To, Parent} when S#mgc.parent == Parent ->
 	    i("loop -> received request to inform about received req's ", []),
-	    loop(S#mgc{req_info = To});
+	    loop(evs(S#mgc{req_info = To}, {reqi, To}));
 
 
 	{verbosity, V, Parent} when S#mgc.parent == Parent ->
 	    i("loop -> received new verbosity: ~p", [V]),
 	    put(verbosity,V),
-	    loop(S);
+	    loop(evs(S, {verb, V}));
 
 
 	{'EXIT', Pid, Reason} when S#mgc.tcp_sup =:= Pid ->
@@ -525,7 +528,7 @@ loop(S) ->
 	    i("loop -> stopped", []),
 	    StopReason = {error, {tcp_terminated, Pid, Reason}}, 
 	    server_reply(S#mgc.parent, stopped, StopReason),
-	    exit(StopReason);
+	    done(evs(S, {tcp_sup_exit, Reason}), StopReason);
 
 
 	{'EXIT', Pid, Reason} when S#mgc.udp_sup =:= Pid ->
@@ -542,15 +545,27 @@ loop(S) ->
 	    i("loop -> stopped", []),
 	    StopReason = {error, {udp_terminated, Pid, Reason}}, 
 	    server_reply(S#mgc.parent, stopped, StopReason),
-	    exit(StopReason);
+	    done(evs(S, {udp_sup_exit, Reason}), StopReason);
 
 
 	Invalid ->
 	    i("loop -> received invalid request: ~p", [Invalid]),
-	    loop(S)
+	    loop(evs(S, {invalid, Invalid}))
     end.
 
 
+evs(#mgc{evs = EVS} = S, Ev) when (length(EVS) < ?EVS_MAX) ->
+    S#mgc{evs = [{?FTS(), Ev}|EVS]};
+evs(#mgc{evs = EVS} = S, Ev) ->
+    S#mgc{evs = [{?FTS(), Ev}|lists:droplast(EVS)]}.
+
+done(#mgc{evs = EVS}, Reason) ->
+    info_msg("Exiting with latest event(s): "
+             "~n   ~p"
+             "~n", [EVS]),
+    exit(Reason).
+
+
 do_reset_stats(Mid) ->
     megaco:reset_stats(),
     do_reset_trans_stats(megaco:user_info(Mid, connections), []).
@@ -825,10 +840,10 @@ handle_megaco_request({handle_trans_ack, CH, PV, AS, AD},
 
 handle_megaco_request({handle_trans_ack, CH, PV, AS, AD}, S) ->
     d("handle_megaco_request(handle_trans_ack) -> entry with"
-      "~n   CH: ~p"
-      "~n   PV: ~p"
-      "~n   AS: ~p"
-      "~n   AD: ~p", [CH, PV, AS, AD]),
+      "~n   Conn Handle:  ~p"
+      "~n   Prot Version: ~p"
+      "~n   Ack Status:   ~p"
+      "~n   Ack Data:     ~p", [CH, PV, AS, AD]),
     {ok, S};
 
 handle_megaco_request({handle_unexpected_trans, CH, PV, TR}, S) ->
@@ -1090,6 +1105,7 @@ sleep(X) ->
     receive after X -> ok end.
 
 
+info_msg(F,A)  -> error_logger:info_msg("MGC: " ++ F ++ "~n",A).
 error_msg(F,A) -> error_logger:error_msg("MGC: " ++ F ++ "~n",A).
 
 
@@ -1153,18 +1169,17 @@ get_conf(Key, Config, Default) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 random_init() ->
-    {A,B,C} = now(),
-    random:seed(A,B,C).
+    ok.
 
 random(N) ->
-    random:uniform(N).
+    rand:uniform(N).
 
 
 display_system_info(Mid) ->
     display_system_info(Mid, "").
 
 display_system_info(Mid, Pre) ->
-    TimeStr = format_timestamp(now()),
+    TimeStr = ?FTS(),
     MibStr  = lists:flatten(io_lib:format("~p ", [Mid])), 
     megaco_test_lib:display_system_info(MibStr ++ Pre ++ TimeStr).
 
@@ -1209,14 +1224,6 @@ print(_, _, _, _) ->
 print(P, F, A) ->
     io:format("*** [~s] ~s ~p ~s ***"
 	      "~n   " ++ F ++ "~n~n", 
-	      [format_timestamp(now()), P, self(), get(sname) | A]).
-
-format_timestamp({_N1, _N2, N3} = Now) ->
-    {Date, Time}   = calendar:now_to_datetime(Now),
-    {YYYY,MM,DD}   = Date,
-    {Hour,Min,Sec} = Time,
-    FormatDate = 
-        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w",
-                      [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),  
-    lists:flatten(FormatDate).
+	      [?FTS(), P, self(), get(sname) | A]).
+
 
diff --git a/lib/megaco/test/megaco_timer_test.erl b/lib/megaco/test/megaco_timer_test.erl
index 34479f7838..84c314d8ed 100644
--- a/lib/megaco/test/megaco_timer_test.erl
+++ b/lib/megaco/test/megaco_timer_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2019. 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.
@@ -332,7 +332,7 @@ integer_timer_start_and_expire(Config) when is_list(Config) ->
     receive
 	{timeout, Timeout} ->
 	    ok
-    after Timeout + 100 ->
+    after Timeout + 500 ->
 	    tmr_stop(Ref),
 	    error(no_timeout)
     end,
@@ -359,7 +359,14 @@ integer_timer_start_and_stop(Config) when is_list(Config) ->
 	{timeout, Timeout} ->
 	    error(bad_timeout)
     after Timeout - 100 ->
-	    tmr_stop(Ref)
+	    case tmr_stop(Ref) of
+                ok ->
+                    ok;
+                {ok, _} ->
+                    ok;
+                CancelRes ->
+                    ?SKIP({cancel_failed, CancelRes})
+            end
     end,
 
     %% Make sure it does not reach us after we attempted to stop it.
@@ -438,21 +445,6 @@ print1(_, _, _, _) ->
 print(Prefix, F, A) ->
     io:format("*** [~s] ~s ~p ~s:~w ***"
               "~n   " ++ F ++ "~n", 
-              [formated_timestamp(), Prefix, self(), get(sname), get(tc) | A]).
+              [?FTS(), Prefix, self(), get(sname), get(tc) | A]).
 
-    
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-formated_timestamp() ->
-    format_timestamp(now()).
-
-format_timestamp({_N1, _N2, N3} = Now) ->
-    {Date, Time}   = calendar:now_to_datetime(Now),
-    {YYYY,MM,DD}   = Date,
-    {Hour,Min,Sec} = Time,
-    FormatDate = 
-        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w",
-                      [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),  
-    lists:flatten(FormatDate).
diff --git a/lib/megaco/test/megaco_trans_test.erl b/lib/megaco/test/megaco_trans_test.erl
index 9786307860..37bc134c8d 100644
--- a/lib/megaco/test/megaco_trans_test.erl
+++ b/lib/megaco/test/megaco_trans_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2019. 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.
@@ -27,7 +27,46 @@
 %%----------------------------------------------------------------------
 -module(megaco_trans_test).
 
--compile(export_all).
+%% -compile(export_all).
+-export([
+         all/0,
+         groups/0,
+         init_per_group/2, end_per_group/2,
+         init_per_testcase/2, end_per_testcase/2,
+
+         single_ack/1,
+         multi_ack_timeout/1,
+         multi_ack_maxcount/1,
+
+         single_trans_req/1,
+         multi_trans_req_timeout/1,
+         multi_trans_req_maxcount1/1,
+         multi_trans_req_maxcount2/1,
+         multi_trans_req_maxsize1/1,
+         multi_trans_req_maxsize2/1,
+
+         single_trans_req_and_ack/1,
+         multi_trans_req_and_ack_timeout/1,
+         multi_trans_req_and_ack_ackmaxcount/1,
+         multi_trans_req_and_ack_reqmaxcount/1,
+         multi_trans_req_and_ack_maxsize1/1,
+         multi_trans_req_and_ack_maxsize2/1,
+
+         single_trans_req_and_pending/1,
+         multi_trans_req_and_pending/1,
+         multi_trans_req_and_ack_and_pending/1,
+         multi_ack_and_pending/1,
+
+         multi_trans_req_and_reply/1,
+         multi_trans_req_and_ack_and_reply/1,
+         multi_ack_and_reply/1,
+
+         otp_7192_1/1,
+         otp_7192_2/1,
+         otp_7192_3/1,
+         
+         t/0, t/1
+        ]).
 
 -include("megaco_test_lib.hrl").
 -include_lib("megaco/include/megaco.hrl").
@@ -44,44 +83,42 @@
 -define(A5555, ["11111111", "11111111", "00000000"]).
 -define(A5556, ["11111111", "11111111", "11111111"]).
 
--define(MGC_START(Pid, Mid, ET, Verb), 
-	megaco_test_mgc:start(Pid, Mid, ET, Verb)).
--define(MGC_STOP(Pid), megaco_test_mgc:stop(Pid)).
--define(MGC_GET_STATS(Pid, No), megaco_test_mgc:get_stats(Pid, No)).
--define(MGC_RESET_STATS(Pid), megaco_test_mgc:reset_stats(Pid)).
--define(MGC_REQ_DISC(Pid,To), megaco_test_mgc:request_discard(Pid,To)).
--define(MGC_REQ_PEND(Pid,To), megaco_test_mgc:request_pending(Pid,To)).
--define(MGC_REQ_HAND(Pid),    megaco_test_mgc:request_handle(Pid)).
--define(MGC_REQ_HANDS(Pid),   megaco_test_mgc:request_handle_sloppy(Pid)).
--define(MGC_UPDATE_UI(Pid,Tag,Val), 
-	megaco_test_mgc:update_user_info(Pid,Tag,Val)).
--define(MGC_UPDATE_CI(Pid,Tag,Val), 
-	megaco_test_mgc:update_conn_info(Pid,Tag,Val)).
--define(MGC_USER_INFO(Pid,Tag), megaco_test_mgc:user_info(Pid,Tag)).
--define(MGC_CONN_INFO(Pid,Tag), megaco_test_mgc:conn_info(Pid,Tag)).
--define(MGC_ACK_INFO(Pid,To),   megaco_test_mgc:ack_info(Pid,To)).
--define(MGC_REQ_INFO(Pid,To),   megaco_test_mgc:req_info(Pid,To)).
+-define(MG,  megaco_test_mg).
+-define(MGC, megaco_test_mgc).
+
+-define(MGC_START(Pid, Mid, ET, Verb), ?MGC:start(Pid, Mid, ET, Verb)).
+-define(MGC_STOP(Pid),                 ?MGC:stop(Pid)).
+-define(MGC_GET_STATS(Pid, No),        ?MGC:get_stats(Pid, No)).
+-define(MGC_RESET_STATS(Pid),          ?MGC:reset_stats(Pid)).
+-define(MGC_REQ_DISC(Pid,To),          ?MGC:request_discard(Pid,To)).
+-define(MGC_REQ_PEND(Pid,To),          ?MGC:request_pending(Pid,To)).
+-define(MGC_REQ_HAND(Pid),             ?MGC:request_handle(Pid)).
+-define(MGC_REQ_HANDS(Pid),            ?MGC:request_handle_sloppy(Pid)).
+-define(MGC_UPDATE_UI(Pid,Tag,Val),    ?MGC:update_user_info(Pid,Tag,Val)).
+-define(MGC_UPDATE_CI(Pid,Tag,Val),    ?MGC:update_conn_info(Pid,Tag,Val)).
+-define(MGC_USER_INFO(Pid,Tag),        ?MGC:user_info(Pid,Tag)).
+-define(MGC_CONN_INFO(Pid,Tag),        ?MGC:conn_info(Pid,Tag)).
+-define(MGC_ACK_INFO(Pid,To),          ?MGC:ack_info(Pid,To)).
+-define(MGC_REQ_INFO(Pid,To),          ?MGC:req_info(Pid,To)).
 
 -define(MG_START(Pid, Mid, Enc, Transp, Conf, Verb), 
-	megaco_test_mg:start(Pid, Mid, Enc, Transp, Conf, Verb)).
--define(MG_STOP(Pid), megaco_test_mg:stop(Pid)).
--define(MG_GET_STATS(Pid),   megaco_test_mg:get_stats(Pid)).
--define(MG_RESET_STATS(Pid), megaco_test_mg:reset_stats(Pid)).
--define(MG_SERV_CHANGE(Pid), megaco_test_mg:service_change(Pid)).
--define(MG_NOTIF_RAR(Pid), megaco_test_mg:notify_request_and_reply(Pid)).
--define(MG_NOTIF_REQ(Pid), megaco_test_mg:notify_request(Pid)).
--define(MG_NOTIF_AR(Pid),  megaco_test_mg:await_notify_reply(Pid)).
--define(MG_CANCEL(Pid,R),  megaco_test_mg:cancel_request(Pid,R)).
--define(MG_APPLY_LOAD(Pid,CntStart), megaco_test_mg:apply_load(Pid,CntStart)).
--define(MG_UPDATE_UI(Pid,Tag,Val), 
-	megaco_test_mg:update_user_info(Pid,Tag,Val)).
--define(MG_UPDATE_CI(Pid,Tag,Val), 
-	megaco_test_mg:update_conn_info(Pid,Tag,Val)).
--define(MG_USER_INFO(Pid,Tag), megaco_test_mg:user_info(Pid,Tag)).
--define(MG_CONN_INFO(Pid,Tag), megaco_test_mg:conn_info(Pid,Tag)).
--define(MG_GRP_REQ(Pid,N),     megaco_test_mg:group_requests(Pid,N)).
--define(MG_ACK_INFO(Pid,To),   megaco_test_mg:ack_info(Pid,To)).
--define(MG_REP_INFO(Pid,To),   megaco_test_mg:rep_info(Pid,To)).
+	?MG:start(Pid, Mid, Enc, Transp, Conf, Verb)).
+-define(MG_STOP(Pid),                ?MG:stop(Pid)).
+-define(MG_GET_STATS(Pid),           ?MG:get_stats(Pid)).
+-define(MG_RESET_STATS(Pid),         ?MG:reset_stats(Pid)).
+-define(MG_SERV_CHANGE(Pid),         ?MG:service_change(Pid)).
+-define(MG_NOTIF_RAR(Pid),           ?MG:notify_request_and_reply(Pid)).
+-define(MG_NOTIF_REQ(Pid),           ?MG:notify_request(Pid)).
+-define(MG_NOTIF_AR(Pid),            ?MG:await_notify_reply(Pid)).
+-define(MG_CANCEL(Pid,R),            ?MG:cancel_request(Pid,R)).
+-define(MG_APPLY_LOAD(Pid,CntStart), ?MG:apply_load(Pid,CntStart)).
+-define(MG_UPDATE_UI(Pid,Tag,Val),   ?MG:update_user_info(Pid,Tag,Val)).
+-define(MG_UPDATE_CI(Pid,Tag,Val),   ?MG:update_conn_info(Pid,Tag,Val)).
+-define(MG_USER_INFO(Pid,Tag),       ?MG:user_info(Pid,Tag)).
+-define(MG_CONN_INFO(Pid,Tag),       ?MG:conn_info(Pid,Tag)).
+-define(MG_GRP_REQ(Pid,N),           ?MG:group_requests(Pid,N)).
+-define(MG_ACK_INFO(Pid,To),         ?MG:ack_info(Pid,To)).
+-define(MG_REP_INFO(Pid,To),         ?MG:rep_info(Pid,To)).
 
 t()     -> megaco_test_lib:t(?MODULE).
 t(Case) -> megaco_test_lib:t({?MODULE, Case}).
@@ -104,35 +141,77 @@ end_per_testcase(Case, Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 all() -> 
-    [{group, ack}, {group, trans_req},
-     {group, trans_req_and_ack}, {group, pending},
-     {group, reply}, {group, tickets}].
+    [{group, ack},
+     {group, trans_req},
+     {group, trans_req_and_ack},
+     {group, pending},
+     {group, reply},
+     {group, tickets}].
 
 groups() -> 
-    [{ack, [],
-      [single_ack, multi_ack_timeout, multi_ack_maxcount]},
-     {trans_req, [],
-      [single_trans_req, multi_trans_req_timeout,
-       multi_trans_req_maxcount1, multi_trans_req_maxcount2,
-       multi_trans_req_maxsize1, multi_trans_req_maxsize2]},
-     {trans_req_and_ack, [],
-      [single_trans_req_and_ack,
-       multi_trans_req_and_ack_timeout,
-       multi_trans_req_and_ack_ackmaxcount,
-       multi_trans_req_and_ack_reqmaxcount,
-       multi_trans_req_and_ack_maxsize1,
-       multi_trans_req_and_ack_maxsize2]},
-     {pending, [],
-      [single_trans_req_and_pending,
-       multi_trans_req_and_pending,
-       multi_trans_req_and_ack_and_pending,
-       multi_ack_and_pending]},
-     {reply, [],
-      [multi_trans_req_and_reply,
-       multi_trans_req_and_ack_and_reply,
-       multi_ack_and_reply]},
-     {tickets, [], [{group, otp_7192}]},
-     {otp_7192, [], [otp_7192_1, otp_7192_2, otp_7192_3]}].
+    [
+     {ack,               [], ack_cases()},
+     {trans_req,         [], trans_req_cases()},
+     {trans_req_and_ack, [], trans_req_and_ack_cases()},
+     {pending,           [], pending_cases()},
+     {reply,             [], reply_cases()},
+     {tickets,           [], tickets_cases()},
+     {otp_7192,          [], otp_7192_cases()}
+    ].
+
+ack_cases() ->
+    [
+     single_ack,
+     multi_ack_timeout,
+     multi_ack_maxcount
+    ].
+
+trans_req_cases() ->
+    [
+     single_trans_req,
+     multi_trans_req_timeout,
+     multi_trans_req_maxcount1,
+     multi_trans_req_maxcount2,
+     multi_trans_req_maxsize1,
+     multi_trans_req_maxsize2
+    ].
+
+trans_req_and_ack_cases() ->
+    [
+     single_trans_req_and_ack,
+     multi_trans_req_and_ack_timeout,
+     multi_trans_req_and_ack_ackmaxcount,
+     multi_trans_req_and_ack_reqmaxcount,
+     multi_trans_req_and_ack_maxsize1,
+     multi_trans_req_and_ack_maxsize2
+    ].
+
+pending_cases() ->
+    [
+     single_trans_req_and_pending,
+     multi_trans_req_and_pending,
+     multi_trans_req_and_ack_and_pending,
+     multi_ack_and_pending
+    ].
+
+reply_cases() ->
+    [
+     multi_trans_req_and_reply,
+     multi_trans_req_and_ack_and_reply,
+     multi_ack_and_reply
+    ].
+
+tickets_cases() ->
+    [
+     {group, otp_7192}
+    ].
+
+otp_7192_cases() ->
+    [
+     otp_7192_1,
+     otp_7192_2,
+     otp_7192_3
+    ].
 
 init_per_group(_GroupName, Config) ->
     Config.
@@ -156,8 +235,8 @@ single_ack(Config) when is_list(Config) ->
     MgcNode = make_node_name(mgc),
     MgNode  = make_node_name(mg),
     d("start nodes: "
-      "~n   MgcNode: ~p"
-      "~n   MgNode:  ~p", 
+      "~n      MGC Node: ~p"
+      "~n      MG Node:  ~p", 
       [MgcNode, MgNode]),
     ok = megaco_test_lib:start_nodes([MgcNode, MgNode], ?FILE, ?LINE),
 
@@ -216,7 +295,7 @@ multi_ack_timeout(doc) ->
     [];
 multi_ack_timeout(Config) when is_list(Config) ->
     %% <CONDITIONAL-SKIP>
-    Skippable = [win32, {unix, [darwin, linux]}], 
+    Skippable = [win32, {unix, [darwin, linux, sunos]}], % Is there any left?
     Condition = fun() -> ?OS_BASED_SKIP(Skippable) end,
     ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
     %% </CONDITIONAL-SKIP>
@@ -231,8 +310,8 @@ multi_ack_timeout(Config) when is_list(Config) ->
     MgcNode  = make_node_name(mgc),
     MgNode   = make_node_name(mg),
     d("start nodes: "
-      "~n   MgcNode: ~p"
-      "~n   MgNode:  ~p", 
+      "~n      MGC Node: ~p"
+      "~n      MG Node:  ~p", 
       [MgcNode, MgNode]),
     ok = megaco_test_lib:start_nodes([MgcNode, MgNode], ?FILE, ?LINE),
 
@@ -308,8 +387,8 @@ multi_ack_maxcount(Config) when is_list(Config) ->
     MgcNode  = make_node_name(mgc),
     MgNode   = make_node_name(mg),
     d("start nodes: "
-      "~n   MgcNode: ~p"
-      "~n   MgNode:  ~p", 
+      "~n      MGC Node: ~p"
+      "~n      MG Node:  ~p", 
       [MgcNode, MgNode]),
     ok = megaco_test_lib:start_nodes([MgcNode, MgNode], ?FILE, ?LINE),
 
@@ -393,8 +472,8 @@ single_trans_req(Config) when is_list(Config) ->
     MgcNode = make_node_name(mgc),
     MgNode  = make_node_name(mg),
     d("start nodes: "
-      "~n   MgcNode: ~p"
-      "~n   MgNode:  ~p", 
+      "~n      MGC Node: ~p"
+      "~n      MG Node:  ~p", 
       [MgcNode, MgNode]),
     ok = megaco_test_lib:start_nodes([MgcNode, MgNode], ?FILE, ?LINE),
 
@@ -628,26 +707,26 @@ str_mgc_service_change_reply_ar(Mid, Cid) ->
     CR    = cre_cmdReply(SCR),
     cre_actionReply(Cid, [CR]).
 
-str_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
-    AR    = str_mgc_service_change_reply_ar(Mid, Cid),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% str_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
+%%     AR    = str_mgc_service_change_reply_ar(Mid, Cid),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 str_mgc_notify_reply_ar(Cid, TermId) ->
     NR    = cre_notifyReply([TermId]),
     CR    = cre_cmdReply(NR),
     cre_actionReply(Cid, [CR]).
 
-str_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
-    AR    = str_mgc_notify_reply_ar(Cid, TermId),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% str_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
+%%     AR    = str_mgc_notify_reply_ar(Cid, TermId),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -778,12 +857,12 @@ str_mg_service_change_request_ar(_Mid, Cid) ->
     CR    = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-str_mg_service_change_request_msg(Mid, TransId, Cid) ->
-    AR    = str_mg_service_change_request_ar(Mid, Cid),
-    TR    = cre_transReq(TransId, [AR]),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% str_mg_service_change_request_msg(Mid, TransId, Cid) ->
+%%     AR    = str_mg_service_change_request_ar(Mid, Cid),
+%%     TR    = cre_transReq(TransId, [AR]),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 str_mg_notify_request_ar(Rid, Tid, Cid) ->
     TT      = cre_timeNotation("19990729", "22000000"),
@@ -794,12 +873,12 @@ str_mg_notify_request_ar(Rid, Tid, Cid) ->
     CR      = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-str_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
-    AR      = str_mg_notify_request_ar(Rid, TermId, Cid),
-    TR      = cre_transReq(TransId, [AR]),
-    Trans   = cre_transaction(TR),
-    Mess    = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% str_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
+%%     AR      = str_mg_notify_request_ar(Rid, TermId, Cid),
+%%     TR      = cre_transReq(TransId, [AR]),
+%%     Trans   = cre_transaction(TR),
+%%     Mess    = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -827,8 +906,8 @@ multi_trans_req_timeout(Config) when is_list(Config) ->
     MgcNode = make_node_name(mgc),
     MgNode  = make_node_name(mg),
     d("start nodes: "
-      "~n   MgcNode: ~p"
-      "~n   MgNode:  ~p", 
+      "~n      MGC Node: ~p"
+      "~n      MG Node:  ~p", 
       [MgcNode, MgNode]),
     ok = megaco_test_lib:start_nodes([MgcNode, MgNode], ?FILE, ?LINE),
 
@@ -1063,26 +1142,26 @@ mtrt_mgc_service_change_reply_ar(Mid, Cid) ->
     CR    = cre_cmdReply(SCR),
     cre_actionReply(Cid, [CR]).
 
-mtrt_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
-    AR    = mtrt_mgc_service_change_reply_ar(Mid, Cid),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrt_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
+%%     AR    = mtrt_mgc_service_change_reply_ar(Mid, Cid),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 mtrt_mgc_notify_reply_ar(Cid, TermId) ->
     NR    = cre_notifyReply([TermId]),
     CR    = cre_cmdReply(NR),
     cre_actionReply(Cid, [CR]).
 
-mtrt_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
-    AR    = mtrt_mgc_notify_reply_ar(Cid, TermId),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrt_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
+%%     AR    = mtrt_mgc_notify_reply_ar(Cid, TermId),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -1224,12 +1303,12 @@ mtrt_mg_service_change_request_ar(_Mid, Cid) ->
     CR    = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-mtrt_mg_service_change_request_msg(Mid, TransId, Cid) ->
-    AR    = mtrt_mg_service_change_request_ar(Mid, Cid),
-    TR    = cre_transReq(TransId, [AR]),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrt_mg_service_change_request_msg(Mid, TransId, Cid) ->
+%%     AR    = mtrt_mg_service_change_request_ar(Mid, Cid),
+%%     TR    = cre_transReq(TransId, [AR]),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 mtrt_mg_notify_request_ar(Rid, Tid, Cid) ->
     TT      = cre_timeNotation("19990729", "22000000"),
@@ -1240,12 +1319,12 @@ mtrt_mg_notify_request_ar(Rid, Tid, Cid) ->
     CR      = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-mtrt_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
-    AR      = mtrt_mg_notify_request_ar(Rid, TermId, Cid),
-    TR      = cre_transReq(TransId, [AR]),
-    Trans   = cre_transaction(TR),
-    Mess    = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrt_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
+%%     AR      = mtrt_mg_notify_request_ar(Rid, TermId, Cid),
+%%     TR      = cre_transReq(TransId, [AR]),
+%%     Trans   = cre_transaction(TR),
+%%     Mess    = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -1273,8 +1352,8 @@ multi_trans_req_maxcount1(Config) when is_list(Config) ->
     MgcNode = make_node_name(mgc),
     MgNode  = make_node_name(mg),
     d("start nodes: "
-      "~n   MgcNode: ~p"
-      "~n   MgNode:  ~p", 
+      "~n      MGC Node: ~p"
+      "~n      MG Node:  ~p", 
       [MgcNode, MgNode]),
     ok = megaco_test_lib:start_nodes([MgcNode, MgNode], ?FILE, ?LINE),
 
@@ -1509,26 +1588,26 @@ mtrmc1_mgc_service_change_reply_ar(Mid, Cid) ->
     CR    = cre_cmdReply(SCR),
     cre_actionReply(Cid, [CR]).
 
-mtrmc1_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
-    AR    = mtrmc1_mgc_service_change_reply_ar(Mid, Cid),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrmc1_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
+%%     AR    = mtrmc1_mgc_service_change_reply_ar(Mid, Cid),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 mtrmc1_mgc_notify_reply_ar(Cid, TermId) ->
     NR    = cre_notifyReply([TermId]),
     CR    = cre_cmdReply(NR),
     cre_actionReply(Cid, [CR]).
 
-mtrmc1_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
-    AR    = mtrmc1_mgc_notify_reply_ar(Cid, TermId),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrmc1_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
+%%     AR    = mtrmc1_mgc_notify_reply_ar(Cid, TermId),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -1675,12 +1754,12 @@ mtrmc1_mg_service_change_request_ar(_Mid, Cid) ->
     CR    = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-mtrmc1_mg_service_change_request_msg(Mid, TransId, Cid) ->
-    AR    = mtrmc1_mg_service_change_request_ar(Mid, Cid),
-    TR    = cre_transReq(TransId, [AR]),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrmc1_mg_service_change_request_msg(Mid, TransId, Cid) ->
+%%     AR    = mtrmc1_mg_service_change_request_ar(Mid, Cid),
+%%     TR    = cre_transReq(TransId, [AR]),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 mtrmc1_mg_notify_request_ar(Rid, Tid, Cid) ->
     TT      = cre_timeNotation("19990729", "22000000"),
@@ -1691,12 +1770,12 @@ mtrmc1_mg_notify_request_ar(Rid, Tid, Cid) ->
     CR      = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-mtrmc1_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
-    AR      = mtrmc1_mg_notify_request_ar(Rid, TermId, Cid),
-    TR      = cre_transReq(TransId, [AR]),
-    Trans   = cre_transaction(TR),
-    Mess    = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrmc1_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
+%%     AR      = mtrmc1_mg_notify_request_ar(Rid, TermId, Cid),
+%%     TR      = cre_transReq(TransId, [AR]),
+%%     Trans   = cre_transaction(TR),
+%%     Mess    = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -1725,8 +1804,8 @@ multi_trans_req_maxcount2(Config) when is_list(Config) ->
     MgcNode = make_node_name(mgc),
     MgNode  = make_node_name(mg),
     d("start nodes: "
-      "~n   MgcNode: ~p"
-      "~n   MgNode:  ~p", 
+      "~n      MGC Node: ~p"
+      "~n      MG Node:  ~p", 
       [MgcNode, MgNode]),
     ok = megaco_test_lib:start_nodes([MgcNode, MgNode], ?FILE, ?LINE),
 
@@ -1978,13 +2057,13 @@ mtrmc2_mgc_service_change_reply_ar(Mid, Cid) ->
     CR    = cre_cmdReply(SCR),
     cre_actionReply(Cid, [CR]).
 
-mtrmc2_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
-    AR    = mtrmc2_mgc_service_change_reply_ar(Mid, Cid),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrmc2_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
+%%     AR    = mtrmc2_mgc_service_change_reply_ar(Mid, Cid),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 mtrmc2_mgc_notify_reply_ar1(Cid, Tid) ->
     NR = cre_notifyReply([Tid]),
@@ -1995,13 +2074,13 @@ mtrmc2_mgc_notify_reply_ar2(Cid, Tids) ->
     CRs = [cre_cmdReply(cre_notifyReply([Tid])) || Tid <- Tids],
     cre_actionReply(Cid, CRs).
 
-mtrmc2_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
-    AR    = mtrmc2_mgc_notify_reply_ar1(Cid, TermId),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrmc2_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
+%%     AR    = mtrmc2_mgc_notify_reply_ar1(Cid, TermId),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -2163,12 +2242,12 @@ mtrmc2_mg_service_change_request_ar(_Mid, Cid) ->
     CR    = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-mtrmc2_mg_service_change_request_msg(Mid, TransId, Cid) ->
-    AR    = mtrmc2_mg_service_change_request_ar(Mid, Cid),
-    TR    = cre_transReq(TransId, [AR]),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrmc2_mg_service_change_request_msg(Mid, TransId, Cid) ->
+%%     AR    = mtrmc2_mg_service_change_request_ar(Mid, Cid),
+%%     TR    = cre_transReq(TransId, [AR]),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 mtrmc2_mg_notify_request_ar1(Rid, Tid, Cid) ->
     TT      = cre_timeNotation("19990729", "22000000"),
@@ -2194,12 +2273,12 @@ mtrmc2_mg_notify_request_ar2(Rid, Tid, Cid) ->
     CRs = [F(N) || N <- Ns],
     cre_actionReq(Cid, CRs).
 
-mtrmc2_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
-    AR      = mtrmc2_mg_notify_request_ar1(Rid, TermId, Cid),
-    TR      = cre_transReq(TransId, [AR]),
-    Trans   = cre_transaction(TR),
-    Mess    = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrmc2_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
+%%     AR      = mtrmc2_mg_notify_request_ar1(Rid, TermId, Cid),
+%%     TR      = cre_transReq(TransId, [AR]),
+%%     Trans   = cre_transaction(TR),
+%%     Mess    = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -2229,8 +2308,8 @@ multi_trans_req_maxsize1(Config) when is_list(Config) ->
     MgcNode = make_node_name(mgc),
     MgNode  = make_node_name(mg),
     d("start nodes: "
-      "~n   MgcNode: ~p"
-      "~n   MgNode:  ~p", 
+      "~n      MGC Node: ~p"
+      "~n      MG Node:  ~p", 
       [MgcNode, MgNode]),
     ok = megaco_test_lib:start_nodes([MgcNode, MgNode], ?FILE, ?LINE),
 
@@ -2466,26 +2545,26 @@ mtrms1_mgc_service_change_reply_ar(Mid, Cid) ->
     CR    = cre_cmdReply(SCR),
     cre_actionReply(Cid, [CR]).
 
-mtrms1_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
-    AR    = mtrms1_mgc_service_change_reply_ar(Mid, Cid),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrms1_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
+%%     AR    = mtrms1_mgc_service_change_reply_ar(Mid, Cid),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 mtrms1_mgc_notify_reply_ar1(Cid, Tid) ->
     NR = cre_notifyReply([Tid]),
     CR = cre_cmdReply(NR),
     cre_actionReply(Cid, [CR]).
 
-mtrms1_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
-    AR    = mtrms1_mgc_notify_reply_ar1(Cid, TermId),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrms1_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
+%%     AR    = mtrms1_mgc_notify_reply_ar1(Cid, TermId),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -2633,12 +2712,12 @@ mtrms1_mg_service_change_request_ar(_Mid, Cid) ->
     CR    = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-mtrms1_mg_service_change_request_msg(Mid, TransId, Cid) ->
-    AR    = mtrms1_mg_service_change_request_ar(Mid, Cid),
-    TR    = cre_transReq(TransId, [AR]),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrms1_mg_service_change_request_msg(Mid, TransId, Cid) ->
+%%     AR    = mtrms1_mg_service_change_request_ar(Mid, Cid),
+%%     TR    = cre_transReq(TransId, [AR]),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 mtrms1_mg_notify_request_ar1(Rid, Tid, Cid) ->
     TT      = cre_timeNotation("19990729", "22000000"),
@@ -2649,18 +2728,16 @@ mtrms1_mg_notify_request_ar1(Rid, Tid, Cid) ->
     CR      = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-mtrms1_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
-    AR      = mtrms1_mg_notify_request_ar1(Rid, TermId, Cid),
-    TR      = cre_transReq(TransId, [AR]),
-    Trans   = cre_transaction(TR),
-    Mess    = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrms1_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
+%%     AR      = mtrms1_mg_notify_request_ar1(Rid, TermId, Cid),
+%%     TR      = cre_transReq(TransId, [AR]),
+%%     Trans   = cre_transaction(TR),
+%%     Mess    = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 mtrms1_err_desc(T) ->
-    EC = ?megaco_internal_gateway_error,
-    ET = lists:flatten(io_lib:format("~w",[T])),
-    #'ErrorDescriptor'{errorCode = EC, errorText = ET}.
+    cre_ErrDesc(T).
 
 
 
@@ -2681,8 +2758,8 @@ multi_trans_req_maxsize2(Config) when is_list(Config) ->
     MgcNode = make_node_name(mgc),
     MgNode  = make_node_name(mg),
     d("start nodes: "
-      "~n   MgcNode: ~p"
-      "~n   MgNode:  ~p", 
+      "~n      MGC Node: ~p"
+      "~n      MG Node:  ~p", 
       [MgcNode, MgNode]),
     ok = megaco_test_lib:start_nodes([MgcNode, MgNode], ?FILE, ?LINE),
 
@@ -2934,13 +3011,13 @@ mtrms2_mgc_service_change_reply_ar(Mid, Cid) ->
     CR    = cre_cmdReply(SCR),
     cre_actionReply(Cid, [CR]).
 
-mtrms2_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
-    AR    = mtrms2_mgc_service_change_reply_ar(Mid, Cid),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrms2_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
+%%     AR    = mtrms2_mgc_service_change_reply_ar(Mid, Cid),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 mtrms2_mgc_notify_reply_ar1(Cid, Tid) ->
     NR = cre_notifyReply([Tid]),
@@ -2951,13 +3028,13 @@ mtrms2_mgc_notify_reply_ar2(Cid, Tids) ->
     CRs = [cre_cmdReply(cre_notifyReply([Tid])) || Tid <- Tids],
     cre_actionReply(Cid, CRs).
 
-mtrms2_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
-    AR    = mtrms2_mgc_notify_reply_ar1(Cid, TermId),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrms2_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
+%%     AR    = mtrms2_mgc_notify_reply_ar1(Cid, TermId),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -3115,12 +3192,12 @@ mtrms2_mg_service_change_request_ar(_Mid, Cid) ->
     CR    = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-mtrms2_mg_service_change_request_msg(Mid, TransId, Cid) ->
-    AR    = mtrms2_mg_service_change_request_ar(Mid, Cid),
-    TR    = cre_transReq(TransId, [AR]),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrms2_mg_service_change_request_msg(Mid, TransId, Cid) ->
+%%     AR    = mtrms2_mg_service_change_request_ar(Mid, Cid),
+%%     TR    = cre_transReq(TransId, [AR]),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 mtrms2_mg_notify_request_ar1(Rid, Tid, Cid) ->
     TT      = cre_timeNotation("19990729", "22000000"),
@@ -3146,18 +3223,16 @@ mtrms2_mg_notify_request_ar2(Rid, Tid, Cid) ->
     CRs = [F(N) || N <- Ns],
     cre_actionReq(Cid, CRs).
 
-mtrms2_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
-    AR      = mtrms2_mg_notify_request_ar1(Rid, TermId, Cid),
-    TR      = cre_transReq(TransId, [AR]),
-    Trans   = cre_transaction(TR),
-    Mess    = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrms2_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
+%%     AR      = mtrms2_mg_notify_request_ar1(Rid, TermId, Cid),
+%%     TR      = cre_transReq(TransId, [AR]),
+%%     Trans   = cre_transaction(TR),
+%%     Mess    = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 mtrms2_err_desc(T) ->
-    EC = ?megaco_internal_gateway_error,
-    ET = lists:flatten(io_lib:format("~w",[T])),
-    #'ErrorDescriptor'{errorCode = EC, errorText = ET}.
+    cre_ErrDesc(T).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3175,8 +3250,8 @@ single_trans_req_and_ack(Config) when is_list(Config) ->
     MgcNode = make_node_name(mgc),
     MgNode  = make_node_name(mg),
     d("start nodes: "
-      "~n   MgcNode: ~p"
-      "~n   MgNode:  ~p", 
+      "~n      MGC Node: ~p"
+      "~n      MG Node:  ~p", 
       [MgcNode, MgNode]),
     ok = megaco_test_lib:start_nodes([MgcNode, MgNode], ?FILE, ?LINE),
 
@@ -3439,26 +3514,26 @@ straa_mgc_service_change_reply_ar(Mid, Cid) ->
     CR    = cre_cmdReply(SCR),
     cre_actionReply(Cid, [CR]).
 
-straa_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
-    AR    = straa_mgc_service_change_reply_ar(Mid, Cid),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% straa_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
+%%     AR    = straa_mgc_service_change_reply_ar(Mid, Cid),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 straa_mgc_notify_reply_ar(Cid, TermId) ->
     NR    = cre_notifyReply([TermId]),
     CR    = cre_cmdReply(NR),
     cre_actionReply(Cid, [CR]).
 
-straa_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
-    AR    = straa_mgc_notify_reply_ar(Cid, TermId),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% straa_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
+%%     AR    = straa_mgc_notify_reply_ar(Cid, TermId),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -3605,12 +3680,12 @@ straa_mg_service_change_request_ar(_Mid, Cid) ->
     CR    = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-straa_mg_service_change_request_msg(Mid, TransId, Cid) ->
-    AR    = straa_mg_service_change_request_ar(Mid, Cid),
-    TR    = cre_transReq(TransId, [AR]),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% straa_mg_service_change_request_msg(Mid, TransId, Cid) ->
+%%     AR    = straa_mg_service_change_request_ar(Mid, Cid),
+%%     TR    = cre_transReq(TransId, [AR]),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 straa_mg_notify_request_ar(Rid, Tid, Cid) ->
     TT      = cre_timeNotation("19990729", "22000000"),
@@ -3621,12 +3696,12 @@ straa_mg_notify_request_ar(Rid, Tid, Cid) ->
     CR      = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-straa_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
-    AR      = straa_mg_notify_request_ar(Rid, TermId, Cid),
-    TR      = cre_transReq(TransId, [AR]),
-    Trans   = cre_transaction(TR),
-    Mess    = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% straa_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
+%%     AR      = straa_mg_notify_request_ar(Rid, TermId, Cid),
+%%     TR      = cre_transReq(TransId, [AR]),
+%%     Trans   = cre_transaction(TR),
+%%     Mess    = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -3634,9 +3709,7 @@ straa_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
 %%
 
 straa_err_desc(T) ->
-    EC = ?megaco_internal_gateway_error,
-    ET = lists:flatten(io_lib:format("~w",[T])),
-    #'ErrorDescriptor'{errorCode = EC, errorText = ET}.
+    cre_ErrDesc(T).
 
 
 
@@ -3656,8 +3729,8 @@ multi_trans_req_and_ack_timeout(Config) when is_list(Config) ->
     MgcNode = make_node_name(mgc),
     MgNode  = make_node_name(mg),
     d("start nodes: "
-      "~n   MgcNode: ~p"
-      "~n   MgNode:  ~p", 
+      "~n      MGC Node: ~p"
+      "~n      MG Node:  ~p", 
       [MgcNode, MgNode]),
     ok = megaco_test_lib:start_nodes([MgcNode, MgNode], ?FILE, ?LINE),
 
@@ -3926,26 +3999,26 @@ mtrtaat_mgc_service_change_reply_ar(Mid, Cid) ->
     CR    = cre_cmdReply(SCR),
     cre_actionReply(Cid, [CR]).
 
-mtrtaat_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
-    AR    = mtrtaat_mgc_service_change_reply_ar(Mid, Cid),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrtaat_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
+%%     AR    = mtrtaat_mgc_service_change_reply_ar(Mid, Cid),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 mtrtaat_mgc_notify_reply_ar(Cid, TermId) ->
     NR    = cre_notifyReply([TermId]),
     CR    = cre_cmdReply(NR),
     cre_actionReply(Cid, [CR]).
 
-mtrtaat_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
-    AR    = mtrtaat_mgc_notify_reply_ar(Cid, TermId),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrtaat_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
+%%     AR    = mtrtaat_mgc_notify_reply_ar(Cid, TermId),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -4098,12 +4171,12 @@ mtrtaat_mg_service_change_request_ar(_Mid, Cid) ->
     CR    = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-mtrtaat_mg_service_change_request_msg(Mid, TransId, Cid) ->
-    AR    = mtrtaat_mg_service_change_request_ar(Mid, Cid),
-    TR    = cre_transReq(TransId, [AR]),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrtaat_mg_service_change_request_msg(Mid, TransId, Cid) ->
+%%     AR    = mtrtaat_mg_service_change_request_ar(Mid, Cid),
+%%     TR    = cre_transReq(TransId, [AR]),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 mtrtaat_mg_notify_request_ar(Rid, Tid, Cid) ->
     TT      = cre_timeNotation("19990729", "22000000"),
@@ -4114,12 +4187,12 @@ mtrtaat_mg_notify_request_ar(Rid, Tid, Cid) ->
     CR      = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-mtrtaat_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
-    AR      = mtrtaat_mg_notify_request_ar(Rid, TermId, Cid),
-    TR      = cre_transReq(TransId, [AR]),
-    Trans   = cre_transaction(TR),
-    Mess    = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrtaat_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
+%%     AR      = mtrtaat_mg_notify_request_ar(Rid, TermId, Cid),
+%%     TR      = cre_transReq(TransId, [AR]),
+%%     Trans   = cre_transaction(TR),
+%%     Mess    = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -4127,9 +4200,7 @@ mtrtaat_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
 %%
 
 mtrtaat_err_desc(T) ->
-    EC = ?megaco_internal_gateway_error,
-    ET = lists:flatten(io_lib:format("~w",[T])),
-    #'ErrorDescriptor'{errorCode = EC, errorText = ET}.
+    cre_ErrDesc(T).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -4147,8 +4218,8 @@ multi_trans_req_and_ack_ackmaxcount(Config) when is_list(Config) ->
     MgcNode = make_node_name(mgc),
     MgNode  = make_node_name(mg),
     d("start nodes: "
-      "~n   MgcNode: ~p"
-      "~n   MgNode:  ~p", 
+      "~n      MGC Node: ~p"
+      "~n      MG Node:  ~p", 
       [MgcNode, MgNode]),
     ok = megaco_test_lib:start_nodes([MgcNode, MgNode], ?FILE, ?LINE),
 
@@ -4422,26 +4493,26 @@ mtrtaaamc_mgc_service_change_reply_ar(Mid, Cid) ->
     CR    = cre_cmdReply(SCR),
     cre_actionReply(Cid, [CR]).
 
-mtrtaaamc_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
-    AR    = mtrtaaamc_mgc_service_change_reply_ar(Mid, Cid),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrtaaamc_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
+%%     AR    = mtrtaaamc_mgc_service_change_reply_ar(Mid, Cid),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 mtrtaaamc_mgc_notify_reply_ar(Cid, TermId) ->
     NR    = cre_notifyReply([TermId]),
     CR    = cre_cmdReply(NR),
     cre_actionReply(Cid, [CR]).
 
-mtrtaaamc_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
-    AR    = mtrtaaamc_mgc_notify_reply_ar(Cid, TermId),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrtaaamc_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
+%%     AR    = mtrtaaamc_mgc_notify_reply_ar(Cid, TermId),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -4596,12 +4667,12 @@ mtrtaaamc_mg_service_change_request_ar(_Mid, Cid) ->
     CR    = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-mtrtaaamc_mg_service_change_request_msg(Mid, TransId, Cid) ->
-    AR    = mtrtaaamc_mg_service_change_request_ar(Mid, Cid),
-    TR    = cre_transReq(TransId, [AR]),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrtaaamc_mg_service_change_request_msg(Mid, TransId, Cid) ->
+%%     AR    = mtrtaaamc_mg_service_change_request_ar(Mid, Cid),
+%%     TR    = cre_transReq(TransId, [AR]),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 mtrtaaamc_mg_notify_request_ar(Rid, Tid, Cid) ->
     TT      = cre_timeNotation("19990729", "22000000"),
@@ -4612,12 +4683,12 @@ mtrtaaamc_mg_notify_request_ar(Rid, Tid, Cid) ->
     CR      = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-mtrtaaamc_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
-    AR      = mtrtaaamc_mg_notify_request_ar(Rid, TermId, Cid),
-    TR      = cre_transReq(TransId, [AR]),
-    Trans   = cre_transaction(TR),
-    Mess    = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrtaaamc_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
+%%     AR      = mtrtaaamc_mg_notify_request_ar(Rid, TermId, Cid),
+%%     TR      = cre_transReq(TransId, [AR]),
+%%     Trans   = cre_transaction(TR),
+%%     Mess    = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -4625,9 +4696,7 @@ mtrtaaamc_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
 %%
 
 mtrtaaamc_err_desc(T) ->
-    EC = ?megaco_internal_gateway_error,
-    ET = lists:flatten(io_lib:format("~w",[T])),
-    #'ErrorDescriptor'{errorCode = EC, errorText = ET}.
+    cre_ErrDesc(T).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -4645,8 +4714,8 @@ multi_trans_req_and_ack_reqmaxcount(Config) when is_list(Config) ->
     MgcNode = make_node_name(mgc),
     MgNode  = make_node_name(mg),
     d("start nodes: "
-      "~n   MgcNode: ~p"
-      "~n   MgNode:  ~p", 
+      "~n      MGC Node: ~p"
+      "~n      MG Node:  ~p", 
       [MgcNode, MgNode]),
     ok = megaco_test_lib:start_nodes([MgcNode, MgNode], ?FILE, ?LINE),
 
@@ -4919,26 +4988,26 @@ mtrtaarac_mgc_service_change_reply_ar(Mid, Cid) ->
     CR    = cre_cmdReply(SCR),
     cre_actionReply(Cid, [CR]).
 
-mtrtaarac_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
-    AR    = mtrtaarac_mgc_service_change_reply_ar(Mid, Cid),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrtaarac_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
+%%     AR    = mtrtaarac_mgc_service_change_reply_ar(Mid, Cid),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 mtrtaarac_mgc_notify_reply_ar(Cid, TermId) ->
     NR    = cre_notifyReply([TermId]),
     CR    = cre_cmdReply(NR),
     cre_actionReply(Cid, [CR]).
 
-mtrtaarac_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
-    AR    = mtrtaarac_mgc_notify_reply_ar(Cid, TermId),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrtaarac_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
+%%     AR    = mtrtaarac_mgc_notify_reply_ar(Cid, TermId),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -5093,12 +5162,12 @@ mtrtaarac_mg_service_change_request_ar(_Mid, Cid) ->
     CR    = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-mtrtaarac_mg_service_change_request_msg(Mid, TransId, Cid) ->
-    AR    = mtrtaarac_mg_service_change_request_ar(Mid, Cid),
-    TR    = cre_transReq(TransId, [AR]),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrtaarac_mg_service_change_request_msg(Mid, TransId, Cid) ->
+%%     AR    = mtrtaarac_mg_service_change_request_ar(Mid, Cid),
+%%     TR    = cre_transReq(TransId, [AR]),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 mtrtaarac_mg_notify_request_ar(Rid, Tid, Cid) ->
     TT      = cre_timeNotation("19990729", "22000000"),
@@ -5109,12 +5178,12 @@ mtrtaarac_mg_notify_request_ar(Rid, Tid, Cid) ->
     CR      = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-mtrtaarac_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
-    AR      = mtrtaarac_mg_notify_request_ar(Rid, TermId, Cid),
-    TR      = cre_transReq(TransId, [AR]),
-    Trans   = cre_transaction(TR),
-    Mess    = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrtaarac_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
+%%     AR      = mtrtaarac_mg_notify_request_ar(Rid, TermId, Cid),
+%%     TR      = cre_transReq(TransId, [AR]),
+%%     Trans   = cre_transaction(TR),
+%%     Mess    = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -5142,8 +5211,8 @@ multi_trans_req_and_ack_maxsize1(Config) when is_list(Config) ->
     MgcNode = make_node_name(mgc),
     MgNode  = make_node_name(mg),
     d("start nodes: "
-      "~n   MgcNode: ~p"
-      "~n   MgNode:  ~p", 
+      "~n      MGC Node: ~p"
+      "~n      MG Node:  ~p", 
       [MgcNode, MgNode]),
     ok = megaco_test_lib:start_nodes([MgcNode, MgNode], ?FILE, ?LINE),
 
@@ -5416,26 +5485,26 @@ mtrtaams1_mgc_service_change_reply_ar(Mid, Cid) ->
     CR    = cre_cmdReply(SCR),
     cre_actionReply(Cid, [CR]).
 
-mtrtaams1_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
-    AR    = mtrtaams1_mgc_service_change_reply_ar(Mid, Cid),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrtaams1_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
+%%     AR    = mtrtaams1_mgc_service_change_reply_ar(Mid, Cid),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 mtrtaams1_mgc_notify_reply_ar(Cid, TermId) ->
     NR    = cre_notifyReply([TermId]),
     CR    = cre_cmdReply(NR),
     cre_actionReply(Cid, [CR]).
 
-mtrtaams1_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
-    AR    = mtrtaams1_mgc_notify_reply_ar(Cid, TermId),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrtaams1_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
+%%     AR    = mtrtaams1_mgc_notify_reply_ar(Cid, TermId),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -5589,12 +5658,12 @@ mtrtaams1_mg_service_change_request_ar(_Mid, Cid) ->
     CR    = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-mtrtaams1_mg_service_change_request_msg(Mid, TransId, Cid) ->
-    AR    = mtrtaams1_mg_service_change_request_ar(Mid, Cid),
-    TR    = cre_transReq(TransId, [AR]),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrtaams1_mg_service_change_request_msg(Mid, TransId, Cid) ->
+%%     AR    = mtrtaams1_mg_service_change_request_ar(Mid, Cid),
+%%     TR    = cre_transReq(TransId, [AR]),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 mtrtaams1_mg_notify_request_ar(Rid, Tid, Cid) ->
     TT      = cre_timeNotation("19990729", "22000000"),
@@ -5605,12 +5674,12 @@ mtrtaams1_mg_notify_request_ar(Rid, Tid, Cid) ->
     CR      = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-mtrtaams1_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
-    AR      = mtrtaams1_mg_notify_request_ar(Rid, TermId, Cid),
-    TR      = cre_transReq(TransId, [AR]),
-    Trans   = cre_transaction(TR),
-    Mess    = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrtaams1_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
+%%     AR      = mtrtaams1_mg_notify_request_ar(Rid, TermId, Cid),
+%%     TR      = cre_transReq(TransId, [AR]),
+%%     Trans   = cre_transaction(TR),
+%%     Mess    = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -5618,9 +5687,7 @@ mtrtaams1_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
 %%
 
 mtrtaams1_err_desc(T) ->
-    EC = ?megaco_internal_gateway_error,
-    ET = lists:flatten(io_lib:format("~w",[T])),
-    #'ErrorDescriptor'{errorCode = EC, errorText = ET}.
+    cre_ErrDesc(T).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -5638,8 +5705,8 @@ multi_trans_req_and_ack_maxsize2(Config) when is_list(Config) ->
     MgcNode = make_node_name(mgc),
     MgNode  = make_node_name(mg),
     d("start nodes: "
-      "~n   MgcNode: ~p"
-      "~n   MgNode:  ~p", 
+      "~n      MGC Node: ~p"
+      "~n      MG Node:  ~p", 
       [MgcNode, MgNode]),
     ok = megaco_test_lib:start_nodes([MgcNode, MgNode], ?FILE, ?LINE),
 
@@ -5915,13 +5982,13 @@ mtrtaams2_mgc_service_change_reply_ar(Mid, Cid) ->
     CR    = cre_cmdReply(SCR),
     cre_actionReply(Cid, [CR]).
 
-mtrtaams2_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
-    AR    = mtrtaams2_mgc_service_change_reply_ar(Mid, Cid),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrtaams2_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
+%%     AR    = mtrtaams2_mgc_service_change_reply_ar(Mid, Cid),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 mtrtaams2_mgc_notify_reply_ar1(Cid, TermId) ->
     NR    = cre_notifyReply([TermId]),
@@ -5932,13 +5999,13 @@ mtrtaams2_mgc_notify_reply_ar2(Cid, Tids) ->
     CRs = [cre_cmdReply(cre_notifyReply([Tid])) || Tid <- Tids],
     cre_actionReply(Cid, CRs).
 
-mtrtaams2_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
-    AR    = mtrtaams2_mgc_notify_reply_ar1(Cid, TermId),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrtaams2_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
+%%     AR    = mtrtaams2_mgc_notify_reply_ar1(Cid, TermId),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -6093,12 +6160,12 @@ mtrtaams2_mg_service_change_request_ar(_Mid, Cid) ->
     CR    = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-mtrtaams2_mg_service_change_request_msg(Mid, TransId, Cid) ->
-    AR    = mtrtaams2_mg_service_change_request_ar(Mid, Cid),
-    TR    = cre_transReq(TransId, [AR]),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrtaams2_mg_service_change_request_msg(Mid, TransId, Cid) ->
+%%     AR    = mtrtaams2_mg_service_change_request_ar(Mid, Cid),
+%%     TR    = cre_transReq(TransId, [AR]),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 mtrtaams2_mg_notify_request_ar1(Rid, Tid, Cid) ->
     TT      = cre_timeNotation("19990729", "22000000"),
@@ -6124,12 +6191,12 @@ mtrtaams2_mg_notify_request_ar2(Rid, Tid, Cid) ->
     CRs = [F(N) || N <- Ns],
     cre_actionReq(Cid, CRs).
 
-mtrtaams2_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
-    AR      = mtrtaams2_mg_notify_request_ar1(Rid, TermId, Cid),
-    TR      = cre_transReq(TransId, [AR]),
-    Trans   = cre_transaction(TR),
-    Mess    = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtrtaams2_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
+%%     AR      = mtrtaams2_mg_notify_request_ar1(Rid, TermId, Cid),
+%%     TR      = cre_transReq(TransId, [AR]),
+%%     Trans   = cre_transaction(TR),
+%%     Mess    = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -6137,9 +6204,7 @@ mtrtaams2_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
 %%
 
 mtrtaams2_err_desc(T) ->
-    EC = ?megaco_internal_gateway_error,
-    ET = lists:flatten(io_lib:format("~w",[T])),
-    #'ErrorDescriptor'{errorCode = EC, errorText = ET}.
+    cre_ErrDesc(T).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -6177,8 +6242,8 @@ multi_trans_req_and_ack_and_pending(Config) when is_list(Config) ->
     MgcNode = make_node_name(mgc),
     MgNode  = make_node_name(mg),
     d("start nodes: "
-      "~n   MgcNode: ~p"
-      "~n   MgNode:  ~p", 
+      "~n      MGC Node: ~p"
+      "~n      MG Node:  ~p", 
       [MgcNode, MgNode]),
     ok = megaco_test_lib:start_nodes([MgcNode, MgNode], ?FILE, ?LINE),
 
@@ -6469,13 +6534,13 @@ mtraaap_mgc_service_change_reply_ar(Mid, Cid) ->
     CR    = cre_cmdReply(SCR),
     cre_actionReply(Cid, [CR]).
 
-mtraaap_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
-    AR    = mtraaap_mgc_service_change_reply_ar(Mid, Cid),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtraaap_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
+%%     AR    = mtraaap_mgc_service_change_reply_ar(Mid, Cid),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 mtraaap_mgc_notify_request_ar(Rid, Tid, Cid) ->
     TT      = cre_timeNotation("19990729", "44000000"),
@@ -6491,13 +6556,13 @@ mtraaap_mgc_notify_reply_ar(Cid, TermId) ->
     CR    = cre_cmdReply(NR),
     cre_actionReply(Cid, [CR]).
 
-mtraaap_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
-    AR    = mtraaap_mgc_notify_reply_ar(Cid, TermId),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtraaap_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
+%%     AR    = mtraaap_mgc_notify_reply_ar(Cid, TermId),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -6639,38 +6704,38 @@ mtraaap_mg_verify_service_change_reply(Else) ->
 	      "~n   Else: ~p~n", [Else]),
     {error, Else, ok}.
 
-mtraaap_mg_verify_notify_request_fun() ->
-    fun(Ev) ->
-	    mtraaap_mg_verify_notify_request(Ev)
-    end.
-
-mtraaap_mg_verify_notify_request(
-  {handle_trans_request, _, ?VERSION, [AR]}) ->
-    io:format("mtraaap_mg_verify_notify_request -> ok"
-	      "~n   AR: ~p~n", [AR]),
-    case AR of
-	#'ActionRequest'{contextId = 1 = Cid, 
-			 commandRequests = [CR]} ->
-	    #'CommandRequest'{command = Cmd} = CR,
-	    {notifyReq, NR} = Cmd,
-	    #'NotifyRequest'{terminationID = [Tid],
-			     observedEventsDescriptor = OED,
-			     errorDescriptor = asn1_NOVALUE} = NR,
-	    #'ObservedEventsDescriptor'{observedEventLst = [OE]} = OED,
-	    #'ObservedEvent'{eventName = "al/of"} = OE,
-	    Reply = {discard_ack, [mtraaap_mg_notify_reply_ar(Cid, Tid)]},
-	    {ok, 3000, AR, Reply};
-	_ ->
-	    ED = mtraaap_err_desc(AR),
-	    ErrReply = {discard_ack, ED},
-	    {error, AR, ErrReply}
-    end;
-mtraaap_mg_verify_notify_request(Else) ->
-    io:format("mtraaap_mg_verify_notify_request:fun -> unknown"
-	      "~n   Else: ~p~n", [Else]),
-    ED = mtraaap_err_desc(Else),
-    ErrReply = {discard_ack, ED},
-    {error, Else, ErrReply}.
+%% mtraaap_mg_verify_notify_request_fun() ->
+%%     fun(Ev) ->
+%% 	    mtraaap_mg_verify_notify_request(Ev)
+%%     end.
+
+%% mtraaap_mg_verify_notify_request(
+%%   {handle_trans_request, _, ?VERSION, [AR]}) ->
+%%     io:format("mtraaap_mg_verify_notify_request -> ok"
+%% 	      "~n   AR: ~p~n", [AR]),
+%%     case AR of
+%% 	#'ActionRequest'{contextId = 1 = Cid, 
+%% 			 commandRequests = [CR]} ->
+%% 	    #'CommandRequest'{command = Cmd} = CR,
+%% 	    {notifyReq, NR} = Cmd,
+%% 	    #'NotifyRequest'{terminationID = [Tid],
+%% 			     observedEventsDescriptor = OED,
+%% 			     errorDescriptor = asn1_NOVALUE} = NR,
+%% 	    #'ObservedEventsDescriptor'{observedEventLst = [OE]} = OED,
+%% 	    #'ObservedEvent'{eventName = "al/of"} = OE,
+%% 	    Reply = {discard_ack, [mtraaap_mg_notify_reply_ar(Cid, Tid)]},
+%% 	    {ok, 3000, AR, Reply};
+%% 	_ ->
+%% 	    ED = mtraaap_err_desc(AR),
+%% 	    ErrReply = {discard_ack, ED},
+%% 	    {error, AR, ErrReply}
+%%     end;
+%% mtraaap_mg_verify_notify_request(Else) ->
+%%     io:format("mtraaap_mg_verify_notify_request:fun -> unknown"
+%% 	      "~n   Else: ~p~n", [Else]),
+%%     ED = mtraaap_err_desc(Else),
+%%     ErrReply = {discard_ack, ED},
+%%     {error, Else, ErrReply}.
 
 mtraaap_mg_verify_notify_reply({handle_trans_reply, _CH, ?VERSION, 
 				{ok, [AR]}, _}) ->
@@ -6691,17 +6756,17 @@ mtraaap_mg_service_change_request_ar(_Mid, Cid) ->
     CR    = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-mtraaap_mg_service_change_request_msg(Mid, TransId, Cid) ->
-    AR    = mtraaap_mg_service_change_request_ar(Mid, Cid),
-    TR    = cre_transReq(TransId, [AR]),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtraaap_mg_service_change_request_msg(Mid, TransId, Cid) ->
+%%     AR    = mtraaap_mg_service_change_request_ar(Mid, Cid),
+%%     TR    = cre_transReq(TransId, [AR]),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
-mtraaap_mg_notify_reply_ar(Cid, TermId) ->
-    NR = cre_notifyReply([TermId]),
-    CR = cre_cmdReply(NR),
-    cre_actionReply(Cid, [CR]).
+%% mtraaap_mg_notify_reply_ar(Cid, TermId) ->
+%%     NR = cre_notifyReply([TermId]),
+%%     CR = cre_cmdReply(NR),
+%%     cre_actionReply(Cid, [CR]).
 
 mtraaap_mg_notify_request_ar(Rid, Tid, Cid) ->
     TT      = cre_timeNotation("19990729", "22000000"),
@@ -6712,12 +6777,12 @@ mtraaap_mg_notify_request_ar(Rid, Tid, Cid) ->
     CR      = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-mtraaap_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
-    AR    = mtraaap_mg_notify_request_ar(Rid, TermId, Cid),
-    TR    = cre_transReq(TransId, [AR]),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtraaap_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
+%%     AR    = mtraaap_mg_notify_request_ar(Rid, TermId, Cid),
+%%     TR    = cre_transReq(TransId, [AR]),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -6725,9 +6790,7 @@ mtraaap_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
 %%
 
 mtraaap_err_desc(T) ->
-    EC = ?megaco_internal_gateway_error,
-    ET = lists:flatten(io_lib:format("~w",[T])),
-    #'ErrorDescriptor'{errorCode = EC, errorText = ET}.
+    cre_ErrDesc(T).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -6765,8 +6828,8 @@ multi_trans_req_and_ack_and_reply(Config) when is_list(Config) ->
     MgcNode = make_node_name(mgc),
     MgNode  = make_node_name(mg),
     d("start nodes: "
-      "~n   MgcNode: ~p"
-      "~n   MgNode:  ~p", 
+      "~n      MGC Node: ~p"
+      "~n      MG Node:  ~p", 
       [MgcNode, MgNode]),
     ok = megaco_test_lib:start_nodes([MgcNode, MgNode], ?FILE, ?LINE),
 
@@ -7061,13 +7124,13 @@ mtraaar_mgc_service_change_reply_ar(Mid, Cid) ->
     CR    = cre_cmdReply(SCR),
     cre_actionReply(Cid, [CR]).
 
-mtraaar_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
-    AR    = mtraaar_mgc_service_change_reply_ar(Mid, Cid),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtraaar_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
+%%     AR    = mtraaar_mgc_service_change_reply_ar(Mid, Cid),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 mtraaar_mgc_notify_request_ar(Rid, Tid, Cid) ->
     TT      = cre_timeNotation("19990729", "44000000"),
@@ -7083,13 +7146,13 @@ mtraaar_mgc_notify_reply_ar(Cid, TermId) ->
     CR    = cre_cmdReply(NR),
     cre_actionReply(Cid, [CR]).
 
-mtraaar_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
-    AR    = mtraaar_mgc_notify_reply_ar(Cid, TermId),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtraaar_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
+%%     AR    = mtraaar_mgc_notify_reply_ar(Cid, TermId),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -7232,38 +7295,38 @@ mtraaar_mg_verify_service_change_reply(Else) ->
 	      "~n   Else: ~p~n", [Else]),
     {error, Else, ok}.
 
-mtraaar_mg_verify_notify_request_fun() ->
-    fun(Ev) ->
-	    mtraaar_mg_verify_notify_request(Ev)
-    end.
-
-mtraaar_mg_verify_notify_request(
-  {handle_trans_request, _, ?VERSION, [AR]}) ->
-    io:format("mtraaar_mg_verify_notify_request -> ok"
-	      "~n   AR: ~p~n", [AR]),
-    case AR of
-	#'ActionRequest'{contextId = 1 = Cid, 
-			 commandRequests = [CR]} ->
-	    #'CommandRequest'{command = Cmd} = CR,
-	    {notifyReq, NR} = Cmd,
-	    #'NotifyRequest'{terminationID = [Tid],
-			     observedEventsDescriptor = OED,
-			     errorDescriptor = asn1_NOVALUE} = NR,
-	    #'ObservedEventsDescriptor'{observedEventLst = [OE]} = OED,
-	    #'ObservedEvent'{eventName = "al/of"} = OE,
-	    Reply = {discard_ack, [mtraaar_mg_notify_reply_ar(Cid, Tid)]},
-	    {ok, AR, Reply};
-	_ ->
-	    ED = mtraaar_err_desc(AR),
-	    ErrReply = {discard_ack, ED},
-	    {error, AR, ErrReply}
-    end;
-mtraaar_mg_verify_notify_request(Else) ->
-    io:format("mtraaar_mg_verify_notify_request -> unknown"
-	      "~n   Else: ~p~n", [Else]),
-    ED = mtraaar_err_desc(Else),
-    ErrReply = {discard_ack, ED},
-    {error, Else, ErrReply}.
+%% mtraaar_mg_verify_notify_request_fun() ->
+%%     fun(Ev) ->
+%% 	    mtraaar_mg_verify_notify_request(Ev)
+%%     end.
+
+%% mtraaar_mg_verify_notify_request(
+%%   {handle_trans_request, _, ?VERSION, [AR]}) ->
+%%     io:format("mtraaar_mg_verify_notify_request -> ok"
+%% 	      "~n   AR: ~p~n", [AR]),
+%%     case AR of
+%% 	#'ActionRequest'{contextId = 1 = Cid, 
+%% 			 commandRequests = [CR]} ->
+%% 	    #'CommandRequest'{command = Cmd} = CR,
+%% 	    {notifyReq, NR} = Cmd,
+%% 	    #'NotifyRequest'{terminationID = [Tid],
+%% 			     observedEventsDescriptor = OED,
+%% 			     errorDescriptor = asn1_NOVALUE} = NR,
+%% 	    #'ObservedEventsDescriptor'{observedEventLst = [OE]} = OED,
+%% 	    #'ObservedEvent'{eventName = "al/of"} = OE,
+%% 	    Reply = {discard_ack, [mtraaar_mg_notify_reply_ar(Cid, Tid)]},
+%% 	    {ok, AR, Reply};
+%% 	_ ->
+%% 	    ED = mtraaar_err_desc(AR),
+%% 	    ErrReply = {discard_ack, ED},
+%% 	    {error, AR, ErrReply}
+%%     end;
+%% mtraaar_mg_verify_notify_request(Else) ->
+%%     io:format("mtraaar_mg_verify_notify_request -> unknown"
+%% 	      "~n   Else: ~p~n", [Else]),
+%%     ED = mtraaar_err_desc(Else),
+%%     ErrReply = {discard_ack, ED},
+%%     {error, Else, ErrReply}.
 
 mtraaar_mg_verify_notify_reply({handle_trans_reply, _CH, ?VERSION, 
 				{ok, [AR]}, _}) ->
@@ -7284,17 +7347,17 @@ mtraaar_mg_service_change_request_ar(_Mid, Cid) ->
     CR    = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-mtraaar_mg_service_change_request_msg(Mid, TransId, Cid) ->
-    AR    = mtraaar_mg_service_change_request_ar(Mid, Cid),
-    TR    = cre_transReq(TransId, [AR]),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtraaar_mg_service_change_request_msg(Mid, TransId, Cid) ->
+%%     AR    = mtraaar_mg_service_change_request_ar(Mid, Cid),
+%%     TR    = cre_transReq(TransId, [AR]),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
-mtraaar_mg_notify_reply_ar(Cid, TermId) ->
-    NR = cre_notifyReply([TermId]),
-    CR = cre_cmdReply(NR),
-    cre_actionReply(Cid, [CR]).
+%% mtraaar_mg_notify_reply_ar(Cid, TermId) ->
+%%     NR = cre_notifyReply([TermId]),
+%%     CR = cre_cmdReply(NR),
+%%     cre_actionReply(Cid, [CR]).
 
 mtraaar_mg_notify_request_ar(Rid, Tid, Cid) ->
     TT      = cre_timeNotation("19990729", "22000000"),
@@ -7305,12 +7368,12 @@ mtraaar_mg_notify_request_ar(Rid, Tid, Cid) ->
     CR      = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-mtraaar_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
-    AR    = mtraaar_mg_notify_request_ar(Rid, TermId, Cid),
-    TR    = cre_transReq(TransId, [AR]),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% mtraaar_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
+%%     AR    = mtraaar_mg_notify_request_ar(Rid, TermId, Cid),
+%%     TR    = cre_transReq(TransId, [AR]),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -7318,9 +7381,7 @@ mtraaar_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
 %%
 
 mtraaar_err_desc(T) ->
-    EC = ?megaco_internal_gateway_error,
-    ET = lists:flatten(io_lib:format("~w",[T])),
-    #'ErrorDescriptor'{errorCode = EC, errorText = ET}.
+    cre_ErrDesc(T).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -7348,8 +7409,8 @@ otp_7192_1(Config) when is_list(Config) ->
     MgcNode = make_node_name(mgc),
     MgNode  = make_node_name(mg),
     d("start nodes: "
-      "~n   MgcNode: ~p"
-      "~n   MgNode:  ~p", 
+      "~n      MGC Node: ~p"
+      "~n      MG Node:  ~p", 
       [MgcNode, MgNode]),
 
     MgMid = {deviceName,"mg"},
@@ -7643,13 +7704,13 @@ otp71921_mgc_service_change_reply_ar(Mid, Cid) ->
     CR    = cre_cmdReply(SCR),
     cre_actionReply(Cid, [CR]).
 
-otp71921_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
-    AR    = otp71921_mgc_service_change_reply_ar(Mid, Cid),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% otp71921_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
+%%     AR    = otp71921_mgc_service_change_reply_ar(Mid, Cid),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 otp71921_mgc_notify_request_ar(Rid, Tid, Cid) ->
     TT      = cre_timeNotation("19990729", "44000000"),
@@ -7665,13 +7726,13 @@ otp71921_mgc_notify_reply_ar(Cid, TermId) ->
     CR    = cre_cmdReply(NR),
     cre_actionReply(Cid, [CR]).
 
-otp71921_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
-    AR    = otp71921_mgc_notify_reply_ar(Cid, TermId),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% otp71921_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
+%%     AR    = otp71921_mgc_notify_reply_ar(Cid, TermId),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -7813,38 +7874,38 @@ otp71921_mg_verify_service_change_reply(Else) ->
 	      "~n   Else: ~p~n", [Else]),
     {error, Else, ok}.
 
-otp71921_mg_verify_notify_request_fun() ->
-    fun(Ev) ->
-	    otp71921_mg_verify_notify_request(Ev)
-    end.
-
-otp71921_mg_verify_notify_request(
-  {handle_trans_request, _, ?VERSION, [AR]}) ->
-    io:format("otp71921_mg_verify_notify_request -> ok"
-	      "~n   AR: ~p~n", [AR]),
-    case AR of
-	#'ActionRequest'{contextId = 1 = Cid, 
-			 commandRequests = [CR]} ->
-	    #'CommandRequest'{command = Cmd} = CR,
-	    {notifyReq, NR} = Cmd,
-	    #'NotifyRequest'{terminationID = [Tid],
-			     observedEventsDescriptor = OED,
-			     errorDescriptor = asn1_NOVALUE} = NR,
-	    #'ObservedEventsDescriptor'{observedEventLst = [OE]} = OED,
-	    #'ObservedEvent'{eventName = "al/of"} = OE,
-	    Reply = {discard_ack, [otp71921_mg_notify_reply_ar(Cid, Tid)]},
-	    {ok, AR, Reply};
-	_ ->
-	    ED = otp71921_err_desc(AR),
-	    ErrReply = {discard_ack, ED},
-	    {error, AR, ErrReply}
-    end;
-otp71921_mg_verify_notify_request(Else) ->
-    io:format("otp71921_mg_verify_notify_request -> unknown"
-	      "~n   Else: ~p~n", [Else]),
-    ED = otp71921_err_desc(Else),
-    ErrReply = {discard_ack, ED},
-    {error, Else, ErrReply}.
+%% otp71921_mg_verify_notify_request_fun() ->
+%%     fun(Ev) ->
+%% 	    otp71921_mg_verify_notify_request(Ev)
+%%     end.
+
+%% otp71921_mg_verify_notify_request(
+%%   {handle_trans_request, _, ?VERSION, [AR]}) ->
+%%     io:format("otp71921_mg_verify_notify_request -> ok"
+%% 	      "~n   AR: ~p~n", [AR]),
+%%     case AR of
+%% 	#'ActionRequest'{contextId = 1 = Cid, 
+%% 			 commandRequests = [CR]} ->
+%% 	    #'CommandRequest'{command = Cmd} = CR,
+%% 	    {notifyReq, NR} = Cmd,
+%% 	    #'NotifyRequest'{terminationID = [Tid],
+%% 			     observedEventsDescriptor = OED,
+%% 			     errorDescriptor = asn1_NOVALUE} = NR,
+%% 	    #'ObservedEventsDescriptor'{observedEventLst = [OE]} = OED,
+%% 	    #'ObservedEvent'{eventName = "al/of"} = OE,
+%% 	    Reply = {discard_ack, [otp71921_mg_notify_reply_ar(Cid, Tid)]},
+%% 	    {ok, AR, Reply};
+%% 	_ ->
+%% 	    ED = otp71921_err_desc(AR),
+%% 	    ErrReply = {discard_ack, ED},
+%% 	    {error, AR, ErrReply}
+%%     end;
+%% otp71921_mg_verify_notify_request(Else) ->
+%%     io:format("otp71921_mg_verify_notify_request -> unknown"
+%% 	      "~n   Else: ~p~n", [Else]),
+%%     ED = otp71921_err_desc(Else),
+%%     ErrReply = {discard_ack, ED},
+%%     {error, Else, ErrReply}.
 
 otp71921_mg_verify_notify_reply({handle_trans_reply, _CH, ?VERSION, 
 				{ok, [AR]}, _}) ->
@@ -7865,17 +7926,17 @@ otp71921_mg_service_change_request_ar(_Mid, Cid) ->
     CR    = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-otp71921_mg_service_change_request_msg(Mid, TransId, Cid) ->
-    AR    = otp71921_mg_service_change_request_ar(Mid, Cid),
-    TR    = cre_transReq(TransId, [AR]),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% otp71921_mg_service_change_request_msg(Mid, TransId, Cid) ->
+%%     AR    = otp71921_mg_service_change_request_ar(Mid, Cid),
+%%     TR    = cre_transReq(TransId, [AR]),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
-otp71921_mg_notify_reply_ar(Cid, TermId) ->
-    NR = cre_notifyReply([TermId]),
-    CR = cre_cmdReply(NR),
-    cre_actionReply(Cid, [CR]).
+%% otp71921_mg_notify_reply_ar(Cid, TermId) ->
+%%     NR = cre_notifyReply([TermId]),
+%%     CR = cre_cmdReply(NR),
+%%     cre_actionReply(Cid, [CR]).
 
 otp71921_mg_notify_request_ar(Rid, Tid, Cid) ->
     TT      = cre_timeNotation("19990729", "22000000"),
@@ -7886,12 +7947,12 @@ otp71921_mg_notify_request_ar(Rid, Tid, Cid) ->
     CR      = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-otp71921_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
-    AR    = otp71921_mg_notify_request_ar(Rid, TermId, Cid),
-    TR    = cre_transReq(TransId, [AR]),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% otp71921_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
+%%     AR    = otp71921_mg_notify_request_ar(Rid, TermId, Cid),
+%%     TR    = cre_transReq(TransId, [AR]),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -7919,8 +7980,8 @@ otp_7192_2(Config) when is_list(Config) ->
     MgcNode = make_node_name(mgc),
     MgNode  = make_node_name(mg),
     d("start nodes: "
-      "~n   MgcNode: ~p"
-      "~n   MgNode:  ~p", 
+      "~n      MGC Node: ~p"
+      "~n      MG Node:  ~p", 
       [MgcNode, MgNode]),
 
     MgMid = {deviceName,"mg"},
@@ -8213,13 +8274,13 @@ otp71922_mgc_service_change_reply_ar(Mid, Cid) ->
     CR    = cre_cmdReply(SCR),
     cre_actionReply(Cid, [CR]).
 
-otp71922_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
-    AR    = otp71922_mgc_service_change_reply_ar(Mid, Cid),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% otp71922_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
+%%     AR    = otp71922_mgc_service_change_reply_ar(Mid, Cid),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 otp71922_mgc_notify_request_ar(Rid, Tid, Cid) ->
     TT      = cre_timeNotation("19990729", "44000000"),
@@ -8235,13 +8296,13 @@ otp71922_mgc_notify_reply_ar(Cid, TermId) ->
     CR    = cre_cmdReply(NR),
     cre_actionReply(Cid, [CR]).
 
-otp71922_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
-    AR    = otp71922_mgc_notify_reply_ar(Cid, TermId),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% otp71922_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
+%%     AR    = otp71922_mgc_notify_reply_ar(Cid, TermId),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -8379,38 +8440,38 @@ otp71922_mg_verify_service_change_reply(Else) ->
 	      "~n   Else: ~p~n", [Else]),
     {error, Else, ok}.
 
-otp71922_mg_verify_notify_request_fun() ->
-    fun(Ev) ->
-	    otp71922_mg_verify_notify_request(Ev)
-    end.
-
-otp71922_mg_verify_notify_request(
-  {handle_trans_request, _, ?VERSION, [AR]}) ->
-    io:format("otp71922_mg_verify_notify_request -> ok"
-	      "~n   AR: ~p~n", [AR]),
-    case AR of
-	#'ActionRequest'{contextId = 1 = Cid, 
-			 commandRequests = [CR]} ->
-	    #'CommandRequest'{command = Cmd} = CR,
-	    {notifyReq, NR} = Cmd,
-	    #'NotifyRequest'{terminationID = [Tid],
-			     observedEventsDescriptor = OED,
-			     errorDescriptor = asn1_NOVALUE} = NR,
-	    #'ObservedEventsDescriptor'{observedEventLst = [OE]} = OED,
-	    #'ObservedEvent'{eventName = "al/of"} = OE,
-	    Reply = {discard_ack, [otp71922_mg_notify_reply_ar(Cid, Tid)]},
-	    {ok, AR, Reply};
-	_ ->
-	    ED = otp71922_err_desc(AR),
-	    ErrReply = {discard_ack, ED},
-	    {error, AR, ErrReply}
-    end;
-otp71922_mg_verify_notify_request(Else) ->
-    io:format("otp71922_mg_verify_notify_request -> unknown"
-	      "~n   Else: ~p~n", [Else]),
-    ED = otp71922_err_desc(Else),
-    ErrReply = {discard_ack, ED},
-    {error, Else, ErrReply}.
+%% otp71922_mg_verify_notify_request_fun() ->
+%%     fun(Ev) ->
+%% 	    otp71922_mg_verify_notify_request(Ev)
+%%     end.
+
+%% otp71922_mg_verify_notify_request(
+%%   {handle_trans_request, _, ?VERSION, [AR]}) ->
+%%     io:format("otp71922_mg_verify_notify_request -> ok"
+%% 	      "~n   AR: ~p~n", [AR]),
+%%     case AR of
+%% 	#'ActionRequest'{contextId = 1 = Cid, 
+%% 			 commandRequests = [CR]} ->
+%% 	    #'CommandRequest'{command = Cmd} = CR,
+%% 	    {notifyReq, NR} = Cmd,
+%% 	    #'NotifyRequest'{terminationID = [Tid],
+%% 			     observedEventsDescriptor = OED,
+%% 			     errorDescriptor = asn1_NOVALUE} = NR,
+%% 	    #'ObservedEventsDescriptor'{observedEventLst = [OE]} = OED,
+%% 	    #'ObservedEvent'{eventName = "al/of"} = OE,
+%% 	    Reply = {discard_ack, [otp71922_mg_notify_reply_ar(Cid, Tid)]},
+%% 	    {ok, AR, Reply};
+%% 	_ ->
+%% 	    ED = otp71922_err_desc(AR),
+%% 	    ErrReply = {discard_ack, ED},
+%% 	    {error, AR, ErrReply}
+%%     end;
+%% otp71922_mg_verify_notify_request(Else) ->
+%%     io:format("otp71922_mg_verify_notify_request -> unknown"
+%% 	      "~n   Else: ~p~n", [Else]),
+%%     ED = otp71922_err_desc(Else),
+%%     ErrReply = {discard_ack, ED},
+%%     {error, Else, ErrReply}.
 
 otp71922_mg_verify_notify_reply({handle_trans_reply, _CH, ?VERSION, 
 				{ok, [AR]}, _}) ->
@@ -8431,17 +8492,17 @@ otp71922_mg_service_change_request_ar(_Mid, Cid) ->
     CR    = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-otp71922_mg_service_change_request_msg(Mid, TransId, Cid) ->
-    AR    = otp71922_mg_service_change_request_ar(Mid, Cid),
-    TR    = cre_transReq(TransId, [AR]),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% otp71922_mg_service_change_request_msg(Mid, TransId, Cid) ->
+%%     AR    = otp71922_mg_service_change_request_ar(Mid, Cid),
+%%     TR    = cre_transReq(TransId, [AR]),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
-otp71922_mg_notify_reply_ar(Cid, TermId) ->
-    NR = cre_notifyReply([TermId]),
-    CR = cre_cmdReply(NR),
-    cre_actionReply(Cid, [CR]).
+%% otp71922_mg_notify_reply_ar(Cid, TermId) ->
+%%     NR = cre_notifyReply([TermId]),
+%%     CR = cre_cmdReply(NR),
+%%     cre_actionReply(Cid, [CR]).
 
 otp71922_mg_notify_request_ar(Rid, Tid, Cid) ->
     TT      = cre_timeNotation("19990729", "22000000"),
@@ -8452,12 +8513,12 @@ otp71922_mg_notify_request_ar(Rid, Tid, Cid) ->
     CR      = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-otp71922_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
-    AR    = otp71922_mg_notify_request_ar(Rid, TermId, Cid),
-    TR    = cre_transReq(TransId, [AR]),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% otp71922_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
+%%     AR    = otp71922_mg_notify_request_ar(Rid, TermId, Cid),
+%%     TR    = cre_transReq(TransId, [AR]),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -8465,9 +8526,7 @@ otp71922_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
 %%
 
 otp71922_err_desc(T) ->
-    EC = ?megaco_internal_gateway_error,
-    ET = lists:flatten(io_lib:format("~w",[T])),
-    #'ErrorDescriptor'{errorCode = EC, errorText = ET}.
+    cre_ErrDesc(T).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -8485,8 +8544,8 @@ otp_7192_3(Config) when is_list(Config) ->
     MgcNode = make_node_name(mgc),
     MgNode  = make_node_name(mg),
     d("start nodes: "
-      "~n   MgcNode: ~p"
-      "~n   MgNode:  ~p", 
+      "~n      MGC Node: ~p"
+      "~n      MG Node:  ~p", 
       [MgcNode, MgNode]),
 
     MgMid = {deviceName,"mg"},
@@ -8779,13 +8838,13 @@ otp72923_mgc_service_change_reply_ar(Mid, Cid) ->
     CR    = cre_cmdReply(SCR),
     cre_actionReply(Cid, [CR]).
 
-otp72923_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
-    AR    = otp72923_mgc_service_change_reply_ar(Mid, Cid),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% otp72923_mgc_service_change_reply_msg(Mid, TransId, Cid) ->
+%%     AR    = otp72923_mgc_service_change_reply_ar(Mid, Cid),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 otp72923_mgc_notify_request_ar(Rid, Tid, Cid) ->
     TT      = cre_timeNotation("19990729", "44000000"),
@@ -8801,13 +8860,13 @@ otp72923_mgc_notify_reply_ar(Cid, TermId) ->
     CR    = cre_cmdReply(NR),
     cre_actionReply(Cid, [CR]).
 
-otp72923_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
-    AR    = otp72923_mgc_notify_reply_ar(Cid, TermId),
-    TRes  = cre_transResult([AR]),
-    TR    = cre_transReply(TransId, TRes),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% otp72923_mgc_notify_reply(Mid, TransId, Cid, TermId) ->
+%%     AR    = otp72923_mgc_notify_reply_ar(Cid, TermId),
+%%     TRes  = cre_transResult([AR]),
+%%     TR    = cre_transReply(TransId, TRes),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -8946,38 +9005,38 @@ otp72923_mg_verify_service_change_reply(Else) ->
 	      "~n   Else: ~p~n", [Else]),
     {error, Else, ok}.
 
-otp72923_mg_verify_notify_request_fun() ->
-    fun(Ev) ->
-	    otp72923_mg_verify_notify_request(Ev)
-    end.
-
-otp72923_mg_verify_notify_request(
-  {handle_trans_request, _, ?VERSION, [AR]}) ->
-    io:format("otp72923_mg_verify_notify_request -> ok"
-	      "~n   AR: ~p~n", [AR]),
-    case AR of
-	#'ActionRequest'{contextId = 1 = Cid, 
-			 commandRequests = [CR]} ->
-	    #'CommandRequest'{command = Cmd} = CR,
-	    {notifyReq, NR} = Cmd,
-	    #'NotifyRequest'{terminationID = [Tid],
-			     observedEventsDescriptor = OED,
-			     errorDescriptor = asn1_NOVALUE} = NR,
-	    #'ObservedEventsDescriptor'{observedEventLst = [OE]} = OED,
-	    #'ObservedEvent'{eventName = "al/of"} = OE,
-	    Reply = {discard_ack, [otp72923_mg_notify_reply_ar(Cid, Tid)]},
-	    {ok, AR, Reply};
-	_ ->
-	    ED = otp72923_err_desc(AR),
-	    ErrReply = {discard_ack, ED},
-	    {error, AR, ErrReply}
-    end;
-otp72923_mg_verify_notify_request(Else) ->
-    io:format("otp72923_mg_verify_notify_request -> unknown"
-	      "~n   Else: ~p~n", [Else]),
-    ED = otp72923_err_desc(Else),
-    ErrReply = {discard_ack, ED},
-    {error, Else, ErrReply}.
+%% otp72923_mg_verify_notify_request_fun() ->
+%%     fun(Ev) ->
+%% 	    otp72923_mg_verify_notify_request(Ev)
+%%     end.
+
+%% otp72923_mg_verify_notify_request(
+%%   {handle_trans_request, _, ?VERSION, [AR]}) ->
+%%     io:format("otp72923_mg_verify_notify_request -> ok"
+%% 	      "~n   AR: ~p~n", [AR]),
+%%     case AR of
+%% 	#'ActionRequest'{contextId = 1 = Cid, 
+%% 			 commandRequests = [CR]} ->
+%% 	    #'CommandRequest'{command = Cmd} = CR,
+%% 	    {notifyReq, NR} = Cmd,
+%% 	    #'NotifyRequest'{terminationID = [Tid],
+%% 			     observedEventsDescriptor = OED,
+%% 			     errorDescriptor = asn1_NOVALUE} = NR,
+%% 	    #'ObservedEventsDescriptor'{observedEventLst = [OE]} = OED,
+%% 	    #'ObservedEvent'{eventName = "al/of"} = OE,
+%% 	    Reply = {discard_ack, [otp72923_mg_notify_reply_ar(Cid, Tid)]},
+%% 	    {ok, AR, Reply};
+%% 	_ ->
+%% 	    ED = otp72923_err_desc(AR),
+%% 	    ErrReply = {discard_ack, ED},
+%% 	    {error, AR, ErrReply}
+%%     end;
+%% otp72923_mg_verify_notify_request(Else) ->
+%%     io:format("otp72923_mg_verify_notify_request -> unknown"
+%% 	      "~n   Else: ~p~n", [Else]),
+%%     ED = otp72923_err_desc(Else),
+%%     ErrReply = {discard_ack, ED},
+%%     {error, Else, ErrReply}.
 
 otp72923_mg_verify_notify_reply({handle_trans_reply, _CH, ?VERSION, 
 				{ok, [AR]}, _}) ->
@@ -8998,17 +9057,17 @@ otp72923_mg_service_change_request_ar(_Mid, Cid) ->
     CR    = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-otp72923_mg_service_change_request_msg(Mid, TransId, Cid) ->
-    AR    = otp72923_mg_service_change_request_ar(Mid, Cid),
-    TR    = cre_transReq(TransId, [AR]),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% otp72923_mg_service_change_request_msg(Mid, TransId, Cid) ->
+%%     AR    = otp72923_mg_service_change_request_ar(Mid, Cid),
+%%     TR    = cre_transReq(TransId, [AR]),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
-otp72923_mg_notify_reply_ar(Cid, TermId) ->
-    NR = cre_notifyReply([TermId]),
-    CR = cre_cmdReply(NR),
-    cre_actionReply(Cid, [CR]).
+%% otp72923_mg_notify_reply_ar(Cid, TermId) ->
+%%     NR = cre_notifyReply([TermId]),
+%%     CR = cre_cmdReply(NR),
+%%     cre_actionReply(Cid, [CR]).
 
 otp72923_mg_notify_request_ar(Rid, Tid, Cid) ->
     TT      = cre_timeNotation("19990729", "22000000"),
@@ -9019,12 +9078,12 @@ otp72923_mg_notify_request_ar(Rid, Tid, Cid) ->
     CR      = cre_cmdReq(CMD),
     cre_actionReq(Cid, [CR]).
 
-otp72923_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
-    AR    = otp72923_mg_notify_request_ar(Rid, TermId, Cid),
-    TR    = cre_transReq(TransId, [AR]),
-    Trans = cre_transaction(TR),
-    Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
-    cre_megacoMessage(Mess).
+%% otp72923_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
+%%     AR    = otp72923_mg_notify_request_ar(Rid, TermId, Cid),
+%%     TR    = cre_transReq(TransId, [AR]),
+%%     Trans = cre_transaction(TR),
+%%     Mess  = cre_message(?VERSION, Mid, cre_transactions([Trans])),
+%%     cre_megacoMessage(Mess).
 
 
 %%
@@ -9032,9 +9091,7 @@ otp72923_notify_request_msg(Mid, TransId, Rid, TermId, Cid) ->
 %%
 
 otp72923_err_desc(T) ->
-    EC = ?megaco_internal_gateway_error,
-    ET = lists:flatten(io_lib:format("~w",[T])),
-    #'ErrorDescriptor'{errorCode = EC, errorText = ET}.
+    cre_ErrDesc(T).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -9065,10 +9122,10 @@ cre_timeNotation(D,T) ->
 cre_obsEvent(Name, Not) ->
     #'ObservedEvent'{eventName    = Name, 
 		     timeNotation = Not}.
-cre_obsEvent(Name, Not, Par) ->
-    #'ObservedEvent'{eventName    = Name, 
-		     timeNotation = Not, 
-		     eventParList = Par}.
+%% cre_obsEvent(Name, Not, Par) ->
+%%     #'ObservedEvent'{eventName    = Name, 
+%% 		     timeNotation = Not, 
+%% 		     eventParList = Par}.
 
 cre_obsEvsDesc(Id, EvList) ->
     #'ObservedEventsDescriptor'{requestId        = Id, 
@@ -9090,9 +9147,9 @@ cre_actionReq(CtxId, CmdReqs) when is_list(CmdReqs) ->
     #'ActionRequest'{contextId       = CtxId,
 		     commandRequests = CmdReqs}.
 
-cre_transReq(TransId, ARs) when is_list(ARs) ->
-    #'TransactionRequest'{transactionId = TransId,
-			  actions       = ARs}.
+%% cre_transReq(TransId, ARs) when is_list(ARs) ->
+%%     #'TransactionRequest'{transactionId = TransId,
+%% 			  actions       = ARs}.
 
 %% --
 
@@ -9120,14 +9177,14 @@ cre_actionReply(CtxId, CmdRep) ->
     #'ActionReply'{contextId    = CtxId,
                    commandReply = CmdRep}.
 
-cre_transResult(ED) when is_record(ED, 'ErrorDescriptor') ->
-    {transactionError, ED};
-cre_transResult([AR|_] = ARs) when is_record(AR, 'ActionReply') ->
-    {actionReplies, ARs}.
+%% cre_transResult(ED) when is_record(ED, 'ErrorDescriptor') ->
+%%     {transactionError, ED};
+%% cre_transResult([AR|_] = ARs) when is_record(AR, 'ActionReply') ->
+%%     {actionReplies, ARs}.
 
-cre_transReply(TransId, Res) ->
-    #'TransactionReply'{transactionId     = TransId,
-			transactionResult = Res}.
+%% cre_transReply(TransId, Res) ->
+%%     #'TransactionReply'{transactionId     = TransId,
+%% 			transactionResult = Res}.
 
 
 %% --
@@ -9136,48 +9193,48 @@ cre_serviceChangeProf(Name, Ver) when is_list(Name) andalso is_integer(Ver) ->
     #'ServiceChangeProfile'{profileName = Name, 
 			    version     = Ver}.
 
-cre_transaction(Trans) when is_record(Trans, 'TransactionRequest') ->
-    {transactionRequest, Trans};
-cre_transaction(Trans) when is_record(Trans, 'TransactionPending') ->
-    {transactionPending, Trans};
-cre_transaction(Trans) when is_record(Trans, 'TransactionReply') ->
-    {transactionReply, Trans};
-cre_transaction(Trans) when is_record(Trans, 'TransactionAck') ->
-    {transactionResponseAck, Trans}.
-
-cre_transactions(Trans) when is_list(Trans) ->
-    {transactions, Trans}.
-
-cre_message(Version, Mid, Body) ->
-    #'Message'{version     = Version,
-	       mId         = Mid,
-	       messageBody = Body}.
-
-cre_megacoMessage(Mess) ->
-    #'MegacoMessage'{mess = Mess}.
+%% cre_transaction(Trans) when is_record(Trans, 'TransactionRequest') ->
+%%     {transactionRequest, Trans};
+%% cre_transaction(Trans) when is_record(Trans, 'TransactionPending') ->
+%%     {transactionPending, Trans};
+%% cre_transaction(Trans) when is_record(Trans, 'TransactionReply') ->
+%%     {transactionReply, Trans};
+%% cre_transaction(Trans) when is_record(Trans, 'TransactionAck') ->
+%%     {transactionResponseAck, Trans}.
+
+%% cre_transactions(Trans) when is_list(Trans) ->
+%%     {transactions, Trans}.
+
+%% cre_message(Version, Mid, Body) ->
+%%     #'Message'{version     = Version,
+%% 	       mId         = Mid,
+%% 	       messageBody = Body}.
+
+%% cre_megacoMessage(Mess) ->
+%%     #'MegacoMessage'{mess = Mess}.
    
     
 %%
 %% Common functions
 %%
 
-encode_msg_fun(Mod, Conf) ->
-    fun(M) -> 
-            Mod:encode_message(Conf, M) 
-    end.
-encode_msg_fun(Mod, Conf, Ver) ->
-    fun(M) -> 
-            Mod:encode_message(Conf, Ver, M) 
-    end.
-
-decode_msg_fun(Mod, Conf) ->
-    fun(M) -> 
-            Mod:decode_message(Conf, M) 
-    end.
-decode_msg_fun(Mod, Conf, Ver) ->
-    fun(M) -> 
-            Mod:decode_message(Conf, Ver, M) 
-    end.
+%% encode_msg_fun(Mod, Conf) ->
+%%     fun(M) -> 
+%%             Mod:encode_message(Conf, M) 
+%%     end.
+%% encode_msg_fun(Mod, Conf, Ver) ->
+%%     fun(M) -> 
+%%             Mod:encode_message(Conf, Ver, M) 
+%%     end.
+
+%% decode_msg_fun(Mod, Conf) ->
+%%     fun(M) -> 
+%%             Mod:decode_message(Conf, M) 
+%%     end.
+%% decode_msg_fun(Mod, Conf, Ver) ->
+%%     fun(M) -> 
+%%             Mod:decode_message(Conf, Ver, M) 
+%%     end.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -9190,10 +9247,10 @@ await_ack(User, N, Timeout, Expected) when (N > 0) andalso is_integer(Timeout) -
     T = tim(),
     receive
 	{ack_received, User, Expected} ->
-	    d("await_ack -> received another ack"),
+	    d("await_ack -> received another expected ack"),
 	    await_ack(User, N-1, Timeout - (tim() - T), Expected);
 	{ack_received, User, UnExpected} ->
-	    d("await_ack -> unexpected ack result: ~p", [UnExpected]),
+	    e("await_ack -> received unexpected ack result: ~p", [UnExpected]),
 	    exit({unexpected_ack_result, UnExpected, Expected})
     after Timeout ->
 	    exit({await_ack_timeout, N})
@@ -9205,72 +9262,13 @@ await_ack(User, N, infinity, Expected) when N > 0 ->
 	    d("await_ack -> received another ack"),
 	    await_ack(User, N-1, infinity, Expected);
 	{ack_received, User, UnExpected} ->
-	    d("await_ack -> unexpected ack result: ~p", [UnExpected]),
+	    e("await_ack -> unexpected ack result: ~p", [UnExpected]),
 	    exit({unexpected_ack_result, UnExpected, Expected})
     end.
 
-await_req(_User, 0, Timeout) ->
-    d("await_req -> done when Timeout = ~p", [Timeout]),
-    ok;
-await_req(User, N, Timeout) when (N > 0) andalso is_integer(Timeout) ->
-    d("await_req -> entry with N: ~p, Timeout: ~p", [N,Timeout]),
-    T = tim(),
-    receive
-	{req_received, User, ARs} ->
-	    d("await_req -> received req(s) when N = ~w", [N]),
-	    N1 = await_req1(N, ARs),
-	    await_req(User, N1, Timeout - (tim() - T))
-    after Timeout ->
-	    exit({await_req_timeout, N})
-    end;
-await_req(User, N, infinity) when N > 0 ->
-    d("await_req -> entry with N: ~p", [N]),
-    receive
-	{req_received, User, ARs} ->
-	    d("await_req -> received req(s) when N = ~2",[N]),
-	    N1 = await_req1(N, ARs),
-	    await_req(User, N1, infinity)
-    end.
-
-await_req1(N, []) when N >= 0 ->
-    N;
-await_req1(N, [AR|ARs]) when (N > 0) andalso is_record(AR, 'ActionRequest') ->
-    await_req1(N-1, ARs);
-await_req1(N, ARs) ->
-    exit({unexpected_req_result, N, ARs}).
-
-% await_rep(_User, 0, Timeout) ->
-%     d("await_rep -> done when Timeout = ~p", [Timeout]),
-%     ok;
-% await_rep(User, N, Timeout) when N > 0, integer(Timeout) ->
-%     d("await_rep -> entry with N: ~p, Timeout: ~p", [N,Timeout]),
-%     T = tim(),
-%     receive
-% 	{rep_received, User, ARs} ->
-% 	    d("await_rep -> received rep(s)"),
-% 	    N1 = await_rep1(N, ARs),
-% 	    await_rep(User, N1, Timeout - (tim() - T))
-%     after Timeout ->
-% 	    exit({await_rep_timeout, N})
-%     end;
-% await_rep(User, N, infinity) when N > 0 ->
-%     d("await_rep -> entry with N: ~p", [N]),
-%     receive
-% 	{rep_received, User, ARs} ->
-% 	    d("await_rep -> received rep(s)"),
-% 	    N1 = await_rep1(N, ARs),
-% 	    await_rep(User, N1, infinity)
-%     end.
-
-% await_rep1(N, []) when N >= 0 ->
-%     N;
-% await_rep1(N, [AR|ARs]) when N > 0, record(AR, 'ActionReply') ->
-%     await_rep1(N-1, ARs);
-% await_rep1(N, ARs) ->
-%     exit({unexpected_rep_result, N, ARs}).
 
 tim() ->
-    {A,B,C} = erlang:now(),
+    {A,B,C} = erlang:timestamp(),
     A*1000000000+B*1000+(C div 1000).
 
 
@@ -9291,7 +9289,8 @@ await_completion(Ids) ->
             d("OK => Reply: ~n~p", [Reply]),
             ok;
         {error, Reply} ->
-            d("ERROR => Reply: ~n~p", [Reply]),
+            e("await completion failed: "
+              "~n   ~p", [Reply]),
             ?ERROR({failed, Reply})
     end.
 
@@ -9301,7 +9300,9 @@ await_completion(Ids, Timeout) ->
             d("OK => Reply: ~n~p", [Reply]),
             ok;
         {error, Reply} ->
-            d("ERROR => Reply: ~n~p", [Reply]),
+            e("await completion failed: "
+              "~n   ~p"
+              "~n   ~p", [Timeout, Reply]),
             ?ERROR({failed, Reply})
     end.
 
@@ -9310,64 +9311,71 @@ await_completion(Ids, Timeout) ->
 
 sleep(X) -> receive after X -> ok end.
 
-error_msg(F,A) -> error_logger:error_msg(F ++ "~n",A).
+%% error_msg(F,A) -> error_logger:error_msg(F ++ "~n",A).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+%% e(F) ->
+%%     e(F, []).
+
+e(F, A) ->
+    print(error, "ERR", F, A).
+
+
 i(F) ->
     i(F, []).
 
 i(F, A) ->
-    print(info, get(verbosity), now(), get(tc), "INF", F, A).
+    print(info, "INF", F, A).
 
 
 d(F) ->
     d(F, []).
 
 d(F, A) ->
-    print(debug, get(verbosity), now(), get(tc), "DBG", F, A).
+    print(debug, "DBG", F, A).
 
 
-printable(_, debug)   -> true;
-printable(info, info) -> true;
-printable(_,_)        -> false.
+print(Severity, P, F, A) ->
+    print2(printable(Severity), P, F, A).
 
-print(Severity, Verbosity, Ts, Tc, P, F, A) ->
-    print(printable(Severity,Verbosity), Ts, Tc, P, F, A).
+printable(Sev) ->
+    printable(Sev, get(verbosity)).
 
-print(true, Ts, Tc, P, F, A) ->
-    io:format("*** [~s] ~s ~p ~s:~w ***"
-	      "~n   " ++ F ++ "~n", 
-	      [format_timestamp(Ts), P, self(), get(tc), Tc | A]);
-print(_, _, _, _, _, _) ->
+printable(_,     debug) -> true;
+printable(info,  info)  -> true;
+printable(error, _)     -> true;
+printable(_,_)          -> false.
+
+
+print2(true, P, F, A) ->
+    TS = erlang:timestamp(),
+    TC = get(tc),
+    S  = ?F("*** [~s] ~s ~p ~w ***"
+            "~n   " ++ F ++ "~n"
+            "~n", [megaco:format_timestamp(TS), P, self(), TC | A]),
+    io:format("~s", [S]),
+    io:format(user, "~s", [S]);
+print2(_, _, _, _) ->
     ok.
 
 
 p(F, A) ->
     io:format("*** [~s] ***"
 	      "~n   " ++ F ++ "~n", 
-	      [format_timestamp(now()) | A]).
+	      [megaco:format_timestamp(erlang:timestamp()) | A]).
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-random_init() ->
-    {A,B,C} = now(),
-    random:seed(A,B,C).
 
-random() ->
-    10 * random:uniform(50).
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-apply_load_timer() ->
-    erlang:send_after(random(), self(), apply_load_timeout).
+%% random_init() ->
+%%     {A,B,C} = erlang:timestamp(),
+%%     random:seed(A,B,C).
 
+%% random() ->
+%%     10 * random:uniform(50).
 
-format_timestamp({_N1, _N2, N3}   = Now) ->
-    {Date, Time}   = calendar:now_to_datetime(Now),
-    {YYYY,MM,DD}   = Date,
-    {Hour,Min,Sec} = Time,
-    FormatDate = 
-        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w",
-                      [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),  
-    lists:flatten(FormatDate).
+%% apply_load_timer() ->
+%%     erlang:send_after(random(), self(), apply_load_timeout).
 
diff --git a/lib/megaco/test/megaco_udp_test.erl b/lib/megaco/test/megaco_udp_test.erl
index cc03ec733a..39ff44709e 100644
--- a/lib/megaco/test/megaco_udp_test.erl
+++ b/lib/megaco/test/megaco_udp_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2019. 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.
@@ -1211,23 +1211,14 @@ p(F, A) ->
 p(S, F, A) when is_list(S) ->
     io:format("*** [~s] ~p ~s ***" 
 	      "~n   " ++ F ++ "~n", 
-	      [format_timestamp(now()), self(), S | A]);
+	      [?FTS(), self(), S | A]);
 p(_S, F, A) ->
     io:format("*** [~s] ~p ~s *** "
 	      "~n   " ++ F ++ "~n", 
-	      [format_timestamp(now()), self(), "undefined" | A]).
+	      [?FTS(), self(), "undefined" | A]).
 
 
 ms() ->
-    {A,B,C} = erlang:now(),
-    A*1000000000+B*1000+(C div 1000).
+    erlang:monotonic_time(milli_seconds).
     
 
-format_timestamp({_N1, _N2, N3} = Now) ->
-    {Date, Time}   = calendar:now_to_datetime(Now),
-    {YYYY,MM,DD}   = Date,
-    {Hour,Min,Sec} = Time,
-    FormatDate =
-        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w",
-                      [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),
-    lists:flatten(FormatDate).
diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk
index f4c82c537a..843a3dccc5 100644
--- a/lib/megaco/vsn.mk
+++ b/lib/megaco/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = megaco
-MEGACO_VSN  = 3.18.4
+MEGACO_VSN  = 3.18.5
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(MEGACO_VSN)$(PRE_VSN)"
diff --git a/lib/mnesia/doc/src/Mnesia_chap7.xmlsrc b/lib/mnesia/doc/src/Mnesia_chap7.xmlsrc
index ffbbdadec0..968e89a745 100644
--- a/lib/mnesia/doc/src/Mnesia_chap7.xmlsrc
+++ b/lib/mnesia/doc/src/Mnesia_chap7.xmlsrc
@@ -295,7 +295,7 @@ ok</pre>
         if the log is large. Notice that the <c>Mnesia</c> system
         continues to operate during log dumps.</p>
       <p>By default <c>Mnesia</c> either dumps the log whenever
-        100 records have
+        1000 records have
         been written in the log or when three minutes have passed.
         This is controlled by the two application parameters
         <c>-mnesia dump_log_write_threshold WriteOperations</c> and
diff --git a/lib/mnesia/doc/src/mnesia.xml b/lib/mnesia/doc/src/mnesia.xml
index 621b6047ee..11b0b8e987 100644
--- a/lib/mnesia/doc/src/mnesia.xml
+++ b/lib/mnesia/doc/src/mnesia.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file></file>
   </header>
-  <module>mnesia</module>
+  <module since="">mnesia</module>
   <modulesummary>A distributed telecommunications DBMS</modulesummary>
   <description>
 
@@ -183,7 +183,7 @@
 
   <funcs>
     <func>
-      <name>abort(Reason) -> transaction abort</name>
+      <name since="">abort(Reason) -> transaction abort</name>
       <fsummary>Terminates the current transaction.</fsummary>
       <desc>
         <p>Makes the transaction silently
@@ -195,7 +195,7 @@
       </desc>
     </func>
     <func>
-      <name>activate_checkpoint(Args) -> {ok,Name,Nodes} | {error,Reason}</name>
+      <name since="">activate_checkpoint(Args) -> {ok,Name,Nodes} | {error,Reason}</name>
       <fsummary>Activates a checkpoint.</fsummary>
       <desc>
       <marker id="activate_checkpoint"></marker>
@@ -259,7 +259,7 @@
       </desc>
     </func>
     <func>
-      <name>activity(AccessContext, Fun [, Args]) -> ResultOfFun | exit(Reason)</name>
+      <name since="">activity(AccessContext, Fun [, Args]) -> ResultOfFun | exit(Reason)</name>
       <fsummary>Executes <c>Fun</c> in <c>AccessContext</c>.</fsummary>
       <desc>
       <marker id="activity_2_3"></marker>
@@ -271,7 +271,7 @@
       </desc>
     </func>
     <func>
-      <name>activity(AccessContext, Fun, Args, AccessMod) -> ResultOfFun | exit(Reason)</name>
+      <name since="">activity(AccessContext, Fun, Args, AccessMod) -> ResultOfFun | exit(Reason)</name>
       <fsummary>Executes <c>Fun</c> in <c>AccessContext</c>.</fsummary>
       <desc>
       <marker id="activity_4"></marker>
@@ -403,7 +403,7 @@
       </desc>
     </func>
     <func>
-      <name>add_table_copy(Tab, Node, Type) -> {aborted, R} | {atomic, ok}</name>
+      <name since="">add_table_copy(Tab, Node, Type) -> {aborted, R} | {atomic, ok}</name>
       <fsummary>Copies a table to a remote node.</fsummary>
       <desc>
       <marker id="add_table_copy"></marker>
@@ -420,7 +420,7 @@ mnesia:add_table_copy(person, Node, disc_copies)</code>
       </desc>
     </func>
     <func>
-      <name>add_table_index(Tab, AttrName) -> {aborted, R} | {atomic, ok}</name>
+      <name since="">add_table_index(Tab, AttrName) -> {aborted, R} | {atomic, ok}</name>
       <fsummary>Creates an index for a table.</fsummary>
       <desc>
       <marker id="add_table_index"></marker>
@@ -441,7 +441,7 @@ mnesia:add_table_index(person, age)</code>
       </desc>
     </func>
     <func>
-      <name>all_keys(Tab) -> KeyList | transaction abort</name>
+      <name since="">all_keys(Tab) -> KeyList | transaction abort</name>
       <fsummary>Returns all keys in a table.</fsummary>
       <desc>
       <marker id="all_keys"></marker>
@@ -453,7 +453,7 @@ mnesia:add_table_index(person, age)</code>
       </desc>
     </func>
     <func>
-      <name>async_dirty(Fun, [, Args]) -> ResultOfFun | exit(Reason)</name>
+      <name since="">async_dirty(Fun, [, Args]) -> ResultOfFun | exit(Reason)</name>
       <fsummary>Calls the <c>Fun</c> in a context that is not protected by a transaction.</fsummary>
       <desc>
       <marker id="async_dirty"></marker>
@@ -493,7 +493,7 @@ mnesia:add_table_index(person, age)</code>
       </desc>
     </func>
     <func>
-      <name>backup(Opaque [, BackupMod]) -> ok | {error,Reason}</name>
+      <name since="">backup(Opaque [, BackupMod]) -> ok | {error,Reason}</name>
       <fsummary>Backs up all tables in the database.</fsummary>
       <desc>
       <marker id="backup"></marker>
@@ -505,7 +505,7 @@ mnesia:add_table_index(person, age)</code>
       </desc>
     </func>
     <func>
-      <name>backup_checkpoint(Name, Opaque [, BackupMod]) -> ok | {error,Reason}</name>
+      <name since="">backup_checkpoint(Name, Opaque [, BackupMod]) -> ok | {error,Reason}</name>
       <fsummary>Backs up all tables in a checkpoint.</fsummary>
       <desc>
       <marker id="backup_checkpoint"></marker>
@@ -520,7 +520,7 @@ mnesia:add_table_index(person, age)</code>
       </desc>
     </func>
     <func>
-      <name>change_config(Config, Value) -> {error, Reason} | {ok, ReturnValue}</name>
+      <name since="">change_config(Config, Value) -> {error, Reason} | {ok, ReturnValue}</name>
       <fsummary>Changes a configuration parameter.</fsummary>
       <desc>
       <marker id="change_config"></marker>
@@ -554,7 +554,7 @@ mnesia:add_table_index(person, age)</code>
       </desc>
     </func>
     <func>
-      <name>change_table_access_mode(Tab, AccessMode) -> {aborted, R} | {atomic, ok}</name>
+      <name since="">change_table_access_mode(Tab, AccessMode) -> {aborted, R} | {atomic, ok}</name>
       <fsummary>Changes the access mode for the table.</fsummary>
       <desc>
       <marker id="change_table_access_mode"></marker>
@@ -568,7 +568,7 @@ mnesia:add_table_index(person, age)</code>
       </desc>
     </func>
     <func>
-      <name>change_table_copy_type(Tab, Node, To) -> {aborted, R} | {atomic, ok}</name>
+      <name since="">change_table_copy_type(Tab, Node, To) -> {aborted, R} | {atomic, ok}</name>
       <fsummary>Changes the storage type of a table.</fsummary>
       <desc>
       <marker id="change_table_copy_type"></marker>
@@ -585,7 +585,7 @@ mnesia:change_table_copy_type(person, node(), disc_copies)</code>
       </desc>
     </func>
     <func>
-      <name>change_table_load_order(Tab, LoadOrder) -> {aborted, R} | {atomic, ok}</name>
+      <name since="">change_table_load_order(Tab, LoadOrder) -> {aborted, R} | {atomic, ok}</name>
       <fsummary>Changes the load order priority for the table.</fsummary>
       <desc>
       <marker id="change_table_load_order"></marker>
@@ -595,7 +595,7 @@ mnesia:change_table_copy_type(person, node(), disc_copies)</code>
       </desc>
     </func>
     <func>
-      <name>change_table_majority(Tab, Majority) -> {aborted, R} | {atomic, ok}</name>
+      <name since="OTP R14B03">change_table_majority(Tab, Majority) -> {aborted, R} | {atomic, ok}</name>
       <fsummary>Changes the majority check setting for the table.</fsummary>
       <desc>
         <p><c>Majority</c> must be a boolean. Default is <c>false</c>.
@@ -607,7 +607,7 @@ mnesia:change_table_copy_type(person, node(), disc_copies)</code>
       </desc>
     </func>
     <func>
-      <name>clear_table(Tab) -> {aborted, R} | {atomic, ok}</name>
+      <name since="">clear_table(Tab) -> {aborted, R} | {atomic, ok}</name>
       <fsummary>Deletes all entries in a table.</fsummary>
       <desc>
       <marker id="clear_table"></marker>
@@ -615,7 +615,7 @@ mnesia:change_table_copy_type(person, node(), disc_copies)</code>
       </desc>
     </func>
     <func>
-      <name>create_schema(DiscNodes) -> ok | {error,Reason}</name>
+      <name since="">create_schema(DiscNodes) -> ok | {error,Reason}</name>
       <fsummary>Creates a new schema on the specified nodes.</fsummary>
       <desc>
       <marker id="create_schema"></marker>
@@ -637,7 +637,7 @@ mnesia:change_table_copy_type(person, node(), disc_copies)</code>
       </desc>
     </func>
     <func>
-      <name>create_table(Name, TabDef) -> {atomic, ok} | {aborted, Reason}</name>
+      <name since="">create_table(Name, TabDef) -> {atomic, ok} | {aborted, Reason}</name>
       <fsummary>Creates a Mnesia table called <c>Name</c>with properties as described by argument <c>TabDef</c>.</fsummary>
       <desc>
       <marker id="create_table"></marker>
@@ -799,7 +799,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>deactivate_checkpoint(Name) -> ok | {error, Reason}</name>
+      <name since="">deactivate_checkpoint(Name) -> ok | {error, Reason}</name>
       <fsummary>Deactivates a checkpoint.</fsummary>
       <desc>
       <marker id="deactivate_checkpoint"></marker>
@@ -811,7 +811,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>del_table_copy(Tab, Node) -> {aborted, R} | {atomic, ok}</name>
+      <name since="">del_table_copy(Tab, Node) -> {aborted, R} | {atomic, ok}</name>
       <fsummary>Deletes the replica of table <c>Tab</c> at node <c>Node</c>.</fsummary>
       <desc>
       <marker id="del_table_copy"></marker>
@@ -825,7 +825,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>del_table_index(Tab, AttrName) -> {aborted, R} | {atomic, ok}</name>
+      <name since="">del_table_index(Tab, AttrName) -> {aborted, R} | {atomic, ok}</name>
       <fsummary>Deletes an index in a table.</fsummary>
       <desc>
       <marker id="del_table_index"></marker>
@@ -834,7 +834,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>delete({Tab, Key}) -> transaction abort | ok</name>
+      <name since="">delete({Tab, Key}) -> transaction abort | ok</name>
       <fsummary>Deletes all records in table <c>Tab</c> with the key <c>Key</c>.</fsummary>
       <desc>
       <marker id="delete_2"></marker>
@@ -842,7 +842,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>delete(Tab, Key, LockKind) -> transaction abort | ok</name>
+      <name since="">delete(Tab, Key, LockKind) -> transaction abort | ok</name>
       <fsummary>Deletes all records in table <c>Tab</c>with the key <c>Key</c>.</fsummary>
       <desc>
       <marker id="delete_3"></marker>
@@ -857,7 +857,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>delete_object(Record) -> transaction abort | ok</name>
+      <name since="">delete_object(Record) -> transaction abort | ok</name>
       <fsummary>Delete a record.</fsummary>
       <desc>
       <marker id="delete_object_1"></marker>
@@ -866,7 +866,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>delete_object(Tab, Record, LockKind) -> transaction abort | ok</name>
+      <name since="">delete_object(Tab, Record, LockKind) -> transaction abort | ok</name>
       <fsummary>Deletes a record.</fsummary>
       <desc>
       <marker id="delete_object_3"></marker>
@@ -883,7 +883,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>delete_schema(DiscNodes) -> ok | {error,Reason}</name>
+      <name since="">delete_schema(DiscNodes) -> ok | {error,Reason}</name>
       <fsummary>Deletes the schema on the given nodes.</fsummary>
       <desc>
       <marker id="delete_schema"></marker>
@@ -904,7 +904,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>delete_table(Tab) -> {aborted, Reason} | {atomic, ok}</name>
+      <name since="">delete_table(Tab) -> {aborted, Reason} | {atomic, ok}</name>
       <fsummary>Deletes permanently all replicas of table <c>Tab</c>.</fsummary>
       <desc>
       <marker id="delete_table"></marker>
@@ -912,7 +912,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>dirty_all_keys(Tab) -> KeyList | exit({aborted, Reason})</name>
+      <name since="">dirty_all_keys(Tab) -> KeyList | exit({aborted, Reason})</name>
       <fsummary>Dirty search for all record keys in table.</fsummary>
       <desc>
       <marker id="delete_all_keys"></marker>
@@ -920,7 +920,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>dirty_delete({Tab, Key}) -> ok | exit({aborted, Reason})</name>
+      <name since="">dirty_delete({Tab, Key}) -> ok | exit({aborted, Reason})</name>
       <fsummary>Dirty delete of a record.</fsummary>
       <desc>
       <marker id="dirty_delete"></marker>
@@ -928,14 +928,14 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>dirty_delete(Tab, Key) -> ok | exit({aborted, Reason})</name>
+      <name since="">dirty_delete(Tab, Key) -> ok | exit({aborted, Reason})</name>
       <fsummary>Dirty delete of a record.</fsummary>
       <desc>
         <p>Dirty equivalent of the function <c>mnesia:delete/3</c>.</p>
       </desc>
     </func>
     <func>
-      <name>dirty_delete_object(Record)</name>
+      <name since="">dirty_delete_object(Record)</name>
       <fsummary>Dirty delete of a record.</fsummary>
       <desc>
       <marker id="dirty_delete_object_1"></marker>
@@ -944,14 +944,14 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>dirty_delete_object(Tab, Record)</name>
+      <name since="">dirty_delete_object(Tab, Record)</name>
       <fsummary>Dirty delete of a record.</fsummary>
       <desc>
         <p>Dirty equivalent of the function <c>mnesia:delete_object/3</c>.</p>
       </desc>
     </func>
     <func>
-      <name>dirty_first(Tab) ->  Key | exit({aborted, Reason})</name>
+      <name since="">dirty_first(Tab) ->  Key | exit({aborted, Reason})</name>
       <fsummary>Returns the key for the first record in a table.</fsummary>
       <desc>
       <marker id="dirty_first"></marker>
@@ -967,7 +967,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>dirty_index_match_object(Pattern, Pos)</name>
+      <name since="">dirty_index_match_object(Pattern, Pos)</name>
       <fsummary>Dirty pattern match using index.</fsummary>
       <desc>
       <marker id="dirty_index_match_object_2"></marker>
@@ -977,7 +977,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>dirty_index_match_object(Tab, Pattern, Pos)</name>
+      <name since="">dirty_index_match_object(Tab, Pattern, Pos)</name>
       <fsummary>Dirty pattern match using index.</fsummary>
       <desc>
         <p>Dirty equivalent of the function
@@ -985,7 +985,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>dirty_index_read(Tab, SecondaryKey, Pos)</name>
+      <name since="">dirty_index_read(Tab, SecondaryKey, Pos)</name>
       <fsummary>Dirty read using index.</fsummary>
       <desc>
       <marker id="dirty_index_read"></marker>
@@ -994,7 +994,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>dirty_last(Tab) -> Key | exit({aborted, Reason})</name>
+      <name since="">dirty_last(Tab) -> Key | exit({aborted, Reason})</name>
       <fsummary>Returns the key for the last record in a table.</fsummary>
       <desc>
       <marker id="dirty_last"></marker>
@@ -1006,7 +1006,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>dirty_match_object(Pattern) -> RecordList | exit({aborted, Reason})</name>
+      <name since="">dirty_match_object(Pattern) -> RecordList | exit({aborted, Reason})</name>
       <fsummary>Dirty pattern match pattern.</fsummary>
       <desc>
       <marker id="dirty_match_object_1"></marker>
@@ -1015,7 +1015,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>dirty_match_object(Tab, Pattern) -> RecordList | exit({aborted, Reason})</name>
+      <name since="">dirty_match_object(Tab, Pattern) -> RecordList | exit({aborted, Reason})</name>
       <fsummary>Dirty pattern match pattern.</fsummary>
       <desc>
         <p>Dirty equivalent of the function
@@ -1023,7 +1023,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>dirty_next(Tab, Key) -> Key | exit({aborted, Reason})</name>
+      <name since="">dirty_next(Tab, Key) -> Key | exit({aborted, Reason})</name>
       <fsummary>Return the next key in a table.</fsummary>
       <desc>
       <marker id="dirty_next"></marker>
@@ -1038,7 +1038,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>dirty_prev(Tab, Key) -> Key | exit({aborted, Reason})</name>
+      <name since="">dirty_prev(Tab, Key) -> Key | exit({aborted, Reason})</name>
       <fsummary>Returns the previous key in a table.</fsummary>
       <desc>
       <marker id="dirty_prev"></marker>
@@ -1050,7 +1050,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>dirty_read({Tab, Key}) -> ValueList | exit({aborted, Reason}</name>
+      <name since="">dirty_read({Tab, Key}) -> ValueList | exit({aborted, Reason}</name>
       <fsummary>Dirty read of records.</fsummary>
       <desc>
       <marker id="dirty_read"></marker>
@@ -1058,14 +1058,14 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>dirty_read(Tab, Key) -> ValueList | exit({aborted, Reason}</name>
+      <name since="">dirty_read(Tab, Key) -> ValueList | exit({aborted, Reason}</name>
       <fsummary>Dirty read of records.</fsummary>
       <desc>
         <p>Dirty equivalent of the function <c>mnesia:read/3</c>.</p>
       </desc>
     </func>
     <func>
-      <name>dirty_select(Tab, MatchSpec) -> ValueList | exit({aborted, Reason}</name>
+      <name since="">dirty_select(Tab, MatchSpec) -> ValueList | exit({aborted, Reason}</name>
       <fsummary>Dirty matches the objects in <c>Tab</c> against <c>MatchSpec</c>.</fsummary>
       <desc>
       <marker id="dirty_select"></marker>
@@ -1073,7 +1073,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>dirty_slot(Tab, Slot) -> RecordList | exit({aborted, Reason})</name>
+      <name since="">dirty_slot(Tab, Slot) -> RecordList | exit({aborted, Reason})</name>
       <fsummary>Returns the list of records that are associated with <c>Slot</c> in a table.</fsummary>
       <desc>
       <marker id="dirty_slot"></marker>
@@ -1089,7 +1089,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>dirty_update_counter({Tab, Key}, Incr) -> NewVal | exit({aborted, Reason})</name>
+      <name since="">dirty_update_counter({Tab, Key}, Incr) -> NewVal | exit({aborted, Reason})</name>
       <fsummary>Dirty update of a counter record.</fsummary>
       <desc>
       <marker id="dirty_update_counter"></marker>
@@ -1097,7 +1097,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>dirty_update_counter(Tab, Key, Incr) -> NewVal | exit({aborted, Reason})</name>
+      <name since="">dirty_update_counter(Tab, Key, Incr) -> NewVal | exit({aborted, Reason})</name>
       <fsummary>Dirty update of a counter record.</fsummary>
       <desc>
         <p>Mnesia has no special counter records. However,
@@ -1126,7 +1126,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>dirty_write(Record) -> ok | exit({aborted, Reason})</name>
+      <name since="">dirty_write(Record) -> ok | exit({aborted, Reason})</name>
       <fsummary>Dirty write of a record.</fsummary>
       <desc>
       <marker id="dirty_write_1"></marker>
@@ -1135,14 +1135,14 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>dirty_write(Tab, Record) -> ok | exit({aborted, Reason})</name>
+      <name since="">dirty_write(Tab, Record) -> ok | exit({aborted, Reason})</name>
       <fsummary>Dirty write of a record.</fsummary>
       <desc>
         <p>Dirty equivalent of the function <c>mnesia:write/3</c>.</p>
       </desc>
     </func>
     <func>
-      <name>dump_log() -> dumped</name>
+      <name since="">dump_log() -> dumped</name>
       <fsummary>Performs a user-initiated dump of the local log file.</fsummary>
       <desc>
       <marker id="dump_log"></marker>
@@ -1156,7 +1156,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>dump_tables(TabList) -> {atomic, ok} | {aborted, Reason}</name>
+      <name since="">dump_tables(TabList) -> {atomic, ok} | {aborted, Reason}</name>
       <fsummary>Dumps all RAM tables to disc.</fsummary>
       <desc>
       <marker id="dump_tables"></marker>
@@ -1168,7 +1168,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>dump_to_textfile(Filename)</name>
+      <name since="">dump_to_textfile(Filename)</name>
       <fsummary>Dumps local tables into a text file.</fsummary>
       <desc>
       <marker id="dump_to_textfile"></marker>
@@ -1181,7 +1181,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>error_description(Error) -> String</name>
+      <name since="">error_description(Error) -> String</name>
       <fsummary>Returns a string describing a particular Mnesia error.</fsummary>
       <desc>
       <marker id="error_description"></marker>
@@ -1259,7 +1259,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>ets(Fun, [, Args]) -> ResultOfFun | exit(Reason)</name>
+      <name since="">ets(Fun, [, Args]) -> ResultOfFun | exit(Reason)</name>
       <fsummary>Calls the <c>Fun</c> in a raw context that is not protected by a transaction.</fsummary>
       <desc>
       <marker id="ets"></marker>
@@ -1278,7 +1278,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>first(Tab) ->  Key | transaction abort</name>
+      <name since="">first(Tab) ->  Key | transaction abort</name>
       <fsummary>Returns the key for the first record in a table.</fsummary>
       <desc>
       <marker id="first"></marker>
@@ -1293,7 +1293,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>foldl(Function, Acc, Table) -> NewAcc | transaction abort</name>
+      <name since="">foldl(Function, Acc, Table) -> NewAcc | transaction abort</name>
       <fsummary>Calls <c>Function</c> for each record in <c>Table</c>.</fsummary>
       <desc>
       <marker id="foldl"></marker>
@@ -1306,7 +1306,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>foldr(Function, Acc, Table) -> NewAcc | transaction abort</name>
+      <name since="">foldr(Function, Acc, Table) -> NewAcc | transaction abort</name>
       <fsummary>Calls <c>Function</c> for each record in <c>Table</c>.</fsummary>
       <desc>
       <marker id="foldr"></marker>
@@ -1317,7 +1317,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>force_load_table(Tab) -> yes | ErrorDescription</name>
+      <name since="">force_load_table(Tab) -> yes | ErrorDescription</name>
       <fsummary>Forces a table to be loaded into the system.</fsummary>
       <desc>
       <marker id="force_load_table"></marker>
@@ -1335,7 +1335,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>index_match_object(Pattern, Pos) -> transaction abort | ObjList</name>
+      <name since="">index_match_object(Pattern, Pos) -> transaction abort | ObjList</name>
       <fsummary>Matches records and uses index information.</fsummary>
       <desc>
       <marker id="index_match_object_2"></marker>
@@ -1345,7 +1345,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>index_match_object(Tab, Pattern, Pos, LockKind) -> transaction abort | ObjList</name>
+      <name since="">index_match_object(Tab, Pattern, Pos, LockKind) -> transaction abort | ObjList</name>
       <fsummary>Matches records and uses index information.</fsummary>
       <desc>
       <marker id="index_match_object_4"></marker>
@@ -1377,7 +1377,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>index_read(Tab, SecondaryKey, Pos) -> transaction abort | RecordList</name>
+      <name since="">index_read(Tab, SecondaryKey, Pos) -> transaction abort | RecordList</name>
       <fsummary>Reads records through index table.</fsummary>
       <desc>
       <marker id="index_read"></marker>
@@ -1397,7 +1397,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>info() -> ok</name>
+      <name since="">info() -> ok</name>
       <fsummary>Prints system information on the terminal.</fsummary>
       <desc>
       <marker id="info"></marker>
@@ -1408,7 +1408,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>install_fallback(Opaque) -> ok | {error,Reason}</name>
+      <name since="">install_fallback(Opaque) -> ok | {error,Reason}</name>
       <fsummary>Installs a backup as fallback.</fsummary>
       <desc>
       <marker id="install_fallback_1"></marker>
@@ -1417,7 +1417,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>install_fallback(Opaque), BackupMod) -> ok | {error,Reason}</name>
+      <name since="">install_fallback(Opaque), BackupMod) -> ok | {error,Reason}</name>
       <fsummary>Installs a backup as fallback.</fsummary>
       <desc>
         <p>Calls <c>mnesia:install_fallback(Opaque, Args)</c>, where
@@ -1425,7 +1425,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>install_fallback(Opaque, Args) -> ok | {error,Reason}</name>
+      <name since="">install_fallback(Opaque, Args) -> ok | {error,Reason}</name>
       <fsummary>Installs a backup as fallback.</fsummary>
       <desc>
         <p>Installs a backup as fallback. The fallback is used to
@@ -1483,7 +1483,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>is_transaction() -> boolean</name>
+      <name since="">is_transaction() -> boolean</name>
       <fsummary>Checks if code is running in a transaction.</fsummary>
       <desc>
       <marker id="is_transaction"></marker>
@@ -1492,7 +1492,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>last(Tab) -> Key | transaction abort</name>
+      <name since="">last(Tab) -> Key | transaction abort</name>
       <fsummary>Returns the key for the last record in a table.</fsummary>
       <desc>
         <p>Works exactly like
@@ -1503,7 +1503,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>load_textfile(Filename)</name>
+      <name since="">load_textfile(Filename)</name>
       <fsummary>Loads tables from a text file.</fsummary>
       <desc>
       <marker id="load_textfile"></marker>
@@ -1516,7 +1516,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>lock(LockItem, LockKind) -> Nodes | ok | transaction abort</name>
+      <name since="">lock(LockItem, LockKind) -> Nodes | ok | transaction abort</name>
       <fsummary>Explicit grab lock.</fsummary>
       <desc>
       <marker id="lock"></marker>
@@ -1605,7 +1605,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>match_object(Pattern) -> transaction abort | RecList</name>
+      <name since="">match_object(Pattern) -> transaction abort | RecList</name>
       <fsummary>Matches <c>Pattern</c> for records.</fsummary>
       <desc>
       <marker id="match_object_1"></marker>
@@ -1614,7 +1614,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>match_object(Tab, Pattern, LockKind) -> transaction abort | RecList</name>
+      <name since="">match_object(Tab, Pattern, LockKind) -> transaction abort | RecList</name>
       <fsummary>Matches <c>Pattern</c> for records.</fsummary>
       <desc>
       <marker id="match_object_3"></marker>
@@ -1639,7 +1639,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>move_table_copy(Tab, From, To) -> {aborted, Reason} | {atomic, ok}</name>
+      <name since="">move_table_copy(Tab, From, To) -> {aborted, Reason} | {atomic, ok}</name>
       <fsummary>Moves the copy of table <c>Tab</c> from node <c>From</c> to node <c>To</c>.</fsummary>
       <desc>
       <marker id="move_table_copy"></marker>
@@ -1653,7 +1653,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>next(Tab, Key) -> Key | transaction abort</name>
+      <name since="">next(Tab, Key) -> Key | transaction abort</name>
       <fsummary>Returns the next key in a table.</fsummary>
       <desc>
       <marker id="next"></marker>
@@ -1665,7 +1665,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>prev(Tab, Key) -> Key | transaction abort</name>
+      <name since="">prev(Tab, Key) -> Key | transaction abort</name>
       <fsummary>Returns the previous key in a table.</fsummary>
       <desc>
         <p>Works exactly like
@@ -1676,7 +1676,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>read({Tab, Key}) -> transaction abort | RecordList</name>
+      <name since="">read({Tab, Key}) -> transaction abort | RecordList</name>
       <fsummary>Reads records(s) with a given key.</fsummary>
       <desc>
       <marker id="read_2"></marker>
@@ -1684,14 +1684,14 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>read(Tab, Key) -> transaction abort | RecordList</name>
+      <name since="">read(Tab, Key) -> transaction abort | RecordList</name>
       <fsummary>Reads records(s) with a given key.</fsummary>
       <desc>
         <p>Calls function <c>mnesia:read(Tab, Key, read)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>read(Tab, Key, LockKind) -> transaction abort | RecordList</name>
+      <name since="">read(Tab, Key, LockKind) -> transaction abort | RecordList</name>
       <fsummary>Reads records(s) with a given key.</fsummary>
       <desc>
       <marker id="read_3"></marker>
@@ -1716,7 +1716,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>read_lock_table(Tab) -> ok | transaction abort</name>
+      <name since="">read_lock_table(Tab) -> ok | transaction abort</name>
       <fsummary>Sets a read lock on an entire table.</fsummary>
       <desc>
       <marker id="read_lock_table"></marker>
@@ -1725,7 +1725,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>report_event(Event) -> ok</name>
+      <name since="">report_event(Event) -> ok</name>
       <fsummary>Reports a user event to the Mnesia event handler.</fsummary>
       <desc>
       <marker id="report_event"></marker>
@@ -1743,7 +1743,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>restore(Opaque, Args) -> {atomic, RestoredTabs} |{aborted, Reason}</name>
+      <name since="">restore(Opaque, Args) -> {atomic, RestoredTabs} |{aborted, Reason}</name>
       <fsummary>Online restore of backup.</fsummary>
       <desc>
       <marker id="restore"></marker>
@@ -1803,7 +1803,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>s_delete({Tab, Key}) -> ok | transaction abort</name>
+      <name since="">s_delete({Tab, Key}) -> ok | transaction abort</name>
       <fsummary>Sets sticky lock and delete records.</fsummary>
       <desc>
       <marker id="s_delete"></marker>
@@ -1812,7 +1812,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>s_delete_object(Record) -> ok | transaction abort</name>
+      <name since="">s_delete_object(Record) -> ok | transaction abort</name>
       <fsummary>Sets sticky lock and delete record.</fsummary>
       <desc>
       <marker id="s_delete_object"></marker>
@@ -1822,7 +1822,7 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>s_write(Record) -> ok | transaction abort</name>
+      <name since="">s_write(Record) -> ok | transaction abort</name>
       <fsummary>Writes <c>Record</c> and sets sticky lock.</fsummary>
       <desc>
       <marker id="s_write"></marker>
@@ -1832,21 +1832,21 @@ mnesia:create_table(person,
       </desc>
     </func>
     <func>
-      <name>schema() -> ok</name>
+      <name since="">schema() -> ok</name>
       <fsummary>Prints information about all table definitions on the terminal.</fsummary>
       <desc>
         <p>Prints information about all table definitions on the terminal.</p>
       </desc>
     </func>
     <func>
-      <name>schema(Tab) -> ok</name>
+      <name since="">schema(Tab) -> ok</name>
       <fsummary>Prints information about one table definition on the terminal.</fsummary>
       <desc>
         <p>Prints information about one table definition on the terminal.</p>
       </desc>
     </func>
     <func>
-      <name>select(Tab, MatchSpec [, Lock]) -> transaction abort | [Object]</name>
+      <name since="">select(Tab, MatchSpec [, Lock]) -> transaction abort | [Object]</name>
       <fsummary>Matches the objects in <c>Tab</c> against <c>MatchSpec</c>.</fsummary>
       <desc>
       <marker id="select_2_3"></marker>
@@ -1884,7 +1884,7 @@ mnesia:select(Tab,[{MatchHead, [Guard], [Result]}]),</code>
       </desc>
     </func>
     <func>
-      <name>select(Tab, MatchSpec, NObjects, Lock) -> transaction abort | {[Object],Cont} | '$end_of_table'</name>
+      <name since="">select(Tab, MatchSpec, NObjects, Lock) -> transaction abort | {[Object],Cont} | '$end_of_table'</name>
       <fsummary>Matches the objects in <c>Tab</c> against <c>MatchSpec</c>.</fsummary>
       <desc>
       <marker id="select_4"></marker>
@@ -1907,7 +1907,7 @@ mnesia:select(Tab,[{MatchHead, [Guard], [Result]}]),</code>
       </desc>
     </func>
     <func>
-      <name>select(Cont) -> transaction abort | {[Object],Cont} | '$end_of_table'</name>
+      <name since="">select(Cont) -> transaction abort | {[Object],Cont} | '$end_of_table'</name>
       <fsummary>Continues selecting objects.</fsummary>
       <desc>
         <p>Selects more objects with the match specification initiated
@@ -1919,7 +1919,7 @@ mnesia:select(Tab,[{MatchHead, [Guard], [Result]}]),</code>
       </desc>
     </func>
     <func>
-      <name>set_debug_level(Level) -> OldLevel</name>
+      <name since="">set_debug_level(Level) -> OldLevel</name>
       <fsummary>Changes the internal debug level of Mnesia.</fsummary>
       <desc>
       <marker id="set_debug_level"></marker>
@@ -1930,7 +1930,7 @@ mnesia:select(Tab,[{MatchHead, [Guard], [Result]}]),</code>
       </desc>
     </func>
     <func>
-      <name>set_master_nodes(MasterNodes) -> ok | {error, Reason}</name>
+      <name since="">set_master_nodes(MasterNodes) -> ok | {error, Reason}</name>
       <fsummary>Sets the master nodes for all tables.</fsummary>
       <desc>
       <marker id="set_master_nodes_1"></marker>
@@ -1943,7 +1943,7 @@ mnesia:select(Tab,[{MatchHead, [Guard], [Result]}]),</code>
       </desc>
     </func>
     <func>
-      <name>set_master_nodes(Tab, MasterNodes) -> ok | {error, Reason}</name>
+      <name since="">set_master_nodes(Tab, MasterNodes) -> ok | {error, Reason}</name>
       <fsummary>Sets the master nodes for a table.</fsummary>
       <desc>
       <marker id="set_master_nodes_2"></marker>
@@ -1968,14 +1968,14 @@ mnesia:select(Tab,[{MatchHead, [Guard], [Result]}]),</code>
       </desc>
     </func>
     <func>
-      <name>snmp_close_table(Tab) -> {aborted, R} | {atomic, ok}</name>
+      <name since="">snmp_close_table(Tab) -> {aborted, R} | {atomic, ok}</name>
       <fsummary>Removes the possibility for SNMP to manipulate the table.</fsummary>
       <desc>
         <p>Removes the possibility for SNMP to manipulate the table.</p>
       </desc>
     </func>
     <func>
-      <name>snmp_get_mnesia_key(Tab, RowIndex) -> {ok, Key} | undefined</name>
+      <name since="">snmp_get_mnesia_key(Tab, RowIndex) -> {ok, Key} | undefined</name>
       <fsummary>Gets the corresponding Mnesia key from an SNMP index.</fsummary>
       <type>
         <v>Tab ::= atom()</v>
@@ -1990,7 +1990,7 @@ mnesia:select(Tab,[{MatchHead, [Guard], [Result]}]),</code>
       </desc>
     </func>
     <func>
-      <name>snmp_get_next_index(Tab, RowIndex) -> {ok, NextIndex} | endOfTable</name>
+      <name since="">snmp_get_next_index(Tab, RowIndex) -> {ok, NextIndex} | endOfTable</name>
       <fsummary>Gets the index of the next lexicographical row.</fsummary>
       <type>
         <v>Tab ::= atom()</v>
@@ -2006,7 +2006,7 @@ mnesia:select(Tab,[{MatchHead, [Guard], [Result]}]),</code>
       </desc>
     </func>
     <func>
-      <name>snmp_get_row(Tab, RowIndex) -> {ok, Row} | undefined</name>
+      <name since="">snmp_get_row(Tab, RowIndex) -> {ok, Row} | undefined</name>
       <fsummary>Retrieves a row indexed by an SNMP index.</fsummary>
       <type>
         <v>Tab ::= atom()</v>
@@ -2019,7 +2019,7 @@ mnesia:select(Tab,[{MatchHead, [Guard], [Result]}]),</code>
       </desc>
     </func>
     <func>
-      <name>snmp_open_table(Tab, SnmpStruct) -> {aborted, R} | {atomic, ok}</name>
+      <name since="">snmp_open_table(Tab, SnmpStruct) -> {aborted, R} | {atomic, ok}</name>
       <fsummary>Organizes a Mnesia table as an SNMP table.</fsummary>
       <type>
         <v>Tab ::= atom()</v>
@@ -2073,10 +2073,17 @@ mnesia:create_table(employee,
       </desc>
     </func>
     <func>
-      <name>start() -> ok | {error, Reason}</name>
+      <name since="">start() -> ok | {error, Reason}</name>
       <fsummary>Starts a local Mnesia system.</fsummary>
       <desc>
       <marker id="start"></marker>
+        <p>Mnesia startup is asynchronous. The function call
+	        <c>mnesia:start()</c> returns the atom <c>ok</c> and then
+          starts to initialize the different tables. Depending on the
+          size of the database, this can take some time, and the
+          application programmer must wait for the tables that the
+          application needs before they can be used. This is achieved
+          by using the function <c>mnesia:wait_for_tables/2</c>.</p>
         <p>The startup procedure for a set of Mnesia nodes is a
           fairly complicated operation. A Mnesia system consists
           of a set of nodes, with Mnesia started locally on all
@@ -2108,7 +2115,7 @@ mnesia:create_table(employee,
       </desc>
     </func>
     <func>
-      <name>stop() -> stopped</name>
+      <name since="">stop() -> stopped</name>
       <fsummary>Stops Mnesia locally.</fsummary>
       <desc>
       <marker id="stop"></marker>
@@ -2117,7 +2124,7 @@ mnesia:create_table(employee,
       </desc>
     </func>
     <func>
-      <name>subscribe(EventCategory) -> {ok, Node} | {error, Reason}</name>
+      <name since="">subscribe(EventCategory) -> {ok, Node} | {error, Reason}</name>
       <fsummary>Subscribes to events of type <c>EventCategory</c>.</fsummary>
       <desc>
       <marker id="subscribe"></marker>
@@ -2127,7 +2134,7 @@ mnesia:create_table(employee,
       </desc>
     </func>
     <func>
-      <name>sync_dirty(Fun, [, Args]) -> ResultOfFun | exit(Reason)</name>
+      <name since="">sync_dirty(Fun, [, Args]) -> ResultOfFun | exit(Reason)</name>
       <fsummary>Calls the <c>Fun</c> in a context that is not protected by a transaction.</fsummary>
       <desc>
       <marker id="sync_dirty"></marker>
@@ -2143,7 +2150,7 @@ mnesia:create_table(employee,
       </desc>
     </func>
     <func>
-      <name>sync_log() -> ok | {error, Reason}</name>
+      <name since="OTP 17.0">sync_log() -> ok | {error, Reason}</name>
       <fsummary>Performs a file sync of the local log file.</fsummary>
       <desc>
         <p>Ensures that the local transaction log file is synced to disk.
@@ -2153,7 +2160,7 @@ mnesia:create_table(employee,
       </desc>
     </func>
     <func>
-      <name>sync_transaction(Fun, [[, Args], Retries]) -> {aborted, Reason} | {atomic, ResultOfFun}</name>
+      <name since="">sync_transaction(Fun, [[, Args], Retries]) -> {aborted, Reason} | {atomic, ResultOfFun}</name>
       <fsummary>Synchronously executes a transaction.</fsummary>
       <desc>
       <marker id="sync_transaction"></marker>
@@ -2166,7 +2173,7 @@ mnesia:create_table(employee,
       </desc>
     </func>
     <func>
-      <name>system_info(InfoKey) -> Info | exit({aborted, Reason})</name>
+      <name since="">system_info(InfoKey) -> Info | exit({aborted, Reason})</name>
       <fsummary>Returns information about the Mnesia system.</fsummary>
       <desc>
       <marker id="system_info"></marker>
@@ -2353,7 +2360,7 @@ mnesia:create_table(employee,
       </desc>
     </func>
     <func>
-      <name>table(Tab [,[Option]]) -> QueryHandle</name>
+      <name since="">table(Tab [,[Option]]) -> QueryHandle</name>
       <fsummary>Return a QLC query handle.</fsummary>
       <desc>
       <marker id="table"></marker>
@@ -2408,7 +2415,7 @@ mnesia:create_table(employee,
       </desc>
     </func>
     <func>
-      <name>table_info(Tab, InfoKey) -> Info | exit({aborted, Reason})</name>
+      <name since="">table_info(Tab, InfoKey) -> Info | exit({aborted, Reason})</name>
       <fsummary>Returns local information about table.</fsummary>
       <desc>
       <marker id="table_info"></marker>
@@ -2560,7 +2567,7 @@ mnesia:create_table(employee,
       </desc>
     </func>
     <func>
-      <name>transaction(Fun [[, Args], Retries]) -> {aborted, Reason} | {atomic, ResultOfFun}</name>
+      <name since="">transaction(Fun [[, Args], Retries]) -> {aborted, Reason} | {atomic, ResultOfFun}</name>
       <fsummary>Executes a transaction.</fsummary>
       <desc>
       <marker id="transaction"></marker>
@@ -2628,7 +2635,7 @@ raise(Name, Amount) ->
       </desc>
     </func>
     <func>
-      <name>transform_table(Tab, Fun, NewAttributeList, NewRecordName) -> {aborted, R} | {atomic, ok}</name>
+      <name since="">transform_table(Tab, Fun, NewAttributeList, NewRecordName) -> {aborted, R} | {atomic, ok}</name>
       <fsummary>Changes format on all records in table <c>Tab</c>.</fsummary>
       <desc>
       <marker id="transform_table_4"></marker>
@@ -2649,7 +2656,7 @@ raise(Name, Amount) ->
       </desc>
     </func>
     <func>
-      <name>transform_table(Tab, Fun, NewAttributeList) -> {aborted, R} | {atomic, ok}</name>
+      <name since="">transform_table(Tab, Fun, NewAttributeList) -> {aborted, R} | {atomic, ok}</name>
       <fsummary>Changes format on all records in table <c>Tab</c>.</fsummary>
       <desc>
         <p>Calls <c>mnesia:transform_table(Tab, Fun,
@@ -2658,7 +2665,7 @@ raise(Name, Amount) ->
       </desc>
     </func>
     <func>
-      <name>traverse_backup(Source, [SourceMod,] Target, [TargetMod,] Fun, Acc) -> {ok, LastAcc} | {error, Reason}</name>
+      <name since="">traverse_backup(Source, [SourceMod,] Target, [TargetMod,] Fun, Acc) -> {ok, LastAcc} | {error, Reason}</name>
       <fsummary>Traversal of a backup.</fsummary>
       <desc>
       <marker id="traverse_backup"></marker>
@@ -2689,7 +2696,7 @@ raise(Name, Amount) ->
       </desc>
     </func>
     <func>
-      <name>uninstall_fallback() -> ok | {error,Reason}</name>
+      <name since="">uninstall_fallback() -> ok | {error,Reason}</name>
       <fsummary>Uninstalls a fallback.</fsummary>
       <desc>
       <marker id="uninstall_fallback_0"></marker>
@@ -2698,7 +2705,7 @@ raise(Name, Amount) ->
       </desc>
     </func>
     <func>
-      <name>uninstall_fallback(Args) -> ok | {error,Reason}</name>
+      <name since="">uninstall_fallback(Args) -> ok | {error,Reason}</name>
       <fsummary>Uninstalls a fallback.</fsummary>
       <desc>
         <p>Deinstalls a fallback before it
@@ -2725,7 +2732,7 @@ raise(Name, Amount) ->
       </desc>
     </func>
     <func>
-      <name>unsubscribe(EventCategory) -> {ok, Node} | {error, Reason}</name>
+      <name since="">unsubscribe(EventCategory) -> {ok, Node} | {error, Reason}</name>
       <fsummary>Subscribes to events of type <c>EventCategory</c>.</fsummary>
       <desc>
       <marker id="unsubscribe"></marker>
@@ -2735,7 +2742,7 @@ raise(Name, Amount) ->
       </desc>
     </func>
     <func>
-      <name>wait_for_tables(TabList, Timeout) -> ok | {timeout, BadTabList} | {error, Reason}</name>
+      <name since="">wait_for_tables(TabList, Timeout) -> ok | {timeout, BadTabList} | {error, Reason}</name>
       <fsummary>Waits for tables to be accessible.</fsummary>
       <desc>
       <marker id="wait_for_tables"></marker>
@@ -2746,7 +2753,7 @@ raise(Name, Amount) ->
       </desc>
     </func>
     <func>
-      <name>wread({Tab, Key}) -> transaction abort | RecordList</name>
+      <name since="">wread({Tab, Key}) -> transaction abort | RecordList</name>
       <fsummary>Reads records with given key.</fsummary>
       <desc>
       <marker id="wread"></marker>
@@ -2754,7 +2761,7 @@ raise(Name, Amount) ->
       </desc>
     </func>
     <func>
-      <name>write(Record) -> transaction abort | ok</name>
+      <name since="">write(Record) -> transaction abort | ok</name>
       <fsummary>Writes a record into the database.</fsummary>
       <desc>
       <marker id="write_1"></marker>
@@ -2763,7 +2770,7 @@ raise(Name, Amount) ->
       </desc>
     </func>
     <func>
-      <name>write(Tab, Record, LockKind) -> transaction abort | ok</name>
+      <name since="">write(Tab, Record, LockKind) -> transaction abort | ok</name>
       <fsummary>Writes a record into the database.</fsummary>
       <desc>
       <marker id="write_3"></marker>
@@ -2779,7 +2786,7 @@ raise(Name, Amount) ->
       </desc>
     </func>
     <func>
-      <name>write_lock_table(Tab) -> ok | transaction abort</name>
+      <name since="">write_lock_table(Tab) -> ok | transaction abort</name>
       <fsummary>Sets write lock on an entire table.</fsummary>
       <desc>
       <marker id="write_lock_table"></marker>
diff --git a/lib/mnesia/doc/src/mnesia_frag_hash.xml b/lib/mnesia/doc/src/mnesia_frag_hash.xml
index c233acdb05..ccaba412d0 100644
--- a/lib/mnesia/doc/src/mnesia_frag_hash.xml
+++ b/lib/mnesia/doc/src/mnesia_frag_hash.xml
@@ -34,7 +34,7 @@
     <rev>A</rev>
     <file>mnesia_frag_hash.sgml</file>
   </header>
-  <module>mnesia_frag_hash</module>
+  <module since="">mnesia_frag_hash</module>
   <modulesummary>Defines mnesia_frag_hash callback behavior</modulesummary>
   <description>
     <p>This module defines a callback behavior for user-defined hash
@@ -50,7 +50,7 @@
 
   <funcs>
     <func>
-      <name>init_state(Tab, State) -> NewState | abort(Reason)</name>
+      <name since="">init_state(Tab, State) -> NewState | abort(Reason)</name>
       <fsummary>Initiates the hash state for a new table.</fsummary>
       <type>
         <v>Tab = atom()</v>
@@ -72,7 +72,7 @@
       </desc>
     </func>
     <func>
-      <name>add_frag(State) -> {NewState, IterFrags, AdditionalLockFrags} | abort(Reason)</name>
+      <name since="">add_frag(State) -> {NewState, IterFrags, AdditionalLockFrags} | abort(Reason)</name>
       <fsummary>Starts when a new fragment is added to a fragmented table.</fsummary>
       <type>
         <v>State = term()</v>
@@ -100,7 +100,7 @@
       </desc>
     </func>
     <func>
-      <name>del_frag(State) ->  {NewState, IterFrags, AdditionalLockFrags} | abort(Reason)</name>
+      <name since="">del_frag(State) ->  {NewState, IterFrags, AdditionalLockFrags} | abort(Reason)</name>
       <fsummary>Starts when a fragment is deleted from a fragmented table.</fsummary>
       <type>
         <v>State = term()</v>
@@ -127,7 +127,7 @@
       </desc>
     </func>
     <func>
-      <name>key_to_frag_number(State, Key) -> FragNum | abort(Reason)</name>
+      <name since="">key_to_frag_number(State, Key) -> FragNum | abort(Reason)</name>
       <fsummary>Resolves the key of a record into a fragment number.</fsummary>
       <type>
         <v>FragNum = integer()</v>
@@ -140,7 +140,7 @@
       </desc>
     </func>
     <func>
-      <name>match_spec_to_frag_numbers(State, MatchSpec) -> FragNums | abort(Reason)</name>
+      <name since="">match_spec_to_frag_numbers(State, MatchSpec) -> FragNums | abort(Reason)</name>
       <fsummary>Resolves a <c>MatchSpec</c> into a list of fragment numbers.</fsummary>
       <type>
         <v>MatcSpec = ets_select_match_spec()</v>
diff --git a/lib/mnesia/doc/src/mnesia_registry.xml b/lib/mnesia/doc/src/mnesia_registry.xml
index a76f716981..18ddc4ab9e 100644
--- a/lib/mnesia/doc/src/mnesia_registry.xml
+++ b/lib/mnesia/doc/src/mnesia_registry.xml
@@ -34,7 +34,7 @@
     <rev>A</rev>
     <file>mnesia_registry.sgml</file>
   </header>
-  <module>mnesia_registry</module>
+  <module since="">mnesia_registry</module>
   <modulesummary>Dump support for registries in erl_interface.</modulesummary>
   <description>
     <p>This module is usually part of the <c>erl_interface</c>
@@ -57,7 +57,7 @@
 
   <funcs>
     <func>
-      <name>create_table(Tab) -> ok | exit(Reason)</name>
+      <name since="">create_table(Tab) -> ok | exit(Reason)</name>
       <fsummary>Creates a registry table in Mnesia.</fsummary>
       <desc>
         <p>A wrapper function for <c>mnesia:create_table/2</c>,
@@ -73,7 +73,7 @@
       </desc>
     </func>
     <func>
-      <name>create_table(Tab, TabDef) -> ok | exit(Reason)</name>
+      <name since="">create_table(Tab, TabDef) -> ok | exit(Reason)</name>
       <fsummary>Creates a customized registry table in Mnesia.</fsummary>
       <desc>
         <p>A wrapper function for <c>mnesia:create_table/2</c>,
diff --git a/lib/mnesia/doc/src/notes.xml b/lib/mnesia/doc/src/notes.xml
index 29c35d221c..2d38e4d01c 100644
--- a/lib/mnesia/doc/src/notes.xml
+++ b/lib/mnesia/doc/src/notes.xml
@@ -39,7 +39,66 @@
     thus constitutes one section in this document. The title of each
     section is the version number of Mnesia.</p>
 
-  <section><title>Mnesia 4.15.5</title>
+  <section><title>Mnesia 4.16</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Optimize mnesia:read/1 if data have been written in the
+	    same transaction.</p>
+          <p>
+	    Own Id: OTP-15550 Aux Id: PR-2029 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed bugs in table index plugin handling.</p>
+          <p>
+	    Own Id: OTP-15689 Aux Id: PR-1695 ERL-556 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Optimized dumping of tables with plugin backends.</p>
+          <p>
+	    Own Id: OTP-15588 Aux Id: PR-2102 </p>
+        </item>
+        <item>
+          <p>
+	    Include stacktrace in exception if a dirty activity
+	    errors, thus if user have matched on the error thrown it
+	    may not match any more.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15804 Aux Id: PR-2216 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Mnesia 4.15.6</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Avoid overload warnings caused by a race condition.</p>
+          <p>
+	    Own Id: OTP-15619 Aux Id: ERIERL-310 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Mnesia 4.15.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
@@ -737,7 +796,7 @@
           <p>
 	    Returns the same value for
 	    mnesia_loader:disc_load_table/2 as
-	    mnesia_loader:net_load_table/4 if a table copy can not be
+	    mnesia_loader:net_load_table/4 if a table copy cannot be
 	    found. (Thanks to Uwe Dauernheim)</p>
           <p>
 	    Own Id: OTP-10015</p>
diff --git a/lib/mnesia/examples/bench/README b/lib/mnesia/examples/bench/README
index 5d31b5ba25..b8209b19b8 100644
--- a/lib/mnesia/examples/bench/README
+++ b/lib/mnesia/examples/bench/README
@@ -46,7 +46,7 @@ you need to:
 
  - put the $ERL_TOP/bin directory in your path on all nodes
  - bind IP adresses to hostnames (e.g via DNS or /etc/hosts)
- - enable usage of rsh so it does not prompt for password
+ - enable usage of ssh so it does not prompt for password
 
 If you cannot achieve this, it is possible to run the benchmark
 anyway, but it requires more manual work to be done for each
@@ -141,7 +141,7 @@ statistics_detail
   following atoms: normal, debug and debug2. debug enables a
   finer grain of statistics to be reported, but since it requires
   more counters, to be updated by the generator processes it may
-  cause slightly worse benchmark performace figures than the brief
+  cause slightly worse benchmark performance figures than the brief
   default case, that is normal. debug2 prints out the debug info
   and formats it according to LMC's benchmark program.
 
@@ -160,7 +160,7 @@ n_fragments
 
   Defines how many fragments each table should be divided in.
   Default is 100. The fragments are evenly distributed over
-  all table nodes. The group table not devided in fragments.
+  all table nodes. The group table not divided in fragments.
 
 n_replicas
 
diff --git a/lib/mnesia/src/mnesia.erl b/lib/mnesia/src/mnesia.erl
index 223dba3f90..02bc884e36 100644
--- a/lib/mnesia/src/mnesia.erl
+++ b/lib/mnesia/src/mnesia.erl
@@ -160,7 +160,7 @@
                     {'sync_transaction', Retries::non_neg_integer()}.
 -type table() :: atom().
 -type storage_type() :: 'ram_copies' | 'disc_copies' | 'disc_only_copies'.
--type index_attr() :: atom() | non_neg_integer().
+-type index_attr() :: atom() | non_neg_integer() | {atom()}.
 -type write_locks() :: 'write' | 'sticky_write'.
 -type read_locks() :: 'read'.
 -type lock_kind() :: write_locks() | read_locks().
@@ -838,18 +838,20 @@ read(Tid, Ts, Tab, Key, LockKind)
 	tid ->
 	    Store = Ts#tidstore.store,
 	    Oid = {Tab, Key},
-	    Objs =
-		case LockKind of
-		    read ->
-			mnesia_locker:rlock(Tid, Store, Oid);
-		    write ->
-			mnesia_locker:rwlock(Tid, Store, Oid);
-		    sticky_write ->
-			mnesia_locker:sticky_rwlock(Tid, Store, Oid);
-		    _ ->
-			abort({bad_type, Tab, LockKind})
-		end,
-	    add_written(?ets_lookup(Store, Oid), Tab, Objs);
+	    ObjsFun =
+                fun() ->
+                        case LockKind of
+                            read ->
+                                mnesia_locker:rlock(Tid, Store, Oid);
+                            write ->
+                                mnesia_locker:rwlock(Tid, Store, Oid);
+                            sticky_write ->
+                                mnesia_locker:sticky_rwlock(Tid, Store, Oid);
+                            _ ->
+                                abort({bad_type, Tab, LockKind})
+                        end
+                end,
+	    add_written(?ets_lookup(Store, Oid), Tab, ObjsFun, LockKind);
 	_Protocol ->
 	    dirty_read(Tab, Key)
     end;
@@ -1202,14 +1204,20 @@ add_previous(_Tid, Ts, _Type, Tab) ->
 %% This routine fixes up the return value from read/1 so that
 %% it is correct with respect to what this particular transaction
 %% has already written, deleted .... etc
+%% The actual read from the table is not done if not needed due to local
+%% transaction context, and if so, no extra read lock is needed either.
 
-add_written([], _Tab, Objs) ->
-    Objs;  % standard normal fast case
-add_written(Written, Tab, Objs) ->
+add_written([], _Tab, ObjsFun, _LockKind) ->
+    ObjsFun();  % standard normal fast case
+add_written(Written, Tab, ObjsFun, LockKind) ->
     case val({Tab, setorbag}) of
 	bag ->
-	    add_written_to_bag(Written, Objs, []);
+	    add_written_to_bag(Written, ObjsFun(), []);
+        _ when LockKind == read;
+               LockKind == write ->
+	    add_written_to_set(Written);
 	_   ->
+            _ = ObjsFun(),  % Fall back to request new lock and read from source
 	    add_written_to_set(Written)
     end.
 
@@ -1269,6 +1277,14 @@ match_object(Tid, Ts, Tab, Pat, LockKind)
 match_object(_Tid, _Ts, Tab, Pat, _LockKind) ->
     abort({bad_type, Tab, Pat}).
 
+add_written_index(Store, Pos, Tab, Key, Objs) when is_integer(Pos) ->
+    Pat = setelement(Pos, val({Tab, wild_pattern}), Key),
+    add_written_match(Store, Pat, Tab, Objs);
+add_written_index(Store, Pos, Tab, Key, Objs) when is_tuple(Pos) ->
+    IxF = mnesia_index:index_vals_f(val({Tab, storage_type}), Tab, Pos),
+    Ops = find_ops(Store, Tab, '_'),
+    add_ix_match(Ops, Objs, IxF, Key, val({Tab, setorbag})).
+
 add_written_match(S, Pat, Tab, Objs) ->
     Ops = find_ops(S, Tab, Pat),
     FixedRes = add_match(Ops, Objs, val({Tab, setorbag})),
@@ -1295,6 +1311,46 @@ add_match([{_Oid, Val, write}|R], Objs, bag) ->
 add_match([{Oid, Val, write}|R], Objs, set) ->
     add_match(R, [Val | deloid(Oid,Objs)],set).
 
+add_ix_match([], Objs, _IxF, _Key, _Type) ->
+    Objs;
+add_ix_match(Written, Objs, IxF, Key, ordered_set) ->
+    %% Must use keysort which is stable
+    add_ordered_match(lists:keysort(1, ix_filter_ops(IxF, Key, Written)), Objs, []);
+add_ix_match([{Oid, _, delete}|R], Objs, IxF, Key, Type) ->
+    add_ix_match(R, deloid(Oid, Objs), IxF, Key, Type);
+add_ix_match([{_Oid, Val, delete_object}|R], Objs, IxF, Key, Type) ->
+    case ix_match(Val, IxF, Key) of
+        true ->
+            add_ix_match(R, lists:delete(Val, Objs), IxF, Key, Type);
+        false ->
+            add_ix_match(R, Objs, IxF, Key, Type)
+    end;
+add_ix_match([{_Oid, Val, write}|R], Objs, IxF, Key, bag) ->
+    case ix_match(Val, IxF, Key) of
+        true ->
+            add_ix_match(R, [Val | lists:delete(Val, Objs)], IxF, Key, bag);
+        false ->
+            add_ix_match(R, Objs, IxF, Key, bag)
+    end;
+add_ix_match([{Oid, Val, write}|R], Objs, IxF, Key, set) ->
+    case ix_match(Val, IxF, Key) of
+        true ->
+            add_ix_match(R, [Val | deloid(Oid,Objs)],IxF,Key,set);
+        false ->
+            add_ix_match(R, Objs, IxF, Key, set)
+    end.
+
+ix_match(Val, IxF, Key) ->
+    lists:member(Key, IxF(Val)).
+
+ix_filter_ops(IxF, Key, Ops) ->
+    lists:filter(
+      fun({_Oid, Obj, write}) ->
+              ix_match(Obj, IxF, Key);
+         (_) ->
+              true
+      end, Ops).
+
 %% For ordered_set only !!
 add_ordered_match(Written = [{{_, Key}, _, _}|_], [Obj|Objs], Acc)
   when Key > element(2, Obj) ->
@@ -1633,6 +1689,16 @@ index_match_object(Tid, Ts, Tab, Pat, Attr, LockKind)
 	    dirty_index_match_object(Tab, Pat, Attr); % Should be optimized?
 	tid ->
 	    case mnesia_schema:attr_tab_to_pos(Tab, Attr) of
+                {_} ->
+                    case LockKind of
+                        read ->
+			    Store = Ts#tidstore.store,
+			    mnesia_locker:rlock_table(Tid, Store, Tab),
+			    Objs = dirty_match_object(Tab, Pat),
+			    add_written_match(Store, Pat, Tab, Objs);
+                        _ ->
+                            abort({bad_type, Tab, LockKind})
+                    end;
 		Pos when Pos =< tuple_size(Pat) ->
 		    case LockKind of
 			read ->
@@ -1680,8 +1746,8 @@ index_read(Tid, Ts, Tab, Key, Attr, LockKind)
 			false ->
 			    Store = Ts#tidstore.store,
 			    Objs = mnesia_index:read(Tid, Store, Tab, Key, Pos),
-			    Pat = setelement(Pos, val({Tab, wild_pattern}), Key),
-			    add_written_match(Store, Pat, Tab, Objs);
+                            add_written_index(
+                              Ts#tidstore.store, Pos, Tab, Key, Objs);
 			true ->
 			    abort({bad_type, Tab, Attr, Key})
 		    end;
@@ -1817,7 +1883,7 @@ remote_dirty_match_object(Tab, Pat) ->
 	false ->
 	    mnesia_lib:db_match_object(Tab, Pat);
 	true ->
-	    PosList = val({Tab, index}),
+            PosList = regular_indexes(Tab),
 	    remote_dirty_match_object(Tab, Pat, PosList)
     end.
 
@@ -1849,7 +1915,7 @@ remote_dirty_select(Tab, Spec) ->
 		false ->
 		    mnesia_lib:db_select(Tab, Spec);
 		true  ->
-		    PosList = val({Tab, index}),
+		    PosList = regular_indexes(Tab),
 		    remote_dirty_select(Tab, Spec, PosList)
 	    end;
 	_ ->
@@ -1916,6 +1982,8 @@ dirty_index_match_object(Pat, _Attr) ->
 dirty_index_match_object(Tab, Pat, Attr)
   when is_atom(Tab), Tab /= schema, is_tuple(Pat), tuple_size(Pat) > 2 ->
     case mnesia_schema:attr_tab_to_pos(Tab, Attr) of
+        {_} ->
+            dirty_match_object(Tab, Pat);
 	Pos when Pos =< tuple_size(Pat) ->
 	    case has_var(element(2, Pat)) of
 		false ->
@@ -3246,3 +3314,7 @@ put_activity_id(Activity) ->
     mnesia_tm:put_activity_id(Activity).
 put_activity_id(Activity,Fun) ->
     mnesia_tm:put_activity_id(Activity,Fun).
+
+regular_indexes(Tab) ->
+    PosList = val({Tab, index}),
+    [P || P <- PosList, is_integer(P)].
diff --git a/lib/mnesia/src/mnesia_controller.erl b/lib/mnesia/src/mnesia_controller.erl
index 882de0d613..0f221b0c1f 100644
--- a/lib/mnesia/src/mnesia_controller.erl
+++ b/lib/mnesia/src/mnesia_controller.erl
@@ -331,35 +331,39 @@ release_schema_commit_lock() ->
 
 %% Special for preparation of add table copy
 get_network_copy(Tid, Tab, Cs) ->
-%   We can't let the controller queue this one
-%   because that may cause a deadlock between schema_operations
-%   and initial tableloadings which both takes schema locks.
-%   But we have to get copier_done msgs when the other side
-%   goes down.
-    call({add_other, self()}),
-    Reason = {dumper,{add_table_copy, Tid}},
-    Work = #net_load{table = Tab,reason = Reason,cstruct = Cs},
-    %% I'll need this cause it's linked trough the subscriber
-    %% might be solved by using monitor in subscr instead.
-    process_flag(trap_exit, true),
-    Load = load_table_fun(Work),
-    Res = ?CATCH(Load()),
-    process_flag(trap_exit, false),
-    call({del_other, self()}),
-    case Res of
- 	#loader_done{is_loaded = true} ->
- 	    Tab = Res#loader_done.table_name,
- 	    case Res#loader_done.needs_announce of
- 		true ->
- 		    i_have_tab(Tab);
- 		false ->
- 		    ignore
- 	    end,
- 	    Res#loader_done.reply;
-	#loader_done{} ->
- 	    Res#loader_done.reply;
- 	Else ->
- 	    {not_loaded, Else}
+    %%   We can't let the controller queue this one
+    %%   because that may cause a deadlock between schema_operations
+    %%   and initial tableloadings which both takes schema locks.
+    %%   But we have to get copier_done msgs when the other side
+    %%   goes down.
+    case call({add_other, self()}) of
+        ok ->
+            Reason = {dumper,{add_table_copy, Tid}},
+            Work = #net_load{table = Tab,reason = Reason,cstruct = Cs},
+            %% I'll need this cause it's linked trough the subscriber
+            %% might be solved by using monitor in subscr instead.
+            process_flag(trap_exit, true),
+            Load = load_table_fun(Work),
+            Res = ?CATCH(Load()),
+            process_flag(trap_exit, false),
+            call({del_other, self()}),
+            case Res of
+                #loader_done{is_loaded = true} ->
+                    Tab = Res#loader_done.table_name,
+                    case Res#loader_done.needs_announce of
+                        true ->
+                            i_have_tab(Tab);
+                        false ->
+                            ignore
+                    end,
+                    Res#loader_done.reply;
+                #loader_done{} ->
+                    Res#loader_done.reply;
+                Else ->
+                    {not_loaded, Else}
+            end;
+        {error, Else} ->
+            {not_loaded, Else}
     end.
 
 %% This functions is invoked from the dumper
@@ -772,6 +776,18 @@ handle_call({unannounce_add_table_copy, [Tab, Node], From}, ReplyTo, State) ->
 	    noreply(State#state{early_msgs = [{call, Msg, undefined} | Msgs]})
     end;
 
+handle_call({add_other, Who}, _From, State = #state{others=Others0, schema_is_merged=SM}) ->
+    case SM of
+        true ->
+            Others = [Who|Others0],
+            {reply, ok, State#state{others=Others}};
+        false ->
+            {reply, {error, {not_active,schema,node()}}, State}
+    end;
+handle_call({del_other, Who}, _From, State = #state{others=Others0}) ->
+    Others = lists:delete(Who, Others0),
+    {reply, ok, State#state{others=Others}};
+
 handle_call(Msg, From, State) when State#state.schema_is_merged /= true ->
     %% Buffer early messages
     Msgs = State#state.early_msgs,
@@ -803,13 +819,6 @@ handle_call({block_table, [Tab], From}, _Dummy, State) ->
 handle_call({check_w2r, _Node, Tab}, _From, State) ->
     {reply, val({Tab, where_to_read}), State};
 
-handle_call({add_other, Who}, _From, State = #state{others=Others0}) ->
-    Others = [Who|Others0],
-    {reply, ok, State#state{others=Others}};
-handle_call({del_other, Who}, _From, State = #state{others=Others0}) ->
-    Others = lists:delete(Who, Others0),
-    {reply, ok, State#state{others=Others}};
-
 handle_call(Msg, _From, State) ->
     error("~p got unexpected call: ~tp~n", [?SERVER_NAME, Msg]),
     noreply(State).
diff --git a/lib/mnesia/src/mnesia_dumper.erl b/lib/mnesia/src/mnesia_dumper.erl
index a2880d6cf4..8ab11be2d3 100644
--- a/lib/mnesia/src/mnesia_dumper.erl
+++ b/lib/mnesia/src/mnesia_dumper.erl
@@ -67,10 +67,10 @@ get_log_writes() ->
 incr_log_writes() ->
     Left = mnesia_lib:incr_counter(trans_log_writes_left, -1),
     if
-	Left > 0 ->
-	    ignore;
+	Left =:= 0 ->
+	    adjust_log_writes(true);
 	true ->
-	    adjust_log_writes(true)
+	    ignore
     end.
 
 adjust_log_writes(DoCast) ->
@@ -272,17 +272,12 @@ do_insert_rec(Tid, Rec, InPlace, InitBy, LogV) ->
 	    end
     end,
     D = Rec#commit.disc_copies,
-    ExtOps = commit_ext(Rec),
     insert_ops(Tid, disc_copies, D, InPlace, InitBy, LogV),
-    [insert_ops(Tid, Ext, Ops, InPlace, InitBy, LogV) ||
-	{Ext, Ops} <- ExtOps,
-	storage_semantics(Ext) == disc_copies],
+    insert_ext_ops(Tid, commit_ext(Rec), InPlace, InitBy),
     case InitBy of
 	startup ->
 	    DO = Rec#commit.disc_only_copies,
-	    insert_ops(Tid, disc_only_copies, DO, InPlace, InitBy, LogV),
-	    [insert_ops(Tid, Ext, Ops, InPlace, InitBy, LogV) ||
-		{Ext, Ops} <- ExtOps, storage_semantics(Ext) == disc_only_copies];
+	    insert_ops(Tid, disc_only_copies, DO, InPlace, InitBy, LogV);
 	_ ->
 	    ignore
     end.
@@ -290,11 +285,8 @@ do_insert_rec(Tid, Rec, InPlace, InitBy, LogV) ->
 commit_ext(#commit{ext = []}) -> [];
 commit_ext(#commit{ext = Ext}) ->
     case lists:keyfind(ext_copies, 1, Ext) of
-	{_, C} ->
-	    lists:foldl(fun({Ext0, Op}, D) ->
-				orddict:append(Ext0, Op, D)
-			end, orddict:new(), C);
-	false -> []
+        {_, C} -> C;
+        false -> []
     end.
 
 update(_Tid, [], _DumperMode) ->
@@ -330,6 +322,21 @@ perform_update(Tid, SchemaOps, _DumperMode, _UseDir) ->
             fatal("Schema update error ~tp ~tp", [{Reason,ST}, SchemaOps])
     end.
 
+insert_ext_ops(Tid, ExtOps, InPlace, InitBy) ->
+  %% Note: ext ops cannot be part of pre-4.3 logs, so there's no need
+  %% to support the old operation order, as in `insert_ops'
+  lists:foreach(
+    fun ({Ext, Op}) ->
+        case storage_semantics(Ext) of
+          Semantics when Semantics == disc_copies;
+                         Semantics == disc_only_copies, InitBy == startup ->
+            insert_op(Tid, Ext, Op, InPlace, InitBy);
+          _Other ->
+            ok
+        end
+    end,
+    ExtOps).
+
 insert_ops(_Tid, _Storage, [], _InPlace, _InitBy, _) ->    ok;
 insert_ops(Tid, Storage, [Op], InPlace, InitBy, Ver)  when Ver >= "4.3"->
     insert_op(Tid, Storage, Op, InPlace, InitBy),
diff --git a/lib/mnesia/src/mnesia_index.erl b/lib/mnesia/src/mnesia_index.erl
index 098265d5fc..6f1c21e3b9 100644
--- a/lib/mnesia/src/mnesia_index.erl
+++ b/lib/mnesia/src/mnesia_index.erl
@@ -1,8 +1,8 @@
 %%
 %% %CopyrightBegin%
-%% 
+%%
 %% 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.
 %% You may obtain a copy of the License at
@@ -14,7 +14,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.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 
@@ -37,7 +37,7 @@
 	 db_match_erase/2,
 	 get_index_table/2,
 	 get_index_table/3,
-	 
+
 	 tab2filename/2,
 	 init_index/2,
 	 init_indecies/3,
@@ -45,6 +45,7 @@
 	 del_transient/3,
 	 del_index_table/3,
 
+         index_vals_f/3,
          index_info/2,
 	 ext_index_instances/1]).
 
@@ -60,9 +61,14 @@ read(Tid, Store, Tab, IxKey, Pos) ->
     ResList = mnesia_locker:ixrlock(Tid, Store, Tab, IxKey, Pos),
     %% Remove all tuples which don't include Ixkey, happens when Tab is a bag
     case val({Tab, setorbag}) of
-	bag -> 
+	bag when is_integer(Pos) ->
 	    mnesia_lib:key_search_all(IxKey, Pos, ResList);
-	_ -> 
+        bag when is_tuple(Pos) ->
+            TabStorage = val({Tab, storage_type}),
+            ValsF = index_vals_f(TabStorage, Tab, Pos),
+            [Obj || Obj <- ResList,
+                    lists:member(IxKey, ValsF(Obj))];
+	_ ->
 	    ResList
     end.
 
@@ -136,7 +142,7 @@ del_object_index2([], _, _Storage, _Tab, _K, _Obj) -> ok;
 del_object_index2([{{Pos, Type}, Ixt} | Tail], SoB, Storage, Tab, K, Obj) ->
     ValsF = index_vals_f(Storage, Tab, Pos),
     case SoB of
-	bag -> 
+	bag ->
 	    del_object_bag(Type, ValsF, Tab, K, Obj, Ixt);
 	_ -> %% If set remove the tuple in index table
 	    del_ixes(Type, Ixt, ValsF, Obj, K)
@@ -197,7 +203,7 @@ merge([], _, _, Ack) ->
 realkeys(Tab, Pos, IxKey) ->
     Index = get_index_table(Tab, Pos),
     db_get(Index, IxKey). % a list on the form [{IxKey, RealKey1} , ....
-    
+
 dirty_select(Tab, Spec, Pos) when is_integer(Pos) ->
     %% Assume that we are on the node where the replica is
     %% Returns the records without applying the match spec
@@ -233,7 +239,7 @@ dirty_read2(Tab, IxKey, Pos) ->
 		  end, Acc, mnesia_lib:db_get(Storage, Tab, K))
 	end, [], Keys)).
 
-pick_index([{{{Pfx,_},IxType}, Ixt}|_], _Tab, {_} = Pfx) ->
+pick_index([{{{Pfx,_,_},IxType}, Ixt}|_], _Tab, {_} = Pfx) ->
     {IxType, Ixt};
 pick_index([{{Pos,IxType}, Ixt}|_], _Tab, Pos) ->
     {IxType, Ixt};
@@ -242,7 +248,7 @@ pick_index([_|T], Tab, Pos) ->
 pick_index([], Tab, Pos) ->
     mnesia:abort({no_exist, Tab, {index, Pos}}).
 
-	    
+
 
 %%%%%%% Creation, Init and deletion routines for index tables
 %% We can have several indexes on the same table
@@ -387,12 +393,12 @@ init_ext_index(Tab, Storage, Alias, Mod, [{Pos,Type} | Tail]) ->
 create_fun(Cont, Tab, Pos) ->
     IxF = index_vals_f(disc_only_copies, Tab, Pos),
     fun(read) ->
-	    Data = 
+	    Data =
 		case Cont of
 		    {start, KeysPerChunk} ->
 			mnesia_lib:db_init_chunk(
 			  disc_only_copies, Tab, KeysPerChunk);
-		    '$end_of_table' -> 
+		    '$end_of_table' ->
 			'$end_of_table';
 		    _Else ->
 			mnesia_lib:db_chunk(disc_only_copies, Cont)
@@ -462,7 +468,7 @@ add_index_info(Tab, SetOrBag, IxElem) ->
 	    %% Check later if mnesia_tm is sensitive about the order
 	    mnesia_lib:set({Tab, index_info}, IndexInfo),
 	    mnesia_lib:set({Tab, index}, index_positions(IndexInfo)),
-	    mnesia_lib:set({Tab, commit_work}, 
+	    mnesia_lib:set({Tab, commit_work},
 			   mnesia_lib:sort_commit([IndexInfo | Commit]));
 	{value, Old} ->
 	    %% We could check for consistency here
@@ -470,7 +476,7 @@ add_index_info(Tab, SetOrBag, IxElem) ->
 	    mnesia_lib:set({Tab, index_info}, Index),
 	    mnesia_lib:set({Tab, index}, index_positions(Index)),
 	    NewC = lists:keyreplace(index, 1, Commit, Index),
-	    mnesia_lib:set({Tab, commit_work}, 
+	    mnesia_lib:set({Tab, commit_work},
 			   mnesia_lib:sort_commit(NewC))
     end.
 
@@ -488,19 +494,19 @@ del_index_info(Tab, Pos) ->
                                       element(1,P)=/=Pos
                               end,
                               Old#index.pos_list) of
-		[] -> 
+		[] ->
                     IndexInfo = index_info(Old#index.setorbag,[]),
 		    mnesia_lib:set({Tab, index_info}, IndexInfo),
 		    mnesia_lib:set({Tab, index}, index_positions(IndexInfo)),
 		    NewC = lists:keydelete(index, 1, Commit),
-		    mnesia_lib:set({Tab, commit_work}, 
+		    mnesia_lib:set({Tab, commit_work},
 				   mnesia_lib:sort_commit(NewC));
 		New ->
 		    Index = Old#index{pos_list = New},
 		    mnesia_lib:set({Tab, index_info}, Index),
 		    mnesia_lib:set({Tab, index}, index_positions(Index)),
 		    NewC = lists:keyreplace(index, 1, Commit, Index),
-		    mnesia_lib:set({Tab, commit_work}, 
+		    mnesia_lib:set({Tab, commit_work},
 				   mnesia_lib:sort_commit(NewC))
 	    end
     end.
@@ -537,7 +543,7 @@ db_match_erase({{ext,_,_} = Ext, Ixt}, Pat) ->
     mnesia_lib:db_match_erase(Ext, Ixt, Pat);
 db_match_erase({dets, Ixt}, Pat) ->
     ok = dets:match_delete(Ixt, Pat).
-    
+
 db_select({ram, Ixt}, Pat) ->
     ets:select(Ixt, Pat);
 db_select({{ext,_,_} = Ext, Ixt}, Pat) ->
@@ -545,7 +551,7 @@ db_select({{ext,_,_} = Ext, Ixt}, Pat) ->
 db_select({dets, Ixt}, Pat) ->
     dets:select(Ixt, Pat).
 
-    
+
 get_index_table(Tab, Pos) ->
     get_index_table(Tab,  val({Tab, storage_type}), Pos).
 
diff --git a/lib/mnesia/src/mnesia_lib.erl b/lib/mnesia/src/mnesia_lib.erl
index a884b8e086..6abc05fade 100644
--- a/lib/mnesia/src/mnesia_lib.erl
+++ b/lib/mnesia/src/mnesia_lib.erl
@@ -929,7 +929,7 @@ error_desc(no_transaction) -> "Operation not allowed outside transactions";
 error_desc(combine_error)  -> "Table options were ilegally combined";
 error_desc(bad_index)  -> "Index already exists or was out of bounds";
 error_desc(already_exists) -> "Some schema option we try to set is already on";
-error_desc(index_exists)-> "Some ops can not  be performed on tabs with index";
+error_desc(index_exists)-> "Some ops cannot  be performed on tabs with index";
 error_desc(no_exists)-> "Tried to perform op on non-existing (non alive) item";
 error_desc(system_limit) -> "Some system_limit was exhausted";
 error_desc(mnesia_down) -> "A transaction involving objects at some remote "
diff --git a/lib/mnesia/src/mnesia_locker.erl b/lib/mnesia/src/mnesia_locker.erl
index f68626413e..0222c5b1a0 100644
--- a/lib/mnesia/src/mnesia_locker.erl
+++ b/lib/mnesia/src/mnesia_locker.erl
@@ -774,10 +774,12 @@ do_sticky_lock(Tid, Store, {Tab, Key} = Oid, Lock) ->
     N = node(),
     receive
 	{?MODULE, N, granted} ->
+            ?ets_insert(Store, {sticky, true}),
 	    ?ets_insert(Store, {{locks, Tab, Key}, write}),
 	    [?ets_insert(Store, {nodes, Node}) || Node <- WNodes],
 	    granted;
 	{?MODULE, N, {granted, Val}} -> %% for rwlocks
+            ?ets_insert(Store, {sticky, true}),
 	    case opt_lookup_in_client(Val, Oid, write) of
 		C = #cyclic{} ->
 		    exit({aborted, C});
diff --git a/lib/mnesia/src/mnesia_monitor.erl b/lib/mnesia/src/mnesia_monitor.erl
index 4cfe16dec0..4e50b46da8 100644
--- a/lib/mnesia/src/mnesia_monitor.erl
+++ b/lib/mnesia/src/mnesia_monitor.erl
@@ -83,9 +83,9 @@
 		going_down = [], tm_started = false, early_connects = [],
 		connecting, mq = [], remote_node_status = []}).
 
--define(current_protocol_version,  {8,3}).
+-define(current_protocol_version,  {8,4}).
 
--define(previous_protocol_version, {8,2}).
+-define(previous_protocol_version, {8,3}).
 
 start() ->
     gen_server:start_link({local, ?MODULE}, ?MODULE,
@@ -196,7 +196,7 @@ protocol_version() ->
 %% A sorted list of acceptable protocols the
 %% preferred protocols are first in the list
 acceptable_protocol_versions() ->
-    [protocol_version(), ?previous_protocol_version, {8,1}].
+    [protocol_version(), ?previous_protocol_version].
 
 needs_protocol_conversion(Node) ->
     case {?catch_val({protocol, Node}), protocol_version()} of
diff --git a/lib/mnesia/src/mnesia_schema.erl b/lib/mnesia/src/mnesia_schema.erl
index ef38adca1e..d0f5d0e07b 100644
--- a/lib/mnesia/src/mnesia_schema.erl
+++ b/lib/mnesia/src/mnesia_schema.erl
@@ -697,7 +697,7 @@ schema_coordinator(Client, _Fun, undefined) ->
 schema_coordinator(Client, Fun, Controller) when is_pid(Controller) ->
     %% Do not trap exit in order to automatically die
     %% when the controller dies
-
+    put(transaction_client, Client), %% debug
     link(Controller),
     unlink(Client),
 
@@ -730,7 +730,10 @@ api_list2cs(Other) ->
     mnesia:abort({badarg, Other}).
 
 vsn_cs2list(Cs) ->
-    cs2list(need_old_cstructs(), Cs).
+    cs2list(Cs).
+
+cs2list(false, Cs) ->
+    cs2list(Cs).
 
 cs2list(Cs) when is_record(Cs, cstruct) ->
     Tags = record_info(fields, cstruct),
@@ -755,25 +758,6 @@ cs2list(Cs) when element(1, Cs) == cstruct, tuple_size(Cs) == 19 ->
 	    cookie,version],
     rec2list(Tags, Tags, 2, Cs).
 
-cs2list(false, Cs) ->
-    cs2list(Cs);
-cs2list({8,3}, Cs) ->
-    cs2list(Cs);
-cs2list({8,Minor}, Cs) when Minor =:= 2; Minor =:= 1 ->
-    Orig = record_info(fields, cstruct),
-    Tags = [name,type,ram_copies,disc_copies,disc_only_copies,
-	    load_order,access_mode,majority,index,snmp,local_content,
-	    record_name,attributes,
-	    user_properties,frag_properties,storage_properties,
-	    cookie,version],
-    CsList = rec2list(Tags, Orig, 2, Cs),
-    case proplists:get_value(index, CsList, []) of
-	[] -> CsList;
-	NewFormat ->
-	    OldFormat = [Pos || {Pos, _Pref} <- NewFormat],
-	    lists:keyreplace(index, 1, CsList, {index, OldFormat})
-    end.
-
 rec2list([index | Tags], [index|Orig], Pos, Rec) ->
     Val = element(Pos, Rec),
     [{index, lists:map(
@@ -796,19 +780,8 @@ rec2list([], _, _Pos, _Rec) ->
 rec2list(Tags, [_|Orig], Pos, Rec) ->
     rec2list(Tags, Orig, Pos+1, Rec).
 
-normalize_cs(Cstructs, Node) ->
-    %% backward-compatibility hack; normalize before returning
-    case need_old_cstructs([Node]) of
-	false ->
-	    Cstructs;
-	Version ->
-	    %% some other format
-	    [convert_cs(Version, Cs) || Cs <- Cstructs]
-    end.
-
-convert_cs(Version, Cs) ->
-    Fields = [Value || {_, Value} <- cs2list(Version, Cs)],
-    list_to_tuple([cstruct|Fields]).
+normalize_cs(Cstructs, _Node) ->
+    Cstructs.
 
 list2cs(List) ->
     list2cs(List, get_ext_types()).
@@ -1864,11 +1837,7 @@ do_move_table(schema, _FromNode, _ToNode) ->
     mnesia:abort({bad_type, schema});
 do_move_table(Tab, FromNode, ToNode) when is_atom(FromNode), is_atom(ToNode) ->
     TidTs = get_tid_ts_and_lock(schema, write),
-    AnyOld = lists:any(fun(Node) -> mnesia_monitor:needs_protocol_conversion(Node) end,
-		       [ToNode|val({Tab, where_to_write})]),
-    if AnyOld -> ignore;  %% Leads to deadlock on old nodes
-       true -> get_tid_ts_and_lock(Tab, write)
-    end,
+    get_tid_ts_and_lock(Tab, write),
     insert_schema_ops(TidTs, make_move_table(Tab, FromNode, ToNode));
 do_move_table(Tab, FromNode, ToNode) ->
     mnesia:abort({badarg, Tab, FromNode, ToNode}).
@@ -3438,15 +3407,14 @@ do_merge_schema(LockTabs0) ->
                                                   mnesia_lib:intersect(Ns,NeedsLock))
                      || {T,Ns} <- LockTabs],
 
-		    NeedsConversion = need_old_cstructs(NeedsLock ++ LockedAlready),
 		    {value, SchemaCs} = lists:keysearch(schema, #cstruct.name, Cstructs),
-		    SchemaDef = cs2list(NeedsConversion, SchemaCs),
+		    SchemaDef = cs2list(false, SchemaCs),
 		    %% Announce that Node is running
 		    A = [{op, announce_im_running, node(), SchemaDef, Running, RemoteRunning}],
 		    do_insert_schema_ops(Store, A),
 
 		    %% Introduce remote tables to local node
-		    do_insert_schema_ops(Store, make_merge_schema(Node, NeedsConversion, Cstructs)),
+		    do_insert_schema_ops(Store, make_merge_schema(Node, false, Cstructs)),
 
 		    %% Introduce local tables to remote nodes
 		    Tabs = val({schema, tables}),
@@ -3471,23 +3439,7 @@ do_merge_schema(LockTabs0) ->
     end.
 
 fetch_cstructs(Node) ->
-    Convert = mnesia_monitor:needs_protocol_conversion(Node),
-    case rpc:call(Node, mnesia_controller, get_remote_cstructs, [])  of
-	{cstructs, Cs0, RemoteRunning1} when Convert ->
-	    {cstructs, [list2cs(cs2list(Cs)) || Cs <- Cs0], RemoteRunning1};
-	Result ->
-	    Result
-    end.
-
-need_old_cstructs() ->
-    need_old_cstructs(val({schema, where_to_write})).
-
-need_old_cstructs(Nodes) ->
-    Filter = fun(Node) -> mnesia_monitor:needs_protocol_conversion(Node) end,
-    case lists:filter(Filter, Nodes) of
-	[] -> false;
-	Ns -> lists:min([element(1, ?catch_val({protocol, Node})) || Node <- Ns])
-    end.
+    rpc:call(Node, mnesia_controller, get_remote_cstructs, []).
 
 tab_to_nodes(Tab) when is_atom(Tab) ->
     Cs = val({Tab, cstruct}),
diff --git a/lib/mnesia/src/mnesia_tm.erl b/lib/mnesia/src/mnesia_tm.erl
index 4b3fffc735..8a4113422a 100644
--- a/lib/mnesia/src/mnesia_tm.erl
+++ b/lib/mnesia/src/mnesia_tm.erl
@@ -26,7 +26,7 @@
 	 init/1,
 	 non_transaction/5,
 	 transaction/6,
-	 commit_participant/5,
+	 commit_participant/6,
 	 dirty/2,
 	 display_info/2,
 	 do_update_op/3,
@@ -62,13 +62,14 @@
 %% Format on coordinators is [{Tid, EtsTabList} .....
 
 -record(prep, {protocol = sym_trans,
-	       %% async_dirty | sync_dirty | sym_trans | sync_sym_trans | asym_trans
+	       %% async_dirty | sync_dirty | sym_trans | sync_sym_trans | asym_trans | sync_asym_trans
 	       records = [],
 	       prev_tab = [], % initiate to a non valid table name
 	       prev_types,
 	       prev_snmp,
 	       types,
-	       majority = []
+	       majority = [],
+               sync = false
 	      }).
 
 -record(participant, {tid, pid, commit, disc_nodes = [],
@@ -250,11 +251,13 @@ doit_loop(#state{coordinators=Coordinators,participants=Participants,supervisor=
 	    mnesia_checkpoint:tm_enter_pending(Tid, DiscNs, RamNs),
 	    Commit = new_cr_format(Commit0),
 	    Pid =
-		case Protocol of
-		    asym_trans when node(Tid#tid.pid) /= node() ->
-			Args = [tmpid(From), Tid, Commit, DiscNs, RamNs],
+                if
+                    node(Tid#tid.pid) =:= node() ->
+                        error({internal_error, local_node});
+                    Protocol =:= asym_trans orelse Protocol =:= sync_asym_trans ->
+			Args = [Protocol, tmpid(From), Tid, Commit, DiscNs, RamNs],
 			spawn_link(?MODULE, commit_participant, Args);
-		    _ when node(Tid#tid.pid) /= node() -> %% *_sym_trans
+                    true -> %% *_sym_trans
 			reply(From, {vote_yes, Tid}),
 			nopid
 		end,
@@ -743,8 +746,9 @@ non_transaction(OldState, Fun, Args, ActivityKind, Mod) ->
 	{aborted, Reason} -> mnesia:abort(Reason);
 	Res -> Res
     catch
-	throw:Throw -> throw(Throw);
-	_:Reason    -> exit(Reason)
+        throw:Throw     -> throw(Throw);
+        error:Reason:ST -> exit({Reason, ST});
+        exit:Reason     -> exit(Reason)
     after
 	case OldState of
 	    undefined -> erase(mnesia_activity_state);
@@ -1189,7 +1193,15 @@ do_arrange(Tid, Store, RestoreKey, Prep, N) when RestoreKey == restore_op ->
     P2 = Prep#prep{protocol = asym_trans, records = Recs2},
     do_arrange(Tid, Store, ?ets_next(Store, RestoreKey), P2, N + 1);
 do_arrange(_Tid, _Store, '$end_of_table', Prep, N) ->
-    {N, Prep};
+    case Prep of
+        #prep{sync=true, protocol=asym_trans} ->
+            {N, Prep#prep{protocol=sync_asym_trans}};
+        _ ->
+            {N, Prep}
+    end;
+do_arrange(Tid, Store, sticky, Prep, N) ->
+    P2 = Prep#prep{sync=true},
+    do_arrange(Tid, Store, ?ets_next(Store, sticky), P2, N);
 do_arrange(Tid, Store, IgnoredKey, Prep, N) -> %% locks, nodes ... local atoms...
     do_arrange(Tid, Store, ?ets_next(Store, IgnoredKey), Prep, N).
 
@@ -1447,7 +1459,8 @@ multi_commit(sync_sym_trans, _Maj = [], Tid, CR, Store) ->
 		    [{tid, Tid}, {outcome, Outcome}]),
     Outcome;
 
-multi_commit(asym_trans, Majority, Tid, CR, Store) ->
+multi_commit(Protocol, Majority, Tid, CR, Store)
+  when Protocol =:= asym_trans; Protocol =:= sync_asym_trans ->
     %% This more expensive commit protocol is used when
     %% table definitions are changed (schema transactions).
     %% It is also used when the involved tables are
@@ -1514,7 +1527,7 @@ multi_commit(asym_trans, Majority, Tid, CR, Store) ->
     end,
     Pending = mnesia_checkpoint:tm_enter_pending(Tid, DiscNs, RamNs),
     ?ets_insert(Store, Pending),
-    {WaitFor, Local} = ask_commit(asym_trans, Tid, CR2, DiscNs, RamNs),
+    {WaitFor, Local} = ask_commit(Protocol, Tid, CR2, DiscNs, RamNs),
     SchemaPrep = ?CATCH(mnesia_schema:prepare_commit(Tid, Local, {coord, WaitFor})),
     {Votes, Pids} = rec_all(WaitFor, Tid, do_commit, []),
 
@@ -1562,38 +1575,38 @@ multi_commit(asym_trans, Majority, Tid, CR, Store) ->
 
 %% Returns do_commit or {do_abort, Reason}
 rec_acc_pre_commit([Pid | Tail], Tid, Store, Commit, Res, DumperMode,
-		   GoodPids, SchemaAckPids) ->
+		   GoodPids, AckPids) ->
     receive
 	{?MODULE, _, {acc_pre_commit, Tid, Pid, true}} ->
 	    rec_acc_pre_commit(Tail, Tid, Store, Commit, Res, DumperMode,
-			       [Pid | GoodPids], [Pid | SchemaAckPids]);
+			       [Pid | GoodPids], [Pid | AckPids]);
 
 	{?MODULE, _, {acc_pre_commit, Tid, Pid, false}} ->
 	    rec_acc_pre_commit(Tail, Tid, Store, Commit, Res, DumperMode,
-			       [Pid | GoodPids], SchemaAckPids);
+			       [Pid | GoodPids], AckPids);
 
 	{?MODULE, _, {acc_pre_commit, Tid, Pid}} ->
 	    %% Kept for backwards compatibility. Remove after Mnesia 4.x
 	    rec_acc_pre_commit(Tail, Tid, Store, Commit, Res, DumperMode,
-			       [Pid | GoodPids], [Pid | SchemaAckPids]);
+			       [Pid | GoodPids], [Pid | AckPids]);
 	{?MODULE, _, {do_abort, Tid, Pid, _Reason}} ->
 	    AbortRes = {do_abort, {bad_commit, node(Pid)}},
 	    rec_acc_pre_commit(Tail, Tid, Store, Commit, AbortRes, DumperMode,
-			       GoodPids, SchemaAckPids);
+			       GoodPids, AckPids);
 	{mnesia_down, Node} when Node == node(Pid) ->
 	    AbortRes = {do_abort, {bad_commit, Node}},
 	    ?SAFE(Pid ! {Tid, AbortRes}),  %% Tell him that he has died
 	    rec_acc_pre_commit(Tail, Tid, Store, Commit, AbortRes, DumperMode,
-			       GoodPids, SchemaAckPids)
+			       GoodPids, AckPids)
     end;
-rec_acc_pre_commit([], Tid, Store, {Commit,OrigC}, Res, DumperMode, GoodPids, SchemaAckPids) ->
+rec_acc_pre_commit([], Tid, Store, {Commit,OrigC}, Res, DumperMode, GoodPids, AckPids) ->
     D = Commit#commit.decision,
     case Res of
 	do_commit ->
 	    %% Now everybody knows that the others
 	    %% has voted yes. We also know that
 	    %% everybody are uncertain.
-	    prepare_sync_schema_commit(Store, SchemaAckPids),
+	    prepare_sync_schema_commit(Store, AckPids),
 	    tell_participants(GoodPids, {Tid, committed}),
 	    D2 = D#decision{outcome = committed},
 	    mnesia_recover:log_decision(D2),
@@ -1605,7 +1618,7 @@ rec_acc_pre_commit([], Tid, Store, {Commit,OrigC}, Res, DumperMode, GoodPids, Sc
 	    do_commit(Tid, Commit, DumperMode),
             ?eval_debug_fun({?MODULE, rec_acc_pre_commit_done_commit},
 			    [{tid, Tid}]),
-	    sync_schema_commit(Tid, Store, SchemaAckPids),
+	    sync_schema_commit(Tid, Store, AckPids),
 	    mnesia_locker:release_tid(Tid),
 	    ?MODULE ! {delete_transaction, Tid};
 
@@ -1622,6 +1635,7 @@ rec_acc_pre_commit([], Tid, Store, {Commit,OrigC}, Res, DumperMode, GoodPids, Sc
     Res.
 
 %% Note all nodes in case of mnesia_down mgt
+%% sync_schema_commit is (ab)used for sync_asym_trans as well.
 prepare_sync_schema_commit(_Store, []) ->
     ok;
 prepare_sync_schema_commit(Store, [Pid | Pids]) ->
@@ -1647,21 +1661,21 @@ tell_participants([Pid | Pids], Msg) ->
 tell_participants([], _Msg) ->
     ok.
 
--spec commit_participant(_, _, _, _, _) -> no_return().
+-spec commit_participant(_, _, _, _, _, _) -> no_return().
 %% Trap exit because we can get a shutdown from application manager
-commit_participant(Coord, Tid, Bin, DiscNs, RamNs) when is_binary(Bin) ->
+commit_participant(Protocol, Coord, Tid, Bin, DiscNs, RamNs) when is_binary(Bin) ->
     process_flag(trap_exit, true),
     Commit = binary_to_term(Bin),
-    commit_participant(Coord, Tid, Bin, Commit, DiscNs, RamNs);
-commit_participant(Coord, Tid, C = #commit{}, DiscNs, RamNs) ->
+    commit_participant(Protocol, Coord, Tid, Bin, Commit, DiscNs, RamNs);
+commit_participant(Protocol, Coord, Tid, C = #commit{}, DiscNs, RamNs) ->
     process_flag(trap_exit, true),
-    commit_participant(Coord, Tid, C, C, DiscNs, RamNs).
+    commit_participant(Protocol, Coord, Tid, C, C, DiscNs, RamNs).
 
-commit_participant(Coord, Tid, Bin, C0, DiscNs, _RamNs) ->
+commit_participant(Protocol, Coord, Tid, Bin, C0, DiscNs, _RamNs) ->
     ?eval_debug_fun({?MODULE, commit_participant, pre}, [{tid, Tid}]),
     try mnesia_schema:prepare_commit(Tid, C0, {part, Coord}) of
 	{Modified, C = #commit{}, DumperMode} ->
-	    %% If we can not find any local unclear decision
+	    %% If we cannot find any local unclear decision
 	    %% we should presume abort at startup recovery
 	    case lists:member(node(), DiscNs) of
 		false ->
@@ -1682,8 +1696,9 @@ commit_participant(Coord, Tid, Bin, C0, DiscNs, _RamNs) ->
 		    mnesia_recover:log_decision(D#decision{outcome = unclear}),
 		    ?eval_debug_fun({?MODULE, commit_participant, pre_commit},
 				    [{tid, Tid}]),
-		    Expect_schema_ack = C#commit.schema_ops /= [],
-		    reply(Coord, {acc_pre_commit, Tid, self(), Expect_schema_ack}),
+		    ExpectAck = C#commit.schema_ops /= []
+                        orelse Protocol =:= sync_asym_trans,
+		    reply(Coord, {acc_pre_commit, Tid, self(), ExpectAck}),
 
 		    %% Now we are vulnerable for failures, since
 		    %% we cannot decide without asking others
@@ -1693,7 +1708,7 @@ commit_participant(Coord, Tid, Bin, C0, DiscNs, _RamNs) ->
 			    ?eval_debug_fun({?MODULE, commit_participant, log_commit},
 					    [{tid, Tid}]),
 			    do_commit(Tid, C, DumperMode),
-			    case Expect_schema_ack of
+			    case ExpectAck of
 				false -> ignore;
 				true -> reply(Coord, {schema_commit, Tid, self()})
 			    end,
@@ -1977,7 +1992,7 @@ sync_send_dirty(Tid, [Head | Tail], Tab, WaitFor) ->
 	    Res =  do_dirty(Tid, Head),
 	    {WF, Res};
 	true ->
-	    {?MODULE, Node} ! {self(), {sync_dirty, Tid, ext_format(Head), Tab}},
+	    {?MODULE, Node} ! {self(), {sync_dirty, Tid, Head, Tab}},
 	    sync_send_dirty(Tid, Tail, Tab, [Node | WaitFor])
     end;
 sync_send_dirty(_Tid, [], _Tab, WaitFor) ->
@@ -1996,11 +2011,11 @@ async_send_dirty(Tid, [Head | Tail], Tab, ReadNode, WaitFor, Res) ->
 	    NewRes =  do_dirty(Tid, Head),
 	    async_send_dirty(Tid, Tail, Tab, ReadNode, WaitFor, NewRes);
 	ReadNode == Node ->
-	    {?MODULE, Node} ! {self(), {sync_dirty, Tid, ext_format(Head), Tab}},
+	    {?MODULE, Node} ! {self(), {sync_dirty, Tid, Head, Tab}},
 	    NewRes = {'EXIT', {aborted, {node_not_running, Node}}},
 	    async_send_dirty(Tid, Tail, Tab, ReadNode, [Node | WaitFor], NewRes);
 	true ->
-	    {?MODULE, Node} ! {self(), {async_dirty, Tid, ext_format(Head), Tab}},
+	    {?MODULE, Node} ! {self(), {async_dirty, Tid, Head, Tab}},
 	    async_send_dirty(Tid, Tail, Tab, ReadNode, WaitFor, Res)
     end;
 async_send_dirty(_Tid, [], _Tab, _ReadNode, WaitFor, Res) ->
@@ -2057,24 +2072,20 @@ ask_commit(Protocol, Tid, [Head | Tail], DiscNs, RamNs, WaitFor, Local) ->
 	Node == node() ->
 	    ask_commit(Protocol, Tid, Tail, DiscNs, RamNs, WaitFor, Head);
 	true ->
-	    CR = ext_format(Head),
-	    Msg = {ask_commit, Protocol, Tid, CR, DiscNs, RamNs},
+	    Msg = {ask_commit, convert_old(Protocol, Node), Tid, Head, DiscNs, RamNs},
 	    {?MODULE, Node} ! {self(), Msg},
 	    ask_commit(Protocol, Tid, Tail, DiscNs, RamNs, [Node | WaitFor], Local)
     end;
 ask_commit(_Protocol, _Tid, [], _DiscNs, _RamNs, WaitFor, Local) ->
     {WaitFor, Local}.
 
-ext_format(#commit{ext=[]}=CR) -> CR;
-ext_format(#commit{node=Node, ext=Ext}=CR) ->
+convert_old(sync_asym_trans, Node) ->
     case mnesia_monitor:needs_protocol_conversion(Node) of
-	true  ->
-	    case lists:keyfind(snmp, 1, Ext) of
-		false -> CR#commit{ext=[]};
-		{snmp, List} -> CR#commit{ext=List}
-	    end;
-	false -> CR
-    end.
+        true -> asym_trans;
+        false -> sync_asym_trans
+    end;
+convert_old(Protocol, _) ->
+    Protocol.
 
 new_cr_format(#commit{ext=[]}=Cr) -> Cr;
 new_cr_format(#commit{ext=[{_,_}|_]}=Cr) -> Cr;
@@ -2303,7 +2314,7 @@ reconfigure_participants(_, []) ->
 %% tell mnesia_tm on all involved nodes (including the local node)
 %% about the outcome.
 tell_outcome(Tid, Protocol, Node, CheckNodes, TellNodes) ->
-    Outcome = mnesia_recover:what_happened(Tid, Protocol, CheckNodes),
+    Outcome = mnesia_recover:what_happened(Tid, proto(Protocol), CheckNodes),
     case Outcome of
 	aborted ->
 	    rpc:abcast(TellNodes, ?MODULE, {Tid,{do_abort, {mnesia_down, Node}}});
@@ -2312,6 +2323,9 @@ tell_outcome(Tid, Protocol, Node, CheckNodes, TellNodes) ->
     end,
     Outcome.
 
+proto(sync_asym_trans) -> asym_trans;
+proto(Proto) -> Proto.
+
 do_stop(#state{coordinators = Coordinators}) ->
     Msg = {mnesia_down, node()},
     lists:foreach(fun({Tid, _}) -> Tid#tid.pid ! Msg end, gb_trees:to_list(Coordinators)),
diff --git a/lib/mnesia/test/Makefile b/lib/mnesia/test/Makefile
index 5b61b1af65..b43bc82801 100644
--- a/lib/mnesia/test/Makefile
+++ b/lib/mnesia/test/Makefile
@@ -53,7 +53,8 @@ MODULES= \
 	mnesia_measure_test \
 	mnesia_cost \
 	mnesia_dbn_meters \
-	ext_test
+	ext_test \
+	mnesia_index_plugin_test
 
 DocExamplesDir := ../doc/src/
 
diff --git a/lib/mnesia/test/README b/lib/mnesia/test/README
index e0ced7399d..30a0d2fd64 100644
--- a/lib/mnesia/test/README
+++ b/lib/mnesia/test/README
@@ -51,7 +51,7 @@ stated as test suite configuration parameters, but by default
 the extra node names are generated. In this example the names
 will be: a, a1 and a2. It is enough to start the first node
 manually, the extra nodes will automatically be started if
-neccessary.
+necessary.
 
 The attached UNIX shell script mt, does not work on all
 platforms, but it may be used as a source for inspiration. It
@@ -63,7 +63,7 @@ test cases (i.e. test cases that encountered an error).
 During development we want to be able to run the test cases
 in the debugger. This demands a little bit of preparations:
 
-  - Start the neccessary number of nodes (normally 3).
+  - Start the necessary number of nodes (normally 3).
     This may either be done by running the mt script or
     by starting the main node and then invoke mt:start_nodes()
     to start the extra nodes with slave.
@@ -73,7 +73,7 @@ in the debugger. This demands a little bit of preparations:
 
   - Load all files that needs to be interpreted. This is typically
     all Mnesia files plus the test case. By invoking mnesia:ni()
-    and mnesia:ni([TestModule]) the neccessary modules will be
+    and mnesia:ni([TestModule]) the necessary modules will be
     loaded on all CONNECTED nodes.
 
 The test case execution is supervised in order to ensure that no test
diff --git a/lib/mnesia/test/mnesia_SUITE.erl b/lib/mnesia/test/mnesia_SUITE.erl
index 24c1def6da..b41bf22efa 100644
--- a/lib/mnesia/test/mnesia_SUITE.erl
+++ b/lib/mnesia/test/mnesia_SUITE.erl
@@ -69,12 +69,13 @@ groups() ->
     %% covered.
     [{light, [],
       [{group, install}, {group, nice}, {group, evil},
-       {group, mnesia_frag_test, light}, {group, qlc},
+       {group, mnesia_frag_test, light}, {group, qlc}, {group, index_plugins},
        {group, registry}, {group, config}, {group, examples}]},
      {install, [], [{mnesia_install_test, all}]},
      {nice, [], [{mnesia_nice_coverage_test, all}]},
      {evil, [], [{mnesia_evil_coverage_test, all}]},
      {qlc, [], [{mnesia_qlc_test, all}]},
+     {index_plugins, [], [{mnesia_index_plugin_test, all}]},
      {registry, [], [{mnesia_registry_test, all}]},
      {config, [], [{mnesia_config_test, all}]},
      {examples, [], [{mnesia_examples_test, all}]},
diff --git a/lib/mnesia/test/mnesia_dirty_access_test.erl b/lib/mnesia/test/mnesia_dirty_access_test.erl
index 67ef1fe901..984f43582c 100644
--- a/lib/mnesia/test/mnesia_dirty_access_test.erl
+++ b/lib/mnesia/test/mnesia_dirty_access_test.erl
@@ -48,7 +48,7 @@
          del_table_copy_1/1, del_table_copy_2/1, del_table_copy_3/1,
          add_table_copy_1/1, add_table_copy_2/1, add_table_copy_3/1,
          add_table_copy_4/1, move_table_copy_1/1, move_table_copy_2/1,
-         move_table_copy_3/1, move_table_copy_4/1]).
+         move_table_copy_3/1, move_table_copy_4/1, dirty_error_stacktrace/1]).
 
 -export([update_trans/3]).
 
@@ -64,7 +64,7 @@ all() ->
      {group, dirty_update_counter}, {group, dirty_delete},
      {group, dirty_delete_object},
      {group, dirty_match_object}, {group, dirty_index},
-     {group, dirty_iter}, {group, admin_tests}].
+     {group, dirty_iter}, {group, admin_tests}, dirty_error_stacktrace].
 
 groups() -> 
     [{dirty_write, [],
@@ -114,6 +114,36 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Errors in dirty activity should have stacktrace
+dirty_error_stacktrace(Config) ->
+    %% Custom errors should have stacktrace
+    try
+        mnesia:async_dirty(fun() -> error(custom_error) end)
+    catch
+        exit:{custom_error, _} -> ok
+    end,
+
+    %% Undef error should have unknown module and function in the stacktrace
+    try
+        mnesia:async_dirty(fun() -> unknown_module:unknown_fun(arg) end)
+    catch
+        exit:{undef, [{unknown_module, unknown_fun, [arg], []} | _]} -> ok
+    end,
+
+    %% Exists don't have stacktrace
+    try
+        mnesia:async_dirty(fun() -> exit(custom_error) end)
+    catch
+        exit:custom_error -> ok
+    end,
+
+    %% Aborts don't have a stacktrace (unfortunately)
+    try
+        mnesia:async_dirty(fun() -> mnesia:abort(custom_abort) end)
+    catch
+        exit:{aborted, custom_abort} -> ok
+    end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Write records dirty
diff --git a/lib/mnesia/test/mnesia_index_plugin_test.erl b/lib/mnesia/test/mnesia_index_plugin_test.erl
new file mode 100644
index 0000000000..44fe047c50
--- /dev/null
+++ b/lib/mnesia/test/mnesia_index_plugin_test.erl
@@ -0,0 +1,261 @@
+%%
+%% %CopyrightBegin%
+%%
+%% 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.
+%% 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(mnesia_index_plugin_test).
+-author('[email protected]').
+
+-export([init_per_testcase/2, end_per_testcase/2,
+         init_per_group/2, end_per_group/2,
+         init_per_suite/1, end_per_suite/1,
+         all/0, groups/0]).
+
+-export([
+         add_rm_plugin/1,
+         tab_with_plugin_index/1,
+         tab_with_multiple_plugin_indexes/1,
+         ix_match_w_plugin/1,
+         ix_match_w_plugin_ordered/1,
+         ix_match_w_plugin_bag/1
+        ]).
+
+-export([ix_prefixes/3,    % test plugin
+         ix_prefixes2/3]). % test plugin 2
+
+-include("mnesia_test_lib.hrl").
+
+init_per_suite(Conf) ->
+    Conf.
+
+end_per_suite(Conf) ->
+    Conf.
+
+init_per_testcase(Func, Conf) ->
+    mnesia_test_lib:init_per_testcase(Func, Conf).
+
+end_per_testcase(Func, Conf) ->
+    mnesia_test_lib:end_per_testcase(Func, Conf).
+
+all() ->
+    [add_rm_plugin,
+     tab_with_plugin_index,
+     tab_with_multiple_plugin_indexes,
+     ix_match_w_plugin,
+     ix_match_w_plugin_ordered,
+     ix_match_w_plugin_bag].
+
+groups() ->
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+add_rm_plugin(suite) -> [];
+add_rm_plugin(Config) when is_list(Config) ->
+    [N1, N2] = Nodes = ?acquire_nodes(2, Config),
+    ok = add_plugin(),
+    ok = rpc_check_plugin(N1),
+    ok = rpc_check_plugin(N2),
+    ok = add_plugin2(),
+    ok = del_plugin(),
+    ok = del_plugin2(),
+    ok = add_plugin(),
+    ok = add_plugin2(),
+    ok = del_plugin(),
+    ok = del_plugin2(),
+    ?verify_mnesia(Nodes, []).
+
+-define(PLUGIN1, {{pfx},?MODULE,ix_prefixes}).
+-define(PLUGIN2, {{pfx2},?MODULE,ix_prefixes2}).
+
+add_plugin() ->
+    {atomic, ok} = mnesia_schema:add_index_plugin({pfx}, ?MODULE, ix_prefixes),
+    [?PLUGIN1] = mnesia_schema:index_plugins(),
+    ok.
+
+add_plugin2() ->
+    {atomic, ok} = mnesia_schema:add_index_plugin({pfx2}, ?MODULE, ix_prefixes2),
+    [?PLUGIN1, ?PLUGIN2] = lists:sort(mnesia_schema:index_plugins()),
+    ok.
+
+del_plugin() ->
+    {atomic, ok} = mnesia_schema:delete_index_plugin({pfx}),
+    [?PLUGIN2] = mnesia_schema:index_plugins(),
+    ok.
+
+del_plugin2() ->
+    {atomic, ok} = mnesia_schema:delete_index_plugin({pfx2}),
+    [] = mnesia_schema:index_plugins(),
+    ok.
+
+rpc_check_plugin(N) ->
+    [?PLUGIN1] =
+        rpc:call(N, mnesia_schema, index_plugins, []),
+    ok.
+
+tab_with_plugin_index(suite) -> [];
+tab_with_plugin_index(Config) when is_list(Config) ->
+    [_N1] = Nodes = ?acquire_nodes(1, Config),
+    ok = add_plugin(),
+    {atomic, ok} = mnesia:create_table(t, [{attributes, [k,v1,v2]},
+                                           {index, [{{pfx}, ordered},
+                                                    {v1, ordered},
+                                                    v2]}]),
+    [ok,ok,ok,ok] =
+        [mnesia:dirty_write({t, K, V1, V2})
+         || {K,V1,V2} <- [{1,a,"123"},
+                          {2,b,"12345"},
+                          {3,c,"6789"},
+                          {4,d,nil}]],
+    [{t,1,a,"123"},{t,2,b,"12345"}] =
+        mnesia:dirty_index_read(t,<<"123">>,{pfx}),
+    [{t,3,c,"6789"}] =
+        mnesia:dirty_index_read(t,"6789",v2),
+    [{t,1,a,"123"}] =
+        mnesia:dirty_match_object({t,'_',a,"123"}),
+    [{t,1,a,"123"}] =
+        mnesia:dirty_select(t, [{ {t,'_',a,"123"}, [], ['$_']}]),
+    mnesia:dirty_delete(t,2),
+    [{t,1,a,"123"}] =
+        mnesia:dirty_index_read(t,<<"123">>,{pfx}),
+    ?verify_mnesia(Nodes, []).
+
+tab_with_multiple_plugin_indexes(suite) -> [];
+tab_with_multiple_plugin_indexes(Config) when is_list(Config) ->
+    [_N1] = Nodes = ?acquire_nodes(1, Config),
+    ok = add_plugin(),
+    ok = add_plugin2(),
+    {atomic, ok} =
+        mnesia:create_table(u, [{attributes, [k,v1,v2]},
+                                {index, [{{pfx}, ordered},
+                                         {{pfx2}, ordered}]}]),
+        [ok,ok,ok,ok] =
+        [mnesia:dirty_write({u, K, V1, V2})
+         || {K,V1,V2} <- [{1,a,"123"},
+                          {2,b,"12345"},
+                          {3,c,"6789"},
+                          {4,d,nil}]],
+    [{u,1,a,"123"},{u,2,b,"12345"}] =
+        mnesia:dirty_index_read(u,<<"123">>,{pfx}),
+    [{u,1,a,"123"},{u,2,b,"12345"}] =
+        mnesia:dirty_index_read(u,<<"321">>,{pfx2}),
+    ?verify_mnesia(Nodes, []).
+
+ix_match_w_plugin(suite) -> [];
+ix_match_w_plugin(Config) when is_list(Config) ->
+    [_N1] = Nodes = ?acquire_nodes(1, Config),
+    ok = add_plugin(),
+    {atomic, ok} = mnesia:create_table(im1, [{attributes, [k, v1, v2]},
+                                             {index, [{{pfx}, ordered},
+                                                      {v1, ordered}]}]),
+    fill_and_test_index_match(im1, set),
+    ?verify_mnesia(Nodes, []).
+
+
+ix_match_w_plugin_ordered(suite) -> [];
+ix_match_w_plugin_ordered(Config) when is_list(Config) ->
+    [_N1] = Nodes = ?acquire_nodes(1, Config),
+    ok = add_plugin(),
+    {atomic, ok} = mnesia:create_table(im2, [{attributes, [k, v1, v2]},
+                                             {type, ordered_set},
+                                             {index, [{{pfx}, ordered},
+                                                      {v1, ordered}]}]),
+    fill_and_test_index_match(im2, ordered_set),
+    ?verify_mnesia(Nodes, []).
+
+ix_match_w_plugin_bag(suite) -> [];
+ix_match_w_plugin_bag(Config) when is_list(Config) ->
+    [_N1] = Nodes = ?acquire_nodes(1, Config),
+    ok = add_plugin(),
+    {atomic, ok} = mnesia:create_table(im3, [{attributes, [k, v1, v2]},
+                                             {type, bag},
+                                             {index, [{{pfx}, ordered},
+                                                      {v1, ordered}]}]),
+    fill_and_test_index_match(im3, bag),
+    ?verify_mnesia(Nodes, []).
+
+fill_and_test_index_match(Tab, Type) ->
+    [ok,ok,ok,ok,ok,ok,ok,ok,ok] =
+        [mnesia:dirty_write({Tab, K, V1, V2})
+         || {K,V1,V2} <- [{1,a,"123"},
+                          {2,b,"12345"},
+                          {3,c,"123"},
+                          {4,d,nil},
+                          {5,e,nil},
+                          {6,f,nil},
+                          {7,g,nil},  %% overwritten if not bag
+                          {7,g,"234"},
+                          {8,h,"123"}]],
+    mnesia:activity(
+      transaction,
+      fun() ->
+              ok = mnesia:write({Tab, 1, aa, "1234"}), %% replaces if not bag
+              ok = mnesia:delete({Tab, 2}),
+              ok = mnesia:delete({Tab, 4}),
+              ok = mnesia:write({Tab, 6, ff, nil}),
+              ok = mnesia:write({Tab, 7, gg, "123"}),
+              ok = mnesia:write({Tab, 100, x, nil}),
+              ok = mnesia:delete_object({Tab,3,c,"123"}),
+              ok = mnesia:delete_object({Tab,5,e,nil}),
+              Res = mnesia:index_read(Tab, <<"123">>, {pfx}),
+              SetRes = [{Tab,1,aa,"1234"}, {Tab,7,gg,"123"}, {Tab,8,h,"123"}],
+              case Type of
+                  set ->
+                      SetRes = lists:sort(Res);
+                  ordered_set ->
+                      SetRes = Res;
+                  bag ->
+                      [{Tab,1,a,"123"}, {Tab,1,aa,"1234"},
+                       {Tab,7,gg,"123"}, {Tab,8,h,"123"}] = lists:sort(Res)
+              end
+      end).
+
+%% ============================================================
+%%
+ix_prefixes(_Tab, _Pos, Obj) ->
+    lists:foldl(
+      fun(V, Acc) when is_list(V) ->
+              try Pfxs = prefixes(list_to_binary(V)),
+                   Pfxs ++ Acc
+              catch
+                  error:_ ->
+                      Acc
+              end;
+         (V, Acc) when is_binary(V) ->
+              Pfxs = prefixes(V),
+              Pfxs ++ Acc;
+         (_, Acc) ->
+              Acc
+      end, [], tl(tuple_to_list(Obj))).
+
+ix_prefixes2(Tab, Pos, Obj) ->
+    [rev(P) || P <- ix_prefixes(Tab, Pos, Obj)].
+
+rev(B) when is_binary(B) ->
+    list_to_binary(lists:reverse(binary_to_list(B))).
+
+prefixes(<<P:3/binary, _/binary>>) ->
+    [P];
+prefixes(_) ->
+    [].
diff --git a/lib/mnesia/test/mnesia_isolation_test.erl b/lib/mnesia/test/mnesia_isolation_test.erl
index 49bcec14af..c99158945d 100644
--- a/lib/mnesia/test/mnesia_isolation_test.erl
+++ b/lib/mnesia/test/mnesia_isolation_test.erl
@@ -29,7 +29,7 @@
 -export([no_conflict/1, simple_queue_conflict/1,
          advanced_queue_conflict/1, simple_deadlock_conflict/1,
          advanced_deadlock_conflict/1, schema_deadlock/1, lock_burst/1,
-         nasty/1, basic_sticky_functionality/1,
+         nasty/1, basic_sticky_functionality/1, sticky_sync/1,
          unbound1/1, unbound2/1,
          create_table/1, delete_table/1, move_table_copy/1,
          add_table_index/1, del_table_index/1, transform_table/1,
@@ -71,7 +71,8 @@ groups() ->
        advanced_deadlock_conflict, schema_deadlock, lock_burst,
        {group, sticky_locks}, {group, unbound_locking},
        {group, admin_conflict}, nasty]},
-     {sticky_locks, [], [basic_sticky_functionality]},
+     {sticky_locks, [],
+      [basic_sticky_functionality,sticky_sync]},
      {unbound_locking, [], [unbound1, unbound2]},
      {admin_conflict, [],
       [create_table, delete_table, move_table_copy,
@@ -594,9 +595,49 @@ get_held() ->
     mnesia_locker ! {get_table, self(), mnesia_sticky_locks},
     receive {mnesia_sticky_locks, Locks} -> Locks end.
 
+sticky_sync(suite) -> [];
+sticky_sync(Config) when is_list(Config) ->
+    %% BUG ERIERL-768
+    Nodes = [N1, N2] = ?acquire_nodes(2, Config),
+
+    mnesia:create_table(dc, [{type, ordered_set}, {disc_copies, Nodes}]),
+    mnesia:create_table(ec, [{type, ordered_set}, {ram_copies, [N2]}]),
+
+    TestFun =
+        fun(I) ->
+                %% In first transaction we initialise {dc, I} record with value 0
+                First = fun() ->
+                                %% Do a lot of writes into ram copies table
+                                %% which on the Slave in do_commit will be
+                                %% processed first
+                                lists:foreach(fun(J) -> ok = mnesia:write(ec, {ec, J, 0}, write) end,
+                                              lists:seq(1, 750)),
+                                %% Then set initial value of {dc, I} record to 0 with sticky_write
+                                mnesia:write(dc, {dc, I, 0}, sticky_write)
+                        end,
+                ok = mnesia:activity(transaction, First),
+                %% In second transaction we set value of {dc, I} record to 1
+                Upd = fun() ->
+                              %% Modify a single ram copies record with ensured lock grant
+                              %% (key not used in previous transactions)
+                              %% we use this second table only to force asym_trans protocol
+                              mnesia:write(ec, {ec, 1001 + I, 0}, write),
+                              %% And set final version of {dc, I} record to 1 with sticky_write
+                              mnesia:write(dc, {dc, I, 1}, sticky_write)
+                    end,
+                ok = mnesia:activity(transaction, Upd)
+        end,
+
+    %% Fill 1000 dc records. At the end all dc records should have value 1.
+    lists:foreach(TestFun, lists:seq(1,1000)),
+    io:format("Written, check content~n",[]),
+    All = fun() -> mnesia:select(dc, [ {{dc, '_', 0}, [] ,['$_']} ]) end,
+    ?match({atomic, []}, rpc:call(N1, mnesia, sync_transaction, [All])),
+    ?match({atomic, []}, rpc:call(N2, mnesia, sync_transaction, [All])),
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+    ?verify_mnesia(Nodes, []).
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 unbound1(suite) -> [];
 unbound1(Config) when is_list(Config) ->
@@ -1036,29 +1077,57 @@ add_table_copy(Config) when is_list(Config) ->
     Def = [{ram_copies, [ThisNode]}, {attributes, [key, attr1, attr2]}],
     ?match({atomic, ok}, mnesia:create_table(Tab, Def)),
     insert(Tab, 50),
-    {success, [A]} = ?start_activities([ThisNode]), 
+    {success, [A]} = ?start_activities([ThisNode]),
     mnesia_test_lib:start_sync_transactions([A], 0),
 
     A ! fun() -> mnesia:write({Tab, 1, 1, updated}) end,
     ?match_receive({A, ok}),   %% A is executed
 
-    Pid = spawn_link(?MODULE, op, [self(), mnesia, add_table_copy, 
+    Pid = spawn_link(?MODULE, op, [self(), mnesia, add_table_copy,
 				   [Tab, Node2, ram_copies]]),
-   
+
     ?match_receive(timeout),   %% op waits for locks occupied by A
 
     A ! end_trans,             %% Kill A, locks should be released
-    ?match_receive({A,{atomic,end_trans}}),     
-    
-    receive 
+    ?match_receive({A,{atomic,end_trans}}),
+
+    receive
 	Msg -> ?match({Pid, {atomic, ok}}, Msg)
     after
 	timer:seconds(20) -> ?error("Operation timed out", [])
     end,
+    ?match_receive({'EXIT', Pid, normal}),
 
     sys:get_status(whereis(mnesia_locker)), % Explicit sync, release locks is async
-    ?match([], mnesia:system_info(held_locks)), 
-    ?match([], mnesia:system_info(lock_queue)), 
+    ?match([], mnesia:system_info(held_locks)),
+    ?match([], mnesia:system_info(lock_queue)),
+
+    {atomic, ok} = mnesia:del_table_copy(Tab, Node2),
+    Self = self(),
+    New = spawn_link(Node2,
+                     fun () ->
+                             application:stop(mnesia),
+                             Self ! {self(), ok},
+                             io:format(user, "restart mnesia~n", []),
+                             Self ! {self(), catch application:start(mnesia)}
+                     end),
+    receive {New,ok} -> ok end,
+
+    Add = fun Add() ->
+                  case mnesia:add_table_copy(Tab, Node2, disc_copies) of
+                      {atomic, ok} -> ok;
+                      _R -> io:format(user, "aborted with reason ~p~n", [_R]),
+                            timer:sleep(10),
+                            Add()
+                  end
+          end,
+
+    ?match(ok, Add()),
+    ?match_receive({New,ok}),
+
+    sys:get_status(whereis(mnesia_locker)), % Explicit sync, release locks is async
+    ?match([], mnesia:system_info(held_locks)),
+    ?match([], mnesia:system_info(lock_queue)),
     ok.
 
 del_table_copy(suite) -> [];
diff --git a/lib/mnesia/test/mt b/lib/mnesia/test/mt
index a398ee0422..b169734f56 100755
--- a/lib/mnesia/test/mt
+++ b/lib/mnesia/test/mt
@@ -34,8 +34,35 @@ erlcmd="erl -sname a $p $args -mnesia_test_timeout"
 erlcmd1="erl -sname a1 $p $args"
 erlcmd2="erl -sname a2 $p $args"
 
-xterm -geometry 70x20+0+550 -T a1 -e $erlcmd1 &
-xterm -geometry 70x20+450+550 -T a2 -e $erlcmd2 &
+if test z"$MT_TERM" = z ; then
+    MT_TERM=xterm
+fi
+
+case $MT_TERM in
+    xterm)
+	geom0="-geometry 142x40+0+0"
+	geom1="-geometry 70x20+0+550"
+	geom2="-geometry 70x20+480+550"
+	title="-T"
+	exec="-e"
+	;;
+    gnome-terminal)
+	geom0="--geometry 142x40+0+0"
+	geom1="--geometry 70x20+0+740"
+	geom2="--geometry 70x20+700+740"
+	title="--title"
+	exec="--hide-menubar --"
+	;;
+    *rxvt)
+	geom0="-geometry 142x40+0+0"
+	geom1="-geometry 70x20+0+680"
+	geom2="-geometry 70x20+630+680"
+	title="-title"
+	exec="-e"
+esac
+
+$MT_TERM $geom1 $title a1 $exec $erlcmd1 &
+$MT_TERM $geom2 $title a2 $exec $erlcmd2 &
 
 rm "$latest" 2>/dev/null
 ln -s "$log" "$latest"
@@ -51,11 +78,6 @@ echo "Give the following command in order to see the outcome from node a@$h"":"
 echo ""
 echo "	less test_log$$"
 
-ostype=`uname -s`
-if [ "$ostype" = "SunOS" ] ; then 
-  /usr/openwin/bin/xterm -geometry 145x40+0+0 -T a -l -lf "$log" -e $erlcmd &
-else
-  xterm -geometry 145x40+0+0 -T a -e script -f -c "$erlcmd" "$log"  &
-fi
+$MT_TERM $geom0 $title a $exec script -f -c "$erlcmd" "$log"  &
 tail -f "$log" | egrep 'Eval|<>ERROR|NYI'
 
diff --git a/lib/mnesia/test/mt.erl b/lib/mnesia/test/mt.erl
index 5a981bf539..037d6adb38 100644
--- a/lib/mnesia/test/mt.erl
+++ b/lib/mnesia/test/mt.erl
@@ -67,6 +67,7 @@ alias(recovery) -> mnesia_recovery_test;
 alias(registry) -> mnesia_registry_test;
 alias(suite) -> mnesia_SUITE;
 alias(trans) -> mnesia_trans_access_test;
+alias(ixp) -> mnesia_index_plugin_test;
 alias(Other) -> Other.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/mnesia/vsn.mk b/lib/mnesia/vsn.mk
index 1cfb35c774..aa5d9adb6d 100644
--- a/lib/mnesia/vsn.mk
+++ b/lib/mnesia/vsn.mk
@@ -1 +1 @@
-MNESIA_VSN = 4.15.5
+MNESIA_VSN = 4.16
diff --git a/lib/observer/doc/src/crashdump.xml b/lib/observer/doc/src/crashdump.xml
index 48f944cbce..62c6ff1f25 100644
--- a/lib/observer/doc/src/crashdump.xml
+++ b/lib/observer/doc/src/crashdump.xml
@@ -34,7 +34,7 @@
     <rev>PA1</rev>
     <file>crashdump.xml</file>
   </header>
-  <module>crashdump_viewer</module>
+  <module since="">crashdump_viewer</module>
   <modulesummary>A WxWidgets based tool for browsing Erlang
   crashdumps.</modulesummary>
   <description>
@@ -46,8 +46,8 @@
   </description>
   <funcs>
     <func>
-      <name>start() -> ok</name>
-      <name>start(File) -> ok</name>
+      <name since="">start() -> ok</name>
+      <name since="OTP 17.0">start(File) -> ok</name>
       <fsummary>Start the Crashdump Viewer.</fsummary>
       <type>
         <v>File = string()</v>
@@ -62,7 +62,7 @@
       </desc>
     </func>
     <func>
-      <name>stop() -> ok</name>
+      <name since="">stop() -> ok</name>
       <fsummary>Terminate the Crashdump Viewer.</fsummary>
       <desc>
         <p>Terminates the Crashdump Viewer and closes
diff --git a/lib/observer/doc/src/etop.xml b/lib/observer/doc/src/etop.xml
index e7a83d0514..f0acc7b5d8 100644
--- a/lib/observer/doc/src/etop.xml
+++ b/lib/observer/doc/src/etop.xml
@@ -34,7 +34,7 @@
     <rev></rev>
     <file></file>
   </header>
-  <module>etop</module>
+  <module since="">etop</module>
   <modulesummary>Erlang Top is a tool for presenting information about Erlang
   processes similar to the information presented by "top" in UNIX.</modulesummary>
   <description>
@@ -98,7 +98,7 @@
   </description>
   <funcs>
     <func>
-      <name>start() -> ok</name>
+      <name since="OTP R15B01">start() -> ok</name>
       <fsummary>Start etop.</fsummary>
       <desc>
         <p>Starts <c>etop</c>.
@@ -106,7 +106,7 @@
       </desc>
     </func>
     <func>
-      <name>start(Options) -> ok</name>
+      <name since="OTP R15B01">start(Options) -> ok</name>
       <fsummary>Start etop.</fsummary>
       <type>
         <v>Options = [Option]</v>
@@ -120,7 +120,7 @@
       </desc>
     </func>
     <func>
-      <name>help() -> ok</name>
+      <name since="OTP R15B01">help() -> ok</name>
       <fsummary>Display the etop help.</fsummary>
       <desc>
         <p>Displays the help of <c>etop</c> and
@@ -128,7 +128,7 @@
       </desc>
     </func>
     <func>
-      <name>config(Key,Value) -> Result</name>
+      <name since="">config(Key,Value) -> Result</name>
       <fsummary>Change the configuration of the tool.</fsummary>
       <type>
         <v>Result = ok | {error,Reason}</v>
@@ -142,7 +142,7 @@
       </desc>
     </func>
     <func>
-      <name>dump(File) -> Result</name>
+      <name since="">dump(File) -> Result</name>
       <fsummary>Dump the current display to a file.</fsummary>
       <type>
         <v>Result = ok | {error,Reason}</v>
@@ -153,7 +153,7 @@
       </desc>
     </func>
     <func>
-      <name>stop() -> stop</name>
+      <name since="">stop() -> stop</name>
       <fsummary>Terminate etop.</fsummary>
       <desc>
         <p>Terminates <c>etop</c>.</p>
diff --git a/lib/observer/doc/src/notes.xml b/lib/observer/doc/src/notes.xml
index 22035af982..f05e58dc21 100644
--- a/lib/observer/doc/src/notes.xml
+++ b/lib/observer/doc/src/notes.xml
@@ -32,6 +32,62 @@
   <p>This document describes the changes made to the Observer
     application.</p>
 
+<section><title>Observer 2.9.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    All incorrect (that is, all) uses of "can not" has been
+	    corrected to "cannot" in source code comments,
+	    documentation, examples, and so on.</p>
+          <p>
+	    Own Id: OTP-14282 Aux Id: PR-1891 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Observer 2.9</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Since Logger was introduced in OTP-21.0, menu choice
+	    <em>Log &gt; Toggle Log View</em> in observer would cause
+	    a crash unless an <c>error_logger</c> event handler was
+	    explicitly installed. This is now corrected.</p>
+          <p>
+	    Own Id: OTP-15553 Aux Id: ERL-848 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Since persistent_term was introduced, observer would
+	    sometimes crash when expanding a term from a process
+	    state. This is now corrected.</p>
+          <p>
+	    Own Id: OTP-15493 Aux Id: ERL-810 </p>
+        </item>
+        <item>
+          <p>
+	    Add <c>OBSERVER_SCALE</c> environment variable for HiDPI
+	    support.</p>
+          <p>
+	    Own Id: OTP-15586 Aux Id: PR-2105 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Observer 2.8.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/observer/doc/src/observer.xml b/lib/observer/doc/src/observer.xml
index 843be26ee1..7fb1dd044e 100644
--- a/lib/observer/doc/src/observer.xml
+++ b/lib/observer/doc/src/observer.xml
@@ -33,7 +33,7 @@
     <rev>PA1</rev>
     <file>observer.xml</file>
   </header>
-  <module>observer</module>
+  <module since="OTP R15B">observer</module>
   <modulesummary>A GUI tool for observing an Erlang system.</modulesummary>
   <description>
     <p>Observer is a graphical tool for observing the characteristics of
@@ -48,7 +48,7 @@
   </description>
   <funcs>
     <func>
-      <name>start() -> ok</name>
+      <name since="OTP R15B">start() -> ok</name>
       <fsummary>Start the Observer GUI.</fsummary>
       <desc>
         <p>Starts the Observer GUI.
diff --git a/lib/observer/doc/src/ttb.xml b/lib/observer/doc/src/ttb.xml
index 7cd15e15d3..fee95e0b21 100644
--- a/lib/observer/doc/src/ttb.xml
+++ b/lib/observer/doc/src/ttb.xml
@@ -33,7 +33,7 @@
     <rev>PA1</rev>
     <file>ttb.xml</file>
   </header>
-  <module>ttb</module>
+  <module since="">ttb</module>
   <modulesummary>A base for building trace tools for distributed systems.</modulesummary>
   <description>
     <p>The Trace Tool Builder, <c>ttb</c>, is a base for building trace
@@ -44,7 +44,7 @@
   </description>
   <funcs>
     <func>
-      <name>start_trace(Nodes, Patterns, FlagSpec, Opts) -> Result</name>
+      <name since="OTP R15B">start_trace(Nodes, Patterns, FlagSpec, Opts) -> Result</name>
       <fsummary>Start a trace port on each specified node.</fsummary>
       <type>
         <v>Result = see p/2</v>
@@ -76,7 +76,7 @@ ttb:p(all, call).</input></pre>
     </func>
 
     <func>
-      <name>tracer() -> Result</name>
+      <name since="">tracer() -> Result</name>
       <fsummary>Equivalent to tracer(node()).</fsummary>
       <desc>
         <p>Equivalent to <c>tracer(node())</c>.</p>
@@ -84,7 +84,7 @@ ttb:p(all, call).</input></pre>
     </func>
 
     <func>
-      <name>tracer(Shortcut) -> Result</name>
+      <name since="">tracer(Shortcut) -> Result</name>
       <fsummary>Handy shortcuts for common tracing settings.</fsummary>
       <type>
         <v>Shortcut = shell | dbg</v>
@@ -97,7 +97,7 @@ ttb:p(all, call).</input></pre>
     </func>
 
     <func>
-      <name>tracer(Nodes) -> Result</name>
+      <name since="">tracer(Nodes) -> Result</name>
       <fsummary>Equivalent to tracer(Nodes,[]).</fsummary>
       <desc>
         <p>Equivalent to <c>tracer(Nodes,[])</c>.</p>
@@ -105,7 +105,7 @@ ttb:p(all, call).</input></pre>
     </func>
 
     <func>
-      <name>tracer(Nodes,Opts) -> Result</name>
+      <name since="">tracer(Nodes,Opts) -> Result</name>
       <fsummary>Start a trace port on each specified node.</fsummary>
       <type>
         <v>Result = {ok, ActivatedNodes} | {error,Reason}</v>
@@ -243,7 +243,7 @@ ttb:p(all, call).</input></pre>
     </func>
 
     <func>
-      <name>p(Item,Flags) -> Return</name>
+      <name since="">p(Item,Flags) -> Return</name>
       <fsummary>Set the specified trace flags on the specified processes or ports.</fsummary>
       <type>
         <v>Return  = {ok,[{Item,MatchDesc}]}</v>
@@ -277,7 +277,8 @@ ttb:p(all, call).</input></pre>
     </func>
 
     <func>
-      <name>tp, tpl, tpe, ctp, ctpl, ctpg, ctpe</name>
+      <name since="">tp, tpl, ctp, ctpl, ctpg</name>
+      <name since="OTP 19.0">tpe, ctpe</name>
       <fsummary>Set and clear trace patterns.</fsummary>
       <desc>
         <p>These functions are to be used with trace
@@ -338,7 +339,7 @@ ttb:p(all, call).</input></pre>
     </func>
 
     <func>
-      <name>list_history() -> History</name>
+      <name since="">list_history() -> History</name>
       <fsummary>Return all calls stored in history.</fsummary>
       <type>
         <v>History = [{N,Func,Args}]</v>
@@ -352,7 +353,7 @@ ttb:p(all, call).</input></pre>
     </func>
 
     <func>
-      <name>run_history(N) -> ok | {error, Reason}</name>
+      <name since="">run_history(N) -> ok | {error, Reason}</name>
       <fsummary>Execute one entry of the history.</fsummary>
       <type>
         <v>N = integer() | [integer()]</v>
@@ -364,7 +365,7 @@ ttb:p(all, call).</input></pre>
     </func>
 
     <func>
-      <name>write_config(ConfigFile,Config)</name>
+      <name since="">write_config(ConfigFile,Config)</name>
       <fsummary>Equivalent to write_config(ConfigFile,Config,[]).</fsummary>
       <desc>
         <p>Equivalent to <c>write_config(ConfigFile,Config,[])</c>.</p>
@@ -372,7 +373,7 @@ ttb:p(all, call).</input></pre>
     </func>
 
     <func>
-      <name>write_config(ConfigFile,Config,Opts) -> ok | {error,Reason}</name>
+      <name since="">write_config(ConfigFile,Config,Opts) -> ok | {error,Reason}</name>
       <fsummary>Create a configuration file.</fsummary>
       <type>
         <v>ConfigFile = string()</v>
@@ -405,7 +406,7 @@ ttb:p(all, call).</input></pre>
     </func>
 
     <func>
-      <name>run_config(ConfigFile) -> ok | {error,Reason}</name>
+      <name since="">run_config(ConfigFile) -> ok | {error,Reason}</name>
       <fsummary>Execute all entries in a configuration file.</fsummary>
       <type>
         <v>ConfigFile = string()</v>
@@ -418,7 +419,7 @@ ttb:p(all, call).</input></pre>
     </func>
 
     <func>
-      <name>run_config(ConfigFile,NumList) -> ok | {error,Reason}</name>
+      <name since="">run_config(ConfigFile,NumList) -> ok | {error,Reason}</name>
       <fsummary>Execute selected entries from a configuration file.</fsummary>
       <type>
         <v>ConfigFile = string()</v>
@@ -437,7 +438,7 @@ ttb:p(all, call).</input></pre>
     </func>
 
     <func>
-      <name>list_config(ConfigFile) -> Config | {error,Reason}</name>
+      <name since="">list_config(ConfigFile) -> Config | {error,Reason}</name>
       <fsummary>List all entries in a configuration file.</fsummary>
       <type>
         <v>ConfigFile = string()</v>
@@ -449,7 +450,7 @@ ttb:p(all, call).</input></pre>
     </func>
 
     <func>
-      <name>write_trace_info(Key,Info) -> ok</name>
+      <name since="">write_trace_info(Key,Info) -> ok</name>
       <fsummary>Write any information to file <c>.ti</c>.</fsummary>
       <type>
         <v>Key = term()</v>
@@ -465,7 +466,7 @@ ttb:p(all, call).</input></pre>
     </func>
 
     <func>
-      <name>seq_trigger_ms() -> MatchSpec</name>
+      <name since="">seq_trigger_ms() -> MatchSpec</name>
       <fsummary>Equivalent to seq_trigger_ms(all).</fsummary>
       <desc>
         <p>Equivalent to <c>seq_trigger_ms(all)</c>.</p>
@@ -473,7 +474,7 @@ ttb:p(all, call).</input></pre>
     </func>
 
     <func>
-      <name>seq_trigger_ms(Flags) -> MatchSpec</name>
+      <name since="">seq_trigger_ms(Flags) -> MatchSpec</name>
       <fsummary>Return a match_spec() which starts sequential tracing.</fsummary>
       <type>
         <v>MatchSpec = match_spec()</v>
@@ -521,7 +522,7 @@ ttb:p(all, call).</input></pre>
     </func>
 
     <func>
-      <name>stop()</name>
+      <name since="">stop()</name>
       <fsummary>Equivalent to stop([]).</fsummary>
       <desc>
         <p>Equivalent to <c>stop([])</c>.</p>
@@ -529,7 +530,7 @@ ttb:p(all, call).</input></pre>
     </func>
 
     <func>
-      <name>stop(Opts) -> stopped | {stopped, Dir}</name>
+      <name since="">stop(Opts) -> stopped | {stopped, Dir}</name>
       <fsummary>Stop tracing and fetch/format logs from all nodes.</fsummary>
       <type>
         <v>Opts = Opt | [Opt]</v>
@@ -573,7 +574,7 @@ ttb:p(all, call).</input></pre>
     </func>
 
     <func>
-      <name>get_et_handler()</name>
+      <name since="OTP R15B">get_et_handler()</name>
       <fsummary>Return the <c>et</c> handler.</fsummary>
       <desc>
         <p>Returns the <c>et</c> handler, which can be used with <c>format/2</c>
@@ -583,7 +584,7 @@ ttb:p(all, call).</input></pre>
     </func>
 
     <func>
-      <name>format(File)</name>
+      <name since="">format(File)</name>
       <fsummary>Equivalent to <c>format(File,[])</c>.</fsummary>
       <desc>
         <p>Equivalent to <c>format(File,[])</c>.</p>
@@ -591,7 +592,7 @@ ttb:p(all, call).</input></pre>
     </func>
 
     <func>
-      <name>format(File,Options) -> ok | {error, Reason}</name>
+      <name since="">format(File,Options) -> ok | {error, Reason}</name>
       <fsummary>Format a binary trace log.</fsummary>
       <type>
         <v>File = string() | [string()]</v>
diff --git a/lib/observer/src/cdv_bin_cb.erl b/lib/observer/src/cdv_bin_cb.erl
index a4a542297c..819596b483 100644
--- a/lib/observer/src/cdv_bin_cb.erl
+++ b/lib/observer/src/cdv_bin_cb.erl
@@ -33,42 +33,43 @@ detail_pages() ->
     [{"Binary", fun init_bin_page/2}].
 
 init_bin_page(Parent,{Type,Bin}) ->
+    Cs = observer_lib:colors(Parent),
     cdv_multi_wx:start_link(
       Parent,
-      [{"Format \~p",cdv_html_wx,{Type,format_bin_fun("~p",Bin)}},
-       {"Format \~tp",cdv_html_wx,{Type,format_bin_fun("~tp",Bin)}},
-       {"Format \~w",cdv_html_wx,{Type,format_bin_fun("~w",Bin)}},
-       {"Format \~tw",cdv_html_wx,{Type,format_bin_fun("~tw",Bin)}},
-       {"Format \~s",cdv_html_wx,{Type,format_bin_fun("~s",Bin)}},
-       {"Format \~ts",cdv_html_wx,{Type,format_bin_fun("~ts",Bin)}},
-       {"Hex",cdv_html_wx,{Type,hex_binary_fun(Bin)}},
-       {"Term",cdv_html_wx,{Type,binary_to_term_fun(Bin)}}]).
+      [{"Format \~p",cdv_html_wx,{Type,format_bin_fun("~p",Bin,Cs)}},
+       {"Format \~tp",cdv_html_wx,{Type,format_bin_fun("~tp",Bin,Cs)}},
+       {"Format \~w",cdv_html_wx,{Type,format_bin_fun("~w",Bin,Cs)}},
+       {"Format \~tw",cdv_html_wx,{Type,format_bin_fun("~tw",Bin,Cs)}},
+       {"Format \~s",cdv_html_wx,{Type,format_bin_fun("~s",Bin,Cs)}},
+       {"Format \~ts",cdv_html_wx,{Type,format_bin_fun("~ts",Bin,Cs)}},
+       {"Hex",cdv_html_wx,{Type,hex_binary_fun(Bin,Cs)}},
+       {"Term",cdv_html_wx,{Type,binary_to_term_fun(Bin,Cs)}}]).
 
-format_bin_fun(Format,Bin) ->
+format_bin_fun(Format,Bin,Cs) ->
     fun() ->
 	    try io_lib:format(Format,[Bin]) of
-		Str -> plain_html(lists:flatten(Str))
+		Str -> plain_html(lists:flatten(Str),Cs)
 	    catch error:badarg ->
-		    Warning = "This binary can not be formatted with " ++ Format,
-		    observer_html_lib:warning(Warning)
+		    Warning = "This binary cannot be formatted with " ++ Format,
+		    observer_html_lib:warning(Warning,Cs)
 	    end
     end.
 
-binary_to_term_fun(Bin) ->
+binary_to_term_fun(Bin,Cs) ->
     fun() ->
 	    try binary_to_term(Bin) of
-		Term -> plain_html(io_lib:format("~tp",[Term]))
+		Term -> plain_html(io_lib:format("~tp",[Term]),Cs)
 	    catch error:badarg ->
-		    Warning = "This binary can not be converted to an Erlang term",
-		    observer_html_lib:warning(Warning)
+		    Warning = "This binary cannot be converted to an Erlang term",
+		    observer_html_lib:warning(Warning,Cs)
 	    end
     end.
 
 -define(line_break,25).
-hex_binary_fun(Bin) ->
+hex_binary_fun(Bin,Cs) ->
     fun() ->
 	    S = "<<" ++ format_hex(Bin,?line_break) ++ ">>",
-	    plain_html(io_lib:format("~s",[S]))
+	    plain_html(io_lib:format("~s",[S]), Cs)
     end.
 
 format_hex(<<>>,_) ->
@@ -82,5 +83,5 @@ format_hex(<<B1:4,B2:4,Bin/binary>>,N) ->
     [integer_to_list(B1,16),integer_to_list(B2,16),$,
      | format_hex(Bin,N-1)].
 
-plain_html(Text) ->
-    observer_html_lib:plain_page(Text).
+plain_html(Text,Cs) ->
+    observer_html_lib:plain_page(Text,Cs).
diff --git a/lib/observer/src/cdv_detail_wx.erl b/lib/observer/src/cdv_detail_wx.erl
index 4b1984c394..5e1137511a 100644
--- a/lib/observer/src/cdv_detail_wx.erl
+++ b/lib/observer/src/cdv_detail_wx.erl
@@ -84,8 +84,9 @@ destroy_progress(_) ->
     ok.
 
 init(Id,ParentFrame,Callback,App,Parent,{Title,Info,TW}) ->
+    Scale = observer_wx:get_scale(),
     Frame=wxFrame:new(ParentFrame, ?wxID_ANY, [Title],
-		      [{style, ?wxDEFAULT_FRAME_STYLE}, {size, {850,600}}]),
+		      [{style, ?wxDEFAULT_FRAME_STYLE}, {size, {Scale*850,Scale*600}}]),
     MenuBar = wxMenuBar:new(),
     create_menus(MenuBar),
     wxFrame:setMenuBar(Frame, MenuBar),
diff --git a/lib/observer/src/cdv_html_wx.erl b/lib/observer/src/cdv_html_wx.erl
index ffef83227c..83ee98de6e 100644
--- a/lib/observer/src/cdv_html_wx.erl
+++ b/lib/observer/src/cdv_html_wx.erl
@@ -30,7 +30,8 @@
 
 %% Records
 -record(state,
-	{panel,
+	{parent,
+         panel,
 	 app,         %% which tool is the user
 	 expand_table,
          expand_wins=[],
@@ -62,7 +63,7 @@ init(ParentWin, HtmlText, Tab, App) ->
     HtmlWin = observer_lib:html_window(ParentWin),
     wxHtmlWindow:setPage(HtmlWin,HtmlText),
     wx_misc:endBusyCursor(),
-    {HtmlWin, #state{panel=HtmlWin,expand_table=Tab,app=App}}.
+    {HtmlWin, #state{parent=ParentWin, panel=HtmlWin,expand_table=Tab,app=App}}.
 
 init(ParentWin, Callback) ->
     {HtmlWin, State} = init(ParentWin, "", undefined, cdv),
@@ -70,23 +71,26 @@ init(ParentWin, Callback) ->
 
 %%%%%%%%%%%%%%%%%%%%%%% Callbacks %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-handle_info(active, #state{panel=HtmlWin,delayed_fetch=Callback}=State)
+handle_info(active, #state{parent=Parent, panel=HtmlWin,delayed_fetch=Callback}=State)
   when Callback=/=undefined ->
     observer_lib:display_progress_dialog(HtmlWin,
                                          "Crashdump Viewer",
                                          "Reading data"),
-    {{expand,HtmlText,Tab},TW} = Callback:get_info(),
+    {{expand,Title,Info,Tab},TW} = Callback:get_info(),
+    Cs = observer_lib:colors(Parent),
+    HtmlText = observer_html_lib:expandable_term(Title,Info,Tab,Cs),
+
     observer_lib:sync_destroy_progress_dialog(),
     wx_misc:beginBusyCursor(),
     wxHtmlWindow:setPage(HtmlWin,HtmlText),
-    cdv_wx:set_status(TW),
+    cdv_wx_set_status(State, TW),
     wx_misc:endBusyCursor(),
     {noreply, State#state{expand_table=Tab,
                           delayed_fetch=undefined,
                           trunc_warn=TW}};
 
 handle_info(active, State) ->
-    cdv_wx:set_status(State#state.trunc_warn),
+    cdv_wx_set_status(State, State#state.trunc_warn),
     {noreply, State};
 
 handle_info(Info, State) ->
@@ -138,7 +142,8 @@ handle_event(#wx{event=#wxHtmlLink{type=command_html_link_clicked,
 				 list_to_integer(Key3)}}},
 		expand(Id,cdv_term_cb,State);
 	    _ when App =:= obs ->
-		observer ! {open_link, Target};
+		observer ! {open_link, Target},
+                State;
 	    _ ->
 		cdv_virtual_list_wx:start_detail_win(Target),
 		State
@@ -164,3 +169,10 @@ expand(Id,Callback,#state{expand_wins=Opened0, app=App}=State) ->
 		Opened0
 	end,
     State#state{expand_wins=Opened}.
+
+cdv_wx_set_status(#state{app = cdv}, Status) ->
+    %% this module is used by the observer when cdw_wx isn't started
+    %% only try to set status when used by cdv
+    cdv_wx:set_status(Status);
+cdv_wx_set_status(_, _) ->
+    ok.
diff --git a/lib/observer/src/cdv_mod_cb.erl b/lib/observer/src/cdv_mod_cb.erl
index 2183e1aa3d..7f2cd0cf87 100644
--- a/lib/observer/src/cdv_mod_cb.erl
+++ b/lib/observer/src/cdv_mod_cb.erl
@@ -85,7 +85,8 @@ init_old_comp_page(Parent, Info) ->
 init_info_page(Parent, undefined) ->
     init_info_page(Parent, "");
 init_info_page(Parent, String) ->
-    cdv_html_wx:start_link(Parent,observer_html_lib:plain_page(String)).
+    Cs = observer_lib:colors(Parent),
+    cdv_html_wx:start_link(Parent,observer_html_lib:plain_page(String,Cs)).
 
 format({Bin,q}) when is_binary(Bin) ->
     [$'|binary_to_list(Bin)];
diff --git a/lib/observer/src/cdv_persistent_cb.erl b/lib/observer/src/cdv_persistent_cb.erl
index d5da18f7fc..90abc6a4f5 100644
--- a/lib/observer/src/cdv_persistent_cb.erl
+++ b/lib/observer/src/cdv_persistent_cb.erl
@@ -26,7 +26,4 @@
 get_info() ->
     Tab = ets:new(pt_expand,[set,public]),
     {ok,PT,TW} = crashdump_viewer:persistent_terms(),
-    {{expand,
-      observer_html_lib:expandable_term("Persistent Terms",PT,Tab),
-      Tab},
-     TW}.
+    {{expand, "Persistent Terms", PT, Tab}, TW}.
diff --git a/lib/observer/src/cdv_proc_cb.erl b/lib/observer/src/cdv_proc_cb.erl
index 2497b4889e..61bd86f188 100644
--- a/lib/observer/src/cdv_proc_cb.erl
+++ b/lib/observer/src/cdv_proc_cb.erl
@@ -108,7 +108,7 @@ init_stack_page(Parent, Info) ->
 init_memory_page(Parent, Info0, Tag, Heading) ->
     Info = proplists:get_value(Tag,Info0),
     Tab = proplists:get_value(expand_table,Info0),
-    Html = observer_html_lib:expandable_term(Heading,Info,Tab),
+    Html = observer_html_lib:expandable_term(Heading,Info,Tab, observer_lib:colors(Parent)),
     cdv_html_wx:start_link(Parent,{expand,Html,Tab}).
 
 init_ets_page(Parent, Info) ->
diff --git a/lib/observer/src/cdv_table_wx.erl b/lib/observer/src/cdv_table_wx.erl
index 0f28a51017..0cad272262 100644
--- a/lib/observer/src/cdv_table_wx.erl
+++ b/lib/observer/src/cdv_table_wx.erl
@@ -50,11 +50,12 @@ init([ParentWin, {ColumnSpec,Info,TW}]) ->
 	end,
     Grid = wxListCtrl:new(ParentWin, [{style, Style}]),
     Li = wxListItem:new(),
+    Scale = observer_wx:get_scale(),
     AddListEntry = fun({Name, Align, DefSize}, Col) ->
 			   wxListItem:setText(Li, Name),
 			   wxListItem:setAlign(Li, Align),
 			   wxListCtrl:insertColumn(Grid, Col, Li),
-			   wxListCtrl:setColumnWidth(Grid, Col, DefSize),
+			   wxListCtrl:setColumnWidth(Grid, Col, DefSize*Scale),
 			   Col + 1
 		   end,
     lists:foldl(AddListEntry, 0, ColumnSpec),
diff --git a/lib/observer/src/cdv_term_cb.erl b/lib/observer/src/cdv_term_cb.erl
index 91de6449c4..a2a7a8750d 100644
--- a/lib/observer/src/cdv_term_cb.erl
+++ b/lib/observer/src/cdv_term_cb.erl
@@ -35,31 +35,32 @@ init_term_page(ParentWin, {Type, [Term, Tab]}) ->
     Expanded = expand(Term, true),
     BinSaved = expand(Term, Tab),
     observer_lib:report_progress({ok,stop_pulse}),
+    Cs = observer_lib:colors(ParentWin),
     cdv_multi_wx:start_link(
       ParentWin,
-      [{"Format \~p",cdv_html_wx,{Type, format_term_fun("~p",BinSaved,Tab)}},
-       {"Format \~tp",cdv_html_wx,{Type,format_term_fun("~tp",BinSaved,Tab)}},
-       {"Format \~w",cdv_html_wx,{Type,format_term_fun("~w",BinSaved,Tab)}},
-       {"Format \~tw",cdv_html_wx,{Type,format_term_fun("~tw",BinSaved,Tab)}},
-       {"Format \~s",cdv_html_wx,{Type,format_term_fun("~s",Expanded,Tab)}},
-       {"Format \~ts",cdv_html_wx,{Type,format_term_fun("~ts",Expanded,Tab)}}]).
+      [{"Format \~p",cdv_html_wx,{Type, format_term_fun("~p",BinSaved,Tab,Cs)}},
+       {"Format \~tp",cdv_html_wx,{Type,format_term_fun("~tp",BinSaved,Tab,Cs)}},
+       {"Format \~w",cdv_html_wx,{Type,format_term_fun("~w",BinSaved,Tab,Cs)}},
+       {"Format \~tw",cdv_html_wx,{Type,format_term_fun("~tw",BinSaved,Tab,Cs)}},
+       {"Format \~s",cdv_html_wx,{Type,format_term_fun("~s",Expanded,Tab,Cs)}},
+       {"Format \~ts",cdv_html_wx,{Type,format_term_fun("~ts",Expanded,Tab,Cs)}}]).
 
-format_term_fun(Format,Term,Tab) ->
+format_term_fun(Format,Term,Tab,Cs) ->
     fun() ->
             observer_lib:report_progress({ok,"Formatting term"}),
             observer_lib:report_progress({ok,start_pulse}),
 	    try io_lib:format(Format,[Term]) of
-		Str -> {expand, plain_html(Str), Tab}
+		Str -> {expand, plain_html(Str,Cs), Tab}
 	    catch error:badarg ->
-		    Warning = "This term can not be formatted with " ++ Format,
-		    observer_html_lib:warning(Warning)
+		    Warning = "This term cannot be formatted with " ++ Format,
+		    observer_html_lib:warning(Warning,Cs)
             after
                     observer_lib:report_progress({ok,stop_pulse})
 	    end
     end.
 
-plain_html(Text) ->
-    observer_html_lib:plain_page(Text).
+plain_html(Text,Cs) ->
+    observer_html_lib:plain_page(Text,Cs).
 
 expand(['#CDVBin',Offset,Size,Pos], true) ->
     {ok,Bin} = crashdump_viewer:expand_binary({Offset,Size,Pos}),
diff --git a/lib/observer/src/cdv_virtual_list_wx.erl b/lib/observer/src/cdv_virtual_list_wx.erl
index 2702301021..51e85e17c1 100644
--- a/lib/observer/src/cdv_virtual_list_wx.erl
+++ b/lib/observer/src/cdv_virtual_list_wx.erl
@@ -96,8 +96,9 @@ start_detail_win_2(Callback,Id) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 init([ParentWin, Callback, Owner]) ->
-    {Holder,TW} = spawn_table_holder(Callback, Owner),
     Panel = wxPanel:new(ParentWin),
+    Attrs = observer_lib:create_attrs(Panel),
+    {Holder,TW} = spawn_table_holder(Callback, Owner, Attrs),
     {Grid,MenuCols}  = create_list_box(Panel, Holder, Callback, Owner),
     Sizer = wxBoxSizer:new(?wxVERTICAL),
     wxSizer:add(Sizer, Grid, [{flag, ?wxEXPAND bor ?wxALL},
@@ -132,11 +133,12 @@ create_list_box(Panel, Holder, Callback, Owner) ->
 				       end}
 				     ]),
     Li = wxListItem:new(),
+    Scale = observer_wx:get_scale(),
     AddListEntry = fun({Name, Align, DefSize}, Col) ->
 			   wxListItem:setText(Li, Name),
 			   wxListItem:setAlign(Li, Align),
 			   wxListCtrl:insertColumn(ListCtrl, Col, Li),
-			   wxListCtrl:setColumnWidth(ListCtrl, Col, DefSize),
+			   wxListCtrl:setColumnWidth(ListCtrl, Col, DefSize*Scale),
 			   Col + 1
 		   end,
     ListItems = Callback:col_spec(),
@@ -232,7 +234,8 @@ handle_call(new_dump, _From,
     Ref = erlang:monitor(process,Holder),
     Holder ! stop,
     receive {'DOWN',Ref,_,_,_} -> ok end,
-    {NewHolder,TW} = spawn_table_holder(Callback, all),
+    Attrs = observer_lib:create_attrs(Grid),
+    {NewHolder,TW} = spawn_table_holder(Callback, all, Attrs),
     {reply, ok, State#state{detail_wins=[],holder=NewHolder,trunc_warn=TW}};
 
 handle_call(Msg, _From, State) ->
@@ -328,9 +331,8 @@ handle_event(Event, State) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%TABLE HOLDER%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-spawn_table_holder(Callback, Owner) ->
+spawn_table_holder(Callback, Owner, Attrs) ->
     {Info,TW} = Callback:get_info(Owner),
-    Attrs = observer_lib:create_attrs(),
     Parent = self(),
     Holder =
 	case Owner of
diff --git a/lib/observer/src/cdv_wx.erl b/lib/observer/src/cdv_wx.erl
index 1e9cef8952..8ad5da857e 100644
--- a/lib/observer/src/cdv_wx.erl
+++ b/lib/observer/src/cdv_wx.erl
@@ -101,8 +101,9 @@ init(File0) ->
     {ok,CdvServer} = crashdump_viewer:start_link(),
 
     catch wxSystemOptions:setOption("mac.listctrl.always_use_generic", 1),
+    Scale = observer_wx:get_scale(),
     Frame = wxFrame:new(wx:null(), ?wxID_ANY, "Crashdump Viewer",
-			[{size, {850, 600}}, {style, ?wxDEFAULT_FRAME_STYLE}]),
+			[{size, {Scale*850, Scale*600}}, {style, ?wxDEFAULT_FRAME_STYLE}]),
     IconFile = filename:join(code:priv_dir(observer), "erlang_observer.png"),
     Icon = wxIcon:new(IconFile, [{type,?wxBITMAP_TYPE_PNG}]),
     wxFrame:setIcon(Frame, Icon),
@@ -196,8 +197,7 @@ setup(#state{frame=Frame, notebook=Notebook}=State) ->
     MemPanel = add_page(Notebook, ?MEM_STR, cdv_multi_wx, cdv_mem_cb),
 
     %% Persistent Terms Panel
-    PersistentPanel = add_page(Notebook, ?PERSISTENT_STR,
-                               cdv_html_wx, cdv_persistent_cb),
+    PersistentPanel = add_page(Notebook, ?PERSISTENT_STR, cdv_html_wx, cdv_persistent_cb),
 
     %% Memory Panel
     IntPanel = add_page(Notebook, ?INT_STR, cdv_multi_wx, cdv_int_tab_cb),
@@ -458,10 +458,7 @@ maybe_warn_filename(FileName) ->
         true ->
             continue;
         false ->
-            DumpName = case os:getenv("ERL_CRASH_DUMP") of
-                           false -> filename:absname("erl_crash.dump");
-                           Name -> filename:absname(Name)
-                       end,
+            DumpName = filename:absname(os:getenv("ERL_CRASH_DUMP", "erl_crash.dump")),
             case filename:absname(FileName) of
                 DumpName ->
                     Warning =
diff --git a/lib/observer/src/observer_alloc_wx.erl b/lib/observer/src/observer_alloc_wx.erl
index 54e246f247..da47a30fb1 100644
--- a/lib/observer/src/observer_alloc_wx.erl
+++ b/lib/observer/src/observer_alloc_wx.erl
@@ -282,11 +282,12 @@ create_mem_info(Parent) ->
     Grid = wxListCtrl:new(Parent, [{style, Style}]),
 
     Li = wxListItem:new(),
+    Scale = observer_wx:get_scale(),
     AddListEntry = fun({Name, Align, DefSize}, Col) ->
 			   wxListItem:setText(Li, Name),
 			   wxListItem:setAlign(Li, Align),
 			   wxListCtrl:insertColumn(Grid, Col, Li),
-			   wxListCtrl:setColumnWidth(Grid, Col, DefSize),
+			   wxListCtrl:setColumnWidth(Grid, Col, DefSize*Scale),
 			   Col + 1
 		   end,
     ListItems = [{"Allocator Type",  ?wxLIST_FORMAT_LEFT,  200},
diff --git a/lib/observer/src/observer_app_wx.erl b/lib/observer/src/observer_app_wx.erl
index 2a481966da..c4527ba063 100644
--- a/lib/observer/src/observer_app_wx.erl
+++ b/lib/observer/src/observer_app_wx.erl
@@ -48,7 +48,7 @@
 	  usegc = false
 	}).
 
--record(paint, {font, pen, brush, sel, links}).
+-record(paint, {font, fg, pen, brush, sel, links}).
 
 -record(app, {ptree, n2p, links, dim}).
 -record(box, {x,y, w,h, s1}).
@@ -92,7 +92,8 @@ init([Notebook, Parent, _Config]) ->
     Extra = wxBoxSizer:new(?wxVERTICAL),
     DrawingArea = wxScrolledWindow:new(P2, [{winid, ?DRAWAREA},
 					    {style,?wxFULL_REPAINT_ON_RESIZE}]),
-    wxWindow:setBackgroundColour(DrawingArea, ?wxWHITE),
+    BG = wxWindow:getBackgroundColour(Apps),
+    wxWindow:setBackgroundStyle(DrawingArea, ?wxBG_STYLE_SYSTEM),
     wxWindow:setVirtualSize(DrawingArea, 800, 800),
     wxSplitterWindow:setMinimumPaneSize(Splitter,50),
     wxSizer:add(Extra, DrawingArea, [{flag, ?wxEXPAND},{proportion, 1}]),
@@ -117,16 +118,29 @@ init([Notebook, Parent, _Config]) ->
 
     UseGC = haveGC(),
     Version28 = ?wxMAJOR_VERSION =:= 2 andalso ?wxMINOR_VERSION =:= 8,
+    Scale = observer_wx:get_scale(),
     Font = case os:type() of
 	       {unix,_} when UseGC, Version28 ->
-		   wxFont:new(12,?wxFONTFAMILY_DECORATIVE,?wxFONTSTYLE_NORMAL,?wxFONTWEIGHT_NORMAL);
+		   wxFont:new(Scale * 12,?wxFONTFAMILY_DECORATIVE,?wxFONTSTYLE_NORMAL,?wxFONTWEIGHT_NORMAL);
 	       _ ->
-		   wxSystemSettings:getFont(?wxSYS_DEFAULT_GUI_FONT)
+		   Font0 = wxSystemSettings:getFont(?wxSYS_DEFAULT_GUI_FONT),
+           wxFont:setPointSize(Font0, Scale * wxFont:getPointSize(Font0)),
+           Font0
 	   end,
     SelCol   = wxSystemSettings:getColour(?wxSYS_COLOUR_HIGHLIGHT),
-    GreyBrush = wxBrush:new({230,230,240}),
+    {Fg,BGBrush,Pen} =
+        case observer_lib:is_darkmode(BG) of
+            false ->
+                {wxSystemSettings:getColour(?wxSYS_COLOUR_BTNTEXT),
+                 wxBrush:new(wxSystemSettings:getColour(?wxSYS_COLOUR_BTNSHADOW)),
+                 wxPen:new({80,80,80}, [{width, Scale * 2}])};
+            true ->
+                {wxSystemSettings:getColour(?wxSYS_COLOUR_BTNTEXT),
+                 wxBrush:new(wxSystemSettings:getColour(?wxSYS_COLOUR_BTNSHADOW)),
+                 wxPen:new({0,0,0}, [{width, Scale * 2}])}
+        end,
     SelBrush = wxBrush:new(SelCol),
-    LinkPen  = wxPen:new(SelCol, [{width, 2}]),
+    LinkPen  = wxPen:new(SelCol, [{width, Scale * 2}]),
     process_flag(trap_exit, true),
     {Panel, #state{parent=Parent,
 		   panel =Panel,
@@ -134,8 +148,9 @@ init([Notebook, Parent, _Config]) ->
 		   app_w =DrawingArea,
 		   usegc = UseGC,
 		   paint=#paint{font = Font,
-				pen  = wxPen:new({80,80,80}, [{width, 2}]),
-				brush= GreyBrush,
+                                fg   = Fg,
+				pen  = Pen,
+				brush= BGBrush,
 				sel  = SelBrush,
 				links= LinkPen
 			       }
@@ -303,11 +318,11 @@ handle_info({delivery, _Pid, app, _Curr, {[], [], [], []}},
 
 handle_info({delivery, Pid, app, Curr, AppData},
 	    State = #state{panel=Panel, appmon=Pid, current=Curr, usegc=UseGC,
-			   app_w=AppWin, paint=#paint{font=Font}}) ->
+			   app_w=AppWin, paint=#paint{fg=Fg, font=Font}}) ->
     GC = if UseGC -> {?wxGC:create(AppWin), false};
 	    true ->  {false, wxWindowDC:new(AppWin)}
 	 end,
-    setFont(GC, Font, {0,0,0}),
+    setFont(GC, Font, Fg),
     App = build_tree(AppData, GC),
     destroy_gc(GC),
     setup_scrollbar(AppWin, App),
@@ -505,13 +520,13 @@ tree_map([], _ , Acc) -> Acc.
 draw(_DC, undefined, _, _) ->
     ok;
 draw(DC, #app{dim={_W,_H}, ptree=Tree, links=Links}, Sel,
-     #paint{font=Font, pen=Pen, brush=Brush, links=LPen, sel=SelBrush}) ->
+     #paint{font=Font, fg=Fg, pen=Pen, brush=Brush, links=LPen, sel=SelBrush}) ->
     setPen(DC, LPen),
     [draw_xlink(Link, DC) || Link <- Links],
     setPen(DC, Pen),
     %% ?wxGC:drawRectangle(DC, 2,2, _W-2,_H-2), %% DEBUG
     setBrush(DC, Brush),
-    setFont(DC, Font, {0,0,0}),
+    setFont(DC, Font, Fg),
     draw_tree(Tree, root, DC),
     case Sel of
 	undefined -> ok;
diff --git a/lib/observer/src/observer_defs.hrl b/lib/observer/src/observer_defs.hrl
index 504d0877d9..7902b32cba 100644
--- a/lib/observer/src/observer_defs.hrl
+++ b/lib/observer/src/observer_defs.hrl
@@ -36,6 +36,7 @@
 	 check = false
 	}).
 
+-record(colors, {fg, even, odd}).
 -record(attrs, {even, odd, searched, deleted, changed_odd, changed_even, new_odd, new_even}).
 -define(EVEN(Row), ((Row rem 2) =:= 0)).
 -define(BG_EVEN,    {230,230,250}).
diff --git a/lib/observer/src/observer_html_lib.erl b/lib/observer/src/observer_html_lib.erl
index c67fa28c6d..4c92a8faab 100644
--- a/lib/observer/src/observer_html_lib.erl
+++ b/lib/observer/src/observer_html_lib.erl
@@ -24,9 +24,9 @@
 %% viewer. No logic or states are kept by this module.
 %%
 
--export([plain_page/1,
-	 expandable_term/3,
-	 warning/1]).
+-export([plain_page/2,
+	 expandable_term/4,
+	 warning/2]).
 
 -include("crashdump_viewer.hrl").
 -include("observer_defs.hrl").
@@ -34,8 +34,9 @@
 %%%-----------------------------------------------------------------
 %%% Display the given information as is, no heading
 %%% Empty body if no info exists.
-warning(Info) ->
-    header(body(warning_body(Info))).
+warning(Info, Colors0) ->
+    Colors = convert(Colors0),
+    header(body(warning_body(Info), Colors)).
 
 warning_body(Info) ->
     [warn(Info)].
@@ -43,18 +44,22 @@ warning_body(Info) ->
 %%%-----------------------------------------------------------------
 %%% Display the given information as is, no heading
 %%% Empty body if no info exists.
-plain_page(Info) ->
-    header(body(plain_body(Info))).
+plain_page(Info, Colors0) ->
+    Colors = convert(Colors0),
+    header(body(plain_body(Info), Colors)).
 
 plain_body(Info) ->
     [pre(href_proc_port(lists:flatten(Info)))].
 
 %%%-----------------------------------------------------------------
 %%% Expanded memory
-expandable_term(Heading,Expanded,Tab) ->
-    header(Heading,body(expandable_term_body(Heading,Expanded,Tab))).
+expandable_term(Heading,Expanded,Tab, Colors0) ->
+    Colors = convert(Colors0),
+    header(Heading,
+           body(expandable_term_body(Heading,Expanded,Tab,Colors),
+                Colors)).
     
-expandable_term_body(Heading,[],_Tab) ->
+expandable_term_body(Heading,[],_Tab, _) ->
     [case Heading of
 	 "MsgQueue" -> "No messages were found";
 	 "Message Queue" -> "No messages were found";
@@ -65,7 +70,7 @@ expandable_term_body(Heading,[],_Tab) ->
          "SaslLog"    -> "No log entry was found";
          "Persistent Terms" -> "No persistent terms were found"
      end];
-expandable_term_body(Heading,Expanded,Tab) ->
+expandable_term_body(Heading,Expanded,Tab, Colors) ->
     Attr = "BORDER=0 CELLPADDING=0 CELLSPACING=1 WIDTH=100%",
     [case Heading of
 	 "MsgQueue" ->
@@ -74,7 +79,7 @@ expandable_term_body(Heading,Expanded,Tab) ->
 		      [th("WIDTH=70%","Message"),
 		       th("WIDTH=30%","SeqTraceToken")]) |
 		    element(1, lists:mapfoldl(fun(Msg, Even) ->
-						      {msgq_table(Tab, Msg, Even),
+						      {msgq_table(Tab, Msg, Even, Colors),
 						       not Even}
 					      end,
 					      true, Expanded))]);
@@ -84,7 +89,7 @@ expandable_term_body(Heading,Expanded,Tab) ->
 		      [th("WIDTH=10%","Id"),
 		       th("WIDTH=90%","Message")]) |
 		    element(1, lists:mapfoldl(fun(Msg, {Even,N}) ->
-						      {msgq_table(Tab, Msg, N, Even),
+						      {msgq_table(Tab, Msg, N, Even, Colors),
 						       {not Even, N+1}}
 					      end,
 					      {true,1}, Expanded))]);
@@ -94,7 +99,7 @@ expandable_term_body(Heading,Expanded,Tab) ->
 		      [th("WIDTH=20%","Label"),
 		       th("WIDTH=80%","Term")]) |
 		    element(1, lists:mapfoldl(fun(Entry, Even) ->
-						      {stackdump_table(Tab, Entry, Even),
+						      {stackdump_table(Tab, Entry, Even, Colors),
 						       not Even}
 					      end, true, Expanded))]);
 	 "ProcState" ->
@@ -103,7 +108,7 @@ expandable_term_body(Heading,Expanded,Tab) ->
 		      [th("WIDTH=20%","Label"),
 		       th("WIDTH=80%","Information")]) |
 		    element(1, lists:mapfoldl(fun(Entry, Even) ->
-						      {proc_state(Tab, Entry,Even),
+						      {proc_state(Tab, Entry,Even, Colors),
 						       not Even}
 					      end, true, Expanded))]);         
      "SaslLog"  ->
@@ -115,37 +120,37 @@ expandable_term_body(Heading,Expanded,Tab) ->
 		      [th("WIDTH=30%","Key"),
 		       th("WIDTH=70%","Value")]) |
 		    element(1, lists:mapfoldl(fun(Entry, Even) ->
-						      {dict_table(Tab, Entry,Even),
+						      {dict_table(Tab, Entry, Even, Colors),
 						       not Even}
 					      end, true, Expanded))])
      end].
 
-msgq_table(Tab,{Msg0,Token0}, Even) ->
+msgq_table(Tab,{Msg0,Token0}, Even, Colors) ->
     Token = case Token0 of
 		[] -> "";
 		_ -> io_lib:fwrite("~w",[Token0])
 	    end,
     Msg = all_or_expand(Tab,Msg0),
-    tr(color(Even),[td(pre(Msg)), td(Token)]).
+    tr(color(Even, Colors),[td(pre(Msg)), td(Token)]).
 
-msgq_table(Tab,Msg0, Id, Even) ->
+msgq_table(Tab,Msg0, Id, Even, Colors) ->
     Msg = all_or_expand(Tab,Msg0),
-    tr(color(Even),[td(integer_to_list(Id)), td(pre(Msg))]).
+    tr(color(Even, Colors),[td(integer_to_list(Id)), td(pre(Msg))]).
 
-stackdump_table(Tab,{Label0,Term0},Even) ->
+stackdump_table(Tab,{Label0,Term0},Even, Colors) ->
     Label = io_lib:format("~w",[Label0]),
     Term = all_or_expand(Tab,Term0),
-    tr(color(Even), [td("VALIGN=center",pre(Label)), td(pre(Term))]).
+    tr(color(Even, Colors), [td("VALIGN=center",pre(Label)), td(pre(Term))]).
 
-dict_table(Tab,{Key0,Value0}, Even) ->
+dict_table(Tab,{Key0,Value0}, Even, Colors) ->
     Key = all_or_expand(Tab,Key0),
     Value = all_or_expand(Tab,Value0),
-    tr(color(Even), [td("VALIGN=center",pre(Key)), td(pre(Value))]).
+    tr(color(Even, Colors), [td("VALIGN=center",pre(Key)), td(pre(Value))]).
 
-proc_state(Tab,{Key0,Value0}, Even) ->
+proc_state(Tab,{Key0,Value0}, Even, Colors) ->
     Key = lists:flatten(io_lib:format("~ts",[Key0])),
     Value = all_or_expand(Tab,Value0),
-    tr(color(Even), [td("VALIGN=center",Key), td(pre(Value))]).
+    tr(color(Even, Colors), [td("VALIGN=center",Key), td(pre(Value))]).
 
 all_or_expand(Tab,Term) ->
     Preview = io_lib:format("~tP",[Term,8]),
@@ -171,8 +176,8 @@ all_or_expand(Tab,Bin,_PreviewStr,_Expand)
     Term = io_lib:format("~tp", [OBSBin]),
     href_proc_port(lists:flatten(Term), true).
 
-color(true) -> io_lib:format("BGCOLOR=\"#~2.16.0B~2.16.0B~2.16.0B\"", tuple_to_list(?BG_EVEN));
-color(false) -> io_lib:format("BGCOLOR=\"#~2.16.0B~2.16.0B~2.16.0B\"", tuple_to_list(?BG_ODD)).
+color(true, #colors{even=Even}) -> "BGCOLOR="++Even;
+color(false,#colors{odd=Odd})   -> "BGCOLOR="++Odd.
 
 %%%-----------------------------------------------------------------
 %%% Internal library
@@ -180,10 +185,10 @@ start_html() ->
     "<HTML>\n".
 stop_html() ->
     "</HTML>".
-start_html_body() ->
-    "<BODY BGCOLOR=\"#FFFFFF\">\n".
+start_html_body(#colors{even=Even, fg=Fg}) ->
+    "<BODY BGCOLOR=" ++ Even ++ ">\n <FONT COLOR=" ++ Fg ++ ">\n".
 stop_html_body() ->
-    "</BODY>\n".
+    "</FONT> </BODY>\n".
 
 header(Body) ->
     header("","",Body).
@@ -205,8 +210,8 @@ only_html_header(Title,JavaScript) ->
      JavaScript,
      "</HEAD>\n"].
 
-body(Text) ->
-    [start_html_body(),
+body(Text, Colors) ->
+    [start_html_body(Colors),
      Text,
      stop_html_body()].
 
@@ -417,3 +422,8 @@ warn([]) ->
     [];
 warn(Warning) ->
     font("COLOR=\"#FF0000\"",p([Warning,br(),br()])).
+
+convert(#colors{fg={FR,FB,FG}, even={ER,EB,EG}, odd={OR,OG,OB}}) ->
+    #colors{fg   = io_lib:format("\"#~2.16.0B~2.16.0B~2.16.0B\"", [FR,FB,FG]),
+            even = io_lib:format("\"#~2.16.0B~2.16.0B~2.16.0B\"", [ER,EB,EG]),
+            odd  = io_lib:format("\"#~2.16.0B~2.16.0B~2.16.0B\"", [OR,OG,OB])}.
diff --git a/lib/observer/src/observer_lib.erl b/lib/observer/src/observer_lib.erl
index 7c68b0ebb6..7d115306bd 100644
--- a/lib/observer/src/observer_lib.erl
+++ b/lib/observer/src/observer_lib.erl
@@ -28,8 +28,8 @@
 	 interval_dialog/4, start_timer/1, start_timer/2, stop_timer/1, timer_config/1,
 	 display_info/2, display_info/3, fill_info/2, update_info/2, to_str/1,
 	 create_menus/3, create_menu_item/3,
-	 create_attrs/0,
-	 set_listctrl_col_size/2,
+	 is_darkmode/1, colors/1, create_attrs/1,
+	 set_listctrl_col_size/2, mix/3,
 	 create_status_bar/1,
 	 html_window/1, html_window/2,
          make_obsbin/2,
@@ -373,26 +373,44 @@ create_menu_item(separator, Menu, Index) ->
     wxMenu:insertSeparator(Menu, Index),
     Index+1.
 
-create_attrs() ->
-    Font = wxSystemSettings:getFont(?wxSYS_DEFAULT_GUI_FONT),
+colors(Window) ->
+    DarkMode = is_darkmode(wxWindow:getBackgroundColour(Window)),
     Text = case wxSystemSettings:getColour(?wxSYS_COLOUR_LISTBOXTEXT) of
-	       {255,255,255,_} -> {10,10,10};  %% Is white on Mac for some reason
-	       Color -> Color
-	   end,
-    #attrs{even = wxListItemAttr:new(Text, ?BG_EVEN, Font),
-	   odd  = wxListItemAttr:new(Text, ?BG_ODD, Font),
-	   deleted = wxListItemAttr:new(?FG_DELETED, ?BG_DELETED, Font),
-	   changed_even = wxListItemAttr:new(Text, mix(?BG_CHANGED,?BG_EVEN), Font),
-	   changed_odd  = wxListItemAttr:new(Text, mix(?BG_CHANGED,?BG_ODD), Font),
-	   new_even = wxListItemAttr:new(Text, mix(?BG_NEW,?BG_EVEN), Font),
-	   new_odd  = wxListItemAttr:new(Text, mix(?BG_NEW, ?BG_ODD), Font),
-	   searched = wxListItemAttr:new(Text, ?BG_SEARCHED, Font)
-	  }.
-
-mix(RGB,_) -> RGB.
-
-%% mix({R,G,B},{MR,MG,MB}) ->
-%%     {trunc(R*MR/255), trunc(G*MG/255), trunc(B*MB/255)}.
+               {255,255,255,_} when not DarkMode -> {10,10,10}; %% Is white on Mac for some reason
+               Color -> Color
+           end,
+    Even = wxSystemSettings:getColour(?wxSYS_COLOUR_LISTBOX),
+    Odd = mix(Even, wxSystemSettings:getColour(?wxSYS_COLOUR_HIGHLIGHT), 0.8),
+    #colors{fg=rgb(Text), even=rgb(Even), odd=rgb(Odd)}.
+
+create_attrs(Window) ->
+    Font = wxSystemSettings:getFont(?wxSYS_DEFAULT_GUI_FONT),
+    #colors{fg=Text, even=Even, odd=Odd} = colors(Window),
+    #attrs{even = wxListItemAttr:new(Text, Even, Font),
+           odd  = wxListItemAttr:new(Text, Odd, Font),
+           deleted = wxListItemAttr:new(?FG_DELETED, ?BG_DELETED, Font),
+           changed_even = wxListItemAttr:new(Text, mix(?BG_CHANGED, ?BG_EVEN, 0.9), Font),
+           changed_odd  = wxListItemAttr:new(Text, mix(?BG_CHANGED, ?BG_ODD, 0.9), Font),
+           new_even = wxListItemAttr:new(Text, mix(?BG_NEW, ?BG_EVEN, 0.9), Font),
+           new_odd  = wxListItemAttr:new(Text, mix(?BG_NEW, ?BG_ODD, 0.9), Font),
+           searched = wxListItemAttr:new(Text, ?BG_SEARCHED, Font)
+          }.
+
+rgb({R,G,B,_}) -> {R,G,B};
+rgb({_,_,_}=RGB) -> RGB.
+
+mix(RGB,{MR,MG,MB,_}, V) ->
+    mix(RGB, {MR,MG,MB}, V);
+mix({R,G,B,_}, RGB, V) ->
+    mix({R,G,B}, RGB, V);
+mix({R,G,B},{MR,MG,MB}, V) when V =< 1.0 ->
+    {min(255, round(R*V+MR*(1.0-V))),
+     min(255, round(G*V+MG*(1.0-V))),
+     min(255, round(B*V+MB*(1.0-V)))}.
+
+
+is_darkmode({R,G,B,_}) ->
+    ((R+G+B) div 3) < 100.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
diff --git a/lib/observer/src/observer_perf_wx.erl b/lib/observer/src/observer_perf_wx.erl
index 21c6d26f49..50a6d6a915 100644
--- a/lib/observer/src/observer_perf_wx.erl
+++ b/lib/observer/src/observer_perf_wx.erl
@@ -55,7 +55,7 @@
 
 -define(wxGC, wxGraphicsContext).
 
--record(paint, {font, small, pen, pen2, pens, dot_pens, usegc = false}).
+-record(paint, {font, small, fg, pen, pen2, pens, dot_pens, usegc = false}).
 
 start_link(Notebook, Parent, Config) ->
     wx_object:start_link(?MODULE, [Notebook, Parent, Config], []).
@@ -110,31 +110,42 @@ setup_graph_drawing(Panels) ->
     _ = [Do(Panel) || Panel <- Panels],
     UseGC = haveGC(),
     Version28 = ?wxMAJOR_VERSION =:= 2 andalso ?wxMINOR_VERSION =:= 8,
+    Scale = observer_wx:get_scale(),
     {Font, SmallFont}
 	= if UseGC, Version28 ->
 		  %% Def font is really small when using Graphics contexts in 2.8
 		  %% Hardcode it
-		  F = wxFont:new(12,?wxFONTFAMILY_DECORATIVE,?wxFONTSTYLE_NORMAL,?wxFONTWEIGHT_BOLD),
-		  SF = wxFont:new(10, ?wxFONTFAMILY_DECORATIVE, ?wxFONTSTYLE_NORMAL, ?wxFONTWEIGHT_NORMAL),
+		  F = wxFont:new(Scale * 12,?wxFONTFAMILY_DECORATIVE,?wxFONTSTYLE_NORMAL,?wxFONTWEIGHT_BOLD),
+		  SF = wxFont:new(Scale * 10, ?wxFONTFAMILY_DECORATIVE, ?wxFONTSTYLE_NORMAL, ?wxFONTWEIGHT_NORMAL),
 		  {F, SF};
 	     true ->
 		  DefFont = wxSystemSettings:getFont(?wxSYS_DEFAULT_GUI_FONT),
 		  DefSize = wxFont:getPointSize(DefFont),
 		  DefFamily = wxFont:getFamily(DefFont),
-		  F = wxFont:new(DefSize-1, DefFamily, ?wxFONTSTYLE_NORMAL, ?wxFONTWEIGHT_BOLD),
-		  SF = wxFont:new(DefSize-2, DefFamily, ?wxFONTSTYLE_NORMAL, ?wxFONTWEIGHT_NORMAL),
+		  F = wxFont:new(Scale * (DefSize-1), DefFamily, ?wxFONTSTYLE_NORMAL, ?wxFONTWEIGHT_BOLD),
+		  SF = wxFont:new(Scale * (DefSize-2), DefFamily, ?wxFONTSTYLE_NORMAL, ?wxFONTWEIGHT_NORMAL),
 		  {F, SF}
 	  end,
-    BlackPen = wxPen:new({0,0,0}, [{width, 1}]),
-    Pens = [wxPen:new(Col, [{width, 1}, {style, ?wxSOLID}])
+    BG = wxWindow:getBackgroundColour((hd(Panels))#win.panel),
+    Fg = case observer_lib:is_darkmode(BG) of
+             false -> {0,0,0};
+             true  -> wxSystemSettings:getColour(?wxSYS_COLOUR_BTNTEXT)
+         end,
+
+    PenColor = case observer_lib:is_darkmode(BG) of
+                   false -> {0,0,0};
+                   true  -> {0,0,0}
+               end,
+    Pens = [wxPen:new(Col, [{width, Scale}, {style, ?wxSOLID}])
             || Col <- tuple_to_list(colors())],
-    DotPens = [wxPen:new(Col, [{width, 1}, {style, ?wxDOT}])
+    DotPens = [wxPen:new(Col, [{width, Scale}, {style, ?wxDOT}])
                || Col <- tuple_to_list(colors())],
     #paint{usegc = UseGC,
 	   font  = Font,
 	   small = SmallFont,
-	   pen   = ?wxGREY_PEN,
-	   pen2  = BlackPen,
+           fg    = Fg,  %% Text color
+	   pen   = wxPen:new(PenColor),
+	   pen2  = wxPen:new(PenColor, [{width, Scale}]),
 	   pens  = list_to_tuple(Pens),
            dot_pens = list_to_tuple(DotPens)
 	  }.
@@ -524,7 +535,7 @@ draw_win(DC, #win{name=Name, no_samples=Samples, geom=#{scale:={WS,HS}},
     DrawBs(),
     ok;
 
-draw_win(DC, #win{no_samples=Samples} = Win,Ti, #paint{small=Small}=Paint) ->
+draw_win(DC, #win{no_samples=Samples} = Win,Ti, #paint{fg=Fg, small=Small}=Paint) ->
     %% Draw Error Msg
     try draw_borders(DC, Ti, Win, Paint) of
 	{X0,_Y0,DrawBs} ->
@@ -532,7 +543,7 @@ draw_win(DC, #win{no_samples=Samples} = Win,Ti, #paint{small=Small}=Paint) ->
 		       true  -> "Waiting for data";
 		       false -> "Information not available"
 		   end,
-	    setFont(DC, Small, {0,0,0}),
+	    setFont(DC, Small, Fg),
 	    {_,WW} = getSize(DC),
 	    drawText(DC, Text, X0 + 100, WW div 2),
 	    DrawBs(),
@@ -627,7 +638,7 @@ spline_tan(Y0, Y1, Y2, Y3) ->
 
 draw_borders(DC, #ti{secs=Secs, fetch=FetchFreq},
 	     #win{name=Type, geom=Geom, info=Info, max={_,_,Unit,_}},
-	     #paint{pen=Pen, pen2=Pen2, font=Font, small=Small}) ->
+	     #paint{pen=Pen, pen2=Pen2, fg=Fg, font=Font, small=Small}) ->
     #{p0:={GraphX0, GraphY0}, p1:={GraphX1,GraphY1}, scale:={ScaleW0,_},
       txsz:={TW,TH,SpaceW}, txt:={BottomTextY, MaxTextY}, strs:={Str1,Str2,Str3}} = Geom,
 
@@ -639,7 +650,7 @@ draw_borders(DC, #ti{secs=Secs, fetch=FetchFreq},
     GraphY50 = GraphY0 + (GraphY1 - GraphY0) / 2,
     GraphY75 = GraphY0 + 3*(GraphY1 - GraphY0) / 4,
 
-    setFont(DC, Small, {0,0,0}),
+    setFont(DC, Small, Fg),
     Align = fun(Str, Y) ->
 		    {StrW, _} = getTextExtent(DC, Str),
 		    drawText(DC, Str, GraphX0 - StrW - ?BW, Y)
@@ -669,11 +680,11 @@ draw_borders(DC, #ti{secs=Secs, fetch=FetchFreq},
     strokeLine(DC, GraphX0-3, GraphY50, GraphX1, GraphY50),
     strokeLine(DC, GraphX0-3, GraphY75, GraphX1, GraphY75),
 
-    setFont(DC, Font, {0,0,0}),
+    setFont(DC, Font, Fg),
 
     Text = fun(X,Y, Str, PenId) ->
 		   if PenId == 0 ->
-			   setFont(DC, Font, {0,0,0});
+			   setFont(DC, Font, Fg);
 		      PenId > 0 ->
 			   Id = 1 + ((PenId-1) rem tuple_size(colors())),
 			   setFont(DC, Font, element(Id, colors()))
diff --git a/lib/observer/src/observer_port_wx.erl b/lib/observer/src/observer_port_wx.erl
index 445f3dd6b1..5cb6d9bc22 100644
--- a/lib/observer/src/observer_port_wx.erl
+++ b/lib/observer/src/observer_port_wx.erl
@@ -61,7 +61,8 @@
          inet}).
 
 -record(opt, {sort_key=2,
-	      sort_incr=true
+	      sort_incr=true,
+              odd_bg
 	     }).
 
 -record(state,
@@ -96,11 +97,12 @@ init([Notebook, Parent, Config]) ->
 			   wxListCtrl:setColumnWidth(Grid, Col, DefSize),
 			   Col + 1
 		   end,
-    ListItems = [{"Id", ?wxLIST_FORMAT_LEFT,  150},
-		 {"Connected", ?wxLIST_FORMAT_LEFT, 150},
-		 {"Name", ?wxLIST_FORMAT_LEFT, 150},
-		 {"Controls", ?wxLIST_FORMAT_LEFT, 200},
-		 {"Slot", ?wxLIST_FORMAT_RIGHT, 50}],
+    Scale = observer_wx:get_scale(),
+    ListItems = [{"Id", ?wxLIST_FORMAT_LEFT,  Scale*150},
+		 {"Connected", ?wxLIST_FORMAT_LEFT, Scale*150},
+		 {"Name", ?wxLIST_FORMAT_LEFT, Scale*150},
+		 {"Controls", ?wxLIST_FORMAT_LEFT, Scale*200},
+		 {"Slot", ?wxLIST_FORMAT_RIGHT, Scale*50}],
     lists:foldl(AddListEntry, 0, ListItems),
     wxListItem:destroy(Li),
 
@@ -110,7 +112,10 @@ init([Notebook, Parent, Config]) ->
     wxListCtrl:connect(Grid, size, [{skip, true}]),
 
     wxWindow:setFocus(Grid),
-    {Panel, #state{grid=Grid, parent=Parent, panel=Panel, timer=Config}}.
+    Even = wxSystemSettings:getColour(?wxSYS_COLOUR_LISTBOX),
+    Odd = observer_lib:mix(Even, wxSystemSettings:getColour(?wxSYS_COLOUR_HIGHLIGHT), 0.8),
+    Opt = #opt{odd_bg=Odd},
+    {Panel, #state{grid=Grid, parent=Parent, panel=Panel, timer=Config, opt=Opt}}.
 
 handle_event(#wx{id=?ID_REFRESH},
 	     State = #state{node=Node, grid=Grid, opt=Opt}) ->
@@ -461,10 +466,11 @@ display_port_info(Parent, PortRec, Opened) ->
 do_display_port_info(Parent0, PortRec) ->
     Parent = observer_lib:get_wx_parent(Parent0),
     Title = "Port Info: " ++ PortRec#port.id_str,
+    Scale = observer_wx:get_scale(),
     Frame = wxMiniFrame:new(Parent, ?wxID_ANY, Title,
 			    [{style, ?wxSYSTEM_MENU bor ?wxCAPTION
 				  bor ?wxCLOSE_BOX bor ?wxRESIZE_BORDER},
-                             {size,{600,400}}]),
+                             {size,{Scale * 600, Scale * 400}}]),
     ScrolledWin = wxScrolledWindow:new(Frame,[{style,?wxHSCROLL bor ?wxVSCROLL}]),
     wxScrolledWindow:enableScrolling(ScrolledWin,true,true),
     wxScrolledWindow:setScrollbars(ScrolledWin,20,20,0,0),
@@ -551,7 +557,7 @@ filter_monitor_info() ->
 
 update_grid(Grid, Sel, Opt, Ports) ->
     wx:batch(fun() -> update_grid2(Grid, Sel, Opt, Ports) end).
-update_grid2(Grid, Sel, #opt{sort_key=Sort,sort_incr=Dir}, Ports) ->
+update_grid2(Grid, Sel, #opt{sort_key=Sort,sort_incr=Dir, odd_bg=BG}, Ports) ->
     wxListCtrl:deleteAllItems(Grid),
     Update =
 	fun(#port{id = Id,
@@ -561,8 +567,8 @@ update_grid2(Grid, Sel, #opt{sort_key=Sort,sort_incr=Dir}, Ports) ->
 		  controls = Ctrl},
 	    Row) ->
 		_Item = wxListCtrl:insertItem(Grid, Row, ""),
-		if (Row rem 2) =:= 0 ->
-			wxListCtrl:setItemBackgroundColour(Grid, Row, ?BG_EVEN);
+		if (Row rem 2) =:= 1 ->
+			wxListCtrl:setItemBackgroundColour(Grid, Row, BG);
 		   true -> ignore
 		end,
 
diff --git a/lib/observer/src/observer_pro_wx.erl b/lib/observer/src/observer_pro_wx.erl
index 04e654a37e..6b359f3c44 100644
--- a/lib/observer/src/observer_pro_wx.erl
+++ b/lib/observer/src/observer_pro_wx.erl
@@ -94,7 +94,7 @@ start_link(Notebook, Parent, Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 init([Notebook, Parent, Config]) ->
-    Attrs = observer_lib:create_attrs(),
+    Attrs = observer_lib:create_attrs(Notebook),
     Self = self(),
     Acc = maps:get(acc, Config, false),
     Holder = spawn_link(fun() -> init_table_holder(Self, Acc, Attrs) end),
@@ -163,13 +163,14 @@ create_list_box(Panel, Holder) ->
 			   wxListCtrl:setColumnWidth(ListCtrl, Col, DefSize),
 			   Col + 1
 		   end,
-    ListItems = [{"Pid", ?wxLIST_FORMAT_CENTRE,  120},
-		 {"Name or Initial Func", ?wxLIST_FORMAT_LEFT, 200},
-%%		 {"Time", ?wxLIST_FORMAT_CENTRE, 50},
-		 {"Reds", ?wxLIST_FORMAT_RIGHT, 100},
-		 {"Memory", ?wxLIST_FORMAT_RIGHT, 100},
-		 {"MsgQ",  ?wxLIST_FORMAT_RIGHT, 50},
-		 {"Current Function", ?wxLIST_FORMAT_LEFT,  200}],
+    Scale = observer_wx:get_scale(),
+    ListItems = [{"Pid", ?wxLIST_FORMAT_CENTRE,  Scale*120},
+		 {"Name or Initial Func", ?wxLIST_FORMAT_LEFT, Scale*200},
+%%		 {"Time", ?wxLIST_FORMAT_CENTRE, Scale*50},
+		 {"Reds", ?wxLIST_FORMAT_RIGHT, Scale*100},
+		 {"Memory", ?wxLIST_FORMAT_RIGHT, Scale*100},
+		 {"MsgQ",  ?wxLIST_FORMAT_RIGHT, Scale*50},
+		 {"Current Function", ?wxLIST_FORMAT_LEFT,  Scale*200}],
     lists:foldl(AddListEntry, 0, ListItems),
     wxListItem:destroy(Li),
 
diff --git a/lib/observer/src/observer_procinfo.erl b/lib/observer/src/observer_procinfo.erl
index f436886735..637a090a15 100644
--- a/lib/observer/src/observer_procinfo.erl
+++ b/lib/observer/src/observer_procinfo.erl
@@ -59,8 +59,9 @@ init([Pid, ParentFrame, Parent]) ->
 		  {registered_name, Registered} -> io_lib:format("~tp (~p)",[Registered, Pid]);
 		  undefined -> throw(process_undefined)
 	      end,
+    Scale = observer_wx:get_scale(),
 	Frame=wxFrame:new(ParentFrame, ?wxID_ANY, [atom_to_list(node(Pid)), $:, Title],
-			  [{style, ?wxDEFAULT_FRAME_STYLE}, {size, {850,600}}]),
+			  [{style, ?wxDEFAULT_FRAME_STYLE}, {size, {Scale * 850, Scale * 600}}]),
 	MenuBar = wxMenuBar:new(),
 	create_menus(MenuBar),
 	wxFrame:setMenuBar(Frame, MenuBar),
@@ -213,12 +214,14 @@ init_process_page(Panel, Pid) ->
 
 init_message_page(Parent, Pid, Table) ->
     Win = observer_lib:html_window(Parent),
+    Cs = observer_lib:colors(Parent),
     Update = fun() ->
 		     case observer_wx:try_rpc(node(Pid), erlang, process_info,
 					      [Pid, messages])
 		     of
 			 {messages, Messages} ->
-			     Html = observer_html_lib:expandable_term("Message Queue", Messages, Table),
+			     Html = observer_html_lib:expandable_term("Message Queue", Messages,
+                                                                      Table, Cs),
 			     wxHtmlWindow:setPage(Win, Html);
 			 _ ->
 			     throw(process_undefined)
@@ -229,11 +232,12 @@ init_message_page(Parent, Pid, Table) ->
 
 init_dict_page(Parent, Pid, Table) ->
     Win = observer_lib:html_window(Parent),
+    Cs = observer_lib:colors(Parent),
     Update = fun() ->
 		     case observer_wx:try_rpc(node(Pid), erlang, process_info, [Pid, dictionary])
 		     of
 			 {dictionary,Dict} ->
-			     Html = observer_html_lib:expandable_term("Dictionary", Dict, Table),
+			     Html = observer_html_lib:expandable_term("Dictionary", Dict, Table, Cs),
 			     wxHtmlWindow:setPage(Win, Html);
 			 _ ->
 			     throw(process_undefined)
@@ -245,13 +249,16 @@ init_dict_page(Parent, Pid, Table) ->
 init_stack_page(Parent, Pid) ->
     LCtrl = wxListCtrl:new(Parent, [{style, ?wxLC_REPORT bor ?wxLC_HRULES}]),
     Li = wxListItem:new(),
+    Scale = observer_wx:get_scale(),
     wxListItem:setText(Li, "Module:Function/Arg"),
     wxListCtrl:insertColumn(LCtrl, 0, Li),
-    wxListCtrl:setColumnWidth(LCtrl, 0, 300),
+    wxListCtrl:setColumnWidth(LCtrl, 0, Scale * 300),
     wxListItem:setText(Li, "File:LineNumber"),
     wxListCtrl:insertColumn(LCtrl, 1, Li),
-    wxListCtrl:setColumnWidth(LCtrl, 1, 300),
+    wxListCtrl:setColumnWidth(LCtrl, 1, Scale * 300),
     wxListItem:destroy(Li),
+    Even = wxSystemSettings:getColour(?wxSYS_COLOUR_LISTBOX),
+    Odd = observer_lib:mix(Even, wxSystemSettings:getColour(?wxSYS_COLOUR_HIGHLIGHT), 0.8),
     Update = fun() ->
 		     case observer_wx:try_rpc(node(Pid), erlang, process_info,
 					      [Pid, current_stacktrace])
@@ -260,8 +267,8 @@ init_stack_page(Parent, Pid) ->
 			     wxListCtrl:deleteAllItems(LCtrl),
 			     wx:foldl(fun({M, F, A, Info}, Row) ->
 					      _Item = wxListCtrl:insertItem(LCtrl, Row, ""),
-					      ?EVEN(Row) andalso
-						  wxListCtrl:setItemBackgroundColour(LCtrl, Row, ?BG_EVEN),
+					      ?EVEN(Row) orelse
+						  wxListCtrl:setItemBackgroundColour(LCtrl, Row, Odd),
 					      wxListCtrl:setItem(LCtrl, Row, 0, observer_lib:to_str({M,F,A})),
 					      FileLine = case Info of
 							     [{file,File},{line,Line}] ->
@@ -286,9 +293,10 @@ init_stack_page(Parent, Pid) ->
 
 init_state_page(Parent, Pid, Table) ->
     Win = observer_lib:html_window(Parent),
+    Cs = observer_lib:colors(Parent),
     Update = fun() ->
 		     StateInfo = fetch_state_info(Pid),
-		     Html = observer_html_lib:expandable_term("ProcState", StateInfo, Table),
+		     Html = observer_html_lib:expandable_term("ProcState", StateInfo, Table, Cs),
 		     wxHtmlWindow:setPage(Win, Html)
 	     end,
     Update(),
@@ -339,6 +347,7 @@ fetch_state_info2(Pid, M) ->
 
 init_log_page(Parent, Pid, Table) ->
     Win = observer_lib:html_window(Parent),
+    Cs = observer_lib:colors(Parent),
     Update = fun() ->
 		     Fd = spawn_link(fun() -> io_server() end),
 		     rpc:call(node(Pid), rb, rescan, [[{start_log, Fd}]]),
@@ -351,7 +360,7 @@ init_log_page(Parent, Pid, Table) ->
 		     NbBlanks = length(Pref) - 1,
 		     Re = "(<" ++ Pref ++ "\.[^>]{1,}>)[ ]{"++ integer_to_list(NbBlanks) ++ "}",
 		     Look = re:replace(ExpPid, Re, "\\1", [global, {return, list}]),
-		     Html = observer_html_lib:expandable_term("SaslLog", Look, Table),
+		     Html = observer_html_lib:expandable_term("SaslLog", Look, Table, Cs),
 		     wxHtmlWindow:setPage(Win, Html)
 	     end,
     Update(),
diff --git a/lib/observer/src/observer_trace_wx.erl b/lib/observer/src/observer_trace_wx.erl
index 2c3b46a3a1..f458c8c34a 100644
--- a/lib/observer/src/observer_trace_wx.erl
+++ b/lib/observer/src/observer_trace_wx.erl
@@ -188,8 +188,9 @@ create_proc_port_view(Parent) ->
 			   wxListCtrl:setColumnWidth(Procs, Col, DefSize),
 			   Col + 1
 		   end,
-    ProcListItems = [{"Process Id",    ?wxLIST_FORMAT_CENTER,  120},
-		     {"Trace Options", ?wxLIST_FORMAT_LEFT, 300}],
+    Scale = observer_wx:get_scale(),
+    ProcListItems = [{"Process Id",    ?wxLIST_FORMAT_CENTER,  Scale*120},
+		     {"Trace Options", ?wxLIST_FORMAT_LEFT, Scale*300}],
     lists:foldl(AddProc, 0, ProcListItems),
 
     AddPort = fun({Name, Align, DefSize}, Col) ->
@@ -199,8 +200,8 @@ create_proc_port_view(Parent) ->
 			   wxListCtrl:setColumnWidth(Ports, Col, DefSize),
 			   Col + 1
 		   end,
-    PortListItems = [{"Port Id",    ?wxLIST_FORMAT_CENTER,  120},
-		     {"Trace Options", ?wxLIST_FORMAT_LEFT, 300}],
+    PortListItems = [{"Port Id",    ?wxLIST_FORMAT_CENTER,  Scale*120},
+		     {"Trace Options", ?wxLIST_FORMAT_LEFT, Scale*300}],
     lists:foldl(AddPort, 0, PortListItems),
 
     wxListItem:destroy(Li),
@@ -242,14 +243,15 @@ create_matchspec_view(Parent) ->
     Funcs   = wxListCtrl:new(Splitter, [{winid, ?FUNCS_WIN}, {style, Style}]),
     Li = wxListItem:new(),
 
+    Scale = observer_wx:get_scale(),
     wxListItem:setText(Li, "Modules"),
     wxListCtrl:insertColumn(Modules, 0, Li),
     wxListItem:setText(Li, "Functions"),
     wxListCtrl:insertColumn(Funcs, 0, Li),
-    wxListCtrl:setColumnWidth(Funcs, 0, 150),
+    wxListCtrl:setColumnWidth(Funcs, 0, Scale*150),
     wxListItem:setText(Li, "Match Spec"),
     wxListCtrl:insertColumn(Funcs, 1, Li),
-    wxListCtrl:setColumnWidth(Funcs, 1, 300),
+    wxListCtrl:setColumnWidth(Funcs, 1, Scale*300),
     wxListItem:destroy(Li),
 
     wxSplitterWindow:setSashGravity(Splitter, 0.0),
@@ -969,7 +971,8 @@ output_file(true, true, Opts) ->
 
 create_logwindow(_Parent, false) -> {false, false};
 create_logwindow(Parent, true) ->
-    LogWin = wxFrame:new(Parent, ?LOG_WIN, "Trace Log", [{size, {750, 800}}]),
+    Scale = observer_wx:get_scale(),
+    LogWin = wxFrame:new(Parent, ?LOG_WIN, "Trace Log", [{size, {750*Scale, 800*Scale}}]),
     MB = wxMenuBar:new(),
     File = wxMenu:new(),
     wxMenu:append(File, ?LOG_CLEAR, "Clear Log\tCtrl-C"),
diff --git a/lib/observer/src/observer_traceoptions_wx.erl b/lib/observer/src/observer_traceoptions_wx.erl
index ea292b92af..514d55ff24 100644
--- a/lib/observer/src/observer_traceoptions_wx.erl
+++ b/lib/observer/src/observer_traceoptions_wx.erl
@@ -167,9 +167,10 @@ select_nodes(Parent, Nodes) ->
     check_selector(Parent, Choices).
 
 module_selector(Parent, Node) ->
+    Scale = observer_wx:get_scale(),
     Dialog = wxDialog:new(Parent, ?wxID_ANY, "Select Module or Event",
 			  [{style, ?wxDEFAULT_DIALOG_STYLE bor ?wxRESIZE_BORDER},
-			   {size, {400, 400}}]),
+			   {size, {400*Scale, 400*Scale}}]),
     Panel = wxPanel:new(Dialog),
     PanelSz = wxBoxSizer:new(?wxVERTICAL),
     MainSz  = wxBoxSizer:new(?wxVERTICAL),
@@ -237,9 +238,10 @@ function_selector(Parent, Node, Module) ->
     end.
 
 check_selector(Parent, ParsedChoices) ->
+    Scale = observer_wx:get_scale(),
     Dialog = wxDialog:new(Parent, ?wxID_ANY, "Trace Functions",
 			  [{style, ?wxDEFAULT_DIALOG_STYLE bor ?wxRESIZE_BORDER},
-			   {size, {400, 400}}]),
+			   {size, {400*Scale, 400*Scale}}]),
 
     Panel = wxPanel:new(Dialog),
     PanelSz = wxBoxSizer:new(?wxVERTICAL),
@@ -331,9 +333,10 @@ select_matchspec(Pid, Parent, AllMatchSpecs, Key) ->
 	    {value,{Key,MSs0},Rest} -> {MSs0,Rest};
 	    false -> {[],AllMatchSpecs}
 	end,
+    Scale = observer_wx:get_scale(),
     Dialog = wxDialog:new(Parent, ?wxID_ANY, "Trace Match Specifications",
 			  [{style, ?wxDEFAULT_DIALOG_STYLE bor ?wxRESIZE_BORDER},
-			   {size, {400, 400}}]),
+			   {size, {400*Scale, 400*Scale}}]),
 
     Panel = wxPanel:new(Dialog),
     PanelSz = wxBoxSizer:new(?wxVERTICAL),
diff --git a/lib/observer/src/observer_tv_table.erl b/lib/observer/src/observer_tv_table.erl
index d6dcee2cda..32d75f77d4 100644
--- a/lib/observer/src/observer_tv_table.erl
+++ b/lib/observer/src/observer_tv_table.erl
@@ -99,7 +99,8 @@ init([Parent, Opts]) ->
 		ets -> "TV Ets: " ++ Title0;
 		mnesia -> "TV Mnesia: " ++ Title0
 	    end,
-    Frame = wxFrame:new(Parent, ?wxID_ANY, Title, [{size, {800, 600}}]),
+    Scale = observer_wx:get_scale(),
+    Frame = wxFrame:new(Parent, ?wxID_ANY, Title, [{size, {Scale * 800, Scale * 600}}]),
     IconFile = filename:join(code:priv_dir(observer), "erlang_observer.png"),
     Icon = wxIcon:new(IconFile, [{type,?wxBITMAP_TYPE_PNG}]),
     wxFrame:setIcon(Frame, Icon),
@@ -115,8 +116,8 @@ init([Parent, Opts]) ->
 	TabId = table_id(Table),
 	ColumnNames = column_names(Node, Source, TabId),
 	KeyPos = key_pos(Node, Source, TabId),
-
-	Attrs = observer_lib:create_attrs(),
+	Panel = wxPanel:new(Frame),
+	Attrs = observer_lib:create_attrs(Panel),
 
 	Self = self(),
 	Holder = spawn_link(fun() ->
@@ -124,7 +125,6 @@ init([Parent, Opts]) ->
 						      length(ColumnNames), Node, Attrs)
 			    end),
 
-	Panel = wxPanel:new(Frame),
 	Sizer = wxBoxSizer:new(?wxVERTICAL),
 	Style = ?wxLC_REPORT bor ?wxLC_VIRTUAL bor ?wxLC_SINGLE_SEL bor ?wxLC_HRULES,
 	Grid = wxListCtrl:new(Panel, [{style, Style},
diff --git a/lib/observer/src/observer_tv_wx.erl b/lib/observer/src/observer_tv_wx.erl
index 814f3a1260..d622b1423b 100644
--- a/lib/observer/src/observer_tv_wx.erl
+++ b/lib/observer/src/observer_tv_wx.erl
@@ -71,7 +71,7 @@ init([Notebook, Parent, Config]) ->
 
     Style = ?wxLC_REPORT bor ?wxLC_VIRTUAL bor ?wxLC_SINGLE_SEL bor ?wxLC_HRULES,
     Self = self(),
-    Attrs = observer_lib:create_attrs(),
+    Attrs = observer_lib:create_attrs(Panel),
     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}],
@@ -87,12 +87,13 @@ init([Notebook, Parent, Config]) ->
 			   wxListCtrl:setColumnWidth(Grid, Col, DefSize),
 			   Col + 1
 		   end,
-    ListItems = [{"Table Name", ?wxLIST_FORMAT_LEFT,  200},
-		 {"Objects",    ?wxLIST_FORMAT_RIGHT, 100},
-		 {"Size (kB)",  ?wxLIST_FORMAT_RIGHT, 100},
-		 {"Owner Pid",  ?wxLIST_FORMAT_CENTER, 150},
-		 {"Owner Name", ?wxLIST_FORMAT_LEFT,  200},
-		 {"Table Id",   ?wxLIST_FORMAT_LEFT, 250}
+    Scale = observer_wx:get_scale(),
+    ListItems = [{"Table Name", ?wxLIST_FORMAT_LEFT,  Scale*200},
+		 {"Objects",    ?wxLIST_FORMAT_RIGHT, Scale*100},
+		 {"Size (kB)",  ?wxLIST_FORMAT_RIGHT, Scale*100},
+		 {"Owner Pid",  ?wxLIST_FORMAT_CENTER, Scale*150},
+		 {"Owner Name", ?wxLIST_FORMAT_LEFT,  Scale*200},
+		 {"Table Id",   ?wxLIST_FORMAT_LEFT, Scale*250}
 		],
     lists:foldl(AddListEntry, 0, ListItems),
     wxListItem:destroy(Li),
@@ -147,7 +148,7 @@ handle_event(#wx{event=#wxList{type=command_list_item_activated,
 	     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"};
+            self() ! {error, "Table has 'private' protection and cannot be read"};
         #tab{}=Table ->
 	    observer_tv_table:start_link(Grid, [{node,Node}, {type,Type}, {table,Table}]);
         _ -> ignore
@@ -187,7 +188,7 @@ handle_event(#wx{id=?ID_SHOW_TABLE},
 	R when is_integer(R) ->
 	    case get_table(Holder, R) of
 		#tab{protection=private} ->
-		    self() ! {error, "Table has 'private' protection and can not be read"};
+		    self() ! {error, "Table has 'private' protection and cannot be read"};
                 #tab{}=Table ->
 		    observer_tv_table:start_link(Grid, [{node,Node}, {type,Type}, {table,Table}]);
                 _ -> ignore
diff --git a/lib/observer/src/observer_wx.erl b/lib/observer/src/observer_wx.erl
index 453e3bdc2d..de7d821030 100644
--- a/lib/observer/src/observer_wx.erl
+++ b/lib/observer/src/observer_wx.erl
@@ -22,7 +22,7 @@
 
 -export([start/0, stop/0]).
 -export([create_menus/2, get_attrib/1, get_tracer/0, get_active_node/0, get_menubar/0,
-	 set_status/1, create_txt_dialog/4, try_rpc/4, return_to_localnode/2]).
+     get_scale/0, set_status/1, create_txt_dialog/4, try_rpc/4, return_to_localnode/2]).
 
 -export([init/1, handle_event/2, handle_cast/2, terminate/2, code_change/3,
 	 handle_call/3, handle_info/2, check_page_title/1]).
@@ -91,14 +91,24 @@ get_active_node() ->
 get_menubar() ->
     wx_object:call(observer, get_menubar).
 
+get_scale() ->
+    ScaleStr = os:getenv("OBSERVER_SCALE", "1"),
+    try list_to_integer(ScaleStr) of
+        Scale when Scale < 1 -> 1;
+        Scale -> Scale
+    catch _:_ ->
+        1
+    end.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 init(_Args) ->
     register(observer, self()),
     wx:new(),
     catch wxSystemOptions:setOption("mac.listctrl.always_use_generic", 1),
+    Scale = get_scale(),
     Frame = wxFrame:new(wx:null(), ?wxID_ANY, "Observer",
-			[{size, {850, 600}}, {style, ?wxDEFAULT_FRAME_STYLE}]),
+			[{size, {Scale * 850, Scale * 600}}, {style, ?wxDEFAULT_FRAME_STYLE}]),
     IconFile = filename:join(code:priv_dir(observer), "erlang_observer.png"),
     Icon = wxIcon:new(IconFile, [{type,?wxBITMAP_TYPE_PNG}]),
     wxFrame:setIcon(Frame, Icon),
@@ -771,7 +781,11 @@ ensure_sasl_started(Node) ->
 
 ensure_mf_h_handler_used(Node) ->
    %% is log_mf_h used ?
-   Handlers = rpc:block_call(Node, gen_event, which_handlers, [error_logger]),
+   Handlers =
+        case rpc:block_call(Node, gen_event, which_handlers, [error_logger]) of
+            {badrpc,{'EXIT',noproc}} -> []; % OTP-21+ and no event handler exists
+            Hs -> Hs
+        end,
    case lists:any(fun(L)-> L == log_mf_h end, Handlers) of
        false -> throw("Error: log_mf_h handler not used in sasl."),
                 error;
@@ -806,7 +820,7 @@ is_rb_compatible(Node) ->
 
 is_rb_server_running(Node, LogState) ->
    %% If already started, somebody else may use it.
-   %% We can not use it too, as far log file would be overriden. Not fair.
+   %% We cannot use it too, as far log file would be overriden. Not fair.
    case rpc:block_call(Node, erlang, whereis, [rb_server]) of
        Pid when is_pid(Pid), (LogState == false) ->
 	   throw("Error: rb_server is already started and maybe used by someone.");
diff --git a/lib/observer/test/crashdump_helper.erl b/lib/observer/test/crashdump_helper.erl
index d5d3649525..10d88c994a 100644
--- a/lib/observer/test/crashdump_helper.erl
+++ b/lib/observer/test/crashdump_helper.erl
@@ -24,7 +24,7 @@
          create_binaries/0,create_sub_binaries/1,
          dump_persistent_terms/0,
          create_persistent_terms/0]).
--compile(r18).
+-compile(r20).
 -include_lib("common_test/include/ct.hrl").
 
 n1_proc(N2,Creator) ->
@@ -48,7 +48,7 @@ n1_proc(Creator,_N2,Pid2,Port2,_L) ->
     Ref = make_ref(),
     Pid = self(),
     Bin = list_to_binary(lists:seq(1, 255)),
-    <<_:2,SubBin:17/binary,_/bits>> = Bin,
+    <<_:2,SubBin:65/binary,_/bits>> = Bin,
 
     register(named_port,Port),
 
@@ -102,7 +102,7 @@ remote_proc(P1,Creator) ->
 	  end).
 
 create_binaries() ->
-    Sizes = lists:seq(60, 70) ++ lists:seq(120, 140),
+    Sizes = lists:seq(100, 120) ++ lists:seq(200, 240),
     [begin
          <<H:16/unit:8>> = erlang:md5(<<Size:32>>),
          Data = ((H bsl (8*150)) div (H+7919)),
@@ -113,7 +113,7 @@ 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]].
+        LenSub <- [0,1,2,3,4,6,9,65]].
 
 create_sub_binary(Bin, Start, LenSub) ->
     Len = byte_size(Bin) - LenSub - Start,
@@ -204,5 +204,4 @@ dump_persistent_terms() ->
 create_persistent_terms() ->
     persistent_term:put({?MODULE,first}, {pid,42.0}),
     persistent_term:put({?MODULE,second}, [1,2,3]),
-    persistent_term:get().
-
+    {persistent_term:get({?MODULE,first}),persistent_term:get({?MODULE,second})}.
diff --git a/lib/observer/test/crashdump_viewer_SUITE.erl b/lib/observer/test/crashdump_viewer_SUITE.erl
index 8c5e618f4a..31cf7011d4 100644
--- a/lib/observer/test/crashdump_viewer_SUITE.erl
+++ b/lib/observer/test/crashdump_viewer_SUITE.erl
@@ -615,9 +615,8 @@ special(File,Procs) ->
 
 	    #proc{dict=Dict} = ProcDetails,
             %% io:format("~p\n", [Dict]),
-            Pts1 = crashdump_helper:create_persistent_terms(),
-            Pts2 = proplists:get_value(pts,Dict),
-            true = lists:sort(Pts1) =:= lists:sort(Pts2),
+            Pts = crashdump_helper:create_persistent_terms(),
+            Pts = proplists:get_value(pts,Dict),
             io:format("  persistent terms ok",[]),
             ok;
 	_ ->
diff --git a/lib/observer/test/crashdump_viewer_SUITE_data/old_format.dump b/lib/observer/test/crashdump_viewer_SUITE_data/old_format.dump
index 2c8944fa9d..0b30fdf2f1 100644
--- a/lib/observer/test/crashdump_viewer_SUITE_data/old_format.dump
+++ b/lib/observer/test/crashdump_viewer_SUITE_data/old_format.dump
@@ -10,7 +10,7 @@ Compiled on Wed Dec  4 11:11:21 2002
 Process Information
 --------------------------------------------------
 <0.0.0> Waiting. Registered as: init
-Spawned as: otp_ring0:start/2
+Spawned as: erl_init:start/2
 Message buffer data: 4 words
 Link list: [<0.5.0>,<0.4.0>,<0.2.0>]
 Reductions 3125 stack+heap 610 old_heap_sz=233 
@@ -68,7 +68,7 @@ y(3)     [gen_event,<0.1.0>,<0.1.0>,{local,error_logger},[],[],[]]
 Spawned as: proc_lib:init_p/5
 Message buffer data: 4 words
 Link list: [<0.7.0>,<0.0.0>]
-Dictionary: [{'$initial_call',{gen,init_it,[gen_server,<0.1.0>,<0.1.0>,{local,application_controller},application_controller,{application,kernel,[{description,"ERTS  CXC 138 10"},{vsn,"2.6.3.15"},{id,[]},{modules,[application,application_controller,application_master,application_starter,auth,code,code_aux,code_server,code_server_int,dist_util,erl_boot_server,erl_distribution,erl_open_port,erl_prim_loader,erl_reply,erlang,error_handler,error_logger,file,global,global_group,global_search,group,heart,inet6_tcp,inet6_tcp_dist,inet6_udp,inet_config,inet_hosts,inet_gethost_native,inet_tcp_dist,otp_pre_init,init,kernel,kernel_config,net,net_adm,net_kernel,os,ram_file,rpc,user,user_drv,user_sup,disk_log,disk_log_1,disk_log_server,disk_log_sup,dist_ac,erl_atom_cache,erl_ddll,erl_epmd,erl_external,erts_debug,fixtable_server,gen_tcp,gen_udp,prim_inet,inet,inet_db,inet_dns,inet_parse,inet_res,inet_tcp,inet_udp,pg2,seq_trace,socks5,socks5_auth,socks5_tcp,socks5_udp,wrap_log_reader,otp_ring0]},{registered,[application_controller,erl_reply,auth,boot_server,code_server,disk_log_server,disk_log_sup,erl_prim_loader,error_logger,file_server,fixtable_server,global_group,global_name_server,heart,init,kernel_config,kernel_sup,net_kernel,net_sup,rex,user,os_server,ddll_server,erl_epmd,inet_db,pg2]},{applications,[]},{included_applications,[]},{env,[{error_logger,tty}]},{start_phases,undefined},{maxT,infinity},{maxP,infinity},{mod,{kernel,[]}}]},[]]}},{'$ancestors',[<0.1.0>]}]
+Dictionary: [{'$initial_call',{gen,init_it,[gen_server,<0.1.0>,<0.1.0>,{local,application_controller},application_controller,{application,kernel,[{description,"ERTS  CXC 138 10"},{vsn,"2.6.3.15"},{id,[]},{modules,[application,application_controller,application_master,application_starter,auth,code,code_aux,code_server,code_server_int,dist_util,erl_boot_server,erl_distribution,erl_open_port,erl_prim_loader,erl_reply,erlang,error_handler,error_logger,file,global,global_group,global_search,group,heart,inet6_tcp,inet6_tcp_dist,inet6_udp,inet_config,inet_hosts,inet_gethost_native,inet_tcp_dist,otp_pre_init,init,kernel,kernel_config,net,net_adm,net_kernel,os,ram_file,rpc,user,user_drv,user_sup,disk_log,disk_log_1,disk_log_server,disk_log_sup,dist_ac,erl_atom_cache,erl_ddll,erl_epmd,erl_external,erts_debug,fixtable_server,gen_tcp,gen_udp,prim_inet,inet,inet_db,inet_dns,inet_parse,inet_res,inet_tcp,inet_udp,pg2,seq_trace,socks5,socks5_auth,socks5_tcp,socks5_udp,wrap_log_reader,erl_init]},{registered,[application_controller,erl_reply,auth,boot_server,code_server,disk_log_server,disk_log_sup,erl_prim_loader,error_logger,file_server,fixtable_server,global_group,global_name_server,heart,init,kernel_config,kernel_sup,net_kernel,net_sup,rex,user,os_server,ddll_server,erl_epmd,inet_db,pg2]},{applications,[]},{included_applications,[]},{env,[{error_logger,tty}]},{start_phases,undefined},{maxT,infinity},{maxP,infinity},{mod,{kernel,[]}}]},[]]}},{'$ancestors',[<0.1.0>]}]
 Reductions 527 stack+heap 1597 old_heap_sz=0 
 Heap unused=833 OldHeap unused=0
 Stack dump:
@@ -88,13 +88,13 @@ y(5)     <0.1.0>
 y(0)     Catch 0x33480C (proc_lib:init_p/5 + 164)
 y(1)     gen
 y(2)     init_it
-y(3)     [gen_server,<0.1.0>,<0.1.0>,{local,application_controller},application_controller,{application,kernel,[{description,"ERTS  CXC 138 10"},{vsn,"2.6.3.15"},{id,[]},{modules,[application,application_controller,application_master,application_starter,auth,code,code_aux,code_server,code_server_int,dist_util,erl_boot_server,erl_distribution,erl_open_port,erl_prim_loader,erl_reply,erlang,error_handler,error_logger,file,global,global_group,global_search,group,heart,inet6_tcp,inet6_tcp_dist,inet6_udp,inet_config,inet_hosts,inet_gethost_native,inet_tcp_dist,otp_pre_init,init,kernel,kernel_config,net,net_adm,net_kernel,os,ram_file,rpc,user,user_drv,user_sup,disk_log,disk_log_1,disk_log_server,disk_log_sup,dist_ac,erl_atom_cache,erl_ddll,erl_epmd,erl_external,erts_debug,fixtable_server,gen_tcp,gen_udp,prim_inet,inet,inet_db,inet_dns,inet_parse,inet_res,inet_tcp,inet_udp,pg2,seq_trace,socks5,socks5_auth,socks5_tcp,socks5_udp,wrap_log_reader,otp_ring0]},{registered,[application_controller,erl_reply,auth,boot_server,code_server,disk_log_server,disk_log_sup,erl_prim_loader,error_logger,file_server,fixtable_server,global_group,global_name_server,heart,init,kernel_config,kernel_sup,net_kernel,net_sup,rex,user,os_server,ddll_server,erl_epmd,inet_db,pg2]},{applications,[]},{included_applications,[]},{env,[{error_logger,tty}]},{start_phases,undefined},{maxT,infinity},{maxP,infinity},{mod,{kernel,[]}}]},[]]
+y(3)     [gen_server,<0.1.0>,<0.1.0>,{local,application_controller},application_controller,{application,kernel,[{description,"ERTS  CXC 138 10"},{vsn,"2.6.3.15"},{id,[]},{modules,[application,application_controller,application_master,application_starter,auth,code,code_aux,code_server,code_server_int,dist_util,erl_boot_server,erl_distribution,erl_open_port,erl_prim_loader,erl_reply,erlang,error_handler,error_logger,file,global,global_group,global_search,group,heart,inet6_tcp,inet6_tcp_dist,inet6_udp,inet_config,inet_hosts,inet_gethost_native,inet_tcp_dist,otp_pre_init,init,kernel,kernel_config,net,net_adm,net_kernel,os,ram_file,rpc,user,user_drv,user_sup,disk_log,disk_log_1,disk_log_server,disk_log_sup,dist_ac,erl_atom_cache,erl_ddll,erl_epmd,erl_external,erts_debug,fixtable_server,gen_tcp,gen_udp,prim_inet,inet,inet_db,inet_dns,inet_parse,inet_res,inet_tcp,inet_udp,pg2,seq_trace,socks5,socks5_auth,socks5_tcp,socks5_udp,wrap_log_reader,erl_init]},{registered,[application_controller,erl_reply,auth,boot_server,code_server,disk_log_server,disk_log_sup,erl_prim_loader,error_logger,file_server,fixtable_server,global_group,global_name_server,heart,init,kernel_config,kernel_sup,net_kernel,net_sup,rex,user,os_server,ddll_server,erl_epmd,inet_db,pg2]},{applications,[]},{included_applications,[]},{env,[{error_logger,tty}]},{start_phases,undefined},{maxT,infinity},{maxP,infinity},{mod,{kernel,[]}}]},[]]
 --------------------------------------------------
 <0.7.0> Waiting.
 Spawned as: proc_lib:init_p/5
 Message buffer data: 0 words
 Link list: [<0.8.0>,<0.5.0>]
-Dictionary: [{'$initial_call',{application_master,init,[<0.5.0>,<0.6.0>,{appl_data,kernel,[application_controller,erl_reply,auth,boot_server,code_server,disk_log_server,disk_log_sup,erl_prim_loader,error_logger,file_server,fixtable_server,global_group,global_name_server,heart,init,kernel_config,kernel_sup,net_kernel,net_sup,rex,user,os_server,ddll_server,erl_epmd,inet_db,pg2],undefined,{kernel,[]},[application,application_controller,application_master,application_starter,auth,code,code_aux,code_server,code_server_int,dist_util,erl_boot_server,erl_distribution,erl_open_port,erl_prim_loader,erl_reply,erlang,error_handler,error_logger,file,global,global_group,global_search,group,heart,inet6_tcp,inet6_tcp_dist,inet6_udp,inet_config,inet_hosts,inet_gethost_native,inet_tcp_dist,otp_pre_init,init,kernel,kernel_config,net,net_adm,net_kernel,os,ram_file,rpc,user,user_drv,user_sup,disk_log,disk_log_1,disk_log_server,disk_log_sup,dist_ac,erl_atom_cache,erl_ddll,erl_epmd,erl_external,erts_debug,fixtable_server,gen_tcp,gen_udp,prim_inet,inet,inet_db,inet_dns,inet_parse,inet_res,inet_tcp,inet_udp,pg2,seq_trace,socks5,socks5_auth,socks5_tcp,socks5_udp,wrap_log_reader,otp_ring0],[],infinity,infinity},normal]}},{'$ancestors',[<0.6.0>]}]
+Dictionary: [{'$initial_call',{application_master,init,[<0.5.0>,<0.6.0>,{appl_data,kernel,[application_controller,erl_reply,auth,boot_server,code_server,disk_log_server,disk_log_sup,erl_prim_loader,error_logger,file_server,fixtable_server,global_group,global_name_server,heart,init,kernel_config,kernel_sup,net_kernel,net_sup,rex,user,os_server,ddll_server,erl_epmd,inet_db,pg2],undefined,{kernel,[]},[application,application_controller,application_master,application_starter,auth,code,code_aux,code_server,code_server_int,dist_util,erl_boot_server,erl_distribution,erl_open_port,erl_prim_loader,erl_reply,erlang,error_handler,error_logger,file,global,global_group,global_search,group,heart,inet6_tcp,inet6_tcp_dist,inet6_udp,inet_config,inet_hosts,inet_gethost_native,inet_tcp_dist,otp_pre_init,init,kernel,kernel_config,net,net_adm,net_kernel,os,ram_file,rpc,user,user_drv,user_sup,disk_log,disk_log_1,disk_log_server,disk_log_sup,dist_ac,erl_atom_cache,erl_ddll,erl_epmd,erl_external,erts_debug,fixtable_server,gen_tcp,gen_udp,prim_inet,inet,inet_db,inet_dns,inet_parse,inet_res,inet_tcp,inet_udp,pg2,seq_trace,socks5,socks5_auth,socks5_tcp,socks5_udp,wrap_log_reader,erl_init],[],infinity,infinity},normal]}},{'$ancestors',[<0.6.0>]}]
 Reductions 45 stack+heap 377 old_heap_sz=377 
 Heap unused=306 OldHeap unused=377
 Stack dump:
@@ -103,14 +103,14 @@ cp = 0x33480c (proc_lib:init_p/5 + 164)
 arity = 0
 
 347174   Return addr 0x33480C (proc_lib:init_p/5 + 164)
-y(0)     {state,<0.8.0>,{appl_data,kernel,[application_controller,erl_reply,auth,boot_server,code_server,disk_log_server,disk_log_sup,erl_prim_loader,error_logger,file_server,fixtable_server,global_group,global_name_server,heart,init,kernel_config,kernel_sup,net_kernel,net_sup,rex,user,os_server,ddll_server,erl_epmd,inet_db,pg2],undefined,{kernel,[]},[application,application_controller,application_master,application_starter,auth,code,code_aux,code_server,code_server_int,dist_util,erl_boot_server,erl_distribution,erl_open_port,erl_prim_loader,erl_reply,erlang,error_handler,error_logger,file,global,global_group,global_search,group,heart,inet6_tcp,inet6_tcp_dist,inet6_udp,inet_config,inet_hosts,inet_gethost_native,inet_tcp_dist,otp_pre_init,init,kernel,kernel_config,net,net_adm,net_kernel,os,ram_file,rpc,user,user_drv,user_sup,disk_log,disk_log_1,disk_log_server,disk_log_sup,dist_ac,erl_atom_cache,erl_ddll,erl_epmd,erl_external,erts_debug,fixtable_server,gen_tcp,gen_udp,prim_inet,inet,inet_db,inet_dns,inet_parse,inet_res,inet_tcp,inet_udp,pg2,seq_trace,socks5,socks5_auth,socks5_tcp,socks5_udp,wrap_log_reader,otp_ring0],[],infinity,infinity},[],0,<0.0.0>}
+y(0)     {state,<0.8.0>,{appl_data,kernel,[application_controller,erl_reply,auth,boot_server,code_server,disk_log_server,disk_log_sup,erl_prim_loader,error_logger,file_server,fixtable_server,global_group,global_name_server,heart,init,kernel_config,kernel_sup,net_kernel,net_sup,rex,user,os_server,ddll_server,erl_epmd,inet_db,pg2],undefined,{kernel,[]},[application,application_controller,application_master,application_starter,auth,code,code_aux,code_server,code_server_int,dist_util,erl_boot_server,erl_distribution,erl_open_port,erl_prim_loader,erl_reply,erlang,error_handler,error_logger,file,global,global_group,global_search,group,heart,inet6_tcp,inet6_tcp_dist,inet6_udp,inet_config,inet_hosts,inet_gethost_native,inet_tcp_dist,otp_pre_init,init,kernel,kernel_config,net,net_adm,net_kernel,os,ram_file,rpc,user,user_drv,user_sup,disk_log,disk_log_1,disk_log_server,disk_log_sup,dist_ac,erl_atom_cache,erl_ddll,erl_epmd,erl_external,erts_debug,fixtable_server,gen_tcp,gen_udp,prim_inet,inet,inet_db,inet_dns,inet_parse,inet_res,inet_tcp,inet_udp,pg2,seq_trace,socks5,socks5_auth,socks5_tcp,socks5_udp,wrap_log_reader,erl_init],[],infinity,infinity},[],0,<0.0.0>}
 y(1)     <0.5.0>
 
 347180   Return addr 0xFCEC8 (<terminate process normally>)
 y(0)     Catch 0x33480C (proc_lib:init_p/5 + 164)
 y(1)     application_master
 y(2)     init
-y(3)     [<0.5.0>,<0.6.0>,{appl_data,kernel,[application_controller,erl_reply,auth,boot_server,code_server,disk_log_server,disk_log_sup,erl_prim_loader,error_logger,file_server,fixtable_server,global_group,global_name_server,heart,init,kernel_config,kernel_sup,net_kernel,net_sup,rex,user,os_server,ddll_server,erl_epmd,inet_db,pg2],undefined,{kernel,[]},[application,application_controller,application_master,application_starter,auth,code,code_aux,code_server,code_server_int,dist_util,erl_boot_server,erl_distribution,erl_open_port,erl_prim_loader,erl_reply,erlang,error_handler,error_logger,file,global,global_group,global_search,group,heart,inet6_tcp,inet6_tcp_dist,inet6_udp,inet_config,inet_hosts,inet_gethost_native,inet_tcp_dist,otp_pre_init,init,kernel,kernel_config,net,net_adm,net_kernel,os,ram_file,rpc,user,user_drv,user_sup,disk_log,disk_log_1,disk_log_server,disk_log_sup,dist_ac,erl_atom_cache,erl_ddll,erl_epmd,erl_external,erts_debug,fixtable_server,gen_tcp,gen_udp,prim_inet,inet,inet_db,inet_dns,inet_parse,inet_res,inet_tcp,inet_udp,pg2,seq_trace,socks5,socks5_auth,socks5_tcp,socks5_udp,wrap_log_reader,otp_ring0],[],infinity,infinity},normal]
+y(3)     [<0.5.0>,<0.6.0>,{appl_data,kernel,[application_controller,erl_reply,auth,boot_server,code_server,disk_log_server,disk_log_sup,erl_prim_loader,error_logger,file_server,fixtable_server,global_group,global_name_server,heart,init,kernel_config,kernel_sup,net_kernel,net_sup,rex,user,os_server,ddll_server,erl_epmd,inet_db,pg2],undefined,{kernel,[]},[application,application_controller,application_master,application_starter,auth,code,code_aux,code_server,code_server_int,dist_util,erl_boot_server,erl_distribution,erl_open_port,erl_prim_loader,erl_reply,erlang,error_handler,error_logger,file,global,global_group,global_search,group,heart,inet6_tcp,inet6_tcp_dist,inet6_udp,inet_config,inet_hosts,inet_gethost_native,inet_tcp_dist,otp_pre_init,init,kernel,kernel_config,net,net_adm,net_kernel,os,ram_file,rpc,user,user_drv,user_sup,disk_log,disk_log_1,disk_log_server,disk_log_sup,dist_ac,erl_atom_cache,erl_ddll,erl_epmd,erl_external,erts_debug,fixtable_server,gen_tcp,gen_udp,prim_inet,inet,inet_db,inet_dns,inet_parse,inet_res,inet_tcp,inet_udp,pg2,seq_trace,socks5,socks5_auth,socks5_tcp,socks5_udp,wrap_log_reader,erl_init],[],infinity,infinity},normal]
 --------------------------------------------------
 <0.8.0> Waiting.
 Spawned as: application_master:start_it/4
@@ -652,7 +652,7 @@ Not alive
 
 Loaded Modules Information
 --------------------------------------------------
-otp_ring0 448
+erl_init 448
 init 28000
 prim_inet 34800
 erl_prim_loader 14187
@@ -1202,7 +1202,7 @@ udp_error
 inet_async
 inet_reply
 empty_out_q
-otp_ring0
+erl_init
 boot
 init
 run
@@ -1285,7 +1285,7 @@ sleep
 start_prim_loader
 erl_prim_loader
 set_path
-'can not start loader'
+'cannot start loader'
 add_to_kernel
 prim_load_flags
 '-loader'
@@ -1304,7 +1304,7 @@ path_flags
 '-pz'
 get_boot
 not_found
-'can not get bootfile'
+'cannot get bootfile'
 'bootfile format error'
 get_file
 script
@@ -1349,7 +1349,7 @@ extension
 '-boot/1-fun-0-'
 '-bs2ss/1-fun-0-'
 '-bs2as/1-fun-0-'
-'can not load'
+'cannot load'
 'unexpected command in bootfile'
 prim_inet
 open
@@ -3071,7 +3071,7 @@ change_group
 change_time
 master
 start_slave
-'can not get remote filer '
+'cannot get remote filer '
 start_relay
 relay
 'Port controlling ~w terminated in file_server'
diff --git a/lib/observer/test/observer_SUITE.erl b/lib/observer/test/observer_SUITE.erl
index 40f5d44847..7d54bb9b3b 100644
--- a/lib/observer/test/observer_SUITE.erl
+++ b/lib/observer/test/observer_SUITE.erl
@@ -41,7 +41,8 @@
 %% Default timetrap timeout (set in init_per_testcase)
 -define(default_timeout, ?t:minutes(2)).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() -> [{timetrap, {minutes, 5}},
+            {ct_hooks,[ts_install_cth]}].
 
 all() ->
     [app_file, appup_file, {group, gui}].
@@ -301,7 +302,7 @@ table_win(Config) when is_list(Config) ->
     Notebook = setup_whitebox_testing(),
     Parent = get_top_level_parent(Notebook),
     TObj = observer_tv_table:start_link(Parent, [{node,node()}, {type,ets}, {table,#tab{name=foo, id=Table}}]),
-    %% Modal can not test edit..
+    %% Modal cannot test edit..
     %% TPid = wx_object:get_pid(TObj),
     %% TPid ! #wx{event=#wxList{type=command_list_item_activated, itemIndex=12}},
     timer:sleep(3000),
diff --git a/lib/observer/vsn.mk b/lib/observer/vsn.mk
index 5ce0aca589..c16c43f942 100644
--- a/lib/observer/vsn.mk
+++ b/lib/observer/vsn.mk
@@ -1 +1 @@
-OBSERVER_VSN = 2.8.2
+OBSERVER_VSN = 2.9.1
diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in
index 784e73c47e..294d832797 100644
--- a/lib/odbc/c_src/Makefile.in
+++ b/lib/odbc/c_src/Makefile.in
@@ -52,7 +52,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/odbc-$(VSN)
 # Target Specs
 # ----------------------------------------------------
 EI_ROOT = $(ERL_TOP)/lib/erl_interface
-EI_INCLUDE = -I$(EI_ROOT)/include
+EI_INCLUDE = -I$(EI_ROOT)/include -I$(EI_ROOT)/include/$(TARGET)
 ifeq ($(findstring win32,$(TARGET)),win32)
 EI_LIB = -lerl_interface_md -lei_md 
 ENTRY_OBJ=$(ERL_TOP)/erts/obj/$(TARGET)/port_entry.o
diff --git a/lib/odbc/c_src/odbcserver.c b/lib/odbc/c_src/odbcserver.c
index 8c799f6ff1..fb4f61417e 100644
--- a/lib/odbc/c_src/odbcserver.c
+++ b/lib/odbc/c_src/odbcserver.c
@@ -2749,6 +2749,11 @@ static diagnos get_diagnos(SQLSMALLINT handleType, SQLHANDLE handle, Boolean ext
 	    errmsg_buffer_size = errmsg_buffer_size - errmsg_size;
 	    acc_errmsg_size = acc_errmsg_size + errmsg_size;
 	    current_errmsg_pos = current_errmsg_pos + errmsg_size;
+	} else if(result == SQL_SUCCESS_WITH_INFO && errmsg_size >= errmsg_buffer_size) {
+	    memcpy(diagnos.sqlState, current_sql_state, SQL_STATE_SIZE);
+	    diagnos.nativeError = nativeError;
+	    acc_errmsg_size = errmsg_buffer_size;
+	    break;
 	} else {
 	    break;
 	}
diff --git a/lib/odbc/configure.in b/lib/odbc/configure.in
index 2dec6e5abf..c5cf2786ca 100644
--- a/lib/odbc/configure.in
+++ b/lib/odbc/configure.in
@@ -21,12 +21,6 @@ dnl
 dnl define([AC_CACHE_LOAD], )dnl
 dnl define([AC_CACHE_SAVE], )dnl
 
-if test "x$no_recursion" != "xyes" -a "x$OVERRIDE_CONFIG_CACHE" = "x"; then
-    # We do not want to use a common cache!
-    cache_file=/dev/null
-fi
-
-
 
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(c_src/odbcserver.c)
diff --git a/lib/odbc/doc/src/databases.xml b/lib/odbc/doc/src/databases.xml
index a060f87e46..614c327a46 100644
--- a/lib/odbc/doc/src/databases.xml
+++ b/lib/odbc/doc/src/databases.xml
@@ -65,7 +65,7 @@
     <p>Another obstacle is that some drivers do not support scrollable
       cursors which has the effect that the only way to traverse the
       result set is sequentially, with next, from the first row to the
-      last, and once you pass a row you can not go back. This means
+      last, and once you pass a row you cannot go back. This means
       that some functions in the interface will not work together with
       certain drivers. A similar problem is that not all drivers
       support "row count" for select queries, hence resulting in that
diff --git a/lib/odbc/doc/src/error_handling.xml b/lib/odbc/doc/src/error_handling.xml
index 4c80cff12f..8d794d2c99 100644
--- a/lib/odbc/doc/src/error_handling.xml
+++ b/lib/odbc/doc/src/error_handling.xml
@@ -138,7 +138,7 @@
          should be run through the erlang port was not compiled for
          your platform.</item>
         <item>Errors discovered by the ODBC driver - If calls to the
-         ODBC-driver fails due to circumstances that can not be
+         ODBC-driver fails due to circumstances that cannot be
          controlled by the Erlang ODBC application programmer, an
          error string will be dug up from the driver.  This string
          will be the <c>Reason</c> in the <c>{error, Reason} </c>
diff --git a/lib/odbc/doc/src/getting_started.xml b/lib/odbc/doc/src/getting_started.xml
index f2ff8b8993..b27754ff22 100644
--- a/lib/odbc/doc/src/getting_started.xml
+++ b/lib/odbc/doc/src/getting_started.xml
@@ -50,7 +50,7 @@
        and paths to appropriate values. This may differ a lot
        between different os's, databases and ODBC drivers. This
        is a configuration problem related to the third party product
-       and hence we can not give you a standard solution in this guide.</item>
+       and hence we cannot give you a standard solution in this guide.</item>
       <item>The Erlang ODBC application consists of both <c>Erlang</c>
        and <c>C</c> code. The <c>C</c> code is delivered as a
        precompiled executable for windows, solaris and linux (SLES10) in the commercial
diff --git a/lib/odbc/doc/src/notes.xml b/lib/odbc/doc/src/notes.xml
index dba7663bb9..8d708162e4 100644
--- a/lib/odbc/doc/src/notes.xml
+++ b/lib/odbc/doc/src/notes.xml
@@ -32,7 +32,38 @@
   <p>This document describes the changes made to the odbc application.
   </p>
 
-  <section><title>ODBC 2.12.2</title>
+  <section><title>ODBC 2.12.4</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Minor adjustments made to build system for parallel
+	    configure.</p>
+          <p>
+	    Own Id: OTP-15340 Aux Id: OTP-14625 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>ODBC 2.12.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Enhance error handling to avoid stack corruption</p>
+          <p>
+	    Own Id: OTP-15667 Aux Id: ERL-808, PR-2065 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>ODBC 2.12.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/odbc/doc/src/notes_history.xml b/lib/odbc/doc/src/notes_history.xml
index 22a92f67cd..d0c0a472e7 100644
--- a/lib/odbc/doc/src/notes_history.xml
+++ b/lib/odbc/doc/src/notes_history.xml
@@ -63,7 +63,7 @@
       <list type="bulleted">
         <item>
           <p>The erlang odbc process will now die normally if a
-            connection can not be established. No connection no
+            connection cannot be established. No connection no
             process it is expected. And as the client has already
             received the error message that would be the reason with
             which the erlang process would be stopped, the supervisor
@@ -193,7 +193,7 @@
         </item>
         <item>
           <p>The erlang odbc process will now die normally if a
-            connection can not be established. No connection no
+            connection cannot be established. No connection no
             process it is expected. And as the client has already
             received the error message that would be the reason with
             which the erlang process would be stopped, the supervisor
diff --git a/lib/odbc/doc/src/odbc.xml b/lib/odbc/doc/src/odbc.xml
index 4bb1f035f9..1a3063e6ce 100644
--- a/lib/odbc/doc/src/odbc.xml
+++ b/lib/odbc/doc/src/odbc.xml
@@ -29,7 +29,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>odbc</module>
+  <module since="">odbc</module>
   <modulesummary>Erlang ODBC application</modulesummary>
   <description>
     <p>This application provides an Erlang interface to communicate
@@ -130,8 +130,8 @@
   </section>
   <funcs>
     <func>
-      <name>commit(Ref, CommitMode) -></name>
-      <name>commit(Ref, CommitMode, TimeOut) -> ok | {error, Reason} </name>
+      <name since="">commit(Ref, CommitMode) -></name>
+      <name since="">commit(Ref, CommitMode, TimeOut) -> ok | {error, Reason} </name>
       <fsummary>Commits or rollbacks a transaction. </fsummary>
       <type>
         <v>Ref = connection_reference() </v>
@@ -145,7 +145,7 @@
       </desc>
     </func>
     <func>
-      <name>connect(ConnectStr, Options) -> {ok, Ref} | {error, Reason} </name>
+      <name since="">connect(ConnectStr, Options) -> {ok, Ref} | {error, Reason} </name>
       <fsummary>Opens a connection to the database. </fsummary>
       <type>
         <v>ConnectStr = string()</v>
@@ -236,7 +236,7 @@
       </desc>
     </func>
     <func>
-      <name>disconnect(Ref) -> ok | {error, Reason} </name>
+      <name since="">disconnect(Ref) -> ok | {error, Reason} </name>
       <fsummary>Closes a connection to a database. </fsummary>
       <type>
         <v>Ref = connection_reference()</v>
@@ -246,7 +246,7 @@
         <p>Closes a connection to a database. This will also
           terminate all processes that may have been spawned 
           when the connection was opened. This call will always succeed.
-          If the connection can not be disconnected gracefully it will
+          If the connection cannot be disconnected gracefully it will
           be brutally killed. However you may receive an error message
           as result if you try to disconnect a connection started by another
           process.
@@ -255,8 +255,8 @@
       </desc>
     </func>
     <func>
-      <name>describe_table(Ref, Table) -> </name>
-      <name>describe_table(Ref, Table, Timeout) -> {ok, Description} | {error, Reason} </name>
+      <name since="">describe_table(Ref, Table) -> </name>
+      <name since="">describe_table(Ref, Table, Timeout) -> {ok, Description} | {error, Reason} </name>
       <fsummary>Queries the database to find out the data types of the columns of the table <c>Table</c>. </fsummary>
       <type>
         <v>Ref = connection_reference()</v>
@@ -271,8 +271,8 @@
       </desc>
     </func>
     <func>
-      <name>first(Ref) -></name>
-      <name>first(Ref, Timeout) -> {selected, ColNames, Rows} | {error, Reason} </name>
+      <name since="">first(Ref) -></name>
+      <name since="">first(Ref, Timeout) -> {selected, ColNames, Rows} | {error, Reason} </name>
       <fsummary>Returns the first row of the result set and positions a cursor at this row.</fsummary>
       <type>
         <v>Ref = connection_reference()</v>
@@ -287,8 +287,8 @@
       </desc>
     </func>
     <func>
-      <name>last(Ref) -></name>
-      <name>last(Ref, TimeOut) -> {selected, ColNames, Rows} | {error, Reason} </name>
+      <name since="">last(Ref) -></name>
+      <name since="">last(Ref, TimeOut) -> {selected, ColNames, Rows} | {error, Reason} </name>
       <fsummary>Returns the last row of the result set and positions a cursor at this row. </fsummary>
       <type>
         <v>Ref = connection_reference()</v>
@@ -303,8 +303,8 @@
       </desc>
     </func>
     <func>
-      <name>next(Ref) -> </name>
-      <name>next(Ref, TimeOut) -> {selected, ColNames, Rows} | {error, Reason} </name>
+      <name since="">next(Ref) -> </name>
+      <name since="">next(Ref, TimeOut) -> {selected, ColNames, Rows} | {error, Reason} </name>
       <fsummary>Returns the next row of the result set relative the current cursor position and positions the cursor at this row. </fsummary>
       <type>
         <v>Ref = connection_reference()</v>
@@ -325,8 +325,8 @@
       </desc>
     </func>
     <func>
-      <name>param_query(Ref, SQLQuery, Params) -> </name>
-      <name>param_query(Ref, SQLQuery, Params, TimeOut) -> ResultTuple | {error, Reason} </name>
+      <name since="">param_query(Ref, SQLQuery, Params) -> </name>
+      <name since="">param_query(Ref, SQLQuery, Params, TimeOut) -> ResultTuple | {error, Reason} </name>
       <fsummary>Executes a parameterized SQL query.</fsummary>
       <type>
         <v>Ref = connection_reference()</v>
@@ -353,8 +353,8 @@
       </desc>
     </func>
     <func>
-      <name>prev(Ref) -> </name>
-      <name>prev(ConnectionReference, TimeOut) -> {selected, ColNames, Rows} | {error, Reason} </name>
+      <name since="">prev(Ref) -> </name>
+      <name since="">prev(ConnectionReference, TimeOut) -> {selected, ColNames, Rows} | {error, Reason} </name>
       <fsummary>Returns the previous row of the result set relative the current cursor position and positions the cursor at this row. </fsummary>
       <type>
         <v>Ref = connection_reference()</v>
@@ -371,8 +371,8 @@
     </func>
 
     <func>
-      <name>start() -> </name>
-      <name>start(Type) -> ok | {error, Reason}</name>
+      <name since="">start() -> </name>
+      <name since="">start(Type) -> ok | {error, Reason}</name>
       <fsummary>Starts the odb application. </fsummary>
       
       <type>
@@ -389,7 +389,7 @@
     </func>
 
     <func>
-      <name>stop() -> ok </name>
+      <name since="">stop() -> ok </name>
       <fsummary> Stops the odbc application.</fsummary>
       
       <desc>
@@ -400,8 +400,8 @@
     </func>
     
     <func>
-      <name>sql_query(Ref, SQLQuery) -> </name>
-      <name>sql_query(Ref, SQLQuery, TimeOut) -> ResultTuple | [ResultTuple] |{error, Reason}</name>
+      <name since="">sql_query(Ref, SQLQuery) -> </name>
+      <name since="">sql_query(Ref, SQLQuery, TimeOut) -> ResultTuple | [ResultTuple] |{error, Reason}</name>
       <fsummary>Executes a SQL query or a batch of SQL queries. If it is a SELECT query the result set is returned, on the format<c>{selected, ColNames, Rows}</c>. For other query types the tuple <c>{updated, NRows}</c>is returned, and for batched queries, if the driver supports them, this function can also return a list of result tuples.</fsummary>
       <type>
         <v>Ref = connection_reference()</v>
@@ -429,8 +429,8 @@
       </desc>
     </func>
     <func>
-      <name>select_count(Ref, SelectQuery) -> </name>
-      <name>select_count(Ref, SelectQuery, TimeOut) -> {ok, NrRows} | {error, Reason} </name>
+      <name since="">select_count(Ref, SelectQuery) -> </name>
+      <name since="">select_count(Ref, SelectQuery, TimeOut) -> {ok, NrRows} | {error, Reason} </name>
       <fsummary>Executes a SQL SELECT query and associates the result set with the connection. A cursor is positioned before the first row in the result set and the tuple <c>{ok, NrRows}</c>is returned. </fsummary>
       <type>
         <v>Ref = connection_reference()</v>
@@ -453,8 +453,8 @@
       </desc>
     </func>
     <func>
-      <name>select(Ref, Position, N) -></name>
-      <name>select(Ref, Position, N, TimeOut) -> {selected, ColNames, Rows} | {error, Reason} </name>
+      <name since="">select(Ref, Position, N) -></name>
+      <name since="">select(Ref, Position, N, TimeOut) -> {selected, ColNames, Rows} | {error, Reason} </name>
       <fsummary>Selects <c>N</c>consecutive rows of the result set.</fsummary>
       <type>
         <v>Ref = connection_reference()</v>
diff --git a/lib/odbc/test/odbc_connect_SUITE.erl b/lib/odbc/test/odbc_connect_SUITE.erl
index 261dfc6f20..94ca62b3fb 100644
--- a/lib/odbc/test/odbc_connect_SUITE.erl
+++ b/lib/odbc/test/odbc_connect_SUITE.erl
@@ -259,7 +259,7 @@ not_exist_db(_Config)  ->
 
 %%-------------------------------------------------------------------------
 no_c_executable() ->
-    [{doc,"Test what happens if the port-program can not be found"}].
+    [{doc,"Test what happens if the port-program cannot be found"}].
 no_c_executable(_Config) ->
     process_flag(trap_exit, true),
     Dir = filename:nativename(filename:join(code:priv_dir(odbc), 
diff --git a/lib/odbc/vsn.mk b/lib/odbc/vsn.mk
index bb21016fad..df6db09f2f 100644
--- a/lib/odbc/vsn.mk
+++ b/lib/odbc/vsn.mk
@@ -1 +1 @@
-ODBC_VSN = 2.12.2
+ODBC_VSN = 2.12.4
diff --git a/lib/os_mon/Makefile b/lib/os_mon/Makefile
index 1eff8a785a..40ce94e0c7 100644
--- a/lib/os_mon/Makefile
+++ b/lib/os_mon/Makefile
@@ -23,11 +23,7 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 #
 # Macros
 #
-ifeq ($(findstring win32,$(TARGET)),win32)
-SUB_DIRECTORIES = src c_src mibs doc/src
-else
-SUB_DIRECTORIES = src c_src mibs doc/src
-endif
+SUB_DIRECTORIES = src c_src doc/src
 
 include vsn.mk
 VSN = $(OS_MON_VSN)
diff --git a/lib/os_mon/c_src/cpu_sup.c b/lib/os_mon/c_src/cpu_sup.c
index c96a5c9f7c..98a2526aab 100644
--- a/lib/os_mon/c_src/cpu_sup.c
+++ b/lib/os_mon/c_src/cpu_sup.c
@@ -359,7 +359,7 @@ static cpu_t *read_procstat(FILE *fp, cpu_t *cpu) {
 	memset(cpu, 0, sizeof(cpu_t));
 	return cpu;
     }
-    sscanf(buffer, "cpu%u %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu",
+    sscanf(buffer, "cpu%u %llu %llu %llu %llu %llu %llu %llu %llu",
 	&(cpu->id),
 	&(cpu->user),
 	&(cpu->nice_user),
diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile
index 354f8ed26b..8e9a4c333c 100644
--- a/lib/os_mon/doc/src/Makefile
+++ b/lib/os_mon/doc/src/Makefile
@@ -39,7 +39,6 @@ XML_APPLICATION_FILES = ref_man.xml
 XML_REF3_FILES = cpu_sup.xml \
 	disksup.xml \
 	memsup.xml \
-	os_mon_mib.xml \
 	os_sup.xml \
 	nteventlog.xml
 
diff --git a/lib/os_mon/doc/src/cpu_sup.xml b/lib/os_mon/doc/src/cpu_sup.xml
index bada165a06..b7adb2bcd2 100644
--- a/lib/os_mon/doc/src/cpu_sup.xml
+++ b/lib/os_mon/doc/src/cpu_sup.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>cpu_sup</module>
+  <module since="">cpu_sup</module>
   <modulesummary>A CPU Load and CPU Utilization Supervisor Process</modulesummary>
   <description>
     <p><c>cpu_sup</c> is a process which supervises the CPU load
@@ -76,7 +76,7 @@
   </description>
   <funcs>
     <func>
-      <name>nprocs() -> UnixProcesses | {error, Reason}</name>
+      <name since="">nprocs() -> UnixProcesses | {error, Reason}</name>
       <fsummary>Get the number of UNIX processes running on this host</fsummary>
       <type>
         <v>UnixProcesses = int()</v>
@@ -90,7 +90,7 @@
       </desc>
     </func>
     <func>
-      <name>avg1() -> SystemLoad | {error, Reason}</name>
+      <name since="">avg1() -> SystemLoad | {error, Reason}</name>
       <fsummary>Get the system load average for the last minute</fsummary>
       <type>
         <v>SystemLoad = int()</v>
@@ -104,7 +104,7 @@
       </desc>
     </func>
     <func>
-      <name>avg5() -> SystemLoad | {error, Reason}</name>
+      <name since="">avg5() -> SystemLoad | {error, Reason}</name>
       <fsummary>Get the system load average for the last five minutes</fsummary>
       <type>
         <v>SystemLoad = int()</v>
@@ -118,7 +118,7 @@
       </desc>
     </func>
     <func>
-      <name>avg15() -> SystemLoad | {error, Reason}</name>
+      <name since="">avg15() -> SystemLoad | {error, Reason}</name>
       <fsummary>Get the system load average for the last fifteen minutes</fsummary>
       <type>
         <v>SystemLoad = int()</v>
@@ -132,7 +132,7 @@
       </desc>
     </func>
     <func>
-      <name>util() -> CpuUtil | {error, Reason}</name>
+      <name since="">util() -> CpuUtil | {error, Reason}</name>
       <fsummary>Get the CPU utilization</fsummary>
       <type>
         <v>CpuUtil = float()</v>
@@ -156,7 +156,7 @@
       </desc>
     </func>
     <func>
-      <name>util(Opts) -> UtilSpec | {error, Reason}</name>
+      <name since="">util(Opts) -> UtilSpec | {error, Reason}</name>
       <fsummary>Get the CPU utilization</fsummary>
       <type>
         <v>Opts = [detailed | per_cpu]</v>
diff --git a/lib/os_mon/doc/src/disksup.xml b/lib/os_mon/doc/src/disksup.xml
index 610ef2c907..116a6dfd19 100644
--- a/lib/os_mon/doc/src/disksup.xml
+++ b/lib/os_mon/doc/src/disksup.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>disksup</module>
+  <module since="">disksup</module>
   <modulesummary>A Disk Supervisor Process</modulesummary>
   <description>
     <p><c>disksup</c> is a process which supervises the available disk
@@ -92,7 +92,7 @@
   </section>
   <funcs>
     <func>
-      <name>get_disk_data() -> [DiskData]</name>
+      <name since="">get_disk_data() -> [DiskData]</name>
       <fsummary>Get data for the disks in the system</fsummary>
       <type>
         <v>DiskData = {Id, KByte, Capacity}</v>
@@ -112,7 +112,7 @@
       </desc>
     </func>
     <func>
-      <name>get_check_interval() -> MS</name>
+      <name since="">get_check_interval() -> MS</name>
       <fsummary>Get time interval, in milliseconds, for the periodic disk space check</fsummary>
       <type>
         <v>MS = int()</v>
@@ -123,7 +123,7 @@
       </desc>
     </func>
     <func>
-      <name>set_check_interval(Minutes) -> ok</name>
+      <name since="">set_check_interval(Minutes) -> ok</name>
       <fsummary>Set time interval, in minutes, for the periodic disk space check</fsummary>
       <type>
         <v>Minutes = int()>=1</v>
@@ -138,7 +138,7 @@
       </desc>
     </func>
     <func>
-      <name>get_almost_full_threshold() -> Percent</name>
+      <name since="">get_almost_full_threshold() -> Percent</name>
       <fsummary>Get threshold, in percent, for disk space utilization</fsummary>
       <type>
         <v>Percent = int()</v>
@@ -148,7 +148,7 @@
       </desc>
     </func>
     <func>
-      <name>set_almost_full_threshold(Float) -> ok</name>
+      <name since="">set_almost_full_threshold(Float) -> ok</name>
       <fsummary>Set threshold, as percentage represented by a float, for disk space utilization</fsummary>
       <type>
         <v>Float = float(), 0=&lt;Float=&lt;1</v>
diff --git a/lib/os_mon/doc/src/memsup.xml b/lib/os_mon/doc/src/memsup.xml
index c669e4670a..51c78b07c2 100644
--- a/lib/os_mon/doc/src/memsup.xml
+++ b/lib/os_mon/doc/src/memsup.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>memsup</module>
+  <module since="">memsup</module>
   <modulesummary>A Memory Supervisor Process</modulesummary>
   <description>
     <p><c>memsup</c> is a process which supervises the memory usage for
@@ -127,7 +127,7 @@
   </section>
   <funcs>
     <func>
-      <name>get_memory_data() -> {Total,Allocated,Worst}</name>
+      <name since="">get_memory_data() -> {Total,Allocated,Worst}</name>
       <fsummary>Get data for the memory in the system</fsummary>
       <type>
         <v>Total = Allocated = int()</v>
@@ -155,7 +155,7 @@
       </desc>
     </func>
     <func>
-      <name>get_system_memory_data() -> MemDataList</name>
+      <name since="">get_system_memory_data() -> MemDataList</name>
       <fsummary>Get system dependent memory data</fsummary>
       <type>
         <v>MemDataList = [{Tag, Size}]</v>
@@ -216,7 +216,7 @@
       </desc>
     </func>
     <func>
-      <name>get_os_wordsize() -> Wordsize</name>
+      <name since="">get_os_wordsize() -> Wordsize</name>
       <fsummary>Get the wordsize of running os.</fsummary>
       <type>
         <v>Wordsize = 32 | 64 | unsupported_os</v>
@@ -226,7 +226,7 @@
       </desc>
     </func>
     <func>
-      <name>get_check_interval() -> MS</name>
+      <name since="">get_check_interval() -> MS</name>
       <fsummary>Get time interval, in milliseconds, for the periodic memory check</fsummary>
       <type>
         <v>MS = int()</v>
@@ -237,7 +237,7 @@
       </desc>
     </func>
     <func>
-      <name>set_check_interval(Minutes) -> ok</name>
+      <name since="">set_check_interval(Minutes) -> ok</name>
       <fsummary>Set time interval, in minutes, for the periodic memory check</fsummary>
       <type>
         <v>Minutes = int()>0</v>
@@ -252,7 +252,7 @@
       </desc>
     </func>
     <func>
-      <name>get_procmem_high_watermark() -> int()</name>
+      <name since="">get_procmem_high_watermark() -> int()</name>
       <fsummary>Get threshold, in percent, for process memory allocation</fsummary>
       <desc>
         <p>Returns the threshold, in percent, for process memory
@@ -260,7 +260,7 @@
       </desc>
     </func>
     <func>
-      <name>set_procmem_high_watermark(Float) -> ok</name>
+      <name since="">set_procmem_high_watermark(Float) -> ok</name>
       <fsummary>Set threshold, as percentage represented by a float, for process memory allocation</fsummary>
       <desc>
         <p>Changes the threshold, given as a float, for process memory
@@ -273,7 +273,7 @@
       </desc>
     </func>
     <func>
-      <name>get_sysmem_high_watermark() -> int()</name>
+      <name since="">get_sysmem_high_watermark() -> int()</name>
       <fsummary>Get threshold, in percent, for system memory allocation</fsummary>
       <desc>
         <p>Returns the threshold, in percent, for system memory
@@ -281,7 +281,7 @@
       </desc>
     </func>
     <func>
-      <name>set_sysmem_high_watermark(Float) -> ok</name>
+      <name since="">set_sysmem_high_watermark(Float) -> ok</name>
       <fsummary>Set threshold, given as a float, for system memory allocation</fsummary>
       <desc>
         <p>Changes the threshold, given as a float, for system memory
@@ -294,7 +294,7 @@
       </desc>
     </func>
     <func>
-      <name>get_helper_timeout() -> Seconds</name>
+      <name since="">get_helper_timeout() -> Seconds</name>
       <fsummary>Get the timeout value, in seconds, for memory checks</fsummary>
       <type>
         <v>Seconds = int()</v>
@@ -304,7 +304,7 @@
       </desc>
     </func>
     <func>
-      <name>set_helper_timeout(Seconds) -> ok</name>
+      <name since="">set_helper_timeout(Seconds) -> ok</name>
       <fsummary>Set the timeout value, in seconds, for memory checks</fsummary>
       <type>
         <v>Seconds = int() (>= 1)</v>
diff --git a/lib/os_mon/doc/src/notes.xml b/lib/os_mon/doc/src/notes.xml
index 64e9f281e3..1f169263e9 100644
--- a/lib/os_mon/doc/src/notes.xml
+++ b/lib/os_mon/doc/src/notes.xml
@@ -31,6 +31,35 @@
   </header>
   <p>This document describes the changes made to the OS_Mon application.</p>
 
+<section><title>Os_Mon 2.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix typespec of <c>cpu_sup:util()</c>.</p>
+          <p>
+	    Own Id: OTP-15770 Aux Id: PR-2208 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The application otp_mibs has been removed from OTP. Some
+	    of its components (mibs) have been moved to other apps
+	    (snmp), or removed completely (os_mon).</p>
+          <p>
+	    Own Id: OTP-14984 Aux Id: OTP-15329 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Os_Mon 2.4.7</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/os_mon/doc/src/nteventlog.xml b/lib/os_mon/doc/src/nteventlog.xml
index d32427227c..08cf165a24 100644
--- a/lib/os_mon/doc/src/nteventlog.xml
+++ b/lib/os_mon/doc/src/nteventlog.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>nteventlog</module>
+  <module since="">nteventlog</module>
   <modulesummary>Interface to Windows Event Log</modulesummary>
   <description>
     <p><c>nteventlog</c> provides a generic interface to the Windows
@@ -61,8 +61,8 @@
   </description>
   <funcs>
     <func>
-      <name>start(Identifier, MFA) -> Result</name>
-      <name>start_link(Identifier, MFA) -> Result</name>
+      <name since="">start(Identifier, MFA) -> Result</name>
+      <name since="">start_link(Identifier, MFA) -> Result</name>
       <fsummary>Start the NT eventlog server</fsummary>
       <type>
         <v>Identifier = string() | atom()</v>
@@ -82,7 +82,7 @@
       </desc>
     </func>
     <func>
-      <name>stop() -> stopped</name>
+      <name since="">stop() -> stopped</name>
       <fsummary>Stop the NT eventlog server</fsummary>
       <type>
         <v>Result = stopped</v>
diff --git a/lib/os_mon/doc/src/os_mon_app.xml b/lib/os_mon/doc/src/os_mon_app.xml
index 99492a2021..c77a9d0411 100644
--- a/lib/os_mon/doc/src/os_mon_app.xml
+++ b/lib/os_mon/doc/src/os_mon_app.xml
@@ -88,33 +88,6 @@
   </section>
 
   <section>
-    <title>SNMP MIBs</title>
-    <p>The following MIBs are defined in OS_Mon:</p>
-    <taglist>
-      <tag>OTP-OS-MON-MIB</tag>
-      <item>
-        <p>This MIB contains objects for instrumentation of disk,
-          memory and CPU usage of the nodes in the system.</p>
-      </item>
-    </taglist>
-    <p>The MIB is stored in the <c>mibs</c> directory.  It is defined
-      in SNMPv2 SMI syntax. An SNMPv1 version of the MIB is delivered
-      in the <c>mibs/v1</c> directory.</p>
-    <p>The compiled MIB is located under <c>priv/mibs</c>, and
-      the generated <c>.hrl</c> file under the <c>include</c> directory.
-      To compile a MIB that IMPORTS the <c>OTP-OS-MON-MIB</c>, give
-      the option <c>{il, ["os_mon/priv/mibs"]}</c> to the MIB compiler.</p>
-    <p>If the MIB should be used in a system, it should be loaded into
-      an agent with a call to <c>os_mon_mib:load(Agent)</c>, where
-      <c>Agent</c> is the pid or registered name of an SNMP agent. Use
-      <c>os_mon_mib:unload(Agent)</c> to unload the MIB.
-      The implementation of this MIB uses Mnesia to store a cache with
-      data needed, which implicates that Mnesia must be up and running.
-      The MIB also use functions defined for the <c>OTP-MIB</c>, thus
-      that MIB must be loaded as well.</p>
-  </section>
-
-  <section>
     <title>See Also</title>
     <p><seealso marker="cpu_sup">cpu_sup(3)</seealso>,
       <seealso marker="disksup">disksup(3)</seealso>,
diff --git a/lib/os_mon/doc/src/os_mon_mib.xml b/lib/os_mon/doc/src/os_mon_mib.xml
deleted file mode 100644
index e995bf3de1..0000000000
--- a/lib/os_mon/doc/src/os_mon_mib.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2004</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>os_mon_mib</title>
-    <prepared>Ingela Andin</prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <module>os_mon_mib</module>
-  <modulesummary>Loading and Unloading of OTP-OS-MON-MIB</modulesummary>
-  <description>
-    <p>Functions for loading and unloading the OTP-OS-MON-MIB into/from
-      an SNMP agent. The instrumentation of the OTP-OS-MON-MIB uses
-      Mnesia, hence Mnesia must be started prior to loading
-    the OTP-OS-MON-MIB.</p>
-    <warning>
-      <p>This module has been deprecated and will be removed in a furture release.</p>
-    </warning>
-  </description>
-  <funcs>
-    <func>
-      <name>load(Agent) -> ok | {error, Reason}</name>
-      <fsummary>Load the OTP-OS-MON-MIB</fsummary>
-      <type>
-        <v>Agent = pid() | atom()</v>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p>Loads the OTP-OS-MON-MIB.</p>
-      </desc>
-    </func>
-    <func>
-      <name>unload(Agent) -> ok | {error, Reason}</name>
-      <fsummary>Unload the OTP-OS-MON-MIB</fsummary>
-      <type>
-        <v>Agent = pid() | atom() </v>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p>Unloads the OTP-OS-MON-MIB.</p>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>See Also</title>
-    <p><seealso marker="os_mon_app">os_mon(6)</seealso>,
-      <seealso marker="snmp:snmp">snmp(3)</seealso></p>
-  </section>
-</erlref>
-
diff --git a/lib/os_mon/doc/src/os_sup.xml b/lib/os_mon/doc/src/os_sup.xml
index d517f387b4..4a84165a6c 100644
--- a/lib/os_mon/doc/src/os_sup.xml
+++ b/lib/os_mon/doc/src/os_sup.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>os_sup</module>
+  <module since="">os_sup</module>
   <modulesummary>Interface to OS System Messages</modulesummary>
   <description>
     <p><c>os_sup</c> is a process providing a message passing service
@@ -159,8 +159,8 @@
   </section>
   <funcs>
     <func>
-      <name>enable() -> ok | {error, Res}</name>
-      <name>enable(Dir, Conf) -> ok | {error, Error}</name>
+      <name since="">enable() -> ok | {error, Res}</name>
+      <name since="">enable(Dir, Conf) -> ok | {error, Error}</name>
       <fsummary>Enable the service (Solaris only)</fsummary>
       <type>
         <v>Dir = Conf = Res = string()</v>
@@ -194,8 +194,8 @@
       </desc>
     </func>
     <func>
-      <name>disable() -> ok | {error, Res}</name>
-      <name>disable(Dir, Conf) -> ok | {error, Error}</name>
+      <name since="">disable() -> ok | {error, Res}</name>
+      <name since="">disable(Dir, Conf) -> ok | {error, Error}</name>
       <fsummary>Disable the service (Solaris only)</fsummary>
       <type>
         <v>Dir = Conf = Res = string()</v>
diff --git a/lib/os_mon/doc/src/ref_man.xml b/lib/os_mon/doc/src/ref_man.xml
index a8f847a8ba..57dd5c5f0b 100644
--- a/lib/os_mon/doc/src/ref_man.xml
+++ b/lib/os_mon/doc/src/ref_man.xml
@@ -36,7 +36,6 @@
   <xi:include href="cpu_sup.xml"/>
   <xi:include href="disksup.xml"/>
   <xi:include href="memsup.xml"/>
-  <xi:include href="os_mon_mib.xml"/>
   <xi:include href="os_sup.xml"/>
   <xi:include href="nteventlog.xml"/>
 </application>
diff --git a/lib/os_mon/mibs/Makefile b/lib/os_mon/mibs/Makefile
deleted file mode 100644
index dbc105ee3d..0000000000
--- a/lib/os_mon/mibs/Makefile
+++ /dev/null
@@ -1,101 +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=$(OS_MON_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-MIB_FILES= OTP-OS-MON-MIB.mib 
-FUNCS_FILES = OTP-OS-MON-MIB.funcs
-
-BIN_TARGETS= $(MIB_FILES:%.mib=$(SNMP_BIN_TARGET_DIR)/%.bin)
-HRL_TARGETS= $(MIB_FILES:%.mib=$(SNMP_HRL_TARGET_DIR)/%.hrl)
-V1_MIB_FILES= $(MIB_FILES:%.mib=v1/%.mib.v1)
-
-TARGET_FILES= $(SNMP_BIN_TARGET_DIR)/OTP-REG.bin \
-  $(SNMP_BIN_TARGET_DIR)/OTP-TC.bin \
-  $(SNMP_BIN_TARGET_DIR)/OTP-MIB.bin \
-  $(BIN_TARGETS) $(HRL_TARGETS) $(V1_MIB_FILES)
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-SNMP_FLAGS =  -I $(SNMP_BIN_TARGET_DIR)
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-debug opt: $(TARGET_FILES)
-
-clean:
-	rm -f $(TARGET_FILES)
-	rm -f core
-
-docs:
-
-OTP_MIBDIR = $(shell if test -d ../../otp_mibs; then echo otp_mibs; \
-		      else echo sasl; fi)
-
-$(SNMP_BIN_TARGET_DIR)/OTP-REG.bin:     $(ERL_TOP)/lib/$(OTP_MIBDIR)/mibs/OTP-REG.mib
-	$(snmp_verbose)$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -I $(SNMP_TOOLKIT)/priv/mibs $(SNMP_FLAGS) -o $(SNMP_BIN_TARGET_DIR) $<
-
-$(SNMP_BIN_TARGET_DIR)/OTP-TC.bin:     $(ERL_TOP)/lib/$(OTP_MIBDIR)/mibs/OTP-TC.mib
-	$(snmp_verbose)$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -I $(SNMP_TOOLKIT)/priv/mibs $(SNMP_FLAGS) -o $(SNMP_BIN_TARGET_DIR) $<
-
-$(SNMP_BIN_TARGET_DIR)/OTP-MIB.bin:     $(ERL_TOP)/lib/$(OTP_MIBDIR)/mibs/OTP-MIB.mib
-	$(snmp_verbose)$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -I $(SNMP_TOOLKIT)/priv/mibs $(SNMP_FLAGS) -o $(SNMP_BIN_TARGET_DIR) $<
-
-v1/%.mib.v1: %.mib
-	$(gen_verbose)$(ERL_TOP)/lib/snmp/bin/snmp-v2tov1 -o $@ $<
-
-$(SNMP_BIN_TARGET_DIR)/OTP-OS-MON-MIB.bin: \
-	$(SNMP_BIN_TARGET_DIR)/OTP-REG.bin \
-	$(SNMP_BIN_TARGET_DIR)/OTP-MIB.bin \
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/mibs"
-	$(INSTALL_DIR) "$(RELSYSDIR)/mibs/v1"
-	$(INSTALL_DATA) $(MIB_FILES) $(FUNCS_FILES) "$(RELSYSDIR)/mibs"
-	$(INSTALL_DATA) $(V1_MIB_FILES) "$(RELSYSDIR)/mibs/v1"
-	$(INSTALL_DIR) "$(RELSYSDIR)/include"
-	$(INSTALL_DATA) $(HRL_TARGETS) "$(RELSYSDIR)/include"
-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/mibs"
-	$(INSTALL_DATA) $(BIN_TARGETS) "$(RELSYSDIR)/priv/mibs"
-
-release_docs_spec:
diff --git a/lib/os_mon/mibs/OTP-OS-MON-MIB.funcs b/lib/os_mon/mibs/OTP-OS-MON-MIB.funcs
deleted file mode 100644
index 7ed76517b9..0000000000
--- a/lib/os_mon/mibs/OTP-OS-MON-MIB.funcs
+++ /dev/null
@@ -1,5 +0,0 @@
-{loadMemorySystemWatermark, {os_mon_mib, mem_sys_mark, []}}.
-{loadMemoryErlProcWatermark, {os_mon_mib, mem_proc_mark, []}}.
-{loadTable, {os_mon_mib, load_table, []}}.
-{diskAlmostFullThreshold, {os_mon_mib, disk_threshold, []}}.
-{diskTable, {os_mon_mib, disk_table, []}}.
diff --git a/lib/os_mon/mibs/OTP-OS-MON-MIB.mib b/lib/os_mon/mibs/OTP-OS-MON-MIB.mib
deleted file mode 100644
index e027e96154..0000000000
--- a/lib/os_mon/mibs/OTP-OS-MON-MIB.mib
+++ /dev/null
@@ -1,423 +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%
---
-
-OTP-OS-MON-MIB DEFINITIONS ::= BEGIN
- 
-IMPORTS
-    MODULE-IDENTITY, NOTIFICATION-TYPE, OBJECT-TYPE,
-    Counter32, Gauge32, Integer32, Unsigned32, Counter64
-        FROM SNMPv2-SMI
-    TEXTUAL-CONVENTION, DisplayString
-        FROM SNMPv2-TC
-    MODULE-COMPLIANCE, NOTIFICATION-GROUP, OBJECT-GROUP
-        FROM SNMPv2-CONF
-    otpModules, otpApplications
-        FROM OTP-REG
-    erlNodeId
-        FROM OTP-MIB
-    ;
-
-
-otpOsMonModule MODULE-IDENTITY
-    LAST-UPDATED  "0305090900Z"
-    ORGANIZATION  "Ericsson"
-    CONTACT-INFO
-        "Contact:  Erlang Support see license agreement for Erlang/OTP."
-
-    DESCRIPTION
-        "This MIB is part of the OTP MIB.  It defines MIB objects
-        for the os_mon application in OTP."
-
-    REVISION	"0508260900Z"
-    DESCRIPTION		
-        "Removed dependeny on EVA."
-    REVISION	"0305090900Z"
-    DESCRIPTION		
-        "Changed CONTACT-INFO as it was outdated, made it more generic
-	to avoid such changes in the future."
-    
-    REVISION     "9807080900Z"
-    DESCRIPTION
-        "Changed MAX-ACCESS for diskDescr from not-accessible to
-        read-only."
-
-    REVISION     "9801270900Z"
-    DESCRIPTION
-        "Changed erroneous name of this module to otpOsMonModule."
-
-    REVISION     "9712010900Z"
-    DESCRIPTION
-        "Converted to v2 SMI and placed in the OTP tree."
-
-    REVISION     "9608191700Z"
-    DESCRIPTION
-        "The initial revision of MIB module OTP-OS-MON-MIB."
-    ::= { otpModules 4 }
-
-OTPCounterBasedGauge64 ::= TEXTUAL-CONVENTION
-  STATUS       current
-  DESCRIPTION
-        "The CounterBasedGauge64 type represents a non-negative
-        integer, which may increase or decrease, but shall never
-        exceed a maximum value, nor fall below a minimum value. The
-        maximum value can not be greater than 2^64-1
-        (18446744073709551615 decimal), and the minimum value can
-
-        not be smaller than 0.  The value of a CounterBasedGauge64
-        has its maximum value whenever the information being modeled
-        is greater than or equal to its maximum value, and has its
-        minimum value whenever the information being modeled is
-        smaller than or equal to its minimum value.  If the
-        information being modeled subsequently decreases below
-        (increases above) the maximum (minimum) value, the
-        CounterBasedGauge64 also decreases (increases).
-
-        Note that this TC is not strictly supported in SMIv2,
-        because the 'always increasing' and 'counter wrap' semantics
-        associated with the Counter64 base type are not preserved.
-        It is possible that management applications which rely
-        solely upon the (Counter64) ASN.1 tag to determine object
-        semantics will mistakenly operate upon objects of this type
-        as they would for Counter64 objects.
-
-        This textual convention represents a limited and short-term
-        solution, and may be deprecated as a long term solution is
-        defined and deployed to replace it."
-  SYNTAX Counter64
-
-otpOsMonMIB     OBJECT IDENTIFIER ::= { otpApplications 2 }
-otpOsMonMIBConformance
-                OBJECT IDENTIFIER ::= { otpOsMonMIB 1 }
-otpOsMonMIBObjects
-                OBJECT IDENTIFIER ::= { otpOsMonMIB 2 }
-otpOsMonMIBAlarms
-                OBJECT IDENTIFIER ::= { otpOsMonMIB 4 }
-otpOsMonMIBAlarmsV2
-                OBJECT IDENTIFIER ::= { otpOsMonMIBAlarms 0 }
-
-
--- Datatypes
-
--- Managed Objects
-
-load            OBJECT IDENTIFIER ::= { otpOsMonMIBObjects 1 }
-disk            OBJECT IDENTIFIER ::= { otpOsMonMIBObjects 2 }
-
-loadMemorySystemWatermark OBJECT-TYPE
-    SYNTAX      Integer32 (0..100)
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION    
-        "Threshold in percent of the total available system
-        memory, which specifies how much memory can be allocated
-        by the system before an alarm is sent."
-    ::= { load 1 }
-
-loadMemoryErlProcWatermark OBJECT-TYPE
-    SYNTAX      Integer32 (0..100)
-    MAX-ACCESS  read-only    
-    STATUS      current    
-    DESCRIPTION
-        "Threshold in percent of the total available system
-        memory, which specifies how much memory can be allocated
-        by one Erlang process before an alarm is sent."
-    ::= { load 2 }
-
-loadTable OBJECT-TYPE
-    SYNTAX      SEQUENCE OF LoadEntry
-    MAX-ACCESS  not-accessible
-    STATUS      current
-    DESCRIPTION
-        "A table with load and memory information
-        for each node."
-    ::= { load 3 }
-
-loadEntry OBJECT-TYPE
-    SYNTAX      LoadEntry
-    MAX-ACCESS  not-accessible
-    STATUS      current
-    DESCRIPTION
-        "A conceptual row in the loadTable."
-    INDEX   { loadErlNodeName }
-    ::= { loadTable 1 }
-
-LoadEntry ::= SEQUENCE {
-    loadErlNodeName                   DisplayString,
-    loadSystemTotalMemory             Gauge32,
-    loadSystemUsedMemory              Gauge32,
-    loadLargestErlProcess             DisplayString,
-    loadLargestErlProcessUsedMemory   Gauge32,
-    loadCpuLoad                       Integer32,
-    loadCpuLoad5                      Integer32,
-    loadCpuLoad15                     Integer32,
-    loadOsWordsize                    Unsigned32,
-    loadSystemTotalMemory64           OTPCounterBasedGauge64,
-    loadSystemUsedMemory64            OTPCounterBasedGauge64,
-    loadLargestErlProcessUsedMemory64 OTPCounterBasedGauge64
-    }
-
-loadErlNodeName OBJECT-TYPE
-    SYNTAX      DisplayString
-    MAX-ACCESS  not-accessible
-    STATUS      current
-    DESCRIPTION
-        "The name of the erlang node, e.g. erlnode@host1."
-    ::= { loadEntry 1 }
-
-loadSystemTotalMemory OBJECT-TYPE
-    SYNTAX      Gauge32
-    UNITS       "bytes"
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The amount of total memory in the system."
-    ::= { loadEntry 2 }
-
-loadSystemUsedMemory OBJECT-TYPE
-    SYNTAX      Gauge32
-    UNITS       "bytes"
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The amount of used memory."
-    ::= { loadEntry 3 }
-
-loadLargestErlProcess OBJECT-TYPE
-    SYNTAX      DisplayString
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The process identifier (Pid) of the largest Erlang
-        process."
-    ::= { loadEntry 4 }
-
-loadLargestErlProcessUsedMemory OBJECT-TYPE
-    SYNTAX      Gauge32
-    UNITS       "bytes"
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The amount of memory used by the largest Erlang
-        process."
-    ::= { loadEntry 5 }
-
-loadCpuLoad OBJECT-TYPE
-    SYNTAX      Integer32 (0..100)
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The average load the last minute in percent of the CPU
-	where the Erlang node runs."
-    ::= { loadEntry 6 }
-
-loadCpuLoad5 OBJECT-TYPE
-    SYNTAX      Integer32 (0..100)
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The average load the last 5 minutes in percent of the CPU
-	where the Erlang node runs."
-    ::= { loadEntry 7}
-
-loadCpuLoad15 OBJECT-TYPE
-    SYNTAX      Integer32 (0..100)
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The average load the last 15 minutes in percent of the CPU
-	where the Erlang node runs."
-    ::= { loadEntry 8}
-
-loadOsWordsize OBJECT-TYPE
-    SYNTAX      Unsigned32
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The wordsize of the operating operating system."
-    ::= { loadEntry 9 }
-
-loadSystemTotalMemory64 OBJECT-TYPE
-    SYNTAX      OTPCounterBasedGauge64
-    UNITS       "bytes"
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The amount of total memory in the system for 64-bit operating system."
-    ::= { loadEntry 10 }
-
-loadSystemUsedMemory64 OBJECT-TYPE
-    SYNTAX      OTPCounterBasedGauge64
-    UNITS       "bytes"
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The amount of used memory for 64-bit operating system."
-    ::= { loadEntry 11 }
-
-loadLargestErlProcessUsedMemory64 OBJECT-TYPE
-    SYNTAX      OTPCounterBasedGauge64
-    UNITS       "bytes"
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The amount of memory used by the largest Erlang
-        process for 64-bit operating system.."
-    ::= { loadEntry 12 }
-
-diskAlmostFullThreshold OBJECT-TYPE
-    SYNTAX      Integer32 (0..100)
-    MAX-ACCESS  read-only    
-    STATUS      current    
-    DESCRIPTION    
-        "Threshold in percent of the available disk space,
-        which specifies how much disk space can be used by
-        a disk or partition before an alarm is sent."
-    ::= { disk 1 }
-
-diskTable OBJECT-TYPE
-    SYNTAX      SEQUENCE OF DiskEntry
-    MAX-ACCESS  not-accessible
-    STATUS      current
-    DESCRIPTION
-          "A table with all local disks or partitions on each
-          node."
-    ::= { disk 2 }
-
-diskEntry OBJECT-TYPE
-    SYNTAX      DiskEntry
-    MAX-ACCESS  not-accessible
-    STATUS      current
-    DESCRIPTION
-          "A conceptual row in the diskTable."
-    INDEX      { erlNodeId, diskId }
-    ::= { diskTable 1 }
-
-DiskEntry ::= SEQUENCE {
-    diskId          Integer32,
-    diskDescr       DisplayString,
-    diskKBytes      Gauge32,
-    diskCapacity    Integer32
-    }
-
-diskId OBJECT-TYPE
-    SYNTAX      Integer32
-    MAX-ACCESS  not-accessible
-    STATUS      current
-    DESCRIPTION
-        "An integer that uniquely identifies the disk
-        or partition."
-    ::= { diskEntry 1 }
-
-diskDescr OBJECT-TYPE
-    SYNTAX     DisplayString
-    MAX-ACCESS read-only
-    STATUS     current
-    DESCRIPTION
-        "A string that identifies the disk or partition."
-    ::= { diskEntry 2 }
-
-diskKBytes OBJECT-TYPE
-    SYNTAX      Gauge32
-    UNITS       "kbytes"
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The amount of total disk/partition space. "
-    ::= { diskEntry 3 }
-
-diskCapacity OBJECT-TYPE
-    SYNTAX      Integer32 (0..100)
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "How much of the disk's/partition's total capacity has
-        been used, in percent."
-    ::= { diskEntry 4 }
-
-
--- conformance information
-
-otpOsMonMIBCompliances
-                OBJECT IDENTIFIER ::= { otpOsMonMIBConformance 1 }
-otpOsMonMIBGroups
-                OBJECT IDENTIFIER ::= { otpOsMonMIBConformance 2 }
-
-
--- compliance statements
-
-otpOsMonBasicCompliance MODULE-COMPLIANCE
-    STATUS  current
-    DESCRIPTION
-        "The compliance statement for SNMPv2 entities which
-        implement the OTP-OS-MON-MIB."
-    MODULE  -- this module
-        GROUP loadGroup
-        DESCRIPTION
-            "This group is mandatory for systems implementing the
-            load supervison functionality."
-        GROUP loadAlarmsGroup
-        DESCRIPTION
-            "This group is optional for systems implementing the
-            load supervison functionality."
-        GROUP diskGroup
-        DESCRIPTION
-            "This group is mandatory for system implementing the
-            disk supervison functionality."
-        GROUP diskAlarmsGroup
-        DESCRIPTION
-            "This group is optional for systems implementing the
-            disk supervison functionality."
-    ::= { otpOsMonMIBCompliances 1 }
-
-
--- units of conformance
-
-loadGroup OBJECT-GROUP
-    OBJECTS { loadMemorySystemWatermark,
-              loadMemoryErlProcWatermark,
-              loadSystemTotalMemory,
-              loadSystemUsedMemory,
-              loadLargestErlProcess,
-              loadLargestErlProcessUsedMemory,
-              loadCpuLoad,
-              loadCpuLoad5,
-              loadCpuLoad15,
-              loadOsWordsize,
-              loadSystemTotalMemory64,
-              loadSystemUsedMemory64,
-              loadLargestErlProcessUsedMemory64}
-    STATUS  current
-    DESCRIPTION
-            "A collection of objects providing basic instrumentation
-            of the load of the OTP system."
-    ::= { otpOsMonMIBGroups 1 }
-
-diskGroup OBJECT-GROUP
-    OBJECTS { diskAlmostFullThreshold,
-              diskDescr,
-              diskKBytes,
-              diskCapacity }
-    STATUS  current
-    DESCRIPTION
-            "A collection of objects providing basic instrumentation
-            of the disks in the OTP system."
-    ::= { otpOsMonMIBGroups 3 }
-
-END
diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile
index fc2eb22393..923a31f290 100644
--- a/lib/os_mon/src/Makefile
+++ b/lib/os_mon/src/Makefile
@@ -34,8 +34,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN)
 # ----------------------------------------------------
 # Target Specs
 # ----------------------------------------------------
-MODULES= disksup memsup cpu_sup os_mon os_mon_mib os_sup os_mon_sysinfo \
-	nteventlog
+MODULES= disksup memsup cpu_sup os_mon os_sup os_mon_sysinfo nteventlog
 
 INCLUDE=../include
 CSRC=../c_src
diff --git a/lib/os_mon/src/cpu_sup.erl b/lib/os_mon/src/cpu_sup.erl
index ba2d89313e..d28f229b3e 100644
--- a/lib/os_mon/src/cpu_sup.erl
+++ b/lib/os_mon/src/cpu_sup.erl
@@ -68,7 +68,7 @@
 
 -type util_cpus() :: 'all' | integer() | [integer()].
 -type util_state() :: 'user' | 'nice_user' | 'kernel' | 'wait' | 'idle'.
--type util_value() :: [{util_state(), float()}] | float().
+-type util_value() :: [{util_state(), number()}] | number().
 -type util_desc() :: {util_cpus(), util_value(), util_value(), []}.
 
 %%----------------------------------------------------------------------
@@ -122,7 +122,7 @@ util(Args) when is_list (Args) ->
 util(_) ->
     erlang:error(badarg).
 
--spec util() -> float() | {'error', any()}.
+-spec util() -> number() | {'error', any()}.
 
 util() ->
     case util([]) of
diff --git a/lib/os_mon/src/disksup.erl b/lib/os_mon/src/disksup.erl
index 5118d807e1..4253067c90 100644
--- a/lib/os_mon/src/disksup.erl
+++ b/lib/os_mon/src/disksup.erl
@@ -264,7 +264,7 @@ check_disk_space({unix, irix}, Port, Threshold) ->
     Result = my_cmd("/usr/sbin/df -lk",Port),
     check_disks_irix(skip_to_eol(Result), Threshold);
 check_disk_space({unix, linux}, Port, Threshold) ->
-    Result = my_cmd("/bin/df -lk", Port),
+    Result = my_cmd("/bin/df -lk -x squashfs", Port),
     check_disks_solaris(skip_to_eol(Result), Threshold);
 check_disk_space({unix, posix}, Port, Threshold) ->
     Result = my_cmd("df -k -P", Port),
diff --git a/lib/os_mon/src/memsup.erl b/lib/os_mon/src/memsup.erl
index 9d6447430d..b69d657aa7 100644
--- a/lib/os_mon/src/memsup.erl
+++ b/lib/os_mon/src/memsup.erl
@@ -701,6 +701,7 @@ get_os_wordsize_with_uname() ->
 	"sparc64" -> 64;
 	"amd64"   -> 64;
 	"ppc64"   -> 64;
+	"ppc64le" -> 64;
 	"s390x"   -> 64;
 	_         -> 32
     end.
diff --git a/lib/os_mon/src/os_mon.app.src b/lib/os_mon/src/os_mon.app.src
index 8be94f65d4..6c9b0d7576 100644
--- a/lib/os_mon/src/os_mon.app.src
+++ b/lib/os_mon/src/os_mon.app.src
@@ -21,7 +21,7 @@
 {application, os_mon,
    [{description, "CPO  CXC 138 46"},
     {vsn, "%VSN%"},
-    {modules, [os_mon, os_mon_mib, os_sup,
+    {modules, [os_mon, os_sup,
                disksup, memsup, cpu_sup, os_mon_sysinfo, nteventlog]},
     {registered, [os_mon_sup, os_mon_sysinfo, disksup, memsup, cpu_sup, 
                   os_sup_server]},
@@ -31,6 +31,4 @@
 	   {start_memsup, true},
 	   {start_os_sup, false}]},
     {mod, {os_mon, []}},
-    {runtime_dependencies, ["stdlib-2.0","snmp-4.25.1","sasl-2.4",
-			    "otp_mibs-1.0.9","mnesia-4.12","kernel-3.0",
-			    "erts-6.0"]}]}.
+    {runtime_dependencies, ["stdlib-2.0","sasl-2.4","kernel-3.0","erts-6.0"]}]}.
diff --git a/lib/os_mon/src/os_mon_mib.erl b/lib/os_mon/src/os_mon_mib.erl
deleted file mode 100644
index 9b5d2fbba6..0000000000
--- a/lib/os_mon/src/os_mon_mib.erl
+++ /dev/null
@@ -1,251 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
--module(os_mon_mib).
-%%%-----------------------------------------------------------------
-%%% Description: This module implements the OS-MON-MIB.
-%%% The tables are implemented as shadow tables with the module
-%%% snmp_shadow_table.  Here the update functions are implemented.
-%%%-----------------------------------------------------------------
-
--include("../../otp_mibs/include/OTP-MIB.hrl").
-      
-%% API
--export([load/1, unload/1]).
-
-%% Deprecated API
--export([init/1, stop/1]).
-
--deprecated([{init,1,eventually},
-	     {stop,1,eventually}]).
-
-%% SNMP instrumentation
--export([load_table/1, load_table/3, disk_table/1, disk_table/3,
-	 mem_sys_mark/1, mem_proc_mark/1, disk_threshold/1]).
-
-%% SNMP shadow functions
--export([update_load_table/0, update_disk_table/0]).
-
-%% Exported for internal use via rpc
--export([get_load/1, get_disks/1]).
-
-%% Shadow tables  
--record(loadTable, {
-	loadErlNodeName, 
-	loadSystemTotalMemory, 
-	loadSystemUsedMemory,
-	loadLargestErlProcess, 
-	loadLargestErlProcessUsedMemory,
-	loadCpuLoad, 
-	loadCpuLoad5, 
-	loadCpuLoad15,
-	loadOsWordsize,
-	loadSystemTotalMemory64, 
-	loadSystemUsedMemory64,
-	loadLargestErlProcessUsedMemory64}).
-
--record(diskTable,
-	{key, diskDescr, diskKBytes, diskCapacity}).
-
-%% Shadow argument macros 
--define(loadShadowArgs, 
-	{loadTable, string, record_info(fields, loadTable), 5000,
-	 fun os_mon_mib:update_load_table/0}).
-	
--define(diskShadowArgs, 
-	{diskTable, {integer, integer}, record_info(fields, diskTable), 5000,
-	 fun os_mon_mib:update_disk_table/0}).
-
-%% Misc
--record(diskAlloc, {diskDescr, diskId}).
-
-%%%=========================================================================
-%%%  API
-%%%=========================================================================
-
-%%-------------------------------------------------------------------------
-%% load(Agent) ->  ok | {error, Reason}
-%% Agent - pid() | atom()
-%% Reason - term()
-%% Description: Loads the OTP-OS-MON-MIB
-%%-------------------------------------------------------------------------
-load(Agent) ->
-    MibDir = filename:join(code:priv_dir(os_mon), "mibs"),
-    snmpa:load_mibs(Agent, [filename:join(MibDir, "OTP-OS-MON-MIB")]).
-
-%%-------------------------------------------------------------------------
-%% unload(Agent) ->  ok | {error, Reason}
-%% Agent - pid() | atom()
-%% Reason - term()
-%% Description: Unloads the OTP-OS-MON-MIB
-%%-------------------------------------------------------------------------
-unload(Agent) ->
-    snmpa:unload_mibs(Agent, ["OTP-OS-MON-MIB"]).
-    
-%% To be backwards compatible
-init(Agent) ->
-    load(Agent).
-stop(Agent) ->
-    unload(Agent).
-
-%%%=========================================================================
-%%%  SNMP instrumentation
-%%%=========================================================================
-load_table(Op) ->
-    snmp_shadow_table:table_func(Op, ?loadShadowArgs).
-load_table(Op, RowIndex, Cols) ->
-    snmp_shadow_table:table_func(Op, RowIndex, Cols, ?loadShadowArgs).
-
-disk_table(new) ->
-    Tab = diskAlloc,
-    Storage = ram_copies, 
-    case lists:member(Tab, mnesia:system_info(tables)) of
-	true ->
-	    case mnesia:table_info(Tab, storage_type) of
-		unknown ->
-		    {atomic, ok}=mnesia:add_table_copy(Tab, node(), Storage);
-		Storage ->
-		    catch delete_all(Tab)
-	    end;
-	false ->
-	    Nodes = [node()],
-	    Props = [{type, set},
-		     {attributes, record_info(fields, diskAlloc)},
-		     {local_content, true},
-		     {Storage, Nodes}],
-	    {atomic, ok} = mnesia:create_table(Tab, Props)
-    
-    end,
-    Rec = #diskAlloc{diskDescr = next_index, diskId = 1},
-    ok = mnesia:dirty_write(Rec),
-    snmp_shadow_table:table_func(new, ?diskShadowArgs).
-
-disk_table(Op, RowIndex, Cols) ->
-    snmp_shadow_table:table_func(Op, RowIndex, Cols, ?diskShadowArgs).
-
-mem_sys_mark(get) ->
-    {value, memsup:get_sysmem_high_watermark()};
-mem_sys_mark(_) ->
-    ok.
-
-mem_proc_mark(get) ->
-    {value, memsup:get_procmem_high_watermark()};
-mem_proc_mark(_) ->
-    ok.
-
-disk_threshold(get) ->
-    {value, disksup:get_almost_full_threshold()};
-disk_threshold(_) ->
-    ok.
-
-%%%=========================================================================
-%%%  SNMP shadow functions
-%%%=========================================================================
-update_load_table() ->
-    delete_all(loadTable),
-    lists:foreach(
-      fun(Node) ->
-	      case rpc:call(Node, os_mon_mib, get_load, [Node]) of
-		  Load when is_record(Load,loadTable) ->
-		      ok = mnesia:dirty_write(Load);
-		  _Else ->
-		      ok
-	      end
-      end, [node() | nodes()]).
-
-
-update_disk_table() ->
-    delete_all(diskTable),
-    node_update_disk_table(
-      otp_mib:erl_node_table(get_next, [], [?erlNodeName,?erlNodeOutBytes])).
-
-%%%========================================================================
-%%% Exported for internal use via rpc
-%%%========================================================================
-get_load(Node) ->
-    {Total, Allocated, PidString, PidAllocated} = case memsup:get_memory_data() of
-	{MemTot, MemAlloc, undefined}     -> {MemTot, MemAlloc, "undefined", 0};
-	{MemTot, MemAlloc, {Pid, PidMem}} -> {MemTot, MemAlloc, pid_to_str(Pid), PidMem} 
-    end,
-    OsWordsize = case memsup:get_os_wordsize() of
-	WS when is_integer(WS) -> WS;
-	_                      -> 0
-    end,
-    #loadTable{
-	loadErlNodeName                   = atom_to_list(Node),
-	loadSystemTotalMemory             = mask_int32(Total),
-	loadSystemUsedMemory              = mask_int32(Allocated),
-	loadLargestErlProcess             = PidString,
-	loadLargestErlProcessUsedMemory   = mask_int32(PidAllocated),
-	loadCpuLoad                       = get_cpu_load(avg1),   
-	loadCpuLoad5                      = get_cpu_load(avg5),
-	loadCpuLoad15                     = get_cpu_load(avg15),
-	loadOsWordsize                    = OsWordsize,  
-	loadSystemTotalMemory64           = Total,
-	loadSystemUsedMemory64            = Allocated,
-	loadLargestErlProcessUsedMemory64 = PidAllocated
-    }.
-
-mask_int32(Value) -> Value band ((1 bsl 32) - 1).
-
-get_disks(NodeId) ->
-    element(1,
-	    lists:mapfoldl(
-	      fun({Descr, KByte, Capacity}, DiskId) ->
-		      {#diskTable{key = {NodeId, DiskId}, 
-				  diskDescr = Descr,
-				  diskKBytes = KByte, 
-				  diskCapacity = Capacity},
-		       DiskId + 1}
-	      end, 1, disksup:get_disk_data())).
-
-
-%%%========================================================================
-%%% Internal functions
-%%%========================================================================
-node_update_disk_table([_, endOfTable]) -> 
-    ok;
-
-node_update_disk_table([{[?erlNodeName | IndexList], NodeStr}, _]) ->
-    Disks = rpc:call(list_to_atom(NodeStr), os_mon_mib, get_disks, 
-		     IndexList),
-    lists:foreach(fun(Disk) ->
-			  mnesia:dirty_write(Disk)
-		  end, Disks),
-    node_update_disk_table(otp_mib:erl_node_table(get_next, 
-						  IndexList, 
-						  [?erlNodeName, 
-						   ?erlNodeOutBytes])).
-
-get_cpu_load(X) when X == avg1; X == avg5; X == avg15 ->
-    case erlang:round(apply(cpu_sup, X, [])/2.56) of
-	Large when Large > 100 ->
-	    100;
-	Load ->
-	    Load
-    end.
-
-delete_all(Name) -> delete_all(mnesia:dirty_first(Name), Name).
-delete_all('$end_of_table', _Name) -> done;
-delete_all(Key, Name) ->
-    Next = mnesia:dirty_next(Name, Key),
-    ok = mnesia:dirty_delete({Name, Key}),
-    delete_all(Next, Name).
-
-pid_to_str(Pid) -> lists:flatten(io_lib:format("~w", [Pid])).
diff --git a/lib/os_mon/test/Makefile b/lib/os_mon/test/Makefile
index 6ac67e6bae..03c73b95ec 100644
--- a/lib/os_mon/test/Makefile
+++ b/lib/os_mon/test/Makefile
@@ -30,7 +30,6 @@ MODULES= \
 	disksup_SUITE \
 	memsup_SUITE \
 	cpu_sup_SUITE \
-	os_mon_mib_SUITE \
 	os_sup_SUITE \
 	os_mon_conf
 
@@ -87,7 +86,6 @@ release_tests_spec: make_emakefile
 	$(INSTALL_DIR) "$(RELSYSDIR)"
 	$(INSTALL_DATA) os_mon.spec os_mon.cover os_mon_smoke.spec \
 		$(EMAKEFILE) $(SOURCE) "$(RELSYSDIR)"
-	$(INSTALL_DATA) os_mon_mib_SUITE.cfg "$(RELSYSDIR)"
 
 ##	tar chf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
 
diff --git a/lib/os_mon/test/os_mon.spec b/lib/os_mon/test/os_mon.spec
index 4b4286b313..d292b258f3 100644
--- a/lib/os_mon/test/os_mon.spec
+++ b/lib/os_mon/test/os_mon.spec
@@ -1,2 +1 @@
 {suites,"../os_mon_test",all}.
-{config,"os_mon_mib_SUITE.cfg"}.
\ No newline at end of file
diff --git a/lib/os_mon/test/os_mon_mib_SUITE.cfg b/lib/os_mon/test/os_mon_mib_SUITE.cfg
deleted file mode 100644
index a33c23530b..0000000000
--- a/lib/os_mon/test/os_mon_mib_SUITE.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-%% -*- erlang -*-
-{snmp, [{start_agent,true},
-	{users,[{os_mon_mib_test,[snmpm_user_default,[]]}]},
-	{managed_agents,[{os_mon_mib_test,
-			  [os_mon_mib_test, {127,0,0,1}, 4000, []]}]},
-	{agent_sysname,"Test os_mon_mibs"},
-	{mgr_port,5001}
-       ]}.
diff --git a/lib/os_mon/test/os_mon_mib_SUITE.erl b/lib/os_mon/test/os_mon_mib_SUITE.erl
deleted file mode 100644
index f40d5f442c..0000000000
--- a/lib/os_mon/test/os_mon_mib_SUITE.erl
+++ /dev/null
@@ -1,578 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2004-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(os_mon_mib_SUITE).
-
-%%-----------------------------------------------------------------
-%% This suite can no longer be executed standalone, i.e. it must be
-%% executed with common test. The reason is that ct_snmp is used
-%% instead of the snmp application directly. The suite requires a
-%% config file, os_mon_mib_SUITE.cfg, found in the same directory as
-%% the suite.
-%%
-%% Execute with:
-%% > ct_run -suite os_mon_mib_SUITE -config os_mon_mib_SUITE.cfg
-%%-----------------------------------------------------------------
-
--include_lib("common_test/include/ct.hrl").
--include_lib("os_mon/include/OTP-OS-MON-MIB.hrl").
--include_lib("snmp/include/snmp_types.hrl").
-
-% Test server specific exports
--export([all/0, suite/0, groups/0,
-         init_per_suite/1, end_per_suite/1]).
-
-
-% Test cases must be exported.
--export([update_load_table/1]).
-
--export([get_mem_sys_mark/1, get_mem_proc_mark/1, get_disk_threshold/1,
-         get_load_table/1, get_disk_table/1,
-         real_snmp_request/1, load_unload/1]).
-
--export([sys_tot_mem/1, sys_used_mem/1, large_erl_process/1,
-         large_erl_process_mem/1, cpu_load/1, cpu_load5/1, cpu_load15/1,
-         os_wordsize/1, sys_tot_mem64/1, sys_used_mem64/1,
-         large_erl_process_mem64/1, disk_descr/1, disk_kbytes/1,
-         disk_capacity/1]).
-
--export([otp_6351/1, otp_7441/1]).
-
--define(TRAP_UDP, 5000).
--define(AGENT_UDP, 4000).
--define(CONF_FILE_VER, [v2]).
--define(SYS_NAME, "Test os_mon_mibs").
--define(MAX_MSG_SIZE, 484).
--define(ENGINE_ID, "mgrEngine").
--define(MGR_PORT, 5001).
-
-%%---------------------------------------------------------------------
-
-suite() ->
-    [{ct_hooks,[ts_install_cth]},
-     {timetrap,{minutes,6}},
-     {require, snmp_mgr_agent, snmp}].
-
-all() -> 
-    [load_unload, get_mem_sys_mark, get_mem_proc_mark,
-     get_disk_threshold, get_load_table,
-     {group, get_next_load_table}, get_disk_table,
-     {group, get_next_disk_table}, real_snmp_request,
-     update_load_table, {group, tickets}].
-
-groups() -> 
-    [{tickets, [], [otp_6351, otp_7441]},
-     {get_next_load_table, [],
-      [sys_tot_mem, sys_used_mem, large_erl_process,
-       large_erl_process_mem, cpu_load, cpu_load5, cpu_load15,
-       os_wordsize, sys_tot_mem64, sys_used_mem64,
-       large_erl_process_mem64]},
-     {get_next_disk_table, [],
-      [disk_descr, disk_kbytes, disk_capacity]}].
-
-
-%%---------------------------------------------------------------------
-%%--------------------------------------------------------------------
-%% 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) ->
-    application:start(sasl),
-    application:start(mnesia),
-    application:start(os_mon),
-
-    ok = ct_snmp:start(Config,snmp_mgr_agent),
-
-    %% Load the mibs that should be tested
-    otp_mib:load(snmp_master_agent),
-    os_mon_mib:load(snmp_master_agent),
-
-    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) ->
-    PrivDir = proplists:get_value(priv_dir, Config),
-    ConfDir = filename:join(PrivDir,"conf"),
-    DbDir = filename:join(PrivDir,"db"),
-    MgrDir = filename:join(PrivDir, "mgr"),
-
-    %% Uload mibs
-    snmpa:unload_mibs(snmp_master_agent,["OTP-OS-MON-MIB"]),
-    otp_mib:unload(snmp_master_agent),
-
-    %% Clean up
-    application:stop(snmp),
-    application:stop(mnesia),
-    application:stop(os_mon),
-
-    del_dir(ConfDir),
-    del_dir(DbDir),
-    (catch del_dir(MgrDir)),
-    ok.
-
-%%---------------------------------------------------------------------
-%% Test cases
-%%---------------------------------------------------------------------
-    
-%% Test to unload and the reload the OTP.mib
-load_unload(Config) when is_list(Config) ->
-    os_mon_mib:unload(snmp_master_agent),
-    os_mon_mib:load(snmp_master_agent),
-    ok.
-%%---------------------------------------------------------------------
-
-%% check os_mon_mib:update_load_table error handling
-update_load_table(Config) when is_list(Config) ->
-    Node = start_node(),
-    ok = rpc:call(Node,application,start,[sasl]),
-    ok = rpc:call(Node,application,start,[os_mon]),
-    ok = os_mon_mib:update_load_table(),
-    rpc:call(Node,application,stop,[os_mon]),
-    ok = os_mon_mib:update_load_table(),
-    stop_node(Node),
-    ok.
-
-%% like update_load_table, when memsup_system_only==true
-otp_6351(Config) when is_list(Config) ->
-    Node = start_node(),
-    ok = rpc:call(Node,application,start,[sasl]),
-    ok = rpc:call(Node,application,load,[os_mon]),
-    ok = rpc:call(Node,application,set_env,
-                  [os_mon,memsup_system_only,true]),
-    ok = rpc:call(Node,application,start,[os_mon]),
-    Res = rpc:call(Node,os_mon_mib,get_load,[Node]),
-    if
-        is_tuple(Res), element(1, Res)==loadTable ->
-            ok;
-        true ->
-            ct:fail(Res)
-    end,
-    rpc:call(Node,application,stop,[os_mon]),
-    stop_node(Node),
-    ok.
-
-
-%%---------------------------------------------------------------------
-%% Simulates a get call to test the instrumentation function
-%% for the loadMemorySystemWatermark variable.
-get_mem_sys_mark(Config) when is_list(Config) ->
-    case  os_mon_mib:mem_sys_mark(get) of
-        {value, SysMark} when is_integer(SysMark) ->
-            ok;
-        _ ->
-            ct:fail(sys_mark_value_not_integer)
-    end.
-%%---------------------------------------------------------------------
-%% Simulates a get call to test the instrumentation function
-%% for the loadMemoryErlProcWatermark variable.
-get_mem_proc_mark(Config) when is_list(Config) ->
-    case os_mon_mib:mem_proc_mark(get) of
-        {value, ProcMark} when is_integer(ProcMark) ->
-            ok;
-        _ ->
-            ct:fail(proc_mark_value_not_integer)
-    end.
-%%---------------------------------------------------------------------
-%% Simulates a get call to test the instrumentation function
-%% for the diskAlmostFullThreshold variable.
-get_disk_threshold(Config) when is_list(Config) ->
-    case os_mon_mib:disk_threshold(get) of
-        {value, ProcMark} when is_integer(ProcMark) ->
-            ok;
-        _ ->
-            ct:fail(disk_threshold_value_not_integer)
-    end.
-%%---------------------------------------------------------------------
-
-%%% Note that when we have a string key, as in loadTable, the
-%%% instrumentation will deal with the [length(String), String]. We
-%%% have to know about this, when short cutting SNMP and calling
-%%% instrumentation functions directly as done in most test cases in
-%%% this test suite
-
-%% Simulates get calls to test the instrumentation function
-%% for the loadTable
-get_load_table(Config) when is_list(Config) ->
-
-    NodeStr = atom_to_list(node()),
-    NodeLen = length(NodeStr),
-
-    {_, _, {Pid, _}} = memsup:get_memory_data(),
-    PidStr = lists:flatten(io_lib:format("~w", [Pid])),
-    [{value, NodeStr},{value, PidStr}] =
-    os_mon_mib:load_table(get, [NodeLen  | NodeStr],
-                          [?loadErlNodeName, ?loadLargestErlProcess]),
-
-    Values = os_mon_mib:load_table(get, [NodeLen  | NodeStr] ,
-                                   [?loadSystemTotalMemory,
-                                    ?loadSystemUsedMemory,
-                                    ?loadLargestErlProcessUsedMemory,
-                                    ?loadCpuLoad,
-                                    ?loadCpuLoad5,
-                                    ?loadCpuLoad15,
-                                    ?loadOsWordsize,
-                                    ?loadSystemTotalMemory64,
-                                    ?loadSystemUsedMemory64,
-                                    ?loadLargestErlProcessUsedMemory64]),
-
-    IsInt = fun({value, Val}) when is_integer(Val) ->
-                    true;
-               (_) ->
-                    false
-            end,
-
-    NewValues = lists:filter(IsInt, Values),
-
-    case length(NewValues) of
-        10 ->
-            ok;
-        _ ->
-            ct:fail(value_not_integer)
-    end,
-
-    [{noValue,noSuchInstance}, {noValue,noSuchInstance},
-     {noValue,noSuchInstance}, {noValue,noSuchInstance},
-     {noValue,noSuchInstance}, {noValue,noSuchInstance},
-     {noValue,noSuchInstance}, {noValue,noSuchInstance},
-     {noValue,noSuchInstance}, {noValue,noSuchInstance},
-     {noValue,noSuchInstance}, {noValue,noSuchInstance}] =
-    os_mon_mib:load_table(get, [3, 102, 111, 111],
-                          [?loadErlNodeName,
-                           ?loadSystemTotalMemory,
-                           ?loadSystemUsedMemory,
-                           ?loadLargestErlProcess,
-                           ?loadLargestErlProcessUsedMemory,
-                           ?loadCpuLoad,
-                           ?loadCpuLoad5,
-                           ?loadCpuLoad15,
-                           ?loadOsWordsize,
-                           ?loadSystemTotalMemory64,
-                           ?loadSystemUsedMemory64,
-                           ?loadLargestErlProcessUsedMemory64]),
-
-    ok.
-%%---------------------------------------------------------------------
-
-sys_tot_mem(Config) when is_list(Config) ->
-    [{[?loadSystemTotalMemory, Len | NodeStr], Mem}] =
-    os_mon_mib:load_table(get_next, [], [?loadSystemTotalMemory]),
-    Len = length(NodeStr),
-    true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
-
-    case Mem of
-        Mem when is_integer(Mem) ->
-            ok;
-        _ ->
-            ct:fail(sys_tot_mem_value_not_integer)
-    end.
-
-sys_used_mem(Config) when is_list(Config) ->
-    [{[?loadSystemUsedMemory, Len | NodeStr], Mem}] =
-    os_mon_mib:load_table(get_next,[], [?loadSystemUsedMemory]),
-    Len = length(NodeStr),
-    true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
-
-    case Mem of
-        Mem when is_integer(Mem) ->
-            ok;
-        _ ->
-            ct:fail(sys_used_mem_value_not_integer)
-    end.
-
-large_erl_process(Config) when is_list(Config) ->
-    {_, _, {Pid, _}} = memsup:get_memory_data(),
-    PidStr = lists:flatten(io_lib:format("~w", [Pid])),
-    [{[?loadLargestErlProcess, Len | NodeStr], PidStr}] =
-    os_mon_mib:load_table(get_next,[], [?loadLargestErlProcess]),
-    Len = length(NodeStr),
-    true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
-    ok.
-
-large_erl_process_mem(Config) when is_list(Config) ->
-
-    [{[?loadLargestErlProcessUsedMemory, Len | NodeStr], Mem}] =
-    os_mon_mib:load_table(get_next,[],
-                          [?loadLargestErlProcessUsedMemory]),
-    Len = length(NodeStr),
-    true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
-
-    case Mem of
-        Mem when is_integer(Mem) ->
-            ok;
-        _ ->
-            ct:fail(erl_pid_mem_value_not_integer)
-    end.
-
-cpu_load(Config) when is_list(Config) ->
-    [{[?loadCpuLoad, Len | NodeStr], Load}] =
-    os_mon_mib:load_table(get_next,[], [?loadCpuLoad]),
-    Len = length(NodeStr),
-    true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
-
-    case Load of
-        Load when is_integer(Load) ->
-            ok;
-        _ ->
-            ct:fail(cpu_load_value_not_integer)
-    end.
-
-cpu_load5(Config) when is_list(Config) ->
-    [{[?loadCpuLoad5, Len | NodeStr], Load}] =
-    os_mon_mib:load_table(get_next,[], [?loadCpuLoad5]),
-    Len = length(NodeStr),
-    true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
-
-    case Load of
-        Load when is_integer(Load) ->
-            ok;
-        _ ->
-            ct:fail(cpu_load5_value_not_integer)
-    end.
-
-cpu_load15(Config) when is_list(Config) ->
-    [{[?loadCpuLoad15, Len | NodeStr], Load}] =
-    os_mon_mib:load_table(get_next,[], [?loadCpuLoad15]),
-    Len = length(NodeStr),
-    true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
-
-    case Load of
-        Load when is_integer(Load) ->
-            ok;
-        _ ->
-            ct:fail(cpu_load15_value_not_integer)
-    end.
-
-os_wordsize(Config) when is_list(Config) ->
-    [{[?loadOsWordsize, Len | NodeStr], Wordsize}] =
-    os_mon_mib:load_table(get_next,[], [?loadOsWordsize]),
-    Len = length(NodeStr),
-    true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
-
-    case Wordsize of
-        Wordsize when is_integer(Wordsize) ->
-            ok;
-        _ ->
-            ct:fail(os_wordsize_value_not_integer)
-    end.
-
-sys_tot_mem64(Config) when is_list(Config) ->
-    [{[?loadSystemTotalMemory64, Len | NodeStr], Mem}] =
-    os_mon_mib:load_table(get_next, [], [?loadSystemTotalMemory64]),
-    Len = length(NodeStr),
-    true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
-
-    case Mem of
-        Mem when is_integer(Mem) ->
-            ok;
-        _ ->
-            ct:fail(sys_tot_mem_value_not_integer)
-    end.
-
-sys_used_mem64(Config) when is_list(Config) ->
-    [{[?loadSystemUsedMemory64, Len | NodeStr], Mem}] =
-    os_mon_mib:load_table(get_next,[], [?loadSystemUsedMemory64]),
-    Len = length(NodeStr),
-    true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
-
-    case Mem of
-        Mem when is_integer(Mem) ->
-            ok;
-        _ ->
-            ct:fail(sys_used_mem_value_not_integer)
-    end.
-
-large_erl_process_mem64(Config) when is_list(Config) ->
-
-    [{[?loadLargestErlProcessUsedMemory64, Len | NodeStr], Mem}] =
-    os_mon_mib:load_table(get_next,[],
-                          [?loadLargestErlProcessUsedMemory64]),
-    Len = length(NodeStr),
-    true = lists:member(list_to_atom(NodeStr), [node() | nodes()]),
-
-    case Mem of
-        Mem when is_integer(Mem) ->
-            ok;
-        _ ->
-            ct:fail(erl_pid_mem_value_not_integer)
-    end.
-%%---------------------------------------------------------------------
-%% Simulates get calls to test the instrumentation function
-%% for the diskTable.
-get_disk_table(Config) when is_list(Config) ->
-
-    DiskData = disksup:get_disk_data(),
-    DiskDataLen = length(DiskData),
-
-    if
-        DiskDataLen > 0 ->
-            [{value, Value}] =
-            os_mon_mib:disk_table(get, [1,1], [?diskDescr]),
-
-            case is_list(Value) of
-                true ->
-                    ok;
-                false ->
-                    ct:fail(value_not_a_string)
-            end,
-
-            Values = os_mon_mib:disk_table(get, [1,1],
-                                           [?diskId,
-                                            ?diskKBytes,
-                                            ?diskCapacity]),
-
-            IsInt = fun({value, Val}) when is_integer(Val) ->
-                            true;
-                       (_) ->
-                            false
-                    end,
-
-            NewValues = lists:filter(IsInt, Values),
-
-            case length(NewValues) of
-                3 ->
-                    ok;
-                _ ->
-                    ct:fail(value_not_integer)
-            end
-    end,
-
-    [{noValue,noSuchInstance}, {noValue,noSuchInstance},
-     {noValue,noSuchInstance}, {noValue,noSuchInstance}] =
-    os_mon_mib:disk_table(get, [1, DiskDataLen + 1], [?diskId,
-                                                      ?diskDescr,
-                                                      ?diskKBytes,
-                                                      ?diskCapacity]),
-
-    ok.
-
-%%---------------------------------------------------------------------
-
-disk_descr(Config) when is_list(Config) ->
-    [{[?diskDescr, 1,1], Descr}] =
-    os_mon_mib:disk_table(get_next, [], [?diskDescr]),
-
-    case Descr of
-        Descr when is_list(Descr) ->
-            ok;
-        _ ->
-            ct:fail(disk_descr_value_not_a_string)
-    end.
-
-disk_kbytes(Config) when is_list(Config) ->
-    [{[?diskKBytes, 1,1], Kbytes}] =
-    os_mon_mib:disk_table(get_next,[], [?diskKBytes]),
-
-    case Kbytes of
-        Kbytes when is_integer(Kbytes) ->
-            ok;
-        _ ->
-            ct:fail(disk_kbytes_value_not_integer)
-    end.
-
-
-disk_capacity(Config) when is_list(Config) ->
-    [{[?diskCapacity, 1,1], Capacity}] =
-    os_mon_mib:disk_table(get_next,[], [?diskCapacity]),
-
-    case Capacity of
-        Capacity when is_integer(Capacity) ->
-            ok;
-        _ ->
-            ct:fail(disk_capacity_value_not_integer)
-    end.
-
-%%---------------------------------------------------------------------
-%% Starts an snmp manager and sends a real snmp-request. i.e.
-%% sends a udp message on the correct format.
-real_snmp_request(Config) when is_list(Config) ->
-    NodStr = atom_to_list(node()),
-    Len = length(NodStr),
-    {_, _, {Pid, _}} = memsup:get_memory_data(),
-    PidStr = lists:flatten(io_lib:format("~w", [Pid])),
-    io:format("FOO: ~p~n", [PidStr]),
-    ok = snmp_get([?loadEntry ++
-                   [?loadLargestErlProcess, Len | NodStr]],
-                  PidStr),
-    ok = snmp_get_next([?loadEntry ++
-                        [?loadSystemUsedMemory, Len | NodStr]],
-                       ?loadEntry ++ [?loadSystemUsedMemory + 1, Len
-                                      | NodStr], PidStr),
-    ok = snmp_set([?loadEntry ++ [?loadLargestErlProcess,  Len | NodStr]],
-                  s, "<0.101.0>", Config),
-    ok.
-
-%% Starts an snmp manager and requests total memory. Was previously
-%% integer32 which was errornous on 64 bit machines.
-otp_7441(Config) when is_list(Config) ->
-    NodStr = atom_to_list(node()),
-    Len = length(NodStr),
-    Oids = [Oid|_] = [?loadEntry ++ [?loadSystemTotalMemory, Len | NodStr]],
-    {noError,0,[#varbind{oid = Oid, variabletype = 'Unsigned32'}]} =
-    ct_snmp:get_values(os_mon_mib_test, Oids, snmp_mgr_agent),
-
-    ok.
-
-%%---------------------------------------------------------------------
-%% Internal functions
-%%---------------------------------------------------------------------
-start_node() ->
-    Pa = filename:dirname(code:which(?MODULE)),
-    {ok,Node} = test_server:start_node(testnisse, slave, [{args, " -pa " ++ Pa}]),
-    Node.
-
-stop_node(Node) ->
-    test_server:stop_node(Node).
-
-del_dir(Dir) ->
-    io:format("Deleting: ~s~n",[Dir]),
-    {ok, Files} = file:list_dir(Dir),
-    FullPathFiles = lists:map(fun(File) -> filename:join(Dir, File) end,
-                              Files),
-    lists:foreach(fun file:delete/1, FullPathFiles),
-    file:del_dir(Dir).
-
-%%---------------------------------------------------------------------
-snmp_get(Oids = [Oid |_], Result) ->
-    {noError,0,[#varbind{oid = Oid,
-                         variabletype = 'OCTET STRING',
-                         value = Result}]} =
-    ct_snmp:get_values(os_mon_mib_test, Oids, snmp_mgr_agent),
-    ok.
-
-snmp_get_next(Oids, NextOid, Result) ->
-    {noError,0,[#varbind{oid = NextOid,
-                         variabletype = 'OCTET STRING',
-                         value = Result}]} =
-    ct_snmp:get_next_values(os_mon_mib_test, Oids, snmp_mgr_agent),
-    ok.
-
-snmp_set(Oid, ValuType, Value, Config) ->
-    {notWritable, _, _} =
-    ct_snmp:set_values(os_mon_mib_test, [{Oid, ValuType, Value}],
-                       snmp_mgr_agent, Config),
-    ok.
diff --git a/lib/os_mon/vsn.mk b/lib/os_mon/vsn.mk
index 9713f6bc6b..845443d329 100644
--- a/lib/os_mon/vsn.mk
+++ b/lib/os_mon/vsn.mk
@@ -1 +1 @@
-OS_MON_VSN = 2.4.7
+OS_MON_VSN = 2.5
diff --git a/lib/otp_mibs/AUTHORS b/lib/otp_mibs/AUTHORS
deleted file mode 100644
index 3f570082f4..0000000000
--- a/lib/otp_mibs/AUTHORS
+++ /dev/null
@@ -1,8 +0,0 @@
-Original Authors and Contributors: 
-
-Martin Bj�rklund
-Lars Thorsen
-Claes Wikstr�m
-Kent Boortz
-Bj�rn Gustavsson
-Ingela Anderton - Created otp_mibs app. to eliminate SASL's SNMP dependence.
diff --git a/lib/otp_mibs/doc/src/Makefile b/lib/otp_mibs/doc/src/Makefile
deleted file mode 100644
index 22c3c127ac..0000000000
--- a/lib/otp_mibs/doc/src/Makefile
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2003-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%
-#
-
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(OTP_MIBS_VSN)
-APPLICATION=otp_mibs
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-XML_APPLICATION_FILES = ref_man.xml
-XML_REF3_FILES = otp_mib.xml
-
-XML_PART_FILES = part.xml
-XML_CHAPTER_FILES = \
-	introduction.xml \
-	mibs.xml \
-	notes.xml
-
-BOOK_FILES = book.xml
-
-XML_FILES = \
-	$(BOOK_FILES) $(XML_CHAPTER_FILES) \
-	$(XML_PART_FILES) $(XML_REF3_FILES) $(XML_APPLICATION_FILES)
-
-GIF_FILES =
-
-# ----------------------------------------------------
-
-HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html)
-
-INFO_FILE = ../../info
-
-MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
-
-HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
-
-TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-XML_FLAGS +=
-DVIPS_FLAGS +=
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-$(HTMLDIR)/%.gif: %.gif
-	$(INSTALL_DATA) $< $@
-
-docs: pdf html man
-
-$(TOP_PDF_FILE): $(XML_FILES)
-
-pdf: $(TOP_PDF_FILE)
-
-html: gifs $(HTML_REF_MAN_FILE)
-
-man: $(MAN3_FILES)
-
-gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
-
-debug opt:
-
-clean clean_docs:
-	rm -rf $(HTMLDIR)/*
-	rm -rf $(XMLDIR)
-	rm -f $(MAN3DIR)/*
-	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
-	rm -f errs core *~
-
-# ----------------------------------------------------
-# Release Target
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_docs_spec: docs
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(HTMLDIR)/* \
-		"$(RELSYSDIR)/doc/html"
-	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
-	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
-	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
-
-release_spec:
diff --git a/lib/otp_mibs/doc/src/introduction.xml b/lib/otp_mibs/doc/src/introduction.xml
deleted file mode 100644
index 7046cbb8ae..0000000000
--- a/lib/otp_mibs/doc/src/introduction.xml
+++ /dev/null
@@ -1,47 +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>Introduction</title>
-    <prepared>Ingela Anderton</prepared>
-    <docno></docno>
-    <date>2003-05-19</date>
-    <rev>A</rev>
-    <file>introduction.xml</file>
-  </header>
-
-  <section>
-    <title>Purpose</title>
-    <p>The purpose of the OTP_Mibs application is to provide an SNMP
-      management information base for Erlang nodes.</p>
-  </section>
-
-  <section>
-    <title>Pre-requisites</title>
-    <p>It is assumed that the reader is familiar with the Erlang
-      programming language, concepts of OTP and has a basic knowledge
-      of SNMP.</p>
-  </section>
-</chapter>
-
-
diff --git a/lib/otp_mibs/doc/src/mibs.xml b/lib/otp_mibs/doc/src/mibs.xml
deleted file mode 100644
index a32d5ea5f5..0000000000
--- a/lib/otp_mibs/doc/src/mibs.xml
+++ /dev/null
@@ -1,71 +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>Mibs</title>
-    <prepared>Ingela Anderton</prepared>
-    <docno></docno>
-    <date>2003-05-19</date>
-    <rev>A</rev>
-    <file>mibs.xml</file>
-  </header>
-
-  <section>
-    <title>Structure</title>
-    <p>The OTP mibs are stored in the
-      <c>$OTP_ROOT/lib/otp_mibs/mibs/</c> directory. They
-      are defined in SNMPv2 SMI syntax. An SNMPv1 version of the mib is
-      delivered in the <c>mibs/v1</c> directory. The compiled MIB is
-      located under <c>priv/mibs</c>, and the generated <c>.hrl</c>
-      file under the <c>include</c> directory. To compile a MIB that
-      IMPORTS a MIB in the OTP_Mibs application, give the option
-      <c>{il, ["otp_mibs/priv/mibs"]}</c> to the MIB compiler.</p>
-  </section>
-
-  <section>
-    <title>OTP-MIB</title>
-    <p>The OTP-MIB mib represents information about Erlang nodes such as
-      node name, number of running processes, virtual machine version
-      etc. If the MIB should be used in a system, it should be
-      loaded into an SNMP agent by using the API function
-      <c>otp_mib:load/1</c>.</p>
-  </section>
-
-  <section>
-    <title>OTP-REG</title>
-    <p>The OTP-REG mib defines the unique OTP subtree of object
-      identifiers under the Ericsson subtree. Under the OTP subtree
-      several object identifiers are defined. This module is typically
-      included by OTP applications defining their own mibs, or ASN.1
-      modules in general, that require unique object identifiers under
-      the OTP subtree.</p>
-  </section>
-
-  <section>
-    <title>OTP-TC</title>
-    <p>The OTP-TC mib provides the textual convention datatype
-      <c>OwnerString</c>.</p>
-  </section>
-</chapter>
-
-
diff --git a/lib/otp_mibs/doc/src/notes.xml b/lib/otp_mibs/doc/src/notes.xml
deleted file mode 100644
index 443f08f1e1..0000000000
--- a/lib/otp_mibs/doc/src/notes.xml
+++ /dev/null
@@ -1,327 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2004</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>OTP_Mibs Release Notes</title>
-    <prepared>otp_appnotes</prepared>
-    <docno>nil</docno>
-    <date>nil</date>
-    <rev>nil</rev>
-    <file>notes.xml</file>
-  </header>
-  <p>This document describes the changes made to the OTP_Mibs
-    application.</p>
-
-<section><title>Otp_Mibs 1.2.1</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Improved documentation.</p>
-          <p>
-	    Own Id: OTP-15190</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Otp_Mibs 1.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    The otp_mibs application has been deprecated and will be
-	    removed in a future release.</p>
-          <p>
-	    Own Id: OTP-15141</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<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>
-      <list>
-        <item>
-          <p>
-	    Internal changes</p>
-          <p>
-	    Own Id: OTP-13551</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Otp_Mibs 1.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Change license text from Erlang Public License to Apache
-	    Public License v2</p>
-          <p>
-	    Own Id: OTP-12845</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Otp_Mibs 1.0.10</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Make sure the clean rule for ssh, ssl, eunit and otp_mibs
-	    actually removes generated files.</p>
-          <p>
-	    Own Id: OTP-12200</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Otp_Mibs 1.0.9</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Add type based integer value truncation/reset.</p>
-          <p>
-	    This fixes errors when querying e.g. the
-	    erlNodeReductions, erlNodeInBytes and erlNodeOutBytes
-	    objects in long-running Erlang/OTP systems.</p>
-          <p>
-	    Update types of applicable MIB objects to 64bit based
-	    types.</p>
-          <p>
-	    Potential incompatibility: Type change of Counter32 to
-	    Counter64 in OTP-MIB.mib</p>
-          <p>
-	    (Thanks to Tobias Schlager)</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-11203</p>
-        </item>
-        <item>
-          <p>
-	    Application upgrade (appup) files are corrected for the
-	    following applications: </p>
-          <p>
-	    <c>asn1, common_test, compiler, crypto, debugger,
-	    dialyzer, edoc, eldap, erl_docgen, et, eunit, gs, hipe,
-	    inets, observer, odbc, os_mon, otp_mibs, parsetools,
-	    percept, public_key, reltool, runtime_tools, ssh,
-	    syntax_tools, test_server, tools, typer, webtool, wx,
-	    xmerl</c></p>
-          <p>
-	    A new test utility for testing appup files is added to
-	    test_server. This is now used by most applications in
-	    OTP.</p>
-          <p>
-	    (Thanks to Tobias Schlager)</p>
-          <p>
-	    Own Id: OTP-11744</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Otp_Mibs 1.0.8</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Misc build updates</p>
-          <p>
-	    Own Id: OTP-10784</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Otp_Mibs 1.0.7</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Tuple funs (a two-element tuple with a module name and a
-	    function) are now officially deprecated and will be
-	    removed in R16. Use '<c>fun M:F/A</c>' instead. To make
-	    you aware that your system uses tuple funs, the very
-	    first time a tuple fun is applied, a warning will be sent
-	    to the error logger.</p>
-          <p>
-	    Own Id: OTP-9649</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Otp_Mibs 1.0.6</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    The documentation is now built with open source tools
-	    (xsltproc and fop) that exists on most platforms. One
-	    visible change is that the frames are removed.</p>
-          <p>
-	    Own Id: OTP-8201</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Otp_Mibs 1.0.5</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>The copyright notices have been updated.</p>
-          <p>
-	    Own Id: OTP-7851</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-  <section>
-    <title>Otp_Mibs 1.0.4.1</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Minor Makefile changes.</p>
-          <p>Own Id: OTP-6689</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>OTP_Mibs 1.0.4</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Replaced calls to deprecated functions in <c>snmp</c>
-            with calls to the equivalent functions in <c>snmpa</c>.</p>
-          <p>Own Id: OTP-6112</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>OTP_Mibs 1.0.3</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>The <c>otp_mib</c> module has been cleaned up to improve the
-            maintainability. It should have no effect on the
-            functionality of the OTP_Mibs application.</p>
-          <p>Own Id: OTP-4982</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>OTP_Mibs 1.0.2</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>Incorrect <c>.app</c> file (missing mandatory
-            <c>registered</c>).</p>
-          <p>Own Id: OTP-4823 Aux Id: Seq8145, OTP-4801 </p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>OTP_Mibs 1.0.1</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>Missing <c>.app</c> and <c>appup</c> files in <c>ebin</c>.</p>
-          <p>Own Id: OTP-4801 Aux Id: Seq8145 </p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>OTP_Mibs 1.0</title>
-    <p>The OTP mibs that where included in the SASL application
-      have been moved to this new application OTP_Mibs. The OTP
-      mibs had no real connection to SASL and it is desirable that
-      the core of Erlang/OTP is not dependent on SNMP.</p>
-    <p>Own Id: OTP-4686</p>
-  </section>
-</chapter>
-
-
diff --git a/lib/otp_mibs/doc/src/otp_mib.xml b/lib/otp_mibs/doc/src/otp_mib.xml
deleted file mode 100644
index 530c529c69..0000000000
--- a/lib/otp_mibs/doc/src/otp_mib.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>2003</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>otp_mib</title>
-    <prepared>Ingela Anderton</prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <module>otp_mib</module>
-  <modulesummary>Handles the OTP-MIB</modulesummary>
-  <description>
-    <p>The SNMP application should be used to start an SNMP agent. Then
-      the API functions below can be used to load/unload the OTP-MIB
-      into/from the agent. The instrumentation of the OTP-MIB uses
-    Mnesia, hence Mnesia must be started prior to loading the OTP-MIB.</p>
-    <warning>
-      <p>This application has been deprecated and will be removed in a furture release.</p>
-    </warning>
-  </description>
-  <funcs>
-    <func>
-      <name>load(Agent) -> ok | {error, Reason}</name>
-      <fsummary>Load the OTP-MIB</fsummary>
-      <type>
-        <v>Agent = pid() | atom()</v>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p>Loads the OTP-MIB.</p>
-      </desc>
-    </func>
-    <func>
-      <name>unload(Agent) -> ok | {error, Reason}</name>
-      <fsummary>Unload the OTP-MIB</fsummary>
-      <type>
-        <v>Agent = pid() | atom()</v>
-        <v>Reason = term()</v>
-      </type>
-      <desc>
-        <p>Unloads the OTP-MIB.</p>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>See Also</title>
-    <p>snmp(3)</p>
-  </section>
-</erlref>
-
-
diff --git a/lib/otp_mibs/info b/lib/otp_mibs/info
deleted file mode 100644
index aedd1c883b..0000000000
--- a/lib/otp_mibs/info
+++ /dev/null
@@ -1,2 +0,0 @@
-group: oam Operation & Maintenance Applications
-short: SNMP management information base for Erlang/OTP nodes. 
diff --git a/lib/otp_mibs/mibs/OTP-EVA-MIB.mib b/lib/otp_mibs/mibs/OTP-EVA-MIB.mib
deleted file mode 100644
index 4d0c53ed95..0000000000
--- a/lib/otp_mibs/mibs/OTP-EVA-MIB.mib
+++ /dev/null
@@ -1,569 +0,0 @@
---
--- %CopyrightBegin%
--- 
--- Copyright Ericsson AB 2004-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%
---
-
-OTP-EVA-MIB DEFINITIONS ::= BEGIN
-
-IMPORTS
-    MODULE-IDENTITY, OBJECT-TYPE, NOTIFICATION-TYPE,
-    Counter32, Gauge32, Integer32
-        FROM SNMPv2-SMI
-    TEXTUAL-CONVENTION, DisplayString, DateAndTime
-        FROM SNMPv2-TC
-    MODULE-COMPLIANCE, OBJECT-GROUP, NOTIFICATION-GROUP
-        FROM SNMPv2-CONF
-    otpModules, otpApplications
-        FROM OTP-REG
-    OwnerString
-        FROM OTP-TC
-    ;
-
-otpEvaModule MODULE-IDENTITY
-    LAST-UPDATED "200305090900Z"
-    ORGANIZATION "Ericsson"
-    CONTACT-INFO
-       "Contact:  Erlang Support see license agreement for Erlang/OTP."
-    DESCRIPTION
-	"This MIB is part of the OTP MIB.  It defines MIB objects
-	for the eva application in OTP."
-   
-    REVISION	"200305090900Z"
-    DESCRIPTION		
-        "Changed CONTACT-INFO as it was outdated, made it more generic
-	to avoid such changes in the future."
-    
-    REVISION     "199801270900Z"
-    DESCRIPTION
-        "Changed erroneous defintion of alarmCleared notification.
-        Changed erroneous name of this module to otpEvaModule."
-    REVISION     "199712010900Z"
-    DESCRIPTION
-        "Converted to v2 SMI and placed in the OTP tree."
-    REVISION     "199705020900Z"
-    DESCRIPTION
-        "The initial version of this MIB module.  It is very much
-        inspired by the ANS-ALM-MIB and Axd301Eva-OMS mibs."
-    ::= { otpModules 6 }
-
-otpEvaMIB       OBJECT IDENTIFIER ::= { otpApplications 4 }
-otpEvaMIBConformance
-                OBJECT IDENTIFIER ::= { otpEvaMIB 1 }
-otpEvaMIBObjects
-                OBJECT IDENTIFIER ::= { otpEvaMIB 2 }
-otpEvaMIBEvents OBJECT IDENTIFIER ::= { otpEvaMIB 3 }
-otpEvaMIBEventsV2
-                OBJECT IDENTIFIER ::= { otpEvaMIBEvents 0 }
-
-
--- Datatypes
-
-AlarmSeverity ::= TEXTUAL-CONVENTION
-    STATUS      current
-    DESCRIPTION
-        "The AlarmSeverity defines six severity levels,
-        which provide an indication of how it is perceived that the
-        capability of the managed object has been affected.  Those
-        severity levels which represent service affecting conditions
-        ordered from most severe to least severe are critical,
-        major, minor and warning.  The levels used are as defined
-        in X.733, ITU Alarm Reporting Function:
-
-            o The Indeterminate severity level indicates that the
-              severity level cannot be determined.
-
-            o The Critical severity level indicates that a service
-              affecting condition has occurred and an immediate
-              corrective action is required.  Such a severity can be
-              reported, for example, when a managed object becomes
-              totally out of service and its capability must be restored.
-
-            o The Major severity level indicates that a service
-              affecting condition has developed and an urgent corrective
-              action is required.  Such a severity can be reported, for
-              example, when there is a severe degradation in the
-              capability of the managed object and its full capability
-              must be restored.
-
-            o The Minor severity level indicates the existence of a
-              non-service affecting fault condition and that corrective
-              action should be taken in order to prevent a more serious
-              (for example, service affecting) fault.  Such a severity
-              can be reported, for example, when the detected alarm
-              condition is not currently degrading the capacity of the
-              managed object.
-
-            o The Warning severity level indicates the detection of a
-              potential or impending service affecting fault, before any
-              significant effects have been felt.  Action should be taken
-              to further diagnose (if necessary) and correct the problem
-              in order to prevent it from becoming a more serious service
-              affecting fault.
-
-        When an alarm is cleared, an alarmCleared event is generated.
-        This event clears the alarm with the currentAlarmFaultId
-        contained in the event.  It is not required that the clearing
-        of previously reported alarms are reported.  Therefore, a managing
-        system cannot assume that the absence of an alarmedCleared event
-        for a fault means that the condition that caused the generation
-        of previous alarms is still present.  Managed object definers
-        shall state if, and under which conditions, the alarmedCleared
-        event is used.
-
-        The clear value of AlarmSeverity is an action which is used when
-        a management station wants to clear an active alarm.  This is not
-        possible on all systems, and thus an agent does not have support
-        write access for this value."
-    REFERENCE
-        "X.733, ITU Alarm Reporting Function"
-    SYNTAX INTEGER {
-                indeterminate (0),
-                critical (1),
-                major (2),
-                minor (3),
-                warning (4),
-                clear (5)   -- Written, not read
-                }
-
-AlarmClass ::= TEXTUAL-CONVENTION
-    STATUS      current
-    DESCRIPTION
-        "The AlarmClass type categorizes the alarm, and is
-	defined when the alarm is registered.  It is as defined in
-	X.733, ITU Alarm Reporting Function:
-
-            o communications.  An alarm of this class is principally
-              associated with the procedures or processes required
-              to convey information from one point to another.
-
-            o qos.  An alarm of this class is principally associated
-              with a degradation in the quality of service.
-
-            o processing.  An alarm of this class is principally
-              associated with a software or processing fault.
-
-	    o equipment.  An alarm of this class is principally
-              associated with an equipment fault.
-
-            o environmental.  An alarm of this class is principally
-	    associated with a condition relating to an enclosure in
-	    with equipment resides."
-    REFERENCE
-        "X.733, ITU Alarm Reporting Function"
-    SYNTAX INTEGER {
-        unknown (0),
-        communications (1),
-        qos (2),
-        processing (3),
-        equipment (4),
-        environmental (5)
-        }
-
-
--- Managed Objects
-
-event          OBJECT IDENTIFIER ::= { otpEvaMIBObjects 1 }
-alarm          OBJECT IDENTIFIER ::= { otpEvaMIBObjects 2 }
-currentAlarm   OBJECT IDENTIFIER ::= { otpEvaMIBObjects 3 }
-
--- The Event group
---
--- The Event group controls the generation of notifications of
--- events from the system.
-
-eventTable OBJECT-TYPE
-    SYNTAX      SEQUENCE OF EventEntry
-    MAX-ACCESS  not-accessible
-    STATUS      current
-    DESCRIPTION
-        "A list of events defined by the system.  This table is used
-        to control the sending of traps and to whom the traps are
-        sent."
-    ::= { event 1 }
-
-eventEntry OBJECT-TYPE
-    SYNTAX      EventEntry
-    MAX-ACCESS  not-accessible
-    STATUS      current
-    DESCRIPTION
-        "A set of parameters that describe an event to be
-        generated when certain conditions are met."
-    INDEX  { eventIndex }
-    ::= { eventTable 1 }
-
-EventEntry ::= SEQUENCE {
-    eventIndex      Integer32 (1..2147483647),
-    eventTrapName   DisplayString,
-    eventTreatment  INTEGER,
-    eventCommunity  OCTET STRING (SIZE (0..127)),
-    eventSentTraps  Counter32,
-    eventOwner      OwnerString
-    }
-
-eventIndex OBJECT-TYPE
-    SYNTAX      Integer32 (1..2147483647)
-    MAX-ACCESS  not-accessible
-    STATUS      current
-    DESCRIPTION
-        "An index that uniquely identifies an entry in the
-        event table.  Each such entry defines one event that
-        is to be generated when the appropriate conditions
-        occur.  The value for each eventIndex must remain
-        constant, at least from one re-initialization of the
-        entity's network management system to the next
-        re-initialization."
-    ::= { eventEntry 1 }
-
-eventTrapName OBJECT-TYPE
-    SYNTAX      DisplayString
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The identifier of the corresponding trap.
-        NOTE: this should be an OID in SNMPv2, but must be
-        a string in v1."
-    ::= { eventEntry 2 }
-
-eventTreatment OBJECT-TYPE
-    SYNTAX  INTEGER {
-        none(1),
-        log(2),
-        snmpTrap(3),
-        logAndTrap(4)
-        }
-    MAX-ACCESS  read-write
-    STATUS      current
-    DESCRIPTION
-        "Defines how the system shall treat this event. In the
-        case of snmpTrap, an SNMP trap is sent to one or more
-        management stations. In the case of log, the event is
-        guaranteed to be logged in a log according to some log
-        strategy. Each such log strategy may define a MIB module
-        for control and examination of logs."
-    ::= { eventEntry 3 }
-
-eventCommunity OBJECT-TYPE
-    SYNTAX      OCTET STRING (SIZE (0..127))
-    MAX-ACCESS  read-write
-    STATUS      current
-    DESCRIPTION
-        "If an SNMP trap is to be sent, it will be sent to
-        the SNMP community specified by this octet string."
-    ::= { eventEntry 4 }
-
-eventSentTraps OBJECT-TYPE
-    SYNTAX      Counter32
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The number of times this event has been sent as a trap."
-    ::= { eventEntry 5 }
-
-eventOwner OBJECT-TYPE
-    SYNTAX      OwnerString
-    MAX-ACCESS  read-write
-    STATUS      current
-    DESCRIPTION
-        "The manager entity that 'owns' this event entry, and is
-        therefore responsible for its contents."
-    ::= { eventEntry 6 }
-
-eventTime OBJECT-TYPE
-    SYNTAX      DateAndTime
-    MAX-ACCESS  accessible-for-notify
-    STATUS      current
-    DESCRIPTION
-        "This object may be included in a trap definition for an event.
-        It specifies the time the event was generated."
-    ::= { event 2 }
-
-
--- The Alarm group
---
--- The Alarm group extends the Event group with objects for alarms.
-
-alarmTable OBJECT-TYPE
-    SYNTAX      SEQUENCE OF AlarmEntry
-    MAX-ACCESS  not-accessible
-    STATUS      current
-    DESCRIPTION
-        "Contains additional information for alarm events."
-    ::= { alarm 1 }
-
-alarmEntry OBJECT-TYPE
-    SYNTAX      AlarmEntry
-    MAX-ACCESS  not-accessible
-    STATUS      current
-    DESCRIPTION
-        "A set of parameters for alarms."
-    INDEX { eventIndex }
-    ::= { alarmTable 1 }
-
-AlarmEntry ::= SEQUENCE {
-    alarmClass      AlarmClass,
-    alarmSeverity   AlarmSeverity
-    }
-
-alarmClass OBJECT-TYPE
-    SYNTAX      AlarmClass
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The class of this alarm."
-    ::= { alarmEntry 1 }
-
-alarmSeverity OBJECT-TYPE
-    SYNTAX      AlarmSeverity
-    MAX-ACCESS  read-write
-    STATUS      current
-    DESCRIPTION
-        "The perceived severity that shall apply to the 
-        associated alarms."
-    ::= { alarmEntry 2 }
-
-
--- The CurrentAlarm group
---
--- The CurrentAlarm group is a collection of objects for monitoring of
--- active alarms in the system.
-
-numberOfCurrentAlarms OBJECT-TYPE
-    SYNTAX      Gauge32
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "Number of currently active alarms in the system."
-    ::= { currentAlarm 1 }
-
-currentAlarmLastTimeChanged OBJECT-TYPE
-    SYNTAX      DateAndTime
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The time an entry in the currentAlarmTable was changed.
-        It may be used by a management station as a value to
-        poll.  If the value is changed, the management station
-        knows that the currentAlarmTable has been updated."
-    ::= { currentAlarm 2 }
-
-currentAlarmTable OBJECT-TYPE
-    SYNTAX      SEQUENCE OF CurrentAlarmEntry
-    MAX-ACCESS  not-accessible
-    STATUS      current
-    DESCRIPTION
-        "A list of currently active alarms in the system."
-    ::= { currentAlarm 3 }
-
-currentAlarmEntry OBJECT-TYPE
-    SYNTAX      CurrentAlarmEntry
-    MAX-ACCESS  not-accessible
-    STATUS      current
-    DESCRIPTION
-        "A set of parameters that describe a currently active
-        alarm."
-    INDEX { currentAlarmFaultId }
-    ::= { currentAlarmTable 1 }
-
-CurrentAlarmEntry ::= SEQUENCE {
-    currentAlarmFaultId     Integer32 (1..2147483647),
-    currentAlarmEventIndex  Integer32 (1..2147483647),
-    currentAlarmObject      OBJECT IDENTIFIER,
-    currentAlarmCause       OBJECT IDENTIFIER,
-    currentAlarmSeverity    AlarmSeverity,
-    currentAlarmTime        DateAndTime,
-    currentAlarmInformation DisplayString,
-    currentAlarmExtra1      OBJECT IDENTIFIER,
-    currentAlarmExtra2      OBJECT IDENTIFIER
-    }
-
-currentAlarmFaultId OBJECT-TYPE
-    SYNTAX      Integer32 (1..2147483647)
-    MAX-ACCESS  not-accessible
-    STATUS      current
-    DESCRIPTION
-        "An id that uniquely identifies a fault. Each fault is
-        represented as one an entry in the currentAlarmTable."
-    ::= { currentAlarmEntry 1 }
-
-currentAlarmEventIndex OBJECT-TYPE
-    SYNTAX      Integer32 (1..2147483647)
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "A pointer into the eventTable. Points to the event
-                corresponding to this alarm."
-    ::= { currentAlarmEntry 2 }
-
-currentAlarmObject OBJECT-TYPE
-    SYNTAX      OBJECT IDENTIFIER
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The alarming object."
-    ::= { currentAlarmEntry 3 }
-
-currentAlarmCause OBJECT-TYPE
-    SYNTAX      OBJECT IDENTIFIER
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The probable cause of the alarm."
-    ::= { currentAlarmEntry 4 }
-
-currentAlarmSeverity OBJECT-TYPE
-    SYNTAX      AlarmSeverity
-    MAX-ACCESS  read-write
-    STATUS      current
-    DESCRIPTION
-        "The perceived severity of the fault.  A manager can set
-        this value to clear only.  When set to clear, the alarm
-        is removed from this table, and a 'clearAlarm' event is
-        generated."
-    ::= { currentAlarmEntry 5 }
-
-currentAlarmTime OBJECT-TYPE
-    SYNTAX      DateAndTime
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The time the fault was detected."
-    ::= { currentAlarmEntry 6 }
-
-currentAlarmInformation OBJECT-TYPE
-    SYNTAX      DisplayString
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "Additional information pin-pointing the problem."
-    ::= { currentAlarmEntry 7 }
-
-currentAlarmExtra1 OBJECT-TYPE
-    SYNTAX      OBJECT IDENTIFIER
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "An extra parameter used for some alarms at their own
-        discretion.  Can be used for example to identify
-        additional objects in the alarm, or instead of 
-        currentAlarmInformation to pin-point the problem, if the
-        additional information is defined in some MIB."
-    ::= { currentAlarmEntry 8 }
-
-currentAlarmExtra2 OBJECT-TYPE
-    SYNTAX      OBJECT IDENTIFIER
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "An extra parameter used for some alarms at their own
-        discretion.  Can be used for example to identify
-        additional objects in the alarm, or instead of 
-        currentAlarmInformation to pin-point the problem, if the
-        additional information is defined in some MIB."
-    ::= { currentAlarmEntry 9 }
-
-
--- Events
-
-alarmCleared NOTIFICATION-TYPE
-    OBJECTS {
-        currentAlarmEventIndex,
-        eventTime
-        }
-    STATUS  current
-    DESCRIPTION
-        "This event is sent when an alarm has been cleared,
-        either by the application or by an operator.  Note that the
-        currentAlarmFaultId is implicitly sent as the instance identifier
-        for currentAlarmEventIndex."
-    ::= { otpEvaMIBEventsV2 1 }
-
-
--- conformance information
-
-otpEvaMIBCompliances
-                OBJECT IDENTIFIER ::= { otpEvaMIBConformance 1 }
-otpEvaMIBGroups
-                OBJECT IDENTIFIER ::= { otpEvaMIBConformance 2 }
-
-
--- compliance statements
-
-otpEvaBasicCompliance MODULE-COMPLIANCE
-    STATUS  current
-    DESCRIPTION
-        "The compliance statement for SNMPv2 entities which
-        implement the OTP-EVA-MIB."
-    MODULE  -- this module
-        MANDATORY-GROUPS { eventGroup,
-                           alarmGroup,
-                           currentAlarmGroup,
-                           evaEventsGroup }
-
-    ::= { otpEvaMIBCompliances 1 }
-
-
--- units of conformance
-
-eventGroup OBJECT-GROUP
-    OBJECTS { eventTrapName,
-              eventTreatment,
-              eventCommunity,
-              eventSentTraps,
-              eventOwner,
-              eventTime }
-    STATUS  current
-    DESCRIPTION
-        "A collection of objects providing basic instrumentation
-        and control of the events defined in the OTP system."
-    ::= { otpEvaMIBGroups 1 }
-
-alarmGroup OBJECT-GROUP
-    OBJECTS { alarmClass,
-              alarmSeverity }
-    STATUS  current
-    DESCRIPTION
-        "A collection of objects providing basic instrumentation
-        and control of the alarms defined the OTP system."
-    ::= { otpEvaMIBGroups 2 }
-
-currentAlarmGroup OBJECT-GROUP
-    OBJECTS { numberOfCurrentAlarms,
-              currentAlarmLastTimeChanged,
-              currentAlarmEventIndex,
-              currentAlarmObject,
-              currentAlarmCause,
-              currentAlarmSeverity,
-              currentAlarmTime,
-              currentAlarmInformation,
-              currentAlarmExtra1,
-              currentAlarmExtra2 }
-    STATUS  current
-    DESCRIPTION
-        "A collection of objects providing basic instrumentation
-        of the activa alarm list in the OTP system."
-    ::= { otpEvaMIBGroups 3 }
-
-evaEventsGroup NOTIFICATION-GROUP
-    NOTIFICATIONS { alarmCleared }
-    STATUS        current
-    DESCRIPTION
-        "The notification which is generated from EVA."
-    ::= { otpEvaMIBGroups 4 }
-
-
-END
diff --git a/lib/otp_mibs/mibs/OTP-MIB.funcs b/lib/otp_mibs/mibs/OTP-MIB.funcs
deleted file mode 100644
index 9f9d69c3d1..0000000000
--- a/lib/otp_mibs/mibs/OTP-MIB.funcs
+++ /dev/null
@@ -1,2 +0,0 @@
-{erlNodeTable, {otp_mib, erl_node_table, []}}.
-{applTable, {otp_mib, appl_table, []}}.
diff --git a/lib/otp_mibs/mibs/OTP-MIB.mib b/lib/otp_mibs/mibs/OTP-MIB.mib
deleted file mode 100644
index 693319eae4..0000000000
--- a/lib/otp_mibs/mibs/OTP-MIB.mib
+++ /dev/null
@@ -1,318 +0,0 @@
---
--- %CopyrightBegin%
--- 
--- Copyright Ericsson AB 1996-2016. All Rights Reserved.
--- 
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
--- 
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
--- 
--- %CopyrightEnd%
---
-
-OTP-MIB DEFINITIONS ::= BEGIN
- 
-IMPORTS
-    MODULE-IDENTITY, OBJECT-TYPE,
-    Counter64, Gauge32, Integer32
-        FROM SNMPv2-SMI
-    TEXTUAL-CONVENTION, DisplayString
-        FROM SNMPv2-TC
-    MODULE-COMPLIANCE, OBJECT-GROUP
-        FROM SNMPv2-CONF
-    otpModules, otpApplications
-        FROM OTP-REG
-    ;
-
-otpModule MODULE-IDENTITY
-    LAST-UPDATED    "201307160700Z"
-    ORGANIZATION    "Ericsson"
-    CONTACT-INFO
-        "Contact:    Erlang Support see license agreement for Erlang/OTP."
-    DESCRIPTION
-        "This is a MIB for a distributed OTP system, with one SNMP
-        agent executing at one node only.  Each Erlang node in the
-        OTP system is represented by one row in the erlNodeTable."
-
-    REVISION        "201307160700Z"
-    DESCRIPTION
-        "Updated various types to be able to reflect larger values.
-        The objects erlNodeReductions, erlNodeInBytes, erlNodeOutBytes as well
-        as the type MilliSeconds have been updated to Counter64."
-
-    REVISION        "200305090900Z"
-    DESCRIPTION
-        "Changed CONTACT-INFO as it was outdated, made it more generic
-	to avoid such changes in the future."
-    
-    REVISION        "199712010900Z"
-    DESCRIPTION
-        "Converted to v2 SMI and placed in the OTP tree."
-
-    REVISION        "199608191700Z"
-    DESCRIPTION
-        "The initial revision of MIB module OTP-MIB."
-
-    ::= { otpModules 3 }
-
-otpMIB          OBJECT IDENTIFIER ::= { otpApplications 1 }
-otpMIBConformance
-                OBJECT IDENTIFIER ::= { otpMIB 1 }
-otpMIBObjects   OBJECT IDENTIFIER ::= { otpMIB 2 }
-
--- Datatypes
-
-MilliSeconds ::= TEXTUAL-CONVENTION
-    STATUS      current
-    DESCRIPTION
-        "The MilliSeconds type represents a Counter which represents
-        the time, in milliseconds between two epochs.  When objects
-	are defined which use this type, the description of the object
-	identifies both of the reference epochs."
-    SYNTAX      Counter64
-
-
--- Managed Objects
-
-erlang          OBJECT IDENTIFIER ::= { otpMIBObjects 1 }
-appls           OBJECT IDENTIFIER ::= { otpMIBObjects 2 }
-
-erlNodeTable OBJECT-TYPE
-    SYNTAX      SEQUENCE OF ErlNodeEntry
-    MAX-ACCESS  not-accessible
-    STATUS      current
-    DESCRIPTION
-        "A table with info on each erlang node in the system."
-    ::= { erlang 1 }
-
-erlNodeEntry OBJECT-TYPE
-    SYNTAX      ErlNodeEntry
-    MAX-ACCESS  not-accessible
-    STATUS      current
-    DESCRIPTION
-        "A conceptual row in the erlNodeTable."
-    INDEX   { erlNodeId }
-    ::= { erlNodeTable 1 }
-
-ErlNodeEntry ::= SEQUENCE {
-    erlNodeId           Integer32,
-    erlNodeName         DisplayString,
-    erlNodeMachine      DisplayString,      
-    erlNodeVersion      DisplayString,
-    erlNodeRunQueue     Gauge32,
-    erlNodeRunTime      MilliSeconds,
-    erlNodeWallClock    MilliSeconds,
-    erlNodeReductions   Counter64,
-    erlNodeProcesses    Gauge32,
-    erlNodeInBytes      Counter64,
-    erlNodeOutBytes     Counter64
-}
-
-erlNodeId OBJECT-TYPE
-    SYNTAX      Integer32
-    MAX-ACCESS  not-accessible
-    STATUS      current
-    DESCRIPTION
-        "An integer that uniquely identifies the erlang node."
-    ::= { erlNodeEntry 1 }
-
-erlNodeName OBJECT-TYPE
-    SYNTAX      DisplayString
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The symbolic name of the erlang node."
-    ::= { erlNodeEntry 2 }
-
-erlNodeMachine OBJECT-TYPE
-    SYNTAX      DisplayString
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The virtual machine executing the erlang node"
-    ::= { erlNodeEntry 3 }
-
-erlNodeVersion OBJECT-TYPE
-    SYNTAX      DisplayString
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The version number of the virtual machine"
-    ::= { erlNodeEntry 4 }
-
-erlNodeRunQueue OBJECT-TYPE
-    SYNTAX      Gauge32
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "Number of processes scheduled to run"
-    ::= { erlNodeEntry 5 }
-
-erlNodeRunTime OBJECT-TYPE
-    SYNTAX      MilliSeconds
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "Total cpu time in milliseconds since the 
-        system started"
-    ::= { erlNodeEntry 6 }
-
-erlNodeWallClock OBJECT-TYPE
-    SYNTAX      MilliSeconds
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "Total real time in milliseconds since the 
-        system started"
-    ::= { erlNodeEntry 7 }  
-
-erlNodeReductions OBJECT-TYPE
-    SYNTAX      Counter64
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "Number of function calls since the system started"
-    ::= { erlNodeEntry 8 }
-
-erlNodeProcesses OBJECT-TYPE
-    SYNTAX      Gauge32
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "Number of running processes in the system."
-    ::= { erlNodeEntry 9 }
-
-erlNodeInBytes  OBJECT-TYPE
-    SYNTAX      Counter64
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The total number of bytes delivered to the system"
-    ::= { erlNodeEntry 10 }
-
-erlNodeOutBytes  OBJECT-TYPE
-    SYNTAX      Counter64
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The total number of bytes delivered from the system"
-    ::= { erlNodeEntry 11 }
-
-
-applTable OBJECT-TYPE
-    SYNTAX      SEQUENCE OF ApplEntry
-    MAX-ACCESS  not-accessible
-    STATUS      current
-    DESCRIPTION
-        "A table with all currently running applications
-        for each node."
-    ::= { appls 1 }
-
-applEntry OBJECT-TYPE
-    SYNTAX      ApplEntry
-    MAX-ACCESS  not-accessible
-    STATUS      current
-    DESCRIPTION
-        "A conceptual row in the applTable."
-    INDEX   { erlNodeId, applId }
-    ::= { applTable 1 }
-
-ApplEntry ::= SEQUENCE {
-    applId      Integer32,
-    applName    DisplayString,
-    applDescr   DisplayString,
-    applVsn     DisplayString
-}
-
-applId OBJECT-TYPE
-    SYNTAX      Integer32
-    MAX-ACCESS  not-accessible
-    STATUS      current
-    DESCRIPTION
-        "An integer that uniquely identifies the application."
-    ::= { applEntry 1 }
-
-applName OBJECT-TYPE
-    SYNTAX      DisplayString
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The name of the application."
-    ::= { applEntry 2 }
-
-applDescr OBJECT-TYPE
-    SYNTAX      DisplayString
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "A short description of the application."
-    ::= { applEntry 3 }
-
-applVsn OBJECT-TYPE
-    SYNTAX      DisplayString
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The version of the application."
-    ::= { applEntry 4 }
-
-
--- conformance information
-
-otpMIBCompliances
-                OBJECT IDENTIFIER ::= { otpMIBConformance 1 }
-otpMIBGroups    OBJECT IDENTIFIER ::= { otpMIBConformance 2 }
-
-
--- compliance statements
-
-otpBasicCompliance MODULE-COMPLIANCE
-    STATUS      current
-    DESCRIPTION
-        "The compliance statement for SNMPv2 entities which
-        implement the OTP-MIB."
-    MODULE  -- this module
-        MANDATORY-GROUPS { erlGroup, applGroup }
-
-    ::= { otpMIBCompliances 1 }
-
-
--- units of conformance
-
-erlGroup OBJECT-GROUP
-    OBJECTS { erlNodeName,
-              erlNodeMachine,
-              erlNodeVersion,
-              erlNodeRunQueue,
-              erlNodeRunTime,
-              erlNodeWallClock,
-              erlNodeReductions,
-              erlNodeProcesses,
-              erlNodeInBytes,
-              erlNodeOutBytes }
-    STATUS  current
-    DESCRIPTION
-        "A collection of objects providing basic instrumentation
-        of the Erlang runtime system."
-    ::= { otpMIBGroups 1 }
-
-applGroup OBJECT-GROUP
-    OBJECTS { applName,
-              applDescr,
-              applVsn }
-    STATUS  current
-    DESCRIPTION
-        "A collection of objects providing basic instrumentation
-        of the applications in the OTP system."
-    ::= { otpMIBGroups 2 }
-
-
-END
diff --git a/lib/otp_mibs/src/Makefile b/lib/otp_mibs/src/Makefile
deleted file mode 100644
index 5c7af39c3f..0000000000
--- a/lib/otp_mibs/src/Makefile
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2003-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
-
-ifeq ($(TYPE),debug)
-ERL_COMPILE_FLAGS += -Ddebug -W
-endif
-
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(OTP_MIBS_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/otp_mibs-$(VSN)
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-MODULES = \
-	otp_mib
-
-INCLUDE=../include
-
-HRL_FILES =
-
-INTERNAL_HRL_FILES =
-
-ERL_FILES = $(MODULES:%=%.erl)
-
-APP_FILE   = otp_mibs.app
-APP_SRC    = $(APP_FILE).src
-APP_TARGET = $(EBIN)/$(APP_FILE)
-
-APPUP_FILE   = otp_mibs.appup
-APPUP_SRC    = $(APPUP_FILE).src
-APPUP_TARGET = $(EBIN)/$(APPUP_FILE)
-
-TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR))
-
-TARGETS = $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_COMPILE_FLAGS += -I$(INCLUDE)
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-debug opt: $(TARGETS)
-
-clean:
-	rm -f $(TARGET_FILES)
-	rm -f $(APP_TARGET)
-	rm -f $(APPUP_TARGET)
-	rm -f core
-
-docs:
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-
-$(APP_TARGET): $(APP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
-$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
-# ----------------------------------------------------
-# Release Target
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
-	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
-	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(TARGETS) "$(RELSYSDIR)/ebin"
-
-release_docs_spec:
-
-
diff --git a/lib/otp_mibs/src/otp_mib.erl b/lib/otp_mibs/src/otp_mib.erl
deleted file mode 100644
index ca868f2817..0000000000
--- a/lib/otp_mibs/src/otp_mib.erl
+++ /dev/null
@@ -1,219 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% 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.
-%% 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(otp_mib).
-%%%-----------------------------------------------------------------
-%%% Description: This module implements the OTP-MIB.
-%%% The tables are implemented as shadow tables with the module
-%%% snmp_shadow_table.
-%%%-----------------------------------------------------------------
-
-%% API
--export([load/1, unload/1]).
-
-%% SNMP instrumentation
--export([erl_node_table/1, erl_node_table/3, appl_table/1, appl_table/3]).
-
-%% SNMP shadow functions
--export([update_erl_node_table/0, update_appl_table/0]).
-
-%% Exported for internal use via rpc
--export([get_erl_node/1, get_appls/1]).
-
--deprecated([{load,1,eventually},
-	     {unload,1,eventually}]).
-
-%% Shadow tables
--record(erlNodeTable,
-	{erlNodeId, erlNodeName, erlNodeMachine, erlNodeVersion,
-	 erlNodeRunQueue,
-         erlNodeRunTime, erlNodeWallClock, erlNodeReductions,
-	 erlNodeProcesses, erlNodeInBytes, erlNodeOutBytes}).
-
--record(applTable, {key = '_', applName = '_', applDescr = '_',
-		    applVsn = '_'}).
-
-%% Shadow argument macros
--define(erlNodeShadowArgs,
-	{erlNodeTable, integer, record_info(fields, erlNodeTable), 5000,
-	 fun otp_mib:update_erl_node_table/0}).
-
--define(applShadowArgs,
-	{applTable, {integer, integer}, record_info(fields, applTable),
-	 5000, fun otp_mib:update_appl_table/0}).
-
-%% Misc
--record(erlNodeAlloc, {nodeName, nodeId}).
-
-%%%=========================================================================
-%%%  API
-%%%=========================================================================
-
-%%-------------------------------------------------------------------------
-%% load(Agent) ->  ok | {error, Reason}
-%% Agent - pid() | atom()
-%% Reason - term()
-%% Description: Loads the OTP-MIB
-%%-------------------------------------------------------------------------
-load(Agent) ->
-    MibDir = code:priv_dir(otp_mibs) ++ "/mibs",
-    snmpa:load_mibs(Agent, [MibDir ++ "/OTP-MIB"]).
-
-%%-------------------------------------------------------------------------
-%% unload(Agent) ->  ok | {error, Reason}
-%% Agent - pid() | atom()
-%% Reason - term()
-%% Description: Loads the OTP-MIB
-%%-------------------------------------------------------------------------
-unload(Agent) ->
-    snmpa:unload_mibs(Agent, ["OTP-MIB"]).
-
-
-%%%=========================================================================
-%%%  SNMP instrumentation
-%%%=========================================================================
-erl_node_table(new) ->
-    Tab = erlNodeAlloc,
-    Storage = ram_copies,
-    case lists:member(Tab, mnesia:system_info(tables)) of
-	true ->
-	    case mnesia:table_info(Tab, storage_type) of
-		unknown ->
-		    {atomic, ok} = mnesia:add_table_copy(Tab, node(), Storage);
-		Storage ->
-		    catch delete_all(Tab)
-	    end;
-	false ->
-	    Nodes = [node()],
-	    Props = [{type, set},
-		     {attributes, record_info(fields, erlNodeAlloc)},
-		     {local_content, true},
-		     {Storage, Nodes}],
-	    {atomic, ok} = mnesia:create_table(Tab, Props)
-    end,
-    ok = mnesia:dirty_write({erlNodeAlloc, next_index, 1}),
-    update_node_alloc([node() | nodes()]),
-    snmp_shadow_table:table_func(new, ?erlNodeShadowArgs).
-
-erl_node_table(Op, RowIndex, Cols) ->
-    snmp_shadow_table:table_func(Op, RowIndex, Cols, ?erlNodeShadowArgs).
-
-
-appl_table(Op) ->
-    snmp_shadow_table:table_func(Op, ?applShadowArgs).
-appl_table(Op, RowIndex, Cols) ->
-    snmp_shadow_table:table_func(Op, RowIndex, Cols, ?applShadowArgs).
-
-
-%%%=========================================================================
-%%%  SNMP shadow functions
-%%%=========================================================================
-update_erl_node_table() ->
-    delete_all(erlNodeTable),
-    Nodes = [node() | nodes()],
-    update_node_alloc(Nodes),
-    lists:foreach(
-      fun(Node) ->
-	      [{_,_,Idx}] = mnesia:dirty_read({erlNodeAlloc, Node}),
-	      ErlNode = rpc:call(Node, otp_mib, get_erl_node, [Idx]),
-	      ok = mnesia:dirty_write(ErlNode)
-      end, Nodes).
-
-update_appl_table() ->
-    delete_all(applTable),
-    Nodes = [node() | nodes()],
-    update_node_alloc(Nodes),
-    lists:foreach(
-      fun(Node) ->
-	      [{_,_,Idx}] = mnesia:dirty_read({erlNodeAlloc, Node}),
-	      Appls = rpc:call(Node, otp_mib, get_appls, [Idx]),
-	      lists:foreach(fun(Appl) ->
-				    ok = mnesia:dirty_write(Appl)
-			    end, Appls)
-      end, Nodes).
-
-%%%========================================================================
-%%% Exported for internal use via rpc
-%%%========================================================================
-get_erl_node(Id) ->
-    RunQueue = erlang:statistics(run_queue),
-    RunTime = element(1, erlang:statistics(runtime)),
-    WallClock = element(1, erlang:statistics(wall_clock)),
-    Reductions = element(1, erlang:statistics(reductions)),
-    Processes = length(processes()),
-    IO = erlang:statistics(io),
-    InBytes = element(2, element(1, IO)),
-    OutBytes = element(2, element(2, IO)),
-    #erlNodeTable{erlNodeId = truncate_int('Integer32', Id),
-		  erlNodeName = atom_to_list(node()),
-		  erlNodeVersion = erlang:system_info(version),
-		  erlNodeMachine = erlang:system_info(machine),
-		  erlNodeRunQueue = truncate_int('Unsigned32', RunQueue),
-		  erlNodeRunTime = truncate_int('Counter64', RunTime),
-		  erlNodeWallClock = truncate_int('Counter64', WallClock),
-		  erlNodeReductions = truncate_int('Counter64', Reductions),
-		  erlNodeProcesses = truncate_int('Unsigned32', Processes),
-		  erlNodeInBytes = truncate_int('Counter64', InBytes),
-		  erlNodeOutBytes = truncate_int('Counter64', OutBytes)}.
-
-get_appls(NodeId) ->
-    element(1,
-	    lists:mapfoldl(
-	      fun({ApplName, ApplDescr, ApplVsn}, ApplId) ->
-		      {#applTable{key = {NodeId, ApplId},
-				  applName = atom_to_list(ApplName),
-				  applDescr = ApplDescr,
-				  applVsn = ApplVsn},
-		       ApplId + 1}
-	      end, 1, application:which_applications())).
-
-%%%========================================================================
-%%% Internal functions
-%%%========================================================================
-update_node_alloc([Node | T]) ->
-    case mnesia:dirty_read({erlNodeAlloc, Node}) of
-	[] ->
-	    [{_, _, Idx}] = mnesia:dirty_read({erlNodeAlloc, next_index}),
-	    ok = mnesia:dirty_write(#erlNodeAlloc{nodeName = Node,
-						  nodeId = Idx}),
-	    ok = mnesia:dirty_write({erlNodeAlloc, next_index, Idx + 1});
-	_ ->
-	    ok
-    end,
-    update_node_alloc(T);
-update_node_alloc([]) -> ok.
-
-delete_all(Name) -> delete_all(mnesia:dirty_first(Name), Name).
-delete_all('$end_of_table', _Name) -> done;
-delete_all(Key, Name) ->
-    Next = mnesia:dirty_next(Name, Key),
-    ok = mnesia:dirty_delete({Name, Key}),
-    delete_all(Next, Name).
-
-%% This will return a value limited to fit into the specified type.
-%% While counter types will be resetted, other integer types will
-%% only be restricted to the valid range.
-truncate_int('Counter64', Value) when Value < 0 -> 0;
-truncate_int('Counter64', Value) -> Value rem 18446744073709551615;
-truncate_int('Unsigned32', Value) when Value < 0 -> 0;
-truncate_int('Unsigned32', Value) when Value > 4294967295 -> 4294967295;
-truncate_int('Unsigned32', Value) -> Value;
-truncate_int('Integer32', Value) when Value < -2147483648 -> -2147483648;
-truncate_int('Integer32', Value) when Value > 2147483647 -> 2147483647;
-truncate_int('Integer32', Value) -> Value.
diff --git a/lib/otp_mibs/test/Makefile b/lib/otp_mibs/test/Makefile
deleted file mode 100644
index 9736cf8bce..0000000000
--- a/lib/otp_mibs/test/Makefile
+++ /dev/null
@@ -1,85 +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
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-MODULES= otp_mibs_SUITE
-
-EBIN = .
-
-HRL_FILES=
-
-ERL_FILES= $(MODULES:%=%.erl)
-
-TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR))
-
-SOURCE = $(ERL_FILES) $(HRL_FILES)
-
-EMAKEFILE=Emakefile
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/otp_mibs_test
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_MAKE_FLAGS +=
-ERL_COMPILE_FLAGS += \
-	-I$(ERL_TOP)/lib/snmp/include
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-make_emakefile:
-	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES)\
-	> $(EMAKEFILE)
-
-tests debug opt: make_emakefile
-	erl $(ERL_MAKE_FLAGS) -make
-
-clean:
-	rm -f $(EMAKEFILE)
-	rm -f $(TARGET_FILES)
-	rm -f core *~
-
-docs:
-
-
-# ----------------------------------------------------
-# Release Target
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec:
-
-release_tests_spec: make_emakefile
-	$(INSTALL_DIR) "$(RELSYSDIR)"
-	$(INSTALL_DATA) $(EMAKEFILE) $(SOURCE) "$(RELSYSDIR)"
-	$(INSTALL_DATA) otp_mibs_SUITE.cfg "$(RELSYSDIR)"
-
-release_docs_spec:
diff --git a/lib/otp_mibs/test/otp_mibs_SUITE.cfg b/lib/otp_mibs/test/otp_mibs_SUITE.cfg
deleted file mode 100644
index d01cf92104..0000000000
--- a/lib/otp_mibs/test/otp_mibs_SUITE.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-%% -*- erlang -*-
-{snmp,
- [
-  {start_agent,true},
-  {users,
-   [
-    {otp_mibs_test,[snmpm_user_default,[]]}
-   ]},
-  {managed_agents,
-   [
-    {otp_mibs_test, [otp_mibs_test, {127,0,0,1}, 4000, []]}
-   ]},
-  {agent_sysname,"Test otp_mibs"},
-  {mgr_port,5001}
- ]}.
diff --git a/lib/otp_mibs/test/otp_mibs_SUITE.erl b/lib/otp_mibs/test/otp_mibs_SUITE.erl
deleted file mode 100644
index cb3cd28200..0000000000
--- a/lib/otp_mibs/test/otp_mibs_SUITE.erl
+++ /dev/null
@@ -1,255 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2004-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(otp_mibs_SUITE).
-
-%%-----------------------------------------------------------------
-%% This suite can no longer be executed standalone, i.e. it must be
-%% executed with common test. The reason is that ct_snmp is used
-%% instead of the snmp application directly. The suite requires a
-%% config file, otp_mibs_SUITE.cfg, found in the same directory as
-%% the suite.
-%%
-%% Execute with:
-%% > ct_run -suite otp_mibs_SUITE -config otp_mibs_SUITE.cfg
-%%-----------------------------------------------------------------
-
--include_lib("common_test/include/ct.hrl").
--include_lib("otp_mibs/include/OTP-MIB.hrl").
--include_lib("snmp/include/snmp_types.hrl").
-
-% Test server specific exports
--export([all/0,
-	 suite/0,
-	 groups/0,
-	 init_per_group/2,
-	 end_per_group/2,
-	 init_per_suite/1,
-	 end_per_suite/1,
-	 init_per_testcase/2,
-	 end_per_testcase/2]).
-
-% Test cases must be exported.
--export([app/1, appup/1, nt_basic_types/1, nt_high_reduction_count/1]).
-
--define(TRAP_UDP,      5000).
--define(AGENT_UDP,     4000).
--define(CONF_FILE_VER, [v2]).
--define(SYS_NAME,      "Test otp_mibs").
--define(MAX_MSG_SIZE,  484).
--define(ENGINE_ID,     "mgrEngine").
--define(MGR_PORT,      5001).
-
-%% Since some cases are only interested in single entries of the OTP-MIB's
-%% node table, one row must be chosen. The first row should be sufficient
-%% for this.
--define(NODE_ENTRY, 1).
-
-%%---------------------------------------------------------------------
-%% CT setup
-%%---------------------------------------------------------------------
-
-init_per_testcase(_Case, Config) when is_list(Config) ->
-    Dog = test_server:timetrap(test_server:minutes(6)),
-    [{watchdog, Dog}|Config].
-
-end_per_testcase(_Case, Config) when is_list(Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    Config.
-
-suite() -> [{ct_hooks,[ts_install_cth]}, {require, snmp_mgr_agent, snmp}].
-
-all() -> [{group, app}, {group, node_table}].
-
-groups() -> [{app, [], [app, appup]},
-             {node_table, [], [nt_basic_types, nt_high_reduction_count]}].
-
-init_per_group(_GroupName, Config) -> Config.
-
-end_per_group(_GroupName, Config) -> Config.
-
-init_per_suite(Config) ->
-    ?line application:start(sasl),
-    ?line application:start(mnesia),
-    ?line application:start(otp_mibs),
-
-    ok = ct_snmp:start(Config,snmp_mgr_agent),
-
-    %% Load the mibs that should be tested
-    otp_mib:load(snmp_master_agent),
-
-    Config.
-
-end_per_suite(Config) ->
-    PrivDir = ?config(priv_dir, Config),
-    ConfDir = filename:join(PrivDir,"conf"),
-    DbDir = filename:join(PrivDir,"db"),
-    MgrDir = filename:join(PrivDir, "mgr"),
-
-    %% Uload mibs
-    otp_mib:unload(snmp_master_agent),
-
-    %% Clean up
-    application:stop(snmp),
-    application:stop(mnesia),
-    application:stop(otp_mibs),
-
-    del_dir(ConfDir),
-    del_dir(DbDir),
-    (catch del_dir(MgrDir)),
-    ok.
-
-%%---------------------------------------------------------------------
-%% Test cases
-%%---------------------------------------------------------------------
-
-%% Test that the otp_mibs app file is ok
-app(Config) when is_list(Config) ->
-    ok = ?t:app_test(otp_mibs).
-
-%% Test that the otp_mibs appup file is ok
-appup(Config) when is_list(Config) ->
-    ok = ?t:appup_test(otp_mibs).
-
-nt_basic_types(suite) ->
-    [];
-nt_basic_types(doc) ->
-    ["Query every item of the node table and check its variable "
-     "type and content for sensible values."];
-nt_basic_types(Config) when is_list(Config) ->
-    ok = otp_mib:update_erl_node_table(),
-
-    NodeNameId = ?erlNodeEntry ++ [?erlNodeName, ?NODE_ENTRY],
-    {noError, 0, [NodeNameVal]} = snmp_get([NodeNameId]),
-    #varbind{variabletype = 'OCTET STRING'} = NodeNameVal,
-    true = is_list(NodeNameVal#varbind.value),
-
-    NodeMachineId = ?erlNodeEntry ++ [?erlNodeMachine, ?NODE_ENTRY],
-    {noError, 0, [NodeMachineVal]} = snmp_get([NodeMachineId]),
-    #varbind{variabletype = 'OCTET STRING'} = NodeMachineVal,
-    true = is_list(NodeMachineVal#varbind.value),
-
-    NodeVersionId = ?erlNodeEntry ++ [?erlNodeVersion, ?NODE_ENTRY],
-    {noError, 0, [NodeVersionVal]} = snmp_get([NodeVersionId]),
-    #varbind{variabletype = 'OCTET STRING'} = NodeVersionVal,
-    true = is_list(NodeVersionVal#varbind.value),
-
-    NodeRunQueueId = ?erlNodeEntry ++ [?erlNodeRunQueue, ?NODE_ENTRY],
-    {noError, 0, [NodeRunQueueVal]} = snmp_get([NodeRunQueueId]),
-    #varbind{variabletype = 'Unsigned32'} = NodeRunQueueVal,
-    true = is_integer(NodeRunQueueVal#varbind.value),
-    NodeRunQueueVal#varbind.value >= 0,
-    NodeRunQueueVal#varbind.value =< 4294967295,
-
-    NodeRunTimeId = ?erlNodeEntry ++ [?erlNodeRunTime, ?NODE_ENTRY],
-    {noError, 0, [NodeRunTimeVal]} = snmp_get([NodeRunTimeId]),
-    #varbind{variabletype = 'Counter64'} = NodeRunTimeVal,
-    true = is_integer(NodeRunTimeVal#varbind.value),
-    NodeRunTimeVal#varbind.value >= 0,
-    NodeRunTimeVal#varbind.value =< 18446744073709551615,
-
-    NodeWallClockId = ?erlNodeEntry ++ [?erlNodeWallClock, ?NODE_ENTRY],
-    {noError, 0, [NodeWallClockVal]} = snmp_get([NodeWallClockId]),
-    #varbind{variabletype = 'Counter64'} = NodeWallClockVal,
-    true = is_integer(NodeWallClockVal#varbind.value),
-    NodeWallClockVal#varbind.value >= 0,
-    NodeWallClockVal#varbind.value =< 18446744073709551615,
-
-    NodeReductionsId = ?erlNodeEntry ++ [?erlNodeReductions, ?NODE_ENTRY],
-    {noError, 0, [NodeReductionsVal]} = snmp_get([NodeReductionsId]),
-    #varbind{variabletype = 'Counter64'} = NodeReductionsVal,
-    true = is_integer(NodeReductionsVal#varbind.value),
-    NodeReductionsVal#varbind.value >= 0,
-    NodeReductionsVal#varbind.value =< 18446744073709551615,
-
-    NodeProcessesId = ?erlNodeEntry ++ [?erlNodeProcesses, ?NODE_ENTRY],
-    {noError, 0, [NodeProcessesVal]} = snmp_get([NodeProcessesId]),
-    #varbind{variabletype = 'Unsigned32'} = NodeProcessesVal,
-    true = is_integer(NodeProcessesVal#varbind.value),
-    NodeProcessesVal#varbind.value >= 0,
-    NodeProcessesVal#varbind.value =< 4294967295,
-
-    NodeInBytesId = ?erlNodeEntry ++ [?erlNodeInBytes, ?NODE_ENTRY],
-    {noError, 0, [NodeInBytesVal]} = snmp_get([NodeInBytesId]),
-    #varbind{variabletype = 'Counter64'} = NodeInBytesVal,
-    true = is_integer(NodeInBytesVal#varbind.value),
-    NodeInBytesVal#varbind.value >= 0,
-    NodeInBytesVal#varbind.value =< 18446744073709551615,
-
-    NodeOutBytesId = ?erlNodeEntry ++ [?erlNodeOutBytes, ?NODE_ENTRY],
-    {noError, 0, [NodeOutBytesVal]} = snmp_get([NodeOutBytesId]),
-    #varbind{variabletype = 'Counter64'} = NodeOutBytesVal,
-    true = is_integer(NodeOutBytesVal#varbind.value),
-    NodeOutBytesVal#varbind.value >= 0,
-    NodeOutBytesVal#varbind.value =< 18446744073709551615,
-
-    ok.
-
-nt_high_reduction_count(suite) ->
-    [];
-nt_high_reduction_count(doc) ->
-    ["Check that no error occurs when the erlNodeReductions field"
-     "exceeds the 32bit boundary, this may take about 10min."];
-nt_high_reduction_count(Config) when is_list(Config) ->
-    NodeReductions = ?erlNodeEntry ++ [?erlNodeReductions, ?NODE_ENTRY],
-
-    BumpFun = fun(F, Limit) ->
-		      case erlang:statistics(reductions) of
-			  {Total, _} when Total < Limit ->
-			      F(F, Limit);
-			  _ ->
-			      ok
-		      end
-	      end,
-
-    ok = otp_mib:update_erl_node_table(),
-
-    {noError, 0, [StartVal]} = snmp_get([NodeReductions]),
-    #varbind{variabletype = 'Counter64'} = StartVal,
-    true = is_integer(StartVal#varbind.value),
-    StartVal#varbind.value >= 0,
-    case StartVal#varbind.value =< 4294967295 of
-	true ->
-	    ok = otp_mib:update_erl_node_table(),
-	    BumpFun(BumpFun, 4294967295),
-	    {noError, 0, [EndVal]} = snmp_get([NodeReductions]),
-	    #varbind{variabletype = 'Counter64'} = EndVal,
-	    true = is_integer(EndVal#varbind.value),
-	    EndVal#varbind.value >= 4294967295,
-	    EndVal#varbind.value =< 18446744073709551615;
-	false ->
-	    %% no need to bump more reductions, since the initial get
-	    %% command already returned successfully with a large value
-	    ok
-    end.
-
-%%---------------------------------------------------------------------
-%% Internal functions
-%%---------------------------------------------------------------------
-
-snmp_get(OIdList) ->
-    ct_snmp:get_values(otp_mibs_test, OIdList, snmp_mgr_agent).
-
-del_dir(Dir) ->
-    io:format("Deleting: ~s~n",[Dir]),
-    {ok, Files} = file:list_dir(Dir),
-    FullPathFiles = lists:map(fun(File) -> filename:join(Dir, File) end, Files),
-    lists:foreach(fun file:delete/1, FullPathFiles),
-    file:del_dir(Dir).
diff --git a/lib/otp_mibs/vsn.mk b/lib/otp_mibs/vsn.mk
deleted file mode 100644
index 1b0444afcd..0000000000
--- a/lib/otp_mibs/vsn.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-OTP_MIBS_VSN = 1.2.1
-
-# 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/leex.xml b/lib/parsetools/doc/src/leex.xml
index 1227625287..3b82f60201 100644
--- a/lib/parsetools/doc/src/leex.xml
+++ b/lib/parsetools/doc/src/leex.xml
@@ -21,7 +21,7 @@
     <rev>A</rev>
     <file>leex.xml</file>
   </header>
-  <module>leex</module>
+  <module since="">leex</module>
   <modulesummary>Lexical analyzer generator for Erlang</modulesummary>
   <description>
     <p>A regular expression based lexical analyzer generator for
@@ -38,7 +38,8 @@ Token = tuple()</code>
   </section>
   <funcs>
     <func>
-      <name>file(FileName, [, Options]) -> LeexRet</name>
+      <name since="">file(FileName) -> LeexRet</name>
+      <name since="OTP R16B02">file(FileName, Options) -> LeexRet</name>
       <fsummary>Generate a lexical analyzer</fsummary>
       <type>
         <v>FileName = filename()</v>
@@ -124,7 +125,7 @@ Token = tuple()</code>
       </desc>
     </func>
     <func>
-      <name>format_error(ErrorInfo) -> Chars</name>
+      <name since="">format_error(ErrorInfo) -> Chars</name>
       <fsummary>Return an English description of a an error tuple.</fsummary>
       <type>
         <v>Chars = [char() | Chars]</v>
@@ -145,8 +146,8 @@ Token = tuple()</code>
 
   <funcs>
     <func>
-      <name>string(String) -> StringRet</name>
-      <name>string(String, StartLine) -> StringRet</name>
+      <name since="">string(String) -> StringRet</name>
+      <name since="">string(String, StartLine) -> StringRet</name>
       <fsummary>Generated by Leex</fsummary>
       <type>
         <v>String = string()</v>
@@ -163,9 +164,9 @@ Token = tuple()</code>
     </func>
 
     <func>
-      <name>token(Cont, Chars) -> {more,Cont1} | {done,TokenRet,RestChars}
+      <name since="">token(Cont, Chars) -> {more,Cont1} | {done,TokenRet,RestChars}
       </name>
-      <name>token(Cont, Chars, StartLine) -> {more,Cont1} 
+      <name since="">token(Cont, Chars, StartLine) -> {more,Cont1} 
              | {done,TokenRet,RestChars}
       </name>
       <fsummary>Generated by Leex</fsummary>
@@ -198,9 +199,9 @@ io:request(InFile, {get_until,Prompt,Module,token,[Line]})
     </func>
 
     <func>
-      <name>tokens(Cont, Chars) -> {more,Cont1} | {done,TokensRet,RestChars}
+      <name since="">tokens(Cont, Chars) -> {more,Cont1} | {done,TokensRet,RestChars}
       </name>
-      <name>tokens(Cont, Chars, StartLine) -> 
+      <name since="">tokens(Cont, Chars, StartLine) -> 
                {more,Cont1} | {done,TokensRet,RestChars}
       </name>
       <fsummary>Generated by Leex</fsummary>
diff --git a/lib/parsetools/doc/src/yecc.xml b/lib/parsetools/doc/src/yecc.xml
index 5f95b5c150..67a2c95c25 100644
--- a/lib/parsetools/doc/src/yecc.xml
+++ b/lib/parsetools/doc/src/yecc.xml
@@ -32,7 +32,7 @@
     <rev>B</rev>
     <file>yecc.sgml</file>
   </header>
-  <module>yecc</module>
+  <module since="">yecc</module>
   <modulesummary>LALR-1 Parser Generator</modulesummary>
   <description>
     <p>An LALR-1 parser generator for Erlang, similar to <c>yacc</c>.
@@ -46,7 +46,7 @@
   </description>
   <funcs>
     <func>
-      <name>file(Grammarfile [, Options]) -> YeccRet</name>
+      <name since="">file(Grammarfile [, Options]) -> YeccRet</name>
       <fsummary>Give information about resolved and unresolved parse action conflicts.</fsummary>
       <type>
         <v>Grammarfile = filename()</v>
@@ -137,7 +137,7 @@
       </desc>
     </func>
     <func>
-      <name>format_error(Reason) -> Chars</name>
+      <name since="">format_error(Reason) -> Chars</name>
       <fsummary>Return an English description of a an error tuple.</fsummary>
       <type>
         <v>Reason =&nbsp;-&nbsp;as returned by yecc:file/1,2&nbsp;-</v>
diff --git a/lib/parsetools/test/leex_SUITE.erl b/lib/parsetools/test/leex_SUITE.erl
index 3f5d9fee3e..ad8fb11beb 100644
--- a/lib/parsetools/test/leex_SUITE.erl
+++ b/lib/parsetools/test/leex_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2019. 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.
@@ -124,10 +124,6 @@ file(Config) when is_list(Config) ->
              "Erlang code.\n">>,
     ?line ok = file:write_file(Filename, Mini),
     ?line {error,[{_,[{none,leex,{file_error,_}}]}],[]} = 
-        leex:file(Filename, [{scannerfile,"//"} | Ret]),
-    ?line {error,[{_,[{none,leex,{file_error,_}}]}],[]} = 
-        leex:file(Filename, [{includefile,"//"} | Ret]),
-    ?line {error,[{_,[{none,leex,{file_error,_}}]}],[]} = 
         leex:file(Filename, [{includefile,"/ /"} | Ret]),
 
     LeexPre = filename:join(Dir, "leexinc.hrl"),
@@ -191,7 +187,6 @@ compile(Config) when is_list(Config) ->
              "{L}+  : {token,{word,TokenLine,TokenChars}}.\n"
              "Erlang code.\n">>,
     ?line ok = file:write_file(Filename, Mini),
-    ?line error = leex:compile(Filename, "//", #options{}),
     ?line ok = leex:compile(Filename, Scannerfile, #options{}),
     file:delete(Scannerfile),
     file:delete(Filename),
diff --git a/lib/public_key/asn1/CMSAesRsaesOaep.asn1 b/lib/public_key/asn1/CMSAesRsaesOaep.asn1
new file mode 100644
index 0000000000..ca8c7b7f92
--- /dev/null
+++ b/lib/public_key/asn1/CMSAesRsaesOaep.asn1
@@ -0,0 +1,39 @@
+CMSAesRsaesOaep {iso(1) member-body(2) us(840) rsadsi(113549)
+      pkcs(1) pkcs-9(9) smime(16) modules(0) id-mod-cms-aes(19) }
+
+
+DEFINITIONS IMPLICIT TAGS ::=
+BEGIN
+
+-- EXPORTS ALL --
+IMPORTS
+    -- PKIX
+      AlgorithmIdentifier
+          FROM PKIX1Explicit88 {iso(1) identified-organization(3) dod(6)
+              internet(1) security(5) mechanisms(5) pkix(7) id-mod(0)
+              id-pkix1-explicit(18)};
+
+-- AES information object identifiers --
+
+aes OBJECT IDENTIFIER ::= { joint-iso-itu-t(2) country(16) us(840)
+               organization(1) gov(101) csor(3) nistAlgorithms(4)  1 }
+
+-- AES using CBC-chaining mode for key sizes of 128, 192, 256
+
+id-aes128-CBC OBJECT IDENTIFIER ::= { aes 2 }
+id-aes192-CBC OBJECT IDENTIFIER ::= { aes 22 }
+id-aes256-CBC OBJECT IDENTIFIER ::= { aes 42 }
+
+-- AES-IV is a the parameter for all the above object identifiers.
+
+AES-IV ::= OCTET STRING (SIZE(16))
+
+
+-- AES Key Wrap Algorithm Identifiers  - Parameter is absent
+
+id-aes128-wrap OBJECT IDENTIFIER ::= { aes 5 }
+id-aes192-wrap OBJECT IDENTIFIER ::= { aes 25 }
+id-aes256-wrap OBJECT IDENTIFIER ::= { aes 45 }
+
+
+END
diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile
index a920ea87ea..10952106c6 100644
--- a/lib/public_key/asn1/Makefile
+++ b/lib/public_key/asn1/Makefile
@@ -42,7 +42,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/public_key-$(VSN)
 ASN_TOP = OTP-PUB-KEY PKCS-FRAME
 ASN_MODULES = PKIX1Explicit88 PKIX1Implicit88 PKIX1Algorithms88 \
 	PKIXAttributeCertificate PKCS-1 PKCS-3 PKCS-7 PKCS-8 PKCS-10 PKCS5v2-0 OTP-PKIX \
-	InformationFramework RFC5639
+	InformationFramework RFC5639 CMSAesRsaesOaep
 ASN_ASNS = $(ASN_MODULES:%=%.asn1)
 ASN_ERLS = $(ASN_TOP:%=%.erl)
 ASN_HRLS = $(ASN_TOP:%=%.hrl)
diff --git a/lib/public_key/asn1/OTP-PKIX.asn1 b/lib/public_key/asn1/OTP-PKIX.asn1
index 9bcd99fba3..ff3250b383 100644
--- a/lib/public_key/asn1/OTP-PKIX.asn1
+++ b/lib/public_key/asn1/OTP-PKIX.asn1
@@ -233,9 +233,13 @@ countryName ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {
  -- regarding how to handle and sometimes accept incorrect certificates
  -- we define and use the type below instead of X520countryName
 
+ -- We accept utf8String encoding of the US-ASCII
+ -- country name code and the mix up with other country code systems
+ -- that uses three characters instead of two.
+
  OTP-X520countryname ::= CHOICE {
-       printableString   PrintableString (SIZE (2)),
-       utf8String        UTF8String      (SIZE (2))
+       printableString   PrintableString (SIZE (2..3)),
+       utf8String        UTF8String      (SIZE (2..3))
 }
 
 serialNumber ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {
diff --git a/lib/public_key/asn1/OTP-PUB-KEY.set.asn b/lib/public_key/asn1/OTP-PUB-KEY.set.asn
index b3f3ccdb77..7ab1684ff3 100644
--- a/lib/public_key/asn1/OTP-PUB-KEY.set.asn
+++ b/lib/public_key/asn1/OTP-PUB-KEY.set.asn
@@ -10,3 +10,5 @@ ECPrivateKey.asn1
 PKCS-7.asn1
 PKCS-10.asn1
 RFC5639.asn1
+CMSAesRsaesOaep.asn1
+
diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index b3e6023c41..57d9898661 100644
--- a/lib/public_key/doc/src/notes.xml
+++ b/lib/public_key/doc/src/notes.xml
@@ -35,6 +35,108 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Public_Key 1.6.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    RSA options passed to crypto for encrypt and decrypt with
+	    public or private key.</p>
+          <p>
+	    Own Id: OTP-15754 Aux Id: ERL-878 </p>
+        </item>
+        <item>
+          <p>
+	    Fix dialyzer warnings caused by a faulty type
+	    specification for digest_type().</p>
+          <p>
+	    This change updates digest_type() and the functions
+	    operating with this argument type to accept both 'sha1'
+	    and 'sha' as digest_type().</p>
+          <p>
+	    Own Id: OTP-15776</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add possibility to read PEM files encrypted with old PEM
+	    encryption using AES-256</p>
+          <p>
+	    Own Id: OTP-13726</p>
+        </item>
+        <item>
+          <p>
+	    Relax decoding of certificates to so that "harmless"
+	    third party encoding errors may be accepted but not
+	    created by the public_key application. This adds
+	    acceptance of using an incorrect three character country
+	    code, the PKIX standard use two character country codes.
+	    It is also accepted that the country code is utf8 encoded
+	    but the specification says it should be ASCII.</p>
+          <p>
+	    Own Id: OTP-15687 Aux Id: PR-2162 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Public_Key 1.6.6.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Support Pasword based encryption with AES</p>
+          <p>
+	    Own Id: OTP-15870 Aux Id: ERL-952 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Public_Key 1.6.6</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Back port of bug fix ERL-893 from OTP-22 and document
+	    enhancements that will solve dialyzer warnings for users
+	    of the ssl application.</p>
+          <p>
+	    This change also affects public_key, eldap (and inet
+	    doc).</p>
+          <p>
+	    Own Id: OTP-15785 Aux Id: ERL-929, ERL-893, PR-2215 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Public_Key 1.6.5</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add export of dialyzer type</p>
+          <p>
+	    Own Id: OTP-15624</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Public_Key 1.6.4</title>
 
     <section><title>Improvements and New Features</title>
@@ -1160,4 +1262,3 @@
 
   
 </chapter>
-
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml
index ee3877ddd0..12bb0b21b0 100644
--- a/lib/public_key/doc/src/public_key.xml
+++ b/lib/public_key/doc/src/public_key.xml
@@ -31,7 +31,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>public_key</module>
+  <module since="">public_key</module>
   <modulesummary>API module for public-key infrastructure.</modulesummary>
   <description>
     <p>Provides functions to handle public-key infrastructure,
@@ -176,7 +176,7 @@
 <funcs>    
 
   <func>
-    <name name="compute_key" arity="2"/>
+    <name name="compute_key" arity="2" since="OTP R16B01"/>
     <fsummary>Computes shared secret.</fsummary>
   <desc>
     <p>Computes shared secret.</p>
@@ -184,7 +184,7 @@
   </func>
 
   <func>
-    <name name="compute_key" arity="3"/>
+    <name name="compute_key" arity="3" since="OTP R16B01"/>
     <fsummary>Computes shared secret.</fsummary>
   <desc>
     <p>Computes shared secret.</p>
@@ -192,8 +192,8 @@
   </func>
 
   <func>
-    <name name="decrypt_private" arity="2"/>
-    <name name="decrypt_private" arity="3"/>
+    <name name="decrypt_private" arity="2" since="OTP R14B"/>
+    <name name="decrypt_private" arity="3" since="OTP R14B"/>
     <fsummary>Public-key decryption.</fsummary>
   <desc> 
     <p>Public-key decryption using the private key. See also <seealso
@@ -202,8 +202,8 @@
   </func>
 
   <func>
-    <name name="decrypt_public" arity="2"/>
-    <name name="decrypt_public" arity="3"/>
+    <name name="decrypt_public" arity="2" since="OTP R14B"/>
+    <name name="decrypt_public" arity="3" since="OTP R14B"/>
     <fsummary>Public-key decryption.</fsummary>
   <desc> 
     <p>Public-key decryption using the public key. See also <seealso
@@ -212,7 +212,7 @@
   </func> 
 
   <func>
-    <name name="der_decode" arity="2"/>
+    <name name="der_decode" arity="2" since="OTP R14B"/>
     <fsummary>Decodes a public-key ASN.1 DER encoded entity.</fsummary>
     <desc>
       <p>Decodes a public-key ASN.1 DER encoded entity.</p>
@@ -220,7 +220,7 @@
   </func>
 
   <func>
-    <name name="der_encode" arity="2"/>
+    <name name="der_encode" arity="2" since="OTP R14B"/>
     <fsummary>Encodes a public-key entity with ASN.1 DER encoding.</fsummary>
   <desc> 
     <p>Encodes a public-key entity with ASN.1 DER encoding.</p>
@@ -228,7 +228,7 @@
   </func>
 
   <func>
-    <name name="dh_gex_group" arity="4"/>
+    <name name="dh_gex_group" arity="4" since="OTP 18.2"/>
     <fsummary>Selects a group for Diffie-Hellman key exchange</fsummary>
     <desc>
       <p>Selects a group for Diffie-Hellman key exchange with the key size in the range <c>MinSize...MaxSize</c>
@@ -249,8 +249,8 @@
   </func>
 
   <func>
-    <name name="encrypt_private" arity="2"/>
-    <name name="encrypt_private" arity="3"/>
+    <name name="encrypt_private" arity="2" since="OTP R14B"/>
+    <name name="encrypt_private" arity="3" since="OTP 21.1"/>
     <fsummary>Public-key encryption using the private key.</fsummary>
   <desc> 
     <p>Public-key encryption using the private key.
@@ -260,8 +260,8 @@
   </func>   
 
   <func>
-    <name name="encrypt_public" arity="2"/>
-    <name name="encrypt_public" arity="3"/>
+    <name name="encrypt_public" arity="2" since="OTP R14B"/>
+    <name name="encrypt_public" arity="3" since="OTP 21.1"/>
     <fsummary>Public-key encryption using the public key.</fsummary>
   <desc> 
     <p>Public-key encryption using the public key. See also <seealso
@@ -270,7 +270,7 @@
   </func>   
   
   <func>
-    <name name="generate_key" arity="1"/>
+    <name name="generate_key" arity="1" since="OTP R16B01"/>
     <fsummary>Generates a new keypair.</fsummary>
   <desc>
     <p>Generates a new keypair. Note that except for Diffie-Hellman
@@ -281,17 +281,19 @@
   </func>
 
   <func>
-    <name name="pem_decode" arity="1"/>
+    <name name="pem_decode" arity="1" since="OTP R14B"/>
     <fsummary>Decodes PEM binary data and returns
     entries as ASN.1 DER encoded entities.</fsummary>
   <desc> 
     <p>Decodes PEM binary data and returns entries as ASN.1 DER encoded entities.</p>
-    <p>Example <c>{ok, PemBin} = file:read_file("cert.pem").</c></p>
+    <p>Example <c>{ok, PemBin} = file:read_file("cert.pem").
+    PemEntries = public_key:pem_decode(PemBin).    
+    </c></p>
   </desc> 
   </func> 
     
   <func>
-    <name name="pem_encode" arity="1"/>
+    <name name="pem_encode" arity="1" since="OTP R14B"/>
     <fsummary>Creates a PEM binary.</fsummary>
     <desc> 
       <p>Creates a PEM binary.</p> 
@@ -299,8 +301,8 @@
   </func>
 
   <func>
-    <name name="pem_entry_decode" arity="1"/>
-    <name name="pem_entry_decode" arity="2"/>
+    <name name="pem_entry_decode" arity="1" since="OTP R14B"/>
+    <name name="pem_entry_decode" arity="2" since="OTP R14B"/>
     <fsummary>Decodes a PEM entry.</fsummary>
   <desc> 
     <p>Decodes a PEM entry. <c>pem_decode/1</c> returns a list of PEM
@@ -311,8 +313,8 @@
   </func>
 
   <func>
-    <name name="pem_entry_encode" arity="2"/>
-    <name name="pem_entry_encode" arity="3"/>
+    <name name="pem_entry_encode" arity="2" since="OTP R14B"/>
+    <name name="pem_entry_encode" arity="3" since="OTP R14B"/>
     <fsummary>Creates a PEM entry that can be fed to <c>pem_encode/1</c>.</fsummary>
     <desc> 
       <p>Creates a PEM entry that can be feed to <c>pem_encode/1</c>.</p>
@@ -326,7 +328,7 @@
   </func>
 
   <func>
-    <name name="pkix_decode_cert" arity="2"/>
+    <name name="pkix_decode_cert" arity="2" since=""/>
     <fsummary>Decodes an ASN.1 DER-encoded PKIX x509 certificate.</fsummary>
     <desc> 
       <p>Decodes an ASN.1 DER-encoded PKIX certificate. Option <c>otp</c>
@@ -337,7 +339,7 @@
   </func>
 
   <func>
-    <name name="pkix_encode" arity="3"/>
+    <name name="pkix_encode" arity="3" since="OTP R14B"/>
     <fsummary>DER encodes a PKIX x509 certificate or part of such a
     certificate.</fsummary>
   <desc> 
@@ -349,7 +351,7 @@
   </func>
 
  <func>
-   <name name="pkix_is_issuer" arity="2"/>
+   <name name="pkix_is_issuer" arity="2" since="OTP R14B"/>
    <fsummary>Checks if <c>IssuerCert</c> issued <c>Cert</c>.</fsummary>
    <desc> 
      <p>Checks if <c>IssuerCert</c> issued <c>Cert</c>.</p> 
@@ -357,7 +359,7 @@
  </func>
   
  <func>
-   <name name="pkix_is_fixed_dh_cert" arity="1"/>
+   <name name="pkix_is_fixed_dh_cert" arity="1" since="OTP R14B"/>
    <fsummary>Checks if a certificate is a fixed Diffie-Hellman certificate.</fsummary>
    <desc> 
      <p>Checks if a certificate is a fixed Diffie-Hellman certificate.</p> 
@@ -365,7 +367,7 @@
  </func>  
   
  <func>
-   <name name="pkix_is_self_signed" arity="1"/>
+   <name name="pkix_is_self_signed" arity="1" since="OTP R14B"/>
    <fsummary>Checks if a certificate is self-signed.</fsummary>
    <desc> 
      <p>Checks if a certificate is self-signed.</p> 
@@ -373,7 +375,7 @@
  </func>
 
  <func>
-   <name name="pkix_issuer_id" arity="2"/>
+   <name name="pkix_issuer_id" arity="2" since="OTP R14B"/>
    <fsummary>Returns the issuer id.</fsummary>
    <desc> 
      <p>Returns the issuer id.</p> 
@@ -381,7 +383,7 @@
  </func>
  
  <func>
-   <name name="pkix_normalize_name" arity="1"/>
+   <name name="pkix_normalize_name" arity="1" since="OTP R14B"/>
    <fsummary>Normalizes an issuer name so that it can be easily
    compared to another issuer name.</fsummary>
    <desc> 
@@ -391,7 +393,7 @@
  </func>
 
   <func>
-    <name>pkix_path_validation(TrustedCert, CertChain, Options) -> {ok, {PublicKeyInfo, PolicyTree}} | {error, {bad_cert, Reason}} </name>
+    <name since="OTP R16B">pkix_path_validation(TrustedCert, CertChain, Options) -> {ok, {PublicKeyInfo, PolicyTree}} | {error, {bad_cert, Reason}} </name>
     <fsummary>Performs a basic path validation according to RFC 5280.</fsummary>
      <type>
        <v>TrustedCert =  #'OTPCertificate'{} | der_encoded() | atom()</v>
@@ -423,7 +425,7 @@
        <p>Available options:</p>
 
        <taglist>
-	<tag>{verify_fun, fun()}</tag>
+	<tag>{verify_fun, {fun(), InitialUserState::term()}</tag>
 	<item>
 	  <p>The fun must be defined as:</p>
 
@@ -491,7 +493,7 @@ fun(OtpCert :: #'OTPCertificate'{},
    </func>
 
     <func>  
-      <name name="pkix_crl_issuer" arity="1"/>
+      <name name="pkix_crl_issuer" arity="1" since="OTP 17.5"/>
       <fsummary>Returns the issuer of the <c>CRL</c>.</fsummary>
       <desc> 
 	<p>Returns the issuer of the <c>CRL</c>.</p>
@@ -499,7 +501,7 @@ fun(OtpCert :: #'OTPCertificate'{},
     </func> 
    
    <func>
-     <name name="pkix_crls_validate" arity="3"/>
+     <name name="pkix_crls_validate" arity="3" since="OTP R16B"/>
      <fsummary>Performs CRL validation.</fsummary>
      <desc>
       <p>Performs CRL validation. It is intended to be called from
@@ -541,7 +543,7 @@ fun(#'DistributionPoint'{}, #'CertificateList'{},
 
 	<tag>{undetermined_details, boolean()}</tag>
 	<item>
-	  <p>Defaults to false. When revocation status can not be
+	  <p>Defaults to false. When revocation status cannot be
 	  determined, and this option is set to true, details of why no
 	  CRLs where accepted are included in the return value.</p>
 	</item>
@@ -551,7 +553,7 @@ fun(#'DistributionPoint'{}, #'CertificateList'{},
    </func>
    
    <func>  
-     <name name="pkix_crl_verify" arity="2"/>
+     <name name="pkix_crl_verify" arity="2" since="OTP 17.5"/>
      <fsummary> Verify that  <c>Cert</c>  is the <c> CRL</c>  signer. </fsummary>
      <desc> 
        <p>Verify that <c>Cert</c> is the <c>CRL</c> signer.</p>
@@ -559,7 +561,7 @@ fun(#'DistributionPoint'{}, #'CertificateList'{},
    </func>
 
    <func>  
-     <name name="pkix_dist_point" arity="1"/>
+     <name name="pkix_dist_point" arity="1" since="OTP 17.5"/>
      <fsummary>Creates a distribution point for CRLs issued by the same issuer as <c>Cert</c>.</fsummary>
      <desc> 
        <p>Creates a distribution point for CRLs issued by the same issuer as <c>Cert</c>.
@@ -570,7 +572,7 @@ fun(#'DistributionPoint'{}, #'CertificateList'{},
    </func>
    
    <func>  
-     <name name="pkix_dist_points" arity="1"/>
+     <name name="pkix_dist_points" arity="1" since="OTP 17.5"/>
      <fsummary> Extracts distribution points from the certificates extensions.</fsummary>
      <desc> 
        <p> Extracts distribution points from the certificates extensions.</p>
@@ -578,7 +580,7 @@ fun(#'DistributionPoint'{}, #'CertificateList'{},
  </func>
    
   <func>
-    <name name="pkix_match_dist_point" arity="2"/>
+    <name name="pkix_match_dist_point" arity="2" since="OTP 19.0"/>
     <fsummary>Checks whether the given distribution point matches the
     Issuing Distribution Point of the CRL.</fsummary>
     <desc>
@@ -590,7 +592,7 @@ fun(#'DistributionPoint'{}, #'CertificateList'{},
   </func>
 
   <func>
-    <name name="pkix_sign" arity="2"/>
+    <name name="pkix_sign" arity="2" since="OTP R14B"/>
     <fsummary>Signs certificate.</fsummary>
     <desc> 
       <p>Signs an 'OTPTBSCertificate'. Returns the corresponding
@@ -599,7 +601,7 @@ fun(#'DistributionPoint'{}, #'CertificateList'{},
   </func> 
 
   <func>
-    <name name="pkix_sign_types" arity="1"/>
+    <name name="pkix_sign_types" arity="1" since="OTP R16B01"/>
     <fsummary>Translates signature algorithm OID to Erlang digest and signature algorithm types.</fsummary>
     <desc>
       <p>Translates signature algorithm OID to Erlang digest and signature types.
@@ -609,8 +611,8 @@ fun(#'DistributionPoint'{}, #'CertificateList'{},
   </func>
 
   <func>
-    <name>pkix_test_data(Options) -> Config </name>
-    <name>pkix_test_data([chain_opts()]) -> [conf_opt()]</name>
+    <name since="OTP 20.1">pkix_test_data(Options) -> Config </name>
+    <name since="OTP 20.1">pkix_test_data([chain_opts()]) -> [conf_opt()]</name>
     <fsummary>Creates certificate test data.</fsummary>
     <type>
       <v>Options = #{chain_type() := chain_opts()} </v>
@@ -644,7 +646,7 @@ fun(#'DistributionPoint'{}, #'CertificateList'{},
       <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>.
+	<seealso marker="ssl:ssl#type-tls_option"> ssl:tls_option()</seealso>.
 	<c>PrivateKey</c> is what
 	<seealso marker="#generate_key-1">generate_key/1</seealso>
 	returns.
@@ -736,13 +738,13 @@ fun(#'DistributionPoint'{}, #'CertificateList'{},
 	  
 	<note><p>
 	Note that the generated certificates and keys does not provide a formally correct PKIX-trust-chain 
-	and they can not be used to achieve real security. This function is provided for testing purposes only.
+	and they cannot be used to achieve real security. This function is provided for testing purposes only.
 </p></note>
     </desc>
   </func>
   
   <func>
-    <name>pkix_test_root_cert(Name, Options) -> RootCert</name>
+    <name since="OTP 20.2">pkix_test_root_cert(Name, Options) -> RootCert</name>
     <fsummary>Generates a test data root cert.</fsummary>
     <type>
       <v>Name = string()</v>
@@ -772,7 +774,7 @@ fun(#'DistributionPoint'{}, #'CertificateList'{},
   </func>
 
   <func>  
-    <name name="pkix_verify" arity="2"/>
+    <name name="pkix_verify" arity="2" since="OTP R14B"/>
     <fsummary>Verifies PKIX x.509 certificate signature.</fsummary>
   <desc> 
     <p>Verifies PKIX x.509 certificate signature.</p>
@@ -780,8 +782,8 @@ fun(#'DistributionPoint'{}, #'CertificateList'{},
   </func> 
 
   <func>
-    <name>pkix_verify_hostname(Cert, ReferenceIDs) -> boolean()</name>
-    <name>pkix_verify_hostname(Cert, ReferenceIDs, Opts) -> boolean()</name>
+    <name since="OTP 19.3">pkix_verify_hostname(Cert, ReferenceIDs) -> boolean()</name>
+    <name since="OTP 19.3">pkix_verify_hostname(Cert, ReferenceIDs, Opts) -> boolean()</name>
     <fsummary>Verifies that a PKIX x.509 certificate <i>presented identifier</i> (e.g hostname) is
     an expected one.</fsummary>
     <type>
@@ -813,7 +815,8 @@ fun(#'DistributionPoint'{}, #'CertificateList'{},
       <p>The <c>{OtherRefId,term()}</c> is defined by the user and is passed to the <c>match_fun</c>, if defined.
       If the term in <c>OtherRefId</c> is a binary, it will be converted to a string.
       </p>
-      <p>The <c>ip</c> Reference ID takes an <seealso marker="inet:inet#type-ip_address">inet:ip_address()</seealso>
+      <p>The <c>ip</c> Reference ID takes an
+      <seealso marker="kernel:inet#type-ip_address">inet:ip_address()</seealso>
       or an ip address in string format (E.g "10.0.1.1" or "1234::5678:9012") as second element.
       </p>
       <p>The options are:</p>
@@ -864,7 +867,7 @@ end
   </func>
 
   <func>
-    <name>pkix_verify_hostname_match_fun(Protcol) ->  fun(RefId | FQDN::string(), PresentedID) -> boolean() | default</name>
+    <name since="OTP 21.0">pkix_verify_hostname_match_fun(Protcol) ->  fun(RefId | FQDN::string(), PresentedID) -> boolean() | default</name>
     <fsummary>Returns a fun that is intendended as argument to the match_fun option in pkix_verify_hostname/3.
     </fsummary>
     <type>
@@ -889,8 +892,8 @@ end
   
 
   <func>
-    <name name="sign" arity="3"/>
-    <name name="sign" arity="4"/>
+    <name name="sign" arity="3" since=""/>
+    <name name="sign" arity="4" since="OTP 20.1"/>
     <fsummary>Creates a digital signature.</fsummary>
   <desc>
     <p>Creates a digital signature.</p> 
@@ -901,7 +904,7 @@ end
   </func>   
 
   <func>
-    <name name="ssh_decode" arity="2"/>
+    <name name="ssh_decode" arity="2" since="OTP R14B03"/>
     <fsummary>Decodes an SSH file-binary.</fsummary>
     <desc>
       <p>Decodes an SSH file-binary. In the case of <c>known_hosts</c> or
@@ -933,7 +936,7 @@ end
   </func>
 
   <func>
-    <name name="ssh_encode" arity="2"/>
+    <name name="ssh_encode" arity="2" since="OTP R14B03"/>
     <fsummary>Encodes a list of SSH file entries to a binary.</fsummary>
     <desc>
       <p>Encodes a list of SSH file entries (public keys and attributes) to a binary. Possible
@@ -947,9 +950,9 @@ end
   </func>
 
   <func>
-    <name>ssh_hostkey_fingerprint(HostKey) -> string()</name>
-    <name>ssh_hostkey_fingerprint(DigestType, HostKey) -> string()</name>
-    <name>ssh_hostkey_fingerprint([DigestType], HostKey) -> [string()]</name>
+    <name since="OTP 19.2">ssh_hostkey_fingerprint(HostKey) -> string()</name>
+    <name since="OTP 19.2">ssh_hostkey_fingerprint(DigestType, HostKey) -> string()</name>
+    <name since="OTP 19.2">ssh_hostkey_fingerprint([DigestType], HostKey) -> [string()]</name>
     <fsummary>Calculates a ssh fingerprint for a hostkey.</fsummary>
     <type>
       <v>HostKey = <seealso marker="#type-public_key">public_key()</seealso></v>
@@ -982,8 +985,8 @@ end
   </func>
 
   <func>
-    <name name="verify" arity="4"/>
-    <name name="verify" arity="5"/>
+    <name name="verify" arity="4" since="OTP R14B"/>
+    <name name="verify" arity="5" since="OTP 20.1"/>
     <fsummary>Verifies a digital signature.</fsummary>
   <desc>
     <p>Verifies a digital signature.</p>
@@ -993,7 +996,7 @@ end
   </func>
 
   <func>
-    <name name="short_name_hash" arity="1"/>
+    <name name="short_name_hash" arity="1" since="OTP 19.0"/>
     <fsummary>Generates a short hash of an issuer name.</fsummary>
     <desc>
       <p>Generates a short hash of an issuer name.  The hash is
diff --git a/lib/public_key/doc/src/public_key_app.xml b/lib/public_key/doc/src/public_key_app.xml
index 923a9f1dfb..5f2c50711a 100644
--- a/lib/public_key/doc/src/public_key_app.xml
+++ b/lib/public_key/doc/src/public_key_app.xml
@@ -51,6 +51,9 @@
       Diffie-Hellman Key Agreement Standard </item>
       <item>Supports <url href="http://www.ietf.org/rfc/rfc2898.txt"> PKCS-5</url> - 
       Password-Based Cryptography Standard </item>
+      <item>Supports <url href="http://www.ietf.org/rfc/fc3565.txt"> AES </url> -
+      Use of the Advanced Encryption Standard (AES) Algorithm in Cryptographic Message Syntax (CMS)
+      </item>
       <item>Supports <url href="http://www.ietf.org/rfc/rfc5208.txt"> PKCS-8</url> - 
       Private-Key Information Syntax Standard</item>
       <item>Supports <url href="http://www.ietf.org/rfc/rfc5967.txt"> PKCS-10</url> - 
diff --git a/lib/public_key/src/pubkey_cert.erl b/lib/public_key/src/pubkey_cert.erl
index 61a1239d26..12c61e158f 100644
--- a/lib/public_key/src/pubkey_cert.erl
+++ b/lib/public_key/src/pubkey_cert.erl
@@ -1187,6 +1187,8 @@ sign_algorithm(#'ECPrivateKey'{parameters = Parms}, Opts) ->
                           parameters = Parms}.
 rsa_digest_oid(sha1) ->
     ?'sha1WithRSAEncryption';
+rsa_digest_oid(sha) ->
+    ?'sha1WithRSAEncryption';
 rsa_digest_oid(sha512) ->
     ?'sha512WithRSAEncryption';
 rsa_digest_oid(sha384) ->
@@ -1198,6 +1200,8 @@ rsa_digest_oid(md5) ->
 
 ecdsa_digest_oid(sha1) ->
     ?'ecdsa-with-SHA1';
+ecdsa_digest_oid(sha) ->
+    ?'ecdsa-with-SHA1';
 ecdsa_digest_oid(sha512) ->
     ?'ecdsa-with-SHA512';
 ecdsa_digest_oid(sha384) ->
diff --git a/lib/public_key/src/pubkey_pbe.erl b/lib/public_key/src/pubkey_pbe.erl
index 806f7c5b0f..6003bf21d0 100644
--- a/lib/public_key/src/pubkey_pbe.erl
+++ b/lib/public_key/src/pubkey_pbe.erl
@@ -26,9 +26,7 @@
 -export([encode/4, decode/4, decrypt_parameters/1, encrypt_parameters/1]). 
 -export([pbdkdf1/4, pbdkdf2/7]).
 
--define(DEFAULT_SHA_MAC_KEYLEN, 20).
 -define(ASN1_OCTET_STR_TAG, 4).
--define(IV_LEN, 8).
 
 %%====================================================================
 %% Internal application API
@@ -41,16 +39,24 @@
 %%--------------------------------------------------------------------
 encode(Data, Password, "DES-CBC" = Cipher, KeyDevParams) ->
     {Key, IV} = password_to_key_and_iv(Password, Cipher, KeyDevParams),
-    crypto:block_encrypt(des_cbc, Key, IV, pbe_pad(Data, KeyDevParams));
-
+    crypto:block_encrypt(des_cbc, Key, IV, pbe_pad(Data, block_size(des_cbc)));
 encode(Data, Password, "DES-EDE3-CBC" = Cipher, KeyDevParams) ->
     {Key, IV} = password_to_key_and_iv(Password, Cipher, KeyDevParams),
     <<Key1:8/binary, Key2:8/binary, Key3:8/binary>> = Key,
-    crypto:block_encrypt(des3_cbc, [Key1, Key2, Key3], IV, pbe_pad(Data));
-
+    crypto:block_encrypt(des3_cbc, [Key1, Key2, Key3], IV,  pbe_pad(Data, block_size(des_3ede)));
 encode(Data, Password, "RC2-CBC" = Cipher, KeyDevParams) ->
     {Key, IV} = password_to_key_and_iv(Password, Cipher, KeyDevParams),
-    crypto:block_encrypt(rc2_cbc, Key, IV, pbe_pad(Data, KeyDevParams)).
+    crypto:block_encrypt(rc2_cbc, Key, IV,  pbe_pad(Data, block_size(rc2_cbc)));
+encode(Data, Password, "AES-128-CBC" = Cipher, KeyDevParams) ->
+    {Key, IV} = password_to_key_and_iv(Password, Cipher, KeyDevParams),
+    crypto:block_encrypt(aes_128_cbc, Key, IV,  pbe_pad(Data, block_size(aes_128_cbc)));
+encode(Data, Password, "AES-192-CBC" = Cipher, KeyDevParams) ->
+    {Key, IV} = password_to_key_and_iv(Password, Cipher, KeyDevParams),
+    crypto:block_encrypt(aes_192_cbc, Key, IV,  pbe_pad(Data, block_size(aes_192_cbc)));
+encode(Data, Password, "AES-256-CBC"= Cipher, KeyDevParams) ->
+    {Key, IV} = password_to_key_and_iv(Password, Cipher, KeyDevParams),
+    crypto:block_encrypt(aes_256_cbc, Key, IV,  pbe_pad(Data, block_size(aes_256_cbc))).
+
 %%--------------------------------------------------------------------
 -spec decode(binary(), string(), string(), term()) -> binary().
 %%
@@ -59,24 +65,25 @@ encode(Data, Password, "RC2-CBC" = Cipher, KeyDevParams) ->
 decode(Data, Password,"DES-CBC"= Cipher, KeyDevParams) ->
     {Key, IV} = password_to_key_and_iv(Password, Cipher, KeyDevParams),
     crypto:block_decrypt(des_cbc, Key, IV, Data);
-
 decode(Data, Password,"DES-EDE3-CBC" = Cipher, KeyDevParams) ->
     {Key, IV} = password_to_key_and_iv(Password, Cipher, KeyDevParams),
     <<Key1:8/binary, Key2:8/binary, Key3:8/binary>> = Key,
     crypto:block_decrypt(des3_cbc, [Key1, Key2, Key3], IV, Data);
-
 decode(Data, Password,"RC2-CBC"= Cipher, KeyDevParams) ->
     {Key, IV} = password_to_key_and_iv(Password, Cipher, KeyDevParams),
     crypto:block_decrypt(rc2_cbc, Key, IV, Data);
-
-decode(Data, Password,"AES-128-CBC"= Cipher, IV) ->
-    %% PKCS5_SALT_LEN is 8 bytes
-    <<Salt:8/binary,_/binary>> = IV,
-    {Key, _} = password_to_key_and_iv(Password, Cipher, Salt),
-    crypto:block_decrypt(aes_cbc128, Key, IV, Data).
+decode(Data, Password,"AES-128-CBC"= Cipher, KeyDevParams) ->
+    {Key, IV} = password_to_key_and_iv(Password, Cipher, KeyDevParams),
+    crypto:block_decrypt(aes_128_cbc, Key, IV, Data);
+decode(Data, Password,"AES-192-CBC"= Cipher, KeyDevParams) ->
+    {Key, IV} = password_to_key_and_iv(Password, Cipher,  KeyDevParams),
+    crypto:block_decrypt(aes_192_cbc, Key, IV, Data);
+decode(Data, Password,"AES-256-CBC"= Cipher,  KeyDevParams) ->
+    {Key, IV} = password_to_key_and_iv(Password, Cipher, KeyDevParams),
+    crypto:block_decrypt(aes_256_cbc, Key, IV, Data).
 
 %%--------------------------------------------------------------------
--spec pbdkdf1(string(), iodata(), integer(), atom()) -> binary().
+-spec pbdkdf1(iodata(), iodata(), integer(), atom()) -> binary().
 %%
 %% Description: Implements password based decryption key derive function 1.
 %% Exported mainly for testing purposes.
@@ -88,7 +95,7 @@ pbdkdf1(Password, Salt, Count, Hash) ->
     do_pbdkdf1(Result, Count-1, Result, Hash).
 
 %%--------------------------------------------------------------------
--spec pbdkdf2(string(), iodata(), integer(), integer(), fun(), atom(), integer())
+-spec pbdkdf2(iodata(), iodata(), integer(), integer(), fun(), atom(), integer())
 	     -> binary().
 %%
 %% Description: Implements password based decryption key derive function 2.
@@ -131,13 +138,15 @@ password_to_key_and_iv(Password, _Cipher, {#'PBEParameter'{salt = Salt,
     <<Key:8/binary, IV:8/binary, _/binary>> 
 	= pbdkdf1(Password, Salt, Count, Hash),
     {Key, IV};
-password_to_key_and_iv(Password, Cipher, Salt) ->
- KeyLen = derived_key_length(Cipher, undefined),
+password_to_key_and_iv(Password, Cipher, KeyDevParams) ->
+    %% PKCS5_SALT_LEN is 8 bytes
+    <<Salt:8/binary,_/binary>> = KeyDevParams,
+    KeyLen = derived_key_length(Cipher, undefined),
     <<Key:KeyLen/binary, _/binary>> = 
 	pem_encrypt(<<>>, Password, Salt, ceiling(KeyLen div 16), <<>>, md5),
     %% Old PEM encryption does not use standard encryption method
-    %% pbdkdf1 and uses then salt as IV 
-    {Key, Salt}.
+    %% pbdkdf1 
+    {Key, KeyDevParams}.
 pem_encrypt(_, _, _, 0, Acc, _) ->
     Acc;
 pem_encrypt(Prev, Password, Salt, Count, Acc, Hash) ->
@@ -150,17 +159,15 @@ do_pbdkdf1(Prev, Count, Acc, Hash) ->
     Result = crypto:hash(Hash, Prev),
     do_pbdkdf1(Result, Count-1 , <<Result/binary, Acc/binary>>, Hash).
 
-iv(#'PBES2-params_encryptionScheme'{algorithm = Algo,
-				    parameters = ASN1IV}) 
-  when (Algo == ?'desCBC') or
-       (Algo == ?'des-EDE3-CBC') ->
-    <<?ASN1_OCTET_STR_TAG, ?IV_LEN, IV:?IV_LEN/binary>> = decode_handle_open_type_wrapper(ASN1IV),
-    IV;
 iv(#'PBES2-params_encryptionScheme'{algorithm = ?'rc2CBC',
 				    parameters =  ASN1IV}) ->
     {ok, #'RC2-CBC-Parameter'{iv = IV}} 
 	= 'PKCS-FRAME':decode('RC2-CBC-Parameter', decode_handle_open_type_wrapper(ASN1IV)),
-    iolist_to_binary(IV).
+    iolist_to_binary(IV);
+iv(#'PBES2-params_encryptionScheme'{algorithm = _Algo,
+				    parameters = ASN1IV}) ->
+    <<?ASN1_OCTET_STR_TAG, Len:8/unsigned-big-integer, IV:Len/binary>> = decode_handle_open_type_wrapper(ASN1IV),
+    IV.
 
 blocks(1, N, Index, Password, Salt, Count, Prf, PrfHash, PrfLen, Acc) ->
     <<XorSum:N/binary, _/binary>> = xor_sum(Password, Salt, Count, Index, Prf, PrfHash, PrfLen),
@@ -217,17 +224,9 @@ pbe1_oid("RC2-CBC", md5) ->
 pbe1_oid("DES-CBC", md5) ->
     ?'pbeWithMD5AndDES-CBC'.
 
-pbe_pad(Data, {#'PBEParameter'{}, _}) ->
-    pbe_pad(Data);
-pbe_pad(Data, #'PBES2-params'{}) ->
-    pbe_pad(Data);
-pbe_pad(Data, _) ->
-pbe_pad(Data).%%    Data.
-
-
-pbe_pad(Data) ->
-    N = 8 - (erlang:byte_size(Data) rem 8), 
-    Pad = list_to_binary(lists:duplicate(N, N)),
+pbe_pad(Data, BlockSize) ->
+    N = BlockSize - (erlang:byte_size(Data) rem BlockSize), 
+    Pad = binary:copy(<<N>>, N),
     <<Data/binary, Pad/binary>>.
 
 key_derivation_params(#'PBES2-params'{keyDerivationFunc = KeyDerivationFunc,
@@ -249,11 +248,27 @@ key_derivation_params(#'PBES2-params'{keyDerivationFunc = KeyDerivationFunc,
 pseudo_random_function(#'PBKDF2-params_prf'{algorithm = 
 						{_,_, _,'id-hmacWithSHA1'}}) ->
     {fun crypto:hmac/4, sha, pseudo_output_length(?'id-hmacWithSHA1')};
-pseudo_random_function(#'PBKDF2-params_prf'{algorithm = ?'id-hmacWithSHA1'}) ->
-    {fun crypto:hmac/4, sha, pseudo_output_length(?'id-hmacWithSHA1')}.
+pseudo_random_function(#'PBKDF2-params_prf'{algorithm = ?'id-hmacWithSHA1' = Algo}) ->
+    {fun crypto:hmac/4, sha, pseudo_output_length(Algo)};
+pseudo_random_function(#'PBKDF2-params_prf'{algorithm = ?'id-hmacWithSHA224'= Algo}) ->
+    {fun crypto:hmac/4, sha224, pseudo_output_length(Algo)};
+pseudo_random_function(#'PBKDF2-params_prf'{algorithm = ?'id-hmacWithSHA256' = Algo}) ->
+    {fun crypto:hmac/4, sha256,  pseudo_output_length(Algo)};
+pseudo_random_function(#'PBKDF2-params_prf'{algorithm = ?'id-hmacWithSHA384' = Algo}) ->
+    {fun crypto:hmac/4, sha384,  pseudo_output_length(Algo)};
+pseudo_random_function(#'PBKDF2-params_prf'{algorithm = ?'id-hmacWithSHA512' = Algo}) ->
+    {fun crypto:hmac/4, sha512,  pseudo_output_length(Algo)}.                 
 
 pseudo_output_length(?'id-hmacWithSHA1') ->
-    ?DEFAULT_SHA_MAC_KEYLEN.
+    20; %%160/8
+pseudo_output_length(?'id-hmacWithSHA224') ->
+    28; %%%224/8
+pseudo_output_length(?'id-hmacWithSHA256') ->
+    32; %%256/8
+pseudo_output_length(?'id-hmacWithSHA384') ->
+    48; %%384/8
+pseudo_output_length(?'id-hmacWithSHA512') ->
+    64. %%512/8
 
 derived_key_length(_, Len) when is_integer(Len) ->
     Len;
@@ -266,9 +281,33 @@ derived_key_length(Cipher,_) when (Cipher == ?'rc2CBC') or
 derived_key_length(Cipher,_) when (Cipher == ?'des-EDE3-CBC') or 
 				  (Cipher == "DES-EDE3-CBC") ->
     24;
-derived_key_length(Cipher,_) when (Cipher == "AES-128-CBC") ->
+
+derived_key_length(Cipher,_) when (Cipher == "AES-128-CBC");
+                                  (Cipher == ?'id-aes128-CBC') ->
+    16;
+derived_key_length(Cipher,_) when (Cipher == "AES-192-CBC");
+                                  (Cipher == ?'id-aes192-CBC') ->
+    24;
+
+derived_key_length(Cipher,_) when (Cipher == "AES-256-CBC");
+                                  (Cipher == ?'id-aes256-CBC') ->
+    32.
+
+block_size(Cipher) when Cipher == rc2_cbc; 
+                        Cipher == des_cbc;
+			Cipher == des_3ede -> 
+    8;
+block_size(Cipher) when Cipher == aes_128_cbc;
+                        Cipher == aes_192_cbc;
+			Cipher == aes_256_cbc ->
     16.
 
+cipher(#'PBES2-params_encryptionScheme'{algorithm = ?'id-aes128-CBC'}) ->
+    "AES-128-CBC";
+cipher(#'PBES2-params_encryptionScheme'{algorithm = ?'id-aes192-CBC'}) ->
+    "AES-192-CBC";
+cipher(#'PBES2-params_encryptionScheme'{algorithm = ?'id-aes256-CBC'}) ->
+    "AES-256-CBC";
 cipher(#'PBES2-params_encryptionScheme'{algorithm = ?'desCBC'}) ->
     "DES-CBC";
 cipher(#'PBES2-params_encryptionScheme'{algorithm = ?'des-EDE3-CBC'}) ->
diff --git a/lib/public_key/src/pubkey_pem.erl b/lib/public_key/src/pubkey_pem.erl
index d7e5bc3ad8..0fd1453f7c 100644
--- a/lib/public_key/src/pubkey_pem.erl
+++ b/lib/public_key/src/pubkey_pem.erl
@@ -101,10 +101,10 @@ encode_pem_entry({'PrivateKeyInfo', Der, EncParams}) ->
     EncDer = encode_encrypted_private_keyinfo(Der, EncParams),
     StartStr = pem_start('EncryptedPrivateKeyInfo'),
     [StartStr, "\n", b64encode_and_split(EncDer), "\n", pem_end(StartStr) ,"\n\n"];
-encode_pem_entry({Type, Der, {Cipher, Salt}}) ->
+encode_pem_entry({Type, Decrypted, {Cipher, Salt}}) ->
     StartStr = pem_start(Type),
     [StartStr,"\n", pem_decrypt(),"\n", pem_decrypt_info(Cipher, Salt),"\n\n",
-     b64encode_and_split(Der), "\n", pem_end(StartStr) ,"\n\n"].
+     b64encode_and_split(Decrypted), "\n", pem_end(StartStr) ,"\n\n"].
 
 decode_pem_entries([], Entries) ->
     lists:reverse(Entries);
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl
index 75d40d2e8a..47266c514c 100644
--- a/lib/public_key/src/public_key.erl
+++ b/lib/public_key/src/public_key.erl
@@ -66,7 +66,7 @@
 
 -export_type([public_key/0, private_key/0, pem_entry/0,
 	      pki_asn1_type/0, asn1_type/0, ssh_file/0, der_encoded/0,
-              key_params/0, digest_type/0]).
+              key_params/0, digest_type/0, issuer_name/0, oid/0]).
 
 -type public_key()           ::  rsa_public_key() | dsa_public_key() | ec_public_key() | ed_public_key() .
 -type private_key()          ::  rsa_private_key() | dsa_private_key() | ec_private_key() | ed_private_key() .
@@ -112,6 +112,7 @@
 -type ssh_file()             :: openssh_public_key | rfc4716_public_key | known_hosts |
 				auth_keys.
 -type digest_type()          :: none % None is for backwards compatibility
+                              | sha1 % Backwards compatibility
                               | crypto:rsa_digest_type()
                               | crypto:dss_digest_type()
                               | crypto:ecdsa_digest_type().
@@ -406,8 +407,7 @@ decrypt_private(CipherText,
 		Options)
   when is_binary(CipherText),
        is_list(Options) ->
-    Padding = proplists:get_value(rsa_pad, Options, rsa_pkcs1_padding),
-    crypto:private_decrypt(rsa, CipherText, format_rsa_private_key(Key), Padding).
+    crypto:private_decrypt(rsa, CipherText, format_rsa_private_key(Key), default_options(Options)).
 
 %%--------------------------------------------------------------------
 %% Description: Public key decryption using the public key.
@@ -428,8 +428,7 @@ decrypt_public(CipherText, Key) ->
                                      PlainText :: binary() .
 decrypt_public(CipherText, #'RSAPublicKey'{modulus = N, publicExponent = E}, 
 	       Options) when is_binary(CipherText), is_list(Options)  ->
-    Padding = proplists:get_value(rsa_pad, Options, rsa_pkcs1_padding),
-    crypto:public_decrypt(rsa, CipherText,[E, N], Padding).
+    crypto:public_decrypt(rsa, CipherText,[E, N], default_options(Options)).
 
 %%--------------------------------------------------------------------
 %% Description: Public key encryption using the public key.
@@ -451,8 +450,7 @@ encrypt_public(PlainText, Key) ->
                                        CipherText :: binary() .
 encrypt_public(PlainText, #'RSAPublicKey'{modulus=N,publicExponent=E}, 
 	       Options) when is_binary(PlainText), is_list(Options) ->
-    Padding = proplists:get_value(rsa_pad, Options, rsa_pkcs1_padding),
-    crypto:public_encrypt(rsa, PlainText, [E,N], Padding).
+    crypto:public_encrypt(rsa, PlainText, [E,N], default_options(Options)).
 
 %%--------------------------------------------------------------------
 %%
@@ -480,8 +478,7 @@ encrypt_private(PlainText,
   when is_binary(PlainText),
        is_integer(N), is_integer(E), is_integer(D),
        is_list(Options) ->
-    Padding = proplists:get_value(rsa_pad, Options, rsa_pkcs1_padding),
-    crypto:private_encrypt(rsa, PlainText, format_rsa_private_key(Key), Padding).
+    crypto:private_encrypt(rsa, PlainText, format_rsa_private_key(Key), default_options(Options)).
 
 %%--------------------------------------------------------------------
 %% Description: List available group sizes among the pre-computed dh groups
@@ -1234,6 +1231,33 @@ pkix_test_root_cert(Name, Opts) ->
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
+default_options([]) ->
+    [{rsa_padding, rsa_pkcs1_padding}];
+default_options(Opts) ->
+    case proplists:get_value(rsa_pad, Opts) of
+        undefined ->
+            case proplists:get_value(rsa_padding, Opts) of
+                undefined ->
+                    case lists:dropwhile(fun erlang:is_tuple/1, Opts) of
+                        [Pad|_] ->
+                            set_padding(Pad, Opts);
+                        [] ->
+                            set_padding(rsa_pkcs1_padding, Opts)
+                    end;
+                Pad ->
+                    set_padding(Pad, Opts)
+            end;
+        Pad ->
+            set_padding(Pad, Opts)
+    end.
+
+set_padding(Pad, Opts) ->
+    [{rsa_padding,Pad} | [{T,V} || {T,V} <- Opts,
+                                   T =/= rsa_padding,
+                                   T =/= rsa_pad]
+    ].
+
+
 format_sign_key(Key = #'RSAPrivateKey'{}) ->
     {rsa, format_rsa_private_key(Key)};
 format_sign_key(#'DSAPrivateKey'{p = P, q = Q, g = G, x = X}) ->
diff --git a/lib/public_key/test/pbe_SUITE.erl b/lib/public_key/test/pbe_SUITE.erl
index 523c9e2515..61db282dfa 100644
--- a/lib/public_key/test/pbe_SUITE.erl
+++ b/lib/public_key/test/pbe_SUITE.erl
@@ -37,7 +37,7 @@ all() ->
     [
      pbdkdf1,
      pbdkdf2,
-     old_enc,
+     old_pbe,
      pbes1,
      pbes2].
 
@@ -197,41 +197,51 @@ pbdkdf2(Config) when is_list(Config) ->
 	= pubkey_pbe:pbdkdf2("pass\0word", 
 			     "sa\0lt", 4096, 16, fun crypto:hmac/4, sha, 20).
 
-old_enc() ->
-    [{doc,"Tests encode/decode RSA key encrypted with different ciphers using old PEM encryption scheme"}].
-old_enc(Config) when is_list(Config) ->
-    Datadir = proplists:get_value(data_dir, Config),
-    %% key generated with ssh-keygen -N hello_aes -f old_aes_128_cbc_enc_key.pem
-    {ok, PemAesCbc} = file:read_file(filename:join(Datadir, "old_aes_128_cbc_enc_key.pem")),
-    
-    PemAesCbcEntry = public_key:pem_decode(PemAesCbc),
-    ct:print("Pem entry: ~p" , [PemAesCbcEntry]),
-    [{'RSAPrivateKey', _, {"AES-128-CBC",_}} = PubAesCbcEntry] = PemAesCbcEntry,
-    #'RSAPrivateKey'{} = public_key:pem_entry_decode(PubAesCbcEntry, "hello_aes").
-
 pbes1() ->
     [{doc,"Tests encode/decode EncryptedPrivateKeyInfo encrypted with different ciphers using PBES1"}].
 pbes1(Config) when is_list(Config) ->
     decode_encode_key_file("pbes1_des_cbc_md5_enc_key.pem", "password", "DES-CBC", Config).
-    
+
 pbes2() ->
     [{doc,"Tests encode/decode EncryptedPrivateKeyInfo encrypted with different ciphers using PBES2"}].
 pbes2(Config) when is_list(Config) ->
     decode_encode_key_file("pbes2_des_cbc_enc_key.pem", "password", "DES-CBC", Config),
-    decode_encode_key_file("pbes2_des_ede3_cbc_enc_key.pem", "password", "DES-EDE3-CBC", Config),   
+    decode_encode_key_file("pbes2_des_ede3_cbc_enc_key.pem", "password", "DES-EDE3-CBC", Config),  
+    decode_encode_key_file("pbes2_aes_128_enc_key.pem", "password", "AES-128-CBC", Config),   
+    decode_encode_key_file("pbes2_aes_192_enc_key.pem", "password", "AES-192-CBC", Config),   
+    decode_encode_key_file("pbes2_aes_256_enc_key.pem", "password", "AES-256-CBC", Config),   
     case lists:member(rc2_cbc, proplists:get_value(ciphers, crypto:supports())) of
 	true ->
 	    decode_encode_key_file("pbes2_rc2_cbc_enc_key.pem", "password", "RC2-CBC", Config);
 	false ->
 	    ok
     end.
+old_pbe() ->
+    [{doc,"Tests encode/decode with old format used before PBE"}].
+old_pbe(Config) when is_list(Config) ->
+     Datadir = proplists:get_value(data_dir, Config),
+     % key generated with ssh-keygen -N hello_aes -f old_aes_128_cbc.pem
+    {ok, PemAes128Cbc} = file:read_file(filename:join(Datadir, "old_aes_128_cbc.pem")),
+    
+    PemAes128CbcEntries = public_key:pem_decode(PemAes128Cbc),
+    ct:print("Pem entry: ~p" , [PemAes128CbcEntries]),
+    [{'RSAPrivateKey', _, {"AES-128-CBC",_}} = Aes128CbcEntry] = PemAes128CbcEntries,
+    #'RSAPrivateKey'{} = Key = public_key:pem_entry_decode(Aes128CbcEntry, "hello_aes"),
+    
 
+    %% Converted with openssl rsa -in old_aes_128_cbc.pem -out old_aes_256_cbc.pem -aes256
+   {ok, PemAes256Cbc} = file:read_file(filename:join(Datadir, "old_aes_256_cbc.pem")),
+    
+    PemAes256CbcEntries = public_key:pem_decode(PemAes256Cbc),
+    ct:print("Pem entry: ~p" , [PemAes256CbcEntries]),
+    [{'RSAPrivateKey', _, {"AES-256-CBC",_}} = Aes256CbcEntry] = PemAes256CbcEntries,
+    Key = public_key:pem_entry_decode(Aes256CbcEntry, "hello_aes").
+    
 decode_encode_key_file(File, Password, Cipher, Config) ->
     Datadir = proplists:get_value(data_dir, Config),
     {ok, PemKey} = file:read_file(filename:join(Datadir, File)),
     
     PemEntry = public_key:pem_decode(PemKey),
-    ct:print("Pem entry: ~p" , [PemEntry]),
     [{Asn1Type, _, {Cipher,_} = CipherInfo} = PubEntry] = PemEntry,
     #'RSAPrivateKey'{} = KeyInfo = public_key:pem_entry_decode(PubEntry, Password),
     PemKey1 = public_key:pem_encode([public_key:pem_entry_encode(Asn1Type, KeyInfo, {CipherInfo, Password})]),
diff --git a/lib/public_key/test/pbe_SUITE_data/old_aes_128_cbc_enc_key.pem b/lib/public_key/test/pbe_SUITE_data/old_aes_128_cbc.pem
index 34c7543f30..34c7543f30 100644
--- a/lib/public_key/test/pbe_SUITE_data/old_aes_128_cbc_enc_key.pem
+++ b/lib/public_key/test/pbe_SUITE_data/old_aes_128_cbc.pem
diff --git a/lib/public_key/test/pbe_SUITE_data/old_aes_256_cbc.pem b/lib/public_key/test/pbe_SUITE_data/old_aes_256_cbc.pem
new file mode 100644
index 0000000000..e6aec2869d
--- /dev/null
+++ b/lib/public_key/test/pbe_SUITE_data/old_aes_256_cbc.pem
@@ -0,0 +1,30 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: AES-256-CBC,ABDA22398E511E9465983E1A50706044
+
+XhIcPOb6pTWL++pgeeTH5rsx0tackhllVqyXyOfbYMBJnVFRhQ/V/1MDg3Jt4wD1
+Nerhcv5srHeiwmf+vwXwDFOzvFzLVM1jFMUJe/2XloYFX4TBiLZAF/zekQA3uPY6
+DKJuBuO5vVSZ0VlxGpu3jphIAwxbssfZkZmryCP3b1/oX5Y3Em/wEWW3RduaeWFu
+Z2nTsPH3yNmHkuqFF3cq0aZs+VxtjcuYo0gbkN5hNVgOoOVxIBzw7DsgBAkdXvr3
+LRCMGg7Y2pVthA963s0xkN37XtZEiYbydoLnzHlW/Kx5QSvED8/Fn94Lcdy5NsQN
+7nYWWgYZRH39Wnsi0BrTZv399U5rBe7DnpStKWPn2Sa8Bdu3CX2oLajM1cZjAp1X
+y6vuasK7SoZ8rWpcsHQpV1HyNBTl/uRU5nrYc/KGD8l2x7tdNidGx2Hey/6O4H5v
+rxL1TB4PlzDYwCsReuyLbEjyuZQ10j0SK/SFzikHuvD2IEpM/oUaPdVFqcW8/sjw
+VhcsupAf4EXfsi2dJBylmDjI2W7h9XwBDLzQN+69DtkBmvimE5CguTITf8MAHQQ6
+Q1vYF2ij7W675tj9ulksRPaMxSsI03luai/Jrieh0mPqGEenGEEC5QU0XPOvsfyw
+GMYaBUbdYrMpbHM3wFPxM2wRlXf4gX5BhZKRGZX7OaEs54pfglyQtTPuZmD0VcAp
+EWHq70G9mbuBlhbMX1rKAomuDmIvgLeLRUpAFf59Qr8KoJSLD1S8TJB3uEPk6i39
+4GnylbpmqS4gv/OIc6WTeOeUZTAD3A77HBwSlELPk3/s1d/MLyfciYClOBEuZ6NB
+FXEKCGCEC786zJA678gLEaa2XPNkEM+2gjzNFqtYMIn5ehAq/HRRsFvW+wkTbee4
+z+qe5HbVKAQ3EOfbidvYrDaGd7HvHVG8zosl+O61iIFs04lLEMDFXBIdvIgEncOK
+Rq3yXdpBKMg89aoZLniaPobSvuvdjNOMzW6EKlb5FKZduCiR68MEZ+rLHYHTwE3W
+Z5+TCbrbV2F6WQpq3zqnB14wGu8igEb5Veq+N2vMkx4iTMTUyCty1SwIjj4NidM1
+dJM7Ighdal6tQ6hIwbDfpIPsY4eGH/UrdVZ0SkxuDR2s76cZ8nFX3lJ/BNwTZLKo
+IqAC4NjUOv3ID+0Q6Lz+sxLCi5pLYUf0E+s4pgi1BYAOu+BF3GwxyqnqVoq/Fs5D
+LXxuY0946YM+WcrYzke4mq3MPx6QQYj04H5KJ2mzxtnbZJrfLF23PVRVhvgKSjyV
+I3/zgJ16fV2H/fb26oCpTNbb11pQvhorkLwdvpwtM+go7dJGebAi1762Nbj/CqnW
+fbBPxPRvNPZn6pEodJ/L/APhvGv1K7eC9THj66H7Kmeoq8Lz74idhywP9I3QS0ZO
+15ORbTDjuiRYNJPxxu79A3/tWMUlprJ9ljhI/0DXRB0M3UGic52D/32Q64I7eewy
+qRNS/3C3ejDShIRBDFTdDkM3s/42LySXJjmjU9bpZY4POQ3kOaJb3EzSvbzTyXzu
+3FiHvDQY+b8XwbxtE/kTMaAPQZ7TtWOao7SRi7J94MvCQ5/tbakFP2suM8psnigC
+-----END RSA PRIVATE KEY-----
diff --git a/lib/public_key/test/pbe_SUITE_data/pbes2_aes_128_enc_key.pem b/lib/public_key/test/pbe_SUITE_data/pbes2_aes_128_enc_key.pem
new file mode 100644
index 0000000000..5702119ad6
--- /dev/null
+++ b/lib/public_key/test/pbe_SUITE_data/pbes2_aes_128_enc_key.pem
@@ -0,0 +1,30 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIWrPgmqJqNpICAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAECBBA/bbIMYqQMUDxMk9ifPR7ABIIE
+0Drfqke1/ccFxk786hTh36yjVo48Xx7B3Scb92KtmyQpNaR6GbR+jhP9cxIcvmGN
+YroCB896VJSIx8PraqGgIJ1hblZXyfLanB0mUnZvaaQ4xp3UJT53a0yOm5Lfd+fB
+0TyaoEzca2jA5EVVh3yH6gzNsvQJRw6cQP5CAptLjiUv2jrwVGnO8x8X4egJDLZS
+Sb8B5AW8h1sGsyKEEFto6gpBjVqnVn5veMoI/Cfs9qDr071+dhbps/m6pseKKp0z
+8qeFM7+9Y4npD1VYg2gqOFi19QAI3gwq6tC8grOzRA8dPFUgpV9eMToVsI2OFQc1
+xnFZEV7NZVymh5HjKM1jwFy6es+5TFoMtRu6vDxKS6Y13lIlZ4oQSh8aXtG5Ylt2
+CqsKNHyDbZUpvKe/k19TBmVXQBCYFuN733jI9/4JBtpygnxwt1aXCvq/PFFGsTS4
+p1JOQvr/jaD7b4JO6IMXH1kSVxiMXKXNG7wPUNr6OWJvc7OqdclsZa7ibEx4L52x
+DuFmsxQo4a3iibhbcjr436OmR5Uw2UAstB5qxWfMhkt+e7rRhCOh/3O7SAYEpt+f
+Zr2VFXdGme4kR6uMCzgGiSh0qCseQXpJUZVufn/Go9r+601OJTJIQ9a2VoqlMR8o
+Dd14D0gBXXaZkY60Mh8iXR/MjKDuv0KBUyBzfcpk3fLmv0PhGSkbn6j+q1jZbogm
+EhI0AL5s2EoofuBdvgdusBhCrrwCMonprqR7BuaKPD0GEw5utnT5ovcUg/sjMJox
+10100QwAzQScU4iG/xic/TsN+ZMumhUcYs003MsZkRLvCEFxZurEMx7819CqfhIc
+NGd7ETTBSwoNf5pXRTHaTbW6pPiIeWunLUUVsRcNoBtL/cXmg+mu1zdsD7nD51mJ
+vG9A7LPW7XVl2Jv2NgQoKkHYO7cVozmcz6AE2z1q+XN4LGto8JEZktb6E7UIyXXg
+Ls4Tv0sn5TLgtaJ31w4+9iybNiGoVYOc4h0s5DoNR4ivcZ6n/Qnf8PTrNzejEJY6
+R/UnDbc24u0palGc1kei99d0BYodnq4OlAj7M7ML0GncftInhgA0Dp81YG5PujMa
+irhvwtnD5Xysfh1YrroAEN7Qxc8+2JlpgNSFlFFkMgfibc6jvTX6/C6MaFz8hiOq
+W43ZBEzjMIs23ZrJKOJGsuTdHSob+VbvqIMgS2PeGb/6g3/GjdipCbynNhX3zUOM
+3j/lpZOiAwE/Bftr5FOSfTFpnyorIIeyWgROEZTTL4eSYvnBjzf+tUdXY7ltxJie
+q0rpQ42X7+B4gTo8Qj/xC7LXSCldERK57cCwwITvjcHwxPyOiJ9BMI1HlRQ/Fo3C
+lPYIst1xjJ67qrTm6mWkor2hUOZcg4MOOzXWuijWRGJ/Wz0H+GKWtoE2X536D6sy
+a4Nwwj09oFY4Fph/SUNwy0MLpTSzikpUx6mxjbs3Odvo6tWWVcicp/dCWYCqLpGU
+3axEb/qlsaRNtKJg9O3Fq7hh1BTyLNGB2ET5wSKtlSD0bDeF15bBvkHB3z2/lDls
+YQ2hEHMjeSEZZyGTPqEHwtBuUwiWBBXwOIhT8nfYXbHWR0CLBLth2+E/JCaO9hD2
+V277arqNFa8nugZMwS+ragi6vbgIX4BiS/rnfYXgqaxD
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/lib/public_key/test/pbe_SUITE_data/pbes2_aes_192_enc_key.pem b/lib/public_key/test/pbe_SUITE_data/pbes2_aes_192_enc_key.pem
new file mode 100644
index 0000000000..ee82e9f667
--- /dev/null
+++ b/lib/public_key/test/pbe_SUITE_data/pbes2_aes_192_enc_key.pem
@@ -0,0 +1,30 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIcqBCM7v+ZlkCAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEWBBD93r4IWBhvry+cdfwIDOKeBIIE
+0DXM8S70sMsUmwxRZQtKwGfYddEWIc9lrEdsgEEuonF6NrseRq7QdXnBSPwq5f0O
+ofMZ/0OCun3Qg1ls1EdsyKdijSOq27ZhHCnmWi1Rw1ApJIAq5i/jY8U17+lUakvG
+VtcsuRzlKmFxbBW44kLK7vK6xiA76HPx0I4ZXcdywR0pbLT1ubbhbQ9djLnBiYkT
+odszGTyxNceEse1Hu/RhFK17tnwov0fdioKY2i9F7qfq8lYLPrusEKTY7tOVjFOh
+bXeCry1BL0KTt65JVGR9xQCI0qokEU0QrCgD6skq7Vx2C/Ho1sW6h8FBFVIm6ozO
+bEUtVk3Xgs5yieetha1GxJAang1VxAPemnXfOmVapoSgSv1BQyDdnk3067Sfkh64
+A5yf44BUjvJsSd/ViCVmCryoXU7KOMAdFkyRSiDDLQus6bZGEhc6f+VEikG+TZ2L
+xxY4OucE2Bz67S6ycyOUpXKo0+FW0juE6NTJdlYSXWOvfciZKA83h6yAej6MfUEu
+4orIvnCTVO7i3+hHybnSgftj42jrqqZzeXll8rkGHg4syrKRVaDD6qfJjgAHBJkJ
+pZT4zZwuJ1puWfBykI25S4mKUnk0erq4N5jpGqdm7U14fWBWCjZN85jY4WgZZOJx
+kBNO2NbmZKzZEzRGyMJ563z4l7MNfzZBHv+FeBNkX146J4ZhMbT8IXPGV9peNWqu
+mY2B9RhN4hlDrd3Hfz5uiiF3UGrFkDcsPRBHWGqQ20YpuOQNno7iL8N0FWauERw1
+dvxAGVwFfUznR3wc/eyGcnRhqQhlYPspukh0IVIyEbre3yVFSG/41GQYQfg08XYd
+LYiiDUu1i515/GeDvYN5VcnZ4nMhPgqfxW4rEUZjI86p++bqwqGy8eOCivkzGV3A
+IFWQwlvKKzU7tSdi3uHUq5v7xQsJrALdf67JVjCCGfUZa17O41vmm58L/vKhhL2Y
+mLz/H004DPsB+CtWoLwqZ8Jmb1EHwqNbna3tGHn3n63j2cV7gykZFa/zXeuBbbJ/
+t4ZIojIEzwAVKA9Xzcl3wyGCRr62WJPEcOqe4kBYREuKd22juPEm9RQgciIIj0tP
+eJVpD0QarGGzERsaq7pheAiWisO+Q4cLjF8Mb3/r89abnd4AQk6meabFJIE2dXWp
+LZy3I6FkNQ7L7LxNOILhnaWzWGdOBVwHeAAxfbLOzM22ewj7oUwBCRpsBJ8zl2PL
+VhUjX6N26YoiR9gE1RBaVrwRkYLmkyGvrowCDoZVPxvJqbfIESQE42zGB9DbEPNp
+WXCnzAg5cIjNC31We274yLE7dpNPVRXPJCRhtp7noorWVzDdKB+dFvg08bIir6Vj
+1gxy8DvuZE1Gq9vqx38V7Cy2MrSpsgapw5mli4n5cMafE7Ty3j5pBJFF2f3jUn6B
+7MjCrKp1d8v6MEy18J/Ugu1Lytb92LMcNtWBKmqyCSxekrUB9/FC2hWqOpdwRI6q
+QMWkwshjyEhmlr2PAkBPM4uVzUFc9lBw1GzOUChkr9jiINdbsUSRJrwZ32Nc3gRY
+yKzWbEELPSgRcXwXgH3QqZukvmk2tBMTIxilXqKTLmd7t/AEnIhkbqC0pfnyChyU
+YlFkme0RpAXpgbDJgv+Vk+1/1s6gyaNSzT4s2Q340WIO
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/lib/public_key/test/pbe_SUITE_data/pbes2_aes_256_enc_key.pem b/lib/public_key/test/pbe_SUITE_data/pbes2_aes_256_enc_key.pem
new file mode 100644
index 0000000000..050337aead
--- /dev/null
+++ b/lib/public_key/test/pbe_SUITE_data/pbes2_aes_256_enc_key.pem
@@ -0,0 +1,30 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQI4MxgpDiHxQcCAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBA2g/L8XmlK2axDkeYJCltnBIIE
+0C3+NQ93DzEK/9qicy1sj0Vag1M7AeJjTGGpatETCxM+eHjk4kNNeDeMV5+EmCSu
+Db4P48uvHOBGGCcqdjnQovfQsAh81GWxgF3yqpd4OKn2RubMLO4/Qu+zGtt/XRKz
+T0pyHHBu6hyPSOhad2SIjKWuaHepwxGYaejLP83sy6yhm0sEmyBUn4nGSTOROcqR
+wd7EbwU2PYUcrRGGxtChU7MUNt48wBO50Xmri1ssPPtZV6MHio4IoIz4hqzCjvAc
+VE1BqAvNIJ7icpdnL8Jqq0lfwEmGjFCkAjgov5fNW9I1b44jE2Tv5LM2urMH8InQ
+9qNjTHozYQhHAk9nX4cmMgHsIhkOd7Z2M+nz8Hd1tj9DmBNOr5XbfyctgVntaMB4
+GGnThuNlX8d5giOKOcaNPMpLU1jtfDcb73mEhwCYcdo1PM0rjrYZ7qetjXJW/oHs
+Nl/hIZIRpMuCRVuXHml4G+ziKbMnXUN8sbtvgkQatYFHFQOhAqZeyzWp8SlDcfqb
+Zt0LlZVJEhKUYzZgKoe7SmR1rXTTCfYeB75PddyYwVgf/IkT6HJ/y1apGOP6/UJ8
+7UV6zssQA35gMsYDT36sH2hAQvA/cOFxSxrip0gm0xXOeFF0gbyZWbFqk0aULaeF
+rbBoMe28akxdE4eD06b+TP2NguUGP72l3TPOlG4PQVScweMw9L3oPXOVj4Vbbd0y
+DenNvRHlWIwOh/y7ADTHSWq9CE45QDBvFaTcn43JQWD8xCmhAhI/9H+fhAQUhABm
+P5QoJLE2IGo8A+Gi7rfgYQb3fCgqcn8azsRJzozhE+oXxMvxEESejYTtm26FNmLg
+ONTWysF9BiaKHt2IXwRX97691wZqv5wJEaxeeJxfVQ6MlAHoEDXe49VxGN4zFXuq
+Yb71JdQDgM94jwc/PoUwFH2ALSkIciiKwU0xfFpptycl4qWpy9m7QTIKw0DjgCfg
+MuySPRGM5jn3yVg72ux2Qf9MKNEybWjZ+Se9MJ1IZmZK5eOo6L2JsFCc0nRn908E
+vn4gAgUfMxyCZ1ygXfxINVAixR+6KPHsz1QTIxTZkrlnXRsuEu1ZfBSHzmXESvJo
+3I9PkP/Iekg1FBpB5xxd7mXwCj17EWqYXWsLnfd8SblMjRYd64q7hfx0oU/MJ1wi
+KadkGcyAGVRyleJRBR0LleYj/2sDihrRQY4zu5UtzSMFMH0XWjSWk5+ZQb+z3iDc
+Ud4GHcHiuTMH+i03ApZGWLN9v93za/15fsnZogstgJkaHxizTz5JuCkRf15xd8+O
+EH77Tsfizjp+h2NF/wcr4OSD0i+H0mwZWajpZ3UmSeJ0BFK6ODEbmVycrInpHo3n
+zyMJnEDTJXL3HUwZSLjO5e5cNaB+75tdHrj2yJtRLuaJFr02b0EO1MUYfuUuqlK4
+7mg7FkBsimW+CXkoLRjHYK88ibT3G+rZ/STf4S/jxiRjBi06FAql3H02K5i1umgB
+0BaaQei0Z8wQxMeTEnGzL+OcJeqDA1ZRFeXe7DNGsX1jeTYKPHA/Dr2IdZqyiCr2
+xh6e7RJuUe4D2liXW8LlMdwhN/7xSinA031PgBmb8XzSRmfdHhytFkA8PiM5T2ew
+NR3qXBJ/G7BuRa/t26RuKI3BMVoBQPhGx80ds10uJjxq
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index 5e2643f0ea..a5e4ec8d5a 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 1.6.4
+PUBLIC_KEY_VSN = 1.6.7
diff --git a/lib/reltool/doc/src/notes.xml b/lib/reltool/doc/src/notes.xml
index 165ae6db6a..ee00b6086d 100644
--- a/lib/reltool/doc/src/notes.xml
+++ b/lib/reltool/doc/src/notes.xml
@@ -38,7 +38,40 @@
     thus constitutes one section in this document. The title of each
     section is the version number of Reltool.</p>
 
-  <section><title>Reltool 0.7.8</title>
+  <section><title>Reltool 0.8</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    A new element, <c>Opts</c>, can now be included in a
+	    <c>rel</c> tuple in the reltool release specific
+	    configuration format: {rel, Name, Vsn, RelApps, Opts}.</p>
+          <p>
+	    This supports the use of <c>{rel, Name, Vsn, RelApps,
+	    [{load_dot_erlang, false}]}</c> to prevent the boot
+	    script from running the <c>.erlang</c> file.</p>
+          <p>
+	    The incompatibilities are as follows:</p>
+          <p>
+	    * The return from <c>reltool:get_config/1</c> and
+	    <c>reltool:get_config/3</c> includes the new <c>rel</c>
+	    tuple for all releases where the <c>load_dot_erlang</c>
+	    option is set to <c>false</c>.<br/> * The return from
+	    <c>reltool:get_config/3</c> includes the new <c>rel</c>
+	    tuple for ALL releases if the <c>InclDefs</c> parameter
+	    is set to <c>true</c>.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15571</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Reltool 0.7.8</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/reltool/doc/src/reltool.xml b/lib/reltool/doc/src/reltool.xml
index 874cda8369..136ec2ed69 100644
--- a/lib/reltool/doc/src/reltool.xml
+++ b/lib/reltool/doc/src/reltool.xml
@@ -33,7 +33,7 @@
     <date></date>
     <rev>%VSN%</rev>
   </header>
-  <module>reltool</module>
+  <module since="">reltool</module>
   <modulesummary>Main API of the Reltool application</modulesummary>
   <description>
     <p>This is an interface module for the Reltool application.</p>
@@ -503,6 +503,7 @@ sys()               = {root_dir, root_dir()}
                     | {incl_cond, incl_cond()}
                     | {boot_rel, boot_rel()}
                     | {rel, rel_name(), rel_vsn(), [rel_app()]}
+                    | {rel, rel_name(), rel_vsn(), [rel_app()], [rel_opt()]}
                     | {relocatable, relocatable()}
                     | {app_file, app_file()}
                     | {debug_info, debug_info()}
@@ -534,6 +535,7 @@ rel_app()           = app_name()
                     | {app_name(), app_type()} 
                     | {app_name(), [incl_app()]}
                     | {app_name(), app_type(), [incl_app()]}
+rel_opt()           = {load_dot_erlang, boolean()}
 app_name()          = atom()
 app_type()          = permanent | transient | temporary | load | none
 app_vsn()           = string()
@@ -591,7 +593,7 @@ target_spec()       = [target_spec()]
 
   <funcs>
     <func>
-      <name>create_target(Server, TargetDir) -> ok | {error, Reason}</name>
+      <name since="">create_target(Server, TargetDir) -> ok | {error, Reason}</name>
       <fsummary>Create a target system</fsummary>
       <type>
         <v>Server     = server()</v>
@@ -604,7 +606,7 @@ target_spec()       = [target_spec()]
     </func>
     
     <func>
-      <name>eval_target_spec(TargetSpec, RootDir, TargetDir) -> ok | {error, Reason}</name>
+      <name since="">eval_target_spec(TargetSpec, RootDir, TargetDir) -> ok | {error, Reason}</name>
       <fsummary>Create a target system</fsummary>
       <type>
         <v>TargetSpec = target_spec()</v>
@@ -655,7 +657,7 @@ target_spec()       = [target_spec()]
     </func>
 
     <func>
-      <name>get_config(Server) -> {ok, Config} | {error, Reason}</name>
+      <name since="">get_config(Server) -> {ok, Config} | {error, Reason}</name>
       <fsummary>Get reltool configuration</fsummary>
       <type>
         <v>Server  = server()</v>
@@ -667,7 +669,7 @@ target_spec()       = [target_spec()]
     </func>
 
     <func>
-      <name>get_config(Server, InclDefaults, InclDerived) -> {ok, Config} | {error, Reason}</name>
+      <name since="">get_config(Server, InclDefaults, InclDerived) -> {ok, Config} | {error, Reason}</name>
       <fsummary>Get reltool configuration</fsummary>
       <type>
         <v>Server        = server()</v>
@@ -685,7 +687,7 @@ target_spec()       = [target_spec()]
     </func>
 
     <func>
-      <name>get_rel(Server, Relname) -> {ok, RelFile} | {error, Reason}</name>
+      <name since="">get_rel(Server, Relname) -> {ok, RelFile} | {error, Reason}</name>
       <fsummary>Get contents of a release file</fsummary>
       <type>
         <v>Server  = server()</v>
@@ -698,7 +700,7 @@ target_spec()       = [target_spec()]
     </func>
 
     <func>
-      <name>get_script(Server, Relname) -> {ok, ScriptFile | {error, Reason}</name>
+      <name since="">get_script(Server, Relname) -> {ok, ScriptFile | {error, Reason}</name>
       <fsummary>Get contents of a boot script file</fsummary>
       <type>
         <v>Server     = server()</v>
@@ -711,7 +713,7 @@ target_spec()       = [target_spec()]
     </func>
 
     <func>
-      <name>get_status(Server) -> {ok, [Warning]} | {error, Reason}</name>
+      <name since="OTP R14B">get_status(Server) -> {ok, [Warning]} | {error, Reason}</name>
       <fsummary>Get contents of a release file</fsummary>
       <type>
         <v>Server  = server()</v>
@@ -722,7 +724,7 @@ target_spec()       = [target_spec()]
     </func>
 
     <func>
-      <name>get_server(WindowPid) -> {ok, ServerPid} | {error, Reason}</name>
+      <name since="">get_server(WindowPid) -> {ok, ServerPid} | {error, Reason}</name>
       <fsummary>Start server process with options</fsummary>
       <type>
         <v>WindowPid   = window_pid()</v>
@@ -733,7 +735,7 @@ target_spec()       = [target_spec()]
     </func>
 
     <func>
-      <name>get_target_spec(Server) -> {ok, TargetSpec} | {error, Reason}</name>
+      <name since="">get_target_spec(Server) -> {ok, TargetSpec} | {error, Reason}</name>
       <fsummary>Return a specification of the target system</fsummary>
       <type>
         <v>Server     = server()</v>
@@ -747,7 +749,7 @@ target_spec()       = [target_spec()]
     </func>
 
     <func>
-      <name>install(RelName, TargetDir) -> ok | {error, Reason}</name>
+      <name since="">install(RelName, TargetDir) -> ok | {error, Reason}</name>
       <fsummary>Install a target system</fsummary>
       <type>
         <v>RelName    = rel_name()</v>
@@ -758,7 +760,7 @@ target_spec()       = [target_spec()]
     </func>
 
     <func>
-      <name>start() -> {ok, WindowPid} | {error, Reason}</name>
+      <name since="">start() -> {ok, WindowPid} | {error, Reason}</name>
       <fsummary>Start main window process</fsummary>
       <type>
         <v>WindowPid   = window_pid()</v>
@@ -768,7 +770,7 @@ target_spec()       = [target_spec()]
     </func>
   
     <func>
-      <name>start(Options) -> {ok, WindowPid} | {error, Reason}</name>
+      <name since="">start(Options) -> {ok, WindowPid} | {error, Reason}</name>
       <fsummary>Start main window process with options</fsummary>
       <type>
         <v>Options     = options()</v>
@@ -779,7 +781,7 @@ target_spec()       = [target_spec()]
     </func>
   
     <func>
-      <name>start_link(Options) -> {ok, WindowPid} | {error, Reason}</name>
+      <name since="">start_link(Options) -> {ok, WindowPid} | {error, Reason}</name>
       <fsummary>Start main window process with options</fsummary>
       <type>
         <v>Options     = options()</v>
@@ -790,7 +792,7 @@ target_spec()       = [target_spec()]
     </func>
   
     <func>
-      <name>start_server(Options) -> {ok, ServerPid} | {error, Reason}</name>
+      <name since="">start_server(Options) -> {ok, ServerPid} | {error, Reason}</name>
       <fsummary>Start server process with options</fsummary>
       <type>
         <v>Options     = options()</v>
@@ -803,7 +805,7 @@ target_spec()       = [target_spec()]
     </func>
 
     <func>
-      <name>stop(Pid) -> ok | {error, Reason}</name>
+      <name since="">stop(Pid) -> ok | {error, Reason}</name>
       <fsummary>Stop a server or window process</fsummary>
       <type>
         <v>Pid     = server_pid() | window_pid()</v>
diff --git a/lib/reltool/doc/src/reltool_examples.xml b/lib/reltool/doc/src/reltool_examples.xml
index 2a103119e6..3888b643a2 100644
--- a/lib/reltool/doc/src/reltool_examples.xml
+++ b/lib/reltool/doc/src/reltool_examples.xml
@@ -160,7 +160,7 @@ Eshell V9.0  (abort with ^G)
                        {mod,erts_internal,[]},
                        {mod,erts_literal_area_collector,[]},
                        {mod,init,[]},
-                       {mod,otp_ring0,...},
+                       {mod,erl_init,...},
                        {mod,...},
                        {...}|...]}]},
           {app,compiler,
@@ -313,9 +313,12 @@ Erlang/OTP 20 [erts-10.0] [source-c13b302] [64-bit] [smp:4:4] [ds:4:4:10] [async
 [hipe] [kernel-poll:false]
 Eshell V10.0  (abort with ^G)
 1&gt;
-1&gt; {ok, Server} = reltool:start_server([{config, {sys, [{boot_rel, "NAME"},
-                                                        {rel, "NAME", "VSN",
-                                                        [sasl]}]}}]).
+1&gt; {ok, Server} = reltool:start_server([{config,
+                                         {sys,
+                                          [{boot_rel, "NAME"},
+                                           {rel, "NAME", "VSN",
+                                            [sasl],
+                                            [{load_dot_erlang, false}]}]}}]).
 {ok,&lt;0.1288.0&gt;}
 2&gt;
 2&gt; reltool:get_config(Server).
@@ -331,7 +334,7 @@ Eshell V10.0  (abort with ^G)
 {ok,{script,{"NAME","VSN"},
             [{preLoaded,[erl_prim_loader,erl_tracer,erlang,
                          erts_code_purger,erts_dirty_process_signal_handler,
-                         erts_internal,erts_literal_area_collector,init,otp_ring0,
+                         erts_internal,erts_literal_area_collector,init,erl_init,
                          prim_eval,prim_file,prim_inet,prim_zip,zlib]},
              {progress,preloaded},
              {path,["$ROOT/lib/kernel-5.2/ebin",
diff --git a/lib/reltool/src/reltool.hrl b/lib/reltool/src/reltool.hrl
index d133762818..892aaf8649 100644
--- a/lib/reltool/src/reltool.hrl
+++ b/lib/reltool/src/reltool.hrl
@@ -61,6 +61,7 @@
                           | {app_name(), app_type()}
                           | {app_name(), [incl_app()]}
                           | {app_name(), app_type(), [incl_app()]}.
+-type rel_opt()          :: {load_dot_erlang, boolean()}.
 -type mod()              :: {incl_cond, incl_cond()}
                           | {debug_info, debug_info()}.
 -type app()              :: {vsn, app_vsn()}
@@ -92,6 +93,8 @@
                           | {lib_dirs, [lib_dir()]}
                           | {boot_rel, boot_rel()}
                           | {rel, rel_name(), rel_vsn(), [rel_app()]}
+                          | {rel, rel_name(), rel_vsn(),
+                             [rel_app()], [rel_opt()]}
                           | {relocatable, relocatable()}
                           | {erts, app()}
                           | {escript, escript_file(), [escript()]}
diff --git a/lib/reltool/src/reltool_server.erl b/lib/reltool/src/reltool_server.erl
index af71b0cf2a..2de8000fd8 100644
--- a/lib/reltool/src/reltool_server.erl
+++ b/lib/reltool/src/reltool_server.erl
@@ -526,7 +526,7 @@ analyse(#state{sys=Sys} = S, Apps, Status) ->
     %% is included in a release (rel spec - see apps_in_rels above).
     %% Then initiate the same for each module, and check that there
     %% are no duplicated module names (in different applications)
-    %% where we can not decide which one to use.
+    %% where we cannot decide which one to use.
     %% Write all #app to app_tab and all #mod to mod_tab.
     Status2 = apps_init_is_included(S, Apps, RelApps, Status),
 
@@ -1483,6 +1483,18 @@ decode(#sys{rels = Rels} = Sys, [{rel, Name, Vsn, RelApps} | SysKeyVals])
     Rel = #rel{name = Name, vsn = Vsn, rel_apps = []},
     Rel2 = decode(Rel, RelApps),
     decode(Sys#sys{rels = [Rel2 | Rels]}, SysKeyVals);
+decode(#sys{rels = Rels} = Sys, [{rel, Name, Vsn, RelApps, Opts} | SysKeyVals])
+  when is_list(Name), is_list(Vsn), is_list(RelApps), is_list(Opts) ->
+    Rel1 = lists:foldl(fun(Opt, Rel0) ->
+        case Opt of
+            {load_dot_erlang, Value} when is_boolean(Value) ->
+                Rel0#rel{load_dot_erlang = Value};
+            _ ->
+                reltool_utils:throw_error("Illegal rel option: ~tp", [Opt])
+        end
+    end, #rel{name = Name, vsn = Vsn, rel_apps = []}, Opts),
+    Rel2 = decode(Rel1, RelApps),
+    decode(Sys#sys{rels = [Rel2 | Rels]}, SysKeyVals);
 decode(#sys{} = Sys, [{Key, Val} | KeyVals]) ->
     Sys3 =
         case Key of
diff --git a/lib/reltool/src/reltool_target.erl b/lib/reltool/src/reltool_target.erl
index 64834ecc1d..dfa62479a0 100644
--- a/lib/reltool/src/reltool_target.erl
+++ b/lib/reltool/src/reltool_target.erl
@@ -108,12 +108,8 @@ do_gen_config(#sys{root_dir          	= RootDir,
 		     emit(incl_cond, A#app.incl_cond, undefined, InclDefs)}
 		    || A <- Apps, A#app.is_escript],
     DefaultRels = reltool_utils:default_rels(),
-    RelsItems =
-	[{rel, R#rel.name, R#rel.vsn, do_gen_config(R, InclDefs)} ||
-	    R <- Rels],
-    DefaultRelsItems =
-	[{rel, R#rel.name, R#rel.vsn, do_gen_config(R, InclDefs)} ||
-	    R <- DefaultRels],
+    RelsItems = [do_gen_config(R, InclDefs) || R <- Rels],
+    DefaultRelsItems = [do_gen_config(R, InclDefs) || R <- DefaultRels],
     RelsItems2 =
 	case InclDefs of
 	    true  -> RelsItems;
@@ -201,11 +197,20 @@ do_gen_config(#mod{name = Name,
 	_ ->
 	    []
     end;
-do_gen_config(#rel{name = _Name,
-		   vsn = _Vsn,
-		   rel_apps = RelApps},
-	      InclDefs) ->
-    [do_gen_config(RA, InclDefs) || RA <- RelApps];
+do_gen_config(#rel{name = Name,
+                   vsn = Vsn,
+                   rel_apps = RelApps,
+                   load_dot_erlang = LoadDotErlang},
+              InclDefs) ->
+    RelAppsConfig = [do_gen_config(RA, InclDefs) || RA <- RelApps],
+    if
+        LoadDotErlang =:= false ->
+            {rel, Name, Vsn, RelAppsConfig, [{load_dot_erlang, false}]};
+        InclDefs =:= true ->
+            {rel, Name, Vsn, RelAppsConfig, [{load_dot_erlang, true}]};
+        LoadDotErlang =:= true ->
+            {rel, Name, Vsn, RelAppsConfig}
+    end;
 do_gen_config(#rel_app{name = Name,
 		       app_type = Type,
 		       incl_apps = InclApps},
diff --git a/lib/reltool/test/reltool_server_SUITE.erl b/lib/reltool/test/reltool_server_SUITE.erl
index 9ee61b595d..bb092e8bbf 100644
--- a/lib/reltool/test/reltool_server_SUITE.erl
+++ b/lib/reltool/test/reltool_server_SUITE.erl
@@ -102,6 +102,7 @@ all() ->
      create_release,
      create_release_sort,
      create_script,
+     create_script_without_dot_erlang,
      create_script_sort,
      create_target,
      create_target_unicode,
@@ -171,7 +172,7 @@ break(_Config) ->
 
 start_server(_Config) ->
     {ok, Pid} = ?msym({ok, _}, reltool:start_server([])),
-    Libs = lists:sort(erl_libs()),
+    Libs = reltool_test_lib:erl_libs(),
     StrippedDefault =
         case Libs of
             [] -> {sys, []};
@@ -185,7 +186,7 @@ start_server(_Config) ->
 %% Start a server process and check that it does not crash
 
 set_config(_Config) ->
-    Libs = lists:sort(erl_libs()),
+    Libs = reltool_test_lib:erl_libs(),
     Default =
         {sys,
          [
@@ -219,7 +220,15 @@ get_config(_Config) ->
     StdLibDir = filename:join(LibDir,"stdlib-"++StdVsn),
     SaslLibDir = filename:join(LibDir,"sasl-"++SaslVsn),
 
-    Sys = {sys,[{incl_cond, exclude},
+    Libs = reltool_test_lib:erl_libs(),
+    LibDirs =
+        case Libs of
+            [] -> [];
+            _ -> [{lib_dirs,Libs}]
+        end,
+
+    Sys = {sys,LibDirs ++
+               [{incl_cond, exclude},
 		{app,kernel,[{incl_cond,include}]},
 		{app,sasl,[{incl_cond,include},{vsn,SaslVsn}]},
 		{app,stdlib,[{incl_cond,include},{lib_dir,StdLibDir}]}]},
@@ -228,13 +237,27 @@ get_config(_Config) ->
     ?m({ok, Sys}, reltool:get_config(Pid,false,false)),
 
     %% Include derived info
-    ?msym({ok,{sys,[{incl_cond, exclude},
-		    {erts,[]},
-		    {app,kernel,[{incl_cond,include},{mod,_,[]}|_]},
-		    {app,sasl,[{incl_cond,include},{vsn,SaslVsn},{mod,_,[]}|_]},
-		    {app,stdlib,[{incl_cond,include},{lib_dir,StdLibDir},
-				 {mod,_,[]}|_]}]}},
-	  reltool:get_config(Pid,false,true)),
+    case Libs of
+        [] ->
+            ?msym({ok,{sys,[{incl_cond, exclude},
+                            {erts,[]},
+                            {app,kernel,[{incl_cond,include},{mod,_,[]}|_]},
+                            {app,sasl,[{incl_cond,include},{vsn,SaslVsn},
+                                       {mod,_,[]}|_]},
+                            {app,stdlib,[{incl_cond,include},{lib_dir,StdLibDir},
+                                         {mod,_,[]}|_]}]}},
+                  reltool:get_config(Pid,false,true));
+        _ ->
+            ?msym({ok,{sys,[{lib_dirs,Libs},
+                            {incl_cond, exclude},
+                            {erts,[]},
+                            {app,kernel,[{incl_cond,include},{mod,_,[]}|_]},
+                            {app,sasl,[{incl_cond,include},{vsn,SaslVsn},
+                                       {mod,_,[]}|_]},
+                            {app,stdlib,[{incl_cond,include},{lib_dir,StdLibDir},
+                                         {mod,_,[]}|_]}]}},
+                  reltool:get_config(Pid,false,true))
+    end,
 
     %% Include defaults
     ?msym({ok,{sys,[{root_dir,_},
@@ -248,9 +271,9 @@ get_config(_Config) ->
 		    {app,stdlib,[{incl_cond,include},{vsn,undefined},
 				 {lib_dir,StdLibDir}]},
 		    {boot_rel,"start_clean"},
-                    {rel,"no_dot_erlang","1.0",[]},
-		    {rel,"start_clean","1.0",[]},
-		    {rel,"start_sasl","1.0",[sasl]},
+                    {rel,"no_dot_erlang","1.0",[],[{load_dot_erlang,false}]},
+		    {rel,"start_clean","1.0",[],[{load_dot_erlang,true}]},
+		    {rel,"start_sasl","1.0",[sasl],[{load_dot_erlang,true}]},
 		    {emu_name,"beam"},
 		    {relocatable,true},
 		    {profile,development},
@@ -279,9 +302,9 @@ get_config(_Config) ->
 		    {app,stdlib,[{incl_cond,include},{vsn,StdVsn},
 				 {lib_dir,StdLibDir},{mod,_,[]}|_]},
 		    {boot_rel,"start_clean"},
-                    {rel,"no_dot_erlang","1.0",[]},
-		    {rel,"start_clean","1.0",[]},
-		    {rel,"start_sasl","1.0",[sasl]},
+                    {rel,"no_dot_erlang","1.0",[],[{load_dot_erlang,false}]},
+		    {rel,"start_clean","1.0",[],[{load_dot_erlang,true}]},
+		    {rel,"start_sasl","1.0",[sasl],[{load_dot_erlang,true}]},
 		    {emu_name,"beam"},
 		    {relocatable,true},
 		    {profile,development},
@@ -305,11 +328,11 @@ get_config(_Config) ->
 %% OTP-9135, test that app_file option can be set to all | keep | strip
 
 otp_9135(_Config) ->
-    Libs = lists:sort(erl_libs()),
+    Libs = reltool_test_lib:erl_libs(),
     StrippedDefaultSys = 
         case Libs of
             [] -> [];
-            _  -> {lib_dirs, Libs}
+            _  -> [{lib_dirs, Libs}]
         end,
     
     Config1 = {sys,[{app_file, keep}]}, % this is the default
@@ -549,6 +572,32 @@ create_script(_Config) ->
     
     ?m(equal, diff_script(OrigScript, Script)),
 
+    %% A release defaults to load_dot_erlang == true
+    {script, {RelName, RelVsn}, ScriptInstructions} = Script,
+    ?m(true, lists:member({apply,{c,erlangrc,[]}}, ScriptInstructions)),
+
+    %% Stop server
+    ?m(ok, reltool:stop(Pid)),
+    ok.
+
+create_script_without_dot_erlang(_Config) ->
+    %% Configure the server
+    RelName = "Just testing",
+    RelVsn = "1.0",
+    Config =
+        {sys,
+         [
+          {lib_dirs, []},
+          {boot_rel, RelName},
+          {rel, RelName, RelVsn, [stdlib, kernel], [{load_dot_erlang, false}]}
+         ]},
+    {ok, Pid} = ?msym({ok, _}, reltool:start_server([{config, Config}])),
+
+    %% Confirm that load_dot_erlang == false was used
+    {ok, Script} = ?msym({ok, _}, reltool:get_script(Pid, RelName)),
+    {script, {RelName, RelVsn}, ScriptInstructions} = Script,
+    ?m(false, lists:member({apply,{c,erlangrc,[]}}, ScriptInstructions)),
+
     %% Stop server
     ?m(ok, reltool:stop(Pid)),
     ok.
@@ -1039,7 +1088,7 @@ create_standalone_app(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Generate standalone system with inlined archived application
-%% Check that the inlined app can not be explicitly configured
+%% Check that the inlined app cannot be explicitly configured
 
 create_standalone_app_clash(Config) ->
     %% Create archive
@@ -1659,7 +1708,7 @@ set_apps_inlined(Config) ->
     ?m(true, Someapp1#app.is_included),
     ?m(true, Someapp1#app.is_pre_included),
 
-    %% Check that inlined app can not be configured
+    %% Check that inlined app cannot be configured
     Someapp2 = Someapp1#app{incl_cond=exclude},
     ?msym({error,
 	   "Application someapp is inlined in '*escript* someapp'. "
@@ -1719,13 +1768,19 @@ set_sys_and_undo(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 load_config_and_undo(Config) ->
-    Sys1 = {sys,[{incl_cond, exclude},
-		 {app,kernel,[{incl_cond,include}]},
-		 {app,sasl,[{incl_cond,include}]},
-		 {app,stdlib,[{incl_cond,include}]},
-		 {app,tools,[{incl_cond,include}]}]},
+    Sys1 = {sys,Cfg1=[{incl_cond, exclude},
+                      {app,kernel,[{incl_cond,include}]},
+                      {app,sasl,[{incl_cond,include}]},
+                      {app,stdlib,[{incl_cond,include}]},
+                      {app,tools,[{incl_cond,include}]}]},
     {ok, Pid} = ?msym({ok, _}, reltool:start_server([{config, Sys1}])),
-    ?m({ok, Sys1}, reltool:get_config(Pid)),
+    Libs = reltool_test_lib:erl_libs(),
+    Sys11 =
+        case Libs of
+            [] -> Sys1;
+            _  -> {sys, [{lib_dirs, Libs}|Cfg1]}
+        end,
+    ?m({ok, Sys11}, reltool:get_config(Pid)),
     ?m({ok,[]}, reltool_server:get_status(Pid)),
 
     %% Get app and mod
@@ -1780,13 +1835,19 @@ load_config_and_undo(Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Test that load_config is properly rolled back if it fails
 load_config_fail(_Config) ->
-    Sys1 = {sys,[{incl_cond, exclude},
-		 {app,kernel,[{incl_cond,include}]},
-		 {app,sasl,[{incl_cond,include}]},
-		 {app,stdlib,[{incl_cond,include}]},
-		 {app,tools,[{incl_cond,include}]}]},
+    Sys1 = {sys,Cfg1=[{incl_cond, exclude},
+                      {app,kernel,[{incl_cond,include}]},
+                      {app,sasl,[{incl_cond,include}]},
+                      {app,stdlib,[{incl_cond,include}]},
+                      {app,tools,[{incl_cond,include}]}]},
     {ok, Pid} = ?msym({ok, _}, reltool:start_server([{config, Sys1}])),
-    ?m({ok, Sys1}, reltool:get_config(Pid)),
+    Libs = reltool_test_lib:erl_libs(),
+    Sys11 =
+        case Libs of
+            [] -> Sys1;
+            _  -> {sys, [{lib_dirs, Libs}|Cfg1]}
+        end,
+    ?m({ok, Sys11}, reltool:get_config(Pid)),
     ?m({ok,[]}, reltool_server:get_status(Pid)),
 
     %% Get app and mod
@@ -1804,7 +1865,7 @@ load_config_fail(_Config) ->
 	  reltool_server:load_config(Pid,Sys2)),
 
     %% Check that a rollback is done to the old configuration
-    ?m({ok, Sys1}, reltool:get_config(Pid,false,false)),
+    ?m({ok, Sys11}, reltool:get_config(Pid,false,false)),
 
     %% and that tools is not changed (i.e. that the new configuration
     %% is not applied)
@@ -2074,25 +2135,42 @@ gen_rel_files(_Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 save_config(Config) ->
     PrivDir = ?config(priv_dir,Config),
-    Sys = {sys,[{incl_cond, exclude},
-		{app,kernel,[{incl_cond,include}]},
-		{app,sasl,[{incl_cond,include}]},
-		{app,stdlib,[{incl_cond,include}]}]},
+    Sys = {sys,Cfg=[{incl_cond, exclude},
+                    {app,kernel,[{incl_cond,include}]},
+                    {app,sasl,[{incl_cond,include}]},
+                    {app,stdlib,[{incl_cond,include}]}]},
     {ok, Pid} = ?msym({ok, _}, reltool:start_server([{config, Sys}])),
-    ?m({ok, Sys}, reltool:get_config(Pid)),
+    Libs = reltool_test_lib:erl_libs(),
+    Sys1 =
+        case Libs of
+            [] -> Sys;
+            _  -> {sys, [{lib_dirs, Libs}|Cfg]}
+        end,
+    ?m({ok, Sys1}, reltool:get_config(Pid)),
 
     Simple = filename:join(PrivDir,"save_simple.reltool"),
     ?m(ok, reltool_server:save_config(Pid,Simple,false,false)),
-    ?m({ok,[Sys]}, file:consult(Simple)),
+    ?m({ok,[Sys1]}, file:consult(Simple)),
 
     Derivates = filename:join(PrivDir,"save_derivates.reltool"),
     ?m(ok, reltool_server:save_config(Pid,Derivates,false,true)),
-    ?msym({ok,[{sys,[{incl_cond, exclude},
-		     {erts,[]},
-		     {app,kernel,[{incl_cond,include},{mod,_,[]}|_]},
-		     {app,sasl,[{incl_cond,include},{mod,_,[]}|_]},
-		     {app,stdlib,[{incl_cond,include},{mod,_,[]}|_]}]}]},
-	  file:consult(Derivates)),
+    case Libs of
+        [] ->
+            ?msym({ok,[{sys,[{incl_cond, exclude},
+                             {erts,[]},
+                             {app,kernel,[{incl_cond,include},{mod,_,[]}|_]},
+                             {app,sasl,[{incl_cond,include},{mod,_,[]}|_]},
+                             {app,stdlib,[{incl_cond,include},{mod,_,[]}|_]}]}]},
+                  file:consult(Derivates));
+        _ ->
+            ?msym({ok,[{sys,[{lib_dirs,Libs},
+                             {incl_cond, exclude},
+                             {erts,[]},
+                             {app,kernel,[{incl_cond,include},{mod,_,[]}|_]},
+                             {app,sasl,[{incl_cond,include},{mod,_,[]}|_]},
+                             {app,stdlib,[{incl_cond,include},{mod,_,[]}|_]}]}]},
+                  file:consult(Derivates))
+    end,
 
     Defaults = filename:join(PrivDir,"save_defaults.reltool"),
     ?m(ok, reltool_server:save_config(Pid,Defaults,true,false)),
@@ -2107,9 +2185,9 @@ save_config(Config) ->
 		     {app,stdlib,[{incl_cond,include},{vsn,undefined},
 				  {lib_dir,undefined}]},
 		     {boot_rel,"start_clean"},
-                     {rel,"no_dot_erlang","1.0",[]},
-		     {rel,"start_clean","1.0",[]},
-		     {rel,"start_sasl","1.0",[sasl]},
+                     {rel,"no_dot_erlang","1.0",[],[{load_dot_erlang,false}]},
+		     {rel,"start_clean","1.0",[],[{load_dot_erlang,true}]},
+		     {rel,"start_sasl","1.0",[sasl],[{load_dot_erlang,true}]},
 		     {emu_name,"beam"},
 		     {relocatable,true},
 		     {profile,development},
@@ -2148,9 +2226,9 @@ save_config(Config) ->
 		     {app,stdlib,[{incl_cond,include},{vsn,StdVsn},
 				  {lib_dir,StdLibDir},{mod,_,[]}|_]},
 		     {boot_rel,"start_clean"},
-                     {rel,"no_dot_erlang","1.0",[]},
-		     {rel,"start_clean","1.0",[]},
-		     {rel,"start_sasl","1.0",[sasl]},
+                     {rel,"no_dot_erlang","1.0",[],[{load_dot_erlang,false}]},
+		     {rel,"start_clean","1.0",[],[{load_dot_erlang,true}]},
+		     {rel,"start_sasl","1.0",[sasl],[{load_dot_erlang,true}]},
 		     {emu_name,"beam"},
 		     {relocatable,true},
 		     {profile,development},
@@ -2560,9 +2638,6 @@ windows_erl_libs(_Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Library functions
 
-erl_libs() ->
-    reltool_utils:erl_libs().
-
 datadir(Config) ->
     %% Removes the trailing slash...
     filename:nativename(?config(data_dir,Config)).
diff --git a/lib/reltool/test/reltool_test_lib.erl b/lib/reltool/test/reltool_test_lib.erl
index be48ea4726..033d952d0a 100644
--- a/lib/reltool/test/reltool_test_lib.erl
+++ b/lib/reltool/test/reltool_test_lib.erl
@@ -237,7 +237,8 @@ wait_for_close() ->
 	    wait_for_close()
     end.
 
-
+erl_libs() ->
+    lists:sort([filename:absname(P) || P<-reltool_utils:erl_libs()]).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% A small test server, which can be run standalone in a shell
diff --git a/lib/reltool/test/reltool_wx_SUITE.erl b/lib/reltool/test/reltool_wx_SUITE.erl
index f6f7721762..983c8f6c52 100644
--- a/lib/reltool/test/reltool_wx_SUITE.erl
+++ b/lib/reltool/test/reltool_wx_SUITE.erl
@@ -74,7 +74,12 @@ start_all_windows(_Config) ->
     %% Test that server pid can be fetched, and that server is alive
     {ok, Server} = ?msym({ok,_}, reltool:get_server(SysPid)),
     ?m(true, erlang:is_process_alive(Server)),
-    ?m({ok,{sys,[]}}, reltool:get_config(Server)),
+    Sys =
+        case reltool_test_lib:erl_libs() of
+            [] -> [];
+            Libs -> [{lib_dirs,Libs}]
+        end,
+    ?m({ok,{sys,Sys}}, reltool:get_config(Server)),
 
     %% Terminate
     check_no_win_crash(),
diff --git a/lib/reltool/vsn.mk b/lib/reltool/vsn.mk
index a649a3e0c0..c5aacfba38 100644
--- a/lib/reltool/vsn.mk
+++ b/lib/reltool/vsn.mk
@@ -1 +1 @@
-RELTOOL_VSN = 0.7.8
+RELTOOL_VSN = 0.8
diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in
index 4530a83aee..75b3a98d56 100644
--- a/lib/runtime_tools/c_src/Makefile.in
+++ b/lib/runtime_tools/c_src/Makefile.in
@@ -36,7 +36,7 @@ CC = $(DED_CC)
 CFLAGS = $(DED_CFLAGS) -I./
 LD = $(DED_LD)
 SHELL = /bin/sh
-LIBS = $(DED_LIBS)
+LIBS = $(DED_LIBS) @LIBS@
 LDFLAGS += $(DED_LDFLAGS)
 
 TRACE_LIBNAME = dyntrace trace_file_drv trace_ip_drv
@@ -58,7 +58,7 @@ TYPE_FLAGS = $(CFLAGS)
 endif
 endif
 
-ALL_CFLAGS = @DEFS@ $(TYPE_FLAGS) $(TRACE_DRV_INCLUDES) \
+ALL_CFLAGS = @DEFS@ @ERTS_CONFIG_H_IDIR@ $(TYPE_FLAGS) $(TRACE_DRV_INCLUDES) \
 	-I$(OBJDIR) -I$(ERL_TOP)/erts/emulator/$(TARGET)
 
 ROOTDIR = $(ERL_TOP)/lib
@@ -75,7 +75,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/runtime_tools-$(VSN)
 # Misc Macros
 # ----------------------------------------------------
 
-TRACE_LIBS = $(foreach LIB, $(TRACE_LIBNAME), $(LIBDIR)/$(LIB)$(TYPEMARKER).@DED_EXT@)
+TRACE_LIBS = $(foreach LIB, $(TRACE_LIBNAME), $(LIBDIR)/$(LIB)$(TYPEMARKER).$(DED_EXT))
 
 # ----------------------------------------------------
 # Targets
@@ -94,7 +94,7 @@ $(LIBDIR):
 $(OBJDIR)/%$(TYPEMARKER).o: %.c dyntrace_lttng.h
 	$(V_CC) -c -o $@ $(ALL_CFLAGS) $<
 
-$(LIBDIR)/%$(TYPEMARKER).@DED_EXT@: $(OBJDIR)/%$(TYPEMARKER).o
+$(LIBDIR)/%$(TYPEMARKER).$(DED_EXT): $(OBJDIR)/%$(TYPEMARKER).o
 	$(V_LD) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 clean:
diff --git a/lib/runtime_tools/doc/src/dbg.xml b/lib/runtime_tools/doc/src/dbg.xml
index 3262cafefc..e15fc3efe6 100644
--- a/lib/runtime_tools/doc/src/dbg.xml
+++ b/lib/runtime_tools/doc/src/dbg.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>dbg.sgml</file>
   </header>
-  <module>dbg</module>
+  <module since="">dbg</module>
   <modulesummary>The Text Based Trace Facility</modulesummary>
   <description>
     <p>This module implements a text based interface to the
@@ -68,7 +68,7 @@
   </description>
   <funcs>
     <func>
-      <name>fun2ms(LiteralFun) -> MatchSpec</name>
+      <name since="">fun2ms(LiteralFun) -> MatchSpec</name>
       <fsummary>Pseudo function that transforms fun syntax to match_spec.</fsummary>
       <type>
         <v>LiteralFun = fun() literal</v>
@@ -113,7 +113,7 @@
         <p>The imported variables will be replaced by match_spec
           <c>const</c> expressions, which is consistent with the
           static scoping for Erlang <c>fun()</c>s. Local or global
-          function calls can not be in the guard or body of the fun
+          function calls cannot be in the guard or body of the fun
           however. Calls to builtin match_spec functions of course is
           allowed:</p>
         <pre>
@@ -145,14 +145,14 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
       </desc>
     </func>
     <func>
-      <name>h() -> ok </name>
+      <name since="">h() -> ok </name>
       <fsummary>Give a list of available help items on standard output.</fsummary>
       <desc>
         <p>Gives a list of items for brief online help.</p>
       </desc>
     </func>
     <func>
-      <name>h(Item) -> ok </name>
+      <name since="">h(Item) -> ok </name>
       <fsummary>Give brief help for an item.</fsummary>
       <type>
         <v>Item = atom()</v>
@@ -163,14 +163,14 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
       </desc>
     </func>
     <func>
-      <name>p(Item) -> {ok, MatchDesc} | {error, term()} </name>
+      <name since="">p(Item) -> {ok, MatchDesc} | {error, term()} </name>
       <fsummary>Trace messages to and from Item.</fsummary>
       <desc>
         <p>Equivalent to <c>p(Item, [m])</c>.</p>
       </desc>
     </func>
     <func>
-      <name>p(Item, Flags) -> {ok, MatchDesc} | {error, term()}</name>
+      <name since="">p(Item, Flags) -> {ok, MatchDesc} | {error, term()}</name>
       <fsummary>Trace Item according to Flags.</fsummary>
       <type>
         <v>MatchDesc = [MatchNum]</v>
@@ -303,14 +303,14 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
       </desc>
     </func>
     <func>
-      <name>c(Mod, Fun, Args)</name>
+      <name since="">c(Mod, Fun, Args)</name>
       <fsummary>Evaluate <c>apply(M,F,Args)</c>with <c>all</c>trace flags set.</fsummary>
       <desc>
         <p>Equivalent to <c>c(Mod, Fun, Args, all)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>c(Mod, Fun, Args, Flags)</name>
+      <name since="">c(Mod, Fun, Args, Flags)</name>
       <fsummary>Evaluate <c>apply(M,F,Args)</c>with <c>Flags</c>trace flags set.</fsummary>
       <desc>
         <p>Evaluates the expression <c>apply(Mod, Fun, Args)</c> with the trace
@@ -319,35 +319,35 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
       </desc>
     </func>
     <func>
-      <name>i() -> ok</name>
+      <name since="">i() -> ok</name>
       <fsummary>Display information about all traced processes and ports.</fsummary>
       <desc>
         <p>Displays information about all traced processes and ports.</p>
       </desc>
     </func>
     <func>
-      <name>tp(Module,MatchSpec)</name>
+      <name since="">tp(Module,MatchSpec)</name>
       <fsummary>Set pattern for traced global function calls</fsummary>
       <desc>
         <p>Same as tp({Module, '_', '_'}, MatchSpec)</p>
       </desc>
     </func>
     <func>
-      <name>tp(Module,Function,MatchSpec)</name>
+      <name since="">tp(Module,Function,MatchSpec)</name>
       <fsummary>Set pattern for traced global function calls</fsummary>
       <desc>
         <p>Same as tp({Module, Function, '_'}, MatchSpec)</p>
       </desc>
     </func>
     <func>
-      <name>tp(Module, Function, Arity, MatchSpec)</name>
+      <name since="">tp(Module, Function, Arity, MatchSpec)</name>
       <fsummary>Set pattern for traced global function calls</fsummary>
       <desc>
         <p>Same as tp({Module, Function, Arity}, MatchSpec)</p>
       </desc>
     </func>
     <func>
-      <name>tp({Module, Function, Arity}, MatchSpec) -> {ok, MatchDesc} | {error, term()}</name>
+      <name since="">tp({Module, Function, Arity}, MatchSpec) -> {ok, MatchDesc} | {error, term()}</name>
       <fsummary>Set pattern for traced global function calls</fsummary>
       <type>
         <v>Module = atom() | '_'</v>
@@ -410,28 +410,28 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
       </desc>
     </func>
     <func>
-      <name>tpl(Module,MatchSpec)</name>
+      <name since="">tpl(Module,MatchSpec)</name>
       <fsummary>Set pattern for traced local (as well as global) function calls</fsummary>
       <desc>
         <p>Same as tpl({Module, '_', '_'}, MatchSpec)</p>
       </desc>
     </func>
     <func>
-      <name>tpl(Module,Function,MatchSpec)</name>
+      <name since="">tpl(Module,Function,MatchSpec)</name>
       <fsummary>Set pattern for traced local (as well as global) function calls</fsummary>
       <desc>
         <p>Same as tpl({Module, Function, '_'}, MatchSpec)</p>
       </desc>
     </func>
     <func>
-      <name>tpl(Module, Function, Arity, MatchSpec)</name>
+      <name since="">tpl(Module, Function, Arity, MatchSpec)</name>
       <fsummary>Set pattern for traced local (as well as global) function calls</fsummary>
       <desc>
         <p>Same as tpl({Module, Function, Arity}, MatchSpec)</p>
       </desc>
     </func>
     <func>
-      <name>tpl({Module, Function, Arity}, MatchSpec) -> {ok, MatchDesc} | {error, term()}</name>
+      <name since="">tpl({Module, Function, Arity}, MatchSpec) -> {ok, MatchDesc} | {error, term()}</name>
       <fsummary>Set pattern for traced local (as well as global) function calls</fsummary>
       <desc>
           <p>This function works as <seealso marker="#tp-2"><c>tp/2</c></seealso>, but enables
@@ -442,7 +442,7 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
 
 
     <func>
-      <name>tpe(Event, MatchSpec) -> {ok, MatchDesc} | {error, term()}</name>
+      <name since="OTP 19.0">tpe(Event, MatchSpec) -> {ok, MatchDesc} | {error, term()}</name>
       <fsummary>Set pattern for traced event</fsummary>
       <type>
 	<v>Event = send | 'receive'</v>
@@ -484,35 +484,35 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
       </desc>
     </func>
     <func>
-      <name>ctp()</name>
+      <name since="">ctp()</name>
       <fsummary>Clear call trace pattern for the specified functions</fsummary>
       <desc>
         <p>Same as ctp({'_', '_', '_'})</p>
       </desc>
     </func>
     <func>
-      <name>ctp(Module)</name>
+      <name since="">ctp(Module)</name>
       <fsummary>Clear call trace pattern for the specified functions</fsummary>
       <desc>
         <p>Same as ctp({Module, '_', '_'})</p>
       </desc>
     </func>
     <func>
-      <name>ctp(Module, Function)</name>
+      <name since="">ctp(Module, Function)</name>
       <fsummary>Clear call trace pattern for the specified functions</fsummary>
       <desc>
         <p>Same as ctp({Module, Function, '_'})</p>
       </desc>
     </func>
     <func>
-      <name>ctp(Module, Function, Arity)</name>
+      <name since="">ctp(Module, Function, Arity)</name>
       <fsummary>Clear call trace pattern for the specified functions</fsummary>
       <desc>
         <p>Same as ctp({Module, Function, Arity})</p>
       </desc>
     </func>
     <func>
-      <name>ctp({Module, Function, Arity}) -> {ok, MatchDesc} | {error, term()}</name>
+      <name since="">ctp({Module, Function, Arity}) -> {ok, MatchDesc} | {error, term()}</name>
       <fsummary>Clear call trace pattern for the specified functions</fsummary>
       <type>
         <v>Module = atom() | '_'</v>
@@ -533,35 +533,35 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
       </desc>
     </func>
     <func>
-      <name>ctpl()</name>
+      <name since="">ctpl()</name>
       <fsummary>Clear call trace pattern for the specified functions</fsummary>
       <desc>
         <p>Same as ctpl({'_', '_', '_'})</p>
       </desc>
     </func>
     <func>
-      <name>ctpl(Module)</name>
+      <name since="">ctpl(Module)</name>
       <fsummary>Clear call trace pattern for the specified functions</fsummary>
       <desc>
         <p>Same as ctpl({Module, '_', '_'})</p>
       </desc>
     </func>
     <func>
-      <name>ctpl(Module, Function)</name>
+      <name since="">ctpl(Module, Function)</name>
       <fsummary>Clear call trace pattern for the specified functions</fsummary>
       <desc>
         <p>Same as ctpl({Module, Function, '_'})</p>
       </desc>
     </func>
     <func>
-      <name>ctpl(Module, Function, Arity)</name>
+      <name since="">ctpl(Module, Function, Arity)</name>
       <fsummary>Clear call trace pattern for the specified functions</fsummary>
       <desc>
         <p>Same as ctpl({Module, Function, Arity})</p>
       </desc>
     </func>
     <func>
-      <name>ctpl({Module, Function, Arity}) -> {ok, MatchDesc} | {error, term()}</name>
+      <name since="">ctpl({Module, Function, Arity}) -> {ok, MatchDesc} | {error, term()}</name>
       <fsummary>Clear call trace pattern for the specified functions</fsummary>
       <desc>
           <p>This function works as <seealso marker="#ctp-1"><c>ctp/1</c></seealso>, but only disables
@@ -570,35 +570,35 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
       </desc>
     </func>
     <func>
-      <name>ctpg()</name>
+      <name since="">ctpg()</name>
       <fsummary>Clear call trace pattern for the specified functions</fsummary>
       <desc>
         <p>Same as ctpg({'_', '_', '_'})</p>
       </desc>
     </func>
     <func>
-      <name>ctpg(Module)</name>
+      <name since="">ctpg(Module)</name>
       <fsummary>Clear call trace pattern for the specified functions</fsummary>
       <desc>
         <p>Same as ctpg({Module, '_', '_'})</p>
       </desc>
     </func>
     <func>
-      <name>ctpg(Module, Function)</name>
+      <name since="">ctpg(Module, Function)</name>
       <fsummary>>Clear call trace pattern for the specified functions</fsummary>
       <desc>
         <p>Same as ctpg({Module, Function, '_'})</p>
       </desc>
     </func>
     <func>
-      <name>ctpg(Module, Function, Arity)</name>
+      <name since="">ctpg(Module, Function, Arity)</name>
       <fsummary>>Clear call trace pattern for the specified functions</fsummary>
       <desc>
         <p>Same as ctpg({Module, Function, Arity})</p>
       </desc>
     </func>
     <func>
-      <name>ctpg({Module, Function, Arity}) -> {ok, MatchDesc} | {error, term()}</name>
+      <name since="">ctpg({Module, Function, Arity}) -> {ok, MatchDesc} | {error, term()}</name>
       <fsummary>Clear call trace pattern for the specified functions</fsummary>
       <desc>
           <p>This function works as <seealso marker="#ctp-1"><c>ctp/1</c></seealso>, but only disables
@@ -607,7 +607,7 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
       </desc>
     </func>
     <func>
-      <name>ctpe(Event) -> {ok, MatchDesc} | {error, term()}</name>
+      <name since="OTP 19.0">ctpe(Event) -> {ok, MatchDesc} | {error, term()}</name>
       <fsummary>Clear trace pattern for the specified event</fsummary>
       <type>
         <v>Event = send | 'receive'</v>
@@ -623,7 +623,7 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
       </desc>
     </func>
     <func>
-      <name>ltp() -> ok</name>
+      <name since="">ltp() -> ok</name>
       <fsummary>List saved and built-in match specifications on the console.</fsummary>
       <desc>
         <p>Use this function to recall all match specifications previously
@@ -654,7 +654,7 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
       </desc>
     </func>
     <func>
-      <name>dtp() -> ok</name>
+      <name since="">dtp() -> ok</name>
       <fsummary>Delete all saved match specifications.</fsummary>
       <desc>
         <p>Use this function to "forget" all match specifications
@@ -665,7 +665,7 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
       </desc>
     </func>
     <func>
-      <name>dtp(N) -> ok</name>
+      <name since="">dtp(N) -> ok</name>
       <fsummary>Delete a specific saved match_spec.</fsummary>
       <type>
         <v>N = integer()</v>
@@ -676,7 +676,7 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
       </desc>
     </func>
     <func>
-      <name>wtp(Name) -> ok | {error, IOError}</name>
+      <name since="">wtp(Name) -> ok | {error, IOError}</name>
       <fsummary>Write all saved and built-in match specifications to a file</fsummary>
       <type>
         <v>Name = string()</v>
@@ -699,7 +699,7 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
       </desc>
     </func>
     <func>
-      <name>rtp(Name) -> ok | {error, Error}</name>
+      <name since="">rtp(Name) -> ok | {error, Error}</name>
       <fsummary>Read saved match specifications from file.</fsummary>
       <type>
         <v>Name = string()</v>
@@ -728,7 +728,7 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
       </desc>
     </func>
     <func>
-      <name>n(Nodename) -> {ok, Nodename} | {error, Reason}</name>
+      <name since="">n(Nodename) -> {ok, Nodename} | {error, Reason}</name>
       <fsummary>Add a remote node to the list of traced nodes</fsummary>
       <type>
         <v>Nodename = atom()</v>
@@ -756,7 +756,7 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
           <c>cant_add_local_node</c> is returned.
           </p>
         <p>If a trace port (see <seealso marker="#trace_port-2"><c>trace_port/2</c></seealso>) is
-          running on the local node, remote nodes can not be traced with
+          running on the local node, remote nodes cannot be traced with
           a tracer process. The error reason
           <c>cant_trace_remote_pid_to_local_port</c> is returned. A
           trace port can however be started on the remote node with the
@@ -767,7 +767,7 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
       </desc>
     </func>
     <func>
-      <name>cn(Nodename) -> ok</name>
+      <name since="">cn(Nodename) -> ok</name>
       <fsummary>Clear a node from the list of traced nodes.</fsummary>
       <type>
         <v>Nodename = atom()</v>
@@ -782,14 +782,14 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
       </desc>
     </func>
     <func>
-      <name>ln() -> ok</name>
+      <name since="">ln() -> ok</name>
       <fsummary>Show the list of traced nodes on the console.</fsummary>
       <desc>
         <p>Shows the list of traced nodes on the console.</p>
       </desc>
     </func>
     <func>
-      <name>tracer() -> {ok, pid()} | {error, already_started}</name>
+      <name since="">tracer() -> {ok, pid()} | {error, already_started}</name>
       <fsummary>Start a tracer server that handles trace messages.</fsummary>
       <desc>
         <p>This function starts a server on the local node that will
@@ -805,7 +805,7 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
       </desc>
     </func>
     <func>
-      <name>tracer(Type, Data) -> {ok, pid()} | {error, Error}</name>
+      <name since="">tracer(Type, Data) -> {ok, pid()} | {error, Error}</name>
       <fsummary>Start a tracer server with additional parameters</fsummary>
       <type>
         <v>Type = port | process | module</v>
@@ -859,7 +859,7 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
       </desc>
     </func>
     <func>
-      <name>tracer(Nodename, Type, Data) -> {ok, Nodename} | {error, Reason}</name>
+      <name since="">tracer(Nodename, Type, Data) -> {ok, Nodename} | {error, Reason}</name>
       <fsummary>Start a tracer server on given node with additional parameters</fsummary>
       <type>
         <v>Nodename = atom()</v>
@@ -881,7 +881,7 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
       </desc>
     </func>
     <func>
-      <name>trace_port(Type, Parameters) -> fun()</name>
+      <name since="">trace_port(Type, Parameters) -> fun()</name>
       <fsummary>Create and returns a trace port generating<em>fun</em></fsummary>
       <type>
         <v>Type = ip | file</v>
@@ -958,28 +958,28 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
       </desc>
     </func>
     <func>
-      <name>flush_trace_port()</name>
+      <name since="">flush_trace_port()</name>
       <fsummary>Equivalent to flush_trace_port(node()).</fsummary>
       <desc>
         <p>Equivalent to <c>flush_trace_port(node())</c>.</p>
       </desc>
     </func>
     <func>
-      <name>flush_trace_port(Nodename) -> ok | {error, Reason}</name>
+      <name since="">flush_trace_port(Nodename) -> ok | {error, Reason}</name>
       <fsummary>Flush internal data buffers in a trace driver on the given node.</fsummary>
       <desc>
         <p>Equivalent to <c>trace_port_control(Nodename,flush)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>trace_port_control(Operation)</name>
+      <name since="">trace_port_control(Operation)</name>
       <fsummary>Equivalent to trace_port_control(node(),Operation).</fsummary>
       <desc>
         <p>Equivalent to <c>trace_port_control(node(),Operation)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>trace_port_control(Nodename,Operation) ->  ok | {ok, Result} | {error, Reason}</name>
+      <name since="">trace_port_control(Nodename,Operation) ->  ok | {ok, Result} | {error, Reason}</name>
       <fsummary>Perform a control operation on the active trace port driver on the given node.</fsummary>
       <type>
         <v>Nodename = atom()</v>
@@ -1013,7 +1013,7 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
       </desc>
     </func>
     <func>
-      <name>trace_client(Type, Parameters) -> pid()</name>
+      <name since="">trace_client(Type, Parameters) -> pid()</name>
       <fsummary>Start a trace client that reads messages created by a trace port driver</fsummary>
       <type>
         <v>Type = ip | file | follow_file</v>
@@ -1080,7 +1080,7 @@ hello</pre>
       </desc>
     </func>
     <func>
-      <name>trace_client(Type, Parameters, HandlerSpec) -> pid()</name>
+      <name since="">trace_client(Type, Parameters, HandlerSpec) -> pid()</name>
       <fsummary>Start a trace client that reads messages created by a trace port driver, with a user defined handler</fsummary>
       <type>
         <v>Type = ip | file | follow_file</v>
@@ -1110,7 +1110,7 @@ hello</pre>
       </desc>
     </func>
     <func>
-      <name>stop_trace_client(Pid) -> ok</name>
+      <name since="">stop_trace_client(Pid) -> ok</name>
       <fsummary>Stop a trace client gracefully.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -1123,14 +1123,14 @@ hello</pre>
       </desc>
     </func>
     <func>
-      <name>get_tracer()</name>
+      <name since="">get_tracer()</name>
       <fsummary>Equivalent to get_tracer(node()).</fsummary>
       <desc>
         <p>Equivalent to <c>get_tracer(node())</c>.</p>
       </desc>
     </func>
     <func>
-      <name>get_tracer(Nodename) -> {ok, Tracer}</name>
+      <name since="">get_tracer(Nodename) -> {ok, Tracer}</name>
       <fsummary>Return the process or port to which all trace messages are sent.</fsummary>
       <type>
         <v>Nodename = atom()</v>
@@ -1142,7 +1142,7 @@ hello</pre>
       </desc>
     </func>
     <func>
-      <name>stop() -> ok</name>
+      <name since="">stop() -> ok</name>
       <fsummary>Stop the <c>dbg</c>server and the tracing of all processes.</fsummary>
       <desc>
         <p>Stops the <c>dbg</c> server and clears all trace flags for
@@ -1153,7 +1153,7 @@ hello</pre>
       </desc>
     </func>
     <func>
-      <name>stop_clear() -> ok</name>
+      <name since="">stop_clear() -> ok</name>
       <fsummary>Stop the <c>dbg</c>server and the tracing of all processes, and clears trace patterns.</fsummary>
       <desc>
         <p>Same as stop/0, but also clears all trace patterns on global functions calls.</p>
diff --git a/lib/runtime_tools/doc/src/dyntrace.xml b/lib/runtime_tools/doc/src/dyntrace.xml
index 0cdcecab68..4935dfcd71 100644
--- a/lib/runtime_tools/doc/src/dyntrace.xml
+++ b/lib/runtime_tools/doc/src/dyntrace.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>dyntrace.xml</file>
   </header>
-  <module>dyntrace</module>
+  <module since="OTP R15B01">dyntrace</module>
   <modulesummary>Interface to dynamic tracing</modulesummary>
   <description>
     <p>This module implements interfaces to dynamic tracing, should such be compiled into the virtual machine. For a standard and/or commercial build, no dynamic tracing is available, in which case none of the functions in this module is usable or give any effect.</p>
@@ -47,7 +47,7 @@
   </description>
   <funcs>
     <func>
-      <name>available() -> boolean()</name>
+      <name since="OTP R15B01">available() -> boolean()</name>
       <fsummary>Check if dynamic tracing is available</fsummary>
       <desc>
 	<p>This function uses the NIF library to determine if dynamic
@@ -59,42 +59,42 @@
       </desc>
     </func>
     <func>
-      <name>p() -> true | false | error | badarg</name>
+      <name since="OTP R15B01">p() -> true | false | error | badarg</name>
       <fsummary>Trigger the user trace probe.</fsummary>
       <desc>
         <p>Calling this function will trigger the "user" trace probe user_trace_i4s4 in the dyntrace NIF module, sending a trace message only containing the user tag and zeroes/empty strings in all other fields.</p>
       </desc>
     </func>
     <func>
-      <name>p(integer() | string()) -> true | false | error | badarg</name>
+      <name since="OTP R15B01">p(integer() | string()) -> true | false | error | badarg</name>
       <fsummary>Trigger the user trace probe.</fsummary>
       <desc>
         <p>Calling this function will trigger the "user" trace probe user_trace_i4s4 in the dyntrace NIF module, sending a trace message containing the user tag and the integer or string parameter in the first integer/string field.</p>
       </desc>
     </func>
     <func>
-      <name>p(integer() | string(), integer() | string()) -> true | false | error | badarg</name>
+      <name since="OTP R15B01">p(integer() | string(), integer() | string()) -> true | false | error | badarg</name>
       <fsummary>Trigger the user trace probe.</fsummary>
       <desc>
         <p>Calling this function will trigger the "user" trace probe user_trace_i4s4 in the dyntrace NIF module, sending a trace message containing the user tag and the integer() or string() parameters as the first fields of respective type. integer() parameters should be put before any string() parameters. I.e. <c>p(1,"Hello")</c> is ok, as is <c>p(1,1)</c> and <c>p("Hello","Again")</c>, but not <c>p("Hello",1)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>p(integer() | string(), integer() | string(), integer() | string()) -> true | false | error | badarg</name>
+      <name since="OTP R15B01">p(integer() | string(), integer() | string(), integer() | string()) -> true | false | error | badarg</name>
       <fsummary>Trigger the user trace probe.</fsummary>
       <desc>
         <p>Calling this function will trigger the "user" trace probe user_trace_i4s4 in the dyntrace NIF module, sending a trace message containing the user tag and the integer() or string() parameters as the first fields of respective type. integer() parameters should be put before any string() parameters, as in <seealso marker="#p/2">p/2</seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>p(integer() | string(), integer() | string(), integer() | string(), integer() | string()) -> true | false | error | badarg</name>
+      <name since="OTP R15B01">p(integer() | string(), integer() | string(), integer() | string(), integer() | string()) -> true | false | error | badarg</name>
       <fsummary>Trigger the user trace probe.</fsummary>
       <desc>
         <p>Calling this function will trigger the "user" trace probe user_trace_i4s4 in the dyntrace NIF module, sending a trace message containing the user tag and the integer() or string() parameters as the first fields of respective type. integer() parameters should be put before any string() parameters, as in <seealso marker="#p/2">p/2</seealso>.</p>
       </desc>
     </func>
     <func>
-      <name>p(integer(), integer() | string(), integer() | string(), integer() | string(), string()) -> true | false | error | badarg</name>
+      <name since="OTP R15B01">p(integer(), integer() | string(), integer() | string(), integer() | string(), string()) -> true | false | error | badarg</name>
       <fsummary>Trigger the user trace probe.</fsummary>
       <desc>
         <p>Calling this function will trigger the "user" trace probe user_trace_i4s4 in the dyntrace NIF module, sending a trace message containing the user tag and the integer() or string() parameters as the first fields of respective type. integer() parameters should be put before any string() parameters, as in <seealso marker="#p/2">p/2</seealso>.</p>
@@ -102,7 +102,7 @@
       </desc>
     </func>
      <func>
-      <name>p(integer(), integer(), integer() | string(), integer() | string(), string(), string()) -> true | false | error | badarg</name>
+      <name since="OTP R15B01">p(integer(), integer(), integer() | string(), integer() | string(), string(), string()) -> true | false | error | badarg</name>
       <fsummary>Trigger the user trace probe.</fsummary>
       <desc>
         <p>Calling this function will trigger the "user" trace probe user_trace_i4s4 in the dyntrace NIF module, sending a trace message containing the user tag and the integer() or string() parameters as the first fields of respective type. integer() parameters should be put before any string() parameters, as in <seealso marker="#p/2">p/2</seealso>.</p>
@@ -110,7 +110,7 @@
       </desc>
     </func>
      <func>
-      <name>p(integer(), integer(), integer(), integer() | string(), string(), string(), string()) -> true | false | error | badarg</name>
+      <name since="OTP R15B01">p(integer(), integer(), integer(), integer() | string(), string(), string(), string()) -> true | false | error | badarg</name>
       <fsummary>Trigger the user trace probe.</fsummary>
       <desc>
         <p>Calling this function will trigger the "user" trace probe user_trace_i4s4 in the dyntrace NIF module, sending a trace message containing the user tag and the integer() or string() parameters as the first fields of respective type. integer() parameters should be put before any string() parameters, as in <seealso marker="#p/2">p/2</seealso>.</p>
@@ -118,14 +118,14 @@
       </desc>
     </func>
      <func>
-      <name>p(integer(), integer(), integer(), integer(), string(), string(), string(), string()) -> true | false | error | badarg</name>
+      <name since="OTP R15B01">p(integer(), integer(), integer(), integer(), string(), string(), string(), string()) -> true | false | error | badarg</name>
       <fsummary>Trigger the user trace probe.</fsummary>
       <desc>
         <p>Calling this function will trigger the "user" trace probe user_trace_i4s4 in the dyntrace NIF module, sending a trace message containing all the integer()'s and string()'s provided, as well as any user tag set in the current process.</p> 
       </desc>
     </func>
     <func>
-      <name>get_tag() -> binary() | undefined</name>
+      <name since="OTP R15B01">get_tag() -> binary() | undefined</name>
       <fsummary>Get the user tag set in the process.</fsummary>
       <desc>
 	<p>This function returns the user tag set in the current
@@ -134,7 +134,7 @@
       </desc>
     </func>
     <func>
-      <name>get_tag() -> binary() | undefined</name>
+      <name since="OTP R15B01">get_tag() -> binary() | undefined</name>
       <fsummary>Get the user tag set in the process or sent to the process.</fsummary>
       <desc>
 	<p>This function returns the user tag set in the current
@@ -151,7 +151,7 @@
     </func>
     
     <func>
-      <name>put_tag(Item) -> binary() | undefined </name>
+      <name since="OTP R15B01">put_tag(Item) -> binary() | undefined </name>
       <fsummary>Set the user tag of the current process.</fsummary>
       <type>
         <v>Item = iodata()</v>
@@ -163,7 +163,7 @@
       </desc>
     </func>
     <func>
-      <name>spread_tag(boolean()) -> TagData</name>
+      <name since="OTP R15B01">spread_tag(boolean()) -> TagData</name>
       <fsummary>Start or stop spreading dynamic trace user tags with the next message.</fsummary>
       <type>
         <v>TagData = opaque data that can be used as parameter to <seealso marker="#restore_tag/1">restore_tag/1</seealso></v>
@@ -185,7 +185,7 @@ f() ->
       </desc>
     </func>
     <func>
-    <name>restore_tag(TagData) -> true</name>
+    <name since="OTP R15B01">restore_tag(TagData) -> true</name>
       <fsummary>Restore to a previous state of user tag spreading.</fsummary>
       <type>
         <v>TagData = opaque data returned by <seealso marker="#spread_tag/1">spread_tag/1</seealso></v>
diff --git a/lib/runtime_tools/doc/src/erts_alloc_config.xml b/lib/runtime_tools/doc/src/erts_alloc_config.xml
index ffc4ec5285..5bcce1b5e3 100644
--- a/lib/runtime_tools/doc/src/erts_alloc_config.xml
+++ b/lib/runtime_tools/doc/src/erts_alloc_config.xml
@@ -29,7 +29,7 @@
     <rev>1</rev>
     <file>erts_alloc_config.sgml</file>
   </header>
-  <module>erts_alloc_config</module>
+  <module since="">erts_alloc_config</module>
   <modulesummary>Configuration tool for erts_alloc</modulesummary>
   <description>
     <note>
@@ -136,7 +136,7 @@
   </description>
   <funcs>
     <func>
-      <name>save_scenario() -> ok | {error, Error}</name>
+      <name since="">save_scenario() -> ok | {error, Error}</name>
       <fsummary>Saves information about current runtime scenario</fsummary>
       <type>
         <v>Error = term()</v>
@@ -154,7 +154,7 @@
       </desc>
     </func>
     <func>
-      <name>make_config() -> ok | {error, Error}</name>
+      <name since="">make_config() -> ok | {error, Error}</name>
       <fsummary>Creates an erts_alloc configuration</fsummary>
       <type>
         <v>Error = term()</v>
@@ -165,7 +165,7 @@
       </desc>
     </func>
     <func>
-      <name>make_config(FileNameOrIODev) -> ok | {error, Error}</name>
+      <name since="">make_config(FileNameOrIODev) -> ok | {error, Error}</name>
       <fsummary>Creates an erts_alloc configuration</fsummary>
       <type>
         <v>FileNameOrIODev = string() | io_device()</v>
@@ -190,7 +190,7 @@
       </desc>
     </func>
     <func>
-      <name>stop() -> ok | {error, Error}</name>
+      <name since="">stop() -> ok | {error, Error}</name>
       <fsummary></fsummary>
       <type>
         <v>Error = term()</v>
diff --git a/lib/runtime_tools/doc/src/msacc.xml b/lib/runtime_tools/doc/src/msacc.xml
index 129da3d230..ae089de8d0 100644
--- a/lib/runtime_tools/doc/src/msacc.xml
+++ b/lib/runtime_tools/doc/src/msacc.xml
@@ -31,7 +31,7 @@
     <rev>A</rev>
     <file>msacc.xml</file>
   </header>
-  <module>msacc</module>
+  <module since="OTP 19.0">msacc</module>
   <modulesummary>Convenience functions for microstate accounting</modulesummary>
   <description>
     <p>This module implements some convenience functions for analyzing
@@ -146,7 +146,7 @@ ok
   </datatypes>
   <funcs>
     <func>
-      <name name="available" arity="0"/>
+      <name name="available" arity="0" since="OTP 19.0"/>
       <fsummary>Check if microstate accounting is available</fsummary>
       <desc>
 	<p>This function checks whether microstate accounting
@@ -154,7 +154,7 @@ ok
       </desc>
     </func>
     <func>
-      <name name="start" arity="0"/>
+      <name name="start" arity="0" since="OTP 19.0"/>
       <fsummary>Start microstate accounting.</fsummary>
       <desc>
         <p>Start microstate accounting. Returns whether it was
@@ -162,7 +162,7 @@ ok
       </desc>
     </func>
     <func>
-      <name name="start" arity="1"/>
+      <name name="start" arity="1" since="OTP 19.0"/>
       <fsummary>Start microstate accounting for a time.</fsummary>
       <desc>
         <p>Resets all counters and then starts microstate accounting
@@ -170,7 +170,7 @@ ok
       </desc>
     </func>
     <func>
-      <name name="stop" arity="0"/>
+      <name name="stop" arity="0" since="OTP 19.0"/>
       <fsummary>Stop microstate accounting.</fsummary>
       <desc>
         <p>Stop microstate accounting.
@@ -178,7 +178,7 @@ ok
       </desc>
     </func>
     <func>
-      <name name="reset" arity="0"/>
+      <name name="reset" arity="0" since="OTP 19.0"/>
       <fsummary>Reset microstate accounting counters</fsummary>
       <desc>
         <p>Reset microstate accounting counters.
@@ -186,7 +186,7 @@ ok
       </desc>
     </func>
     <func>
-      <name name="print" arity="0"/>
+      <name name="print" arity="0" since="OTP 19.0"/>
       <fsummary>Print microstate statistics</fsummary>
       <desc>
         <p>
@@ -199,7 +199,7 @@ ok
       </desc>
     </func>
     <func>
-      <name name="print" arity="1"/>
+      <name name="print" arity="1" since="OTP 19.0"/>
       <fsummary>Print microstate statistics</fsummary>
       <desc>
         <p>Print the given microstate statistics values to stdout.
@@ -211,7 +211,7 @@ ok
       </desc>
     </func>
     <func>
-      <name name="print" arity="2"/>
+      <name name="print" arity="2" since="OTP 19.0"/>
       <fsummary>Print microstate statistics</fsummary>
       <desc>
         <p>Print the given microstate statistics values to standard out.
@@ -234,7 +234,7 @@ ok
       </desc>
     </func>
     <func>
-      <name name="print" arity="3"/>
+      <name name="print" arity="3" since="OTP 19.0"/>
       <fsummary>Print microstate statistics</fsummary>
       <desc>
         <p>Print the given microstate statistics values to the given file
@@ -243,7 +243,7 @@ ok
       </desc>
     </func>
     <func>
-      <name name="stats" arity="0"/>
+      <name name="stats" arity="0" since="OTP 19.0"/>
       <fsummary></fsummary>
       <desc>
         <p>Returns a runtime system independent version of the microstate
@@ -254,7 +254,7 @@ ok
       </desc>
     </func>
     <func>
-      <name name="stats" arity="2" clause_i="1"/>
+      <name name="stats" arity="2" clause_i="1" since="OTP 19.0"/>
       <fsummary></fsummary>
       <desc>
         <p>Returns the system time for the given microstate statistics values.
@@ -269,7 +269,7 @@ ok
       </desc>
     </func>
     <func>
-      <name name="stats" arity="2" clause_i="2"/>
+      <name name="stats" arity="2" clause_i="2" since="OTP 19.0"/>
       <fsummary></fsummary>
       <desc>
         <p>Returns fractions of real-time or run-time spent in the various
@@ -277,7 +277,7 @@ ok
       </desc>
     </func>
     <func>
-      <name name="stats" arity="2" clause_i="3"/>
+      <name name="stats" arity="2" clause_i="3" since="OTP 19.0"/>
       <fsummary></fsummary>
       <desc>
         <p>Returns a list of microstate statistics values where the values
@@ -285,7 +285,7 @@ ok
       </desc>
     </func>
     <func>
-      <name name="to_file" arity="1"/>
+      <name name="to_file" arity="1" since="OTP 19.0"/>
       <fsummary></fsummary>
       <desc>
         <p>Dumps the current microstate statistics counters to a file that can
@@ -294,7 +294,7 @@ ok
       </desc>
     </func>
     <func>
-      <name name="from_file" arity="1"/>
+      <name name="from_file" arity="1" since="OTP 19.0"/>
       <fsummary></fsummary>
       <desc>
         <p>Read a file dump produced by <seealso marker="#to_file/1">
diff --git a/lib/runtime_tools/doc/src/notes.xml b/lib/runtime_tools/doc/src/notes.xml
index 810bb8207c..1b94c3e6d9 100644
--- a/lib/runtime_tools/doc/src/notes.xml
+++ b/lib/runtime_tools/doc/src/notes.xml
@@ -32,6 +32,37 @@
   <p>This document describes the changes made to the Runtime_Tools
     application.</p>
 
+<section><title>Runtime_Tools 1.13.3</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Minor updates to build system necessary due to move of
+	    configuration of <c>crypto</c> application.</p>
+          <p>
+	    Own Id: OTP-15262 Aux Id: OTP-15129 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Runtime_Tools 1.13.2</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Update of systemtap trace example scripts.</p>
+          <p>
+	    Own Id: OTP-15670</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Runtime_Tools 1.13.1</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/runtime_tools/doc/src/scheduler.xml b/lib/runtime_tools/doc/src/scheduler.xml
index dd8bf73bae..b033430183 100644
--- a/lib/runtime_tools/doc/src/scheduler.xml
+++ b/lib/runtime_tools/doc/src/scheduler.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>scheduler.xml</file>
   </header>
-  <module>scheduler</module>
+  <module since="OTP 21.0">scheduler</module>
   <modulesummary>Measure scheduler utilization</modulesummary>
   <description>
     <p>This module contains utility functions for easier measurement and
@@ -84,7 +84,7 @@
   <funcs>
 
     <func>
-      <name name="sample" arity="0"/>
+      <name name="sample" arity="0" since="OTP 21.0"/>
       <fsummary>Get scheduler utilization sample.</fsummary>
       <desc>
         <p>Return a scheduler utilization sample for normal and dirty-cpu
@@ -93,7 +93,7 @@
     </func>
 
     <func>
-      <name name="sample_all" arity="0"/>
+      <name name="sample_all" arity="0" since="OTP 21.0"/>
       <fsummary>Get scheduler utilization sample.</fsummary>
       <desc>
         <p>Return a scheduler utilization sample for all schedulers,
@@ -102,7 +102,7 @@
     </func>
 
     <func>
-      <name name="utilization" arity="1" clause_i="1"/>
+      <name name="utilization" arity="1" clause_i="1" since="OTP 21.0"/>
       <fsummary>Measure scheduler utilizations during a period of time.</fsummary>
       <desc>
         <p>Measure utilization for normal and dirty-cpu schedulers during
@@ -111,7 +111,7 @@
     </func>
 
     <func>
-      <name name="utilization" arity="1" clause_i="2"/>
+      <name name="utilization" arity="1" clause_i="2" since="OTP 21.0"/>
       <fsummary>Measure scheduler utilizations since sample.</fsummary>
       <desc>
         <p>Calculate scheduler utilizations for the time interval from when
@@ -121,7 +121,7 @@
     </func>
 
     <func>
-      <name name="utilization" arity="2"/>
+      <name name="utilization" arity="2" since="OTP 21.0"/>
       <fsummary>Measure scheduler utilizations between two samples.</fsummary>
       <desc>
 	<p>Calculates scheduler utilizations for the time interval between
diff --git a/lib/runtime_tools/doc/src/system_information.xml b/lib/runtime_tools/doc/src/system_information.xml
index 53dc595e64..a356b5c6f8 100644
--- a/lib/runtime_tools/doc/src/system_information.xml
+++ b/lib/runtime_tools/doc/src/system_information.xml
@@ -32,14 +32,14 @@
     <rev></rev>
     <file>system_information.xml</file>
   </header>
-  <module>system_information</module>
+  <module since="OTP 17.0">system_information</module>
   <modulesummary>System Information</modulesummary>
   <description>
     <p></p>
   </description>
   <funcs>
     <func>
-      <name name="sanity_check" arity="0"/>
+      <name name="sanity_check" arity="0" since="OTP 17.0"/>
       <fsummary>Perform a sanity check</fsummary>
       <desc>
         <p>Performs a sanity check on the system. If no issues
@@ -88,7 +88,7 @@
       </desc>
     </func>
     <func>
-      <name name="to_file" arity="1"/>
+      <name name="to_file" arity="1" since="OTP 17.0"/>
       <fsummary>Write miscellaneous system information to file</fsummary>
       <desc><p>Writes  miscellaneous system information to file. This
       information will typically be requested by the Erlang/OTP team
diff --git a/lib/runtime_tools/examples/dist.systemtap b/lib/runtime_tools/examples/dist.systemtap
index bb20d617e1..4102a5243c 100644
--- a/lib/runtime_tools/examples/dist.systemtap
+++ b/lib/runtime_tools/examples/dist.systemtap
@@ -19,18 +19,18 @@
  * %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: This file assumes that you're using the SMP-enabled Erlang
+ *       virtual machine, "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.
+ *       "beam.smp" with "beam.debug.smp" or the VM name appropriate
+ *       to your environment.
  */
 
-probe process("beam").mark("dist-monitor")
+probe process("beam.smp").mark("dist-monitor")
 {
     printf("monitor: pid %d, who %s, what %s, node %s, type %s, reason %s\n",
            pid(),
@@ -38,38 +38,38 @@ probe process("beam").mark("dist-monitor")
            user_string($arg5));
 }
 
-probe process("beam").mark("dist-port_busy")
+probe process("beam.smp").mark("dist-port_busy")
 {
     printf("dist port_busy: node %s, port %s, remote_node %s, blocked pid %s\n",
            user_string($arg1), user_string($arg2), user_string($arg3), user_string($arg4));
-    blocked_procs[user_string($arg4)] = timestamp;
+    blocked_procs[user_string($arg4)] = local_clock_ns();
 }
 
-probe process("beam").mark("dist-port_busy")
+probe process("beam.smp").mark("dist-port_busy")
 {
     printf("dist port_busy: node %s, port %s, remote_node %s, blocked pid %s\n",
            user_string($arg1), user_string($arg2), user_string($arg3), user_string($arg4));
-    blocked_procs[user_string($arg4)] = timestamp;
+    blocked_procs[user_string($arg4)] = local_clock_ns();
 }
 
-probe process("beam").mark("dist-output")
+probe process("beam.smp").mark("dist-output")
 {
     printf("dist output: node %s, port %s, remote_node %s bytes %d\n",
            user_string($arg1), user_string($arg2), user_string($arg3), $arg4);
 }
 
-probe process("beam").mark("dist-outputv")
+probe process("beam.smp").mark("dist-outputv")
 {
     printf("port outputv: node %s, port %s, remote_node %s bytes %d\n",
            user_string($arg1), user_string($arg2), user_string($arg3), $arg4);
 }
 
-probe process("beam").mark("process-scheduled")
+probe process("beam.smp").mark("process-scheduled")
 {
     pidstr = user_string($arg1);
     if (pidstr in blocked_procs) {
 	printf("blocked pid %s scheduled now, waited %d microseconds\n",
-		pidstr, (timestamp - blocked_procs[pidstr]) / 1000);
+		pidstr, (local_clock_ns() - blocked_procs[pidstr]) / 1000);
 	delete blocked_procs[pidstr];
     }
 }
diff --git a/lib/runtime_tools/examples/driver1.systemtap b/lib/runtime_tools/examples/driver1.systemtap
index e1ee8ecffc..f5bc28b42d 100644
--- a/lib/runtime_tools/examples/driver1.systemtap
+++ b/lib/runtime_tools/examples/driver1.systemtap
@@ -19,108 +19,102 @@
  * %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: This file assumes that you're using the SMP-enabled Erlang
+ *       virtual machine, "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.
+ *       "beam.smp" with "beam.debug.smp" or the VM name appropriate
+ *       to your environment.
  */
 
-probe process("beam").mark("driver-init")
+probe process("beam.smp").mark("driver__init")
 {
     printf("driver init name %s major %d minor %d flags %d\n",
 	   user_string($arg1), $arg2, $arg3, $arg4);
 }
 
-probe process("beam").mark("driver-start")
+probe process("beam.smp").mark("driver__start")
 {
     printf("driver start pid %s driver name %s port %s\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3));
 }
 
-probe process("beam").mark("driver-stop")
+probe process("beam.smp").mark("driver__stop")
 {
     printf("driver stop pid %s driver name %s port %s\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3));
 }
 
-probe process("beam").mark("driver-finish")
+probe process("beam.smp").mark("driver__finish")
 {
     printf("driver finish driver name %s\n",
            user_string($arg1));
 }
 
-probe process("beam").mark("driver-flush")
+probe process("beam.smp").mark("driver__flush")
 {
     printf("driver flush pid %s port %s port name %s\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3));
 }
 
-probe process("beam").mark("driver-output")
+probe process("beam.smp").mark("driver__output")
 {
     printf("driver output pid %s port %s port name %s bytes %d\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3), $arg4);
 }
 
-probe process("beam").mark("driver-outputv")
+probe process("beam.smp").mark("driver__outputv")
 {
     printf("driver outputv pid %s port %s port name %s bytes %d\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3), $arg4);
 }
 
-probe process("beam").mark("driver-control")
+probe process("beam.smp").mark("driver__control")
 {
     printf("driver control pid %s port %s port name %s command %d bytes %d\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3), $arg4, $arg5);
 }
 
-probe process("beam").mark("driver-call")
+probe process("beam.smp").mark("driver__call")
 {
     printf("driver call pid %s port %s port name %s command %d bytes %d\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3), $arg4, $arg5);
 }
 
-probe process("beam").mark("driver-event")
-{
-    printf("driver event pid %s port %s port name %s\n",
-	   user_string($arg1), user_string($arg2), user_string($arg3));
-}
-
-probe process("beam").mark("driver-ready_input")
+probe process("beam.smp").mark("driver__ready_input")
 {
     printf("driver ready_input pid %s port %s port name %s\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3));
 }
 
-probe process("beam").mark("driver-ready_output")
+probe process("beam.smp").mark("driver__ready_output")
 {
     printf("driver ready_output pid %s port %s port name %s\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3));
 }
 
-probe process("beam").mark("driver-timeout")
+probe process("beam.smp").mark("driver__timeout")
 {
     printf("driver timeout pid %s port %s port name %s\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3));
 }
 
-probe process("beam").mark("driver-ready_async")
+probe process("beam.smp").mark("driver__ready_async")
 {
     printf("driver ready_async pid %s port %s port name %s\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3));
 }
 
-probe process("beam").mark("driver-process_exit")
+probe process("beam.smp").mark("driver__process_exit")
 {
     printf("driver process_exit pid %s port %s port name %s\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3));
 }
 
-probe process("beam").mark("driver-stop_select")
+probe process("beam.smp").mark("driver__stop_select")
 {
     printf("driver stop_select driver name %s\n", user_string($arg1));
 }
diff --git a/lib/runtime_tools/examples/function-calls.systemtap b/lib/runtime_tools/examples/function-calls.systemtap
index 9c44b2d014..6bb173b3ec 100644
--- a/lib/runtime_tools/examples/function-calls.systemtap
+++ b/lib/runtime_tools/examples/function-calls.systemtap
@@ -18,51 +18,51 @@
  * %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: This file assumes that you're using the SMP-enabled Erlang
+ *       virtual machine, "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.
+ *       "beam.smp" with "beam.debug.smp" or the VM name appropriate
+ *       to your environment.
  */
 
-probe process("beam").mark("local-function-entry")
+probe process("beam.smp").mark("local-function-entry")
 {
     printf("pid %s enter (local) %s depth %d\n",
 	   user_string($arg1), user_string($arg2), $arg3);
 }
 
-probe process("beam").mark("global-function-entry")
+probe process("beam.smp").mark("global-function-entry")
 {
     printf("pid %s enter (global)  %s depth %d\n",
 	   user_string($arg1), user_string($arg2), $arg3);
 }
 
-probe process("beam").mark("function-return")
+probe process("beam.smp").mark("function-return")
 {
     printf("pid %s return %s depth %d\n",
 	   user_string($arg1), user_string($arg2), $arg3);
 }
 
-probe process("beam").mark("bif-entry")
+probe process("beam.smp").mark("bif-entry")
 {
     printf("pid %s BIF entry  mfa %s\n", user_string($arg1), user_string($arg2));
 }
 
-probe process("beam").mark("bif-return")
+probe process("beam.smp").mark("bif-return")
 {
     printf("pid %s BIF return mfa %s\n", user_string($arg1), user_string($arg2));
 }
 
-probe process("beam").mark("nif-entry")
+probe process("beam.smp").mark("nif-entry")
 {
     printf("pid %s NIF entry  mfa %s\n", user_string($arg1), user_string($arg2));
 }
 
-probe process("beam").mark("nif-return")
+probe process("beam.smp").mark("nif-return")
 {
     printf("pid %s NIF return mfa %s\n", user_string($arg1), user_string($arg2));
 }
diff --git a/lib/runtime_tools/examples/garbage-collection.systemtap b/lib/runtime_tools/examples/garbage-collection.systemtap
index e414eea821..14f0d6851c 100644
--- a/lib/runtime_tools/examples/garbage-collection.systemtap
+++ b/lib/runtime_tools/examples/garbage-collection.systemtap
@@ -18,33 +18,33 @@
  * %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: This file assumes that you're using the SMP-enabled Erlang
+ *       virtual machine, "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.
+ *       "beam.smp" with "beam.debug.smp" or the VM name appropriate
+ *       to your environment.
  */
 
-probe process("beam").mark("gc_major-start")
+probe process("beam.smp").mark("gc_major-start")
 {
     printf("GC major start pid %s need %d words\n", user_string($arg1), $arg2);
 }
 
-probe process("beam").mark("gc_minor-start")
+probe process("beam.smp").mark("gc_minor-start")
 {
     printf("GC minor start pid %s need %d words\n", user_string($arg1), $arg2);
 }
 
-probe process("beam").mark("gc_major-end")
+probe process("beam.smp").mark("gc_major-end")
 {
     printf("GC major end pid %s reclaimed %d words\n", user_string($arg1), $arg2);
 }
 
-probe process("beam").mark("gc_minor-start")
+probe process("beam.smp").mark("gc_minor-start")
 {
     printf("GC minor end pid %s reclaimed %d words\n", user_string($arg1), $arg2);
 }
diff --git a/lib/runtime_tools/examples/memory1.systemtap b/lib/runtime_tools/examples/memory1.systemtap
index 04df4d64c4..2fdc5a796c 100644
--- a/lib/runtime_tools/examples/memory1.systemtap
+++ b/lib/runtime_tools/examples/memory1.systemtap
@@ -18,34 +18,34 @@
  * %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: This file assumes that you're using the SMP-enabled Erlang
+ *       virtual machine, "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.
+ *       "beam.smp" with "beam.debug.smp" or the VM name appropriate
+ *       to your environment.
  */
 
-probe process("beam").mark("copy-struct")
+probe process("beam.smp").mark("copy-struct")
 {
     printf("copy_struct %d bytes\n", $arg1);
 }
 
-probe process("beam").mark("copy-object")
+probe process("beam.smp").mark("copy-object")
 {
     printf("copy_object pid %s %d bytes\n", user_string($arg1), $arg2);
 }
 
-probe process("beam").mark("process-heap_grow")
+probe process("beam.smp").mark("process-heap_grow")
 {
     printf("proc heap grow pid %s %d -> %d bytes\n", user_string($arg1),
 	   $arg2, $arg3);
 }
 
-probe process("beam").mark("process-heap_shrink")
+probe process("beam.smp").mark("process-heap_shrink")
 {
     printf("proc heap shrink pid %s %d -> %d bytes\n", user_string($arg1),
 	   $arg2, $arg3);
diff --git a/lib/runtime_tools/examples/messages.systemtap b/lib/runtime_tools/examples/messages.systemtap
index f2ef56a22b..49b7f46d69 100644
--- a/lib/runtime_tools/examples/messages.systemtap
+++ b/lib/runtime_tools/examples/messages.systemtap
@@ -18,15 +18,15 @@
  * %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: This file assumes that you're using the SMP-enabled Erlang
+ *       virtual machine, "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.
+ *       "beam.smp" with "beam.debug.smp" or the VM name appropriate
+ *       to your environment.
  */
 
 probe begin
@@ -38,7 +38,7 @@ probe begin
     printf("\n");
 }
 
-probe process("beam").mark("message-send")
+probe process("beam.smp").mark("message-send")
 {
     if ($arg4 == 0 && $arg5 == 0 && $arg6 == 0) {
         printf("send:   %s -> %s: %d words\n",
@@ -51,7 +51,7 @@ probe process("beam").mark("message-send")
     }
 }
 
-probe process("beam").mark("message-send-remote")
+probe process("beam.smp").mark("message-send-remote")
 {
     if ($arg5 == 0 && $arg6 == 0 && $arg7 == 0) {
         printf("send :  %s -> %s %s: %d words\n",
@@ -64,7 +64,7 @@ probe process("beam").mark("message-send-remote")
     }
 }
 
-probe process("beam").mark("message-queued")
+probe process("beam.smp").mark("message-queued")
 {
     if ($arg4 == 0 && $arg5 == 0 && $arg6 == 0) {
         printf("queued: %s: %d words, queue len %d\n", user_string($arg1), $arg2, $arg3);
@@ -75,7 +75,7 @@ probe process("beam").mark("message-queued")
     }
 }
 
-probe process("beam").mark("message-receive")
+probe process("beam.smp").mark("message-receive")
 {
     if ($arg4 == 0 && $arg5 == 0 && $arg6 == 0) {
         printf("receive: %s: %d words, queue len %d\n",
diff --git a/lib/runtime_tools/examples/port1.systemtap b/lib/runtime_tools/examples/port1.systemtap
index f7ce03a65e..235581b0b1 100644
--- a/lib/runtime_tools/examples/port1.systemtap
+++ b/lib/runtime_tools/examples/port1.systemtap
@@ -18,15 +18,15 @@
  * %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: This file assumes that you're using the SMP-enabled Erlang
+ *       virtual machine, "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.
+ *       "beam.smp" with "beam.debug.smp" or the VM name appropriate
+ *       to your environment.
  */
 
 probe begin
@@ -96,19 +96,19 @@ probe begin
         driver_map["udp_inet", 62] = "BINDX";
 }
 
-probe process("beam").mark("port-open")
+probe process("beam.smp").mark("port-open")
 {
     printf("port open pid %s port name %s port %s\n",
            user_string($arg1), user_string($arg2), user_string($arg3));
 }
 
-probe process("beam").mark("port-command")
+probe process("beam.smp").mark("port-command")
 {
     printf("port command pid %s port %s port name %s command type %s\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3), user_string($arg4));
 }
 
-probe process("beam").mark("port-control")
+probe process("beam.smp").mark("port-control")
 {
     cmd = driver_map[user_string($arg3), $arg4];
     cmd_str = (cmd == "") ? "unknown" : cmd;
@@ -118,36 +118,36 @@ probe process("beam").mark("port-control")
 
 /* port-exit is fired as a result of port_close() or exit signal */
 
-probe process("beam").mark("port-exit")
+probe process("beam.smp").mark("port-exit")
 {
     printf("port exit pid %s port %s port name %s reason %s\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3), user_string($arg4));
 }
 
-probe process("beam").mark("port-connect")
+probe process("beam.smp").mark("port-connect")
 {
     printf("port connect pid %s port %s port name %s new pid %s\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3), user_string($arg4));
 }
 
-probe process("beam").mark("port-busy")
+probe process("beam.smp").mark("port-busy")
 {
     printf("port busy %s\n", user_string($arg1));
 }
 
-probe process("beam").mark("port-not_busy")
+probe process("beam.smp").mark("port-not_busy")
 {
     printf("port not busy %s\n", user_string($arg1));
 }
 
-probe process("beam").mark("aio_pool-add")
+probe process("beam.smp").mark("aio_pool-add")
 {
     printf("async I/O pool add thread %d queue len %d\n", $arg1, $arg2);
 }
 
-probe process("beam").mark("aio_pool-get")
+probe process("beam.smp").mark("aio_pool-get")
 {
     printf("async I/O pool get thread %d queue len %d\n", $arg1, $arg2);
 }
 
-global driver_map;
\ No newline at end of file
+global driver_map;
diff --git a/lib/runtime_tools/examples/process-scheduling.systemtap b/lib/runtime_tools/examples/process-scheduling.systemtap
index b0b74257b3..231c589f64 100644
--- a/lib/runtime_tools/examples/process-scheduling.systemtap
+++ b/lib/runtime_tools/examples/process-scheduling.systemtap
@@ -18,28 +18,28 @@
  * %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: This file assumes that you're using the SMP-enabled Erlang
+ *       virtual machine, "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.
+ *       "beam.smp" with "beam.debug.smp" or the VM name appropriate
+ *       to your environment.
  */
 
-probe process("beam").mark("process-scheduled")
+probe process("beam.smp").mark("process-scheduled")
 {
     printf("  Schedule pid %s mfa %s\n", user_string($arg1), user_string($arg2));
 }
 
-probe process("beam").mark("process-unscheduled")
+probe process("beam.smp").mark("process-unscheduled")
 {
     printf("Unschedule pid %s\n", user_string($arg1));
 }
 
-probe process("beam").mark("process-hibernate")
+probe process("beam.smp").mark("process-hibernate")
 {
     printf("  Hibernate pid %s resume mfa %s\n",
      user_string($arg1), user_string($arg2));
diff --git a/lib/runtime_tools/examples/spawn-exit.systemtap b/lib/runtime_tools/examples/spawn-exit.systemtap
index 89bca14496..a7b4a0a3ea 100644
--- a/lib/runtime_tools/examples/spawn-exit.systemtap
+++ b/lib/runtime_tools/examples/spawn-exit.systemtap
@@ -18,34 +18,34 @@
  * %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: This file assumes that you're using the SMP-enabled Erlang
+ *       virtual machine, "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.
+ *       "beam.smp" with "beam.debug.smp" or the VM name appropriate
+ *       to your environment.
  */
 
-probe process("beam").mark("process-spawn")
+probe process("beam.smp").mark("process-spawn")
 {
     printf("pid %s mfa %s\n", user_string($arg1), user_string($arg2));
 }
 
-probe process("beam").mark("process-exit")
+probe process("beam.smp").mark("process-exit")
 {
     printf("pid %s reason %s\n", user_string($arg1), user_string($arg2));
 }
 
-probe process("beam").mark("process-exit_signal")
+probe process("beam.smp").mark("process-exit_signal")
 {
     printf("sender %s -> pid %s reason %s\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3));
 }
 
-probe process("beam").mark("process-exit_signal-remote")
+probe process("beam.smp").mark("process-exit_signal-remote")
 {
     printf("sender %s -> node %s pid %s reason %s\n",
 	   user_string($arg1), user_string($arg2), user_string($arg3), user_string($arg4));
diff --git a/lib/runtime_tools/examples/user-probe-n.systemtap b/lib/runtime_tools/examples/user-probe-n.systemtap
index 25f7503283..8a0a89c931 100644
--- a/lib/runtime_tools/examples/user-probe-n.systemtap
+++ b/lib/runtime_tools/examples/user-probe-n.systemtap
@@ -18,18 +18,19 @@
  * %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: This file assumes that you're using the SMP-enabled Erlang
+ *       virtual machine, "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.
+ *       "beam.smp" with "beam.debug.smp" or the VM name appropriate
+ *       to your environment.
  */
 
-probe process("beam").mark("user_trace-n0")
+
+probe process("beam.smp").mark("user_trace-n0")
 {
     printf("probe n0: %s %s %d %d %d %d '%s' '%s' '%s' '%s'\n",
            user_string($arg1),
@@ -41,7 +42,7 @@ probe process("beam").mark("user_trace-n0")
            $arg9 == NULL ? "" : user_string($arg9));
 }
 
-probe process("beam").mark("user_trace-n1")
+probe process("beam.smp").mark("user_trace-n1")
 {
     printf("probe n1: %s %s %d %d %d %d '%s' '%s' '%s' '%s'\n",
            user_string($arg1),
diff --git a/lib/runtime_tools/examples/user-probe.systemtap b/lib/runtime_tools/examples/user-probe.systemtap
index 1777476e54..ce9dde30f8 100644
--- a/lib/runtime_tools/examples/user-probe.systemtap
+++ b/lib/runtime_tools/examples/user-probe.systemtap
@@ -18,23 +18,23 @@
  * %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: This file assumes that you're using the SMP-enabled Erlang
+ *       virtual machine, "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.
+ *       "beam.smp" with "beam.debug.smp" or the VM name appropriate
+ *       to your environment.
  */
 
-probe process("beam").mark("user_trace-s1")
+probe process("beam.smp").mark("user_trace-s1")
 {
     printf("%s\n", user_string($arg1));
 }
 
-probe process("beam").mark("user_trace-i4s4")
+probe process("beam.smp").mark("user_trace-i4s4")
 {
     printf("%s %s %d %d %d %d '%s' '%s' '%s' '%s'\n",
            user_string($arg1),
diff --git a/lib/runtime_tools/src/system_information.erl b/lib/runtime_tools/src/system_information.erl
index 136ee55b54..8f7bfa195b 100644
--- a/lib/runtime_tools/src/system_information.erl
+++ b/lib/runtime_tools/src/system_information.erl
@@ -400,7 +400,6 @@ os_getenv_erts_specific() ->
 	    "ERL_MALLOC_LIB",
 	    "ERL_MAX_PORTS",
 	    "ERL_MAX_ETS_TABLES",
-	    "ERL_NO_VFORK",
 	    "ERL_NO_KERNEL_POLL",
 	    "ERL_THREAD_POOL_SIZE",
 	    "ERLC_EMULATOR",
diff --git a/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat b/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat
index a0e3806981..a9399a5d53 100644
--- a/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat
+++ b/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat
@@ -6829,7 +6829,7 @@
                         {native,false},
                         {compiler,"4.9.1"},
                         {md5,"55bb9fddcdf820938be2efee15eccd82"}]},
-                      {otp_ring0,
+                      {erl_init,
                        [{loaded,true},
                         {native,false},
                         {compiler,"4.9.1"},
diff --git a/lib/runtime_tools/vsn.mk b/lib/runtime_tools/vsn.mk
index aa3d702997..3f38574be4 100644
--- a/lib/runtime_tools/vsn.mk
+++ b/lib/runtime_tools/vsn.mk
@@ -1 +1 @@
-RUNTIME_TOOLS_VSN = 1.13.1
+RUNTIME_TOOLS_VSN = 1.13.3
diff --git a/lib/sasl/doc/src/alarm_handler.xml b/lib/sasl/doc/src/alarm_handler.xml
index 4160757164..6e74f833cd 100644
--- a/lib/sasl/doc/src/alarm_handler.xml
+++ b/lib/sasl/doc/src/alarm_handler.xml
@@ -34,7 +34,7 @@
     <rev>A</rev>
     <file>alarm_handler.sgml.t1</file>
   </header>
-  <module>alarm_handler</module>
+  <module since="">alarm_handler</module>
   <modulesummary>An Alarm Handling Process</modulesummary>
   <description>
     <p>The alarm handler process is a 
@@ -81,7 +81,7 @@
 
   <funcs>
     <func>
-      <name>clear_alarm(AlarmId) -> void()</name>
+      <name since="">clear_alarm(AlarmId) -> void()</name>
       <fsummary>Clears the specified alarms.</fsummary>
       <type>
         <v>AlarmId = term()</v>
@@ -94,7 +94,7 @@
     </func>
 
     <func>
-      <name>get_alarms() -> [alarm()]</name>
+      <name since="">get_alarms() -> [alarm()]</name>
       <fsummary>Gets all active alarms.</fsummary>
       <desc>
         <p>Returns a list of all active alarms. This function can only
@@ -103,7 +103,7 @@
     </func>
 
     <func>
-      <name>set_alarm(alarm())</name>
+      <name since="">set_alarm(alarm())</name>
       <fsummary>Sets an alarm with an id.</fsummary>
       <type>
         <v>alarm() = {AlarmId, AlarmDescription}</v>
diff --git a/lib/sasl/doc/src/notes.xml b/lib/sasl/doc/src/notes.xml
index 982c874117..a1ae404776 100644
--- a/lib/sasl/doc/src/notes.xml
+++ b/lib/sasl/doc/src/notes.xml
@@ -31,6 +31,23 @@
   </header>
   <p>This document describes the changes made to the SASL application.</p>
 
+<section><title>SASL 3.4</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Change the first module called by erts to be named
+	    erl_init instead of otp_ring0. systools in sasl have been
+	    updated to reflect this change.</p>
+          <p>
+	    Own Id: OTP-15336 Aux Id: PR-1825 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SASL 3.3</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/sasl/doc/src/rb.xml b/lib/sasl/doc/src/rb.xml
index d5df4fd345..0ed7e91c11 100644
--- a/lib/sasl/doc/src/rb.xml
+++ b/lib/sasl/doc/src/rb.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>rb.sgml</file>
   </header>
-  <module>rb</module>
+  <module since="">rb</module>
   <modulesummary>The Report Browser Tool</modulesummary>
   <description>
     <p>The Report Browser (RB) tool is used to browse and
@@ -43,8 +43,8 @@
 
   <funcs>
     <func>
-      <name>filter(Filters)</name>
-      <name>filter(Filters, Dates)</name>
+      <name since="OTP R13B04">filter(Filters)</name>
+      <name since="OTP R13B04">filter(Filters, Dates)</name>
       <fsummary>Filters reports and displays them on the screen.</fsummary>
       <type>
         <v>Filters = [filter()]</v>
@@ -86,7 +86,7 @@
     </func>
 
     <func>
-      <name>grep(RegExp)</name>
+      <name since="">grep(RegExp)</name>
       <fsummary>Searches the reports for a regular expression.</fsummary>
       <type>
         <v>RegExp = string() | {string(), Options} | re:mp() | {re:mp(), Options}</v>
@@ -109,8 +109,8 @@
     </func>
 
     <func>
-      <name>h()</name>
-      <name>help()</name>
+      <name since="">h()</name>
+      <name since="">help()</name>
       <fsummary>Displays help information.</fsummary>
       <desc>
         <p>Displays online help information.</p>
@@ -118,8 +118,8 @@
     </func>
 
     <func>
-      <name>list()</name>
-      <name>list(Type)</name>
+      <name since="">list()</name>
+      <name since="">list(Type)</name>
       <fsummary>Lists all reports.</fsummary>
       <type>
         <v>Type = type()</v>
@@ -137,8 +137,8 @@
     </func>
 
     <func>
-      <name>log_list()</name>
-      <name>log_list(Type)</name>
+      <name since="OTP R16B02">log_list()</name>
+      <name since="OTP R16B02">log_list(Type)</name>
       <fsummary>Logs report lists.</fsummary>
       <type>
         <v>Type = type()</v>
@@ -157,8 +157,8 @@
     </func>
 
     <func>
-      <name>rescan()</name>
-      <name>rescan(Options)</name>
+      <name since="">rescan()</name>
+      <name since="">rescan(Options)</name>
       <fsummary>Rescans the report directory.</fsummary>
       <type>
         <v>Options = [opt()]</v>
@@ -171,8 +171,8 @@
     </func>
 
     <func>
-      <name>show()</name>
-      <name>show(Report)</name>
+      <name since="">show()</name>
+      <name since="">show(Report)</name>
       <fsummary>Displays reports.</fsummary>
       <type>
         <v>Report = integer() | type()</v>
@@ -186,8 +186,8 @@
     </func>
 
     <func>
-      <name>start()</name>
-      <name>start(Options)</name>
+      <name since="">start()</name>
+      <name since="">start(Options)</name>
       <fsummary>Starts the <c>rb_server</c>.</fsummary>
       <type>
         <v>Options = [opt()]</v>
@@ -256,7 +256,7 @@
     </func>
 
     <func>
-      <name>start_log(FileName)</name>
+      <name since="">start_log(FileName)</name>
       <fsummary>Redirects all output to <c>FileName</c>.</fsummary>
       <type>
         <v>FileName = string() | atom() | pid()</v>
@@ -268,7 +268,7 @@
     </func>
 
     <func>
-      <name>stop()</name>
+      <name since="">stop()</name>
       <fsummary>Stops the <c>rb_server</c>.</fsummary>
       <desc>
         <p>Stops <c>rb_server</c>.</p>
@@ -276,7 +276,7 @@
     </func>
 
     <func>
-      <name>stop_log()</name>
+      <name since="">stop_log()</name>
       <fsummary>Stops logging to file.</fsummary>
       <desc>
         <p>Closes the log file. The output from the RB tool is
diff --git a/lib/sasl/doc/src/release_handler.xml b/lib/sasl/doc/src/release_handler.xml
index 9ba276aeac..f8ee0306d8 100644
--- a/lib/sasl/doc/src/release_handler.xml
+++ b/lib/sasl/doc/src/release_handler.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>release_handler</module>
+  <module since="">release_handler</module>
   <modulesummary>Unpacking and Installation of Release Packages</modulesummary>
   <description>
     <p>The <em>release handler</em> process belongs to the SASL
@@ -168,8 +168,8 @@
 
   <funcs>
     <func>
-      <name>check_install_release(Vsn) -> {ok, OtherVsn, Descr} | {error, Reason}</name>
-      <name>check_install_release(Vsn,Opts) -> {ok, OtherVsn, Descr} | {error, Reason}</name>
+      <name since="">check_install_release(Vsn) -> {ok, OtherVsn, Descr} | {error, Reason}</name>
+      <name since="OTP R14B04">check_install_release(Vsn,Opts) -> {ok, OtherVsn, Descr} | {error, Reason}</name>
       <fsummary>Checks installation of a release in the system.</fsummary>
       <type>
         <v>Vsn = OtherVsn = string()</v>
@@ -202,7 +202,7 @@
     </func>
 
     <func>
-      <name>create_RELEASES(Root, RelDir, RelFile, AppDirs) -> ok | {error, Reason}</name>
+      <name since="">create_RELEASES(Root, RelDir, RelFile, AppDirs) -> ok | {error, Reason}</name>
       <fsummary>Creates an initial <c>RELEASES</c> file.</fsummary>
       <type>
         <v>Root = RelDir = RelFile = string()</v>
@@ -233,7 +233,7 @@
     </func>
 
     <func>
-      <name>install_file(Vsn, File) -> ok | {error, Reason}</name>
+      <name since="">install_file(Vsn, File) -> ok | {error, Reason}</name>
       <fsummary>Installs a release file in the release structure.</fsummary>
       <type>
         <v>Vsn = File = string()</v>
@@ -252,8 +252,8 @@
     </func>
 
     <func>
-      <name>install_release(Vsn) -> {ok, OtherVsn, Descr} | {error, Reason}</name>
-      <name>install_release(Vsn, [Opt]) -> {ok, OtherVsn, Descr} | {continue_after_restart, OtherVsn, Descr} | {error, Reason}</name>
+      <name since="">install_release(Vsn) -> {ok, OtherVsn, Descr} | {error, Reason}</name>
+      <name since="">install_release(Vsn, [Opt]) -> {ok, OtherVsn, Descr} | {continue_after_restart, OtherVsn, Descr} | {error, Reason}</name>
       <fsummary>Installs a release in the system.</fsummary>
       <type>
         <v>Vsn = OtherVsn = string()</v>
@@ -383,7 +383,7 @@ release_handler:set_unpacked(RelFile, [{myapp,"1.0","/home/user"},...]).
     </func>
 
     <func>
-      <name>make_permanent(Vsn) -> ok | {error, Reason}</name>
+      <name since="">make_permanent(Vsn) -> ok | {error, Reason}</name>
       <fsummary>Makes the specified release version permanent.</fsummary>
       <type>
         <v>Vsn = string()</v>
@@ -396,7 +396,7 @@ release_handler:set_unpacked(RelFile, [{myapp,"1.0","/home/user"},...]).
     </func>
 
     <func>
-      <name>remove_release(Vsn) -> ok | {error, Reason}</name>
+      <name since="">remove_release(Vsn) -> ok | {error, Reason}</name>
       <fsummary>Removes a release from the system.</fsummary>
       <type>
         <v>Vsn = string()</v>
@@ -410,7 +410,7 @@ release_handler:set_unpacked(RelFile, [{myapp,"1.0","/home/user"},...]).
 
     </func>
     <func>
-      <name>reboot_old_release(Vsn) -> ok | {error, Reason}</name>
+      <name since="">reboot_old_release(Vsn) -> ok | {error, Reason}</name>
       <fsummary>Reboots the system from an old release.</fsummary>
       <type>
         <v>Vsn = string()</v>
@@ -425,7 +425,7 @@ release_handler:set_unpacked(RelFile, [{myapp,"1.0","/home/user"},...]).
     </func>
 
     <func>
-      <name>set_removed(Vsn) -> ok | {error, Reason}</name>
+      <name since="">set_removed(Vsn) -> ok | {error, Reason}</name>
       <fsummary>Marks a release as removed.</fsummary>
       <type>
         <v>Vsn = string()</v>
@@ -440,7 +440,7 @@ release_handler:set_unpacked(RelFile, [{myapp,"1.0","/home/user"},...]).
     </func>
 
     <func>
-      <name>set_unpacked(RelFile, AppDirs) -> {ok, Vsn} | {error, Reason}</name>
+      <name since="">set_unpacked(RelFile, AppDirs) -> {ok, Vsn} | {error, Reason}</name>
       <fsummary>Marks a release as unpacked.</fsummary>
       <type>
         <v>RelFile = string()</v>
@@ -466,7 +466,7 @@ release_handler:set_unpacked(RelFile, [{myapp,"1.0","/home/user"},...]).
     </func>
 
     <func>
-      <name>unpack_release(Name) -> {ok, Vsn} | {error, Reason}</name>
+      <name since="">unpack_release(Name) -> {ok, Vsn} | {error, Reason}</name>
       <fsummary>Unpacks a release package.</fsummary>
       <type>
         <v>Name = Vsn = string()</v>
@@ -482,7 +482,7 @@ release_handler:set_unpacked(RelFile, [{myapp,"1.0","/home/user"},...]).
     </func>
 
     <func>
-      <name>which_releases() -> [{Name, Vsn, Apps, Status}]</name>
+      <name since="">which_releases() -> [{Name, Vsn, Apps, Status}]</name>
       <fsummary>Returns all known releases.</fsummary>
       <type>
         <v>Name = Vsn = string()</v>
@@ -495,7 +495,7 @@ release_handler:set_unpacked(RelFile, [{myapp,"1.0","/home/user"},...]).
     </func>
 
     <func>
-      <name>which_releases(Status) -> [{Name, Vsn, Apps, Status}]</name>
+      <name since="OTP R15B">which_releases(Status) -> [{Name, Vsn, Apps, Status}]</name>
       <fsummary>Returns all known releases of a specific status.</fsummary>
       <type>
         <v>Name = Vsn = string()</v>
@@ -537,7 +537,7 @@ release_handler:set_unpacked(RelFile, [{myapp,"1.0","/home/user"},...]).
 
   <funcs>
     <func>
-      <name>upgrade_app(App, Dir) -> {ok, Unpurged} | restart_emulator | {error, Reason}</name>
+      <name since="">upgrade_app(App, Dir) -> {ok, Unpurged} | restart_emulator | {error, Reason}</name>
       <fsummary>Upgrades to a new application version.</fsummary>
       <type>
         <v>App = atom()</v>
@@ -586,8 +586,8 @@ release_handler:set_unpacked(RelFile, [{myapp,"1.0","/home/user"},...]).
     </func>
 
     <func>
-      <name>downgrade_app(App, Dir) -></name>
-      <name>downgrade_app(App, OldVsn, Dir) -> {ok, Unpurged} | restart_emulator | {error, Reason}</name>
+      <name since="">downgrade_app(App, Dir) -></name>
+      <name since="">downgrade_app(App, OldVsn, Dir) -> {ok, Unpurged} | restart_emulator | {error, Reason}</name>
       <fsummary>Downgrades to a previous application version.</fsummary>
       <type>
         <v>App = atom()</v>
@@ -633,7 +633,7 @@ release_handler:set_unpacked(RelFile, [{myapp,"1.0","/home/user"},...]).
     </func>
 
     <func>
-      <name>upgrade_script(App, Dir) -> {ok, NewVsn, Script}</name>
+      <name since="">upgrade_script(App, Dir) -> {ok, NewVsn, Script}</name>
       <fsummary>Finds an application upgrade script.</fsummary>
       <type>
         <v>App = atom()</v>
@@ -671,7 +671,7 @@ release_handler:set_unpacked(RelFile, [{myapp,"1.0","/home/user"},...]).
     </func>
 
     <func>
-      <name>downgrade_script(App, OldVsn, Dir) -> {ok, Script}</name>
+      <name since="">downgrade_script(App, OldVsn, Dir) -> {ok, Script}</name>
       <fsummary>Finds an application downgrade script.</fsummary>
       <type>
         <v>App = atom()</v>
@@ -710,7 +710,7 @@ release_handler:set_unpacked(RelFile, [{myapp,"1.0","/home/user"},...]).
     </func>
 
     <func>
-      <name>eval_appup_script(App, ToVsn, ToDir, Script) -> {ok, Unpurged} | restart_emulator | {error, Reason}</name>
+      <name since="">eval_appup_script(App, ToVsn, ToDir, Script) -> {ok, Unpurged} | restart_emulator | {error, Reason}</name>
       <fsummary>Evaluates an application upgrade or downgrade script.</fsummary>
       <type>
         <v>App = atom()</v>
diff --git a/lib/sasl/doc/src/systools.xml b/lib/sasl/doc/src/systools.xml
index 4842c732b1..6facb8ddae 100644
--- a/lib/sasl/doc/src/systools.xml
+++ b/lib/sasl/doc/src/systools.xml
@@ -30,7 +30,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>systools</module>
+  <module since="">systools</module>
   <modulesummary>A Set of Release Handling Tools</modulesummary>
   <description>
     <p>This module contains functions to generate boot scripts
@@ -40,8 +40,8 @@
 
   <funcs>
     <func>
-      <name>make_relup(Name, UpFrom, DownTo) -> Result</name>
-      <name>make_relup(Name, UpFrom, DownTo, [Opt]) -> Result</name>
+      <name since="">make_relup(Name, UpFrom, DownTo) -> Result</name>
+      <name since="">make_relup(Name, UpFrom, DownTo, [Opt]) -> Result</name>
       <fsummary>Generates a release upgrade file <c>relup</c>.</fsummary>
       <type>
         <v>Name = string()</v>
@@ -136,8 +136,8 @@
     </func>
 
     <func>
-      <name>make_script(Name) -> Result</name>
-      <name>make_script(Name, [Opt]) -> Result</name>
+      <name since="">make_script(Name) -> Result</name>
+      <name since="">make_script(Name, [Opt]) -> Result</name>
       <fsummary>Generates a boot script <c>.script/.boot</c>.</fsummary>
       <type>
         <v>Name = string()</v>
@@ -263,8 +263,8 @@
     </func>
 
     <func>
-      <name>make_tar(Name) -> Result</name>
-      <name>make_tar(Name, [Opt]) -> Result</name>
+      <name since="">make_tar(Name) -> Result</name>
+      <name since="">make_tar(Name, [Opt]) -> Result</name>
       <fsummary>Creates a release package.</fsummary>
       <type>
         <v>Name = string()</v>
@@ -369,7 +369,7 @@ myapp-1/ebin/myapp.app
     </func>
 
     <func>
-      <name>script2boot(File) -> ok | error</name>
+      <name since="">script2boot(File) -> ok | error</name>
       <fsummary>Generates a binary version of a boot script.</fsummary>
       <type>
         <v>File = string()</v>
diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile
index 7338bdf016..a5b9a5e731 100644
--- a/lib/sasl/src/Makefile
+++ b/lib/sasl/src/Makefile
@@ -61,6 +61,7 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
+
 ERL_COMPILE_FLAGS += -I../../stdlib/include -Werror
 
 
diff --git a/lib/sasl/src/rb.erl b/lib/sasl/src/rb.erl
index 28829132a1..bef4268d3a 100644
--- a/lib/sasl/src/rb.erl
+++ b/lib/sasl/src/rb.erl
@@ -890,7 +890,7 @@ read_rep(Fd, FilePosition, Device, Abort, Log) ->
     
 handle_bad_form(Date, Msg, Device, Abort, Log) ->
     io:format("rb: ERROR! A report on bad form was encountered. " ++
-	      "It can not be printed to the log.~n~n"),
+	      "It cannot be printed to the log.~n~n"),
     io:format("Details:~n~p ~tp~n~n", [Date,Msg]),
     case {Abort,Device,open_log_file(Log)} of
 	{true,standard_io,standard_io} ->
diff --git a/lib/sasl/src/release_handler.erl b/lib/sasl/src/release_handler.erl
index 7570b74c1a..48feac1a21 100644
--- a/lib/sasl/src/release_handler.erl
+++ b/lib/sasl/src/release_handler.erl
@@ -1120,7 +1120,7 @@ new_emulator_make_hybrid_config(CurrentVsn,ToVsn,TmpVsn,RelDir,Masters) ->
 	    {ok,[FC]} ->
 		FC;
 	    {error,Error1} ->
-		io:format("Warning: ~w can not read ~tp: ~tp~n",
+		io:format("Warning: ~w cannot read ~tp: ~tp~n",
 			  [?MODULE,FromFile,Error1]),
 		[]
 	end,
@@ -1130,7 +1130,7 @@ new_emulator_make_hybrid_config(CurrentVsn,ToVsn,TmpVsn,RelDir,Masters) ->
 	    {ok,[ToConfig]} ->
 		[lists:keyfind(App,1,ToConfig) || App <- [kernel,stdlib,sasl]];
 	    {error,Error2} ->
-		io:format("Warning: ~w can not read ~tp: ~tp~n",
+		io:format("Warning: ~w cannot read ~tp: ~tp~n",
 			  [?MODULE,ToFile,Error2]),
 		[false,false,false]
 	end,
diff --git a/lib/sasl/src/release_handler_1.erl b/lib/sasl/src/release_handler_1.erl
index ca97515299..bf18691687 100644
--- a/lib/sasl/src/release_handler_1.erl
+++ b/lib/sasl/src/release_handler_1.erl
@@ -147,7 +147,7 @@ split_instructions([], Before) ->
 %%          If PrePurgeMethod == soft_purge, the function will succeed
 %%          only if there is no process running old code of any of the
 %%          modules. Else it will throw {error,Mod}, where Mod is the
-%%          first module found that can not be soft_purged.
+%%          first module found that cannot be soft_purged.
 %%
 %%          If PrePurgeMethod == brutal_purge, the function will
 %%          always succeed and return a list of all modules that are
diff --git a/lib/sasl/src/sasl.appup.src b/lib/sasl/src/sasl.appup.src
index 26127eae84..22a9027b7c 100644
--- a/lib/sasl/src/sasl.appup.src
+++ b/lib/sasl/src/sasl.appup.src
@@ -19,27 +19,21 @@
 %%
 %% We allow upgrade from, and downgrade to all previous
 %% versions from the following OTP releases:
-%% - OTP 20
 %% - OTP 21
+%% - OTP 22
 %%
 %% We also allow upgrade from, and downgrade to all
 %% versions that have branched off from the above
 %% stated previous versions.
 %%
 {"%VSN%",
- [{<<"^3\\.0\\.4(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^3\\.1$">>,[restart_new_emulator]},
-  {<<"^3\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^3\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^3\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^3\\.2$">>,[restart_new_emulator]},
+ [{<<"^3\\.2$">>,[restart_new_emulator]},
   {<<"^3\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^3\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
- [{<<"^3\\.0\\.4(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^3\\.1$">>,[restart_new_emulator]},
-  {<<"^3\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^3\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^3\\.1\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^3\\.2$">>,[restart_new_emulator]},
+  {<<"^3\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.3$">>,[restart_new_emulator]},
+  {<<"^3\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
+ [{<<"^3\\.2$">>,[restart_new_emulator]},
   {<<"^3\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^3\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
+  {<<"^3\\.2\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.3$">>,[restart_new_emulator]},
+  {<<"^3\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
diff --git a/lib/sasl/src/systools.erl b/lib/sasl/src/systools.erl
index dd1a58c3c1..34eca6679f 100644
--- a/lib/sasl/src/systools.erl
+++ b/lib/sasl/src/systools.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. 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.
@@ -73,7 +73,7 @@ make_tar(RelName, Opt) ->
 script2boot(File) ->
     case systools_lib:file_term2binary(File ++ ".script", File ++ ".boot") of
 	{error,Error} ->
-	    io:format(systools_make:format_error(Error)),
+	    io:format("~ts", [systools_make:format_error(Error)]),
 	    error;
 	_ ->
 	    ok
@@ -84,7 +84,7 @@ script2boot(File, Output0, _Opt) ->
     Output = Output0++".boot",
     case systools_lib:file_term2binary(Input, Output) of
 	{error,Error} ->
-	    io:format(systools_make:format_error(Error)),
+	    io:format("~ts", [systools_make:format_error(Error)]),
 	    error;
 	_ ->
 	    ok
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl
index f085246924..c5d4b9bef3 100644
--- a/lib/sasl/src/systools_make.erl
+++ b/lib/sasl/src/systools_make.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. 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,6 +33,7 @@
 -export([read_application/4]).
 
 -export([make_hybrid_boot/4]).
+-export([preloaded/0]). % Exported just for testing
 
 -import(lists, [filter/2, keysort/2, keysearch/3, map/2, reverse/1,
 		append/1, foldl/3,  member/2, foreach/2]).
@@ -45,6 +46,15 @@
 
 -compile({inline,[{badarg,2}]}).
 
+-ifdef(USE_ESOCK).
+-define(ESOCK_SOCKET_MODS, [socket]).
+-define(ESOCK_NET_MODS,    [prim_net]).
+-else.
+-define(ESOCK_SOCKET_MODS, []).
+-define(ESOCK_NET_MODS,    []).
+-endif.
+
+
 %%-----------------------------------------------------------------
 %% Create a boot script from a release file.
 %% Options is a list of {path, Path} | silent | local
@@ -1562,11 +1572,11 @@ mandatory_modules() ->
 
 preloaded() ->
     %% Sorted
-    [atomics, counters, erl_prim_loader,erl_tracer,erlang,
+    [atomics,counters,erl_init,erl_prim_loader,erl_tracer,erlang,
      erts_code_purger,erts_dirty_process_signal_handler,
      erts_internal,erts_literal_area_collector,
-     init,otp_ring0,persistent_term,prim_buffer,prim_eval,prim_file,
-     prim_inet,prim_zip,zlib].
+     init,persistent_term,prim_buffer,prim_eval,prim_file,
+     prim_inet] ++ ?ESOCK_NET_MODS ++ [prim_zip] ++ ?ESOCK_SOCKET_MODS ++ [zlib].
 
 %%______________________________________________________________________
 %% Kernel processes; processes that are specially treated by the init
diff --git a/lib/sasl/src/systools_relup.erl b/lib/sasl/src/systools_relup.erl
index e836d57670..5f1176ec69 100644
--- a/lib/sasl/src/systools_relup.erl
+++ b/lib/sasl/src/systools_relup.erl
@@ -587,7 +587,7 @@ default(warnings_as_errors) -> false.
 
 print_error({error, Mod, Error}) ->
     S = apply(Mod, format_error, [Error]),
-    io:format(S, []);
+    io:format("~ts", [S]);
 print_error(Other) ->
     io:format("Error: ~tp~n", [Other]).
 
diff --git a/lib/sasl/test/installer.erl b/lib/sasl/test/installer.erl
index e38d0cfa7b..5429008a5f 100644
--- a/lib/sasl/test/installer.erl
+++ b/lib/sasl/test/installer.erl
@@ -905,7 +905,7 @@ start_client(TestNode,Client,Sname) ->
             wait_started(TestNode,Node)
     after 30000 ->
 	    ?print([{start_client,failed,Node},net_adm:ping(Node)]),
-            ?fail({"can not start", Node})
+            ?fail({"cannot start", Node})
     end.
 
 start_client_unix(TestNode,Sname,Node) ->
diff --git a/lib/sasl/test/rb_SUITE.erl b/lib/sasl/test/rb_SUITE.erl
index 2b6e452d14..e5ca1775d5 100644
--- a/lib/sasl/test/rb_SUITE.erl
+++ b/lib/sasl/test/rb_SUITE.erl
@@ -423,7 +423,7 @@ start_stop_log(Config) ->
     StdioResult2 = capture(fun() -> rb:log_list() end),
     {ok,<<>>} = file:read_file(OutFile),
     
-    %% Test that standard_io is used if log file can not be opened
+    %% Test that standard_io is used if log file cannot be opened
     ok = rb:start_log(filename:join(nonexistingdir,"newfile.txt")),
     StdioResult = capture(fun() -> rb:show(1) end),
     {ok,<<>>} = file:read_file(OutFile),
diff --git a/lib/sasl/test/systools_SUITE.erl b/lib/sasl/test/systools_SUITE.erl
index 1827974866..6c913850b9 100644
--- a/lib/sasl/test/systools_SUITE.erl
+++ b/lib/sasl/test/systools_SUITE.erl
@@ -1654,7 +1654,7 @@ abnormal_relup(Config) when is_list(Config) ->
     ok.
 
 
-%% make_relup: Check relup can not be created is sasl is not in rel file.
+%% make_relup: Check relup cannot be created is sasl is not in rel file.
 no_sasl_relup(Config) when is_list(Config) ->
     {ok, OldDir} = file:get_cwd(),
     {Dir1,Name1} = create_script(latest1_no_sasl,Config),
diff --git a/lib/sasl/test/test_lib.hrl b/lib/sasl/test/test_lib.hrl
index f5210d4f27..7867d3da39 100644
--- a/lib/sasl/test/test_lib.hrl
+++ b/lib/sasl/test/test_lib.hrl
@@ -1,3 +1,3 @@
 -define(ertsvsn,"4.4").
--define(kernelvsn,"5.3").
--define(stdlibvsn,"3.4").
+-define(kernelvsn,"6.0").
+-define(stdlibvsn,"3.5").
diff --git a/lib/sasl/vsn.mk b/lib/sasl/vsn.mk
index c1f80752a7..8838b514da 100644
--- a/lib/sasl/vsn.mk
+++ b/lib/sasl/vsn.mk
@@ -1 +1 @@
-SASL_VSN = 3.3
+SASL_VSN = 3.4
diff --git a/lib/snmp/Makefile b/lib/snmp/Makefile
index 879f1b05c5..df321fc2d1 100644
--- a/lib/snmp/Makefile
+++ b/lib/snmp/Makefile
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1996-2016. All Rights Reserved.
+# Copyright Ericsson AB 1996-2019. 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.
@@ -136,11 +136,17 @@ dclean:
 
 dialyzer_plt: $(DIA_PLT)
 
-$(DIA_PLT): 
+$(DIA_PLT): Makefile
 	@echo "Building $(APPLICATION) plt file"
 	@dialyzer --build_plt \
                   --output_plt $@ \
                   -r ../$(APPLICATION)/ebin \
+                     ../../lib/kernel/ebin \
+                     ../../lib/stdlib/ebin \
+                     ../../lib/runtime_tools/ebin \
+                     ../../lib/crypto/ebin \
+                     ../../lib/mnesia/ebin \
+                     ../../erts/preloaded/ebin \
                   --output $(DIA_ANALYSIS) \
                   --verbose
 
@@ -148,4 +154,4 @@ dialyzer: $(DIA_PLT)
 	@echo "Running dialyzer on $(APPLICATION)"
 	@dialyzer --plt $< \
                   ../$(APPLICATION)/ebin \
-                  --verbose
\ No newline at end of file
+                  --verbose
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 423d90fef6..780e0cae76 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -34,7 +34,32 @@
   </header>
 
 
-  <section><title>SNMP 5.2.12</title>
+  <section><title>SNMP 5.3</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The application otp_mibs has been removed from OTP. Some
+	    of its components (mibs) have been moved to other apps
+	    (snmp), or removed completely (os_mon).</p>
+          <p>
+	    Own Id: OTP-14984 Aux Id: OTP-15329 </p>
+        </item>
+        <item>
+          <p>
+	    [snmp|agent] Add a get-mechanism callback module (and a
+	    corresponding behaviour). The agent calls this module to
+	    handle each get (get, get-next and get-bulk) request.</p>
+          <p>
+	    Own Id: OTP-15691 Aux Id: ERIERL-324 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SNMP 5.2.12</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
@@ -73,6 +98,23 @@
 
 </section>
 
+  <section><title>SNMP 5.2.11.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    [snmp|agent] Add a get-mechanism callback module (and a
+	    corresponding behaviour). The agent calls this module to
+	    handle each get (get, get-next and get-bulk) request.</p>
+          <p>
+	    Own Id: OTP-15691 Aux Id: ERIERL-324 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SNMP 5.2.11</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/snmp/doc/src/snmp.xml b/lib/snmp/doc/src/snmp.xml
index 480ed2e825..d20f1a8d06 100644
--- a/lib/snmp/doc/src/snmp.xml
+++ b/lib/snmp/doc/src/snmp.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmp.xml</file>
   </header>
-  <module>snmp</module>
+  <module since="">snmp</module>
   <modulesummary>Interface functions to the SNMP toolkit</modulesummary>
   <description>
     <p>The module <c>snmp</c> contains interface functions to the 
@@ -56,7 +56,7 @@
 
   <funcs>
     <func>
-      <name>config() -> ok | {error, Reason}</name>
+      <name since="">config() -> ok | {error, Reason}</name>
       <fsummary>Configure with a simple interactive tool</fsummary>
       <desc>
         <p>A simple interactive configuration tool. Simple
@@ -78,8 +78,8 @@
     </func>
 
     <func>
-      <name>start() -> ok | {error, Reason}</name>
-      <name>start(Type) -> ok | {error, Reason}</name>
+      <name since="">start() -> ok | {error, Reason}</name>
+      <name since="">start(Type) -> ok | {error, Reason}</name>
       <fsummary>Start the SNMP application</fsummary>
       <type>
         <v>Type = start_type()</v>
@@ -93,8 +93,8 @@
     </func>
 
     <func>
-      <name>start_agent() -> ok | {error, Reason}</name>
-      <name>start_agent(Type) -> ok | {error, Reason}</name>
+      <name since="">start_agent() -> ok | {error, Reason}</name>
+      <name since="">start_agent(Type) -> ok | {error, Reason}</name>
       <fsummary>Start the agent part of the SNMP application</fsummary>
       <type>
         <v>Type = start_type()</v>
@@ -117,8 +117,8 @@
     </func>
 
     <func>
-      <name>start_manager() -> ok | {error, Reason}</name>
-      <name>start_manager(Type) -> ok | {error, Reason}</name>
+      <name since="">start_manager() -> ok | {error, Reason}</name>
+      <name since="">start_manager(Type) -> ok | {error, Reason}</name>
       <fsummary>Start the manager part of the SNMP application</fsummary>
       <type>
         <v>Type = start_type()</v>
@@ -141,7 +141,7 @@
     </func>
 
     <func>
-      <name>date_and_time() -> DateAndTime</name>
+      <name since="">date_and_time() -> DateAndTime</name>
       <fsummary>Return the current date and time as an OCTET STRING</fsummary>
       <type>
         <v>DateAndTime = [int()]</v>
@@ -155,7 +155,7 @@
     </func>
 
     <func>
-      <name>date_and_time_to_universal_time_dst(DateAndTime) -> [utc()]</name>
+      <name since="">date_and_time_to_universal_time_dst(DateAndTime) -> [utc()]</name>
       <fsummary>Convert a DateAndTime value to a list of possible utc()</fsummary>
       <type>
         <v>DateAndTime = [int()]</v>
@@ -171,8 +171,8 @@
     </func>
 
     <func>
-      <name>date_and_time_to_string(DateAndTime) -> string()</name>
-      <name>date_and_time_to_string(DateAndTime, Validate) -> string()</name>
+      <name since="">date_and_time_to_string(DateAndTime) -> string()</name>
+      <name since="">date_and_time_to_string(DateAndTime, Validate) -> string()</name>
       <fsummary>Convert a DateAndTime value to a string</fsummary>
       <type>
         <v>DateAndTime = [int()]</v>
@@ -194,7 +194,7 @@
     </func>
 
     <func>
-      <name>date_and_time_to_string2(DateAndTime) -> string()</name>
+      <name since="">date_and_time_to_string2(DateAndTime) -> string()</name>
       <fsummary>Convert a DateAndTime value to a string</fsummary>
       <type>
         <v>DateAndTime = [int()]</v>
@@ -210,7 +210,7 @@
     </func>
 
     <func>
-      <name>local_time_to_date_and_time_dst(Local) -> [DateAndTime]</name>
+      <name since="">local_time_to_date_and_time_dst(Local) -> [DateAndTime]</name>
       <fsummary>Convert a Local time value to a list of possible DateAndTime(s)</fsummary>
       <type>
         <v>Local = {{Y,Mo,D},{H,M,S}}</v>
@@ -226,7 +226,7 @@
     </func>
 
     <func>
-      <name>universal_time_to_date_and_time(UTC) -> DateAndTime</name>
+      <name since="">universal_time_to_date_and_time(UTC) -> DateAndTime</name>
       <fsummary>Convert a UTC value to DateAndTime</fsummary>
       <type>
         <v>UTC = {{Y,Mo,D},{H,M,S}}</v>
@@ -241,8 +241,8 @@
     </func>
 
     <func>
-      <name>validate_date_and_time(DateAndTime) -> bool()</name>
-      <name>validate_date_and_time(DateAndTime, Validate) -> bool()</name>
+      <name since="">validate_date_and_time(DateAndTime) -> bool()</name>
+      <name since="">validate_date_and_time(DateAndTime, Validate) -> bool()</name>
       <fsummary>Check if a DateAndTime value is correct</fsummary>
       <type>
         <v>DateAndTime = term()</v>
@@ -279,7 +279,7 @@
     </func>
 
     <func>
-      <name>passwd2localized_key(Alg, Passwd, EngineID) -> Key</name>
+      <name since="">passwd2localized_key(Alg, Passwd, EngineID) -> Key</name>
       <fsummary>Generates an localized key</fsummary>
       <type>
         <v>Alg = algorithm()</v>
@@ -298,7 +298,7 @@
     </func>
 
     <func>
-      <name>octet_string_to_bits(S) -> Val</name>
+      <name since="">octet_string_to_bits(S) -> Val</name>
       <fsummary>Convert an OCTET-STRING to BITS</fsummary>
       <type>
         <v>Val = bits()</v>
@@ -312,7 +312,7 @@
     </func>
 
     <func>
-      <name>bits_to_octet_string(B) -> Val</name>
+      <name since="">bits_to_octet_string(B) -> Val</name>
       <fsummary>Convert an OCTET-STRING to BITS</fsummary>
       <type>
         <v>Val = octet_string()</v>
@@ -326,7 +326,7 @@
     </func>
 
     <func>
-      <name>read_mib(FileName) -> {ok, mib()} | {error, Reason}</name>
+      <name since="">read_mib(FileName) -> {ok, mib()} | {error, Reason}</name>
       <fsummary></fsummary>
       <type>
         <v>FileName = string()</v>
@@ -341,10 +341,10 @@
     </func>
 
     <func>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile) ->  ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block | Start) ->  ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Block | Stop) -> ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop, Block) -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="">log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="">log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block | Start) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="">log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Block | Stop) -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="OTP R16B03">log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop, Block) -> ok | {ok, Cnt} | {error, Reason}</name>
       <fsummary>Convert an Audit Trail Log to text format</fsummary>
       <type>
         <v>LogDir = string()</v>
@@ -412,10 +412,10 @@
     </func>
 
     <func>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile) ->  ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block | Start) ->  ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Start, Block | Stop) -> ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop, Block) -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="OTP R15B01">log_to_io(LogDir, Mibs, LogName, LogFile) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="OTP R15B01">log_to_io(LogDir, Mibs, LogName, LogFile, Block | Start) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="OTP R15B01">log_to_io(LogDir, Mibs, LogName, LogFile, Start, Block | Stop) -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="OTP R16B03">log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop, Block) -> ok | {ok, Cnt} | {error, Reason}</name>
       <fsummary>Convert an Audit Trail Log to text format</fsummary>
       <type>
         <v>LogDir = string()</v>
@@ -440,7 +440,7 @@
     </func>
 
     <func>
-      <name>change_log_size(LogName, NewSize) -> ok | {error, Reason}</name>
+      <name since="">change_log_size(LogName, NewSize) -> ok | {error, Reason}</name>
       <fsummary>Change the size of the Audit Trail Log</fsummary>
       <type>
         <v>LogName = string()</v>
@@ -463,8 +463,8 @@
     </func>
 
     <func>
-      <name>print_version_info() -> void()</name>
-      <name>print_version_info(Prefix) -> void()</name>
+      <name since="">print_version_info() -> void()</name>
+      <name since="">print_version_info(Prefix) -> void()</name>
       <fsummary>Formatted print of result of the versions functions</fsummary>
       <type>
         <v>Prefix = string() | integer()</v>
@@ -484,8 +484,8 @@
     </func>
 
     <func>
-      <name>versions1() -> {ok, Info} | {error, Reason}</name>
-      <name>versions2() -> {ok, Info} | {error, Reason}</name>
+      <name since="">versions1() -> {ok, Info} | {error, Reason}</name>
+      <name since="">versions2() -> {ok, Info} | {error, Reason}</name>
       <fsummary>Retrieve various system and application info</fsummary>
       <type>
         <v>Info = [info()]</v>
@@ -504,8 +504,8 @@
     </func>
 
     <func>
-      <name>print_versions(VersionInfo) -> void()</name>
-      <name>print_versions(Prefix, VersionInfo) -> void()</name>
+      <name since="">print_versions(VersionInfo) -> void()</name>
+      <name since="">print_versions(Prefix, VersionInfo) -> void()</name>
       <fsummary>Formatted print of result of the versions functions</fsummary>
       <type>
         <v>VersionInfo = [version_info()]</v>
@@ -527,7 +527,7 @@
     </func>
 
     <func>
-      <name>enable_trace() -> void()</name>
+      <name since="">enable_trace() -> void()</name>
       <fsummary>Starts a tracer</fsummary>
       <!--
       <type>
@@ -543,7 +543,7 @@
     </func>
 
     <func>
-      <name>disable_trace() -> void()</name>
+      <name since="">disable_trace() -> void()</name>
       <fsummary>Stop the tracer</fsummary>
       <!--
       <type>
@@ -558,7 +558,7 @@
     </func>
 
     <func>
-      <name>set_trace(Targets) -> void()</name>
+      <name since="">set_trace(Targets) -> void()</name>
       <fsummary>Set trace target</fsummary>
       <type>
         <v>Targets = target() | targets()</v>
@@ -582,7 +582,7 @@
     </func>
 
     <func>
-      <name>reset_trace(Targets) -> void()</name>
+      <name since="">reset_trace(Targets) -> void()</name>
       <fsummary>Reset trace target</fsummary>
       <type>
         <v>Targets = module() | modules()</v>
@@ -598,7 +598,7 @@
     </func>
 
     <func>
-      <name>set_trace(Targets, Opts) -> void()</name>
+      <name since="">set_trace(Targets, Opts) -> void()</name>
       <fsummary>Set trace target</fsummary>
       <type>
         <v>Targets = target() | targets()</v>
diff --git a/lib/snmp/doc/src/snmp_community_mib.xml b/lib/snmp/doc/src/snmp_community_mib.xml
index 61dea05950..9800fb6c00 100644
--- a/lib/snmp/doc/src/snmp_community_mib.xml
+++ b/lib/snmp/doc/src/snmp_community_mib.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmp_community_mib.xml</file>
   </header>
-  <module>snmp_community_mib</module>
+  <module since="">snmp_community_mib</module>
   <modulesummary>Instrumentation Functions for SNMP-COMMUNITY-MIB</modulesummary>
   <description>
     <p>The module <c>snmp_community_mib</c> implements the instrumentation
@@ -45,7 +45,7 @@
 
   <funcs>
     <func>
-      <name>configure(ConfDir) -> void()</name>
+      <name since="">configure(ConfDir) -> void()</name>
       <fsummary>Configure the SNMP-COMMUNITY-MIB</fsummary>
       <type>
         <v>ConfDir = string()</v>
@@ -77,7 +77,7 @@
     </func>
 
     <func>
-      <name>reconfigure(ConfDir) -> void()</name>
+      <name since="">reconfigure(ConfDir) -> void()</name>
       <fsummary>Configure the SNMP-COMMUNITY-MIB</fsummary>
       <type>
         <v>ConfDir = string()</v>
@@ -108,8 +108,8 @@
     </func>
 
     <func>
-      <name>add_community(Idx, CommName, SecName, CtxName, TransportTag) -> Ret</name>
-      <name>add_community(Idx, CommName, SecName, EngineId, CtxName, TransportTag) -> Ret</name>
+      <name since="">add_community(Idx, CommName, SecName, CtxName, TransportTag) -> Ret</name>
+      <name since="OTP R14B03">add_community(Idx, CommName, SecName, EngineId, CtxName, TransportTag) -> Ret</name>
       <fsummary>Added one community</fsummary>
       <type>
         <v>Idx = string()</v>
@@ -132,7 +132,7 @@
     </func>
 
     <func>
-      <name>delete_community(Key) -> Ret</name>
+      <name since="">delete_community(Key) -> Ret</name>
       <fsummary>Delete one community</fsummary>
       <type>
         <v>Key = term()</v>
diff --git a/lib/snmp/doc/src/snmp_framework_mib.xml b/lib/snmp/doc/src/snmp_framework_mib.xml
index 64e5df6ff5..d84327d4d5 100644
--- a/lib/snmp/doc/src/snmp_framework_mib.xml
+++ b/lib/snmp/doc/src/snmp_framework_mib.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmp_framework_mib.xml</file>
   </header>
-  <module>snmp_framework_mib</module>
+  <module since="">snmp_framework_mib</module>
   <modulesummary>Instrumentation Functions for SNMP-FRAMEWORK-MIB</modulesummary>
   <description>
     <p>The module <c>snmp_framework_mib</c> implements instrumentation
@@ -44,7 +44,7 @@
   </description>
   <funcs>
     <func>
-      <name>configure(ConfDir) -> void()</name>
+      <name since="">configure(ConfDir) -> void()</name>
       <fsummary>Configure the SNMP-FRAMEWORK-MIB</fsummary>
       <type>
         <v>ConfDir = string()</v>
@@ -75,7 +75,7 @@
       </desc>
     </func>
     <func>
-      <name>init() -> void()</name>
+      <name since="">init() -> void()</name>
       <fsummary>Initialize the SNMP-FRAMEWORK-MIB</fsummary>
       <desc>
         <p>This function is called from the supervisor at system
@@ -88,7 +88,7 @@
       </desc>
     </func>
     <func>
-      <name>add_context(Ctx) -> Ret</name>
+      <name since="">add_context(Ctx) -> Ret</name>
       <fsummary>Added one context</fsummary>
       <type>
         <v>Ctx = string()</v>
@@ -103,7 +103,7 @@
       </desc>
     </func>
     <func>
-      <name>delete_context(Key) -> Ret</name>
+      <name since="">delete_context(Key) -> Ret</name>
       <fsummary>Delete one context</fsummary>
       <type>
         <v>Key = term()</v>
diff --git a/lib/snmp/doc/src/snmp_generic.xml b/lib/snmp/doc/src/snmp_generic.xml
index 44762dec59..6fb714907c 100644
--- a/lib/snmp/doc/src/snmp_generic.xml
+++ b/lib/snmp/doc/src/snmp_generic.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmp_generic.xml</file>
   </header>
-  <module>snmp_generic</module>
+  <module since="">snmp_generic</module>
   <modulesummary>Generic Functions for Implementing SNMP Objects in a Database</modulesummary>
   <description>
     <marker id="description"></marker>
@@ -127,8 +127,8 @@ value() = term()
 
   <funcs>
     <func>
-      <name>get_status_col(Name, Cols)</name>
-      <name>get_status_col(NameDb, Cols) -> {ok, StatusVal} | false</name>
+      <name since="">get_status_col(Name, Cols)</name>
+      <name since="">get_status_col(NameDb, Cols) -> {ok, StatusVal} | false</name>
       <fsummary>Get the value of the status column from <c>Cols</c></fsummary>
       <type>
         <v>Name = name()</v>
@@ -148,7 +148,7 @@ value() = term()
     </func>
 
     <func>
-      <name>get_index_types(Name)</name>
+      <name since="">get_index_types(Name)</name>
       <fsummary>Get the index types of <c>Name</c></fsummary>
       <type>
         <v>Name = name()</v>
@@ -163,7 +163,7 @@ value() = term()
     </func>
 
     <func>
-      <name>get_table_info(Name, Item) -> table_info_result()</name>
+      <name since="OTP R15B01">get_table_info(Name, Item) -> table_info_result()</name>
       <fsummary>Get table info item of MIB table <c>Name</c></fsummary>
       <type>
         <v>Name = name()</v>
@@ -187,8 +187,8 @@ value() = term()
     </func>
 
     <func>
-      <name>table_func(Op1, NameDb)</name>
-      <name>table_func(Op2, RowIndex, Cols, NameDb) -> Ret</name>
+      <name since="">table_func(Op1, NameDb)</name>
+      <name since="">table_func(Op2, RowIndex, Cols, NameDb) -> Ret</name>
       <fsummary>Default instrumentation function for tables</fsummary>
       <type>
         <v>Op1 = new | delete </v>
@@ -232,7 +232,7 @@ value() = term()
     </func>
 
     <func>
-      <name>table_get_elements(NameDb, RowIndex, Cols) -> Values</name>
+      <name since="">table_get_elements(NameDb, RowIndex, Cols) -> Values</name>
       <fsummary>Get elements in a table row</fsummary>
       <type>
         <v>NameDb = name_db()</v>
@@ -249,7 +249,7 @@ value() = term()
     </func>
 
     <func>
-      <name>table_next(NameDb, RestOid) -> RowIndex | endOfTable</name>
+      <name since="">table_next(NameDb, RestOid) -> RowIndex | endOfTable</name>
       <fsummary>Find the next row in the table</fsummary>
       <type>
         <v>NameDb = name_db()</v>
@@ -265,7 +265,7 @@ value() = term()
     </func>
 
     <func>
-      <name>table_row_exists(NameDb, RowIndex) -> bool()</name>
+      <name since="">table_row_exists(NameDb, RowIndex) -> bool()</name>
       <fsummary>Check if a row in a table exists</fsummary>
       <type>
         <v>NameDb = name_db()</v>
@@ -279,7 +279,7 @@ value() = term()
     </func>
 
     <func>
-      <name>table_set_elements(NameDb, RowIndex, Cols) -> bool()</name>
+      <name since="">table_set_elements(NameDb, RowIndex, Cols) -> bool()</name>
       <fsummary>Set elements in a table row</fsummary>
       <type>
         <v>NameDb = name_db()</v>
@@ -300,8 +300,8 @@ value() = term()
     </func>
 
     <func>
-      <name>variable_func(Op1, NameDb)</name>
-      <name>variable_func(Op2, Val, NameDb) -> Ret</name>
+      <name since="">variable_func(Op1, NameDb)</name>
+      <name since="">variable_func(Op2, Val, NameDb) -> Ret</name>
       <fsummary>Default instrumentation function for tables</fsummary>
       <type>
         <v>Op1 = new | delete | get</v>
@@ -325,7 +325,7 @@ value() = term()
     </func>
 
     <func>
-      <name>variable_get(NameDb) -> {value, Value} | undefined</name>
+      <name since="">variable_get(NameDb) -> {value, Value} | undefined</name>
       <fsummary>Get the value of a variable</fsummary>
       <type>
         <v>NameDb = name_db()</v>
@@ -339,7 +339,7 @@ value() = term()
     </func>
 
     <func>
-      <name>variable_set(NameDb, NewVal) -> true | false</name>
+      <name since="">variable_set(NameDb, NewVal) -> true | false</name>
       <fsummary>Set a value for a variable</fsummary>
       <type>
         <v>NameDb = name_db()</v>
diff --git a/lib/snmp/doc/src/snmp_index.xml b/lib/snmp/doc/src/snmp_index.xml
index 646e9661a3..1497f4cf67 100644
--- a/lib/snmp/doc/src/snmp_index.xml
+++ b/lib/snmp/doc/src/snmp_index.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmp_index.xml</file>
   </header>
-  <module>snmp_index</module>
+  <module since="">snmp_index</module>
   <modulesummary>Abstract Data Type for SNMP Indexing</modulesummary>
   <description>
     <p>The module <c>snmp_index</c> implements an Abstract
@@ -159,7 +159,7 @@ get_next_pid(Oid, SnmpIndex) ->
   </section>
   <funcs>
     <func>
-      <name>delete(Index) -> true</name>
+      <name since="">delete(Index) -> true</name>
       <fsummary>Delete an index table</fsummary>
       <type>
         <v>Index = NewIndex = index()</v>
@@ -173,7 +173,7 @@ get_next_pid(Oid, SnmpIndex) ->
       </desc>
     </func>
     <func>
-      <name>delete(Index, Key) -> NewIndex</name>
+      <name since="">delete(Index, Key) -> NewIndex</name>
       <fsummary>Delete an item from the index</fsummary>
       <type>
         <v>Index = NewIndex = index()</v>
@@ -185,7 +185,7 @@ get_next_pid(Oid, SnmpIndex) ->
       </desc>
     </func>
     <func>
-      <name>get(Index, KeyOid) -> {ok, {KeyOid, Value}} | undefined</name>
+      <name since="">get(Index, KeyOid) -> {ok, {KeyOid, Value}} | undefined</name>
       <fsummary>Get the item with <c>KeyOid</c></fsummary>
       <type>
         <v>Index = index()</v>
@@ -198,7 +198,7 @@ get_next_pid(Oid, SnmpIndex) ->
       </desc>
     </func>
     <func>
-      <name>get_last(Index) -> {ok, {KeyOid, Value}} | undefined</name>
+      <name since="">get_last(Index) -> {ok, {KeyOid, Value}} | undefined</name>
       <fsummary>Get the last item in the index structure</fsummary>
       <type>
         <v>Index = index()</v>
@@ -210,7 +210,7 @@ get_next_pid(Oid, SnmpIndex) ->
       </desc>
     </func>
     <func>
-      <name>get_next(Index, KeyOid) -> {ok, {NextKeyOid, Value}} | undefined</name>
+      <name since="">get_next(Index, KeyOid) -> {ok, {NextKeyOid, Value}} | undefined</name>
       <fsummary>Get the next item</fsummary>
       <type>
         <v>Index = index()</v>
@@ -224,7 +224,7 @@ get_next_pid(Oid, SnmpIndex) ->
       </desc>
     </func>
     <func>
-      <name>insert(Index, Key, Value) -> NewIndex</name>
+      <name since="">insert(Index, Key, Value) -> NewIndex</name>
       <fsummary>Insert an item into the index</fsummary>
       <type>
         <v>Index = NewIndex = index()</v>
@@ -238,7 +238,7 @@ get_next_pid(Oid, SnmpIndex) ->
       </desc>
     </func>
     <func>
-      <name>key_to_oid(Index, Key) -> KeyOid</name>
+      <name since="">key_to_oid(Index, Key) -> KeyOid</name>
       <fsummary>Convert a key to an OBJECT IDENTIFIER</fsummary>
       <type>
         <v>Index = index()</v>
@@ -250,7 +250,7 @@ get_next_pid(Oid, SnmpIndex) ->
       </desc>
     </func>
     <func>
-      <name>new(KeyTypes) -> Index</name>
+      <name since="">new(KeyTypes) -> Index</name>
       <fsummary>Create a new snmp index structure</fsummary>
       <type>
         <v>KeyTypes = key_types()</v>
diff --git a/lib/snmp/doc/src/snmp_notification_mib.xml b/lib/snmp/doc/src/snmp_notification_mib.xml
index d2e288ec15..9395edf155 100644
--- a/lib/snmp/doc/src/snmp_notification_mib.xml
+++ b/lib/snmp/doc/src/snmp_notification_mib.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmp_notification_mib.xml</file>
   </header>
-  <module>snmp_notification_mib</module>
+  <module since="">snmp_notification_mib</module>
   <modulesummary>Instrumentation Functions for SNMP-NOTIFICATION-MIB</modulesummary>
   <description>
     <p>The module <c>snmp_notification_mib</c> implements the
@@ -43,7 +43,7 @@
   </description>
   <funcs>
     <func>
-      <name>configure(ConfDir) -> void()</name>
+      <name since="">configure(ConfDir) -> void()</name>
       <fsummary>Configure the SNMP-NOTIFICATION-MIB</fsummary>
       <type>
         <v>ConfDir = string()</v>
@@ -70,7 +70,7 @@
       </desc>
     </func>
     <func>
-      <name>reconfigure(ConfDir) -> void()</name>
+      <name since="">reconfigure(ConfDir) -> void()</name>
       <fsummary>Configure the SNMP-NOTIFICATION-MIB</fsummary>
       <type>
         <v>ConfDir = string()</v>
@@ -98,7 +98,7 @@
       </desc>
     </func>
     <func>
-      <name>add_notify(Name, Tag, Type) -> Ret</name>
+      <name since="">add_notify(Name, Tag, Type) -> Ret</name>
       <fsummary>Added one notify definition</fsummary>
       <type>
         <v>Name = string()</v>
@@ -115,7 +115,7 @@
       </desc>
     </func>
     <func>
-      <name>delete_notify(Key) -> Ret</name>
+      <name since="">delete_notify(Key) -> Ret</name>
       <fsummary>Delete one notify definition</fsummary>
       <type>
         <v>Key = term()</v>
diff --git a/lib/snmp/doc/src/snmp_pdus.xml b/lib/snmp/doc/src/snmp_pdus.xml
index 1d086e6f48..f403b6edf4 100644
--- a/lib/snmp/doc/src/snmp_pdus.xml
+++ b/lib/snmp/doc/src/snmp_pdus.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmp_pdus.xml</file>
   </header>
-  <module>snmp_pdus</module>
+  <module since="">snmp_pdus</module>
   <modulesummary>Encode and Decode Functions for SNMP PDUs</modulesummary>
   <description>
     <p>RFC1157, RFC1905 and/or RFC2272 should be studied carefully
@@ -55,7 +55,7 @@
   </description>
   <funcs>
     <func>
-      <name>dec_message([byte()]) -> Message</name>
+      <name since="">dec_message([byte()]) -> Message</name>
       <fsummary>Decode an SNMP Message</fsummary>
       <type>
         <v>Message = #message</v>
@@ -71,7 +71,7 @@
       </desc>
     </func>
     <func>
-      <name>dec_message_only([byte()]) -> Message</name>
+      <name since="">dec_message_only([byte()]) -> Message</name>
       <fsummary>Decode an SNMP Message, but not the data part</fsummary>
       <type>
         <v>Message = #message</v>
@@ -84,7 +84,7 @@
       </desc>
     </func>
     <func>
-      <name>dec_pdu([byte()]) -> Pdu</name>
+      <name since="">dec_pdu([byte()]) -> Pdu</name>
       <fsummary>Decode an SNMP Pdu</fsummary>
       <type>
         <v>Pdu = #pdu</v>
@@ -94,7 +94,7 @@
       </desc>
     </func>
     <func>
-      <name>dec_scoped_pdu([byte()]) -> ScopedPdu</name>
+      <name since="">dec_scoped_pdu([byte()]) -> ScopedPdu</name>
       <fsummary>Decode an SNMP ScopedPdu</fsummary>
       <type>
         <v>ScopedPdu = #scoped_pdu</v>
@@ -104,7 +104,7 @@
       </desc>
     </func>
     <func>
-      <name>dec_scoped_pdu_data([byte()]) -> ScopedPduData</name>
+      <name since="">dec_scoped_pdu_data([byte()]) -> ScopedPduData</name>
       <fsummary>Decode an SNMP ScopedPduData</fsummary>
       <type>
         <v>ScopedPduData = #scoped_pdu | EncryptedPDU</v>
@@ -116,7 +116,7 @@
       </desc>
     </func>
     <func>
-      <name>dec_usm_security_parameters([byte()]) -> UsmSecParams</name>
+      <name since="">dec_usm_security_parameters([byte()]) -> UsmSecParams</name>
       <fsummary>Decode SNMP UsmSecurityParameters</fsummary>
       <type>
         <v>UsmSecParams = #usmSecurityParameters</v>
@@ -126,7 +126,7 @@
       </desc>
     </func>
     <func>
-      <name>enc_encrypted_scoped_pdu(EncryptedScopedPdu) -> [byte()]</name>
+      <name since="">enc_encrypted_scoped_pdu(EncryptedScopedPdu) -> [byte()]</name>
       <fsummary>Encode an encrypted SNMP scopedPDU</fsummary>
       <type>
         <v>EncryptedScopedPdu = [byte()]</v>
@@ -142,7 +142,7 @@
       </desc>
     </func>
     <func>
-      <name>enc_message(Message) -> [byte()]</name>
+      <name since="">enc_message(Message) -> [byte()]</name>
       <fsummary>Encode an SNMP Message</fsummary>
       <type>
         <v>Message = #message</v>
@@ -152,7 +152,7 @@
       </desc>
     </func>
     <func>
-      <name>enc_message_only(Message) -> [byte()]</name>
+      <name since="">enc_message_only(Message) -> [byte()]</name>
       <fsummary>Encode an SNMP Message, but not the data part</fsummary>
       <type>
         <v>Message = #message</v>
@@ -166,7 +166,7 @@
       </desc>
     </func>
     <func>
-      <name>enc_pdu(Pd) -> [byte()]</name>
+      <name since="">enc_pdu(Pd) -> [byte()]</name>
       <fsummary>Encode an SNMP Pdu</fsummary>
       <type>
         <v>Pdu = #pdu</v>
@@ -176,7 +176,7 @@
       </desc>
     </func>
     <func>
-      <name>enc_scoped_pdu(ScopedPdu) -> [byte()]</name>
+      <name since="">enc_scoped_pdu(ScopedPdu) -> [byte()]</name>
       <fsummary>Encode an SNMP scopedPDU</fsummary>
       <type>
         <v>ScopedPdu = #scoped_pdu</v>
@@ -190,7 +190,7 @@
       </desc>
     </func>
     <func>
-      <name>enc_usm_security_parameters(UsmSecParams) -> [byte()]</name>
+      <name since="">enc_usm_security_parameters(UsmSecParams) -> [byte()]</name>
       <fsummary>Encode SNMP UsmSecurityParameters</fsummary>
       <type>
         <v>UsmSecParams = #usmSecurityParameters</v>
diff --git a/lib/snmp/doc/src/snmp_standard_mib.xml b/lib/snmp/doc/src/snmp_standard_mib.xml
index 35efbba483..eb4e2fd097 100644
--- a/lib/snmp/doc/src/snmp_standard_mib.xml
+++ b/lib/snmp/doc/src/snmp_standard_mib.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmp_standard_mib.xml</file>
   </header>
-  <module>snmp_standard_mib</module>
+  <module since="">snmp_standard_mib</module>
   <modulesummary>Instrumentation Functions for STANDARD-MIB and SNMPv2-MIB</modulesummary>
   <description>
     <p>The module <c>snmp_standard_mib</c> implements the instrumentation functions for the
@@ -42,7 +42,7 @@
   </description>
   <funcs>
     <func>
-      <name>configure(ConfDir) -> void()</name>
+      <name since="">configure(ConfDir) -> void()</name>
       <fsummary>Configure the STANDARD-MIB and SNMPv2-MIB</fsummary>
       <type>
         <v>ConfDir = string()</v>
@@ -71,8 +71,8 @@
       </desc>
     </func>
     <func>
-      <name>inc(Name) -> void()</name>
-      <name>inc(Name, N) -> void()</name>
+      <name since="">inc(Name) -> void()</name>
+      <name since="">inc(Name, N) -> void()</name>
       <fsummary>Increment a variable in the MIB</fsummary>
       <type>
         <v>Name = atom()</v>
@@ -84,7 +84,7 @@
       </desc>
     </func>
     <func>
-      <name>reconfigure(ConfDir) -> void()</name>
+      <name since="">reconfigure(ConfDir) -> void()</name>
       <fsummary>Configure the STANDARD-MIB and SNMPv2-MIB</fsummary>
       <type>
         <v>ConfDir = string()</v>
@@ -114,14 +114,14 @@
       </desc>
     </func>
     <func>
-      <name>reset() -> void()</name>
+      <name since="">reset() -> void()</name>
       <fsummary>Reset all <c>snmp</c>counters to 0</fsummary>
       <desc>
         <p>Resets all <c>snmp</c> counters to 0.</p>
       </desc>
     </func>
     <func>
-      <name>sys_up_time() -> Time</name>
+      <name since="">sys_up_time() -> Time</name>
       <fsummary>Get the system up time</fsummary>
       <type>
         <v>Time = int()</v>
diff --git a/lib/snmp/doc/src/snmp_target_mib.xml b/lib/snmp/doc/src/snmp_target_mib.xml
index c3bcd3b4e3..c46edb810d 100644
--- a/lib/snmp/doc/src/snmp_target_mib.xml
+++ b/lib/snmp/doc/src/snmp_target_mib.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmp_target_mib.xml</file>
   </header>
-  <module>snmp_target_mib</module>
+  <module since="">snmp_target_mib</module>
   <modulesummary>Instrumentation Functions for SNMP-TARGET-MIB</modulesummary>
   <description>
     <p>The module <c>snmp_target_mib</c> implements the instrumentation
@@ -57,7 +57,7 @@
 
   <funcs>
     <func>
-      <name>configure(ConfDir) -> void()</name>
+      <name since="">configure(ConfDir) -> void()</name>
       <fsummary>Configure the SNMP-TARGET-MIB</fsummary>
       <type>
         <v>ConfDir = string()</v>
@@ -85,7 +85,7 @@
     </func>
 
     <func>
-      <name>reconfigure(ConfDir) -> void()</name>
+      <name since="">reconfigure(ConfDir) -> void()</name>
       <fsummary>Configure the SNMP-TARGET-MIB</fsummary>
       <type>
         <v>ConfDir = string()</v>
@@ -113,7 +113,7 @@
     </func>
 
     <func>
-      <name>set_target_engine_id(TargetAddrName, EngineId) -> boolean()</name>
+      <name since="">set_target_engine_id(TargetAddrName, EngineId) -> boolean()</name>
       <fsummary>Set the engine id for a targetAddr row.</fsummary>
       <type>
         <v>TargetAddrName = string()</v>
@@ -130,7 +130,7 @@
     </func>
 
     <func>
-      <name>add_addr(Name, Domain, Addr, Timeout, Retry, TagList, Params, EngineId, TMask, MMS) -> Ret</name>
+      <name since="">add_addr(Name, Domain, Addr, Timeout, Retry, TagList, Params, EngineId, TMask, MMS) -> Ret</name>
       <fsummary>Add one target address definition</fsummary>
       <type>
         <v>Name = string()</v>
@@ -156,7 +156,7 @@
     </func>
 
     <func>
-      <name>delete_addr(Key) -> Ret</name>
+      <name since="">delete_addr(Key) -> Ret</name>
       <fsummary>Delete one target address definition</fsummary>
       <type>
         <v>Key = term()</v>
@@ -171,7 +171,7 @@
     </func>
 
     <func>
-      <name>add_params(Name, MPModel, SecModel, SecName, SecLevel) -> Ret</name>
+      <name since="">add_params(Name, MPModel, SecModel, SecName, SecLevel) -> Ret</name>
       <fsummary>Add one target parameter definition</fsummary>
       <type>
         <v>Name = string()</v>
@@ -191,7 +191,7 @@
       </desc>
     </func>
     <func>
-      <name>delete_params(Key) -> Ret</name>
+      <name since="">delete_params(Key) -> Ret</name>
       <fsummary>Delete one target parameter definition</fsummary>
       <type>
         <v>Key = term()</v>
diff --git a/lib/snmp/doc/src/snmp_user_based_sm_mib.xml b/lib/snmp/doc/src/snmp_user_based_sm_mib.xml
index cc376ac118..6c2203ed22 100644
--- a/lib/snmp/doc/src/snmp_user_based_sm_mib.xml
+++ b/lib/snmp/doc/src/snmp_user_based_sm_mib.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmp_user_based_sm_mib.xml</file>
   </header>
-  <module>snmp_user_based_sm_mib</module>
+  <module since="">snmp_user_based_sm_mib</module>
   <modulesummary>Instrumentation Functions for SNMP-USER-BASED-SM-MIB</modulesummary>
   <description>
     <p>The module <c>snmp_user_based_sm_mib</c> implements the instrumentation 
@@ -43,7 +43,7 @@
   </description>
   <funcs>
     <func>
-      <name>configure(ConfDir) -> void()</name>
+      <name since="">configure(ConfDir) -> void()</name>
       <fsummary>Configure the SNMP-USER-BASED-SM-MIB</fsummary>
       <type>
         <v>ConfDir = string()</v>
@@ -72,7 +72,7 @@
       </desc>
     </func>
     <func>
-      <name>reconfigure(ConfDir) -> void()</name>
+      <name since="">reconfigure(ConfDir) -> void()</name>
       <fsummary>Configure the SNMP-USER-BASED-SM-MIB</fsummary>
       <type>
         <v>ConfDir = string()</v>
@@ -103,7 +103,7 @@
       </desc>
     </func>
     <func>
-      <name>add_user(EngineID, Name, SecName, Clone, AuthP, AuthKeyC, OwnAuthKeyC, PrivP, PrivKeyC, OwnPrivKeyC, Public, AuthKey, PrivKey) -> Ret</name>
+      <name since="">add_user(EngineID, Name, SecName, Clone, AuthP, AuthKeyC, OwnAuthKeyC, PrivP, PrivKeyC, OwnPrivKeyC, Public, AuthKey, PrivKey) -> Ret</name>
       <fsummary>Add one user</fsummary>
       <type>
         <v>EngineID = string()</v>
@@ -130,7 +130,7 @@
       </desc>
     </func>
     <func>
-      <name>delete_user(Key) -> Ret</name>
+      <name since="">delete_user(Key) -> Ret</name>
       <fsummary>Delete one user</fsummary>
       <type>
         <v>Key = term()</v>
diff --git a/lib/snmp/doc/src/snmp_view_based_acm_mib.xml b/lib/snmp/doc/src/snmp_view_based_acm_mib.xml
index fdad735e71..c5e98a3eb5 100644
--- a/lib/snmp/doc/src/snmp_view_based_acm_mib.xml
+++ b/lib/snmp/doc/src/snmp_view_based_acm_mib.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmp_view_based_acm_mib.xml</file>
   </header>
-  <module>snmp_view_based_acm_mib</module>
+  <module since="">snmp_view_based_acm_mib</module>
   <modulesummary>Instrumentation Functions for SNMP-VIEW-BASED-ACM-MIB</modulesummary>
   <description>
     <p>The module <c>snmp_view_based_acm_mib</c> implements the instrumentation functions for the
@@ -45,7 +45,7 @@
 
   <funcs>
     <func>
-      <name>configure(ConfDir) -> void()</name>
+      <name since="">configure(ConfDir) -> void()</name>
       <fsummary>Configure the SNMP-VIEW-BASED-ACM-MIB</fsummary>
       <type>
         <v>ConfDir = string()</v>
@@ -71,7 +71,7 @@
     </func>
 
     <func>
-      <name>reconfigure(ConfDir) -> void()</name>
+      <name since="">reconfigure(ConfDir) -> void()</name>
       <fsummary>Configure the SNMP-VIEW-BASED-ACM-MIB</fsummary>
       <type>
         <v>ConfDir = string()</v>
@@ -104,7 +104,7 @@
     </func>
 
     <func>
-      <name>add_sec2group(SecModel, SecName, GroupName) -> Ret</name>
+      <name since="">add_sec2group(SecModel, SecName, GroupName) -> Ret</name>
       <fsummary>Add one security to group definition</fsummary>
       <type>
         <v>SecModel = v1 | v2c | usm</v>
@@ -124,7 +124,7 @@
     </func>
 
     <func>
-      <name>delete_sec2group(Key) -> Ret</name>
+      <name since="">delete_sec2group(Key) -> Ret</name>
       <fsummary>Delete one security to group definition</fsummary>
       <type>
         <v>Key = term()</v>
@@ -139,7 +139,7 @@
     </func>
 
     <func>
-      <name>add_access(GroupName, Prefix, SecModel, SecLevel, Match, RV, WV, NV) -> Ret</name>
+      <name since="">add_access(GroupName, Prefix, SecModel, SecLevel, Match, RV, WV, NV) -> Ret</name>
       <fsummary>Add one access definition</fsummary>
       <type>
         <v>GroupName = string()</v>
@@ -163,7 +163,7 @@
     </func>
 
     <func>
-      <name>delete_access(Key) -> Ret</name>
+      <name since="">delete_access(Key) -> Ret</name>
       <fsummary>Delete one access definition</fsummary>
       <type>
         <v>Key = term()</v>
@@ -178,7 +178,7 @@
     </func>
 
     <func>
-      <name>add_view_tree_fam(ViewIndex, SubTree, Status, Mask) -> Ret</name>
+      <name since="">add_view_tree_fam(ViewIndex, SubTree, Status, Mask) -> Ret</name>
       <fsummary>Add one view tree family definition</fsummary>
       <type>
         <v>ViewIndex = integer()</v>
@@ -199,7 +199,7 @@
     </func>
 
     <func>
-      <name>delete_view_tree_fam(Key) -> Ret</name>
+      <name since="">delete_view_tree_fam(Key) -> Ret</name>
       <fsummary>Delete one view tree family definition</fsummary>
       <type>
         <v>Key = term()</v>
diff --git a/lib/snmp/doc/src/snmpa.xml b/lib/snmp/doc/src/snmpa.xml
index b78f14da01..dc2f4e6d66 100644
--- a/lib/snmp/doc/src/snmpa.xml
+++ b/lib/snmp/doc/src/snmpa.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmpa.xml</file>
   </header>
-  <module>snmpa</module>
+  <module since="">snmpa</module>
   <modulesummary>Interface Functions to the SNMP toolkit agent</modulesummary>
   <description>
     <p>The module <c>snmpa</c> contains interface functions to the 
@@ -77,7 +77,7 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
 
   <funcs>
     <func>
-      <name>add_agent_caps(SysORID, SysORDescr) -> SysORIndex</name>
+      <name since="">add_agent_caps(SysORID, SysORDescr) -> SysORIndex</name>
       <fsummary>Add an AGENT-CAPABILITY definition to the agent</fsummary>
       <type>
         <v>SysORID = oid()</v>
@@ -93,7 +93,7 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>del_agent_caps(SysORIndex) -> void()</name>
+      <name since="">del_agent_caps(SysORIndex) -> void()</name>
       <fsummary>Delete an AGENT-CAPABILITY definition from the agent</fsummary>
       <type>
         <v>SysORIndex = integer()</v>
@@ -108,7 +108,7 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>get_agent_caps() -> [[SysORIndex, SysORID, SysORDescr, SysORUpTime]]</name>
+      <name since="">get_agent_caps() -> [[SysORIndex, SysORID, SysORDescr, SysORUpTime]]</name>
       <fsummary>Return all AGENT-CAPABILITY definitions in the agent</fsummary>
       <type>
         <v>SysORIndex = integer()</v>
@@ -125,8 +125,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>get(Agent, Vars) -> Values | {error, Reason}</name>
-      <name>get(Agent, Vars, Context) -> Values | {error, Reason}</name>
+      <name since="">get(Agent, Vars) -> Values | {error, Reason}</name>
+      <name since="">get(Agent, Vars, Context) -> Values | {error, Reason}</name>
       <fsummary>Perform a get operation on the agent</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -150,8 +150,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>get_next(Agent, Vars) -> Values | {error, Reason}</name>
-      <name>get_next(Agent, Vars, Context) -> Values | {error, Reason}</name>
+      <name since="">get_next(Agent, Vars) -> Values | {error, Reason}</name>
+      <name since="">get_next(Agent, Vars, Context) -> Values | {error, Reason}</name>
       <fsummary>Perform a get-next operation on the agent</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -176,7 +176,7 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
 
 <!--
     <func>
-      <name>get_symbolic_store_db() -> Db</name>
+      <name since="">get_symbolic_store_db() -> Db</name>
       <fsummary>Retrieve the symbolic store database reference</fsummary>
       <type>
         <v>Db = term()</v>
@@ -193,8 +193,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
 
 -->
     <func>
-      <name>backup(BackupDir) -> ok | {error, Reason}</name>
-      <name>backup(Agent, BackupDir) -> ok | {error, Reason}</name>
+      <name since="">backup(BackupDir) -> ok | {error, Reason}</name>
+      <name since="">backup(Agent, BackupDir) -> ok | {error, Reason}</name>
       <fsummary>Backup agent data</fsummary>
       <type>
         <v>BackupDir = string()</v>
@@ -216,8 +216,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
       </desc>
     </func>
     <func>
-      <name>info() -> [{Key, Value}]</name>
-      <name>info(Agent) -> [{Key, Value}]</name>
+      <name since="">info() -> [{Key, Value}]</name>
+      <name since="">info(Agent) -> [{Key, Value}]</name>
       <fsummary>Return information about the agent</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -236,7 +236,7 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>old_info_format(NewInfo) -> OldInfo</name>
+      <name since="">old_info_format(NewInfo) -> OldInfo</name>
       <fsummary>Return information about the agent</fsummary>
       <type>
         <v>OldInfo = NewInfo = [{Key, Value}]</v>
@@ -251,8 +251,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>load_mib(Mib) -> ok | {error, Reason}</name>
-      <name>load_mib(Agent, Mib) -> ok | {error, Reason}</name>
+      <name since="OTP R16B02">load_mib(Mib) -> ok | {error, Reason}</name>
+      <name since="OTP R16B02">load_mib(Agent, Mib) -> ok | {error, Reason}</name>
       <fsummary>Load single MIB into the agent</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -273,10 +273,10 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>load_mibs(Mibs) -> ok | {error, Reason}</name>
-      <name>load_mibs(Mibs, Force) -> ok | {error, Reason}</name>
-      <name>load_mibs(Agent, Mibs) -> ok | {error, Reason}</name>
-      <name>load_mibs(Agent, Mibs, Force) -> ok | {error, Reason}</name>
+      <name since="">load_mibs(Mibs) -> ok | {error, Reason}</name>
+      <name since="">load_mibs(Mibs, Force) -> ok | {error, Reason}</name>
+      <name since="">load_mibs(Agent, Mibs) -> ok | {error, Reason}</name>
+      <name since="OTP R16B02">load_mibs(Agent, Mibs, Force) -> ok | {error, Reason}</name>
       <fsummary>Load MIBs into the agent</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -305,8 +305,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>unload_mib(Mib) -> ok | {error, Reason}</name>
-      <name>unload_mib(Agent, Mib) -> ok | {error, Reason}</name>
+      <name since="OTP R16B02">unload_mib(Mib) -> ok | {error, Reason}</name>
+      <name since="OTP R16B02">unload_mib(Agent, Mib) -> ok | {error, Reason}</name>
       <fsummary>Unload single MIB from the agent</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -321,10 +321,10 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>unload_mibs(Mibs) -> ok | {error, Reason}</name>
-      <name>unload_mibs(Mibs, Force) -> ok | {error, Reason}</name>
-      <name>unload_mibs(Agent, Mibs) -> ok | {error, Reason}</name>
-      <name>unload_mibs(Agent, Mibs, Force) -> ok | {error, Reason}</name>
+      <name since="">unload_mibs(Mibs) -> ok | {error, Reason}</name>
+      <name since="">unload_mibs(Mibs, Force) -> ok | {error, Reason}</name>
+      <name since="">unload_mibs(Agent, Mibs) -> ok | {error, Reason}</name>
+      <name since="OTP R16B02">unload_mibs(Agent, Mibs, Force) -> ok | {error, Reason}</name>
       <fsummary>Unload MIBs from the agent</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -347,8 +347,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>which_mibs() -> Mibs</name>
-      <name>which_mibs(Agent) -> Mibs</name>
+      <name since="">which_mibs() -> Mibs</name>
+      <name since="">which_mibs(Agent) -> Mibs</name>
       <fsummary>Get a list of all the loaded mibs</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -365,8 +365,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>whereis_mib(MibName) -> {ok, MibFile} | {error, Reason}</name>
-      <name>whereis_mib(Agent, MibName) -> {ok, MibFile} | {error, Reason}</name>
+      <name since="">whereis_mib(MibName) -> {ok, MibFile} | {error, Reason}</name>
+      <name since="">whereis_mib(Agent, MibName) -> {ok, MibFile} | {error, Reason}</name>
       <fsummary>Get the path to the mib file</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -385,10 +385,10 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>current_request_id() -> {value, RequestId} | false</name>
-      <name>current_context() -> {value, Context} | false</name>
-      <name>current_community() -> {value, Community} | false</name>
-      <name>current_address() -> {value, Address} | false</name>
+      <name since="">current_request_id() -> {value, RequestId} | false</name>
+      <name since="">current_context() -> {value, Context} | false</name>
+      <name since="">current_community() -> {value, Community} | false</name>
+      <name since="">current_address() -> {value, Address} | false</name>
       <fsummary>Get the request-id, context, community and address of the current request</fsummary>
       <type>
         <v>RequestId = integer()</v>
@@ -409,8 +409,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>enum_to_int(Name, Enum) -> {value, Int} | false</name>
-      <name>enum_to_int(Db, Name, Enum) -> {value, Int} | false</name>
+      <name since="">enum_to_int(Name, Enum) -> {value, Int} | false</name>
+      <name since="">enum_to_int(Db, Name, Enum) -> {value, Int} | false</name>
       <fsummary>Convert an enum value to an integer</fsummary>
       <type>
         <v>Db   = term()</v>
@@ -435,8 +435,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>int_to_enum(Name, Int) -> {value, Enum} | false</name>
-      <name>int_to_enum(Db, Name, Int) -> {value, Enum} | false</name>
+      <name since="">int_to_enum(Name, Int) -> {value, Enum} | false</name>
+      <name since="">int_to_enum(Db, Name, Int) -> {value, Enum} | false</name>
       <fsummary>Convert an integer to an enum value</fsummary>
       <type>
         <v>Db   = term()</v>
@@ -461,8 +461,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>name_to_oid(Name) -> {value, oid()} | false</name>
-      <name>name_to_oid(Db, Name) -> {value, oid()} | false</name>
+      <name since="">name_to_oid(Name) -> {value, oid()} | false</name>
+      <name since="">name_to_oid(Db, Name) -> {value, oid()} | false</name>
       <fsummary>Convert a symbolic name to an OID</fsummary>
       <type>
         <v>Db   = term()</v>
@@ -482,8 +482,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>oid_to_name(OID) -> {value, Name} | false</name>
-      <name>oid_to_name(Db, OID) -> {value, Name} | false</name>
+      <name since="">oid_to_name(OID) -> {value, Name} | false</name>
+      <name since="">oid_to_name(Db, OID) -> {value, Name} | false</name>
       <fsummary>Convert an OID to a symbolic name</fsummary>
       <type>
         <v>Db   = term()</v>
@@ -503,7 +503,7 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>which_aliasnames() -> Result</name>
+      <name since="">which_aliasnames() -> Result</name>
       <fsummary>Get all alias-names known to the agent</fsummary>
       <type>
         <v>Result = [atom()]</v>
@@ -515,7 +515,7 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>which_tables() -> Result</name>
+      <name since="">which_tables() -> Result</name>
       <fsummary>Get all tables known to the agent</fsummary>
       <type>
         <v>Result = [atom()]</v>
@@ -528,7 +528,7 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>which_variables() -> Result</name>
+      <name since="">which_variables() -> Result</name>
       <fsummary>Get all variables known to the agent</fsummary>
       <type>
         <v>Result = [atom()]</v>
@@ -541,7 +541,7 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>which_notifications() -> Result</name>
+      <name since="">which_notifications() -> Result</name>
       <fsummary>Get all notifications known to the agent</fsummary>
       <type>
         <v>Result = [{Name, MibName, Info}]</v>
@@ -557,15 +557,15 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>log_to_txt(LogDir)</name>
-      <name>log_to_txt(LogDir, Block | Mibs)</name>
-      <name>log_to_txt(LogDir, Mibs, Block | OutFile) -> ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, Block | LogName) ->  ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, Block | LogFile) ->  ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block | Start) ->  ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start)  -> ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop)  -> ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop)  -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="OTP R15B01">log_to_txt(LogDir)</name>
+      <name since="">log_to_txt(LogDir, Block | Mibs)</name>
+      <name since="">log_to_txt(LogDir, Mibs, Block | OutFile) -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="">log_to_txt(LogDir, Mibs, OutFile, Block | LogName) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="">log_to_txt(LogDir, Mibs, OutFile, LogName, Block | LogFile) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="">log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block | Start) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="">log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start)  -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="">log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop)  -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="OTP R16B03">log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop)  -> ok | {ok, Cnt} | {error, Reason}</name>
       <fsummary>Convert an Audit Trail Log to text format</fsummary>
       <type>
         <v>LogDir = string()</v>
@@ -600,14 +600,14 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>log_to_io(LogDir) ->  ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_io(LogDir, Block | Mibs) ->  ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, Block | LogName) ->  ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, Block | LogFile) -> ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block | Start) -> ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start) -> ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop) -> ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop) -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="OTP R15B01">log_to_io(LogDir) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="OTP R15B01">log_to_io(LogDir, Block | Mibs) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="OTP R15B01">log_to_io(LogDir, Mibs, Block | LogName) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="OTP R15B01">log_to_io(LogDir, Mibs, LogName, Block | LogFile) -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="OTP R15B01">log_to_io(LogDir, Mibs, LogName, LogFile, Block | Start) -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="OTP R15B01">log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start) -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="OTP R15B01">log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop) -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="OTP R16B03">log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop) -> ok | {ok, Cnt} | {error, Reason}</name>
       <fsummary>Convert an Audit Trail Log to text format</fsummary>
       <type>
         <v>LogDir = string()</v>
@@ -641,7 +641,7 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>change_log_size(NewSize) -> ok | {error, Reason}</name>
+      <name since="">change_log_size(NewSize) -> ok | {error, Reason}</name>
       <fsummary>Change the size of the Audit Trail Log</fsummary>
       <type>
         <v>NewSize = {MaxBytes, MaxFiles}</v>
@@ -662,8 +662,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>set_log_type(NewType) -> {ok, OldType} | {error, Reason}</name>
-      <name>set_log_type(Agent, NewType) -> {ok, OldType} | {error, Reason}</name>
+      <name since="">set_log_type(NewType) -> {ok, OldType} | {error, Reason}</name>
+      <name since="">set_log_type(Agent, NewType) -> {ok, OldType} | {error, Reason}</name>
       <fsummary>Change the type of the Audit Trail Log</fsummary>
       <type>
         <v>NewType = OldType = atl_type()</v>
@@ -684,8 +684,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>mib_of(Oid) -> {ok, MibName} | {error, Reason}</name>
-      <name>mib_of(Agent, Oid) -> {ok, MibName} | {error, Reason}</name>
+      <name since="">mib_of(Oid) -> {ok, MibName} | {error, Reason}</name>
+      <name since="">mib_of(Agent, Oid) -> {ok, MibName} | {error, Reason}</name>
       <fsummary>Which mib an Oid belongs to</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -704,8 +704,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>me_of(Oid) -> {ok, Me} | {error, Reason}</name>
-      <name>me_of(Agent, Oid) -> {ok, Me} | {error, Reason}</name>
+      <name since="">me_of(Oid) -> {ok, Me} | {error, Reason}</name>
+      <name since="">me_of(Agent, Oid) -> {ok, Me} | {error, Reason}</name>
       <fsummary>Retrieve the mib-entry of an Oid</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -724,8 +724,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>invalidate_mibs_cache() -> void()</name>
-      <name>invalidate_mibs_cache(Agent) -> void()</name>
+      <name since="">invalidate_mibs_cache() -> void()</name>
+      <name since="">invalidate_mibs_cache(Agent) -> void()</name>
       <fsummary>Invalidate the mib server cache</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -739,8 +739,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>enable_mibs_cache() -> void()</name>
-      <name>enable_mibs_cache(Agent) -> void()</name>
+      <name since="">enable_mibs_cache() -> void()</name>
+      <name since="">enable_mibs_cache(Agent) -> void()</name>
       <fsummary>Enable the mib server cache</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -753,8 +753,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>disable_mibs_cache() -> void()</name>
-      <name>disable_mibs_cache(Agent) -> void()</name>
+      <name since="">disable_mibs_cache() -> void()</name>
+      <name since="">disable_mibs_cache(Agent) -> void()</name>
       <fsummary>Disable the mib server cache</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -767,8 +767,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>which_mibs_cache_size() -> void()</name>
-      <name>which_mibs_cache_size(Agent) -> void()</name>
+      <name since="OTP R14B">which_mibs_cache_size() -> void()</name>
+      <name since="OTP R14B">which_mibs_cache_size(Agent) -> void()</name>
       <fsummary>The size of the mib server cache</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -781,12 +781,12 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>gc_mibs_cache() -> {ok, NumElementsGCed} | {error, Reason}</name>
-      <name>gc_mibs_cache(Agent) -> {ok, NumElementsGCed} | {error, Reason}</name>
-      <name>gc_mibs_cache(Age) -> {ok, NumElementsGCed} | {error, Reason}</name>
-      <name>gc_mibs_cache(Agent, Age) -> {ok, NumElementsGCed} | {error, Reason}</name>
-      <name>gc_mibs_cache(Age, GcLimit) -> {ok, NumElementsGCed} | {error, Reason}</name>
-      <name>gc_mibs_cache(Agent, Age, GcLimit) -> {ok, NumElementsGCed} | {error, Reason}</name>
+      <name since="">gc_mibs_cache() -> {ok, NumElementsGCed} | {error, Reason}</name>
+      <name since="">gc_mibs_cache(Agent) -> {ok, NumElementsGCed} | {error, Reason}</name>
+      <name since="">gc_mibs_cache(Age) -> {ok, NumElementsGCed} | {error, Reason}</name>
+      <name since="">gc_mibs_cache(Agent, Age) -> {ok, NumElementsGCed} | {error, Reason}</name>
+      <name since="">gc_mibs_cache(Age, GcLimit) -> {ok, NumElementsGCed} | {error, Reason}</name>
+      <name since="">gc_mibs_cache(Agent, Age, GcLimit) -> {ok, NumElementsGCed} | {error, Reason}</name>
       <fsummary>Perform mib server cache gc</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -808,8 +808,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>enable_mibs_cache_autogc() -> void()</name>
-      <name>enable_mibs_cache_autogc(Agent) -> void()</name>
+      <name since="">enable_mibs_cache_autogc() -> void()</name>
+      <name since="">enable_mibs_cache_autogc(Agent) -> void()</name>
       <fsummary>Enable automatic gc of the mib server cache</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -822,8 +822,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>disable_mibs_cache_autogc() -> void()</name>
-      <name>disable_mibs_cache_autogc(Agent) -> void()</name>
+      <name since="">disable_mibs_cache_autogc() -> void()</name>
+      <name since="">disable_mibs_cache_autogc(Agent) -> void()</name>
       <fsummary>Disable automatic gc of the mib server cache</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -836,8 +836,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>update_mibs_cache_age(NewAge) -> ok | {error, Reason}</name>
-      <name>update_mibs_cache_age(Agent, NewAge) -> ok | {error, Reason}</name>
+      <name since="">update_mibs_cache_age(NewAge) -> ok | {error, Reason}</name>
+      <name since="">update_mibs_cache_age(Agent, NewAge) -> ok | {error, Reason}</name>
       <fsummary>Change the mib server cache age property</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -852,8 +852,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>update_mibs_cache_gclimit(NewGcLimit) -> ok | {error, Reason}</name>
-      <name>update_mibs_cache_gclimit(Agent, NewGCLimit) -> ok | {error, Reason}</name>
+      <name since="">update_mibs_cache_gclimit(NewGcLimit) -> ok | {error, Reason}</name>
+      <name since="">update_mibs_cache_gclimit(Agent, NewGCLimit) -> ok | {error, Reason}</name>
       <fsummary>Change the mib server cache gclimit property</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -869,10 +869,10 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
 
 
     <func>
-      <name>register_notification_filter(Id, Mod, Data) -> ok | {error, Reason}</name>
-      <name>register_notification_filter(Agent, Id, Mod, Data) -> ok | {error, Reason}</name>
-      <name>register_notification_filter(Id, Mod, Data, Where) -> ok | {error, Reason}</name>
-      <name>register_notification_filter(Agent, Id, Mod, Data, Where) -> ok | {error, Reason}</name>
+      <name since="">register_notification_filter(Id, Mod, Data) -> ok | {error, Reason}</name>
+      <name since="">register_notification_filter(Agent, Id, Mod, Data) -> ok | {error, Reason}</name>
+      <name since="">register_notification_filter(Id, Mod, Data, Where) -> ok | {error, Reason}</name>
+      <name since="">register_notification_filter(Agent, Id, Mod, Data, Where) -> ok | {error, Reason}</name>
       <fsummary>Register a notification filter</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -897,8 +897,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>unregister_notification_filter(Id) -> ok | {error, Reason}</name>
-      <name>unregister_notification_filter(Agent, Id) -> ok | {error, Reason}</name>
+      <name since="">unregister_notification_filter(Id) -> ok | {error, Reason}</name>
+      <name since="">unregister_notification_filter(Agent, Id) -> ok | {error, Reason}</name>
       <fsummary>Unregister a notification filter</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -913,8 +913,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>which_notification_filter() -> Filters</name>
-      <name>which_notification_filter(Agent) -> Filters</name>
+      <name since="">which_notification_filter() -> Filters</name>
+      <name since="">which_notification_filter(Agent) -> Filters</name>
       <fsummary>Which notification filter</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -929,8 +929,8 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
    <func>
-      <name>set_request_limit(NewLimit) -> {ok, OldLimit} | {error, Reason}</name>
-      <name>set_request_limit(Agent, NewLimit) -> {ok, OldLimit} | {error, Reason}</name>
+      <name since="">set_request_limit(NewLimit) -> {ok, OldLimit} | {error, Reason}</name>
+      <name since="">set_request_limit(Agent, NewLimit) -> {ok, OldLimit} | {error, Reason}</name>
       <fsummary>Change the request limit</fsummary>
       <type>
         <v>NewLimit = OldLimit = infinity | integer() >= 0</v>
@@ -950,7 +950,7 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
     </func>
 
     <func>
-      <name>register_subagent(Agent, SubTreeOid, Subagent) -> ok | {error, Reason}</name>
+      <name since="">register_subagent(Agent, SubTreeOid, Subagent) -> ok | {error, Reason}</name>
       <fsummary>Register a sub-agent under a sub-tree</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -975,7 +975,7 @@ snmp_agent:register_subagent(SA1,[1,2,3], SA2).
     </func>
 
     <func>
-      <name>unregister_subagent(Agent, SubagentOidOrPid) -> ok | {ok, SubAgentPid} | {error, Reason}</name>
+      <name since="">unregister_subagent(Agent, SubagentOidOrPid) -> ok | {ok, SubAgentPid} | {error, Reason}</name>
       <fsummary>Unregister a sub-agent</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -992,7 +992,7 @@ snmp_agent:register_subagent(SA1,[1,2,3], SA2).
 
 
     <func>
-      <name>send_notification2(Agent, Notification, SendOpts) -> void()</name>
+      <name since="OTP R14B03">send_notification2(Agent, Notification, SendOpts) -> void()</name>
       <fsummary>Send notification</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -1119,11 +1119,11 @@ snmp_agent:register_subagent(SA1,[1,2,3], SA2).
 
 
     <func>
-      <name>send_notification(Agent, Notification, Receiver)</name>
-      <name>send_notification(Agent, Notification, Receiver, Varbinds)</name>
-      <name>send_notification(Agent, Notification, Receiver, NotifyName, Varbinds)</name>
-      <name>send_notification(Agent, Notification, Receiver, NotifyName, ContextName, Varbinds) -> void() </name>
-      <name>send_notification(Agent, Notification, Receiver, NotifyName, ContextName, Varbinds, LocalEngineID) -> void() </name>
+      <name since="">send_notification(Agent, Notification, Receiver)</name>
+      <name since="">send_notification(Agent, Notification, Receiver, Varbinds)</name>
+      <name since="">send_notification(Agent, Notification, Receiver, NotifyName, Varbinds)</name>
+      <name since="">send_notification(Agent, Notification, Receiver, NotifyName, ContextName, Varbinds) -> void() </name>
+      <name since="OTP R14B">send_notification(Agent, Notification, Receiver, NotifyName, ContextName, Varbinds, LocalEngineID) -> void() </name>
       <fsummary>Send a notification</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -1324,13 +1324,13 @@ snmp_agent:register_subagent(SA1,[1,2,3], SA2).
 
 
     <func>
-      <name>discovery(TargetName, Notification) -> {ok, ManagerEngineID} | {error, Reason}</name>
-      <name>discovery(TargetName, Notification, Varbinds) -> {ok, ManagerEngineID} | {error, Reason}</name>
-      <name>discovery(TargetName, Notification, DiscoHandler) -> {ok, ManagerEngineID} | {error, Reason}</name>
-      <name>discovery(TargetName, Notification, ContextName, Varbinds) -> {ok, ManagerEngineID} | {error, Reason}</name>
-      <name>discovery(TargetName, Notification, Varbinds, DiscoHandler) -> {ok, ManagerEngineID} | {error, Reason}</name>
-      <name>discovery(TargetName, Notification, ContextName, Varbinds, DiscoHandler) -> {ok, ManagerEngineID} | {error, Reason}</name>
-      <name>discovery(TargetName, Notification, ContextName, Varbinds, DiscoHandler, ExtraInfo) -> {ok, ManagerEngineID} | {error, Reason}</name>
+      <name since="">discovery(TargetName, Notification) -> {ok, ManagerEngineID} | {error, Reason}</name>
+      <name since="">discovery(TargetName, Notification, Varbinds) -> {ok, ManagerEngineID} | {error, Reason}</name>
+      <name since="">discovery(TargetName, Notification, DiscoHandler) -> {ok, ManagerEngineID} | {error, Reason}</name>
+      <name since="">discovery(TargetName, Notification, ContextName, Varbinds) -> {ok, ManagerEngineID} | {error, Reason}</name>
+      <name since="">discovery(TargetName, Notification, Varbinds, DiscoHandler) -> {ok, ManagerEngineID} | {error, Reason}</name>
+      <name since="">discovery(TargetName, Notification, ContextName, Varbinds, DiscoHandler) -> {ok, ManagerEngineID} | {error, Reason}</name>
+      <name since="">discovery(TargetName, Notification, ContextName, Varbinds, DiscoHandler, ExtraInfo) -> {ok, ManagerEngineID} | {error, Reason}</name>
       <fsummary>Initiate the discovery process with a manager</fsummary>
       <type>
         <v>TargetName = string()</v>
@@ -1379,7 +1379,7 @@ snmp_agent:register_subagent(SA1,[1,2,3], SA2).
     </func>
 
     <func>
-      <name>convert_config(OldConfig) -> AgentConfig</name>
+      <name since="">convert_config(OldConfig) -> AgentConfig</name>
       <fsummary>Convert old snmp config to new agent config</fsummary>
       <type>
         <v>OldConfig = list()</v>
@@ -1403,8 +1403,8 @@ snmp_agent:register_subagent(SA1,[1,2,3], SA2).
     </func>
 
     <func>
-      <name>restart_worker() -> void()</name>
-      <name>restart_worker(Agent) -> void()</name>
+      <name since="">restart_worker() -> void()</name>
+      <name since="">restart_worker(Agent) -> void()</name>
       <fsummary>Restart the worker process of a multi-threaded agent</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -1419,8 +1419,8 @@ snmp_agent:register_subagent(SA1,[1,2,3], SA2).
     </func>
 
     <func>
-      <name>restart_set_worker() -> void()</name>
-      <name>restart_set_worker(Agent) -> void()</name>
+      <name since="">restart_set_worker() -> void()</name>
+      <name since="">restart_set_worker(Agent) -> void()</name>
       <fsummary>Restart the set worker process of a multi-threaded agent</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
@@ -1435,7 +1435,7 @@ snmp_agent:register_subagent(SA1,[1,2,3], SA2).
     </func>
 
     <func>
-      <name>print_mib_info() -> void()</name>
+      <name since="OTP R14B02">print_mib_info() -> void()</name>
       <fsummary>Print mib info</fsummary>
       <desc>
         <p>Prints the content of all the (snmp) tables and variables 
@@ -1446,7 +1446,7 @@ snmp_agent:register_subagent(SA1,[1,2,3], SA2).
     </func>
 
     <func>
-      <name>print_mib_tables() -> void()</name>
+      <name since="OTP R14B02">print_mib_tables() -> void()</name>
       <fsummary>Print mib tables</fsummary>
       <desc>
         <p>Prints the content of all the (snmp) tables 
@@ -1457,7 +1457,7 @@ snmp_agent:register_subagent(SA1,[1,2,3], SA2).
     </func>
 
     <func>
-      <name>print_mib_variables() -> void()</name>
+      <name since="OTP R14B02">print_mib_variables() -> void()</name>
       <fsummary>Print mib variables</fsummary>
       <desc>
         <p>Prints the content of all the (snmp) variables 
@@ -1468,7 +1468,7 @@ snmp_agent:register_subagent(SA1,[1,2,3], SA2).
     </func>
 
     <func>
-      <name>verbosity(Ref,Verbosity) -> void()</name>
+      <name since="">verbosity(Ref,Verbosity) -> void()</name>
       <fsummary>Assign a new verbosity for the process</fsummary>
       <type>
         <v>Ref = pid() | sub_agents | master_agent | net_if | mib_server | symbolic_store | note_store | local_db</v>
diff --git a/lib/snmp/doc/src/snmpa_conf.xml b/lib/snmp/doc/src/snmpa_conf.xml
index 503e44a6a2..4134a81c0c 100644
--- a/lib/snmp/doc/src/snmpa_conf.xml
+++ b/lib/snmp/doc/src/snmpa_conf.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmpa_conf.xml</file>
   </header>
-  <module>snmpa_conf</module>
+  <module since="">snmpa_conf</module>
   <modulesummary>Utility functions for handling the agent config files.</modulesummary>
   <description>
     <p>The module <c>snmpa_conf</c> contains various utility functions to 
@@ -92,7 +92,7 @@ word() = 0..65535
 
   <funcs>
     <func>
-      <name>agent_entry(Tag, Val) -> agent_entry()</name>
+      <name since="">agent_entry(Tag, Val) -> agent_entry()</name>
       <fsummary>Create an agent entry</fsummary>
       <type>
         <v>Tag = intAgentTransports | intAgentUDPPort | intAgentMaxPacketSize | snmpEngineMaxMessageSize | snmpEngineID</v>
@@ -111,8 +111,8 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>write_agent_config(Dir, Conf) -> ok</name>
-      <name>write_agent_config(Dir, Hdr, Conf) -> ok</name>
+      <name since="">write_agent_config(Dir, Conf) -> ok</name>
+      <name since="">write_agent_config(Dir, Hdr, Conf) -> ok</name>
       <fsummary>Write the agent config to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -134,7 +134,7 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>append_agent_config(Dir, Conf) -> ok</name>
+      <name since="">append_agent_config(Dir, Conf) -> ok</name>
       <fsummary>Append the agent config to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -153,7 +153,7 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>read_agent_config(Dir) -> Conf</name>
+      <name since="">read_agent_config(Dir) -> Conf</name>
       <fsummary>Read the agent config from the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -172,7 +172,7 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>standard_entry(Tag, Val) -> standard_entry()</name>
+      <name since="">standard_entry(Tag, Val) -> standard_entry()</name>
       <fsummary>Create an standard entry</fsummary>
       <type>
         <v>Tag = sysDescr | sysObjectID | sysContact | sysName | sysLocation | sysServices | snmpEnableAuthenTraps</v>
@@ -192,8 +192,8 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>write_standard_config(Dir, Conf) -> ok</name>
-      <name>write_standard_config(Dir, Hdr, Conf) -> ok</name>
+      <name since="">write_standard_config(Dir, Conf) -> ok</name>
+      <name since="">write_standard_config(Dir, Hdr, Conf) -> ok</name>
       <fsummary>Write the agent standard config to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -216,7 +216,7 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>append_standard_config(Dir, Conf) -> ok</name>
+      <name since="">append_standard_config(Dir, Conf) -> ok</name>
       <fsummary>Append the agent standard config to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -236,7 +236,7 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>read_standard_config(Dir) -> Conf</name>
+      <name since="">read_standard_config(Dir) -> Conf</name>
       <fsummary>Read the agent standard config from the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -255,7 +255,7 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>context_entry(Context) -> context_entry()</name>
+      <name since="">context_entry(Context) -> context_entry()</name>
       <fsummary>Create an context entry</fsummary>
       <type>
         <v>Context = string()</v>
@@ -273,8 +273,8 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>write_context_config(Dir, Conf) -> ok</name>
-      <name>write_context_config(Dir, Hdr, Conf) -> ok</name>
+      <name since="">write_context_config(Dir, Conf) -> ok</name>
+      <name since="">write_context_config(Dir, Hdr, Conf) -> ok</name>
       <fsummary>Write the agent context(s) to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -297,7 +297,7 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>append_context_config(Dir, Conf) -> ok</name>
+      <name since="">append_context_config(Dir, Conf) -> ok</name>
       <fsummary>Append the agent context(s) to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -317,7 +317,7 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>read_context_config(Dir) -> Conf</name>
+      <name since="">read_context_config(Dir) -> Conf</name>
       <fsummary>Read the agent context config from the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -336,8 +336,8 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>community_entry(CommunityIndex) -> community_entry()</name>
-      <name>community_entry(CommunityIndex, CommunityName, SecName, ContextName, TransportTag) -> community_entry()</name>
+      <name since="">community_entry(CommunityIndex) -> community_entry()</name>
+      <name since="">community_entry(CommunityIndex, CommunityName, SecName, ContextName, TransportTag) -> community_entry()</name>
       <fsummary>Create an community entry</fsummary>
       <type>
         <v>CommunityIndex = string()</v>
@@ -364,8 +364,8 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>write_community_config(Dir, Conf) -> ok</name>
-      <name>write_community_config(Dir, Hdr, Conf) -> ok</name>
+      <name since="">write_community_config(Dir, Conf) -> ok</name>
+      <name since="">write_community_config(Dir, Hdr, Conf) -> ok</name>
       <fsummary>Write the agent community config to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -388,7 +388,7 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>append_community_config(Dir, Conf) -> ok</name>
+      <name since="">append_community_config(Dir, Conf) -> ok</name>
       <fsummary>Append the agent community config to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -408,7 +408,7 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>read_community_config(Dir) -> Conf</name>
+      <name since="">read_community_config(Dir) -> Conf</name>
       <fsummary>Read the agent community config from the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -427,10 +427,10 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>target_addr_entry(Name, Domain, Addr, TagList, ParamsName, EngineId) -> target_addr_entry()</name>
-      <name>target_addr_entry(Name, Domain, Addr, TagList, ParamsName, EngineId, TMask) -> target_addr_entry()</name>
-      <name>target_addr_entry(Name, Domain, Addr, TagList, ParamsName, EngineId, TMask, MaxMessageSize) -> target_addr_entry()</name>
-      <name>target_addr_entry(Name, Domain, Addr, Timeout, RetryCount, TagList, ParamsName, EngineId, TMask, MaxMessageSize) -> target_addr_entry()</name>
+      <name since="">target_addr_entry(Name, Domain, Addr, TagList, ParamsName, EngineId) -> target_addr_entry()</name>
+      <name since="OTP 17.3">target_addr_entry(Name, Domain, Addr, TagList, ParamsName, EngineId, TMask) -> target_addr_entry()</name>
+      <name since="">target_addr_entry(Name, Domain, Addr, TagList, ParamsName, EngineId, TMask, MaxMessageSize) -> target_addr_entry()</name>
+      <name since="">target_addr_entry(Name, Domain, Addr, Timeout, RetryCount, TagList, ParamsName, EngineId, TMask, MaxMessageSize) -> target_addr_entry()</name>
       <fsummary>Create an target_addr entry</fsummary>
       <type>
         <v>Name = string()</v>
@@ -464,8 +464,8 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>write_target_addr_config(Dir, Conf) -> ok</name>
-      <name>write_target_addr_config(Dir, Hdr, Conf) -> ok</name>
+      <name since="">write_target_addr_config(Dir, Conf) -> ok</name>
+      <name since="">write_target_addr_config(Dir, Hdr, Conf) -> ok</name>
       <fsummary>Write the agent target_addr config to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -488,7 +488,7 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>append_target_addr_config(Dir, Conf) -> ok</name>
+      <name since="">append_target_addr_config(Dir, Conf) -> ok</name>
       <fsummary>Append the agent target_addr config to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -508,7 +508,7 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>read_target_addr_config(Dir) -> Conf</name>
+      <name since="">read_target_addr_config(Dir) -> Conf</name>
       <fsummary>Read the agent target_addr config from the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -527,9 +527,9 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>target_params_entry(Name, Vsn) -> target_params_entry()</name>
-      <name>target_params_entry(Name, Vsn, SecName, SecLevel) -> target_params_entry()</name>
-      <name>target_params_entry(Name, MPModel, SecModel, SecName, SecLevel) -> target_params_entry()</name>
+      <name since="">target_params_entry(Name, Vsn) -> target_params_entry()</name>
+      <name since="">target_params_entry(Name, Vsn, SecName, SecLevel) -> target_params_entry()</name>
+      <name since="">target_params_entry(Name, MPModel, SecModel, SecName, SecLevel) -> target_params_entry()</name>
       <fsummary>Create an target_params entry</fsummary>
       <type>
         <v>Name = string()</v>
@@ -564,8 +564,8 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>write_target_params_config(Dir, Conf) -> ok</name>
-      <name>write_target_params_config(Dir, Hdr, Conf) -> ok</name>
+      <name since="">write_target_params_config(Dir, Conf) -> ok</name>
+      <name since="">write_target_params_config(Dir, Hdr, Conf) -> ok</name>
       <fsummary>Write the agent target_params config to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -588,7 +588,7 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>append_target_params_config(Dir, Conf) -> ok</name>
+      <name since="">append_target_params_config(Dir, Conf) -> ok</name>
       <fsummary>Append the agent target_params config to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -608,7 +608,7 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>read_target_params_config(Dir) -> Conf</name>
+      <name since="">read_target_params_config(Dir) -> Conf</name>
       <fsummary>Read the agent target_params config from the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -627,10 +627,10 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>vacm_s2g_entry(SecModel, SecName, GroupName) -> vacm_s2g_entry()</name>
-      <name>vacm_acc_entry(GroupName, Prefix, SecModel, SecLevel, Match, ReadView, WriteView, NotifyView) -> vacm_acc_entry()</name>
-      <name>vacm_vtf_entry(ViewIndex, ViewSubtree) -> vacm_vtf_entry()</name>
-      <name>vacm_vtf_entry(ViewIndex, ViewSubtree, ViewStatus, ViewMask) -> vacm_vtf_entry()</name>
+      <name since="">vacm_s2g_entry(SecModel, SecName, GroupName) -> vacm_s2g_entry()</name>
+      <name since="">vacm_acc_entry(GroupName, Prefix, SecModel, SecLevel, Match, ReadView, WriteView, NotifyView) -> vacm_acc_entry()</name>
+      <name since="">vacm_vtf_entry(ViewIndex, ViewSubtree) -> vacm_vtf_entry()</name>
+      <name since="">vacm_vtf_entry(ViewIndex, ViewSubtree, ViewStatus, ViewMask) -> vacm_vtf_entry()</name>
       <fsummary>Create an vacm entry</fsummary>
       <type>
         <v>SecModel = v1 | v2c | usm</v>
@@ -665,8 +665,8 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>write_vacm_config(Dir, Conf) -> ok</name>
-      <name>write_vacm_config(Dir, Hdr, Conf) -> ok</name>
+      <name since="">write_vacm_config(Dir, Conf) -> ok</name>
+      <name since="">write_vacm_config(Dir, Hdr, Conf) -> ok</name>
       <fsummary>Write the agent vacm config to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -690,7 +690,7 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>append_vacm_config(Dir, Conf) -> ok</name>
+      <name since="">append_vacm_config(Dir, Conf) -> ok</name>
       <fsummary>Append the agent vacm config to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -710,7 +710,7 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>read_vacm_config(Dir) -> Conf</name>
+      <name since="">read_vacm_config(Dir) -> Conf</name>
       <fsummary>Read the agent vacm config from the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -729,8 +729,8 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>usm_entry(EngineId) -> usm_entry()</name>
-      <name>usm_entry(EngineID, UserName, SecName, Clone, AuthP, AuthKeyC, OwnAuthKeyC, PrivP, PrivKeyC, OwnPrivKeyC, Public, AuthKey, PrivKey) -> usm_entry()</name>
+      <name since="">usm_entry(EngineId) -> usm_entry()</name>
+      <name since="">usm_entry(EngineID, UserName, SecName, Clone, AuthP, AuthKeyC, OwnAuthKeyC, PrivP, PrivKeyC, OwnPrivKeyC, Public, AuthKey, PrivKey) -> usm_entry()</name>
       <fsummary>Create an usm entry</fsummary>
       <type>
         <v>EngineId = string()</v>
@@ -762,8 +762,8 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>write_usm_config(Dir, Conf) -> ok</name>
-      <name>write_usm_config(Dir, Hdr, Conf) -> ok</name>
+      <name since="">write_usm_config(Dir, Conf) -> ok</name>
+      <name since="">write_usm_config(Dir, Hdr, Conf) -> ok</name>
       <fsummary>Write the agent usm config to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -786,7 +786,7 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>append_usm_config(Dir, Conf) -> ok</name>
+      <name since="">append_usm_config(Dir, Conf) -> ok</name>
       <fsummary>Append the agent usm config to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -805,7 +805,7 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>read_usm_config(Dir) -> Conf</name>
+      <name since="">read_usm_config(Dir) -> Conf</name>
       <fsummary>Read the agent usm config from the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -824,7 +824,7 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>notify_entry(Name, Tag, Type) -> notify_entry()</name>
+      <name since="">notify_entry(Name, Tag, Type) -> notify_entry()</name>
       <fsummary>Create an notify entry</fsummary>
       <type>
         <v>Name = string()</v>
@@ -845,8 +845,8 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>write_notify_config(Dir, Conf) -> ok</name>
-      <name>write_notify_config(Dir, Hdr, Conf) -> ok</name>
+      <name since="">write_notify_config(Dir, Conf) -> ok</name>
+      <name since="">write_notify_config(Dir, Hdr, Conf) -> ok</name>
       <fsummary>Write the agent notify config to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -869,7 +869,7 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>append_notify_config(Dir, Conf) -> ok</name>
+      <name since="">append_notify_config(Dir, Conf) -> ok</name>
       <fsummary>Append the agent notify config to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -889,7 +889,7 @@ word() = 0..65535
     </func>
 
     <func>
-      <name>read_notify_config(Dir) -> Conf</name>
+      <name since="">read_notify_config(Dir) -> Conf</name>
       <fsummary>Read the agent notify config from the config file</fsummary>
       <type>
         <v>Dir = string()</v>
diff --git a/lib/snmp/doc/src/snmpa_discovery_handler.xml b/lib/snmp/doc/src/snmpa_discovery_handler.xml
index 0ea72a880c..21b8746c11 100644
--- a/lib/snmp/doc/src/snmpa_discovery_handler.xml
+++ b/lib/snmp/doc/src/snmpa_discovery_handler.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmpa_discovery_handler.xml</file>
   </header>
-  <module>snmpa_discovery_handler</module>
+  <module since="">snmpa_discovery_handler</module>
   <modulesummary>Behaviour module for the SNMP agent discovery handler.</modulesummary>
   <description>
     <p>This module defines the behaviour of the agent discovery
@@ -51,7 +51,7 @@
 
   <funcs>
     <func>
-      <name>stage1_finish(TargetName, ManagerEngineID, ExtraInfo) -> ignore | {ok, usm_entry() | [usm_entry()]} | {ok, usm_entry() | [usm_entry()], NewExtraInfo}</name>
+      <name since="">stage1_finish(TargetName, ManagerEngineID, ExtraInfo) -> ignore | {ok, usm_entry() | [usm_entry()]} | {ok, usm_entry() | [usm_entry()], NewExtraInfo}</name>
       <fsummary>Discovery stage 1 finish</fsummary>
       <type>
         <v>TargetName = string()</v>
diff --git a/lib/snmp/doc/src/snmpa_error.xml b/lib/snmp/doc/src/snmpa_error.xml
index 7cc4a3513d..6e6761b7a5 100644
--- a/lib/snmp/doc/src/snmpa_error.xml
+++ b/lib/snmp/doc/src/snmpa_error.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmpa_error.xml</file>
   </header>
-  <module>snmpa_error</module>
+  <module since="">snmpa_error</module>
   <modulesummary>Functions for Reporting SNMP Errors</modulesummary>
   <description>
     <marker id="desc"></marker>
@@ -57,7 +57,7 @@
   </description>
   <funcs>
     <func>
-      <name>config_err(Format, Args) -> void()</name>
+      <name since="">config_err(Format, Args) -> void()</name>
       <fsummary>Called if a configuration error occurs</fsummary>
       <type>
         <v>Format = string()</v>
@@ -76,7 +76,7 @@
     </func>
 
     <func>
-      <name>user_err(Format, Args) -> void()</name>
+      <name since="">user_err(Format, Args) -> void()</name>
       <fsummary>Called if a user related error occurs</fsummary>
       <type>
         <v>Format = string()</v>
diff --git a/lib/snmp/doc/src/snmpa_error_io.xml b/lib/snmp/doc/src/snmpa_error_io.xml
index bcb2688646..d78e09ff13 100644
--- a/lib/snmp/doc/src/snmpa_error_io.xml
+++ b/lib/snmp/doc/src/snmpa_error_io.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmpa_error_io.xml</file>
   </header>
-  <module>snmpa_error_io</module>
+  <module since="">snmpa_error_io</module>
   <modulesummary>Functions for Reporting SNMP Errors on stdio</modulesummary>
   <description>
     <p>The module <c>snmpa_error_io</c> implements the 
@@ -52,7 +52,7 @@
   </description>
   <funcs>
     <func>
-      <name>config_err(Format, Args) -> void()</name>
+      <name since="">config_err(Format, Args) -> void()</name>
       <fsummary>Called if a configuration error occurs</fsummary>
       <type>
         <v>Format = string()</v>
@@ -68,7 +68,7 @@
       </desc>
     </func>
     <func>
-      <name>user_err(Format, Args) -> void()</name>
+      <name since="">user_err(Format, Args) -> void()</name>
       <fsummary>Called if a user related error occurs</fsummary>
       <type>
         <v>Format = string()</v>
diff --git a/lib/snmp/doc/src/snmpa_error_logger.xml b/lib/snmp/doc/src/snmpa_error_logger.xml
index 4feb2e7f32..b0565a6839 100644
--- a/lib/snmp/doc/src/snmpa_error_logger.xml
+++ b/lib/snmp/doc/src/snmpa_error_logger.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmpa_error_logger.xml</file>
   </header>
-  <module>snmpa_error_logger</module>
+  <module since="">snmpa_error_logger</module>
   <modulesummary>Functions for Reporting SNMP Errors through the error_logger</modulesummary>
   <description>
     <p>The module <c>snmpa_error_logger</c> implements the 
@@ -54,7 +54,7 @@
   </description>
   <funcs>
     <func>
-      <name>config_err(Format, Args) -> void()</name>
+      <name since="">config_err(Format, Args) -> void()</name>
       <fsummary>Called if a configuration error occurs</fsummary>
       <type>
         <v>Format = string()</v>
@@ -70,7 +70,7 @@
       </desc>
     </func>
     <func>
-      <name>user_err(Format, Args) -> void()</name>
+      <name since="">user_err(Format, Args) -> void()</name>
       <fsummary>Called if a user related error occurs</fsummary>
       <type>
         <v>Format = string()</v>
diff --git a/lib/snmp/doc/src/snmpa_error_report.xml b/lib/snmp/doc/src/snmpa_error_report.xml
index 282d9b4e59..f08dc1df23 100644
--- a/lib/snmp/doc/src/snmpa_error_report.xml
+++ b/lib/snmp/doc/src/snmpa_error_report.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmpa_error_report.xml</file>
   </header>
-  <module>snmpa_error_report</module>
+  <module since="">snmpa_error_report</module>
   <modulesummary>Behaviour module for reporting SNMP agent errors</modulesummary>
   <description>
     <marker id="desc"></marker>
@@ -52,7 +52,7 @@
   </description>
   <funcs>
     <func>
-      <name>config_err(Format, Args) -> void()</name>
+      <name since="">config_err(Format, Args) -> void()</name>
       <fsummary>Called if a configuration error occurs</fsummary>
       <type>
         <v>Format = string()</v>
@@ -68,7 +68,7 @@
       </desc>
     </func>
     <func>
-      <name>user_err(Format, Args) -> void()</name>
+      <name since="">user_err(Format, Args) -> void()</name>
       <fsummary>Called if a user related error occurs</fsummary>
       <type>
         <v>Format = string()</v>
diff --git a/lib/snmp/doc/src/snmpa_local_db.xml b/lib/snmp/doc/src/snmpa_local_db.xml
index ac8d466ab3..229f22ab70 100644
--- a/lib/snmp/doc/src/snmpa_local_db.xml
+++ b/lib/snmp/doc/src/snmpa_local_db.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmpa_local_db.xml</file>
   </header>
-  <module>snmpa_local_db</module>
+  <module since="">snmpa_local_db</module>
   <modulesummary>The SNMP built-in database</modulesummary>
   <description>
     <p>The module <c>snmpa_local_db</c> contains functions for
@@ -86,7 +86,7 @@
   </section>
   <funcs>
     <func>
-      <name>dump() -> ok | {error, Reason}</name>
+      <name since="">dump() -> ok | {error, Reason}</name>
       <fsummary>Dump the database to disk</fsummary>
       <type>
         <v>Reason = term()</v>
@@ -97,7 +97,7 @@
       </desc>
     </func>
     <func>
-      <name>match(NameDb, Pattern)</name>
+      <name since="">match(NameDb, Pattern)</name>
       <fsummary>Perform a match on the table</fsummary>
       <desc>
         <p>Performs an ets/dets matching on the table. 
@@ -106,9 +106,9 @@
       </desc>
     </func>
     <func>
-      <name>print()</name>
-      <name>print(TableName)</name>
-      <name>print(TableName, Db)</name>
+      <name since="">print()</name>
+      <name since="">print(TableName)</name>
+      <name since="">print(TableName, Db)</name>
       <fsummary>Print the database to screen</fsummary>
       <type>
         <v>TableName = atom()</v>
@@ -124,7 +124,7 @@
       </desc>
     </func>
     <func>
-      <name>table_create(NameDb) -> bool()</name>
+      <name since="">table_create(NameDb) -> bool()</name>
       <fsummary>Create a table</fsummary>
       <desc>
         <p>Creates a table. If the table already exist, the old copy
@@ -135,7 +135,7 @@
       </desc>
     </func>
     <func>
-      <name>table_create_row(NameDb, RowIndex, Row) -> bool()</name>
+      <name since="">table_create_row(NameDb, RowIndex, Row) -> bool()</name>
       <fsummary>Create a row in a table</fsummary>
       <type>
         <v>Row = {Val1, Val2, ..., ValN}</v>
@@ -147,28 +147,28 @@
       </desc>
     </func>
     <func>
-      <name>table_delete(NameDb) -> void()</name>
+      <name since="">table_delete(NameDb) -> void()</name>
       <fsummary>Delete a table</fsummary>
       <desc>
         <p>Deletes a table.</p>
       </desc>
     </func>
     <func>
-      <name>table_delete_row(NameDb, RowIndex) -> bool()</name>
+      <name since="">table_delete_row(NameDb, RowIndex) -> bool()</name>
       <fsummary>Delete the row in the table</fsummary>
       <desc>
         <p>Deletes the row in the table.</p>
       </desc>
     </func>
     <func>
-      <name>table_exists(NameDb) -> bool()</name>
+      <name since="">table_exists(NameDb) -> bool()</name>
       <fsummary>Check if a table exists</fsummary>
       <desc>
         <p>Checks if a table exists.</p>
       </desc>
     </func>
     <func>
-      <name>table_get_row(NameDb, RowIndex) -> Row | undefined</name>
+      <name since="">table_get_row(NameDb, RowIndex) -> Row | undefined</name>
       <fsummary>Get a row from the table</fsummary>
       <type>
         <v>Row = {Val1, Val2, ..., ValN}</v>
diff --git a/lib/snmp/doc/src/snmpa_mib_data.xml b/lib/snmp/doc/src/snmpa_mib_data.xml
index 1a73c9b634..b849a2826a 100644
--- a/lib/snmp/doc/src/snmpa_mib_data.xml
+++ b/lib/snmp/doc/src/snmpa_mib_data.xml
@@ -30,7 +30,7 @@
     <file>snmpa_mib_data.xml</file>
   </header>
 
-  <module>snmpa_mib_data</module>
+  <module since="OTP R16B01">snmpa_mib_data</module>
   <modulesummary>Behaviour module for the SNMP agent mib-server 
   data module.</modulesummary>
   <description>
@@ -108,7 +108,7 @@
 
   <funcs>
     <func>
-      <name>Module:new(Storage) -> State</name>
+      <name since="OTP R16B01">Module:new(Storage) -> State</name>
       <fsummary>Create new (mib-server) data instance</fsummary>
       <type>
         <v>Storage = mib_storage()</v>
@@ -122,7 +122,7 @@
     </func>
 
     <func>
-      <name>Module:close(State) -> void()</name>
+      <name since="OTP R16B01">Module:close(State) -> void()</name>
       <fsummary>Close the mib-server data instance</fsummary>
       <type>
         <v>State = term()</v>
@@ -135,7 +135,7 @@
     </func>
 
     <func>
-      <name>Module:sync(State) -> void()</name>
+      <name since="OTP R16B01">Module:sync(State) -> void()</name>
       <fsummary>Synchronize to disc</fsummary>
       <type>
         <v>State = term()</v>
@@ -151,7 +151,7 @@
     </func>
 
     <func>
-      <name>Module:load_mib(State, Filename, MeOverride, TeOverride) -> {ok, NewState} | {error, Reason}</name>
+      <name since="OTP R16B01">Module:load_mib(State, Filename, MeOverride, TeOverride) -> {ok, NewState} | {error, Reason}</name>
       <fsummary>Load a mib into the mib-server</fsummary>
       <type>
         <v>State = NewState = term()</v>
@@ -172,7 +172,7 @@
     </func>
 
     <func>
-      <name>Module:unload_mib(State, Filename) -> {ok, NewState} | {error, Reason}</name>
+      <name since="OTP R16B01">Module:unload_mib(State, Filename) -> {ok, NewState} | {error, Reason}</name>
       <fsummary>Unload mib from the mib-server</fsummary>
       <type>
         <v>State = NewState = term()</v>
@@ -188,7 +188,7 @@
     </func>
 
     <func>
-      <name>Module:lookup(State, Oid) -> Reply</name>
+      <name since="OTP R16B01">Module:lookup(State, Oid) -> Reply</name>
       <fsummary>Find the mib-entry corresponding to the Oid</fsummary>
       <type>
         <v>State = term()</v>
@@ -210,7 +210,7 @@
     </func>
 
     <func>
-      <name>Module:next(State, Oid, MibView) -> Reply</name>
+      <name since="OTP R16B01">Module:next(State, Oid, MibView) -> Reply</name>
       <fsummary>Finds the lexicographically next oid</fsummary>
       <type>
         <v>State = term()</v>
@@ -227,7 +227,7 @@
     </func>
 
     <func>
-      <name>Module:register_subagent(State, Oid, Pid) -> Reply</name>
+      <name since="OTP R16B01">Module:register_subagent(State, Oid, Pid) -> Reply</name>
       <fsummary>Register the subagent</fsummary>
       <type>
         <v>State = NewState = term()</v>
@@ -245,7 +245,7 @@
     </func>
 
     <func>
-      <name>Module:unregister_subagent(State, PidOrOid) -> Reply</name>
+      <name since="OTP R16B01">Module:unregister_subagent(State, PidOrOid) -> Reply</name>
       <fsummary>Unregister the subagent</fsummary>
       <type>
         <v>State = NewState = term()</v>
@@ -266,7 +266,7 @@
     </func>
 
     <func>
-      <name>Module:dump(State, Destination) -> Reply</name>
+      <name since="OTP R16B01">Module:dump(State, Destination) -> Reply</name>
       <fsummary>Unregister the subagent</fsummary>
       <type>
         <v>State = term()</v>
@@ -284,7 +284,7 @@
     </func>
 
     <func>
-      <name>Module:which_mib(State, Oid) -> Reply</name>
+      <name since="OTP R16B01">Module:which_mib(State, Oid) -> Reply</name>
       <fsummary>Retrieve the mib file for an oid()</fsummary>
       <type>
         <v>State = term()</v>
@@ -301,7 +301,7 @@
     </func>
 
     <func>
-      <name>Module:which_mibs(State) -> Reply</name>
+      <name since="OTP R16B01">Module:which_mibs(State) -> Reply</name>
       <fsummary>Retrieve all loaded mib files</fsummary>
       <type>
         <v>State = term()</v>
@@ -317,7 +317,7 @@
     </func>
 
     <func>
-      <name>Module:whereis_mib(State, MibName) -> Reply</name>
+      <name since="OTP R16B01">Module:whereis_mib(State, MibName) -> Reply</name>
       <fsummary>Retrieve the mib file for the mib</fsummary>
       <type>
         <v>State = term()</v>
@@ -334,7 +334,7 @@
     </func>
 
     <func>
-      <name>Module:info(State) -> Reply</name>
+      <name since="OTP R16B01">Module:info(State) -> Reply</name>
       <fsummary>Retrieve misc info for the mib data</fsummary>
       <type>
         <v>State = term()</v>
@@ -352,7 +352,7 @@
     </func>
 
     <func>
-      <name>Module:backup(State, BackupDir) -> Reply</name>
+      <name since="OTP R16B01">Module:backup(State, BackupDir) -> Reply</name>
       <fsummary>Perform a backup of the mib-server data</fsummary>
       <type>
         <v>State = term()</v>
@@ -370,7 +370,7 @@
     </func>
 
     <func>
-      <name>Module:code_change(Destination, Vsn, Extra, State) -> NewState</name>
+      <name since="OTP R16B01">Module:code_change(Destination, Vsn, Extra, State) -> NewState</name>
       <fsummary>Perform a code-change</fsummary>
       <type>
         <v>Destination = up | down</v>
diff --git a/lib/snmp/doc/src/snmpa_mib_storage.xml b/lib/snmp/doc/src/snmpa_mib_storage.xml
index 58ce2167ec..6db2f178a9 100644
--- a/lib/snmp/doc/src/snmpa_mib_storage.xml
+++ b/lib/snmp/doc/src/snmpa_mib_storage.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2013</year><year>2016</year>
+      <year>2013</year><year>2019</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -30,7 +30,7 @@
     <file>snmpa_mib_storage.xml</file>
   </header>
 
-  <module>snmpa_mib_storage</module>
+  <module since="OTP R16B01">snmpa_mib_storage</module>
   <modulesummary>
     Behaviour module for the SNMP agent mib storage. 
   </modulesummary>
@@ -96,7 +96,7 @@
 
   <funcs>
     <func>
-      <name>Module:open(Name, RecordName, Fields, Type, Options) -> {ok, TabId} | {error, Reason}</name>
+      <name since="OTP R16B01">Module:open(Name, RecordName, Fields, Type, Options) -> {ok, TabId} | {error, Reason}</name>
       <fsummary>Create new (mib-server) data instance</fsummary>
       <type>
         <v>Name = atom()</v>
@@ -122,7 +122,7 @@
     </func>
 
     <func>
-      <name>Module:close(TabId) -> void()</name>
+      <name since="OTP R16B01">Module:close(TabId) -> void()</name>
       <fsummary>Close the mib-storage table</fsummary>
       <type>
         <v>State = term()</v>
@@ -135,7 +135,7 @@
     </func>
 
     <func>
-      <name>Module:read(TabId, Key) -> false | {value, Record}</name>
+      <name since="OTP R16B01">Module:read(TabId, Key) -> false | {value, Record}</name>
       <fsummary>Read a record from the mib-storage table</fsummary>
       <type>
         <v>TabId = term()</v>
@@ -150,7 +150,7 @@
     </func>
 
     <func>
-      <name>Module:write(TabId, Record) -> ok | {error, Reason}</name>
+      <name since="OTP R16B01">Module:write(TabId, Record) -> ok | {error, Reason}</name>
       <fsummary>Write a record to the mib-storage table</fsummary>
       <type>
         <v>TabId = term()</v>
@@ -165,7 +165,7 @@
     </func>
 
     <func>
-      <name>Module:delete(TabId) -> void()</name>
+      <name since="OTP R16B01">Module:delete(TabId) -> void()</name>
       <fsummary>Delete an entire mib-storage table</fsummary>
       <type>
         <v>TabId = term()</v>
@@ -178,7 +178,7 @@
     </func>
 
     <func>
-      <name>Module:delete(TabId, Key) -> ok | {error, Reason}</name>
+      <name since="OTP R16B01">Module:delete(TabId, Key) -> ok | {error, Reason}</name>
       <fsummary>Delete a record from the mib-storage table</fsummary>
       <type>
         <v>TabId = term()</v>
@@ -193,7 +193,7 @@
     </func>
 
     <func>
-      <name>Module:match_object(TabId, Pattern) -> {ok, Recs} | {error, Reason}</name>
+      <name since="OTP R16B01">Module:match_object(TabId, Pattern) -> Recs | {error, Reason}</name>
       <fsummary>Search the mib-storage table for record matching pattern</fsummary>
       <type>
         <v>TabId = term()</v>
@@ -210,7 +210,7 @@
     </func>
 
     <func>
-      <name>Module:match_delete(TabId, Pattern) -> {ok, Recs} | {error, Reason}</name>
+      <name since="OTP R16B01">Module:match_delete(TabId, Pattern) -> Recs | {error, Reason}</name>
       <fsummary>Delete records in the mib-storage table matching pattern</fsummary>
       <type>
         <v>TabId = term()</v>
@@ -228,7 +228,7 @@
     </func>
 
     <func>
-      <name>Module:tab2list(TabId) -> Recs</name>
+      <name since="OTP R16B01">Module:tab2list(TabId) -> Recs</name>
       <fsummary>Return all records of the mib-storage table</fsummary>
       <type>
         <v>TabId = term()</v>
@@ -243,7 +243,7 @@
     </func>
 
     <func>
-      <name>Module:info(TabId) -> {ok, Info} | {error, Reason}</name>
+      <name since="OTP R16B01">Module:info(TabId) -> {ok, Info} | {error, Reason}</name>
       <fsummary>Returns information about the mib-storage table. </fsummary>
       <type>
         <v>TabId = term()</v>
@@ -259,7 +259,7 @@
     </func>
 
     <func>
-      <name>Module:sync(TabId) -> void()</name>
+      <name since="OTP R16B01">Module:sync(TabId) -> void()</name>
       <fsummary>Synchronize mib-storage table</fsummary>
       <type>
         <v>TabId = term()</v>
@@ -273,7 +273,7 @@
     </func>
 
     <func>
-      <name>Module:backup(TabId, BackupDir) -> ok | {error, Reason}</name>
+      <name since="OTP R16B01">Module:backup(TabId, BackupDir) -> ok | {error, Reason}</name>
       <fsummary>Perform a backup of the mib-storage table</fsummary>
       <type>
         <v>TabId = term()</v>
diff --git a/lib/snmp/doc/src/snmpa_mpd.xml b/lib/snmp/doc/src/snmpa_mpd.xml
index a39c087c20..d76a9c4a94 100644
--- a/lib/snmp/doc/src/snmpa_mpd.xml
+++ b/lib/snmp/doc/src/snmpa_mpd.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmpa_mpd.xml</file>
   </header>
-  <module>snmpa_mpd</module>
+  <module since="">snmpa_mpd</module>
   <modulesummary>Message Processing and Dispatch module for the SNMP agent</modulesummary>
   <description>
     <p>The module <c>snmpa_mpd</c> implements the version independent
@@ -52,7 +52,7 @@
 
   <funcs>
     <func>
-      <name>init(Vsns) -> mpd_state()</name>
+      <name since="">init(Vsns) -> mpd_state()</name>
       <fsummary>Initialize the MPD module</fsummary>
       <type>
         <v>Vsns = [Vsn]</v>
@@ -70,8 +70,8 @@
     </func>
 
     <func>
-      <name>process_packet(Packet, From, State, NoteStore, Log) -> {ok, Vsn, Pdu, PduMS, ACMData} | {discarded, Reason} | {discovery, DiscoPacket}</name>
-      <name>process_packet(Packet, From, LocalEngineID, State, NoteStore, Log) -> {ok, Vsn, Pdu, PduMS, ACMData} | {discarded, Reason} | {discovery, DiscoPacket}</name>
+      <name since="OTP 17.3">process_packet(Packet, From, State, NoteStore, Log) -> {ok, Vsn, Pdu, PduMS, ACMData} | {discarded, Reason} | {discovery, DiscoPacket}</name>
+      <name since="OTP R14B">process_packet(Packet, From, LocalEngineID, State, NoteStore, Log) -> {ok, Vsn, Pdu, PduMS, ACMData} | {discarded, Reason} | {discovery, DiscoPacket}</name>
       <fsummary>Process a packet received from the network</fsummary>
       <type>
         <v>Packet = binary()</v>
@@ -108,8 +108,8 @@
     </func>
 
     <func>
-      <name>generate_response_msg(Vsn, RePdu, Type, ACMData, Log) -> {ok, Packet} | {discarded, Reason}</name>
-      <name>generate_response_msg(Vsn, RePdu, Type, ACMData, LocalEngineID, Log) -> {ok, Packet} | {discarded, Reason}</name>
+      <name since="OTP R14B">generate_response_msg(Vsn, RePdu, Type, ACMData, Log) -> {ok, Packet} | {discarded, Reason}</name>
+      <name since="OTP R14B">generate_response_msg(Vsn, RePdu, Type, ACMData, LocalEngineID, Log) -> {ok, Packet} | {discarded, Reason}</name>
       <fsummary>Generate a response packet to be sent to the network</fsummary>
       <type>
         <v>Vsn = 'version-1' | 'version-2' | 'version-3'</v>
@@ -136,8 +136,8 @@
     </func>
 
     <func>
-      <name>generate_msg(Vsn, NoteStore, Pdu, MsgData, To) -> {ok, PacketsAndAddresses} | {discarded, Reason}</name>
-      <name>generate_msg(Vsn, NoteStore, Pdu, MsgData, LocalEngineID, To) -> {ok, PacketsAndAddresses} | {discarded, Reason}</name>
+      <name since="OTP R14B">generate_msg(Vsn, NoteStore, Pdu, MsgData, To) -> {ok, PacketsAndAddresses} | {discarded, Reason}</name>
+      <name since="OTP R14B">generate_msg(Vsn, NoteStore, Pdu, MsgData, LocalEngineID, To) -> {ok, PacketsAndAddresses} | {discarded, Reason}</name>
       <fsummary>Generate a request message to be sent to the network</fsummary>
       <type>
         <v>Vsn = 'version-1' | 'version-2' | 'version-3'</v>
@@ -185,7 +185,7 @@
     </func>
 
     <func>
-      <name>process_taddrs(TDests) -> Dests</name>
+      <name since="OTP 17.3">process_taddrs(TDests) -> Dests</name>
       <fsummary>Transform addresses from internal MIB format to a less internal
       </fsummary>
       <type>
@@ -211,7 +211,7 @@
     </func>
 
     <func>
-      <name>discarded_pdu(Variable) -> void()</name>
+      <name since="">discarded_pdu(Variable) -> void()</name>
       <fsummary>Increment the variable associated with a discarded pdu</fsummary>
       <type>
         <v>Variable = atom()</v>
diff --git a/lib/snmp/doc/src/snmpa_network_interface.xml b/lib/snmp/doc/src/snmpa_network_interface.xml
index d4d4989e90..3e79df11b1 100644
--- a/lib/snmp/doc/src/snmpa_network_interface.xml
+++ b/lib/snmp/doc/src/snmpa_network_interface.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmpa_network_interface.xml</file>
   </header>
-  <module>snmpa_network_interface</module>
+  <module since="">snmpa_network_interface</module>
   <modulesummary>Behaviour module for the SNMP agent network interface.</modulesummary>
   <description>
     <p>This module defines the behaviour of the agent network
@@ -68,7 +68,7 @@
 
   <funcs>
     <func>
-      <name>start_link(Prio, NoteStore, MasterAgent, Opts) -> {ok, Pid} | {error, Reason}</name>
+      <name since="">start_link(Prio, NoteStore, MasterAgent, Opts) -> {ok, Pid} | {error, Reason}</name>
       <fsummary>Start-link the network interface process</fsummary>
       <type>
         <v>Prio        = priority()</v>
@@ -93,7 +93,7 @@
     </func>
 
     <func>
-      <name>info(Pid) -> [{Key, Value}]</name>
+      <name since="">info(Pid) -> [{Key, Value}]</name>
       <fsummary>Return information about the running network interface process</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -112,7 +112,7 @@
     </func>
 
     <func>
-      <name>verbosity(Pid, Verbosity) -> void()</name>
+      <name since="">verbosity(Pid, Verbosity) -> void()</name>
       <fsummary>Change the verbosity of a running network interface process</fsummary>
       <type>
         <v>Pid       = pid()</v>
@@ -126,7 +126,7 @@
     </func>
 
     <func>
-      <name>get_log_type(Pid) -> {ok, LogType} | {error, Reason}</name>
+      <name since="">get_log_type(Pid) -> {ok, LogType} | {error, Reason}</name>
       <fsummary>Get the Audit Trail Log type</fsummary>
       <type>
         <v>Pid     = pid()</v>
@@ -147,7 +147,7 @@
     </func>
 
     <func>
-      <name>set_log_type(Pid, NewType) -> {ok, OldType} | {error, Reason}</name>
+      <name since="">set_log_type(Pid, NewType) -> {ok, OldType} | {error, Reason}</name>
       <fsummary>Change the Audit Trail Log type</fsummary>
       <type>
         <v>Pid     = pid()</v>
diff --git a/lib/snmp/doc/src/snmpa_network_interface_filter.xml b/lib/snmp/doc/src/snmpa_network_interface_filter.xml
index 7cd08f8935..02c7d291dd 100644
--- a/lib/snmp/doc/src/snmpa_network_interface_filter.xml
+++ b/lib/snmp/doc/src/snmpa_network_interface_filter.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmpa_network_interface_filter.xml</file>
   </header>
-  <module>snmpa_network_interface_filter</module>
+  <module since="">snmpa_network_interface_filter</module>
   <modulesummary>Behaviour module for the SNMP agent network-interface filter.</modulesummary>
   <description>
     <p>This module defines the behaviour of the agent network interface
@@ -101,7 +101,7 @@ pdu_type() = 'get-request' | 'get-next-request' | 'get-response' |
   </section>
   <funcs>
     <func>
-      <name>accept_recv(Domain, Addr) -> boolean()</name>
+      <name since="">accept_recv(Domain, Addr) -> boolean()</name>
       <fsummary>Shall the received message be accepted</fsummary>
       <type>
 	<v>Domain = transportDomain()</v>
@@ -116,7 +116,7 @@ pdu_type() = 'get-request' | 'get-next-request' | 'get-response' |
       </desc>
     </func>
     <func>
-      <name>accept_send(Domain, Addr) -> boolean()</name>
+      <name since="">accept_send(Domain, Addr) -> boolean()</name>
       <fsummary>Shall the message be sent</fsummary>
       <type>
 	<v>Domain = transportDomain()</v>
@@ -131,7 +131,7 @@ pdu_type() = 'get-request' | 'get-next-request' | 'get-response' |
       </desc>
     </func>
     <func>
-      <name>accept_recv_pdu(Domain, Addr, PduType) -> boolean()</name>
+      <name since="">accept_recv_pdu(Domain, Addr, PduType) -> boolean()</name>
       <fsummary>Shall the received pdu be accepted</fsummary>
       <type>
 	<v>Domain = transportDomain()</v>
@@ -148,7 +148,7 @@ pdu_type() = 'get-request' | 'get-next-request' | 'get-response' |
       </desc>
     </func>
     <func>
-      <name>accept_send_pdu(Targets, PduType) -> Reply</name>
+      <name since="">accept_send_pdu(Targets, PduType) -> Reply</name>
       <fsummary>Shall the pdu be sent</fsummary>
       <type>
         <v>Targets = targets()</v>
diff --git a/lib/snmp/doc/src/snmpa_notification_delivery_info_receiver.xml b/lib/snmp/doc/src/snmpa_notification_delivery_info_receiver.xml
index cbae158544..5dad372710 100644
--- a/lib/snmp/doc/src/snmpa_notification_delivery_info_receiver.xml
+++ b/lib/snmp/doc/src/snmpa_notification_delivery_info_receiver.xml
@@ -34,7 +34,7 @@
     <rev></rev>
     <file>snmpa_notification_delivery_info_receiver.xml</file>
   </header>
-  <module>snmpa_notification_delivery_info_receiver</module>
+  <module since="">snmpa_notification_delivery_info_receiver</module>
   <modulesummary>
     Behaviour module for the SNMP agent notification delivery 
     information receiver.
@@ -76,7 +76,7 @@
 
   <funcs>
     <func>
-      <name>delivery_targets(Tag, Targets, Extra) -> void()</name>
+      <name since="">delivery_targets(Tag, Targets, Extra) -> void()</name>
       <fsummary>Inform about target addresses</fsummary>
       <type>
         <v>Tag = term()</v>
@@ -97,7 +97,7 @@
     </func>
 
     <func>
-      <name>delivery_info(Tag, Target, DeliveryResult, Extra) -> void()</name>
+      <name since="">delivery_info(Tag, Target, DeliveryResult, Extra) -> void()</name>
       <fsummary>Inform about delivery result</fsummary>
       <type>
         <v>Tag = term()</v>
diff --git a/lib/snmp/doc/src/snmpa_notification_filter.xml b/lib/snmp/doc/src/snmpa_notification_filter.xml
index 0f16ba4440..902412ccc5 100644
--- a/lib/snmp/doc/src/snmpa_notification_filter.xml
+++ b/lib/snmp/doc/src/snmpa_notification_filter.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmpa_notification_filter.xml</file>
   </header>
-  <module>snmpa_notification_filter</module>
+  <module since="">snmpa_notification_filter</module>
   <modulesummary>Behaviour module for the SNMP agent notification filters.</modulesummary>
   <description>
     <p>This module defines the behaviour of the agent notification
@@ -51,7 +51,7 @@
   </description>
   <funcs>
     <func>
-      <name>handle_notification(Notif, Data) -> Reply</name>
+      <name since="">handle_notification(Notif, Data) -> Reply</name>
       <fsummary>Handle a notification</fsummary>
       <type>
         <v>Reply = send | {send, NewNotif} | dont_send</v>
diff --git a/lib/snmp/doc/src/snmpa_supervisor.xml b/lib/snmp/doc/src/snmpa_supervisor.xml
index 86c6fbc350..e11cde390f 100644
--- a/lib/snmp/doc/src/snmpa_supervisor.xml
+++ b/lib/snmp/doc/src/snmpa_supervisor.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmpa_supervisor.xml</file>
   </header>
-  <module>snmpa_supervisor</module>
+  <module since="">snmpa_supervisor</module>
   <modulesummary>A supervisor for the SNMP agent Processes</modulesummary>
   <description>
     <p>This is the top supervisor for the agent part of the SNMP 
@@ -42,7 +42,7 @@
   </description>
   <funcs>
     <func>
-      <name>start_sub_sup(Opts) -> {ok, pid()} | {error, {already_started, pid()}} | {error, Reason}</name>
+      <name since="">start_sub_sup(Opts) -> {ok, pid()} | {error, {already_started, pid()}} | {error, Reason}</name>
       <fsummary>Start the SNMP supervisor for sub-agents only</fsummary>
       <type>
         <v>Opts = [opt()]</v>
@@ -60,7 +60,7 @@
       </desc>
     </func>
     <func>
-      <name>start_master_sup(Opts) -> {ok, pid()} |  {error, {already_started, pid()}} | {error, Reason}</name>
+      <name since="">start_master_sup(Opts) -> {ok, pid()} |  {error, {already_started, pid()}} | {error, Reason}</name>
       <fsummary>Start the SNMP supervisor for all agents</fsummary>
       <type>
         <v>Opts = [opt()]</v>
@@ -82,7 +82,7 @@
       </desc>
     </func>
     <func>
-      <name>start_sub_agent(ParentAgent,Subtree,Mibs) -> {ok, pid()} | {error, Reason}</name>
+      <name since="">start_sub_agent(ParentAgent,Subtree,Mibs) -> {ok, pid()} | {error, Reason}</name>
       <fsummary>Start a sub-agent</fsummary>
       <type>
         <v>ParentAgent = pid()</v>
@@ -99,7 +99,7 @@
       </desc>
     </func>
     <func>
-      <name>stop_sub_agent(SubAgent) -> ok | no_such_child</name>
+      <name since="">stop_sub_agent(SubAgent) -> ok | no_such_child</name>
       <fsummary>Stop a sub-agent</fsummary>
       <type>
         <v>SubAgent = pid()</v>
diff --git a/lib/snmp/doc/src/snmpc.xml b/lib/snmp/doc/src/snmpc.xml
index aba51bb500..b22b32a133 100644
--- a/lib/snmp/doc/src/snmpc.xml
+++ b/lib/snmp/doc/src/snmpc.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmpc.xml</file>
   </header>
-  <module>snmpc</module>
+  <module since="">snmpc</module>
   <modulesummary>Interface Functions to the SNMP toolkit MIB compiler</modulesummary>
   <description>
     <p>The module <c>snmpc</c> contains interface functions to the 
@@ -43,8 +43,8 @@
 
   <funcs>
     <func>
-      <name>compile(File)</name>
-      <name>compile(File, Options) -> {ok, BinFileName} | {error, Reason}</name>
+      <name since="">compile(File)</name>
+      <name since="">compile(File, Options) -> {ok, BinFileName} | {error, Reason}</name>
       <fsummary>Compile the specified MIB</fsummary>
       <type>
         <v>File = string()</v>
@@ -236,7 +236,7 @@
     </func>
 
     <func>
-      <name>is_consistent(Mibs) -> ok | {error, Reason}</name>
+      <name since="">is_consistent(Mibs) -> ok | {error, Reason}</name>
       <fsummary>Check for OID conflicts between MIBs</fsummary>
       <type>
         <v>Mibs = [MibName]</v>
@@ -252,7 +252,7 @@
     </func>
 
     <func>
-      <name>mib_to_hrl(MibName) -> ok | {error, Reason}</name>
+      <name since="">mib_to_hrl(MibName) -> ok | {error, Reason}</name>
       <fsummary>Generate constants for the objects in the MIB</fsummary>
       <type>
         <v>MibName = string()</v>
diff --git a/lib/snmp/doc/src/snmpm.xml b/lib/snmp/doc/src/snmpm.xml
index be4cd58a1a..c45df98ee0 100644
--- a/lib/snmp/doc/src/snmpm.xml
+++ b/lib/snmp/doc/src/snmpm.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmpm.xml</file>
   </header>
-  <module>snmpm</module>
+  <module since="">snmpm</module>
   <modulesummary>Interface functions to the SNMP toolkit manager</modulesummary>
   <description>
     <p>The module <c>snmpm</c> contains interface functions to the 
@@ -77,7 +77,7 @@ sec_level() = noAuthNoPriv | authNoPriv | authPriv
   </section>
   <funcs>
     <func>
-      <name>monitor() -> Ref</name>
+      <name since="">monitor() -> Ref</name>
       <fsummary>Monitor the snmp manager</fsummary>
       <type>
         <v>Ref = reference()</v>
@@ -92,7 +92,7 @@ sec_level() = noAuthNoPriv | authNoPriv | authPriv
     </func>
 
     <func>
-      <name>demonitor(Ref) -> void()</name>
+      <name since="">demonitor(Ref) -> void()</name>
       <fsummary>Turn off monitoring of the snmp manager</fsummary>
       <type>
         <v>Ref = reference()</v>
@@ -105,7 +105,7 @@ sec_level() = noAuthNoPriv | authNoPriv | authPriv
     </func>
 
     <func>
-      <name>notify_started(Timeout) -> Pid</name>
+      <name since="">notify_started(Timeout) -> Pid</name>
       <fsummary>Request to be notified when manager started</fsummary>
       <type>
         <v>Timeout = integer()</v>
@@ -148,7 +148,7 @@ sec_level() = noAuthNoPriv | authNoPriv | authPriv
     </func>
 
     <func>
-      <name>cancel_notify_started(Pid) -> void()</name>
+      <name since="">cancel_notify_started(Pid) -> void()</name>
       <fsummary>Cancel request to be notified when manager started</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -161,8 +161,8 @@ sec_level() = noAuthNoPriv | authNoPriv | authPriv
     </func>
 
     <func>
-      <name>register_user(Id, Module, Data) -> ok | {error, Reason}</name>
-      <name>register_user(Id, Module, Data, DefaultAgentConfig) -> ok | {error, Reason}</name>
+      <name since="">register_user(Id, Module, Data) -> ok | {error, Reason}</name>
+      <name since="">register_user(Id, Module, Data, DefaultAgentConfig) -> ok | {error, Reason}</name>
       <fsummary>Register a user of the manager</fsummary>
       <type>
         <v>Id = term()</v>
@@ -204,8 +204,8 @@ sec_level = noAuthNoPriv | authNoPriv | authPriv
     </func>
 
     <func>
-      <name>register_user_monitor(Id, Module, Data) -> ok | {error, Reason}</name>
-      <name>register_user_monitor(Id, Module, Data, DefaultAgentConfig) -> ok | {error, Reason}</name>
+      <name since="">register_user_monitor(Id, Module, Data) -> ok | {error, Reason}</name>
+      <name since="">register_user_monitor(Id, Module, Data, DefaultAgentConfig) -> ok | {error, Reason}</name>
       <fsummary>Register a monitored user of the manager</fsummary>
       <type>
         <v>Id = term()</v>
@@ -252,7 +252,7 @@ sec_level = noAuthNoPriv | authNoPriv | authPriv
     </func>
 
     <func>
-      <name>unregister_user(Id) -> ok | {error, Reason}</name>
+      <name since="">unregister_user(Id) -> ok | {error, Reason}</name>
       <fsummary>Unregister the user</fsummary>
       <type>
         <v>Id = term()</v>
@@ -265,7 +265,7 @@ sec_level = noAuthNoPriv | authNoPriv | authPriv
     </func>
 
     <func>
-      <name>which_users() -> Users</name>
+      <name since="">which_users() -> Users</name>
       <fsummary>Get a list of all users</fsummary>
       <type>
         <v>Users = [UserId]</v>
@@ -279,7 +279,7 @@ sec_level = noAuthNoPriv | authNoPriv | authPriv
     </func>
 
     <func>
-      <name>register_agent(UserId, TargetName, Config) -> ok | {error, Reason}</name>
+      <name since="">register_agent(UserId, TargetName, Config) -> ok | {error, Reason}</name>
       <fsummary>Register this agent</fsummary>
       <type>
         <v>UserId = term()</v>
@@ -325,7 +325,7 @@ sec_level = noAuthNoPriv | authNoPriv | authPriv
     </func>
 
     <func>
-      <name>unregister_agent(UserId, TargetName) -> ok | {error, Reason}</name>
+      <name since="">unregister_agent(UserId, TargetName) -> ok | {error, Reason}</name>
       <fsummary>Unregister the user</fsummary>
       <type>
         <v>UserId = term()</v>
@@ -339,7 +339,7 @@ sec_level = noAuthNoPriv | authNoPriv | authPriv
     </func>
 
     <func>
-      <name>agent_info(TargetName, Item) -> {ok, Val} | {error, Reason}</name>
+      <name since="">agent_info(TargetName, Item) -> {ok, Val} | {error, Reason}</name>
       <fsummary>Retrieve agent config</fsummary>
       <type>
         <v>TargetName = target_name()</v>
@@ -354,8 +354,8 @@ sec_level = noAuthNoPriv | authNoPriv | authPriv
     </func>
 
     <func>
-      <name>update_agent_info(UserId, TargetName, Info) -> ok | {error, Reason}</name>
-      <name>update_agent_info(UserId, TargetName, Item, Val) -> ok | {error, Reason}</name>
+      <name since="OTP R14B04">update_agent_info(UserId, TargetName, Info) -> ok | {error, Reason}</name>
+      <name since="">update_agent_info(UserId, TargetName, Item, Val) -> ok | {error, Reason}</name>
       <fsummary>Update agent config</fsummary>
       <type>
         <v>UserId = term()</v>
@@ -379,8 +379,8 @@ sec_level = noAuthNoPriv | authNoPriv | authPriv
     </func>
 
     <func>
-      <name>which_agents() -> Agents</name>
-      <name>which_agents(UserId) -> Agents</name>
+      <name since="">which_agents() -> Agents</name>
+      <name since="">which_agents(UserId) -> Agents</name>
       <fsummary>List the registered agents</fsummary>
       <type>
         <v>UserId = term()</v>
@@ -396,7 +396,7 @@ sec_level = noAuthNoPriv | authNoPriv | authPriv
     </func>
 
     <func>
-      <name>register_usm_user(EngineID, UserName, Conf) -> ok | {error, Reason}</name>
+      <name since="">register_usm_user(EngineID, UserName, Conf) -> ok | {error, Reason}</name>
       <fsummary>Register this USM user</fsummary>
       <type>
         <v>EngineID = string()</v>
@@ -427,7 +427,7 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>unregister_usm_user(EngineID, UserName) -> ok | {error, Reason}</name>
+      <name since="">unregister_usm_user(EngineID, UserName) -> ok | {error, Reason}</name>
       <fsummary>Unregister this USM user</fsummary>
       <type>
         <v>EngineID = string()</v>
@@ -442,7 +442,7 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>usm_user_info(EngineID, UserName, Item) -> {ok, Val} | {error, Reason}</name>
+      <name since="">usm_user_info(EngineID, UserName, Item) -> {ok, Val} | {error, Reason}</name>
       <fsummary>Retrieve usm user config</fsummary>
       <type>
         <v>EngineID = string()</v>
@@ -458,7 +458,7 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>update_usm_user_info(EngineID, UserName, Item, Val) -> ok | {error, Reason}</name>
+      <name since="">update_usm_user_info(EngineID, UserName, Item, Val) -> ok | {error, Reason}</name>
       <fsummary>Update agent config</fsummary>
       <type>
         <v>EngineID = string()</v>
@@ -475,7 +475,7 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>which_usm_users() -> UsmUsers</name>
+      <name since="">which_usm_users() -> UsmUsers</name>
       <fsummary>List all the registered usm users</fsummary>
       <type>
         <v>UsmUsers = [{EngineID,UserName}]</v>
@@ -490,7 +490,7 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>which_usm_users(EngineID) -> UsmUsers</name>
+      <name since="">which_usm_users(EngineID) -> UsmUsers</name>
       <fsummary>List the registered usm users</fsummary>
       <type>
         <v>UsmUsers = [UserName]</v>
@@ -505,8 +505,8 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>sync_get2(UserId, TargetName, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
-      <name>sync_get2(UserId, TargetName, Oids, SendOpts) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="OTP R14B03">sync_get2(UserId, TargetName, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="OTP R14B03">sync_get2(UserId, TargetName, Oids, SendOpts) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
       <fsummary>Synchronous <c>get-request</c></fsummary>
       <type>
         <v>UserId = term()</v>
@@ -559,11 +559,11 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
    <func>
-      <name>sync_get(UserId, TargetName, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
-      <name>sync_get(UserId, TargetName, ContextName, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
-      <name>sync_get(UserId, TargetName, Oids, Timeout) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
-      <name>sync_get(UserId, TargetName, ContextName, Oids, Timeout) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
-      <name>sync_get(UserId, TargetName, ContextName, Oids, Timeout, ExtraInfo) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="">sync_get(UserId, TargetName, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="">sync_get(UserId, TargetName, ContextName, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="">sync_get(UserId, TargetName, Oids, Timeout) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="">sync_get(UserId, TargetName, ContextName, Oids, Timeout) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="">sync_get(UserId, TargetName, ContextName, Oids, Timeout, ExtraInfo) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
       <fsummary>Synchronous <c>get-request</c></fsummary>
       <type>
         <v>UserId = term()</v>
@@ -605,8 +605,8 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>async_get2(UserId, TargetName, Oids) -> {ok, ReqId} | {error, Reason}</name>
-      <name>async_get2(UserId, TargetName, Oids, SendOpts) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="OTP R14B03">async_get2(UserId, TargetName, Oids) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="OTP R14B03">async_get2(UserId, TargetName, Oids, SendOpts) -> {ok, ReqId} | {error, Reason}</name>
       <fsummary>Asynchronous <c>get-request</c></fsummary>
       <type>
         <v>UserId = term()</v>
@@ -647,11 +647,11 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>async_get(UserId, TargetName, Oids) -> {ok, ReqId} | {error, Reason}</name>
-      <name>async_get(UserId, TargetName, ContextName, Oids) -> {ok, ReqId} | {error, Reason}</name>
-      <name>async_get(UserId, TargetName, Oids, Expire) -> {ok, ReqId} | {error, Reason}</name>
-      <name>async_get(UserId, TargetName, ContextName, Oids, Expire) -> {ok, ReqId} | {error, Reason}</name>
-      <name>async_get(UserId, TargetName, ContextName, Oids, Expire, ExtraInfo) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="">async_get(UserId, TargetName, Oids) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="">async_get(UserId, TargetName, ContextName, Oids) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="">async_get(UserId, TargetName, Oids, Expire) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="">async_get(UserId, TargetName, ContextName, Oids, Expire) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="">async_get(UserId, TargetName, ContextName, Oids, Expire, ExtraInfo) -> {ok, ReqId} | {error, Reason}</name>
       <fsummary>Asynchronous <c>get-request</c></fsummary>
       <type>
         <v>UserId = term()</v>
@@ -683,8 +683,8 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>sync_get_next2(UserId, TargetName, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
-      <name>sync_get_next2(UserId, TargetName, Oids, SendOpts) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="OTP R14B03">sync_get_next2(UserId, TargetName, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="OTP R14B03">sync_get_next2(UserId, TargetName, Oids, SendOpts) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
       <fsummary>Synchronous <c>get-next-request</c></fsummary>
       <type>
         <v>UserId = term()</v>
@@ -737,11 +737,11 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>sync_get_next(UserId, TargetName, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
-      <name>sync_get_next(UserId, TargetName, ContextName, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
-      <name>sync_get_next(UserId, TargetName, Oids, Timeout) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
-      <name>sync_get_next(UserId, TargetName, ContextName, Oids, Timeout) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
-      <name>sync_get_next(UserId, TargetName, ContextName, Oids, Timeout, ExtraInfo) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="">sync_get_next(UserId, TargetName, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="">sync_get_next(UserId, TargetName, ContextName, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="">sync_get_next(UserId, TargetName, Oids, Timeout) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="">sync_get_next(UserId, TargetName, ContextName, Oids, Timeout) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="">sync_get_next(UserId, TargetName, ContextName, Oids, Timeout, ExtraInfo) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
       <fsummary>Synchronous <c>get-next-request</c></fsummary>
       <type>
         <v>UserId = term()</v>
@@ -775,8 +775,8 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>async_get_next2(UserId, TargetName, Oids) -> {ok, ReqId} | {error, Reason}</name>
-      <name>async_get_next2(UserId, TargetName, Oids, SendOpts) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="OTP R14B03">async_get_next2(UserId, TargetName, Oids) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="OTP R14B03">async_get_next2(UserId, TargetName, Oids, SendOpts) -> {ok, ReqId} | {error, Reason}</name>
       <fsummary>Asynchronous <c>get-next-request</c></fsummary>
       <type>
         <v>UserId = term()</v>
@@ -814,11 +814,11 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>async_get_next(UserId, TargetName, Oids) -> {ok, ReqId} | {error, Reason}</name>
-      <name>async_get_next(UserId, TargetName, ContextName, Oids) -> {ok, ReqId} | {error, Reason}</name>
-      <name>async_get_next(UserId, TargetName, Oids, Expire) -> {ok, ReqId} | {error, Reason}</name>
-      <name>async_get_next(UserId, TargetName, ContextName, Oids, Expire) -> {ok, ReqId} | {error, Reason}</name>
-      <name>async_get_next(UserId, TargetName, ContextName, Oids, Expire, ExtraInfo) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="">async_get_next(UserId, TargetName, Oids) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="">async_get_next(UserId, TargetName, ContextName, Oids) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="">async_get_next(UserId, TargetName, Oids, Expire) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="">async_get_next(UserId, TargetName, ContextName, Oids, Expire) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="">async_get_next(UserId, TargetName, ContextName, Oids, Expire, ExtraInfo) -> {ok, ReqId} | {error, Reason}</name>
       <fsummary>Asynchronous <c>get-next-request</c></fsummary>
       <type>
         <v>UserId = term()</v>
@@ -849,8 +849,8 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>sync_set2(UserId, TargetName, VarsAndVals) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
-      <name>sync_set2(UserId, TargetName, VarsAndVals, SendOpts) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="OTP R14B03">sync_set2(UserId, TargetName, VarsAndVals) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="OTP R14B03">sync_set2(UserId, TargetName, VarsAndVals, SendOpts) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
       <fsummary>Synchronous <c>set-request</c></fsummary>
       <type>
         <v>UserId = term()</v>
@@ -906,11 +906,11 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>sync_set(UserId, TargetName, VarsAndVals) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
-      <name>sync_set(UserId, TargetName, ContextName, VarsAndVals) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
-      <name>sync_set(UserId, TargetName, VarsAndVals, Timeout) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
-      <name>sync_set(UserId, TargetName, ContextName, VarsAndVals, Timeout) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
-      <name>sync_set(UserId, TargetName, ContextName, VarsAndVals, Timeout, ExtraInfo) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="">sync_set(UserId, TargetName, VarsAndVals) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="">sync_set(UserId, TargetName, ContextName, VarsAndVals) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="">sync_set(UserId, TargetName, VarsAndVals, Timeout) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="">sync_set(UserId, TargetName, ContextName, VarsAndVals, Timeout) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="">sync_set(UserId, TargetName, ContextName, VarsAndVals, Timeout, ExtraInfo) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
       <fsummary>Synchronous <c>set-request</c></fsummary>
       <type>
         <v>UserId = term()</v>
@@ -946,8 +946,8 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>async_set2(UserId, TargetName, VarsAndVals) -> {ok, ReqId} | {error, Reason}</name>
-      <name>async_set2(UserId, TargetName, VarsAndVals, SendOpts) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="OTP R14B03">async_set2(UserId, TargetName, VarsAndVals) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="OTP R14B03">async_set2(UserId, TargetName, VarsAndVals, SendOpts) -> {ok, ReqId} | {error, Reason}</name>
       <fsummary>Asynchronous <c>set-request</c></fsummary>
       <type>
         <v>UserId = term()</v>
@@ -990,11 +990,11 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>async_set(UserId, TargetName, VarsAndVals) -> {ok, ReqId} | {error, Reason}</name>
-      <name>async_set(UserId, TargetName, ContextName, VarsAndVals) -> {ok, ReqId} | {error, Reason}</name>
-      <name>async_set(UserId, TargetName, VarsAndVals, Expire) -> {ok, ReqId} | {error, Reason}</name>
-      <name>async_set(UserId, TargetName, ContextName, VarsAndVals, Expire) -> {ok, ReqId} | {error, Reason}</name>
-      <name>async_set(UserId, TargetName, ContextName, VarsAndVals, Expire, ExtraInfo) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="">async_set(UserId, TargetName, VarsAndVals) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="">async_set(UserId, TargetName, ContextName, VarsAndVals) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="">async_set(UserId, TargetName, VarsAndVals, Expire) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="">async_set(UserId, TargetName, ContextName, VarsAndVals, Expire) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="">async_set(UserId, TargetName, ContextName, VarsAndVals, Expire, ExtraInfo) -> {ok, ReqId} | {error, Reason}</name>
       <fsummary>Asynchronous <c>set-request</c></fsummary>
       <type>
         <v>UserId = term()</v>
@@ -1026,8 +1026,8 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>sync_get_bulk2(UserId, TragetName, NonRep, MaxRep, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
-      <name>sync_get_bulk2(UserId, TragetName, NonRep, MaxRep, Oids, SendOpts) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="OTP R14B03">sync_get_bulk2(UserId, TragetName, NonRep, MaxRep, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="OTP R14B03">sync_get_bulk2(UserId, TragetName, NonRep, MaxRep, Oids, SendOpts) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
       <fsummary>Synchronous <c>get-bulk-request</c></fsummary>
       <type>
         <v>UserId = term()</v>
@@ -1082,11 +1082,11 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>sync_get_bulk(UserId, TragetName, NonRep, MaxRep, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
-      <name>sync_get_bulk(UserId, TragetName, NonRep, MaxRep, ContextName, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
-      <name>sync_get_bulk(UserId, TragetName, NonRep, MaxRep, Oids, Timeout) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
-      <name>sync_get_bulk(UserId, TragetName, NonRep, MaxRep, ContextName, Oids, Timeout) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
-      <name>sync_get_bulk(UserId, TragetName, NonRep, MaxRep, ContextName, Oids, Timeout, ExtraInfo) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="">sync_get_bulk(UserId, TragetName, NonRep, MaxRep, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="">sync_get_bulk(UserId, TragetName, NonRep, MaxRep, ContextName, Oids) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="">sync_get_bulk(UserId, TragetName, NonRep, MaxRep, Oids, Timeout) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="">sync_get_bulk(UserId, TragetName, NonRep, MaxRep, ContextName, Oids, Timeout) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
+      <name since="">sync_get_bulk(UserId, TragetName, NonRep, MaxRep, ContextName, Oids, Timeout, ExtraInfo) -> {ok, SnmpReply, Remaining} | {error, Reason}</name>
       <fsummary>Synchronous <c>get-bulk-request</c></fsummary>
       <type>
         <v>UserId = term()</v>
@@ -1121,8 +1121,8 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>async_get_bulk2(UserId, TargetName, NonRep, MaxRep, Oids) -> {ok, ReqId} | {error, Reason}</name>
-      <name>async_get_bulk2(UserId, TargetName, NonRep, MaxRep, Oids, SendOpts) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="OTP R14B03">async_get_bulk2(UserId, TargetName, NonRep, MaxRep, Oids) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="OTP R14B03">async_get_bulk2(UserId, TargetName, NonRep, MaxRep, Oids, SendOpts) -> {ok, ReqId} | {error, Reason}</name>
       <fsummary>Asynchronous <c>get-bulk-request</c></fsummary>
       <type>
         <v>UserId = term()</v>
@@ -1162,11 +1162,11 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>async_get_bulk(UserId, TargetName, NonRep, MaxRep, Oids) -> {ok, ReqId} | {error, Reason}</name>
-      <name>async_get_bulk(UserId, TargetName, NonRep, MaxRep, ContextName, Oids) -> {ok, ReqId} | {error, Reason}</name>
-      <name>async_get_bulk(UserId, TargetName, NonRep, MaxRep, Oids, Expire) -> {ok, ReqId} | {error, Reason}</name>
-      <name>async_get_bulk(UserId, TargetName, NonRep, MaxRep, ContextName, Oids, Expire) -> {ok, ReqId} | {error, Reason}</name>
-      <name>async_get_bulk(UserId, TargetName, NonRep, MaxRep, ContextName, Oids, Expire, ExtraInfo) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="">async_get_bulk(UserId, TargetName, NonRep, MaxRep, Oids) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="">async_get_bulk(UserId, TargetName, NonRep, MaxRep, ContextName, Oids) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="">async_get_bulk(UserId, TargetName, NonRep, MaxRep, Oids, Expire) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="">async_get_bulk(UserId, TargetName, NonRep, MaxRep, ContextName, Oids, Expire) -> {ok, ReqId} | {error, Reason}</name>
+      <name since="">async_get_bulk(UserId, TargetName, NonRep, MaxRep, ContextName, Oids, Expire, ExtraInfo) -> {ok, ReqId} | {error, Reason}</name>
       <fsummary>Asynchronous <c>get-bulk-request</c></fsummary>
       <type>
         <v>UserId = term()</v>
@@ -1199,7 +1199,7 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>cancel_async_request(UserId, ReqId) -> ok | {error, Reason}</name>
+      <name since="">cancel_async_request(UserId, ReqId) -> ok | {error, Reason}</name>
       <fsummary>Cancel a asynchronous request</fsummary>
       <type>
         <v>UserId = term()</v>
@@ -1214,15 +1214,15 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>log_to_txt(LogDir)</name>
-      <name>log_to_txt(LogDir, Block | Mibs)</name>
-      <name>log_to_txt(LogDir, Mibs, Block | OutFile) -> ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, Block | LogName) ->  ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, Block | LogFile) ->  ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block | Start) ->  ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start)  -> ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop)  -> ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop)  -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="OTP R16B03">log_to_txt(LogDir)</name>
+      <name since="">log_to_txt(LogDir, Block | Mibs)</name>
+      <name since="">log_to_txt(LogDir, Mibs, Block | OutFile) -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="">log_to_txt(LogDir, Mibs, OutFile, Block | LogName) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="">log_to_txt(LogDir, Mibs, OutFile, LogName, Block | LogFile) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="">log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block | Start) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="">log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start)  -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="">log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop)  -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="OTP R16B03">log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop)  -> ok | {ok, Cnt} | {error, Reason}</name>
       <fsummary>Convert an Audit Trail Log to text format</fsummary>
       <type>
         <v>LogDir = string()</v>
@@ -1257,15 +1257,15 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>log_to_io(LogDir) -> ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_io(LogDir, Block | Mibs) -> ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs) -> ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, Block | LogName) ->  ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, Block | LogFile) ->  ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block | Start) ->  ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start)  -> ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop)  -> ok | {ok, Cnt} | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop)  -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="OTP R15B01">log_to_io(LogDir) -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="OTP R15B01">log_to_io(LogDir, Block | Mibs) -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="OTP R15B01">log_to_io(LogDir, Mibs) -> ok | {error, Reason}</name>
+      <name since="OTP R15B01">log_to_io(LogDir, Mibs, Block | LogName) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="OTP R15B01">log_to_io(LogDir, Mibs, LogName, Block | LogFile) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="OTP R15B01">log_to_io(LogDir, Mibs, LogName, LogFile, Block | Start) ->  ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="OTP R15B01">log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start)  -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="OTP R15B01">log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop)  -> ok | {ok, Cnt} | {error, Reason}</name>
+      <name since="OTP R16B03">log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop)  -> ok | {ok, Cnt} | {error, Reason}</name>
       <fsummary>Convert an Audit Trail Log to text format</fsummary>
       <type>
         <v>LogDir = string()</v>
@@ -1299,7 +1299,7 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>change_log_size(NewSize) -> ok | {error, Reason}</name>
+      <name since="">change_log_size(NewSize) -> ok | {error, Reason}</name>
       <fsummary>Change the size of the Audit Trail Log</fsummary>
       <type>
         <v>NewSize = {MaxBytes, MaxFiles}</v>
@@ -1321,7 +1321,7 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>set_log_type(NewType) -> {ok, OldType} | {error, Reason}</name>
+      <name since="">set_log_type(NewType) -> {ok, OldType} | {error, Reason}</name>
       <fsummary>Change the Audit Trail Log type</fsummary>
       <type>
         <v>NewType = OldType = atl_type()</v>
@@ -1340,7 +1340,7 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>load_mib(Mib) -> ok | {error, Reason}</name>
+      <name since="">load_mib(Mib) -> ok | {error, Reason}</name>
       <fsummary>Load a MIB into the manager</fsummary>
       <type>
         <v>Mib = MibName</v>
@@ -1361,7 +1361,7 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>unload_mib(Mib) -> ok | {error, Reason}</name>
+      <name since="">unload_mib(Mib) -> ok | {error, Reason}</name>
       <fsummary>Unload a MIB from the manager</fsummary>
       <type>
         <v>Mib = MibName</v>
@@ -1382,7 +1382,7 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>which_mibs() -> Mibs</name>
+      <name since="">which_mibs() -> Mibs</name>
       <fsummary>Which mibs are loaded into the manager</fsummary>
       <type>
         <v>Mibs = [{MibName, MibFile}]</v>
@@ -1397,7 +1397,7 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>name_to_oid(Name) -> {ok, Oids} | {error, Reason}</name>
+      <name since="">name_to_oid(Name) -> {ok, Oids} | {error, Reason}</name>
       <fsummary>Get all the possible oid's for an alias-name</fsummary>
       <type>
         <v>Name = atom()</v>
@@ -1414,7 +1414,7 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>oid_to_name(Oid) -> {ok, Name} | {error, Reason}</name>
+      <name since="">oid_to_name(Oid) -> {ok, Name} | {error, Reason}</name>
       <fsummary>Get the alias-name of the oid </fsummary>
       <type>
         <v>Oid = oid()</v>
@@ -1429,7 +1429,7 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>oid_to_type(Oid) -> {ok, Type} | {error, Reason}</name>
+      <name since="">oid_to_type(Oid) -> {ok, Type} | {error, Reason}</name>
       <fsummary>Get the type of the the oid</fsummary>
       <type>
         <v>Oid = oid()</v>
@@ -1444,7 +1444,7 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>backup(BackupDir) -> ok | {error, Reason}</name>
+      <name since="">backup(BackupDir) -> ok | {error, Reason}</name>
       <fsummary>Backup manager data</fsummary>
       <type>
         <v>BackupDir = string()</v>
@@ -1458,7 +1458,7 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>info() -> [{Key, Value}]</name>
+      <name since="">info() -> [{Key, Value}]</name>
       <fsummary>Return information about the manager</fsummary>
       <type>
         <v>Key = atom()</v>
@@ -1475,7 +1475,7 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>verbosity(Ref, Verbosity) -> void()</name>
+      <name since="">verbosity(Ref, Verbosity) -> void()</name>
       <fsummary>Assign a new verbosity for the process</fsummary>
       <type>
         <v>Ref = server | config | net_if | note_store | all</v>
@@ -1492,8 +1492,8 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>format_reason(Reason) -> string()</name>
-      <name>format_reason(Prefix, Reason) -> string()</name>
+      <name since="">format_reason(Reason) -> string()</name>
+      <name since="">format_reason(Prefix, Reason) -> string()</name>
       <fsummary>Assign a new verbosity for the process</fsummary>
       <type>
         <v>Reason = term()</v>
diff --git a/lib/snmp/doc/src/snmpm_conf.xml b/lib/snmp/doc/src/snmpm_conf.xml
index a3097e5f7e..17ecf2df7c 100644
--- a/lib/snmp/doc/src/snmpm_conf.xml
+++ b/lib/snmp/doc/src/snmpm_conf.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmpm_conf.xml</file>
   </header>
-  <module>snmpm_conf</module>
+  <module since="">snmpm_conf</module>
   <modulesummary>Utility functions for handling the manager config files.</modulesummary>
   <description>
     <p>The module <c>snmpm_conf</c> contains various utility functions to 
@@ -42,7 +42,7 @@
   </description>
   <funcs>
     <func>
-      <name>manager_entry(Tag, Val) -> manager_entry()</name>
+      <name since="">manager_entry(Tag, Val) -> manager_entry()</name>
       <fsummary>Create an manager entry</fsummary>
       <type>
         <v>Tag = address | port | engine_id | max_message_size</v>
@@ -60,8 +60,8 @@
       </desc>
     </func>
     <func>
-      <name>write_manager_config(Dir, Conf) -> ok</name>
-      <name>write_manager_config(Dir, Hdr, Conf) -> ok</name>
+      <name since="">write_manager_config(Dir, Conf) -> ok</name>
+      <name since="">write_manager_config(Dir, Hdr, Conf) -> ok</name>
       <fsummary>Write the manager config to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -81,7 +81,7 @@
       </desc>
     </func>
     <func>
-      <name>append_manager_config(Dir, Conf) -> ok</name>
+      <name since="">append_manager_config(Dir, Conf) -> ok</name>
       <fsummary>Append the manager config to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -98,7 +98,7 @@
       </desc>
     </func>
     <func>
-      <name>read_manager_config(Dir) -> Conf</name>
+      <name since="">read_manager_config(Dir) -> Conf</name>
       <fsummary>Read the manager config from the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -115,9 +115,9 @@
       </desc>
     </func>
     <func>
-      <name>users_entry(UserId) -> users_entry()</name>
-      <name>users_entry(UserId, UserMod) -> users_entry()</name>
-      <name>users_entry(UserId, UserMod, UserData) -> users_entry()</name>
+      <name since="">users_entry(UserId) -> users_entry()</name>
+      <name since="">users_entry(UserId, UserMod) -> users_entry()</name>
+      <name since="">users_entry(UserId, UserMod, UserData) -> users_entry()</name>
       <fsummary>Create an users entry</fsummary>
       <type>
         <v>UserId = term()</v>
@@ -139,8 +139,8 @@
       </desc>
     </func>
     <func>
-      <name>write_users_config(Dir, Conf) -> ok</name>
-      <name>write_users_config(Dir, Hdr, Conf) -> ok</name>
+      <name since="">write_users_config(Dir, Conf) -> ok</name>
+      <name since="">write_users_config(Dir, Hdr, Conf) -> ok</name>
       <fsummary>Write the manager users config to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -161,7 +161,7 @@
       </desc>
     </func>
     <func>
-      <name>append_users_config(Dir, Conf) -> ok</name>
+      <name since="">append_users_config(Dir, Conf) -> ok</name>
       <fsummary>Append the manager users config to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -179,7 +179,7 @@
       </desc>
     </func>
     <func>
-      <name>read_users_config(Dir) -> Conf</name>
+      <name since="">read_users_config(Dir) -> Conf</name>
       <fsummary>Read the manager users config from the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -196,7 +196,7 @@
       </desc>
     </func>
     <func>
-      <name>agents_entry(UserId, TargetName, Comm, Domain, Addr, EngineID, Timeout, MaxMessageSize, Version, SecModel, SecName, SecLevel) -> agents_entry()</name>
+      <name since="">agents_entry(UserId, TargetName, Comm, Domain, Addr, EngineID, Timeout, MaxMessageSize, Version, SecModel, SecName, SecLevel) -> agents_entry()</name>
       <fsummary>Create an agents entry</fsummary>
       <type>
         <v>UserId = term()</v>
@@ -223,8 +223,8 @@
       </desc>
     </func>
     <func>
-      <name>write_agents_config(Dir, Conf) -> ok</name>
-      <name>write_agents_config(Dir, Hdr, Conf) -> ok</name>
+      <name since="">write_agents_config(Dir, Conf) -> ok</name>
+      <name since="">write_agents_config(Dir, Hdr, Conf) -> ok</name>
       <fsummary>Write the manager agents to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -245,7 +245,7 @@
       </desc>
     </func>
     <func>
-      <name>append_agents_config(Dir, Conf) -> ok</name>
+      <name since="">append_agents_config(Dir, Conf) -> ok</name>
       <fsummary>Append the manager agents to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -263,7 +263,7 @@
       </desc>
     </func>
     <func>
-      <name>read_agents_config(Dir) -> Conf</name>
+      <name since="">read_agents_config(Dir) -> Conf</name>
       <fsummary>Read the manager agents config from the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -280,8 +280,8 @@
       </desc>
     </func>
     <func>
-      <name>usm_entry(EngineID, UserName, AuthP, AuthKey, PrivP, PrivKey) -> usm_entry()</name>
-      <name>usm_entry(EngineID, UserName, SecName, AuthP, AuthKey, PrivP, PrivKey) -> usm_entry()</name>
+      <name since="">usm_entry(EngineID, UserName, AuthP, AuthKey, PrivP, PrivKey) -> usm_entry()</name>
+      <name since="">usm_entry(EngineID, UserName, SecName, AuthP, AuthKey, PrivP, PrivKey) -> usm_entry()</name>
       <fsummary>Create an usm entry</fsummary>
       <type>
         <v>EngineID = string()</v>
@@ -303,8 +303,8 @@
       </desc>
     </func>
     <func>
-      <name>write_usm_config(Dir, Conf) -> ok</name>
-      <name>write_usm_config(Dir, Hdr, Conf) -> ok</name>
+      <name since="">write_usm_config(Dir, Conf) -> ok</name>
+      <name since="">write_usm_config(Dir, Hdr, Conf) -> ok</name>
       <fsummary>Write the manager usm config to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -325,7 +325,7 @@
       </desc>
     </func>
     <func>
-      <name>append_usm_config(Dir, Conf) -> ok</name>
+      <name since="">append_usm_config(Dir, Conf) -> ok</name>
       <fsummary>Append the manager usm  config to the config file</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -343,7 +343,7 @@
       </desc>
     </func>
     <func>
-      <name>read_usm_config(Dir) -> Conf</name>
+      <name since="">read_usm_config(Dir) -> Conf</name>
       <fsummary>Read the manager usm config from the config file</fsummary>
       <type>
         <v>Dir = string()</v>
diff --git a/lib/snmp/doc/src/snmpm_mpd.xml b/lib/snmp/doc/src/snmpm_mpd.xml
index 08276e4b30..b024f8d294 100644
--- a/lib/snmp/doc/src/snmpm_mpd.xml
+++ b/lib/snmp/doc/src/snmpm_mpd.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmpm_mpd.xml</file>
   </header>
-  <module>snmpm_mpd</module>
+  <module since="">snmpm_mpd</module>
   <modulesummary>Message Processing and Dispatch module for the SNMP manager</modulesummary>
   <description>
     <p>The module <c>snmpm_mpd</c> implements the version independent
@@ -48,7 +48,7 @@
 
   <funcs>
     <func>
-      <name>init_mpd(Vsns) -> mpd_state()</name>
+      <name since="">init_mpd(Vsns) -> mpd_state()</name>
       <fsummary>Initialize the MPD module</fsummary>
       <type>
         <v>Vsns = [Vsn]</v>
@@ -64,7 +64,7 @@
       </desc>
     </func>
     <func>
-      <name>process_msg(Msg, Domain, Addr, State, NoteStore, Logger) -> {ok, Vsn, Pdu, PduMS, MsgData} | {discarded, Reason}</name>
+      <name since="OTP 17.3">process_msg(Msg, Domain, Addr, State, NoteStore, Logger) -> {ok, Vsn, Pdu, PduMS, MsgData} | {discarded, Reason}</name>
       <fsummary>Process a message received from the network</fsummary>
       <type>
         <v>Msg = binary()</v>
@@ -92,7 +92,7 @@
       </desc>
     </func>
     <func>
-      <name>generate_msg(Vsn, NoteStore, Pdu, MsgData, Logger) -> {ok, Packet} | {discarded, Reason}</name>
+      <name since="">generate_msg(Vsn, NoteStore, Pdu, MsgData, Logger) -> {ok, Packet} | {discarded, Reason}</name>
       <fsummary>Generate a request message to be sent to the network</fsummary>
       <type>
         <v>Vsn = 'version-1' | 'version-2' | 'version-3'</v>
@@ -117,7 +117,7 @@
       </desc>
     </func>
     <func>
-      <name>generate_response_msg(Vsn, Pdu, MsgData, Logger) -> {ok, Packet} | {discarded, Reason}</name>
+      <name since="">generate_response_msg(Vsn, Pdu, MsgData, Logger) -> {ok, Packet} | {discarded, Reason}</name>
       <fsummary>Generate a response packet to be sent to the network</fsummary>
       <type>
         <v>Vsn = 'version-1' | 'version-2' | 'version-3'</v>
diff --git a/lib/snmp/doc/src/snmpm_network_interface.xml b/lib/snmp/doc/src/snmpm_network_interface.xml
index 73892aa2e8..e4a66ceef2 100644
--- a/lib/snmp/doc/src/snmpm_network_interface.xml
+++ b/lib/snmp/doc/src/snmpm_network_interface.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmpm_network_interface.xml</file>
   </header>
-  <module>snmpm_network_interface</module>
+  <module since="">snmpm_network_interface</module>
   <modulesummary>Behaviour module for the SNMP manager network interface.</modulesummary>
   <description>
     <p>This module defines the behaviour of the manager network
@@ -79,7 +79,7 @@
 
   <funcs>
     <func>
-      <name>start_link(Server, NoteStore) -> {ok, Pid} | {error, Reason}</name>
+      <name since="">start_link(Server, NoteStore) -> {ok, Pid} | {error, Reason}</name>
       <fsummary>Start-link the network interface process</fsummary>
       <type>
         <v>Server    = pid()</v>
@@ -95,7 +95,7 @@
     </func>
 
     <func>
-      <name>stop(Pid) -> void()</name>
+      <name since="">stop(Pid) -> void()</name>
       <fsummary>Stop the network interface process</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -108,7 +108,7 @@
     </func>
 
     <func>
-      <name>send_pdu(Pid, Pdu, Vsn, MsgData, Domain, Addr, ExtraInfo) -> void()</name>
+      <name since="">send_pdu(Pid, Pdu, Vsn, MsgData, Domain, Addr, ExtraInfo) -> void()</name>
       <fsummary>Request the network interface process to send this pdu</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -142,7 +142,7 @@
     </func>
 
     <func>
-      <name>inform_response(Pid, Ref, Addr, Port) -> void()</name>
+      <name since="">inform_response(Pid, Ref, Addr, Port) -> void()</name>
       <fsummary>Send the inform-request ack</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -163,7 +163,7 @@
     </func>
 
     <func>
-      <name>note_store(Pid, NoteStore) -> void()</name>
+      <name since="">note_store(Pid, NoteStore) -> void()</name>
       <fsummary>Change the verbosity of the network interface process</fsummary>
       <type>
         <v>Pid       = pid()</v>
@@ -179,7 +179,7 @@
     </func>
 
     <func>
-      <name>info(Pid) -> [{Key, Value}]</name>
+      <name since="">info(Pid) -> [{Key, Value}]</name>
       <fsummary>Return information about the running network interface process</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -198,7 +198,7 @@
     </func>
 
     <func>
-      <name>verbosity(Pid, Verbosity) -> void()</name>
+      <name since="">verbosity(Pid, Verbosity) -> void()</name>
       <fsummary>Change the verbosity of the network interface process</fsummary>
       <type>
         <v>Pid       = pid()</v>
@@ -212,7 +212,7 @@
     </func>
 
     <func>
-      <name>get_log_type(Pid) -> {ok, LogType} | {error, Reason}</name>
+      <name since="">get_log_type(Pid) -> {ok, LogType} | {error, Reason}</name>
       <fsummary>Get the Audit Trail Log type</fsummary>
       <type>
         <v>Pid     = pid()</v>
@@ -233,7 +233,7 @@
     </func>
 
     <func>
-      <name>set_log_type(Pid, NewType) -> {ok, OldType} | {error, Reason}</name>
+      <name since="">set_log_type(Pid, NewType) -> {ok, OldType} | {error, Reason}</name>
       <fsummary>Change the Audit Trail Log type</fsummary>
       <type>
         <v>Pid     = pid()</v>
diff --git a/lib/snmp/doc/src/snmpm_network_interface_filter.xml b/lib/snmp/doc/src/snmpm_network_interface_filter.xml
index 742cd53fc6..a50572da51 100644
--- a/lib/snmp/doc/src/snmpm_network_interface_filter.xml
+++ b/lib/snmp/doc/src/snmpm_network_interface_filter.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmpm_network_interface_filter.xml</file>
   </header>
-  <module>snmpm_network_interface_filter</module>
+  <module since="">snmpm_network_interface_filter</module>
   <modulesummary>Behaviour module for the SNMP manager network-interface filter.</modulesummary>
   <description>
     <p>This module defines the behaviour of the manager network interface
@@ -100,7 +100,7 @@ pdu_type() = 'get-request' | 'get-next-request' | 'get-response' |
 
   <funcs>
     <func>
-      <name>accept_recv(Domain, Addr) -> boolean()</name>
+      <name since="">accept_recv(Domain, Addr) -> boolean()</name>
       <fsummary>Shall the received message be accepted</fsummary>
       <type>
 	<v>Domain = transportDomain()</v>
@@ -116,7 +116,7 @@ pdu_type() = 'get-request' | 'get-next-request' | 'get-response' |
     </func>
 
     <func>
-      <name>accept_send(Domain, Addr) -> boolean()</name>
+      <name since="">accept_send(Domain, Addr) -> boolean()</name>
       <fsummary>Shall the message be sent</fsummary>
       <type>
 	<v>Domain = transportDomain()</v>
@@ -132,7 +132,7 @@ pdu_type() = 'get-request' | 'get-next-request' | 'get-response' |
     </func>
 
     <func>
-      <name>accept_recv_pdu(Domain, Addr, PduType) -> boolean()</name>
+      <name since="">accept_recv_pdu(Domain, Addr, PduType) -> boolean()</name>
       <fsummary>Shall the received pdu be accepted</fsummary>
       <type>
 	<v>Domain = transportDomain()</v>
@@ -150,7 +150,7 @@ pdu_type() = 'get-request' | 'get-next-request' | 'get-response' |
     </func>
 
     <func>
-      <name>accept_send_pdu(Domain, Addr, PduType) -> boolean()</name>
+      <name since="">accept_send_pdu(Domain, Addr, PduType) -> boolean()</name>
       <fsummary>Shall the pdu be sent</fsummary>
       <type>
 	<v>Domain = transportDomain()</v>
diff --git a/lib/snmp/doc/src/snmpm_user.xml b/lib/snmp/doc/src/snmpm_user.xml
index 87ae1d224a..9abf596c83 100644
--- a/lib/snmp/doc/src/snmpm_user.xml
+++ b/lib/snmp/doc/src/snmpm_user.xml
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>snmpm_user.xml</file>
   </header>
-  <module>snmpm_user</module>
+  <module since="">snmpm_user</module>
   <modulesummary>Behaviour module for the SNMP manager user.</modulesummary>
   <description>
     <p>This module defines the behaviour of the manager user. 
@@ -93,7 +93,7 @@ snmp_v1_trap_info() :: {Enteprise :: snmp:oid(),
 
   <funcs>
     <func>
-      <name>handle_error(ReqId, Reason, UserData) -> void()</name>
+      <name since="">handle_error(ReqId, Reason, UserData) -> void()</name>
       <fsummary>Handle error</fsummary>
       <type>
         <v>ReqId = integer()</v>
@@ -122,7 +122,7 @@ snmp_v1_trap_info() :: {Enteprise :: snmp:oid(),
     </func>
 
     <func>
-      <name>handle_agent(Domain, Addr, Type, SnmpInfo, UserData) -> Reply</name>
+      <name since="">handle_agent(Domain, Addr, Type, SnmpInfo, UserData) -> Reply</name>
       <fsummary>Handle agent</fsummary>
       <type>
         <v>Domain = transportDomainUdpIpv4 | transportDomainUdpIpv6</v>
@@ -181,7 +181,7 @@ snmp_v1_trap_info() :: {Enteprise :: snmp:oid(),
     </func>
 
     <func>
-      <name>handle_pdu(TargetName, ReqId, SnmpPduInfo, UserData) -> void()</name>
+      <name since="">handle_pdu(TargetName, ReqId, SnmpPduInfo, UserData) -> void()</name>
       <fsummary>Handle the reply to an asynchronous request</fsummary>
       <type>
         <v>TargetName = target_name()</v>
@@ -202,7 +202,7 @@ snmp_v1_trap_info() :: {Enteprise :: snmp:oid(),
     </func>
 
     <func>
-      <name>handle_trap(TargetName, SnmpTrapInfo, UserData) -> Reply</name>
+      <name since="">handle_trap(TargetName, SnmpTrapInfo, UserData) -> Reply</name>
       <fsummary>Handle a trap/notification message</fsummary>
       <type>
         <v>TargetName = TargetName2 = target_name()</v>
@@ -225,7 +225,7 @@ snmp_v1_trap_info() :: {Enteprise :: snmp:oid(),
     </func>
 
     <func>
-      <name>handle_inform(TargetName, SnmpInformInfo, UserData) -> Reply</name>
+      <name since="">handle_inform(TargetName, SnmpInformInfo, UserData) -> Reply</name>
       <fsummary>Handle a inform message</fsummary>
       <type>
         <v>TargetName = TargetName2 = target_name()</v>
@@ -253,7 +253,7 @@ snmp_v1_trap_info() :: {Enteprise :: snmp:oid(),
     </func>
 
     <func>
-      <name>handle_report(TargetName, SnmpReportInfo, UserData) -> Reply</name>
+      <name since="">handle_report(TargetName, SnmpReportInfo, UserData) -> Reply</name>
       <fsummary>Handle a report message</fsummary>
       <type>
         <v>TargetName = TargetName2 = target_name()</v>
@@ -278,7 +278,7 @@ snmp_v1_trap_info() :: {Enteprise :: snmp:oid(),
     </func>
 
     <func>
-      <name>handle_invalid_result(IN, OUT) -> void()</name>
+      <name since="OTP R16B03">handle_invalid_result(IN, OUT) -> void()</name>
       <fsummary>Handle a report message</fsummary>
       <type>
         <v>IN = {Func, Args}</v>
diff --git a/lib/snmp/include/snmp_types.hrl b/lib/snmp/include/snmp_types.hrl
index ffe30996dc..eff17a13a3 100644
--- a/lib/snmp/include/snmp_types.hrl
+++ b/lib/snmp/include/snmp_types.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. 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,6 +349,9 @@
 -define(view_included, 1).
 -define(view_excluded, 2).
 
+-define(view_wildcard, 0).
+-define(view_exact,    1).
+
 
 %%-----------------------------------------------------------------
 %% From SNMPv2-SMI
diff --git a/lib/snmp/mibs/Makefile.in b/lib/snmp/mibs/Makefile.in
index 2350194077..77893cbdc8 100644
--- a/lib/snmp/mibs/Makefile.in
+++ b/lib/snmp/mibs/Makefile.in
@@ -41,14 +41,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/snmp-$(VSN)
 # Common macros
 # ----------------------------------------------------
 
-# NOTE: 
-#    The OTP-REG mib actually belongs to another
-#    application (otp_mibs), and is exported by this
-#    app. But since that app is built later, we have 
-#    to built it here in order to be able to build 
-#    OTP-SNMPEA-MIB (that needs otpModules and
-#    otpApplications).
-MIBS_A = \
+MIBS = \
 	RFC1213-MIB \
 	STANDARD-MIB \
 	SNMPv2-TM \
@@ -62,16 +55,10 @@ MIBS_A = \
 	SNMP-VIEW-BASED-ACM-MIB \
 	SNMP-USM-AES-MIB \
 	INET-ADDRESS-MIB \
-	TRANSPORT-ADDRESS-MIB
-
-MIBS_B = OTP-SNMPEA-MIB
-
-BUILD_MIBS = \
-	$(MIBS_A) \
+	TRANSPORT-ADDRESS-MIB \
 	OTP-REG \
-	$(MIBS_B)
-
-MIBS = $(MIBS_A) $(MIBS_B)
+	OTP-TC \
+	OTP-SNMPEA-MIB
 
 STD_v1_MIB_FILES = \
 	RFC1155-SMI.mib \
@@ -100,8 +87,8 @@ HRL_FILES = $(SNMP_HRL_TARGET_DIR)/SNMPv2-TC.hrl \
 
 TARGET_FILES = \
 	$(ERL_TOP)/lib/snmp/bin/snmp-v2tov1 \
-	$(BUILD_MIBS:%=$(SNMP_BIN_TARGET_DIR)/%.bin) \
-	$(HRL_TARGETS)  \
+	$(MIBS:%=$(SNMP_BIN_TARGET_DIR)/%.bin) \
+	$(HRL_TARGETS) \
 	$(V1_MIB_FILES)
 
 
@@ -136,21 +123,18 @@ endif
 # Targets
 # ----------------------------------------------------
 
-OTP_MIBDIR = $(shell if test -d ../../otp_mibs; then echo otp_mibs; \
-		      else echo sasl; fi)
-
 debug opt: $(TARGET_FILES)
 
 $(ERL_TOP)/lib/snmp/bin/snmp-v2tov1: $(ERL_TOP)/lib/snmp/bin/snmp-v2tov1.src
 	$(gen_verbose)$(PERL) -p -e 's?%PERL%?$(PERL)? ' < $< > $@
 	$(V_at)chmod 755 $@
 
-$(SNMP_BIN_TARGET_DIR)/OTP-REG.bin:	$(ERL_TOP)/lib/$(OTP_MIBDIR)/mibs/OTP-REG.mib
-	$(snmp_verbose)$(ERLC) -pa $(SNMP_TOOLKIT)/ebin -I $(SNMP_TOOLKIT)/priv/mibs $(SNMP_FLAGS) -o $(SNMP_BIN_TARGET_DIR) $<
-
 # To support parallel make, we'll need explicit dependencies
 # to ensure that an imported MIB has been compiled when it's needed.
 
+$(SNMP_BIN_TARGET_DIR)/OTP-TC.bin: \
+	$(SNMP_BIN_TARGET_DIR)/OTP-REG.bin
+
 $(SNMP_BIN_TARGET_DIR)/STANDARD-MIB.bin: \
 	$(SNMP_BIN_TARGET_DIR)/RFC1213-MIB.bin
 
@@ -208,8 +192,6 @@ info:
 	@echo ""
 	@echo "TARGET_FILES = $(TARGET_FILES)"
 	@echo ""
-	@echo "OTP_MIBDIR   = $(OTP_MIBDIR)"
-	@echo ""
 	@echo "SNMP_VSN    = $(SNMP_VSN)"
 	@echo "VSN         = $(VSN)"
 	@echo "RELSYSDIR   = "$(RELSYSDIR)""
diff --git a/lib/otp_mibs/mibs/OTP-REG.mib b/lib/snmp/mibs/OTP-REG.mib
index bf1585061c..bf1585061c 100644
--- a/lib/otp_mibs/mibs/OTP-REG.mib
+++ b/lib/snmp/mibs/OTP-REG.mib
diff --git a/lib/otp_mibs/mibs/OTP-TC.mib b/lib/snmp/mibs/OTP-TC.mib
index efe5451f0c..efe5451f0c 100644
--- a/lib/otp_mibs/mibs/OTP-TC.mib
+++ b/lib/snmp/mibs/OTP-TC.mib
diff --git a/lib/snmp/src/agent/depend.mk b/lib/snmp/src/agent/depend.mk
index 8eba50fa3b..49c7669e41 100644
--- a/lib/snmp/src/agent/depend.mk
+++ b/lib/snmp/src/agent/depend.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2004-2016. All Rights Reserved.
+# Copyright Ericsson AB 2004-2019. All Rights Reserved.
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,6 +24,9 @@ $(EBIN)/snmpa_authentication_service.$(EMULATOR): \
 $(EBIN)/snmpa_error_report.$(EMULATOR): \
 	snmpa_error_report.erl
 
+$(EBIN)/snmpa_get_mechanism.$(EMULATOR): \
+	snmpa_get_mechanism.erl
+
 $(EBIN)/snmpa_network_interface.$(EMULATOR): \
 	snmpa_network_interface.erl
 
@@ -78,6 +81,20 @@ $(EBIN)/snmpa_error_logger.$(EMULATOR): \
 	snmpa_error_report.erl \
 	snmpa_error_logger.erl
 
+$(EBIN)/snmpa_set.$(EMULATOR): \
+	snmpa_set_mechanism.erl \
+	snmpa_set.erl \
+	../misc/snmp_verbosity.hrl
+
+$(EBIN)/snmpa_get.$(EMULATOR): \
+	snmpa_get_mechanism.erl \
+	snmpa_get.erl \
+	../misc/snmp_verbosity.hrl
+
+$(EBIN)/snmpa_get_lib.$(EMULATOR): \
+	snmpa_get_lib.erl \
+	../misc/snmp_verbosity.hrl
+
 $(EBIN)/snmpa_local_db.$(EMULATOR): \
 	snmpa_local_db.erl \
 	../misc/snmp_debug.hrl \
diff --git a/lib/snmp/src/agent/modules.mk b/lib/snmp/src/agent/modules.mk
index 0f8615588a..49cc158c2e 100644
--- a/lib/snmp/src/agent/modules.mk
+++ b/lib/snmp/src/agent/modules.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2004-2016. All Rights Reserved.
+# Copyright Ericsson AB 2004-2019. 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 @@ BEHAVIOUR_MODULES = \
 	snmpa_authentication_service \
 	snmpa_discovery_handler \
 	snmpa_error_report \
+	snmpa_get_mechanism \
 	snmpa_mib_storage \
 	snmpa_mib_data \
 	snmpa_network_interface \
@@ -30,12 +31,24 @@ BEHAVIOUR_MODULES = \
 	snmpa_notification_filter \
 	snmpa_set_mechanism
 
+MIB_MODULES = \
+	snmp_community_mib \
+	snmp_framework_mib \
+	snmp_notification_mib \
+	snmp_standard_mib \
+	snmp_target_mib \
+	snmp_user_based_sm_mib \
+	snmp_view_based_acm_mib
+
 # snmpa is "plain" interface module but also defines some agent specific types
 # and therefor must be compiled before the modules that use them, including
 # the behaviour modules...
+# Some of the MIB modules also define types used elsewhere and therefor
+# has to be built before the other mods.
 # snmpa_mib_data_ttln
 MODULES = \
 	snmpa \
+	$(MIB_MODULES) \
 	$(BEHAVIOUR_MODULES) \
 	snmpa_acm \
 	snmpa_agent \
@@ -46,6 +59,8 @@ MODULES = \
 	snmpa_error \
 	snmpa_error_io \
 	snmpa_error_logger \
+	snmpa_get \
+	snmpa_get_lib \
 	snmpa_local_db \
 	snmpa_mib_storage_ets \
 	snmpa_mib_storage_dets \
@@ -66,17 +81,10 @@ MODULES = \
 	snmpa_trap \
 	snmpa_usm \
 	snmpa_vacm \
-	snmp_community_mib \
-	snmp_framework_mib \
 	snmp_generic \
 	snmp_generic_mnesia \
 	snmp_index \
-	snmp_notification_mib \
-	snmp_shadow_table \
-	snmp_standard_mib \
-	snmp_target_mib \
-	snmp_user_based_sm_mib \
-	snmp_view_based_acm_mib
+	snmp_shadow_table
 
 
 INTERNAL_HRL_FILES = \
diff --git a/lib/snmp/src/agent/snmp_community_mib.erl b/lib/snmp/src/agent/snmp_community_mib.erl
index 9fd7b30f9f..4bd30632f5 100644
--- a/lib/snmp/src/agent/snmp_community_mib.erl
+++ b/lib/snmp/src/agent/snmp_community_mib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2019. 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.
@@ -206,10 +206,10 @@ do_add_community(Community) ->
 		    {error, create_failed}
 	    end
     catch
-	{error, Reason} ->
-	    {error, Reason};
-	Class:Reason ->
-	    {error, {Class, Reason, erlang:get_stacktrace()}}
+	throw:{error, _} = ERROR ->
+	    ERROR;
+	C:E:S ->
+	    {error, {C, E, S}}
     end.
 
 %% FIXME: does not work with mnesia
@@ -545,26 +545,18 @@ snmpTargetAddrExtTable(is_set_ok, RowIndex, Cols0) ->
     end.
 
 
-
 get_snmpTargetAddrTDomain(RowIndex, Col) ->
-    case
-	get(
-	  snmpTargetAddrTable, RowIndex,
-	  [?snmpTargetAddrRowStatus,?snmpTargetAddrTDomain])
-    of
-	[{value,?snmpTargetAddrRowStatus_active},ValueTDomain] ->
-	    case ValueTDomain of
-		{value,TDomain} ->
-		    TDomain;
-		_ ->
-		    ?snmpUDPDomain
-	    end;
-	_ ->
+    Cols = [?snmpTargetAddrRowStatus,?snmpTargetAddrTDomain],
+    case snmp_target_mib:snmpTargetAddrTable(get, RowIndex, Cols) of
+	[{value, ?snmpTargetAddrRowStatus_active}, {value, TDomain}] ->
+            TDomain;
+	[{value, ?snmpTargetAddrRowStatus_active}, _] ->
+            ?snmpUDPDomain;
+        _ ->
 	    wrongValue(Col)
     end.
 
 
-
 verify_snmpTargetAddrExtTable_cols([], _TDomain, Cols) ->
     {ok, lists:reverse(Cols)};
 verify_snmpTargetAddrExtTable_cols([{Col, Val0}|Cols], TDomain, Acc) ->
diff --git a/lib/snmp/src/agent/snmp_framework_mib.erl b/lib/snmp/src/agent/snmp_framework_mib.erl
index 7ea4f0ed97..6db6f87a85 100644
--- a/lib/snmp/src/agent/snmp_framework_mib.erl
+++ b/lib/snmp/src/agent/snmp_framework_mib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2019. 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.
@@ -246,6 +246,7 @@ check_agent(X) ->
 
 %% Ordering function to sort intAgentTransportDomain first
 %% hence before intAgentIpAddress.  Sort other entries on the key.
+-dialyzer({nowarn_function, order_agent/2}).
 order_agent(EntryA, EntryB) ->
     snmp_conf:keyorder(
       1, EntryA, EntryB,
diff --git a/lib/snmp/src/agent/snmp_generic.erl b/lib/snmp/src/agent/snmp_generic.erl
index e67a1b3c80..26a0dd0648 100644
--- a/lib/snmp/src/agent/snmp_generic.erl
+++ b/lib/snmp/src/agent/snmp_generic.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. 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.
@@ -421,12 +421,12 @@ table_check_status(NameDb, Col, ?'RowStatus_createAndGo', RowIndex, Cols) ->
 			_Found -> {inconsistentValue, Col}
 		    end
             catch
-                _:_Reason ->
+                _:_E:_S ->
 		    ?vtrace(
 		       "failed construct row (createAndGo): "
-		       " n   Reason: ~p"
-		       " n   Stack:  ~p",
-		       [_Reason, erlang:get_stacktrace()]),
+		       " n   Error: ~p"
+		       " n   Stack: ~p",
+		       [_E, _S]),
 		    {noCreation, Col}           % Bad RowIndex
 	    end;
 	true -> {inconsistentValue, Col}
@@ -441,12 +441,12 @@ table_check_status(NameDb, Col, ?'RowStatus_createAndWait', RowIndex, Cols) ->
 		_Row ->
 		    {noError, 0}
             catch
-                _:_Reason ->
+                _:_E:_S ->
 		    ?vtrace(
 		       "failed construct row (createAndWait): "
-		       " n   Reason: ~p"
-		       " n   Stack:  ~p",
-		       [_Reason, erlang:get_stacktrace()]),
+		       " n   Error: ~p"
+		       " n   Stack: ~p",
+		       [_E, _S]),
 		    {noCreation, Col}           % Bad RowIndex
 	    end;
 	true -> {inconsistentValue, Col}
diff --git a/lib/snmp/src/agent/snmp_standard_mib.erl b/lib/snmp/src/agent/snmp_standard_mib.erl
index bfe471178d..679d2657c6 100644
--- a/lib/snmp/src/agent/snmp_standard_mib.erl
+++ b/lib/snmp/src/agent/snmp_standard_mib.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. 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.
@@ -27,6 +27,7 @@
 -include("snmp_types.hrl").
 -include("STANDARD-MIB.hrl").
 
+-include("snmpa_internal.hrl").
 -define(VMODULE,"STANDARD-MIB").
 -include("snmp_verbosity.hrl").
 
@@ -547,10 +548,12 @@ dummy(_Op) -> ok.
 %%-----------------------------------------------------------------
 snmp_set_serial_no(new) ->
     snmp_generic:variable_func(new, {snmpSetSerialNo, volatile}),
-    random:seed(erlang:phash2([node()]),
-                erlang:monotonic_time(),
-                erlang:unique_integer()),
-    Val = random:uniform(2147483648) - 1,
+    ?SNMP_RAND_SEED(),
+    %% rand:seed(exrop,
+    %%           {erlang:phash2([node()]),
+    %%            erlang:monotonic_time(),
+    %%            erlang:unique_integer()}),
+    Val = rand:uniform(2147483648) - 1,
     snmp_generic:variable_func(set, Val, {snmpSetSerialNo, volatile});
 
 snmp_set_serial_no(delete) ->
diff --git a/lib/snmp/src/agent/snmp_target_mib.erl b/lib/snmp/src/agent/snmp_target_mib.erl
index e65fa7f340..22fd3acb84 100644
--- a/lib/snmp/src/agent/snmp_target_mib.erl
+++ b/lib/snmp/src/agent/snmp_target_mib.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2019. 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.
@@ -42,6 +42,7 @@
 
 -define(VMODULE,"TARGET-MIB").
 -include("snmp_verbosity.hrl").
+-include("snmpa_internal.hrl").
 
 
 %% Column not accessible via SNMP - needed when the agent sends informs
@@ -673,10 +674,12 @@ snmpTargetSpinLock(print) ->
     
 snmpTargetSpinLock(new) ->
     snmp_generic:variable_func(new, {snmpTargetSpinLock, volatile}),
-    random:seed(erlang:phash2([node()]),
-                erlang:monotonic_time(),
-                erlang:unique_integer()),
-    Val = random:uniform(2147483648) - 1,
+    ?SNMP_RAND_SEED(),
+    %% rand:seed(exrop,
+    %%           {erlang:phash2([node()]),
+    %%            erlang:monotonic_time(),
+    %%            erlang:unique_integer()}),
+    Val = rand:uniform(2147483648) - 1,
     snmp_generic:variable_func(set, Val, {snmpTargetSpinLock, volatile});
 
 snmpTargetSpinLock(delete) ->
diff --git a/lib/snmp/src/agent/snmp_user_based_sm_mib.erl b/lib/snmp/src/agent/snmp_user_based_sm_mib.erl
index f6e4fd3951..4842669fa4 100644
--- a/lib/snmp/src/agent/snmp_user_based_sm_mib.erl
+++ b/lib/snmp/src/agent/snmp_user_based_sm_mib.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2019. 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.
@@ -440,10 +440,12 @@ usmUserSpinLock(print) ->
     
 usmUserSpinLock(new) ->
     snmp_generic:variable_func(new, {usmUserSpinLock, volatile}),
-    random:seed(erlang:phash2([node()]),
-                erlang:monotonic_time(),
-                erlang:unique_integer()),
-    Val = random:uniform(2147483648) - 1,
+    ?SNMP_RAND_SEED(),
+    %% rand:seed(exrop,
+    %%           {erlang:phash2([node()]),
+    %%            erlang:monotonic_time(),
+    %%            erlang:unique_integer()}),
+    Val = rand:uniform(2147483648) - 1,
     snmp_generic:variable_func(set, Val, {usmUserSpinLock, volatile});
 
 usmUserSpinLock(delete) ->
diff --git a/lib/snmp/src/agent/snmp_view_based_acm_mib.erl b/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
index 02415e8036..a5a65d9326 100644
--- a/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
+++ b/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -37,11 +37,18 @@
 %%
 -export([emask2imask/1]).
 
+-export_type([
+              mibview/0,
+              internal_view_mask/0,
+              internal_view_mask_element/0,
+              internal_view_type/0
+             ]).
 
 -include("snmp_types.hrl").
 -include("SNMPv2-TC.hrl").
 -include("SNMP-VIEW-BASED-ACM-MIB.hrl").
 -include("snmpa_vacm.hrl").
+-include("snmpa_internal.hrl").
 
 
 -define(VMODULE,"VACM-MIB").
@@ -53,7 +60,13 @@
 
 
 -type internal_view_mask()         :: null | [internal_view_mask_element()].
--type internal_view_mask_element() :: 0 | 1.
+-type internal_view_mask_element() :: ?view_wildcard |
+                                      ?view_exact.
+-type internal_view_type() :: ?view_included | ?view_excluded.
+
+-type mibview() :: [{SubTree :: snmp:oid(),
+                     Mask    :: internal_view_mask(),
+                     Type    :: internal_view_type()}].
 
 -type external_view_mask() :: octet_string(). % At most length of 16 octet
 -type octet_string()       :: [octet()].
@@ -641,7 +654,7 @@ vacmAccessTable(is_set_ok, RowIndex, Cols0) ->
 		{{Col, ?'RowStatus_createAndWait'}, _} ->
 		    %% Row already exists => inconsistentValue
 		    {inconsistentValue, Col};
-		{value, {_Col, ?'RowStatus_destroy'}} ->
+		{{_Col, ?'RowStatus_destroy'}, _} ->
 		    %% always ok!
 		    {noError, 0};
 		{_, false} ->
@@ -848,10 +861,12 @@ vacmViewSpinLock(print) ->
 
 vacmViewSpinLock(new) ->
     snmp_generic:variable_func(new, volatile_db(vacmViewSpinLock)),
-    random:seed(erlang:phash2([node()]),
-                erlang:monotonic_time(),
-                erlang:unique_integer()),
-    Val = random:uniform(2147483648) - 1,
+    ?SNMP_RAND_SEED(),
+    %% rand:seed(exrop,
+    %%           {erlang:phash2([node()]),
+    %%            erlang:monotonic_time(),
+    %%            erlang:unique_integer()}),
+    Val = rand:uniform(2147483648) - 1,
     snmp_generic:variable_func(set, Val, volatile_db(vacmViewSpinLock));
 
 vacmViewSpinLock(delete) ->
@@ -1100,9 +1115,7 @@ externalize_next(Name, Result) when is_list(Result) ->
     F = fun({[Col | _] = Idx, Val}) -> {Idx, externalize(Name, Col, Val)};
 	   (Other)                  -> Other
 	end,
-    [F(R) || R <- Result];
-externalize_next(_, Result) ->
-    Result.
+    [F(R) || R <- Result].
 
 
 externalize_get(Name, Cols, Result) when is_list(Result) ->
@@ -1112,9 +1125,7 @@ externalize_get(Name, Cols, Result) when is_list(Result) ->
 	end,
     %% Merge column numbers and return values. there must be as much
     %% return values as there are columns requested. And then patch all values
-    [F(R) || R <- lists:zip(Cols, Result)];
-externalize_get(_, _, Result) ->
-    Result. 
+    [F(R) || R <- lists:zip(Cols, Result)]. 
 
 externalize(vacmViewTreeFamilyTable, ?vacmViewTreeFamilyMask, Val) ->
     imask2emask(Val);
diff --git a/lib/snmp/src/agent/snmpa_agent.erl b/lib/snmp/src/agent/snmpa_agent.erl
index 458b88359b..7489f74223 100644
--- a/lib/snmp/src/agent/snmpa_agent.erl
+++ b/lib/snmp/src/agent/snmpa_agent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. 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 @@
 
 %% External exports
 -export([start_link/4, start_link/5, stop/1]).
--export([subagent_set/2, 
+-export([subagent_get/3, subagent_get_next/3,
+         subagent_set/2, 
 	 load_mibs/3, unload_mibs/3, 
 	 which_mibs/1, whereis_mib/2, info/1,
 	 register_subagent/3, unregister_subagent/2,
@@ -362,12 +363,19 @@ do_init(Prio, Parent, Ref, Options) ->
 	  "~n   Options: ~p",[Prio, Parent, Ref, Options]),
 
     Mibs       = get_mibs(Options),
+
     SetModule  = get_set_mechanism(Options),
     put(set_module, SetModule),
+    ?vtrace("set-module: ~w", [SetModule]),
+
+    GetModule  = get_get_mechanism(Options),
+    put(get_module, GetModule),
+    ?vtrace("get-module: ~w", [GetModule]),
 
     %% OTP-3324. For AXD301.
     AuthModule = get_authentication_service(Options),
     put(auth_module, AuthModule),
+    ?vtrace("auth-module: ~w", [AuthModule]),
 
     MultiT  = get_multi_threaded(Options),
     Vsns    = get_versions(Options),
@@ -517,9 +525,25 @@ unregister_subagent(Agent, SubagentOidOrPid) ->
 %% These subagent_ functions either return a value, or exits
 %% with {nodedown, Node} | Reason.
 %%-----------------------------------------------------------------
-subagent_get(SubAgent, Varbinds, IsNotification) ->
+
+%% A proper spec for this would be something like this:
+%% But, there is now way to spec that a process *can* exit.
+%% -spec subagent_get(Agent, VBs, IsNotification) ->
+%%                           {noError, 0, NewVBs} |
+%%                           {ErrStatus, ErrIndex, []} |
+%%                           erlang:exit(Reason) when
+%%       Agent          :: pid(),
+%%       VBs            :: [snmp:varbind()],
+%%       IsNotification :: boolean(),
+%%       NewVBs         :: [snmp:varbind()],
+%%       ErrStatus      :: snmp:error_status(),
+%%       ErrIndex       :: snmp:error_index(),
+%%       Reason         :: {nodedown, Node} | term(),
+%%       Node           :: atom().
+
+subagent_get(SubAgent, VBs, IsNotification) ->
     PduData = get_pdu_data(),
-    call(SubAgent, {subagent_get, Varbinds, PduData, IsNotification}).
+    call(SubAgent, {subagent_get, VBs, PduData, IsNotification}).
 
 subagent_get_next(SubAgent, MibView, Varbinds) ->
     PduData = get_pdu_data(),
@@ -1133,7 +1157,7 @@ handle_call({subagent_get_next, MibView, Varbinds, PduData}, _From, S) ->
 	  "~n   PduData:  ~p", 
 	  [MibView,Varbinds,PduData]),
     put_pdu_data(PduData),
-    {reply, do_get_next(MibView, Varbinds, infinity), S};
+    {reply, do_get_next(MibView, Varbinds), S};
 handle_call({subagent_set, Arguments, PduData}, _From, S) ->
     ?vlog("[handle_call] subagent set:"
 	  "~n   Arguments: ~p"
@@ -1174,7 +1198,7 @@ handle_call({get_next, Vars, Context}, _From, S) ->
             ?vdebug("Varbinds: ~p",[Varbinds]),
             MibView = snmpa_acm:get_root_mib_view(),
             Reply =
-                case do_get_next(MibView, Varbinds, infinity) of
+                case do_get_next(MibView, Varbinds) of
                     {noError, 0, NewVarbinds} ->
                         Vbs = lists:keysort(#varbind.org_index, NewVarbinds),
 			[{Oid,Val} || #varbind{oid = Oid, value = Val} <- Vbs];
@@ -1786,9 +1810,8 @@ worker_loop(Master) ->
 					GbMaxVBs, Extra)
 			end
 		    catch 
-			T:E ->
-			    exit({worker_crash, Req, T, E, 
-				  erlang:get_stacktrace()})
+			C:E:S ->
+			    exit({worker_crash, Req, C, E, S})
 		    end,
 		Master ! worker_available,
 		HandlePduRes; % For debugging...
@@ -1814,9 +1837,8 @@ worker_loop(Master) ->
 						 get(net_if))
 			end
 		    catch 
-			T:E ->
-			    exit({worker_crash, Req, T, E, 
-				  erlang:get_stacktrace()})
+			C:E:S ->
+			    exit({worker_crash, Req, C, E, S})
 		    end,
 		Master ! worker_available, 
 		SendTrapRes; % For debugging...
@@ -2535,22 +2557,31 @@ process_msg(
 process_pdu(#pdu{type='get-request', request_id = ReqId, varbinds=Vbs},
 	    _PduMS, Vsn, MibView, _GbMaxVBs) ->
     ?vtrace("get ~p",[ReqId]),
-    Res = get_err(do_get(MibView, Vbs, false)),
-    ?vtrace("get result: "
-	    "~n   ~p",[Res]),
+    OrigRes = do_get(MibView, Vbs, false),
+    Res     = get_err(OrigRes),
     {ErrStatus, ErrIndex, ResVarbinds} =
 	if
 	    Vsn =:= 'version-1' -> validate_get_v1(Res);
 	    true -> Res
 	end,
-    ?vtrace("get final result: "
-	    "~n   Error status: ~p"
-	    "~n   Error index:  ~p"
-	    "~n   Varbinds:     ~p",
-	    [ErrStatus,ErrIndex,ResVarbinds]),
+    if
+        (ErrStatus =/= noError) ->
+            ?vlog("get final result: "
+                  "~n      Error status: ~p"
+                  "~n      Error index:  ~p"
+                  "~n   when"
+                  "~n      Original Result: "
+                  "~n         ~p", [ErrStatus, ErrIndex, OrigRes]);
+        true ->
+            ?vtrace("get final result: "
+                    "~n   Error status: ~p"
+                    "~n   Error index:  ~p"
+                    "~n   Varbinds:     ~p",
+                    [ErrStatus, ErrIndex, ResVarbinds])
+    end,
     ResponseVarbinds = lists:keysort(#varbind.org_index, ResVarbinds),
     ?vtrace("response varbinds: "
-	    "~n   ~p",[ResponseVarbinds]),
+	    "~n   ~p", [ResponseVarbinds]),
     make_response_pdu(ReqId, ErrStatus, ErrIndex, Vbs, ResponseVarbinds);
 
 process_pdu(#pdu{type = 'get-next-request', request_id = ReqId, varbinds = Vbs},
@@ -2558,22 +2589,31 @@ process_pdu(#pdu{type = 'get-next-request', request_id = ReqId, varbinds = Vbs},
     ?vtrace("process get-next-request -> entry with"
 	    "~n   ReqId:   ~p"
 	    "~n   Vbs:     ~p"
-	    "~n   MibView: ~p",[ReqId, Vbs, MibView]),
-    Res = get_err(do_get_next(MibView, Vbs, infinity)),
-    ?vtrace("get-next result: "
-	    "~n   ~p",[Res]),
+	    "~n   MibView: ~p", [ReqId, Vbs, MibView]),
+    OrigRes = do_get_next(MibView, Vbs),
+    Res     = get_err(OrigRes),
     {ErrStatus, ErrIndex, ResVarbinds} = 
 	if
 	    Vsn =:= 'version-1' -> validate_next_v1(Res, MibView);
 	    true -> Res
 	end,
-    ?vtrace("get-next final result -> validation result:"
-	    "~n   Error status: ~p"
-	    "~n   Error index:  ~p"
-	    "~n   Varbinds:     ~p",[ErrStatus,ErrIndex,ResVarbinds]),
+    if
+        (ErrStatus =/= noError) ->
+            ?vlog("get-next final result: "
+                  "~n   Error status: ~p"
+                  "~n   Error index:  ~p"
+                  "~n   when"
+                  "~n      Original Result: "
+                  "~n         ~p", [ErrStatus, ErrIndex, OrigRes]);
+        true ->
+            ?vtrace("get-next final result:"
+                    "~n   Error status: ~p"
+                    "~n   Error index:  ~p"
+                    "~n   Varbinds:     ~p", [ErrStatus, ErrIndex, ResVarbinds])
+    end,
     ResponseVarbinds = lists:keysort(#varbind.org_index, ResVarbinds),
     ?vtrace("get-next final result -> response varbinds: "
-	    "~n   ~p",[ResponseVarbinds]),
+	    "~n   ~p", [ResponseVarbinds]),
     make_response_pdu(ReqId, ErrStatus, ErrIndex, Vbs, ResponseVarbinds);
 
 process_pdu(#pdu{type         = 'get-bulk-request',
@@ -2582,31 +2622,50 @@ process_pdu(#pdu{type         = 'get-bulk-request',
 		 error_status = NonRepeaters, 
 		 error_index  = MaxRepetitions},
 	    PduMS, _Vsn, MibView, GbMaxVBs) ->
-    {ErrStatus, ErrIndex, ResponseVarbinds} = 
-	get_err(do_get_bulk(MibView, NonRepeaters, MaxRepetitions, PduMS, Vbs, 
-			    GbMaxVBs)),
-    ?vtrace("get-bulk final result: "
-	    "~n   Error status:     ~p"
-	    "~n   Error index:      ~p"
-	    "~n   Respons varbinds: ~p",
-	    [ErrStatus,ErrIndex,ResponseVarbinds]),
+    OrigRes = do_get_bulk(MibView, NonRepeaters, MaxRepetitions, PduMS, Vbs, 
+                          GbMaxVBs),
+    {ErrStatus, ErrIndex, ResponseVarbinds} = get_err(OrigRes),
+    if
+        (ErrStatus =/= noError) ->
+            ?vlog("get-bulk final result: "
+                  "~n   Error Status: ~p"
+                  "~n   Error Index:  ~p"
+                  "~n   when"
+                  "~n      Original Result: "
+                  "~n         ~p", [ErrStatus, ErrIndex, OrigRes]);
+        true ->
+            ?vtrace("get-bulk final result: "
+                    "~n   Error status:     ~p"
+                    "~n   Error index:      ~p"
+                    "~n   Response Varbinds: ~p",
+                    [ErrStatus, ErrIndex, ResponseVarbinds])
+    end,
     make_response_pdu(ReqId, ErrStatus, ErrIndex, Vbs, ResponseVarbinds);
 
 process_pdu(#pdu{type = 'set-request', request_id = ReqId, varbinds = Vbs},
-	    _PduMS, Vsn, MibView, _GbMaxVbs)->
-    Res = do_set(MibView, Vbs),
-    ?vtrace("set result: "
-	    "~n   ~p",[Res]),
+	    _PduMS, Vsn, MibView, _GbMaxVbs) ->
+    OrigRes = do_set(MibView, Vbs),
     {ErrStatus, ErrIndex} =
 	if 
-	    Vsn =:= 'version-1' -> validate_err(v2_to_v1, Res);
-	    true -> Res
+	    Vsn =:= 'version-1' -> validate_err(v2_to_v1, OrigRes);
+	    true -> OrigRes
 	end,
-    ?vtrace("set final result: "
-	    "~n   Error status: ~p"
-	    "~n   Error index:  ~p",[ErrStatus,ErrIndex]),
+    if
+        (ErrStatus =/= noError) ->
+            ?vlog("set final result: "
+                  "~n      Error Status: ~p"
+                  "~n      Error Index:  ~p"
+                  "~n   when"
+                  "~n      Original Result: "
+                  "~n         ~p", [ErrStatus, ErrIndex, OrigRes]);
+        true ->
+            ?vtrace("set final result: "
+                    "~n   Error Status: ~p"
+                    "~n   Error Index:  ~p", [ErrStatus, ErrIndex])
+    end,
     make_response_pdu(ReqId, ErrStatus, ErrIndex, Vbs, Vbs).
 
+
 %%-----------------------------------------------------------------
 %% Transform a value == noSuchInstance | noSuchObject or a 
 %% Counter64 type to a noSuchName error for the whole pdu.
@@ -2650,8 +2709,7 @@ validate_next_v1_2([Vb | _Vbs], _MibView, _Res)
     {noSuchName, Vb#varbind.org_index};
 validate_next_v1_2([Vb | Vbs], MibView, Res)
   when Vb#varbind.variabletype =:= 'Counter64' ->
-    case validate_next_v1(
-	   do_get_next(MibView, [mk_next_oid(Vb)], infinity), MibView) of
+    case validate_next_v1( do_get_next(MibView, [mk_next_oid(Vb)]), MibView) of
 	{noError, 0, [NVb]} ->
 	    validate_next_v1_2(Vbs, MibView, [NVb | Res]);
 	{Error, Index, _OrgVb} ->
@@ -2693,6 +2751,20 @@ mk_next_oid(Vb) ->
 %%%-----------------------------------------------------------------
 
 %%-----------------------------------------------------------------
+%% Func: do_get/2
+%% Purpose: Handles all VBs in a request that is inside the 
+%%          mibview (local).
+%% Returns: {noError, 0, ListOfNewVarbinds} |
+%%          {ErrorStatus, ErrorIndex, []}
+%%-----------------------------------------------------------------
+
+do_get(UnsortedVarbinds, IsNotification) ->
+    Extra     = get(net_if_data),
+    GetModule = get(get_module),
+    GetModule:do_get(UnsortedVarbinds, IsNotification, Extra).
+    
+
+%%-----------------------------------------------------------------
 %% Func: do_get/3
 %% Purpose: do_get handles "getRequests".
 %% Pre: incoming varbinds have type == 'NULL', value == unSpecified
@@ -2700,390 +2772,24 @@ mk_next_oid(Vb) ->
 %%          {ErrorStatus, ErrorIndex, []}
 %%-----------------------------------------------------------------
 
-%% If this function is called from a worker-process, we *may* 
-%% need to tunnel into the master-agent and let it do the 
-%% work
+%% If this function is called from a worker-process (or other process),
+%% we *may* need to tunnel into the master-agent and let it do the work.
 
 do_get(MibView, UnsortedVarbinds, IsNotification) ->
-    do_get(MibView, UnsortedVarbinds, IsNotification, false).
+    Extra     = get(net_if_data),
+    GetModule = get(get_module),
+    GetModule:do_get(MibView, UnsortedVarbinds, IsNotification, Extra).
 
 do_get(MibView, UnsortedVarbinds, IsNotification, ForceMaster) ->
-    ?vtrace("do_get -> entry with"
-	    "~n   MibView:          ~p"
-	    "~n   UnsortedVarbinds: ~p"
-	    "~n   IsNotification:   ~p", 
-	    [MibView, UnsortedVarbinds, IsNotification]),
     case (whereis(snmp_master_agent) =:= self()) of
 	false when (ForceMaster =:= true) ->
-	    %% I am a lowly worker process, handoff to the master agent
 	    PduData = get_pdu_data(), 
 	    call(snmp_master_agent, 
 		 {do_get, MibView, UnsortedVarbinds, IsNotification, PduData});
-
-	_ ->
-	    %% This is me, the master, so go ahead
-	    {OutSideView, InSideView} = 
-		split_vbs_view(UnsortedVarbinds, MibView),
-	    {Error, Index, NewVbs} = 
-		do_get(InSideView, IsNotification),
-	    {Error, Index, NewVbs ++ OutSideView}
-
-    end.
-
-
-split_vbs_view(Vbs, MibView) ->
-    ?vtrace("split the varbinds view", []),
-    split_vbs_view(Vbs, MibView, [], []).
-
-split_vbs_view([Vb | Vbs], MibView, Out, In) ->
-    case snmpa_acm:validate_mib_view(Vb#varbind.oid, MibView) of
-	true -> split_vbs_view(Vbs, MibView, Out, [Vb | In]);
-	false -> split_vbs_view(Vbs, MibView,
-				[Vb#varbind{value = noSuchObject} | Out], In)
-    end;
-split_vbs_view([], _MibView, Out, In) ->
-    {Out, In}.
-	    
-do_get(UnsortedVarbinds, IsNotification) ->
-    {MyVarbinds, SubagentVarbinds} = sort_varbindlist(UnsortedVarbinds),
-    case do_get_local(MyVarbinds, [], IsNotification) of
-	{noError, 0, NewMyVarbinds} ->
-	    case do_get_subagents(SubagentVarbinds, IsNotification) of
-		{noError, 0, NewSubagentVarbinds} ->
-		    {noError, 0, NewMyVarbinds ++ NewSubagentVarbinds};
-		{ErrorStatus, ErrorIndex, _} ->
-		    {ErrorStatus, ErrorIndex, []}
-	    end;
-	{ErrorStatus, ErrorIndex, _} -> 
-	    {ErrorStatus, ErrorIndex, []}
-    end.
-
-%%-----------------------------------------------------------------
-%% Func: do_get_local/3
-%% Purpose: Loop the variablebindings list. We know that each varbind
-%%          in that list belongs to us.
-%% Returns: {noError, 0, ListOfNewVarbinds} |
-%%          {ErrorStatus, ErrorIndex, []}
-%%-----------------------------------------------------------------
-do_get_local([Vb | Vbs], Res, IsNotification) ->
-    case try_get(Vb, IsNotification) of
-	NewVb when is_record(NewVb, varbind) ->
-	    do_get_local(Vbs, [NewVb | Res], IsNotification);
-	ListOfNewVb when is_list(ListOfNewVb) ->
-	    do_get_local(Vbs, lists:append(ListOfNewVb, Res), IsNotification);
-	{error, Error, OrgIndex} ->
-	    {Error, OrgIndex, []}
-    end;
-do_get_local([], Res, _IsNotification) -> 
-    {noError, 0, Res}.
-
-%%-----------------------------------------------------------------
-%% Func: do_get_subagents/2
-%% Purpose: Loop the list of varbinds for different subagents.
-%%          For each of them, call sub_agent_get to retreive
-%%          the values for them.
-%% Returns: {noError, 0, ListOfNewVarbinds} |
-%%          {ErrorStatus, ErrorIndex, []}
-%%-----------------------------------------------------------------
-do_get_subagents(SubagentVarbinds, IsNotification) ->
-    do_get_subagents(SubagentVarbinds, [], IsNotification).
-do_get_subagents([{SubAgentPid, SAVbs} | Tail], Res, IsNotification) ->
-    {_SAOids, Vbs} = sa_split(SAVbs),
-    case catch subagent_get(SubAgentPid, Vbs, IsNotification) of
-	{noError, 0, NewVbs} ->
-	    do_get_subagents(Tail, lists:append(NewVbs, Res), IsNotification);
-	{ErrorStatus, ErrorIndex, _} ->
-	    {ErrorStatus, ErrorIndex, []};
-	{'EXIT', Reason} ->
-	    user_err("Lost contact with subagent (get) ~w. Using genErr", 
-		     [Reason]),
-	    {genErr, 0, []} 
-    end;
-do_get_subagents([], Res, _IsNotification) ->
-    {noError, 0, Res}.
-
-
-%%-----------------------------------------------------------------
-%% Func: try_get/2
-%% Returns: {error, ErrorStatus, OrgIndex} |
-%%          #varbind |
-%%          List of #varbind
-%%-----------------------------------------------------------------
-try_get(IVb, IsNotification) when is_record(IVb, ivarbind) ->
-    ?vtrace("try_get(ivarbind) -> entry with"
-	    "~n   IVb: ~p", [IVb]),
-    get_var_value_from_ivb(IVb, IsNotification);
-try_get({TableOid, TableVbs}, IsNotification) ->
-    ?vtrace("try_get(table) -> entry with"
-	    "~n   TableOid: ~p"
-	    "~n   TableVbs: ~p", [TableOid, TableVbs]),
-    [#ivarbind{mibentry = MibEntry}|_] = TableVbs,
-    {NoAccessVbs, AccessVbs} =
-	check_all_table_vbs(TableVbs, IsNotification, [], []),
-    case get_tab_value_from_mib(MibEntry, TableOid, AccessVbs) of
-	{error, ErrorStatus, OrgIndex} ->
-	    {error, ErrorStatus, OrgIndex};
-	NVbs ->
-	    NVbs ++ NoAccessVbs
-    end.
-
-%%-----------------------------------------------------------------
-%% Make sure all requested columns are accessible.
-%%-----------------------------------------------------------------
-check_all_table_vbs([IVb| IVbs], IsNotification, NoA, A) ->
-    #ivarbind{mibentry = Me, varbind = Vb} = IVb,
-    case Me#me.access of
-	'not-accessible' -> 
-	    NNoA = [Vb#varbind{value = noSuchInstance} | NoA],
-	    check_all_table_vbs(IVbs, IsNotification, NNoA, A);
-	'accessible-for-notify' when IsNotification =:= false -> 
-	    NNoA = [Vb#varbind{value = noSuchInstance} | NoA],
-	    check_all_table_vbs(IVbs, IsNotification, NNoA, A);
-	'write-only' -> 
-	    NNoA = [Vb#varbind{value = noSuchInstance} | NoA],
-	    check_all_table_vbs(IVbs, IsNotification, NNoA, A);
-	_ ->
-	    check_all_table_vbs(IVbs, IsNotification, NoA, [IVb | A])
-    end;
-check_all_table_vbs([], _IsNotification, NoA, A) -> {NoA, A}.
-
-%%-----------------------------------------------------------------
-%% Returns: {error, ErrorStatus, OrgIndex} |
-%%          #varbind
-%%-----------------------------------------------------------------
-get_var_value_from_ivb(IVb, IsNotification)
-  when IVb#ivarbind.status =:= noError ->
-    ?vtrace("get_var_value_from_ivb(noError) -> entry", []),
-    #ivarbind{mibentry = Me, varbind = Vb} = IVb,
-    #varbind{org_index = OrgIndex, oid = Oid} = Vb,
-    case Me#me.access of
-	'not-accessible' -> 
-	    Vb#varbind{value = noSuchInstance};
-	'accessible-for-notify' when IsNotification =:= false -> 
-	    Vb#varbind{value = noSuchInstance};
-	'write-only' -> 
-	    Vb#varbind{value = noSuchInstance};
-	_ -> 
-	    case get_var_value_from_mib(Me, Oid) of
-		{value, Type, Value} ->
-		    Vb#varbind{variabletype = Type, value = Value};
-		{error, ErrorStatus} ->
-		    {error, ErrorStatus, OrgIndex}
-	    end
-    end;
-get_var_value_from_ivb(#ivarbind{status = Status, varbind = Vb}, _) ->
-    ?vtrace("get_var_value_from_ivb(~p) -> entry", [Status]),
-    Vb#varbind{value = Status}.
-
-%%-----------------------------------------------------------------
-%% Func: get_var_value_from_mib/1
-%% Purpose: 
-%% Returns: {error, ErrorStatus} |
-%%          {value, Type, Value}
-%%-----------------------------------------------------------------
-%% Pre: Oid is a correct instance Oid (lookup checked that).
-%% Returns: A correct return value (see make_value_a_correct_value)
-get_var_value_from_mib(#me{entrytype = variable,
-			   asn1_type = ASN1Type,
-			   mfa       = {Mod, Func, Args}},
-		       _Oid) ->
-    ?vtrace("get_var_value_from_mib(variable) -> entry when"
-	    "~n   Mod:  ~p"
-	    "~n   Func: ~p"
-	    "~n   Args: ~p", [Mod, Func, Args]),
-    Result = (catch dbg_apply(Mod, Func, [get | Args])),
-    % mib shall return {value, <a-nice-value-within-range>} |
-    % {noValue, noSuchName} (v1) | 
-    % {noValue, noSuchObject | noSuchInstance} (v2, v1)
-    % everything else (including 'genErr') will generate 'genErr'.
-    make_value_a_correct_value(Result, ASN1Type, {Mod, Func, Args});
-
-get_var_value_from_mib(#me{entrytype = table_column,
-			   oid       = MeOid,
-			   asn1_type = ASN1Type,
-			   mfa       = {Mod, Func, Args}},
-		       Oid) ->
-    ?vtrace("get_var_value_from_mib(table_column) -> entry when"
-	    "~n   MeOid: ~p"
-	    "~n   Mod:   ~p"
-	    "~n   Func:  ~p"
-	    "~n   Args:  ~p"
-	    "~n   Oid:   ~p", [MeOid, Mod, Func, Args, Oid]),
-    Col = lists:last(MeOid),
-    Indexes = snmp_misc:diff(Oid, MeOid),
-    [Result] = (catch dbg_apply(Mod, Func, [get, Indexes, [Col] | Args])),
-    make_value_a_correct_value(Result, ASN1Type, 
-			       {Mod, Func, Args, Indexes, Col}).
-
-
-%% For table operations we need to pass RestOid down to the table-function.
-%% Its up to the table-function to check for noSuchInstance (ex: a 
-%% non-existing row).
-%% Returns: {error, ErrorStatus, OrgIndex} |
-%%          {value, Type, Value}
-get_tab_value_from_mib(#me{mfa = {Mod, Func, Args}}, TableOid, TableVbs) ->
-    ?vtrace("get_tab_value_from_mib -> entry when"
-	    "~n   Mod:  ~p"
-	    "~n   Func: ~p"
-	    "~n   Args: ~p", [Mod, Func, Args]),
-    TableOpsWithShortOids = deletePrefixes(TableOid, TableVbs),
-    SortedVBsRows = snmpa_svbl:sort_varbinds_rows(TableOpsWithShortOids), 
-    case get_value_all_rows(SortedVBsRows, Mod, Func, Args, []) of
-	{Error, Index} ->
-	    #ivarbind{varbind = Vb} = lists:nth(Index, TableVbs),
-	    {error, Error, Vb#varbind.org_index};
-	ListOfValues -> 
-	    merge_varbinds_and_value(TableVbs, ListOfValues)
+        _ ->
+            do_get(MibView, UnsortedVarbinds, IsNotification)
     end.
 
-%%-----------------------------------------------------------------
-%% Values is a scrambled list of {CorrectValue, Index}, where Index
-%% is index into the #ivarbind list. So for each Value, we must
-%% find the corresponding #ivarbind, and merge them into a new
-%% #varbind.
-%% The Values list comes from validate_tab_res.
-%%-----------------------------------------------------------------
-merge_varbinds_and_value(IVbs, [{{value, Type, Value}, Index} | Values]) ->
-    #ivarbind{varbind = Vb} = lists:nth(Index, IVbs),
-    [Vb#varbind{variabletype = Type, value = Value} |
-     merge_varbinds_and_value(IVbs, Values)];
-merge_varbinds_and_value(_, []) -> [].
-    
-get_value_all_rows([{[], OrgCols} | Rows], Mod, Func, Args, Res) ->
-    ?vtrace("get_value_all_rows -> entry when"
-	    "~n   OrgCols: ~p", [OrgCols]),
-    Cols   = [{{value, noValue, noSuchInstance}, Index} || 
-		 {_Col, _ASN1Type, Index} <- OrgCols], 
-    NewRes = lists:append(Cols, Res),
-    get_value_all_rows(Rows, Mod, Func, Args, NewRes);
-get_value_all_rows([{RowIndex, OrgCols} | Rows], Mod, Func, Args, Res) ->
-    ?vtrace("get_value_all_rows -> entry when"
-	    "~n   RowIndex: ~p"
-	    "~n   OrgCols:  ~p", [RowIndex, OrgCols]),
-    {DOrgCols, Dup} = remove_duplicates(OrgCols),
-    Cols   = delete_index(DOrgCols),
-    Result = (catch dbg_apply(Mod, Func, [get, RowIndex, Cols | Args])),
-    case validate_tab_res(Result, DOrgCols, {Mod, Func, Args}) of
-	Values when is_list(Values) ->
-	    NVals  = restore_duplicates(Dup, Values),
-	    NewRes = lists:append(NVals, Res),
-	    get_value_all_rows(Rows, Mod, Func, Args, NewRes);
-	{error, ErrorStatus, Index} ->
-	    validate_err(row_set, {ErrorStatus, Index}, {Mod, Func, Args})
-    end;
-get_value_all_rows([], _Mod, _Func, _Args, Res) -> 
-    ?vtrace("get_value_all_rows -> entry when done"
-	    "~n   Res: ~p", [Res]),
-    Res.
-
-%%-----------------------------------------------------------------
-%% Returns: list of {ShortOid, ASN1TYpe}
-%%-----------------------------------------------------------------
-deletePrefixes(Prefix, [#ivarbind{varbind = Varbind, mibentry = ME} | Vbs]) ->
-    #varbind{oid = Oid} = Varbind,
-    [{snmp_misc:diff(Oid, Prefix), ME#me.asn1_type} |
-     deletePrefixes(Prefix, Vbs)];
-deletePrefixes(_Prefix, []) -> [].
-
-%%-----------------------------------------------------------------
-%% Args: {RowIndex, list of {ShortOid, ASN1Type}}
-%% Returns: list of Col
-%%-----------------------------------------------------------------
-delete_index([{Col, _Val, _OrgIndex} | T]) ->
-    [Col | delete_index(T)];
-delete_index([]) -> [].
-
-%%-----------------------------------------------------------------
-%% This function is called before 'get' on a table, and removes
-%% any duplicate columns.  It returns {Cols, DupInfo}.  The Cols
-%% are the unique columns.  The instrumentation function is
-%% called to get the values.  These values, together with the
-%% DupInfo, is later passed to restore_duplicates, which uses
-%% the retrieved values to reconstruct the original column list,
-%% but with the retrieved value for each column.
-%%-----------------------------------------------------------------
-remove_duplicates(Cols) ->
-    remove_duplicates(Cols, [], []).
-
-
-remove_duplicates([{Col, V1, OrgIdx1}, {Col, V2, OrgIdx2} | T], NCols, Dup) ->
-    remove_duplicates([{Col, V1, OrgIdx1} | T], NCols, 
-		      [{Col, V2, OrgIdx2} | Dup]);
-remove_duplicates([Col | T], NCols, Dup) ->
-    remove_duplicates(T, [Col | NCols], Dup);
-remove_duplicates([], NCols, Dup) ->
-    {lists:reverse(NCols), lists:reverse(Dup)}.
-
-restore_duplicates([], Cols) ->
-    [{Val, OrgIndex} || {_Col, Val, OrgIndex} <- Cols];
-restore_duplicates([{Col, _Val2, OrgIndex2} | Dup],
-		   [{Col, NVal, OrgIndex1} | Cols]) ->
-    [{NVal, OrgIndex2} |
-     restore_duplicates(Dup, [{Col, NVal, OrgIndex1} | Cols])];
-restore_duplicates(Dup, [{_Col, Val, OrgIndex} | T]) ->
-    [{Val, OrgIndex} | restore_duplicates(Dup, T)].
-
-%% Maps the column number to Index.
-% col_to_index(0, _) -> 0;
-% col_to_index(Col, [{Col, _, Index}|_]) ->
-%     Index;
-% col_to_index(Col, [_|Cols]) ->
-%     col_to_index(Col, Cols).
-
-%%-----------------------------------------------------------------
-%% Three cases:
-%%   1) All values ok
-%%   2) table_func returned {Error, ...}
-%%   3) Some value in Values list is erroneous.
-%% Args: Value is a list of values from table_func(get..)
-%%       OrgCols is a list with {Col, ASN1Type, OrgIndex} 
-%%         each element in Values and OrgCols correspond to each
-%%         other.
-%%-----------------------------------------------------------------
-validate_tab_res(Values, OrgCols, Mfa) when is_list(Values) ->
-    {_Col, _ASN1Type, OneIdx} = hd(OrgCols),
-    validate_tab_res(Values, OrgCols, Mfa, [], OneIdx);
-validate_tab_res({noValue, Error}, OrgCols, Mfa) ->
-    Values = lists:duplicate(length(OrgCols), {noValue, Error}),
-    validate_tab_res(Values, OrgCols, Mfa);
-validate_tab_res({genErr, Col}, OrgCols, Mfa) ->
-    case lists:keysearch(Col, 1, OrgCols) of
-	{value, {_Col, _ASN1Type, Index}} ->
-	    {error, genErr, Index};
-	_ ->
-	    user_err("Invalid column in {genErr, ~w} from ~w (get)",
-		     [Col, Mfa]),
-	    [{_Col, _ASN1Type, Index} | _] = OrgCols,
-	    {error, genErr, Index}
-    end;
-validate_tab_res(genErr, [{_Col, __ASN1Type, Index} | _OrgCols], _Mfa) ->
-    {error, genErr, Index};
-validate_tab_res(Error, [{_Col, _ASN1Type, Index} | _OrgCols], Mfa) ->
-    user_err("Invalid return value ~w from ~w (get)",[Error, Mfa]),
-    {error, genErr, Index}.
-
-validate_tab_res([Value | Values], 
-		 [{Col, ASN1Type, Index} | OrgCols],
-		 Mfa, Res, I) ->
-    %% This one makes it possible to return a list of genErr, which
-    %% is not allowed according to the manual.  But that's ok, as
-    %% everything else will generate a genErr! (the only problem is
-    %% that it won't generate a user_error).
-    case make_value_a_correct_value(Value, ASN1Type, Mfa) of
-	{error, ErrorStatus} ->
-	    {error, ErrorStatus, Index};
-	CorrectValue ->
-	    NewRes = [{Col, CorrectValue, Index} | Res],
-	    validate_tab_res(Values, OrgCols, Mfa, NewRes, I)
-    end;
-validate_tab_res([], [], _Mfa, Res, _I) -> 
-    lists:reverse(Res);
-validate_tab_res([], [{_Col, _ASN1Type, Index}|_], Mfa, _Res, _I) ->
-    user_err("Too few values returned from ~w (get)", [Mfa]),
-    {error, genErr, Index};
-validate_tab_res(_TooMany, [], Mfa, _Res, I) ->
-    user_err("Too many values returned from ~w (get)", [Mfa]),
-    {error, genErr, I}.
 
 
 %%%-----------------------------------------------------------------
@@ -3125,491 +2831,12 @@ validate_tab_res(_TooMany, [], Mfa, _Res, I) ->
 %%      subagent must be considered to be very rare.
 %%-----------------------------------------------------------------
 
-%% It may be a bit agressive to check this already, 
-%% but since it is a security measure, it makes sense.
-do_get_next(_MibView, UnsortedVarbinds, GbMaxVBs) 
-  when (is_integer(GbMaxVBs) andalso (length(UnsortedVarbinds) > GbMaxVBs)) ->
-    {tooBig, 0, []}; % What is the correct index in this case?
-do_get_next(MibView, UnsortedVBs, GbMaxVBs) ->
-    ?vt("do_get_next -> entry when"
- 	"~n   MibView:          ~p"
- 	"~n   UnsortedVBs: ~p", [MibView, UnsortedVBs]),
-    SortedVBs = oid_sort_vbs(UnsortedVBs),
-    ?vt("do_get_next -> "
- 	"~n   SortedVBs: ~p", [SortedVBs]),
-    next_loop_varbinds([], SortedVBs, MibView, [], [], GbMaxVBs).
-
-oid_sort_vbs(Vbs) ->
-    lists:keysort(#varbind.oid, Vbs).
-
-next_loop_varbinds(_, Vbs, _MibView, Res, _LAVb, GbMaxVBs) 
-  when (is_integer(GbMaxVBs) andalso 
-	((length(Vbs) + length(Res)) > GbMaxVBs)) ->
-    {tooBig, 0, []}; % What is the correct index in this case?
-
-%% LAVb is Last Accessible Vb
-next_loop_varbinds([], [Vb | Vbs], MibView, Res, LAVb, GbMaxVBs) ->
-    ?vt("next_loop_varbinds -> entry when"
- 	"~n   Vb:      ~p"
- 	"~n   MibView: ~p", [Vb, MibView]),
-    case varbind_next(Vb, MibView) of
-	endOfMibView ->
-	    ?vt("next_loop_varbind -> endOfMibView", []),
-	    RVb = if LAVb =:= [] -> Vb;
-		     true -> LAVb
-		  end,
-	    NewVb = RVb#varbind{variabletype = 'NULL', value = endOfMibView},
-	    next_loop_varbinds([], Vbs, MibView, [NewVb | Res], [], GbMaxVBs);
-
-	{variable, ME, VarOid} when ((ME#me.access =/= 'not-accessible') andalso 
-				     (ME#me.access =/= 'write-only') andalso 
-				     (ME#me.access =/= 'accessible-for-notify')) -> 
-	    ?vt("next_loop_varbind -> variable: "
-		"~n   ME:     ~p"
-		"~n   VarOid: ~p", [ME, VarOid]),
-	    case try_get_instance(Vb, ME) of
-		{value, noValue, _NoSuchSomething} ->
-		    ?vt("next_loop_varbind -> noValue", []),
-		    %% Try next one
-		    NewVb = Vb#varbind{oid   = VarOid, 
-				       value = 'NULL'},
-		    next_loop_varbinds([], [NewVb | Vbs], MibView, Res, [], 
-				       GbMaxVBs);
-		{value, Type, Value} ->
-		    ?vt("next_loop_varbind -> value"
-			"~n   Type:  ~p"
-			"~n   Value: ~p", [Type, Value]),
-		    NewVb = Vb#varbind{oid          = VarOid, 
-				       variabletype = Type,
-				       value        = Value},
-		    next_loop_varbinds([], Vbs, MibView, [NewVb | Res], [],
-				       GbMaxVBs);
-		{error, ErrorStatus} ->
-		    ?vdebug("next loop varbinds:"
-			    "~n   ErrorStatus: ~p",[ErrorStatus]),
-		    {ErrorStatus, Vb#varbind.org_index, []}
-	    end;
-	{variable, _ME, VarOid} -> 
-	    ?vt("next_loop_varbind -> variable: "
-		"~n   VarOid: ~p", [VarOid]),
-	    RVb = if LAVb =:= [] -> Vb;
-		     true -> LAVb
-		  end,
-	    NewVb = Vb#varbind{oid = VarOid, value = 'NULL'},
-	    next_loop_varbinds([], [NewVb | Vbs], MibView, Res, RVb, GbMaxVBs);
-	{table, TableOid, TableRestOid, ME} ->
-	    ?vt("next_loop_varbind -> table: "
-		"~n   TableOid:     ~p"
-		"~n   TableRestOid: ~p"
-		"~n   ME:           ~p", [TableOid, TableRestOid, ME]),
-	    next_loop_varbinds({table, TableOid, ME,
-				[{tab_oid(TableRestOid), Vb}]},
-			       Vbs, MibView, Res, [], GbMaxVBs);
-	{subagent, SubAgentPid, SAOid} ->
-	    ?vt("next_loop_varbind -> subagent: "
-		"~n   SubAgentPid: ~p"
-		"~n   SAOid:       ~p", [SubAgentPid, SAOid]),
-	    NewVb = Vb#varbind{variabletype = 'NULL', value = 'NULL'},
-	    next_loop_varbinds({subagent, SubAgentPid, SAOid, [NewVb]},
-			       Vbs, MibView, Res, [], GbMaxVBs)
-    end;
-next_loop_varbinds({table, TableOid, ME, TabOids},
-		   [Vb | Vbs], MibView, Res, _LAVb, GbMaxVBs) ->
-    ?vt("next_loop_varbinds(table) -> entry with"
- 	"~n   TableOid: ~p"
- 	"~n   Vb:       ~p", [TableOid, Vb]),
-    case varbind_next(Vb, MibView) of
-	{table, TableOid, TableRestOid, _ME} ->
-	    next_loop_varbinds({table, TableOid, ME,
-				[{tab_oid(TableRestOid), Vb} | TabOids]},
-			       Vbs, MibView, Res, [], GbMaxVBs);
-	_ ->
-	    case get_next_table(ME, TableOid, TabOids, MibView) of
-		{ok, TabRes, TabEndOfTabVbs} ->
-		    NewVbs = lists:append(TabEndOfTabVbs, [Vb | Vbs]),
-		    NewRes = lists:append(TabRes, Res),
-		    next_loop_varbinds([], NewVbs, MibView, NewRes, [], 
-				       GbMaxVBs);
-		{ErrorStatus, OrgIndex} ->
-		    ?vdebug("next loop varbinds: next varbind"
-			    "~n   ErrorStatus: ~p"
-			    "~n   OrgIndex:    ~p",
-			    [ErrorStatus,OrgIndex]),
-		    {ErrorStatus, OrgIndex, []}
-	    end
-    end;
-next_loop_varbinds({table, TableOid, ME, TabOids},
-		   [], MibView, Res, _LAVb, GbMaxVBs) ->
-    ?vt("next_loop_varbinds(table) -> entry with"
-	"~n   TableOid: ~p", [TableOid]),
-    case get_next_table(ME, TableOid, TabOids, MibView) of
-	{ok, TabRes, TabEndOfTabVbs} ->
- 	    ?vt("next_loop_varbinds(table) -> get_next_table result:"
-		"~n   TabRes:         ~p"
-		"~n   TabEndOfTabVbs: ~p", [TabRes, TabEndOfTabVbs]),
-	    NewRes = lists:append(TabRes, Res),
-	    next_loop_varbinds([], TabEndOfTabVbs, MibView, NewRes, [], 
-			       GbMaxVBs);
-	{ErrorStatus, OrgIndex} ->
-	    ?vdebug("next loop varbinds: next table"
-		    "~n   ErrorStatus: ~p"
-		    "~n   OrgIndex:    ~p",
-		    [ErrorStatus,OrgIndex]),
-	    {ErrorStatus, OrgIndex, []}
-    end;
-next_loop_varbinds({subagent, SAPid, SAOid, SAVbs},
-		   [Vb | Vbs], MibView, Res, _LAVb, GbMaxVBs) ->
-    ?vt("next_loop_varbinds(subagent) -> entry with"
-	"~n   SAPid: ~p"
-	"~n   SAOid: ~p"
- 	"~n   Vb:    ~p", [SAPid, SAOid, Vb]),
-    case varbind_next(Vb, MibView) of
-	{subagent, _SubAgentPid, SAOid} ->
-	    next_loop_varbinds({subagent, SAPid, SAOid,
-				[Vb | SAVbs]},
-			       Vbs, MibView, Res, [], GbMaxVBs);
-	_ ->
-	    case get_next_sa(SAPid, SAOid, SAVbs, MibView) of
-		{ok, SARes, SAEndOfMibViewVbs} ->
-		    NewVbs = lists:append(SAEndOfMibViewVbs, [Vb | Vbs]),
-		    NewRes = lists:append(SARes, Res),
-		    next_loop_varbinds([], NewVbs, MibView, NewRes, [], 
-				       GbMaxVBs);
-		{noSuchName, OrgIndex} ->
-		    %% v1 reply, treat this Vb as endOfMibView, and try again
-		    %% for the others.
-		    case lists:keysearch(OrgIndex, #varbind.org_index, SAVbs) of
-			{value, EVb} ->
-			    NextOid = next_oid(SAOid),
-			    EndOfVb = 
-				EVb#varbind{oid = NextOid,
-					    value = {endOfMibView, NextOid}},
-			    case lists:delete(EVb, SAVbs) of
-				[] ->
-				    next_loop_varbinds([], [EndOfVb, Vb | Vbs],
-						       MibView, Res, [],
-						       GbMaxVBs);
-				TryAgainVbs ->
-				    next_loop_varbinds({subagent, SAPid, SAOid,
-							TryAgainVbs},
-						       [EndOfVb, Vb | Vbs],
-						       MibView, Res, [],
-						       GbMaxVBs)
-			    end;
-			false ->
-			    %% bad index from subagent
-			    {genErr, (hd(SAVbs))#varbind.org_index, []}
-		    end;
-		{ErrorStatus, OrgIndex} ->
- 		    ?vdebug("next loop varbinds: next subagent"
- 			    "~n   Vb:          ~p"
- 			    "~n   ErrorStatus: ~p"
- 			    "~n   OrgIndex:    ~p",
- 			    [Vb,ErrorStatus,OrgIndex]),
-		    {ErrorStatus, OrgIndex, []}
-	    end
-    end;
-next_loop_varbinds({subagent, SAPid, SAOid, SAVbs},
-		   [], MibView, Res, _LAVb, GbMaxVBs) ->
-     ?vt("next_loop_varbinds(subagent) -> entry with"
-	 "~n   SAPid: ~p"
-	 "~n   SAOid: ~p", [SAPid, SAOid]),
-    case get_next_sa(SAPid, SAOid, SAVbs, MibView) of
-	{ok, SARes, SAEndOfMibViewVbs} ->
-	    NewRes = lists:append(SARes, Res),
-	    next_loop_varbinds([], SAEndOfMibViewVbs, MibView, NewRes, [],
-			       GbMaxVBs);
-	{noSuchName, OrgIndex} ->
-	    %% v1 reply, treat this Vb as endOfMibView, and try again for
-	    %% the others.
-	    case lists:keysearch(OrgIndex, #varbind.org_index, SAVbs) of
-		{value, EVb} ->
-		    NextOid = next_oid(SAOid),
-		    EndOfVb = EVb#varbind{oid = NextOid,
-					  value = {endOfMibView, NextOid}},
-		    case lists:delete(EVb, SAVbs) of
-			[] ->
-			    next_loop_varbinds([], [EndOfVb], MibView, Res, [],
-					       GbMaxVBs);
-			TryAgainVbs ->
-			    next_loop_varbinds({subagent, SAPid, SAOid,
-						TryAgainVbs},
-					       [EndOfVb], MibView, Res, [],
-					       GbMaxVBs)
-		    end;
-		false ->
-		    %% bad index from subagent
-		    {genErr, (hd(SAVbs))#varbind.org_index, []}
-	    end;
-	{ErrorStatus, OrgIndex} ->
- 	    ?vdebug("next loop varbinds: next subagent"
- 		    "~n   ErrorStatus: ~p"
- 		    "~n   OrgIndex:    ~p",
- 		    [ErrorStatus,OrgIndex]),
- 	    {ErrorStatus, OrgIndex, []}
-    end;
-next_loop_varbinds([], [], _MibView, Res, _LAVb, _GbMaxVBs) ->
-    ?vt("next_loop_varbinds -> entry when done", []),
-    {noError, 0, Res}.
-
-try_get_instance(_Vb, #me{mfa = {M, F, A}, asn1_type = ASN1Type}) ->
-    ?vtrace("try_get_instance -> entry with"
-	    "~n   M: ~p"
-	    "~n   F: ~p"
-	    "~n   A: ~p", [M,F,A]),
-    Result = (catch dbg_apply(M, F, [get | A])),
-    % mib shall return {value, <a-nice-value-within-range>} |
-    % {noValue, noSuchName} (v1) | 
-    % {noValue, noSuchObject | noSuchInstance} (v2, v1)
-    % everything else (including 'genErr') will generate 'genErr'.
-    make_value_a_correct_value(Result, ASN1Type, {M, F, A}).
-
-tab_oid([]) -> [0];
-tab_oid(X) -> X.
-
-
-%%-----------------------------------------------------------------
-%% Perform a next, using the varbinds Oid if value is simple
-%% value. If value is {endOf<something>, NextOid}, use NextOid.
-%% This case happens when a table has returned endOfTable, or
-%% a subagent has returned endOfMibView.
-%%-----------------------------------------------------------------
-varbind_next(#varbind{value = Value, oid = Oid}, MibView) ->
-    ?vt("varbind_next -> entry with"
- 	"~n   Value:   ~p"
- 	"~n   Oid:     ~p"
- 	"~n   MibView: ~p", [Value, Oid, MibView]),
-    case Value of
-	{endOfTable, NextOid} ->
-	    snmpa_mib:next(get(mibserver), NextOid, MibView);
-	{endOfMibView, NextOid} ->
-	    snmpa_mib:next(get(mibserver), NextOid, MibView);
-	_ ->
-	    snmpa_mib:next(get(mibserver), Oid, MibView)
-    end.
-
-get_next_table(#me{mfa = {M, F, A}}, TableOid, TableOids, MibView) ->
-    % We know that all TableOids have at least a column number as oid
-    ?vt("get_next_table -> entry with"
-	"~n   M:         ~p"
-	"~n   F:         ~p"
-	"~n   A:         ~p"
-	"~n   TableOid:  ~p"
-	"~n   TableOids: ~p"
-	"~n   MibView:   ~p", [M, F, A, TableOid, TableOids, MibView]),
-    Sorted = snmpa_svbl:sort_varbinds_rows(TableOids),
-    case get_next_values_all_rows(Sorted, M,F,A, [], TableOid) of
-	NewVbs when is_list(NewVbs) ->
- 	    ?vt("get_next_table -> "
-		"~n   NewVbs: ~p", [NewVbs]),
-	    % We must now check each Vb for endOfTable and that it is
-	    % in the MibView. If not, it becomes a endOfTable. We 
-	    % collect all of these together.
-	    transform_tab_next_result(NewVbs, {[], []}, MibView);
-	{ErrorStatus, OrgIndex} ->
-	    {ErrorStatus, OrgIndex}
-    end.
-
-get_next_values_all_rows([Row | Rows], M, F, A, Res, TabOid) ->
-    {RowIndex, TableOids} = Row,
-    Cols = delete_index(TableOids),
-    ?vt("get_next_values_all_rows -> "
-	"~n   Cols: ~p", [Cols]),
-    Result = (catch dbg_apply(M, F, [get_next, RowIndex, Cols | A])),
-    ?vt("get_next_values_all_rows -> "
- 	"~n   Result: ~p", [Result]),
-    case validate_tab_next_res(Result, TableOids, {M, F, A}, TabOid) of
-	Values when is_list(Values) -> 
- 	    ?vt("get_next_values_all_rows -> "
- 		"~n   Values: ~p", [Values]),
-	    NewRes = lists:append(Values, Res),
-	    get_next_values_all_rows(Rows, M, F, A, NewRes, TabOid);
-	{ErrorStatus, OrgIndex} ->
-	    {ErrorStatus, OrgIndex}
-    end;
-get_next_values_all_rows([], _M, _F, _A, Res, _TabOid) ->
-    Res.
-
-transform_tab_next_result([Vb | Vbs], {Res, EndOfs}, MibView) ->
-    case Vb#varbind.value of
-	{endOfTable, _} ->
-%% 	    ?vtrace("transform_tab_next_result -> endOfTable: "
-%% 		"split varbinds",[]),
-%% 	    R = split_varbinds(Vbs, Res, [Vb | EndOfs]),
-%% 	    ?vtrace("transform_tab_next_result -> "
-%% 		"~n   R: ~p", [R]),
-%% 	    R;
-	    split_varbinds(Vbs, Res, [Vb | EndOfs]);
-	_ ->
-	    case snmpa_acm:validate_mib_view(Vb#varbind.oid, MibView) of
-		true ->
-		    transform_tab_next_result(Vbs, {[Vb|Res], EndOfs},MibView);
-		_ ->
-		    Oid = Vb#varbind.oid,
-		    NewEndOf = Vb#varbind{value = {endOfTable, Oid}},
-		    transform_tab_next_result(Vbs, {Res, [NewEndOf | EndOfs]},
-					      MibView)
-	    end
-    end;
-transform_tab_next_result([], {Res, EndOfs}, _MibView) ->
-    ?vt("transform_tab_next_result -> entry with: "
- 	"~n   Res:    ~p"
- 	"~n   EndIfs: ~p",[Res, EndOfs]),
-    {ok, Res, EndOfs}.
-
-%%-----------------------------------------------------------------
-%% Three cases:
-%%   1) All values ok
-%%   2) table_func returned {Error, ...}
-%%   3) Some value in Values list is erroneous.
-%% Args: Value is a list of values from table_func(get_next, ...)
-%%       TableOids is a list of {TabRestOid, OrgVb} 
-%%         each element in Values and TableOids correspond to each
-%%         other.
-%% Returns: List of NewVarbinds |
-%%          {ErrorStatus, OrgIndex}
-%%          (In the NewVarbinds list, the value may be endOfTable)
-%%-----------------------------------------------------------------
-validate_tab_next_res(Values, TableOids, Mfa, TabOid) ->
-     ?vt("validate_tab_next_res -> entry with: "
-	 "~n   Values:     ~p"
-	 "~n   TableOids:  ~p"
-	 "~n   Mfa:        ~p"
-	 "~n   TabOid:     ~p", [Values, TableOids, Mfa, TabOid]),
-    {_Col, _ASN1Type, OneIdx} = hd(TableOids),
-    validate_tab_next_res(Values, TableOids, Mfa, [], TabOid,
-			  next_oid(TabOid), OneIdx).
-validate_tab_next_res([{NextOid, Value} | Values],
-		      [{_ColNo, OrgVb, _Index} | TableOids],
-		      Mfa, Res, TabOid, TabNextOid, I) ->
-    ?vt("validate_tab_next_res -> entry with: "
- 	"~n   NextOid:    ~p"
- 	"~n   Value:      ~p"
- 	"~n   Values:     ~p"
- 	"~n   TableOids:  ~p"
- 	"~n   Mfa:        ~p"
- 	"~n   TabOid:     ~p", 
- 	[NextOid, Value, Values, TableOids, Mfa, TabOid]),
-    #varbind{org_index = OrgIndex} = OrgVb,
-    ?vt("validate_tab_next_res -> OrgIndex: ~p", [OrgIndex]),
-    NextCompleteOid = lists:append(TabOid, NextOid),
-    case snmpa_mib:lookup(get(mibserver), NextCompleteOid) of
-	{table_column, #me{asn1_type = ASN1Type}, _TableEntryOid} ->
-  	    ?vt("validate_tab_next_res -> ASN1Type: ~p", [ASN1Type]),
-	    case make_value_a_correct_value({value, Value}, ASN1Type, Mfa) of
-		{error, ErrorStatus} ->
- 		    ?vt("validate_tab_next_res -> "
- 			"~n   ErrorStatus: ~p", [ErrorStatus]),
-		    {ErrorStatus, OrgIndex};
-		{value, Type, NValue} ->
- 		    ?vt("validate_tab_next_res -> "
-     			"~n   Type:   ~p"
-			"~n   NValue: ~p", [Type, NValue]),
-		    NewVb = OrgVb#varbind{oid = NextCompleteOid,
-					  variabletype = Type, value = NValue},
-		    validate_tab_next_res(Values, TableOids, Mfa,
-					  [NewVb | Res], TabOid, TabNextOid, I)
-	    end;
-	Error ->
-	    user_err("Invalid oid ~w from ~w (get_next). Using genErr => ~p",
-		     [NextOid, Mfa, Error]),
-	    {genErr, OrgIndex}
-    end;
-validate_tab_next_res([endOfTable | Values],
-		      [{_ColNo, OrgVb, _Index} | TableOids],
-		      Mfa, Res, TabOid, TabNextOid, I) ->
-     ?vt("validate_tab_next_res(endOfTable) -> entry with: "
-	 "~n   Values:     ~p"
-	 "~n   OrgVb:      ~p"
-	 "~n   TableOids:  ~p"
-	 "~n   Mfa:        ~p"
-	 "~n   Res:        ~p"
-	 "~n   TabOid:     ~p"
-	 "~n   TabNextOid: ~p"
-	 "~n   I:          ~p",
-	 [Values, OrgVb, TableOids, Mfa, Res, TabOid, TabNextOid, I]),
-    NewVb = OrgVb#varbind{value = {endOfTable, TabNextOid}},
-    validate_tab_next_res(Values, TableOids, Mfa, [NewVb | Res],
-			  TabOid, TabNextOid, I);
-validate_tab_next_res([], [], _Mfa, Res, _TabOid, _TabNextOid, _I) ->
-    Res;
-validate_tab_next_res([], [{_Col, _OrgVb, Index}|_], Mfa, _Res, _, _, _I) ->
-    user_err("Too few values returned from ~w (get_next)", [Mfa]),
-    {genErr, Index};
-validate_tab_next_res({genErr, ColNumber}, OrgCols,
-		      Mfa, _Res, _TabOid, _TabNextOid, _I) ->
-    OrgIndex = snmpa_svbl:col_to_orgindex(ColNumber, OrgCols),
-    validate_err(table_next, {genErr, OrgIndex}, Mfa);
-validate_tab_next_res({error, Reason}, [{_ColNo, OrgVb, _Index} | _TableOids],
-		      Mfa, _Res, _TabOid, _TabNextOid, _I) ->
-    #varbind{org_index = OrgIndex} = OrgVb,
-    user_err("Erroneous return value ~w from ~w (get_next)",
-	     [Reason, Mfa]),
-    {genErr, OrgIndex};
-validate_tab_next_res(Error, [{_ColNo, OrgVb, _Index} | _TableOids],
-		      Mfa, _Res, _TabOid, _TabNextOid, _I) ->
-    #varbind{org_index = OrgIndex} = OrgVb,
-    user_err("Invalid return value ~w from ~w (get_next)",
-	     [Error, Mfa]),
-    {genErr, OrgIndex};
-validate_tab_next_res(TooMany, [], Mfa, _Res, _, _, I) ->
-    user_err("Too many values ~w returned from ~w (get_next)",
-	     [TooMany, Mfa]),
-    {genErr, I}.
-
-%%-----------------------------------------------------------------
-%% Func: get_next_sa/4
-%% Purpose: Loop the list of varbinds for the subagent.
-%%          Call subagent_get_next to retreive
-%%          the next varbinds.
-%% Returns: {ok, ListOfNewVbs, ListOfEndOfMibViewsVbs} |
-%%          {ErrorStatus, ErrorIndex}
-%%-----------------------------------------------------------------
-get_next_sa(SAPid, SAOid, SAVbs, MibView) ->
-    case catch subagent_get_next(SAPid, MibView, SAVbs) of
-	{noError, 0, NewVbs} ->
-	    NewerVbs = transform_sa_next_result(NewVbs,SAOid,next_oid(SAOid)),
-	    split_varbinds(NewerVbs, [], []);
-	{ErrorStatus, ErrorIndex, _} ->
-	    {ErrorStatus, ErrorIndex};
-	{'EXIT', Reason} ->
-	    user_err("Lost contact with subagent (next) ~w. Using genErr",
-		     [Reason]),
-	    {genErr, 0}
-    end.
 
-%%-----------------------------------------------------------------
-%% Check for wrong prefix returned or endOfMibView, and convert
-%% into {endOfMibView, SANextOid}.
-%%-----------------------------------------------------------------
-transform_sa_next_result([Vb | Vbs], SAOid, SANextOid)
-  when Vb#varbind.value =:= endOfMibView ->
-    [Vb#varbind{value = {endOfMibView, SANextOid}} |
-     transform_sa_next_result(Vbs, SAOid, SANextOid)];
-transform_sa_next_result([Vb | Vbs], SAOid, SANextOid) ->
-    case lists:prefix(SAOid, Vb#varbind.oid) of
-	true ->
-	    [Vb | transform_sa_next_result(Vbs, SAOid, SANextOid)];
-	_ ->
-	    [Vb#varbind{oid = SANextOid, value = {endOfMibView, SANextOid}} |
-	     transform_sa_next_result(Vbs, SAOid, SANextOid)]
-    end;
-transform_sa_next_result([], _SAOid, _SANextOid) ->
-    [].
-
-split_varbinds([Vb | Vbs], Res, EndOfs) ->
-    case Vb#varbind.value of
-	{endOfMibView, _} -> split_varbinds(Vbs, Res, [Vb | EndOfs]);
-	{endOfTable, _} -> split_varbinds(Vbs, Res, [Vb | EndOfs]);
-	_ -> split_varbinds(Vbs, [Vb | Res], EndOfs)
-    end;
-split_varbinds([], Res, EndOfs) -> {ok, Res, EndOfs}.
+do_get_next(MibView, UnsortedVarbinds) ->
+    Extra     = get(net_if_data),
+    GetModule = get(get_module),
+    GetModule:do_get_next(MibView, UnsortedVarbinds, Extra).
 
-next_oid(Oid) ->
-    case lists:reverse(Oid) of
-	[H | T] -> lists:reverse([H+1 | T]);
-	[] -> []
-    end.
 
 
 %%%-----------------------------------------------------------------
@@ -3623,200 +2850,12 @@ next_oid(Oid) ->
 %%%-----------------------------------------------------------------
 
 do_get_bulk(MibView, NonRepeaters, MaxRepetitions, PduMS, Varbinds, GbMaxVBs) ->
-    ?vtrace("do_get_bulk -> entry with"
-	    "~n   MibView:        ~p"
-	    "~n   NonRepeaters:   ~p"
-	    "~n   MaxRepetitions: ~p"
-	    "~n   PduMS:          ~p"
-	    "~n   Varbinds:       ~p"
-	    "~n   GbMaxVBs:       ~p",
-	    [MibView, NonRepeaters, MaxRepetitions, PduMS, Varbinds, GbMaxVBs]),
-    {NonRepVbs, RestVbs} = split_vbs(NonRepeaters, Varbinds, []),
-    ?vt("do_get_bulk -> split: "
-	"~n   NonRepVbs: ~p"
-	"~n   RestVbs:   ~p", [NonRepVbs, RestVbs]),
-    case do_get_next(MibView, NonRepVbs, GbMaxVBs) of
-	{noError, 0, UResNonRepVbs} ->
-	    ?vt("do_get_bulk -> next noError: "
-		"~n   UResNonRepVbs: ~p", [UResNonRepVbs]),
-	    ResNonRepVbs = lists:keysort(#varbind.org_index, UResNonRepVbs),
-	    %% Decode the first varbinds, produce a reversed list of
-	    %% listOfBytes.
-	    case (catch enc_vbs(PduMS - ?empty_pdu_size, ResNonRepVbs)) of
- 		{error, Idx, Reason} ->
-		    user_err("failed encoding varbind ~w:~n~p", [Idx, Reason]),
-                    {genErr, Idx, []};
-                {SizeLeft, Res} when is_integer(SizeLeft) and is_list(Res) ->
- 		    ?vtrace("do_get_bulk -> encoded: "
-			    "~n   SizeLeft: ~p"
-			    "~n   Res:      ~w", [SizeLeft, Res]),
-		    case (catch do_get_rep(SizeLeft, MibView, MaxRepetitions,
-					   RestVbs, Res, 
-					   length(UResNonRepVbs), GbMaxVBs)) of
-			{error, Idx, Reason} ->
-			    user_err("failed encoding varbind ~w:~n~p", 
-				     [Idx, Reason]),
-			    {genErr, Idx, []};
-			Res when is_list(Res) ->
-			    ?vtrace("do get bulk -> Res: "
-				    "~n   ~w", [Res]),
-			    {noError, 0, conv_res(Res)};
-			{noError, 0, Data} = OK ->
-			    ?vtrace("do get bulk -> OK: "
-				    "~n   length(Data): ~w", [length(Data)]),
-			    OK;
-			Else ->
-			    ?vtrace("do get bulk -> Else: "
-				    "~n   ~w", [Else]),
-			    Else
-		    end;
-		Res when is_list(Res) ->
-		    {noError, 0, conv_res(Res)}
-	    end;
+    Extra     = get(net_if_data),
+    GetModule = get(get_module),
+    GetModule:do_get_bulk(MibView, NonRepeaters, MaxRepetitions,
+                          PduMS, Varbinds, GbMaxVBs,
+                          Extra).
 
-	{ErrorStatus, Index, _} ->
-	    ?vdebug("do get bulk: "
-		    "~n   ErrorStatus: ~p"
-		    "~n   Index:       ~p",[ErrorStatus, Index]),
-	    {ErrorStatus, Index, []}
-    end.
-
-% sz(L) when list(L) -> length(L);
-% sz(B) when binary(B) -> size(B);
-% sz(_) -> unknown.
-
-split_vbs(N, Varbinds, Res) when N =< 0 -> {Res, Varbinds};
-split_vbs(N, [H | T], Res) -> split_vbs(N-1, T, [H | Res]);
-split_vbs(_N, [], Res) -> {Res, []}.
-     
-enc_vbs(SizeLeft, Vbs) ->
-    ?vt("enc_vbs -> entry with"
-	"~n   SizeLeft: ~w", [SizeLeft]),
-    Fun = fun(Vb, {Sz, Res}) when Sz > 0 ->
-		  ?vt("enc_vbs -> (fun) entry with"
-		      "~n   Vb:  ~p"
-		      "~n   Sz:  ~p"
-		      "~n   Res: ~w", [Vb, Sz, Res]),
-		  case (catch snmp_pdus:enc_varbind(Vb)) of
-		      {'EXIT', Reason} ->
-			  ?vtrace("enc_vbs -> encode failed: "
-				  "~n   Reason: ~p", [Reason]),
-			  throw({error, Vb#varbind.org_index, Reason});
-		      X ->
-			  ?vt("enc_vbs -> X: ~w", [X]),
-			  Lx = length(X),
-			  ?vt("enc_vbs -> Lx: ~w", [Lx]),
-			  if
-			      Lx < Sz ->
-				  {Sz - length(X), [X | Res]};
-			      true ->
-				  throw(Res)
-			  end
-		  end;
-	     (_Vb, {_Sz, [_H | T]}) ->
-		  ?vt("enc_vbs -> (fun) entry with"
-		      "~n   T: ~p", [T]),
-		  throw(T);
-	     (_Vb, {_Sz, []}) ->
-		  ?vt("enc_vbs -> (fun) entry", []),
-		  throw([])
-	  end,
-    lists:foldl(Fun, {SizeLeft, []}, Vbs).
-
-do_get_rep(Sz, MibView, MaxRepetitions, Varbinds, Res, GbNumVBs, GbMaxVBs) 
-  when MaxRepetitions >= 0 ->
-    do_get_rep(Sz, MibView, 0, MaxRepetitions, Varbinds, Res, 
-	       GbNumVBs, GbMaxVBs);
-do_get_rep(Sz, MibView, _MaxRepetitions, Varbinds, Res, GbNumVBs, GbMaxVBs) ->
-    do_get_rep(Sz, MibView, 0, 0, Varbinds, Res, GbNumVBs, GbMaxVBs).
-
-conv_res(ResVarbinds) ->
-    conv_res(ResVarbinds, []).
-conv_res([VbListOfBytes | T], Bytes) ->
-    conv_res(T, VbListOfBytes ++ Bytes);
-conv_res([], Bytes) ->
-    Bytes.
-
-%% The only other value, then a positive integer, is infinity.
-do_get_rep(_Sz, _MibView, Count, Max, _, _Res, GbNumVBs, GbMaxVBs) 
-  when (is_integer(GbMaxVBs) andalso (GbNumVBs > GbMaxVBs)) ->
-    ?vinfo("Max Get-BULK VBs limit (~w) exceeded (~w) when:"
-	   "~n   Count: ~p"
-	   "~n   Max:   ~p", [GbMaxVBs, GbNumVBs, Count, Max]),
-    {tooBig, 0, []};
-do_get_rep(_Sz, _MibView, Max, Max, _, Res, _GbNumVBs, _GbMaxVBs) ->
-    ?vt("do_get_rep -> done when: "
-	"~n   Res: ~p", [Res]),
-    {noError, 0, conv_res(Res)};
-do_get_rep(Sz, MibView, Count, Max, Varbinds, Res, GbNumVBs, GbMaxVBs) -> 
-    ?vt("do_get_rep -> entry when: "
-	"~n   Sz:    ~p"
-	"~n   Count: ~p"
-	"~n   Res:   ~w", [Sz, Count, Res]),
-    case try_get_bulk(Sz, MibView, Varbinds, GbMaxVBs) of
-	{noError, NextVarbinds, SizeLeft, Res2} -> 
-	    ?vt("do_get_rep -> noError: "
-		"~n   SizeLeft: ~p"
-		"~n   Res2:     ~p", [SizeLeft, Res2]),
-	    do_get_rep(SizeLeft, MibView, Count+1, Max, NextVarbinds,
-		       Res2 ++ Res, 
-		       GbNumVBs + length(Varbinds), GbMaxVBs);
-	{endOfMibView, _NextVarbinds, _SizeLeft, Res2} -> 
-	    ?vt("do_get_rep -> endOfMibView: "
-		"~n   Res2: ~p", [Res2]),
-	    {noError, 0, conv_res(Res2 ++ Res)};
-	{ErrorStatus, Index} ->
-	    ?vtrace("do_get_rep -> done when error: "
-		    "~n   ErrorStatus: ~p"
-		    "~n   Index:       ~p", [ErrorStatus, Index]),
-	    {ErrorStatus, Index, []}
-    end.
-
-org_index_sort_vbs(Vbs) ->
-    lists:keysort(#varbind.org_index, Vbs).
-
-try_get_bulk(Sz, MibView, Varbinds, GbMaxVBs) -> 
-    ?vt("try_get_bulk -> entry with"
-	"~n   Sz:       ~w"
-	"~n   MibView:  ~w"
-	"~n   Varbinds: ~w", [Sz, MibView, Varbinds]),
-    case do_get_next(MibView, Varbinds, GbMaxVBs) of
-	{noError, 0, UNextVarbinds} -> 
-	    ?vt("try_get_bulk -> noError: "
-		"~n   UNextVarbinds: ~p", [UNextVarbinds]),
-	    NextVarbinds = org_index_sort_vbs(UNextVarbinds),
-	    case (catch enc_vbs(Sz, NextVarbinds)) of
-		{error, Idx, Reason} ->
-		    user_err("failed encoding varbind ~w:~n~p", [Idx, Reason]),
-		    ?vtrace("try_get_bulk -> encode error: "
-			    "~n   Idx:    ~p"
-			    "~n   Reason: ~p", [Idx, Reason]),
-		    {genErr, Idx};
-		{SizeLeft, Res} when is_integer(SizeLeft) andalso 
-				     is_list(Res) ->
-		    ?vt("try get bulk -> encode ok: "
-			"~n   SizeLeft: ~w"
-			"~n   Res:      ~w", [SizeLeft, Res]),
-		    {check_end_of_mibview(NextVarbinds),
-		     NextVarbinds, SizeLeft, Res};
-		Res when is_list(Res) ->
-		    ?vt("try get bulk -> Res: "
-			"~n   ~w", [Res]),
-		    {endOfMibView, [], 0, Res}
-	    end;
-	{ErrorStatus, Index, _} ->
-	    ?vt("try_get_bulk -> error: "
-		"~n   ErrorStatus: ~p"
-		"~n   Index:       ~p", [ErrorStatus, Index]),
-	    {ErrorStatus, Index}
-    end.
-
-%% If all variables in this pass are endOfMibView,
-%% there is no reason to continue.
-check_end_of_mibview([#varbind{value = endOfMibView} | T]) ->
-    check_end_of_mibview(T);
-check_end_of_mibview([]) -> endOfMibView;
-check_end_of_mibview(_) -> noError.
 
 
 %%%--------------------------------------------------
@@ -3834,14 +2873,11 @@ do_subagent_set(Arguments) ->
     SetModule = get(set_module),
     apply(SetModule, do_subagent_set, [Arguments]).
 
+
+
 %%%-----------------------------------------------------------------
 %%% 7. Misc functions
 %%%-----------------------------------------------------------------
-sort_varbindlist(Varbinds) ->
-    snmpa_svbl:sort_varbindlist(get(mibserver), Varbinds).
-
-sa_split(SubagentVarbinds) ->
-    snmpa_svbl:sa_split(SubagentVarbinds).
 
 make_response_pdu(ReqId, ErrStatus, ErrIndex, OrgVarbinds, _ResponseVarbinds)
   when ErrIndex =/= 0 ->
@@ -4139,6 +3175,7 @@ report_err(Val, Mfa, Err) ->
     user_err("Got ~p from ~w. Using ~w", [Val, Mfa, Err]),
     {error, Err}.
 
+
 is_valid_pdu_type('get-request')      -> true;
 is_valid_pdu_type('get-next-request') -> true;
 is_valid_pdu_type('get-bulk-request') -> true;
@@ -4176,33 +3213,8 @@ mapfoldl(F, Eas, Accu0, [Hd|Tail]) ->
 mapfoldl(_F, _Eas, Accu, []) -> {Accu,[]}.
 
 
-%%-----------------------------------------------------------------
-%% Runtime debugging of the agent.
-%%-----------------------------------------------------------------
-
-dbg_apply(M,F,A) ->
-    case get(verbosity) of
-	silence -> 
-	    apply(M,F,A);
-	_ ->
-	    ?vlog("~n   apply: ~w,~w,~p~n", [M,F,A]),
-	    Res = (catch apply(M,F,A)),
-	    case Res of
-		{'EXIT', Reason} ->
-		    ?vinfo("Call to: "
-			   "~n   Module:   ~p"
-			   "~n   Function: ~p"
-			   "~n   Args:     ~p"
-			   "~n"
-			   "~nresulted in an exit"
-			   "~n"
-			   "~n   ~p", [M, F, A, Reason]);
-		_ ->
-		    ?vlog("~n   returned: ~p", [Res])
-	    end,
-	    Res
-    end.
 
+%% ---------------------------------------------------------------------
 
 short_name(none) -> ma;
 short_name(_Pid) -> sa.
@@ -4450,6 +3462,9 @@ get_mib_storage(Opts) ->
 get_set_mechanism(Opts) ->
     get_option(set_mechanism, Opts, snmpa_set).
 
+get_get_mechanism(Opts) ->
+    get_option(get_mechanism, Opts, snmpa_get).
+
 get_authentication_service(Opts) ->
     get_option(authentication_service, Opts, snmpa_acm).
 
diff --git a/lib/snmp/src/agent/snmpa_app.erl b/lib/snmp/src/agent/snmpa_app.erl
index 86ff145e93..c00929c334 100644
--- a/lib/snmp/src/agent/snmpa_app.erl
+++ b/lib/snmp/src/agent/snmpa_app.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. 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.
@@ -67,6 +67,7 @@ convert_config(Opts) ->
 	    SaVerb = get_sub_agent_verbosity(Opts),
 	    [{agent_type,             AgentType}, 
 	     {agent_verbosity,        SaVerb}, 
+	     {get_mechanism,          snmpa_get},
 	     {set_mechanism,          SetModule},
 	     {authentication_service, AuthModule},
 	     {priority,               Prio},
@@ -97,6 +98,7 @@ convert_config(Opts) ->
 			 {verbosity,  ConfVerb}],
 	    [{agent_type,             AgentType}, 
 	     {agent_verbosity,        MaVerb}, 
+	     {get_mechanism,          snmpa_get},
 	     {set_mechanism,          SetModule},
 	     {authentication_service, AuthModule},
 	     {db_dir,                 DbDir},
diff --git a/lib/snmp/src/agent/snmpa_authentication_service.erl b/lib/snmp/src/agent/snmpa_authentication_service.erl
index e4238a8384..b6b9f5bd96 100644
--- a/lib/snmp/src/agent/snmpa_authentication_service.erl
+++ b/lib/snmp/src/agent/snmpa_authentication_service.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. 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,13 +19,27 @@
 %%
 -module(snmpa_authentication_service).
 
--export([behaviour_info/1]).
- 
-behaviour_info(callbacks) ->
-    [{init_check_access, 2}];
-behaviour_info(_) ->
-    undefined.
- 
+-export_type([
+              acm_data/0
+             ]).
+
+-type acm_data() :: {community,
+                     SecModel  :: 0 | 1 | 2 | 3, % any | v1 | v2c | v3
+                     Community :: string(),
+                     %% Oids for either:
+                     %%      transportDomainUdpIpv4 | transportDomainUdpIpv6
+                     TDomain   :: snmp:oid(),
+                     TAddress  :: [non_neg_integer()]} |
+                    {v3,
+                     MsgID           :: integer(),
+                     SecModel        :: 0 | 1 | 2 | 3, % any | v1 | v2c | v3
+                     SecName         :: string(),
+                     %% noAuthNoPriv | authNoPriv | authPriv
+                     SecLevel        :: 1 | 2 | 3,
+                     ContextEngineID :: string(),
+                     ContextName     :: string(),
+                     SecData         :: term()}.
+
 
 %%-----------------------------------------------------------------
 %% init_check_access(Pdu, ACMData)
@@ -46,9 +60,7 @@ behaviour_info(_) ->
 %%        Variable        = snmpInBadCommunityNames |
 %%                          snmpInBadCommunityUses |
 %%                          snmpInASNParseErrs
-%%        Reason          = snmp_message_decoding |
-%%                          {bad_community_name, Address, Community}} |
-%%                          {invalid_access, Access, Op}
+%%        Reason          = {bad_community_name, Address, Community}}
 %%
 %% Purpose: Called once for each Pdu.  Returns a MibView
 %%          which is later used for each variable in the pdu.
@@ -57,3 +69,14 @@ behaviour_info(_) ->
 %%
 %% NOTE: This function is executed in the Master agents's context
 %%-----------------------------------------------------------------
+
+-callback init_check_access(Pdu, ACMData) ->
+    {ok, MibView, ContextName} |
+    {error, Reason} |
+    {discarded, Variable, Reason} when
+      Pdu         :: snmp:pdu(),
+      ACMData     :: acm_data(),
+      MibView     :: snmp_view_based_acm_mib:mibview(),
+      ContextName :: string(),
+      Reason      :: term(),
+      Variable    :: snmpInBadCommunityNames.
diff --git a/lib/snmp/src/agent/snmpa_conf.erl b/lib/snmp/src/agent/snmpa_conf.erl
index fc5116dac9..c2e9d4025a 100644
--- a/lib/snmp/src/agent/snmpa_conf.erl
+++ b/lib/snmp/src/agent/snmpa_conf.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2019. 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.
@@ -83,6 +83,34 @@
 
 
 
+-export_type([
+              usm_entry/0
+             ]).
+
+-type usm_entry() :: {
+                      EngineID    :: string(),
+                      UserName    :: string(),
+                      SecName     :: string(),
+                      Clone       :: zeroDotZero | [non_neg_integer()],
+                      AuthP       :: usmNoAuthProtocol |
+                                     usmHMACMD5AuthProtocol |
+                                     usmHMACSHAAuthProtocol,
+                      AuthKeyC    :: string(),
+                      OwnAuthKeyC :: string(),
+                      PrivP       :: usmNoPrivProtocol |
+                                     usmDESPrivProtocol |
+                                     usmAesCfb128Protocol,
+                      PrivKeyC    :: string(),
+                      OwnPrivKeyC :: string(),
+                      Public      :: string(),
+                      %% Size 16 for usmHMACMD5AuthProtocol
+                      %% Size 20 for usmHMACSHAAuthProtocol
+                      AuthKey     :: [non_neg_integer()],
+                      %% Size 16 for usmDESPrivProtocol | usmAesCfb128Protocol
+                      PrivKey     :: [non_neg_integer()]
+                     }.
+
+
 %%
 %% ------ agent.conf ------
 %%
diff --git a/lib/snmp/src/agent/snmpa_discovery_handler.erl b/lib/snmp/src/agent/snmpa_discovery_handler.erl
index ffdd6aca1e..6fb1d1eb72 100644
--- a/lib/snmp/src/agent/snmpa_discovery_handler.erl
+++ b/lib/snmp/src/agent/snmpa_discovery_handler.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2019. 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,12 +19,17 @@
 %%
 -module(snmpa_discovery_handler).
 
--export([behaviour_info/1, verify/1]).
-
-behaviour_info(callbacks) ->
-    [{stage1_finish, 3}];
-behaviour_info(_) ->
-    undefined.
+-export([verify/1]).
 
+-callback stage1_finish(TargetName, ManagerEngineID, ExtraInfo) ->
+    ignore |
+    {ok, snmpa_conf:usm_entry() | [snmpa_conf:usm_entry()]} |
+    {ok, snmpa_conf:usm_entry() | [snmpa_conf:usm_entry()], NewExtraInfo} when
+      TargetName      :: string(),
+      ManagerEngineID :: string(),
+      ExtraInfo       :: term(),
+      NewExtraInfo    :: term().
+      
 verify(Mod) ->
     snmp_misc:verify_behaviour(?MODULE, Mod).
+
diff --git a/lib/snmp/src/agent/snmpa_error_report.erl b/lib/snmp/src/agent/snmpa_error_report.erl
index 8f28eac653..6b281693e5 100644
--- a/lib/snmp/src/agent/snmpa_error_report.erl
+++ b/lib/snmp/src/agent/snmpa_error_report.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. 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,10 +19,12 @@
 %%
 -module(snmpa_error_report).
 
--export([behaviour_info/1]).
+-callback config_err(Format, Args) ->
+    snmp:void() when
+      Format :: string(),
+      Args   :: [term()].
 
-behaviour_info(callbacks) ->
-    [{user_err,   2},
-     {config_err, 2}];
-behaviour_info(_) ->
-    undefined.
+-callback user_err(Format, Args) ->
+    snmp:void() when
+      Format :: string(),
+      Args   :: [term()].
diff --git a/lib/snmp/src/agent/snmpa_get.erl b/lib/snmp/src/agent/snmpa_get.erl
new file mode 100644
index 0000000000..8b16016d84
--- /dev/null
+++ b/lib/snmp/src/agent/snmpa_get.erl
@@ -0,0 +1,1175 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019-2019. 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(snmpa_get).
+
+-behaviour(snmpa_get_mechanism).
+
+
+%%%-----------------------------------------------------------------
+%%% snmpa_get_mechanism exports
+%%%-----------------------------------------------------------------
+
+-export([
+         do_get/3, do_get/4,
+         do_get_next/3,
+         do_get_bulk/7
+        ]).
+
+-define(VMODULE,"GET").
+-include("snmpa_internal.hrl").
+-include("snmp_types.hrl").
+-include("snmp_debug.hrl").
+-include("snmp_verbosity.hrl").
+
+-ifndef(default_verbosity).
+-define(default_verbosity,silence).
+-endif.
+
+-define(empty_pdu_size, 21).
+
+-ifdef(snmp_extended_verbosity).
+-define(vt(F,A), ?vtrace(F, A)).
+-else.
+-define(vt(_F, _A), ok).
+-endif.
+
+
+-define(AGENT, snmpa_agent).
+-define(LIB,   snmpa_get_lib).
+
+
+
+%%%-----------------------------------------------------------------
+%%% 3. GET REQUEST
+%%% --------------
+%%%   According to RFC1157, section 4.1.2 and RFC1905, section 4.2.1.
+%%%   In rfc1157:4.1.2 it isn't specified if noSuchName should be
+%%%   returned even if some other varbind generates a genErr.
+%%%   In rfc1905:4.2.1 this is not a problem since exceptions are
+%%%   used, and thus a genErr will be returned anyway.
+%%%-----------------------------------------------------------------
+
+%%-----------------------------------------------------------------
+%% Func: do_get/2
+%% Purpose: Handles all VBs in a request that is inside the 
+%%          mibview (local).
+%% Returns: {noError, 0, ListOfNewVarbinds} |
+%%          {ErrorStatus, ErrorIndex, []}
+%%-----------------------------------------------------------------
+
+%% There is now to properly spec the behaviour of the ?AGENT:subagent_get/3
+%% function (it *can* exit).
+-dialyzer({nowarn_function, do_get/3}).
+do_get(UnsortedVarbinds, IsNotification, _Extra) ->
+    {MyVarbinds, SubagentVarbinds} = ?LIB:agent_sort_vbs(UnsortedVarbinds),
+    case do_get_local(MyVarbinds, IsNotification) of
+	{noError, 0, NewMyVarbinds} ->
+	    case do_get_subagents(SubagentVarbinds, IsNotification) of
+		{noError, 0, NewSubagentVarbinds} ->
+		    {noError, 0, NewMyVarbinds ++ NewSubagentVarbinds};
+		{ErrorStatus, ErrorIndex, _} ->
+		    {ErrorStatus, ErrorIndex, []}
+	    end;
+	{ErrorStatus, ErrorIndex, _} -> 
+	    {ErrorStatus, ErrorIndex, []}
+    end.
+
+
+%%-----------------------------------------------------------------
+%% Func: do_get/3
+%% Purpose: do_get handles "getRequests".
+%% Pre: incoming varbinds have type == 'NULL', value == unSpecified
+%% Returns: {noError, 0, ListOfNewVarbinds} |
+%%          {ErrorStatus, ErrorIndex, []}
+%%-----------------------------------------------------------------
+
+do_get(MibView, UnsortedVarbinds, IsNotification, Extra) ->
+    ?vtrace("do_get -> entry with"
+	    "~n   MibView:          ~p"
+	    "~n   UnsortedVarbinds: ~p"
+	    "~n   IsNotification:   ~p", 
+	    [MibView, UnsortedVarbinds, IsNotification]),
+    %% This is me, the master, so go ahead
+    {OutSideView, InSideView} = ?LIB:split_vbs_view(UnsortedVarbinds, MibView),
+    {Error, Index, NewVbs}    = do_get(InSideView, IsNotification, Extra),
+    {Error, Index, NewVbs ++ OutSideView}.
+
+
+
+%%-----------------------------------------------------------------
+%% Func: do_get_local/2,3
+%% Purpose: Loop the variablebindings list. We know that each varbind
+%%          in that list belongs to us.
+%% Returns: {noError, 0, ListOfNewVarbinds} |
+%%          {ErrorStatus, ErrorIndex, []}
+%%-----------------------------------------------------------------
+
+do_get_local(VBs, IsNotification) ->
+    do_get_local(VBs, [], IsNotification).
+
+-dialyzer({nowarn_function, do_get_local/3}).
+do_get_local([Vb | Vbs], Res, IsNotification) ->
+    case try_get(Vb, IsNotification) of
+	NewVb when is_record(NewVb, varbind) ->
+	    do_get_local(Vbs, [NewVb | Res], IsNotification);
+	ListOfNewVb when is_list(ListOfNewVb) ->
+	    do_get_local(Vbs, lists:append(ListOfNewVb, Res), IsNotification);
+	{error, Error, OrgIndex} ->
+	    {Error, OrgIndex, []}
+    end;
+do_get_local([], Res, _IsNotification) -> 
+    {noError, 0, Res}.
+
+
+
+%%-----------------------------------------------------------------
+%% Func: do_get_subagents/2
+%% Purpose: Loop the list of varbinds for different subagents.
+%%          For each of them, call sub_agent_get to retreive
+%%          the values for them.
+%% Returns: {noError, 0, ListOfNewVarbinds} |
+%%          {ErrorStatus, ErrorIndex, []}
+%%-----------------------------------------------------------------
+
+%% There is now to properly spec the behaviour of the ?AGENT:subagent_get/3
+%% function (it *can* exit).
+-dialyzer({nowarn_function, do_get_subagents/3}).
+do_get_subagents(SubagentVarbinds, IsNotification) ->
+    do_get_subagents(SubagentVarbinds, [], IsNotification).
+
+do_get_subagents([{SubAgentPid, SAVbs} | Tail], Res, IsNotification) ->
+    {_SAOids, Vbs} = ?LIB:sa_split(SAVbs),
+    case (catch ?AGENT:subagent_get(SubAgentPid, Vbs, IsNotification)) of
+	{noError, 0, NewVbs} ->
+	    do_get_subagents(Tail, lists:append(NewVbs, Res), IsNotification);
+	{ErrorStatus, ErrorIndex, _} ->
+	    {ErrorStatus, ErrorIndex, []};
+	{'EXIT', Reason} ->
+	    ?LIB:user_err("Lost contact with subagent (get) ~w. Using genErr", 
+                          [Reason]),
+	    {genErr, 0, []} 
+    end;
+do_get_subagents([], Res, _IsNotification) ->
+    {noError, 0, Res}.
+
+
+%%-----------------------------------------------------------------
+%% Func: try_get/2
+%% Returns: {error, ErrorStatus, OrgIndex} |
+%%          #varbind |
+%%          List of #varbind
+%%-----------------------------------------------------------------
+
+-dialyzer({nowarn_function, try_get/2}).
+try_get(IVb, IsNotification) when is_record(IVb, ivarbind) ->
+    ?vtrace("try_get(ivarbind) -> entry with"
+	    "~n   IVb: ~p", [IVb]),
+    get_var_value_from_ivb(IVb, IsNotification);
+try_get({TableOid, TableVbs}, IsNotification) ->
+    ?vtrace("try_get(table) -> entry with"
+	    "~n   TableOid: ~p"
+	    "~n   TableVbs: ~p", [TableOid, TableVbs]),
+    [#ivarbind{mibentry = MibEntry}|_] = TableVbs,
+    {NoAccessVbs, AccessVbs} =
+	check_all_table_vbs(TableVbs, IsNotification, [], []),
+    case get_tab_value_from_mib(MibEntry, TableOid, AccessVbs) of
+	{error, ErrorStatus, OrgIndex} ->
+	    {error, ErrorStatus, OrgIndex};
+	NVbs ->
+	    NVbs ++ NoAccessVbs
+    end.
+
+
+%%-----------------------------------------------------------------
+%% Make sure all requested columns are accessible.
+%%-----------------------------------------------------------------
+
+-dialyzer({nowarn_function, check_all_table_vbs/4}).
+check_all_table_vbs([IVb| IVbs], IsNotification, NoA, A) ->
+    #ivarbind{mibentry = Me, varbind = Vb} = IVb,
+    case Me#me.access of
+	'not-accessible' -> 
+	    NNoA = [Vb#varbind{value = noSuchInstance} | NoA],
+	    check_all_table_vbs(IVbs, IsNotification, NNoA, A);
+	'accessible-for-notify' when IsNotification =:= false -> 
+	    NNoA = [Vb#varbind{value = noSuchInstance} | NoA],
+	    check_all_table_vbs(IVbs, IsNotification, NNoA, A);
+	'write-only' -> 
+	    NNoA = [Vb#varbind{value = noSuchInstance} | NoA],
+	    check_all_table_vbs(IVbs, IsNotification, NNoA, A);
+	_ ->
+	    check_all_table_vbs(IVbs, IsNotification, NoA, [IVb | A])
+    end;
+check_all_table_vbs([], _IsNotification, NoA, A) -> {NoA, A}.
+
+%%-----------------------------------------------------------------
+%% Returns: {error, ErrorStatus, OrgIndex} |
+%%          #varbind
+%%-----------------------------------------------------------------
+-dialyzer({nowarn_function, get_var_value_from_ivb/2}).
+get_var_value_from_ivb(IVb, IsNotification)
+  when IVb#ivarbind.status =:= noError ->
+    ?vtrace("get_var_value_from_ivb(noError) -> entry", []),
+    #ivarbind{mibentry = Me, varbind = Vb} = IVb,
+    #varbind{org_index = OrgIndex, oid = Oid} = Vb,
+    case Me#me.access of
+	'not-accessible' -> 
+	    Vb#varbind{value = noSuchInstance};
+	'accessible-for-notify' when IsNotification =:= false -> 
+	    Vb#varbind{value = noSuchInstance};
+	'write-only' -> 
+	    Vb#varbind{value = noSuchInstance};
+	_ -> 
+	    case get_var_value_from_mib(Me, Oid) of
+		{value, Type, Value} ->
+		    Vb#varbind{variabletype = Type, value = Value};
+		{error, ErrorStatus} ->
+		    {error, ErrorStatus, OrgIndex}
+	    end
+    end;
+get_var_value_from_ivb(#ivarbind{status = Status, varbind = Vb}, _) ->
+    ?vtrace("get_var_value_from_ivb(~p) -> entry", [Status]),
+    Vb#varbind{value = Status}.
+
+%%-----------------------------------------------------------------
+%% Func: get_var_value_from_mib/1
+%% Purpose: 
+%% Returns: {error, ErrorStatus} |
+%%          {value, Type, Value}
+%%-----------------------------------------------------------------
+%% Pre: Oid is a correct instance Oid (lookup checked that).
+%% Returns: A correct return value (see ?AGENT:make_value_a_correct_value)
+-dialyzer({nowarn_function, get_var_value_from_mib/2}).
+get_var_value_from_mib(#me{entrytype = variable,
+			   asn1_type = ASN1Type,
+			   mfa       = {Mod, Func, Args}},
+		       _Oid) ->
+    ?vtrace("get_var_value_from_mib(variable) -> entry when"
+	    "~n   Mod:  ~p"
+	    "~n   Func: ~p"
+	    "~n   Args: ~p", [Mod, Func, Args]),
+    Result = (catch ?LIB:dbg_apply(Mod, Func, [get | Args])),
+    %% mib shall return {value, <a-nice-value-within-range>} |
+    %% {noValue, noSuchName} (v1) | 
+    %% {noValue, noSuchObject | noSuchInstance} (v2, v1)
+    %% everything else (including 'genErr') will generate 'genErr'.
+    ?AGENT:make_value_a_correct_value(Result, ASN1Type, {Mod, Func, Args});
+
+get_var_value_from_mib(#me{entrytype = table_column,
+			   oid       = MeOid,
+			   asn1_type = ASN1Type,
+			   mfa       = {Mod, Func, Args}},
+		       Oid) ->
+    ?vtrace("get_var_value_from_mib(table_column) -> entry when"
+	    "~n   MeOid: ~p"
+	    "~n   Mod:   ~p"
+	    "~n   Func:  ~p"
+	    "~n   Args:  ~p"
+	    "~n   Oid:   ~p", [MeOid, Mod, Func, Args, Oid]),
+    Col = lists:last(MeOid),
+    Indexes = snmp_misc:diff(Oid, MeOid),
+    [Result] = (catch ?LIB:dbg_apply(Mod, Func, [get, Indexes, [Col] | Args])),
+    ?AGENT:make_value_a_correct_value(Result, ASN1Type, 
+                                      {Mod, Func, Args, Indexes, Col}).
+
+
+%% For table operations we need to pass RestOid down to the table-function.
+%% Its up to the table-function to check for noSuchInstance (ex: a 
+%% non-existing row).
+%% Returns: {error, ErrorStatus, OrgIndex} |
+%%          {value, Type, Value}
+-dialyzer({nowarn_function, get_tab_value_from_mib/3}).
+get_tab_value_from_mib(#me{mfa = {Mod, Func, Args}}, TableOid, TableVbs) ->
+    ?vtrace("get_tab_value_from_mib -> entry when"
+	    "~n   Mod:  ~p"
+	    "~n   Func: ~p"
+	    "~n   Args: ~p", [Mod, Func, Args]),
+    TableOpsWithShortOids = ?LIB:delete_prefixes(TableOid, TableVbs),
+    SortedVBsRows = snmpa_svbl:sort_varbinds_rows(TableOpsWithShortOids), 
+    case get_value_all_rows(SortedVBsRows, Mod, Func, Args, []) of
+	{Error, Index} ->
+	    #ivarbind{varbind = Vb} = lists:nth(Index, TableVbs),
+	    {error, Error, Vb#varbind.org_index};
+	ListOfValues -> 
+	    merge_varbinds_and_value(TableVbs, ListOfValues)
+    end.
+
+%%-----------------------------------------------------------------
+%% Values is a scrambled list of {CorrectValue, Index}, where Index
+%% is index into the #ivarbind list. So for each Value, we must
+%% find the corresponding #ivarbind, and merge them into a new
+%% #varbind.
+%% The Values list comes from validate_tab_res.
+%%-----------------------------------------------------------------
+-dialyzer({nowarn_function, merge_varbinds_and_value/2}).
+merge_varbinds_and_value(IVbs, [{{value, Type, Value}, Index} | Values]) ->
+    #ivarbind{varbind = Vb} = lists:nth(Index, IVbs),
+    [Vb#varbind{variabletype = Type, value = Value} |
+     merge_varbinds_and_value(IVbs, Values)];
+merge_varbinds_and_value(_, []) -> [].
+    
+-dialyzer({nowarn_function, get_value_all_rows/5}).
+get_value_all_rows([{[], OrgCols} | Rows], Mod, Func, Args, Res) ->
+    ?vtrace("get_value_all_rows -> entry when"
+	    "~n   OrgCols: ~p", [OrgCols]),
+    Cols   = [{{value, noValue, noSuchInstance}, Index} || 
+		 {_Col, _ASN1Type, Index} <- OrgCols], 
+    NewRes = lists:append(Cols, Res),
+    get_value_all_rows(Rows, Mod, Func, Args, NewRes);
+get_value_all_rows([{RowIndex, OrgCols} | Rows], Mod, Func, Args, Res) ->
+    ?vtrace("get_value_all_rows -> entry when"
+	    "~n   RowIndex: ~p"
+	    "~n   OrgCols:  ~p", [RowIndex, OrgCols]),
+    {DOrgCols, Dup} = remove_duplicates(OrgCols),
+    Cols   = delete_index(DOrgCols),
+    Result = (catch ?LIB:dbg_apply(Mod, Func, [get, RowIndex, Cols | Args])),
+    case validate_tab_res(Result, DOrgCols, {Mod, Func, Args}) of
+	Values when is_list(Values) ->
+	    NVals  = restore_duplicates(Dup, Values),
+	    NewRes = lists:append(NVals, Res),
+	    get_value_all_rows(Rows, Mod, Func, Args, NewRes);
+	{error, ErrorStatus, Index} ->
+	    ?AGENT:validate_err(row_set, {ErrorStatus, Index}, {Mod, Func, Args})
+    end;
+get_value_all_rows([], _Mod, _Func, _Args, Res) -> 
+    ?vtrace("get_value_all_rows -> entry when done"
+	    "~n   Res: ~p", [Res]),
+    Res.
+
+%%-----------------------------------------------------------------
+%% Args: {RowIndex, list of {ShortOid, ASN1Type}}
+%% Returns: list of Col
+%%-----------------------------------------------------------------
+delete_index([{Col, _Val, _OrgIndex} | T]) ->
+    [Col | delete_index(T)];
+delete_index([]) -> [].
+
+%%-----------------------------------------------------------------
+%% This function is called before 'get' on a table, and removes
+%% any duplicate columns.  It returns {Cols, DupInfo}.  The Cols
+%% are the unique columns.  The instrumentation function is
+%% called to get the values.  These values, together with the
+%% DupInfo, is later passed to restore_duplicates, which uses
+%% the retrieved values to reconstruct the original column list,
+%% but with the retrieved value for each column.
+%%-----------------------------------------------------------------
+
+-dialyzer({nowarn_function, remove_duplicates/1}).
+remove_duplicates(Cols) ->
+    remove_duplicates(Cols, [], []).
+
+
+-dialyzer({nowarn_function, remove_duplicates/3}).
+remove_duplicates([{Col, V1, OrgIdx1}, {Col, V2, OrgIdx2} | T], NCols, Dup) ->
+    remove_duplicates([{Col, V1, OrgIdx1} | T], NCols, 
+		      [{Col, V2, OrgIdx2} | Dup]);
+remove_duplicates([Col | T], NCols, Dup) ->
+    remove_duplicates(T, [Col | NCols], Dup);
+remove_duplicates([], NCols, Dup) ->
+    {lists:reverse(NCols), lists:reverse(Dup)}.
+
+-dialyzer({nowarn_function, restore_duplicates/2}).
+restore_duplicates([], Cols) ->
+    [{Val, OrgIndex} || {_Col, Val, OrgIndex} <- Cols];
+restore_duplicates([{Col, _Val2, OrgIndex2} | Dup],
+		   [{Col, NVal, OrgIndex1} | Cols]) ->
+    [{NVal, OrgIndex2} |
+     restore_duplicates(Dup, [{Col, NVal, OrgIndex1} | Cols])];
+restore_duplicates(Dup, [{_Col, Val, OrgIndex} | T]) ->
+    [{Val, OrgIndex} | restore_duplicates(Dup, T)].
+
+
+
+%%-----------------------------------------------------------------
+%% Three cases:
+%%   1) All values ok
+%%   2) table_func returned {Error, ...}
+%%   3) Some value in Values list is erroneous.
+%% Args: Value is a list of values from table_func(get..)
+%%       OrgCols is a list with {Col, ASN1Type, OrgIndex} 
+%%         each element in Values and OrgCols correspond to each
+%%         other.
+%%-----------------------------------------------------------------
+-dialyzer({nowarn_function, validate_tab_res/3}).
+validate_tab_res(Values, OrgCols, Mfa) when is_list(Values) ->
+    {_Col, _ASN1Type, OneIdx} = hd(OrgCols),
+    validate_tab_res(Values, OrgCols, Mfa, [], OneIdx);
+validate_tab_res({noValue, Error}, OrgCols, Mfa) ->
+    Values = lists:duplicate(length(OrgCols), {noValue, Error}),
+    validate_tab_res(Values, OrgCols, Mfa);
+validate_tab_res({genErr, Col}, OrgCols, Mfa) ->
+    case lists:keysearch(Col, 1, OrgCols) of
+	{value, {_Col, _ASN1Type, Index}} ->
+	    {error, genErr, Index};
+	_ ->
+	    ?LIB:user_err("Invalid column in {genErr, ~w} from ~w (get)",
+                          [Col, Mfa]),
+	    [{_Col, _ASN1Type, Index} | _] = OrgCols,
+	    {error, genErr, Index}
+    end;
+validate_tab_res(genErr, [{_Col, __ASN1Type, Index} | _OrgCols], _Mfa) ->
+    {error, genErr, Index};
+validate_tab_res(Error, [{_Col, _ASN1Type, Index} | _OrgCols], Mfa) ->
+    ?LIB:user_err("Invalid return value ~w from ~w (get)",[Error, Mfa]),
+    {error, genErr, Index}.
+
+-dialyzer({nowarn_function, validate_tab_res/5}).
+validate_tab_res([Value | Values], 
+		 [{Col, ASN1Type, Index} | OrgCols],
+		 Mfa, Res, I) ->
+    %% This one makes it possible to return a list of genErr, which
+    %% is not allowed according to the manual.  But that's ok, as
+    %% everything else will generate a genErr! (the only problem is
+    %% that it won't generate a user_error).
+    case ?AGENT:make_value_a_correct_value(Value, ASN1Type, Mfa) of
+	{error, ErrorStatus} ->
+	    {error, ErrorStatus, Index};
+	CorrectValue ->
+	    NewRes = [{Col, CorrectValue, Index} | Res],
+	    validate_tab_res(Values, OrgCols, Mfa, NewRes, I)
+    end;
+validate_tab_res([], [], _Mfa, Res, _I) -> 
+    lists:reverse(Res);
+validate_tab_res([], [{_Col, _ASN1Type, Index}|_], Mfa, _Res, _I) ->
+    ?LIB:user_err("Too few values returned from ~w (get)", [Mfa]),
+    {error, genErr, Index};
+validate_tab_res(_TooMany, [], Mfa, _Res, I) ->
+    ?LIB:user_err("Too many values returned from ~w (get)", [Mfa]),
+    {error, genErr, I}.
+
+
+
+%%%-----------------------------------------------------------------
+%%% 4. GET-NEXT REQUEST
+%%% --------------
+%%%   According to RFC1157, section 4.1.3 and RFC1905, section 4.2.2.
+%%%-----------------------------------------------------------------
+%%-----------------------------------------------------------------
+%% Func: do_get_next/3
+%% Purpose: do_get_next handles "getNextRequests".
+%% Note: Even if it is SNMPv1, a varbind's value can be
+%%       endOfMibView. This is converted to noSuchName in process_pdu.
+%% Returns: {noError, 0, ListOfNewVarbinds} |
+%%          {ErrorStatus, ErrorIndex, []}
+%% Note2: ListOfNewVarbinds is not sorted in any order!!!
+%% Alg: First, the variables are sorted in OID order.
+%%
+%%      Second, next in the MIB is performed for each OID, and
+%%      the result is collected as: if next oid is a variable,
+%%      perform a get to retrieve its value; if next oid is in a
+%%      table, save this value and continue until we get an oid
+%%      outside this table. Then perform get_next on the table,
+%%      and continue with all endOfTables and the oid outside the
+%%      table; if next oid is an subagent, save this value and
+%%      continue as in the table case.
+%%
+%%      Third, each response is checked for endOfMibView, or (for
+%%      subagents) that the Oid returned has the correct prefix.
+%%      (This is necessary since an SA can be registered under many
+%%      separated subtrees, and if the last variable in the first
+%%      subtree is requested in a next, the SA will return the first
+%%      variable in the second subtree. This might be working, since
+%%      there may be a variable in between these subtrees.) For each
+%%      of these, a new get-next is performed, one at a time.
+%%      This alg. might be optimised in several ways. The most 
+%%      striking one is that the same SA might be called several
+%%      times, when one time should be enough. But it isn't clear
+%%      that this really matters, since many nexts across the same
+%%      subagent must be considered to be very rare.
+%%-----------------------------------------------------------------
+
+do_get_next(MibView, UnsortedVBs, _Extra) ->
+    do_get_next2(MibView, UnsortedVBs, infinity).
+
+%% The third argument is only used if we are called as result
+%% of a get-bulk request.
+do_get_next2(_MibView, UnsortedVarbinds, GbMaxVBs) 
+  when (is_integer(GbMaxVBs) andalso (length(UnsortedVarbinds) > GbMaxVBs)) ->
+    {tooBig, 0, []}; % What is the correct index in this case?
+do_get_next2(MibView, UnsortedVBs, GbMaxVBs) ->
+    ?vt("do_get_next2 -> entry when"
+ 	"~n   MibView:          ~p"
+ 	"~n   UnsortedVBs: ~p", [MibView, UnsortedVBs]),
+    SortedVBs = ?LIB:oid_sort_vbs(UnsortedVBs),
+    ?vt("do_get_next -> "
+ 	"~n   SortedVBs: ~p", [SortedVBs]),
+    next_loop_varbinds([], SortedVBs, MibView, [], [], GbMaxVBs).
+
+next_loop_varbinds(_, Vbs, _MibView, Res, _LAVb, GbMaxVBs) 
+  when (is_integer(GbMaxVBs) andalso 
+	((length(Vbs) + length(Res)) > GbMaxVBs)) ->
+    {tooBig, 0, []}; % What is the correct index in this case?
+
+%% LAVb is Last Accessible Vb
+next_loop_varbinds([], [Vb | Vbs], MibView, Res, LAVb, GbMaxVBs) ->
+    ?vt("next_loop_varbinds -> entry when"
+ 	"~n   Vb:      ~p"
+ 	"~n   MibView: ~p", [Vb, MibView]),
+    case varbind_next(Vb, MibView) of
+	endOfMibView ->
+	    ?vt("next_loop_varbind -> endOfMibView", []),
+	    RVb = if LAVb =:= [] -> Vb;
+		     true -> LAVb
+		  end,
+	    NewVb = RVb#varbind{variabletype = 'NULL', value = endOfMibView},
+	    next_loop_varbinds([], Vbs, MibView, [NewVb | Res], [], GbMaxVBs);
+
+	{variable, ME, VarOid} when ((ME#me.access =/= 'not-accessible') andalso 
+				     (ME#me.access =/= 'write-only') andalso 
+				     (ME#me.access =/= 'accessible-for-notify')) -> 
+	    ?vt("next_loop_varbind -> variable: "
+		"~n   ME:     ~p"
+		"~n   VarOid: ~p", [ME, VarOid]),
+	    case try_get_instance(Vb, ME) of
+		{value, noValue, _NoSuchSomething} ->
+		    ?vt("next_loop_varbind -> noValue", []),
+		    %% Try next one
+		    NewVb = Vb#varbind{oid   = VarOid, 
+				       value = 'NULL'},
+		    next_loop_varbinds([], [NewVb | Vbs], MibView, Res, [], 
+				       GbMaxVBs);
+		{value, Type, Value} ->
+		    ?vt("next_loop_varbind -> value"
+			"~n   Type:  ~p"
+			"~n   Value: ~p", [Type, Value]),
+		    NewVb = Vb#varbind{oid          = VarOid, 
+				       variabletype = Type,
+				       value        = Value},
+		    next_loop_varbinds([], Vbs, MibView, [NewVb | Res], [],
+				       GbMaxVBs);
+		{error, ErrorStatus} ->
+		    ?vdebug("next loop varbinds:"
+			    "~n   ErrorStatus: ~p",[ErrorStatus]),
+		    {ErrorStatus, Vb#varbind.org_index, []}
+	    end;
+	{variable, _ME, VarOid} -> 
+	    ?vt("next_loop_varbind -> variable: "
+		"~n   VarOid: ~p", [VarOid]),
+	    RVb = if LAVb =:= [] -> Vb;
+		     true -> LAVb
+		  end,
+	    NewVb = Vb#varbind{oid = VarOid, value = 'NULL'},
+	    next_loop_varbinds([], [NewVb | Vbs], MibView, Res, RVb, GbMaxVBs);
+	{table, TableOid, TableRestOid, ME} ->
+	    ?vt("next_loop_varbind -> table: "
+		"~n   TableOid:     ~p"
+		"~n   TableRestOid: ~p"
+		"~n   ME:           ~p", [TableOid, TableRestOid, ME]),
+	    next_loop_varbinds({table, TableOid, ME,
+				[{tab_oid(TableRestOid), Vb}]},
+			       Vbs, MibView, Res, [], GbMaxVBs);
+	{subagent, SubAgentPid, SAOid} ->
+	    ?vt("next_loop_varbind -> subagent: "
+		"~n   SubAgentPid: ~p"
+		"~n   SAOid:       ~p", [SubAgentPid, SAOid]),
+	    NewVb = Vb#varbind{variabletype = 'NULL', value = 'NULL'},
+	    next_loop_varbinds({subagent, SubAgentPid, SAOid, [NewVb]},
+			       Vbs, MibView, Res, [], GbMaxVBs)
+    end;
+next_loop_varbinds({table, TableOid, ME, TabOids},
+		   [Vb | Vbs], MibView, Res, _LAVb, GbMaxVBs) ->
+    ?vt("next_loop_varbinds(table) -> entry with"
+ 	"~n   TableOid: ~p"
+ 	"~n   Vb:       ~p", [TableOid, Vb]),
+    case varbind_next(Vb, MibView) of
+	{table, TableOid, TableRestOid, _ME} ->
+	    next_loop_varbinds({table, TableOid, ME,
+				[{tab_oid(TableRestOid), Vb} | TabOids]},
+			       Vbs, MibView, Res, [], GbMaxVBs);
+	_ ->
+	    case get_next_table(ME, TableOid, TabOids, MibView) of
+		{ok, TabRes, TabEndOfTabVbs} ->
+		    NewVbs = lists:append(TabEndOfTabVbs, [Vb | Vbs]),
+		    NewRes = lists:append(TabRes, Res),
+		    next_loop_varbinds([], NewVbs, MibView, NewRes, [], 
+				       GbMaxVBs);
+		{ErrorStatus, OrgIndex} ->
+		    ?vdebug("next loop varbinds: next varbind"
+			    "~n   ErrorStatus: ~p"
+			    "~n   OrgIndex:    ~p",
+			    [ErrorStatus,OrgIndex]),
+		    {ErrorStatus, OrgIndex, []}
+	    end
+    end;
+next_loop_varbinds({table, TableOid, ME, TabOids},
+		   [], MibView, Res, _LAVb, GbMaxVBs) ->
+    ?vt("next_loop_varbinds(table) -> entry with"
+	"~n   TableOid: ~p", [TableOid]),
+    case get_next_table(ME, TableOid, TabOids, MibView) of
+	{ok, TabRes, TabEndOfTabVbs} ->
+ 	    ?vt("next_loop_varbinds(table) -> get_next_table result:"
+		"~n   TabRes:         ~p"
+		"~n   TabEndOfTabVbs: ~p", [TabRes, TabEndOfTabVbs]),
+	    NewRes = lists:append(TabRes, Res),
+	    next_loop_varbinds([], TabEndOfTabVbs, MibView, NewRes, [], 
+			       GbMaxVBs);
+	{ErrorStatus, OrgIndex} ->
+	    ?vdebug("next loop varbinds: next table"
+		    "~n   ErrorStatus: ~p"
+		    "~n   OrgIndex:    ~p",
+		    [ErrorStatus,OrgIndex]),
+	    {ErrorStatus, OrgIndex, []}
+    end;
+next_loop_varbinds({subagent, SAPid, SAOid, SAVbs},
+		   [Vb | Vbs], MibView, Res, _LAVb, GbMaxVBs) ->
+    ?vt("next_loop_varbinds(subagent) -> entry with"
+	"~n   SAPid: ~p"
+	"~n   SAOid: ~p"
+ 	"~n   Vb:    ~p", [SAPid, SAOid, Vb]),
+    case varbind_next(Vb, MibView) of
+	{subagent, _SubAgentPid, SAOid} ->
+	    next_loop_varbinds({subagent, SAPid, SAOid,
+				[Vb | SAVbs]},
+			       Vbs, MibView, Res, [], GbMaxVBs);
+	_ ->
+	    case get_next_sa(SAPid, SAOid, SAVbs, MibView) of
+		{ok, SARes, SAEndOfMibViewVbs} ->
+		    NewVbs = lists:append(SAEndOfMibViewVbs, [Vb | Vbs]),
+		    NewRes = lists:append(SARes, Res),
+		    next_loop_varbinds([], NewVbs, MibView, NewRes, [], 
+				       GbMaxVBs);
+		{noSuchName, OrgIndex} ->
+		    %% v1 reply, treat this Vb as endOfMibView, and try again
+		    %% for the others.
+		    case lists:keysearch(OrgIndex, #varbind.org_index, SAVbs) of
+			{value, EVb} ->
+			    NextOid = next_oid(SAOid),
+			    EndOfVb = 
+				EVb#varbind{oid = NextOid,
+					    value = {endOfMibView, NextOid}},
+			    case lists:delete(EVb, SAVbs) of
+				[] ->
+				    next_loop_varbinds([], [EndOfVb, Vb | Vbs],
+						       MibView, Res, [],
+						       GbMaxVBs);
+				TryAgainVbs ->
+				    next_loop_varbinds({subagent, SAPid, SAOid,
+							TryAgainVbs},
+						       [EndOfVb, Vb | Vbs],
+						       MibView, Res, [],
+						       GbMaxVBs)
+			    end;
+			false ->
+			    %% bad index from subagent
+			    {genErr, (hd(SAVbs))#varbind.org_index, []}
+		    end;
+		{ErrorStatus, OrgIndex} ->
+ 		    ?vdebug("next loop varbinds: next subagent"
+ 			    "~n   Vb:          ~p"
+ 			    "~n   ErrorStatus: ~p"
+ 			    "~n   OrgIndex:    ~p",
+ 			    [Vb,ErrorStatus,OrgIndex]),
+		    {ErrorStatus, OrgIndex, []}
+	    end
+    end;
+next_loop_varbinds({subagent, SAPid, SAOid, SAVbs},
+		   [], MibView, Res, _LAVb, GbMaxVBs) ->
+     ?vt("next_loop_varbinds(subagent) -> entry with"
+	 "~n   SAPid: ~p"
+	 "~n   SAOid: ~p", [SAPid, SAOid]),
+    case get_next_sa(SAPid, SAOid, SAVbs, MibView) of
+	{ok, SARes, SAEndOfMibViewVbs} ->
+	    NewRes = lists:append(SARes, Res),
+	    next_loop_varbinds([], SAEndOfMibViewVbs, MibView, NewRes, [],
+			       GbMaxVBs);
+	{noSuchName, OrgIndex} ->
+	    %% v1 reply, treat this Vb as endOfMibView, and try again for
+	    %% the others.
+	    case lists:keysearch(OrgIndex, #varbind.org_index, SAVbs) of
+		{value, EVb} ->
+		    NextOid = next_oid(SAOid),
+		    EndOfVb = EVb#varbind{oid = NextOid,
+					  value = {endOfMibView, NextOid}},
+		    case lists:delete(EVb, SAVbs) of
+			[] ->
+			    next_loop_varbinds([], [EndOfVb], MibView, Res, [],
+					       GbMaxVBs);
+			TryAgainVbs ->
+			    next_loop_varbinds({subagent, SAPid, SAOid,
+						TryAgainVbs},
+					       [EndOfVb], MibView, Res, [],
+					       GbMaxVBs)
+		    end;
+		false ->
+		    %% bad index from subagent
+		    {genErr, (hd(SAVbs))#varbind.org_index, []}
+	    end;
+	{ErrorStatus, OrgIndex} ->
+ 	    ?vdebug("next loop varbinds: next subagent"
+ 		    "~n   ErrorStatus: ~p"
+ 		    "~n   OrgIndex:    ~p",
+ 		    [ErrorStatus,OrgIndex]),
+ 	    {ErrorStatus, OrgIndex, []}
+    end;
+next_loop_varbinds([], [], _MibView, Res, _LAVb, _GbMaxVBs) ->
+    ?vt("next_loop_varbinds -> entry when done", []),
+    {noError, 0, Res}.
+
+try_get_instance(_Vb, #me{mfa = {M, F, A}, asn1_type = ASN1Type}) ->
+    ?vtrace("try_get_instance -> entry with"
+	    "~n   M: ~p"
+	    "~n   F: ~p"
+	    "~n   A: ~p", [M,F,A]),
+    Result = (catch ?LIB:dbg_apply(M, F, [get | A])),
+    % mib shall return {value, <a-nice-value-within-range>} |
+    % {noValue, noSuchName} (v1) | 
+    % {noValue, noSuchObject | noSuchInstance} (v2, v1)
+    % everything else (including 'genErr') will generate 'genErr'.
+    ?AGENT:make_value_a_correct_value(Result, ASN1Type, {M, F, A}).
+
+tab_oid([]) -> [0];
+tab_oid(X) -> X.
+
+
+%%-----------------------------------------------------------------
+%% Perform a next, using the varbinds Oid if value is simple
+%% value. If value is {endOf<something>, NextOid}, use NextOid.
+%% This case happens when a table has returned endOfTable, or
+%% a subagent has returned endOfMibView.
+%%-----------------------------------------------------------------
+varbind_next(#varbind{value = Value, oid = Oid}, MibView) ->
+    ?vt("varbind_next -> entry with"
+ 	"~n   Value:   ~p"
+ 	"~n   Oid:     ~p"
+ 	"~n   MibView: ~p", [Value, Oid, MibView]),
+    case Value of
+	{endOfTable, NextOid} ->
+	    snmpa_mib:next(get(mibserver), NextOid, MibView);
+	{endOfMibView, NextOid} ->
+	    snmpa_mib:next(get(mibserver), NextOid, MibView);
+	_ ->
+	    snmpa_mib:next(get(mibserver), Oid, MibView)
+    end.
+
+get_next_table(#me{mfa = {M, F, A}}, TableOid, TableOids, MibView) ->
+    % We know that all TableOids have at least a column number as oid
+    ?vt("get_next_table -> entry with"
+	"~n   M:         ~p"
+	"~n   F:         ~p"
+	"~n   A:         ~p"
+	"~n   TableOid:  ~p"
+	"~n   TableOids: ~p"
+	"~n   MibView:   ~p", [M, F, A, TableOid, TableOids, MibView]),
+    Sorted = snmpa_svbl:sort_varbinds_rows(TableOids),
+    case get_next_values_all_rows(Sorted, M,F,A, [], TableOid) of
+	NewVbs when is_list(NewVbs) ->
+ 	    ?vt("get_next_table -> "
+		"~n   NewVbs: ~p", [NewVbs]),
+	    % We must now check each Vb for endOfTable and that it is
+	    % in the MibView. If not, it becomes a endOfTable. We 
+	    % collect all of these together.
+	    transform_tab_next_result(NewVbs, {[], []}, MibView);
+	{ErrorStatus, OrgIndex} ->
+	    {ErrorStatus, OrgIndex}
+    end.
+
+get_next_values_all_rows([Row | Rows], M, F, A, Res, TabOid) ->
+    {RowIndex, TableOids} = Row,
+    Cols = delete_index(TableOids),
+    ?vt("get_next_values_all_rows -> "
+	"~n   Cols: ~p", [Cols]),
+    Result = (catch ?LIB:dbg_apply(M, F, [get_next, RowIndex, Cols | A])),
+    ?vt("get_next_values_all_rows -> "
+ 	"~n   Result: ~p", [Result]),
+    case validate_tab_next_res(Result, TableOids, {M, F, A}, TabOid) of
+	Values when is_list(Values) -> 
+ 	    ?vt("get_next_values_all_rows -> "
+ 		"~n   Values: ~p", [Values]),
+	    NewRes = lists:append(Values, Res),
+	    get_next_values_all_rows(Rows, M, F, A, NewRes, TabOid);
+	{ErrorStatus, OrgIndex} ->
+	    {ErrorStatus, OrgIndex}
+    end;
+get_next_values_all_rows([], _M, _F, _A, Res, _TabOid) ->
+    Res.
+
+transform_tab_next_result([Vb | Vbs], {Res, EndOfs}, MibView) ->
+    case Vb#varbind.value of
+	{endOfTable, _} ->
+	    {ResVBs, EndOfVBs} = ?LIB:split_vbs(Vbs, Res, [Vb | EndOfs]),
+            {ok, ResVBs, EndOfVBs};
+	_ ->
+	    case snmpa_acm:validate_mib_view(Vb#varbind.oid, MibView) of
+		true ->
+		    transform_tab_next_result(Vbs, {[Vb|Res], EndOfs},MibView);
+		_ ->
+		    Oid = Vb#varbind.oid,
+		    NewEndOf = Vb#varbind{value = {endOfTable, Oid}},
+		    transform_tab_next_result(Vbs, {Res, [NewEndOf | EndOfs]},
+					      MibView)
+	    end
+    end;
+transform_tab_next_result([], {Res, EndOfs}, _MibView) ->
+    ?vt("transform_tab_next_result -> entry with: "
+ 	"~n   Res:    ~p"
+ 	"~n   EndIfs: ~p",[Res, EndOfs]),
+    {ok, Res, EndOfs}.
+
+
+
+%%-----------------------------------------------------------------
+%% Three cases:
+%%   1) All values ok
+%%   2) table_func returned {Error, ...}
+%%   3) Some value in Values list is erroneous.
+%% Args: Value is a list of values from table_func(get_next, ...)
+%%       TableOids is a list of {TabRestOid, OrgVb} 
+%%         each element in Values and TableOids correspond to each
+%%         other.
+%% Returns: List of NewVarbinds |
+%%          {ErrorStatus, OrgIndex}
+%%          (In the NewVarbinds list, the value may be endOfTable)
+%%-----------------------------------------------------------------
+validate_tab_next_res(Values, TableOids, Mfa, TabOid) ->
+     ?vt("validate_tab_next_res -> entry with: "
+	 "~n   Values:     ~p"
+	 "~n   TableOids:  ~p"
+	 "~n   Mfa:        ~p"
+	 "~n   TabOid:     ~p", [Values, TableOids, Mfa, TabOid]),
+    {_Col, _ASN1Type, OneIdx} = hd(TableOids),
+    validate_tab_next_res(Values, TableOids, Mfa, [], TabOid,
+			  next_oid(TabOid), OneIdx).
+validate_tab_next_res([{NextOid, Value} | Values],
+		      [{_ColNo, OrgVb, _Index} | TableOids],
+		      Mfa, Res, TabOid, TabNextOid, I) ->
+    ?vt("validate_tab_next_res -> entry with: "
+ 	"~n   NextOid:    ~p"
+ 	"~n   Value:      ~p"
+ 	"~n   Values:     ~p"
+ 	"~n   TableOids:  ~p"
+ 	"~n   Mfa:        ~p"
+ 	"~n   TabOid:     ~p", 
+ 	[NextOid, Value, Values, TableOids, Mfa, TabOid]),
+    #varbind{org_index = OrgIndex} = OrgVb,
+    ?vt("validate_tab_next_res -> OrgIndex: ~p", [OrgIndex]),
+    NextCompleteOid = lists:append(TabOid, NextOid),
+    case snmpa_mib:lookup(get(mibserver), NextCompleteOid) of
+	{table_column, #me{asn1_type = ASN1Type}, _TableEntryOid} ->
+  	    ?vt("validate_tab_next_res -> ASN1Type: ~p", [ASN1Type]),
+	    case ?AGENT:make_value_a_correct_value({value, Value}, ASN1Type, Mfa) of
+		{error, ErrorStatus} ->
+ 		    ?vt("validate_tab_next_res -> "
+ 			"~n   ErrorStatus: ~p", [ErrorStatus]),
+		    {ErrorStatus, OrgIndex};
+		{value, Type, NValue} ->
+ 		    ?vt("validate_tab_next_res -> "
+     			"~n   Type:   ~p"
+			"~n   NValue: ~p", [Type, NValue]),
+		    NewVb = OrgVb#varbind{oid = NextCompleteOid,
+					  variabletype = Type, value = NValue},
+		    validate_tab_next_res(Values, TableOids, Mfa,
+					  [NewVb | Res], TabOid, TabNextOid, I)
+	    end;
+	Error ->
+	    ?LIB:user_err("Invalid oid ~w from ~w (get_next). Using genErr => ~p",
+                          [NextOid, Mfa, Error]),
+	    {genErr, OrgIndex}
+    end;
+validate_tab_next_res([endOfTable | Values],
+		      [{_ColNo, OrgVb, _Index} | TableOids],
+		      Mfa, Res, TabOid, TabNextOid, I) ->
+     ?vt("validate_tab_next_res(endOfTable) -> entry with: "
+	 "~n   Values:     ~p"
+	 "~n   OrgVb:      ~p"
+	 "~n   TableOids:  ~p"
+	 "~n   Mfa:        ~p"
+	 "~n   Res:        ~p"
+	 "~n   TabOid:     ~p"
+	 "~n   TabNextOid: ~p"
+	 "~n   I:          ~p",
+	 [Values, OrgVb, TableOids, Mfa, Res, TabOid, TabNextOid, I]),
+    NewVb = OrgVb#varbind{value = {endOfTable, TabNextOid}},
+    validate_tab_next_res(Values, TableOids, Mfa, [NewVb | Res],
+			  TabOid, TabNextOid, I);
+validate_tab_next_res([], [], _Mfa, Res, _TabOid, _TabNextOid, _I) ->
+    Res;
+validate_tab_next_res([], [{_Col, _OrgVb, Index}|_], Mfa, _Res, _, _, _I) ->
+    ?LIB:user_err("Too few values returned from ~w (get_next)", [Mfa]),
+    {genErr, Index};
+validate_tab_next_res({genErr, ColNumber}, OrgCols,
+		      Mfa, _Res, _TabOid, _TabNextOid, _I) ->
+    OrgIndex = snmpa_svbl:col_to_orgindex(ColNumber, OrgCols),
+    ?AGENT:validate_err(table_next, {genErr, OrgIndex}, Mfa);
+validate_tab_next_res({error, Reason}, [{_ColNo, OrgVb, _Index} | _TableOids],
+		      Mfa, _Res, _TabOid, _TabNextOid, _I) ->
+    #varbind{org_index = OrgIndex} = OrgVb,
+    ?LIB:user_err("Erroneous return value ~w from ~w (get_next)",
+                  [Reason, Mfa]),
+    {genErr, OrgIndex};
+validate_tab_next_res(Error, [{_ColNo, OrgVb, _Index} | _TableOids],
+		      Mfa, _Res, _TabOid, _TabNextOid, _I) ->
+    #varbind{org_index = OrgIndex} = OrgVb,
+    ?LIB:user_err("Invalid return value ~w from ~w (get_next)",
+                  [Error, Mfa]),
+    {genErr, OrgIndex};
+validate_tab_next_res(TooMany, [], Mfa, _Res, _, _, I) ->
+    ?LIB:user_err("Too many values ~w returned from ~w (get_next)",
+                  [TooMany, Mfa]),
+    {genErr, I}.
+
+%%-----------------------------------------------------------------
+%% Func: get_next_sa/4
+%% Purpose: Loop the list of varbinds for the subagent.
+%%          Call subagent_get_next to retreive
+%%          the next varbinds.
+%% Returns: {ok, ListOfNewVbs, ListOfEndOfMibViewsVbs} |
+%%          {ErrorStatus, ErrorIndex}
+%%-----------------------------------------------------------------
+get_next_sa(SAPid, SAOid, SAVbs, MibView) ->
+    case catch ?AGENT:subagent_get_next(SAPid, MibView, SAVbs) of
+	{noError, 0, NewVbs} ->
+	    NewerVbs = transform_sa_next_result(NewVbs,SAOid,next_oid(SAOid)),
+	    {ResVBs, EndOfVBs} = ?LIB:split_vbs(NewerVbs),
+            {ok, ResVBs, EndOfVBs};
+	{ErrorStatus, ErrorIndex, _} ->
+	    {ErrorStatus, ErrorIndex};
+	{'EXIT', Reason} ->
+	    ?LIB:user_err("Lost contact with subagent (next) ~w. Using genErr",
+                          [Reason]),
+	    {genErr, 0}
+    end.
+
+%%-----------------------------------------------------------------
+%% Check for wrong prefix returned or endOfMibView, and convert
+%% into {endOfMibView, SANextOid}.
+%%-----------------------------------------------------------------
+transform_sa_next_result([Vb | Vbs], SAOid, SANextOid)
+  when Vb#varbind.value =:= endOfMibView ->
+    [Vb#varbind{value = {endOfMibView, SANextOid}} |
+     transform_sa_next_result(Vbs, SAOid, SANextOid)];
+transform_sa_next_result([Vb | Vbs], SAOid, SANextOid) ->
+    case lists:prefix(SAOid, Vb#varbind.oid) of
+	true ->
+	    [Vb | transform_sa_next_result(Vbs, SAOid, SANextOid)];
+	_ ->
+	    [Vb#varbind{oid = SANextOid, value = {endOfMibView, SANextOid}} |
+	     transform_sa_next_result(Vbs, SAOid, SANextOid)]
+    end;
+transform_sa_next_result([], _SAOid, _SANextOid) ->
+    [].
+
+
+next_oid(Oid) ->
+    case lists:reverse(Oid) of
+	[H | T] -> lists:reverse([H+1 | T]);
+	[] -> []
+    end.
+
+
+
+%%%-----------------------------------------------------------------
+%%% 5. GET-BULK REQUEST
+%%% 
+%%% In order to prevent excesses in reply sizes there are two 
+%%% preventive methods in place. One is to check that the encode
+%%% size does not exceed Max PDU size (this is mentioned in the
+%%% standard). The other is a simple VBs limit. That is, the 
+%%% resulting response cannot contain more then this number of VBs.
+%%%-----------------------------------------------------------------
+
+do_get_bulk(MibView, NonRepeaters, MaxRepetitions,
+            PduMS, Varbinds, GbMaxVBs, _Extra) ->
+    ?vtrace("do_get_bulk -> entry with"
+	    "~n   MibView:        ~p"
+	    "~n   NonRepeaters:   ~p"
+	    "~n   MaxRepetitions: ~p"
+	    "~n   PduMS:          ~p"
+	    "~n   Varbinds:       ~p"
+	    "~n   GbMaxVBs:       ~p",
+	    [MibView, NonRepeaters, MaxRepetitions, PduMS, Varbinds, GbMaxVBs]),
+    {NonRepVbs, RestVbs} = ?LIB:split_vbs_gb(NonRepeaters, Varbinds),
+    ?vt("do_get_bulk -> split: "
+	"~n   NonRepVbs: ~p"
+	"~n   RestVbs:   ~p", [NonRepVbs, RestVbs]),
+    case do_get_next2(MibView, NonRepVbs, GbMaxVBs) of
+	{noError, 0, UResNonRepVbs} ->
+	    ?vt("do_get_bulk -> next noError: "
+		"~n   UResNonRepVbs: ~p", [UResNonRepVbs]),
+	    ResNonRepVbs = lists:keysort(#varbind.org_index, UResNonRepVbs),
+	    %% Decode the first varbinds, produce a reversed list of
+	    %% listOfBytes.
+	    case (catch enc_vbs(PduMS - ?empty_pdu_size, ResNonRepVbs)) of
+ 		{error, Idx, Reason} ->
+		    ?LIB:user_err("failed encoding varbind ~w:~n~p", [Idx, Reason]),
+                    {genErr, Idx, []};
+                {SizeLeft, Res} when is_integer(SizeLeft) and is_list(Res) ->
+ 		    ?vtrace("do_get_bulk -> encoded: "
+			    "~n   SizeLeft: ~p"
+			    "~n   Res:      ~w", [SizeLeft, Res]),
+		    case (catch do_get_rep(SizeLeft, MibView, MaxRepetitions,
+					   RestVbs, Res, 
+					   length(UResNonRepVbs), GbMaxVBs)) of
+			{error, Idx, Reason} ->
+			    ?LIB:user_err("failed encoding varbind ~w:~n~p", 
+                                          [Idx, Reason]),
+			    {genErr, Idx, []};
+			Res when is_list(Res) ->
+			    ?vtrace("do get bulk -> Res: "
+				    "~n   ~w", [Res]),
+			    {noError, 0, conv_res(Res)};
+			{noError, 0, Data} = OK ->
+			    ?vtrace("do get bulk -> OK: "
+				    "~n   length(Data): ~w", [length(Data)]),
+			    OK;
+			Else ->
+			    ?vtrace("do get bulk -> Else: "
+				    "~n   ~w", [Else]),
+			    Else
+		    end;
+		Res when is_list(Res) ->
+		    {noError, 0, conv_res(Res)}
+	    end;
+
+	{ErrorStatus, Index, _} ->
+	    ?vdebug("do get bulk: "
+		    "~n   ErrorStatus: ~p"
+		    "~n   Index:       ~p",[ErrorStatus, Index]),
+	    {ErrorStatus, Index, []}
+    end.
+
+enc_vbs(SizeLeft, Vbs) ->
+    ?vt("enc_vbs -> entry with"
+	"~n   SizeLeft: ~w", [SizeLeft]),
+    Fun = fun(Vb, {Sz, Res}) when Sz > 0 ->
+		  ?vt("enc_vbs -> (fun) entry with"
+		      "~n   Vb:  ~p"
+		      "~n   Sz:  ~p"
+		      "~n   Res: ~w", [Vb, Sz, Res]),
+		  case (catch snmp_pdus:enc_varbind(Vb)) of
+		      {'EXIT', Reason} ->
+			  ?vtrace("enc_vbs -> encode failed: "
+				  "~n   Reason: ~p", [Reason]),
+			  throw({error, Vb#varbind.org_index, Reason});
+		      X ->
+			  ?vt("enc_vbs -> X: ~w", [X]),
+			  Lx = length(X),
+			  ?vt("enc_vbs -> Lx: ~w", [Lx]),
+			  if
+			      Lx < Sz ->
+				  {Sz - length(X), [X | Res]};
+			      true ->
+				  throw(Res)
+			  end
+		  end;
+	     (_Vb, {_Sz, [_H | T]}) ->
+		  ?vt("enc_vbs -> (fun) entry with"
+		      "~n   T: ~p", [T]),
+		  throw(T);
+	     (_Vb, {_Sz, []}) ->
+		  ?vt("enc_vbs -> (fun) entry", []),
+		  throw([])
+	  end,
+    lists:foldl(Fun, {SizeLeft, []}, Vbs).
+
+do_get_rep(Sz, MibView, MaxRepetitions, Varbinds, Res, GbNumVBs, GbMaxVBs) 
+  when MaxRepetitions >= 0 ->
+    do_get_rep(Sz, MibView, 0, MaxRepetitions, Varbinds, Res, 
+	       GbNumVBs, GbMaxVBs);
+do_get_rep(Sz, MibView, _MaxRepetitions, Varbinds, Res, GbNumVBs, GbMaxVBs) ->
+    do_get_rep(Sz, MibView, 0, 0, Varbinds, Res, GbNumVBs, GbMaxVBs).
+
+conv_res(ResVarbinds) ->
+    conv_res(ResVarbinds, []).
+conv_res([VbListOfBytes | T], Bytes) ->
+    conv_res(T, VbListOfBytes ++ Bytes);
+conv_res([], Bytes) ->
+    Bytes.
+
+%% The only other value, then a positive integer, is infinity.
+do_get_rep(_Sz, _MibView, Count, Max, _, _Res, GbNumVBs, GbMaxVBs) 
+  when (is_integer(GbMaxVBs) andalso (GbNumVBs > GbMaxVBs)) ->
+    ?vinfo("Max Get-BULK VBs limit (~w) exceeded (~w) when:"
+	   "~n   Count: ~p"
+	   "~n   Max:   ~p", [GbMaxVBs, GbNumVBs, Count, Max]),
+    {tooBig, 0, []};
+do_get_rep(_Sz, _MibView, Max, Max, _, Res, _GbNumVBs, _GbMaxVBs) ->
+    ?vt("do_get_rep -> done when: "
+	"~n   Res: ~p", [Res]),
+    {noError, 0, conv_res(Res)};
+do_get_rep(Sz, MibView, Count, Max, Varbinds, Res, GbNumVBs, GbMaxVBs) -> 
+    ?vt("do_get_rep -> entry when: "
+	"~n   Sz:    ~p"
+	"~n   Count: ~p"
+	"~n   Res:   ~w", [Sz, Count, Res]),
+    case try_get_bulk(Sz, MibView, Varbinds, GbMaxVBs) of
+	{noError, NextVarbinds, SizeLeft, Res2} -> 
+	    ?vt("do_get_rep -> noError: "
+		"~n   SizeLeft: ~p"
+		"~n   Res2:     ~p", [SizeLeft, Res2]),
+	    do_get_rep(SizeLeft, MibView, Count+1, Max, NextVarbinds,
+		       Res2 ++ Res, 
+		       GbNumVBs + length(Varbinds), GbMaxVBs);
+	{endOfMibView, _NextVarbinds, _SizeLeft, Res2} -> 
+	    ?vt("do_get_rep -> endOfMibView: "
+		"~n   Res2: ~p", [Res2]),
+	    {noError, 0, conv_res(Res2 ++ Res)};
+	{ErrorStatus, Index} ->
+	    ?vtrace("do_get_rep -> done when error: "
+		    "~n   ErrorStatus: ~p"
+		    "~n   Index:       ~p", [ErrorStatus, Index]),
+	    {ErrorStatus, Index, []}
+    end.
+
+try_get_bulk(Sz, MibView, Varbinds, GbMaxVBs) -> 
+    ?vt("try_get_bulk -> entry with"
+	"~n   Sz:       ~w"
+	"~n   MibView:  ~w"
+	"~n   Varbinds: ~w", [Sz, MibView, Varbinds]),
+    case do_get_next2(MibView, Varbinds, GbMaxVBs) of
+	{noError, 0, UNextVarbinds} -> 
+	    ?vt("try_get_bulk -> noError: "
+		"~n   UNextVarbinds: ~p", [UNextVarbinds]),
+	    NextVarbinds = ?LIB:org_index_sort_vbs(UNextVarbinds),
+	    case (catch enc_vbs(Sz, NextVarbinds)) of
+		{error, Idx, Reason} ->
+		    ?LIB:user_err("failed encoding varbind ~w:~n~p", [Idx, Reason]),
+		    ?vtrace("try_get_bulk -> encode error: "
+			    "~n   Idx:    ~p"
+			    "~n   Reason: ~p", [Idx, Reason]),
+		    {genErr, Idx};
+		{SizeLeft, Res} when is_integer(SizeLeft) andalso 
+				     is_list(Res) ->
+		    ?vt("try get bulk -> encode ok: "
+			"~n   SizeLeft: ~w"
+			"~n   Res:      ~w", [SizeLeft, Res]),
+		    {check_end_of_mibview(NextVarbinds),
+		     NextVarbinds, SizeLeft, Res};
+		Res when is_list(Res) ->
+		    ?vt("try get bulk -> Res: "
+			"~n   ~w", [Res]),
+		    {endOfMibView, [], 0, Res}
+	    end;
+	{ErrorStatus, Index, _} ->
+	    ?vt("try_get_bulk -> error: "
+		"~n   ErrorStatus: ~p"
+		"~n   Index:       ~p", [ErrorStatus, Index]),
+	    {ErrorStatus, Index}
+    end.
+
+%% If all variables in this pass are endOfMibView,
+%% there is no reason to continue.
+check_end_of_mibview([#varbind{value = endOfMibView} | T]) ->
+    check_end_of_mibview(T);
+check_end_of_mibview([]) -> endOfMibView;
+check_end_of_mibview(_) -> noError.
+
+
+
diff --git a/lib/snmp/src/agent/snmpa_get_lib.erl b/lib/snmp/src/agent/snmpa_get_lib.erl
new file mode 100644
index 0000000000..eaf7fe2641
--- /dev/null
+++ b/lib/snmp/src/agent/snmpa_get_lib.erl
@@ -0,0 +1,254 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019-2019. 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 that most of these functions *assume* that they are executed
+%% by the agent. If they are not they may note work as they require
+%% some properties to be set in the process dictionary!
+%%
+
+-module(snmpa_get_lib).
+
+-export([
+         split_vbs/1, split_vbs/3,
+         split_vbs_view/2,
+         split_vbs_gb/2,
+
+         agent_sort_vbs/1,
+         oid_sort_vbs/1, org_index_sort_vbs/1,
+
+         sa_split/1,
+
+         delete_prefixes/2,
+
+         dbg_apply/3,
+
+         user_err/2
+        ]).
+
+-define(VMODULE,"GET-LIB").
+-include("snmpa_internal.hrl").
+-include("snmp_types.hrl").
+-include("snmp_debug.hrl").
+-include("snmp_verbosity.hrl").
+
+
+
+
+%%-----------------------------------------------------------------
+%% split_vbs/1,3
+%%
+%% Splits the list of varbinds (basically) into two lists. One
+%% of 'end of'-varbinds (mib view and tables) and then the rest
+%% of the varbinds.
+%%-----------------------------------------------------------------
+
+-spec split_vbs(VBs :: [snmp:varbind()]) ->
+                       {ResVBs   :: [snmp:varbind()], 
+                        EndOfVBs :: [snmp:varbind()]}.
+
+split_vbs(VBs) ->
+    split_vbs(VBs, [], []).
+
+-spec split_vbs(VBs    :: [snmp:varbind()],
+                Res    :: [snmp:varbind()],
+                EndOfs :: [snmp:varbind()]) ->
+                       {ResVBs   :: [snmp:varbind()],
+                        EndOfVBs :: [snmp:varbind()]}.
+
+split_vbs([], ResVBs, EndOfVBs) ->
+    {ResVBs, EndOfVBs};
+split_vbs([VB | VBs], Res, EndOfs) ->
+    case VB#varbind.value of
+        {endOfMibView, _} -> split_vbs(VBs, Res, [VB | EndOfs]);
+        {endOfTable, _}   -> split_vbs(VBs, Res, [VB | EndOfs]);
+        _                 -> split_vbs(VBs, [VB | Res], EndOfs)
+    end.
+
+
+
+%%-----------------------------------------------------------------
+%% split_vbs_view/2
+%%
+%% Splits a list of varbinds into two lists based on the provided
+%% MibView. One list of varbinds inside the MibView and one of
+%% varbinds outside the MibView.
+%%-----------------------------------------------------------------
+
+-spec split_vbs_view(VBs     :: [snmp:varbind()],
+                     MibView :: snmp_view_based_acm_mib:mibview()) ->
+                            {OutSideView :: [snmp:varbind()],
+                             InSideView  :: [snmp:varbind()]}.
+
+split_vbs_view(VBs, MibView) ->
+    ?vtrace("split the varbinds view", []),
+    split_vbs_view(VBs, MibView, [], []).
+
+split_vbs_view([], _MibView, Out, In) ->
+    {Out, In};
+split_vbs_view([VB | VBs], MibView, Out, In) ->
+    case snmpa_acm:validate_mib_view(VB#varbind.oid, MibView) of
+	true ->
+            split_vbs_view(VBs, MibView, Out, [VB | In]);
+	false ->
+            VB2 = VB#varbind{value = noSuchObject},
+            split_vbs_view(VBs, MibView, [VB2 | Out], In)
+    end.
+
+
+
+%%-----------------------------------------------------------------
+%% split_vbs_gb/2
+%%
+%% Performs a get-bulk split of the varbinds
+%%-----------------------------------------------------------------
+
+-spec split_vbs_gb(NonRepeaters :: integer(),
+                   VBs          :: [snmp:varbind()]) ->
+                          {NonRepVBs :: [snmp:varbind()], 
+                           RestVBs   :: [snmp:varbind()]}.
+
+split_vbs_gb(N, VBs) ->
+    split_vbs_gb(N, VBs, []).
+
+split_vbs_gb(N, Varbinds, Res) when N =< 0 ->
+    {Res, Varbinds};
+split_vbs_gb(N, [H | T], Res) ->
+    split_vbs_gb(N-1, T, [H | Res]);
+split_vbs_gb(_N, [], Res) ->
+    {Res, []}.
+
+
+
+%%-----------------------------------------------------------------
+%% agent_sort_vbs/1
+%%
+%% Sorts the varbinds into two categories. The first is varbinds
+%% belonging to "our" agent and the other is varbinds for 
+%% subagents.
+%%-----------------------------------------------------------------
+
+-spec agent_sort_vbs(VBs :: [snmp:varbind()]) ->
+                      {AgentVBs    :: [snmp:varbind()],
+                       SubAgentVBs :: [snmp:varbind()]}.
+
+agent_sort_vbs(VBs) ->
+    snmpa_svbl:sort_varbindlist(get(mibserver), VBs).
+
+
+%%-----------------------------------------------------------------
+%% oid_sort_vbs/1
+%%
+%% Sorts the varbinds based on their oid.
+%%-----------------------------------------------------------------
+
+-spec oid_sort_vbs(VBs :: [snmp:varbind()]) -> SortedVBs :: [snmp:varbind()].
+
+oid_sort_vbs(VBs) ->
+    lists:keysort(#varbind.oid, VBs).
+
+
+%%-----------------------------------------------------------------
+%% org_index_sort_vbs/1
+%%
+%% Sorts the varbinds based on their org_index.
+%%-----------------------------------------------------------------
+
+-spec org_index_sort_vbs(VBs :: [snmp:varbind()]) -> SortedVBs :: [snmp:varbind()].
+
+org_index_sort_vbs(Vbs) ->
+    lists:keysort(#varbind.org_index, Vbs).
+
+
+
+%%-----------------------------------------------------------------
+%% sa_split/1
+%%
+%% Splits a list of {oid(), varbind()} into two lists of oid() 
+%% and varbind. The resulting lists are reversed!
+%%-----------------------------------------------------------------
+
+-spec sa_split(SAVBs :: [{SAOid :: snmp:oid(), snmp:varbind()}]) ->
+                      {Oids :: [snmp:oid()], VBs :: [snmp:varbind()]}.
+
+sa_split(SAVBs) ->
+    snmpa_svbl:sa_split(SAVBs).
+
+
+
+%%-----------------------------------------------------------------
+%% delete_prefixes/2
+%%
+%% Takes an Oid prefix and a list of ivarbinds and produces a list
+%% of {ShortOid, ASN1Type}. The ShortOid is basically the oid with 
+%% the OidPrefix removed.
+%%-----------------------------------------------------------------
+
+-spec delete_prefixes(OidPrefix :: snmp:oid(),
+                      VBs       :: [snmp:ivarbind()]) ->
+                             [{ShortOid :: snmp:oid(),
+                               ASN1Type :: snmp:asn1_type()}].
+
+delete_prefixes(OidPrefix, IVBs) ->
+    [{snmp_misc:diff(Oid, OidPrefix), ME#me.asn1_type} ||
+        #ivarbind{varbind = #varbind{oid = Oid}, mibentry = ME} <- IVBs].
+
+
+
+%%-----------------------------------------------------------------
+%% dbg_apply/3
+%%
+%% Call instrumentation functions, but allow for debug printing
+%% of useful debug info.
+%%-----------------------------------------------------------------
+
+-spec dbg_apply(M :: atom(), F :: atom(), A :: list()) ->
+                       any().
+
+dbg_apply(M, F, A) ->
+    case get(verbosity) of
+	silence -> 
+	    apply(M,F,A);
+	_ ->
+	    ?vlog("~n   apply: ~w, ~w, ~p~n", [M,F,A]),
+	    Res = (catch apply(M,F,A)),
+	    case Res of
+		{'EXIT', Reason} ->
+		    ?vinfo("Call to: "
+			   "~n   Module:   ~p"
+			   "~n   Function: ~p"
+			   "~n   Args:     ~p"
+			   "~n"
+			   "~nresulted in an exit"
+			   "~n"
+			   "~n   ~p~n", [M, F, A, Reason]);
+		_ ->
+		    ?vlog("~n   returned: ~p~n", [Res])
+	    end,
+	    Res
+    end.
+
+
+%% ---------------------------------------------------------------------
+
+user_err(F, A) ->
+    snmpa_error:user_err(F, A).
+
+
diff --git a/lib/snmp/src/agent/snmpa_get_mechanism.erl b/lib/snmp/src/agent/snmpa_get_mechanism.erl
new file mode 100644
index 0000000000..744a6529e1
--- /dev/null
+++ b/lib/snmp/src/agent/snmpa_get_mechanism.erl
@@ -0,0 +1,79 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019-2019. 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(snmpa_get_mechanism).
+
+%%
+%% This module defines the behaviour for the undocumented (hidden)
+%% get-mechanism feature. This allows for implementing your own
+%% handling of get, get-next and get-bulk requests.
+%% Probably only useful for special cases (e.g. optimization).
+%%
+
+
+
+%% ----------- do_get/2,3 -----------------------------------------------------
+
+%% Purpose: Handles all VBs in a request that is inside the 
+%%          mibview (local).
+
+-callback do_get(UnsortedVBs    :: [snmp:varbind()],
+                 IsNotification :: boolean(),
+                 Extra          :: term()) ->
+    {noError, 0, ResVBs :: [snmp:varbind()]} |
+    {ErrStatus :: snmp:error_status(), ErrIndex :: snmp:error_index(), []}.
+
+
+%% Purpose: Handles "get-requests".
+
+-callback do_get(MibView        :: snmp_view_based_acm_mib:mibview(), 
+                 UnsortedVBs    :: [snmp:varbind()],
+                 IsNotification :: boolean(),
+                 Extra          :: term()) ->
+    {noError, 0, ResVBs :: [snmp:varbind()]} |
+    {ErrStatus :: snmp:error_status(), ErrIndex :: snmp:error_index(), []}.
+
+
+
+
+%% ----------- do_get_next/2 ------------------------------------------------
+
+%% Purpose: Handles "get-next-requests".
+
+-callback do_get_next(MibView     :: snmp_view_based_acm_mib:mibview(),
+                      UnsortedVBs :: [snmp:varbind()],
+                      Extra       :: term()) ->
+    {noError, 0, ResVBs :: [snmp:varbind()]} |
+    {ErrStatus :: snmp:error_status(), ErrIndex :: snmp:error_index(), []}.
+
+
+
+
+%% ----------- do_get_bulk/6 ------------------------------------------------
+
+-callback do_get_bulk(MibView        :: snmp_view_based_acm_mib:mibview(),
+                      NonRepeaters   :: non_neg_integer(),
+                      MaxRepetitions :: non_neg_integer(),
+                      PduMS          :: pos_integer(),
+                      VBs            :: [snmp:varbind()],
+                      MaxVBs         :: pos_integer(),
+                      Extra          :: term()) ->
+    {noError, 0, ResVBs :: [snmp:varbind()]} |
+    {ErrStatus :: snmp:error_status(), ErrIndex :: snmp:error_index(), []}.
diff --git a/lib/snmp/src/agent/snmpa_local_db.erl b/lib/snmp/src/agent/snmpa_local_db.erl
index eb67b9cd6f..c9093fcdb9 100644
--- a/lib/snmp/src/agent/snmpa_local_db.erl
+++ b/lib/snmp/src/agent/snmpa_local_db.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. 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.
@@ -147,12 +147,13 @@ init([Prio, DbDir, DbInitError, Opts]) ->
 do_init(Prio, DbDir, DbInitError, Opts) ->
     process_flag(priority, Prio),
     process_flag(trap_exit, true),
-    put(sname,ldb),
-    put(verbosity,get_opt(verbosity, Opts, ?default_verbosity)),
+    put(sname,     get_opt(sname, Opts, ldb)),
+    put(verbosity, get_opt(verbosity, Opts, ?default_verbosity)),
     ?vlog("starting",[]),
     Dets = dets_open(DbDir, DbInitError, Opts),
     Ets  = ets:new(?ETS_TAB, [set, protected]),
     ?vdebug("started",[]),
+    put(started,   snmp_misc:formated_timestamp()),
     {ok, #state{dets = Dets, ets = Ets}}.
 
 dets_open(DbDir, DbInitError, Opts) ->
@@ -625,7 +626,7 @@ handle_info(Info, State) ->
 
 
 terminate(Reason, State) ->
-    ?vlog("terminate: ~p",[Reason]),
+    ?vlog("terminate: ~p", [Reason]),
     close(State).
 
 
@@ -732,16 +733,16 @@ dets_backup(close, _Cont, _D, B) ->
     ok;
 dets_backup(read, Cont1, D, B) ->
     case dets:bchunk(D, Cont1) of
+	{error, _} = ERROR ->
+	    ERROR;
+	'$end_of_table' ->
+	    dets:close(B),
+	    end_of_input;
 	{Cont2, Data} ->
 	    F = fun(Arg) ->
 			dets_backup(Arg, Cont2, D, B)
 		end,
-	    {Data, F};
-	'$end_of_table' ->
-	    dets:close(B),
-	    end_of_input;
-	Error ->
-	    Error
+	    {Data, F}
     end.
 
 
diff --git a/lib/snmp/src/agent/snmpa_mib_storage.erl b/lib/snmp/src/agent/snmpa_mib_storage.erl
index ed0607fb84..d46dab0be0 100644
--- a/lib/snmp/src/agent/snmpa_mib_storage.erl
+++ b/lib/snmp/src/agent/snmpa_mib_storage.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2019. 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.
@@ -120,7 +120,7 @@
 
 -callback match_object(TabId   :: mib_storage_table_id(), 
 		       Pattern :: ets:match_pattern()) ->
-    {ok, Recs :: [tuple()]} | {error, Reason :: term()}.
+    Recs :: [tuple()] | {error, Reason :: term()}.
 
 
 %% ---------------------------------------------------------------
@@ -133,7 +133,7 @@
 
 -callback match_delete(TabId   :: mib_storage_table_id(), 
 		       Pattern :: ets:match_pattern()) ->
-    {ok, Recs :: [tuple()]} | {error, Reason :: term()}.
+    Recs :: [tuple()] | {error, Reason :: term()}.
 
 
 %% ---------------------------------------------------------------
diff --git a/lib/snmp/src/agent/snmpa_mib_storage_dets.erl b/lib/snmp/src/agent/snmpa_mib_storage_dets.erl
index 2459b6bc3e..0fcb8083f5 100644
--- a/lib/snmp/src/agent/snmpa_mib_storage_dets.erl
+++ b/lib/snmp/src/agent/snmpa_mib_storage_dets.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2019. 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.
@@ -291,16 +291,16 @@ dets_backup(close, _Cont, _ID, B) ->
     ok;
 dets_backup(read, Cont1, ID, B) ->
     case dets:bchunk(ID, Cont1) of
+        {error, _} = ERROR ->
+            ERROR;
+	'$end_of_table' ->
+	    dets:close(B),
+	    end_of_input;
 	{Cont2, Data} ->
 	    F = fun(Arg) ->
 			dets_backup(Arg, Cont2, ID, B)
 		end,
-	    {Data, F};
-	'$end_of_table' ->
-	    dets:close(B),
-	    end_of_input;
-	Error ->
-	    Error
+	    {Data, F}
     end.
 
 
diff --git a/lib/snmp/src/agent/snmpa_mib_storage_ets.erl b/lib/snmp/src/agent/snmpa_mib_storage_ets.erl
index 68dfa83247..173dac276e 100644
--- a/lib/snmp/src/agent/snmpa_mib_storage_ets.erl
+++ b/lib/snmp/src/agent/snmpa_mib_storage_ets.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2019. 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,8 @@ read(#tab{id = ID}, Key) ->
 write(#tab{id = ID, rec_name = RecName}, Rec) 
   when (is_tuple(Rec) andalso (element(1, Rec) =:= RecName)) ->
     ?vtrace("write to table ~p", [ID]),
-    ets:insert(ID, Rec).
+    ets:insert(ID, Rec),
+    ok.
 
 
 %% ---------------------------------------------------------------
@@ -213,7 +214,9 @@ delete(#tab{id = ID, file = File}) ->
 %% ---------------------------------------------------------------
 delete(#tab{id = ID}, Key) ->
     ?vtrace("delete from table ~p: ~p", [ID, Key]),
-    ets:delete(ID, Key).
+    ets:delete(ID, Key),
+    ok.
+        
 
 
 %% ---------------------------------------------------------------
diff --git a/lib/snmp/src/agent/snmpa_mpd.erl b/lib/snmp/src/agent/snmpa_mpd.erl
index b440d57d03..2ec5dcb5e6 100644
--- a/lib/snmp/src/agent/snmpa_mpd.erl
+++ b/lib/snmp/src/agent/snmpa_mpd.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2019. 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.
@@ -76,11 +76,9 @@
 init(Vsns) ->
     ?vlog("init -> entry with"
 	"~n   Vsns: ~p", [Vsns]),
-    random:seed(erlang:phash2([node()]),
-                erlang:monotonic_time(),
-                erlang:unique_integer()),
-    ets:insert(snmp_agent_table, {msg_id, random:uniform(2147483647)}),
-    ets:insert(snmp_agent_table, {req_id, random:uniform(2147483647)}),
+    ?SNMP_RAND_SEED(),
+    ets:insert(snmp_agent_table, {msg_id, rand:uniform(2147483647)}),
+    ets:insert(snmp_agent_table, {req_id, rand:uniform(2147483647)}),
     init_counters(),
     init_versions(Vsns, #state{}).
 
diff --git a/lib/snmp/src/agent/snmpa_network_interface.erl b/lib/snmp/src/agent/snmpa_network_interface.erl
index 699fbde671..24985c113e 100644
--- a/lib/snmp/src/agent/snmpa_network_interface.erl
+++ b/lib/snmp/src/agent/snmpa_network_interface.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. 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,28 +19,56 @@
 %%
 -module(snmpa_network_interface).
 
--export([behaviour_info/1]).
-
-behaviour_info(callbacks) ->
-    [{start_link,        4}, 
-     {get_log_type,      1},
-     {set_log_type,      2},
-     {get_request_limit, 1},
-     {set_request_limit, 2},
-     {info,              1}, 
-     {verbosity,         2}];
-behaviour_info(_) ->
-    undefined.
-
-
-%% behaviour_info(callbacks) ->
-%%     [{start_link,        4}, 
-%%      {send_pdu,          5},
-%%      {send_response_pdu, 6},
-%%      {discard_pdu,       6},
-%%      {send_pdu_req,      6},
-%%      {verbosity,         2}, 
-%%      {change_log_type, 2}];
-%% behaviour_info(_) ->
-%%     undefined.
+%% Note that this behaviour is not enough!
+%% There is also a set of mandatory messages which the
+%% network interface entity must be able to receive and
+%% be able to send. See the documentation for more info.
+
+-callback start_link(Prio, NoteStore, MasterAgent, Opts) ->
+    {ok, Pid} | {error, Reason} when
+      Prio        :: low | normal | high, % priority_level(),
+      NoteStore   :: pid(),
+      MasterAgent :: pid(),
+      Opts        :: [Option],
+      Option      :: {verbosity, snmp:verbosity()} |
+                     {versions,  [snmp:version()]} |
+                     term(),
+      Pid         :: pid(),
+      Reason      :: term().
+
+-callback info(Pid) ->
+    Info when
+      Pid   :: pid(),
+      Info  :: [{Key, Value}],
+      Key   :: term(),
+      Value :: term().
+
+-callback verbosity(Pid, Verbosity) ->
+    snmp:void() when
+      Pid       :: pid(),
+      Verbosity :: snmp:verbosity().
+
+-callback get_log_type(Pid) ->
+    {ok, LogType} | {error, Reason} when
+      Pid     :: pid(),
+      LogType :: snmp:atl_type(),
+      Reason  :: term().
+
+-callback set_log_type(Pid, NewType) ->
+    {ok, OldType} | {error, Reason} when
+      Pid     :: pid(),
+      NewType :: snmp:atl_type(),
+      OldType :: snmp:atl_type(),
+      Reason  :: term().
+
+-callback get_request_limit(Pid) ->
+    {ok, Limit} when
+      Pid   :: pid(),
+      Limit :: non_neg_integer() | infinity.
+
+-callback set_request_limit(Pid, NewLimit) ->
+    {ok, OldLimit} when
+      Pid      :: pid(),
+      NewLimit :: non_neg_integer() | infinity,
+      OldLimit :: non_neg_integer() | infinity.
 
diff --git a/lib/snmp/src/agent/snmpa_set.erl b/lib/snmp/src/agent/snmpa_set.erl
index 9833d6fdcc..b3a3bf0ab0 100644
--- a/lib/snmp/src/agent/snmpa_set.erl
+++ b/lib/snmp/src/agent/snmpa_set.erl
@@ -163,10 +163,14 @@ set_phase_two(MyVarbinds, SubagentVarbinds) ->
 	    [MyVarbinds, SubagentVarbinds]),
     case snmpa_set_lib:try_set(MyVarbinds) of
 	{noError, 0} ->
+            ?vtrace("set phase two: (local) varbinds set ok", []),
 	    set_phase_two_subagents(SubagentVarbinds);
-	{ErrorStatus, Index} ->
+	{ErrorStatus, ErrorIndex} ->
+            ?vlog("set phase two: (local) varbinds set failed"
+                  "~n   ErrorStatus: ~p" 
+                  "~n   ErrorIndex:  ~p", [ErrorStatus, ErrorIndex]),
 	    set_phase_two_undo_subagents(SubagentVarbinds),
-	    {ErrorStatus, Index}
+	    {ErrorStatus, ErrorIndex}
     end.
 
 %%-----------------------------------------------------------------
@@ -188,6 +192,7 @@ set_phase_two_subagents([{SubAgentPid, SAVbs} | SubagentVarbinds]) ->
     {_SAOids, Vbs} = sa_split(SAVbs),
     case catch snmpa_agent:subagent_set(SubAgentPid, [phase_two, set, Vbs]) of
 	{noError, 0} ->
+            ?vtrace("set phase two: subagent ~p varbinds set ok", [SubAgentPid]),
 	    set_phase_two_subagents(SubagentVarbinds);
 	{'EXIT', Reason} ->
 	    user_err("Lost contact with subagent (set)~n~w. Using genErr", 
@@ -195,10 +200,14 @@ set_phase_two_subagents([{SubAgentPid, SAVbs} | SubagentVarbinds]) ->
 	    set_phase_two_undo_subagents(SubagentVarbinds),
 	    {genErr, 0};
 	{ErrorStatus, ErrorIndex} ->
+            ?vlog("set phase two: subagent ~p varbinds set failed"
+                  "~n   ErrorStatus: ~p"
+                  "~n   ErrorIndex:  ~p", [SubAgentPid, ErrorStatus, ErrorIndex]),
 	    set_phase_two_undo_subagents(SubagentVarbinds),
 	    {ErrorStatus, ErrorIndex}
     end;
 set_phase_two_subagents([]) ->
+    ?vtrace("set phase two: subagent(s) set ok", []),
     {noError, 0}.
 
 %%-----------------------------------------------------------------
diff --git a/lib/snmp/src/agent/snmpa_set_lib.erl b/lib/snmp/src/agent/snmpa_set_lib.erl
index 57507a36e8..94120f4c7d 100644
--- a/lib/snmp/src/agent/snmpa_set_lib.erl
+++ b/lib/snmp/src/agent/snmpa_set_lib.erl
@@ -46,9 +46,9 @@
 %%*  6) IF value is outside the acceptable range THEN wrongValue.
 %%   7) IF variable does not exist and could not ever be created
 %%      THEN noCreation.
-%%   8) IF variable can not be created now THEN inconsistentName.
-%%   9) IF value can not be set now THEN inconsistentValue.
-%%*  9) IF instances of the variable can not be modified THEN notWritable.
+%%   8) IF variable cannot be created now THEN inconsistentName.
+%%   9) IF value cannot be set now THEN inconsistentValue.
+%%*  9) IF instances of the variable cannot be modified THEN notWritable.
 %%  10) IF an unavailable resource is needed THEN resourceUnavailable.
 %%  11) IF any other error THEN genErr.
 %%  12) Otherwise ok!
@@ -390,7 +390,7 @@ dbg_apply(M,F,A) ->
         {'EXIT', {function_clause, [{M, F, A} | _]}} ->
             {'EXIT', {hook_function_clause, {M, F, A}}};
 
-						% XYZ: Older format for compatibility
+        %% XYZ: Older format for compatibility
         {'EXIT', {undef, {M, F, A}}} ->
             {'EXIT', {hook_undef, {M, F, A}}};
         {'EXIT', {function_clause, {M, F, A}}} ->
diff --git a/lib/snmp/src/agent/snmpa_set_mechanism.erl b/lib/snmp/src/agent/snmpa_set_mechanism.erl
index 2f24f38092..4eee7d7257 100644
--- a/lib/snmp/src/agent/snmpa_set_mechanism.erl
+++ b/lib/snmp/src/agent/snmpa_set_mechanism.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. 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,18 +19,26 @@
 %%
 -module(snmpa_set_mechanism).
 
--export([behaviour_info/1]).
- 
-behaviour_info(callbacks) ->
-    [{do_set, 2}, {do_subagent_set, 1}];
-behaviour_info(_) ->
-    undefined.
+%% -export([behaviour_info/1]).
  
+%% behaviour_info(callbacks) ->
+%%     [{do_set, 2}, {do_subagent_set, 1}];
+%% behaviour_info(_) ->
+%%     undefined.
+
 
 %%-----------------------------------------------------------------
 %% do_set(MibView, UnsortedVarbinds) 
 %%-----------------------------------------------------------------
 
+-callback do_set(MibView, UnsortedVBs) ->
+    {noError, 0} | {ErrStatus, ErrIndex} when
+      MibView     :: snmp_view_based_acm_mib:mibview(),
+      UnsortedVBs :: [snmp:varbind()],
+      ErrStatus   :: snmp:error_status(),
+      ErrIndex    :: snmp:error_index().
+
+
 %%-----------------------------------------------------------------
 %% do_subagent_set(Args)
 %% 
@@ -41,3 +49,18 @@ behaviour_info(_) ->
 %%   [phase_two, set, UnsortedVarbinds]
 %%   [phase_two, undo, UnsortedVarbinds]
 %%-----------------------------------------------------------------
+
+%% -callback do_subagent_set(Args) ->
+%%     {noError, 0} | {ErrStatus, ErrIndex} when
+%%       Args        :: [phase_one, UnsortedVBs] |
+%%                      [phase_two, set, UnsortedVBs] |
+%%                      [phase_two, undo, UnsortedVBs],
+%%       ErrStatus   :: snmp:error_status(),
+%%       ErrIndex    :: snmp:error_index(),
+%%       UnsortedVBs :: [snmp:varbind()].
+
+-callback do_subagent_set(Args) ->
+    {noError, 0} | {ErrStatus, ErrIndex} when
+      Args      :: list(),
+      ErrStatus :: snmp:error_status(),
+      ErrIndex  :: snmp:error_index().
diff --git a/lib/snmp/src/agent/snmpa_supervisor.erl b/lib/snmp/src/agent/snmpa_supervisor.erl
index cdb5ca840d..7d5c6da2c8 100644
--- a/lib/snmp/src/agent/snmpa_supervisor.erl
+++ b/lib/snmp/src/agent/snmpa_supervisor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 -behaviour(supervisor).
 
 %% External exports
--export([start_link/2]).
+-export([start_link/2, stop/0, stop/1]).
 -export([start_sub_sup/1, start_master_sup/1]).
 -export([start_sub_agent/3, stop_sub_agent/1]).
 
@@ -91,6 +91,39 @@ start_link(master, Opts, {takeover, Node}) ->
             Else
     end.
 
+
+stop() ->
+    stop(0).
+
+stop(Timeout) ->
+    case whereis(?SERVER) of
+	Pid when is_pid(Pid) ->
+            stop(Pid, Timeout);
+	_ ->
+	    not_running
+    end.
+
+%% For some unfathomable reason there is no "nice" way to stop
+%% a supervisor. The "normal" way to do it is:
+%% 1) exit(Pid, kill) (kaboom)
+%% 2) If the caller is the *parent*: exit(Pid, shutdown)
+%% So, here we do it the really ugly way...but since this function is 
+%% intended for testing (mostly)...
+stop(Pid, Timeout) when (Timeout =:= 0) ->
+    sys:terminate(Pid, shutdown),
+    ok;
+stop(Pid, Timeout) ->
+    MRef = erlang:monitor(process, Pid),
+    sys:terminate(Pid, shutdown),
+    receive
+        {'DOWN', MRef, process, Pid, _} ->
+            ok
+    after Timeout ->
+            erlang:demonitor(MRef, [flush]),
+            {error, timeout}
+    end.
+    
+
 get_own_loaded_mibs() ->
     AgentInfo = snmpa:info(snmp_master_agent),
     [ Name || {Name, _, _} <- loaded_mibs(AgentInfo) ].
@@ -193,36 +226,36 @@ init([AgentType, Opts]) ->
     ?vdebug("agent restart type: ~w", [Restart]),
 
     %% -- Agent type --
-    ets:insert(snmp_agent_table, {agent_type, AgentType}),
+    store(agent_type, AgentType),
 
     %% -- Prio --
     Prio = get_opt(priority, Opts, normal),
     ?vdebug("[agent table] store priority: ~p",[Prio]),
-    ets:insert(snmp_agent_table, {priority, Prio}),
+    store(priority, Prio),
 
     %% -- Versions -- 
     Vsns = get_opt(versions, Opts, [v1,v2,v3]),
     ?vdebug("[agent table] store versions: ~p",[Vsns]),
-    ets:insert(snmp_agent_table, {versions, Vsns}),
+    store(versions, Vsns),
 
     %% -- Max number of VBs in a Get-BULK response --
     GbMaxVBs = get_gb_max_vbs(Opts),
     ?vdebug("[agent table] Get-BULK max VBs: ~p", [GbMaxVBs]),
-    ets:insert(snmp_agent_table, {gb_max_vbs, GbMaxVBs}),
+    store(gb_max_vbs, GbMaxVBs),
 
     %% -- DB-directory --
     DbDir = get_opt(db_dir, Opts),
     ?vdebug("[agent table] store db_dir: ~n   ~p",[DbDir]),
-    ets:insert(snmp_agent_table, {db_dir, filename:join([DbDir])}),
+    store(db_dir, filename:join([DbDir])),
 
     DbInitError = get_opt(db_init_error, Opts, terminate),
     ?vdebug("[agent table] store db_init_error: ~n   ~p",[DbInitError]),
-    ets:insert(snmp_agent_table, {db_init_error, DbInitError}),
+    store(db_init_error, DbInitError),
 
     %% -- Error report module --
     ErrorReportMod = get_opt(error_report_mod, Opts, snmpa_error_logger),
     ?vdebug("[agent table] store error report module: ~w",[ErrorReportMod]),
-    ets:insert(snmp_agent_table, {error_report_mod, ErrorReportMod}),
+    store(error_report_mod, ErrorReportMod),
 
     %% -- mib storage --
     %% MibStorage has only one mandatory part: module
@@ -320,31 +353,31 @@ init([AgentType, Opts]) ->
 	end,
 
     ?vdebug("[agent table] store mib storage: ~w", [MibStorage]),
-    ets:insert(snmp_agent_table, {mib_storage, MibStorage}),
+    store(mib_storage, MibStorage),
 
     %% -- Agent mib storage --
     AgentMibStorage = get_opt(agent_mib_storage, Opts, persistent),
     %% ?vdebug("[agent table] store agent mib storage: ~w",[AgentMibStorage]),
-    ets:insert(snmp_agent_table, {agent_mib_storage, AgentMibStorage}),
+    store(agent_mib_storage, AgentMibStorage),
 
     %% -- System start time --
     ?vdebug("[agent table] store system start time",[]),
-    ets:insert(snmp_agent_table, {system_start_time, snmp_misc:now(cs)}),
+    store(system_start_time, snmp_misc:now(cs)),
 
     %% -- Symbolic store options --
     SsOpts = get_opt(symbolic_store, Opts, []),
     ?vdebug("[agent table] store symbolic store options: ~w",[SsOpts]),
-    ets:insert(snmp_agent_table, {symbolic_store, SsOpts}),
+    store(symbolic_store, SsOpts),
 
     %% -- Local DB options --
     LdbOpts = get_opt(local_db, Opts, []),
     ?vdebug("[agent table] store local db options: ~w",[LdbOpts]),
-    ets:insert(snmp_agent_table, {local_db, LdbOpts}),
+    store(local_db, LdbOpts),
 
     %% -- Target cache options --
     TargetCacheOpts = get_opt(target_cache, Opts, []),
     ?vdebug("[agent table] store target cache options: ~w",[TargetCacheOpts]),
-    ets:insert(snmp_agent_table, {target_cache, TargetCacheOpts}),
+    store(target_cache, TargetCacheOpts),
 
     %% -- Specs --
     SupFlags = {one_for_all, 0, 3600},
@@ -377,7 +410,7 @@ init([AgentType, Opts]) ->
 		%% -- Config --
 		ConfOpts = get_opt(config, Opts, []),
 		?vdebug("[agent table] store config options: ~p", [ConfOpts]),
-		ets:insert(snmp_agent_table, {config, ConfOpts}),
+		store(config, ConfOpts),
 
 		ConfigArgs = [Vsns, ConfOpts],
 		ConfigSpec = 
@@ -390,43 +423,46 @@ init([AgentType, Opts]) ->
 		%% -- Discovery processing --
 		DiscoOpts = get_opt(discovery, Opts, []),
 		?vdebug("[agent table] store discovery options: ~p", [DiscoOpts]),
-		ets:insert(snmp_agent_table, {discovery, DiscoOpts}),
+		store(discovery, DiscoOpts),
 
 		%% -- Mibs --
 		Mibs = get_mibs(get_opt(mibs, Opts, []), Vsns),
 		?vdebug("[agent table] store mibs: ~n   ~p",[Mibs]),
-		ets:insert(snmp_agent_table, {mibs, Mibs}),
+		store(mibs, Mibs),
 
 		Ref  = make_ref(),
 
+		%% -- Get module --
+		GetModule  = get_opt(get_mechanism, Opts, snmpa_get),
+		?vdebug("[agent table] store get-module: ~p", [GetModule]),
+		store(get_mechanism, GetModule),
+
 		%% -- Set module --
 		SetModule  = get_opt(set_mechanism, Opts, snmpa_set),
 		?vdebug("[agent table] store set-module: ~p",[SetModule]),
-		ets:insert(snmp_agent_table, {set_mechanism, ConfOpts}),
+		store(set_mechanism, SetModule),
 
 		%% -- Authentication service --
 		AuthModule = get_opt(authentication_service, Opts, snmpa_acm),
 		?vdebug("[agent table] store authentication service: ~w",
 			[AuthModule]),
-		ets:insert(snmp_agent_table, 
-			   {authentication_service, AuthModule}),
+		store(authentication_service, AuthModule),
 
 		%% -- Multi-threaded --
 		MultiT = get_opt(multi_threaded, Opts, false),
-		?vdebug("[agent table] store multi-threaded: ~p",[MultiT]),
-		ets:insert(snmp_agent_table, {multi_threaded, MultiT}),
+		?vdebug("[agent table] store multi-threaded: ~p", [MultiT]),
+		store(multi_threaded, MultiT),
 
 		%% -- Audit trail log --
 		case get_opt(audit_trail_log, Opts, not_found) of
 		    not_found ->
-			?vdebug("[agent table] no audit trail log",[]),
+			?vdebug("[agent table] no audit trail log", []),
 			ok;
 		    AtlOpts ->
 			?vdebug("[agent table] "
 				"store audit trail log options: ~p",
 				[AtlOpts]),
-			ets:insert(snmp_agent_table, 
-				   {audit_trail_log, AtlOpts}),
+			store(audit_trail_log, AtlOpts),
 			ok
 		end,
 
@@ -434,24 +470,25 @@ init([AgentType, Opts]) ->
 		MibsOpts = get_opt(mib_server, Opts, []),
 		?vdebug("[agent table] store mib-server options: "
 			"~n   ~p", [MibsOpts]),
-		ets:insert(snmp_agent_table, {mib_server, MibsOpts}),
+		store(mib_server, MibsOpts),
 
 		%% -- Network interface --
 		NiOpts = get_opt(net_if, Opts, []),
 		?vdebug("[agent table] store net-if options: "
 			"~n   ~p", [NiOpts]),
-		ets:insert(snmp_agent_table, {net_if, NiOpts}),
+		store(net_if, NiOpts),
 
 		%% -- Note store --
 		NsOpts = get_opt(note_store, Opts, []),
 		?vdebug("[agent table] store note-store options: "
 			"~n   ~p",[NsOpts]),
-		ets:insert(snmp_agent_table, {note_store, NsOpts}),
+		store(note_store, NsOpts),
 
 		AgentOpts = 
 		    [{verbosity,              AgentVerb},
 		     {mibs,                   Mibs},
 		     {mib_storage,            MibStorage},
+		     {get_mechanism,          GetModule},
 		     {set_mechanism,          SetModule},
 		     {authentication_service, AuthModule},
 		     {multi_threaded,         MultiT},
@@ -480,6 +517,10 @@ init([AgentType, Opts]) ->
     {ok, {SupFlags, [MiscSupSpec, SymStoreSpec, LocalDbSpec, TargetCacheSpec | 
 		     Rest]}}.
 
+
+store(Key, Value) ->
+    ets:insert(snmp_agent_table, {Key, Value}).
+
 get_mibs(Mibs, Vsns) ->
     MibDir = filename:join(code:priv_dir(snmp), "mibs"),
     StdMib = 
diff --git a/lib/snmp/src/agent/snmpa_trap.erl b/lib/snmp/src/agent/snmpa_trap.erl
index e75016f7ec..119207c76b 100644
--- a/lib/snmp/src/agent/snmpa_trap.erl
+++ b/lib/snmp/src/agent/snmpa_trap.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. 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.
@@ -364,13 +364,14 @@ send_trap(TrapRec, NotifyName, ContextName, Recv, Vbs, LocalEngineID,
 			 LocalEngineID, ExtraInfo, NetIf)
 	end
     catch
-	T:E ->
-	    Info = [{args, [TrapRec, NotifyName, ContextName, 
-			    Recv, Vbs, LocalEngineID, ExtraInfo, NetIf]},
-		    {tag,  T},
-		    {err,  E},
-		    {stacktrace, erlang:get_stacktrace()}],
-	    ?vlog("snmpa_trap:send_trap exception: ~p", [Info]),
+	C:E:S ->
+	    Info = [{args,  [TrapRec, NotifyName, ContextName, 
+                             Recv, Vbs, LocalEngineID, ExtraInfo, NetIf]},
+		    {class, C},
+		    {err,   E},
+		    {stacktrace, S}],
+	    ?vlog("snmpa_trap:send_trap exception: "
+                  "~n   ~p", [Info]),
 	    {error, {failed_sending_trap, Info}}
     end.
      
@@ -830,11 +831,11 @@ do_send_v1_trap(Enter, Spec, V1Res, NVbs, ExtraInfo, NetIf, SysUpTime) ->
 		case lists:keyfind(transportDomainUdpIpv4, 1, Transports) of
 		    false ->
 			?vtrace(
-			   "snmpa_trap: can not send v1 trap "
+			   "snmpa_trap: cannot send v1 trap "
 			   "without IPv4 domain: ~p",
 			   [Transports]),
 			user_err(
-			   "snmpa_trap: can not send v1 trap "
+			   "snmpa_trap: cannot send v1 trap "
 			   "without IPv4 domain: ~p",
 			   [Transports]);
 		    DomainAddr ->
@@ -917,7 +918,7 @@ do_send_v2_trap(Recvs, Vbs, ExtraInfo, NetIf) ->
     TrapPdu = make_v2_notif_pdu(Vbs, 'snmpv2-trap'),
     AddrCommunities = mk_addr_communities(Recvs),
     lists:foreach(fun({Community, Addrs}) ->
-			  ?vtrace("~n   send v2 trap to ~p",[Addrs]),
+			  ?vtrace("send v2 trap to ~p",[Addrs]),
 			  NetIf ! {send_pdu, 'version-2', TrapPdu,
 				   {community, Community}, Addrs, ExtraInfo}
 		  end, AddrCommunities),
@@ -1114,7 +1115,7 @@ transform_taddrs(TAddrs) ->
 
 %% v2
 transform_taddr({?snmpUDPDomain, Addr}) ->
-    transform_taddr(transportDomainIdpIpv4, Addr);
+    transform_taddr(transportDomainUdpIpv4, Addr);
 transform_taddr({?transportDomainUdpIpv4, Addr}) ->
     transform_taddr(transportDomainUdpIpv4, Addr);
 transform_taddr({?transportDomainUdpIpv6, Addr}) ->
diff --git a/lib/snmp/src/agent/snmpa_usm.erl b/lib/snmp/src/agent/snmpa_usm.erl
index fb616cd9ef..1debceae98 100644
--- a/lib/snmp/src/agent/snmpa_usm.erl
+++ b/lib/snmp/src/agent/snmpa_usm.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2019. 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.
@@ -646,10 +646,12 @@ get_des_salt() ->
 		ets:insert(snmp_agent_table, {usm_des_salt, 0}),
 		0;
 	    _ -> % it doesn't exist, initialize
-                random:seed(erlang:phash2([node()]),
-                            erlang:monotonic_time(),
-                            erlang:unique_integer()),
-		R = random:uniform(4294967295),
+                ?SNMP_RAND_SEED(),
+                %% rand:seed(exrop,
+                %%           {erlang:phash2([node()]),
+                %%            erlang:monotonic_time(),
+                %%            erlang:unique_integer()}),
+		R = rand:uniform(4294967295),
 		ets:insert(snmp_agent_table, {usm_des_salt, R}),
 		R
 	end,
@@ -679,10 +681,12 @@ get_aes_salt() ->
 		ets:insert(snmp_agent_table, {usm_aes_salt, 0}),
 		0;
 	    _ -> % it doesn't exist, initialize
-                random:seed(erlang:phash2([node()]),
-                            erlang:monotonic_time(),
-                            erlang:unique_integer()),
-		R = random:uniform(36893488147419103231),
+                ?SNMP_RAND_SEED(),
+                %% rand:seed(exrop,
+                %%           {erlang:phash2([node()]),
+                %%            erlang:monotonic_time(),
+                %%            erlang:unique_integer()}),
+		R = rand:uniform(36893488147419103231),
 		ets:insert(snmp_agent_table, {usm_aes_salt, R}),
 		R
 	end,
diff --git a/lib/snmp/src/app/snmp.app.src b/lib/snmp/src/app/snmp.app.src
index d4bf0de61a..178309b488 100644
--- a/lib/snmp/src/app/snmp.app.src
+++ b/lib/snmp/src/app/snmp.app.src
@@ -49,6 +49,9 @@
              snmpa_error_io,
              snmpa_error_logger,
              snmpa_error_report,
+             snmpa_get,
+             snmpa_get_lib,
+             snmpa_get_mechanism, 
              snmpa_local_db,
              snmpa_mib,
              snmpa_mib_data,
diff --git a/lib/snmp/src/app/snmp.config b/lib/snmp/src/app/snmp.config
index b66ef5d7df..f35a636157 100644
--- a/lib/snmp/src/app/snmp.config
+++ b/lib/snmp/src/app/snmp.config
@@ -8,6 +8,7 @@
 %%                 {agent_verbosity,   verbosity()} |
 %%                 {versions,          versions()} |
 %%                 {priority,          atom()} |
+%%                 {get_mechanism,     module()} |
 %%                 {set_mechanism,     module()} |
 %%                 {authentication_service, module()} |
 %%                 {multi_threaded,    bool()} | 
diff --git a/lib/snmp/src/app/snmp.erl b/lib/snmp/src/app/snmp.erl
index 8a736f688b..1e6a93deff 100644
--- a/lib/snmp/src/app/snmp.erl
+++ b/lib/snmp/src/app/snmp.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. 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.
@@ -95,6 +95,9 @@
 	      dir/0, 
 	      snmp_timer/0, 
 
+              atl_type/0,
+              verbosity/0,
+
 	      engine_id/0, 
 	      tdomain/0, 
 	      community/0, 
@@ -116,7 +119,10 @@
 	      pdu/0, 
 	      trappdu/0, 
 	      mib/0, 
-	      mib_name/0, 
+	      mib_name/0,
+
+              error_status/0,
+              error_index/0,
  
 	      void/0
 	     ]).
@@ -185,6 +191,9 @@
 -type dir()           :: string().
 -type snmp_timer()    :: #snmp_incr_timer{}.
 
+-type atl_type()      :: read | write | read_write.
+-type verbosity()     :: info | log | debug | trace | silence.
+
 -type engine_id()     :: string().
 -type tdomain()       :: transportDomainUdpIpv4 | transportDomainUdpIpv6.
 -type community()     :: string().
@@ -208,6 +217,23 @@
 -type pdu()           :: #pdu{}.
 -type trappdu()       :: #trappdu{}.
 
+%% We should really specify all of these, but they are so numerous...
+%% See the validate_err/1 function in the snmpa_agent.
+%% Here are a number of them:
+%% badValue |
+%% commitFailed |
+%% genErr |
+%% inconsistentName | inconsistentValue |
+%% noAccess | noCreation |
+%% noSuchInstance | noSuchName | noSuchObject |
+%% notWritable |
+%% resourceUnavailable |
+%% undoFailed |
+%% wrongValue
+
+-type error_status()  :: atom().
+-type error_index()   :: pos_integer().
+
 -type void()          :: term().
 
 
@@ -570,15 +596,6 @@ print_mod_info(Prefix, {Module, Info}) ->
             _ ->
                 "Not found"
         end,
-    CompDate =
-        case key1search(compile_time, Info) of
-            {value, {Year, Month, Day, Hour, Min, Sec}} ->
-                io_lib:format(
-		  "~w-~2..0w-~2..0w ~2..0w:~2..0w:~2..0w",
-		  [Year, Month, Day, Hour, Min, Sec]);
-            _ ->
-                "Not found"
-        end,
     Digest =
         case key1search(md5, Info) of
             {value, MD5} when is_binary(MD5) ->
@@ -590,13 +607,11 @@ print_mod_info(Prefix, {Module, Info}) ->
               "~s      Vsn:          ~s~n"
               "~s      App vsn:      ~s~n"
               "~s      Compiler ver: ~s~n"
-	      "~s      Compile time: ~s~n"
               "~s      MD5 digest:   ~s~n",
               [Prefix, Module, 
 	       Prefix, Vsn, 
 	       Prefix, AppVsn, 
 	       Prefix, CompVer,
-	       Prefix, CompDate,
 	       Prefix, Digest]),
     ok.
 
@@ -691,13 +706,8 @@ sys_info() ->
     [{arch, SysArch}, {ver, SysVer}].
  
 os_info() ->
-    V = os:version(),
-    case os:type() of
-        {OsFam, OsName} ->
-            [{fam, OsFam}, {name, OsName}, {ver, V}];
-        OsFam ->
-            [{fam, OsFam}, {ver, V}]
-    end.
+    {OsFam, OsName} = os:type(),
+    [{fam, OsFam}, {name, OsName}, {ver, os:version()}].
 
 ms1() ->
     App    = ?APPLICATION,
diff --git a/lib/snmp/src/app/snmp_internal.hrl b/lib/snmp/src/app/snmp_internal.hrl
index 374767df15..f9a758ab7b 100644
--- a/lib/snmp/src/app/snmp_internal.hrl
+++ b/lib/snmp/src/app/snmp_internal.hrl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2019. 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,7 +25,12 @@
 -define(APPLICATION, snmp).
 -endif.
 
--define(STACK(), erlang:get_stacktrace()).
+
+-define(SNMP_RAND_SEED_ALG,    exrop).
+-define(SNMP_RAND_SEED(),      rand:seed(?SNMP_RAND_SEED_ALG,
+                                         {erlang:phash2([node()]),
+                                          erlang:monotonic_time(),
+                                          erlang:unique_integer()})).
 
 -define(snmp_info(C, F, A),    ?snmp_msg(info_msg, C, F, A)).
 -define(snmp_warning(C, F, A), ?snmp_msg(warning_msg, C, F, A)).
@@ -39,5 +44,3 @@
 
 -endif. % -ifdef(snmp_internal).
 
-
-
diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile
index 4093ffa9ca..d9678669a5 100644
--- a/lib/snmp/src/compile/Makefile
+++ b/lib/snmp/src/compile/Makefile
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-2016. All Rights Reserved.
+# Copyright Ericsson AB 1997-2019. 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.
@@ -59,6 +59,8 @@ PARSER_TARGET = $(PARSER_MODULE).$(EMULATOR)
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
+ERL_COMPILE_FLAGS += -pa $(ERL_TOP)/lib/snmp/ebin
+
 ifeq ($(WARN_UNUSED_VARS),true)
 ERL_COMPILE_FLAGS += +warn_unused_vars
 endif
diff --git a/lib/snmp/src/compile/snmpc.erl b/lib/snmp/src/compile/snmpc.erl
index c810bfcd41..4249799195 100644
--- a/lib/snmp/src/compile/snmpc.erl
+++ b/lib/snmp/src/compile/snmpc.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2019. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
 -export([init/3]).
 
 -include_lib("stdlib/include/erl_compile.hrl").
+-include_lib("snmp/src/app/snmp_internal.hrl").
 -include("snmp_types.hrl").
 -include("snmpc.hrl").
 -include("snmpc_lib.hrl").
@@ -413,9 +414,11 @@ get_verbosity(Options) ->
 %%----------------------------------------------------------------------
 
 init(From, MibFileName, Options) ->
-    random:seed(erlang:phash2([node()]),
-                erlang:monotonic_time(),
-                erlang:unique_integer()),
+    ?SNMP_RAND_SEED(),
+    %% rand:seed(exrop,
+    %%           {erlang:phash2([node()]),
+    %%            erlang:monotonic_time(),
+    %%            erlang:unique_integer()}),
     put(options,            Options),
     put(verbosity,          get_verbosity(Options)),
     put(description,        get_description(Options)),
diff --git a/lib/snmp/src/manager/snmpm.erl b/lib/snmp/src/manager/snmpm.erl
index cf8c95d69f..8e60cecaf9 100644
--- a/lib/snmp/src/manager/snmpm.erl
+++ b/lib/snmp/src/manager/snmpm.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
 	 %% Management API
 	 start/0, start/1, 
 	 start_link/0, start_link/1, 
-	 stop/0, 
+	 stop/0, stop/1,
 
 	 monitor/0, demonitor/1, 
 	 notify_started/1, cancel_notify_started/1, 
@@ -196,7 +196,12 @@ start(Opts) ->
     ok.
 
 stop() ->
-    snmpm_supervisor:stop().
+    stop(0).
+
+stop(Timeout) when (Timeout =:= infinity) orelse
+                   (is_integer(Timeout) andalso (Timeout >= 0)) ->
+    snmpm_supervisor:stop(Timeout).
+
 
 
 monitor() ->
diff --git a/lib/snmp/src/manager/snmpm_conf.erl b/lib/snmp/src/manager/snmpm_conf.erl
index 0421f49c88..d097b40438 100644
--- a/lib/snmp/src/manager/snmpm_conf.erl
+++ b/lib/snmp/src/manager/snmpm_conf.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2019. 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.
@@ -356,6 +356,7 @@ read_config_file(Dir, File, Order, Check) ->
 
 %% ---- config file utility functions ----
 
+-dialyzer({nowarn_function, check_ok/1}). % Future compat
 check_ok(ok) ->
     ok;
 check_ok({ok, _}) ->
diff --git a/lib/snmp/src/manager/snmpm_config.erl b/lib/snmp/src/manager/snmpm_config.erl
index 118cdcd1df..4653d9822d 100644
--- a/lib/snmp/src/manager/snmpm_config.erl
+++ b/lib/snmp/src/manager/snmpm_config.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. 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.
@@ -479,10 +479,7 @@ agent_info(Domain, Address, Item) when is_atom(Domain) ->
 	NAddress ->
 	    do_agent_info(Domain, NAddress, Item)
     catch
-	_Thrown ->
-	    %% p(?MODULE_STRING":agent_info(~p, ~p, ~p) throwed ~p at.~n"
-	    %%   "    ~p",
-	    %%   [Domain, Address, Item, _Thrown, erlang:get_stacktrace()]),
+	_C:_E:_S ->
 	    {error, not_found}
     end;
 agent_info(Ip, Port, Item) when is_integer(Port) ->
@@ -493,10 +490,7 @@ agent_info(Ip, Port, Item) when is_integer(Port) ->
 	Address ->
 	    do_agent_info(Domain, Address, Item)
     catch
-	_Thrown ->
-	    %% p(?MODULE_STRING":agent_info(~p, ~p, ~p) throwed ~p at.~n"
-	    %%   "    ~p",
-	    %%   [Ip, Port, Item, _Thrown, erlang:get_stacktrace()]),
+	_C:_E:_S ->
 	    {error, not_found}
     end.
 
@@ -1688,9 +1682,10 @@ read_agents_config_file(Dir) ->
     Check = fun check_agent_config/2,
     try read_file(Dir, "agents.conf", Order, Check, [])
     catch
-	throw:Error ->
-	    ?vlog("agent config error: ~p", [Error]),
-	    erlang:raise(throw, Error, erlang:get_stacktrace())
+	throw:E:S ->
+	    ?vlog("agent config error: "
+                  "~n   ~p", [E]),
+	    erlang:raise(throw, E, S)
     end.
 
 check_agent_config(Agent, State) ->
@@ -1935,9 +1930,10 @@ read_users_config_file(Dir) ->
     Check = fun (User, State) -> {check_user_config(User), State} end,
     try read_file(Dir, "users.conf", Order, Check, [])
     catch
-	throw:Error ->
-	    ?vlog("failure reading users config file: ~n   ~p", [Error]),
-	    erlang:raise(throw, Error, erlang:get_stacktrace())
+	throw:E:S ->
+	    ?vlog("failure reading users config file: "
+                  "~n   ~p", [E]),
+	    erlang:raise(throw, E, S)
     end.
 
 check_user_config({Id, Mod, Data}) ->
@@ -2351,10 +2347,11 @@ read_file(Dir, FileName, Order, Check, Default) ->
 read_file(Dir, FileName, Order, Check) ->
     try snmp_conf:read(filename:join(Dir, FileName), Order, Check)
     catch
-	throw:{error, Reason} = Error
+	throw:{error, Reason} = E:S
 	  when element(1, Reason) =:= failed_open ->
-	    error_msg("failed reading config from ~s: ~p", [FileName, Reason]),
-	    erlang:raise(throw, Error, erlang:get_stacktrace())
+	    error_msg("failed reading config from ~s: "
+                      "~n   ~p", [FileName, Reason]),
+	    erlang:raise(throw, E, S)
     end.
 
 %%--------------------------------------------------------------------
@@ -2741,16 +2738,16 @@ dets_backup(close, _Cont, _D, B) ->
     ok;
 dets_backup(read, Cont1, D, B) ->
     case dets:bchunk(D, Cont1) of
+        {error, _} = ERROR ->
+            ERROR;
+        '$end_of_table' ->
+            dets:close(B),
+            end_of_input;
         {Cont2, Data} ->
             F = fun(Arg) ->
                         dets_backup(Arg, Cont2, D, B)
                 end,
-            {Data, F};
-        '$end_of_table' ->
-            dets:close(B),
-            end_of_input;
-        Error ->
-            Error
+            {Data, F}
     end.
 
 
diff --git a/lib/snmp/src/manager/snmpm_mpd.erl b/lib/snmp/src/manager/snmpm_mpd.erl
index 191dc2c281..8d0a7918a6 100644
--- a/lib/snmp/src/manager/snmpm_mpd.erl
+++ b/lib/snmp/src/manager/snmpm_mpd.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. 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.
@@ -68,11 +68,13 @@
 %%%-----------------------------------------------------------------
 init(Vsns) ->
     ?vdebug("init -> entry with ~p", [Vsns]),
-    random:seed(erlang:phash2([node()]),
-                erlang:monotonic_time(),
-                erlang:unique_integer()),
-    snmpm_config:cre_counter(msg_id, random:uniform(2147483647)),
-    snmpm_config:cre_counter(req_id, random:uniform(2147483647)),
+    ?SNMP_RAND_SEED(),
+    %% rand:seed(exrop,
+    %%           {erlang:phash2([node()]),
+    %%            erlang:monotonic_time(),
+    %%            erlang:unique_integer()}),
+    snmpm_config:cre_counter(msg_id, rand:uniform(2147483647)),
+    snmpm_config:cre_counter(req_id, rand:uniform(2147483647)),
     init_counters(),
     State = init_versions(Vsns, #state{}),
     init_usm(State#state.v3),
diff --git a/lib/snmp/src/manager/snmpm_net_if.erl b/lib/snmp/src/manager/snmpm_net_if.erl
index 29216f9d6a..184f782860 100644
--- a/lib/snmp/src/manager/snmpm_net_if.erl
+++ b/lib/snmp/src/manager/snmpm_net_if.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. 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.
@@ -182,11 +182,9 @@ worker(Worker, Failer, #state{log = Log} = State) ->
 		      %% Winds up in handle_info {'DOWN', ...}
 		      erlang:exit({net_if_worker, Result})
 	      catch
-		  Class:Reason ->
+		  C:E:S ->
 		      %% Winds up in handle_info {'DOWN', ...}
-		      erlang:exit(
-			{net_if_worker, Failer,
-			 Class, Reason, erlang:get_stacktrace()})
+		      erlang:exit({net_if_worker, Failer, C, E, S})
 	      end
       end,
       [monitor]).
@@ -983,11 +981,10 @@ udp_send(Sock, To, Msg) ->
 	    error_msg("failed sending message to ~p:~p:~n"
 		      "   ~p",[IpAddr, IpPort, Reason])
     catch
-	error:Error ->
-	    error_msg("failed sending message to ~p:~p:~n"
-		      "   error:~p~n"
-		      "   ~p",
-		      [IpAddr, IpPort, Error, erlang:get_stacktrace()])
+	error:E:S ->
+	    error_msg("failed sending message to ~p:~p:"
+		      "~n   ~p"
+		      "~n   ~p", [IpAddr, IpPort, E, S])
     end.
 
 sz(B) when is_binary(B) ->
diff --git a/lib/snmp/src/manager/snmpm_network_interface.erl b/lib/snmp/src/manager/snmpm_network_interface.erl
index d0f6f709d3..7123bb94f0 100644
--- a/lib/snmp/src/manager/snmpm_network_interface.erl
+++ b/lib/snmp/src/manager/snmpm_network_interface.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -20,19 +20,61 @@
 
 -module(snmpm_network_interface).
 
--export([behaviour_info/1]).
-
-behaviour_info(callbacks) ->
-    [{start_link,          2}, 
-     {stop,                1},
-     {send_pdu,            7},
-     {inform_response,     4},
-     {note_store,          2},
-     {info,                1},
-     {verbosity,           2},
-     %% {system_info_updated, 2},
-     {get_log_type,        1},
-     {set_log_type,        2}];
-behaviour_info(_) ->
-    undefined.
+-callback start_link(Server, NoteStore) ->
+    {ok, Pid} | {error, Reason} when
+      Server    :: pid(),
+      NoteStore :: pid(),
+      Pid       :: pid(),
+      Reason    :: term().
+
+-callback stop(Pid) ->
+    snmp:void() when
+      Pid :: pid().
+
+-callback send_pdu(Pid, Pdu, Vsn, MsgData, Domain, Addr, ExtraInfo) ->
+    snmp:void() when
+      Pid       :: pid(),
+      Pdu       :: snmp:pdu(),
+      Vsn       :: 'version-1' | 'version-2' | 'version-3',
+      MsgData   :: term(),
+      Domain    :: snmp:tdomain(),
+      Addr      :: {inet:ip_address(), inet:port_number()},
+      ExtraInfo :: term().
+
+-callback inform_response(Pid, Ref, Addr, Port) ->
+    snmp:void() when
+      Pid  :: pid(),
+      Ref  :: term(),
+      Addr :: inet:ip_address(),
+      Port :: inet:port_number().
+
+-callback note_store(Pid, NoteStore) ->
+    snmp:void() when
+      Pid       :: pid(),
+      NoteStore :: pid().
+
+-callback info(Pid) ->
+    Info when
+      Pid   :: pid(),
+      Info  :: [{Key, Value}],
+      Key   :: term(),
+      Value :: term().
+
+-callback verbosity(Pid, Verbosity) ->
+    snmp:void() when
+      Pid       :: pid(),
+      Verbosity :: snmp:verbosity().
+
+-callback get_log_type(Pid) ->
+    {ok, LogType} | {error, Reason} when
+      Pid     :: pid(),
+      LogType :: snmp:atl_type(),
+      Reason  :: term().
+
+-callback set_log_type(Pid, NewType) ->
+    {ok, OldType} | {error, Reason} when
+      Pid     :: pid(),
+      NewType :: snmp:atl_type(),
+      OldType :: snmp:atl_type(),
+      Reason  :: term().
 
diff --git a/lib/snmp/src/manager/snmpm_server.erl b/lib/snmp/src/manager/snmpm_server.erl
index c8d7fa1e8b..a6ca2b2b14 100644
--- a/lib/snmp/src/manager/snmpm_server.erl
+++ b/lib/snmp/src/manager/snmpm_server.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. 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.
@@ -1755,9 +1755,10 @@ handle_error(_UserId, Mod, Reason, ReqId, Data, _State) ->
 			Mod:handle_error(ReqId, Reason, Data)
 		    end
 		catch
-		    T:E ->
+		    C:E:S ->
 			CallbackArgs = [ReqId, Reason, Data], 
-			handle_invalid_result(handle_error, CallbackArgs, T, E)
+			handle_invalid_result(handle_error, CallbackArgs,
+                                              C, E, S)
 		end
 	end,
     handle_callback(F),
@@ -1948,9 +1949,10 @@ handle_pdu(
 			Mod:handle_pdu(TargetName, ReqId, SnmpResponse, Data)
 		    end
 		catch
-		    T:E ->
+		    C:E:S ->
 			CallbackArgs = [TargetName, ReqId, SnmpResponse, Data], 
-			handle_invalid_result(handle_pdu, CallbackArgs, T, E) 
+			handle_invalid_result(handle_pdu, CallbackArgs,
+                                              C, E, S) 
 		end
 	end,
     handle_callback(F),
@@ -2119,10 +2121,10 @@ do_handle_agent(DefUserId, DefMod,
 		      "<~p,~p>: ~n~w", [Type, Domain, Addr, SnmpInfo])
 	    end;
 	
-	T:E ->
+	C:E:S ->
 	    CallbackArgs =
 		[Domain_or_Ip, Addr_or_Port, Type, SnmpInfo, DefData],
-	    handle_invalid_result(handle_agent, CallbackArgs, T, E)
+	    handle_invalid_result(handle_agent, CallbackArgs, C, E, S)
 	    
     end.
 
@@ -2331,8 +2333,8 @@ do_handle_trap(
 	    handle_invalid_result(handle_trap, CallbackArgs, InvalidResult)
 
     catch
-	T:E ->
-	    handle_invalid_result(handle_trap, CallbackArgs, T, E)
+	C:E:S ->
+	    handle_invalid_result(handle_trap, CallbackArgs, C, E, S)
 
     end.
 
@@ -2523,8 +2525,8 @@ do_handle_inform(
 		reply
 
 	catch
-	    T:E ->
-		handle_invalid_result(handle_inform, CallbackArgs, T, E), 
+	    C:E:S ->
+		handle_invalid_result(handle_inform, CallbackArgs, C, E, S), 
 		reply
 
 	end,
@@ -2837,8 +2839,8 @@ do_handle_report(
 	    reply
 
     catch
-	T:E ->
-	    handle_invalid_result(handle_report, CallbackArgs, T, E),
+	C:E:S ->
+	    handle_invalid_result(handle_report, CallbackArgs, C, E, S),
 	    reply
 
     end.
@@ -2855,15 +2857,14 @@ handle_callback(F) ->
 
     
 
-handle_invalid_result(Func, Args, T, E) ->
-    Stacktrace = ?STACK(), 
+handle_invalid_result(Func, Args, C, E, S) ->
     error_msg("Callback function failed: "
 	      "~n   Function:   ~p"
 	      "~n   Args:       ~p"
-	      "~n   Error Type: ~p"
+	      "~n   Class:      ~p"
 	      "~n   Error:      ~p"
 	      "~n   Stacktrace: ~p", 
-	      [Func, Args, T, E, Stacktrace]). 
+	      [Func, Args, C, E, S]). 
 
 handle_invalid_result(Func, Args, InvalidResult) ->
     error_msg("Callback function returned invalid result: "
diff --git a/lib/snmp/src/manager/snmpm_supervisor.erl b/lib/snmp/src/manager/snmpm_supervisor.erl
index c36bbe1bdd..bc66025c6f 100644
--- a/lib/snmp/src/manager/snmpm_supervisor.erl
+++ b/lib/snmp/src/manager/snmpm_supervisor.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 
 
 %% External exports
--export([start_link/2, stop/0]).
+-export([start_link/2, stop/0, stop/1]).
 
 %% supervisor callbacks
 -export([init/1]).
@@ -38,26 +38,54 @@
 %%%-------------------------------------------------------------------
 %%% API
 %%%-------------------------------------------------------------------
+
 start_link(Type, Opts) ->
     ?d("start_link -> entry with"
        "~n   Opts: ~p", [Opts]),
     SupName = {local, ?MODULE}, 
     supervisor:start_link(SupName, ?MODULE, [Type, Opts]).
 
+
 stop() ->
+    stop(0).
+
+stop(Timeout) ->
     ?d("stop -> entry", []),
     case whereis(?SERVER) of
 	Pid when is_pid(Pid) ->
-	    ?d("stop -> Pid: ~p", [Pid]),
-	    exit(Pid, shutdown),
-	    ?d("stop -> stopped", []),
-	    ok;
+            stop(Pid, Timeout);
 	_ ->
 	    ?d("stop -> not running", []),
 	    not_running
     end.
 
+%% For some unfathomable reason there is no "nice" way to stop
+%% a supervisor. The "normal" way to do it is:
+%% 1) exit(Pid, kill) (kaboom)
+%% 2) If the caller is the *parent*: exit(Pid, shutdown)
+%% So, here we do it the really ugly way...but since this function is 
+%% intended for testing (mostly)...
+stop(Pid, Timeout) when (Timeout =:= 0) ->
+    ?d("stop -> Pid: ~p", [Pid]),
+    sys:terminate(Pid, shutdown),
+    ?d("stop -> stopped", []),
+    ok;
+stop(Pid, Timeout) ->
+    ?d("stop -> Pid: ~p", [Pid]),
+    MRef = erlang:monitor(process, Pid),
+    sys:terminate(Pid, shutdown),
+    receive
+        {'DOWN', MRef, process, Pid, _} ->
+            ?d("stop -> stopped", []),
+            ok
+    after Timeout ->
+            ?d("stop -> timeout", []),
+            erlang:demonitor(MRef, [flush]),
+            {error, timeout}
+    end.
+
 
+    
 %%%-------------------------------------------------------------------
 %%% Callback functions from supervisor
 %%%-------------------------------------------------------------------
diff --git a/lib/snmp/src/misc/snmp_conf.erl b/lib/snmp/src/misc/snmp_conf.erl
index 513616a285..20b7af0373 100644
--- a/lib/snmp/src/misc/snmp_conf.erl
+++ b/lib/snmp/src/misc/snmp_conf.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. 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.
@@ -164,6 +164,14 @@ no_filter(X) -> X.
 %% An ordering function (A, B) shall return true iff
 %% A is less than or equal to B i.e shall return
 %% false iff A is to be ordered after B.
+
+-spec keyorder(N, A, B, Keys) ->
+                      boolean() when
+      N    :: integer(),
+      A    :: tuple(),
+      B    :: tuple(),
+      Keys :: maybe_improper_list().
+
 keyorder(N, A, B, _) when element(N, A) == element(N, B) ->
     true;
 keyorder(N, A, B, [Key | _])
@@ -236,15 +244,16 @@ read_check(File, Check, [{StartLine, Row, EndLine}|Lines], State, Res) ->
 		    "   NewRow: ~p~n", [NewRow]),
 	    read_check(File, Check, Lines, NewState, [NewRow | Res])
     catch
-	{error, Reason} ->
-	    ?vtrace("read_check -> error:~n"
-		    "   Reason: ~p", [Reason]),
+	throw:{error, Reason} ->
+	    ?vtrace("read_check -> error:"
+		    "~n   Reason: ~p", [Reason]),
 	    error({failed_check, File, StartLine, EndLine, Reason});
-	Class:Reason ->
-	    Error = {Class,Reason,erlang:get_stacktrace()},
-	    ?vtrace("read_check -> failure:~n"
-		    "   Error: ~p", [Error]),
-	    error({failed_check, File, StartLine, EndLine, Error})
+	C:E:S ->
+	    ?vtrace("read_check -> failure:"
+                    "~n   Class: ~p"
+		    "~n   Error: ~p"
+		    "~n   Stack: ~p", [C, E, S]),
+	    error({failed_check, File, StartLine, EndLine, {C, E, S}})
     end.
 
 open_file(File) ->
diff --git a/lib/snmp/src/misc/snmp_config.erl b/lib/snmp/src/misc/snmp_config.erl
index 45661b71a7..3104f2a096 100644
--- a/lib/snmp/src/misc/snmp_config.erl
+++ b/lib/snmp/src/misc/snmp_config.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. 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.
@@ -96,17 +96,15 @@
 	]).
 
 
--export_type([void/0,
-	      order_config_entry_function/0,
+-export_type([
+              order_config_entry_function/0,
 	      check_config_entry_function/0,
-	      write_config_function/0]).
+	      write_config_function/0
+             ]).
 
 
 %%----------------------------------------------------------------------
 
--type void() :: term(). % Any value - ignored
-
-
 %%----------------------------------------------------------------------
 %% Handy SNMP configuration
 %%----------------------------------------------------------------------
@@ -1106,6 +1104,7 @@ verify_sec_type(ST)         -> {error, "invalid security type: " ++ ST}.
 verify_address(A) ->
     verify_address(A, snmpUDPDomain).
 
+-dialyzer({nowarn_function, verify_address/2}). % Future compat
 verify_address(A, snmpUDPDomain = _Domain) ->
     do_verify_address(A, inet);
 verify_address(A, transportDomainUdpIpv4 = _Domain) ->
@@ -2573,15 +2572,17 @@ write_config_file(Dir, FileName, Order, Check, Write, Entries)
 		    Error
 	    end
     catch
-	Error ->
-	    S = erlang:get_stacktrace(),
-	    d("File write of ~s throwed: ~p~n    ~p~n",
-	      [FileName, Error, S]),
-	    Error;
-	C:E ->
-	    S = erlang:get_stacktrace(),
-	    d("File write of ~s exception: ~p:~p~n    ~p~n",
-	      [FileName,C,E,S]),
+	throw:E:S ->
+	    d("File write of ~s throwed: "
+              "~n   ~p"
+              "~n   ~p"
+              "~n", [FileName, E, S]),
+	    E;
+	C:E:S ->
+	    d("File write of ~s exception: "
+              "~n   ~p:~p"
+              "~n   ~p"
+              "~n", [FileName, C, E, S]),
 	    {error, {failed_write, Dir, FileName, {C, E, S}}}
     end.
 
@@ -2590,16 +2591,18 @@ write_config_file(Dir, FileName, Write, Entries, Fd) ->
 	ok ->
 	    close_config_file(Dir, FileName, Fd)
     catch
-	Error ->
-	    S = erlang:get_stacktrace(),
-	    d("File write of ~s throwed: ~p~n    ~p~n",
-	      [FileName, Error, S]),
+	throw:E:S ->
+	    d("File write of ~s throwed: "
+              "~n   ~p"
+              "~n   ~p"
+              "~n", [FileName, E, S]),
 	    close_config_file(Dir, FileName, Fd),
-	    Error;
-	C:E ->
-	    S = erlang:get_stacktrace(),
-	    d("File write of ~s exception: ~p:~p~n    ~p~n",
-	      [FileName,C,E,S]),
+	    E;
+	C:E:S ->
+	    d("File write of ~s exception: "
+              "~n   ~p:~p"
+              "~n   ~p"
+              "~n", [FileName, C, E, S]),
 	    close_config_file(Dir, FileName, Fd),
 	    {error, {failed_write, Dir, FileName, {C, E, S}}}
     end.
@@ -2661,16 +2664,18 @@ append_config_file(Dir, FileName, Order, Check, Write, Entries, Fd) ->
 	ok ->
 	    close_config_file(Dir, FileName, Fd)
     catch
-	Error ->
-	    S = erlang:get_stacktrace(),
-	    d("File append of ~s throwed: ~p~n    ~p~n",
-	      [FileName, Error, S]),
+	throw:E:S ->
+	    d("File append of ~s throwed: "
+              "~n   ~p"
+              "~n   ~p"
+              "~n", [FileName, E, S]),
 	    close_config_file(Dir, FileName, Fd),
-	    Error;
-	C:E ->
-	    S = erlang:get_stacktrace(),
-	    d("File append of ~s exception: ~p:~p~n    ~p~n",
-	      [FileName,C,E,S]),
+	    E;
+	C:E:S ->
+	    d("File append of ~s exception: "
+              "~n   ~p:~p"
+              "~n   ~p"
+              "~n", [FileName, C, E, S]),
 	    close_config_file(Dir, FileName, Fd),
 	    {error, {failed_append, Dir, FileName, {C, E, S}}}
     end.
@@ -2702,16 +2707,18 @@ read_config_file(Dir, FileName, Order, Check)
 		SortedLines = sort_lines(Lines, Order),
 		{ok, verify_lines(SortedLines, Check, undefined, [])}
 	    catch
-		Error ->
-		    S = erlang:get_stacktrace(),
-		    d("File read of ~s throwed: ~p~n    ~p~n",
-		      [FileName, Error, S]),
-		    {error, Error};
-		T:E ->
-		    S = erlang:get_stacktrace(),
-		    d("File read of ~s exception: ~p:~p~n    ~p~n",
-		      [FileName,T,E,S]),
-		    {error, {failed_read, Dir, FileName, {T, E, S}}}
+		throw:E:S ->
+		    d("File read of ~s throwed: "
+                      "~n   ~p"
+                      "~n   ~p"
+                      "~n", [FileName, E, S]),
+		    {error, E};
+		C:E:S ->
+		    d("File read of ~s exception: "
+                      "~n   ~p:~p"
+                      "~n    ~p"
+                      "~n", [FileName, C, E, S]),
+		    {error, {failed_read, Dir, FileName, {C, E, S}}}
 	    after
 		file:close(Fd)
 	    end;
@@ -2760,11 +2767,10 @@ verify_lines(
 	{{ok, NewTerm}, NewState} ->
 	    verify_lines(Lines, Check, NewState, [NewTerm|Acc])
     catch
-	{error, Reason} ->
+	throw:{error, Reason}:_ ->
 	    throw({failed_check, StartLine, EndLine, Reason});
-	C:R ->
-	    S = erlang:get_stacktrace(),
-	    throw({failed_check, StartLine, EndLine, {C, R, S}})
+	C:E:S ->
+	    throw({failed_check, StartLine, EndLine, {C, E, S}})
     end.
 
 
diff --git a/lib/snmp/src/misc/snmp_log.erl b/lib/snmp/src/misc/snmp_log.erl
index 5713c14912..8a4dfa621b 100644
--- a/lib/snmp/src/misc/snmp_log.erl
+++ b/lib/snmp/src/misc/snmp_log.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2019. 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.
@@ -342,9 +342,9 @@ validate_loop({Cont, Terms, BadBytes}, Log, Validator, PrevTS, PrevSN) ->
     ?vtrace("validate_loop -> "
 	    "~n   NextTS: ~p"
 	    "~n   NextSN: ~p", [NextTS, NextSN]),
-    validate_loop(disk_log:chunk(Log, Cont), Log, Validator, NextTS, NextSN);
-validate_loop(Error, _Log, _Write, _PrevTS, _PrevSN) ->
-    Error.
+    validate_loop(disk_log:chunk(Log, Cont), Log, Validator, NextTS, NextSN).
+%% validate_loop(Error, _Log, _Write, _PrevTS, _PrevSN) ->
+%%     Error.
     
 
 %% -- log ---
@@ -924,14 +924,7 @@ f(TimeStamp, SeqNo,
 	end,
     format_tab(
       "~w ~s - ~s [~s]~s ~w\n~s",
-      [Class, AddrStr, HdrStr, TimeStamp, SeqNo, Vsn, Str]);
-f(TimeStamp, SeqNo, Msg, AddrStr, _Mib) ->
-    io:format("<ERROR> Unexpected data: "
-              "~n   TimeStamp: ~s~s"
-              "~n   Msg:       ~p"
-              "~n   AddrStr:   ~p"
-              "~n", [TimeStamp, SeqNo, Msg, AddrStr]),
-    throw({error, 'invalid-message'}).
+      [Class, AddrStr, HdrStr, TimeStamp, SeqNo, Vsn, Str]).
 
 f(F, A) ->
     lists:flatten(io_lib:format(F, A)).
diff --git a/lib/snmp/src/misc/snmp_misc.erl b/lib/snmp/src/misc/snmp_misc.erl
index 1f847b7a29..39254503ac 100644
--- a/lib/snmp/src/misc/snmp_misc.erl
+++ b/lib/snmp/src/misc/snmp_misc.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. 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.
@@ -64,8 +64,18 @@
 	 strip_extension_from_filename/2, 
 	 str_xor/2,
 	 time/3,
-	 
-	 verify_behaviour/2
+
+	 verify_behaviour/2,
+
+	 %% These are used both for debugging (verbosity printouts)
+         %% and other such "utility" operations.
+         format_timestamp/1, format_timestamp/2, 
+         format_short_timestamp/1, format_short_timestamp/2, 
+         format_long_timestamp/1, format_long_timestamp/2,
+         formated_timestamp/0, 
+         formated_short_timestamp/0, 
+         formated_long_timestamp/0
+
 	]).
 
 
@@ -112,6 +122,102 @@ now(sec) ->
     erlang:monotonic_time(seconds).
     
 
+
+%% ---------------------------------------------------------------------------
+%% # formated_timstamp/0,     formated_timstamp/1
+%% # format_short_timstamp/0, format_short_timstamp/1
+%% # format_long_timstamp/0,  format_long_timstamp/1
+%% 
+%% Create a formatted timestamp. Short means that it will not include 
+%% the date in the formatted timestamp. Also it will only include millis.
+%% ---------------------------------------------------------------------------
+
+formated_timestamp() ->
+    formated_long_timestamp().
+
+formated_short_timestamp() ->
+    format_short_timestamp(os:timestamp()).
+
+formated_long_timestamp() ->
+    format_long_timestamp(os:timestamp()).
+
+
+%% ---------------------------------------------------------------------------
+%% # format_timstamp/1, format_timstamp/2
+%% # format_short_timstamp/1, format_short_timstamp/2
+%% # format_long_timstamp/1, format_long_timstamp/2
+%% 
+%% Formats the provided timestamp. Short means that it will not include 
+%% the date in the formatted timestamp.
+%% ---------------------------------------------------------------------------
+
+-spec format_timestamp(Now :: erlang:timestamp()) ->
+    string().
+
+format_timestamp(Now) ->
+    format_long_timestamp(Now).
+
+-spec format_short_timestamp(Now :: erlang:timestamp()) ->
+    string().
+
+format_short_timestamp(Now) ->
+    N2T = fun(N) -> calendar:now_to_local_time(N) end,
+    format_timestamp(short, Now, N2T).
+
+-spec format_long_timestamp(Now :: erlang:timestamp()) ->
+    string().
+
+format_long_timestamp(Now) ->
+    N2T = fun(N) -> calendar:now_to_local_time(N) end,
+    format_timestamp(long, Now, N2T).
+
+-spec format_timestamp(Now :: erlang:timestamp(), 
+                       N2T :: function()) ->
+    string().
+
+format_timestamp(Now, N2T) when is_tuple(Now) andalso is_function(N2T) ->
+    format_long_timestamp(Now, N2T).
+
+-spec format_short_timestamp(Now :: erlang:timestamp(), 
+                             N2T :: function()) ->
+    string().
+
+format_short_timestamp(Now, N2T) when is_tuple(Now) andalso is_function(N2T) ->
+    format_timestamp(short, Now, N2T).
+
+-spec format_long_timestamp(Now :: erlang:timestamp(), 
+                            N2T :: function()) ->
+    string().
+
+format_long_timestamp(Now, N2T) when is_tuple(Now) andalso is_function(N2T) ->
+    format_timestamp(long, Now, N2T).
+
+format_timestamp(Format, {_N1, _N2, N3} = Now, N2T) ->
+    {Date, Time} = N2T(Now),
+    do_format_timestamp(Format, Date, Time, N3).
+
+do_format_timestamp(short, _Date, Time, N3) ->
+    do_format_short_timestamp(Time, N3);
+do_format_timestamp(long, Date, Time, N3) ->
+    do_format_long_timestamp(Date, Time, N3).
+    
+do_format_long_timestamp(Date, Time, N3) ->
+    {YYYY,MM,DD}   = Date,
+    {Hour,Min,Sec} = Time,
+    FormatDate = 
+        io_lib:format("~.4w-~.2.0w-~.2.0w ~.2.0w:~.2.0w:~.2.0w.~.3.0w",
+                      [YYYY, MM, DD, Hour, Min, Sec, N3 div 1000]),  
+    lists:flatten(FormatDate).
+
+do_format_short_timestamp(Time, N3) ->
+    {Hour,Min,Sec} = Time,
+    FormatDate = 
+        io_lib:format("~.2.0w:~.2.0w:~.2.0w.~.3.0w", 
+                      [Hour, Min, Sec, N3 div 1000]),  
+    lists:flatten(FormatDate).
+
+
+
 is_crypto_supported(Alg) ->
     %% The 'try catch' handles the case when 'crypto' is
     %% not present in the system (or not started).
diff --git a/lib/snmp/src/misc/snmp_verbosity.erl b/lib/snmp/src/misc/snmp_verbosity.erl
index edfb52a474..9b2676d048 100644
--- a/lib/snmp/src/misc/snmp_verbosity.erl
+++ b/lib/snmp/src/misc/snmp_verbosity.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2019. 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.
@@ -70,16 +70,7 @@ print2(_Verbosity,Format,Arguments) ->
 
 
 timestamp() ->
-    format_timestamp(os:timestamp()).
-
-format_timestamp({_N1, _N2, N3} = Now) ->
-    {Date, Time}   = calendar:now_to_datetime(Now),
-    {YYYY,MM,DD}   = Date,
-    {Hour,Min,Sec} = Time,
-    FormatDate =
-        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w ~w",
-                      [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),
-    lists:flatten(FormatDate).
+    snmp_misc:formated_timestamp().
 
 process_args([], Acc) ->
     lists:reverse(Acc);
@@ -155,7 +146,8 @@ image_of_sname(mgr)       -> "MGR";
 image_of_sname(mgr_misc)  -> "MGR_MISC";
 
 image_of_sname(undefined) -> "";
-image_of_sname(V)         -> lists:flatten(io_lib:format("~p",[V])).
+image_of_sname(N) when is_list(N) -> N; % Used in testing
+image_of_sname(N)         -> lists:flatten(io_lib:format("~p", [N])).
 
 
 validate(info)  -> info;
diff --git a/lib/snmp/test/Makefile b/lib/snmp/test/Makefile
index a9142d911d..d9b01536ea 100644
--- a/lib/snmp/test/Makefile
+++ b/lib/snmp/test/Makefile
@@ -180,7 +180,7 @@ emakebuild: $(EMAKEFILE)
 targets: mib $(EMAKEFILE) 
 	erl -make
 
-old_targets: $(TARGET_FILES) $(TEST_SERVER_TARGETS)
+old_targets: mib $(TARGET_FILES) $(TEST_SERVER_TARGETS)
 
 $(EMAKEFILE):  Makefile
 	$(MAKE_EMAKE) $(ERL_COMPILE_FLAGS) -o$(EBIN) '*_SUITE_make' > $(EMAKEFILE)
diff --git a/lib/snmp/test/modules.mk b/lib/snmp/test/modules.mk
index 0f54e67c65..ec3870dbd8 100644
--- a/lib/snmp/test/modules.mk
+++ b/lib/snmp/test/modules.mk
@@ -31,6 +31,7 @@ SUITE_MODULES = \
 	snmp_agent_mibs_test \
 	snmp_agent_nfilter_test \
 	snmp_agent_test \
+	snmp_agent_test_get \
 	snmp_agent_conf_test \
 	snmp_agent_test_lib \
 	snmp_manager_config_test \
@@ -41,6 +42,8 @@ SUITE_MODULES = \
 	snmp_manager_test
 
 TEST_UTIL_MODULES = \
+	snmp_test_global_sys_monitor \
+	snmp_test_sys_monitor \
 	snmp_test_lib \
 	snmp_test_manager \
 	snmp_test_mgr \
diff --git a/lib/snmp/test/snmp_agent_test.erl b/lib/snmp/test/snmp_agent_test.erl
index f9c18af6ea..a45cfa9e98 100644
--- a/lib/snmp/test/snmp_agent_test.erl
+++ b/lib/snmp/test/snmp_agent_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2019. 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.
@@ -557,6 +557,8 @@ init_per_suite(Config0) when is_list(Config0) ->
 
     Config3 = [{mib_dir, MibDir}, {std_mib_dir, StdMibDir} | Config2],
 
+    snmp_test_global_sys_monitor:start(),
+    snmp_test_sys_monitor:start(), % We need one on this node also
     snmp_test_mgr_counter_server:start(), 
 
     p("init_per_suite -> end when"
@@ -580,6 +582,8 @@ end_per_suite(Config) when is_list(Config) ->
     	    p("end_per_suite -> failed stopping counter server"
 	      "~n      Reason: ~p", [Reason])
     end,
+    snmp_test_sys_monitor:stop(),
+    snmp_test_global_sys_monitor:stop(),
 
     p("end_per_suite -> end when"
       "~n      Nodes:  ~p", [erlang:nodes()]),
@@ -667,22 +671,39 @@ init_per_group(GroupName, Config) ->
     snmp_test_lib:init_group_top_dir(GroupName, Config).
 
 init_per_group_ipv6(GroupName, Config, Init) ->
-    {ok, Hostname0} = inet:gethostname(),
-    case ct:require(ipv6_hosts) of
-	ok ->
-	  case lists:member(list_to_atom(Hostname0), ct:get_config(ipv6_hosts)) of
-	      true ->
-		  Init(
-		    snmp_test_lib:init_group_top_dir(
-		      GroupName,
-		      [{ipfamily, inet6},
-		       {ip, ?LOCALHOST(inet6)}
-		       | lists:keydelete(ip, 1, Config)]));
-	      false ->
-		  {skip, "Host does not support IPV6"}
-	  end;
-	_ ->
-	    {skip, "Test config ipv6_hosts is missing"}
+    %% <OS-CONDITIONAL-SKIP>
+    %% This is a higly questionable test.
+    %% But until we have time to figure out what IPv6 issues
+    %% are actually causing the failures...
+    OSSkipable = [{unix, 
+                   [
+                    {darwin, fun(V) when (V > {9, 8, 0}) ->
+				     %% This version is OK: No Skip
+				     false;
+				(_) ->
+				     %% This version is *not* ok: Skip
+				     true
+                             end}
+                   ]
+                  }],
+    %% </OS-CONDITIONAL-SKIP>
+    case ?OS_BASED_SKIP(OSSkipable) of
+        true ->
+            {skip, "Host *may* not *properly* support IPV6"};
+        false ->
+            %% Even if this host supports IPv6 we don't use it unless its
+            %% one of the configured/supported IPv6 hosts...
+            case (?HAS_SUPPORT_IPV6() andalso ?IS_IPV6_HOST()) of
+                true ->
+                    Init(
+                      snmp_test_lib:init_group_top_dir(
+                        GroupName,
+                        [{ipfamily, inet6},
+                         {ip, ?LOCALHOST(inet6)}
+                         | lists:keydelete(ip, 1, Config)]));
+                false ->
+                    {skip, "Host does not support IPv6"}
+            end
     end.
 
 end_per_group(all_tcs, Config) ->
@@ -751,6 +772,8 @@ init_per_testcase(Case, Config) when is_list(Config) ->
 
     Result = init_per_testcase1(Case, Config),
 
+    snmp_test_global_sys_monitor:reset_events(),
+
     p("init_per_testcase -> done when"
       "~n      Result: ~p"
       "~n      Nodes:  ~p", [Result, erlang:nodes()]),
@@ -800,6 +823,9 @@ end_per_testcase(Case, Config) when is_list(Config) ->
       "~n   Nodes:  ~p", [Config, erlang:nodes()]),
 
     display_log(Config),
+
+    p("system events during test: "
+      "~n   ~p", [snmp_test_global_sys_monitor:events()]),
     
     Result = end_per_testcase1(Case, Config),
 
@@ -1116,15 +1142,15 @@ init_ms(Config, Opts) when is_list(Config) ->
     Opts1 = [MasterAgentVerbosity, MibsVerbosity, SymStoreVerbosity | Opts],
     [{vsn, v1} | start_v1_agent(Config, Opts1)].
 
-init_size_check_mse(Config) when is_list(Config) ->
-    MibStorage = {mib_storage, [{module, snmpa_mib_storage_ets}]},
-    init_size_check_ms(Config, [MibStorage]).
+%% init_size_check_mse(Config) when is_list(Config) ->
+%%     MibStorage = {mib_storage, [{module, snmpa_mib_storage_ets}]},
+%%     init_size_check_ms(Config, [MibStorage]).
 
-init_size_check_msd(Config) when is_list(Config) ->
-    AgentDbDir = ?GCONF(agent_db_dir, Config),
-    MibStorage = {mib_storage, [{module,  snmpa_mib_storage_dets}, 
-				{options, [{dir, AgentDbDir}]}]},
-    init_size_check_ms(Config, [MibStorage]).
+%% init_size_check_msd(Config) when is_list(Config) ->
+%%     AgentDbDir = ?GCONF(agent_db_dir, Config),
+%%     MibStorage = {mib_storage, [{module,  snmpa_mib_storage_dets}, 
+%% 				{options, [{dir, AgentDbDir}]}]},
+%%     init_size_check_ms(Config, [MibStorage]).
 
 init_size_check_msm(Config) when is_list(Config) ->
     ?line AgentNode = ?GCONF(snmp_master, Config),
@@ -1637,7 +1663,7 @@ create_local_db_dir(Config) when is_list(Config) ->
     Name = list_to_atom(atom_to_list(create_local_db_dir)
                         ++"-"++As++"-"++Bs++"-"++Cs),
     Pa = filename:dirname(code:which(?MODULE)),
-    {ok,Node} = ?t:start_node(Name, slave, [{args, "-pa "++Pa}]),
+    {ok,Node} = ?t:start_node(Name, slave, [{args, "-pa " ++ Pa}]),
 
     %% first start with a nonexisting DbDir
     Fun1 = fun() ->
@@ -5146,12 +5172,21 @@ snmp_framework_mib_3(Config) when is_list(Config) ->
 %% Req. SNMP-FRAMEWORK-MIB
 snmp_framework_mib_test() ->
     ?line ["agentEngine"] = get_req(1, [[snmpEngineID,0]]),
+    T1 = snmp_misc:now(ms),
     ?line [EngineTime] = get_req(2, [[snmpEngineTime,0]]),
+    T2 = snmp_misc:now(ms),
     ?SLEEP(5000),
+    T3 = snmp_misc:now(ms),
     ?line [EngineTime2] = get_req(3, [[snmpEngineTime,0]]),
-    ?DBG("snmp_framework_mib -> time(s): "
-	 "~n   EngineTime 1 = ~p"
-	 "~n   EngineTime 2 = ~p", [EngineTime, EngineTime2]),
+    T4 = snmp_misc:now(ms),
+    ?PRINT2("snmp_framework_mib -> time(s): "
+            "~n   EngineTime 1: ~p"
+            "~n      Time to acquire: ~w ms"
+            "~n   EngineTime 2: ~p"
+            "~n      Time to acquire: ~w ms"
+            "~n   => (5 sec sleep between get(snmpEngineTime))"
+            "~n      Total time to acquire: ~w ms",
+            [EngineTime, T2-T1, EngineTime2, T4-T3, T4-T1]),
     if 
 	(EngineTime+7) < EngineTime2 ->
 	    ?line ?FAIL({too_large_diff, EngineTime, EngineTime2});
@@ -5160,11 +5195,18 @@ snmp_framework_mib_test() ->
 	true -> 
 	    ok
     end,
+    T5 = snmp_misc:now(ms),
     ?line case get_req(4, [[snmpEngineBoots,0]]) of
 	      [Boots] when is_integer(Boots) -> 
+                  T6 = snmp_misc:now(ms),
+                  ?PRINT2("snmp_framework_mib -> "
+                          "~n   boots: ~p"
+                          "~n      Time to acquire: ~w ms", [Boots, T6-T5]),
 		  ok;
 	      Else -> 
-		  ?FAIL(Else)
+                  ?PRINT2("snmp_framework_mib -> failed get proper boots:"
+                          "~n   ~p", [Else]),
+		  ?FAIL({invalid_boots, Else})
 	  end,
     ok.
 
@@ -6551,7 +6593,6 @@ otp_4394_test() ->
     gn([[1,1]]),
     Res = 
 	case snmp_test_mgr:expect(1, [{[sysDescr,0],  "Erlang SNMP agent"}]) of
-	    %% {error, 1, {"?",[]}, {"~w",[timeout]}}
 	    {error, 1, _, {_, [timeout]}} ->
 		?DBG("otp_4394_test -> expected result: timeout", []),
 		ok;
diff --git a/lib/snmp/test/snmp_agent_test_get.erl b/lib/snmp/test/snmp_agent_test_get.erl
new file mode 100644
index 0000000000..517c71507a
--- /dev/null
+++ b/lib/snmp/test/snmp_agent_test_get.erl
@@ -0,0 +1,58 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019-2019. 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(snmp_agent_test_get).
+
+-behaviour(snmpa_get_mechanism).
+
+
+%%%-----------------------------------------------------------------
+%%% snmpa_get_mechanism exports
+%%%-----------------------------------------------------------------
+
+-export([
+         do_get/3, do_get/4,
+         do_get_next/3,
+         do_get_bulk/7
+        ]).
+
+
+
+do_get(UnsortedVarbinds, IsNotification, Extra) ->
+    snmpa_get:do_get(UnsortedVarbinds, IsNotification, Extra).
+
+
+
+do_get(MibView, UnsortedVarbinds, IsNotification, Extra) ->
+    snmpa_get:do_get(MibView, UnsortedVarbinds, IsNotification, Extra).
+
+
+
+do_get_next(MibView, UnsortedVBs, Extra) ->
+    snmpa_get:do_get_next(MibView, UnsortedVBs, Extra).
+
+
+
+
+do_get_bulk(MibView, NonRepeaters, MaxRepetitions,
+            PduMS, Varbinds, GbMaxVBs, Extra) ->
+    snmpa_get:do_get_bulk(MibView, NonRepeaters, MaxRepetitions,
+                          PduMS, Varbinds, GbMaxVBs,
+                          Extra).
diff --git a/lib/snmp/test/snmp_agent_test_lib.erl b/lib/snmp/test/snmp_agent_test_lib.erl
index 66211d7105..c0da47dc4c 100644
--- a/lib/snmp/test/snmp_agent_test_lib.erl
+++ b/lib/snmp/test/snmp_agent_test_lib.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2019. 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,7 @@
 	]).
 
 %% Internal exports
--export([wait/5, run/4]).
+-export([tc_wait/5, tc_run/4]).
 
 -include_lib("kernel/include/file.hrl").
 -include_lib("common_test/include/ct.hrl").
@@ -276,117 +276,256 @@ init_case(Config) when is_list(Config) ->
 %%% configuration.
 %%%--------------------------------------------------
 
-try_test(Mod, Func) ->
-    call(get(mgr_node), ?MODULE, run, [Mod, Func, [], []]).
-
-try_test(Mod, Func, A) ->
-    call(get(mgr_node), ?MODULE, run, [Mod, Func, A, []]).
-
-try_test(Mod, Func, A, Opts) ->
-    call(get(mgr_node), ?MODULE, run, [Mod, Func, A, Opts]).
-
-call(N,M,F,A) ->
-    ?DBG("call -> entry with~n"
-	   "    N:     ~p~n"
-	   "    M:     ~p~n"
-	   "    F:     ~p~n"
-	   "    A:     ~p~n"
-	   "  when~n"
-	   "    get(): ~p",
-	   [N,M,F,A,get()]),
-    spawn(N, ?MODULE, wait, [self(),get(),M,F,A]),
+try_test(TcRunMod, TcRunFunc) ->
+    try_test(TcRunMod, TcRunFunc, []).
+
+try_test(TcRunMod, TcRunFunc, TcRunArgs) ->
+    try_test(TcRunMod, TcRunFunc, TcRunArgs, []).
+
+try_test(TcRunMod, TcRunFunc, TcRunArgs, TcRunOpts) ->
+    Node      = get(mgr_node),
+    Mod       = ?MODULE,
+    Func      = tc_run,
+    Args      = [TcRunMod, TcRunFunc, TcRunArgs, TcRunOpts],
+    tc_try(Node, Mod, Func, Args).
+
+%% We spawn a test case runner process on the manager node.
+%% The assumption is that the manager shall do something, but
+%% not all test cases have the manager perform actions.
+%% In some cases we make a rpc call back to the agent node directly
+%% and call something in the agent... (for example the info_test
+%% test case).
+%% We should use link (instead of monitor) in order for the test case
+%% timeout cleanup (kills) should have effect on the test case runner
+%% process as well.
+
+tc_try(N, M, F, A) ->
+    ?PRINT2("tc_try -> entry with"
+            "~n      N:     ~p"
+            "~n      M:     ~p"
+            "~n      F:     ~p"
+            "~n      A:     ~p"
+            "~n   when"
+            "~n      get(): ~p"
+            "~n", [N,
+                   M, F, A,
+                   get()]),
+    case net_adm:ping(N) of
+        pong ->
+            ?PRINT2("tc_try -> ~p still running - start runner~n", [N]),
+            OldFlag = trap_exit(true), % Make sure we catch it
+            Runner  = spawn_link(N, ?MODULE, tc_wait, [self(), get(), M, F, A]),
+            await_tc_runner_started(Runner, OldFlag),
+            await_tc_runner_done(Runner, OldFlag);
+        pang ->
+            ?EPRINT2("tc_try -> ~p *not* running~n", [N]),
+            skip({node_not_running, N})
+    end.
+
+await_tc_runner_started(Runner, OldFlag) ->
+    ?PRINT2("await tc-runner (~p) start ack~n", [Runner]),
+    receive
+        {'EXIT', Runner, Reason} ->
+            ?EPRINT2("TC runner start failed: "
+                     "~n   ~p~n", [Reason]),
+            exit({tx_runner_start_failed, Reason});
+        {tc_runner_started, Runner} ->
+            ?PRINT2("TC runner start acknowledged~n"),
+            ok
+    after 10000 -> %% We should *really* not have to wait this long, but...
+            trap_exit(OldFlag),
+            unlink_and_flush_exit(Runner),
+            RunnerInfo = process_info(Runner),
+            ?EPRINT2("TC runner start timeout: "
+                     "~n   ~p", [RunnerInfo]),
+            %% If we don't get a start ack within 10 seconds, we are f*ed
+            exit(Runner, kill),
+            exit({tc_runner_start, timeout, RunnerInfo})
+    end.
+
+await_tc_runner_done(Runner, OldFlag) ->
     receive
-	{done, {'EXIT', Rn}, Loc} ->
-	    ?DBG("call -> done with exit: "
-		 "~n   Rn:  ~p"
-		 "~n   Loc: ~p", [Rn, Loc]),
+        {'EXIT', Runner, Reason} ->
+            %% This is not a normal (tc) failure (that is the clause below).
+            %% Instead the tc runner process crashed, for some reason. So
+            %% check if have got any system events, and if so, skip.
+            SysEvs = snmp_test_global_sys_monitor:events(),
+            if
+                (SysEvs =:= []) ->
+                    ?EPRINT2("TC runner failed: "
+                             "~n   ~p~n", [Reason]),
+                    exit({tx_runner_failed, Reason});
+                true ->
+                    ?EPRINT2("TC runner failed when we got system events: "
+                             "~n   Reason:     ~p"
+                             "~n   Sys Events: ~p"
+                             "~n", [Reason, SysEvs]),
+                    skip([{reason, Reason}, {system_events, SysEvs}])
+            end;
+	{tc_runner_done, Runner, {'EXIT', {skip, Reason}}, Loc} ->
+	    ?PRINT2("call -> done with skip: "
+                    "~n   Reason: ~p"
+                    "~n   Loc:    ~p"
+                    "~n", [Reason, Loc]),
+            trap_exit(OldFlag),
+            unlink_and_flush_exit(Runner),
+	    put(test_server_loc, Loc),
+	    skip(Reason);
+	{tc_runner_done, Runner, {'EXIT', Rn}, Loc} ->
+	    ?PRINT2("call -> done with exit: "
+                    "~n   Rn:  ~p"
+                    "~n   Loc: ~p"
+                    "~n", [Rn, Loc]),
+            trap_exit(OldFlag),
+            unlink_and_flush_exit(Runner),
 	    put(test_server_loc, Loc),
 	    exit(Rn);
-	{done, Ret, _Zed} -> 
+	{tc_runner_done, Runner, Ret, _Zed} -> 
 	    ?DBG("call -> done:"
 		 "~n   Ret: ~p"
 		 "~n   Zed: ~p", [Ret, _Zed]),
+            trap_exit(OldFlag),
+            unlink_and_flush_exit(Runner),
 	    case Ret of
 		{error, Reason} ->
 		    exit(Reason);
+		{skip, Reason} ->
+		    skip(Reason);
 		OK ->
 		    OK
 	    end
     end.
 
-wait(From, Env, M, F, A) ->
-    ?DBG("wait -> entry with"
-	 "~n   From: ~p"
-	 "~n   Env:  ~p"
-	 "~n   M:    ~p"
-	 "~n   F:    ~p"
-	 "~n   A:    ~p", [From, Env, M, F, A]),
+trap_exit(Flag) when is_boolean(Flag) ->    
+    erlang:process_flag(trap_exit, Flag).
+
+unlink_and_flush_exit(Pid) ->
+    unlink(Pid),
+    receive
+        {'EXIT', Pid, _} ->
+            ok
+    after 0 ->
+            ok
+    end.
+
+tc_wait(From, Env, M, F, A) ->
+    ?PRINT2("tc_wait -> entry with"
+            "~n   From: ~p"
+            "~n   Env:  ~p"
+            "~n   M:    ~p"
+            "~n   F:    ~p"
+            "~n   A:    ~p", [From, Env, M, F, A]),
+    From ! {tc_runner_started, self()},
     lists:foreach(fun({K,V}) -> put(K,V) end, Env),
-    Rn = (catch apply(M, F, A)),
-    ?DBG("wait -> Rn: ~n~p", [Rn]),
-    From ! {done, Rn, get(test_server_loc)},
-    exit(Rn).
-
-run(Mod, Func, Args, Opts) ->
-    ?DBG("run -> entry with"
-	 "~n   Mod:  ~p"
-	 "~n   Func: ~p"
-	 "~n   Args: ~p"
-	 "~n   Opts: ~p", [Mod, Func, Args, Opts]),
-    M = get(mib_dir),
-    Dir = get(mgr_dir),
-    User = snmp_misc:get_option(user, Opts, "all-rights"),
-    SecLevel = snmp_misc:get_option(sec_level, Opts, noAuthNoPriv),
-    EngineID = snmp_misc:get_option(engine_id, Opts, "agentEngine"),
+    ?PRINT2("tc_wait -> env set - now run tc~n"),
+    Res = (catch apply(M, F, A)),
+    ?PRINT2("tc_wait -> tc run done: "
+            "~n   ~p"
+            "~n", [Res]),
+    From ! {tc_runner_done, self(), Res, get(test_server_loc)},
+    %% The point of this is that in some cases we have seen that the 
+    %% exit signal having been "passed on" to the CT, which consider any
+    %% exit a fail (even if its {'EXIT', ok}).
+    %% So, just to be on the safe side, convert an 'ok' to a 'normal'.
+    case Res of
+        ok ->
+            exit(normal);
+        {ok, _} ->
+            exit(normal);
+        _ ->
+            exit(Res)
+    end.
+
+tc_run(Mod, Func, Args, Opts) ->
+    ?PRINT2("tc_run -> entry with"
+            "~n   Mod:  ~p"
+            "~n   Func: ~p"
+            "~n   Args: ~p"
+            "~n   Opts: ~p"
+            "~n", [Mod, Func, Args, Opts]),
+    (catch snmp_test_mgr:stop()), % If we had a running mgr from a failed case
+    M           = get(mib_dir),
+    Dir         = get(mgr_dir),
+    User        = snmp_misc:get_option(user, Opts, "all-rights"),
+    SecLevel    = snmp_misc:get_option(sec_level, Opts, noAuthNoPriv),
+    EngineID    = snmp_misc:get_option(engine_id, Opts, "agentEngine"),
     CtxEngineID = snmp_misc:get_option(context_engine_id, Opts, EngineID),
-    Community = snmp_misc:get_option(community, Opts, "all-rights"),
-    ?DBG("run -> start crypto app",[]),
-    _CryptoRes = ?CRYPTO_START(),
-    ?DBG("run -> Crypto: ~p", [_CryptoRes]),
-    catch snmp_test_mgr:stop(), % If we had a running mgr from a failed case
-    StdM = join(code:priv_dir(snmp), "mibs") ++ "/",
-    Vsn = get(vsn), 
-    ?DBG("run -> config:"
-	   "~n   M:           ~p"
-	   "~n   Vsn:         ~p"
-	   "~n   Dir:         ~p"
-	   "~n   User:        ~p"
-	   "~n   SecLevel:    ~p"
-	   "~n   EngineID:    ~p"
-	   "~n   CtxEngineID: ~p"
-	   "~n   Community:   ~p"
-	   "~n   StdM:        ~p",
-	   [M,Vsn,Dir,User,SecLevel,EngineID,CtxEngineID,Community,StdM]),
+    Community   = snmp_misc:get_option(community, Opts, "all-rights"),
+    ?DBG("tc_run -> start crypto app",[]),
+    _CryptoRes  = ?CRYPTO_START(),
+    ?DBG("tc_run -> Crypto: ~p", [_CryptoRes]),
+    StdM        = join(code:priv_dir(snmp), "mibs") ++ "/",
+    Vsn         = get(vsn), 
+    ?PRINT2("tc_run -> config:"
+            "~n   M:           ~p"
+            "~n   Vsn:         ~p"
+            "~n   Dir:         ~p"
+            "~n   User:        ~p"
+            "~n   SecLevel:    ~p"
+            "~n   EngineID:    ~p"
+            "~n   CtxEngineID: ~p"
+            "~n   Community:   ~p"
+            "~n   StdM:        ~p"
+            "~n", [M,Vsn,Dir,User,SecLevel,EngineID,CtxEngineID,Community,StdM]),
     case snmp_test_mgr:start([%% {agent, snmp_test_lib:hostname()},
-			      {packet_server_debug,true},
-			      {debug,true},
-			      {agent, get(master_host)}, 
-			      {ipfamily, get(ipfamily)},
-			      {agent_udp, 4000},
-			      {trap_udp, 5000},
-			      {recbuf,65535},
+			      {packet_server_debug, true},
+			      {debug,               true},
+			      {agent,               get(master_host)}, 
+			      {ipfamily,            get(ipfamily)},
+			      {agent_udp,           4000},
+			      {trap_udp,            5000},
+			      {recbuf,              65535},
 			      quiet,
 			      Vsn, 
-			      {community, Community},
-			      {user, User},
-			      {sec_level, SecLevel},
-			      {engine_id, EngineID},
-			      {context_engine_id, CtxEngineID},
-			      {dir, Dir},
-			      {mibs, mibs(StdM, M)}]) of
+			      {community,           Community},
+			      {user,                User},
+			      {sec_level,           SecLevel},
+			      {engine_id,           EngineID},
+			      {context_engine_id,   CtxEngineID},
+			      {dir,                 Dir},
+			      {mibs,                mibs(StdM, M)}]) of
 	{ok, _Pid} ->
 	    case (catch apply(Mod, Func, Args)) of
+		{'EXIT', {skip, Reason}} ->
+                    ?EPRINT2("apply skip detected: "
+                             "~n   ~p", [Reason]),
+		    (catch snmp_test_mgr:stop()),
+		    ?SKIP(Reason);
 		{'EXIT', Reason} ->
-		    catch snmp_test_mgr:stop(),
-		    ?FAIL({apply_failed, {Mod, Func, Args}, Reason});
+                    %% We have hosts (mostly *very* slooow VMs) that
+                    %% can timeout anything. Since we are basically
+                    %% testing communication, we therefor must check
+                    %% for system events at every failure. Grrr!
+                    SysEvs = snmp_test_global_sys_monitor:events(),
+		    (catch snmp_test_mgr:stop()),
+                    if
+                        (SysEvs =:= []) ->
+                            ?EPRINT2("TC runner failed: "
+                                     "~n   ~p~n", [Reason]),
+                            ?FAIL({apply_failed, {Mod, Func, Args}, Reason});
+                        true ->
+                            ?EPRINT2("apply exit catched when we got system events: "
+                                     "~n   Reason:     ~p"
+                                     "~n   Sys Events: ~p"
+                                     "~n", [Reason, SysEvs]),
+                            ?SKIP([{reason, Reason}, {system_events, SysEvs}])
+                    end;
 		Res ->
-		    catch snmp_test_mgr:stop(),
+		    (catch snmp_test_mgr:stop()),
 		    Res
 	    end;
+
+	{error, Reason} ->
+	    ?EPRINT2("Failed starting (test) manager: "
+                     "~n   ~p", [Reason]),
+	    (catch snmp_test_mgr:stop()),
+	    ?line ?FAIL({mgr_start_error, Reason});
+
 	Err ->
-	    io:format("Error starting manager: ~p\n", [Err]),
-	    catch snmp_test_mgr:stop(),
-	    ?line ?FAIL({mgr_start, Err})
+	    ?EPRINT2("Failed starting (test) manager: "
+                     "~n   ~p", [Err]),
+	    (catch snmp_test_mgr:stop()),
+	    ?line ?FAIL({mgr_start_failure, Err})
     end.
 
 
@@ -445,6 +584,7 @@ start_agent(Config, Vsns, Opts) ->
 	    [{versions,         Vsns}, 
 	     {agent_type,       master},
 	     {agent_verbosity,  trace},
+             {get_mechanism,    snmp_agent_test_get},
 	     {db_dir,           AgentDbDir},
 	     {audit_trail_log,  [{type, read_write},
 				 {dir,  AgentLogDir},
@@ -463,20 +603,24 @@ start_agent(Config, Vsns, Opts) ->
 
     process_flag(trap_exit,true),
 
+    ?PRINT2("start_agent -> try start snmp app supervisor", []),
     {ok, AppSup} = snmp_app_sup:start_link(),
     unlink(AppSup),
     ?DBG("start_agent -> snmp app supervisor: ~p", [AppSup]),
 
-    ?DBG("start_agent -> start master agent",[]),
+    ?PRINT2("start_agent -> try start master agent",[]),
     ?line Sup = start_sup(Env), 
-
-    ?DBG("start_agent -> unlink from supervisor", []),
     ?line unlink(Sup),
+    ?DBG("start_agent -> snmp supervisor: ~p", [Sup]),
+
+    ?PRINT2("start_agent -> try (rpc) start sub agent on ~p", [SaNode]),
     ?line SaDir = ?config(sa_dir, Config),
-    ?DBG("start_agent -> (rpc) start sub on ~p", [SaNode]),
     ?line {ok, Sub} = start_sub_sup(SaNode, SaDir),
-    ?DBG("start_agent -> done",[]),
-    ?line [{snmp_sup, {Sup, self()}}, {snmp_sub, Sub} | Config].
+    ?DBG("start_agent -> done", []),
+
+    ?line [{snmp_app_sup, AppSup}, 
+           {snmp_sup,     {Sup, self()}}, 
+           {snmp_sub,     Sub} | Config].
 
 
 app_agent_env_init(Env0, Opts) ->
@@ -669,35 +813,52 @@ merge_agent_options([{Key, _Value} = Opt|Opts], Options) ->
 
 
 stop_agent(Config) when is_list(Config) ->
-    ?LOG("stop_agent -> entry with"
-	 "~n   Config: ~p",[Config]),
-
-    {Sup, Par} = ?config(snmp_sup, Config),
-    ?DBG("stop_agent -> attempt to stop (sup) ~p"
-	"~n   Sup: ~p"
-	"~n   Par: ~p",
-	[Sup, 
-	(catch process_info(Sup)),
-	(catch process_info(Par))]),
-    
-    _Info = agent_info(Sup),
-    ?DBG("stop_agent -> Agent info: "
-	 "~n   ~p", [_Info]),
-    
-    stop_sup(Sup, Par),
-
-    {Sup2, Par2} = ?config(snmp_sub, Config),
-    ?DBG("stop_agent -> attempt to stop (sub) ~p"
-	"~n   Sup2: ~p"
-	"~n   Par2: ~p",
-	[Sup2,
-	(catch process_info(Sup2)),
-	(catch process_info(Par2))]),
-    stop_sup(Sup2, Par2),
-
-    ?DBG("stop_agent -> done - now cleanup config", []),
-    C1 = lists:keydelete(snmp_sup, 1, Config),
-    lists:keydelete(snmp_sub, 1, C1).
+    ?PRINT2("stop_agent -> entry with"
+            "~n   Config: ~p",[Config]),
+
+
+    %% Stop the sub-agent (the agent supervisor)
+    {SubSup, SubPar} = ?config(snmp_sub, Config),
+    ?PRINT2("stop_agent -> attempt to stop sub agent (~p)"
+            "~n   Sub Sup info: "
+            "~n      ~p"
+            "~n   Sub Par info: "
+            "~n      ~p",
+            [SubSup,
+             (catch process_info(SubSup)),
+             (catch process_info(SubPar))]),
+    stop_sup(SubSup, SubPar),
+    Config2 = lists:keydelete(snmp_sub, 1, Config),
+
+
+    %% Stop the master-agent (the top agent supervisor)
+    {MasterSup, MasterPar} = ?config(snmp_sup, Config),
+    ?PRINT2("stop_agent -> attempt to stop master agent (~p)"
+            "~n   Master Sup: "
+            "~n      ~p"
+            "~n   Master Par: "
+            "~n      ~p"
+            "~n   Agent Info: "
+            "~n      ~p",
+            [MasterSup, 
+             (catch process_info(MasterSup)),
+             (catch process_info(MasterPar)),
+             agent_info(MasterSup)]),
+    stop_sup(MasterSup, MasterPar),
+    Config3 = lists:keydelete(snmp_sup, 1, Config2),
+
+
+    %% Stop the top supervisor (of the snmp app)
+    AppSup = ?config(snmp_app_sup, Config),
+    ?PRINT2("stop_agent -> attempt to app sup ~p"
+            "~n   App Sup: ~p",
+            [AppSup, 
+             (catch process_info(AppSup))]),
+    Config4 = lists:keydelete(snmp_app_sup, 1, Config3),
+
+
+    ?PRINT2("stop_agent -> done", []),
+    Config4.
 
 
 start_sup(Env) ->
@@ -727,7 +888,6 @@ stop_sup(Pid, _) ->
     ?LOG("stop_sup -> attempt to stop ~p", [Pid]),
     Ref = erlang:monitor(process, Pid),
     ?LOG("stop_sup -> Ref: ~p", [Ref]),
-    %% Pid ! {'EXIT', Parent, shutdown}, % usch
     exit(Pid, kill), 
     await_stopped(Pid, Ref).
 
@@ -863,23 +1023,37 @@ expect(Mod, Line, Type, Enterp, Generic, Specific, ExpVBs) ->
     expect2(Mod, Line, Fun).
 
 expect2(Mod, Line, F) ->
-    io:format("EXPECT for ~w:~w~n", [Mod, Line]),
+    io_format_expect("for ~w:~w", [Mod, Line]),
     case F() of
 	{error, Reason} ->
-	    io:format("EXPECT failed at ~w:~w => ~n~p~n", [Mod, Line, Reason]),
+	    io_format_expect("failed at ~w:~w => "
+                             "~n      ~p", [Mod, Line, Reason]),
 	    throw({error, {expect, Mod, Line, Reason}});
 	Else ->
-	    io:format("EXPECT result for ~w:~w => ~n~p~n", [Mod, Line, Else]),
+	    io_format_expect("result for ~w:~w => "
+                             "~n      ~p", [Mod, Line, Else]),
 	    Else
     end.
 
 	
 %% ----------------------------------------------------------------------
 
-get_timeout() ->
-    get_timeout(os:type()).
+-define(BASE_REQ_TIMEOUT, 3500).
 
-get_timeout(_)       -> 3500.
+get_timeout() ->
+    %% Try to figure out how "fast" a machine is.
+    %% We assume that the number of schedulers
+    %% (which depends on the number of core:s)
+    %% effect the performance of the host...
+    %% This is obviously not enough. The network
+    %% also matterns, clock freq or the CPU, ...
+    %% But its better than what we had before...
+    case erlang:system_info(schedulers) of
+        N when is_integer(N) ->
+            ?BASE_REQ_TIMEOUT + timer:seconds(10 div N);
+        _ ->
+            ?BASE_REQ_TIMEOUT
+    end.
 
 receive_pdu(To) ->
     receive
@@ -898,20 +1072,27 @@ receive_trap(To) ->
     end.
 
 
+io_format_expect(F) ->
+    io_format_expect(F, []).
+
+io_format_expect(F, A) ->
+    ?PRINT2("EXPECT " ++ F, A).
+    
+
 do_expect(Expect) when is_atom(Expect) ->
     do_expect({Expect, get_timeout()});
 
 do_expect({any_pdu, To}) 
   when is_integer(To) orelse (To =:= infinity) ->
-    io:format("EXPECT any PDU~n", []),
+    io_format_expect("any PDU"),
     receive_pdu(To);
 
 do_expect({any_trap, To}) ->
-    io:format("EXPECT any TRAP within ~w~n", [To]),
+    io_format_expect("any TRAP within ~w", [To]),
     receive_trap(To);
 
 do_expect({timeout, To}) ->
-    io:format("EXPECT nothing within ~w~n", [To]),
+    io_format_expect("nothing within ~w", [To]),
     receive
 	X ->
 	    {error, {unexpected, X}}
@@ -923,16 +1104,16 @@ do_expect({timeout, To}) ->
 do_expect({Err, To}) 
   when (is_atom(Err) andalso 
 	((is_integer(To) andalso To > 0) orelse (To =:= infinity))) ->
-    io:format("EXPECT error ~w within ~w~n", [Err, To]),
+    io_format_expect("error ~w within ~w", [Err, To]),
     do_expect({{error, Err}, To});
 
 do_expect({error, Err}) when is_atom(Err) ->
     Check = fun(_, R) -> R end,
-    io:format("EXPECT error ~w~n", [Err]),
+    io_format_expect("error ~w", [Err]),
     do_expect2(Check, any, Err, any, any, get_timeout());
 do_expect({{error, Err}, To}) ->
     Check = fun(_, R) -> R end,
-    io:format("EXPECT error ~w within ~w~n", [Err, To]),
+    io_format_expect("error ~w within ~w", [Err, To]),
     do_expect2(Check, any, Err, any, any, To);
 
 %% exp_varbinds() -> [exp_varbind()]
@@ -942,25 +1123,23 @@ do_expect({{error, Err}, To}) ->
 %% ExpVBs         -> exp_varbinds() | {VbsCondition, exp_varbinds()}
 do_expect(ExpVBs) ->
     Check = fun(_, R) -> R end,
-    io:format("EXPECT 'get-response'"
-	      "~n   with"
-	      "~n      Varbinds: ~p~n", [ExpVBs]),
+    io_format_expect("'get-response'"
+                     "~n   with"
+                     "~n      Varbinds: ~p", [ExpVBs]),
     do_expect2(Check, 'get-response', noError, 0, ExpVBs, get_timeout()).
 
 
 do_expect(v2trap, ExpVBs) ->
     Check = fun(_, R) -> R end,
-    io:format("EXPECT 'snmpv2-trap'"
-	      "~n   with"
-	      "~n      Varbinds: ~p~n", [ExpVBs]),
+    io_format_expect("'snmpv2-trap' with"
+                     "~n      Varbinds: ~p", [ExpVBs]),
     do_expect2(Check, 'snmpv2-trap', noError, 0, ExpVBs, get_timeout());
 
 
 do_expect(report, ExpVBs) ->
     Check = fun(_, R) -> R end,
-    io:format("EXPECT 'report'"
-	      "~n   with"
-	      "~n      Varbinds: ~p~n", [ExpVBs]),
+    io_format_expect("'report' with"
+                     "~n      Varbinds: ~p", [ExpVBs]),
     do_expect2(Check, 'report', noError, 0, ExpVBs, get_timeout());
 
 
@@ -969,9 +1148,8 @@ do_expect(inform, ExpVBs) ->
 
 do_expect({inform, false}, ExpVBs) ->
     Check = fun(_, R) -> R end,
-    io:format("EXPECT 'inform-request' (false)"
-	      "~n   with"
-	      "~n      Varbinds: ~p~n", [ExpVBs]),
+    io_format_expect("'inform-request' (false) with"
+                     "~n      Varbinds: ~p", [ExpVBs]),
     do_expect2(Check, 'inform-request', noError, 0, ExpVBs, get_timeout());
 
 do_expect({inform, true}, ExpVBs) ->
@@ -985,9 +1163,8 @@ do_expect({inform, true}, ExpVBs) ->
 	   (_, Err) ->
 		Err
 	end,
-    io:format("EXPECT 'inform-request' (true)"
-	      "~n   with"
-	      "~n      Varbinds: ~p~n", [ExpVBs]),
+    io_format_expect("'inform-request' (true) with"
+                     "~n      Varbinds: ~p", [ExpVBs]),
     do_expect2(Check, 'inform-request', noError, 0, ExpVBs, get_timeout());
 
 do_expect({inform, {error, EStat, EIdx}}, ExpVBs) 
@@ -1002,11 +1179,10 @@ do_expect({inform, {error, EStat, EIdx}}, ExpVBs)
 	   (_, Err) ->
 		Err
 	end,
-    io:format("EXPECT 'inform-request' (error)"
-	      "~n   with"
-	      "~n      Error Status: ~p"
-	      "~n      Error Index:  ~p"
-	      "~n      Varbinds:     ~p~n", [EStat, EIdx, ExpVBs]),
+    io_format_expect("'inform-request' (error) with"
+                     "~n      Error Status: ~p"
+                     "~n      Error Index:  ~p"
+                     "~n      Varbinds:     ~p", [EStat, EIdx, ExpVBs]),
     do_expect2(Check, 'inform-request', noError, 0, ExpVBs, get_timeout()).
 
 
@@ -1017,26 +1193,23 @@ do_expect(Err, Idx, ExpVBs, To)
   when is_atom(Err) andalso 
        (is_integer(Idx) orelse is_list(Idx) orelse (Idx == any)) ->
     Check = fun(_, R) -> R end,
-    io:format("EXPECT 'get-response'"
-	      "~n   with"
-	      "~n      Error:    ~p"
-	      "~n      Index:    ~p"
-	      "~n      Varbinds: ~p"
-	      "~n   within ~w~n", [Err, Idx, ExpVBs, To]),
+    io_format_expect("'get-response' withing ~w ms with"
+                     "~n      Error:    ~p"
+                     "~n      Index:    ~p"
+                     "~n      Varbinds: ~p", [To, Err, Idx, ExpVBs]),
     do_expect2(Check, 'get-response', Err, Idx, ExpVBs, To).
 
 
 do_expect(Type, Enterp, Generic, Specific, ExpVBs) ->
-    do_expect(Type, Enterp, Generic, Specific, ExpVBs, 3500).
+    do_expect(Type, Enterp, Generic, Specific, ExpVBs, get_timeout()).
 
 do_expect(trap, Enterp, Generic, Specific, ExpVBs, To) ->
-    io:format("EXPECT trap"
-	      "~n   with"
-	      "~n      Enterp:   ~w"
-	      "~n      Generic:  ~w"
-	      "~n      Specific: ~w"
-	      "~n      Varbinds: ~w"
-	      "~n   within ~w~n", [Enterp, Generic, Specific, ExpVBs, To]),
+    io_format_expect("trap within ~w ms with"
+                     "~n      Enterp:   ~w"
+                     "~n      Generic:  ~w"
+                     "~n      Specific: ~w"
+                     "~n      Varbinds: ~w",
+                     [To, Enterp, Generic, Specific, ExpVBs]),
     PureE = purify_oid(Enterp),
     case receive_trap(To) of
 	#trappdu{enterprise    = PureE, 
@@ -1053,6 +1226,18 @@ do_expect(trap, Enterp, Generic, Specific, ExpVBs, To) ->
 		     {PureE, Generic, Specific, ExpVBs}, 
 		     {Ent2, G2, Spec2, VBs}}};
 
+	{error, timeout} = Error ->
+            SysEvs = snmp_test_global_sys_monitor:events(),
+	    io_format_expect("[expecting trap] got timeout when system events:"
+                             "~n   ~p", [SysEvs]),
+            if
+                (SysEvs =:= []) ->
+                    Error;
+                true ->
+                    skip({system_events, SysEvs})
+            end;
+
+
 	Error ->
 	    Error
     end.
@@ -1071,46 +1256,46 @@ do_expect2(Check, Type, Err, Idx, ExpVBs, To)
 	#pdu{type         = Type, 
 	     error_status = Err,
 	     error_index  = Idx} when ExpVBs =:= any -> 
-	    io:format("EXPECT received expected pdu (1)~n", []),
+	    io_format_expect("received expected pdu (1)"),
 	    ok;
 
 	#pdu{type         = Type, 
 	     request_id   = ReqId, 
 	     error_status = Err2,
 	     error_index  = Idx} when ExpVBs =:= any -> 
-	    io:format("EXPECT received expected pdu with "
-		      "unexpected error status (2): "
-		      "~n   Error Status: ~p~n", [Err2]),
+	    io_format_expect("received expected pdu with "
+                             "unexpected error status (2): "
+                             "~n   Error Status: ~p", [Err2]),
 	    {error, {unexpected_error_status, Err, Err2, ReqId}};
 
 	#pdu{error_status = Err} when (Type   =:= any) andalso 
 				      (Idx    =:= any) andalso 
 				      (ExpVBs =:= any) -> 
-	    io:format("EXPECT received expected pdu (3)~n", []),
+	    io_format_expect("received expected pdu (3)"),
 	    ok;
 
 	#pdu{request_id   = ReqId, 
 	     error_status = Err2} when (Type   =:= any) andalso 
 				       (Idx    =:= any) andalso 
 				       (ExpVBs =:= any) -> 
-	    io:format("EXPECT received expected pdu with "
-		      "unexpected error status (4): "
-		      "~n   Error Status: ~p~n", [Err2]),
+	    io_format_expect("received expected pdu with "
+                             "unexpected error status (4): "
+                             "~n   Error Status: ~p", [Err2]),
 	    {error, {unexpected_error_status, Err, Err2, ReqId}};
 
 	#pdu{type         = Type, 
 	     error_status = Err} when (Idx =:= any) andalso 
 				      (ExpVBs =:= any) -> 
-	    io:format("EXPECT received expected pdu (5)~n", []),
+	    io_format_expect("received expected pdu (5)", []),
 	    ok;
 
 	#pdu{type         = Type, 
 	     request_id   = ReqId, 
 	     error_status = Err2} when (Idx =:= any) andalso 
 				       (ExpVBs =:= any) -> 
-	    io:format("EXPECT received expected pdu with "
-		      "unexpected error status (6): "
-		      "~n   Error Status: ~p~n", [Err2]),
+	    io_format_expect("received expected pdu with "
+                             "unexpected error status (6): "
+                             "~n   Error Status: ~p", [Err2]),
 	    {error, {unexpected_error_status, Err, Err2, ReqId}};
 
 	#pdu{type         = Type, 
@@ -1119,13 +1304,13 @@ do_expect2(Check, Type, Err, Idx, ExpVBs, To)
 	     error_index  = EI} when is_list(Idx) andalso (ExpVBs =:= any) -> 
 	    case lists:member(EI, Idx) of
 		true ->
-		    io:format("EXPECT received expected pdu with "
-			      "expected error index (7)~n", []),
+		    io_format_expect("received expected pdu with "
+                                     "expected error index (7)"),
 		    ok;
 		false ->
-		    io:format("EXPECT received expected pdu with "
-			      "unexpected error index (8): "
-			      "~n   Error Index: ~p~n", [EI]),
+		    io_format_expect("received expected pdu with "
+                                     "unexpected error index (8): "
+                                     "~n   Error Index: ~p", [EI]),
 		    {error, {unexpected_error_index, EI, Idx, ReqId}}
 	    end;
 
@@ -1135,15 +1320,15 @@ do_expect2(Check, Type, Err, Idx, ExpVBs, To)
 	     error_index  = EI} when is_list(Idx) andalso (ExpVBs =:= any) -> 
 	    case lists:member(EI, Idx) of
 		true ->
-		    io:format("EXPECT received expected pdu with "
-			      "unexpected error status (9): "
-			      "~n   Error Status: ~p~n", [Err2]),
+		    io_format_expect("received expected pdu with "
+                                     "unexpected error status (9): "
+                                     "~n   Error Status: ~p", [Err2]),
 		    {error, {unexpected_error_status, Err, Err2, ReqId}};
 		false ->
-		    io:format("EXPECT received expected pdu with "
-			      "unexpected error (10): "
-			      "~n   Error Status: ~p"
-			      "~n   Error index:  ~p~n", [Err2, EI]),
+		    io_format_expect("received expected pdu with "
+                                     "unexpected error (10): "
+                                     "~n   Error Status: ~p"
+                                     "~n   Error index:  ~p", [Err2, EI]),
 		    {error, {unexpected_error, {Err, Idx}, {Err2, EI}, ReqId}}
 	    end;
 
@@ -1151,12 +1336,12 @@ do_expect2(Check, Type, Err, Idx, ExpVBs, To)
 	     request_id   = ReqId, 
 	     error_status = Err2, 
 	     error_index  = Idx2} when ExpVBs =:= any ->
-	    io:format("EXPECT received unexpected pdu with (11) "
-		      "~n   Type:         ~p"
-		      "~n   ReqId:        ~p"
-		      "~n   Errot status: ~p"
-		      "~n   Error index:  ~p"
-		      "~n", [Type2, ReqId, Err2, Idx2]),
+	    io_format_expect("received unexpected pdu with (11) "
+                             "~n   Type:         ~p"
+                             "~n   ReqId:        ~p"
+                             "~n   Error status: ~p"
+                             "~n   Error index:  ~p",
+                             [Type2, ReqId, Err2, Idx2]),
 	    {error, 
 	     {unexpected_pdu, 
 	      {Type, Err, Idx}, {Type2, Err2, Idx2}, ReqId}};
@@ -1165,26 +1350,26 @@ do_expect2(Check, Type, Err, Idx, ExpVBs, To)
 	     error_status = Err, 
 	     error_index  = Idx,
 	     varbinds     = VBs} = PDU ->
-	    io:format("EXPECT received pdu (12): "
-		      "~n   [exp] Type:         ~p"
-		      "~n   [exp] Error Status: ~p"
-		      "~n   [exp] Error Index:  ~p"
-		      "~n   VBs:                ~p"
-		      "~nwhen"
-		      "~n   ExpVBs:             ~p"
-		      "~n", [Type, Err, Idx, VBs, ExpVBs]),
+	    io_format_expect("received pdu (12): "
+                             "~n   [exp] Type:         ~p"
+                             "~n   [exp] Error Status: ~p"
+                             "~n   [exp] Error Index:  ~p"
+                             "~n   VBs:                ~p"
+                             "~nwhen"
+                             "~n   ExpVBs:             ~p",
+                             [Type, Err, Idx, VBs, ExpVBs]),
 	    Check(PDU, check_vbs(purify_oids(ExpVBs), VBs));
 
 	#pdu{type         = Type, 
 	     error_status = Err, 
 	     varbinds     = VBs} = PDU when Idx =:= any ->
-	    io:format("EXPECT received pdu (13): "
-		      "~n   [exp] Type:         ~p"
-		      "~n   [exp] Error Status: ~p"
-		      "~n   VBs:                ~p"
-		      "~nwhen"
-		      "~n   ExpVBs:             ~p"
-		      "~n", [Type, Err, VBs, ExpVBs]),
+	    io_format_expect("received pdu (13): "
+                             "~n   [exp] Type:         ~p"
+                             "~n   [exp] Error Status: ~p"
+                             "~n   VBs:                ~p"
+                             "~nwhen"
+                             "~n   ExpVBs:             ~p",
+                             [Type, Err, VBs, ExpVBs]),
 	    Check(PDU, check_vbs(purify_oids(ExpVBs), VBs));
 
 	#pdu{type         = Type, 
@@ -1192,15 +1377,15 @@ do_expect2(Check, Type, Err, Idx, ExpVBs, To)
 	     error_status = Err, 
 	     error_index  = EI,
 	     varbinds     = VBs} = PDU when is_list(Idx) ->
-	    io:format("EXPECT received pdu (14): "
-		      "~n   [exp] Type:         ~p"
-		      "~n   ReqId:              ~p"
-		      "~n   [exp] Error Status: ~p"
-		      "~n   [exp] Error Index:  ~p"
-		      "~n   VBs:                ~p"
-		      "~nwhen"
-		      "~n   ExpVBs:             ~p"
-		      "~n", [Type, ReqId, Err, EI, VBs, ExpVBs]),
+	    io_format_expect("received pdu (14): "
+                             "~n   [exp] Type:         ~p"
+                             "~n   ReqId:              ~p"
+                             "~n   [exp] Error Status: ~p"
+                             "~n   [exp] Error Index:  ~p"
+                             "~n   VBs:                ~p"
+                             "~nwhen"
+                             "~n   ExpVBs:             ~p",
+                             [Type, ReqId, Err, EI, VBs, ExpVBs]),
 	    PureVBs = purify_oids(ExpVBs), 
 	    case lists:member(EI, Idx) of
 		true ->
@@ -1214,24 +1399,36 @@ do_expect2(Check, Type, Err, Idx, ExpVBs, To)
 	     error_status = Err2, 
 	     error_index  = Idx2,
 	     varbinds     = VBs2} ->
-	    io:format("EXPECT received unexpected pdu with (15) "
-		      "~n   Type:         ~p"
-		      "~n   ReqId:        ~p"
-		      "~n   Errot status: ~p"
-		      "~n   Error index:  ~p"
-		      "~n   Varbinds:     ~p"
-		      "~n", [Type2, ReqId, Err2, Idx2, VBs2]),
+	    io_format_expect("received unexpected pdu with (15) "
+                             "~n   Type:         ~p"
+                             "~n   ReqId:        ~p"
+                             "~n   Error status: ~p"
+                             "~n   Error index:  ~p"
+                             "~n   Varbinds:     ~p",
+                             [Type2, ReqId, Err2, Idx2, VBs2]),
 	    {error, 
 	     {unexpected_pdu, 
 	      {Type,  Err,  Idx, purify_oids(ExpVBs)}, 
 	      {Type2, Err2, Idx2, VBs2}, 
 	      ReqId}};
 	
-	Error ->
-	    io:format("EXPECT received error (16):  "
-		      "~n   Error: ~p"
-		      "~n", [Error]),
-	    Error
+
+	{error, timeout} = Error ->
+            SysEvs = snmp_test_global_sys_monitor:events(),
+	    io_format_expect("got timeout (16) when system events:"
+                             "~n   ~p", [SysEvs]),
+            if
+                (SysEvs =:= []) ->
+                    Error;
+                true ->
+                    skip({system_events, SysEvs})
+            end;
+
+
+        Error ->
+            io_format_expect("received error (17):  "
+                             "~n   Error: ~p", [Error]),
+            Error
     end.
 
 
@@ -1349,12 +1546,15 @@ start_node(Name) ->
 		      ""
 	      end,
     %% Do not use start_link!!! (the proc that calls this one is tmp)
-    ?DBG("start_node -> Args: ~p~n",[Args]),
-    A = Args ++ " -pa " ++ Pa,
+    ?DBG("start_node -> Args: ~p~n", [Args]),
+    A = Args ++ " -pa " ++ Pa ++ 
+        " -s " ++ atom_to_list(snmp_test_sys_monitor) ++ " start" ++ 
+        " -s global sync",
     case (catch ?START_NODE(Name, A)) of
 	{ok, Node} ->
 	    %% Tell the test_server to not clean up things it never started.
 	    ?DBG("start_node -> Node: ~p",[Node]),
+            global:sync(),
 	    {ok, Node};
 	Else  -> 
 	    ?ERR("start_node -> failed with(other): Else: ~p",[Else]),
@@ -1672,6 +1872,10 @@ rpc(Node, F, A) ->
 join(Dir, File) ->
     filename:join(Dir, File).
 
+
+skip(R) ->
+    exit({skip, R}).
+
 %% await_pdu(To) ->
 %%     await_response(To, pdu).
 %% 
diff --git a/lib/snmp/test/snmp_compiler_test.erl b/lib/snmp/test/snmp_compiler_test.erl
index 0a7b729d1f..a28f925a22 100644
--- a/lib/snmp/test/snmp_compiler_test.erl
+++ b/lib/snmp/test/snmp_compiler_test.erl
@@ -226,22 +226,20 @@ agent_capabilities(Config) when is_list(Config) ->
     put(tname,agent_capabilities),
     p("starting with Config: ~p~n", [Config]),
 
-    SnmpPrivDir    = code:priv_dir(snmp),
+    SnmpPrivDir    = which_priv_dir(snmp),
     SnmpMibsDir    = join(SnmpPrivDir, "mibs"), 
-    OtpMibsPrivDir = code:priv_dir(otp_mibs),
-    OtpMibsMibsDir = join(OtpMibsPrivDir, "mibs"), 
     Dir   = ?config(mib_dir, Config),
     AcMib = join(Dir,"AC-TEST-MIB.mib"),
     ?line {ok, MibFile1} = snmpc:compile(AcMib, [options,
 						 version,
-						 {i,         [SnmpMibsDir, OtpMibsMibsDir]}, 
+						 {i,         [SnmpMibsDir]}, 
 						 {outdir,    Dir}, 
 						 {verbosity, trace}]),
     ?line {ok, Mib1} = snmp_misc:read_mib(MibFile1), 
     ?line {ok, MibFile2} = snmpc:compile(AcMib, [options,
 						 version,
 						 agent_capabilities,
-						 {i,         [SnmpMibsDir, OtpMibsMibsDir]}, 
+						 {i,         [SnmpMibsDir]}, 
 						 {outdir,    Dir}, 
 						 {verbosity, trace}]),
     ?line {ok, Mib2} = snmp_misc:read_mib(MibFile2), 
@@ -269,28 +267,26 @@ module_compliance(Config) when is_list(Config) ->
     put(tname,module_compliance),
     p("starting with Config: ~p~n", [Config]),
 
-    SnmpPrivDir    = code:priv_dir(snmp),
-    SnmpMibsDir    = join(SnmpPrivDir, "mibs"), 
-    OtpMibsPrivDir = code:priv_dir(otp_mibs),
-    OtpMibsMibsDir = join(OtpMibsPrivDir, "mibs"), 
-    Dir   = ?config(mib_dir, Config),
-    AcMib = join(Dir,"MC-TEST-MIB.mib"),
+    SnmpPrivDir = which_priv_dir(snmp),
+    SnmpMibsDir = join(SnmpPrivDir, "mibs"), 
+    Dir         = ?config(mib_dir, Config),
+    AcMib       = join(Dir,"MC-TEST-MIB.mib"),
     ?line {ok, MibFile1} = snmpc:compile(AcMib, [options,
 						 version,
-						 {i,           [SnmpMibsDir, OtpMibsMibsDir]}, 
+						 {i,           [SnmpMibsDir]}, 
 						 {outdir,      Dir}, 
 						 {verbosity,   trace}]),
     ?line {ok, Mib1} = snmp_misc:read_mib(MibFile1), 
     ?line {ok, MibFile2} = snmpc:compile(AcMib, [options,
 						 version,
 						 module_compliance,
-						 {i,           [SnmpMibsDir, OtpMibsMibsDir]}, 
+						 {i,           [SnmpMibsDir]}, 
 						 {outdir,      Dir}, 
 						 {verbosity,   trace}]),
     ?line {ok, Mib2} = snmp_misc:read_mib(MibFile2), 
     MEDiff = Mib2#mib.mes -- Mib1#mib.mes,
     %% This is a rather pathetic test, but it is somthing...
-    io:format("agent_capabilities -> "
+    io:format("module_compliance -> "
 	      "~n   MEDiff: ~p"
 	      "~n   Mib1:   ~p"
 	      "~n   Mib2:   ~p"
@@ -731,6 +727,15 @@ check_desc(Desc1, Desc2) ->
     exit({'description not equal', Desc1, Desc2}).
 
 
+which_priv_dir(App) ->
+    case code:priv_dir(App) of
+        Dir when is_list(Dir) ->
+            Dir;
+        {error, Reason} ->
+            exit({App, priv_dir_not_found, Reason})
+    end.
+    
+
 %% join(Comp) ->
 %%     filename:join(Comp).
 
diff --git a/lib/snmp/test/snmp_manager_config_test.erl b/lib/snmp/test/snmp_manager_config_test.erl
index 64d3134055..ccbdd77629 100644
--- a/lib/snmp/test/snmp_manager_config_test.erl
+++ b/lib/snmp/test/snmp_manager_config_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. 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,6 +35,7 @@
 -include_lib("common_test/include/ct.hrl").
 -include("snmp_test_lib.hrl").
 -include_lib("snmp/src/manager/snmpm_usm.hrl").
+-include_lib("snmp/src/app/snmp_internal.hrl").
 
 
 %%----------------------------------------------------------------------
@@ -2259,11 +2260,13 @@ create_and_increment(Conf) when is_list(Conf) ->
     ?line {ok, _Pid} = snmpm_config:start_link(Opts),
 
     %% Random init
-    random:seed(erlang:phash2([node()]),
-                erlang:monotonic_time(),
-                erlang:unique_integer()),
+    ?SNMP_RAND_SEED(),
+    %% rand:seed(exrop,
+    %%           {erlang:phash2([node()]),
+    %%            erlang:monotonic_time(),
+    %%            erlang:unique_integer()}),
 
-    StartVal = random:uniform(2147483647),
+    StartVal = rand:uniform(2147483647),
     IncVal   = 42, 
     EndVal   = StartVal + IncVal,
 
diff --git a/lib/snmp/test/snmp_manager_test.erl b/lib/snmp/test/snmp_manager_test.erl
index 6ced55f0cc..c31bb92e1f 100644
--- a/lib/snmp/test/snmp_manager_test.erl
+++ b/lib/snmp/test/snmp_manager_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2019. 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.
@@ -62,7 +62,7 @@
 
 	 register_user1/1,
 	
-	 register_agent1/1,
+	 register_agent_old/1,
 	 register_agent2/1,
 	 register_agent3/1,
 
@@ -185,7 +185,6 @@ end_per_suite(Config) when is_list(Config) ->
 
 
 init_per_testcase(Case, Config) when is_list(Config) ->
-    io:format(user, "~n~n*** INIT ~w:~w ***~n~n", [?MODULE, Case]),
     p(Case, "init_per_testcase begin when"
       "~n      Nodes: ~p~n~n", [erlang:nodes()]),
     %% This version of the API, based on Addr and Port, has been deprecated
@@ -204,10 +203,17 @@ init_per_testcase(Case, Config) when is_list(Config) ->
     Result = 
 	case lists:member(Case, DeprecatedApiCases) of
 	    true ->
-		%% ?SKIP(api_no_longer_supported);
-		{skip, api_no_longer_supported};
+		{skip, "API no longer supported"};
 	    false ->
-		init_per_testcase2(Case, Config)
+		try init_per_testcase2(Case, Config)
+                catch
+                    C:{skip, _} = E:_ when ((C =:= throw) orelse
+                                            (C =:= exit)) ->
+                        E;
+                    C:E:_ when ((C =:= throw) orelse
+                                (C =:= exit)) ->
+                        {skip, {catched, C, E}}
+                end
 	end,
     p(Case, "init_per_testcase end when"
       "~n      Nodes:  ~p"
@@ -326,9 +332,25 @@ init_per_testcase3(Case, Config) ->
 			true ->
 			    Config
 		    end,
+            %% We don't need to try catch this (init_agent)
+            %% since we have a try catch "higher up"...
 	    Conf2 = init_agent(Conf1),
-	    Conf3 = init_manager(AutoInform, Conf2), 
-	    Conf4 = init_mgr_user(Conf3),
+	    Conf3 = try init_manager(AutoInform, Conf2)
+                    catch AC:AE:_ ->
+                            %% Ouch we need to clean up: 
+                            %% The init_agent starts an agent node!
+                            init_per_testcase_fail_agent_cleanup(Conf2),
+                            throw({skip, {manager_init_failed, AC, AE}})
+                    end,
+	    Conf4 = try init_mgr_user(Conf3)
+                    catch MC:ME:_ ->
+                            %% Ouch we need to clean up: 
+                            %% The init_agent starts an agent node!
+                            %% The init_magager starts an manager node!
+                            init_per_testcase_fail_manager_cleanup(Conf3),
+                            init_per_testcase_fail_agent_cleanup(Conf3),
+                            throw({skip, {manager_user_init_failed, MC, ME}})
+                    end,
 	    case lists:member(Case, ApiCases02 ++ ApiCases03) of
 		true ->
 		    init_mgr_user_data2(Conf4);
@@ -339,6 +361,12 @@ init_per_testcase3(Case, Config) ->
 	    Config
     end.
 
+init_per_testcase_fail_manager_cleanup(Conf) ->
+    (catch fin_manager(Conf)).
+
+init_per_testcase_fail_agent_cleanup(Conf) ->
+    (catch fin_agent(Conf)).
+
 end_per_testcase(Case, Config) when is_list(Config) ->
     p(Case, "end_per_testcase begin when"
       "~n      Nodes: ~p~n~n", [erlang:nodes()]),
@@ -452,7 +480,7 @@ groups() ->
      },
      {agent_tests, [], 
       [
-       register_agent1, 
+       register_agent_old,
        register_agent2, 
        register_agent3
       ]
@@ -568,7 +596,7 @@ groups() ->
 
 ipv6_tests() ->
     [
-     register_agent1,
+     register_agent_old,
      simple_sync_get_next3,
      simple_async_get2,
      simple_sync_get3,
@@ -592,38 +620,47 @@ init_per_group(event_tests_mt = GroupName, Config) ->
       GroupName, 
       [{manager_net_if_module, snmpm_net_if_mt} | Config]);
 init_per_group(ipv6_mt = GroupName, Config) ->
-    {ok, Hostname0} = inet:gethostname(),
-    case ct:require(ipv6_hosts) of
-	ok ->
-	    case lists:member(list_to_atom(Hostname0), ct:get_config(ipv6_hosts)) of
-		true ->
-		    ipv6_init(
-		      snmp_test_lib:init_group_top_dir(
-			GroupName,
-			[{manager_net_if_module, snmpm_net_if_mt}
-			 | Config]));
-		false ->
-		    {skip, "Host does not support IPv6"}
-	    end;
-	_ ->
-	    {skip, "Test config ipv6_hosts is missing"}
-    end;
+    init_per_group_ipv6(GroupName,
+                        [{manager_net_if_module, snmpm_net_if_mt} | Config]);   
 init_per_group(ipv6 = GroupName, Config) -> 
-    {ok, Hostname0} = inet:gethostname(),
-    case ct:require(ipv6_hosts) of
-	ok ->
-	    case lists:member(list_to_atom(Hostname0), ct:get_config(ipv6_hosts)) of
-		true ->
-		    ipv6_init(snmp_test_lib:init_group_top_dir(GroupName, Config));
-		false ->
-		    {skip, "Host does not support IPv6"}
-	    end;
-	_ ->
-	    {skip, "Test config ipv6_hosts is missing"}
-    end;
+    init_per_group_ipv6(GroupName, Config);   
 init_per_group(GroupName, Config) ->
     snmp_test_lib:init_group_top_dir(GroupName, Config).
 
+
+init_per_group_ipv6(GroupName, Config) ->
+    %% <OS-CONDITIONAL-SKIP>
+    OSSkipable = [{unix, 
+                   [
+                    {darwin, fun(V) when (V > {9, 8, 0}) ->
+				     %% This version is OK: No Skip
+				     false;
+				(_) ->
+				     %% This version is *not* ok: Skip
+                                     %% We need a fully qualified hostname
+                                     %% to get a proper IPv6 address (in this
+                                     %% version), but its just to messy, so 
+                                     %% instead we skip this **OLD** darwin...
+				     true
+                             end}
+                   ]
+                  }],
+    %% </OS-CONDITIONAL-SKIP>
+    case ?OS_BASED_SKIP(OSSkipable) of
+        true ->
+            {skip, "Host *may* not *properly* support IPV6"};
+        false ->
+            %% Even if this host supports IPv6 we don't use it unless its
+            %% one of the configures/supported IPv6 hosts...
+            case (?HAS_SUPPORT_IPV6() andalso ?IS_IPV6_HOST()) of
+                true ->
+                    ipv6_init(snmp_test_lib:init_group_top_dir(GroupName, Config));
+                false ->
+                    {skip, "Host does not support IPv6"}
+            end
+    end.
+
+
 end_per_group(_GroupName, Config) ->
     %% Do we really need to do this?
     lists:keydelete(snmp_group_top_dir, 1, Config).
@@ -635,11 +672,11 @@ end_per_group(_GroupName, Config) ->
 
 simple_start_and_stop1(suite) -> [];
 simple_start_and_stop1(Config) when is_list(Config) ->
-    %% ?SKIP(not_yet_implemented),
-    process_flag(trap_exit, true),
-    put(tname,ssas1),
-    p("starting with Config: ~n~p", [Config]),
+    ?TC_TRY(simple_start_and_stop1,
+            fun() -> do_simple_start_and_stop1(Config) end).
 
+do_simple_start_and_stop1(Config) ->
+    p("starting with Config: ~n~p", [Config]),
     ConfDir = ?config(manager_conf_dir, Config),
     DbDir   = ?config(manager_db_dir, Config),
 
@@ -660,7 +697,6 @@ simple_start_and_stop1(Config) when is_list(Config) ->
 
     ?SLEEP(1000),
 
-    p("end"),
     ok.
 
 
@@ -668,9 +704,10 @@ simple_start_and_stop1(Config) when is_list(Config) ->
 
 simple_start_and_stop2(suite) -> [];
 simple_start_and_stop2(Config) when is_list(Config) ->
-    %% ?SKIP(not_yet_implemented),
-    process_flag(trap_exit, true),
-    put(tname,ssas2),
+    ?TC_TRY(simple_start_and_stop2,
+            fun() -> do_simple_start_and_stop2(Config) end).
+
+do_simple_start_and_stop2(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     ManagerNode = start_manager_node(), 
@@ -708,7 +745,6 @@ simple_start_and_stop2(Config) when is_list(Config) ->
 
     ?SLEEP(1000),
 
-    p("end"),
     ok.
 
 
@@ -716,8 +752,10 @@ simple_start_and_stop2(Config) when is_list(Config) ->
 
 simple_start_and_monitor_crash1(suite) -> [];
 simple_start_and_monitor_crash1(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname,ssamc1),
+    ?TC_TRY(simple_start_and_monitor_crash1,
+            fun() -> do_simple_start_and_monitor_crash1(Config) end).
+
+do_simple_start_and_monitor_crash1(Config) ->
     p("starting with Config: ~n~p", [Config]),
 
     ConfDir = ?config(manager_conf_dir, Config),
@@ -761,7 +799,6 @@ simple_start_and_monitor_crash1(Config) when is_list(Config) ->
 	    ?FAIL(timeout)
     end,
 
-    p("end"),
     ok.
 
 
@@ -769,8 +806,10 @@ simple_start_and_monitor_crash1(Config) when is_list(Config) ->
 
 simple_start_and_monitor_crash2(suite) -> [];
 simple_start_and_monitor_crash2(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname,ssamc2),
+    ?TC_TRY(simple_start_and_monitor_crash2,
+            fun() -> do_simple_start_and_monitor_crash2(Config) end).
+
+do_simple_start_and_monitor_crash2(Config) ->
     p("starting with Config: ~n~p", [Config]),
 
     ConfDir = ?config(manager_conf_dir, Config),
@@ -815,7 +854,6 @@ simple_start_and_monitor_crash2(Config) when is_list(Config) ->
 	    ?FAIL(timeout)
     end,
 
-    p("end"),
     ok.
 
 
@@ -861,8 +899,10 @@ simulate_crash(NumKills, _) ->
 
 notify_started01(suite) -> [];
 notify_started01(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname,ns01),
+    ?TC_TRY(notify_started01,
+            fun() -> do_notify_started01(Config) end).
+
+do_notify_started01(Config) ->
     p("starting with Config: ~n~p", [Config]),
 
     ConfDir = ?config(manager_conf_dir, Config),
@@ -949,37 +989,34 @@ snmpm_starter(Opts, To) ->
 
 notify_started02(suite) -> [];
 notify_started02(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname,ns02),
+    ?TC_TRY(notify_started02,
+            fun() -> notify_started02_cond(Config) end,
+            fun() -> do_notify_started02(Config) end).
 
-    %% <CONDITIONAL-SKIP>
-    %% The point of this is to catch machines running 
-    %% SLES9 (2.6.5)
+notify_started02_cond(Config) ->
     LinuxVersionVerify = 
 	fun() ->
 		case os:cmd("uname -m") of
 		    "i686" ++ _ ->
-%% 			io:format("found an i686 machine, "
-%% 				  "now check version~n", []),
 			case os:version() of
 			    {2, 6, Rev} when Rev >= 16 ->
-				true;
+				false;
 			    {2, Min, _} when Min > 6 ->
-				true;
+				false;
 			    {Maj, _, _} when Maj > 2 ->
-				true;
+				false;
 			    _ ->
-				false
+				true
 			end;
 		    _ ->
-			true
+			false
 		end
 	end,
     Skippable = [{unix, [{linux, LinuxVersionVerify}]}],
     Condition = fun() -> ?OS_BASED_SKIP(Skippable) end,
-    ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
-    %% </CONDITIONAL-SKIP>
-
+    ?NON_PC_TC_MAYBE_SKIP(Config, Condition).
+    
+do_notify_started02(Config) ->
     p("starting with Config: ~n~p", [Config]),
 
     ConfDir = ?config(manager_conf_dir, Config),
@@ -987,24 +1024,52 @@ notify_started02(Config) when is_list(Config) ->
 
     write_manager_conf(ConfDir),
 
-    Opts = [{server, [{verbosity, log}]},
-	    {net_if, [{verbosity, silence}]},
+    Opts = [{server,     [{verbosity, log}]},
+	    {net_if,     [{verbosity, silence}]},
 	    {note_store, [{verbosity, silence}]},
-	    {config, [{verbosity, log}, {dir, ConfDir}, {db_dir, DbDir}]}],
+	    {config,     [{verbosity, debug}, {dir, ConfDir}, {db_dir, DbDir}]}],
 
     p("start snmpm client process"),
-    Pid1 = ns02_loop1_start(),
+    NumIterations = 5,
+    Pid1 = ns02_client_start(NumIterations),
+
+    p("start snmpm ctrl (starter) process"),
+    Pid2 = ns02_ctrl_start(Opts, NumIterations),
+
+    %% On a reasonably fast machine, one iteration takes approx 4 seconds.
+    %% We measure the first iteration, and then we wait for the remaining
+    %% ones (4 in this case).
+    ApproxStartTime =
+        case ns02_client_await_approx_runtime(Pid1) of
+            {ok, T} ->
+                T;
+            {error, Reason} ->
+                %% Attempt cleanup just in case
+                exit(Pid1, kill),
+                exit(Pid2, kill),
+                ?FAIL(Reason);
+            {skip, Reason} ->
+                %% Attempt cleanup just in case
+                exit(Pid1, kill),
+                exit(Pid2, kill),
+                ?SKIP(Reason)
+        end,
 
-    p("start snmpm starter process"),
-    Pid2 = ns02_loop2_start(Opts),
-    
-    p("await snmpm client process exit"),
+    p("await snmpm client process exit (max ~p+10000 msec)", [ApproxStartTime]),
     receive 
+        %% We take this opportunity to check if we got a skip from
+        %% the ctrl process.
+	{'EXIT', Pid2, {skip, SkipReason1}} ->
+	    ?SKIP(SkipReason1);
 	{'EXIT', Pid1, normal} ->
 	    ok;
+	{'EXIT', Pid1, {suite_failed, Reason1}} ->
+	    ?FAIL({client, Reason1});
 	{'EXIT', Pid1, Reason1} ->
-	    ?FAIL(Reason1)
-    after 25000 ->
+	    ?FAIL({client, Reason1})
+    after ApproxStartTime + 10000 ->
+            exit(Pid1, kill),
+            exit(Pid2, kill),
 	    ?FAIL(timeout)
     end,
 	
@@ -1012,9 +1077,13 @@ notify_started02(Config) when is_list(Config) ->
     receive 
 	{'EXIT', Pid2, normal} ->
 	    ok;
+	{'EXIT', Pid2, {skip, SkipReason2}} ->
+            %% In case of a race
+	    ?SKIP(SkipReason2);
 	{'EXIT', Pid2, Reason2} ->
-	    ?FAIL(Reason2)
+	    ?FAIL({ctrl, Reason2})
     after 5000 ->
+            exit(Pid2, kill),
 	    ?FAIL(timeout)
     end,
 	
@@ -1022,26 +1091,63 @@ notify_started02(Config) when is_list(Config) ->
     ok.
 
 
-ns02_loop1_start() ->
-    spawn_link(fun() -> ns02_loop1() end).
+ns02_client_start(N) ->
+    Self = self(),
+    spawn_link(fun() -> ns02_client(Self, N) end).
+
+ns02_client_await_approx_runtime(Pid) ->
+    receive
+        {?MODULE, client_time, Time} ->
+            {ok, Time};
+        {'EXIT', Pid, Reason} ->
+            p("client (~p) failed: "
+              "~n      ~p", [Pid, Reason]),
+            {error, Reason}
+                
+    after 30000 ->
+            %% Either something is *really* wrong or this machine 
+            %% is dog slow. Either way, this is a skip-reason...
+            {skip, approx_runtime_timeout}
+    end.
+    
 		       
-ns02_loop1() ->
-    put(tname,ns02_loop1),
+ns02_client(Parent, N) when is_pid(Parent) ->
+    put(tname, ns02_client),
     p("starting"),
-    ns02_loop1(dummy, snmpm:notify_started(?NS_TIMEOUT), 5).
+    ns02_client_loop(Parent, 
+                     dummy, snmpm:notify_started(?NS_TIMEOUT),
+                     snmp_misc:now(ms), undefined,
+                     N).
 
-ns02_loop1(_Ref, _Pid, 0) ->
-    p("done"),
+ns02_client_loop(_Parent, _Ref, _Pid, _Begin, _End, 0) ->
+    %% p("loop -> done"),
     exit(normal);
-ns02_loop1(Ref, Pid, N) ->
-    p("entry when"
-      "~n   Ref: ~p"
-      "~n   Pid: ~p"
-      "~n   N:   ~p", [Ref, Pid, N]),
+ns02_client_loop(Parent, Ref, Pid, Begin, End, N) 
+  when is_pid(Parent) andalso is_integer(Begin) andalso is_integer(End) ->
+    %% p("loop -> [~w] inform parent: ~w, ~w => ~w", [N, Begin, End, End-Begin]),
+    Parent ! {?MODULE, client_time, N*(End-Begin)},
+    ns02_client_loop(undefined, Ref, Pid, snmp_misc:now(ms), undefined, N);    
+ns02_client_loop(Parent, Ref, Pid, Begin, End, N) 
+  when is_integer(Begin) andalso is_integer(End) ->
+    %% p("loop -> [~w] entry when"
+    %%   "~n      Ref:   ~p"
+    %%   "~n      Pid:   ~p"
+    %%   "~n      Begin: ~p"
+    %%   "~n      End:   ~p", [N, Ref, Pid, Begin, End]),
+    ns02_client_loop(Parent, Ref, Pid, snmp_misc:now(ms), undefined, N);    
+ns02_client_loop(Parent, Ref, Pid, Begin, End, N) ->
+    %% p("loop(await message) -> [~w] entry when"
+    %%   "~n      Ref:   ~p"
+    %%   "~n      Pid:   ~p"
+    %%   "~n      Begin: ~p"
+    %%   "~n      End:   ~p", [N, Ref, Pid, Begin, End]),
     receive
 	{snmpm_started, Pid} ->
 	    p("received expected started message (~w)", [N]),
-	    ns02_loop1(snmpm:monitor(), dummy, N);
+	    ns02_client_loop(Parent,
+                             snmpm:monitor(), dummy,
+                             Begin, End,
+                             N);
 	{snmpm_start_timeout, Pid} ->
 	    p("unexpected timout"),
 	    ?FAIL({unexpected_start_timeout, Pid});
@@ -1049,40 +1155,72 @@ ns02_loop1(Ref, Pid, N) ->
 	    p("received expected DOWN message (~w) with"
 	      "~n   Obj:    ~p"
 	      "~n   Reason: ~p", [N, Obj, Reason]),
-	    ns02_loop1(dummy, snmpm:notify_started(?NS_TIMEOUT), N-1)
-    after 10000 ->
-	    ?FAIL(timeout)
+	    ns02_client_loop(Parent,
+                             dummy, snmpm:notify_started(?NS_TIMEOUT),
+                             Begin, snmp_misc:now(ms),
+                             N-1)
     end.
 
-
-ns02_loop2_start(Opts) ->
-    spawn_link(fun() -> ns02_loop2(Opts) end).
+ns02_ctrl_start(Opts, N) ->
+    spawn_link(fun() -> ns02_ctrl(Opts, N) end).
 		       
-ns02_loop2(Opts) ->
-    put(tname,ns02_loop2),
+ns02_ctrl(Opts, N) ->
+    put(tname, ns02_ctrl),
     p("starting"),
-    ns02_loop2(Opts, 5).
+    ns02_ctrl_loop(Opts, N).
+
 
-ns02_loop2(_Opts, 0) ->
+%% We have seen that some times it takes unreasonably long time to
+%% start the manager (it got "stuck" in snmpm_config). But since
+%% we did not have enough verbosity, we do not know how far it got.
+%% So, we try to monitor each start attempt. We allow 5 sec (just 
+%% to give slow boxes a chance).
+ns02_ctrl_loop(_Opts, 0) ->
     p("done"),
     exit(normal);
-ns02_loop2(Opts, N) ->
+ns02_ctrl_loop(Opts, N) ->
     p("entry when N: ~p", [N]),
     ?SLEEP(2000),
     p("start manager"),
-    snmpm:start(Opts),
+    TS1 = erlang:system_time(millisecond),
+    {StarterPid, StarterMRef} =
+        erlang:spawn_monitor(fun() -> exit(snmpm:start(Opts)) end),
+    receive
+        {'DOWN', StarterMRef, process, StarterPid, ok} ->
+            TS2 = erlang:system_time(millisecond),
+            p("manager started: ~w ms", [TS2-TS1]),
+            ok
+    after 5000 ->
+            p("manager (~p) start timeout - kill", [StarterPid]),
+            exit(StarterPid, kill),
+            exit({skip, start_timeout})
+    end,
     ?SLEEP(2000),
     p("stop manager"),
-    snmpm:stop(),
-    ns02_loop2(Opts, N-1).
+    ?SLEEP(100), % Give the verbosity to take effect...
+    TS3 = erlang:system_time(millisecond),
+    case snmpm:stop(5000) of
+        ok ->
+            TS4 = erlang:system_time(millisecond),
+            p("manager stopped: ~p ms", [TS4-TS3]),
+            ok;
+        {error, timeout} ->
+            p("manager stop timeout - kill (cleanup) and skip"),
+            exit(whereis(snmpm_supervisor), kill),
+            exit({skip, stop_timeout})
+    end,
+    ns02_ctrl_loop(Opts, N-1).
+
 
 
 %%======================================================================
 
 info(suite) -> [];
 info(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname,info),
+    ?TC_TRY(info,
+            fun() -> do_info(Config) end).
+
+do_info(Config) ->
     p("starting with Config: ~n~p", [Config]),
 
     ConfDir = ?config(manager_conf_dir, Config),
@@ -1110,7 +1248,6 @@ info(Config) when is_list(Config) ->
 
     ?SLEEP(1000),
 
-    p("end"),
     ok.
 
 verify_info(Info) when is_list(Info) ->
@@ -1150,9 +1287,10 @@ verify_info([{Key, SubKeys}|Keys], Info) ->
 
 register_user1(suite) -> [];
 register_user1(Config) when is_list(Config) ->
-    %% ?SKIP(not_yet_implemented).
-    process_flag(trap_exit, true),
-    put(tname,ru1),
+    ?TC_TRY(register_user1,
+            fun() -> do_register_user1(Config) end).
+
+do_register_user1(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     ManagerNode = start_manager_node(), 
@@ -1226,7 +1364,6 @@ register_user1(Config) when is_list(Config) ->
 
     ?SLEEP(1000),
 
-    p("end"),
     ok.
 
 verify_users([], []) ->
@@ -1244,14 +1381,15 @@ verify_users(ActualUsers0, [User|RegUsers]) ->
 
 %%======================================================================
 
-register_agent1(doc) -> 
+register_agent_old(doc) -> 
     ["Test registration of agents with the OLD interface functions"];
-register_agent1(suite) -> 
+register_agent_old(suite) -> 
     [];
-register_agent1(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname,ra1),
-    
+register_agent_old(Config) when is_list(Config) ->
+    ?TC_TRY(register_agent_old,
+            fun() -> do_register_agent_old(Config) end).
+
+do_register_agent_old(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     ManagerNode = start_manager_node(), 
@@ -1366,7 +1504,6 @@ register_agent1(Config) when is_list(Config) ->
 
     ?SLEEP(1000),
 
-    p("end"),
     ok.
 
 
@@ -1377,8 +1514,10 @@ register_agent2(doc) ->
 register_agent2(suite) -> 
     [];
 register_agent2(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname, ra2),
+    ?TC_TRY(register_agent2,
+            fun() -> do_register_agent2(Config) end).
+
+do_register_agent2(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     ManagerNode = start_manager_node(), 
@@ -1511,7 +1650,6 @@ register_agent2(Config) when is_list(Config) ->
 
     ?SLEEP(1000),
 
-    p("end"),
     ok.
 
 
@@ -1523,8 +1661,10 @@ register_agent3(doc) ->
 register_agent3(suite) -> 
     [];
 register_agent3(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname, ra3),
+    ?TC_TRY(register_agent3,
+            fun() -> do_register_agent3(Config) end).
+
+do_register_agent3(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     ManagerNode = start_manager_node(), 
@@ -1661,7 +1801,6 @@ register_agent3(Config) when is_list(Config) ->
 
     ?SLEEP(1000),
 
-    p("end"),
     ok.
 
 
@@ -1670,10 +1809,11 @@ register_agent3(Config) when is_list(Config) ->
 simple_sync_get1(doc) -> ["Simple sync get-request - Old style (Addr & Port)"];
 simple_sync_get1(suite) -> [];
 simple_sync_get1(Config) when is_list(Config) ->
-    ?SKIP(api_no_longer_supported), 
+    ?TC_TRY(simple_sync_get1,
+            fun() -> {skip, "API no longer supported"} end,
+            fun() -> do_simple_sync_get1(Config) end).
 
-    process_flag(trap_exit, true),
-    put(tname, ssg1),
+do_simple_sync_get1(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     Node  = ?config(manager_node, Config),
@@ -1732,18 +1872,18 @@ simple_sync_get2(doc) ->
     ["Simple sync get-request - Version 2 API (TargetName)"];
 simple_sync_get2(suite) -> [];
 simple_sync_get2(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname, ssg2),
-    do_simple_sync_get2(Config),
-    display_log(Config),
-    ok.
+    ?TC_TRY(simple_sync_get2,
+            fun() -> do_simple_sync_get2(Config) end).
 
 do_simple_sync_get2(Config) ->
+    p("starting with Config: ~n~p", [Config]),
     Get = fun(Node, TargetName, Oids) -> 
 		  mgr_user_sync_get(Node, TargetName, Oids) 
 	  end, 
     PostVerify = fun() -> ok end,
-    do_simple_sync_get2(Config, Get, PostVerify).
+    do_simple_sync_get2(Config, Get, PostVerify),
+    display_log(Config),
+    ok.
 
 do_simple_sync_get2(Config, Get, PostVerify) ->
     p("starting with Config: ~p~n", [Config]),
@@ -1799,13 +1939,11 @@ simple_sync_get3(doc) ->
     ["Simple sync get-request - Version 3 API (TargetName and send-opts)"];
 simple_sync_get3(suite) -> [];
 simple_sync_get3(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname, ssg3),
-    do_simple_sync_get3(Config),
-    display_log(Config),
-    ok.
+    ?TC_TRY(simple_sync_get3,
+            fun() -> do_simple_sync_get3(Config) end).
 
 do_simple_sync_get3(Config) ->
+    p("starting with Config: ~n~p", [Config]),
     Self  = self(), 
     Msg   = simple_sync_get3, 
     Fun   = fun() -> Self ! Msg end,
@@ -1824,7 +1962,9 @@ do_simple_sync_get3(Config) ->
 			ok
 		end
 	end,
-    do_simple_sync_get2(Config, Get, PostVerify).
+    do_simple_sync_get2(Config, Get, PostVerify),
+    display_log(Config),
+    ok.
 
 
 %%======================================================================
@@ -1833,10 +1973,11 @@ simple_async_get1(doc) ->
     ["Simple (async) get-request - Old style (Addr & Port)"];
 simple_async_get1(suite) -> [];
 simple_async_get1(Config) when is_list(Config) ->
-    ?SKIP(api_no_longer_supported), 
+    ?TC_TRY(simple_async_get1,
+            fun() -> {skip, "API no longer supported"} end,
+            fun() -> do_simple_async_get1(Config) end).
 
-    process_flag(trap_exit, true),
-    put(tname, sag1),
+do_simple_async_get1(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     MgrNode   = ?config(manager_node, Config),
@@ -1937,8 +2078,10 @@ simple_async_get2(doc) ->
     ["Simple (async) get-request - Version 2 API (TargetName)"];
 simple_async_get2(suite) -> [];
 simple_async_get2(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname, sag2),
+    ?TC_TRY(simple_async_get2,
+            fun() -> do_simple_async_get2(Config) end).
+
+do_simple_async_get2(Config) ->
     p("starting with Config: ~p~n", [Config]),
     MgrNode    = ?config(manager_node, Config),
     AgentNode  = ?config(agent_node, Config),
@@ -2018,8 +2161,10 @@ simple_async_get3(doc) ->
     ["Simple (async) get-request - Version 3 API (TargetName and send-opts)"];
 simple_async_get3(suite) -> [];
 simple_async_get3(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname, sag3),
+    ?TC_TRY(simple_async_get3,
+            fun() -> do_simple_async_get3(Config) end).
+
+do_simple_async_get3(Config) ->
     p("starting with Config: ~p~n", [Config]),
     MgrNode    = ?config(manager_node, Config),
     AgentNode  = ?config(agent_node, Config),
@@ -2050,10 +2195,11 @@ simple_sync_get_next1(doc) -> ["Simple (sync) get_next-request - "
 			       "Old style (Addr & Port)"];
 simple_sync_get_next1(suite) -> [];
 simple_sync_get_next1(Config) when is_list(Config) ->
-    ?SKIP(api_no_longer_supported), 
+    ?TC_TRY(simple_sync_get_next1,
+            fun() -> {skip, "API no longer supported"} end,
+            fun() -> do_simple_sync_get_next1(Config) end).
 
-    process_flag(trap_exit, true),
-    put(tname, ssgn1),
+do_simple_sync_get_next1(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     MgrNode   = ?config(manager_node, Config),
@@ -2191,8 +2337,10 @@ simple_sync_get_next2(doc) ->
     ["Simple (sync) get_next-request - Version 2 API (TargetName)"];
 simple_sync_get_next2(suite) -> [];
 simple_sync_get_next2(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname, ssgn2),
+    ?TC_TRY(simple_sync_get_next2,
+            fun() -> do_simple_sync_get_next2(Config) end).
+
+do_simple_sync_get_next2(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     GetNext = fun(Node, TargetName, Oids) -> 
@@ -2344,10 +2492,11 @@ simple_async_get_next1(doc) -> ["Simple (async) get_next-request - "
 				"Old style (Addr & Port)"];
 simple_async_get_next1(suite) -> [];
 simple_async_get_next1(Config) when is_list(Config) ->
-    ?SKIP(api_no_longer_supported), 
+    ?TC_TRY(simple_async_get_next1,
+            fun() -> {skip, "API no longer supported"} end,
+            fun() -> do_simple_async_get_next1(Config) end).
 
-    process_flag(trap_exit, true),
-    put(tname, ssgn1),
+do_simple_async_get_next1(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     MgrNode   = ?config(manager_node, Config),
@@ -2444,8 +2593,10 @@ simple_async_get_next2(doc) ->
     ["Simple (async) get_next-request - Version 2 API (TargetName)"];
 simple_async_get_next2(suite) -> [];
 simple_async_get_next2(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname, ssgn2),
+    ?TC_TRY(simple_async_get_next2,
+            fun() -> do_simple_async_get_next2(Config) end).
+
+do_simple_async_get_next2(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     MgrNode    = ?config(manager_node, Config),
@@ -2555,8 +2706,10 @@ simple_async_get_next3(doc) ->
      "Version 3 API (TargetName with send-opts)"];
 simple_async_get_next3(suite) -> [];
 simple_async_get_next3(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname, ssgn2),
+    ?TC_TRY(simple_async_get_next3,
+            fun() -> do_simple_async_get_next3(Config) end).
+
+do_simple_async_get_next3(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     MgrNode    = ?config(manager_node, Config),
@@ -2598,10 +2751,11 @@ simple_sync_set1(doc) -> ["Simple (sync) set-request - "
 			  "Old style (Addr & Port)"];
 simple_sync_set1(suite) -> [];
 simple_sync_set1(Config) when is_list(Config) ->
-    ?SKIP(api_no_longer_supported), 
+    ?TC_TRY(simple_sync_set1,
+            fun() -> {skip, "API no longer supported"} end,
+            fun() -> do_simple_sync_set1(Config) end).
 
-    process_flag(trap_exit, true),
-    put(tname, sss1),
+do_simple_sync_set1(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     Node = ?config(manager_node, Config),
@@ -2671,8 +2825,10 @@ simple_sync_set2(doc) ->
     ["Simple (sync) set-request - Version 2 API (TargetName)"];
 simple_sync_set2(suite) -> [];
 simple_sync_set2(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname, sss2),
+    ?TC_TRY(simple_sync_set2,
+            fun() -> do_simple_sync_set2(Config) end).
+
+do_simple_sync_set2(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     Set = fun(Node, TargetName, VAVs) -> 
@@ -2741,8 +2897,10 @@ simple_sync_set3(doc) ->
     ["Simple (sync) set-request - Version 3 API (TargetName with send-opts)"];
 simple_sync_set3(suite) -> [];
 simple_sync_set3(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname, sss3),
+    ?TC_TRY(simple_sync_set3,
+            fun() -> do_simple_sync_set3(Config) end).
+
+do_simple_sync_set3(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     Self  = self(), 
@@ -2770,10 +2928,11 @@ simple_async_set1(doc) -> ["Simple (async) set-request - "
 			   "Old style (Addr & Port)"];
 simple_async_set1(suite) -> [];
 simple_async_set1(Config) when is_list(Config) ->
-    ?SKIP(api_no_longer_supported), 
+    ?TC_TRY(simple_async_set1,
+            fun() -> {skip, "API no longer supported"} end,
+            fun() -> do_simple_async_set1(Config) end).
 
-    process_flag(trap_exit, true),
-    put(tname, sas1),
+do_simple_async_set1(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     MgrNode   = ?config(manager_node, Config),
@@ -2865,8 +3024,10 @@ simple_async_set2(doc) ->
     ["Simple (async) set-request - Version 2 API (TargetName)"];
 simple_async_set2(suite) -> [];
 simple_async_set2(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname, sas2),
+    ?TC_TRY(simple_async_set2,
+            fun() -> do_simple_async_set2(Config) end).
+
+do_simple_async_set2(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     MgrNode    = ?config(manager_node, Config),
@@ -2938,8 +3099,10 @@ simple_async_set3(doc) ->
     ["Simple (async) set-request - Version 3 API (TargetName with send-opts)"];
 simple_async_set3(suite) -> [];
 simple_async_set3(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname, sas3),
+    ?TC_TRY(simple_async_set3,
+            fun() -> do_simple_async_set3(Config) end).
+
+do_simple_async_set3(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     MgrNode    = ?config(manager_node, Config),
@@ -2982,10 +3145,11 @@ simple_sync_get_bulk1(doc) -> ["Simple (sync) get_bulk-request - "
 			       "Old style (Addr & Port)"];
 simple_sync_get_bulk1(suite) -> [];
 simple_sync_get_bulk1(Config) when is_list(Config) ->
-    ?SKIP(api_no_longer_supported), 
+    ?TC_TRY(simple_sync_get_bulk1,
+            fun() -> {skip, "API no longer supported"} end,
+            fun() -> do_simple_sync_get_bulk1(Config) end).
 
-    process_flag(trap_exit, true),
-    put(tname, ssgb1),
+do_simple_sync_get_bulk1(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     MgrNode = ?config(manager_node, Config),
@@ -3156,8 +3320,10 @@ simple_sync_get_bulk2(doc) ->
     ["Simple (sync) get_bulk-request - Version 2 API (TargetName)"];
 simple_sync_get_bulk2(suite) -> [];
 simple_sync_get_bulk2(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname, ssgb2),
+    ?TC_TRY(simple_sync_get_bulk2,
+            fun() -> do_simple_sync_get_bulk2(Config) end).
+
+do_simple_sync_get_bulk2(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     MgrNode    = ?config(manager_node, Config),
@@ -3312,8 +3478,10 @@ simple_sync_get_bulk3(doc) ->
      "Version 3 API (TargetName with send-opts)"];
 simple_sync_get_bulk3(suite) -> [];
 simple_sync_get_bulk3(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname, ssgb3),
+    ?TC_TRY(simple_sync_get_bulk3,
+            fun() -> do_simple_sync_get_bulk3(Config) end).
+
+do_simple_sync_get_bulk3(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     MgrNode    = ?config(manager_node, Config),
@@ -3349,10 +3517,11 @@ simple_async_get_bulk1(doc) -> ["Simple (async) get_bulk-request - "
 				"Old style (Addr & Port)"];
 simple_async_get_bulk1(suite) -> [];
 simple_async_get_bulk1(Config) when is_list(Config) ->
-    ?SKIP(api_no_longer_supported), 
+    ?TC_TRY(simple_async_get_bulk1,
+            fun() -> {skip, "API no longer supported"} end,
+            fun() -> do_simple_async_get_bulk1(Config) end).
 
-    process_flag(trap_exit, true),
-    put(tname, sagb1),
+do_simple_async_get_bulk1(Config) ->
     p("starting with Config: ~p~n", [Config]),
     
     MgrNode   = ?config(manager_node, Config),
@@ -3495,8 +3664,10 @@ simple_async_get_bulk2(doc) ->
     ["Simple (async) get_bulk-request - Version 2 API (TargetName)"];
 simple_async_get_bulk2(suite) -> [];
 simple_async_get_bulk2(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname, sagb2),
+    ?TC_TRY(simple_async_get_bulk2,
+            fun() -> do_simple_async_get_bulk2(Config) end).
+
+do_simple_async_get_bulk2(Config) ->
     p("starting with Config: ~p~n", [Config]),
     
     MgrNode    = ?config(manager_node, Config),
@@ -3651,8 +3822,10 @@ simple_async_get_bulk3(doc) ->
      "Version 3 API (TargetName with send-opts)"];
 simple_async_get_bulk3(suite) -> [];
 simple_async_get_bulk3(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname, sagb3),
+    ?TC_TRY(simple_async_get_bulk3,
+            fun() -> do_simple_async_get_bulk3(Config) end).
+
+do_simple_async_get_bulk3(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     MgrNode    = ?config(manager_node, Config),
@@ -3695,10 +3868,11 @@ misc_async1(doc) -> ["Misc (async) request(s) - "
 		     "Old style (Addr & Port)"];
 misc_async1(suite) -> [];
 misc_async1(Config) when is_list(Config) ->
-    ?SKIP(api_no_longer_supported), 
+    ?TC_TRY(misc_async1,
+            fun() -> {skip, "API no longer supported"} end,
+            fun() -> do_misc_async1(Config) end).
 
-    process_flag(trap_exit, true),
-    put(tname, ms1),
+do_misc_async1(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     MgrNode   = ?config(manager_node, Config),
@@ -3887,8 +4061,10 @@ misc_async2(doc) ->
     ["Misc (async) request(s) - Version 2 API (TargetName)"];
 misc_async2(suite) -> [];
 misc_async2(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname, ms2),
+    ?TC_TRY(misc_async2,
+            fun() -> do_misc_async2(Config) end).
+
+do_misc_async2(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     MgrNode   = ?config(manager_node, Config),
@@ -4137,8 +4313,10 @@ verify_trap(Trap, [{Id, Verifier}|Verifiers]) ->
 
 trap1(suite) -> [];
 trap1(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname,t1),
+    ?TC_TRY(trap1,
+            fun() -> do_trap1(Config) end).
+
+do_trap1(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     MgrNode   = ?config(manager_node, Config),
@@ -4290,8 +4468,10 @@ trap1(Config) when is_list(Config) ->
 
 trap2(suite) -> [];
 trap2(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname,t2),
+    ?TC_TRY(trap2,
+            fun() -> do_trap2(Config) end).
+
+do_trap2(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     MgrNode   = ?config(manager_node, Config),
@@ -4483,8 +4663,10 @@ trap2(Config) when is_list(Config) ->
 
 inform1(suite) -> [];
 inform1(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname,i1),
+    ?TC_TRY(inform1,
+            fun() -> do_inform1(Config) end).
+
+do_inform1(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     MgrNode   = ?config(manager_node, Config),
@@ -4610,8 +4792,10 @@ inform1(Config) when is_list(Config) ->
 
 inform2(suite) -> [];
 inform2(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname, i2),
+    ?TC_TRY(inform2,
+            fun() -> do_inform2(Config) end).
+
+do_inform2(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     MgrNode   = ?config(manager_node, Config),
@@ -4745,7 +4929,7 @@ inform2(Config) when is_list(Config) ->
 			  "~n   ~p", [Addr]),
 			ok;
 		    {snmp_notification, inform2_tag1, {no_response, Addr}} ->
-			p("<ERROR> received expected \"no response\" "
+			e("Received unexpected \"no response\" "
 			  "notification from: "
 			  "~n   ~p", [Addr]),
 			{error, no_response}
@@ -4782,8 +4966,10 @@ inform2(Config) when is_list(Config) ->
 
 inform3(suite) -> [];
 inform3(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname,i3),
+    ?TC_TRY(inform3,
+            fun() -> do_inform3(Config) end).
+
+do_inform3(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     MgrNode   = ?config(manager_node, Config),
@@ -4879,7 +5065,7 @@ inform3(Config) when is_list(Config) ->
 			  "~n   ~p", [Addr]),
 			ok;
 		    {snmp_notification, inform3_tag1, {got_response, Addr}} ->
-			p("<ERROR> received unexpected \"got response\" "
+			e("Received unexpected \"got response\" "
 			  "notification from: "
 			  "~n   ~p", 
 			  [Addr]),
@@ -4918,8 +5104,10 @@ inform3(Config) when is_list(Config) ->
 
 inform4(suite) -> [];
 inform4(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname,i4),
+    ?TC_TRY(inform4,
+            fun() -> do_inform4(Config) end).
+
+do_inform4(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     MgrNode   = ?config(manager_node, Config),
@@ -5038,8 +5226,10 @@ inform4(Config) when is_list(Config) ->
 
 inform_swarm(suite) -> [];
 inform_swarm(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname, is),
+    ?TC_TRY(inform_swarm,
+            fun() -> do_inform_swarm(Config) end).
+
+do_inform_swarm(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     MgrNode   = ?config(manager_node, Config),
@@ -5166,7 +5356,7 @@ inform_swarm_collector(N, SentAckCnt, RecvCnt, RespCnt, Timeout) ->
 		    inform_swarm_collector(N, SentAckCnt, RecvCnt+1, RespCnt, 
 					   Timeout);
 		{Err, Idx, VBs} ->
-		    p("<ERROR> unexpected error status: "
+		    e("Unexpected error status: "
 		      "~n   Err: ~p"
 		      "~n   Idx: ~p"
 		      "~n   VBs: ~p", [Err, Idx, VBs]),
@@ -5185,7 +5375,7 @@ inform_swarm_collector(N, SentAckCnt, RecvCnt, RespCnt, Timeout) ->
 
 	%% The agent did not received ack from the manager in time 
 	{snmp_notification, inform2_tag1, {no_response, Addr}} ->
-	    p("<ERROR> received expected \"no response\" notification "
+	    e("Received expected \"no response\" notification "
 	      "from: "
 	      "~n   ~p", [Addr]),
 	    Reason = {no_response, Addr, {N, SentAckCnt, RecvCnt, RespCnt}},
@@ -5210,8 +5400,10 @@ report(Config) when is_list(Config) ->
 otp8015_1(doc) -> ["OTP-8015:1 - testing the new api-function."];
 otp8015_1(suite) -> [];
 otp8015_1(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname, otp8015_1),
+    ?TC_TRY(otp8015_1,
+            fun() -> do_otp8015_1(Config) end).
+
+do_otp8015_1(Config) ->
     p("starting with Config: ~p~n", [Config]),
 
     ConfDir = ?config(manager_conf_dir, Config),
@@ -5258,8 +5450,10 @@ otp8015_1(Config) when is_list(Config) ->
 otp8395_1(doc) -> ["OTP-8395:1 - simple get with ATL sequence numbering."];
 otp8395_1(suite) -> [];
 otp8395_1(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    put(tname, otp8395_1),
+    ?TC_TRY(otp8395_1,
+            fun() -> do_otp8395_1(Config) end).
+
+do_otp8395_1(Config) ->
     do_simple_sync_get2(Config).
 
 
@@ -5362,10 +5556,10 @@ command_handler([{No, Desc, Cmd}|Cmds]) ->
             p("command_handler -> ~w: ok",[No]),
             command_handler(Cmds);
         {error, Reason} ->
-            p("<ERROR> command_handler -> ~w error: ~n~p",[No, Reason]),
+            e("Command_handler -> ~w error: ~n~p",[No, Reason]),
             ?line ?FAIL({command_failed, No, Reason});
         Error ->
-            p("<ERROR> command_handler -> ~w unexpected: ~n~p",[No, Error]),
+            e("Command_handler -> ~w unexpected: ~n~p",[No, Error]),
             ?line ?FAIL({unexpected_command_result, No, Error})
     end.
 
@@ -5416,15 +5610,14 @@ init_manager(AutoInform, Config) ->
 	    start_manager(Node, Vsns, Conf)
 	end
     catch
-	T:E ->
-	    StackTrace = ?STACK(), 
+	C:E:S ->
 	    p("Failure during manager start: "
-	      "~n      Error Type: ~p"
-	      "~n      Error:      ~p"
-	      "~n      StackTrace: ~p", [T, E, StackTrace]), 
+	      "~n      Error Class: ~p"
+	      "~n      Error:       ~p"
+	      "~n      StackTrace:  ~p", [C, E, S]), 
 	    %% And now, *try* to cleanup
 	    (catch stop_node(Node)), 
-	    ?FAIL({failed_starting_manager, T, E, StackTrace})
+	    ?FAIL({failed_starting_manager, C, E, S})
     end.
 
 fin_manager(Config) ->
@@ -5432,7 +5625,7 @@ fin_manager(Config) ->
     StopMgrRes    = stop_manager(Node),
     StopCryptoRes = fin_crypto(Node),
     StopNode      = stop_node(Node),
-    p("fin_agent -> stop apps and (mgr node ~p) node results: "
+    p("fin_manager -> stop apps and (mgr node ~p) node results: "
       "~n      SNMP Mgr: ~p"
       "~n      Crypto:   ~p"
       "~n      Node:     ~p", 
@@ -5498,15 +5691,14 @@ init_agent(Config) ->
 	    start_agent(Node, Vsns, Conf)
 	end
     catch
-	T:E ->
-	    StackTrace = ?STACK(), 
+	C:E:S ->
 	    p("Failure during agent start: "
-	      "~n      Error Type: ~p"
-	      "~n      Error:      ~p"
-	      "~n      StackTrace: ~p", [T, E, StackTrace]), 
+	      "~n      Error Class: ~p"
+	      "~n      Error:       ~p"
+	      "~n      StackTrace:  ~p", [C, E, S]), 
 	    %% And now, *try* to cleanup
 	    (catch stop_node(Node)), 
-	    ?FAIL({failed_starting_agent, T, E, StackTrace})
+	    ?FAIL({failed_starting_agent, C, E, S})
     end.
 	      
 
@@ -6179,7 +6371,12 @@ start_agent(Node, Vsns, Conf0, _Opts) ->
 	   {mib_server,      [{verbosity, MSV}]},
 	   {note_store,      [{verbosity, NSV}]},
 	   {stymbolic_store, [{verbosity, SSV}]},
-	   {net_if,          [{verbosity, NIV}]},
+	   {net_if,          [{verbosity, NIV},
+                              %% On some linux "they" add a 127.0.1.1 or somthing
+                              %% similar, so if we don't specify bind_to
+                              %% we don't know which address will be selected
+                              %% (which will cause problems for some test cases).
+                              {options, [{bind_to, true}]}]},
 	   {multi_threaded,  true}],
     ?line ok = set_agent_env(Node, Env),
 
@@ -6228,6 +6425,8 @@ start_manager_node() ->
     start_node(snmp_manager).
 
 start_node(Name) ->
+    start_node(Name, true).
+start_node(Name, Retry) ->
     Pa   = filename:dirname(code:which(?MODULE)),
     Args = case init:get_argument('CC_TEST') of
                {ok, [[]]} ->
@@ -6238,30 +6437,47 @@ start_node(Name) ->
                       ""
               end,
     A = Args ++ " -pa " ++ Pa,
-    case (catch ?START_NODE(Name, A)) of
+    try ?START_NODE(Name, A) of
 	{ok, Node} ->
 	    Node;
-	Else ->
-	    ?line ?FAIL(Else)
+	{error, timeout} ->
+            e("Failed starting node ~p: timeout", [Name]),
+	    ?line ?FAIL({error_starting_node, Name, timeout});
+	{error, {already_running, Node}} when (Retry =:= true) ->
+            %% Ouch
+            %% Either we previously failed to (properly) stop the node
+            %% or it was a failed start, that reported failure (for instance
+            %% timeout) but actually succeeded. Regardless, we don't know
+            %% the state of this node, so (try) stop it and then (re-) try
+            %% start again.
+            e("Failed starting node ~p: Already Running - try stop", [Node]),
+            case ?STOP_NODE(Node) of
+                true ->
+                    p("Successfully stopped old node ~p", [Node]),
+                    start_node(Name, false);
+                false ->
+                    e("Failed stop old node ~p", [Node]),
+                    ?line ?FAIL({error_starting_node, Node, Retry, already_running})
+            end;
+	{error, {already_running, Node}} ->
+            e("Failed starting node ~p: Already Running", [Node]),
+            ?line ?FAIL({error_starting_node, Node, Retry, already_running});
+	{error, Reason} ->
+            e("Failed starting node ~p: ~p", [Name, Reason]),
+	    ?line ?FAIL({error_starting_node, Name, Reason})
+    catch
+        exit:{suite_failed, Reason} ->
+            e("(suite) Failed starting node ~p: ~p", [Name, Reason]),
+            ?line ?FAIL({failed_starting_node, Name, Reason})
     end.
 
-stop_node(Node) ->
-    rpc:cast(Node, erlang, halt, []),
-    await_stopped(Node, 5).
 
-await_stopped(Node, 0) ->
-    p("await_stopped -> ~p still exist: giving up", [Node]),
-    ok;
-await_stopped(Node, N) ->
-    Nodes = erlang:nodes(),
-    case lists:member(Node, Nodes) of
-	true ->
-	    p("await_stopped -> ~p still exist: ~w", [Node, N]),
-	    ?SLEEP(1000),
-	    await_stopped(Node, N-1);
-	false ->
-	    p("await_stopped -> ~p gone: ~w", [Node, N]),
-	    ok
+stop_node(Node) ->
+    case ?STOP_NODE(Node) of
+        true ->
+            ok;
+        false ->
+            ?line ?FAIL({failed_stop_node, Node})
     end.
     
  
@@ -6506,12 +6722,15 @@ rcall(Node, Mod, Func, Args) ->
 
 %% ------
 
+e(F, A) ->
+    p("<ERROR> " ++ F, A).
+
 p(F) ->
     p(F, []).
  
 p(F, A) ->
     p(get(tname), F, A).
- 
+
 p(TName, F, A) ->
     io:format("*** [~w][~s] ***"
               "~n   " ++ F ++ "~n", [TName, formated_timestamp()|A]).
diff --git a/lib/snmp/test/snmp_test_global_sys_monitor.erl b/lib/snmp/test/snmp_test_global_sys_monitor.erl
new file mode 100644
index 0000000000..eafb96621a
--- /dev/null
+++ b/lib/snmp/test/snmp_test_global_sys_monitor.erl
@@ -0,0 +1,214 @@
+%% 
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2019-2019. 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(snmp_test_global_sys_monitor).
+
+-export([start/0, stop/0,
+         reset_events/0,
+         events/0,
+         log/1]).
+-export([init/1]).
+
+-define(NAME, ?MODULE).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+start() ->
+    Parent = self(),
+    proc_lib:start(?MODULE, init, [Parent]).
+
+stop() ->
+    cast(stop).
+
+%% This does not reset the global counter but the "collector"
+%% See events for more info.
+reset_events() ->
+    cast(reset_events).
+
+events() ->
+    call(events).
+
+log(Event) ->
+    cast({node(), Event}).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+init(Parent) ->
+    process_flag(priority, high),
+    case global:register_name(?NAME, self()) of
+        yes ->
+            info_msg("Starting", []),
+            proc_lib:init_ack(Parent, {ok, self()}),
+            loop(#{parent => Parent, ev_cnt => 0, evs => []});
+        no ->
+            warning_msg("Already started", []),
+            proc_lib:init_ack(Parent, {error, already_started}),
+            exit(normal)
+    end.
+    
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+loop(State) ->
+    receive
+        {?MODULE, stop} ->
+            warning_msg("Stopping with ~w events counted",
+                        [maps:get(ev_cnt, State)]),
+            exit(normal);
+
+        {?MODULE, reset_events} ->
+            loop(State#{evs => []});
+
+        {?MODULE, Ref, From, events} ->
+            Evs = maps:get(evs, State),
+            From ! {?MODULE, Ref, lists:reverse(Evs)},
+            loop(State);
+
+        {?MODULE, {Node, Event}} ->
+            State2 = process_event(State, Node, Event),
+            loop(State2);
+
+        {nodedown = Event, Node} ->
+            State2 = process_event(State, Node, Event),
+            loop(State2);            
+
+        _ ->
+            loop(State)
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+process_event(State, Node, {Pid, TS, Tag, Info}) ->
+    process_system_event(State, Node, Pid, TS, Tag, Info);
+
+process_event(State, Node, {TS, starting}) ->
+    FTS = snmp_misc:format_timestamp(TS),
+    info_msg("System Monitor on node ~p starting at ~s", [Node, FTS]),
+    if
+        (Node =/= node()) ->
+            erlang:monitor_node(Node, true);
+        true ->
+            ok
+    end,
+    State;
+
+process_event(State, Node, {TS, already_started}) ->
+    FTS = snmp_misc:format_timestamp(TS),
+    info_msg("System Monitor on node ~p already started", [Node, FTS]),
+    State;
+
+process_event(State, Node, nodedown) ->
+    info_msg("Node ~p down", [Node]),
+    State;
+
+process_event(State, Node, Event) ->
+    warning_msg("Received unknown event from node ~p:"
+                "~n   ~p", [Node, Event]),
+    State.
+
+
+%% System Monitor events
+%% We only *count* system events
+process_system_event(#{ev_cnt := Cnt, evs := Evs} = State,
+                     Node, Pid, TS, long_gc = Ev, Info) ->
+    print_system_event("Long GC", Node, Pid, TS, Info),
+    State#{ev_cnt => Cnt + 1, evs => [{Node, Ev} | Evs]};
+process_system_event(#{ev_cnt := Cnt, evs := Evs} = State,
+                     Node, Pid, TS, long_schedule = Ev, Info) ->
+    print_system_event("Long Schedule", Node, Pid, TS, Info),
+    State#{ev_cnt => Cnt + 1, evs => [{Node, Ev} | Evs]};
+process_system_event(#{ev_cnt := Cnt, evs := Evs} = State,
+                     Node, Pid, TS, large_heap = Ev, Info) ->
+    print_system_event("Large Heap", Node, Pid, TS, Info),
+    State#{ev_cnt => Cnt + 1, evs => [{Node, Ev} | Evs]};
+process_system_event(#{ev_cnt := Cnt, evs := Evs} = State,
+                     Node, Pid, TS, busy_port = Ev, Info) ->
+    print_system_event("Busy port", Node, Pid, TS, Info),
+    State#{ev_cnt => Cnt + 1, evs => [{Node, Ev} | Evs]};
+process_system_event(#{ev_cnt := Cnt, evs := Evs} = State,
+                     Node, Pid, TS, busy_dist_port = Ev, Info) ->
+    print_system_event("Busy dist port", Node, Pid, TS, Info),
+    State#{ev_cnt => Cnt + 1, evs => [{Node, Ev} | Evs]};
+
+%% And everything else
+process_system_event(State, Node, Pid, TS, Tag, Info) ->
+    Pre = f("Unknown Event '~p'", [Tag]),
+    print_system_event(Pre, Node, Pid, TS, Info),
+    State.
+
+
+print_system_event(Pre, Node, Pid, TS, Info) ->
+    FTS = snmp_misc:format_timestamp(TS),
+    warning_msg("~s from ~p (~p) at ~s:"
+                "~n   ~p", [Pre, Node, Pid, FTS, Info]).
+
+f(F, A) ->
+    lists:flatten(io_lib:format(F, A)).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+cast(Msg) ->
+    try global:send(?NAME, {?MODULE, Msg}) of
+        Pid when is_pid(Pid) ->
+            ok
+    catch
+        C:E:_ ->
+            {error, {catched, C, E}}
+    end.
+
+call(Req) ->
+    call(Req, infinity).
+
+call(Req, Timeout) ->
+    Ref = make_ref(),
+    try global:send(?NAME, {?MODULE, Ref, self(), Req}) of
+        Pid when is_pid(Pid) ->
+            receive
+                {?MODULE, Ref, Rep} ->
+                    Rep
+            after Timeout ->
+                    {error, timeout}
+            end
+    catch
+        C:E:_ ->
+            {error, {catched, C, E}}
+    end.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+info_msg(F, A) ->
+    error_logger:info_msg(format_msg(F, A), []).
+
+warning_msg(F, A) ->
+    error_logger:warning_msg(format_msg(F, A), []).
+
+                             
+format_msg(F, A) ->
+    f("~n" ++ 
+          "****** SNMP TEST GLOBAL SYSTEM MONITOR ******~n~n" ++ 
+          F ++ 
+          "~n~n",
+      A).
+   
diff --git a/lib/snmp/test/snmp_test_lib.erl b/lib/snmp/test/snmp_test_lib.erl
index 290f1bc31a..26b68501e2 100644
--- a/lib/snmp/test/snmp_test_lib.erl
+++ b/lib/snmp/test/snmp_test_lib.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2019. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -23,9 +23,12 @@
 -include_lib("kernel/include/file.hrl").
 
 
+-export([tc_try/2, tc_try/3]).
 -export([hostname/0, hostname/1, localhost/0, localhost/1, os_type/0, sz/1,
 	 display_suite_info/1]).
--export([non_pc_tc_maybe_skip/4, os_based_skip/1]).
+-export([non_pc_tc_maybe_skip/4, os_based_skip/1,
+         has_support_ipv6/0, has_support_ipv6/1,
+         is_ipv6_host/0, is_ipv6_host/1]).
 -export([fix_data_dir/1, 
 	 init_suite_top_dir/2, init_group_top_dir/2, init_testcase_top_dir/2, 
 	 lookup/2, 
@@ -34,17 +37,114 @@
 -export([hours/1, minutes/1, seconds/1, sleep/1]).
 -export([flush_mqueue/0, trap_exit/0, trap_exit/1]).
 -export([ping/1, local_nodes/0, nodes_on/1]).
--export([start_node/2]).
+-export([start_node/2, stop_node/1]).
 -export([is_app_running/1, 
 	 is_crypto_running/0, is_mnesia_running/0, is_snmp_running/0]).
 -export([crypto_start/0, crypto_support/0]).
 -export([watchdog/3, watchdog_start/1, watchdog_start/2, watchdog_stop/1]).
 -export([del_dir/1]).
 -export([cover/1]).
--export([p/2, print/5, formated_timestamp/0]).
+-export([f/2, p/2, print1/2, print2/2, print/5, formated_timestamp/0]).
 
 
 %% ----------------------------------------------------------------------
+%% Run test-case
+%%
+
+%% *** tc_try/2,3 ***
+%% Case:      Basically the test case name
+%% TCCondFun: A fun that is evaluated before the actual test case
+%%            The point of this is that it can performs checks to
+%%            see if we shall run the test case at all.
+%%            For instance, the test case may only work in specific
+%%            conditions.
+%% FCFun:     The test case fun
+tc_try(Case, TCFun) ->
+    tc_try(Case, fun() -> ok end, TCFun).
+                        
+tc_try(Case, TCCondFun, TCFun)
+  when is_atom(Case) andalso 
+       is_function(TCCondFun, 0) andalso 
+       is_function(TCFun, 0) ->
+    tc_begin(Case),
+    try TCCondFun() of
+        ok ->
+            try 
+                begin
+                    TCFun(),
+                    sleep(seconds(1)),
+                    tc_end("ok")
+                end
+            catch
+                C:{skip, _} = SKIP when ((C =:= throw) orelse (C =:= exit)) ->
+                    tc_end( f("skipping(catched,~w,tc)", [C]) ),
+                    SKIP;
+                C:E:S ->
+                    tc_end( f("failed(catched,~w,tc)", [C]) ),
+                    erlang:raise(C, E, S)
+            end;
+        {skip, _} = SKIP ->
+            tc_end("skipping(tc)"),
+            SKIP;
+        {error, Reason} ->
+            tc_end("failed(tc)"),
+            exit({tc_cond_failed, Reason})
+    catch
+        C:{skip, _} = SKIP when ((C =:= throw) orelse (C =:= exit)) ->
+            tc_end( f("skipping(catched,~w,cond)", [C]) ),
+            SKIP;
+        C:E:S ->
+            tc_end( f("failed(catched,~w,cond)", [C]) ),
+            erlang:raise(C, E, S)
+    end.
+
+
+tc_set_name(N) when is_atom(N) ->
+    tc_set_name(atom_to_list(N));
+tc_set_name(N) when is_list(N) ->
+    put(tc_name, N).
+
+tc_get_name() ->
+    get(tc_name).
+
+tc_begin(TC) ->
+    OldVal = process_flag(trap_exit, true),
+    put(old_trap_exit, OldVal),
+    tc_set_name(TC),
+    tc_print("begin ***",
+             "~n----------------------------------------------------~n", "").
+
+tc_end(Result) when is_list(Result) ->
+    OldVal = erase(old_trap_exit),
+    process_flag(trap_exit, OldVal),
+    tc_print("done: ~s", [Result], 
+             "", "----------------------------------------------------~n~n"),
+    ok.
+
+tc_print(F, Before, After) ->
+    tc_print(F, [], Before, After).
+
+tc_print(F, A, Before, After) ->
+    Name = tc_which_name(),
+    FStr = f("*** [~s][~s][~p] " ++ F ++ "~n", 
+             [formated_timestamp(),Name,self()|A]),
+    io:format(user, Before ++ FStr ++ After, []).
+
+tc_which_name() ->
+    case tc_get_name() of
+        undefined ->
+            case get(sname) of
+                undefined ->
+                    "";
+                SName when is_list(SName) ->
+                    SName
+            end;
+        Name when is_list(Name) ->
+            Name
+    end.
+    
+
+%% ----------------------------------------------------------------------
 %% Misc functions
 %%
 
@@ -52,18 +152,76 @@ hostname() ->
     hostname(node()).
 
 hostname(Node) ->
-    from($@, atom_to_list(Node)).
+    case string:tokens(atom_to_list(Node), [$@]) of
+        [_, Host] ->
+            Host;
+        _ ->
+            []
+    end.
 
-from(H, [H | T]) -> T;
-from(H, [_ | T]) -> from(H, T);
-from(_H, []) -> [].
+%% localhost() ->
+%%     {ok, Ip} = snmp_misc:ip(net_adm:localhost()),
+%%     Ip.
+%% localhost(Family) ->
+%%     {ok, Ip} = snmp_misc:ip(net_adm:localhost(), Family),
+%%     Ip.
 
 localhost() ->
-    {ok, Ip} = snmp_misc:ip(net_adm:localhost()),
-    Ip.
+    localhost(inet).
+
 localhost(Family) ->
-    {ok, Ip} = snmp_misc:ip(net_adm:localhost(), Family),
-    Ip.
+    case inet:getaddr(net_adm:localhost(), Family) of
+        {ok, {127, _, _, _}} when (Family =:= inet) ->
+            %% Ouch, we need to use something else
+            case inet:getifaddrs() of
+                {ok, IfList} ->
+                    which_addr(Family, IfList);
+                {error, Reason1} ->
+                    fail({getifaddrs, Reason1}, ?MODULE, ?LINE)
+            end;
+        {ok, {A1, _, _, _, _, _, _, _}} when (Family =:= inet6) andalso
+                                             ((A1 =:= 0) orelse
+                                              (A1 =:= 16#fe80)) ->
+            %% Ouch, we need to use something else
+            case inet:getifaddrs() of
+                {ok, IfList} ->
+                    which_addr(Family, IfList);
+                {error, Reason1} ->
+                    fail({getifaddrs, Reason1}, ?MODULE, ?LINE)
+            end;
+        {ok, Addr} ->
+            Addr;
+        {error, Reason2} ->
+            fail({getaddr, Reason2}, ?MODULE, ?LINE)
+    end.
+
+which_addr(_Family, []) ->
+    fail(no_valid_addr, ?MODULE, ?LINE);
+which_addr(Family, [{"lo", _} | IfList]) ->
+    which_addr(Family, IfList);
+which_addr(Family, [{"docker" ++ _, _} | IfList]) ->
+    which_addr(Family, IfList);
+which_addr(Family, [{"br-" ++ _, _} | IfList]) ->
+    which_addr(Family, IfList);
+which_addr(Family, [{_Name, IfOpts} | IfList]) ->
+    case which_addr2(Family, IfOpts) of
+        {ok, Addr} ->
+            Addr;
+        {error, _} ->
+            which_addr(Family, IfList)
+    end.
+
+which_addr2(_Family, []) ->
+    {error, not_found};
+which_addr2(Family, [{addr, Addr}|_]) 
+  when (Family =:= inet) andalso (size(Addr) =:= 4) ->
+    {ok, Addr};
+which_addr2(Family, [{addr, Addr}|_]) 
+  when (Family =:= inet6) andalso (size(Addr) =:= 8) ->
+    {ok, Addr};
+which_addr2(Family, [_|IfOpts]) ->
+    which_addr2(Family, IfOpts).
+
 
 sz(L) when is_list(L) ->
     length(L);
@@ -142,63 +300,121 @@ non_pc_tc_maybe_skip(Config, Condition, File, Line)
 		    %% test-server...
 		    ok;
 		_ ->
-		    case Condition() of
+		    try Condition() of
 			true ->
 			    skip(non_pc_testcase, File, Line);
 			false ->
 			    ok
+                    catch
+                        C:E:S ->
+                            skip({condition, C, E, S}, File, Line)
 		    end
 	    end
     end.
 
 
+%% The type and spec'ing is just to increase readability
+-type os_family()  :: win32 | unix.
+-type os_name()    :: atom().
+-type os_version() :: string() | {non_neg_integer(),
+				  non_neg_integer(),
+				  non_neg_integer()}.
+-type os_skip_check() :: fun(() -> boolean()) | 
+			    fun((os_version()) -> boolean()).
+-type skippable() :: any | [os_family() | 
+			    {os_family(), os_name() |
+			                  [os_name() | {os_name(), 
+							os_skip_check()}]}].
+
+-spec os_based_skip(skippable()) -> boolean().
+
 os_based_skip(any) ->
-    io:format("os_based_skip(any) -> entry"
-	      "~n", []), 
     true;
 os_based_skip(Skippable) when is_list(Skippable) ->
-    io:format("os_based_skip -> entry with"
-	      "~n   Skippable: ~p"
-	      "~n", [Skippable]), 
-    {OsFam, OsName} =
-        case os:type() of
-            {_Fam, _Name} = FamAndName ->
-                FamAndName;
-            Fam ->
-                {Fam, undefined}
-        end,
-    io:format("os_based_skip -> os-type: "
-	      "~n   OsFam: ~p"
-	      "~n   OsName: ~p"
-	      "~n", [OsFam, OsName]), 
+    os_base_skip(Skippable, os:type());
+os_based_skip(_Crap) ->
+    false.
+
+os_base_skip(Skippable, {OsFam, OsName}) ->
+    os_base_skip(Skippable, OsFam, OsName);
+os_base_skip(Skippable, OsFam) ->
+    os_base_skip(Skippable, OsFam, undefined).
+
+os_base_skip(Skippable, OsFam, OsName) -> 
+    %% Check if the entire family is to be skipped
+    %% Example: [win32, unix]
     case lists:member(OsFam, Skippable) of
         true ->
             true;
         false ->
-            case lists:keysearch(OsFam, 1, Skippable) of
-                {value, {OsFam, OsName}} ->
-                    true;
-                {value, {OsFam, OsNames}} when is_list(OsNames) ->
+	    %% Example: [{unix, freebsd}] | [{unix, [freebsd, darwin]}]
+	    case lists:keysearch(OsFam, 1, Skippable) of
+		{value, {OsFam, OsName}} ->
+		    true;
+		{value, {OsFam, OsNames}} when is_list(OsNames) ->
+		    %% OsNames is a list of: 
+		    %%    [atom()|{atom(), function/0 | function/1}]
                     case lists:member(OsName, OsNames) of
 			true ->
 			    true;
 			false ->
-			    case lists:keymember(OsName, 1, OsNames) of
-				{value, {OsName, Check}} when is_function(Check) ->
-				    Check();
-				_ ->
-				    false
-			    end
+			    os_based_skip_check(OsName, OsNames)
 		    end;
-                _ ->
-                    false
-            end
-    end;
-os_based_skip(_Crap) ->
-    io:format("os_based_skip -> entry with"
-	      "~n   _Crap: ~p"
-	      "~n", [_Crap]), 
-    false.
+		_ ->
+		    false
+	    end
+    end.
+
+%% Performs a check via a provided fun with arity 0 or 1.
+%% The argument is the result of os:version().
+os_based_skip_check(OsName, OsNames) ->
+    case lists:keysearch(OsName, 1, OsNames) of
+	{value, {OsName, Check}} when is_function(Check, 0) ->
+	    Check();
+	{value, {OsName, Check}} when is_function(Check, 1) ->
+	    Check(os:version());
+	_ ->
+	    false
+    end.
+
+
+%% A basic test to check if current host supports IPv6
+has_support_ipv6() ->
+    case inet:gethostname() of
+        {ok, Hostname} ->
+            has_support_ipv6(Hostname);
+        _ ->
+            false
+    end.
+
+has_support_ipv6(Hostname) ->
+    case inet:getaddr(Hostname, inet6) of
+        {ok, Addr} when (size(Addr) =:= 8) andalso
+                        (element(1, Addr) =/= 0) andalso
+                        (element(1, Addr) =/= 16#fe80) ->
+            true;
+        {ok, _} ->
+            false;
+        {error, _} ->
+            false
+    end.
+		
+
+is_ipv6_host() ->
+    case inet:gethostname() of
+        {ok, Hostname} ->
+            is_ipv6_host(Hostname);
+        {error, _} ->
+            false
+    end.
+
+is_ipv6_host(Hostname) ->
+    case ct:require(ipv6_hosts) of
+        ok ->
+            lists:member(list_to_atom(Hostname), ct:get_config(ipv6_hosts));
+        _ ->
+            false
+    end.
 
 
 %% ----------------------------------------------------------------
@@ -397,10 +613,14 @@ nodes_on(Host) when is_list(Host) ->
 
 
 start_node(Name, Args) ->
-    Opts = [{cleanup,false}, {args,Args}],
+    Opts = [{cleanup, false}, {args, Args}],
     test_server:start_node(Name, slave, Opts).
 
 
+stop_node(Node) ->
+    test_server:stop_node(Node).
+
+
 %% ----------------------------------------------------------------
 %% Application and Crypto utility functions
 %% 
@@ -593,6 +813,9 @@ cover([Suite, Case] = Args) when is_atom(Suite) andalso is_atom(Case) ->
 %% (debug) Print functions
 %%
 
+f(F, A) ->
+    lists:flatten(io_lib:format(F, A)).
+
 p(Mod, Case) when is_atom(Mod) andalso is_atom(Case) ->
     case get(test_case) of
 	undefined ->
@@ -605,19 +828,30 @@ p(Mod, Case) when is_atom(Mod) andalso is_atom(Case) ->
 p(F, A) when is_list(F) andalso is_list(A) ->
     io:format(user, F ++ "~n", A).
 
+%% This is just a bog standard printout, with a (formatted) timestamp
+%% prefix and a newline after.
+%% print1 - prints to both standard_io and user.
+%% print2 - prints to just standard_io.
+
+print_format(F, A) ->
+    FTS = snmp_test_lib:formated_timestamp(),
+    io_lib:format("[~s] " ++ F ++ "~n", [FTS | A]).
+
+print1(F, A) ->
+    S = print_format(F, A),
+    io:format("~s", [S]),
+    io:format(user, "~s", [S]).
+
+print2(F, A) ->
+    S = print_format(F, A),
+    io:format("~s", [S]).
+
+
 print(Prefix, Module, Line, Format, Args) ->
     io:format("*** [~s] ~s ~p ~p ~p:~p *** " ++ Format ++ "~n", 
 	      [formated_timestamp(), 
 	       Prefix, node(), self(), Module, Line|Args]).
 
 formated_timestamp() ->
-    format_timestamp(os:timestamp()).
-
-format_timestamp({_N1, _N2, N3} = Now) ->
-    {Date, Time}   = calendar:now_to_datetime(Now),
-    {YYYY,MM,DD}   = Date,
-    {Hour,Min,Sec} = Time,
-    FormatDate =
-        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w ~w",
-                      [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),
-    lists:flatten(FormatDate).
+    snmp_misc:formated_timestamp().
+
diff --git a/lib/snmp/test/snmp_test_lib.hrl b/lib/snmp/test/snmp_test_lib.hrl
index 7acebee1f1..f077f15d3e 100644
--- a/lib/snmp/test/snmp_test_lib.hrl
+++ b/lib/snmp/test/snmp_test_lib.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2019. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -18,15 +18,11 @@
 %% The Initial Developer of the Original Code is Ericsson AB.
 %% %CopyrightEnd%
 %%
+
 %%----------------------------------------------------------------------
-%% Purpose: Define common macros for testing
+%% Purpose: Define common macros for (the snmp) testing
 %%----------------------------------------------------------------------
 
-%% - (some of the) Macros stolen from the test server -
-
-%% -define(line,put(test_server_loc,{?MODULE,?LINE}),).
-
-
 %% - Misc macros -
 
 -ifndef(APPLICATION).
@@ -45,12 +41,18 @@
 
 
 %% - Test case macros - 
+-define(TC_TRY(C, TC),         snmp_test_lib:tc_try(C, TC)).
+-define(TC_TRY(C, TCCond, TC), snmp_test_lib:tc_try(C, TCCond, TC)).
 -define(OS_BASED_SKIP(Skippable),
         snmp_test_lib:os_based_skip(Skippable)).
 -define(NON_PC_TC_MAYBE_SKIP(Config, Condition),
         snmp_test_lib:non_pc_tc_maybe_skip(Config, Condition, ?MODULE, ?LINE)).
--define(SKIP(Reason),   snmp_test_lib:skip(Reason, ?MODULE, ?LINE)).
--define(FAIL(Reason),   snmp_test_lib:fail(Reason, ?MODULE, ?LINE)).
+-define(SKIP(Reason),        snmp_test_lib:skip(Reason, ?MODULE, ?LINE)).
+-define(FAIL(Reason),        snmp_test_lib:fail(Reason, ?MODULE, ?LINE)).
+-define(IS_IPV6_HOST(),      snmp_test_lib:is_ipv6_host()).
+-define(IS_IPV6_HOST(H),     snmp_test_lib:is_ipv6_host(H)).
+-define(HAS_SUPPORT_IPV6(),  snmp_test_lib:has_support_ipv6()).
+-define(HAS_SUPPORT_IPV6(H), snmp_test_lib:has_support_ipv6(H)).
 
 
 %% - Time macros -
@@ -88,6 +90,7 @@
 -define(LNODES(),           snmp_test_lib:local_nodes()).
 -define(NODES(H),           snmp_test_lib:nodes_on(H)).
 -define(START_NODE(N,A),    snmp_test_lib:start_node(N,A)).
+-define(STOP_NODE(N),       snmp_test_lib:stop_node(N)).
 
 
 %% - Application and Crypto utility macros - 
@@ -127,24 +130,33 @@
 -endif.
 
 -ifdef(snmp_debug).
--define(DBG(F,A),?PRINT("DBG",F,A)).
+-define(DBG(F,A), ?PRINT("DBG", F, A)).
 -else.
--define(DBG(F,A),ok).
+-define(DBG(F,A), ok).
 -endif.
 
 -ifdef(snmp_log).
--define(LOG(F,A),?PRINT("LOG",F,A)).
+-define(LOG(F,A), ?PRINT("LOG", F, A)).
 -else.
--define(LOG(F,A),ok).
+-define(LOG(F,A), ok).
 -endif.
 
 -ifdef(snmp_error).
--define(ERR(F,A),?PRINT("ERR",F,A)).
+-define(ERR(F,A), ?PRINT("ERR", F, A)).
 -else.
--define(ERR(F,A),ok).
+-define(ERR(F,A), ok).
 -endif.
 
--define(INF(F,A),?PRINT("INF",F,A)).
+-define(INF(F,A), ?PRINT("INF", F, A)).
 
 -define(PRINT(P,F,A),
-	snmp_test_lib:print(P,?MODULE,?LINE,F,A)).
+	snmp_test_lib:print(P, ?MODULE, ?LINE, F, A)).
+
+-define(PRINT1(F, A),  snmp_test_lib:print1(F, A)).
+-define(PRINT1(F),     ?PRINT1(F, [])).
+-define(EPRINT1(F, A), ?PRINT1("<ERROR> " ++ F, A)).
+
+-define(PRINT2(F, A),  snmp_test_lib:print2(F, A)).
+-define(PRINT2(F),     ?PRINT2(F, [])).
+-define(EPRINT2(F, A), ?PRINT2("<ERROR> " ++ F, A)).
+
diff --git a/lib/snmp/test/snmp_test_mgr.erl b/lib/snmp/test/snmp_test_mgr.erl
index 36637d5cf4..9d6be65088 100644
--- a/lib/snmp/test/snmp_test_mgr.erl
+++ b/lib/snmp/test/snmp_test_mgr.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -20,8 +20,10 @@
 
 -module(snmp_test_mgr).
 
+
 %%----------------------------------------------------------------------
-%% This module implements a simple SNMP manager for Erlang.
+%% This module implements a simple SNMP manager for Erlang. Its used
+%% during by the agent test suite.
 %%----------------------------------------------------------------------
 
 %% c(snmp_test_mgr).
@@ -49,16 +51,18 @@
 
 -include_lib("snmp/include/snmp_types.hrl").
 -include_lib("snmp/include/STANDARD-MIB.hrl").
-
--record(state,{dbg         = true,
-	       quiet,
-	       parent,
-	       timeout     = 3500,
-	       print_traps = true,
-	       mini_mib,
-	       packet_server, 
-	       last_sent_pdu, 
-	       last_received_pdu}).
+-include("snmp_test_lib.hrl").
+-include_lib("snmp/src/app/snmp_internal.hrl").
+
+-record(state, {dbg         = true,
+                quiet,
+                parent,
+                timeout     = 3500,
+                print_traps = true,
+                mini_mib,
+                packet_server, 
+                last_sent_pdu, 
+                last_received_pdu}).
 
 -define(SERVER, ?MODULE).
 -define(PACK_SERV, snmp_test_mgr_misc).
@@ -189,35 +193,38 @@ receive_trap(Timeout) ->
 init({Options, CallerPid}) ->
     put(sname,     mgr),
     put(verbosity, debug), 
-    random:seed(erlang:phash2([node()]),
-                erlang:monotonic_time(),
-                erlang:unique_integer()),
+    ?SNMP_RAND_SEED(),
+    %% rand:seed(exrop,
+    %%           {erlang:phash2([node()]),
+    %%            erlang:monotonic_time(),
+    %%            erlang:unique_integer()}),
     case (catch is_options_ok(Options)) of
 	true ->
 	    put(debug, get_value(debug, Options, false)),
 	    d("init -> (~p) extract options",[self()]),
  	    PacksDbg    = get_value(packet_server_debug, Options, false),
-	    io:format("[~w] ~p -> PacksDbg: ~p~n", [?MODULE, self(), PacksDbg]),
+	    print("[~w] ~p -> PacksDbg: ~p~n", [?MODULE, self(), PacksDbg]),
 	    RecBufSz    = get_value(recbuf,            Options, 1024),
-	    io:format("[~w] ~p -> RecBufSz: ~p~n", [?MODULE, self(), RecBufSz]),
+	    print("[~w] ~p -> RecBufSz: ~p~n", [?MODULE, self(), RecBufSz]),
 	    Mibs        = get_value(mibs,              Options, []),
-	    io:format("[~w] ~p -> Mibs: ~p~n", [?MODULE, self(), Mibs]),
+	    print("[~w] ~p -> Mibs: ~p~n", [?MODULE, self(), Mibs]),
 	    Udp         = get_value(agent_udp,         Options, 4000),
-	    io:format("[~w] ~p -> Udp: ~p~n", [?MODULE, self(), Udp]),
+	    print("[~w] ~p -> Udp: ~p~n", [?MODULE, self(), Udp]),
 	    User        = get_value(user,              Options, "initial"),
-	    io:format("[~w] ~p -> User: ~p~n", [?MODULE, self(), User]),
+	    print("[~w] ~p -> User: ~p~n", [?MODULE, self(), User]),
 	    EngineId    = get_value(engine_id,         Options, "agentEngine"),
-	    io:format("[~w] ~p -> EngineId: ~p~n", [?MODULE, self(), EngineId]),
+	    print("[~w] ~p -> EngineId: ~p~n", [?MODULE, self(), EngineId]),
 	    CtxEngineId = get_value(context_engine_id, Options, EngineId),
-	    io:format("[~w] ~p -> CtxEngineId: ~p~n", [?MODULE, self(), CtxEngineId]),
+	    print("[~w] ~p -> CtxEngineId: ~p~n", [?MODULE, self(), CtxEngineId]),
 	    TrapUdp     = get_value(trap_udp,          Options, 5000),
-	    io:format("[~w] ~p -> TrapUdp: ~p~n", [?MODULE, self(), TrapUdp]),
+	    print("[~w] ~p -> TrapUdp: ~p~n", [?MODULE, self(), TrapUdp]),
 	    Dir         = get_value(dir,               Options, "."),
-	    io:format("[~w] ~p -> Dir: ~p~n", [?MODULE, self(), Dir]),
+	    print("[~w] ~p -> Dir: ~p~n", [?MODULE, self(), Dir]),
 	    SecLevel    = get_value(sec_level,         Options, noAuthNoPriv),
-	    io:format("[~w] ~p -> SecLevel: ~p~n", [?MODULE, self(), SecLevel]),
+	    print("[~w] ~p -> SecLevel: ~p~n", [?MODULE, self(), SecLevel]),
 	    MiniMIB     = snmp_mini_mib:create(Mibs),
-	    io:format("[~w] ~p -> MiniMIB: ~p~n", [?MODULE, self(), MiniMIB]),
+	    d("[~w] ~p -> MiniMIB: "
+              "~n   ~p", [?MODULE, self(), MiniMIB]),
 	    Version     = case lists:member(v2, Options) of
 			      true -> 'version-2';
 			      false -> 
@@ -226,30 +233,41 @@ init({Options, CallerPid}) ->
 				      false -> 'version-1'
 				  end
 			  end,
-	    io:format("[~w] ~p -> Version: ~p~n", [?MODULE, self(), Version]),
+	    print("[~w] ~p -> Version: ~p~n", [?MODULE, self(), Version]),
 	    Com = case Version of
 		      'version-3' ->
 			  get_value(context, Options, "");
 		      _ ->
 			  get_value(community, Options, "public")
 		  end,
-	    io:format("[~w] ~p -> Com: ~p~n", [?MODULE, self(), Com]),
+	    print("[~w] ~p -> Com: ~p~n", [?MODULE, self(), Com]),
 	    VsnHdrD = 
 		{Com, User, EngineId, CtxEngineId, mk_seclevel(SecLevel)},
-	    io:format("[~w] ~p -> VsnHdrD: ~p~n", [?MODULE, self(), VsnHdrD]),
+	    print("[~w] ~p -> VsnHdrD: ~p~n", [?MODULE, self(), VsnHdrD]),
 	    IpFamily = get_value(ipfamily, Options, inet),
-	    io:format("[~w] ~p -> IpFamily: ~p~n", [?MODULE, self(), IpFamily]),
+	    print("[~w] ~p -> IpFamily: ~p~n", [?MODULE, self(), IpFamily]),
 	    AgIp = case snmp_misc:assq(agent, Options) of
-		       {value, Tuple4} when is_tuple(Tuple4) andalso 
-					    (size(Tuple4) =:= 4) ->
-			   Tuple4;
+		       {value, Addr} when is_tuple(Addr) andalso 
+                                          (size(Addr) =:= 4) andalso
+                                          (IpFamily =:= inet) ->
+                           print("[~w] ~p -> Addr: ~p~n",
+                                 [?MODULE, self(), Addr]),
+			   Addr;
+		       {value, Addr} when is_tuple(Addr) andalso 
+                                          (size(Addr) =:= 8) andalso
+                                          (IpFamily =:= inet6) ->
+                           print("[~w] ~p -> Addr: ~p~n",
+                                 [?MODULE, self(), Addr]),
+			   Addr;
 		       {value, Host} when is_list(Host) ->
+                           print("[~w] ~p -> Host: ~p~n",
+                                 [?MODULE, self(), Host]),
 			   {ok, Ip} = snmp_misc:ip(Host, IpFamily),
 			   Ip
 		   end,
-	    io:format("[~w] ~p -> AgIp: ~p~n", [?MODULE, self(), AgIp]),
+	    print("[~w] ~p -> AgIp: ~p~n", [?MODULE, self(), AgIp]),
 	    Quiet = lists:member(quiet, Options),
-	    io:format("[~w] ~p -> Quiet: ~p~n", [?MODULE, self(), Quiet]),
+	    print("[~w] ~p -> Quiet: ~p~n", [?MODULE, self(), Quiet]),
 	    PackServ =
 		start_packet_server(
 		  Quiet, Options, CallerPid, AgIp, Udp, TrapUdp,
@@ -443,7 +461,8 @@ handle_cast({bulk, Args}, State) ->
     {noreply, execute_request(bulk, Args, State)};
 
 handle_cast({response, RespPdu}, State) ->
-    d("handle_cast -> response request with ~p", [RespPdu]),
+    d("handle_cast -> response request with "
+      "~n   ~p", [RespPdu]),
     ?PACK_SERV:send_pdu(RespPdu, State#state.packet_server),
     {noreply, State};
 
@@ -663,7 +682,6 @@ make_vb(Oid) ->
     #varbind{oid = Oid, variabletype = 'NULL', value = 'NULL'}.
 
 make_request_id() ->
-    %% random:uniform(16#FFFFFFF-1).
     snmp_test_mgr_counter_server:increment(mgr_request_id, 1, 1, 2147483647).
 
 echo_pdu(PDU, MiniMIB) ->
@@ -1126,14 +1144,15 @@ sizeOf(L) when is_list(L) ->
 sizeOf(B) when is_binary(B) ->
     size(B).
 
-d(F,A) -> d(get(debug),F,A).
+d(F, A) -> d(get(debug), F, A).
 
-d(true,F,A) ->
-    io:format("*** [~s] MGR_DBG *** " ++ F ++ "~n",
-	      [formated_timestamp()|A]);
+d(true, F, A) ->
+    print(F, A);
 d(_,_F,_A) -> 
     ok.
 
+print(F, A) ->
+    ?PRINT2("MGR " ++ F, A).
 
-formated_timestamp() ->
-    snmp_test_lib:formated_timestamp().
+%% formated_timestamp() ->
+%%     snmp_test_lib:formated_timestamp().
diff --git a/lib/snmp/test/snmp_test_mgr_misc.erl b/lib/snmp/test/snmp_test_mgr_misc.erl
index 274fb5be26..6608a88c00 100644
--- a/lib/snmp/test/snmp_test_mgr_misc.erl
+++ b/lib/snmp/test/snmp_test_mgr_misc.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. 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,11 +38,14 @@
 
 -define(SNMP_USE_V3, true).
 -include_lib("snmp/include/snmp_types.hrl").
+-include_lib("snmp/src/misc/snmp_verbosity.hrl").
+-include("snmp_test_lib.hrl").
 
 
 %%----------------------------------------------------------------------
 %% The InHandler process will receive messages on the form {snmp_pdu, Pdu}.
 %%----------------------------------------------------------------------
+
 start_link_packet(
   InHandler, AgentIp, UdpPort, TrapUdp, VsnHdr, Version, Dir, BufSz) ->
     start_link_packet(
@@ -101,11 +104,11 @@ init_packet(
   DbgOptions, IpFamily) ->
     put(sname, mgr_misc),
     init_debug(DbgOptions),
-    {ok, UdpId} =
-	gen_udp:open(TrapUdp, [{recbuf,BufSz}, {reuseaddr, true}, IpFamily]),
+    UdpOpts     = [{recbuf,BufSz}, {reuseaddr, true}, IpFamily],
+    {ok, UdpId} = gen_udp:open(TrapUdp, UdpOpts),
     put(msg_id, 1),
-    proc_lib:init_ack(Parent, self()),
     init_usm(Version, Dir),
+    proc_lib:init_ack(Parent, self()),
     packet_loop(SnmpMgr, UdpId, AgentIp, UdpPort, VsnHdr, Version, []).
 
 init_debug(Dbg) when is_atom(Dbg) ->
@@ -200,86 +203,24 @@ packet_loop(SnmpMgr, UdpId, AgentIp, UdpPort, VsnHdr, Version, MsgData) ->
 handle_udp_packet(_V, undefined, 
 		  UdpId, Ip, UdpPort,
 		  Bytes, SnmpMgr, AgentIp) ->
-    M = (catch snmp_pdus:dec_message_only(Bytes)),
-    MsgData3 =
-	case M of
-	    Message when Message#message.version =:= 'version-3' ->
-		d("handle_udp_packet -> version 3"),
-		case catch handle_v3_msg(Bytes, Message) of
-		    {ok, NewData, MsgData2} ->
-			Msg = Message#message{data = NewData},
-			case SnmpMgr of
-			    {pdu, Pid} ->
-				Pdu = get_pdu(Msg), 
-				d("packet_loop -> "
-				  "send pdu to manager (~w): ~p", [Pid, Pdu]),
-				Pid ! {snmp_pdu, Pdu};
-			    {msg, Pid} ->
-				d("packet_loop -> "
-				  "send msg to manager (~w): ~p", [Pid, Msg]),
-				Pid ! {snmp_msg, Msg, Ip, UdpPort}
-			end,
-			MsgData2;
-		    {error, Reason, B} ->
-			udp_send(UdpId, AgentIp, UdpPort, B),
-			error("Decoding error. Auto-sending Report.\n"
-			      "Reason: ~w "
-			      "(UDPport: ~w, Ip: ~w)",
-			      [Reason, UdpPort, Ip]),
-			[];
-		    {error, Reason} ->
-			error("Decoding error. "
-				      "Bytes: ~w ~n Reason: ~w "
-			      "(UDPport: ~w, Ip: ~w)",
-			      [Bytes, Reason, UdpPort, Ip]),
-			[]
-		end;
-	    Message when is_record(Message, message) ->
-		%% v1 or v2c
-		d("handle_udp_packet -> version v1 or v2c"),
-		case catch snmp_pdus:dec_pdu(Message#message.data) of
-		    Pdu when is_record(Pdu, pdu) ->
-			case SnmpMgr of
-			    {pdu, Pid} ->
-				d("handle_udp_packet -> "
-				  "send pdu to manager (~w): ~p", 
-				  [Pid, Pdu]),
-				Pid ! {snmp_pdu, Pdu};
-			    {msg, Pid} ->
-				d("handle_udp_packet -> "
-				  "send pdu-msg to manager (~w):  ~p", 
-				  [Pid, Pdu]),
-				Msg = Message#message{data = Pdu},
-				Pid ! {snmp_msg, Msg, Ip, UdpPort}
-			end;
-		    Pdu when is_record(Pdu, trappdu) ->
-			case SnmpMgr of
-			    {pdu, Pid} ->
-				d("handle_udp_packet -> "
-				  "send trap to manager (~w): ~p", 
-				  [Pid, Pdu]),
-				Pid ! {snmp_pdu, Pdu};
-			    {msg, Pid} ->
-				d("handle_udp_packet -> "
-				  "send trap-msg to manager (~w): ~p", 
-				  [Pid, Pdu]),
-				Msg = Message#message{data = Pdu},
-				Pid ! {snmp_msg, Msg, Ip, UdpPort}
-			end;
-		    Reason ->
-			error("Decoding error. "
-			      "Bytes: ~w ~n Reason: ~w "
-			      "(UDPport: ~w, Ip: ~w)",
-			      [Bytes, Reason, UdpPort, Ip])
-		end,
-		[];
-	    Reason ->
-		error("Decoding error. Bytes: ~w ~n Reason: ~w "
-		      "(UDPport: ~w, Ip: ~w)",
-		      [Bytes, Reason, UdpPort, Ip]),
-		[]
-	end,
-    MsgData3;
+    try snmp_pdus:dec_message_only(Bytes) of
+        Message when Message#message.version =:= 'version-3' ->
+            d("handle_udp_packet -> version 3"),
+            handle_v3_message(SnmpMgr, UdpId, Ip, UdpPort, AgentIp,
+                              Bytes, Message);
+
+        Message when is_record(Message, message) ->
+            d("handle_udp_packet -> version 1 or 2"),
+            handle_v1_or_v2_message(SnmpMgr, UdpId, Ip, UdpPort, AgentIp,
+                                    Bytes, Message)
+
+    catch
+        Class:Error:_ ->
+            error("Decoding error (~w). Bytes: ~w ~n Error: ~w "
+                  "(UDPport: ~w, Ip: ~w)",
+                  [Class, Bytes, Error, UdpPort, Ip]),
+            []
+    end;
 handle_udp_packet(V, {DiscoReqMsg, From}, _UdpId, _Ip, _UdpPort, 
 		  Bytes, _, _AgentIp) ->
     DiscoRspMsg = (catch snmp_pdus:dec_message(Bytes)),
@@ -297,6 +238,88 @@ handle_udp_packet(V, {DiscoReqMsg, From}, _UdpId, _Ip, _UdpPort,
 	    []
     end.
 
+handle_v3_message(Mgr, UdpId, Ip, UdpPort, AgentIp,
+                  Bytes, Message) ->
+    try handle_v3_msg(Bytes, Message) of
+        {ok, NewData, MsgData} ->
+            Msg = Message#message{data = NewData},
+            case Mgr of
+                {pdu, Pid} ->
+                    Pdu = get_pdu(Msg), 
+                    d("handle_v3_message -> send pdu to manager (~p): "
+                      "~n   ~p", [Pid, Pdu]),
+                    Pid ! {snmp_pdu, Pdu};
+                {msg, Pid} ->
+                    d("handle_v3_message -> send msg to manager (~p): "
+                      "~n   ~p", [Pid, Msg]),
+                    Pid ! {snmp_msg, Msg, Ip, UdpPort}
+            end,
+            MsgData
+
+        catch
+            throw:{error, Reason, B}:_ ->
+                udp_send(UdpId, AgentIp, UdpPort, B),
+                error("Decoding (v3) error. Auto-sending Report.\n"
+                      "~n   Reason: ~w "
+                      "(UDPport: ~w, Ip: ~w)",
+                      [Reason, UdpPort, Ip]),
+                [];
+
+            throw:{error, Reason}:_ ->
+                error("Decoding (v3) error. "
+                      "~n   Bytes: ~w"
+                      "~n   Reason: ~w "
+                      "(UDPport: ~w, Ip: ~w)",
+                      [Bytes, Reason, UdpPort, Ip]),
+                [];
+
+            Class:Error:_ ->
+                error("Decoding (v3) error (~w). "
+                      "~n   Bytes: ~w"
+                      "~n   Error: ~w "
+                      "(UDPport: ~w, Ip: ~w)",
+                      [Class, Bytes, Error, UdpPort, Ip]),
+                []
+
+    end.
+
+handle_v1_or_v2_message(Mgr, _UdpId, Ip, UdpPort, _AgentIp,
+                        Bytes, Message) ->
+    try snmp_pdus:dec_pdu(Message#message.data) of
+        Pdu when is_record(Pdu, pdu) ->
+            case Mgr of
+                {pdu, Pid} ->
+                    d("handle_v1_or_v2_message -> send pdu to manager (~p): "
+                      "~n   ~p", [Pid, Pdu]),
+                    Pid ! {snmp_pdu, Pdu};
+                {msg, Pid} ->
+                    d("handle_v1_or_v2_message -> send msg to manager (~p): "
+                      "~n   ~p", [Pid, Pdu]),
+                    Msg = Message#message{data = Pdu},
+                    Pid ! {snmp_msg, Msg, Ip, UdpPort}
+            end;
+        Pdu when is_record(Pdu, trappdu) ->
+            case Mgr of
+                {pdu, Pid} ->
+                    d("handle_v1_or_v2_message -> send trap-pdu to manager (~p): "
+                      "~n   ~p", [Pid, Pdu]),
+                    Pid ! {snmp_pdu, Pdu};
+                {msg, Pid} ->
+                    d("handle_v1_or_v2_message -> send trap-msg to manager (~p): "
+                      "~n   ~p", [Pid, Pdu]),
+                    Msg = Message#message{data = Pdu},
+                    Pid ! {snmp_msg, Msg, Ip, UdpPort}
+            end
+
+    catch
+        Class:Error:_ ->
+            error("Decoding (v1 or v2) error (~w): "
+                  "~n   Bytes: ~w"
+                  "~n   Error: ~w "
+                  "(UDPport: ~w, Ip: ~w)",
+                  [Class, Bytes, Error, UdpPort, Ip])
+    end.
+
 
 %% This function assumes that the agent and the manager (thats us) 
 %% has the same version.
@@ -553,6 +576,7 @@ vsn('version-2') -> v2c.
 
 
 udp_send(UdpId, AgentIp, UdpPort, B) ->
+    ?vlog("attempt send message (~w bytes) to ~p", [sz(B), {AgentIp, UdpPort}]),
     case (catch gen_udp:send(UdpId, AgentIp, UdpPort, B)) of
 	{error,ErrorReason} ->
 	    error("failed (error) sending message to ~p:~p: "
@@ -578,18 +602,100 @@ set_pdu(Msg, RePdu) ->
 
 
 init_usm('version-3', Dir) ->
+    ?vlog("init_usm -> create (and init) fake \"agent\" table", []),
     ets:new(snmp_agent_table, [set, public, named_table]),
     ets:insert(snmp_agent_table, {agent_mib_storage, persistent}),
-    snmpa_local_db:start_link(normal, Dir, [{verbosity,trace}]),
+    %% The local-db process may *still* be running (from a previous
+    %% test case), on the way down, but not yet dead.
+    %% Either way, before we start it, make sure its dead and *gone*!
+    %% How do we do that without getting hung up? Calling the stop
+    %% function, will not do since it uses Timeout=infinity.
+    ?vlog("init_usm -> ensure (old) fake local-db is dead", []),
+    ensure_local_db_dead(),
+    ?vlog("init_usm -> try start fake local-db", []),
+    case snmpa_local_db:start_link(normal, Dir,
+                                   [{sname,     "MGR-LOCAL-DB"},
+                                    {verbosity, trace}]) of
+        {ok, Pid} ->
+            ?vlog("started: ~p"
+                  "~n      ~p", [Pid, process_info(Pid)]);
+        {error, {already_started, Pid}} ->
+            LDBInfo = process_info(Pid),
+            ?vlog("already started: ~p"
+                  "~n      ~p", [Pid, LDBInfo]),
+            ?FAIL({still_running, snmpa_local_db, LDBInfo});
+        {error, Reason} ->
+            ?FAIL({failed_starting, snmpa_local_db, Reason})
+    end,
     NameDb = snmpa_agent:db(snmpEngineID),
+    ?vlog("init_usm -> try set manager engine-id", []),
     R = snmp_generic:variable_set(NameDb, "mgrEngine"),
-    io:format("~w:init_usm -> engine-id set result: ~p~n", [?MODULE,R]),
+    snmp_verbosity:print(info, info, "init_usm -> engine-id set result: ~p", [R]),
+    ?vlog("init_usm -> try set engine boots (framework-mib)", []),
     snmp_framework_mib:set_engine_boots(1),
+    ?vlog("init_usm -> try set engine time (framework-mib)", []),
     snmp_framework_mib:set_engine_time(1),
-    snmp_user_based_sm_mib:reconfigure(Dir);
+    ?vlog("init_usm -> try usm (mib) reconfigure", []),
+    snmp_user_based_sm_mib:reconfigure(Dir),
+    ?vlog("init_usm -> done", []),
+    ok;
 init_usm(_Vsn, _Dir) ->
     ok.
 
+ensure_local_db_dead() ->
+    ensure_dead(whereis(snmpa_local_db), 2000).
+
+ensure_dead(Pid, Timeout) when is_pid(Pid) ->
+    MRef = erlang:monitor(process, Pid),
+    try
+        begin
+            ensure_dead_wait(Pid, MRef, Timeout),
+            ensure_dead_stop(Pid, MRef, Timeout),
+            ensure_dead_kill(Pid, MRef, Timeout),
+            exit(failed_stop_local_db)
+        end
+    catch
+        throw:ok ->
+            ok
+    end;
+ensure_dead(_, _) ->
+    ?vlog("ensure_dead -> already dead", []),
+    ok.
+
+ensure_dead_wait(Pid, MRef, Timeout) ->
+    receive
+        {'DOWN', MRef, process, Pid, _Info} ->
+            ?vlog("ensure_dead_wait -> died peacefully", []),
+            throw(ok)
+    after Timeout ->
+            ?vlog("ensure_dead_wait -> giving up", []),
+            ok
+    end.
+
+ensure_dead_stop(Pid, MRef, Timeout) ->
+    StopPid = spawn(fun() -> snmpa_local_db:stop() end),
+    receive
+        {'DOWN', MRef, process, Pid, _Info} ->
+            ?vlog("ensure_dead -> dead (stopped)", []),
+            throw(ok)
+    after Timeout ->
+            ?vlog("ensure_dead_stop -> giving up", []),
+            exit(StopPid, kill),
+            ok
+    end.
+
+ensure_dead_kill(Pid, MRef, Timeout) ->
+    exit(Pid, kill),
+    receive
+        {'DOWN', MRef, process, Pid, _Info} ->
+            ?vlog("ensure_dead -> dead (killed)", []),
+            throw(ok)
+    after Timeout ->
+            ?vlog("ensure_dead_kill -> giving up", []),
+            ok
+    end.
+
+
 
 display_incomming_message(M) ->
     display_message("Incomming",M).
@@ -775,20 +881,20 @@ display_prop_hdr(S) ->
 %%----------------------------------------------------------------------
 
 sz(L) when is_list(L) ->
-    length(lists:flatten(L));
+    iolist_size(L);
 sz(B) when is_binary(B) ->
     size(B);
 sz(O) ->
     {unknown_size, O}.
 
 d(F)   -> d(F, []).
-d(F,A) -> d(get(debug),F,A).
+d(F,A) -> d(get(debug), F, A).
 
-d(true,F,A) ->
-    io:format("*** [~s] MGR_PS_DBG *** " ++ F ++ "~n",
-	      [formated_timestamp()|A]);
+d(true, F, A) ->
+    print(F, A);
 d(_,_F,_A) -> 
     ok.
 
-formated_timestamp() ->
-    snmp_test_lib:formated_timestamp().
+print(F, A) ->
+    ?PRINT2("MGR_PS " ++ F, A).
+
diff --git a/lib/snmp/test/snmp_test_server.erl b/lib/snmp/test/snmp_test_server.erl
index a77bdc142c..ab7dbbbaa0 100644
--- a/lib/snmp/test/snmp_test_server.erl
+++ b/lib/snmp/test/snmp_test_server.erl
@@ -207,7 +207,7 @@ do_subcases(Mod, Fun, [{conf, Init, Cases, Finish}|SubCases], Config, Acc)
 		[{failed, {Mod, Fun}, Error}]
 	end,
     do_subcases(Mod, Fun, SubCases, Config, [R|Acc]);
-do_subcases(Mod, Fun, [SubCase|SubCases], Config, Acc) when atom(SubCase) ->
+do_subcases(Mod, Fun, [SubCase|SubCases], Config, Acc) when is_atom(SubCase) ->
     R = do_case(Mod, SubCase, Config),
     do_subcases(Mod, Fun, SubCases,Config, [R|Acc]).
 
@@ -407,7 +407,7 @@ d(_, _, _, _) ->
     ok.
 
 timestamp() ->
-    {Date, Time}     = calendar:now_to_datetime( now() ),
+    {Date, Time}     = calendar:now_to_datetime( erlang:timestamp() ),
     {YYYY, MM, DD}   = Date,
     {Hour, Min, Sec} = Time,
     FormatDate =
diff --git a/lib/snmp/test/snmp_test_sys_monitor.erl b/lib/snmp/test/snmp_test_sys_monitor.erl
new file mode 100644
index 0000000000..2291c6ca97
--- /dev/null
+++ b/lib/snmp/test/snmp_test_sys_monitor.erl
@@ -0,0 +1,86 @@
+%% 
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2019-2019. 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(snmp_test_sys_monitor).
+
+-export([start/0, stop/0,
+         init/1]).
+
+-define(NAME, ?MODULE).
+-define(GSM,  snmp_test_global_sys_monitor).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+start() ->
+    Parent = self(),
+    proc_lib:start(?MODULE, init, [Parent]).
+
+stop() ->
+    case whereis(?NAME) of
+        Pid when is_pid(Pid) ->
+            Pid ! {?MODULE, stop},
+            ok;
+        _ ->
+            ok
+    end.
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+init(Parent) ->
+    process_flag(priority, high),
+    try register(?NAME, self()) of
+        true ->
+            global:sync(),
+            MonSettings = [
+                           busy_port,
+                           busy_dist_port,
+                           {long_gc, 1000},
+                           {long_schedule, 1000},
+                           {large_heap, 8*1024*1024} % 8 MB
+                          ],
+            erlang:system_monitor(self(), MonSettings),
+            ?GSM:log({erlang:timestamp(), starting}),
+            proc_lib:init_ack(Parent, {ok, self()}),
+            loop(#{parent => Parent})
+    catch
+        _:_:_ ->
+            ?GSM:log({erlang:timestamp(), already_started}),
+            proc_lib:init_ack(Parent, {error, already_started}),
+            exit(normal)
+    end.
+    
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+loop(State) ->
+    receive
+        {monitor, Pid, Tag, Info} ->
+            ?GSM:log({Pid, erlang:timestamp(), Tag, Info}),
+            loop(State);
+
+        _ ->
+            loop(State)
+    end.
+
+
+
diff --git a/lib/snmp/test/snmp_to_snmpnet_SUITE.erl b/lib/snmp/test/snmp_to_snmpnet_SUITE.erl
index b83c7461d1..b8bdb30271 100644
--- a/lib/snmp/test/snmp_to_snmpnet_SUITE.erl
+++ b/lib/snmp/test/snmp_to_snmpnet_SUITE.erl
@@ -247,9 +247,17 @@ erlang_agent_netsnmp_get(Config) when is_list(Config) ->
     start_agent(Config),
     Oid = ?sysDescr_instance,
     Expected = expected(Oid, get),
-    [Expected = snmpget(Oid, Transport, Config)
-     || Transport <- Transports],
-    ok.
+    try
+        begin
+            [Expected = snmpget(Oid, Transport, Config)
+             || Transport <- Transports],
+            ok
+        end
+    catch
+        throw:{skip, _} = SKIP ->
+            SKIP
+    end.
+
 
 %%--------------------------------------------------------------------
 erlang_manager_netsnmp_get() ->
@@ -260,29 +268,34 @@ erlang_manager_netsnmp_get(Config) when is_list(Config) ->
     SysDescr = "Net-SNMP agent",
     TargetName = "Target Net-SNMP agent",
     Transports = ?config(transports, Config),
-    ProgHandle = start_snmpd(Community, SysDescr, Config),
-    start_manager(Config),
-    snmp_manager_user:start_link(self(), test_user),
-    [snmp_manager_user:register_agent(
-       TargetName++domain_suffix(Domain),
-       [{reg_type, target_name},
-	{tdomain, Domain}, {taddress, Addr},
-	{community, Community}, {engine_id, "EngineId"},
-	{version, v2}, {sec_model, v2c}, {sec_level, noAuthNoPriv}])
-     || {Domain, Addr} <- Transports],
-    Results =
-	[snmp_manager_user:sync_get(
-	   TargetName++domain_suffix(Domain),
-	   [?sysDescr_instance])
-	 || {Domain, _} <- Transports],
-    ct:pal("sync_get -> ~p", [Results]),
-    snmp_manager_user:stop(),
-    stop_program(ProgHandle),
-    [{ok,
-      {noError, 0,
-       [{varbind, ?sysDescr_instance, 'OCTET STRING', SysDescr,1}] },
-      _} = R || R <- Results],
-    ok.
+    case start_snmpd(Community, SysDescr, Config) of
+        {skip, _} = SKIP ->
+            SKIP;
+        ProgHandle ->
+            start_manager(Config),
+            snmp_manager_user:start_link(self(), test_user),
+            [snmp_manager_user:register_agent(
+               TargetName++domain_suffix(Domain),
+               [{reg_type, target_name},
+                {tdomain, Domain}, {taddress, Addr},
+                {community, Community}, {engine_id, "EngineId"},
+                {version, v2}, {sec_model, v2c}, {sec_level, noAuthNoPriv}])
+             || {Domain, Addr} <- Transports],
+            Results =
+                [snmp_manager_user:sync_get(
+                   TargetName++domain_suffix(Domain),
+                   [?sysDescr_instance])
+                 || {Domain, _} <- Transports],
+            ct:pal("sync_get -> ~p", [Results]),
+            snmp_manager_user:stop(),
+            stop_program(ProgHandle),
+            [{ok,
+              {noError, 0,
+               [{varbind, ?sysDescr_instance, 'OCTET STRING', SysDescr,1}] },
+              _} = R || R <- Results],
+            ok
+    end.
+
 
 %%--------------------------------------------------------------------
 erlang_agent_netsnmp_inform(Config) when is_list(Config) ->
@@ -292,17 +305,19 @@ erlang_agent_netsnmp_inform(Config) when is_list(Config) ->
     start_agent(Config),
     ok = snmpa:load_mib(snmp_master_agent, filename:join(DataDir, Mib)),
 
-    ProgHandle = start_snmptrapd(Mib, Config),
-
-    snmpa:send_notification(
-      snmp_master_agent, testTrapv22, {erlang_agent_test, self()}),
-
-    receive
-	{snmp_targets, erlang_agent_test, Addresses} ->
-	    ct:pal("Notification sent to: ~p~n", [Addresses]),
-	    erlang_agent_netsnmp_inform_responses(Addresses)
-    end,
-    stop_program(ProgHandle).
+    case start_snmptrapd(Mib, Config) of
+        {skip, _} = SKIP ->
+            SKIP;
+        ProgHandle ->
+            snmpa:send_notification(
+              snmp_master_agent, testTrapv22, {erlang_agent_test, self()}),
+            receive
+                {snmp_targets, erlang_agent_test, Addresses} ->
+                    ct:pal("Notification sent to: ~p~n", [Addresses]),
+                    erlang_agent_netsnmp_inform_responses(Addresses)
+            end,
+            stop_program(ProgHandle)
+    end.
 
 erlang_agent_netsnmp_inform_responses([]) ->
     receive
@@ -326,6 +341,7 @@ erlang_agent_netsnmp_inform_responses([Address | Addresses]) ->
 %%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
+
 snmpget(Oid, Transport, Config) ->
     Versions = ?config(snmp_versions, Config),
 
@@ -335,10 +351,14 @@ snmpget(Oid, Transport, Config) ->
 	 "-Cf",
 	 net_snmp_addr_str(Transport),
 	 oid_str(Oid)],
-    ProgHandle = start_program(snmpget, Args, none, Config),
-    {_, line, Line} = get_program_output(ProgHandle),
-    stop_program(ProgHandle),
-    Line.
+    case start_program(snmpget, Args, none, Config) of
+        {skip, _} = SKIP ->
+            throw(SKIP);
+        ProgHandle ->
+            {_, line, Line} = get_program_output(ProgHandle),
+            stop_program(ProgHandle),
+            Line
+    end.
 
 start_snmptrapd(Mibs, Config) ->
     DataDir = ?config(data_dir, Config),
@@ -382,12 +402,13 @@ start_program(Prog, Args, StartCheckMP, Config) ->
     DataDir = ?config(data_dir, Config),
     StartWrapper = filename:join(DataDir, "start_stop_wrapper"),
     Parent = self(),
-    Pid =
-	spawn_link(
+    %% process_flag(trap_exit, true),
+    {Pid, Mon} =
+	spawn_monitor(
 	  fun () ->
 		  run_program(Parent, StartWrapper, [Path | Args])
 	  end),
-    start_check(Pid, erlang:monitor(process, Pid), StartCheckMP).
+    start_check(Pid, Mon, StartCheckMP).
 
 start_check(Pid, Mon, none) ->
     {Pid, Mon};
@@ -400,6 +421,10 @@ start_check(Pid, Mon, StartCheckMP) ->
 		nomatch ->
 		    start_check(Pid, Mon, StartCheckMP)
 	    end;
+	{'DOWN', Mon, _, _Pid, {skip, Reason} = SKIP} ->
+	    ct:pal("Received DOWN from ~p"
+                   "~n   Skip Reason: ~p", [_Pid, Reason]),
+            SKIP;
 	{'DOWN', Mon, _, _, Reason} ->
 	    ct:fail("Prog ~p start failed: ~p", [Pid, Reason])
     end.
@@ -446,14 +471,34 @@ run_program_loop(Parent, Port, Buf) ->
 	{Port, {data, {Flag, Data}}} ->
 	    case Flag of
 		eol ->
-		    Line = iolist_to_binary(lists:reverse(Buf, Data)),
-		    ct:pal("Prog ~p output: ~s", [Port, Line]),
-		    Parent ! {self(), line, Line},
-		    run_program_loop(Parent, Port, []);
+		    Line  = iolist_to_binary(lists:reverse(Buf, Data)),
+                    ct:pal("Prog ~p output: ~s", [Port, Line]),
+                    %% There are potentially many different fail outputs,
+                    %% but for now we test for just this one: illegal option
+                    IOpt = "illegal option",
+                    case string:find(binary_to_list(Line), IOpt) of
+                        nomatch ->
+                            Parent ! {self(), line, Line},
+                            run_program_loop(Parent, Port, []);
+                        Line2 ->
+                            %% Try to extract the actual illegal option string
+                            IOpt2 =
+                                case string:take(
+                                       string:prefix(Line2, IOpt), [$-, $ ]) of
+                                    {_, Str} when length(Str) > 0 ->
+                                        Str;
+                                    _X ->
+                                        Line2
+                                end,
+                            ct:pal("Force program ~p stop", [Port]),
+                            true = port_command(Port, <<"stop\n">>),
+                            (catch port_close(Port)),
+                            exit({skip, {illegal_option, IOpt2}})
+                    end;
 		noeol ->
 		    run_program_loop(Parent, Port, [Data | Buf])
 	    end;
-	{Port, {exit_status,ExitStatus}} ->
+	{Port, {exit_status, ExitStatus}} ->
 	    ct:pal("Prog ~p exit: ~p", [Port, ExitStatus]),
 	    catch port_close(Port),
 	    Parent ! {self(), exit, ExitStatus};
diff --git a/lib/snmp/test/test-mibs/ALARM-MIB.mib b/lib/snmp/test/test-mibs/ALARM-MIB.mib
index 18e43d4b4b..10d2adbff9 100644
--- a/lib/snmp/test/test-mibs/ALARM-MIB.mib
+++ b/lib/snmp/test/test-mibs/ALARM-MIB.mib
@@ -330,7 +330,7 @@ alarmModelRowStatus OBJECT-TYPE
     cannot be used as an alarm suppression mechanism.  Entries
     that are notInService will disappear as described in RFC2579.
 
-    This row can not be modified while it is being
+    This row cannot be modified while it is being
     referenced by a value of alarmActiveModelPointer.  In these
     cases, an error of `inconsistentValue' will be returned to
     the manager.
diff --git a/lib/snmp/test/test-mibs/SNMPv2-TC.mib b/lib/snmp/test/test-mibs/SNMPv2-TC.mib
index fd6a728ab5..1d75c4bbd8 100644
--- a/lib/snmp/test/test-mibs/SNMPv2-TC.mib
+++ b/lib/snmp/test/test-mibs/SNMPv2-TC.mib
@@ -454,7 +454,7 @@ value         |              |      see 1|          ->C|          ->D
                  associated with this column or that there is no
                  conceptual row for which this column would be
                  accessible in the MIB view used by the retrieval.  As
-                 such, the management station can not issue any
+                 such, the management station cannot issue any
                  management protocol set operations to create an
                  instance of this column.
 
@@ -576,7 +576,7 @@ value         |              |      see 1|          ->C|          ->D
                  associated with this column or that there is no
                  conceptual row for which this column would be
                  accessible in the MIB view used by the retrieval.  As
-                 such, the management station can not issue any
+                 such, the management station cannot issue any
                  management protocol set operations to create an
                  instance of this column.
 
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index 4d5a0fbce8..f305497cd3 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = snmp
-SNMP_VSN    = 5.2.12
+SNMP_VSN    = 5.3
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)"
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 177784384e..60f20c7c3f 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,100 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 4.7.7</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    SSH uses the new crypto API.</p>
+          <p>
+	    Own Id: OTP-15673</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Ssh 4.7.6</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    When an SSH server receives the very first message on a
+	    new TCP connection, and that message is not the expected
+	    one, the 64 first bytes of the received message are now
+	    dumped in the INFO REPORT that reports the Protocol
+	    Error.</p>
+          <p>
+	    This facilitates the debugging of who sends the bad
+	    message or of detecting a possible port scanning.</p>
+          <p>
+	    Own Id: OTP-15772</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Ssh 4.7.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The callback <c>ssh_channel:init/1</c> was missing in
+	    OTP-21</p>
+          <p>
+	    Own Id: OTP-15762</p>
+        </item>
+        <item>
+          <p>
+	    If a client was connected to an server on an already open
+	    socket, the callback <c>fun(PeerName,FingerPrint)</c> in
+	    the <c>accept_callback</c> option passed the local name
+	    in the argument PeerName instead of the remote name.</p>
+          <p>
+	    Own Id: OTP-15763</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Ssh 4.7.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    SSH sftp daemon now accepts an SSH_FXP_STAT message
+	    encoded according to the wrong sftp version. Some clients
+	    sends such messages.</p>
+          <p>
+	    Own Id: OTP-15498 Aux Id: ERL-822, PR-2077 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Ssh 4.7.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed port leakage if a ssh:daemon call failed.</p>
+          <p>
+	    Own Id: OTP-15397 Aux Id: ERL-801 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 4.7.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -293,6 +387,39 @@
     </section>
 </section>
 
+<section><title>Ssh 4.6.9.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    If a client was connected to an server on an already open
+	    socket, the callback <c>fun(PeerName,FingerPrint)</c> in
+	    the <c>accept_callback</c> option passed the local name
+	    in the argument PeerName instead of the remote name.</p>
+          <p>
+	    Own Id: OTP-15763</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Ssh 4.6.9.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed port leakage if a ssh:daemon call failed.</p>
+          <p>
+	    Own Id: OTP-15397 Aux Id: ERL-801 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 4.6.9.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -2883,7 +3010,7 @@
         </item>
         <item>
           <p>
-	    Fixed internal error on when client and server can not
+	    Fixed internal error on when client and server cannot
 	    agree o which authmethod to use.</p>
           <p>
 	    Own Id: OTP-10731 Aux Id: seq12237 </p>
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 8435fced11..8b7cb4dcd4 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -28,7 +28,7 @@
     <date>2007-10-06</date>
     <rev></rev>
   </header>
-  <module>ssh</module>
+  <module since="">ssh</module>
   <modulesummary>Main API of the ssh application</modulesummary>
   <description>
     <p>This is the interface module for the <c>SSH</c> application.
@@ -46,7 +46,7 @@
     In that encrypted connection one or more channels could be opened with
     <seealso marker="ssh_connection#session_channel/2">ssh_connection:session_channel/2,4</seealso>.
     </p>
-    <p>Each channel is an isolated "pipe" between a client-side process and a server-side process. Thoose process
+    <p>Each channel is an isolated "pipe" between a client-side process and a server-side process. Those process
     pairs could handle for example file transfers (sftp) or remote command execution (shell, exec and/or cli).
     If a custom shell is implemented, the user of the client could execute the special commands remotely. Note that
     the user is not necessarily a human but probably a system interfacing the SSH app.
@@ -347,6 +347,7 @@
     
     <datatype>
       <name name="subsystem_daemon_option"/>
+      <name name="subsystem_specs"/>
       <name name="subsystem_spec"/>
       <desc>
 	<p>Defines a subsystem in the daemon.</p>
@@ -1059,17 +1060,17 @@
 
 <!-- CLOSE/1 -->
    <func>
-     <name name="close" arity="1"/>
+     <name name="close" arity="1" since=""/>
       <fsummary>Closes an SSH connection.</fsummary>
       <desc><p>Closes an SSH connection.</p></desc>
     </func>
     
 <!-- CONNECT/2 etc -->
    <func>
-     <name>connect(Host, Port, Options) -> Result </name>
-     <name>connect(Host, Port, Options, NegotiationTimeout) -> Result </name>
-     <name>connect(TcpSocket, Options) -> Result</name>
-     <name>connect(TcpSocket, Options, NegotiationTimeout) -> Result</name>
+     <name since="">connect(Host, Port, Options) -> Result </name>
+     <name since="">connect(Host, Port, Options, NegotiationTimeout) -> Result </name>
+     <name since="OTP 19.0">connect(TcpSocket, Options) -> Result</name>
+     <name since="">connect(TcpSocket, Options, NegotiationTimeout) -> Result</name>
      <fsummary>Connects to an SSH server.</fsummary>
      <type>
        <v>Host = <seealso marker="#type-host">host()</seealso></v>
@@ -1098,7 +1099,7 @@
 
 <!-- CONNECTION_INFO/1, CONNECTION_INFO/2 -->
    <func>
-     <name name="connection_info" arity="2"/>
+     <name name="connection_info" arity="2" since=""/>
      <fsummary>Retrieves information about a connection.</fsummary>
      <desc>
        <p>Retrieves information about a connection. The list <c>Keys</c> defines which information that
@@ -1108,9 +1109,9 @@
 
 <!-- DEAMON/1,2,3 -->
    <func>
-     <name>daemon(Port | TcpSocket) -> Result</name>
-     <name>daemon(Port | TcpSocket, Options) -> Result</name>
-     <name>daemon(HostAddress, Port, Options) -> Result</name>
+     <name since="">daemon(Port | TcpSocket) -> Result</name>
+     <name since="">daemon(Port | TcpSocket, Options) -> Result</name>
+     <name since="">daemon(HostAddress, Port, Options) -> Result</name>
      <fsummary>Starts a server listening for SSH connections.</fsummary>
      <type>
        <v>Port = integer()</v>
@@ -1154,7 +1155,7 @@
 
 <!-- DAEMON_INFO/1 -->   
    <func>
-     <name name="daemon_info" arity="1"/>
+     <name name="daemon_info" arity="1" since="OTP 19.0"/>
      <fsummary>Get info about a daemon</fsummary>
      <desc>
        <p>Returns a key-value list with information about the daemon.</p>
@@ -1164,7 +1165,7 @@
 
 <!-- DEFAULT_ALGORITHMS/0 -->
     <func>
-      <name name="default_algorithms" arity="0"/>
+      <name name="default_algorithms" arity="0" since="OTP 18.0"/>
       <fsummary>Get a list declaring the supported algorithms</fsummary>
       <desc>
 	<p>Returns a key-value list, where the keys are the different types of algorithms and the values are the
@@ -1176,9 +1177,9 @@
 
 <!-- SHELL/1,2,3 -->
     <func>
-      <name>shell(Host | TcpSocket) -> Result </name>
-      <name>shell(Host | TcpSocket, Options) -> Result </name>
-      <name>shell(Host, Port, Options) -> Result </name>
+      <name since="">shell(Host | TcpSocket) -> Result </name>
+      <name since="">shell(Host | TcpSocket, Options) -> Result </name>
+      <name since="">shell(Host, Port, Options) -> Result </name>
       <fsummary>Starts an interactive shell on a remote SSH server.</fsummary>
       <type>
 	<v>Host = <seealso marker="#type-host">host()</seealso></v>
@@ -1203,8 +1204,8 @@
     </func>
 
     <func>
-      <name name="start" arity="0"/>
-      <name name="start" arity="1"/>
+      <name name="start" arity="0" since=""/>
+      <name name="start" arity="1" since=""/>
       <fsummary>Starts the SSH application.</fsummary>
       <desc>
         <p>Utility function that starts the applications <c>crypto</c>, <c>public_key</c>,
@@ -1215,7 +1216,7 @@
     </func>
 
     <func>
-      <name name="stop" arity="0"/>
+      <name name="stop" arity="0" since=""/>
       <fsummary>Stops the <c>ssh</c> application.</fsummary>
       <desc>
         <p>Stops the <c>ssh</c> application.
@@ -1225,9 +1226,9 @@
     </func>
     
     <func>
-      <name name="stop_daemon" arity="1"/>
-      <name name="stop_daemon" arity="2"/>
-      <name name="stop_daemon" arity="3"/>
+      <name name="stop_daemon" arity="1" since=""/>
+      <name name="stop_daemon" arity="2" since=""/>
+      <name name="stop_daemon" arity="3" since="OTP 21.0"/>
       <fsummary>Stops the listener and all connections started by the listener.</fsummary>
       <desc>
 	<p>Stops the listener and all connections started by the listener.</p>
@@ -1235,9 +1236,9 @@
     </func>
 
     <func>
-      <name name="stop_listener" arity="1"/>
-      <name name="stop_listener" arity="2"/>
-      <name name="stop_listener" arity="3"/>
+      <name name="stop_listener" arity="1" since=""/>
+      <name name="stop_listener" arity="2" since=""/>
+      <name name="stop_listener" arity="3" since="OTP 21.0"/>
       <fsummary>Stops the listener, but leaves existing connections started by the listener operational.</fsummary>
       <desc>
 	<p>Stops the listener, but leaves existing connections started by the listener operational.</p>
diff --git a/lib/ssh/doc/src/ssh_client_channel.xml b/lib/ssh/doc/src/ssh_client_channel.xml
index 9be4007c68..cd28b95fd3 100644
--- a/lib/ssh/doc/src/ssh_client_channel.xml
+++ b/lib/ssh/doc/src/ssh_client_channel.xml
@@ -29,7 +29,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>ssh_client_channel</module>
+  <module since="OTP 21.0">ssh_client_channel</module>
   <modulesummary>-behaviour(ssh_client_channel). (Replaces ssh_channel)
   </modulesummary>
   <description>
@@ -68,8 +68,8 @@
 
   <funcs>
     <func>
-      <name>call(ChannelRef, Msg) -></name>
-      <name>call(ChannelRef, Msg, Timeout) -> Reply | {error, Reason}</name>
+      <name since="OTP 21.0">call(ChannelRef, Msg) -></name>
+      <name since="OTP 21.0">call(ChannelRef, Msg, Timeout) -> Reply | {error, Reason}</name>
       <fsummary>Makes a synchronous call to a channel.</fsummary>
       <type>
 	<v>ChannelRef = pid() </v>
@@ -92,7 +92,7 @@
     </func>
     
     <func>
-      <name>cast(ChannelRef, Msg) -> ok </name>
+      <name since="OTP 21.0">cast(ChannelRef, Msg) -> ok </name>
       <fsummary>Sends an asynchronous message to the channel
 	ChannelRef and returns ok.</fsummary>
       <type>
@@ -111,7 +111,7 @@
     </func>
 
     <func>
-      <name>enter_loop(State) -> _ </name>
+      <name since="OTP 21.0">enter_loop(State) -> _ </name>
       <fsummary>Makes an existing process an ssh_client_channel (replaces ssh_channel) process.</fsummary>
       <type>
 	<v>State = term()</v>
@@ -131,7 +131,7 @@
     </func>
     
     <func>
-      <name>init(Options) -> {ok, State} |  {ok, State, Timeout} | {stop, Reason} </name>
+      <name since="OTP 21.0">init(Options) -> {ok, State} |  {ok, State, Timeout} | {stop, Reason} </name>
       <fsummary>Initiates an <c>ssh_client_channel</c> process.</fsummary>
       <type>
 	<v>Options = [{Option, Value}]</v>
@@ -173,7 +173,7 @@
     </func>
 
     <func>
-      <name>reply(Client, Reply) -> _</name>
+      <name since="OTP 21.0">reply(Client, Reply) -> _</name>
       <fsummary>Sends a reply to a client.</fsummary>
       <type>
         <v>Client = opaque()</v>
@@ -193,8 +193,8 @@
     </func>
 
     <func>
-      <name>start(SshConnection, ChannelId, ChannelCb, CbInitArgs) -> </name>
-      <name>start_link(SshConnection, ChannelId, ChannelCb, CbInitArgs) ->
+      <name since="OTP 21.0">start(SshConnection, ChannelId, ChannelCb, CbInitArgs) -> </name>
+      <name since="OTP 21.0">start_link(SshConnection, ChannelId, ChannelCb, CbInitArgs) ->
       {ok, ChannelRef} | {error, Reason}</name>
       <fsummary>Starts a process that handles an SSH channel.</fsummary>
       <type>
@@ -244,7 +244,7 @@
 
   <funcs>
     <func>
-      <name>Module:code_change(OldVsn, State, Extra) -> {ok,
+      <name since="OTP 21.0">Module:code_change(OldVsn, State, Extra) -> {ok,
       NewState}</name>
       <fsummary>Converts process state when code is changed.</fsummary>
       <type>
@@ -287,7 +287,7 @@
     </func>
     
     <func>
-      <name>Module:init(Args) -> {ok, State} | {ok, State, timeout()} |
+      <name since="OTP 21.0">Module:init(Args) -> {ok, State} | {ok, State, timeout()} |
       {stop, Reason}</name>
       <fsummary>Makes necessary initializations and returns the
       initial channel state if the initializations succeed.</fsummary>
@@ -307,7 +307,7 @@
     </func>
    
     <func>
-      <name>Module:handle_call(Msg, From, State) -> Result</name>
+      <name since="OTP 21.0">Module:handle_call(Msg, From, State) -> Result</name>
       <fsummary>Handles messages sent by calling
       <c>call/[2,3]</c>.</fsummary>
       <type>
@@ -334,7 +334,7 @@
     </func>
 
     <func>
-      <name>Module:handle_cast(Msg, State) -> Result</name>
+      <name since="OTP 21.0">Module:handle_cast(Msg, State) -> Result</name>
       <fsummary>Handles messages sent by calling
       <c>cast/2</c>.</fsummary>
       <type>
@@ -355,7 +355,7 @@
     </func>
  
     <func>
-      <name>Module:handle_msg(Msg, State) -> {ok, State} |
+      <name since="OTP 21.0">Module:handle_msg(Msg, State) -> {ok, State} |
       {stop, ChannelId, State}</name>
 
       <fsummary>Handles other messages than SSH connection protocol,
@@ -389,7 +389,7 @@
     </func>
 
     <func>
-      <name>Module:handle_ssh_msg(Msg, State) -> {ok, State} | {stop,
+      <name since="OTP 21.0">Module:handle_ssh_msg(Msg, State) -> {ok, State} | {stop,
       ChannelId, State}</name>
       <fsummary>Handles <c>ssh</c> connection protocol messages.</fsummary>
       <type>
@@ -416,7 +416,7 @@
     </func>
 
     <func>
-      <name>Module:terminate(Reason, State) -> _</name>
+      <name since="OTP 21.0">Module:terminate(Reason, State) -> _</name>
       <fsummary>Does cleaning up before channel process termination.
       </fsummary>
       <type>
diff --git a/lib/ssh/doc/src/ssh_client_key_api.xml b/lib/ssh/doc/src/ssh_client_key_api.xml
index bc77756147..9f2f3013e5 100644
--- a/lib/ssh/doc/src/ssh_client_key_api.xml
+++ b/lib/ssh/doc/src/ssh_client_key_api.xml
@@ -29,7 +29,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>ssh_client_key_api</module>
+  <module since="OTP R16B">ssh_client_key_api</module>
   <modulesummary>
      -behaviour(ssh_client_key_api).
   </modulesummary>
@@ -86,7 +86,7 @@
 
   <funcs>
     <func>
-      <name>Module:add_host_key(HostNames, PublicHostKey, ConnectOptions) -> ok | {error, Reason}</name>
+      <name since="OTP R16B">Module:add_host_key(HostNames, PublicHostKey, ConnectOptions) -> ok | {error, Reason}</name>
       <fsummary>Adds a host key to the set of trusted host keys.</fsummary>
       <type>
 	<v>HostNames = string()</v>
@@ -103,7 +103,7 @@
     </func>
 
     <func>
-      <name>Module:is_host_key(Key, Host, Algorithm, ConnectOptions) -> Result</name>
+      <name since="OTP R16B">Module:is_host_key(Key, Host, Algorithm, ConnectOptions) -> Result</name>
       <fsummary>Checks if a host key is trusted.</fsummary>
       <type>
 	<v>Key = <seealso marker="public_key:public_key#type-public_key">public_key:public_key()</seealso></v>
@@ -125,7 +125,7 @@
     </func>
 
     <func>
-      <name>Module:user_key(Algorithm, ConnectOptions) ->
+      <name since="OTP R16B">Module:user_key(Algorithm, ConnectOptions) ->
       {ok, PrivateKey}  | {error, Reason}</name>
       <fsummary>Fetches the users <em>public key</em> matching the <c>Algorithm</c>.</fsummary>
       <type>
diff --git a/lib/ssh/doc/src/ssh_connection.xml b/lib/ssh/doc/src/ssh_connection.xml
index 8e1cf156a8..2a701929f6 100644
--- a/lib/ssh/doc/src/ssh_connection.xml
+++ b/lib/ssh/doc/src/ssh_connection.xml
@@ -30,7 +30,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>ssh_connection</module>
+  <module since="">ssh_connection</module>
   <modulesummary>
     This module provides API functions to send SSH Connection Protocol 
     events to the other side of an SSH channel.
@@ -201,7 +201,7 @@
   <funcs>
    
    <func>
-     <name>adjust_window(ConnectionRef, ChannelId, NumOfBytes) -> ok</name>
+     <name since="">adjust_window(ConnectionRef, ChannelId, NumOfBytes) -> ok</name>
      <fsummary>Adjusts the SSH flow control window.</fsummary>
      <type>
        <v>ConnectionRef = connection_ref()</v>
@@ -221,7 +221,7 @@
    </func>
    
    <func>
-     <name>close(ConnectionRef, ChannelId) -> ok</name>
+     <name since="">close(ConnectionRef, ChannelId) -> ok</name>
      <fsummary>Sends a close message on the channel <c>ChannelId</c>.</fsummary>
      <type>
        <v>ConnectionRef = connection_ref()</v>
@@ -240,7 +240,7 @@
    </func>
    
    <func>
-     <name>exec(ConnectionRef, ChannelId, Command, TimeOut) -> ssh_request_status() |
+     <name since="">exec(ConnectionRef, ChannelId, Command, TimeOut) -> ssh_request_status() |
      {error, reason()}</name>
      <fsummary>Requests that the server starts the execution of the given command.</fsummary>
      <type>
@@ -284,7 +284,7 @@
    </func>
 
    <func>
-     <name>exit_status(ConnectionRef, ChannelId, Status) -> ok</name>
+     <name since="">exit_status(ConnectionRef, ChannelId, Status) -> ok</name>
      <fsummary>Sends the exit status of a command to the client.</fsummary>
      <type>
        <v>ConnectionRef = connection_ref() </v>
@@ -298,8 +298,8 @@
    </func>
    
    <func>
-     <name>ptty_alloc(ConnectionRef, ChannelId, Options) -></name>
-     <name>ptty_alloc(ConnectionRef, ChannelId, Options, Timeout) ->  > ssh_request_status() |
+     <name since="OTP 17.5">ptty_alloc(ConnectionRef, ChannelId, Options) -></name>
+     <name since="OTP 17.4">ptty_alloc(ConnectionRef, ChannelId, Options, Timeout) ->  > ssh_request_status() |
      {error, reason()}</name>
        <fsummary>Sends an SSH Connection Protocol <c>pty_req</c>,
        to allocate a pseudo-terminal.</fsummary>
@@ -339,7 +339,7 @@
      </func>
 
      <func>
-       <name>reply_request(ConnectionRef, WantReply, Status, ChannelId) -> ok</name>
+       <name since="">reply_request(ConnectionRef, WantReply, Status, ChannelId) -> ok</name>
        <fsummary>Sends status replies to requests that want such replies.</fsummary>
       <type>
 	<v>ConnectionRef = connection_ref()</v>
@@ -357,10 +357,10 @@
      </func>
     
      <func>
-       <name>send(ConnectionRef, ChannelId, Data) -></name>
-       <name>send(ConnectionRef, ChannelId, Data, Timeout) -></name>
-       <name>send(ConnectionRef, ChannelId, Type, Data) -></name>
-       <name>send(ConnectionRef, ChannelId, Type, Data, TimeOut) ->
+       <name since="">send(ConnectionRef, ChannelId, Data) -></name>
+       <name since="">send(ConnectionRef, ChannelId, Data, Timeout) -></name>
+       <name since="">send(ConnectionRef, ChannelId, Type, Data) -></name>
+       <name since="">send(ConnectionRef, ChannelId, Type, Data, TimeOut) ->
        ok | {error, timeout} | {error, closed}</name>
        <fsummary>Sends channel data.</fsummary>
        <type>
@@ -380,7 +380,7 @@
      </func>
      
      <func>
-       <name>send_eof(ConnectionRef, ChannelId) -> ok | {error, closed}</name>
+       <name since="">send_eof(ConnectionRef, ChannelId) -> ok | {error, closed}</name>
        <fsummary>Sends EOF on channel <c>ChannelId</c>.</fsummary>
        <type>
 	<v>ConnectionRef = connection_ref()</v>
@@ -392,8 +392,8 @@
      </func>
 
      <func>
-       <name>session_channel(ConnectionRef, Timeout) -></name>
-       <name>session_channel(ConnectionRef, InitialWindowSize,
+       <name since="">session_channel(ConnectionRef, Timeout) -></name>
+       <name since="">session_channel(ConnectionRef, InitialWindowSize,
        MaxPacketSize, Timeout) -> {ok, channel_id()} | {error, reason()}</name>
        <fsummary>Opens a channel for an SSH session.</fsummary>
        <type>
@@ -410,7 +410,7 @@
      </func>
 
     <func>
-      <name>setenv(ConnectionRef, ChannelId, Var, Value, TimeOut) -> ssh_request_status() |
+      <name since="">setenv(ConnectionRef, ChannelId, Var, Value, TimeOut) -> ssh_request_status() |
       {error, reason()}</name>
       <fsummary>Environment variables can be passed to the
       shell/command to be started later.</fsummary>
@@ -428,7 +428,7 @@
     </func>
     
     <func>
-      <name>shell(ConnectionRef, ChannelId) -> ok | failure | {error, closed}
+      <name since="">shell(ConnectionRef, ChannelId) -> ok | failure | {error, closed}
       </name>
       <fsummary>Requests that the user default shell (typically defined in
       /etc/passwd in Unix systems) is to be executed at the server end.</fsummary>
@@ -448,7 +448,7 @@
     </func>
 
     <func>
-      <name>subsystem(ConnectionRef, ChannelId, Subsystem, Timeout) -> ssh_request_status() |
+      <name since="">subsystem(ConnectionRef, ChannelId, Subsystem, Timeout) -> ssh_request_status() |
       {error, reason()}</name>
       <fsummary>Requests to execute a predefined subsystem on the server.</fsummary>
        <type>
diff --git a/lib/ssh/doc/src/ssh_file.xml b/lib/ssh/doc/src/ssh_file.xml
index 6681d9c306..f1fef09083 100644
--- a/lib/ssh/doc/src/ssh_file.xml
+++ b/lib/ssh/doc/src/ssh_file.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>ssh_file</module>
+  <module since="OTP 21.2">ssh_file</module>
   <modulesummary>Default callback module for the client's and server's database operations in the ssh application</modulesummary>
   <description>
     <p>This module is the default callback handler for the client's and the server's user and host "database" operations.
@@ -169,7 +169,7 @@
 
   <funcs>
     <func>
-      <name>host_key(Algorithm, DaemonOptions) -> {ok, Key} | {error, Reason}</name>
+      <name since="OTP 21.2">host_key(Algorithm, DaemonOptions) -> {ok, Key} | {error, Reason}</name>
       <fsummary></fsummary>
       <desc>
 	<p><strong>Types and description</strong></p>
@@ -195,7 +195,7 @@
     </func>
 
     <func>
-      <name>is_auth_key(PublicUserKey, User, DaemonOptions) -> Result</name>
+      <name since="OTP 21.2">is_auth_key(PublicUserKey, User, DaemonOptions) -> Result</name>
       <fsummary></fsummary>
       <desc>
 	<p><strong>Types and description</strong></p>
@@ -216,7 +216,7 @@
     </func>
 
     <func>
-      <name>add_host_key(HostNames, PublicHostKey, ConnectOptions) -> ok | {error, Reason}</name>
+      <name since="OTP 21.2">add_host_key(HostNames, PublicHostKey, ConnectOptions) -> ok | {error, Reason}</name>
       <fsummary></fsummary>
       <desc>
 	<p><strong>Types and description</strong></p>
@@ -235,7 +235,7 @@
     </func>
 
     <func>
-      <name>is_host_key(Key, Host, Algorithm, ConnectOptions) -> Result</name>
+      <name since="OTP 21.2">is_host_key(Key, Host, Algorithm, ConnectOptions) -> Result</name>
       <fsummary></fsummary>
       <desc>
 	<p><strong>Types and description</strong></p>
@@ -254,7 +254,7 @@
     </func>
 
     <func>
-      <name>user_key(Algorithm, ConnectOptions) -> {ok, PrivateKey} | {error, Reason}</name>
+      <name since="OTP 21.2">user_key(Algorithm, ConnectOptions) -> {ok, PrivateKey} | {error, Reason}</name>
       <fsummary></fsummary>
       <desc>
 	<p><strong>Types and description</strong></p>
diff --git a/lib/ssh/doc/src/ssh_server_channel.xml b/lib/ssh/doc/src/ssh_server_channel.xml
index 31ba9a3231..a4e18bbfbf 100644
--- a/lib/ssh/doc/src/ssh_server_channel.xml
+++ b/lib/ssh/doc/src/ssh_server_channel.xml
@@ -29,7 +29,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>ssh_server_channel</module>
+  <module since="OTP 21.0">ssh_server_channel</module>
   <modulesummary>-behaviour(ssh_server_channel). (Replaces ssh_daemon_channel)
   </modulesummary>
   <description>
@@ -70,7 +70,7 @@
 
   <funcs>
     <func>
-      <name>Module:init(Args) -> {ok, State} | {ok, State, timeout()} |
+      <name since="OTP 21.0">Module:init(Args) -> {ok, State} | {ok, State, timeout()} |
       {stop, Reason}</name>
       <fsummary>Makes necessary initializations and returns the
       initial channel state if the initializations succeed.</fsummary>
@@ -93,7 +93,7 @@
     </func>
    
     <func>
-      <name>Module:handle_msg(Msg, State) -> {ok, State} |
+      <name since="OTP 21.0">Module:handle_msg(Msg, State) -> {ok, State} |
       {stop, ChannelId, State}</name>
 
       <fsummary>Handles other messages than SSH connection protocol,
@@ -125,7 +125,7 @@
     </func>
 
     <func>
-      <name>Module:handle_ssh_msg(Msg, State) -> {ok, State} | {stop,
+      <name since="OTP 21.0">Module:handle_ssh_msg(Msg, State) -> {ok, State} | {stop,
       ChannelId, State}</name>
       <fsummary>Handles <c>ssh</c> connection protocol messages.</fsummary>
       <type>
@@ -152,7 +152,7 @@
     </func>
 
     <func>
-      <name>Module:terminate(Reason, State) -> _</name>
+      <name since="OTP 21.0">Module:terminate(Reason, State) -> _</name>
       <fsummary>Does cleaning up before channel process termination.
       </fsummary>
       <type>
diff --git a/lib/ssh/doc/src/ssh_server_key_api.xml b/lib/ssh/doc/src/ssh_server_key_api.xml
index e2a31bd5f5..013a788a4a 100644
--- a/lib/ssh/doc/src/ssh_server_key_api.xml
+++ b/lib/ssh/doc/src/ssh_server_key_api.xml
@@ -29,7 +29,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>ssh_server_key_api</module>
+  <module since="OTP R16B">ssh_server_key_api</module>
   <modulesummary>
     -behaviour(ssh_server_key_api).
   </modulesummary>
@@ -87,7 +87,7 @@
 
   <funcs>
     <func>
-      <name>Module:host_key(Algorithm, DaemonOptions) ->
+      <name since="OTP R16B">Module:host_key(Algorithm, DaemonOptions) ->
       {ok, Key} | {error, Reason}</name>
       <fsummary>Fetches the host’s private key.</fsummary>
       <type>
@@ -111,7 +111,7 @@
     </func>
 
     <func>
-      <name>Module:is_auth_key(PublicUserKey, User, DaemonOptions) -> Result</name>
+      <name since="OTP R16B">Module:is_auth_key(PublicUserKey, User, DaemonOptions) -> Result</name>
       <fsummary>Checks if the user key is authorized.</fsummary>
       <type>
 	<v>PublicUserKey = <seealso marker="public_key:public_key#type-public_key">public_key:public_key()</seealso></v>
diff --git a/lib/ssh/doc/src/ssh_sftp.xml b/lib/ssh/doc/src/ssh_sftp.xml
index 8c105147d6..c89092798d 100644
--- a/lib/ssh/doc/src/ssh_sftp.xml
+++ b/lib/ssh/doc/src/ssh_sftp.xml
@@ -29,7 +29,7 @@
     <rev></rev>
     <file>ssh_sftp.sgml</file>
   </header>
-  <module>ssh_sftp</module>
+  <module since="">ssh_sftp</module>
   <modulesummary>SFTP client.</modulesummary>
   <description>
     <p>This module implements an SSH FTP (SFTP) client. SFTP is a
@@ -82,7 +82,7 @@
 
   <funcs>
      <func>
-       <name>apread(ChannelPid, Handle, Position, Len) -> {async, N} | {error, reason()}</name>
+       <name since="">apread(ChannelPid, Handle, Position, Len) -> {async, N} | {error, reason()}</name>
        <fsummary>Reads asynchronously from an open file.</fsummary>
        <type>
 	 <v>ChannelPid = pid()</v>
@@ -98,7 +98,7 @@
      </func>
      
      <func>
-	<name>apwrite(ChannelPid, Handle, Position, Data) -> {async, N} | {error, reason()}</name>
+	<name since="">apwrite(ChannelPid, Handle, Position, Data) -> {async, N} | {error, reason()}</name>
 	<fsummary>Writes asynchronously to an open file.</fsummary>
 	<type>
 	  <v>ChannelPid = pid()</v>
@@ -116,7 +116,7 @@
       </func>
       
       <func>
-	<name>aread(ChannelPid, Handle, Len) -> {async, N} | {error, reason()}</name>
+	<name since="">aread(ChannelPid, Handle, Len) -> {async, N} | {error, reason()}</name>
 	<fsummary>Reads asynchronously from an open file.</fsummary>
 	<type>
 	  <v>ChannelPid = pid()</v>
@@ -137,7 +137,7 @@
     </func>
 
     <func>
-      <name>awrite(ChannelPid, Handle, Data) -> {async, N} | {error, reason()}</name>
+      <name since="">awrite(ChannelPid, Handle, Data) -> {async, N} | {error, reason()}</name>
       <fsummary>Writes asynchronously to an open file.</fsummary>
       <type>
         <v>ChannelPid = pid()</v>
@@ -159,8 +159,8 @@
     </func>
 
     <func>
-      <name>close(ChannelPid, Handle) -></name>
-      <name>close(ChannelPid, Handle, Timeout) -> ok | {error, reason()}</name>
+      <name since="">close(ChannelPid, Handle) -></name>
+      <name since="">close(ChannelPid, Handle, Timeout) -> ok | {error, reason()}</name>
       <fsummary>Closes an open handle.</fsummary>
       <type>
         <v>ChannelPid = pid()</v>
@@ -173,8 +173,8 @@
     </func>
 
     <func>
-      <name>delete(ChannelPid, Name) -></name>
-      <name>delete(ChannelPid, Name, Timeout) -> ok | {error, reason()}</name>
+      <name since="">delete(ChannelPid, Name) -></name>
+      <name since="">delete(ChannelPid, Name, Timeout) -> ok | {error, reason()}</name>
       <fsummary>Deletes a file.</fsummary>
       <type>
         <v>ChannelPid = pid()</v>
@@ -188,8 +188,8 @@
     </func>
 
     <func>
-      <name>del_dir(ChannelPid, Name) -></name>
-      <name>del_dir(ChannelPid, Name, Timeout) -> ok | {error, reason()}</name>
+      <name since="">del_dir(ChannelPid, Name) -></name>
+      <name since="">del_dir(ChannelPid, Name, Timeout) -> ok | {error, reason()}</name>
       <fsummary>Deletes an empty directory.</fsummary>
       <type>
         <v>ChannelPid = pid()</v>
@@ -204,8 +204,8 @@
     </func>
 
      <func>
-      <name>list_dir(ChannelPid, Path) -></name>
-      <name>list_dir(ChannelPid, Path, Timeout) -> {ok, Filenames} | {error, reason()}</name>
+      <name since="">list_dir(ChannelPid, Path) -></name>
+      <name since="">list_dir(ChannelPid, Path, Timeout) -> {ok, Filenames} | {error, reason()}</name>
       <fsummary>Lists the directory.</fsummary>
       <type>
         <v>ChannelPid = pid()</v>
@@ -221,8 +221,8 @@
     </func>
 
     <func>
-      <name>make_dir(ChannelPid, Name) -></name>
-      <name>make_dir(ChannelPid, Name, Timeout) -> ok | {error, reason()}</name>
+      <name since="">make_dir(ChannelPid, Name) -></name>
+      <name since="">make_dir(ChannelPid, Name, Timeout) -> ok | {error, reason()}</name>
       <fsummary>Creates a directory.</fsummary>
       <type>
         <v>ChannelPid = pid()</v>
@@ -237,8 +237,8 @@
     </func>
 
     <func>
-      <name>make_symlink(ChannelPid, Name, Target) -></name>
-      <name>make_symlink(ChannelPid, Name, Target, Timeout) -> ok | {error, reason()}</name>
+      <name since="">make_symlink(ChannelPid, Name, Target) -></name>
+      <name since="">make_symlink(ChannelPid, Name, Target, Timeout) -> ok | {error, reason()}</name>
       <fsummary>Creates a symbolic link.</fsummary>
       <type>
         <v>ChannelPid = pid()</v>
@@ -253,8 +253,8 @@
     </func>
 
        <func>
-      <name>open(ChannelPid, File, Mode) -></name>
-      <name>open(ChannelPid, File, Mode, Timeout) -> {ok, Handle} | {error, reason()}</name>
+      <name since="">open(ChannelPid, File, Mode) -></name>
+      <name since="">open(ChannelPid, File, Mode, Timeout) -> {ok, Handle} | {error, reason()}</name>
       <fsummary>Opens a file and returns a handle.</fsummary>
       <type>
         <v>ChannelPid = pid()</v>
@@ -270,8 +270,8 @@
       </desc>
     </func>
     <func>
-      <name>opendir(ChannelPid, Path) -></name>
-      <name>opendir(ChannelPid, Path, Timeout) -> {ok, Handle} | {error, reason()}</name>
+      <name since="">opendir(ChannelPid, Path) -></name>
+      <name since="">opendir(ChannelPid, Path, Timeout) -> {ok, Handle} | {error, reason()}</name>
       <fsummary>Opens a directory and returns a handle.</fsummary>
       <type>
         <v>ChannelPid = pid()</v>
@@ -285,8 +285,8 @@
     </func>
 
     <func>
-      <name>open_tar(ChannelPid, Path, Mode) -></name>
-      <name>open_tar(ChannelPid, Path, Mode, Timeout) -> {ok, Handle} | {error, reason()}</name>
+      <name since="OTP 17.4">open_tar(ChannelPid, Path, Mode) -></name>
+      <name since="OTP 17.4">open_tar(ChannelPid, Path, Mode, Timeout) -> {ok, Handle} | {error, reason()}</name>
       <fsummary>Opens a tar file on the server to which <c>ChannelPid</c>
       is connected and returns a handle.</fsummary>
       <type>
@@ -339,8 +339,8 @@
     </func>
 
     <func>
-      <name>position(ChannelPid, Handle, Location) -></name>
-      <name>position(ChannelPid, Handle, Location, Timeout) -> {ok, NewPosition | {error, reason()}</name>
+      <name since="">position(ChannelPid, Handle, Location) -></name>
+      <name since="">position(ChannelPid, Handle, Location, Timeout) -> {ok, NewPosition | {error, reason()}</name>
       <fsummary>Sets the file position of a file.</fsummary>
       <type>
         <v>ChannelPid = pid()</v>
@@ -384,8 +384,8 @@
     </func>
 
     <func>
-      <name>pread(ChannelPid, Handle, Position, Len) -></name>
-      <name>pread(ChannelPid, Handle, Position, Len, Timeout) -> {ok, Data} | eof | {error, reason()}</name>
+      <name since="">pread(ChannelPid, Handle, Position, Len) -></name>
+      <name since="">pread(ChannelPid, Handle, Position, Len, Timeout) -> {ok, Data} | eof | {error, reason()}</name>
       <fsummary>Reads from an open file.</fsummary>
       <type>
         <v>ChannelPid = pid()</v>
@@ -402,8 +402,8 @@
      </func>
 
     <func>
-      <name>pwrite(ChannelPid, Handle, Position, Data) -> ok</name>
-      <name>pwrite(ChannelPid, Handle, Position, Data, Timeout) -> ok | {error, reason()}</name>
+      <name since="">pwrite(ChannelPid, Handle, Position, Data) -> ok</name>
+      <name since="">pwrite(ChannelPid, Handle, Position, Data, Timeout) -> ok | {error, reason()}</name>
       <fsummary>Writes to an open file.</fsummary>
       <type>
         <v>ChannelPid = pid()</v>
@@ -419,8 +419,8 @@
     </func>
 
     <func>
-      <name>read(ChannelPid, Handle, Len) -></name>
-      <name>read(ChannelPid, Handle, Len, Timeout) -> {ok, Data} | eof | {error, reason()}</name>
+      <name since="">read(ChannelPid, Handle, Len) -></name>
+      <name since="">read(ChannelPid, Handle, Len, Timeout) -> {ok, Data} | eof | {error, reason()}</name>
       <fsummary>Reads from an open file.</fsummary>
       <type>
         <v>ChannelPid = pid()</v>
@@ -441,8 +441,8 @@
     </func>
 
       <func>
-      <name>read_file(ChannelPid, File) -></name>
-      <name>read_file(ChannelPid, File, Timeout) -> {ok, Data} | {error, reason()}</name>
+      <name since="">read_file(ChannelPid, File) -></name>
+      <name since="">read_file(ChannelPid, File, Timeout) -> {ok, Data} | {error, reason()}</name>
       <fsummary>Reads a file.</fsummary>
       <type>
 	<v>ChannelPid = pid()</v>
@@ -456,8 +456,8 @@
     </func>
 
       <func>
-      <name>read_file_info(ChannelPid, Name) -></name>
-      <name>read_file_info(ChannelPid, Name, Timeout) -> {ok, FileInfo} | {error, reason()}</name>
+      <name since="">read_file_info(ChannelPid, Name) -></name>
+      <name since="">read_file_info(ChannelPid, Name, Timeout) -> {ok, FileInfo} | {error, reason()}</name>
       <fsummary>Gets information about a file.</fsummary>
       <type>
         <v>ChannelPid = pid()</v>
@@ -481,8 +481,8 @@
     </func>
 
      <func>
-      <name>read_link(ChannelPid, Name) -></name>
-      <name>read_link(ChannelPid, Name, Timeout) -> {ok, Target} | {error, reason()}</name>
+      <name since="">read_link(ChannelPid, Name) -></name>
+      <name since="">read_link(ChannelPid, Name, Timeout) -> {ok, Target} | {error, reason()}</name>
       <fsummary>Reads symbolic link.</fsummary>
       <type>
         <v>ChannelPid = pid()</v>
@@ -496,8 +496,8 @@
     </func>
 
      <func>
-      <name>read_link_info(ChannelPid, Name) -> {ok, FileInfo} | {error, reason()}</name>
-      <name>read_link_info(ChannelPid, Name, Timeout) -> {ok, FileInfo} | {error, reason()}</name>
+      <name since="">read_link_info(ChannelPid, Name) -> {ok, FileInfo} | {error, reason()}</name>
+      <name since="">read_link_info(ChannelPid, Name, Timeout) -> {ok, FileInfo} | {error, reason()}</name>
       <fsummary>Gets information about a symbolic link.</fsummary>
       <type>
         <v>ChannelPid = pid()</v>
@@ -517,8 +517,8 @@
     </func>
 
     <func>
-      <name>rename(ChannelPid, OldName, NewName) -> </name>
-      <name>rename(ChannelPid, OldName, NewName, Timeout) -> ok | {error, reason()}</name>
+      <name since="">rename(ChannelPid, OldName, NewName) -> </name>
+      <name since="">rename(ChannelPid, OldName, NewName, Timeout) -> ok | {error, reason()}</name>
       <fsummary>Renames a file.</fsummary>
       <type>
         <v>ChannelPid = pid()</v>
@@ -534,16 +534,16 @@
     </func>
 
     <func>
-      <name>start_channel(ConnectionRef) -></name>
-      <name>start_channel(ConnectionRef, Options) ->
+      <name since="">start_channel(ConnectionRef) -></name>
+      <name since="">start_channel(ConnectionRef, Options) ->
       {ok, Pid} | {error, reason()|term()}</name>
 
-      <name>start_channel(Host, Options) -></name>
-      <name>start_channel(Host, Port, Options) -> 
+      <name since="">start_channel(Host, Options) -></name>
+      <name since="">start_channel(Host, Port, Options) -> 
       {ok, Pid, ConnectionRef} | {error, reason()|term()}</name>
 
-      <name>start_channel(TcpSocket) -></name>
-      <name>start_channel(TcpSocket, Options) ->
+      <name since="">start_channel(TcpSocket) -></name>
+      <name since="">start_channel(TcpSocket, Options) ->
       {ok, Pid, ConnectionRef} | {error, reason()|term()}</name>
 
       <fsummary>Starts an SFTP client.</fsummary>
@@ -594,7 +594,7 @@
     </func>
 
      <func>
-      <name>stop_channel(ChannelPid) -> ok</name>
+      <name since="">stop_channel(ChannelPid) -> ok</name>
       <fsummary>Stops the SFTP client channel.</fsummary>
       <type>
         <v>ChannelPid = pid()</v>
@@ -606,8 +606,8 @@
     </func>
 
     <func>
-      <name>write(ChannelPid, Handle, Data) -></name>
-      <name>write(ChannelPid, Handle, Data, Timeout) -> ok | {error, reason()}</name>
+      <name since="">write(ChannelPid, Handle, Data) -></name>
+      <name since="">write(ChannelPid, Handle, Data, Timeout) -> ok | {error, reason()}</name>
       <fsummary>Writes to an open file.</fsummary>
       <type>
         <v>ChannelPid = pid()</v>
@@ -625,8 +625,8 @@
     </func>
     
     <func>
-      <name>write_file(ChannelPid, File, Iolist) -></name>
-      <name>write_file(ChannelPid, File, Iolist, Timeout) -> ok | {error, reason()}</name>
+      <name since="">write_file(ChannelPid, File, Iolist) -></name>
+      <name since="">write_file(ChannelPid, File, Iolist, Timeout) -> ok | {error, reason()}</name>
       <fsummary>Writes a file.</fsummary>
       <type>
         <v>ChannelPid = pid()</v>
@@ -641,8 +641,8 @@
     </func>
     
     <func>
-      <name>write_file_info(ChannelPid, Name, Info) -></name>
-      <name>write_file_info(ChannelPid, Name, Info, Timeout) -> ok | {error, reason()}</name>
+      <name since="">write_file_info(ChannelPid, Name, Info) -></name>
+      <name since="">write_file_info(ChannelPid, Name, Info, Timeout) -> ok | {error, reason()}</name>
       <fsummary>Writes information for a file.</fsummary>
       <type>
         <v>ChannelPid = pid()</v>
diff --git a/lib/ssh/doc/src/ssh_sftpd.xml b/lib/ssh/doc/src/ssh_sftpd.xml
index 3b34150e98..ee72784add 100644
--- a/lib/ssh/doc/src/ssh_sftpd.xml
+++ b/lib/ssh/doc/src/ssh_sftpd.xml
@@ -29,7 +29,7 @@
     <rev></rev>
     <file>ssh_sftpd.sgml</file>
   </header>
-  <module>ssh_sftpd</module>
+  <module since="">ssh_sftpd</module>
   <modulesummary>Specifies the channel process to handle an SFTP subsystem.</modulesummary>
   <description>
     <p>Specifies a channel process to handle an SFTP subsystem.</p>
@@ -51,7 +51,7 @@
   </section>
   <funcs>
     <func>
-      <name>subsystem_spec(Options) -> subsystem_spec()</name>
+      <name since="">subsystem_spec(Options) -> subsystem_spec()</name>
       <fsummary>Returns the subsystem specification that allows an SSH daemon to handle the subsystem "sftp".</fsummary>
       <type>
 	<v>Options = [{Option, Value}]</v>
diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile
index 6d64a45112..9627b70eeb 100644
--- a/lib/ssh/src/Makefile
+++ b/lib/ssh/src/Makefile
@@ -99,7 +99,7 @@ APP_TARGET= $(EBIN)/$(APP_FILE)
 APPUP_SRC= $(APPUP_FILE).src
 APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
 
-INTERNAL_HRL_FILES = ssh_auth.hrl ssh_connect.hrl ssh_transport.hrl ssh.hrl ssh_userauth.hrl ssh_xfer.hrl
+INTERNAL_HRL_FILES = ssh_auth.hrl ssh_connect.hrl ssh_transport.hrl ssh.hrl ssh_xfer.hrl
 
 # ----------------------------------------------------
 # FLAGS
diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src
index 410061cded..2193c14611 100644
--- a/lib/ssh/src/ssh.app.src
+++ b/lib/ssh/src/ssh.app.src
@@ -44,10 +44,10 @@
   {env, []},
   {mod, {ssh_app, []}},
   {runtime_dependencies, [
-			  "crypto-4.2",
-			  "erts-6.0",
-			  "kernel-3.0",
-			  "public_key-1.5.2",
-			  "stdlib-3.3"
+			  "crypto-4.5",
+			  "erts-9.0",
+			  "kernel-5.3",
+			  "public_key-1.6.1",
+			  "stdlib-3.4.1"
 			 ]}]}.
 
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 086fa6e5f8..ff5aee14d7 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -127,7 +127,7 @@ connect(Socket, UserOptions, NegotiationTimeout) when is_port(Socket),
 	Options ->
             case valid_socket_to_use(Socket, ?GET_OPT(transport,Options)) of
 		ok ->
-		    {ok, {Host,_Port}} = inet:sockname(Socket),
+		    {ok, {Host,_Port}} = inet:peername(Socket),
 		    Opts = ?PUT_INTERNAL_OPT([{user_pid,self()}, {host,Host}], Options),
 		    ssh_connection_handler:start_connection(client, Socket, Opts, NegotiationTimeout);
 		{error,SockError} ->
@@ -270,25 +270,38 @@ daemon(Host0, Port0, UserOptions0) when 0 =< Port0, Port0 =< 65535,
     try
         {Host1, UserOptions} = handle_daemon_args(Host0, UserOptions0),
         #{} = Options0 = ssh_options:handle_options(server, UserOptions),
-
-        {{Host,Port}, ListenSocket} =
-            open_listen_socket(Host1, Port0, Options0),
-
-        %% Now Host,Port is what to use for the supervisor to register its name,
-        %% and ListenSocket is for listening on connections. But it is still owned
-        %% by self()...
-
-        finalize_start(Host, Port, ?GET_OPT(profile, Options0),
-                       ?PUT_INTERNAL_OPT({lsocket,{ListenSocket,self()}}, Options0),
-                       fun(Opts, Result) ->
-                               {_, Callback, _} = ?GET_OPT(transport, Opts),
-                               receive
-                                   {request_control, ListenSocket, ReqPid} ->
-                                       ok = Callback:controlling_process(ListenSocket, ReqPid),
-                                       ReqPid ! {its_yours,ListenSocket},
-                                       Result
-                               end
-                       end)
+        {open_listen_socket(Host1, Port0, Options0), Options0}
+    of
+        {{{Host,Port}, ListenSocket}, Options1} ->
+            try
+                %% Now Host,Port is what to use for the supervisor to register its name,
+                %% and ListenSocket is for listening on connections. But it is still owned
+                %% by self()...
+                finalize_start(Host, Port, ?GET_OPT(profile, Options1),
+                               ?PUT_INTERNAL_OPT({lsocket,{ListenSocket,self()}}, Options1),
+                               fun(Opts, Result) ->
+                                       {_, Callback, _} = ?GET_OPT(transport, Opts),
+                                       receive
+                                           {request_control, ListenSocket, ReqPid} ->
+                                               ok = Callback:controlling_process(ListenSocket, ReqPid),
+                                               ReqPid ! {its_yours,ListenSocket},
+                                               Result
+                                       end
+                               end)
+            of
+                {error,Err} ->
+                    close_listen_socket(ListenSocket, Options1),
+                    {error,Err};
+                OK ->
+                    OK
+            catch
+                error:Error ->
+                    close_listen_socket(ListenSocket, Options1),
+                    error(Error);
+                exit:Exit ->
+                    close_listen_socket(ListenSocket, Options1),
+                    exit(Exit)
+            end
     catch
         throw:bad_fd ->
             {error,bad_fd};
@@ -524,6 +537,15 @@ open_listen_socket(_Host0, Port0, Options0) ->
     {{LHost,LPort}, LSock}.
 
 %%%----------------------------------------------------------------
+close_listen_socket(ListenSocket, Options) ->
+    try
+        {_, Callback, _} = ?GET_OPT(transport, Options),
+        Callback:close(ListenSocket)
+    catch
+        _C:_E -> ok
+    end.
+
+%%%----------------------------------------------------------------
 finalize_start(Host, Port, Profile, Options0, F) ->
     try
         %% throws error:Error if no usable hostkey is found
diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl
index 923e9309f4..a991f72cf2 100644
--- a/lib/ssh/src/ssh.hrl
+++ b/lib/ssh/src/ssh.hrl
@@ -68,6 +68,25 @@
 -define(string(X), ?string_utf8(X)).
 -define(binary(X), << ?STRING(X) >>).
 
+-define('2bin'(X), (if is_binary(X) -> X;
+		       is_list(X) -> list_to_binary(X);
+		       X==undefined -> <<>>
+		    end) ).
+
+%% encoding macros
+-define('E...'(X),    ?'2bin'(X)/binary ).
+-define(Eboolean(X),  ?BOOLEAN(case X of
+				   true -> ?TRUE;
+				   false -> ?FALSE
+			       end) ).
+-define(Ebyte(X),        ?BYTE(X) ).
+-define(Euint32(X),      ?UINT32(X) ).
+-define(Estring(X),      ?STRING(?'2bin'(X)) ).
+-define(Estring_utf8(X), ?string_utf8(X)/binary ).
+-define(Ename_list(X),   ?STRING(ssh_bits:name_list(X)) ).
+-define(Empint(X),       (ssh_bits:mpint(X))/binary ).
+-define(Ebinary(X),      ?STRING(X) ).
+
 %% Cipher details
 -define(SSH_CIPHER_NONE, 0).
 -define(SSH_CIPHER_3DES, 3).
@@ -293,7 +312,8 @@
       | gen_tcp:listen_option()
       | ?COMMON_OPTION .
 
--type subsystem_daemon_option() :: {subsystems, subsystem_spec()}.
+-type subsystem_daemon_option() :: {subsystems, subsystem_specs()}.
+-type subsystem_specs() :: [ subsystem_spec() ].
 
 -type shell_daemon_option()     :: {shell, mod_fun_args() | 'shell_fun/1'()  | 'shell_fun/2'() }.
 -type 'shell_fun/1'() :: fun((User::string()) -> pid()) .
@@ -396,11 +416,13 @@
 	  recv_mac_size = 0,
 
 	  encrypt = none,       %% encrypt algorithm
+          encrypt_cipher,       %% cipher. could be different from the algorithm
 	  encrypt_keys,         %% encrypt keys
 	  encrypt_block_size = 8,
 	  encrypt_ctx,
 
 	  decrypt = none,       %% decrypt algorithm
+          decrypt_cipher,       %% cipher. could be different from the algorithm
 	  decrypt_keys,         %% decrypt keys
 	  decrypt_block_size = 8,
 	  decrypt_ctx,          %% Decryption context   
@@ -457,14 +479,6 @@
           recv_ext_info
 	 }).
 
--record(ssh_key,
-	{
-	  type,
-	  public,
-	  private,
-	  comment = ""
-	 }).
-
 -record(ssh_pty, {term = "", % e.g. "xterm"
 		  width = 80,
 		  height = 25,
@@ -472,13 +486,6 @@
 		  pixel_height = 768,
 		  modes = <<>>}).
 
-%% assertion macro
--define(ssh_assert(Expr, Reason),
-	case Expr of
-	    true -> ok;
-	    _ -> exit(Reason)
-	end).
-
 
 %% dbg help macros
 -define(wr_record(N,BlackList),
diff --git a/lib/ssh/src/ssh_channel.erl b/lib/ssh/src/ssh_channel.erl
index 443bd05086..1d977e3bc9 100644
--- a/lib/ssh/src/ssh_channel.erl
+++ b/lib/ssh/src/ssh_channel.erl
@@ -58,6 +58,7 @@
  					    State::term()}.
 %%% API
 -export([start/4, start/5, start_link/4, start_link/5, call/2, call/3,
+         init/1,
 	 cast/2, reply/2, enter_loop/1]).
 
 %%====================================================================
@@ -76,6 +77,9 @@ cast(ChannelPid, Msg) ->
 reply(From, Msg) ->
     ssh_client_channel:reply(From, Msg).
 
+init(Args) ->
+    ssh_client_channel:init(Args).
+
 start(ConnectionManager, ChannelId, CallBack, CbInitArgs) ->
     ssh_client_channel:start(ConnectionManager, ChannelId, CallBack, CbInitArgs).
 
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index 7c87591cf2..9df4f1e2d7 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -386,16 +386,24 @@ init_connection_handler(Role, Socket, Opts) ->
                                   D);
 
         {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)
-                           },
+            D = try
+                    %% Only servers have supervisorts defined in Opts
+                    Sups = ?GET_INTERNAL_OPT(supervisors, Opts),
+                    #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)
+                               }
+                of
+                    C ->
+                        #data{connection_state=C}
+                catch
+                    _:_ ->
+                        #data{connection_state=#connection{}}
+                end,
             gen_statem:enter_loop(?MODULE,
                                   [],
                                   {init_error,Error},
-                                  #data{connection_state=C,
-                                        socket=Socket})
+                                  D#data{socket=Socket})
     end.
 
 
@@ -594,7 +602,7 @@ handle_event(_, socket_control, {hello,_}=StateName, D) ->
 	    {stop, {shutdown,{unexpected_getopts_return, Other}}}
     end;
 
-handle_event(_, {info_line,_Line}, {hello,Role}=StateName, D) ->
+handle_event(_, {info_line,Line}, {hello,Role}=StateName, D) ->
     case Role of
 	client ->
 	    %% The server may send info lines to the client before the version_exchange
@@ -605,9 +613,9 @@ handle_event(_, {info_line,_Line}, {hello,Role}=StateName, D) ->
 	    %% But the client may NOT send them to the server. Openssh answers with cleartext,
 	    %% and so do we
 	    send_bytes("Protocol mismatch.", D),
-            ?call_disconnectfun_and_log_cond("Protocol mismatch.", 
-                                             "Protocol mismatch in version exchange. Client sent info lines.",
-                                             StateName, D),
+            Msg = io_lib:format("Protocol mismatch in version exchange. Client sent info lines.~n~s",
+                                [ssh_dbg:hex_dump(Line, 64)]),
+            ?call_disconnectfun_and_log_cond("Protocol mismatch.", Msg, StateName, D),
 	    {stop, {shutdown,"Protocol mismatch in version exchange. Client sent info lines."}}
     end;
 
@@ -1550,7 +1558,7 @@ terminate({shutdown,"Connection closed"}, _StateName, D) ->
 
 terminate({shutdown,{init,Reason}}, StateName, D) ->
     %% Error in initiation. "This error should not occur".
-    log(error, D, io_lib:format("Shutdown in init (StateName=~p): ~p~n",[StateName,Reason])),
+    log(error, D, "Shutdown in init (StateName=~p): ~p~n", [StateName,Reason]),
     stop_subsystem(D),
     close_transport(D);
 
@@ -1952,12 +1960,12 @@ send_disconnect(Code, Reason, DetailedText, Module, Line, StateName, D0) ->
 call_disconnectfun_and_log_cond(LogMsg, DetailedText, Module, Line, StateName, D) ->
     case disconnect_fun(LogMsg, D) of
         void ->
-            log(info, D, 
-                io_lib:format("~s~n"
-                              "State = ~p~n"
-                              "Module = ~p, Line = ~p.~n"
-                              "Details:~n  ~s~n",
-                              [LogMsg, StateName, Module, Line, DetailedText]));
+            log(info, D,
+                "~s~n"
+                "State = ~p~n"
+                "Module = ~p, Line = ~p.~n"
+                "Details:~n  ~s~n",
+                [LogMsg, StateName, Module, Line, DetailedText]);
         _ ->
             ok
     end.
@@ -2021,6 +2029,9 @@ fold_keys(Keys, Fun, Extra) ->
 		end, [], Keys).
 
 %%%----------------------------------------------------------------
+log(Tag, D, Format, Args) ->
+    log(Tag, D, io_lib:format(Format,Args)).
+
 log(Tag, D, Reason) ->
     case atom_to_list(Tag) of                   % Dialyzer-technical reasons...
         "error"   -> do_log(error_msg,   Reason, D);
@@ -2028,36 +2039,50 @@ log(Tag, D, Reason) ->
         "info"    -> do_log(info_msg,    Reason, D)
     end.
 
-do_log(F, Reason, #data{ssh_params = #ssh{role = Role} = S
-                       }) ->
-    VSN =
-        case application:get_key(ssh,vsn) of
-            {ok,Vsn} -> Vsn;
-            undefined -> ""
-        end,
-    PeerVersion =
-        case Role of
-            server -> S#ssh.c_version;
-            client -> S#ssh.s_version
-        end,
-    CryptoInfo =
-        try 
-            [{_,_,CI}] = crypto:info_lib(),
-            <<"(",CI/binary,")">>
-        catch
-            _:_ -> ""
-        end,
-    Other =
-         case Role of
-            server -> "Client";
-            client -> "Server"
-        end,
-    error_logger:F("Erlang SSH ~p ~s ~s.~n"
-                   "~s: ~p~n"
-                   "~s~n",
-                   [Role, VSN, CryptoInfo, 
-                    Other, PeerVersion,
-                    Reason]).
+
+do_log(F, Reason, #data{ssh_params = S}) ->
+    case S of
+        #ssh{role = Role} when Role==server ;
+                               Role==client ->
+            {PeerRole,PeerVersion} =
+                case Role of
+                    server -> {"Client", S#ssh.c_version};
+                    client -> {"Server", S#ssh.s_version}
+                end,
+            error_logger:F("Erlang SSH ~p ~s ~s.~n"
+                           "~s: ~p~n"
+                           "~s~n",
+                           [Role,
+                            ssh_log_version(), crypto_log_info(), 
+                            PeerRole, PeerVersion,
+                            Reason]);
+        _ ->
+            error_logger:F("Erlang SSH ~s ~s.~n"
+                           "~s~n",
+                           [ssh_log_version(), crypto_log_info(), 
+                            Reason])
+    end.
+
+crypto_log_info() ->
+    try 
+        [{_,_,CI}] = crypto:info_lib(),
+        case crypto:info_fips() of
+            enabled ->
+                <<"(",CI/binary,". FIPS enabled)">>;
+            not_enabled ->
+                <<"(",CI/binary,". FIPS available but not enabled)">>;
+            _ ->
+                <<"(",CI/binary,")">>
+        end
+    catch
+        _:_ -> ""
+    end.
+
+ssh_log_version() ->
+    case application:get_key(ssh,vsn) of
+        {ok,Vsn} -> Vsn;
+        undefined -> ""
+    end.
 
 %%%----------------------------------------------------------------
 not_connected_filter({connection_reply, _Data}) -> true;
diff --git a/lib/ssh/src/ssh_dbg.erl b/lib/ssh/src/ssh_dbg.erl
index 4fe15b24d3..43ac4c0ccf 100644
--- a/lib/ssh/src/ssh_dbg.erl
+++ b/lib/ssh/src/ssh_dbg.erl
@@ -60,6 +60,7 @@
          cbuf_stop_clear/0,
          cbuf_in/1,
          cbuf_list/0,
+         hex_dump/1, hex_dump/2,
          fmt_cbuf_items/0, fmt_cbuf_item/1
 	]).
 
@@ -439,3 +440,75 @@ fmt_value(#circ_buf_entry{module = M,
     io_lib:format("~p:~p  ~p/~p ~p~n~s",[M,L,F,A,Pid,fmt_value(V)]);
 fmt_value(Value) ->
     io_lib:format("~p",[Value]).
+
+%%%================================================================
+
+-record(h, {max_bytes = 65536,
+            bytes_per_line = 16,
+            address_len = 4
+           }).
+
+
+hex_dump(Data) -> hex_dump1(Data, hd_opts([])).
+
+hex_dump(X, Max) when is_integer(Max) ->
+    hex_dump(X, [{max_bytes,Max}]);
+hex_dump(X, OptList) when is_list(OptList) ->
+    hex_dump1(X, hd_opts(OptList)).
+
+hex_dump1(B, Opts) when is_binary(B) -> hex_dump1(binary_to_list(B), Opts);
+hex_dump1(L, Opts) when is_list(L), length(L) > Opts#h.max_bytes ->
+    io_lib:format("~s---- skip ~w bytes----~n", [hex_dump1(lists:sublist(L,Opts#h.max_bytes), Opts),
+                                                 length(L) - Opts#h.max_bytes
+                                                ]);
+hex_dump1(L, Opts0) when is_list(L) ->
+    Opts = Opts0#h{address_len = num_hex_digits(Opts0#h.max_bytes)},
+    Result = hex_dump(L, [{0,[],[]}], Opts),
+    [io_lib:format("~*.s | ~*s | ~s~n"
+                   "~*.c-+-~*c-+-~*c~n",
+                   [Opts#h.address_len, lists:sublist("Address",Opts#h.address_len),
+                    -3*Opts#h.bytes_per_line, lists:sublist("Hexdump",3*Opts#h.bytes_per_line),
+                    "ASCII",
+                    Opts#h.address_len, $-,
+                    3*Opts#h.bytes_per_line, $-,
+                    Opts#h.bytes_per_line, $-
+                   ]) |
+     [io_lib:format("~*.16.0b | ~s~*c | ~s~n",[Opts#h.address_len, N*Opts#h.bytes_per_line,
+                                               lists:reverse(Hexs),
+                                               3*(Opts#h.bytes_per_line-length(Hexs)), $ ,
+                                               lists:reverse(Chars)])
+      || {N,Hexs,Chars}  <- lists:reverse(Result)
+     ]
+    ].
+
+
+hd_opts(L) -> lists:foldl(fun hd_opt/2, #h{}, L).
+
+hd_opt({max_bytes,M},      O) -> O#h{max_bytes=M};
+hd_opt({bytes_per_line,M}, O) -> O#h{bytes_per_line=M}.
+
+
+num_hex_digits(N) when N<16 -> 1;
+num_hex_digits(N) -> trunc(math:ceil(math:log2(N)/4)).
+    
+
+hex_dump([L|Cs], Result0, Opts) when is_list(L) ->
+    Result = hex_dump(L,Result0, Opts),
+    hex_dump(Cs, Result, Opts);
+
+hex_dump(Cs, [{N0,_,Chars}|_]=Lines, Opts) when length(Chars) == Opts#h.bytes_per_line ->
+    hex_dump(Cs, [{N0+1,[],[]}|Lines], Opts);
+
+hex_dump([C|Cs], [{N,Hexs,Chars}|Lines], Opts) ->
+    Asc = if
+              16#20 =< C,C =< 16#7E -> C;
+              true -> $.
+          end,
+    Hex = io_lib:format("~2.16.0b ", [C]),
+    hex_dump(Cs, [{N, [Hex|Hexs], [Asc|Chars]} | Lines], Opts);
+
+hex_dump([], Result, _) ->
+    Result.
+
+    
+    
diff --git a/lib/ssh/src/ssh_message.erl b/lib/ssh/src/ssh_message.erl
index d95e58c1bb..7c86a81108 100644
--- a/lib/ssh/src/ssh_message.erl
+++ b/lib/ssh/src/ssh_message.erl
@@ -34,24 +34,6 @@
 
 -export([dbg_trace/3]).
 
--define('2bin'(X), (if is_binary(X) -> X;
-		       is_list(X) -> list_to_binary(X);
-		       X==undefined -> <<>>
-		    end) ).
-
--define('E...'(X),    ?'2bin'(X)/binary ).
--define(Eboolean(X),  ?BOOLEAN(case X of
-				   true -> ?TRUE;
-				   false -> ?FALSE
-			       end) ).
--define(Ebyte(X),        ?BYTE(X) ).
--define(Euint32(X),      ?UINT32(X) ).
--define(Estring(X),      ?STRING(?'2bin'(X)) ).
--define(Estring_utf8(X), ?string_utf8(X)/binary ).
--define(Ename_list(X),   ?STRING(ssh_bits:name_list(X)) ).
--define(Empint(X),       (ssh_bits:mpint(X))/binary ).
--define(Ebinary(X),      ?STRING(X) ).
-
 ucl(B) ->
     try unicode:characters_to_list(B) of
 	L when is_list(L) -> L;
diff --git a/lib/ssh/src/ssh_sftpd.erl b/lib/ssh/src/ssh_sftpd.erl
index 278f6a9780..5ec12e2d04 100644
--- a/lib/ssh/src/ssh_sftpd.erl
+++ b/lib/ssh/src/ssh_sftpd.erl
@@ -508,11 +508,8 @@ close_our_file({_,Fd}, FileMod, FS0) ->
     FS1.
 
 %%% stat: do the stat
-stat(Vsn, ReqId, Data, State, F) when Vsn =< 3->
-    <<?UINT32(BLen), BPath:BLen/binary>> = Data,
-    stat(ReqId, unicode:characters_to_list(BPath), State, F);
-stat(Vsn, ReqId, Data, State, F) when Vsn >= 4->
-    <<?UINT32(BLen), BPath:BLen/binary, ?UINT32(_Flags)>> = Data,
+stat(_Vsn, ReqId, Data, State, F) ->
+    <<?UINT32(BLen), BPath:BLen/binary, _/binary>> = Data,
     stat(ReqId, unicode:characters_to_list(BPath), State, F).
 
 fstat(Vsn, ReqId, Data, State) when Vsn =< 3->
diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl
index 9ff20454cd..a85926354e 100644
--- a/lib/ssh/src/ssh_transport.erl
+++ b/lib/ssh/src/ssh_transport.erl
@@ -61,14 +61,6 @@
 -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;
-				is_list(X) -> list_to_binary(X);
-				X==undefined -> <<>>
-			     end))).
--define(Empint(X),     (ssh_bits:mpint(X))/binary ).
--define(Ebinary(X),    ?STRING(X) ).
--define(Euint32(X),   ?UINT32(X) ).
-
 %%%----------------------------------------------------------------------------
 %%%
 %%% There is a difference between supported and default algorithms. The
@@ -162,15 +154,15 @@ supported_algorithms(cipher) ->
       select_crypto_supported(
 	[
          {'[email protected]', [{ciphers,chacha20}, {macs,poly1305}]},
-         {'[email protected]', [{ciphers,{aes_gcm,256}}]},
-         {'aes256-ctr',       [{ciphers,{aes_ctr,256}}]},
-         {'aes192-ctr',       [{ciphers,{aes_ctr,192}}]},
-	 {'[email protected]', [{ciphers,{aes_gcm,128}}]},
-	 {'aes128-ctr',       [{ciphers,{aes_ctr,128}}]},
-	 {'AEAD_AES_256_GCM', [{ciphers,{aes_gcm,256}}]},
-	 {'AEAD_AES_128_GCM', [{ciphers,{aes_gcm,128}}]},
-	 {'aes128-cbc',       [{ciphers,aes_cbc128}]},
-	 {'3des-cbc',         [{ciphers,des3_cbc}]}
+         {'[email protected]', [{ciphers,aes_256_gcm}]},
+         {'aes256-ctr',       [{ciphers,aes_256_ctr}]},
+         {'aes192-ctr',       [{ciphers,aes_192_ctr}]},
+	 {'[email protected]', [{ciphers,aes_128_gcm}]},
+	 {'aes128-ctr',       [{ciphers,aes_128_ctr}]},
+	 {'AEAD_AES_256_GCM', [{ciphers,aes_256_gcm}]},
+	 {'AEAD_AES_128_GCM', [{ciphers,aes_128_gcm}]},
+	 {'aes128-cbc',       [{ciphers,aes_128_cbc}]},
+	 {'3des-cbc',         [{ciphers,des_ede3_cbc}]}
 	]
        ));
 supported_algorithms(mac) ->
@@ -179,8 +171,8 @@ supported_algorithms(mac) ->
 	[{'hmac-sha2-256',    [{macs,hmac}, {hashs,sha256}]},
 	 {'hmac-sha2-512',    [{macs,hmac}, {hashs,sha512}]},
 	 {'hmac-sha1',        [{macs,hmac}, {hashs,sha}]},
-	 {'AEAD_AES_128_GCM', [{ciphers,{aes_gcm,128}}]},
-	 {'AEAD_AES_256_GCM', [{ciphers,{aes_gcm,256}}]}
+	 {'AEAD_AES_128_GCM', [{ciphers,aes_128_gcm}]},
+	 {'AEAD_AES_256_GCM', [{ciphers,aes_256_gcm}]}
 	]
        ));
 supported_algorithms(compression) ->
@@ -1256,11 +1248,6 @@ get_length(aead, EncryptedBuffer, Ssh) ->
     end.
 
 
-pkt_type('AEAD_AES_128_GCM') -> aead;
-pkt_type('AEAD_AES_256_GCM') -> aead;
-pkt_type('[email protected]') -> aead;
-pkt_type(_) -> common.
-
 payload(<<PacketLen:32, PaddingLen:8, PayloadAndPadding/binary>>) ->
     PayloadLen = PacketLen - PaddingLen - 1,
     <<Payload:PayloadLen/binary, _/binary>> = PayloadAndPadding,
@@ -1323,231 +1310,163 @@ verify(PlainText, HashAlg, Sig, Key, _) ->
 
 %%% Unit: bytes
 
--record(cipher_data, {
-          key_bytes,
-          iv_bytes,
-          block_bytes
-         }).
+-record(cipher, {
+                 impl,
+                 key_bytes,
+                 iv_bytes,
+                 block_bytes,
+                 pkt_type = common
+                }).
 
 %%% Start of a more parameterized crypto handling.
 cipher('AEAD_AES_128_GCM') ->
-    #cipher_data{key_bytes = 16,
-                 iv_bytes = 12,
-                 block_bytes = 16};
+    #cipher{impl = aes_128_gcm,
+            key_bytes = 16,
+            iv_bytes = 12,
+            block_bytes = 16,
+            pkt_type = aead};
 
 cipher('AEAD_AES_256_GCM') ->
-    #cipher_data{key_bytes = 32,
-                 iv_bytes = 12,
-                 block_bytes = 16};
+    #cipher{impl = aes_256_gcm,
+            key_bytes = 32,
+            iv_bytes = 12,
+            block_bytes = 16,
+            pkt_type = aead};
 
 cipher('3des-cbc') ->
-    #cipher_data{key_bytes = 24,
-                 iv_bytes = 8,
-                 block_bytes = 8};
+    #cipher{impl = des_ede3_cbc,
+            key_bytes = 24,
+            iv_bytes = 8,
+            block_bytes = 8};
     
 cipher('aes128-cbc') ->
-    #cipher_data{key_bytes = 16,
-                 iv_bytes = 16,
-                 block_bytes = 16};
+    #cipher{impl = aes_128_cbc,
+            key_bytes = 16,
+            iv_bytes = 16,
+            block_bytes = 16};
 
 cipher('aes128-ctr') ->
-    #cipher_data{key_bytes = 16,
-                 iv_bytes = 16,
-                 block_bytes = 16};
+    #cipher{impl = aes_128_ctr,
+            key_bytes = 16,
+            iv_bytes = 16,
+            block_bytes = 16};
 
 cipher('aes192-ctr') ->
-    #cipher_data{key_bytes = 24,
-                 iv_bytes = 16,
-                 block_bytes = 16};
+    #cipher{impl = aes_192_ctr,
+            key_bytes = 24,
+            iv_bytes = 16,
+            block_bytes = 16};
 
 cipher('aes256-ctr') ->
-    #cipher_data{key_bytes = 32,
-                 iv_bytes = 16,
-                 block_bytes = 16};
+    #cipher{impl = aes_256_ctr,
+            key_bytes = 32,
+            iv_bytes = 16,
+            block_bytes = 16};
 
 cipher('[email protected]') -> % FIXME: Verify!!
-    #cipher_data{key_bytes = 32,
-                 iv_bytes = 12,
-                 block_bytes = 8}.
-    
+    #cipher{impl = chacha20_poly1305,
+            key_bytes = 32,
+            iv_bytes = 12,
+            block_bytes = 8,
+            pkt_type = aead};
+
+cipher(_) -> 
+    #cipher{}.
+
+
+pkt_type(SshCipher) -> (cipher(SshCipher))#cipher.pkt_type.
+
+decrypt_magic(server) -> {"A", "C"};
+decrypt_magic(client) -> {"B", "D"}.
+
+encrypt_magic(client) -> decrypt_magic(server);
+encrypt_magic(server) -> decrypt_magic(client).
+
 
 
 encrypt_init(#ssh{encrypt = none} = Ssh) ->
     {ok, Ssh};
-encrypt_init(#ssh{encrypt = '[email protected]', role = client} = Ssh) ->
+
+encrypt_init(#ssh{encrypt = '[email protected]', role = Role} = Ssh) ->
     %% [email protected] uses two independent crypto streams, one (chacha20)
     %% for the length used in stream mode, and the other (chacha20-poly1305) as AEAD for
     %% the payload and to MAC the length||payload.
     %% See draft-josefsson-ssh-chacha20-poly1305-openssh-00
-    <<K2:32/binary,K1:32/binary>> = hash(Ssh, "C", 512),
+    {_, KeyMagic} = encrypt_magic(Role),
+    <<K2:32/binary,K1:32/binary>> = hash(Ssh, KeyMagic, 8*64),
     {ok, Ssh#ssh{encrypt_keys = {K1,K2}
                 % encrypt_block_size = 16, %default = 8.  What to set it to? 64 (openssl chacha.h)
                  % ctx and iv is setup for each packet
                 }};
-encrypt_init(#ssh{encrypt = '[email protected]', role = server} = Ssh) ->
-    <<K2:32/binary,K1:32/binary>> = hash(Ssh, "D", 512),
-    {ok, Ssh#ssh{encrypt_keys = {K1,K2}
-                % encrypt_block_size = 16, %default = 8.  What to set it to?
-                }};
-encrypt_init(#ssh{encrypt = 'AEAD_AES_128_GCM', role = client} = Ssh) ->
-    IV = hash(Ssh, "A", 12*8),
-    <<K:16/binary>> = hash(Ssh, "C", 128),
-    {ok, Ssh#ssh{encrypt_keys = K,
-		 encrypt_block_size = 16,
-		 encrypt_ctx = IV}};
-encrypt_init(#ssh{encrypt = 'AEAD_AES_128_GCM', role = server} = Ssh) ->
-    IV = hash(Ssh, "B", 12*8),
-    <<K:16/binary>> = hash(Ssh, "D", 128),
-    {ok, Ssh#ssh{encrypt_keys = K,
-		 encrypt_block_size = 16,
-		 encrypt_ctx = IV}};
-encrypt_init(#ssh{encrypt = 'AEAD_AES_256_GCM', role = client} = Ssh) ->
-    IV = hash(Ssh, "A", 12*8),
-    <<K:32/binary>> = hash(Ssh, "C", 256),
-    {ok, Ssh#ssh{encrypt_keys = K,
-		 encrypt_block_size = 16,
-		 encrypt_ctx = IV}};
-encrypt_init(#ssh{encrypt = 'AEAD_AES_256_GCM', role = server} = Ssh) ->
-    IV = hash(Ssh, "B", 12*8),
-    <<K:32/binary>> = hash(Ssh, "D", 256),
-    {ok, Ssh#ssh{encrypt_keys = K,
-		 encrypt_block_size = 16,
-		 encrypt_ctx = IV}};
-encrypt_init(#ssh{encrypt = '3des-cbc', role = client} = Ssh) ->
-    IV = hash(Ssh, "A", 64),
-    <<K1:8/binary, K2:8/binary, K3:8/binary>> = hash(Ssh, "C", 192),
-    {ok, Ssh#ssh{encrypt_keys = {K1,K2,K3},
-		 encrypt_block_size = 8,
-		 encrypt_ctx = IV}};
-encrypt_init(#ssh{encrypt = '3des-cbc', role = server} = Ssh) ->
-    IV = hash(Ssh, "B", 64),
-    <<K1:8/binary, K2:8/binary, K3:8/binary>> = hash(Ssh, "D", 192),
-    {ok, Ssh#ssh{encrypt_keys = {K1,K2,K3},
-		 encrypt_block_size = 8,
-		 encrypt_ctx = IV}};
-encrypt_init(#ssh{encrypt = 'aes128-cbc', role = client} = Ssh) ->
-    IV = hash(Ssh, "A", 128),
-    <<K:16/binary>> = hash(Ssh, "C", 128),
-    {ok, Ssh#ssh{encrypt_keys = K,
-		 encrypt_block_size = 16,
+
+encrypt_init(#ssh{encrypt = SshCipher, role = Role} = Ssh) when SshCipher == 'AEAD_AES_128_GCM';
+                                                                SshCipher == 'AEAD_AES_256_GCM' ->
+    {IvMagic, KeyMagic} = encrypt_magic(Role),
+    #cipher{impl = CryptoCipher,
+            key_bytes = KeyBytes,
+            iv_bytes = IvBytes,
+            block_bytes = BlockBytes} = cipher(SshCipher),
+    IV = hash(Ssh, IvMagic, 8*IvBytes),
+    K = hash(Ssh, KeyMagic, 8*KeyBytes),
+    {ok, Ssh#ssh{encrypt_cipher = CryptoCipher,
+                 encrypt_keys = K,
+		 encrypt_block_size = BlockBytes,
 		 encrypt_ctx = IV}};
-encrypt_init(#ssh{encrypt = 'aes128-cbc', role = server} = Ssh) ->
-    IV = hash(Ssh, "B", 128),
-    <<K:16/binary>> = hash(Ssh, "D", 128),
-    {ok, Ssh#ssh{encrypt_keys = K,
-		 encrypt_block_size = 16,
-                 encrypt_ctx = IV}};
-encrypt_init(#ssh{encrypt = 'aes128-ctr', role = client} = Ssh) ->
-    IV = hash(Ssh, "A", 128),
-    <<K:16/binary>> = hash(Ssh, "C", 128),
-    State = crypto:stream_init(aes_ctr, K, IV),
-    {ok, Ssh#ssh{encrypt_keys = K,
-		 encrypt_block_size = 16,
-                 encrypt_ctx = State}};
-encrypt_init(#ssh{encrypt = 'aes192-ctr', role = client} = Ssh) ->
-    IV = hash(Ssh, "A", 128),
-    <<K:24/binary>> = hash(Ssh, "C", 192),
-    State = crypto:stream_init(aes_ctr, K, IV),
-    {ok, Ssh#ssh{encrypt_keys = K,
-		 encrypt_block_size = 16,
-                 encrypt_ctx = State}};
-encrypt_init(#ssh{encrypt = 'aes256-ctr', role = client} = Ssh) ->
-    IV = hash(Ssh, "A", 128),
-    <<K:32/binary>> = hash(Ssh, "C", 256),
-    State = crypto:stream_init(aes_ctr, K, IV),
-    {ok, Ssh#ssh{encrypt_keys = K,
-		 encrypt_block_size = 16,
-                 encrypt_ctx = State}};
-encrypt_init(#ssh{encrypt = 'aes128-ctr', role = server} = Ssh) ->
-    IV = hash(Ssh, "B", 128),
-    <<K:16/binary>> = hash(Ssh, "D", 128),
-    State = crypto:stream_init(aes_ctr, K, IV),
-    {ok, Ssh#ssh{encrypt_keys = K,
-		 encrypt_block_size = 16,
-                 encrypt_ctx = State}};
-encrypt_init(#ssh{encrypt = 'aes192-ctr', role = server} = Ssh) ->
-    IV = hash(Ssh, "B", 128),
-    <<K:24/binary>> = hash(Ssh, "D", 192),
-    State = crypto:stream_init(aes_ctr, K, IV),
-    {ok, Ssh#ssh{encrypt_keys = K,
-		 encrypt_block_size = 16,
-                 encrypt_ctx = State}};
-encrypt_init(#ssh{encrypt = 'aes256-ctr', role = server} = Ssh) ->
-    IV = hash(Ssh, "B", 128),
-    <<K:32/binary>> = hash(Ssh, "D", 256),
-    State = crypto:stream_init(aes_ctr, K, IV),
-    {ok, Ssh#ssh{encrypt_keys = K,
-		 encrypt_block_size = 16,
-                 encrypt_ctx = State}}.
+
+encrypt_init(#ssh{encrypt = SshCipher, role = Role} = Ssh) ->
+    {IvMagic, KeyMagic} = encrypt_magic(Role),
+    #cipher{impl = CryptoCipher,
+            key_bytes = KeyBytes,
+            iv_bytes = IvBytes,
+            block_bytes = BlockBytes} = cipher(SshCipher),
+    IV = hash(Ssh, IvMagic, 8*IvBytes),
+    K = hash(Ssh, KeyMagic, 8*KeyBytes),
+    Ctx0 = crypto:crypto_init(CryptoCipher, K, IV, true),
+    {ok, Ssh#ssh{encrypt_cipher = CryptoCipher,
+                 encrypt_block_size = BlockBytes,
+                 encrypt_ctx = Ctx0}}.
 
 encrypt_final(Ssh) ->
-    {ok, Ssh#ssh{encrypt = none, 
+    {ok, Ssh#ssh{encrypt = none,
 		 encrypt_keys = undefined,
 		 encrypt_block_size = 8,
 		 encrypt_ctx = undefined
 		}}.
 
+
 encrypt(#ssh{encrypt = none} = Ssh, Data) ->
     {Ssh, Data};
+
 encrypt(#ssh{encrypt = '[email protected]',
              encrypt_keys = {K1,K2},
              send_sequence = Seq} = Ssh,
         <<LenData:4/binary, PayloadData/binary>>) ->
     %% Encrypt length
     IV1 = <<0:8/unit:8, Seq:8/unit:8>>,
-    {_,EncLen} = crypto:stream_encrypt(crypto:stream_init(chacha20, K1, IV1),
-                                            LenData),
+    EncLen = crypto:crypto_one_time(chacha20, K1, IV1, LenData, true),
     %% Encrypt payload
     IV2 = <<1:8/little-unit:8, Seq:8/unit:8>>,
-     {_,EncPayloadData} = crypto:stream_encrypt(crypto:stream_init(chacha20, K2, IV2),
-                                                PayloadData),
-
+    EncPayloadData = crypto:crypto_one_time(chacha20, K2, IV2, PayloadData, true),
     %% MAC tag
-    {_,PolyKey} = crypto:stream_encrypt(crypto:stream_init(chacha20, K2, <<0:8/unit:8,Seq:8/unit:8>>),
-                                        <<0:32/unit:8>>),
+    PolyKey = crypto:crypto_one_time(chacha20, K2, <<0:8/unit:8,Seq:8/unit:8>>, <<0:32/unit:8>>, true),
     EncBytes = <<EncLen/binary,EncPayloadData/binary>>,
     Ctag = crypto:poly1305(PolyKey, EncBytes),
     %% Result
     {Ssh, {EncBytes,Ctag}};
-encrypt(#ssh{encrypt = 'AEAD_AES_128_GCM',
-            encrypt_keys = K,
+
+encrypt(#ssh{encrypt = SshCipher,
+             encrypt_cipher = CryptoCipher,
+             encrypt_keys = K,
              encrypt_ctx = IV0} = Ssh,
-        <<LenData:4/binary, PayloadData/binary>>) ->
-    {Ctext,Ctag} = crypto:block_encrypt(aes_gcm, K, IV0, {LenData,PayloadData}),
-    IV = next_gcm_iv(IV0),
-    {Ssh#ssh{encrypt_ctx = IV}, {<<LenData/binary,Ctext/binary>>,Ctag}};
-encrypt(#ssh{encrypt = 'AEAD_AES_256_GCM',
-            encrypt_keys = K,
-             encrypt_ctx = IV0} = Ssh, 
-        <<LenData:4/binary, PayloadData/binary>>) ->
-    {Ctext,Ctag} = crypto:block_encrypt(aes_gcm, K, IV0, {LenData,PayloadData}),
+        <<LenData:4/binary, PayloadData/binary>>) when SshCipher == 'AEAD_AES_128_GCM' ;
+                                                       SshCipher == 'AEAD_AES_256_GCM' ->
+    {Ctext,Ctag} = crypto:crypto_one_time_aead(CryptoCipher, K, IV0, PayloadData, LenData, true),
     IV = next_gcm_iv(IV0),
     {Ssh#ssh{encrypt_ctx = IV}, {<<LenData/binary,Ctext/binary>>,Ctag}};
-encrypt(#ssh{encrypt = '3des-cbc',
-	     encrypt_keys = {K1,K2,K3},
-	     encrypt_ctx = IV0} = Ssh, Data) ->
-    Enc = crypto:block_encrypt(des3_cbc, [K1,K2,K3], IV0, Data),
-    IV = crypto:next_iv(des3_cbc, Enc),
-    {Ssh#ssh{encrypt_ctx = IV}, Enc};
-encrypt(#ssh{encrypt = 'aes128-cbc',
-            encrypt_keys = K,
-            encrypt_ctx = IV0} = Ssh, Data) ->
-    Enc = crypto:block_encrypt(aes_cbc128, K,IV0,Data),
-    IV = crypto:next_iv(aes_cbc, Enc),
-    {Ssh#ssh{encrypt_ctx = IV}, Enc};
-encrypt(#ssh{encrypt = 'aes128-ctr',
-            encrypt_ctx = State0} = Ssh, Data) ->
-    {State, Enc} = crypto:stream_encrypt(State0,Data),
-    {Ssh#ssh{encrypt_ctx = State}, Enc};
-encrypt(#ssh{encrypt = 'aes192-ctr',
-            encrypt_ctx = State0} = Ssh, Data) ->
-    {State, Enc} = crypto:stream_encrypt(State0,Data),
-    {Ssh#ssh{encrypt_ctx = State}, Enc};
-encrypt(#ssh{encrypt = 'aes256-ctr',
-            encrypt_ctx = State0} = Ssh, Data) ->
-    {State, Enc} = crypto:stream_encrypt(State0,Data),
-    {Ssh#ssh{encrypt_ctx = State}, Enc}.
-  
+
+encrypt(#ssh{encrypt_ctx = Ctx0} = Ssh, Data) ->
+    Enc = crypto:crypto_update(Ctx0, Data),
+    {Ssh, Enc}.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Decryption
@@ -1555,181 +1474,92 @@ encrypt(#ssh{encrypt = 'aes256-ctr',
 
 decrypt_init(#ssh{decrypt = none} = Ssh) ->
     {ok, Ssh};
-decrypt_init(#ssh{decrypt = '[email protected]', role = client} = Ssh) ->
-    <<K2:32/binary,K1:32/binary>> = hash(Ssh, "D", 512),
-    {ok, Ssh#ssh{decrypt_keys = {K1,K2}
-                }};
-decrypt_init(#ssh{decrypt = '[email protected]', role = server} = Ssh) ->
-    <<K2:32/binary,K1:32/binary>> = hash(Ssh, "C", 512),
+
+decrypt_init(#ssh{decrypt = '[email protected]', role = Role} = Ssh) ->
+    {_, KeyMagic} = decrypt_magic(Role),
+    <<K2:32/binary,K1:32/binary>> = hash(Ssh, KeyMagic, 8*64),
     {ok, Ssh#ssh{decrypt_keys = {K1,K2}
                 }};
-decrypt_init(#ssh{decrypt = 'AEAD_AES_128_GCM', role = client} = Ssh) ->
-    IV = hash(Ssh, "B", 12*8),
-    <<K:16/binary>> = hash(Ssh, "D", 128),
-    {ok, Ssh#ssh{decrypt_keys = K,
-		 decrypt_block_size = 16,
-		 decrypt_ctx = IV}};
-decrypt_init(#ssh{decrypt = 'AEAD_AES_128_GCM', role = server} = Ssh) ->
-    IV = hash(Ssh, "A", 12*8),
-    <<K:16/binary>> = hash(Ssh, "C", 128),
-    {ok, Ssh#ssh{decrypt_keys = K,
-		 decrypt_block_size = 16,
-		 decrypt_ctx = IV}};
-decrypt_init(#ssh{decrypt = 'AEAD_AES_256_GCM', role = client} = Ssh) ->
-    IV = hash(Ssh, "B", 12*8),
-    <<K:32/binary>> = hash(Ssh, "D", 256),
-    {ok, Ssh#ssh{decrypt_keys = K,
-		 decrypt_block_size = 16,
-		 decrypt_ctx = IV}};
-decrypt_init(#ssh{decrypt = 'AEAD_AES_256_GCM', role = server} = Ssh) ->
-    IV = hash(Ssh, "A", 12*8),
-    <<K:32/binary>> = hash(Ssh, "C", 256),
-    {ok, Ssh#ssh{decrypt_keys = K,
-		 decrypt_block_size = 16,
+
+decrypt_init(#ssh{decrypt = SshCipher, role = Role} = Ssh) when SshCipher == 'AEAD_AES_128_GCM';
+                                                                SshCipher == 'AEAD_AES_256_GCM' ->
+    {IvMagic, KeyMagic} = decrypt_magic(Role),
+    #cipher{impl = CryptoCipher,
+            key_bytes = KeyBytes,
+            iv_bytes = IvBytes,
+            block_bytes = BlockBytes} = cipher(SshCipher),
+    IV = hash(Ssh, IvMagic, 8*IvBytes),
+    K = hash(Ssh, KeyMagic, 8*KeyBytes),
+    {ok, Ssh#ssh{decrypt_cipher = CryptoCipher,
+                 decrypt_keys = K,
+		 decrypt_block_size = BlockBytes,
 		 decrypt_ctx = IV}};
-decrypt_init(#ssh{decrypt = '3des-cbc', role = client} = Ssh) ->
-    {IV, KD} = {hash(Ssh, "B", 64),
-		hash(Ssh, "D", 192)},
-    <<K1:8/binary, K2:8/binary, K3:8/binary>> = KD,
-    {ok, Ssh#ssh{decrypt_keys = {K1,K2,K3}, decrypt_ctx = IV,
-			 decrypt_block_size = 8}}; 
-decrypt_init(#ssh{decrypt = '3des-cbc', role = server} = Ssh) ->
-    {IV, KD} = {hash(Ssh, "A", 64),
-		hash(Ssh, "C", 192)},
-    <<K1:8/binary, K2:8/binary, K3:8/binary>> = KD,
-    {ok, Ssh#ssh{decrypt_keys = {K1, K2, K3}, decrypt_ctx = IV,
-		 decrypt_block_size = 8}};
-decrypt_init(#ssh{decrypt = 'aes128-cbc', role = client} = Ssh) ->
-    {IV, KD} = {hash(Ssh, "B", 128),
-		hash(Ssh, "D", 128)},
-    <<K:16/binary>> = KD,
-    {ok, Ssh#ssh{decrypt_keys = K, decrypt_ctx = IV,
-		 decrypt_block_size = 16}};
-decrypt_init(#ssh{decrypt = 'aes128-cbc', role = server} = Ssh) ->
-    {IV, KD} = {hash(Ssh, "A", 128),
-		hash(Ssh, "C", 128)},
-    <<K:16/binary>> = KD,
-    {ok, Ssh#ssh{decrypt_keys = K, decrypt_ctx = IV,
-		 decrypt_block_size = 16}};
-decrypt_init(#ssh{decrypt = 'aes128-ctr', role = client} = Ssh) ->
-	IV = hash(Ssh, "B", 128),
-    <<K:16/binary>> = hash(Ssh, "D", 128),
-    State = crypto:stream_init(aes_ctr, K, IV),
-    {ok, Ssh#ssh{decrypt_keys = K,
-		 decrypt_block_size = 16,
-                 decrypt_ctx = State}};
-decrypt_init(#ssh{decrypt = 'aes192-ctr', role = client} = Ssh) ->
-	IV = hash(Ssh, "B", 128),
-    <<K:24/binary>> = hash(Ssh, "D", 192),
-    State = crypto:stream_init(aes_ctr, K, IV),
-    {ok, Ssh#ssh{decrypt_keys = K,
-		 decrypt_block_size = 16,
-                 decrypt_ctx = State}};
-decrypt_init(#ssh{decrypt = 'aes256-ctr', role = client} = Ssh) ->
-	IV = hash(Ssh, "B", 128),
-    <<K:32/binary>> = hash(Ssh, "D", 256),
-    State = crypto:stream_init(aes_ctr, K, IV),
-    {ok, Ssh#ssh{decrypt_keys = K,
-		 decrypt_block_size = 16,
-                 decrypt_ctx = State}};
-decrypt_init(#ssh{decrypt = 'aes128-ctr', role = server} = Ssh) ->
-	IV = hash(Ssh, "A", 128),
-    <<K:16/binary>> = hash(Ssh, "C", 128),
-    State = crypto:stream_init(aes_ctr, K, IV),
-    {ok, Ssh#ssh{decrypt_keys = K,
-		 decrypt_block_size = 16,
-                 decrypt_ctx = State}};
-decrypt_init(#ssh{decrypt = 'aes192-ctr', role = server} = Ssh) ->
-	IV = hash(Ssh, "A", 128),
-    <<K:24/binary>> = hash(Ssh, "C", 192),
-    State = crypto:stream_init(aes_ctr, K, IV),
-    {ok, Ssh#ssh{decrypt_keys = K,
-		 decrypt_block_size = 16,
-                 decrypt_ctx = State}};
-decrypt_init(#ssh{decrypt = 'aes256-ctr', role = server} = Ssh) ->
-	IV = hash(Ssh, "A", 128),
-    <<K:32/binary>> = hash(Ssh, "C", 256),
-    State = crypto:stream_init(aes_ctr, K, IV),
-    {ok, Ssh#ssh{decrypt_keys = K,
-		 decrypt_block_size = 16,
-                 decrypt_ctx = State}}.
-
-  
+
+decrypt_init(#ssh{decrypt = SshCipher, role = Role} = Ssh) ->
+    {IvMagic, KeyMagic} = decrypt_magic(Role),
+    #cipher{impl = CryptoCipher,
+            key_bytes = KeyBytes,
+            iv_bytes = IvBytes,
+            block_bytes = BlockBytes} = cipher(SshCipher),
+    IV = hash(Ssh, IvMagic, 8*IvBytes),
+    K = hash(Ssh, KeyMagic, 8*KeyBytes),
+    Ctx0 = crypto:crypto_init(CryptoCipher, K, IV, false),
+    {ok, Ssh#ssh{decrypt_cipher = CryptoCipher,
+                 decrypt_block_size = BlockBytes,
+                 decrypt_ctx = Ctx0}}.
+
+
 decrypt_final(Ssh) ->
     {ok, Ssh#ssh {decrypt = none, 
 		  decrypt_keys = undefined,
 		  decrypt_ctx = undefined,
 		  decrypt_block_size = 8}}.
 
+
 decrypt(Ssh, <<>>) ->
     {Ssh, <<>>};
+
 decrypt(#ssh{decrypt = '[email protected]',
-             decrypt_keys = {K1,_K2},
-             recv_sequence = Seq} = Ssh, {length,EncryptedLen}) ->
-    {_State,PacketLenBin} =
-        crypto:stream_decrypt(crypto:stream_init(chacha20, K1, <<0:8/unit:8, Seq:8/unit:8>>),
-                              EncryptedLen),
-    {Ssh, PacketLenBin};
-decrypt(#ssh{decrypt = '[email protected]',
-             decrypt_keys = {_K1,K2},
-             recv_sequence = Seq} = Ssh, {AAD,Ctext,Ctag}) ->
-    %% The length is already decoded and used to divide the input
-    %% Check the mac (important that it is timing-safe):
-    {_,PolyKey} =
-        crypto:stream_encrypt(crypto:stream_init(chacha20, K2, <<0:8/unit:8,Seq:8/unit:8>>),
-                              <<0:32/unit:8>>),
-    case equal_const_time(Ctag, crypto:poly1305(PolyKey, <<AAD/binary,Ctext/binary>>)) of
-        true ->
-            %% MAC is ok, decode
-            IV2 = <<1:8/little-unit:8, Seq:8/unit:8>>,
-            {_,PlainText} =
-                crypto:stream_decrypt(crypto:stream_init(chacha20,K2,IV2), Ctext),
-            {Ssh, PlainText};
-        false ->
-           {Ssh,error}
+             decrypt_keys = {K1,K2},
+             recv_sequence = Seq} = Ssh, Data) ->
+    case Data of
+        {length,EncryptedLen} ->
+            %% The length is decrypted separately in a first step
+            PacketLenBin = crypto:crypto_one_time(chacha20, K1, <<0:8/unit:8, Seq:8/unit:8>>, EncryptedLen, false),
+            {Ssh, PacketLenBin};
+         {AAD,Ctext,Ctag} ->
+            %% The length is already decrypted and used to divide the input
+            %% Check the mac (important that it is timing-safe):
+            PolyKey = crypto:crypto_one_time(chacha20, K2, <<0:8/unit:8,Seq:8/unit:8>>, <<0:32/unit:8>>, false),
+            case equal_const_time(Ctag, crypto:poly1305(PolyKey, <<AAD/binary,Ctext/binary>>)) of
+                true ->
+                    %% MAC is ok, decode
+                    IV2 = <<1:8/little-unit:8, Seq:8/unit:8>>,
+                    PlainText = crypto:crypto_one_time(chacha20, K2, IV2, Ctext, false),
+                    {Ssh, PlainText};
+                false ->
+                    {Ssh,error}
+            end
     end;
+
 decrypt(#ssh{decrypt = none} = Ssh, Data) ->
     {Ssh, Data};
-decrypt(#ssh{decrypt = 'AEAD_AES_128_GCM',
-	     decrypt_keys = K,
-	     decrypt_ctx = IV0} = Ssh, Data = {_AAD,_Ctext,_Ctag}) ->
-    Dec = crypto:block_decrypt(aes_gcm, K, IV0, Data), % Dec = PlainText | error 
-    IV = next_gcm_iv(IV0),
-    {Ssh#ssh{decrypt_ctx = IV}, Dec};
-decrypt(#ssh{decrypt = 'AEAD_AES_256_GCM',
+
+decrypt(#ssh{decrypt = SshCipher,
+             decrypt_cipher = CryptoCipher,
 	     decrypt_keys = K,
-	     decrypt_ctx = IV0} = Ssh, Data = {_AAD,_Ctext,_Ctag}) ->
-    Dec = crypto:block_decrypt(aes_gcm, K, IV0, Data), % Dec = PlainText | error 
+	     decrypt_ctx = IV0} = Ssh, {AAD,Ctext,Ctag}) when SshCipher == 'AEAD_AES_128_GCM' ;
+                                                              SshCipher == 'AEAD_AES_256_GCM' ->
+    Dec = crypto:crypto_one_time_aead(CryptoCipher, K, IV0, Ctext, AAD, Ctag, false),
     IV = next_gcm_iv(IV0),
     {Ssh#ssh{decrypt_ctx = IV}, Dec};
-decrypt(#ssh{decrypt = '3des-cbc', decrypt_keys = Keys,
-	     decrypt_ctx = IV0} = Ssh, Data) ->
-    {K1, K2, K3} = Keys,
-    Dec = crypto:block_decrypt(des3_cbc, [K1,K2,K3], IV0, Data),
-    IV = crypto:next_iv(des3_cbc, Data),
-    {Ssh#ssh{decrypt_ctx = IV}, Dec};
-decrypt(#ssh{decrypt = 'aes128-cbc', decrypt_keys = Key,
-	     decrypt_ctx = IV0} = Ssh, Data) ->
-    Dec = crypto:block_decrypt(aes_cbc128, Key,IV0,Data),
-    IV = crypto:next_iv(aes_cbc, Data),
-    {Ssh#ssh{decrypt_ctx = IV}, Dec};
-decrypt(#ssh{decrypt = 'aes128-ctr',
-            decrypt_ctx = State0} = Ssh, Data) ->
-    {State, Enc} = crypto:stream_decrypt(State0,Data),
-    {Ssh#ssh{decrypt_ctx = State}, Enc};
-decrypt(#ssh{decrypt = 'aes192-ctr',
-            decrypt_ctx = State0} = Ssh, Data) ->
-    {State, Enc} = crypto:stream_decrypt(State0,Data),
-    {Ssh#ssh{decrypt_ctx = State}, Enc};
-decrypt(#ssh{decrypt = 'aes256-ctr',
-            decrypt_ctx = State0} = Ssh, Data) ->
-    {State, Enc} = crypto:stream_decrypt(State0,Data),
-    {Ssh#ssh{decrypt_ctx = State}, Enc}.
 
+decrypt(#ssh{decrypt_ctx = Ctx0} = Ssh, Data) ->
+    Dec = crypto:crypto_update(Ctx0, Data),
+    {Ssh, Dec}.
 
 next_gcm_iv(<<Fixed:32, InvCtr:64>>) -> <<Fixed:32, (InvCtr+1):64>>.
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Compression
 %%
@@ -2058,9 +1888,9 @@ compute_key(Algorithm, OthersPublic, MyPrivate, Args) ->
 dh_bits(#alg{encrypt = Encrypt,
              send_mac = SendMac}) ->
     C = cipher(Encrypt),
-    8 * lists:max([C#cipher_data.key_bytes,
-                   C#cipher_data.block_bytes,
-                   C#cipher_data.iv_bytes,
+    8 * lists:max([C#cipher.key_bytes,
+                   C#cipher.block_bytes,
+                   C#cipher.iv_bytes,
                    mac_key_bytes(SendMac)
                   ]).
 
@@ -2091,40 +1921,13 @@ select_crypto_supported(L) ->
 
 crypto_supported(Conditions, Supported) ->
     lists:all( fun({Tag,CryptoName}) when is_atom(CryptoName) ->
-		       crypto_name_supported(Tag,CryptoName,Supported);
-		  ({Tag,{Name,Len}}) when is_integer(Len) ->
-		       crypto_name_supported(Tag,Name,Supported) andalso
-			   len_supported(Name,Len)
+		       crypto_name_supported(Tag,CryptoName,Supported)
 	       end, Conditions).
 
 crypto_name_supported(Tag, CryptoName, Supported) ->
-    Vs = case proplists:get_value(Tag,Supported,[]) of
-             [] when Tag == curves -> crypto:ec_curves();
-             L -> L
-         end,
+    Vs = proplists:get_value(Tag,Supported,[]),
     lists:member(CryptoName, Vs).
 
-len_supported(Name, Len) ->
-    try
-	case Name of
-	    aes_ctr ->
-		{_, <<_/binary>>} = 
-		    %% Test encryption
-		    crypto:stream_encrypt(crypto:stream_init(Name, <<0:Len>>, <<0:128>>), <<"">>);
-	    aes_gcm ->
-		{<<_/binary>>, <<_/binary>>} = 
-		    crypto:block_encrypt(Name, 
-					 _Key = <<0:Len>>,
-					 _IV = <<0:12/unsigned-unit:8>>,
-					 {<<"AAD">>,"PT"})
-	end
-    of
-	_ -> true
-    catch
-	_:_ -> false
-    end.
-	    
-
 same(Algs) ->  [{client2server,Algs}, {server2client,Algs}].
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/ssh/src/ssh_userauth.hrl b/lib/ssh/src/ssh_userauth.hrl
deleted file mode 100644
index 2cfc1f0f83..0000000000
--- a/lib/ssh/src/ssh_userauth.hrl
+++ /dev/null
@@ -1,78 +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%
-%%
-
-%%
-
-%%% Description: user authentication protocol
-
--define(SSH_MSG_USERAUTH_REQUEST,  50).
--define(SSH_MSG_USERAUTH_FAILURE,  51).
--define(SSH_MSG_USERAUTH_SUCCESS,  52).
--define(SSH_MSG_USERAUTH_BANNER,  53).
--define(SSH_MSG_USERAUTH_PK_OK,  60).
--define(SSH_MSG_USERAUTH_PASSWD_CHANGEREQ, 60).
--define(SSH_MSG_USERAUTH_INFO_REQUEST, 60).
--define(SSH_MSG_USERAUTH_INFO_RESPONSE, 61).
-
--record(ssh_msg_userauth_request,
-	{
-	  user,     %% string
-	  service,  %% string
-	  method,   %% string "publickey", "password"
-	  data      %% opaque
-	 }).
-
--record(ssh_msg_userauth_failure,
-	{
-	  authentications,     %% string
-	  partial_success      %% boolean
-	 }).
-
--record(ssh_msg_userauth_success,
-	{
-	 }).
-
--record(ssh_msg_userauth_banner,
-	{
-	  message,    %% string
-	  language    %% string
-	 }).
-
--record(ssh_msg_userauth_passwd_changereq,
-	{
-	  prompt,     %% string
-	  languge     %% string
-	 }).
-
--record(ssh_msg_userauth_pk_ok,
-	{
-	  algorithm_name, % string
-	  key_blob % string
-	 }).
-
--record(ssh_msg_userauth_info_request,
-	{name,
-	 instruction,
-	 language_tag,
-	 num_prompts,
-	 data}).
--record(ssh_msg_userauth_info_response,
-	{num_responses,
-	 data}).
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index da94b5722f..9b987dea5a 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -43,7 +43,9 @@ suite() ->
      {timetrap,{seconds,40}}].
 
 all() -> 
-    [{group, all_tests}].
+    [{group, all_tests},
+     daemon_already_started
+    ].
 
 groups() ->
     [{all_tests, [parallel], [{group, ssh_renegotiate_SUITE},
@@ -801,6 +803,24 @@ daemon_already_started(Config) when is_list(Config) ->
     ssh:stop_daemon(Pid).
 
 %%--------------------------------------------------------------------
+%%% Test that a failed daemon start does not leave the port open
+daemon_error_closes_port(Config) ->
+    GoodSystemDir = proplists:get_value(data_dir, Config),
+    Port = ssh_test_lib:inet_port(),
+    {error,_} = ssh_test_lib:daemon(Port, []), % No system dir
+    case ssh_test_lib:daemon(Port, [{system_dir, GoodSystemDir}]) of
+        {error,eaddrinuse} ->
+            {fail, "Port leakage"};
+        {error,Error} ->
+            ct:log("Strange error: ~p",[Error]),
+            {fail, "Strange error"};
+        {Pid, _Host, Port} ->
+            %% Ok
+            ssh:stop_daemon(Pid)
+    end.
+    
+
+%%--------------------------------------------------------------------
 %%% check that known_hosts is updated correctly
 known_hosts(Config) when is_list(Config) ->
     SystemDir = proplists:get_value(data_dir, Config),
@@ -1379,7 +1399,7 @@ rekey_chk(Config, RLdaemon, RLclient) ->
     Kex1 = ssh_test_lib:get_kex_init(ConnectionRef),
 
     %% Make both sides send something:
-    {ok, SftpPid} = ssh_sftp:start_channel(ConnectionRef),
+    {ok, _SftpPid} = ssh_sftp:start_channel(ConnectionRef),
 
     %% Check rekeying
     timer:sleep(?REKEY_DATA_TMO),
diff --git a/lib/ssh/test/ssh_bench_SUITE.erl b/lib/ssh/test/ssh_bench_SUITE.erl
index 764c52b624..5ff7a71c45 100644
--- a/lib/ssh/test/ssh_bench_SUITE.erl
+++ b/lib/ssh/test/ssh_bench_SUITE.erl
@@ -26,7 +26,7 @@
 -include_lib("ssh/src/ssh.hrl").
 -include_lib("ssh/src/ssh_transport.hrl").
 -include_lib("ssh/src/ssh_connect.hrl").
--include_lib("ssh/src/ssh_userauth.hrl").
+-include_lib("ssh/src/ssh_auth.hrl").
 
 %%%================================================================
 %%%
@@ -109,11 +109,10 @@ connect(Config) ->
     lists:foreach(
       fun(KexAlg) ->
               PrefAlgs = preferred_algorithms(KexAlg),
-              report([{value, measure_connect(Config,
-                                              [{preferred_algorithms,PrefAlgs}])},
-                      {suite, ?MODULE},
-                      {name, mk_name(["Connect erlc erld ",KexAlg," [µs]"])}
-                     ])
+              TimeMicroSec =  measure_connect(Config,
+                                              [{preferred_algorithms,PrefAlgs}]),
+              report(["Connect erlc erld ",KexAlg," [connects per sec]"],
+                     1000000 / TimeMicroSec)
       end, KexAlgs).
 
 
@@ -130,7 +129,7 @@ measure_connect(Config, Opts) ->
       [begin
            {Time, {ok,Pid}} = timer:tc(ssh,connect,["localhost", Port, ConnectOptions]),
            ssh:close(Pid),
-           Time
+           Time % in µs
        end || _ <- lists:seq(1,?Nruns)]).
 
 %%%----------------------------------------------------------------
@@ -178,12 +177,8 @@ gen_data(DataSz) ->
     <<Data0/binary, Data1/binary>>.
 
 
-%% connect_measure(Port, Cipher, Mac, Data, Options) ->
-%%     report([{value, 1},
-%%              {suite, ?MODULE},
-%%              {name, mk_name(["Transfer 1M bytes ",Cipher,"/",Mac," [µs]"])}]);
 connect_measure(Port, Cipher, Mac, Data, Options) ->
-    AES_GCM = {cipher,
+    _AES_GCM = {cipher,
                []},
                %% ['[email protected]',
                %%  '[email protected]']},
@@ -192,22 +187,22 @@ connect_measure(Port, Cipher, Mac, Data, Options) ->
                  {none,none} ->
                      [{modify_algorithms,[{prepend, [{cipher,[Cipher]},
                                                      {mac,[Mac]}]}
-%%%                                          ,{rm,[AES_GCM]}
+%%%                                          ,{rm,[_AES_GCM]}
                                          ]}];
                  {none,_} ->
                      [{modify_algorithms,[{prepend, [{cipher,[Cipher]}]}
-%%%                                          ,{rm,[AES_GCM]}
+%%%                                          ,{rm,[_AES_GCM]}
                                          ]},
                       {preferred_algorithms, [{mac,[Mac]}]}];
                  {_,none} ->
                      [{modify_algorithms,[{prepend, [{mac,[Mac]}]}
-%%%                                          ,{rm,[AES_GCM]}
+%%%                                          ,{rm,[_AES_GCM]}
                                          ]},
                       {preferred_algorithms, [{cipher,[Cipher]}]}];
                  _ ->
                      [{preferred_algorithms, [{cipher,[Cipher]},
                                               {mac,[Mac]}]}
-%%%                      ,{modify_algorithms, [{rm,[AES_GCM]}]}
+%%%                      ,{modify_algorithms, [{rm,[_AES_GCM]}]}
                      ]
              end,
     Times =
@@ -220,10 +215,8 @@ connect_measure(Port, Cipher, Mac, Data, Options) ->
              ssh:close(C),
              Time
          end || _ <- lists:seq(1,?Nruns)],
-    
-    report([{value, median(Times)},
-            {suite, ?MODULE},
-            {name, mk_name(["Transfer 1M bytes ",Cipher,"/",Mac," [µs]"])}]).
+    report(["Transfer ",Cipher,"/",Mac," [Mbyte per sec]"],
+           1000000 / median(Times)).
 
 send_wait_acc(C, Ch, Data) ->
     ssh_connection:send(C, Ch, Data),
@@ -238,12 +231,6 @@ send_wait_acc(C, Ch, Data) ->
 %%% 
 
 %%%----------------------------------------------------------------
-mk_name(Name) -> [char(C) || C <- lists:concat(Name)].
-
-char($-) -> $_;
-char(C) -> C.
-
-%%%----------------------------------------------------------------
 preferred_algorithms(KexAlg) ->
      [{kex,         [KexAlg]},
       {public_key,  ['ssh-rsa']},
@@ -265,11 +252,22 @@ median(Data) when is_list(Data) ->
             1 ->
                 lists:nth(N div 2 + 1, SortedData)
         end,
-    ct:log("median(~p) = ~p",[SortedData,Median]),
+    ct:pal("median(~p) = ~p",[SortedData,Median]),
     Median.
 
+%%%----------------------------------------------------------------
+report(LabelList, Value) ->
+    Label = report_chars(lists:concat(LabelList)),
+    ct:pal("ct_event:notify ~p: ~p", [Label, Value]),
+    ct_event:notify(
+      #event{name = benchmark_data,
+             data = [{suite, ?MODULE},
+                     {name,  Label},
+                     {value, Value}]}).
+
+report_chars(Cs) ->
+    [case C of
+         $- -> $_;
+         _ -> C
+     end || C <- Cs].
 
-report(Data) ->
-    ct:log("EventData = ~p",[Data]),
-    ct_event:notify(#event{name = benchmark_data,
-                           data = Data}).
diff --git a/lib/ssh/test/ssh_chan_behaviours_SUITE.erl b/lib/ssh/test/ssh_chan_behaviours_SUITE.erl
index 16ed152bcd..103d7253fd 100644
--- a/lib/ssh/test/ssh_chan_behaviours_SUITE.erl
+++ b/lib/ssh/test/ssh_chan_behaviours_SUITE.erl
@@ -128,8 +128,8 @@ subsystem_client(Config) ->
     C = proplists:get_value(connref, Config),
 
     {ok,ChRef} = ssh_chan_behaviours_client:start_link(C),
-    IDclt = ?EXPECT({{C,Ch1clt},     {ssh_channel_up,Ch1clt,C}},     {C,Ch1clt}),
-    IDsrv = ?EXPECT({{_Csrv,Ch1srv}, {ssh_channel_up,Ch1srv,_Csrv}}, {_Csrv,Ch1srv}),
+    IDclt = ?EXPECT({{C,_Ch1clt},     {ssh_channel_up,_Ch1clt,C}},     {C,_Ch1clt}),
+    IDsrv = ?EXPECT({{_Csrv,_Ch1srv}, {ssh_channel_up,_Ch1srv,_Csrv}}, {_Csrv,_Ch1srv}),
 
     ok = ssh_chan_behaviours_client:stop(ChRef),
     ?EXPECT({IDclt, {terminate,normal}}, []), % From the proper channel handler
diff --git a/lib/ssh/test/ssh_chan_behaviours_client.erl b/lib/ssh/test/ssh_chan_behaviours_client.erl
index 15f17733d6..8dd18973ad 100644
--- a/lib/ssh/test/ssh_chan_behaviours_client.erl
+++ b/lib/ssh/test/ssh_chan_behaviours_client.erl
@@ -94,7 +94,7 @@ handle_ssh_msg({ssh_cm, C, {eof, Ch}}=M, #state{ch=Ch,cm=C} = State) ->
     ?DBG(State, "eof",[]),
     {ok, State};
 
-handle_ssh_msg({ssh_cm, C, {signal, _Ch, _SigNameStr}=Sig} = M, #state{ch=Ch,cm=C} = State) ->
+handle_ssh_msg({ssh_cm, C, {signal, Ch, _SigNameStr}=Sig} = M, #state{ch=Ch,cm=C} = State) ->
     %% Ignore signals according to RFC 4254 section 6.9.
     tell_parent(M, State),
     ?DBG(State, "~p",[Sig]),
diff --git a/lib/ssh/test/ssh_chan_behaviours_server.erl b/lib/ssh/test/ssh_chan_behaviours_server.erl
index 1408675a6e..1d504b1bc6 100644
--- a/lib/ssh/test/ssh_chan_behaviours_server.erl
+++ b/lib/ssh/test/ssh_chan_behaviours_server.erl
@@ -65,7 +65,7 @@ handle_ssh_msg({ssh_cm, C, {eof, Ch}}=M, #state{ch=Ch,cm=C} = State) ->
     ?DBG(State, "eof",[]),
     {ok, State};
 
-handle_ssh_msg({ssh_cm, C, {signal, _Ch, _SigNameStr}=Sig} = M, #state{ch=Ch,cm=C} = State) ->
+handle_ssh_msg({ssh_cm, C, {signal, Ch, _SigNameStr}=Sig} = M, #state{ch=Ch,cm=C} = State) ->
     %% Ignore signals according to RFC 4254 section 6.9.
     tell_parent(M, State),
     ?DBG(State, "~p",[Sig]),
diff --git a/lib/ssh/test/ssh_compat_SUITE.erl b/lib/ssh/test/ssh_compat_SUITE.erl
index f4eef2dc77..06ed9082cf 100644
--- a/lib/ssh/test/ssh_compat_SUITE.erl
+++ b/lib/ssh/test/ssh_compat_SUITE.erl
@@ -150,8 +150,7 @@ init_per_group(G, Config0) ->
                             stop_docker(ID),
                             {fail, "Can't contact docker sshd"}
                     catch
-                        Class:Exc ->
-                            ST = erlang:get_stacktrace(),
+                        Class:Exc:ST ->
                             ct:log("common_algs: ~p:~p~n~p",[Class,Exc,ST]),
                             stop_docker(ID),
                             {fail, "Failed during setup"}
@@ -160,8 +159,7 @@ init_per_group(G, Config0) ->
                 cant_start_docker ->
                     {skip, "Can't start docker"};
 
-                C:E ->
-                    ST = erlang:get_stacktrace(),
+                C:E:ST ->
                     ct:log("No ~p~n~p:~p~n~p",[G,C,E,ST]),
                     {skip, "Can't start docker"}
             end;
@@ -1026,8 +1024,7 @@ receive_hello(S) ->
         Result ->
             Result
     catch
-        Class:Error ->
-            ST = erlang:get_stacktrace(),
+        Class:Error:ST ->
             {error, {Class,Error,ST}}
     end.
         
@@ -1104,8 +1101,7 @@ sftp_tests_erl_server(Config, ServerIP, ServerPort, ServerRootDir, UserDir) ->
         call_sftp_in_docker(Config, ServerIP, ServerPort, Cmnds, UserDir),
         check_local_directory(ServerRootDir)
     catch
-        Class:Error ->
-            ST = erlang:get_stacktrace(),
+        Class:Error:ST ->
             {error, {Class,Error,ST}}
     end.
 
@@ -1126,7 +1122,24 @@ prepare_local_directory(ServerRootDir) ->
      "chmod 222 unreadable_file",
      "exit"].
 
+
 check_local_directory(ServerRootDir) ->
+    TimesToTry = 3,  % sleep 0.5, 1, 2 and then 4 secs (7.5s in total)
+    check_local_directory(ServerRootDir, 500, TimesToTry-1).
+
+check_local_directory(ServerRootDir, SleepTime, N) ->
+    case do_check_local_directory(ServerRootDir) of
+        {error,_Error} when N>0 ->
+            %% Could be that the erlang side is faster and the docker's operations
+            %% are not yet finalized.
+            %% Sleep for a while and retry a few times:
+            timer:sleep(SleepTime),
+            check_local_directory(ServerRootDir, 2*SleepTime, N-1);
+        Other ->
+            Other
+    end.
+
+do_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")),
@@ -1161,6 +1174,7 @@ check_local_directory(ServerRootDir) ->
             {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,
@@ -1329,8 +1343,7 @@ one_test_erl_client(SFTP, Id, C) when SFTP==sftp ; SFTP==sftp_async ->
         catch ssh_sftp:stop_channel(Ch),
         R
     catch
-        Class:Error ->
-            ST = erlang:get_stacktrace(),
+        Class:Error:ST ->
             {error, {SFTP,Id,Class,Error,ST}}
     end.
 
diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl
index 778e4a5fc8..6aa587dc7f 100644
--- a/lib/ssh/test/ssh_connection_SUITE.erl
+++ b/lib/ssh/test/ssh_connection_SUITE.erl
@@ -1124,12 +1124,12 @@ start_our_shell(_User, _Peer) ->
 
 ssh_exec_echo(Cmd) ->
     spawn(fun() ->
-                  io:format("echo "++Cmd ++ "\n")
+                  io:format("echo ~s\n", [Cmd])
           end).
 
 ssh_exec_echo(Cmd, User) ->
     spawn(fun() ->
-                  io:format(io_lib:format("echo ~s ~s\n",[User,Cmd]))
+                  io:format("echo ~s ~s\n",[User,Cmd])
           end).
 ssh_exec_echo(Cmd, User, _PeerAddr) ->
     ssh_exec_echo(Cmd,User).
diff --git a/lib/ssh/test/ssh_options_SUITE.erl b/lib/ssh/test/ssh_options_SUITE.erl
index 60d0da2a39..bf90f74324 100644
--- a/lib/ssh/test/ssh_options_SUITE.erl
+++ b/lib/ssh/test/ssh_options_SUITE.erl
@@ -214,7 +214,7 @@ init_per_testcase(_TestCase, Config) ->
     file:make_dir(UserDir),
     [{user_dir,UserDir}|Config].
 
-end_per_testcase(_TestCase, Config) ->
+end_per_testcase(_TestCase, _Config) ->
     ssh:stop(),
     ok.
 
diff --git a/lib/ssh/test/ssh_protocol_SUITE.erl b/lib/ssh/test/ssh_protocol_SUITE.erl
index 3e3e151781..b12ddfeef6 100644
--- a/lib/ssh/test/ssh_protocol_SUITE.erl
+++ b/lib/ssh/test/ssh_protocol_SUITE.erl
@@ -38,7 +38,11 @@
 -define(EXTRA_KEX, 'diffie-hellman-group1-sha1').
 
 -define(CIPHERS, ['aes256-ctr','aes192-ctr','aes128-ctr','aes128-cbc','3des-cbc']).
--define(DEFAULT_CIPHERS, [{client2server,?CIPHERS}, {server2client,?CIPHERS}]).
+-define(DEFAULT_CIPHERS, (fun() -> Ciphs = filter_supported(cipher, ?CIPHERS),
+                                   [{client2server,Ciphs}, {server2client,Ciphs}]
+                          end)()
+        ).
+
 
 -define(v(Key, Config), proplists:get_value(Key, Config)).
 -define(v(Key, Config, Default), proplists:get_value(Key, Config, Default)).
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl
index a1a7eebcde..1129303414 100644
--- a/lib/ssh/test/ssh_test_lib.erl
+++ b/lib/ssh/test/ssh_test_lib.erl
@@ -409,7 +409,7 @@ ct:log("DataDir ~p:~n ~p~n~nSystDir ~p:~n ~p~n~nUserDir ~p:~n ~p",[DataDir, file
     setup_ecdsa_auth_keys(Size, DataDir, UserDir).
 
 setup_eddsa(Alg, DataDir, UserDir) ->
-    {IdPriv, IdPub, HostPriv, HostPub} =
+    {IdPriv, _IdPub, HostPriv, HostPub} =
         case Alg of
             ed25519 -> {"id_ed25519", "id_ed25519.pub", "ssh_host_ed25519_key", "ssh_host_ed25519_key.pub"};
             ed448   -> {"id_ed448",   "id_ed448.pub",   "ssh_host_ed448_key",   "ssh_host_ed448_key.pub"}
@@ -970,7 +970,7 @@ expected_state(_) -> false.
 %%%----------------------------------------------------------------
 %%% Return a string with N random characters
 %%%
-random_chars(N) -> [crypto:rand_uniform($a,$z) || _<-lists:duplicate(N,x)].
+random_chars(N) -> [($a-1)+rand:uniform($z-$a) || _<-lists:duplicate(N,x)].
 
 
 create_random_dir(Config) ->
diff --git a/lib/ssh/test/ssh_trpt_test_lib.erl b/lib/ssh/test/ssh_trpt_test_lib.erl
index 8de550af15..3f4df2c986 100644
--- a/lib/ssh/test/ssh_trpt_test_lib.erl
+++ b/lib/ssh/test/ssh_trpt_test_lib.erl
@@ -41,15 +41,20 @@
 	  opts = [],
 	  timeout = 5000,			% ms
 	  seen_hello = false,
-	  enc = <<>>,
 	  ssh = #ssh{},				% #ssh{}
 	  alg_neg = {undefined,undefined},      % {own_kexinit, peer_kexinit}
 	  alg,                                  % #alg{}
 	  vars = dict:new(),
 	  reply = [],				% Some repy msgs are generated hidden in ssh_transport :[
 	  prints = [],
-	  return_value
-	 }).
+	  return_value,
+
+          %% Packet retrival and decryption
+          decrypted_data_buffer     = <<>>,
+          encrypted_data_buffer     = <<>>,
+          aead_data                 = <<>>,
+          undecrypted_packet_length
+         }).
 
 -define(role(S), ((S#s.ssh)#ssh.role) ).
 
@@ -475,11 +480,11 @@ recv(S0 = #s{}) ->
 
 %%%================================================================
 try_find_crlf(Seen, S0) ->
-    case erlang:decode_packet(line,S0#s.enc,[]) of
+    case erlang:decode_packet(line,S0#s.encrypted_data_buffer,[]) of
 	{more,_} ->
-	    Line = <<Seen/binary,(S0#s.enc)/binary>>,
+	    Line = <<Seen/binary,(S0#s.encrypted_data_buffer)/binary>>,
 	    S0#s{seen_hello = {more,Line},
-		 enc = <<>>,	       % didn't find a complete line 
+		 encrypted_data_buffer = <<>>,	       % didn't find a complete line 
 				       % -> no more characters to test
 		 return_value = {more,Line}
 	       };
@@ -490,13 +495,13 @@ try_find_crlf(Seen, S0) ->
 		    S = opt(print_messages, S0, 
 			    fun(X) when X==true;X==detail -> {"Recv info~n~p~n",[Line]} end),
 		    S#s{seen_hello = false,
-			enc = Rest,
+			encrypted_data_buffer = Rest,
 			return_value = {info,Line}};
 		S1=#s{} ->
 		    S = opt(print_messages, S1,
 			fun(X) when X==true;X==detail -> {"Recv hello~n~p~n",[Line]} end),
 		    S#s{seen_hello = true,
-			enc = Rest,
+			encrypted_data_buffer = Rest,
 			return_value = {hello,Line}}
 	    end
     end.
@@ -511,73 +516,58 @@ handle_hello(Bin, S=#s{ssh=C}) ->
 	{{Vp,Vs}, server} ->   S#s{ssh = C#ssh{c_vsn=Vp, c_version=Vs}}
     end.
 
-receive_binary_msg(S0=#s{ssh=C0=#ssh{decrypt_block_size = BlockSize,
-				     recv_mac_size = MacSize
-				    }
-			}) ->
-    case size(S0#s.enc) >= max(8,BlockSize) of
-	false ->
-	    %% Need more bytes to decode the packet_length field
-	    Remaining = max(8,BlockSize) - size(S0#s.enc),
-	    receive_binary_msg( receive_wait(Remaining, S0) );
-	true ->
-	    %% Has enough bytes to decode the packet_length field
-	    {_, <<?UINT32(PacketLen), _/binary>>, _} =
-		ssh_transport:decrypt_blocks(S0#s.enc, BlockSize, C0), % FIXME: BlockSize should be at least 4
-
-	    %% FIXME: Check that ((4+PacketLen) rem BlockSize) == 0 ?
-
-	    S1 = if
-		     PacketLen > ?SSH_MAX_PACKET_SIZE ->
-			 fail({too_large_message,PacketLen},S0);        % FIXME: disconnect
-
-		     ((4+PacketLen) rem BlockSize) =/= 0 ->
-			 fail(bad_packet_length_modulo, S0); % FIXME: disconnect
-
-		     size(S0#s.enc) >= (4 + PacketLen + MacSize) ->
-			 %% has the whole packet
-			 S0;
-
-		     true ->
-			 %% need more bytes to get have the whole packet
-			 Remaining = (4 + PacketLen + MacSize) - size(S0#s.enc),
-			 receive_wait(Remaining, S0)
-		 end,
-
-	    %% Decrypt all, including the packet_length part (re-use the initial #ssh{})
-	    {C1, SshPacket = <<?UINT32(_),?BYTE(PadLen),Tail/binary>>, EncRest} = 
-		ssh_transport:decrypt_blocks(S1#s.enc, PacketLen+4, C0),
-	    
-	    PayloadLen = PacketLen - 1 - PadLen,
-	    <<CompressedPayload:PayloadLen/binary, _Padding:PadLen/binary>> = Tail,
-
-	    {C2, Payload} = ssh_transport:decompress(C1, CompressedPayload),
-
-	    <<Mac:MacSize/binary, Rest/binary>> = EncRest,
-
-	    case {ssh_transport:is_valid_mac(Mac, SshPacket, C2),
-		  catch ssh_message:decode(set_prefix_if_trouble(Payload,S1))}
-	    of
-		{false,         _} -> fail(bad_mac,S1);
-		{_,    {'EXIT',_}} -> fail(decode_failed,S1);
-
-		{true, Msg} ->
-		    C3 = case Msg of
-			     #ssh_msg_kexinit{} ->
-				 ssh_transport:key_init(opposite_role(C2), C2, Payload);
-			     _ ->
-				 C2
+receive_binary_msg(S0=#s{}) ->
+     case ssh_transport:handle_packet_part(
+           S0#s.decrypted_data_buffer,
+           S0#s.encrypted_data_buffer,
+           S0#s.aead_data,
+           S0#s.undecrypted_packet_length,
+           S0#s.ssh)
+     of
+         {packet_decrypted, DecryptedBytes, EncryptedDataRest, Ssh1} ->
+             S1 = S0#s{ssh = Ssh1#ssh{recv_sequence = ssh_transport:next_seqnum(Ssh1#ssh.recv_sequence)},
+                       decrypted_data_buffer = <<>>,
+                       undecrypted_packet_length = undefined,
+                       aead_data = <<>>,
+                       encrypted_data_buffer = EncryptedDataRest},
+             case
+                 catch ssh_message:decode(set_prefix_if_trouble(DecryptedBytes,S1))
+             of
+                 {'EXIT',_} -> fail(decode_failed,S1);
+
+                 Msg ->
+                     Ssh2 = case Msg of
+                              #ssh_msg_kexinit{} ->
+                                  ssh_transport:key_init(opposite_role(Ssh1), Ssh1, DecryptedBytes);
+                              _ ->
+                                  Ssh1
 			 end,
-		    S2 = opt(print_messages, S1,
-			     fun(X) when X==true;X==detail -> {"Recv~n~s~n",[format_msg(Msg)]} end),
-		    S3 = opt(print_messages, S2, 
-			     fun(detail) -> {"decrypted bytes ~p~n",[SshPacket]} end),
-		    S3#s{ssh = inc_recv_seq_num(C3),
-			 enc = Rest,
-			 return_value = Msg
-			}
-	    end
-    end.
+                     S2 = opt(print_messages, S1,
+                              fun(X) when X==true;X==detail -> {"Recv~n~s~n",[format_msg(Msg)]} end),
+                     S3 = opt(print_messages, S2, 
+                              fun(detail) -> {"decrypted bytes ~p~n",[DecryptedBytes]} end),
+                     S3#s{ssh = inc_recv_seq_num(Ssh2),
+                          return_value = Msg
+                         }
+             end;
+
+         {get_more, DecryptedBytes, EncryptedDataRest, AeadData, TotalNeeded, Ssh1} ->
+             %% Here we know that there are not enough bytes in
+             %% EncryptedDataRest to use. We must wait for more.
+             Remaining = case TotalNeeded of
+                             undefined -> 8;
+                             _ -> TotalNeeded - size(DecryptedBytes) - size(EncryptedDataRest)
+                         end,
+             receive_binary_msg(
+               receive_wait(Remaining,
+                            S0#s{encrypted_data_buffer = EncryptedDataRest,
+                                 decrypted_data_buffer = DecryptedBytes,
+                                 undecrypted_packet_length = TotalNeeded,
+                                 aead_data = AeadData,
+                                 ssh = Ssh1}
+                           ))
+     end.
+
 
 
 set_prefix_if_trouble(Msg = <<?BYTE(Op),_/binary>>, #s{alg=#alg{kex=Kex}})
@@ -602,7 +592,7 @@ receive_poll(S=#s{socket=Sock}) ->
     inet:setopts(Sock, [{active,once}]),
     receive
 	{tcp,Sock,Data} ->
-	    receive_poll( S#s{enc = <<(S#s.enc)/binary,Data/binary>>} );
+	    receive_poll( S#s{encrypted_data_buffer = <<(S#s.encrypted_data_buffer)/binary,Data/binary>>} );
 	{tcp_closed,Sock} ->
 	    throw({tcp,tcp_closed});
 	{tcp_error, Sock, Reason} ->
@@ -616,7 +606,7 @@ receive_wait(S=#s{socket=Sock,
     inet:setopts(Sock, [{active,once}]),
     receive
 	{tcp,Sock,Data} ->
-	    S#s{enc = <<(S#s.enc)/binary,Data/binary>>};
+	    S#s{encrypted_data_buffer = <<(S#s.encrypted_data_buffer)/binary,Data/binary>>};
 	{tcp_closed,Sock} ->
 	    throw({tcp,tcp_closed});
 	{tcp_error, Sock, Reason} ->
@@ -627,11 +617,11 @@ receive_wait(S=#s{socket=Sock,
 
 receive_wait(N, S=#s{socket=Sock,
 		     timeout=Timeout,
-		     enc=Enc0}) when N>0 ->
+		     encrypted_data_buffer=Enc0}) when N>0 ->
     inet:setopts(Sock, [{active,once}]),
     receive
 	{tcp,Sock,Data} ->
-	    receive_wait(N-size(Data), S#s{enc = <<Enc0/binary,Data/binary>>});
+	    receive_wait(N-size(Data), S#s{encrypted_data_buffer = <<Enc0/binary,Data/binary>>});
 	{tcp_closed,Sock} ->
 	    throw({tcp,tcp_closed});
 	{tcp_error, Sock, Reason} ->
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 3ba1e177be..bb87dd388c 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,4 +1,4 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 4.7.2
+SSH_VSN = 4.7.7
 APP_VSN    = "ssh-$(SSH_VSN)"
diff --git a/lib/ssl/doc/specs/.gitignore b/lib/ssl/doc/specs/.gitignore
new file mode 100644
index 0000000000..322eebcb06
--- /dev/null
+++ b/lib/ssl/doc/specs/.gitignore
@@ -0,0 +1 @@
+specs_*.xml
diff --git a/lib/ssl/doc/src/Makefile b/lib/ssl/doc/src/Makefile
index c72b6d6cc4..064131944c 100644
--- a/lib/ssl/doc/src/Makefile
+++ b/lib/ssl/doc/src/Makefile
@@ -47,6 +47,7 @@ XML_CHAPTER_FILES = \
 	ssl_protocol.xml \
 	using_ssl.xml \
 	ssl_distribution.xml \
+	standards_compliance.xml \
 	notes.xml
 
 BOOK_FILES = book.xml
@@ -80,11 +81,16 @@ HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
+SPECS_FILES = $(XML_REF3_FILES:%.xml=$(SPECDIR)/specs_%.xml)
+
+TOP_SPECS_FILE = specs.xml
+
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
 XML_FLAGS +=
 DVIPS_FLAGS +=
+SPECS_FLAGS = -I../../../public_key/include -I../../../public_key/src -I../../..
 
 # ----------------------------------------------------
 # Targets
@@ -92,7 +98,7 @@ DVIPS_FLAGS +=
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
 
-docs: pdf html man
+docs: html pdf man
 
 $(TOP_PDF_FILE): $(XML_FILES)
 
@@ -105,6 +111,7 @@ clean clean_docs:
 	rm -rf $(XMLDIR)
 	rm -f $(MAN3DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
+	rm -f $(SPECS_FILES)
 	rm -f errs core *~
 
 man: $(MAN3_FILES) $(MAN6_FILES)
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 48372babf8..335896c60a 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -27,6 +27,500 @@
   </header>
   <p>This document describes the changes made to the SSL application.</p>
 
+<section><title>SSL 9.3.5</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Enhance error handling for erroneous alerts from the
+	    peer.</p>
+          <p>
+	    Own Id: OTP-15943</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 9.3.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix handling of certificate decoding problems in TLS 1.3
+	    similarly as in TLS 1.2.</p>
+          <p>
+	    Own Id: OTP-15900</p>
+        </item>
+        <item>
+          <p>
+	    Hibernation now works as expected in all cases, was
+	    accidently broken by optimization efforts.</p>
+          <p>
+	    Own Id: OTP-15910</p>
+        </item>
+        <item>
+          <p>
+	    Fix interoperability problems with openssl when the TLS
+	    1.3 server is configured wirh the option
+	    signature_algs_cert.</p>
+          <p>
+	    Own Id: OTP-15913</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 9.3.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Correct handshake handling, might cause strange symptoms
+	    such as ASN.1 certificate decoding issues.</p>
+          <p>
+	    Own Id: OTP-15879 Aux Id: ERL-968 </p>
+        </item>
+        <item>
+          <p>
+	    Fix handling of the signature_algorithms_cert extension
+	    in the ClientHello handshake message.</p>
+          <p>
+	    Own Id: OTP-15887 Aux Id: ERL-973 </p>
+        </item>
+        <item>
+          <p>
+	    Handle new ClientHello extensions when handshake is
+	    paused by the {handshake, hello} ssl option.</p>
+          <p>
+	    Own Id: OTP-15888 Aux Id: ERL-975 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 9.3.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Returned "alert error string" is now same as logged alert
+	    string</p>
+          <p>
+	    Own Id: OTP-15844</p>
+        </item>
+        <item>
+          <p>
+	    Fix returned extension map fields to follow the
+	    documentation.</p>
+          <p>
+	    Own Id: OTP-15862 Aux Id: ERL-951 </p>
+        </item>
+        <item>
+          <p>
+	    Avoid DTLS crash due to missing gen_server return value
+	    in DTLS packet demux process.</p>
+          <p>
+	    Own Id: OTP-15864 Aux Id: ERL-962 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 9.3.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Missing check of size of user_data_buffer made internal
+	    socket behave as an active socket instead of active N.
+	    This could cause memory problems.</p>
+          <p>
+	    Own Id: OTP-15825 Aux Id: ERL-934, OTP-15823 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 9.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The distribution handshake with TLS distribution
+	    (<c>inet_tls_dist</c>) does now utilize the socket option
+	    <c>{nodelay, true}</c>, which decreases the distribution
+	    setup time significantly.</p>
+          <p>
+	    Own Id: OTP-14792</p>
+        </item>
+        <item>
+          <p>
+	    Correct shutdown reason to avoid an incorrect crash
+	    report</p>
+          <p>
+	    Own Id: OTP-15710 Aux Id: ERL-893 </p>
+        </item>
+        <item>
+          <p>
+	    Enhance documentation and type specifications.</p>
+          <p>
+	    Own Id: OTP-15746 Aux Id: ERIERL-333 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    TLS-1.0, TLS-1.1 and DTLS-1.0 are now considered legacy
+	    and not supported by default</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-14865</p>
+        </item>
+        <item>
+          <p>
+	    Use new logger API in ssl. Introduce log levels and
+	    verbose debug logging for SSL.</p>
+          <p>
+	    Own Id: OTP-15055</p>
+        </item>
+        <item>
+          <p>
+	    Add new API function str_to_suite/1, cipher_suites/3
+	    (list cipher suites as rfc or OpenSSL name strings) and
+	    suite_to_openssl_str/1</p>
+          <p>
+	    Own Id: OTP-15483 Aux Id: ERL-924 </p>
+        </item>
+        <item>
+          <p>
+	    Basic support for TLS 1.3 Server for experimental use.
+	    The client is not yet functional, for more information
+	    see the Standards Compliance chapter of the User's Guide.</p>
+          <p>
+	    Own Id: OTP-15591</p>
+        </item>
+        <item>
+          <p>
+	    Add support for PSK CCM ciphers from RFC 6655</p>
+          <p>
+	    Own Id: OTP-15626</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 9.2.3.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Handling of zero size fragments in TLS could cause an
+	    infinite loop. This has now been corrected.</p>
+          <p>
+	    Own Id: OTP-15328 Aux Id: ERIERL-379 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 9.2.3.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Hibernation now works as expected in all cases, was
+	    accidently broken by optimization efforts.</p>
+          <p>
+	    Own Id: OTP-15910</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 9.2.3.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Correct handshake handling, might cause strange symptoms
+	    such as ASN.1 certificate decoding issues.</p>
+          <p>
+	    Own Id: OTP-15879 Aux Id: ERL-968 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 9.2.3.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Returned "alert error string" is now same as logged alert
+	    string</p>
+          <p>
+	    Own Id: OTP-15844</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 9.2.3.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Correct solution for retaining tcp flow control OTP-15802
+	    (ERL-934) as to not break ssl:recv as reported in
+	    (ERL-938)</p>
+          <p>
+	    Own Id: OTP-15823 Aux Id: ERL-934, ERL-938 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 9.2.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Missing check of size of user_data_buffer made internal
+	    socket behave as an active socket instead of active N.
+	    This could cause memory problems.</p>
+          <p>
+	    Own Id: OTP-15802 Aux Id: ERL-934 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Back port of bug fix ERL-893 from OTP-22 and document
+	    enhancements that will solve dialyzer warnings for users
+	    of the ssl application.</p>
+          <p>
+	    This change also affects public_key, eldap (and inet
+	    doc).</p>
+          <p>
+	    Own Id: OTP-15785 Aux Id: ERL-929, ERL-893, PR-2215 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 9.2.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    With the default BEAST Mitigation strategy for TLS 1.0 an
+	    empty TLS fragment could be sent after a one-byte
+	    fragment. This glitch has been fixed.</p>
+          <p>
+	    Own Id: OTP-15054 Aux Id: ERIERL-346 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 9.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The timeout for a passive receive was sometimes not
+	    cancelled and later caused a server crash. This bug has
+	    now been corrected.</p>
+          <p>
+	    Own Id: OTP-14701 Aux Id: ERL-883, ERL-884 </p>
+        </item>
+        <item>
+          <p>
+	    Add tag for passive message (active N) in cb_info to
+	    retain transport transparency.</p>
+          <p>
+	    Own Id: OTP-15679 Aux Id: ERL-861 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 9.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix bug that an incorrect return value for gen_statem
+	    could be created when alert was a result of handling
+	    renegotiation info extension</p>
+          <p>
+	    Own Id: OTP-15502</p>
+        </item>
+        <item>
+          <p>
+	    Correct check for 3des_ede_cbc, could cause ssl to claim
+	    to support 3des_ede_cbc when cryptolib does not.</p>
+          <p>
+	    Own Id: OTP-15539</p>
+        </item>
+        <item>
+          <p>
+	    Improved DTLS error handling, avoids unexpected
+	    connection failure in rare cases.</p>
+          <p>
+	    Own Id: OTP-15561</p>
+        </item>
+        <item>
+          <p>
+	    Corrected active once emulation bug that could cause the
+	    ssl_closed meassage to not be sent. Bug introduced by
+	    OTP-15449</p>
+          <p>
+	    Own Id: OTP-15666 Aux Id: ERIERL-316, </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add client option {reuse_session, SessionID::binary()}
+	    that can be used together with new option value
+	    {reuse_sessions, save}. This makes it possible to reuse a
+	    session from a specific connection establishment.</p>
+          <p>
+	    Own Id: OTP-15369</p>
+        </item>
+        <item>
+          <p>
+	    The Reason part of of the error return from the functions
+	    connect and handshake has a better and documented format.
+	    This will sometimes differ from previous returned
+	    reasons, however those where only documented as term()
+	    and should for that reason not be relied on.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15423</p>
+        </item>
+        <item>
+          <p>
+	    Refactor of state handling to improve TLS application
+	    data throughput and reduce CPU overhead</p>
+          <p>
+	    Own Id: OTP-15445</p>
+        </item>
+        <item>
+          <p>
+	    The SSL code has been optimized in many small ways to
+	    reduce CPU load for encryption/decryption, especially for
+	    Erlang's distribution protocol over TLS.</p>
+          <p>
+	    Own Id: OTP-15529</p>
+        </item>
+        <item>
+          <p>
+	    Add support for active N</p>
+          <p>
+	    Own Id: OTP-15665 Aux Id: ERL-811, PR-2072 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 9.1.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix encoding of the SRP extension length field in ssl.
+	    The old encoding of the SRP extension length could cause
+	    interoperability problems with third party SSL
+	    implementations when SRP was used.</p>
+          <p>
+	    Own Id: OTP-15477 Aux Id: ERL-790 </p>
+        </item>
+        <item>
+          <p>
+	    Guarantee active once data delivery, handling TCP stream
+	    properly.</p>
+          <p>
+	    Own Id: OTP-15504 Aux Id: ERL-371 </p>
+        </item>
+        <item>
+          <p>
+	    Correct gen_statem returns for some error cases</p>
+          <p>
+	    Own Id: OTP-15505</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 9.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed renegotiation bug. Client did not handle server
+	    initiated renegotiation correctly after rewrite to two
+	    connection processes, due to ERL-622 commit
+	    d87ac1c55188f5ba5cdf72384125d94d42118c18. This could
+	    manifest it self as a " bad_record_mac" alert.</p>
+          <p>
+	    Also included are some optimizations</p>
+          <p>
+	    Own Id: OTP-15489 Aux Id: ERL-308 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SSL 9.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -663,7 +1157,7 @@
           <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
+	    fail cannot connect reusing a session created when the
 	    server name verification succeeded.</p>
           <p>
 	    Own Id: OTP-14632</p>
@@ -841,7 +1335,7 @@
 	    public_key:pkix_verify_hostname/2 to verify the hostname
 	    of the connection with the server certificates specified
 	    hostname during certificate path validation. The user may
-	    explicitly disables it. Also if the hostname can not be
+	    explicitly disables it. Also if the hostname cannot be
 	    derived from the first argument to connect or is not
 	    supplied by the server name indication option, the check
 	    will not be performed.</p>
diff --git a/lib/ssl/doc/src/specs.xml b/lib/ssl/doc/src/specs.xml
new file mode 100644
index 0000000000..50e9428fec
--- /dev/null
+++ b/lib/ssl/doc/src/specs.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<specs xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="../specs/specs_ssl_crl_cache_api.xml"/>
+  <xi:include href="../specs/specs_ssl_crl_cache.xml"/>
+  <xi:include href="../specs/specs_ssl_session_cache_api.xml"/>
+  <xi:include href="../specs/specs_ssl.xml"/>
+</specs>
+
+ 
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index 3029977745..05590666da 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -28,7 +28,7 @@
     <rev></rev>
     <file>ssl.xml</file>
   </header>
-  <module>ssl</module>
+  <module since="">ssl</module>
   <modulesummary>Interface Functions for Secure Socket Layer</modulesummary>
   <description>
     <p>
@@ -37,277 +37,383 @@
       <seealso marker="ssl_app">ssl(6)</seealso>.
     </p>
   </description>
-    
-  <section>
-    <title>DATA TYPES</title>
-    <p>The following data types are used in the functions for SSL/TLS/DTLS:</p>
-
-    <taglist>
-
-      <tag><c>boolean() =</c></tag>
-      <item><p><c>true | false</c></p></item>
-
-      <tag><c>option() =</c></tag>
-      <item><p><c>socketoption() | ssl_option() | transport_option()</c></p>
-      </item>
-
-      <tag><c>socketoption() =</c></tag>
-      <item><p><c>proplists:property()</c></p>
-      <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>,
-      <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>
-	<p><c>{verify, verify_type()}</c></p>
-	<p><c>| {verify_fun, {fun(), term()}}</c></p>
-	<p><c>| {fail_if_no_peer_cert, boolean()}</c></p>
-	<p><c>| {depth, integer()}</c></p>
-	<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()} |
-	#{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>
-	<p><c>| {cacertfile, path()}</c></p>
-	<p><c>| {dh, public_key:der_encoded()}</c></p>
-	<p><c>| {dhfile, path()}</c></p>
-	<p><c>| {ciphers, ciphers()}</c></p>
-	<p><c>| {user_lookup_fun, {fun(), term()}}, {psk_identity, string()},
-	{srp_identity, {string(), string()}}</c></p>
-	<p><c>| {reuse_sessions, boolean()}</c></p>
-	<p><c>| {reuse_session, fun()} {next_protocols_advertised, [binary()]}</c></p>
-	<p><c>| {client_preferred_next_protocols, {client | server,
-	[binary()]} | {client | server, [binary()], binary()}}</c></p>
-	<p><c>| {log_alert, boolean()}</c></p>
-	<p><c>| {server_name_indication, hostname() | disable}</c></p>
-	<p><c>| {customize_hostname_check, list()}</c></p>
-	<p><c>| {sni_hosts, [{hostname(), [ssl_option()]}]}</c></p>
-	<p><c>| {sni_fun, SNIfun::fun()}</c></p>
-      </item>
-      
-      <tag><c>transport_option() =</c></tag>
-      <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> 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. For DTLS this feature must be considered exprimental.</p>
-      <taglist>
-	<tag><c>CallbackModule =</c></tag>
-	<item><p><c>atom()</c></p></item>
-	<tag><c>DataTag =</c></tag>
-	<item><p><c>atom()</c></p>
-	<p>Used in socket data message.</p></item>
-	<tag><c>ClosedTag =</c></tag>
-	<item><p><c>atom()</c></p>
-	<p>Used in socket close message.</p></item>
-      </taglist>
-      </item>
-
-      <tag><c>verify_type() =</c></tag>
-      <item><p><c>verify_none | verify_peer</c></p></item>
-
-      <tag><c>path() =</c></tag>
-      <item><p><c>string()</c></p>
-      <p>Represents a file path.</p></item>
 
-      <tag><c>public_key:der_encoded() =</c></tag>
-      <item><p><c>binary()</c></p>
-      <p>ASN.1 DER-encoded entity as an Erlang binary.</p></item>
+  <!--
+      ================================================================
+      =  Data types                                                  =
+      ================================================================
+  -->
 
-      <tag><c>host() =</c></tag>
-      <item><p><c>hostname() | ipaddress()</c></p></item>
+  <datatypes>
+    <datatype_title>Types used in SSL/TLS/DTLS</datatype_title>
 
-      <tag><c>hostname() =</c></tag>
-      <item><p><c>string() - DNS hostname</c></p></item>
-
-      <tag><c>ip_address() =</c></tag>
-      <item><p><c>{N1,N2,N3,N4} % IPv4 | {K1,K2,K3,K4,K5,K6,K7,K8} % IPv6
-      </c></p></item>
+    
+    <datatype>
+      <name name="socket"/>
+    </datatype>
+    
+    <datatype>
+      <name name="sslsocket"/>
+      <desc>
+	<p>An opaque reference to the TLS/DTLS connection, may be used for equality matching.</p>
+	</desc>
+    </datatype>
+
+    <datatype>
+      <name name="tls_option"/>
+    </datatype>
+        
+    <datatype>
+      <name name="tls_client_option"/>
+    </datatype>
+    
+    <datatype>
+      <name name="tls_server_option"/>
+    </datatype>
+   
+    
+    <datatype>
+      <name name="socket_option"/>
+      <desc>
+	<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>,
+	<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>
+      </desc>
+    </datatype>
 
-      <tag><c>sslsocket() =</c></tag>
-      <item><p>opaque()</p></item>
-      
-      <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()]</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 := 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
-      | rsa_psk | srp_anon | srp_dss | srp_rsa | ecdh_anon | ecdh_ecdsa
-      | ecdhe_ecdsa | ecdh_rsa | ecdhe_rsa</c></p></item>
-
-      <tag><c>cipher() =</c></tag>
-      <item><p><c>rc4_128 | des_cbc | '3des_ede_cbc'
-      | aes_128_cbc | aes_256_cbc | aes_128_gcm | aes_256_gcm | chacha20_poly1305</c></p></item>
-
-      <tag><c>hash() =</c></tag>
-      <item><p><c>md5 | sha | sha224 | sha256 | sha348 | sha512</c></p></item>
-
-      <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>
-
-      <tag><c>SNIfun::fun()</c></tag>
-      <item><p><c>= fun(ServerName :: string()) -> [ssl_option()]</c></p></item>
-
-      <tag><c>named_curve() =</c></tag>
-      <item><p><c>sect571r1 | sect571k1 | secp521r1 | brainpoolP512r1
-       | sect409k1 | sect409r1 | brainpoolP384r1 | secp384r1
-       | sect283k1 | sect283r1 | brainpoolP256r1 | secp256k1 | secp256r1
-       | sect239k1 | sect233k1 | sect233r1 | secp224k1 | secp224r1
-       | sect193r1 | sect193r2 | secp192k1 | secp192r1 | sect163k1
-       | sect163r1 | sect163r2 | secp160k1 | secp160r1 | secp160r2</c></p></item>
-
-       <tag><c>hello_extensions() =</c></tag>
-       <item><p><c>#{renegotiation_info => binary() | undefined,
-                   signature_algs => [{hash(), ecsda| rsa| dsa}] | undefined
-		   alpn => binary() | undefined,
-		   next_protocol_negotiation => binary() | undefined,
-		   srp => string() | undefined,
-		   ec_point_formats => list() | undefined,
-		   elliptic_curves => [oid] | undefined,
-		   sni => string() | undefined}
-       }</c></p></item>
+    <datatype>
+      <name name="active_msgs"/>
+      <desc>
+      <p>When a 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 as described above.</p>
+      <p>The <c>ssl_passive</c> message is sent only when the socket is in
+      <c>{active, N}</c> mode and the counter dropped to 0. It indicates
+      that the socket has transitioned to passive (<c>{active, false}</c>) mode.</p>
+      </desc>
+    </datatype>
       
-
-    </taglist>
-  </section>
-
-  <section>
-    <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>
+    <datatype>
+      <name name="transport_option"/>
+      <desc>
+	<p>Defaults to <c>{gen_tcp, tcp, tcp_closed, tcp_error,
+	tcp_passive}</c> for TLS (for backward compatibility a four
+	tuple will be converted to a five tuple with the last element
+	"second_element"_passive) and <c>{gen_udp, udp, udp_closed,
+	udp_error}</c> for DTLS (might also be changed to five tuple in
+	the future). Can be used to customize the transport layer. The
+	tag values should be the values used by the underlying
+	transport in its active mode messages. 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. For DTLS this
+	feature must be considered exprimental.
+	</p>
+      </desc>
+    </datatype>
+  
+     <datatype>
+      <name name="host"/>
+     </datatype>
+
+     <datatype>
+      <name name="hostname"/>
+     </datatype>
+
+     <datatype>
+      <name name="ip_address"/>
+     </datatype>
+
+     <datatype>
+       <name name="protocol_version"/>
+     </datatype>
+
+     <datatype>
+       <name name="tls_version"/>
+     </datatype>
+
+     <datatype>
+       <name name="dtls_version"/>
+     </datatype>
+
+     <datatype>
+       <name name="tls_legacy_version"/>
+     </datatype>
+
+     <datatype>
+       <name name="dtls_legacy_version"/>
+     </datatype>
+
+     <datatype>
+       <name name="prf_random"/>
+     </datatype>
+     
+      <datatype>
+       <name name="verify_type"/>
+     </datatype>
+       
+     <datatype>
+       <name name="ciphers"/>
+     </datatype>
+     
+      <datatype>
+       <name name="erl_cipher_suite"/>
+     </datatype>
+     
+     <datatype>
+       <name name="cipher"/>
+     </datatype>
     
-    <taglist>
-
-      <tag><c>{protocol, tls | dtls}</c></tag>
-      <item><p>Choose TLS or DTLS protocol for the transport layer security.
-      Defaults to <c>tls</c> Introduced in OTP 20, DTLS support is considered
-      experimental in this release. Other transports than UDP are not yet supported.</p></item>
-
-      <tag><c>{handshake, hello | full}</c></tag>
-      <item><p> Defaults to <c>full</c>. If hello is specified the handshake will
-      pause after the hello message and give the user a possibility make decisions
-      based on hello extensions before continuing or aborting the handshake by calling
-      <seealso marker="#handshake_continue-3"> handshake_continue/3</seealso> or
-      <seealso marker="#handshake_cancel-1"> handshake_cancel/1</seealso>
-      </p></item>
-      
-      <tag><c>{cert, public_key:der_encoded()}</c></tag>
-      <item><p>The DER-encoded users certificate. If this option
-      is supplied, it overrides option <c>certfile</c>.</p></item>
-      
-      <tag><c>{certfile, path()}</c></tag>
-      <item><p>Path to a file containing the user certificate.</p></item>
-      
-      <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>
-      <item><p>Path to the file containing the user's
-      private PEM-encoded key. As PEM-files can contain several
-      entries, this option defaults to the same file as given by
-      option <c>certfile</c>.</p></item>
-
-      <tag><c>{password, string()}</c></tag>
-      <item><p>String containing the user's password. Only used if the 
-      private keyfile is password-protected.</p></item>
-
-      <tag><c>{ciphers, ciphers()}</c></tag>
-      <item><p>Supported cipher suites. The function
-      <c>cipher_suites/0</c> can be used to find all ciphers that are
-      supported by default. <c>cipher_suites(all)</c> can be called
-      to find all available cipher suites. Pre-Shared Key 
-      (<url href="http://www.ietf.org/rfc/rfc4279.txt">RFC 4279</url> and
-      <url href="http://www.ietf.org/rfc/rfc5487.txt">RFC 5487</url>), 
-      Secure Remote Password 
-      (<url href="http://www.ietf.org/rfc/rfc5054.txt">RFC 5054</url>), RC4 cipher suites,
-      and anonymous cipher suites only work if explicitly enabled by
-      this option; they are supported/enabled by the peer also.
-      Anonymous cipher suites are supported for testing purposes
-      only and are not be used when security matters.</p></item>
-
-      <tag><c>{eccs, [named_curve()]}</c></tag>
-      <item><p> Allows to specify the order of preference for named curves
-      and to restrict their usage when using a cipher suite supporting them.
-      </p></item>
-
-      <tag><c>{secure_renegotiate, boolean()}</c></tag>
-      <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>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>
-      </item>
-
-      <tag><c>{depth, integer()}</c></tag>
-      <item><p>Maximum number of non-self-issued
+     <datatype>
+       <name name="legacy_cipher"/>
+     </datatype>
+    
+     <datatype>
+       <name name="cipher_filters"/>
+     </datatype>
+ 
+       <datatype>
+       <name name="hash"/>
+     </datatype>
+
+     <datatype>
+       <name name="sha2"/>
+     </datatype>
+
+     <datatype>
+       <name name="legacy_hash"/>
+     </datatype>
+
+    <datatype>
+       <name name="old_cipher_suite"/>
+     </datatype>
+     
+     <datatype>
+      <name name="signature_algs"/>
+     </datatype>
+
+     <datatype>
+      <name name="sign_algo"/>
+     </datatype>
+     
+     <datatype>
+       <name name="sign_scheme"/>
+     </datatype>
+
+     <datatype>
+       <name name="group"/>
+     </datatype>
+     
+     <datatype>
+      <name name="kex_algo"/>
+     </datatype>
+
+     <datatype>
+      <name name="algo_filter"/>
+     </datatype>
+
+     <datatype>
+      <name name="named_curve"/>
+     </datatype>
+
+     <datatype>
+       <name name="psk_identity"/>
+     </datatype>
+
+     <datatype>
+       <name name="srp_identity"/>
+     </datatype>
+
+     <datatype>
+      <name name="srp_param_type"/>
+     </datatype>
+     
+     <datatype>
+       <name name="app_level_protocol"/>
+     </datatype>
+
+     <datatype>
+      <name name="protocol_extensions"/>
+     </datatype>
+
+     <datatype>
+      <name name="error_alert"/>
+     </datatype>
+
+     <datatype>
+      <name name="tls_alert"/>
+     </datatype>
+
+     <datatype>
+      <name name="reason"/>
+     </datatype>
+
+    <datatype_title>TLS/DTLS OPTION DESCRIPTIONS - COMMON for SERVER and CLIENT</datatype_title>
+    
+    <datatype>
+      <name name="common_option"/>
+    </datatype>
+    
+    <datatype>
+      <name since="OTP 20" name="protocol"/>
+      <desc>
+	<p>Choose TLS or DTLS protocol for the transport layer security.
+	Defaults to <c>tls</c>. For DTLS other transports than UDP are not yet supported.</p>
+      </desc>
+    </datatype>
+    
+    <datatype>
+      <name name="handshake_completion"/>
+      <desc>
+	<p>Defaults to <c>full</c>. If hello is specified the handshake will
+	pause after the hello message and give the user a possibility make decisions
+	based on hello extensions before continuing or aborting the handshake by calling
+	<seealso marker="#handshake_continue-3"> handshake_continue/3</seealso> or
+	<seealso marker="#handshake_cancel-1"> handshake_cancel/1</seealso></p>
+      </desc>
+    </datatype>
+    
+    <datatype>
+      <name name="cert"/>
+      <desc>
+	<p>The DER-encoded users certificate. If this option
+	is supplied, it overrides option <c>certfile</c>.</p>
+      </desc>
+    </datatype>
+    
+    <datatype>
+      <name name="cert_pem"/>
+      <desc>
+	<p>Path to a file containing the user certificate on PEM format.</p>
+      </desc>
+    </datatype>
+    
+    <datatype>
+      <name name="key"/>
+      <desc>
+	<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>
+      </desc>
+    </datatype>
+    
+     <datatype>
+       <name name="key_pem"/>
+       <desc>
+	<p>Path to the file containing the user's
+	private PEM-encoded key. As PEM-files can contain several
+	entries, this option defaults to the same file as given by
+	option <c>certfile</c>.</p>
+       </desc>
+     </datatype>
+     
+    <datatype>
+      <name name="key_password"/>
+      <desc>
+	<p>String containing the user's password. Only used if the 
+	private keyfile is password-protected.</p>
+      </desc>
+    </datatype>
+    
+    <datatype>
+      <name name="cipher_suites"/>
+      <desc>
+	<p>Supported cipher suites. The function
+	<c>cipher_suites/2</c> can be used to find all ciphers that
+	are supported by default. <c>cipher_suites(all, 'tlsv1.2')</c> can be
+	called to find all available cipher suites. Pre-Shared Key
+	(<url href="http://www.ietf.org/rfc/rfc4279.txt">RFC
+	4279</url> and <url
+	href="http://www.ietf.org/rfc/rfc5487.txt">RFC 5487</url>),
+	Secure Remote Password (<url
+	href="http://www.ietf.org/rfc/rfc5054.txt">RFC 5054</url>),
+	RC4, 3DES, DES cipher suites, and anonymous cipher suites only work if
+	explicitly enabled by this option; they are supported/enabled
+	by the peer also.  Anonymous cipher suites are supported for
+	testing purposes only and are not be used when security
+	matters.</p>
+      </desc>
+    </datatype>
+    
+    <datatype>
+      <name name="signature_schemes"/>
+      <desc>
+	  <p>
+	    In addition to the signature_algorithms extension from TLS 1.2,
+	    <url href="http://www.ietf.org/rfc/rfc8446.txt#section-4.2.3">TLS 1.3
+	    (RFC 5246 Section 4.2.3)</url>adds the signature_algorithms_cert extension
+	    which enables having special requirements on the signatures used in the
+	    certificates that differs from the requirements on digital signatures as a whole.
+	    If this is not required this extension is not needed.
+	  </p>
+	  <p>
+	    The client will send a signature_algorithms_cert extension (ClientHello),
+	    if TLS version 1.3 or later is used, and the signature_algs_cert option is
+	    explicitly specified. By default, only the signature_algs extension is sent.
+	  </p>
+	  <p>
+	    The signature schemes shall be ordered according to the client's preference
+	    (favorite choice first).
+	  </p>
+      </desc>
+     </datatype>
+
+     <datatype>
+       <name name="supported_groups"/>
+       <desc>
+	 <p>TLS 1.3 introduces the "supported_groups" extension that is used for negotiating
+	 the Diffie-Hellman parameters in a TLS 1.3 handshake. Both client and server
+	 can specify a list of parameters that they are willing to use.
+	 </p>
+	 <p> If it is not specified it will use a default list ([x25519, x448, secp256r1, secp384r1]) that
+	 is filtered based on the installed crypto library version.
+	 </p>
+      </desc>
+     </datatype>
+
+    <datatype>
+      <name name="secure_renegotiation"/>
+      <desc><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>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>
+      </desc>
+    </datatype>
+    
+    <datatype>
+      <name name="allowed_cert_chain_length"/>
+      <desc><p>Maximum number of non-self-issued
       intermediate certificates that can follow the peer certificate 
       in a valid certification path. So, if depth is 0 the PEER must 
       be signed by the trusted ROOT-CA directly; if 1 the path can 
       be PEER, CA, ROOT-CA; if 2 the path can be PEER, CA, CA, 
-      ROOT-CA, and so on. The default value is 1.</p></item>
-
-      <tag><marker id="verify_fun"/><c>{verify_fun, {Verifyfun :: fun(), InitialUserState ::
-      term()}}</c></tag>
-      <item><p>The verification fun is to be defined as follows:</p>
+      ROOT-CA, and so on. The default value is 1.</p>
+      </desc>
+    </datatype>
+    
+    <datatype>
+      <name name="custom_verify"/>
+      <desc>
+	<p>The verification fun is to be defined as follows:</p>
 
 	<code>
-fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom() | {revoked,
-atom()}} |
+fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom() |
+             {revoked, atom()}} |
 	     {extension, #'Extension'{}}, InitialUserState :: term()) ->
 	{valid, UserState :: term()} | {valid_peer, UserState :: term()} |
 	{fail, Reason :: term()} | {unknown, UserState :: term()}.
@@ -315,20 +421,21 @@ atom()}} |
 
 	<p>The verification fun is called during the X509-path
 	validation when an error or an extension unknown to the SSL
-	application is encountered. It is also called
-	when a certificate is considered valid by the path validation
-	to allow access to each certificate in the path to the user
-	application. It differentiates between the peer
-	certificate and the CA certificates by using <c>valid_peer</c> or
-	<c>valid</c> as second argument to the verification fun. See the
-	<seealso marker="public_key:public_key_records">public_key User's
-	Guide</seealso> for definition of <c>#'OTPCertificate'{}</c> and
-	<c>#'Extension'{}</c>.</p>
+	application is encountered. It is also called when a
+	certificate is considered valid by the path validation to
+	allow access to each certificate in the path to the user
+	application. It differentiates between the peer certificate
+	and the CA certificates by using <c>valid_peer</c> or
+	<c>valid</c> as second argument to the verification fun. See
+	the <seealso marker="public_key:public_key_records">public_key
+	User's Guide</seealso> for definition of
+	<c>#'OTPCertificate'{}</c> and <c>#'Extension'{}</c>.</p>
 
 	<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/DTLS handshake terminates.</p></item>
+	  <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/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
@@ -378,10 +485,12 @@ atom()}} |
 
       <taglist>
 	<tag><c>unknown_ca</c></tag>
-	<item><p>No trusted CA was found in the trusted store. The trusted CA is
-	normally a so called ROOT CA, which is a self-signed certificate. Trust can
-	be claimed for an intermediate CA (trusted anchor does not have to be
-	self-signed according to X-509) by using option <c>partial_chain</c>.</p>
+	<item><p>No trusted CA was found in the trusted store. The
+	trusted CA is normally a so called ROOT CA, which is a
+	self-signed certificate. Trust can be claimed for an
+	intermediate CA (trusted anchor does not have to be
+	self-signed according to X-509) by using option
+	<c>partial_chain</c>.</p>
 	</item>
 
 	<tag><c>selfsigned_peer</c></tag>
@@ -392,15 +501,17 @@ atom()}} |
 marker="public_key:public_key#pkix_path_validation-3">public_key:pkix_path_validation/3</seealso>
 	</p></item>
       </taglist>
-      </item>
-
-      <tag><c>{crl_check, boolean() | peer | best_effort }</c></tag>
-      <item>
+      </desc>
+    </datatype>
+    
+    <datatype>
+      <name name="crl_check"/>
+      <desc>
 	<p>Perform CRL (Certificate Revocation List) verification
 	<seealso marker="public_key:public_key#pkix_crls_validate-3">
-	(public_key:pkix_crls_validate/3)</seealso> on all the certificates during the path validation
-	<seealso
-	    marker="public_key:public_key#pkix_path_validation-3">(public_key:pkix_path_validation/3)
+	(public_key:pkix_crls_validate/3)</seealso> on all the
+	certificates during the path validation <seealso
+	marker="public_key:public_key#pkix_path_validation-3">(public_key:pkix_path_validation/3)
 	</seealso>
 	of the certificate chain. Defaults to <c>false</c>.</p>
 	
@@ -409,115 +520,114 @@ marker="public_key:public_key#pkix_path_validation-3">public_key:pkix_path_valid
 	  <item>check is only performed on the peer certificate.</item>
 
 	  <tag><c>best_effort</c></tag>
-	  <item>if certificate revocation status can not be determined
+	  <item>if certificate revocation status cannot be determined
 	  it will be accepted as valid.</item>
 	</taglist>
-
+	
 	<p>The CA certificates specified for the connection will be used to 
 	construct the certificate chain validating the CRLs.</p>
  	
 	<p>The CRLs will be fetched from a local or external cache. See
 	<seealso marker="ssl:ssl_crl_cache_api">ssl_crl_cache_api(3)</seealso>.</p>
-      </item>
-
-      <tag><c>{crl_cache, {Module :: atom(), {DbHandle :: internal | term(), Args :: list()}}}</c></tag>
-      <item>
-	<p>Specify how to perform lookup and caching of certificate revocation lists.
-	<c>Module</c> defaults to <seealso marker="ssl:ssl_crl_cache">ssl_crl_cache</seealso>
-	with <c> DbHandle </c> being <c>internal</c> and an
-	empty argument list.</p>
-
-	<p>There are two implementations available:</p>
-
-	<taglist>
-	  <tag><c>ssl_crl_cache</c></tag>
-	  <item>
-	    <p>This module maintains a cache of CRLs.  CRLs can be
-	    added to the cache using the function <seealso
-	    marker="ssl:ssl_crl_cache#insert-1">ssl_crl_cache:insert/1</seealso>,
-	    and optionally automatically fetched through HTTP if the
-	    following argument is specified:</p>
-
-	    <taglist>
-	      <tag><c>{http, timeout()}</c></tag>
-	      <item><p>
-		Enables fetching of CRLs specified as http URIs in<seealso
-		marker="public_key:public_key_records">X509 certificate extensions</seealso>.
-		Requires the OTP inets application.</p>
-	      </item>
-	    </taglist>
-	  </item>
-
-	  <tag><c>ssl_crl_hash_dir</c></tag>
-	  <item>
-	    <p>This module makes use of a directory where CRLs are
-	    stored in files named by the hash of the issuer name.</p>
-
-	    <p>The file names consist of eight hexadecimal digits
-	    followed by <c>.rN</c>, where <c>N</c> is an integer,
-	    e.g. <c>1a2b3c4d.r0</c>.  For the first version of the
-	    CRL, <c>N</c> starts at zero, and for each new version,
-	    <c>N</c> is incremented by one.  The OpenSSL utility
-	    <c>c_rehash</c> creates symlinks according to this
-	    pattern.</p>
-
-	    <p>For a given hash value, this module finds all
-	    consecutive <c>.r*</c> files starting from zero, and those
-	    files taken together make up the revocation list.  CRL
-	    files whose <c>nextUpdate</c> fields are in the past, or
-	    that are issued by a different CA that happens to have the
-	    same name hash, are excluded.</p>
-
-	    <p>The following argument is required:</p>
-
-	    <taglist>
-	      <tag><c>{dir, string()}</c></tag>
-	      <item><p>Specifies the directory in which the CRLs can be found.</p></item>
-	    </taglist>
-
-	  </item>
-
-	  <tag><c>max_handshake_size</c></tag>
-	  <item>
-	    <p>Integer (24 bits unsigned). Used to limit the size of
-	    valid TLS handshake packets to avoid DoS attacks.
-	    Defaults to 256*1024.</p>
-          </item>
-          
-	</taglist>
-
-      </item>
+      </desc>
+    </datatype>
 
-      <tag><c>{partial_chain, fun(Chain::[DerCert]) -> {trusted_ca, DerCert} |
-      unknown_ca }</c></tag>
-      <item><p>Claim an intermediate CA in the chain as trusted. TLS then
-      performs <seealso
-      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>
+    <datatype>
+      <name name="crl_cache_opts"/>
+      <desc>
+    	<p>Specify how to perform lookup and caching of certificate revocation lists.
+    	<c>Module</c> defaults to <seealso marker="ssl:ssl_crl_cache">ssl_crl_cache</seealso>
+    	with <c> DbHandle </c> being <c>internal</c> and an
+    	empty argument list.</p>
+	
+    	<p>There are two implementations available:</p>
+	
+    	<taglist>
+    	  <tag><c>ssl_crl_cache</c></tag>
+    	  <item>
+    	    <p>This module maintains a cache of CRLs.  CRLs can be
+    	    added to the cache using the function <seealso
+    	    marker="ssl:ssl_crl_cache#insert-1">ssl_crl_cache:insert/1</seealso>,
+    	    and optionally automatically fetched through HTTP if the
+    	    following argument is specified:</p>
+	    
+    	    <taglist>
+    	      <tag><c>{http, timeout()}</c></tag>
+    	      <item><p>
+    		Enables fetching of CRLs specified as http URIs in<seealso
+    		marker="public_key:public_key_records">X509 certificate extensions</seealso>.
+    		Requires the OTP inets application.</p>
+    	      </item>
+    	    </taglist>
+    	  </item>
+	  
+    	  <tag><c>ssl_crl_hash_dir</c></tag>
+    	  <item>
+    	    <p>This module makes use of a directory where CRLs are
+    	    stored in files named by the hash of the issuer name.</p>
+
+    	    <p>The file names consist of eight hexadecimal digits
+    	    followed by <c>.rN</c>, where <c>N</c> is an integer,
+    	    e.g. <c>1a2b3c4d.r0</c>.  For the first version of the
+    	    CRL, <c>N</c> starts at zero, and for each new version,
+    	    <c>N</c> is incremented by one.  The OpenSSL utility
+    	    <c>c_rehash</c> creates symlinks according to this
+    	    pattern.</p>
+
+    	    <p>For a given hash value, this module finds all
+    	    consecutive <c>.r*</c> files starting from zero, and those
+    	    files taken together make up the revocation list.  CRL
+    	    files whose <c>nextUpdate</c> fields are in the past, or
+    	    that are issued by a different CA that happens to have the
+    	    same name hash, are excluded.</p>
+	    
+    	    <p>The following argument is required:</p>
+
+    	    <taglist>
+    	      <tag><c>{dir, string()}</c></tag>
+    	      <item><p>Specifies the directory in which the CRLs can be found.</p></item>
+    	    </taglist>
+    	  </item>
+	  </taglist>
+	</desc>
+    </datatype>
+
+    <datatype>
+      <name name="root_fun"/>
+      <desc>
+	<code>
+fun(Chain::[public_key:der_encoded()]) ->
+	{trusted_ca, DerCert::public_key:der_encoded()} | unknown_ca}
+	</code>
+	<p>Claim an intermediate CA in the chain as trusted. TLS then
+	performs <seealso
+	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>
+      </desc>
+    </datatype>
 
-      <tag><c>{versions, [protocol_version()]}</c></tag>
 
-      <item><p>TLS protocol versions supported by started clients and servers.
+    <datatype>
+      <name name="protocol_versions"/>
+      <desc><p>TLS protocol versions supported by started clients and servers.
       This option overrides the application environment option
       <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>
+      See also <seealso marker="ssl:ssl_app">ssl(6).</seealso></p>
+      </desc>
+    </datatype>
 
-      <tag><c>{hibernate_after, integer()|undefined}</c></tag>
-      <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
-      never goes into hibernation.</p></item>
 
-      <tag><c>{user_lookup_fun, {Lookupfun :: fun(), UserState :: term()}}</c></tag>
-      <item><p>The lookup fun is to defined as follows:</p>
+      <datatype>
+      <name name="custom_user_lookup"/>
+      <desc><p>The lookup fun is to defined as follows:</p>
 
 	<code>
 fun(psk, PSKIdentity ::string(), UserState :: term()) ->
 	{ok, SharedSecret :: binary()} | error;
 fun(srp, Username :: string(), UserState :: term()) ->
-	{ok, {SRPParams :: srp_param_type(), Salt :: binary(), DerivedKey :: binary()}} | error.
+	{ok, {SRPParams :: srp_param_type(), Salt :: binary(),
+	      DerivedKey :: binary()}} | error.
 	</code>
 
 	<p>For Pre-Shared Key (PSK) cipher suites, the lookup fun is
@@ -533,20 +643,63 @@ fun(srp, Username :: string(), UserState :: term()) ->
 	<url href="http://tools.ietf.org/html/rfc5054#section-2.4"> RFC 5054</url>:
 	<c>crypto:sha([Salt, crypto:sha([Username, &lt;&lt;$:&gt;&gt;, Password])])</c>
 	</p>
-      </item>
+      </desc>
+    </datatype>
 
-      <tag><c>{padding_check, boolean()}</c></tag>
-      <item><p>Affects TLS-1.0 connections only.
+    <datatype>
+      <name name="session_id"/>
+      <desc>
+	<p>Identifies a TLS session.</p>
+      </desc>
+    </datatype>
+    
+    <datatype>    
+      <name name="log_alert"/> 
+      <desc><p>If set to <c>false</c>, error reports are not displayed.
+      Deprecated in OTP 22, use {log_level, <seealso marker="#type-logging_level">logging_level()</seealso>} instead.</p> 
+      </desc> 
+    </datatype> 
+
+    <datatype>    
+      <name name="logging_level"/> 
+      <desc><p>Specifies the log level for TLS/DTLS. At verbosity level <c>notice</c> and above error reports are
+      displayed in TLS/DTLS. The level <c>debug</c> triggers verbose logging of TLS/DTLS protocol
+      messages.</p>
+      </desc> 
+    </datatype> 
+    
+    <datatype>    
+    <name name="hibernate_after"/> 
+    <desc><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 
+    never goes into hibernation.</p> 
+    </desc> 
+    </datatype> 
+
+    <datatype>
+      <name name="handshake_size"/>
+      <desc>
+    	<p>Integer (24 bits unsigned). Used to limit the size of
+    	valid TLS handshake packets to avoid DoS attacks.
+    	Defaults to 256*1024.</p>
+      </desc>
+    </datatype>
+    
+    <datatype>
+      <name name="padding_check"/>
+      <desc><p>Affects TLS-1.0 connections only.
       If set to <c>false</c>, it disables the block cipher padding check
       to be able to interoperate with legacy software.</p>
       <warning><p>Using <c>{padding_check, boolean()}</c> makes TLS
 	vulnerable to the Poodle attack.</p></warning>
-      </item>
-
-      
+      </desc>
+    </datatype>
 
-      <tag><c>{beast_mitigation, one_n_minus_one | zero_n | disabled}</c></tag>
-      <item><p>Affects SSL-3.0 and TLS-1.0 connections only. Used to change the BEAST
+    <datatype>
+      <name name="beast_mitigation"/>
+      <desc><p>Affects SSL-3.0 and TLS-1.0 connections only. Used to change the BEAST
        mitigation strategy to interoperate with legacy software.
        Defaults to <c>one_n_minus_one</c>.</p>
 
@@ -556,127 +709,170 @@ fun(srp, Username :: string(), UserState :: term()) ->
 
       <p><c>disabled</c> - Disable BEAST mitigation.</p>
 
-      <warning><p>Using <c>{beast_mitigation, disabled}</c> makes SSL or TLS
+      <warning><p>Using <c>{beast_mitigation, disabled}</c> makes SSL-3.0 or TLS-1.0
         vulnerable to the BEAST attack.</p></warning>
-      </item>
-      </taglist>
-
-  </section>
-  
-  <section>
-    <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>
-
-    <taglist>
+      </desc>
+    </datatype>
+    
+    <datatype>
+      <name name="ssl_imp"/>
+        <desc><p>Deprecated since OTP-17, has no affect.</p></desc>
+    </datatype>
+    
+    <datatype_title>TLS/DTLS OPTION DESCRIPTIONS - CLIENT</datatype_title>
+    
+    <datatype>
+      <name name="client_option"/>
+    </datatype>
+   
+     <datatype>
+      <name name="client_verify_type"/>
+      <desc><p>In mode <c>verify_none</c> the default behavior is to allow
+      all x509-path validation errors. See also option  <seealso marker="#type-custom_verify">verify_fun</seealso>.</p>
+      </desc>
+    </datatype>
 
-      <tag><c>{verify, verify_type()}</c></tag>
-      <item><p>In mode <c>verify_none</c> the default behavior is to allow
-      all x509-path validation errors. See also option <c>verify_fun</c>.</p>
-      </item>
+    <datatype>
+      <name name="client_reuse_session"/>
+      <desc>
+	<p>Reuses a specific session earlier saved with the option
+	<c>{reuse_sessions, save} since OTP-21.3 </c>
+      </p>
+      </desc>
+    </datatype>
 
-      <tag><c>{reuse_sessions, boolean()}</c></tag>
-      <item><p>Specifies if the client is to try to reuse sessions
-      when possible.</p></item>
+    <datatype>
+      <name name="client_reuse_sessions"/>
+      <desc>
+	<p>When <c>save</c> is specified a new connection will be negotiated
+      and saved for later reuse. The session ID can be fetched with 
+      <seealso marker="#connection_information-2">connection_information/2</seealso>
+      and used with the client option <seealso marker="#type-client_reuse_session">reuse_session</seealso>
+      The boolean value true specifies that if possible, automatized session reuse will
+      be performed. If a new session is created, and is unique in regard 
+      to previous stored sessions, it will be saved for possible later reuse. Since OTP-21.3</p>
+      </desc>
+    </datatype>
 
-      <tag><c>{cacerts, [public_key:der_encoded()]}</c></tag>
-      <item><p>The DER-encoded trusted certificates. If this option
-      is supplied it overrides option <c>cacertfile</c>.</p></item>
-      
-      <tag><c>{cacertfile, path()}</c></tag>
-      <item><p>Path to a file containing PEM-encoded CA certificates. The CA
+    <datatype>
+      <name name="client_cacerts"/>
+      <desc>
+	<p>The DER-encoded trusted certificates. If this option
+      is supplied it overrides option <c>cacertfile</c>.</p>
+      </desc>
+    </datatype>
+    
+    <datatype>
+      <name name="client_cafile"/>
+      <desc>
+	<p>Path to a file containing PEM-encoded CA certificates. The CA
       certificates are used during server authentication and when building the
       client certificate chain.</p>
-    </item>
-
-      <tag><c>{alpn_advertised_protocols, [binary()]}</c></tag>
-      <item>
-      <p>The list of protocols supported by the client to be sent to the
-      server to be used for an Application-Layer Protocol Negotiation (ALPN).
-      If the server supports ALPN then it will choose a protocol from this
-      list; otherwise it will fail the connection with a "no_application_protocol"
-      alert. A server that does not support ALPN will ignore this value.</p>
-
-      <p>The list of protocols must not contain an empty binary.</p>
-
-      <p>The negotiated protocol can be retrieved using the <c>negotiated_protocol/1</c> function.</p>
-      </item>
-
-      <tag><c>{client_preferred_next_protocols, {Precedence :: server | client, ClientPrefs :: [binary()]}}</c><br/>
-      <c>{client_preferred_next_protocols, {Precedence :: server | client, ClientPrefs :: [binary()], Default :: binary()}}</c></tag>
-	   <item>
-	   <p>Indicates that the client is to try to perform Next Protocol
-	   Negotiation.</p>
-
-	   <p>If precedence is server, the negotiated protocol is the
-	   first protocol to be shown on the server advertised list, which is
-	   also on the client preference list.</p>
-
-	   <p>If precedence is client, the negotiated protocol is the
-	   first protocol to be shown on the client preference list, which is
-	   also on the server advertised list.</p>
-
-	   <p>If the client does not support any of the server advertised
-	   protocols or the server does not advertise any protocols, the
-	   client falls back to the first protocol in its list or to the
-	   default protocol (if a default is supplied). If the
-	   server does not support Next Protocol Negotiation, the
-	   connection terminates if no default protocol is supplied.</p>
-	   </item>
-
-      <tag><c>{psk_identity, string()}</c></tag>
-      <item><p>Specifies the identity the client presents to the server.
-      The matching secret is found by calling <c>user_lookup_fun</c>.</p>
-      </item>
-
-      <tag><c>{srp_identity, {Username :: string(), Password :: string()}
-      </c></tag>
-      <item><p>Specifies the username and password to use to authenticate
-      to the server.</p></item>
-
-      <tag><c>{server_name_indication, HostName :: hostname()}</c></tag>
-      <item><p>Specify the hostname to be used in TLS Server Name Indication extension.
-      If not specified it will default to the <c>Host</c> argument of <seealso marker="#connect-3">connect/[3,4]</seealso>
-      unless it is of type inet:ipaddress().</p>
-      <p>
-	The <c>HostName</c> will also be used in the hostname verification of the peer certificate using
-	<seealso marker="public_key:public_key#pkix_verify_hostname-2">public_key:pkix_verify_hostname/2</seealso>.
-      </p>
-      </item>
-      <tag><c>{server_name_indication, disable}</c></tag>
-	<item>
-          <p> Prevents the Server Name Indication extension from being sent and
-	  disables the hostname verification check
-	  <seealso marker="public_key:public_key#pkix_verify_hostname-2">public_key:pkix_verify_hostname/2</seealso> </p>
-	</item>
-
-	<tag><c>{customize_hostname_check, Options::list()}</c></tag>
-	<item>
-          <p> Customizes the hostname verification of the peer certificate, as different protocols that use
+      </desc>
+    </datatype>
+    
+    <datatype>
+      <name name="client_alpn"/>
+      <desc>
+	<p>The list of protocols supported by the client to be sent to the
+	server to be used for an Application-Layer Protocol Negotiation (ALPN).
+	If the server supports ALPN then it will choose a protocol from this
+	list; otherwise it will fail the connection with a "no_application_protocol"
+	alert. A server that does not support ALPN will ignore this value.</p>
+	
+	<p>The list of protocols must not contain an empty binary.</p>
+	
+	<p>The negotiated protocol can be retrieved using the <c>negotiated_protocol/1</c> function.</p>
+      </desc>
+    </datatype>
+    
+   <datatype>
+      <name name="client_preferred_next_protocols"/>
+      <desc>
+	<p>Indicates that the client is to try to perform Next Protocol
+	Negotiation.</p>
+	
+	<p>If precedence is server, the negotiated protocol is the
+	first protocol to be shown on the server advertised list, which is
+	also on the client preference list.</p>
+	
+	<p>If precedence is client, the negotiated protocol is the
+	first protocol to be shown on the client preference list, which is
+	also on the server advertised list.</p>
+	
+	<p>If the client does not support any of the server advertised
+	protocols or the server does not advertise any protocols, the
+	client falls back to the first protocol in its list or to the
+	default protocol (if a default is supplied). If the
+	server does not support Next Protocol Negotiation, the
+	connection terminates if no default protocol is supplied.</p>
+      </desc>
+   </datatype>
+   
+   <datatype>
+      <name name="client_psk_identity"/>
+      <desc>
+	<p>Specifies the identity the client presents to the server.
+	The matching secret is found by calling <c>user_lookup_fun</c></p>
+      </desc>
+      </datatype>
+
+      <datatype>
+	<name name="client_srp_identity"/>
+	<desc>
+	  <p>Specifies the username and password to use to authenticate
+	  to the server.</p>
+	</desc>
+      </datatype>
+
+      <datatype>
+      <name name="sni"/>
+      <desc>
+	<p>Specify the hostname to be used in TLS Server Name Indication extension.
+	If not specified it will default to the <c>Host</c> argument of <seealso marker="#connect-3">connect/[3,4]</seealso>
+	unless it is of type inet:ipaddress().</p>
+	<p>
+	  The <c>HostName</c> will also be used in the hostname verification of the peer certificate using
+	  <seealso marker="public_key:public_key#pkix_verify_hostname-2">public_key:pkix_verify_hostname/2</seealso>.
+	</p>
+	<p> The special value <c>disable</c> prevents the Server Name Indication extension from being sent and
+	disables the hostname verification check
+	<seealso marker="public_key:public_key#pkix_verify_hostname-2">public_key:pkix_verify_hostname/2</seealso> </p>
+      </desc>
+      </datatype>
+         
+      <datatype>
+	<name name="customize_hostname_check"/>
+	<desc>
+	  <p> Customizes the hostname verification of the peer certificate, as different protocols that use
 	  TLS such as HTTP or LDAP may want to do it differently, for possible options see
 	  <seealso marker="public_key:public_key#pkix_verify_hostname-3">public_key:pkix_verify_hostname/3</seealso> </p>
-	</item>
-
-      <tag><c>{fallback, boolean()}</c></tag>
-      <item>
-	<p> Send special cipher suite TLS_FALLBACK_SCSV to avoid undesired TLS version downgrade.
-	Defaults to false</p>
-	<warning><p>Note this option is not needed in normal TLS usage and should not be used
-	to implement new clients. But legacy clients that retries connections in the following manner</p>
-
-	<p><c> ssl:connect(Host, Port, [...{versions, ['tlsv2', 'tlsv1.1', 'tlsv1', 'sslv3']}])</c></p>
-	<p><c>  ssl:connect(Host, Port, [...{versions, [tlsv1.1', 'tlsv1', 'sslv3']}, {fallback, true}])</c></p>
-	<p><c>  ssl:connect(Host, Port, [...{versions, ['tlsv1', 'sslv3']}, {fallback, true}]) </c></p>
-	<p><c>  ssl:connect(Host, Port, [...{versions, ['sslv3']}, {fallback, true}]) </c></p>
-	 
-	 <p>may use it to avoid undesired TLS version downgrade. Note that TLS_FALLBACK_SCSV must also
-	 be supported by the server for the prevention to work.
-	</p></warning>
-      </item>
-      <tag><marker id="client_signature_algs"/><c>{signature_algs, [{hash(), ecdsa | rsa | dsa}]}</c></tag>
-	<item>
-	<p>In addition to the algorithms negotiated by the cipher
+	</desc>
+      </datatype>
+      
+      <datatype>
+	<name name="fallback"/>
+	<desc>
+	  <p> Send special cipher suite TLS_FALLBACK_SCSV to avoid undesired TLS version downgrade.
+	  Defaults to false</p>
+	  <warning><p>Note this option is not needed in normal TLS usage and should not be used
+	  to implement new clients. But legacy clients that retries connections in the following manner</p>
+	  
+	  <p><c> ssl:connect(Host, Port, [...{versions, ['tlsv2', 'tlsv1.1', 'tlsv1', 'sslv3']}])</c></p>
+	  <p><c>  ssl:connect(Host, Port, [...{versions, [tlsv1.1', 'tlsv1', 'sslv3']}, {fallback, true}])</c></p>
+	  <p><c>  ssl:connect(Host, Port, [...{versions, ['tlsv1', 'sslv3']}, {fallback, true}]) </c></p>
+	  <p><c>  ssl:connect(Host, Port, [...{versions, ['sslv3']}, {fallback, true}]) </c></p>
+	  
+	  <p>may use it to avoid undesired TLS version downgrade. Note that TLS_FALLBACK_SCSV must also
+	  be supported by the server for the prevention to work.
+	  </p></warning>
+	</desc>
+      </datatype>
+      
+      <datatype>
+	<name name="client_signature_algs"/>
+	<desc>
+	  <p>In addition to the algorithms negotiated by the cipher
 	suite used for key exchange, payload encryption, message
 	authentication and pseudo random calculation, the TLS signature
 	algorithm extension <url
@@ -707,178 +903,227 @@ fun(srp, Username :: string(), UserState :: term()) ->
 	Selected signature algorithm can restrict which hash functions
 	that may be selected. Default support for {md5, rsa} removed in ssl-8.0
 	</p>
-	</item>
-      </taglist>
-   </section>
-   
-  <section>
-    <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>
-
-    <taglist>
-
-      <tag><c>{cacerts, [public_key:der_encoded()]}</c></tag>
-      <item><p>The DER-encoded trusted certificates. If this option
-      is supplied it overrides option <c>cacertfile</c>.</p></item>
+	</desc>
+      </datatype>
       
-      <tag><c>{cacertfile, path()}</c></tag>
-      <item><p>Path to a file containing PEM-encoded CA
-      certificates. The CA certificates are used to build the server
-      certificate chain and for client authentication. The CAs are
-      also used in the list of acceptable client CAs passed to the
-      client when a certificate is requested. Can be omitted if there
-      is no need to verify the client and if there are no
-      intermediate CAs for the server certificate.</p></item>
-  
-      <tag><c>{dh, public_key:der_encoded()}</c></tag>
-      <item><p>The DER-encoded Diffie-Hellman parameters. If specified,
-      it overrides option <c>dhfile</c>.</p></item>
-
-      <tag><c>{dhfile, path()}</c></tag>
-      <item><p>Path to a file containing PEM-encoded Diffie Hellman parameters
-      to be used by the server if a cipher suite using Diffie Hellman key
-      exchange is negotiated. If not specified, default parameters are used.
-      </p></item>
-
-      <tag><c>{verify, verify_type()}</c></tag>
-      <item><p>A server only does x509-path validation in mode <c>verify_peer</c>,
-      as it then sends a certificate request to the client
-      (this message is not sent if the verify option is <c>verify_none</c>).
-      You can then also want to specify option <c>fail_if_no_peer_cert</c>.
-      </p></item>
-
-      <tag><c>{fail_if_no_peer_cert, boolean()}</c></tag>
-      <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
-      certificate (an empty certificate is considered valid). Defaults to false.</p>
-      </item>
-
-      <tag><c>{reuse_sessions, boolean()}</c></tag>
-      <item><p>Specifies if the server is to agree to reuse sessions
-      when requested by the clients. See also option <c>reuse_session</c>.
-      </p></item>
-
-      <tag><c>{reuse_session, fun(SuggestedSessionId,
-      PeerCert, Compression, CipherSuite) -> boolean()}</c></tag>
-      <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
-      a DER-encoded certificate, <c>Compression</c> is an enumeration integer,
-      and <c>CipherSuite</c> is of type <c>ciphersuite()</c>.</p></item>
-
-      <tag><c>{alpn_preferred_protocols, [binary()]}</c></tag>
-      <item>
-      <p>Indicates the server will try to perform Application-Layer
-      Protocol Negotiation (ALPN).</p>
-
-      <p>The list of protocols is in order of preference. The protocol
-      negotiated will be the first in the list that matches one of the
-      protocols advertised by the client. If no protocol matches, the
-      server will fail the connection with a "no_application_protocol" alert.</p>
-
-      <p>The negotiated protocol can be retrieved using the <c>negotiated_protocol/1</c> function.</p>
-      </item>
-
-      <tag><c>{next_protocols_advertised, Protocols :: [binary()]}</c></tag>
-      <item><p>List of protocols to send to the client if the client indicates that
-      it supports the Next Protocol extension. The client can select a protocol
-      that is not on this list. The list of protocols must not contain an empty
-      binary. If the server negotiates a Next Protocol, it can be accessed
-      using the <c>negotiated_next_protocol/1</c> method.</p></item>
-
-      <tag><c>{psk_identity, string()}</c></tag>
-      <item><p>Specifies the server identity hint, which the server presents to
-      the client.</p></item>
-
-      <tag><c>{log_alert, boolean()}</c></tag>
-      <item><p>If set to <c>false</c>, error reports are not displayed.</p></item>
-
-      <tag><c>{honor_cipher_order, boolean()}</c></tag>
-      <item><p>If set to <c>true</c>, use the server preference for cipher
-      selection. If set to <c>false</c> (the default), use the client
-      preference.</p></item>
-
-      <tag><c>{sni_hosts, [{hostname(), [ssl_option()]}]}</c></tag>
-      <item><p>If the server receives a SNI (Server Name Indication) from the client
-      matching a host listed in the <c>sni_hosts</c> option, the specific options for
-      that host will override previously specified options.
-
-      The option <c>sni_fun</c>, and <c>sni_hosts</c> are mutually exclusive.</p></item>
-
-      <tag><c>{sni_fun, SNIfun::fun()}</c></tag>
-      <item><p>If the server receives a SNI (Server Name Indication) from the client,
-      the given function will be called to retrieve <c>[ssl_option()]</c> for the indicated server.
-      These options will be merged into predefined <c>[ssl_option()]</c>.
-
-      The function should be defined as:
-        <c>fun(ServerName :: string()) -> [ssl_option()]</c>
-      and can be specified as a fun or as named <c>fun module:function/1</c>
-
-      The option <c>sni_fun</c>, and <c>sni_hosts</c> are mutually exclusive.</p></item>
-
-      <tag><c>{client_renegotiation, boolean()}</c></tag>
-      <item>In protocols that support client-initiated renegotiation, the cost
-      of resources of such an operation is higher for the server than the
-      client. This can act as a vector for denial of service attacks. The SSL
-      application already takes measures to counter-act such attempts,
-      but client-initiated renegotiation can be strictly disabled by setting
-      this option to <c>false</c>. The default value is <c>true</c>.
-      Note that disabling renegotiation can result in long-lived connections
-      becoming unusable due to limits on the number of messages the underlying
-      cipher suite can encipher.
-      </item>
-
-      <tag><c>{honor_cipher_order, boolean()}</c></tag>
-      <item>If true, use the server's preference for cipher selection. If false
-      (the default), use the client's preference.
-      </item>
+      <datatype_title>TLS/DTLS OPTION DESCRIPTIONS - SERVER </datatype_title>
+
+
+      <datatype>
+	<name name="server_option"/>
+      </datatype>
+     
+      <datatype>
+	<name name="server_cacerts"/>
+	<desc><p>The DER-encoded trusted certificates. If this option
+      is supplied it overrides option <c>cacertfile</c>.</p>
+	</desc>
+      </datatype>
+            
+      <datatype>
+	<name name="server_cafile"/>
+	<desc><p>Path to a file containing PEM-encoded CA
+	certificates. The CA certificates are used to build the server
+	certificate chain and for client authentication. The CAs are
+	also used in the list of acceptable client CAs passed to the
+	client when a certificate is requested. Can be omitted if
+	there is no need to verify the client and if there are no
+	intermediate CAs for the server certificate.</p>
+	</desc>
+      </datatype>
+
+      <datatype>
+	<name name="dh_der"/>
+	<desc><p>The DER-encoded Diffie-Hellman parameters. If
+	specified, it overrides option <c>dhfile</c>.</p>
+	<warning><p>The <c>dh_der</c> option is not supported by TLS 1.3. Use the
+	<c>supported_groups</c> option instead.</p></warning>
+	</desc>
+      </datatype>
+    
+      <datatype>
+	<name name="dh_file"/>
+	<desc><p>Path to a file containing PEM-encoded Diffie Hellman
+	parameters to be used by the server if a cipher suite using
+	Diffie Hellman key exchange is negotiated. If not specified,
+	default parameters are used.</p>
+	<warning><p>The <c>dh_file</c> option is not supported by TLS 1.3. Use the
+	<c>supported_groups</c> option instead.</p></warning>
+	</desc>
+      </datatype>
+
+    <datatype>
+	<name name="server_verify_type"/>
+	<desc><p>A server only does x509-path validation in mode
+	<c>verify_peer</c>, as it then sends a certificate request to
+	the client (this message is not sent if the verify option is
+	<c>verify_none</c>).  You can then also want to specify option
+	<c>fail_if_no_peer_cert</c>. </p>
+	</desc>
+      </datatype>
+
+      <datatype>
+	<name name="fail_if_no_peer_cert"/>
+	<desc><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 certificate (an empty certificate
+	is considered valid). Defaults to false.</p>
+	</desc>
+      </datatype>
       
-      <tag><c>{honor_ecc_order, boolean()}</c></tag>
-      <item>If true, use the server's preference for ECC curve selection. If false
-      (the default), use the client's preference.
-      </item>
-
-      <tag><c>{signature_algs, [{hash(), ecdsa | rsa | dsa}]}</c></tag>
-      <item><p> The algorithms specified by
-      this option will be the ones accepted by the server in a signature algorithm
-      negotiation, introduced in TLS-1.2. The algorithms will also be offered to the client if a
-      client certificate is requested. For more details see the <seealso marker="#client_signature_algs">corresponding client option</seealso>.
-      </p> </item>
-
-    </taglist>
-  </section>
-  
-  <section>
-    <title>General</title>
+      <datatype>
+	<name name="server_reuse_sessions"/>
+	<desc><p>The boolean value true specifies that the server will
+	agree to reuse sessions. Setting it to false will result in an empty
+	session table, that is no sessions will be reused. 
+	See also option <seealso marker="#type-server_reuse_session">reuse_session</seealso>
+      </p>
+	</desc>
+      </datatype>
       
-    <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>
+      <datatype>
+	<name name="server_reuse_session"/>
+	<desc><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 a DER-encoded certificate,
+	<c>Compression</c> is an enumeration integer, and
+	<c>CipherSuite</c> is of type <c>ciphersuite()</c>.</p>
+	</desc>
+      </datatype>
+
+      <datatype>
+	<name name="server_alpn"/>
+	<desc>  
+	  <p>Indicates the server will try to perform
+	  Application-Layer Protocol Negotiation (ALPN).</p>
+	  
+	  <p>The list of protocols is in order of preference. The
+	  protocol negotiated will be the first in the list that
+	  matches one of the protocols advertised by the client. If no
+	  protocol matches, the server will fail the connection with a
+	  "no_application_protocol" alert.</p>
+	  
+	  <p>The negotiated protocol can be retrieved using the
+	  <c>negotiated_protocol/1</c> function.</p>
+	</desc>
+      </datatype>
+      
+      <datatype>
+	<name name="server_next_protocol"/>
+	<desc><p>List of protocols to send to the client if the client
+	indicates that it supports the Next Protocol extension. The
+	client can select a protocol that is not on this list. The
+	list of protocols must not contain an empty binary. If the
+	server negotiates a Next Protocol, it can be accessed using
+	the <c>negotiated_next_protocol/1</c> method.</p>
+	</desc>
+      </datatype>
+
+      <datatype>
+	<name name="server_psk_identity"/>
+	<desc>
+	  <p>Specifies the server identity hint, which the server presents to
+	  the client.</p>
+	</desc>
+      </datatype>
+
+      <datatype>
+	<name name="honor_cipher_order"/>
+	<desc>
+	  <p>If set to <c>true</c>, use the server preference for cipher
+	  selection. If set to <c>false</c> (the default), use the client
+	  preference.</p>
+	</desc>
+      </datatype>
+
+      <datatype>
+	<name name="sni_hosts"/>
+	<desc><p>If the server receives a SNI (Server Name Indication) from the client
+	matching a host listed in the <c>sni_hosts</c> option, the specific options for
+	that host will override previously specified options.
+	
+	The option <c>sni_fun</c>, and <c>sni_hosts</c> are mutually exclusive.</p>
+	</desc>
+      </datatype>
+
+      <datatype>
+	<name name="sni_fun"/>
+	<desc>
+	  <p>If the server receives a SNI (Server Name Indication)
+	  from the client, the given function will be called to
+	  retrieve <seealso marker="#type-server_option">[server_option()] </seealso> for the indicated server.
+	  These options will be merged into predefined
+	  <seealso marker="#type-server_option">[server_option()] </seealso> list.
+	  
+	  The function should be defined as:
+          fun(ServerName :: string()) -> <seealso marker="#type-server_option">[server_option()] </seealso>
+	  and can be specified as a fun or as named <c>fun module:function/1</c>
+	  
+	  The option <c>sni_fun</c>, and <c>sni_hosts</c> are mutually exclusive.</p>
+	</desc>
+      </datatype>
+
+      <datatype>
+	<name name="client_renegotiation"/>
+	<desc><p>In protocols that support client-initiated
+	renegotiation, the cost of resources of such an operation is
+	higher for the server than the client. This can act as a
+	vector for denial of service attacks. The SSL application
+	already takes measures to counter-act such attempts, but
+	client-initiated renegotiation can be strictly disabled by
+	setting this option to <c>false</c>. The default value is
+	<c>true</c>.  Note that disabling renegotiation can result in
+	long-lived connections becoming unusable due to limits on the
+	number of messages the underlying cipher suite can
+	encipher.</p>
+	</desc>
+      </datatype>
+      
+      <datatype>
+	<name name="honor_cipher_order"/>
+	<desc><p>If true, use the server's preference for cipher
+	selection. If false (the default), use the client's
+	preference.</p>
+	</desc>
+      </datatype>
+
+      <datatype>
+	<name name="honor_ecc_order"/>
+	<desc><p>If true, use the server's preference for ECC curve
+	selection. If false (the default), use the client's
+	preference.</p>
+	</desc>
+      </datatype>
+
+      <datatype>
+	<name name="server_signature_algs"/>
+	<desc><p> The algorithms specified by this option will be the
+	ones accepted by the server in a signature algorithm
+	negotiation, introduced in TLS-1.2. The algorithms will also
+	be offered to the client if a client certificate is
+	requested. For more details see the <seealso
+	marker="#type-client_signature_algs">corresponding client
+	option</seealso>.
+      </p>
+	</desc>
+      </datatype>
+    </datatypes>
 
-    <list type="bulleted">
-      <item><p><c>{ssl, Socket, Data}</c></p></item>
-      <item><p><c>{ssl_closed, Socket}</c></p></item>
-      <item><p><c>{ssl_error, Socket, Reason}</c></p></item>
-    </list>
+<!--
+    ================================================================
+    =  Function definitions                                        =
+    ================================================================
+-->
 
-    <p>A <c>Timeout</c> argument specifies a time-out in milliseconds. The
-      default value for argument <c>Timeout</c> is <c>infinity</c>.</p>
-  </section>
-  
   <funcs>
 
     <func>
-      <name>append_cipher_suites(Deferred, Suites) -> ciphers() </name>
+      <name name="append_cipher_suites" arity="2" since="OTP 20.3"/>
       <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
@@ -889,25 +1134,18 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
     
     <func>
-      <name>cipher_suites() -></name>
-      <name>cipher_suites(Type) -> old_ciphers()</name>
+      <name name="cipher_suites" arity="0" since="OTP R14B"/>
+      <name name="cipher_suites" arity="1" since="OTP R14B"/>
       <fsummary>Returns a list of supported cipher suites.</fsummary>
-      <type>
-        <v>Type = erlang | openssl | all</v>
-      </type>
       <desc>
 	<p>Deprecated in OTP 21, use <seealso marker="#cipher_suites-2">cipher_suites/2</seealso> instead.</p>
       </desc>
     </func>
     
    <func>
-      <name>cipher_suites(Supported, Version) ->  ciphers()</name>
+      <name name="cipher_suites" arity="2" since="OTP 20.3"/>
       <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>
@@ -915,10 +1153,18 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
 
     <func>
-      <name>eccs() -></name>
-      <name>eccs(protocol_version()) -> [named_curve()]</name>
+      <name name="cipher_suites" arity="3" since="OTP 22.0"/>
+      <fsummary>Returns a list of RFC or OpenSSL names</fsummary>
+      <desc><p>Same as <seealso marker="#cipher_suites-2">cipher_suites/2</seealso>
+      but lists RFC or OpenSSL string names instead of <seealso marker="#type-erl_cipher_suite">erl_cipher_suite()</seealso>
+    </p>
+    </desc>
+    </func>
+    
+    <func>
+      <name name="eccs" arity="0" since="OTP 19.2"/>
+      <name name="eccs" arity="1" since="OTP 19.2"/>
       <fsummary>Returns a list of supported ECCs.</fsummary>
-
       <desc><p>Returns a list of supported ECCs. <c>eccs()</c>
       is equivalent to calling <c>eccs(Protocol)</c> with all
       supported protocols and then deduplicating the output.</p>
@@ -926,9 +1172,8 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
     
     <func>
-      <name>clear_pem_cache() -> ok </name>
+      <name name="clear_pem_cache" arity="0" since="OTP 17.5"/>
       <fsummary> Clears the pem cache</fsummary>
-
       <desc><p>PEM files, used by ssl API-functions, are cached. The
       cache is regularly checked to see if any cache entries should be
       invalidated, however this function provides a way to
@@ -938,61 +1183,50 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
    
     <func>
-      <name>connect(Socket, SslOptions) -> </name>
-      <name>connect(Socket, SslOptions, Timeout) -> {ok, SslSocket} | {ok, SslSocket, Ext}
-	| {error, Reason}</name>
+      <name name="connect" arity="2" since="OTP R14B"/>
+      <name name="connect" arity="3" clause_i="1" since=""/>
       <fsummary>Upgrades a <c>gen_tcp</c>, or
 	equivalent, connected socket to an TLS socket.</fsummary>
-      <type>
-	<v>Socket = socket()</v>
-	<v>SslOptions = [{handshake, hello| full} | ssl_option()]</v>
-	<v>Timeout = integer() | infinity</v>
-	<v>SslSocket = sslsocket()</v>
-	<v>Ext = hello_extensions()</v>
-	<v>Reason = term()</v>
-      </type>
       <desc><p>Upgrades a <c>gen_tcp</c>, or equivalent,
 	  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,
-	  if it is not no Server Name Indication extension will be sent,
-	  and <seealso marker="public_key:public_key#pkix_verify_hostname-2">public_key:pkix_verify_hostname/2</seealso>
-	  will be called with the IP-address of the connection as <c>ReferenceID</c>, which is proably not what you want.</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, if it is not no Server Name
+	  Indication extension will be sent, and <seealso
+	  marker="public_key:public_key#pkix_verify_hostname-2">public_key:pkix_verify_hostname/2</seealso>
+	  will be called with the IP-address of the connection as
+	  <c>ReferenceID</c>, which is proably not what you want.</p>
 	  </note>
 
 	  <p> If the option <c>{handshake, hello}</c> is used the
 	  handshake is paused after receiving the server hello message
 	  and the success response is <c>{ok, SslSocket, Ext}</c>
-	  instead of <c>{ok, SslSocket}</c>. Thereafter the handshake is continued or
-	  canceled by calling <seealso marker="#handshake_continue-3">
+	  instead of <c>{ok, SslSocket}</c>. Thereafter the handshake
+	  is continued or canceled by calling <seealso
+	  marker="#handshake_continue-3">
 	  <c>handshake_continue/3</c></seealso> or <seealso
-	  marker="#handshake_cancel-1"><c>handshake_cancel/1</c></seealso>.	 
+	  marker="#handshake_cancel-1"><c>handshake_cancel/1</c></seealso>.
 	  </p>
 	  
+	  <p> If the option <c>active</c> is set to <c>once</c>, <c>true</c> or an integer value,
+	  the process owning the sslsocket will receive messages of type 
+	  <seealso marker="#type-active_msgs"> active_msgs() </seealso>
+	  </p>
     </desc>
     </func>
 
     <func>
-      <name>connect(Host, Port, Options) -></name>
-      <name>connect(Host, Port, Options, Timeout) ->
-	  {ok, SslSocket}| {ok, SslSocket, Ext} | {error, Reason}</name>
+      <name since="" name="connect" arity="3" clause_i="2"/>
+      <name since="" name="connect" arity="4"/>
       <fsummary>Opens an TLS/DTLS connection to <c>Host</c>, <c>Port</c>.</fsummary>
-      <type>
-	  <v>Host = host()</v>
-	  <v>Port = integer()</v>
-	  <v>Options = [option()]</v>
-	  <v>Timeout = integer() | infinity</v>
-	  <v>SslSocket = sslsocket()</v>
-	  <v>Reason = term()</v>
-      </type>
       <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
+      be propagated to the path validation fun <seealso marker="#type-custom_verify">verify_fun</seealso>, where it is possible to do customized
       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>
@@ -1014,28 +1248,24 @@ fun(srp, Username :: string(), UserState :: term()) ->
 	  <c>handshake_continue/3</c></seealso> or <seealso
 	  marker="#handshake_cancel-1"><c>handshake_cancel/1</c></seealso>.
 	  </p>
+
+	  <p> If the option <c>active</c> is set to <c>once</c>, <c>true</c> or an integer value,
+	  the process owning the sslsocket will receive messages of type 
+	  <seealso marker="#type-active_msgs"> active_msgs() </seealso>
+	  </p>
       </desc>
     </func>
 
     <func>
-      <name>close(SslSocket) -> ok | {error, Reason}</name>
+      <name since="" name="close" arity="1" />
       <fsummary>Closes an TLS/DTLS connection.</fsummary>
-      <type>
-	  <v>SslSocket = sslsocket()</v>
-	  <v>Reason = term()</v>
-      </type>
       <desc><p>Closes an TLS/DTLS connection.</p>
       </desc>
     </func>
 
     <func>
-      <name>close(SslSocket, How) -> ok | {ok, port()} | {error, Reason}</name>
+      <name since="OTP 18.1" name="close" arity="2"/>
       <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 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
@@ -1044,15 +1274,9 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
     
     <func>
-      <name>controlling_process(SslSocket, NewOwner) ->
-	ok | {error, Reason}</name>
+      <name since="" name="controlling_process" arity="2" />
 	<fsummary>Assigns a new controlling process to the
 	TLS/DTLS socket.</fsummary>
-	<type>
-	  <v>SslSocket = sslsocket()</v>
-	  <v>NewOwner = pid()</v>
-	  <v>Reason = term()</v>
-	</type>
 	<desc><p>Assigns a new controlling process to the SSL socket. A
 	controlling process is the owner of an SSL socket, and receives
 	all messages from the socket.</p>
@@ -1060,17 +1284,9 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
 
     <func>
-      <name>connection_information(SslSocket) ->
-        {ok, Result} |  {error, Reason} </name>
+      <name since="OTP 18.0" name="connection_information" arity="1"/>
       <fsummary>Returns all the connection information.
       </fsummary>
-      <type>
-	<v>SslSocket = sslsocket()</v>
-        <v>Item = protocol | selected_cipher_suite | sni_hostname | ecc | session_id | atom()</v>
-	<d>Meaningful atoms, not specified above, are the ssl option names.</d>
-	<v>Result = [{Item::atom(), Value::term()}]</v>
-        <v>Reason = term()</v>
-      </type>
       <desc><p>Returns the most relevant information about the connection, ssl options that
       are undefined will be filtered out. Note that values that affect the security of the
       connection will only be returned if explicitly requested by connection_information/2.</p>
@@ -1081,34 +1297,23 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
 
     <func>
-      <name>connection_information(SslSocket, Items) ->
-        {ok, Result} |  {error, Reason} </name>
+      <name since="OTP 18.0" name="connection_information" arity="2"/>
       <fsummary>Returns the requested connection information.
       </fsummary>
-      <type>
-	<v>SslSocket = sslsocket()</v>
-	<v>Items = [Item]</v>
-	<v>Item = protocol | cipher_suite | sni_hostname | ecc | session_id | client_random 
-          | server_random  | master_secret | atom()</v>
-	<d>Note that client_random, server_random  and master_secret are values
-        that affect the security of connection. Meaningful atoms, not specified above, are the ssl option names.</d>
-	<v>Result = [{Item::atom(), Value::term()}]</v>
-        <v>Reason = term()</v>
-      </type>
       <desc><p>Returns the requested information items about the connection,
       if they are defined.</p>
+      <p>Note that client_random, server_random  and master_secret are values
+      that affect the security of connection. Meaningful atoms, not specified
+      above, are the ssl option names.</p>
+
       <note><p>If only undefined options are requested the
       resulting list can be empty.</p></note>
       </desc>
     </func>
 
       <func>
-      <name>filter_cipher_suites(Suites, Filters) -> ciphers()</name>
+      <name since="OTP 20.3" name="filter_cipher_suites" arity="2" />
       <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
@@ -1118,24 +1323,16 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
     
     <func>
-      <name>format_error(Reason) -> string()</name>
+      <name since="" name="format_error" arity="1" />
       <fsummary>Returns an error string.</fsummary>
-      <type>
-        <v>Reason = term()</v>
-      </type>
       <desc>
         <p>Presents the error returned by an SSL function as a printable string.</p>
       </desc>
     </func>
    
     <func>
-      <name>getopts(SslSocket, OptionNames) ->
-	{ok, [socketoption()]} | {error, Reason}</name>
+      <name since="" name="getopts" arity="2" />
       <fsummary>Gets the values of the specified options.</fsummary>
-      <type>
-	<v>Socket = sslsocket()</v>
-	<v>OptionNames = [atom()]</v>
-      </type>
       <desc>
 	<p>Gets the values of the specified socket options.
 	</p>
@@ -1143,16 +1340,9 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
 
     <func>
-      <name>getstat(SslSocket) ->
-        {ok, OptionValues} | {error, inet:posix()}</name>
-      <name>getstat(SslSocket, OptionNames) ->
-        {ok, OptionValues} | {error, inet:posix()}</name>
+      <name since="OTP 19.0" name="getstat" arity="1" />
+      <name since="OTP 19.0" name="getstat" arity="2" />
       <fsummary>Get one or more statistic options for a socket</fsummary>
-      <type>
-    <v>SslSocket = sslsocket()</v>
-    <v>OptionNames = [atom()]</v>
-        <v>OptionValues = [{inet:stat_option(), integer()}]</v>
-      </type>
       <desc>
         <p>Gets one or more statistic options for the underlying TCP socket.</p>
         <p>See inet:getstat/2 for statistic options description.</p>
@@ -1160,32 +1350,24 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
 
     <func>
-      <name>handshake(HsSocket) -> </name>
-      <name>handshake(HsSocket, Timeout) -> {ok, SslSocket}  | {error, Reason}</name>
+      <name since="OTP 21.0" name="handshake" arity="1" />
+      <name since="OTP 21.0" name="handshake" arity="2" clause_i="1" />
       <fsummary>Performs server-side SSL/TLS handshake.</fsummary>
-      <type>
-        <v>HsSocket = SslSocket = sslsocket()</v>
-        <v>Timeout = integer()</v>
-        <v>Reason = term()</v>
-      </type>
       <desc>
         <p>Performs the SSL/TLS/DTLS server-side handshake.</p>
 	<p>Returns a new TLS/DTLS socket if the handshake is successful.</p>
+
+	<p> If the option <c>active</c> is set to <c>once</c>, <c>true</c> or an integer value,
+	the process owning the sslsocket will receive messages of type 
+	<seealso marker="#type-active_msgs"> active_msgs() </seealso>
+	</p>	
       </desc>
     </func>
 
     <func>
-      <name>handshake(Socket, SslOptions) -> </name>
-      <name>handshake(Socket, SslOptions, Timeout) -> {ok, SslSocket} | {ok, SslSocket, Ext} | {error, Reason}</name>
+      <name since="OTP 21.0" name="handshake" arity="2" clause_i="2" />
+      <name since="OTP 21.0" name="handshake" arity="3" />
       <fsummary>Performs server-side SSL/TLS/DTLS handshake.</fsummary>
-      <type>
-        <v>Socket = socket() | sslsocket() </v>
-	<v>SslSocket = sslsocket() </v>
-	<v>Ext = hello_extensions()</v>
-	<v>SslOptions = [{handshake, hello| full} | ssl_option()]</v>
-        <v>Timeout = integer()</v>
-        <v>Reason = term()</v>
-      </type>
       <desc>
         <p>If <c>Socket</c> is a ordinary <c>socket()</c>: upgrades a <c>gen_tcp</c>,
 	or equivalent, socket to an SSL socket, that is, performs
@@ -1196,7 +1378,8 @@ fun(srp, Username :: string(), UserState :: term()) ->
 	is undefined.
 	</p></warning>
 	
-	<p>If <c>Socket</c> is an <c>sslsocket()</c>: provides extra SSL/TLS/DTLS
+	<p>If <c>Socket</c> is an 
+	<seealso marker="#type-sslsocket"> sslsocket() </seealso>: provides extra SSL/TLS/DTLS
 	options to those specified in
 	<seealso marker="#listen-2">listen/2 </seealso> and then performs
 	the SSL/TLS/DTLS handshake. Returns a new TLS/DTLS socket if the handshake is successful.</p>
@@ -1210,56 +1393,43 @@ fun(srp, Username :: string(), UserState :: term()) ->
 	  <c>handshake_continue/3</c></seealso> or <seealso
 	  marker="#handshake_cancel-1"><c>handshake_cancel/1</c></seealso>.
 	</p>
+	
+	<p> If the option <c>active</c> is set to <c>once</c>, <c>true</c> or an integer value,
+	the process owning the sslsocket will receive messages of type 
+	<seealso marker="#type-active_msgs"> active_msgs() </seealso>
+	</p>
+	
       </desc>
     </func>
 
     <func>
-      <name>handshake_cancel(SslSocket) -> ok </name>
+      <name since="OTP 21.0" name="handshake_cancel" arity="1" />
       <fsummary>Cancel handshake with a fatal alert</fsummary>
-      <type>
-        <v>SslSocket = sslsocket()</v>
-      </type>
       <desc>
         <p>Cancel the handshake with a fatal <c>USER_CANCELED</c> alert.</p>
       </desc>
     </func>
 
     <func>
-      <name>handshake_continue(HsSocket, SSLOptions) -> {ok, SslSocket} | {error, Reason}</name>
-      <name>handshake_continue(HsSocket, SSLOptions, Timeout) -> {ok, SslSocket} | {error, Reason}</name>
+      <name since="OTP 21.0" name="handshake_continue" arity="2" />
+      <name since="OTP 21.0" name="handshake_continue" arity="3" />
       <fsummary>Continue the SSL/TLS handshake.</fsummary>
-      <type>
-	<v>HsSocket = SslSocket = sslsocket()</v>
-	<v>SslOptions = [ssl_option()]</v>
-	<v>Timeout = integer()</v>
-	<v>Reason = term()</v>
-      </type>
       <desc>
         <p>Continue the SSL/TLS handshake possiby with new, additional or changed options.</p>
       </desc>
     </func>
     
     <func>
-      <name>listen(Port, Options) ->
-	{ok, ListenSocket} | {error, Reason}</name>
+      <name since="" name="listen" arity="2" />
       <fsummary>Creates an SSL listen socket.</fsummary>
-      <type>
-	<v>Port = integer()</v>
-	<v>Options = options()</v>
-	<v>ListenSocket = sslsocket()</v>
-      </type>
       <desc>
 	<p>Creates an SSL listen socket.</p>
       </desc>
     </func>
 
     <func>
-      <name>negotiated_protocol(SslSocket) -> {ok, Protocol} | {error, protocol_not_negotiated}</name>
+      <name since="OTP 18.0" name="negotiated_protocol" arity="1" />
       <fsummary>Returns the protocol negotiated through ALPN or NPN extensions.</fsummary>
-      <type>
-        <v>SslSocket = sslsocket()</v>
-        <v>Protocol = binary()</v>
-      </type>
       <desc>
         <p>
           Returns the protocol negotiated through ALPN or NPN extensions.
@@ -1268,12 +1438,8 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
     
     <func>
-      <name>peercert(SslSocket) -> {ok, Cert} | {error, Reason}</name>
+      <name since="" name="peercert" arity="1" />
       <fsummary>Returns the peer certificate.</fsummary>
-     <type>
-        <v>SslSocket = sslsocket()</v>
-        <v>Cert = binary()</v>
-      </type>
       <desc>
         <p>The peer certificate is returned as a DER-encoded binary.
 	  The certificate can be decoded with
@@ -1283,26 +1449,16 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
 
     <func>
-      <name>peername(SslSocket) -> {ok, {Address, Port}} |
-	{error, Reason}</name>
+      <name since="" name="peername" arity="1" />
       <fsummary>Returns the peer address and port.</fsummary>
-      <type>
-        <v>SslSocket = sslsocket()</v>
-        <v>Address = ipaddress()</v>
-        <v>Port = integer()</v>
-      </type>
       <desc>
         <p>Returns the address and port number of the peer.</p>
       </desc>
     </func>
     
       <func>
-      <name>prepend_cipher_suites(Preferred, Suites) -> ciphers()</name>
+      <name since="OTP 20.3" name="prepend_cipher_suites" arity="2" />
       <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
@@ -1313,15 +1469,8 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
 
     <func>
-      <name>prf(Socket, Secret, Label, Seed, WantedLength) -> {ok, binary()} | {error, reason()}</name>
+      <name since="OTP R15B01" name="prf" arity="5" />
       <fsummary>Uses a session Pseudo-Random Function to generate key material.</fsummary>
-      <type>
-	<v>Socket = sslsocket()</v>
-	<v>Secret = binary() | master_secret</v>
-	<v>Label = binary()</v>
-	<v>Seed = [binary() | prf_random()]</v>
-	<v>WantedLength = non_neg_integer()</v>
-      </type>
       <desc>
         <p>Uses the Pseudo-Random Function (PRF) of a TLS session to generate
 	  extra key material. It either takes user-generated values for
@@ -1333,16 +1482,14 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
     
     <func>
-      <name>recv(SslSocket, Length) -> </name>
-      <name>recv(SslSocket, Length, Timeout) -> {ok, Data} | {error,
-	Reason}</name>
+      <name since="" name="recv" arity="2" />
+      <name since="" name="recv" arity="3" />
       <fsummary>Receives data on a socket.</fsummary>
-      <type>
-        <v>SslSocket = sslsocket()</v>
-        <v>Length = integer()</v>
-        <v>Timeout = integer()</v>
-        <v>Data = [char()] | binary()</v>
-      </type>
+      <type_desc variable="HttpPacket">See the description of
+        <c>HttpPacket</c> in
+        <seealso marker="erts:erlang#decode_packet/3"><c>erlang:decode_packet/3</c></seealso>
+	in ERTS.
+      </type_desc>
       <desc>
         <p>Receives a packet from a socket in passive
           mode. A closed socket is indicated by return value
@@ -1360,11 +1507,8 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
     
     <func>
-      <name>renegotiate(SslSocket) -> ok | {error, Reason}</name>
+      <name since="OTP R14B" name="renegotiate" arity="1" />
       <fsummary>Initiates a new handshake.</fsummary>
-      <type>
-	<v>SslSocket = sslsocket()</v>
-      </type>
       <desc><p>Initiates a new handshake. A notable return value is
       <c>{error, renegotiation_rejected}</c> indicating that the peer
       refused to go through with the renegotiation, but the connection
@@ -1373,40 +1517,27 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
     
     <func>
-      <name>send(SslSocket, Data) -> ok | {error, Reason}</name>
+      <name since="" name="send" arity="2" />
       <fsummary>Writes data to a socket.</fsummary>
-      <type>
-        <v>SslSocket = sslsocket()</v>
-        <v>Data = iodata()</v>
-      </type>
       <desc>
-        <p>Writes <c>Data</c> to <c>Socket</c>.</p>
+        <p>Writes <c>Data</c> to <c>SslSocket</c>.</p>
         <p>A notable return value is <c>{error, closed}</c> indicating that
           the socket is closed.</p>
       </desc>
     </func>
 
     <func>
-      <name>setopts(SslSocket, Options) -> ok | {error, Reason}</name>
+      <name since="" name="setopts" arity="2" />
       <fsummary>Sets socket options.</fsummary>
-      <type>
-        <v>SslSocket = sslsocket()</v>
-        <v>Options = [socketoption]()</v>
-      </type>
       <desc>
         <p>Sets options according to <c>Options</c> for socket
-          <c>Socket</c>.</p>
+          <c>SslSocket</c>.</p>
       </desc>
     </func>
 
     <func>
-      <name>shutdown(SslSocket, How) -> ok | {error, Reason}</name>
+      <name since="OTP R14B" name="shutdown" arity="2" />
       <fsummary>Immediately closes a socket.</fsummary>
-      <type>
-        <v>SslSocket = sslsocket()</v>
-        <v>How = read | write | read_write</v>
-        <v>Reason = reason()</v>
-      </type>
       <desc>
         <p>Immediately closes a socket in one or two directions.</p>
         <p><c>How == write</c> means closing the socket for writing,
@@ -1418,14 +1549,9 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
     
     <func>
-      <name>ssl_accept(SslSocket) -> </name>
-      <name>ssl_accept(SslSocket, Timeout) -> ok | {error, Reason}</name>
+      <name since="" name="ssl_accept" arity="1" />
+      <name since="" name="ssl_accept" arity="2" />
       <fsummary>Performs server-side SSL/TLS handshake.</fsummary>
-      <type>
-        <v>SslSocket = sslsocket()</v>
-        <v>Timeout = integer()</v>
-        <v>Reason = term()</v>
-      </type>
       <desc>
 	<p>Deprecated in OTP 21, use <seealso marker="#handshake-1">handshake/[1,2]</seealso> instead.</p>
 	<note><p>handshake/[1,2] always returns a new socket.</p></note>
@@ -1433,15 +1559,8 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
 
     <func>
-      <name>ssl_accept(Socket, SslOptions) -> </name>
-      <name>ssl_accept(Socket, SslOptions, Timeout) -> {ok, Socket} | ok | {error, Reason}</name>
+      <name since="OTP R14B" name="ssl_accept" arity="3" />
       <fsummary>Performs server-side SSL/TLS/DTLS handshake.</fsummary>
-      <type>
-        <v>Socket = socket() | sslsocket() </v>
-	<v>SslOptions = [ssl_option()]</v>
-        <v>Timeout = integer()</v>
-        <v>Reason = term()</v>
-      </type>
       <desc>
 	<p>Deprecated in OTP 21, use  <seealso marker="#handshake-3">handshake/[2,3]</seealso> instead.</p>
 	<note><p>handshake/[2,3] always returns a new socket.</p></note>
@@ -1449,27 +1568,18 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
     
     <func>
-      <name>sockname(SslSocket) -> {ok, {Address, Port}} |
-	{error, Reason}</name>
+      <name since="" name="sockname" arity="1" />
       <fsummary>Returns the local address and port.</fsummary>
-      <type>
-        <v>SslSocket = sslsocket()</v>
-        <v>Address = ipaddress()</v>
-        <v>Port = integer()</v>
-      </type>
       <desc>
         <p>Returns the local address and port number of socket
-          <c>Socket</c>.</p>
+          <c>SslSocket</c>.</p>
       </desc>
     </func>
     
     <func>
-      <name>start() -> </name>
-      <name>start(Type) -> ok | {error, Reason}</name>
+      <name since="OTP R14B" name="start" arity="0" />
+      <name since="OTP R14B">start(Type) -> ok | {error, Reason}</name>
       <fsummary>Starts the SSL application.</fsummary>
-      <type>
-        <v>Type = permanent | transient | temporary</v>
-      </type>
       <desc>
         <p>Starts the SSL application. Default type
           is <c>temporary</c>.</p>
@@ -1477,36 +1587,50 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
 
     <func>
-      <name>stop() -> ok </name>
+      <name since="OTP R14B" name="stop" arity="0" />
       <fsummary>Stops the SSL application.</fsummary>
       <desc>
         <p>Stops the SSL application.</p>
       </desc>
     </func>
+  
+    <func>
+      <name since="OTP 22.0" name="str_to_suite" arity="1" />
+      <fsummary>Converts an RFC or OpenSSL name string to an erlang cipher suite format</fsummary>
+      <desc>
+        <p>Converts an RFC or OpenSSL name string to an
+	<seealso marker="#type-erl_cipher_suite">erl_cipher_suite()</seealso>
+	Returns an error if the cipher suite is not supported or the name is not a valid cipher suite name.</p>
+      </desc>
+    </func>
 
     <func>
-      <name>suite_to_str(CipherSuite) -> String</name>
-      <fsummary>Returns the string representation of a cipher suite.</fsummary>
-      <type>
-        <v>CipherSuite = erl_cipher_suite()</v>
-	<v>String = string()</v>
-      </type>
+      <name since="OTP 22.0" name="suite_to_openssl_str" arity="1" />
+      <fsummary>Converts erlang cipher suite format to an OpenSSL name string.
+      </fsummary>
+      <desc>
+        <p>Converts <seealso marker="#type-erl_cipher_suite">erl_cipher_suite()</seealso>
+	to OpenSSL name string. </p>
+	
+	<p>PRE TLS-1.3 these names differ for RFC names</p>
+	
+      </desc>
+    </func>
+    
+    <func>
+      <name since="OTP 21.0" name="suite_to_str" arity="1" clause_i="1" />
+      <fsummary>Converts an erlang cipher suite to an RFC name string.</fsummary>
       <desc>
-        <p>Returns the string representation of a cipher suite.</p>
+        <p>Converts <seealso marker="#type-erl_cipher_suite">erl_cipher_suite()</seealso>
+	to RFC name string.</p>
       </desc>
     </func>
 
     <func>
-      <name>transport_accept(ListenSocket) -></name>
-      <name>transport_accept(ListenSocket, Timeout) ->
-	{ok, SslSocket} | {error, Reason}</name>
+      <name since="" name="transport_accept" arity="1" />
+      <name since="" name="transport_accept" arity="2" />
       <fsummary>Accepts an incoming connection and
 	prepares for <c>ssl_accept</c>.</fsummary>
-      <type>
-        <v>ListenSocket = SslSocket = sslsocket()</v>
-        <v>Timeout = integer()</v>
-        <v>Reason = reason()</v>
-      </type>
       <desc>
         <p>Accepts an incoming connection request on a listen socket.
 	<c>ListenSocket</c> must be a socket returned from
@@ -1532,13 +1656,9 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
     
     <func>
-      <name>versions() -> [versions_info()]</name>
+      <name since="OTP R14B" name="versions" arity="0" />
       <fsummary>Returns version information relevant for the
 	SSL application.</fsummary>
-      <type>
-	<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
 	application.</p>
diff --git a/lib/ssl/doc/src/ssl_app.xml b/lib/ssl/doc/src/ssl_app.xml
index 893919aeb4..b05caf44ea 100644
--- a/lib/ssl/doc/src/ssl_app.xml
+++ b/lib/ssl/doc/src/ssl_app.xml
@@ -35,45 +35,10 @@
 
   <description>
     <p>
-      The ssl application is an implementation of the SSL/TLS/DTLS protocol in Erlang.
+      The ssl application is an implementation of the SSL, TLS and DTLS protocols in Erlang.
     </p>
-    <list type="bulleted">
-      <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.
-      Interoperability with SSL-2.0 enabled clients dropped. (OTP 21) </item>
-      <item>For security reasons SSL-3.0 is no longer supported by default,
-      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. (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,
-      but not Diffie Hellman Certificates cipher suites.</item>
-      <item>Elliptic Curve cipher suites are supported if the Crypto 
-      application supports it and named curves are used.
-      </item>
-      <item>Export cipher suites are not supported as the
-      U.S. lifted its export restrictions in early 2000.</item>
-      <item>IDEA cipher suites are not supported as they have
-      become deprecated by the latest TLS specification so it is not 
-      motivated to implement them.</item>
-      <item>Compression is not supported.</item>
-      <item>CRL validation is supported.</item>
-      <item>Policy certificate extensions are not supported.</item>
-      <item>'Server Name Indication' extension
-      (<url href="http://www.ietf.org/rfc/rfc6066.txt">RFC 6066</url>) is supported.</item>
-      <item>Application Layer Protocol Negotiation (ALPN) and its successor Next Protocol Negotiation (NPN)
-      are supported. </item>
-      <item>It is possible to use Pre-Shared Key (PSK) and Secure Remote Password (SRP)
-      cipher suites, but they are not enabled by default.
-      </item>
-    </list>
-   </description>
+    <p>For current statement of standards compliance see the <seealso marker="standards_compliance">User's Guide</seealso>.</p>
+  </description>
 
   <section>
     <title>DEPENDENCIES</title>
diff --git a/lib/ssl/doc/src/ssl_crl_cache.xml b/lib/ssl/doc/src/ssl_crl_cache.xml
index 71c6d5e49e..a33aec62a7 100644
--- a/lib/ssl/doc/src/ssl_crl_cache.xml
+++ b/lib/ssl/doc/src/ssl_crl_cache.xml
@@ -24,7 +24,7 @@
     <file>ssl_crl_cache.xml</file>
   </header>
   
-  <module>ssl_crl_cache</module>
+  <module since="OTP 18.0">ssl_crl_cache</module>
   <modulesummary>CRL cache </modulesummary>
   <description>
     <p>
@@ -34,32 +34,43 @@
       the following functions are available.
     </p>
   </description>
+
+    <datatypes>
+    <datatype_title>DATA TYPES</datatype_title>
+
+      <datatype>
+	<name name="crl_src"/>
+      </datatype>
+
+      <datatype>
+	<name name="uri"/>
+      </datatype>
+
+    </datatypes>
   
     <funcs>
       <func>
-	<name>delete(Entries) -> ok |  {error, Reason} </name>
+	<name since="OTP 18.0">delete(Entries) -> ok |  {error, Reason} </name>
 	<fsummary> </fsummary>
 	<type>
-	  <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>
+	  <v> Entries =  <seealso marker="#type-crl_src">crl_src()</seealso>]}</v>
+	  <v> Reason = crl_reason()</v>
 	</type>
 	<desc>
 	  <p>Delete CRLs from the ssl applications local cache. </p>
 	</desc>
       </func>     
       <func>
-	<name>insert(CRLSrc) -> ok | {error, Reason}</name>
-	<name>insert(URI, CRLSrc) -> ok | {error, Reason}</name>
+	<name since="OTP 18.0">insert(CRLSrc) -> ok | {error, Reason}</name>
+	<name since="OTP 18.0">insert(URI, CRLSrc) -> ok | {error, Reason}</name>
 	<fsummary> </fsummary>
 	<type>
-	  <v> CRLSrc = {file, string()} | {der, [ <seealso
-	marker="public_key:public_key"> public_key:der_encoded() </seealso> ]}</v>
-	  <v> URI = <seealso marker="stdlib:uri_string">uri_string:uri_string() </seealso> </v>
+	  <v> CRLSrc = <seealso marker="#type-crl_src">crl_src()</seealso>]}</v>
+	  <v> URI = <seealso marker="#type-uri">uri()</seealso> </v>
 	  <v> Reason = term()</v>
 	</type>
 	<desc>
-	 <p>Insert CRLs into the ssl applications local cache. </p>
+	 <p>Insert CRLs, available to fetch on DER format from <c>URI</c>, into the ssl applications local cache. </p>
 	</desc>
       </func>
     </funcs>
diff --git a/lib/ssl/doc/src/ssl_crl_cache_api.xml b/lib/ssl/doc/src/ssl_crl_cache_api.xml
index c6774b4df6..4cba4e1de1 100644
--- a/lib/ssl/doc/src/ssl_crl_cache_api.xml
+++ b/lib/ssl/doc/src/ssl_crl_cache_api.xml
@@ -24,7 +24,7 @@
     <file>ssl_crl_cache_api.xml</file>
   </header>
   
-  <module>ssl_crl_cache_api</module>
+  <module since="OTP 18.0">ssl_crl_cache_api</module>
   <modulesummary>API for a SSL/TLS CRL (Certificate Revocation List) cache.</modulesummary>
   <description>
     <p>
@@ -39,35 +39,44 @@
       a CRL cache.
     </p>
   </description>
-  
-  <section>
-    <title>DATA TYPES</title>
-    
-    <p>The following data types are used in the functions below:
-    </p>
-    
-    <taglist>
-      
-    <tag><c>cache_ref() =</c></tag> 
-    <item>opaque()</item>
-    <tag><c>dist_point() =</c></tag>
-    <item><p>#'DistributionPoint'{} see <seealso
-    marker="public_key:public_key_records"> X509 certificates records</seealso></p></item>
-    
-    </taglist>
+
+
+  <!--
+      ================================================================
+      =  Data types                                                  =
+      ================================================================
+  -->
+
+  <datatypes>
     
-  </section>
+     <datatype>
+	<name name="crl_cache_ref"/>
+	<desc>
+	  <p>Reference to the CRL cache.</p>
+	</desc>
+      </datatype>
+
+
+     <datatype>
+	<name name="dist_point"/>
+	<desc>
+	  <p>For description see <seealso 
+	  marker="public_key:public_key_records"> X509 certificates records</seealso></p>
+	</desc>
+     </datatype>      
+   </datatypes>
+  
   <funcs>
       <func>
-      <name>fresh_crl(DistributionPoint, CRL) -> FreshCRL</name>
+      <name since="OTP 18.0">fresh_crl(DistributionPoint, CRL) -> FreshCRL</name>
       <fsummary> <c>fun fresh_crl/2 </c> will be used as input option <c>update_crl</c> to
       public_key:pkix_crls_validate/3 </fsummary>
       <type>
-	<v> DistributionPoint = dist_point() </v>
+	<v> DistributionPoint = <seealso marker="#type-dist_point"> dist_point() </seealso> </v>
 	<v> CRL = [<seealso
-	marker="public_key:public_key">public_key:der_encoded()</seealso>] </v>
+	marker="public_key:public_key#type-der_encoded">public_key:der_encoded()</seealso>] </v>
 	<v> FreshCRL = [<seealso
-	marker="public_key:public_key">public_key:der_encoded()</seealso>] </v>
+	marker="public_key:public_key#type-der_encoded">public_key:der_encoded()</seealso>] </v>
       </type>
       <desc>
 	<p> <c>fun fresh_crl/2 </c> will be used as input option <c>update_crl</c> to
@@ -76,16 +85,16 @@
     </func>
     
     <func>
-      <name>lookup(DistributionPoint, Issuer, DbHandle) -> not_available | CRLs </name>
-      <name>lookup(DistributionPoint, DbHandle) -> not_available | CRLs </name>
+      <name since="OTP 19.0">lookup(DistributionPoint, Issuer, DbHandle) -> not_available | CRLs </name>
+      <name since="OTP 18.0">lookup(DistributionPoint, DbHandle) -> not_available | CRLs </name>
       <fsummary> </fsummary>
       <type>
-        <v> DistributionPoint = dist_point() </v>
+	<v> DistributionPoint = <seealso marker="#type-dist_point"> dist_point() </seealso> </v>
         <v> Issuer = <seealso
-	marker="public_key:public_key">public_key:issuer_name()</seealso> </v>
-	<v> DbHandle  = cache_ref() </v>
+	marker="public_key:public_key#type-issuer_name">public_key:issuer_name()</seealso> </v>
+	<v> DbHandle = <seealso marker="#type-crl_cache_ref"> crl_cache_ref() </seealso></v>
 	<v> CRLs = [<seealso
-	   marker="public_key:public_key">public_key:der_encoded()</seealso>] </v>
+	   marker="public_key:public_key#type-der_encoded">public_key:der_encoded()</seealso>] </v>
 	</type>
 	<desc> <p>Lookup the CRLs belonging to the distribution point <c> Distributionpoint</c>.
 	This function may choose to only look in the cache or to follow distribution point
@@ -106,12 +115,12 @@
     </func>
     
     <func>
-      <name>select(Issuer, DbHandle) -> CRLs </name>
+      <name since="OTP 18.0">select(Issuer, DbHandle) -> CRLs </name>
       <fsummary>Select the CRLs in the cache that are issued by <c>Issuer</c></fsummary>
       <type>
 	<v> Issuer = <seealso
-	marker="public_key:public_key">public_key:issuer_name()</seealso></v>
-	<v> DbHandle  = cache_ref() </v>
+	marker="public_key:public_key#type-issuer_name">public_key:issuer_name()</seealso></v>
+	<v> DbHandle = <seealso marker="#type-crl_cache_ref"> cache_ref() </seealso></v>
 	</type>
 	<desc>
 	  <p>Select the CRLs in the cache that are issued by <c>Issuer</c> </p>
diff --git a/lib/ssl/doc/src/ssl_distribution.xml b/lib/ssl/doc/src/ssl_distribution.xml
index e14f3f90dc..1774bd8f77 100644
--- a/lib/ssl/doc/src/ssl_distribution.xml
+++ b/lib/ssl/doc/src/ssl_distribution.xml
@@ -191,7 +191,7 @@ Eshell V5.0  (abort with ^G)
       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.
+      body cannot be compiled when consulting a file.
     </p>
     <p>
       Do not tamper with the socket options
diff --git a/lib/ssl/doc/src/ssl_session_cache_api.xml b/lib/ssl/doc/src/ssl_session_cache_api.xml
index a84a3dfce9..e841729e57 100644
--- a/lib/ssl/doc/src/ssl_session_cache_api.xml
+++ b/lib/ssl/doc/src/ssl_session_cache_api.xml
@@ -28,7 +28,7 @@
     <rev></rev>
     <file>ssl_session_cache_api.xml</file>
   </header>
-  <module>ssl_session_cache_api</module>
+  <module since="OTP R14B">ssl_session_cache_api</module>
   <modulesummary>TLS session cache API</modulesummary>
 
   <description>
@@ -38,39 +38,50 @@
       defining a new callback module implementing this API.
     </p>
   </description>
-  <section>
-    <title>DATA TYPES</title>
 
-    <p>The following data types are used in the functions for
-    <c>ssl_session_cache_api</c>:</p>
-
-    <taglist>
-      <tag><c>cache_ref() =</c></tag>
-      <item><p><c>opaque()</c></p></item>
-
-      <tag><c>key() =</c></tag>
-      <item><p><c>{partialkey(), session_id()}</c></p></item>
-
-      <tag><c>partialkey() =</c></tag>
-      <item><p><c>opaque()</c></p></item>
-
-      <tag><c>session_id() =</c></tag>
-      <item><p><c>binary()</c></p></item>
-
-      <tag><c>session()</c> =</tag>
-      <item><p><c>opaque()</c></p></item>
-    </taglist>
-
-  </section>
+ <!--
+      ================================================================
+      =  Data types                                                  =
+      ================================================================
+  -->
+
+  <datatypes>
+    
+      <datatype>
+	<name name="session_cache_ref"/>
+      </datatype>
+
+      <datatype>
+	<name name="session_cache_key"/>
+	<desc>
+	  <p>A key to an entry in the session cache.</p>
+	</desc>
+      </datatype>
+
+        <datatype>
+	  <name name="partial_key"/>
+	<desc>
+	   <p>The opaque part of the key. Does not need to be handled
+	  by the callback.</p>
+	</desc>
+      </datatype>
+      
+       <datatype>
+	<name name="session"/>
+	<desc>
+	   <p>The session data that is stored for each session.</p>
+	</desc>
+      </datatype>  
+  </datatypes>
 
   <funcs>
 
     <func>
-      <name>delete(Cache, Key) -> _</name>
+      <name since="OTP R14B">delete(Cache, Key) -> _</name>
       <fsummary>Deletes a cache entry.</fsummary>
       <type>
-	<v>Cache = cache_ref()</v>
-	<v>Key = key()</v>
+	<v>Cache = <seealso marker="#type-session_cache_ref"> session_cache_ref() </seealso></v>
+	<v>Key = <seealso marker="#type-session_cache_key">session_cache_key() </seealso> </v>
       </type>
       <desc>
 	<p>Deletes a cache entry. Is only called from the cache
@@ -80,10 +91,12 @@
     </func>
 
     <func>
-      <name>foldl(Fun, Acc0, Cache) -> Acc</name>
+      <name since="OTP R14B">foldl(Fun, Acc0, Cache) -> Acc</name>
       <fsummary></fsummary>
       <type>
-	<v></v>
+	<v>Fun = fun()</v>
+	<v>Acc0 = Acc = term()</v>
+	<v>Cache = <seealso marker="#type-session_cache_ref"> session_cache_ref() </seealso></v>
       </type>
       <desc>
 	<p>Calls <c>Fun(Elem, AccIn)</c> on successive elements of the
@@ -96,10 +109,11 @@
     </func>
 
     <func>
-      <name>init(Args) -> opaque() </name>
+      <name since="OTP 18.0">init(Args) -> Cache </name>
       <fsummary>Returns cache reference.</fsummary>
       <type>
-	<v>Args = proplists:proplist()</v>
+	<v>Cache = <seealso marker="#type-session_cache_ref"> session_cache_ref() </seealso></v>
+	<v>Args = <seealso marker="stdlib:proplists#type-proplist">proplists:proplist()</seealso></v>
       </type>
       <desc>
 	<p>Includes property <c>{role, client | server}</c>.
@@ -121,12 +135,12 @@
     </func>
 
     <func>
-      <name>lookup(Cache, Key) -> Entry</name>
+      <name since="OTP R14B">lookup(Cache, Key) -> Entry</name>
       <fsummary>Looks up a cache entry.</fsummary>
       <type>
-	<v>Cache = cache_ref()</v>
-	<v>Key = key()</v>
-	<v>Entry = session() | undefined</v>
+	<v>Cache = <seealso marker="#type-session_cache_ref"> session_cache_ref() </seealso></v>
+	<v>Key = <seealso marker="#type-session_cache_key">session_cache_key()</seealso> </v>
+	<v>Session = <seealso marker="#type-session">session()</seealso> | undefined</v>
       </type>
       <desc>
 	<p>Looks up a cache entry. Is to be callable from any
@@ -136,12 +150,12 @@
     </func>
 
     <func>
-      <name>select_session(Cache, PartialKey) -> [session()]</name>
+      <name since="OTP R14B">select_session(Cache, PartialKey) -> [Session]</name>
       <fsummary>Selects sessions that can be reused.</fsummary>
       <type>
-	<v>Cache = cache_ref()</v>
-	<v>PartialKey = partialkey()</v>
-	<v>Session = session()</v>
+	<v>Cache = <seealso marker="#type-session_cache_ref"> session_cache_ref() </seealso></v>
+	<v>PartialKey = <seealso marker="#type-partial_key"> partial_key() </seealso></v>
+	<v>Session = <seealso marker="#type-session">session()</seealso></v>
       </type>
       <desc>
 	<p>Selects sessions that can be reused. Is to be callable
@@ -151,10 +165,10 @@
     </func>
 
     <func>
-      <name>size(Cache) -> integer()</name>
+      <name since="OTP 19.3">size(Cache) -> integer()</name>
       <fsummary>Returns the number of sessions in the cache.</fsummary>
       <type>
-	<v>Cache = cache_ref()</v>
+	<v>Cache = <seealso marker="#type-session_cache_ref"> session_cache_ref() </seealso></v>
       </type>
       <desc>
 	<p>Returns the number of sessions in the cache. If size
@@ -166,11 +180,12 @@
     </func>
 
     <func>
-      <name>terminate(Cache) -> _</name>
+      <name since="OTP R14B">terminate(Cache) -> _</name>
       <fsummary>Called by the process that handles the cache when it
       is about to terminate.</fsummary>
       <type>
-	<v>Cache = term() - as returned by init/0</v>
+	<v>Cache = <seealso marker="#type-session_cache_ref"> session_cache_ref() </seealso></v>
+	<d>As returned by init/0</d>
       </type>
       <desc>
 	<p>Takes care of possible cleanup that is needed when the
@@ -180,12 +195,12 @@
     </func>
 
     <func>
-      <name>update(Cache, Key, Session) -> _</name>
+      <name since="OTP R14B">update(Cache, Key, Session) -> _</name>
       <fsummary>Caches a new session or updates an already cached one.</fsummary>
       <type>
-	<v>Cache = cache_ref()</v>
-	<v>Key = key()</v>
-	<v>Session = session()</v>
+	<v>Cache = <seealso marker="#type-session_cache_ref"> session_cache_ref() </seealso></v>
+	<v>Key = <seealso marker="#type-session_cache_key">session_cache_key()</seealso> </v>
+	<v>Session = <seealso marker="#type-session">session()</seealso></v>
       </type>
       <desc>
 	<p>Caches a new session or updates an already cached one. Is
diff --git a/lib/ssl/doc/src/standards_compliance.xml b/lib/ssl/doc/src/standards_compliance.xml
new file mode 100644
index 0000000000..9df48b99d3
--- /dev/null
+++ b/lib/ssl/doc/src/standards_compliance.xml
@@ -0,0 +1,2360 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE chapter SYSTEM "chapter.dtd">
+
+<chapter>
+  <header>
+    <copyright>
+      <year>2015</year>
+      <year>2019</year>
+      <holder>Ericsson AB, All Rights Reserved</holder>
+    </copyright>
+    <legalnotice>
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  The Initial Developer of the Original Code is Ericsson AB.
+    </legalnotice>
+
+    <title>Standards Compliance</title>
+    <prepared>OTP team</prepared>
+    <docno></docno>
+    <date>2019-03-20</date>
+    <rev>A</rev>
+    <file>standards_compliance.xml</file>
+  </header>
+
+  <section>
+    <title>Purpose</title>
+    <p>This section describes the current state of standards compliance of the ssl application.</p>
+  </section>
+
+  <section>
+    <title>Common (pre TLS 1.3)</title>
+    <list type="bulleted">
+      <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. (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,
+      but not Diffie Hellman Certificates cipher suites.
+      </item>
+      <item>Elliptic Curve cipher suites are supported if the Crypto
+      application supports it and named curves are used.
+      </item>
+      <item>Export cipher suites are not supported as the
+      U.S. lifted its export restrictions in early 2000.
+      </item>
+      <item>IDEA cipher suites are not supported as they have
+      become deprecated by the TLS 1.2 specification so it is not
+      motivated to implement them.
+      </item>
+      <item>Compression is not supported.
+      </item>
+    </list>
+  </section>
+
+  <section>
+    <title>Common</title>
+    <list type="bulleted">
+      <item>CRL validation is supported.</item>
+      <item>Policy certificate extensions are not supported.</item>
+      <item>'Server Name Indication' extension
+      (<url href="http://www.ietf.org/rfc/rfc6066.txt">RFC 6066</url>) is supported.</item>
+      <item>Application Layer Protocol Negotiation (ALPN) and its successor Next Protocol Negotiation (NPN) are supported. </item>
+      <item>It is possible to use Pre-Shared Key (PSK) and Secure Remote Password (SRP)
+      cipher suites, but they are not enabled by default.
+      </item>
+    </list>
+  </section>
+
+
+  <section>
+    <title>SSL 2.0</title>
+    <p>For security reasons SSL-2.0 is not supported. Interoperability with SSL-2.0 enabled clients dropped. (OTP 21)</p>
+  </section>
+
+  <section>
+    <title>SSL 3.0</title>
+    <p>For security reasons SSL-3.0 is no longer supported by default, but can be configured. (OTP 19)</p>
+  </section>
+
+  <section>
+    <title>TLS 1.0</title>
+    <p>For security reasons TLS-1.0 is no longer supported by default, but can be configured. (OTP 22)</p>
+  </section>
+
+  <section>
+    <title>TLS 1.1</title>
+    <p>For security reasons TLS-1.1 is no longer supported by default, but can be configured. (OTP 22)</p>
+  </section>
+
+  <section>
+    <title>TLS 1.2</title>
+    <p>Supported</p>
+  </section>
+
+  <section>
+    <title>DTLS 1.0</title>
+    <p>For security reasons DTLS-1.0 (based on TLS 1.1) is no longer supported by default, but can be configured. (OTP 22)</p>
+  </section>
+
+  <section>
+    <title>DTLS 1.2</title>
+    <p>Supported (based on TLS 1.2)</p>
+  </section>
+
+  <section>
+    <title>DTLS 1.3</title>
+    <p>Not yet supported</p>
+  </section>
+
+  <section>
+    <title>TLS 1.3</title>
+    <p>OTP-22 introduces basic support for TLS 1.3. Basic functionality
+    covers a simple TLS 1.3 handshake with support of the mandatory extensions
+    (supported_groups, signature_algorithms, key_share, supported_versions and
+    signature_algorithms_cert). The current implementation supports a selective set of cryptographic algorithms:</p>
+    <list type="bulleted">
+      <item>Key Exchange: ECDHE</item>
+      <item>Groups: all standard groups supported for the Diffie-Hellman key exchange</item>
+      <item>Ciphers: TLS_AES_128_GCM_SHA256, TLS_AES_256_GCM_SHA384,
+      TLS_CHACHA20_POLY1305_SHA256 and TLS_AES_128_CCM_SHA256</item>
+      <item>Signature Algorithms: rsa_pkcs1_sha256, rsa_pkcs1_sha384, rsa_pkcs1_sha512,
+      ecdsa_secp256r1_sha256, ecdsa_secp384r1_sha384, ecdsa_secp521r1_sha512, rsa_pss_rsae_sha256,
+      rsa_pss_rsae_sha384, rsa_pss_rsae_sha512, rsa_pkcs1_sha1 and ecdsa_sha1</item>
+      <item>Certificates: RSA (it MUST use the rsaEncryption OID) and ECDSA keys</item>
+    </list>
+    <p>Other notable features:</p>
+    <list type="bulleted">
+      <item>PSK and session resumption not supported</item>
+      <item>Early data and 0-RTT not supported</item>
+      <item>Key and Initialization Vector Update not supported</item>
+    </list>
+    <p>For more detailed information see the
+    <seealso marker="#soc_table">Standards Compliance</seealso> below.</p>
+
+    <p> The following table describes the current state of standards compliance for TLS 1.3.</p>
+    <p>(<em>C</em> = Compliant, <em>NC</em> = Non-Compliant, <em>PC</em> = Partially-Compliant,
+    <em>NA</em> = Not Applicable)</p>
+    <marker id="soc_table"/>
+    <table>
+      <row>
+        <cell align="left" valign="middle"><em>Section</em></cell>
+        <cell align="left" valign="middle"><em>Feature</em></cell>
+	<cell align="left" valign="middle"><em>State</em></cell>
+	<cell align="left" valign="middle"><em>Since</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-1.2">
+	    1.3. Updates Affecting TLS 1.2
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">Version downgrade protection mechanism</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">RSASSA-PSS signature schemes</cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">supported_versions (ClientHello) extension</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">signature_algorithms_cert extension</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-2">
+	    2. Protocol Overview
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"></cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">(EC)DHE</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">PSK-only</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">PSK with (EC)DHE</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-2.1">
+	    2.1. Incorrect DHE share
+	  </url>
+	</cell>
+        <cell align="left" valign="middle">HelloRetryRequest</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-2.2">
+	    2.2. Resumption and Pre-Shared Key (PSK)
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-2.3">
+	    2.3. 0-RTT Data
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.1.1">
+	    4.1.1. Cryptographic Negotiation
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"></cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">supported_groups extension</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">signature_algorithms extension</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">pre_shared_key extension</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.1.2">
+	    4.1.2. Client Hello
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+     <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">server_name (RFC6066)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">max_fragment_length (RFC6066)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">status_request (RFC6066)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">supported_groups (RFC7919)</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">signature_algorithms (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">use_srtp (RFC5764)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">heartbeat (RFC6520)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">application_layer_protocol_negotiation (RFC7301)</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">signed_certificate_timestamp (RFC6962)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">client_certificate_type (RFC7250)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">server_certificate_type (RFC7250)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">padding (RFC7685)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">key_share (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">pre_shared_key (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">psk_key_exchange_modes (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">early_data (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">cookie (RFC8446) </cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">supported_versions (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">certificate_authorities (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">oid_filters (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">post_handshake_auth (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">signature_algorithms_cert (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">server_name (RFC6066)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">max_fragment_length (RFC6066)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">status_request (RFC6066)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">supported_groups (RFC7919)</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">signature_algorithms (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">use_srtp (RFC5764)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">heartbeat (RFC6520)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">application_layer_protocol_negotiation (RFC7301)</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">signed_certificate_timestamp (RFC6962)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">client_certificate_type (RFC7250)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">server_certificate_type (RFC7250)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">padding (RFC7685)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">key_share (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">pre_shared_key (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">psk_key_exchange_modes (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">early_data (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">cookie (RFC8446) </cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">supported_versions (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">certificate_authorities (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">oid_filters (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">post_handshake_auth (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">signature_algorithms_cert (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.1.3">
+	    4.1.3. Server Hello
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">Version downgrade protection</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">key_share (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">pre_shared_key (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">supported_versions (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">Version downgrade protection</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">key_share (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">pre_shared_key (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">supported_versions (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.1.4">
+	    4.1.4. Hello Retry Request
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">key_share (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">cookie (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">supported_versions (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.2.1">
+	    4.2.1. Supported Versions
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.2.2">
+	    4.2.2. Cookie
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.2.3">
+	    4.2.3. Signature Algorithms
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">rsa_pkcs1_sha256</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">rsa_pkcs1_sha384</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">rsa_pkcs1_sha512</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">ecdsa_secp256r1_sha256</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">ecdsa_secp384r1_sha384</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">ecdsa_secp521r1_sha512</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">rsa_pss_rsae_sha256</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">rsa_pss_rsae_sha384</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">rsa_pss_rsae_sha512</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">ed25519</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">ed448</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">rsa_pss_pss_sha256</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">rsa_pss_pss_sha384</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">rsa_pss_pss_sha512</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">rsa_pkcs1_sha1</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">ecdsa_sha1</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">rsa_pkcs1_sha256</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">rsa_pkcs1_sha384</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">rsa_pkcs1_sha512</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">ecdsa_secp256r1_sha256</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">ecdsa_secp384r1_sha384</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">ecdsa_secp521r1_sha512</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">rsa_pss_rsae_sha256</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">rsa_pss_rsae_sha384</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">rsa_pss_rsae_sha512</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">ed25519</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">ed448</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">rsa_pss_pss_sha256</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">rsa_pss_pss_sha384</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">rsa_pss_pss_sha512</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">rsa_pkcs1_sha1</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">ecdsa_sha1</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.2.4">
+	    4.2.4. Certificate Authorities
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.2.5">
+	    4.2.5. OID Filters
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.2.6">
+	    4.2.6. Post-Handshake Client Authentication
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.2.7">
+	    4.2.7. Supported Groups
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">secp256r1</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">secp384r1</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">secp521r1</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">x25519</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">x448</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">ffdhe2048</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">ffdhe3072</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">ffdhe4096</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">ffdhe6144</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">ffdhe8192</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">secp256r1</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">secp384r1</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">secp521r1</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">x25519</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">x448</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">ffdhe2048</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">ffdhe3072</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">ffdhe4096</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">ffdhe6144</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">ffdhe8192</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.2.8">
+	    4.2.8. Key Share
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.2.9">
+	    4.2.9. Pre-Shared Key Exchange Modes
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.2.10">
+	    4.2.10. Early Data Indication
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.2.11">
+	    4.2.11. Pre-Shared Key Extension
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.2.11.1">
+	    4.2.11.1. Ticket Age
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.2.11.2">
+	    4.2.11.2. PSK Binder
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.2.11.3">
+	    4.2.11.3. Processing Order
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.3.1">
+	    4.3.1. Encrypted Extensions
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">server_name (RFC6066)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">max_fragment_length (RFC6066)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">supported_groups (RFC7919)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">use_srtp (RFC5764)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">heartbeat (RFC6520)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">application_layer_protocol_negotiation (RFC7301)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">client_certificate_type (RFC7250)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">server_certificate_type (RFC7250)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">early_data (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">supported_versions (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">server_name (RFC6066)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">max_fragment_length (RFC6066)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">supported_groups (RFC7919)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">use_srtp (RFC5764)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">heartbeat (RFC6520)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">application_layer_protocol_negotiation (RFC7301)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">client_certificate_type (RFC7250)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">server_certificate_type (RFC7250)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">early_data (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">supported_versions (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.3.2">
+	    4.3.2. Certificate Request
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">status_request (RFC6066)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">signature_algorithms (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">signed_certificate_timestamp (RFC6962)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">certificate_authorities (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">oid_filters (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">signature_algorithms_cert (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">status_request (RFC6066)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">signature_algorithms (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">signed_certificate_timestamp (RFC6962)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">certificate_authorities (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">oid_filters (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">signature_algorithms_cert (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.4.1">
+	    4.4.1. The Transcript Hash
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.4.2">
+	    4.4.2. Certificate
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">status_request (RFC6066)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">signed_certificate_timestamp (RFC6962)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">status_request (RFC6066)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">signed_certificate_timestamp (RFC6962)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.4.2.1">
+	    4.4.2.1. OCSP Status and SCT Extensions
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.4.2.2">
+	    4.4.2.2. Server Certificate Selection
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">The certificate type MUST be X.509v3, unless explicitly
+	negotiated otherwise</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">The server's end-entity certificate's public key (and associated
+	restrictions) MUST be compatible with the selected authentication
+	algorithm from the client's "signature_algorithms" extension
+	(currently RSA, ECDSA, or EdDSA).</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">The certificate MUST allow the key to be used for signing
+	with a signature scheme indicated in the client's "signature_algorithms"/"signature_algorithms_cert"
+	extensions</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">The "server_name" and "certificate_authorities"
+	extensions are used to guide certificate selection.  As servers
+	MAY require the presence of the "server_name" extension, clients
+	SHOULD send this extension, when applicable.</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.4.2.3">
+	    4.4.2.3. Client Certificate Selection
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">The certificate type MUST be X.509v3, unless explicitly
+	negotiated otherwise</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">If the "certificate_authorities" extension in the
+	CertificateRequest message was present, at least one of the
+	certificates in the certificate chain SHOULD be issued by one of
+	the listed CAs.</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">The certificates MUST be signed using an acceptable signature
+	algorithm</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">If the CertificateRequest message contained a non-empty
+	"oid_filters" extension, the end-entity certificate MUST match the
+	extension OIDs that are recognized by the client</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.4.2.4">
+	    4.4.2.4. Receiving a Certificate Message
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.4.3">
+	    4.4.3. Certificate Verify
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.4.4">
+	    4.4.4. Finished
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.5">
+	    4.5. End of Early Data
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.6.1">
+	    4.6.1. New Session Ticket Message
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">early_data (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">early_data (RFC8446)</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.6.2">
+	    4.6.2. Post-Handshake Authentication
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-4.6.3">
+	    4.6.3. Key and Initialization Vector Update
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em>Client</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Server</em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-5.1">
+	    5.1. Record Layer
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">MUST NOT be interleaved with other record types</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">MUST NOT span key changes</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">MUST NOT send zero-length fragments</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">Alert messages MUST NOT be fragmented</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-5.2">
+	    5.2. Record Payload Protection
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-5.3">
+	    5.3. Per-Record Nonce
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-5.4">
+	    5.4. Record Padding
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">MAY choose to pad</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">MUST NOT send Handshake and Alert records that have a zero-length TLSInnerPlaintext.content</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">The padding sent is automatically verified</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-5.5">
+	    5.5. Limits on Key Usage
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-6.1">
+	    6.1. Closure Alerts
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">close_notify</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">user_cancelled</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-6.2">
+	    6.2. Error Alerts
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-7.1">
+	    7.1. Key Schedule
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-7.2">
+	    7.2. Updating Traffic Secrets
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-7.3">
+	    7.3. Traffic Key Calculation
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-7.5">
+	    7.5. Exporters
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-8">
+	    8. 0-RTT and Anti-Replay
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-8.1">
+	    8.1. Single-Use Tickets
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-8.2">
+	    8.2. Client Hello Recording
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-8.3">
+	    8.3. Freshness Checks
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-9.1">
+	    9.1. Mandatory-to-Implement Cipher Suites
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">MUST implement the TLS_AES_128_GCM_SHA256</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">SHOULD implement the TLS_AES_256_GCM_SHA384</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">SHOULD implement the TLS_CHACHA20_POLY1305_SHA256</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Digital signatures</em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">MUST support rsa_pkcs1_sha256 (for certificates)</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">MUST support rsa_pss_rsae_sha256 (for CertificateVerify and certificates)</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">MUST support ecdsa_secp256r1_sha256</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>Key Exchange</em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">MUST support key exchange with secp256r1</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">SHOULD support key exchange with X25519</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-9.2">
+	    9.2. Mandatory-to-Implement Extensions
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">Supported Versions</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">Cookie</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">Signature Algorithms</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">Signature Algorithms Certificate</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">Negotiated Groups</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">Key Share</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">Server Name Indication</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>MUST send and use these extensions</em></cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">"supported_versions" is REQUIRED for ClientHello, ServerHello and HelloRetryRequest</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">"signature_algorithms" is REQUIRED for certificate authentication</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">"supported_groups" is REQUIRED for ClientHello messages using (EC)DHE key exchange</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">"key_share" is REQUIRED for (EC)DHE key exchange</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">"pre_shared_key" is REQUIRED for PSK key agreement</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">"psk_key_exchange_modes" is REQUIRED for PSK key agreement</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>TLS 1.3 ClientHello</em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">If not containing a "pre_shared_key" extension, it MUST contain both a "signature_algorithms" extension and a "supported_groups" extension.</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">If containing a "supported_groups" extension, it MUST also contain a "key_share" extension, and vice versa.  An empty KeyShare.client_shares vector is permitted.</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>TLS 1.3 ServerHello</em></cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">MUST support the use of the "server_name" extension</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-9.3">
+	    9.3. Protocol Invariants
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle"><em>MUST correctly handle extensible fields</em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">A client sending a ClientHello MUST support all parameters
+	advertised in it. Otherwise, the server may fail to interoperate by selecting one of those parameters.</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">A server receiving a ClientHello MUST correctly ignore all
+	unrecognized cipher suites, extensions, and other parameters. Otherwise, it may fail to
+	interoperate with newer clients. In TLS 1.3, a client receiving a CertificateRequest or
+	NewSessionTicket MUST also ignore all unrecognized extensions.</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22.1</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">A middlebox which terminates a TLS connection MUST behave as a
+	compliant TLS server</cell>
+	<cell align="left" valign="middle"><em>NA</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">A middlebox which forwards ClientHello parameters it does not
+	understand MUST NOT process any messages beyond that ClientHello. It MUST forward all subsequent
+	traffic unmodified.  Otherwise, it may fail to interoperate with newer clients and servers.</cell>
+	<cell align="left" valign="middle"><em>NA</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-B.4">
+	    B.4. Cipher Suites
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">TLS_AES_128_GCM_SHA256</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">TLS_AES_256_GCM_SHA384</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">TLS_CHACHA20_POLY1305_SHA256</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">TLS_AES_128_CCM_SHA256</cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+      <row>
+        <cell align="left" valign="middle"></cell>
+        <cell align="left" valign="middle">TLS_AES_128_CCM_8_SHA256</cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-C.1">
+	    C.1. Random Number Generation and Seeding
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-C.2">
+	    C.2. Certificates and Authentication
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-C.3">
+	    C.3. Implementation Pitfalls
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-C.4">
+	    C.4. Client Tracking Prevention
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-C.5">
+	    C.5. Unauthenticated Operation
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-D.1">
+	    D.1. Negotiating with an Older Server
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-D.2">
+	    D.2. Negotiating with an Older Client
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-D.3">
+	    D.3. 0-RTT Backward Compatibility
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>NC</em></cell>
+	<cell align="left" valign="middle"><em></em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-D.4">
+	    D.4. Middlebox Compatibility Mode
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>PC</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <row>
+        <cell align="left" valign="middle">
+	  <url href="https://tools.ietf.org/html/rfc8446#section-D.5">
+	    D.5. Security Restrictions Related to Backward Compatibility
+	  </url>
+	</cell>
+        <cell align="left" valign="middle"><em></em></cell>
+	<cell align="left" valign="middle"><em>C</em></cell>
+	<cell align="left" valign="middle"><em>22</em></cell>
+      </row>
+
+      <tcaption>Standards Compliance</tcaption>
+    </table>
+
+  </section>
+
+</chapter>
diff --git a/lib/ssl/doc/src/usersguide.xml b/lib/ssl/doc/src/usersguide.xml
index 23ccf668c3..b22b2456e4 100644
--- a/lib/ssl/doc/src/usersguide.xml
+++ b/lib/ssl/doc/src/usersguide.xml
@@ -38,6 +38,7 @@
   <xi:include href="ssl_protocol.xml"/>
   <xi:include href="using_ssl.xml"/>
   <xi:include href="ssl_distribution.xml"/>
+  <xi:include href="standards_compliance.xml"/>
 </part>
 
 
diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile
index 8d1341f594..8dc76f2638 100644
--- a/lib/ssl/src/Makefile
+++ b/lib/ssl/src/Makefile
@@ -39,60 +39,80 @@ RELSYSDIR = $(RELEASE_PATH)/lib/ssl-$(VSN)
 # ----------------------------------------------------
 
 BEHAVIOUR_MODULES= \
-        ssl_session_cache_api \
-	ssl_crl_cache_api
+	ssl_crl_cache_api \
+	ssl_session_cache_api
+
 
 MODULES= \
-	ssl \
-	ssl_alert \
-	ssl_app \
-	ssl_sup \
-	ssl_admin_sup\
-	tls_connection_sup \
-        ssl_connection_sup \
-        ssl_listen_tracker_sup\
+	dtls_connection \
 	dtls_connection_sup \
-	dtls_packet_demux \
+	dtls_handshake \
 	dtls_listener_sup \
-	ssl_dist_sup\
-        ssl_dist_admin_sup\
-        ssl_dist_connection_sup\
+	dtls_packet_demux \
+	dtls_record \
+	dtls_socket \
+	dtls_v1 \
 	inet_tls_dist \
 	inet6_tls_dist \
-	ssl_certificate\
-	ssl_pkix_db\
+	ssl \
+	ssl_admin_sup \
+	ssl_alert \
+	ssl_app \
+	ssl_certificate \
 	ssl_cipher \
 	ssl_cipher_format \
-	ssl_srp_primes \
-	tls_connection \
-	dtls_connection \
-	tls_sender\
 	ssl_config \
 	ssl_connection \
-	tls_handshake \
-	dtls_handshake\
-	ssl_handshake\
-	ssl_manager \
-	ssl_session \
-	ssl_session_cache \
-	ssl_pem_cache \
-	ssl_crl\
+	ssl_connection_sup \
+	ssl_crl \
 	ssl_crl_cache \
 	ssl_crl_hash_dir \
-	tls_socket \
-	dtls_socket \
-	tls_record \
-	dtls_record \
+	ssl_dh_groups \
+	ssl_dist_admin_sup \
+	ssl_dist_connection_sup \
+	ssl_dist_sup \
+	ssl_handshake \
+	ssl_listen_tracker_sup \
+	ssl_logger \
+	ssl_manager \
+	ssl_pem_cache \
+	ssl_pkix_db \
 	ssl_record \
+	ssl_session \
+	ssl_session_cache \
+	ssl_srp_primes \
+	ssl_sup \
 	ssl_v3 \
-	tls_v1 \
-	dtls_v1
+	tls_connection \
+	tls_connection_sup \
+	tls_connection_1_3 \
+	tls_handshake \
+	tls_handshake_1_3 \
+	tls_record \
+	tls_record_1_3 \
+	tls_sender \
+	tls_socket \
+	tls_v1
+
 
 INTERNAL_HRL_FILES = \
-	ssl_alert.hrl ssl_cipher.hrl \
-	tls_connection.hrl dtls_connection.hrl ssl_connection.hrl \
-        ssl_handshake.hrl tls_handshake.hrl dtls_handshake.hrl ssl_api.hrl ssl_internal.hrl \
-        ssl_record.hrl tls_record.hrl dtls_record.hrl ssl_srp.hrl
+	dtls_connection.hrl \
+	dtls_handshake.hrl \
+	dtls_record.hrl \
+	ssl_alert.hrl \
+	ssl_api.hrl \
+	ssl_cipher.hrl \
+	ssl_connection.hrl \
+	ssl_handshake.hrl \
+	ssl_internal.hrl \
+	ssl_record.hrl \
+	ssl_srp.hrl \
+	tls_connection.hrl \
+	tls_handshake.hrl \
+	tls_handshake_1_3.hrl \
+	tls_record.hrl \
+	tls_record_1_3.hrl
+
 
 ERL_FILES= \
 	$(MODULES:%=%.erl) \
@@ -111,6 +131,10 @@ APP_TARGET= $(EBIN)/$(APP_FILE)
 APPUP_SRC= $(APPUP_FILE).src
 APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
 
+DEPDIR=$(ERL_TOP)/lib/ssl/src/deps
+DEP_FILE=$(DEPDIR)/ssl.d
+$(shell mkdir -p $(dir $(DEP_FILE)) >/dev/null)
+
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
@@ -118,7 +142,7 @@ EXTRA_ERLC_FLAGS = +warn_unused_vars
 ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/kernel/src \
 	-pz $(EBIN) \
 	-pz $(ERL_TOP)/lib/public_key/ebin \
-	$(EXTRA_ERLC_FLAGS) -DVSN=\"$(VSN)\"
+	$(EXTRA_ERLC_FLAGS)
 
 
 # ----------------------------------------------------
@@ -127,11 +151,22 @@ ERL_COMPILE_FLAGS += -I$(ERL_TOP)/lib/kernel/src \
 
 $(TARGET_FILES): $(BEHAVIOUR_TARGET_FILES)
 
-debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) 
+$(DEP_FILE): $(ERL_FILES)
+	$(gen_verbose)erlc -M $(ERL_FILES) \
+	| sed "s@$(ERL_TOP)@../../..@g" \
+	| sed "s/\.$(EMULATOR)/\.$$\(EMULATOR\)/" \
+	| sed 's@^dtls_@$$(EBIN)/dtls_@' \
+	| sed 's@^inet_@$$(EBIN)/inet_@' \
+	| sed 's@^ssl_@$$(EBIN)/ssl_@' \
+	| sed 's@^tls_@$$(EBIN)/tls_@' \
+	> $(DEP_FILE)
+
+debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(DEP_FILE)
 
 clean:
 	rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(BEHAVIOUR_TARGET_FILES) 
 	rm -f errs core *~
+	rm -rf $(DEPDIR)
 
 $(APP_TARGET):	$(APP_SRC) ../vsn.mk
 	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
@@ -141,7 +176,6 @@ $(APPUP_TARGET):	$(APPUP_SRC) ../vsn.mk
 
 docs:
 
-
 # ----------------------------------------------------
 # Release Target
 # ---------------------------------------------------- 
@@ -159,22 +193,4 @@ release_docs_spec:
 # ----------------------------------------------------
 # Dependencies
 # ----------------------------------------------------
-$(EBIN)/inet_tls_dist.$(EMULATOR): ../../kernel/include/net_address.hrl  ../../kernel/include/dist.hrl  ../../kernel/include/dist_util.hrl
-$(EBIN)/tls.$(EMULATOR): ssl_internal.hrl ssl_record.hrl ssl_cipher.hrl ssl_handshake.hrl ../../public_key/include/public_key.hrl
-$(EBIN)/ssl_alert.$(EMULATOR): ssl_alert.hrl ssl_record.hrl  
-$(EBIN)/ssl_certificate.$(EMULATOR): ssl_internal.hrl ssl_alert.hrl ssl_handshake.hrl ../../public_key/include/public_key.hrl
-$(EBIN)/ssl_certificate_db.$(EMULATOR): ssl_internal.hrl ../../public_key/include/public_key.hrl ../../kernel/include/file.hrl
-$(EBIN)/ssl_cipher.$(EMULATOR): ssl_internal.hrl ssl_record.hrl ssl_cipher.hrl ssl_handshake.hrl ssl_alert.hrl ../../public_key/include/public_key.hrl
-$(EBIN)/tls_connection.$(EMULATOR): ssl_internal.hrl tls_connection.hrl tls_record.hrl ssl_cipher.hrl tls_handshake.hrl ssl_alert.hrl ../../public_key/include/public_key.hrl
-$(EBIN)/dtls_connection.$(EMULATOR): ssl_internal.hrl dtls_connection.hrl dtls_record.hrl ssl_cipher.hrl dtls_handshake.hrl ssl_alert.hrl ../../public_key/include/public_key.hrl
-$(EBIN)/tls_handshake.$(EMULATOR): ssl_internal.hrl tls_record.hrl ssl_cipher.hrl tls_handshake.hrl ssl_alert.hrl ../../public_key/include/public_key.hrl
-$(EBIN)/tls_handshake.$(EMULATOR): ssl_internal.hrl ssl_connection.hrl ssl_record.hrl ssl_cipher.hrl ssl_handshake.hrl ssl_alert.hrl ../../public_key/include/public_key.hrl
-$(EBIN)/ssl_manager.$(EMULATOR): ssl_internal.hrl ssl_handshake.hrl ../../kernel/include/file.hrl
-$(EBIN)/ssl_record.$(EMULATOR):  ssl_internal.hrl ssl_record.hrl ssl_cipher.hrl ssl_handshake.hrl ssl_alert.hrl
-$(EBIN)/ssl_session.$(EMULATOR):  ssl_internal.hrl ssl_handshake.hrl
-$(EBIN)/ssl_session_cache.$(EMULATOR):  ssl_internal.hrl ssl_handshake.hrl
-$(EBIN)/ssl_session_cache_api.$(EMULATOR):  ssl_internal.hrl ssl_handshake.hrl
-$(EBIN)/ssl_ssl3.$(EMULATOR): ssl_internal.hrl ssl_record.hrl ssl_cipher.hrl
-$(EBIN)/ssl_tls1.$(EMULATOR): ssl_internal.hrl ssl_record.hrl ssl_cipher.hrl
-$(EBIN)/ssl_cache.$(EMULATOR): ssl_cache.erl ssl_internal.hrl ../../public_key/include/public_key.hrl
-
+-include $(DEP_FILE)
diff --git a/lib/ssl/src/dtls_connection.erl b/lib/ssl/src/dtls_connection.erl
index 37719ad439..b220691e79 100644
--- a/lib/ssl/src/dtls_connection.erl
+++ b/lib/ssl/src/dtls_connection.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2019. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@
 -include("ssl_internal.hrl").
 -include("ssl_srp.hrl").
 -include_lib("public_key/include/public_key.hrl"). 
+-include_lib("kernel/include/logger.hrl").
 
 %% Internal application API
 
@@ -39,7 +40,7 @@
 -export([start_fsm/8, start_link/7, init/1, pids/1]).
 
 %% State transition handling	 
--export([next_event/3, next_event/4, handle_common_event/4]).
+-export([next_event/3, next_event/4, handle_protocol_record/3]).
 
 %% Handshake handling
 -export([renegotiate/2, send_handshake/2, 
@@ -50,8 +51,7 @@
 -export([encode_alert/3, send_alert/2, send_alert_in_connection/2, close/5, protocol_name/0]).
 
 %% Data handling
--export([encode_data/3, next_record/1,
-	 send/3, socket/5, setopts/3, getopts/3]).
+-export([socket/4, setopts/3, getopts/3]).
 
 %% gen_statem state functions
 -export([init/3, error/3, downgrade/3, %% Initiation and take down states
@@ -67,7 +67,7 @@
 %% Setup
 %%====================================================================	     
 start_fsm(Role, Host, Port, Socket, {#ssl_options{erl_dist = false},_, Tracker} = Opts,
-	  User, {CbModule, _,_, _} = CbInfo, 
+	  User, {CbModule, _, _, _, _} = CbInfo,
 	  Timeout) -> 
     try 
 	{ok, Pid} = dtls_connection_sup:start_child([Role, Host, Port, Socket, 
@@ -80,7 +80,7 @@ start_fsm(Role, Host, Port, Socket, {#ssl_options{erl_dist = false},_, Tracker}
     end.
 
 %%--------------------------------------------------------------------
--spec start_link(atom(), host(), inet:port_number(), port(), list(), pid(), tuple()) ->
+-spec start_link(atom(), ssl: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
@@ -107,9 +107,11 @@ pids(_) ->
 %%====================================================================
 %% 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{handshake_env = 
+                       #handshake_env{unprocessed_handshake_events = N} = HsEnv} 
+            = State) when N > 0 ->
+    {no_record, State#state{handshake_env = 
+                                HsEnv#handshake_env{unprocessed_handshake_events = N-1}}};
 next_record(#state{protocol_buffers =
 		       #protocol_buffers{dtls_cipher_texts = [#ssl_tls{epoch = Epoch} = CT | Rest]}
 		   = Buffers,
@@ -141,17 +143,20 @@ next_record(#state{protocol_buffers =
     next_record(State#state{protocol_buffers =
                                 Buffers#protocol_buffers{dtls_cipher_texts = Rest},
                             connection_states = ConnectionStates});
-next_record(#state{role = server,
-		   socket = {Listener, {Client, _}}} = State) -> 
+next_record(#state{static_env = #static_env{role = server,
+                                            socket = {Listener, {Client, _}}}} = State) ->
     dtls_packet_demux: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
+next_record(#state{protocol_specific = #{active_n_toggle := true,
+                                         active_n := N} = ProtocolSpec,
+                   static_env = #static_env{role = client,
+                                            socket = {_Server, Socket} = DTLSSocket,
+                                            close_tag = CloseTag,
+                                            transport_cb = Transport}} = State) ->
+    case dtls_socket:setopts(Transport, Socket, [{active,N}]) of
         ok ->
- 	    {no_record, State};
+            {no_record, State#state{protocol_specific =
+                                        ProtocolSpec#{active_n_toggle => false}}};
  	_ ->
             self() ! {CloseTag, DTLSSocket},
 	    {no_record, State}
@@ -191,7 +196,8 @@ next_event(StateName, no_record,
 	    %% TODO maybe buffer later epoch
             next_event(StateName, no_record, State, Actions); 
 	{#alert{} = Alert, State} ->
-	    {next_state, StateName, State, [{next_event, internal, Alert} | Actions]}
+            Version = State#state.connection_env#connection_env.negotiated_version,
+            handle_own_alert(Alert, Version, StateName, State)
     end;
 next_event(connection = StateName, Record,
 	   #state{connection_states = #{current_read := #{epoch := CurrentEpoch}}} = State0, Actions) ->
@@ -231,40 +237,49 @@ next_event(StateName, Record,
 	    %% TODO maybe buffer later epoch
             next_event(StateName, no_record, State0, Actions); 
 	#alert{} = Alert ->
-	    {next_state, StateName, State0, [{next_event, internal, Alert} | Actions]}
+	    Version = State0#state.connection_env#connection_env.negotiated_version,
+            handle_own_alert(Alert, Version, StateName, State0)
     end.
 
-handle_common_event(internal, #alert{} = Alert, StateName, 
-		    #state{negotiated_version = Version} = State) ->
-    handle_own_alert(Alert, Version, StateName, State);
+%%% DTLS record protocol level application data messages 
+
+handle_protocol_record(#ssl_tls{type = ?APPLICATION_DATA, fragment = Data}, StateName0, State0) ->
+    case ssl_connection:read_application_data(Data, State0) of
+	{stop, _, _} = Stop->
+            Stop;
+	{Record, State1} ->
+            {next_state, StateName, State, Actions} = next_event(StateName0, Record, State1), 
+            ssl_connection:hibernate_after(StateName, State, Actions)
+    end;
 %%% DTLS record protocol level handshake messages 
-handle_common_event(internal, #ssl_tls{type = ?HANDSHAKE,
+handle_protocol_record(#ssl_tls{type = ?HANDSHAKE,
 				       fragment = Data}, 
 		    StateName, 
-		    #state{protocol_buffers = Buffers0,
-			   negotiated_version = Version} = State0) ->
+                       #state{protocol_buffers = Buffers0,
+                              connection_env = #connection_env{negotiated_version = Version},
+                              ssl_options = Options} = State) ->
     try
-	case dtls_handshake:get_dtls_handshake(Version, Data, Buffers0) of
+	case dtls_handshake:get_dtls_handshake(Version, Data, Buffers0, Options) of
 	    {[], Buffers} ->
-		next_event(StateName, no_record, State0#state{protocol_buffers = Buffers});
+		next_event(StateName, no_record, State#state{protocol_buffers = Buffers});
 	    {Packets, Buffers} ->
-		State = State0#state{protocol_buffers = Buffers},
+		HsEnv = State#state.handshake_env,
 		Events = dtls_handshake_events(Packets),
                 {next_state, StateName, 
-                 State#state{unprocessed_handshake_events = unprocessed_events(Events)}, Events}
+                 State#state{protocol_buffers = Buffers,
+                             handshake_env = 
+                                 HsEnv#handshake_env{unprocessed_handshake_events 
+                                                     = unprocessed_events(Events)}}, Events}
 	end
     catch throw:#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, StateName, State0)
+	    handle_own_alert(Alert, Version, StateName, State)
     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) ->
+handle_protocol_record(#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) ->
+handle_protocol_record(#ssl_tls{type = ?ALERT, fragment = EncAlerts}, StateName,
+                       #state{connection_env = #connection_env{negotiated_version = Version}} = State) ->
     case decode_alerts(EncAlerts) of
 	Alerts = [_|_] ->
 	    handle_alerts(Alerts,  {next_state, StateName, State});
@@ -272,18 +287,21 @@ handle_common_event(internal, #ssl_tls{type = ?ALERT, fragment = EncAlerts}, Sta
 	    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_protocol_record(#ssl_tls{type = _Unknown}, StateName, State) ->
+    {next_state, StateName, State, []}.
 
 %%====================================================================
 %% Handshake handling
 %%====================================================================	     
 
-renegotiate(#state{role = client} = State, Actions) ->
+renegotiate(#state{static_env = #static_env{role = client}} = State0, Actions) ->
     %% Handle same way as if server requested
     %% the renegotiation
-    next_event(connection, no_record, State, [{next_event, internal, #hello_request{}} | Actions]);
-renegotiate(#state{role = server} = State0, Actions) ->
+    State = reinit_handshake_data(State0),
+    {next_state, connection, State,
+     [{next_event, internal, #hello_request{}} | Actions]};
+
+renegotiate(#state{static_env = #static_env{role = server}} = State0, Actions) ->
     HelloRequest = ssl_handshake:hello_request(),
     State1 = prepare_flight(State0),
     {State, MoreActions} = send_handshake(HelloRequest, State1),
@@ -293,42 +311,51 @@ 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).
 
-queue_handshake(Handshake0, #state{tls_handshake_history = Hist0, 
-				   negotiated_version = Version,
+queue_handshake(Handshake0, #state{handshake_env = #handshake_env{tls_handshake_history = Hist0} = HsEnv, 
+                                   connection_env = #connection_env{negotiated_version = Version},
 				   flight_buffer = #{handshakes := HsBuffer0,
 						     change_cipher_spec := undefined,
-						     next_sequence := Seq} = Flight0} = State) ->
+						     next_sequence := Seq} = Flight0,
+                                   ssl_options = SslOpts} = State) ->
     Handshake = dtls_handshake:encode_handshake(Handshake0, Version, Seq),
     Hist = update_handshake_history(Handshake0, Handshake, Hist0),
+    ssl_logger:debug(SslOpts#ssl_options.log_level, outbound, 'handshake', Handshake0),
+
     State#state{flight_buffer = Flight0#{handshakes => [Handshake | HsBuffer0],
 					 next_sequence => Seq +1},
-		tls_handshake_history = Hist};
+	handshake_env = HsEnv#handshake_env{tls_handshake_history = Hist}};
 
-queue_handshake(Handshake0, #state{tls_handshake_history = Hist0, 
-				   negotiated_version = Version,
+queue_handshake(Handshake0, #state{handshake_env = #handshake_env{tls_handshake_history = Hist0} = HsEnv, 
+                                   connection_env = #connection_env{negotiated_version = Version},
 				   flight_buffer = #{handshakes_after_change_cipher_spec := Buffer0,
-						     next_sequence := Seq} = Flight0} = State) ->
+						     next_sequence := Seq} = Flight0,
+                                   ssl_options = SslOpts} = State) ->
     Handshake = dtls_handshake:encode_handshake(Handshake0, Version, Seq),
     Hist = update_handshake_history(Handshake0, Handshake, Hist0),
+    ssl_logger:debug(SslOpts#ssl_options.log_level, outbound, 'handshake', Handshake0),
+
     State#state{flight_buffer = Flight0#{handshakes_after_change_cipher_spec => [Handshake | Buffer0],
 					 next_sequence => Seq +1},
-		tls_handshake_history = Hist}.
+                handshake_env = HsEnv#handshake_env{tls_handshake_history = Hist}}.
 
 queue_change_cipher(ChangeCipher, #state{flight_buffer = Flight,
 					 connection_states = ConnectionStates0} = State) -> 
     ConnectionStates = 
-	dtls_record:next_epoch(ConnectionStates0, write), 
+	dtls_record:next_epoch(ConnectionStates0, write),
     State#state{flight_buffer = Flight#{change_cipher_spec => ChangeCipher},
 		connection_states = ConnectionStates}.
 
 reinit(State) ->
     %% To be API compatible with TLS NOOP here
     reinit_handshake_data(State).
-reinit_handshake_data(#state{protocol_buffers = Buffers} = State) ->
-    State#state{premaster_secret = undefined,
-		public_key_info = undefined,
-                tls_handshake_history = ssl_handshake:init_handshake_history(),
-                flight_state = {retransmit, ?INITIAL_RETRANSMIT_TIMEOUT},
+reinit_handshake_data(#state{static_env = #static_env{data_tag = DataTag},
+                             protocol_buffers = Buffers,
+                             protocol_specific = PS,
+                             handshake_env = HsEnv} = State) ->
+    State#state{handshake_env = HsEnv#handshake_env{tls_handshake_history = ssl_handshake:init_handshake_history(),
+                                                    public_key_info = undefined,
+                                                    premaster_secret = undefined},
+                protocol_specific = PS#{flight_state => initial_flight_state(DataTag)},
 		flight_buffer = new_flight(),
                 protocol_buffers =
 		    Buffers#protocol_buffers{
@@ -337,8 +364,8 @@ reinit_handshake_data(#state{protocol_buffers = Buffers} = State) ->
 		      dtls_handshake_later_fragments = []
 		     }}.
 
-select_sni_extension(#client_hello{extensions = HelloExtensions}) ->
-    HelloExtensions#hello_extensions.sni;
+select_sni_extension(#client_hello{extensions = #{sni := SNI}}) ->
+    SNI;
 select_sni_extension(_) ->
     undefined.
 
@@ -352,13 +379,16 @@ empty_connection_state(ConnectionEnd, BeastMitigation) ->
 encode_alert(#alert{} = Alert, Version, ConnectionStates) ->
     dtls_record:encode_alert_record(Alert, Version, ConnectionStates).
 
-send_alert(Alert, #state{negotiated_version = Version,
-			 socket = Socket,
-			 transport_cb = Transport,
-			 connection_states = ConnectionStates0} = State0) ->
+send_alert(Alert, #state{static_env = #static_env{socket = Socket,
+                                                  transport_cb = Transport},
+
+                         connection_env = #connection_env{negotiated_version = Version},
+			 connection_states = ConnectionStates0,
+                         ssl_options = SslOpts} = State0) ->
     {BinMsg, ConnectionStates} =
 	encode_alert(Alert, Version, ConnectionStates0),
     send(Transport, Socket, BinMsg),
+    ssl_logger:debug(SslOpts#ssl_options.log_level, outbound, 'record', BinMsg),
     State0#state{connection_states = ConnectionStates}.
 
 send_alert_in_connection(Alert, State) ->
@@ -378,16 +408,13 @@ protocol_name() ->
 %% Data handling
 %%====================================================================	 
 
-encode_data(Data, Version, ConnectionStates0)->
-    dtls_record:encode_data(Data, Version, ConnectionStates0).
+send(Transport, {Listener, Socket}, Data) when is_pid(Listener) -> % Server socket
+    dtls_socket:send(Transport, Socket, Data);
+send(Transport, Socket, Data) -> % Client socket
+    dtls_socket:send(Transport, Socket, Data).
 
-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).
+socket(Pid,  Transport, Socket, _Tracker) ->
+    dtls_socket:socket(Pid, Transport, Socket, ?MODULE).
 
 setopts(Transport, Socket, Other) ->
     dtls_socket:setopts(Transport, Socket, Other).
@@ -406,42 +433,38 @@ getopts(Transport, Socket, Tag) ->
 init(enter, _, State) ->
     {keep_state, State};     
 init({call, From}, {start, Timeout}, 
-     #state{host = Host, port = Port, role = client,
+     #state{static_env = #static_env{host = Host,
+                                     port = Port,
+                                     role = client,
+                                     session_cache = Cache,
+                                     session_cache_cb = CacheCb},
+            handshake_env = #handshake_env{renegotiation = {Renegotiation, _}},
+            connection_env = CEnv,
 	    ssl_options = SslOpts,
 	    session = #session{own_certificate = Cert} = Session0,
-	    connection_states = ConnectionStates0,
-	    renegotiation = {Renegotiation, _},
-	    session_cache = Cache,
-	    session_cache_cb = CacheCb
+	    connection_states = ConnectionStates0
 	   } = State0) ->
-    Timer = ssl_connection:start_or_recv_cancel_timer(Timeout, From),
     Hello = dtls_handshake:client_hello(Host, Port, ConnectionStates0, SslOpts,
 					Cache, CacheCb, Renegotiation, Cert),
 
     Version = Hello#client_hello.client_version,
     HelloVersion = dtls_record:hello_version(Version, SslOpts#ssl_options.versions),
-    State1 = prepare_flight(State0#state{negotiated_version = Version}),
-    {State2, Actions} = send_handshake(Hello, State1#state{negotiated_version = HelloVersion}),  
-    State = State2#state{negotiated_version = Version, %% Requested version
-                         session =
-                             Session0#session{session_id = Hello#client_hello.session_id},
-                         start_or_recv_from = From,
-                         timer = Timer,
-                         flight_state = {retransmit, ?INITIAL_RETRANSMIT_TIMEOUT}
-                        },
-    next_event(hello, no_record, State, Actions);
-init({call, _} = Type, Event, #state{role = server, data_tag = udp} = State) ->
+    State1 = prepare_flight(State0#state{connection_env = CEnv#connection_env{negotiated_version = Version}}),
+    {State2, Actions} = send_handshake(Hello, State1#state{connection_env = CEnv#connection_env{negotiated_version = HelloVersion}}),  
+    State = State2#state{connection_env = CEnv#connection_env{negotiated_version = Version}, %% RequestedVersion
+			  session =
+			      Session0#session{session_id = Hello#client_hello.session_id},
+			  start_or_recv_from = From},
+    next_event(hello, no_record, State, [{{timeout, handshake}, Timeout, close} | Actions]);
+init({call, _} = Type, Event, #state{static_env = #static_env{role = server},
+                                     protocol_specific = PS} = State) ->
     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}}),
+                           State#state{protocol_specific = PS#{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
-    gen_handshake(?FUNCTION_NAME, Type, Event, State#state{flight_state = reliable});
 init(Type, Event, State) ->
    gen_handshake(?FUNCTION_NAME, Type, Event, State).
 
@@ -454,8 +477,8 @@ error(enter, _, State) ->
     {keep_state, State};     
 error({call, From}, {start, _Timeout}, 
       #state{protocol_specific = #{error := Error}} = State) ->
-    ssl_connection:stop_and_reply(
-      normal, {reply, From, {error, Error}}, State);
+    {stop_and_reply, {shutdown, normal}, 
+     [{reply, From, {error, Error}}], State};
 error({call, _} = Call, Msg, State) ->
     gen_handshake(?FUNCTION_NAME, Call, Msg, State);
 error(_, _, _) ->
@@ -467,16 +490,18 @@ error(_, _, _) ->
 	    #state{}) ->
 		   gen_statem:state_function_result().
 %%--------------------------------------------------------------------
-hello(enter, _, #state{role = server} = State) ->
+hello(enter, _, #state{static_env = #static_env{role = server}} = State) ->
     {keep_state, State};     
-hello(enter, _, #state{role = client} = State0) ->
+hello(enter, _, #state{static_env = #static_env{role = client}} = State0) ->
     {State, Actions} = handle_flight_timer(State0),
     {keep_state, State, Actions}; 
 hello(internal, #client_hello{cookie = <<>>,
 			      client_version = Version} = Hello, 
-      #state{role = server,
-             transport_cb = Transport,
-             socket = Socket,
+      #state{static_env = #static_env{role = server,
+                                      transport_cb = Transport,
+                                      socket = Socket},
+             handshake_env = HsEnv,
+             connection_env = CEnv,
              protocol_specific = #{current_cookie_secret := Secret}} = State0) ->
     {ok, {IP, Port}} = dtls_socket:peername(Transport, Socket),
     Cookie = dtls_handshake:cookie(Secret, IP, Port, Hello),
@@ -487,51 +512,61 @@ hello(internal, #client_hello{cookie = <<>>,
     %% version 1.0 regardless of the version of TLS that is expected to be
     %% negotiated.
     VerifyRequest = dtls_handshake:hello_verify_request(Cookie, ?HELLO_VERIFY_REQUEST_VERSION),
-    State1 = prepare_flight(State0#state{negotiated_version = Version}),
+    State1 = prepare_flight(State0#state{connection_env = CEnv#connection_env{negotiated_version = Version}}),
     {State, Actions} = send_handshake(VerifyRequest, State1),
     next_event(?FUNCTION_NAME, no_record, 
-               State#state{tls_handshake_history = ssl_handshake:init_handshake_history()}, Actions);
-hello(internal, #hello_verify_request{cookie = Cookie}, #state{role = client,
-							       host = Host, port = Port, 
+               State#state{handshake_env = HsEnv#handshake_env{
+                                             tls_handshake_history = 
+                                                 ssl_handshake:init_handshake_history()}}, 
+               Actions);
+hello(internal, #hello_verify_request{cookie = Cookie}, #state{static_env = #static_env{role = client,
+                                                                                        host = Host,
+                                                                                        port = Port,
+                                                                                        session_cache = Cache,
+                                                                                        session_cache_cb = CacheCb},
+                                                               handshake_env = #handshake_env{renegotiation = {Renegotiation, _}} = HsEnv,
+                                                               connection_env = CEnv,
 							       ssl_options = SslOpts,
 							       session = #session{own_certificate = OwnCert} 
 							       = Session0,
-							       connection_states = ConnectionStates0,
-							       renegotiation = {Renegotiation, _},
-							       session_cache = Cache,
-							       session_cache_cb = CacheCb
+							       connection_states = ConnectionStates0
 							      } = State0) ->
   
     Hello = dtls_handshake:client_hello(Host, Port, Cookie, ConnectionStates0,
 					SslOpts,
 					Cache, CacheCb, Renegotiation, OwnCert),
     Version = Hello#client_hello.client_version,
-    State1 = prepare_flight(State0#state{tls_handshake_history = ssl_handshake:init_handshake_history()}),
+    State1 = prepare_flight(State0#state{handshake_env =  
+                                             HsEnv#handshake_env{tls_handshake_history 
+                                                                 = ssl_handshake:init_handshake_history()}}),
     
     {State2, Actions} = send_handshake(Hello, State1), 
-    State = State2#state{negotiated_version = Version, %% Requested version
+    State = State2#state{connection_env = CEnv#connection_env{negotiated_version = Version}, %% Requested version
                          session =
                              Session0#session{session_id = 
                                                   Hello#client_hello.session_id}},
     next_event(?FUNCTION_NAME, no_record, State, Actions);
 hello(internal, #client_hello{extensions = Extensions} = Hello, 
       #state{ssl_options = #ssl_options{handshake = hello},
+             handshake_env = HsEnv,
              start_or_recv_from = From} = State) ->
     {next_state, user_hello, State#state{start_or_recv_from = undefined,
-                                             hello = Hello},
-     [{reply, From, {ok, ssl_connection:map_extensions(Extensions)}}]};
+                                         handshake_env = HsEnv#handshake_env{hello = Hello}},
+     [{reply, From, {ok, Extensions}}]};
 hello(internal, #server_hello{extensions = Extensions} = Hello, 
       #state{ssl_options = #ssl_options{handshake = hello},
+             handshake_env = HsEnv,
              start_or_recv_from = From} = State) ->
     {next_state, user_hello, State#state{start_or_recv_from = undefined,
-                                             hello = Hello},
-     [{reply, From, {ok, ssl_connection:map_extensions(Extensions)}}]};     
-hello(internal, #client_hello{cookie = Cookie} = Hello, 
-      #state{role = server,
-             transport_cb = Transport,
-             socket = Socket,
-             protocol_specific = #{current_cookie_secret := Secret,
-                                   previous_cookie_secret := PSecret}} = State0) ->
+                                         handshake_env = HsEnv#handshake_env{hello = Hello}},    
+     [{reply, From, {ok, Extensions}}]};     
+
+hello(internal, #client_hello{cookie = Cookie} = Hello, #state{static_env = #static_env{role = server,
+                                                                                        transport_cb = Transport,
+                                                                                        socket = Socket},
+                                                               protocol_specific = #{current_cookie_secret := Secret,
+                                                                                     previous_cookie_secret := PSecret}
+                                                              } = State0) ->
     {ok, {IP, Port}} = dtls_socket:peername(Transport, Socket),
     case dtls_handshake:cookie(Secret, IP, Port, Hello) of
 	Cookie ->
@@ -546,11 +581,12 @@ hello(internal, #client_hello{cookie = Cookie} = Hello,
             end
     end;
 hello(internal, #server_hello{} = Hello,
-      #state{connection_states = ConnectionStates0,
-	     negotiated_version = ReqVersion,
-	     role = client,
-	     renegotiation = {Renegotiation, _},
-	     ssl_options = SslOptions} = State) ->
+      #state{
+         static_env = #static_env{role = client},
+         handshake_env = #handshake_env{renegotiation = {Renegotiation, _}},
+         connection_env = #connection_env{negotiated_version = ReqVersion},
+         connection_states = ConnectionStates0,
+         ssl_options = SslOptions} = State) ->
     case dtls_handshake:hello(Hello, SslOptions, ConnectionStates0, Renegotiation) of
 	#alert{} = Alert ->
 	    handle_own_alert(Alert, ReqVersion, ?FUNCTION_NAME, State);
@@ -596,10 +632,11 @@ abbreviated(internal = Type,
     ConnectionStates1 = dtls_record:save_current_connection_state(ConnectionStates0, read),
     ConnectionStates = dtls_record:next_epoch(ConnectionStates1, read),
     gen_handshake(?FUNCTION_NAME, Type, Event, State#state{connection_states = ConnectionStates});
-abbreviated(internal = Type, #finished{} = Event, #state{connection_states = ConnectionStates} = State) ->
+abbreviated(internal = Type, #finished{} = Event, #state{connection_states = ConnectionStates,
+                                                         protocol_specific = PS} = State) ->
     gen_handshake(?FUNCTION_NAME, Type, Event, 
                   prepare_flight(State#state{connection_states = ConnectionStates,
-                                             flight_state = connection}));
+                                             protocol_specific = PS#{flight_state => connection}}));
 abbreviated(state_timeout, Event, State) ->
     handle_state_timeout(Event, ?FUNCTION_NAME, State);
 abbreviated(Type, Event, State) ->
@@ -639,10 +676,11 @@ cipher(internal = Type, #change_cipher_spec{type = <<1>>} = Event,
     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);
-cipher(internal = Type, #finished{} = Event, #state{connection_states = ConnectionStates} = State) ->
+cipher(internal = Type, #finished{} = Event, #state{connection_states = ConnectionStates,
+                                                   protocol_specific = PS} = State) ->
     ssl_connection:?FUNCTION_NAME(Type, Event, 
                                   prepare_flight(State#state{connection_states = ConnectionStates,
-                                                             flight_state = connection}), 
+                                                             protocol_specific = PS#{flight_state => connection}}), 
                                   ?MODULE);
 cipher(state_timeout, Event, State) ->
     handle_state_timeout(Event, ?FUNCTION_NAME, State);
@@ -658,33 +696,43 @@ connection(enter, _, State) ->
     {keep_state, State};     
 connection(info, Event, State) ->
     gen_info(Event, ?FUNCTION_NAME, State);
-connection(internal, #hello_request{}, #state{host = Host, port = Port,
+connection(internal, #hello_request{}, #state{static_env = #static_env{host = Host,
+                                                                       port = Port,
+                                                                       data_tag = DataTag,
+                                                                       session_cache = Cache,
+                                                                       session_cache_cb = CacheCb
+                                                                      },
+                                              handshake_env = #handshake_env{ renegotiation = {Renegotiation, _}},
+                                              connection_env = CEnv,
                                               session = #session{own_certificate = Cert} = Session0,
-                                              session_cache = Cache, session_cache_cb = CacheCb,
                                               ssl_options = SslOpts,
                                               connection_states = ConnectionStates0,
-                                              renegotiation = {Renegotiation, _}} = State0) ->
+                                              protocol_specific = PS
+                                             } = State0) ->
     
     Hello = dtls_handshake:client_hello(Host, Port, ConnectionStates0, SslOpts,
 					Cache, CacheCb, Renegotiation, Cert),
     Version = Hello#client_hello.client_version,
     HelloVersion = dtls_record:hello_version(Version, SslOpts#ssl_options.versions),
     State1 = prepare_flight(State0),
-    {State, Actions} = send_handshake(Hello, State1#state{negotiated_version = HelloVersion}),
-    next_event(hello, no_record, State#state{flight_state = {retransmit, ?INITIAL_RETRANSMIT_TIMEOUT},
-                                             session = Session0#session{session_id
-                                                                        = Hello#client_hello.session_id}},
-               Actions);
-connection(internal, #client_hello{} = Hello, #state{role = server, allow_renegotiate = true} = State) ->
+    {State2, Actions} = send_handshake(Hello, State1#state{connection_env = CEnv#connection_env{negotiated_version = HelloVersion}}),
+    State = State2#state{protocol_specific = PS#{flight_state => initial_flight_state(DataTag)},
+                         session = Session0#session{session_id
+                                                    = Hello#client_hello.session_id}},
+    next_event(hello, no_record, State, Actions);
+connection(internal, #client_hello{} = Hello, #state{static_env = #static_env{role = server},
+                                                     handshake_env = #handshake_env{allow_renegotiate = true} = HsEnv} = State) ->
     %% Mitigate Computational DoS attack
     %% http://www.educatedguesswork.org/2011/10/ssltls_and_computational_dos.html
     %% http://www.thc.org/thc-ssl-dos/ Rather than disabling client
     %% initiated renegotiation we will disallow many client initiated
     %% renegotiations immediately after each other.
     erlang:send_after(?WAIT_TO_ALLOW_RENEGOTIATION, self(), allow_renegotiate),
-    {next_state, hello, State#state{allow_renegotiate = false, renegotiation = {true, peer}},
+    {next_state, hello, State#state{handshake_env = HsEnv#handshake_env{renegotiation = {true, peer},
+                                                                        allow_renegotiate = false}},
      [{next_event, internal, Hello}]};
-connection(internal, #client_hello{}, #state{role = server, allow_renegotiate = false} = State0) ->
+connection(internal, #client_hello{}, #state{static_env = #static_env{role = server},
+                                             handshake_env = #handshake_env{allow_renegotiate = false}} = State0) ->
     Alert = ?ALERT_REC(?WARNING, ?NO_RENEGOTIATION),
     State1 = send_alert(Alert, State0),
     {Record, State} = ssl_connection:prepare_connection(State1, ?MODULE),
@@ -727,7 +775,7 @@ format_status(Type, Data) ->
 %%% Internal functions
 %%--------------------------------------------------------------------
 initial_state(Role, Host, Port, Socket, {SSLOptions, SocketOptions, _}, User,
-	      {CbModule, DataTag, CloseTag, ErrorTag}) ->
+	      {CbModule, DataTag, CloseTag, ErrorTag, PassiveTag}) ->
     #ssl_options{beast_mitigation = BeastMitigation} = SSLOptions,
     ConnectionStates = dtls_record:init_connection_states(Role, BeastMitigation),
     
@@ -737,41 +785,64 @@ initial_state(Role, Host, Port, Socket, {SSLOptions, SocketOptions, _}, User,
 			 _  ->
 			     ssl_session_cache
 		     end,
-    
+    InternalActiveN =  case application:get_env(ssl, internal_active_n) of
+                           {ok, N} when is_integer(N) ->
+                               N;
+                           _  ->
+                               ?INTERNAL_ACTIVE_N
+                       end,
     Monitor = erlang:monitor(process, User),
-
-    #state{socket_options = SocketOptions,
+    InitStatEnv = #static_env{
+                     role = Role,
+                     transport_cb = CbModule,
+                     protocol_cb = ?MODULE,
+                     data_tag = DataTag,
+                     close_tag = CloseTag,
+                     error_tag = ErrorTag,
+                     passive_tag = PassiveTag,
+                     host = Host,
+                     port = Port,
+                     socket = Socket,
+                     session_cache_cb = SessionCacheCb
+                    },
+
+    #state{static_env = InitStatEnv,
+           handshake_env = #handshake_env{
+                              tls_handshake_history = ssl_handshake:init_handshake_history(),
+                              renegotiation = {false, first},
+                              allow_renegotiate = SSLOptions#ssl_options.client_renegotiation
+                             },
+           connection_env = #connection_env{user_application = {Monitor, User}},
+           socket_options = SocketOptions,
 	   %% We do not want to save the password in the state so that
 	   %% could be written in the clear into error logs.
 	   ssl_options = SSLOptions#ssl_options{password = undefined},	   
 	   session = #session{is_resumable = new},
-	   transport_cb = CbModule,
-	   data_tag = DataTag,
-	   close_tag = CloseTag,
-	   error_tag = ErrorTag,
-	   role = Role,
-	   host = Host,
-	   port = Port,
-	   socket = Socket,
 	   connection_states = ConnectionStates,
 	   protocol_buffers = #protocol_buffers{},
-	   user_application = {Monitor, User},
-	   user_data_buffer = <<>>,
-	   session_cache_cb = SessionCacheCb,
-	   renegotiation = {false, first},
-	   allow_renegotiate = SSLOptions#ssl_options.client_renegotiation,
+	   user_data_buffer = {[],0,[]},
 	   start_or_recv_from = undefined,
-	   protocol_cb = ?MODULE,
 	   flight_buffer = new_flight(),
-           flight_state = {retransmit, ?INITIAL_RETRANSMIT_TIMEOUT}
+           protocol_specific = #{active_n => InternalActiveN,
+                                 active_n_toggle => true,
+                                 flight_state => initial_flight_state(DataTag)}
 	  }.
 
+initial_flight_state(udp)->
+    {retransmit, ?INITIAL_RETRANSMIT_TIMEOUT};
+initial_flight_state(_) ->
+    reliable.
+
 next_dtls_record(Data, StateName, #state{protocol_buffers = #protocol_buffers{
 						   dtls_record_buffer = Buf0,
-						   dtls_cipher_texts = CT0} = Buffers} = State0) ->
+						   dtls_cipher_texts = CT0} = Buffers,
+                                         connection_env = #connection_env{negotiated_version = Version},
+                                         static_env = #static_env{data_tag = DataTag},
+                                         ssl_options = SslOpts} = State0) ->
     case dtls_record:get_dtls_records(Data,
-                                      acceptable_record_versions(StateName, State0), 
-                                      Buf0) of
+                                      {DataTag, StateName, Version, 
+                                       [dtls_record:protocol_version(Vsn) || Vsn <- ?ALL_AVAILABLE_DATAGRAM_VERSIONS]}, 
+                                      Buf0, SslOpts) of
 	{Records, Buf1} ->
 	    CT1 = CT0 ++ Records,
 	    next_record(State0#state{protocol_buffers =
@@ -781,10 +852,6 @@ next_dtls_record(Data, StateName, #state{protocol_buffers = #protocol_buffers{
 	    Alert
     end.
 
-acceptable_record_versions(hello, _) ->
-    [dtls_record:protocol_version(Vsn) || Vsn <- ?ALL_DATAGRAM_SUPPORTED_VERSIONS];
-acceptable_record_versions(_, #state{negotiated_version = Version}) ->
-    [Version].
 
 dtls_handshake_events(Packets) ->
     lists:map(fun(Packet) ->
@@ -802,19 +869,22 @@ decode_cipher_text(#state{protocol_buffers = #protocol_buffers{dtls_cipher_texts
 	    {Alert, State}
     end.
 
-dtls_version(hello, Version, #state{role = server} = State) ->
-    State#state{negotiated_version = Version}; %%Inital version
+dtls_version(hello, Version, #state{static_env = #static_env{role = server},
+                                    connection_env = CEnv} = State) ->
+    State#state{connection_env = CEnv#connection_env{negotiated_version = Version}}; %%Inital version
 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,
+                           static_env = #static_env{port = Port,
+                                                     session_cache = Cache,
+                                                    session_cache_cb = CacheCb},
+                           handshake_env = #handshake_env{kex_algorithm = KeyExAlg,
+                                                          renegotiation = {Renegotiation, _},
+                                                          negotiated_protocol = CurrentProtocol} = HsEnv,
+                           connection_env = CEnv,
+			   session = #session{own_certificate = Cert} = Session0,
 			   ssl_options = SslOpts} = State0) ->
     
     case dtls_handshake:hello(Hello, SslOpts, {Port, Session0, Cache, CacheCb,
@@ -829,11 +899,12 @@ handle_client_hello(#client_hello{client_version = ClientVersion} = Hello,
 		       end,
 
 	    State = prepare_flight(State0#state{connection_states = ConnectionStates,
-						negotiated_version = Version,
-						hashsign_algorithm = HashSign,
-                                                client_hello_version = ClientVersion,
-						session = Session,
-						negotiated_protocol = Protocol}),
+						connection_env = CEnv#connection_env{negotiated_version = Version},
+                                                handshake_env = HsEnv#handshake_env{
+                                                                  hashsign_algorithm = HashSign,
+                                                                  client_hello_version = ClientVersion,
+                                                                  negotiated_protocol = Protocol},
+						session = Session}),
 	    
 	    ssl_connection:hello(internal, {common_client_hello, Type, ServerHelloExt},
 				 State, ?MODULE)
@@ -842,20 +913,29 @@ handle_client_hello(#client_hello{client_version = ClientVersion} = Hello,
 
 %% raw data from socket, unpack records
 handle_info({Protocol, _, _, _, Data}, StateName,
-            #state{data_tag = Protocol} = State0) ->
+            #state{static_env = #static_env{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)
+            {stop, {shutdown, own_alert}, State0}
     end;
+
+handle_info({PassiveTag, Socket}, StateName,
+            #state{static_env = #static_env{socket = {_, Socket},
+                                            passive_tag = PassiveTag},
+                   protocol_specific = PS} = State) ->
+    next_event(StateName, no_record,
+               State#state{protocol_specific = PS#{active_n_toggle => true}});
+
 handle_info({CloseTag, Socket}, StateName,
-	    #state{socket = Socket, 
+	    #state{static_env = #static_env{socket = Socket,
+                                            close_tag = CloseTag},
+                   connection_env = #connection_env{negotiated_version = Version},
                    socket_options = #socket_options{active = Active},
                    protocol_buffers = #protocol_buffers{dtls_cipher_texts = CTs},
-                   close_tag = CloseTag,
-		   negotiated_version = Version} = State) ->
+                   protocol_specific = PS} = 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
@@ -873,12 +953,13 @@ handle_info({CloseTag, Socket}, StateName,
                     ok
             end,
             ssl_connection:handle_normal_shutdown(?ALERT_REC(?FATAL, ?CLOSE_NOTIFY), StateName, State),
-            ssl_connection:stop({shutdown, transport_closed}, State);
+            {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)
+            next_event(StateName, no_record, State#state{
+                                               protocol_specific = PS#{active_n_toggle => true}})
     end;
 
 handle_info(new_cookie_secret, StateName, 
@@ -891,9 +972,10 @@ 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)),
+                     #state{protocol_specific = 
+                                #{flight_state := {retransmit, _NextTimeout}}} = State0) ->
+    {State1, Actions0} = send_handshake_flight(State0, 
+                                               retransmit_epoch(StateName, State0)),
     {next_state, StateName, State, Actions} = next_event(StateName, no_record, State1, Actions0),
     %% This will reset the retransmission timer by repeating the enter state event
     {repeat_state, State, Actions}.
@@ -907,12 +989,12 @@ handle_alerts([Alert | Alerts], {next_state, 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{data_tag = udp,
-                                                   role = Role,
+handle_own_alert(Alert, Version, StateName, #state{static_env = #static_env{data_tag = 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),
+            log_ignore_alert(Options#ssl_options.log_level, StateName, Alert, Role),
             {next_state, StateName, State};
         {false, State} ->
             ssl_connection:handle_own_alert(Alert, Version, StateName, State)
@@ -933,7 +1015,7 @@ decode_alerts(Bin) ->
     ssl_alert:decode(Bin).
 
 gen_handshake(StateName, Type, Event, 
-	      #state{negotiated_version = Version} = State) ->
+	      #state{connection_env = #connection_env{negotiated_version = Version}} = State) ->
     try ssl_connection:StateName(Type, Event, State, ?MODULE) of
 	Result ->
 	    Result
@@ -944,7 +1026,7 @@ gen_handshake(StateName, Type, Event,
 					    Version, StateName, State)  
     end.
 
-gen_info(Event, connection = StateName,  #state{negotiated_version = Version} = State) ->
+gen_info(Event, connection = StateName,  #state{connection_env = #connection_env{negotiated_version = Version}} = State) ->
     try handle_info(Event, StateName, State) of
 	Result ->
 	    Result
@@ -955,7 +1037,7 @@ gen_info(Event, connection = StateName,  #state{negotiated_version = Version} =
 					    Version, StateName, State)  
     end;
 
-gen_info(Event, StateName, #state{negotiated_version = Version} = State) ->
+gen_info(Event, StateName, #state{connection_env = #connection_env{negotiated_version = Version}} = State) ->
     try handle_info(Event, StateName, State) of
 	Result ->
 	    Result
@@ -998,58 +1080,67 @@ next_flight(Flight) ->
 	    change_cipher_spec => undefined,
 	    handshakes_after_change_cipher_spec => []}.
        
-handle_flight_timer(#state{data_tag = udp,
-                          flight_state = {retransmit, Timeout}} = State) ->
+handle_flight_timer(#state{static_env = #static_env{data_tag = udp},
+                           protocol_specific = #{flight_state := {retransmit, Timeout}}} = State) ->
     start_retransmision_timer(Timeout, State);
-handle_flight_timer(#state{data_tag = udp,
-		    flight_state = connection} = State) ->
+handle_flight_timer(#state{static_env = #static_env{data_tag = udp},
+                           protocol_specific = #{flight_state := connection}} = State) ->
     {State, []};
-handle_flight_timer(State) ->
+handle_flight_timer(#state{protocol_specific = #{flight_state := reliable}} = State) ->
     %% No retransmision needed i.e DTLS over SCTP
-    {State#state{flight_state = reliable}, []}.
+    {State, []}.
 
-start_retransmision_timer(Timeout, State) ->
-    {State#state{flight_state = {retransmit, new_timeout(Timeout)}}, 
+start_retransmision_timer(Timeout, #state{protocol_specific = PS} = State) ->
+    {State#state{protocol_specific = PS#{flight_state => {retransmit, new_timeout(Timeout)}}}, 
      [{state_timeout, Timeout, flight_retransmission_timeout}]}.
 
-new_timeout(N) when N =< 30 -> 
+new_timeout(N) when N =< 30000 ->
     N * 2;
 new_timeout(_) -> 
-    60.
+    60000.
 
-send_handshake_flight(#state{socket = Socket,
-			     transport_cb = Transport,
-			     flight_buffer = #{handshakes := Flight,
+send_handshake_flight(#state{static_env = #static_env{socket = Socket,
+                                                      transport_cb = Transport},
+                             connection_env = #connection_env{negotiated_version = Version},
+                             flight_buffer = #{handshakes := Flight,
 					       change_cipher_spec := undefined},
-			     negotiated_version = Version,
-			     connection_states = ConnectionStates0} = State0, Epoch) ->
+			     connection_states = ConnectionStates0,
+                             ssl_options = #ssl_options{log_level = LogLevel}} = State0,
+                      Epoch) ->
     %% TODO remove hardcoded Max size
     {Encoded, ConnectionStates} =
 	encode_handshake_flight(lists:reverse(Flight), Version, 1400, Epoch, ConnectionStates0),
-    send(Transport, Socket, Encoded), 
+    send(Transport, Socket, Encoded),
+    ssl_logger:debug(LogLevel, outbound, 'record', Encoded),
    {State0#state{connection_states = ConnectionStates}, []};
 
-send_handshake_flight(#state{socket = Socket,
-			     transport_cb = Transport,
+send_handshake_flight(#state{static_env = #static_env{socket = Socket,
+                                                      transport_cb = Transport},
+                             connection_env = #connection_env{negotiated_version = Version},
 			     flight_buffer = #{handshakes := [_|_] = Flight0,
 					       change_cipher_spec := ChangeCipher,
 					       handshakes_after_change_cipher_spec := []},
-			     negotiated_version = Version,
-			     connection_states = ConnectionStates0} = State0, Epoch) ->      
+			     connection_states = ConnectionStates0,
+                             ssl_options = #ssl_options{log_level = LogLevel}} = 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]),
+    ssl_logger:debug(LogLevel, outbound, 'record', [HsBefore]),
+    ssl_logger:debug(LogLevel, outbound, 'record', [EncChangeCipher]),
     {State0#state{connection_states = ConnectionStates}, []};
 
-send_handshake_flight(#state{socket = Socket,
-			     transport_cb = Transport,
+send_handshake_flight(#state{static_env = #static_env{socket = Socket,
+                                                      transport_cb = Transport},
+                             connection_env = #connection_env{negotiated_version = Version},
 			     flight_buffer = #{handshakes := [_|_] = Flight0,
 					       change_cipher_spec := ChangeCipher,
 					       handshakes_after_change_cipher_spec := Flight1},
-			     negotiated_version = Version,
-			     connection_states = ConnectionStates0} = State0, Epoch) ->      
+			     connection_states = ConnectionStates0,
+                             ssl_options = #ssl_options{log_level = LogLevel}} = State0,
+                      Epoch) ->
     {HsBefore, ConnectionStates1} =
 	encode_handshake_flight(lists:reverse(Flight0), Version, 1400, Epoch-1, ConnectionStates0),
     {EncChangeCipher, ConnectionStates2} = 
@@ -1057,20 +1148,27 @@ send_handshake_flight(#state{socket = Socket,
     {HsAfter, ConnectionStates} =
 	encode_handshake_flight(lists:reverse(Flight1), Version, 1400, Epoch, ConnectionStates2),
     send(Transport, Socket, [HsBefore, EncChangeCipher, HsAfter]),
+    ssl_logger:debug(LogLevel, outbound, 'record', [HsBefore]),
+    ssl_logger:debug(LogLevel, outbound, 'record', [EncChangeCipher]),
+    ssl_logger:debug(LogLevel, outbound, 'record', [HsAfter]),
     {State0#state{connection_states = ConnectionStates}, []};
 
-send_handshake_flight(#state{socket = Socket,
-			     transport_cb = Transport,
+send_handshake_flight(#state{static_env = #static_env{socket = Socket,
+                                                      transport_cb = Transport},
+                             connection_env = #connection_env{negotiated_version = Version},
 			     flight_buffer = #{handshakes := [],
 					       change_cipher_spec := ChangeCipher,
 					       handshakes_after_change_cipher_spec := Flight1},
-			     negotiated_version = Version,
-			     connection_states = ConnectionStates0} = State0, Epoch) ->
+			     connection_states = ConnectionStates0,
+                             ssl_options = #ssl_options{log_level = LogLevel}} = 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]),
+    ssl_logger:debug(LogLevel, outbound, 'record', [EncChangeCipher]),
+    ssl_logger:debug(LogLevel, outbound, 'record', [HsAfter]),
     {State0#state{connection_states = ConnectionStates}, []}.
 
 retransmit_epoch(_StateName, #state{connection_states = ConnectionStates}) ->
@@ -1109,31 +1207,33 @@ is_ignore_alert(#alert{description = ?ILLEGAL_PARAMETER}) ->
 is_ignore_alert(_) ->
     false.
 
-log_ignore_alert(true, StateName, Alert, Role) ->
+log_ignore_alert(debug, StateName, Alert, Role) ->
     Txt = ssl_alert:alert_txt(Alert),
-    error_logger:format("DTLS over UDP ~p: In state ~p ignored to send ALERT ~s as DoS-attack mitigation \n", 
-                        [Role, StateName, Txt]);
-log_ignore_alert(false, _, _,_) ->
+    ?LOG_ERROR("DTLS over UDP ~p: In state ~p ignored to send ALERT ~s as DoS-attack mitigation \n",
+                 [Role, StateName, Txt]);
+log_ignore_alert(_, _, _, _) ->
     ok.
 
 send_application_data(Data, From, _StateName,
-                      #state{socket = Socket,
-                             negotiated_version = Version,
-                             protocol_cb = Connection,
-                             transport_cb = Transport,
+                      #state{static_env = #static_env{socket = Socket,
+                                                      transport_cb = Transport},
+                             connection_env = #connection_env{negotiated_version = Version},
+                             handshake_env = HsEnv,
                              connection_states = ConnectionStates0,
-                             ssl_options = #ssl_options{renegotiate_at = RenegotiateAt}} = State0) ->
+                             ssl_options = #ssl_options{renegotiate_at = RenegotiateAt,
+                                                        log_level = LogLevel}} = State0) ->
        
     case time_to_renegotiate(Data, ConnectionStates0, RenegotiateAt) of
 	true ->
-	    renegotiate(State0#state{renegotiation = {true, internal}}, 
+	    renegotiate(State0#state{handshake_env = HsEnv#handshake_env{renegotiation = {true, internal}}}, 
                         [{next_event, {call, From}, {application_data, Data}}]);
 	false ->
 	    {Msgs, ConnectionStates} =
-                Connection:encode_data(Data, Version, ConnectionStates0),
+                dtls_record:encode_data(Data, Version, ConnectionStates0),
             State = State0#state{connection_states = ConnectionStates},
-	    case Connection:send(Transport, Socket, Msgs) of
+	    case send(Transport, Socket, Msgs) of
                 ok ->
+                    ssl_logger:debug(LogLevel, outbound, 'record', Msgs),
                     ssl_connection:hibernate_after(connection, State, [{reply, From, ok}]);
                 Result ->
                     ssl_connection:hibernate_after(connection, State, [{reply, From, Result}])
@@ -1154,3 +1254,4 @@ is_time_to_renegotiate(N, M) when N < M->
     false;
 is_time_to_renegotiate(_,_) ->
     true.
+
diff --git a/lib/ssl/src/dtls_handshake.erl b/lib/ssl/src/dtls_handshake.erl
index 3f70eaec8a..4a381745d4 100644
--- a/lib/ssl/src/dtls_handshake.erl
+++ b/lib/ssl/src/dtls_handshake.erl
@@ -37,7 +37,7 @@
 -export([fragment_handshake/2, encode_handshake/3]).
 
 %% Handshake decodeing
--export([get_dtls_handshake/3]). 
+-export([get_dtls_handshake/4]).
 
 -type dtls_handshake() :: #client_hello{} | #hello_verify_request{} | 
 			  ssl_handshake:ssl_handshake().
@@ -46,7 +46,7 @@
 %% Handshake handling
 %%====================================================================
 %%--------------------------------------------------------------------
--spec client_hello(host(), inet:port_number(), ssl_record:connection_states(),
+-spec client_hello(ssl:host(), inet:port_number(), ssl_record:connection_states(),
 		   #ssl_options{}, integer(), atom(), boolean(), der_cert()) ->
 			  #client_hello{}.
 %%
@@ -59,7 +59,7 @@ client_hello(Host, Port, ConnectionStates, SslOpts,
 		 Cache, CacheCb, Renegotiation, OwnCert).
 
 %%--------------------------------------------------------------------
--spec client_hello(host(), inet:port_number(), term(), ssl_record:connection_states(),
+-spec client_hello(ssl:host(), inet:port_number(), term(), ssl_record:connection_states(),
 		   #ssl_options{}, integer(), atom(), boolean(), der_cert()) ->
 			  #client_hello{}.
 %%
@@ -79,7 +79,7 @@ client_hello(Host, Port, Cookie, ConnectionStates,
 
     Extensions = ssl_handshake:client_hello_extensions(TLSVersion, CipherSuites,
                                                        SslOpts, ConnectionStates, 
-                                                       Renegotiation),
+                                                       Renegotiation, undefined),
     Id = ssl_session:client_id({Host, Port, SslOpts}, Cache, CacheCb, OwnCert),
 
     #client_hello{session_id = Id,
@@ -123,7 +123,7 @@ cookie(Key, Address, Port, #client_hello{client_version = {Major, Minor},
 		  Random, SessionId, CipherSuites, CompressionMethods],
     crypto:hmac(sha, Key, CookieData).
 %%--------------------------------------------------------------------
--spec hello_verify_request(binary(),  dtls_record:dtls_version()) -> #hello_verify_request{}.
+-spec hello_verify_request(binary(),  ssl_record:ssl_version()) -> #hello_verify_request{}.
 %%
 %% Description: Creates a hello verify request message sent by server to
 %% verify client
@@ -151,15 +151,15 @@ encode_handshake(Handshake, Version, Seq) ->
 %%--------------------------------------------------------------------
 
 %%--------------------------------------------------------------------
--spec get_dtls_handshake(dtls_record:dtls_version(), binary(), #protocol_buffers{}) ->
+-spec get_dtls_handshake(ssl_record:ssl_version(), binary(), #protocol_buffers{}, #ssl_options{}) ->
                                 {[dtls_handshake()], #protocol_buffers{}}.                
 %%
 %% Description:  Given buffered and new data from dtls_record, collects
 %% and returns it as a list of handshake messages, also returns 
 %% possible leftover data in the new "protocol_buffers".
 %%--------------------------------------------------------------------
-get_dtls_handshake(Version, Fragment, ProtocolBuffers) ->
-    handle_fragments(Version, Fragment, ProtocolBuffers, []).
+get_dtls_handshake(Version, Fragment, ProtocolBuffers, Options) ->
+    handle_fragments(Version, Fragment, ProtocolBuffers, Options, []).
 
 %%--------------------------------------------------------------------
 %%% Internal functions
@@ -169,10 +169,7 @@ handle_client_hello(Version,
                                   cipher_suites = CipherSuites,
                                   compression_methods = Compressions,
                                   random = Random,
-                                  extensions =
-                                      #hello_extensions{elliptic_curves = Curves,
-                                                        signature_algs = ClientHashSigns} 
-                                  = HelloExt},
+                                  extensions = HelloExt},
 		    #ssl_options{versions = Versions,
 				 signature_algs = SupportedHashSigns,
                                  eccs = SupportedECCs,
@@ -181,6 +178,8 @@ handle_client_hello(Version,
                     Renegotiation) ->
     case dtls_record:is_acceptable_version(Version, Versions) of
 	true ->
+            Curves = maps:get(elliptic_curves, HelloExt, undefined),
+            ClientHashSigns = maps:get(signature_algs, HelloExt, undefined),
 	    TLSVersion = dtls_v1:corresponding_tls_version(Version),
 	    AvailableHashSigns = ssl_handshake:available_signature_algs(
 				   ClientHashSigns, SupportedHashSigns, Cert,TLSVersion),
@@ -194,8 +193,8 @@ handle_client_hello(Version,
 		no_suite ->
 		    ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY);
 		_ ->
-		    #{key_exchange := KeyExAlg} = ssl_cipher_format:suite_definition(CipherSuite),
-		    case ssl_handshake:select_hashsign(ClientHashSigns, Cert, KeyExAlg, 
+		    #{key_exchange := KeyExAlg} = ssl_cipher_format:suite_bin_to_map(CipherSuite),
+		    case ssl_handshake:select_hashsign({ClientHashSigns, undefined}, Cert, KeyExAlg,
 						       SupportedHashSigns, TLSVersion) of
 			#alert{} = Alert ->
 			    Alert;
@@ -215,8 +214,6 @@ handle_client_hello_extensions(Version, Type, Random, CipherSuites,
 						     HelloExt, dtls_v1:corresponding_tls_version(Version),
 						     SslOpts, Session0, 
                                                      ConnectionStates0, Renegotiation) of
-	#alert{} = Alert ->
-	    Alert;
 	{Session, ConnectionStates, Protocol, ServerHelloExt} ->
 	    {Version, {Type, Session}, ConnectionStates, Protocol, ServerHelloExt, HashSign}
     catch throw:Alert ->
@@ -225,17 +222,16 @@ handle_client_hello_extensions(Version, Type, Random, CipherSuites,
 
 handle_server_hello_extensions(Version, SessionId, Random, CipherSuite,
 			       Compression, HelloExt, SslOpt, ConnectionStates0, Renegotiation) ->
-    case ssl_handshake:handle_server_hello_extensions(dtls_record, Random, CipherSuite,
-						      Compression, HelloExt,
-						      dtls_v1:corresponding_tls_version(Version),
-						      SslOpt, ConnectionStates0, Renegotiation) of
-	#alert{} = Alert ->
-	    Alert;
+    try ssl_handshake:handle_server_hello_extensions(dtls_record, Random, CipherSuite,
+                                                     Compression, HelloExt,
+                                                     dtls_v1:corresponding_tls_version(Version),
+                                                     SslOpt, ConnectionStates0, Renegotiation) of
 	{ConnectionStates, ProtoExt, Protocol} ->
 	    {Version, SessionId, ConnectionStates, ProtoExt, Protocol}
+    catch throw:Alert ->
+	    Alert
     end.
 
-
 %%--------------------------------------------------------------------
 
 enc_handshake(#hello_verify_request{protocol_version = {Major, Minor},
@@ -259,7 +255,8 @@ enc_handshake(#client_hello{client_version = {Major, Minor},
     CmLength = byte_size(BinCompMethods),
     BinCipherSuites = list_to_binary(CipherSuites),
     CsLength = byte_size(BinCipherSuites),
-    ExtensionsBin = ssl_handshake:encode_hello_extensions(HelloExtensions),
+    ExtensionsBin = ssl_handshake:encode_hello_extensions(HelloExtensions, 
+                                                          dtls_v1:corresponding_tls_version({Major, Minor})),
 
     {?CLIENT_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
  		      ?BYTE(SIDLength), SessionID/binary,
@@ -314,20 +311,21 @@ address_to_bin({A,B,C,D,E,F,G,H}, Port) ->
 
 %%--------------------------------------------------------------------
 
-handle_fragments(Version, FragmentData, Buffers0, Acc) ->
+handle_fragments(Version, FragmentData, Buffers0, Options, Acc) ->
     Fragments = decode_handshake_fragments(FragmentData),
-    do_handle_fragments(Version, Fragments, Buffers0, Acc).
+    do_handle_fragments(Version, Fragments, Buffers0, Options, Acc).
 
-do_handle_fragments(_, [], Buffers, Acc) ->
+do_handle_fragments(_, [], Buffers, _Options, Acc) ->
     {lists:reverse(Acc), Buffers};
-do_handle_fragments(Version, [Fragment | Fragments], Buffers0, Acc) ->
+do_handle_fragments(Version, [Fragment | Fragments], Buffers0, Options, Acc) ->
     case reassemble(Version, Fragment, Buffers0) of
 	{more_data, Buffers} when Fragments == [] ->
 	    {lists:reverse(Acc), Buffers};
 	{more_data, Buffers} ->
-	    do_handle_fragments(Version, Fragments, Buffers, Acc);
-	{HsPacket, Buffers} ->
-	    do_handle_fragments(Version, Fragments, Buffers, [HsPacket | Acc])
+	    do_handle_fragments(Version, Fragments, Buffers, Options, Acc);
+	{{Handshake, _} = HsPacket, Buffers} ->
+            ssl_logger:debug(Options#ssl_options.log_level, inbound, 'handshake', Handshake),
+	    do_handle_fragments(Version, Fragments, Buffers, Options, [HsPacket | Acc])
     end.
 
 decode_handshake(Version, <<?BYTE(Type), Bin/binary>>) ->
@@ -335,7 +333,7 @@ decode_handshake(Version, <<?BYTE(Type), Bin/binary>>) ->
 
 decode_handshake(_, ?HELLO_REQUEST, <<>>) ->
     #hello_request{};
-decode_handshake(_Version, ?CLIENT_HELLO, <<?UINT24(_), ?UINT16(_),
+decode_handshake(Version, ?CLIENT_HELLO, <<?UINT24(_), ?UINT16(_),
 					    ?UINT24(_),  ?UINT24(_), 
 					    ?BYTE(Major), ?BYTE(Minor), Random:32/binary,
 					    ?BYTE(SID_length), Session_ID:SID_length/binary,
@@ -343,8 +341,10 @@ decode_handshake(_Version, ?CLIENT_HELLO, <<?UINT24(_), ?UINT16(_),
 					    ?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}),
+    TLSVersion = dtls_v1:corresponding_tls_version(Version),
+    LegacyVersion = dtls_v1:corresponding_tls_version({Major, Minor}),
+    Exts = ssl_handshake:decode_vector(Extensions),
+    DecodedExtensions = ssl_handshake:decode_hello_extensions(Exts, TLSVersion, LegacyVersion, client),
 
     #client_hello{
        client_version = {Major,Minor},
@@ -365,9 +365,9 @@ decode_handshake(_Version, ?HELLO_VERIFY_REQUEST, <<?UINT24(_), ?UINT16(_),
 decode_handshake(Version, Tag,  <<?UINT24(_), ?UINT16(_),
 				  ?UINT24(_),  ?UINT24(_), Msg/binary>>) -> 
     %% DTLS specifics stripped
-    decode_tls_thandshake(Version, Tag, Msg).
+    decode_tls_handshake(Version, Tag, Msg).
 
-decode_tls_thandshake(Version, Tag, Msg) ->
+decode_tls_handshake(Version, Tag, Msg) ->
     TLSVersion = dtls_v1:corresponding_tls_version(Version),
     ssl_handshake:decode_handshake(TLSVersion, Tag, Msg).
 
@@ -428,74 +428,135 @@ merge_fragment(Frag0, [Frag1 | Rest]) ->
 	Frag ->
 	    merge_fragment(Frag, Rest)
     end.
-%% Duplicate
+
+
+%% Duplicate (fully contained fragment)
+%% 2,5 _ _ P P P P P
+%% 2,5 _ _ C C C C C
 merge_fragments(#handshake_fragment{
-		   fragment_offset = PreviousOffSet, 
+		   fragment_offset = PreviousOffSet,
 		   fragment_length = PreviousLen,
 		   fragment = PreviousData
-		  } = Previous, 
+		  } = Previous,
 		#handshake_fragment{
 		   fragment_offset = PreviousOffSet,
 		   fragment_length = PreviousLen,
 		   fragment = PreviousData}) ->
     Previous;
 
-%% Lager fragment save new data
+%% Duplicate (fully contained fragment)
+%% 2,5 _ _ P P P P P
+%% 2,2 _ _ C C
+%% 0,3 X X X
+%% 5,3 _ _ _ _ _ X X X
 merge_fragments(#handshake_fragment{
-		   fragment_offset = PreviousOffSet, 
-		   fragment_length = PreviousLen,
+                   fragment_offset = PreviousOffset,
+                   fragment_length = PreviousLen
+                  } = Previous,
+                #handshake_fragment{
+                   fragment_offset = CurrentOffset,
+                   fragment_length = CurrentLen})
+  when PreviousOffset =< CurrentOffset andalso
+       CurrentOffset =< PreviousOffset + PreviousLen andalso
+       CurrentOffset + CurrentLen =< PreviousOffset + PreviousLen ->
+    Previous;
+
+%% Fully overlapping fragments
+%% 2,5 _ _ P P P P P
+%% 0,8 C C C C C C C C
+merge_fragments(#handshake_fragment{
+                   fragment_offset = PreviousOffset,
+                   fragment_length = PreviousLen
+                  },
+                #handshake_fragment{
+                   fragment_offset = CurrentOffset,
+                   fragment_length = CurrentLen} = Current)
+  when CurrentOffset =< PreviousOffset andalso
+       CurrentOffset + CurrentLen >= PreviousOffset + PreviousLen ->
+    Current;
+
+%% Overlapping fragments
+%% 2,5 _ _ P P P P P
+%% 0,3 C C C
+merge_fragments(#handshake_fragment{
+                   fragment_offset = PreviousOffset,
+                   fragment_length = PreviousLen,
 		   fragment = PreviousData
-		  } = Previous, 
-		#handshake_fragment{
-		   fragment_offset = PreviousOffSet,
-		   fragment_length = CurrentLen,
-		   fragment = CurrentData}) when CurrentLen > PreviousLen ->
-    NewLength = CurrentLen - PreviousLen,
-    <<_:PreviousLen/binary, NewData/binary>> = CurrentData, 
+                  } = Previous,
+                #handshake_fragment{
+                   fragment_offset = CurrentOffset,
+                   fragment_length = CurrentLen,
+                   fragment = CurrentData})
+  when CurrentOffset < PreviousOffset andalso
+       CurrentOffset + CurrentLen < PreviousOffset + PreviousLen ->
+    NewDataLen = PreviousOffset - CurrentOffset,
+    <<NewData:NewDataLen/binary, _/binary>> = CurrentData,
     Previous#handshake_fragment{
-      fragment_length = PreviousLen + NewLength,
-      fragment = <<PreviousData/binary, NewData/binary>>
+      fragment_length = PreviousLen + NewDataLen,
+      fragment = <<NewData/binary, PreviousData/binary>>
      };
 
-%% Smaller fragment
+%% Overlapping fragments
+%% 2,5 _ _ P P P P P
+%% 5,3 _ _ _ _ _ C C C
 merge_fragments(#handshake_fragment{
-		   fragment_offset = PreviousOffSet, 
-		   fragment_length = PreviousLen
-		  } = Previous, 
-		#handshake_fragment{
-		   fragment_offset = PreviousOffSet,
-		   fragment_length = CurrentLen}) when CurrentLen < PreviousLen ->
-    Previous;
-%% Next fragment, might be overlapping
+                   fragment_offset = PreviousOffset,
+                   fragment_length = PreviousLen,
+		   fragment = PreviousData
+                  } = Previous,
+                #handshake_fragment{
+                   fragment_offset = CurrentOffset,
+                   fragment_length = CurrentLen,
+                   fragment = CurrentData})
+  when CurrentOffset > PreviousOffset andalso
+       CurrentOffset < PreviousOffset + PreviousLen ->
+    NewDataLen = CurrentOffset + CurrentLen - (PreviousOffset + PreviousLen),
+    DropLen = CurrentLen - NewDataLen,
+    <<_:DropLen/binary, NewData/binary>> = CurrentData,
+    Previous#handshake_fragment{
+      fragment_length = PreviousLen + NewDataLen,
+      fragment = <<PreviousData/binary, NewData/binary>>
+     };
+
+%% Adjacent fragments
+%% 2,5 _ _ P P P P P
+%% 7,3 _ _ _ _ _ _ _ C C C
 merge_fragments(#handshake_fragment{
-		   fragment_offset = PreviousOffSet, 
-		   fragment_length = PreviousLen,
+                   fragment_offset = PreviousOffset,
+                   fragment_length = PreviousLen,
 		   fragment = PreviousData
-		  } = Previous, 
-		#handshake_fragment{
-		   fragment_offset = CurrentOffSet,
-		   fragment_length = CurrentLen,
-                  fragment = CurrentData})
-  when PreviousOffSet + PreviousLen >= CurrentOffSet andalso
-       PreviousOffSet + PreviousLen < CurrentOffSet + CurrentLen ->
-    CurrentStart = PreviousOffSet + PreviousLen - CurrentOffSet,
-    <<_:CurrentStart/bytes, Data/binary>> = CurrentData,
+                  } = Previous,
+                #handshake_fragment{
+                   fragment_offset = CurrentOffset,
+                   fragment_length = CurrentLen,
+                   fragment = CurrentData})
+  when CurrentOffset =:= PreviousOffset + PreviousLen ->
     Previous#handshake_fragment{
-      fragment_length =  PreviousLen + CurrentLen - CurrentStart,
-      fragment = <<PreviousData/binary, Data/binary>>};
-%% already fully contained fragment
+      fragment_length = PreviousLen + CurrentLen,
+      fragment = <<PreviousData/binary, CurrentData/binary>>
+     };
+
+%% Adjacent fragments
+%% 2,5 _ _ P P P P P
+%% 0,2 C C
 merge_fragments(#handshake_fragment{
-                   fragment_offset = PreviousOffSet, 
-                   fragment_length = PreviousLen
-                  } = Previous, 
+                   fragment_offset = PreviousOffset,
+                   fragment_length = PreviousLen,
+		   fragment = PreviousData
+                  } = Previous,
                 #handshake_fragment{
-                   fragment_offset = CurrentOffSet,
-                   fragment_length = CurrentLen})
-  when PreviousOffSet + PreviousLen >= CurrentOffSet andalso
-       PreviousOffSet + PreviousLen >= CurrentOffSet + CurrentLen ->
-    Previous;
+                   fragment_offset = CurrentOffset,
+                   fragment_length = CurrentLen,
+                   fragment = CurrentData})
+  when PreviousOffset =:= CurrentOffset + CurrentLen ->
+    Previous#handshake_fragment{
+      fragment_length = PreviousLen + CurrentLen,
+      fragment = <<CurrentData/binary, PreviousData/binary>>
+     };
 
 %% No merge there is a gap
+%% 3,5 _ _ _ P P P P
+%% 0,2 C C
 merge_fragments(Previous, Current) ->
     [Previous, Current].
 
diff --git a/lib/ssl/src/dtls_handshake.hrl b/lib/ssl/src/dtls_handshake.hrl
index 50e92027d2..de2be1daeb 100644
--- a/lib/ssl/src/dtls_handshake.hrl
+++ b/lib/ssl/src/dtls_handshake.hrl
@@ -26,22 +26,13 @@
 -ifndef(dtls_handshake).
 -define(dtls_handshake, true).
 
+-include("tls_handshake.hrl"). %% Common TLS and DTLS records and Constantes
 -include("ssl_handshake.hrl"). %% Common TLS and DTLS records and Constantes
+-include("ssl_api.hrl").
 
 -define(HELLO_VERIFY_REQUEST, 3).
 -define(HELLO_VERIFY_REQUEST_VERSION, {254, 255}).
 
--record(client_hello, {
-	  client_version,
-	  random,             
-	  session_id,          % opaque SessionID<0..32>
-	  cookie,              % opaque<2..2^16-1>
-	  cipher_suites,       % cipher_suites<2..2^16-1>
-	  compression_methods, % compression_methods<1..2^8-1>,
-	  %% Extensions
-	  extensions
-	 }).
-
 -record(hello_verify_request, {
 	  protocol_version,
 	  cookie
@@ -56,4 +47,11 @@
 	  fragment
 	 }).
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% RFC 7764  Datagram Transport Layer Security (DTLS) Extension to Establish Keys
+%% for the Secure Real-time Transport Protocol (SRTP)
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Not supported
+-define(USE_SRTP, 14).
+
 -endif. % -ifdef(dtls_handshake).
diff --git a/lib/ssl/src/dtls_packet_demux.erl b/lib/ssl/src/dtls_packet_demux.erl
index 1497c77cf3..94b350eaa5 100644
--- a/lib/ssl/src/dtls_packet_demux.erl
+++ b/lib/ssl/src/dtls_packet_demux.erl
@@ -24,6 +24,7 @@
 -behaviour(gen_server).
 
 -include("ssl_internal.hrl").
+-include_lib("kernel/include/logger.hrl").
 
 %% API
 -export([start_link/5, active_once/3, accept/2, sockname/1, close/1,
@@ -34,7 +35,8 @@
 	 terminate/2, code_change/3]).
 
 -record(state, 
-	{port, 
+	{active_n,
+         port,
 	 listener,
          transport,
 	 dtls_options,
@@ -75,10 +77,18 @@ set_sock_opts(PacketSocket, Opts) ->
 %%% gen_server callbacks
 %%%===================================================================
 
-init([Port, {TransportModule, _,_,_} = TransportInfo, EmOpts, InetOptions, DTLSOptions]) ->
+init([Port, {TransportModule, _,_,_,_} = TransportInfo, EmOpts, InetOptions, DTLSOptions]) ->
     try 
 	{ok, Socket} = TransportModule:open(Port, InetOptions),
-	{ok, #state{port = Port,
+        InternalActiveN =  case application:get_env(ssl, internal_active_n) of
+                               {ok, N} when is_integer(N) ->
+                                   N;
+                               _  ->
+                                   ?INTERNAL_ACTIVE_N
+                           end,
+
+	{ok, #state{active_n = InternalActiveN,
+                    port = Port,
 		    first = true,
                     transport = TransportInfo,
 		    dtls_options = DTLSOptions,
@@ -91,10 +101,11 @@ init([Port, {TransportModule, _,_,_} = TransportInfo, EmOpts, InetOptions, DTLSO
 handle_call({accept, _}, _, #state{close = true} = State) ->
     {reply, {error, closed}, State};
 
-handle_call({accept, Accepter}, From, #state{first = true,
+handle_call({accept, Accepter}, From, #state{active_n = N,
+                                             first = true,
 					     accepters = Accepters,
 					     listener = Socket} = State0) ->
-    next_datagram(Socket),
+    next_datagram(Socket, N),
     State = State0#state{first = false,
 			 accepters = queue:in({Accepter, From}, Accepters)}, 		 
     {noreply, State};
@@ -136,21 +147,26 @@ handle_cast({active_once, Client, Pid}, State0) ->
     State = handle_active_once(Client, Pid, State0),
     {noreply, State}.
 
-handle_info({Transport, Socket, IP, InPortNo, _} = Msg, #state{listener = Socket, transport = {_,Transport,_,_}} = State0) ->
+handle_info({Transport, Socket, IP, InPortNo, _} = Msg, #state{listener = Socket, transport = {_,Transport,_,_,_}} = State0) ->
     State = handle_datagram({IP, InPortNo}, Msg, State0),
-    next_datagram(Socket),
     {noreply, State};
 
+handle_info({PassiveTag, Socket},
+            #state{active_n = N,
+                   listener = Socket,
+                   transport = {_, _, _, _, PassiveTag}} = State) ->
+    next_datagram(Socket, N),
+    {noreply, State}; 
 %% UDP socket does not have a connection and should not receive an econnreset
 %% This does however happens on some windows versions. Just ignoring it
 %% appears to make things work as expected! 
-handle_info({Error, Socket, econnreset = Error}, #state{listener = Socket, transport = {_,_,_, udp_error}} = State) ->
+handle_info({udp_error, Socket, econnreset = Error}, #state{listener = Socket, transport = {_,_,_, udp_error,_}} = State) ->
     Report = io_lib:format("Ignore SSL UDP Listener: Socket error: ~p ~n", [Error]),
-    error_logger:info_report(Report),
+    ?LOG_NOTICE(Report),
     {noreply, State};
-handle_info({Error, Socket, Error}, #state{listener = Socket, transport = {_,_,_, Error}} = State) ->
+handle_info({ErrorTag, Socket, Error}, #state{listener = Socket, transport = {_,_,_, ErrorTag,_}} = State) ->
     Report = io_lib:format("SSL Packet muliplxer shutdown: Socket error: ~p ~n", [Error]),
-    error_logger:info_report(Report),
+    ?LOG_NOTICE(Report),
     {noreply, State#state{close=true}};
 
 handle_info({'DOWN', _, process, Pid, _}, #state{clients = Clients,
@@ -202,16 +218,16 @@ dispatch(Client, Msg, #state{dtls_msq_queues = MsgQueues} = State) ->
 		    Pid ! Msg,
 		    State#state{dtls_msq_queues = 
 				    kv_update(Client, Queue, MsgQueues)};
-		{{value, _}, Queue} -> 
+		{{value, _UDP}, _Queue} ->
 		    State#state{dtls_msq_queues = 
-				    kv_update(Client, queue:in(Msg, Queue), MsgQueues)};
+				    kv_update(Client, queue:in(Msg, Queue0), MsgQueues)};
 		{empty, Queue} ->
 		    State#state{dtls_msq_queues = 
 				    kv_update(Client, queue:in(Msg, Queue), MsgQueues)}
 	    end
     end.
-next_datagram(Socket) ->
-    inet:setopts(Socket, [{active, once}]).
+next_datagram(Socket, N) ->
+    inet:setopts(Socket, [{active, N}]).
 
 handle_active_once(Client, Pid, #state{dtls_msq_queues = MsgQueues} = State0) ->
     Queue0 = kv_get(Client, MsgQueues),
@@ -297,6 +313,9 @@ do_set_emulated_opts([], Opts) ->
     Opts;
 do_set_emulated_opts([{mode, Value} | Rest], Opts) ->
     do_set_emulated_opts(Rest,  Opts#socket_options{mode = Value}); 
+do_set_emulated_opts([{active, N0} | Rest], Opts=#socket_options{active = Active}) when is_integer(N0) ->
+    N = tls_socket:update_active_n(N0, Active),
+    do_set_emulated_opts(Rest,  Opts#socket_options{active = N});
 do_set_emulated_opts([{active, Value} | Rest], Opts) ->
     do_set_emulated_opts(Rest,  Opts#socket_options{active = Value}).
 
diff --git a/lib/ssl/src/dtls_record.erl b/lib/ssl/src/dtls_record.erl
index b7346d3ec8..8b8db7b2de 100644
--- a/lib/ssl/src/dtls_record.erl
+++ b/lib/ssl/src/dtls_record.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2019. 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.
@@ -30,7 +30,7 @@
 -include("ssl_cipher.hrl").
 
 %% Handling of incoming data
--export([get_dtls_records/3,  init_connection_states/2, empty_connection_state/1]).
+-export([get_dtls_records/4,  init_connection_states/2, empty_connection_state/1]).
 
 -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]).
@@ -49,9 +49,8 @@
 	 is_acceptable_version/2, hello_version/2]).
 
 
--export_type([dtls_version/0, dtls_atom_version/0]).
+-export_type([dtls_atom_version/0]).
 
--type dtls_version()       :: ssl_record:ssl_version().
 -type dtls_atom_version()  :: dtlsv1 | 'dtlsv1.2'.
 
 -define(REPLAY_WINDOW_SIZE, 64).
@@ -135,7 +134,7 @@ set_connection_state_by_epoch(ReadState, Epoch, #{saved_read := #{epoch := Epoch
     States#{saved_read := ReadState}.
 
 %%--------------------------------------------------------------------
--spec init_connection_state_seq(dtls_version(), ssl_record:connection_states()) ->
+-spec init_connection_state_seq(ssl_record:ssl_version(), ssl_record:connection_states()) ->
 				       ssl_record:connection_state().
 %%
 %% Description: Copy the read sequence number to the write sequence number
@@ -163,32 +162,23 @@ current_connection_state_epoch(#{current_write := #{epoch := Epoch}},
     Epoch.
 
 %%--------------------------------------------------------------------
--spec get_dtls_records(binary(), [dtls_version()], binary()) -> {[binary()], binary()} | #alert{}.
+-spec get_dtls_records(binary(), {atom(), atom(), ssl_record:ssl_version(), [ssl_record:ssl_version()]}, binary(),
+                       #ssl_options{}) -> {[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, Versions, Buffer) ->
+get_dtls_records(Data, Vinfo, Buffer, SslOpts) ->
     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.
+    get_dtls_records_aux(Vinfo, BinData, [], SslOpts).
 
 %%====================================================================
 %% Encoding DTLS records
 %%====================================================================
 
 %%--------------------------------------------------------------------
--spec encode_handshake(iolist(), dtls_version(), integer(), ssl_record:connection_states()) ->
+-spec encode_handshake(iolist(), ssl_record:ssl_version(), integer(), ssl_record:connection_states()) ->
 			      {iolist(), ssl_record:connection_states()}.
 %
 %% Description: Encodes a handshake message to send on the ssl-socket.
@@ -198,7 +188,7 @@ encode_handshake(Frag, Version, Epoch, ConnectionStates) ->
 
 
 %%--------------------------------------------------------------------
--spec encode_alert_record(#alert{}, dtls_version(), ssl_record:connection_states()) ->
+-spec encode_alert_record(#alert{}, ssl_record:ssl_version(), ssl_record:connection_states()) ->
 				 {iolist(), ssl_record:connection_states()}.
 %%
 %% Description: Encodes an alert message to send on the ssl-socket.
@@ -210,7 +200,7 @@ encode_alert_record(#alert{level = Level, description = Description},
 		      ConnectionStates).
 
 %%--------------------------------------------------------------------
--spec encode_change_cipher_spec(dtls_version(), integer(), ssl_record:connection_states()) ->
+-spec encode_change_cipher_spec(ssl_record:ssl_version(), integer(), ssl_record:connection_states()) ->
 				       {iolist(), ssl_record:connection_states()}.
 %%
 %% Description: Encodes a change_cipher_spec-message to send on the ssl socket.
@@ -219,7 +209,7 @@ encode_change_cipher_spec(Version, Epoch, ConnectionStates) ->
     encode_plain_text(?CHANGE_CIPHER_SPEC, Version, Epoch, ?byte(?CHANGE_CIPHER_SPEC_PROTO), ConnectionStates).
 
 %%--------------------------------------------------------------------
--spec encode_data(binary(), dtls_version(), ssl_record:connection_states()) ->
+-spec encode_data(binary(), ssl_record:ssl_version(), ssl_record:connection_states()) ->
 			 {iolist(),ssl_record:connection_states()}.
 %%
 %% Description: Encodes data to send on the ssl-socket.
@@ -248,8 +238,8 @@ decode_cipher_text(#ssl_tls{epoch = Epoch} = CipherText, ConnnectionStates0) ->
 %%====================================================================
 
 %%--------------------------------------------------------------------
--spec protocol_version(dtls_atom_version() | dtls_version()) ->
-			      dtls_version() | dtls_atom_version().
+-spec protocol_version(dtls_atom_version() | ssl_record:ssl_version()) ->
+			      ssl_record:ssl_version() | dtls_atom_version().
 %%
 %% Description: Creates a protocol version record from a version atom
 %% or vice versa.
@@ -263,7 +253,7 @@ protocol_version({254, 253}) ->
 protocol_version({254, 255}) ->
     dtlsv1.
 %%--------------------------------------------------------------------
--spec lowest_protocol_version(dtls_version(), dtls_version()) -> dtls_version().
+-spec lowest_protocol_version(ssl_record:ssl_version(), ssl_record:ssl_version()) -> ssl_record:ssl_version().
 %%
 %% Description: Lowes protocol version of two given versions
 %%--------------------------------------------------------------------
@@ -277,7 +267,7 @@ lowest_protocol_version(_,Version) ->
     Version.
 
 %%--------------------------------------------------------------------
--spec lowest_protocol_version([dtls_version()]) -> dtls_version().
+-spec lowest_protocol_version([ssl_record:ssl_version()]) -> ssl_record:ssl_version().
 %%     
 %% Description: Lowest protocol version present in a list
 %%--------------------------------------------------------------------
@@ -288,7 +278,7 @@ lowest_protocol_version(Versions) ->
     lowest_list_protocol_version(Ver, Vers).
 
 %%--------------------------------------------------------------------
--spec highest_protocol_version([dtls_version()]) -> dtls_version().
+-spec highest_protocol_version([ssl_record:ssl_version()]) -> ssl_record:ssl_version().
 %%
 %% Description: Highest protocol version present in a list
 %%--------------------------------------------------------------------
@@ -299,7 +289,7 @@ highest_protocol_version(Versions) ->
     highest_list_protocol_version(Ver, Vers).
 
 %%--------------------------------------------------------------------
--spec highest_protocol_version(dtls_version(), dtls_version()) -> dtls_version().
+-spec highest_protocol_version(ssl_record:ssl_version(), ssl_record:ssl_version()) -> ssl_record:ssl_version().
 %%
 %% Description: Highest protocol version of two given versions
 %%--------------------------------------------------------------------
@@ -315,7 +305,7 @@ highest_protocol_version(_,Version) ->
     Version.
 
 %%--------------------------------------------------------------------
--spec is_higher(V1 :: dtls_version(), V2::dtls_version()) -> boolean().
+-spec is_higher(V1 :: ssl_record:ssl_version(), V2::ssl_record:ssl_version()) -> boolean().
 %%
 %% Description: Is V1 > V2
 %%--------------------------------------------------------------------
@@ -327,7 +317,7 @@ is_higher(_, _) ->
     false.
 
 %%--------------------------------------------------------------------
--spec supported_protocol_versions() -> [dtls_version()].
+-spec supported_protocol_versions() -> [ssl_record:ssl_version()].
 %%
 %% Description: Protocol versions supported
 %%--------------------------------------------------------------------
@@ -370,7 +360,7 @@ supported_protocol_versions([_|_] = Vsns) ->
     end.
 
 %%--------------------------------------------------------------------
--spec is_acceptable_version(dtls_version(), Supported :: [dtls_version()]) -> boolean().
+-spec is_acceptable_version(ssl_record:ssl_version(), Supported :: [ssl_record:ssl_version()]) -> boolean().
 %%
 %% Description: ssl version 2 is not acceptable security risks are too big.
 %%
@@ -378,7 +368,7 @@ supported_protocol_versions([_|_] = Vsns) ->
 is_acceptable_version(Version, Versions) ->
     lists:member(Version, Versions).
 
--spec hello_version(dtls_version(), [dtls_version()]) -> dtls_version().
+-spec hello_version(ssl_record:ssl_version(), [ssl_record:ssl_version()]) -> ssl_record:ssl_version().
 hello_version(Version, Versions) ->
     case dtls_v1:corresponding_tls_version(Version) of
         TLSVersion when TLSVersion >= {3, 3} ->
@@ -405,47 +395,49 @@ 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).
 
-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),
+get_dtls_records_aux({DataTag, StateName, _, Versions} = Vinfo, <<?BYTE(Type),?BYTE(MajVer),?BYTE(MinVer),
+                                                         ?UINT16(Epoch), ?UINT48(SequenceNumber),
+                                                         ?UINT16(Length), Data:Length/binary, Rest/binary>> = RawDTLSRecord,
+		     Acc, SslOpts) when ((StateName == hello) orelse
+                                         ((StateName == certify) andalso (DataTag == udp)) orelse
+                                         ((StateName == abbreviated) andalso(DataTag == udp))) 
+                                        andalso
+                                        ((Type == ?HANDSHAKE) orelse
+                                         (Type == ?ALERT)) ->
+    ssl_logger:debug(SslOpts#ssl_options.log_level, inbound, 'record', [RawDTLSRecord]),
+    case is_acceptable_version({MajVer, MinVer}, Versions) of
+        true ->
+            get_dtls_records_aux(Vinfo, Rest, [#ssl_tls{type = Type,
+                                                 version = {MajVer, MinVer},
+                                                 epoch = Epoch, sequence_number = SequenceNumber,
+                                                 fragment = Data} | Acc], SslOpts);
+        false ->
+              ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC)
+        end;
+get_dtls_records_aux({_, _, Version, _} = Vinfo, <<?BYTE(Type),?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(<<?BYTE(_), ?BYTE(_MajVer), ?BYTE(_MinVer),
+		       ?UINT16(Length), Data:Length/binary, Rest/binary>> = RawDTLSRecord,
+		     Acc, SslOpts) when (Type == ?APPLICATION_DATA) orelse
+                                        (Type == ?HANDSHAKE) orelse
+                                        (Type == ?ALERT) orelse
+                                        (Type == ?CHANGE_CIPHER_SPEC) ->
+    ssl_logger:debug(SslOpts#ssl_options.log_level, inbound, 'record', [RawDTLSRecord]),
+    case {MajVer, MinVer} of
+        Version ->
+            get_dtls_records_aux(Vinfo, Rest, [#ssl_tls{type = Type,
+                                                 version = {MajVer, MinVer},
+                                                 epoch = Epoch, sequence_number = SequenceNumber,
+                                                 fragment = Data} | Acc], SslOpts);
+        _ ->
+            ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC)
+    end;
+get_dtls_records_aux(_, <<?BYTE(_), ?BYTE(_MajVer), ?BYTE(_MinVer),
 		       ?UINT16(Length), _/binary>>,
-		     _Acc) when Length > ?MAX_CIPHER_TEXT_LENGTH ->
+		     _Acc, _) when Length > ?MAX_CIPHER_TEXT_LENGTH ->
     ?ALERT_REC(?FATAL, ?RECORD_OVERFLOW);
 
-get_dtls_records_aux(Data, Acc) ->
+get_dtls_records_aux(_, Data, Acc, _) ->
     case size(Data) =< ?MAX_CIPHER_TEXT_LENGTH + ?INITIAL_BYTES of
 	true ->
 	    {lists:reverse(Acc), Data};
@@ -547,15 +539,15 @@ decode_cipher_text(#ssl_tls{type = Type, version = Version,
 			    compression_algorithm = CompAlg}} = ReadState0, 
 		   ConnnectionStates0) ->
     AAD = start_additional_data(Type, Version, Epoch, Seq),
-    CipherS1 = ssl_record:nonce_seed(BulkCipherAlgo, <<?UINT16(Epoch), ?UINT48(Seq)>>, CipherS0),
+    CipherS = ssl_record:nonce_seed(BulkCipherAlgo, <<?UINT16(Epoch), ?UINT48(Seq)>>, CipherS0),
     TLSVersion = dtls_v1:corresponding_tls_version(Version),
-    case  ssl_record:decipher_aead(BulkCipherAlgo, CipherS1, AAD, CipherFragment, TLSVersion) of
-	{PlainFragment, CipherState} ->
-	    {Plain, CompressionS1} = ssl_record:uncompress(CompAlg,
+    case ssl_record:decipher_aead(BulkCipherAlgo, CipherS, AAD, CipherFragment, TLSVersion) of
+	PlainFragment when is_binary(PlainFragment) ->
+	    {Plain, CompressionS} = ssl_record:uncompress(CompAlg,
 							   PlainFragment, CompressionS0),
-	    ReadState0 = ReadState0#{compression_state => CompressionS1,
-                                    cipher_state => CipherState},
-            ReadState = update_replay_window(Seq, ReadState0),
+	    ReadState1 = ReadState0#{compression_state := CompressionS,
+                                     cipher_state := CipherS},
+            ReadState = update_replay_window(Seq, ReadState1),
 	    ConnnectionStates = set_connection_state_by_epoch(ReadState, Epoch, ConnnectionStates0, read),
 	    {CipherText#ssl_tls{fragment = Plain}, ConnnectionStates};
 	  #alert{} = Alert ->
diff --git a/lib/ssl/src/dtls_socket.erl b/lib/ssl/src/dtls_socket.erl
index 2001afd02f..b305d08f70 100644
--- a/lib/ssl/src/dtls_socket.erl
+++ b/lib/ssl/src/dtls_socket.erl
@@ -38,12 +38,14 @@ listen(Port, #config{transport_info = TransportInfo,
     case dtls_listener_sup:start_child([Port, TransportInfo, emulated_socket_options(EmOpts, #socket_options{}), 
 				   Options ++ internal_inet_values(), SslOpts]) of
 	{ok, Pid} ->
-	    {ok, #sslsocket{pid = {dtls, Config#config{dtls_handler = {Pid, Port}}}}};
+        Socket = #sslsocket{pid = {dtls, Config#config{dtls_handler = {Pid, Port}}}},
+        check_active_n(EmOpts, Socket),
+	    {ok, Socket};
 	Err = {error, _} ->
 	    Err
     end.
 
-accept(dtls, #config{transport_info = {Transport,_,_,_},
+accept(dtls, #config{transport_info = {Transport,_,_,_,_},
 		    connection_cb = ConnectionCb,
 		    dtls_handler = {Listner, _}}, _Timeout) -> 
     case dtls_packet_demux:accept(Listner, self()) of
@@ -53,7 +55,7 @@ accept(dtls, #config{transport_info = {Transport,_,_,_},
 	    {error, Reason}
     end.
 
-connect(Address, Port, #config{transport_info = {Transport, _, _, _} = CbInfo,
+connect(Address, Port, #config{transport_info = {Transport, _, _, _, _} = CbInfo,
 				connection_cb = ConnectionCb,
 				ssl = SslOpts,
 				emulated = EmOpts,
@@ -81,8 +83,9 @@ socket(Pids, Transport, Socket, ConnectionCb) ->
     #sslsocket{pid = Pids, 
 	       %% "The name "fd" is keept for backwards compatibility
 	       fd = {Transport, Socket, ConnectionCb}}.
-setopts(_, #sslsocket{pid = {dtls, #config{dtls_handler = {ListenPid, _}}}}, Options) ->
-    SplitOpts = tls_socket:split_options(Options),
+setopts(_, Socket = #sslsocket{pid = {dtls, #config{dtls_handler = {ListenPid, _}}}}, Options) ->
+    SplitOpts = {_, EmOpts} = tls_socket:split_options(Options),
+    check_active_n(EmOpts, Socket),
     dtls_packet_demux:set_sock_opts(ListenPid, SplitOpts);
 %%% Following clauses will not be called for emulated options, they are  handled in the connection process
 setopts(gen_udp, Socket, Options) ->
@@ -90,6 +93,32 @@ setopts(gen_udp, Socket, Options) ->
 setopts(Transport, Socket, Options) ->
     Transport:setopts(Socket, Options).
 
+check_active_n(EmulatedOpts, Socket = #sslsocket{pid = {dtls, #config{dtls_handler = {ListenPid, _}}}}) ->
+    %% We check the resulting options to send an ssl_passive message if necessary.
+    case proplists:lookup(active, EmulatedOpts) of
+        %% The provided value is out of bound.
+        {_, N} when is_integer(N), N < -32768 ->
+            throw(einval);
+        {_, N} when is_integer(N), N > 32767 ->
+            throw(einval);
+        {_, N} when is_integer(N) ->
+            {ok, #socket_options{active = Active}, _} = dtls_packet_demux:get_all_opts(ListenPid),
+            case Active of
+                Atom when is_atom(Atom), N =< 0 ->
+                    self() ! {ssl_passive, Socket};
+                %% The result of the addition is out of bound.
+                %% We do not need to check < -32768 because Active can't be below 1.
+                A when is_integer(A), A + N > 32767 ->
+                    throw(einval);
+                A when is_integer(A), A + N =< 0 ->
+                    self() ! {ssl_passive, Socket};
+                _ ->
+                    ok
+            end;
+        _ ->
+            ok
+    end.
+
 getopts(_, #sslsocket{pid = {dtls, #config{dtls_handler = {ListenPid, _}}}}, Options) ->
     SplitOpts = tls_socket:split_options(Options),
     dtls_packet_demux:get_sock_opts(ListenPid, SplitOpts);
@@ -145,7 +174,7 @@ default_inet_values() ->
     [{active, true}, {mode, list}, {packet, 0}, {packet_size, 0}].
 
 default_cb_info() ->
-    {gen_udp, udp, udp_closed, udp_error}.
+    {gen_udp, udp, udp_closed, udp_error, udp_passive}.
 
 get_emulated_opts(EmOpts, EmOptNames) -> 
     lists:map(fun(Name) -> {value, Value} = lists:keysearch(Name, 1, EmOpts),
@@ -161,9 +190,18 @@ emulated_socket_options(InetValues, #socket_options{
        mode   = proplists:get_value(mode, InetValues, Mode),
        packet = proplists:get_value(packet, InetValues, Packet),
        packet_size = proplists:get_value(packet_size, InetValues, PacketSize),
-       active = proplists:get_value(active, InetValues, Active)
+       active = emulated_active_option(InetValues, Active)
       }.
 
+emulated_active_option([], Active) ->
+    Active;
+emulated_active_option([{active, Active} | _], _) when Active =< 0 ->
+    false;
+emulated_active_option([{active, Active} | _], _) ->
+    Active;
+emulated_active_option([_|Tail], Active) ->
+    emulated_active_option(Tail, Active).
+
 emulated_options([{mode, Value} = Opt |Opts], Inet, Emulated) ->
     validate_inet_option(mode, Value),
     emulated_options(Opts, Inet, [Opt | proplists:delete(mode, Emulated)]);
@@ -185,6 +223,9 @@ validate_inet_option(mode, Value)
   when Value =/= list, Value =/= binary ->
     throw({error, {options, {mode,Value}}});
 validate_inet_option(active, Value)
+  when Value >= -32768, Value =< 32767 ->
+    ok;
+validate_inet_option(active, Value)
   when Value =/= true, Value =/= false, Value =/= once ->
     throw({error, {options, {active,Value}}});
 validate_inet_option(_, _) ->
diff --git a/lib/ssl/src/dtls_v1.erl b/lib/ssl/src/dtls_v1.erl
index b365961a6a..fc9dce02ce 100644
--- a/lib/ssl/src/dtls_v1.erl
+++ b/lib/ssl/src/dtls_v1.erl
@@ -31,18 +31,18 @@
 
 suites(Minor) ->
     lists:filter(fun(Cipher) -> 
-                         is_acceptable_cipher(ssl_cipher_format:suite_definition(Cipher)) 
+                         is_acceptable_cipher(ssl_cipher_format:suite_bin_to_map(Cipher)) 
                  end,
                  tls_v1:suites(corresponding_minor_tls_version(Minor))).
 all_suites(Version) ->
     lists:filter(fun(Cipher) -> 
-                         is_acceptable_cipher(ssl_cipher_format:suite_definition(Cipher)) 
+                         is_acceptable_cipher(ssl_cipher_format:suite_bin_to_map(Cipher)) 
                  end,
                  ssl_cipher:all_suites(corresponding_tls_version(Version))).
 
 anonymous_suites(Version) ->
     lists:filter(fun(Cipher) -> 
-                         is_acceptable_cipher(ssl_cipher_format:suite_definition(Cipher)) 
+                         is_acceptable_cipher(ssl_cipher_format:suite_bin_to_map(Cipher)) 
                  end, 
                  ssl_cipher:anonymous_suites(corresponding_tls_version(Version))).
                  
diff --git a/lib/ssl/src/inet_tls_dist.erl b/lib/ssl/src/inet_tls_dist.erl
index a4f8bb7562..8d9b92361b 100644
--- a/lib/ssl/src/inet_tls_dist.erl
+++ b/lib/ssl/src/inet_tls_dist.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2019. 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 @@
 -include_lib("public_key/include/public_key.hrl").
 
 -include("ssl_api.hrl").
+-include_lib("kernel/include/logger.hrl").
 
 %% -------------------------------------------------------------------------
 
@@ -131,8 +132,8 @@ f_recv(SslSocket, Length, Timeout) ->
 f_setopts_pre_nodeup(_SslSocket) ->
     ok.
 
-f_setopts_post_nodeup(_SslSocket) ->
-    ok.
+f_setopts_post_nodeup(SslSocket) ->
+    ssl:setopts(SslSocket, [nodelay()]).
 
 f_getll(DistCtrl) ->
     {ok, DistCtrl}.
@@ -198,7 +199,7 @@ listen(Name) ->
 gen_listen(Driver, Name) ->
     case inet_tcp_dist:gen_listen(Driver, Name) of
         {ok, {Socket, Address, Creation}} ->
-            inet:setopts(Socket, [{packet, 4}]),
+            inet:setopts(Socket, [{packet, 4}, {nodelay, true}]),
             {ok, {Socket, Address#net_address{protocol=tls}, Creation}};
         Other ->
             Other
@@ -225,7 +226,7 @@ accept_loop(Driver, Listen, Kernel) ->
                 true ->
                     accept_loop(Driver, Listen, Kernel, Socket);
                 {false,IP} ->
-		    error_logger:error_msg(
+		    ?LOG_ERROR(
                       "** Connection attempt from "
                       "disallowed IP ~w ** ~n", [IP]),
 		    ?shutdown2(no_node, trace({disallowed, IP}))
@@ -260,7 +261,7 @@ accept_loop(Driver, Listen, Kernel, Socket) ->
         {error, {options, _}} = Error ->
             %% Bad options: that's probably our fault.
             %% Let's log that.
-            error_logger:error_msg(
+            ?LOG_ERROR(
               "Cannot accept TLS distribution connection: ~s~n",
               [ssl:format_error(Error)]),
             gen_tcp:close(Socket),
@@ -436,7 +437,7 @@ allowed_nodes(SslSocket, Allowed) ->
                           PeerCert, allowed_hosts(Allowed), PeerIP)
                     of
                         [] ->
-                            error_logger:error_msg(
+                            ?LOG_ERROR(
                               "** Connection attempt from "
                               "disallowed node(s) ~p ** ~n", [PeerIP]),
                             ?shutdown2(
@@ -480,22 +481,25 @@ allowed_nodes(PeerCert, Allowed, PeerIP, Node, Host) ->
             allowed_nodes(PeerCert, Allowed, PeerIP)
     end.
 
-
-
 setup(Node, Type, MyNode, LongOrShortNames, SetupTime) ->
     gen_setup(inet_tcp, Node, Type, MyNode, LongOrShortNames, SetupTime).
 
 gen_setup(Driver, Node, Type, MyNode, LongOrShortNames, SetupTime) ->
     Kernel = self(),
     monitor_pid(
-      spawn_opt(
-        fun() ->
-                do_setup(
-                  Driver, Kernel, Node, Type,
-                  MyNode, LongOrShortNames, SetupTime)
-        end,
-        [link, {priority, max}])).
+      spawn_opt(setup_fun(Driver, Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime),
+                [link, {priority, max}])).
+
+-spec setup_fun(_,_,_,_,_,_,_) -> fun(() -> no_return()).
+setup_fun(Driver, Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) ->
+    fun() ->
+            do_setup(
+              Driver, Kernel, Node, Type,
+              MyNode, LongOrShortNames, SetupTime)
+    end.
 
+
+-spec do_setup(_,_,_,_,_,_,_) -> no_return().
 do_setup(Driver, Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) ->
     {Name, Address} = split_node(Driver, Node, LongOrShortNames),
     ErlEpmd = net_kernel:epmd_module(),
@@ -520,13 +524,15 @@ do_setup(Driver, Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) ->
                trace({getaddr_failed, Driver, Address, Other}))
     end.
 
+-spec do_setup_connect(_,_,_,_,_,_,_,_,_,_) -> no_return().
+
 do_setup_connect(Driver, Kernel, Node, Address, Ip, TcpPort, Version, Type, MyNode, Timer) ->
     Opts =  trace(connect_options(get_ssl_options(client))),
     dist_util:reset_timer(Timer),
     case ssl:connect(
         Address, TcpPort,
         [binary, {active, false}, {packet, 4},
-            Driver:family(), nodelay()] ++ Opts,
+            Driver:family(), {nodelay, true}] ++ Opts,
         net_kernel:connecttime()) of
     {ok, #sslsocket{pid = [_, DistCtrl| _]} = SslSocket} ->
             _ = monitor_pid(DistCtrl),
@@ -564,7 +570,7 @@ gen_close(Driver, Socket) ->
 %% Determine if EPMD module supports address resolving. Default
 %% is to use inet_tcp:getaddr/2.
 %% ------------------------------------------------------------
-get_address_resolver(EpmdModule, Driver) ->
+get_address_resolver(EpmdModule, _Driver) ->
     case erlang:function_exported(EpmdModule, address_please, 3) of
         true -> {EpmdModule, address_please};
         _    -> {erl_epmd, address_please}
@@ -690,12 +696,12 @@ split_node(Driver, Node, LongOrShortNames) ->
         {node, Name, Host} ->
 	    check_node(Driver, Node, Name, Host, LongOrShortNames);
 	{host, _} ->
-	    error_logger:error_msg(
+	    ?LOG_ERROR(
               "** Nodename ~p illegal, no '@' character **~n",
               [Node]),
 	    ?shutdown2(Node, trace({illegal_node_n@me, Node}));
 	_ ->
-	    error_logger:error_msg(
+	    ?LOG_ERROR(
               "** Nodename ~p illegal **~n", [Node]),
 	    ?shutdown2(Node, trace({illegal_node_name, Node}))
     end.
@@ -707,7 +713,7 @@ check_node(Driver, Node, Name, Host, LongOrShortNames) ->
 		{ok, _} ->
 		    {Name, Host};
 		_ ->
-		    error_logger:error_msg(
+		    ?LOG_ERROR(
                       "** System running to use "
                       "fully qualified hostnames **~n"
                       "** Hostname ~s is illegal **~n",
@@ -715,7 +721,7 @@ check_node(Driver, Node, Name, Host, LongOrShortNames) ->
 		    ?shutdown2(Node, trace({not_longnames, Host}))
 	    end;
 	[_,_|_] when LongOrShortNames =:= shortnames ->
-	    error_logger:error_msg(
+	    ?LOG_ERROR(
               "** System NOT running to use "
               "fully qualified hostnames **~n"
               "** Hostname ~s is illegal **~n",
@@ -845,13 +851,13 @@ monitor_pid(Pid) ->
     %%          MRef = erlang:monitor(process, Pid),
     %%          receive
     %%              {'DOWN', MRef, _, _, normal} ->
-    %%                  error_logger:error_report(
-    %%                    [dist_proc_died,
+    %%                  ?LOG_ERROR(
+    %%                    [{slogan, dist_proc_died},
     %%                     {reason, normal},
     %%                     {pid, Pid}]);
     %%              {'DOWN', MRef, _, _, Reason} ->
-    %%                  error_logger:info_report(
-    %%                    [dist_proc_died,
+    %%                  ?LOG_NOTICE(
+    %%                    [{slogan, dist_proc_died},
     %%                     {reason, Reason},
     %%                     {pid, Pid}])
     %%          end
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src
index 936df12e70..e7a4d73ec4 100644
--- a/lib/ssl/src/ssl.app.src
+++ b/lib/ssl/src/ssl.app.src
@@ -4,13 +4,17 @@
     {modules, [
 	       %% TLS/SSL 
 	       tls_connection,
+	       tls_connection_1_3,
 	       tls_handshake,
+	       tls_handshake_1_3,
 	       tls_record,
+	       tls_record_1_3,
 	       tls_socket,
 	       tls_v1,
 	       ssl_v3,
 	       tls_connection_sup,
 	       tls_sender,
+	       ssl_dh_groups,
 	       %% DTLS
 	       dtls_connection,
 	       dtls_handshake,
@@ -51,6 +55,8 @@
 	       ssl_crl_cache, 
 	       ssl_crl_cache_api,
 	       ssl_crl_hash_dir,
+	       %% Logging
+	       ssl_logger,
 	       %% App structure
 	       ssl_app,
 	       ssl_sup,
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 03a1e40bfc..7ff9aed8ea 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2019. 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,42 +35,424 @@
 -include("ssl_srp.hrl").
 
 %% Application handling
--export([start/0, start/1, stop/0, clear_pem_cache/0]).
+-export([start/0, 
+         start/1, 
+         stop/0, 
+         clear_pem_cache/0]).
 
 %% Socket handling
--export([connect/3, connect/2, connect/4,
-	 listen/2, transport_accept/1, transport_accept/2,
-	 handshake/1, handshake/2, handshake/3, handshake_continue/2,
-         handshake_continue/3, handshake_cancel/1,
-         ssl_accept/1, ssl_accept/2, ssl_accept/3,
-	 controlling_process/2, peername/1, peercert/1, sockname/1,
-	 close/1, close/2, shutdown/2, recv/2, recv/3, send/2,
-	 getopts/2, setopts/2, getstat/1, getstat/2
+-export([connect/3, 
+         connect/2, 
+         connect/4,
+	 listen/2, 
+         transport_accept/1, 
+         transport_accept/2,
+	 handshake/1, 
+         handshake/2, 
+         handshake/3, 
+         handshake_continue/2,
+         handshake_continue/3, 
+         handshake_cancel/1,
+         ssl_accept/1, 
+         ssl_accept/2, 
+         ssl_accept/3,
+	 controlling_process/2, 
+         peername/1, 
+         peercert/1, 
+         sockname/1,
+	 close/1, 
+         close/2, 
+         shutdown/2, 
+         recv/2, 
+         recv/3, 
+         send/2,
+	 getopts/2, 
+         setopts/2, 
+         getstat/1, 
+         getstat/2
 	]).
 
 %% SSL/TLS protocol handling
--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]).
+-export([cipher_suites/0, 
+         cipher_suites/1, 
+         cipher_suites/2, 
+         cipher_suites/3,
+         filter_cipher_suites/2,
+         prepend_cipher_suites/2, 
+         append_cipher_suites/2,
+         eccs/0, 
+         eccs/1, 
+         versions/0, 
+         groups/0, 
+         groups/1,
+         format_error/1, 
+         renegotiate/1, 
+         prf/5, 
+         negotiated_protocol/1, 
+	 connection_information/1, 
+         connection_information/2]).
 %% Misc
--export([handle_options/2, tls_version/1, new_ssl_options/3, suite_to_str/1]).
+-export([handle_options/2, 
+         tls_version/1, 
+         new_ssl_options/3, 
+         suite_to_str/1,
+         suite_to_openssl_str/1,
+         str_to_suite/1]).
 
 -deprecated({ssl_accept, 1, eventually}).
 -deprecated({ssl_accept, 2, eventually}).
 -deprecated({ssl_accept, 3, eventually}).
 
+-export_type([socket/0,
+              sslsocket/0,
+              socket_option/0,
+              active_msgs/0,
+              host/0,
+              tls_option/0,              
+              tls_client_option/0,
+              tls_server_option/0,                            
+              erl_cipher_suite/0,
+              old_cipher_suite/0,
+              ciphers/0,             
+              cipher/0,
+              hash/0,
+              key/0,
+              kex_algo/0,
+              prf_random/0, 
+              cipher_filters/0,
+              sign_algo/0,
+              protocol_version/0,
+              protocol_extensions/0,
+              session_id/0,
+              error_alert/0,
+              tls_alert/0,
+              srp_param_type/0,
+              named_curve/0,
+              sign_scheme/0,
+              group/0]).
+
+%% -------------------------------------------------------------------------------------------------------
+
+-type socket()                   :: gen_tcp:socket(). % exported
+-type socket_option()            :: gen_tcp:connect_option() | gen_tcp:listen_option() | gen_udp:option(). % exported
+-type sslsocket()                :: any(). % exported
+-type tls_option()               :: tls_client_option() | tls_server_option(). % exported
+-type tls_client_option()        :: client_option() | common_option() | socket_option() |  transport_option(). % exported
+-type tls_server_option()        :: server_option() | common_option() | socket_option() | transport_option(). % exported
+-type active_msgs()              :: {ssl, sslsocket(), Data::binary() | list()} | {ssl_closed, sslsocket()} |
+                                    {ssl_error, sslsocket(), Reason::any()} | {ssl_passive, sslsocket()}. % exported
+-type transport_option()         :: {cb_info, {CallbackModule::atom(), DataTag::atom(),
+                                               ClosedTag::atom(), ErrTag::atom()}} |  
+                                    {cb_info, {CallbackModule::atom(), DataTag::atom(),
+                                               ClosedTag::atom(), ErrTag::atom(), PassiveTag::atom()}}.
+-type host()                     :: hostname() | ip_address(). % exported
+-type hostname()                 :: string().
+-type ip_address()               :: inet:ip_address().
+-type session_id()               :: binary(). % exported
+-type protocol_version()         :: tls_version() | dtls_version(). % exported
+-type tls_version()              :: 'tlsv1.2' | 'tlsv1.3' | tls_legacy_version().
+-type dtls_version()             :: 'dtlsv1.2' | dtls_legacy_version().
+-type tls_legacy_version()       ::  tlsv1 | 'tlsv1.1' | sslv3.
+-type dtls_legacy_version()      :: 'dtlsv1'.
+-type verify_type()              :: verify_none | verify_peer.
+-type cipher()                   :: aes_128_cbc |
+                                    aes_256_cbc |
+                                    aes_128_gcm |
+                                    aes_256_gcm |
+                                    aes_128_ccm |
+                                    aes_256_ccm |
+                                    aes_128_ccm_8 |
+                                    aes_256_ccm_8 |                                    
+                                    chacha20_poly1305 |
+                                    legacy_cipher(). % exported
+-type legacy_cipher()            ::  rc4_128 |
+                                     des_cbc |
+                                     '3des_ede_cbc'.
+
+-type hash()                     :: sha |
+                                    sha2() |
+                                    legacy_hash(). % exported
+
+-type sha2()                    ::  sha224 |
+                                    sha256 |
+                                    sha384 |
+                                    sha512.
+
+-type legacy_hash()             :: md5.
+
+-type sign_algo()               :: rsa | dsa | ecdsa. % exported
+
+-type sign_scheme()             :: rsa_pkcs1_sha256 
+                                 | rsa_pkcs1_sha384
+                                 | rsa_pkcs1_sha512
+                                 | ecdsa_secp256r1_sha256
+                                 | ecdsa_secp384r1_sha384
+                                 | ecdsa_secp521r1_sha512
+                                 | rsa_pss_rsae_sha256
+                                 | rsa_pss_rsae_sha384
+                                 | rsa_pss_rsae_sha512
+                                 | rsa_pss_pss_sha256
+                                 | rsa_pss_pss_sha384
+                                 | rsa_pss_pss_sha512
+                                 | rsa_pkcs1_sha1
+                                 | ecdsa_sha1. % exported
+
+-type kex_algo()                :: 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 |
+                                   any. %% TLS 1.3 , exported
+-type erl_cipher_suite()       :: #{key_exchange := kex_algo(),
+                                    cipher := cipher(),
+                                    mac    := hash() | aead,
+                                    prf    := hash() | default_prf %% Old cipher suites, version dependent
+                                   }.  
+
+-type old_cipher_suite() :: {kex_algo(), cipher(), hash()} % Pre TLS 1.2 
+                             %% TLS 1.2, internally PRE TLS 1.2 will use default_prf
+                           | {kex_algo(), cipher(), hash() | aead, hash()}. 
+
+-type named_curve()           :: sect571r1 |
+                                 sect571k1 |
+                                 secp521r1 |
+                                 brainpoolP512r1 |
+                                 sect409k1 |
+                                 sect409r1 |
+                                 brainpoolP384r1 |
+                                 secp384r1 |
+                                 sect283k1 |
+                                 sect283r1 |
+                                 brainpoolP256r1 |
+                                 secp256k1 |
+                                 secp256r1 |
+                                 sect239k1 |
+                                 sect233k1 |
+                                 sect233r1 |
+                                 secp224k1 |
+                                 secp224r1 |
+                                 sect193r1 |
+                                 sect193r2 |
+                                 secp192k1 |
+                                 secp192r1 |
+                                 sect163k1 |
+                                 sect163r1 |
+                                 sect163r2 |
+                                 secp160k1 |
+                                 secp160r1 |
+                                 secp160r2. % exported
+
+-type group() :: secp256r1 | secp384r1 | secp521r1 | ffdhe2048 |
+                 ffdhe3072 | ffdhe4096 | ffdhe6144 | ffdhe8192. % exported
+
+-type srp_param_type()        :: srp_1024 |
+                                 srp_1536 |
+                                 srp_2048 |
+                                 srp_3072 |
+                                 srp_4096 |
+                                 srp_6144 |
+                                 srp_8192. % exported
+
+-type error_alert()           :: {tls_alert, {tls_alert(), Description::string()}}. % exported
+
+-type tls_alert()             :: close_notify | 
+                                 unexpected_message | 
+                                 bad_record_mac | 
+                                 record_overflow | 
+                                 handshake_failure |
+                                 bad_certificate | 
+                                 unsupported_certificate | 
+                                 certificate_revoked | 
+                                 certificate_expired | 
+                                 certificate_unknown |
+                                 illegal_parameter | 
+                                 unknown_ca | 
+                                 access_denied | 
+                                 decode_error | 
+                                 decrypt_error | 
+                                 export_restriction| 
+                                 protocol_version |
+                                 insufficient_security |
+                                 internal_error |
+                                 inappropriate_fallback |
+                                 user_canceled |
+                                 no_renegotiation |
+                                 unsupported_extension |
+                                 certificate_unobtainable |
+                                 unrecognized_name |
+                                 bad_certificate_status_response |
+                                 bad_certificate_hash_value |
+                                 unknown_psk_identity |
+                                 no_application_protocol. % exported
+
+%% -------------------------------------------------------------------------------------------------------
+-type common_option()        :: {protocol, protocol()} |
+                                {handshake, handshake_completion()} |
+                                {cert, cert()} |
+                                {certfile, cert_pem()} |
+                                {key, key()} |
+                                {keyfile, key_pem()} |
+                                {password, key_password()} |
+                                {ciphers, cipher_suites()} |
+                                {eccs, [named_curve()]} |
+                                {signature_algs_cert, signature_schemes()} |
+                                {supported_groups, supported_groups()} |
+                                {secure_renegotiate, secure_renegotiation()} |
+                                {depth, allowed_cert_chain_length()} |
+                                {verify_fun, custom_verify()} |
+                                {crl_check, crl_check()} |
+                                {crl_cache, crl_cache_opts()} |
+                                {max_handshake_size, handshake_size()} |
+                                {partial_chain, root_fun()} |
+                                {versions, protocol_versions()} |
+                                {user_lookup_fun, custom_user_lookup()} |
+                                {log_level, logging_level()} |
+                                {log_alert, log_alert()} |
+                                {hibernate_after, hibernate_after()} |
+                                {padding_check, padding_check()} |
+                                {beast_mitigation, beast_mitigation()} |
+                                {ssl_imp, ssl_imp()}.
+
+-type protocol()                  :: tls | dtls.
+-type handshake_completion()      :: hello | full.
+-type cert()                      :: public_key:der_encoded().
+-type cert_pem()                  :: file:filename().
+-type 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()}. % exported
+-type key_pem()                   :: file:filename().
+-type key_password()              :: string().
+-type cipher_suites()             :: ciphers().    
+-type ciphers()                   :: [erl_cipher_suite()] |
+                                     string(). % (according to old API) exported
+-type cipher_filters()            :: list({key_exchange | cipher | mac | prf,
+                                        algo_filter()}). % exported
+-type algo_filter()               :: fun((kex_algo()|cipher()|hash()|aead|default_prf) -> true | false).
+-type secure_renegotiation()      :: boolean(). 
+-type allowed_cert_chain_length() :: integer().
+
+-type custom_verify()               ::  {Verifyfun :: fun(), InitialUserState :: any()}.
+-type crl_check()                :: boolean() | peer | best_effort.
+-type crl_cache_opts()           :: [any()].
+-type handshake_size()           :: integer().
+-type hibernate_after()          :: timeout().
+-type root_fun()                 ::  fun().
+-type protocol_versions()        ::  [protocol_version()].
+-type signature_algs()           ::  [{hash(), sign_algo()}].
+-type signature_schemes()        ::  [sign_scheme()].
+-type supported_groups()         ::  [group()].
+-type custom_user_lookup()       ::  {Lookupfun :: fun(), UserState :: any()}.
+-type padding_check()            :: boolean(). 
+-type beast_mitigation()         :: one_n_minus_one | zero_n | disabled.
+-type srp_identity()             :: {Username :: string(), Password :: string()}.
+-type psk_identity()             :: string().
+-type log_alert()                :: boolean().
+-type logging_level()            :: logger:level().
+
+%% -------------------------------------------------------------------------------------------------------
+
+-type client_option()        :: {verify, client_verify_type()} |
+                                {reuse_session, client_reuse_session()} |
+                                {reuse_sessions, client_reuse_sessions()} |
+                                {cacerts, client_cacerts()} |
+                                {cacertfile, client_cafile()} |
+                                {alpn_advertised_protocols, client_alpn()} |
+                                {client_preferred_next_protocols, client_preferred_next_protocols()} |
+                                {psk_identity, client_psk_identity()} |
+                                {srp_identity, client_srp_identity()} |
+                                {server_name_indication, sni()} |
+                                {customize_hostname_check, customize_hostname_check()} |
+                                {signature_algs, client_signature_algs()} |                                    
+                                {fallback, fallback()}.
+
+-type client_verify_type()       :: verify_type().
+-type client_reuse_session()     :: session_id().
+-type client_reuse_sessions()    :: boolean() | save.
+-type client_cacerts()           :: [public_key:der_encoded()].
+-type client_cafile()            :: file:filename().
+-type app_level_protocol()       :: binary().
+-type client_alpn()              :: [app_level_protocol()].
+-type client_preferred_next_protocols() :: {Precedence :: server | client, 
+                                            ClientPrefs :: [app_level_protocol()]} |
+                                           {Precedence :: server | client, 
+                                            ClientPrefs :: [app_level_protocol()], 
+                                            Default::app_level_protocol()}.
+-type client_psk_identity()             :: psk_identity().
+-type client_srp_identity()             :: srp_identity().
+-type customize_hostname_check() :: list().
+-type sni()                      :: HostName :: hostname() | disable. 
+-type client_signature_algs()    :: signature_algs().
+-type fallback()                 :: boolean().
+-type ssl_imp()                  :: new | old.
+
+%% -------------------------------------------------------------------------------------------------------
+
+-type server_option()        :: {cacerts, server_cacerts()} |
+                                {cacertfile, server_cafile()} |
+                                {dh, dh_der()} |
+                                {dhfile, dh_file()} |
+                                {verify, server_verify_type()} |
+                                {fail_if_no_peer_cert, fail_if_no_peer_cert()} |
+                                {reuse_sessions, server_reuse_sessions()} |
+                                {reuse_session, server_reuse_session()} |
+                                {alpn_preferred_protocols, server_alpn()} |
+                                {next_protocols_advertised, server_next_protocol()} |
+                                {psk_identity, server_psk_identity()} |
+                                {honor_cipher_order, boolean()} |
+                                {sni_hosts, sni_hosts()} |
+                                {sni_fun, sni_fun()} |
+                                {honor_cipher_order, honor_cipher_order()} |
+                                {honor_ecc_order, honor_ecc_order()} |
+                                {client_renegotiation, client_renegotiation()}|
+                                {signature_algs, server_signature_algs()}.
+
+-type server_cacerts()           :: [public_key:der_encoded()].
+-type server_cafile()            :: file:filename().
+-type server_alpn()              :: [app_level_protocol()].
+-type server_next_protocol()     :: [app_level_protocol()].
+-type server_psk_identity()      :: psk_identity().
+-type dh_der()                   :: binary().
+-type dh_file()                  :: file:filename().
+-type server_verify_type()       :: verify_type().
+-type fail_if_no_peer_cert()     :: boolean().
+-type server_signature_algs()    :: signature_algs().
+-type server_reuse_session()     :: fun().
+-type server_reuse_sessions()    :: boolean().
+-type sni_hosts()                :: [{hostname(), [server_option() | common_option()]}].
+-type sni_fun()                  :: fun().
+-type honor_cipher_order()       :: boolean().
+-type honor_ecc_order()          :: boolean().
+-type client_renegotiation()     :: boolean().
+%% -------------------------------------------------------------------------------------------------------
+-type prf_random() :: client_random | server_random. % exported
+-type protocol_extensions()  :: #{renegotiation_info => binary(),
+                                  signature_algs => signature_algs(),
+                                  alpn =>  app_level_protocol(),
+                                  srp  => binary(),
+                                  next_protocol => app_level_protocol(),
+                                  ec_point_formats  => [0..2],
+                                  elliptic_curves => [public_key:oid()],
+                                  sni => hostname()}. % exported
+%% -------------------------------------------------------------------------------------------------------
+
+%%%--------------------------------------------------------------------
+%%% API
+%%%--------------------------------------------------------------------
+
 %%--------------------------------------------------------------------
--spec start() -> ok  | {error, reason()}.
--spec start(permanent | transient | temporary) -> ok | {error, reason()}.
 %%
 %% Description: Utility function that starts the ssl and applications
 %% that it depends on.
 %% see application(3)
 %%--------------------------------------------------------------------
+-spec start() -> ok  | {error, reason()}.
 start() ->
     start(temporary).
+-spec start(permanent | transient | temporary) -> ok | {error, reason()}.
 start(Type) ->
     case application:ensure_all_started(ssl, Type) of
 	{ok, _} ->
@@ -87,24 +469,38 @@ stop() ->
     application:stop(ssl).
 
 %%--------------------------------------------------------------------
--spec connect(host() | port(), [connect_option()]) -> {ok, #sslsocket{}} |
-					      {error, reason()}.
--spec connect(host() | port(), [connect_option()] | inet:port_number(),
-	      timeout() | list()) ->
-		     {ok, #sslsocket{}} | {error, reason()}.
--spec connect(host() | port(), inet:port_number(), list(), timeout()) ->
-		     {ok, #sslsocket{}} | {error, reason()}.
-
 %%
 %% Description: Connect to an ssl server.
 %%--------------------------------------------------------------------
+
+-spec connect(TCPSocket, TLSOptions) ->
+                     {ok, sslsocket()} |
+                     {error, reason()} |
+                     {option_not_a_key_value_tuple, any()} when
+      TCPSocket :: socket(),
+      TLSOptions :: [tls_client_option()].
+
 connect(Socket, SslOptions) when is_port(Socket) ->
     connect(Socket, SslOptions, infinity).
 
+-spec connect(TCPSocket, TLSOptions, Timeout) ->
+                     {ok, sslsocket()} | {error, reason()} when
+      TCPSocket :: socket(),
+      TLSOptions :: [tls_client_option()],
+      Timeout :: timeout();
+             (Host, Port, TLSOptions) ->
+                     {ok, sslsocket()} |
+                     {ok, sslsocket(),Ext :: protocol_extensions()} |
+                     {error, reason()} |
+                     {option_not_a_key_value_tuple, any()} when
+      Host :: host(),
+      Port :: inet:port_number(),
+      TLSOptions :: [tls_client_option()].
+
 connect(Socket, SslOptions0, Timeout) when is_port(Socket),
-					    (is_integer(Timeout) andalso Timeout >= 0) or (Timeout == infinity) ->
-    {Transport,_,_,_} = proplists:get_value(cb_info, SslOptions0,
-					      {gen_tcp, tcp, tcp_closed, tcp_error}),
+                                           (is_integer(Timeout) andalso Timeout >= 0) or (Timeout == infinity) ->
+    CbInfo = handle_option(cb_info, SslOptions0, default_cb_info(tls)),
+    Transport = element(1, CbInfo),
     EmulatedOptions = tls_socket:emulated_options(),
     {ok, SocketValues} = tls_socket:getopts(Transport, Socket, EmulatedOptions),
     try handle_options(SslOptions0 ++ SocketValues, client) of
@@ -117,6 +513,17 @@ connect(Socket, SslOptions0, Timeout) when is_port(Socket),
 connect(Host, Port, Options) ->
     connect(Host, Port, Options, infinity).
 
+
+-spec connect(Host, Port, TLSOptions, Timeout) ->
+                     {ok, sslsocket()} |
+                     {ok, sslsocket(),Ext :: protocol_extensions()} |
+                     {error, reason()} |
+                     {option_not_a_key_value_tuple, any()} when
+      Host :: host(),
+      Port :: inet:port_number(),
+      TLSOptions :: [tls_client_option()],
+      Timeout :: timeout().
+
 connect(Host, Port, Options, Timeout) when (is_integer(Timeout) andalso Timeout >= 0) or (Timeout == infinity) ->
     try
 	{ok, Config} = handle_options(Options, client, Host),
@@ -132,7 +539,10 @@ connect(Host, Port, Options, Timeout) when (is_integer(Timeout) andalso Timeout
     end.
 
 %%--------------------------------------------------------------------
--spec listen(inet:port_number(), [listen_option()]) ->{ok, #sslsocket{}} | {error, reason()}.
+-spec listen(Port, Options) -> {ok, ListenSocket} | {error, reason()} when
+      Port::inet:port_number(),
+      Options::[tls_server_option()],
+      ListenSocket :: sslsocket().
 
 %%
 %% Description: Creates an ssl listen socket.
@@ -148,16 +558,23 @@ listen(Port, Options0) ->
 	    Error
     end.
 %%--------------------------------------------------------------------
--spec transport_accept(#sslsocket{}) -> {ok, #sslsocket{}} |
-					{error, reason()}.
--spec transport_accept(#sslsocket{}, timeout()) -> {ok, #sslsocket{}} |
-						   {error, reason()}.
 %%
 %% Description: Performs transport accept on an ssl listen socket
 %%--------------------------------------------------------------------
+-spec transport_accept(ListenSocket) -> {ok, SslSocket} |
+					{error, reason()} when
+      ListenSocket :: sslsocket(),
+      SslSocket :: sslsocket().
+
 transport_accept(ListenSocket) ->
     transport_accept(ListenSocket, infinity).
 
+-spec transport_accept(ListenSocket, Timeout) -> {ok, SslSocket} |
+					{error, reason()} when
+      ListenSocket :: sslsocket(),
+      Timeout :: timeout(),
+      SslSocket :: sslsocket().
+
 transport_accept(#sslsocket{pid = {ListenSocket,
 				   #config{connection_cb = ConnectionCb} = Config}}, Timeout) 
   when (is_integer(Timeout) andalso Timeout >= 0) or (Timeout == infinity) ->
@@ -169,25 +586,40 @@ transport_accept(#sslsocket{pid = {ListenSocket,
     end.
   
 %%--------------------------------------------------------------------
--spec ssl_accept(#sslsocket{}) -> ok | {error, reason()}.
--spec ssl_accept(#sslsocket{} | port(), timeout()| [ssl_option()
-						    | transport_option()]) ->
-			ok | {ok, #sslsocket{}} | {error, reason()}.
-
--spec ssl_accept(#sslsocket{} | port(), [ssl_option()] | [ssl_option()| transport_option()], timeout()) ->
-			ok | {ok, #sslsocket{}} | {error, reason()}.
 %%
 %% Description: Performs accept on an ssl listen socket. e.i. performs
 %%              ssl handshake.
 %%--------------------------------------------------------------------
+-spec ssl_accept(SslSocket) ->
+                        ok |
+                        {error, Reason} when
+      SslSocket :: sslsocket(),
+      Reason :: closed | timeout | error_alert().
+
 ssl_accept(ListenSocket) ->
     ssl_accept(ListenSocket, [], infinity).
+
+-spec ssl_accept(Socket, TimeoutOrOptions) ->
+			ok |
+                        {ok, sslsocket()} | {error, Reason} when
+      Socket :: sslsocket() | socket(),
+      TimeoutOrOptions :: timeout() | [tls_server_option()],
+      Reason :: timeout | closed | {options, any()} | error_alert().
+
 ssl_accept(Socket, Timeout)  when  (is_integer(Timeout) andalso Timeout >= 0) or (Timeout == infinity) ->
     ssl_accept(Socket, [], Timeout);
 ssl_accept(ListenSocket, SslOptions) when is_port(ListenSocket) ->
     ssl_accept(ListenSocket, SslOptions, infinity);
 ssl_accept(Socket, Timeout) ->
     ssl_accept(Socket, [], Timeout).
+
+-spec ssl_accept(Socket, Options, Timeout) ->
+			ok | {ok, sslsocket()} | {error, Reason} when
+      Socket :: sslsocket() | socket(),
+      Options :: [tls_server_option()],
+      Timeout :: timeout(),
+      Reason :: timeout | closed | {options, any()} | error_alert().
+
 ssl_accept(Socket, SslOptions, Timeout) when is_port(Socket) ->
     handshake(Socket, SslOptions, Timeout);
 ssl_accept(Socket, SslOptions, Timeout) ->
@@ -198,27 +630,58 @@ ssl_accept(Socket, SslOptions, Timeout) ->
             Error
      end.
 %%--------------------------------------------------------------------
--spec handshake(#sslsocket{}) -> {ok, #sslsocket{}} | {error, reason()}.
--spec handshake(#sslsocket{} | port(), timeout()| [ssl_option()
-						    | transport_option()]) ->
-                       {ok, #sslsocket{}} | {error, reason()}.
-
--spec handshake(#sslsocket{} | port(), [ssl_option()] | [ssl_option()| transport_option()], timeout()) ->
-			{ok, #sslsocket{}} | {error, reason()}.
 %%
 %% Description: Performs accept on an ssl listen socket. e.i. performs
 %%              ssl handshake.
 %%--------------------------------------------------------------------
+
+%% Performs the SSL/TLS/DTLS server-side handshake.
+-spec handshake(HsSocket) -> {ok, SslSocket} | {ok, SslSocket, Ext} | {error, Reason} when
+      HsSocket :: sslsocket(),
+      SslSocket :: sslsocket(),
+      Ext :: protocol_extensions(),
+      Reason :: closed | timeout | error_alert().
+
 handshake(ListenSocket) ->
     handshake(ListenSocket, infinity).
 
+-spec handshake(HsSocket, Timeout) -> {ok, SslSocket} | {ok, SslSocket, Ext} | {error, Reason} when
+      HsSocket :: sslsocket(),
+      Timeout :: timeout(),
+      SslSocket :: sslsocket(),
+      Ext :: protocol_extensions(),
+      Reason :: closed | timeout | error_alert();
+               (Socket, Options) -> {ok, SslSocket} | {ok, SslSocket, Ext} | {error, Reason} when
+      Socket :: socket() | sslsocket(),
+      SslSocket :: sslsocket(),
+      Options :: [server_option()],
+      Ext :: protocol_extensions(),
+      Reason :: closed | timeout | error_alert().
+
 handshake(#sslsocket{} = Socket, Timeout) when  (is_integer(Timeout) andalso Timeout >= 0) or 
                                                 (Timeout == infinity) ->
     ssl_connection:handshake(Socket, Timeout);
 
+%% If Socket is a ordinary socket(): upgrades a gen_tcp, or equivalent, socket to
+%% an SSL socket, that is, performs the SSL/TLS server-side handshake and returns
+%% the SSL socket.
+%%
+%% If Socket is an sslsocket(): provides extra SSL/TLS/DTLS options to those
+%% specified in ssl:listen/2 and then performs the SSL/TLS/DTLS handshake.
 handshake(ListenSocket, SslOptions)  when is_port(ListenSocket) ->
     handshake(ListenSocket, SslOptions, infinity).
 
+-spec handshake(Socket, Options, Timeout) ->
+                       {ok, SslSocket} |
+                       {ok, SslSocket, Ext} |
+                       {error, Reason} when
+      Socket :: socket() | sslsocket(),
+      SslSocket :: sslsocket(),
+      Options :: [server_option()],
+      Timeout :: timeout(),
+      Ext :: protocol_extensions(),
+      Reason :: closed | timeout | {options, any()} | error_alert().
+
 handshake(#sslsocket{} = Socket, [], Timeout) when (is_integer(Timeout) andalso Timeout >= 0) or 
                                                     (Timeout == infinity)->
     handshake(Socket, Timeout);
@@ -242,8 +705,8 @@ handshake(#sslsocket{pid = [Pid|_], fd = {_, _, _}} = Socket, SslOpts, Timeout)
     end;
 handshake(Socket, SslOptions, Timeout) when is_port(Socket),
                                             (is_integer(Timeout) andalso Timeout >= 0) or (Timeout == infinity) ->
-    {Transport,_,_,_} =
-	proplists:get_value(cb_info, SslOptions, {gen_tcp, tcp, tcp_closed, tcp_error}),
+    CbInfo = handle_option(cb_info, SslOptions, default_cb_info(tls)),
+    Transport = element(1, CbInfo),
     EmulatedOptions = tls_socket:emulated_options(),
     {ok, SocketValues} = tls_socket:getopts(Transport, Socket, EmulatedOptions),
     ConnetionCb = connection_cb(SslOptions),
@@ -261,8 +724,12 @@ handshake(Socket, SslOptions, Timeout) when is_port(Socket),
 
 
 %%--------------------------------------------------------------------
--spec handshake_continue(#sslsocket{}, [ssl_option()]) -> 
-                                {ok, #sslsocket{}} | {error, reason()}.
+-spec handshake_continue(HsSocket, Options) ->
+                                {ok, SslSocket} | {error, Reason} when
+      HsSocket :: sslsocket(),
+      Options :: [tls_client_option() | tls_server_option()],
+      SslSocket :: sslsocket(),
+      Reason :: closed | timeout | error_alert().
 %%
 %%
 %% Description: Continues the handshke possible with newly supplied options.
@@ -270,8 +737,13 @@ handshake(Socket, SslOptions, Timeout) when is_port(Socket),
 handshake_continue(Socket, SSLOptions) ->
     handshake_continue(Socket, SSLOptions, infinity).
 %%--------------------------------------------------------------------
--spec handshake_continue(#sslsocket{}, [ssl_option()], timeout()) -> 
-                                {ok, #sslsocket{}} | {error, reason()}.
+-spec handshake_continue(HsSocket, Options, Timeout) ->
+                                {ok, SslSocket} | {error, Reason} when
+      HsSocket :: sslsocket(),
+      Options :: [tls_client_option() | tls_server_option()],
+      Timeout :: timeout(),
+      SslSocket :: sslsocket(),
+      Reason :: closed | timeout | error_alert().
 %%
 %%
 %% Description: Continues the handshke possible with newly supplied options.
@@ -279,7 +751,7 @@ handshake_continue(Socket, SSLOptions) ->
 handshake_continue(Socket, SSLOptions, Timeout) ->
     ssl_connection:handshake_continue(Socket, SSLOptions, Timeout).
 %%--------------------------------------------------------------------
--spec  handshake_cancel(#sslsocket{}) -> term().
+-spec  handshake_cancel(#sslsocket{}) -> any().
 %%
 %% Description: Cancels the handshakes sending a close alert.
 %%--------------------------------------------------------------------
@@ -287,7 +759,9 @@ handshake_cancel(Socket) ->
     ssl_connection:handshake_cancel(Socket).
 
 %%--------------------------------------------------------------------
--spec  close(#sslsocket{}) -> term().
+-spec  close(SslSocket) -> ok | {error, Reason} when
+      SslSocket :: sslsocket(),
+      Reason :: any().
 %%
 %% Description: Close an ssl connection
 %%--------------------------------------------------------------------
@@ -295,11 +769,14 @@ close(#sslsocket{pid = [Pid|_]}) when is_pid(Pid) ->
     ssl_connection:close(Pid, {close, ?DEFAULT_TIMEOUT});
 close(#sslsocket{pid = {dtls, #config{dtls_handler = {Pid, _}}}}) ->
    dtls_packet_demux:close(Pid);
-close(#sslsocket{pid = {ListenSocket, #config{transport_info={Transport,_, _, _}}}}) ->
+close(#sslsocket{pid = {ListenSocket, #config{transport_info={Transport,_,_,_,_}}}}) ->
     Transport:close(ListenSocket).
 
 %%--------------------------------------------------------------------
--spec  close(#sslsocket{}, timeout() | {pid(), integer()}) -> term().
+-spec  close(SslSocket, How) -> ok | {ok, port()} | {error,Reason} when
+      SslSocket :: sslsocket(),
+      How :: timeout() | {NewController::pid(), timeout()},
+      Reason :: any().
 %%
 %% Description: Close an ssl connection
 %%--------------------------------------------------------------------
@@ -311,44 +788,63 @@ close(#sslsocket{pid = [TLSPid|_]},
 close(#sslsocket{pid = [TLSPid|_]}, Timeout) when is_pid(TLSPid),
 					      (is_integer(Timeout) andalso Timeout >= 0) or (Timeout == infinity) ->
     ssl_connection:close(TLSPid, {close, Timeout});
-close(#sslsocket{pid = {ListenSocket, #config{transport_info={Transport,_, _, _}}}}, _) ->
+close(#sslsocket{pid = {ListenSocket, #config{transport_info={Transport,_,_,_,_}}}}, _) ->
     Transport:close(ListenSocket).
 
 %%--------------------------------------------------------------------
--spec send(#sslsocket{}, iodata()) -> ok | {error, reason()}.
+-spec send(SslSocket, Data) -> ok | {error, reason()} when
+      SslSocket :: sslsocket(),
+      Data :: iodata().
 %%
 %% Description: Sends data over the ssl connection
 %%--------------------------------------------------------------------
 send(#sslsocket{pid = [Pid]}, Data) when is_pid(Pid) ->
     ssl_connection:send(Pid, Data);
 send(#sslsocket{pid = [_, Pid]}, Data) when is_pid(Pid) ->
-    tls_sender:send_data(Pid,  erlang:iolist_to_binary(Data));
+    tls_sender:send_data(Pid,  erlang:iolist_to_iovec(Data));
 send(#sslsocket{pid = {_, #config{transport_info={_, udp, _, _}}}}, _) ->
     {error,enotconn}; %% Emulate connection behaviour
 send(#sslsocket{pid = {dtls,_}}, _) ->
     {error,enotconn};  %% Emulate connection behaviour
-send(#sslsocket{pid = {ListenSocket, #config{transport_info={Transport, _, _, _}}}}, Data) ->
+send(#sslsocket{pid = {ListenSocket, #config{transport_info = Info}}}, Data) ->
+    Transport = element(1, Info),
     Transport:send(ListenSocket, Data). %% {error,enotconn}
 
 %%--------------------------------------------------------------------
--spec recv(#sslsocket{}, integer()) -> {ok, binary()| list()} | {error, reason()}.
--spec recv(#sslsocket{}, integer(), timeout()) -> {ok, binary()| list()} | {error, reason()}.
 %%
 %% Description: Receives data when active = false
 %%--------------------------------------------------------------------
+-spec recv(SslSocket, Length) -> {ok, Data} | {error, reason()} when
+      SslSocket :: sslsocket(),
+      Length :: integer(),
+      Data :: binary() | list() | HttpPacket,
+      HttpPacket :: any().
+
 recv(Socket, Length) ->
     recv(Socket, Length, infinity).
+
+-spec recv(SslSocket, Length, Timeout) -> {ok, Data} | {error, reason()} when
+      SslSocket :: sslsocket(),
+      Length :: integer(),
+      Data :: binary() | list() | HttpPacket,
+      Timeout :: timeout(),
+      HttpPacket :: any().
+
 recv(#sslsocket{pid = [Pid|_]}, Length, Timeout) when is_pid(Pid),
 						  (is_integer(Timeout) andalso Timeout >= 0) or (Timeout == infinity)->
     ssl_connection:recv(Pid, Length, Timeout);
 recv(#sslsocket{pid = {dtls,_}}, _, _) ->
     {error,enotconn};
 recv(#sslsocket{pid = {Listen,
-		       #config{transport_info = {Transport, _, _, _}}}}, _,_) when is_port(Listen)->
+		       #config{transport_info = Info}}},_,_) when is_port(Listen)->
+    Transport = element(1, Info),
     Transport:recv(Listen, 0). %% {error,enotconn}
 
 %%--------------------------------------------------------------------
--spec controlling_process(#sslsocket{}, pid()) -> ok | {error, reason()}.
+-spec controlling_process(SslSocket, NewOwner) -> ok | {error, Reason} when
+      SslSocket :: sslsocket(),
+      NewOwner :: pid(),
+      Reason :: any().
 %%
 %% Description: Changes process that receives the messages when active = true
 %% or once.
@@ -359,7 +855,7 @@ controlling_process(#sslsocket{pid = {dtls, _}},
 		    NewOwner) when is_pid(NewOwner) ->
     ok; %% Meaningless but let it be allowed to conform with TLS 
 controlling_process(#sslsocket{pid = {Listen,
-				      #config{transport_info = {Transport, _, _, _}}}},
+				      #config{transport_info = {Transport,_,_,_,_}}}},
 		    NewOwner) when is_port(Listen),
 				   is_pid(NewOwner) ->
      %% Meaningless but let it be allowed to conform with normal sockets  
@@ -367,7 +863,11 @@ controlling_process(#sslsocket{pid = {Listen,
 
 
 %%--------------------------------------------------------------------
--spec connection_information(#sslsocket{}) -> {ok, list()} | {error, reason()}.
+-spec connection_information(SslSocket) -> {ok, Result} | {error, reason()} when
+      SslSocket :: sslsocket(),
+      Result :: [{OptionName, OptionValue}],
+      OptionName :: atom(),
+      OptionValue :: any().
 %%
 %% Description: Return SSL information for the connection
 %%--------------------------------------------------------------------
@@ -384,7 +884,12 @@ connection_information(#sslsocket{pid = {dtls,_}}) ->
     {error,enotconn}. 
 
 %%--------------------------------------------------------------------
--spec connection_information(#sslsocket{}, [atom()]) -> {ok, list()} | {error, reason()}.
+-spec connection_information(SslSocket, Items) -> {ok, Result} | {error, reason()} when
+      SslSocket :: sslsocket(),
+      Items :: [OptionName],
+      Result :: [{OptionName, OptionValue}],
+      OptionName :: atom(),
+      OptionValue :: any().
 %%
 %% Description: Return SSL information for the connection
 %%--------------------------------------------------------------------
@@ -398,23 +903,29 @@ connection_information(#sslsocket{pid = [Pid|_]}, Items) when is_pid(Pid) ->
     end.
 
 %%--------------------------------------------------------------------
--spec peername(#sslsocket{}) -> {ok, {inet:ip_address(), inet:port_number()}} | {error, reason()}.
+-spec peername(SslSocket) -> {ok, {Address, Port}} |
+                             {error, reason()} when
+      SslSocket :: sslsocket(),
+      Address :: inet:ip_address(),
+      Port :: inet:port_number().
 %%
 %% Description: same as inet:peername/1.
 %%--------------------------------------------------------------------
-peername(#sslsocket{pid = [Pid|_], fd = {Transport, Socket, _}}) when is_pid(Pid)->
+peername(#sslsocket{pid = [Pid|_], fd = {Transport, Socket,_}}) when is_pid(Pid)->
     dtls_socket:peername(Transport, Socket);
-peername(#sslsocket{pid = [Pid|_], fd = {Transport, Socket, _, _}}) when is_pid(Pid)->
+peername(#sslsocket{pid = [Pid|_], fd = {Transport, Socket,_,_}}) when is_pid(Pid)->
     tls_socket:peername(Transport, Socket);
-peername(#sslsocket{pid = {dtls, #config{dtls_handler = {_Pid, _}}}}) ->
+peername(#sslsocket{pid = {dtls, #config{dtls_handler = {_Pid,_}}}}) ->
     dtls_socket:peername(dtls, undefined);
-peername(#sslsocket{pid = {ListenSocket,  #config{transport_info = {Transport,_,_,_}}}}) ->
+peername(#sslsocket{pid = {ListenSocket,  #config{transport_info = {Transport,_,_,_,_}}}}) ->
     tls_socket:peername(Transport, ListenSocket); %% Will return {error, enotconn}
 peername(#sslsocket{pid = {dtls,_}}) ->
     {error,enotconn}.
 
 %%--------------------------------------------------------------------
--spec peercert(#sslsocket{}) ->{ok, DerCert::binary()} | {error, reason()}.
+-spec peercert(SslSocket) -> {ok, Cert} | {error, reason()} when
+      SslSocket :: sslsocket(),
+      Cert :: binary().
 %%
 %% Description: Returns the peercert.
 %%--------------------------------------------------------------------
@@ -431,7 +942,10 @@ peercert(#sslsocket{pid = {Listen, _}}) when is_port(Listen) ->
     {error, enotconn}.
 
 %%--------------------------------------------------------------------
--spec negotiated_protocol(#sslsocket{}) -> {ok, binary()} | {error, reason()}.
+-spec negotiated_protocol(SslSocket) -> {ok, Protocol} | {error, Reason} when
+      SslSocket :: sslsocket(),
+      Protocol :: binary(),
+      Reason :: protocol_not_negotiated.
 %%
 %% Description: Returns the protocol that has been negotiated. If no
 %% protocol has been negotiated will return {error, protocol_not_negotiated}
@@ -440,33 +954,36 @@ negotiated_protocol(#sslsocket{pid = [Pid|_]}) when is_pid(Pid) ->
     ssl_connection:negotiated_protocol(Pid).
 
 %%--------------------------------------------------------------------
--spec cipher_suites() -> [ssl_cipher_format:old_erl_cipher_suite()] | [string()].
+-spec cipher_suites() -> [old_cipher_suite()] | [string()].
 %%--------------------------------------------------------------------
 cipher_suites() ->
     cipher_suites(erlang).
 %%--------------------------------------------------------------------
--spec cipher_suites(erlang | openssl | all) -> 
-                           [ssl_cipher_format:old_erl_cipher_suite() | string()].
+-spec cipher_suites(Type) -> [old_cipher_suite() | string()] when
+      Type :: erlang | openssl | all.
+
 %% Description: Returns all supported cipher suites.
 %%--------------------------------------------------------------------
 cipher_suites(erlang) ->
-    [ssl_cipher_format:erl_suite_definition(Suite) || Suite <- available_suites(default)];
+    [ssl_cipher_format:suite_legacy(Suite) || Suite <- available_suites(default)];
 
 cipher_suites(openssl) ->
-    [ssl_cipher_format:openssl_suite_name(Suite) ||
+    [ssl_cipher_format:suite_map_to_openssl_str(ssl_cipher_format:suite_bin_to_map(Suite)) ||
         Suite <- available_suites(default)];
 
 cipher_suites(all) ->
-    [ssl_cipher_format:erl_suite_definition(Suite) || Suite <- available_suites(all)].
+    [ssl_cipher_format:suite_legacy(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_format:erl_cipher_suite()].
+-spec cipher_suites(Supported, Version) -> ciphers() when
+      Supported :: default | all | anonymous,
+      Version :: protocol_version().
+
 %% Description: Returns all default and all supported cipher suites for a
 %% TLS/DTLS version
 %%--------------------------------------------------------------------
-cipher_suites(Base, Version) when Version == 'tlsv1.2';
+cipher_suites(Base, Version) when Version == 'tlsv1.3';
+                                  Version == 'tlsv1.2';
                                   Version == 'tlsv1.1';
                                   Version == tlsv1;
                                   Version == sslv3 ->
@@ -475,12 +992,37 @@ cipher_suites(Base, Version)  when Version == 'dtlsv1.2';
                                    Version == 'dtlsv1'->
     cipher_suites(Base, dtls_record:protocol_version(Version));                   
 cipher_suites(Base, Version) ->
-    [ssl_cipher_format:suite_definition(Suite) || Suite <- supported_suites(Base, Version)].
+    [ssl_cipher_format:suite_bin_to_map(Suite) || Suite <- supported_suites(Base, Version)].
+
+%%--------------------------------------------------------------------
+-spec cipher_suites(Supported, Version, rfc | openssl) -> [string()] when
+      Supported :: default | all | anonymous,
+      Version :: protocol_version().
 
+%% Description: Returns all default and all supported cipher suites for a
+%% TLS/DTLS version
 %%--------------------------------------------------------------------
--spec filter_cipher_suites([ssl_cipher_format:erl_cipher_suite()], 
-                           [{key_exchange | cipher | mac | prf, fun()}] | []) -> 
-                                  [ssl_cipher_format:erl_cipher_suite()].
+cipher_suites(Base, Version, StringType) when Version == 'tlsv1.2';
+                                              Version == 'tlsv1.1';
+                                                  Version == tlsv1;
+                                              Version == sslv3 ->
+    cipher_suites(Base, tls_record:protocol_version(Version), StringType);
+cipher_suites(Base, Version, StringType)  when Version == 'dtlsv1.2';
+                                               Version == 'dtlsv1'->
+    cipher_suites(Base, dtls_record:protocol_version(Version), StringType);                   
+cipher_suites(Base, Version, rfc) ->
+    [ssl_cipher_format:suite_map_to_str(ssl_cipher_format:suite_bin_to_map(Suite)) 
+     || Suite <- supported_suites(Base, Version)];
+cipher_suites(Base, Version, openssl) ->
+    [ssl_cipher_format:suite_map_to_openssl_str(ssl_cipher_format:suite_bin_to_map(Suite)) 
+     || Suite <- supported_suites(Base, Version)].
+
+%%--------------------------------------------------------------------
+-spec filter_cipher_suites(Suites, Filters) -> Ciphers when
+      Suites :: ciphers(),
+      Filters :: cipher_filters(),
+      Ciphers :: ciphers().
+
 %% 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.
@@ -497,10 +1039,10 @@ filter_cipher_suites(Suites, Filters0) ->
                 prf_filters => add_filter(proplists:get_value(prf, Filters0), PrfF)},
     ssl_cipher:filter_suites(Suites, Filters).
 %%--------------------------------------------------------------------
--spec prepend_cipher_suites([ssl_cipher_format:erl_cipher_suite()] | 
-                            [{key_exchange | cipher | mac | prf, fun()}],
-                            [ssl_cipher_format:erl_cipher_suite()]) -> 
-                                   [ssl_cipher_format:erl_cipher_suite()].
+-spec prepend_cipher_suites(Preferred, Suites) -> ciphers() when
+      Preferred :: ciphers() | cipher_filters(),
+      Suites :: ciphers().
+
 %% 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
@@ -515,10 +1057,10 @@ prepend_cipher_suites(Filters, Suites) ->
     Preferred = filter_cipher_suites(Suites, Filters), 
     Preferred ++ (Suites -- Preferred).
 %%--------------------------------------------------------------------
--spec append_cipher_suites(Deferred :: [ssl_cipher_format:erl_cipher_suite()] | 
-                                       [{key_exchange | cipher | mac | prf, fun()}],
-                           [ssl_cipher_format:erl_cipher_suite()]) -> 
-                                  [ssl_cipher_format:erl_cipher_suite()].
+-spec append_cipher_suites(Deferred, Suites) -> ciphers() when
+      Deferred :: ciphers() | cipher_filters(),
+      Suites :: ciphers().
+
 %% 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.
@@ -532,7 +1074,9 @@ append_cipher_suites(Filters, Suites) ->
     (Suites -- Deferred) ++  Deferred.
 
 %%--------------------------------------------------------------------
--spec eccs() -> tls_v1:curves().
+-spec eccs() -> NamedCurves when
+      NamedCurves :: [named_curve()].
+
 %% Description: returns all supported curves across all versions
 %%--------------------------------------------------------------------
 eccs() ->
@@ -540,27 +1084,24 @@ eccs() ->
     eccs_filter_supported(Curves).
 
 %%--------------------------------------------------------------------
--spec eccs(tls_record:tls_version() | tls_record:tls_atom_version() |
-           dtls_record:dtls_version() | dtls_record:dtls_atom_version()) ->
-                  tls_v1:curves().
+-spec eccs(Version) -> NamedCurves when
+      Version :: protocol_version(),
+      NamedCurves :: [named_curve()].
+
 %% Description: returns the curves supported for a given version of
 %% ssl/tls.
 %%--------------------------------------------------------------------
-eccs({3,0}) ->
+eccs(sslv3) ->
     [];
-eccs({3,_}) ->
-    Curves = tls_v1:ecc_curves(all),
-    eccs_filter_supported(Curves);
-eccs({254,_} = Version) ->
-    eccs(dtls_v1:corresponding_tls_version(Version));
+eccs('dtlsv1') ->
+    eccs('tlsv1.1');
+eccs('dtlsv1.2') ->
+    eccs('tlsv1.2');
 eccs(Version) when Version == 'tlsv1.2';
                    Version == 'tlsv1.1';
-                   Version == tlsv1;
-                   Version == sslv3 ->
-    eccs(tls_record:protocol_version(Version));
-eccs(Version) when Version == 'dtlsv1.2';
-                   Version == 'dtlsv1'->
-    eccs(dtls_v1:corresponding_tls_version(dtls_record:protocol_version(Version))).
+                   Version == tlsv1 ->
+    Curves = tls_v1:ecc_curves(all),
+    eccs_filter_supported(Curves).
 
 eccs_filter_supported(Curves) ->
     CryptoCurves = crypto:ec_curves(),
@@ -568,14 +1109,30 @@ eccs_filter_supported(Curves) ->
                  Curves).
 
 %%--------------------------------------------------------------------
--spec getopts(#sslsocket{}, [gen_tcp:option_name()]) ->
-		     {ok, [gen_tcp:option()]} | {error, reason()}.
+-spec groups() -> [group()].
+%% Description: returns all supported groups (TLS 1.3 and later)
+%%--------------------------------------------------------------------
+groups() ->
+    tls_v1:groups(4).
+
+%%--------------------------------------------------------------------
+-spec groups(default) -> [group()].
+%% Description: returns the default groups (TLS 1.3 and later)
+%%--------------------------------------------------------------------
+groups(default) ->
+    tls_v1:default_groups(4).
+
+%%--------------------------------------------------------------------
+-spec getopts(SslSocket, OptionNames) ->
+		     {ok, [gen_tcp:option()]} | {error, reason()} when
+      SslSocket :: sslsocket(),
+      OptionNames :: [gen_tcp:option_name()].
 %%
 %% Description: Gets options
 %%--------------------------------------------------------------------
 getopts(#sslsocket{pid = [Pid|_]}, OptionTags) when is_pid(Pid), is_list(OptionTags) ->
     ssl_connection:get_opts(Pid, OptionTags);
-getopts(#sslsocket{pid = {dtls, #config{transport_info = {Transport,_,_,_}}}} = ListenSocket, OptionTags) when is_list(OptionTags) ->
+getopts(#sslsocket{pid = {dtls, #config{transport_info = {Transport,_,_,_,_}}}} = ListenSocket, OptionTags) when is_list(OptionTags) ->
     try dtls_socket:getopts(Transport, ListenSocket, OptionTags) of
         {ok, _} = Result ->
             Result;
@@ -585,7 +1142,7 @@ getopts(#sslsocket{pid = {dtls, #config{transport_info = {Transport,_,_,_}}}} =
 	_:Error ->
 	    {error, {options, {socket_options, OptionTags, Error}}}
     end;
-getopts(#sslsocket{pid = {_,  #config{transport_info = {Transport,_,_,_}}}} = ListenSocket,
+getopts(#sslsocket{pid = {_,  #config{transport_info = {Transport,_,_,_,_}}}} = ListenSocket,
 	OptionTags) when is_list(OptionTags) ->
     try tls_socket:getopts(Transport, ListenSocket, OptionTags) of
 	{ok, _} = Result ->
@@ -600,7 +1157,9 @@ getopts(#sslsocket{}, OptionTags) ->
     {error, {options, {socket_options, OptionTags}}}.
 
 %%--------------------------------------------------------------------
--spec setopts(#sslsocket{},  [gen_tcp:option()]) -> ok | {error, reason()}.
+-spec setopts(SslSocket, Options) -> ok | {error, reason()} when
+      SslSocket :: sslsocket(),
+      Options :: [gen_tcp:option()].
 %%
 %% Description: Sets options
 %%--------------------------------------------------------------------
@@ -632,7 +1191,7 @@ setopts(#sslsocket{pid = [Pid|_]}, Options0) when is_pid(Pid), is_list(Options0)
 	_:_ ->
 	    {error, {options, {not_a_proplist, Options0}}}
     end;
-setopts(#sslsocket{pid = {dtls, #config{transport_info = {Transport,_,_,_}}}} = ListenSocket, Options) when is_list(Options) ->
+setopts(#sslsocket{pid = {dtls, #config{transport_info = {Transport,_,_,_,_}}}} = ListenSocket, Options) when is_list(Options) ->
     try dtls_socket:setopts(Transport, ListenSocket, Options) of
 	ok ->
 	    ok;
@@ -642,7 +1201,7 @@ setopts(#sslsocket{pid = {dtls, #config{transport_info = {Transport,_,_,_}}}} =
 	_:Error ->
 	    {error, {options, {socket_options, Options, Error}}}
     end;
-setopts(#sslsocket{pid = {_, #config{transport_info = {Transport,_,_,_}}}} = ListenSocket, Options) when is_list(Options) ->
+setopts(#sslsocket{pid = {_, #config{transport_info = {Transport,_,_,_,_}}}} = ListenSocket, Options) when is_list(Options) ->
     try tls_socket:setopts(Transport, ListenSocket, Options) of
 	ok ->
 	    ok;
@@ -656,9 +1215,9 @@ setopts(#sslsocket{}, Options) ->
     {error, {options,{not_a_proplist, Options}}}.
 
 %%---------------------------------------------------------------
--spec getstat(Socket) ->
-	{ok, OptionValues} | {error, inet:posix()} when
-      Socket :: #sslsocket{},
+-spec getstat(SslSocket) ->
+                     {ok, OptionValues} | {error, inet:posix()} when
+      SslSocket :: sslsocket(),
       OptionValues :: [{inet:stat_option(), integer()}].
 %%
 %% Description: Get all statistic options for a socket.
@@ -667,27 +1226,30 @@ getstat(Socket) ->
 	getstat(Socket, inet:stats()).
 
 %%---------------------------------------------------------------
--spec getstat(Socket, Options) ->
-	{ok, OptionValues} | {error, inet:posix()} when
-      Socket :: #sslsocket{},
+-spec getstat(SslSocket, Options) ->
+                     {ok, OptionValues} | {error, inet:posix()} when
+      SslSocket :: sslsocket(),
       Options :: [inet:stat_option()],
       OptionValues :: [{inet:stat_option(), integer()}].
 %%
 %% Description: Get one or more statistic options for a socket.
 %%--------------------------------------------------------------------
-getstat(#sslsocket{pid = {Listen,  #config{transport_info = {Transport, _, _, _}}}}, Options) when is_port(Listen), is_list(Options) ->
+getstat(#sslsocket{pid = {Listen,  #config{transport_info = {Transport, _, _, _, _}}}}, Options) when is_port(Listen), is_list(Options) ->
     tls_socket:getstat(Transport, Listen, Options);
 
 getstat(#sslsocket{pid = [Pid|_], fd = {Transport, Socket, _, _}}, Options) when is_pid(Pid), is_list(Options) ->
     tls_socket:getstat(Transport, Socket, Options).
 
 %%---------------------------------------------------------------
--spec shutdown(#sslsocket{}, read | write | read_write) ->  ok | {error, reason()}.
+-spec shutdown(SslSocket, How) ->  ok | {error, reason()} when
+      SslSocket :: sslsocket(),
+      How :: read | write | read_write.
 %%
 %% Description: Same as gen_tcp:shutdown/2
 %%--------------------------------------------------------------------
-shutdown(#sslsocket{pid = {Listen, #config{transport_info = {Transport,_, _, _}}}},
+shutdown(#sslsocket{pid = {Listen, #config{transport_info = Info}}},
 	 How) when is_port(Listen) ->
+    Transport = element(1, Info),
     Transport:shutdown(Listen, How);
 shutdown(#sslsocket{pid = {dtls,_}},_) ->
     {error, enotconn};
@@ -695,24 +1257,28 @@ shutdown(#sslsocket{pid = [Pid|_]}, How) when is_pid(Pid) ->
     ssl_connection:shutdown(Pid, How).
 
 %%--------------------------------------------------------------------
--spec sockname(#sslsocket{}) -> {ok, {inet:ip_address(), inet:port_number()}} | {error, reason()}.
+-spec sockname(SslSocket) ->
+                      {ok, {Address, Port}} | {error, reason()} when
+      SslSocket :: sslsocket(),
+      Address :: inet:ip_address(),
+      Port :: inet:port_number().
 %%
 %% Description: Same as inet:sockname/1
 %%--------------------------------------------------------------------
-sockname(#sslsocket{pid = {Listen,  #config{transport_info = {Transport, _, _, _}}}}) when is_port(Listen) ->
+sockname(#sslsocket{pid = {Listen,  #config{transport_info = {Transport,_,_,_,_}}}}) when is_port(Listen) ->
     tls_socket:sockname(Transport, Listen);
 sockname(#sslsocket{pid = {dtls, #config{dtls_handler = {Pid, _}}}}) ->
     dtls_packet_demux:sockname(Pid);
-sockname(#sslsocket{pid = [Pid|_], fd = {Transport, Socket, _}}) when is_pid(Pid) ->
+sockname(#sslsocket{pid = [Pid|_], fd = {Transport, Socket,_}}) when is_pid(Pid) ->
     dtls_socket:sockname(Transport, Socket);
-sockname(#sslsocket{pid = [Pid| _], fd = {Transport, Socket, _, _}}) when is_pid(Pid) ->
+sockname(#sslsocket{pid = [Pid| _], fd = {Transport, Socket,_,_}}) when is_pid(Pid) ->
     tls_socket:sockname(Transport, Socket).
 
 %%---------------------------------------------------------------
--spec versions() -> [{ssl_app, string()} | {supported, [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()]}].
+-spec versions() -> [VersionInfo] when
+      VersionInfo :: {ssl_app, string()} |
+                     {supported | available, [tls_version()]} |
+                     {supported_dtls | available_dtls, [dtls_version()]}.
 %%
 %% Description: Returns a list of relevant versions.
 %%--------------------------------------------------------------------
@@ -723,14 +1289,15 @@ versions() ->
     SupportedDTLSVsns = [dtls_record:protocol_version(Vsn) || Vsn <- DTLSVsns],
     AvailableTLSVsns = ?ALL_AVAILABLE_VERSIONS,
     AvailableDTLSVsns = ?ALL_AVAILABLE_DATAGRAM_VERSIONS,
-    [{ssl_app, ?VSN}, {supported, SupportedTLSVsns}, 
+    [{ssl_app, "9.2"}, {supported, SupportedTLSVsns}, 
      {supported_dtls, SupportedDTLSVsns}, 
      {available, AvailableTLSVsns}, 
      {available_dtls, AvailableDTLSVsns}].
 
 
 %%---------------------------------------------------------------
--spec renegotiate(#sslsocket{}) -> ok | {error, reason()}.
+-spec renegotiate(SslSocket) -> ok | {error, reason()} when
+      SslSocket :: sslsocket().
 %%
 %% Description: Initiates a renegotiation.
 %%--------------------------------------------------------------------
@@ -750,9 +1317,13 @@ renegotiate(#sslsocket{pid = {Listen,_}}) when is_port(Listen) ->
     {error, enotconn}.
 
 %%--------------------------------------------------------------------
--spec prf(#sslsocket{}, binary() | 'master_secret', binary(),
-	  [binary() | prf_random()], non_neg_integer()) ->
-		 {ok, binary()} | {error, reason()}.
+-spec prf(SslSocket, Secret, Label, Seed, WantedLength) ->
+                 {ok, binary()} | {error, reason()} when
+      SslSocket :: sslsocket(),
+      Secret :: binary() | 'master_secret',
+      Label::binary(),
+      Seed :: [binary() | prf_random()],
+      WantedLength :: non_neg_integer().
 %%
 %% Description: use a ssl sessions TLS PRF to generate key material
 %%--------------------------------------------------------------------
@@ -773,7 +1344,8 @@ clear_pem_cache() ->
     ssl_pem_cache:clear().
 
 %%---------------------------------------------------------------
--spec format_error({error, term()}) -> list().
+-spec format_error({error, Reason}) -> string() when
+      Reason :: any().
 %%
 %% Description: Creates error string.
 %%--------------------------------------------------------------------
@@ -783,8 +1355,8 @@ format_error(Reason) when is_list(Reason) ->
     Reason;
 format_error(closed) ->
     "TLS connection is closed";
-format_error({tls_alert, Description}) ->
-    "TLS Alert: " ++ Description;
+format_error({tls_alert, {_, Description}}) ->
+    Description;
 format_error({options,{FileType, File, Reason}}) when FileType == cacertfile;
 						      FileType == certfile;
 						      FileType == keyfile;
@@ -811,19 +1383,54 @@ tls_version({3, _} = Version) ->
 tls_version({254, _} = Version) ->
     dtls_v1:corresponding_tls_version(Version).
 
-
 %%--------------------------------------------------------------------
--spec suite_to_str(ssl_cipher_format:erl_cipher_suite()) -> string().
+-spec suite_to_str(CipherSuite) -> string() when
+      CipherSuite :: erl_cipher_suite();
+                  (CipherSuite) -> string() when
+      %% For internal use!
+      CipherSuite :: #{key_exchange := null,
+                       cipher := null,
+                       mac := null,
+                       prf := null}.
 %%
 %% Description: Return the string representation of a cipher suite.
 %%--------------------------------------------------------------------
 suite_to_str(Cipher) ->
-    ssl_cipher_format:suite_to_str(Cipher).
+    ssl_cipher_format:suite_map_to_str(Cipher).
 
+%%--------------------------------------------------------------------
+-spec suite_to_openssl_str(CipherSuite) -> string() when
+      CipherSuite :: erl_cipher_suite().                
+%%
+%% Description: Return the string representation of a cipher suite.
+%%--------------------------------------------------------------------
+suite_to_openssl_str(Cipher) ->
+    ssl_cipher_format:suite_map_to_openssl_str(Cipher).
 
+%%
+%%--------------------------------------------------------------------
+-spec str_to_suite(CipherSuiteName) -> erl_cipher_suite() when
+      CipherSuiteName :: string() | {error, {not_recognized, CipherSuiteName :: string()}}.
+%%
+%% Description: Return the map representation of a cipher suite.
+%%--------------------------------------------------------------------
+str_to_suite(CipherSuiteName) ->
+    try
+        %% Note in TLS-1.3 OpenSSL conforms to RFC names
+        %% so if CipherSuiteName starts with TLS this
+        %% function will call ssl_cipher_format:suite_str_to_map
+        %% so both RFC names and legacy OpenSSL names of supported
+        %% cipher suites will be handled
+        ssl_cipher_format:suite_openssl_str_to_map(CipherSuiteName)
+    catch
+        _:_ ->
+            {error, {not_recognized, CipherSuiteName}}
+    end.
+           
 %%%--------------------------------------------------------------
 %%% Internal functions
 %%%--------------------------------------------------------------------
+  
 %% Possible filters out suites not supported by crypto 
 available_suites(default) ->  
     Version = tls_record:highest_protocol_version([]),			  
@@ -839,7 +1446,7 @@ supported_suites(all, Version) ->
 supported_suites(anonymous, Version) -> 
     ssl_cipher:anonymous_suites(Version).
 
-do_listen(Port, #config{transport_info = {Transport, _, _, _}} = Config, tls_connection) ->
+do_listen(Port, #config{transport_info = {Transport, _, _, _,_}} = Config, tls_connection) ->
     tls_socket:listen(Transport, Port, Config);
 
 do_listen(Port,  Config, dtls_connection) ->
@@ -880,9 +1487,10 @@ handle_options(Opts0, #ssl_options{protocol = Protocol, cacerts = CaCerts0,
 	[] ->
 	    new_ssl_options(SslOpts1, NewVerifyOpts, RecordCB);
 	Value ->
-	    Versions = [RecordCB:protocol_version(Vsn) || Vsn <- Value],
+            Versions0 = [RecordCB:protocol_version(Vsn) || Vsn <- Value],
+            Versions1 = lists:sort(fun RecordCB:is_higher/2, Versions0),
 	    new_ssl_options(proplists:delete(versions, SslOpts1), 
-			    NewVerifyOpts#ssl_options{versions = Versions}, record_cb(Protocol))
+			    NewVerifyOpts#ssl_options{versions = Versions1}, record_cb(Protocol))
     end;
 
 %% Handle all options in listen and connect
@@ -891,22 +1499,21 @@ handle_options(Opts0, Role, Host) ->
 			     {list, [{mode, list}]}], Opts0),
     assert_proplist(Opts),
     RecordCb = record_cb(Opts),
-
-    ReuseSessionFun = fun(_, _, _, _) -> true end,
     CaCerts = handle_option(cacerts, Opts, undefined),
 
     {Verify, FailIfNoPeerCert, CaCertDefault, VerifyFun, PartialChainHanlder, VerifyClientOnce} =
 	handle_verify_options(Opts, CaCerts),
     
     CertFile = handle_option(certfile, Opts, <<>>),
-    RecordCb = record_cb(Opts),
     
-    Versions = case handle_option(versions, Opts, []) of
-		   [] ->
-		       RecordCb:supported_protocol_versions();
-		   Vsns  ->
-		       [RecordCb:protocol_version(Vsn) || Vsn <- Vsns]
-	       end,
+    [HighestVersion|_] = Versions =
+        case handle_option(versions, Opts, []) of
+            [] ->
+                RecordCb:supported_protocol_versions();
+            Vsns  ->
+                Versions0 = [RecordCb:protocol_version(Vsn) || Vsn <- Vsns],
+                lists:sort(fun RecordCb:is_higher/2, Versions0)
+        end,
 
     Protocol = handle_option(protocol, Opts, tls),
 
@@ -917,7 +1524,7 @@ handle_options(Opts0, Role, Host) ->
             ok
     end,
    
-    SSLOptions = #ssl_options{
+    SSLOptions0 = #ssl_options{
 		    versions   = Versions,
 		    verify     = validate_option(verify, Verify),
 		    verify_fun = VerifyFun,
@@ -938,16 +1545,31 @@ handle_options(Opts0, Role, Host) ->
 		    psk_identity = handle_option(psk_identity, Opts, undefined),
 		    srp_identity = handle_option(srp_identity, Opts, undefined),
 		    ciphers    = handle_cipher_option(proplists:get_value(ciphers, Opts, []), 
-						      RecordCb:highest_protocol_version(Versions)),
+						      HighestVersion),
 		    eccs       = handle_eccs_option(proplists:get_value(eccs, Opts, eccs()),
-						      RecordCb:highest_protocol_version(Versions)),
-		    signature_algs = handle_hashsigns_option(proplists:get_value(signature_algs, Opts, 
-									     default_option_role(server, 
-												 tls_v1:default_signature_algs(Versions), Role)),
-							 tls_version(RecordCb:highest_protocol_version(Versions))), 
-		    %% Server side option
-		    reuse_session = handle_option(reuse_session, Opts, ReuseSessionFun),
-		    reuse_sessions = handle_option(reuse_sessions, Opts, true),
+                                                    HighestVersion),
+                    supported_groups = handle_supported_groups_option(
+                                         proplists:get_value(supported_groups, Opts, groups(default)),
+                                         HighestVersion),
+		    signature_algs =
+                         handle_hashsigns_option(
+                           proplists:get_value(
+                             signature_algs,
+                             Opts,
+                             default_option_role_sign_algs(server,
+                                                 tls_v1:default_signature_algs(HighestVersion),
+                                                 Role,
+                                                 HighestVersion)),
+                           tls_version(HighestVersion)),
+                    signature_algs_cert =
+                         handle_signature_algorithms_option(
+                           proplists:get_value(
+                             signature_algs_cert,
+                             Opts,
+                             undefined),  %% Do not send by default
+                           tls_version(HighestVersion)),
+                    reuse_sessions = handle_reuse_sessions_option(reuse_sessions, Opts, Role),
+		    reuse_session = handle_reuse_session_option(reuse_session, Opts, Role),
 		    secure_renegotiate = handle_option(secure_renegotiate, Opts, true),
 		    client_renegotiation = handle_option(client_renegotiation, Opts, 
 							 default_option_role(server, true, Role), 
@@ -964,7 +1586,6 @@ handle_options(Opts0, Role, Host) ->
 		    next_protocol_selector =
 			make_next_protocol_selector(
 			  handle_option(client_preferred_next_protocols, Opts, undefined)),
-		    log_alert = handle_option(log_alert, Opts, true),
 		    server_name_indication = handle_option(server_name_indication, Opts, 
                                                            default_option_role(client,
                                                                                server_name_indication_default(Host), Role)),
@@ -990,8 +1611,12 @@ handle_options(Opts0, Role, Host) ->
                     handshake = handle_option(handshake, Opts, full),
                     customize_hostname_check = handle_option(customize_hostname_check, Opts, [])
 		   },
+    LogLevel = handle_option(log_alert, Opts, true),
+    SSLOptions = SSLOptions0#ssl_options{
+                   log_level = handle_option(log_level, Opts, LogLevel)
+                  },
 
-    CbInfo  = proplists:get_value(cb_info, Opts, default_cb_info(Protocol)),
+    CbInfo  = handle_option(cb_info, Opts, default_cb_info(Protocol)),
     SslOptions = [protocol, versions, verify, verify_fun, partial_chain,
 		  fail_if_no_peer_cert, verify_client_once,
 		  depth, cert, certfile, key, keyfile,
@@ -1001,10 +1626,12 @@ handle_options(Opts0, Role, Host) ->
 		  cb_info, renegotiate_at, secure_renegotiate, hibernate_after,
 		  erl_dist, alpn_advertised_protocols, sni_hosts, sni_fun,
 		  alpn_preferred_protocols, next_protocols_advertised,
-		  client_preferred_next_protocols, log_alert,
+		  client_preferred_next_protocols, log_alert, log_level,
 		  server_name_indication, honor_cipher_order, padding_check, crl_check, crl_cache,
-		  fallback, signature_algs, eccs, honor_ecc_order, beast_mitigation,
-                  max_handshake_size, handshake, customize_hostname_check],
+		  fallback, signature_algs, signature_algs_cert, eccs, honor_ecc_order,
+                  beast_mitigation, max_handshake_size, handshake, customize_hostname_check,
+                  supported_groups],
+
     SockOpts = lists:foldl(fun(Key, PropList) ->
 				   proplists:delete(Key, PropList)
 			   end, Opts, SslOptions),
@@ -1033,6 +1660,10 @@ handle_option(sni_fun, Opts, Default) ->
         _ ->
             throw({error, {conflict_options, [sni_fun, sni_hosts]}})
     end;
+handle_option(cb_info, Opts, Default) ->
+    CbInfo = proplists:get_value(cb_info, Opts, Default),
+    true = validate_option(cb_info, CbInfo),
+    handle_cb_info(CbInfo, Default);
 handle_option(OptionName, Opts, Default) ->
     validate_option(OptionName,
 		    proplists:get_value(OptionName, Opts, Default)).
@@ -1138,11 +1769,16 @@ validate_option(srp_identity, {Username, Password})
     {unicode:characters_to_binary(Username),
      unicode:characters_to_binary(Password)};
 
+validate_option(reuse_session, undefined) ->
+    undefined;
 validate_option(reuse_session, Value) when is_function(Value) ->
     Value;
+validate_option(reuse_session, Value) when is_binary(Value) ->
+    Value;
 validate_option(reuse_sessions, Value) when is_boolean(Value) ->
     Value;
-
+validate_option(reuse_sessions, save = Value) ->
+    Value;
 validate_option(secure_renegotiate, Value) when is_boolean(Value) ->
     Value;
 validate_option(client_renegotiation, Value) when is_boolean(Value) ->
@@ -1180,7 +1816,20 @@ validate_option(client_preferred_next_protocols, {Precedence, PreferredProtocols
     Value;
 validate_option(client_preferred_next_protocols, undefined) ->
     undefined;
-validate_option(log_alert, Value) when is_boolean(Value) ->
+validate_option(log_alert, true) ->
+    notice;
+validate_option(log_alert, false) ->
+    warning;
+validate_option(log_level, Value) when
+      is_atom(Value) andalso
+      (Value =:= emergency orelse
+       Value =:= alert orelse
+       Value =:= critical orelse
+       Value =:= error orelse
+       Value =:= warning orelse
+       Value =:= notice orelse
+       Value =:= info orelse
+       Value =:= debug) ->
     Value;
 validate_option(next_protocols_advertised, Value) when is_list(Value) ->
     validate_binary_list(next_protocols_advertised, Value),
@@ -1249,22 +1898,85 @@ validate_option(handshake, full = Value) ->
     Value;
 validate_option(customize_hostname_check, Value) when is_list(Value) ->
     Value;
+validate_option(cb_info, {V1, V2, V3, V4}) when is_atom(V1),
+                                                is_atom(V2),
+                                                is_atom(V3),
+                                                is_atom(V4)
+                                                ->
+    true;
+validate_option(cb_info, {V1, V2, V3, V4, V5}) when is_atom(V1),
+                                                    is_atom(V2),
+                                                    is_atom(V3),
+                                                    is_atom(V4),
+                                                    is_atom(V5)
+                                                ->
+    true;
+validate_option(cb_info, _) ->
+    false;
 validate_option(Opt, Value) ->
     throw({error, {options, {Opt, Value}}}).
 
+handle_cb_info({V1, V2, V3, V4}, {_,_,_,_,_}) ->
+    {V1,V2,V3,V4, list_to_atom(atom_to_list(V2) ++ "_passive")};
+handle_cb_info(CbInfo, _) ->
+    CbInfo.
+
+handle_hashsigns_option(Value, Version) when is_list(Value)
+                                             andalso Version >= {3, 4} ->
+    case tls_v1:signature_schemes(Version, Value) of
+	[] ->
+	    throw({error, {options,
+                           no_supported_signature_schemes,
+                           {signature_algs, Value}}});
+	_ ->
+	    Value
+    end;
 handle_hashsigns_option(Value, Version) when is_list(Value) 
-                                             andalso Version >= {3, 3} ->
+                                             andalso Version =:= {3, 3} ->
     case tls_v1:signature_algs(Version, Value) of
 	[] ->
 	    throw({error, {options, no_supported_algorithms, {signature_algs, Value}}});
 	_ ->	
 	    Value
     end;
-handle_hashsigns_option(_, Version) when Version >= {3, 3} ->
+handle_hashsigns_option(_, Version) when Version =:= {3, 3} ->
     handle_hashsigns_option(tls_v1:default_signature_algs(Version), Version);
 handle_hashsigns_option(_, _Version) ->
     undefined.
 
+handle_signature_algorithms_option(Value, Version) when is_list(Value)
+                                                        andalso Version >= {3, 4} ->
+    case tls_v1:signature_schemes(Version, Value) of
+	[] ->
+	    throw({error, {options,
+                           no_supported_signature_schemes,
+                           {signature_algs_cert, Value}}});
+	_ ->
+	    Value
+    end;
+handle_signature_algorithms_option(_, _Version) ->
+    undefined.
+
+handle_reuse_sessions_option(Key, Opts, client) ->
+    Value = proplists:get_value(Key, Opts, true),
+    validate_option(Key, Value),
+    Value;
+handle_reuse_sessions_option(Key, Opts0, server) ->
+    Opts = proplists:delete({Key, save}, Opts0),
+    Value = proplists:get_value(Key, Opts, true),
+    validate_option(Key, Value),
+    Value.
+
+handle_reuse_session_option(Key, Opts, client) ->
+    Value = proplists:get_value(Key, Opts, undefined),
+    validate_option(Key, Value),
+    Value;
+handle_reuse_session_option(Key, Opts, server) ->
+    ReuseSessionFun = fun(_, _, _, _) -> true end,
+    Value = proplists:get_value(Key, Opts, ReuseSessionFun),
+    validate_option(Key, Value),
+    Value.
+
 validate_options([]) ->
 	[];
 validate_options([{Opt, Value} | Tail]) ->
@@ -1288,7 +2000,8 @@ validate_binary_list(Opt, List) ->
         end, List).
 validate_versions([], Versions) ->
     Versions;
-validate_versions([Version | Rest], Versions) when Version == 'tlsv1.2';
+validate_versions([Version | Rest], Versions) when Version == 'tlsv1.3';
+                                                   Version == 'tlsv1.2';
                                                    Version == 'tlsv1.1';
                                                    Version == tlsv1;
                                                    Version == sslv3 ->
@@ -1301,10 +2014,11 @@ validate_versions([Ver| _], Versions) ->
 
 tls_validate_versions([], Versions) ->
     Versions;
-tls_validate_versions([Version | Rest], Versions) when Version == 'tlsv1.2';
-                                                   Version == 'tlsv1.1';
-                                                   Version == tlsv1;
-                                                   Version == sslv3 ->
+tls_validate_versions([Version | Rest], Versions) when Version == 'tlsv1.3';
+                                                       Version == 'tlsv1.2';
+                                                       Version == 'tlsv1.1';
+                                                       Version == tlsv1;
+                                                       Version == sslv3 ->
     tls_validate_versions(Rest, Versions);                  
 tls_validate_versions([Ver| _], Versions) ->
     throw({error, {options, {Ver, {versions, Versions}}}}).
@@ -1352,10 +2066,10 @@ binary_cipher_suites(Version, []) ->
     %% not require explicit configuration
     default_binary_suites(Version);
 binary_cipher_suites(Version, [Map|_] = Ciphers0) when is_map(Map) ->
-    Ciphers = [ssl_cipher_format:suite(C) || C <- Ciphers0],
+    Ciphers = [ssl_cipher_format:suite_map_to_bin(C) || C <- Ciphers0],
     binary_cipher_suites(Version, Ciphers);
 binary_cipher_suites(Version, [Tuple|_] = Ciphers0) when is_tuple(Tuple) ->
-    Ciphers = [ssl_cipher_format:suite(tuple_to_map(C)) || C <- Ciphers0],
+    Ciphers = [ssl_cipher_format:suite_map_to_bin(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(Version) ++ 
@@ -1370,11 +2084,11 @@ binary_cipher_suites(Version, [Cipher0 | _] = Ciphers0) when is_binary(Cipher0)
     end;
 binary_cipher_suites(Version, [Head | _] = Ciphers0) when is_list(Head) ->
     %% Format: ["RC4-SHA","RC4-MD5"]
-    Ciphers = [ssl_cipher_format:openssl_suite(C) || C <- Ciphers0],
+    Ciphers = [ssl_cipher_format:suite_openssl_str_to_map(C) || C <- Ciphers0],
     binary_cipher_suites(Version, Ciphers);
 binary_cipher_suites(Version, Ciphers0)  ->
     %% Format: "RC4-SHA:RC4-MD5"
-    Ciphers = [ssl_cipher_format:openssl_suite(C) || C <- string:lexemes(Ciphers0, ":")],
+    Ciphers = [ssl_cipher_format:suite_openssl_str_to_map(C) || C <- string:lexemes(Ciphers0, ":")],
     binary_cipher_suites(Version, Ciphers).
 
 default_binary_suites(Version) ->
@@ -1410,6 +2124,16 @@ handle_eccs_option(Value, Version) when is_list(Value) ->
         error:_ -> throw({error, {options, {eccs, Value}}})
     end.
 
+handle_supported_groups_option(Value, Version) when is_list(Value) ->
+    {_Major, Minor} = tls_version(Version),
+    try tls_v1:groups(Minor, Value) of
+        Groups -> #supported_groups{supported_groups = Groups}
+    catch
+        exit:_ -> throw({error, {options, {supported_groups, Value}}});
+        error:_ -> throw({error, {options, {supported_groups, Value}}})
+    end.
+
+
 unexpected_format(Error) ->
     lists:flatten(io_lib:format("Unexpected error: ~p", [Error])).
 
@@ -1555,8 +2279,10 @@ new_ssl_options([{next_protocols_advertised, Value} | Rest], #ssl_options{} = Op
 new_ssl_options([{client_preferred_next_protocols, Value} | Rest], #ssl_options{} = Opts, RecordCB) -> 
     new_ssl_options(Rest, Opts#ssl_options{next_protocol_selector = 
 					       make_next_protocol_selector(validate_option(client_preferred_next_protocols, Value))}, RecordCB);
-new_ssl_options([{log_alert, Value} | Rest], #ssl_options{} = Opts, RecordCB) -> 
-    new_ssl_options(Rest, Opts#ssl_options{log_alert = validate_option(log_alert, Value)}, RecordCB);
+new_ssl_options([{log_alert, Value} | Rest], #ssl_options{} = Opts, RecordCB) ->
+    new_ssl_options(Rest, Opts#ssl_options{log_level = validate_option(log_alert, Value)}, RecordCB);
+new_ssl_options([{log_level, Value} | Rest], #ssl_options{} = Opts, RecordCB) ->
+    new_ssl_options(Rest, Opts#ssl_options{log_level = validate_option(log_level, Value)}, RecordCB);
 new_ssl_options([{server_name_indication, Value} | Rest], #ssl_options{} = Opts, RecordCB) -> 
     new_ssl_options(Rest, Opts#ssl_options{server_name_indication = validate_option(server_name_indication, Value)}, RecordCB);
 new_ssl_options([{honor_cipher_order, Value} | Rest], #ssl_options{} = Opts, RecordCB) -> 
@@ -1569,12 +2295,26 @@ new_ssl_options([{eccs, Value} | Rest], #ssl_options{} = Opts, RecordCB) ->
 			 handle_eccs_option(Value, RecordCB:highest_protocol_version())
 		    },
 		    RecordCB);
+new_ssl_options([{supported_groups, Value} | Rest], #ssl_options{} = Opts, RecordCB) ->
+    new_ssl_options(Rest,
+		    Opts#ssl_options{supported_groups =
+			 handle_supported_groups_option(Value, RecordCB:highest_protocol_version())
+		    },
+		    RecordCB);
 new_ssl_options([{signature_algs, Value} | Rest], #ssl_options{} = Opts, RecordCB) -> 
     new_ssl_options(Rest, 
 		    Opts#ssl_options{signature_algs = 
 					 handle_hashsigns_option(Value, 
 								 tls_version(RecordCB:highest_protocol_version()))}, 
 		    RecordCB);
+new_ssl_options([{signature_algs_cert, Value} | Rest], #ssl_options{} = Opts, RecordCB) ->
+    new_ssl_options(
+      Rest,
+      Opts#ssl_options{signature_algs_cert =
+                           handle_signature_algorithms_option(
+                             Value,
+                             tls_version(RecordCB:highest_protocol_version()))},
+      RecordCB);
 new_ssl_options([{protocol, dtls = Value} | Rest], #ssl_options{} = Opts, dtls_record = RecordCB) -> 
     new_ssl_options(Rest, Opts#ssl_options{protocol = Value}, RecordCB);
 new_ssl_options([{protocol, tls = Value} | Rest], #ssl_options{} = Opts, tls_record = RecordCB) -> 
@@ -1636,15 +2376,24 @@ handle_verify_options(Opts, CaCerts) ->
 	    throw({error, {options, {verify, Value}}})
     end.
 
+%% Added to handle default values for signature_algs in TLS 1.3
+default_option_role_sign_algs(_, Value, _, Version) when Version >= {3,4} ->
+    Value;
+default_option_role_sign_algs(Role, Value, Role, _) ->
+    Value;
+default_option_role_sign_algs(_, _, _, _) ->
+    undefined.
+
 default_option_role(Role, Value, Role) ->
     Value;
 default_option_role(_,_,_) ->
     undefined.
 
+
 default_cb_info(tls) ->
-    {gen_tcp, tcp, tcp_closed, tcp_error};
+    {gen_tcp, tcp, tcp_closed, tcp_error, tcp_passive};
 default_cb_info(dtls) ->
-    {gen_udp, udp, udp_closed, udp_error}.
+    {gen_udp, udp, udp_closed, udp_error, udp_passive}.
 
 include_security_info([]) ->
     false;
diff --git a/lib/ssl/src/ssl_alert.erl b/lib/ssl/src/ssl_alert.erl
index 34e9797f1f..2d57b72f7b 100644
--- a/lib/ssl/src/ssl_alert.erl
+++ b/lib/ssl/src/ssl_alert.erl
@@ -32,7 +32,11 @@
 -include("ssl_record.hrl").
 -include("ssl_internal.hrl").
 
--export([decode/1, own_alert_txt/1, alert_txt/1, reason_code/2]).
+-export([decode/1, 
+         own_alert_txt/1, 
+         alert_txt/1,
+         alert_txt/4, 
+         reason_code/4]).
 
 %%====================================================================
 %% Internal application API
@@ -48,18 +52,29 @@ decode(Bin) ->
     decode(Bin, [], 0).
 
 %%--------------------------------------------------------------------
--spec reason_code(#alert{}, client | server) ->
-                         closed | {tls_alert, unicode:chardata()}.
-%-spec reason_code(#alert{}, client | server) -> closed | {essl, string()}.
+-spec reason_code(#alert{}, client | server, ProtocolName::string(), StateName::atom()) ->
+                         {tls_alert, {atom(), unicode:chardata()}} | closed.
 %%
 %% Description: Returns the error reason that will be returned to the
 %% user.
 %%--------------------------------------------------------------------
 
-reason_code(#alert{description = ?CLOSE_NOTIFY}, _) ->
+reason_code(#alert{description = ?CLOSE_NOTIFY}, _, _, _) ->
     closed;
-reason_code(#alert{description = Description}, _) ->
-    {tls_alert, string:casefold(description_txt(Description))}.
+reason_code(#alert{description = Description, role = Role} = Alert, Role, ProtocolName, StateName) ->
+    Txt = lists:flatten(alert_txt(ProtocolName, Role, StateName, own_alert_txt(Alert))),
+    {tls_alert, {description_atom(Description), Txt}};
+reason_code(#alert{description = Description} = Alert, Role, ProtocolName, StateName) ->
+    Txt = lists:flatten(alert_txt(ProtocolName, Role, StateName, alert_txt(Alert))),
+    {tls_alert, {description_atom(Description), Txt}}.
+
+%%--------------------------------------------------------------------
+-spec alert_txt(string(), server | client, StateNam::atom(), string()) -> string().
+%%
+%% Description: Generates alert text for log or string part of error return.
+%%--------------------------------------------------------------------
+alert_txt(ProtocolName, Role, StateName, Txt) ->
+    io_lib:format("~s ~p: In state ~p ~s\n", [ProtocolName, Role, StateName, Txt]).
 
 %%--------------------------------------------------------------------
 -spec own_alert_txt(#alert{}) -> string().
@@ -159,10 +174,14 @@ description_txt(?INSUFFICIENT_SECURITY) ->
     "Insufficient Security";
 description_txt(?INTERNAL_ERROR) ->
     "Internal Error";
+description_txt(?INAPPROPRIATE_FALLBACK) ->
+    "Inappropriate Fallback";
 description_txt(?USER_CANCELED) ->
     "User Canceled";
 description_txt(?NO_RENEGOTIATION) ->
     "No Renegotiation";
+description_txt(?MISSING_EXTENSION) ->
+    "Missing extension";
 description_txt(?UNSUPPORTED_EXTENSION) ->
     "Unsupported Extension";
 description_txt(?CERTIFICATE_UNOBTAINABLE) ->
@@ -175,9 +194,80 @@ description_txt(?BAD_CERTIFICATE_HASH_VALUE) ->
     "Bad Certificate Hash Value";
 description_txt(?UNKNOWN_PSK_IDENTITY) ->
     "Unknown Psk Identity";
-description_txt(?INAPPROPRIATE_FALLBACK) ->
-    "Inappropriate Fallback";
+description_txt(?CERTIFICATE_REQUIRED) ->
+    "Certificate required";
 description_txt(?NO_APPLICATION_PROTOCOL) ->
     "No application protocol";
 description_txt(Enum) ->
     lists:flatten(io_lib:format("unsupported/unknown alert: ~p", [Enum])).
+
+description_atom(?CLOSE_NOTIFY) ->
+    close_notify;
+description_atom(?UNEXPECTED_MESSAGE) ->
+    unexpected_message;
+description_atom(?BAD_RECORD_MAC) ->
+    bad_record_mac;
+description_atom(?DECRYPTION_FAILED_RESERVED) ->
+    decryption_failed_reserved;
+description_atom(?RECORD_OVERFLOW) ->
+    record_overflow;
+description_atom(?DECOMPRESSION_FAILURE) ->
+    decompression_failure;
+description_atom(?HANDSHAKE_FAILURE) ->
+    handshake_failure;
+description_atom(?NO_CERTIFICATE_RESERVED) ->
+    no_certificate_reserved;
+description_atom(?BAD_CERTIFICATE) ->
+    bad_certificate;
+description_atom(?UNSUPPORTED_CERTIFICATE) ->
+    unsupported_certificate;
+description_atom(?CERTIFICATE_REVOKED) ->
+    certificate_revoked;
+description_atom(?CERTIFICATE_EXPIRED) ->
+    certificate_expired;
+description_atom(?CERTIFICATE_UNKNOWN) ->
+    certificate_unknown;
+description_atom(?ILLEGAL_PARAMETER) ->
+    illegal_parameter;
+description_atom(?UNKNOWN_CA) ->
+    unknown_ca;
+description_atom(?ACCESS_DENIED) ->
+    access_denied;
+description_atom(?DECODE_ERROR) ->
+    decode_error;
+description_atom(?DECRYPT_ERROR) ->
+    decrypt_error;
+description_atom(?EXPORT_RESTRICTION) ->
+    export_restriction;
+description_atom(?PROTOCOL_VERSION) ->
+    protocol_version;
+description_atom(?INSUFFICIENT_SECURITY) ->
+    insufficient_security;
+description_atom(?INTERNAL_ERROR) ->
+    internal_error;
+description_atom(?INAPPROPRIATE_FALLBACK) ->
+    inappropriate_fallback;
+description_atom(?USER_CANCELED) ->
+    user_canceled;
+description_atom(?NO_RENEGOTIATION) ->
+    no_renegotiation;
+description_atom(?MISSING_EXTENSION) ->
+    missing_extension;
+description_atom(?UNSUPPORTED_EXTENSION) ->
+    unsupported_extension;
+description_atom(?CERTIFICATE_UNOBTAINABLE) ->
+    certificate_unobtainable;
+description_atom(?UNRECOGNISED_NAME) ->
+    unrecognised_name;
+description_atom(?BAD_CERTIFICATE_STATUS_RESPONSE) ->
+    bad_certificate_status_response;
+description_atom(?BAD_CERTIFICATE_HASH_VALUE) ->
+    bad_certificate_hash_value;
+description_atom(?UNKNOWN_PSK_IDENTITY) ->
+    unknown_psk_identity;
+description_atom(?CERTIFICATE_REQUIRED) ->
+    certificate_required;
+description_atom(?NO_APPLICATION_PROTOCOL) ->
+    no_application_protocol;
+description_atom(_) ->
+    'unsupported/unknown_alert'.
diff --git a/lib/ssl/src/ssl_alert.hrl b/lib/ssl/src/ssl_alert.hrl
index b23123905e..9b2322da17 100644
--- a/lib/ssl/src/ssl_alert.hrl
+++ b/lib/ssl/src/ssl_alert.hrl
@@ -29,6 +29,9 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Alert protocol - RFC 2246 section 7.2
+%%% updated by RFC 8486 with
+%%% missing_extension(109),
+%%% certificate_required(116),
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %% AlertLevel
@@ -100,12 +103,14 @@
 -define(INAPPROPRIATE_FALLBACK, 86).
 -define(USER_CANCELED, 90).
 -define(NO_RENEGOTIATION, 100).
+-define(MISSING_EXTENSION, 109).
 -define(UNSUPPORTED_EXTENSION, 110).
 -define(CERTIFICATE_UNOBTAINABLE, 111).
 -define(UNRECOGNISED_NAME, 112).
 -define(BAD_CERTIFICATE_STATUS_RESPONSE, 113).
 -define(BAD_CERTIFICATE_HASH_VALUE, 114).
 -define(UNKNOWN_PSK_IDENTITY, 115).
+-define(CERTIFICATE_REQUIRED, 116).
 -define(NO_APPLICATION_PROTOCOL, 120).
 
 -define(ALERT_REC(Level,Desc), #alert{level=Level,description=Desc,where={?FILE, ?LINE}}).
diff --git a/lib/ssl/src/ssl_api.hrl b/lib/ssl/src/ssl_api.hrl
index 7b7b1cbcd9..f4594912bd 100644
--- a/lib/ssl/src/ssl_api.hrl
+++ b/lib/ssl/src/ssl_api.hrl
@@ -21,56 +21,7 @@
 -ifndef(ssl_api).
 -define(ssl_api, true).
 
--include("ssl_cipher.hrl").
-
-%% Visible in API
--export_type([connect_option/0, listen_option/0, ssl_option/0, transport_option/0,
-	      prf_random/0, sslsocket/0]).
-
-
 %% Looks like it does for backwards compatibility reasons
 -record(sslsocket, {fd = nil, pid = nil}).
 
-
--type sslsocket()                :: #sslsocket{}.
--type connect_option()           :: socket_connect_option() | ssl_option() | transport_option().
--type socket_connect_option()    :: gen_tcp:connect_option().
--type listen_option()            :: socket_listen_option() | ssl_option() | transport_option().
--type socket_listen_option()     :: gen_tcp:listen_option().
-
--type ssl_option()    :: {versions, ssl_record:ssl_atom_version()} |
-			 {verify, verify_type()} |
-			 {verify_fun, {fun(), InitialUserState::term()}} |
-                         {fail_if_no_peer_cert, boolean()} | {depth, integer()} |
-                         {cert, Der::binary()} | {certfile, path()} |
-                         {key, {private_key_type(), Der::binary()}} |
-                         {keyfile, path()} | {password, string()} | {cacerts, [Der::binary()]} |
-                         {cacertfile, path()} | {dh, Der::binary()} | {dhfile, path()} |
-                         {user_lookup_fun, {fun(), InitialUserState::term()}} |
-                         {psk_identity, string()} |
-                         {srp_identity, {string(), string()}} |
-                         {ciphers, ciphers()} | {ssl_imp, ssl_imp()} | {reuse_sessions, boolean()} |
-                         {reuse_session, fun()} | {hibernate_after, integer()|undefined} |
-                         {alpn_advertised_protocols, [binary()]} |
-                         {alpn_preferred_protocols, [binary()]} |
-                         {next_protocols_advertised, list(binary())} |
-                         {client_preferred_next_protocols, binary(), client | server, list(binary())}.
-
--type verify_type()  :: verify_none | verify_peer.
--type path()         :: string().
--type ciphers()      :: [ssl_cipher_format:erl_cipher_suite()] |
-			string(). % (according to old API)
--type ssl_imp()      :: new | old.
-
--type transport_option() :: {cb_info, {CallbackModule::atom(), DataTag::atom(),
-				       ClosedTag::atom(), ErrTag::atom()}}.
--type prf_random() :: client_random | server_random.
-
--type private_key_type() :: rsa | %% Backwards compatibility
-                            dsa | %% Backwards compatibility
-                            'RSAPrivateKey' |
-                            'DSAPrivateKey' |
-                            'ECPrivateKey' |
-                            'PrivateKeyInfo'.
-
 -endif. % -ifdef(ssl_api).
diff --git a/lib/ssl/src/ssl_app.erl b/lib/ssl/src/ssl_app.erl
index 62e8765d4a..9e6d676bef 100644
--- a/lib/ssl/src/ssl_app.erl
+++ b/lib/ssl/src/ssl_app.erl
@@ -29,9 +29,26 @@
 -export([start/2, stop/1]).
 
 start(_Type, _StartArgs) ->
+    start_logger(),
     ssl_sup:start_link().
 
 stop(_State) ->
+    stop_logger(),
     ok.
 
+%%
+%% Description: Start SSL logger
+start_logger() ->
+    Config = #{level => debug,
+               filter_default => stop,
+               formatter => {ssl_logger, #{}}},
+    Filter = {fun logger_filters:domain/2,{log,sub,[otp,ssl]}},
+    logger:add_handler(ssl_handler, logger_std_h, Config),
+    logger:add_handler_filter(ssl_handler, filter_non_ssl, Filter),
+    logger:set_application_level(ssl, debug).
 
+%%
+%% Description: Stop SSL logger
+stop_logger() ->
+    logger:unset_application_level(ssl),
+    logger:remove_handler(ssl_handler).
diff --git a/lib/ssl/src/ssl_certificate.erl b/lib/ssl/src/ssl_certificate.erl
index 549e557beb..9997f5e0c8 100644
--- a/lib/ssl/src/ssl_certificate.erl
+++ b/lib/ssl/src/ssl_certificate.erl
@@ -71,7 +71,7 @@ trusted_cert_and_path(CertChain, CertDbHandle, CertDbRef, PartialChainHandler) -
     
     case SignedAndIssuerID of
 	{error, issuer_not_found} ->
-	    %% The root CA was not sent and can not be found.
+	    %% The root CA was not sent and cannot be found.
 	    handle_incomplete_chain(Path, PartialChainHandler);
 	{self, _} when length(Path) == 1 ->
 	    {selfsigned_peer, Path};
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl
index 54c04c13e5..c16e2331ff 100644
--- a/lib/ssl/src/ssl_cipher.erl
+++ b/lib/ssl/src/ssl_cipher.erl
@@ -1,7 +1,7 @@
 %
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2019. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -31,18 +31,24 @@
 -include("ssl_cipher.hrl").
 -include("ssl_handshake.hrl").
 -include("ssl_alert.hrl").
+-include("tls_handshake_1_3.hrl").
 -include_lib("public_key/include/public_key.hrl").
 
--export([security_parameters/2, security_parameters/3, 
-	 cipher_init/3, nonce_seed/2, decipher/6, cipher/5, aead_encrypt/5, aead_decrypt/6,
+-export([security_parameters/2, security_parameters/3, security_parameters_1_3/2,
+	 cipher_init/3, nonce_seed/2, decipher/6, cipher/5, aead_encrypt/6, aead_decrypt/6,
 	 suites/1, all_suites/1,  crypto_support_filters/0,
 	 chacha_suites/1, anonymous_suites/1, psk_suites/1, psk_suites_anon/1, 
-         srp_suites/0, srp_suites_anon/0,
+         srp_suites/1, srp_suites_anon/1,
 	 rc4_suites/1, des_suites/1, rsa_suites/1, 
          filter/3, 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]).
+	 random_bytes/1, calc_mac_hash/4, calc_mac_hash/6,
+         is_stream_ciphersuite/1, signature_scheme/1,
+         scheme_to_components/1, hash_size/1, effective_key_bits/1,
+         key_material/1, signature_algorithm_to_scheme/1]).
+
+%% RFC 8446 TLS 1.3
+-export([generate_client_shares/1, generate_server_share/1, add_zero_padding/2]).
 
 -compile(inline).
 
@@ -70,7 +76,7 @@ security_parameters(?TLS_NULL_WITH_NULL_NULL = CipherSuite, SecParams) ->
 %%-------------------------------------------------------------------
 security_parameters(Version, CipherSuite, SecParams) ->
     #{cipher := Cipher, mac := Hash, 
-      prf := PrfHashAlg} = ssl_cipher_format:suite_definition(CipherSuite),
+      prf := PrfHashAlg} = ssl_cipher_format:suite_bin_to_map(CipherSuite),
     SecParams#security_parameters{
       cipher_suite = CipherSuite,
       bulk_cipher_algorithm = bulk_cipher_algorithm(Cipher),
@@ -83,6 +89,15 @@ security_parameters(Version, CipherSuite, SecParams) ->
       prf_algorithm = prf_algorithm(PrfHashAlg, Version),
       hash_size = hash_size(Hash)}.
 
+security_parameters_1_3(SecParams, CipherSuite) ->
+     #{cipher := Cipher, prf := PrfHashAlg} =
+        ssl_cipher_format:suite_bin_to_map(CipherSuite),
+    SecParams#security_parameters{
+      cipher_suite = CipherSuite,
+      bulk_cipher_algorithm = bulk_cipher_algorithm(Cipher),
+      prf_algorithm = PrfHashAlg,  %% HKDF hash algorithm
+      cipher_type = ?AEAD}.
+
 %%--------------------------------------------------------------------
 -spec cipher_init(cipher_enum(), binary(), binary()) -> #cipher_state{}.
 %%
@@ -91,13 +106,18 @@ security_parameters(Version, CipherSuite, SecParams) ->
 cipher_init(?RC4, IV, Key) ->
     State = crypto:stream_init(rc4, Key),
     #cipher_state{iv = IV, key = Key, state = State};
-cipher_init(?AES_GCM, IV, Key) ->
+cipher_init(Type, IV, Key) when Type == ?AES_GCM;
+                                Type == ?AES_CCM ->
     <<Nonce:64>> = random_bytes(8),
     #cipher_state{iv = IV, key = Key, nonce = Nonce, tag_len = 16};
+cipher_init(?AES_CCM_8, IV, Key) ->
+    <<Nonce:64>> = random_bytes(8),
+    #cipher_state{iv = IV, key = Key, nonce = Nonce, tag_len = 8};
 cipher_init(?CHACHA20_POLY1305, IV, Key) ->
     #cipher_state{iv = IV, key = Key, tag_len = 16};
 cipher_init(_BCA, IV, Key) ->
-    #cipher_state{iv = IV, key = Key}.
+    %% Initialize random IV cache, not used for aead ciphers
+    #cipher_state{iv = IV, key = Key, state = <<>>}.
 
 nonce_seed(Seed, CipherState) ->
     CipherState#cipher_state{nonce = Seed}.
@@ -112,12 +132,11 @@ nonce_seed(Seed, CipherState) ->
 %% data is calculated and the data plus the HMAC is ecncrypted.
 %%-------------------------------------------------------------------
 cipher(?NULL, CipherState, <<>>, Fragment, _Version) ->
-    GenStreamCipherList = [Fragment, <<>>],
-    {GenStreamCipherList, CipherState};
+    {iolist_to_binary(Fragment), CipherState};
 cipher(?RC4, CipherState = #cipher_state{state = State0}, Mac, Fragment, _Version) ->
     GenStreamCipherList = [Fragment, Mac],
     {State1, T} = crypto:stream_encrypt(State0, GenStreamCipherList),
-    {T, CipherState#cipher_state{state = State1}};
+    {iolist_to_binary(T), CipherState#cipher_state{state = State1}};
 cipher(?DES, CipherState, Mac, Fragment, Version) ->
     block_cipher(fun(Key, IV, T) ->
 			 crypto:block_encrypt(des_cbc, Key, IV, T)
@@ -133,21 +152,24 @@ cipher(?AES_CBC, CipherState, Mac, Fragment, Version) ->
 			 crypto:block_encrypt(aes_cbc256, Key, IV, T)
 		 end, block_size(aes_128_cbc), CipherState, Mac, Fragment, Version).
 
-aead_encrypt(Type, Key, Nonce, Fragment, AdditionalData) ->
-    crypto:block_encrypt(aead_type(Type), Key, Nonce, {AdditionalData, Fragment}).
+aead_encrypt(Type, Key, Nonce, Fragment, AdditionalData, TagLen) ->
+    crypto:block_encrypt(aead_type(Type), Key, Nonce, {AdditionalData, Fragment, TagLen}).
 
 aead_decrypt(Type, Key, Nonce, CipherText, CipherTag, AdditionalData) ->
     crypto:block_decrypt(aead_type(Type), Key, Nonce, {AdditionalData, CipherText, CipherTag}).
 
 aead_type(?AES_GCM) ->
     aes_gcm;
+aead_type(?AES_CCM) ->
+    aes_ccm;
+aead_type(?AES_CCM_8) ->
+    aes_ccm;
 aead_type(?CHACHA20_POLY1305) ->
     chacha20_poly1305.
 
 build_cipher_block(BlockSz, Mac, Fragment) ->
     TotSz = byte_size(Mac) + erlang:iolist_size(Fragment) + 1,
-    {PaddingLength, Padding} = get_padding(TotSz, BlockSz),
-    [Fragment, Mac, PaddingLength, Padding].
+    [Fragment, Mac, padding_with_len(TotSz, BlockSz)].
 
 block_cipher(Fun, BlockSz, #cipher_state{key=Key, iv=IV} = CS0,
 	     Mac, Fragment, {3, N})
@@ -157,14 +179,21 @@ block_cipher(Fun, BlockSz, #cipher_state{key=Key, iv=IV} = CS0,
     NextIV = next_iv(T, IV),
     {T, CS0#cipher_state{iv=NextIV}};
 
-block_cipher(Fun, BlockSz, #cipher_state{key=Key, iv=IV} = CS0,
+block_cipher(Fun, BlockSz, #cipher_state{key=Key, iv=IV, state = IV_Cache0} = CS0,
 	     Mac, Fragment, {3, N})
-  when N == 2; N == 3 ->
-    NextIV = random_iv(IV),
+  when N == 2; N == 3; N == 4 ->
+    IV_Size = byte_size(IV),
+    <<NextIV:IV_Size/binary, IV_Cache/binary>> =
+        case IV_Cache0 of
+            <<>> ->
+                random_bytes(IV_Size bsl 5); % 32 IVs
+            _ ->
+                IV_Cache0
+        end,
     L0 = build_cipher_block(BlockSz, Mac, Fragment),
     L = [NextIV|L0],
     T = Fun(Key, IV, L),
-    {T, CS0#cipher_state{iv=NextIV}}.
+    {T, CS0#cipher_state{iv=NextIV, state = IV_Cache}}.
 
 %%--------------------------------------------------------------------
 -spec decipher(cipher_enum(), integer(), #cipher_state{}, binary(), 
@@ -255,7 +284,7 @@ all_suites({3, _} = Version) ->
     suites(Version)
         ++ chacha_suites(Version)
 	++ psk_suites(Version)
-	++ srp_suites()
+	++ srp_suites(Version)
         ++ rc4_suites(Version)
         ++ des_suites(Version)
         ++ rsa_suites(Version);
@@ -284,12 +313,13 @@ chacha_suites(_) ->
 %% Description: Returns a list of the anonymous cipher suites, only supported
 %% if explicitly set by user. Intended only for testing.
 %%--------------------------------------------------------------------
-anonymous_suites({3, N}) ->
-    srp_suites_anon() ++ anonymous_suites(N);
+anonymous_suites({3, N} = Version) ->
+    srp_suites_anon(Version) ++ anonymous_suites(N);
 anonymous_suites({254, _} = Version) ->
     dtls_v1:anonymous_suites(Version);
-anonymous_suites(N)
-  when N >= 3 ->
+anonymous_suites(4) ->
+    []; %% Raw public key negotiation may be used instead
+anonymous_suites( 3 = N) ->
     psk_suites_anon(N) ++
     [?TLS_DH_anon_WITH_AES_128_GCM_SHA256,
      ?TLS_DH_anon_WITH_AES_256_GCM_SHA384,
@@ -322,8 +352,9 @@ anonymous_suites(N)  when N == 0;
 %%--------------------------------------------------------------------
 psk_suites({3, N}) ->
     psk_suites(N);
-psk_suites(N)
-  when N >= 3 ->
+psk_suites(4) ->
+    []; %% TODO Add new PSK, PSK_(EC)DHE suites
+psk_suites(3) ->
     [
      ?TLS_RSA_PSK_WITH_AES_256_GCM_SHA384,
      ?TLS_RSA_PSK_WITH_AES_256_CBC_SHA384,
@@ -344,22 +375,34 @@ psk_suites(_) ->
 %%--------------------------------------------------------------------
 psk_suites_anon({3, N}) ->
     psk_suites_anon(N);
-psk_suites_anon(N)
-  when N >= 3 ->
+psk_suites_anon(3 = N) ->
     [
      ?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_PSK_WITH_AES_256_CBC_SHA384,
+     ?TLS_DHE_PSK_WITH_AES_256_CCM,
+     ?TLS_PSK_DHE_WITH_AES_256_CCM_8,
+     ?TLS_PSK_WITH_AES_256_CCM,
+     ?TLS_PSK_WITH_AES_256_CCM_8,
      ?TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256,
+     ?TLS_ECDHE_PSK_WITH_AES_128_CCM_SHA256,
+     ?TLS_ECDHE_PSK_WITH_AES_128_CCM_8_SHA256,
      ?TLS_DHE_PSK_WITH_AES_128_GCM_SHA256,
      ?TLS_PSK_WITH_AES_128_GCM_SHA256,
+     ?TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256,
+     ?TLS_ECDHE_PSK_WITH_AES_128_CCM_8_SHA256,
      ?TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256,
      ?TLS_DHE_PSK_WITH_AES_128_CBC_SHA256,
-     ?TLS_PSK_WITH_AES_128_CBC_SHA256
-    ] ++ psk_suites_anon(0);
-psk_suites_anon(_) ->
+     ?TLS_PSK_WITH_AES_128_CBC_SHA256,
+     ?TLS_DHE_PSK_WITH_AES_128_CCM,
+     ?TLS_PSK_DHE_WITH_AES_128_CCM_8,
+     ?TLS_PSK_WITH_AES_128_CCM,
+     ?TLS_PSK_WITH_AES_128_CCM_8,
+     ?TLS_ECDHE_PSK_WITH_RC4_128_SHA
+    ] ++ psk_suites_anon(N-1);
+psk_suites_anon(N) when  N > 0 ->
 	[?TLS_DHE_PSK_WITH_AES_256_CBC_SHA,
 	 ?TLS_PSK_WITH_AES_256_CBC_SHA,
 	 ?TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA,
@@ -370,14 +413,18 @@ psk_suites_anon(_) ->
 	 ?TLS_PSK_WITH_3DES_EDE_CBC_SHA,
 	 ?TLS_ECDHE_PSK_WITH_RC4_128_SHA,
 	 ?TLS_DHE_PSK_WITH_RC4_128_SHA,
-	 ?TLS_PSK_WITH_RC4_128_SHA].
+	 ?TLS_PSK_WITH_RC4_128_SHA];
+psk_suites_anon(0) ->
+    [].
 %%--------------------------------------------------------------------
--spec srp_suites() -> [ssl_cipher_format:cipher_suite()].
+-spec srp_suites(tls_record:tls_version()) -> [ssl_cipher_format:cipher_suite()].
 %%
 %% Description: Returns a list of the SRP cipher suites, only supported
 %% if explicitly set by user.
 %%--------------------------------------------------------------------
-srp_suites() ->
+srp_suites({3,0}) ->
+    [];
+srp_suites(_) ->
     [?TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA,
      ?TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA,
      ?TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA,
@@ -386,12 +433,14 @@ srp_suites() ->
      ?TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA].
 
 %%--------------------------------------------------------------------
--spec srp_suites_anon() -> [ssl_cipher_format:cipher_suite()].
+-spec srp_suites_anon(tls_record:tls_version()) -> [ssl_cipher_format:cipher_suite()].
 %%
 %% Description: Returns a list of the SRP anonymous cipher suites, only supported
 %% if explicitly set by user.
 %%--------------------------------------------------------------------
-srp_suites_anon() ->
+srp_suites_anon({3,0}) ->
+    [];
+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].
@@ -412,11 +461,12 @@ rc4_suites({3, Minor}) ->
 rc4_suites(0) ->
     [?TLS_RSA_WITH_RC4_128_SHA,
      ?TLS_RSA_WITH_RC4_128_MD5];
-rc4_suites(N) when N =< 3 ->
+rc4_suites(N) when N =< 4 ->
     [?TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
      ?TLS_ECDHE_RSA_WITH_RC4_128_SHA,
      ?TLS_ECDH_ECDSA_WITH_RC4_128_SHA,
      ?TLS_ECDH_RSA_WITH_RC4_128_SHA].
+
 %%--------------------------------------------------------------------
 -spec des_suites(Version::ssl_record:ssl_version()) -> [ssl_cipher_format:cipher_suite()].
 %%
@@ -451,7 +501,7 @@ rsa_suites(0) ->
      ?TLS_RSA_WITH_AES_128_CBC_SHA,
      ?TLS_RSA_WITH_3DES_EDE_CBC_SHA
     ];  
-rsa_suites(N) when N =< 3 ->
+rsa_suites(N) when N =< 4 ->
     [
      ?TLS_RSA_WITH_AES_256_GCM_SHA384,
      ?TLS_RSA_WITH_AES_256_CBC_SHA256,
@@ -481,8 +531,8 @@ filter(DerCert, Ciphers0, Version) ->
     filter_suites_signature(Sign, Ciphers, Version).
 
 %%--------------------------------------------------------------------
--spec filter_suites([ssl_cipher_format:erl_cipher_suite()] | [ssl_cipher_format:cipher_suite()], map()) ->
-                           [ssl_cipher_format:erl_cipher_suite()] |  [ssl_cipher_format:cipher_suite()].
+-spec filter_suites([ssl:erl_cipher_suite()] | [ssl_cipher_format:cipher_suite()], map()) ->
+                           [ssl:erl_cipher_suite()] |  [ssl_cipher_format:cipher_suite()].
 %%
 %% Description: Filter suites using supplied filter funs
 %%-------------------------------------------------------------------	
@@ -505,11 +555,11 @@ filter_suite(#{key_exchange := KeyExchange,
         all_filters(Hash, HashFilters) andalso
         all_filters(Prf, PrfFilters);
 filter_suite(Suite, Filters) ->
-    filter_suite(ssl_cipher_format:suite_definition(Suite), Filters).
+    filter_suite(ssl_cipher_format:suite_bin_to_map(Suite), Filters).
 
 %%--------------------------------------------------------------------
--spec filter_suites([ssl_cipher_format:erl_cipher_suite()] | [ssl_cipher_format:cipher_suite()]) -> 
-                           [ssl_cipher_format:erl_cipher_suite()] | [ssl_cipher_format:cipher_suite()].
+-spec filter_suites([ssl:erl_cipher_suite()] | [ssl_cipher_format:cipher_suite()]) -> 
+                           [ssl:erl_cipher_suite()] | [ssl_cipher_format:cipher_suite()].
 %%
 %% Description: Filter suites for algorithms supported by crypto.
 %%-------------------------------------------------------------------
@@ -550,7 +600,8 @@ crypto_support_filters() ->
           end]}.
 
 is_acceptable_keyexchange(KeyExchange, _Algos) when KeyExchange == psk;
-                                                    KeyExchange == null ->
+                                                    KeyExchange == null;
+                                                    KeyExchange == any ->
     true;
 is_acceptable_keyexchange(KeyExchange, Algos) when KeyExchange == dh_anon;
                                                    KeyExchange == dhe_psk ->
@@ -562,7 +613,7 @@ is_acceptable_keyexchange(dhe_rsa, Algos) ->
     proplists:get_bool(dh, Algos) andalso
         proplists:get_bool(rsa, Algos);
 is_acceptable_keyexchange(KeyExchange, Algos) when KeyExchange == ecdh_anon;
-                                                   KeyExchange == ecdhe_psk ->
+                                                   KeyExchange == ecdhe_psk ->        
     proplists:get_bool(ecdh, Algos);
 is_acceptable_keyexchange(KeyExchange, Algos) when KeyExchange == ecdh_ecdsa;
                                                    KeyExchange == ecdhe_ecdsa ->
@@ -593,7 +644,7 @@ is_acceptable_cipher(rc4_128, Algos) ->
 is_acceptable_cipher(des_cbc, Algos) ->
     proplists:get_bool(des_cbc, Algos);
 is_acceptable_cipher('3des_ede_cbc', Algos) ->
-    proplists:get_bool(des3_cbc, Algos);
+    proplists:get_bool(des_ede3, Algos);
 is_acceptable_cipher(aes_128_cbc, Algos) ->
     proplists:get_bool(aes_cbc128, Algos);
 is_acceptable_cipher(aes_256_cbc, Algos) ->
@@ -602,6 +653,12 @@ is_acceptable_cipher(Cipher, Algos)
   when Cipher == aes_128_gcm;
        Cipher == aes_256_gcm ->
     proplists:get_bool(aes_gcm, Algos);
+is_acceptable_cipher(Cipher, Algos)
+  when Cipher == aes_128_ccm;
+       Cipher == aes_256_ccm;
+       Cipher == aes_128_ccm_8;
+       Cipher == aes_256_ccm_8 ->
+    proplists:get_bool(aes_ccm, Algos);
 is_acceptable_cipher(Cipher, Algos) ->
     proplists:get_bool(Cipher, Algos).
 
@@ -633,17 +690,40 @@ random_bytes(N) ->
 calc_mac_hash(Type, Version,
 	      PlainFragment, #{sequence_number := SeqNo,
 			       mac_secret := MacSecret,
-			       security_parameters:=
-				   SecPars}) ->
+			       security_parameters :=
+				   #security_parameters{mac_algorithm = MacAlgorithm}}) ->
+    calc_mac_hash(Type, Version, PlainFragment, MacAlgorithm, MacSecret, SeqNo).
+%%
+calc_mac_hash(Type, Version, PlainFragment, MacAlgorithm, MacSecret, SeqNo) ->
     Length = erlang:iolist_size(PlainFragment),
-    mac_hash(Version, SecPars#security_parameters.mac_algorithm,
-	     MacSecret, SeqNo, Type,
-	     Length, PlainFragment).
+    mac_hash(Version, MacAlgorithm, MacSecret, SeqNo, Type, Length, PlainFragment).
 
 is_stream_ciphersuite(#{cipher := rc4_128}) ->
     true;
 is_stream_ciphersuite(_) ->
     false.
+
+-spec  hash_size(atom()) -> integer().
+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) ->
+    20;
+%% Uncomment when adding cipher suite that needs it
+%hash_size(sha224) ->
+%    28;
+hash_size(sha256) ->
+    32;
+hash_size(sha384) ->
+    48;
+hash_size(sha512) ->
+    64.
+
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
@@ -653,7 +733,7 @@ mac_hash({_,_}, ?NULL, _MacSecret, _SeqNo, _Type,
 mac_hash({3, 0}, MacAlg, MacSecret, SeqNo, Type, Length, Fragment) ->
     ssl_v3:mac_hash(MacAlg, MacSecret, SeqNo, Type, Length, Fragment);
 mac_hash({3, N} = Version, MacAlg, MacSecret, SeqNo, Type, Length, Fragment)  
-  when N =:= 1; N =:= 2; N =:= 3 ->
+  when N =:= 1; N =:= 2; N =:= 3; N =:= 4 ->
     tls_v1:mac_hash(MacAlg, MacSecret, SeqNo, Type, Version,
 		      Length, Fragment).
 
@@ -671,6 +751,12 @@ bulk_cipher_algorithm(Cipher) when Cipher == aes_128_cbc;
 bulk_cipher_algorithm(Cipher) when Cipher == aes_128_gcm;
 				   Cipher == aes_256_gcm ->
     ?AES_GCM;
+bulk_cipher_algorithm(Cipher) when Cipher == aes_128_ccm;
+				   Cipher == aes_256_ccm ->
+    ?AES_CCM;
+bulk_cipher_algorithm(Cipher) when Cipher == aes_128_ccm_8;
+				   Cipher == aes_256_ccm_8 ->
+    ?AES_CCM_8;
 bulk_cipher_algorithm(chacha20_poly1305) ->
     ?CHACHA20_POLY1305.
 
@@ -685,6 +771,10 @@ type(Cipher) when Cipher == des_cbc;
     ?BLOCK;
 type(Cipher) when Cipher == aes_128_gcm;
 		  Cipher == aes_256_gcm;
+                  Cipher == aes_128_ccm;
+		  Cipher == aes_256_ccm;
+                  Cipher == aes_128_ccm_8;
+		  Cipher == aes_256_ccm_8;
 		  Cipher == chacha20_poly1305 ->
     ?AEAD.
 
@@ -702,8 +792,16 @@ key_material(aes_256_cbc) ->
     32;
 key_material(aes_128_gcm) ->
     16;
+key_material(aes_128_ccm) ->
+    16;
+key_material(aes_128_ccm_8) ->
+    16;
 key_material(aes_256_gcm) ->
     32;
+key_material(aes_256_ccm_8) ->
+    32;
+key_material(aes_256_ccm) ->
+    32;
 key_material(chacha20_poly1305) ->
     32.
 
@@ -719,45 +817,58 @@ expanded_key_material(Cipher) when Cipher == aes_128_cbc;
 				   Cipher == aes_256_cbc;
 				   Cipher == aes_128_gcm;
 				   Cipher == aes_256_gcm;
+                                   Cipher == aes_128_ccm;
+				   Cipher == aes_256_ccm;
+                                   Cipher == aes_128_ccm_8;
+				   Cipher == aes_256_ccm_8;
 				   Cipher == chacha20_poly1305 ->
     unknown.  
 
-
 effective_key_bits(null) ->
     0;
 effective_key_bits(des_cbc) ->
     56;
 effective_key_bits(Cipher) when Cipher == rc4_128;
 				Cipher == aes_128_cbc;
-				Cipher == aes_128_gcm ->
+				Cipher == aes_128_gcm;
+                                Cipher == aes_128_ccm;
+                                Cipher == aes_128_ccm_8 ->
     128;
 effective_key_bits('3des_ede_cbc') ->
     168;
 effective_key_bits(Cipher) when Cipher == aes_256_cbc;
 				Cipher == aes_256_gcm;
+				Cipher == aes_256_ccm;
+                                Cipher == aes_256_ccm_8;
 				Cipher == chacha20_poly1305 ->
     256.
 
 iv_size(Cipher) when Cipher == null;
-		     Cipher == rc4_128;
-		     Cipher == chacha20_poly1305->
+		     Cipher == rc4_128 ->
     0;
-
 iv_size(Cipher) when Cipher == aes_128_gcm;
-		     Cipher == aes_256_gcm ->
+		     Cipher == aes_256_gcm;
+                     Cipher == aes_128_ccm;
+		     Cipher == aes_256_ccm;
+                     Cipher == aes_128_ccm_8;
+		     Cipher == aes_256_ccm_8 ->
     4;
-
+iv_size(chacha20_poly1305) ->
+    12;
 iv_size(Cipher) ->
     block_size(Cipher).
 
 block_size(Cipher) when Cipher == des_cbc;
 			Cipher == '3des_ede_cbc' -> 
     8;
-
 block_size(Cipher) when Cipher == aes_128_cbc;
 			Cipher == aes_256_cbc;
 			Cipher == aes_128_gcm;
 			Cipher == aes_256_gcm;
+                        Cipher == aes_128_ccm;
+			Cipher == aes_256_ccm;
+                        Cipher == aes_128_ccm_8;
+			Cipher == aes_256_ccm_8;
 			Cipher == chacha20_poly1305 ->
     16.
 
@@ -801,26 +912,93 @@ sign_algorithm(?ECDSA) -> ecdsa;
 sign_algorithm(Other) when is_integer(Other) andalso ((Other >= 4) and (Other =< 223)) -> unassigned;
 sign_algorithm(Other) when is_integer(Other) andalso ((Other >= 224) and (Other =< 255)) -> 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) ->
-    20;
-%% Uncomment when adding cipher suite that needs it
-%hash_size(sha224) ->
-%    28;
-hash_size(sha256) ->
-    32;
-hash_size(sha384) ->
-    48.
-%% Uncomment when adding cipher suite that needs it
-%hash_size(sha512) ->
-%    64.
+
+signature_scheme(rsa_pkcs1_sha256) -> ?RSA_PKCS1_SHA256;
+signature_scheme(rsa_pkcs1_sha384) -> ?RSA_PKCS1_SHA384;
+signature_scheme(rsa_pkcs1_sha512) -> ?RSA_PKCS1_SHA512;
+signature_scheme(ecdsa_secp256r1_sha256) -> ?ECDSA_SECP256R1_SHA256;
+signature_scheme(ecdsa_secp384r1_sha384) -> ?ECDSA_SECP384R1_SHA384;
+signature_scheme(ecdsa_secp521r1_sha512) -> ?ECDSA_SECP521R1_SHA512;
+signature_scheme(rsa_pss_rsae_sha256) -> ?RSA_PSS_RSAE_SHA256;
+signature_scheme(rsa_pss_rsae_sha384) -> ?RSA_PSS_RSAE_SHA384;
+signature_scheme(rsa_pss_rsae_sha512) -> ?RSA_PSS_RSAE_SHA512;
+signature_scheme(ed25519) -> ?ED25519;
+signature_scheme(ed448) -> ?ED448;
+signature_scheme(rsa_pss_pss_sha256) -> ?RSA_PSS_PSS_SHA256;
+signature_scheme(rsa_pss_pss_sha384) -> ?RSA_PSS_PSS_SHA384;
+signature_scheme(rsa_pss_pss_sha512) -> ?RSA_PSS_PSS_SHA512;
+signature_scheme(rsa_pkcs1_sha1) -> ?RSA_PKCS1_SHA1;
+signature_scheme(ecdsa_sha1) -> ?ECDSA_SHA1;
+%% Handling legacy signature algorithms
+signature_scheme({Hash0, Sign0}) ->
+    Hash = hash_algorithm(Hash0),
+    Sign = sign_algorithm(Sign0),
+    <<?UINT16(SigAlg)>> = <<?BYTE(Hash),?BYTE(Sign)>>,
+    SigAlg;
+signature_scheme(?RSA_PKCS1_SHA256) -> rsa_pkcs1_sha256;
+signature_scheme(?RSA_PKCS1_SHA384) -> rsa_pkcs1_sha384;
+signature_scheme(?RSA_PKCS1_SHA512) -> rsa_pkcs1_sha512;
+signature_scheme(?ECDSA_SECP256R1_SHA256) -> ecdsa_secp256r1_sha256;
+signature_scheme(?ECDSA_SECP384R1_SHA384) -> ecdsa_secp384r1_sha384;
+signature_scheme(?ECDSA_SECP521R1_SHA512) -> ecdsa_secp521r1_sha512;
+signature_scheme(?RSA_PSS_RSAE_SHA256) -> rsa_pss_rsae_sha256;
+signature_scheme(?RSA_PSS_RSAE_SHA384) -> rsa_pss_rsae_sha384;
+signature_scheme(?RSA_PSS_RSAE_SHA512) -> rsa_pss_rsae_sha512;
+signature_scheme(?ED25519) -> ed25519;
+signature_scheme(?ED448) -> ed448;
+signature_scheme(?RSA_PSS_PSS_SHA256) -> rsa_pss_pss_sha256;
+signature_scheme(?RSA_PSS_PSS_SHA384) -> rsa_pss_pss_sha384;
+signature_scheme(?RSA_PSS_PSS_SHA512) -> rsa_pss_pss_sha512;
+signature_scheme(?RSA_PKCS1_SHA1) -> rsa_pkcs1_sha1;
+signature_scheme(?ECDSA_SHA1) -> ecdsa_sha1;
+%% Handling legacy signature algorithms for logging purposes. These algorithms
+%% cannot be used in TLS 1.3 handshakes.
+signature_scheme(SignAlgo) when is_integer(SignAlgo) ->
+    <<?BYTE(Hash),?BYTE(Sign)>> = <<?UINT16(SignAlgo)>>,
+    {ssl_cipher:hash_algorithm(Hash), ssl_cipher:sign_algorithm(Sign)};
+signature_scheme(_) -> unassigned.
+%% TODO: reserved code points?
+
+scheme_to_components(rsa_pkcs1_sha256) -> {sha256, rsa_pkcs1, undefined};
+scheme_to_components(rsa_pkcs1_sha384) -> {sha384, rsa_pkcs1, undefined};
+scheme_to_components(rsa_pkcs1_sha512) -> {sha512, rsa_pkcs1, undefined};
+scheme_to_components(ecdsa_secp256r1_sha256) -> {sha256, ecdsa, secp256r1};
+scheme_to_components(ecdsa_secp384r1_sha384) -> {sha384, ecdsa, secp384r1};
+scheme_to_components(ecdsa_secp521r1_sha512) -> {sha512, ecdsa, secp521r1};
+scheme_to_components(rsa_pss_rsae_sha256) -> {sha256, rsa_pss_rsae, undefined};
+scheme_to_components(rsa_pss_rsae_sha384) -> {sha384, rsa_pss_rsae, undefined};
+scheme_to_components(rsa_pss_rsae_sha512) -> {sha512, rsa_pss_rsae, undefined};
+scheme_to_components(ed25519) -> {undefined, undefined, undefined};
+scheme_to_components(ed448) -> {undefined, undefined, undefined};
+scheme_to_components(rsa_pss_pss_sha256) -> {sha256, rsa_pss_pss, undefined};
+scheme_to_components(rsa_pss_pss_sha384) -> {sha384, rsa_pss_pss, undefined};
+scheme_to_components(rsa_pss_pss_sha512) -> {sha512, rsa_pss_pss, undefined};
+scheme_to_components(rsa_pkcs1_sha1) -> {sha1, rsa_pkcs1, undefined};
+scheme_to_components(ecdsa_sha1) -> {sha1, ecdsa, undefined};
+%% Handling legacy signature algorithms
+scheme_to_components({Hash,Sign}) -> {Hash, Sign, undefined}.
+
+
+%% TODO: Add support for ed25519, ed448, rsa_pss*
+signature_algorithm_to_scheme(#'SignatureAlgorithm'{algorithm = ?sha256WithRSAEncryption}) ->
+    rsa_pkcs1_sha256;
+signature_algorithm_to_scheme(#'SignatureAlgorithm'{algorithm = ?sha384WithRSAEncryption}) ->
+    rsa_pkcs1_sha384;
+signature_algorithm_to_scheme(#'SignatureAlgorithm'{algorithm = ?sha512WithRSAEncryption}) ->
+    rsa_pkcs1_sha512;
+signature_algorithm_to_scheme(#'SignatureAlgorithm'{algorithm = ?'ecdsa-with-SHA256'}) ->
+    ecdsa_secp256r1_sha256;
+signature_algorithm_to_scheme(#'SignatureAlgorithm'{algorithm = ?'ecdsa-with-SHA384'}) ->
+    ecdsa_secp384r1_sha384;
+signature_algorithm_to_scheme(#'SignatureAlgorithm'{algorithm = ?'ecdsa-with-SHA512'}) ->
+    ecdsa_secp512r1_sha512;
+signature_algorithm_to_scheme(#'SignatureAlgorithm'{algorithm = ?'sha-1WithRSAEncryption'}) ->
+    rsa_pkcs1_sha1;
+signature_algorithm_to_scheme(#'SignatureAlgorithm'{algorithm = ?sha1WithRSAEncryption}) ->
+    rsa_pkcs1_sha1;
+signature_algorithm_to_scheme(#'SignatureAlgorithm'{algorithm = ?'ecdsa-with-SHA1'}) ->
+    ecdsa_sha1.
+
 
 %% RFC 5246: 6.2.3.2.  CBC Block Cipher
 %%
@@ -858,7 +1036,7 @@ generic_block_cipher_from_bin({3, N}, T, IV, HashSize)
 			  next_iv = IV};
 
 generic_block_cipher_from_bin({3, N}, T, IV, HashSize)
-  when N == 2; N == 3 ->
+  when N == 2; N == 3; N == 4 ->
     Sz1 = byte_size(T) - 1,
     <<_:Sz1/binary, ?BYTE(PadLength)>> = T,
     IVLength = byte_size(IV),
@@ -888,21 +1066,51 @@ is_correct_padding(GenBlockCipher, {3, 1}, false) ->
 %% Padding must be checked in TLS 1.1 and after  
 is_correct_padding(#generic_block_cipher{padding_length = Len,
 					 padding = Padding}, _, _) ->
-    Len == byte_size(Padding) andalso
-		list_to_binary(lists:duplicate(Len, Len)) == Padding.
-
-get_padding(Length, BlockSize) ->
-    get_padding_aux(BlockSize, Length rem BlockSize).
-
-get_padding_aux(_, 0) ->
-    {0, <<>>};
-get_padding_aux(BlockSize, PadLength) ->
-    N = BlockSize - PadLength,
-    {N, list_to_binary(lists:duplicate(N, N))}.
+    (Len == byte_size(Padding)) andalso (padding(Len) == Padding).
+
+padding(PadLen) ->
+    case PadLen of
+        0 -> <<>>;
+        1 -> <<1>>;
+        2 -> <<2,2>>;
+        3 -> <<3,3,3>>;
+        4 -> <<4,4,4,4>>;
+        5 -> <<5,5,5,5,5>>;
+        6 -> <<6,6,6,6,6,6>>;
+        7 -> <<7,7,7,7,7,7,7>>;
+        8 -> <<8,8,8,8,8,8,8,8>>;
+        9 -> <<9,9,9,9,9,9,9,9,9>>;
+        10 -> <<10,10,10,10,10,10,10,10,10,10>>;
+        11 -> <<11,11,11,11,11,11,11,11,11,11,11>>;
+        12 -> <<12,12,12,12,12,12,12,12,12,12,12,12>>;
+        13 -> <<13,13,13,13,13,13,13,13,13,13,13,13,13>>;
+        14 -> <<14,14,14,14,14,14,14,14,14,14,14,14,14,14>>;
+        15 -> <<15,15,15,15,15,15,15,15,15,15,15,15,15,15,15>>;
+        _ ->
+            binary:copy(<<PadLen>>, PadLen)
+    end.
 
-random_iv(IV) ->
-    IVSz = byte_size(IV),
-    random_bytes(IVSz).
+padding_with_len(TextLen, BlockSize) ->
+    case BlockSize - (TextLen rem BlockSize) of
+        0 -> <<0>>;
+        1 -> <<1,1>>;
+        2 -> <<2,2,2>>;
+        3 -> <<3,3,3,3>>;
+        4 -> <<4,4,4,4,4>>;
+        5 -> <<5,5,5,5,5,5>>;
+        6 -> <<6,6,6,6,6,6,6>>;
+        7 -> <<7,7,7,7,7,7,7,7>>;
+        8 -> <<8,8,8,8,8,8,8,8,8>>;
+        9 -> <<9,9,9,9,9,9,9,9,9,9>>;
+        10 -> <<10,10,10,10,10,10,10,10,10,10,10>>;
+        11 -> <<11,11,11,11,11,11,11,11,11,11,11,11>>;
+        12 -> <<12,12,12,12,12,12,12,12,12,12,12,12,12>>;
+        13 -> <<13,13,13,13,13,13,13,13,13,13,13,13,13,13>>;
+        14 -> <<14,14,14,14,14,14,14,14,14,14,14,14,14,14,14>>;
+        15 -> <<15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15>>;
+        PadLen ->
+            binary:copy(<<PadLen>>, PadLen + 1)
+    end.
 
 next_iv(Bin, IV) ->
     BinSz = byte_size(Bin),
@@ -1126,3 +1334,55 @@ filter_keyuse_suites(Use, KeyUse, CipherSuits, Suites) ->
 	false ->
 	    CipherSuits -- Suites
     end.
+
+generate_server_share(Group) ->
+    Key = generate_key_exchange(Group),
+    #key_share_server_hello{
+       server_share = #key_share_entry{
+                         group = Group,
+                         key_exchange = Key
+                        }}.
+
+generate_client_shares([]) ->
+    #key_share_client_hello{client_shares = []};
+generate_client_shares(Groups) ->
+    generate_client_shares(Groups, []).
+%%
+generate_client_shares([], Acc) ->
+    #key_share_client_hello{client_shares = lists:reverse(Acc)};
+generate_client_shares([Group|Groups], Acc) ->
+    Key = generate_key_exchange(Group),
+    KeyShareEntry = #key_share_entry{
+                       group = Group,
+                       key_exchange = Key
+                      },
+    generate_client_shares(Groups, [KeyShareEntry|Acc]).
+
+
+generate_key_exchange(secp256r1) ->
+    public_key:generate_key({namedCurve, secp256r1});
+generate_key_exchange(secp384r1) ->
+    public_key:generate_key({namedCurve, secp384r1});
+generate_key_exchange(secp521r1) ->
+    public_key:generate_key({namedCurve, secp521r1});
+generate_key_exchange(x25519) ->
+    crypto:generate_key(ecdh, x25519);
+generate_key_exchange(x448) ->
+    crypto:generate_key(ecdh, x448);
+generate_key_exchange(FFDHE) ->
+    public_key:generate_key(ssl_dh_groups:dh_params(FFDHE)).
+
+
+%% TODO: Move this functionality to crypto!
+%% 7.4.1.  Finite Field Diffie-Hellman
+%%
+%%    For finite field groups, a conventional Diffie-Hellman [DH76]
+%%    computation is performed.  The negotiated key (Z) is converted to a
+%%    byte string by encoding in big-endian form and left-padded with zeros
+%%    up to the size of the prime.  This byte string is used as the shared
+%%    secret in the key schedule as specified above.
+add_zero_padding(Bin, PrimeSize)
+  when byte_size (Bin) =:= PrimeSize ->
+    Bin;
+add_zero_padding(Bin, PrimeSize) ->
+    add_zero_padding(<<0, Bin/binary>>, PrimeSize).
diff --git a/lib/ssl/src/ssl_cipher.hrl b/lib/ssl/src/ssl_cipher.hrl
index 2371e8bd32..0fa5f66c49 100644
--- a/lib/ssl/src/ssl_cipher.hrl
+++ b/lib/ssl/src/ssl_cipher.hrl
@@ -47,6 +47,7 @@
 -record(cipher_state, {
 	  iv,
 	  key,
+	  finished_key,
 	  state,
 	  nonce,
           tag_len       
@@ -600,15 +601,98 @@
 %%      TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384     = {0xC0,0x32};
 -define(TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384, <<?BYTE(16#C0), ?BYTE(16#32)>>).
 
-%%% Chacha20/Poly1305 Suites draft-agl-tls-chacha20poly1305-04
 
-%%      TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256   = {0xcc, 0x13}
--define(TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, <<?BYTE(16#CC), ?BYTE(16#13)>>).
+%%% ChaCha20-Poly1305 Cipher Suites for Transport Layer Security (TLS) RFC7905
 
-%%      TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256 = {0xcc, 0x14}
--define(TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256, <<?BYTE(16#CC), ?BYTE(16#14)>>).
+%%      TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256   = {0xCC, 0xA8}
+-define(TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, <<?BYTE(16#CC), ?BYTE(16#A8)>>).
 
-%%      TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256     = {0xcc, 0x15}
--define(TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256, <<?BYTE(16#CC), ?BYTE(16#15)>>).
+%%      TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256 = {0xCC, 0xA9}
+-define(TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256, <<?BYTE(16#CC), ?BYTE(16#A9)>>).
+
+%%      TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256     = {0xCC, 0xAA}
+-define(TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256, <<?BYTE(16#CC), ?BYTE(16#AA)>>).
+
+%%      TLS_PSK_WITH_CHACHA20_POLY1305_SHA256         = {0xCC, 0xAB}
+-define(TLS_PSK_WITH_CHACHA20_POLY1305_SHA256, <<?BYTE(16#CC), ?BYTE(16#AB)>>).
+
+%%      TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256   = {0xCC, 0xAC}
+-define(TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256, <<?BYTE(16#CC), ?BYTE(16#AC)>>).
+
+%%      TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256     = {0xCC, 0xAD}
+-define(TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256, <<?BYTE(16#CC), ?BYTE(16#AD)>>).
+
+%%      TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256     = {0xCC, 0xAE}
+-define(TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256, <<?BYTE(16#CC), ?BYTE(16#AE)>>).
+
+
+
+%% RFC 6655 - TLS-1.2 cipher suites
+
+%% TLS_RSA_WITH_AES_128_CCM      = {0xC0,0x9C}
+-define(TLS_RSA_WITH_AES_128_CCM,   <<?BYTE(16#C0), ?BYTE(16#9C)>>).
+
+%% TLS_RSA_WITH_AES_256_CCM      = {0xC0,0x9D}
+-define(TLS_RSA_WITH_AES_256_CCM, <<?BYTE(16#C0), ?BYTE(16#9D)>>).
+
+%% TLS_DHE_RSA_WITH_AES_256_CCM      = {0xC0,0x9E}
+-define(TLS_DHE_RSA_WITH_AES_256_CCM, <<?BYTE(16#C0), ?BYTE(16#9E)>>).
+
+%% TLS_DHE_RSA_WITH_AES_128_CCM      = {0xC0,0x9F}
+-define(TLS_DHE_RSA_WITH_AES_128_CCM, <<?BYTE(16#C0), ?BYTE(16#9F)>>).
+
+%% TLS_RSA_WITH_AES_256_CCM_8      = {0xC0,0x9A0}
+-define(TLS_RSA_WITH_AES_256_CCM_8, <<?BYTE(16#C0), ?BYTE(16#A0)>>).
+
+%% TLS_RSA_WITH_AES_128_CCM_8      = {0xC0,0xA1}
+-define(TLS_RSA_WITH_AES_128_CCM_8, <<?BYTE(16#C0), ?BYTE(16#A1)>>).
+
+%% TLS_DHE_RSA_WITH_AES_128_CCM_8      = {0xC0,0xA2}
+-define(TLS_DHE_RSA_WITH_AES_128_CCM_8, <<?BYTE(16#C0), ?BYTE(16#A2)>>).
+
+%% TLS_DHE_RSA_WITH_AES_256_CCM_8      = {0xC0,0xA3}
+-define(TLS_DHE_RSA_WITH_AES_256_CCM_8, <<?BYTE(16#C0), ?BYTE(16#A3)>>).
+
+%%  TLS_PSK_WITH_AES_128_CCM       = {0xC0,0xA4}
+-define(TLS_PSK_WITH_AES_128_CCM, <<?BYTE(16#C0), ?BYTE(16#A4)>>).
+
+%% TLS_PSK_WITH_AES_256_CCM       = {0xC0,0xA5)
+-define(TLS_PSK_WITH_AES_256_CCM, <<?BYTE(16#C0), ?BYTE(16#A5)>>).
+
+%% TLS_DHE_PSK_WITH_AES_128_CCM   = {0xC0,0xA6}
+-define(TLS_DHE_PSK_WITH_AES_128_CCM, <<?BYTE(16#C0), ?BYTE(16#A6)>>).
+
+%% TLS_DHE_PSK_WITH_AES_256_CCM   = {0xC0,0xA7}
+-define(TLS_DHE_PSK_WITH_AES_256_CCM, <<?BYTE(16#C0), ?BYTE(16#A7)>>).
+
+%% TLS_PSK_WITH_AES_128_CCM_8     = {0xC0,0xA8}
+-define(TLS_PSK_WITH_AES_128_CCM_8, <<?BYTE(16#C0), ?BYTE(16#A8)>>).
+
+%%  TLS_PSK_WITH_AES_256_CCM_8     = {0xC0,0xA9)
+-define(TLS_PSK_WITH_AES_256_CCM_8, <<?BYTE(16#C0), ?BYTE(16#A9)>>).
+
+%% TLS_PSK_DHE_WITH_AES_128_CCM_8 = {0xC0,0xAA}
+-define(TLS_PSK_DHE_WITH_AES_128_CCM_8, <<?BYTE(16#C0), ?BYTE(16#AA)>>).
+
+%% TLS_PSK_DHE_WITH_AES_256_CCM_8 = << ?BYTE(0xC0,0xAB}
+-define(TLS_PSK_DHE_WITH_AES_256_CCM_8, <<?BYTE(16#C0),?BYTE(16#AB)>>).
+
+
+%%% TLS 1.3 cipher suites RFC8446
+
+%% TLS_AES_128_GCM_SHA256       = {0x13,0x01}
+-define(TLS_AES_128_GCM_SHA256, <<?BYTE(16#13), ?BYTE(16#01)>>).
+
+%% TLS_AES_256_GCM_SHA384       = {0x13,0x02}
+-define(TLS_AES_256_GCM_SHA384, <<?BYTE(16#13),?BYTE(16#02)>>).
+
+%% TLS_CHACHA20_POLY1305_SHA256 = {0x13,0x03}
+-define(TLS_CHACHA20_POLY1305_SHA256, <<?BYTE(16#13),?BYTE(16#03)>>).
+
+%% %% TLS_AES_128_CCM_SHA256       = {0x13,0x04}
+-define(TLS_AES_128_CCM_SHA256, <<?BYTE(16#13), ?BYTE(16#04)>>).
+
+%% %%  TLS_AES_128_CCM_8_SHA256    = {0x13,0x05}
+-define(TLS_AES_128_CCM_8_SHA256, <<?BYTE(16#13),?BYTE(16#05)>>).
 
 -endif. % -ifdef(ssl_cipher).
diff --git a/lib/ssl/src/ssl_cipher_format.erl b/lib/ssl/src/ssl_cipher_format.erl
index c311c0d097..bca1022b5f 100644
--- a/lib/ssl/src/ssl_cipher_format.erl
+++ b/lib/ssl/src/ssl_cipher_format.erl
@@ -25,66 +25,177 @@
 %%----------------------------------------------------------------------
 -module(ssl_cipher_format).
 
+-include("ssl_api.hrl").
 -include("ssl_cipher.hrl").
 -include("ssl_internal.hrl").
 -include_lib("public_key/include/public_key.hrl").
 
--export_type([cipher_suite/0,
-	      erl_cipher_suite/0, old_erl_cipher_suite/0, openssl_cipher_suite/0,
-	      hash/0, key_algo/0, sign_algo/0]).
+-export_type([old_erl_cipher_suite/0, openssl_cipher_suite/0, cipher_suite/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 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_exchange := key_algo(),
-                               cipher := cipher(),
-                               mac    := hash() | aead,
-                               prf    := hash() | default_prf %% Old cipher suites, version dependent
+-type internal_cipher()            :: null | ssl:cipher().
+-type internal_hash()              :: null | ssl:hash().
+-type internal_kex_algo()          :: null | ssl:kex_algo().
+-type internal_erl_cipher_suite()  :: #{key_exchange := internal_kex_algo(),
+                               cipher := internal_cipher(),
+                               mac    := internal_hash() | aead,
+                               prf    := internal_hash() | default_prf %% Old cipher suites, version dependent
                               }.  
--type old_erl_cipher_suite() :: {key_algo(), cipher(), hash()} % Pre TLS 1.2 
+-type old_erl_cipher_suite() :: {ssl:kex_algo(), internal_cipher(), internal_hash()} % Pre TLS 1.2 
                                 %% TLS 1.2, internally PRE TLS 1.2 will use default_prf
-                              | {key_algo(), cipher(), hash(), hash() | default_prf}. 
+                              | {ssl:kex_algo(), internal_cipher(), internal_hash(), 
+                                 internal_hash() | default_prf}. 
 -type cipher_suite()      :: binary().
 -type openssl_cipher_suite()  :: string().
 
 
--export([suite_to_str/1, suite_definition/1, suite/1, erl_suite_definition/1, 
-         openssl_suite/1, openssl_suite_name/1]).
+-export([suite_map_to_bin/1,            %% Binary format  
+         suite_bin_to_map/1, %% Erlang API format
+         suite_map_to_str/1,     %% RFC string
+         suite_str_to_map/1,
+         suite_map_to_openssl_str/1, %% OpenSSL name
+         suite_openssl_str_to_map/1,
+         suite_legacy/1 %% Erlang legacy format
+        ]).
 
 %%--------------------------------------------------------------------
--spec suite_to_str(erl_cipher_suite()) -> string().
+-spec suite_map_to_str(internal_erl_cipher_suite()) -> string().
 %%
 %% Description: Return the string representation of a cipher suite.
 %%--------------------------------------------------------------------
-suite_to_str(#{key_exchange := null,
+suite_map_to_str(#{key_exchange := null,
                cipher := null,
                mac := null,
                prf := null}) ->
     "TLS_EMPTY_RENEGOTIATION_INFO_SCSV";
-suite_to_str(#{key_exchange := Kex,
+suite_map_to_str(#{key_exchange := any,
+               cipher := Cipher,
+               mac := aead,
+               prf := PRF}) ->
+    "TLS_" ++ string:to_upper(atom_to_list(Cipher)) ++
+        "_" ++ string:to_upper(atom_to_list(PRF));
+suite_map_to_str(#{key_exchange := Kex,
                cipher := Cipher,
                mac := aead,
                prf := PRF}) ->
     "TLS_" ++ string:to_upper(atom_to_list(Kex)) ++
         "_WITH_" ++  string:to_upper(atom_to_list(Cipher)) ++
         "_" ++ string:to_upper(atom_to_list(PRF));
-suite_to_str(#{key_exchange := Kex,
+suite_map_to_str(#{key_exchange := Kex,
                cipher := Cipher,
                mac := Mac}) ->
     "TLS_" ++ string:to_upper(atom_to_list(Kex)) ++
         "_WITH_" ++  string:to_upper(atom_to_list(Cipher)) ++
         "_" ++ string:to_upper(atom_to_list(Mac)).
 
+suite_str_to_map("TLS_EMPTY_RENEGOTIATION_INFO_SCSV") ->
+    #{key_exchange => null,
+      cipher => null,
+      mac => null,
+      prf => null};
+suite_str_to_map(SuiteStr)->
+    Str0 = string:prefix(SuiteStr, "TLS_"),
+    case string:split(Str0, "_WITH_") of
+        [Rest] ->
+            tls_1_3_suite_str_to_map(Rest);
+        [Prefix, Kex | Rest] when Prefix == "SPR"; 
+                                  Prefix == "PSK";                                  
+                                  Prefix == "DHE"; 
+                                  Prefix == "ECDHE" 
+                                  ->
+            pre_tls_1_3_suite_str_to_map(Prefix ++ "_" ++ Kex, Rest);
+        [Kex| Rest] ->
+            pre_tls_1_3_suite_str_to_map(Kex, Rest)
+    end.
+
+suite_map_to_openssl_str(#{key_exchange := any,
+                       mac := aead} = Suite) ->
+    %% TLS 1.3 OpenSSL finally use RFC names
+    suite_map_to_str(Suite);
+suite_map_to_openssl_str(#{key_exchange := null} = Suite) ->
+    %% TLS_EMPTY_RENEGOTIATION_INFO_SCSV
+    suite_map_to_str(Suite);
+suite_map_to_openssl_str(#{key_exchange := rsa = Kex,
+                           cipher := Cipher,
+                           mac := Mac}) when Cipher == "des_cbc";
+                                             Cipher == "3des_ede_cbc" ->
+    openssl_cipher_name(Kex, string:to_upper(atom_to_list(Cipher))) ++
+        "-" ++ string:to_upper(atom_to_list(Mac));
+suite_map_to_openssl_str(#{key_exchange := Kex,
+                           cipher := chacha20_poly1305 = Cipher,
+                           mac := aead}) ->
+    openssl_suite_start(string:to_upper(atom_to_list(Kex))) 
+        ++  openssl_cipher_name(Kex, string:to_upper(atom_to_list(Cipher)));
+suite_map_to_openssl_str(#{key_exchange := Kex,
+                       cipher := Cipher,
+                       mac := aead,
+                       prf := PRF}) ->
+    openssl_suite_start(string:to_upper(atom_to_list(Kex))) 
+        ++  openssl_cipher_name(Kex, string:to_upper(atom_to_list(Cipher))) ++
+        "-" ++ string:to_upper(atom_to_list(PRF));
+suite_map_to_openssl_str(#{key_exchange := Kex,
+                       cipher := Cipher,
+                       mac := Mac}) ->
+    openssl_suite_start(string:to_upper(atom_to_list(Kex))) 
+        ++  openssl_cipher_name(Kex, string:to_upper(atom_to_list(Cipher))) ++
+        "-" ++ string:to_upper(atom_to_list(Mac)).
+
+
+suite_openssl_str_to_map("TLS_" ++ _ = SuiteStr) ->
+    suite_str_to_map(SuiteStr);
+suite_openssl_str_to_map("DES-CBC-SHA") ->
+    suite_str_to_map("TLS_RSA_WITH_DES_CBC_SHA");
+suite_openssl_str_to_map("DES-CBC3-SHA") ->
+    suite_str_to_map("TLS_RSA_WITH_3DES_EDE_CBC_SHA");
+suite_openssl_str_to_map("SRP-DSS-DES-CBC3-SHA") ->
+    suite_str_to_map("TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA");
+suite_openssl_str_to_map("DHE-RSA-" ++ Rest) ->
+    suite_openssl_str_to_map("DHE-RSA", Rest);
+suite_openssl_str_to_map("DHE-DSS-" ++ Rest) ->
+    suite_openssl_str_to_map("DHE-DSS", Rest);
+suite_openssl_str_to_map("EDH-RSA-" ++ Rest) ->
+    suite_openssl_str_to_map("DHE-RSA", Rest);
+suite_openssl_str_to_map("EDH-DSS-" ++ Rest) ->
+    suite_openssl_str_to_map("DHE-DSS", Rest);
+suite_openssl_str_to_map("DES" ++ _ = Rest) ->
+    suite_openssl_str_to_map("RSA", Rest);
+suite_openssl_str_to_map("AES" ++ _ = Rest) ->
+    suite_openssl_str_to_map("RSA", Rest);
+suite_openssl_str_to_map("RC4" ++ _ = Rest) ->
+    suite_openssl_str_to_map("RSA", Rest);
+suite_openssl_str_to_map("ECDH-RSA-" ++ Rest) ->
+    suite_openssl_str_to_map("ECDH-RSA", Rest);
+suite_openssl_str_to_map("ECDH-ECDSA-" ++ Rest) ->
+    suite_openssl_str_to_map("ECDH-ECDSA", Rest);
+suite_openssl_str_to_map("ECDHE-RSA-" ++ Rest) ->
+    suite_openssl_str_to_map("ECDHE-RSA", Rest);
+suite_openssl_str_to_map("ECDHE-ECDSA-" ++ Rest) ->
+    suite_openssl_str_to_map("ECDHE-ECDSA", Rest);
+suite_openssl_str_to_map("RSA-PSK-" ++ Rest) ->
+    suite_openssl_str_to_map("RSA-PSK", Rest);
+suite_openssl_str_to_map("RSA-" ++ Rest) ->
+    suite_openssl_str_to_map("RSA", Rest);
+suite_openssl_str_to_map("DHE-PSK-" ++ Rest) ->
+    suite_openssl_str_to_map("DHE-PSK", Rest);
+suite_openssl_str_to_map("ECDHE-PSK-" ++ Rest) ->
+    suite_openssl_str_to_map("ECDHE-PSK", Rest);
+suite_openssl_str_to_map("PSK-" ++ Rest) ->
+    suite_openssl_str_to_map("PSK", Rest);
+suite_openssl_str_to_map("SRP-RSA-" ++ Rest) ->
+    suite_openssl_str_to_map("SRP-RSA", Rest);
+suite_openssl_str_to_map("SRP-DSS-" ++ Rest) ->
+    suite_openssl_str_to_map("SRP-DSS", Rest);
+suite_openssl_str_to_map("SRP-" ++ Rest) ->
+    suite_openssl_str_to_map("SRP", Rest).
+
 %%--------------------------------------------------------------------
--spec suite_definition(cipher_suite()) -> erl_cipher_suite().
+-spec suite_bin_to_map(cipher_suite()) -> internal_erl_cipher_suite().
 %%
 %% Description: Return erlang cipher suite definition.
 %% Note: Currently not supported suites are commented away.
 %% They should be supported or removed in the future.
 %%-------------------------------------------------------------------
 %% TLS v1.1 suites
-suite_definition(?TLS_NULL_WITH_NULL_NULL) ->
+suite_bin_to_map(?TLS_NULL_WITH_NULL_NULL) ->
     #{key_exchange => null,
       cipher => null, 
       mac => null, 
@@ -92,111 +203,111 @@ suite_definition(?TLS_NULL_WITH_NULL_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) ->
+suite_bin_to_map(?TLS_EMPTY_RENEGOTIATION_INFO_SCSV) ->
     #{key_exchange => null,
       cipher => null, 
       mac => null,
       prf => null};
-suite_definition(?TLS_RSA_WITH_RC4_128_MD5) ->	
+suite_bin_to_map(?TLS_RSA_WITH_RC4_128_MD5) ->	
     #{key_exchange => rsa,
       cipher => rc4_128, 
       mac => md5, 
       prf => default_prf};
-suite_definition(?TLS_RSA_WITH_RC4_128_SHA) ->
+suite_bin_to_map(?TLS_RSA_WITH_RC4_128_SHA) ->
     #{key_exchange => rsa,
       cipher => rc4_128,
       mac => sha,
       prf => default_prf};
-suite_definition(?TLS_RSA_WITH_DES_CBC_SHA) ->
+suite_bin_to_map(?TLS_RSA_WITH_DES_CBC_SHA) ->
     #{key_exchange => rsa,
       cipher => des_cbc,
       mac => sha,
       prf => default_prf};
-suite_definition(?TLS_RSA_WITH_3DES_EDE_CBC_SHA) ->
+suite_bin_to_map(?TLS_RSA_WITH_3DES_EDE_CBC_SHA) ->
     #{key_exchange => rsa,
       cipher => '3des_ede_cbc', 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_DHE_DSS_WITH_DES_CBC_SHA) ->
+suite_bin_to_map(?TLS_DHE_DSS_WITH_DES_CBC_SHA) ->
     #{key_exchange => dhe_dss, 
       cipher => des_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA) ->
+suite_bin_to_map(?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA) ->
     #{key_exchange => dhe_dss, 
       cipher => '3des_ede_cbc', 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_DHE_RSA_WITH_DES_CBC_SHA) ->
+suite_bin_to_map(?TLS_DHE_RSA_WITH_DES_CBC_SHA) ->
     #{key_exchange => dhe_rsa, 
       cipher => des_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA) ->
+suite_bin_to_map(?TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA) ->
     #{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) -> 
+suite_bin_to_map(?TLS_RSA_WITH_AES_128_CBC_SHA) -> 
     #{key_exchange => rsa,
       cipher => aes_128_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_DHE_DSS_WITH_AES_128_CBC_SHA) ->
+suite_bin_to_map(?TLS_DHE_DSS_WITH_AES_128_CBC_SHA) ->
     #{key_exchange => dhe_dss, 
       cipher => aes_128_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_DHE_RSA_WITH_AES_128_CBC_SHA) ->
+suite_bin_to_map(?TLS_DHE_RSA_WITH_AES_128_CBC_SHA) ->
     #{key_exchange => dhe_rsa, 
       cipher => aes_128_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_RSA_WITH_AES_256_CBC_SHA) -> 
+suite_bin_to_map(?TLS_RSA_WITH_AES_256_CBC_SHA) -> 
     #{key_exchange => rsa, 
       cipher => aes_256_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_DHE_DSS_WITH_AES_256_CBC_SHA) ->
+suite_bin_to_map(?TLS_DHE_DSS_WITH_AES_256_CBC_SHA) ->
     #{key_exchange => dhe_dss, 
       cipher => aes_256_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_DHE_RSA_WITH_AES_256_CBC_SHA) ->
+suite_bin_to_map(?TLS_DHE_RSA_WITH_AES_256_CBC_SHA) ->
     #{key_exchange => dhe_rsa, 
       cipher => aes_256_cbc, 
       mac => sha, 
       prf => default_prf};
 %% TLS v1.2 suites
-%% suite_definition(?TLS_RSA_WITH_NULL_SHA) ->
+%% suite_bin_to_map(?TLS_RSA_WITH_NULL_SHA) ->
 %%     {rsa, null, sha, default_prf};
-suite_definition(?TLS_RSA_WITH_AES_128_CBC_SHA256) ->
+suite_bin_to_map(?TLS_RSA_WITH_AES_128_CBC_SHA256) ->
     #{key_exchange => rsa, 
       cipher => aes_128_cbc, 
       mac => sha256, 
       prf => default_prf};
-suite_definition(?TLS_RSA_WITH_AES_256_CBC_SHA256) ->
+suite_bin_to_map(?TLS_RSA_WITH_AES_256_CBC_SHA256) ->
     #{key_exchange => rsa, 
       cipher => aes_256_cbc, 
       mac => sha256, 
       prf => default_prf};
-suite_definition(?TLS_DHE_DSS_WITH_AES_128_CBC_SHA256) ->
+suite_bin_to_map(?TLS_DHE_DSS_WITH_AES_128_CBC_SHA256) ->
     #{key_exchange => dhe_dss, 
       cipher => aes_128_cbc, 
       mac => sha256, 
       prf => default_prf};
-suite_definition(?TLS_DHE_RSA_WITH_AES_128_CBC_SHA256) ->
+suite_bin_to_map(?TLS_DHE_RSA_WITH_AES_128_CBC_SHA256) ->
     #{key_exchange => dhe_rsa, 
       cipher => aes_128_cbc, 
       mac => sha256, 
       prf => default_prf};
-suite_definition(?TLS_DHE_DSS_WITH_AES_256_CBC_SHA256) ->
+suite_bin_to_map(?TLS_DHE_DSS_WITH_AES_256_CBC_SHA256) ->
     #{key_exchange => dhe_dss, 
       cipher => aes_256_cbc, 
       mac => sha256, 
       prf => default_prf};
-suite_definition(?TLS_DHE_RSA_WITH_AES_256_CBC_SHA256) ->
+suite_bin_to_map(?TLS_DHE_RSA_WITH_AES_256_CBC_SHA256) ->
     #{key_exchange => dhe_rsa, 
       cipher => aes_256_cbc, 
       mac => sha256, 
@@ -208,611 +319,683 @@ suite_definition(?TLS_DHE_RSA_WITH_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) ->
+suite_bin_to_map(?TLS_DH_anon_WITH_RC4_128_MD5) ->
     #{key_exchange => dh_anon, 
       cipher => rc4_128, 
       mac => md5, 
       prf => default_prf};
-suite_definition(?TLS_DH_anon_WITH_DES_CBC_SHA) ->
+suite_bin_to_map(?TLS_DH_anon_WITH_DES_CBC_SHA) ->
     #{key_exchange => dh_anon, 
       cipher => des_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_DH_anon_WITH_3DES_EDE_CBC_SHA) ->
+suite_bin_to_map(?TLS_DH_anon_WITH_3DES_EDE_CBC_SHA) ->
     #{key_exchange => dh_anon, 
       cipher => '3des_ede_cbc', 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_DH_anon_WITH_AES_128_CBC_SHA) ->
+suite_bin_to_map(?TLS_DH_anon_WITH_AES_128_CBC_SHA) ->
     #{key_exchange => dh_anon, 
       cipher => aes_128_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_DH_anon_WITH_AES_256_CBC_SHA) ->
+suite_bin_to_map(?TLS_DH_anon_WITH_AES_256_CBC_SHA) ->
     #{key_exchange => dh_anon, 
       cipher => aes_256_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_DH_anon_WITH_AES_128_CBC_SHA256) ->
+suite_bin_to_map(?TLS_DH_anon_WITH_AES_128_CBC_SHA256) ->
     #{key_exchange => dh_anon, 
       cipher => aes_128_cbc, 
       mac => sha256, 
       prf => default_prf};
-suite_definition(?TLS_DH_anon_WITH_AES_256_CBC_SHA256) ->
+suite_bin_to_map(?TLS_DH_anon_WITH_AES_256_CBC_SHA256) ->
     #{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) ->
+suite_bin_to_map(?TLS_PSK_WITH_RC4_128_SHA) ->
     #{key_exchange => psk, 
       cipher => rc4_128, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_PSK_WITH_3DES_EDE_CBC_SHA) ->
+suite_bin_to_map(?TLS_PSK_WITH_3DES_EDE_CBC_SHA) ->
     #{key_exchange => psk, 
       cipher => '3des_ede_cbc', 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_PSK_WITH_AES_128_CBC_SHA) ->
+suite_bin_to_map(?TLS_PSK_WITH_AES_128_CBC_SHA) ->
     #{key_exchange => psk, 
       cipher => aes_128_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_PSK_WITH_AES_256_CBC_SHA) ->
+suite_bin_to_map(?TLS_PSK_WITH_AES_256_CBC_SHA) ->
     #{key_exchange => psk, 
       cipher => aes_256_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_DHE_PSK_WITH_RC4_128_SHA) ->
+suite_bin_to_map(?TLS_DHE_PSK_WITH_RC4_128_SHA) ->
     #{key_exchange => dhe_psk, 
       cipher => rc4_128, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA) ->
+suite_bin_to_map(?TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA) ->
     #{key_exchange => dhe_psk, 
       cipher => '3des_ede_cbc', 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_DHE_PSK_WITH_AES_128_CBC_SHA) ->
+suite_bin_to_map(?TLS_DHE_PSK_WITH_AES_128_CBC_SHA) ->
     #{key_exchange => dhe_psk, 
       cipher => aes_128_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_DHE_PSK_WITH_AES_256_CBC_SHA) ->
+suite_bin_to_map(?TLS_DHE_PSK_WITH_AES_256_CBC_SHA) ->
     #{key_exchange => dhe_psk, 
       cipher => aes_256_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_RSA_PSK_WITH_RC4_128_SHA) ->
+suite_bin_to_map(?TLS_RSA_PSK_WITH_RC4_128_SHA) ->
     #{key_exchange => rsa_psk, 
       cipher => rc4_128, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA) ->
+suite_bin_to_map(?TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA) ->
     #{key_exchange => rsa_psk, 
       cipher => '3des_ede_cbc', 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_RSA_PSK_WITH_AES_128_CBC_SHA) ->
+suite_bin_to_map(?TLS_RSA_PSK_WITH_AES_128_CBC_SHA) ->
     #{key_exchange => rsa_psk, 
       cipher => aes_128_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_RSA_PSK_WITH_AES_256_CBC_SHA) ->
+suite_bin_to_map(?TLS_RSA_PSK_WITH_AES_256_CBC_SHA) ->
     #{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) ->
+suite_bin_to_map(?TLS_PSK_WITH_NULL_SHA) ->
     #{key_exchange => psk, 
       cipher => null, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_DHE_PSK_WITH_NULL_SHA) ->
+suite_bin_to_map(?TLS_DHE_PSK_WITH_NULL_SHA) ->
     #{key_exchange => dhe_psk,
       cipher => null, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_RSA_PSK_WITH_NULL_SHA) ->
+suite_bin_to_map(?TLS_RSA_PSK_WITH_NULL_SHA) ->
     #{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) ->
+suite_bin_to_map(?TLS_PSK_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => psk, 
       cipher => aes_128_gcm, 
       mac => aead, 
       prf => sha256};
-suite_definition(?TLS_PSK_WITH_AES_256_GCM_SHA384) ->
+suite_bin_to_map(?TLS_PSK_WITH_AES_256_GCM_SHA384) ->
     #{key_exchange => psk, 
       cipher => aes_256_gcm, 
       mac => aead, 
       prf => sha384};
-suite_definition(?TLS_DHE_PSK_WITH_AES_128_GCM_SHA256) ->
+suite_bin_to_map(?TLS_DHE_PSK_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => dhe_psk, 
       cipher => aes_128_gcm, 
       mac => aead, 
       prf => sha256};
-suite_definition(?TLS_DHE_PSK_WITH_AES_256_GCM_SHA384) ->
+suite_bin_to_map(?TLS_DHE_PSK_WITH_AES_256_GCM_SHA384) ->
     #{key_exchange => dhe_psk, 
       cipher => aes_256_gcm, 
       mac => aead, 
       prf => sha384};
-suite_definition(?TLS_RSA_PSK_WITH_AES_128_GCM_SHA256) ->
+suite_bin_to_map(?TLS_RSA_PSK_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => rsa_psk, 
       cipher => aes_128_gcm, 
       mac => aead, 
       prf => sha256};
-suite_definition(?TLS_RSA_PSK_WITH_AES_256_GCM_SHA384) ->
+suite_bin_to_map(?TLS_RSA_PSK_WITH_AES_256_GCM_SHA384) ->
     #{key_exchange => rsa_psk, 
       cipher => aes_256_gcm, 
       mac => aead, 
       prf => sha384};
-suite_definition(?TLS_PSK_WITH_AES_128_CBC_SHA256) ->
+suite_bin_to_map(?TLS_PSK_WITH_AES_128_CBC_SHA256) ->
     #{key_exchange => psk, 
       cipher => aes_128_cbc, 
       mac => sha256, 
       prf => default_prf};
-suite_definition(?TLS_PSK_WITH_AES_256_CBC_SHA384) ->
+suite_bin_to_map(?TLS_PSK_WITH_AES_256_CBC_SHA384) ->
     #{key_exchange => psk, 
       cipher => aes_256_cbc, 
       mac => sha384, 
-      prf => default_prf};
-suite_definition(?TLS_DHE_PSK_WITH_AES_128_CBC_SHA256) ->
+      prf => sha384};
+suite_bin_to_map(?TLS_DHE_PSK_WITH_AES_128_CBC_SHA256) ->
     #{key_exchange => dhe_psk, 
       cipher => aes_128_cbc, 
       mac => sha256, 
       prf => default_prf};
-suite_definition(?TLS_DHE_PSK_WITH_AES_256_CBC_SHA384) ->
+suite_bin_to_map(?TLS_DHE_PSK_WITH_AES_256_CBC_SHA384) ->
     #{key_exchange => dhe_psk, 
       cipher => aes_256_cbc, 
       mac => sha384, 
-      prf => default_prf};
-suite_definition(?TLS_RSA_PSK_WITH_AES_128_CBC_SHA256) ->
+      prf => sha384};
+suite_bin_to_map(?TLS_RSA_PSK_WITH_AES_128_CBC_SHA256) ->
     #{key_exchange => rsa_psk, 
       cipher => aes_128_cbc, 
       mac => sha256, 
       prf => default_prf};
-suite_definition(?TLS_RSA_PSK_WITH_AES_256_CBC_SHA384) ->
+suite_bin_to_map(?TLS_RSA_PSK_WITH_AES_256_CBC_SHA384) ->
     #{key_exchange => rsa_psk, 
       cipher => aes_256_cbc, 
       mac => sha384, 
-      prf => default_prf};
-suite_definition(?TLS_PSK_WITH_NULL_SHA256) ->
+      prf => sha384};
+suite_bin_to_map(?TLS_PSK_WITH_NULL_SHA256) ->
     #{key_exchange => psk, 
       cipher => null, 
       mac => sha256, 
       prf => default_prf};
-suite_definition(?TLS_PSK_WITH_NULL_SHA384) ->
+suite_bin_to_map(?TLS_PSK_WITH_NULL_SHA384) ->
     #{key_exchange => psk, 
       cipher => null, 
       mac => sha384, 
-      prf => default_prf};
-suite_definition(?TLS_DHE_PSK_WITH_NULL_SHA256) ->
+      prf => sha384};
+suite_bin_to_map(?TLS_DHE_PSK_WITH_NULL_SHA256) ->
     #{key_exchange => dhe_psk, 
       cipher => null, 
       mac => sha256, 
       prf => default_prf};
-suite_definition(?TLS_DHE_PSK_WITH_NULL_SHA384) ->
+suite_bin_to_map(?TLS_DHE_PSK_WITH_NULL_SHA384) ->
     #{key_exchange => dhe_psk, 
       cipher => null, 
       mac => sha384, 
-      prf => default_prf};
-suite_definition(?TLS_RSA_PSK_WITH_NULL_SHA256) ->
+      prf => sha384};
+suite_bin_to_map(?TLS_RSA_PSK_WITH_NULL_SHA256) ->
     #{key_exchange => rsa_psk, 
       cipher => null, 
       mac => sha256, 
       prf => default_prf};
-suite_definition(?TLS_RSA_PSK_WITH_NULL_SHA384) ->
+suite_bin_to_map(?TLS_RSA_PSK_WITH_NULL_SHA384) ->
     #{key_exchange => rsa_psk, 
       cipher => null, 
       mac => sha384, 
-      prf => default_prf};
+      prf => sha384};
 %%% ECDHE PSK Cipher Suites RFC 5489
-suite_definition(?TLS_ECDHE_PSK_WITH_RC4_128_SHA) ->
+suite_bin_to_map(?TLS_ECDHE_PSK_WITH_RC4_128_SHA) ->
     #{key_exchange => ecdhe_psk, 
       cipher => rc4_128, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA) ->
+suite_bin_to_map(?TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA) ->
     #{key_exchange => ecdhe_psk, 
       cipher => '3des_ede_cbc',
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA) ->
+suite_bin_to_map(?TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA) ->
     #{key_exchange => ecdhe_psk, 
       cipher => aes_128_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA) ->
+suite_bin_to_map(?TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA) ->
     #{key_exchange => ecdhe_psk, 
       cipher => aes_256_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256) ->
+suite_bin_to_map(?TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256) ->
     #{key_exchange => ecdhe_psk, 
       cipher => aes_128_cbc, 
       mac => sha256, 
       prf => default_prf};
-suite_definition(?TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384) ->
+suite_bin_to_map(?TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384) ->
     #{key_exchange => ecdhe_psk, 
       cipher => aes_256_cbc, 
       mac => sha384, 
-      prf => default_prf};
-suite_definition(?TLS_ECDHE_PSK_WITH_NULL_SHA256) ->
+      prf => sha384};
+suite_bin_to_map(?TLS_ECDHE_PSK_WITH_NULL_SHA256) ->
     #{key_exchange => ecdhe_psk, 
       cipher => null, 
       mac => sha256, 
       prf => default_prf};
-suite_definition(?TLS_ECDHE_PSK_WITH_NULL_SHA384) ->
+suite_bin_to_map(?TLS_ECDHE_PSK_WITH_NULL_SHA384) ->
     #{key_exchange => ecdhe_psk, 
       cipher => null, mac => sha384, 
-      prf => default_prf};
+      prf => sha384};
 %%% 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) ->
+suite_bin_to_map(?TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => ecdhe_psk, 
       cipher => aes_128_gcm, 
       mac => null, 
       prf => sha256};
-suite_definition(?TLS_ECDHE_PSK_WITH_AES_256_GCM_SHA384) ->
+suite_bin_to_map(?TLS_ECDHE_PSK_WITH_AES_256_GCM_SHA384) ->
     #{key_exchange => ecdhe_psk, 
       cipher => aes_256_gcm, 
       mac => null, 
       prf => sha384};
-%% suite_definition(?TLS_ECDHE_PSK_WITH_AES_128_CCM_8_SHA256) ->
-%%     #{key_exchange => ecdhe_psk, 
-%%       cipher => aes_128_ccm, 
-%%       mac => null, 
-%%       prf =>sha256};
-%% suite_definition(?TLS_ECDHE_PSK_WITH_AES_128_CCM_SHA256) ->
-%%     #{key_exchange => ecdhe_psk, 
-%%       cipher => aes_256_ccm, 
-%%       mac => null, 
-%%       prf => sha256};
+suite_bin_to_map(?TLS_ECDHE_PSK_WITH_AES_128_CCM_SHA256) ->
+     #{key_exchange => ecdhe_psk, 
+      cipher => aes_128_ccm, 
+       mac => null, 
+       prf => sha256};
+suite_bin_to_map(?TLS_ECDHE_PSK_WITH_AES_128_CCM_8_SHA256) ->
+    #{key_exchange => ecdhe_psk, 
+      cipher => aes_128_ccm_8, 
+      mac => null, 
+      prf => sha256};
 %%% SRP Cipher Suites RFC 5054
-suite_definition(?TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA) ->
+suite_bin_to_map(?TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA) ->
     #{key_exchange => srp_anon, 
       cipher => '3des_ede_cbc', 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA) ->
+suite_bin_to_map(?TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA) ->
     #{key_exchange => srp_rsa, 
       cipher => '3des_ede_cbc', 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA) ->
+suite_bin_to_map(?TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA) ->
     #{key_exchange => srp_dss, 
       cipher => '3des_ede_cbc', 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_SRP_SHA_WITH_AES_128_CBC_SHA) ->
+suite_bin_to_map(?TLS_SRP_SHA_WITH_AES_128_CBC_SHA) ->
     #{key_exchange => srp_anon, 
       cipher => aes_128_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA) ->
+suite_bin_to_map(?TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA) ->
     #{key_exchange => srp_rsa, 
       cipher => aes_128_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA) ->
+suite_bin_to_map(?TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA) ->
     #{key_exchange => srp_dss, 
       cipher => aes_128_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_SRP_SHA_WITH_AES_256_CBC_SHA) ->
+suite_bin_to_map(?TLS_SRP_SHA_WITH_AES_256_CBC_SHA) ->
     #{key_exchange => srp_anon, 
       cipher => aes_256_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA) ->
+suite_bin_to_map(?TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA) ->
     #{key_exchange => srp_rsa, 
       cipher => aes_256_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA) ->
+suite_bin_to_map(?TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA) ->
     #{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) ->
+suite_bin_to_map(?TLS_ECDH_ECDSA_WITH_NULL_SHA) ->
     #{key_exchange => ecdh_ecdsa, 
       cipher => null, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDH_ECDSA_WITH_RC4_128_SHA) ->
+suite_bin_to_map(?TLS_ECDH_ECDSA_WITH_RC4_128_SHA) ->
     #{key_exchange => ecdh_ecdsa, 
       cipher => rc4_128, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA) ->
+suite_bin_to_map(?TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA) ->
     #{key_exchange => ecdh_ecdsa, 
       cipher => '3des_ede_cbc', 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA) ->
+suite_bin_to_map(?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA) ->
     #{key_exchange => ecdh_ecdsa, 
       cipher => aes_128_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA) ->
+suite_bin_to_map(?TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA) ->
     #{key_exchange => ecdh_ecdsa, 
       cipher => aes_256_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDHE_ECDSA_WITH_NULL_SHA) ->
+suite_bin_to_map(?TLS_ECDHE_ECDSA_WITH_NULL_SHA) ->
     #{key_exchange => ecdhe_ecdsa, 
       cipher => null, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDHE_ECDSA_WITH_RC4_128_SHA) ->
+suite_bin_to_map(?TLS_ECDHE_ECDSA_WITH_RC4_128_SHA) ->
     #{key_exchange => ecdhe_ecdsa, 
       cipher => rc4_128, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA) ->
+suite_bin_to_map(?TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA) ->
     #{key_exchange => ecdhe_ecdsa, 
       cipher => '3des_ede_cbc', 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA) ->
+suite_bin_to_map(?TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA) ->
     #{key_exchange => ecdhe_ecdsa, 
       cipher => aes_128_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA) ->
+suite_bin_to_map(?TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA) ->
     #{key_exchange => ecdhe_ecdsa, 
       cipher => aes_256_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDH_RSA_WITH_NULL_SHA) ->
+suite_bin_to_map(?TLS_ECDH_RSA_WITH_NULL_SHA) ->
     #{key_exchange => ecdh_rsa, 
       cipher => null, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDH_RSA_WITH_RC4_128_SHA) ->
+suite_bin_to_map(?TLS_ECDH_RSA_WITH_RC4_128_SHA) ->
     #{key_exchange => ecdh_rsa, 
       cipher => rc4_128, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA) ->
+suite_bin_to_map(?TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA) ->
     #{key_exchange => ecdh_rsa, 
       cipher => '3des_ede_cbc', 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA) ->
+suite_bin_to_map(?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA) ->
     #{key_exchange => ecdh_rsa, 
       cipher => aes_128_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDH_RSA_WITH_AES_256_CBC_SHA) ->
+suite_bin_to_map(?TLS_ECDH_RSA_WITH_AES_256_CBC_SHA) ->
     #{key_exchange => ecdh_rsa, 
       cipher => aes_256_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDHE_RSA_WITH_NULL_SHA) ->
+suite_bin_to_map(?TLS_ECDHE_RSA_WITH_NULL_SHA) ->
     #{key_exchange => ecdhe_rsa, 
       cipher => null, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDHE_RSA_WITH_RC4_128_SHA) ->
+suite_bin_to_map(?TLS_ECDHE_RSA_WITH_RC4_128_SHA) ->
     #{key_exchange => ecdhe_rsa, 
       cipher => rc4_128, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA) ->
+suite_bin_to_map(?TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA) ->
     #{key_exchange => ecdhe_rsa, 
       cipher => '3des_ede_cbc', 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) ->
+suite_bin_to_map(?TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) ->
     #{key_exchange => ecdhe_rsa, 
       cipher => aes_128_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA) ->
+suite_bin_to_map(?TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA) ->
     #{key_exchange => ecdhe_rsa, 
       cipher => aes_256_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDH_anon_WITH_NULL_SHA) ->
+suite_bin_to_map(?TLS_ECDH_anon_WITH_NULL_SHA) ->
     #{key_exchange => ecdh_anon, 
       cipher => null, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDH_anon_WITH_RC4_128_SHA) ->
+suite_bin_to_map(?TLS_ECDH_anon_WITH_RC4_128_SHA) ->
     #{key_exchange => ecdh_anon, 
       cipher => rc4_128, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA) ->
+suite_bin_to_map(?TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA) ->
     #{key_exchange => ecdh_anon, 
       cipher => '3des_ede_cbc', 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDH_anon_WITH_AES_128_CBC_SHA) ->
+suite_bin_to_map(?TLS_ECDH_anon_WITH_AES_128_CBC_SHA) ->
     #{key_exchange => ecdh_anon, 
       cipher => aes_128_cbc, 
       mac => sha, 
       prf => default_prf};
-suite_definition(?TLS_ECDH_anon_WITH_AES_256_CBC_SHA) ->
+suite_bin_to_map(?TLS_ECDH_anon_WITH_AES_256_CBC_SHA) ->
     #{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) ->
+suite_bin_to_map(?TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256) ->
     #{key_exchange => ecdhe_ecdsa, 
       cipher => aes_128_cbc, 
       mac => sha256, 
       prf => sha256};
-suite_definition(?TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384) ->
+suite_bin_to_map(?TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384) ->
     #{key_exchange => ecdhe_ecdsa, 
       cipher => aes_256_cbc, 
       mac => sha384, 
       prf => sha384};
-suite_definition(?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256) ->
+suite_bin_to_map(?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256) ->
     #{key_exchange => ecdh_ecdsa, 
       cipher => aes_128_cbc, 
       mac => sha256, 
       prf => sha256};
-suite_definition(?TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384) ->
+suite_bin_to_map(?TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384) ->
     #{key_exchange => ecdh_ecdsa, 
       cipher => aes_256_cbc, 
       mac => sha384, 
       prf => sha384};
-suite_definition(?TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) ->
+suite_bin_to_map(?TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) ->
     #{key_exchange => ecdhe_rsa, 
       cipher => aes_128_cbc, 
       mac => sha256, 
       prf => sha256};
-suite_definition(?TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) ->
+suite_bin_to_map(?TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) ->
     #{key_exchange => ecdhe_rsa, 
       cipher => aes_256_cbc, 
       mac => sha384, 
       prf => sha384};
-suite_definition(?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256) ->
+suite_bin_to_map(?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256) ->
     #{key_exchange => ecdh_rsa, 
       cipher => aes_128_cbc, 
       mac => sha256, 
       prf => sha256};
-suite_definition(?TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384) ->
+suite_bin_to_map(?TLS_ECDH_RSA_WITH_AES_256_CBC_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) ->
+suite_bin_to_map(?TLS_RSA_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => rsa, 
       cipher => aes_128_gcm, 
       mac => aead, 
       prf => sha256};
-suite_definition(?TLS_RSA_WITH_AES_256_GCM_SHA384) ->
+suite_bin_to_map(?TLS_RSA_WITH_AES_256_GCM_SHA384) ->
     #{key_exchange => rsa, 
       cipher => aes_256_gcm, 
       mac => aead, 
       prf => sha384};
-suite_definition(?TLS_DHE_RSA_WITH_AES_128_GCM_SHA256) ->
+suite_bin_to_map(?TLS_DHE_RSA_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => dhe_rsa, 
       cipher => aes_128_gcm, 
       mac => aead, 
       prf => sha256};
-suite_definition(?TLS_DHE_RSA_WITH_AES_256_GCM_SHA384) ->
+suite_bin_to_map(?TLS_DHE_RSA_WITH_AES_256_GCM_SHA384) ->
     #{key_exchange => dhe_rsa, 
       cipher => aes_256_gcm, 
       mac => aead, 
       prf => sha384};
-suite_definition(?TLS_DH_RSA_WITH_AES_128_GCM_SHA256) ->
+suite_bin_to_map(?TLS_DH_RSA_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => dh_rsa, 
       cipher => aes_128_gcm, 
       mac => aead, 
       prf => sha256};
-suite_definition(?TLS_DH_RSA_WITH_AES_256_GCM_SHA384) ->
+suite_bin_to_map(?TLS_DH_RSA_WITH_AES_256_GCM_SHA384) ->
     #{key_exchange => dh_rsa, 
       cipher => aes_256_gcm, 
       mac => aead, 
       prf => sha384};
-suite_definition(?TLS_DHE_DSS_WITH_AES_128_GCM_SHA256) ->
+suite_bin_to_map(?TLS_DHE_DSS_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => dhe_dss, 
       cipher => aes_128_gcm, 
       mac => aead, 
       prf => sha256};
-suite_definition(?TLS_DHE_DSS_WITH_AES_256_GCM_SHA384) ->
+suite_bin_to_map(?TLS_DHE_DSS_WITH_AES_256_GCM_SHA384) ->
     #{key_exchange => dhe_dss, 
       cipher => aes_256_gcm, 
       mac => aead, 
       prf => sha384};
-suite_definition(?TLS_DH_DSS_WITH_AES_128_GCM_SHA256) ->
+suite_bin_to_map(?TLS_DH_DSS_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => dh_dss, 
       cipher => aes_128_gcm, 
       mac => null, 
       prf => sha256};
-suite_definition(?TLS_DH_DSS_WITH_AES_256_GCM_SHA384) ->
+suite_bin_to_map(?TLS_DH_DSS_WITH_AES_256_GCM_SHA384) ->
     #{key_exchange => dh_dss, 
       cipher => aes_256_gcm, 
       mac => aead, 
       prf => sha384};
-suite_definition(?TLS_DH_anon_WITH_AES_128_GCM_SHA256) ->
+suite_bin_to_map(?TLS_DH_anon_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => dh_anon, 
       cipher => aes_128_gcm, 
       mac => aead, 
       prf => sha256};
-suite_definition(?TLS_DH_anon_WITH_AES_256_GCM_SHA384) ->
+suite_bin_to_map(?TLS_DH_anon_WITH_AES_256_GCM_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) ->
+suite_bin_to_map(?TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => ecdhe_ecdsa, 
       cipher => aes_128_gcm, 
       mac => aead, 
       prf => sha256};
-suite_definition(?TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384) ->
+suite_bin_to_map(?TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384) ->
     #{key_exchange => ecdhe_ecdsa, 
       cipher => aes_256_gcm, 
       mac => aead, 
       prf => sha384};
-suite_definition(?TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256) ->
+suite_bin_to_map(?TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => ecdh_ecdsa, 
       cipher => aes_128_gcm, 
       mac => aead, 
       prf => sha256};
-suite_definition(?TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384) ->
+suite_bin_to_map(?TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384) ->
     #{key_exchange => ecdh_ecdsa, 
       cipher => aes_256_gcm, 
       mac => aead, 
       prf => sha384};
-suite_definition(?TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) ->
+suite_bin_to_map(?TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => ecdhe_rsa, 
       cipher => aes_128_gcm, 
       mac => aead, 
       prf => sha256};
-suite_definition(?TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) ->
+suite_bin_to_map(?TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) ->
     #{key_exchange => ecdhe_rsa, 
       cipher => aes_256_gcm, 
       mac => aead, 
       prf => sha384};
-suite_definition(?TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256) ->
+suite_bin_to_map(?TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256) ->
     #{key_exchange => ecdh_rsa, 
       cipher => aes_128_gcm, 
       mac => aead, 
       prf => sha256};
-suite_definition(?TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384) ->
+suite_bin_to_map(?TLS_ECDH_RSA_WITH_AES_256_GCM_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) ->
+suite_bin_to_map(?TLS_PSK_WITH_AES_128_CCM) ->
+    #{key_exchange => psk,
+      cipher => aes_128_ccm,
+      mac => aead,
+      prf => sha256};
+suite_bin_to_map(?TLS_PSK_WITH_AES_256_CCM) -> 
+    #{key_exchange => psk,
+      cipher => aes_256_ccm,
+      mac => aead,
+      prf => sha256};
+suite_bin_to_map(?TLS_DHE_PSK_WITH_AES_128_CCM) ->
+    #{key_exchange => dhe_psk,
+      cipher => aes_128_ccm,
+      mac => aead,
+      prf => sha256};
+suite_bin_to_map(?TLS_DHE_PSK_WITH_AES_256_CCM) ->
+    #{key_exchange => dhe_psk,
+      cipher => aes_256_ccm,
+      mac => aead,
+      prf => sha256};
+suite_bin_to_map(?TLS_PSK_WITH_AES_128_CCM_8) ->
+    #{key_exchange => psk,
+      cipher => aes_128_ccm_8,
+      mac => aead,
+      prf => sha256};
+suite_bin_to_map(?TLS_PSK_WITH_AES_256_CCM_8) ->
+    #{key_exchange => psk,
+      cipher => aes_256_ccm_8,
+      mac => aead,
+      prf => sha256};
+suite_bin_to_map(?TLS_PSK_DHE_WITH_AES_128_CCM_8) ->
+  #{key_exchange => dhe_psk,
+    cipher => aes_128_ccm_8,
+    mac => aead,
+    prf => sha256};
+suite_bin_to_map(?TLS_PSK_DHE_WITH_AES_256_CCM_8) ->
+  #{key_exchange => dhe_psk,
+    cipher => aes_256_ccm_8,
+    mac => aead,
+    prf => sha256};
+suite_bin_to_map(#{key_exchange := psk_dhe,
+                   cipher := aes_256_ccm_8,
+                   mac := aead,
+                   prf := sha256}) ->
+    ?TLS_PSK_DHE_WITH_AES_256_CCM_8;
+
+% draft-agl-tls-chacha20poly1305-04 Chacha20/Poly1305 Suites
+suite_bin_to_map(?TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256) ->
     #{key_exchange => ecdhe_rsa, 
       cipher => chacha20_poly1305, 
       mac => aead, 
       prf => sha256};
-suite_definition(?TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256) ->
+suite_bin_to_map(?TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256) ->
     #{key_exchange => ecdhe_ecdsa, 
       cipher => chacha20_poly1305, 
       mac => aead, 
       prf => sha256};
-suite_definition(?TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256) ->
+suite_bin_to_map(?TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256) ->
     #{key_exchange => dhe_rsa, 
       cipher => chacha20_poly1305, 
       mac => aead, 
-      prf => sha256}.
+      prf => sha256};
+%% TLS 1.3 Cipher Suites RFC8446
+suite_bin_to_map(?TLS_AES_128_GCM_SHA256) ->
+    #{key_exchange => any,
+      cipher => aes_128_gcm,
+      mac => aead,
+      prf => sha256};
+suite_bin_to_map(?TLS_AES_256_GCM_SHA384) ->
+    #{key_exchange => any,
+      cipher => aes_256_gcm,
+      mac => aead,
+      prf => sha384};
+suite_bin_to_map(?TLS_CHACHA20_POLY1305_SHA256) ->
+    #{key_exchange => any,
+      cipher => chacha20_poly1305,
+      mac => aead,
+      prf => sha256};
+suite_bin_to_map(?TLS_AES_128_CCM_SHA256) ->
+     #{key_exchange => any,
+       cipher => aes_128_ccm,
+       mac => aead,
+       prf => sha256}.
+%% suite_bin_to_map(?TLS_AES_128_CCM_8_SHA256) ->
+%%      #{key_exchange => any,
+%%       cipher => aes_128_ccm_8,
+%%        mac => aead,
+%%        prf => sha256}.
 
 %%--------------------------------------------------------------------
--spec erl_suite_definition(cipher_suite() | erl_cipher_suite()) -> old_erl_cipher_suite().
+-spec suite_legacy(cipher_suite() | internal_erl_cipher_suite()) -> old_erl_cipher_suite().
 %%
 %% Description: Return erlang cipher suite definition. Filters last value
 %% for now (compatibility reasons).
 %%--------------------------------------------------------------------
-erl_suite_definition(Bin) when is_binary(Bin) ->
-    erl_suite_definition(suite_definition(Bin));    
-erl_suite_definition(#{key_exchange := KeyExchange, cipher := Cipher,
+suite_legacy(Bin) when is_binary(Bin) ->
+    suite_legacy(suite_bin_to_map(Bin));    
+suite_legacy(#{key_exchange := KeyExchange, cipher := Cipher,
                        mac := Hash, prf := Prf}) ->
     case Prf of
         default_prf ->
@@ -822,943 +1005,915 @@ erl_suite_definition(#{key_exchange := KeyExchange, cipher := Cipher,
     end.
 
 %%--------------------------------------------------------------------
--spec suite(erl_cipher_suite()) -> cipher_suite().
+-spec suite_map_to_bin(internal_erl_cipher_suite()) -> cipher_suite().
 %%
 %% Description: Return TLS cipher suite definition.
 %%--------------------------------------------------------------------
 %% TLS v1.1 suites
-suite(#{key_exchange := rsa, 
+suite_map_to_bin(#{key_exchange := rsa, 
         cipher := rc4_128, 
         mac := md5}) ->
     ?TLS_RSA_WITH_RC4_128_MD5;
-suite(#{key_exchange := rsa, 
+suite_map_to_bin(#{key_exchange := rsa, 
         cipher := rc4_128, 
         mac := sha}) ->
     ?TLS_RSA_WITH_RC4_128_SHA;
-suite(#{key_exchange := rsa, 
+suite_map_to_bin(#{key_exchange := rsa, 
         cipher := des_cbc, 
         mac := sha}) ->
     ?TLS_RSA_WITH_DES_CBC_SHA; 
-suite(#{key_exchange := rsa, 
+suite_map_to_bin(#{key_exchange := rsa, 
         cipher :='3des_ede_cbc', 
         mac := sha}) ->
     ?TLS_RSA_WITH_3DES_EDE_CBC_SHA; 
-suite(#{key_exchange := dhe_dss,  
+suite_map_to_bin(#{key_exchange := dhe_dss,  
         cipher:= des_cbc, 
         mac := sha}) ->
     ?TLS_DHE_DSS_WITH_DES_CBC_SHA;
-suite(#{key_exchange := dhe_dss, 
+suite_map_to_bin(#{key_exchange := dhe_dss, 
         cipher:= '3des_ede_cbc', 
         mac := sha}) ->
     ?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA;
-suite(#{key_exchange := dhe_rsa, 
+suite_map_to_bin(#{key_exchange := dhe_rsa, 
         cipher:= des_cbc,
         mac := sha}) ->
     ?TLS_DHE_RSA_WITH_DES_CBC_SHA;
-suite(#{key_exchange := dhe_rsa, 
+suite_map_to_bin(#{key_exchange := dhe_rsa, 
         cipher:= '3des_ede_cbc', 
         mac := sha}) ->
     ?TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA; 
-suite(#{key_exchange := dh_anon, 
+suite_map_to_bin(#{key_exchange := dh_anon, 
         cipher:= rc4_128,
         mac := md5}) ->
     ?TLS_DH_anon_WITH_RC4_128_MD5;
-suite(#{key_exchange := dh_anon, 
+suite_map_to_bin(#{key_exchange := dh_anon, 
         cipher:= des_cbc,  
         mac := sha}) ->
     ?TLS_DH_anon_WITH_DES_CBC_SHA;
-suite(#{key_exchange := dh_anon, 
+suite_map_to_bin(#{key_exchange := dh_anon, 
         cipher:= '3des_ede_cbc',
         mac := sha}) ->
     ?TLS_DH_anon_WITH_3DES_EDE_CBC_SHA;
 %%% TSL V1.1 AES suites
-suite(#{key_exchange := rsa, 
+suite_map_to_bin(#{key_exchange := rsa, 
         cipher := aes_128_cbc, 
         mac := sha}) ->
     ?TLS_RSA_WITH_AES_128_CBC_SHA; 
-suite(#{key_exchange := dhe_dss, 
+suite_map_to_bin(#{key_exchange := dhe_dss, 
         cipher := aes_128_cbc, 
         mac := sha}) ->
     ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA; 
-suite(#{key_exchange := dhe_rsa, 
+suite_map_to_bin(#{key_exchange := dhe_rsa, 
         cipher := aes_128_cbc, 
         mac := sha}) ->
     ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA;
-suite(#{key_exchange := dh_anon, 
+suite_map_to_bin(#{key_exchange := dh_anon, 
         cipher := aes_128_cbc, 
         mac := sha}) ->
     ?TLS_DH_anon_WITH_AES_128_CBC_SHA;
-suite(#{key_exchange := rsa, 
+suite_map_to_bin(#{key_exchange := rsa, 
         cipher := aes_256_cbc,  
         mac := sha}) ->
     ?TLS_RSA_WITH_AES_256_CBC_SHA;
-suite(#{key_exchange := dhe_dss, 
+suite_map_to_bin(#{key_exchange := dhe_dss, 
         cipher := aes_256_cbc, 
         mac := sha}) ->
     ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA;
-suite(#{key_exchange := dhe_rsa, 
+suite_map_to_bin(#{key_exchange := dhe_rsa, 
         cipher := aes_256_cbc, 
         mac := sha}) ->
     ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA;
-suite(#{key_exchange := dh_anon, 
+suite_map_to_bin(#{key_exchange := dh_anon, 
         cipher := aes_256_cbc, 
         mac := sha}) ->
     ?TLS_DH_anon_WITH_AES_256_CBC_SHA;
 %% TLS v1.2 suites
-suite(#{key_exchange := rsa, 
+suite_map_to_bin(#{key_exchange := rsa, 
         cipher := aes_128_cbc, 
         mac := sha256}) ->
     ?TLS_RSA_WITH_AES_128_CBC_SHA256;
-suite(#{key_exchange := rsa, 
+suite_map_to_bin(#{key_exchange := rsa, 
         cipher := aes_256_cbc, 
         mac := sha256}) ->
     ?TLS_RSA_WITH_AES_256_CBC_SHA256;
-suite(#{key_exchange := dhe_dss, 
+suite_map_to_bin(#{key_exchange := dhe_dss, 
         cipher := aes_128_cbc, 
         mac := sha256}) ->
     ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA256;
-suite(#{key_exchange := dhe_rsa, 
+suite_map_to_bin(#{key_exchange := dhe_rsa, 
         cipher := aes_128_cbc, 
         mac := sha256}) ->
     ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA256;
-suite(#{key_exchange := dhe_dss, 
+suite_map_to_bin(#{key_exchange := dhe_dss, 
         cipher := aes_256_cbc, 
         mac := sha256}) ->
     ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA256;
-suite(#{key_exchange := dhe_rsa, 
+suite_map_to_bin(#{key_exchange := dhe_rsa, 
         cipher := aes_256_cbc, 
         mac := sha256}) ->
     ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA256;
-suite(#{key_exchange := dh_anon, 
+suite_map_to_bin(#{key_exchange := dh_anon, 
         cipher := aes_128_cbc, 
         mac := sha256}) ->
     ?TLS_DH_anon_WITH_AES_128_CBC_SHA256;
-suite(#{key_exchange := dh_anon, 
+suite_map_to_bin(#{key_exchange := dh_anon, 
         cipher := aes_256_cbc, 
         mac := sha256}) ->
     ?TLS_DH_anon_WITH_AES_256_CBC_SHA256;
 %%% PSK Cipher Suites RFC 4279
-suite(#{key_exchange := psk, 
+suite_map_to_bin(#{key_exchange := psk, 
         cipher := rc4_128,
         mac := sha}) ->
     ?TLS_PSK_WITH_RC4_128_SHA;
-suite(#{key_exchange := psk, 
+suite_map_to_bin(#{key_exchange := psk, 
         cipher := '3des_ede_cbc', 
         mac := sha}) ->
     ?TLS_PSK_WITH_3DES_EDE_CBC_SHA;
-suite(#{key_exchange := psk, 
+suite_map_to_bin(#{key_exchange := psk, 
         cipher := aes_128_cbc, 
         mac := sha}) ->
     ?TLS_PSK_WITH_AES_128_CBC_SHA;
-suite(#{key_exchange := psk, 
+suite_map_to_bin(#{key_exchange := psk, 
         cipher := aes_256_cbc, 
         mac := sha}) ->
     ?TLS_PSK_WITH_AES_256_CBC_SHA;
-suite(#{key_exchange := dhe_psk, 
+suite_map_to_bin(#{key_exchange := dhe_psk, 
         cipher := rc4_128, 
         mac := sha})  ->
     ?TLS_DHE_PSK_WITH_RC4_128_SHA;
-suite(#{key_exchange := dhe_psk, 
+suite_map_to_bin(#{key_exchange := dhe_psk, 
         cipher := '3des_ede_cbc', 
         mac := sha}) ->
     ?TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA;
-suite(#{key_exchange := dhe_psk, 
+suite_map_to_bin(#{key_exchange := dhe_psk, 
         cipher := aes_128_cbc, 
         mac := sha}) ->
     ?TLS_DHE_PSK_WITH_AES_128_CBC_SHA;
-suite(#{key_exchange := dhe_psk, 
+suite_map_to_bin(#{key_exchange := dhe_psk, 
         cipher := aes_256_cbc, 
         mac := sha}) ->
     ?TLS_DHE_PSK_WITH_AES_256_CBC_SHA;
-suite(#{key_exchange := rsa_psk, 
+suite_map_to_bin(#{key_exchange := rsa_psk, 
         cipher := rc4_128, 
         mac := sha}) ->
     ?TLS_RSA_PSK_WITH_RC4_128_SHA;
-suite(#{key_exchange := rsa_psk, 
+suite_map_to_bin(#{key_exchange := rsa_psk, 
         cipher := '3des_ede_cbc', 
         mac := sha}) ->
     ?TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA;
-suite(#{key_exchange := rsa_psk, 
+suite_map_to_bin(#{key_exchange := rsa_psk, 
         cipher := aes_128_cbc, 
         mac := sha}) ->
     ?TLS_RSA_PSK_WITH_AES_128_CBC_SHA;
-suite(#{key_exchange := rsa_psk, 
+suite_map_to_bin(#{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(#{key_exchange := psk, 
+suite_map_to_bin(#{key_exchange := psk, 
         cipher := null, 
         mac := sha}) ->
     ?TLS_PSK_WITH_NULL_SHA;
-suite(#{key_exchange := dhe_psk, 
+suite_map_to_bin(#{key_exchange := dhe_psk, 
         cipher := null, 
         mac := sha}) ->
     ?TLS_DHE_PSK_WITH_NULL_SHA;
-suite(#{key_exchange := rsa_psk, 
+suite_map_to_bin(#{key_exchange := rsa_psk, 
        cipher := null, 
        mac := sha}) ->
     ?TLS_RSA_PSK_WITH_NULL_SHA;
 %%% TLS 1.2 PSK Cipher Suites RFC 5487
-suite(#{key_exchange := psk, 
+suite_map_to_bin(#{key_exchange := psk, 
         cipher := aes_128_gcm, 
         mac := aead, 
         prf := sha256}) ->
     ?TLS_PSK_WITH_AES_128_GCM_SHA256;
-suite(#{key_exchange := psk, 
+suite_map_to_bin(#{key_exchange := psk, 
         cipher := aes_256_gcm, 
         mac := aead, 
         prf := sha384}) ->
     ?TLS_PSK_WITH_AES_256_GCM_SHA384;
-suite(#{key_exchange := dhe_psk, 
+suite_map_to_bin(#{key_exchange := dhe_psk, 
         cipher := aes_128_gcm, 
         mac := aead, 
         prf := sha256}) ->
     ?TLS_DHE_PSK_WITH_AES_128_GCM_SHA256;
-suite(#{key_exchange := dhe_psk, 
+suite_map_to_bin(#{key_exchange := dhe_psk, 
         cipher := aes_256_gcm, 
         mac := aead, 
         prf := sha384}) ->
     ?TLS_DHE_PSK_WITH_AES_256_GCM_SHA384;
-suite(#{key_exchange := rsa_psk, 
+suite_map_to_bin(#{key_exchange := rsa_psk, 
         cipher := aes_128_gcm, 
         mac := aead, 
         prf := sha256}) ->
     ?TLS_RSA_PSK_WITH_AES_128_GCM_SHA256;
-suite(#{key_exchange := rsa_psk, 
+suite_map_to_bin(#{key_exchange := rsa_psk, 
         cipher := aes_256_gcm, 
         mac := aead, 
         prf := sha384}) ->
     ?TLS_RSA_PSK_WITH_AES_256_GCM_SHA384;
-suite(#{key_exchange := psk, 
+suite_map_to_bin(#{key_exchange := psk, 
         cipher := aes_128_cbc, 
         mac := sha256}) ->
     ?TLS_PSK_WITH_AES_128_CBC_SHA256;
-suite(#{key_exchange := psk, 
+suite_map_to_bin(#{key_exchange := psk, 
         cipher := aes_256_cbc, 
         mac := sha384}) ->
     ?TLS_PSK_WITH_AES_256_CBC_SHA384;
-suite(#{key_exchange := dhe_psk, 
+suite_map_to_bin(#{key_exchange := dhe_psk, 
         cipher := aes_128_cbc, 
         mac := sha256}) ->
     ?TLS_DHE_PSK_WITH_AES_128_CBC_SHA256;
-suite(#{key_exchange := dhe_psk, 
+suite_map_to_bin(#{key_exchange := dhe_psk, 
         cipher := aes_256_cbc, 
         mac := sha384}) ->
     ?TLS_DHE_PSK_WITH_AES_256_CBC_SHA384;
-suite(#{key_exchange := rsa_psk, 
+suite_map_to_bin(#{key_exchange := rsa_psk, 
         cipher := aes_128_cbc, 
         mac := sha256}) ->
     ?TLS_RSA_PSK_WITH_AES_128_CBC_SHA256;
-suite(#{key_exchange := rsa_psk, 
+suite_map_to_bin(#{key_exchange := rsa_psk, 
         cipher := aes_256_cbc, 
         mac := sha384}) ->
     ?TLS_RSA_PSK_WITH_AES_256_CBC_SHA384;
-suite(#{key_exchange := psk, 
+suite_map_to_bin(#{key_exchange := psk, 
         cipher := null, 
         mac := sha256}) ->
     ?TLS_PSK_WITH_NULL_SHA256;
-suite(#{key_exchange := psk, 
+suite_map_to_bin(#{key_exchange := psk, 
         cipher := null,
         mac := sha384}) ->
     ?TLS_PSK_WITH_NULL_SHA384;
-suite(#{key_exchange := dhe_psk, 
+suite_map_to_bin(#{key_exchange := dhe_psk, 
         cipher := null, 
         mac := sha256}) ->
     ?TLS_DHE_PSK_WITH_NULL_SHA256;
-suite(#{key_exchange := dhe_psk, 
+suite_map_to_bin(#{key_exchange := dhe_psk, 
         cipher := null, 
         mac := sha384}) ->
     ?TLS_DHE_PSK_WITH_NULL_SHA384;
-suite(#{key_exchange := rsa_psk, 
+suite_map_to_bin(#{key_exchange := rsa_psk, 
         cipher := null,  
         mac := sha256}) ->
     ?TLS_RSA_PSK_WITH_NULL_SHA256;
-suite(#{key_exchange := rsa_psk, 
+suite_map_to_bin(#{key_exchange := rsa_psk, 
        cipher := null, 
        mac := sha384}) ->
     ?TLS_RSA_PSK_WITH_NULL_SHA384;
 %%% ECDHE PSK Cipher Suites RFC 5489
-suite(#{key_exchange := ecdhe_psk, 
+suite_map_to_bin(#{key_exchange := ecdhe_psk, 
         cipher := rc4_128,
         mac := sha}) ->
     ?TLS_ECDHE_PSK_WITH_RC4_128_SHA;
-suite(#{key_exchange := ecdhe_psk, 
+suite_map_to_bin(#{key_exchange := ecdhe_psk, 
         cipher :='3des_ede_cbc',
         mac := sha}) ->
     ?TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA;
-suite(#{key_exchange := ecdhe_psk, 
+suite_map_to_bin(#{key_exchange := ecdhe_psk, 
         cipher := aes_128_cbc,
         mac := sha}) ->
     ?TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA;
-suite(#{key_exchange := ecdhe_psk, 
+suite_map_to_bin(#{key_exchange := ecdhe_psk, 
         cipher := aes_256_cbc,
         mac := sha}) ->
     ?TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA;
-suite(#{key_exchange := ecdhe_psk, 
+suite_map_to_bin(#{key_exchange := ecdhe_psk, 
        cipher := aes_128_cbc, 
        mac := sha256}) ->
     ?TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256;
-suite(#{key_exchange := ecdhe_psk, 
+suite_map_to_bin(#{key_exchange := ecdhe_psk, 
        cipher := aes_256_cbc, 
        mac := sha384}) ->
     ?TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384;
-suite(#{key_exchange := ecdhe_psk, 
+suite_map_to_bin(#{key_exchange := ecdhe_psk, 
        cipher := null, 
        mac := sha256}) ->
     ?TLS_ECDHE_PSK_WITH_NULL_SHA256;
-suite(#{key_exchange := ecdhe_psk, 
+suite_map_to_bin(#{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(#{key_exchange := ecdhe_psk, 
+suite_map_to_bin(#{key_exchange := ecdhe_psk, 
        cipher := aes_128_gcm, 
        mac := null, 
        prf := sha256}) ->
     ?TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256;
-suite(#{key_exchange := ecdhe_psk, 
+suite_map_to_bin(#{key_exchange := ecdhe_psk, 
        cipher := aes_256_gcm, 
        mac := null, 
        prf := sha384}) ->
     ?TLS_ECDHE_PSK_WITH_AES_256_GCM_SHA384;
- %% 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;
+suite_map_to_bin(#{key_exchange := ecdhe_psk, 
+        cipher := aes_128_ccm_8, 
+        mac := null, 
+        prf := sha256}) ->
+    ?TLS_ECDHE_PSK_WITH_AES_128_CCM_8_SHA256;
+suite_map_to_bin(#{key_exchange := ecdhe_psk, 
+        cipher := aes_128_ccm, 
+         mac := null, 
+         prf := sha256}) ->
+    ?TLS_ECDHE_PSK_WITH_AES_128_CCM_SHA256;
 %%% SRP Cipher Suites RFC 5054
-suite(#{key_exchange := srp_anon, 
+suite_map_to_bin(#{key_exchange := srp_anon, 
         cipher := '3des_ede_cbc',
         mac :=  sha}) ->
     ?TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA;
-suite(#{key_exchange := srp_rsa, 
+suite_map_to_bin(#{key_exchange := srp_rsa, 
         cipher := '3des_ede_cbc',
         mac := sha}) ->
     ?TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA;
-suite(#{key_exchange := srp_dss, 
+suite_map_to_bin(#{key_exchange := srp_dss, 
         cipher := '3des_ede_cbc', 
         mac := sha}) ->
     ?TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA;
-suite(#{key_exchange := srp_anon, 
+suite_map_to_bin(#{key_exchange := srp_anon, 
         cipher := aes_128_cbc, 
         mac := sha}) ->
     ?TLS_SRP_SHA_WITH_AES_128_CBC_SHA;
-suite(#{key_exchange := srp_rsa, 
+suite_map_to_bin(#{key_exchange := srp_rsa, 
         cipher := aes_128_cbc, 
         mac := sha}) ->
     ?TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA;
-suite(#{key_exchange := srp_dss, 
+suite_map_to_bin(#{key_exchange := srp_dss, 
         cipher := aes_128_cbc, 
         mac := sha}) ->
     ?TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA;
-suite(#{key_exchange := srp_anon, 
+suite_map_to_bin(#{key_exchange := srp_anon, 
         cipher := aes_256_cbc, 
         mac := sha}) ->
     ?TLS_SRP_SHA_WITH_AES_256_CBC_SHA;
-suite(#{key_exchange := srp_rsa, 
+suite_map_to_bin(#{key_exchange := srp_rsa, 
         cipher := aes_256_cbc, 
         mac := sha}) ->
     ?TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA;
-suite(#{key_exchange := srp_dss, 
+suite_map_to_bin(#{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(#{key_exchange := ecdh_ecdsa, 
+suite_map_to_bin(#{key_exchange := ecdh_ecdsa, 
         cipher := null, 
         mac := sha}) ->
     ?TLS_ECDH_ECDSA_WITH_NULL_SHA;
-suite(#{key_exchange := ecdh_ecdsa, 
+suite_map_to_bin(#{key_exchange := ecdh_ecdsa, 
         cipher := rc4_128,  
         mac := sha})  ->
     ?TLS_ECDH_ECDSA_WITH_RC4_128_SHA;
-suite(#{key_exchange := ecdh_ecdsa, 
+suite_map_to_bin(#{key_exchange := ecdh_ecdsa, 
         cipher := '3des_ede_cbc', 
         mac := sha}) ->
     ?TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA;
-suite(#{key_exchange := ecdh_ecdsa, 
+suite_map_to_bin(#{key_exchange := ecdh_ecdsa, 
         cipher := aes_128_cbc, 
         mac := sha}) ->
     ?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA;
-suite(#{key_exchange := ecdh_ecdsa, 
+suite_map_to_bin(#{key_exchange := ecdh_ecdsa, 
         cipher := aes_256_cbc, 
         mac := sha}) ->
     ?TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA;
-suite(#{key_exchange := ecdhe_ecdsa, 
+suite_map_to_bin(#{key_exchange := ecdhe_ecdsa, 
         cipher := null, 
         mac := sha}) ->
     ?TLS_ECDHE_ECDSA_WITH_NULL_SHA;
-suite(#{key_exchange := ecdhe_ecdsa, 
+suite_map_to_bin(#{key_exchange := ecdhe_ecdsa, 
         cipher := rc4_128, 
         mac := sha}) ->
     ?TLS_ECDHE_ECDSA_WITH_RC4_128_SHA;
-suite(#{key_exchange := ecdhe_ecdsa, 
+suite_map_to_bin(#{key_exchange := ecdhe_ecdsa, 
         cipher := '3des_ede_cbc', 
         mac := sha}) ->
     ?TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA;
-suite(#{key_exchange := ecdhe_ecdsa, 
+suite_map_to_bin(#{key_exchange := ecdhe_ecdsa, 
         cipher := aes_128_cbc, 
         mac := sha}) ->
     ?TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA;
-suite(#{key_exchange := ecdhe_ecdsa, 
+suite_map_to_bin(#{key_exchange := ecdhe_ecdsa, 
         cipher := aes_256_cbc, 
         mac := sha}) ->
     ?TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA;
-suite(#{key_exchange := ecdh_rsa, 
+suite_map_to_bin(#{key_exchange := ecdh_rsa, 
         cipher := null, 
         mac := sha}) ->
     ?TLS_ECDH_RSA_WITH_NULL_SHA;
-suite(#{key_exchange := ecdh_rsa, 
+suite_map_to_bin(#{key_exchange := ecdh_rsa, 
         cipher := rc4_128, 
         mac := sha}) ->
     ?TLS_ECDH_RSA_WITH_RC4_128_SHA;
-suite(#{key_exchange := ecdh_rsa, 
+suite_map_to_bin(#{key_exchange := ecdh_rsa, 
         cipher := '3des_ede_cbc', mac := sha}) ->
     ?TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA;
-suite(#{key_exchange := ecdh_rsa, 
+suite_map_to_bin(#{key_exchange := ecdh_rsa, 
         cipher := aes_128_cbc, 
         mac := sha}) ->
     ?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA;
-suite(#{key_exchange := ecdh_rsa, 
+suite_map_to_bin(#{key_exchange := ecdh_rsa, 
         cipher := aes_256_cbc, 
         mac := sha}) ->
     ?TLS_ECDH_RSA_WITH_AES_256_CBC_SHA;
-suite(#{key_exchange := ecdhe_rsa, 
+suite_map_to_bin(#{key_exchange := ecdhe_rsa, 
         cipher := null, 
         mac := sha}) ->
     ?TLS_ECDHE_RSA_WITH_NULL_SHA;
-suite(#{key_exchange := ecdhe_rsa, 
+suite_map_to_bin(#{key_exchange := ecdhe_rsa, 
         cipher := rc4_128, 
         mac := sha}) ->
     ?TLS_ECDHE_RSA_WITH_RC4_128_SHA;
-suite(#{key_exchange := ecdhe_rsa, 
+suite_map_to_bin(#{key_exchange := ecdhe_rsa, 
         cipher := '3des_ede_cbc', 
         mac := sha}) ->
     ?TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA;
-suite(#{key_exchange := ecdhe_rsa, 
+suite_map_to_bin(#{key_exchange := ecdhe_rsa, 
         cipher := aes_128_cbc, 
         mac := sha}) ->
     ?TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA;
-suite(#{key_exchange := ecdhe_rsa, 
+suite_map_to_bin(#{key_exchange := ecdhe_rsa, 
         cipher := aes_256_cbc, 
         mac := sha}) ->
     ?TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA;
-suite(#{key_exchange := ecdh_anon, 
+suite_map_to_bin(#{key_exchange := ecdh_anon, 
         cipher := null, 
         mac := sha}) ->
     ?TLS_ECDH_anon_WITH_NULL_SHA;
-suite(#{key_exchange := ecdh_anon, 
+suite_map_to_bin(#{key_exchange := ecdh_anon, 
         cipher := rc4_128, 
         mac := sha}) ->
     ?TLS_ECDH_anon_WITH_RC4_128_SHA;
-suite(#{key_exchange := ecdh_anon, 
+suite_map_to_bin(#{key_exchange := ecdh_anon, 
         cipher := '3des_ede_cbc', 
         mac :=  sha}) ->
     ?TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA;
-suite(#{key_exchange := ecdh_anon, 
+suite_map_to_bin(#{key_exchange := ecdh_anon, 
         cipher := aes_128_cbc, 
         mac := sha}) ->
     ?TLS_ECDH_anon_WITH_AES_128_CBC_SHA;
-suite(#{key_exchange := ecdh_anon, 
+suite_map_to_bin(#{key_exchange := ecdh_anon, 
         cipher := aes_256_cbc, 
         mac := sha}) ->
     ?TLS_ECDH_anon_WITH_AES_256_CBC_SHA;
 %%% RFC 5289 EC TLS suites
-suite(#{key_exchange := ecdhe_ecdsa, 
+suite_map_to_bin(#{key_exchange := ecdhe_ecdsa, 
         cipher := aes_128_cbc, 
         mac:= sha256, 
         prf := sha256}) ->
     ?TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256;
-suite(#{key_exchange := ecdhe_ecdsa, 
+suite_map_to_bin(#{key_exchange := ecdhe_ecdsa, 
         cipher := aes_256_cbc, 
         mac := sha384, 
         prf := sha384}) ->
     ?TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384;
-suite(#{key_exchange := ecdh_ecdsa, 
+suite_map_to_bin(#{key_exchange := ecdh_ecdsa, 
         cipher := aes_128_cbc, 
         mac := sha256, 
         prf := sha256}) ->
     ?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256;
-suite(#{key_exchange := ecdh_ecdsa, 
+suite_map_to_bin(#{key_exchange := ecdh_ecdsa, 
         cipher := aes_256_cbc, 
         mac := sha384, 
         prf := sha384}) ->
     ?TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384;
-suite(#{key_exchange := ecdhe_rsa, 
+suite_map_to_bin(#{key_exchange := ecdhe_rsa, 
         cipher := aes_128_cbc, 
         mac := sha256, 
         prf := sha256}) ->
     ?TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256;
-suite(#{key_exchange := ecdhe_rsa, 
+suite_map_to_bin(#{key_exchange := ecdhe_rsa, 
         cipher := aes_256_cbc, 
         mac := sha384, 
         prf := sha384}) ->
     ?TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384;
-suite(#{key_exchange := ecdh_rsa, 
+suite_map_to_bin(#{key_exchange := ecdh_rsa, 
         cipher := aes_128_cbc, 
         mac := sha256, 
         prf := sha256}) ->
     ?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256;
-suite(#{key_exchange := ecdh_rsa, 
+suite_map_to_bin(#{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(#{key_exchange := rsa, 
+suite_map_to_bin(#{key_exchange := rsa, 
         cipher := aes_128_gcm, 
         mac := aead, 
         prf := sha256}) ->
     ?TLS_RSA_WITH_AES_128_GCM_SHA256;
-suite(#{key_exchange := rsa, 
+suite_map_to_bin(#{key_exchange := rsa, 
         cipher := aes_256_gcm, 
         mac := aead, 
         prf := sha384}) ->
     ?TLS_RSA_WITH_AES_256_GCM_SHA384;
-suite(#{key_exchange := dhe_rsa, 
+suite_map_to_bin(#{key_exchange := dhe_rsa, 
         cipher := aes_128_gcm, 
         mac := aead, 
         prf := sha256}) ->
     ?TLS_DHE_RSA_WITH_AES_128_GCM_SHA256;
-suite(#{key_exchange := dhe_rsa, 
+suite_map_to_bin(#{key_exchange := dhe_rsa, 
         cipher := aes_256_gcm, 
         mac := aead, 
         prf := sha384}) ->
     ?TLS_DHE_RSA_WITH_AES_256_GCM_SHA384;
-suite(#{key_exchange := dh_rsa, 
+suite_map_to_bin(#{key_exchange := dh_rsa, 
         cipher := aes_128_gcm, 
         mac := aead, 
         prf := sha256}) ->
     ?TLS_DH_RSA_WITH_AES_128_GCM_SHA256;
-suite(#{key_exchange := dh_rsa, 
+suite_map_to_bin(#{key_exchange := dh_rsa, 
         cipher := aes_256_gcm, 
         mac := aead, 
         prf := sha384}) ->
     ?TLS_DH_RSA_WITH_AES_256_GCM_SHA384;
-suite(#{key_exchange := dhe_dss, 
+suite_map_to_bin(#{key_exchange := dhe_dss, 
         cipher := aes_128_gcm, 
         mac := aead, 
         prf := sha256}) ->
     ?TLS_DHE_DSS_WITH_AES_128_GCM_SHA256;
-suite(#{key_exchange := dhe_dss, 
+suite_map_to_bin(#{key_exchange := dhe_dss, 
         cipher := aes_256_gcm, 
         mac := aead, 
         prf := sha384}) ->
     ?TLS_DHE_DSS_WITH_AES_256_GCM_SHA384;
-suite(#{key_exchange := dh_dss, 
+suite_map_to_bin(#{key_exchange := dh_dss, 
         cipher := aes_128_gcm, 
         mac := aead, 
         prf := sha256}) ->
     ?TLS_DH_DSS_WITH_AES_128_GCM_SHA256;
-suite(#{key_exchange := dh_dss, 
+suite_map_to_bin(#{key_exchange := dh_dss, 
         cipher := aes_256_gcm, 
         mac := aead, 
         prf := sha384}) ->
     ?TLS_DH_DSS_WITH_AES_256_GCM_SHA384;
-suite(#{key_exchange := dh_anon, 
+suite_map_to_bin(#{key_exchange := dh_anon, 
         cipher := aes_128_gcm, 
         mac := aead, 
         prf := sha256}) ->
     ?TLS_DH_anon_WITH_AES_128_GCM_SHA256;
-suite(#{key_exchange := dh_anon, 
+suite_map_to_bin(#{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(#{key_exchange := ecdhe_ecdsa, 
+suite_map_to_bin(#{key_exchange := ecdhe_ecdsa, 
         cipher := aes_128_gcm, 
         mac := aead, 
         prf := sha256}) ->
     ?TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256;
-suite(#{key_exchange := ecdhe_ecdsa, 
+suite_map_to_bin(#{key_exchange := ecdhe_ecdsa, 
         cipher := aes_256_gcm, 
         mac := aead, 
         prf := sha384}) ->
     ?TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384;
-suite(#{key_exchange := ecdh_ecdsa, 
+suite_map_to_bin(#{key_exchange := ecdh_ecdsa, 
         cipher := aes_128_gcm, 
         mac := aead, 
         prf := sha256}) ->
     ?TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256;
-suite(#{key_exchange := ecdh_ecdsa, 
+suite_map_to_bin(#{key_exchange := ecdh_ecdsa, 
         cipher := aes_256_gcm, 
         mac := aead, 
         prf := sha384}) ->
     ?TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384;
-suite(#{key_exchange := ecdhe_rsa, 
+suite_map_to_bin(#{key_exchange := ecdhe_rsa, 
         cipher := aes_128_gcm, 
         mac := aead, 
         prf := sha256}) ->
     ?TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256;
-suite(#{key_exchange := ecdhe_rsa, 
+suite_map_to_bin(#{key_exchange := ecdhe_rsa, 
         cipher := aes_256_gcm, 
         mac := aead, 
         prf := sha384}) ->
     ?TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384;
-suite(#{key_exchange := ecdh_rsa, 
+suite_map_to_bin(#{key_exchange := ecdh_rsa, 
         cipher := aes_128_gcm, 
         mac := aead, 
         prf := sha256}) ->
     ?TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256;
-suite(#{key_exchange := ecdh_rsa, 
+suite_map_to_bin(#{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(#{key_exchange := ecdhe_rsa, 
+suite_map_to_bin(#{key_exchange := ecdhe_rsa, 
         cipher := chacha20_poly1305,  
         mac := aead, 
         prf := sha256}) ->
     ?TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256;
-suite(#{key_exchange := ecdhe_ecdsa, 
+suite_map_to_bin(#{key_exchange := ecdhe_ecdsa, 
         cipher := chacha20_poly1305, 
         mac := aead, 
         prf := sha256}) ->
     ?TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256;
-suite(#{key_exchange := dhe_rsa, 
+suite_map_to_bin(#{key_exchange := dhe_rsa, 
         cipher := chacha20_poly1305,  
         mac := aead, 
         prf := sha256}) ->
-    ?TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256.
+    ?TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256;
 
-%%--------------------------------------------------------------------
--spec openssl_suite(openssl_cipher_suite()) -> cipher_suite().
-%%
-%% Description: Return TLS cipher suite definition.
-%%--------------------------------------------------------------------
-%% translate constants <-> openssl-strings
-openssl_suite("DHE-RSA-AES256-SHA256") ->
-    ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA256;
-openssl_suite("DHE-DSS-AES256-SHA256") ->
-    ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA256;
-openssl_suite("AES256-SHA256") ->
-    ?TLS_RSA_WITH_AES_256_CBC_SHA256;
-openssl_suite("DHE-RSA-AES128-SHA256") ->
-    ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA256;
-openssl_suite("DHE-DSS-AES128-SHA256") ->
-    ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA256;
-openssl_suite("AES128-SHA256") ->
-    ?TLS_RSA_WITH_AES_128_CBC_SHA256;
-openssl_suite("DHE-RSA-AES256-SHA") ->
-    ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA;
-openssl_suite("DHE-DSS-AES256-SHA") ->
-    ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA;
-openssl_suite("AES256-SHA") ->
-    ?TLS_RSA_WITH_AES_256_CBC_SHA;
-openssl_suite("EDH-RSA-DES-CBC3-SHA") ->
-    ?TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA;
-openssl_suite("EDH-DSS-DES-CBC3-SHA") ->
-    ?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA;
-openssl_suite("DES-CBC3-SHA") ->
-    ?TLS_RSA_WITH_3DES_EDE_CBC_SHA;
-openssl_suite("DHE-RSA-AES128-SHA") ->
-    ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA;
-openssl_suite("DHE-DSS-AES128-SHA") ->
-    ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA;
-openssl_suite("AES128-SHA") ->
-    ?TLS_RSA_WITH_AES_128_CBC_SHA;
-openssl_suite("RC4-SHA") ->
-    ?TLS_RSA_WITH_RC4_128_SHA;
-openssl_suite("RC4-MD5") -> 
-    ?TLS_RSA_WITH_RC4_128_MD5;
-openssl_suite("EDH-RSA-DES-CBC-SHA") ->
-    ?TLS_DHE_RSA_WITH_DES_CBC_SHA;
-openssl_suite("DES-CBC-SHA") ->
-    ?TLS_RSA_WITH_DES_CBC_SHA;
+%% RFC 6655 - TLS-1.2 cipher suites
+suite_map_to_bin(#{key_exchange := psk,
+        cipher := aes_128_ccm,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_PSK_WITH_AES_128_CCM;
+suite_map_to_bin(#{key_exchange := psk,
+        cipher := aes_256_ccm,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_PSK_WITH_AES_256_CCM;
+suite_map_to_bin(#{key_exchange := dhe_psk,
+        cipher := aes_128_ccm,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_DHE_PSK_WITH_AES_128_CCM;
+suite_map_to_bin(#{key_exchange := dhe_psk,
+        cipher := aes_256_ccm,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_DHE_PSK_WITH_AES_256_CCM;
+suite_map_to_bin(#{key_exchange := rsa,
+        cipher := aes_128_ccm,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_RSA_WITH_AES_128_CCM;
+suite_map_to_bin(#{key_exchange := rsa,
+        cipher := aes_256_ccm,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_RSA_WITH_AES_256_CCM;
+suite_map_to_bin(#{key_exchange := dhe_rsa,
+        cipher := aes_128_ccm,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_DHE_RSA_WITH_AES_128_CCM;
+suite_map_to_bin(#{key_exchange := dhe_rsa,
+        cipher := aes_256_ccm,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_DHE_RSA_WITH_AES_256_CCM;
 
-%%% SRP Cipher Suites RFC 5054
+suite_map_to_bin(#{key_exchange := psk,
+        cipher := aes_128_ccm_8,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_PSK_WITH_AES_128_CCM_8;
+suite_map_to_bin(#{key_exchange := psk,
+        cipher := aes_256_ccm_8,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_PSK_WITH_AES_256_CCM_8;
+suite_map_to_bin(#{key_exchange := dhe_psk,
+        cipher := aes_128_ccm_8,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_PSK_DHE_WITH_AES_128_CCM_8;
+suite_map_to_bin(#{key_exchange := dhe_psk,
+        cipher := aes_256_ccm_8,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_PSK_DHE_WITH_AES_256_CCM_8;
+suite_map_to_bin(#{key_exchange := rsa,
+        cipher := aes_128_ccm_8,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_RSA_WITH_AES_128_CCM_8;
+suite_map_to_bin(#{key_exchange := rsa,
+        cipher := aes_256_ccm_8,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_RSA_WITH_AES_256_CCM_8;
+suite_map_to_bin(#{key_exchange := dhe_rsa,
+        cipher := aes_128_ccm_8,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_DHE_RSA_WITH_AES_128_CCM_8;
+suite_map_to_bin(#{key_exchange := dhe_rsa,
+        cipher := aes_256_ccm_8,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_DHE_RSA_WITH_AES_256_CCM_8;
 
-openssl_suite("SRP-DSS-AES-256-CBC-SHA") ->
-    ?TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA;
-openssl_suite("SRP-RSA-AES-256-CBC-SHA") ->
-    ?TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA;
-openssl_suite("SRP-DSS-3DES-EDE-CBC-SHA") ->
-    ?TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA;
-openssl_suite("SRP-RSA-3DES-EDE-CBC-SHA") ->
-    ?TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA;
-openssl_suite("SRP-DSS-AES-128-CBC-SHA") ->
-    ?TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA;
-openssl_suite("SRP-RSA-AES-128-CBC-SHA") ->
-    ?TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA;
+%% TLS 1.3 Cipher Suites RFC8446
+suite_map_to_bin(#{key_exchange := any,
+        cipher := aes_128_gcm,
+        mac := aead,
+        prf := sha256}) ->
+    ?TLS_AES_128_GCM_SHA256;
+suite_map_to_bin(#{key_exchange := any,
+      cipher := aes_256_gcm,
+      mac := aead,
+      prf := sha384}) ->
+    ?TLS_AES_256_GCM_SHA384;
+suite_map_to_bin(#{key_exchange := any,
+      cipher := chacha20_poly1305,
+      mac := aead,
+      prf := sha256}) ->
+    ?TLS_CHACHA20_POLY1305_SHA256;
+suite_map_to_bin(#{key_exchange := any,
+      cipher := aes_128_ccm,
+      mac := aead,
+      prf := sha256}) ->
+    ?TLS_AES_128_CCM_SHA256.
+%% suite_map_to_bin(#{key_exchange := any,
+%%       cipher := aes_128_ccm_8,
+%%       mac := aead,
+%%       prf := sha256}) ->
+%%     ?TLS_AES_128_CCM_8_SHA256.
 
-%% RFC 4492 EC TLS suites
-openssl_suite("ECDH-ECDSA-RC4-SHA") ->
-    ?TLS_ECDH_ECDSA_WITH_RC4_128_SHA;
-openssl_suite("ECDH-ECDSA-DES-CBC3-SHA") ->
-    ?TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA;
-openssl_suite("ECDH-ECDSA-AES128-SHA") ->
-    ?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA;
-openssl_suite("ECDH-ECDSA-AES256-SHA") ->
-    ?TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA;
 
-openssl_suite("ECDHE-ECDSA-RC4-SHA") ->
-    ?TLS_ECDHE_ECDSA_WITH_RC4_128_SHA;
-openssl_suite("ECDHE-ECDSA-DES-CBC3-SHA") ->
-    ?TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA;
-openssl_suite("ECDHE-ECDSA-AES128-SHA") ->
-    ?TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA;
-openssl_suite("ECDHE-ECDSA-AES256-SHA") ->
-    ?TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA;
+tls_1_3_suite_str_to_map(CipherStr) ->
+    {Cipher, Mac, Prf} = cipher_str_to_algs(any, CipherStr, ""),
+    #{key_exchange => any,
+      mac => Mac,
+      cipher => Cipher,
+      prf => Prf   
+     }.
 
-openssl_suite("ECDHE-RSA-RC4-SHA") ->
-    ?TLS_ECDHE_RSA_WITH_RC4_128_SHA;
-openssl_suite("ECDHE-RSA-DES-CBC3-SHA") ->
-    ?TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA;
-openssl_suite("ECDHE-RSA-AES128-SHA") ->
-    ?TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA;
-openssl_suite("ECDHE-RSA-AES256-SHA") ->
-    ?TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA;
+pre_tls_1_3_suite_str_to_map(KexStr, Rest) ->
+    Kex = algo_str_to_atom(KexStr),
+    [CipherStr, AlgStr] = string:split(Rest, "_", trailing),
+    {Cipher, Mac, Prf} = cipher_str_to_algs(Kex, CipherStr, AlgStr),
+    #{key_exchange => Kex,
+      mac => Mac,
+      cipher => Cipher,
+      prf => Prf   
+     }.
+                
+cipher_str_to_algs(_, CipherStr, "CCM"= End) -> %% PRE TLS 1.3
+    Cipher = algo_str_to_atom(CipherStr ++ "_" ++ End),
+    {Cipher, aead, sha256};
+cipher_str_to_algs(_, CipherStr, "8" = End) -> %% PRE TLS 1.3
+    Cipher = algo_str_to_atom(CipherStr ++ "_" ++ End),
+    {Cipher, aead, sha256};
+cipher_str_to_algs(_, CipherStr, "CHACHA20_POLY1305" = End) -> %% PRE TLS 1.3
+    Cipher = algo_str_to_atom(CipherStr ++ "_" ++ End),
+    {Cipher, aead, sha256};
+cipher_str_to_algs(_, CipherStr0, "") -> %% TLS 1.3
+    [CipherStr, AlgStr] = string:split(CipherStr0, "_", trailing),
+    Hash = algo_str_to_atom(AlgStr),
+    Cipher = algo_str_to_atom(CipherStr),
+    {Cipher, aead, Hash};
+cipher_str_to_algs(Kex, CipherStr, HashStr) -> %% PRE TLS 1.3
+    Hash = algo_str_to_atom(HashStr),
+    Cipher = algo_str_to_atom(CipherStr),
+    case is_aead_cipher(CipherStr) of
+        true ->
+            {Cipher, aead, Hash};
+        false ->
+            {Cipher, Hash, default_prf(Kex, Hash)}
+    end.
 
-openssl_suite("ECDH-RSA-RC4-SHA") ->
-    ?TLS_ECDH_RSA_WITH_RC4_128_SHA;
-openssl_suite("ECDH-RSA-DES-CBC3-SHA") ->
-    ?TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA;
-openssl_suite("ECDH-RSA-AES128-SHA") ->
-    ?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA;
-openssl_suite("ECDH-RSA-AES256-SHA") ->
-    ?TLS_ECDH_RSA_WITH_AES_256_CBC_SHA;
+default_prf(_, md5) ->
+    default_prf;
+default_prf(_, sha) ->
+    default_prf;
+default_prf(ecdhe_ecdsa, sha256) ->
+    sha256;
+default_prf(ecdhe_rsa, sha256) ->
+    sha256;
+default_prf(dhe_rsa, sha256) ->
+    default_prf;
+default_prf(dhe_dss, sha256) ->
+    default_prf;
+default_prf(rsa, sha256) ->
+    default_prf;
+default_prf(rsa_psk, sha256) ->
+    default_prf;
+default_prf(_, Hash) ->
+    Hash.
 
-%% RFC 5289 EC TLS suites
-openssl_suite("ECDHE-ECDSA-AES128-SHA256") ->
-    ?TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256;
-openssl_suite("ECDHE-ECDSA-AES256-SHA384") ->
-    ?TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384;
-openssl_suite("ECDH-ECDSA-AES128-SHA256") ->
-    ?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256;
-openssl_suite("ECDH-ECDSA-AES256-SHA384") ->
-    ?TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384;
-openssl_suite("ECDHE-RSA-AES128-SHA256") ->
-    ?TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256;
-openssl_suite("ECDHE-RSA-AES256-SHA384") ->
-    ?TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384;
-openssl_suite("ECDH-RSA-AES128-SHA256") ->
-    ?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256;
-openssl_suite("ECDH-RSA-AES256-SHA384") ->
-    ?TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384;
+%% PRE TLS 1.3
+is_aead_cipher("CHACHA20_POLY1305") ->
+    true;
+is_aead_cipher(CipherStr) ->
+    [_, Rest] = string:split(CipherStr, "_", trailing),
+    (Rest == "GCM") orelse (Rest == "CCM") orelse (Rest == "8").
 
-%% RFC 5288 AES-GCM Cipher Suites
-openssl_suite("AES128-GCM-SHA256") ->
-    ?TLS_RSA_WITH_AES_128_GCM_SHA256;
-openssl_suite("AES256-GCM-SHA384") ->
-    ?TLS_RSA_WITH_AES_256_GCM_SHA384;
-openssl_suite("DHE-RSA-AES128-GCM-SHA256") ->
-    ?TLS_DHE_RSA_WITH_AES_128_GCM_SHA256;
-openssl_suite("DHE-RSA-AES256-GCM-SHA384") ->
-    ?TLS_DHE_RSA_WITH_AES_256_GCM_SHA384;
-openssl_suite("DH-RSA-AES128-GCM-SHA256") ->
-    ?TLS_DH_RSA_WITH_AES_128_GCM_SHA256;
-openssl_suite("DH-RSA-AES256-GCM-SHA384") ->
-    ?TLS_DH_RSA_WITH_AES_256_GCM_SHA384;
-openssl_suite("DHE-DSS-AES128-GCM-SHA256") ->
-    ?TLS_DHE_DSS_WITH_AES_128_GCM_SHA256;
-openssl_suite("DHE-DSS-AES256-GCM-SHA384") ->
-    ?TLS_DHE_DSS_WITH_AES_256_GCM_SHA384;
-openssl_suite("DH-DSS-AES128-GCM-SHA256") ->
-    ?TLS_DH_DSS_WITH_AES_128_GCM_SHA256;
-openssl_suite("DH-DSS-AES256-GCM-SHA384") ->
-    ?TLS_DH_DSS_WITH_AES_256_GCM_SHA384;
+openssl_is_aead_cipher("CHACHA20-POLY1305") ->
+    true;
+openssl_is_aead_cipher(CipherStr) ->
+    case string:split(CipherStr, "-", trailing) of
+        [_, Rest] ->      
+            (Rest == "GCM") orelse (Rest == "CCM") orelse (Rest == "8");
+        [_] ->
+            false
+    end.  
 
-%% RFC 5289 ECC AES-GCM Cipher Suites
-openssl_suite("ECDHE-ECDSA-AES128-GCM-SHA256") ->
-    ?TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256;
-openssl_suite("ECDHE-ECDSA-AES256-GCM-SHA384") ->
-    ?TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384;
-openssl_suite("ECDH-ECDSA-AES128-GCM-SHA256") ->
-    ?TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256;
-openssl_suite("ECDH-ECDSA-AES256-GCM-SHA384") ->
-    ?TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384;
-openssl_suite("ECDHE-RSA-AES128-GCM-SHA256") ->
-    ?TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256;
-openssl_suite("ECDHE-RSA-AES256-GCM-SHA384") ->
-    ?TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384;
-openssl_suite("ECDH-RSA-AES128-GCM-SHA256") ->
-    ?TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256;
-openssl_suite("ECDH-RSA-AES256-GCM-SHA384") ->
-    ?TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384.
+algo_str_to_atom("SRP_SHA_DSS") ->
+    srp_dss;
+algo_str_to_atom(AlgoStr) ->
+    erlang:list_to_existing_atom(string:to_lower(AlgoStr)).
 
-%%--------------------------------------------------------------------
--spec openssl_suite_name(cipher_suite()) -> openssl_cipher_suite() | erl_cipher_suite().
-%%
-%% Description: Return openssl cipher suite name if possible
-%%-------------------------------------------------------------------
-openssl_suite_name(?TLS_DHE_RSA_WITH_AES_256_CBC_SHA) ->
-    "DHE-RSA-AES256-SHA";
-openssl_suite_name(?TLS_DHE_DSS_WITH_AES_256_CBC_SHA) ->
-    "DHE-DSS-AES256-SHA";
-openssl_suite_name(?TLS_RSA_WITH_AES_256_CBC_SHA) ->
-    "AES256-SHA";
-openssl_suite_name(?TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA) ->
-    "EDH-RSA-DES-CBC3-SHA";
-openssl_suite_name(?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA) ->
-    "EDH-DSS-DES-CBC3-SHA";
-openssl_suite_name(?TLS_RSA_WITH_3DES_EDE_CBC_SHA) ->
-    "DES-CBC3-SHA";
-openssl_suite_name( ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA) ->
-    "DHE-RSA-AES128-SHA";
-openssl_suite_name(?TLS_DHE_DSS_WITH_AES_128_CBC_SHA) ->
-    "DHE-DSS-AES128-SHA";
-openssl_suite_name(?TLS_RSA_WITH_AES_128_CBC_SHA) ->
-    "AES128-SHA";
-openssl_suite_name(?TLS_RSA_WITH_RC4_128_SHA) ->
-    "RC4-SHA";
-openssl_suite_name(?TLS_RSA_WITH_RC4_128_MD5) -> 
-    "RC4-MD5";
-openssl_suite_name(?TLS_DHE_RSA_WITH_DES_CBC_SHA) ->
-    "EDH-RSA-DES-CBC-SHA";
-openssl_suite_name(?TLS_RSA_WITH_DES_CBC_SHA) ->
-    "DES-CBC-SHA";
-openssl_suite_name(?TLS_RSA_WITH_NULL_SHA256) ->
-    "NULL-SHA256";
-openssl_suite_name(?TLS_RSA_WITH_AES_128_CBC_SHA256) ->
-    "AES128-SHA256";
-openssl_suite_name(?TLS_RSA_WITH_AES_256_CBC_SHA256) ->
-    "AES256-SHA256";
-openssl_suite_name(?TLS_DH_DSS_WITH_AES_128_CBC_SHA256) ->
-    "DH-DSS-AES128-SHA256";
-openssl_suite_name(?TLS_DH_RSA_WITH_AES_128_CBC_SHA256) ->
-    "DH-RSA-AES128-SHA256";
-openssl_suite_name(?TLS_DHE_DSS_WITH_AES_128_CBC_SHA256) ->
-    "DHE-DSS-AES128-SHA256";
-openssl_suite_name(?TLS_DHE_RSA_WITH_AES_128_CBC_SHA256) ->
-    "DHE-RSA-AES128-SHA256";
-openssl_suite_name(?TLS_DH_DSS_WITH_AES_256_CBC_SHA256) ->
-    "DH-DSS-AES256-SHA256";
-openssl_suite_name(?TLS_DH_RSA_WITH_AES_256_CBC_SHA256) ->
-    "DH-RSA-AES256-SHA256";
-openssl_suite_name(?TLS_DHE_DSS_WITH_AES_256_CBC_SHA256) ->
-    "DHE-DSS-AES256-SHA256";
-openssl_suite_name(?TLS_DHE_RSA_WITH_AES_256_CBC_SHA256) ->
-    "DHE-RSA-AES256-SHA256";
+openssl_cipher_name(_, "3DES_EDE_CBC" ++ _) ->
+    "DES-CBC3";
+openssl_cipher_name(Kex, "AES_128_CBC" ++ _ = CipherStr) when Kex == rsa;
+                                                              Kex == dhe_rsa;
+                                                              Kex == ecdhe_rsa;
+                                                              Kex == ecdhe_ecdsa ->
+    openssl_name_concat(CipherStr);
+openssl_cipher_name(Kex, "AES_256_CBC" ++ _ = CipherStr) when Kex == rsa;
+                                                              Kex == dhe_rsa;
+                                                              Kex == ecdhe_rsa;
+                                                              Kex == ecdhe_ecdsa ->
+    openssl_name_concat(CipherStr);
+openssl_cipher_name(Kex, "AES_128_CBC" ++ _ = CipherStr) when Kex == srp;
+                                                              Kex == srp_rsa ->
+    lists:append(string:replace(CipherStr, "_", "-", all));
+openssl_cipher_name(Kex, "AES_256_CBC" ++ _ = CipherStr) when Kex == srp;
+                                                              Kex == srp_rsa ->
+    lists:append(string:replace(CipherStr, "_", "-", all));
+openssl_cipher_name(_, "AES_128_CBC" ++ _ = CipherStr) ->
+    openssl_name_concat(CipherStr)  ++ "-CBC";
+openssl_cipher_name(_, "AES_256_CBC" ++ _ = CipherStr) ->
+    openssl_name_concat(CipherStr)  ++ "-CBC";
+openssl_cipher_name(_, "AES_128_GCM" ++ _ = CipherStr) ->
+    openssl_name_concat(CipherStr) ++ "-GCM";
+openssl_cipher_name(_, "AES_256_GCM" ++ _ = CipherStr) ->
+    openssl_name_concat(CipherStr) ++ "-GCM";
+openssl_cipher_name(_, "RC4" ++ _) ->
+    "RC4";
+openssl_cipher_name(_, CipherStr) ->
+    lists:append(string:replace(CipherStr, "_", "-", all)).
 
-%%% PSK Cipher Suites RFC 4279
 
-openssl_suite_name(?TLS_PSK_WITH_AES_256_CBC_SHA) ->
-    "PSK-AES256-CBC-SHA";
-openssl_suite_name(?TLS_PSK_WITH_3DES_EDE_CBC_SHA) ->
-    "PSK-3DES-EDE-CBC-SHA";
-openssl_suite_name(?TLS_PSK_WITH_AES_128_CBC_SHA) ->
-    "PSK-AES128-CBC-SHA";
-openssl_suite_name(?TLS_PSK_WITH_RC4_128_SHA) ->
-    "PSK-RC4-SHA";
+openssl_suite_start(Kex) ->
+    case openssl_kex_name(Kex) of
+        "" ->
+            "";
+        Name ->
+            Name ++ "-"
+    end.
 
-%%% SRP Cipher Suites RFC 5054
+openssl_kex_name("RSA") ->
+    "";
+openssl_kex_name(Kex) ->
+    lists:append(string:replace(Kex, "_", "-", all)).
 
-openssl_suite_name(?TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA) ->
-    "SRP-RSA-3DES-EDE-CBC-SHA";
-openssl_suite_name(?TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA) ->
-    "SRP-DSS-3DES-EDE-CBC-SHA";
-openssl_suite_name(?TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA) ->
-    "SRP-RSA-AES-128-CBC-SHA";
-openssl_suite_name(?TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA) ->
-    "SRP-DSS-AES-128-CBC-SHA";
-openssl_suite_name(?TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA) ->
-    "SRP-RSA-AES-256-CBC-SHA";
-openssl_suite_name(?TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA) ->
-    "SRP-DSS-AES-256-CBC-SHA";
+kex_name_from_openssl(Kex) ->
+    lists:append(string:replace(Kex, "-", "_", all)).
 
-%% RFC 4492 EC TLS suites
-openssl_suite_name(?TLS_ECDH_ECDSA_WITH_RC4_128_SHA) ->
-    "ECDH-ECDSA-RC4-SHA";
-openssl_suite_name(?TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA) ->
-    "ECDH-ECDSA-DES-CBC3-SHA";
-openssl_suite_name(?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA) ->
-    "ECDH-ECDSA-AES128-SHA";
-openssl_suite_name(?TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA) ->
-    "ECDH-ECDSA-AES256-SHA";
+cipher_name_from_openssl("AES128") ->
+    "AES_128_CBC";
+cipher_name_from_openssl("AES256") ->
+    "AES_256_CBC";
+cipher_name_from_openssl("AES128-CBC") ->
+    "AES_128_CBC";
+cipher_name_from_openssl("AES256-CBC") ->
+    "AES_256_CBC";
+cipher_name_from_openssl("AES-128-CBC") ->
+    "AES_128_CBC";
+cipher_name_from_openssl("AES-256-CBC") ->
+    "AES_256_CBC";
+cipher_name_from_openssl("AES128-GCM") ->
+    "AES_128_GCM";
+cipher_name_from_openssl("AES256-GCM") ->
+    "AES_256_GCM";
+cipher_name_from_openssl("DES-CBC") ->
+    "DES_CBC";
+cipher_name_from_openssl("DES-CBC3") ->
+    "3DES_EDE_CBC";
+cipher_name_from_openssl("RC4") ->
+    "RC4_128";
+cipher_name_from_openssl(Str) ->
+    Str.
 
-openssl_suite_name(?TLS_ECDHE_ECDSA_WITH_RC4_128_SHA) ->
-    "ECDHE-ECDSA-RC4-SHA";
-openssl_suite_name(?TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA) ->
-    "ECDHE-ECDSA-DES-CBC3-SHA";
-openssl_suite_name(?TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA) ->
-    "ECDHE-ECDSA-AES128-SHA";
-openssl_suite_name(?TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA) ->
-    "ECDHE-ECDSA-AES256-SHA";
+openssl_name_concat(Str0) ->
+    [Str, _] = string:split(Str0, "_", trailing),
+    [Part1, Part2] = string:split(Str, "_", trailing),
+    Part1 ++ Part2.
 
-openssl_suite_name(?TLS_ECDH_RSA_WITH_RC4_128_SHA) ->
-    "ECDH-RSA-RC4-SHA";
-openssl_suite_name(?TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA) ->
-    "ECDH-RSA-DES-CBC3-SHA";
-openssl_suite_name(?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA) ->
-    "ECDH-RSA-AES128-SHA";
-openssl_suite_name(?TLS_ECDH_RSA_WITH_AES_256_CBC_SHA) ->
-    "ECDH-RSA-AES256-SHA";
 
-openssl_suite_name(?TLS_ECDHE_RSA_WITH_RC4_128_SHA) ->
-    "ECDHE-RSA-RC4-SHA";
-openssl_suite_name(?TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA) ->
-    "ECDHE-RSA-DES-CBC3-SHA";
-openssl_suite_name(?TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) ->
-    "ECDHE-RSA-AES128-SHA";
-openssl_suite_name(?TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA) ->
-    "ECDHE-RSA-AES256-SHA";
+suite_openssl_str_to_map(Kex0, Rest) ->
+    Kex = algo_str_to_atom(kex_name_from_openssl(Kex0)),
+    [CipherStr, AlgStr] = string:split(Rest, "-", trailing),
+    {Cipher, Mac, Prf} = openssl_cipher_str_to_algs(Kex, CipherStr, AlgStr),
+    #{key_exchange => Kex,
+      mac => Mac,
+      cipher => Cipher,
+      prf => Prf   
+     }.
 
-%% RFC 5289 EC TLS suites
-openssl_suite_name(?TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256) ->
-    "ECDHE-ECDSA-AES128-SHA256";
-openssl_suite_name(?TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384) ->
-    "ECDHE-ECDSA-AES256-SHA384";
-openssl_suite_name(?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256) ->
-    "ECDH-ECDSA-AES128-SHA256";
-openssl_suite_name(?TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384) ->
-    "ECDH-ECDSA-AES256-SHA384";
-openssl_suite_name(?TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) ->
-    "ECDHE-RSA-AES128-SHA256";
-openssl_suite_name(?TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) ->
-    "ECDHE-RSA-AES256-SHA384";
-openssl_suite_name(?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256) ->
-    "ECDH-RSA-AES128-SHA256";
-openssl_suite_name(?TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384) ->
-    "ECDH-RSA-AES256-SHA384";
+%% Does only need own implementation PRE TLS 1.3 
+openssl_cipher_str_to_algs(_, CipherStr, "CCM"= End) -> 
+    Cipher = algo_str_to_atom(CipherStr ++ "_" ++ End),
+    {Cipher, aead, sha256};
+openssl_cipher_str_to_algs(_, CipherStr, "8" = End) -> 
+    Cipher = algo_str_to_atom(CipherStr ++ "_" ++ End),
+    {Cipher, aead, sha256};
+openssl_cipher_str_to_algs(_, CipherStr, "POLY1305" = End) -> 
+    Cipher = algo_str_to_atom(CipherStr ++ "_" ++ End),
+    {Cipher, aead, sha256};
+openssl_cipher_str_to_algs(Kex, CipherStr, HashStr) ->
+    Hash = algo_str_to_atom(HashStr),
+    Cipher = algo_str_to_atom(cipher_name_from_openssl(CipherStr)),
+    case openssl_is_aead_cipher(CipherStr) of
+        true ->
+            {Cipher, aead, Hash};
+        false ->
+            {Cipher, Hash, default_prf(Kex, Hash)}
+    end.
 
-%% RFC 5288 AES-GCM Cipher Suites
-openssl_suite_name(?TLS_RSA_WITH_AES_128_GCM_SHA256) ->
-    "AES128-GCM-SHA256";
-openssl_suite_name(?TLS_RSA_WITH_AES_256_GCM_SHA384) ->
-    "AES256-GCM-SHA384";
-openssl_suite_name(?TLS_DHE_RSA_WITH_AES_128_GCM_SHA256) ->
-    "DHE-RSA-AES128-GCM-SHA256";
-openssl_suite_name(?TLS_DHE_RSA_WITH_AES_256_GCM_SHA384) ->
-    "DHE-RSA-AES256-GCM-SHA384";
-openssl_suite_name(?TLS_DH_RSA_WITH_AES_128_GCM_SHA256) ->
-    "DH-RSA-AES128-GCM-SHA256";
-openssl_suite_name(?TLS_DH_RSA_WITH_AES_256_GCM_SHA384) ->
-    "DH-RSA-AES256-GCM-SHA384";
-openssl_suite_name(?TLS_DHE_DSS_WITH_AES_128_GCM_SHA256) ->
-    "DHE-DSS-AES128-GCM-SHA256";
-openssl_suite_name(?TLS_DHE_DSS_WITH_AES_256_GCM_SHA384) ->
-    "DHE-DSS-AES256-GCM-SHA384";
-openssl_suite_name(?TLS_DH_DSS_WITH_AES_128_GCM_SHA256) ->
-    "DH-DSS-AES128-GCM-SHA256";
-openssl_suite_name(?TLS_DH_DSS_WITH_AES_256_GCM_SHA384) ->
-    "DH-DSS-AES256-GCM-SHA384";
 
-%% RFC 5289 ECC AES-GCM Cipher Suites
-openssl_suite_name(?TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256) ->
-    "ECDHE-ECDSA-AES128-GCM-SHA256";
-openssl_suite_name(?TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384) ->
-    "ECDHE-ECDSA-AES256-GCM-SHA384";
-openssl_suite_name(?TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256) ->
-    "ECDH-ECDSA-AES128-GCM-SHA256";
-openssl_suite_name(?TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384) ->
-    "ECDH-ECDSA-AES256-GCM-SHA384";
-openssl_suite_name(?TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) ->
-    "ECDHE-RSA-AES128-GCM-SHA256";
-openssl_suite_name(?TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) ->
-    "ECDHE-RSA-AES256-GCM-SHA384";
-openssl_suite_name(?TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256) ->
-    "ECDH-RSA-AES128-GCM-SHA256";
-openssl_suite_name(?TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384) ->
-    "ECDH-RSA-AES256-GCM-SHA384";
 
-%% No oppenssl name
-openssl_suite_name(Cipher) ->
-    suite_definition(Cipher).
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index 4b406b4c1e..2483509228 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2019. 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,12 +35,13 @@
 -include("ssl_internal.hrl").
 -include("ssl_srp.hrl").
 -include_lib("public_key/include/public_key.hrl").
+-include_lib("kernel/include/logger.hrl").
 
 %% Setup
 
--export([connect/8, handshake/7, handshake/2, handshake/3,
+-export([connect/8, handshake/7, handshake/2, handshake/3, handle_common_event/5,
          handshake_continue/3, handshake_cancel/1,
-	 socket_control/4, socket_control/5, start_or_recv_cancel_timer/2]).
+	 socket_control/4, socket_control/5]).
 
 %% User Events 
 -export([send/2, recv/3, close/2, shutdown/2,
@@ -51,7 +52,7 @@
 
 %% Alert and close handling
 -export([handle_own_alert/4, handle_alert/3, 
-	 handle_normal_shutdown/3, stop/2, stop_and_reply/3,
+	 handle_normal_shutdown/3, 
          handle_trusted_certs_db/1]).
 
 %% Data handling
@@ -59,7 +60,7 @@
 
 %% Help functions for tls|dtls_connection.erl
 -export([handle_session/7, ssl_config/3,
-	 prepare_connection/2, hibernate_after/3, map_extensions/1]).
+	 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
@@ -70,14 +71,14 @@
 -export([terminate/3, format_status/2]).
 
 %% Erlang Distribution export
--export([get_sslsocket/1, dist_handshake_complete/2]).
+-export([dist_handshake_complete/2]).
 
 %%====================================================================
 %% Setup
 %%====================================================================
 %%--------------------------------------------------------------------
 -spec connect(tls_connection | dtls_connection,
-	      host(), inet:port_number(), 
+	      ssl:host(), inet:port_number(), 
 	      port() | {tuple(), port()}, %% TLS | DTLS  
 	      {#ssl_options{}, #socket_options{},
 	       %% Tracker only needed on server side
@@ -114,7 +115,7 @@ handshake(Connection, Port, Socket, Opts, User, CbInfo, Timeout) ->
 
 %%--------------------------------------------------------------------
 -spec handshake(#sslsocket{}, timeout()) ->  {ok, #sslsocket{}} |
-                                                 {ok,  #sslsocket{}, map()}| {error, reason()}.
+                                             {ok,  #sslsocket{}, map()}| {error, reason()}.
 %%
 %% Description: Starts ssl handshake. 
 %%--------------------------------------------------------------------
@@ -123,14 +124,14 @@ handshake(#sslsocket{pid = [Pid|_]} = Socket, Timeout) ->
 	connected ->
 	    {ok, Socket};
         {ok, Ext} ->
-            {ok, Socket, Ext};
+            {ok, Socket, no_records(Ext)};
  	Error ->
 	    Error
     end.
 
 %%--------------------------------------------------------------------
--spec handshake(#sslsocket{}, {#ssl_options{},#socket_options{}},
-		timeout()) ->   {ok, #sslsocket{}} | {error, reason()}.
+-spec handshake(#sslsocket{}, {#ssl_options{},#socket_options{}}, timeout()) ->
+                       {ok, #sslsocket{}} | {ok, #sslsocket{}, map()} | {error, reason()}.
 %%
 %% Description: Starts ssl handshake with some new options 
 %%--------------------------------------------------------------------
@@ -143,7 +144,7 @@ handshake(#sslsocket{pid = [Pid|_]} = Socket, SslOptions, Timeout) ->
     end.
 
 %%--------------------------------------------------------------------
--spec handshake_continue(#sslsocket{}, [ssl_option()],
+-spec handshake_continue(#sslsocket{}, [ssl:tls_server_option()],
                          timeout()) ->  {ok,  #sslsocket{}}| {error, reason()}.
 %%
 %% Description: Continues handshake with new options
@@ -182,27 +183,23 @@ socket_control(Connection, Socket, Pid, Transport) ->
 %%--------------------------------------------------------------------	    
 socket_control(Connection, Socket, Pids, Transport, udp_listener) ->
     %% dtls listener process must have the socket control
-    {ok, Connection:socket(Pids, Transport, Socket, Connection, undefined)};
+    {ok, Connection:socket(Pids, Transport, Socket, undefined)};
 
 socket_control(tls_connection = Connection, Socket, [Pid|_] = Pids, Transport, ListenTracker) ->
     case Transport:controlling_process(Socket, Pid) of
 	ok ->
-	    {ok, Connection:socket(Pids, Transport, Socket, Connection, ListenTracker)};
+	    {ok, Connection:socket(Pids, Transport, Socket, ListenTracker)};
 	{error, Reason}	->
 	    {error, Reason}
     end;
 socket_control(dtls_connection = Connection, {_, Socket}, [Pid|_] = Pids, Transport, ListenTracker) ->
     case Transport:controlling_process(Socket, Pid) of
 	ok ->
-	    {ok, Connection:socket(Pids, Transport, Socket, Connection, ListenTracker)};
+	    {ok, Connection:socket(Pids, Transport, Socket, ListenTracker)};
 	{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
@@ -215,9 +212,9 @@ start_or_recv_cancel_timer(Timeout, RecvFrom) ->
 %%--------------------------------------------------------------------
 send(Pid, Data) -> 
     call(Pid, {application_data, 
-				    %% iolist_to_binary should really
-				    %% be called iodata_to_binary()
-				    erlang:iolist_to_binary(Data)}).
+				    %% iolist_to_iovec should really
+				    %% be called iodata_to_iovec()
+				    erlang:iolist_to_iovec(Data)}).
 
 %%--------------------------------------------------------------------
 -spec recv(pid(), integer(), timeout()) ->  
@@ -315,9 +312,6 @@ renegotiation(ConnectionPid) ->
 internal_renegotiation(ConnectionPid, #{current_write := WriteState}) ->
     gen_statem:cast(ConnectionPid, {internal_renegotiate, WriteState}). 
 
-get_sslsocket(ConnectionPid) ->
-    call(ConnectionPid, get_sslsocket).
-
 dist_handshake_complete(ConnectionPid, DHandle) ->
     gen_statem:cast(ConnectionPid, {dist_handshake_complete, DHandle}).
 
@@ -334,197 +328,407 @@ prf(ConnectionPid, Secret, Label, Seed, WantedLength) ->
 %%====================================================================
 %% Alert and close handling
 %%====================================================================
-handle_own_alert(Alert, _, StateName,
-		 #state{role = Role,
-                        protocol_cb = Connection,
+handle_own_alert(Alert0, _, StateName,
+		 #state{static_env = #static_env{role = Role,
+                                                 protocol_cb = Connection},
                         ssl_options = SslOpts} = State) ->
     try %% Try to tell the other side
-        send_alert(Alert, StateName, State)
+        send_alert(Alert0, StateName, State)
     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}),
+        Alert = Alert0#alert{role = Role},
+	log_alert(SslOpts#ssl_options.log_level, Role, Connection:protocol_name(), StateName, Alert),
 	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}} = State) ->
+    {stop, {shutdown, own_alert}, State}.
+
+handle_normal_shutdown(Alert, StateName, #state{static_env = #static_env{role = Role,
+                                                                         socket = Socket,
+                                                                         transport_cb = Transport,
+                                                                         protocol_cb = Connection,
+                                                                         tracker = Tracker},
+                                                handshake_env = #handshake_env{renegotiation = {false, first}},
+                                                start_or_recv_from = StartFrom} = State) ->
     Pids = Connection:pids(State),
-    alert_user(Pids, 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} = State) ->
+    alert_user(Pids, Transport, Tracker,Socket, StartFrom, Alert, Role, StateName, Connection);
+
+handle_normal_shutdown(Alert, StateName, #state{static_env = #static_env{role = Role,
+                                                                         socket = Socket,
+                                                                         transport_cb = Transport,
+                                                                         protocol_cb = Connection,
+                                                                         tracker = Tracker},
+                                                connection_env  = #connection_env{user_application = {_Mon, Pid}},
+                                                socket_options = Opts,
+						start_or_recv_from = RecvFrom} = State) ->
     Pids = Connection:pids(State),
-    alert_user(Pids, 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) ->
+    alert_user(Pids, Transport, Tracker, Socket, StateName, Opts, Pid, RecvFrom, Alert, Role, StateName, Connection).
+
+handle_alert(#alert{level = ?FATAL} = Alert0, StateName,
+	     #state{static_env = #static_env{role = Role,
+                                             socket = Socket,
+                                             host = Host,
+                                             port = Port,
+                                             tracker = Tracker,
+                                             transport_cb = Transport,
+                                             protocol_cb = Connection},
+                    connection_env  = #connection_env{user_application = {_Mon, Pid}},
+		    ssl_options = SslOpts,
+                    start_or_recv_from = From,
+                    session = Session, 
+		    socket_options = Opts} = 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 = Alert0#alert{role = opposite_role(Role)},
+    log_alert(SslOpts#ssl_options.log_level, Role, Connection:protocol_name(), 
+              StateName, Alert),
     Pids = Connection:pids(State),
-    alert_user(Pids, Transport, Tracker, Socket, StateName, Opts, Pid, From, Alert, Role, Connection),
-    stop(normal, State);
+    alert_user(Pids, Transport, Tracker, Socket, StateName, Opts, Pid, From, Alert, Role, StateName, Connection),
+    {stop, {shutdown, normal}, State};
 
 handle_alert(#alert{level = ?WARNING, description = ?CLOSE_NOTIFY} = Alert, 
-	     StateName, State) -> 
+	     downgrade= StateName, State) -> 
+    {next_state, StateName, State, [{next_event, internal, Alert}]};
+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)}),
+    {stop,{shutdown, peer_close}, State};
+handle_alert(#alert{level = ?WARNING, description = ?NO_RENEGOTIATION} = Alert0, StateName, 
+	     #state{static_env = #static_env{role = Role,
+                                             protocol_cb = Connection},
+                    handshake_env = #handshake_env{renegotiation = {true, internal}},
+                    ssl_options = SslOpts} = State) ->
+    Alert = Alert0#alert{role = opposite_role(Role)},
+    log_alert(SslOpts#ssl_options.log_level, Role, 
+              Connection:protocol_name(), StateName, Alert),
     handle_normal_shutdown(Alert, StateName, State),
-    stop({shutdown, peer_close}, State);
+    {stop,{shutdown, peer_close}, State};
 
 handle_alert(#alert{level = ?WARNING, description = ?NO_RENEGOTIATION} = Alert, connection = StateName, 
-	     #state{role = Role,
-                    ssl_options = SslOpts, renegotiation = {true, From},
-		    protocol_cb = Connection} = State0) ->
-    log_alert(SslOpts#ssl_options.log_alert,  Role,
+	     #state{static_env = #static_env{role = Role,
+                                             protocol_cb = Connection},
+                    handshake_env = #handshake_env{renegotiation = {true, From}} = HsEnv,
+                    ssl_options = SslOpts                 
+		   } = State0) ->
+    log_alert(SslOpts#ssl_options.log_level,  Role,
               Connection:protocol_name(), StateName, Alert#alert{role = opposite_role(Role)}),
     gen_statem:reply(From, {error, renegotiation_rejected}),
     State = Connection:reinit_handshake_data(State0),
-    Connection:next_event(connection, no_record, State#state{renegotiation = undefined});
+    Connection:next_event(connection, no_record, State#state{handshake_env = HsEnv#handshake_env{renegotiation = undefined}});
 
 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,
+	     #state{static_env = #static_env{role = Role,
+                                             protocol_cb = Connection},
+                    handshake_env = #handshake_env{renegotiation = {true, From}} = HsEnv,
+                    ssl_options = SslOpts
+                   } = State0) ->
+    log_alert(SslOpts#ssl_options.log_level,  Role,
               Connection:protocol_name(), StateName, Alert#alert{role = opposite_role(Role)}),
     gen_statem:reply(From, {error, renegotiation_rejected}),
     %% Go back to connection!
-    State = Connection:reinit(State0#state{renegotiation = undefined}),
+    State = Connection:reinit(State0#state{handshake_env = HsEnv#handshake_env{renegotiation = undefined}}),
     Connection:next_event(connection, no_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} = State) ->
-    log_alert(SslOpts#ssl_options.log_alert,  Role,
-              Connection:protocol_name(), StateName, Alert#alert{role = opposite_role(Role)}),
+	     #state{static_env = #static_env{role = Role,
+                                             protocol_cb = Connection},
+                    ssl_options = SslOpts} = State) ->
+    log_alert(SslOpts#ssl_options.log_level, Role,
+              Connection:protocol_name(), StateName,
+              Alert#alert{role = opposite_role(Role)}),
     Connection:next_event(StateName, no_record, State).
 
 %%====================================================================
 %% Data handling
 %%====================================================================
-
-passive_receive(State0 = #state{user_data_buffer = Buffer}, StateName, Connection) -> 
-    case Buffer of
-	<<>> ->
-	    {Record, State} = Connection:next_record(State0),
-	    Connection:next_event(StateName, Record, State);
+passive_receive(State0 = #state{user_data_buffer = {_,BufferSize,_}}, StateName, Connection, StartTimerAction) ->
+    case BufferSize of
+	0 ->
+	    Connection:next_event(StateName, no_record, State0, StartTimerAction);
 	_ ->
 	    case read_application_data(<<>>, State0) of
                 {stop, _, _} = ShutdownError ->
                     ShutdownError;
                 {Record, State} ->
-                    Connection:next_event(StateName, Record, State)
+                    case State#state.start_or_recv_from of
+                        undefined ->
+                            %% Cancel recv timeout as data has been delivered
+                            Connection:next_event(StateName, Record, State, 
+                                                  [{{timeout, recv}, infinity, timeout}]);
+                        _ ->
+                            Connection:next_event(StateName, Record, State, StartTimerAction)
+                    end
+            end
+    end.
+
+read_application_data(
+  Data,
+  #state{
+     user_data_buffer = {Front0,BufferSize0,Rear0},
+     connection_env = #connection_env{erl_dist_handle = DHandle}} = State) ->
+    %%
+    Front = Front0,
+    BufferSize = BufferSize0 + byte_size(Data),
+    Rear = [Data|Rear0],
+    case DHandle of
+        undefined ->
+            read_application_data(State, Front, BufferSize, Rear);
+        _ ->
+            try read_application_dist_data(DHandle, Front, BufferSize, Rear) of
+                Buffer ->
+                    {no_record, State#state{user_data_buffer = Buffer}}
+            catch error:_ ->
+                    {stop,disconnect,
+                     State#state{user_data_buffer = {Front,BufferSize,Rear}}}
             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
-            #state{ssl_options = #ssl_options{erl_dist = Dist},
-                   erl_dist_data = DistData} = State0,
-            case Dist andalso is_dist_up(DistData) of                
-                       true ->                                
-                           dist_app_data(ClientData, State0#state{user_data_buffer = Buffer,
-                                                                      bytes_to_read = undefined});
-                       _ ->
-                           SocketOpt =
-                               deliver_app_data(Connection:pids(State0),
-                                                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
-                                   {no_record, State};
-                               true -> %% We have more data
-                                   read_application_data(<<>>, State)
-                           end
-                   end;
-	{more, Buffer} -> % no reply, we need more data
-            {no_record, State0#state{user_data_buffer = Buffer}};
-	{passive, Buffer} ->
-	    {no_record, State0#state{user_data_buffer = Buffer}};
-	{error,_Reason} -> %% Invalid packet in packet mode
-	    deliver_packet_error(Connection:pids(State0),
-                                 Transport, Socket, SOpts, Buffer1, Pid, RecvFrom, Tracker, Connection),
-            stop(normal, State0)
+
+read_application_data(#state{
+                         socket_options = SocketOpts,
+                         bytes_to_read = BytesToRead,
+                         start_or_recv_from = RecvFrom} = State, Front, BufferSize, Rear) ->
+    read_application_data(State, Front, BufferSize, Rear, SocketOpts, RecvFrom, BytesToRead).
+
+%% Pick binary from queue front, if empty wait for more data
+read_application_data(State, [Bin|Front], BufferSize, Rear, SocketOpts, RecvFrom, BytesToRead) ->
+    read_application_data_bin(State, Front, BufferSize, Rear, SocketOpts, RecvFrom, BytesToRead, Bin);
+read_application_data(State, [] = Front, BufferSize, [] = Rear, SocketOpts, RecvFrom, BytesToRead) ->
+    0 = BufferSize, % Assert
+    {no_record, State#state{socket_options = SocketOpts,
+                            bytes_to_read = BytesToRead,
+                            start_or_recv_from = RecvFrom,
+                            user_data_buffer = {Front,BufferSize,Rear}}};
+read_application_data(State, [], BufferSize, Rear, SocketOpts, RecvFrom, BytesToRead) ->
+    [Bin|Front] = lists:reverse(Rear),
+    read_application_data_bin(State, Front, BufferSize, [], SocketOpts, RecvFrom, BytesToRead, Bin).
+
+read_application_data_bin(State, Front, BufferSize, Rear, SocketOpts, RecvFrom, BytesToRead, <<>>) ->
+    %% Done with this binary - get next
+    read_application_data(State, Front, BufferSize, Rear, SocketOpts, RecvFrom, BytesToRead);
+read_application_data_bin(State, Front0, BufferSize0, Rear0, SocketOpts0, RecvFrom, BytesToRead, Bin0) ->
+    %% Decode one packet from a binary
+    case get_data(SocketOpts0, BytesToRead, Bin0) of
+	{ok, Data, Bin} -> % Send data
+            BufferSize = BufferSize0 - (byte_size(Bin0) - byte_size(Bin)),
+            read_application_data_deliver(
+              State, [Bin|Front0], BufferSize, Rear0, SocketOpts0, RecvFrom, Data);
+        {more, undefined} ->
+            %% We need more data, do not know how much
+            if
+                byte_size(Bin0) < BufferSize0 ->
+                    %% We have more data in the buffer besides the first binary - concatenate all and retry
+                    Bin = iolist_to_binary([Bin0,Front0|lists:reverse(Rear0)]),
+                    read_application_data_bin(
+                      State, [], BufferSize0, [], SocketOpts0, RecvFrom, BytesToRead, Bin);
+                true ->
+                    %% All data is in the first binary, no use to retry - wait for more
+                    {no_record, State#state{socket_options = SocketOpts0,
+                                            bytes_to_read = BytesToRead,
+                                            start_or_recv_from = RecvFrom,
+                                            user_data_buffer = {[Bin0|Front0],BufferSize0,Rear0}}}
+            end;
+        {more, Size} when Size =< BufferSize0 ->
+            %% We have a packet in the buffer - collect it in a binary and decode
+            {Data,Front,Rear} = iovec_from_front(Size - byte_size(Bin0), Front0, Rear0, [Bin0]),
+            Bin = iolist_to_binary(Data),
+            read_application_data_bin(
+              State, Front, BufferSize0, Rear, SocketOpts0, RecvFrom, BytesToRead, Bin);
+        {more, _Size} ->
+            %% We do not have a packet in the buffer - wait for more
+            {no_record, State#state{socket_options = SocketOpts0,
+                                    bytes_to_read = BytesToRead,
+                                    start_or_recv_from = RecvFrom,
+                                    user_data_buffer = {[Bin0|Front0],BufferSize0,Rear0}}};
+        passive ->
+            {no_record, State#state{socket_options = SocketOpts0,
+                                    bytes_to_read = BytesToRead,
+                                    start_or_recv_from = RecvFrom,
+                                    user_data_buffer = {[Bin0|Front0],BufferSize0,Rear0}}};
+	{error,_Reason} ->
+            %% Invalid packet in packet mode
+            #state{
+               static_env =
+                   #static_env{
+                      socket = Socket,
+                      protocol_cb = Connection,
+                      transport_cb = Transport,
+                      tracker = Tracker},
+               connection_env =
+                   #connection_env{user_application = {_Mon, Pid}}} = State,
+            Buffer = iolist_to_binary([Bin0,Front0|lists:reverse(Rear0)]),
+	    deliver_packet_error(
+              Connection:pids(State), Transport, Socket, SocketOpts0,
+              Buffer, Pid, RecvFrom, Tracker, Connection),
+            {stop, {shutdown, normal}, State#state{socket_options = SocketOpts0,
+                                                   bytes_to_read = BytesToRead,
+                                                   start_or_recv_from = RecvFrom,
+                                                   user_data_buffer = {[Buffer],BufferSize0,[]}}}
     end.
 
-dist_app_data(ClientData, #state{erl_dist_data = #{dist_handle := undefined,
-                                                   dist_buffer := DistBuff} = DistData} = State) ->
-    {no_record, State#state{erl_dist_data = DistData#{dist_buffer => [ClientData, DistBuff]}}};
-dist_app_data(ClientData, #state{erl_dist_data = #{dist_handle := DHandle,
-                                                   dist_buffer := DistBuff} = ErlDistData,
-                                 user_data_buffer = Buffer,
-                                 socket_options = SOpts} = State) ->
-    Data = merge_dist_data(DistBuff, ClientData),
-    try erlang:dist_ctrl_put_data(DHandle, Data) of
-        _ when SOpts#socket_options.active =:= false;
-               Buffer =:= <<>> ->
+read_application_data_deliver(State, Front, BufferSize, Rear, SocketOpts0, RecvFrom, Data) ->
+    #state{
+       static_env =
+           #static_env{
+              socket = Socket,
+              protocol_cb = Connection,
+              transport_cb = Transport,
+              tracker = Tracker},
+       connection_env =
+           #connection_env{user_application = {_Mon, Pid}}} = State,
+    SocketOpts =
+        deliver_app_data(
+          Connection:pids(State), Transport, Socket, SocketOpts0, Data, Pid, RecvFrom, Tracker, Connection),
+    if
+        SocketOpts#socket_options.active =:= false ->
             %% Passive mode, wait for active once or recv
-            %% Active and empty, get more data
-            {no_record, State#state{erl_dist_data = ErlDistData#{dist_buffer => <<>>}}};
-        _ -> %% We have more data
-            read_application_data(<<>>, State)
-    catch error:_ ->
-            stop(State, disconnect)
+            {no_record,
+             State#state{
+               user_data_buffer = {Front,BufferSize,Rear},
+               start_or_recv_from = undefined,
+                bytes_to_read = undefined,
+               socket_options = SocketOpts
+              }};
+        true -> %% Try to deliver more data
+            read_application_data(State, Front, BufferSize, Rear, SocketOpts, undefined, undefined)
+    end.
+
+
+read_application_dist_data(DHandle, [Bin|Front], BufferSize, Rear) ->
+    read_application_dist_data(DHandle, Front, BufferSize, Rear, Bin);
+read_application_dist_data(_DHandle, [] = Front, BufferSize, [] = Rear) ->
+    BufferSize = 0,
+    {Front,BufferSize,Rear};
+read_application_dist_data(DHandle, [], BufferSize, Rear) ->
+    [Bin|Front] = lists:reverse(Rear),
+    read_application_dist_data(DHandle, Front, BufferSize, [], Bin).
+%%
+read_application_dist_data(DHandle, Front0, BufferSize, Rear0, Bin0) ->
+    case Bin0 of
+        %%
+        %% START Optimization
+        %% It is cheaper to match out several packets in one match operation than to loop for each
+        <<SizeA:32, DataA:SizeA/binary,
+          SizeB:32, DataB:SizeB/binary,
+          SizeC:32, DataC:SizeC/binary,
+          SizeD:32, DataD:SizeD/binary, Rest/binary>>
+          when 0 < SizeA, 0 < SizeB, 0 < SizeC, 0 < SizeD ->
+            %% We have 4 complete packets in the first binary
+            erlang:dist_ctrl_put_data(DHandle, DataA),
+            erlang:dist_ctrl_put_data(DHandle, DataB),
+            erlang:dist_ctrl_put_data(DHandle, DataC),
+            erlang:dist_ctrl_put_data(DHandle, DataD),
+            read_application_dist_data(
+              DHandle, Front0, BufferSize - (4*4+SizeA+SizeB+SizeC+SizeD), Rear0, Rest);
+        <<SizeA:32, DataA:SizeA/binary,
+          SizeB:32, DataB:SizeB/binary,
+          SizeC:32, DataC:SizeC/binary, Rest/binary>>
+          when 0 < SizeA, 0 < SizeB, 0 < SizeC ->
+            %% We have 3 complete packets in the first binary
+            erlang:dist_ctrl_put_data(DHandle, DataA),
+            erlang:dist_ctrl_put_data(DHandle, DataB),
+            erlang:dist_ctrl_put_data(DHandle, DataC),
+            read_application_dist_data(
+              DHandle, Front0, BufferSize - (3*4+SizeA+SizeB+SizeC), Rear0, Rest);
+        <<SizeA:32, DataA:SizeA/binary,
+          SizeB:32, DataB:SizeB/binary, Rest/binary>>
+          when 0 < SizeA, 0 < SizeB ->
+            %% We have 2 complete packets in the first binary
+            erlang:dist_ctrl_put_data(DHandle, DataA),
+            erlang:dist_ctrl_put_data(DHandle, DataB),
+            read_application_dist_data(
+              DHandle, Front0, BufferSize - (2*4+SizeA+SizeB), Rear0, Rest);
+        %% END Optimization
+        %%
+        %% Basic one packet code path
+        <<Size:32, Data:Size/binary, Rest/binary>> ->
+            %% We have a complete packet in the first binary
+            0 < Size andalso erlang:dist_ctrl_put_data(DHandle, Data),
+            read_application_dist_data(DHandle, Front0, BufferSize - (4+Size), Rear0, Rest);
+        <<Size:32, FirstData/binary>> when 4+Size =< BufferSize ->
+            %% We have a complete packet in the buffer
+            %% - fetch the missing content from the buffer front
+            {Data,Front,Rear} = iovec_from_front(Size - byte_size(FirstData), Front0, Rear0, [FirstData]),
+            0 < Size andalso erlang:dist_ctrl_put_data(DHandle, Data),
+            read_application_dist_data(DHandle, Front, BufferSize - (4+Size), Rear);
+        <<Bin/binary>> ->
+            %% In OTP-21 the match context reuse optimization fails if we use Bin0 in recursion, so here we
+            %% match out the whole binary which will trick the optimization into keeping the match context
+            %% for the first binary contains complete packet code above
+            case Bin of
+                <<_Size:32, _InsufficientData/binary>> ->
+                    %% We have a length field in the first binary but there is not enough data
+                    %% in the buffer to form a complete packet - await more data
+                    {[Bin|Front0],BufferSize,Rear0};
+                <<IncompleteLengthField/binary>> when 4 < BufferSize ->
+                    %% We do not have a length field in the first binary but the buffer
+                    %% contains enough data to maybe form a packet
+                    %% - fetch a tiny binary from the buffer front to complete the length field
+                    {LengthField,Front,Rear} =
+                        case IncompleteLengthField of
+                            <<>> ->
+                                iovec_from_front(4, Front0, Rear0, []);
+                            _ ->
+                                iovec_from_front(
+                                  4 - byte_size(IncompleteLengthField), Front0, Rear0, [IncompleteLengthField])
+                        end,
+                    LengthBin = iolist_to_binary(LengthField),
+                    read_application_dist_data(DHandle, Front, BufferSize, Rear, LengthBin);
+                <<IncompleteLengthField/binary>> ->
+                    %% We do not have enough data in the buffer to even form a length field - await more data
+                    case IncompleteLengthField of
+                        <<>> ->
+                            {Front0,BufferSize,Rear0};
+                        _ ->
+                            {[IncompleteLengthField|Front0],BufferSize,Rear0}
+                    end
+            end
+    end.
+
+iovec_from_front(0, Front, Rear, Acc) ->
+    {lists:reverse(Acc),Front,Rear};
+iovec_from_front(Size, [], Rear, Acc) ->
+    case Rear of
+        %% Avoid lists:reverse/1 for simple cases.
+        %% Case clause for [] to avoid infinite loop.
+        [_] ->
+            iovec_from_front(Size, Rear, [], Acc);
+        [Bin2,Bin1] ->
+            iovec_from_front(Size, [Bin1,Bin2], [], Acc);
+        [Bin3,Bin2,Bin1] ->
+            iovec_from_front(Size, [Bin1,Bin2,Bin3], [], Acc);
+        [_,_,_|_] = Rear ->
+            iovec_from_front(Size, lists:reverse(Rear), [], Acc)
+    end;
+iovec_from_front(Size, [Bin|Front], Rear, []) ->
+    case Bin of
+        <<Last:Size/binary>> -> % Just enough
+            {[Last],Front,Rear};
+        <<Last:Size/binary, Rest/binary>> -> % More than enough, split here
+            {[Last],[Rest|Front],Rear};
+        <<>> -> % Not enough, skip empty binaries
+            iovec_from_front(Size, Front, Rear, []);
+        <<_/binary>> -> % Not enough
+            BinSize = byte_size(Bin),
+            iovec_from_front(Size - BinSize, Front, Rear, [Bin])
+    end;
+iovec_from_front(Size, [Bin|Front], Rear, Acc) ->
+    case Bin of
+        <<Last:Size/binary>> -> % Just enough
+            {lists:reverse(Acc, [Last]),Front,Rear};
+        <<Last:Size/binary, Rest/binary>> -> % More than enough, split here
+            {lists:reverse(Acc, [Last]),[Rest|Front],Rear};
+        <<>> -> % Not enough, skip empty binaries
+            iovec_from_front(Size, Front, Rear, Acc);
+        <<_/binary>> -> % Not enough
+            BinSize = byte_size(Bin),
+            iovec_from_front(Size - BinSize, Front, Rear, [Bin|Acc])
     end.
 
-merge_dist_data(<<>>, ClientData) ->
-    ClientData;
-merge_dist_data(DistBuff, <<>>) ->
-    DistBuff;
-merge_dist_data(DistBuff, ClientData) ->
-    [DistBuff, ClientData].
+
 %%====================================================================
 %% Help functions for tls|dtls_connection.erl
 %%====================================================================
@@ -537,26 +741,27 @@ handle_session(#server_hello{cipher_suite = CipherSuite,
 			     compression_method = Compression}, 
 	       Version, NewId, ConnectionStates, ProtoExt, Protocol0,
 	       #state{session = #session{session_id = OldId},
-		      negotiated_version = ReqVersion,
-		      negotiated_protocol = CurrentProtocol} = State0) ->
+		      handshake_env = #handshake_env{negotiated_protocol = CurrentProtocol} = HsEnv,
+                      connection_env = #connection_env{negotiated_version = ReqVersion} = CEnv} = State0) ->
     #{key_exchange := KeyAlgorithm} =
-	ssl_cipher_format:suite_definition(CipherSuite),
+	ssl_cipher_format:suite_bin_to_map(CipherSuite),
     
     PremasterSecret = make_premaster_secret(ReqVersion, KeyAlgorithm),
 
     {ExpectNPN, Protocol} = case Protocol0 of
 				undefined -> 
+
 				    {false, CurrentProtocol};
 				_ -> 
 				    {ProtoExt =:= npn, Protocol0}
 			    end,
 
-    State = State0#state{key_algorithm = KeyAlgorithm,
-			 negotiated_version = Version,
-			 connection_states = ConnectionStates,
-			 premaster_secret = PremasterSecret,
-			 expecting_next_protocol_negotiation = ExpectNPN,
-			 negotiated_protocol = Protocol},
+    State = State0#state{connection_states = ConnectionStates,
+			 handshake_env = HsEnv#handshake_env{kex_algorithm = KeyAlgorithm,
+                                                             premaster_secret = PremasterSecret,
+                                                             expecting_next_protocol_negotiation = ExpectNPN,
+                                                             negotiated_protocol = Protocol},
+                         connection_env = CEnv#connection_env{negotiated_version = Version}},
     
     case ssl_session:is_new(OldId, NewId) of
 	true ->
@@ -570,10 +775,9 @@ handle_session(#server_hello{cipher_suite = CipherSuite,
 %%--------------------------------------------------------------------
 -spec ssl_config(#ssl_options{}, client | server, #state{}) -> #state{}.
 %%--------------------------------------------------------------------
-ssl_config(Opts, Role, State) ->
-    ssl_config(Opts, Role, State, new).
-
-ssl_config(Opts, Role, State0, Type) ->
+ssl_config(Opts, Role, #state{static_env = InitStatEnv0, 
+                              handshake_env = HsEnv,
+                              connection_env = CEnv} = State0) ->
     {ok, #{cert_db_ref := Ref, 
            cert_db_handle := CertDbHandle, 
            fileref_db_handle := FileRefHandle, 
@@ -585,24 +789,19 @@ ssl_config(Opts, Role, State0, Type) ->
 	ssl_config:init(Opts, Role), 
     TimeStamp = erlang:monotonic_time(),
     Session = State0#state.session,
-    State = State0#state{session = Session#session{own_certificate = OwnCert,
-                                                   time_stamp = TimeStamp},
-                         file_ref_db = FileRefHandle,
-                         cert_db_ref = Ref,
-                         cert_db = CertDbHandle,
-                         crl_db = CRLDbHandle,
-                         session_cache = CacheHandle,
-                         private_key = Key,
-                         diffie_hellman_params = DHParams,
-                         ssl_options = Opts},
-    case Type of
-        new ->
-            Handshake = ssl_handshake:init_handshake_history(),
-            State#state{tls_handshake_history = Handshake};
-        continue ->
-            State
-    end.
-
+    
+    State0#state{session = Session#session{own_certificate = OwnCert,
+                                           time_stamp = TimeStamp},
+                 static_env = InitStatEnv0#static_env{
+                                file_ref_db = FileRefHandle,
+                                cert_db_ref = Ref,
+                                cert_db = CertDbHandle,
+                                crl_db = CRLDbHandle,
+                                session_cache = CacheHandle
+                               },
+                 handshake_env = HsEnv#handshake_env{diffie_hellman_params = DHParams},
+                 connection_env = CEnv#connection_env{private_key = Key},
+                 ssl_options = Opts}.
 
 %%====================================================================
 %% gen_statem general state functions with connection cb argument
@@ -615,10 +814,11 @@ ssl_config(Opts, Role, State0, Type) ->
 %%--------------------------------------------------------------------
 
 init({call, From}, {start, Timeout}, State0, Connection) ->
-    Timer = start_or_recv_cancel_timer(Timeout, From),
-    Connection:next_event(hello, no_record, State0#state{start_or_recv_from = From, timer = Timer});
+    Connection:next_event(hello, no_record, State0#state{start_or_recv_from = From},
+                          [{{timeout, handshake}, Timeout, close}]);
 init({call, From}, {start, {Opts, EmOpts}, Timeout}, 
-     #state{role = Role, ssl_options = OrigSSLOptions,
+     #state{static_env = #static_env{role = Role},
+            ssl_options = OrigSSLOptions,
             socket_options = SockOpts} = State0, Connection) ->
     try 
         SslOpts = ssl:handle_options(Opts, OrigSSLOptions),
@@ -627,7 +827,7 @@ init({call, From}, {start, {Opts, EmOpts}, Timeout},
 	     State#state{ssl_options = SslOpts, 
                          socket_options = new_emulated(EmOpts, SockOpts)}, Connection)
     catch throw:Error ->
-	    stop_and_reply(normal, {reply, From, {error, Error}}, State0)
+	   {stop_and_reply, {shutdown, normal}, {reply, From, {error, Error}}, State0}
     end;
 init({call, From}, {new_user, _} = Msg, State, Connection) ->
     handle_call(Msg, From, ?FUNCTION_NAME, State, Connection);
@@ -643,7 +843,7 @@ init(_Type, _Event, _State, _Connection) ->
 		   gen_statem:state_function_result().
 %%--------------------------------------------------------------------
 error({call, From}, {close, _}, State, _Connection) ->
-    stop_and_reply(normal, {reply, From, ok}, State);
+    {stop_and_reply, {shutdown, normal}, {reply, From, ok}, State};
 error({call, From}, _Msg, State, _Connection) ->
     {next_state, ?FUNCTION_NAME, State, [{reply, From, {error, closed}}]}.
 
@@ -662,20 +862,18 @@ hello(info, Msg, State, _) ->
 hello(Type, Msg, State, Connection) ->
     handle_common_event(Type, Msg, ?FUNCTION_NAME, State, Connection).
 
-user_hello({call, From}, cancel, #state{negotiated_version = Version} = State, _) ->
+user_hello({call, From}, cancel, #state{connection_env = #connection_env{negotiated_version = Version}} = State, _) ->
     gen_statem:reply(From, ok),
     handle_own_alert(?ALERT_REC(?FATAL, ?USER_CANCELED, user_canceled),
                      Version, ?FUNCTION_NAME, State);
-user_hello({call, From}, {handshake_continue, NewOptions, Timeout}, #state{hello = Hello,
-                                                                           role = Role,
-                                                                           start_or_recv_from = RecvFrom,
-                                                                           ssl_options = Options0} = State0, _Connection) ->
-    Timer = start_or_recv_cancel_timer(Timeout, RecvFrom),
+user_hello({call, From}, {handshake_continue, NewOptions, Timeout},
+           #state{static_env = #static_env{role = Role},
+                  handshake_env = #handshake_env{hello = Hello},
+                  ssl_options = Options0} = State0, _Connection) ->
     Options = ssl:handle_options(NewOptions, Options0#ssl_options{handshake = full}),
-    State = ssl_config(Options, Role, State0, continue),
-    {next_state, hello, State#state{start_or_recv_from = From,
-                                    timer = Timer}, 
-     [{next_event, internal, Hello}]};
+    State = ssl_config(Options, Role, State0),
+    {next_state, hello, State#state{start_or_recv_from = From}, 
+     [{next_event, internal, Hello}, {{timeout, handshake}, Timeout, close}]};
 user_hello(_, _, _, _) ->
     {keep_state_and_data, [postpone]}.
 
@@ -688,60 +886,63 @@ user_hello(_, _, _, _) ->
 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,
-		   expecting_finished = true,
-		   tls_handshake_history = Handshake,
+	    #state{static_env = #static_env{role = server},
+                   handshake_env = #handshake_env{tls_handshake_history = Hist,
+                                                  expecting_finished = true} = HsEnv,
+		   connection_env = #connection_env{negotiated_version = Version},
 		   session = #session{master_secret = MasterSecret},
 		   connection_states = ConnectionStates0} =
 		State0, Connection) ->
     case ssl_handshake:verify_connection(ssl:tls_version(Version), Finished, client,
 					 get_current_prf(ConnectionStates0, write),
-					 MasterSecret, Handshake) of
+					 MasterSecret, Hist) of
         verified ->
 	    ConnectionStates =
 		ssl_record:set_client_verify_data(current_both, Data, ConnectionStates0),
 	    {Record, State} = prepare_connection(State0#state{connection_states = ConnectionStates,
-							      expecting_finished = false}, Connection),
-	    Connection:next_event(connection, Record, State);
+                                                              handshake_env = HsEnv#handshake_env{expecting_finished = false}}, Connection),
+	    Connection:next_event(connection, Record, State, [{{timeout, handshake}, infinity, close}]);
 	#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,
+	    #state{static_env = #static_env{role = client},
+                   handshake_env = #handshake_env{tls_handshake_history = Hist0},
+                   connection_env = #connection_env{negotiated_version = Version},
 		   session = #session{master_secret = MasterSecret},
-		   negotiated_version = Version,
 		   connection_states = ConnectionStates0} = State0, Connection) ->
     case ssl_handshake:verify_connection(ssl:tls_version(Version), Finished, server,
 					 get_pending_prf(ConnectionStates0, write),
-					 MasterSecret, Handshake0) of
+					 MasterSecret, Hist0) of
         verified ->
 	    ConnectionStates1 =
 		ssl_record:set_server_verify_data(current_read, Data, ConnectionStates0),
-	    {State1, Actions} =
+	    {#state{handshake_env = HsEnv} = State1, Actions} =
 		finalize_handshake(State0#state{connection_states = ConnectionStates1},
 				   ?FUNCTION_NAME, Connection),
-	    {Record, State} = prepare_connection(State1#state{expecting_finished = false}, Connection),
-	    Connection:next_event(connection, Record, State, Actions);
+	    {Record, State} = prepare_connection(State1#state{handshake_env = HsEnv#handshake_env{expecting_finished = false}}, Connection),
+	    Connection:next_event(connection, Record, State, [{{timeout, handshake}, infinity, close} | Actions]);
 	#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},
-	    #state{role = server, expecting_next_protocol_negotiation = true} = State,
+	    #state{static_env = #static_env{role = server},
+                   handshake_env = #handshake_env{expecting_next_protocol_negotiation = true} = HsEnv} = State,
 	    Connection) ->
     Connection:next_event(?FUNCTION_NAME, no_record, 
-			  State#state{negotiated_protocol = SelectedProtocol,
-                                      expecting_next_protocol_negotiation = false});
+			  State#state{handshake_env = HsEnv#handshake_env{negotiated_protocol = SelectedProtocol,
+                                                                         expecting_next_protocol_negotiation = false}});
 abbreviated(internal, 
 	    #change_cipher_spec{type = <<1>>},  
-            #state{connection_states = ConnectionStates0} = State, Connection) ->
+            #state{connection_states = ConnectionStates0,
+                   handshake_env = HsEnv} = State, Connection) ->
     ConnectionStates1 =
 	ssl_record:activate_pending_connection_state(ConnectionStates0, read, Connection),
     Connection:next_event(?FUNCTION_NAME, no_record, State#state{connection_states = 
                                                                      ConnectionStates1,
-                                                                 expecting_finished = true});
+                                                                 handshake_env = HsEnv#handshake_env{expecting_finished = true}});
 abbreviated(info, Msg, State, _) ->
     handle_info(Msg, ?FUNCTION_NAME, State);
 abbreviated(Type, Msg, State, Connection) ->
@@ -759,32 +960,34 @@ certify({call, From}, Msg, State, Connection) ->
 certify(info, Msg, State, _) ->
     handle_info(Msg, ?FUNCTION_NAME, State);
 certify(internal, #certificate{asn1_certificates = []},
-	#state{role = server, negotiated_version = Version,
+	#state{static_env = #static_env{role = server},
+               connection_env = #connection_env{negotiated_version = Version},
 	       ssl_options = #ssl_options{verify = verify_peer,
 					  fail_if_no_peer_cert = true}} =
 	    State, _) ->
     Alert =  ?ALERT_REC(?FATAL,?HANDSHAKE_FAILURE),
     handle_own_alert(Alert, Version, ?FUNCTION_NAME, State);
 certify(internal, #certificate{asn1_certificates = []},
-	#state{role = server,
+	#state{static_env = #static_env{role = server},
 	       ssl_options = #ssl_options{verify = verify_peer,
 					  fail_if_no_peer_cert = false}} =
 	State0, Connection) ->
     Connection:next_event(?FUNCTION_NAME, no_record, State0#state{client_certificate_requested = false});
 certify(internal, #certificate{},
-	#state{role = server,
-	       negotiated_version = Version,
+	#state{static_env = #static_env{role = server},
+               connection_env = #connection_env{negotiated_version = Version},
 	       ssl_options = #ssl_options{verify = verify_none}} =
 	    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,
-               host = Host,
-	       cert_db = CertDbHandle,
-	       cert_db_ref = CertDbRef,
-	       crl_db = CRLDbInfo,
+        #state{static_env = #static_env{
+                               role = Role,
+                               host = Host,
+                               cert_db = CertDbHandle,
+                               cert_db_ref = CertDbRef,
+                               crl_db = CRLDbInfo},
+               connection_env = #connection_env{negotiated_version = Version},
 	       ssl_options = Opts} = State, Connection) ->
     case ssl_handshake:certify(Cert, CertDbHandle, CertDbRef, 
 			       Opts, CRLDbInfo, Role, Host) of
@@ -795,112 +998,132 @@ certify(internal, #certificate{} = Cert,
             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,
-	       public_key_info = PubKeyInfo,
+        #state{static_env = #static_env{role = client},
+               handshake_env = #handshake_env{kex_algorithm = KexAlg,
+                                              public_key_info = PubKeyInfo} = HsEnv,
+               connection_env = #connection_env{negotiated_version = Version},
                session = Session,
 	       connection_states = ConnectionStates} = State, Connection)
-  when Alg == dhe_dss; Alg == dhe_rsa;
-       Alg == ecdhe_rsa; Alg == ecdhe_ecdsa;
-       Alg == dh_anon; Alg == ecdh_anon;
-       Alg == psk; Alg == dhe_psk; Alg == ecdhe_psk; Alg == rsa_psk;
-       Alg == srp_dss; Alg == srp_rsa; Alg == srp_anon ->
-
-    Params = ssl_handshake:decode_server_key(Keys, Alg, ssl:tls_version(Version)),
+  when KexAlg == dhe_dss; 
+       KexAlg == dhe_rsa;
+       KexAlg == ecdhe_rsa; 
+       KexAlg == ecdhe_ecdsa;
+       KexAlg == dh_anon; 
+       KexAlg == ecdh_anon;
+       KexAlg == psk; 
+       KexAlg == dhe_psk; 
+       KexAlg == ecdhe_psk; 
+       KexAlg == rsa_psk;
+       KexAlg == srp_dss; 
+       KexAlg == srp_rsa; 
+       KexAlg == srp_anon ->
+
+    Params = ssl_handshake:decode_server_key(Keys, KexAlg, ssl:tls_version(Version)),
 
     %% Use negotiated value if TLS-1.2 otherwhise return default
-    HashSign = negotiated_hashsign(Params#server_key_params.hashsign, Alg, PubKeyInfo, ssl:tls_version(Version)),
+    HashSign = negotiated_hashsign(Params#server_key_params.hashsign, KexAlg, PubKeyInfo, ssl:tls_version(Version)),
 
-    case is_anonymous(Alg) of
+    case is_anonymous(KexAlg) of
 	true ->
 	    calculate_secret(Params#server_key_params.params,
-			     State#state{hashsign_algorithm = HashSign}, Connection);
+			     State#state{handshake_env = HsEnv#handshake_env{hashsign_algorithm = HashSign}}, Connection);
 	false ->
 	    case  ssl_handshake:verify_server_key(Params, HashSign, 
 						  ConnectionStates, ssl:tls_version(Version), PubKeyInfo) of
 		true ->
 		    calculate_secret(Params#server_key_params.params,
-				     State#state{hashsign_algorithm = HashSign,
-                                                 session = session_handle_params(Params#server_key_params.params, Session)}, 
-				     Connection);
+				     State#state{handshake_env = HsEnv#handshake_env{hashsign_algorithm = HashSign},
+                                                 session = session_handle_params(Params#server_key_params.params, Session)},
+                    Connection);
 		false ->
 		    handle_own_alert(?ALERT_REC(?FATAL, ?DECRYPT_ERROR),
 						Version, ?FUNCTION_NAME, State)
 	    end
     end;
 certify(internal, #certificate_request{},
-	#state{role = client, negotiated_version = Version,
-               key_algorithm = Alg} = State, _)
-  when Alg == dh_anon; Alg == ecdh_anon;
-       Alg == psk; Alg == dhe_psk; Alg == ecdhe_psk; Alg == rsa_psk;
-       Alg == srp_dss; Alg == srp_rsa; Alg == srp_anon ->
+	#state{static_env = #static_env{role = client},
+               handshake_env = #handshake_env{kex_algorithm = KexAlg},
+               connection_env = #connection_env{negotiated_version = Version}} = State, _)
+  when KexAlg == dh_anon; 
+       KexAlg == ecdh_anon;
+       KexAlg == psk; 
+       KexAlg == dhe_psk; 
+       KexAlg == ecdhe_psk; 
+       KexAlg == rsa_psk;
+       KexAlg == srp_dss; 
+       KexAlg == srp_rsa; 
+       KexAlg == srp_anon ->
     handle_own_alert(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE),
                      Version, ?FUNCTION_NAME, State);
 certify(internal, #certificate_request{},
-	#state{session = #session{own_certificate = undefined},
-	       role = client} = State, Connection) ->
+	#state{static_env = #static_env{role = client},
+               session = #session{own_certificate = undefined}} = State, Connection) ->
     %% The 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.
     Connection:next_event(?FUNCTION_NAME, no_record, State#state{client_certificate_requested = true});
 certify(internal, #certificate_request{} = CertRequest,
-	#state{session = #session{own_certificate = Cert},
-	       role = client,
-	       ssl_options = #ssl_options{signature_algs = SupportedHashSigns},
-	       negotiated_version = Version} = State, Connection) ->
-    case ssl_handshake:select_hashsign(CertRequest, Cert, SupportedHashSigns, ssl:tls_version(Version)) of
+	#state{static_env = #static_env{role = client},
+               handshake_env = HsEnv,
+               connection_env = #connection_env{negotiated_version = Version},
+               session = #session{own_certificate = Cert},
+               ssl_options = #ssl_options{signature_algs = SupportedHashSigns}} = State, Connection) ->
+    case ssl_handshake:select_hashsign(CertRequest, Cert, 
+                                       SupportedHashSigns, ssl:tls_version(Version)) of
 	#alert {} = Alert ->
 	    handle_own_alert(Alert, Version, ?FUNCTION_NAME, State);
 	NegotiatedHashSign -> 	
 	    Connection:next_event(?FUNCTION_NAME, no_record,
 				  State#state{client_certificate_requested = true,
-                                              cert_hashsign_algorithm = NegotiatedHashSign})
+                                              handshake_env = HsEnv#handshake_env{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},
-	       negotiated_version = Version,
-	       psk_identity = PSKIdentity,
-	       ssl_options = #ssl_options{user_lookup_fun = PSKLookup},
-	       premaster_secret = undefined,
-	       role = client,
-	       key_algorithm = Alg} = State0, Connection)
-  when Alg == psk ->
-    case ssl_handshake:premaster_secret({Alg, PSKIdentity}, PSKLookup) of
+	#state{static_env = #static_env{role = client},
+               session = #session{master_secret = undefined},
+               connection_env = #connection_env{negotiated_version = Version},
+               handshake_env = #handshake_env{kex_algorithm = KexAlg,
+                                              premaster_secret = undefined,
+                                              server_psk_identity = PSKIdentity} = HsEnv,
+	       ssl_options = #ssl_options{user_lookup_fun = PSKLookup}} = State0, Connection)
+  when KexAlg == psk ->
+    case ssl_handshake:premaster_secret({KexAlg, PSKIdentity}, PSKLookup) of
 	#alert{} = Alert ->
 	    handle_own_alert(Alert, Version, ?FUNCTION_NAME, State0);
 	PremasterSecret ->
 	    State = master_secret(PremasterSecret,
-				  State0#state{premaster_secret = PremasterSecret}),
-	    client_certify_and_key_exchange(State, Connection)
+				  State0#state{handshake_env =
+                                                   HsEnv#handshake_env{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},
-	       negotiated_version = {Major, Minor} = Version,
-	       psk_identity = PSKIdentity,
-	       premaster_secret = undefined,
-	       role = client,
-	       key_algorithm = Alg} = State0, Connection)
-  when Alg == rsa_psk ->
+	#state{static_env = #static_env{role = client},
+               connection_env = #connection_env{negotiated_version = {Major, Minor}} = Version,
+               handshake_env = #handshake_env{kex_algorithm = KexAlg,
+                                              premaster_secret = undefined,
+                                              server_psk_identity = PSKIdentity} = HsEnv,
+               session = #session{master_secret = undefined},
+	       ssl_options = #ssl_options{user_lookup_fun = PSKLookup}} = State0, Connection)
+  when KexAlg == rsa_psk ->
     Rand = ssl_cipher:random_bytes(?NUM_OF_PREMASTERSECRET_BYTES-2),
     RSAPremasterSecret = <<?BYTE(Major), ?BYTE(Minor), Rand/binary>>,
-    case ssl_handshake:premaster_secret({Alg, PSKIdentity}, PSKLookup, 
+    case ssl_handshake:premaster_secret({KexAlg, PSKIdentity}, PSKLookup, 
 					RSAPremasterSecret) of
 	#alert{} = Alert ->
 	    handle_own_alert(Alert, Version, ?FUNCTION_NAME, State0);
 	PremasterSecret ->
 	    State = master_secret(PremasterSecret, 
-				  State0#state{premaster_secret = RSAPremasterSecret}),
+				  State0#state{handshake_env = 
+                                                   HsEnv#handshake_env{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,
-	       connection_states = ConnectionStates0,
-	       negotiated_version = Version,
-	       premaster_secret = undefined,
-	       role = client} = State0, Connection) ->
+	#state{static_env = #static_env{role = client},
+               connection_env = #connection_env{negotiated_version = Version},
+               handshake_env = #handshake_env{premaster_secret = undefined},
+               session = #session{master_secret = MasterSecret} = Session,
+	       connection_states = ConnectionStates0} = State0, Connection) ->
     case ssl_handshake:master_secret(ssl:tls_version(Version), Session,
 				     ConnectionStates0, client) of
 	{MasterSecret, ConnectionStates} ->
@@ -911,11 +1134,11 @@ certify(internal, #server_hello_done{},
     end;
 %% Master secret is calculated from premaster_secret
 certify(internal, #server_hello_done{},
-	#state{session = Session0,
-	       connection_states = ConnectionStates0,
-	       negotiated_version = Version,
-	       premaster_secret = PremasterSecret,
-	       role = client} = State0, Connection) ->
+	#state{static_env = #static_env{role = client},
+               connection_env = #connection_env{negotiated_version = Version},
+               handshake_env = #handshake_env{premaster_secret = PremasterSecret},
+               session = Session0,
+	       connection_states = ConnectionStates0} = State0, Connection) ->
     case ssl_handshake:master_secret(ssl:tls_version(Version), PremasterSecret,
 				     ConnectionStates0, client) of
 	{MasterSecret, ConnectionStates} ->
@@ -927,14 +1150,15 @@ certify(internal, #server_hello_done{},
 	    handle_own_alert(Alert, Version, ?FUNCTION_NAME, State0)
     end;
 certify(internal = Type, #client_key_exchange{} = Msg,
-	#state{role = server,
+	#state{static_env = #static_env{role = server},
 	       client_certificate_requested = true,
 	       ssl_options = #ssl_options{fail_if_no_peer_cert = true}} = State, 
 	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) ->
+	State = #state{handshake_env = #handshake_env{kex_algorithm = KeyAlg}, 
+                       connection_env = #connection_env{negotiated_version = Version}}, Connection) ->
     try
 	certify_client_key_exchange(ssl_handshake:decode_client_key(Keys, KeyAlg, ssl:tls_version(Version)),
 				    State, Connection)
@@ -957,69 +1181,70 @@ cipher(info, Msg, State, _) ->
     handle_info(Msg, ?FUNCTION_NAME, State);
 cipher(internal, #certificate_verify{signature = Signature, 
 				     hashsign_algorithm = CertHashSign},
-       #state{role = server,
-	      key_algorithm = KexAlg,
-	      public_key_info = PublicKeyInfo,
-	      negotiated_version = Version,
-	      session = #session{master_secret = MasterSecret},
-	      tls_handshake_history = Handshake
+       #state{static_env = #static_env{role = server},
+              handshake_env = #handshake_env{tls_handshake_history = Hist,
+                                             kex_algorithm = KexAlg,
+                                             public_key_info = PubKeyInfo} = HsEnv,
+              connection_env = #connection_env{negotiated_version = Version},
+	      session = #session{master_secret = MasterSecret}
 	     } = State, Connection) ->
     
     TLSVersion = ssl:tls_version(Version),
     %% Use negotiated value if TLS-1.2 otherwhise return default
-    HashSign = negotiated_hashsign(CertHashSign, KexAlg, PublicKeyInfo, TLSVersion),
-    case ssl_handshake:certificate_verify(Signature, PublicKeyInfo,
-					  TLSVersion, HashSign, MasterSecret, Handshake) of
+    HashSign = negotiated_hashsign(CertHashSign, KexAlg, PubKeyInfo, TLSVersion),
+    case ssl_handshake:certificate_verify(Signature, PubKeyInfo,
+					  TLSVersion, HashSign, MasterSecret, Hist) of
 	valid ->
 	    Connection:next_event(?FUNCTION_NAME, no_record,
-				  State#state{cert_hashsign_algorithm = HashSign});
+				  State#state{handshake_env = HsEnv#handshake_env{cert_hashsign_algorithm = HashSign}});
 	#alert{} = Alert ->
 	    handle_own_alert(Alert, Version, ?FUNCTION_NAME, State)
     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,
+       #state{static_env = #static_env{role = server},
+              handshake_env = #handshake_env{expecting_next_protocol_negotiation = true,
+                                             negotiated_protocol = undefined},
+              connection_env = #connection_env{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,
-	      port = Port,
-	      role = Role,
-	      expecting_finished = true,
+       #state{static_env = #static_env{role = Role,
+                                       host = Host,
+                                       port = Port},
+              handshake_env = #handshake_env{tls_handshake_history = Hist,
+                                             expecting_finished = true} = HsEnv,
+              connection_env = #connection_env{negotiated_version = Version},
 	      session = #session{master_secret = MasterSecret}
 	      = Session0,
               ssl_options = SslOpts,
-	      connection_states = ConnectionStates0,
-	      tls_handshake_history = Handshake0} = State, Connection) ->
+	      connection_states = ConnectionStates0} = State, Connection) ->
     case ssl_handshake:verify_connection(ssl:tls_version(Version), Finished,
 					 opposite_role(Role),
 					 get_current_prf(ConnectionStates0, read),
-					 MasterSecret, Handshake0) of
+					 MasterSecret, Hist) of
         verified ->
-	    Session = register_session(Role, host_id(Role, Host, SslOpts), Port, Session0),
+	    Session = handle_session(Role, SslOpts, Host, Port, Session0),
 	    cipher_role(Role, Data, Session, 
-			State#state{expecting_finished = false}, Connection);
+			State#state{handshake_env = HsEnv#handshake_env{expecting_finished = false}}, Connection);
         #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},
-       #state{role = server, expecting_next_protocol_negotiation = true,
-	      expecting_finished = true} = State, Connection) ->
+       #state{static_env = #static_env{role = server},
+              handshake_env = #handshake_env{expecting_finished = true,
+                                             expecting_next_protocol_negotiation = true} = HsEnv} = State, Connection) ->
     Connection:next_event(?FUNCTION_NAME, no_record, 
-			  State#state{expecting_next_protocol_negotiation = false,
-                                      negotiated_protocol = SelectedProtocol
-                                     });
-cipher(internal, #change_cipher_spec{type = <<1>>},  #state{connection_states = ConnectionStates0} =
+			  State#state{handshake_env = HsEnv#handshake_env{negotiated_protocol = SelectedProtocol,
+                                                                          expecting_next_protocol_negotiation = false}});
+cipher(internal, #change_cipher_spec{type = <<1>>},  #state{handshake_env = HsEnv, connection_states = ConnectionStates0} =
 	   State, Connection) ->
     ConnectionStates =
 	ssl_record:activate_pending_connection_state(ConnectionStates0, read, Connection),
-    Connection:next_event(?FUNCTION_NAME, no_record, State#state{connection_states = 
-                                                                     ConnectionStates,
-                                                                 expecting_finished = true});
+    Connection:next_event(?FUNCTION_NAME, no_record, State#state{handshake_env = HsEnv#handshake_env{expecting_finished = true},
+                                                                 connection_states = ConnectionStates});
 cipher(Type, Msg, State, Connection) ->
     handle_common_event(Type, Msg, ?FUNCTION_NAME, State, Connection).
 
@@ -1029,15 +1254,17 @@ cipher(Type, Msg, State, Connection) ->
 			gen_statem:state_function_result().
 %%--------------------------------------------------------------------
 connection({call, RecvFrom}, {recv, N, Timeout},  
-	   #state{protocol_cb = Connection,  socket_options =
-		      #socket_options{active = false}} = State0, Connection) ->
-    Timer = start_or_recv_cancel_timer(Timeout, RecvFrom),
+	   #state{static_env = #static_env{protocol_cb = Connection},
+                  socket_options =
+                      #socket_options{active = false}} = State0, Connection) ->
     passive_receive(State0#state{bytes_to_read = N,
-                                 start_or_recv_from = RecvFrom, 
-                                 timer = Timer}, ?FUNCTION_NAME, Connection);
-connection({call, From}, renegotiate, #state{protocol_cb = Connection} = State, 
+                                 start_or_recv_from = RecvFrom}, ?FUNCTION_NAME, Connection,
+                    [{{timeout, recv}, Timeout, timeout}]);
+
+connection({call, From}, renegotiate, #state{static_env = #static_env{protocol_cb = Connection},
+                                             handshake_env = HsEnv} = State,
 	   Connection) ->
-    Connection:renegotiate(State#state{renegotiation = {true, From}}, []);
+    Connection:renegotiate(State#state{handshake_env = HsEnv#handshake_env{renegotiation = {true, From}}}, []);
 connection({call, From}, peer_certificate, 
 	   #state{session = #session{peer_certificate = Cert}} = State, _) ->
     hibernate_after(?FUNCTION_NAME, State, [{reply, From,  {ok, Cert}}]); 
@@ -1048,35 +1275,43 @@ connection({call, From}, {connection_information, false}, State, _) ->
     Info = connection_info(State),
     hibernate_after(?FUNCTION_NAME, State, [{reply, From, {ok, Info}}]);
 connection({call, From}, negotiated_protocol, 
-	   #state{negotiated_protocol = undefined} = State, _) ->
+	   #state{handshake_env = #handshake_env{alpn = undefined,
+                                                 negotiated_protocol = undefined}} = State, _) ->
     hibernate_after(?FUNCTION_NAME, State, [{reply, From, {error, protocol_not_negotiated}}]);
 connection({call, From}, negotiated_protocol, 
-	   #state{negotiated_protocol = SelectedProtocol} = State, _) ->
+	   #state{handshake_env = #handshake_env{alpn = undefined,
+                                                 negotiated_protocol = SelectedProtocol}} = State, _) ->
+    hibernate_after(?FUNCTION_NAME, State,
+		    [{reply, From, {ok, SelectedProtocol}}]);
+connection({call, From}, negotiated_protocol,
+	   #state{handshake_env = #handshake_env{alpn = SelectedProtocol,
+                                                 negotiated_protocol = undefined}} = State, _) ->
     hibernate_after(?FUNCTION_NAME, State,
 		    [{reply, From, {ok, SelectedProtocol}}]);
 connection({call, From}, Msg, State, Connection) ->
     handle_call(Msg, From, ?FUNCTION_NAME, State, Connection);
-connection(cast, {internal_renegotiate, WriteState}, #state{protocol_cb = Connection,
+connection(cast, {internal_renegotiate, WriteState}, #state{static_env = #static_env{protocol_cb = Connection},
+                                                            handshake_env = HsEnv,
                                                             connection_states = ConnectionStates} 
            = State, Connection) -> 
-    Connection:renegotiate(State#state{renegotiation = {true, internal},
+    Connection:renegotiate(State#state{handshake_env = HsEnv#handshake_env{renegotiation = {true, internal}},
                                        connection_states = ConnectionStates#{current_write => WriteState}}, []);
 connection(cast, {dist_handshake_complete, DHandle},
            #state{ssl_options = #ssl_options{erl_dist = true},
-                  erl_dist_data = ErlDistData,
+                  connection_env = CEnv,
                   socket_options = SockOpts} = State0, Connection) ->
     process_flag(priority, normal),
     State1 =
         State0#state{
-          socket_options =
-              SockOpts#socket_options{active = true},
-          erl_dist_data = ErlDistData#{dist_handle => DHandle}},
-    {Record, State} = dist_app_data(<<>>, State1),
+          socket_options = SockOpts#socket_options{active = true},
+          connection_env = CEnv#connection_env{erl_dist_handle = DHandle},
+          bytes_to_read = undefined},
+    {Record, State} = read_application_data(<<>>, State1),
     Connection:next_event(connection, Record, State);
 connection(info, Msg, State, _) ->
     handle_info(Msg, ?FUNCTION_NAME, State);
-connection(internal, {recv, _}, State, Connection) ->
-    passive_receive(State, ?FUNCTION_NAME, Connection);
+connection(internal, {recv, Timeout}, State, Connection) ->
+    passive_receive(State, ?FUNCTION_NAME, Connection, [{{timeout, recv}, Timeout, timeout}]);
 connection(Type, Msg, State, Connection) ->
     handle_common_event(Type, Msg, ?FUNCTION_NAME, State, Connection).
 
@@ -1085,22 +1320,6 @@ connection(Type, Msg, State, Connection) ->
 		#state{}, tls_connection | dtls_connection) ->
 		       gen_statem:state_function_result().
 %%--------------------------------------------------------------------
-downgrade(internal, #alert{description = ?CLOSE_NOTIFY},
-	  #state{transport_cb = Transport, socket = Socket,
-		 downgrade = {Pid, From}} = State, _) ->
-    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);
-downgrade(timeout, downgrade, #state{downgrade = {_, From}} = State, _) ->
-    gen_statem:reply(From, {error, timeout}),
-    stop(normal, State);
-downgrade(
-  info, {CloseTag, Socket},
-  #state{socket = Socket, close_tag = CloseTag, downgrade = {_, From}} =
-      State, _) ->
-    gen_statem:reply(From, {error, CloseTag}),
-    stop(normal, State);
 downgrade(Type, Event, State, Connection) ->
     handle_common_event(Type, Event, ?FUNCTION_NAME, State, Connection).
 
@@ -1109,95 +1328,87 @@ downgrade(Type, Event, State, Connection) ->
 %% common or unexpected events for the state.
 %%--------------------------------------------------------------------
 handle_common_event(internal, {handshake, {#hello_request{} = Handshake, _}}, connection = StateName,  
-		    #state{role = client} = State, _) ->
+		    #state{static_env = #static_env{role = client}, 
+                           handshake_env = HsEnv} = State, _) ->
     %% Should not be included in handshake history
-    {next_state, StateName, State#state{renegotiation = {true, peer}}, [{next_event, internal, Handshake}]};
-handle_common_event(internal, {handshake, {#hello_request{}, _}}, StateName, #state{role = client}, _) 
+    {next_state, StateName, State#state{handshake_env = HsEnv#handshake_env{renegotiation = {true, peer}}},
+     [{next_event, internal, Handshake}]};
+handle_common_event(internal, {handshake, {#hello_request{}, _}}, StateName,
+                    #state{static_env = #static_env{role = client}}, _)
   when StateName =/= connection ->
-    {keep_state_and_data};
+    keep_state_and_data;
 handle_common_event(internal, {handshake, {Handshake, Raw}}, StateName,
-		    #state{tls_handshake_history = Hs0} = State0,
+		    #state{handshake_env = #handshake_env{tls_handshake_history = Hist0}} = State0,
 		    Connection) ->
    
     PossibleSNI = Connection:select_sni_extension(Handshake),
     %% This function handles client SNI hello extension when Handshake is
     %% a client_hello, which needs to be determined by the connection callback.
     %% In other cases this is a noop
-    State = handle_sni_extension(PossibleSNI, State0),
-    HsHist = ssl_handshake:update_handshake_history(Hs0, iolist_to_binary(Raw)),
-    {next_state, StateName, State#state{tls_handshake_history = HsHist}, 
+    State = #state{handshake_env = HsEnv} = handle_sni_extension(PossibleSNI, State0),
+
+    Hist = ssl_handshake:update_handshake_history(Hist0, Raw),
+    {next_state, StateName, State#state{handshake_env = HsEnv#handshake_env{tls_handshake_history = Hist}}, 
      [{next_event, internal, Handshake}]};
 handle_common_event(internal, {protocol_record, TLSorDTLSRecord}, StateName, State, Connection) -> 
-    Connection:handle_common_event(internal, TLSorDTLSRecord, StateName, State);
+    Connection:handle_protocol_record(TLSorDTLSRecord, StateName, State);
 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, _, _} = Stop->
-            Stop;
-	{Record, State1} ->
-            case Connection:next_event(StateName, Record, State1) of
-                {next_state, StateName, State} ->
-                    hibernate_after(StateName, State, []);
-                {next_state, StateName, State, Actions} -> 
-                    hibernate_after(StateName, State, Actions);
-                {stop, _, _} = Stop ->
-                    Stop
-            end 
-    end;
 handle_common_event(internal, #change_cipher_spec{type = <<1>>}, StateName, 
-		    #state{negotiated_version = Version} = State,  _) ->
+		    #state{connection_env = #connection_env{negotiated_version = Version}} = State,  _) ->
     handle_own_alert(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE), Version, 
 				StateName, State);
-handle_common_event(_Type, Msg, StateName, #state{negotiated_version = Version} = State, 
+handle_common_event({timeout, handshake}, close, _StateName, #state{start_or_recv_from = StartFrom} = State, _) ->
+    {stop_and_reply,
+     {shutdown, user_timeout},
+     {reply, StartFrom, {error, timeout}}, State#state{start_or_recv_from = undefined}};
+handle_common_event({timeout, recv}, timeout, StateName, #state{start_or_recv_from = RecvFrom} = State, _) ->
+    {next_state, StateName, State#state{start_or_recv_from = undefined,
+                                        bytes_to_read = undefined}, [{reply, RecvFrom, {error, timeout}}]};
+handle_common_event(Type, Msg, StateName, #state{connection_env =
+                                                      #connection_env{negotiated_version = Version}} = State, 
 		    _) ->
-    Alert =  ?ALERT_REC(?FATAL,?UNEXPECTED_MESSAGE, {unexpected_msg, Msg}),
+    Alert =  ?ALERT_REC(?FATAL,?UNEXPECTED_MESSAGE, {unexpected_msg, {Type,Msg}}),
     handle_own_alert(Alert, Version, StateName, State).
 
 handle_call({application_data, _Data}, _, _, _, _) ->
     %% In renegotiation priorities handshake, send data when handshake is finished
     {keep_state_and_data, [postpone]};
-handle_call({close, {Pid, Timeout}}, From, StateName, State0, Connection) when is_pid(Pid) ->
-    %% terminate will send close alert to peer
-    State = State0#state{downgrade = {Pid, From}},
-    Connection:terminate(downgrade, StateName, State),
-    %% User downgrades connection
-    %% When downgrading an TLS connection to a transport connection
-    %% we must recive the close alert from the peer before releasing the 
-    %% transport socket.
-    {next_state, downgrade, State#state{terminated = true}, [{timeout, Timeout, downgrade}]};
-handle_call({close, _} = Close, From, StateName, State, _Connection) ->
+handle_call({close, _} = Close, From, StateName, #state{connection_env = CEnv} = State, _Connection) ->
     %% Run terminate before returning so that the reuseaddr
     %% inet-option works properly
     Result = terminate(Close, StateName, State),
-    stop_and_reply(
-      {shutdown, normal},
-      {reply, From, Result}, State#state{terminated = true});
+    {stop_and_reply,
+     {shutdown, normal},
+     {reply, From, Result}, State#state{connection_env = CEnv#connection_env{terminated = true}}};
 handle_call({shutdown, read_write = How}, From, StateName,
-	    #state{transport_cb = Transport,
-		   socket = Socket} = State, _) ->
-
+	    #state{static_env = #static_env{transport_cb = Transport,
+                                            socket = Socket},
+                   connection_env = CEnv} = State, _) ->
     try send_alert(?ALERT_REC(?WARNING, ?CLOSE_NOTIFY),
-                       StateName, State) of
+                   StateName, State) of
         _ -> 
             case Transport:shutdown(Socket, How) of
                 ok ->
-                    {next_state, StateName, State#state{terminated = true}, [{reply, From, ok}]};
+                    {next_state, StateName, State#state{connection_env = 
+                                                            CEnv#connection_env{terminated = true}},
+                     [{reply, From, ok}]};
                 Error ->
-                    {stop, StateName, State#state{terminated = true}, [{reply, From, Error}]}
+                    {stop_and_reply, {shutdown, normal}, {reply, From, Error}, 
+                     State#state{connection_env = CEnv#connection_env{terminated = true}}}
             end
     catch
         throw:Return ->
             Return
     end;
 handle_call({shutdown, How0}, From, StateName,
-	    #state{transport_cb = Transport,
-		   socket = Socket} = State, _) ->
+	    #state{static_env = #static_env{transport_cb = Transport,
+                                            socket = Socket}} = State, _) ->
     case Transport:shutdown(Socket, How0) of
 	ok ->
 	    {next_state, StateName, State, [{reply, From, ok}]};
 	Error ->
-            {stop, StateName, State, [{reply, From, Error}]}
+            {stop_and_reply, {shutdown, normal}, {reply, From, Error}, State}
     end;
 handle_call({recv, _N, _Timeout}, From, _,  
 		  #state{socket_options = 
@@ -1206,40 +1417,47 @@ handle_call({recv, _N, _Timeout}, From, _,
 handle_call({recv, N, Timeout}, RecvFrom, StateName, State, _) ->
     %% Doing renegotiate wait with handling request until renegotiate is
     %% finished. 
-    Timer = start_or_recv_cancel_timer(Timeout, RecvFrom),
-    {next_state, StateName, State#state{bytes_to_read = N, start_or_recv_from = RecvFrom,
-					timer = Timer}, 
-     [{next_event, internal, {recv, RecvFrom}}]};
+    {next_state, StateName, State#state{bytes_to_read = N, start_or_recv_from = RecvFrom}, 
+     [{next_event, internal, {recv, RecvFrom}} , {{timeout, recv}, Timeout, timeout}]};
 handle_call({new_user, User}, From, StateName, 
-		  State =#state{user_application = {OldMon, _}}, _) ->
+            State = #state{connection_env = #connection_env{user_application = {OldMon, _}} = CEnv}, _) ->
     NewMon = erlang:monitor(process, User),
     erlang:demonitor(OldMon, [flush]),
-    {next_state, StateName, State#state{user_application = {NewMon,User}},
+    {next_state, StateName, State#state{connection_env = CEnv#connection_env{user_application = {NewMon, User}}},
      [{reply, From, ok}]};
 handle_call({get_opts, OptTags}, From, _,
-		  #state{socket = Socket,
-			 transport_cb = Transport,
+            #state{static_env = #static_env{socket = Socket,
+                                            transport_cb = Transport},
 			 socket_options = SockOpts}, Connection) ->
     OptsReply = get_socket_opts(Connection, Transport, Socket, OptTags, SockOpts, []),
     {keep_state_and_data, [{reply, From, OptsReply}]};
 handle_call({set_opts, Opts0}, From, StateName, 
-	    #state{socket_options = Opts1, 
-			 socket = Socket,
-			 transport_cb = Transport} = State0, Connection) ->
+	    #state{static_env =  #static_env{socket = Socket,
+                                            transport_cb = Transport,
+                                            tracker = Tracker},
+                   connection_env = 
+                       #connection_env{user_application = {_Mon, Pid}},
+                   socket_options = Opts1
+                  } = State0, Connection) ->
     {Reply, Opts} = set_socket_opts(Connection, Transport, Socket, Opts0, Opts1, []),
+    case {proplists:lookup(active, Opts0), Opts} of
+        {{_, N}, #socket_options{active=false}} when is_integer(N) ->
+            send_user(
+              Pid,
+              format_passive(
+                Connection:pids(State0), Transport, Socket, Tracker, Connection));
+        _ ->
+            ok
+    end,
     State = State0#state{socket_options = Opts},
     handle_active_option(Opts#socket_options.active, StateName, From, Reply, State);
     
 handle_call(renegotiate, From, StateName, _, _) when StateName =/= connection ->
     {keep_state_and_data, [{reply, From, {error, already_renegotiating}}]};
 
-handle_call(get_sslsocket, From, _StateName, State, Connection) ->
-    SslSocket = Connection:socket(State),
-    {keep_state_and_data, [{reply, From, SslSocket}]};
-
 handle_call({prf, Secret, Label, Seed, WantedLength}, From, _,
 	    #state{connection_states = ConnectionStates,
-		   negotiated_version = Version}, _) ->
+		   connection_env = #connection_env{negotiated_version = Version}}, _) ->
     #{security_parameters := SecParams} =
 	ssl_record:current_connection_state(ConnectionStates, read),
     #security_parameters{master_secret = MasterSecret,
@@ -1266,70 +1484,59 @@ handle_call(_,_,_,_,_) ->
     {keep_state_and_data, [postpone]}.
 
 handle_info({ErrorTag, Socket, econnaborted}, StateName,  
-	    #state{socket = Socket, transport_cb = Transport,
-		   protocol_cb = Connection,
-		   start_or_recv_from = StartFrom, role = Role,
-		   error_tag = ErrorTag,
-		   tracker = Tracker} = State)  when StateName =/= connection ->
+	    #state{static_env = #static_env{role = Role,
+                                            socket = Socket,
+                                            transport_cb = Transport,
+                                            error_tag = ErrorTag,
+                                            tracker = Tracker,
+                                            protocol_cb = Connection},
+		   start_or_recv_from = StartFrom
+		  } = State)  when StateName =/= connection ->
     Pids = Connection:pids(State),
     alert_user(Pids, Transport, Tracker,Socket, 
-	       StartFrom, ?ALERT_REC(?FATAL, ?CLOSE_NOTIFY), Role, Connection),
-    stop(normal, State);
+	       StartFrom, ?ALERT_REC(?FATAL, ?CLOSE_NOTIFY), Role, StateName, Connection),
+    {stop, {shutdown, normal}, State};
 
-handle_info({ErrorTag, Socket, Reason}, StateName, #state{socket = Socket,
-							  error_tag = ErrorTag} = State)  ->
+handle_info({ErrorTag, Socket, Reason}, StateName, #state{static_env = #static_env{socket = Socket,
+                                                                                   error_tag = ErrorTag}} = State)  ->
     Report = io_lib:format("SSL: Socket error: ~p ~n", [Reason]),
-    error_logger:error_report(Report),
+    ?LOG_ERROR(Report),
     handle_normal_shutdown(?ALERT_REC(?FATAL, ?CLOSE_NOTIFY), StateName, State),
-    stop(normal, State);
+    {stop, {shutdown,normal}, State};
 
 handle_info({'DOWN', MonitorRef, _, _, Reason}, _,
-            #state{user_application = {MonitorRef, _Pid},
+            #state{connection_env = #connection_env{user_application = {MonitorRef, _Pid}},
                    ssl_options = #ssl_options{erl_dist = true}}) ->
     {stop, {shutdown, Reason}};
 handle_info({'DOWN', MonitorRef, _, _, _}, _,
-            #state{user_application = {MonitorRef, _Pid}}) ->
-    {stop, normal};
+            #state{connection_env = #connection_env{user_application = {MonitorRef, _Pid}}}) ->
+    {stop, {shutdown, normal}};
 handle_info({'EXIT', Pid, _Reason}, StateName,
-            #state{user_application = {_MonitorRef, Pid}} = State) ->
+            #state{connection_env = #connection_env{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);
-handle_info({'EXIT', Socket, normal}, _StateName, #state{socket = Socket} = State) ->
+    {stop, shutdown, State};
+handle_info({'EXIT', Socket, normal}, _StateName, #state{static_env = #static_env{socket = Socket}} = State) ->
     %% Handle as transport close"
-    stop({shutdown, transport_closed}, State);
-handle_info({'EXIT', Socket, Reason}, _StateName, #state{socket = Socket} = 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});
-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}};
+    {stop,{shutdown, transport_closed}, State};
+handle_info({'EXIT', Socket, Reason}, _StateName, #state{static_env = #static_env{socket = Socket}} = State) ->
+    {stop,{shutdown, Reason}, State};
+
+handle_info(allow_renegotiate, StateName, #state{handshake_env = HsEnv} = State) ->
+    {next_state, StateName, State#state{handshake_env = HsEnv#handshake_env{allow_renegotiate = true}}};
 
-handle_info(Msg, StateName, #state{socket = Socket, error_tag = Tag} = State) ->
+handle_info(Msg, StateName, #state{static_env = #static_env{socket = Socket, error_tag = Tag}} = State) ->
     Report = io_lib:format("SSL: Got unexpected info: ~p ~n", [{Msg, Tag, Socket}]),
-    error_logger:info_report(Report),
+    ?LOG_NOTICE(Report),
     {next_state, StateName, State}.
 
 %%====================================================================
 %% general gen_statem callbacks
 %%====================================================================
-terminate(_, _, #state{terminated = true}) ->
+terminate(_, _, #state{connection_env = #connection_env{terminated = true}}) ->
     %% Happens when user closes the connection using ssl:close/1
     %% we want to guarantee that Transport:close has been called
     %% when ssl:close/1 returns unless it is a downgrade where
@@ -1338,14 +1545,15 @@ terminate(_, _, #state{terminated = true}) ->
     %% 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) ->
+	  _StateName, #state{static_env = #static_env{protocol_cb = Connection,
+                                                      socket = Socket,
+                                                      transport_cb = Transport}} = State) ->
     handle_trusted_certs_db(State),
     Connection:close(Reason, Socket, Transport, undefined, undefined);
 terminate({shutdown, own_alert}, _StateName, #state{
-						protocol_cb = Connection,
-						socket = Socket, 
-						transport_cb = Transport} = State) ->
+						static_env = #static_env{protocol_cb = Connection,
+                                                                         socket = Socket,
+                                                                         transport_cb = Transport}} = State) ->
     handle_trusted_certs_db(State),
     case application:get_env(ssl, alert_timeout) of
 	{ok, Timeout} when is_integer(Timeout) ->
@@ -1353,23 +1561,27 @@ terminate({shutdown, own_alert}, _StateName, #state{
 	_ ->
 	    Connection:close({timeout, ?DEFAULT_TIMEOUT}, Socket, Transport, undefined, undefined)
     end;
-terminate(downgrade = Reason, connection, #state{protocol_cb = Connection,
-                                        transport_cb = Transport, socket = Socket
-                                       } = State) ->
+terminate({shutdown, downgrade = Reason}, downgrade, #state{static_env = #static_env{protocol_cb = Connection,
+                                                                                     transport_cb = Transport,
+                                                                                     socket = Socket}
+                                                           } = State) ->
     handle_trusted_certs_db(State),
     Connection:close(Reason, Socket, Transport, undefined, undefined);
-terminate(Reason, connection, #state{protocol_cb = Connection,
+terminate(Reason, connection, #state{static_env = #static_env{
+                                                     protocol_cb = Connection,
+                                                     transport_cb = Transport,
+                                                     socket = Socket},
                                      connection_states = ConnectionStates,
-                                     ssl_options = #ssl_options{padding_check = Check},
-                                     transport_cb = Transport, socket = Socket
+                                     ssl_options = #ssl_options{padding_check = Check}
                                     } = State) ->
     handle_trusted_certs_db(State),
     Alert = terminate_alert(Reason),
     %% Send the termination ALERT if possible
-    catch (Connection:send_alert_in_connection(Alert, State)),
+    catch (ok = Connection:send_alert_in_connection(Alert, State)),
     Connection:close({timeout, ?DEFAULT_TIMEOUT}, Socket, Transport, ConnectionStates, Check);
-terminate(Reason, _StateName, #state{transport_cb = Transport, protocol_cb = Connection,
-				     socket = Socket 
+terminate(Reason, _StateName, #state{static_env = #static_env{transport_cb = Transport,
+                                                              protocol_cb = Connection,
+                                                              socket = Socket}
 				    } = State) ->
     handle_trusted_certs_db(State),
     Connection:close(Reason, Socket, Transport, undefined, undefined).
@@ -1388,14 +1600,9 @@ format_status(terminate, [_, StateName, State]) ->
     [{data, [{"State", {StateName, State#state{connection_states = ?SECRET_PRINTOUT,
 					       protocol_buffers =  ?SECRET_PRINTOUT,
 					       user_data_buffer = ?SECRET_PRINTOUT,
-					       tls_handshake_history =  ?SECRET_PRINTOUT,
+					       handshake_env =  ?SECRET_PRINTOUT,
+                                               connection_env = ?SECRET_PRINTOUT,
 					       session =  ?SECRET_PRINTOUT,
-					       private_key =  ?SECRET_PRINTOUT,
-					       diffie_hellman_params = ?SECRET_PRINTOUT,
-					       diffie_hellman_keys =  ?SECRET_PRINTOUT,
-					       srp_params = ?SECRET_PRINTOUT,
-					       srp_keys =  ?SECRET_PRINTOUT,
-					       premaster_secret =  ?SECRET_PRINTOUT,
 					       ssl_options = NewOptions,
 					       flight_buffer =  ?SECRET_PRINTOUT}
 		       }}]}].
@@ -1403,19 +1610,19 @@ format_status(terminate, [_, StateName, State]) ->
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
-send_alert(Alert, connection, #state{protocol_cb = Connection} = State) ->
+send_alert(Alert, connection, #state{static_env = #static_env{protocol_cb = Connection}} = State) ->
      Connection:send_alert_in_connection(Alert, State);
-send_alert(Alert, _, #state{protocol_cb = Connection} = State) ->
+send_alert(Alert, _, #state{static_env = #static_env{protocol_cb = Connection}} = State) ->
     Connection:send_alert(Alert, State).
 
-connection_info(#state{sni_hostname = SNIHostname, 
-		       session = #session{session_id = SessionId,
+connection_info(#state{static_env = #static_env{protocol_cb = Connection},
+                       handshake_env = #handshake_env{sni_hostname = SNIHostname},
+                       session = #session{session_id = SessionId,
                                           cipher_suite = CipherSuite, ecc = ECCCurve},
-		       protocol_cb = Connection,
-		       negotiated_version =  {_,_} = Version, 
+		       connection_env = #connection_env{negotiated_version =  {_,_} = Version}, 
 		       ssl_options = Opts}) ->
     RecordCB = record_cb(Connection),
-    CipherSuiteDef = #{key_exchange := KexAlg} = ssl_cipher_format:suite_definition(CipherSuite),
+    CipherSuiteDef = #{key_exchange := KexAlg} = ssl_cipher_format:suite_bin_to_map(CipherSuite),
     IsNamedCurveSuite = lists:member(KexAlg,
                                      [ecdh_ecdsa, ecdhe_ecdsa, ecdh_rsa, ecdhe_rsa, ecdh_anon]),
     CurveInfo = case ECCCurve of
@@ -1426,7 +1633,7 @@ connection_info(#state{sni_hostname = SNIHostname,
 		end,
     [{protocol, RecordCB:protocol_version(Version)},
      {session_id, SessionId},
-     {cipher_suite, ssl_cipher_format:erl_suite_definition(CipherSuiteDef)},
+     {cipher_suite, ssl_cipher_format:suite_legacy(CipherSuiteDef)},
      {selected_cipher_suite, CipherSuiteDef},
      {sni_hostname, SNIHostname} | CurveInfo] ++ ssl_options_list(Opts).
 
@@ -1438,18 +1645,24 @@ security_info(#state{connection_states = ConnectionStates}) ->
 	ssl_record:current_connection_state(ConnectionStates, read),
     [{client_random, ClientRand}, {server_random, ServerRand}, {master_secret, MasterSecret}].
 
-do_server_hello(Type, #hello_extensions{next_protocol_negotiation = NextProtocols} =
+do_server_hello(Type, #{next_protocol_negotiation := NextProtocols} =
 		    ServerHelloExt,
-		#state{negotiated_version = Version,
+		#state{connection_env = #connection_env{negotiated_version = Version},
+                       handshake_env = HsEnv,
 		       session = #session{session_id = SessId},
-		       connection_states = ConnectionStates0}
+		       connection_states = ConnectionStates0,
+                       ssl_options = #ssl_options{versions = [HighestVersion|_]}}
 		= State0, Connection) when is_atom(Type) ->
-
+    %% TLS 1.3 - Section 4.1.3
+    %% Override server random values for TLS 1.3 downgrade protection mechanism.
+    ConnectionStates1 = update_server_random(ConnectionStates0, Version, HighestVersion),
+    State1 = State0#state{connection_states = ConnectionStates1},
     ServerHello =
-	ssl_handshake:server_hello(SessId, ssl:tls_version(Version), ConnectionStates0, ServerHelloExt),
+	ssl_handshake:server_hello(SessId, ssl:tls_version(Version),
+                                   ConnectionStates1, ServerHelloExt),
     State = server_hello(ServerHello,
-			 State0#state{expecting_next_protocol_negotiation =
-					  NextProtocols =/= undefined}, Connection),
+			 State1#state{handshake_env = HsEnv#handshake_env{expecting_next_protocol_negotiation =
+                                                                              NextProtocols =/= undefined}}, Connection),
     case Type of
 	new ->
 	    new_server_hello(ServerHello, State, Connection);
@@ -1457,11 +1670,65 @@ do_server_hello(Type, #hello_extensions{next_protocol_negotiation = NextProtocol
 	    resumed_server_hello(State, Connection)
     end.
 
+update_server_random(#{pending_read := #{security_parameters := ReadSecParams0} =
+                           ReadState0,
+                       pending_write := #{security_parameters := WriteSecParams0} =
+                           WriteState0} = ConnectionStates,
+                     Version, HighestVersion) ->
+    ReadRandom = override_server_random(
+                   ReadSecParams0#security_parameters.server_random,
+                   Version,
+                   HighestVersion),
+    WriteRandom = override_server_random(
+                    WriteSecParams0#security_parameters.server_random,
+                    Version,
+                    HighestVersion),
+    ReadSecParams = ReadSecParams0#security_parameters{server_random = ReadRandom},
+    WriteSecParams = WriteSecParams0#security_parameters{server_random = WriteRandom},
+    ReadState = ReadState0#{security_parameters => ReadSecParams},
+    WriteState = WriteState0#{security_parameters => WriteSecParams},
+
+    ConnectionStates#{pending_read => ReadState, pending_write => WriteState}.
+
+%% TLS 1.3 - Section 4.1.3
+%%
+%% If negotiating TLS 1.2, TLS 1.3 servers MUST set the last eight bytes
+%% of their Random value to the bytes:
+%%
+%%   44 4F 57 4E 47 52 44 01
+%%
+%% If negotiating TLS 1.1 or below, TLS 1.3 servers MUST and TLS 1.2
+%% servers SHOULD set the last eight bytes of their Random value to the
+%% bytes:
+%%
+%%   44 4F 57 4E 47 52 44 00
+override_server_random(<<Random0:24/binary,_:8/binary>> = Random, {M,N}, {Major,Minor})
+  when Major > 3 orelse Major =:= 3 andalso Minor >= 4 -> %% TLS 1.3 or above
+    if M =:= 3 andalso N =:= 3 ->                         %% Negotating TLS 1.2
+            Down = ?RANDOM_OVERRIDE_TLS12,
+            <<Random0/binary,Down/binary>>;
+       M =:= 3 andalso N < 3 ->                           %% Negotating TLS 1.1 or prior
+            Down = ?RANDOM_OVERRIDE_TLS11,
+            <<Random0/binary,Down/binary>>;
+       true ->
+            Random
+    end;
+override_server_random(<<Random0:24/binary,_:8/binary>> = Random, {M,N}, {Major,Minor})
+  when Major =:= 3 andalso Minor =:= 3 ->   %% TLS 1.2
+    if M =:= 3 andalso N < 3 ->             %% Negotating TLS 1.1 or prior
+            Down = ?RANDOM_OVERRIDE_TLS11,
+            <<Random0/binary,Down/binary>>;
+       true ->
+            Random
+    end;
+override_server_random(Random, _, _) ->
+    Random.
+
 new_server_hello(#server_hello{cipher_suite = CipherSuite,
 			      compression_method = Compression,
 			      session_id = SessionId},
-		#state{session = Session0,
-		       negotiated_version = Version} = State0, Connection) ->
+                 #state{session = Session0,
+                        connection_env = #connection_env{negotiated_version = Version}} = State0, Connection) ->
     try server_certify_and_key_exchange(State0, Connection) of
         #state{} = State1 ->
             {State, Actions} = server_hello_done(State1, Connection),
@@ -1477,7 +1744,7 @@ new_server_hello(#server_hello{cipher_suite = CipherSuite,
 
 resumed_server_hello(#state{session = Session,
 			    connection_states = ConnectionStates0,
-			    negotiated_version = Version} = State0, Connection) ->
+			    connection_env = #connection_env{negotiated_version = Version}} = State0, Connection) ->
 
     case ssl_handshake:master_secret(ssl:tls_version(Version), Session,
 				     ConnectionStates0, server) of
@@ -1493,48 +1760,42 @@ resumed_server_hello(#state{session = Session,
 
 server_hello(ServerHello, State0, Connection) ->
     CipherSuite = ServerHello#server_hello.cipher_suite,
-    #{key_exchange := KeyAlgorithm}  = ssl_cipher_format:suite_definition(CipherSuite),
-    State = Connection:queue_handshake(ServerHello, State0),
-    State#state{key_algorithm = KeyAlgorithm}.
+    #{key_exchange := KeyAlgorithm}  = ssl_cipher_format:suite_bin_to_map(CipherSuite),
+    #state{handshake_env = HsEnv} = State = Connection:queue_handshake(ServerHello, State0),
+    State#state{handshake_env = HsEnv#handshake_env{kex_algorithm = KeyAlgorithm}}.
 
 server_hello_done(State, Connection) ->
     HelloDone = ssl_handshake:server_hello_done(),
     Connection:send_handshake(HelloDone, State).
 
 handle_peer_cert(Role, PeerCert, PublicKeyInfo,
-		 #state{session = #session{cipher_suite = CipherSuite} = Session} = State0,
+		 #state{handshake_env = HsEnv,
+                    session = #session{cipher_suite = CipherSuite} = Session} = State0,
 		 Connection) ->
-    State1 = State0#state{session =
-			 Session#session{peer_certificate = PeerCert},
-			 public_key_info = PublicKeyInfo},
-    #{key_exchange := KeyAlgorithm} = ssl_cipher_format:suite_definition(CipherSuite),
+    State1 = State0#state{handshake_env = HsEnv#handshake_env{public_key_info = PublicKeyInfo},
+                          session =
+                              Session#session{peer_certificate = PeerCert}},
+    #{key_exchange := KeyAlgorithm} = ssl_cipher_format:suite_bin_to_map(CipherSuite),
     State = handle_peer_cert_key(Role, PeerCert, PublicKeyInfo, KeyAlgorithm, State1),
     Connection:next_event(certify, no_record, State).
 
 handle_peer_cert_key(client, _,
 		     {?'id-ecPublicKey',  #'ECPoint'{point = _ECPoint} = PublicKey,
 		      PublicKeyParams},
-		     KeyAlg, #state{session = Session} = State)  when KeyAlg == ecdh_rsa;
+		     KeyAlg, #state{handshake_env = HsEnv,
+                                    session = Session} = State)  when KeyAlg == ecdh_rsa;
                                                                       KeyAlg == ecdh_ecdsa ->
     ECDHKey = public_key:generate_key(PublicKeyParams),
     PremasterSecret = ssl_handshake:premaster_secret(PublicKey, ECDHKey),
-    master_secret(PremasterSecret, State#state{diffie_hellman_keys = ECDHKey,
+    master_secret(PremasterSecret, State#state{handshake_env = HsEnv#handshake_env{kex_keys = ECDHKey},
                                                session = Session#session{ecc = PublicKeyParams}});
-%% 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.
-%% handle_peer_cert_key(client, _PeerCert, {?dhpublicnumber, PublicKey, PublicKeyParams},
-%%                      {_,SignAlg},
-%% 		        #state{diffie_hellman_keys = {_, MyPrivatKey}} = State) when
-%%                                                                           SignAlg == dh_rsa;
-%% 									     SignAlg == dh_dss ->
-%%     dh_master_secret(PublicKeyParams, PublicKey, MyPrivatKey, State);
 handle_peer_cert_key(_, _, _, _, State) ->
     State.
 
-certify_client(#state{client_certificate_requested = true, role = client,
-		      cert_db = CertDbHandle,
-                      cert_db_ref = CertDbRef,
+certify_client(#state{static_env = #static_env{role = client,
+                                               cert_db = CertDbHandle,
+                                               cert_db_ref = CertDbRef},
+                      client_certificate_requested = true,
 		      session = #session{own_certificate = OwnCert}}
 	       = State, Connection) ->
     Certificate = ssl_handshake:certificate(OwnCert, CertDbHandle, CertDbRef, client),
@@ -1542,16 +1803,17 @@ certify_client(#state{client_certificate_requested = true, role = client,
 certify_client(#state{client_certificate_requested = false} = State, _) ->
     State.
 
-verify_client_cert(#state{client_certificate_requested = true, role = client,
-			  negotiated_version = Version,
-			  private_key = PrivateKey,
+verify_client_cert(#state{static_env = #static_env{role = client},
+                          handshake_env = #handshake_env{tls_handshake_history = Hist,
+                                                         cert_hashsign_algorithm = HashSign},
+                          connection_env = #connection_env{negotiated_version = Version,
+                                                           private_key = PrivateKey},
+                          client_certificate_requested = true,
 			  session = #session{master_secret = MasterSecret,
-					     own_certificate = OwnCert},
-			  cert_hashsign_algorithm = HashSign,
-			  tls_handshake_history = Handshake0} = State, Connection) ->
+					     own_certificate = OwnCert}} = State, Connection) ->
 
     case ssl_handshake:client_certificate_verify(OwnCert, MasterSecret,
-						 ssl:tls_version(Version), HashSign, PrivateKey, Handshake0) of
+						 ssl:tls_version(Version), HashSign, PrivateKey, Hist) of
         #certificate_verify{} = Verified ->
            Connection:queue_handshake(Verified, State);
 	ignore ->
@@ -1562,7 +1824,7 @@ verify_client_cert(#state{client_certificate_requested = true, role = client,
 verify_client_cert(#state{client_certificate_requested = false} = State, _) ->
     State.
 
-client_certify_and_key_exchange(#state{negotiated_version = Version} =
+client_certify_and_key_exchange(#state{connection_env = #connection_env{negotiated_version = Version}} =
 				State0, Connection) ->
     try do_client_certify_and_key_exchange(State0, Connection) of
         State1 = #state{} ->
@@ -1587,7 +1849,9 @@ 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, client_hello_version = {Major, Minor} = Version} = State, Connection) ->
+			    #state{connection_env = #connection_env{private_key = Key}, 
+                                   handshake_env = #handshake_env{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.
@@ -1608,14 +1872,15 @@ certify_client_key_exchange(#encrypted_premaster_secret{premaster_secret= EncPMS
         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,
+			    #state{handshake_env = #handshake_env{diffie_hellman_params = #'DHParameter'{} = Params,
+                                                                  kex_keys = {_, ServerDhPrivateKey}}
+				  } = State,
 			    Connection) ->
     PremasterSecret = ssl_handshake:premaster_secret(ClientPublicDhKey, ServerDhPrivateKey, Params),
     calculate_master_secret(PremasterSecret, State, Connection, certify, cipher);
 
 certify_client_key_exchange(#client_ec_diffie_hellman_public{dh_public = ClientPublicEcDhPoint},
-			    #state{diffie_hellman_keys = ECDHKey} = State, Connection) ->
+			    #state{handshake_env = #handshake_env{kex_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,
@@ -1625,8 +1890,8 @@ certify_client_key_exchange(#client_psk_identity{} = ClientKey,
     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},
+			    #state{handshake_env = #handshake_env{diffie_hellman_params = #'DHParameter'{} = Params,
+                                                                  kex_keys = {_, ServerDhPrivateKey}},
 				   ssl_options = 
 				       #ssl_options{user_lookup_fun = PSKLookup}} = State0,
 			    Connection) ->
@@ -1634,7 +1899,7 @@ certify_client_key_exchange(#client_dhe_psk_identity{} = ClientKey,
 	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,
+			    #state{handshake_env = #handshake_env{kex_keys = ServerEcDhPrivateKey},
 				   ssl_options =
 				       #ssl_options{user_lookup_fun = PSKLookup}} = State,
 			    Connection) ->
@@ -1642,28 +1907,29 @@ certify_client_key_exchange(#client_ecdhe_psk_identity{} = ClientKey,
 	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,
+			    #state{connection_env = #connection_env{private_key = Key},
 				   ssl_options = 
 				       #ssl_options{user_lookup_fun = PSKLookup}} = State0,
 			    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
+			    #state{handshake_env = #handshake_env{srp_params = Params,
+                                                                  kex_keys = Key}
 				  } = State0, Connection) ->
     PremasterSecret = ssl_handshake:premaster_secret(ClientKey, Key, Params),
     calculate_master_secret(PremasterSecret, State0, Connection, certify, cipher).
 
-certify_server(#state{key_algorithm = Algo} = State, _) when Algo == dh_anon; 
-							     Algo == ecdh_anon; 
-							     Algo == psk; 
-							     Algo == dhe_psk; 
-							     Algo == ecdhe_psk; 
-							     Algo == srp_anon  ->
+certify_server(#state{handshake_env = #handshake_env{kex_algorithm = KexAlg}} = 
+                   State, _) when KexAlg == dh_anon; 
+                                  KexAlg == ecdh_anon; 
+                                  KexAlg == psk; 
+                                  KexAlg == dhe_psk; 
+                                  KexAlg == ecdhe_psk; 
+                                  KexAlg == srp_anon  ->
     State;
-certify_server(#state{cert_db = CertDbHandle,
-		      cert_db_ref = CertDbRef,
+certify_server(#state{static_env = #static_env{cert_db = CertDbHandle,
+                                               cert_db_ref = CertDbRef},
 		      session = #session{own_certificate = OwnCert}} = State, Connection) ->
     case ssl_handshake:certificate(OwnCert, CertDbHandle, CertDbRef, server) of
 	Cert = #certificate{} ->
@@ -1672,18 +1938,19 @@ certify_server(#state{cert_db = CertDbHandle,
 	    throw(Alert)
     end.
 
-key_exchange(#state{role = server, key_algorithm = rsa} = State,_) ->
+key_exchange(#state{static_env = #static_env{role = server}, 
+                    handshake_env = #handshake_env{kex_algorithm = rsa}} = State,_) ->
     State;
-key_exchange(#state{role = server, key_algorithm = Algo,
-		    hashsign_algorithm = HashSignAlgo,
-		    diffie_hellman_params = #'DHParameter'{} = Params,
-		    private_key = PrivateKey,
-		    connection_states = ConnectionStates0,
-		    negotiated_version = Version
-		   } = State0, Connection)
-  when Algo == dhe_dss;
-       Algo == dhe_rsa;
-       Algo == dh_anon ->
+key_exchange(#state{static_env = #static_env{role = server}, 
+		    handshake_env = #handshake_env{kex_algorithm = KexAlg,
+                                                   diffie_hellman_params = #'DHParameter'{} = Params,
+                                                   hashsign_algorithm = HashSignAlgo},
+                    connection_env = #connection_env{negotiated_version = Version,
+                                                     private_key = PrivateKey},
+		    connection_states = ConnectionStates0} = State0, Connection)
+  when KexAlg == dhe_dss;
+       KexAlg == dhe_rsa;
+       KexAlg == dh_anon ->
     DHKeys = public_key:generate_key(Params),
     #{security_parameters := SecParams} =
 	ssl_record:pending_connection_state(ConnectionStates0, read),
@@ -1693,22 +1960,26 @@ key_exchange(#state{role = server, key_algorithm = Algo,
 					       HashSignAlgo, ClientRandom,
 					       ServerRandom,
 					       PrivateKey}),
-    State = Connection:queue_handshake(Msg, State0),
-    State#state{diffie_hellman_keys = DHKeys};
-key_exchange(#state{role = server, private_key = #'ECPrivateKey'{parameters = ECCurve} = Key, key_algorithm = Algo,
+    #state{handshake_env = HsEnv} = State = Connection:queue_handshake(Msg, State0),
+    State#state{handshake_env = HsEnv#handshake_env{kex_keys = DHKeys}};
+key_exchange(#state{static_env = #static_env{role = server},
+                    handshake_env = #handshake_env{kex_algorithm = KexAlg} = HsEnv,
+                    connection_env = #connection_env{private_key = #'ECPrivateKey'{parameters = ECCurve} = Key},
                    session = Session} = State, _)
-  when Algo == ecdh_ecdsa; Algo == ecdh_rsa ->
-    State#state{diffie_hellman_keys = Key,
+  when KexAlg == ecdh_ecdsa; 
+       KexAlg == ecdh_rsa ->
+    State#state{handshake_env = HsEnv#handshake_env{kex_keys = Key},
                 session = Session#session{ecc = ECCurve}};
-key_exchange(#state{role = server, key_algorithm = Algo,
-		    hashsign_algorithm = HashSignAlgo,
-		    private_key = PrivateKey,
+key_exchange(#state{static_env = #static_env{role = server}, 
+                    handshake_env = #handshake_env{kex_algorithm = KexAlg,
+                                                   hashsign_algorithm = HashSignAlgo},
+                    connection_env = #connection_env{negotiated_version = Version,
+                                                     private_key = PrivateKey},
 		    session = #session{ecc = ECCCurve},
-		    connection_states = ConnectionStates0,
-		    negotiated_version = Version
-		   } = State0, Connection)
-  when Algo == ecdhe_ecdsa; Algo == ecdhe_rsa;
-       Algo == ecdh_anon ->
+		    connection_states = ConnectionStates0} = State0, Connection)
+  when KexAlg == ecdhe_ecdsa; 
+       KexAlg == ecdhe_rsa;
+       KexAlg == ecdh_anon ->
 
     ECDHKeys = public_key:generate_key(ECCCurve),
     #{security_parameters := SecParams} = 
@@ -1720,18 +1991,19 @@ key_exchange(#state{role = server, key_algorithm = Algo,
 				       HashSignAlgo, ClientRandom,
 				       ServerRandom,
 				       PrivateKey}),
-    State = Connection:queue_handshake(Msg, State0),
-    State#state{diffie_hellman_keys = ECDHKeys};
-key_exchange(#state{role = server, key_algorithm = psk,
+    #state{handshake_env = HsEnv} = State = Connection:queue_handshake(Msg, State0),
+    State#state{handshake_env = HsEnv#handshake_env{kex_keys = ECDHKeys}};
+key_exchange(#state{static_env = #static_env{role = server}, 
+                    handshake_env = #handshake_env{kex_algorithm = psk},
 		    ssl_options = #ssl_options{psk_identity = undefined}} = State, _) ->
     State;
-key_exchange(#state{role = server, key_algorithm = psk,
+key_exchange(#state{static_env = #static_env{role = server}, 
 		    ssl_options = #ssl_options{psk_identity = PskIdentityHint},
-		    hashsign_algorithm = HashSignAlgo,
-		    private_key = PrivateKey,
-		    connection_states = ConnectionStates0,
-		    negotiated_version = Version
-		   } = State0, Connection) ->
+		    handshake_env = #handshake_env{kex_algorithm = psk,
+                                                   hashsign_algorithm = HashSignAlgo},     
+                    connection_env = #connection_env{negotiated_version = Version,
+                                                     private_key = PrivateKey},
+             connection_states = ConnectionStates0} = State0, Connection) ->
     #{security_parameters := SecParams} = 
 	ssl_record:pending_connection_state(ConnectionStates0, read),
     #security_parameters{client_random = ClientRandom,
@@ -1740,15 +2012,16 @@ key_exchange(#state{role = server, key_algorithm = psk,
 				     {psk, PskIdentityHint,
 				      HashSignAlgo, ClientRandom,
 				      ServerRandom,
-						       PrivateKey}),
+                                      PrivateKey}),
     Connection:queue_handshake(Msg, State0);
-key_exchange(#state{role = server, key_algorithm = dhe_psk,
+key_exchange(#state{static_env = #static_env{role = server},                    
 		    ssl_options = #ssl_options{psk_identity = PskIdentityHint},
-		    hashsign_algorithm = HashSignAlgo,
-		    diffie_hellman_params = #'DHParameter'{} = Params,
-		    private_key = PrivateKey,
-		    connection_states = ConnectionStates0,
-		    negotiated_version = Version
+		    handshake_env = #handshake_env{kex_algorithm = dhe_psk,
+                                                   diffie_hellman_params = #'DHParameter'{} = Params,
+                                                   hashsign_algorithm = HashSignAlgo},                                        
+                    connection_env = #connection_env{negotiated_version = Version,
+                                                     private_key = PrivateKey},
+		    connection_states = ConnectionStates0
 		   } = State0, Connection) ->
     DHKeys = public_key:generate_key(Params),
     #{security_parameters := SecParams} =
@@ -1761,15 +2034,16 @@ key_exchange(#state{role = server, key_algorithm = dhe_psk,
 				       HashSignAlgo, ClientRandom,
 				       ServerRandom,
 				       PrivateKey}),
-    State = Connection:queue_handshake(Msg, State0),
-    State#state{diffie_hellman_keys = DHKeys};
-key_exchange(#state{role = server, key_algorithm = ecdhe_psk,
+    #state{handshake_env = HsEnv} = State = Connection:queue_handshake(Msg, State0),
+    State#state{handshake_env = HsEnv#handshake_env{kex_keys = DHKeys}};
+key_exchange(#state{static_env = #static_env{role = server}, 
 		    ssl_options = #ssl_options{psk_identity = PskIdentityHint},
-		    hashsign_algorithm = HashSignAlgo,
-		    private_key = PrivateKey,
+                    handshake_env = #handshake_env{kex_algorithm = ecdhe_psk,
+                                                   hashsign_algorithm = HashSignAlgo},
+                    connection_env = #connection_env{negotiated_version = Version,
+                                                     private_key = PrivateKey},
                     session = #session{ecc = ECCCurve},
-		    connection_states = ConnectionStates0,
-		    negotiated_version = Version
+		    connection_states = ConnectionStates0
 		   } = State0, Connection) ->
     ECDHKeys = public_key:generate_key(ECCCurve),
     #{security_parameters := SecParams} =
@@ -1782,17 +2056,19 @@ key_exchange(#state{role = server, key_algorithm = ecdhe_psk,
 				       HashSignAlgo, ClientRandom,
 				       ServerRandom,
 				       PrivateKey}),
-    State = Connection:queue_handshake(Msg, State0),
-    State#state{diffie_hellman_keys = ECDHKeys};
-key_exchange(#state{role = server, key_algorithm = rsa_psk,
+    #state{handshake_env = HsEnv} = State = Connection:queue_handshake(Msg, State0),
+    State#state{handshake_env = HsEnv#handshake_env{kex_keys = ECDHKeys}};
+key_exchange(#state{static_env = #static_env{role = server}, 
+                    handshake_env = #handshake_env{kex_algorithm = rsa_psk},
 		    ssl_options = #ssl_options{psk_identity = undefined}} = State, _) ->
     State;
-key_exchange(#state{role = server, key_algorithm = rsa_psk,
+key_exchange(#state{static_env = #static_env{role = server}, 
 		    ssl_options = #ssl_options{psk_identity = PskIdentityHint},
-		    hashsign_algorithm = HashSignAlgo,
-		    private_key = PrivateKey,
-		    connection_states = ConnectionStates0,
-		    negotiated_version = Version
+                    handshake_env = #handshake_env{kex_algorithm = rsa_psk,
+                                                   hashsign_algorithm = HashSignAlgo}, 
+                    connection_env = #connection_env{negotiated_version = Version,
+                                                     private_key = PrivateKey},
+		    connection_states = ConnectionStates0
 		   } = State0, Connection) ->
     #{security_parameters := SecParams} =
 	ssl_record:pending_connection_state(ConnectionStates0, read),
@@ -1804,17 +2080,18 @@ key_exchange(#state{role = server, key_algorithm = rsa_psk,
 				       ServerRandom,
 				       PrivateKey}),
     Connection:queue_handshake(Msg, State0);
-key_exchange(#state{role = server, key_algorithm = Algo,
+key_exchange(#state{static_env = #static_env{role = server}, 
 		    ssl_options = #ssl_options{user_lookup_fun = LookupFun},
-		    hashsign_algorithm = HashSignAlgo,
+                    handshake_env = #handshake_env{kex_algorithm = KexAlg,
+                                                   hashsign_algorithm = HashSignAlgo}, 
+                    connection_env = #connection_env{negotiated_version = Version,
+                                                     private_key = PrivateKey},
 		    session = #session{srp_username = Username},
-		    private_key = PrivateKey,
-		    connection_states = ConnectionStates0,
-		    negotiated_version = Version
+		    connection_states = ConnectionStates0
 		   } = State0, Connection)
-  when Algo == srp_dss;
-       Algo == srp_rsa;
-       Algo == srp_anon ->
+  when KexAlg == srp_dss;
+       KexAlg == srp_rsa;
+       KexAlg == srp_anon ->
     SrpParams = handle_srp_identity(Username, LookupFun),
     Keys = case generate_srp_server_keys(SrpParams, 0) of
 	       Alert = #alert{} ->
@@ -1831,82 +2108,86 @@ key_exchange(#state{role = server, key_algorithm = Algo,
 				       HashSignAlgo, ClientRandom,
 				       ServerRandom,
 				       PrivateKey}),
-    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,
-		    negotiated_version = Version,
-		    premaster_secret = PremasterSecret} = State0, Connection) ->
+    #state{handshake_env = HsEnv} = State = Connection:queue_handshake(Msg, State0),
+    State#state{handshake_env = HsEnv#handshake_env{srp_params = SrpParams,
+                                                    kex_keys = Keys}};
+key_exchange(#state{static_env = #static_env{role = client},
+                    handshake_env = #handshake_env{kex_algorithm = rsa,
+                                                   public_key_info = PublicKeyInfo,
+                                                   premaster_secret = PremasterSecret},
+                    connection_env = #connection_env{negotiated_version = Version}
+		   } = 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,
-		    diffie_hellman_keys = {DhPubKey, _}
-		   } = State0, Connection)
-  when Algorithm == dhe_dss;
-       Algorithm == dhe_rsa;
-       Algorithm == dh_anon ->
+key_exchange(#state{static_env = #static_env{role = client},
+                    handshake_env = #handshake_env{kex_algorithm = KexAlg,
+                                                   kex_keys = {DhPubKey, _}},
+                    connection_env = #connection_env{negotiated_version = Version}
+                   } = State0, Connection)
+  when KexAlg == dhe_dss;
+       KexAlg == dhe_rsa;
+       KexAlg == dh_anon ->
     Msg =  ssl_handshake:key_exchange(client, ssl:tls_version(Version), {dh, DhPubKey}),
     Connection:queue_handshake(Msg, State0);
 
-key_exchange(#state{role = client,
-		    key_algorithm = Algorithm,
-		    negotiated_version = Version,
-                    session = Session,
-		    diffie_hellman_keys = #'ECPrivateKey'{parameters = ECCurve} = Key} = State0, Connection)
-  when Algorithm == ecdhe_ecdsa; Algorithm == ecdhe_rsa;
-       Algorithm == ecdh_ecdsa; Algorithm == ecdh_rsa;
-       Algorithm == ecdh_anon ->
+key_exchange(#state{static_env = #static_env{role = client},
+                    handshake_env = #handshake_env{kex_algorithm = KexAlg,
+                                                   kex_keys = #'ECPrivateKey'{parameters = ECCurve} = Key},
+                    connection_env = #connection_env{negotiated_version = Version},
+                    session = Session
+		   } = State0, Connection)
+  when KexAlg == ecdhe_ecdsa; 
+       KexAlg == ecdhe_rsa;
+       KexAlg == ecdh_ecdsa; 
+       KexAlg == ecdh_rsa;
+       KexAlg == ecdh_anon ->
     Msg = ssl_handshake:key_exchange(client, ssl:tls_version(Version), {ecdh, Key}),
     Connection:queue_handshake(Msg, State0#state{session = Session#session{ecc = ECCurve}});
-key_exchange(#state{role = client,
-		    ssl_options = SslOpts,
-		    key_algorithm = psk,
-		    negotiated_version = Version} = State0, Connection) ->
+key_exchange(#state{static_env = #static_env{role = client},
+                    handshake_env = #handshake_env{kex_algorithm = psk},
+                    connection_env = #connection_env{negotiated_version = Version},
+		    ssl_options = SslOpts} = State0, Connection) ->
     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,
-		    negotiated_version = Version,
-		    diffie_hellman_keys = {DhPubKey, _}} = State0, Connection) ->
+key_exchange(#state{static_env = #static_env{role = client},
+                    handshake_env = #handshake_env{kex_algorithm = dhe_psk,
+                                                   kex_keys = {DhPubKey, _}},
+                    connection_env = #connection_env{negotiated_version = Version},
+		    ssl_options = SslOpts} = State0, Connection) ->
     Msg =  ssl_handshake:key_exchange(client, ssl:tls_version(Version),
 				      {dhe_psk, 
 				       SslOpts#ssl_options.psk_identity, DhPubKey}),
     Connection:queue_handshake(Msg, State0);
 
-key_exchange(#state{role = client,
-		    ssl_options = SslOpts,
-		    key_algorithm = ecdhe_psk,
-		    negotiated_version = Version,
-		    diffie_hellman_keys = ECDHKeys} = State0, Connection) ->
+key_exchange(#state{static_env = #static_env{role = client},
+                    handshake_env = #handshake_env{kex_algorithm = ecdhe_psk,
+                                                   kex_keys = ECDHKeys},
+                    connection_env = #connection_env{negotiated_version = Version},
+		    ssl_options = SslOpts} = State0, Connection) ->
     Msg =  ssl_handshake:key_exchange(client, ssl:tls_version(Version),
 				      {ecdhe_psk,
 				       SslOpts#ssl_options.psk_identity, ECDHKeys}),
     Connection:queue_handshake(Msg, State0);
 
-key_exchange(#state{role = client,
-		    ssl_options = SslOpts,
-		    key_algorithm = rsa_psk,
-		    public_key_info = PublicKeyInfo,
-		    negotiated_version = Version,
-		    premaster_secret = PremasterSecret}
+key_exchange(#state{static_env = #static_env{role = client},
+                    handshake_env = #handshake_env{kex_algorithm = rsa_psk,
+                                                   public_key_info = PublicKeyInfo,
+                                                   premaster_secret = PremasterSecret},
+                    connection_env = #connection_env{negotiated_version = Version},
+		    ssl_options = SslOpts}
 	     = State0, Connection) ->
     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,
-		    srp_keys = {ClientPubKey, _}}
+key_exchange(#state{static_env = #static_env{role = client},
+                    handshake_env = #handshake_env{kex_algorithm = KexAlg,
+                                                   kex_keys = {ClientPubKey, _}},
+                    connection_env = #connection_env{negotiated_version = Version}}
 	     = State0, Connection)
-  when Algorithm == srp_dss;
-       Algorithm == srp_rsa;
-       Algorithm == srp_anon ->
+  when KexAlg == srp_dss;
+       KexAlg == srp_rsa;
+       KexAlg == srp_anon ->
     Msg =  ssl_handshake:key_exchange(client, ssl:tls_version(Version), {srp, ClientPubKey}),
     Connection:queue_handshake(Msg, State0).
 
@@ -1943,18 +2224,24 @@ rsa_psk_key_exchange(Version, PskIdentity, PremasterSecret,
 rsa_psk_key_exchange(_, _, _, _) ->
     throw (?ALERT_REC(?FATAL,?HANDSHAKE_FAILURE, pub_key_is_not_rsa)).
 
-request_client_cert(#state{key_algorithm = Alg} = State, _)
-  when Alg == dh_anon; Alg == ecdh_anon;
-       Alg == psk; Alg == dhe_psk; Alg == ecdhe_psk; Alg == rsa_psk;
-       Alg == srp_dss; Alg == srp_rsa; Alg == srp_anon ->
+request_client_cert(#state{handshake_env = #handshake_env{kex_algorithm = Alg}} = State, _)
+  when Alg == dh_anon; 
+       Alg == ecdh_anon;
+       Alg == psk; 
+       Alg == dhe_psk; 
+       Alg == ecdhe_psk; 
+       Alg == rsa_psk;
+       Alg == srp_dss; 
+       Alg == srp_rsa; 
+       Alg == srp_anon ->
     State;
 
-request_client_cert(#state{ssl_options = #ssl_options{verify = verify_peer, 
-						      signature_algs = SupportedHashSigns},
-			   connection_states = ConnectionStates0,
-			   cert_db = CertDbHandle,
-			   cert_db_ref = CertDbRef,
-			   negotiated_version = Version} = State0, Connection) ->
+request_client_cert(#state{static_env = #static_env{cert_db = CertDbHandle,
+                                                    cert_db_ref = CertDbRef},
+                           connection_env = #connection_env{negotiated_version = Version},
+                           ssl_options = #ssl_options{verify = verify_peer,
+                                                      signature_algs = SupportedHashSigns},
+                           connection_states = ConnectionStates0} = State0, Connection) ->
     #{security_parameters :=
 	  #security_parameters{cipher_suite = CipherSuite}} =
 	ssl_record:pending_connection_state(ConnectionStates0, read),
@@ -1971,7 +2258,7 @@ request_client_cert(#state{ssl_options = #ssl_options{verify = verify_none}} =
     State.
 
 calculate_master_secret(PremasterSecret, 
-			#state{negotiated_version = Version,
+			#state{connection_env = #connection_env{negotiated_version = Version},
 			       connection_states = ConnectionStates0,
 			       session = Session0} = State0, Connection,
 			_Current, Next) ->
@@ -1998,27 +2285,29 @@ finalize_handshake(State0, StateName, Connection) ->
     State = next_protocol(State2, Connection),
     finished(State, StateName, Connection).
 
-next_protocol(#state{role = server} = State, _) ->
+next_protocol(#state{static_env = #static_env{role = server}} = State, _) ->
     State;
-next_protocol(#state{negotiated_protocol = undefined} = State, _) ->
+next_protocol(#state{handshake_env = #handshake_env{negotiated_protocol = undefined}} = State, _) ->
     State;
-next_protocol(#state{expecting_next_protocol_negotiation = false} = State, _) ->
+next_protocol(#state{handshake_env = #handshake_env{expecting_next_protocol_negotiation = false}} = State, _) ->
     State;
-next_protocol(#state{negotiated_protocol = NextProtocol} = State0, Connection) ->
+next_protocol(#state{handshake_env = #handshake_env{negotiated_protocol = NextProtocol}} = State0, Connection) ->
     NextProtocolMessage = ssl_handshake:next_protocol(NextProtocol),
     Connection:queue_handshake(NextProtocolMessage, State0).
 
 cipher_protocol(State, Connection) ->
     Connection:queue_change_cipher(#change_cipher_spec{}, State).
 
-finished(#state{role = Role, negotiated_version = Version,
+finished(#state{static_env = #static_env{role = Role},
+                handshake_env = #handshake_env{tls_handshake_history = Hist},
+                connection_env = #connection_env{negotiated_version = Version},
 		session = Session,
-                connection_states = ConnectionStates0,
-                tls_handshake_history = Handshake0} = State0, StateName, Connection) ->
+                connection_states = ConnectionStates0} = State0, 
+         StateName, Connection) ->
     MasterSecret = Session#session.master_secret,
     Finished = ssl_handshake:finished(ssl:tls_version(Version), Role,
 				       get_current_prf(ConnectionStates0, write),
-				       MasterSecret, Handshake0),
+				       MasterSecret, Hist),
     ConnectionStates = save_verify_data(Role, Finished, ConnectionStates0, StateName),
     Connection:send_handshake(Finished, State0#state{connection_states =
 								 ConnectionStates}).
@@ -2034,64 +2323,71 @@ save_verify_data(server, #finished{verify_data = Data}, ConnectionStates, abbrev
 
 calculate_secret(#server_dh_params{dh_p = Prime, dh_g = Base, 
 				   dh_y = ServerPublicDhKey} = Params,
-		 State, Connection) ->
+		 #state{handshake_env = HsEnv} = State, Connection) ->
     Keys = {_, PrivateDhKey} = crypto:generate_key(dh, [Prime, Base]),
     PremasterSecret =
 	ssl_handshake:premaster_secret(ServerPublicDhKey, PrivateDhKey, Params),
     calculate_master_secret(PremasterSecret,
-			    State#state{diffie_hellman_keys = Keys}, 
+			    State#state{handshake_env = HsEnv#handshake_env{kex_keys = Keys}}, 
 			    Connection, certify, certify);
 
 calculate_secret(#server_ecdh_params{curve = ECCurve, public = ECServerPubKey},
-		     State=#state{session=Session}, Connection) ->
+		     #state{handshake_env = HsEnv,
+                            session = Session} = State, Connection) ->
     ECDHKeys = public_key:generate_key(ECCurve),
     PremasterSecret = 
 	ssl_handshake:premaster_secret(#'ECPoint'{point = ECServerPubKey}, ECDHKeys),
     calculate_master_secret(PremasterSecret,
-			    State#state{diffie_hellman_keys = ECDHKeys,
+			    State#state{handshake_env = HsEnv#handshake_env{kex_keys = ECDHKeys},
 					session = Session#session{ecc = ECCurve}},
 			    Connection, certify, certify);
 
 calculate_secret(#server_psk_params{
 		    hint = IdentityHint},
-		 State, Connection) ->
+		 #state{handshake_env = HsEnv} = State, Connection) ->
     %% store for later use
-    Connection:next_event(certify, no_record, State#state{psk_identity = IdentityHint});
+    Connection:next_event(certify, no_record, 
+                          State#state{handshake_env = 
+                                          HsEnv#handshake_env{server_psk_identity = IdentityHint}});
 
 calculate_secret(#server_dhe_psk_params{
 		    dh_params = #server_dh_params{dh_p = Prime, dh_g = Base}} = ServerKey,
-		    #state{ssl_options = #ssl_options{user_lookup_fun = PSKLookup}} = 
+		    #state{handshake_env = HsEnv,
+                           ssl_options = #ssl_options{user_lookup_fun = PSKLookup}} = 
 		     State, Connection) ->
     Keys = {_, PrivateDhKey} =
 	crypto:generate_key(dh, [Prime, Base]),
     PremasterSecret = ssl_handshake:premaster_secret(ServerKey, PrivateDhKey, PSKLookup),
-    calculate_master_secret(PremasterSecret, State#state{diffie_hellman_keys = Keys},
+    calculate_master_secret(PremasterSecret, State#state{handshake_env = HsEnv#handshake_env{kex_keys = Keys}},
 			    Connection, certify, certify);
 
 calculate_secret(#server_ecdhe_psk_params{
                     dh_params = #server_ecdh_params{curve = ECCurve}} = ServerKey,
                  #state{ssl_options = #ssl_options{user_lookup_fun = PSKLookup}} = 
-		     State=#state{session=Session}, Connection) ->
+		     #state{handshake_env = HsEnv,
+                            session = Session} = State, Connection) ->
     ECDHKeys = public_key:generate_key(ECCurve),
 
     PremasterSecret = ssl_handshake:premaster_secret(ServerKey, ECDHKeys, PSKLookup),
     calculate_master_secret(PremasterSecret,
-			    State#state{diffie_hellman_keys = ECDHKeys,
+			    State#state{handshake_env = HsEnv#handshake_env{kex_keys = ECDHKeys},
 					session = Session#session{ecc = ECCurve}},
 			    Connection, certify, certify);
 
 calculate_secret(#server_srp_params{srp_n = Prime, srp_g = Generator} = ServerKey,
-		 #state{ssl_options = #ssl_options{srp_identity = SRPId}} = State, 
+		 #state{handshake_env = HsEnv,
+                        ssl_options = #ssl_options{srp_identity = SRPId}} = State, 
 		 Connection) ->
     Keys = generate_srp_client_keys(Generator, Prime, 0),
     PremasterSecret = ssl_handshake:premaster_secret(ServerKey, Keys, SRPId),
-    calculate_master_secret(PremasterSecret, State#state{srp_keys = Keys}, Connection, 
+    calculate_master_secret(PremasterSecret, State#state{handshake_env = HsEnv#handshake_env{kex_keys = Keys}}, Connection, 
 			    certify, certify).
 
 master_secret(#alert{} = Alert, _) ->
     Alert;
-master_secret(PremasterSecret, #state{session = Session,
-				      negotiated_version = Version, role = Role,
+master_secret(PremasterSecret, #state{static_env = #static_env{role = Role},
+                                      connection_env = #connection_env{negotiated_version = Version},
+                                      session = Session,
 				      connection_states = ConnectionStates0} = State) ->
     case ssl_handshake:master_secret(ssl:tls_version(Version), PremasterSecret,
 				     ConnectionStates0, Role) of
@@ -2151,7 +2447,7 @@ cipher_role(client, Data, Session, #state{connection_states = ConnectionStates0}
      {Record, State} = prepare_connection(State0#state{session = Session,
 						       connection_states = ConnectionStates},
 					 Connection),
-    Connection:next_event(connection, Record, State);
+    Connection:next_event(connection, Record, State, [{{timeout, handshake}, infinity, close}]);
 cipher_role(server, Data, Session,  #state{connection_states = ConnectionStates0} = State0,
 	    Connection) ->
     ConnectionStates1 = ssl_record:set_client_verify_data(current_read, Data, 
@@ -2160,15 +2456,15 @@ cipher_role(server, Data, Session,  #state{connection_states = ConnectionStates0
 	finalize_handshake(State0#state{connection_states = ConnectionStates1,
 					session = Session}, cipher, Connection),
     {Record, State} = prepare_connection(State1, Connection),
-    Connection:next_event(connection, Record, State, Actions).
-
-is_anonymous(Algo) when Algo == dh_anon;
-			Algo == ecdh_anon;
-			Algo == psk;
-			Algo == dhe_psk;
-			Algo == ecdhe_psk;
-			Algo == rsa_psk;
-			Algo == srp_anon ->
+    Connection:next_event(connection, Record, State, [{{timeout, handshake}, infinity, close} | Actions]).
+
+is_anonymous(KexAlg) when KexAlg == dh_anon;
+                          KexAlg == ecdh_anon;
+                          KexAlg == psk;
+                          KexAlg == dhe_psk;
+                          KexAlg == ecdhe_psk;
+                          KexAlg == rsa_psk;
+                          KexAlg == srp_anon ->
     true;
 is_anonymous(_) ->
     false.
@@ -2282,6 +2578,30 @@ set_socket_opts(ConnectionCb, Transport, Socket, [{active, Active}| Opts], SockO
        Active == false ->
     set_socket_opts(ConnectionCb, Transport, Socket, Opts, 
 		    SockOpts#socket_options{active = Active}, Other);
+set_socket_opts(ConnectionCb, Transport, Socket, [{active, Active1} = Opt| Opts],
+                SockOpts=#socket_options{active = Active0}, Other)
+  when Active1 >= -32768, Active1 =< 32767 ->
+    Active = if
+        is_integer(Active0), Active0 + Active1 < -32768 ->
+            error;
+        is_integer(Active0), Active0 + Active1 =< 0 ->
+            false;
+        is_integer(Active0), Active0 + Active1 > 32767 ->
+            error;
+        Active1 =< 0 ->
+            false;
+        is_integer(Active0) ->
+            Active0 + Active1;
+        true ->
+            Active1
+    end,
+    case Active of
+        error ->
+            {{error, {options, {socket_options, Opt}} }, SockOpts};
+        _ ->
+            set_socket_opts(ConnectionCb, Transport, Socket, Opts,
+                            SockOpts#socket_options{active = Active}, Other)
+    end;
 set_socket_opts(_,_, _, [{active, _} = Opt| _], SockOpts, _) ->
     {{error, {options, {socket_options, Opt}} }, SockOpts};
 set_socket_opts(ConnectionCb, Transport, Socket, [Opt | Opts], SockOpts, Other) ->
@@ -2296,22 +2616,6 @@ hibernate_after(connection = StateName,
 hibernate_after(StateName, State, Actions) ->
     {next_state, StateName, State, Actions}.
 
-map_extensions(#hello_extensions{renegotiation_info = RenegotiationInfo,
-                                 signature_algs = SigAlg,          
-                                 alpn = Alpn,
-                                 next_protocol_negotiation = Next, 
-                                 srp = SRP,
-                                 ec_point_formats = ECPointFmt,
-                                 elliptic_curves = ECCCurves,
-                                 sni = SNI}) ->
-    #{renegotiation_info => ssl_handshake:extension_value(RenegotiationInfo),
-      signature_algs =>  ssl_handshake:extension_value(SigAlg),
-      alpn =>  ssl_handshake:extension_value(Alpn),
-      srp  => ssl_handshake:extension_value(SRP),
-      next_protocol => ssl_handshake:extension_value(Next),
-      ec_point_formats  => ssl_handshake:extension_value(ECPointFmt),
-      elliptic_curves => ssl_handshake:extension_value(ECCCurves),
-      sni => ssl_handshake:extension_value(SNI)}.
 
 terminate_alert(normal) ->
     ?ALERT_REC(?WARNING, ?CLOSE_NOTIFY);
@@ -2325,18 +2629,18 @@ handle_trusted_certs_db(#state{ssl_options =
 				   #ssl_options{cacertfile = <<>>, cacerts = []}}) ->
     %% No trusted certs specified
     ok;
-handle_trusted_certs_db(#state{cert_db_ref = Ref,
-			       cert_db = CertDb,
-			       ssl_options = #ssl_options{cacertfile = <<>>}}) when CertDb =/= undefined ->
+handle_trusted_certs_db(#state{static_env = #static_env{cert_db_ref = Ref,
+                                                        cert_db = CertDb},
+                               ssl_options = #ssl_options{cacertfile = <<>>}}) when CertDb =/= undefined ->
     %% Certs provided as DER directly can not be shared
     %% with other connections and it is safe to delete them when the connection ends.
     ssl_pkix_db:remove_trusted_certs(Ref, CertDb);
-handle_trusted_certs_db(#state{file_ref_db = undefined}) ->
+handle_trusted_certs_db(#state{static_env = #static_env{file_ref_db = undefined}}) ->
     %% Something went wrong early (typically cacertfile does not
     %% exist) so there is nothing to handle
     ok;
-handle_trusted_certs_db(#state{cert_db_ref = Ref,
-			       file_ref_db = RefDb,
+handle_trusted_certs_db(#state{static_env = #static_env{cert_db_ref = Ref,
+                                                        file_ref_db = RefDb},
 			       ssl_options = #ssl_options{cacertfile = File}}) ->
     case ssl_pkix_db:ref_count(Ref, RefDb, -1) of
 	0 ->
@@ -2345,7 +2649,7 @@ handle_trusted_certs_db(#state{cert_db_ref = Ref,
 	    ok
     end.
 
-prepare_connection(#state{renegotiation = Renegotiate, 
+prepare_connection(#state{handshake_env = #handshake_env{renegotiation = Renegotiate}, 
 			  start_or_recv_from = RecvFrom} = State0, Connection) 
   when Renegotiate =/= {false, first}, 
        RecvFrom =/= undefined ->
@@ -2355,42 +2659,54 @@ prepare_connection(State0, Connection) ->
     State = Connection:reinit(State0),
     {no_record, ack_connection(State)}.
 
-ack_connection(#state{renegotiation = {true, Initiater}} = State) when Initiater == peer;
-                                                                       Initiater == internal ->
-    State#state{renegotiation = undefined};
-ack_connection(#state{renegotiation = {true, From}} = State) ->    
+ack_connection(#state{handshake_env = #handshake_env{renegotiation = {true, Initiater}} = HsEnv} = State) when Initiater == peer;
+                                                                                                               Initiater == internal ->
+    State#state{handshake_env = HsEnv#handshake_env{renegotiation = undefined}};
+ack_connection(#state{handshake_env = #handshake_env{renegotiation = {true, From}} = HsEnv} = State) ->    
     gen_statem:reply(From, ok),
-    State#state{renegotiation = undefined};
-ack_connection(#state{renegotiation = {false, first}, 
-		      start_or_recv_from = StartFrom,
-		      timer = Timer} = State) when StartFrom =/= undefined ->
+    State#state{handshake_env = HsEnv#handshake_env{renegotiation = undefined}};
+ack_connection(#state{handshake_env = #handshake_env{renegotiation = {false, first}} = HsEnv, 
+		      start_or_recv_from = StartFrom} = State) when StartFrom =/= undefined ->
     gen_statem:reply(StartFrom, connected),
-    cancel_timer(Timer),
-    State#state{renegotiation = undefined, 
-		start_or_recv_from = undefined, timer = undefined};
+    State#state{handshake_env = HsEnv#handshake_env{renegotiation = undefined}, 
+		start_or_recv_from = undefined};
 ack_connection(State) ->
     State.
 
-cancel_timer(undefined) ->
-    ok;
-cancel_timer(Timer) ->
-    erlang:cancel_timer(Timer),
-    ok.
-
 session_handle_params(#server_ecdh_params{curve = ECCurve}, Session) ->
     Session#session{ecc = ECCurve};
 session_handle_params(_, Session) ->
     Session.
 
-register_session(client, Host, Port, #session{is_resumable = new} = Session0) ->
+handle_session(Role = server, #ssl_options{reuse_sessions = true} = SslOpts, 
+               Host, Port, Session0) ->
+    register_session(Role, host_id(Role, Host, SslOpts), Port, Session0, true);
+handle_session(Role = client, #ssl_options{verify = verify_peer,
+                                           reuse_sessions = Reuse} = SslOpts, 
+               Host, Port, Session0) when Reuse =/= false ->
+    register_session(Role, host_id(Role, Host, SslOpts), Port, Session0, reg_type(Reuse));
+handle_session(server, _, Host, Port, Session) ->
+    %% Remove "session of type new" entry from session DB 
+    ssl_manager:invalidate_session(Host, Port, Session),
+    Session;
+handle_session(client, _,_,_, Session) ->
+    %% In client case there is no entry yet, so nothing to remove
+    Session.
+
+reg_type(save) ->
+    true;
+reg_type(true) ->
+    unique.
+
+register_session(client, Host, Port, #session{is_resumable = new} = Session0, Save) ->
     Session = Session0#session{is_resumable = true},
-    ssl_manager:register_session(Host, Port, Session),
+    ssl_manager:register_session(Host, Port, Session, Save),
     Session;
-register_session(server, _, Port, #session{is_resumable = new} = Session0) ->
+register_session(server, _, Port, #session{is_resumable = new} = Session0, _) ->
     Session = Session0#session{is_resumable = true},
     ssl_manager:register_session(Port, Session),
     Session;
-register_session(_, _, _, Session) ->
+register_session(_, _, _, Session, _) ->
     Session. %% Already registered
 
 host_id(client, _Host, #ssl_options{server_name_indication = Hostname}) when is_list(Hostname) ->
@@ -2399,19 +2715,21 @@ host_id(_, Host, _) ->
     Host.
 
 handle_new_session(NewId, CipherSuite, Compression, 
-		   #state{session = Session0,
-			  protocol_cb = Connection} = State0) ->
+		   #state{static_env = #static_env{protocol_cb = Connection},
+                          session = Session0
+			 } = State0) ->
     Session = Session0#session{session_id = NewId,
 			       cipher_suite = CipherSuite,
 			       compression_method = Compression},
     Connection:next_event(certify, no_record, State0#state{session = Session}).
 
-handle_resumed_session(SessId, #state{connection_states = ConnectionStates0,
-				      negotiated_version = Version,
-				      host = Host, port = Port,
-				      protocol_cb = Connection,
-				      session_cache = Cache,
-				      session_cache_cb = CacheCb} = State) ->
+handle_resumed_session(SessId, #state{static_env = #static_env{host = Host,
+                                                               port = Port,
+                                                               protocol_cb = Connection,
+                                                               session_cache = Cache,
+                                                               session_cache_cb = CacheCb},
+                                      connection_env = #connection_env{negotiated_version = Version},
+                                      connection_states = ConnectionStates0} = State) ->
     Session = CacheCb:lookup(Cache, {{Host, Port}, SessId}),
     case ssl_handshake:master_secret(ssl:tls_version(Version), Session,
 				     ConnectionStates0, client) of
@@ -2459,7 +2777,7 @@ ssl_options_list([ciphers = Key | Keys], [Value | Values], Acc) ->
    ssl_options_list(Keys, Values, 
 		    [{Key, lists:map(
 			     fun(Suite) -> 
-				     ssl_cipher_format:suite_definition(Suite) 
+				     ssl_cipher_format:suite_bin_to_map(Suite) 
 			     end, Value)} 
 		     | Acc]);
 ssl_options_list([Key | Keys], [Value | Values], Acc) ->
@@ -2468,8 +2786,13 @@ ssl_options_list([Key | Keys], [Value | Values], Acc) ->
 handle_active_option(false, connection = StateName, To, Reply, State) ->
     hibernate_after(StateName, State, [{reply, To, Reply}]);
 
-handle_active_option(_, connection = StateName0, To, Reply, #state{protocol_cb = Connection,
-							      user_data_buffer = <<>>} = State0) ->
+handle_active_option(_, connection = StateName, To, _Reply, #state{connection_env = #connection_env{terminated = true},
+                                                                   user_data_buffer = {_,0,_}} = State) ->
+    handle_normal_shutdown(?ALERT_REC(?FATAL, ?CLOSE_NOTIFY, all_data_deliverd), StateName, 
+                           State#state{start_or_recv_from = To}),
+    {stop,{shutdown, peer_close}, State};
+handle_active_option(_, connection = StateName0, To, Reply, #state{static_env = #static_env{protocol_cb = Connection},
+                                                                   user_data_buffer = {_,0,_}} = State0) ->
     case Connection:next_event(StateName0, no_record, State0) of
 	{next_state, StateName, State} ->
 	    hibernate_after(StateName, State, [{reply, To, Reply}]);
@@ -2478,12 +2801,13 @@ handle_active_option(_, connection = StateName0, To, Reply, #state{protocol_cb =
 	{stop, _, _} = Stop ->
 	    Stop
     end;
-handle_active_option(_, StateName, To, Reply, #state{user_data_buffer = <<>>} = State) ->
+handle_active_option(_, StateName, To, Reply, #state{user_data_buffer = {_,0,_}} = State) ->
     %% Active once already set 
     {next_state, StateName, State, [{reply, To, Reply}]};
 
-%% user_data_buffer =/= <<>>
-handle_active_option(_, StateName0, To, Reply, #state{protocol_cb = Connection} = State0) -> 
+%% user_data_buffer nonempty
+handle_active_option(_, StateName0, To, Reply,
+                     #state{static_env = #static_env{protocol_cb = Connection}} = State0) ->
     case read_application_data(<<>>, State0) of
 	{stop, _, _} = Stop ->
 	    Stop;
@@ -2501,33 +2825,25 @@ handle_active_option(_, StateName0, To, Reply, #state{protocol_cb = Connection}
 
 
 %% Picks ClientData 
-get_data(_, _, <<>>) ->
-    {more, <<>>};
-%% Recv timed out save buffer data until next recv
-get_data(#socket_options{active=false}, undefined, Buffer) ->
-    {passive, Buffer};
-get_data(#socket_options{active=Active, packet=Raw}, BytesToRead, Buffer) 
+get_data(#socket_options{active=false}, undefined, _Bin) ->
+    %% Recv timed out save buffer data until next recv
+    passive;
+get_data(#socket_options{active=Active, packet=Raw}, BytesToRead, Bin)
   when Raw =:= raw; Raw =:= 0 ->   %% Raw Mode
-    if 
-	Active =/= false orelse BytesToRead =:= 0  ->
+    case Bin of
+        <<_/binary>> when Active =/= false orelse BytesToRead =:= 0 ->
 	    %% Active true or once, or passive mode recv(0)  
-	    {ok, Buffer, <<>>};
-	byte_size(Buffer) >= BytesToRead ->  
+	    {ok, Bin, <<>>};
+        <<Data:BytesToRead/binary, Rest/binary>> ->
 	    %% Passive Mode, recv(Bytes) 
-	    <<Data:BytesToRead/binary, Rest/binary>> = Buffer,
-	    {ok, Data, Rest};
-	true ->
+            {ok, Data, Rest};
+        <<_/binary>> ->
 	    %% Passive Mode not enough data
-	    {more, Buffer}
+            {more, BytesToRead}
     end;
-get_data(#socket_options{packet=Type, packet_size=Size}, _, Buffer) ->
+get_data(#socket_options{packet=Type, packet_size=Size}, _, Bin) ->
     PacketOpts = [{packet_size, Size}], 
-    case decode_packet(Type, Buffer, PacketOpts) of
-	{more, _} ->
-	    {more, Buffer};
-	Decoded ->
-	    Decoded
-    end.
+    decode_packet(Type, Bin, PacketOpts).
 
 decode_packet({http, headers}, Buffer, PacketOpts) ->
     decode_packet(httph, Buffer, PacketOpts);
@@ -2545,24 +2861,39 @@ decode_packet(Type, Buffer, PacketOpts) ->
 %% Note that if the user has explicitly configured the socket to expect
 %% HTTP headers using the {packet, httph} option, we don't do any automatic
 %% switching of states.
-deliver_app_data(CPids, Transport, Socket, SOpts = #socket_options{active=Active, packet=Type},
-		 Data, Pid, From, Tracker, Connection) ->
-    send_or_reply(Active, Pid, From, 
-                  format_reply(CPids, Transport, Socket, SOpts, Data, Tracker, Connection)),
-    SO = case Data of
-	     {P, _, _, _} when ((P =:= http_request) or (P =:= http_response)),
-			       ((Type =:= http) or (Type =:= http_bin)) ->
-	         SOpts#socket_options{packet={Type, headers}};
-	     http_eoh when tuple_size(Type) =:= 2 ->
-                 % End of headers - expect another Request/Response line
-	         {Type1, headers} = Type,
-	         SOpts#socket_options{packet=Type1};
-	     _ ->
-	         SOpts
-	 end,
+deliver_app_data(
+  CPids, Transport, Socket,
+  #socket_options{active=Active, packet=Type} = SOpts,
+  Data, Pid, From, Tracker, Connection) ->
+    %%
+    send_or_reply(
+      Active, Pid, From,
+      format_reply(
+        CPids, Transport, Socket, SOpts, Data, Tracker, Connection)),
+    SO =
+        case Data of
+            {P, _, _, _}
+              when ((P =:= http_request) or (P =:= http_response)),
+                   ((Type =:= http) or (Type =:= http_bin)) ->
+                SOpts#socket_options{packet={Type, headers}};
+            http_eoh when tuple_size(Type) =:= 2 ->
+                %% End of headers - expect another Request/Response line
+                {Type1, headers} = Type,
+                SOpts#socket_options{packet=Type1};
+            _ ->
+                SOpts
+        end,
     case Active of
         once ->
             SO#socket_options{active=false};
+        1 ->
+            send_user(
+              Pid,
+              format_passive(
+                CPids, Transport, Socket, Tracker, Connection)),
+            SO#socket_options{active=false};
+        N when is_integer(N) ->
+            SO#socket_options{active=N - 1};
 	_ ->
 	    SO
     end.
@@ -2572,7 +2903,7 @@ format_reply(_, _, _,#socket_options{active = false, mode = Mode, packet = Packe
     {ok, do_format_reply(Mode, Packet, Header, Data)};
 format_reply(CPids, Transport, Socket, #socket_options{active = _, mode = Mode, packet = Packet,
 						header = Header}, Data, Tracker, Connection) ->
-    {ssl, Connection:socket(CPids, Transport, Socket, Connection, Tracker), 
+    {ssl, Connection:socket(CPids, Transport, Socket, Tracker),
      do_format_reply(Mode, Packet, Header, Data)}.
 
 deliver_packet_error(CPids, Transport, Socket, 
@@ -2584,7 +2915,7 @@ format_packet_error(_, _, _,#socket_options{active = false, mode = Mode}, Data,
     {error, {invalid_packet, do_format_reply(Mode, raw, 0, Data)}};
 format_packet_error(CPids, Transport, Socket, #socket_options{active = _, mode = Mode}, 
                     Data, Tracker, Connection) ->
-    {ssl_error, Connection:socket(CPids, Transport, Socket, Connection, Tracker), 
+    {ssl_error, Connection:socket(CPids, Transport, Socket, Tracker),
      {invalid_packet, do_format_reply(Mode, raw, 0, Data)}}.
 
 do_format_reply(binary, _, N, Data) when N > 0 ->  % Header mode
@@ -2599,6 +2930,9 @@ do_format_reply(list, Packet, _, Data)
 do_format_reply(list, _,_, Data) ->
     binary_to_list(Data).
 
+format_passive(CPids, Transport, Socket, Tracker, Connection) ->
+    {ssl_passive, Connection:socket(CPids, Transport, Socket, Tracker)}.
+
 header(0, <<>>) ->
     <<>>;
 header(_, <<>>) ->
@@ -2622,40 +2956,38 @@ send_user(Pid, Msg) ->
     Pid ! Msg,
     ok.
 
-alert_user(Pids, Transport, Tracker, Socket, connection, Opts, Pid, From, Alert, Role, Connection) ->
-    alert_user(Pids, Transport, Tracker, Socket, Opts#socket_options.active, Pid, From, Alert, Role, Connection);
-alert_user(Pids, Transport, Tracker, Socket,_, _, _, From, Alert, Role, Connection) ->
-    alert_user(Pids, Transport, Tracker, Socket, From, Alert, Role, Connection).
+alert_user(Pids, Transport, Tracker, Socket, connection, Opts, Pid, From, Alert, Role, StateName, Connection) ->
+    alert_user(Pids, Transport, Tracker, Socket, Opts#socket_options.active, Pid, From, Alert, Role, StateName, Connection);
+alert_user(Pids, Transport, Tracker, Socket,_, _, _, From, Alert, Role, StateName, Connection) ->
+    alert_user(Pids, Transport, Tracker, Socket, From, Alert, Role, StateName, Connection).
 
-alert_user(Pids, Transport, Tracker, Socket, From, Alert, Role, Connection) ->
-    alert_user(Pids, Transport, Tracker, Socket, false, no_pid, From, Alert, Role, Connection).
+alert_user(Pids, Transport, Tracker, Socket, From, Alert, Role, StateName, Connection) ->
+    alert_user(Pids, Transport, Tracker, Socket, false, no_pid, From, Alert, Role, StateName, Connection).
 
-alert_user(_, _, _, _, false = Active, Pid, From,  Alert, Role, _) when From =/= undefined ->
+alert_user(_, _, _, _, false = Active, Pid, From,  Alert, Role, StateName, Connection) when From =/= undefined ->
     %% If there is an outstanding ssl_accept | recv
     %% From will be defined and send_or_reply will
     %% send the appropriate error message.
-    ReasonCode = ssl_alert:reason_code(Alert, Role),
+    ReasonCode = ssl_alert:reason_code(Alert, Role, Connection:protocol_name(), StateName),
     send_or_reply(Active, Pid, From, {error, ReasonCode});
-alert_user(Pids, Transport, Tracker, Socket, Active, Pid, From, Alert, Role, Connection) ->
-    case ssl_alert:reason_code(Alert, Role) of
+alert_user(Pids, Transport, Tracker, Socket, Active, Pid, From, Alert, Role, StateName, Connection) ->
+    case ssl_alert:reason_code(Alert, Role, Connection:protocol_name(), StateName) of
 	closed ->
 	    send_or_reply(Active, Pid, From,
-			  {ssl_closed, Connection:socket(Pids, 
-							 Transport, Socket, Connection, Tracker)});
+			  {ssl_closed, Connection:socket(Pids, Transport, Socket, Tracker)});
 	ReasonCode ->
 	    send_or_reply(Active, Pid, From,
-			  {ssl_error, Connection:socket(Pids, 
-							Transport, Socket, Connection, Tracker), ReasonCode})
+			  {ssl_error, Connection:socket(Pids, Transport, Socket, Tracker), ReasonCode})
     end.
 
-log_alert(true, Role, ProtocolName, StateName, #alert{role = Role} = Alert) ->
+log_alert(Level, Role, ProtocolName, StateName, #alert{role = Role} = Alert) ->
     Txt = ssl_alert:own_alert_txt(Alert),
-    error_logger:info_report(io_lib:format("~s ~p: In state ~p ~s\n", [ProtocolName, Role, StateName, Txt]));
-log_alert(true, Role, ProtocolName, StateName, Alert) ->
+    Report = ssl_alert:alert_txt(ProtocolName, Role, StateName, Txt),
+    ssl_logger:notice(Level, Report);
+log_alert(Level, Role, ProtocolName, StateName, Alert) ->
     Txt = ssl_alert:alert_txt(Alert),
-    error_logger:info_report(io_lib:format("~s ~p: In state ~p ~s\n", [ProtocolName, Role, StateName, Txt]));
-log_alert(false, _, _, _, _) ->
-    ok.
+    Report = ssl_alert:alert_txt(ProtocolName, Role, StateName, Txt),
+    ssl_logger:notice(Level, Report).
 
 invalidate_session(client, Host, Port, Session) ->
     ssl_manager:invalidate_session(Host, Port, Session);
@@ -2664,7 +2996,9 @@ invalidate_session(server, _, Port, Session) ->
 
 handle_sni_extension(undefined, State) ->
     State;
-handle_sni_extension(#sni{hostname = Hostname}, State0) ->
+handle_sni_extension(#sni{hostname = Hostname}, #state{static_env = #static_env{role = Role} = InitStatEnv0,
+                                                       handshake_env = HsEnv,
+                                                       connection_env = CEnv} = State0) ->
     NewOptions = update_ssl_options_from_sni(State0#state.ssl_options, Hostname),
     case NewOptions of
 	undefined ->
@@ -2678,19 +3012,21 @@ handle_sni_extension(#sni{hostname = Hostname}, State0) ->
                    private_key := Key,
                    dh_params := DHParams,
                    own_certificate := OwnCert}} =
-                 ssl_config:init(NewOptions, State0#state.role),
+                 ssl_config:init(NewOptions, Role),
              State0#state{
                session = State0#state.session#session{own_certificate = OwnCert},
-               file_ref_db = FileRefHandle,
-               cert_db_ref = Ref,
-               cert_db = CertDbHandle,
-               crl_db = CRLDbHandle,
-               session_cache = CacheHandle,
-               private_key = Key,
-	      diffie_hellman_params = DHParams,
-	      ssl_options = NewOptions,
-	      sni_hostname = Hostname
-	     }
+               static_env = InitStatEnv0#static_env{
+                                        file_ref_db = FileRefHandle,
+                                        cert_db_ref = Ref,
+                                        cert_db = CertDbHandle,
+                                        crl_db = CRLDbHandle,
+                                        session_cache = CacheHandle
+                             },
+               connection_env = CEnv#connection_env{private_key = Key},
+               ssl_options = NewOptions,
+               handshake_env = HsEnv#handshake_env{sni_hostname = Hostname,
+                                                   diffie_hellman_params = DHParams}
+              }
     end.
 
 update_ssl_options_from_sni(OrigSSLOptions, SNIHostname) ->
@@ -2714,13 +3050,7 @@ new_emulated([], EmOpts) ->
 new_emulated(NewEmOpts, _) ->
     NewEmOpts.
 
-stop(Reason, State) ->
-    {stop, Reason, State}.
-
-stop_and_reply(Reason, Replies, State) ->
-    {stop_and_reply, Reason, Replies, State}.
-
-is_dist_up(#{dist_handle := Handle}) when Handle =/= undefined ->
-    true;
-is_dist_up(_) ->
-    false.
+no_records(Extensions) ->
+    maps:map(fun(_, Value) ->
+                     ssl_handshake:extension_value(Value)
+             end, Extensions).  
diff --git a/lib/ssl/src/ssl_connection.hrl b/lib/ssl/src/ssl_connection.hrl
index 66e3182313..844368c761 100644
--- a/lib/ssl/src/ssl_connection.hrl
+++ b/lib/ssl/src/ssl_connection.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2019. 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,74 +33,152 @@
 -include("ssl_cipher.hrl").
 -include_lib("public_key/include/public_key.hrl").
 
+-record(static_env, {
+                     role                  :: client | server,
+                     transport_cb          :: atom(),   % callback module
+                     protocol_cb           :: tls_connection | dtls_connection,
+                     data_tag              :: atom(),   % ex tcp.
+                     close_tag             :: atom(),   % ex tcp_closed
+                     error_tag             :: atom(),   % ex tcp_error
+                     passive_tag           :: atom(),   % ex tcp_passive
+                     host                  :: string() | inet:ip_address(),
+                     port                  :: integer(),
+                     socket                :: port() | tuple(), %% TODO: dtls socket
+                     cert_db               :: reference() | 'undefined',
+                     session_cache         :: db_handle(),
+                     session_cache_cb      :: atom(),
+                     crl_db                :: term(),
+                     file_ref_db          :: db_handle(),
+                     cert_db_ref          :: certdb_ref() | 'undefined',
+                     tracker              :: pid() | 'undefined' %% Tracker process for listen socket
+                    }).
+
+-record(handshake_env, {
+                        client_hello_version  :: ssl_record:ssl_version() | 'undefined',
+                        unprocessed_handshake_events = 0    :: integer(),
+                        tls_handshake_history :: ssl_handshake:ssl_handshake_history() | secret_printout()
+                                               | 'undefined',
+                        expecting_finished =                  false ::boolean(),
+                        renegotiation        :: undefined | {boolean(), From::term() | internal | peer},
+                        allow_renegotiate = true                    ::boolean(),
+                        %% Ext handling
+                        hello,                %%:: #client_hello{} | #server_hello{}            
+                        sni_hostname = undefined,
+                        expecting_next_protocol_negotiation = false ::boolean(),
+                        next_protocol = undefined                   :: undefined | binary(),
+                        alpn = undefined,     %% Used in TLS 1.3
+                        negotiated_protocol,
+                        hashsign_algorithm = {undefined, undefined},
+                        cert_hashsign_algorithm = {undefined, undefined},
+                        %% key exchange
+                        kex_algorithm         :: ssl:kex_algo(),  
+                        kex_keys  :: {PublicKey :: binary(), PrivateKey :: binary()} | #'ECPrivateKey'{} |  undefined |  secret_printout(),        
+                        diffie_hellman_params:: #'DHParameter'{} | undefined | secret_printout(),
+                        srp_params           :: #srp_user{} | secret_printout() | 'undefined',
+                        public_key_info      :: ssl_handshake:public_key_info() | 'undefined',
+                        premaster_secret     :: binary() | secret_printout() | 'undefined',
+                        server_psk_identity         :: binary() | 'undefined'  % server psk identity hint
+                       }).
+
+-record(connection_env, { 
+                          user_application      :: {Monitor::reference(), User::pid()},
+                          downgrade,
+                          terminated = false                          ::boolean() | closed,  
+                          negotiated_version    :: ssl_record:ssl_version() | 'undefined',
+                          erl_dist_handle = undefined :: erlang:dist_handle() | 'undefined',
+                          private_key          :: public_key:private_key() | secret_printout() | 'undefined'
+                        }).
+
 -record(state, {
-          role                  :: client | server,
-	  user_application      :: {Monitor::reference(), User::pid()},
-          transport_cb          :: atom(),   % callback module
-	  protocol_cb           :: tls_connection | dtls_connection,
-          data_tag              :: atom(),   % ex tcp.
-	  close_tag             :: atom(),   % ex tcp_closed
-	  error_tag             :: atom(),   % ex tcp_error
-          host                  :: string() | inet:ip_address(),
-          port                  :: integer(),
-          socket                :: port() | tuple(), %% TODO: dtls socket
-          sender                :: pid() | undefined,
-          ssl_options           :: #ssl_options{},
-          socket_options        :: #socket_options{},
-          connection_states     :: ssl_record:connection_states() | secret_printout(),
-	  protocol_buffers      :: term() | secret_printout() , %% #protocol_buffers{} from tls_record.hrl or dtls_recor.hrl
-	  unprocessed_handshake_events = 0    :: integer(),
-          tls_handshake_history :: ssl_handshake:ssl_handshake_history() | secret_printout()
-                                 | 'undefined',
-	  cert_db               :: reference() | 'undefined',
-          session               :: #session{} | secret_printout(),
-	  session_cache         :: db_handle(),
-	  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_format:key_algo(),
-	  hashsign_algorithm = {undefined, undefined},
-	  cert_hashsign_algorithm = {undefined, undefined},
-          public_key_info      :: ssl_handshake:public_key_info() | 'undefined',
-          private_key          :: public_key:private_key() | secret_printout() | 'undefined',
-	  diffie_hellman_params:: #'DHParameter'{} | undefined | secret_printout(),
-	  diffie_hellman_keys  :: {PublicKey :: binary(), PrivateKey :: binary()} | #'ECPrivateKey'{} |  undefined |  secret_printout(),  
-	  psk_identity         :: binary() | 'undefined', % server psk identity hint
-	  srp_params           :: #srp_user{} | secret_printout() | 'undefined',
-	  srp_keys             ::{PublicKey :: binary(), PrivateKey :: binary()} | secret_printout() | 'undefined',
-          premaster_secret     :: binary() | secret_printout() | 'undefined',
-	  file_ref_db          :: db_handle(),
-          cert_db_ref          :: certdb_ref() | 'undefined',
-          bytes_to_read        :: undefined | integer(), %% bytes to read in passive mode
-          user_data_buffer     :: undefined | binary() | secret_printout(), 
-          erl_dist_data = #{} :: map(),
-	  renegotiation        :: undefined | {boolean(), From::term() | internal | peer},
-	  start_or_recv_from   :: term(),
-	  timer                :: undefined | reference(), % start_or_recive_timer
-          %%send_queue           :: queue:queue(),
-          hello,                %%:: #client_hello{} | #server_hello{}, 
-	  terminated = false                          ::boolean(),
-	  allow_renegotiate = true                    ::boolean(),
-          expecting_next_protocol_negotiation = false ::boolean(),
-	  expecting_finished =                  false ::boolean(),
-          next_protocol = undefined                   :: undefined | binary(),
-	  negotiated_protocol,
-	  tracker              :: pid() | 'undefined', %% Tracker process for listen socket
-	  sni_hostname = undefined,
-	  downgrade,
-	  flight_buffer = []   :: list() | map(),  %% Buffer of TLS/DTLS records, used during the TLS handshake
-          %% to when possible pack more than one TLS record into the 
-          %% underlaying packet format. Introduced by DTLS - RFC 4347.
-          %% The mecahnism is also usefull in TLS although we do not
-          %% need to worry about packet loss in TLS. In DTLS we need to track DTLS handshake seqnr
-          flight_state = reliable,  %% reliable | {retransmit, integer()}| {waiting, ref(), integer()} - last two is used in DTLS over udp.   
-          protocol_specific = #{}      :: map()                    
-	 }).
+                static_env            :: #static_env{},
+                connection_env        :: #connection_env{} | secret_printout(),
+                ssl_options           :: #ssl_options{},
+                socket_options        :: #socket_options{},
+
+                %% Hanshake %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+                handshake_env         :: #handshake_env{} | secret_printout(),
+                %% Buffer of TLS/DTLS records, used during the TLS
+                %% handshake to when possible pack more than one TLS
+                %% record into the underlaying packet
+                %% format. Introduced by DTLS - RFC 4347.  The
+                %% mecahnism is also usefull in TLS although we do not
+                %% need to worry about packet loss in TLS. In DTLS we
+                %% need to track DTLS handshake seqnr
+                flight_buffer = []   :: list() | map(),  
+                client_certificate_requested = false :: boolean(),
+                protocol_specific = #{}      :: map(),
+                session               :: #session{} | secret_printout(),
+                key_share,
+                %% Data shuffling %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+                connection_states     :: ssl_record:connection_states() | secret_printout(),
+                protocol_buffers      :: term() | secret_printout() , %% #protocol_buffers{} from tls_record.hrl or dtls_recor.hr
+                user_data_buffer     :: undefined | {[binary()],non_neg_integer(),[binary()]} | secret_printout(),
+                bytes_to_read        :: undefined | integer(), %% bytes to read in passive mode
+                %% recv and start handling
+                start_or_recv_from   :: term(),
+                log_level
+               }).
+
 -define(DEFAULT_DIFFIE_HELLMAN_PARAMS,
 	#'DHParameter'{prime = ?DEFAULT_DIFFIE_HELLMAN_PRIME,
 		       base = ?DEFAULT_DIFFIE_HELLMAN_GENERATOR}).
 -define(WAIT_TO_ALLOW_RENEGOTIATION, 12000).
 
+
+%%----------------------------------------------------------------------
+%% TLS 1.3
+%%----------------------------------------------------------------------
+
+%% TLS 1.3 uses the same state record with the following differences:
+%%
+%% state :: record()
+%%
+%%   session_cache                - not implemented
+%%   session_cache_cb             - not implemented
+%%   crl_db                       - not implemented
+%%   client_hello_version         - Bleichenbacher mitigation in TLS 1.2
+%%   client_certificate_requested - Built into TLS 1.3 state machine
+%%   key_algorithm                - not used
+%%   diffie_hellman_params        - used in TLS 1.2 ECDH key exchange
+%%   diffie_hellman_keys          - used in TLS 1.2 ECDH key exchange
+%%   psk_identity                 - not used
+%%   srp_params                   - not used, no srp extension in TLS 1.3
+%%   srp_keys                     - not used, no srp extension in TLS 1.3
+%%   premaster_secret             - not used
+%%   renegotiation                - TLS 1.3 forbids renegotiation
+%%   hello                        - used in user_hello, handshake continue
+%%   allow_renegotiate            - TLS 1.3 forbids renegotiation
+%%   expecting_next_protocol_negotiation - ALPN replaced NPN, depricated in TLS 1.3
+%%   expecting_finished           - not implemented, used by abbreviated
+%%   next_protocol                - ALPN replaced NPN, depricated in TLS 1.3
+%%
+%% connection_state :: map()
+%%
+%%   compression_state            - not used
+%%   mac_secret                   - not used
+%%   sequence_number              - not used
+%%   secure_renegotiation         - not used, no renegotiation_info in TLS 1.3
+%%   client_verify_data           - not used, no renegotiation_info in TLS 1.3
+%%   server_verify_data           - not used, no renegotiation_info in TLS 1.3
+%%   beast_mitigation             - not used
+%%
+%% security_parameters :: map()
+%%
+%%   cipher_type                  - TLS 1.3 uses only AEAD ciphers
+%%   iv_size                      - not used
+%%   key_size                     - not used
+%%   key_material_length          - not used
+%%   expanded_key_material_length - used in SSL 3.0
+%%   mac_algorithm                - not used
+%%   prf_algorithm                - not used
+%%   hash_size                    - not used
+%%   compression_algorithm        - not used
+%%   master_secret                - used for multiple secret types in TLS 1.3
+%%   client_random                - not used
+%%   server_random                - not used
+%%   exportable                   - not used
+%%
+%% cipher_state :: record()
+%%   nonce - used for sequence_number
+
 -endif. % -ifdef(ssl_connection).
diff --git a/lib/ssl/src/ssl_crl_cache.erl b/lib/ssl/src/ssl_crl_cache.erl
index 9c1af86eeb..841620ce57 100644
--- a/lib/ssl/src/ssl_crl_cache.erl
+++ b/lib/ssl/src/ssl_crl_cache.erl
@@ -28,6 +28,10 @@
 
 -behaviour(ssl_crl_cache_api).
 
+-export_type([crl_src/0, uri/0]).
+-type crl_src() :: {file, file:filename()} | {der,  public_key:der_encoded()}.
+-type uri()     :: uri_string:uri_string().
+
 -export([lookup/3, select/2, fresh_crl/2]).
 -export([insert/1, insert/2, delete/1]).
 
diff --git a/lib/ssl/src/ssl_crl_cache_api.erl b/lib/ssl/src/ssl_crl_cache_api.erl
index d5380583e7..8a750b3929 100644
--- a/lib/ssl/src/ssl_crl_cache_api.erl
+++ b/lib/ssl/src/ssl_crl_cache_api.erl
@@ -21,12 +21,15 @@
 %%
 
 -module(ssl_crl_cache_api).
-
 -include_lib("public_key/include/public_key.hrl"). 
 
--type db_handle() :: term().
--type issuer_name() :: {rdnSequence, [#'AttributeTypeAndValue'{}]}.
+-export_type([dist_point/0, crl_cache_ref/0]).
+
+-type crl_cache_ref() :: any().
+-type issuer_name() ::  {rdnSequence,[#'AttributeTypeAndValue'{}]}.
+-type dist_point()  :: #'DistributionPoint'{}.
 
--callback lookup(#'DistributionPoint'{}, issuer_name(), db_handle()) -> not_available | [public_key:der_encoded()].
--callback select(issuer_name(), db_handle()) ->  [public_key:der_encoded()].
--callback fresh_crl(#'DistributionPoint'{}, public_key:der_encoded()) -> public_key:der_encoded().
+  
+-callback lookup(dist_point(), issuer_name(), crl_cache_ref()) -> not_available | [public_key:der_encoded()].
+-callback select(issuer_name(), crl_cache_ref()) ->  [public_key:der_encoded()].
+-callback fresh_crl(dist_point(), public_key:der_encoded()) -> public_key:der_encoded().
diff --git a/lib/ssl/src/ssl_crl_hash_dir.erl b/lib/ssl/src/ssl_crl_hash_dir.erl
index bb62737232..9478ff9b78 100644
--- a/lib/ssl/src/ssl_crl_hash_dir.erl
+++ b/lib/ssl/src/ssl_crl_hash_dir.erl
@@ -20,6 +20,7 @@
 -module(ssl_crl_hash_dir).
 
 -include_lib("public_key/include/public_key.hrl").
+-include_lib("kernel/include/logger.hrl").
 
 -behaviour(ssl_crl_cache_api).
 
@@ -55,7 +56,7 @@ select(Issuer, {_DbHandle, [{dir, Dir}]}) ->
             %% is happy with that, but if it's true, this is an error.
             [];
         {error, Error} ->
-            error_logger:error_report(
+            ?LOG_ERROR(
               [{cannot_find_crl, Error},
                {dir, Dir},
                {module, ?MODULE},
@@ -86,7 +87,7 @@ find_crls(Issuer, Hash, Dir, N, Acc) ->
 		error:Error ->
 		    %% Something is wrong with the file.  Report
 		    %% it, and try the next one.
-		    error_logger:error_report(
+		    ?LOG_ERROR(
 		      [{crl_parse_error, Error},
 		       {filename, Filename},
 		       {module, ?MODULE},
diff --git a/lib/ssl/src/ssl_dh_groups.erl b/lib/ssl/src/ssl_dh_groups.erl
new file mode 100644
index 0000000000..20d53de430
--- /dev/null
+++ b/lib/ssl/src/ssl_dh_groups.erl
@@ -0,0 +1,467 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2007-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(ssl_dh_groups).
+
+-include_lib("public_key/include/public_key.hrl").
+
+-export([modp2048_generator/0, modp2048_prime/0,
+         ffdhe2048_generator/0, ffdhe2048_prime/0,
+         ffdhe3072_generator/0, ffdhe3072_prime/0,
+         ffdhe4096_generator/0, ffdhe4096_prime/0,
+         ffdhe6144_generator/0, ffdhe6144_prime/0,
+         ffdhe8192_generator/0, ffdhe8192_prime/0,
+         dh_params/1]).
+
+%% RFC3526 - 2048-bit MODP Group
+%% This group is assigned id 14.
+%%
+%%    This prime is: 2^2048 - 2^1984 - 1 + 2^64 * { [2^1918 pi] + 124476 }
+%%
+%%    Its hexadecimal value is:
+%%
+%%       FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1
+%%       29024E08 8A67CC74 020BBEA6 3B139B22 514A0879 8E3404DD
+%%       EF9519B3 CD3A431B 302B0A6D F25F1437 4FE1356D 6D51C245
+%%       E485B576 625E7EC6 F44C42E9 A637ED6B 0BFF5CB6 F406B7ED
+%%       EE386BFB 5A899FA5 AE9F2411 7C4B1FE6 49286651 ECE45B3D
+%%       C2007CB8 A163BF05 98DA4836 1C55D39A 69163FA8 FD24CF5F
+%%       83655D23 DCA3AD96 1C62F356 208552BB 9ED52907 7096966D
+%%       670C354E 4ABC9804 F1746C08 CA18217C 32905E46 2E36CE3B
+%%       E39E772C 180E8603 9B2783A2 EC07A28F B5C55DF0 6F4C52C9
+%%       DE2BCBF6 95581718 3995497C EA956AE5 15D22618 98FA0510
+%%       15728E5A 8AACAA68 FFFFFFFF FFFFFFFF
+%%
+%%    The generator is: 2.
+modp2048_generator() ->
+    2.
+
+modp2048_prime() ->
+    P = "FFFFFFFF" "FFFFFFFF" "C90FDAA2" "2168C234" "C4C6628B" "80DC1CD1"
+        "29024E08" "8A67CC74" "020BBEA6" "3B139B22" "514A0879" "8E3404DD"
+        "EF9519B3" "CD3A431B" "302B0A6D" "F25F1437" "4FE1356D" "6D51C245"
+        "E485B576" "625E7EC6" "F44C42E9" "A637ED6B" "0BFF5CB6" "F406B7ED"
+        "EE386BFB" "5A899FA5" "AE9F2411" "7C4B1FE6" "49286651" "ECE45B3D"
+        "C2007CB8" "A163BF05" "98DA4836" "1C55D39A" "69163FA8" "FD24CF5F"
+        "83655D23" "DCA3AD96" "1C62F356" "208552BB" "9ED52907" "7096966D"
+        "670C354E" "4ABC9804" "F1746C08" "CA18217C" "32905E46" "2E36CE3B"
+        "E39E772C" "180E8603" "9B2783A2" "EC07A28F" "B5C55DF0" "6F4C52C9"
+        "DE2BCBF6" "95581718" "3995497C" "EA956AE5" "15D22618" "98FA0510"
+        "15728E5A" "8AACAA68" "FFFFFFFF" "FFFFFFFF",
+    list_to_integer(P, 16).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% RFC8446 - TLS 1.3
+%%% RFC7919 - Negotiated FFDHE for TLS
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% ffdhe2048
+%% ---------
+%% The 2048-bit group has registry value 256 and is calculated from the
+%% following formula:
+%%
+%%   The modulus is:
+%%
+%%     p = 2^2048 - 2^1984 + {[2^1918 * e] + 560316 } * 2^64 - 1
+%%
+%%   The hexadecimal representation of p is:
+%%
+%%     FFFFFFFF FFFFFFFF ADF85458 A2BB4A9A AFDC5620 273D3CF1
+%%     D8B9C583 CE2D3695 A9E13641 146433FB CC939DCE 249B3EF9
+%%     7D2FE363 630C75D8 F681B202 AEC4617A D3DF1ED5 D5FD6561
+%%     2433F51F 5F066ED0 85636555 3DED1AF3 B557135E 7F57C935
+%%     984F0C70 E0E68B77 E2A689DA F3EFE872 1DF158A1 36ADE735
+%%     30ACCA4F 483A797A BC0AB182 B324FB61 D108A94B B2C8E3FB
+%%     B96ADAB7 60D7F468 1D4F42A3 DE394DF4 AE56EDE7 6372BB19
+%%     0B07A7C8 EE0A6D70 9E02FCE1 CDF7E2EC C03404CD 28342F61
+%%     9172FE9C E98583FF 8E4F1232 EEF28183 C3FE3B1B 4C6FAD73
+%%     3BB5FCBC 2EC22005 C58EF183 7D1683B2 C6F34A26 C1B2EFFA
+%%     886B4238 61285C97 FFFFFFFF FFFFFFFF
+%%
+%%   The generator is: g = 2
+%%
+%%   The group size is: q = (p-1)/2
+%%
+%% The estimated symmetric-equivalent strength of this group is 103
+%% bits.
+ffdhe2048_generator() ->
+    2.
+
+ffdhe2048_prime() ->
+    P = "FFFFFFFF" "FFFFFFFF" "ADF85458" "A2BB4A9A" "AFDC5620" "273D3CF1"
+        "D8B9C583" "CE2D3695" "A9E13641" "146433FB" "CC939DCE" "249B3EF9"
+        "7D2FE363" "630C75D8" "F681B202" "AEC4617A" "D3DF1ED5" "D5FD6561"
+        "2433F51F" "5F066ED0" "85636555" "3DED1AF3" "B557135E" "7F57C935"
+        "984F0C70" "E0E68B77" "E2A689DA" "F3EFE872" "1DF158A1" "36ADE735"
+        "30ACCA4F" "483A797A" "BC0AB182" "B324FB61" "D108A94B" "B2C8E3FB"
+        "B96ADAB7" "60D7F468" "1D4F42A3" "DE394DF4" "AE56EDE7" "6372BB19"
+        "0B07A7C8" "EE0A6D70" "9E02FCE1" "CDF7E2EC" "C03404CD" "28342F61"
+        "9172FE9C" "E98583FF" "8E4F1232" "EEF28183" "C3FE3B1B" "4C6FAD73"
+        "3BB5FCBC" "2EC22005" "C58EF183" "7D1683B2" "C6F34A26" "C1B2EFFA"
+        "886B4238" "61285C97" "FFFFFFFF" "FFFFFFFF",
+    list_to_integer(P, 16).
+
+
+%% ffdhe3072
+%% ---------
+%% The 3072-bit prime has registry value 257 and is calculated from the
+%% following formula:
+%%
+%%   The modulus is:
+%%
+%%     p = 2^3072 - 2^3008 + {[2^2942 * e] + 2625351} * 2^64 - 1
+%%
+%%   The hexadecimal representation of p is:
+%%
+%%     FFFFFFFF FFFFFFFF ADF85458 A2BB4A9A AFDC5620 273D3CF1
+%%     D8B9C583 CE2D3695 A9E13641 146433FB CC939DCE 249B3EF9
+%%     7D2FE363 630C75D8 F681B202 AEC4617A D3DF1ED5 D5FD6561
+%%     2433F51F 5F066ED0 85636555 3DED1AF3 B557135E 7F57C935
+%%     984F0C70 E0E68B77 E2A689DA F3EFE872 1DF158A1 36ADE735
+%%     30ACCA4F 483A797A BC0AB182 B324FB61 D108A94B B2C8E3FB
+%%     B96ADAB7 60D7F468 1D4F42A3 DE394DF4 AE56EDE7 6372BB19
+%%     0B07A7C8 EE0A6D70 9E02FCE1 CDF7E2EC C03404CD 28342F61
+%%     9172FE9C E98583FF 8E4F1232 EEF28183 C3FE3B1B 4C6FAD73
+%%     3BB5FCBC 2EC22005 C58EF183 7D1683B2 C6F34A26 C1B2EFFA
+%%     886B4238 611FCFDC DE355B3B 6519035B BC34F4DE F99C0238
+%%     61B46FC9 D6E6C907 7AD91D26 91F7F7EE 598CB0FA C186D91C
+%%     AEFE1309 85139270 B4130C93 BC437944 F4FD4452 E2D74DD3
+%%     64F2E21E 71F54BFF 5CAE82AB 9C9DF69E E86D2BC5 22363A0D
+%%     ABC52197 9B0DEADA 1DBF9A42 D5C4484E 0ABCD06B FA53DDEF
+%%     3C1B20EE 3FD59D7C 25E41D2B 66C62E37 FFFFFFFF FFFFFFFF
+%%
+%%   The generator is: g = 2
+%%
+%%   The group size is: q = (p-1)/2
+%%
+%% The estimated symmetric-equivalent strength of this group is 125
+%% bits.
+ffdhe3072_generator() ->
+    2.
+
+ffdhe3072_prime() ->
+    P = "FFFFFFFF" "FFFFFFFF" "ADF85458" "A2BB4A9A" "AFDC5620" "273D3CF1"
+        "D8B9C583" "CE2D3695" "A9E13641" "146433FB" "CC939DCE" "249B3EF9"
+        "7D2FE363" "630C75D8" "F681B202" "AEC4617A" "D3DF1ED5" "D5FD6561"
+        "2433F51F" "5F066ED0" "85636555" "3DED1AF3" "B557135E" "7F57C935"
+        "984F0C70" "E0E68B77" "E2A689DA" "F3EFE872" "1DF158A1" "36ADE735"
+        "30ACCA4F" "483A797A" "BC0AB182" "B324FB61" "D108A94B" "B2C8E3FB"
+        "B96ADAB7" "60D7F468" "1D4F42A3" "DE394DF4" "AE56EDE7" "6372BB19"
+        "0B07A7C8" "EE0A6D70" "9E02FCE1" "CDF7E2EC" "C03404CD" "28342F61"
+        "9172FE9C" "E98583FF" "8E4F1232" "EEF28183" "C3FE3B1B" "4C6FAD73"
+        "3BB5FCBC" "2EC22005" "C58EF183" "7D1683B2" "C6F34A26" "C1B2EFFA"
+        "886B4238" "611FCFDC" "DE355B3B" "6519035B" "BC34F4DE" "F99C0238"
+        "61B46FC9" "D6E6C907" "7AD91D26" "91F7F7EE" "598CB0FA" "C186D91C"
+        "AEFE1309" "85139270" "B4130C93" "BC437944" "F4FD4452" "E2D74DD3"
+        "64F2E21E" "71F54BFF" "5CAE82AB" "9C9DF69E" "E86D2BC5" "22363A0D"
+        "ABC52197" "9B0DEADA" "1DBF9A42" "D5C4484E" "0ABCD06B" "FA53DDEF"
+        "3C1B20EE" "3FD59D7C" "25E41D2B" "66C62E37" "FFFFFFFF" "FFFFFFFF",
+    list_to_integer(P, 16).
+
+
+%% ffdhe4096
+%% ---------
+%% The 4096-bit group has registry value 258 and is calculated from the
+%% following formula:
+%%
+%%   The modulus is:
+%%
+%%     p = 2^4096 - 2^4032 + {[2^3966 * e] + 5736041} * 2^64 - 1
+%%
+%%   The hexadecimal representation of p is:
+%%
+%%     FFFFFFFF FFFFFFFF ADF85458 A2BB4A9A AFDC5620 273D3CF1
+%%     D8B9C583 CE2D3695 A9E13641 146433FB CC939DCE 249B3EF9
+%%     7D2FE363 630C75D8 F681B202 AEC4617A D3DF1ED5 D5FD6561
+%%     2433F51F 5F066ED0 85636555 3DED1AF3 B557135E 7F57C935
+%%     984F0C70 E0E68B77 E2A689DA F3EFE872 1DF158A1 36ADE735
+%%     30ACCA4F 483A797A BC0AB182 B324FB61 D108A94B B2C8E3FB
+%%     B96ADAB7 60D7F468 1D4F42A3 DE394DF4 AE56EDE7 6372BB19
+%%     0B07A7C8 EE0A6D70 9E02FCE1 CDF7E2EC C03404CD 28342F61
+%%     9172FE9C E98583FF 8E4F1232 EEF28183 C3FE3B1B 4C6FAD73
+%%     3BB5FCBC 2EC22005 C58EF183 7D1683B2 C6F34A26 C1B2EFFA
+%%     886B4238 611FCFDC DE355B3B 6519035B BC34F4DE F99C0238
+%%     61B46FC9 D6E6C907 7AD91D26 91F7F7EE 598CB0FA C186D91C
+%%     AEFE1309 85139270 B4130C93 BC437944 F4FD4452 E2D74DD3
+%%     64F2E21E 71F54BFF 5CAE82AB 9C9DF69E E86D2BC5 22363A0D
+%%     ABC52197 9B0DEADA 1DBF9A42 D5C4484E 0ABCD06B FA53DDEF
+%%     3C1B20EE 3FD59D7C 25E41D2B 669E1EF1 6E6F52C3 164DF4FB
+%%     7930E9E4 E58857B6 AC7D5F42 D69F6D18 7763CF1D 55034004
+%%     87F55BA5 7E31CC7A 7135C886 EFB4318A ED6A1E01 2D9E6832
+%%     A907600A 918130C4 6DC778F9 71AD0038 092999A3 33CB8B7A
+%%     1A1DB93D 7140003C 2A4ECEA9 F98D0ACC 0A8291CD CEC97DCF
+%%     8EC9B55A 7F88A46B 4DB5A851 F44182E1 C68A007E 5E655F6A
+%%     FFFFFFFF FFFFFFFF
+%%
+%%   The generator is: g = 2
+%%
+%%   The group size is: q = (p-1)/2
+%%
+%% The estimated symmetric-equivalent strength of this group is 150
+%% bits.
+ffdhe4096_generator() ->
+    2.
+
+ffdhe4096_prime() ->
+    P = "FFFFFFFF" "FFFFFFFF" "ADF85458" "A2BB4A9A" "AFDC5620" "273D3CF1"
+        "D8B9C583" "CE2D3695" "A9E13641" "146433FB" "CC939DCE" "249B3EF9"
+        "7D2FE363" "630C75D8" "F681B202" "AEC4617A" "D3DF1ED5" "D5FD6561"
+        "2433F51F" "5F066ED0" "85636555" "3DED1AF3" "B557135E" "7F57C935"
+        "984F0C70" "E0E68B77" "E2A689DA" "F3EFE872" "1DF158A1" "36ADE735"
+        "30ACCA4F" "483A797A" "BC0AB182" "B324FB61" "D108A94B" "B2C8E3FB"
+        "B96ADAB7" "60D7F468" "1D4F42A3" "DE394DF4" "AE56EDE7" "6372BB19"
+        "0B07A7C8" "EE0A6D70" "9E02FCE1" "CDF7E2EC" "C03404CD" "28342F61"
+        "9172FE9C" "E98583FF" "8E4F1232" "EEF28183" "C3FE3B1B" "4C6FAD73"
+        "3BB5FCBC" "2EC22005" "C58EF183" "7D1683B2" "C6F34A26" "C1B2EFFA"
+        "886B4238" "611FCFDC" "DE355B3B" "6519035B" "BC34F4DE" "F99C0238"
+        "61B46FC9" "D6E6C907" "7AD91D26" "91F7F7EE" "598CB0FA" "C186D91C"
+        "AEFE1309" "85139270" "B4130C93" "BC437944" "F4FD4452" "E2D74DD3"
+        "64F2E21E" "71F54BFF" "5CAE82AB" "9C9DF69E" "E86D2BC5" "22363A0D"
+        "ABC52197" "9B0DEADA" "1DBF9A42" "D5C4484E" "0ABCD06B" "FA53DDEF"
+        "3C1B20EE" "3FD59D7C" "25E41D2B" "669E1EF1" "6E6F52C3" "164DF4FB"
+        "7930E9E4" "E58857B6" "AC7D5F42" "D69F6D18" "7763CF1D" "55034004"
+        "87F55BA5" "7E31CC7A" "7135C886" "EFB4318A" "ED6A1E01" "2D9E6832"
+        "A907600A" "918130C4" "6DC778F9" "71AD0038" "092999A3" "33CB8B7A"
+        "1A1DB93D" "7140003C" "2A4ECEA9" "F98D0ACC" "0A8291CD" "CEC97DCF"
+        "8EC9B55A" "7F88A46B" "4DB5A851" "F44182E1" "C68A007E" "5E655F6A"
+        "FFFFFFFF" "FFFFFFFF",
+    list_to_integer(P, 16).
+
+
+%% ffdhe6144
+%% ---------
+%% The 6144-bit group has registry value 259 and is calculated from the
+%% following formula:
+%%
+%%   The modulus is:
+%%
+%%     p = 2^6144 - 2^6080 + {[2^6014 * e] + 15705020} * 2^64 - 1
+%%
+%%   The hexadecimal representation of p is:
+%%
+%%     FFFFFFFF FFFFFFFF ADF85458 A2BB4A9A AFDC5620 273D3CF1
+%%     D8B9C583 CE2D3695 A9E13641 146433FB CC939DCE 249B3EF9
+%%     7D2FE363 630C75D8 F681B202 AEC4617A D3DF1ED5 D5FD6561
+%%     2433F51F 5F066ED0 85636555 3DED1AF3 B557135E 7F57C935
+%%     984F0C70 E0E68B77 E2A689DA F3EFE872 1DF158A1 36ADE735
+%%     30ACCA4F 483A797A BC0AB182 B324FB61 D108A94B B2C8E3FB
+%%     B96ADAB7 60D7F468 1D4F42A3 DE394DF4 AE56EDE7 6372BB19
+%%     0B07A7C8 EE0A6D70 9E02FCE1 CDF7E2EC C03404CD 28342F61
+%%     9172FE9C E98583FF 8E4F1232 EEF28183 C3FE3B1B 4C6FAD73
+%%     3BB5FCBC 2EC22005 C58EF183 7D1683B2 C6F34A26 C1B2EFFA
+%%     886B4238 611FCFDC DE355B3B 6519035B BC34F4DE F99C0238
+%%     61B46FC9 D6E6C907 7AD91D26 91F7F7EE 598CB0FA C186D91C
+%%     AEFE1309 85139270 B4130C93 BC437944 F4FD4452 E2D74DD3
+%%     64F2E21E 71F54BFF 5CAE82AB 9C9DF69E E86D2BC5 22363A0D
+%%     ABC52197 9B0DEADA 1DBF9A42 D5C4484E 0ABCD06B FA53DDEF
+%%     3C1B20EE 3FD59D7C 25E41D2B 669E1EF1 6E6F52C3 164DF4FB
+%%     7930E9E4 E58857B6 AC7D5F42 D69F6D18 7763CF1D 55034004
+%%     87F55BA5 7E31CC7A 7135C886 EFB4318A ED6A1E01 2D9E6832
+%%     A907600A 918130C4 6DC778F9 71AD0038 092999A3 33CB8B7A
+%%     1A1DB93D 7140003C 2A4ECEA9 F98D0ACC 0A8291CD CEC97DCF
+%%     8EC9B55A 7F88A46B 4DB5A851 F44182E1 C68A007E 5E0DD902
+%%     0BFD64B6 45036C7A 4E677D2C 38532A3A 23BA4442 CAF53EA6
+%%     3BB45432 9B7624C8 917BDD64 B1C0FD4C B38E8C33 4C701C3A
+%%     CDAD0657 FCCFEC71 9B1F5C3E 4E46041F 388147FB 4CFDB477
+%%     A52471F7 A9A96910 B855322E DB6340D8 A00EF092 350511E3
+%%     0ABEC1FF F9E3A26E 7FB29F8C 183023C3 587E38DA 0077D9B4
+%%     763E4E4B 94B2BBC1 94C6651E 77CAF992 EEAAC023 2A281BF6
+%%     B3A739C1 22611682 0AE8DB58 47A67CBE F9C9091B 462D538C
+%%     D72B0374 6AE77F5E 62292C31 1562A846 505DC82D B854338A
+%%     E49F5235 C95B9117 8CCF2DD5 CACEF403 EC9D1810 C6272B04
+%%     5B3B71F9 DC6B80D6 3FDD4A8E 9ADB1E69 62A69526 D43161C1
+%%     A41D570D 7938DAD4 A40E329C D0E40E65 FFFFFFFF FFFFFFFF
+%%
+%%   The generator is: g = 2
+%%
+%%   The group size is: q = (p-1)/2
+%%
+%% The estimated symmetric-equivalent strength of this group is 175
+%% bits.
+ffdhe6144_generator() ->
+    2.
+
+ffdhe6144_prime() ->
+    P = "FFFFFFFF" "FFFFFFFF" "ADF85458" "A2BB4A9A" "AFDC5620" "273D3CF1"
+        "D8B9C583" "CE2D3695" "A9E13641" "146433FB" "CC939DCE" "249B3EF9"
+        "7D2FE363" "630C75D8" "F681B202" "AEC4617A" "D3DF1ED5" "D5FD6561"
+        "2433F51F" "5F066ED0" "85636555" "3DED1AF3" "B557135E" "7F57C935"
+        "984F0C70" "E0E68B77" "E2A689DA" "F3EFE872" "1DF158A1" "36ADE735"
+        "30ACCA4F" "483A797A" "BC0AB182" "B324FB61" "D108A94B" "B2C8E3FB"
+        "B96ADAB7" "60D7F468" "1D4F42A3" "DE394DF4" "AE56EDE7" "6372BB19"
+        "0B07A7C8" "EE0A6D70" "9E02FCE1" "CDF7E2EC" "C03404CD" "28342F61"
+        "9172FE9C" "E98583FF" "8E4F1232" "EEF28183" "C3FE3B1B" "4C6FAD73"
+        "3BB5FCBC" "2EC22005" "C58EF183" "7D1683B2" "C6F34A26" "C1B2EFFA"
+        "886B4238" "611FCFDC" "DE355B3B" "6519035B" "BC34F4DE" "F99C0238"
+        "61B46FC9" "D6E6C907" "7AD91D26" "91F7F7EE" "598CB0FA" "C186D91C"
+        "AEFE1309" "85139270" "B4130C93" "BC437944" "F4FD4452" "E2D74DD3"
+        "64F2E21E" "71F54BFF" "5CAE82AB" "9C9DF69E" "E86D2BC5" "22363A0D"
+        "ABC52197" "9B0DEADA" "1DBF9A42" "D5C4484E" "0ABCD06B" "FA53DDEF"
+        "3C1B20EE" "3FD59D7C" "25E41D2B" "669E1EF1" "6E6F52C3" "164DF4FB"
+        "7930E9E4" "E58857B6" "AC7D5F42" "D69F6D18" "7763CF1D" "55034004"
+        "87F55BA5" "7E31CC7A" "7135C886" "EFB4318A" "ED6A1E01" "2D9E6832"
+        "A907600A" "918130C4" "6DC778F9" "71AD0038" "092999A3" "33CB8B7A"
+        "1A1DB93D" "7140003C" "2A4ECEA9" "F98D0ACC" "0A8291CD" "CEC97DCF"
+        "8EC9B55A" "7F88A46B" "4DB5A851" "F44182E1" "C68A007E" "5E0DD902"
+        "0BFD64B6" "45036C7A" "4E677D2C" "38532A3A" "23BA4442" "CAF53EA6"
+        "3BB45432" "9B7624C8" "917BDD64" "B1C0FD4C" "B38E8C33" "4C701C3A"
+        "CDAD0657" "FCCFEC71" "9B1F5C3E" "4E46041F" "388147FB" "4CFDB477"
+        "A52471F7" "A9A96910" "B855322E" "DB6340D8" "A00EF092" "350511E3"
+        "0ABEC1FF" "F9E3A26E" "7FB29F8C" "183023C3" "587E38DA" "0077D9B4"
+        "763E4E4B" "94B2BBC1" "94C6651E" "77CAF992" "EEAAC023" "2A281BF6"
+        "B3A739C1" "22611682" "0AE8DB58" "47A67CBE" "F9C9091B" "462D538C"
+        "D72B0374" "6AE77F5E" "62292C31" "1562A846" "505DC82D" "B854338A"
+        "E49F5235" "C95B9117" "8CCF2DD5" "CACEF403" "EC9D1810" "C6272B04"
+        "5B3B71F9" "DC6B80D6" "3FDD4A8E" "9ADB1E69" "62A69526" "D43161C1"
+        "A41D570D" "7938DAD4" "A40E329C" "D0E40E65" "FFFFFFFF" "FFFFFFFF",
+    list_to_integer(P, 16).
+
+
+%% ffdhe8192
+%% ---------
+%% The 8192-bit group has registry value 260 and is calculated from the
+%% following formula:
+%%
+%%   The modulus is:
+%%
+%%     p = 2^8192 - 2^8128 + {[2^8062 * e] + 10965728} * 2^64 - 1
+%%
+%%   The hexadecimal representation of p is:
+%%
+%%     FFFFFFFF FFFFFFFF ADF85458 A2BB4A9A AFDC5620 273D3CF1
+%%     D8B9C583 CE2D3695 A9E13641 146433FB CC939DCE 249B3EF9
+%%     7D2FE363 630C75D8 F681B202 AEC4617A D3DF1ED5 D5FD6561
+%%     2433F51F 5F066ED0 85636555 3DED1AF3 B557135E 7F57C935
+%%     984F0C70 E0E68B77 E2A689DA F3EFE872 1DF158A1 36ADE735
+%%     30ACCA4F 483A797A BC0AB182 B324FB61 D108A94B B2C8E3FB
+%%     B96ADAB7 60D7F468 1D4F42A3 DE394DF4 AE56EDE7 6372BB19
+%%     0B07A7C8 EE0A6D70 9E02FCE1 CDF7E2EC C03404CD 28342F61
+%%     9172FE9C E98583FF 8E4F1232 EEF28183 C3FE3B1B 4C6FAD73
+%%     3BB5FCBC 2EC22005 C58EF183 7D1683B2 C6F34A26 C1B2EFFA
+%%     886B4238 611FCFDC DE355B3B 6519035B BC34F4DE F99C0238
+%%     61B46FC9 D6E6C907 7AD91D26 91F7F7EE 598CB0FA C186D91C
+%%     AEFE1309 85139270 B4130C93 BC437944 F4FD4452 E2D74DD3
+%%     64F2E21E 71F54BFF 5CAE82AB 9C9DF69E E86D2BC5 22363A0D
+%%     ABC52197 9B0DEADA 1DBF9A42 D5C4484E 0ABCD06B FA53DDEF
+%%     3C1B20EE 3FD59D7C 25E41D2B 669E1EF1 6E6F52C3 164DF4FB
+%%     7930E9E4 E58857B6 AC7D5F42 D69F6D18 7763CF1D 55034004
+%%     87F55BA5 7E31CC7A 7135C886 EFB4318A ED6A1E01 2D9E6832
+%%     A907600A 918130C4 6DC778F9 71AD0038 092999A3 33CB8B7A
+%%     1A1DB93D 7140003C 2A4ECEA9 F98D0ACC 0A8291CD CEC97DCF
+%%     8EC9B55A 7F88A46B 4DB5A851 F44182E1 C68A007E 5E0DD902
+%%     0BFD64B6 45036C7A 4E677D2C 38532A3A 23BA4442 CAF53EA6
+%%     3BB45432 9B7624C8 917BDD64 B1C0FD4C B38E8C33 4C701C3A
+%%     CDAD0657 FCCFEC71 9B1F5C3E 4E46041F 388147FB 4CFDB477
+%%     A52471F7 A9A96910 B855322E DB6340D8 A00EF092 350511E3
+%%     0ABEC1FF F9E3A26E 7FB29F8C 183023C3 587E38DA 0077D9B4
+%%     763E4E4B 94B2BBC1 94C6651E 77CAF992 EEAAC023 2A281BF6
+%%     B3A739C1 22611682 0AE8DB58 47A67CBE F9C9091B 462D538C
+%%     D72B0374 6AE77F5E 62292C31 1562A846 505DC82D B854338A
+%%     E49F5235 C95B9117 8CCF2DD5 CACEF403 EC9D1810 C6272B04
+%%     5B3B71F9 DC6B80D6 3FDD4A8E 9ADB1E69 62A69526 D43161C1
+%%     A41D570D 7938DAD4 A40E329C CFF46AAA 36AD004C F600C838
+%%     1E425A31 D951AE64 FDB23FCE C9509D43 687FEB69 EDD1CC5E
+%%     0B8CC3BD F64B10EF 86B63142 A3AB8829 555B2F74 7C932665
+%%     CB2C0F1C C01BD702 29388839 D2AF05E4 54504AC7 8B758282
+%%     2846C0BA 35C35F5C 59160CC0 46FD8251 541FC68C 9C86B022
+%%     BB709987 6A460E74 51A8A931 09703FEE 1C217E6C 3826E52C
+%%     51AA691E 0E423CFC 99E9E316 50C1217B 624816CD AD9A95F9
+%%     D5B80194 88D9C0A0 A1FE3075 A577E231 83F81D4A 3F2FA457
+%%     1EFC8CE0 BA8A4FE8 B6855DFE 72B0A66E DED2FBAB FBE58A30
+%%     FAFABE1C 5D71A87E 2F741EF8 C1FE86FE A6BBFDE5 30677F0D
+%%     97D11D49 F7A8443D 0822E506 A9F4614E 011E2A94 838FF88C
+%%     D68C8BB7 C5C6424C FFFFFFFF FFFFFFFF
+%%
+%%   The generator is: g = 2
+%%
+%%   The group size is: q = (p-1)/2
+%%
+%% The estimated symmetric-equivalent strength of this group is 192
+%% bits.
+ffdhe8192_generator() ->
+    2.
+
+ffdhe8192_prime() ->
+    P = "FFFFFFFF" "FFFFFFFF" "ADF85458" "A2BB4A9A" "AFDC5620" "273D3CF1"
+        "D8B9C583" "CE2D3695" "A9E13641" "146433FB" "CC939DCE" "249B3EF9"
+        "7D2FE363" "630C75D8" "F681B202" "AEC4617A" "D3DF1ED5" "D5FD6561"
+        "2433F51F" "5F066ED0" "85636555" "3DED1AF3" "B557135E" "7F57C935"
+        "984F0C70" "E0E68B77" "E2A689DA" "F3EFE872" "1DF158A1" "36ADE735"
+        "30ACCA4F" "483A797A" "BC0AB182" "B324FB61" "D108A94B" "B2C8E3FB"
+        "B96ADAB7" "60D7F468" "1D4F42A3" "DE394DF4" "AE56EDE7" "6372BB19"
+        "0B07A7C8" "EE0A6D70" "9E02FCE1" "CDF7E2EC" "C03404CD" "28342F61"
+        "9172FE9C" "E98583FF" "8E4F1232" "EEF28183" "C3FE3B1B" "4C6FAD73"
+        "3BB5FCBC" "2EC22005" "C58EF183" "7D1683B2" "C6F34A26" "C1B2EFFA"
+        "886B4238" "611FCFDC" "DE355B3B" "6519035B" "BC34F4DE" "F99C0238"
+        "61B46FC9" "D6E6C907" "7AD91D26" "91F7F7EE" "598CB0FA" "C186D91C"
+        "AEFE1309" "85139270" "B4130C93" "BC437944" "F4FD4452" "E2D74DD3"
+        "64F2E21E" "71F54BFF" "5CAE82AB" "9C9DF69E" "E86D2BC5" "22363A0D"
+        "ABC52197" "9B0DEADA" "1DBF9A42" "D5C4484E" "0ABCD06B" "FA53DDEF"
+        "3C1B20EE" "3FD59D7C" "25E41D2B" "669E1EF1" "6E6F52C3" "164DF4FB"
+        "7930E9E4" "E58857B6" "AC7D5F42" "D69F6D18" "7763CF1D" "55034004"
+        "87F55BA5" "7E31CC7A" "7135C886" "EFB4318A" "ED6A1E01" "2D9E6832"
+        "A907600A" "918130C4" "6DC778F9" "71AD0038" "092999A3" "33CB8B7A"
+        "1A1DB93D" "7140003C" "2A4ECEA9" "F98D0ACC" "0A8291CD" "CEC97DCF"
+        "8EC9B55A" "7F88A46B" "4DB5A851" "F44182E1" "C68A007E" "5E0DD902"
+        "0BFD64B6" "45036C7A" "4E677D2C" "38532A3A" "23BA4442" "CAF53EA6"
+        "3BB45432" "9B7624C8" "917BDD64" "B1C0FD4C" "B38E8C33" "4C701C3A"
+        "CDAD0657" "FCCFEC71" "9B1F5C3E" "4E46041F" "388147FB" "4CFDB477"
+        "A52471F7" "A9A96910" "B855322E" "DB6340D8" "A00EF092" "350511E3"
+        "0ABEC1FF" "F9E3A26E" "7FB29F8C" "183023C3" "587E38DA" "0077D9B4"
+        "763E4E4B" "94B2BBC1" "94C6651E" "77CAF992" "EEAAC023" "2A281BF6"
+        "B3A739C1" "22611682" "0AE8DB58" "47A67CBE" "F9C9091B" "462D538C"
+        "D72B0374" "6AE77F5E" "62292C31" "1562A846" "505DC82D" "B854338A"
+        "E49F5235" "C95B9117" "8CCF2DD5" "CACEF403" "EC9D1810" "C6272B04"
+        "5B3B71F9" "DC6B80D6" "3FDD4A8E" "9ADB1E69" "62A69526" "D43161C1"
+        "A41D570D" "7938DAD4" "A40E329C" "CFF46AAA" "36AD004C" "F600C838"
+        "1E425A31" "D951AE64" "FDB23FCE" "C9509D43" "687FEB69" "EDD1CC5E"
+        "0B8CC3BD" "F64B10EF" "86B63142" "A3AB8829" "555B2F74" "7C932665"
+        "CB2C0F1C" "C01BD702" "29388839" "D2AF05E4" "54504AC7" "8B758282"
+        "2846C0BA" "35C35F5C" "59160CC0" "46FD8251" "541FC68C" "9C86B022"
+        "BB709987" "6A460E74" "51A8A931" "09703FEE" "1C217E6C" "3826E52C"
+        "51AA691E" "0E423CFC" "99E9E316" "50C1217B" "624816CD" "AD9A95F9"
+        "D5B80194" "88D9C0A0" "A1FE3075" "A577E231" "83F81D4A" "3F2FA457"
+        "1EFC8CE0" "BA8A4FE8" "B6855DFE" "72B0A66E" "DED2FBAB" "FBE58A30"
+        "FAFABE1C" "5D71A87E" "2F741EF8" "C1FE86FE" "A6BBFDE5" "30677F0D"
+        "97D11D49" "F7A8443D" "0822E506" "A9F4614E" "011E2A94" "838FF88C"
+        "D68C8BB7" "C5C6424C" "FFFFFFFF" "FFFFFFFF",
+    list_to_integer(P, 16).
+
+dh_params(ffdhe2048) ->
+    #'DHParameter'{
+       prime = ffdhe2048_prime(),
+       base = ffdhe2048_generator()};
+dh_params(ffdhe3072) ->
+    #'DHParameter'{
+       prime = ffdhe3072_prime(),
+       base = ffdhe3072_generator()};
+dh_params(ffdhe4096) ->
+    #'DHParameter'{
+       prime = ffdhe4096_prime(),
+       base = ffdhe4096_generator()};
+dh_params(ffdhe6144) ->
+    #'DHParameter'{
+       prime = ffdhe6144_prime(),
+       base = ffdhe6144_generator()};
+dh_params(ffdhe8192) ->
+    #'DHParameter'{
+       prime = ffdhe8192_prime(),
+       base = ffdhe8192_generator()}.
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index 14df1d2e02..bd2efa9fbb 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -30,6 +30,7 @@
 -include("ssl_alert.hrl").
 -include("ssl_internal.hrl").
 -include("ssl_srp.hrl").
+-include("tls_handshake_1_3.hrl").
 -include_lib("public_key/include/public_key.hrl").
 
 -export_type([ssl_handshake/0, ssl_handshake_history/0,
@@ -38,7 +39,7 @@
 -type oid()               :: tuple().
 -type public_key_params() :: #'Dss-Parms'{} |  {namedCurve, oid()} | #'ECParameters'{} | term().
 -type public_key_info()   :: {oid(), #'RSAPublicKey'{} | integer() | #'ECPoint'{}, public_key_params()}.
--type ssl_handshake_history() :: {[binary()], [binary()]}.
+-type ssl_handshake_history() :: {iodata(), iodata()}.
 
 -type ssl_handshake() :: #server_hello{} | #server_hello_done{} | #certificate{} | #certificate_request{} |
 			 #client_key_exchange{} | #finished{} | #certificate_verify{} |
@@ -53,14 +54,14 @@
 -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/2, verify_server_key/5,
-         select_version/3, extension_value/1
+         select_version/3, select_supported_version/2, extension_value/1
 	]).
 
 %% Encode
--export([encode_handshake/2, encode_hello_extensions/1,
+-export([encode_handshake/2, encode_hello_extensions/2, encode_extensions/1, encode_extensions/2,
 	 encode_client_protocol_negotiation/2, encode_protocols_advertised_on_server/1]).
 %% Decode
--export([decode_handshake/3, decode_hello_extensions/1,
+-export([decode_handshake/3, decode_vector/1, decode_hello_extensions/4, decode_extensions/3,
 	 decode_server_key/3, decode_client_key/3,
 	 decode_suites/2
 	]).
@@ -71,13 +72,19 @@
          premaster_secret/2, premaster_secret/3, premaster_secret/4]).
 
 %% Extensions handling
--export([client_hello_extensions/5,
+-export([client_hello_extensions/6,
 	 handle_client_hello_extensions/9, %% Returns server hello extensions
 	 handle_server_hello_extensions/9, select_curve/2, select_curve/3,
          select_hashsign/4, select_hashsign/5,
-	 select_hashsign_algs/3
+	 select_hashsign_algs/3, empty_extensions/2, add_server_share/3,
+	 add_alpn/2, add_selected_version/1, decode_alpn/1
 	]).
 
+-export([get_cert_params/1,
+         server_name/3,
+         validation_fun_and_state/9,
+         handle_path_validation_error/7]).
+
 %%====================================================================
 %% Create handshake messages 
 %%====================================================================
@@ -92,8 +99,8 @@ hello_request() ->
     #hello_request{}.
 
 %%--------------------------------------------------------------------
--spec server_hello(#session{}, ssl_record:ssl_version(), ssl_record:connection_states(),
-		   #hello_extensions{}) -> #server_hello{}.
+%%-spec server_hello(binary(), ssl_record:ssl_version(), ssl_record:connection_states(),
+%%		   Extension::map()) -> #server_hello{}.
 %%
 %% Description: Creates a server hello message.
 %%--------------------------------------------------------------------
@@ -176,7 +183,7 @@ client_certificate_verify(OwnCert, MasterSecret, Version,
 %% Description: Creates a certificate_request message, called by the server.
 %%--------------------------------------------------------------------
 certificate_request(CipherSuite, CertDbHandle, CertDbRef, HashSigns, Version) ->
-    Types = certificate_types(ssl_cipher_format:suite_definition(CipherSuite), Version),
+    Types = certificate_types(ssl_cipher_format:suite_bin_to_map(CipherSuite), Version),
     Authorities = certificate_authorities(CertDbHandle, CertDbRef),
     #certificate_request{
 		    certificate_types = Types,
@@ -357,7 +364,7 @@ certify(#certificate{asn1_certificates = ASN1Certs}, CertDbHandle, CertDbRef,
                                              CertDbHandle, CertDbRef)
 	end
     catch
-	error:{badmatch,{asn1, Asn1Reason}} ->
+	error:{badmatch,{error, {asn1, Asn1Reason}}} ->
 	    %% ASN-1 decode of certificate somehow failed
             ?ALERT_REC(?FATAL, ?CERTIFICATE_UNKNOWN, {failed_to_decode_certificate, Asn1Reason});
         error:OtherReason ->
@@ -504,6 +511,21 @@ verify_server_key(#server_key_params{params_bin = EncParams,
 select_version(RecordCB, ClientVersion, Versions) ->
     do_select_version(RecordCB, ClientVersion, Versions).
 
+
+%% Called by TLS 1.2/1.3 Server when "supported_versions" is present
+%% in ClientHello.
+%% Input lists are ordered (highest first)
+select_supported_version([], _ServerVersions) ->
+    undefined;
+select_supported_version([ClientVersion|T], ServerVersions) ->
+    case lists:member(ClientVersion, ServerVersions) of
+        true ->
+            ClientVersion;
+        false ->
+            select_supported_version(T, ServerVersions)
+    end.
+
+
 %%====================================================================
 %% Encode handshake 
 %%====================================================================
@@ -512,14 +534,14 @@ 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},
+encode_handshake(#server_hello{server_version = {Major, Minor} = Version,
 			       random = Random,
 			       session_id = Session_ID,
 			       cipher_suite = CipherSuite,
 			       compression_method = Comp_method,
-			       extensions = #hello_extensions{} = Extensions}, _Version) ->
+			       extensions = Extensions}, _Version) ->
 			SID_length = byte_size(Session_ID),
-    ExtensionsBin = encode_hello_extensions(Extensions),
+    ExtensionsBin = encode_hello_extensions(Extensions, Version),
     {?SERVER_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
 		     ?BYTE(SID_length), Session_ID/binary,
                      CipherSuite/binary, ?BYTE(Comp_method), ExtensionsBin/binary>>};
@@ -567,71 +589,146 @@ encode_handshake(#certificate_verify{signature = BinSig, hashsign_algorithm = Ha
 encode_handshake(#finished{verify_data = VerifyData}, _Version) ->
     {?FINISHED, VerifyData}.
 
-encode_hello_extensions(#hello_extensions{} = Extensions) ->
-    encode_hello_extensions(hello_extensions_list(Extensions), <<>>).
-encode_hello_extensions([], <<>>) ->
+encode_hello_extensions(_, {3, 0}) ->
     <<>>;
-encode_hello_extensions([], Acc) ->
+encode_hello_extensions(Extensions, _) ->
+    encode_extensions(hello_extensions_list(Extensions), <<>>).
+
+encode_extensions(Exts) ->
+    encode_extensions(Exts, <<>>).
+    
+encode_extensions([], <<>>) ->
+    <<?UINT16(0)>>;
+encode_extensions([], Acc) ->
     Size = byte_size(Acc),
     <<?UINT16(Size), Acc/binary>>;
-
-encode_hello_extensions([#alpn{extension_data = ExtensionData} | Rest], Acc) ->
-	Len = byte_size(ExtensionData),
+encode_extensions([#alpn{extension_data = ExtensionData} | Rest], Acc) ->
+    Len = byte_size(ExtensionData),
     ExtLen = Len + 2,
-	encode_hello_extensions(Rest, <<?UINT16(?ALPN_EXT), ?UINT16(ExtLen), ?UINT16(Len),
-					ExtensionData/binary, Acc/binary>>);
-encode_hello_extensions([#next_protocol_negotiation{extension_data = ExtensionData} | Rest], Acc) ->
+    encode_extensions(Rest, <<?UINT16(?ALPN_EXT), ?UINT16(ExtLen), ?UINT16(Len),
+                              ExtensionData/binary, Acc/binary>>);
+encode_extensions([#next_protocol_negotiation{extension_data = ExtensionData} | Rest], Acc) ->
     Len = byte_size(ExtensionData),
-    encode_hello_extensions(Rest, <<?UINT16(?NEXTPROTONEG_EXT), ?UINT16(Len),
+    encode_extensions(Rest, <<?UINT16(?NEXTPROTONEG_EXT), ?UINT16(Len),
 				    ExtensionData/binary, Acc/binary>>);
-encode_hello_extensions([#renegotiation_info{renegotiated_connection = undefined} | Rest], Acc) ->
-    encode_hello_extensions(Rest, Acc);
-encode_hello_extensions([#renegotiation_info{renegotiated_connection = ?byte(0) = Info} | Rest], Acc) ->
+encode_extensions([#renegotiation_info{renegotiated_connection = undefined} | Rest], Acc) ->
+    encode_extensions(Rest, Acc);
+encode_extensions([#renegotiation_info{renegotiated_connection = ?byte(0) = Info} | Rest], Acc) ->
     Len = byte_size(Info),
-    encode_hello_extensions(Rest, <<?UINT16(?RENEGOTIATION_EXT), ?UINT16(Len), Info/binary, Acc/binary>>);
+    encode_extensions(Rest, <<?UINT16(?RENEGOTIATION_EXT), ?UINT16(Len), Info/binary, Acc/binary>>);
 
-encode_hello_extensions([#renegotiation_info{renegotiated_connection = Info} | Rest], Acc) ->
+encode_extensions([#renegotiation_info{renegotiated_connection = Info} | Rest], Acc) ->
     InfoLen = byte_size(Info),
     Len = InfoLen +1,
-    encode_hello_extensions(Rest, <<?UINT16(?RENEGOTIATION_EXT), ?UINT16(Len), ?BYTE(InfoLen),
+    encode_extensions(Rest, <<?UINT16(?RENEGOTIATION_EXT), ?UINT16(Len), ?BYTE(InfoLen),
 				    Info/binary, Acc/binary>>);
-encode_hello_extensions([#elliptic_curves{elliptic_curve_list = EllipticCurves} | Rest], Acc) ->
+encode_extensions([#elliptic_curves{elliptic_curve_list = EllipticCurves} | Rest], Acc) ->
 
     EllipticCurveList = << <<(tls_v1:oid_to_enum(X)):16>> || X <- EllipticCurves>>,
     ListLen = byte_size(EllipticCurveList),
     Len = ListLen + 2,
-    encode_hello_extensions(Rest, <<?UINT16(?ELLIPTIC_CURVES_EXT),
+    encode_extensions(Rest, <<?UINT16(?ELLIPTIC_CURVES_EXT),
 				 ?UINT16(Len), ?UINT16(ListLen), EllipticCurveList/binary, Acc/binary>>);
-encode_hello_extensions([#ec_point_formats{ec_point_format_list = ECPointFormats} | Rest], Acc) ->
+encode_extensions([#supported_groups{supported_groups = SupportedGroups} | Rest], Acc) ->
+
+    SupportedGroupList = << <<(tls_v1:group_to_enum(X)):16>> || X <- SupportedGroups>>,
+    ListLen = byte_size(SupportedGroupList),
+    Len = ListLen + 2,
+    encode_extensions(Rest, <<?UINT16(?ELLIPTIC_CURVES_EXT),
+                              ?UINT16(Len), ?UINT16(ListLen), 
+                              SupportedGroupList/binary, Acc/binary>>);
+encode_extensions([#ec_point_formats{ec_point_format_list = ECPointFormats} | Rest], Acc) ->
     ECPointFormatList = list_to_binary(ECPointFormats),
     ListLen = byte_size(ECPointFormatList),
     Len = ListLen + 1,
-    encode_hello_extensions(Rest, <<?UINT16(?EC_POINT_FORMATS_EXT),
+    encode_extensions(Rest, <<?UINT16(?EC_POINT_FORMATS_EXT),
 				 ?UINT16(Len), ?BYTE(ListLen), ECPointFormatList/binary, Acc/binary>>);
-encode_hello_extensions([#srp{username = UserName} | Rest], Acc) ->
+encode_extensions([#srp{username = UserName} | Rest], Acc) ->
     SRPLen = byte_size(UserName),
-    Len = SRPLen + 2,
-    encode_hello_extensions(Rest, <<?UINT16(?SRP_EXT), ?UINT16(Len), ?BYTE(SRPLen),
+    Len = SRPLen + 1,
+    encode_extensions(Rest, <<?UINT16(?SRP_EXT), ?UINT16(Len), ?BYTE(SRPLen),
 				    UserName/binary, Acc/binary>>);
-encode_hello_extensions([#hash_sign_algos{hash_sign_algos = HashSignAlgos} | Rest], Acc) ->
+encode_extensions([#hash_sign_algos{hash_sign_algos = HashSignAlgos} | Rest], Acc) ->
     SignAlgoList = << <<(ssl_cipher:hash_algorithm(Hash)):8, (ssl_cipher:sign_algorithm(Sign)):8>> ||
 		       {Hash, Sign} <- HashSignAlgos >>,
     ListLen = byte_size(SignAlgoList),
     Len = ListLen + 2,
-    encode_hello_extensions(Rest, <<?UINT16(?SIGNATURE_ALGORITHMS_EXT),
+    encode_extensions(Rest, <<?UINT16(?SIGNATURE_ALGORITHMS_EXT),
 				 ?UINT16(Len), ?UINT16(ListLen), SignAlgoList/binary, Acc/binary>>);
-encode_hello_extensions([#sni{hostname = Hostname} | Rest], Acc) ->
+encode_extensions([#signature_algorithms{
+                            signature_scheme_list = SignatureSchemes} | Rest], Acc) ->
+    SignSchemeList = << <<(ssl_cipher:signature_scheme(SignatureScheme)):16 >> ||
+		       SignatureScheme <- SignatureSchemes >>,
+    ListLen = byte_size(SignSchemeList),
+    Len = ListLen + 2,
+    encode_extensions(Rest, <<?UINT16(?SIGNATURE_ALGORITHMS_EXT),
+				 ?UINT16(Len), ?UINT16(ListLen), SignSchemeList/binary, Acc/binary>>);
+encode_extensions([#signature_algorithms_cert{
+                            signature_scheme_list = SignatureSchemes} | Rest], Acc) ->
+    SignSchemeList = << <<(ssl_cipher:signature_scheme(SignatureScheme)):16 >> ||
+		       SignatureScheme <- SignatureSchemes >>,
+    ListLen = byte_size(SignSchemeList),
+    Len = ListLen + 2,
+    encode_extensions(Rest, <<?UINT16(?SIGNATURE_ALGORITHMS_CERT_EXT),
+				 ?UINT16(Len), ?UINT16(ListLen), SignSchemeList/binary, Acc/binary>>);
+encode_extensions([#sni{hostname = Hostname} | Rest], Acc) ->
     HostLen = length(Hostname),
     HostnameBin = list_to_binary(Hostname),
     % Hostname type (1 byte) + Hostname length (2 bytes) + Hostname (HostLen bytes)
     ServerNameLength = 1 + 2 + HostLen,
     % ServerNameListSize (2 bytes) + ServerNameLength
     ExtLength = 2 + ServerNameLength,
-    encode_hello_extensions(Rest, <<?UINT16(?SNI_EXT), ?UINT16(ExtLength),
-				    ?UINT16(ServerNameLength),
-				    ?BYTE(?SNI_NAMETYPE_HOST_NAME),
-				    ?UINT16(HostLen), HostnameBin/binary,
-				    Acc/binary>>).
+    encode_extensions(Rest, <<?UINT16(?SNI_EXT), ?UINT16(ExtLength),
+                              ?UINT16(ServerNameLength),
+                              ?BYTE(?SNI_NAMETYPE_HOST_NAME),
+                              ?UINT16(HostLen), HostnameBin/binary,
+                              Acc/binary>>);
+encode_extensions([#client_hello_versions{versions = Versions0} | Rest], Acc) ->
+    Versions = encode_versions(Versions0),
+    VerLen = byte_size(Versions),
+    Len = VerLen + 1,
+    encode_extensions(Rest, <<?UINT16(?SUPPORTED_VERSIONS_EXT),
+                              ?UINT16(Len), ?BYTE(VerLen), Versions/binary, Acc/binary>>);
+encode_extensions([#server_hello_selected_version{selected_version = Version0} | Rest], Acc) ->
+    Version = encode_versions([Version0]),
+    Len = byte_size(Version), %% 2
+    encode_extensions(Rest, <<?UINT16(?SUPPORTED_VERSIONS_EXT),
+                              ?UINT16(Len), Version/binary, Acc/binary>>);
+encode_extensions([#key_share_client_hello{client_shares = ClientShares0} | Rest], Acc) ->
+    ClientShares = encode_client_shares(ClientShares0),
+    ClientSharesLen = byte_size(ClientShares),
+    Len = ClientSharesLen + 2,
+    encode_extensions(Rest, <<?UINT16(?KEY_SHARE_EXT),
+                              ?UINT16(Len), ?UINT16(ClientSharesLen),
+                              ClientShares/binary, Acc/binary>>);
+encode_extensions([#key_share_server_hello{server_share = ServerShare0} | Rest], Acc) ->
+    ServerShare = encode_key_share_entry(ServerShare0),
+    Len = byte_size(ServerShare),
+    encode_extensions(Rest, <<?UINT16(?KEY_SHARE_EXT),
+                              ?UINT16(Len), ServerShare/binary, Acc/binary>>);
+encode_extensions([#key_share_hello_retry_request{selected_group = Group0} | Rest], Acc) ->
+    Group = tls_v1:group_to_enum(Group0),
+    encode_extensions(Rest, <<?UINT16(?KEY_SHARE_EXT),
+                              ?UINT16(2), ?UINT16(Group), Acc/binary>>);
+encode_extensions([#psk_key_exchange_modes{ke_modes = KEModes0} | Rest], Acc) ->
+    KEModes = encode_psk_key_exchange_modes(KEModes0),
+    KEModesLen = byte_size(KEModes),
+    ExtLen = KEModesLen + 1,
+    encode_extensions(Rest, <<?UINT16(?PSK_KEY_EXCHANGE_MODES_EXT),
+                              ?UINT16(ExtLen), ?BYTE(KEModesLen), KEModes/binary, Acc/binary>>);
+encode_extensions([#pre_shared_key_client_hello{
+                      offered_psks = #offered_psks{
+                                        identities = Identities0,
+                                        binders = Binders0} = PSKs} | Rest], Acc) ->
+    Identities = encode_psk_identities(Identities0),
+    Binders = encode_psk_binders(Binders0),
+    Len = byte_size(Identities) + byte_size(Binders),
+    encode_extensions(Rest, <<?UINT16(?PRE_SHARED_KEY_EXT),
+                              ?UINT16(Len), Identities/binary, Binders/binary, Acc/binary>>);
+encode_extensions([#pre_shared_key_server_hello{selected_identity = Identity} | Rest], Acc) ->
+    encode_extensions(Rest, <<?UINT16(?PRE_SHARED_KEY_EXT),
+                              ?UINT16(2), ?UINT16(Identity), Acc/binary>>).
+
 
 encode_client_protocol_negotiation(undefined, _) ->
     undefined;
@@ -657,7 +754,7 @@ decode_handshake(_, ?NEXT_PROTOCOL, <<?BYTE(SelectedProtocolLength),
 				      ?BYTE(PaddingLength), _Padding:PaddingLength/binary>>) ->
     #next_protocol{selected_protocol = SelectedProtocol};
 
-decode_handshake(_Version, ?SERVER_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
+decode_handshake(Version, ?SERVER_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
 					    ?BYTE(SID_length), Session_ID:SID_length/binary,
 					    Cipher_suite:2/binary, ?BYTE(Comp_method)>>) ->
     #server_hello{
@@ -666,14 +763,13 @@ decode_handshake(_Version, ?SERVER_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:3
        session_id = Session_ID,
        cipher_suite = Cipher_suite,
        compression_method = Comp_method,
-       extensions = #hello_extensions{}};
+       extensions = empty_extensions(Version, server_hello)};
 
-decode_handshake(_Version, ?SERVER_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
+decode_handshake(Version, ?SERVER_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
 		       ?BYTE(SID_length), Session_ID:SID_length/binary,
 		       Cipher_suite:2/binary, ?BYTE(Comp_method),
 		       ?UINT16(ExtLen), Extensions:ExtLen/binary>>) ->
-
-    HelloExtensions = decode_hello_extensions(Extensions),
+    HelloExtensions = decode_hello_extensions(Extensions, Version, {Major, Minor}, server_hello),
 
     #server_hello{
        server_version = {Major,Minor},
@@ -716,20 +812,52 @@ decode_handshake(_Version, ?FINISHED, VerifyData) ->
 decode_handshake(_, Message, _) ->
     throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, {unknown_or_malformed_handshake, Message})).
 
+
 %%--------------------------------------------------------------------
--spec decode_hello_extensions({client, binary()} | binary()) -> #hello_extensions{}.
+-spec decode_vector(binary()) -> binary().
+%%
+%% Description: Remove length tag from TLS Vector type. Needed
+%% for client hello when extensions in older versions may be empty.
+%% 
+%%--------------------------------------------------------------------
+decode_vector(<<>>) ->
+    <<>>;
+decode_vector(<<?UINT16(Len), Vector:Len/binary>>) ->
+    Vector.
+
+%%--------------------------------------------------------------------
+-spec decode_hello_extensions(binary(), ssl_record:ssl_version(),
+                              ssl_record:ssl_version(), atom()) -> map().
+%%
+%% Description: Decodes TLS hello extensions
+%%--------------------------------------------------------------------
+decode_hello_extensions(Extensions, LocalVersion, LegacyVersion, MessageType0) ->
+    %% Convert legacy atoms
+    MessageType =
+        case MessageType0 of
+            client -> client_hello;
+            server -> server_hello;
+            T -> T
+        end,
+    %% RFC 8446 - 4.2.1
+    %% Servers MUST be prepared to receive ClientHellos that include this extension but
+    %% do not include 0x0304 in the list of versions.
+    %% Clients MUST check for this extension prior to processing the rest of the
+    %% ServerHello (although they will have to parse the ServerHello in order to read
+    %% the extension).
+    Version = process_supported_versions_extension(Extensions, LocalVersion, LegacyVersion),
+    decode_extensions(Extensions, Version, MessageType, empty_extensions(Version, MessageType)).
+
+%%--------------------------------------------------------------------
+-spec decode_extensions(binary(),tuple(), atom()) -> map().
 %%
 %% Description: Decodes TLS hello extensions
 %%--------------------------------------------------------------------
-decode_hello_extensions({client, <<>>}) ->
-    #hello_extensions{};
-decode_hello_extensions({client, <<?UINT16(ExtLen), Extensions:ExtLen/binary>>}) ->
-    decode_hello_extensions(Extensions);
-decode_hello_extensions(Extensions) ->
-    dec_hello_extensions(Extensions, #hello_extensions{}).
+decode_extensions(Extensions, Version, MessageType) ->
+    decode_extensions(Extensions, Version, MessageType, empty_extensions()).
 
 %%--------------------------------------------------------------------
--spec decode_server_key(binary(), ssl_cipher_format:key_algo(), ssl_record:ssl_version()) ->
+-spec decode_server_key(binary(), ssl:kex_algo(), ssl_record:ssl_version()) ->
 			       #server_key_params{}.
 %%
 %% Description: Decode server_key data and return appropriate type
@@ -738,7 +866,7 @@ decode_server_key(ServerKey, Type, Version) ->
     dec_server_key(ServerKey, key_exchange_alg(Type), Version).
 
 %%--------------------------------------------------------------------
--spec decode_client_key(binary(), ssl_cipher_format:key_algo(), ssl_record:ssl_version()) ->
+-spec decode_client_key(binary(), ssl:kex_algo(), ssl_record:ssl_version()) ->
 			    #encrypted_premaster_secret{}
 			    | #client_diffie_hellman_public{}
 			    | #client_ec_diffie_hellman_public{}
@@ -776,7 +904,7 @@ available_suites(ServerCert, UserSuites, Version, undefined, Curve) ->
     filter_unavailable_ecc_suites(Curve, Suites);
 available_suites(ServerCert, UserSuites, Version, HashSigns, Curve) ->
     Suites = available_suites(ServerCert, UserSuites, Version, undefined, Curve),
-    filter_hashsigns(Suites, [ssl_cipher_format:suite_definition(Suite) || Suite <- Suites], HashSigns, 
+    filter_hashsigns(Suites, [ssl_cipher_format:suite_bin_to_map(Suite) || Suite <- Suites], HashSigns, 
                      Version, []).
 
 available_signature_algs(undefined, _)  ->
@@ -936,98 +1064,224 @@ premaster_secret(EncSecret, #{algorithm := rsa} = Engine) ->
 %%====================================================================
 %% 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_format:suite_definition/1, CipherSuites)) of
-	    true ->
-		client_ecc_extensions(SupportedECCs);
-	    false ->
-		{undefined, undefined}
-	end,
+client_hello_extensions(Version, CipherSuites, SslOpts, ConnectionStates, Renegotiation, KeyShare) ->
+    HelloExtensions0 = add_tls12_extensions(Version, SslOpts, ConnectionStates, Renegotiation),
+    HelloExtensions1 = add_common_extensions(Version, HelloExtensions0, CipherSuites, SslOpts),
+    maybe_add_tls13_extensions(Version, HelloExtensions1, SslOpts, KeyShare).
+
+
+add_tls12_extensions(_Version,
+                     SslOpts,
+                     ConnectionStates,
+                     Renegotiation) ->
     SRP = srp_user(SslOpts),
+    #{renegotiation_info => renegotiation_info(tls_record, client,
+                                               ConnectionStates, Renegotiation),
+      srp => SRP,
+      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)
+     }.
+
+
+add_common_extensions({3,4},
+                      HelloExtensions,
+                      _CipherSuites,
+                      #ssl_options{eccs = SupportedECCs,
+                                   supported_groups = Groups,
+                                   signature_algs = SignatureSchemes}) ->
+    {EcPointFormats, _} =
+        client_ecc_extensions(SupportedECCs),
+    HelloExtensions#{ec_point_formats => EcPointFormats,
+                     elliptic_curves => Groups,
+                     signature_algs => signature_algs_ext(SignatureSchemes)};
+
+add_common_extensions(Version,
+                      HelloExtensions,
+                      CipherSuites,
+                      #ssl_options{eccs = SupportedECCs,
+                                   signature_algs = SupportedHashSigns}) ->
 
-    #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)}.
+    {EcPointFormats, EllipticCurves} =
+        case advertises_ec_ciphers(
+               lists:map(fun ssl_cipher_format:suite_bin_to_map/1,
+                         CipherSuites)) of
+            true ->
+                client_ecc_extensions(SupportedECCs);
+            false ->
+                {undefined, undefined}
+        end,
+    HelloExtensions#{ec_point_formats => EcPointFormats,
+                     elliptic_curves => EllipticCurves,
+                     signature_algs => available_signature_algs(SupportedHashSigns, Version)}.
+
+
+maybe_add_tls13_extensions({3,4},
+                           HelloExtensions0,
+                           #ssl_options{signature_algs_cert = SignatureSchemes,
+                                        versions = SupportedVersions},
+                           KeyShare) ->
+    HelloExtensions =
+        HelloExtensions0#{client_hello_versions =>
+                              #client_hello_versions{versions = SupportedVersions},
+                          signature_algs_cert =>
+                              signature_algs_cert(SignatureSchemes)},
+    maybe_add_key_share(HelloExtensions, KeyShare);
+maybe_add_tls13_extensions(_, HelloExtensions, _, _) ->
+    HelloExtensions.
+
+
+%% TODO: Add support for PSK key establishment
+
+%% RFC 8446 (TLS 1.3) - 4.2.8.  Key Share
+%%
+%% 4.2.8.1.  Diffie-Hellman Parameters
+%% Diffie-Hellman [DH76] parameters for both clients and servers are
+%% encoded in the opaque key_exchange field of a KeyShareEntry in a
+%% KeyShare structure.  The opaque value contains the Diffie-Hellman
+%% public value (Y = g^X mod p) for the specified group (see [RFC7919]
+%% for group definitions) encoded as a big-endian integer and padded to
+%% the left with zeros to the size of p in bytes.
+%%
+%% 4.2.8.2.  ECDHE Parameters
+%%
+%% ECDHE parameters for both clients and servers are encoded in the
+%% opaque key_exchange field of a KeyShareEntry in a KeyShare structure.
+%%
+%% For secp256r1, secp384r1, and secp521r1, the contents are the
+%% serialized value of the following struct:
+%%
+%%    struct {
+%%        uint8 legacy_form = 4;
+%%        opaque X[coordinate_length];
+%%        opaque Y[coordinate_length];
+%%    } UncompressedPointRepresentation;
+%%
+%% X and Y, respectively, are the binary representations of the x and y
+%% values in network byte order.  There are no internal length markers,
+%% so each number representation occupies as many octets as implied by
+%% the curve parameters.  For P-256, this means that each of X and Y use
+%% 32 octets, padded on the left by zeros if necessary.  For P-384, they
+%% take 48 octets each.  For P-521, they take 66 octets each.
+maybe_add_key_share(HelloExtensions, undefined) ->
+    HelloExtensions;
+maybe_add_key_share(HelloExtensions, KeyShare) ->
+    #key_share_client_hello{client_shares = ClientShares0} = KeyShare,
+    %% Keep only public keys
+    ClientShares = lists:map(fun kse_remove_private_key/1, ClientShares0),
+    HelloExtensions#{key_share => #key_share_client_hello{
+                                     client_shares = ClientShares}}.
+
+add_server_share(server_hello, Extensions, KeyShare) ->
+    #key_share_server_hello{server_share = ServerShare0} = KeyShare,
+    %% Keep only public keys
+    ServerShare = kse_remove_private_key(ServerShare0),
+    Extensions#{key_share => #key_share_server_hello{
+                                server_share = ServerShare}};
+add_server_share(hello_retry_request, Extensions,
+                 #key_share_server_hello{
+                    server_share = #key_share_entry{group = Group}}) ->
+    Extensions#{key_share => #key_share_hello_retry_request{
+                                selected_group = Group}}.
+
+add_alpn(Extensions, ALPN0) ->
+    ALPN = encode_alpn([ALPN0], false),
+    Extensions#{alpn => ALPN}.
+
+add_selected_version(Extensions) ->
+    SupportedVersions = #server_hello_selected_version{selected_version = {3,4}},
+    Extensions#{server_hello_selected_version => SupportedVersions}.
+
+kse_remove_private_key(#key_share_entry{
+                      group = Group,
+                      key_exchange =
+                          #'ECPrivateKey'{publicKey = PublicKey}}) ->
+    #key_share_entry{
+       group = Group,
+       key_exchange = PublicKey};
+kse_remove_private_key(#key_share_entry{
+                      group = Group,
+                      key_exchange =
+                          {PublicKey, _}}) ->
+    #key_share_entry{
+       group = Group,
+       key_exchange = PublicKey}.
+
+signature_algs_ext(undefined) ->
+    undefined;
+signature_algs_ext(SignatureSchemes0) ->
+    %% The SSL option signature_algs contains both hash-sign algorithms (tuples) and
+    %% signature schemes (atoms) if TLS 1.3 is configured.
+    #signature_algorithms{signature_scheme_list = SignatureSchemes0}.
+
+signature_algs_cert(undefined) ->
+    undefined;
+signature_algs_cert(SignatureSchemes) ->
+    #signature_algorithms_cert{signature_scheme_list = SignatureSchemes}.
 
 handle_client_hello_extensions(RecordCB, Random, ClientCipherSuites,
-			       #hello_extensions{renegotiation_info = Info,
-						 srp = SRP,
-						 ec_point_formats = ECCFormat,
-						 alpn = ALPN,
-						 next_protocol_negotiation = NextProtocolNegotiation}, Version,
+                               Exts, Version,
 			       #ssl_options{secure_renegotiate = SecureRenegotation,
                                             alpn_preferred_protocols = ALPNPreferredProtocols} = Opts,
 			       #session{cipher_suite = NegotiatedCipherSuite,
 					compression_method = Compression} = Session0,
 			       ConnectionStates0, Renegotiation) ->
-    Session = handle_srp_extension(SRP, Session0),
-    ConnectionStates = handle_renegotiation_extension(server, RecordCB, Version, Info,
+    Session = handle_srp_extension(maps:get(srp, Exts, undefined), Session0),
+    ConnectionStates = handle_renegotiation_extension(server, RecordCB, Version, maps:get(renegotiation_info, Exts, undefined),
 						      Random, NegotiatedCipherSuite, 
 						      ClientCipherSuites, Compression,
 						      ConnectionStates0, Renegotiation, SecureRenegotation),
 
-    ServerHelloExtensions =  #hello_extensions{
-				renegotiation_info = renegotiation_info(RecordCB, server,
-									ConnectionStates, Renegotiation),
-				ec_point_formats = server_ecc_extension(Version, ECCFormat)
-			       },
-
+    Empty = empty_extensions(Version, server_hello),
+    ServerHelloExtensions = Empty#{renegotiation_info => renegotiation_info(RecordCB, server,
+                                                                            ConnectionStates, Renegotiation),
+                                   ec_point_formats => server_ecc_extension(Version, 
+                                                                            maps:get(ec_point_formats, Exts, undefined))
+                                  },
+    
     %% If we receive an ALPN extension and have ALPN configured for this connection,
     %% we handle it. Otherwise we check for the NPN extension.
+    ALPN = maps:get(alpn, Exts, undefined),
     if
         ALPN =/= undefined, ALPNPreferredProtocols =/= undefined ->
-			case handle_alpn_extension(ALPNPreferredProtocols, decode_alpn(ALPN)) of
-                #alert{} = Alert ->
-                    Alert;
-                Protocol ->
-                    {Session, ConnectionStates, Protocol,
-                        ServerHelloExtensions#hello_extensions{alpn=encode_alpn([Protocol], Renegotiation)}}
-            end;
+            Protocol = handle_alpn_extension(ALPNPreferredProtocols, decode_alpn(ALPN)),
+            {Session, ConnectionStates, Protocol,
+             ServerHelloExtensions#{alpn => encode_alpn([Protocol], Renegotiation)}};
         true ->
+            NextProtocolNegotiation = maps:get(next_protocol_negotiation, Exts, undefined),
             ProtocolsToAdvertise = handle_next_protocol_extension(NextProtocolNegotiation, Renegotiation, Opts),
             {Session, ConnectionStates, undefined,
-				ServerHelloExtensions#hello_extensions{next_protocol_negotiation=
-                	encode_protocols_advertised_on_server(ProtocolsToAdvertise)}}
+             ServerHelloExtensions#{next_protocol_negotiation =>
+                                        encode_protocols_advertised_on_server(ProtocolsToAdvertise)}}
     end.
 
 handle_server_hello_extensions(RecordCB, Random, CipherSuite, Compression,
-			       #hello_extensions{renegotiation_info = Info,
-                                                 alpn = ALPN,
-						 next_protocol_negotiation = NextProtocolNegotiation}, Version,
+                               Exts, Version,
 			       #ssl_options{secure_renegotiate = SecureRenegotation,
 					    next_protocol_selector = NextProtoSelector},
 			       ConnectionStates0, Renegotiation) ->
-    ConnectionStates = handle_renegotiation_extension(client, RecordCB, Version, Info, Random, 
+    ConnectionStates = handle_renegotiation_extension(client, RecordCB, Version,  
+                                                      maps:get(renegotiation_info, Exts, undefined), Random, 
 						      CipherSuite, undefined,
 						      Compression, ConnectionStates0,
 						      Renegotiation, SecureRenegotation),
 
     %% If we receive an ALPN extension then this is the protocol selected,
     %% otherwise handle the NPN extension.
+    ALPN = maps:get(alpn, Exts, undefined),
     case decode_alpn(ALPN) of
         %% ServerHello contains exactly one protocol: the one selected.
         %% We also ignore the ALPN extension during renegotiation (see encode_alpn/2).
         [Protocol] when not Renegotiation ->
             {ConnectionStates, alpn, Protocol};
+        [_] when Renegotiation ->
+            {ConnectionStates, alpn, undefined};
         undefined ->
-            case handle_next_protocol(NextProtocolNegotiation, NextProtoSelector, Renegotiation) of
-                #alert{} = Alert ->
-                    Alert;
-                Protocol ->
-                    {ConnectionStates, npn, Protocol}
-            end;
+            NextProtocolNegotiation = maps:get(next_protocol_negotiation, Exts, undefined),
+            Protocol = handle_next_protocol(NextProtocolNegotiation, NextProtoSelector, Renegotiation),
+            {ConnectionStates, npn, Protocol};
         {error, Reason} ->
             ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, Reason);
         [] ->
@@ -1070,26 +1324,50 @@ select_hashsign(_, _, KeyExAlgo, _, _Version) when KeyExAlgo == dh_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} = public_key:pkix_decode_cert(Cert, otp),
-    #'OTPSubjectPublicKeyInfo'{algorithm = {_, SubjAlgo, _}} = 
-     	TBSCert#'OTPTBSCertificate'.subjectPublicKeyInfo,
-
-    SubSign = sign_algo(SubjAlgo),
-    
-    case lists:filter(fun({_, S} = Algos) when S == SubSign ->
-			      is_acceptable_hash_sign(Algos, KeyExAlgo, SupportedHashSigns);
-			 (_)  ->
-			      false
-		      end, HashSigns) of
-	[] ->
-            ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, no_suitable_signature_algorithm);
-	[HashSign | _] ->
-	    HashSign
+select_hashsign({ClientHashSigns, ClientSignatureSchemes},
+                Cert, KeyExAlgo, undefined, {Major, Minor} = Version)
+  when Major >= 3 andalso Minor >= 3->
+    select_hashsign({ClientHashSigns, ClientSignatureSchemes}, Cert, KeyExAlgo,
+                    tls_v1:default_signature_algs(Version), Version);
+select_hashsign({#hash_sign_algos{hash_sign_algos = ClientHashSigns},
+                 ClientSignatureSchemes0},
+                Cert, KeyExAlgo, SupportedHashSigns, {Major, Minor})
+  when Major >= 3 andalso Minor >= 3 ->
+    ClientSignatureSchemes = get_signature_scheme(ClientSignatureSchemes0),
+    {SignAlgo0, Param, PublicKeyAlgo0} = get_cert_params(Cert),
+    SignAlgo = sign_algo(SignAlgo0),
+    PublicKeyAlgo = public_key_algo(PublicKeyAlgo0),
+
+    %% RFC 5246 (TLS 1.2)
+    %% If the client provided a "signature_algorithms" extension, then all
+    %% certificates provided by the server MUST be signed by a
+    %% hash/signature algorithm pair that appears in that extension.
+    %%
+    %% RFC 8446 (TLS 1.3)
+    %% TLS 1.3 provides two extensions for indicating which signature
+    %% algorithms may be used in digital signatures.  The
+    %% "signature_algorithms_cert" extension applies to signatures in
+    %% certificates and the "signature_algorithms" extension, which
+    %% originally appeared in TLS 1.2, applies to signatures in
+    %% CertificateVerify messages.
+    %%
+    %% If no "signature_algorithms_cert" extension is
+    %% present, then the "signature_algorithms" extension also applies to
+    %% signatures appearing in certificates.
+    case is_supported_sign(SignAlgo, Param, ClientHashSigns, ClientSignatureSchemes) of
+        true ->
+            case lists:filter(fun({_, S} = Algos) when S == PublicKeyAlgo ->
+                                      is_acceptable_hash_sign(Algos, KeyExAlgo, SupportedHashSigns);
+                                 (_)  ->
+                                      false
+                              end, ClientHashSigns) 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(_, Cert, _, _, Version) ->
     #'OTPCertificate'{tbsCertificate = TBSCert} = public_key:pkix_decode_cert(Cert, otp),
@@ -1103,21 +1381,23 @@ select_hashsign(_, Cert, _, _, Version) ->
 %%
 %% Description: Handles signature algorithms selection for certificate requests (client) 
 %%--------------------------------------------------------------------
-select_hashsign(#certificate_request{hashsign_algorithms = #hash_sign_algos{hash_sign_algos = HashSigns}, 
-				     certificate_types = Types}, Cert, SupportedHashSigns, 
+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
+    {SignAlgo0, Param, PublicKeyAlgo0} = get_cert_params(Cert),
+    SignAlgo = sign_algo(SignAlgo0),
+    PublicKeyAlgo = public_key_algo(PublicKeyAlgo0),
+
+    case is_acceptable_cert_type(PublicKeyAlgo, Types) andalso
+        %% certificate_request has no "signature_algorithms_cert"
+        %% extension in TLS 1.2.
+        is_supported_sign(SignAlgo, Param, HashSigns, undefined) of
 	true ->
-	    case lists:filter(fun({_, S} = Algos) when S == SubSign ->
+	    case lists:filter(fun({_, S} = Algos) when S == PublicKeyAlgo ->
 				 is_acceptable_hash_sign(Algos, SupportedHashSigns);
 			    (_)  ->
 				      false
@@ -1130,8 +1410,38 @@ select_hashsign(#certificate_request{hashsign_algorithms = #hash_sign_algos{hash
 	false ->
 	    ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, no_suitable_signature_algorithm)
     end;
-select_hashsign(#certificate_request{}, Cert, _, Version) ->
-    select_hashsign(undefined, Cert, undefined, [], Version).
+select_hashsign(#certificate_request{certificate_types = Types}, Cert, _, Version) ->
+    {_, _, PublicKeyAlgo0} = get_cert_params(Cert),
+    PublicKeyAlgo = public_key_algo(PublicKeyAlgo0),
+
+    %% Check cert even for TLS 1.0/1.1
+    case is_acceptable_cert_type(PublicKeyAlgo, Types) of
+        true ->
+            select_hashsign(undefined, Cert, undefined, [], Version);
+        false ->
+            ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, no_suitable_signature_algorithm)
+    end.
+
+
+%% Gets the relevant parameters of a certificate:
+%% - signature algorithm
+%% - parameters of the signature algorithm
+%% - public key algorithm (key type)
+get_cert_params(Cert) ->
+    #'OTPCertificate'{tbsCertificate = TBSCert,
+		      signatureAlgorithm =
+                          {_,SignAlgo, Param}} = public_key:pkix_decode_cert(Cert, otp),
+    #'OTPSubjectPublicKeyInfo'{algorithm = {_, PublicKeyAlgo, _}} =
+        TBSCert#'OTPTBSCertificate'.subjectPublicKeyInfo,
+    {SignAlgo, Param, PublicKeyAlgo}.
+
+
+get_signature_scheme(undefined) ->
+    undefined;
+get_signature_scheme(#signature_algorithms_cert{
+                        signature_scheme_list = ClientSignatureSchemes}) ->
+    ClientSignatureSchemes.
+
 
 %%--------------------------------------------------------------------
 -spec select_hashsign_algs({atom(), atom()}| undefined, oid(), ssl_record:ssl_version()) ->
@@ -1180,6 +1490,8 @@ extension_value(#ec_point_formats{ec_point_format_list = List}) ->
     List;
 extension_value(#elliptic_curves{elliptic_curve_list = List}) ->
     List;
+extension_value(#supported_groups{supported_groups = SupportedGroups}) ->
+    SupportedGroups;
 extension_value(#hash_sign_algos{hash_sign_algos = Algos}) ->
     Algos;
 extension_value(#alpn{extension_data = Data}) ->
@@ -1189,7 +1501,20 @@ extension_value(#next_protocol_negotiation{extension_data = Data}) ->
 extension_value(#srp{username = Name}) ->
     Name;
 extension_value(#renegotiation_info{renegotiated_connection = Data}) ->
-    Data.
+    Data;
+extension_value(#signature_algorithms{signature_scheme_list = Schemes}) ->
+    Schemes;
+extension_value(#signature_algorithms_cert{signature_scheme_list = Schemes}) ->
+    Schemes;
+extension_value(#key_share_client_hello{client_shares = ClientShares}) ->
+    ClientShares;
+extension_value(#key_share_server_hello{server_share = ServerShare}) ->
+    ServerShare;
+extension_value(#client_hello_versions{versions = Versions}) ->
+    Versions;
+extension_value(#server_hello_selected_version{selected_version = SelectedVersion}) ->
+    SelectedVersion.
+
 
 %%--------------------------------------------------------------------
 %%% Internal functions
@@ -1200,33 +1525,30 @@ 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 ->
-	    <<?BYTE(?ECDSA_SIGN), ?BYTE(?RSA_SIGN), ?BYTE(?DSS_SIGN)>>;
-	false ->
-	    <<?BYTE(?RSA_SIGN), ?BYTE(?DSS_SIGN)>>
-    end;
-
-certificate_types(#{key_exchange := KeyExchange}, _) when KeyExchange == rsa;
-                                                          KeyExchange == dh_rsa;
-                                                          KeyExchange == dhe_rsa;
-                                                          KeyExchange == ecdhe_rsa ->
-    <<?BYTE(?RSA_SIGN)>>;
-
-certificate_types(#{key_exchange := KeyExchange}, _)  when KeyExchange == dh_dss; 
-                                                           KeyExchange == dhe_dss;
-                                                           KeyExchange == srp_dss ->
-    <<?BYTE(?DSS_SIGN)>>;
-
-certificate_types(#{key_exchange := KeyExchange}, _) when KeyExchange == dh_ecdsa;
-                                                          KeyExchange == dhe_ecdsa;
-                                                          KeyExchange == ecdh_ecdsa;
-                                                          KeyExchange == ecdhe_ecdsa ->
-    <<?BYTE(?ECDSA_SIGN)>>;
+%% TLS 1.0+
+%% The end-entity certificate provided by the client MUST contain a
+%% key that is compatible with certificate_types.
+certificate_types(_, {N, M}) when N >= 3 andalso M >= 1 ->
+    ECDSA = supported_cert_type_or_empty(ecdsa, ?ECDSA_SIGN),
+    RSA = supported_cert_type_or_empty(rsa, ?RSA_SIGN),
+    DSS = supported_cert_type_or_empty(dss, ?DSS_SIGN),
+    <<ECDSA/binary,RSA/binary,DSS/binary>>;
+%% SSL 3.0
 certificate_types(_, _) ->
-    <<?BYTE(?RSA_SIGN)>>.
+    RSA = supported_cert_type_or_empty(rsa, ?RSA_SIGN),
+    DSS = supported_cert_type_or_empty(dss, ?DSS_SIGN),
+    <<RSA/binary,DSS/binary>>.
+
+%% Returns encoded certificate_type if algorithm is supported
+supported_cert_type_or_empty(Algo, Type) ->
+    case proplists:get_bool(
+           Algo,
+           proplists:get_value(public_keys, crypto:supports())) of
+        true ->
+            <<?BYTE(Type)>>;
+        false ->
+            <<>>
+    end.
 
 certificate_authorities(CertDbHandle, CertDbRef) ->
     Authorities = certificate_authorities_from_db(CertDbHandle, CertDbRef),
@@ -1769,16 +2091,67 @@ encode_alpn(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].
+
+encode_versions(Versions) ->
+    encode_versions(lists:reverse(Versions), <<>>).
+%%
+encode_versions([], Acc) ->
+    Acc;
+encode_versions([{M,N}|T], Acc) ->
+    encode_versions(T, <<?BYTE(M),?BYTE(N),Acc/binary>>).
+
+encode_client_shares(ClientShares) ->
+    encode_client_shares(ClientShares, <<>>).
+%%
+encode_client_shares([], Acc) ->
+    Acc;
+encode_client_shares([KeyShareEntry0|T], Acc) ->
+    KeyShareEntry = encode_key_share_entry(KeyShareEntry0),
+    encode_client_shares(T, <<Acc/binary,KeyShareEntry/binary>>).
+
+encode_key_share_entry(#key_share_entry{
+                          group = Group,
+                          key_exchange = KeyExchange}) ->
+    Len = byte_size(KeyExchange),
+    <<?UINT16((tls_v1:group_to_enum(Group))),?UINT16(Len),KeyExchange/binary>>.
+
+encode_psk_key_exchange_modes(KEModes) ->
+    encode_psk_key_exchange_modes(lists:reverse(KEModes), <<>>).
+%%
+encode_psk_key_exchange_modes([], Acc) ->
+    Acc;
+encode_psk_key_exchange_modes([psk_ke|T], Acc) ->
+    encode_psk_key_exchange_modes(T, <<?BYTE(?PSK_KE),Acc/binary>>);
+encode_psk_key_exchange_modes([psk_dhe_ke|T], Acc) ->
+    encode_psk_key_exchange_modes(T, <<?BYTE(?PSK_DHE_KE),Acc/binary>>).
+
+
+encode_psk_identities(Identities) ->
+    encode_psk_identities(Identities, <<>>).
+%%
+encode_psk_identities([], Acc) ->
+    Len = byte_size(Acc),
+    <<?UINT16(Len), Acc/binary>>;
+encode_psk_identities([#psk_identity{
+                          identity = Identity,
+                          obfuscated_ticket_age = Age}|T], Acc) ->
+    IdLen = byte_size(Identity),
+    encode_psk_identities(T, <<Acc/binary,?UINT16(IdLen),Identity/binary,Age/binary>>).
+
+
+encode_psk_binders(Binders) ->
+    encode_psk_binders(Binders, <<>>).
+%%
+encode_psk_binders([], Acc) ->
+    Len = byte_size(Acc),
+    <<?UINT16(Len), Acc/binary>>;
+encode_psk_binders([Binder|T], Acc) ->
+    Len = byte_size(Binder),
+    encode_psk_binders(T, <<Acc/binary,?BYTE(Len),Binder/binary>>).
+
+
+hello_extensions_list(HelloExtensions) ->
+    [Ext || {_, Ext} <- maps:to_list(HelloExtensions), Ext =/= undefined].
 
 %%-------------Decode handshakes---------------------------------
 dec_server_key(<<?UINT16(PLen), P:PLen/binary,
@@ -1918,16 +2291,60 @@ dec_server_key_signature(Params, <<?UINT16(Len), Signature:Len/binary>>, _) ->
 dec_server_key_signature(_, _, _) ->
     throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, failed_to_decrypt_server_key_sign)).
 
-dec_hello_extensions(<<>>, Acc) ->
+%% Processes a ClientHello/ServerHello message and returns the version to be used
+%% in the decoding functions. The following rules apply:
+%% - IF supported_versions extension is absent:
+%%   RETURN the lowest of (LocalVersion and LegacyVersion)
+%% - IF supported_versions estension is present:
+%%   RETURN the lowest of (LocalVersion and first element of supported versions)
+process_supported_versions_extension(<<>>, LocalVersion, LegacyVersion)
+  when LegacyVersion =< LocalVersion ->
+    LegacyVersion;
+process_supported_versions_extension(<<>>, LocalVersion, _LegacyVersion) ->
+    LocalVersion;
+process_supported_versions_extension(<<?UINT16(?SUPPORTED_VERSIONS_EXT), ?UINT16(Len),
+                                       ExtData:Len/binary, _Rest/binary>>,
+                                     LocalVersion, _LegacyVersion) when Len > 2 ->
+    <<?BYTE(_),Versions0/binary>> = ExtData,
+    [Highest|_] = decode_versions(Versions0),
+    if Highest =< LocalVersion ->
+            Highest;
+       true ->
+            LocalVersion
+    end;
+process_supported_versions_extension(<<?UINT16(?SUPPORTED_VERSIONS_EXT), ?UINT16(Len),
+                                       ?BYTE(Major),?BYTE(Minor), _Rest/binary>>,
+                                     LocalVersion, _LegacyVersion) when Len =:= 2 ->
+    SelectedVersion = {Major, Minor},
+    if SelectedVersion =< LocalVersion ->
+            SelectedVersion;
+       true ->
+            LocalVersion
+    end;
+process_supported_versions_extension(<<?UINT16(_), ?UINT16(Len),
+                                       _ExtData:Len/binary, Rest/binary>>,
+                                     LocalVersion, LegacyVersion) ->
+    process_supported_versions_extension(Rest, LocalVersion, LegacyVersion);
+%% Tolerate protocol encoding errors and skip parsing the rest of the extension.
+process_supported_versions_extension(_, LocalVersion, LegacyVersion)
+  when LegacyVersion =< LocalVersion ->
+    LegacyVersion;
+process_supported_versions_extension(_, LocalVersion, _) ->
+    LocalVersion.
+
+decode_extensions(<<>>, _Version, _MessageType, Acc) ->
     Acc;
-dec_hello_extensions(<<?UINT16(?ALPN_EXT), ?UINT16(ExtLen), ?UINT16(Len), ExtensionData:Len/binary, Rest/binary>>, Acc)
-        when Len + 2 =:= ExtLen ->
+decode_extensions(<<?UINT16(?ALPN_EXT), ?UINT16(ExtLen), ?UINT16(Len),
+                    ExtensionData:Len/binary, Rest/binary>>, Version, MessageType, Acc)
+  when Len + 2 =:= ExtLen ->
     ALPN = #alpn{extension_data = ExtensionData},
-    dec_hello_extensions(Rest, Acc#hello_extensions{alpn = ALPN});
-dec_hello_extensions(<<?UINT16(?NEXTPROTONEG_EXT), ?UINT16(Len), ExtensionData:Len/binary, Rest/binary>>, Acc) ->
+    decode_extensions(Rest, Version, MessageType, Acc#{alpn => ALPN});
+decode_extensions(<<?UINT16(?NEXTPROTONEG_EXT), ?UINT16(Len),
+                    ExtensionData:Len/binary, Rest/binary>>, Version, MessageType, Acc) ->
     NextP = #next_protocol_negotiation{extension_data = ExtensionData},
-    dec_hello_extensions(Rest, Acc#hello_extensions{next_protocol_negotiation = NextP});
-dec_hello_extensions(<<?UINT16(?RENEGOTIATION_EXT), ?UINT16(Len), Info:Len/binary, Rest/binary>>, Acc) ->
+    decode_extensions(Rest, Version, MessageType, Acc#{next_protocol_negotiation => NextP});
+decode_extensions(<<?UINT16(?RENEGOTIATION_EXT), ?UINT16(Len),
+                    Info:Len/binary, Rest/binary>>, Version, MessageType, Acc) ->
     RenegotiateInfo = case Len of
 			  1 ->  % Initial handshake
 			      Info; % should be <<0>> will be matched in handle_renegotiation_info
@@ -1936,25 +2353,54 @@ dec_hello_extensions(<<?UINT16(?RENEGOTIATION_EXT), ?UINT16(Len), Info:Len/binar
 			      <<?BYTE(VerifyLen), VerifyInfo/binary>> = Info,
 			      VerifyInfo
 		      end,
-    dec_hello_extensions(Rest, Acc#hello_extensions{renegotiation_info =
-							#renegotiation_info{renegotiated_connection =
-										RenegotiateInfo}});
-
-dec_hello_extensions(<<?UINT16(?SRP_EXT), ?UINT16(Len), ?BYTE(SRPLen), SRP:SRPLen/binary, Rest/binary>>, Acc)
-  when Len == SRPLen + 2 ->
-    dec_hello_extensions(Rest,  Acc#hello_extensions{srp = #srp{username = SRP}});
-
-dec_hello_extensions(<<?UINT16(?SIGNATURE_ALGORITHMS_EXT), ?UINT16(Len),
-		       ExtData:Len/binary, Rest/binary>>, Acc) ->
+    decode_extensions(Rest, Version, MessageType,
+                      Acc#{renegotiation_info =>
+                               #renegotiation_info{renegotiated_connection =
+                                                       RenegotiateInfo}});
+
+decode_extensions(<<?UINT16(?SRP_EXT), ?UINT16(Len), ?BYTE(SRPLen),
+                    SRP:SRPLen/binary, Rest/binary>>, Version, MessageType, Acc)
+  when Len == SRPLen + 1 ->
+    decode_extensions(Rest, Version, MessageType, Acc#{srp => #srp{username = SRP}});
+
+decode_extensions(<<?UINT16(?SIGNATURE_ALGORITHMS_EXT), ?UINT16(Len),
+		       ExtData:Len/binary, Rest/binary>>, Version, MessageType, Acc)
+  when Version < {3,4} ->
     SignAlgoListLen = Len - 2,
     <<?UINT16(SignAlgoListLen), SignAlgoList/binary>> = ExtData,
     HashSignAlgos = [{ssl_cipher:hash_algorithm(Hash), ssl_cipher:sign_algorithm(Sign)} ||
 			<<?BYTE(Hash), ?BYTE(Sign)>> <= SignAlgoList],
-    dec_hello_extensions(Rest, Acc#hello_extensions{signature_algs =
-						    #hash_sign_algos{hash_sign_algos = HashSignAlgos}});
-
-dec_hello_extensions(<<?UINT16(?ELLIPTIC_CURVES_EXT), ?UINT16(Len),
-		       ExtData:Len/binary, Rest/binary>>, Acc) ->
+    decode_extensions(Rest, Version, MessageType,
+                      Acc#{signature_algs =>
+                               #hash_sign_algos{hash_sign_algos =
+                                                    HashSignAlgos}});
+
+decode_extensions(<<?UINT16(?SIGNATURE_ALGORITHMS_EXT), ?UINT16(Len),
+		       ExtData:Len/binary, Rest/binary>>, Version, MessageType, Acc)
+  when Version =:= {3,4} ->
+    SignSchemeListLen = Len - 2,
+    <<?UINT16(SignSchemeListLen), SignSchemeList/binary>> = ExtData,
+    SignSchemes = [ssl_cipher:signature_scheme(SignScheme) ||
+			<<?UINT16(SignScheme)>> <= SignSchemeList],
+    decode_extensions(Rest, Version, MessageType,
+                      Acc#{signature_algs =>
+                               #signature_algorithms{
+                                  signature_scheme_list = SignSchemes}});
+
+decode_extensions(<<?UINT16(?SIGNATURE_ALGORITHMS_CERT_EXT), ?UINT16(Len),
+		       ExtData:Len/binary, Rest/binary>>, Version, MessageType, Acc) ->
+    SignSchemeListLen = Len - 2,
+    <<?UINT16(SignSchemeListLen), SignSchemeList/binary>> = ExtData,
+    SignSchemes = [ssl_cipher:signature_scheme(SignScheme) ||
+			<<?UINT16(SignScheme)>> <= SignSchemeList],
+    decode_extensions(Rest, Version, MessageType,
+                      Acc#{signature_algs_cert =>
+                               #signature_algorithms_cert{
+                                  signature_scheme_list = SignSchemes}});
+
+decode_extensions(<<?UINT16(?ELLIPTIC_CURVES_EXT), ?UINT16(Len),
+		       ExtData:Len/binary, Rest/binary>>, Version, MessageType, Acc)
+  when Version < {3,4} ->
     <<?UINT16(_), EllipticCurveList/binary>> = ExtData,
     %% Ignore unknown curves
     Pick = fun(Enum) ->
@@ -1966,31 +2412,130 @@ dec_hello_extensions(<<?UINT16(?ELLIPTIC_CURVES_EXT), ?UINT16(Len),
 		   end
 	   end,
     EllipticCurves = lists:filtermap(Pick, [ECC || <<ECC:16>> <= EllipticCurveList]),
-    dec_hello_extensions(Rest, Acc#hello_extensions{elliptic_curves =
-							#elliptic_curves{elliptic_curve_list =
-									     EllipticCurves}});
-dec_hello_extensions(<<?UINT16(?EC_POINT_FORMATS_EXT), ?UINT16(Len),
-		       ExtData:Len/binary, Rest/binary>>, Acc) ->
+    decode_extensions(Rest, Version, MessageType,
+                      Acc#{elliptic_curves =>
+                               #elliptic_curves{elliptic_curve_list =
+                                                    EllipticCurves}});
+
+decode_extensions(<<?UINT16(?ELLIPTIC_CURVES_EXT), ?UINT16(Len),
+		       ExtData:Len/binary, Rest/binary>>, Version, MessageType, Acc)
+  when Version =:= {3,4} ->
+    <<?UINT16(_), GroupList/binary>> = ExtData,
+    %% Ignore unknown curves
+    Pick = fun(Enum) ->
+		   case tls_v1:enum_to_group(Enum) of
+		       undefined ->
+			   false;
+		       Group ->
+			   {true, Group}
+		   end
+	   end,
+    SupportedGroups = lists:filtermap(Pick, [Group || <<Group:16>> <= GroupList]),
+    decode_extensions(Rest, Version, MessageType,
+                      Acc#{elliptic_curves =>
+                               #supported_groups{supported_groups =
+                                                     SupportedGroups}});
+
+decode_extensions(<<?UINT16(?EC_POINT_FORMATS_EXT), ?UINT16(Len),
+                    ExtData:Len/binary, Rest/binary>>, Version, MessageType, Acc) ->
     <<?BYTE(_), ECPointFormatList/binary>> = ExtData,
     ECPointFormats = binary_to_list(ECPointFormatList),
-    dec_hello_extensions(Rest, Acc#hello_extensions{ec_point_formats =
-							#ec_point_formats{ec_point_format_list =
-									      ECPointFormats}});
-
-dec_hello_extensions(<<?UINT16(?SNI_EXT), ?UINT16(Len), Rest/binary>>, Acc) when Len == 0 ->
-    dec_hello_extensions(Rest, Acc#hello_extensions{sni = #sni{hostname = ""}}); %% Server may send an empy SNI
-
-dec_hello_extensions(<<?UINT16(?SNI_EXT), ?UINT16(Len),
-                ExtData:Len/binary, Rest/binary>>, Acc) ->
+    decode_extensions(Rest, Version, MessageType,
+                      Acc#{ec_point_formats =>
+                               #ec_point_formats{ec_point_format_list =
+                                                     ECPointFormats}});
+
+decode_extensions(<<?UINT16(?SNI_EXT), ?UINT16(Len),
+                    Rest/binary>>, Version, MessageType, Acc) when Len == 0 ->
+    decode_extensions(Rest, Version, MessageType,
+                      Acc#{sni => #sni{hostname = ""}}); %% Server may send an empy SNI
+
+decode_extensions(<<?UINT16(?SNI_EXT), ?UINT16(Len),
+                ExtData:Len/binary, Rest/binary>>, Version, MessageType, Acc) ->
     <<?UINT16(_), NameList/binary>> = ExtData,
-    dec_hello_extensions(Rest, Acc#hello_extensions{sni = dec_sni(NameList)});
+    decode_extensions(Rest, Version, MessageType,
+                      Acc#{sni => dec_sni(NameList)});
+
+decode_extensions(<<?UINT16(?SUPPORTED_VERSIONS_EXT), ?UINT16(Len),
+                       ExtData:Len/binary, Rest/binary>>, Version, MessageType, Acc) when Len > 2 ->
+    <<?BYTE(_),Versions/binary>> = ExtData,
+    decode_extensions(Rest, Version, MessageType,
+                      Acc#{client_hello_versions =>
+                               #client_hello_versions{
+                                  versions = decode_versions(Versions)}});
+
+decode_extensions(<<?UINT16(?SUPPORTED_VERSIONS_EXT), ?UINT16(Len),
+                       ?UINT16(SelectedVersion), Rest/binary>>, Version, MessageType, Acc)
+  when Len =:= 2, SelectedVersion =:= 16#0304 ->
+    decode_extensions(Rest, Version, MessageType,
+                      Acc#{server_hello_selected_version =>
+                               #server_hello_selected_version{selected_version =
+                                                                  {3,4}}});
+
+decode_extensions(<<?UINT16(?KEY_SHARE_EXT), ?UINT16(Len),
+                       ExtData:Len/binary, Rest/binary>>,
+                  Version, MessageType = client_hello, Acc) ->
+    <<?UINT16(_),ClientShares/binary>> = ExtData,
+    decode_extensions(Rest, Version, MessageType,
+                      Acc#{key_share =>
+                               #key_share_client_hello{
+                                  client_shares = decode_client_shares(ClientShares)}});
+
+decode_extensions(<<?UINT16(?KEY_SHARE_EXT), ?UINT16(Len),
+                    ExtData:Len/binary, Rest/binary>>,
+                  Version, MessageType = server_hello, Acc) ->
+    <<?UINT16(Group),?UINT16(KeyLen),KeyExchange:KeyLen/binary>> = ExtData,
+    decode_extensions(Rest, Version, MessageType,
+                      Acc#{key_share =>
+                               #key_share_server_hello{
+                                  server_share =
+                                      #key_share_entry{
+                                         group = tls_v1:enum_to_group(Group),
+                                         key_exchange = KeyExchange}}});
+
+decode_extensions(<<?UINT16(?KEY_SHARE_EXT), ?UINT16(Len),
+                    ExtData:Len/binary, Rest/binary>>,
+                  Version, MessageType = hello_retry_request, Acc) ->
+    <<?UINT16(Group)>> = ExtData,
+    decode_extensions(Rest, Version, MessageType,
+                      Acc#{key_share =>
+                               #key_share_hello_retry_request{
+                                  selected_group = tls_v1:enum_to_group(Group)}});
+
+decode_extensions(<<?UINT16(?PSK_KEY_EXCHANGE_MODES_EXT), ?UINT16(Len),
+                       ExtData:Len/binary, Rest/binary>>, Version, MessageType, Acc) ->
+    <<?BYTE(PLen),KEModes:PLen/binary>> = ExtData,
+    decode_extensions(Rest, Version, MessageType,
+                      Acc#{psk_key_exchange_modes =>
+                               #psk_key_exchange_modes{
+                                  ke_modes = decode_psk_key_exchange_modes(KEModes)}});
+
+decode_extensions(<<?UINT16(?PRE_SHARED_KEY_EXT), ?UINT16(Len),
+                       ExtData:Len/binary, Rest/binary>>,
+                  Version, MessageType = client_hello, Acc) ->
+    <<?UINT16(IdLen),Identities:IdLen/binary,?UINT16(BLen),Binders:BLen/binary>> = ExtData,
+    decode_extensions(Rest, Version, MessageType,
+                      Acc#{pre_shared_key =>
+                               #pre_shared_key_client_hello{
+                                  offered_psks = #offered_psks{
+                                                    identities = decode_psk_identities(Identities),
+                                                    binders = decode_psk_binders(Binders)}}});
+
+decode_extensions(<<?UINT16(?PRE_SHARED_KEY_EXT), ?UINT16(Len),
+                       ExtData:Len/binary, Rest/binary>>,
+                  Version, MessageType = server_hello, Acc) ->
+    <<?UINT16(Identity)>> = ExtData,
+    decode_extensions(Rest, Version, MessageType,
+                      Acc#{pre_shared_key =>
+                               #pre_shared_key_server_hello{
+                                  selected_identity = Identity}});
+
 %% Ignore data following the ClientHello (i.e.,
 %% extensions) if not understood.
-
-dec_hello_extensions(<<?UINT16(_), ?UINT16(Len), _Unknown:Len/binary, Rest/binary>>, Acc) ->
-    dec_hello_extensions(Rest, Acc);
+decode_extensions(<<?UINT16(_), ?UINT16(Len), _Unknown:Len/binary, Rest/binary>>, Version, MessageType, Acc) ->
+    decode_extensions(Rest, Version, MessageType, Acc);
 %% This theoretically should not happen if the protocol is followed, but if it does it is ignored.
-dec_hello_extensions(_, Acc) ->
+decode_extensions(_, _, _, Acc) ->
     Acc.
 
 dec_hashsign(<<?BYTE(HashAlgo), ?BYTE(SignAlgo)>>) ->
@@ -2008,6 +2553,26 @@ decode_alpn(undefined) ->
 decode_alpn(#alpn{extension_data=Data}) ->
     decode_protocols(Data, []).
 
+decode_versions(Versions) ->
+    decode_versions(Versions, []).
+%%
+decode_versions(<<>>, Acc) ->
+    lists:reverse(Acc);
+decode_versions(<<?BYTE(M),?BYTE(N),Rest/binary>>, Acc) ->
+    decode_versions(Rest, [{M,N}|Acc]).
+
+
+decode_client_shares(ClientShares) ->
+    decode_client_shares(ClientShares, []).
+%%
+decode_client_shares(<<>>, Acc) ->
+    lists:reverse(Acc);
+decode_client_shares(<<?UINT16(Group),?UINT16(Len),KeyExchange:Len/binary,Rest/binary>>, Acc) ->
+    decode_client_shares(Rest, [#key_share_entry{
+                                   group = tls_v1:enum_to_group(Group),
+                                   key_exchange= KeyExchange
+                                  }|Acc]).
+
 decode_next_protocols({next_protocol_negotiation, Protocols}) ->
     decode_protocols(Protocols, []).
 
@@ -2023,6 +2588,38 @@ decode_protocols(<<?BYTE(Len), Protocol:Len/binary, Rest/binary>>, Acc) ->
 decode_protocols(_Bytes, _Acc) ->
     {error, invalid_protocols}.
 
+
+decode_psk_key_exchange_modes(KEModes) ->
+    decode_psk_key_exchange_modes(KEModes, []).
+%%
+decode_psk_key_exchange_modes(<<>>, Acc) ->
+    lists:reverse(Acc);
+decode_psk_key_exchange_modes(<<?BYTE(?PSK_KE), Rest/binary>>, Acc) ->
+    decode_psk_key_exchange_modes(Rest, [psk_ke|Acc]);
+decode_psk_key_exchange_modes(<<?BYTE(?PSK_DHE_KE), Rest/binary>>, Acc) ->
+    decode_psk_key_exchange_modes(Rest, [psk_dhe_ke|Acc]).
+
+
+decode_psk_identities(Identities) ->
+    decode_psk_identities(Identities, []).
+%%
+decode_psk_identities(<<>>, Acc) ->
+    lists:reverse(Acc);
+decode_psk_identities(<<?UINT16(Len), Identity:Len/binary, Age:4/binary, Rest/binary>>, Acc) ->
+    decode_psk_identities(Rest, [#psk_identity{
+                                    identity = Identity,
+                                    obfuscated_ticket_age = Age}|Acc]).
+
+
+decode_psk_binders(Binders) ->
+    decode_psk_binders(Binders, []).
+%%
+decode_psk_binders(<<>>, Acc) ->
+    lists:reverse(Acc);
+decode_psk_binders(<<?BYTE(Len), Binder:Len/binary, Rest/binary>>, Acc) ->
+    decode_psk_binders(Rest, [Binder|Acc]).
+
+
 %% encode/decode stream of certificate data to/from list of certificate data
 certs_to_list(ASN1Certs) ->
     certs_to_list(ASN1Certs, []).
@@ -2189,30 +2786,26 @@ filter_unavailable_ecc_suites(_, Suites) ->
 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.
+    {ok, ConnectionStates} = handle_renegotiation_info(Version, RecordCB, Role, Info, ConnectionStates0,
+                                                       Renegotiation, SecureRenegotation,
+                                                       ClientCipherSuites),
+    hello_pending_connection_states(RecordCB, Role,
+                                    Version,
+                                    NegotiatedCipherSuite,
+                                    Random,
+                                    Compression,
+                                    ConnectionStates).
 
 %% Receive protocols, choose one from the list, return it.
 handle_alpn_extension(_, {error, Reason}) ->
-    ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, Reason);
+    throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, Reason));
 handle_alpn_extension([], _) ->
-	?ALERT_REC(?FATAL, ?NO_APPLICATION_PROTOCOL);
+    throw(?ALERT_REC(?FATAL, ?NO_APPLICATION_PROTOCOL));
 handle_alpn_extension([ServerProtocol|Tail], ClientProtocols) ->
-	case lists:member(ServerProtocol, ClientProtocols) of
-		true -> ServerProtocol;
-		false -> handle_alpn_extension(Tail, ClientProtocols)
-	end.
+    case lists:member(ServerProtocol, ClientProtocols) of
+        true -> ServerProtocol;
+            false -> handle_alpn_extension(Tail, ClientProtocols)
+    end.
 
 handle_next_protocol(undefined,
 		     _NextProtocolSelector, _Renegotiating) ->
@@ -2225,14 +2818,14 @@ handle_next_protocol(#next_protocol_negotiation{} = NextProtocols,
         true ->
             select_next_protocol(decode_next_protocols(NextProtocols), NextProtocolSelector);
         false ->
-            ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, unexpected_next_protocol_extension)
+            throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, unexpected_next_protocol_extension))
     end.
 
 
 handle_next_protocol_extension(NextProtocolNegotiation, Renegotiation, SslOpts)->
     case handle_next_protocol_on_server(NextProtocolNegotiation, Renegotiation, SslOpts) of
 	#alert{} = Alert ->
-	    Alert;
+	    throw(Alert);
 	ProtocolsToAdvertise ->
 	    ProtocolsToAdvertise
     end.
@@ -2265,17 +2858,6 @@ handle_srp_extension(undefined, Session) ->
 handle_srp_extension(#srp{username = Username}, Session) ->
     Session#session{srp_username = Username}.
 
-
-sign_algo(?rsaEncryption) ->
-    rsa;
-sign_algo(?'id-ecPublicKey') ->
-    ecdsa;
-sign_algo(?'id-dsa') ->
-    dsa;
-sign_algo(Alg) ->
-    {_, Sign} =public_key:pkix_sign_types(Alg),
-    Sign.
-
 is_acceptable_hash_sign( _, KeyExAlgo, _) when 
       KeyExAlgo == psk;
       KeyExAlgo == dhe_psk;
@@ -2291,15 +2873,80 @@ is_acceptable_hash_sign(Algos,_, SupportedHashSigns) ->
 is_acceptable_hash_sign(Algos, SupportedHashSigns) ->
     lists:member(Algos, SupportedHashSigns).
 
-is_acceptable_cert_type(Sign, _HashSigns, Types) ->
+is_acceptable_cert_type(Sign, Types) ->
     lists:member(sign_type(Sign), binary_to_list(Types)).
 
-is_supported_sign(Sign, HashSigns) ->
-     [] =/=  lists:dropwhile(fun({_, S}) when S =/= Sign -> 
-				     true;
-				(_)-> 
-				     false 
-			     end, HashSigns).
+%% signature_algorithms_cert = undefined
+is_supported_sign(SignAlgo, _, HashSigns, undefined) ->
+    lists:member(SignAlgo, HashSigns);
+
+%% {'SignatureAlgorithm',{1,2,840,113549,1,1,11},'NULL'}
+is_supported_sign({Hash, Sign}, 'NULL', _, SignatureSchemes) ->
+    Fun = fun (Scheme, Acc) ->
+                  {H0, S0, _} = ssl_cipher:scheme_to_components(Scheme),
+                  S1 = case S0 of
+                             rsa_pkcs1 -> rsa;
+                             S -> S
+                         end,
+                  H1 = case H0 of
+                             sha1 -> sha;
+                             H -> H
+                         end,
+                  Acc orelse (Sign =:= S1 andalso
+                              Hash =:= H1)
+          end,
+    lists:foldl(Fun, false, SignatureSchemes);
+
+%% TODO: Implement validation for the curve used in the signature
+%% RFC 3279 - 2.2.3 ECDSA Signature Algorithm
+%% When the ecdsa-with-SHA1 algorithm identifier appears as the
+%% algorithm field in an AlgorithmIdentifier, the encoding MUST omit the
+%% parameters field.  That is, the AlgorithmIdentifier SHALL be a
+%% SEQUENCE of one component: the OBJECT IDENTIFIER ecdsa-with-SHA1.
+%%
+%% The elliptic curve parameters in the subjectPublicKeyInfo field of
+%% the certificate of the issuer SHALL apply to the verification of the
+%% signature.
+is_supported_sign({Hash, Sign}, _Param, _, SignatureSchemes) ->
+    Fun = fun (Scheme, Acc) ->
+                  {H0, S0, _} = ssl_cipher:scheme_to_components(Scheme),
+                  S1 = case S0 of
+                             rsa_pkcs1 -> rsa;
+                             S -> S
+                         end,
+                  H1 = case H0 of
+                             sha1 -> sha;
+                             H -> H
+                         end,
+                  Acc orelse (Sign  =:= S1 andalso
+                              Hash  =:= H1)
+          end,
+    lists:foldl(Fun, false, SignatureSchemes).
+
+%% SupportedPublicKeyAlgorithms PUBLIC-KEY-ALGORITHM-CLASS ::= {
+%%   dsa | rsa-encryption | dh  | kea  | ec-public-key }
+public_key_algo(?rsaEncryption) ->
+    rsa;
+public_key_algo(?'id-ecPublicKey') ->
+    ecdsa;
+public_key_algo(?'id-dsa') ->
+    dsa.
+
+%% SupportedSignatureAlgorithms SIGNATURE-ALGORITHM-CLASS ::= {
+%%   dsa-with-sha1 | dsaWithSHA1 |  md2-with-rsa-encryption |
+%%   md5-with-rsa-encryption | sha1-with-rsa-encryption | sha-1with-rsa-encryption |
+%%   sha224-with-rsa-encryption |
+%%   sha256-with-rsa-encryption |
+%%   sha384-with-rsa-encryption |
+%%   sha512-with-rsa-encryption |
+%%   ecdsa-with-sha1 |
+%%   ecdsa-with-sha224 |
+%%   ecdsa-with-sha256 |
+%%   ecdsa-with-sha384 |
+%%   ecdsa-with-sha512 }
+sign_algo(Alg) ->
+    public_key:pkix_sign_types(Alg).
+
 sign_type(rsa) ->
     ?RSA_SIGN;
 sign_type(dsa) ->
@@ -2318,6 +2965,11 @@ client_ecc_extensions(SupportedECCs) ->
     CryptoSupport = proplists:get_value(public_keys, crypto:supports()),
     case proplists:get_bool(ecdh, CryptoSupport) of
 	true ->
+            %% RFC 8422 - 5.1.  Client Hello Extensions
+            %% Clients SHOULD send both the Supported Elliptic Curves Extension and the
+            %% Supported Point Formats Extension.  If the Supported Point Formats
+            %% Extension is indeed sent, it MUST contain the value 0 (uncompressed)
+            %% as one of the items in the list of point formats.
 	    EcPointFormats = #ec_point_formats{ec_point_format_list = [?ECPOINT_UNCOMPRESSED]},
 	    EllipticCurves = SupportedECCs,
 	    {EcPointFormats, EllipticCurves};
@@ -2404,11 +3056,11 @@ renegotiation_info(_RecordCB, server, ConnectionStates, true) ->
 	    #renegotiation_info{renegotiated_connection = undefined}
     end.
 
-handle_renegotiation_info(_RecordCB, _, #renegotiation_info{renegotiated_connection = ?byte(0)},
+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) ->
+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)};
@@ -2416,10 +3068,10 @@ handle_renegotiation_info(_RecordCB, server, undefined, ConnectionStates, _, _,
 	    {ok, ssl_record:set_renegotiation_flag(false, ConnectionStates)}
     end;
 
-handle_renegotiation_info(_RecordCB, _, undefined, ConnectionStates, false, _, _) ->
+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},
+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),
@@ -2428,14 +3080,14 @@ handle_renegotiation_info(_RecordCB, client, #renegotiation_info{renegotiated_co
 	true ->
 	    {ok, ConnectionStates};
 	false ->
-            ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, client_renegotiation)
+            throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, client_renegotiation))
     end;
-handle_renegotiation_info(_RecordCB, server, #renegotiation_info{renegotiated_connection = ClientVerify},
+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});
+              throw(?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),
@@ -2443,17 +3095,19 @@ handle_renegotiation_info(_RecordCB, server, #renegotiation_info{renegotiated_co
 		  true ->
 		      {ok, ConnectionStates};
 		  false ->
-                      ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, server_renegotiation)
+                      throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, server_renegotiation))
 	      end
       end;
+handle_renegotiation_info({3,0}, _RecordCB, client, undefined, ConnectionStates, true, _SecureRenegotation, _) ->
+    {ok, ssl_record:set_renegotiation_flag(true, ConnectionStates)};
 
-handle_renegotiation_info(RecordCB, client, undefined, ConnectionStates, true, SecureRenegotation, _) ->
+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) ->
+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});
+             throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, {server_renegotiation, empty_renegotiation_info_scsv}));
 	 false ->
 	     handle_renegotiation_info(RecordCB, ConnectionStates, SecureRenegotation)
      end.
@@ -2462,9 +3116,9 @@ 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);
+            throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, already_secure));
 	{true, false} ->
-	    ?ALERT_REC(?FATAL, ?NO_RENEGOTIATION);
+	    throw(?ALERT_REC(?FATAL, ?NO_RENEGOTIATION));
 	{false, false} ->
 	    {ok, ConnectionStates}
     end.
@@ -2472,7 +3126,7 @@ handle_renegotiation_info(_RecordCB, ConnectionStates, SecureRenegotation) ->
 cert_curve(_, _, no_suite) ->
     {no_curve, no_suite};
 cert_curve(Cert, ECCCurve0, CipherSuite) ->
-    case ssl_cipher_format:suite_definition(CipherSuite) of
+    case ssl_cipher_format:suite_bin_to_map(CipherSuite) of
         #{key_exchange := Kex} when Kex == ecdh_ecdsa; 
                                     Kex == ecdh_rsa ->
             OtpCert = public_key:pkix_decode_cert(Cert, otp),
@@ -2485,4 +3139,58 @@ cert_curve(Cert, ECCCurve0, CipherSuite) ->
             {ECCCurve0, CipherSuite}
     end.
 
-   
+empty_extensions() ->
+     #{}.
+
+empty_extensions({3,4}, client_hello) ->
+    #{
+      sni => undefined,
+      %% max_fragment_length => undefined,
+      %% status_request => undefined,
+      elliptic_curves => undefined,
+      signature_algs => undefined,
+      %% use_srtp => undefined,
+      %% heartbeat => undefined,
+      alpn => undefined,
+      %% signed_cert_timestamp => undefined,
+      %% client_cert_type => undefined,
+      %% server_cert_type => undefined,
+      %% padding => undefined,
+      key_share => undefined,
+      pre_shared_key => undefined,
+      psk_key_exchange_modes => undefined,
+      %% early_data => undefined,
+      %% cookie => undefined,
+      client_hello_versions => undefined,
+      %% cert_authorities => undefined,
+      %% post_handshake_auth => undefined,
+      signature_algs_cert => undefined
+     };
+empty_extensions({3, 3}, client_hello) ->
+    Ext = empty_extensions({3,2}, client_hello),
+    Ext#{signature_algs => undefined};
+empty_extensions(_, client_hello) ->
+    #{renegotiation_info => undefined,
+      alpn => undefined,
+      next_protocol_negotiation => undefined,
+      srp => undefined,
+      ec_point_formats => undefined,
+      elliptic_curves => undefined,
+      sni => undefined};
+empty_extensions({3,4}, server_hello) ->
+    #{server_hello_selected_version => undefined,
+      key_share => undefined,
+      pre_shared_key => undefined
+     };
+empty_extensions({3,4}, hello_retry_request) ->
+    #{server_hello_selected_version => undefined,
+      key_share => undefined,
+      pre_shared_key => undefined
+     };
+empty_extensions({3,0}, _) ->
+    empty_extensions();
+empty_extensions(_, server_hello) ->
+    #{renegotiation_info => undefined,
+      alpn => undefined,
+      next_protocol_negotiation => undefined,
+      ec_point_formats => undefined}.
diff --git a/lib/ssl/src/ssl_handshake.hrl b/lib/ssl/src/ssl_handshake.hrl
index a191fcf766..b248edcaa9 100644
--- a/lib/ssl/src/ssl_handshake.hrl
+++ b/lib/ssl/src/ssl_handshake.hrl
@@ -47,14 +47,15 @@
 	  srp_username,
 	  is_resumable,
 	  time_stamp,
-	  ecc
+	  ecc,                   %% TLS 1.3 Group
+	  sign_alg,              %% TLS 1.3 Signature Algorithm
+	  dh_public_value        %% TLS 1.3 DH Public Value from peer
 	  }).
 
 -define(NUM_OF_SESSION_ID_BYTES, 32).  % TSL 1.1 & SSL 3
 -define(NUM_OF_PREMASTERSECRET_BYTES, 48).
--define(DEFAULT_DIFFIE_HELLMAN_GENERATOR, 2).
--define(DEFAULT_DIFFIE_HELLMAN_PRIME,
-	16#FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF6955817183995497CEA956AE515D2261898FA051015728E5A8AACAA68FFFFFFFFFFFFFFFF).
+-define(DEFAULT_DIFFIE_HELLMAN_GENERATOR, ssl_dh_groups:modp2048_generator()).
+-define(DEFAULT_DIFFIE_HELLMAN_PRIME, ssl_dh_groups:modp2048_prime()).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Handsake protocol - RFC 4346 section 7.4
@@ -105,7 +106,11 @@
 	  srp,
 	  ec_point_formats,
 	  elliptic_curves,
-	  sni
+	  sni,
+          client_hello_versions,
+          server_hello_selected_version,
+          signature_algs_cert,
+          key_share
 	 }).
 
 -record(server_hello, {
@@ -313,12 +318,12 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -define(SIGNATURE_ALGORITHMS_EXT, 13).
 
--record(hash_sign_algos, {
-	  hash_sign_algos
-	 }).
+-record(hash_sign_algos, {hash_sign_algos}).
+%% RFC 8446 (TLS 1.3)
+-record(signature_algorithms, {signature_scheme_list}).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Application-Layer Protocol Negotiation  RFC 7301
+%% RFC 7301 Application-Layer Protocol Negotiation  
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 -define(ALPN_EXT, 16).
@@ -338,9 +343,8 @@
 -record(next_protocol, {selected_protocol}).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% ECC Extensions RFC 4492 section 4 and 5
+%% ECC Extensions RFC 8422  section 4 and 5
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 -define(ELLIPTIC_CURVES_EXT, 10).
 -define(EC_POINT_FORMATS_EXT, 11).
 
@@ -348,11 +352,18 @@
 	  elliptic_curve_list
 	 }).
 
+%% RFC 8446 (TLS 1.3) renamed the "elliptic_curve" extension.
+-record(supported_groups, {
+	  supported_groups
+	 }).
+
 -record(ec_point_formats, {
 	  ec_point_format_list
 	 }).
 
 -define(ECPOINT_UNCOMPRESSED, 0).
+%% Defined in RFC 4492, deprecated by RFC 8422
+%% RFC 8422 compliant implementations MUST not support the two formats below
 -define(ECPOINT_ANSIX962_COMPRESSED_PRIME, 1).
 -define(ECPOINT_ANSIX962_COMPRESSED_CHAR2, 2).
 
@@ -365,10 +376,11 @@
 -define(NAMED_CURVE, 3).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Server name indication RFC 6066 section 3
+%% RFC 6066 Server name indication 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--define(SNI_EXT, 16#0000).
+%% section 3
+-define(SNI_EXT, 0).
 
 %% enum { host_name(0), (255) } NameType;
 -define(SNI_NAMETYPE_HOST_NAME, 0).
@@ -377,4 +389,56 @@
           hostname = undefined
         }).
 
+%% Other possible values from RFC 6066, not supported
+-define(MAX_FRAGMENT_LENGTH, 1).
+-define(CLIENT_CERTIFICATE_URL, 2).
+-define(TRUSTED_CA_KEYS, 3).
+-define(TRUNCATED_HMAC, 4).
+-define(STATUS_REQUEST, 5).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% RFC 7250 Using Raw Public Keys in Transport Layer Security (TLS)
+%% and Datagram Transport Layer Security (DTLS)
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Not supported
+-define(CLIENT_CERTIFICATE_TYPE, 19).            
+-define(SERVER_CERTIFICATE_TYPE, 20).         
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% RFC 6520 Transport Layer Security (TLS) and
+%% Datagram Transport Layer Security (DTLS) Heartbeat Extension
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Not supported
+-define(HS_HEARTBEAT, 15).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% RFC 6962 Certificate Transparency     
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Not supported
+-define(SIGNED_CERTIFICATE_TIMESTAMP, 18).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% RFC 7685  A Transport Layer Security (TLS) ClientHello Padding Extension
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Not supported
+-define(PADDING, 21).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Supported Versions RFC 8446 (TLS 1.3) section 4.2.1 also affects TLS-1.2
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-define(SUPPORTED_VERSIONS_EXT, 43).
+
+-record(client_hello_versions, {versions}).
+-record(server_hello_selected_version, {selected_version}).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Signature Algorithms RFC 8446 (TLS 1.3) section 4.2.3 also affects TLS-1.2
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-define(SIGNATURE_ALGORITHMS_CERT_EXT, 50).
+
+-record(signature_algorithms_cert, {signature_scheme_list}).
+
 -endif. % -ifdef(ssl_handshake).
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl
index 63e751440a..06c3ccae45 100644
--- a/lib/ssl/src/ssl_internal.hrl
+++ b/lib/ssl/src/ssl_internal.hrl
@@ -25,16 +25,15 @@
 
 -include_lib("public_key/include/public_key.hrl"). 
 
+-define(VSN, "8.2.6").
 -define(SECRET_PRINTOUT, "***").
 
--type reason()            :: term().
--type reply()             :: term().
--type msg()               :: term().
--type from()              :: term().
--type host()		  :: inet:ip_address() | inet:hostname().
--type session_id()        :: 0 | binary().
+-type reason()            :: any().
+-type reply()             :: any().
+-type msg()               :: any().
+-type from()              :: any().
 -type certdb_ref()        :: reference().
--type db_handle()         :: term().
+-type db_handle()         :: any().
 -type der_cert()          :: binary().
 -type issuer()            :: tuple().
 -type serialnumber()      :: integer().
@@ -72,37 +71,64 @@
 -define(FALSE, 1).
 
 %% 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]).
+%% Keep as interop with legacy software but do not support as default
+%% tlsv1.0 and tlsv1.1 is now also considered legacy
+%% tlsv1.3 is under development (experimental).
+-define(ALL_AVAILABLE_VERSIONS, ['tlsv1.3', '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]).
+%% Defines the default versions when not specified by an ssl option.
+-define(ALL_SUPPORTED_VERSIONS, ['tlsv1.2']).
+-define(MIN_SUPPORTED_VERSIONS, ['tlsv1.1']).
+
+%% Versions allowed in TLSCiphertext.version (TLS 1.2 and prior) and
+%% TLSCiphertext.legacy_record_version (TLS 1.3).
+%% TLS 1.3 sets TLSCiphertext.legacy_record_version to 0x0303 for all records
+%% generated other than an than an initial ClientHello, where it MAY also be 0x0301.
+%% Thus, the allowed range is limited to 0x0300 - 0x0303.
+-define(ALL_TLS_RECORD_VERSIONS, ['tlsv1.2', 'tlsv1.1', tlsv1, sslv3]).
+
+-define(ALL_DATAGRAM_SUPPORTED_VERSIONS, ['dtlsv1.2']).
 -define(MIN_DATAGRAM_SUPPORTED_VERSIONS, [dtlsv1]).
 
+%% TLS 1.3 - Section 4.1.3
+%%
+%% If negotiating TLS 1.2, TLS 1.3 servers MUST set the last eight bytes
+%% of their Random value to the bytes:
+%%
+%%   44 4F 57 4E 47 52 44 01
+%%
+%% If negotiating TLS 1.1 or below, TLS 1.3 servers MUST and TLS 1.2
+%% servers SHOULD set the last eight bytes of their Random value to the
+%% bytes:
+%%
+%%   44 4F 57 4E 47 52 44 00
+-define(RANDOM_OVERRIDE_TLS12, <<16#44,16#4F,16#57,16#4E,16#47,16#52,16#44,16#01>>).
+-define(RANDOM_OVERRIDE_TLS11, <<16#44,16#4F,16#57,16#4E,16#47,16#52,16#44,16#00>>).
+
 -define('24H_in_msec', 86400000).
 -define('24H_in_sec', 86400).
 
 -record(ssl_options, {
-	  protocol    :: tls | dtls,
-	  versions    :: [ssl_record:ssl_version()], %% ssl_record:atom_version() in API
-	  verify      :: verify_none | verify_peer,
+	  protocol    :: tls | dtls | 'undefined',
+	  versions    :: [ssl_record:ssl_version()] | 'undefined', %% ssl_record:atom_version() in API
+	  verify      :: verify_none | verify_peer | 'undefined',
 	  verify_fun,  %%:: fun(CertVerifyErrors::term()) -> boolean(),
-	  partial_chain       :: fun(),
-	  fail_if_no_peer_cert ::  boolean(),
-	  verify_client_once   ::  boolean(),
+	  partial_chain       :: fun() | 'undefined',
+	  fail_if_no_peer_cert ::  boolean() | 'undefined',
+	  verify_client_once   ::  boolean() | 'undefined',
 	  %% fun(Extensions, State, Verify, AccError) ->  {Extensions, State, AccError}
 	  validate_extensions_fun, 
-	  depth                :: integer(),
-	  certfile             :: binary(),
+	  depth                :: integer() | 'undefined',
+	  certfile             :: binary() | 'undefined',
 	  cert                 :: public_key:der_encoded() | secret_printout() | 'undefined',
-	  keyfile              :: binary(),
-	  key	               :: {'RSAPrivateKey' | 'DSAPrivateKey' | 'ECPrivateKey' | 'PrivateKeyInfo', 
-                                   public_key:der_encoded()} | key_map() | secret_printout() | 'undefined',
+	  keyfile              :: binary() | 'undefined',
+	  key	               :: {'RSAPrivateKey' | 'DSAPrivateKey' | 'ECPrivateKey' | 'PrivateKeyInfo' | 'undefined',
+                                   public_key:der_encoded()} | map()  %%map() -> ssl:key() how to handle dialyzer?
+                                | secret_printout() | 'undefined',
 	  password	       :: string() | secret_printout() | 'undefined',
 	  cacerts              :: [public_key:der_encoded()] | secret_printout() | 'undefined',
-	  cacertfile           :: binary(),
-	  dh                   :: public_key:der_encoded() | secret_printout(),
+	  cacertfile           :: binary() | 'undefined',
+	  dh                   :: public_key:der_encoded() | secret_printout() | 'undefined',
 	  dhfile               :: binary() | secret_printout() | 'undefined',
 	  user_lookup_fun,  % server option, fun to lookup the user
 	  psk_identity         :: binary() | secret_printout() | 'undefined',
@@ -111,26 +137,26 @@
 	  %% Local policy for the server if it want's to reuse the session
 	  %% or not. Defaluts to allways returning true.
 	  %% fun(SessionId, PeerCert, Compression, CipherSuite) -> boolean()
-	  reuse_session,  
+	  reuse_session        :: fun() | binary() | undefined, %% Server side is a fun()
 	  %% If false sessions will never be reused, if true they
 	  %% will be reused if possible.
-	  reuse_sessions       :: boolean(),
+	  reuse_sessions       :: boolean() | save | 'undefined',  %% Only client side can use value save
 	  renegotiate_at,
 	  secure_renegotiate,
 	  client_renegotiation,
 	  %% undefined if not hibernating, or number of ms of
 	  %% inactivity after which ssl_connection will go into
 	  %% hibernation
-	  hibernate_after      :: timeout(),          
+	  hibernate_after      :: timeout() | 'undefined',
 	  %% This option should only be set to true by inet_tls_dist
 	  erl_dist = false     :: boolean(),
-          alpn_advertised_protocols = undefined :: [binary()] | undefined ,
+          alpn_advertised_protocols = undefined :: [binary()] | undefined,
           alpn_preferred_protocols = undefined  :: [binary()] | undefined,
 	  next_protocols_advertised = undefined :: [binary()] | undefined,
 	  next_protocol_selector = undefined,  %% fun([binary()]) -> binary())
-	  log_alert             :: boolean(),
+	  log_level = notice :: atom(),
 	  server_name_indication = undefined,
-	  sni_hosts  :: [{inet:hostname(), [tuple()]}],
+	  sni_hosts  :: [{inet:hostname(), [tuple()]}] | 'undefined',
 	  sni_fun :: function() | undefined,
 	  %% Should the server prefer its own cipher order over the one provided by
 	  %% the client?
@@ -140,14 +166,18 @@
 	  %%mitigation entirely?
 	  beast_mitigation = one_n_minus_one :: one_n_minus_one | zero_n | disabled,
 	  fallback = false           :: boolean(),
-	  crl_check                  :: boolean() | peer | best_effort, 
+	  crl_check                  :: boolean() | peer | best_effort | 'undefined',
 	  crl_cache,
 	  signature_algs,
+	  signature_algs_cert,
 	  eccs,
-	  honor_ecc_order            :: boolean(),
-          max_handshake_size         :: integer(),
+	  supported_groups,  %% RFC 8422, RFC 8446
+	  honor_ecc_order            :: boolean() | 'undefined',
+          max_handshake_size         :: integer() | 'undefined',
           handshake,
           customize_hostname_check
+    %%                 ,
+      %%    save_session               :: boolean()            
          }).
 
 -record(socket_options,
@@ -168,19 +198,12 @@
 		 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()} |
-				{stop, term(), term()}.
+-type gen_fsm_state_return() :: {next_state, state_name(), any()} |
+				{next_state, state_name(), any(), timeout()} |
+				{stop, any(), any()}.
+-type ssl_options()          :: #ssl_options{}.
+
 -endif. % -ifdef(ssl_internal).
 
 
diff --git a/lib/ssl/src/ssl_logger.erl b/lib/ssl/src/ssl_logger.erl
new file mode 100644
index 0000000000..514a4464bc
--- /dev/null
+++ b/lib/ssl/src/ssl_logger.erl
@@ -0,0 +1,451 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1999-2019. 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_logger).
+
+-export([debug/4,
+         format/2,
+         notice/2]).
+
+-define(DEC2HEX(X),
+        if ((X) >= 0) andalso ((X) =< 9) -> (X) + $0;
+           ((X) >= 10) andalso ((X) =< 15) -> (X) + $a - 10
+        end).
+
+-define(rec_info(T,R),lists:zip(record_info(fields,T),tl(tuple_to_list(R)))).
+
+-include("tls_record.hrl").
+-include("ssl_cipher.hrl").
+-include("ssl_internal.hrl").
+-include("tls_handshake.hrl").
+-include("dtls_handshake.hrl").
+-include("tls_handshake_1_3.hrl").
+-include_lib("kernel/include/logger.hrl").
+
+%%-------------------------------------------------------------------------
+%% External API
+%%-------------------------------------------------------------------------
+
+%% SSL log formatter
+format(#{level:= _Level, msg:= {report, Msg}, meta:= _Meta}, _Config0) ->
+     #{direction := Direction,
+       protocol := Protocol,
+       message := Content} = Msg,
+    case Protocol of
+        'record' ->
+            BinMsg =
+                case Content of
+                    #ssl_tls{} ->
+                        [tls_record:build_tls_record(Content)];
+                    _ when is_list(Content) ->
+                        lists:flatten(Content)
+                end,
+            format_tls_record(Direction, BinMsg);
+        'handshake' ->
+            format_handshake(Direction, Content);
+        _Other ->
+            []
+    end.
+
+%% Stateful logging
+debug(Level, Direction, Protocol, Message)
+  when (Direction =:= inbound orelse Direction =:= outbound) andalso
+       (Protocol =:= 'record' orelse Protocol =:= 'handshake') ->
+    case logger:compare_levels(Level, debug) of
+        lt ->
+            ?LOG_DEBUG(#{direction => Direction,
+                         protocol => Protocol,
+                         message => Message},
+                       #{domain => [otp,ssl,Protocol]});
+        eq ->
+            ?LOG_DEBUG(#{direction => Direction,
+                         protocol => Protocol,
+                         message => Message},
+                       #{domain => [otp,ssl,Protocol]});
+        _ ->
+            ok
+    end.
+
+%% Stateful logging
+notice(Level, Report) ->
+    case logger:compare_levels(Level, notice) of
+        lt ->
+            ?LOG_NOTICE(Report);
+        eq ->
+            ?LOG_NOTICE(Report);
+        _ ->
+            ok
+    end.
+
+
+%%-------------------------------------------------------------------------
+%% Handshake Protocol
+%%-------------------------------------------------------------------------
+format_handshake(Direction, BinMsg) ->
+    {Header, Message} = parse_handshake(Direction, BinMsg),
+    io_lib:format("~s~n~s~n", [Header, Message]).
+
+
+parse_handshake(Direction, #client_hello{
+                              client_version = Version0,
+                              cipher_suites = CipherSuites0,
+                              extensions = Extensions
+                             } = ClientHello) ->
+    Version = get_client_version(Version0, Extensions),
+    Header = io_lib:format("~s ~s Handshake, ClientHello",
+                           [header_prefix(Direction),
+                            version(Version)]),
+    CipherSuites = parse_cipher_suites(CipherSuites0),
+    Message = io_lib:format("~p",
+                            [?rec_info(client_hello,
+                                       ClientHello#client_hello{cipher_suites = CipherSuites})]),
+    {Header, Message};
+parse_handshake(Direction, #server_hello{
+                              server_version = Version0,
+                              cipher_suite = CipherSuite0,
+                              extensions = Extensions
+                             } = ServerHello) ->
+    Version = get_server_version(Version0, Extensions),
+    Header = io_lib:format("~s ~s Handshake, ServerHello",
+                           [header_prefix(Direction),
+                            version(Version)]),
+    CipherSuite = format_cipher(CipherSuite0),
+    Message = io_lib:format("~p",
+                            [?rec_info(server_hello,
+                                       ServerHello#server_hello{cipher_suite = CipherSuite})]),
+    {Header, Message};
+parse_handshake(Direction, #hello_verify_request{} = HelloVerifyRequest) ->
+    Header = io_lib:format("~s Handshake, HelloVerifyRequest",
+                           [header_prefix(Direction)]),
+    Message = io_lib:format("~p", [?rec_info(hello_verify_request, HelloVerifyRequest)]),
+    {Header, Message};
+parse_handshake(Direction, #certificate{} = Certificate) ->
+    Header = io_lib:format("~s Handshake, Certificate",
+                           [header_prefix(Direction)]),
+    Message = io_lib:format("~p", [?rec_info(certificate, Certificate)]),
+    {Header, Message};
+parse_handshake(Direction, #server_key_exchange{} = ServerKeyExchange) ->
+    Header = io_lib:format("~s Handshake, ServerKeyExchange",
+                           [header_prefix(Direction)]),
+    Message = io_lib:format("~p", [?rec_info(server_key_exchange, ServerKeyExchange)]),
+    {Header, Message};
+parse_handshake(Direction, #server_key_params{} = ServerKeyExchange) ->
+    Header = io_lib:format("~s Handshake, ServerKeyExchange",
+                           [header_prefix(Direction)]),
+    Message = io_lib:format("~p", [?rec_info(server_key_params, ServerKeyExchange)]),
+    {Header, Message};
+parse_handshake(Direction, #certificate_request{} = CertificateRequest) ->
+    Header = io_lib:format("~s Handshake, CertificateRequest",
+                           [header_prefix(Direction)]),
+    Message = io_lib:format("~p", [?rec_info(certificate_request, CertificateRequest)]),
+    {Header, Message};
+parse_handshake(Direction, #server_hello_done{} = ServerHelloDone) ->
+    Header = io_lib:format("~s Handshake, ServerHelloDone",
+                           [header_prefix(Direction)]),
+    Message = io_lib:format("~p", [?rec_info(server_hello_done, ServerHelloDone)]),
+    {Header, Message};
+parse_handshake(Direction, #client_key_exchange{} = ClientKeyExchange) ->
+    Header = io_lib:format("~s Handshake, ClientKeyExchange",
+                           [header_prefix(Direction)]),
+    Message = io_lib:format("~p", [?rec_info(client_key_exchange, ClientKeyExchange)]),
+    {Header, Message};
+parse_handshake(Direction, #certificate_verify{} = CertificateVerify) ->
+    Header = io_lib:format("~s Handshake, CertificateVerify",
+                           [header_prefix(Direction)]),
+    Message = io_lib:format("~p", [?rec_info(certificate_verify, CertificateVerify)]),
+    {Header, Message};
+parse_handshake(Direction, #finished{} = Finished) ->
+    Header = io_lib:format("~s Handshake, Finished",
+                           [header_prefix(Direction)]),
+    Message = io_lib:format("~p", [?rec_info(finished, Finished)]),
+    {Header, Message};
+parse_handshake(Direction, #hello_request{} = HelloRequest) ->
+    Header = io_lib:format("~s Handshake, HelloRequest",
+                           [header_prefix(Direction)]),
+    Message = io_lib:format("~p", [?rec_info(hello_request, HelloRequest)]),
+    {Header, Message};
+parse_handshake(Direction, #certificate_request_1_3{} = CertificateRequest) ->
+    Header = io_lib:format("~s Handshake, CertificateRequest",
+                           [header_prefix(Direction)]),
+    Message = io_lib:format("~p", [?rec_info(certificate_request_1_3, CertificateRequest)]),
+    {Header, Message};
+parse_handshake(Direction, #certificate_1_3{} = Certificate) ->
+    Header = io_lib:format("~s Handshake, Certificate",
+                           [header_prefix(Direction)]),
+    Message = io_lib:format("~p", [?rec_info(certificate_1_3, Certificate)]),
+    {Header, Message};
+parse_handshake(Direction, #certificate_verify_1_3{} = CertificateVerify) ->
+    Header = io_lib:format("~s Handshake, CertificateVerify",
+                           [header_prefix(Direction)]),
+    Message = io_lib:format("~p", [?rec_info(certificate_verify_1_3, CertificateVerify)]),
+    {Header, Message};
+parse_handshake(Direction, #encrypted_extensions{} = EncryptedExtensions) ->
+    Header = io_lib:format("~s Handshake, EncryptedExtensions",
+                           [header_prefix(Direction)]),
+    Message = io_lib:format("~p", [?rec_info(encrypted_extensions, EncryptedExtensions)]),
+    {Header, Message};
+parse_handshake(Direction, #new_session_ticket{} = NewSessionTicket) ->
+    Header = io_lib:format("~s Post-Handshake, NewSessionTicket",
+                           [header_prefix(Direction)]),
+    Message = io_lib:format("~p", [?rec_info(new_session_ticket, NewSessionTicket)]),
+    {Header, Message}.
+
+
+parse_cipher_suites([_|_] = Ciphers) ->
+    [format_cipher(C) || C <- Ciphers].
+
+format_cipher(C0) ->
+    try ssl_cipher_format:suite_bin_to_map(C0) of
+        Map ->
+            ssl_cipher_format:suite_map_to_str(Map)
+    catch 
+        error:function_clause ->
+            format_uknown_cipher_suite(C0)
+    end.
+
+get_client_version(Version, Extensions) ->
+    CHVersions = maps:get(client_hello_versions, Extensions, undefined),
+    case CHVersions of
+        #client_hello_versions{versions = [Highest|_]} ->
+            Highest;
+        undefined ->
+            Version
+    end.
+
+get_server_version(Version, Extensions) ->
+    SHVersion = maps:get(server_hello_selected_version, Extensions, undefined),
+    case SHVersion of
+        #server_hello_selected_version{selected_version = SelectedVersion} ->
+            SelectedVersion;
+        undefined ->
+            Version
+    end.
+
+version({3,4}) ->
+    "TLS 1.3";
+version({3,3}) ->
+    "TLS 1.2";
+version({3,2}) ->
+    "TLS 1.1";
+version({3,1}) ->
+    "TLS 1.0";
+version({3,0}) ->
+    "SSL 3.0";
+version({254,253}) ->
+    "DTLS 1.2";
+version({254,255}) ->
+    "DTLS 1.0";
+version({M,N}) ->
+    io_lib:format("TLS/DTLS [0x0~B0~B]", [M,N]).
+
+header_prefix(inbound) ->
+    "<<<";
+header_prefix(outbound) ->
+    ">>>".
+
+
+%%-------------------------------------------------------------------------
+%% TLS Record Protocol
+%%-------------------------------------------------------------------------
+format_tls_record(Direction, BinMsg) ->
+    {Message, Size} = convert_to_hex('tls_record', BinMsg),
+    Header = io_lib:format("~s (~B bytes) ~s~n",
+                           [header_prefix_tls_record(Direction),
+                            Size,
+                            tls_record_version(BinMsg)]),
+    Header ++ Message.
+
+
+header_prefix_tls_record(inbound) ->
+    "reading";
+header_prefix_tls_record(outbound) ->
+    "writing".
+
+
+tls_record_version([<<?BYTE(B),?BYTE(3),?BYTE(3),_/binary>>|_]) ->
+    io_lib:format("TLS 1.2 Record Protocol, ~s", [msg_type(B)]);
+tls_record_version([<<?BYTE(B),?BYTE(3),?BYTE(2),_/binary>>|_]) ->
+    io_lib:format("TLS 1.1 Record Protocol, ~s", [msg_type(B)]);
+tls_record_version([<<?BYTE(B),?BYTE(3),?BYTE(1),_/binary>>|_]) ->
+    io_lib:format("TLS 1.0 Record Protocol, ~s", [msg_type(B)]);
+tls_record_version([<<?BYTE(B),?BYTE(3),?BYTE(0),_/binary>>|_]) ->
+    io_lib:format("SSL 3.0 Record Protocol, ~s", [msg_type(B)]);
+tls_record_version([<<?BYTE(B),?BYTE(254),?BYTE(253),_/binary>>|_]) ->
+    io_lib:format("DTLS 1.2 Record Protocol, ~s", [msg_type(B)]);
+tls_record_version([<<?BYTE(B),?BYTE(254),?BYTE(255),_/binary>>|_]) ->
+    io_lib:format("DTLS 1.0 Record Protocol, ~s", [msg_type(B)]);
+tls_record_version([<<?BYTE(B),?BYTE(M),?BYTE(N),_/binary>>|_]) ->
+    io_lib:format("TLS/DTLS [0x0~B0~B] Record Protocol, ~s", [M, N, msg_type(B)]).
+
+
+msg_type(20) -> "change_cipher_spec";
+msg_type(21) -> "alert";
+msg_type(22) -> "handshake";
+msg_type(23) -> "application_data";
+msg_type(_) -> unknown.
+
+
+%%-------------------------------------------------------------------------
+%% Hex encoding functions
+%%-------------------------------------------------------------------------
+convert_to_hex(Protocol, BinMsg) ->
+    convert_to_hex(Protocol, BinMsg, [], [], 0).
+%%
+convert_to_hex(P, [], Row0, Acc, C) when C rem 16 =:= 0 ->
+    Row = lists:reverse(end_row(P, Row0)),
+    {lists:reverse(Acc) ++ Row ++ io_lib:nl(), C};
+convert_to_hex(P, [], Row0, Acc, C) ->
+    Row = lists:reverse(end_row(P, Row0)),
+    Padding = calculate_padding(Row0, Acc),
+    PaddedRow = string:pad(Row, Padding, leading, $ ),
+    {lists:reverse(Acc) ++ PaddedRow ++ io_lib:nl(), C};
+convert_to_hex(P, [H|T], Row, Acc, C) when is_list(H) ->
+    convert_to_hex(P, H ++ T, Row, Acc, C);
+convert_to_hex(P, [<<>>|T], Row, Acc, C) ->
+    convert_to_hex(P, T, Row, Acc, C);
+
+%% First line
+convert_to_hex(P, [<<A:4,B:4,R/binary>>|T], Row, Acc, C) when C =:= 0 ->
+    convert_to_hex(P, [<<R/binary>>|T],
+                   update_row(<<A:4,B:4>>, Row),
+                   prepend_first_row(P, A, B, Acc, C),
+                   C + 1);
+%% New line
+convert_to_hex(P, [<<A:4,B:4,R/binary>>|T], Row, Acc, C) when C rem 16 =:= 0 ->
+    convert_to_hex(P, [<<R/binary>>|T],
+                   update_row(<<A:4,B:4>>, []),
+                   prepend_row(P, A, B, Row, Acc, C),
+                   C + 1);
+%% Add 8th hex with extra whitespace
+%% 0000 - 16 03 02 00 bd 01 00 00  b9 ...
+%%                             ^^^^
+convert_to_hex(P, [<<A:4,B:4,R/binary>>|T], Row, Acc, C) when C rem 8 =:= 7 ->
+    convert_to_hex(P, [<<R/binary>>|T],
+                   update_row(<<A:4,B:4>>, Row),
+                   prepend_eighths_hex(A, B, Acc),
+                   C + 1);
+convert_to_hex(P, [<<A:4,B:4,R/binary>>|T], Row, Acc, C) ->
+    convert_to_hex(P, [<<R/binary>>|T],
+                   update_row(<<A:4,B:4>>, Row),
+                   prepend_hex(A, B, Acc),
+                   C + 1);
+%% First line
+convert_to_hex(P, [H|T], Row, Acc, C) when is_integer(H), C =:= 0 ->
+    convert_to_hex(P, T,
+                   update_row(H, Row),
+                   prepend_first_row(P, H, Acc, C),
+                   C + 1);
+%% New line
+convert_to_hex(P, [H|T], Row, Acc, C) when is_integer(H), C rem 16 =:= 0 ->
+    convert_to_hex(P, T,
+                   update_row(H, []),
+                   prepend_row(P, H, Row, Acc, C),
+                   C + 1);
+%% Add 8th hex with extra whitespace
+%% 0000 - 16 03 02 00 bd 01 00 00  b9 ...
+%%                             ^^^^
+convert_to_hex(P, [H|T], Row, Acc, C) when is_integer(H), C rem 8 =:= 7 ->
+    convert_to_hex(P, T,
+                   update_row(H, Row),
+                   prepend_eighths_hex(H, Acc),
+                   C + 1);
+convert_to_hex(P, [H|T], Row, Acc, C) when is_integer(H) ->
+    convert_to_hex(P, T,
+                   update_row(H, Row),
+                   prepend_hex(H, Acc),
+                   C + 1).
+
+
+row_prefix(_ , N) ->
+    S = string:pad(string:to_lower(erlang:integer_to_list(N, 16)),4,leading,$0),
+    lists:reverse(lists:flatten(S ++ " - ")).
+
+
+end_row(_, Row) ->
+    Row ++ "  ".
+
+
+%% Calculate padding of the "printable character" lines in order to be
+%% visually aligned.
+calculate_padding(Row, Acc) ->
+    %% Number of new line characters
+    NNL = (length(Acc) div 75) * length(io_lib:nl()),
+    %% Length of the last printed line
+    Length = (length(Acc) - NNL) rem 75,
+    %% Adjusted length of the last printed line
+    PaddedLength = 75 - (16 - length(Row)), %% Length
+    %% Padding
+    PaddedLength - Length.
+
+
+%%-------------------------------------------------------------------------
+%% Functions operating on reversed lists
+%%-------------------------------------------------------------------------
+update_row(B, Row) when is_binary(B) ->
+    case binary_to_list(B) of
+        [C] when 32 =< C, C =< 126 ->
+            [C|Row];
+        _Else ->
+            [$.|Row]
+    end;
+update_row(C, Row) when 32 =< C, C =< 126 ->
+    [C|Row];
+update_row(_, Row) ->
+    [$.|Row].
+
+
+prepend_first_row(P, A, B, Acc, C) ->
+    prepend_hex(A, B,row_prefix(P, C) ++ Acc).
+%%
+prepend_first_row(P, N, Acc, C) ->
+    prepend_hex(N,row_prefix(P, C) ++ Acc).
+
+prepend_row(P, A, B, Row, Acc, C) ->
+    prepend_hex(A, B,row_prefix(P, C) ++ io_lib:nl() ++ end_row(P, Row) ++ Acc).
+%%
+prepend_row(P, N, Row, Acc, C) ->
+    prepend_hex(N,row_prefix(P, C) ++ io_lib:nl() ++ end_row(P, Row) ++ Acc).
+
+
+
+prepend_hex(A, B, Acc) ->
+    [$ ,?DEC2HEX(B),?DEC2HEX(A)|Acc].
+%%
+prepend_hex(N, Acc) ->
+    " " ++ number_to_hex(N) ++ Acc.
+
+
+prepend_eighths_hex(A, B, Acc) ->
+    [$ ,$ ,?DEC2HEX(B),?DEC2HEX(A)|Acc].
+%%
+prepend_eighths_hex(N, Acc) ->
+    "  " ++ number_to_hex(N) ++ Acc.
+
+number_to_hex(N) ->
+    case string:to_lower(erlang:integer_to_list(N, 16)) of
+        H when length(H) < 2 ->
+            lists:append(H, "0");
+        H ->
+            lists:reverse(H)
+    end.
+ 
+format_uknown_cipher_suite(<<?BYTE(X), ?BYTE(Y)>>) ->
+    "0x" ++ number_to_hex(X) ++ "0x" ++ number_to_hex(Y).
+
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl
index 4b735b2400..456a560bf6 100644
--- a/lib/ssl/src/ssl_manager.erl
+++ b/lib/ssl/src/ssl_manager.erl
@@ -30,7 +30,7 @@
 	 connection_init/3, cache_pem_file/2,
 	 lookup_trusted_cert/4,
 	 new_session_id/1, clean_cert_db/2,
-	 register_session/2, register_session/3, invalidate_session/2,
+	 register_session/2, register_session/4, invalidate_session/2,
 	 insert_crls/2, insert_crls/3, delete_crls/1, delete_crls/2, 
 	 invalidate_session/3, name/1]).
 
@@ -42,6 +42,8 @@
 
 -include("ssl_handshake.hrl").
 -include("ssl_internal.hrl").
+-include("ssl_api.hrl").
+
 -include_lib("kernel/include/file.hrl").
 
 -record(state, {
@@ -148,7 +150,7 @@ lookup_trusted_cert(DbHandle, Ref, SerialNumber, Issuer) ->
     ssl_pkix_db:lookup_trusted_cert(DbHandle, Ref, SerialNumber, Issuer).
 
 %%--------------------------------------------------------------------
--spec new_session_id(integer()) -> session_id().
+-spec new_session_id(integer()) -> ssl:session_id().
 %%
 %% Description: Creates a session id for the server.
 %%--------------------------------------------------------------------
@@ -170,9 +172,11 @@ clean_cert_db(Ref, File) ->
 %%
 %% Description: Make the session available for reuse.
 %%--------------------------------------------------------------------
--spec register_session(host(), inet:port_number(), #session{}) -> ok.
-register_session(Host, Port, Session) ->
-    cast({register_session, Host, Port, Session}).
+-spec register_session(ssl:host(), inet:port_number(), #session{}, unique | true) -> ok.
+register_session(Host, Port, Session, true) ->
+    call({register_session, Host, Port, Session});
+register_session(Host, Port, Session, unique = Save) ->
+    cast({register_session, Host, Port, Session, Save}).
 
 -spec register_session(inet:port_number(), #session{}) -> ok.
 register_session(Port, Session) ->
@@ -183,7 +187,7 @@ register_session(Port, Session) ->
 %% a the session has been marked "is_resumable = false" for some while
 %% it will be safe to remove the data from the session database.
 %%--------------------------------------------------------------------
--spec invalidate_session(host(), inet:port_number(), #session{}) -> ok.
+-spec invalidate_session(ssl:host(), inet:port_number(), #session{}) -> ok.
 invalidate_session(Host, Port, Session) ->
     load_mitigation(),
     cast({invalidate_session, Host, Port, Session}).
@@ -301,7 +305,10 @@ handle_call({{new_session_id, Port}, _},
 	    _, #state{session_cache_cb = CacheCb,
 		      session_cache_server = Cache} = State) ->
     Id = new_id(Port, ?GEN_UNIQUE_ID_MAX_TRIES, Cache, CacheCb),
-    {reply, Id, State}.
+    {reply, Id, State};
+handle_call({{register_session, Host, Port, Session},_}, _, State0) ->
+    State = client_register_session(Host, Port, Session, State0), 
+    {reply, ok, State}.
 
 %%--------------------------------------------------------------------
 -spec  handle_cast(msg(), #state{}) -> {noreply, #state{}}.
@@ -311,8 +318,12 @@ handle_call({{new_session_id, Port}, _},
 %%
 %% Description: Handling cast messages
 %%--------------------------------------------------------------------
-handle_cast({register_session, Host, Port, Session}, State0) ->
-    State = ssl_client_register_session(Host, Port, Session, State0), 
+handle_cast({register_session, Host, Port, Session, unique}, State0) ->
+    State = client_register_unique_session(Host, Port, Session, State0), 
+    {noreply, State};
+
+handle_cast({register_session, Host, Port, Session, true}, State0) ->
+    State = client_register_session(Host, Port, Session, State0), 
     {noreply, State};
 
 handle_cast({register_session, Port, Session}, State0) ->    
@@ -505,10 +516,10 @@ last_delay_timer({{_,_},_}, TRef, {LastServer, _}) ->
 last_delay_timer({_,_}, TRef, {_, LastClient}) ->
     {TRef, LastClient}.
 
-%% If we can not generate a not allready in use session ID in
+%% If we cannot generate a not allready in use session ID in
 %% ?GEN_UNIQUE_ID_MAX_TRIES we make the new session uncacheable The
 %% value of ?GEN_UNIQUE_ID_MAX_TRIES is stolen from open SSL which
-%% states : "If we can not find a session id in
+%% states : "If we cannot find a session id in
 %% ?GEN_UNIQUE_ID_MAX_TRIES either the RAND code is broken or someone
 %% is trying to open roughly very close to 2^128 (or 2^256) SSL
 %% sessions to our server"
@@ -519,7 +530,7 @@ new_id(Port, Tries, Cache, CacheCb) ->
     case CacheCb:lookup(Cache, {Port, Id}) of
 	undefined ->
 	    Now = erlang:monotonic_time(),
-	    %% New sessions can not be set to resumable
+	    %% New sessions cannot be set to resumable
 	    %% until handshake is compleate and the
 	    %% other session values are set.
 	    CacheCb:update(Cache, {Port, Id}, #session{session_id = Id,
@@ -540,10 +551,10 @@ clean_cert_db(Ref, CertDb, RefDb, FileMapDb, File) ->
 	    ok
     end.
 
-ssl_client_register_session(Host, Port, Session, #state{session_cache_client = Cache,
-							session_cache_cb = CacheCb,
-							session_cache_client_max = Max,
-							session_client_invalidator = Pid0} = State) ->
+client_register_unique_session(Host, Port, Session, #state{session_cache_client = Cache,
+                                                           session_cache_cb = CacheCb,
+                                                           session_cache_client_max = Max,
+                                                           session_client_invalidator = Pid0} = State) ->
     TimeStamp = erlang:monotonic_time(),
     NewSession = Session#session{time_stamp = TimeStamp},
     
@@ -557,6 +568,17 @@ ssl_client_register_session(Host, Port, Session, #state{session_cache_client = C
 	    register_unique_session(Sessions, NewSession, {Host, Port}, State)
     end.
 
+client_register_session(Host, Port, Session, #state{session_cache_client = Cache,
+                                                    session_cache_cb = CacheCb,
+                                                    session_cache_client_max = Max,
+                                                    session_client_invalidator = Pid0} = State) ->
+    TimeStamp = erlang:monotonic_time(),
+    NewSession = Session#session{time_stamp = TimeStamp},
+    Pid = do_register_session({{Host, Port}, 
+                               NewSession#session.session_id}, 
+                              NewSession, Max, Pid0, Cache, CacheCb),
+    State#state{session_client_invalidator = Pid}.
+
 server_register_session(Port, Session, #state{session_cache_server_max = Max,
 					      session_cache_server = Cache,
 					      session_cache_cb = CacheCb,
diff --git a/lib/ssl/src/ssl_pkix_db.erl b/lib/ssl/src/ssl_pkix_db.erl
index f7ddbd060e..dec48fa914 100644
--- a/lib/ssl/src/ssl_pkix_db.erl
+++ b/lib/ssl/src/ssl_pkix_db.erl
@@ -27,6 +27,7 @@
 -include("ssl_internal.hrl").
 -include_lib("public_key/include/public_key.hrl").
 -include_lib("kernel/include/file.hrl").
+-include_lib("kernel/include/logger.hrl").
 
 -export([create/1, create_pem_cache/1, 
 	 add_crls/3, remove_crls/2, remove/1, add_trusted_certs/3, 
@@ -311,7 +312,7 @@ decode_certs(Ref, Cert) ->
 	error:_ ->
 	    Report = io_lib:format("SSL WARNING: Ignoring a CA cert as "
 				   "it could not be correctly decoded.~n", []),
-	    error_logger:info_report(Report),
+	    ?LOG_NOTICE(Report),
 	    undefined
     end.
 
diff --git a/lib/ssl/src/ssl_record.erl b/lib/ssl/src/ssl_record.erl
index b9d1320ef3..867d2cfc5a 100644
--- a/lib/ssl/src/ssl_record.erl
+++ b/lib/ssl/src/ssl_record.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2019. 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,7 @@
 -module(ssl_record).
 
 -include("ssl_record.hrl").
+-include("ssl_connection.hrl").
 -include("ssl_internal.hrl").
 -include("ssl_cipher.hrl").
 -include("ssl_alert.hrl").
@@ -39,20 +40,23 @@
 	 set_renegotiation_flag/2,
 	 set_client_verify_data/3,
 	 set_server_verify_data/3,
-	 empty_connection_state/2, initial_connection_state/2, record_protocol_role/1]).
+	 empty_connection_state/2, initial_connection_state/2, record_protocol_role/1,
+         step_encryption_state/1]).
 
 %% Compression
 -export([compress/3, uncompress/3, compressions/0]).
 
 %% Payload encryption/decryption
--export([cipher/4, decipher/4, cipher_aead/4, decipher_aead/5, is_correct_mac/2, nonce_seed/3]).
+-export([cipher/4, cipher/5, decipher/4,
+         cipher_aead/4, cipher_aead/5, decipher_aead/5,
+         is_correct_mac/2, nonce_seed/3]).
 
 -export_type([ssl_version/0, ssl_atom_version/0, connection_states/0, connection_state/0]).
 
 -type ssl_version()       :: {integer(), integer()}.
 -type ssl_atom_version() :: tls_record:tls_atom_version().
--type connection_states() :: term(). %% Map
--type connection_state() :: term(). %% Map
+-type connection_states() :: map(). %% Map
+-type connection_state() :: map(). %% Map
 
 %%====================================================================
 %% Connection state handling
@@ -118,6 +122,22 @@ activate_pending_connection_state(#{current_write := Current,
 	   }.
 
 %%--------------------------------------------------------------------
+-spec step_encryption_state(#state{}) -> #state{}.
+%%
+%% Description: Activates the next encyrption state (e.g. handshake
+%% encryption).
+%%--------------------------------------------------------------------
+step_encryption_state(#state{connection_states =
+                                 #{pending_read := PendingRead,
+                                   pending_write := PendingWrite} = ConnStates} = State) ->
+    NewRead = PendingRead#{sequence_number => 0},
+    NewWrite = PendingWrite#{sequence_number => 0},
+    State#state{connection_states =
+                    ConnStates#{current_read => NewRead,
+                                current_write => NewWrite}}.
+
+
+%%--------------------------------------------------------------------
 -spec set_security_params(#security_parameters{}, #security_parameters{},
 			  connection_states()) -> connection_states().
 %%
@@ -278,13 +298,12 @@ compress(?NULL, Data, CS) ->
     {Data, CS}.
 
 %%--------------------------------------------------------------------
--spec compressions() -> [binary()].
+-spec compressions() -> [integer()].
 %%
 %% Description: return a list of compressions supported (currently none)
 %%--------------------------------------------------------------------
 compressions() ->
-    [?byte(?NULL)].
-
+    [?NULL].
 
 %%====================================================================
 %% Payload encryption/decryption
@@ -302,27 +321,49 @@ cipher(Version, Fragment,
 	     #security_parameters{bulk_cipher_algorithm =
 				      BulkCipherAlgo}
 	} = WriteState0, MacHash) ->
-    
+    %%
     {CipherFragment, CipherS1} =
 	ssl_cipher:cipher(BulkCipherAlgo, CipherS0, MacHash, Fragment, Version),
     {CipherFragment,  WriteState0#{cipher_state => CipherS1}}.
+
+%%--------------------------------------------------------------------
+-spec cipher(ssl_version(), iodata(), #cipher_state{}, MacHash::binary(), #security_parameters{}) ->
+		    {CipherFragment::binary(), #cipher_state{}}.
+%%
+%% Description: Payload encryption
+%%--------------------------------------------------------------------
+cipher(Version, Fragment, CipherS0, MacHash,
+       #security_parameters{bulk_cipher_algorithm = BulkCipherAlgo}) ->
+    %%
+    ssl_cipher:cipher(BulkCipherAlgo, CipherS0, MacHash, Fragment, Version).
+
 %%--------------------------------------------------------------------
 -spec cipher_aead(ssl_version(), iodata(), connection_state(), AAD::binary()) ->
  			 {CipherFragment::binary(), connection_state()}.
 
 %% Description: Payload encryption
 %% %%--------------------------------------------------------------------
-cipher_aead(Version, Fragment,
+cipher_aead(_Version, Fragment,
 	    #{cipher_state := CipherS0,
 	      security_parameters :=
 		  #security_parameters{bulk_cipher_algorithm =
 					   BulkCipherAlgo}
 	     } = WriteState0, AAD) ->
     {CipherFragment, CipherS1} =
-	cipher_aead(BulkCipherAlgo, CipherS0, AAD, Fragment, Version),
+	do_cipher_aead(BulkCipherAlgo, Fragment, CipherS0, AAD),
     {CipherFragment,  WriteState0#{cipher_state => CipherS1}}.
 
 %%--------------------------------------------------------------------
+-spec cipher_aead(ssl_version(), iodata(), #cipher_state{}, AAD::binary(), #security_parameters{}) ->
+                         {CipherFragment::binary(), #cipher_state{}}.
+
+%% Description: Payload encryption
+%% %%--------------------------------------------------------------------
+cipher_aead(_Version, Fragment, CipherS, AAD,
+            #security_parameters{bulk_cipher_algorithm = BulkCipherAlgo}) ->
+    do_cipher_aead(BulkCipherAlgo, Fragment, CipherS, AAD).
+
+%%--------------------------------------------------------------------
 -spec decipher(ssl_version(), binary(), connection_state(), boolean()) ->
                       {binary(), binary(), connection_state()} | #alert{}.
 %%
@@ -343,9 +384,8 @@ decipher(Version, CipherFragment,
 	    Alert
     end.
 %%--------------------------------------------------------------------
--spec decipher_aead(ssl_cipher:cipher_enum(),  #cipher_state{}, 
-                    binary(), binary(), ssl_record:ssl_version()) ->
-			   {binary(), #cipher_state{}} | #alert{}.
+-spec decipher_aead(ssl_cipher:cipher_enum(),  #cipher_state{}, binary(), binary(), ssl_record:ssl_version()) ->
+			   binary() | #alert{}.
 %%
 %% Description: Decrypts the data and checks the associated data (AAD) MAC using
 %% cipher described by cipher_enum() and updating the cipher state.
@@ -355,9 +395,9 @@ decipher_aead(Type, #cipher_state{key = Key} = CipherState, AAD0, CipherFragment
     try
         Nonce = decrypt_nonce(Type, CipherState, CipherFragment),
         {AAD, CipherText, CipherTag} = aead_ciphertext_split(Type, CipherState, CipherFragment, AAD0),
-	case ssl_cipher:aead_decrypt(Type, Key, Nonce, CipherText, CipherTag, AAD) of
+        case ssl_cipher:aead_decrypt(Type, Key, Nonce, CipherText, CipherTag, AAD) of
 	    Content when is_binary(Content) ->
-		{Content, CipherState};
+		Content;
 	    _ ->
                 ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC, decryption_failed)
 	end
@@ -399,11 +439,13 @@ random() ->
     Random_28_bytes = ssl_cipher:random_bytes(28),
     <<?UINT32(Secs_since_1970), Random_28_bytes/binary>>.
 
+-compile({inline, [is_correct_mac/2]}).
 is_correct_mac(Mac, Mac) ->
     true;
 is_correct_mac(_M,_H) ->
     false.
 
+-compile({inline, [record_protocol_role/1]}).
 record_protocol_role(client) ->
     ?CLIENT;
 record_protocol_role(server) ->
@@ -427,37 +469,45 @@ initial_security_params(ConnectionEnd) ->
 				     compression_algorithm = ?NULL},
     ssl_cipher:security_parameters(?TLS_NULL_WITH_NULL_NULL, SecParams).
 
-cipher_aead(?CHACHA20_POLY1305 = Type, #cipher_state{key=Key} = CipherState, AAD0, Fragment, _Version) ->
-    AAD = end_additional_data(AAD0, erlang:iolist_size(Fragment)),
-    Nonce = encrypt_nonce(Type, CipherState),
-    {Content, CipherTag} = ssl_cipher:aead_encrypt(Type, Key, Nonce, Fragment, AAD),
+-define(end_additional_data(AAD, Len), << (begin(AAD)end)/binary, ?UINT16(begin(Len)end) >>).
+
+do_cipher_aead(?CHACHA20_POLY1305 = Type, Fragment, #cipher_state{key=Key, tag_len = TagLen} = CipherState, AAD0) ->
+    AAD = ?end_additional_data(AAD0, erlang:iolist_size(Fragment)),
+    Nonce = chacha_nonce(CipherState),
+    {Content, CipherTag} = ssl_cipher:aead_encrypt(Type, Key, Nonce, Fragment, AAD, TagLen),
     {<<Content/binary, CipherTag/binary>>, CipherState};
-cipher_aead(Type, #cipher_state{key=Key, nonce = ExplicitNonce} = CipherState, AAD0, Fragment, _Version) ->
-    AAD = end_additional_data(AAD0, erlang:iolist_size(Fragment)),
+do_cipher_aead(Type, Fragment, #cipher_state{key=Key, tag_len = TagLen, nonce = ExplicitNonce} = CipherState, AAD0) ->
+    AAD = ?end_additional_data(AAD0, erlang:iolist_size(Fragment)),
     Nonce = encrypt_nonce(Type, CipherState),
-    {Content, CipherTag} = ssl_cipher:aead_encrypt(Type, Key, Nonce, Fragment, AAD),
+    {Content, CipherTag} = ssl_cipher:aead_encrypt(Type, Key, Nonce, Fragment, AAD, TagLen),
     {<<ExplicitNonce:64/integer, Content/binary, CipherTag/binary>>, CipherState#cipher_state{nonce = ExplicitNonce + 1}}.
 
-encrypt_nonce(?CHACHA20_POLY1305, #cipher_state{nonce = Nonce, iv = IV}) ->
-    crypto:exor(<<?UINT32(0), Nonce/binary>>, IV);
-encrypt_nonce(?AES_GCM, #cipher_state{iv = IV, nonce = ExplicitNonce}) ->
+
+chacha_nonce(#cipher_state{nonce = Nonce, iv = IV}) ->
+    crypto:exor(<<?UINT32(0), Nonce/binary>>, IV).
+
+encrypt_nonce(Type, #cipher_state{iv = IV, nonce = ExplicitNonce}) when  Type == ?AES_GCM;
+                                                                         Type == ?AES_CCM;
+                                                                         Type == ?AES_CCM_8 ->
     <<Salt:4/bytes, _/binary>> = IV,
     <<Salt/binary, ExplicitNonce:64/integer>>.
 
-decrypt_nonce(?CHACHA20_POLY1305, #cipher_state{nonce = Nonce, iv = IV}, _) ->
-    crypto:exor(<<Nonce:96/unsigned-big-integer>>, IV);
-decrypt_nonce(?AES_GCM, #cipher_state{iv = <<Salt:4/bytes, _/binary>>}, <<ExplicitNonce:8/bytes, _/binary>>) ->   
-     <<Salt/binary, ExplicitNonce/binary>>.
+decrypt_nonce(?CHACHA20_POLY1305, CipherState, _) ->
+    chacha_nonce(CipherState);
+decrypt_nonce(Type, #cipher_state{iv = <<Salt:4/bytes, _/binary>>}, <<ExplicitNonce:8/bytes, _/binary>>) when 
+      Type == ?AES_GCM; 
+      Type == ?AES_CCM; 
+      Type == ?AES_CCM_8 ->
+    <<Salt/binary, ExplicitNonce/binary>>.
 
+-compile({inline, [aead_ciphertext_split/4]}).
 aead_ciphertext_split(?CHACHA20_POLY1305, #cipher_state{tag_len = Len}, CipherTextFragment, AAD) ->
-    CipherLen = size(CipherTextFragment) - Len,
+    CipherLen = byte_size(CipherTextFragment) - Len,
     <<CipherText:CipherLen/bytes, CipherTag:Len/bytes>> = CipherTextFragment,
-    {end_additional_data(AAD, CipherLen), CipherText, CipherTag};
-aead_ciphertext_split(?AES_GCM,  #cipher_state{tag_len = Len}, CipherTextFragment, AAD) ->
-    CipherLen = size(CipherTextFragment) - (Len + 8), %% 8 is length of explicit Nonce
+    {?end_additional_data(AAD, CipherLen), CipherText, CipherTag};
+aead_ciphertext_split(Type,  #cipher_state{tag_len = Len}, CipherTextFragment, AAD) when Type == ?AES_GCM;
+                                                                                         Type == ?AES_CCM;
+                                                                                         Type == ?AES_CCM_8 ->
+    CipherLen = byte_size(CipherTextFragment) - (Len + 8), %% 8 is length of explicit Nonce
     << _:8/bytes, CipherText:CipherLen/bytes, CipherTag:Len/bytes>> = CipherTextFragment,
-    {end_additional_data(AAD, CipherLen), CipherText, CipherTag}.
-
-end_additional_data(AAD, Len) ->
-    <<AAD/binary, ?UINT16(Len)>>.
-        
+    {?end_additional_data(AAD, CipherLen), CipherText, CipherTag}.
diff --git a/lib/ssl/src/ssl_record.hrl b/lib/ssl/src/ssl_record.hrl
index ed007f58d7..6d4d47cedb 100644
--- a/lib/ssl/src/ssl_record.hrl
+++ b/lib/ssl/src/ssl_record.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2019. 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.
@@ -74,7 +74,7 @@
 -define(INITIAL_BYTES, 5).
 
 -define(MAX_SEQENCE_NUMBER, 18446744073709551615). %% (1 bsl 64) - 1 = 18446744073709551615
-%% Sequence numbers can not wrap so when max is about to be reached we should renegotiate.
+%% Sequence numbers cannot wrap so when max is about to be reached we should renegotiate.
 %% We will renegotiate a little before so that there will be sequence numbers left
 %% for the rehandshake and a little data. Currently we decided to renegotiate a little more
 %% often as we can have a cheaper test to check if it is time to renegotiate. It will still
@@ -96,6 +96,11 @@
 -define(AES_CBC, 7).
 -define(AES_GCM, 8).
 -define(CHACHA20_POLY1305, 9).
+%% Following two are not defined in any RFC but we want to have the
+%% same type of handling internaly, all of these "bulk_cipher_algorithm"
+%% enums are only used internaly anyway.
+-define(AES_CCM, 10). 
+-define(AES_CCM_8, 11). 
 
 %% CipherType
 -define(STREAM, 0).
@@ -140,6 +145,9 @@
 -define(ALERT, 21).
 -define(HANDSHAKE, 22).
 -define(APPLICATION_DATA, 23).
+-define(HEARTBEAT, 24).
+-define(KNOWN_RECORD_TYPE(Type),
+        (is_integer(Type) andalso (20 =< (Type)) andalso ((Type) =< 23))).
 -define(MAX_PLAIN_TEXT_LENGTH, 16384).
 -define(MAX_COMPRESSED_LENGTH, (?MAX_PLAIN_TEXT_LENGTH+1024)).
 -define(MAX_CIPHER_TEXT_LENGTH, (?MAX_PLAIN_TEXT_LENGTH+2048)).
diff --git a/lib/ssl/src/ssl_session.erl b/lib/ssl/src/ssl_session.erl
index c9607489e9..44305c65fe 100644
--- a/lib/ssl/src/ssl_session.erl
+++ b/lib/ssl/src/ssl_session.erl
@@ -27,6 +27,7 @@
 
 -include("ssl_handshake.hrl").
 -include("ssl_internal.hrl").
+-include("ssl_api.hrl").
 
 %% Internal application API
 -export([is_new/2, client_id/4, server_id/6, valid_session/2]).
@@ -34,7 +35,7 @@
 -type seconds()   :: integer(). 
 
 %%--------------------------------------------------------------------
--spec is_new(session_id(), session_id()) -> boolean().
+-spec is_new(ssl:session_id(), ssl:session_id()) -> boolean().
 %%
 %% Description: Checks if the session id decided by the server is a
 %%              new or resumed sesion id.
@@ -47,12 +48,19 @@ is_new(_ClientSuggestion, _ServerDecision) ->
     true.
 
 %%--------------------------------------------------------------------
--spec client_id({host(), inet:port_number(), #ssl_options{}}, db_handle(), atom(),
+-spec client_id({ssl:host(), inet:port_number(), #ssl_options{}}, db_handle(), atom(),
 	 undefined | binary()) -> binary().
 %%
 %% Description: Should be called by the client side to get an id
 %%              for the client hello message.
 %%--------------------------------------------------------------------
+client_id({Host, Port, #ssl_options{reuse_session = SessionId}}, Cache, CacheCb, _) when is_binary(SessionId)->
+    case CacheCb:lookup(Cache, {{Host, Port}, SessionId}) of
+        undefined ->
+	    <<>>;
+	#session{} ->
+	    SessionId
+    end;
 client_id(ClientInfo, Cache, CacheCb, OwnCert) ->
     case select_session(ClientInfo, Cache, CacheCb, OwnCert) of
 	no_session ->
@@ -91,7 +99,8 @@ server_id(Port, SuggestedId, Options, Cert, Cache, CacheCb) ->
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
-select_session({_, _, #ssl_options{reuse_sessions=false}}, _Cache, _CacheCb, _OwnCert) ->
+select_session({_, _, #ssl_options{reuse_sessions = Reuse}}, _Cache, _CacheCb, _OwnCert) when Reuse =/= true ->
+    %% If reuse_sessions == true | save a new session should be created
     no_session;
 select_session({HostIP, Port, SslOpts}, Cache, CacheCb, OwnCert) ->
     Sessions = CacheCb:select_session(Cache, {HostIP, Port}),
@@ -132,7 +141,7 @@ is_resumable(SuggestedSessionId, Port, #ssl_options{reuse_session = ReuseFun} =
 		false -> {false, undefined}
 	    end;
 	undefined ->
-	    {false, undefined}
+ 	    {false, undefined}
     end.
 
 resumable(new) ->
diff --git a/lib/ssl/src/ssl_session_cache_api.erl b/lib/ssl/src/ssl_session_cache_api.erl
index b68c75a09b..5f96f905b1 100644
--- a/lib/ssl/src/ssl_session_cache_api.erl
+++ b/lib/ssl/src/ssl_session_cache_api.erl
@@ -23,14 +23,20 @@
 -module(ssl_session_cache_api).
 -include("ssl_handshake.hrl").
 -include("ssl_internal.hrl").
+-include("ssl_api.hrl").
 
--type key() :: {{host(), inet:port_number()}, session_id()} |  {inet:port_number(), session_id()}.
+-export_type([session_cache_key/0, session/0, partial_key/0, session_cache_ref/0]).
 
--callback init(list()) -> db_handle().
--callback terminate(db_handle()) -> any().
--callback lookup(db_handle(), key()) -> #session{} | undefined.
--callback update(db_handle(), key(), #session{}) -> any().
--callback delete(db_handle(), key()) -> any().
--callback foldl(fun(), term(), db_handle()) -> term().
--callback select_session(db_handle(), {host(), inet:port_number()} | inet:port_number()) -> [#session{}].
--callback size(db_handle()) -> integer().
+-type session_cache_ref() :: any().
+-type session_cache_key() :: {partial_key(), ssl:session_id()}.
+-opaque session()         :: #session{}.
+-opaque partial_key()     :: {ssl:host(), inet:port_number()} | inet:port_number().
+
+-callback init(list()) -> session_cache_ref().
+-callback terminate(session_cache_ref()) -> any().
+-callback lookup(session_cache_ref(), session_cache_key()) -> #session{} | undefined.
+-callback update(session_cache_ref(), session_cache_key(), #session{}) -> any().
+-callback delete(session_cache_ref(), session_cache_key()) -> any().
+-callback foldl(fun(), term(), session_cache_ref()) -> term().
+-callback select_session(session_cache_ref(), {ssl:host(), inet:port_number()} | inet:port_number()) -> [#session{}].
+-callback size(session_cache_ref()) -> integer().
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl
index 0f986b5e21..3998f03519 100644
--- a/lib/ssl/src/tls_connection.erl
+++ b/lib/ssl/src/tls_connection.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2019. 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,7 +17,6 @@
 %%
 %% %CopyrightEnd%
 %%
-
 %%
 %%----------------------------------------------------------------------
 %% Purpose: Handles an ssl connection, e.i. both the setup
@@ -32,13 +31,15 @@
 
 -include("tls_connection.hrl").
 -include("tls_handshake.hrl").
+-include("tls_handshake_1_3.hrl").
 -include("ssl_alert.hrl").
 -include("tls_record.hrl").
 -include("ssl_cipher.hrl").
 -include("ssl_api.hrl").
 -include("ssl_internal.hrl").
 -include("ssl_srp.hrl").
--include_lib("public_key/include/public_key.hrl"). 
+-include_lib("public_key/include/public_key.hrl").
+-include_lib("kernel/include/logger.hrl").
 
 %% Internal application API
 
@@ -47,10 +48,11 @@
 
 %% State transition handling	 
 -export([next_event/3, next_event/4, 
-         handle_common_event/4]).
+         handle_protocol_record/3]).
 
 %% Handshake handling
--export([renegotiation/2, renegotiate/2, send_handshake/2, 
+-export([renegotiation/2, renegotiate/2, send_handshake/2,
+         send_handshake_flight/1,
 	 queue_handshake/2, queue_change_cipher/2,
 	 reinit/1, reinit_handshake_data/1, select_sni_extension/1, 
          empty_connection_state/2]).
@@ -58,19 +60,35 @@
 %% Alert and close handling
 -export([send_alert/2, send_alert_in_connection/2,
          send_sync_alert/2,
-         encode_alert/3, close/5, protocol_name/0]).
+         close/5, protocol_name/0]).
 
 %% Data handling
--export([encode_data/3, next_record/1,
-         send/3, socket/5, setopts/3, getopts/3]).
+-export([socket/4, setopts/3, getopts/3]).
 
 %% gen_statem state functions
 -export([init/3, error/3, downgrade/3, %% Initiation and take down states
 	 hello/3, user_hello/3, certify/3, cipher/3, abbreviated/3, %% Handshake states 
 	 connection/3]).
+%% TLS 1.3 state functions (server)
+-export([start/3,         %% common state with client
+         negotiated/3,
+         recvd_ch/3,
+         wait_cert/3,     %% common state with client
+         wait_cv/3,       %% common state with client
+         wait_eoed/3,
+         wait_finished/3, %% common state with client
+         wait_flight2/3,
+         connected/3      %% common state with client
+        ]).
+%% TLS 1.3 state functions (client)
+-export([wait_cert_cr/3,
+         wait_ee/3,
+         wait_sh/3
+        ]).
 %% gen_statem callbacks
 -export([callback_mode/0, terminate/3, code_change/4, format_status/2]).
  
+-export([encode_handshake/4]).
 
 -define(DIST_CNTRL_SPAWN_OPTS, [{priority, max}]).
 
@@ -81,7 +99,7 @@
 %% Setup
 %%====================================================================
 start_fsm(Role, Host, Port, Socket, {#ssl_options{erl_dist = false},_, Tracker} = Opts,
-	  User, {CbModule, _,_, _} = CbInfo, 
+	  User, {CbModule, _,_, _, _} = CbInfo, 
 	  Timeout) -> 
     try 
         {ok, Sender} = tls_sender:start(),
@@ -95,7 +113,7 @@ start_fsm(Role, Host, Port, Socket, {#ssl_options{erl_dist = false},_, Tracker}
     end;
 
 start_fsm(Role, Host, Port, Socket, {#ssl_options{erl_dist = true},_, Tracker} = Opts,
-	  User, {CbModule, _,_, _} = CbInfo, 
+	  User, {CbModule, _,_, _, _} = CbInfo, 
 	  Timeout) -> 
     try 
         {ok, Sender} = tls_sender:start([{spawn_opt, ?DIST_CNTRL_SPAWN_OPTS}]),
@@ -109,7 +127,7 @@ start_fsm(Role, Host, Port, Socket, {#ssl_options{erl_dist = true},_, Tracker} =
     end.
 
 %%--------------------------------------------------------------------
--spec start_link(atom(), pid(), host(), inet:port_number(), port(), list(), pid(), tuple()) ->
+-spec start_link(atom(), pid(), ssl: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
@@ -144,69 +162,146 @@ pids(#state{protocol_specific = #{sender := Sender}}) ->
 %%====================================================================
 %% 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 = []},
-                   protocol_specific = #{active_n_toggle := true, active_n := N} = ProtocolSpec,
- 		   socket = Socket,
-                   close_tag = CloseTag,
-		   transport_cb = Transport} = State) ->
-     case tls_socket:setopts(Transport, Socket, [{active, N}]) of
- 	ok ->
-             {no_record, State#state{protocol_specific = ProtocolSpec#{active_n_toggle => false}}}; 
- 	_ ->
-             self() ! {CloseTag, Socket},
-             {no_record, State}
-     end;
-next_record(State) ->
+next_record(_, #state{handshake_env = 
+                       #handshake_env{unprocessed_handshake_events = N} = HsEnv} 
+            = State) when N > 0 ->
+    {no_record, State#state{handshake_env = 
+                                HsEnv#handshake_env{unprocessed_handshake_events = N-1}}};
+next_record(_, #state{protocol_buffers =
+                          #protocol_buffers{tls_cipher_texts = [_|_] = CipherTexts},
+                      connection_states = ConnectionStates,
+                      ssl_options = #ssl_options{padding_check = Check}} = State) ->
+    next_record(State, CipherTexts, ConnectionStates, Check);
+next_record(connection, #state{protocol_buffers = #protocol_buffers{tls_cipher_texts = []},
+                               protocol_specific = #{active_n_toggle := true}
+                              } = State) ->
+    %% If ssl application user is not reading data wait to activate socket
+    flow_ctrl(State); 
+  
+next_record(_, #state{protocol_buffers = #protocol_buffers{tls_cipher_texts = []},
+                      protocol_specific = #{active_n_toggle := true}
+                     } = State) ->
+    activate_socket(State);
+next_record(_, State) ->
     {no_record, State}.
 
+
+flow_ctrl(#state{user_data_buffer = {_,Size,_},
+                 socket_options = #socket_options{active = false},
+                 bytes_to_read = undefined} = State)  when Size =/= 0 ->
+    {no_record, State};
+flow_ctrl(#state{user_data_buffer = {_,Size,_},
+                 socket_options = #socket_options{active = false},
+                 bytes_to_read = 0} = State)  when Size =/= 0 ->
+    {no_record, State};
+flow_ctrl(#state{user_data_buffer = {_,Size,_}, 
+                 socket_options = #socket_options{active = false},
+                 bytes_to_read = BytesToRead} = State) when (Size >= BytesToRead) andalso
+                                                            (BytesToRead > 0) ->
+    {no_record, State};
+flow_ctrl(State) ->
+    activate_socket(State).
+
+
+activate_socket(#state{protocol_specific = #{active_n_toggle := true, active_n := N} = ProtocolSpec,
+                       static_env = #static_env{socket = Socket,
+                                                close_tag = CloseTag,
+                                                transport_cb = Transport}  
+                      } = State) ->                                                                                                            
+    case tls_socket:setopts(Transport, Socket, [{active, N}]) of
+        ok ->
+            {no_record, State#state{protocol_specific = ProtocolSpec#{active_n_toggle => false}}}; 
+        _ ->
+            self() ! {CloseTag, Socket},
+            {no_record, State}
+    end.
+
+%% Decipher next record and concatenate consecutive ?APPLICATION_DATA records into one
+%%
+next_record(State, CipherTexts, ConnectionStates, Check) ->
+    next_record(State, CipherTexts, ConnectionStates, Check, []).
+%%
+next_record(#state{connection_env = #connection_env{negotiated_version = Version}} = State,
+            [CT|CipherTexts], ConnectionStates0, Check, Acc) ->
+    case tls_record:decode_cipher_text(Version, CT, ConnectionStates0, Check) of
+        {#ssl_tls{type = ?APPLICATION_DATA, fragment = Fragment}, ConnectionStates} ->
+            case CipherTexts of
+                [] ->
+                    %% End of cipher texts - build and deliver an ?APPLICATION_DATA record
+                    %% from the accumulated fragments
+                    next_record_done(State, [], ConnectionStates,
+                                     #ssl_tls{type = ?APPLICATION_DATA,
+                                              fragment = iolist_to_binary(lists:reverse(Acc, [Fragment]))});
+                [_|_] ->
+                    next_record(State, CipherTexts, ConnectionStates, Check, [Fragment|Acc])
+            end;
+        {Record, ConnectionStates} when Acc =:= [] ->
+            %% Singelton non-?APPLICATION_DATA record - deliver
+            next_record_done(State, CipherTexts, ConnectionStates, Record);
+        {_Record, _ConnectionStates_to_forget} ->
+            %% Not ?APPLICATION_DATA but we have accumulated fragments
+            %% -> build an ?APPLICATION_DATA record with concatenated fragments
+            %%    and forget about decrypting this record - we'll decrypt it again next time
+            next_record_done(State, [CT|CipherTexts], ConnectionStates0,
+                             #ssl_tls{type = ?APPLICATION_DATA, fragment = iolist_to_binary(lists:reverse(Acc))});
+        #alert{} = Alert ->
+            Alert
+    end.
+
+next_record_done(#state{protocol_buffers = Buffers} = State, CipherTexts, ConnectionStates, Record) ->
+    {Record,
+     State#state{protocol_buffers = Buffers#protocol_buffers{tls_cipher_texts = CipherTexts},
+                 connection_states = ConnectionStates}}.
+
 next_event(StateName, Record, State) ->
     next_event(StateName, Record, State, []).
+%%
 next_event(StateName, no_record, State0, Actions) ->
-    case next_record(State0) of
+    case next_record(StateName, State0) of
  	{no_record, State} ->
-            {next_state, 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]}
+            ssl_connection:hibernate_after(StateName, State, Actions);
+        {Record, State} ->
+            next_event(StateName, Record, State, 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.
+next_event(StateName,  #ssl_tls{} = Record, State, Actions) ->
+    {next_state, StateName, State, [{next_event, internal, {protocol_record, Record}} | Actions]};
+next_event(StateName,  #alert{} = Alert, State, Actions) ->
+    {next_state, StateName, State, [{next_event, internal, Alert} | Actions]}.
 
-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 application data messages 
+handle_protocol_record(#ssl_tls{type = ?APPLICATION_DATA, fragment = Data}, StateName, 
+                       #state{start_or_recv_from = From,
+                              socket_options = #socket_options{active = false}} = State0) when From =/= undefined ->
+    case ssl_connection:read_application_data(Data, State0) of
+       {stop, _, _} = Stop->
+            Stop;
+       {Record, #state{start_or_recv_from = Caller} = State1} ->
+            TimerAction = case Caller of
+                              undefined -> %% Passive recv complete cancel timer
+                                  [{{timeout, recv}, infinity, timeout}];
+                              _ ->
+                                  []
+                          end,
+            {next_state, StateName, State, Actions} = next_event(StateName, Record, State1, TimerAction), 
+            ssl_connection:hibernate_after(StateName, State, Actions)
+    end;
+handle_protocol_record(#ssl_tls{type = ?APPLICATION_DATA, fragment = Data}, StateName, State0) ->
+    case ssl_connection:read_application_data(Data, State0) of
+	{stop, _, _} = Stop->
+            Stop;
+	{Record, State1} ->
+            {next_state, StateName, State, Actions} = next_event(StateName, Record, State1), 
+            ssl_connection:hibernate_after(StateName, State, Actions)
+    end;
 %%% TLS record protocol level handshake messages 
-handle_common_event(internal,  #ssl_tls{type = ?HANDSHAKE, fragment = Data}, 
+handle_protocol_record(#ssl_tls{type = ?HANDSHAKE, fragment = Data}, 
 		    StateName, #state{protocol_buffers =
 					  #protocol_buffers{tls_handshake_buffer = Buf0} = Buffers,
-				      negotiated_version = Version,
+                                      connection_env = #connection_env{negotiated_version = Version},
 				      ssl_options = Options} = State0) ->
     try
-	{Packets, Buf} = tls_handshake:get_tls_handshake(Version,Data,Buf0, Options),
+	EffectiveVersion = effective_version(Version, Options),
+	{Packets, Buf} = tls_handshake:get_tls_handshake(EffectiveVersion,Data,Buf0, Options),
 	State =
 	    State0#state{protocol_buffers =
 			     Buffers#protocol_buffers{tls_handshake_buffer = Buf}},
@@ -220,30 +315,30 @@ handle_common_event(internal,  #ssl_tls{type = ?HANDSHAKE, fragment = Data},
                     connection ->
                         ssl_connection:hibernate_after(StateName, State, Events);
                     _ ->
+                        HsEnv = State#state.handshake_env,
                         {next_state, StateName, 
-                         State#state{unprocessed_handshake_events = unprocessed_events(Events)}, Events}
+                         State#state{handshake_env = 
+                                         HsEnv#handshake_env{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) ->
+handle_protocol_record(#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) ->
+handle_protocol_record(#ssl_tls{type = ?ALERT, fragment = EncAlerts}, StateName,
+                       #state{connection_env = #connection_env{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)
+        #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),
@@ -251,81 +346,92 @@ handle_common_event(internal, #ssl_tls{type = ?ALERT, fragment = EncAlerts}, Sta
 
     end;
 %% Ignore unknown TLS record level protocol messages
-handle_common_event(internal, #ssl_tls{type = _Unknown}, StateName, State) ->
-    {next_state, StateName, State}.
+handle_protocol_record(#ssl_tls{type = _Unknown}, StateName, State) ->
+    {next_state, StateName, State, []}.
 %%====================================================================
 %% Handshake handling
 %%====================================================================
 renegotiation(Pid, WriteState) ->
     gen_statem:call(Pid, {user_renegotiate, WriteState}).
 
-renegotiate(#state{role = client} = State, Actions) ->
+renegotiate(#state{static_env = #static_env{role = client},
+                   handshake_env = HsEnv} = 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_state, connection, State#state{handshake_env = HsEnv#handshake_env{tls_handshake_history = Hs0}}, 
      [{next_event, internal, #hello_request{}} | Actions]};
-renegotiate(#state{role = server,
-		   socket = Socket,
-		   transport_cb = Transport,
-		   negotiated_version = Version,
+renegotiate(#state{static_env = #static_env{role = server,
+                                            socket = Socket,
+                                            transport_cb = Transport},
+                   handshake_env = HsEnv,
+                   connection_env = #connection_env{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),
+    tls_socket:send(Transport, Socket, BinMsg),
     State = State0#state{connection_states = 
 			     ConnectionStates,
-			 tls_handshake_history = Hs0},
+			 handshake_env = HsEnv#handshake_env{tls_handshake_history = Hs0}},
     next_event(hello, no_record, State, Actions).
 	     
 send_handshake(Handshake, State) ->
     send_handshake_flight(queue_handshake(Handshake, State)).
 
-queue_handshake(Handshake, #state{negotiated_version = Version,
-				  tls_handshake_history = Hist0,
-				  flight_buffer = Flight0,
+
+queue_handshake(Handshake, #state{handshake_env = #handshake_env{tls_handshake_history = Hist0} = HsEnv,
+				  connection_env = #connection_env{negotiated_version = Version},
+                                  flight_buffer = Flight0,
+                                  ssl_options = SslOpts,
 				  connection_states = ConnectionStates0} = State0) ->
     {BinHandshake, ConnectionStates, Hist} =
 	encode_handshake(Handshake, Version, ConnectionStates0, Hist0),
+    ssl_logger:debug(SslOpts#ssl_options.log_level, outbound, 'handshake', Handshake),
+    ssl_logger:debug(SslOpts#ssl_options.log_level, outbound, 'record', BinHandshake),
+
     State0#state{connection_states = ConnectionStates,
-		 tls_handshake_history = Hist,
+                 handshake_env = HsEnv#handshake_env{tls_handshake_history = Hist},
 		 flight_buffer = Flight0 ++ [BinHandshake]}.
 
-send_handshake_flight(#state{socket = Socket,
-			     transport_cb = Transport,
+
+send_handshake_flight(#state{static_env = #static_env{socket = Socket,
+                                                      transport_cb = Transport},
 			     flight_buffer = Flight} = State0) ->
-    send(Transport, Socket, Flight),
+    tls_socket:send(Transport, Socket, Flight),
     {State0#state{flight_buffer = []}, []}.
 
-queue_change_cipher(Msg, #state{negotiated_version = Version,
-				  flight_buffer = Flight0,
-				  connection_states = ConnectionStates0} = State0) ->
+
+queue_change_cipher(Msg, #state{connection_env = #connection_env{negotiated_version = Version},
+                                flight_buffer = Flight0,
+                                ssl_options = SslOpts,
+                                connection_states = ConnectionStates0} = State0) ->
     {BinChangeCipher, ConnectionStates} =
 	encode_change_cipher(Msg, Version, ConnectionStates0),
+    ssl_logger:debug(SslOpts#ssl_options.log_level, outbound, 'record', BinChangeCipher),
     State0#state{connection_states = ConnectionStates,
 		 flight_buffer = Flight0 ++ [BinChangeCipher]}.
 
 reinit(#state{protocol_specific = #{sender := Sender},
-              negotiated_version = Version,
+              connection_env = #connection_env{negotiated_version = Version},
               connection_states = #{current_write := Write}} = State) -> 
     tls_sender:update_connection_state(Sender, Write, Version),
     reinit_handshake_data(State).
 
-reinit_handshake_data(State) ->
+reinit_handshake_data(#state{handshake_env = HsEnv} =State) ->
     %% premaster_secret, public_key_info and tls_handshake_info 
     %% are only needed during the handshake phase. 
     %% To reduce memory foot print of a connection reinitialize them.
      State#state{
-       premaster_secret = undefined,
-       public_key_info = undefined,
-       tls_handshake_history = ssl_handshake:init_handshake_history()
+       handshake_env = HsEnv#handshake_env{tls_handshake_history = ssl_handshake:init_handshake_history(),
+                                           public_key_info = undefined,
+                                           premaster_secret = undefined}
      }.
 
-select_sni_extension(#client_hello{extensions = HelloExtensions}) ->
-    HelloExtensions#hello_extensions.sni;
+select_sni_extension(#client_hello{extensions = #{sni := SNI}}) ->
+    SNI;
 select_sni_extension(_) ->
     undefined.
 
@@ -335,6 +441,7 @@ empty_connection_state(ConnectionEnd, BeastMitigation) ->
 %%====================================================================
 %% Alert and close handling
 %%====================================================================	     
+
 %%--------------------------------------------------------------------
 -spec encode_alert(#alert{}, ssl_record:ssl_version(), ssl_record:connection_states()) -> 
 		    {iolist(), ssl_record:connection_states()}.
@@ -344,13 +451,15 @@ empty_connection_state(ConnectionEnd, BeastMitigation) ->
 encode_alert(#alert{} = Alert, Version, ConnectionStates) ->
     tls_record:encode_alert_record(Alert, Version, ConnectionStates).
 
-send_alert(Alert, #state{negotiated_version = Version,
-                         socket = Socket,
-                         transport_cb = Transport,
+send_alert(Alert, #state{static_env = #static_env{socket = Socket,
+                                                  transport_cb = Transport},
+                         connection_env = #connection_env{negotiated_version = Version},
+                         ssl_options = SslOpts,
                          connection_states = ConnectionStates0} = StateData0) ->
     {BinMsg, ConnectionStates} =
         encode_alert(Alert, Version, ConnectionStates0),
-    send(Transport, Socket, BinMsg),
+    tls_socket:send(Transport, Socket, BinMsg),
+    ssl_logger:debug(SslOpts#ssl_options.log_level, outbound, 'record', BinMsg),
     StateData0#state{connection_states = ConnectionStates}.
 
 %% If an ALERT sent in the connection state, should cause the TLS
@@ -404,14 +513,9 @@ protocol_name() ->
 %%====================================================================
 %% Data handling
 %%====================================================================	     
-encode_data(Data, Version, ConnectionStates0)->
-    tls_record:encode_data(Data, Version, ConnectionStates0).
 
-send(Transport, Socket, Data) ->
-   tls_socket:send(Transport, Socket, Data).
-
-socket(Pids,  Transport, Socket, Connection, Tracker) ->
-    tls_socket:socket(Pids, Transport, Socket, Connection, Tracker).
+socket(Pids,  Transport, Socket, Tracker) ->
+    tls_socket:socket(Pids, Transport, Socket, ?MODULE, Tracker).
 
 setopts(Transport, Socket, Other) ->
     tls_socket:setopts(Transport, Socket, Other).
@@ -429,33 +533,40 @@ getopts(Transport, Socket, Tag) ->
 %%--------------------------------------------------------------------
 
 init({call, From}, {start, Timeout}, 
-     #state{host = Host, port = Port, role = client,
+     #state{static_env = #static_env{role = client,
+                                     host = Host,
+                                     port = Port,
+                                     transport_cb = Transport,
+                                     socket = Socket,
+                                     session_cache = Cache,
+                                     session_cache_cb = CacheCb},
+            handshake_env = #handshake_env{renegotiation = {Renegotiation, _}} = HsEnv,
+            connection_env = CEnv,
 	    ssl_options = SslOpts,
 	    session = #session{own_certificate = Cert} = Session0,
-	    transport_cb = Transport, socket = Socket,
-	    connection_states = ConnectionStates0,
-	    renegotiation = {Renegotiation, _},
-	    session_cache = Cache,
-	    session_cache_cb = CacheCb
+	    connection_states = ConnectionStates0
 	   } = State0) ->
-    Timer = ssl_connection:start_or_recv_cancel_timer(Timeout, From),
+    KeyShare = maybe_generate_client_shares(SslOpts),
     Hello = tls_handshake:client_hello(Host, Port, ConnectionStates0, SslOpts,
-				       Cache, CacheCb, Renegotiation, Cert),
-    
-    Version = Hello#client_hello.client_version,
-    HelloVersion = tls_record:hello_version(Version, SslOpts#ssl_options.versions),
+				       Cache, CacheCb, Renegotiation, Cert, KeyShare),
+
+    HelloVersion = tls_record:hello_version(SslOpts#ssl_options.versions),
     Handshake0 = ssl_handshake:init_handshake_history(),
     {BinMsg, ConnectionStates, Handshake} =
         encode_handshake(Hello,  HelloVersion, ConnectionStates0, Handshake0),
-    send(Transport, Socket, BinMsg),
+    tls_socket:send(Transport, Socket, BinMsg),
+    ssl_logger:debug(SslOpts#ssl_options.log_level, outbound, 'handshake', Hello),
+    ssl_logger:debug(SslOpts#ssl_options.log_level, outbound, 'record', BinMsg),
+
     State = State0#state{connection_states = ConnectionStates,
-                         negotiated_version = Version, %% Requested version
+                         connection_env = CEnv#connection_env{negotiated_version = HelloVersion}, %% Requested version
                          session =
                              Session0#session{session_id = Hello#client_hello.session_id},
-                         tls_handshake_history = Handshake,
+                         handshake_env = HsEnv#handshake_env{tls_handshake_history = Handshake},
                          start_or_recv_from = From,
-			  timer = Timer},
-    next_event(hello, no_record, State);
+                         key_share = KeyShare},
+    next_event(hello, no_record, State, [{{timeout, handshake}, Timeout, close}]);
+
 init(Type, Event, State) ->
     gen_handshake(?FUNCTION_NAME, Type, Event, State).
  
@@ -466,8 +577,9 @@ init(Type, Event, State) ->
 %%--------------------------------------------------------------------
 error({call, From}, {start, _Timeout}, 
       #state{protocol_specific = #{error := Error}} = State) ->
-    ssl_connection:stop_and_reply(
-      normal, {reply, From, {error, Error}}, State);
+    {stop_and_reply, {shutdown, normal}, 
+     [{reply, From, {error, Error}}], State};
+
 error({call, _} = Call, Msg, State) ->
     gen_handshake(?FUNCTION_NAME, Call, Msg, State);
 error(_, _, _) ->
@@ -481,58 +593,85 @@ error(_, _, _) ->
 %%--------------------------------------------------------------------
 hello(internal, #client_hello{extensions = Extensions} = Hello, 
       #state{ssl_options = #ssl_options{handshake = hello},
+             handshake_env = HsEnv,
              start_or_recv_from = From} = State) ->
     {next_state, user_hello, State#state{start_or_recv_from = undefined,
-                                              hello = Hello},
-     [{reply, From, {ok, ssl_connection:map_extensions(Extensions)}}]};
+                                         handshake_env = HsEnv#handshake_env{hello = Hello}},
+     [{reply, From, {ok, Extensions}}]};
 hello(internal, #server_hello{extensions = Extensions} = Hello, 
       #state{ssl_options = #ssl_options{handshake = hello},
+             handshake_env = HsEnv,
              start_or_recv_from = From} = State) ->
     {next_state, user_hello, State#state{start_or_recv_from = undefined,
-                                         hello = Hello},
-     [{reply, From, {ok, ssl_connection:map_extensions(Extensions)}}]};     
+                                         handshake_env = HsEnv#handshake_env{hello = Hello}},
+     [{reply, From, {ok, Extensions}}]};     
+
 hello(internal, #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,
+             static_env = #static_env{
+                             port = Port,
+                             session_cache = Cache,
+                             session_cache_cb = CacheCb},
+             handshake_env = #handshake_env{kex_algorithm = KeyExAlg,
+                                            renegotiation = {Renegotiation, _},
+                                            negotiated_protocol = CurrentProtocol} = HsEnv,
+             connection_env = CEnv,
+             session = #session{own_certificate = Cert} = Session0,
 	     ssl_options = SslOpts} = State) ->
-    case tls_handshake:hello(Hello, SslOpts, {Port, Session0, Cache, CacheCb,
-					      ConnectionStates0, Cert, KeyExAlg}, Renegotiation) of
-        #alert{} = Alert ->
-            ssl_connection:handle_own_alert(Alert, ClientVersion, hello,
-                                            State#state{negotiated_version
-                                                        = ClientVersion});
-        {Version, {Type, Session},
-	 ConnectionStates, Protocol0, ServerHelloExt, HashSign} ->
-	    Protocol = case Protocol0 of
-			   undefined -> CurrentProtocol;
-			   _ -> Protocol0
-		       end,
-            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})
+
+    case choose_tls_version(SslOpts, Hello) of
+        'tls_v1.3' ->
+            %% Continue in TLS 1.3 'start' state
+            {next_state, start, State, [{next_event, internal, Hello}]};
+        'tls_v1.2' ->
+            case tls_handshake:hello(Hello,
+                                     SslOpts,
+                                     {Port, Session0, Cache, CacheCb,
+                                      ConnectionStates0, Cert, KeyExAlg},
+                                     Renegotiation) of
+                #alert{} = Alert ->
+                    ssl_connection:handle_own_alert(Alert, ClientVersion, hello,
+                                                    State#state{connection_env = CEnv#connection_env{negotiated_version
+                                                                                                     = ClientVersion}});
+                {Version, {Type, Session},
+                 ConnectionStates, Protocol0, ServerHelloExt, HashSign} ->
+                    Protocol = case Protocol0 of
+                                   undefined -> CurrentProtocol;
+                                   _ -> Protocol0
+                               end,
+                    gen_handshake(?FUNCTION_NAME,
+                                  internal,
+                                  {common_client_hello, Type, ServerHelloExt},
+                                  State#state{connection_states  = ConnectionStates,
+                                              connection_env = CEnv#connection_env{negotiated_version = Version},
+                                              handshake_env = HsEnv#handshake_env{
+                                                                hashsign_algorithm = HashSign,
+                                                                client_hello_version = ClientVersion,
+                                                                negotiated_protocol = Protocol},
+                                              session = Session
+                                             })
+            end
+
     end;
 hello(internal, #server_hello{} = Hello,      
       #state{connection_states = ConnectionStates0,
-	     negotiated_version = ReqVersion,
-	     role = client,
-	     renegotiation = {Renegotiation, _},
+             connection_env = #connection_env{negotiated_version = ReqVersion} = CEnv,
+	     static_env = #static_env{role = client},
+             handshake_env = #handshake_env{renegotiation = {Renegotiation, _}},
 	     ssl_options = SslOptions} = State) ->
     case tls_handshake:hello(Hello, SslOptions, ConnectionStates0, Renegotiation) of
-	#alert{} = Alert ->
+	#alert{} = Alert -> %%TODO
 	    ssl_connection:handle_own_alert(Alert, ReqVersion, hello,
-                                            State#state{negotiated_version = ReqVersion});
+                                            State#state{connection_env =
+                                                            CEnv#connection_env{negotiated_version = ReqVersion}});
+        %% Legacy TLS 1.2 and older
 	{Version, NewId, ConnectionStates, ProtoExt, Protocol} ->
 	    ssl_connection:handle_session(Hello, 
-					  Version, NewId, ConnectionStates, ProtoExt, Protocol, State)
+					  Version, NewId, ConnectionStates, ProtoExt, Protocol, State);
+        %% TLS 1.3
+        {next_state, wait_sh} ->
+            %% Continue in TLS 1.3 'wait_sh' state
+            {next_state, wait_sh, State, [{next_event, internal, Hello}]}
     end;
 hello(info, Event, State) ->
     gen_info(Event, ?FUNCTION_NAME, State);
@@ -580,22 +719,77 @@ connection({call, From}, {user_renegotiate, WriteState},
            #state{connection_states = ConnectionStates} = State) ->
     {next_state,  ?FUNCTION_NAME, State#state{connection_states = ConnectionStates#{current_write => WriteState}}, 
      [{next_event,{call, From}, renegotiate}]};
+connection({call, From}, 
+           {close, {Pid, _Timeout}}, 
+           #state{connection_env = #connection_env{terminated = closed} =CEnv} = State) ->
+    {next_state, downgrade, State#state{connection_env = 
+                                            CEnv#connection_env{terminated = true, 
+                                                                downgrade = {Pid, From}}}, 
+     [{next_event, internal, ?ALERT_REC(?WARNING, ?CLOSE_NOTIFY)}]};
+connection({call, From}, 
+           {close,{Pid, Timeout}},
+           #state{connection_states = ConnectionStates,
+                  protocol_specific = #{sender := Sender},
+                  connection_env = CEnv
+                 } = State0) ->
+    case tls_sender:downgrade(Sender, Timeout) of
+        {ok, Write} ->
+            %% User downgrades connection
+            %% When downgrading an TLS connection to a transport connection
+            %% we must recive the close alert from the peer before releasing the 
+            %% transport socket.
+            State = send_alert(?ALERT_REC(?WARNING, ?CLOSE_NOTIFY), 
+                               State0#state{connection_states =
+                                                ConnectionStates#{current_write => Write}}),
+            {next_state, downgrade, State#state{connection_env = 
+                                                    CEnv#connection_env{downgrade = {Pid, From},
+                                                                        terminated = true}}, 
+             [{timeout, Timeout, downgrade}]};
+        {error, timeout} ->
+            {stop_and_reply, {shutdown, downgrade_fail}, [{reply, From, {error, timeout}}]}
+    end;
 connection(internal, #hello_request{},
-	   #state{role = client, 
-                  renegotiation = {Renegotiation, _},
-                  host = Host, port = Port,
+	   #state{static_env = #static_env{role = client,
+                                           host = Host,
+                                           port = Port,
+                                           session_cache = Cache,
+                                           session_cache_cb = CacheCb},
+                  handshake_env = #handshake_env{renegotiation = {Renegotiation, peer}},
 		  session = #session{own_certificate = Cert} = Session0,
-		  session_cache = Cache, session_cache_cb = CacheCb,
-		  ssl_options = SslOpts,                
+		  ssl_options = SslOpts, 
+                  protocol_specific = #{sender := Pid},
+		  connection_states = ConnectionStates} = State0) ->
+    try tls_sender:peer_renegotiate(Pid) of
+        {ok, Write} ->
+            Hello = tls_handshake:client_hello(Host, Port, ConnectionStates, SslOpts,
+                                               Cache, CacheCb, Renegotiation, Cert, undefined),
+            {State, Actions} = send_handshake(Hello, State0#state{connection_states = ConnectionStates#{current_write => Write}}),
+            next_event(hello, no_record, State#state{session = Session0#session{session_id
+                                                                      = Hello#client_hello.session_id}}, Actions)
+        catch 
+            _:_ ->
+                {stop, {shutdown, sender_blocked}, State0}
+        end;
+connection(internal, #hello_request{},
+	   #state{static_env = #static_env{role = client,
+                                           host = Host,
+                                           port = Port,
+                                           session_cache = Cache,
+                                           session_cache_cb = CacheCb},
+                  handshake_env = #handshake_env{renegotiation = {Renegotiation, _}},
+		  session = #session{own_certificate = Cert} = Session0,
+		  ssl_options = SslOpts, 
 		  connection_states = ConnectionStates} = State0) ->
     Hello = tls_handshake:client_hello(Host, Port, ConnectionStates, SslOpts,
-				       Cache, CacheCb, Renegotiation, Cert),
+				       Cache, CacheCb, Renegotiation, Cert, undefined),
+
     {State, Actions} = send_handshake(Hello, State0),
     next_event(hello, no_record, State#state{session = Session0#session{session_id
                                                                         = Hello#client_hello.session_id}}, Actions);
 connection(internal, #client_hello{} = Hello, 
-	   #state{role = server, allow_renegotiate = true, connection_states = CS,
-                  %%protocol_cb = Connection,
+	   #state{static_env = #static_env{role = server},
+                  handshake_env = #handshake_env{allow_renegotiate = true}= HsEnv,
+                  connection_states = CS,
                   protocol_specific = #{sender := Sender}
                  } = State) ->
     %% Mitigate Computational DoS attack
@@ -606,17 +800,23 @@ connection(internal, #client_hello{} = Hello,
     erlang:send_after(?WAIT_TO_ALLOW_RENEGOTIATION, self(), allow_renegotiate),
     {ok, Write} = tls_sender:renegotiate(Sender),
     next_event(hello, no_record, State#state{connection_states = CS#{current_write => Write},
-                                             allow_renegotiate = false,
-                                             renegotiation = {true, peer}
+                                             handshake_env = HsEnv#handshake_env{renegotiation = {true, peer},
+                                                                                 allow_renegotiate = false}
                                             }, 
                [{next_event, internal, Hello}]);
 connection(internal, #client_hello{}, 
-	   #state{role = server, allow_renegotiate = false,
-                  protocol_cb = Connection} = State0) ->
+	   #state{static_env = #static_env{role = server},
+                  handshake_env = #handshake_env{allow_renegotiate = false}} = State0) ->
     Alert = ?ALERT_REC(?WARNING, ?NO_RENEGOTIATION),
     send_alert_in_connection(Alert, State0),
-    State = Connection:reinit_handshake_data(State0),
+    State = reinit_handshake_data(State0),
     next_event(?FUNCTION_NAME, no_record, State);
+
+connection(internal, #new_session_ticket{}, State) ->
+    %% TLS 1.3
+    %% Drop NewSessionTicket (currently not supported)
+    next_event(?FUNCTION_NAME, no_record, State);
+
 connection(Type, Event, State) ->
     ssl_connection:?FUNCTION_NAME(Type, Event, State, ?MODULE).
 
@@ -624,19 +824,147 @@ connection(Type, Event, State) ->
 -spec downgrade(gen_statem:event_type(), term(), #state{}) ->
 		       gen_statem:state_function_result().
 %%--------------------------------------------------------------------
+downgrade(internal, #alert{description = ?CLOSE_NOTIFY},
+	  #state{static_env = #static_env{transport_cb = Transport,
+                                          socket = Socket},
+		 connection_env = #connection_env{downgrade = {Pid, From}}} = State) ->
+    tls_socket:setopts(Transport, Socket, [{active, false}, {packet, 0}, {mode, binary}]),
+    Transport:controlling_process(Socket, Pid),
+    {stop_and_reply, {shutdown, downgrade},[{reply, From, {ok, Socket}}], State};
+downgrade(timeout, downgrade, #state{ connection_env = #connection_env{downgrade = {_, From}}} = State) ->
+    {stop_and_reply, {shutdown, normal},[{reply, From, {error, timeout}}], State};
+downgrade(info, {CloseTag, Socket},
+          #state{static_env = #static_env{socket = Socket, 
+                                          close_tag = CloseTag},
+                 connection_env = #connection_env{downgrade = {_, From}}} =
+              State) ->
+    {stop_and_reply, {shutdown, normal},[{reply, From, {error, CloseTag}}], State};
+downgrade(info, Info, State) ->
+    handle_info(Info, ?FUNCTION_NAME, State);
 downgrade(Type, Event, State) ->
      ssl_connection:?FUNCTION_NAME(Type, Event, State, ?MODULE).
 
+%%--------------------------------------------------------------------
+%% TLS 1.3 state functions
+%%--------------------------------------------------------------------
+%%--------------------------------------------------------------------
+-spec start(gen_statem:event_type(), term(), #state{}) ->
+			 gen_statem:state_function_result().
+%%--------------------------------------------------------------------
+start(info, Event, State) ->
+    gen_info_1_3(Event, ?FUNCTION_NAME, State);
+start(Type, Event, State) ->
+    gen_handshake_1_3(?FUNCTION_NAME, Type, Event, State).
+
+%%--------------------------------------------------------------------
+-spec negotiated(gen_statem:event_type(), term(), #state{}) ->
+			 gen_statem:state_function_result().
+%%--------------------------------------------------------------------
+negotiated(info, Event, State) ->
+    gen_info_1_3(Event, ?FUNCTION_NAME, State);
+negotiated(Type, Event, State) ->
+    gen_handshake_1_3(?FUNCTION_NAME, Type, Event, State).
+
+%%--------------------------------------------------------------------
+-spec recvd_ch(gen_statem:event_type(), term(), #state{}) ->
+			 gen_statem:state_function_result().
+%%--------------------------------------------------------------------
+recvd_ch(info, Event, State) ->
+    gen_info_1_3(Event, ?FUNCTION_NAME, State);
+recvd_ch(Type, Event, State) ->
+    gen_handshake_1_3(?FUNCTION_NAME, Type, Event, State).
+
+%%--------------------------------------------------------------------
+-spec wait_cert(gen_statem:event_type(), term(), #state{}) ->
+			 gen_statem:state_function_result().
+%%--------------------------------------------------------------------
+wait_cert(info, Event, State) ->
+    gen_info_1_3(Event, ?FUNCTION_NAME, State);
+wait_cert(Type, Event, State) ->
+    gen_handshake_1_3(?FUNCTION_NAME, Type, Event, State).
+
+%%--------------------------------------------------------------------
+-spec wait_cv(gen_statem:event_type(), term(), #state{}) ->
+			 gen_statem:state_function_result().
+%%--------------------------------------------------------------------
+wait_cv(info, Event, State) ->
+    gen_info_1_3(Event, ?FUNCTION_NAME, State);
+wait_cv(Type, Event, State) ->
+    gen_handshake_1_3(?FUNCTION_NAME, Type, Event, State).
+
+%%--------------------------------------------------------------------
+-spec wait_eoed(gen_statem:event_type(), term(), #state{}) ->
+			 gen_statem:state_function_result().
+%%--------------------------------------------------------------------
+wait_eoed(info, Event, State) ->
+    gen_info_1_3(Event, ?FUNCTION_NAME, State);
+wait_eoed(Type, Event, State) ->
+    gen_handshake_1_3(?FUNCTION_NAME, Type, Event, State).
+
+%%--------------------------------------------------------------------
+-spec wait_finished(gen_statem:event_type(), term(), #state{}) ->
+			 gen_statem:state_function_result().
+%%--------------------------------------------------------------------
+wait_finished(info, Event, State) ->
+    gen_info_1_3(Event, ?FUNCTION_NAME, State);
+wait_finished(Type, Event, State) ->
+    gen_handshake_1_3(?FUNCTION_NAME, Type, Event, State).
+
+%%--------------------------------------------------------------------
+-spec wait_flight2(gen_statem:event_type(), term(), #state{}) ->
+			 gen_statem:state_function_result().
+%%--------------------------------------------------------------------
+wait_flight2(info, Event, State) ->
+    gen_info_1_3(Event, ?FUNCTION_NAME, State);
+wait_flight2(Type, Event, State) ->
+    gen_handshake_1_3(?FUNCTION_NAME, Type, Event, State).
+
+%%--------------------------------------------------------------------
+-spec connected(gen_statem:event_type(), term(), #state{}) ->
+			 gen_statem:state_function_result().
+%%--------------------------------------------------------------------
+connected(info, Event, State) ->
+    gen_info_1_3(Event, ?FUNCTION_NAME, State);
+connected(Type, Event, State) ->
+    gen_handshake_1_3(?FUNCTION_NAME, Type, Event, State).
+
+%%--------------------------------------------------------------------
+-spec wait_cert_cr(gen_statem:event_type(), term(), #state{}) ->
+			 gen_statem:state_function_result().
+%%--------------------------------------------------------------------
+wait_cert_cr(info, Event, State) ->
+    gen_info_1_3(Event, ?FUNCTION_NAME, State);
+wait_cert_cr(Type, Event, State) ->
+    gen_handshake_1_3(?FUNCTION_NAME, Type, Event, State).
+
+%%--------------------------------------------------------------------
+-spec wait_ee(gen_statem:event_type(), term(), #state{}) ->
+			 gen_statem:state_function_result().
+%%--------------------------------------------------------------------
+wait_ee(info, Event, State) ->
+    gen_info_1_3(Event, ?FUNCTION_NAME, State);
+wait_ee(Type, Event, State) ->
+    gen_handshake_1_3(?FUNCTION_NAME, Type, Event, State).
+
+%%--------------------------------------------------------------------
+-spec wait_sh(gen_statem:event_type(), term(), #state{}) ->
+			 gen_statem:state_function_result().
+%%--------------------------------------------------------------------
+wait_sh(info, Event, State) ->
+    gen_info_1_3(Event, ?FUNCTION_NAME, State);
+wait_sh(Type, Event, State) ->
+    gen_handshake_1_3(?FUNCTION_NAME, Type, Event, State).
+
 %--------------------------------------------------------------------
 %% gen_statem callbacks
 %%--------------------------------------------------------------------
 callback_mode() ->
     state_functions.
 
-
-terminate(
-  {shutdown, sender_died, Reason}, _StateName,
-  #state{socket = Socket, transport_cb = Transport} = State) ->
+terminate({shutdown, {sender_died, Reason}}, _StateName,
+          #state{static_env = #static_env{socket = Socket, 
+                                          transport_cb = Transport}} 
+          = State) ->
     ssl_connection:handle_trusted_certs_db(State),
     close(Reason, Socket, Transport, undefined, undefined);
 terminate(Reason, StateName, State) ->
@@ -653,71 +981,69 @@ code_change(_OldVsn, StateName, State, _) ->
 %%% Internal functions
 %%--------------------------------------------------------------------
 initial_state(Role, Sender, Host, Port, Socket, {SSLOptions, SocketOptions, Tracker}, User,
-	      {CbModule, DataTag, CloseTag, ErrorTag}) ->
+	      {CbModule, DataTag, CloseTag, ErrorTag, PassiveTag}) ->
     #ssl_options{beast_mitigation = BeastMitigation,
                  erl_dist = IsErlDist} = SSLOptions,
     ConnectionStates = tls_record:init_connection_states(Role, BeastMitigation),
-    
-    ErlDistData = erl_dist_data(IsErlDist),
     SessionCacheCb = case application:get_env(ssl, session_cb) of
 			 {ok, Cb} when is_atom(Cb) ->
 			    Cb;
 			 _  ->
 			     ssl_session_cache
 		     end,
-
     InternalActiveN =  case application:get_env(ssl, internal_active_n) of
                            {ok, N} when is_integer(N) andalso (not IsErlDist) ->
                                N;
                            _  ->
                                ?INTERNAL_ACTIVE_N
                        end,
-    
     UserMonitor = erlang:monitor(process, User),
-
-    #state{socket_options = SocketOptions,
-	   ssl_options = SSLOptions,	   
-	   session = #session{is_resumable = new},
-	   transport_cb = CbModule,
-	   data_tag = DataTag,
-	   close_tag = CloseTag,
-	   error_tag = ErrorTag,
-	   role = Role,
-	   host = Host,
-	   port = Port,
-	   socket = Socket,
-           erl_dist_data = ErlDistData,
-	   connection_states = ConnectionStates,
-	   protocol_buffers = #protocol_buffers{},
-	   user_application = {UserMonitor, User},
-	   user_data_buffer = <<>>,
-	   session_cache_cb = SessionCacheCb,
-	   renegotiation = {false, first},
-	   allow_renegotiate = SSLOptions#ssl_options.client_renegotiation,
-	   start_or_recv_from = undefined,
-	   protocol_cb = ?MODULE,
-	   tracker = Tracker,
-	   flight_buffer = [],
-           protocol_specific = #{sender => Sender,
-                                 active_n => InternalActiveN,
-                                 active_n_toggle => true
-                                }
-	  }.
-
-erl_dist_data(true) ->
-    #{dist_handle => undefined,
-      dist_buffer => <<>>};
-erl_dist_data(false) ->
-    #{}.
-
-initialize_tls_sender(#state{role = Role,
-                             socket = Socket,
-                             socket_options = SockOpts,
-                             tracker = Tracker,
-                             protocol_cb = Connection,
-                             transport_cb = Transport,
-                             negotiated_version = Version,
-                             ssl_options = #ssl_options{renegotiate_at = RenegotiateAt},
+    InitStatEnv = #static_env{
+                     role = Role,
+                     transport_cb = CbModule,
+                     protocol_cb = ?MODULE,
+                     data_tag = DataTag,
+                     close_tag = CloseTag,
+                     error_tag = ErrorTag,
+                     passive_tag = PassiveTag,
+                     host = Host,
+                     port = Port,
+                     socket = Socket,
+                     session_cache_cb = SessionCacheCb,
+                     tracker = Tracker
+                    },
+    #state{
+       static_env = InitStatEnv,
+       handshake_env = #handshake_env{
+                          tls_handshake_history = ssl_handshake:init_handshake_history(),
+                          renegotiation = {false, first},
+                          allow_renegotiate = SSLOptions#ssl_options.client_renegotiation
+                         },
+       connection_env = #connection_env{user_application = {UserMonitor, User}},
+       socket_options = SocketOptions,
+       ssl_options = SSLOptions,
+       session = #session{is_resumable = new},
+       connection_states = ConnectionStates,
+       protocol_buffers = #protocol_buffers{},
+       user_data_buffer = {[],0,[]},
+       start_or_recv_from = undefined,
+       flight_buffer = [],
+       protocol_specific = #{sender => Sender,
+                             active_n => InternalActiveN,
+                             active_n_toggle => true
+                            }
+      }.
+
+initialize_tls_sender(#state{static_env = #static_env{
+                                             role = Role,
+                                             transport_cb = Transport,
+                                             socket = Socket,
+                                             tracker = Tracker
+                                            },
+                             connection_env = #connection_env{negotiated_version = Version},
+                             socket_options = SockOpts, 
+                             ssl_options = #ssl_options{renegotiate_at = RenegotiateAt,
+                                                        log_level = LogLevel},
                              connection_states = #{current_write := ConnectionWriteState},
                              protocol_specific = #{sender := Sender}}) ->
     Init = #{current_write => ConnectionWriteState,
@@ -725,22 +1051,32 @@ initialize_tls_sender(#state{role = Role,
              socket => Socket,
              socket_options => SockOpts,
              tracker => Tracker,
-             protocol_cb => Connection,
              transport_cb => Transport,
              negotiated_version => Version,
-             renegotiate_at => RenegotiateAt},
+             renegotiate_at => RenegotiateAt,
+             log_level => LogLevel},
     tls_sender:initialize(Sender, Init).
-    
-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
+
+next_tls_record(Data, StateName,
+                         #state{protocol_buffers =
+                                    #protocol_buffers{tls_record_buffer = Buf0,
+                                                      tls_cipher_texts = CT0} = Buffers,
+                                ssl_options = SslOpts} = State0) ->
+    Versions =
+        %% TLS 1.3 Client/Server
+        %% - Ignore TLSPlaintext.legacy_record_version
+        %% - Verify that TLSCiphertext.legacy_record_version is set to  0x0303 for all records
+        %%   other than an initial ClientHello, where it MAY also be 0x0301.
+        case StateName of
+            hello ->
+                [tls_record:protocol_version(Vsn) || Vsn <- ?ALL_AVAILABLE_VERSIONS];
+            _ ->
+                State0#state.connection_env#connection_env.negotiated_version
+        end,
+    case tls_record:get_tls_records(Data, Versions, Buf0, SslOpts) of
 	{Records, Buf1} ->
 	    CT1 = CT0 ++ Records,
-	    next_record(State0#state{protocol_buffers =
+	    next_record(StateName, State0#state{protocol_buffers =
 					 Buffers#protocol_buffers{tls_record_buffer = Buf1,
 								  tls_cipher_texts = CT1}});
 	#alert{} = Alert ->
@@ -748,10 +1084,6 @@ next_tls_record(Data, StateName, #state{protocol_buffers =
     end.
 
 
-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, _) ->
     Alert.
 
@@ -762,33 +1094,35 @@ tls_handshake_events(Packets) ->
 
 %% raw data from socket, upack records
 handle_info({Protocol, _, Data}, StateName,
-            #state{data_tag = Protocol
-                  } = State0) ->
+            #state{static_env = #static_env{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)
+	    {stop, {shutdown, own_alert}, State0}
     end;
-handle_info({tcp_passive, Socket},  StateName, #state{socket = Socket,
-                                                      protocol_specific = PS
-                                                     } = State) ->
-    next_event(StateName, no_record, State#state{protocol_specific = PS#{active_n_toggle => true}});
+handle_info({PassiveTag, Socket},  StateName, 
+            #state{static_env = #static_env{socket = Socket,
+                                            passive_tag = PassiveTag},
+                   protocol_specific = PS
+                  } = State) ->
+    next_event(StateName, no_record, 
+               State#state{protocol_specific = PS#{active_n_toggle => true}});
 handle_info({CloseTag, Socket}, StateName,
-            #state{socket = Socket, close_tag = CloseTag,
+            #state{static_env = #static_env{socket = Socket, close_tag = CloseTag},
+                   connection_env = #connection_env{negotiated_version = Version},
                    socket_options = #socket_options{active = Active},
                    protocol_buffers = #protocol_buffers{tls_cipher_texts = CTs},
-                   user_data_buffer = Buffer,
-                   protocol_specific = PS,
-		   negotiated_version = Version} = State) ->
+                   user_data_buffer = {_,BufferSize,_},
+                   protocol_specific = PS} = 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 =/= []) or (Buffer =/= <<>>)) of
+    case (Active == false) andalso ((CTs =/= []) or (BufferSize =/= 0)) of
         false ->
             case Version of
                 {1, N} when N >= 1 ->
@@ -802,7 +1136,7 @@ handle_info({CloseTag, Socket}, StateName,
             end,
 
             ssl_connection:handle_normal_shutdown(?ALERT_REC(?FATAL, ?CLOSE_NOTIFY), StateName, State),
-            ssl_connection:stop({shutdown, transport_closed}, State);
+            {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
@@ -812,7 +1146,7 @@ handle_info({CloseTag, Socket}, StateName,
     end;
 handle_info({'EXIT', Sender, Reason}, _,
             #state{protocol_specific = #{sender := Sender}} = State) ->
-    {stop, {shutdown, sender_died, Reason}, State};
+    {stop, {shutdown, {sender_died, Reason}}, State};
 handle_info(Msg, StateName, State) ->
     ssl_connection:StateName(info, Msg, State, ?MODULE).
 
@@ -820,6 +1154,14 @@ handle_alerts([], Result) ->
     Result;
 handle_alerts(_, {stop, _, _} = Stop) ->
     Stop;
+handle_alerts([#alert{level = ?WARNING, description = ?CLOSE_NOTIFY} | _Alerts], 
+              {next_state, connection = StateName, #state{connection_env = CEnv, 
+                                                          socket_options = #socket_options{active = false},
+                                                          user_data_buffer = {_,BufferSize,_},
+                                                          protocol_buffers = #protocol_buffers{tls_cipher_texts = CTs}} = 
+                   State}) when (BufferSize =/= 0) orelse
+                                (CTs =/= []) -> 
+    {next_state, StateName, State#state{connection_env = CEnv#connection_env{terminated = true}}};
 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}) ->
@@ -839,7 +1181,7 @@ decode_alerts(Bin) ->
     ssl_alert:decode(Bin).
 
 gen_handshake(StateName, Type, Event, 
-	      #state{negotiated_version = Version} = State) ->
+	      #state{connection_env = #connection_env{negotiated_version = Version}} = State) ->
     try ssl_connection:StateName(Type, Event, State, ?MODULE) of
 	Result ->
 	    Result
@@ -850,18 +1192,32 @@ gen_handshake(StateName, Type, Event,
 					    Version, StateName, State)  
     end.
 
-gen_info(Event, connection = StateName,  #state{negotiated_version = Version} = State) ->
+
+gen_handshake_1_3(StateName, Type, Event,
+	      #state{connection_env = #connection_env{negotiated_version = Version}} = State) ->
+    try tls_connection_1_3: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{connection_env = #connection_env{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) ->
+gen_info(Event, StateName, #state{connection_env = #connection_env{negotiated_version = Version}} = State) ->
     try handle_info(Event, StateName, State) of
 	Result ->
 	    Result
@@ -871,6 +1227,29 @@ gen_info(Event, StateName, #state{negotiated_version = Version} = State) ->
 						       malformed_handshake_data), 
 					    Version, StateName, State)  
     end.
+
+gen_info_1_3(Event, connected = StateName,  #state{connection_env = #connection_env{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_1_3(Event, StateName, #state{connection_env = #connection_env{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
@@ -915,3 +1294,35 @@ ensure_sender_terminate(_,  #state{protocol_specific = #{sender := Sender}}) ->
                    end
            end,
     spawn(Kill).
+
+maybe_generate_client_shares(#ssl_options{
+                            versions = [Version|_],
+                            supported_groups =
+                                #supported_groups{
+                                  supported_groups = [Group|_]}})
+  when Version =:= {3,4} ->
+    %% Generate only key_share entry for the most preferred group
+    ssl_cipher:generate_client_shares([Group]);
+maybe_generate_client_shares(_) ->
+    undefined.
+
+choose_tls_version(#ssl_options{versions = Versions},
+                   #client_hello{
+                      extensions = #{client_hello_versions :=
+                                         #client_hello_versions{versions = ClientVersions}
+                                    }
+                     }) ->
+    case ssl_handshake:select_supported_version(ClientVersions, Versions) of
+        {3,4} ->
+            'tls_v1.3';
+        _Else ->
+            'tls_v1.2'
+    end;
+choose_tls_version(_, _) ->
+    'tls_v1.2'.
+
+
+effective_version(undefined, #ssl_options{versions = [Version|_]}) ->
+    Version;
+effective_version(Version, _) ->
+    Version.
diff --git a/lib/ssl/src/tls_connection.hrl b/lib/ssl/src/tls_connection.hrl
index 0af2258932..9063b1b736 100644
--- a/lib/ssl/src/tls_connection.hrl
+++ b/lib/ssl/src/tls_connection.hrl
@@ -30,7 +30,6 @@
 -include("tls_record.hrl").
 
 -record(protocol_buffers, {
-	  tls_packets = [], %%           :: [#ssl_tls{}],  % Not yet handled decode SSL/TLS packets.
           tls_record_buffer = <<>>, %%    :: binary(),  % Buffer of incomplete records
           tls_handshake_buffer = <<>>, %% :: binary(),  % Buffer of incomplete handshakes
 	  tls_cipher_texts = []       %%:: [binary()]
diff --git a/lib/ssl/src/tls_connection_1_3.erl b/lib/ssl/src/tls_connection_1_3.erl
new file mode 100644
index 0000000000..117e4f059d
--- /dev/null
+++ b/lib/ssl/src/tls_connection_1_3.erl
@@ -0,0 +1,244 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2007-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%
+%%
+
+%%
+%%----------------------------------------------------------------------
+%% Purpose: TODO
+%%----------------------------------------------------------------------
+
+%% RFC 8446
+%% A.1.  Client
+%%
+%%                               START <----+
+%%                Send ClientHello |        | Recv HelloRetryRequest
+%%           [K_send = early data] |        |
+%%                                 v        |
+%%            /                 WAIT_SH ----+
+%%            |                    | Recv ServerHello
+%%            |                    | K_recv = handshake
+%%        Can |                    V
+%%       send |                 WAIT_EE
+%%      early |                    | Recv EncryptedExtensions
+%%       data |           +--------+--------+
+%%            |     Using |                 | Using certificate
+%%            |       PSK |                 v
+%%            |           |            WAIT_CERT_CR
+%%            |           |        Recv |       | Recv CertificateRequest
+%%            |           | Certificate |       v
+%%            |           |             |    WAIT_CERT
+%%            |           |             |       | Recv Certificate
+%%            |           |             v       v
+%%            |           |              WAIT_CV
+%%            |           |                 | Recv CertificateVerify
+%%            |           +> WAIT_FINISHED <+
+%%            |                  | Recv Finished
+%%            \                  | [Send EndOfEarlyData]
+%%                               | K_send = handshake
+%%                               | [Send Certificate [+ CertificateVerify]]
+%%     Can send                  | Send Finished
+%%     app data   -->            | K_send = K_recv = application
+%%     after here                v
+%%                           CONNECTED
+%%
+%% A.2.  Server
+%%
+%%                               START <-----+
+%%                Recv ClientHello |         | Send HelloRetryRequest
+%%                                 v         |
+%%                              RECVD_CH ----+
+%%                                 | Select parameters
+%%                                 v
+%%                              NEGOTIATED
+%%                                 | Send ServerHello
+%%                                 | K_send = handshake
+%%                                 | Send EncryptedExtensions
+%%                                 | [Send CertificateRequest]
+%%  Can send                       | [Send Certificate + CertificateVerify]
+%%  app data                       | Send Finished
+%%  after   -->                    | K_send = application
+%%  here                  +--------+--------+
+%%               No 0-RTT |                 | 0-RTT
+%%                        |                 |
+%%    K_recv = handshake  |                 | K_recv = early data
+%%  [Skip decrypt errors] |    +------> WAIT_EOED -+
+%%                        |    |       Recv |      | Recv EndOfEarlyData
+%%                        |    | early data |      | K_recv = handshake
+%%                        |    +------------+      |
+%%                        |                        |
+%%                        +> WAIT_FLIGHT2 <--------+
+%%                                 |
+%%                        +--------+--------+
+%%                No auth |                 | Client auth
+%%                        |                 |
+%%                        |                 v
+%%                        |             WAIT_CERT
+%%                        |        Recv |       | Recv Certificate
+%%                        |       empty |       v
+%%                        | Certificate |    WAIT_CV
+%%                        |             |       | Recv
+%%                        |             v       | CertificateVerify
+%%                        +-> WAIT_FINISHED <---+
+%%                                 | Recv Finished
+%%                                 | K_recv = application
+%%                                 v
+%%                             CONNECTED
+
+-module(tls_connection_1_3).
+
+-include("ssl_alert.hrl").
+-include("ssl_connection.hrl").
+-include("tls_handshake.hrl").
+-include("tls_handshake_1_3.hrl").
+
+%% gen_statem helper functions
+-export([start/4,
+         negotiated/4,
+         wait_cert/4,
+         wait_cv/4,
+         wait_finished/4,
+         wait_sh/4,
+         wait_ee/4,
+         wait_cert_cr/4
+        ]).
+
+
+start(internal, #change_cipher_spec{}, State, _Module) ->
+    tls_connection:next_event(?FUNCTION_NAME, no_record, State);
+start(internal, #client_hello{} = Hello, State0, _Module) ->
+    case tls_handshake_1_3:do_start(Hello, State0) of
+        #alert{} = Alert ->
+            ssl_connection:handle_own_alert(Alert, {3,4}, start, State0);
+        {State, start} ->
+            {next_state, start, State, []};
+        {State, negotiated} ->
+            {next_state, negotiated, State, [{next_event, internal, start_handshake}]}
+    end;
+start(internal, #server_hello{} = ServerHello, State0, _Module) ->
+    case tls_handshake_1_3:do_start(ServerHello, State0) of
+        #alert{} = Alert ->
+            ssl_connection:handle_own_alert(Alert, {3,4}, start, State0);
+        {State, NextState} ->
+            {next_state, NextState, State, []}
+    end;
+start(Type, Msg, State, Connection) ->
+    ssl_connection:handle_common_event(Type, Msg, ?FUNCTION_NAME, State, Connection).
+
+
+negotiated(internal, #change_cipher_spec{}, State, _Module) ->
+    tls_connection:next_event(?FUNCTION_NAME, no_record, State);
+negotiated(internal, Message, State0, _Module) ->
+    case tls_handshake_1_3:do_negotiated(Message, State0) of
+        #alert{} = Alert ->
+            ssl_connection:handle_own_alert(Alert, {3,4}, negotiated, State0);
+        {State, NextState} ->
+            {next_state, NextState, State, []}
+    end.
+
+
+wait_cert(internal, #change_cipher_spec{}, State, _Module) ->
+    tls_connection:next_event(?FUNCTION_NAME, no_record, State);
+wait_cert(internal,
+          #certificate_1_3{} = Certificate, State0, _Module) ->
+    case tls_handshake_1_3:do_wait_cert(Certificate, State0) of
+        {#alert{} = Alert, State} ->
+            ssl_connection:handle_own_alert(Alert, {3,4}, wait_cert, State);
+        {State, NextState} ->
+            tls_connection:next_event(NextState, no_record, State)
+    end;
+wait_cert(Type, Msg, State, Connection) ->
+    ssl_connection:handle_common_event(Type, Msg, ?FUNCTION_NAME, State, Connection).
+
+
+wait_cv(internal, #change_cipher_spec{}, State, _Module) ->
+    tls_connection:next_event(?FUNCTION_NAME, no_record, State);
+wait_cv(internal,
+          #certificate_verify_1_3{} = CertificateVerify, State0, _Module) ->
+    case tls_handshake_1_3:do_wait_cv(CertificateVerify, State0) of
+        {#alert{} = Alert, State} ->
+            ssl_connection:handle_own_alert(Alert, {3,4}, wait_cv, State);
+        {State, NextState} ->
+            tls_connection:next_event(NextState, no_record, State)
+    end;
+wait_cv(Type, Msg, State, Connection) ->
+    ssl_connection:handle_common_event(Type, Msg, ?FUNCTION_NAME, State, Connection).
+
+
+wait_finished(internal, #change_cipher_spec{}, State, _Module) ->
+    tls_connection:next_event(?FUNCTION_NAME, no_record, State);
+wait_finished(internal,
+             #finished{} = Finished, State0, Module) ->
+    case tls_handshake_1_3:do_wait_finished(Finished, State0) of
+        #alert{} = Alert ->
+            ssl_connection:handle_own_alert(Alert, {3,4}, finished, State0);
+        State1 ->
+            {Record, State} = ssl_connection:prepare_connection(State1, Module),
+            tls_connection:next_event(connection, Record, State)
+    end;
+wait_finished(Type, Msg, State, Connection) ->
+    ssl_connection:handle_common_event(Type, Msg, ?FUNCTION_NAME, State, Connection).
+
+
+wait_sh(internal, #change_cipher_spec{}, State, _Module) ->
+    tls_connection:next_event(?FUNCTION_NAME, no_record, State);
+wait_sh(internal, #server_hello{} = Hello, State0, _Module) ->
+    case tls_handshake_1_3:do_wait_sh(Hello, State0) of
+        #alert{} = Alert ->
+            ssl_connection:handle_own_alert(Alert, {3,4}, wait_sh, State0);
+        {State1, start, ServerHello} ->
+            %% hello_retry_request: go to start
+            {next_state, start, State1, [{next_event, internal, ServerHello}]};
+        {State1, wait_ee} ->
+            tls_connection:next_event(wait_ee, no_record, State1)
+    end;
+wait_sh(Type, Msg, State, Connection) ->
+    ssl_connection:handle_common_event(Type, Msg, ?FUNCTION_NAME, State, Connection).
+
+
+wait_ee(internal, #change_cipher_spec{}, State, _Module) ->
+    tls_connection:next_event(?FUNCTION_NAME, no_record, State);
+wait_ee(internal, #encrypted_extensions{} = EE, State0, _Module) ->
+    case tls_handshake_1_3:do_wait_ee(EE, State0) of
+        #alert{} = Alert ->
+            ssl_connection:handle_own_alert(Alert, {3,4}, wait_ee, State0);
+        {State1, NextState} ->
+            tls_connection:next_event(NextState, no_record, State1)
+    end;
+wait_ee(Type, Msg, State, Connection) ->
+    ssl_connection:handle_common_event(Type, Msg, ?FUNCTION_NAME, State, Connection).
+
+
+wait_cert_cr(internal, #change_cipher_spec{}, State, _Module) ->
+    tls_connection:next_event(?FUNCTION_NAME, no_record, State);
+wait_cert_cr(internal, #certificate_1_3{} = Certificate, State0, _Module) ->
+    case tls_handshake_1_3:do_wait_cert_cr(Certificate, State0) of
+        {#alert{} = Alert, State} ->
+            ssl_connection:handle_own_alert(Alert, {3,4}, wait_cert_cr, State);
+        {State1, NextState} ->
+            tls_connection:next_event(NextState, no_record, State1)
+    end;
+wait_cert_cr(internal, #certificate_request_1_3{} = CertificateRequest, State0, _Module) ->
+    case tls_handshake_1_3:do_wait_cert_cr(CertificateRequest, State0) of
+        #alert{} = Alert ->
+            ssl_connection:handle_own_alert(Alert, {3,4}, wait_cert_cr, State0);
+        {State1, NextState} ->
+            tls_connection:next_event(NextState, no_record, State1)
+    end;
+wait_cert_cr(Type, Msg, State, Connection) ->
+    ssl_connection:handle_common_event(Type, Msg, ?FUNCTION_NAME, State, Connection).
diff --git a/lib/ssl/src/tls_handshake.erl b/lib/ssl/src/tls_handshake.erl
index 19a5eb0348..37265e0759 100644
--- a/lib/ssl/src/tls_handshake.erl
+++ b/lib/ssl/src/tls_handshake.erl
@@ -26,14 +26,17 @@
 -module(tls_handshake).
 
 -include("tls_handshake.hrl").
+-include("tls_handshake_1_3.hrl").
 -include("tls_record.hrl").
 -include("ssl_alert.hrl").
 -include("ssl_internal.hrl").
 -include("ssl_cipher.hrl").
+-include("ssl_api.hrl").
 -include_lib("public_key/include/public_key.hrl").
+-include_lib("kernel/include/logger.hrl").
 
 %% Handshake handling
--export([client_hello/8, hello/4]).
+-export([client_hello/9, hello/4]).
 
 %% Handshake encoding
 -export([encode_handshake/2]).
@@ -47,8 +50,9 @@
 %% Handshake handling
 %%====================================================================
 %%--------------------------------------------------------------------
--spec client_hello(host(), inet:port_number(), ssl_record:connection_states(),
-		   #ssl_options{}, integer(), atom(), boolean(), der_cert()) ->
+-spec client_hello(ssl:host(), inet:port_number(), ssl_record:connection_states(),
+		   #ssl_options{}, integer(), atom(), boolean(), der_cert(),
+                   #key_share_client_hello{} | undefined) ->
 			  #client_hello{}.
 %%
 %% Description: Creates a client hello message.
@@ -58,19 +62,32 @@ client_hello(Host, Port, ConnectionStates,
 			  ciphers = UserSuites,
 			  fallback = Fallback
 			 } = SslOpts,
-	     Cache, CacheCb, Renegotiation, OwnCert) ->
+	     Cache, CacheCb, Renegotiation, OwnCert, KeyShare) ->
     Version = tls_record:highest_protocol_version(Versions),
+
+    %% In TLS 1.3, the client indicates its version preferences in the
+    %% "supported_versions" extension (Section 4.2.1) and the
+    %% legacy_version field MUST be set to 0x0303, which is the version
+    %% number for TLS 1.2.
+    LegacyVersion =
+        case tls_record:is_higher(Version, {3,2}) of
+            true ->
+                {3,3};
+            false ->
+                Version
+        end,
     #{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),
+                                                       Renegotiation,
+                                                       KeyShare),
     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,
+		  client_version = LegacyVersion,
 		  cipher_suites = CipherSuites,
 		  compression_methods = ssl_record:compressions(),
 		  random = SecParams#security_parameters.client_random,
@@ -81,21 +98,98 @@ client_hello(Host, Port, ConnectionStates,
 -spec hello(#server_hello{} | #client_hello{}, #ssl_options{},
 	    ssl_record:connection_states() | {inet:port_number(), #session{}, db_handle(),
 				    atom(), ssl_record:connection_states(), 
-				    binary() | undefined, ssl_cipher_format:key_algo()},
+				    binary() | undefined, ssl:kex_algo()},
 	    boolean()) ->
-		   {tls_record:tls_version(), session_id(), 
+		   {tls_record:tls_version(), ssl:session_id(), 
 		    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_format:hash(), ssl_cipher_format:sign_algo()} | 
-                    undefined} | #alert{}.
+                    HelloExt::map(), {ssl:hash(), ssl:sign_algo()} | 
+                    undefined} | {atom(), atom()} |#alert{}.
 %%
 %% Description: Handles a received hello message
 %%--------------------------------------------------------------------
-hello(#server_hello{server_version = Version, random = Random,
+
+
+%% TLS 1.3 - Section 4.1.3
+%% TLS 1.3 clients receiving a ServerHello indicating TLS 1.2 or below
+%% MUST check that the last eight bytes are not equal to either of these
+%% values.
+hello(#server_hello{server_version = {Major, Minor},
+                    random = <<_:24/binary,Down:8/binary>>},
+      #ssl_options{versions = [{M,N}|_]}, _, _)
+  when (M > 3 orelse M =:= 3 andalso N >= 4) andalso  %% TLS 1.3 client
+       (Major =:= 3 andalso Minor =:= 3 andalso       %% Negotiating TLS 1.2
+        Down =:= ?RANDOM_OVERRIDE_TLS12) orelse
+
+       (M > 3 orelse M =:= 3 andalso N >= 4) andalso  %% TLS 1.3 client
+       (Major =:= 3 andalso Minor < 3 andalso         %% Negotiating TLS 1.1 or prior
+        Down =:= ?RANDOM_OVERRIDE_TLS11) ->
+    ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER);
+
+%% TLS 1.2 clients SHOULD also check that the last eight bytes are not
+%% equal to the second value if the ServerHello indicates TLS 1.1 or below.
+hello(#server_hello{server_version = {Major, Minor},
+                    random = <<_:24/binary,Down:8/binary>>},
+      #ssl_options{versions = [{M,N}|_]}, _, _)
+  when (M =:= 3 andalso N =:= 3) andalso              %% TLS 1.2 client
+       (Major =:= 3 andalso Minor < 3 andalso         %% Negotiating TLS 1.1 or prior
+        Down =:= ?RANDOM_OVERRIDE_TLS11) ->
+    ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER);
+
+
+%% TLS 1.3 - 4.2.1.  Supported Versions
+%% If the "supported_versions" extension in the ServerHello contains a
+%% version not offered by the client or contains a version prior to TLS
+%% 1.3, the client MUST abort the handshake with an "illegal_parameter"
+%% alert.
+%%--------------------------------------------------------------------
+%% TLS 1.2 Client
+%%
+%% - If "supported_version" is present (ServerHello):
+%%   - Abort handshake with an "illegal_parameter" alert
+hello(#server_hello{server_version = LegacyVersion,
+                    random = Random,
 		    cipher_suite = CipherSuite,
 		    compression_method = Compression,
-		    session_id = SessionId, extensions = HelloExt},
+		    session_id = SessionId,
+                    extensions = #{server_hello_selected_version :=
+                                       #server_hello_selected_version{selected_version = Version} = HelloExt}
+                   },
+      #ssl_options{versions = SupportedVersions} = SslOpt,
+      ConnectionStates0, Renegotiation) ->
+    %% In TLS 1.3, the TLS server indicates its version using the "supported_versions" extension
+    %% (Section 4.2.1), and the legacy_version field MUST be set to 0x0303, which is the version
+    %% number for TLS 1.2.
+    %% The "supported_versions" extension is supported from TLS 1.2.
+    case LegacyVersion > {3,3} orelse
+        LegacyVersion =:= {3,3} andalso Version < {3,3} of
+        true ->
+            ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER);
+        false ->
+            case tls_record:is_acceptable_version(Version, SupportedVersions) of
+                true ->
+                    case Version of
+                        {3,3} ->
+                            %% TLS 1.2 ServerHello with "supported_versions" (special case)
+                            handle_server_hello_extensions(Version, SessionId, Random, CipherSuite,
+                                                           Compression, HelloExt, SslOpt,
+                                                           ConnectionStates0, Renegotiation);
+                        {3,4} ->
+                            %% TLS 1.3
+                            {next_state, wait_sh}
+                    end;
+                false ->
+                    ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER)
+            end
+    end;
+
+hello(#server_hello{server_version = Version,
+                    random = Random,
+		    cipher_suite = CipherSuite,
+		    compression_method = Compression,
+		    session_id = SessionId,
+                    extensions = HelloExt},
       #ssl_options{versions = SupportedVersions} = SslOpt,
       ConnectionStates0, Renegotiation) ->
     case tls_record:is_acceptable_version(Version, SupportedVersions) of
@@ -106,6 +200,36 @@ hello(#server_hello{server_version = Version, random = Random,
 	false ->
 	    ?ALERT_REC(?FATAL, ?PROTOCOL_VERSION)
     end;
+
+
+%% TLS 1.2 Server
+%% - If "supported_versions" is present (ClientHello):
+%%   - Select version from "supported_versions" (ignore ClientHello.legacy_version)
+%%   - If server only supports versions greater than "supported_versions":
+%%     - Abort handshake with a "protocol_version" alert (*)
+%% - If "supported_versions" is absent (ClientHello):
+%%   - Negotiate the minimum of ClientHello.legacy_version and TLS 1.2 (**)
+%%   - If server only supports versions greater than ClientHello.legacy_version:
+%%     - Abort handshake with a "protocol_version" alert
+%%
+%% (*)  Sends alert even if there is a gap in supported versions
+%%      e.g. Server 1.0,1.2 Client 1.1,1.3
+%% (**) Current implementation can negotiate a version not supported by the client
+%%      e.g. Server 1.0,1.2 Client 1.1 -> ServerHello 1.0
+hello(#client_hello{client_version = _ClientVersion,
+		    cipher_suites = CipherSuites,
+                    extensions = #{client_hello_versions :=
+                                       #client_hello_versions{versions = ClientVersions}
+                                  }} = Hello,
+      #ssl_options{versions = Versions} = SslOpts,
+      Info, Renegotiation) ->
+    try
+        Version = ssl_handshake:select_supported_version(ClientVersions, Versions),
+        do_hello(Version, Versions, CipherSuites, Hello, SslOpts, Info, Renegotiation)
+    catch
+	_:_ ->
+	    ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, malformed_handshake_data)
+    end;
 			       
 hello(#client_hello{client_version = ClientVersion,
 		    cipher_suites = CipherSuites} = Hello,
@@ -113,18 +237,7 @@ hello(#client_hello{client_version = ClientVersion,
       Info, Renegotiation) ->
     try
 	Version = ssl_handshake:select_version(tls_record, ClientVersion, Versions),
-	case ssl_cipher:is_fallback(CipherSuites) of
-	true -> 
-		Highest = tls_record:highest_protocol_version(Versions),
-		case tls_record:is_higher(Highest, Version) of
-		    true ->
-			?ALERT_REC(?FATAL, ?INAPPROPRIATE_FALLBACK);
-		    false ->				     
-			handle_client_hello(Version, Hello, SslOpts, Info, Renegotiation)
-		end;
-	    false ->
-		handle_client_hello(Version, Hello, SslOpts, Info, Renegotiation)
-	end
+        do_hello(Version, Versions, CipherSuites, Hello, SslOpts, Info, Renegotiation)
     catch
         error:{case_clause,{asn1, Asn1Reason}} ->
 	    %% ASN-1 decode of certificate somehow failed
@@ -139,7 +252,8 @@ hello(#client_hello{client_version = ClientVersion,
 %%--------------------------------------------------------------------
 
 %%--------------------------------------------------------------------
--spec encode_handshake(tls_handshake(), tls_record:tls_version()) -> iolist().
+-spec encode_handshake(tls_handshake() | tls_handshake_1_3:tls_handshake_1_3(),
+                       tls_record:tls_version()) -> iolist().
 %%     
 %% Description: Encode a handshake packet
 %%--------------------------------------------------------------------
@@ -156,7 +270,7 @@ encode_handshake(Package, Version) ->
 %%--------------------------------------------------------------------
 -spec get_tls_handshake(tls_record:tls_version(), binary(), binary() | iolist(), 
                         #ssl_options{}) ->
-     {[tls_handshake()], binary()}.
+     {[{tls_handshake(), binary()}], binary()}.
 %%
 %% Description: Given buffered and new data from ssl_record, collects
 %% and returns it as a list of handshake messages, also returns leftover
@@ -175,10 +289,7 @@ handle_client_hello(Version,
                                   cipher_suites = CipherSuites,
                                   compression_methods = Compressions,
                                   random = Random,
-                                  extensions = 
-                                      #hello_extensions{elliptic_curves = Curves,
-                                                        signature_algs = ClientHashSigns} 
-                                  = HelloExt},
+                                  extensions = HelloExt},
 		    #ssl_options{versions = Versions,
 				 signature_algs = SupportedHashSigns,
 				 eccs = SupportedECCs,
@@ -187,6 +298,9 @@ handle_client_hello(Version,
                     Renegotiation) ->
     case tls_record:is_acceptable_version(Version, Versions) of
 	true ->
+            Curves = maps:get(elliptic_curves, HelloExt, undefined),
+            ClientHashSigns = maps:get(signature_algs, HelloExt, undefined),
+            ClientSignatureSchemes = maps:get(signature_algs_cert, HelloExt, undefined),
 	    AvailableHashSigns = ssl_handshake:available_signature_algs(
 				   ClientHashSigns, SupportedHashSigns, Cert, Version),
 	    ECCCurve = ssl_handshake:select_curve(Curves, SupportedECCs, ECCOrder),
@@ -199,9 +313,11 @@ handle_client_hello(Version,
 		no_suite ->
                     ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, no_suitable_ciphers);
 		_ ->
-		    #{key_exchange := KeyExAlg} = ssl_cipher_format:suite_definition(CipherSuite),
-		    case ssl_handshake:select_hashsign(ClientHashSigns, Cert, KeyExAlg, 
-                                                       SupportedHashSigns, Version) of
+		    #{key_exchange := KeyExAlg} = ssl_cipher_format:suite_bin_to_map(CipherSuite),
+		    case ssl_handshake:select_hashsign({ClientHashSigns, ClientSignatureSchemes},
+                                                       Cert, KeyExAlg,
+                                                       SupportedHashSigns,
+                                                       Version) of
 			#alert{} = Alert ->
 			    Alert;
 			HashSign ->
@@ -223,8 +339,6 @@ handle_client_hello_extensions(Version, Type, Random, CipherSuites,
 						     HelloExt, Version, SslOpts,
 						     Session0, ConnectionStates0, 
                                                      Renegotiation) of
-	#alert{} = Alert ->
-	    Alert;
 	{Session, ConnectionStates, Protocol, ServerHelloExt} ->
 	    {Version, {Type, Session}, ConnectionStates, Protocol, 
              ServerHelloExt, HashSign}
@@ -235,19 +349,37 @@ handle_client_hello_extensions(Version, Type, Random, CipherSuites,
 
 handle_server_hello_extensions(Version, SessionId, Random, CipherSuite,
 			Compression, HelloExt, SslOpt, ConnectionStates0, Renegotiation) ->
-    case ssl_handshake:handle_server_hello_extensions(tls_record, Random, CipherSuite,
+    try ssl_handshake:handle_server_hello_extensions(tls_record, Random, CipherSuite,
 						      Compression, HelloExt, Version,
 						      SslOpt, ConnectionStates0, 
-                                                      Renegotiation) of
-	#alert{} = Alert ->
-	    Alert;
+                                                     Renegotiation) of
 	{ConnectionStates, ProtoExt, Protocol} ->
 	    {Version, SessionId, ConnectionStates, ProtoExt, Protocol}
+    catch throw:Alert ->
+	    Alert
+    end.
+
+
+do_hello(undefined, _Versions, _CipherSuites, _Hello, _SslOpts, _Info, _Renegotiation) ->
+    ?ALERT_REC(?FATAL, ?PROTOCOL_VERSION);
+do_hello(Version, Versions, CipherSuites, Hello, SslOpts, Info, Renegotiation) ->
+    case ssl_cipher:is_fallback(CipherSuites) of
+        true ->
+            Highest = tls_record:highest_protocol_version(Versions),
+            case tls_record:is_higher(Highest, Version) of
+                true ->
+                    ?ALERT_REC(?FATAL, ?INAPPROPRIATE_FALLBACK);
+                false ->
+                    handle_client_hello(Version, Hello, SslOpts, Info, Renegotiation)
+            end;
+        false ->
+            handle_client_hello(Version, Hello, SslOpts, Info, Renegotiation)
     end.
+
 %%--------------------------------------------------------------------
-enc_handshake(#hello_request{}, _Version) ->
+enc_handshake(#hello_request{}, {3, N}) when N < 4 ->
     {?HELLO_REQUEST, <<>>};
-enc_handshake(#client_hello{client_version = {Major, Minor},
+enc_handshake(#client_hello{client_version = {Major, Minor} = Version,
 		     random = Random,
 		     session_id = SessionID,
 		     cipher_suites = CipherSuites,
@@ -258,13 +390,14 @@ enc_handshake(#client_hello{client_version = {Major, Minor},
     CmLength = byte_size(BinCompMethods),
     BinCipherSuites = list_to_binary(CipherSuites),
     CsLength = byte_size(BinCipherSuites),
-    ExtensionsBin = ssl_handshake:encode_hello_extensions(HelloExtensions),
+    ExtensionsBin = ssl_handshake:encode_hello_extensions(HelloExtensions, Version),
 
     {?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, {3, 4}) ->
+    tls_handshake_1_3:encode_handshake(HandshakeMsg);
 enc_handshake(HandshakeMsg, Version) ->
     ssl_handshake:encode_handshake(HandshakeMsg, Version).
 
@@ -275,6 +408,7 @@ get_tls_handshake_aux(Version, <<?BYTE(Type), ?UINT24(Length),
     Raw = <<?BYTE(Type), ?UINT24(Length), Body/binary>>,
     try decode_handshake(Version, Type, Body) of
 	Handshake ->
+            ssl_logger:debug(Opts#ssl_options.log_level, inbound, 'handshake', Handshake),
 	    get_tls_handshake_aux(Version, Rest, Opts, [{Handshake,Raw} | Acc])
     catch
 	_:_ ->
@@ -283,24 +417,26 @@ get_tls_handshake_aux(Version, <<?BYTE(Type), ?UINT24(Length),
 get_tls_handshake_aux(_Version, Data, _, Acc) ->
     {lists:reverse(Acc), Data}.
 
-decode_handshake(_, ?HELLO_REQUEST, <<>>) ->
+decode_handshake({3, N}, ?HELLO_REQUEST, <<>>) when N < 4 ->
     #hello_request{};
-decode_handshake(_Version, ?CLIENT_HELLO, 
+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}),
+    Exts = ssl_handshake:decode_vector(Extensions),
+    DecodedExtensions = ssl_handshake:decode_hello_extensions(Exts, Version, {Major, Minor},
+                                                              client_hello),
     #client_hello{
        client_version = {Major,Minor},
        random = Random,
        session_id = Session_ID,
        cipher_suites = ssl_handshake:decode_suites('2_bytes', CipherSuites),
-       compression_methods = Comp_methods,
+       compression_methods = erlang:binary_to_list(Comp_methods),
        extensions = DecodedExtensions
       };
+decode_handshake({3, 4}, Tag, Msg) ->
+    tls_handshake_1_3:decode_handshake(Tag, Msg);
 decode_handshake(Version, Tag, Msg) ->
     ssl_handshake:decode_handshake(Version, Tag, Msg).
-
-
diff --git a/lib/ssl/src/tls_handshake.hrl b/lib/ssl/src/tls_handshake.hrl
index f6644f64af..fc67bb61fd 100644
--- a/lib/ssl/src/tls_handshake.hrl
+++ b/lib/ssl/src/tls_handshake.hrl
@@ -32,6 +32,7 @@
 	  client_version,
 	  random,             
 	  session_id,          % opaque SessionID<0..32>
+	  cookie,              % opaque<2..2^16-1>
 	  cipher_suites,       % cipher_suites<2..2^16-1>
 	  compression_methods, % compression_methods<1..2^8-1>,
 	  %% Extensions
diff --git a/lib/ssl/src/tls_handshake_1_3.erl b/lib/ssl/src/tls_handshake_1_3.erl
new file mode 100644
index 0000000000..c29366e717
--- /dev/null
+++ b/lib/ssl/src/tls_handshake_1_3.erl
@@ -0,0 +1,1898 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2007-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%
+%%
+
+%%----------------------------------------------------------------------
+%% Purpose: Help funtions for handling the TLS 1.3 (specific parts of)
+%%% TLS handshake protocol
+%%----------------------------------------------------------------------
+
+-module(tls_handshake_1_3).
+
+-include("tls_handshake_1_3.hrl").
+-include("ssl_alert.hrl").
+-include("ssl_cipher.hrl").
+-include("ssl_connection.hrl").
+-include("ssl_internal.hrl").
+-include("ssl_record.hrl").
+-include_lib("public_key/include/public_key.hrl").
+
+%% Encode
+-export([encode_handshake/1, decode_handshake/2]).
+
+%% Create handshake messages
+-export([certificate/5,
+         certificate_verify/4,
+         encrypted_extensions/1]).
+
+-export([do_start/2,
+         do_negotiated/2,
+         do_wait_cert/2,
+         do_wait_cv/2,
+         do_wait_finished/2,
+         do_wait_sh/2,
+         do_wait_ee/2,
+         do_wait_cert_cr/2]).
+
+
+%% crypto:hash(sha256, "HelloRetryRequest").
+-define(HELLO_RETRY_REQUEST_RANDOM, <<207,33,173,116,229,154,97,17,
+                                      190,29,140,2,30,101,184,145,
+                                      194,162,17,22,122,187,140,94,
+                                      7,158,9,226,200,168,51,156>>).
+
+%%====================================================================
+%% Create handshake messages
+%%====================================================================
+
+server_hello(MsgType, SessionId, KeyShare, ConnectionStates) ->
+    #{security_parameters := SecParams} =
+	ssl_record:pending_connection_state(ConnectionStates, read),
+    Extensions = server_hello_extensions(MsgType, KeyShare),
+    #server_hello{server_version = {3,3}, %% legacy_version
+		  cipher_suite = SecParams#security_parameters.cipher_suite,
+                  compression_method = 0, %% legacy attribute
+		  random = server_hello_random(MsgType, SecParams),
+		  session_id = SessionId,
+		  extensions = Extensions
+		 }.
+
+
+%% The server's extensions MUST contain "supported_versions".
+%% Additionally, it SHOULD contain the minimal set of extensions
+%% necessary for the client to generate a correct ClientHello pair.  As
+%% with the ServerHello, a HelloRetryRequest MUST NOT contain any
+%% extensions that were not first offered by the client in its
+%% ClientHello, with the exception of optionally the "cookie" (see
+%% Section 4.2.2) extension.
+server_hello_extensions(hello_retry_request = MsgType, KeyShare) ->
+    SupportedVersions = #server_hello_selected_version{selected_version = {3,4}},
+    Extensions = #{server_hello_selected_version => SupportedVersions},
+    ssl_handshake:add_server_share(MsgType, Extensions, KeyShare);
+server_hello_extensions(MsgType, KeyShare) ->
+    SupportedVersions = #server_hello_selected_version{selected_version = {3,4}},
+    Extensions = #{server_hello_selected_version => SupportedVersions},
+    ssl_handshake:add_server_share(MsgType, Extensions, KeyShare).
+
+
+server_hello_random(server_hello, #security_parameters{server_random = Random}) ->
+    Random;
+%% For reasons of backward compatibility with middleboxes (see
+%% Appendix D.4), the HelloRetryRequest message uses the same structure
+%% as the ServerHello, but with Random set to the special value of the
+%% SHA-256 of "HelloRetryRequest":
+%%
+%%   CF 21 AD 74 E5 9A 61 11 BE 1D 8C 02 1E 65 B8 91
+%%   C2 A2 11 16 7A BB 8C 5E 07 9E 09 E2 C8 A8 33 9C
+server_hello_random(hello_retry_request, _) ->
+    ?HELLO_RETRY_REQUEST_RANDOM.
+
+
+encrypted_extensions(#state{handshake_env = #handshake_env{alpn = undefined}}) ->
+    #encrypted_extensions{
+       extensions = #{}
+      };
+encrypted_extensions(#state{handshake_env = #handshake_env{alpn = ALPNProtocol}}) ->
+    Extensions = ssl_handshake:add_alpn(#{}, ALPNProtocol),
+    #encrypted_extensions{
+       extensions = Extensions
+      }.
+
+
+certificate_request(SignAlgs0, SignAlgsCert0) ->
+    %% Input arguments contain TLS 1.2 algorithms due to backward compatibility
+    %% reasons. These {Hash, Algo} tuples must be filtered before creating the
+    %% the extensions.
+    SignAlgs = filter_tls13_algs(SignAlgs0),
+    SignAlgsCert = filter_tls13_algs(SignAlgsCert0),
+    Extensions0 = add_signature_algorithms(#{}, SignAlgs),
+    Extensions = add_signature_algorithms_cert(Extensions0, SignAlgsCert),
+    #certificate_request_1_3{
+      certificate_request_context = <<>>,
+      extensions = Extensions}.
+
+
+add_signature_algorithms(Extensions, SignAlgs) ->
+    Extensions#{signature_algorithms =>
+                    #signature_algorithms{signature_scheme_list = SignAlgs}}.
+
+
+add_signature_algorithms_cert(Extensions, undefined) ->
+    Extensions;
+add_signature_algorithms_cert(Extensions, SignAlgsCert) ->
+    Extensions#{signature_algorithms_cert =>
+                    #signature_algorithms_cert{signature_scheme_list = SignAlgsCert}}.
+
+
+filter_tls13_algs(undefined) -> undefined;
+filter_tls13_algs(Algo) ->
+    lists:filter(fun is_atom/1, Algo).
+
+
+%% enum {
+%%     X509(0),
+%%     RawPublicKey(2),
+%%     (255)
+%% } CertificateType;
+%%
+%% struct {
+%%     select (certificate_type) {
+%%         case RawPublicKey:
+%%           /* From RFC 7250 ASN.1_subjectPublicKeyInfo */
+%%           opaque ASN1_subjectPublicKeyInfo<1..2^24-1>;
+%%
+%%         case X509:
+%%           opaque cert_data<1..2^24-1>;
+%%     };
+%%     Extension extensions<0..2^16-1>;
+%% } CertificateEntry;
+%%
+%% struct {
+%%     opaque certificate_request_context<0..2^8-1>;
+%%     CertificateEntry certificate_list<0..2^24-1>;
+%% } Certificate;
+certificate(OwnCert, CertDbHandle, CertDbRef, _CRContext, Role) ->
+    case ssl_certificate:certificate_chain(OwnCert, CertDbHandle, CertDbRef) of
+	{ok, _, Chain} ->
+            CertList = chain_to_cert_list(Chain),
+            %% If this message is in response to a CertificateRequest, the value of
+            %% certificate_request_context in that message. Otherwise (in the case
+            %%of server authentication), this field SHALL be zero length.
+	    {ok, #certificate_1_3{
+                    certificate_request_context = <<>>,
+                    certificate_list = CertList}};
+	{error, Error} when Role =:= server ->
+            {error, {no_suitable_certificates, Error}};
+	{error, _Error} when Role =:= client ->
+            %% The client MUST send a Certificate message if and only if the server
+            %% has requested client authentication via a CertificateRequest message
+            %% (Section 4.3.2).  If the server requests client authentication but no
+            %% suitable certificate is available, the client MUST send a Certificate
+            %% message containing no certificates (i.e., with the "certificate_list"
+            %% field having length 0).
+            {ok, #certificate_1_3{
+                    certificate_request_context = <<>>,
+                    certificate_list = []}}
+    end.
+
+
+certificate_verify(PrivateKey, SignatureScheme,
+                   #state{connection_states = ConnectionStates,
+                          handshake_env =
+                              #handshake_env{
+                                 tls_handshake_history = {Messages, _}}}, Role) ->
+    #{security_parameters := SecParamsR} =
+        ssl_record:pending_connection_state(ConnectionStates, write),
+    #security_parameters{prf_algorithm = HKDFAlgo} = SecParamsR,
+
+    {HashAlgo, _, _} =
+        ssl_cipher:scheme_to_components(SignatureScheme),
+
+    Context = lists:reverse(Messages),
+
+    %% Transcript-Hash uses the HKDF hash function defined by the cipher suite.
+    THash = tls_v1:transcript_hash(Context, HKDFAlgo),
+    ContextString = context_string(Role),
+
+    %% Digital signatures use the hash function defined by the selected signature
+    %% scheme.
+    case sign(THash, ContextString, HashAlgo, PrivateKey) of
+        {ok, Signature} ->
+            {ok, #certificate_verify_1_3{
+                    algorithm = SignatureScheme,
+                    signature = Signature
+                   }};
+        {error, badarg} ->
+            {error, badarg}
+
+    end.
+
+
+finished(#state{connection_states = ConnectionStates,
+                handshake_env =
+                    #handshake_env{
+                       tls_handshake_history = {Messages, _}}}) ->
+    #{security_parameters := SecParamsR,
+     cipher_state := #cipher_state{finished_key = FinishedKey}} =
+        ssl_record:current_connection_state(ConnectionStates, write),
+    #security_parameters{prf_algorithm = HKDFAlgo} = SecParamsR,
+
+    VerifyData = tls_v1:finished_verify_data(FinishedKey, HKDFAlgo, Messages),
+
+    #finished{
+       verify_data = VerifyData
+      }.
+
+
+%%====================================================================
+%% Encode handshake
+%%====================================================================
+
+encode_handshake(#certificate_request_1_3{
+                    certificate_request_context = Context, 
+                    extensions = Exts})->
+    EncContext = encode_cert_req_context(Context),
+    BinExts = encode_extensions(Exts),
+    {?CERTIFICATE_REQUEST, <<EncContext/binary, BinExts/binary>>};
+encode_handshake(#certificate_1_3{
+                    certificate_request_context = Context, 
+                    certificate_list = Entries}) ->
+    EncContext = encode_cert_req_context(Context),
+    EncEntries = encode_cert_entries(Entries),
+    {?CERTIFICATE, <<EncContext/binary, EncEntries/binary>>};
+encode_handshake(#certificate_verify_1_3{
+                    algorithm = Algorithm,
+                    signature = Signature}) ->
+    EncAlgo = encode_algorithm(Algorithm),
+    EncSign = encode_signature(Signature),
+    {?CERTIFICATE_VERIFY, <<EncAlgo/binary, EncSign/binary>>};
+encode_handshake(#encrypted_extensions{extensions = Exts})->
+    {?ENCRYPTED_EXTENSIONS, encode_extensions(Exts)};        
+encode_handshake(#new_session_ticket{
+                    ticket_lifetime = LifeTime,  
+                    ticket_age_add = Age,   
+                    ticket_nonce = Nonce,     
+                    ticket = Ticket,           
+                    extensions = Exts}) ->
+    TicketSize = byte_size(Ticket),
+    BinExts = encode_extensions(Exts),
+    {?NEW_SESSION_TICKET, <<?UINT32(LifeTime), ?UINT32(Age),
+                            ?BYTE(Nonce), ?UINT16(TicketSize), Ticket/binary,
+                            BinExts/binary>>};
+encode_handshake(#end_of_early_data{}) ->
+    {?END_OF_EARLY_DATA, <<>>};
+encode_handshake(#key_update{request_update = Update}) ->
+    {?KEY_UPDATE, <<?BYTE(Update)>>};
+encode_handshake(HandshakeMsg) ->
+    ssl_handshake:encode_handshake(HandshakeMsg, {3,4}).
+
+
+%%====================================================================
+%% Decode handshake
+%%====================================================================
+
+
+decode_handshake(?SERVER_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
+                                  ?BYTE(SID_length), Session_ID:SID_length/binary,
+                                  Cipher_suite:2/binary, ?BYTE(Comp_method),
+                                  ?UINT16(ExtLen), Extensions:ExtLen/binary>>)
+  when Random =:= ?HELLO_RETRY_REQUEST_RANDOM ->
+    HelloExtensions = ssl_handshake:decode_hello_extensions(Extensions, {3,4}, {Major, Minor},
+                                                            hello_retry_request),
+    #server_hello{
+       server_version = {Major,Minor},
+       random = Random,
+       session_id = Session_ID,
+       cipher_suite = Cipher_suite,
+       compression_method = Comp_method,
+       extensions = HelloExtensions};
+decode_handshake(?CERTIFICATE_REQUEST, <<?BYTE(0), ?UINT16(Size), EncExts:Size/binary>>) ->
+    Exts = decode_extensions(EncExts, certificate_request),
+    #certificate_request_1_3{
+       certificate_request_context = <<>>,
+       extensions = Exts};
+decode_handshake(?CERTIFICATE_REQUEST, <<?BYTE(CSize), Context:CSize/binary,
+                                         ?UINT16(Size), EncExts:Size/binary>>) ->
+    Exts = decode_extensions(EncExts, certificate_request),
+    #certificate_request_1_3{
+       certificate_request_context = Context,
+       extensions = Exts};
+decode_handshake(?CERTIFICATE, <<?BYTE(0), ?UINT24(Size), Certs:Size/binary>>) ->
+    CertList = decode_cert_entries(Certs),
+    #certificate_1_3{ 
+       certificate_request_context = <<>>,
+       certificate_list = CertList
+      };
+decode_handshake(?CERTIFICATE, <<?BYTE(CSize), Context:CSize/binary,
+                                 ?UINT24(Size), Certs:Size/binary>>) ->
+    CertList = decode_cert_entries(Certs),
+    #certificate_1_3{ 
+       certificate_request_context = Context,
+       certificate_list = CertList
+      };
+decode_handshake(?CERTIFICATE_VERIFY, <<?UINT16(EncAlgo), ?UINT16(Size), Signature:Size/binary>>) ->
+    Algorithm = ssl_cipher:signature_scheme(EncAlgo),
+    #certificate_verify_1_3{
+       algorithm = Algorithm,
+       signature = Signature};
+decode_handshake(?ENCRYPTED_EXTENSIONS, <<?UINT16(Size), EncExts:Size/binary>>) ->
+    #encrypted_extensions{
+       extensions = decode_extensions(EncExts, encrypted_extensions)
+      };
+decode_handshake(?NEW_SESSION_TICKET, <<?UINT32(LifeTime), ?UINT32(Age),
+                                        ?BYTE(Nonce), ?UINT16(TicketSize), Ticket:TicketSize/binary,
+                                        BinExts/binary>>) ->
+    Exts = decode_extensions(BinExts, encrypted_extensions),
+    #new_session_ticket{ticket_lifetime = LifeTime,  
+                        ticket_age_add = Age,   
+                        ticket_nonce = Nonce,     
+                        ticket = Ticket,           
+                        extensions = Exts};
+decode_handshake(?END_OF_EARLY_DATA, _) ->
+    #end_of_early_data{};
+decode_handshake(?KEY_UPDATE, <<?BYTE(Update)>>) ->
+    #key_update{request_update = Update};
+decode_handshake(Tag, HandshakeMsg) ->
+    ssl_handshake:decode_handshake({3,4}, Tag, HandshakeMsg).
+
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+encode_cert_req_context(<<>>) ->
+    <<?BYTE(0)>>;
+encode_cert_req_context(Bin) ->
+    Size = byte_size(Bin),
+    <<?BYTE(Size), Bin/binary>>.
+
+encode_cert_entries(Entries) ->
+    CertEntryList = encode_cert_entries(Entries, []),
+    Size = byte_size(CertEntryList),
+    <<?UINT24(Size), CertEntryList/binary>>.
+ 
+encode_cert_entries([], Acc) ->
+    iolist_to_binary(lists:reverse(Acc));
+encode_cert_entries([#certificate_entry{data = Data,
+                                        extensions = Exts} | Rest], Acc) ->
+    DSize = byte_size(Data),
+    BinExts = encode_extensions(Exts),
+    encode_cert_entries(Rest, 
+                        [<<?UINT24(DSize), Data/binary, BinExts/binary>> | Acc]).
+
+encode_algorithm(Algo) ->
+    Scheme = ssl_cipher:signature_scheme(Algo),
+    <<?UINT16(Scheme)>>.
+
+encode_signature(Signature) ->
+    Size = byte_size(Signature),
+    <<?UINT16(Size), Signature/binary>>.
+
+decode_cert_entries(Entries) ->
+    decode_cert_entries(Entries, []).
+
+decode_cert_entries(<<>>, Acc) ->
+    lists:reverse(Acc);
+decode_cert_entries(<<?UINT24(DSize), Data:DSize/binary, ?UINT16(Esize), BinExts:Esize/binary,
+                      Rest/binary>>, Acc) ->
+    Exts = decode_extensions(BinExts, certificate_request),
+    decode_cert_entries(Rest, [#certificate_entry{data = Data,
+                                                  extensions = Exts} | Acc]).
+
+encode_extensions(Exts)->
+    ssl_handshake:encode_extensions(extensions_list(Exts)).
+decode_extensions(Exts, MessageType) ->
+    ssl_handshake:decode_extensions(Exts, {3,4}, MessageType).
+
+extensions_list(HelloExtensions) ->
+    [Ext || {_, Ext} <- maps:to_list(HelloExtensions)].
+
+
+%% TODO: add extensions!
+chain_to_cert_list(L) ->
+    chain_to_cert_list(L, []).
+%%
+chain_to_cert_list([], Acc) ->
+    lists:reverse(Acc);
+chain_to_cert_list([H|T], Acc) ->
+    chain_to_cert_list(T, [certificate_entry(H)|Acc]).
+
+
+certificate_entry(DER) ->
+    #certificate_entry{
+       data = DER,
+       extensions = #{} %% Extensions not supported.
+      }.
+
+%% The digital signature is then computed over the concatenation of:
+%%   -  A string that consists of octet 32 (0x20) repeated 64 times
+%%   -  The context string
+%%   -  A single 0 byte which serves as the separator
+%%   -  The content to be signed
+%%
+%% For example, if the transcript hash was 32 bytes of 01 (this length
+%% would make sense for SHA-256), the content covered by the digital
+%% signature for a server CertificateVerify would be:
+%%
+%%    2020202020202020202020202020202020202020202020202020202020202020
+%%    2020202020202020202020202020202020202020202020202020202020202020
+%%    544c5320312e332c207365727665722043657274696669636174655665726966
+%%    79
+%%    00
+%%    0101010101010101010101010101010101010101010101010101010101010101
+sign(THash, Context, HashAlgo, #'ECPrivateKey'{} = PrivateKey) ->
+    Content = build_content(Context, THash),
+    try public_key:sign(Content, HashAlgo, PrivateKey) of
+        Signature ->
+            {ok, Signature}
+    catch
+        error:badarg ->
+            {error, badarg}
+    end;
+sign(THash, Context, HashAlgo, PrivateKey) ->
+    Content = build_content(Context, THash),
+
+    %% The length of the Salt MUST be equal to the length of the output
+    %% of the digest algorithm: rsa_pss_saltlen = -1
+    try public_key:sign(Content, HashAlgo, PrivateKey,
+                    [{rsa_padding, rsa_pkcs1_pss_padding},
+                     {rsa_pss_saltlen, -1},
+                     {rsa_mgf1_md, HashAlgo}]) of
+        Signature ->
+            {ok, Signature}
+    catch
+        error:badarg ->
+            {error, badarg}
+    end.
+
+
+verify(THash, Context, HashAlgo, Signature, {?'id-ecPublicKey', PublicKey, PublicKeyParams}) ->
+    Content = build_content(Context, THash),
+    try public_key:verify(Content, HashAlgo, Signature, {PublicKey, PublicKeyParams}) of
+        Result ->
+            {ok, Result}
+    catch
+        error:badarg ->
+            {error, badarg}
+    end;
+verify(THash, Context, HashAlgo, Signature, {?rsaEncryption, PublicKey, _PubKeyParams}) ->
+    Content = build_content(Context, THash),
+
+    %% The length of the Salt MUST be equal to the length of the output
+    %% of the digest algorithm: rsa_pss_saltlen = -1
+    try public_key:verify(Content, HashAlgo, Signature, PublicKey,
+                    [{rsa_padding, rsa_pkcs1_pss_padding},
+                     {rsa_pss_saltlen, -1},
+                     {rsa_mgf1_md, HashAlgo}]) of
+        Result ->
+            {ok, Result}
+    catch
+        error:badarg ->
+            {error, badarg}
+    end.
+
+
+build_content(Context, THash) ->
+    Prefix = binary:copy(<<32>>, 64),
+    <<Prefix/binary,Context/binary,?BYTE(0),THash/binary>>.
+
+
+%%====================================================================
+%% Handle handshake messages
+%%====================================================================
+
+
+%% TLS Server
+do_start(#client_hello{cipher_suites = ClientCiphers,
+                       session_id = SessionId,
+                       extensions = Extensions} = _Hello,
+         #state{connection_states = _ConnectionStates0,
+                ssl_options = #ssl_options{ciphers = ServerCiphers,
+                                           signature_algs = ServerSignAlgs,
+                                           supported_groups = ServerGroups0,
+                                           alpn_preferred_protocols = ALPNPreferredProtocols,
+                                           honor_cipher_order = HonorCipherOrder},
+                session = #session{own_certificate = Cert}} = State0) ->
+    ClientGroups0 = maps:get(elliptic_curves, Extensions, undefined),
+    ClientGroups = get_supported_groups(ClientGroups0),
+    ServerGroups = get_supported_groups(ServerGroups0),
+
+    ClientShares0 = maps:get(key_share, Extensions, undefined),
+    ClientShares = get_key_shares(ClientShares0),
+
+    ClientALPN0 = maps:get(alpn, Extensions, undefined),
+    ClientALPN = ssl_handshake:decode_alpn(ClientALPN0),
+
+    ClientSignAlgs = get_signature_scheme_list(
+                       maps:get(signature_algs, Extensions, undefined)),
+    ClientSignAlgsCert = get_signature_scheme_list(
+                           maps:get(signature_algs_cert, Extensions, undefined)),
+
+    {Ref,Maybe} = maybe(),
+
+    try
+        %% Handle ALPN extension if ALPN is configured
+        ALPNProtocol = Maybe(handle_alpn(ALPNPreferredProtocols, ClientALPN)),
+
+        %% If the server does not select a PSK, then the server independently selects a
+        %% cipher suite, an (EC)DHE group and key share for key establishment,
+        %% and a signature algorithm/certificate pair to authenticate itself to
+        %% the client.
+        Cipher = Maybe(select_cipher_suite(HonorCipherOrder, ClientCiphers, ServerCiphers)),
+        Groups = Maybe(select_common_groups(ServerGroups, ClientGroups)),
+        Maybe(validate_client_key_share(ClientGroups, ClientShares)),
+
+        {PublicKeyAlgo, SignAlgo, SignHash} = get_certificate_params(Cert),
+
+        %% Check if client supports signature algorithm of server certificate
+        Maybe(check_cert_sign_algo(SignAlgo, SignHash, ClientSignAlgs, ClientSignAlgsCert)),
+
+        %% Select signature algorithm (used in CertificateVerify message).
+        SelectedSignAlg = Maybe(select_sign_algo(PublicKeyAlgo, ClientSignAlgs, ServerSignAlgs)),
+
+        %% Select client public key. If no public key found in ClientShares or
+        %% ClientShares is empty, trigger HelloRetryRequest as we were able
+        %% to find an acceptable set of parameters but the ClientHello does not
+        %% contain sufficient information.
+        {Group, ClientPubKey} = get_client_public_key(Groups, ClientShares),
+
+        %% Generate server_share
+        KeyShare = ssl_cipher:generate_server_share(Group),
+
+        State1 = update_start_state(State0,
+                                    #{cipher => Cipher,
+                                      key_share => KeyShare,
+                                      session_id => SessionId,
+                                      group => Group,
+                                      sign_alg => SelectedSignAlg,
+                                      peer_public_key => ClientPubKey,
+                                      alpn => ALPNProtocol}),
+
+        %% 4.1.4.  Hello Retry Request
+        %%
+        %% The server will send this message in response to a ClientHello
+        %% message if it is able to find an acceptable set of parameters but the
+        %% ClientHello does not contain sufficient information to proceed with
+        %% the handshake.
+        Maybe(send_hello_retry_request(State1, ClientPubKey, KeyShare, SessionId))
+
+        %% TODO: session handling
+
+    catch
+        {Ref, {insufficient_security, no_suitable_groups}} ->
+            ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, no_suitable_groups);
+        {Ref, illegal_parameter} ->
+            ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER);
+        {Ref, no_suitable_cipher} ->
+            ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, no_suitable_cipher);
+        {Ref, {insufficient_security, no_suitable_signature_algorithm}} ->
+            ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, "No suitable signature algorithm");
+        {Ref, {insufficient_security, no_suitable_public_key}} ->
+            ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, no_suitable_public_key);
+        {Ref, no_application_protocol} ->
+            ?ALERT_REC(?FATAL, ?NO_APPLICATION_PROTOCOL)
+    end;
+%% TLS Client
+do_start(#server_hello{cipher_suite = SelectedCipherSuite,
+                       session_id = SessionId,
+                       extensions = Extensions} = _ServerHello,
+         #state{static_env = #static_env{role = client,
+                                         host = Host,
+                                         port = Port,
+                                         transport_cb = Transport,
+                                         socket = Socket,
+                                         session_cache = Cache,
+                                         session_cache_cb = CacheCb},
+                handshake_env = #handshake_env{renegotiation = {Renegotiation, _},
+                                               tls_handshake_history = _HHistory} = HsEnv,
+                connection_env = CEnv,
+                ssl_options = #ssl_options{ciphers = ClientCiphers,
+                                           supported_groups = ClientGroups0} = SslOpts,
+                session = #session{own_certificate = Cert} = Session0,
+                connection_states = ConnectionStates0
+               } = State0) ->
+    ClientGroups = get_supported_groups(ClientGroups0),
+
+    {Ref,Maybe} = maybe(),
+    try
+        ServerKeyShare = maps:get(key_share, Extensions, undefined),
+        SelectedGroup = get_selected_group(ServerKeyShare),
+
+        %% Upon receipt of this extension in a HelloRetryRequest, the client
+        %% MUST verify that (1) the selected_group field corresponds to a group
+        %% which was provided in the "supported_groups" extension in the
+        %% original ClientHello and (2) the selected_group field does not
+        %% correspond to a group which was provided in the "key_share" extension
+        %% in the original ClientHello.  If either of these checks fails, then
+        %% the client MUST abort the handshake with an "illegal_parameter"
+        %% alert.
+        Maybe(validate_selected_group(SelectedGroup, ClientGroups)),
+
+        Maybe(validate_cipher_suite(SelectedCipherSuite, ClientCiphers)),
+
+        %% Otherwise, when sending the new ClientHello, the client MUST
+        %% replace the original "key_share" extension with one containing only a
+        %% new KeyShareEntry for the group indicated in the selected_group field
+        %% of the triggering HelloRetryRequest.
+        ClientKeyShare = ssl_cipher:generate_client_shares([SelectedGroup]),
+        Hello = tls_handshake:client_hello(Host, Port, ConnectionStates0, SslOpts,
+                                           Cache, CacheCb, Renegotiation, Cert, ClientKeyShare),
+
+        HelloVersion = tls_record:hello_version(SslOpts#ssl_options.versions),
+
+        %% Update state
+        State1 = update_start_state(State0,
+                                    #{cipher => SelectedCipherSuite,
+                                      key_share => ClientKeyShare,
+                                      session_id => SessionId,
+                                      group => SelectedGroup}),
+
+        %% Replace ClientHello1 with a special synthetic handshake message
+        State2 = replace_ch1_with_message_hash(State1),
+        #state{handshake_env = #handshake_env{tls_handshake_history = HHistory}} = State2,
+
+        {BinMsg, ConnectionStates, Handshake} =
+            tls_connection:encode_handshake(Hello,  HelloVersion, ConnectionStates0, HHistory),
+        tls_socket:send(Transport, Socket, BinMsg),
+        ssl_logger:debug(SslOpts#ssl_options.log_level, outbound, 'handshake', Hello),
+        ssl_logger:debug(SslOpts#ssl_options.log_level, outbound, 'record', BinMsg),
+
+        State = State2#state{
+                  connection_states = ConnectionStates,
+                  connection_env = CEnv#connection_env{negotiated_version = HelloVersion}, %% Requested version
+                  session = Session0#session{session_id = Hello#client_hello.session_id},
+                  handshake_env = HsEnv#handshake_env{tls_handshake_history = Handshake},
+                  key_share = ClientKeyShare},
+
+        {State, wait_sh}
+
+    catch
+        {Ref, {illegal_parameter, Reason}} ->
+            ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER, Reason)
+    end.
+
+
+do_negotiated(start_handshake,
+              #state{connection_states = ConnectionStates0,
+                     session = #session{session_id = SessionId,
+                                        own_certificate = OwnCert,
+                                        ecc = SelectedGroup,
+                                        sign_alg = SignatureScheme,
+                                        dh_public_value = ClientPublicKey},
+                     ssl_options = #ssl_options{} = SslOpts,
+                     key_share = KeyShare,
+                     handshake_env = #handshake_env{tls_handshake_history = _HHistory0},
+                     connection_env = #connection_env{private_key = CertPrivateKey},
+                     static_env = #static_env{
+                                     cert_db = CertDbHandle,
+                                     cert_db_ref = CertDbRef,
+                                     socket = _Socket,
+                                     transport_cb = _Transport}
+                    } = State0) ->
+    ServerPrivateKey = get_server_private_key(KeyShare),
+
+    {Ref,Maybe} = maybe(),
+
+    try
+        %% Create server_hello
+        %% Extensions: supported_versions, key_share, (pre_shared_key)
+        ServerHello = server_hello(server_hello, SessionId, KeyShare, ConnectionStates0),
+
+        {State1, _} = tls_connection:send_handshake(ServerHello, State0),
+
+        State2 =
+            calculate_handshake_secrets(ClientPublicKey, ServerPrivateKey, SelectedGroup, State1),
+
+        State3 = ssl_record:step_encryption_state(State2),
+
+        %% Create EncryptedExtensions
+        EncryptedExtensions = encrypted_extensions(State2),
+
+        %% Encode EncryptedExtensions
+        State4 = tls_connection:queue_handshake(EncryptedExtensions, State3),
+
+        %% Create and send CertificateRequest ({verify, verify_peer})
+        {State5, NextState} = maybe_send_certificate_request(State4, SslOpts),
+
+        %% Create Certificate
+        Certificate = Maybe(certificate(OwnCert, CertDbHandle, CertDbRef, <<>>, server)),
+
+        %% Encode Certificate
+        State6 = tls_connection:queue_handshake(Certificate, State5),
+
+        %% Create CertificateVerify
+        CertificateVerify = Maybe(certificate_verify(CertPrivateKey, SignatureScheme,
+                                                     State6, server)),
+        %% Encode CertificateVerify
+        State7 = tls_connection:queue_handshake(CertificateVerify, State6),
+
+        %% Create Finished
+        Finished = finished(State7),
+
+        %% Encode Finished
+        State8 = tls_connection:queue_handshake(Finished, State7),
+
+        %% Send first flight
+        {State9, _} = tls_connection:send_handshake_flight(State8),
+
+        {State9, NextState}
+
+    catch
+        {Ref, badarg} ->
+            ?ALERT_REC(?FATAL, ?INTERNAL_ERROR, {digitally_sign, badarg});
+        {Ref, {no_suitable_certificates, Reason}} ->
+            ?ALERT_REC(?FATAL, ?INTERNAL_ERROR, {no_suitable_certificates, Reason})
+    end.
+
+
+do_wait_cert(#certificate_1_3{} = Certificate, State0) ->
+    {Ref,Maybe} = maybe(),
+    try
+        Maybe(process_certificate(Certificate, State0))
+    catch
+        {Ref, {certificate_required, State}} ->
+            {?ALERT_REC(?FATAL, ?CERTIFICATE_REQUIRED, certificate_required), State};
+        {Ref, {{certificate_unknown, Reason}, State}} ->
+            {?ALERT_REC(?FATAL, ?CERTIFICATE_UNKNOWN, Reason), State};
+        {Ref, {{internal_error, Reason}, State}} ->
+            {?ALERT_REC(?FATAL, ?INTERNAL_ERROR, Reason), State};
+        {Ref, {{handshake_failure, Reason}, State}} ->
+            {?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, Reason), State};
+        {Ref, {#alert{} = Alert, State}} ->
+            {Alert, State};
+        {#alert{} = Alert, State} ->
+            {Alert, State}
+    end.
+
+
+do_wait_cv(#certificate_verify_1_3{} = CertificateVerify, State0) ->
+    {Ref,Maybe} = maybe(),
+    try
+        State1 = Maybe(verify_signature_algorithm(State0, CertificateVerify)),
+        Maybe(verify_certificate_verify(State1, CertificateVerify))
+    catch
+        {Ref, {{bad_certificate, Reason}, State}} ->
+            {?ALERT_REC(?FATAL, ?BAD_CERTIFICATE, {bad_certificate, Reason}), State};
+        {Ref, {badarg, State}} ->
+            {?ALERT_REC(?FATAL, ?INTERNAL_ERROR, {verify, badarg}), State};
+        {Ref, {{handshake_failure, Reason}, State}} ->
+            {?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, {handshake_failure, Reason}), State}
+    end.
+
+%% TLS Server
+do_wait_finished(#finished{verify_data = VerifyData},
+                 #state{static_env = #static_env{role = server}} = State0) ->
+
+    {Ref,Maybe} = maybe(),
+
+    try
+        Maybe(validate_client_finished(State0, VerifyData)),
+
+        State1 = calculate_traffic_secrets(State0),
+
+        %% Configure traffic keys
+        ssl_record:step_encryption_state(State1)
+
+
+    catch
+        {Ref, decrypt_error} ->
+            ?ALERT_REC(?FATAL, ?DECRYPT_ERROR, decrypt_error)
+    end;
+%% TLS Client
+do_wait_finished(#finished{verify_data = _VerifyData},
+                 #state{static_env = #static_env{role = client}} = State0) ->
+
+    {Ref,Maybe} = maybe(),
+
+    try
+        %% Maybe(validate_client_finished(State0, VerifyData)),
+
+        %% Maybe send Certificate + CertificateVerify
+        State1 = Maybe(maybe_queue_cert_cert_cv(State0)),
+
+        Finished = finished(State1),
+
+        %% Encode Finished
+        State2 = tls_connection:queue_handshake(Finished, State1),
+
+        %% Send first flight
+        {State3, _} = tls_connection:send_handshake_flight(State2),
+
+        State4 = calculate_traffic_secrets(State3),
+
+        %% Configure traffic keys
+        ssl_record:step_encryption_state(State4)
+
+    catch
+        {Ref, decrypt_error} ->
+            ?ALERT_REC(?FATAL, ?DECRYPT_ERROR, decrypt_error);
+        {Ref, badarg} ->
+            ?ALERT_REC(?FATAL, ?INTERNAL_ERROR, {digitally_sign, badarg});
+        {Ref, {no_suitable_certificates, Reason}} ->
+            ?ALERT_REC(?FATAL, ?INTERNAL_ERROR, {no_suitable_certificates, Reason})
+    end.
+
+
+do_wait_sh(#server_hello{cipher_suite = SelectedCipherSuite,
+                         session_id = SessionId,
+                         extensions = Extensions} = ServerHello,
+           #state{key_share = ClientKeyShare0,
+                  ssl_options = #ssl_options{ciphers = ClientCiphers,
+                                             supported_groups = ClientGroups0}} = State0) ->
+    ClientGroups = get_supported_groups(ClientGroups0),
+    ServerKeyShare0 = maps:get(key_share, Extensions, undefined),
+    ClientKeyShare = get_key_shares(ClientKeyShare0),
+
+    {Ref,Maybe} = maybe(),
+    try
+        %% Go to state 'start' if server replies with 'HelloRetryRequest'.
+        Maybe(maybe_hello_retry_request(ServerHello, State0)),
+
+        ServerKeyShare = get_key_shares(ServerKeyShare0),
+
+        Maybe(validate_cipher_suite(SelectedCipherSuite, ClientCiphers)),
+        Maybe(validate_server_key_share(ClientGroups, ServerKeyShare)),
+
+        %% Get server public key
+        {SelectedGroup, ServerPublicKey} = get_server_public_key(ServerKeyShare),
+
+        {_, ClientPrivateKey} = get_client_private_key([SelectedGroup], ClientKeyShare),
+
+        %% Update state
+        State1 = update_start_state(State0,
+                                    #{cipher => SelectedCipherSuite,
+                                     key_share => ClientKeyShare0,
+                                     session_id => SessionId,
+                                     group => SelectedGroup,
+                                     peer_public_key => ServerPublicKey}),
+
+        State2 = calculate_handshake_secrets(ServerPublicKey, ClientPrivateKey, SelectedGroup, State1),
+
+        State3 = ssl_record:step_encryption_state(State2),
+
+        {State3, wait_ee}
+
+    catch
+        {Ref, {State, StateName, ServerHello}} ->
+            {State, StateName, ServerHello};
+        {Ref, {insufficient_security, no_suitable_groups}} ->
+            ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, no_suitable_groups);
+        {Ref, illegal_parameter} ->
+            ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER);
+        {Ref, no_suitable_cipher} ->
+            ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, no_suitable_cipher);
+        {Ref, {insufficient_security, no_suitable_signature_algorithm}} ->
+            ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, "No suitable signature algorithm");
+        {Ref, {insufficient_security, no_suitable_public_key}} ->
+            ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, no_suitable_public_key)
+    end.
+
+
+do_wait_ee(#encrypted_extensions{extensions = Extensions}, State0) ->
+
+    ALPNProtocol0 = maps:get(alpn, Extensions, undefined),
+    ALPNProtocol = get_alpn(ALPNProtocol0),
+
+    {Ref,_Maybe} = maybe(),
+
+    try
+        %% Update state
+        #state{handshake_env = HsEnv} = State0,
+        State1 = State0#state{handshake_env = HsEnv#handshake_env{alpn = ALPNProtocol}},
+
+        {State1, wait_cert_cr}
+    catch
+        {Ref, {insufficient_security, no_suitable_groups}} ->
+            ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, no_suitable_groups);
+        {Ref, illegal_parameter} ->
+            ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER);
+        {Ref, no_suitable_cipher} ->
+            ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, no_suitable_cipher);
+        {Ref, {insufficient_security, no_suitable_signature_algorithm}} ->
+            ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, "No suitable signature algorithm");
+        {Ref, {insufficient_security, no_suitable_public_key}} ->
+            ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY, no_suitable_public_key)
+    end.
+
+
+do_wait_cert_cr(#certificate_1_3{} = Certificate, State0) ->
+    {Ref,Maybe} = maybe(),
+    try
+        Maybe(process_certificate(Certificate, State0))
+    catch
+        {Ref, {certificate_required, _State}} ->
+            ?ALERT_REC(?FATAL, ?CERTIFICATE_REQUIRED, certificate_required);
+        {Ref, {{certificate_unknown, Reason}, _State}} ->
+            ?ALERT_REC(?FATAL, ?CERTIFICATE_UNKNOWN, Reason);
+        {Ref, {{internal_error, Reason}, _State}} ->
+            ?ALERT_REC(?FATAL, ?INTERNAL_ERROR, Reason);
+        {Ref, {{handshake_failure, Reason}, _State}} ->
+            ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, Reason);
+        {Ref, {#alert{} = Alert, State}} ->
+            {Alert, State}
+    end;
+do_wait_cert_cr(#certificate_request_1_3{} = CertificateRequest, State0) ->
+    {Ref,Maybe} = maybe(),
+    try
+        Maybe(process_certificate_request(CertificateRequest, State0))
+    catch
+        {Ref, {certificate_required, _State}} ->
+            ?ALERT_REC(?FATAL, ?CERTIFICATE_REQUIRED, certificate_required);
+        {Ref, {{certificate_unknown, Reason}, _State}} ->
+            ?ALERT_REC(?FATAL, ?CERTIFICATE_UNKNOWN, Reason);
+        {Ref, {illegal_parameter, Reason}} ->
+            ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER, Reason);
+        {Ref, {{internal_error, Reason}, _State}} ->
+            ?ALERT_REC(?FATAL, ?INTERNAL_ERROR, Reason);
+        {Ref, {{handshake_failure, Reason}, _State}} ->
+            ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, Reason)
+    end.
+
+
+
+%% TODO: Remove this function!
+%% not_implemented(State, Reason) ->
+%%     {error, {not_implemented, State, Reason}}.
+
+%% not_implemented(update_secrets, State0, Reason) ->
+%%     State1 = calculate_traffic_secrets(State0),
+%%     State = ssl_record:step_encryption_state(State1),
+%%     {error, {not_implemented, State, Reason}}.
+
+
+%% For reasons of backward compatibility with middleboxes (see
+%% Appendix D.4), the HelloRetryRequest message uses the same structure
+%% as the ServerHello, but with Random set to the special value of the
+%% SHA-256 of "HelloRetryRequest":
+%%
+%%   CF 21 AD 74 E5 9A 61 11 BE 1D 8C 02 1E 65 B8 91
+%%   C2 A2 11 16 7A BB 8C 5E 07 9E 09 E2 C8 A8 33 9C
+%%
+%% Upon receiving a message with type server_hello, implementations MUST
+%% first examine the Random value and, if it matches this value, process
+%% it as described in Section 4.1.4).
+maybe_hello_retry_request(#server_hello{random = ?HELLO_RETRY_REQUEST_RANDOM} = ServerHello, State0) ->
+    {error, {State0, start, ServerHello}};
+maybe_hello_retry_request(_, _) ->
+    ok.
+
+
+maybe_queue_cert_cert_cv(#state{client_certificate_requested = false} = State) ->
+    {ok, State};
+maybe_queue_cert_cert_cv(#state{connection_states = _ConnectionStates0,
+                                session = #session{session_id = _SessionId,
+                                                   own_certificate = OwnCert},
+                                ssl_options = #ssl_options{} = _SslOpts,
+                                key_share = _KeyShare,
+                                handshake_env = #handshake_env{tls_handshake_history = _HHistory0},
+                                static_env = #static_env{
+                                                role = client,
+                                                cert_db = CertDbHandle,
+                                                cert_db_ref = CertDbRef,
+                                                socket = _Socket,
+                                                transport_cb = _Transport}
+                               } = State0) ->
+    {Ref,Maybe} = maybe(),
+    try
+        %% Create Certificate
+        Certificate = Maybe(certificate(OwnCert, CertDbHandle, CertDbRef, <<>>, client)),
+
+        %% Encode Certificate
+        State1 = tls_connection:queue_handshake(Certificate, State0),
+
+        %% Maybe create and queue CertificateVerify
+        State = Maybe(maybe_queue_cert_verify(Certificate, State1)),
+        {ok, State}
+    catch
+        {Ref, badarg} ->
+            {error, badarg}
+    end.
+
+
+%% Clients MUST send this message whenever authenticating via a certificate
+%% (i.e., when the Certificate message is non-empty).
+maybe_queue_cert_verify(#certificate_1_3{certificate_list = []}, State) ->
+    {ok, State};
+maybe_queue_cert_verify(_Certificate,
+                        #state{connection_states = _ConnectionStates0,
+                               session = #session{sign_alg = SignatureScheme},
+                               connection_env = #connection_env{private_key = CertPrivateKey},
+                               static_env = #static_env{role = client}
+                              } = State) ->
+    {Ref,Maybe} = maybe(),
+    try
+        CertificateVerify = Maybe(certificate_verify(CertPrivateKey, SignatureScheme, State, client)),
+        {ok, tls_connection:queue_handshake(CertificateVerify, State)}
+    catch
+        {Ref, badarg} ->
+            {error, badarg}
+    end.
+
+
+%% Recipients of Finished messages MUST verify that the contents are
+%% correct and if incorrect MUST terminate the connection with a
+%% "decrypt_error" alert.
+validate_client_finished(#state{connection_states = ConnectionStates,
+                handshake_env =
+                    #handshake_env{
+                       tls_handshake_history = {Messages0, _}}}, VerifyData) ->
+    #{security_parameters := SecParamsR,
+     cipher_state := #cipher_state{finished_key = FinishedKey}} =
+        ssl_record:current_connection_state(ConnectionStates, read),
+    #security_parameters{prf_algorithm = HKDFAlgo} = SecParamsR,
+
+    %% Drop the client's finished message, it is not part of the handshake context
+    %% when the client calculates its finished message.
+    [_|Messages] = Messages0,
+
+    ControlData = tls_v1:finished_verify_data(FinishedKey, HKDFAlgo, Messages),
+    compare_verify_data(ControlData, VerifyData).
+
+
+compare_verify_data(Data, Data) ->
+    ok;
+compare_verify_data(_, _) ->
+    {error, decrypt_error}.
+
+
+send_hello_retry_request(#state{connection_states = ConnectionStates0} = State0,
+                         no_suitable_key, KeyShare, SessionId) ->
+    ServerHello = server_hello(hello_retry_request, SessionId, KeyShare, ConnectionStates0),
+    {State1, _} = tls_connection:send_handshake(ServerHello, State0),
+
+    %% Update handshake history
+    State2 = replace_ch1_with_message_hash(State1),
+
+    {ok, {State2, start}};
+send_hello_retry_request(State0, _, _, _) ->
+    %% Suitable key found.
+    {ok, {State0, negotiated}}.
+
+
+maybe_send_certificate_request(State, #ssl_options{verify = verify_none}) ->
+    {State, wait_finished};
+maybe_send_certificate_request(State, #ssl_options{
+                                         verify = verify_peer,
+                                         signature_algs = SignAlgs,
+                                         signature_algs_cert = SignAlgsCert}) ->
+    CertificateRequest = certificate_request(SignAlgs, SignAlgsCert),
+    {tls_connection:queue_handshake(CertificateRequest, State), wait_cert}.
+
+
+process_certificate_request(#certificate_request_1_3{},
+                            #state{session = #session{own_certificate = undefined}} = State) ->
+    {ok, {State#state{client_certificate_requested = true}, wait_cert}};
+
+process_certificate_request(#certificate_request_1_3{
+                              extensions = Extensions},
+                            #state{session = #session{own_certificate = Cert} = Session} = State) ->
+    ServerSignAlgs = get_signature_scheme_list(
+                       maps:get(signature_algs, Extensions, undefined)),
+    ServerSignAlgsCert = get_signature_scheme_list(
+                           maps:get(signature_algs_cert, Extensions, undefined)),
+
+    {_PublicKeyAlgo, SignAlgo, SignHash} = get_certificate_params(Cert),
+
+    %% Check if server supports signature algorithm of client certificate
+    case check_cert_sign_algo(SignAlgo, SignHash, ServerSignAlgs, ServerSignAlgsCert) of
+        ok ->
+            {ok, {State#state{client_certificate_requested = true}, wait_cert}};
+        {error, _} ->
+            %% Certificate not supported: send empty certificate in state 'wait_finished'
+            {ok, {State#state{client_certificate_requested = true,
+                              session = Session#session{own_certificate = undefined}}, wait_cert}}
+    end.
+
+
+process_certificate(#certificate_1_3{
+                       certificate_request_context = <<>>,
+                       certificate_list = []},
+                    #state{ssl_options =
+                               #ssl_options{
+                                  fail_if_no_peer_cert = false}} = State) ->
+    {ok, {State, wait_finished}};
+process_certificate(#certificate_1_3{
+                       certificate_request_context = <<>>,
+                       certificate_list = []},
+                    #state{ssl_options =
+                               #ssl_options{
+                                  fail_if_no_peer_cert = true}} = State0) ->
+
+    %% At this point the client believes that the connection is up and starts using
+    %% its traffic secrets. In order to be able send an proper Alert to the client
+    %% the server should also change its connection state and use the traffic
+    %% secrets.
+    State1 = calculate_traffic_secrets(State0),
+    State = ssl_record:step_encryption_state(State1),
+    {error, {certificate_required, State}};
+process_certificate(#certificate_1_3{certificate_list = Certs0},
+                    #state{ssl_options =
+                               #ssl_options{signature_algs = SignAlgs,
+                                            signature_algs_cert = SignAlgsCert} = SslOptions,
+                           static_env =
+                               #static_env{
+                                  role = Role,
+                                  host = Host,
+                                  cert_db = CertDbHandle,
+                                  cert_db_ref = CertDbRef,
+                                  crl_db = CRLDbHandle}} = State0) ->
+    %% TODO: handle extensions!
+    %% Remove extensions from list of certificates!
+    Certs = convert_certificate_chain(Certs0),
+    case is_supported_signature_algorithm(Certs, SignAlgs, SignAlgsCert) of
+        true ->
+            case validate_certificate_chain(Certs, CertDbHandle, CertDbRef,
+                                            SslOptions, CRLDbHandle, Role, Host) of
+                {ok, {PeerCert, PublicKeyInfo}} ->
+                    State = store_peer_cert(State0, PeerCert, PublicKeyInfo),
+                    {ok, {State, wait_cv}};
+                {error, Reason} ->
+                    State = update_encryption_state(Role, State0),
+                    {error, {Reason, State}};
+                {ok, #alert{} = Alert} ->
+                    State = update_encryption_state(Role, State0),
+                    {error, {Alert, State}}
+            end;
+        false ->
+            State1 = calculate_traffic_secrets(State0),
+            State = ssl_record:step_encryption_state(State1),
+            {error, {{handshake_failure,
+                      "Client certificate uses unsupported signature algorithm"}, State}}
+    end.
+
+
+%% TODO: check whole chain!
+is_supported_signature_algorithm(Certs, SignAlgs, undefined) ->
+    is_supported_signature_algorithm(Certs, SignAlgs);
+is_supported_signature_algorithm(Certs, _, SignAlgsCert) ->
+    is_supported_signature_algorithm(Certs, SignAlgsCert).
+%%
+is_supported_signature_algorithm([BinCert|_], SignAlgs0) ->
+    #'OTPCertificate'{signatureAlgorithm = SignAlg} =
+        public_key:pkix_decode_cert(BinCert, otp),
+    SignAlgs = filter_tls13_algs(SignAlgs0),
+    Scheme = ssl_cipher:signature_algorithm_to_scheme(SignAlg),
+    lists:member(Scheme, SignAlgs).
+
+
+%% Sets correct encryption state when sending Alerts in shared states that use different secrets.
+%% - If client: use handshake secrets.
+%% - If server: use traffic secrets as by this time the client's state machine
+%%              already stepped into the 'connection' state.
+update_encryption_state(server, State0) ->
+    State1 = calculate_traffic_secrets(State0),
+    ssl_record:step_encryption_state(State1);
+update_encryption_state(client, State) ->
+    State.
+
+
+validate_certificate_chain(Certs, CertDbHandle, CertDbRef, SslOptions, CRLDbHandle, Role, Host) ->
+    ServerName = ssl_handshake:server_name(SslOptions#ssl_options.server_name_indication, Host, Role),
+    [PeerCert | ChainCerts ] = Certs,
+    try
+	{TrustedCert, CertPath}  =
+	    ssl_certificate:trusted_cert_and_path(Certs, CertDbHandle, CertDbRef,
+                                                  SslOptions#ssl_options.partial_chain),
+        ValidationFunAndState =
+            ssl_handshake:validation_fun_and_state(SslOptions#ssl_options.verify_fun, Role,
+                                     CertDbHandle, CertDbRef, ServerName,
+                                     SslOptions#ssl_options.customize_hostname_check,
+                                     SslOptions#ssl_options.crl_check, CRLDbHandle, CertPath),
+        Options = [{max_path_length, SslOptions#ssl_options.depth},
+                   {verify_fun, ValidationFunAndState}],
+        %% TODO: Validate if Certificate is using a supported signature algorithm
+        %% (signature_algs_cert)!
+        case public_key:pkix_path_validation(TrustedCert, CertPath, Options) of
+            {ok, {PublicKeyInfo,_}} ->
+                {ok, {PeerCert, PublicKeyInfo}};
+            {error, Reason} ->
+                {ok, ssl_handshake:handle_path_validation_error(Reason, PeerCert, ChainCerts,
+                                                                SslOptions, Options,
+                                                                CertDbHandle, CertDbRef)}
+        end
+    catch
+        error:{badmatch,{error, {asn1, Asn1Reason}}} ->
+            %% ASN-1 decode of certificate somehow failed
+            {error, {certificate_unknown, {failed_to_decode_certificate, Asn1Reason}}};
+        error:OtherReason ->
+            {error, {internal_error, {unexpected_error, OtherReason}}}
+    end.
+
+
+store_peer_cert(#state{session = Session,
+                       handshake_env = HsEnv} = State, PeerCert, PublicKeyInfo) ->
+    State#state{session = Session#session{peer_certificate = PeerCert},
+                handshake_env = HsEnv#handshake_env{public_key_info = PublicKeyInfo}}.
+
+
+convert_certificate_chain(Certs) ->
+    Fun = fun(#certificate_entry{data = Data}) ->
+                  {true, Data};
+             (_) ->
+                  false
+          end,
+    lists:filtermap(Fun, Certs).
+
+
+%% 4.4.1.  The Transcript Hash
+%%
+%% As an exception to this general rule, when the server responds to a
+%% ClientHello with a HelloRetryRequest, the value of ClientHello1 is
+%% replaced with a special synthetic handshake message of handshake type
+%% "message_hash" containing Hash(ClientHello1).  I.e.,
+%%
+%% Transcript-Hash(ClientHello1, HelloRetryRequest, ... Mn) =
+%%    Hash(message_hash ||        /* Handshake type */
+%%         00 00 Hash.length  ||  /* Handshake message length (bytes) */
+%%         Hash(ClientHello1) ||  /* Hash of ClientHello1 */
+%%         HelloRetryRequest  || ... || Mn)
+%%
+%% NOTE: Hash.length is used in practice (openssl) and not message length!
+%%       It is most probably a fault in the RFC.
+replace_ch1_with_message_hash(#state{connection_states = ConnectionStates,
+                                     handshake_env =
+                                         #handshake_env{
+                                            tls_handshake_history =
+                                                {[HRR,CH1|HHistory], LM}} = HSEnv}  = State0) ->
+    #{security_parameters := SecParamsR} =
+        ssl_record:pending_connection_state(ConnectionStates, read),
+    #security_parameters{prf_algorithm = HKDFAlgo} = SecParamsR,
+    MessageHash = message_hash(CH1, HKDFAlgo),
+    State0#state{handshake_env =
+                     HSEnv#handshake_env{
+                        tls_handshake_history =
+                            {[HRR,MessageHash|HHistory], LM}}}.
+
+
+message_hash(ClientHello1, HKDFAlgo) ->
+    [?MESSAGE_HASH,
+     0,0,ssl_cipher:hash_size(HKDFAlgo),
+     crypto:hash(HKDFAlgo, ClientHello1)].
+
+
+calculate_handshake_secrets(PublicKey, PrivateKey, SelectedGroup,
+                              #state{connection_states = ConnectionStates,
+                                     handshake_env =
+                                         #handshake_env{
+                                            tls_handshake_history = HHistory}} = State0) ->
+    #{security_parameters := SecParamsR} =
+        ssl_record:pending_connection_state(ConnectionStates, read),
+    #security_parameters{prf_algorithm = HKDFAlgo,
+                         cipher_suite = CipherSuite} = SecParamsR,
+
+    %% Calculate handshake_secret
+    PSK = binary:copy(<<0>>, ssl_cipher:hash_size(HKDFAlgo)),
+    EarlySecret = tls_v1:key_schedule(early_secret, HKDFAlgo , {psk, PSK}),
+
+    IKM = calculate_shared_secret(PublicKey, PrivateKey, SelectedGroup),
+    HandshakeSecret = tls_v1:key_schedule(handshake_secret, HKDFAlgo, IKM, EarlySecret),
+
+    %% Calculate [sender]_handshake_traffic_secret
+    {Messages, _} =  HHistory,
+
+    ClientHSTrafficSecret =
+        tls_v1:client_handshake_traffic_secret(HKDFAlgo, HandshakeSecret, lists:reverse(Messages)),
+    ServerHSTrafficSecret =
+        tls_v1:server_handshake_traffic_secret(HKDFAlgo, HandshakeSecret, lists:reverse(Messages)),
+
+    %% Calculate traffic keys
+    #{cipher := Cipher} = ssl_cipher_format:suite_bin_to_map(CipherSuite),
+    {ReadKey, ReadIV} = tls_v1:calculate_traffic_keys(HKDFAlgo, Cipher, ClientHSTrafficSecret),
+    {WriteKey, WriteIV} = tls_v1:calculate_traffic_keys(HKDFAlgo, Cipher, ServerHSTrafficSecret),
+
+    %% Calculate Finished Keys
+    ReadFinishedKey = tls_v1:finished_key(ClientHSTrafficSecret, HKDFAlgo),
+    WriteFinishedKey = tls_v1:finished_key(ServerHSTrafficSecret, HKDFAlgo),
+
+    update_pending_connection_states(State0, HandshakeSecret,
+                                     ReadKey, ReadIV, ReadFinishedKey,
+                                     WriteKey, WriteIV, WriteFinishedKey).
+
+
+calculate_traffic_secrets(#state{
+                             static_env = #static_env{role = Role},
+                             connection_states = ConnectionStates,
+                             handshake_env =
+                                 #handshake_env{
+                                    tls_handshake_history = HHistory}} = State0) ->
+    #{security_parameters := SecParamsR} =
+        ssl_record:pending_connection_state(ConnectionStates, read),
+    #security_parameters{prf_algorithm = HKDFAlgo,
+                         cipher_suite = CipherSuite,
+                         master_secret = HandshakeSecret} = SecParamsR,
+
+    MasterSecret =
+        tls_v1:key_schedule(master_secret, HKDFAlgo, HandshakeSecret),
+
+    %% Get the correct list messages for the handshake context.
+    Messages = get_handshake_context(Role, HHistory),
+
+    %% Calculate [sender]_application_traffic_secret_0
+    ClientAppTrafficSecret0 =
+        tls_v1:client_application_traffic_secret_0(HKDFAlgo, MasterSecret, lists:reverse(Messages)),
+    ServerAppTrafficSecret0 =
+        tls_v1:server_application_traffic_secret_0(HKDFAlgo, MasterSecret, lists:reverse(Messages)),
+
+    %% Calculate traffic keys
+    #{cipher := Cipher} = ssl_cipher_format:suite_bin_to_map(CipherSuite),
+    {ReadKey, ReadIV} = tls_v1:calculate_traffic_keys(HKDFAlgo, Cipher, ClientAppTrafficSecret0),
+    {WriteKey, WriteIV} = tls_v1:calculate_traffic_keys(HKDFAlgo, Cipher, ServerAppTrafficSecret0),
+
+    update_pending_connection_states(State0, MasterSecret,
+                                     ReadKey, ReadIV, undefined,
+                                     WriteKey, WriteIV, undefined).
+
+
+get_server_private_key(#key_share_server_hello{server_share = ServerShare}) ->
+    get_private_key(ServerShare).
+
+get_private_key(#key_share_entry{
+                   key_exchange = #'ECPrivateKey'{} = PrivateKey}) ->
+    PrivateKey;
+get_private_key(#key_share_entry{
+                      key_exchange =
+                          {_, PrivateKey}}) ->
+    PrivateKey.
+
+%% X25519, X448
+calculate_shared_secret(OthersKey, MyKey, Group)
+  when is_binary(OthersKey) andalso is_binary(MyKey) andalso
+       (Group =:= x25519 orelse Group =:= x448)->
+    crypto:compute_key(ecdh, OthersKey, MyKey, Group);
+%% FFDHE
+calculate_shared_secret(OthersKey, MyKey, Group)
+  when is_binary(OthersKey) andalso is_binary(MyKey) ->
+    Params = #'DHParameter'{prime = P} = ssl_dh_groups:dh_params(Group),
+    S = public_key:compute_key(OthersKey, MyKey, Params),
+    Size = byte_size(binary:encode_unsigned(P)),
+    ssl_cipher:add_zero_padding(S, Size);
+%% ECDHE
+calculate_shared_secret(OthersKey, MyKey = #'ECPrivateKey'{}, _Group)
+  when is_binary(OthersKey) ->
+    Point = #'ECPoint'{point = OthersKey},
+    public_key:compute_key(Point, MyKey).
+
+
+update_pending_connection_states(#state{
+                                    static_env = #static_env{role = server},
+                                    connection_states =
+                                        CS = #{pending_read := PendingRead0,
+                                               pending_write := PendingWrite0}} = State,
+                                 HandshakeSecret,
+                                 ReadKey, ReadIV, ReadFinishedKey,
+                                 WriteKey, WriteIV, WriteFinishedKey) ->
+    PendingRead = update_connection_state(PendingRead0, HandshakeSecret,
+                                          ReadKey, ReadIV, ReadFinishedKey),
+    PendingWrite = update_connection_state(PendingWrite0, HandshakeSecret,
+                                           WriteKey, WriteIV, WriteFinishedKey),
+    State#state{connection_states = CS#{pending_read => PendingRead,
+                                        pending_write => PendingWrite}};
+update_pending_connection_states(#state{
+                                    static_env = #static_env{role = client},
+                                    connection_states =
+                                        CS = #{pending_read := PendingRead0,
+                                               pending_write := PendingWrite0}} = State,
+                                 HandshakeSecret,
+                                 ReadKey, ReadIV, ReadFinishedKey,
+                                 WriteKey, WriteIV, WriteFinishedKey) ->
+    PendingRead = update_connection_state(PendingRead0, HandshakeSecret,
+                                          WriteKey, WriteIV, WriteFinishedKey),
+    PendingWrite = update_connection_state(PendingWrite0, HandshakeSecret,
+                                           ReadKey, ReadIV, ReadFinishedKey),
+    State#state{connection_states = CS#{pending_read => PendingRead,
+                                        pending_write => PendingWrite}}.
+
+
+update_connection_state(ConnectionState = #{security_parameters := SecurityParameters0},
+                        HandshakeSecret, Key, IV, FinishedKey) ->
+    %% Store secret
+    SecurityParameters = SecurityParameters0#security_parameters{
+                           master_secret = HandshakeSecret},
+    ConnectionState#{security_parameters => SecurityParameters,
+                     cipher_state => cipher_init(Key, IV, FinishedKey)}.
+
+
+update_start_state(State, Map) ->
+    Cipher = maps:get(cipher, Map, undefined),
+    KeyShare = maps:get(key_share, Map, undefined),
+    SessionId = maps:get(session_id, Map, undefined),
+    Group = maps:get(group, Map, undefined),
+    SelectedSignAlg = maps:get(sign_alg, Map, undefined),
+    PeerPublicKey = maps:get(peer_public_key, Map, undefined),
+    ALPNProtocol = maps:get(alpn, Map, undefined),
+    update_start_state(State, Cipher, KeyShare, SessionId,
+                       Group, SelectedSignAlg, PeerPublicKey,
+                       ALPNProtocol).
+%%
+update_start_state(#state{connection_states = ConnectionStates0,
+                          handshake_env = #handshake_env{} = HsEnv,
+                          connection_env = CEnv,
+                          session = Session} = State,
+                   Cipher, KeyShare, SessionId,
+                   Group, SelectedSignAlg, PeerPublicKey, ALPNProtocol) ->
+    #{security_parameters := SecParamsR0} = PendingRead =
+        maps:get(pending_read, ConnectionStates0),
+    #{security_parameters := SecParamsW0} = PendingWrite =
+        maps:get(pending_write, ConnectionStates0),
+    SecParamsR = ssl_cipher:security_parameters_1_3(SecParamsR0, Cipher),
+    SecParamsW = ssl_cipher:security_parameters_1_3(SecParamsW0, Cipher),
+    ConnectionStates =
+        ConnectionStates0#{pending_read => PendingRead#{security_parameters => SecParamsR},
+                           pending_write => PendingWrite#{security_parameters => SecParamsW}},
+    State#state{connection_states = ConnectionStates,
+                handshake_env = HsEnv#handshake_env{alpn = ALPNProtocol},
+                key_share = KeyShare,
+                session = Session#session{session_id = SessionId,
+                                          ecc = Group,
+                                          sign_alg = SelectedSignAlg,
+                                          dh_public_value = PeerPublicKey,
+                                          cipher_suite = Cipher},
+                connection_env = CEnv#connection_env{negotiated_version = {3,4}}}.
+
+
+cipher_init(Key, IV, FinishedKey) ->
+    #cipher_state{key = Key,
+                  iv = IV,
+                  finished_key = FinishedKey,
+                  tag_len = 16}.
+
+
+%% Get handshake context for verification of CertificateVerify.
+%%
+%% Verify CertificateVerify:
+%%    ClientHello         (client) (1)
+%%    ServerHello         (server) (2)
+%%    EncryptedExtensions (server) (8)
+%%    CertificateRequest  (server) (13)
+%%    Certificate         (server) (11)
+%%    CertificateVerify   (server) (15)
+%%    Finished            (server) (20)
+%%    Certificate         (client) (11)
+%%    CertificateVerify   (client) (15) - Drop! Not included in calculations!
+get_handshake_context_cv({[<<15,_/binary>>|Messages], _}) ->
+    Messages.
+
+
+%% Get handshake context for traffic key calculation.
+%%
+%% Client is authenticated with certificate:
+%%    ClientHello         (client) (1)
+%%    ServerHello         (server) (2)
+%%    EncryptedExtensions (server) (8)
+%%    CertificateRequest  (server) (13)
+%%    Certificate         (server) (11)
+%%    CertificateVerify   (server) (15)
+%%    Finished            (server) (20)
+%%    Certificate         (client) (11) - Drop! Not included in calculations!
+%%    CertificateVerify   (client) (15) - Drop! Not included in calculations!
+%%    Finished            (client) (20) - Drop! Not included in calculations!
+%%
+%% Client is authenticated but sends empty certificate:
+%%    ClientHello         (client) (1)
+%%    ServerHello         (server) (2)
+%%    EncryptedExtensions (server) (8)
+%%    CertificateRequest  (server) (13)
+%%    Certificate         (server) (11)
+%%    CertificateVerify   (server) (15)
+%%    Finished            (server) (20)
+%%    Certificate         (client) (11) - Drop! Not included in calculations!
+%%    Finished            (client) (20) - Drop! Not included in calculations!
+%%
+%% Client is not authenticated:
+%%    ClientHello         (client) (1)
+%%    ServerHello         (server) (2)
+%%    EncryptedExtensions (server) (8)
+%%    Certificate         (server) (11)
+%%    CertificateVerify   (server) (15)
+%%    Finished            (server) (20)
+%%    Finished            (client) (20) - Drop! Not included in calculations!
+%%
+%% Drop all client messages from the front of the iolist using the property that
+%% incoming messages are binaries.
+get_handshake_context(server, {Messages, _}) ->
+    get_handshake_context_server(Messages);
+get_handshake_context(client, {Messages, _}) ->
+    get_handshake_context_client(Messages).
+
+get_handshake_context_server([H|T]) when is_binary(H) ->
+    get_handshake_context_server(T);
+get_handshake_context_server(L) ->
+    L.
+
+
+get_handshake_context_client([H|T]) when is_list(H) ->
+    get_handshake_context_client(T);
+get_handshake_context_client(L) ->
+    L.
+
+
+%% If the CertificateVerify message is sent by a server, the signature
+%% algorithm MUST be one offered in the client's "signature_algorithms"
+%% extension unless no valid certificate chain can be produced without
+%% unsupported algorithms
+%%
+%% If sent by a client, the signature algorithm used in the signature
+%% MUST be one of those present in the supported_signature_algorithms
+%% field of the "signature_algorithms" extension in the
+%% CertificateRequest message.
+verify_signature_algorithm(#state{
+                              static_env = #static_env{role = Role},
+                              ssl_options =
+                                  #ssl_options{
+                                     signature_algs = LocalSignAlgs}} = State0,
+                           #certificate_verify_1_3{algorithm = PeerSignAlg}) ->
+    case lists:member(PeerSignAlg, LocalSignAlgs) of
+        true ->
+            {ok, maybe_update_selected_sign_alg(State0, PeerSignAlg, Role)};
+        false ->
+            State1 = calculate_traffic_secrets(State0),
+            State = ssl_record:step_encryption_state(State1),
+            {error, {{handshake_failure,
+                      "CertificateVerify uses unsupported signature algorithm"}, State}}
+    end.
+
+
+maybe_update_selected_sign_alg(#state{session = Session} = State, SignAlg, client) ->
+    State#state{session = Session#session{sign_alg = SignAlg}};
+maybe_update_selected_sign_alg(State, _, _) ->
+    State.
+
+
+verify_certificate_verify(#state{
+                             static_env = #static_env{role = Role},
+                             connection_states = ConnectionStates,
+                             handshake_env =
+                                 #handshake_env{
+                                    public_key_info = PublicKeyInfo,
+                                    tls_handshake_history = HHistory}} = State0,
+                          #certificate_verify_1_3{
+                             algorithm = SignatureScheme,
+                             signature = Signature}) ->
+    #{security_parameters := SecParamsR} =
+        ssl_record:pending_connection_state(ConnectionStates, write),
+    #security_parameters{prf_algorithm = HKDFAlgo} = SecParamsR,
+
+    {HashAlgo, _, _} =
+        ssl_cipher:scheme_to_components(SignatureScheme),
+
+    Messages = get_handshake_context_cv(HHistory),
+
+    Context = lists:reverse(Messages),
+
+    %% Transcript-Hash uses the HKDF hash function defined by the cipher suite.
+    THash = tls_v1:transcript_hash(Context, HKDFAlgo),
+
+    ContextString = peer_context_string(Role),
+
+    %% Digital signatures use the hash function defined by the selected signature
+    %% scheme.
+    case verify(THash, ContextString, HashAlgo, Signature, PublicKeyInfo) of
+        {ok, true} ->
+            {ok, {State0, wait_finished}};
+        {ok, false} ->
+            State1 = calculate_traffic_secrets(State0),
+            State = ssl_record:step_encryption_state(State1),
+            {error, {{handshake_failure, "Failed to verify CertificateVerify"}, State}};
+        {error, badarg} ->
+            State1 = calculate_traffic_secrets(State0),
+            State = ssl_record:step_encryption_state(State1),
+            {error, {badarg, State}}
+    end.
+
+
+context_string(server) ->
+    <<"TLS 1.3, server CertificateVerify">>;
+context_string(client) ->
+    <<"TLS 1.3, client CertificateVerify">>.
+
+
+%% Return context string for verifing peer signature
+peer_context_string(server) ->
+    <<"TLS 1.3, client CertificateVerify">>;
+peer_context_string(client) ->
+    <<"TLS 1.3, server CertificateVerify">>.
+
+
+%% If there is no overlap between the received
+%% "supported_groups" and the groups supported by the server, then the
+%% server MUST abort the handshake with a "handshake_failure" or an
+%% "insufficient_security" alert.
+select_common_groups(_, []) ->
+    {error, {insufficient_security, no_suitable_groups}};
+select_common_groups(ServerGroups, ClientGroups) ->
+    Fun = fun(E) -> lists:member(E, ClientGroups) end,
+    case lists:filter(Fun, ServerGroups) of
+        [] ->
+            {error, {insufficient_security, no_suitable_groups}};
+        L ->
+            {ok, L}
+    end.
+
+
+%% RFC 8446 - 4.2.8.  Key Share
+%% This vector MAY be empty if the client is requesting a
+%% HelloRetryRequest.  Each KeyShareEntry value MUST correspond to a
+%% group offered in the "supported_groups" extension and MUST appear in
+%% the same order.  However, the values MAY be a non-contiguous subset
+%% of the "supported_groups" extension and MAY omit the most preferred
+%% groups.
+%%
+%% Clients can offer as many KeyShareEntry values as the number of
+%% supported groups it is offering, each representing a single set of
+%% key exchange parameters.
+%%
+%% Clients MUST NOT offer multiple KeyShareEntry values
+%% for the same group.  Clients MUST NOT offer any KeyShareEntry values
+%% for groups not listed in the client's "supported_groups" extension.
+%% Servers MAY check for violations of these rules and abort the
+%% handshake with an "illegal_parameter" alert if one is violated.
+validate_client_key_share(_ ,[]) ->
+    ok;
+validate_client_key_share([], _) ->
+    {error, illegal_parameter};
+validate_client_key_share([G|ClientGroups], [{_, G, _}|ClientShares]) ->
+    validate_client_key_share(ClientGroups, ClientShares);
+validate_client_key_share([_|ClientGroups], [_|_] = ClientShares) ->
+    validate_client_key_share(ClientGroups, ClientShares).
+
+
+%% Verify that selected group is offered by the client.
+validate_server_key_share([G|_ClientGroups], {_, G, _}) ->
+    ok;
+validate_server_key_share([_|ClientGroups], {_, _, _} = ServerKeyShare) ->
+    validate_server_key_share(ClientGroups, ServerKeyShare).
+
+
+validate_selected_group(SelectedGroup, [SelectedGroup|_]) ->
+    {error, {illegal_parameter,
+             "Selected group sent by the server shall not correspond to a group"
+             " which was provided in the key_share extension"}};
+validate_selected_group(SelectedGroup, ClientGroups) ->
+    case lists:member(SelectedGroup, ClientGroups) of
+        true ->
+            ok;
+        false ->
+            {error, {illegal_parameter,
+                     "Selected group sent by the server shall correspond to a group"
+                     " which was provided in the supported_groups extension"}}
+    end.
+
+
+get_client_public_key([Group|_] = Groups, ClientShares) ->
+    get_client_public_key(Groups, ClientShares, Group).
+%%
+get_client_public_key(_, [], PreferredGroup) ->
+    {PreferredGroup, no_suitable_key};
+get_client_public_key([], _, PreferredGroup) ->
+    {PreferredGroup, no_suitable_key};
+get_client_public_key([Group|Groups], ClientShares, PreferredGroup) ->
+     case lists:keysearch(Group, 2, ClientShares) of
+         {value, {_, _, ClientPublicKey}} ->
+             {Group, ClientPublicKey};
+         false ->
+             get_client_public_key(Groups, ClientShares, PreferredGroup)
+     end.
+
+get_client_private_key([Group|_] = Groups, ClientShares) ->
+    get_client_private_key(Groups, ClientShares, Group).
+%%
+get_client_private_key(_, [], PreferredGroup) ->
+    {PreferredGroup, no_suitable_key};
+get_client_private_key([], _, PreferredGroup) ->
+    {PreferredGroup, no_suitable_key};
+get_client_private_key([Group|Groups], ClientShares, PreferredGroup) ->
+     case lists:keysearch(Group, 2, ClientShares) of
+         {value, {_, _, {_, ClientPrivateKey}}} ->
+             {Group, ClientPrivateKey};
+         {value, {_, _, #'ECPrivateKey'{} = ClientPrivateKey}} ->
+             {Group, ClientPrivateKey};
+         false ->
+             get_client_private_key(Groups, ClientShares, PreferredGroup)
+     end.
+
+
+get_server_public_key({key_share_entry, Group, PublicKey}) ->
+                             {Group, PublicKey}.
+
+
+%% RFC 7301 - Application-Layer Protocol Negotiation Extension
+%% It is expected that a server will have a list of protocols that it
+%% supports, in preference order, and will only select a protocol if the
+%% client supports it.  In that case, the server SHOULD select the most
+%% highly preferred protocol that it supports and that is also
+%% advertised by the client.  In the event that the server supports no
+%% protocols that the client advertises, then the server SHALL respond
+%% with a fatal "no_application_protocol" alert.
+handle_alpn(undefined, _) ->
+    {ok, undefined};
+handle_alpn([], _) ->
+    {error, no_application_protocol};
+handle_alpn([_|_], undefined) ->
+    {ok, undefined};
+handle_alpn([ServerProtocol|T], ClientProtocols) ->
+    case lists:member(ServerProtocol, ClientProtocols) of
+        true ->
+            {ok, ServerProtocol};
+        false ->
+            handle_alpn(T, ClientProtocols)
+    end.
+
+
+select_cipher_suite(_, [], _) ->
+    {error, no_suitable_cipher};
+%% If honor_cipher_order is set to true, use the server's preference for
+%% cipher suite selection.
+select_cipher_suite(true, ClientCiphers, ServerCiphers) ->
+    select_cipher_suite(false, ServerCiphers, ClientCiphers);
+select_cipher_suite(false, [Cipher|ClientCiphers], ServerCiphers) ->
+    case lists:member(Cipher, tls_v1:suites('TLS_v1.3')) andalso
+        lists:member(Cipher, ServerCiphers) of
+        true ->
+            {ok, Cipher};
+        false ->
+            select_cipher_suite(false, ClientCiphers, ServerCiphers)
+    end.
+
+
+%% RFC 8446 4.1.3 ServerHello
+%% A client which receives a cipher suite that was not offered MUST abort the
+%% handshake with an "illegal_parameter" alert.
+validate_cipher_suite(Cipher, ClientCiphers) ->
+    case lists:member(Cipher, ClientCiphers) of
+        true ->
+            ok;
+        false ->
+            {error, illegal_parameter}
+    end.
+
+
+%% RFC 8446 (TLS 1.3)
+%% TLS 1.3 provides two extensions for indicating which signature
+%% algorithms may be used in digital signatures.  The
+%% "signature_algorithms_cert" extension applies to signatures in
+%% certificates and the "signature_algorithms" extension, which
+%% originally appeared in TLS 1.2, applies to signatures in
+%% CertificateVerify messages.
+%%
+%% If no "signature_algorithms_cert" extension is
+%% present, then the "signature_algorithms" extension also applies to
+%% signatures appearing in certificates.
+
+%% Check if the signature algorithm of the server certificate is supported
+%% by the client.
+check_cert_sign_algo(SignAlgo, SignHash, ClientSignAlgs, undefined) ->
+    do_check_cert_sign_algo(SignAlgo, SignHash, ClientSignAlgs);
+check_cert_sign_algo(SignAlgo, SignHash, _, ClientSignAlgsCert) ->
+    do_check_cert_sign_algo(SignAlgo, SignHash, ClientSignAlgsCert).
+
+
+%% DSA keys are not supported by TLS 1.3
+select_sign_algo(dsa, _ClientSignAlgs, _ServerSignAlgs) ->
+    {error, {insufficient_security, no_suitable_public_key}};
+select_sign_algo(_, [], _) ->
+    {error, {insufficient_security, no_suitable_signature_algorithm}};
+select_sign_algo(PublicKeyAlgo, [C|ClientSignAlgs], ServerSignAlgs) ->
+    {_, S, _} = ssl_cipher:scheme_to_components(C),
+    %% RSASSA-PKCS1-v1_5 and Legacy algorithms are not defined for use in signed
+    %% TLS handshake messages: filter sha-1 and rsa_pkcs1.
+    %%
+    %% RSASSA-PSS RSAE algorithms: If the public key is carried in an X.509
+    %% certificate, it MUST use the rsaEncryption OID.
+    %% RSASSA-PSS PSS algorithms: If the public key is carried in an X.509 certificate,
+    %% it MUST use the RSASSA-PSS OID.
+    case ((PublicKeyAlgo =:= rsa andalso S =:= rsa_pss_rsae)
+          orelse (PublicKeyAlgo =:= rsa_pss andalso S =:= rsa_pss_pss)
+          orelse (PublicKeyAlgo =:= ecdsa andalso S =:= ecdsa))
+        andalso
+        lists:member(C, ServerSignAlgs) of
+        true ->
+            {ok, C};
+        false ->
+            select_sign_algo(PublicKeyAlgo, ClientSignAlgs, ServerSignAlgs)
+    end.
+
+
+do_check_cert_sign_algo(_, _, []) ->
+    {error, {insufficient_security, no_suitable_signature_algorithm}};
+do_check_cert_sign_algo(SignAlgo, SignHash, [Scheme|T]) ->
+    {Hash, Sign, _Curve} = ssl_cipher:scheme_to_components(Scheme),
+    case compare_sign_algos(SignAlgo, SignHash, Sign, Hash) of
+        true ->
+            ok;
+        _Else ->
+            do_check_cert_sign_algo(SignAlgo, SignHash, T)
+    end.
+
+
+%% id-RSASSA-PSS (rsa_pss) indicates that the key may only be used for PSS signatures.
+%% TODO: Uncomment when rsa_pss signatures are supported in certificates
+%% compare_sign_algos(rsa_pss, Hash, Algo, Hash)
+%%   when Algo =:= rsa_pss_pss ->
+%%     true;
+%% rsaEncryption (rsa) allows the key to be used for any of the standard encryption or
+%% signature schemes.
+compare_sign_algos(rsa, Hash, Algo, Hash)
+  when Algo =:= rsa_pss_rsae orelse
+       Algo =:= rsa_pkcs1 ->
+    true;
+compare_sign_algos(Algo, Hash, Algo, Hash) ->
+    true;
+compare_sign_algos(_, _, _, _) ->
+    false.
+
+
+get_certificate_params(Cert) ->
+    {SignAlgo0, _Param, PublicKeyAlgo0} = ssl_handshake:get_cert_params(Cert),
+    {SignHash0, SignAlgo} = public_key:pkix_sign_types(SignAlgo0),
+    %% Convert hash to new format
+    SignHash = case SignHash0 of
+                   sha ->
+                       sha1;
+                   H -> H
+               end,
+    PublicKeyAlgo = public_key_algo(PublicKeyAlgo0),
+    {PublicKeyAlgo, SignAlgo, SignHash}.
+
+
+%% Note: copied from ssl_handshake
+public_key_algo(?'id-RSASSA-PSS') ->
+    rsa_pss;
+public_key_algo(?rsaEncryption) ->
+    rsa;
+public_key_algo(?'id-ecPublicKey') ->
+    ecdsa;
+public_key_algo(?'id-dsa') ->
+    dsa.
+
+get_signature_scheme_list(undefined) ->
+    undefined;
+get_signature_scheme_list(#signature_algorithms_cert{
+                        signature_scheme_list = ClientSignatureSchemes}) ->
+    ClientSignatureSchemes;
+get_signature_scheme_list(#signature_algorithms{
+                        signature_scheme_list = ClientSignatureSchemes}) ->
+    %% Filter unassigned and legacy elements
+    lists:filter(fun (E) -> is_atom(E) andalso E =/= unassigned end,
+                 ClientSignatureSchemes).
+
+get_supported_groups(#supported_groups{supported_groups = Groups}) ->
+    Groups.
+
+get_key_shares(#key_share_client_hello{client_shares = ClientShares}) ->
+    ClientShares;
+get_key_shares(#key_share_server_hello{server_share = ServerShare}) ->
+    ServerShare.
+
+get_selected_group(#key_share_hello_retry_request{selected_group = SelectedGroup}) ->
+    SelectedGroup.
+
+get_alpn(ALPNProtocol0) ->
+    case ssl_handshake:decode_alpn(ALPNProtocol0) of
+        undefined ->
+            undefined;
+        [ALPNProtocol] ->
+            ALPNProtocol
+    end.
+
+maybe() ->
+    Ref = erlang:make_ref(),
+    Ok = fun(ok) -> ok;
+            ({ok,R}) -> R;
+            ({error,Reason}) ->
+                 throw({Ref,Reason})
+         end,
+    {Ref,Ok}.
diff --git a/lib/ssl/src/tls_handshake_1_3.hrl b/lib/ssl/src/tls_handshake_1_3.hrl
new file mode 100644
index 0000000000..eb85f216c8
--- /dev/null
+++ b/lib/ssl/src/tls_handshake_1_3.hrl
@@ -0,0 +1,261 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018-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%
+%%
+%%
+%%----------------------------------------------------------------------
+%% Purpose: Record and constant defenitions for the TLS-handshake protocol
+%% see RFC 8446. Also includes supported hello extensions.
+%%----------------------------------------------------------------------
+
+-ifndef(tls_handshake_1_3).
+-define(tls_handshake_1_3, true).
+
+%% Common to TLS-1.3 and previous TLS versions 
+%% Some defenitions may not exist in TLS-1.3 this is 
+%% handled elsewhere
+-include("tls_handshake.hrl"). 
+
+%% New handshake types in TLS-1.3 RFC 8446 B.3
+-define(NEW_SESSION_TICKET, 4).
+-define(END_OF_EARLY_DATA, 5).
+-define(ENCRYPTED_EXTENSIONS, 8).
+-define(KEY_UPDATE, 24).
+%% %% Not really a message but special way to handle handshake hashes
+%% %% when a "hello-retry-request" (special server_hello) is sent
+-define(MESSAGE_HASH, 254). 
+
+%% %%  RFC 8446 B.3.1.
+%% %% New extension types in TLS-1.3
+-define(PRE_SHARED_KEY_EXT, 41).
+-define(EARLY_DATA_EXT, 42).
+%%-define(SUPPORTED_VERSIONS_EXT, 43). %% Updates TLS 1.2 so defined in ssl_handshake.hrl
+-define(COOKIE_EXT, 44).
+-define(PSK_KEY_EXCHANGE_MODES_EXT, 45).
+-define(CERTIFICATE_AUTHORITIES_EXT, 47).
+-define(OID_FILTERS_EXT, 48).
+-define(POST_HANDSHAKE_AUTH_EXT, 49).
+%% -define(SIGNATURE_ALGORITHMS_CERT_EXT, 50). %% Updates TLS 1.2 so defined in ssl_handshake.hrl
+-define(KEY_SHARE_EXT, 51).
+
+%%  RFC 8446 B.3.1
+-record(key_share_entry, {
+          group,  %NamedGroup
+          key_exchange %key_exchange<1..2^16-1>;
+         }).
+-record(key_share_client_hello, {
+          client_shares   %% KeyShareEntry client_shares<0..2^16-1>;
+         }).
+-record(key_share_hello_retry_request, {
+          selected_group  %%  NamedGroup
+         }).
+-record(key_share_server_hello, {
+          server_share  %% KeyShareEntry server_share;
+         }).
+
+-record(uncompressed_point_representation, {
+          legacy_form = 4, %     uint8 legacy_form = 4;
+          x,               %     opaque X[coordinate_length];
+          y                %     opaque Y[coordinate_length];
+         }).
+
+%% RFC 8446 4.2.9.  Pre-Shared Key Exchange Modes
+
+%% enum { psk_ke(0), psk_dhe_ke(1), (255) } PskKeyExchangeMode;
+-define(PSK_KE, 0).
+-define(PSK_DHE_KE, 1).
+
+-record(psk_key_exchange_modes, {
+          ke_modes % ke_modes<1..255>
+         }).
+
+%% RFC 8446 4.2.10.  Early Data Indication
+-record(empty, {
+         }).
+-record(early_data_indication, {
+          indication % uint32 max_early_data_size (new_session_ticket) | 
+          %% #empty{} (client_hello, encrypted_extensions)
+         }).
+
+%% RFC 8446 4.2.11. Pre-Shared Key Extension
+-record(psk_identity,
+        {
+         identity,             % opaque identity<1..2^16-1>
+         obfuscated_ticket_age % uint32
+        }).
+
+-record(offered_psks,
+        {
+         identities,    % PskIdentity identities<7..2^16-1>;
+         binders        % PskBinderEntry binders<33..2^16-1>; opaque PskBinderEntry<32..255>
+        }).
+
+%% struct {
+%%     select (Handshake.msg_type) {
+%%         case client_hello: OfferedPsks;
+%%         case server_hello: uint16 selected_identity;
+%%     };
+%% } PreSharedKeyExtension;
+-record(pre_shared_key_client_hello,
+        {
+         offered_psks
+        }).
+
+-record(pre_shared_key_server_hello,
+        {
+         selected_identity
+        }).
+
+%% RFC 8446 B.3.1.2.
+-record(cookie, {
+          cookie %cookie<1..2^16-1>;
+         }).
+
+%%% RFC 8446 B.3.1.3.  Signature Algorithm Extension
+%% Signature Schemes
+%% RSASSA-PKCS1-v1_5 algorithms
+-define(RSA_PKCS1_SHA256, 16#0401).
+-define(RSA_PKCS1_SHA384, 16#0501).
+-define(RSA_PKCS1_SHA512, 16#0601).
+
+%% ECDSA algorithms 
+-define(ECDSA_SECP256R1_SHA256, 16#0403).
+-define(ECDSA_SECP384R1_SHA384, 16#0503).
+-define(ECDSA_SECP521R1_SHA512, 16#0603).
+
+%% RSASSA-PSS algorithms with public key OID rsaEncryption 
+-define(RSA_PSS_RSAE_SHA256, 16#0804).
+-define(RSA_PSS_RSAE_SHA384, 16#0805).
+-define(RSA_PSS_RSAE_SHA512, 16#0806).
+
+%% EdDSA algorithms 
+-define(ED25519, 16#0807).
+-define(ED448, 16#0808).
+
+%% RSASSA-PSS algorithms with public key OID RSASSA-PSS 
+-define(RSA_PSS_PSS_SHA256, 16#0809).
+-define(RSA_PSS_PSS_SHA384, 16#080a).
+-define(RSA_PSS_PSS_SHA512, 16#080b).
+
+%% Legacy algorithms
+-define(RSA_PKCS1_SHA1, 16#201).
+-define(ECDSA_SHA1, 16#0203).
+
+%%  RFC 8446 B.3.1.4.  Supported Groups Extension
+%% Elliptic Curve Groups (ECDHE)
+-define(SECP256R1, 16#0017). 
+-define(SECP384R1, 16#0018). 
+-define(SECP521R1, 16#0019).
+-define(X25519, 16#001D).
+-define(X448, 16#001E).
+
+%% RFC 8446 Finite Field Groups (DHE)
+-define(FFDHE2048, 16#0100).
+-define(FFDHE3072, 16#0101).
+-define(FFDHE4096, 16#0102). 
+-define(FFDHE6144, 16#0103).
+-define(FFDHE8192 ,16#0104).
+
+-record(named_group_list, {
+        named_group_list  %named_group_list<2..2^16-1>;
+         }).
+
+%%  RFC 8446 B.3.2 Server Parameters Messages
+%%  opaque DistinguishedName<1..2^16-1>;XS
+-record(certificate_authoritie_sextension, {
+          authorities  %DistinguishedName authorities<3..2^16-1>;
+         }).
+
+-record(oid_filter, {
+          certificate_extension_oid, % opaque certificate_extension_oid<1..2^8-1>;
+          certificate_extension_values % opaque certificate_extension_values<0..2^16-1>;
+         }).
+
+-record(oid_filter_extension, {
+          filters %OIDFilter filters<0..2^16-1>;
+         }).
+-record(post_handshake_auth, {
+         }).
+
+-record(encrypted_extensions, {
+          extensions  %extensions<0..2^16-1>;
+         }).
+
+-record(certificate_request_1_3, {
+          certificate_request_context, % opaque certificate_request_context<0..2^8-1>;
+          extensions %Extension extensions<2..2^16-1>;
+         }).
+
+%%  RFC 8446 B.3.3  Authentication Messages
+
+%% Certificate Type
+-define(X509, 0).
+-define(OpenPGP_RESERVED, 1).
+-define(RawPublicKey, 2).
+
+-record(certificate_entry, {
+          data,  
+          %% select (certificate_type) {
+          %%     case RawPublicKey:
+          %%       /* From RFC 7250 ASN.1_subjectPublicKeyInfo */
+          %%       opaque ASN1_subjectPublicKeyInfo<1..2^24-1>;
+          %%
+          %%     case X509:
+          %%       opaque cert_data<1..2^24-1>;
+          %% };
+          extensions %% Extension extensions<0..2^16-1>;
+         }).
+
+-record(certificate_1_3, {
+          certificate_request_context, % opaque certificate_request_context<0..2^8-1>;
+          certificate_list             % CertificateEntry certificate_list<0..2^24-1>;
+         }).
+
+-record(certificate_verify_1_3, {
+          algorithm, % SignatureScheme
+          signature  % signature<0..2^16-1>
+	 }).
+
+%% RFC 8446 B.3.4. Ticket Establishment
+-record(new_session_ticket, {
+          ticket_lifetime,  %unit32
+          ticket_age_add,   %unit32
+          ticket_nonce,     %opaque ticket_nonce<0..255>;
+          ticket,           %opaque ticket<1..2^16-1>
+          extensions        %extensions<0..2^16-2>
+         }).
+
+%%  RFC 8446 B.3.5. Updating Keys
+-record(end_of_early_data, {
+         }).
+
+-define(UPDATE_NOT_REQUESTED, 0).
+-define(UPDATE_REQUESTED, 1).
+
+-record(key_update, {
+          request_update
+         }).
+
+-type tls_handshake_1_3() :: #encrypted_extensions{} |
+                             #certificate_request_1_3{} |
+                             #certificate_1_3{} |
+                             #certificate_verify_1_3{}.
+
+-export_type([tls_handshake_1_3/0]).
+
+-endif. % -ifdef(tls_handshake_1_3).
diff --git a/lib/ssl/src/tls_record.erl b/lib/ssl/src/tls_record.erl
index cf0690f2a5..2aeab98929 100644
--- a/lib/ssl/src/tls_record.erl
+++ b/lib/ssl/src/tls_record.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2019. 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.
@@ -30,9 +30,10 @@
 -include("ssl_alert.hrl").
 -include("tls_handshake.hrl").
 -include("ssl_cipher.hrl").
+-include_lib("kernel/include/logger.hrl").
 
 %% Handling of incoming data
--export([get_tls_records/3, init_connection_states/2]).
+-export([get_tls_records/4, init_connection_states/2]).
 
 %% Encoding TLS records
 -export([encode_handshake/3, encode_alert_record/3,
@@ -40,13 +41,16 @@
 -export([encode_plain_text/4]).
 
 %% Decoding
--export([decode_cipher_text/3]).
+-export([decode_cipher_text/4]).
+
+%% Logging helper
+-export([build_tls_record/1]).
 
 %% 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]).
+	 is_acceptable_version/1, is_acceptable_version/2, hello_version/1]).
 
 -export_type([tls_version/0, tls_atom_version/0]).
 
@@ -75,25 +79,23 @@ init_connection_states(Role, BeastMitigation) ->
       pending_write => Pending}.
 
 %%--------------------------------------------------------------------
--spec get_tls_records(binary(), [tls_version()], binary()) -> {[binary()], binary()} | #alert{}.
+-spec get_tls_records(
+        binary(),
+        [tls_version()] | tls_version(),
+        Buffer0 :: binary() | {'undefined' | #ssl_tls{}, {[binary()],non_neg_integer(),[binary()]}},
+        #ssl_options{}) ->
+                             {Records :: [#ssl_tls{}],
+                              Buffer :: {'undefined' | #ssl_tls{}, {[binary()],non_neg_integer(),[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, 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.
+get_tls_records(Data, Versions, Buffer, SslOpts) when is_binary(Buffer) ->
+    parse_tls_records(Versions, {[Data],byte_size(Data),[]}, SslOpts, undefined);
+get_tls_records(Data, Versions, {Hdr, {Front,Size,Rear}}, SslOpts) ->
+    parse_tls_records(Versions, {Front,Size + byte_size(Data),[Data|Rear]}, SslOpts, Hdr).
 
 %%====================================================================
 %% Encoding
@@ -105,6 +107,8 @@ get_tls_records(Data, Versions, Buffer) ->
 %
 %% Description: Encodes a handshake message to send on the ssl-socket.
 %%--------------------------------------------------------------------
+encode_handshake(Frag, {3, 4}, ConnectionStates) ->
+    tls_record_1_3:encode_handshake(Frag, ConnectionStates);
 encode_handshake(Frag, Version, 
 		 #{current_write :=
 		       #{beast_mitigation := BeastMitigation,
@@ -113,8 +117,8 @@ encode_handshake(Frag, Version,
 		     ConnectionStates) ->
     case iolist_size(Frag) of
 	N  when N > ?MAX_PLAIN_TEXT_LENGTH ->
-	    Data = split_bin(iolist_to_binary(Frag), Version, BCA, BeastMitigation),
-	    encode_iolist(?HANDSHAKE, Data, Version, ConnectionStates);
+	    Data = split_iovec(erlang:iolist_to_iovec(Frag), Version, BCA, BeastMitigation),
+	    encode_fragments(?HANDSHAKE, Version, Data, ConnectionStates);
 	_  ->
 	    encode_plain_text(?HANDSHAKE, Version, Frag, ConnectionStates)
     end.
@@ -125,6 +129,8 @@ encode_handshake(Frag, Version,
 %%
 %% Description: Encodes an alert message to send on the ssl-socket.
 %%--------------------------------------------------------------------
+encode_alert_record(Alert, {3, 4}, ConnectionStates) ->
+    tls_record_1_3:encode_alert_record(Alert, ConnectionStates);
 encode_alert_record(#alert{level = Level, description = Description},
                     Version, ConnectionStates) ->
     encode_plain_text(?ALERT, Version, <<?BYTE(Level), ?BYTE(Description)>>,
@@ -140,80 +146,86 @@ encode_change_cipher_spec(Version, ConnectionStates) ->
     encode_plain_text(?CHANGE_CIPHER_SPEC, Version, ?byte(?CHANGE_CIPHER_SPEC_PROTO), ConnectionStates).
 
 %%--------------------------------------------------------------------
--spec encode_data(binary(), tls_version(), ssl_record:connection_states()) ->
-			 {iolist(), ssl_record:connection_states()}.
+-spec encode_data([binary()], tls_version(), ssl_record:connection_states()) ->
+			 {[[binary()]], ssl_record:connection_states()}.
 %%
 %% Description: Encodes data to send on the ssl-socket.
 %%--------------------------------------------------------------------
-encode_data(Frag, Version,
+encode_data(Data, {3, 4}, ConnectionStates) ->
+    tls_record_1_3:encode_data(Data, ConnectionStates);
+encode_data(Data, Version,
 	    #{current_write := #{beast_mitigation := BeastMitigation,
 				 security_parameters :=
 				     #security_parameters{bulk_cipher_algorithm = BCA}}} =
 		ConnectionStates) ->
-    Data = split_bin(Frag, Version, BCA, BeastMitigation),
-    encode_iolist(?APPLICATION_DATA, Data, Version, ConnectionStates).
+    Fragments = split_iovec(Data, Version, BCA, BeastMitigation),
+    encode_fragments(?APPLICATION_DATA, Version, Fragments, ConnectionStates).
 
 %%====================================================================
 %% Decoding
 %%====================================================================
 
 %%--------------------------------------------------------------------
--spec decode_cipher_text(#ssl_tls{}, ssl_record:connection_states(), boolean()) ->
+-spec decode_cipher_text(tls_version(), #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,
+decode_cipher_text({3,4}, CipherTextRecord, ConnectionStates, _) -> 
+    tls_record_1_3:decode_cipher_text(CipherTextRecord, ConnectionStates);
+decode_cipher_text(_, CipherTextRecord,
 		   #{current_read :=
-			 #{compression_state := CompressionS0,
-			   sequence_number := Seq,
-                           cipher_state := CipherS0,
+			 #{sequence_number := Seq,
 			   security_parameters :=
-			       #security_parameters{
-				  cipher_type = ?AEAD,
-                                  bulk_cipher_algorithm =
-                                      BulkCipherAlgo,
-				  compression_algorithm = CompAlg}
-			  } = ReadState0} = ConnnectionStates0, _) ->
-    AAD = start_additional_data(Type, Version, ReadState0),
-    CipherS1 = ssl_record:nonce_seed(BulkCipherAlgo, <<?UINT64(Seq)>>, CipherS0),
-    case ssl_record:decipher_aead(BulkCipherAlgo, CipherS1, AAD, CipherFragment, Version) of
-	{PlainFragment, CipherState} ->
-	    {Plain, CompressionS1} = ssl_record:uncompress(CompAlg,
-							   PlainFragment, CompressionS0),
-	    ConnnectionStates = ConnnectionStates0#{
+                               #security_parameters{cipher_type = ?AEAD,
+                                                    bulk_cipher_algorithm = BulkCipherAlgo},
+                           cipher_state := CipherS0
+                          }
+                    } = ConnectionStates0, _) ->
+    SeqBin = <<?UINT64(Seq)>>,
+    #ssl_tls{type = Type, version = {MajVer,MinVer} = Version, fragment = Fragment} = CipherTextRecord,
+    StartAdditionalData = <<SeqBin/binary, ?BYTE(Type), ?BYTE(MajVer), ?BYTE(MinVer)>>,
+    CipherS = ssl_record:nonce_seed(BulkCipherAlgo, SeqBin, CipherS0),
+    case ssl_record:decipher_aead(
+           BulkCipherAlgo, CipherS, StartAdditionalData, Fragment, Version)
+    of
+	PlainFragment when is_binary(PlainFragment) ->
+            #{current_read :=
+                  #{security_parameters := SecParams,
+                    compression_state := CompressionS0} = ReadState0} = ConnectionStates0,
+	    {Plain, CompressionS} = ssl_record:uncompress(SecParams#security_parameters.compression_algorithm,
+                                                          PlainFragment, CompressionS0),
+	    ConnectionStates = ConnectionStates0#{
 				  current_read => ReadState0#{
-                                                    cipher_state => CipherState,
+                                                    cipher_state => CipherS,
                                                     sequence_number => Seq + 1,
-                                                    compression_state => CompressionS1}},
-	    {CipherText#ssl_tls{fragment = Plain}, ConnnectionStates};
+                                                    compression_state => CompressionS}},
+	    {CipherTextRecord#ssl_tls{fragment = Plain}, ConnectionStates};
 	#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) ->
+decode_cipher_text(_, #ssl_tls{version = Version,
+                               fragment = CipherFragment} = CipherTextRecord,
+		   #{current_read := 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),
+	    MacHash = ssl_cipher:calc_mac_hash(CipherTextRecord#ssl_tls.type, Version, PlainFragment, ReadState1),
 	    case ssl_record:is_correct_mac(Mac, MacHash) of
 		true ->
+                    #{sequence_number := Seq,
+                      compression_state := CompressionS0,
+                      security_parameters :=
+                          #security_parameters{compression_algorithm = CompAlg}} = ReadState0,
 		    {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};
+		    ConnnectionStates =
+                        ConnnectionStates0#{current_read =>
+                                                ReadState1#{sequence_number => Seq + 1,
+                                                            compression_state => CompressionS1}},
+		    {CipherTextRecord#ssl_tls{fragment = Plain}, ConnnectionStates};
 		false ->
-			?ALERT_REC(?FATAL, ?BAD_RECORD_MAC)
+                    ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC)
 	    end;
 	    #alert{} = Alert ->
 	    Alert
@@ -230,6 +242,8 @@ decode_cipher_text(#ssl_tls{type = Type, version = Version,
 %% Description: Creates a protocol version record from a version atom
 %% or vice versa.
 %%--------------------------------------------------------------------
+protocol_version('tlsv1.3') ->
+    {3, 4};
 protocol_version('tlsv1.2') ->
     {3, 3};
 protocol_version('tlsv1.1') ->
@@ -240,6 +254,8 @@ protocol_version(sslv3) ->
     {3, 0};
 protocol_version(sslv2) -> %% Backwards compatibility
     {2, 0};
+protocol_version({3, 4}) ->
+    'tlsv1.3';
 protocol_version({3, 3}) ->
     'tlsv1.2';
 protocol_version({3, 2}) ->
@@ -373,10 +389,10 @@ is_acceptable_version({N,_} = Version, Versions)
 is_acceptable_version(_,_) ->
     false.
 
--spec hello_version(tls_version(), [tls_version()]) -> tls_version().
-hello_version(Version, _) when Version >= {3, 3} ->
-    Version;
-hello_version(_, Versions) ->
+-spec hello_version([tls_version()]) -> tls_version().
+hello_version([Highest|_]) when Highest >= {3,3} ->
+    Highest;
+hello_version(Versions) ->
     lowest_protocol_version(Versions).
 
 %%--------------------------------------------------------------------
@@ -395,117 +411,243 @@ initial_connection_state(ConnectionEnd, BeastMitigation) ->
       server_verify_data => undefined
      }.
 
-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) ->
-    get_tls_records_aux(Rest, [#ssl_tls{type = ?APPLICATION_DATA,
-					version = {MajVer, MinVer},
-					fragment = Data} | Acc]);
-get_tls_records_aux(<<?BYTE(?HANDSHAKE),?BYTE(MajVer),?BYTE(MinVer),
-		     ?UINT16(Length), 
-		     Data:Length/binary, Rest/binary>>, Acc) ->
-    get_tls_records_aux(Rest, [#ssl_tls{type = ?HANDSHAKE,
-					version = {MajVer, MinVer},
-					fragment = Data} | Acc]);
-get_tls_records_aux(<<?BYTE(?ALERT),?BYTE(MajVer),?BYTE(MinVer),
-		     ?UINT16(Length), Data:Length/binary, 
-		     Rest/binary>>, Acc) ->
-    get_tls_records_aux(Rest, [#ssl_tls{type = ?ALERT,
-					version = {MajVer, MinVer},
-					fragment = Data} | Acc]);
-get_tls_records_aux(<<?BYTE(?CHANGE_CIPHER_SPEC),?BYTE(MajVer),?BYTE(MinVer),
-		     ?UINT16(Length), Data:Length/binary, Rest/binary>>, 
-		    Acc) ->
-    get_tls_records_aux(Rest, [#ssl_tls{type = ?CHANGE_CIPHER_SPEC,
-					version = {MajVer, MinVer},
-					fragment = Data} | Acc]);
-get_tls_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_tls_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.
-%%--------------------------------------------------------------------
-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}}.
-
-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}}.
-
-encode_iolist(Type, Data, Version, ConnectionStates0) ->
-    {ConnectionStates, EncodedMsg} =
-        lists:foldl(fun(Text, {CS0, Encoded}) ->
-			    {Enc, CS1} =
-				encode_plain_text(Type, Version, Text, CS0),
-			    {CS1, [Enc | Encoded]}
-		    end, {ConnectionStates0, []}, Data),
-    {lists:reverse(EncodedMsg), ConnectionStates}.
-%%--------------------------------------------------------------------
-do_encode_plain_text(Type, Version, Data, #{compression_state := CompS0,
-                                            cipher_state := CipherS0,
-                                            sequence_number := Seq,
-                                            security_parameters :=
-					     #security_parameters{
-						cipher_type = ?AEAD,
-                                                bulk_cipher_algorithm = BCAlg,
-						compression_algorithm = CompAlg}
-					} = WriteState0) ->
-    {Comp, CompS1} = ssl_record:compress(CompAlg, Data, CompS0),
-    CipherS = ssl_record:nonce_seed(BCAlg, <<?UINT64(Seq)>>, CipherS0),
-    WriteState = WriteState0#{compression_state => CompS1,
-                              cipher_state => CipherS},
-    AAD = start_additional_data(Type, Version, WriteState),
-    ssl_record:cipher_aead(Version, Comp, WriteState, 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) ->
+%% Used by logging to recreate the received bytes
+build_tls_record(#ssl_tls{type = Type, version = {MajVer, MinVer}, fragment = Fragment}) ->
+    Length = byte_size(Fragment),
+    <<?BYTE(Type),?BYTE(MajVer),?BYTE(MinVer),?UINT16(Length), Fragment/binary>>.
+
+
+parse_tls_records(Versions, Q, SslOpts, undefined) ->
+    decode_tls_records(Versions, Q, SslOpts, [], undefined, undefined, undefined);
+parse_tls_records(Versions, Q, SslOpts, #ssl_tls{type = Type, version = Version, fragment = Length}) ->
+    decode_tls_records(Versions, Q, SslOpts, [], Type, Version, Length).
+
+%% Generic code path
+decode_tls_records(Versions, {_,Size,_} = Q0, SslOpts, Acc, undefined, _Version, _Length) ->
+    if
+        5 =< Size ->
+            {<<?BYTE(Type),?BYTE(MajVer),?BYTE(MinVer), ?UINT16(Length)>>, Q} = binary_from_front(5, Q0),
+            validate_tls_records_type(Versions, Q, SslOpts, Acc, Type, {MajVer,MinVer}, Length);
+        3 =< Size ->
+            {<<?BYTE(Type),?BYTE(MajVer),?BYTE(MinVer)>>, Q} = binary_from_front(3, Q0),
+            validate_tls_records_type(Versions, Q, SslOpts, Acc, Type, {MajVer,MinVer}, undefined);
+        1 =< Size ->
+            {<<?BYTE(Type)>>, Q} = binary_from_front(1, Q0),
+            validate_tls_records_type(Versions, Q, SslOpts, Acc, Type, undefined, undefined);
+        true ->
+            validate_tls_records_type(Versions, Q0, SslOpts, Acc, undefined, undefined, undefined)
+    end;
+decode_tls_records(Versions, {_,Size,_} = Q0, SslOpts, Acc, Type, undefined, _Length) ->
+    if
+        4 =< Size ->
+            {<<?BYTE(MajVer),?BYTE(MinVer), ?UINT16(Length)>>, Q} = binary_from_front(4, Q0),
+            validate_tls_record_version(Versions, Q, SslOpts, Acc, Type, {MajVer,MinVer}, Length);
+        2 =< Size ->
+            {<<?BYTE(MajVer),?BYTE(MinVer)>>, Q} = binary_from_front(2, Q0),
+            validate_tls_record_version(Versions, Q, SslOpts, Acc, Type, {MajVer,MinVer}, undefined);
+        true ->
+            validate_tls_record_version(Versions, Q0, SslOpts, Acc, Type, undefined, undefined)
+    end;
+decode_tls_records(Versions, {_,Size,_} = Q0, SslOpts, Acc, Type, Version, undefined) ->
+    if
+        2 =< Size ->
+            {<<?UINT16(Length)>>, Q} = binary_from_front(2, Q0),
+            validate_tls_record_length(Versions, Q, SslOpts, Acc, Type, Version, Length);
+        true ->
+            validate_tls_record_length(Versions, Q0, SslOpts, Acc, Type, Version, undefined)
+    end;
+decode_tls_records(Versions, Q, SslOpts, Acc, Type, Version, Length) ->
+    validate_tls_record_length(Versions, Q, SslOpts, Acc, Type, Version, Length).
+
+validate_tls_records_type(_Versions, Q, _SslOpts, Acc, undefined, _Version, _Length) ->
+    {lists:reverse(Acc),
+     {undefined, Q}};
+validate_tls_records_type(Versions, Q, SslOpts, Acc, Type, Version, Length) ->
+    if
+        ?KNOWN_RECORD_TYPE(Type) ->
+            validate_tls_record_version(Versions, Q, SslOpts, Acc, Type, Version, Length);
+        true ->
+            %% Not ?KNOWN_RECORD_TYPE(Type)
+            ?ALERT_REC(?FATAL, ?UNEXPECTED_MESSAGE)
+    end.
+
+validate_tls_record_version(_Versions, Q, _SslOpts, Acc, Type, undefined, _Length) ->
+    {lists:reverse(Acc),
+     {#ssl_tls{type = Type, version = undefined, fragment = undefined}, Q}};
+validate_tls_record_version(Versions, Q, SslOpts, Acc, Type, Version, Length) ->
+    case Versions of
+        _ when is_list(Versions) ->
+            case is_acceptable_version(Version, Versions) of
+                true ->
+                    validate_tls_record_length(Versions, Q, SslOpts, Acc, Type, Version, Length);
+                false ->
+                    ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC)
+            end;
+        {3, 4} when Version =:= {3, 3} ->
+            validate_tls_record_length(Versions, Q, SslOpts, Acc, Type, Version, Length);
+        Version ->
+            %% Exact version match
+            validate_tls_record_length(Versions, Q, SslOpts, Acc, Type, Version, Length);
+        _ ->
+            ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC)
+    end.
+
+validate_tls_record_length(_Versions, Q, _SslOpts, Acc, Type, Version, undefined) ->
+    {lists:reverse(Acc),
+     {#ssl_tls{type = Type, version = Version, fragment = undefined}, Q}};
+validate_tls_record_length(Versions, {_,Size0,_} = Q0, SslOpts, Acc, Type, Version, Length) ->
+    if
+        Length =< ?MAX_CIPHER_TEXT_LENGTH ->
+            if
+                Length =< Size0 ->
+                    %% Complete record
+                    {Fragment, Q} = binary_from_front(Length, Q0),
+                    Record = #ssl_tls{type = Type, version = Version, fragment = Fragment},
+                    ssl_logger:debug(SslOpts#ssl_options.log_level, inbound, 'record', Record),
+                    decode_tls_records(Versions, Q, SslOpts, [Record|Acc], undefined, undefined, undefined);
+                true ->
+                    {lists:reverse(Acc),
+                     {#ssl_tls{type = Type, version = Version, fragment = Length}, Q0}}
+            end;
+        true ->
+            ?ALERT_REC(?FATAL, ?RECORD_OVERFLOW)
+    end.
+
+
+binary_from_front(0, Q) ->
+    {<<>>, Q};
+binary_from_front(SplitSize, {Front,Size,Rear}) when SplitSize =< Size ->
+    binary_from_front(SplitSize, Front, Size, Rear, []).
+%%
+%% SplitSize > 0 and there is at least SplitSize bytes buffered in Front and Rear
+binary_from_front(SplitSize, [], Size, Rear, Acc) ->
+    case Rear of
+        %% Avoid lists:reverse/1 for simple cases.
+        %% Case clause for [] to avoid infinite loop.
+        [_] ->
+            binary_from_front(SplitSize, Rear, Size, [], Acc);
+        [Bin2,Bin1] ->
+            binary_from_front(SplitSize, [Bin1,Bin2], Size, [], Acc);
+        [Bin3,Bin2,Bin1] ->
+            binary_from_front(SplitSize, [Bin1,Bin2,Bin3], Size, [], Acc);
+        [_,_,_|_] ->
+            binary_from_front(SplitSize, lists:reverse(Rear), Size, [], Acc)
+    end;
+binary_from_front(SplitSize, [Bin|Front], Size, Rear, []) ->
+    %% Optimize the frequent case when the accumulator is empty
+    BinSize = byte_size(Bin),
+    if
+        SplitSize < BinSize ->
+            {RetBin, Rest} = erlang:split_binary(Bin, SplitSize),
+            {RetBin, {[Rest|Front],Size - SplitSize,Rear}};
+        BinSize < SplitSize ->
+            binary_from_front(SplitSize - BinSize, Front, Size, Rear, [Bin]);
+        true -> % Perfect fit
+            {Bin, {Front,Size - SplitSize,Rear}}
+    end;
+binary_from_front(SplitSize, [Bin|Front], Size, Rear, Acc) ->
+    BinSize = byte_size(Bin),
+    if
+        SplitSize < BinSize ->
+            {Last, Rest} = erlang:split_binary(Bin, SplitSize),
+            RetBin = iolist_to_binary(lists:reverse(Acc, [Last])),
+            {RetBin, {[Rest|Front],Size - byte_size(RetBin),Rear}};
+        BinSize < SplitSize ->
+            binary_from_front(SplitSize - BinSize, Front, Size, Rear, [Bin|Acc]);
+        true -> % Perfect fit
+            RetBin = iolist_to_binary(lists:reverse(Acc, [Bin])),
+            {RetBin, {Front,Size - byte_size(RetBin),Rear}}
+    end.
+
+%%--------------------------------------------------------------------
+encode_plain_text(Type, Version, Data, ConnectionStates0) ->
+    {[CipherText],ConnectionStates} = encode_fragments(Type, Version, [Data], ConnectionStates0),
+    {CipherText,ConnectionStates}.
+%%--------------------------------------------------------------------
+encode_fragments(Type, Version, Data,
+              #{current_write := #{compression_state := CompS,
+                                   cipher_state := CipherS,
+                                   sequence_number := Seq}} = ConnectionStates) ->
+    encode_fragments(Type, Version, Data, ConnectionStates, CompS, CipherS, Seq, []).
+%%
+encode_fragments(_Type, _Version, [], #{current_write := WriteS} = CS,
+              CompS, CipherS, Seq, CipherFragments) ->
+    {lists:reverse(CipherFragments),
+     CS#{current_write := WriteS#{compression_state := CompS,
+                                  cipher_state := CipherS,
+                                  sequence_number := Seq}}};
+encode_fragments(Type, Version, [Text|Data],
+              #{current_write := #{security_parameters :=
+                                       #security_parameters{cipher_type = ?AEAD,
+                                                            bulk_cipher_algorithm = BCAlg,
+                                                            compression_algorithm = CompAlg} = SecPars}} = CS,
+              CompS0, CipherS0, Seq, CipherFragments) ->
+    {CompText, CompS} = ssl_record:compress(CompAlg, Text, CompS0),
+    SeqBin = <<?UINT64(Seq)>>,
+    CipherS1 = ssl_record:nonce_seed(BCAlg, SeqBin, CipherS0),
+    {MajVer, MinVer} = Version,
+    VersionBin = <<?BYTE(MajVer), ?BYTE(MinVer)>>,
+    StartAdditionalData = <<SeqBin/binary, ?BYTE(Type), VersionBin/binary>>,
+    {CipherFragment,CipherS} = ssl_record:cipher_aead(Version, CompText, CipherS1, StartAdditionalData, SecPars),
+    Length = byte_size(CipherFragment),
+    CipherHeader = <<?BYTE(Type), VersionBin/binary, ?UINT16(Length)>>,
+    encode_fragments(Type, Version, Data, CS, CompS, CipherS, Seq + 1,
+                  [[CipherHeader, CipherFragment] | CipherFragments]);
+encode_fragments(Type, Version, [Text|Data],
+              #{current_write := #{security_parameters :=
+                                       #security_parameters{compression_algorithm = CompAlg,
+                                                            mac_algorithm = MacAlgorithm} = SecPars,
+                                   mac_secret := MacSecret}} = CS,
+              CompS0, CipherS0, Seq, CipherFragments) ->
+    {CompText, CompS} = ssl_record:compress(CompAlg, Text, CompS0),
+    MacHash = ssl_cipher:calc_mac_hash(Type, Version, CompText, MacAlgorithm, MacSecret, Seq),
+    {CipherFragment,CipherS} = ssl_record:cipher(Version, CompText, CipherS0, MacHash, SecPars),
+    Length = byte_size(CipherFragment),
+    {MajVer, MinVer} = Version,
+    CipherHeader = <<?BYTE(Type), ?BYTE(MajVer), ?BYTE(MinVer), ?UINT16(Length)>>,
+    encode_fragments(Type, Version, Data, CS, CompS, CipherS, Seq + 1,
+                  [[CipherHeader, CipherFragment] | CipherFragments]);
+encode_fragments(_Type, _Version, _Data, CS, _CompS, _CipherS, _Seq, _CipherFragments) ->
     exit({cs, CS}).
 %%--------------------------------------------------------------------
-start_additional_data(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.
-split_bin(<<FirstByte:8, Rest/binary>>, Version, BCA, one_n_minus_one) when
-      BCA =/= ?RC4 andalso ({3, 1} == Version orelse
-			    {3, 0} == Version) ->
-    [[FirstByte]|do_split_bin(Rest)];
+split_iovec(Data, Version, BCA, one_n_minus_one)
+  when (BCA =/= ?RC4) andalso ({3, 1} == Version orelse
+                               {3, 0} == Version) ->
+    {Part, RestData} = split_iovec(Data, 1, []),
+    [Part|split_iovec(RestData)];
 %% 0/n splitting countermeasure for clients that are incompatible with 1/n-1
 %% splitting.
-split_bin(Bin, Version, BCA, zero_n) when
-      BCA =/= ?RC4 andalso ({3, 1} == Version orelse
-			    {3, 0} == Version) ->
-    [<<>>|do_split_bin(Bin)];
-split_bin(Bin, _, _, _) ->
-    do_split_bin(Bin).
-
-do_split_bin(<<>>) -> [];
-do_split_bin(Bin) ->
-    case Bin of
-        <<Chunk:?MAX_PLAIN_TEXT_LENGTH/binary, Rest/binary>> ->
-            [Chunk|do_split_bin(Rest)];
-        _ ->
-            [Bin]
-    end.
+split_iovec(Data, Version, BCA, zero_n)
+  when (BCA =/= ?RC4) andalso ({3, 1} == Version orelse
+                               {3, 0} == Version) ->
+    {Part, RestData} = split_iovec(Data, 0, []),
+    [Part|split_iovec(RestData)];
+split_iovec(Data, _Version, _BCA, _BeatMitigation) ->
+    split_iovec(Data).
+
+split_iovec([]) ->
+    [];
+split_iovec(Data) ->
+    {Part,Rest} = split_iovec(Data, ?MAX_PLAIN_TEXT_LENGTH, []),
+    [Part|split_iovec(Rest)].
+%%
+split_iovec([Bin|Data] = Bin_Data, SplitSize, Acc) ->
+    BinSize = byte_size(Bin),
+    if
+        BinSize =< SplitSize ->
+            split_iovec(Data, SplitSize - BinSize, [Bin|Acc]);
+        SplitSize == 0 ->
+            {lists:reverse(Acc), Bin_Data};
+        SplitSize < BinSize ->
+            {Last, Rest} = erlang:split_binary(Bin, SplitSize),
+            {lists:reverse(Acc, [Last]), [Rest|Data]}
+    end;
+split_iovec([], _SplitSize, Acc) ->
+    {lists:reverse(Acc),[]}.
+
 %%--------------------------------------------------------------------
 lowest_list_protocol_version(Ver, []) ->
     Ver;
diff --git a/lib/ssl/src/tls_record_1_3.erl b/lib/ssl/src/tls_record_1_3.erl
new file mode 100644
index 0000000000..d713062284
--- /dev/null
+++ b/lib/ssl/src/tls_record_1_3.erl
@@ -0,0 +1,320 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2007-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(tls_record_1_3).
+
+-include("tls_record.hrl").
+-include("tls_record_1_3.hrl").
+-include("ssl_internal.hrl").
+-include("ssl_alert.hrl").
+-include("ssl_cipher.hrl").
+
+%% Encoding 
+-export([encode_handshake/2, encode_alert_record/2,
+	 encode_data/2]).
+-export([encode_plain_text/3]).
+
+%% Decoding
+-export([decode_cipher_text/2]).
+
+%%====================================================================
+%% Encoding
+%%====================================================================
+
+%%--------------------------------------------------------------------
+-spec encode_handshake(iolist(), ssl_record:connection_states()) ->
+			      {iolist(), ssl_record:connection_states()}.
+%
+%% Description: Encodes a handshake message to send on the tls-1.3-socket.
+%%--------------------------------------------------------------------
+encode_handshake(Frag, ConnectionStates) ->
+    case iolist_size(Frag) of
+	N  when N > ?MAX_PLAIN_TEXT_LENGTH ->
+            %% TODO: Consider padding here
+	    Data = split_bin(iolist_to_binary(Frag), ?MAX_PLAIN_TEXT_LENGTH),
+	    encode_iolist(?HANDSHAKE, Data, ConnectionStates);
+	_  ->
+	    encode_plain_text(?HANDSHAKE, Frag, ConnectionStates)
+    end.
+
+%%--------------------------------------------------------------------
+-spec encode_alert_record(#alert{}, ssl_record:connection_states()) ->
+				 {iolist(), ssl_record:connection_states()}.
+%%
+%% Description: Encodes an alert message to send on the ssl-socket.
+%%--------------------------------------------------------------------
+encode_alert_record(#alert{level = Level, description = Description},
+                    ConnectionStates) ->
+    encode_plain_text(?ALERT, <<?BYTE(Level), ?BYTE(Description)>>,
+		      ConnectionStates).
+%%--------------------------------------------------------------------
+-spec encode_data(binary(), ssl_record:connection_states()) ->
+			 {iolist(), ssl_record:connection_states()}.
+%%
+%% Description: Encodes data to send on the ssl-socket.
+%%--------------------------------------------------------------------
+encode_data(Frag, ConnectionStates) ->
+    Data = split_bin(Frag, ?MAX_PLAIN_TEXT_LENGTH, {3,4}),
+    encode_iolist(?APPLICATION_DATA, Data, ConnectionStates).
+
+encode_plain_text(Type, Data0, #{current_write := Write0} = ConnectionStates) ->
+    PadLen = 0, %% TODO where to specify PadLen?
+    Data = inner_plaintext(Type, Data0, PadLen),
+    CipherFragment = encode_plain_text(Data, Write0),
+    {CipherText, Write} = encode_tls_cipher_text(CipherFragment, Write0),
+    {CipherText, ConnectionStates#{current_write => Write}}.
+
+encode_iolist(Type, Data, ConnectionStates0) ->
+    {ConnectionStates, EncodedMsg} =
+        lists:foldl(fun(Text, {CS0, Encoded}) ->
+			    {Enc, CS1} =
+				encode_plain_text(Type, Text, CS0),
+			    {CS1, [Enc | Encoded]}
+		    end, {ConnectionStates0, []}, Data),
+    {lists:reverse(EncodedMsg), ConnectionStates}.
+
+%%====================================================================
+%% Decoding
+%%====================================================================
+
+%%--------------------------------------------------------------------
+-spec decode_cipher_text(#ssl_tls{}, ssl_record:connection_states()) ->
+				{#ssl_tls{}, ssl_record:connection_states()}| #alert{}.
+%%
+%% Description: Decode cipher text, use legacy type ssl_tls instead of tls_cipher_text
+%% in decoding context so that we can reuse the code from erlier versions. 
+%%--------------------------------------------------------------------
+decode_cipher_text(#ssl_tls{type = ?OPAQUE_TYPE,
+                            version = ?LEGACY_VERSION,
+                            fragment = CipherFragment},
+		   #{current_read :=
+			 #{sequence_number := Seq,
+                           cipher_state := #cipher_state{key = Key,
+                                                         iv = IV,
+                                                         tag_len = TagLen},
+			   security_parameters :=
+			       #security_parameters{
+				  cipher_type = ?AEAD,
+                                  bulk_cipher_algorithm =
+                                      BulkCipherAlgo}
+			  } = ReadState0} = ConnectionStates0) ->
+    case decipher_aead(CipherFragment, BulkCipherAlgo, Key, Seq, IV, TagLen) of
+	#alert{} = Alert ->
+	    Alert;
+	PlainFragment ->
+	    ConnectionStates =
+                ConnectionStates0#{current_read =>
+                                       ReadState0#{sequence_number => Seq + 1}},
+	    {decode_inner_plaintext(PlainFragment), ConnectionStates}
+    end;
+
+
+%% RFC8446 - TLS 1.3 (OpenSSL compatibility)
+%% Handle unencrypted Alerts from openssl s_client when server's
+%% connection states are already stepped into traffic encryption.
+%% (E.g. openssl s_client receives a CertificateRequest with
+%% a signature_algorithms_cert extension that does not contain
+%% the signature algorithm of the client's certificate.)
+decode_cipher_text(#ssl_tls{type = ?ALERT,
+                            version = ?LEGACY_VERSION,
+                            fragment = <<2,47>>},
+		   ConnectionStates0) ->
+    {#ssl_tls{type = ?ALERT,
+              version = {3,4}, %% Internally use real version
+              fragment = <<2,47>>}, ConnectionStates0};
+%% TLS 1.3 server can receive a User Cancelled Alert when handshake is
+%% paused and then cancelled on the client side.
+decode_cipher_text(#ssl_tls{type = ?ALERT,
+                            version = ?LEGACY_VERSION,
+                            fragment = <<2,90>>},
+		   ConnectionStates0) ->
+    {#ssl_tls{type = ?ALERT,
+              version = {3,4}, %% Internally use real version
+              fragment = <<2,90>>}, ConnectionStates0};
+%% RFC8446 - TLS 1.3
+%% D.4.  Middlebox Compatibility Mode
+%%    -  If not offering early data, the client sends a dummy
+%%       change_cipher_spec record (see the third paragraph of Section 5)
+%%       immediately before its second flight.  This may either be before
+%%       its second ClientHello or before its encrypted handshake flight.
+%%       If offering early data, the record is placed immediately after the
+%%       first ClientHello.
+decode_cipher_text(#ssl_tls{type = ?CHANGE_CIPHER_SPEC,
+                            version = ?LEGACY_VERSION,
+                            fragment = <<1>>},
+		   ConnectionStates0) ->
+    {#ssl_tls{type = ?CHANGE_CIPHER_SPEC,
+              version = {3,4}, %% Internally use real version
+              fragment = <<1>>}, ConnectionStates0};
+decode_cipher_text(#ssl_tls{type = Type,
+                            version = ?LEGACY_VERSION,
+                            fragment = CipherFragment},
+		   #{current_read :=
+			 #{security_parameters :=
+			       #security_parameters{
+                                  cipher_suite = ?TLS_NULL_WITH_NULL_NULL}
+			  }} = ConnnectionStates0) ->
+    {#ssl_tls{type = Type,
+              version = {3,4}, %% Internally use real version
+              fragment = CipherFragment}, ConnnectionStates0};
+decode_cipher_text(#ssl_tls{type = Type}, _) ->
+    %% Version mismatch is already asserted
+    ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC, {record_type_mismatch, Type}).
+
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+split_bin(Bin, ChunkSize) ->
+    split_bin(Bin, ChunkSize, []).
+split_bin(Bin, ChunkSize, _) ->
+    do_split_bin(Bin, ChunkSize, []).
+
+do_split_bin(<<>>, _, Acc) ->
+    lists:reverse(Acc);
+do_split_bin(Bin, ChunkSize, Acc) ->
+    case Bin of
+        <<Chunk:ChunkSize/binary, Rest/binary>> ->
+            do_split_bin(Rest, ChunkSize, [Chunk | Acc]);
+        _ ->
+            lists:reverse(Acc, [Bin])
+    end.
+
+inner_plaintext(Type, Data, Length) ->
+    #inner_plaintext{
+       content = Data,
+       type = Type,
+       zeros = zero_padding(Length)
+      }.
+zero_padding(Length)->
+    binary:copy(<<?BYTE(0)>>, Length).
+
+encode_plain_text(#inner_plaintext{
+                     content = Data,
+                     type = Type,
+                     zeros = Zeros
+                    }, #{cipher_state := #cipher_state{key= Key,
+                                                       iv = IV,
+                                                       tag_len = TagLen},
+                         sequence_number := Seq,
+                         security_parameters :=
+                             #security_parameters{
+                                cipher_type = ?AEAD,
+                                bulk_cipher_algorithm = BulkCipherAlgo}
+                        }) ->
+    PlainText = [Data, Type, Zeros],
+    Encoded = cipher_aead(PlainText, BulkCipherAlgo, Key, Seq, IV, TagLen),
+    #tls_cipher_text{opaque_type = 23,  %% 23 (application_data) for outward compatibility
+                     legacy_version = {3,3},
+                     encoded_record = Encoded};
+encode_plain_text(#inner_plaintext{
+                     content = Data,
+                     type = Type
+                    }, #{security_parameters :=
+                             #security_parameters{
+                                cipher_suite = ?TLS_NULL_WITH_NULL_NULL}
+                        }) ->
+    %% RFC8446 - 5.1.  Record Layer
+    %% When record protection has not yet been engaged, TLSPlaintext
+    %% structures are written directly onto the wire.
+    #tls_cipher_text{opaque_type = Type,
+                      legacy_version = {3,3},
+                      encoded_record = Data};
+
+encode_plain_text(_, CS) ->
+    exit({cs, CS}).
+
+additional_data(Length) ->
+    <<?BYTE(?OPAQUE_TYPE), ?BYTE(3), ?BYTE(3),?UINT16(Length)>>.
+
+%% The per-record nonce for the AEAD construction is formed as
+%% follows:
+%%
+%% 1.  The 64-bit record sequence number is encoded in network byte
+%%     order and padded to the left with zeros to iv_length.
+%%
+%% 2.  The padded sequence number is XORed with either the static
+%%     client_write_iv or server_write_iv (depending on the role).
+%%
+%% The resulting quantity (of length iv_length) is used as the
+%% per-record nonce.
+nonce(Seq, IV) ->
+    Padding = binary:copy(<<0>>, byte_size(IV) - 8),
+    crypto:exor(<<Padding/binary,?UINT64(Seq)>>, IV).
+
+cipher_aead(Fragment, BulkCipherAlgo, Key, Seq, IV, TagLen) ->
+    AAD = additional_data(erlang:iolist_size(Fragment) + TagLen),
+    Nonce = nonce(Seq, IV),
+    {Content, CipherTag} =
+        ssl_cipher:aead_encrypt(BulkCipherAlgo, Key, Nonce, Fragment, AAD, TagLen),
+    <<Content/binary, CipherTag/binary>>.
+
+encode_tls_cipher_text(#tls_cipher_text{opaque_type = Type,
+                                        legacy_version = {MajVer, MinVer},
+                                        encoded_record = Encoded}, #{sequence_number := Seq} = Write) ->
+    Length = erlang:iolist_size(Encoded),
+    {[<<?BYTE(Type), ?BYTE(MajVer), ?BYTE(MinVer), ?UINT16(Length)>>, Encoded],
+     Write#{sequence_number => Seq +1}}.
+
+decipher_aead(CipherFragment, BulkCipherAlgo, Key, Seq, IV, TagLen) ->
+    try
+        AAD = additional_data(erlang:iolist_size(CipherFragment)),
+        Nonce = nonce(Seq, IV),
+        {CipherText, CipherTag} = aead_ciphertext_split(CipherFragment, TagLen),
+	case ssl_cipher:aead_decrypt(BulkCipherAlgo, Key, Nonce, CipherText, CipherTag, AAD) of
+	    Content when is_binary(Content) ->
+		Content;
+	    _ ->
+                ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC, decryption_failed)
+	end
+    catch
+	_:_ ->
+            ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC, decryption_failed)
+    end.
+
+
+aead_ciphertext_split(CipherTextFragment, TagLen)
+  when is_binary(CipherTextFragment) ->
+    CipherLen = erlang:byte_size(CipherTextFragment) - TagLen,
+    <<CipherText:CipherLen/bytes, CipherTag:TagLen/bytes>> = CipherTextFragment,
+    {CipherText, CipherTag};
+aead_ciphertext_split(CipherTextFragment, TagLen)
+  when is_list(CipherTextFragment) ->
+    CipherLen = erlang:iolist_size(CipherTextFragment) - TagLen,
+    <<CipherText:CipherLen/bytes, CipherTag:TagLen/bytes>> =
+        erlang:iolist_to_binary(CipherTextFragment),
+    {CipherText, CipherTag}.
+
+decode_inner_plaintext(PlainText) ->
+    case binary:last(PlainText) of
+        0 ->
+            decode_inner_plaintext(init_binary(PlainText));
+        Type when Type =:= ?APPLICATION_DATA orelse
+                  Type =:= ?HANDSHAKE orelse
+                  Type =:= ?ALERT ->
+            #ssl_tls{type = Type,
+                     version = {3,4}, %% Internally use real version
+                     fragment = init_binary(PlainText)};
+        _Else ->
+            ?ALERT_REC(?FATAL, ?UNEXPECTED_MESSAGE, empty_alert)
+    end.
+
+init_binary(B) ->
+    {Init, _} =
+        split_binary(B, byte_size(B) - 1),
+    Init.
diff --git a/lib/ssl/src/tls_record_1_3.hrl b/lib/ssl/src/tls_record_1_3.hrl
new file mode 100644
index 0000000000..273427a34e
--- /dev/null
+++ b/lib/ssl/src/tls_record_1_3.hrl
@@ -0,0 +1,58 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018-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%
+%%
+
+%%
+%%----------------------------------------------------------------------
+%% Purpose: Record and constant defenitions for the TLS-1.3-record protocol
+%% see RFC 8446 not present in earlier versions
+%%----------------------------------------------------------------------
+
+-ifndef(tls_record_1_3).
+-define(tls_record_1_3, true).
+
+%% enum {
+%%         invalid(0),
+%%         %% defined in ssl_record.hrl
+%%         change_cipher_spec(20),
+%%         alert(21),
+%%         handshake(22),
+%%         application_data(23),
+%%         heartbeat(24),  /* RFC 6520 */
+%%         (255)
+%%     } ContentType;
+
+-define(INVALID, 0).
+-define(LEGACY_VERSION, {3,3}).
+-define(OPAQUE_TYPE, 23).
+
+-record(inner_plaintext, {
+                          content, %% data
+                          type, %% Contentype
+                          zeros %% padding "uint8 zeros[length_of_padding]"
+                         }). 
+-record(tls_cipher_text, {  %% Equivalent of encrypted version of #ssl_tls from previous versions
+                            %% decrypted version will still use #ssl_tls for code reuse purposes
+                            %% with real values for content type and version
+                            opaque_type = ?OPAQUE_TYPE,
+                            legacy_version = ?LEGACY_VERSION,
+                            encoded_record
+                         }).
+
+-endif. % -ifdef(tls_record_1_3).
diff --git a/lib/ssl/src/tls_sender.erl b/lib/ssl/src/tls_sender.erl
index ee2b7be4f4..d0604565e3 100644
--- a/lib/ssl/src/tls_sender.erl
+++ b/lib/ssl/src/tls_sender.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2018-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2018-2019. 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,7 +29,7 @@
 
 %% API
 -export([start/0, start/1, initialize/2, send_data/2, send_alert/2,
-         send_and_ack_alert/2, setopts/2, renegotiate/1,
+         send_and_ack_alert/2, setopts/2, renegotiate/1, peer_renegotiate/1, downgrade/2,
          update_connection_state/3, dist_tls_socket/1, dist_handshake_complete/3]).
 
 %% gen_statem callbacks
@@ -38,19 +38,24 @@
 
 -define(SERVER, ?MODULE).
 
--record(data, {connection_pid,
-               connection_states = #{},
-               role,
-               socket,
-               socket_options,
-               tracker,
-               protocol_cb,
-               transport_cb,
-               negotiated_version,
-               renegotiate_at,
-               connection_monitor,
-               dist_handle
-              }).
+-record(static,
+        {connection_pid,
+         role,
+         socket,
+         socket_options,
+         tracker,
+         transport_cb,
+         negotiated_version,
+         renegotiate_at,
+         connection_monitor,
+         dist_handle,
+         log_level
+        }).
+
+-record(data,
+        {static = #static{},
+         connection_states = #{}
+        }).
 
 %%%===================================================================
 %%% API
@@ -118,6 +123,15 @@ setopts(Pid, Opts) ->
 renegotiate(Pid) ->
     %% Needs error handling for external API
     call(Pid, renegotiate).
+
+%%--------------------------------------------------------------------
+-spec peer_renegotiate(pid()) -> {ok, WriteState::map()} | {error, term()}.
+%% Description: So TLS connection process can synchronize the 
+%% encryption state to be used when handshaking.
+%%--------------------------------------------------------------------
+peer_renegotiate(Pid) ->
+     gen_statem:call(Pid, renegotiate, ?DEFAULT_TIMEOUT).
+
 %%--------------------------------------------------------------------
 -spec update_connection_state(pid(), WriteState::map(), tls_record:tls_version()) -> ok. 
 %% Description: So TLS connection process can synchronize the 
@@ -125,6 +139,21 @@ renegotiate(Pid) ->
 %%--------------------------------------------------------------------
 update_connection_state(Pid, NewState, Version) ->
     gen_statem:cast(Pid, {new_write, NewState, Version}).
+
+%%--------------------------------------------------------------------
+-spec downgrade(pid(), integer()) -> {ok, ssl_record:connection_state()}
+                                         | {error, timeout}.
+%% Description: So TLS connection process can synchronize the 
+%% encryption state to be used when sending application data. 
+%%--------------------------------------------------------------------
+downgrade(Pid, Timeout) ->
+    try gen_statem:call(Pid, downgrade, Timeout) of
+        Result ->
+            Result    
+    catch
+        _:_ ->
+            {error, timeout}
+    end.
 %%--------------------------------------------------------------------
 -spec dist_handshake_complete(pid(), node(), term()) -> ok. 
 %%  Description: Erlang distribution callback 
@@ -147,6 +176,10 @@ dist_tls_socket(Pid) ->
 callback_mode() -> 
     state_functions.
 
+
+-define(HANDLE_COMMON,
+        ?FUNCTION_NAME(Type, Msg, StateData) ->
+               handle_common(Type, Msg, StateData)).
 %%--------------------------------------------------------------------
 -spec init(Args :: term()) ->
                   gen_statem:init_result(atom()).
@@ -168,39 +201,37 @@ init({call, From}, {Pid, #{current_write := WriteState,
                            socket := Socket,
                            socket_options := SockOpts,
                            tracker := Tracker,
-                           protocol_cb := Connection,
                            transport_cb := Transport,
                            negotiated_version := Version,
-                           renegotiate_at := RenegotiateAt}}, 
-     #data{connection_states = ConnectionStates} = StateData0) ->    
+                           renegotiate_at := RenegotiateAt,
+                           log_level := LogLevel}},
+     #data{connection_states = ConnectionStates, static = Static0} = StateData0) ->
     Monitor = erlang:monitor(process, Pid),
     StateData = 
-        StateData0#data{connection_pid = Pid,
-                        connection_monitor = Monitor,
-                        connection_states = 
-                            ConnectionStates#{current_write => WriteState},
-                        role = Role,
-                        socket = Socket,
-                        socket_options = SockOpts,
-                        tracker = Tracker,
-                        protocol_cb = Connection,
-                        transport_cb = Transport,
-                        negotiated_version = Version,
-                        renegotiate_at = RenegotiateAt},          
+        StateData0#data{connection_states = ConnectionStates#{current_write => WriteState},
+                        static = Static0#static{connection_pid = Pid,
+                                                connection_monitor = Monitor,
+                                                role = Role,
+                                                socket = Socket,
+                                                socket_options = SockOpts,
+                                                tracker = Tracker,
+                                                transport_cb = Transport,
+                                                negotiated_version = Version,
+                                                renegotiate_at = RenegotiateAt,
+                                                log_level = LogLevel}},
     {next_state, handshake, StateData, [{reply, From, ok}]};
-init(info, Msg, StateData) -> 
-    handle_info(Msg, ?FUNCTION_NAME, StateData).
+init(_, _, _) ->
+    %% Just in case anything else sneeks through
+    {keep_state_and_data, [postpone]}.
+
 %%--------------------------------------------------------------------
 -spec connection(gen_statem:event_type(),
            Msg :: term(),
            StateData :: term()) ->
                   gen_statem:event_handler_result(atom()).
 %%--------------------------------------------------------------------
-connection({call, From}, renegotiate, 
-           #data{connection_states = #{current_write := Write}} = StateData) ->
-    {next_state, handshake, StateData, [{reply, From, {ok, Write}}]};
 connection({call, From}, {application_data, AppData}, 
-           #data{socket_options = #socket_options{packet = Packet}} =
+           #data{static = #static{socket_options = #socket_options{packet = Packet}}} =
                StateData) ->
     case encode_packet(Packet, AppData) of
         {error, _} = Error ->
@@ -208,37 +239,40 @@ connection({call, From}, {application_data, AppData},
         Data ->
             send_application_data(Data, From, ?FUNCTION_NAME, StateData)
     end;
-connection({call, From}, {set_opts, _} = Call, StateData) ->
-    handle_call(From, Call, ?FUNCTION_NAME, StateData);
+connection({call, From}, {ack_alert, #alert{} = Alert}, StateData0) ->
+    StateData = send_tls_alert(Alert, StateData0),
+    {next_state, ?FUNCTION_NAME, StateData,
+     [{reply,From,ok}]};
+connection({call, From}, renegotiate,
+           #data{connection_states = #{current_write := Write}} = StateData) ->
+    {next_state, handshake, StateData, [{reply, From, {ok, Write}}]};
+connection({call, From}, downgrade, #data{connection_states =
+                                              #{current_write := Write}} = StateData) ->
+    {next_state, death_row, StateData, [{reply,From, {ok, Write}}]};
+connection({call, From}, {set_opts, Opts}, StateData) ->
+    handle_set_opts(From, Opts, StateData);
 connection({call, From}, dist_get_tls_socket, 
-           #data{protocol_cb = Connection, 
-                 transport_cb = Transport,
-                 socket = Socket,
-                 connection_pid = Pid, 
-                 tracker = Tracker} = StateData) ->
-    TLSSocket = Connection:socket([Pid, self()], Transport, Socket, Connection, Tracker),
+           #data{static = #static{transport_cb = Transport,
+                                  socket = Socket,
+                                  connection_pid = Pid,
+                                  tracker = Tracker}} = StateData) ->
+    TLSSocket = tls_connection:socket([Pid, self()], Transport, Socket, Tracker),
     {next_state, ?FUNCTION_NAME, StateData, [{reply, From, {ok, TLSSocket}}]};
 connection({call, From}, {dist_handshake_complete, _Node, DHandle},
-           #data{connection_pid = Pid,
-                 socket_options = #socket_options{packet = Packet}} =
-               StateData) ->
+           #data{static = #static{connection_pid = Pid} = Static} = StateData) ->
     ok = erlang:dist_ctrl_input_handler(DHandle, Pid),
     ok = ssl_connection:dist_handshake_complete(Pid, DHandle),
     %% From now on we execute on normal priority
     process_flag(priority, normal),
-    {next_state, ?FUNCTION_NAME, StateData#data{dist_handle = DHandle},
-     [{reply, From, ok}
-      | case dist_data(DHandle, Packet) of
-            [] ->
-                [];
-            Data ->
-                [{next_event, internal,
-                  {application_packets,{self(),undefined},Data}}]
-        end]};
-connection({call, From}, {ack_alert, #alert{} = Alert}, StateData0) ->
-    StateData = send_tls_alert(Alert, StateData0),
-    {next_state, ?FUNCTION_NAME, StateData,
-     [{reply,From,ok}]};
+    {keep_state, StateData#data{static = Static#static{dist_handle = DHandle}},
+     [{reply,From,ok}|
+      case dist_data(DHandle) of
+          [] ->
+              [];
+          Data ->
+              [{next_event, internal,
+               {application_packets,{self(),undefined},erlang:iolist_to_iovec(Data)}}]
+      end]};
 connection(internal, {application_packets, From, Data}, StateData) ->
     send_application_data(Data, From, ?FUNCTION_NAME, StateData);
 %%
@@ -246,29 +280,26 @@ connection(cast, #alert{} = Alert, StateData0) ->
     StateData = send_tls_alert(Alert, StateData0),
     {next_state, ?FUNCTION_NAME, StateData};
 connection(cast, {new_write, WritesState, Version}, 
-           #data{connection_states = ConnectionStates0} = StateData) -> 
+           #data{connection_states = ConnectionStates, static = Static} = StateData) ->
     {next_state, connection, 
      StateData#data{connection_states = 
-                        ConnectionStates0#{current_write => WritesState},
-                    negotiated_version = Version}};
+                        ConnectionStates#{current_write => WritesState},
+                    static = Static#static{negotiated_version = Version}}};
 %%
-connection(info, dist_data,
-           #data{dist_handle = DHandle,
-                 socket_options = #socket_options{packet = Packet}} =
-               StateData) ->
-    {next_state, ?FUNCTION_NAME, StateData,
-      case dist_data(DHandle, Packet) of
+connection(info, dist_data, #data{static = #static{dist_handle = DHandle}}) ->
+    {keep_state_and_data,
+      case dist_data(DHandle) of
           [] ->
               [];
           Data ->
               [{next_event, internal,
-               {application_packets,{self(),undefined},Data}}]
+               {application_packets,{self(),undefined},erlang:iolist_to_iovec(Data)}}]
       end};
 connection(info, tick, StateData) ->  
     consume_ticks(),
-    {next_state, ?FUNCTION_NAME, StateData, 
-     [{next_event, {call, {self(), undefined}},
-       {application_data, <<>>}}]};
+    Data = [<<0:32>>], % encode_packet(4, <<>>)
+    From = {self(), undefined},
+    send_application_data(Data, From, ?FUNCTION_NAME, StateData);
 connection(info, {send, From, Ref, Data}, _StateData) -> 
     %% This is for testing only!
     %%
@@ -277,29 +308,37 @@ connection(info, {send, From, Ref, Data}, _StateData) ->
     From ! {Ref, ok},
     {keep_state_and_data,
      [{next_event, {call, {self(), undefined}},
-       {application_data, iolist_to_binary(Data)}}]};
-connection(info, Msg, StateData) -> 
-    handle_info(Msg, ?FUNCTION_NAME, StateData).
+       {application_data, erlang:iolist_to_iovec(Data)}}]};
+?HANDLE_COMMON.
+
 %%--------------------------------------------------------------------
 -spec handshake(gen_statem:event_type(),
                   Msg :: term(),
                   StateData :: term()) ->
                          gen_statem:event_handler_result(atom()).
 %%--------------------------------------------------------------------
-handshake({call, From}, {set_opts, _} = Call, StateData) ->
-    handle_call(From, Call, ?FUNCTION_NAME, StateData);
+handshake({call, From}, {set_opts, Opts}, StateData) ->
+    handle_set_opts(From, Opts, StateData);
 handshake({call, _}, _, _) ->
+    %% Postpone all calls to the connection state
+    {keep_state_and_data, [postpone]};
+handshake(internal, {application_packets,_,_}, _) ->
     {keep_state_and_data, [postpone]};
 handshake(cast, {new_write, WritesState, Version}, 
-          #data{connection_states = ConnectionStates0} = StateData) ->
+          #data{connection_states = ConnectionStates, static = Static} = StateData) ->
     {next_state, connection, 
-     StateData#data{connection_states = 
-                        ConnectionStates0#{current_write => WritesState},
-                   negotiated_version = Version}};
-handshake(internal, {application_packets,_,_}, _) ->
+     StateData#data{connection_states = ConnectionStates#{current_write => WritesState},
+                    static = Static#static{negotiated_version = Version}}};
+handshake(info, dist_data, _) ->
     {keep_state_and_data, [postpone]};
-handshake(info, Msg, StateData) -> 
-    handle_info(Msg, ?FUNCTION_NAME, StateData).
+handshake(info, tick, _) ->
+    %% Ignore - data is sent anyway during handshake
+    consume_ticks(),
+    keep_state_and_data;
+handshake(info, {send, _, _, _}, _) ->
+    %% Testing only, OTP distribution test suites...
+    {keep_state_and_data, [postpone]};
+?HANDLE_COMMON.
 
 %%--------------------------------------------------------------------
 -spec death_row(gen_statem:event_type(),
@@ -334,54 +373,76 @@ code_change(_OldVsn, State, Data, _Extra) ->
 %%%===================================================================
 %%% Internal functions
 %%%===================================================================
-handle_call(From, {set_opts, Opts}, StateName, #data{socket_options = SockOpts} = StateData) ->
-    {next_state, StateName, StateData#data{socket_options = set_opts(SockOpts, Opts)}, [{reply, From, ok}]}.
-        
-handle_info({'DOWN', Monitor, _, _, Reason}, _, 
-            #data{connection_monitor = Monitor,
-                  dist_handle = Handle} = StateData) when Handle =/= undefined->
-    {next_state, death_row, StateData, [{state_timeout, 5000, Reason}]};
-handle_info({'DOWN', Monitor, _, _, _}, _, 
-            #data{connection_monitor = Monitor} = StateData) ->
+
+handle_set_opts(
+  From, Opts, #data{static = #static{socket_options = SockOpts} = Static} = StateData) ->
+    {keep_state, StateData#data{static = Static#static{socket_options = set_opts(SockOpts, Opts)}},
+     [{reply, From, ok}]}.
+
+handle_common(
+  {call, From}, {set_opts, Opts},
+  #data{static = #static{socket_options = SockOpts} = Static} = StateData) ->
+    {keep_state, StateData#data{static = Static#static{socket_options = set_opts(SockOpts, Opts)}},
+     [{reply, From, ok}]};
+handle_common(
+  info, {'DOWN', Monitor, _, _, Reason},
+  #data{static = #static{connection_monitor = Monitor,
+                         dist_handle = Handle}} = StateData) when Handle =/= undefined ->
+    {next_state, death_row, StateData,
+     [{state_timeout, 5000, Reason}]};
+handle_common(
+  info, {'DOWN', Monitor, _, _, _},
+  #data{static = #static{connection_monitor = Monitor}} = StateData) ->
     {stop, normal, StateData};
-handle_info(_,_,_) ->
+handle_common(info, Msg, _) ->
+    Report =
+        io_lib:format("TLS sender: Got unexpected info: ~p ~n", [Msg]),
+    error_logger:info_report(Report),
+    keep_state_and_data;
+handle_common(Type, Msg, _) ->
+    Report =
+        io_lib:format(
+          "TLS sender: Got unexpected event: ~p ~n", [{Type,Msg}]),
+    error_logger:error_report(Report),
     keep_state_and_data.
 
-send_tls_alert(Alert, #data{negotiated_version = Version,
-                            socket = Socket,
-                            protocol_cb = Connection, 
-                            transport_cb = Transport,
-                            connection_states = ConnectionStates0} = StateData0) ->
+send_tls_alert(#alert{} = Alert,
+               #data{static = #static{negotiated_version = Version,
+                                      socket = Socket,
+                                      transport_cb = Transport,
+                                      log_level = LogLevel},
+                     connection_states = ConnectionStates0} = StateData0) ->
     {BinMsg, ConnectionStates} =
-	Connection:encode_alert(Alert, Version, ConnectionStates0),
-    Connection:send(Transport, Socket, BinMsg),
+	tls_record:encode_alert_record(Alert, Version, ConnectionStates0),
+    tls_socket:send(Transport, Socket, BinMsg),
+    ssl_logger:debug(LogLevel, outbound, 'record', BinMsg),
     StateData0#data{connection_states = ConnectionStates}.
 
 send_application_data(Data, From, StateName,
-		       #data{connection_pid = Pid,
-                             socket = Socket,
-                             dist_handle = DistHandle,
-                             negotiated_version = Version,
-                             protocol_cb = Connection,
-                             transport_cb = Transport,
-                             connection_states = ConnectionStates0,
-                             renegotiate_at = RenegotiateAt} = StateData0) ->
+		       #data{static = #static{connection_pid = Pid,
+                                              socket = Socket,
+                                              dist_handle = DistHandle,
+                                              negotiated_version = Version,
+                                              transport_cb = Transport,
+                                              renegotiate_at = RenegotiateAt,
+                                              log_level = LogLevel},
+                             connection_states = ConnectionStates0} = StateData0) ->
     case time_to_renegotiate(Data, ConnectionStates0, RenegotiateAt) of
 	true ->
 	    ssl_connection:internal_renegotiation(Pid, ConnectionStates0),
             {next_state, handshake, StateData0, 
              [{next_event, internal, {application_packets, From, Data}}]};
 	false ->
-	    {Msgs, ConnectionStates} =
-                Connection:encode_data(
-                  iolist_to_binary(Data), Version, ConnectionStates0),
+	    {Msgs, ConnectionStates} = tls_record:encode_data(Data, Version, ConnectionStates0),
             StateData = StateData0#data{connection_states = ConnectionStates},
-	    case Connection:send(Transport, Socket, Msgs) of
+	    case tls_socket:send(Transport, Socket, Msgs) of
                 ok when DistHandle =/=  undefined ->
+                    ssl_logger:debug(LogLevel, outbound, 'record', Msgs),
                     {next_state, StateName, StateData, []};
                 Reason when DistHandle =/= undefined ->
                     {next_state, death_row, StateData, [{state_timeout, 5000, Reason}]};
                 ok ->
+                    ssl_logger:debug(LogLevel, outbound, 'record', Msgs),
                     {next_state, StateName, StateData,  [{reply, From, ok}]};
                 Result ->
                     {next_state, StateName, StateData,  [{reply, From, Result}]}
@@ -392,9 +453,9 @@ send_application_data(Data, From, StateName,
 encode_packet(Packet, Data) ->
     Len = iolist_size(Data),
     case Packet of
-        1 when Len < (1 bsl 8) ->  [<<Len:8>>,Data];
-        2 when Len < (1 bsl 16) -> [<<Len:16>>,Data];
-        4 when Len < (1 bsl 32) -> [<<Len:32>>,Data];
+        1 when Len < (1 bsl 8) ->  [<<Len:8>>|Data];
+        2 when Len < (1 bsl 16) -> [<<Len:16>>|Data];
+        4 when Len < (1 bsl 32) -> [<<Len:32>>|Data];
         N when N =:= 1; N =:= 2; N =:= 4 ->
             {error,
              {badarg, {packet_to_large, Len, (1 bsl (Packet bsl 3)) - 1}}};
@@ -431,22 +492,30 @@ call(FsmPid, Event) ->
 	    {error, closed}
     end.
 
-%%---------------Erlang distribution --------------------------------------
+%%-------------- Erlang distribution helpers ------------------------------
 
-dist_data(DHandle, Packet) ->
+dist_data(DHandle) ->
     case erlang:dist_ctrl_get_data(DHandle) of
         none ->
             erlang:dist_ctrl_get_data_notification(DHandle),
             [];
-        Data ->
-            %% This is encode_packet(4, Data) without Len check
-            %% since the emulator will always deliver a Data
-            %% smaller than 4 GB, and the distribution will
-            %% therefore always have to use {packet,4}
+        %% This is encode_packet(4, Data) without Len check
+        %% since the emulator will always deliver a Data
+        %% smaller than 4 GB, and the distribution will
+        %% therefore always have to use {packet,4}
+        Data when is_binary(Data) ->
+            Len = byte_size(Data),
+            [[<<Len:32>>,Data]|dist_data(DHandle)];
+        [BA,BB] = Data ->
+            Len = byte_size(BA) + byte_size(BB),
+            [[<<Len:32>>|Data]|dist_data(DHandle)];
+        Data when is_list(Data) ->
             Len = iolist_size(Data),
-            [<<Len:32>>,Data|dist_data(DHandle, Packet)]
+            [[<<Len:32>>|Data]|dist_data(DHandle)]
     end.
 
+
+%% Empty the inbox from distribution ticks - do not let them accumulate
 consume_ticks() ->
     receive tick -> 
             consume_ticks()
diff --git a/lib/ssl/src/tls_socket.erl b/lib/ssl/src/tls_socket.erl
index a391bc53de..6c32e6fa04 100644
--- a/lib/ssl/src/tls_socket.erl
+++ b/lib/ssl/src/tls_socket.erl
@@ -32,6 +32,7 @@
 	 emulated_socket_options/2, get_emulated_opts/1, 
 	 set_emulated_opts/2, get_all_opts/1, handle_call/3, handle_cast/2,
 	 handle_info/2, code_change/3]).
+-export([update_active_n/2]).
 
 -record(state, {
 	  emulated_opts,
@@ -45,18 +46,20 @@
 send(Transport, Socket, Data) ->
     Transport:send(Socket, Data).
 
-listen(Transport, Port, #config{transport_info = {Transport, _, _, _}, 
+listen(Transport, Port, #config{transport_info = {Transport, _, _, _, _}, 
 				inet_user = Options, 
 				ssl = SslOpts, emulated = EmOpts} = Config) ->
     case Transport:listen(Port, Options ++ internal_inet_values()) of
 	{ok, ListenSocket} ->
 	    {ok, Tracker} = inherit_tracker(ListenSocket, EmOpts, SslOpts),
-	    {ok, #sslsocket{pid = {ListenSocket, Config#config{emulated = Tracker}}}};
+        Socket = #sslsocket{pid = {ListenSocket, Config#config{emulated = Tracker}}},
+        check_active_n(EmOpts, Socket),
+	    {ok, Socket};
 	Err = {error, _} ->
 	    Err
     end.
 
-accept(ListenSocket, #config{transport_info = {Transport,_,_,_} = CbInfo,
+accept(ListenSocket, #config{transport_info = {Transport,_,_,_,_} = CbInfo,
 			     connection_cb = ConnectionCb,
 			     ssl = SslOpts,
 			     emulated = Tracker}, Timeout) -> 
@@ -77,7 +80,7 @@ accept(ListenSocket, #config{transport_info = {Transport,_,_,_} = CbInfo,
 	    {error, Reason}
     end.
 
-upgrade(Socket, #config{transport_info = {Transport,_,_,_}= CbInfo,
+upgrade(Socket, #config{transport_info = {Transport,_,_,_,_}= CbInfo,
 			ssl = SslOptions,
 			emulated = EmOpts, connection_cb = ConnectionCb}, Timeout) ->
     ok = setopts(Transport, Socket, tls_socket:internal_inet_values()),
@@ -95,7 +98,7 @@ connect(Address, Port,
 	#config{transport_info = CbInfo, inet_user = UserOpts, ssl = SslOpts,
 		emulated = EmOpts, inet_ssl = SocketOpts, connection_cb = ConnetionCb},
 	Timeout) ->
-    {Transport, _, _, _} = CbInfo,
+    {Transport, _, _, _, _} = CbInfo,
     try Transport:connect(Address, Port,  SocketOpts, Timeout) of
 	{ok, Socket} ->
 	    ssl_connection:connect(ConnetionCb, Address, Port, Socket, 
@@ -117,14 +120,16 @@ socket(Pids, Transport, Socket, ConnectionCb, Tracker) ->
     #sslsocket{pid = Pids, 
 	       %% "The name "fd" is keept for backwards compatibility
 	       fd = {Transport, Socket, ConnectionCb, Tracker}}.
-setopts(gen_tcp, #sslsocket{pid = {ListenSocket, #config{emulated = Tracker}}}, Options) ->
+setopts(gen_tcp, Socket = #sslsocket{pid = {ListenSocket, #config{emulated = Tracker}}}, Options) ->
     {SockOpts, EmulatedOpts} = split_options(Options),
     ok = set_emulated_opts(Tracker, EmulatedOpts),
+    check_active_n(EmulatedOpts, Socket),
     inet:setopts(ListenSocket, SockOpts);
-setopts(_, #sslsocket{pid = {ListenSocket, #config{transport_info = {Transport,_,_,_},
+setopts(_, Socket = #sslsocket{pid = {ListenSocket, #config{transport_info = {Transport,_,_,_,_},
 						  emulated = Tracker}}}, Options) ->
     {SockOpts, EmulatedOpts} = split_options(Options),
     ok = set_emulated_opts(Tracker, EmulatedOpts),
+    check_active_n(EmulatedOpts, Socket),
     Transport:setopts(ListenSocket, SockOpts);
 %%% Following clauses will not be called for emulated options, they are  handled in the connection process
 setopts(gen_tcp, Socket, Options) ->
@@ -132,6 +137,31 @@ setopts(gen_tcp, Socket, Options) ->
 setopts(Transport, Socket, Options) ->
     Transport:setopts(Socket, Options).
 
+check_active_n(EmulatedOpts, Socket = #sslsocket{pid = {_, #config{emulated = Tracker}}}) ->
+    %% We check the resulting options to send an ssl_passive message if necessary.
+    case proplists:lookup(active, EmulatedOpts) of
+        %% The provided value is out of bound.
+        {_, N} when is_integer(N), N < -32768 ->
+            throw(einval);
+        {_, N} when is_integer(N), N > 32767 ->
+            throw(einval);
+        {_, N} when is_integer(N) ->
+            case get_emulated_opts(Tracker, [active]) of
+                [{_, false}] ->
+                    self() ! {ssl_passive, Socket},
+                    ok;
+                %% The result of the addition is out of bound.
+                [{_, A}] when is_integer(A), A < -32768 ->
+                    throw(einval);
+                [{_, A}] when is_integer(A), A > 32767 ->
+                    throw(einval);
+                _ ->
+                    ok
+            end;
+        _ ->
+            ok
+    end.
+
 getopts(gen_tcp,  #sslsocket{pid = {ListenSocket, #config{emulated = Tracker}}}, Options) ->
     {SockOptNames, EmulatedOptNames} = split_options(Options),
     EmulatedOpts = get_emulated_opts(Tracker, EmulatedOptNames),
@@ -209,7 +239,7 @@ start_link(Port, SockOpts, SslOpts) ->
 init([Port, Opts, SslOpts]) ->
     process_flag(trap_exit, true),
     true = link(Port),
-    {ok, #state{emulated_opts = Opts, port = Port, ssl_opts = SslOpts}}.
+    {ok, #state{emulated_opts = do_set_emulated_opts(Opts, []), port = Port, ssl_opts = SslOpts}}.
 
 %%--------------------------------------------------------------------
 -spec handle_call(msg(), from(), #state{}) -> {reply, reply(), #state{}}. 
@@ -304,9 +334,24 @@ split_options([Name | Opts], Emu, SocketOptNames, EmuOptNames) ->
 
 do_set_emulated_opts([], Opts) ->
     Opts;
+do_set_emulated_opts([{active, N0} | Rest], Opts) when is_integer(N0) ->
+    N = update_active_n(N0, proplists:get_value(active, Opts, false)),
+    do_set_emulated_opts(Rest, [{active, N} | proplists:delete(active, Opts)]);
 do_set_emulated_opts([{Name,_} = Opt | Rest], Opts) ->
     do_set_emulated_opts(Rest, [Opt | proplists:delete(Name, Opts)]).
 
+update_active_n(New, Current) ->
+    if
+        is_integer(Current), New + Current =< 0 ->
+            false;
+        is_integer(Current) ->
+            New + Current;
+        New =< 0 ->
+            false;
+        true ->
+            New
+    end.
+
 get_socket_opts(_, [], _) ->
     [];
 get_socket_opts(ListenSocket, SockOptNames, Cb) ->
@@ -366,6 +411,9 @@ validate_inet_option(header, Value)
   when not is_integer(Value) ->
     throw({error, {options, {header,Value}}});
 validate_inet_option(active, Value)
+  when Value >= -32768, Value =< 32767 ->
+    ok;
+validate_inet_option(active, Value)
   when Value =/= true, Value =/= false, Value =/= once ->
     throw({error, {options, {active,Value}}});
 validate_inet_option(_, _) ->
diff --git a/lib/ssl/src/tls_v1.erl b/lib/ssl/src/tls_v1.erl
index 1bfd9a8b6d..f7c8c770ae 100644
--- a/lib/ssl/src/tls_v1.erl
+++ b/lib/ssl/src/tls_v1.erl
@@ -32,7 +32,19 @@
 -export([master_secret/4, finished/5, certificate_verify/3, mac_hash/7, hmac_hash/3,
 	 setup_keys/8, suites/1, prf/5,
 	 ecc_curves/1, ecc_curves/2, oid_to_enum/1, enum_to_oid/1, 
-	 default_signature_algs/1, signature_algs/2]).
+	 default_signature_algs/1, signature_algs/2,
+         default_signature_schemes/1, signature_schemes/2,
+         groups/1, groups/2, group_to_enum/1, enum_to_group/1, default_groups/1]).
+
+-export([derive_secret/4, hkdf_expand_label/5, hkdf_extract/3, hkdf_expand/4,
+         key_schedule/3, key_schedule/4, create_info/3,
+         external_binder_key/2, resumption_binder_key/2,
+         client_early_traffic_secret/3, early_exporter_master_secret/3,
+         client_handshake_traffic_secret/3, server_handshake_traffic_secret/3,
+         client_application_traffic_secret_0/3, server_application_traffic_secret_0/3,
+         exporter_master_secret/3, resumption_master_secret/3,
+         update_traffic_secret/2, calculate_traffic_keys/3,
+         transcript_hash/2, finished_key/2, finished_verify_data/3]).
 
 -type named_curve() :: sect571r1 | sect571k1 | secp521r1 | brainpoolP512r1 |
                        sect409k1 | sect409r1 | brainpoolP384r1 | secp384r1 |
@@ -41,12 +53,68 @@
                        sect193r1 | sect193r2 | secp192k1 | secp192r1 | sect163k1 |
                        sect163r1 | sect163r2 | secp160k1 | secp160r1 | secp160r2.
 -type curves() :: [named_curve()].
--export_type([curves/0, named_curve/0]).
+-type group() :: secp256r1 | secp384r1 | secp521r1 | ffdhe2048 |
+                 ffdhe3072 | ffdhe4096 | ffdhe6144 | ffdhe8192.
+-type supported_groups() :: [group()].
+-export_type([curves/0, named_curve/0, group/0, supported_groups/0]).
 
 %%====================================================================
 %% Internal application API
 %%====================================================================
 
+%% TLS 1.3 ---------------------------------------------------
+-spec derive_secret(Secret::binary(), Label::binary(),
+                    Messages::iodata(), Algo::ssl:hash()) -> Key::binary().
+derive_secret(Secret, Label, Messages, Algo) ->
+    Hash = crypto:hash(mac_algo(Algo), Messages),
+    hkdf_expand_label(Secret, Label,
+                      Hash, ssl_cipher:hash_size(Algo), Algo).
+
+-spec hkdf_expand_label(Secret::binary(), Label0::binary(),
+                        Context::binary(), Length::integer(),  
+                        Algo::ssl:hash()) -> KeyingMaterial::binary().
+hkdf_expand_label(Secret, Label0, Context, Length, Algo) ->
+    HkdfLabel = create_info(Label0, Context, Length),
+    hkdf_expand(Secret, HkdfLabel, Length, Algo).
+
+%% Create info parameter for HKDF-Expand:
+%% HKDF-Expand(PRK, info, L) -> OKM
+create_info(Label0, Context0, Length) ->
+    %% struct {
+    %%     uint16 length = Length;
+    %%     opaque label<7..255> = "tls13 " + Label;
+    %%     opaque context<0..255> = Context;
+    %% } HkdfLabel;
+    Label1 = << <<"tls13 ">>/binary, Label0/binary>>,
+    LabelLen = size(Label1),
+    Label = <<?BYTE(LabelLen), Label1/binary>>,
+    ContextLen = size(Context0),
+    Context = <<?BYTE(ContextLen),Context0/binary>>,
+    Content = <<Label/binary, Context/binary>>,
+    <<?UINT16(Length), Content/binary>>.
+
+-spec hkdf_extract(MacAlg::ssl:hash(), Salt::binary(),
+                   KeyingMaterial::binary()) -> PseudoRandKey::binary().
+
+hkdf_extract(MacAlg, Salt, KeyingMaterial) -> 
+    hmac_hash(MacAlg, Salt, KeyingMaterial).
+
+
+-spec hkdf_expand(PseudoRandKey::binary(), ContextInfo::binary(),
+                  Length::integer(), Algo::ssl:hash()) -> KeyingMaterial::binary().
+                     
+hkdf_expand(PseudoRandKey, ContextInfo, Length, Algo) -> 
+    Iterations = erlang:ceil(Length / ssl_cipher:hash_size(Algo)),
+    hkdf_expand(Algo, PseudoRandKey, ContextInfo, Length, 1, Iterations, <<>>, <<>>).
+
+
+-spec transcript_hash(Messages::iodata(),  Algo::ssl:hash()) -> Hash::binary().
+
+transcript_hash(Messages, Algo) ->
+     crypto:hash(mac_algo(Algo), Messages).
+%% TLS 1.3 ---------------------------------------------------
+
+%% TLS 1.0 -1.2  ---------------------------------------------------
 -spec master_secret(integer(), binary(), binary(), binary()) -> binary().
 
 master_secret(PrfAlgo, PreMasterSecret, ClientRandom, ServerRandom) ->
@@ -56,9 +124,10 @@ master_secret(PrfAlgo, PreMasterSecret, ClientRandom, ServerRandom) ->
 
     prf(PrfAlgo, PreMasterSecret, <<"master secret">>,
 	[ClientRandom, ServerRandom], 48).
+%% TLS 1.0 -1.2  ---------------------------------------------------
 
 -spec finished(client | server, integer(), integer(), binary(), [binary()]) -> binary().
-
+%% TLS 1.0 -1.1  ---------------------------------------------------
 finished(Role, Version, PrfAlgo, MasterSecret, Handshake)
   when Version == 1; Version == 2; PrfAlgo == ?MD5SHA ->
     %% RFC 2246 & 4346 - 7.4.9. Finished
@@ -72,7 +141,9 @@ finished(Role, Version, PrfAlgo, MasterSecret, Handshake)
     MD5 = crypto:hash(md5, Handshake),
     SHA = crypto:hash(sha, Handshake),
     prf(?MD5SHA, MasterSecret, finished_label(Role), [MD5, SHA], 12);
+%% TLS 1.0 -1.1  ---------------------------------------------------
 
+%% TLS 1.2 ---------------------------------------------------
 finished(Role, Version, PrfAlgo, MasterSecret, Handshake)
   when Version == 3 ->
     %% RFC 5246 - 7.4.9. Finished
@@ -84,21 +155,28 @@ finished(Role, Version, PrfAlgo, MasterSecret, Handshake)
     %%          PRF(master_secret, finished_label, Hash(handshake_messages)) [0..11];
     Hash = crypto:hash(mac_algo(PrfAlgo), Handshake),
     prf(PrfAlgo, MasterSecret, finished_label(Role), Hash, 12).
+%% TLS 1.2 ---------------------------------------------------
+
+%% TODO 1.3 finished
 
 -spec certificate_verify(md5sha | sha, integer(), [binary()]) -> binary().
 
+%% TLS 1.0 -1.1  ---------------------------------------------------
 certificate_verify(md5sha, _Version, Handshake) ->
     MD5 = crypto:hash(md5, Handshake),
     SHA = crypto:hash(sha, Handshake),
     <<MD5/binary, SHA/binary>>;
+%% TLS 1.0 -1.1  ---------------------------------------------------
 
+%% TLS 1.2 ---------------------------------------------------
 certificate_verify(HashAlgo, _Version, Handshake) ->
     crypto:hash(HashAlgo, Handshake).
+%% TLS 1.2 ---------------------------------------------------
 
 -spec setup_keys(integer(), integer(), binary(), binary(), binary(), integer(),
 		 integer(), integer()) -> {binary(), binary(), binary(),
 					  binary(), binary(), binary()}.
-
+%% TLS v1.0  ---------------------------------------------------
 setup_keys(Version, _PrfAlgo, MasterSecret, ServerRandom, ClientRandom, HashSize,
 	   KeyMatLen, IVSize)
   when Version == 1 ->
@@ -123,8 +201,9 @@ setup_keys(Version, _PrfAlgo, MasterSecret, ServerRandom, ClientRandom, HashSize
      ClientIV:IVSize/binary, ServerIV:IVSize/binary>> = KeyBlock,
     {ClientWriteMacSecret, ServerWriteMacSecret, ClientWriteKey,
      ServerWriteKey, ClientIV, ServerIV};
+%% TLS v1.0  ---------------------------------------------------
 
-%% TLS v1.1
+%% TLS v1.1 ---------------------------------------------------
 setup_keys(Version, _PrfAlgo, MasterSecret, ServerRandom, ClientRandom, HashSize,
 	   KeyMatLen, IVSize)
   when Version == 2 ->
@@ -150,11 +229,12 @@ setup_keys(Version, _PrfAlgo, MasterSecret, ServerRandom, ClientRandom, HashSize
      ClientIV:IVSize/binary, ServerIV:IVSize/binary>> = KeyBlock,
     {ClientWriteMacSecret, ServerWriteMacSecret, ClientWriteKey,
      ServerWriteKey, ClientIV, ServerIV};
+%% TLS v1.1 ---------------------------------------------------
 
-%% TLS v1.2
+%% TLS v1.2  ---------------------------------------------------
 setup_keys(Version, PrfAlgo, MasterSecret, ServerRandom, ClientRandom, HashSize,
 	   KeyMatLen, IVSize)
-  when Version == 3 ->
+  when Version == 3; Version == 4 ->
     %% RFC 5246 - 6.3. Key calculation
     %% key_block = PRF(SecurityParameters.master_secret,
     %%                      "key expansion",
@@ -176,8 +256,177 @@ setup_keys(Version, PrfAlgo, MasterSecret, ServerRandom, ClientRandom, HashSize,
      ClientIV:IVSize/binary, ServerIV:IVSize/binary>> = KeyBlock,
     {ClientWriteMacSecret, ServerWriteMacSecret, ClientWriteKey,
      ServerWriteKey, ClientIV, ServerIV}.
+%% TLS v1.2  ---------------------------------------------------
 
--spec mac_hash(integer(), binary(), integer(), integer(), tls_record:tls_version(),
+%% TLS v1.3  ---------------------------------------------------
+%% RFC 8446  -  7.1.  Key Schedule
+%%
+%%             0
+%%             |
+%%             v
+%%   PSK ->  HKDF-Extract = Early Secret
+%%             |
+%%             +-----> Derive-Secret(., "ext binder" | "res binder", "")
+%%             |                     = binder_key
+%%             |
+%%             +-----> Derive-Secret(., "c e traffic", ClientHello)
+%%             |                     = client_early_traffic_secret
+%%             |
+%%             +-----> Derive-Secret(., "e exp master", ClientHello)
+%%             |                     = early_exporter_master_secret
+%%             v
+%%       Derive-Secret(., "derived", "")
+%%             |
+%%             v
+%%   (EC)DHE -> HKDF-Extract = Handshake Secret
+%%             |
+%%             +-----> Derive-Secret(., "c hs traffic",
+%%             |                     ClientHello...ServerHello)
+%%             |                     = client_handshake_traffic_secret
+%%             |
+%%             +-----> Derive-Secret(., "s hs traffic",
+%%             |                     ClientHello...ServerHello)
+%%             |                     = server_handshake_traffic_secret
+%%             v
+%%       Derive-Secret(., "derived", "")
+%%             |
+%%             v
+%%   0 -> HKDF-Extract = Master Secret
+%%             |
+%%             +-----> Derive-Secret(., "c ap traffic",
+%%             |                     ClientHello...server Finished)
+%%             |                     = client_application_traffic_secret_0
+%%             |
+%%             +-----> Derive-Secret(., "s ap traffic",
+%%             |                     ClientHello...server Finished)
+%%             |                     = server_application_traffic_secret_0
+%%             |
+%%             +-----> Derive-Secret(., "exp master",
+%%             |                     ClientHello...server Finished)
+%%             |                     = exporter_master_secret
+%%             |
+%%             +-----> Derive-Secret(., "res master",
+%%                                   ClientHello...client Finished)
+%%                                   = resumption_master_secret
+-spec key_schedule(early_secret | handshake_secret | master_secret,
+                   atom(), {psk | early_secret | handshake_secret, binary()}) ->
+                          {early_secret | handshake_secret | master_secret, binary()}.
+
+key_schedule(early_secret, Algo, {psk, PSK}) ->
+    Len = ssl_cipher:hash_size(Algo),
+    Salt = binary:copy(<<?BYTE(0)>>, Len),
+    {early_secret, hkdf_extract(Algo, Salt, PSK)};
+key_schedule(master_secret, Algo, {handshake_secret, Secret}) ->
+    Len = ssl_cipher:hash_size(Algo),
+    IKM = binary:copy(<<?BYTE(0)>>, Len),
+    Salt = derive_secret(Secret, <<"derived">>, <<>>, Algo),
+    {master_secret, hkdf_extract(Algo, Salt, IKM)}.
+%%
+key_schedule(handshake_secret, Algo, IKM, {early_secret, Secret}) ->
+    Salt = derive_secret(Secret, <<"derived">>, <<>>, Algo),
+    {handshake_secret, hkdf_extract(Algo, Salt, IKM)}.
+
+-spec external_binder_key(atom(), {early_secret, binary()}) -> binary().
+external_binder_key(Algo, {early_secret, Secret}) ->
+    derive_secret(Secret, <<"ext binder">>, <<>>, Algo).
+
+-spec resumption_binder_key(atom(), {early_secret, binary()}) -> binary().
+resumption_binder_key(Algo, {early_secret, Secret}) ->
+    derive_secret(Secret, <<"res binder">>, <<>>, Algo).
+
+-spec client_early_traffic_secret(atom(), {early_secret, binary()}, iodata()) -> binary().
+%% M = ClientHello
+client_early_traffic_secret(Algo, {early_secret, Secret}, M) ->
+    derive_secret(Secret, <<"c e traffic">>, M, Algo).
+
+-spec early_exporter_master_secret(atom(), {early_secret, binary()}, iodata()) -> binary().
+%% M = ClientHello
+early_exporter_master_secret(Algo, {early_secret, Secret}, M) ->
+    derive_secret(Secret, <<"e exp master">>, M, Algo).
+
+-spec client_handshake_traffic_secret(atom(), {handshake_secret, binary()}, iodata()) -> binary().
+%% M = ClientHello...ServerHello
+client_handshake_traffic_secret(Algo, {handshake_secret, Secret}, M) ->
+    derive_secret(Secret, <<"c hs traffic">>, M, Algo).
+
+-spec server_handshake_traffic_secret(atom(), {handshake_secret, binary()}, iodata()) -> binary().
+%% M = ClientHello...ServerHello
+server_handshake_traffic_secret(Algo, {handshake_secret, Secret}, M) ->
+    derive_secret(Secret, <<"s hs traffic">>, M, Algo).
+
+-spec client_application_traffic_secret_0(atom(), {master_secret, binary()}, iodata()) -> binary().
+%% M = ClientHello...server Finished
+client_application_traffic_secret_0(Algo, {master_secret, Secret}, M) ->
+    derive_secret(Secret, <<"c ap traffic">>, M, Algo).
+
+-spec server_application_traffic_secret_0(atom(), {master_secret, binary()}, iodata()) -> binary().
+%% M = ClientHello...server Finished
+server_application_traffic_secret_0(Algo, {master_secret, Secret}, M) ->
+    derive_secret(Secret, <<"s ap traffic">>, M, Algo).
+
+-spec exporter_master_secret(atom(), {master_secret, binary()}, iodata()) -> binary().
+%% M = ClientHello...server Finished
+exporter_master_secret(Algo, {master_secret, Secret}, M) ->
+    derive_secret(Secret, <<"exp master">>, M, Algo).
+
+-spec resumption_master_secret(atom(), {master_secret, binary()}, iodata()) -> binary().
+%% M = ClientHello...client Finished
+resumption_master_secret(Algo, {master_secret, Secret}, M) ->
+    derive_secret(Secret, <<"res master">>, M, Algo).
+
+-spec finished_key(binary(), atom()) -> binary().
+finished_key(BaseKey, Algo) ->
+    %% finished_key =
+    %%        HKDF-Expand-Label(BaseKey, "finished", "", Hash.length)
+    ssl_cipher:hash_size(Algo),
+    hkdf_expand_label(BaseKey, <<"finished">>, <<>>, ssl_cipher:hash_size(Algo), Algo).
+
+-spec finished_verify_data(binary(), atom(), iodata()) -> binary().
+finished_verify_data(FinishedKey, HKDFAlgo, Messages) ->
+    %% The verify_data value is computed as follows:
+    %%
+    %%       verify_data =
+    %%           HMAC(finished_key,
+    %%                Transcript-Hash(Handshake Context,
+    %%                                Certificate*, CertificateVerify*))
+    Context = lists:reverse(Messages),
+    THash = tls_v1:transcript_hash(Context, HKDFAlgo),
+    tls_v1:hmac_hash(HKDFAlgo, FinishedKey, THash).
+
+%% The next-generation application_traffic_secret is computed as:
+%%
+%%        application_traffic_secret_N+1 =
+%%            HKDF-Expand-Label(application_traffic_secret_N,
+%%                              "traffic upd", "", Hash.length)
+-spec update_traffic_secret(atom(), binary()) -> binary().
+update_traffic_secret(Algo, Secret) ->
+    hkdf_expand_label(Secret, <<"traffic upd">>, <<>>, ssl_cipher:hash_size(Algo), Algo).
+
+%% The traffic keying material is generated from the following input
+%%    values:
+%%
+%%    -  A secret value
+%%
+%%    -  A purpose value indicating the specific value being generated
+%%
+%%    -  The length of the key being generated
+%%
+%%    The traffic keying material is generated from an input traffic secret
+%%    value using:
+%%
+%%    [sender]_write_key = HKDF-Expand-Label(Secret, "key", "", key_length)
+%%    [sender]_write_iv  = HKDF-Expand-Label(Secret, "iv", "", iv_length)
+-spec calculate_traffic_keys(atom(), atom(), binary()) -> {binary(), binary()}.
+calculate_traffic_keys(HKDFAlgo, Cipher, Secret) ->
+    Key = hkdf_expand_label(Secret, <<"key">>, <<>>, ssl_cipher:key_material(Cipher), HKDFAlgo),
+    %% TODO: remove hard coded IV size
+    IV = hkdf_expand_label(Secret, <<"iv">>, <<>>, 12, HKDFAlgo),
+    {Key, IV}.
+
+%% TLS v1.3  ---------------------------------------------------
+
+%% TLS 1.0 -1.2  ---------------------------------------------------
+-spec mac_hash(integer() | atom(), binary(), integer(), integer(), tls_record:tls_version(),
 	       integer(), binary()) -> binary().
 
 mac_hash(Method, Mac_write_secret, Seq_num, Type, {Major, Minor},
@@ -191,8 +440,11 @@ mac_hash(Method, Mac_write_secret, Seq_num, Type, {Major, Minor},
 		      ?BYTE(Major), ?BYTE(Minor), ?UINT16(Length)>>,
 		     Fragment]),
     Mac.
+%% TLS 1.0 -1.2  ---------------------------------------------------
+
+%% TODO 1.3 same as above?
 
--spec suites(1|2|3) -> [ssl_cipher_format:cipher_suite()].
+-spec suites(1|2|3|4|'TLS_v1.3') -> [ssl_cipher_format:cipher_suite()].
 
 suites(Minor) when Minor == 1; Minor == 2 ->
     [
@@ -244,8 +496,29 @@ suites(3) ->
      %% ?TLS_DH_DSS_WITH_AES_256_GCM_SHA384,
      %% ?TLS_DH_RSA_WITH_AES_128_GCM_SHA256,
      %% ?TLS_DH_DSS_WITH_AES_128_GCM_SHA256
-    ] ++ suites(2).
-
+    ] ++ suites(2);
+
+suites(4) ->
+    [?TLS_AES_256_GCM_SHA384,
+     ?TLS_AES_128_GCM_SHA256,
+     ?TLS_CHACHA20_POLY1305_SHA256,
+     ?TLS_AES_128_CCM_SHA256
+     %% Not supported
+     %% ?TLS_AES_128_CCM_8_SHA256
+    ] ++ suites(3);
+
+suites('TLS_v1.3') ->
+    [?TLS_AES_256_GCM_SHA384,
+     ?TLS_AES_128_GCM_SHA256,
+     ?TLS_CHACHA20_POLY1305_SHA256,
+     ?TLS_AES_128_CCM_SHA256
+     %% Not supported
+     %% ?TLS_AES_128_CCM_8_SHA256
+    ].
+
+
+signature_algs({3, 4}, HashSigns) ->
+    signature_algs({3, 3}, HashSigns);
 signature_algs({3, 3}, HashSigns) ->
     CryptoSupports =  crypto:supports(),
     Hashes = proplists:get_value(hashs, CryptoSupports),
@@ -273,6 +546,10 @@ signature_algs({3, 3}, HashSigns) ->
 			    end, [], HashSigns),
     lists:reverse(Supported).
 
+default_signature_algs({3, 4} = Version) ->
+    %% TLS 1.3 servers shall be prepared to process TLS 1.2 ClientHellos
+    %% containing legacy hash-sign tuples.
+    default_signature_schemes(Version) ++ default_signature_algs({3,3});
 default_signature_algs({3, 3} = Version) ->
     Default = [%% SHA2
 	       {sha512, ecdsa},
@@ -291,15 +568,117 @@ default_signature_algs({3, 3} = Version) ->
 default_signature_algs(_) ->
     undefined.
 
+
+signature_schemes(Version, SignatureSchemes) when is_tuple(Version)
+                                                  andalso Version >= {3, 3} ->
+    CryptoSupports =  crypto:supports(),
+    Hashes = proplists:get_value(hashs, CryptoSupports),
+    PubKeys = proplists:get_value(public_keys, CryptoSupports),
+    Curves = proplists:get_value(curves, CryptoSupports),
+    RSAPSSSupported = lists:member(rsa_pkcs1_pss_padding,
+                                   proplists:get_value(rsa_opts, CryptoSupports)),
+    Fun = fun (Scheme, Acc) when is_atom(Scheme) ->
+                  {Hash0, Sign0, Curve} =
+                      ssl_cipher:scheme_to_components(Scheme),
+                  Sign = case Sign0 of
+                             rsa_pkcs1 ->
+                                 rsa;
+                             rsa_pss_rsae when RSAPSSSupported ->
+                                 rsa;
+                             rsa_pss_pss when RSAPSSSupported ->
+                                 rsa;
+                             S -> S
+                         end,
+                  Hash = case Hash0 of
+                             sha1 ->
+                                 sha;
+                             H -> H
+                         end,
+                  case proplists:get_bool(Sign, PubKeys)
+                      andalso proplists:get_bool(Hash, Hashes)
+                      andalso (Curve =:= undefined orelse
+                               proplists:get_bool(Curve, Curves))
+                      andalso is_pair(Hash, Sign, Hashes)
+                  of
+                      true ->
+                          [Scheme | Acc];
+                      false ->
+                          Acc
+                  end;
+              %% Special clause for filtering out the legacy hash-sign tuples.
+              ({Hash, dsa = Sign} = Alg, Acc) ->
+                  case proplists:get_bool(dss, PubKeys)
+                      andalso proplists:get_bool(Hash, Hashes)
+                      andalso is_pair(Hash, Sign, Hashes)
+                  of
+                      true ->
+                          [Alg | Acc];
+                      false ->
+                          Acc
+                  end;
+              ({Hash, Sign} = Alg, Acc) ->
+                  case proplists:get_bool(Sign, PubKeys)
+                      andalso proplists:get_bool(Hash, Hashes)
+                      andalso is_pair(Hash, Sign, Hashes)
+                  of
+                      true ->
+                          [Alg | Acc];
+                      false ->
+                          Acc
+                  end
+          end,
+    Supported = lists:foldl(Fun, [], SignatureSchemes),
+    lists:reverse(Supported);
+signature_schemes(_, _) ->
+    [].
+
+default_signature_schemes(Version) ->
+    Default = [
+               ecdsa_secp521r1_sha512,
+               ecdsa_secp384r1_sha384,
+               ecdsa_secp256r1_sha256,
+               rsa_pss_pss_sha512,
+               rsa_pss_pss_sha384,
+               rsa_pss_pss_sha256,
+               rsa_pss_rsae_sha512,
+               rsa_pss_rsae_sha384,
+               rsa_pss_rsae_sha256,
+               %% ed25519,
+               %% ed448,
+
+               %% These values refer solely to signatures
+               %% which appear in certificates (see Section 4.4.2.2) and are not
+               %% defined for use in signed TLS handshake messages, although they
+               %% MAY appear in "signature_algorithms" and
+               %% "signature_algorithms_cert" for backward compatibility with
+               %% TLS 1.2.
+               rsa_pkcs1_sha512,
+               rsa_pkcs1_sha384,
+               rsa_pkcs1_sha256,
+               ecdsa_sha1,
+               rsa_pkcs1_sha1
+              ],
+    signature_schemes(Version, Default).
+
+
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
+hkdf_expand(Algo, PseudoRandKey, ContextInfo, Length, N, N, Prev, Acc) ->
+    Keyingmaterial = hmac_hash(Algo, PseudoRandKey, <<Prev/binary, ContextInfo/binary, ?BYTE(N)>>),
+    binary:part(<<Acc/binary, Keyingmaterial/binary>>, {0, Length});
+hkdf_expand(Algo, PseudoRandKey, ContextInfo, Length, M, N, Prev, Acc) ->
+    Keyingmaterial = hmac_hash(Algo, PseudoRandKey, <<Prev/binary, ContextInfo/binary, ?BYTE(M)>>),
+    hkdf_expand(Algo, PseudoRandKey, ContextInfo, Length, M + 1, N, Keyingmaterial, <<Acc/binary, Keyingmaterial/binary>>).
+
 %%%% HMAC and the Pseudorandom Functions RFC 2246 & 4346 - 5.%%%%
 hmac_hash(?NULL, _, _) ->
     <<>>;
 hmac_hash(Alg, Key, Value) ->
     crypto:hmac(mac_algo(Alg), Key, Value).
 
+mac_algo(Alg) when is_atom(Alg) -> 
+    Alg;
 mac_algo(?MD5)    -> md5;
 mac_algo(?SHA)    -> sha;
 mac_algo(?SHA256) -> sha256;
@@ -395,6 +774,7 @@ ecc_curves(all) ->
      sect239k1,sect233k1,sect233r1,secp224k1,secp224r1,
      sect193r1,sect193r2,secp192k1,secp192r1,sect163k1,
      sect163r1,sect163r2,secp160k1,secp160r1,secp160r2];
+
 ecc_curves(Minor) ->
     TLSCurves = ecc_curves(all),
     ecc_curves(Minor, TLSCurves).
@@ -409,6 +789,63 @@ ecc_curves(_Minor, TLSCurves) ->
 			end
 		end, [], TLSCurves).
 
+-spec groups(4 | all | default) -> [group()].
+groups(all) ->
+    [x25519,
+     x448,
+     secp256r1,
+     secp384r1,
+     secp521r1,
+     ffdhe2048,
+     ffdhe3072,
+     ffdhe4096,
+     ffdhe6144,
+     ffdhe8192];
+groups(default) ->
+    [x25519,
+     x448,
+     secp256r1,
+     secp384r1];
+groups(Minor) ->
+    TLSGroups = groups(all),
+    groups(Minor, TLSGroups).
+%%
+-spec groups(4, [group()]) -> [group()].
+groups(_Minor, TLSGroups) ->
+    CryptoGroups = supported_groups(),
+    lists:filter(fun(Group) -> proplists:get_bool(Group, CryptoGroups) end, TLSGroups).
+
+default_groups(Minor) ->
+    TLSGroups = groups(default),
+    groups(Minor, TLSGroups).
+
+supported_groups() ->
+    %% TODO: Add new function to crypto?
+    proplists:get_value(curves,  crypto:supports()) ++
+        [ffdhe2048,ffdhe3072,ffdhe4096,ffdhe6144,ffdhe8192].
+
+group_to_enum(secp256r1) -> 23;
+group_to_enum(secp384r1) -> 24;
+group_to_enum(secp521r1) -> 25;
+group_to_enum(x25519)    -> 29;
+group_to_enum(x448)      -> 30;
+group_to_enum(ffdhe2048) -> 256;
+group_to_enum(ffdhe3072) -> 257;
+group_to_enum(ffdhe4096) -> 258;
+group_to_enum(ffdhe6144) -> 259;
+group_to_enum(ffdhe8192) -> 260.
+
+enum_to_group(23) -> secp256r1;
+enum_to_group(24) -> secp384r1;
+enum_to_group(25) -> secp521r1;
+enum_to_group(29) -> x25519;
+enum_to_group(30) -> x448;
+enum_to_group(256) -> ffdhe2048;
+enum_to_group(257) -> ffdhe3072;
+enum_to_group(258) -> ffdhe4096;
+enum_to_group(259) -> ffdhe6144;
+enum_to_group(260) -> ffdhe8192;
+enum_to_group(_) -> undefined.
 
 %% ECC curves from draft-ietf-tls-ecc-12.txt (Oct. 17, 2005)
 oid_to_enum(?sect163k1) -> 1;
diff --git a/lib/ssl/test/Makefile b/lib/ssl/test/Makefile
index 9dfb2eba53..0925c0facc 100644
--- a/lib/ssl/test/Makefile
+++ b/lib/ssl/test/Makefile
@@ -29,7 +29,7 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 # Application version
 # ----------------------------------------------------
 include ../vsn.mk
-VSN=$(GS_VSN)
+VSN=$(SSL_VSN)
 
 # ----------------------------------------------------
 # Target Specs
@@ -37,12 +37,29 @@ VSN=$(GS_VSN)
 
 MODULES = \
 	ssl_test_lib \
+	ssl_app_env_SUITE\
+	ssl_alert_SUITE\
 	ssl_bench_test_lib \
 	ssl_dist_test_lib \
-	ssl_alpn_handshake_SUITE \
+	ssl_api_SUITE\
+	tls_api_SUITE\
 	ssl_basic_SUITE \
 	ssl_bench_SUITE \
 	ssl_cipher_SUITE \
+        ssl_cipher_suite_SUITE \
+	openssl_cipher_suite_SUITE\
+	ssl_alpn_SUITE \
+        openssl_alpn_SUITE\
+	ssl_npn_SUITE \
+	openssl_npn_SUITE\
+	openssl_sni_SUITE\
+	ssl_renegotiate_SUITE\
+	openssl_renegotiate_SUITE\
+	openssl_reject_SUITE\
+	ssl_cert_tests\
+        ssl_cert_SUITE\
+	openssl_server_cert_SUITE\
+	openssl_client_cert_SUITE\
 	ssl_certificate_verify_SUITE\
 	ssl_crl_SUITE\
 	ssl_dist_SUITE \
@@ -50,19 +67,26 @@ MODULES = \
 	ssl_engine_SUITE\
 	ssl_handshake_SUITE \
 	ssl_npn_hello_SUITE \
-	ssl_npn_handshake_SUITE \
 	ssl_packet_SUITE \
 	ssl_payload_SUITE \
 	ssl_pem_cache_SUITE \
+	ssl_session_SUITE \
 	ssl_session_cache_SUITE	\
-	ssl_to_openssl_SUITE \
+	openssl_session_SUITE \
 	ssl_ECC_SUITE \
 	ssl_ECC_openssl_SUITE \
 	ssl_ECC\
 	ssl_upgrade_SUITE\
 	ssl_sni_SUITE \
-	make_certs\
-        x509_test
+	ssl_eqc_SUITE \
+	ssl_rfc_5869_SUITE \
+	tls_1_3_record_SUITE\
+	openssl_tls_1_3_version_SUITE\
+	tls_1_3_version_SUITE\
+	ssl_socket_SUITE\
+	make_certs \
+        x509_test \
+	inet_crypto_dist
 
 
 ERL_FILES = $(MODULES:%=%.erl)
@@ -144,7 +168,7 @@ release_tests_spec: opt
 	$(INSTALL_DATA)  $(ERL_FILES) $(HRL_FILES) $(HRL_FILES_NEEDED_IN_TEST) $(COVER_FILE) "$(RELSYSDIR)"
 	$(INSTALL_DATA) ssl.spec ssl_bench.spec ssl.cover "$(RELSYSDIR)"
 	chmod -R u+w "$(RELSYSDIR)"
-	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
+	@tar cf - *_SUITE_data property_test | (cd "$(RELSYSDIR)"; tar xf -)
 
 release_docs_spec:
 
diff --git a/lib/ssl/test/inet_crypto_dist.erl b/lib/ssl/test/inet_crypto_dist.erl
new file mode 100644
index 0000000000..63c19d9438
--- /dev/null
+++ b/lib/ssl/test/inet_crypto_dist.erl
@@ -0,0 +1,1541 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019. 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 for encrypted Erlang protocol - a minimal encrypted
+%% distribution protocol based on only a shared secret
+%% and the crypto application
+%%
+-module(inet_crypto_dist).
+-define(DIST_NAME, inet_crypto).
+-define(DIST_PROTO, crypto).
+-define(DRIVER, inet_tcp).
+-define(FAMILY, inet).
+
+-export([listen/1, accept/1, accept_connection/5,
+	 setup/5, close/1, select/1, is_node_name/1]).
+
+%% Generalized dist API, for sibling IPv6 module inet6_crypto_dist
+-export([gen_listen/2, gen_accept/2, gen_accept_connection/6,
+	 gen_setup/6, gen_close/2, gen_select/2]).
+
+-export([nodelay/0]).
+
+%% Debug
+%%%-compile(export_all).
+-export([dbg/0, test_server/0, test_client/1]).
+
+-include_lib("kernel/include/net_address.hrl").
+-include_lib("kernel/include/dist.hrl").
+-include_lib("kernel/include/dist_util.hrl").
+
+-define(PACKET_SIZE, 65536).
+-define(BUFFER_SIZE, (?PACKET_SIZE bsl 4)).
+
+%% -------------------------------------------------------------------------
+
+-record(params,
+        {socket,
+         dist_handle,
+         hmac_algorithm = sha256,
+         aead_cipher = aes_gcm,
+         rekey_key,
+         iv = 12,
+         key = 16,
+         tag_len = 16,
+         rekey_interval = 262144
+        }).
+
+params(Socket) ->
+    #params{socket = Socket}.
+
+
+-record(key_pair,
+        {type = ecdh,
+         %% The curve choice greatly affects setup time,
+         %% we really want an Edwards curve but that would
+         %% require a very new openssl version.
+         %% Twisted brainpool curves (*t1) are faster than
+         %% non-twisted (*r1), 256 is much faster than 384,
+         %% and so on...
+%%%         params = brainpoolP384t1,
+         params = brainpoolP256t1,
+         public,
+         private}).
+
+-define(KEY_PAIR_LIFE_TIME, 3600000). % 1 hour
+-define(KEY_PAIR_LIFE_COUNT, 256). % Number of connection setups
+
+
+%% -------------------------------------------------------------------------
+%% Keep the node's public/private key pair in the process state
+%% of a key pair server linked to the acceptor process.
+%% Create the key pair the first time it is needed
+%% so crypto gets time to start first.
+%%
+
+start_key_pair_server() ->
+    monitor_dist_proc(
+      spawn_link(
+        fun () ->
+                register(?MODULE, self()),
+                key_pair_server()
+        end)).
+
+key_pair_server() ->
+    key_pair_server(undefined, undefined, undefined).
+%%
+key_pair_server(KeyPair) ->
+    key_pair_server(
+      KeyPair,
+      erlang:start_timer(?KEY_PAIR_LIFE_TIME, self(), discard),
+      ?KEY_PAIR_LIFE_COUNT).
+%%    
+key_pair_server(_KeyPair, Timer, 0) ->
+    cancel_timer(Timer),
+    key_pair_server();
+key_pair_server(KeyPair, Timer, Count) ->
+    receive
+        {Pid, Tag, get_key_pair} ->
+            case KeyPair of
+                undefined ->
+                    KeyPair_1 = generate_key_pair(),
+                    Pid ! {Tag, KeyPair_1},
+                    key_pair_server(KeyPair_1);
+                #key_pair{} ->
+                    Pid ! {Tag, KeyPair},
+                    key_pair_server(KeyPair, Timer, Count - 1)
+            end;
+        {Pid, Tag, get_new_key_pair} ->
+            cancel_timer(Timer),
+            KeyPair_1 = generate_key_pair(),
+            Pid ! {Tag, KeyPair_1},
+            key_pair_server(KeyPair_1);
+        {timeout, Timer, discard} when is_reference(Timer) ->
+            key_pair_server()
+    end.
+
+generate_key_pair() ->
+    #key_pair{type = Type, params = Params} = #key_pair{},
+    {Public, Private} =
+        crypto:generate_key(Type, Params),
+    #key_pair{public = Public, private = Private}.
+
+cancel_timer(undefined) ->
+    ok;
+cancel_timer(Timer) ->
+    case erlang:cancel_timer(Timer) of
+        false ->
+            receive
+                {timeout, Timer, _} -> ok
+            end;
+        _RemainingTime ->
+            ok
+    end.
+
+get_key_pair() ->
+    call_key_pair_server(get_key_pair).
+
+get_new_key_pair() ->
+    call_key_pair_server(get_new_key_pair).
+
+call_key_pair_server(Request) ->
+    Pid = whereis(?MODULE),
+    Ref = erlang:monitor(process, Pid),
+    Pid ! {self(), Ref, Request},
+    receive
+        {Ref, Reply} ->
+            erlang:demonitor(Ref, [flush]),
+            Reply;
+        {'DOWN', Ref, process, Pid, Reason} ->
+            error(Reason)
+    end.
+
+compute_shared_secret(
+  #key_pair{
+     type = PublicKeyType,
+     params = PublicKeyParams,
+     private = PrivKey}, PubKey) ->
+    %%
+    crypto:compute_key(PublicKeyType, PubKey, PrivKey, PublicKeyParams).
+
+%% -------------------------------------------------------------------------
+%% Erlang distribution plugin structure explained to myself
+%% -------
+%% These are the processes involved in the distribution:
+%% * net_kernel
+%% * The Acceptor
+%% * The Controller | Handshaker | Ticker
+%% * The DistCtrl process that may be split into:
+%%   + The Output controller
+%%   + The Input controller
+%%   For the regular inet_tcp_dist distribution module, DistCtrl
+%%   is not one or two processes, but one port - a gen_tcp socket
+%%
+%% When the VM is started with the argument "-proto_dist inet_crypto"
+%% net_kernel registers the module inet_crypto_dist acli,oams distribution
+%% module.  net_kernel calls listen/1 to create a listen socket
+%% and then accept/1 with the listen socket as argument to spawn
+%% the Acceptor process, which is linked to net_kernel.  Apparently
+%% the listen socket is owned by net_kernel - I wonder if it could
+%% be owned by the Acceptor process instead...
+%%
+%% The Acceptor process calls blocking accept on the listen socket
+%% and when an incoming socket is returned it spawns the DistCtrl
+%% process a linked to the Acceptor.  The ownership of the accepted
+%% socket is transferred to the DistCtrl process.
+%% A message is sent to net_kernel to inform it that an incoming
+%% connection has appeared and the Acceptor awaits a reply from net_kernel.
+%%
+%% net_kernel then calls accept_connection/5 to spawn the Controller |
+%% Handshaker | Ticker process that is linked to net_kernel.
+%% The Controller then awaits a message from the Acceptor process.
+%%
+%% When net_kernel has spawned the Controller it replies with a message
+%% to the Acceptor that then calls DistCtrl to changes its links
+%% so DistCtrl ends up linked to the Controller and not to the Acceptor.
+%% The Acceptor then sends a message to the Controller.  The Controller
+%% then changes role into the Handshaker creates a #hs_data{} record
+%% and calls dist_util:handshake_other_started/1.  After this
+%% the Acceptor goes back into a blocking accept on the listen socket.
+%%
+%% For the regular distribution inet_tcp_dist DistCtrl is a gen_tcp socket
+%% and when it is a process it also acts as a socket.  The #hs_data{}
+%% record used by dist_util presents a set of funs that are used
+%% by dist_util to perform the distribution handshake.  These funs
+%% make sure to transfer the handshake messages through the DistCtrl
+%% "socket".
+%%
+%% When the handshake is finished a fun for this purpose in #hs_data{}
+%% is called, which tells DistCtrl that it does not need to be prepared
+%% for any more #hs_data{} handshake calls.  The DistCtrl process in this
+%% module then spawns the Input controller process that gets ownership
+%% of the connection's gen_tcp socket and changes into {active, N} mode
+%% so now it gets all incoming traffic and delivers that to the VM.
+%% The original DistCtrl process changes role into the Output controller
+%% process and starts asking the VM for outbound messages and transfers
+%% them on the connection socket.
+%%
+%% The Handshaker now changes into the Ticker role, and uses only two
+%% functions in the #hs_data{} record; one to get socket statistics
+%% and one to send a tick.  None of these may block for any reason
+%% in particular not for a congested socket since that would destroy
+%% connection supervision.
+%%
+%%
+%% For an connection net_kernel calls setup/5 which spawns the
+%% Controller process as linked to net_kernel.  This Controller process
+%% connects to the other node's listen socket and when that is succesful
+%% spawns the DistCtrl process as linked to the controller and transfers
+%% socket ownership to it.
+%%
+%% Then the Controller creates the #hs_data{} record and calls
+%% dist_util:handshake_we_started/1 which changes the process role
+%% into Handshaker.
+%%
+%% When the distribution handshake is finished the procedure is just
+%% as for an incoming connection above.
+%%
+%%
+%% To sum it up.
+%%
+%% There is an Acceptor process that is linked to net_kernel and
+%% informs it when new connections arrive.
+%%
+%% net_kernel spawns Controllers for incoming and for outgoing connections.
+%% these Controllers use the DistCtrl processes to do distribution
+%% handshake and after that becomes Tickers that supervise the connection.
+%%
+%% The Controller | Handshaker | Ticker is linked to net_kernel, and to
+%% DistCtrl, one or both.  If any of these connection processes would die
+%% all others should be killed by the links.  Therefore none of them may
+%% terminate with reason 'normal'.
+%% -------------------------------------------------------------------------
+
+-compile({inline, [socket_options/0]}).
+socket_options() ->
+    [binary, {active, false}, {packet, 2}, {nodelay, true},
+     {sndbuf, ?BUFFER_SIZE}, {recbuf, ?BUFFER_SIZE},
+     {buffer, ?BUFFER_SIZE}].
+
+%% -------------------------------------------------------------------------
+%% select/1 is called by net_kernel to ask if this distribution protocol
+%% is willing to handle Node
+%%
+
+select(Node) ->
+    gen_select(Node, ?DRIVER).
+
+gen_select(Node, Driver) ->
+    case dist_util:split_node(Node) of
+        {node, _, Host} ->
+	    case Driver:getaddr(Host) of
+		{ok, _} -> true;
+		_ -> false
+	    end;
+        _ ->
+            false
+    end.
+
+%% -------------------------------------------------------------------------
+
+is_node_name(Node) ->
+    dist_util:is_node_name(Node).
+
+%% -------------------------------------------------------------------------
+%% Called by net_kernel to create a listen socket for this
+%% distribution protocol.  This listen socket is used by
+%% the Acceptor process.
+%%
+
+listen(Name) ->
+    gen_listen(Name, ?DRIVER).
+
+gen_listen(Name, Driver) ->
+    case inet_tcp_dist:gen_listen(Driver, Name) of
+        {ok, {Socket, Address, Creation}} ->
+            inet:setopts(Socket, socket_options()),
+            {ok,
+             {Socket, Address#net_address{protocol = ?DIST_PROTO}, Creation}};
+        Other ->
+            Other
+    end.
+
+%% -------------------------------------------------------------------------
+%% Called by net_kernel to spawn the Acceptor process that awaits
+%% new connection in a blocking accept and informs net_kernel
+%% when a new connection has appeared, and starts the DistCtrl
+%% "socket" process for the connection.
+%%
+
+accept(Listen) ->
+    gen_accept(Listen, ?DRIVER).
+
+gen_accept(Listen, Driver) ->
+    NetKernel = self(),
+    %%
+    %% Spawn Acceptor process
+    %%
+    monitor_dist_proc(
+      spawn_opt(
+        fun () ->
+                start_key_pair_server(),
+                accept_loop(Listen, Driver, NetKernel)
+        end,
+        [link, {priority, max}])).
+
+accept_loop(Listen, Driver, NetKernel) ->
+    case Driver:accept(trace(Listen)) of
+        {ok, Socket} ->
+            wait_for_code_server(),
+            Timeout = net_kernel:connecttime(),
+            DistCtrl = start_dist_ctrl(trace(Socket), Timeout),
+            %% DistCtrl is a "socket"
+            NetKernel !
+                trace({accept,
+                       self(), DistCtrl, Driver:family(), ?DIST_PROTO}),
+            receive
+                {NetKernel, controller, Controller} ->
+                    call_dist_ctrl(DistCtrl, {controller, Controller, self()}),
+                    Controller ! {self(), controller, Socket};
+                {NetKernel, unsupported_protocol} ->
+                    exit(unsupported_protocol)
+            end,
+            accept_loop(Listen, Driver, NetKernel);
+        AcceptError ->
+            exit({accept, AcceptError})
+    end.
+
+wait_for_code_server() ->
+    %% This is an ugly hack.  Starting encryption on a connection
+    %% requires the crypto module to be loaded.  Loading the crypto
+    %% module triggers its on_load function, which calls
+    %% code:priv_dir/1 to find the directory where its NIF library is.
+    %% However, distribution is started earlier than the code server,
+    %% so the code server is not necessarily started yet, and
+    %% code:priv_dir/1 might fail because of that, if we receive
+    %% an incoming connection on the distribution port early enough.
+    %%
+    %% If the on_load function of a module fails, the module is
+    %% unloaded, and the function call that triggered loading it fails
+    %% with 'undef', which is rather confusing.
+    %%
+    %% So let's avoid that by waiting for the code server to start.
+    %%
+    case whereis(code_server) of
+	undefined ->
+	    timer:sleep(10),
+	    wait_for_code_server();
+	Pid when is_pid(Pid) ->
+	    ok
+    end.
+
+%% -------------------------------------------------------------------------
+%% Called by net_kernel when a new connection has appeared, to spawn
+%% a Controller process that performs the handshake with the new node,
+%% and then becomes the Ticker connection supervisor.
+%% -------------------------------------------------------------------------
+
+accept_connection(Acceptor, DistCtrl, MyNode, Allowed, SetupTime) ->
+    gen_accept_connection(
+      Acceptor, DistCtrl, MyNode, Allowed, SetupTime, ?DRIVER).
+
+gen_accept_connection(
+  Acceptor, DistCtrl, MyNode, Allowed, SetupTime, Driver) ->
+    NetKernel = self(),
+    %%
+    %% Spawn Controller/handshaker/ticker process
+    %%
+    monitor_dist_proc(
+      spawn_opt(
+        fun() ->
+                do_accept(
+                  Acceptor, DistCtrl,
+                  trace(MyNode), Allowed, SetupTime, Driver, NetKernel)
+        end,
+        [link, {priority, max}])).
+
+do_accept(
+  Acceptor, DistCtrl, MyNode, Allowed, SetupTime, Driver, NetKernel) ->
+    %%
+    receive
+	{Acceptor, controller, Socket} ->
+	    Timer = dist_util:start_timer(SetupTime),
+            HSData =
+                hs_data_common(
+                  NetKernel, MyNode, DistCtrl, Timer,
+                  Socket, Driver:family()),
+            HSData_1 =
+                HSData#hs_data{
+                  this_node = MyNode,
+                  this_flags = 0,
+                  allowed = Allowed},
+            dist_util:handshake_other_started(trace(HSData_1))
+    end.
+
+%% -------------------------------------------------------------------------
+%% Called by net_kernel to spawn a Controller process that sets up
+%% a new connection to another Erlang node, performs the handshake
+%% with the other it, and then becomes the Ticker process
+%% that supervises the connection.
+%% -------------------------------------------------------------------------
+
+setup(Node, Type, MyNode, LongOrShortNames, SetupTime) ->
+    gen_setup(Node, Type, MyNode, LongOrShortNames, SetupTime, ?DRIVER).
+
+gen_setup(Node, Type, MyNode, LongOrShortNames, SetupTime, Driver) ->
+    NetKernel = self(),
+    %%
+    %% Spawn Controller/handshaker/ticker process
+    %%
+    monitor_dist_proc(
+      spawn_opt(
+        setup_fun(
+          Node, Type, MyNode, LongOrShortNames, SetupTime, Driver, NetKernel),
+        [link, {priority, max}])).
+
+-spec setup_fun(_,_,_,_,_,_,_) -> fun(() -> no_return()).
+setup_fun(
+  Node, Type, MyNode, LongOrShortNames, SetupTime, Driver, NetKernel) ->
+    %%
+    fun() ->
+            do_setup(
+              trace(Node), Type, MyNode, LongOrShortNames, SetupTime,
+              Driver, NetKernel)
+    end.
+
+-spec do_setup(_,_,_,_,_,_,_) -> no_return().
+do_setup(
+  Node, Type, MyNode, LongOrShortNames, SetupTime, Driver, NetKernel) ->
+    %%
+    {Name, Address} = split_node(Driver, Node, LongOrShortNames),
+    ErlEpmd = net_kernel:epmd_module(),
+    {ARMod, ARFun} = get_address_resolver(ErlEpmd, Driver),
+    Timer = trace(dist_util:start_timer(SetupTime)),
+    case ARMod:ARFun(Name, Address, Driver:family()) of
+        {ok, Ip, TcpPort, Version} ->
+            do_setup_connect(
+              Node, Type, MyNode, Timer, Driver, NetKernel,
+              Ip, TcpPort, Version);
+	{ok, Ip} ->
+	    case ErlEpmd:port_please(Name, Ip) of
+		{port, TcpPort, Version} ->
+                do_setup_connect(
+                  Node, Type, MyNode, Timer, Driver, NetKernel,
+                  Ip, TcpPort, trace(Version));
+		Other ->
+                    _ = trace(
+                          {ErlEpmd, port_please, [Name, Ip], Other}),
+                    ?shutdown(Node)
+	    end;
+	Other ->
+            _ = trace(
+                  {ARMod, ARFun, [Name, Address, Driver:family()],
+                   Other}),
+            ?shutdown(Node)
+    end.
+
+-spec do_setup_connect(_,_,_,_,_,_,_,_,_) -> no_return().
+
+do_setup_connect(
+  Node, Type, MyNode, Timer, Driver, NetKernel,
+  Ip, TcpPort, Version) ->
+    dist_util:reset_timer(Timer),
+    ConnectOpts = trace(connect_options(socket_options())),
+    case Driver:connect(Ip, TcpPort, ConnectOpts) of
+        {ok, Socket} ->
+            DistCtrl =
+                try start_dist_ctrl(Socket, net_kernel:connecttime())
+                catch error : {dist_ctrl, _} = DistCtrlError ->
+                        _ = trace(DistCtrlError),
+                        ?shutdown(Node)
+                end,
+            %% DistCtrl is a "socket"
+            HSData =
+                hs_data_common(
+                  NetKernel, MyNode, DistCtrl, Timer,
+                  Socket, Driver:family()),
+            HSData_1 =
+                HSData#hs_data{
+                  other_node = Node,
+                  this_flags = 0,
+                  other_version = Version,
+                  request_type = Type},
+            dist_util:handshake_we_started(trace(HSData_1));
+        ConnectError ->
+            _ = trace(
+                  {Driver, connect, [Ip, TcpPort, ConnectOpts],
+                   ConnectError}),
+            ?shutdown(Node)
+    end.
+
+%% -------------------------------------------------------------------------
+%% close/1 is only called by net_kernel on the socket returned by listen/1.
+
+close(Socket) ->
+    gen_close(Socket, ?DRIVER).
+
+gen_close(Socket, Driver) ->
+    Driver:close(trace(Socket)).
+
+%% -------------------------------------------------------------------------
+
+
+hs_data_common(NetKernel, MyNode, DistCtrl, Timer, Socket, Family) ->
+    %% Field 'socket' below is set to DistCtrl, which makes
+    %% the distribution handshake process (ticker) call
+    %% the funs below with DistCtrl as the S argument.
+    %% So, S =:= DistCtrl below...
+    #hs_data{
+       kernel_pid = NetKernel,
+       this_node = MyNode,
+       socket = DistCtrl,
+       timer = Timer,
+       %%
+       f_send = % -> ok | {error, closed}=>?shutdown()
+           fun (S, Packet) when S =:= DistCtrl ->
+                   try call_dist_ctrl(S, {send, Packet})
+                   catch error : {dist_ctrl, Reason} ->
+                           _ = trace(Reason),
+                           {error, closed}
+                   end
+           end,
+       f_recv = % -> {ok, List} | Other=>?shutdown()
+           fun (S, 0, infinity) when S =:= DistCtrl ->
+                   try call_dist_ctrl(S, recv) of
+                       {ok, Bin} when is_binary(Bin) ->
+                           {ok, binary_to_list(Bin)};
+                       Error ->
+                           Error
+                   catch error : {dist_ctrl, Reason} ->
+                           {error, trace(Reason)}
+                   end
+           end,
+       f_setopts_pre_nodeup =
+           fun (S) when S =:= DistCtrl ->
+                   ok
+           end,
+       f_setopts_post_nodeup =
+           fun (S) when S =:= DistCtrl ->
+                   ok
+           end,
+       f_getll =
+           fun (S) when S =:= DistCtrl ->
+                   {ok, S} %% DistCtrl is the distribution port
+           end,
+       f_address = % -> #net_address{} | ?shutdown()
+           fun (S, Node) when S =:= DistCtrl ->
+                   try call_dist_ctrl(S, peername) of
+                       {ok, Address} ->
+                           case dist_util:split_node(Node) of
+                               {node, _, Host} ->
+                                   #net_address{
+                                      address = Address,
+                                      host = Host,
+                                      protocol = ?DIST_PROTO,
+                                      family = Family};
+                               _ ->
+                                   ?shutdown(Node)
+                           end;
+                       Error ->
+                           _ = trace(Error),
+                           ?shutdown(Node)
+                   catch error : {dist_ctrl, Reason} ->
+                           _ = trace(Reason),
+                           ?shutdown(Node)
+                   end
+           end,
+       f_handshake_complete = % -> ok | ?shutdown()
+           fun (S, Node, DistHandle) when S =:= DistCtrl ->
+                   try call_dist_ctrl(S, {handshake_complete, DistHandle})
+                   catch error : {dist_ctrl, Reason} ->
+                           _ = trace(Reason),
+                           ?shutdown(Node)
+                   end
+           end,
+       %%
+       %% mf_tick/1, mf_getstat/1, mf_setopts/2 and mf_getopts/2
+       %% are called by the ticker any time after f_handshake_complete/3
+       %% so they may not block the caller even for congested socket
+       mf_tick =
+           fun (S) when S =:= DistCtrl ->
+                   S ! dist_tick
+           end,
+       mf_getstat = % -> {ok, RecvCnt, SendCnt, SendPend} | Other=>ignore_it
+           fun (S) when S =:= DistCtrl ->
+                   case
+                       inet:getstat(Socket, [recv_cnt, send_cnt, send_pend])
+                   of
+                       {ok, Stat} ->
+                           split_stat(Stat, 0, 0, 0);
+                       Error ->
+                           trace(Error)
+                   end
+           end,
+       mf_setopts =
+           fun (S, Opts) when S =:= DistCtrl ->
+                   inet:setopts(Socket, setopts_filter(Opts))
+           end,
+       mf_getopts =
+           fun (S, Opts) when S =:= DistCtrl ->
+                   inet:getopts(Socket, Opts)
+           end}.
+
+setopts_filter(Opts) ->
+    [Opt ||
+        Opt <- Opts,
+        case Opt of
+            {K, _} when K =:= active; K =:= deliver; K =:= packet -> false;
+            K when K =:= list; K =:= binary -> false;
+            K when K =:= inet; K =:= inet6 -> false;
+            _ -> true
+        end].
+
+split_stat([{recv_cnt, R}|Stat], _, W, P) ->
+    split_stat(Stat, R, W, P);
+split_stat([{send_cnt, W}|Stat], R, _, P) ->
+    split_stat(Stat, R, W, P);
+split_stat([{send_pend, P}|Stat], R, W, _) ->
+    split_stat(Stat, R, W, P);
+split_stat([], R, W, P) ->
+    {ok, R, W, P}.
+
+%% ------------------------------------------------------------
+%% Determine if EPMD module supports address resolving. Default
+%% is to use inet_tcp:getaddr/2.
+%% ------------------------------------------------------------
+get_address_resolver(EpmdModule, _Driver) ->
+    case erlang:function_exported(EpmdModule, address_please, 3) of
+        true -> {EpmdModule, address_please};
+        _    -> {erl_epmd, address_please}
+    end.
+
+
+%% If Node is illegal terminate the connection setup!!
+split_node(Driver, Node, LongOrShortNames) ->
+    case dist_util:split_node(Node) of
+        {node, Name, Host} ->
+	    check_node(Driver, Node, Name, Host, LongOrShortNames);
+	{host, _} ->
+	    error_logger:error_msg(
+              "** Nodename ~p illegal, no '@' character **~n",
+              [Node]),
+	    ?shutdown2(Node, trace({illegal_node_n@me, Node}));
+	_ ->
+	    error_logger:error_msg(
+              "** Nodename ~p illegal **~n", [Node]),
+	    ?shutdown2(Node, trace({illegal_node_name, Node}))
+    end.
+
+check_node(Driver, Node, Name, Host, LongOrShortNames) ->
+    case string:split(Host, ".", all) of
+	[_] when LongOrShortNames =:= longnames ->
+	    case Driver:parse_address(Host) of
+		{ok, _} ->
+		    {Name, Host};
+		_ ->
+		    error_logger:error_msg(
+                      "** System running to use "
+                      "fully qualified hostnames **~n"
+                      "** Hostname ~s is illegal **~n",
+                      [Host]),
+		    ?shutdown2(Node, trace({not_longnames, Host}))
+	    end;
+	[_, _|_] when LongOrShortNames =:= shortnames ->
+	    error_logger:error_msg(
+              "** System NOT running to use "
+              "fully qualified hostnames **~n"
+              "** Hostname ~s is illegal **~n",
+              [Host]),
+	    ?shutdown2(Node, trace({not_shortnames, Host}));
+	_ ->
+	    {Name, Host}
+    end.
+
+%% -------------------------------------------------------------------------
+
+connect_options(Opts) ->
+    case application:get_env(kernel, inet_dist_connect_options) of
+	{ok, ConnectOpts} ->
+            Opts ++ setopts_filter(ConnectOpts);
+	_ ->
+	    Opts
+    end.
+
+%% we may not always want the nodelay behaviour
+%% for performance reasons
+nodelay() ->
+    case application:get_env(kernel, dist_nodelay) of
+	undefined ->
+	    {nodelay, true};
+	{ok, true} ->
+	    {nodelay, true};
+	{ok, false} ->
+	    {nodelay, false};
+	_ ->
+	    {nodelay, true}
+    end.
+
+%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% The DistCtrl process(es).
+%%
+%% At net_kernel handshake_complete spawns off the input controller that
+%% takes over the socket ownership, and itself becomes the output controller
+%%
+%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%% XXX Missing to "productified":
+%%% * Cryptoanalysis by experts, this is crypto amateur work.
+%%% * Is it useful over inet_tls_dist; i.e to not have to bother
+%%%   with certificates but instead manage a secret cluster cookie?
+%%% * An application to belong to (kernel)
+%%% * Restart and/or code reload policy (not needed in kernel)
+%%% * Fitting into the epmd/Erlang distro protocol version framework
+%%%   (something needs to be created for multiple protocols, epmd,
+%%%    multiple address families, fallback to previous version, etc)
+
+
+%% Debug client and server
+
+test_server() ->
+    {ok, Listen} = gen_tcp:listen(0, socket_options()),
+    {ok, Port} = inet:port(Listen),
+    io:format(?MODULE_STRING":test_client(~w).~n", [Port]),
+    {ok, Socket} = gen_tcp:accept(Listen),
+    test(Socket).
+
+test_client(Port) ->
+    {ok, Socket} = gen_tcp:connect(localhost, Port, socket_options()),
+    test(Socket).
+
+test(Socket) ->
+    start_dist_ctrl(Socket, 10000).
+
+%% -------------------------------------------------------------------------
+
+start_dist_ctrl(Socket, Timeout) ->
+    Secret = atom_to_binary(auth:get_cookie(), latin1),
+    Controller = self(),
+    Server =
+        monitor_dist_proc(
+          spawn_opt(
+            fun () ->
+                    receive
+                        {?MODULE, From, start} ->
+                            {SendParams, RecvParams} =
+                                init(Socket, Secret),
+                            reply(From, self()),
+                            handshake(SendParams, 1, RecvParams, 1, Controller)
+                    end
+            end,
+            [link,
+             {priority, max},
+             {message_queue_data, off_heap},
+             {fullsweep_after, 0}])),
+    ok = gen_tcp:controlling_process(Socket, Server),
+    call_dist_ctrl(Server, start, Timeout).
+
+
+call_dist_ctrl(Server, Msg) ->
+    call_dist_ctrl(Server, Msg, infinity).
+%%
+call_dist_ctrl(Server, Msg, Timeout) ->
+    Ref = erlang:monitor(process, Server),
+    Server ! {?MODULE, {Ref, self()}, Msg},
+    receive
+        {Ref, Res} ->
+            erlang:demonitor(Ref, [flush]),
+            Res;
+        {'DOWN', Ref, process, Server, Reason} ->
+            error({dist_ctrl, Reason})
+    after Timeout -> % Timeout < infinity is only used by start_dist_ctrl/2
+            receive
+                {'DOWN', Ref, process, Server, _} ->
+                    receive {Ref, _} -> ok after 0 -> ok end,
+                    error({dist_ctrl, timeout})
+                    %% Server will be killed by link
+            end
+    end.
+
+reply({Ref, Pid}, Msg) ->
+    Pid ! {Ref, Msg},
+    ok.
+
+%% -------------------------------------------------------------------------
+
+-define(TCP_ACTIVE, 16).
+-define(CHUNK_SIZE, (?PACKET_SIZE - 512)).
+
+-define(HANDSHAKE_CHUNK, 1).
+-define(DATA_CHUNK, 2).
+-define(TICK_CHUNK, 3).
+-define(REKEY_CHUNK, 4).
+
+%% -------------------------------------------------------------------------
+%% Crypto strategy
+%% -------
+%% The crypto strategy is as simple as possible to get an encrypted
+%% connection as benchmark reference.  It is geared around AEAD
+%% ciphers in particular AES-GCM.
+%%
+%% The init message and the start message must fit in the TCP buffers
+%% since both sides start with sending the init message, waits
+%% for the other end's init message, sends the start message
+%% and waits for the other end's start message.  So if the send
+%% blocks we have a deadlock.
+%%
+%% The init + start sequence tries to implement Password Encrypted
+%% Key Exchange using a node public/private key pair and the
+%% shared secret (the Cookie) to create session encryption keys
+%% that can not be re-created if the shared secret is compromized,
+%% which should create forward secrecy.  You need both nodes'
+%% key pairs and the shared secret to decrypt the traffic
+%% between the nodes.
+%%
+%% All exchanged messages uses {packet, 2} i.e 16 bit size header.
+%%
+%% The init message contains a random number and encrypted: the public key
+%% and two random numbers.  The encryption is done with Key and IV hashed
+%% from the unencrypted random number and the shared secret.
+%%
+%% The other node's public key is used with the own node's private
+%% key to create a shared key that is hashed with one of the encrypted
+%% random numbers from each side to create Key and IV for the session.
+%%
+%% The start message contains the two encrypted random numbers
+%% this time encrypted with the session keys for verification
+%% by the other side, plus the rekey interval.  The rekey interval
+%% is just there to get an early check for if the other side's
+%% maximum rekey interal is acceptable, it is just an embryo
+%% of some better check.  Any side may rekey earlier but if the
+%% rekey interval is exceeded the connection fails.
+%%
+%% Subsequent encrypted messages has the sequence number and the length
+%% of the message as AAD data, and an incrementing IV.  These messages
+%% has got a message type that differentiates data from ticks and rekeys.
+%% Ticks have a random size in an attempt to make them less obvious to spot.
+%%
+%% Rekeying is done by the sender that creates a new key pair and
+%% a new shared secret from the other end's public key and with
+%% this and the current key and iv hashes a new key and iv.
+%% The new public key is sent to the other end that uses it
+%% and its old private key to create the same new shared
+%% secret and from that a new key and iv.
+%% So the receiver keeps its private key, and the sender keeps
+%% the receivers public key for the connection's life time.
+%% While the sender generates a new key pair at every rekey,
+%% which changes the shared secret at every rekey.
+%%
+%% The only reaction to errors is to crash noisily (?) wich will bring
+%% down the connection and hopefully produce something useful
+%% in the local log, but all the other end sees is a closed connection.
+%% -------------------------------------------------------------------------
+
+init(Socket, Secret) ->
+    #key_pair{public = PubKey} = KeyPair = get_key_pair(),
+    Params = params(Socket),
+    {R2, R3, Msg} = init_msg(Params, PubKey, Secret),
+    ok = gen_tcp:send(Socket, Msg),
+    init_recv(Params, Secret, KeyPair, R2, R3).
+
+init_recv(
+  #params{socket = Socket, iv = IVLen} = Params, Secret, KeyPair, R2, R3) ->
+    %%
+    {ok, InitMsg} = gen_tcp:recv(Socket, 0),
+    IVSaltLen = IVLen - 6,
+    try
+        case init_msg(Params, Secret, KeyPair, R2, R3, InitMsg) of
+            {#params{iv = <<IV2ASalt:IVSaltLen/binary, IV2ANo:48>>} =
+                 SendParams,
+             RecvParams, SendStartMsg} ->
+                ok = gen_tcp:send(Socket, SendStartMsg),
+                {ok, RecvStartMsg} = gen_tcp:recv(Socket, 0),
+                #params{
+                   iv = <<IV2BSalt:IVSaltLen/binary, IV2BNo:48>>} =
+                    RecvParams_1 =
+                    start_msg(RecvParams, R2, R3, RecvStartMsg),
+                {SendParams#params{iv = {IV2ASalt, IV2ANo}},
+                 RecvParams_1#params{iv = {IV2BSalt, IV2BNo}}}
+        end
+    catch
+        error : Reason : Stacktrace->
+            _ = trace({Reason, Stacktrace}),
+            exit(connection_closed)
+    end.
+
+
+
+init_msg(
+  #params{
+     hmac_algorithm = HmacAlgo,
+     aead_cipher = AeadCipher,
+     key = KeyLen,
+     iv = IVLen,
+     tag_len = TagLen}, PubKeyA, Secret) ->
+    %%
+    RLen = KeyLen + IVLen,
+    <<R1A:RLen/binary, R2A:RLen/binary, R3A:RLen/binary>> =
+        crypto:strong_rand_bytes(3 * RLen),
+    {Key1A, IV1A} = hmac_key_iv(HmacAlgo, R1A, Secret, KeyLen, IVLen),
+    Plaintext = [R2A, R3A, PubKeyA],
+    MsgLen = byte_size(R1A) + TagLen + iolist_size(Plaintext),
+    AAD = [<<MsgLen:32>>, R1A],
+    {Ciphertext, Tag} =
+        crypto:block_encrypt(AeadCipher, Key1A, IV1A, {AAD, Plaintext, TagLen}),
+    Msg = [R1A, Tag, Ciphertext],
+    {R2A, R3A, Msg}.
+%%
+init_msg(
+  #params{
+     hmac_algorithm = HmacAlgo,
+     aead_cipher = AeadCipher,
+     key = KeyLen,
+     iv = IVLen,
+     tag_len = TagLen,
+     rekey_interval = RekeyInterval} = Params,
+  Secret, KeyPair, R2A, R3A, Msg) ->
+    %%
+    RLen = KeyLen + IVLen,
+    case Msg of
+        <<R1B:RLen/binary, Tag:TagLen/binary, Ciphertext/binary>> ->
+            {Key1B, IV1B} = hmac_key_iv(HmacAlgo, R1B, Secret, KeyLen, IVLen),
+            MsgLen = byte_size(Msg),
+            AAD = [<<MsgLen:32>>, R1B],
+            case
+                crypto:block_decrypt(
+                  AeadCipher, Key1B, IV1B, {AAD, Ciphertext, Tag})
+            of
+                <<R2B:RLen/binary, R3B:RLen/binary, PubKeyB/binary>> ->
+                    SharedSecret = compute_shared_secret(KeyPair, PubKeyB),
+                    %%
+                    {Key2A, IV2A} =
+                        hmac_key_iv(
+                          HmacAlgo, SharedSecret, [R2A, R3B], KeyLen, IVLen),
+                    SendParams =
+                        Params#params{
+                          rekey_key = PubKeyB,
+                          key = Key2A, iv = IV2A},
+                    %%
+                    StartCleartext = [R2B, R3B, <<RekeyInterval:32>>],
+                    StartMsgLen = TagLen + iolist_size(StartCleartext),
+                    StartAAD = <<StartMsgLen:32>>,
+                    {StartCiphertext, StartTag} =
+                        crypto:block_encrypt(
+                          AeadCipher, Key2A, IV2A,
+                          {StartAAD, StartCleartext, TagLen}),
+                    StartMsg = [StartTag, StartCiphertext],
+                    %%
+                    {Key2B, IV2B} =
+                        hmac_key_iv(
+                          HmacAlgo, SharedSecret, [R2B, R3A], KeyLen, IVLen),
+                    RecvParams =
+                        Params#params{
+                          rekey_key = KeyPair,
+                          key = Key2B, iv = IV2B},
+                    %%
+                    {SendParams, RecvParams, StartMsg}
+            end
+    end.
+
+start_msg(
+  #params{
+     aead_cipher = AeadCipher,
+     key = Key2B,
+     iv = IV2B,
+     tag_len = TagLen,
+     rekey_interval = RekeyIntervalA} = RecvParams, R2A, R3A, Msg) ->
+    %%
+    case Msg of
+        <<Tag:TagLen/binary, Ciphertext/binary>> ->
+            KeyLen = byte_size(Key2B),
+            IVLen = byte_size(IV2B),
+            RLen = KeyLen + IVLen,
+            MsgLen = byte_size(Msg),
+            AAD = <<MsgLen:32>>,
+            case
+                crypto:block_decrypt(
+                  AeadCipher, Key2B, IV2B, {AAD, Ciphertext, Tag})
+            of
+                <<R2A:RLen/binary, R3A:RLen/binary, RekeyIntervalB:32>>
+                  when RekeyIntervalA =< (RekeyIntervalB bsl 2),
+                       RekeyIntervalB =< (RekeyIntervalA bsl 2) ->
+                    RecvParams#params{rekey_interval = RekeyIntervalB}
+            end
+    end.
+
+hmac_key_iv(HmacAlgo, MacKey, Data, KeyLen, IVLen) ->
+    <<Key:KeyLen/binary, IV:IVLen/binary>> =
+        crypto:hmac(HmacAlgo, MacKey, Data, KeyLen + IVLen),
+    {Key, IV}.
+
+%% -------------------------------------------------------------------------
+%% net_kernel distribution handshake in progress
+%%
+
+handshake(
+  SendParams, SendSeq,
+  #params{socket = Socket} = RecvParams, RecvSeq, Controller) ->
+    receive
+        {?MODULE, From, {controller, Controller_1, Parent}} ->
+            Result = link(Controller_1),
+            true = unlink(Parent),
+            reply(From, Result),
+            handshake(SendParams, SendSeq, RecvParams, RecvSeq, Controller_1);
+        {?MODULE, From, {handshake_complete, DistHandle}} ->
+            InputHandler =
+                monitor_dist_proc(
+                  spawn_opt(
+                    fun () ->
+                            link(Controller),
+                            receive
+                                DistHandle ->
+                                    ok =
+                                        inet:setopts(
+                                          Socket,
+                                          [{active, ?TCP_ACTIVE},
+                                           nodelay()]),
+                                    input_handler(
+                                      RecvParams#params{
+                                        dist_handle = DistHandle},
+                                      RecvSeq, empty_q(), infinity)
+                            end
+                    end,
+                    [link,
+                     {priority, normal},
+                     {message_queue_data, off_heap},
+                     {fullsweep_after, 0}])),
+            _ = monitor(process, InputHandler), % For the benchmark test
+            ok = gen_tcp:controlling_process(Socket, InputHandler),
+            ok = erlang:dist_ctrl_input_handler(DistHandle, InputHandler),
+            InputHandler ! DistHandle,
+            crypto:rand_seed_alg(crypto_cache),
+            reply(From, ok),
+            process_flag(priority, normal),
+            erlang:dist_ctrl_get_data_notification(DistHandle),
+            output_handler(
+              SendParams#params{dist_handle = DistHandle}, SendSeq);
+        %%
+        {?MODULE, From, {send, Data}} ->
+            case
+                encrypt_and_send_chunk(
+                  SendParams, SendSeq, [?HANDSHAKE_CHUNK, Data])
+            of
+                {SendParams_1, SendSeq_1, ok} ->
+                    reply(From, ok),
+                    handshake(
+                      SendParams_1, SendSeq_1, RecvParams, RecvSeq,
+                      Controller);
+                {_, _, Error} ->
+                    reply(From, {error, closed}),
+                    death_row({send, trace(Error)})
+            end;
+        {?MODULE, From, recv} ->
+            case recv_and_decrypt_chunk(RecvParams, RecvSeq) of
+                {RecvParams_1, RecvSeq_1, {ok, _} = Reply} ->
+                    reply(From, Reply),
+                    handshake(
+                      SendParams, SendSeq, RecvParams_1, RecvSeq_1,
+                      Controller);
+                {_, _, Error} ->
+                    reply(From, Error),
+                    death_row({recv, trace(Error)})
+            end;
+        {?MODULE, From, peername} ->
+            reply(From, inet:peername(Socket)),
+            handshake(SendParams, SendSeq, RecvParams, RecvSeq, Controller);
+        %%
+        _Alien ->
+            handshake(SendParams, SendSeq, RecvParams, RecvSeq, Controller)
+    end.
+
+recv_and_decrypt_chunk(#params{socket = Socket} = RecvParams, RecvSeq) ->
+    case gen_tcp:recv(Socket, 0) of
+        {ok, Chunk} ->
+            case decrypt_chunk(RecvParams, RecvSeq, Chunk) of
+                <<?HANDSHAKE_CHUNK, Cleartext/binary>> ->
+                    {RecvParams, RecvSeq + 1, {ok, Cleartext}};
+                OtherChunk when is_binary(OtherChunk) ->
+                    {RecvParams, RecvSeq + 1, {error, decrypt_error}};
+                #params{} = RecvParams_1 ->
+                    recv_and_decrypt_chunk(RecvParams_1, 0);
+                error ->
+                    {RecvParams, RecvSeq, {error, decrypt_error}}
+            end;
+        Error ->
+            {RecvParams, RecvSeq, Error}
+    end.
+
+%% -------------------------------------------------------------------------
+%% Output handler process
+%%
+%% The game here is to flush all dist_data and dist_tick messages,
+%% prioritize dist_data over dist_tick, and to not use selective receive
+
+output_handler(Params, Seq) ->
+    receive
+        Msg ->
+            case Msg of
+                dist_data ->
+                    output_handler_data(Params, Seq);
+                dist_tick ->
+                    output_handler_tick(Params, Seq);
+                Other ->
+                    %% Ignore
+                    _ = trace(Other),
+                    output_handler(Params, Seq)
+            end
+    end.
+
+output_handler_data(Params, Seq) ->
+    receive
+        Msg ->
+            case Msg of
+                dist_data ->
+                    output_handler_data(Params, Seq);
+                dist_tick ->
+                    output_handler_data(Params, Seq);
+                Other ->
+                    %% Ignore
+                    _ = trace(Other),
+                    output_handler_data(Params, Seq)
+            end
+    after 0 ->
+            DistHandle = Params#params.dist_handle,
+            Q = get_data(DistHandle, empty_q()),
+            {Params_1, Seq_1} = output_handler_send(Params, Seq, Q),
+            erlang:dist_ctrl_get_data_notification(DistHandle),
+            output_handler(Params_1, Seq_1)
+    end.
+
+output_handler_tick(Params, Seq) ->
+    receive
+        Msg ->
+            case Msg of
+                dist_data ->
+                    output_handler_data(Params, Seq);
+                dist_tick ->
+                    output_handler_tick(Params, Seq);
+                Other ->
+                    %% Ignore
+                    _ = trace(Other),
+                    output_handler_tick(Params, Seq)
+            end
+    after 0 ->
+            TickSize = 7 + rand:uniform(56),
+            TickData = binary:copy(<<0>>, TickSize),
+            case
+                encrypt_and_send_chunk(Params, Seq, [?TICK_CHUNK, TickData])
+            of
+                {Params_1, Seq_1, ok} ->
+                    output_handler(Params_1, Seq_1);
+                {_, _, Error} ->
+                    _ = trace(Error),
+                    death_row()
+            end
+    end.
+
+output_handler_send(Params, Seq, {_, Size, _} = Q) ->
+    if
+        ?CHUNK_SIZE < Size ->
+            output_handler_send(Params, Seq, Q, ?CHUNK_SIZE);
+        true ->
+            case get_data(Params#params.dist_handle, Q) of
+                {_, 0, _} ->
+                    {Params, Seq};
+                {_, Size, _} = Q_1 -> % Got no more
+                    output_handler_send(Params, Seq, Q_1, Size);
+                Q_1 ->
+                    output_handler_send(Params, Seq, Q_1)
+            end
+    end.
+
+output_handler_send(Params, Seq, Q, Size) ->
+    {Cleartext, Q_1} = deq_iovec(Size, Q),
+    case
+        encrypt_and_send_chunk(Params, Seq, [?DATA_CHUNK, Cleartext])
+    of
+        {Params_1, Seq_1, ok} ->
+            output_handler_send(Params_1, Seq_1, Q_1);
+        {_, _, Error} ->
+            _ = trace(Error),
+            death_row()
+    end.
+
+%% -------------------------------------------------------------------------
+%% Input handler process
+%%
+%% Here is T = 0|infinity to steer if we should try to receive
+%% more data or not; start with infinity, and when we get some
+%% data try with 0 to see if more is waiting
+
+input_handler(#params{socket = Socket} = Params, Seq, Q, T) ->
+    receive
+        Msg ->
+            case Msg of
+                {tcp_passive, Socket} ->
+                    ok = inet:setopts(Socket, [{active, ?TCP_ACTIVE}]),
+                    Q_1 =
+                        case T of
+                            0 ->
+                                deliver_data(Params#params.dist_handle, Q);
+                            infinity ->
+                                Q
+                        end,
+                    input_handler(Params, Seq, Q_1, infinity);
+                {tcp, Socket, Chunk} ->
+                    input_chunk(Params, Seq, Q, T, Chunk);
+                {tcp_closed, Socket} ->
+                    exit(connection_closed);
+                Other ->
+                    %% Ignore...
+                    _ = trace(Other),
+                    input_handler(Params, Seq, Q, T)
+            end
+    after T ->
+            Q_1 = deliver_data(Params#params.dist_handle, Q),
+            input_handler(Params, Seq, Q_1, infinity)
+    end.
+
+input_chunk(Params, Seq, Q, T, Chunk) ->
+    case decrypt_chunk(Params, Seq, Chunk) of
+        <<?DATA_CHUNK, Cleartext/binary>> ->
+            input_handler(Params, Seq + 1, enq_binary(Cleartext, Q), 0);
+        <<?TICK_CHUNK, _/binary>> ->
+            input_handler(Params, Seq + 1, Q, T);
+        OtherChunk when is_binary(OtherChunk) ->
+            _ = trace(invalid_chunk),
+            exit(connection_closed);
+        #params{} = Params_1 ->
+            input_handler(Params_1, 0, Q, T);
+        error ->
+            _ = trace(decrypt_error),
+            exit(connection_closed)
+    end.
+
+%% -------------------------------------------------------------------------
+%% erlang:dist_ctrl_* helpers
+
+%% Get data for sending from the VM and place it in a queue
+%%
+get_data(DistHandle, {Front, Size, Rear}) ->
+    get_data(DistHandle, Front, Size, Rear).
+%%
+get_data(DistHandle, Front, Size, Rear) ->
+    case erlang:dist_ctrl_get_data(DistHandle) of
+        none ->
+            {Front, Size, Rear};
+        Bin when is_binary(Bin)  ->
+            Len = byte_size(Bin),
+            get_data(
+              DistHandle, Front, Size + 4 + Len,
+              [Bin, <<Len:32>>|Rear]);
+        [Bin1, Bin2] ->
+            Len = byte_size(Bin1) + byte_size(Bin2),
+            get_data(
+              DistHandle, Front, Size + 4 + Len,
+              [Bin2, Bin1, <<Len:32>>|Rear]);
+        Iovec ->
+            Len = iolist_size(Iovec),
+            get_data(
+              DistHandle, Front, Size + 4 + Len,
+              lists:reverse(Iovec, [<<Len:32>>|Rear]))
+    end.
+
+%% De-packet and deliver received data to the VM from a queue
+%%
+deliver_data(DistHandle, Q) ->
+    case Q of
+        {[], Size, []} ->
+            Size = 0, % Assert
+            Q;
+        {[], Size, Rear} ->
+            [Bin|Front] = lists:reverse(Rear),
+            deliver_data(DistHandle, Front, Size, [], Bin);
+        {[Bin|Front], Size, Rear} ->
+            deliver_data(DistHandle, Front, Size, Rear, Bin)
+    end.
+%%
+deliver_data(DistHandle, Front, Size, Rear, Bin) ->
+    case Bin of
+        <<DataSizeA:32, DataA:DataSizeA/binary,
+          DataSizeB:32, DataB:DataSizeB/binary, Rest/binary>> ->
+            erlang:dist_ctrl_put_data(DistHandle, DataA),
+            erlang:dist_ctrl_put_data(DistHandle, DataB),
+            deliver_data(
+              DistHandle,
+              Front, Size - (4 + DataSizeA + 4 + DataSizeB), Rear,
+              Rest);
+        <<DataSize:32, Data:DataSize/binary, Rest/binary>> ->
+            erlang:dist_ctrl_put_data(DistHandle, Data),
+            deliver_data(DistHandle, Front, Size - (4 + DataSize), Rear, Rest);
+        <<DataSize:32, FirstData/binary>> ->
+            TotalSize = 4 + DataSize,
+            if
+                TotalSize =< Size ->
+                    BinSize = byte_size(Bin),
+                    {MoreData, Q} =
+                        deq_iovec(
+                          TotalSize - BinSize,
+                          Front, Size - BinSize, Rear),
+                    erlang:dist_ctrl_put_data(DistHandle, [FirstData|MoreData]),
+                    deliver_data(DistHandle, Q);
+                true -> % Incomplete data
+                    {[Bin|Front], Size, Rear}
+            end;
+        <<_/binary>> ->
+            BinSize = byte_size(Bin),
+            if
+                4 =< Size -> % Fragmented header - extract a header bin
+                    {RestHeader, {Front_1, _Size_1, Rear_1}} =
+                        deq_iovec(4 - BinSize, Front, Size - BinSize, Rear),
+                    Header = iolist_to_binary([Bin|RestHeader]),
+                    deliver_data(DistHandle, Front_1, Size, Rear_1, Header);
+                true -> % Incomplete header
+                    {[Bin|Front], Size, Rear}
+            end
+    end.
+
+%% -------------------------------------------------------------------------
+%% Encryption and decryption helpers
+
+encrypt_and_send_chunk(
+  #params{
+     socket = Socket,
+     rekey_interval = Seq,
+     rekey_key = PubKeyB,
+     key = Key,
+     iv = {IVSalt, IVNo},
+     hmac_algorithm = HmacAlgo} = Params,
+  Seq, Cleartext) ->
+    %%
+    KeyLen = byte_size(Key),
+    IVSaltLen = byte_size(IVSalt),
+    #key_pair{public = PubKeyA} = KeyPair = get_new_key_pair(),
+    case
+        gen_tcp:send(
+          Socket, encrypt_chunk(Params, Seq, [?REKEY_CHUNK, PubKeyA]))
+    of
+        ok ->
+            SharedSecret = compute_shared_secret(KeyPair, PubKeyB),
+            IV = <<(IVNo + Seq):48>>,
+            {Key_1, <<IVSalt_1:IVSaltLen/binary, IVNo_1:48>>} =
+                hmac_key_iv(
+                  HmacAlgo, SharedSecret, [Key, IVSalt, IV],
+                  KeyLen, IVSaltLen + 6),
+            Params_1 = Params#params{key = Key_1, iv = {IVSalt_1, IVNo_1}},
+            Result =
+                gen_tcp:send(Socket, encrypt_chunk(Params_1, 0, Cleartext)),
+            {Params_1, 1, Result};
+        SendError ->
+            {Params, Seq + 1, SendError}
+    end;
+encrypt_and_send_chunk(#params{socket = Socket} = Params, Seq, Cleartext) ->
+    Result = gen_tcp:send(Socket, encrypt_chunk(Params, Seq, Cleartext)),
+    {Params, Seq + 1, Result}.
+
+encrypt_chunk(
+  #params{
+     aead_cipher = AeadCipher,
+     iv = {IVSalt, IVNo}, key = Key, tag_len = TagLen}, Seq, Cleartext) ->
+    %%
+    ChunkLen = iolist_size(Cleartext) + TagLen,
+    AAD = <<Seq:32, ChunkLen:32>>,
+    IVBin = <<IVSalt/binary, (IVNo + Seq):48>>,
+    {Ciphertext, CipherTag} =
+        crypto:block_encrypt(AeadCipher, Key, IVBin, {AAD, Cleartext, TagLen}),
+    Chunk = [Ciphertext,CipherTag],
+    Chunk.
+
+decrypt_chunk(
+  #params{
+     aead_cipher = AeadCipher,
+     iv = {IVSalt, IVNo}, key = Key, tag_len = TagLen} = Params, Seq, Chunk) ->
+    %%
+    ChunkLen = byte_size(Chunk),
+    if
+        ChunkLen < TagLen ->
+            error;
+        true ->
+            AAD = <<Seq:32, ChunkLen:32>>,
+            IVBin = <<IVSalt/binary, (IVNo + Seq):48>>,
+            CiphertextLen = ChunkLen - TagLen,
+            case Chunk of
+                <<Ciphertext:CiphertextLen/binary,
+                  CipherTag:TagLen/binary>> ->
+                    block_decrypt(
+                      Params, Seq, AeadCipher, Key, IVBin,
+                      {AAD, Ciphertext, CipherTag});
+                _ ->
+                    error
+            end
+    end.
+
+block_decrypt(
+  #params{
+     rekey_key = #key_pair{public = PubKeyA} = KeyPair,
+     rekey_interval = RekeyInterval} = Params,
+  Seq, AeadCipher, Key, IV, Data) ->
+    %%
+    case crypto:block_decrypt(AeadCipher, Key, IV, Data) of
+        <<?REKEY_CHUNK, Rest/binary>> ->
+            PubKeyLen = byte_size(PubKeyA),
+            case Rest of
+                <<PubKeyB:PubKeyLen/binary>> ->
+                    SharedSecret = compute_shared_secret(KeyPair, PubKeyB),
+                    KeyLen = byte_size(Key),
+                    IVLen = byte_size(IV),
+                    IVSaltLen = IVLen - 6,
+                    {Key_1, <<IVSalt:IVSaltLen/binary, IVNo:48>>} =
+                        hmac_key_iv(
+                          Params#params.hmac_algorithm,
+                          SharedSecret, [Key, IV], KeyLen, IVLen),
+                    Params#params{iv = {IVSalt, IVNo}, key = Key_1};
+                _ ->
+                    error
+            end;
+        Chunk when is_binary(Chunk) ->
+            case Seq of
+                RekeyInterval ->
+                    %% This was one chunk too many without rekeying
+                    error;
+                _ ->
+                    Chunk
+            end;
+        error ->
+            error
+    end.
+
+%% -------------------------------------------------------------------------
+%% Queue of binaries i.e an iovec queue
+
+empty_q() ->
+    {[], 0, []}.
+
+enq_binary(Bin, {Front, Size, Rear}) ->
+    {Front, Size + byte_size(Bin), [Bin|Rear]}.
+
+deq_iovec(GetSize, {Front, Size, Rear}) when GetSize =< Size ->
+    deq_iovec(GetSize, Front, Size, Rear, []).
+%%
+deq_iovec(GetSize, Front, Size, Rear) ->
+    deq_iovec(GetSize, Front, Size, Rear, []).
+%%
+deq_iovec(GetSize, [], Size, Rear, Acc) ->
+    deq_iovec(GetSize, lists:reverse(Rear), Size, [], Acc);
+deq_iovec(GetSize, [Bin|Front], Size, Rear, Acc) ->
+    BinSize = byte_size(Bin),
+    if
+        BinSize < GetSize ->
+            deq_iovec(
+              GetSize - BinSize, Front, Size - BinSize, Rear, [Bin|Acc]);
+        GetSize < BinSize ->
+            {Bin1,Bin2} = erlang:split_binary(Bin, GetSize),
+            {lists:reverse(Acc, [Bin1]), {[Bin2|Front], Size - GetSize, Rear}};
+        true ->
+            {lists:reverse(Acc, [Bin]), {Front, Size - BinSize, Rear}}
+    end.
+
+%% -------------------------------------------------------------------------
+
+death_row() -> death_row(connection_closed).
+%%
+death_row(normal) -> death_row(connection_closed);
+death_row(Reason) -> receive after 5000 -> exit(Reason) end.
+
+%% -------------------------------------------------------------------------
+
+%% Trace point
+trace(Term) -> Term.
+
+%% Keep an eye on this Pid (debug)
+-ifndef(undefined).
+monitor_dist_proc(Pid) ->
+    Pid.
+-else.
+monitor_dist_proc(Pid) ->
+    spawn(
+      fun () ->
+              MRef = erlang:monitor(process, Pid),
+              receive
+                  {'DOWN', MRef, _, _, normal} ->
+                      error_logger:error_report(
+                        [dist_proc_died,
+                         {reason, normal},
+                         {pid, Pid}]);
+                  {'DOWN', MRef, _, _, Reason} ->
+                      error_logger:info_report(
+                        [dist_proc_died,
+                         {reason, Reason},
+                         {pid, Pid}])
+              end
+      end),
+    Pid.
+-endif.
+
+dbg() ->
+    dbg:stop(),
+    dbg:tracer(),
+    dbg:p(all, c),
+    dbg:tpl(?MODULE, trace, cx),
+    dbg:tpl(erlang, dist_ctrl_get_data_notification, cx),
+    dbg:tpl(erlang, dist_ctrl_get_data, cx),
+    dbg:tpl(erlang, dist_ctrl_put_data, cx),
+    ok.
diff --git a/lib/ssl/test/make_certs.erl b/lib/ssl/test/make_certs.erl
index 8fe7c54549..76bf0fa895 100644
--- a/lib/ssl/test/make_certs.erl
+++ b/lib/ssl/test/make_certs.erl
@@ -189,6 +189,18 @@ gencrl(Root, CA, C, CrlHours) ->
     Env = [{"ROOTDIR", filename:absname(Root)}], 
     cmd(Cmd, Env).
 
+%% This function sets the number of seconds until the next CRL is due.
+gencrl_sec(Root, CA, C, CrlSecs) ->
+    CACnfFile = filename:join([Root, CA, "ca.cnf"]),
+    CACRLFile = filename:join([Root, CA, "crl.pem"]),
+    Cmd = [C#config.openssl_cmd, " ca"
+	   " -gencrl ",
+	   " -crlsec ", integer_to_list(CrlSecs),
+	   " -out ", CACRLFile,
+	   " -config ", CACnfFile],
+    Env = [{"ROOTDIR", filename:absname(Root)}],
+    cmd(Cmd, Env).
+
 can_generate_expired_crls(C) ->
     %% OpenSSL can generate CRLs with an expiration date in the past,
     %% if we pass a negative number for -crlhours.  However, LibreSSL
@@ -365,7 +377,7 @@ req_cnf(Root, C) ->
      "default_bits	= ", integer_to_list(C#config.default_bits), "\n"
      "RANDFILE		= $ROOTDIR/RAND\n"
      "encrypt_key	= no\n"
-     "default_md	= md5\n"
+     "default_md	= sha1\n"
      "#string_mask	= pkix\n"
      "x509_extensions	= ca_ext\n"
      "prompt		= no\n"
@@ -415,7 +427,7 @@ ca_cnf(
      ["crl_extensions = crl_ext\n" || C#config.v2_crls],
      "unique_subject  = no\n"
      "default_days	= 3600\n"
-     "default_md	= md5\n"
+     "default_md	= sha1\n"
      "preserve	        = no\n"
      "policy		= policy_match\n"
      "\n"
@@ -499,7 +511,7 @@ ca_cnf(
      ["crl_extensions = crl_ext\n" || C#config.v2_crls],
      "unique_subject  = no\n"
      "default_days	= 3600\n"
-     "default_md	= md5\n"
+     "default_md	= sha1\n"
      "preserve	        = no\n"
      "policy		= policy_match\n"
      "\n"
diff --git a/lib/ssl/test/openssl_alpn_SUITE.erl b/lib/ssl/test/openssl_alpn_SUITE.erl
new file mode 100644
index 0000000000..5008dba922
--- /dev/null
+++ b/lib/ssl/test/openssl_alpn_SUITE.erl
@@ -0,0 +1,421 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019-2019. 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(openssl_alpn_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+-define(OPENSSL_QUIT, "Q\n").
+-define(OPENSSL_RENEGOTIATE, "R\n").
+-define(SLEEP, 1000).
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+
+all() ->
+    %% Note: ALPN not supported in sslv3
+    case ssl_test_lib:openssl_sane_dtls_alpn() of 
+        true ->
+            [
+             {group, 'tlsv1.3'},
+             {group, 'tlsv1.2'},
+             {group, 'tlsv1.1'},
+             {group, 'tlsv1'},
+             {group, 'dtlsv1.2'},
+             {group, 'dtlsv1'}];
+        false ->
+            [{group, 'tlsv1.2'},
+             {group, 'tlsv1.1'},
+             {group, 'tlsv1'}]
+    end.
+
+groups() ->
+    case ssl_test_lib:openssl_sane_dtls_alpn() of 
+        true ->             
+            [
+             {'tlsv1.3', [], alpn_tests()},
+             {'tlsv1.2', [], alpn_tests() ++ alpn_npn_coexist() ++ rengotiation_tests()},
+             {'tlsv1.1', [], alpn_tests() ++ alpn_npn_coexist() ++ rengotiation_tests()},
+             {'tlsv1', [], alpn_tests() ++ alpn_npn_coexist() ++ rengotiation_tests()},
+             {'dtlsv1.2', [], alpn_tests()},
+             {'dtlsv1', [], alpn_tests()}
+            ];
+         false ->
+            [
+             {'tlsv1.3', [], alpn_tests()},
+             {'tlsv1.2', [], alpn_tests() ++ alpn_npn_coexist() ++ rengotiation_tests()},
+             {'tlsv1.1', [], alpn_tests() ++ alpn_npn_coexist() ++ rengotiation_tests()},
+             {'tlsv1', [], alpn_tests() ++ alpn_npn_coexist() ++ rengotiation_tests()}
+            ]
+     end.
+ 
+alpn_tests() ->
+    [erlang_client_alpn_openssl_server_alpn,
+     erlang_server_alpn_openssl_client_alpn,
+     erlang_client_alpn_openssl_server,
+     erlang_client_openssl_server_alpn,
+     erlang_server_alpn_openssl_client,
+     erlang_server_openssl_client_alpn].
+
+alpn_npn_coexist() ->
+    [
+     erlang_client_alpn_npn_openssl_server_alpn_npn,
+     erlang_server_alpn_npn_openssl_client_alpn_npn  
+    ].
+rengotiation_tests() ->
+    case ssl_test_lib:sane_openssl_alpn_npn_renegotiate() of
+        true ->
+            [erlang_client_alpn_openssl_server_alpn_renegotiate,
+             erlang_server_alpn_openssl_client_alpn_renegotiate];
+        false ->
+            []
+    end.
+init_per_suite(Config0) ->
+    case os:find_executable("openssl") of
+        false ->
+            {skip, "Openssl not found"};
+        _ ->
+            case check_openssl_alpn_support(Config0) of
+                {skip, _} = Skip ->
+                    Skip;
+                _ ->
+                    ct:pal("Version: ~p", [os:cmd("openssl version")]),
+                    catch crypto:stop(),
+                    try crypto:start() of
+                        ok ->
+                            ssl_test_lib:clean_start(),
+                            ssl_test_lib:make_rsa_cert(Config0)
+                    catch _:_  ->
+                            {skip, "Crypto did not start"}
+                    end
+            end
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:stop(crypto),
+    ssl_test_lib:kill_openssl().
+
+init_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+        true ->
+            case ssl_test_lib:supports_ssl_tls_version(GroupName) of
+                 true ->
+                    case ssl_test_lib:check_sane_openssl_version(GroupName) of
+                         true ->
+                            ssl_test_lib:init_tls_version(GroupName, Config);
+                         false ->
+                            {skip, openssl_does_not_support_version}
+                    end;
+                false ->
+                    {skip, openssl_does_not_support_version}
+            end; 
+         _ ->
+            Config
+    end.
+
+end_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+        true ->
+            ssl_test_lib:clean_tls_version(Config);
+       false ->
+            Config
+    end.
+
+init_per_testcase(TestCase, Config) -> 
+    ct:timetrap({seconds, 10}),
+    special_init(TestCase, Config).
+
+special_init(TestCase, Config)
+     when TestCase == erlang_client_alpn_openssl_server_alpn_renegotiate;
+          TestCase == erlang_server_alpn_openssl_client_alpn_renegotiate ->
+     {ok, Version} = application:get_env(ssl, protocol_version),
+    ssl_test_lib:check_sane_openssl_renegotaite(Config, Version);
+special_init(TestCase, Config)
+  when TestCase == erlang_client_alpn_npn_openssl_server_alpn_npn;
+       TestCase == erlang_server_alpn_npn_openssl_client_alpn_npn ->
+    ssl_test_lib:check_openssl_npn_support(Config);
+special_init(_, Config) ->
+     Config.
+
+end_per_testcase(_, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+erlang_client_alpn_openssl_server_alpn(Config) when is_list(Config) ->
+    Data = "From openssl to erlang",
+    start_erlang_client_and_openssl_server_for_alpn_negotiation(Config, Data, fun(Client, OpensslPort) ->
+                                                                                      true = port_command(OpensslPort, Data),
+                                                                                      ssl_test_lib:check_result(Client, Data)
+                                                                              end).
+
+%%--------------------------------------------------------------------
+
+erlang_server_alpn_openssl_client_alpn(Config) when is_list(Config) ->
+    Data = "From openssl to erlang",
+    start_erlang_server_and_openssl_client_for_alpn_negotiation(Config, Data, fun(Client, OpensslPort) ->
+                                                                                      true = port_command(OpensslPort, Data),
+                                                                                      ssl_test_lib:check_result(Client, Data)
+                                                                              end).
+
+%%--------------------------------------------------------------------------
+
+erlang_client_alpn_openssl_server(Config) when is_list(Config) ->
+    Data = "From openssl to erlang",
+    ssl_test_lib:start_erlang_client_and_openssl_server_with_opts(Config,
+                                                                  [{alpn_advertised_protocols, [<<"spdy/2">>]}],
+                                                                  [],
+                                                                  Data, fun(Client, OpensslPort) ->
+                                                                                true = port_command(OpensslPort, Data),
+                                                                                ssl_test_lib:check_result(Client, Data)
+                                                                        end).
+
+%%--------------------------------------------------------------------------
+
+erlang_client_openssl_server_alpn(Config) when is_list(Config) ->
+    Data = "From openssl to erlang",
+    ssl_test_lib:start_erlang_client_and_openssl_server_with_opts(Config,
+                                                                  [],
+                                                                  ["-alpn", "spdy/2"],
+                                                                  Data, fun(Client, OpensslPort) ->
+                                                                                true = port_command(OpensslPort, Data),
+                                                                                ssl_test_lib:check_result(Client, Data)
+                                                                        end).
+
+%%--------------------------------------------------------------------------
+
+erlang_server_alpn_openssl_client(Config) when is_list(Config) ->
+    Data = "From openssl to erlang",
+    ssl_test_lib:start_erlang_server_and_openssl_client_with_opts(Config,
+						     [{alpn_preferred_protocols, [<<"spdy/2">>]}],
+                                                                  [],
+                                                                  Data, fun(Server, OpensslPort) ->
+                                                                                true = port_command(OpensslPort, Data),
+                                                                                ssl_test_lib:check_result(Server, Data)
+                                                                        end).
+
+%%--------------------------------------------------------------------------
+
+erlang_server_openssl_client_alpn(Config) when is_list(Config) ->
+    Data = "From openssl to erlang",
+    ssl_test_lib:start_erlang_server_and_openssl_client_with_opts(Config,
+                                                                  [],
+                                                                  ["-alpn", "spdy/2"],
+                                                                  Data, fun(Server, OpensslPort) ->
+                                                                                true = port_command(OpensslPort, Data),
+                                                                                ssl_test_lib:check_result(Server, Data)
+                                                                        end).
+
+%%--------------------------------------------------------------------
+
+erlang_client_alpn_openssl_server_alpn_renegotiate(Config) when is_list(Config) ->
+    Data = "From openssl to erlang",
+    start_erlang_client_and_openssl_server_for_alpn_negotiation(Config, Data, fun(Client, OpensslPort) ->
+                                                                                      true = port_command(OpensslPort, ?OPENSSL_RENEGOTIATE),
+                                                                                      ct:sleep(?SLEEP),
+                                                                                      true = port_command(OpensslPort, Data),
+                                                                                      ssl_test_lib:check_result(Client, Data)
+                                                                              end).
+
+%%--------------------------------------------------------------------
+
+erlang_server_alpn_openssl_client_alpn_renegotiate(Config) when is_list(Config) ->
+    Data = "From openssl to erlang",
+    start_erlang_server_and_openssl_client_for_alpn_negotiation(Config, Data, fun(Server, OpensslPort) ->
+                                                                                      true = port_command(OpensslPort, ?OPENSSL_RENEGOTIATE),
+                                                                                      ct:sleep(?SLEEP),
+                                                                                      true = port_command(OpensslPort, Data),
+                                                                                      ssl_test_lib:check_result(Server, Data)
+                                                                              end).
+
+%%--------------------------------------------------------------------
+
+erlang_client_alpn_npn_openssl_server_alpn_npn(Config) when is_list(Config) ->
+    Data = "From openssl to erlang",
+    start_erlang_client_and_openssl_server_for_alpn_npn_negotiation(Config, Data, fun(Client, OpensslPort) ->
+                                                                                          true = port_command(OpensslPort, Data),
+                                                                                          ssl_test_lib:check_result(Client, Data)
+                                                                                  end).
+
+%%--------------------------------------------------------------------
+
+erlang_server_alpn_npn_openssl_client_alpn_npn(Config) when is_list(Config) ->
+    Data = "From openssl to erlang",
+    start_erlang_server_and_openssl_client_for_alpn_npn_negotiation(Config, Data, fun(Server, OpensslPort) ->
+                                                                                          true = port_command(OpensslPort, Data),
+                                                                                          ssl_test_lib:check_result(Server, Data)
+                                                                                  end).
+
+
+%%--------------------------------------------------------------------
+%% Internal functions  -----------------------------------------------
+%%--------------------------------------------------------------------
+check_openssl_alpn_support(Config) ->
+    HelpText = os:cmd("openssl s_client --help"),
+    case string:str(HelpText, "alpn") of
+        0 ->
+            {skip, "Openssl not compiled with alpn support"};
+        _ ->
+            Config
+    end.
+
+start_erlang_client_and_openssl_server_for_alpn_negotiation(Config, Data, Callback) ->
+    process_flag(trap_exit, true),
+    ServerOpts = proplists:get_value(server_rsa_verify_opts, Config),
+    ClientOpts0 =  ssl_test_lib:ssl_options(client_rsa_verify_opts, Config),
+    ClientOpts = [{alpn_advertised_protocols, [<<"spdy/2">>]} | ClientOpts0],
+
+    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
+
+    Data = "From openssl to erlang",
+
+    Port = ssl_test_lib:inet_port(node()),
+    CaCertFile = proplists:get_value(cacertfile, ServerOpts),
+    CertFile = proplists:get_value(certfile, ServerOpts),
+    KeyFile = proplists:get_value(keyfile, ServerOpts),
+    Version = ssl_test_lib:protocol_version(Config),
+
+    Exe = "openssl",
+    Args = ["s_server", "-msg", "-alpn", "http/1.1,spdy/2", "-accept", 
+            integer_to_list(Port), ssl_test_lib:version_flag(Version),
+            "-CAfile", CaCertFile,
+	    "-cert", CertFile, "-key", KeyFile],
+    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, {ssl_test_lib,
+                           erlang_ssl_receive_and_assert_negotiated_protocol, [<<"spdy/2">>, Data]}},
+                    {options,  [{reuse_sessions, false} | ClientOpts]}]),
+
+    Callback(Client, OpensslPort),
+
+    %% 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).
+
+start_erlang_server_and_openssl_client_for_alpn_negotiation(Config, Data, Callback) ->
+    process_flag(trap_exit, true),
+    ServerOpts0 =  ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    ServerOpts = [{alpn_preferred_protocols, [<<"spdy/2">>]} | ServerOpts0],
+
+    {_, ServerNode, _} = ssl_test_lib:run_where(Config),
+
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+                    {from, self()},
+                    {mfa, {ssl_test_lib, erlang_ssl_receive_and_assert_negotiated_protocol, [<<"spdy/2">>, Data]}},
+                    {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Version = ssl_test_lib:protocol_version(Config),
+
+    Exe = "openssl",
+    Args = ["s_client", "-alpn", "http/1.0,spdy/2", "-msg", "-port", 
+	    integer_to_list(Port), ssl_test_lib:version_flag(Version),
+	    "-host", "localhost"],
+
+    OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args),  
+
+    Callback(Server, OpenSslPort),
+
+    ssl_test_lib:close(Server),
+
+    ssl_test_lib:close_port(OpenSslPort),
+    process_flag(trap_exit, false).
+
+start_erlang_client_and_openssl_server_for_alpn_npn_negotiation(Config, Data, Callback) ->
+    process_flag(trap_exit, true),
+    ServerOpts = proplists:get_value(server_rsa_verify_opts, Config),
+    ClientOpts0 =  ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ClientOpts = [{alpn_advertised_protocols, [<<"spdy/2">>]},
+        {client_preferred_next_protocols, {client, [<<"spdy/3">>, <<"http/1.1">>]}} | ClientOpts0],
+
+    {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", "-msg", "-alpn", "http/1.1,spdy/2", "-nextprotoneg", 
+	    "spdy/3", "-accept", integer_to_list(Port), ssl_test_lib:version_flag(Version),
+	    "-cert", CertFile, "-key",  KeyFile],
+
+    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, {ssl_test_lib,
+                           erlang_ssl_receive_and_assert_negotiated_protocol, [<<"spdy/2">>, Data]}},
+                    {options, [{reuse_sessions, false} | ClientOpts]}]),
+
+    Callback(Client, OpensslPort),
+
+    %% 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).
+
+start_erlang_server_and_openssl_client_for_alpn_npn_negotiation(Config, Data, Callback) ->
+    process_flag(trap_exit, true),
+    ServerOpts0 = ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
+    ServerOpts = [{alpn_preferred_protocols, [<<"spdy/2">>]},
+                  {next_protocols_advertised, [<<"spdy/3">>, <<"http/1.1">>]} | ServerOpts0],
+
+    {_, ServerNode, _} = ssl_test_lib:run_where(Config),
+
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+                                        {from, self()},
+                                        {mfa, {ssl_test_lib, erlang_ssl_receive_and_assert_negotiated_protocol, [<<"spdy/2">>, Data]}},
+                                        {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Version = ssl_test_lib:protocol_version(Config),
+    Exe = "openssl",
+    Args = ["s_client", "-alpn", "http/1.1,spdy/2", "-nextprotoneg", "spdy/3", 
+	    "-msg", "-port", integer_to_list(Port), ssl_test_lib:version_flag(Version),
+	    "-host", "localhost"],
+    OpenSslPort =  ssl_test_lib:portable_open_port(Exe, Args),  
+
+    Callback(Server, OpenSslPort),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close_port(OpenSslPort),
+    process_flag(trap_exit, false).
+
diff --git a/lib/ssl/test/openssl_cipher_suite_SUITE.erl b/lib/ssl/test/openssl_cipher_suite_SUITE.erl
new file mode 100644
index 0000000000..955eb914c0
--- /dev/null
+++ b/lib/ssl/test/openssl_cipher_suite_SUITE.erl
@@ -0,0 +1,801 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019-2019. 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(openssl_cipher_suite_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+all() -> 
+    [
+     {group,  openssl_server},
+     {group,  openssl_client}
+    ].
+
+all_protocol_groups() ->
+    [{group, 'tlsv1.2'},
+     {group, 'tlsv1.1'},
+     {group, 'tlsv1'},
+     {group, 'sslv3'},
+     {group, 'dtlsv1.2'},
+     {group, 'dtlsv1'}
+     ].
+
+groups() ->
+    %% TODO: Enable SRP, PSK suites (needs OpenSSL s_server conf)
+    %% TODO: Enable all "kex" on DTLS
+    [
+     {openssl_server, all_protocol_groups()},
+     {openssl_client, all_protocol_groups()},
+     {'tlsv1.2', [], kex()},
+     {'tlsv1.1', [], kex()},
+     {'tlsv1', [], kex()},
+     {'sslv3', [], kex()},
+     {'dtlsv1.2', [], dtls_kex()},
+     {'dtlsv1', [], dtls_kex()},
+     {dhe_rsa, [],[dhe_rsa_3des_ede_cbc, 
+                   dhe_rsa_aes_128_cbc,
+                   dhe_rsa_aes_256_cbc,
+                   dhe_rsa_chacha20_poly1305
+                  ]},
+     {ecdhe_rsa, [], [ecdhe_rsa_3des_ede_cbc, 
+                      ecdhe_rsa_aes_128_cbc,
+                      ecdhe_rsa_aes_128_gcm,
+                      ecdhe_rsa_aes_256_cbc,
+                      ecdhe_rsa_aes_256_gcm,
+                      ecdhe_rsa_chacha20_poly1305
+                    ]},
+     {ecdhe_ecdsa, [],[ecdhe_ecdsa_rc4_128, 
+                       ecdhe_ecdsa_3des_ede_cbc, 
+                       ecdhe_ecdsa_aes_128_cbc,
+                       ecdhe_ecdsa_aes_128_gcm,
+                       ecdhe_ecdsa_aes_256_cbc,
+                       ecdhe_ecdsa_aes_256_gcm,
+                       ecdhe_ecdsa_chacha20_poly1305
+                      ]},
+     {rsa, [], [rsa_3des_ede_cbc, 
+                rsa_aes_128_cbc,
+                rsa_aes_256_cbc,
+                rsa_rc4_128
+               ]},
+     {dhe_dss, [], [dhe_dss_3des_ede_cbc, 
+                    dhe_dss_aes_128_cbc,
+                    dhe_dss_aes_256_cbc]},
+     %% {srp_rsa, [], [srp_rsa_3des_ede_cbc, 
+     %%                srp_rsa_aes_128_cbc,
+     %%                srp_rsa_aes_256_cbc]},
+     %% {srp_dss, [], [srp_dss_3des_ede_cbc, 
+     %%                srp_dss_aes_128_cbc,
+     %%                srp_dss_aes_256_cbc]},
+     %% {rsa_psk, [], [rsa_psk_3des_ede_cbc,                    
+     %%                rsa_psk_rc4_128,
+     %%                rsa_psk_aes_128_cbc,
+     %%                rsa_psk_aes_256_cbc
+     %%               ]},
+     {dh_anon, [], [dh_anon_rc4_128,
+                    dh_anon_3des_ede_cbc, 
+                    dh_anon_aes_128_cbc,
+                    dh_anon_aes_128_gcm,
+                    dh_anon_aes_256_cbc,
+                    dh_anon_aes_256_gcm]},
+     {ecdh_anon, [], [ecdh_anon_3des_ede_cbc, 
+                      ecdh_anon_aes_128_cbc,
+                      ecdh_anon_aes_256_cbc
+                     ]}    
+     %% {srp_anon, [], [srp_anon_3des_ede_cbc, 
+     %%                 srp_anon_aes_128_cbc,
+     %%                 srp_anon_aes_256_cbc]},
+     %% {psk, [], [psk_3des_ede_cbc,                    
+     %%            psk_rc4_128,
+     %%            psk_aes_128_cbc,
+     %%            psk_aes_128_ccm,
+     %%            psk_aes_128_ccm_8,
+     %%            psk_aes_256_cbc,
+     %%            psk_aes_256_ccm,
+     %%            psk_aes_256_ccm_8
+     %%           ]},
+     %% {dhe_psk, [], [dhe_psk_3des_ede_cbc,                    
+     %%                dhe_psk_rc4_128,
+     %%                dhe_psk_aes_128_cbc,
+     %%                dhe_psk_aes_128_ccm,
+     %%                dhe_psk_aes_128_ccm_8,
+     %%                dhe_psk_aes_256_cbc,
+     %%                dhe_psk_aes_256_ccm,
+     %%                dhe_psk_aes_256_ccm_8
+     %%           ]},
+     %% {ecdhe_psk, [], [ecdhe_psk_3des_ede_cbc,                    
+     %%                 ecdhe_psk_rc4_128,
+     %%                 ecdhe_psk_aes_128_cbc,
+     %%                 ecdhe_psk_aes_128_ccm,
+     %%                 ecdhe_psk_aes_128_ccm_8,
+     %%                 ecdhe_psk_aes_256_cbc
+     %%           ]}
+    ].
+
+kex() ->
+     rsa() ++ ecdsa() ++ dss() ++ anonymous().
+
+dtls_kex() -> %% Should be all kex in the future
+      dtls_rsa() ++ dss() ++ anonymous().
+
+ssl3_kex() ->
+    ssl3_rsa() ++ ssl3_dss() ++ ssl3_anonymous().
+
+rsa() ->
+    [{group, dhe_rsa},
+     {group, ecdhe_rsa},
+     {group, rsa} %%, {group, srp_rsa},
+     %%{group, rsa_psk}
+    ].
+
+dtls_rsa() ->
+    [
+     {group, rsa} 
+     %%,{group, rsa_psk}
+    ].
+
+ssl3_rsa() ->
+    [{group, dhe_rsa},
+     {group, rsa}
+    ].
+
+ecdsa() ->
+    [{group, ecdhe_ecdsa}].
+    
+dss() ->
+    [{group, dhe_dss}
+     %%{group, srp_dss}
+    ].
+
+ssl3_dss() ->
+    [{group, dhe_dss}
+    ].
+
+anonymous() ->
+    [{group, dh_anon},
+     {group, ecdh_anon}
+     %% {group, psk},
+     %%{group, dhe_psk},
+     %%{group, ecdhe_psk}
+     %%{group, srp_anon}
+    ].
+
+ssl3_anonymous() ->
+    [{group, dh_anon}].
+
+init_per_suite(Config) ->
+    catch crypto:stop(),
+    try crypto:start() of
+	ok ->
+	    ssl_test_lib:clean_start(),
+            Config
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:stop(crypto),
+    ssl_test_lib:kill_openssl().
+
+%%--------------------------------------------------------------------
+init_per_group(GroupName, Config) ->
+       case ssl_test_lib:is_tls_version(GroupName) of
+           true ->
+               case ssl_test_lib:supports_ssl_tls_version(GroupName) of
+                   true ->
+                       case ssl_test_lib:check_sane_openssl_version(GroupName) of
+                           true ->
+                               ssl_test_lib:init_tls_version(GroupName, Config),
+                               do_init_per_group(GroupName, Config);
+                           false ->
+                               {skip, openssl_does_not_support_version}
+                       end;
+                   false ->
+                       {skip, {openssl_does_not_support, GroupName}}
+               end;  
+           false ->
+               do_init_per_group(GroupName, Config)
+       end.
+do_init_per_group(openssl_client, Config0) ->
+    Config = proplists:delete(server_type, proplists:delete(client_type, Config0)),
+    [{client_type, openssl}, {server_type, erlang} | Config];
+do_init_per_group(openssl_server, Config0) ->
+    Config = proplists:delete(server_type, proplists:delete(client_type, Config0)),
+    [{client_type, erlang}, {server_type, openssl} | Config];    
+do_init_per_group(GroupName, Config) when GroupName == ecdh_anon;
+                                       GroupName == ecdhe_rsa;
+                                       GroupName == ecdhe_psk ->
+    case proplists:get_bool(ecdh, proplists:get_value(public_keys, crypto:supports())) of
+        true ->
+            init_certs(GroupName, Config);
+        false ->
+            {skip, "Missing EC crypto support"}
+    end;
+do_init_per_group(ecdhe_ecdsa = GroupName, Config) ->
+    PKAlg = proplists:get_value(public_keys, crypto:supports()),
+    case lists:member(ecdh, PKAlg) andalso lists:member(ecdsa, PKAlg) of
+        true ->
+            init_certs(GroupName, Config);
+        false ->
+            {skip, "Missing EC crypto support"}
+    end;
+do_init_per_group(dhe_dss = GroupName, Config) ->
+    PKAlg = proplists:get_value(public_keys, crypto:supports()),
+    case lists:member(dss, PKAlg) andalso lists:member(dh, PKAlg) of
+        true ->
+            init_certs(GroupName, Config);
+        false ->
+            {skip, "Missing DSS crypto support"}
+    end;
+do_init_per_group(srp_dss = GroupName, Config) ->
+    PKAlg = proplists:get_value(public_keys, crypto:supports()),
+    case lists:member(dss, PKAlg) andalso lists:member(srp, PKAlg) of
+        true ->
+            init_certs(GroupName, Config);
+        false ->
+            {skip, "Missing DSS_SRP crypto support"}
+    end;
+do_init_per_group(GroupName, Config) when GroupName == srp_anon;
+                                       GroupName == srp_rsa ->
+    PKAlg = proplists:get_value(public_keys, crypto:supports()),
+    case lists:member(srp, PKAlg) of
+        true ->
+            init_certs(GroupName, Config);
+        false ->
+            {skip, "Missing SRP crypto support"}
+    end;
+do_init_per_group(dhe_psk = GroupName, Config) ->
+    PKAlg = proplists:get_value(public_keys, crypto:supports()),
+    case lists:member(dh, PKAlg) of
+        true ->
+            init_certs(GroupName, Config);
+        false ->
+            {skip, "Missing SRP crypto support"}
+    end;
+do_init_per_group(GroupName, Config0) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+        true ->
+            ssl_test_lib:init_tls_version(GroupName, end_per_group(GroupName, Config0));
+        false ->
+            init_certs(GroupName, Config0)
+    end.
+  
+end_per_group(GroupName, Config) ->
+  case ssl_test_lib:is_tls_version(GroupName) of
+      true ->
+          ssl_test_lib:clean_tls_version(Config);
+      false ->
+          Config
+  end.
+
+init_per_testcase(TestCase, Config) when TestCase == psk_3des_ede_cbc;
+                                         TestCase == srp_anon_3des_ede_cbc;
+                                         TestCase == dhe_psk_3des_ede_cbc;
+                                         TestCase == ecdhe_psk_3des_ede_cbc;
+                                         TestCase == srp_rsa_3des_ede_cbc;
+                                         TestCase == srp_dss_3des_ede_cbc;
+                                         TestCase == rsa_psk_3des_ede_cbc;
+                                         TestCase == rsa_3des_ede_cbc;
+                                         TestCase == dhe_rsa_3des_ede_cbc;
+                                         TestCase == dhe_dss_3des_ede_cbc;
+                                         TestCase == ecdhe_rsa_3des_ede_cbc;
+                                         TestCase == srp_anon_dss_3des_ede_cbc;
+                                         TestCase == dh_anon_3des_ede_cbc;
+                                         TestCase == ecdh_anon_3des_ede_cbc;
+                                         TestCase == ecdhe_ecdsa_3des_ede_cbc ->
+    SupCiphers = proplists:get_value(ciphers, crypto:supports()),
+    case lists:member(des_ede3, SupCiphers) of
+        true ->
+            ct:timetrap({seconds, 5}),
+            Config;
+        _ ->
+            {skip, "Missing 3DES crypto support"}
+    end;
+init_per_testcase(TestCase, Config) when TestCase == psk_rc4_128;
+                                         TestCase == ecdhe_psk_rc4_128;
+                                         TestCase == dhe_psk_rc4_128;
+                                         TestCase == rsa_psk_rc4_128;
+                                         TestCase == rsa_rc4_128;
+                                         TestCase == ecdhe_rsa_rc4_128;
+                                         TestCase == ecdhe_ecdsa_rc4_128;
+                                         TestCase == dh_anon_rc4_128 ->
+    SupCiphers = proplists:get_value(ciphers, crypto:supports()),
+    case lists:member(rc4, SupCiphers) of
+        true ->
+            ct:timetrap({seconds, 5}),
+            Config;
+        _ ->
+            {skip, "Missing RC4 crypto support"}
+    end;
+init_per_testcase(TestCase, Config) when  TestCase == psk_aes_128_ccm_8;
+                                          TestCase == rsa_psk_aes_128_ccm_8;
+                                          TestCase == psk_aes_128_ccm_8;
+                                          TestCase == dhe_psk_aes_128_ccm_8;
+                                          TestCase == ecdhe_psk_aes_128_ccm_8 ->
+    SupCiphers = proplists:get_value(ciphers, crypto:supports()),
+    case lists:member(aes_128_ccm, SupCiphers) of
+        true ->
+            ct:timetrap({seconds, 5}),
+            Config;
+        _ ->
+            {skip, "Missing AES_128_CCM crypto support"}
+    end;
+init_per_testcase(TestCase, Config) when TestCase == psk_aes_256_ccm_8;
+                                         TestCase == rsa_psk_aes_256_ccm_8;
+                                         TestCase == psk_aes_256_ccm_8;
+                                         TestCase == dhe_psk_aes_256_ccm_8;
+                                         TestCase == ecdhe_psk_aes_256_ccm_8 ->
+    SupCiphers = proplists:get_value(ciphers, crypto:supports()),
+    case lists:member(aes_256_ccm, SupCiphers) of
+        true ->
+            ct:timetrap({seconds, 5}),
+            Config;
+        _ ->
+            {skip, "Missing AES_256_CCM crypto support"}
+    end;
+init_per_testcase(TestCase, Config) ->
+    Cipher = ssl_test_lib:test_cipher(TestCase, Config),
+    SupCiphers = proplists:get_value(ciphers, crypto:supports()),
+    case lists:member(Cipher, SupCiphers) of
+        true ->
+            ct:timetrap({seconds, 5}),
+            Config;
+        _ ->
+            {skip, {Cipher, SupCiphers}}
+    end.
+
+end_per_testcase(_TestCase, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Initializtion ------------------------------------------
+%%--------------------------------------------------------------------
+init_certs(srp_rsa, Config) ->
+    {ClientOpts, ServerOpts} = ssl_test_lib:make_rsa_cert_chains([{server_chain, ssl_test_lib:default_cert_chain_conf()},
+                                                                  {client_chain, ssl_test_lib:default_cert_chain_conf()}],
+                                                                 Config, ""),
+    [{tls_config, #{server_config => [{user_lookup_fun, {fun ssl_test_lib:user_lookup/3, undefined}} | ServerOpts],
+                    client_config => [{srp_identity, {"Test-User", "secret"}} | ClientOpts]}} |
+     proplists:delete(tls_config, Config)];
+init_certs(srp_anon, Config) ->
+    [{tls_config, #{server_config => [{user_lookup_fun, {fun ssl_test_lib:user_lookup/3, undefined}}],
+                    client_config => [{srp_identity, {"Test-User", "secret"}}]}} |
+     proplists:delete(tls_config, Config)];
+init_certs(rsa_psk, Config) ->
+    Ext = x509_test:extensions([{key_usage, [digitalSignature, keyEncipherment]}]),
+    {ClientOpts, ServerOpts} = ssl_test_lib:make_rsa_cert_chains([{server_chain, 
+                                                                   [[ssl_test_lib:digest()],[ssl_test_lib:digest()],
+                                                                    [ssl_test_lib:digest(), {extensions, Ext}]]},
+                                                                  {client_chain, ssl_test_lib:default_cert_chain_conf()}], 
+                                                                 Config, "_peer_keyEncipherment"),
+    PskSharedSecret = <<1,2,3,4,5,6,7,8,9,10,11,12,13,14,15>>,
+    [{tls_config, #{server_config => [{user_lookup_fun, {fun ssl_test_lib:user_lookup/3, PskSharedSecret}} | ServerOpts],
+                    client_config => [{psk_identity, "Test-User"},
+                                      {user_lookup_fun, {fun ssl_test_lib:user_lookup/3, PskSharedSecret}} | ClientOpts]}} |
+     proplists:delete(tls_config, Config)];
+init_certs(rsa, Config) ->
+    Ext = x509_test:extensions([{key_usage, [digitalSignature, keyEncipherment]}]),
+    {ClientOpts, ServerOpts} = ssl_test_lib:make_rsa_cert_chains([{server_chain, 
+                                                                   [[ssl_test_lib:digest()],[ssl_test_lib:digest()],
+                                                                    [ssl_test_lib:digest(), {extensions, Ext}]]} 
+                                                                 ], 
+                                                                 Config, "_peer_keyEncipherment"),
+    [{tls_config, #{server_config => ServerOpts,
+                    client_config => ClientOpts}} |
+     proplists:delete(tls_config, Config)];
+init_certs(dhe_dss, Config) ->
+     {ClientOpts, ServerOpts} = ssl_test_lib:make_dsa_cert_chains([{server_chain, ssl_test_lib:default_cert_chain_conf()},
+                                                                  {client_chain, ssl_test_lib:default_cert_chain_conf()}], 
+                                                                  Config, ""),
+    [{tls_config, #{server_config => ServerOpts,
+                    client_config => ClientOpts}} |
+     proplists:delete(tls_config, Config)];
+init_certs(srp_dss, Config) ->
+    {ClientOpts, ServerOpts} = ssl_test_lib:make_dsa_cert_chains([{server_chain, ssl_test_lib:default_cert_chain_conf()},
+                                                                  {client_chain, ssl_test_lib:default_cert_chain_conf()}], 
+                                                                 Config, ""),
+    [{tls_config, #{server_config => [{user_lookup_fun, {fun ssl_test_lib:user_lookup/3, undefined}} | ServerOpts],
+                    client_config => [{srp_identity, {"Test-User", "secret"}} | ClientOpts]}} |
+       proplists:delete(tls_config, Config)];
+init_certs(GroupName, Config) when GroupName == dhe_rsa;
+                                   GroupName == ecdhe_rsa ->
+    {ClientOpts, ServerOpts} = ssl_test_lib:make_rsa_cert_chains([{server_chain, ssl_test_lib:default_cert_chain_conf()},
+                                                                  {client_chain, ssl_test_lib:default_cert_chain_conf()}], 
+                                                                 Config, ""),
+    [{tls_config, #{server_config => ServerOpts,
+                    client_config => ClientOpts}} |
+     proplists:delete(tls_config, Config)];
+init_certs(GroupName, Config) when GroupName == dhe_ecdsa;
+                                   GroupName == ecdhe_ecdsa ->
+    {ClientOpts, ServerOpts} = ssl_test_lib:make_ecc_cert_chains([{server_chain, ssl_test_lib:default_cert_chain_conf()},
+                                                                 {client_chain, ssl_test_lib:default_cert_chain_conf()}], 
+                                                                 Config, ""),
+    [{tls_config, #{server_config => ServerOpts,
+                    client_config => ClientOpts}} |
+     proplists:delete(tls_config, Config)];
+init_certs(GroupName, Config) when GroupName == psk;
+                                   GroupName == dhe_psk;
+                                   GroupName == ecdhe_psk ->
+    PskSharedSecret = <<1,2,3,4,5,6,7,8,9,10,11,12,13,14,15>>,
+    [{tls_config, #{server_config => [{user_lookup_fun, {fun ssl_test_lib:user_lookup/3, PskSharedSecret}}],
+                    client_config => [{psk_identity, "Test-User"},
+                                      {user_lookup_fun, {fun ssl_test_lib:user_lookup/3, PskSharedSecret}}]}} |
+     proplists:delete(tls_config, Config)]; 
+init_certs(srp, Config) -> 
+      [{tls_config, #{server_config => [{user_lookup_fun, {fun ssl_test_lib:user_lookup/3, undefined}}],
+                      client_config => [{srp_identity, {"Test-User", "secret"}}]}} |
+       proplists:delete(tls_config, Config)];
+init_certs(_GroupName, Config) -> 
+    %% Anonymous does not need certs
+     [{tls_config, #{server_config => [],
+                     client_config => []}} |
+       proplists:delete(tls_config, Config)].
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% SRP --------------------------------------------------------
+%%--------------------------------------------------------------------
+srp_rsa_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(srp_rsa, '3des_ede_cbc', Config).                 
+    
+srp_rsa_aes_128_cbc(Config) when is_list(Config) ->
+   run_ciphers_test(srp_rsa, 'aes_128_cbc', Config).             
+
+srp_rsa_aes_256_cbc(Config) when is_list(Config) ->
+   run_ciphers_test(srp_rsa, 'aes_256_cbc', Config).             
+
+srp_dss_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(srp_dss, '3des_ede_cbc', Config).                 
+    
+srp_dss_aes_128_cbc(Config) when is_list(Config) ->
+   run_ciphers_test(srp_dss, 'aes_128_cbc', Config).             
+
+srp_dss_aes_256_cbc(Config) when is_list(Config) ->
+   run_ciphers_test(srp_dss, 'aes_256_cbc', Config).     
+
+%%--------------------------------------------------------------------
+%% PSK --------------------------------------------------------
+%%--------------------------------------------------------------------
+rsa_psk_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(rsa_psk, '3des_ede_cbc', Config).            
+
+rsa_psk_aes_128_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(rsa_psk, 'aes_128_cbc', Config).             
+
+rsa_psk_aes_128_ccm(Config) when is_list(Config) ->
+    run_ciphers_test(rsa_psk, 'aes_128_ccm', Config).             
+
+rsa_psk_aes_128_ccm_8(Config) when is_list(Config) ->
+    run_ciphers_test(rsa_psk, 'aes_128_ccm_8', Config).             
+
+rsa_psk_aes_256_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(rsa_psk, 'aes_256_cbc', Config). 
+
+rsa_psk_aes_256_ccm(Config) when is_list(Config) ->
+    run_ciphers_test(rsa_psk, 'aes_256_ccm', Config).             
+
+rsa_psk_aes_256_ccm_8(Config) when is_list(Config) ->
+    run_ciphers_test(rsa_psk, 'aes_256_ccm_8', Config).             
+     
+rsa_psk_rc4_128(Config) when is_list(Config) ->
+    run_ciphers_test(rsa_psk, 'rc4_128', Config).    
+         
+%%--------------------------------------------------------------------
+%% RSA --------------------------------------------------------
+%%--------------------------------------------------------------------
+rsa_des_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(rsa, 'des_cbc', Config).            
+
+rsa_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(rsa, '3des_ede_cbc', Config).            
+
+rsa_aes_128_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(rsa, 'aes_128_cbc', Config).             
+
+rsa_aes_256_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(rsa, 'aes_256_cbc', Config).
+
+rsa_aes_128_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(rsa, 'aes_128_gcm', Config).             
+
+rsa_aes_256_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(rsa, 'aes_256_gcm', Config).
+
+rsa_rc4_128(Config) when is_list(Config) ->
+    run_ciphers_test(rsa, 'rc4_128', Config).    
+%%--------------------------------------------------------------------
+%% DHE_RSA --------------------------------------------------------
+%%--------------------------------------------------------------------
+dhe_rsa_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_rsa, '3des_ede_cbc', Config).         
+
+dhe_rsa_aes_128_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_rsa, 'aes_128_cbc', Config).   
+
+dhe_rsa_aes_128_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_rsa, 'aes_128_gcm', Config).   
+
+dhe_rsa_aes_256_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_rsa, 'aes_256_cbc', Config).   
+
+dhe_rsa_aes_256_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_rsa, 'aes_256_gcm', Config).
+
+dhe_rsa_chacha20_poly1305(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_rsa, 'chacha20_poly1305', Config).
+%%--------------------------------------------------------------------
+%% ECDHE_RSA --------------------------------------------------------
+%%--------------------------------------------------------------------
+ecdhe_rsa_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_rsa, '3des_ede_cbc', Config).         
+
+ecdhe_rsa_aes_128_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_rsa, 'aes_128_cbc', Config).         
+
+ecdhe_rsa_aes_128_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_rsa, 'aes_128_gcm', Config).         
+
+ecdhe_rsa_aes_256_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_rsa, 'aes_256_cbc', Config).   
+
+ecdhe_rsa_aes_256_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_rsa, 'aes_256_gcm', Config).   
+
+ecdhe_rsa_rc4_128(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_rsa, 'rc4_128', Config).      
+
+ecdhe_rsa_chacha20_poly1305(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_rsa, 'chacha20_poly1305', Config).
+
+%%--------------------------------------------------------------------
+%% ECDHE_ECDSA --------------------------------------------------------
+%%--------------------------------------------------------------------
+ecdhe_ecdsa_rc4_128(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_ecdsa, 'rc4_128', Config).         
+
+ecdhe_ecdsa_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_ecdsa, '3des_ede_cbc', Config).         
+
+ecdhe_ecdsa_aes_128_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_ecdsa, 'aes_128_cbc', Config).         
+
+ecdhe_ecdsa_aes_128_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_ecdsa, 'aes_128_gcm', Config).         
+
+ecdhe_ecdsa_aes_256_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_ecdsa, 'aes_256_cbc', Config).   
+
+ecdhe_ecdsa_aes_256_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_ecdsa, 'aes_256_gcm', Config).   
+
+ecdhe_ecdsa_chacha20_poly1305(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_ecdsa, 'chacha20_poly1305', Config).
+%%--------------------------------------------------------------------
+%% DHE_DSS --------------------------------------------------------
+%%--------------------------------------------------------------------
+dhe_dss_des_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_dss, 'des_cbc', Config).            
+
+dhe_dss_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_dss, '3des_ede_cbc', Config).            
+
+dhe_dss_aes_128_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_dss, 'aes_128_cbc', Config).             
+
+dhe_dss_aes_256_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_dss, 'aes_256_cbc', Config).
+
+dhe_dss_aes_128_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_dss, 'aes_128_gcm', Config).             
+
+dhe_dss_aes_256_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_dss, 'aes_256_gcm', Config).
+
+%%--------------------------------------------------------------------
+%% Anonymous --------------------------------------------------------
+%%--------------------------------------------------------------------
+dh_anon_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dh_anon, '3des_ede_cbc', Config).         
+
+dh_anon_aes_128_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dh_anon, 'aes_128_cbc', Config).         
+
+dh_anon_aes_128_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(dh_anon, 'aes_128_gcm', Config).         
+
+dh_anon_aes_256_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dh_anon, 'aes_256_cbc', Config).   
+
+dh_anon_aes_256_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(dh_anon, 'aes_256_gcm', Config).   
+
+dh_anon_rc4_128(Config) when is_list(Config) ->
+    run_ciphers_test(dh_anon, 'rc4_128', Config).      
+
+ecdh_anon_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdh_anon, '3des_ede_cbc', Config).         
+
+ecdh_anon_aes_128_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdh_anon, 'aes_128_cbc', Config).   
+
+ecdh_anon_aes_256_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdh_anon, 'aes_256_cbc', Config).   
+
+srp_anon_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(srp_anon, '3des_ede_cbc', Config).                 
+    
+srp_anon_aes_128_cbc(Config) when is_list(Config) ->
+   run_ciphers_test(srp_anon, 'aes_128_cbc', Config).             
+
+srp_anon_aes_256_cbc(Config) when is_list(Config) ->
+   run_ciphers_test(srp_anon, 'aes_256_cbc', Config).     
+
+dhe_psk_des_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_psk, 'des_cbc', Config).            
+
+dhe_psk_rc4_128(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_psk, 'rc4_128', Config).            
+
+dhe_psk_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_psk, '3des_ede_cbc', Config).            
+
+dhe_psk_aes_128_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_psk, 'aes_128_cbc', Config).             
+
+dhe_psk_aes_256_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_psk, 'aes_256_cbc', Config).
+
+dhe_psk_aes_128_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_psk, 'aes_128_gcm', Config).             
+
+dhe_psk_aes_256_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_psk, 'aes_256_gcm', Config).
+
+dhe_psk_aes_128_ccm(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_psk, 'aes_128_ccm', Config).             
+
+dhe_psk_aes_256_ccm(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_psk, 'aes_256_ccm', Config).
+
+dhe_psk_aes_128_ccm_8(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_psk, 'aes_128_ccm_8', Config).
+
+dhe_psk_aes_256_ccm_8(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_psk, 'aes_256_ccm_8', Config).
+
+ecdhe_psk_des_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, 'des_cbc', Config).            
+
+ecdhe_psk_rc4_128(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, 'rc4_128', Config).            
+
+ecdhe_psk_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, '3des_ede_cbc', Config).            
+
+ecdhe_psk_aes_128_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, 'aes_128_cbc', Config).             
+
+ecdhe_psk_aes_256_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, 'aes_256_cbc', Config).
+
+ecdhe_psk_aes_128_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, 'aes_128_gcm', Config).             
+
+ecdhe_psk_aes_256_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, 'aes_256_gcm', Config).
+
+ecdhe_psk_aes_128_ccm(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, 'aes_128_ccm', Config).             
+
+ecdhe_psk_aes_128_ccm_8(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, 'aes_128_ccm_8', Config).
+
+psk_des_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(psk, 'des_cbc', Config).            
+
+psk_rc4_128(Config) when is_list(Config) ->
+    run_ciphers_test(psk, 'rc4_128', Config).            
+
+psk_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(psk, '3des_ede_cbc', Config).            
+
+psk_aes_128_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(psk, 'aes_128_cbc', Config).             
+
+psk_aes_256_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(psk, 'aes_256_cbc', Config).
+
+psk_aes_128_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(psk, 'aes_128_gcm', Config).             
+
+psk_aes_256_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(psk, 'aes_256_gcm', Config).
+
+psk_aes_128_ccm(Config) when is_list(Config) ->
+    run_ciphers_test(psk, 'aes_128_ccm', Config).             
+
+psk_aes_256_ccm(Config) when is_list(Config) ->
+    run_ciphers_test(psk, 'aes_256_ccm', Config).
+
+psk_aes_128_ccm_8(Config) when is_list(Config) ->
+    run_ciphers_test(psk, 'aes_128_ccm_8', Config).             
+
+psk_aes_256_ccm_8(Config) when is_list(Config) ->
+    run_ciphers_test(psk, 'aes_256_ccm_8', Config).
+
+%%--------------------------------------------------------------------
+%% Internal functions  ----------------------------------------------
+%%--------------------------------------------------------------------
+run_ciphers_test(Kex, Cipher, Config) ->
+    Version = ssl_test_lib:protocol_version(Config),
+    TestCiphers = test_ciphers(Kex, Cipher, Version),                  
+    
+    case TestCiphers of
+        [_|_] -> 
+            lists:foreach(fun(TestCipher) -> 
+                                  cipher_suite_test(TestCipher, Version, Config)
+                          end, TestCiphers);
+        []  ->
+            {skip, {not_sup, Kex, Cipher, Version}}
+    end.
+
+cipher_suite_test(CipherSuite, _Version, Config) ->
+    #{server_config := SOpts,
+      client_config := COpts} = proplists:get_value(tls_config, Config),
+    ServerOpts = ssl_test_lib:ssl_options(SOpts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(COpts, Config),
+    ct:log("Testing CipherSuite ~p~n", [CipherSuite]),
+    ct:log("Server Opts ~p~n", [ServerOpts]),
+    ct:log("Client Opts ~p~n", [ClientOpts]),
+    ssl_test_lib:basic_test([{ciphers, [CipherSuite]} | COpts], SOpts, Config).
+
+
+test_ciphers(Kex, Cipher, Version) ->
+    Ciphers = ssl:filter_cipher_suites(ssl:cipher_suites(default, Version) ++ ssl:cipher_suites(anonymous, Version), 
+                             [{key_exchange, 
+                               fun(Kex0) when Kex0 == Kex -> true; 
+                                  (_) -> false 
+                               end}, 
+                              {cipher,  
+                               fun(Cipher0) when Cipher0 == Cipher -> true; 
+                                  (_) -> false 
+                               end}]),
+    ct:log("Version ~p Testing  ~p~n", [Version, Ciphers]),
+    OpenSSLCiphers = openssl_ciphers(),
+    ct:log("OpenSSLCiphers ~p~n", [OpenSSLCiphers]),
+    lists:filter(fun(C) ->
+                         ct:log("Cipher ~p~n", [C]),
+                         lists:member(ssl_cipher_format:suite_map_to_openssl_str(C), OpenSSLCiphers)
+                 end, Ciphers).
+
+
+openssl_ciphers() ->
+    Str = os:cmd("openssl ciphers"),
+    string:split(string:strip(Str, right, $\n), ":", all).
diff --git a/lib/ssl/test/openssl_client_cert_SUITE.erl b/lib/ssl/test/openssl_client_cert_SUITE.erl
new file mode 100644
index 0000000000..b327988744
--- /dev/null
+++ b/lib/ssl/test/openssl_client_cert_SUITE.erl
@@ -0,0 +1,350 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019-2019. 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(openssl_client_cert_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() -> 
+    [
+     {group,  openssl_client}
+    ].
+
+groups() ->
+    [
+     {openssl_client, [], protocol_groups()},
+     {'tlsv1.3', [], tls_1_3_protocol_groups()},
+     {'tlsv1.2', [], pre_tls_1_3_protocol_groups()},
+     {'tlsv1.1', [], pre_tls_1_3_protocol_groups()},
+     {'tlsv1', [], pre_tls_1_3_protocol_groups()},
+     {'sslv3', [], ssl_protocol_groups()},
+     {'dtlsv1.2', [], pre_tls_1_3_protocol_groups()},
+     {'dtlsv1', [], pre_tls_1_3_protocol_groups()},
+     {rsa, [], all_version_tests()},
+     {ecdsa, [], all_version_tests()},
+     {dsa, [], all_version_tests()},
+     {rsa_1_3, [], all_version_tests() ++ tls_1_3_tests() ++ [unsupported_sign_algo_client_auth,
+                                                              unsupported_sign_algo_cert_client_auth]},
+     {ecdsa_1_3, [], all_version_tests() ++ tls_1_3_tests()}
+    ].
+
+protocol_groups() ->
+    [{group, 'tlsv1.3'},
+     {group, 'tlsv1.2'},
+     {group, 'tlsv1.1'},
+     {group, 'tlsv1'},
+     {group, 'sslv3'},
+     {group, 'dtlsv1.2'},
+     {group, 'dtlsv1'}
+     ].
+
+ssl_protocol_groups() ->
+    [{group, rsa},
+     {group, dsa}].
+
+pre_tls_1_3_protocol_groups() ->
+    [{group, rsa},
+     {group, ecdsa},
+     {group, dsa}].
+
+tls_1_3_protocol_groups() ->
+    [{group, rsa_1_3},
+     {group, ecdsa_1_3}].
+
+tls_1_3_tests() ->
+    [
+     hello_retry_request,
+     custom_groups,
+     hello_retry_client_auth,
+     hello_retry_client_auth_empty_cert_accepted,
+     hello_retry_client_auth_empty_cert_rejected
+    ].
+
+all_version_tests() ->
+    [
+     no_auth,
+     auth,
+     client_auth_empty_cert_accepted,
+     client_auth_empty_cert_rejected,
+     client_auth_partial_chain,
+     client_auth_allow_partial_chain,
+     client_auth_do_not_allow_partial_chain,
+     client_auth_partial_chain_fun_fail,
+     missing_root_cert_no_auth
+     %%invalid_signature_client
+    ].
+
+init_per_suite(Config) ->
+    catch crypto:stop(),
+    try crypto:start() of
+	ok ->
+	    ssl_test_lib:clean_start(),
+            Config
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:unload(ssl),
+    application:stop(crypto).
+
+init_per_group(openssl_client, Config0) ->
+    Config = proplists:delete(server_type, proplists:delete(client_type, Config0)),
+    [{client_type, openssl}, {server_type, erlang} | Config];
+init_per_group(Group, Config0) when Group == rsa;
+                                    Group == rsa_1_3 ->
+    Config = ssl_test_lib:make_rsa_cert(Config0),
+    COpts = proplists:get_value(client_rsa_opts, Config),
+    SOpts = proplists:get_value(server_rsa_opts, Config),
+    %% Make sure _rsa* suite is choosen by ssl_test_lib:start_server
+    Version = proplists:get_value(version,Config),
+    Ciphers = ssl_cert_tests:test_ciphers(fun(dhe_rsa) -> 
+                                                  true;
+                                             (ecdhe_rsa) -> 
+                                                  true;
+                                             (_) ->
+                                                  false 
+                                          end, Version), 
+    case Ciphers of
+        [_|_] ->
+            [{cert_key_alg, rsa} |
+             lists:delete(cert_key_alg,                                 
+                          [{client_cert_opts, [{ciphers, Ciphers} | COpts]}, 
+                           {server_cert_opts, SOpts} | 
+                           lists:delete(server_cert_opts, 
+                                        lists:delete(client_cert_opts, Config))])];
+        [] ->
+            {skip, {no_sup, Group, Version}}
+    end;
+init_per_group(Group, Config0) when Group == ecdsa;
+                                    Group == ecdsa_1_3 ->
+    PKAlg = crypto:supports(public_keys),
+    case lists:member(ecdsa, PKAlg) andalso (lists:member(ecdh, PKAlg) orelse 
+                                             lists:member(dh, PKAlg)) of
+        true ->
+            Config = ssl_test_lib:make_ecdsa_cert(Config0),
+            COpts = proplists:get_value(client_ecdsa_opts, Config),
+            SOpts = proplists:get_value(server_ecdsa_opts, Config),
+            %% Make sure ecdh* suite is choosen by ssl_test_lib:start_server
+            Version = proplists:get_value(version,Config),
+            Ciphers =  ssl_cert_tests:test_ciphers(fun(ecdh_ecdsa) -> 
+                                                           true;
+                                                      (ecdhe_ecdsa) -> 
+                                                           true;
+                                                      (_) ->
+                                                           false 
+                                                   end, Version), 
+            case Ciphers of
+                [_|_] ->
+                    [{cert_key_alg, ecdsa} |
+                     lists:delete(cert_key_alg,
+                                  [{client_cert_opts, [{ciphers, Ciphers} | COpts]}, 
+                                   {server_cert_opts, SOpts} | 
+                                   lists:delete(server_cert_opts, 
+                                                lists:delete(client_cert_opts, Config))]
+                                 )];
+                        [] ->
+                    {skip, {no_sup, Group, Version}}
+            end;
+        false ->
+            {skip, "Missing EC crypto support"}
+    end;
+init_per_group(Group, Config0) when Group == dsa ->
+    PKAlg = crypto:supports(public_keys),
+    case lists:member(dss, PKAlg) andalso lists:member(dh, PKAlg) of
+        true ->
+            Config = ssl_test_lib:make_dsa_cert(Config0),    
+            COpts = proplists:get_value(client_dsa_opts, Config),
+            SOpts = proplists:get_value(server_dsa_opts, Config),
+            %% Make sure dhe_dss* suite is choosen by ssl_test_lib:start_server
+            Version = proplists:get_value(version,Config),
+            Ciphers =  ssl_cert_tests:test_ciphers(fun(dh_dss) -> 
+                                                           true;
+                                                      (dhe_dss) -> 
+                                                           true;
+                                                      (_) ->
+                                                           false 
+                                                   end, Version), 
+            case Ciphers of
+                [_|_] ->
+                    [{cert_key_alg, dsa} |
+                     lists:delete(cert_key_alg,
+                                  [{client_cert_opts, [{ciphers, Ciphers} | COpts]}, 
+                                   {server_cert_opts, SOpts} | 
+                                   lists:delete(server_cert_opts, 
+                                                lists:delete(client_cert_opts, Config))])];
+                [] ->
+                    {skip, {no_sup, Group, Version}}
+            end;
+        false ->
+            {skip, "Missing DSS crypto support"}
+    end;    
+init_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+	true ->
+	    case ssl_test_lib:check_sane_openssl_version(GroupName) of
+		true ->
+		    [{version, GroupName} 
+                     | ssl_test_lib:init_tls_version(GroupName, Config)];
+		false ->
+		    {skip, "Missing openssl support"}
+	    end;
+	_ ->
+	    ssl:start(),
+	    Config
+    end.
+
+end_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+        true ->
+            ssl_test_lib:clean_tls_version(Config);
+        false ->
+            Config
+    end.
+init_per_testcase(TestCase, Config) when 
+      TestCase == client_auth_empty_cert_accepted;
+      TestCase == client_auth_empty_cert_rejected ->
+    Version = proplists:get_value(version,Config),
+    case Version of
+        sslv3 ->
+            %% Openssl client sends "No Certificate Reserved" warning ALERT
+            %% instead of sending EMPTY cert message in SSL-3.0 so empty cert test are not
+            %% relevant
+            {skip, openssl_behaves_differently};
+        _ -> 
+            ssl_test_lib:ct_log_supported_protocol_versions(Config),
+            ct:timetrap({seconds, 10}),
+            Config
+    end;
+init_per_testcase(_TestCase, Config) ->
+    ssl_test_lib:ct_log_supported_protocol_versions(Config),
+    ct:timetrap({seconds, 10}),
+    Config.
+
+end_per_testcase(_TestCase, Config) ->     
+    Config.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+no_auth() ->
+     ssl_cert_tests:no_auth().
+
+no_auth(Config) ->
+      ssl_cert_tests:no_auth(Config).
+%%--------------------------------------------------------------------
+auth() ->
+    ssl_cert_tests:auth().
+auth(Config) ->
+    ssl_cert_tests:auth(Config).
+%%--------------------------------------------------------------------
+client_auth_empty_cert_accepted() ->
+     ssl_cert_tests:client_auth_empty_cert_accepted().
+client_auth_empty_cert_accepted(Config) ->
+    ssl_cert_tests:client_auth_empty_cert_accepted(Config).
+%%--------------------------------------------------------------------
+client_auth_empty_cert_rejected() ->
+      ssl_cert_tests:client_auth_empty_cert_rejected().
+client_auth_empty_cert_rejected(Config) ->
+    ssl_cert_tests:client_auth_empty_cert_rejected(Config).
+%%--------------------------------------------------------------------
+client_auth_partial_chain() ->
+    ssl_cert_tests:client_auth_partial_chain().
+client_auth_partial_chain(Config) when is_list(Config) ->
+    ssl_cert_tests:client_auth_partial_chain(Config).
+
+%%--------------------------------------------------------------------
+client_auth_allow_partial_chain() ->
+    ssl_cert_tests:client_auth_allow_partial_chain().
+client_auth_allow_partial_chain(Config) when is_list(Config) ->
+    ssl_cert_tests:client_auth_allow_partial_chain(Config).
+%%--------------------------------------------------------------------
+client_auth_do_not_allow_partial_chain() ->
+   ssl_cert_tests:client_auth_do_not_allow_partial_chain().
+client_auth_do_not_allow_partial_chain(Config) when is_list(Config) ->
+    ssl_cert_tests:client_auth_do_not_allow_partial_chain(Config).
+
+%%--------------------------------------------------------------------
+client_auth_partial_chain_fun_fail() ->
+   ssl_cert_tests:client_auth_partial_chain_fun_fail().
+client_auth_partial_chain_fun_fail(Config) when is_list(Config) ->
+    ssl_cert_tests:client_auth_partial_chain_fun_fail(Config).
+
+%%--------------------------------------------------------------------
+missing_root_cert_no_auth() ->
+   ssl_cert_tests:missing_root_cert_no_auth().
+missing_root_cert_no_auth(Config) when is_list(Config) ->
+    ssl_cert_tests:missing_root_cert_no_auth(Config).
+
+%%--------------------------------------------------------------------
+invalid_signature_client() ->
+    ssl_cert_tests:invalid_signature_client().
+invalid_signature_client(Config) when is_list(Config) ->
+    ssl_cert_tests:invalid_signature_client(Config).
+%%--------------------------------------------------------------------
+invalid_signature_server() ->
+    ssl_cert_tests:invalid_signature_client().
+invalid_signature_server(Config) when is_list(Config) ->
+    ssl_cert_tests:invalid_signature_client(Config).
+
+%%--------------------------------------------------------------------
+%% TLS 1.3 Test Cases ------------------------------------------------
+%%--------------------------------------------------------------------
+hello_retry_request() ->
+    ssl_cert_tests:hello_retry_request().
+hello_retry_request(Config) ->
+    ssl_cert_tests:hello_retry_request(Config).
+%%--------------------------------------------------------------------
+custom_groups() ->
+ ssl_cert_tests:custom_groups().
+custom_groups(Config) ->
+  ssl_cert_tests:custom_groups(Config).
+unsupported_sign_algo_cert_client_auth() ->
+ ssl_cert_tests:unsupported_sign_algo_cert_client_auth().
+unsupported_sign_algo_cert_client_auth(Config) ->
+    ssl_cert_tests:unsupported_sign_algo_cert_client_auth(Config).
+unsupported_sign_algo_client_auth() ->
+ ssl_cert_tests:unsupported_sign_algo_client_auth().
+unsupported_sign_algo_client_auth(Config) ->
+    ssl_cert_tests:unsupported_sign_algo_client_auth(Config).
+%%--------------------------------------------------------------------
+hello_retry_client_auth() ->
+ ssl_cert_tests:hello_retry_client_auth().
+hello_retry_client_auth(Config) ->
+  ssl_cert_tests:hello_retry_client_auth(Config).
+%%--------------------------------------------------------------------
+hello_retry_client_auth_empty_cert_accepted() ->
+    ssl_cert_tests:hello_retry_client_auth_empty_cert_accepted().
+hello_retry_client_auth_empty_cert_accepted(Config) ->
+    ssl_cert_tests:hello_retry_client_auth_empty_cert_accepted(Config).
+%%--------------------------------------------------------------------
+hello_retry_client_auth_empty_cert_rejected() ->
+    ssl_cert_tests:hello_retry_client_auth_empty_cert_rejected().
+hello_retry_client_auth_empty_cert_rejected(Config) ->
+   ssl_cert_tests:hello_retry_client_auth_empty_cert_rejected(Config).
diff --git a/lib/ssl/test/openssl_npn_SUITE.erl b/lib/ssl/test/openssl_npn_SUITE.erl
new file mode 100644
index 0000000000..0294f4997f
--- /dev/null
+++ b/lib/ssl/test/openssl_npn_SUITE.erl
@@ -0,0 +1,311 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019-2019. 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(openssl_npn_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+-define(OPENSSL_QUIT, "Q\n").
+-define(OPENSSL_RENEGOTIATE, "R\n").
+-define(SLEEP, 1000).
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+all() -> 
+    %% NPN is not supported in TLS-1.3 (replaced by ALPN and deprecated in TLS 1.2)
+    %% OpenSSL DTLS support for NPN is either not there or broken.
+    [{group, 'tlsv1.2'},
+     {group, 'tlsv1.1'},
+     {group, 'tlsv1'}].
+
+groups() ->
+    [{'tlsv1.2', [], npn_tests() ++ npn_renegotiate_tests()},
+     {'tlsv1.1', [], npn_tests() ++ npn_renegotiate_tests()},
+     {'tlsv1', [], npn_tests() ++ npn_renegotiate_tests()}
+    ].
+ 
+npn_tests() ->
+    [erlang_client_openssl_server_npn,
+     erlang_server_openssl_client_npn,
+     erlang_server_openssl_client_npn_only_client,
+     erlang_server_openssl_client_npn_only_server,
+     erlang_client_openssl_server_npn_only_client,
+     erlang_client_openssl_server_npn_only_server].
+
+npn_renegotiate_tests() ->
+   case ssl_test_lib:sane_openssl_alpn_npn_renegotiate() of
+        true ->
+           [erlang_server_openssl_client_npn_renegotiate,
+            erlang_client_openssl_server_npn_renegotiate];
+        false ->
+            []
+    end.
+
+init_per_suite(Config0) ->
+    case os:find_executable("openssl") of
+        false ->
+            {skip, "Openssl not found"};
+        _ ->
+            case check_openssl_npn_support(Config0) of
+                {skip, _} = Skip ->
+                    Skip;
+                _ ->
+                    ct:pal("Version: ~p", [os:cmd("openssl version")]),
+                    catch crypto:stop(),
+                    try crypto:start() of
+                        ok ->
+                            ssl_test_lib:clean_start(),
+                            ssl_test_lib:make_rsa_cert(Config0)
+                    catch _:_  ->
+                            {skip, "Crypto did not start"}
+                    end
+            end
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:stop(crypto),
+    ssl_test_lib:kill_openssl().
+
+init_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+        true ->
+            case ssl_test_lib:supports_ssl_tls_version(GroupName) of
+                 true ->
+                    case ssl_test_lib:check_sane_openssl_version(GroupName) of
+                         true ->
+                            ssl_test_lib:init_tls_version(GroupName, Config);
+                         false ->
+                            {skip, openssl_does_not_support_version}
+                    end;
+                false ->
+                    {skip, openssl_does_not_support_version}
+            end; 
+         _ ->
+            Config
+    end.
+
+end_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+        true ->
+            ssl_test_lib:clean_tls_version(Config);
+       false ->
+            Config
+    end.
+
+init_per_testcase(TestCase, Config) -> 
+    ct:timetrap({seconds, 10}),
+    special_init(TestCase, Config).
+
+special_init(TestCase, Config)
+     when TestCase == erlang_client_npn_openssl_server_npn_renegotiate;
+          TestCase == erlang_server_npn_openssl_client_npn_renegotiate ->
+     {ok, Version} = application:get_env(ssl, protocol_version),
+    ssl_test_lib:check_sane_openssl_renegotaite(Config, Version);
+special_init(_, Config) ->
+     Config.
+
+end_per_testcase(_, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+erlang_client_openssl_server_npn() ->
+    [{doc,"Test erlang client with openssl server doing npn negotiation"}].
+
+erlang_client_openssl_server_npn(Config) when is_list(Config) ->
+    Data = "From openssl to erlang",
+    start_erlang_client_and_openssl_server_for_npn_negotiation(Config, Data, 
+                                                               fun(Client, OpensslPort) ->
+                                                                       true = port_command(OpensslPort, Data),
+                                                                       ssl_test_lib:check_result(Client, Data)
+                                                               end).
+
+%%--------------------------------------------------------------------
+erlang_client_openssl_server_npn_renegotiate() ->
+    [{doc,"Test erlang client with openssl server doing npn negotiation and renegotiate"}].
+
+erlang_client_openssl_server_npn_renegotiate(Config) when is_list(Config) ->
+    Data = "From openssl to erlang",
+    start_erlang_client_and_openssl_server_for_npn_negotiation(Config, Data, 
+                                                               fun(Client, OpensslPort) ->
+                                                                       true = port_command(OpensslPort, 
+                                                                                           ?OPENSSL_RENEGOTIATE),
+                                                                       ct:sleep(?SLEEP),
+                                                                       true = port_command(OpensslPort, Data),
+                                                                       ssl_test_lib:check_result(Client, Data)
+                                                               end).
+%%--------------------------------------------------------------------------
+erlang_server_openssl_client_npn() ->
+    [{doc,"Test erlang server with openssl client and npn negotiation"}].
+
+erlang_server_openssl_client_npn(Config) when is_list(Config) ->
+
+    Data = "From openssl to erlang",
+    start_erlang_server_and_openssl_client_for_npn_negotiation(Config, Data, 
+                                                               fun(Server, OpensslPort) ->
+                                                                       true = port_command(OpensslPort, Data),
+                                                                       ssl_test_lib:check_result(Server, Data)
+                                                               end).
+
+%%--------------------------------------------------------------------------
+erlang_server_openssl_client_npn_renegotiate() ->
+    [{doc,"Test erlang server with openssl client and npn negotiation with renegotiation"}].
+
+erlang_server_openssl_client_npn_renegotiate(Config) when is_list(Config) ->
+    Data = "From openssl to erlang",
+    start_erlang_server_and_openssl_client_for_npn_negotiation(Config, Data, 
+                                                               fun(Server, OpensslPort) ->
+                                                                       true = port_command(OpensslPort, 
+                                                                                           ?OPENSSL_RENEGOTIATE),
+                                                                       ct:sleep(?SLEEP),
+                                                                       true = port_command(OpensslPort, Data),
+                                                                       ssl_test_lib:check_result(Server, Data)
+                                                               end).
+%%--------------------------------------------------------------------------
+erlang_client_openssl_server_npn_only_server(Config) when is_list(Config) ->
+    Data = "From openssl to erlang",
+    ssl_test_lib:start_erlang_client_and_openssl_server_with_opts(Config, [],
+                                                                  ["-nextprotoneg", "spdy/2"], Data, 
+                                                                  fun(Server, OpensslPort) ->
+                                                                          true = port_command(OpensslPort, Data),
+                                                                          ssl_test_lib:check_result(Server, Data)
+                                                                  end).
+
+%%--------------------------------------------------------------------------
+
+erlang_client_openssl_server_npn_only_client(Config) when is_list(Config) ->
+    Data = "From openssl to erlang",
+    ssl_test_lib:start_erlang_client_and_openssl_server_with_opts(Config,
+                                                                  [{client_preferred_next_protocols,
+                                                                    {client, [<<"spdy/2">>], <<"http/1.1">>}}], [],
+                                                                  Data, 
+                                                                  fun(Server, OpensslPort) ->
+                                                                          true = port_command(OpensslPort, Data),
+                                                                          ssl_test_lib:check_result(Server, Data)
+                                                                  end).
+
+%%--------------------------------------------------------------------------
+erlang_server_openssl_client_npn_only_server(Config) when is_list(Config) ->
+    Data = "From openssl to erlang",
+    ssl_test_lib:start_erlang_server_and_openssl_client_with_opts(Config, 
+                                                                  [{next_protocols_advertised, [<<"spdy/2">>]}], [],
+                                                                  Data, 
+                                                                  fun(Server, OpensslPort) ->
+                                                                          true = port_command(OpensslPort, Data),
+                                                                          ssl_test_lib:check_result(Server, Data)
+                                                                  end).
+
+erlang_server_openssl_client_npn_only_client(Config) when is_list(Config) ->
+    Data = "From openssl to erlang",
+    ssl_test_lib:start_erlang_server_and_openssl_client_with_opts(Config, [], ["-nextprotoneg", "spdy/2"],
+                                                                  Data, 
+                                                                  fun(Server, OpensslPort) ->
+                                                                          true = port_command(OpensslPort, Data),
+                                                                          ssl_test_lib:check_result(Server, Data)
+                                                                  end).
+
+%%--------------------------------------------------------------------
+%% Internal functions  -----------------------------------------------
+%%--------------------------------------------------------------------
+
+start_erlang_client_and_openssl_server_for_npn_negotiation(Config, Data, Callback) ->
+    process_flag(trap_exit, true),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
+    ClientOpts0 = ssl_test_lib:ssl_options(client_rsa_verify_opts, Config),
+    ClientOpts = [{client_preferred_next_protocols, {client, [<<"spdy/2">>], <<"http/1.1">>}} | ClientOpts0],
+
+    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
+
+    Data = "From openssl to erlang",
+
+    Port = ssl_test_lib:inet_port(node()),
+    CaCertFile = proplists:get_value(cacertfile, ServerOpts),
+    CertFile = proplists:get_value(certfile, ServerOpts),
+    KeyFile = proplists:get_value(keyfile, ServerOpts),
+    Version = ssl_test_lib:protocol_version(Config),
+    
+    Exe = "openssl",
+    Args = ["s_server", "-msg", "-nextprotoneg", "http/1.1,spdy/2", "-accept", integer_to_list(Port),
+	    ssl_test_lib:version_flag(Version),
+            "-CAfile", CaCertFile,
+	    "-cert", CertFile, "-key", KeyFile],
+    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, {ssl_test_lib,
+                           erlang_ssl_receive_and_assert_negotiated_protocol, [<<"spdy/2">>, Data]}},
+                    {options, ClientOpts}]),
+
+    Callback(Client, OpensslPort),
+
+    %% 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).
+
+start_erlang_server_and_openssl_client_for_npn_negotiation(Config, Data, Callback) ->
+    process_flag(trap_exit, true),
+    ServerOpts0 = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    ServerOpts = [{next_protocols_advertised, [<<"spdy/2">>]} | ServerOpts0],
+
+    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+                    {from, self()},
+                    {mfa, {ssl_test_lib, erlang_ssl_receive_and_assert_negotiated_protocol, [<<"spdy/2">>, Data]}},
+                    {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Version = ssl_test_lib:protocol_version(Config),
+
+    Exe = "openssl",
+    Args = ["s_client", "-nextprotoneg", "http/1.0,spdy/2", "-msg", "-connect", 
+            ssl_test_lib:hostname_format(Hostname) ++ ":" 
+	    ++ integer_to_list(Port), ssl_test_lib:version_flag(Version)],
+
+    OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args),  
+
+    Callback(Server, OpenSslPort),
+
+    ssl_test_lib:close(Server),
+
+    ssl_test_lib:close_port(OpenSslPort),
+    process_flag(trap_exit, false).
+
+check_openssl_npn_support(Config) ->
+    HelpText = os:cmd("openssl s_client --help"),
+    case string:str(HelpText, "nextprotoneg") of
+        0 ->
+            {skip, "Openssl not compiled with nextprotoneg support"};
+        _ ->
+            Config
+    end.
diff --git a/lib/ssl/test/openssl_reject_SUITE.erl b/lib/ssl/test/openssl_reject_SUITE.erl
new file mode 100644
index 0000000000..deefd11823
--- /dev/null
+++ b/lib/ssl/test/openssl_reject_SUITE.erl
@@ -0,0 +1,209 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019-2019. 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(openssl_reject_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+-define(SLEEP, 1000).
+-define(OPENSSL_GARBAGE, "P\n").
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+
+all() -> 
+    [{group, 'tlsv1.2'},
+     {group, 'tlsv1.1'},
+     {group, 'tlsv1'},
+     {group, 'sslv3'}].
+
+groups() ->
+    [{'tlsv1.2', [], all_versions_tests()},
+     {'tlsv1.1', [], all_versions_tests()},
+     {'tlsv1', [], all_versions_tests()},
+     {'sslv3', [], all_versions_tests()}
+    ].
+ 
+all_versions_tests() ->
+    [    
+     erlang_client_bad_openssl_server,
+     ssl2_erlang_server_openssl_client
+    ].
+
+init_per_suite(Config0) ->
+    case os:find_executable("openssl") of
+        false ->
+            {skip, "Openssl not found"};
+        _ ->
+            ct:pal("Version: ~p", [os:cmd("openssl version")]),
+            catch crypto:stop(),
+            try crypto:start() of
+                ok ->
+                    ssl_test_lib:clean_start(),                   
+                    ssl_test_lib:make_rsa_cert(Config0)
+            catch _:_  ->
+                    {skip, "Crypto did not start"}
+            end
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:stop(crypto),
+    ssl_test_lib:kill_openssl().
+
+init_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+        true ->
+            case ssl_test_lib:supports_ssl_tls_version(GroupName) of
+                 true ->
+                    case ssl_test_lib:check_sane_openssl_version(GroupName) of
+                         true ->
+                            ssl_test_lib:init_tls_version(GroupName, Config);
+                         false ->
+                            {skip, openssl_does_not_support_version}
+                    end;
+                false ->
+                    {skip, openssl_does_not_support_version}
+            end; 
+         _ ->
+            Config
+    end.
+
+end_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+        true ->
+            ssl_test_lib:clean_tls_version(Config);
+       false ->
+            Config
+    end.
+
+init_per_testcase(TestCase, Config) ->
+    ct:timetrap({seconds, 10}),
+    special_init(TestCase, Config).
+
+special_init(ssl2_erlang_server_openssl_client, Config) ->
+    case ssl_test_lib:supports_ssl_tls_version(sslv2) of
+        true ->
+            Config;
+        false ->
+            {skip, "sslv2 not supported by openssl"}
+     end;
+special_init(_, Config) ->
+     Config.
+
+end_per_testcase(_, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+erlang_client_bad_openssl_server() ->
+    [{doc,"Test what happens if openssl server sends garbage to erlang ssl client"}].
+erlang_client_bad_openssl_server(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+
+    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
+
+    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],
+    OpensslPort = ssl_test_lib:portable_open_port(Exe, Args), 
+
+    ssl_test_lib:wait_for_openssl_server(Port, proplists:get_value(protocol, Config)),
+
+    Client0 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
+                                         {host, Hostname},
+                                         {from, self()},
+                                         {mfa, {?MODULE, server_sent_garbage, []}},
+                                         {options,
+                                          [{versions, [Version]} | ClientOpts]}]),
+
+    %% Send garbage
+    true = port_command(OpensslPort, ?OPENSSL_GARBAGE),
+
+    ct:sleep(?SLEEP),
+
+    Client0 ! server_sent_garbage,
+
+    ssl_test_lib:check_result(Client0, true),
+
+    ssl_test_lib:close(Client0),
+
+    %% Make sure openssl does not hang and leave zombie process
+    Client1 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+                                         {host, Hostname},
+                                         {from, self()},
+                                         {mfa, {ssl_test_lib, no_result, []}},
+                                         {options,
+                                          [{versions, [Version]} | ClientOpts]}]),
+
+    %% Clean close down!   Server needs to be closed first !!
+    ssl_test_lib:close_port(OpensslPort),
+    ssl_test_lib:close(Client1),
+    process_flag(trap_exit, false).
+
+%%--------------------------------------------------------------------
+ssl2_erlang_server_openssl_client() ->
+    [{doc,"Test that ssl v2 clients are rejected"}].
+
+ssl2_erlang_server_openssl_client(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+
+    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0}, 
+                                              {from, self()},
+                                              {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+
+    Exe = "openssl",
+    Args = ["s_client", "-connect", ssl_test_lib:hostname_format(Hostname) ++ ":" ++ integer_to_list(Port), 
+            "-ssl2", "-msg"],
+
+    OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args),  
+
+    ct:log("Ports ~p~n", [[erlang:port_info(P) || P <- erlang:ports()]]), 
+    ssl_test_lib:consume_port_exit(OpenSslPort),
+    ssl_test_lib:check_server_alert(Server, unexpected_message),
+    process_flag(trap_exit, false).
+
+
+%%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
+%%--------------------------------------------------------------------
+
+server_sent_garbage(Socket) ->
+    receive 
+	server_sent_garbage ->
+	    {error, closed} == ssl:send(Socket, "data")
+	    
+    end.
diff --git a/lib/ssl/test/openssl_renegotiate_SUITE.erl b/lib/ssl/test/openssl_renegotiate_SUITE.erl
new file mode 100644
index 0000000000..91a8175ac6
--- /dev/null
+++ b/lib/ssl/test/openssl_renegotiate_SUITE.erl
@@ -0,0 +1,341 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019-2019. 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(openssl_renegotiate_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+-define(SLEEP, 1000).
+-define(OPENSSL_RENEGOTIATE, "R\n").
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+
+all() -> 
+    case ssl_test_lib:openssl_sane_dtls() of 
+        true ->
+            [{group, 'tlsv1.2'},
+             {group, 'tlsv1.1'},
+             {group, 'tlsv1'},
+             {group, 'sslv3'},
+             {group, 'dtlsv1.2'},
+             {group, 'dtlsv1'}];
+        false ->
+            [{group, 'tlsv1.2'},
+             {group, 'tlsv1.1'},
+             {group, 'tlsv1'},
+             {group, 'sslv3'}]
+    end.
+
+groups() ->
+     case ssl_test_lib:openssl_sane_dtls() of 
+         true ->
+             [{'tlsv1.2', [], all_versions_tests()},
+              {'tlsv1.1', [], all_versions_tests()},
+              {'tlsv1', [], all_versions_tests()},
+              {'sslv3', [], all_versions_tests()},
+              {'dtlsv1.2', [], all_versions_tests()},
+              {'dtlsv1', [], all_versions_tests()}
+             ];
+        false ->
+             [{'tlsv1.2', [], all_versions_tests()},
+              {'tlsv1.1', [], all_versions_tests()},
+              {'tlsv1', [], all_versions_tests()},
+              {'sslv3', [], all_versions_tests()}
+           ]
+     end.
+ 
+all_versions_tests() ->
+    [    
+     erlang_client_openssl_server_renegotiate,
+     erlang_client_openssl_server_renegotiate_after_client_data,
+     erlang_client_openssl_server_nowrap_seqnum,
+     erlang_server_openssl_client_nowrap_seqnum
+    ].
+
+
+init_per_suite(Config0) ->
+    case os:find_executable("openssl") of
+        false ->
+            {skip, "Openssl not found"};
+        _ ->
+            ct:pal("Version: ~p", [os:cmd("openssl version")]),
+            catch crypto:stop(),
+            try crypto:start() of
+                ok ->
+                    ssl_test_lib:clean_start(),
+                    ssl_test_lib:make_rsa_cert(Config0)
+            catch _:_  ->
+                    {skip, "Crypto did not start"}
+            end
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:stop(crypto),
+    ssl_test_lib:kill_openssl().
+
+init_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+        true ->
+            case ssl_test_lib:supports_ssl_tls_version(GroupName) of
+                 true ->
+                    case ssl_test_lib:check_sane_openssl_version(GroupName) of
+                         true ->
+                            ssl_test_lib:init_tls_version(GroupName, Config);
+                         false ->
+                            {skip, openssl_does_not_support_version}
+                    end;
+                false ->
+                    {skip, openssl_does_not_support_version}
+            end; 
+         _ ->
+            Config
+    end.
+
+end_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+        true ->
+            ssl_test_lib:clean_tls_version(Config);
+       false ->
+            Config
+    end.
+
+init_per_testcase(TestCase, Config) ->
+    ct:timetrap({seconds, 10}),
+    special_init(TestCase, Config).
+
+special_init(TestCase, Config)
+  when TestCase == erlang_client_openssl_server_renegotiate;
+       TestCase == erlang_client_openssl_server_nowrap_seqnum;
+       TestCase == erlang_server_openssl_client_nowrap_seqnum;
+       TestCase == erlang_client_openssl_server_renegotiate_after_client_data
+        ->
+    {ok, Version} = application:get_env(ssl, protocol_version),
+    ssl_test_lib:check_sane_openssl_renegotaite(Config, Version);
+special_init(_, Config) ->
+     Config.
+
+end_per_testcase(_, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+erlang_client_openssl_server_renegotiate() ->
+    [{doc,"Test erlang client when openssl server issuses a renegotiate"}].
+erlang_client_openssl_server_renegotiate(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_verify_opts, Config),
+
+    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
+    
+    ErlData = "From erlang to openssl",
+    OpenSslData = "From openssl to erlang",
+
+    Port = ssl_test_lib:inet_port(node()),
+    CertFile = proplists:get_value(certfile, ServerOpts),
+    CaCertFile = proplists:get_value(cacertfile, 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),
+            "-CAfile", CaCertFile,
+            "-cert", CertFile, "-key", KeyFile, "-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,
+                                               delayed_send, [[ErlData, OpenSslData]]}},
+                                         {options, [{reuse_sessions, false} | ClientOpts]}]),
+
+    true = port_command(OpensslPort, ?OPENSSL_RENEGOTIATE),
+    ct:sleep(?SLEEP),
+    true = port_command(OpensslPort, OpenSslData),
+    
+    ssl_test_lib:check_result(Client, OpenSslData), 
+
+     %% 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_client_openssl_server_renegotiate_after_client_data() ->
+    [{doc,"Test erlang client when openssl server issuses a renegotiate after reading client data"}].
+erlang_client_openssl_server_renegotiate_after_client_data(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_verify_opts, Config),
+
+    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
+
+    ErlData = "From erlang to openssl",
+    OpenSslData = "From openssl to erlang",
+
+    Port = ssl_test_lib:inet_port(node()),
+    CaCertFile = proplists:get_value(cacertfile, ServerOpts),
+    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),
+            "-CAfile", CaCertFile,
+            "-cert", CertFile, "-key", KeyFile, "-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,
+                                               send_wait_send, [[ErlData, OpenSslData]]}},
+                                        {options, [{reuse_sessions, false} |ClientOpts]}]),
+
+    true = port_command(OpensslPort, ?OPENSSL_RENEGOTIATE),
+    ct:sleep(?SLEEP),
+    true = port_command(OpensslPort, OpenSslData),
+
+    ssl_test_lib:check_result(Client, OpenSslData),
+    
+    %% 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_client_openssl_server_nowrap_seqnum() ->
+    [{doc, "Test that erlang client will renegotiate session when",
+      "max sequence number celing is about to be reached. Although"
+      "in the testcase we use the test option renegotiate_at"
+      " to lower treashold substantially."}].
+erlang_client_openssl_server_nowrap_seqnum(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+
+    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
+
+    ErlData = "From erlang to openssl\n",
+    N = 10,
+
+    Port = ssl_test_lib:inet_port(node()),
+    CaCertFile = proplists:get_value(cacertfile, ServerOpts),
+    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),
+            "-CAfile", CaCertFile,
+            "-cert", CertFile, "-key", KeyFile, "-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, {ssl_test_lib,
+                                               trigger_renegotiate, [[ErlData, N+2]]}},
+                                        {options, [{reuse_sessions, false},
+                                                   {renegotiate_at, N} | ClientOpts]}]),
+
+    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).
+%%--------------------------------------------------------------------
+erlang_server_openssl_client_nowrap_seqnum() ->
+    [{doc, "Test that erlang client will renegotiate session when",
+      "max sequence number celing is about to be reached. Although"
+      "in the testcase we use the test option renegotiate_at"
+      " to lower treashold substantially."}].
+erlang_server_openssl_client_nowrap_seqnum(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
+
+    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Data = "From openssl to erlang",
+
+    N = 10,
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+                                        {from, self()},
+                                        {mfa, {ssl_test_lib,
+                                               trigger_renegotiate, [[Data, N+2]]}},
+                                        {options, [{renegotiate_at, N}, {reuse_sessions, false} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Version = ssl_test_lib:protocol_version(Config),
+    Exe = "openssl", 
+    Args = ["s_client","-connect", ssl_test_lib:hostname_format(Hostname) ++ ":" ++ integer_to_list(Port),
+            ssl_test_lib:version_flag(Version),
+            "-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).
+
+
+%%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
+%%--------------------------------------------------------------------
+delayed_send(Socket, [ErlData, OpenSslData]) ->
+    ct:sleep(?SLEEP),
+    ssl:send(Socket, ErlData),
+    ssl_test_lib:active_recv(Socket, length(OpenSslData)).
+
+
+send_wait_send(Socket, [ErlData, OpenSslData]) ->
+    ssl:send(Socket, ErlData),
+    ct:sleep(?SLEEP),
+    ssl:send(Socket, ErlData),
+    ssl_test_lib:active_recv(Socket, length(OpenSslData)).
+    
diff --git a/lib/ssl/test/openssl_server_cert_SUITE.erl b/lib/ssl/test/openssl_server_cert_SUITE.erl
new file mode 100644
index 0000000000..c2af864a92
--- /dev/null
+++ b/lib/ssl/test/openssl_server_cert_SUITE.erl
@@ -0,0 +1,373 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019-2019. 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(openssl_server_cert_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() -> 
+    [
+     {group,  openssl_server}].
+
+groups() ->
+    [
+     {openssl_server, [], protocol_groups()},
+     {'tlsv1.3', [], tls_1_3_protocol_groups()},
+     {'tlsv1.2', [], pre_tls_1_3_protocol_groups()},
+     {'tlsv1.1', [], pre_tls_1_3_protocol_groups()},
+     {'tlsv1', [], pre_tls_1_3_protocol_groups()},
+     {'sslv3', [], ssl_protocol_groups()},
+     {'dtlsv1.2', [], pre_tls_1_3_protocol_groups()},
+     {'dtlsv1', [], pre_tls_1_3_protocol_groups()},
+     {rsa, [], all_version_tests()},
+     {ecdsa, [], all_version_tests()},
+     {dsa, [], all_version_tests()},
+     {rsa_1_3, [], all_version_tests() ++ tls_1_3_tests()},
+      %% TODO: Create proper conf of openssl server
+      %%++ [unsupported_sign_algo_client_auth,
+      %% unsupported_sign_algo_cert_client_auth]},
+     {ecdsa_1_3, [], all_version_tests() ++ tls_1_3_tests()}
+    ].
+
+protocol_groups() ->
+    [{group, 'tlsv1.3'},
+     {group, 'tlsv1.2'},
+     {group, 'tlsv1.1'},
+     {group, 'tlsv1'},
+     {group, 'sslv3'},
+     {group, 'dtlsv1.2'},
+     {group, 'dtlsv1'}
+     ].
+
+ssl_protocol_groups() ->
+    [{group, rsa},
+     {group, dsa}].
+
+pre_tls_1_3_protocol_groups() ->
+    [{group, rsa},
+     {group, ecdsa},
+     {group, dsa}].
+
+tls_1_3_protocol_groups() ->
+    [{group, rsa_1_3},
+     {group, ecdsa_1_3}].
+
+tls_1_3_tests() ->
+    [
+     hello_retry_request,
+     custom_groups,
+     hello_retry_client_auth,
+     hello_retry_client_auth_empty_cert_accepted,
+     hello_retry_client_auth_empty_cert_rejected
+    ].
+
+all_version_tests() ->
+    [
+     no_auth,
+     auth,
+     missing_root_cert_no_auth
+     %%invalid_signature_client
+    ].
+
+init_per_suite(Config) ->
+    catch crypto:stop(),
+    try crypto:start() of
+	ok ->
+	    ssl_test_lib:clean_start(),
+            Config
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:unload(ssl),
+    application:stop(crypto).
+
+init_per_group(openssl_server, Config0) ->
+    Config = proplists:delete(server_type, proplists:delete(client_type, Config0)),
+    [{client_type, erlang}, {server_type, openssl} | Config];    
+init_per_group(rsa = Group, Config0) ->
+    Config = ssl_test_lib:make_rsa_cert(Config0),
+    COpts = proplists:get_value(client_rsa_opts, Config),
+    SOpts = proplists:get_value(server_rsa_opts, Config),
+    %% Make sure _rsa* suite is choosen by ssl_test_lib:start_server
+    Version = proplists:get_value(version,Config),
+    Ciphers = ssl_cert_tests:test_ciphers(fun(dhe_rsa) -> 
+                                                  true;
+                                             (ecdhe_rsa) -> 
+                                                  true;
+                                             (_) ->
+                                                  false 
+                                          end, Version), 
+    case Ciphers of
+        [_|_] ->
+            [{cert_key_alg, rsa} |
+             lists:delete(cert_key_alg,                                 
+                          [{client_cert_opts, [{ciphers, Ciphers} | COpts]}, 
+                           {server_cert_opts, SOpts} | 
+                           lists:delete(server_cert_opts, 
+                                        lists:delete(client_cert_opts, Config))])];
+        [] ->
+            {skip, {no_sup, Group, Version}}
+    end;
+init_per_group(rsa_1_3 = Group, Config0) ->
+    Config = ssl_test_lib:make_rsa_cert(Config0),
+    COpts = proplists:get_value(client_rsa_opts, Config),
+    SOpts = proplists:get_value(server_rsa_opts, Config),
+    %% Make sure _rsa* suite is choosen by ssl_test_lib:start_server
+    Version = proplists:get_value(version,Config),
+    Ciphers = ssl_cert_tests:test_ciphers(undefined, Version),
+    case Ciphers of
+        [_|_] ->
+            [{cert_key_alg, rsa} |
+             lists:delete(cert_key_alg,
+                          [{client_cert_opts, [{ciphers, Ciphers} | COpts]},
+                           {server_cert_opts, SOpts} |
+                           lists:delete(server_cert_opts,
+                                        lists:delete(client_cert_opts, Config))])];
+        [] ->
+            {skip, {no_sup, Group, Version}}
+    end;
+init_per_group(ecdsa = Group, Config0) ->
+    PKAlg = crypto:supports(public_keys),
+    case lists:member(ecdsa, PKAlg) andalso (lists:member(ecdh, PKAlg) orelse 
+                                             lists:member(dh, PKAlg)) of
+        true ->
+            Config = ssl_test_lib:make_ecdsa_cert(Config0),
+            COpts = proplists:get_value(client_ecdsa_opts, Config),
+            SOpts = proplists:get_value(server_ecdsa_opts, Config),
+            %% Make sure ecdh* suite is choosen by ssl_test_lib:start_server
+            Version = proplists:get_value(version,Config),
+            Ciphers =  ssl_cert_tests:test_ciphers(fun(ecdh_ecdsa) -> 
+                                                           true;
+                                                      (ecdhe_ecdsa) -> 
+                                                           true;
+                                                      (_) ->
+                                                           false 
+                                                   end, Version), 
+            case Ciphers of
+                [_|_] ->
+                    [{cert_key_alg, ecdsa} |
+                     lists:delete(cert_key_alg,
+                                  [{client_cert_opts, [{ciphers, Ciphers} | COpts]}, 
+                                   {server_cert_opts, SOpts} | 
+                                   lists:delete(server_cert_opts, 
+                                                lists:delete(client_cert_opts, Config))]
+                                 )];
+                        [] ->
+                    {skip, {no_sup, Group, Version}}
+            end;
+        false ->
+            {skip, "Missing EC crypto support"}
+    end;
+init_per_group(ecdsa_1_3 = Group, Config0) ->
+    PKAlg = crypto:supports(public_keys),
+    case lists:member(ecdsa, PKAlg) andalso (lists:member(ecdh, PKAlg) orelse
+                                             lists:member(dh, PKAlg)) of
+        true ->
+            Config = ssl_test_lib:make_ecdsa_cert(Config0),
+            COpts = proplists:get_value(client_ecdsa_opts, Config),
+            SOpts = proplists:get_value(server_ecdsa_opts, Config),
+            %% Make sure ecdh* suite is choosen by ssl_test_lib:start_server
+            Version = proplists:get_value(version,Config),
+            Ciphers =  ssl_cert_tests:test_ciphers(undefined, Version),
+            case Ciphers of
+                [_|_] ->
+                    [{cert_key_alg, ecdsa} |
+                     lists:delete(cert_key_alg,
+                                  [{client_cert_opts, [{ciphers, Ciphers} | COpts]},
+                                   {server_cert_opts, SOpts} |
+                                   lists:delete(server_cert_opts,
+                                                lists:delete(client_cert_opts, Config))]
+                                 )];
+                        [] ->
+                    {skip, {no_sup, Group, Version}}
+            end;
+        false ->
+            {skip, "Missing EC crypto support"}
+    end;
+init_per_group(Group, Config0) when Group == dsa ->
+    PKAlg = crypto:supports(public_keys),
+    case lists:member(dss, PKAlg) andalso lists:member(dh, PKAlg) of
+        true ->
+            Config = ssl_test_lib:make_dsa_cert(Config0),    
+            COpts = proplists:get_value(client_dsa_opts, Config),
+            SOpts = proplists:get_value(server_dsa_opts, Config),
+            %% Make sure dhe_dss* suite is choosen by ssl_test_lib:start_server
+            Version = proplists:get_value(version,Config),
+            Ciphers =  ssl_cert_tests:test_ciphers(fun(dh_dss) -> 
+                                                           true;
+                                                      (dhe_dss) -> 
+                                                           true;
+                                                      (_) ->
+                                                           false 
+                                                   end, Version), 
+            case Ciphers of
+                [_|_] ->
+                    [{cert_key_alg, dsa} |
+                     lists:delete(cert_key_alg,
+                                  [{client_cert_opts, [{ciphers, Ciphers} | COpts]}, 
+                                   {server_cert_opts, SOpts} | 
+                                   lists:delete(server_cert_opts, 
+                                                lists:delete(client_cert_opts, Config))])];
+                [] ->
+                    {skip, {no_sup, Group, Version}}
+            end;
+        false ->
+            {skip, "Missing DSS crypto support"}
+    end;    
+init_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+	true ->
+	    case ssl_test_lib:check_sane_openssl_version(GroupName) of
+		true ->
+		    [{version, GroupName} 
+                     | ssl_test_lib:init_tls_version(GroupName, Config)];
+		false ->
+		    {skip, "Missing openssl support"}
+	    end;
+	_ ->
+	    ssl:start(),
+	    Config
+    end.
+
+end_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+        true ->
+            ssl_test_lib:clean_tls_version(Config);
+        false ->
+            Config
+    end.
+
+init_per_testcase(_TestCase, Config) ->
+    ssl_test_lib:ct_log_supported_protocol_versions(Config),
+    ct:timetrap({seconds, 10}),
+    Config.
+
+end_per_testcase(_TestCase, Config) ->     
+    Config.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+no_auth() ->
+     ssl_cert_tests:no_auth().
+
+no_auth(Config) ->
+      ssl_cert_tests:no_auth(Config).
+%%--------------------------------------------------------------------
+auth() ->
+    ssl_cert_tests:auth().
+auth(Config) ->
+    ssl_cert_tests:auth(Config).
+%%--------------------------------------------------------------------
+client_auth_empty_cert_accepted() ->
+     ssl_cert_tests:client_auth_empty_cert_accepted().
+client_auth_empty_cert_accepted(Config) ->
+    ssl_cert_tests:client_auth_empty_cert_accepted(Config).
+%%--------------------------------------------------------------------
+client_auth_empty_cert_rejected() ->
+      ssl_cert_tests:client_auth_empty_cert_rejected().
+client_auth_empty_cert_rejected(Config) ->
+    ssl_cert_tests:client_auth_empty_cert_rejected(Config).
+%%--------------------------------------------------------------------
+client_auth_partial_chain() ->
+    ssl_cert_tests:client_auth_partial_chain().
+client_auth_partial_chain(Config) when is_list(Config) ->
+    ssl_cert_tests:client_auth_partial_chain(Config).
+
+%%--------------------------------------------------------------------
+client_auth_allow_partial_chain() ->
+    ssl_cert_tests:client_auth_allow_partial_chain().
+client_auth_allow_partial_chain(Config) when is_list(Config) ->
+    ssl_cert_tests:client_auth_allow_partial_chain(Config).
+%%--------------------------------------------------------------------
+client_auth_do_not_allow_partial_chain() ->
+   ssl_cert_tests:client_auth_do_not_allow_partial_chain().
+client_auth_do_not_allow_partial_chain(Config) when is_list(Config) ->
+    ssl_cert_tests:client_auth_do_not_allow_partial_chain(Config).
+
+%%--------------------------------------------------------------------
+client_auth_partial_chain_fun_fail() ->
+   ssl_cert_tests:client_auth_partial_chain_fun_fail().
+client_auth_partial_chain_fun_fail(Config) when is_list(Config) ->
+    ssl_cert_tests:client_auth_partial_chain_fun_fail(Config).
+
+%%--------------------------------------------------------------------
+missing_root_cert_no_auth() ->
+   ssl_cert_tests:missing_root_cert_no_auth().
+missing_root_cert_no_auth(Config) when is_list(Config) ->
+    ssl_cert_tests:missing_root_cert_no_auth(Config).
+
+%%--------------------------------------------------------------------
+invalid_signature_client() ->
+    ssl_cert_tests:invalid_signature_client().
+invalid_signature_client(Config) when is_list(Config) ->
+    ssl_cert_tests:invalid_signature_client(Config).
+%%--------------------------------------------------------------------
+invalid_signature_server() ->
+    ssl_cert_tests:invalid_signature_client().
+invalid_signature_server(Config) when is_list(Config) ->
+    ssl_cert_tests:invalid_signature_client(Config).
+
+%%--------------------------------------------------------------------
+%% TLS 1.3 Test Cases ------------------------------------------------
+%%--------------------------------------------------------------------
+hello_retry_request() ->
+    ssl_cert_tests:hello_retry_request().
+hello_retry_request(Config) ->
+    ssl_cert_tests:hello_retry_request(Config).
+%%--------------------------------------------------------------------
+custom_groups() ->
+    ssl_cert_tests:custom_groups().
+custom_groups(Config) ->
+    ssl_cert_tests:custom_groups(Config).
+unsupported_sign_algo_cert_client_auth() ->
+    ssl_cert_tests:unsupported_sign_algo_cert_client_auth().
+unsupported_sign_algo_cert_client_auth(Config) ->
+    ssl_cert_tests:unsupported_sign_algo_cert_client_auth(Config).
+unsupported_sign_algo_client_auth() ->
+    ssl_cert_tests:unsupported_sign_algo_client_auth().
+unsupported_sign_algo_client_auth(Config) ->
+    ssl_cert_tests:unsupported_sign_algo_client_auth(Config).
+%%--------------------------------------------------------------------
+hello_retry_client_auth() ->
+    ssl_cert_tests:hello_retry_client_auth().
+hello_retry_client_auth(Config) ->
+    ssl_cert_tests:hello_retry_client_auth(Config).
+%%--------------------------------------------------------------------
+hello_retry_client_auth_empty_cert_accepted() ->
+    ssl_cert_tests:hello_retry_client_auth_empty_cert_accepted().
+hello_retry_client_auth_empty_cert_accepted(Config) ->
+    ssl_cert_tests:hello_retry_client_auth_empty_cert_accepted(Config).
+%%--------------------------------------------------------------------
+hello_retry_client_auth_empty_cert_rejected() ->
+    ssl_cert_tests:hello_retry_client_auth_empty_cert_rejected().
+hello_retry_client_auth_empty_cert_rejected(Config) ->
+    ssl_cert_tests:hello_retry_client_auth_empty_cert_rejected(Config).
diff --git a/lib/ssl/test/openssl_session_SUITE.erl b/lib/ssl/test/openssl_session_SUITE.erl
new file mode 100644
index 0000000000..24dcaa7817
--- /dev/null
+++ b/lib/ssl/test/openssl_session_SUITE.erl
@@ -0,0 +1,262 @@
+%%
+%% %CopyrightBegin%
+%%
+%% 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.
+%% 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(openssl_session_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+-define(SLEEP, 1000).
+-define(EXPIRE, 10).
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+
+all() -> 
+    case ssl_test_lib:openssl_sane_dtls() of 
+        true ->
+            [{group, 'tlsv1.2'},
+             {group, 'tlsv1.1'},
+             {group, 'tlsv1'},
+             {group, 'sslv3'},
+             {group, 'dtlsv1.2'},
+             {group, 'dtlsv1'}];
+        false ->
+            [{group, 'tlsv1.2'},
+             {group, 'tlsv1.1'},
+             {group, 'tlsv1'},
+             {group, 'sslv3'}]
+    end.
+
+groups() ->
+     case ssl_test_lib:openssl_sane_dtls() of 
+         true ->
+             [{'tlsv1.2', [], tests()},
+              {'tlsv1.1', [], tests()},
+              {'tlsv1', [], tests()},
+              {'sslv3', [], tests()},
+              {'dtlsv1.2', [], dtls_tests()},
+              {'dtlsv1', [], dtls_tests()}
+             ];
+        false ->
+             [{'tlsv1.2', [], tests()},
+              {'tlsv1.1', [], tests()},
+              {'tlsv1', [], tests()},
+              {'sslv3', [], tests()}
+           ]
+     end.
+ 
+tests() ->
+    [    
+         reuse_session_erlang_server,
+         reuse_session_erlang_client
+    ].
+
+dtls_tests() ->
+    [    
+         reuse_session_erlang_server
+    ].
+
+
+init_per_suite(Config0) ->
+    case os:find_executable("openssl") of
+        false ->
+            {skip, "Openssl not found"};
+        _ ->
+            ct:pal("Version: ~p", [os:cmd("openssl version")]),
+            catch crypto:stop(),
+            try crypto:start() of
+                ok ->
+                    ssl_test_lib:clean_start(),
+                    ssl_test_lib:make_rsa_cert(Config0)
+            catch _:_  ->
+                    {skip, "Crypto did not start"}
+            end
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:stop(crypto),
+    ssl_test_lib:kill_openssl().
+
+init_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+        true ->
+            case ssl_test_lib:supports_ssl_tls_version(GroupName) of
+                true ->
+                    case ssl_test_lib:check_sane_openssl_version(GroupName) of
+                        true ->
+                            ssl_test_lib:init_tls_version(GroupName, Config);
+                        false ->
+                            {skip, openssl_does_not_support_version}
+                    end;
+                false ->
+                    {skip, openssl_does_not_support_version}
+            end; 
+         _ ->
+            ssl:start(),
+            Config
+    end.
+
+end_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+        true ->
+            ssl_test_lib:clean_tls_version(Config);
+        false ->
+            Config
+    end.
+
+init_per_testcase(reuse_session_erlang_client, Config) ->
+    ct:timetrap(?EXPIRE * 1000 * 5),
+    ssl:stop(),
+    application:load(ssl),
+    application:set_env(ssl, session_lifetime, ?EXPIRE),
+    ssl:start(),
+    Config;
+
+init_per_testcase(TestCase, Config) ->
+    ct:timetrap({seconds, 10}),
+    Config.
+
+end_per_testcase(reuse_session_erlang_client, Config) ->
+    application:unset_env(ssl, session_lifetime),
+    Config;
+end_per_testcase(_, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+reuse_session_erlang_server() ->
+    [{doc, "Test erlang server with openssl client that reconnects with the"
+      "same session id, to test reusing of sessions."}].
+reuse_session_erlang_server(Config) when is_list(Config) ->
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    
+    {_, 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, {ssl_test_lib, active_recv, [length(Data)]}},
+                                        {reconnect_times, 5},
+                                        {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Version = ssl_test_lib:protocol_version(Config),
+    
+    Exe = "openssl",
+    Args = ["s_client", "-connect", ssl_test_lib:hostname_format(Hostname)
+            ++ ":" ++ integer_to_list(Port),
+            ssl_test_lib:version_flag(Version),
+            "-reconnect"],
+    
+    OpenSslPort =  ssl_test_lib:portable_open_port(Exe, Args),
+    
+    true = port_command(OpenSslPort, Data),
+    
+    ssl_test_lib:check_result(Server, Data),
+    
+    %% Clean close down!   Server needs to be closed first !!
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close_port(OpenSslPort).
+
+%%--------------------------------------------------------------------
+
+reuse_session_erlang_client() ->
+    [{doc, "Test erlang ssl client that wants to reuse sessions"}].
+reuse_session_erlang_client(Config) when is_list(Config) -> 
+    process_flag(trap_exit, true),
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
+    
+    Port = ssl_test_lib:inet_port(node()),
+    CertFile = proplists:get_value(certfile, ServerOpts),
+    CACertFile = proplists:get_value(cacertfile, ServerOpts),
+    KeyFile = proplists:get_value(keyfile, ServerOpts),
+
+    Exe = "openssl",
+    Args = ["s_server", "-accept", integer_to_list(Port),
+            "-cert", CertFile,"-key", KeyFile, "-CAfile", CACertFile],
+
+    OpensslPort = ssl_test_lib:portable_open_port(Exe, Args), 
+
+    ssl_test_lib:wait_for_openssl_server(Port, tls),
+    
+    Client0 =
+        ssl_test_lib:start_client([{node, ClientNode},
+                                   {port, Port}, {host, Hostname},
+                                   {mfa, {ssl_test_lib, session_id, []}},
+                                   {from, self()},  {options, [{reuse_sessions, save}, {verify, verify_peer}| ClientOpts]}]),
+    
+    SID = receive
+              {Client0, Id0} ->
+                  Id0
+          end,
+    
+    ssl_test_lib:close(Client0),
+    
+    Client1 =
+        ssl_test_lib:start_client([{node, ClientNode},
+                                   {port, Port}, {host, Hostname},
+                                   {mfa, {ssl_test_lib, session_id, []}},
+                                   {from, self()},  {options, [{reuse_session, SID} | ClientOpts]}]),                              
+    receive
+        {Client1, SID} ->
+            ok
+    after ?SLEEP ->
+            ct:fail(session_not_reused)
+    end,
+    
+    
+    ssl_test_lib:close(Client1),
+    %% Make sure session is unregistered due to expiration
+    ct:sleep(20000),
+    
+    Client2 =
+        ssl_test_lib:start_client([{node, ClientNode},
+                                   {port, Port}, {host, Hostname},
+                                   {mfa, {ssl_test_lib, session_id, []}},
+                                   {from, self()},  {options, ClientOpts}]),
+    receive
+        {Client2, ID} ->
+            case ID of
+                SID ->    
+                    ct:fail(expired_session_reused);
+                _  ->
+                    ok
+            end
+    end,
+    
+    %% Clean close down!   Server needs to be closed first !!
+    ssl_test_lib:close_port(OpensslPort),
+    ssl_test_lib:close(Client2).
+
+
+%%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
+%%--------------------------------------------------------------------
diff --git a/lib/ssl/test/openssl_sni_SUITE.erl b/lib/ssl/test/openssl_sni_SUITE.erl
new file mode 100644
index 0000000000..26f08e36c0
--- /dev/null
+++ b/lib/ssl/test/openssl_sni_SUITE.erl
@@ -0,0 +1,251 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019-2019. 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(openssl_sni_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+-define(OPENSSL_QUIT, "Q\n").
+-define(OPENSSL_RENEGOTIATE, "R\n").
+-define(SLEEP, 1000).
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+
+all() -> 
+    %% Note: SNI not supported in sslv3
+    case ssl_test_lib:openssl_sane_dtls() of 
+        true ->
+            [{group, 'tlsv1.2'},
+             {group, 'tlsv1.1'},
+             {group, 'tlsv1'}
+             %% Seems broken in openssl 
+             %%{group, 'dtlsv1.2'},
+             %%{group, 'dtlsv1'}
+            ];
+        false ->
+            [{group, 'tlsv1.2'},
+             {group, 'tlsv1.1'},
+             {group, 'tlsv1'}]
+    end.
+
+groups() ->
+     case ssl_test_lib:openssl_sane_dtls() of 
+         true ->
+             [{'tlsv1.2', [], sni_tests()},
+              {'tlsv1.1', [], sni_tests()},
+              {'tlsv1', [], sni_tests()}
+              %% Seems broken in openssl 
+              %%{'dtlsv1.2', [], sni_tests()},
+              %%{'dtlsv1', [], sni_tests()}
+             ];
+        false ->
+             [{'tlsv1.2', [], sni_tests()},
+              {'tlsv1.1', [], sni_tests()},
+              {'tlsv1', [], sni_tests()}
+             ]
+     end.
+ 
+sni_tests() ->
+    [erlang_server_openssl_client_sni_match,
+     erlang_server_openssl_client_sni_match_fun,
+     erlang_server_openssl_client_sni_no_match,
+     erlang_server_openssl_client_sni_no_match_fun,
+     erlang_server_openssl_client_sni_no_header,
+     erlang_server_openssl_client_sni_no_header_fun].
+
+init_per_suite(Config0) ->
+    case os:find_executable("openssl") of
+        false ->
+            {skip, "Openssl not found"};
+        _ ->
+            case check_openssl_sni_support(Config0) of
+                {skip, _} = Skip ->
+                    Skip;
+                _ ->
+                    ct:pal("Version: ~p", [os:cmd("openssl version")]),
+                    catch crypto:stop(),
+                    try crypto:start() of
+                        ok ->
+                            ssl_test_lib:clean_start(),
+                            Config = ssl_test_lib:make_rsa_cert(Config0),
+                            RsaOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+                            [{sni_server_opts, [{sni_hosts,
+                                  [{"a.server", [
+                                                 {certfile, proplists:get_value(certfile, RsaOpts)},
+                                                 {keyfile,  proplists:get_value(keyfile, RsaOpts)}
+                                                ]},
+                                   {"b.server", [
+                                                 {certfile, proplists:get_value(certfile, RsaOpts)},
+                                                 {keyfile, proplists:get_value(keyfile, RsaOpts)}
+                                                ]}
+                                  ]}]} | Config]
+                    catch _:_  ->
+                            {skip, "Crypto did not start"}
+                    end
+            end
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:stop(crypto),
+    ssl_test_lib:kill_openssl().
+
+init_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+        true ->
+            case ssl_test_lib:supports_ssl_tls_version(GroupName) of
+                 true ->
+                    case ssl_test_lib:check_sane_openssl_version(GroupName) of
+                         true ->
+                            ssl_test_lib:init_tls_version(GroupName, Config);
+                         false ->
+                            {skip, openssl_does_not_support_version}
+                    end;
+                false ->
+                    {skip, openssl_does_not_support_version}
+            end; 
+         _ ->
+            Config
+    end.
+
+end_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+        true ->
+            ssl_test_lib:clean_tls_version(Config);
+       false ->
+            Config
+    end.
+
+init_per_testcase(_TestCase, Config) -> 
+    ct:timetrap({seconds, 10}),
+    Config.
+
+
+end_per_testcase(_, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+erlang_server_openssl_client_sni_no_header(Config) when is_list(Config) ->
+    erlang_server_openssl_client_sni_test(Config, undefined, undefined, "server Peer cert").
+
+erlang_server_openssl_client_sni_no_header_fun(Config) when is_list(Config) ->
+    erlang_server_openssl_client_sni_test_sni_fun(Config, undefined, undefined, "server Peer cert").
+
+erlang_server_openssl_client_sni_match(Config) when is_list(Config) ->  
+    erlang_server_openssl_client_sni_test(Config, "a.server", "a.server", "server Peer cert").
+
+erlang_server_openssl_client_sni_match_fun(Config) when is_list(Config) ->
+    erlang_server_openssl_client_sni_test_sni_fun(Config, "a.server", "a.server", "server Peer cert").
+
+erlang_server_openssl_client_sni_no_match(Config) when is_list(Config) ->
+    erlang_server_openssl_client_sni_test(Config, "c.server", undefined, "server Peer cert").
+
+erlang_server_openssl_client_sni_no_match_fun(Config) when is_list(Config) ->
+    erlang_server_openssl_client_sni_test_sni_fun(Config, "c.server", undefined, "server Peer cert").
+
+
+erlang_server_openssl_client_sni_test(Config, SNIHostname, ExpectedSNIHostname, ExpectedCN) ->
+    Version = ssl_test_lib:protocol_version(Config),
+    ct:log("Start running handshake, Config: ~p, SNIHostname: ~p, ExpectedSNIHostname: ~p, ExpectedCN: ~p", 
+           [Config, SNIHostname, ExpectedSNIHostname, ExpectedCN]),
+    ServerOptions = proplists:get_value(sni_server_opts, Config) ++ proplists:get_value(server_rsa_opts, Config),
+    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+                                        {from, self()}, {mfa, {?MODULE, send_and_hostname, []}},
+                                        {options, ServerOptions}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Exe = "openssl",
+    ClientArgs = case SNIHostname of
+		     undefined ->
+			 openssl_client_args(Version, Hostname,Port);
+		     _ ->
+			 openssl_client_args(Version, Hostname, Port, SNIHostname)
+		 end,       
+    ClientPort = ssl_test_lib:portable_open_port(Exe, ClientArgs),  
+  
+    ssl_test_lib:check_result(Server, ExpectedSNIHostname),
+    ssl_test_lib:close_port(ClientPort),
+    ssl_test_lib:close(Server),
+    ok.
+
+
+erlang_server_openssl_client_sni_test_sni_fun(Config, SNIHostname, ExpectedSNIHostname, ExpectedCN) ->
+    Version = ssl_test_lib:protocol_version(Config),
+    ct:log("Start running handshake for sni_fun, Config: ~p, SNIHostname: ~p, ExpectedSNIHostname: ~p, ExpectedCN: ~p",
+           [Config, SNIHostname, ExpectedSNIHostname, ExpectedCN]),
+    [{sni_hosts, ServerSNIConf}] = proplists:get_value(sni_server_opts, Config),
+    SNIFun = fun(Domain) -> proplists:get_value(Domain, ServerSNIConf, undefined) end,
+    ServerOptions = proplists:get_value(server_rsa_opts, Config) ++ [{sni_fun, SNIFun}],
+    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+                                        {from, self()}, {mfa, {?MODULE, send_and_hostname, []}},
+                                        {options, ServerOptions}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Exe = "openssl",
+    ClientArgs = case SNIHostname of
+		     undefined ->
+			 openssl_client_args(Version, Hostname,Port);
+		     _ ->
+			 openssl_client_args(Version, Hostname, Port, SNIHostname)
+		 end,       
+
+    ClientPort = ssl_test_lib:portable_open_port(Exe, ClientArgs), 
+    
+    ssl_test_lib:check_result(Server, ExpectedSNIHostname),
+    ssl_test_lib:close_port(ClientPort),
+    ssl_test_lib:close(Server).
+
+send_and_hostname(SSLSocket) ->
+    ssl:send(SSLSocket, "OK"),
+    case ssl:connection_information(SSLSocket, [sni_hostname]) of
+	{ok, []} ->
+	    undefined;
+	{ok, [{sni_hostname, Hostname}]} ->
+	    Hostname
+    end.
+
+openssl_client_args(Version, Hostname, Port) ->
+    ["s_client", "-connect", Hostname ++ ":" ++ integer_to_list(Port), ssl_test_lib:version_flag(Version)].
+
+openssl_client_args(Version, Hostname, Port, ServerName) ->
+    ["s_client",  "-connect", Hostname ++ ":" ++ 
+	 integer_to_list(Port), ssl_test_lib:version_flag(Version), "-servername", ServerName].
+
+check_openssl_sni_support(Config) ->
+    HelpText = os:cmd("openssl s_client --help"),
+    case ssl_test_lib:is_sane_oppenssl_client() of
+        true ->
+            case string:str(HelpText, "-servername") of
+                0 ->
+                    {skip, "Current openssl doesn't support SNI"};
+                _ ->
+                    Config
+            end;
+        false ->
+            {skip, "Current openssl doesn't support SNI or extension handling is flawed"}
+    end.
diff --git a/lib/ssl/test/openssl_tls_1_3_version_SUITE.erl b/lib/ssl/test/openssl_tls_1_3_version_SUITE.erl
new file mode 100644
index 0000000000..8a2692ec1d
--- /dev/null
+++ b/lib/ssl/test/openssl_tls_1_3_version_SUITE.erl
@@ -0,0 +1,172 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019-2019. 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(openssl_tls_1_3_version_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() -> 
+    [
+     %%{group,  openssl_server},
+     {group,  openssl_client}
+    ].
+
+groups() ->
+    [
+     %%{openssl_server, [{group, 'tlsv1.3'}]},
+     {openssl_client, [{group, 'tlsv1.3'}]},
+     {'tlsv1.3', [], cert_groups()},
+     {rsa, [], tests()},
+     {ecdsa, [], tests()}
+    ].
+
+cert_groups() ->
+    [{group, rsa},
+     {group, ecdsa}].
+
+tests() ->
+    [tls13_client_tls12_server,
+     %%tls13_client_with_ext_tls12_server,
+     tls12_client_tls13_server].
+    
+init_per_suite(Config) ->
+    catch crypto:stop(),
+    try crypto:start() of
+	ok ->
+            case ssl_test_lib:check_sane_openssl_version('tlsv1.3') of
+                true ->
+                    ssl_test_lib:clean_start(),
+                    Config;
+                false ->
+                    {skip, openssl_does_not_support_version}
+            end
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:stop(crypto).
+
+init_per_group(openssl_client, Config0) ->
+    Config = proplists:delete(server_type, proplists:delete(client_type, Config0)),
+    [{client_type, openssl}, {server_type, erlang} | Config];
+init_per_group(openssl_server, Config0) ->
+    Config = proplists:delete(server_type, proplists:delete(client_type, Config0)),
+    [{client_type, erlang}, {server_type, openssl} | Config];    
+init_per_group(rsa, Config0) ->
+    Config = ssl_test_lib:make_rsa_cert(Config0),
+    COpts = proplists:get_value(client_rsa_opts, Config),
+    SOpts = proplists:get_value(server_rsa_opts, Config),
+    [{client_cert_opts, COpts}, {server_cert_opts, SOpts} | 
+     lists:delete(server_cert_opts, lists:delete(client_cert_opts, Config))];
+init_per_group(ecdsa, Config0) ->
+    PKAlg = crypto:supports(public_keys),
+    case lists:member(ecdsa, PKAlg) andalso 
+        (lists:member(ecdh, PKAlg) orelse lists:member(dh, PKAlg)) of
+        true ->
+            Config = ssl_test_lib:make_ecdsa_cert(Config0),
+            COpts = proplists:get_value(client_ecdsa_opts, Config),
+            SOpts = proplists:get_value(server_ecdsa_opts, Config),
+            [{client_cert_opts, COpts}, {server_cert_opts, SOpts} | 
+             lists:delete(server_cert_opts, lists:delete(client_cert_opts, Config))];
+        false ->
+            {skip, "Missing EC crypto support"}
+    end;
+init_per_group(GroupName, Config) ->
+    ssl_test_lib:clean_tls_version(Config),                          
+    case ssl_test_lib:is_tls_version(GroupName) andalso 
+        ssl_test_lib:sufficient_crypto_support(GroupName) of
+	true ->
+            ssl_test_lib:init_tls_version(GroupName, Config);
+	_ ->
+	    case ssl_test_lib:sufficient_crypto_support(GroupName) of
+		true ->
+		    ssl:start(),
+		    Config;
+		false ->
+		    {skip, "Missing crypto support"}
+	    end
+    end.
+
+end_per_group(GroupName, Config) ->
+  case ssl_test_lib:is_tls_version(GroupName) of
+      true ->
+          ssl_test_lib:clean_tls_version(Config);
+      false ->
+          Config
+  end.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+tls13_client_tls12_server() ->
+    [{doc,"Test that a TLS 1.3 client can connect to a TLS 1.2 server."}].
+
+tls13_client_tls12_server(Config) when is_list(Config) ->
+    ClientOpts = [{versions,
+                   ['tlsv1.3', 'tlsv1.2']} | ssl_test_lib:ssl_options(client_cert_opts, Config)],
+    ServerOpts =  [{versions,
+                   ['tlsv1.1', 'tlsv1.2']} | ssl_test_lib:ssl_options(server_cert_opts, Config)],
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+    
+%% tls13_client_with_ext_tls12_server() ->
+%%      [{doc,"Test basic connection between TLS 1.2 server and TLS 1.3 client when " 
+%%        "client has TLS 1.3 specsific extensions"}].
+
+%% tls13_client_with_ext_tls12_server(Config) ->
+%%     ClientOpts0 = ssl_test_lib:ssl_options(client_cert_opts, Config),
+%%     ServerOpts0 = ssl_test_lib:ssl_options(server_cert_opts, Config),
+  
+%%     {ServerOpts, ClientOpts} =
+%%         case proplists:get_value(client_type) of
+%%             erlang ->
+%%                 {[{versions, ['tlsv1.2']}|ServerOpts0],
+%%                  [{versions, ['tlsv1.2','tlsv1.3']},
+%%                   {signature_algs_cert, [ecdsa_secp384r1_sha384,
+%%                                          ecdsa_secp256r1_sha256,
+%%                                          rsa_pss_rsae_sha256,
+%%                                          rsa_pkcs1_sha256,
+%%                                          {sha256,rsa},{sha256,dsa}]}|ClientOpts0]};
+%%             openssl ->
+                
+            
+%%     ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+   
+tls12_client_tls13_server() ->
+    [{doc,"Test that a TLS 1.2 client can connect to a TLS 1.3 server."}].
+
+tls12_client_tls13_server(Config) when is_list(Config) ->    
+    ClientOpts = [{versions,
+                   ['tlsv1.1', 'tlsv1.2']} | ssl_test_lib:ssl_options(client_cert_opts, Config)],
+    ServerOpts =  [{versions,
+                   ['tlsv1.3', 'tlsv1.2']} | ssl_test_lib:ssl_options(server_cert_opts, Config)],
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+   
diff --git a/lib/ssl/test/property_test/ssl_eqc_cipher_format.erl b/lib/ssl/test/property_test/ssl_eqc_cipher_format.erl
new file mode 100644
index 0000000000..f225065ba6
--- /dev/null
+++ b/lib/ssl/test/property_test/ssl_eqc_cipher_format.erl
@@ -0,0 +1,96 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2019-2019. All Rights Reserved.
+%% 
+%% 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.
+%% 
+%% %CopyrightEnd%
+%%
+%%
+
+-module(ssl_eqc_cipher_format).
+
+-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('TLS_v1.3', 'tlsv1.3').
+-define('TLS_v1.2', 'tlsv1.2').
+-define('TLS_v1.1', 'tlsv1.1').
+-define('TLS_v1',   'tlsv1').
+-define('SSL_v3',   'sslv3').
+
+%%--------------------------------------------------------------------
+%% Properties --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+prop_tls_cipher_suite_rfc_name() ->
+    ?FORALL({CipherSuite, TLSVersion}, ?LET(Version, tls_version(), {cipher_suite(Version), Version}),
+            case ssl:str_to_suite(ssl:suite_to_str(CipherSuite)) of
+		CipherSuite ->
+		    true;
+		_ ->
+		    false
+	    end
+	   ).
+
+prop_tls_cipher_suite_openssl_name() ->
+    ?FORALL({CipherSuite, TLSVersion}, ?LET(Version, tls_version(), {cipher_suite(Version), Version}),
+            case ssl:str_to_suite(ssl:suite_to_openssl_str(CipherSuite)) of
+		CipherSuite ->
+		    true;
+		_ ->
+		    false
+	    end
+	   ).
+
+
+%%--------------------------------------------------------------------
+%% Generators  -----------------------------------------------
+%%--------------------------------------------------------------------
+tls_version() ->
+    oneof([?'TLS_v1.2', ?'TLS_v1.1', ?'TLS_v1', ?'SSL_v3']).
+
+cipher_suite(Version) ->
+    oneof(cipher_suites(Version)).
+
+cipher_suites(Version) ->
+    ssl:cipher_suites(all, Version).
+
diff --git a/lib/ssl/test/property_test/ssl_eqc_handshake.erl b/lib/ssl/test/property_test/ssl_eqc_handshake.erl
new file mode 100644
index 0000000000..2ceb540e15
--- /dev/null
+++ b/lib/ssl/test/property_test/ssl_eqc_handshake.erl
@@ -0,0 +1,883 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2018-2018. All Rights Reserved.
+%% 
+%% 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.
+%% 
+%% %CopyrightEnd%
+%%
+%%
+
+-module(ssl_eqc_handshake).
+
+-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.
+
+-include_lib("kernel/include/inet.hrl").
+-include_lib("ssl/src/tls_handshake_1_3.hrl").
+-include_lib("ssl/src/tls_handshake.hrl").
+-include_lib("ssl/src/ssl_handshake.hrl").
+-include_lib("ssl/src/ssl_alert.hrl").
+-include_lib("ssl/src/ssl_internal.hrl").
+
+-define('TLS_v1.3', {3,4}).
+-define('TLS_v1.2', {3,3}).
+-define('TLS_v1.1', {3,2}).
+-define('TLS_v1',   {3,1}).
+-define('SSL_v3',   {3,0}).
+
+%%--------------------------------------------------------------------
+%% Properties --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+prop_tls_hs_encode_decode() ->
+    ?FORALL({Handshake, TLSVersion}, ?LET(Version, tls_version(), {tls_msg(Version), Version}),
+            try 
+                [Type, _Length, Data] = tls_handshake:encode_handshake(Handshake, TLSVersion),
+                case tls_handshake:decode_handshake(TLSVersion, Type, Data) of
+                    Handshake ->
+                        true;
+                    _ ->
+                        false
+                end
+            catch
+                throw:#alert{} ->
+                    true
+            end
+	   ).
+
+%%--------------------------------------------------------------------
+%% Message Generators  -----------------------------------------------
+%%--------------------------------------------------------------------
+
+tls_msg(?'TLS_v1.3'= Version) ->
+    oneof([client_hello(Version),
+           server_hello(Version),
+           %%new_session_ticket()
+          #end_of_early_data{},
+           encrypted_extensions(),
+           certificate_1_3(),
+           %%certificate_request_1_3,
+           certificate_verify_1_3(),
+           finished(),
+           key_update()
+          ]);
+tls_msg(Version) ->
+    oneof([
+           #hello_request{},
+           client_hello(Version),
+           server_hello(Version),
+           certificate(),
+           %%server_key_exchange()
+           certificate_request(Version),
+           #server_hello_done{},
+           %%certificate_verify()
+           %%client_key_exchange()
+           finished()
+          ]).
+
+%%
+%% Shared messages
+%%
+client_hello(?'TLS_v1.3' = Version) ->
+    #client_hello{session_id = session_id(),
+                  client_version = ?'TLS_v1.2',
+                  cipher_suites = cipher_suites(Version),
+                  compression_methods = compressions(Version),
+                  random = client_random(Version),
+                  extensions = client_hello_extensions(Version)
+                 };
+client_hello(Version) ->
+    #client_hello{session_id = session_id(),
+		  client_version = Version,
+                  cipher_suites = cipher_suites(Version),
+		  compression_methods = compressions(Version),
+		  random = client_random(Version),
+		  extensions = client_hello_extensions(Version)    
+                 };
+client_hello(?'SSL_v3' = Version) ->
+    #client_hello{session_id = session_id(),
+		  client_version = Version,
+                  cipher_suites = cipher_suites(Version),
+		  compression_methods = compressions(Version),
+		  random = client_random(Version),
+		  extensions = ssl_handshake:empty_extensions(Version, client_hello)
+                 }.
+
+server_hello(?'TLS_v1.3' = Version) ->
+    #server_hello{server_version = ?'TLS_v1.2',
+		  session_id = session_id(),
+                  random = server_random(Version),
+                  cipher_suite = cipher_suite(Version),
+		  compression_method = compression(Version),
+		  extensions = server_hello_extensions(Version)    
+                 };
+server_hello(?'SSL_v3' = Version) ->
+    #server_hello{server_version = Version,
+		  session_id = session_id(),
+                  random = server_random(Version),
+                  cipher_suite = cipher_suite(Version),
+		  compression_method = compression(Version),
+		  extensions = ssl_handshake:empty_extensions(Version, server_hello)
+                 };
+server_hello(Version) ->
+    #server_hello{server_version = Version,
+		  session_id = session_id(),
+                  random = server_random(Version),
+                  cipher_suite = cipher_suite(Version),
+		  compression_method = compression(Version),
+		  extensions = server_hello_extensions(Version)    
+                 }.
+
+certificate() ->
+    #certificate{
+       asn1_certificates = certificate_chain()
+      }.
+
+certificate_1_3() ->
+     ?LET(Certs, certificate_chain(),
+          #certificate_1_3{
+             certificate_request_context = certificate_request_context(),
+             certificate_list = certificate_entries(Certs, [])
+            }).
+
+certificate_verify_1_3() ->
+     ?LET(Certs, certificate_chain(),
+          #certificate_verify_1_3{
+             algorithm = sig_scheme(),
+             signature = signature()
+            }).
+
+finished() ->
+    ?LET(Size, digest_size(),
+         #finished{verify_data = crypto:strong_rand_bytes(Size)}).
+
+%%
+%% TLS 1.0-1.2 messages
+%%
+
+
+
+%%
+%% TLS 1.3 messages
+%%
+
+encrypted_extensions() ->
+    ?LET(Exts, extensions(?'TLS_v1.3', encrypted_extensions),
+         #encrypted_extensions{extensions = Exts}).
+
+
+key_update() ->
+    #key_update{request_update = request_update()}.
+
+
+%%--------------------------------------------------------------------
+%% Messge Data Generators  -------------------------------------------
+%%--------------------------------------------------------------------
+
+tls_version() ->
+    oneof([?'TLS_v1.3', ?'TLS_v1.2', ?'TLS_v1.1', ?'TLS_v1', ?'SSL_v3']).
+
+cipher_suite(Version) ->
+    oneof(cipher_suites(Version)).
+
+cipher_suites(Version) ->
+    ssl_cipher:suites(Version).
+
+session_id() ->
+    crypto:strong_rand_bytes(?NUM_OF_SESSION_ID_BYTES).
+ 
+compression(Version) ->
+     oneof(compressions(Version)).
+
+compressions(_) -> 
+    ssl_record:compressions().
+
+client_random(_) ->
+    crypto:strong_rand_bytes(32).
+
+server_random(_) ->
+    crypto:strong_rand_bytes(32).
+
+
+client_hello_extensions(Version) ->
+    ?LET(Exts, extensions(Version, client_hello),
+         maps:merge(ssl_handshake:empty_extensions(Version, client_hello),
+                    Exts)).
+
+server_hello_extensions(Version) ->
+    ?LET(Exts, extensions(Version, server_hello),
+         maps:merge(ssl_handshake:empty_extensions(Version, server_hello),
+                    Exts)).
+
+key_share_client_hello() ->
+     oneof([undefined]).
+    %%oneof([#key_share_client_hello{}, undefined]).
+
+key_share_server_hello() ->
+     oneof([undefined]).
+    %%oneof([#key_share_server_hello{}, undefined]).
+
+pre_shared_keyextension() ->
+     oneof([undefined]).
+     %%oneof([#pre_shared_keyextension{},undefined]).
+
+%% +--------------------------------------------------+-------------+
+%% | Extension                                        |     TLS 1.3 |
+%% +--------------------------------------------------+-------------+
+%% | server_name [RFC6066]                            |      CH, EE |
+%% |                                                  |             |
+%% | max_fragment_length [RFC6066]                    |      CH, EE |
+%% |                                                  |             |
+%% | status_request [RFC6066]                         |  CH, CR, CT |
+%% |                                                  |             |
+%% | supported_groups [RFC7919]                       |      CH, EE |
+%% |                                                  |             |
+%% | signature_algorithms (RFC 8446)                  |      CH, CR |
+%% |                                                  |             |
+%% | use_srtp [RFC5764]                               |      CH, EE |
+%% |                                                  |             |
+%% | heartbeat [RFC6520]                              |      CH, EE |
+%% |                                                  |             |
+%% | application_layer_protocol_negotiation [RFC7301] |      CH, EE |
+%% |                                                  |             |
+%% | signed_certificate_timestamp [RFC6962]           |  CH, CR, CT |
+%% |                                                  |             |
+%% | client_certificate_type [RFC7250]                |      CH, EE |
+%% |                                                  |             |
+%% | server_certificate_type [RFC7250]                |      CH, EE |
+%% |                                                  |             |
+%% | padding [RFC7685]                                |          CH |
+%% |                                                  |             |
+%% | key_share (RFC 8446)                             | CH, SH, HRR |
+%% |                                                  |             |
+%% | pre_shared_key (RFC 8446)                        |      CH, SH |
+%% |                                                  |             |
+%% | psk_key_exchange_modes (RFC 8446)                |          CH |
+%% |                                                  |             |
+%% | early_data (RFC 8446)                            | CH, EE, NST |
+%% |                                                  |             |
+%% | cookie (RFC 8446)                                |     CH, HRR |
+%% |                                                  |             |
+%% | supported_versions (RFC 8446)                    | CH, SH, HRR |
+%% |                                                  |             |
+%% | certificate_authorities (RFC 8446)               |      CH, CR |
+%% |                                                  |             |
+%% | oid_filters (RFC 8446)                           |          CR |
+%% |                                                  |             |
+%% | post_handshake_auth (RFC 8446)                   |          CH |
+%% |                                                  |             |
+%% | signature_algorithms_cert (RFC 8446)             |      CH, CR |
+%% +--------------------------------------------------+-------------+
+extensions(?'TLS_v1.3' = Version, MsgType = client_hello) ->
+     ?LET({
+           ServerName,
+           %% MaxFragmentLength,
+           %% StatusRequest,
+           SupportedGroups,
+           SignatureAlgorithms,
+           %% UseSrtp,
+           %% Heartbeat,
+           ALPN,
+           %% SignedCertTimestamp,
+           %% ClientCertiticateType,
+           %% ServerCertificateType,
+           %% Padding,
+           KeyShare,
+           PreSharedKey,
+           PSKKeyExchangeModes,
+           %% EarlyData,
+           %% Cookie,
+           SupportedVersions,
+           %% CertAuthorities,
+           %% PostHandshakeAuth,
+           SignatureAlgorithmsCert
+          },
+          {
+           oneof([server_name(), undefined]),
+           %% oneof([max_fragment_length(), undefined]),
+           %% oneof([status_request(), undefined]),
+           oneof([supported_groups(Version), undefined]),
+           oneof([signature_algs(Version), undefined]),
+           %% oneof([use_srtp(), undefined]),
+           %% oneof([heartbeat(), undefined]),
+           oneof([alpn(), undefined]),
+           %% oneof([signed_cert_timestamp(), undefined]),
+           %% oneof([client_cert_type(), undefined]),
+           %% oneof([server_cert_type(), undefined]),
+           %% oneof([padding(), undefined]),
+           oneof([key_share(MsgType), undefined]),
+           oneof([pre_shared_key(MsgType), undefined]),
+           oneof([psk_key_exchange_modes(), undefined]),
+           %% oneof([early_data(), undefined]),
+           %% oneof([cookie(), undefined]),
+           oneof([client_hello_versions(Version)]),
+           %% oneof([cert_authorities(), undefined]),
+           %% oneof([post_handshake_auth(), undefined]),
+           oneof([signature_algs_cert(), undefined])
+          },
+          maps:filter(fun(_, undefined) ->
+                              false;
+                         (_,_) ->
+                              true
+                      end,
+                      #{
+                        sni => ServerName,
+                        %% max_fragment_length => MaxFragmentLength,
+                        %% status_request => StatusRequest,
+                        elliptic_curves => SupportedGroups,
+                        signature_algs => SignatureAlgorithms,
+                        %% use_srtp => UseSrtp,
+                        %% heartbeat => Heartbeat,
+                        alpn => ALPN,
+                        %% signed_cert_timestamp => SignedCertTimestamp,
+                        %% client_cert_type => ClientCertificateType,
+                        %% server_cert_type => ServerCertificateType,
+                        %% padding => Padding,
+                        key_share => KeyShare,
+                        pre_shared_key => PreSharedKey,
+                        psk_key_exchange_modes => PSKKeyExchangeModes,
+                        %% early_data => EarlyData,
+                        %% cookie => Cookie,
+                        client_hello_versions => SupportedVersions,
+                        %% cert_authorities => CertAuthorities,
+                        %% post_handshake_auth => PostHandshakeAuth,
+                        signature_algs_cert => SignatureAlgorithmsCert
+                       }));
+extensions(?'SSL_v3', client_hello) ->
+    #{};
+extensions(Version, client_hello) ->
+    ?LET({
+          SNI,
+          ECPoitF,
+          ECCurves,
+          ALPN,
+          NextP,
+          SRP
+          %% RenegotiationInfo
+         },
+         {
+          oneof([sni(), undefined]),
+          oneof([ec_point_formats(), undefined]),
+          oneof([elliptic_curves(Version), undefined]), 
+          oneof([alpn(),  undefined]), 
+          oneof([next_protocol_negotiation(), undefined]),
+          oneof([srp(), undefined])
+          %% oneof([renegotiation_info(), undefined])
+         },
+         maps:filter(fun(_, undefined) -> 
+                             false;
+                        (_,_) -> 
+                             true 
+                     end, 
+                     #{
+                       sni => SNI,
+                       ec_point_formats => ECPoitF,
+                       elliptic_curves => ECCurves,
+                       alpn => ALPN,
+                       next_protocol_negotiation => NextP,
+                       srp => SRP
+                       %% renegotiation_info => RenegotiationInfo
+                      }));
+extensions(?'TLS_v1.3' = Version, MsgType = server_hello) ->
+    ?LET({
+          KeyShare,
+          PreSharedKey,
+          SupportedVersions
+         },
+         {
+          oneof([key_share(MsgType), undefined]),
+          oneof([pre_shared_key(MsgType),  undefined]),
+          oneof([server_hello_selected_version()])
+         },
+         maps:filter(fun(_, undefined) ->
+                             false;
+                        (_,_) ->
+                             true
+                     end,
+                     #{
+                       key_share => KeyShare,
+                       pre_shared_key => PreSharedKey,
+                       server_hello_selected_version => SupportedVersions
+                      }));
+extensions(Version, server_hello) ->
+    ?LET({
+          ECPoitF,
+          ALPN,
+          NextP
+          %% RenegotiationInfo,
+         },
+         {
+          oneof([ec_point_formats(), undefined]),
+          oneof([alpn(),  undefined]),
+          oneof([next_protocol_negotiation(), undefined])
+          %% oneof([renegotiation_info(), undefined]),
+         },
+         maps:filter(fun(_, undefined) ->
+                             false;
+                        (_,_) ->
+                             true
+                     end,
+                     #{
+                       ec_point_formats => ECPoitF,
+                       alpn => ALPN,
+                       next_protocol_negotiation => NextP
+                       %% renegotiation_info => RenegotiationInfo
+                      }));
+extensions(?'TLS_v1.3' = Version, encrypted_extensions) ->
+     ?LET({
+           ServerName,
+           %% MaxFragmentLength,
+           SupportedGroups,
+           %% UseSrtp,
+           %% Heartbeat,
+           ALPN
+           %% ClientCertiticateType,
+           %% ServerCertificateType,
+           %% EarlyData
+          },
+          {
+           oneof([server_name(), undefined]),
+           %% oneof([max_fragment_length(), undefined]),
+           oneof([supported_groups(Version), undefined]),
+           %% oneof([use_srtp(), undefined]),
+           %% oneof([heartbeat(), undefined]),
+           oneof([alpn(), undefined])
+           %% oneof([client_cert_type(), undefined]),
+           %% oneof([server_cert_type(), undefined]),
+           %% oneof([early_data(), undefined])
+          },
+          maps:filter(fun(_, undefined) ->
+                              false;
+                         (_,_) ->
+                              true
+                      end,
+                      #{
+                        sni => ServerName,
+                        %% max_fragment_length => MaxFragmentLength,
+                        elliptic_curves => SupportedGroups,
+                        %% use_srtp => UseSrtp,
+                        %% heartbeat => Heartbeat,
+                        alpn => ALPN
+                        %% client_cert_type => ClientCertificateType,
+                        %% server_cert_type => ServerCertificateType,
+                        %% early_data => EarlyData
+                       })).
+
+server_name() ->
+  ?LET(ServerName, sni(),
+       ServerName).
+    %% sni().
+
+signature_algs_cert() ->
+    ?LET(List,  sig_scheme_list(),
+         #signature_algorithms_cert{signature_scheme_list = List}).
+
+signature_algorithms() ->
+    ?LET(List,  sig_scheme_list(), 
+         #signature_algorithms{signature_scheme_list = List}).
+
+sig_scheme_list() ->
+    oneof([[rsa_pkcs1_sha256],
+           [rsa_pkcs1_sha256, ecdsa_sha1],
+           [rsa_pkcs1_sha256,
+            rsa_pkcs1_sha384,
+            rsa_pkcs1_sha512,
+            ecdsa_secp256r1_sha256,
+            ecdsa_secp384r1_sha384,
+            ecdsa_secp521r1_sha512,
+            rsa_pss_rsae_sha256,
+            rsa_pss_rsae_sha384,
+            rsa_pss_rsae_sha512,
+            rsa_pss_pss_sha256,
+            rsa_pss_pss_sha384,
+            rsa_pss_pss_sha512,
+            rsa_pkcs1_sha1,
+            ecdsa_sha1]
+          ]).
+
+sig_scheme() ->
+    oneof([rsa_pkcs1_sha256,
+            rsa_pkcs1_sha384,
+            rsa_pkcs1_sha512,
+            ecdsa_secp256r1_sha256,
+            ecdsa_secp384r1_sha384,
+            ecdsa_secp521r1_sha512,
+            rsa_pss_rsae_sha256,
+            rsa_pss_rsae_sha384,
+            rsa_pss_rsae_sha512,
+            rsa_pss_pss_sha256,
+            rsa_pss_pss_sha384,
+            rsa_pss_pss_sha512,
+            rsa_pkcs1_sha1,
+            ecdsa_sha1]).
+
+signature() ->
+    <<44,119,215,137,54,84,156,26,121,212,64,173,189,226,
+      191,46,76,89,204,2,78,79,163,228,90,21,89,179,4,198,
+      109,14,52,26,230,22,56,8,170,129,86,0,7,132,245,81,
+      181,131,62,70,79,167,112,85,14,171,175,162,110,29,
+      212,198,45,188,83,176,251,197,224,104,95,74,89,59,
+      26,60,63,79,238,196,137,65,23,199,127,145,176,184,
+      216,3,48,116,172,106,97,83,227,172,246,137,91,79,
+      173,119,169,60,67,1,177,117,9,93,38,86,232,253,73,
+      140,17,147,130,110,136,245,73,10,91,70,105,53,225,
+      158,107,60,190,30,14,26,92,147,221,60,117,104,53,70,
+      142,204,7,131,11,183,192,120,246,243,68,99,147,183,
+      49,149,48,188,8,218,17,150,220,121,2,99,194,140,35,
+      13,249,201,37,216,68,45,87,58,18,10,106,11,132,241,
+      71,170,225,216,197,212,29,107,36,80,189,184,202,56,
+      86,213,45,70,34,74,71,48,137,79,212,194,172,151,57,
+      57,30,126,24,157,198,101,220,84,162,89,105,185,245,
+      76,105,212,176,25,6,148,49,194,106,253,241,212,200,
+      37,154,227,53,49,216,72,82,163>>.
+
+client_hello_versions(?'TLS_v1.3') ->
+    ?LET(SupportedVersions,
+         oneof([[{3,4}],
+                %% This list breaks the property but can be used for negative tests
+                %% [{3,3},{3,4}],
+                [{3,4},{3,3}],
+                [{3,4},{3,3},{3,2},{3,1},{3,0}]
+               ]),
+        #client_hello_versions{versions = SupportedVersions});
+client_hello_versions(_) ->
+    ?LET(SupportedVersions,
+         oneof([[{3,3}],
+                [{3,3},{3,2}],
+                [{3,3},{3,2},{3,1},{3,0}]
+               ]),
+        #client_hello_versions{versions = SupportedVersions}).
+
+server_hello_selected_version() ->
+    #server_hello_selected_version{selected_version = {3,4}}.
+
+request_update() ->
+     oneof([?UPDATE_NOT_REQUESTED, ?UPDATE_REQUESTED]).
+
+certificate_chain()->
+    Conf = cert_conf(),
+    ?LET(Chain, 
+         choose_certificate_chain(Conf),
+         Chain).
+
+choose_certificate_chain(#{server_config := ServerConf,
+                           client_config := ClientConf}) -> 
+    oneof([certificate_chain(ServerConf), certificate_chain(ClientConf)]).
+
+certificate_request_context() ->
+    oneof([<<>>,
+           <<1>>,
+           <<"foobar">>
+          ]).
+certificate_entries([], Acc) ->
+    lists:reverse(Acc);
+certificate_entries([Cert | Rest], Acc) ->
+    certificate_entries(Rest, [certificate_entry(Cert) | Acc]).
+
+certificate_entry(Cert) ->
+    #certificate_entry{data = Cert,
+                       extensions = certificate_entry_extensions()
+                      }.
+certificate_entry_extensions() ->
+    #{}.
+
+certificate_chain(Conf) ->  
+    CAs = proplists:get_value(cacerts, Conf),
+    Cert = proplists:get_value(cert, Conf),
+    %% Middle argument are of correct type but will not be used
+    {ok, _, Chain} = ssl_certificate:certificate_chain(Cert, ets:new(foo, []), make_ref(), CAs), 
+    Chain.
+
+cert_conf()->
+    Hostname = net_adm:localhost(),
+    {ok, #hostent{h_addr_list = [_IP |_]}} = inet:gethostbyname(net_adm:localhost()),
+    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 => [{extensions, [#'Extension'{extnID = 
+                                                                              ?'id-ce-subjectAltName',
+                                                                          extnValue = [{dNSName, Hostname}],
+                                                                          critical = false}]},
+                                               {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)}]}}).
+
+certificate_request(Version) ->
+    #certificate_request{certificate_types = certificate_types(Version),
+			 hashsign_algorithms = hashsign_algorithms(Version),
+			 certificate_authorities = certificate_authorities()}.
+
+certificate_types(?'TLS_v1.3') ->
+    iolist_to_binary([<<?BYTE(?ECDSA_SIGN)>>, <<?BYTE(?RSA_SIGN)>>]);
+certificate_types(?'TLS_v1.2') ->
+    iolist_to_binary([<<?BYTE(?ECDSA_SIGN)>>, <<?BYTE(?RSA_SIGN)>>, <<?BYTE(?DSS_SIGN)>>]);
+certificate_types(_) ->
+    iolist_to_binary([<<?BYTE(?ECDSA_SIGN)>>, <<?BYTE(?RSA_SIGN)>>, <<?BYTE(?DSS_SIGN)>>]).
+
+
+
+signature_algs({3,4}) ->
+    ?LET(Algs, signature_algorithms(),
+         Algs);
+signature_algs({3,3} = Version) ->
+        #hash_sign_algos{hash_sign_algos = hash_alg_list(Version)};
+signature_algs(Version) when Version < {3,3} ->
+    undefined.
+
+
+
+hashsign_algorithms({_, N} = Version) when N >= 3 ->                                 
+    #hash_sign_algos{hash_sign_algos = hash_alg_list(Version)};
+hashsign_algorithms(_) -> 
+    undefined.
+
+hash_alg_list(Version) ->
+    ?LET(NumOf, choose(1,15),
+	 ?LET(List, [hash_alg(Version) || _ <- lists:seq(1,NumOf)],
+	      lists:usort(List)
+             )).
+    
+hash_alg(Version) ->
+   ?LET(Alg, sign_algorithm(Version),
+         {hash_algorithm(Version, Alg), Alg}
+       ).
+
+hash_algorithm(?'TLS_v1.3', _) ->
+    oneof([sha, sha224, sha256, sha384, sha512]);
+hash_algorithm(?'TLS_v1.2', rsa) ->
+    oneof([sha, sha224, sha256, sha384, sha512]);
+hash_algorithm(_, rsa) ->
+    oneof([md5, sha, sha224, sha256, sha384, sha512]);
+hash_algorithm(_, ecdsa) ->
+    oneof([sha, sha224, sha256, sha384, sha512]);
+hash_algorithm(_, dsa) ->
+    sha.
+
+sign_algorithm(?'TLS_v1.3') ->
+    oneof([rsa, ecdsa]);
+sign_algorithm(_) ->
+    oneof([rsa, dsa, ecdsa]).
+
+certificate_authorities() ->
+    #{server_config := ServerConf} = cert_conf(), 
+    Authorities = proplists:get_value(cacerts, ServerConf),
+    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(public_key:pkix_decode_cert(DERCert, otp)) || DERCert <- Authorities]).
+
+digest_size()->
+   oneof([160,224,256,384,512]).
+
+key_share_entry() ->
+    undefined.
+    %%#key_share_entry{}.
+
+server_hello_selected_version(Version) ->
+    #server_hello_selected_version{selected_version = Version}.
+
+sni() ->
+    #sni{hostname = net_adm:localhost()}.
+
+ec_point_formats() ->
+    #ec_point_formats{ec_point_format_list = ec_point_format_list()}.
+ 
+ec_point_format_list() ->
+    [?ECPOINT_UNCOMPRESSED].
+
+elliptic_curves({_, Minor}) when Minor < 4 ->
+    Curves = tls_v1:ecc_curves(Minor),
+    #elliptic_curves{elliptic_curve_list = Curves}.
+
+%% RFC 8446 (TLS 1.3) renamed the "elliptic_curve" extension.
+supported_groups({_, Minor}) when Minor >= 4 ->
+    SupportedGroups = tls_v1:groups(Minor),
+    #supported_groups{supported_groups = SupportedGroups}.
+
+
+alpn() ->
+    ?LET(ExtD,  alpn_protocols(), #alpn{extension_data = ExtD}).
+
+alpn_protocols() ->
+    oneof([<<"spdy/2">>, <<"spdy/3">>, <<"http/2">>, <<"http/1.0">>, <<"http/1.1">>]).
+    
+next_protocol_negotiation() ->
+   %% Predecessor to APLN
+    ?LET(ExtD,  alpn_protocols(), #next_protocol_negotiation{extension_data = ExtD}).
+
+srp() ->
+   ?LET(Name, gen_name(),  #srp{username = list_to_binary(Name)}).
+
+renegotiation_info() ->
+    #renegotiation_info{renegotiated_connection = 0}.
+
+gen_name() -> 
+    ?LET(Size, choose(1,10), gen_string(Size)).
+
+gen_char() -> 
+    choose($a,$z).
+
+gen_string(N) ->
+    gen_string(N, []).
+
+gen_string(0, Acc) ->
+    Acc;
+gen_string(N, Acc) ->
+    ?LET(Char, gen_char(), gen_string(N-1, [Char | Acc])).
+
+key_share(client_hello) ->
+    ?LET(ClientShares, key_share_entry_list(),
+        #key_share_client_hello{
+          client_shares = ClientShares});
+key_share(server_hello) ->
+    ?LET([ServerShare], key_share_entry_list(1),
+        #key_share_server_hello{
+          server_share = ServerShare}).
+
+key_share_entry_list() ->
+    Max = length(ssl:groups()),
+    ?LET(Size, choose(1,Max), key_share_entry_list(Size)).
+%%
+key_share_entry_list(N) ->
+    key_share_entry_list(N, ssl:groups(), []).
+%%
+key_share_entry_list(0, _Pool, Acc) ->
+    Acc;
+key_share_entry_list(N, Pool, Acc) ->
+    R = rand:uniform(length(Pool)),
+    G = lists:nth(R, Pool),
+    P = generate_public_key(G),
+    KeyShareEntry =
+        #key_share_entry{
+          group = G,
+          key_exchange = P},
+    key_share_entry_list(N - 1, Pool -- [G], [KeyShareEntry|Acc]).
+
+%% TODO: fix curve generation
+generate_public_key(Group)
+  when Group =:= secp256r1 orelse
+       Group =:= secp384r1 orelse
+       Group =:= secp521r1 orelse
+       Group =:= x448 orelse
+       Group =:= x25519 ->
+    #'ECPrivateKey'{publicKey = PublicKey} =
+        public_key:generate_key({namedCurve, secp256r1}),
+    PublicKey;
+generate_public_key(Group) ->
+    {PublicKey, _} =
+        public_key:generate_key(ssl_dh_groups:dh_params(Group)),
+    PublicKey.
+
+groups() ->
+    Max = length(ssl:groups()),
+    ?LET(Size, choose(1,Max), group_list(Size)).
+
+group_list(N) ->
+    group_list(N, ssl:groups(), []).
+%%
+group_list(0, _Pool, Acc) ->
+    Acc;
+group_list(N, Pool, Acc) ->
+    R = rand:uniform(length(Pool)),
+    G = lists:nth(R, Pool),
+    group_list(N - 1, Pool -- [G], [G|Acc]).
+
+
+ke_modes() ->
+    oneof([[psk_ke],[psk_dhe_ke],[psk_ke,psk_dhe_ke]]).
+
+psk_key_exchange_modes() ->
+    ?LET(KEModes, ke_modes(),
+         #psk_key_exchange_modes{
+            ke_modes = KEModes}).
+
+pre_shared_key(client_hello) ->
+    ?LET(OfferedPsks, offered_psks(),
+         #pre_shared_key_client_hello{
+            offered_psks = OfferedPsks});
+pre_shared_key(server_hello) ->
+    ?LET(SelectedIdentity, selected_identity(),
+         #pre_shared_key_server_hello{
+           selected_identity = SelectedIdentity}).
+
+selected_identity() ->
+    rand:uniform(32).
+
+offered_psks() ->
+    ?LET(Size, choose(1,5),
+         #offered_psks{
+            identities = psk_identities(Size),
+            binders = psk_binders(Size)}).
+
+psk_identities(Size) ->
+    psk_identities(Size, []).
+%%
+psk_identities(0, Acc) ->
+    Acc;
+psk_identities(N, Acc) ->
+    psk_identities(N - 1, [psk_identity()|Acc]).
+
+psk_identity() ->
+    Len = rand:uniform(32),
+    Identity = crypto:strong_rand_bytes(Len),
+    Age = crypto:strong_rand_bytes(4),
+    #psk_identity{
+      identity = Identity,
+      obfuscated_ticket_age = Age}.
+
+psk_binders(Size) ->
+    psk_binders(Size, []).
+%%
+psk_binders(0, Acc) ->
+    Acc;
+psk_binders(N, Acc) ->
+    psk_binders(N - 1, [psk_binder()|Acc]).
+
+psk_binder() ->
+    Len = rand:uniform(224) + 31,
+    crypto:strong_rand_bytes(Len).
diff --git a/lib/ssl/test/ssl.spec b/lib/ssl/test/ssl.spec
index cb54168d36..15587abecd 100644
--- a/lib/ssl/test/ssl.spec
+++ b/lib/ssl/test/ssl.spec
@@ -1,4 +1,12 @@
-{suites,"../ssl_test",all}.
-{skip_suites, "../ssl_test",
-     [ssl_bench_SUITE, ssl_dist_bench_SUITE],
-     "Benchmarks run separately"}.
+% {merge_tests,false}.
+{alias,dir,"../ssl_test"}.
+
+{suites,dir,all}.
+{skip_groups,dir,ssl_bench_SUITE,setup,"Benchmarks run separately"}.
+{skip_groups,dir,ssl_bench_SUITE,payload,"Benchmarks run separately"}.
+{skip_groups,dir,ssl_bench_SUITE,pem_cache,"Benchmarks run separately"}.
+{skip_groups,dir,ssl_dist_bench_SUITE,setup,"Benchmarks run separately"}.
+{skip_groups,dir,ssl_dist_bench_SUITE,roundtrip,"Benchmarks run separately"}.
+{skip_groups,dir,ssl_dist_bench_SUITE,throughput,"Benchmarks run separately"}.
+{skip_groups,dir,ssl_dist_bench_SUITE,sched_utilization,"Benchmarks run separately"}.
+
diff --git a/lib/ssl/test/ssl_ECC_SUITE.erl b/lib/ssl/test/ssl_ECC_SUITE.erl
index a5309e866b..d02888793c 100644
--- a/lib/ssl/test/ssl_ECC_SUITE.erl
+++ b/lib/ssl/test/ssl_ECC_SUITE.erl
@@ -51,35 +51,7 @@ groups() ->
     ].
 
 test_cases()->
-    key_cert_combinations()
-        ++ misc() 
-        ++ ecc_negotiation().
-
-key_cert_combinations() ->
-    server_ecdh_rsa() ++
-        server_ecdhe_rsa() ++
-        server_ecdh_ecdsa() ++
-        server_ecdhe_ecdsa().
-
-server_ecdh_rsa() ->
-    [client_ecdh_rsa_server_ecdh_rsa,
-     client_ecdhe_rsa_server_ecdh_rsa,     
-     client_ecdhe_ecdsa_server_ecdh_rsa].
-
-server_ecdhe_rsa() ->
-    [client_ecdh_rsa_server_ecdhe_rsa,
-     client_ecdhe_rsa_server_ecdhe_rsa,
-     client_ecdhe_ecdsa_server_ecdhe_rsa].
-
-server_ecdh_ecdsa() ->
-    [client_ecdh_ecdsa_server_ecdh_ecdsa,
-     client_ecdhe_rsa_server_ecdh_ecdsa,
-     client_ecdhe_ecdsa_server_ecdh_ecdsa].
-
-server_ecdhe_ecdsa() ->
-    [client_ecdh_rsa_server_ecdhe_ecdsa,
-     client_ecdh_ecdsa_server_ecdhe_ecdsa,
-     client_ecdhe_ecdsa_server_ecdhe_ecdsa].
+    misc() ++ ecc_negotiation().
 
 misc()->
     [client_ecdsa_server_ecdsa_with_raw_key].
@@ -160,35 +132,6 @@ end_per_testcase(_TestCase, Config) ->
 %% Test diffrent certificate chain types, note that it is the servers
 %% chain that affect what cipher suit that will be choosen
 
-%% ECDH_RSA 
-client_ecdh_rsa_server_ecdh_rsa(Config) when is_list(Config) ->
-    ssl_ECC:client_ecdh_rsa_server_ecdh_rsa(Config).
-client_ecdhe_rsa_server_ecdh_rsa(Config) when is_list(Config) ->
-    ssl_ECC:client_ecdhe_rsa_server_ecdh_rsa(Config).
-client_ecdhe_ecdsa_server_ecdh_rsa(Config) when is_list(Config) ->
-    ssl_ECC:client_ecdhe_ecdsa_server_ecdh_rsa(Config).
-%% ECDHE_RSA    
-client_ecdh_rsa_server_ecdhe_rsa(Config)  when is_list(Config) ->
-    ssl_ECC:client_ecdh_rsa_server_ecdhe_rsa(Config).
-client_ecdhe_rsa_server_ecdhe_rsa(Config) when is_list(Config) ->
-    ssl_ECC:client_ecdhe_rsa_server_ecdhe_rsa(Config).
-client_ecdhe_ecdsa_server_ecdhe_rsa(Config) when is_list(Config) ->
-   ssl_ECC:client_ecdhe_ecdsa_server_ecdhe_rsa(Config).
-%% ECDH_ECDSA
-client_ecdh_ecdsa_server_ecdh_ecdsa(Config) when is_list(Config) ->
-    ssl_ECC:client_ecdh_ecdsa_server_ecdh_ecdsa(Config).
-client_ecdhe_rsa_server_ecdh_ecdsa(Config) when is_list(Config) ->
-    ssl_ECC:client_ecdhe_rsa_server_ecdh_ecdsa(Config).
-client_ecdhe_ecdsa_server_ecdh_ecdsa(Config) when is_list(Config) ->
-    ssl_ECC:client_ecdhe_ecdsa_server_ecdh_ecdsa(Config).
-%% ECDHE_ECDSA
-client_ecdh_rsa_server_ecdhe_ecdsa(Config) when is_list(Config) ->
-    ssl_ECC:client_ecdh_rsa_server_ecdhe_ecdsa(Config).
-client_ecdh_ecdsa_server_ecdhe_ecdsa(Config) when is_list(Config) ->
-    ssl_ECC:client_ecdh_ecdsa_server_ecdhe_ecdsa(Config).
-client_ecdhe_ecdsa_server_ecdhe_ecdsa(Config) when is_list(Config) ->
-     ssl_ECC:client_ecdhe_ecdsa_server_ecdhe_ecdsa(Config).
-
 client_ecdsa_server_ecdsa_with_raw_key(Config)  when is_list(Config) ->
      Default = ssl_test_lib:default_cert_chain_conf(),
     {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
@@ -212,53 +155,61 @@ client_ecdsa_server_ecdsa_with_raw_key(Config)  when is_list(Config) ->
 
 ecc_default_order(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
+    DefaultCurve = pubkey_cert_records:namedCurves(hd(tls_v1:ecc_curves(1))),
     {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
                                                          {client_chain, Default}],
-                                                        ecdhe_ecdsa, ecdhe_ecdsa, Config),   
+                                                        ecdhe_ecdsa, ecdhe_ecdsa,
+                                                        Config, DefaultCurve),
     COpts = ssl_test_lib:ssl_options(COpts0, Config), 
     SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
     ECCOpts = [],
-    case ssl_test_lib:supported_eccs([{eccs, [sect571r1]}]) of
-        true ->  ssl_test_lib:ecc_test(sect571r1, COpts, SOpts, [], ECCOpts, Config);
+    case ssl_test_lib:supported_eccs([{eccs, [DefaultCurve]}]) of
+        true ->  ssl_test_lib:ecc_test(DefaultCurve, COpts, SOpts, [], ECCOpts, Config);
         false -> {skip, "unsupported named curves"}
      end.
 
 ecc_default_order_custom_curves(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
+    DefaultCurve = pubkey_cert_records:namedCurves(hd(tls_v1:ecc_curves(1))),
     {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
                                                          {client_chain, Default}],
-                                                        ecdhe_ecdsa, ecdhe_ecdsa, Config),   
+                                                        ecdhe_ecdsa, ecdhe_ecdsa,
+                                                        Config, DefaultCurve),
     COpts = ssl_test_lib:ssl_options(COpts0, Config), 
     SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
-    ECCOpts = [{eccs, [secp256r1, sect571r1]}],
+    ECCOpts = [{eccs, [secp256r1, DefaultCurve]}],
     case ssl_test_lib:supported_eccs(ECCOpts) of
-         true ->  ssl_test_lib:ecc_test(sect571r1, COpts, SOpts, [], ECCOpts, Config);
+         true ->  ssl_test_lib:ecc_test(DefaultCurve, COpts, SOpts, [], ECCOpts, Config);
         false -> {skip, "unsupported named curves"}
     end.
 
 ecc_client_order(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
+    DefaultCurve = pubkey_cert_records:namedCurves(hd(tls_v1:ecc_curves(1))),
     {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
                                                          {client_chain, Default}],
-                                                        ecdhe_ecdsa, ecdhe_ecdsa, Config),   
+                                                        ecdhe_ecdsa, ecdhe_ecdsa,
+                                                        Config, DefaultCurve),
     COpts = ssl_test_lib:ssl_options(COpts0, Config), 
     SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
     ECCOpts = [{honor_ecc_order, false}],
-    case ssl_test_lib:supported_eccs([{eccs, [sect571r1]}]) of
-         true -> ssl_test_lib:ecc_test(sect571r1, COpts, SOpts, [], ECCOpts, Config);
+    case ssl_test_lib:supported_eccs([{eccs, [DefaultCurve]}]) of
+         true -> ssl_test_lib:ecc_test(DefaultCurve, COpts, SOpts, [], ECCOpts, Config);
         false -> {skip, "unsupported named curves"}
     end.
 
 ecc_client_order_custom_curves(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
+    DefaultCurve = pubkey_cert_records:namedCurves(hd(tls_v1:ecc_curves(1))),
     {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default},
                                                         {client_chain, Default}],
-                                                      ecdhe_ecdsa, ecdhe_ecdsa, Config),   
+                                                        ecdhe_ecdsa, ecdhe_ecdsa,
+                                                        Config, DefaultCurve),
     COpts = ssl_test_lib:ssl_options(COpts0, Config), 
     SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
-    ECCOpts = [{honor_ecc_order, false}, {eccs, [secp256r1, sect571r1]}],
+    ECCOpts = [{honor_ecc_order, false}, {eccs, [secp256r1, DefaultCurve]}],
     case ssl_test_lib:supported_eccs(ECCOpts) of
-        true -> ssl_test_lib:ecc_test(sect571r1, COpts, SOpts, [], ECCOpts, Config);
+        true -> ssl_test_lib:ecc_test(DefaultCurve, COpts, SOpts, [], ECCOpts, Config);
         false -> {skip, "unsupported named curves"}
     end.
 
@@ -274,12 +225,13 @@ ecc_unknown_curve(Config) ->
 
 client_ecdh_rsa_server_ecdhe_ecdsa_server_custom(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
+    DefaultCurve = pubkey_cert_records:namedCurves(hd(tls_v1:ecc_curves(1))),
     {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default},
                                                        {client_chain, Default}], 
                                                         ecdh_rsa, ecdhe_ecdsa, Config),
     COpts = ssl_test_lib:ssl_options(COpts0, Config), 
     SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
-    ECCOpts = [{honor_ecc_order, true}, {eccs, [secp256r1, sect571r1]}],
+    ECCOpts = [{honor_ecc_order, true}, {eccs, [secp256r1, DefaultCurve]}],
      case ssl_test_lib:supported_eccs(ECCOpts) of
          true -> ssl_test_lib:ecc_test(secp256r1, COpts, SOpts, [], ECCOpts, Config);
          false -> {skip, "unsupported named curves"}
@@ -287,12 +239,13 @@ client_ecdh_rsa_server_ecdhe_ecdsa_server_custom(Config) ->
 
 client_ecdh_rsa_server_ecdhe_rsa_server_custom(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
+    DefaultCurve = pubkey_cert_records:namedCurves(hd(tls_v1:ecc_curves(1))),
     {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
                                                          {client_chain, Default}],
                                                         ecdh_rsa, ecdhe_rsa, Config),
     COpts = ssl_test_lib:ssl_options(COpts0, Config), 
     SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
-     ECCOpts = [{honor_ecc_order, true}, {eccs, [secp256r1, sect571r1]}],
+    ECCOpts = [{honor_ecc_order, true}, {eccs, [secp256r1, DefaultCurve]}],
     
     case ssl_test_lib:supported_eccs(ECCOpts) of
         true -> ssl_test_lib:ecc_test(secp256r1, COpts, SOpts, [], ECCOpts, Config);
@@ -301,12 +254,13 @@ client_ecdh_rsa_server_ecdhe_rsa_server_custom(Config) ->
 
 client_ecdhe_rsa_server_ecdhe_ecdsa_server_custom(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
+    DefaultCurve = pubkey_cert_records:namedCurves(hd(tls_v1:ecc_curves(1))),
     {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
                                                          {client_chain, Default}],
                                                         ecdhe_rsa, ecdhe_ecdsa, Config),
     COpts = ssl_test_lib:ssl_options(COpts0, Config), 
     SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
-    ECCOpts = [{honor_ecc_order, true}, {eccs, [secp256r1, sect571r1]}],
+    ECCOpts = [{honor_ecc_order, true}, {eccs, [secp256r1, DefaultCurve]}],
     case ssl_test_lib:supported_eccs(ECCOpts) of
          true -> ssl_test_lib:ecc_test(secp256r1, COpts, SOpts, [], ECCOpts, Config);
         false -> {skip, "unsupported named curves"}
@@ -314,19 +268,21 @@ client_ecdhe_rsa_server_ecdhe_ecdsa_server_custom(Config) ->
 
 client_ecdhe_rsa_server_ecdhe_rsa_server_custom(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
+    DefaultCurve = pubkey_cert_records:namedCurves(hd(tls_v1:ecc_curves(1))),
     {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
                                                          {client_chain, Default}], 
                                                         ecdhe_rsa, ecdhe_rsa, Config),
 
     COpts = ssl_test_lib:ssl_options(COpts0, Config), 
     SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
-    ECCOpts = [{honor_ecc_order, true}, {eccs, [secp256r1, sect571r1]}],
+    ECCOpts = [{honor_ecc_order, true}, {eccs, [secp256r1, DefaultCurve]}],
     case ssl_test_lib:supported_eccs(ECCOpts) of
         true -> ssl_test_lib:ecc_test(secp256r1, COpts, SOpts, [], ECCOpts, Config);
         false -> {skip, "unsupported named curves"}
      end.
 client_ecdhe_rsa_server_ecdh_rsa_server_custom(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
+    DefaultCurve = pubkey_cert_records:namedCurves(hd(tls_v1:ecc_curves(1))),
     Ext = x509_test:extensions([{key_usage, [keyEncipherment]}]),
     {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, [[], [], [{extensions, Ext}]]},
                                                          {client_chain, Default}], 
@@ -334,8 +290,8 @@ client_ecdhe_rsa_server_ecdh_rsa_server_custom(Config) ->
 
     COpts = ssl_test_lib:ssl_options(COpts0, Config), 
     SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
-    ECCOpts = [{honor_ecc_order, true}, {eccs, [secp256r1, sect571r1]}],
-    Expected = pubkey_cert_records:namedCurves(hd(tls_v1:ecc_curves(0))), %% The certificate curve
+    ECCOpts = [{honor_ecc_order, true}, {eccs, [secp256r1, DefaultCurve]}],
+    Expected = secp256r1, %% The certificate curve
 
     case ssl_test_lib:supported_eccs(ECCOpts) of
         true -> ssl_test_lib:ecc_test(Expected, COpts, SOpts, [], ECCOpts, Config);
@@ -344,12 +300,13 @@ client_ecdhe_rsa_server_ecdh_rsa_server_custom(Config) ->
 
 client_ecdhe_ecdsa_server_ecdhe_ecdsa_server_custom(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
+    DefaultCurve = pubkey_cert_records:namedCurves(hd(tls_v1:ecc_curves(1))),
     {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
                                                        {client_chain, Default}], 
                                                         ecdhe_ecdsa, ecdhe_ecdsa, Config),
     COpts = ssl_test_lib:ssl_options(COpts0, Config), 
     SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
-    ECCOpts = [{honor_ecc_order, true}, {eccs, [secp256r1, sect571r1]}],
+    ECCOpts = [{honor_ecc_order, true}, {eccs, [secp256r1, DefaultCurve]}],
     case ssl_test_lib:supported_eccs(ECCOpts) of
         true -> ssl_test_lib:ecc_test(secp256r1, COpts, SOpts, [], ECCOpts, Config);
         false -> {skip, "unsupported named curves"}
@@ -357,12 +314,13 @@ client_ecdhe_ecdsa_server_ecdhe_ecdsa_server_custom(Config) ->
 
 client_ecdhe_ecdsa_server_ecdhe_rsa_server_custom(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
+    DefaultCurve = pubkey_cert_records:namedCurves(hd(tls_v1:ecc_curves(1))),
     {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
                                                          {client_chain, Default}],
                                                         ecdhe_ecdsa, ecdhe_rsa, Config),
     COpts = ssl_test_lib:ssl_options(COpts0, Config), 
     SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
-    ECCOpts = [{honor_ecc_order, true}, {eccs, [secp256r1, sect571r1]}],
+    ECCOpts = [{honor_ecc_order, true}, {eccs, [secp256r1, DefaultCurve]}],
     case ssl_test_lib:supported_eccs(ECCOpts) of
         true -> ssl_test_lib:ecc_test(secp256r1, COpts, SOpts, [], ECCOpts, Config);
         false -> {skip, "unsupported named curves"}
@@ -370,12 +328,13 @@ client_ecdhe_ecdsa_server_ecdhe_rsa_server_custom(Config) ->
 
 client_ecdhe_ecdsa_server_ecdhe_ecdsa_client_custom(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
+    DefaultCurve = pubkey_cert_records:namedCurves(hd(tls_v1:ecc_curves(1))),
     {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
                                                        {client_chain, Default}],
                                                         ecdhe_ecdsa, ecdhe_ecdsa, Config),
     COpts = ssl_test_lib:ssl_options(COpts0, Config), 
     SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
-    ECCOpts = [{eccs, [secp256r1, sect571r1]}],
+    ECCOpts = [{eccs, [secp256r1, DefaultCurve]}],
     case ssl_test_lib:supported_eccs(ECCOpts) of
         true -> ssl_test_lib:ecc_test(secp256r1, COpts, SOpts, ECCOpts, [], Config);
         false -> {skip, "unsupported named curves"}
@@ -383,12 +342,13 @@ client_ecdhe_ecdsa_server_ecdhe_ecdsa_client_custom(Config) ->
 
 client_ecdhe_rsa_server_ecdhe_ecdsa_client_custom(Config) ->
     Default = ssl_test_lib:default_cert_chain_conf(),
+    DefaultCurve = pubkey_cert_records:namedCurves(hd(tls_v1:ecc_curves(1))),
     {COpts0, SOpts0} = ssl_test_lib:make_ec_cert_chains([{server_chain, Default}, 
                                                          {client_chain, Default}],
                                                          ecdhe_rsa, ecdhe_ecdsa, Config),
     COpts = ssl_test_lib:ssl_options(COpts0, Config), 
     SOpts = ssl_test_lib:ssl_options(SOpts0, Config),
-    ECCOpts = [{eccs, [secp256r1, sect571r1]}],
+    ECCOpts = [{eccs, [secp256r1, DefaultCurve]}],
     case ssl_test_lib:supported_eccs(ECCOpts) of
         true -> ssl_test_lib:ecc_test(secp256r1, COpts, SOpts, ECCOpts, [], Config);
         false -> {skip, "unsupported named curves"}
diff --git a/lib/ssl/test/ssl_ECC_openssl_SUITE.erl b/lib/ssl/test/ssl_ECC_openssl_SUITE.erl
index 81a7dfd2da..787c08a517 100644
--- a/lib/ssl/test/ssl_ECC_openssl_SUITE.erl
+++ b/lib/ssl/test/ssl_ECC_openssl_SUITE.erl
@@ -33,77 +33,23 @@
 %%--------------------------------------------------------------------
 
 all() ->
-    case test_cases() of
-        [_|_] ->
-            all_groups();
-        [] ->
-            [skip]
-    end.
-
-all_groups() ->
     case ssl_test_lib:openssl_sane_dtls() of 
         true ->
             [{group, 'tlsv1.2'},
-             {group, 'tlsv1.1'},
-             {group, 'tlsv1'},
-             {group, 'dtlsv1.2'},
-             {group, 'dtlsv1'}];
+             {group, 'dtlsv1.2'}];   
         false ->
-            [{group, 'tlsv1.2'},
-             {group, 'tlsv1.1'},
-             {group, 'tlsv1'}]
+            [{group, 'tlsv1.2'}]
     end.
 
 groups() ->
     case ssl_test_lib:openssl_sane_dtls() of 
         true ->
-            [{'tlsv1.2', [], [mix_sign | test_cases()]},
-             {'tlsv1.1', [], test_cases()},
-             {'tlsv1', [], test_cases()},
-             {'dtlsv1.2', [],  [mix_sign | test_cases()]},
-             {'dtlsv1', [], test_cases()}];
+            [{'tlsv1.2', [], [mix_sign]},
+             {'dtlsv1.2', [],  [mix_sign]}];
         false ->
-            [{'tlsv1.2', [], [mix_sign | test_cases()]},
-             {'tlsv1.1', [], test_cases()},
-             {'tlsv1', [], test_cases()}]
+            [{'tlsv1.2', [], [mix_sign]}]
     end.
-
-test_cases()->
-   cert_combinations().
   
-cert_combinations() ->
-    lists:append(lists:map(fun({Name, Suites}) -> 
-                                   case ssl_test_lib:openssl_filter(Name) of
-                                       [] ->
-                                           [];
-                                       [_|_] ->
-                                           Suites
-                                   end
-                           end, [{"ECDH-ECDSA", server_ecdh_ecdsa()},
-                                 {"ECDH-RSA", server_ecdh_rsa()},
-                                 {"ECDHE-RSA", server_ecdhe_rsa()},
-                                 {"ECDHE-ECDSA", server_ecdhe_ecdsa()}
-                                ])).
-server_ecdh_rsa() ->
-    [client_ecdh_rsa_server_ecdh_rsa,
-     client_ecdhe_rsa_server_ecdh_rsa,     
-     client_ecdhe_ecdsa_server_ecdh_rsa].
-
-server_ecdhe_rsa() ->
-    [client_ecdh_rsa_server_ecdhe_rsa,
-     client_ecdhe_rsa_server_ecdhe_rsa,
-     client_ecdhe_ecdsa_server_ecdhe_rsa].
-
-server_ecdh_ecdsa() ->
-    [client_ecdh_ecdsa_server_ecdh_ecdsa,
-     client_ecdhe_rsa_server_ecdh_ecdsa,
-     client_ecdhe_ecdsa_server_ecdh_ecdsa].
-
-server_ecdhe_ecdsa() ->
-    [client_ecdh_rsa_server_ecdhe_ecdsa,
-     client_ecdh_ecdsa_server_ecdhe_ecdsa,
-     client_ecdhe_ecdsa_server_ecdhe_ecdsa].
-
 %%--------------------------------------------------------------------
 init_per_suite(Config0) ->
     end_per_suite(Config0),
@@ -121,7 +67,8 @@ init_per_suite(Config0) ->
 
 end_per_suite(_Config) ->
     application:stop(ssl),
-    application:stop(crypto).
+    application:stop(crypto),
+    ssl_test_lib:kill_openssl().
 
 %%--------------------------------------------------------------------
 init_per_group(GroupName, Config) ->
@@ -171,38 +118,6 @@ end_per_testcase(_TestCase, Config) ->
 skip(Config) when is_list(Config) ->
     {skip, openssl_does_not_support_ECC}.
 
-%% Test diffrent certificate chain types, note that it is the servers
-%% chain that affect what cipher suit that will be choosen
-
-%% ECDH_RSA 
-client_ecdh_rsa_server_ecdh_rsa(Config) when is_list(Config) ->
-    ssl_ECC:client_ecdh_rsa_server_ecdh_rsa(Config).
-client_ecdhe_rsa_server_ecdh_rsa(Config) when is_list(Config) ->
-    ssl_ECC:client_ecdhe_rsa_server_ecdh_rsa(Config).
-client_ecdhe_ecdsa_server_ecdh_rsa(Config) when is_list(Config) ->
-    ssl_ECC:client_ecdhe_ecdsa_server_ecdh_rsa(Config).
-%% ECDHE_RSA    
-client_ecdh_rsa_server_ecdhe_rsa(Config)  when is_list(Config) ->
-    ssl_ECC:client_ecdh_rsa_server_ecdhe_rsa(Config).
-client_ecdhe_rsa_server_ecdhe_rsa(Config) when is_list(Config) ->
-    ssl_ECC:client_ecdhe_rsa_server_ecdhe_rsa(Config).
-client_ecdhe_ecdsa_server_ecdhe_rsa(Config) when is_list(Config) ->
-   ssl_ECC:client_ecdhe_ecdsa_server_ecdhe_rsa(Config).
-%% ECDH_ECDSA
-client_ecdh_ecdsa_server_ecdh_ecdsa(Config) when is_list(Config) ->
-    ssl_ECC:client_ecdh_ecdsa_server_ecdh_ecdsa(Config).
-client_ecdhe_rsa_server_ecdh_ecdsa(Config) when is_list(Config) ->
-    ssl_ECC:client_ecdhe_rsa_server_ecdh_ecdsa(Config).
-client_ecdhe_ecdsa_server_ecdh_ecdsa(Config) when is_list(Config) ->
-    ssl_ECC:client_ecdhe_ecdsa_server_ecdh_ecdsa(Config).
-%% ECDHE_ECDSA
-client_ecdh_rsa_server_ecdhe_ecdsa(Config) when is_list(Config) ->
-    ssl_ECC:client_ecdh_rsa_server_ecdhe_ecdsa(Config).
-client_ecdh_ecdsa_server_ecdhe_ecdsa(Config) when is_list(Config) ->
-    ssl_ECC:client_ecdh_ecdsa_server_ecdhe_ecdsa(Config).
-client_ecdhe_ecdsa_server_ecdhe_ecdsa(Config) when is_list(Config) ->
-     ssl_ECC:client_ecdhe_ecdsa_server_ecdhe_ecdsa(Config).
-
 mix_sign(Config) ->
     {COpts0, SOpts0} = ssl_test_lib:make_mix_cert(Config),
     COpts = ssl_test_lib:ssl_options(COpts0, Config), 
diff --git a/lib/ssl/test/ssl_alert_SUITE.erl b/lib/ssl/test/ssl_alert_SUITE.erl
new file mode 100644
index 0000000000..cc0b636580
--- /dev/null
+++ b/lib/ssl/test/ssl_alert_SUITE.erl
@@ -0,0 +1,100 @@
+%%
+%% Copyright Ericsson AB 2019-2019. 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_alert_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").
+
+-include_lib("ssl/src/ssl_alert.hrl").
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+all() -> 
+    [
+     alerts,
+     alert_details,
+     alert_details_not_too_big
+    ].
+
+init_per_testcase(_TestCase, Config) ->
+    ct:timetrap({seconds, 5}),
+    Config.
+
+end_per_testcase(_TestCase, Config) ->     
+    Config.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+alerts() ->
+    [{doc, "Test ssl_alert:alert_txt/1"}].
+alerts(Config) when is_list(Config) ->
+    Descriptions = [?CLOSE_NOTIFY, ?UNEXPECTED_MESSAGE, ?BAD_RECORD_MAC,
+		    ?DECRYPTION_FAILED_RESERVED, ?RECORD_OVERFLOW, ?DECOMPRESSION_FAILURE,
+		    ?HANDSHAKE_FAILURE, ?BAD_CERTIFICATE, ?UNSUPPORTED_CERTIFICATE,
+		    ?CERTIFICATE_REVOKED,?CERTIFICATE_EXPIRED, ?CERTIFICATE_UNKNOWN,
+		    ?ILLEGAL_PARAMETER, ?UNKNOWN_CA, ?ACCESS_DENIED, ?DECODE_ERROR,
+		    ?DECRYPT_ERROR, ?EXPORT_RESTRICTION, ?PROTOCOL_VERSION, 
+		    ?INSUFFICIENT_SECURITY, ?INTERNAL_ERROR, ?USER_CANCELED,
+		    ?NO_RENEGOTIATION, ?UNSUPPORTED_EXTENSION, ?CERTIFICATE_UNOBTAINABLE,
+		    ?UNRECOGNISED_NAME, ?BAD_CERTIFICATE_STATUS_RESPONSE,
+		    ?BAD_CERTIFICATE_HASH_VALUE, ?UNKNOWN_PSK_IDENTITY, 
+		    255 %% Unsupported/unknow alert will result in a description too
+		   ],
+    Alerts = [?ALERT_REC(?WARNING, ?CLOSE_NOTIFY) | 
+	      [?ALERT_REC(?FATAL, Desc) || Desc <- Descriptions]],
+    lists:foreach(fun(Alert) ->
+                          try ssl_alert:alert_txt(Alert)
+                          catch
+			    C:E:T ->
+                                  ct:fail({unexpected, {C, E, T}})
+			end 
+		  end, Alerts).
+%%--------------------------------------------------------------------
+alert_details() ->
+    [{doc, "Test that ssl_alert:alert_txt/1 result contains extendend error description"}].
+alert_details(Config) when is_list(Config) ->
+    Unique = make_ref(),
+    UniqueStr = lists:flatten(io_lib:format("~w", [Unique])),
+    Alert = ?ALERT_REC(?WARNING, ?CLOSE_NOTIFY, Unique),
+    case string:str(ssl_alert:alert_txt(Alert), UniqueStr) of
+        0 ->
+            ct:fail(error_details_missing);
+        _ ->
+            ok
+    end.
+
+%%--------------------------------------------------------------------
+alert_details_not_too_big() ->
+    [{doc, "Test that ssl_alert:alert_txt/1 limits printed depth of extended error description"}].
+alert_details_not_too_big(Config) when is_list(Config) ->
+    Reason = lists:duplicate(10, lists:duplicate(10, lists:duplicate(10, {some, data}))),
+    Alert = ?ALERT_REC(?WARNING, ?CLOSE_NOTIFY, Reason),
+    case length(ssl_alert:alert_txt(Alert)) < 1000 of
+        true ->
+            ok;
+        false ->
+            ct:fail(ssl_alert_text_too_big)
+    end.
diff --git a/lib/ssl/test/ssl_alpn_handshake_SUITE.erl b/lib/ssl/test/ssl_alpn_SUITE.erl
index 04c4b257d9..82a49e1469 100644
--- a/lib/ssl/test/ssl_alpn_handshake_SUITE.erl
+++ b/lib/ssl/test/ssl_alpn_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 
 %%
--module(ssl_alpn_handshake_SUITE).
+-module(ssl_alpn_SUITE).
 
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
@@ -32,7 +32,9 @@
 %%--------------------------------------------------------------------
 
 all() ->
-    [{group, 'tlsv1.2'},
+    [
+     {group, 'tlsv1.3'},
+     {group, 'tlsv1.2'},
      {group, 'tlsv1.1'},
      {group, 'tlsv1'},
      {group, 'sslv3'},
@@ -42,12 +44,13 @@ all() ->
 
 groups() ->
     [
-     {'tlsv1.2', [], alpn_tests()},
-     {'tlsv1.1', [], alpn_tests()},
-     {'tlsv1', [], alpn_tests()},
+     {'tlsv1.3', [], alpn_tests() -- [client_renegotiate, session_reused]},
+     {'tlsv1.2', [], alpn_tests() ++ alpn_npn_coexist()},
+     {'tlsv1.1', [], alpn_tests() ++ alpn_npn_coexist()},
+     {'tlsv1', [], alpn_tests() ++ alpn_npn_coexist()},
      {'sslv3', [], alpn_not_supported()},
-     {'dtlsv1.2', [], alpn_tests() -- [client_renegotiate]},
-     {'dtlsv1', [], alpn_tests() -- [client_renegotiate]}
+     {'dtlsv1.2', [], alpn_tests() ++ alpn_npn_coexist()},
+     {'dtlsv1', [], alpn_tests() ++ alpn_npn_coexist()}
     ].
 
 alpn_tests() ->
@@ -61,12 +64,16 @@ alpn_tests() ->
      client_alpn_and_server_no_support,
      client_no_support_and_server_alpn,
      client_alpn_npn_and_server_alpn,
-     client_alpn_npn_and_server_alpn_npn,
-     client_alpn_and_server_alpn_npn,
      client_renegotiate,
      session_reused
     ].
 
+alpn_npn_coexist() ->
+    [
+     client_alpn_npn_and_server_alpn_npn,
+     client_alpn_and_server_alpn_npn
+    ].
+
 alpn_not_supported() ->
     [alpn_not_supported_client,
      alpn_not_supported_server
@@ -77,8 +84,7 @@ init_per_suite(Config0) ->
     try crypto:start() of
 	ok ->
 	    ssl_test_lib:clean_start(),
-	    Config = ssl_test_lib:make_rsa_cert(Config0),
-	    ssl_test_lib:cert_options(Config)
+	    ssl_test_lib:make_rsa_cert(Config0)
     catch _:_ ->
 	    {skip, "Crypto did not start"}
     end.
@@ -153,41 +159,41 @@ protocols_must_be_a_binary_list(Config) when is_list(Config) ->
 
 empty_client(Config) when is_list(Config) ->
     run_failing_handshake(Config,
-        [{alpn_advertised_protocols, []}],
-        [{alpn_preferred_protocols, [<<"spdy/2">>, <<"spdy/3">>, <<"http/2">>]}],
-        {error,{tls_alert,"no application protocol"}}).
+                          [{alpn_advertised_protocols, []}],
+                          [{alpn_preferred_protocols, [<<"spdy/2">>, <<"spdy/3">>, <<"http/2">>]}],
+                          no_application_protocol).
 
 %--------------------------------------------------------------------------------
 
 empty_server(Config) when is_list(Config) ->
     run_failing_handshake(Config,
-        [{alpn_advertised_protocols, [<<"http/1.0">>, <<"http/1.1">>]}],
-        [{alpn_preferred_protocols, []}],
-        {error,{tls_alert,"no application protocol"}}).
+                          [{alpn_advertised_protocols, [<<"http/1.0">>, <<"http/1.1">>]}],
+                          [{alpn_preferred_protocols, []}],
+                          no_application_protocol).
 
 %--------------------------------------------------------------------------------
 
 empty_client_empty_server(Config) when is_list(Config) ->
     run_failing_handshake(Config,
-        [{alpn_advertised_protocols, []}],
-        [{alpn_preferred_protocols, []}],
-        {error,{tls_alert,"no application protocol"}}).
+                          [{alpn_advertised_protocols, []}],
+                          [{alpn_preferred_protocols, []}],
+                          no_application_protocol).
 
 %--------------------------------------------------------------------------------
 
 no_matching_protocol(Config) when is_list(Config) ->
     run_failing_handshake(Config,
-        [{alpn_advertised_protocols, [<<"http/1.0">>, <<"http/1.1">>]}],
-        [{alpn_preferred_protocols, [<<"spdy/2">>, <<"spdy/3">>, <<"http/2">>]}],
-        {error,{tls_alert,"no application protocol"}}).
+                          [{alpn_advertised_protocols, [<<"http/1.0">>, <<"http/1.1">>]}],
+                          [{alpn_preferred_protocols, [<<"spdy/2">>, <<"spdy/3">>, <<"http/2">>]}],
+                          no_application_protocol).
 
 %--------------------------------------------------------------------------------
 
 client_alpn_and_server_alpn(Config) when is_list(Config) ->
     run_handshake(Config,
-		    [{alpn_advertised_protocols, [<<"http/1.0">>, <<"http/1.1">>]}],
-		    [{alpn_preferred_protocols, [<<"spdy/2">>, <<"http/1.1">>, <<"http/1.0">>]}],
-		    {ok, <<"http/1.1">>}).
+                  [{alpn_advertised_protocols, [<<"http/1.0">>, <<"http/1.1">>]}],
+                  [{alpn_preferred_protocols, [<<"spdy/2">>, <<"http/1.1">>, <<"http/1.0">>]}],
+                  {ok, <<"http/1.1">>}).
 
 %--------------------------------------------------------------------------------
 
@@ -262,52 +268,12 @@ client_renegotiate(Config) when is_list(Config) ->
 %--------------------------------------------------------------------------------
 
 session_reused(Config) when  is_list(Config)->
-    ClientOpts0 = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ClientOpts0 = ssl_test_lib:ssl_options(client_rsa_verify_opts, Config),
     ClientOpts = [{alpn_advertised_protocols, [<<"http/1.0">>]}] ++ ClientOpts0,
     ServerOpts0 = ssl_test_lib:ssl_options(server_rsa_opts, Config),
     ServerOpts = [{alpn_preferred_protocols, [<<"spdy/2">>, <<"http/1.1">>, <<"http/1.0">>]}] ++  ServerOpts0,
 
-    {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, session_info_result, []}},
-					{options, ServerOpts}]),
-
-    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, no_result_msg, []}},
-               {options, ClientOpts}]),
-
-    SessionInfo = 
-	receive
-	    {Server, Info} ->
-		Info
-	end,
-        
-    Server ! {listen, {mfa, {ssl_test_lib, no_result, []}}},
-    
-    %% Make sure session is registered
-    ct:sleep(?SLEEP),
-
-    Client1 =
-	ssl_test_lib:start_client([{node, ClientNode},
-				   {port, Port}, {host, Hostname},
-				   {mfa, {ssl_test_lib, session_info_result, []}},
-				   {from, self()},  {options, ClientOpts}]),
-
-      receive
-	{Client1, SessionInfo} ->
-	    ok;
-	{Client1, Other} ->
-	    ct:fail(Other)
-      end,
-    
-    ssl_test_lib:close(Server), 
-    ssl_test_lib:close(Client),
-    ssl_test_lib:close(Client1).
-
+    ssl_test_lib:reuse_session(ClientOpts, ServerOpts, Config).
 %--------------------------------------------------------------------------------
 
 alpn_not_supported_client(Config) when is_list(Config) ->
@@ -337,7 +303,7 @@ alpn_not_supported_server(Config) when is_list(Config)->
 %% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
 
-run_failing_handshake(Config, ClientExtraOpts, ServerExtraOpts, ExpectedResult) ->
+run_failing_handshake(Config, ClientExtraOpts, ServerExtraOpts, ExpectedAlert) ->
     ClientOpts = ClientExtraOpts ++ ssl_test_lib:ssl_options(client_rsa_opts, Config),
     ServerOpts = ServerExtraOpts ++ ssl_test_lib:ssl_options(server_rsa_opts, Config),
 
@@ -353,8 +319,7 @@ run_failing_handshake(Config, ClientExtraOpts, ServerExtraOpts, ExpectedResult)
                                            {from, self()},
                                            {mfa, {?MODULE, placeholder, []}},
                                            {options, ClientOpts}]),
-    ssl_test_lib:check_result(Server, ExpectedResult,
-                              Client, ExpectedResult).
+    ssl_test_lib:check_client_alert(Server, Client, ExpectedAlert).
 
 run_handshake(Config, ClientExtraOpts, ServerExtraOpts, ExpectedProtocol) ->
     Data = "hello world",
diff --git a/lib/ssl/test/ssl_api_SUITE.erl b/lib/ssl/test/ssl_api_SUITE.erl
new file mode 100644
index 0000000000..fefecc0b65
--- /dev/null
+++ b/lib/ssl/test/ssl_api_SUITE.erl
@@ -0,0 +1,1976 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019-2019. 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_api_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+-include_lib("common_test/include/ct.hrl").
+-include_lib("ssl/src/ssl_api.hrl").
+
+-define(SLEEP, 500).
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+
+all() ->
+    [
+     {group, 'tlsv1.3'},
+     {group, 'tlsv1.2'},
+     {group, 'tlsv1.1'},
+     {group, 'tlsv1'},
+     {group, 'sslv3'},
+     {group, 'dtlsv1.2'},
+     {group, 'dtlsv1'}
+    ].
+
+groups() ->
+    [
+     {'tlsv1.3', [], ((gen_api_tests() ++ tls13_group() ++ handshake_paus_tests()) -- [dh_params, honor_server_cipher_order, honor_client_cipher_order,
+                                        new_options_in_handshake])
+      ++ (since_1_2() -- [conf_signature_algs])},
+     {'tlsv1.2', [],  gen_api_tests() ++ since_1_2() ++ handshake_paus_tests() ++ pre_1_3()},
+     {'tlsv1.1', [],  gen_api_tests() ++ handshake_paus_tests() ++ pre_1_3()},
+     {'tlsv1', [],  gen_api_tests() ++ handshake_paus_tests() ++ pre_1_3() ++ beast_mitigation_test()},
+     {'sslv3', [],  (gen_api_tests() -- [new_options_in_handshake]) ++ beast_mitigation_test() ++ pre_1_3()},
+     {'dtlsv1.2', [], (gen_api_tests() -- [invalid_keyfile, invalid_certfile, invalid_cacertfile,
+                                         invalid_options, new_options_in_handshake])  ++ handshake_paus_tests() ++ pre_1_3()},
+     {'dtlsv1', [],  (gen_api_tests() -- [invalid_keyfile, invalid_certfile, invalid_cacertfile,
+                                         invalid_options, new_options_in_handshake]) ++ handshake_paus_tests() ++ pre_1_3()}
+    ].
+
+since_1_2() ->
+    [
+     conf_signature_algs,
+     no_common_signature_algs
+    ].
+
+pre_1_3() ->
+    [
+     default_reject_anonymous
+    ].
+gen_api_tests() ->
+    [
+     peercert,
+     peercert_with_client_cert,
+     connection_information,
+     secret_connection_info,
+     versions,
+     active_n,
+     dh_params,
+     hibernate,
+     hibernate_right_away,
+     listen_socket,
+     recv_active,
+     recv_active_once,
+     recv_active_n,
+     recv_timeout,
+     recv_close,
+     controlling_process,
+     controller_dies,
+     controlling_process_transport_accept_socket,
+     close_with_timeout,
+     close_in_error_state,
+     call_in_error_state,
+     close_transport_accept,
+     abuse_transport_accept_socket,
+     honor_server_cipher_order,
+     honor_client_cipher_order,
+     ipv6,
+     der_input,
+     new_options_in_handshake,
+     max_handshake_size,
+     invalid_certfile,
+     invalid_cacertfile,
+     invalid_keyfile,
+     options_not_proplist,
+     invalid_options
+    ].
+
+handshake_paus_tests() ->
+    [
+     handshake_continue, 
+     handshake_continue_timeout, 
+     hello_client_cancel,
+     hello_server_cancel
+    ].
+
+%% Only relevant for SSL 3.0 and TLS 1.1
+beast_mitigation_test() ->
+    [%% Original option
+     rizzo_disabled,
+     %% Same effect as disable
+     rizzo_zero_n, 
+     %% Same as default
+     rizzo_one_n_minus_one 
+    ].
+
+tls13_group() ->
+    [
+     supported_groups,
+     honor_server_cipher_order_tls13,
+     honor_client_cipher_order_tls13
+    ].
+
+
+init_per_suite(Config0) ->
+    catch crypto:stop(),
+    try crypto:start() of
+	ok ->
+	    ssl_test_lib:clean_start(),
+	    ssl_test_lib:make_rsa_cert(Config0)
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:unload(ssl),
+    application:stop(crypto).
+
+
+init_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+	true ->
+	    case ssl_test_lib:sufficient_crypto_support(GroupName) of
+		true ->
+		    [{client_type, erlang},
+                     {server_type, erlang} | ssl_test_lib:init_tls_version(GroupName, Config)];
+		false ->
+		    {skip, "Missing crypto support"}
+	    end;
+	_ ->
+	    ssl:start(),
+	    Config
+    end.
+
+end_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+        true ->
+            ssl_test_lib:clean_tls_version(Config);
+        false ->
+            Config
+    end.
+
+init_per_testcase(prf, Config) ->
+    ssl_test_lib:ct_log_supported_protocol_versions(Config),
+    ct:timetrap({seconds, 10}),
+    Version = ssl_test_lib:protocol_version(Config),
+    PRFS = [md5, sha, sha256, sha384, sha512],
+    %% All are the result of running tls_v1:prf(PrfAlgo, <<>>, <<>>, <<>>, 16)
+    %% with the specified PRF algorithm
+    ExpectedPrfResults =
+        [{md5, <<96,139,180,171,236,210,13,10,28,32,2,23,88,224,235,199>>},
+         {sha, <<95,3,183,114,33,169,197,187,231,243,19,242,220,228,70,151>>},
+         {sha256, <<166,249,145,171,43,95,158,232,6,60,17,90,183,180,0,155>>},
+         {sha384, <<153,182,217,96,186,130,105,85,65,103,123,247,146,91,47,106>>},
+         {sha512, <<145,8,98,38,243,96,42,94,163,33,53,49,241,4,127,28>>},
+         %% TLS 1.0 and 1.1 PRF:
+         {md5sha, <<63,136,3,217,205,123,200,177,251,211,17,229,132,4,173,80>>}],
+    TestPlan = prf_create_plan([Version], PRFS, ExpectedPrfResults),
+    [{prf_test_plan, TestPlan} | Config];
+init_per_testcase(_TestCase, Config) ->
+    ssl_test_lib:ct_log_supported_protocol_versions(Config),
+    ct:timetrap({seconds, 10}),
+    Config.
+
+end_per_testcase(internal_active_n, _Config) ->
+    application:unset_env(ssl, internal_active_n);
+end_per_testcase(_TestCase, Config) ->     
+    Config.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+peercert() ->
+    [{doc,"Test API function peercert/1"}].
+peercert(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+			   {mfa, {?MODULE, peercert_result, []}},
+			   {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+			   {from, self()},
+			   {mfa, {?MODULE, peercert_result, []}},
+			   {options, ClientOpts}]),
+
+    CertFile = proplists:get_value(certfile, ServerOpts),
+    [{'Certificate', BinCert, _}]= ssl_test_lib:pem_to_der(CertFile),
+
+    ServerMsg = {error, no_peercert},
+    ClientMsg = {ok, BinCert},
+
+    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
+		       [self(), Client, Server]),
+
+    ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+
+peercert_with_client_cert() ->
+    [{doc,"Test API function peercert/1"}].
+peercert_with_client_cert(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
+					{from, self()},
+			   {mfa, {?MODULE, peercert_result, []}},
+			   {options, [{verify, verify_peer} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
+					{host, Hostname},
+			   {from, self()},
+			   {mfa, {?MODULE, peercert_result, []}},
+			   {options, ClientOpts}]),
+
+    ServerCertFile = proplists:get_value(certfile, ServerOpts),
+    [{'Certificate', ServerBinCert, _}]= ssl_test_lib:pem_to_der(ServerCertFile),
+     ClientCertFile = proplists:get_value(certfile, ClientOpts),
+    [{'Certificate', ClientBinCert, _}]= ssl_test_lib:pem_to_der(ClientCertFile),
+
+    ServerMsg = {ok, ClientBinCert},
+    ClientMsg = {ok, ServerBinCert},
+
+    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
+		       [self(), Client, Server]),
+
+    ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+connection_information() ->
+    [{doc,"Test the API function ssl:connection_information/1"}].
+connection_information(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+					{from, self()}, 
+					{mfa, {?MODULE, connection_information_result, []}},
+					{options, ServerOpts}]),
+    
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+			   {from, self()}, 
+			   {mfa, {?MODULE, connection_information_result, []}},
+			   {options, ClientOpts}]),
+    
+    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
+		       [self(), Client, Server]),
+    			   
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+%%--------------------------------------------------------------------
+
+secret_connection_info() ->
+    [{doc,"Test the API function ssl:connection_information/2"}].
+secret_connection_info(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+					{from, self()}, 
+					{mfa, {?MODULE, secret_connection_info_result, []}},
+					{options, [{verify, verify_peer} | ServerOpts]}]),
+    
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+                                        {from, self()}, 
+                                        {mfa, {?MODULE, secret_connection_info_result, []}},
+                                        {options,  [{verify, verify_peer} |ClientOpts]}]),
+    
+    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
+		       [self(), Client, Server]),
+			   
+    ssl_test_lib:check_result(Server, true, Client, true),
+    
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+%%--------------------------------------------------------------------
+prf() ->
+    [{doc,"Test that ssl:prf/5 uses the negotiated PRF."}].
+prf(Config) when is_list(Config) ->
+    TestPlan = proplists:get_value(prf_test_plan, Config),
+    case TestPlan of
+        [] -> ct:fail({error, empty_prf_test_plan});
+        _ -> lists:foreach(fun(Suite) ->
+                                   lists:foreach(
+                                     fun(Test) ->
+                                             V = proplists:get_value(tls_ver, Test),
+                                             C = proplists:get_value(ciphers, Test),
+                                             E = proplists:get_value(expected, Test),
+                                             P = proplists:get_value(prf, Test),
+                                             prf_run_test(Config, V, C, E, P)
+                                     end, Suite)
+                           end, TestPlan)
+    end.
+
+%%--------------------------------------------------------------------
+dh_params() ->
+    [{doc,"Test to specify DH-params file in server."}].
+
+dh_params(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    DataDir = proplists:get_value(data_dir, Config),
+    DHParamFile = filename:join(DataDir, "dHParam.pem"),
+
+    {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, [{dhfile, DHParamFile} | ServerOpts]}]),
+    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,
+			    [{ciphers,[{dhe_rsa,aes_256_cbc,sha}]} | 
+				       ClientOpts]}]),
+    
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+conf_signature_algs() ->
+    [{doc,"Test to set the signature_algs option on both client and server"}].
+conf_signature_algs(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, 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, []}},
+				   {options,  [{active, false}, {signature_algs, [{sha256, rsa}]} | ServerOpts]}]),
+    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, []}},
+				   {options, [{active, false}, {signature_algs, [{sha256, rsa}]} | ClientOpts]}]),
+    
+    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
+			 [self(), Client, Server]),
+    
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+
+%%--------------------------------------------------------------------
+no_common_signature_algs()  ->
+    [{doc,"Set the signature_algs option so that there client and server does not share any hash sign algorithms"}].
+no_common_signature_algs(Config) when is_list(Config) ->
+    
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+
+    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
+					      {from, self()},
+					      {options, [{signature_algs, [{sha256, rsa}]}
+							 | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
+                                              {host, Hostname},
+                                              {from, self()},
+                                              {options, [{signature_algs, [{sha384, rsa}]}
+                                                         | ClientOpts]}]),
+    
+    ssl_test_lib:check_server_alert(Server, Client, insufficient_security).
+
+%%--------------------------------------------------------------------
+handshake_continue() ->
+    [{doc, "Test API function ssl:handshake_continue/3"}].
+handshake_continue(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, 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, ssl_test_lib:ssl_options([{reuseaddr, true}, 
+                                                                            {verify, verify_peer},
+                                                                            {handshake, hello} | ServerOpts
+                                                                           ], 
+                                                                           Config)},
+                                        {continue_options, proplists:delete(reuseaddr, ServerOpts)}
+                                       ]),
+    
+    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, ssl_test_lib:ssl_options([{handshake, hello},
+                                                                            {verify, verify_peer} | ClientOpts
+                                                                           ], 
+                                                                           Config)},
+                                        {continue_options,  proplists:delete(reuseaddr, ClientOpts)}]),
+     
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+
+%%------------------------------------------------------------------
+handshake_continue_timeout() ->
+    [{doc, "Test API function ssl:handshake_continue/3 with short timeout"}].
+handshake_continue_timeout(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+                                        {from, self()},
+                                        {timeout, 1},
+                                        {options, ssl_test_lib:ssl_options([{reuseaddr, true}, {handshake, hello},
+                                                                            {verify, verify_peer} | ServerOpts],
+                                                                           Config)},
+                                        {continue_options, proplists:delete(reuseaddr, ServerOpts)}
+                                       ]),
+
+    Port = ssl_test_lib:inet_port(Server),
+
+
+    ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
+                                     {host, Hostname},
+                                     {from, self()},
+                                     {options, [{verify, verify_peer} | ClientOpts]}]),
+    
+    ssl_test_lib:check_result(Server, {error,timeout}),
+    ssl_test_lib:close(Server).
+
+
+%%--------------------------------------------------------------------
+hello_client_cancel() ->
+    [{doc, "Test API function ssl:handshake_cancel/1 on the client side"}].
+hello_client_cancel(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+					{from, self()}, 
+					{options, ssl_test_lib:ssl_options([{handshake, hello},
+                                                                            {verify, verify_peer} | ServerOpts], Config)},
+                                        {continue_options, proplists:delete(reuseaddr, ServerOpts)}]),
+    
+    Port = ssl_test_lib:inet_port(Server),
+
+    %% That is ssl:handshake_cancel returns ok
+    {connect_failed, ok} = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+                                                      {host, Hostname},
+                                                      {from, self()}, 
+                                                      {options, ssl_test_lib:ssl_options([{handshake, hello},
+                                                                                          {verify, verify_peer} | ClientOpts], Config)},
+                                                      {continue_options, cancel}]),    
+    ssl_test_lib:check_server_alert(Server, user_canceled).
+%%--------------------------------------------------------------------
+hello_server_cancel() ->
+    [{doc, "Test API function ssl:handshake_cancel/1 on the server side"}].
+hello_server_cancel(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+					{from, self()}, 
+					{options, ssl_test_lib:ssl_options([{handshake, hello},
+                                                                            {verify, verify_peer} | ServerOpts
+                                                                            ], Config)},
+                                        {continue_options, cancel}]),
+    
+    Port = ssl_test_lib:inet_port(Server),
+
+    ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
+                                     {host, Hostname},
+                                     {from, self()}, 
+                                         {options, ssl_test_lib:ssl_options([{handshake, hello},
+                                                                             {verify, verify_peer} | ClientOpts
+                                                                            ], Config)},
+                                     {continue_options, proplists:delete(reuseaddr, ClientOpts)}]),
+    
+    ssl_test_lib:check_result(Server, ok).
+
+%%--------------------------------------------------------------------
+versions() ->
+    [{doc,"Test API function versions/0"}].
+
+versions(Config) when is_list(Config) -> 
+    [_|_] = Versions = ssl:versions(),
+    ct:log("~p~n", [Versions]).
+
+%%--------------------------------------------------------------------
+%% Test case adapted from gen_tcp_misc_SUITE.
+active_n() ->
+    [{doc,"Test {active,N} option"}].
+
+active_n(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    Port = ssl_test_lib:inet_port(node()),
+    N = 3,
+    LS = ok(ssl:listen(Port, [{active,N}|ServerOpts])),
+    [{active,N}] = ok(ssl:getopts(LS, [active])),
+    active_n_common(LS, N),
+    Self = self(),
+    spawn_link(fun() ->
+        S0 = ok(ssl:transport_accept(LS)),
+        {ok, S} = ssl:handshake(S0),
+        ok = ssl:setopts(S, [{active,N}]),
+        [{active,N}] = ok(ssl:getopts(S, [active])),
+        ssl:controlling_process(S, Self),
+        Self ! {server, S}
+    end),
+    C = ok(ssl:connect("localhost", Port, [{active,N}|ClientOpts])),
+    [{active,N}] = ok(ssl:getopts(C, [active])),
+    S = receive
+        {server, S0} -> S0
+    after
+        1000 ->
+            exit({error, connect})
+    end,
+    active_n_common(C, N),
+    active_n_common(S, N),
+    ok = ssl:setopts(C, [{active,N}]),
+    ok = ssl:setopts(S, [{active,N}]),
+    ReceiveMsg = fun(Socket, Msg) ->
+        receive
+            {ssl,Socket,Msg} ->
+                ok;
+            {ssl,Socket,Begin} ->
+                receive
+                    {ssl,Socket,End} ->
+                        Msg = Begin ++ End,
+                        ok
+                after 1000 ->
+                    exit(timeout)
+                end
+        after 1000 ->
+            exit(timeout)
+        end
+    end,
+    repeat(3, fun(I) ->
+        Msg = "message "++integer_to_list(I),
+        ok = ssl:send(C, Msg),
+        ReceiveMsg(S, Msg),
+        ok = ssl:send(S, Msg),
+        ReceiveMsg(C, Msg)
+    end),
+    receive
+        {ssl_passive,S} ->
+            [{active,false}] = ok(ssl:getopts(S, [active]))
+    after
+        1000 ->
+            exit({error,ssl_passive})
+    end,
+    receive
+        {ssl_passive,C} ->
+            [{active,false}] = ok(ssl:getopts(C, [active]))
+    after
+        1000 ->
+            exit({error,ssl_passive})
+    end,
+    LS2 = ok(ssl:listen(0, [{active,0}])),
+    receive
+        {ssl_passive,LS2} ->
+            [{active,false}] = ok(ssl:getopts(LS2, [active]))
+    after
+        1000 ->
+            exit({error,ssl_passive})
+    end,
+    ok = ssl:close(LS2),
+    ok = ssl:close(C),
+    ok = ssl:close(S),
+    ok = ssl:close(LS),
+    ok.
+
+hibernate() ->
+    [{doc,"Check that an SSL connection that is started with option "
+      "{hibernate_after, 1000} indeed hibernates after 1000ms of "
+      "inactivity"}].
+
+hibernate(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, 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, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    {Client, #sslsocket{pid=[Pid|_]}} = ssl_test_lib:start_client([return_socket,
+                    {node, ClientNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {ssl_test_lib, send_recv_result_active, []}},
+					{options, [{hibernate_after, 1000}|ClientOpts]}]),
+    {current_function, _} =
+        process_info(Pid, current_function),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    
+    ct:sleep(1500),
+    {current_function, {erlang, hibernate, 3}} =
+	process_info(Pid, current_function),
+    
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+
+hibernate_right_away() ->
+    [{doc,"Check that an SSL connection that is configured to hibernate "
+    "after 0 or 1 milliseconds hibernates as soon as possible and not "
+    "crashes"}].
+
+hibernate_right_away(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    StartServerOpts = [{node, ServerNode}, {port, 0},
+                    {from, self()},
+                    {mfa, {ssl_test_lib, send_recv_result_active, []}},
+                    {options, ServerOpts}],
+    StartClientOpts = [return_socket,
+                    {node, ClientNode},
+                    {host, Hostname},
+                    {from, self()},
+                    {mfa, {ssl_test_lib, send_recv_result_active, []}}],
+
+    Server1 = ssl_test_lib:start_server(StartServerOpts),
+    Port1 = ssl_test_lib:inet_port(Server1),
+    {Client1, #sslsocket{pid = [Pid1|_]}} = ssl_test_lib:start_client(StartClientOpts ++
+                    [{port, Port1}, {options, [{hibernate_after, 0}|ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server1, ok, Client1, ok),
+    
+    ct:sleep(1000), %% Schedule out
+  
+     {current_function, {erlang, hibernate, 3}} =
+	process_info(Pid1, current_function),
+    ssl_test_lib:close(Server1),
+    ssl_test_lib:close(Client1),
+    
+    Server2 = ssl_test_lib:start_server(StartServerOpts),
+    Port2 = ssl_test_lib:inet_port(Server2),
+    {Client2, #sslsocket{pid = [Pid2|_]}} = ssl_test_lib:start_client(StartClientOpts ++
+                    [{port, Port2}, {options, [{hibernate_after, 1}|ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server2, ok, Client2, ok),
+
+    ct:sleep(1000), %% Schedule out
+    
+    {current_function, {erlang, hibernate, 3}} =
+	process_info(Pid2, current_function),
+
+    ssl_test_lib:close(Server2),
+    ssl_test_lib:close(Client2).
+
+listen_socket() ->
+    [{doc,"Check error handling and inet compliance when calling API functions with listen sockets."}].
+
+listen_socket(Config) ->
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ok, ListenSocket} = ssl:listen(0, ServerOpts),
+
+    %% This can be a valid thing to do as
+    %% options are inherited by the accept socket
+    ok = ssl:controlling_process(ListenSocket, self()),
+
+    {ok, _} = ssl:sockname(ListenSocket),
+
+    {error, enotconn} = ssl:send(ListenSocket, <<"data">>),
+    {error, enotconn} = ssl:recv(ListenSocket, 0),
+    {error, enotconn} = ssl:connection_information(ListenSocket),
+    {error, enotconn} = ssl:peername(ListenSocket),
+    {error, enotconn} = ssl:peercert(ListenSocket),
+    {error, enotconn} = ssl:renegotiate(ListenSocket),
+    {error, enotconn} = ssl:prf(ListenSocket, 'master_secret', <<"Label">>, [client_random], 256),
+    {error, enotconn} = ssl:shutdown(ListenSocket, read_write),
+
+    ok = ssl:close(ListenSocket).
+
+%%--------------------------------------------------------------------
+recv_active() ->
+    [{doc,"Test recv on active socket"}].
+
+recv_active(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = 
+	ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+				   {from, self()}, 
+				   {mfa, {?MODULE, try_recv_active, []}},
+				   {options,  [{active, true} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = 
+	ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
+				   {host, Hostname},
+				   {from, self()}, 
+				   {mfa, {?MODULE, try_recv_active, []}},
+				   {options, [{active, true} | ClientOpts]}]),
+        
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+recv_active_once() ->
+    [{doc,"Test recv on active (once) socket"}].
+
+recv_active_once(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = 
+	ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+				   {from, self()}, 
+				   {mfa, {?MODULE, try_recv_active_once, []}},
+				   {options,  [{active, once} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = 
+	ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
+				   {host, Hostname},
+				   {from, self()}, 
+				   {mfa, {?MODULE, try_recv_active_once, []}},
+				   {options, [{active, once} | ClientOpts]}]),
+        
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+recv_active_n() ->
+    [{doc,"Test recv on active (n) socket"}].
+
+recv_active_n(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server =
+	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+				   {from, self()},
+				   {mfa, {?MODULE, try_recv_active_once, []}},
+				   {options,  [{active, 1} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client =
+	ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+				   {host, Hostname},
+				   {from, self()},
+				   {mfa, {?MODULE, try_recv_active_once, []}},
+				   {options, [{active, 1} | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+%%--------------------------------------------------------------------
+recv_timeout() ->
+    [{doc,"Test ssl:ssl_accept timeout"}].
+
+recv_timeout(Config) ->
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server =
+	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+				   {from, self()},
+				   {mfa, {?MODULE, send_recv_result_timeout_server, []}},
+				   {options, [{active, 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,
+					       send_recv_result_timeout_client, []}},
+					{options, [{active, false} | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Client, ok, Server, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+recv_close() ->
+    [{doc,"Special case of call error handling"}].
+recv_close(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server  = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					  {from, self()},
+					  {mfa, {?MODULE, do_recv_close, []}},
+					 {options, [{active, false} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    {_Client, #sslsocket{} = SslSocket} = ssl_test_lib:start_client([return_socket,
+									   {node, ClientNode}, {port, Port},
+									   {host, Hostname},
+									   {from, self()},
+									   {mfa, {ssl_test_lib, no_result, []}},
+									   {options, ClientOpts}]),
+    ssl:close(SslSocket),
+    ssl_test_lib:check_result(Server, ok).
+
+
+
+%%--------------------------------------------------------------------
+controlling_process() ->
+    [{doc,"Test API function controlling_process/2"}].
+
+controlling_process(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    ClientMsg = "Server hello",
+    ServerMsg = "Client hello",
+   
+    Server = ssl_test_lib:start_server([
+                                        {node, ServerNode}, {port, 0}, 
+                                        {from, self()}, 
+                                        {mfa, {?MODULE, 
+                                               controlling_process_result, [self(),
+                                                                            ServerMsg]}},
+                                        {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    {Client, CSocket} = ssl_test_lib:start_client([return_socket,
+                                                   {node, ClientNode}, {port, Port}, 
+                                                   {host, Hostname},
+                                        {from, self()}, 
+			   {mfa, {?MODULE, 
+				  controlling_process_result, [self(),
+							       ClientMsg]}},
+			   {options, ClientOpts}]),
+    
+    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
+           [self(), Client, Server]),
+    
+    ServerMsg = ssl_test_lib:active_recv(CSocket, length(ServerMsg)),
+    %% We do not have the TLS server socket but all messages form the client
+    %% socket are now read, so ramining are form the server socket
+    ClientMsg = ssl_active_recv(length(ClientMsg)),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+%%--------------------------------------------------------------------
+controller_dies() ->
+    [{doc,"Test that the socket is closed after controlling process dies"}].
+controller_dies(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    ClientMsg = "Hello server",
+    ServerMsg = "Hello client",
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+					{from, self()}, 
+					{mfa, {?MODULE, 
+					       controller_dies_result, [self(),
+									ServerMsg]}},
+					{options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
+					{host, Hostname},
+					{from, self()}, 
+					{mfa, {?MODULE, 
+					       controller_dies_result, [self(),
+									    ClientMsg]}},
+					{options, ClientOpts}]),
+
+    ct:log("Testcase ~p, Client ~p  Server ~p ~n", [self(), Client, Server]),
+    ct:sleep(?SLEEP), %% so that they are connected
+    
+    process_flag(trap_exit, true),
+
+    %% Test that clients die
+    exit(Client, killed),
+    get_close(Client, ?LINE),
+
+    %% Test that clients die when process disappear
+    Server ! listen, 
+    Tester = self(),
+    Connect = fun(Pid) ->
+		      {ok, Socket} = ssl:connect(Hostname, Port, ClientOpts),
+		      %% Make sure server finishes and verification
+		      %% and is in coonection state before
+		      %% killing client
+		      ct:sleep(?SLEEP),
+		      Pid ! {self(), connected, Socket},
+		      receive die_nice -> normal end
+	      end,
+    Client2 = spawn_link(fun() -> Connect(Tester) end),
+    receive {Client2, connected, _Socket} ->  Client2 ! die_nice end,
+    
+    get_close(Client2, ?LINE),
+    
+    %% Test that clients die when the controlling process have changed 
+    Server ! listen, 
+
+    Client3 = spawn_link(fun() -> Connect(Tester) end),
+    Controller = spawn_link(fun() -> receive die_nice -> normal end end),
+    receive 
+	{Client3, connected, Socket} ->  
+	    ok = ssl:controlling_process(Socket, Controller),
+	    Client3 ! die_nice 
+    end,
+
+    ct:log("Wating on exit ~p~n",[Client3]),
+    receive {'EXIT', Client3, normal} -> ok end,
+    
+    receive   %% Client3 is dead but that doesn't matter, socket should not be closed.
+	Unexpected ->
+	    ct:log("Unexpected ~p~n",[Unexpected]),
+	    ct:fail({line, ?LINE-1})
+    after 1000 ->
+	    ok
+    end,
+    Controller ! die_nice,
+    get_close(Controller, ?LINE),
+    
+    %% Test that servers die
+    Server ! listen, 
+    LastClient = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
+					    {host, Hostname},
+					    {from, self()}, 
+					    {mfa, {?MODULE, 
+						   controller_dies_result, [self(),
+									    ClientMsg]}},
+					    {options, ClientOpts}]),
+    ct:sleep(?SLEEP), %% so that they are connected
+    
+    exit(Server, killed),
+    get_close(Server, ?LINE),
+    process_flag(trap_exit, false),
+    ssl_test_lib:close(LastClient).
+%%--------------------------------------------------------------------
+controlling_process_transport_accept_socket() ->
+    [{doc,"Only ssl:handshake and ssl:controlling_process is allowed for transport_accept:sockets"}].
+controlling_process_transport_accept_socket(Config) when is_list(Config) ->
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = ssl_test_lib:start_server_transport_control([{node, ServerNode}, 
+                                                          {port, 0},
+                                                          {from, self()},
+                                                          {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    
+    _Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
+                                              {host, Hostname},
+                                              {from, self()},
+                                              {options, ClientOpts}]),
+    ssl_test_lib:check_result(Server, ok),
+    ssl_test_lib:close(Server).
+
+%%--------------------------------------------------------------------
+close_with_timeout() ->
+      [{doc,"Test normal (not downgrade) ssl:close/2"}].
+close_with_timeout(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, tls_close, []}},
+					{options,[{active, 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, tls_close, []}},
+					{options, [{active, false} |ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok).
+
+%%--------------------------------------------------------------------
+close_in_error_state() ->
+    [{doc,"Special case of closing socket in error state"}].
+close_in_error_state(Config) when is_list(Config) ->
+    ServerOpts0 = ssl_test_lib:ssl_options(server_opts, Config),
+    ServerOpts = [{cacertfile, "foo.pem"} | proplists:delete(cacertfile, ServerOpts0)],
+    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
+    _ = spawn_link(?MODULE, run_error_server_close, [[self() | ServerOpts]]),
+    receive
+        {_Pid, Port} ->
+            spawn_link(?MODULE, run_client_error, [[Port, ClientOpts]])
+    end,
+    receive
+        ok ->
+            ok;
+        Other ->
+            ct:fail(Other)
+    end.
+
+%%--------------------------------------------------------------------
+call_in_error_state() ->
+    [{doc,"Special case of call error handling"}].
+call_in_error_state(Config) when is_list(Config) ->
+    ServerOpts0 = ssl_test_lib:ssl_options(server_opts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
+    ServerOpts = [{cacertfile, "foo.pem"} | proplists:delete(cacertfile, ServerOpts0)],
+    Pid = spawn_link(?MODULE, run_error_server, [[self() | ServerOpts]]),
+    receive
+        {Pid, Port} ->
+            spawn_link(?MODULE, run_client_error, [[Port, ClientOpts]])
+    end,
+    receive
+        {error, closed} ->
+            ok;
+        Other ->
+            ct:fail(Other)
+    end.
+%%--------------------------------------------------------------------
+close_transport_accept() ->
+    [{doc,"Tests closing ssl socket when waiting on ssl:transport_accept/1"}].
+
+close_transport_accept(Config) when is_list(Config) ->
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {_ClientNode, ServerNode, _Hostname} = ssl_test_lib:run_where(Config),
+
+    Port = 0,
+    Opts = [{active, false} | ServerOpts],
+    {ok, ListenSocket} = rpc:call(ServerNode, ssl, listen, [Port, Opts]),
+    spawn_link(fun() ->
+			ct:sleep(?SLEEP),
+			rpc:call(ServerNode, ssl, close, [ListenSocket])
+	       end),
+    case rpc:call(ServerNode, ssl, transport_accept, [ListenSocket]) of
+	{error, closed} ->
+	    ok;
+	Other ->
+	    exit({?LINE, Other})
+    end.
+%%--------------------------------------------------------------------
+abuse_transport_accept_socket() ->
+    [{doc,"Only ssl:handshake and ssl:controlling_process is allowed for transport_accept:sockets"}].
+abuse_transport_accept_socket(Config) when is_list(Config) ->
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = ssl_test_lib:start_server_transport_abuse_socket([{node, ServerNode}, 
+                                                               {port, 0},
+                                                               {from, self()},
+                                                               {options, ServerOpts}]),
+    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, no_result, []}},
+                                        {options, ClientOpts}]),
+    ssl_test_lib:check_result(Server, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+
+invalid_keyfile() ->
+    [{doc,"Test what happens with an invalid key file"}].
+invalid_keyfile(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    BadKeyFile = filename:join([proplists:get_value(priv_dir, Config), 
+			      "badkey.pem"]),
+    BadOpts = [{keyfile, BadKeyFile}| proplists:delete(keyfile, ServerOpts)],
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = 
+	ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0}, 
+					 {from, self()},
+			    {options, BadOpts}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+
+    Client =
+	ssl_test_lib:start_client_error([{node, ClientNode}, 
+			    {port, Port}, {host, Hostname},
+			    {from, self()},  {options, ClientOpts}]),
+
+    File = proplists:get_value(keyfile,BadOpts),    
+    ssl_test_lib:check_result(Server, {error,{options, {keyfile, File, {error,enoent}}}}, Client,  
+				       {error, closed}).
+
+%%--------------------------------------------------------------------
+honor_server_cipher_order() ->
+    [{doc,"Test API honor server cipher order."}].
+honor_server_cipher_order(Config) when is_list(Config) ->
+     ClientCiphers = [#{key_exchange => dhe_rsa, 
+                       cipher => aes_128_cbc, 
+                       mac => sha,
+                       prf => default_prf}, 
+                     #{key_exchange => dhe_rsa, 
+                       cipher => aes_256_cbc, 
+                       mac => sha,
+                       prf => default_prf}],
+    ServerCiphers = [#{key_exchange => dhe_rsa, 
+                       cipher => aes_256_cbc,   
+                       mac =>sha,
+                       prf => default_prf},
+                     #{key_exchange => dhe_rsa, 
+                       cipher => aes_128_cbc, 
+                       mac => sha,
+                       prf => default_prf}],
+    honor_cipher_order(Config, true, ServerCiphers, ClientCiphers, #{key_exchange => dhe_rsa,
+                                                                     cipher => aes_256_cbc,
+                                                                     mac => sha,
+                                                                     prf => default_prf}).
+
+%%--------------------------------------------------------------------
+honor_client_cipher_order() ->
+    [{doc,"Test API honor server cipher order."}].
+honor_client_cipher_order(Config) when is_list(Config) ->
+    ClientCiphers = [#{key_exchange => dhe_rsa, 
+                       cipher => aes_128_cbc, 
+                       mac => sha,
+                       prf => default_prf}, 
+                     #{key_exchange => dhe_rsa, 
+                       cipher => aes_256_cbc, 
+                       mac => sha,
+                       prf => default_prf}],
+    ServerCiphers = [#{key_exchange => dhe_rsa, 
+                       cipher => aes_256_cbc,   
+                       mac =>sha,
+                       prf => default_prf},
+                     #{key_exchange => dhe_rsa, 
+                       cipher => aes_128_cbc, 
+                       mac => sha,
+                       prf => default_prf}],
+    honor_cipher_order(Config, false, ServerCiphers, ClientCiphers, #{key_exchange => dhe_rsa,
+                                                                      cipher => aes_128_cbc,
+                                                                      mac => sha,
+                                                                      prf => default_prf}).
+
+%%--------------------------------------------------------------------
+ipv6() ->
+    [{require, ipv6_hosts},
+     {doc,"Test ipv6."}].
+ipv6(Config) when is_list(Config) ->
+    {ok, Hostname0} = inet:gethostname(),
+    
+    case lists:member(list_to_atom(Hostname0), ct:get_config(ipv6_hosts)) of
+	true ->
+	    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+	    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+	    {ClientNode, ServerNode, Hostname} = 
+		ssl_test_lib:run_where(Config, ipv6),
+	    Server = ssl_test_lib:start_server([{node, ServerNode}, 
+				   {port, 0}, {from, self()}, 
+				   {mfa, {ssl_test_lib, send_recv_result, []}},
+				   {options,  
+				    [inet6, {active, false} | ServerOpts]}]),
+	    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, []}},
+				   {options, 
+				    [inet6, {active, false} | ClientOpts]}]),
+	    
+	    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
+			       [self(), Client, Server]),
+	    
+	    ssl_test_lib:check_result(Server, ok, Client, ok),
+	    
+	    ssl_test_lib:close(Server),
+	    ssl_test_lib:close(Client);
+	false ->
+	    {skip, "Host does not support IPv6"}
+    end.
+
+%%--------------------------------------------------------------------
+der_input() ->
+    [{doc,"Test to input certs and key as der"}].
+
+der_input(Config) when is_list(Config) ->
+    DataDir = proplists:get_value(data_dir, Config),
+    DHParamFile = filename:join(DataDir, "dHParam.pem"),
+
+    {status, _, _, StatusInfo} = sys:get_status(whereis(ssl_manager)),
+    [_, _,_, _, Prop] = StatusInfo,
+    State = ssl_test_lib:state(Prop),
+    [CADb | _] = element(6, State),
+
+    Size = ets:info(CADb, size),
+
+    SeverVerifyOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ServerCert, ServerKey, ServerCaCerts, DHParams} = der_input_opts([{dhfile, DHParamFile} |
+								       SeverVerifyOpts]),
+    ClientVerifyOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    {ClientCert, ClientKey, ClientCaCerts, DHParams} = der_input_opts([{dhfile, DHParamFile} |
+								       ClientVerifyOpts]),
+    ServerOpts = [{verify, verify_peer}, {fail_if_no_peer_cert, true},
+		  {dh, DHParams},
+		  {cert, ServerCert}, {key, ServerKey}, {cacerts, ServerCaCerts}],
+    ClientOpts = [{verify, verify_peer}, {fail_if_no_peer_cert, true},
+		  {dh, DHParams},
+		  {cert, ClientCert}, {key, ClientKey}, {cacerts, ClientCaCerts}],
+    {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, []}},
+					{options, [{active, false} | ServerOpts]}]),
+    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, []}},
+					{options, [{active, false} | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client),
+    Size = ets:info(CADb, size).
+
+%%--------------------------------------------------------------------
+invalid_certfile() ->
+    [{doc,"Test what happens with an invalid cert file"}].
+
+invalid_certfile(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    BadCertFile = filename:join([proplists:get_value(priv_dir, Config), 
+                                 "badcert.pem"]),
+    ServerBadOpts = [{certfile, BadCertFile}| proplists:delete(certfile, ServerOpts)],
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    
+    Server = 
+	ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0}, 
+					 {from, self()},
+					 {options, ServerBadOpts}]),
+
+    Port = ssl_test_lib:inet_port(Server),
+
+    Client =
+	ssl_test_lib:start_client_error([{node, ClientNode}, 
+					 {port, Port}, {host, Hostname},
+					 {from, self()}, 
+					 {options, ClientOpts}]),
+    File = proplists:get_value(certfile, ServerBadOpts),
+    ssl_test_lib:check_result(Server, {error,{options, {certfile, File, {error,enoent}}}}, 
+			      Client, {error, closed}).
+    
+
+%%--------------------------------------------------------------------
+invalid_cacertfile() ->
+    [{doc,"Test what happens with an invalid cacert file"}].
+
+invalid_cacertfile(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    BadCACertFile = filename:join([proplists:get_value(priv_dir, Config), 
+                                 "badcacert.pem"]),
+    ServerBadOpts = [{cacertfile, BadCACertFile}| proplists:delete(cacertfile, ServerOpts)],
+    
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server0  = 
+	ssl_test_lib:start_server_error([{node, ServerNode}, 
+					 {port, 0}, {from, self()},
+					 {options, ServerBadOpts}]),
+
+    Port0 = ssl_test_lib:inet_port(Server0),
+    
+
+    Client0 =
+	ssl_test_lib:start_client_error([{node, ClientNode}, 
+					 {port, Port0}, {host, Hostname},
+					 {from, self()}, 
+					 {options, ClientOpts}]),
+
+    File0 = proplists:get_value(cacertfile, ServerBadOpts),
+    
+    ssl_test_lib:check_result(Server0, {error, {options, {cacertfile, File0,{error,enoent}}}},
+			      Client0, {error, closed}),
+    
+    File = File0 ++ "do_not_exit.pem",
+    ServerBadOpts1 = [{cacertfile, File}|proplists:delete(cacertfile, ServerBadOpts)],
+            
+    Server1  = 
+	ssl_test_lib:start_server_error([{node, ServerNode}, 
+					 {port, 0}, {from, self()},
+					 {options, ServerBadOpts1}]),
+
+    Port1 = ssl_test_lib:inet_port(Server1),
+    
+    Client1 =
+	ssl_test_lib:start_client_error([{node, ClientNode}, 
+					 {port, Port1}, {host, Hostname},
+					 {from, self()}, 
+					 {options, ClientOpts}]),
+
+
+    ssl_test_lib:check_result(Server1, {error, {options, {cacertfile, File,{error,enoent}}}},
+			      Client1, {error, closed}),
+    ok.
+
+%%--------------------------------------------------------------------
+new_options_in_handshake() ->
+    [{doc,"Test that you can set ssl options in handshake/3 and not only in tcp upgrade"}].
+new_options_in_handshake(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    Version = ssl_test_lib:protocol_version(Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    [_, Cipher | _] = ssl:filter_cipher_suites(ssl:cipher_suites(all, Version), 
+                                               [{key_exchange,
+                                                 fun(dhe_rsa) ->
+                                                         true;
+                                                    (ecdhe_rsa) ->
+                                                         true;
+                                                    (ecdh_rsa) ->
+                                                         true;
+                                                    (rsa) ->
+                                                         true;
+                                                    (_) ->
+                                                         false
+                                                 end
+                                                }]),
+    
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+					{from, self()}, 
+					{ssl_extra_opts, [{versions, [Version]},
+							  {ciphers,[Cipher]}]}, %% To be set in ssl_accept/3
+					{mfa, {?MODULE, connection_info_result, []}},
+					{options, ServerOpts}]),
+    
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+					{from, self()}, 
+					{mfa, {?MODULE, connection_info_result, []}},
+					{options, [{ciphers, [Cipher]} | ClientOpts]}]),
+    
+    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
+		       [self(), Client, Server]),
+
+    ServerMsg = ClientMsg = {ok, {Version, Cipher}},
+   
+    ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
+    
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%-------------------------------------------------------------------
+max_handshake_size() ->
+    [{doc,"Test that we can set max_handshake_size to max value."}].
+
+max_handshake_size(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, 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,  [{max_handshake_size, 8388607} |ServerOpts]}]),
+    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, [{max_handshake_size, 8388607} | ClientOpts]}]),
+ 
+    ssl_test_lib:check_result(Server, ok, Client, ok).
+  
+
+%%-------------------------------------------------------------------
+options_not_proplist() ->
+    [{doc,"Test what happens if an option is not a key value tuple"}].
+
+options_not_proplist(Config) when is_list(Config) ->
+    BadOption =  {client_preferred_next_protocols, 
+		  client, [<<"spdy/3">>,<<"http/1.1">>], <<"http/1.1">>},
+    {option_not_a_key_value_tuple, BadOption} =
+	ssl:connect("twitter.com", 443, [binary, {active, false}, 
+					 BadOption]).
+
+%%-------------------------------------------------------------------
+invalid_options() ->
+    [{doc,"Test what happens when we give invalid options"}].
+       
+invalid_options(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_verify_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    
+    Check = fun(Client, Server, {versions, [sslv2, sslv3]} = Option) ->
+		    ssl_test_lib:check_result(Server, 
+					      {error, {options, {sslv2, Option}}}, 
+					      Client,
+					      {error, {options, {sslv2, Option}}});
+	       (Client, Server, Option) ->
+		    ssl_test_lib:check_result(Server, 
+					      {error, {options, Option}}, 
+					      Client,
+					      {error, {options, Option}})
+	    end,
+
+    TestOpts = 
+         [{versions, [sslv2, sslv3]}, 
+          {verify, 4}, 
+          {verify_fun, function},
+          {fail_if_no_peer_cert, 0}, 
+          {verify_client_once, 1},
+          {depth, four}, 
+          {certfile, 'cert.pem'}, 
+          {keyfile,'key.pem' }, 
+          {password, foo},
+          {cacertfile, ""}, 
+          {dhfile,'dh.pem' },
+          {ciphers, [{foo, bar, sha, ignore}]},
+          {reuse_session, foo},
+          {reuse_sessions, 0},
+          {renegotiate_at, "10"},
+          {mode, depech},
+          {packet, 8.0},
+          {packet_size, "2"},
+          {header, a},
+          {active, trice},
+          {key, 'key.pem' }],
+
+    [begin
+	 Server =
+	     ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
+					{from, self()},
+					{options, [TestOpt | ServerOpts]}]),
+	 %% Will never reach a point where port is used.
+	 Client =
+	     ssl_test_lib:start_client_error([{node, ClientNode}, {port, 0},
+					      {host, Hostname}, {from, self()},
+					      {options, [TestOpt | ClientOpts]}]),
+	 Check(Client, Server, TestOpt),
+	 ok
+     end || TestOpt <- TestOpts],
+    ok.
+%%-------------------------------------------------------------------
+
+default_reject_anonymous()->
+    [{doc,"Test that by default anonymous cipher suites are rejected "}].
+default_reject_anonymous(Config) when is_list(Config) ->
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    Version = ssl_test_lib:protocol_version(Config),
+    TLSVersion = ssl_test_lib:tls_version(Version),
+    
+   [CipherSuite | _] = ssl_test_lib:ecdh_dh_anonymous_suites(TLSVersion),
+    
+    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
+					      {from, self()},
+					      {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
+                                              {host, Hostname},
+                                              {from, self()},
+                                              {options,
+                                               [{ciphers,[CipherSuite]} |
+                                                ClientOpts]}]),
+
+    ssl_test_lib:check_server_alert(Server, Client, insufficient_security).
+
+%%-------------------------------------------------------------------
+%% Note that these test only test that the options are valid to set. As application data
+%% is a stream you can not test that the send acctually splits it up as when it arrives
+%% again at the user layer it may be concatenated. But COVER can show that the split up
+%% code has been run.
+   
+rizzo_disabled() ->
+     [{doc, "Test original beast mitigation disable option for SSL 3.0 and TLS 1.0"}].
+
+rizzo_disabled(Config) ->
+    ClientOpts = [{beast_mitigation, disabled} | ssl_test_lib:ssl_options(client_rsa_opts, Config)],
+    ServerOpts =  [{beast_mitigation, disabled} | ssl_test_lib:ssl_options(server_rsa_opts, Config)],
+    
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+%%-------------------------------------------------------------------
+rizzo_zero_n() ->
+     [{doc, "Test zero_n beast mitigation option (same affect as original disable option) for SSL 3.0 and TLS 1.0"}].
+
+rizzo_zero_n(Config) ->
+    ClientOpts = [{beast_mitigation, zero_n} | ssl_test_lib:ssl_options(client_rsa_opts, Config)],
+    ServerOpts =  [{beast_mitigation, zero_n} | ssl_test_lib:ssl_options(server_rsa_opts, Config)],
+    
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+%%-------------------------------------------------------------------
+rizzo_one_n_minus_one () ->
+     [{doc, "Test beast_mitigation option one_n_minus_one (same affect as default) for SSL 3.0 and TLS 1.0"}].
+
+rizzo_one_n_minus_one (Config) ->
+    ClientOpts = [{beast_mitigation, one_n_minus_one } | ssl_test_lib:ssl_options(client_rsa_opts, Config)],
+    ServerOpts =  [{beast_mitigation, one_n_minus_one} | ssl_test_lib:ssl_options(server_rsa_opts, Config)],
+    
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+
+supported_groups() ->
+    [{doc,"Test the supported_groups option in TLS 1.3."}].
+
+supported_groups(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, 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, [{supported_groups, [x448, x25519]} | ServerOpts]}]),
+    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, [{supported_groups,[x448]} | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+honor_client_cipher_order_tls13() ->
+    [{doc,"Test API honor server cipher order in TLS 1.3."}].
+honor_client_cipher_order_tls13(Config) when is_list(Config) ->
+    ClientCiphers = [#{key_exchange => any,
+                       cipher => aes_256_gcm,
+                       mac => aead,
+                       prf => sha384},
+                     #{key_exchange => any,
+                       cipher => aes_128_gcm,
+                       mac => aead,
+                       prf => sha256}],
+    ServerCiphers = [#{key_exchange => any,
+                       cipher => aes_128_gcm,
+                       mac => aead,
+                       prf => sha256},
+                     #{key_exchange => any,
+                       cipher => aes_256_gcm,
+                       mac => aead,
+                       prf => sha384}],
+    honor_cipher_order(Config, false, ServerCiphers, ClientCiphers, #{key_exchange => any,
+                                                                      cipher => aes_256_gcm,
+                                                                      mac => aead,
+                                                                      prf => sha384}).
+
+%%--------------------------------------------------------------------
+honor_server_cipher_order_tls13() ->
+    [{doc,"Test API honor server cipher order in TLS 1.3."}].
+honor_server_cipher_order_tls13(Config) when is_list(Config) ->
+    ClientCiphers = [#{key_exchange => any,
+                       cipher => aes_256_gcm,
+                       mac => aead,
+                       prf => sha384},
+                     #{key_exchange => any,
+                       cipher => aes_128_gcm,
+                       mac => aead,
+                       prf => sha256}],
+    ServerCiphers = [#{key_exchange => any,
+                       cipher => aes_128_gcm,
+                       mac => aead,
+                       prf => sha256},
+                     #{key_exchange => any,
+                       cipher => aes_256_gcm,
+                       mac => aead,
+                       prf => sha384}],
+    honor_cipher_order(Config, true, ServerCiphers, ClientCiphers, #{key_exchange => any,
+                                                                     cipher => aes_128_gcm,
+                                                                     mac => aead,
+                                                                     prf => sha256}).
+
+
+%%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
+%%--------------------------------------------------------------------
+
+peercert_result(Socket) ->
+    ssl:peercert(Socket).
+
+connection_information_result(Socket) ->
+    {ok, Info = [_ | _]} = ssl:connection_information(Socket),
+    case  length(Info) > 3 of
+	true -> 
+	    %% Atleast one ssl_option() is set
+	    ct:log("Info ~p", [Info]),
+	    ok;
+	false ->
+	    ct:fail(no_ssl_options_returned)
+    end.
+secret_connection_info_result(Socket) ->
+    {ok, [{protocol, Protocol}]} = ssl:connection_information(Socket, [protocol]),
+    {ok, ConnInfo} = ssl:connection_information(Socket, [client_random, server_random, master_secret]),
+    check_connection_info(Protocol, ConnInfo).
+  
+
+%% In TLS 1.3 the master_secret field is used to store multiple secrets from the key schedule and it is a tuple.
+%% client_random and server_random are not used in the TLS 1.3 key schedule.
+check_connection_info('tlsv1.3', [{client_random, ClientRand}, {master_secret, {master_secret, MasterSecret}}]) ->
+    is_binary(ClientRand) andalso is_binary(MasterSecret);
+check_connection_info('tlsv1.3', [{server_random, ServerRand}, {master_secret, {master_secret, MasterSecret}}]) ->
+    is_binary(ServerRand) andalso is_binary(MasterSecret);
+check_connection_info(_, [{client_random, ClientRand}, {server_random, ServerRand}, {master_secret, MasterSecret}]) ->
+    is_binary(ClientRand) andalso is_binary(ServerRand) andalso is_binary(MasterSecret);
+check_connection_info(_, _) ->
+    false.
+
+
+prf_create_plan(TlsVersions, PRFs, Results) ->
+    lists:foldl(fun(Ver, Acc) ->
+                        A = prf_ciphers_and_expected(Ver, PRFs, Results),
+                        [A|Acc]
+                end, [], TlsVersions).
+
+prf_ciphers_and_expected(TlsVer, PRFs, Results) ->
+    case TlsVer of
+        TlsVer when TlsVer == sslv3 orelse TlsVer == tlsv1
+                    orelse TlsVer == 'tlsv1.1' orelse TlsVer == 'dtlsv1' ->
+            Ciphers = ssl:cipher_suites(),
+            {_, Expected} = lists:keyfind(md5sha, 1, Results),
+            [[{tls_ver, TlsVer}, {ciphers, Ciphers}, {expected, Expected}, {prf, md5sha}]];
+        TlsVer when  TlsVer == 'tlsv1.2' orelse  TlsVer == 'dtlsv1.2'->
+            lists:foldl(
+              fun(PRF, Acc) ->
+                      Ciphers = prf_get_ciphers(TlsVer, PRF),
+                      case Ciphers of
+                          [] ->
+                              ct:log("No ciphers for PRF algorithm ~p. Skipping.", [PRF]),
+                              Acc;
+                          Ciphers ->
+                              {_, Expected} = lists:keyfind(PRF, 1, Results),
+                              [[{tls_ver, TlsVer}, {ciphers, Ciphers}, {expected, Expected},
+                                {prf, PRF}] | Acc]
+                      end
+              end, [], PRFs)
+    end.
+
+prf_get_ciphers(_, PRF) ->
+    lists:filter(
+      fun(C) when tuple_size(C) == 4 andalso
+                  element(4, C) == PRF -> 
+              true;
+         (_) -> 
+              false
+      end, 
+      ssl:cipher_suites()).
+
+prf_run_test(_, TlsVer, [], _, Prf) ->
+    ct:fail({error, cipher_list_empty, TlsVer, Prf});
+prf_run_test(Config, TlsVer, Ciphers, Expected, Prf) ->
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    BaseOpts = [{active, true}, {versions, [TlsVer]}, {ciphers, Ciphers}, {protocol, tls_or_dtls(TlsVer)}],
+    ServerOpts = BaseOpts ++ proplists:get_value(server_opts, Config),
+    ClientOpts = BaseOpts ++ proplists:get_value(client_opts, Config),
+    Server = ssl_test_lib:start_server(
+               [{node, ServerNode}, {port, 0}, {from, self()},
+                {mfa, {?MODULE, prf_verify_value, [TlsVer, Expected, Prf]}},
+                {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client(
+               [{node, ClientNode}, {port, Port},
+                {host, Hostname}, {from, self()},
+                {mfa, {?MODULE, prf_verify_value, [TlsVer, Expected, Prf]}},
+                {options, ClientOpts}]),
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+prf_verify_value(Socket, TlsVer, Expected, Algo) ->
+    Ret = ssl:prf(Socket, <<>>, <<>>, [<<>>], 16),
+    case TlsVer of
+        sslv3 ->
+            case Ret of
+                {error, undefined} -> ok;
+                _ ->
+                    {error, {expected, {error, undefined},
+                             got, Ret, tls_ver, TlsVer, prf_algorithm, Algo}}
+            end;
+        _ ->
+            case Ret of
+                {ok, Expected} -> ok;
+                {ok, Val} -> {error, {expected, Expected, got, Val, tls_ver, TlsVer,
+                                      prf_algorithm, Algo}}
+            end
+    end.
+
+tls_or_dtls('dtlsv1') ->
+    dtls;
+tls_or_dtls('dtlsv1.2') ->
+    dtls;
+tls_or_dtls(_) ->
+    tls.
+
+active_n_common(S, N) ->
+    ok = ssl:setopts(S, [{active,-N}]),
+    receive
+        {ssl_passive, S} -> ok
+    after
+        1000 ->
+            error({error,ssl_passive_failure})
+    end,
+    [{active,false}] = ok(ssl:getopts(S, [active])),
+    ok = ssl:setopts(S, [{active,0}]),
+    receive
+        {ssl_passive, S} -> ok
+    after
+        1000 ->
+            error({error,ssl_passive_failure})
+    end,
+    ok = ssl:setopts(S, [{active,32767}]),
+    {error,{options,_}} = ssl:setopts(S, [{active,1}]),
+    {error,{options,_}} = ssl:setopts(S, [{active,-32769}]),
+    ok = ssl:setopts(S, [{active,-32768}]),
+    receive
+        {ssl_passive, S} -> ok
+    after
+        1000 ->
+            error({error,ssl_passive_failure})
+    end,
+    [{active,false}] = ok(ssl:getopts(S, [active])),
+    ok = ssl:setopts(S, [{active,N}]),
+    ok = ssl:setopts(S, [{active,true}]),
+    [{active,true}] = ok(ssl:getopts(S, [active])),
+    receive
+        _ -> error({error,active_n})
+    after
+        0 ->
+            ok
+    end,
+    ok = ssl:setopts(S, [{active,N}]),
+    ok = ssl:setopts(S, [{active,once}]),
+    [{active,once}] = ok(ssl:getopts(S, [active])),
+    receive
+        _ -> error({error,active_n})
+    after
+        0 ->
+            ok
+    end,
+    {error,{options,_}} = ssl:setopts(S, [{active,32768}]),
+    ok = ssl:setopts(S, [{active,false}]),
+    [{active,false}] = ok(ssl:getopts(S, [active])),
+    ok.
+
+ok({ok,V}) -> V.
+
+repeat(N, Fun) ->
+    repeat(N, N, Fun).
+
+repeat(N, T, Fun) when is_integer(N), N > 0 ->
+    Fun(T-N),
+    repeat(N-1, T, Fun);
+repeat(_, _, _) ->
+    ok.
+
+try_recv_active(Socket) ->
+    ssl:send(Socket, "Hello world"),
+    {error, einval} = ssl:recv(Socket, 11),
+    ok.
+try_recv_active_once(Socket) ->
+    {error, einval} = ssl:recv(Socket, 11),
+    ok.
+
+controlling_process_result(Socket, Pid, Msg) ->
+    ok = ssl:controlling_process(Socket, Pid),
+    %% Make sure other side has evaluated controlling_process
+    %% before message is sent
+    ct:sleep(?SLEEP),
+    ssl:send(Socket, Msg),
+    no_result_msg.
+
+controller_dies_result(_Socket, _Pid, _Msg) ->
+    receive Result -> Result end.
+get_close(Pid, Where) ->
+    receive
+	{'EXIT', Pid, _Reason} ->
+	    receive
+		{_, {ssl_closed, Socket}} ->
+		    ct:log("Socket closed ~p~n",[Socket]);
+		Unexpected ->
+		    ct:log("Unexpected ~p~n",[Unexpected]),
+		    ct:fail({line, ?LINE-1})
+	    after 5000 ->
+		    ct:fail({timeout, {line, ?LINE, Where}})
+	    end;
+	Unexpected ->
+	    ct:log("Unexpected ~p~n",[Unexpected]),
+	    ct:fail({line, ?LINE-1})
+    after 5000 ->
+	    ct:fail({timeout, {line, ?LINE, Where}})
+    end.
+
+ssl_active_recv(N) ->
+    ssl_active_recv(N, []).
+
+ssl_active_recv(0, Acc) ->
+    Acc;
+ssl_active_recv(N, Acc) ->
+    receive 
+	{ssl, _, Bytes} ->
+            ssl_active_recv(N-length(Bytes),  Acc ++ Bytes)
+    end.
+
+send_recv_result_timeout_client(Socket) ->
+    {error, timeout} = ssl:recv(Socket, 11, 500),
+    {error, timeout} = ssl:recv(Socket, 11, 0),
+    ssl:send(Socket, "Hello world"),
+    receive
+	Msg ->
+	    io:format("Msg ~p~n",[Msg])
+    after 500 ->
+	    ok
+    end,
+    {ok, "Hello world"} = ssl:recv(Socket, 11, 500),
+    ok.
+send_recv_result_timeout_server(Socket) ->
+    ssl:send(Socket, "Hello"),
+    {ok, "Hello world"} = ssl:recv(Socket, 11),
+    ssl:send(Socket, " world"),
+    ok.
+
+do_recv_close(Socket) ->
+    {error, closed} = ssl:recv(Socket, 11),
+    receive
+	{_,{error,closed}} ->
+	    error_extra_close_sent_to_user_process
+    after 500 ->
+	    ok
+    end.
+
+tls_close(Socket) ->
+    ok = ssl_test_lib:send_recv_result(Socket),
+    case ssl:close(Socket, 5000) of
+        ok ->
+            ok;
+        {error, closed} ->
+            ok;
+        Other ->
+            ct:fail(Other)
+    end.
+
+run_error_server_close([Pid | Opts]) ->
+    {ok, Listen} = ssl:listen(0, Opts),
+    {ok,{_, Port}} = ssl:sockname(Listen),
+    Pid ! {self(), Port},
+    {ok, Socket} = ssl:transport_accept(Listen),
+    Pid ! ssl:close(Socket).
+
+run_error_server([ Pid | Opts]) ->
+    {ok, Listen} = ssl:listen(0, Opts),
+    {ok,{_, Port}} = ssl:sockname(Listen),
+    Pid ! {self(), Port},
+    {ok, Socket} = ssl:transport_accept(Listen),
+    Pid ! ssl:controlling_process(Socket, self()).
+
+run_client_error([Port, Opts]) ->
+    ssl:connect("localhost", Port, Opts).
+
+honor_cipher_order(Config, Honor, ServerCiphers, ClientCiphers, Expected) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, connection_info_result, []}},
+					{options, [{ciphers, ServerCiphers}, {honor_cipher_order, Honor}
+						   | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, connection_info_result, []}},
+					{options, [{ciphers, ClientCiphers}, {honor_cipher_order, Honor}
+						   | ClientOpts]}]),
+
+    Version = ssl_test_lib:protocol_version(Config),
+
+    ServerMsg = ClientMsg = {ok, {Version, Expected}},
+
+    ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+connection_info_result(Socket) ->
+    {ok, Info} = ssl:connection_information(Socket, [protocol, selected_cipher_suite]),
+    {ok, {proplists:get_value(protocol, Info), proplists:get_value(selected_cipher_suite, Info)}}.
+
+der_input_opts(Opts) ->
+    Certfile = proplists:get_value(certfile, Opts),
+    CaCertsfile = proplists:get_value(cacertfile, Opts),
+    Keyfile = proplists:get_value(keyfile, Opts),
+    Dhfile = proplists:get_value(dhfile, Opts),
+    [{_, Cert, _}] = ssl_test_lib:pem_to_der(Certfile),
+    [{Asn1Type, Key, _}]  = ssl_test_lib:pem_to_der(Keyfile),
+    [{_, DHParams, _}]  = ssl_test_lib:pem_to_der(Dhfile),
+    CaCerts =
+	lists:map(fun(Entry) ->
+			  {_, CaCert, _} = Entry,
+			  CaCert
+		  end, ssl_test_lib:pem_to_der(CaCertsfile)),
+    {Cert, {Asn1Type, Key}, CaCerts, DHParams}.
diff --git a/lib/ssl/test/ssl_basic_SUITE_data/dHParam.pem b/lib/ssl/test/ssl_api_SUITE_data/dHParam.pem
index feb581da30..feb581da30 100644
--- a/lib/ssl/test/ssl_basic_SUITE_data/dHParam.pem
+++ b/lib/ssl/test/ssl_api_SUITE_data/dHParam.pem
diff --git a/lib/ssl/test/ssl_app_env_SUITE.erl b/lib/ssl/test/ssl_app_env_SUITE.erl
new file mode 100644
index 0000000000..27fbcb8e47
--- /dev/null
+++ b/lib/ssl/test/ssl_app_env_SUITE.erl
@@ -0,0 +1,171 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019-2019. 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_app_env_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+-include_lib("common_test/include/ct.hrl").
+-include_lib("ssl/src/ssl_api.hrl").
+
+-define(SLEEP, 500).
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+
+all() ->
+    [
+     {group, 'tlsv1.3'},
+     {group, 'tlsv1.2'},
+     {group, 'tlsv1.1'},
+     {group, 'tlsv1'},
+     {group, 'sslv3'},
+     {group, 'dtlsv1.2'},
+     {group, 'dtlsv1'}
+    ].
+
+groups() ->
+    [
+     {'tlsv1.3', [], tests()},
+     {'tlsv1.2', [],  tests()},
+     {'tlsv1.1', [],  tests()},
+     {'tlsv1', [],  tests()},
+     {'sslv3', [],  tests()},
+     {'dtlsv1.2', [], tests()},
+     {'dtlsv1', [],  tests()}
+    ].
+
+tests() ->
+    [
+     internal_active_1,
+     protocol_versions,
+     empty_protocol_versions
+    ].
+
+
+init_per_suite(Config0) ->
+    catch crypto:stop(),
+    try crypto:start() of
+	ok ->
+	    ssl_test_lib:clean_start(),
+	    ssl_test_lib:make_rsa_cert(Config0)
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:unload(ssl),
+    application:stop(crypto).
+
+
+init_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+	true ->
+	    case ssl_test_lib:sufficient_crypto_support(GroupName) of
+		true ->
+		    [{client_type, erlang},
+                     {server_type, erlang} | ssl_test_lib:init_tls_version(GroupName, Config)];
+		false ->
+		    {skip, "Missing crypto support"}
+	    end;
+	_ ->
+	    ssl:start(),
+	    Config
+    end.
+
+end_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+        true ->
+            ssl_test_lib:clean_tls_version(Config);
+        false ->
+            Config
+    end.
+
+init_per_testcase(internal_active_1, Config) ->
+    ssl:stop(),
+    application:load(ssl),
+    application:set_env(ssl, internal_active_n, 1),
+    ssl:start(),
+    ct:timetrap({seconds, 5}),
+    Config;
+init_per_testcase(protocol_versions, Config) ->
+    Version = ssl_test_lib:protocol_version(Config),
+    case atom_to_list(Version) of
+        "d" ++ _ ->
+            ssl:stop(),
+            application:load(ssl),
+            application:set_env(ssl, dtls_protocol_version, [Version]),
+            ssl:start();
+        _ ->  
+            ssl:stop(),
+            application:load(ssl),
+            application:set_env(ssl, protocol_version, [Version]),
+            ssl:start()
+    end,
+    ct:timetrap({seconds, 5}),
+    Config;
+init_per_testcase(empty_protocol_versions, Config)  ->
+    ssl:stop(),
+    application:load(ssl),
+    ssl_test_lib:clean_env(),
+    application:set_env(ssl, protocol_version, []),
+    application:set_env(ssl, dtls_protocol_version, []),
+    ssl:start(),
+    ct:timetrap({seconds, 5}),
+    Config;
+init_per_testcase(_TestCase, Config) ->
+    ct:timetrap({seconds, 5}),
+    Config.
+
+end_per_testcase(_, _Config) ->
+    ssl_test_lib:clean_start().
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+%%--------------------------------------------------------------------
+internal_active_1() ->
+    [{doc,"Test internal active 1 (behave as internal active once)"}].
+
+internal_active_1(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+    
+%%--------------------------------------------------------------------
+protocol_versions() ->
+    [{doc,"Test to set a list of protocol versions in app environment."}].
+
+protocol_versions(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+
+%%--------------------------------------------------------------------
+empty_protocol_versions() ->
+    [{doc,"Test to set an empty list of protocol versions in app environment."}].
+
+empty_protocol_versions(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index 9633800da5..355cd31070 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2019. 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,14 +26,8 @@
 -compile(export_all).
 
 -include_lib("common_test/include/ct.hrl").
--include_lib("public_key/include/public_key.hrl").
+-include_lib("ssl/src/ssl_api.hrl").
 
--include("ssl_api.hrl").
--include("ssl_internal.hrl").
--include("ssl_alert.hrl").
--include("ssl_internal.hrl").
--include("tls_record.hrl").
--include("tls_handshake.hrl").
 
 -define(TIMEOUT, 20000).
 -define(EXPIRE, 10).
@@ -48,225 +42,35 @@
 all() -> 
     [
      {group, basic},
-     {group, basic_tls},
-     {group, options},
-     {group, options_tls},
-     {group, session},
-     {group, 'dtlsv1.2'},
-     {group, 'dtlsv1'}, 
-     {group, 'tlsv1.2'},
-     {group, 'tlsv1.1'},
-     {group, 'tlsv1'},
-     {group, 'sslv3'}
+     {group, options}
     ].
 
 groups() ->
     [{basic, [], basic_tests()},
-     {basic_tls, [], basic_tests_tls()},
-     {options, [], options_tests()},
-     {options_tls, [], options_tests_tls()},
-     {'dtlsv1.2', [], all_versions_groups()},
-     {'dtlsv1', [], all_versions_groups()},
-     {'tlsv1.2', [], all_versions_groups() ++ tls_versions_groups() ++ [conf_signature_algs, no_common_signature_algs]},
-     {'tlsv1.1', [], all_versions_groups() ++ tls_versions_groups()},
-     {'tlsv1', [], all_versions_groups() ++ tls_versions_groups() ++ rizzo_tests()},
-     {'sslv3', [], all_versions_groups() ++ tls_versions_groups() ++ rizzo_tests() ++ [tls_ciphersuite_vs_version]},
-     {api,[], api_tests()},
-     {api_tls,[], api_tests_tls()},
-     {tls_ciphers,[], tls_cipher_tests()},
-     {session, [], session_tests()},
-     {renegotiate, [], renegotiate_tests()},
-     {ciphers, [], cipher_tests()},
-     {ciphers_ec, [], cipher_tests_ec()},
-     {error_handling_tests, [], error_handling_tests()},
-     {error_handling_tests_tls, [], error_handling_tests_tls()}
+     {options, [], options_tests()}
     ].
 
-tls_versions_groups ()->
-    [
-     {group, api_tls},
-     {group, tls_ciphers},
-     {group, error_handling_tests_tls}].
-
-all_versions_groups ()->
-    [{group, api},
-     {group, renegotiate},
-     {group, ciphers},
-     {group, ciphers_ec},
-     {group, error_handling_tests}].
-
-
 basic_tests() ->
     [app,
-     appup,
-     alerts,
-     alert_details,
-     alert_details_not_too_big,
+     appup,    
      version_option,
      connect_twice,
      connect_dist,
-     clear_pem_cache,
      defaults,
      fallback,
      cipher_format,
-     suite_to_str
-    ].
-
-basic_tests_tls() ->
-    [tls_send_close
-    ].
-
-options_tests() ->
-    [der_input,
-     ssl_options_not_proplist,
-     raw_ssl_option,
-     invalid_inet_get_option,
-     invalid_inet_get_option_not_list,
-     invalid_inet_get_option_improper_list,
-     invalid_inet_set_option,
-     invalid_inet_set_option_not_list,
-     invalid_inet_set_option_improper_list,
-     dh_params,
-     invalid_certfile,
-     invalid_cacertfile,
-     invalid_keyfile,
-     invalid_options,
-     protocol_versions,
-     empty_protocol_versions,
-     ipv6,
-     reuseaddr,
-     honor_server_cipher_order,
-     honor_client_cipher_order,
-     unordered_protocol_versions_server,
-     unordered_protocol_versions_client,
-     max_handshake_size
-].
-
-options_tests_tls() ->
-    [tls_misc_ssl_options,
-     tls_tcp_reuseaddr].
-
-api_tests() ->
-    [secret_connection_info,
-     connection_information,
-     peercert,
-     peercert_with_client_cert,
-     versions,
+     tls_versions_option,
      eccs,
-     controlling_process,
-     getstat,
-     close_with_timeout,
-     hibernate,
-     hibernate_right_away,
-     listen_socket,
-     ssl_recv_timeout,
-     server_name_indication_option,
-     accept_pool,
-     prf,
-     socket_options,
      cipher_suites,
-     handshake_continue,
-     hello_client_cancel,
-     hello_server_cancel
-    ].
-
-api_tests_tls() ->
-    [tls_versions_option,
-     tls_upgrade,
-     tls_upgrade_with_timeout,
-     tls_ssl_accept_timeout,
-     tls_downgrade,
-     tls_shutdown,
-     tls_shutdown_write,
-     tls_shutdown_both,
-     tls_shutdown_error,
-     peername,
-     sockname,
-     tls_socket_options,
-     new_options_in_accept
-    ].
-
-session_tests() ->
-    [reuse_session,
-     reuse_session_expired,
-     server_does_not_want_to_reuse_session,
-     no_reuses_session_server_restart_new_cert,
-     no_reuses_session_server_restart_new_cert_file].
-
-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,
-     server_no_wrap_sequence_number,
-     renegotiate_dos_mitigate_active,
-     renegotiate_dos_mitigate_passive,
-     renegotiate_dos_mitigate_absolute].
-
-tls_cipher_tests() ->
-    [rc4_rsa_cipher_suites,
-     rc4_ecdh_rsa_cipher_suites,
-     rc4_ecdsa_cipher_suites].
-
-cipher_tests() ->
-    [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,
-     psk_anon_cipher_suites,
-     psk_anon_with_hint_cipher_suites,
-     srp_cipher_suites,
-     srp_anon_cipher_suites,
-     srp_dsa_cipher_suites,
-     des_rsa_cipher_suites,
-     des_ecdh_rsa_cipher_suites,
-     default_reject_anonymous].
-
-cipher_tests_ec() ->
-    [ciphers_ecdsa_signed_certs,
-     ciphers_ecdsa_signed_certs_openssl_names,
-     ciphers_ecdh_rsa_signed_certs,
-     ciphers_ecdh_rsa_signed_certs_openssl_names].
-
-error_handling_tests()->
-    [close_transport_accept,
-     recv_active,
-     recv_active_once,
-     recv_error_handling,
-     call_in_error_state,
-     close_in_error_state,
-     abuse_transport_accept_socket,
-     controlling_process_transport_accept_socket
-    ].
-
-error_handling_tests_tls()->
-    [controller_dies,
-     tls_client_closes_socket,
-     tls_closed_in_active_once,
-     tls_tcp_error_propagation_in_active_mode,
-     tls_tcp_connect,
-     tls_tcp_connect_big,
-     tls_dont_crash_on_handshake_garbage
+     old_cipher_suites,
+     cipher_suites_mix     
     ].
 
-rizzo_tests() ->
-    [rizzo,
-     no_rizzo_rc4,
-     rizzo_one_n_minus_one,
-     rizzo_zero_n,
-     rizzo_disabled].
+options_tests() ->
+    [
+     unordered_protocol_versions_server,
+     unordered_protocol_versions_client].
 
-%%--------------------------------------------------------------------
 init_per_suite(Config0) ->
     catch crypto:stop(),
     try crypto:start() of
@@ -289,231 +93,6 @@ end_per_suite(_Config) ->
     application:stop(crypto).
 
 %%--------------------------------------------------------------------
-
-init_per_group(GroupName, Config) when GroupName == basic_tls;
-                                       GroupName == options_tls;
-                                       GroupName == options;
-                                       GroupName == basic;
-                                       GroupName == session;
-                                       GroupName == error_handling_tests_tls
-                                       ->
-    ssl_test_lib:clean_tls_version(Config);                          
-init_per_group(GroupName, Config) ->
-    ssl_test_lib:clean_tls_version(Config),                          
-    case ssl_test_lib:is_tls_version(GroupName) andalso ssl_test_lib:sufficient_crypto_support(GroupName) of
-	true ->
-	    ssl_test_lib:init_tls_version(GroupName, Config);
-	_ ->
-	    case ssl_test_lib:sufficient_crypto_support(GroupName) of
-		true ->
-		    ssl:start(),
-		    Config;
-		false ->
-		    {skip, "Missing crypto support"}
-	    end
-    end.
-
-end_per_group(GroupName, Config) ->
-  case ssl_test_lib:is_tls_version(GroupName) of
-      true ->
-          ssl_test_lib:clean_tls_version(Config);
-      false ->
-          Config
-  end.
-
-%%--------------------------------------------------------------------
-init_per_testcase(Case, Config) when Case ==  unordered_protocol_versions_client;
-				     Case == unordered_protocol_versions_server->
-    case proplists:get_value(supported, ssl:versions()) of
-	['tlsv1.2' | _] ->
-	    ct:timetrap({seconds, 5}),
-	    Config;
-	_ ->
-	    {skip, "TLS 1.2 need but not supported on this platform"}
-    end;
-
-init_per_testcase(protocol_versions, Config)  ->
-    ssl:stop(),
-    application:load(ssl),
-    %% For backwards compatibility sslv2 should be filtered out.
-    application:set_env(ssl, protocol_version, [sslv2, sslv3, tlsv1]),
-    ssl:start(),
-    ct:timetrap({seconds, 5}),
-    Config;
-
-init_per_testcase(reuse_session_expired, Config)  ->
-    ssl:stop(),
-    application:load(ssl),
-    ssl_test_lib:clean_env(),
-    application:set_env(ssl, session_lifetime, ?EXPIRE),
-    application:set_env(ssl, session_delay_cleanup_time, 500),
-    ssl:start(),
-    ct:timetrap({seconds, 30}),
-    Config;
-
-init_per_testcase(empty_protocol_versions, Config)  ->
-    ssl:stop(),
-    application:load(ssl),
-    ssl_test_lib:clean_env(),
-    application:set_env(ssl, protocol_version, []),
-    ssl:start(),
-    ct:timetrap({seconds, 5}),
-    Config;
-
-init_per_testcase(fallback, Config)  ->
-    case tls_record:highest_protocol_version([]) of
-	{3, N} when N > 1 ->
-	    ct:timetrap({seconds, 5}),
-	    Config;
-	_ ->
-	    {skip, "Not relevant if highest supported version is less than 3.2"}
-    end;
-
-init_per_testcase(TestCase, Config) when TestCase == client_renegotiate;
-					 TestCase == server_renegotiate;
-					 TestCase == client_secure_renegotiate;
-					 TestCase == client_renegotiate_reused_session;
-					 TestCase == server_renegotiate_reused_session;
-					 TestCase == client_no_wrap_sequence_number;
-					 TestCase == server_no_wrap_sequence_number;
-					 TestCase == renegotiate_dos_mitigate_active;
-					 TestCase == renegotiate_dos_mitigate_passive;
-					 TestCase == renegotiate_dos_mitigate_absolute ->
-    ssl_test_lib:ct_log_supported_protocol_versions(Config),
-    ct:timetrap({seconds, ?SEC_RENEGOTIATION_TIMEOUT + 5}),
-    Config;
-
-init_per_testcase(TestCase, Config) when TestCase == psk_cipher_suites;
-					 TestCase == psk_with_hint_cipher_suites;
-					 TestCase == ciphers_rsa_signed_certs;
-					 TestCase == ciphers_rsa_signed_certs_openssl_names;
-                                         TestCase == ciphers_ecdh_rsa_signed_certs_openssl_names;
-                                         TestCase == ciphers_ecdh_rsa_signed_certs;                           
-					 TestCase == ciphers_dsa_signed_certs;
-					 TestCase == ciphers_dsa_signed_certs_openssl_names;
-					 TestCase == anonymous_cipher_suites;
-					 TestCase == ciphers_ecdsa_signed_certs;
-					 TestCase == ciphers_ecdsa_signed_certs_openssl_names;
-					 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 == tls_tcp_connect_big ->
-    ssl_test_lib:ct_log_supported_protocol_versions(Config),
-    ct:timetrap({seconds, 60}),
-    Config;
-
-init_per_testcase(version_option, Config) ->
-    ssl_test_lib:ct_log_supported_protocol_versions(Config),
-    ct:timetrap({seconds, 10}),
-    Config;
-
-init_per_testcase(reuse_session, Config) ->
-    ssl_test_lib:ct_log_supported_protocol_versions(Config),
-    ct:timetrap({seconds, 10}),
-    Config;
-
-init_per_testcase(rizzo, Config) ->
-    ssl_test_lib:ct_log_supported_protocol_versions(Config),
-    ct:timetrap({seconds, 60}),
-    Config;
-
-init_per_testcase(no_rizzo_rc4, Config) ->
-    ssl_test_lib:ct_log_supported_protocol_versions(Config),
-    ct:timetrap({seconds, 60}),
-    Config;
-
-init_per_testcase(rizzo_one_n_minus_one, Config) ->
-    ct:log("TLS/SSL version ~p~n ", [tls_record:supported_protocol_versions()]),
-    ct:timetrap({seconds, 60}),
-    rizzo_add_mitigation_option(one_n_minus_one, Config);
-
-init_per_testcase(rizzo_zero_n, Config) ->
-    ct:log("TLS/SSL version ~p~n ", [tls_record:supported_protocol_versions()]),
-    ct:timetrap({seconds, 60}),
-    rizzo_add_mitigation_option(zero_n, Config);
-
-init_per_testcase(rizzo_disabled, Config) ->
-    ct:log("TLS/SSL version ~p~n ", [tls_record:supported_protocol_versions()]),
-    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}),
-    case proplists:get_value(tc_group_path, Config) of
-        [] -> Prop = [];
-        [Prop] -> Prop
-    end,
-    case proplists:get_value(name, Prop) of
-        undefined -> TlsVersions = [sslv3, tlsv1, 'tlsv1.1', 'tlsv1.2'];
-        TlsVersion when is_atom(TlsVersion) ->
-            TlsVersions = [TlsVersion]
-    end,
-    PRFS=[md5, sha, sha256, sha384, sha512],
-    %All are the result of running tls_v1:prf(PrfAlgo, <<>>, <<>>, <<>>, 16)
-    %with the specified PRF algorithm
-    ExpectedPrfResults=
-    [{md5, <<96,139,180,171,236,210,13,10,28,32,2,23,88,224,235,199>>},
-     {sha, <<95,3,183,114,33,169,197,187,231,243,19,242,220,228,70,151>>},
-     {sha256, <<166,249,145,171,43,95,158,232,6,60,17,90,183,180,0,155>>},
-     {sha384, <<153,182,217,96,186,130,105,85,65,103,123,247,146,91,47,106>>},
-     {sha512, <<145,8,98,38,243,96,42,94,163,33,53,49,241,4,127,28>>},
-     %TLS 1.0 and 1.1 PRF:
-     {md5sha, <<63,136,3,217,205,123,200,177,251,211,17,229,132,4,173,80>>}],
-    TestPlan = prf_create_plan(TlsVersions, PRFS, ExpectedPrfResults),
-    [{prf_test_plan, TestPlan} | Config];
-
-init_per_testcase(TestCase, Config) when TestCase == tls_ssl_accept_timeout;
-					 TestCase == tls_client_closes_socket;
-					 TestCase == tls_closed_in_active_once;
-					 TestCase == tls_downgrade ->
-    ssl:stop(),
-    ssl:start(),
-    ssl_test_lib:ct_log_supported_protocol_versions(Config),
-    ct:timetrap({seconds, 15}),
-    Config;
-init_per_testcase(TestCase, Config) when TestCase == clear_pem_cache;
-						TestCase == der_input;
-						TestCase == defaults ->
-    ssl_test_lib:ct_log_supported_protocol_versions(Config),
-    %% White box test need clean start
-    ssl:stop(),
-    ssl:start(),
-    ct:timetrap({seconds, 20}),
-    Config;
-init_per_testcase(raw_ssl_option, Config) ->
-    ct:timetrap({seconds, 5}),
-    case os:type() of
-        {unix,linux} ->
-            Config;
-        _ ->
-            {skip, "Raw options are platform-specific"}
-    end;
-
-init_per_testcase(accept_pool, Config) ->
-    ct:timetrap({seconds, 5}),
-    case proplists:get_value(protocol, Config) of
-	dtls ->
-            {skip, "Not yet supported on DTLS sockets"};
-	_ ->
-	    ssl_test_lib:ct_log_supported_protocol_versions(Config),
-	    Config
-    end;
-init_per_testcase(controller_dies, Config) ->
-    ct:timetrap({seconds, 10}),
-    Config;
 init_per_testcase(eccs, Config) ->
     case ssl:eccs() of
         [] ->
@@ -528,19 +107,8 @@ init_per_testcase(_TestCase, Config) ->
     ct:timetrap({seconds, 5}),
     Config.
 
-end_per_testcase(reuse_session_expired, Config) ->
-    application:unset_env(ssl, session_lifetime),
-    application:unset_env(ssl, session_delay_cleanup_time),
-    end_per_testcase(default_action, Config);
-
-end_per_testcase(Case, Config) when Case == protocol_versions;
-				    Case == empty_protocol_versions->
-    application:unset_env(ssl, protocol_versions),
-    end_per_testcase(default_action, Config);
-
 end_per_testcase(_TestCase, Config) ->
     Config.
-
 %%--------------------------------------------------------------------
 %% Test Cases --------------------------------------------------------
 %%--------------------------------------------------------------------
@@ -554,624 +122,76 @@ appup() ->
 appup(Config) when is_list(Config) ->
     ok = ?t:appup_test(ssl).
 %%--------------------------------------------------------------------
-alerts() ->
-    [{doc, "Test ssl_alert:alert_txt/1"}].
-alerts(Config) when is_list(Config) ->
-    Descriptions = [?CLOSE_NOTIFY, ?UNEXPECTED_MESSAGE, ?BAD_RECORD_MAC,
-		    ?DECRYPTION_FAILED_RESERVED, ?RECORD_OVERFLOW, ?DECOMPRESSION_FAILURE,
-		    ?HANDSHAKE_FAILURE, ?BAD_CERTIFICATE, ?UNSUPPORTED_CERTIFICATE,
-		    ?CERTIFICATE_REVOKED,?CERTIFICATE_EXPIRED, ?CERTIFICATE_UNKNOWN,
-		    ?ILLEGAL_PARAMETER, ?UNKNOWN_CA, ?ACCESS_DENIED, ?DECODE_ERROR,
-		    ?DECRYPT_ERROR, ?EXPORT_RESTRICTION, ?PROTOCOL_VERSION, 
-		    ?INSUFFICIENT_SECURITY, ?INTERNAL_ERROR, ?USER_CANCELED,
-		    ?NO_RENEGOTIATION, ?UNSUPPORTED_EXTENSION, ?CERTIFICATE_UNOBTAINABLE,
-		    ?UNRECOGNISED_NAME, ?BAD_CERTIFICATE_STATUS_RESPONSE,
-		    ?BAD_CERTIFICATE_HASH_VALUE, ?UNKNOWN_PSK_IDENTITY, 
-		    255 %% Unsupported/unknow alert will result in a description too
-		   ],
-    Alerts = [?ALERT_REC(?WARNING, ?CLOSE_NOTIFY) | 
-	      [?ALERT_REC(?FATAL, Desc) || Desc <- Descriptions]],
-    lists:foreach(fun(Alert) ->
-			case ssl_alert:alert_txt(Alert) of
-			    Txt when is_list(Txt) ->
-				ok;
-			    Other ->
-				ct:fail({unexpected, Other})
-			end 
-		  end, Alerts).
-%%--------------------------------------------------------------------
-alert_details() ->
-    [{doc, "Test that ssl_alert:alert_txt/1 result contains extendend error description"}].
-alert_details(Config) when is_list(Config) ->
-    Unique = make_ref(),
-    UniqueStr = lists:flatten(io_lib:format("~w", [Unique])),
-    Alert = ?ALERT_REC(?WARNING, ?CLOSE_NOTIFY, Unique),
-    case string:str(ssl_alert:alert_txt(Alert), UniqueStr) of
-        0 ->
-            ct:fail(error_details_missing);
-        _ ->
-            ok
-    end.
-
-%%--------------------------------------------------------------------
-alert_details_not_too_big() ->
-    [{doc, "Test that ssl_alert:alert_txt/1 limits printed depth of extended error description"}].
-alert_details_not_too_big(Config) when is_list(Config) ->
-    Reason = lists:duplicate(10, lists:duplicate(10, lists:duplicate(10, {some, data}))),
-    Alert = ?ALERT_REC(?WARNING, ?CLOSE_NOTIFY, Reason),
-    case length(ssl_alert:alert_txt(Alert)) < 1000 of
-        true ->
-            ok;
-        false ->
-            ct:fail(ssl_alert_text_too_big)
-    end.
-
-%%--------------------------------------------------------------------
-new_options_in_accept() ->
-    [{doc,"Test that you can set ssl options in ssl_accept/3 and not only in tcp upgrade"}].
-new_options_in_accept(Config) when is_list(Config) -> 
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts0 = ssl_test_lib:ssl_options(server_dsa_opts, Config),
-    [_ , _ | ServerSslOpts] = ssl_test_lib:ssl_options(server_opts, Config), %% Remove non ssl opts
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Version = ssl_test_lib:protocol_options(Config, [{tls, sslv3}, {dtls, dtlsv1}]),
-    Cipher = ssl_test_lib:protocol_options(Config, [{tls, #{key_exchange =>rsa,
-                                                            cipher => rc4_128,
-                                                            mac => sha,
-                                                            prf => default_prf
-                                                           }}, 
-                                                    {dtls, #{key_exchange =>rsa,
-                                                             cipher => aes_128_cbc,
-                                                             mac => sha,
-                                                             prf => default_prf
-                                                            }}]),
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-					{ssl_extra_opts, [{versions, [Version]},
-							  {ciphers,[Cipher]} | ServerSslOpts]}, %% To be set in ssl_accept/3
-					{mfa, {?MODULE, connection_info_result, []}},
-					{options, proplists:delete(cacertfile, ServerOpts0)}]),
-    
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {?MODULE, connection_info_result, []}},
-					{options, [{versions, [Version]},
-						   {ciphers,[Cipher]} | ClientOpts]}]),
-    
-    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
-		       [self(), Client, Server]),
-
-    ServerMsg = ClientMsg = {ok, {Version, Cipher}},
+version_option() ->
+    [{doc, "Use version option and do no specify ciphers list. Bug specified incorrect ciphers"}].
+version_option(Config) when is_list(Config) ->
+    Versions = proplists:get_value(supported, ssl:versions()),
+    [version_option_test(Config, Version) || Version <- Versions].
    
-    ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
-    
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
 %%--------------------------------------------------------------------
-handshake_continue() ->
-    [{doc, "Test API function ssl:handshake_continue/3"}].
-handshake_continue(Config) when is_list(Config) -> 
-    ClientOpts = ssl_test_lib:ssl_options(client_verification_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_verification_opts, 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, ssl_test_lib:ssl_options([{reuseaddr, true}, {handshake, hello}], 
-                                                                           Config)},
-                                        {continue_options, proplists:delete(reuseaddr, ServerOpts)}
-                                       ]),
-    
-    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, ssl_test_lib:ssl_options([{handshake, hello}], 
-                                                                           Config)},
-                                        {continue_options,  proplists:delete(reuseaddr, ClientOpts)}]),
-     
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-hello_client_cancel() ->
-    [{doc, "Test API function ssl:handshake_cancel/1 on the client side"}].
-hello_client_cancel(Config) when is_list(Config) -> 
-    ServerOpts = ssl_test_lib:ssl_options(server_verification_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_verification_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-					{options, ssl_test_lib:ssl_options([{handshake, hello}], Config)},
-                                        {continue_options, proplists:delete(reuseaddr, ServerOpts)}]),
-    
-    Port = ssl_test_lib:inet_port(Server),
-
-    %% That is ssl:handshake_cancel returns ok
-    {connect_failed, ok} = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
-                                                      {host, Hostname},
-                                                      {from, self()}, 
-                                                      {options, ssl_test_lib:ssl_options([{handshake, hello}], Config)},
-                                                      {continue_options, cancel}]),    
-      receive
-          {Server, {error, {tls_alert, "user canceled"}}} ->
-              ok;
-          {Server, {error, closed}} ->
-              ct:pal("Did not receive the ALERT"),
-              ok
-      end.
-
-%%--------------------------------------------------------------------
-hello_server_cancel() ->
-    [{doc, "Test API function ssl:handshake_cancel/1 on the server side"}].
-hello_server_cancel(Config) when is_list(Config) -> 
-    ClientOpts = ssl_test_lib:ssl_options(client_verification_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-					{options, ssl_test_lib:ssl_options([{handshake, hello}], Config)},
-                                        {continue_options, cancel}]),
-    
-    Port = ssl_test_lib:inet_port(Server),
-
-    {connect_failed, _} = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
-                                                     {host, Hostname},
-                                                     {from, self()}, 
-                                                     {options, ssl_test_lib:ssl_options([{handshake, hello}], Config)},
-                                                     {continue_options, proplists:delete(reuseaddr, ClientOpts)}]),
-    
-    ssl_test_lib:check_result(Server, ok).
-
-%%--------------------------------------------------------------------
-prf() ->
-    [{doc,"Test that ssl:prf/5 uses the negotiated PRF."}].
-prf(Config) when is_list(Config) ->
-    TestPlan = proplists:get_value(prf_test_plan, Config),
-    case TestPlan of
-        [] -> ct:fail({error, empty_prf_test_plan});
-        _ -> lists:foreach(fun(Suite) ->
-                                   lists:foreach(
-                                     fun(Test) ->
-                                             V = proplists:get_value(tls_ver, Test),
-                                             C = proplists:get_value(ciphers, Test),
-                                             E = proplists:get_value(expected, Test),
-                                             P = proplists:get_value(prf, Test),
-                                             prf_run_test(Config, V, C, E, P)
-                                     end, Suite)
-                           end, TestPlan)
-    end.
-
-%%--------------------------------------------------------------------
-
-secret_connection_info() ->
-    [{doc,"Test the API function ssl:connection_information/2"}].
-secret_connection_info(Config) when is_list(Config) -> 
-    ClientOpts = ssl_test_lib:ssl_options(client_verification_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_verification_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, secret_connection_info_result, []}},
-					{options, ServerOpts}]),
-    
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
-					{host, Hostname},
-                                        {from, self()}, 
-                                        {mfa, {?MODULE, secret_connection_info_result, []}},
-                                        {options, ClientOpts}]),
-    
-    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
-		       [self(), Client, Server]),
-			   
-    ssl_test_lib:check_result(Server, true, Client, true),
-    
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-
-%%--------------------------------------------------------------------
-
-connection_information() ->
-    [{doc,"Test the API function ssl:connection_information/1"}].
-connection_information(Config) when is_list(Config) -> 
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, connection_information_result, []}},
-					{options, ServerOpts}]),
-    
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
-					{host, Hostname},
-			   {from, self()}, 
-			   {mfa, {?MODULE, connection_information_result, []}},
-			   {options, ClientOpts}]),
-    
-    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
-		       [self(), Client, Server]),
-    
-    ServerMsg = ClientMsg = ok,
-			   
-    ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
-    
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-
-%%--------------------------------------------------------------------
-protocol_versions() ->
-    [{doc,"Test to set a list of protocol versions in app environment."}].
-
-protocol_versions(Config) when is_list(Config) -> 
-    basic_test(Config).
-
-%%--------------------------------------------------------------------
-empty_protocol_versions() ->
-    [{doc,"Test to set an empty list of protocol versions in app environment."}].
-
-empty_protocol_versions(Config) when is_list(Config) -> 
-    basic_test(Config).
-
-%%--------------------------------------------------------------------
-
-controlling_process() ->
-    [{doc,"Test API function controlling_process/2"}].
-
-controlling_process(Config) when is_list(Config) -> 
+connect_twice() ->
+    [{doc,""}].
+connect_twice(Config) when is_list(Config) ->
     ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
     ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    ClientMsg = "Server hello",
-    ServerMsg = "Client hello",
-   
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-			   {mfa, {?MODULE, 
-				  controlling_process_result, [self(),
-							       ServerMsg]}},
-			   {options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-		   {from, self()}, 
-			   {mfa, {?MODULE, 
-				  controlling_process_result, [self(),
-							       ClientMsg]}},
-			   {options, ClientOpts}]),
-   
-    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
-		       [self(), Client, Server]),
-    
-    receive 
-	{ssl, _, "S"} ->
-	    receive_s_rizzo_duong_beast();
-	{ssl, _, ServerMsg} ->
-	    receive 
-		{ssl, _, ClientMsg} ->
-		    ok
-	    end;
-	{ssl, _, "C"} ->
-	    receive_c_rizzo_duong_beast();
-	{ssl, _, ClientMsg} ->
-	      receive 
-		  {ssl, _, ServerMsg} ->
-		      ok
-	      end;
-	Unexpected ->
-	    ct:fail(Unexpected)
-    end,
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
 
-%%--------------------------------------------------------------------
-getstat() ->
-    [{doc,"Test API function getstat/2"}].
-
-getstat(Config) when is_list(Config) ->
-    ClientOpts = ?config(client_opts, Config),
-    ServerOpts = ?config(server_opts, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server1 =
-        ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-                                   {from, self()},
-                                   {mfa, {ssl_test_lib, send_recv_result, []}},
-                                   {options,  [{active, false} | ServerOpts]}]),
-    Port1 = ssl_test_lib:inet_port(Server1),
-    Server2 =
-        ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-                                   {from, self()},
-                                   {mfa, {ssl_test_lib, send_recv_result, []}},
-                                   {options,  [{active, false} | ServerOpts]}]),
-    Port2 = ssl_test_lib:inet_port(Server2),
-    {ok, ActiveC} = rpc:call(ClientNode, ssl, connect,
-                          [Hostname,Port1,[{active, once}|ClientOpts]]),
-    {ok, PassiveC} = rpc:call(ClientNode, ssl, connect,
-                          [Hostname,Port2,[{active, false}|ClientOpts]]),
-
-    ct:log("Testcase ~p, Client ~p  Servers ~p, ~p ~n",
-                       [self(), self(), Server1, Server2]),
-
-    %% We only check that the values are non-zero initially
-    %% (due to the handshake), and that sending more changes the values.
-
-    %% Passive socket.
-
-    {ok, InitialStats} = ssl:getstat(PassiveC),
-    ct:pal("InitialStats  ~p~n", [InitialStats]),
-    [true] = lists:usort([0 =/= proplists:get_value(Name, InitialStats)
-        || Name <- [recv_cnt, recv_oct, recv_avg, recv_max, send_cnt, send_oct, send_avg, send_max]]),
-
-    ok = ssl:send(PassiveC, "Hello world"),
-    wait_for_send(PassiveC),
-    {ok, SStats} = ssl:getstat(PassiveC, [send_cnt, send_oct]),
-    ct:pal("SStats  ~p~n", [SStats]),
-    [true] = lists:usort([proplists:get_value(Name, SStats) =/= proplists:get_value(Name, InitialStats)
-        || Name <- [send_cnt, send_oct]]),
-
-    %% Active socket.
-
-    {ok, InitialAStats} = ssl:getstat(ActiveC),
-    ct:pal("InitialAStats  ~p~n", [InitialAStats]),
-    [true] = lists:usort([0 =/= proplists:get_value(Name, InitialAStats)
-        || Name <- [recv_cnt, recv_oct, recv_avg, recv_max, send_cnt, send_oct, send_avg, send_max]]),
-
-    _ = receive
-        {ssl, ActiveC, _} ->
-            ok
-    after
-        ?SLEEP ->
-            exit(timeout)
-    end,
-
-    ok = ssl:send(ActiveC, "Hello world"),
-    wait_for_send(ActiveC),
-    {ok, ASStats} = ssl:getstat(ActiveC, [send_cnt, send_oct]),
-    ct:pal("ASStats  ~p~n", [ASStats]),
-    [true] = lists:usort([proplists:get_value(Name, ASStats) =/= proplists:get_value(Name, InitialAStats)
-        || Name <- [send_cnt, send_oct]]),
-
-    ok.
-
-%%--------------------------------------------------------------------
-controller_dies() ->
-    [{doc,"Test that the socket is closed after controlling process dies"}].
-controller_dies(Config) when is_list(Config) -> 
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    ClientMsg = "Hello server",
-    ServerMsg = "Hello client",
-
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, 
-					       controller_dies_result, [self(),
-									ServerMsg]}},
-					{options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {?MODULE, 
-					       controller_dies_result, [self(),
-									    ClientMsg]}},
-					{options, ClientOpts}]),
-
-    ct:log("Testcase ~p, Client ~p  Server ~p ~n", [self(), Client, Server]),
-    ct:sleep(?SLEEP), %% so that they are connected
-    
-    process_flag(trap_exit, true),
-
-    %% Test that clients die
-    exit(Client, killed),
-    get_close(Client, ?LINE),
-
-    %% Test that clients die when process disappear
-    Server ! listen, 
-    Tester = self(),
-    Connect = fun(Pid) ->
-		      {ok, Socket} = ssl:connect(Hostname, Port, ClientOpts),
-		      %% Make sure server finishes and verification
-		      %% and is in coonection state before
-		      %% killing client
-		      ct:sleep(?SLEEP),
-		      Pid ! {self(), connected, Socket},
-		      receive die_nice -> normal end
-	      end,
-    Client2 = spawn_link(fun() -> Connect(Tester) end),
-    receive {Client2, connected, _Socket} ->  Client2 ! die_nice end,
-    
-    get_close(Client2, ?LINE),
-    
-    %% Test that clients die when the controlling process have changed 
-    Server ! listen, 
-
-    Client3 = spawn_link(fun() -> Connect(Tester) end),
-    Controller = spawn_link(fun() -> receive die_nice -> normal end end),
-    receive 
-	{Client3, connected, Socket} ->  
-	    ok = ssl:controlling_process(Socket, Controller),
-	    Client3 ! die_nice 
-    end,
-
-    ct:log("Wating on exit ~p~n",[Client3]),
-    receive {'EXIT', Client3, normal} -> ok end,
-    
-    receive   %% Client3 is dead but that doesn't matter, socket should not be closed.
-	Unexpected ->
-	    ct:log("Unexpected ~p~n",[Unexpected]),
-	    ct:fail({line, ?LINE-1})
-    after 1000 ->
-	    ok
-    end,
-    Controller ! die_nice,
-    get_close(Controller, ?LINE),
-    
-    %% Test that servers die
-    Server ! listen, 
-    LastClient = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					    {host, Hostname},
-					    {from, self()}, 
-					    {mfa, {?MODULE, 
-						   controller_dies_result, [self(),
-									    ClientMsg]}},
-					    {options, ClientOpts}]),
-    ct:sleep(?SLEEP), %% so that they are connected
-    
-    exit(Server, killed),
-    get_close(Server, ?LINE),
-    process_flag(trap_exit, false),
-    ssl_test_lib:close(LastClient).
-
-%%--------------------------------------------------------------------
-tls_client_closes_socket() ->
-    [{doc,"Test what happens when client closes socket before handshake is compleated"}].
 
-tls_client_closes_socket(Config) when is_list(Config) -> 
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    TcpOpts = [binary, {reuseaddr, true}],
-    
-    Server = ssl_test_lib:start_upgrade_server_error([{node, ServerNode}, {port, 0}, 
-						      {from, self()}, 
-						      {tcp_options, TcpOpts},
-						      {ssl_options, ServerOpts}]),
+    Server =
+	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+				   {from, self()},
+				   {mfa, {ssl_test_lib, send_recv_result, []}},
+				   {options,  [{keepalive, true},{active, false}
+					       | ServerOpts]}]),
     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, []}},
+				   {options, [{keepalive, true},{active, false}
+					      | ClientOpts]}]),
+    Server ! listen,
 
-    Connect = fun() ->
-		      {ok, _Socket} = rpc:call(ClientNode, gen_tcp, connect, 
-					      [Hostname, Port, [binary]]),	      
-		      %% Make sure that ssl_accept is called before 
-		      %% client process ends and closes socket.
-		      ct:sleep(?SLEEP)
-	      end,
-    
-    _Client = spawn_link(Connect),
-
-    ssl_test_lib:check_result(Server, {error,closed}).
-
-%%--------------------------------------------------------------------
-tls_closed_in_active_once() ->
-    [{doc, "Test that ssl_closed is delivered in active once with non-empty buffer, check ERL-420."}].
-
-tls_closed_in_active_once(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {_ClientNode, _ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    TcpOpts = [binary, {reuseaddr, true}],
-    Port = ssl_test_lib:inet_port(node()),
-    Server = fun() ->
-		     {ok, Listen} = gen_tcp:listen(Port, TcpOpts),
-		     {ok, TcpServerSocket} = gen_tcp:accept(Listen),
-		     {ok, ServerSocket} = ssl:ssl_accept(TcpServerSocket, ServerOpts),
-		     lists:foreach(
-		       fun(_) ->
-			       ssl:send(ServerSocket, "some random message\r\n")
-		       end, lists:seq(1, 20)),
-		     %% Close TCP instead of SSL socket to trigger the bug:
-		     gen_tcp:close(TcpServerSocket),
-		     gen_tcp:close(Listen)
-	     end,
-    spawn_link(Server),
-    {ok, Socket} = ssl:connect(Hostname, Port, [{active, false} | ClientOpts]),
-    Result = tls_closed_in_active_once_loop(Socket),
-    ssl:close(Socket),
-    case Result of
-	ok -> ok;
-	_ -> ct:fail(Result)
-    end.
-
-tls_closed_in_active_once_loop(Socket) ->
-    case ssl:setopts(Socket, [{active, once}]) of
-        ok ->
-            receive
-                {ssl, Socket, _} ->
-                    tls_closed_in_active_once_loop(Socket);
-                {ssl_closed, Socket} ->
-                    ok
-            after 5000 ->
-                    no_ssl_closed_received
-            end;
-        {error, closed} ->
-            ok
-    end.
-%%--------------------------------------------------------------------
-connect_dist() ->
-    [{doc,"Test a simple connect as is used by distribution"}].
-
-connect_dist(Config) when is_list(Config) -> 
-    ClientOpts0 = ssl_test_lib:ssl_options(client_kc_opts, Config),
-    ClientOpts = [{ssl_imp, new},{active, false}, {packet,4}|ClientOpts0],
-    ServerOpts0 = ssl_test_lib:ssl_options(server_kc_opts, Config),
-    ServerOpts = [{ssl_imp, new},{active, false}, {packet,4}|ServerOpts0],
+    {Client1, #sslsocket{}} =
+	ssl_test_lib:start_client([return_socket,
+				   {node, ClientNode}, {port, Port},
+				   {host, Hostname},
+				   {from, self()},
+				   {mfa, {ssl_test_lib, send_recv_result, []}},
+				   {options, [{keepalive, true},{active, false}
+					      | ClientOpts]}]),
 
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
+			 [self(), Client, Server]),
 
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, connect_dist_s, []}},
-					{options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {?MODULE, connect_dist_c, []}},
-					{options, ClientOpts}]),
-    
     ssl_test_lib:check_result(Server, ok, Client, ok),
+    ssl_test_lib:check_result(Server, ok, Client1, ok),
 
     ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-
-clear_pem_cache() ->
-    [{doc,"Test that internal reference tabel is cleaned properly even when "
-     " the PEM cache is cleared" }].
-clear_pem_cache(Config) when is_list(Config) -> 
-    {status, _, _, StatusInfo} = sys:get_status(whereis(ssl_manager)),
-    [_, _,_, _, Prop] = StatusInfo,
-    State = ssl_test_lib:state(Prop),
-    [_,{FilRefDb, _} |_] = element(6, State),
-    {Server, Client} = basic_verify_test_no_close(Config),
-    CountReferencedFiles = fun({_, -1}, Acc) ->
-				   Acc;
-			      ({_, N}, Acc) ->
-				   N + Acc
-			   end,
-    
-    2 = ets:foldl(CountReferencedFiles, 0, FilRefDb), 
-    ssl:clear_pem_cache(),
-    _ = sys:get_status(whereis(ssl_manager)),
-    {Server1, Client1} = basic_verify_test_no_close(Config),
-    4 =  ets:foldl(CountReferencedFiles, 0, FilRefDb), 
-    ssl_test_lib:close(Server),
     ssl_test_lib:close(Client),
-    ct:sleep(2000),
-    _ = sys:get_status(whereis(ssl_manager)),
-    2 =  ets:foldl(CountReferencedFiles, 0, FilRefDb), 
-    ssl_test_lib:close(Server1),
-    ssl_test_lib:close(Client1),
-    ct:sleep(2000),
-    _ = sys:get_status(whereis(ssl_manager)),
-    0 =  ets:foldl(CountReferencedFiles, 0, FilRefDb).
+    ssl_test_lib:close(Client1).
+defaults(Config) when is_list(Config)->
+    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)),
+    false = lists:member('tlsv1',  proplists:get_value(supported, Versions)),
+    true = lists:member('tlsv1.1', proplists:get_value(available, Versions)),
+    false = 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('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)),
+    false = lists:member('dtlsv1', proplists:get_value(supported_dtls, Versions)).
 
-%%--------------------------------------------------------------------
 
 fallback() ->
     [{doc, "Test TLS_FALLBACK_SCSV downgrade prevention"}].
@@ -1195,10 +215,8 @@ fallback(Config) when is_list(Config) ->
                                                            [{fallback, true},
                                                             {versions, ['tlsv1']}
                                                             | ClientOpts]}]),
-    
-    ssl_test_lib:check_result(Server, {error,{tls_alert,"inappropriate fallback"}},
-                              Client, {error,{tls_alert,"inappropriate fallback"}}).
-
+    ssl_test_lib:check_server_alert(Server, Client, inappropriate_fallback).
+   
 %%--------------------------------------------------------------------
 cipher_format() ->
     [{doc, "Test that cipher conversion from maps | tuples | stings to binarys works"}].
@@ -1212,175 +230,6 @@ cipher_format(Config) when is_list(Config) ->
     ssl:close(Socket2).
 
 %%--------------------------------------------------------------------
-suite_to_str() ->
-    [{doc, "Test that the suite_to_str API works"}].
-suite_to_str(Config) when is_list(Config) ->
-    "TLS_EMPTY_RENEGOTIATION_INFO_SCSV" =
-        ssl:suite_to_str(#{key_exchange => null,
-                           cipher => null,
-                           mac => null,
-                           prf => null}),
-    "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256" =
-        ssl:suite_to_str(#{key_exchange => ecdhe_ecdsa,
-                           cipher => aes_128_gcm,
-                           mac => aead,
-                           prf => sha256}),
-    "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256" =
-        ssl:suite_to_str(#{key_exchange => ecdh_rsa,
-                           cipher => aes_128_cbc,
-                           mac => sha256,
-                           prf => sha256}).
-
-%%--------------------------------------------------------------------
-
-peername() ->
-    [{doc,"Test API function peername/1"}].
-
-peername(Config) when is_list(Config) -> 
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-			   {mfa, {?MODULE, peername_result, []}},
-			   {options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {?MODULE, peername_result, []}},
-					{options, [{port, 0} | ClientOpts]}]),
-    
-    ClientPort = ssl_test_lib:inet_port(Client),
-    ServerIp = ssl_test_lib:node_to_hostip(ServerNode),
-    ClientIp = ssl_test_lib:node_to_hostip(ClientNode),
-    ServerMsg = {ok, {ClientIp, ClientPort}},
-    ClientMsg = {ok, {ServerIp, Port}},
-	
-    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
-		       [self(), Client, Server]),
-		   
-    ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
-    
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-peercert() ->
-    [{doc,"Test API function peercert/1"}].
-peercert(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
-					{from, self()},
-			   {mfa, {?MODULE, peercert_result, []}},
-			   {options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
-					{host, Hostname},
-			   {from, self()},
-			   {mfa, {?MODULE, peercert_result, []}},
-			   {options, ClientOpts}]),
-
-    CertFile = proplists:get_value(certfile, ServerOpts),
-    [{'Certificate', BinCert, _}]= ssl_test_lib:pem_to_der(CertFile),
-
-    ServerMsg = {error, no_peercert},
-    ClientMsg = {ok, BinCert},
-
-    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
-		       [self(), Client, Server]),
-
-    ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-peercert_result(Socket) ->
-    ssl:peercert(Socket).
-%%--------------------------------------------------------------------
-
-peercert_with_client_cert() ->
-    [{doc,"Test API function peercert/1"}].
-peercert_with_client_cert(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_dsa_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_dsa_verify_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-    Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
-					{from, self()},
-			   {mfa, {?MODULE, peercert_result, []}},
-			   {options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ServerNode}, {port, Port},
-					{host, Hostname},
-			   {from, self()},
-			   {mfa, {?MODULE, peercert_result, []}},
-			   {options, ClientOpts}]),
-
-    ServerCertFile = proplists:get_value(certfile, ServerOpts),
-    [{'Certificate', ServerBinCert, _}]= ssl_test_lib:pem_to_der(ServerCertFile),
-     ClientCertFile = proplists:get_value(certfile, ClientOpts),
-    [{'Certificate', ClientBinCert, _}]= ssl_test_lib:pem_to_der(ClientCertFile),
-
-    ServerMsg = {ok, ClientBinCert},
-    ClientMsg = {ok, ServerBinCert},
-
-    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
-		       [self(), Client, Server]),
-
-    ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-sockname() ->
-    [{doc,"Test API function sockname/1"}].
-sockname(Config) when is_list(Config) -> 
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-			   {mfa, {?MODULE, sockname_result, []}},
-			   {options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-			   {from, self()}, 
-			   {mfa, {?MODULE, sockname_result, []}},
-			   {options, [{port, 0} | ClientOpts]}]),
-
-    ClientPort = ssl_test_lib:inet_port(Client),
-    ServerIp =
-	case proplists:get_value(protocol, Config) of
-	    dtls ->
-		%% DTLS sockets are not connected on the server side,
-		%% so we can only get a ClientIP, ServerIP will always be 0.0.0.0
-		{0,0,0,0};
-	    _ ->
-		ssl_test_lib:node_to_hostip(ServerNode)
-	end,
-
-    ClientIp = ssl_test_lib:node_to_hostip(ClientNode),
-    ServerMsg = {ok, {ServerIp, Port}},
-    ClientMsg = {ok, {ClientIp, ClientPort}},
-			   
-    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
-			 [self(), Client, Server]),
-    
-    ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
-    
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-sockname_result(S) ->
-    ssl:sockname(S).
-
-%%--------------------------------------------------------------------
 
 cipher_suites() ->
     [{doc,"Test API function cipher_suites/2, filter_cipher_suites/2"
@@ -1458,8 +307,8 @@ cipher_suites_mix() ->
 
 cipher_suites_mix(Config) when is_list(Config) -> 
     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),
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_verify_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
 
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
 
@@ -1477,2810 +326,95 @@ cipher_suites_mix(Config) when is_list(Config) ->
     ssl_test_lib:check_result(Server, ok, Client, ok),
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
-%%--------------------------------------------------------------------
-tls_socket_options() ->
-    [{doc,"Test API function getopts/2 and setopts/2"}].
+unordered_protocol_versions_server() ->
+    [{doc,"Test that the highest protocol is selected even" 
+      " when it is not first in the versions list."}].
 
-tls_socket_options(Config) when is_list(Config) -> 
+unordered_protocol_versions_server(Config) when is_list(Config) -> 
     ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Values = [{mode, list}, {packet, 0}, {header, 0},
-		      {active, true}],    
-    %% Shall be the reverse order of Values! 
-    Options = [active, header, packet, mode],
-    
-    NewValues = [{mode, binary}, {active, once}],
-    %% Shall be the reverse order of NewValues! 
-    NewOptions = [active, mode],
-    
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-			   {mfa, {?MODULE, tls_socket_options_result, 
-				  [Options, Values, NewOptions, NewValues]}},
-			   {options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-			   {from, self()}, 
-			   {mfa, {?MODULE, tls_socket_options_result, 
-				  [Options, Values, NewOptions, NewValues]}},
-			   {options, ClientOpts}]),
-    
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-
-    ssl_test_lib:close(Server),
-    
-    {ok, Listen} = ssl:listen(0, ServerOpts),
-    {ok,[{mode,list}]} = ssl:getopts(Listen, [mode]),
-    ok = ssl:setopts(Listen, [{mode, binary}]),
-    {ok,[{mode, binary}]} = ssl:getopts(Listen, [mode]),
-    {ok,[{recbuf, _}]} = ssl:getopts(Listen, [recbuf]),
-    ssl:close(Listen).
-
-tls_socket_options_result(Socket, Options, DefaultValues, NewOptions, NewValues) ->
-    %% Test get/set emulated opts
-    {ok, DefaultValues} = ssl:getopts(Socket, Options), 
-    ssl:setopts(Socket, NewValues),
-    {ok, NewValues} = ssl:getopts(Socket, NewOptions),
-    %% Test get/set inet opts
-    {ok,[{nodelay,false}]} = ssl:getopts(Socket, [nodelay]),  
-    ssl:setopts(Socket, [{nodelay, true}]),
-    {ok,[{nodelay, true}]} = ssl:getopts(Socket, [nodelay]),
-    {ok, All} = ssl:getopts(Socket, []),
-    ct:log("All opts ~p~n", [All]),
-    ok.
-
-
-%%--------------------------------------------------------------------
-socket_options() ->
-    [{doc,"Test API function getopts/2 and setopts/2"}].
+    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),  
 
-socket_options(Config) when is_list(Config) -> 
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Values = [{mode, list}, {active, true}],    
-    %% Shall be the reverse order of Values! 
-    Options = [active, mode],
-    
-    NewValues = [{mode, binary}, {active, once}],
-    %% Shall be the reverse order of NewValues! 
-    NewOptions = [active, mode],
-    
     Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
 					{from, self()}, 
-			   {mfa, {?MODULE, socket_options_result, 
-				  [Options, Values, NewOptions, NewValues]}},
-			   {options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-			   {from, self()}, 
-			   {mfa, {?MODULE, socket_options_result, 
-				  [Options, Values, NewOptions, NewValues]}},
-			   {options, ClientOpts}]),
-    
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-
-    ssl_test_lib:close(Server),
-    
-    {ok, Listen} = ssl:listen(0, ServerOpts),
-    {ok,[{mode,list}]} = ssl:getopts(Listen, [mode]),
-    ok = ssl:setopts(Listen, [{mode, binary}]),
-    {ok,[{mode, binary}]} = ssl:getopts(Listen, [mode]),
-    {ok,[{recbuf, _}]} = ssl:getopts(Listen, [recbuf]),
-    ssl:close(Listen).
-
-
-socket_options_result(Socket, Options, DefaultValues, NewOptions, NewValues) ->
-    %% Test get/set emulated opts
-    {ok, DefaultValues} = ssl:getopts(Socket, Options), 
-    ssl:setopts(Socket, NewValues),
-    {ok, NewValues} = ssl:getopts(Socket, NewOptions),
-    %% Test get/set inet opts
-    {ok,[{reuseaddr, _}]} = ssl:getopts(Socket, [reuseaddr]),  
-    {ok, All} = ssl:getopts(Socket, []),
-    ct:log("All opts ~p~n", [All]),
-    ok.
-
-
-%%--------------------------------------------------------------------
-invalid_inet_get_option() ->
-    [{doc,"Test handling of invalid inet options in getopts"}].
-
-invalid_inet_get_option(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-					{from, self()},
-			   {mfa, {?MODULE, get_invalid_inet_option, []}},
-			   {options, ServerOpts}]),
-    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, no_result, []}},
-			   {options, ClientOpts}]),
-
-    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
-		       [self(), Client, Server]),
-
-    ssl_test_lib:check_result(Server, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-invalid_inet_get_option_not_list() ->
-    [{doc,"Test handling of invalid type in getopts"}].
-
-invalid_inet_get_option_not_list(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-					{from, self()},
-			   {mfa, {?MODULE, get_invalid_inet_option_not_list, []}},
-			   {options, ServerOpts}]),
-    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, no_result, []}},
-			   {options, ClientOpts}]),
-
-    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
-		       [self(), Client, Server]),
-    
-    ssl_test_lib:check_result(Server, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-
-get_invalid_inet_option_not_list(Socket) ->
-    {error, {options, {socket_options, some_invalid_atom_here}}}
-     = ssl:getopts(Socket, some_invalid_atom_here),
-     ok.
-
-%%--------------------------------------------------------------------
-invalid_inet_get_option_improper_list() ->
-    [{doc,"Test handling of invalid type in getopts"}].
-
-invalid_inet_get_option_improper_list(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-					{from, self()},
-			   {mfa, {?MODULE, get_invalid_inet_option_improper_list, []}},
-			   {options, ServerOpts}]),
-    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, no_result, []}},
-			   {options, ClientOpts}]),
-
-    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
-		       [self(), Client, Server]),
-
-    ssl_test_lib:check_result(Server, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-
-get_invalid_inet_option_improper_list(Socket) ->
-    {error, {options, {socket_options, foo,_}}} = ssl:getopts(Socket, [packet | foo]),
-    ok.
-
-%%--------------------------------------------------------------------
-invalid_inet_set_option() ->
-    [{doc,"Test handling of invalid inet options in setopts"}].
-
-invalid_inet_set_option(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-					{from, self()},
-			   {mfa, {?MODULE, set_invalid_inet_option, []}},
-			   {options, ServerOpts}]),
-    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, no_result, []}},
-			   {options, ClientOpts}]),
-
-    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
-		       [self(), Client, Server]),
-
-    ssl_test_lib:check_result(Server, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-set_invalid_inet_option(Socket) ->
-    {error, {options, {socket_options, {packet, foo}}}} = ssl:setopts(Socket, [{packet, foo}]),
-    {error, {options, {socket_options, {header, foo}}}} = ssl:setopts(Socket, [{header, foo}]),
-    {error, {options, {socket_options, {active, foo}}}} = ssl:setopts(Socket, [{active, foo}]),
-    {error, {options, {socket_options, {mode, foo}}}}   = ssl:setopts(Socket, [{mode, foo}]),
-    ok.
-%%--------------------------------------------------------------------
-invalid_inet_set_option_not_list() ->
-    [{doc,"Test handling of invalid type in setopts"}].
-
-invalid_inet_set_option_not_list(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-					{from, self()},
-			   {mfa, {?MODULE, set_invalid_inet_option_not_list, []}},
-			   {options, ServerOpts}]),
-    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, no_result, []}},
-			   {options, ClientOpts}]),
-
-    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
-		       [self(), Client, Server]),
-
-    ssl_test_lib:check_result(Server, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-
-set_invalid_inet_option_not_list(Socket) ->
-    {error, {options, {not_a_proplist, some_invalid_atom_here}}}
-	= ssl:setopts(Socket, some_invalid_atom_here),
-    ok.
-
-%%--------------------------------------------------------------------
-invalid_inet_set_option_improper_list() ->
-    [{doc,"Test handling of invalid tye in setopts"}].
-
-invalid_inet_set_option_improper_list(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-					{from, self()},
-			   {mfa, {?MODULE, set_invalid_inet_option_improper_list, []}},
-			   {options, ServerOpts}]),
-    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, no_result, []}},
-			   {options, ClientOpts}]),
-
-    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
-		       [self(), Client, Server]),
-
-    ssl_test_lib:check_result(Server, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-set_invalid_inet_option_improper_list(Socket) ->
-    {error, {options, {not_a_proplist, [{packet, 0} | {foo, 2}]}}} =
-	ssl:setopts(Socket, [{packet, 0} | {foo, 2}]),
-    ok.
-
-%%--------------------------------------------------------------------
-tls_misc_ssl_options() ->
-    [{doc,"Test what happens when we give valid options"}].
-
-tls_misc_ssl_options(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    
-    %% Check that ssl options not tested elsewhere are filtered away e.i. not passed to inet.
-    TestOpts = [{depth, 1}, 
-		{key, undefined}, 
-		{password, []},
-		{reuse_session, fun(_,_,_,_) -> true end},
-		{cb_info, {gen_tcp, tcp, tcp_closed, tcp_error}}],
-    
-   Server = 
-	ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-				   {from, self()}, 
-				   {mfa, {ssl_test_lib, send_recv_result_active, []}},
-				   {options,  TestOpts ++ ServerOpts}]),
-    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, TestOpts ++ ClientOpts}]),
-
-    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
-			 [self(), Client, Server]),
-    
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-ssl_options_not_proplist() ->
-    [{doc,"Test what happens if an option is not a key value tuple"}].
-
-ssl_options_not_proplist(Config) when is_list(Config) ->
-    BadOption =  {client_preferred_next_protocols, 
-		  client, [<<"spdy/3">>,<<"http/1.1">>], <<"http/1.1">>},
-    {option_not_a_key_value_tuple, BadOption} =
-	ssl:connect("twitter.com", 443, [binary, {active, false}, 
-					 BadOption]).
-
-%%--------------------------------------------------------------------
-raw_ssl_option() ->
-    [{doc,"Ensure that a single 'raw' option is passed to ssl:listen correctly."}].
-
-raw_ssl_option(Config) when is_list(Config) ->
-    % 'raw' option values are platform-specific; these are the Linux values:
-    IpProtoTcp = 6,
-    % Use TCP_KEEPIDLE, because (e.g.) TCP_MAXSEG can't be read back reliably.
-    TcpKeepIdle = 4,
-    KeepAliveTimeSecs = 55,
-    LOptions = [{raw, IpProtoTcp, TcpKeepIdle, <<KeepAliveTimeSecs:32/native>>}],
-    {ok, LSocket} = ssl:listen(0, LOptions),
-    % Per http://www.erlang.org/doc/man/inet.html#getopts-2, we have to specify
-    % exactly which raw option we want, and the size of the buffer.
-    {ok, [{raw, IpProtoTcp, TcpKeepIdle, <<KeepAliveTimeSecs:32/native>>}]} = ssl:getopts(LSocket, [{raw, IpProtoTcp, TcpKeepIdle, 4}]).
-
-
-%%--------------------------------------------------------------------
-versions() ->
-    [{doc,"Test API function versions/0"}].
-
-versions(Config) when is_list(Config) -> 
-    [_|_] = Versions = ssl:versions(),
-    ct:log("~p~n", [Versions]).
-
-
-%%--------------------------------------------------------------------
-eccs() ->
-    [{doc, "Test API functions eccs/0 and eccs/1"}].
-
-eccs(Config) when is_list(Config) ->
-    [_|_] = All = ssl:eccs(),
-    [] = SSL3 = ssl:eccs({3,0}),
-    [_|_] = Tls = ssl:eccs({3,1}),
-    [_|_] = Tls1 = ssl:eccs({3,2}),
-    [_|_] = Tls2 = ssl:eccs({3,3}),
-    [] = SSL3 = ssl:eccs(sslv3),
-    [_|_] = Tls = ssl:eccs(tlsv1),
-    [_|_] = Tls1 = ssl:eccs('tlsv1.1'),
-    [_|_] = Tls2 = ssl:eccs('tlsv1.2'),
-    %% ordering is currently unverified by the test
-    true = lists:sort(All) =:= lists:usort(SSL3 ++ Tls ++ Tls1 ++ Tls2),
-    ok.
-
-%%--------------------------------------------------------------------
-send_recv() ->
-    [{doc,""}].
-send_recv(Config) when is_list(Config) -> 
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, 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, []}},
-				   {options,  [{active, false} | ServerOpts]}]),
-    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, []}},
-				   {options, [{active, false} | ClientOpts]}]),
-    
-    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
-			 [self(), Client, Server]),
-    
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-tls_send_close() ->
-    [{doc,""}].
-tls_send_close(Config) when is_list(Config) -> 
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, 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, []}},
-				   {options,  [{active, false} | ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    {ok, TcpS} = rpc:call(ClientNode, gen_tcp, connect, 
-			  [Hostname,Port,[binary, {active, false}]]),
-    {ok, SslS} = rpc:call(ClientNode, ssl, connect, 
-			  [TcpS,[{active, false}|ClientOpts]]),
-    
-    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
-		       [self(), self(), Server]),
-    ok = ssl:send(SslS, "Hello world"),      
-    {ok,<<"Hello world">>} = ssl:recv(SslS, 11),    
-    gen_tcp:close(TcpS),    
-    {error, _} = ssl:send(SslS, "Hello world").
-
-%%--------------------------------------------------------------------
-version_option() ->
-    [{doc, "Use version option and do no specify ciphers list. Bug specified incorrect ciphers"}].
-version_option(Config) when is_list(Config) ->
-    Versions = proplists:get_value(supported, ssl:versions()),
-    [version_option_test(Config, Version) || Version <- Versions].
-   
-%%--------------------------------------------------------------------
-close_transport_accept() ->
-    [{doc,"Tests closing ssl socket when waiting on ssl:transport_accept/1"}].
-
-close_transport_accept(Config) when is_list(Config) ->
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {_ClientNode, ServerNode, _Hostname} = ssl_test_lib:run_where(Config),
-
-    Port = 0,
-    Opts = [{active, false} | ServerOpts],
-    {ok, ListenSocket} = rpc:call(ServerNode, ssl, listen, [Port, Opts]),
-    spawn_link(fun() ->
-			ct:sleep(?SLEEP),
-			rpc:call(ServerNode, ssl, close, [ListenSocket])
-	       end),
-    case rpc:call(ServerNode, ssl, transport_accept, [ListenSocket]) of
-	{error, closed} ->
-	    ok;
-	Other ->
-	    exit({?LINE, Other})
-    end.
-%%--------------------------------------------------------------------
-recv_active() ->
-    [{doc,"Test recv on active socket"}].
-
-recv_active(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server = 
-	ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-				   {from, self()}, 
-				   {mfa, {?MODULE, try_recv_active, []}},
-				   {options,  [{active, true} | ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = 
-	ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-				   {host, Hostname},
-				   {from, self()}, 
-				   {mfa, {?MODULE, try_recv_active, []}},
-				   {options, [{active, true} | ClientOpts]}]),
-        
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-recv_active_once() ->
-    [{doc,"Test recv on active socket"}].
-
-recv_active_once(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server = 
-	ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-				   {from, self()}, 
-				   {mfa, {?MODULE, try_recv_active_once, []}},
-				   {options,  [{active, once} | ServerOpts]}]),
+					{mfa, {?MODULE, protocol_info_result, []}},
+					{options, [{versions, ['tlsv1.1', 'tlsv1.2']} | ServerOpts]}]),
     Port = ssl_test_lib:inet_port(Server),
-    Client = 
-	ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-				   {host, Hostname},
-				   {from, self()}, 
-				   {mfa, {?MODULE, try_recv_active_once, []}},
-				   {options, [{active, once} | ClientOpts]}]),
-        
-    ssl_test_lib:check_result(Server, ok, Client, ok),
     
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-dh_params() ->
-    [{doc,"Test to specify DH-params file in server."}].
-
-dh_params(Config) when is_list(Config) -> 
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    DataDir = proplists:get_value(data_dir, Config),
-    DHParamFile = filename:join(DataDir, "dHParam.pem"),
-
-    {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, [{dhfile, DHParamFile} | ServerOpts]}]),
-    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,
-			    [{ciphers,[{dhe_rsa,aes_256_cbc,sha}]} | 
-				       ClientOpts]}]),
-    
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-tls_upgrade() ->
-    [{doc,"Test that you can upgrade an tcp connection to an ssl connection"}].
-
-tls_upgrade(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    TcpOpts = [binary, {reuseaddr, true}],
-
-    Server = ssl_test_lib:start_upgrade_server([{node, ServerNode}, {port, 0}, 
-						{from, self()}, 
-						{mfa, {?MODULE, 
-						       upgrade_result, []}},
-						{tcp_options, 
-						 [{active, false} | TcpOpts]},
-						{ssl_options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_upgrade_client([{node, ClientNode}, 
-						{port, Port}, 
-				   {host, Hostname},
-				   {from, self()}, 
-				   {mfa, {?MODULE, upgrade_result, []}},
-				   {tcp_options, [binary]},
-				   {ssl_options, ClientOpts}]),
-    
-    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
-		       [self(), Client, Server]),
-    
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-upgrade_result(Socket) ->
-    ssl:setopts(Socket, [{active, true}]),
-    ok = ssl:send(Socket, "Hello world"),
-    %% Make sure binary is inherited from tcp socket and that we do
-    %% not get the list default!
-    receive 
-	{ssl, _, <<"H">>} ->
-	    receive 
-		{ssl, _, <<"ello world">>} ->
-		    ok
-	    end;
-	{ssl, _, <<"Hello world">>}  ->
-	    ok
-    end.
-
-%%--------------------------------------------------------------------
-tls_upgrade_with_timeout() ->
-    [{doc,"Test ssl_accept/3"}].
-
-tls_upgrade_with_timeout(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    TcpOpts = [binary, {reuseaddr, true}],
-
-    Server = ssl_test_lib:start_upgrade_server([{node, ServerNode}, {port, 0}, 
-						{from, self()}, 
-						{timeout, 5000},
-						{mfa, {?MODULE, 
-						       upgrade_result, []}},
-						{tcp_options, 
-						 [{active, false} | TcpOpts]},
-						{ssl_options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_upgrade_client([{node, ClientNode}, 
-						{port, Port}, 
-						{host, Hostname},
-						{from, self()}, 
-						{mfa, {?MODULE, upgrade_result, []}},
-						{tcp_options, TcpOpts},
-						{ssl_options, ClientOpts}]),
-    
-    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
-		       [self(), Client, Server]),
-    
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-tls_downgrade() ->
-      [{doc,"Test that you can downgarde an ssl connection to an tcp connection"}].
-tls_downgrade(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-					{from, self()},
-					{mfa, {?MODULE, tls_downgrade_result, []}},
-					{options, [{active, 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, tls_downgrade_result, []}},
-					{options, [{active, false} |ClientOpts]}]),
-
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-close_with_timeout() ->
-      [{doc,"Test normal (not downgrade) ssl:close/2"}].
-close_with_timeout(Config) when is_list(Config) -> 
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-					{from, self()},
-					{mfa, {?MODULE, tls_close, []}},
-					{options,[{active, 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, tls_close, []}},
-					{options, [{active, false} |ClientOpts]}]),
-
-    ssl_test_lib:check_result(Server, ok, Client, ok).
-
-
-%%--------------------------------------------------------------------
-tls_tcp_connect() ->
-    [{doc,"Test what happens when a tcp tries to connect, i,e. a bad (ssl) packet is sent first"}].
-
-tls_tcp_connect(Config) when is_list(Config) ->
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    TcpOpts = [binary, {reuseaddr, true}, {active, false}],
-
-    Server = ssl_test_lib:start_upgrade_server_error([{node, ServerNode}, {port, 0},
-						      {from, self()},
-						      {timeout, 5000},
-						      {mfa, {?MODULE, dummy, []}},
-						      {tcp_options, TcpOpts},
-						      {ssl_options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-
-    {ok, Socket} = gen_tcp:connect(Hostname, Port, [binary, {packet, 0}]),
-    ct:log("Testcase ~p connected to Server ~p ~n", [self(), Server]),
-    gen_tcp:send(Socket, "<SOME GARBLED NON SSL MESSAGE>"),
-
-    receive 
-	{tcp_closed, Socket} ->
-	    receive 
-		{Server, {error, Error}} ->
-		    ct:log("Error ~p", [Error])
-	    end
-    end.
-%%--------------------------------------------------------------------
-tls_tcp_connect_big() ->
-    [{doc,"Test what happens when a tcp tries to connect, i,e. a bad big (ssl) packet is sent first"}].
-
-tls_tcp_connect_big(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    TcpOpts = [binary, {reuseaddr, true}],
-
-    Rand = crypto:strong_rand_bytes(?MAX_CIPHER_TEXT_LENGTH+1),
-    Server = ssl_test_lib:start_upgrade_server_error([{node, ServerNode}, {port, 0},
-						      {from, self()},
-						      {timeout, 5000},
-						      {mfa, {?MODULE, dummy, []}},
-						      {tcp_options, TcpOpts},
-						      {ssl_options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-
-    {ok, Socket} = gen_tcp:connect(Hostname, Port, [binary, {packet, 0}]),
-    ct:log("Testcase ~p connected to Server ~p ~n", [self(), Server]),
-
-    gen_tcp:send(Socket, <<?BYTE(0),
-			   ?BYTE(3), ?BYTE(1), ?UINT16(?MAX_CIPHER_TEXT_LENGTH), Rand/binary>>),
-
-    receive
-	{tcp_closed, Socket} ->
-	    receive
-		{Server, {error, timeout}} ->
-		    ct:fail("hangs");
-		{Server, {error, Error}} ->
-		    ct:log("Error ~p", [Error]);
-		{'EXIT', Server, _} ->
-		    ok	 
-	    end
-    end.
-
-%%--------------------------------------------------------------------
-ipv6() ->
-    [{require, ipv6_hosts},
-     {doc,"Test ipv6."}].
-ipv6(Config) when is_list(Config) ->
-    {ok, Hostname0} = inet:gethostname(),
-    
-    case lists:member(list_to_atom(Hostname0), ct:get_config(ipv6_hosts)) of
-	true ->
-	    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-	    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-	    {ClientNode, ServerNode, Hostname} = 
-		ssl_test_lib:run_where(Config, ipv6),
-	    Server = ssl_test_lib:start_server([{node, ServerNode}, 
-				   {port, 0}, {from, self()}, 
-				   {mfa, {ssl_test_lib, send_recv_result, []}},
-				   {options,  
-				    [inet6, {active, false} | ServerOpts]}]),
-	    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, []}},
-				   {options, 
-				    [inet6, {active, false} | ClientOpts]}]),
-	    
-	    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
-			       [self(), Client, Server]),
-	    
-	    ssl_test_lib:check_result(Server, ok, Client, ok),
-	    
-	    ssl_test_lib:close(Server),
-	    ssl_test_lib:close(Client);
-	false ->
-	    {skip, "Host does not support IPv6"}
-    end.
-
-%%--------------------------------------------------------------------
-
-invalid_keyfile() ->
-    [{doc,"Test what happens with an invalid key file"}].
-invalid_keyfile(Config) when is_list(Config) -> 
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    BadOpts = ssl_test_lib:ssl_options(server_bad_key, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-    Server = 
-	ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0}, 
-					 {from, self()},
-			    {options, BadOpts}]),
-
-    Port = ssl_test_lib:inet_port(Server),
-
-    Client =
-	ssl_test_lib:start_client_error([{node, ClientNode}, 
-			    {port, Port}, {host, Hostname},
-			    {from, self()},  {options, ClientOpts}]),
-
-    File = proplists:get_value(keyfile,BadOpts),    
-    ssl_test_lib:check_result(Server, {error,{options, {keyfile, File, {error,enoent}}}}, Client,  
-				       {error, closed}).
-
-%%--------------------------------------------------------------------
-
-invalid_certfile() ->
-    [{doc,"Test what happens with an invalid cert file"}].
-
-invalid_certfile(Config) when is_list(Config) -> 
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerBadOpts = ssl_test_lib:ssl_options(server_bad_cert, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    
-    Server = 
-	ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0}, 
-					 {from, self()},
-					 {options, ServerBadOpts}]),
-
-    Port = ssl_test_lib:inet_port(Server),
+					{from, self()}, 
+					{mfa, {?MODULE, protocol_info_result, []}},
+					{options, ClientOpts}]),
 
-    Client =
-	ssl_test_lib:start_client_error([{node, ClientNode}, 
-					 {port, Port}, {host, Hostname},
-					 {from, self()}, 
-					 {options, ClientOpts}]),
-    File = proplists:get_value(certfile, ServerBadOpts),
-    ssl_test_lib:check_result(Server, {error,{options, {certfile, File, {error,enoent}}}}, 
-			      Client, {error, closed}).
-    
+    ServerMsg = ClientMsg = {ok,'tlsv1.2'},    
+    ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg).
 
 %%--------------------------------------------------------------------
-invalid_cacertfile() ->
-    [{doc,"Test what happens with an invalid cacert file"}].
-
-invalid_cacertfile(Config) when is_list(Config) ->
-    ClientOpts    = [{reuseaddr, true}|ssl_test_lib:ssl_options(client_opts, Config)],
-    ServerBadOpts = [{reuseaddr, true}|ssl_test_lib:ssl_options(server_bad_ca, Config)],
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    
-    Server0  = 
-	ssl_test_lib:start_server_error([{node, ServerNode}, 
-					 {port, 0}, {from, self()},
-					 {options, ServerBadOpts}]),
-
-    Port0 = ssl_test_lib:inet_port(Server0),
-    
-
-    Client0 =
-	ssl_test_lib:start_client_error([{node, ClientNode}, 
-					 {port, Port0}, {host, Hostname},
-					 {from, self()}, 
-					 {options, ClientOpts}]),
-
-    File0 = proplists:get_value(cacertfile, ServerBadOpts),
-    
-    ssl_test_lib:check_result(Server0, {error, {options, {cacertfile, File0,{error,enoent}}}},
-			      Client0, {error, closed}),
-    
-    File = File0 ++ "do_not_exit.pem",
-    ServerBadOpts1 = [{cacertfile, File}|proplists:delete(cacertfile, ServerBadOpts)],
-            
-    Server1  = 
-	ssl_test_lib:start_server_error([{node, ServerNode}, 
-					 {port, 0}, {from, self()},
-					 {options, ServerBadOpts1}]),
-
-    Port1 = ssl_test_lib:inet_port(Server1),
-    
-    Client1 =
-	ssl_test_lib:start_client_error([{node, ClientNode}, 
-					 {port, Port1}, {host, Hostname},
-					 {from, self()}, 
-					 {options, ClientOpts}]),
-
-
-    ssl_test_lib:check_result(Server1, {error, {options, {cacertfile, File,{error,enoent}}}},
-			      Client1, {error, closed}),
-    ok.
-    
-    
+unordered_protocol_versions_client() ->
+    [{doc,"Test that the highest protocol is selected even" 
+      " when it is not first in the versions list."}].
 
-%%--------------------------------------------------------------------
-invalid_options() ->
-    [{doc,"Test what happens when we give invalid options"}].
-       
-invalid_options(Config) when is_list(Config) -> 
+unordered_protocol_versions_client(Config) when is_list(Config) -> 
     ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    
-    Check = fun(Client, Server, {versions, [sslv2, sslv3]} = Option) ->
-		    ssl_test_lib:check_result(Server, 
-					      {error, {options, {sslv2, Option}}}, 
-					      Client,
-					      {error, {options, {sslv2, Option}}});
-	       (Client, Server, Option) ->
-		    ssl_test_lib:check_result(Server, 
-					      {error, {options, Option}}, 
-					      Client,
-					      {error, {options, Option}})
-	    end,
-
-    TestOpts = [{versions, [sslv2, sslv3]}, 
-		{verify, 4}, 
-		{verify_fun, function},
-		{fail_if_no_peer_cert, 0}, 
-		{verify_client_once, 1},
-		{depth, four}, 
-		{certfile, 'cert.pem'}, 
-		{keyfile,'key.pem' }, 
-		{password, foo},
-		{cacertfile, ""}, 
-		{dhfile,'dh.pem' },
-		{ciphers, [{foo, bar, sha, ignore}]},
-		{reuse_session, foo},
-		{reuse_sessions, 0},
-		{renegotiate_at, "10"},
-		{mode, depech},
-		{packet, 8.0},
-		{packet_size, "2"},
-		{header, a},
-		{active, trice},
-		{key, 'key.pem' }],
-
-    [begin
-	 Server =
-	     ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
-					{from, self()},
-					{options, [TestOpt | ServerOpts]}]),
-	 %% Will never reach a point where port is used.
-	 Client =
-	     ssl_test_lib:start_client_error([{node, ClientNode}, {port, 0},
-					      {host, Hostname}, {from, self()},
-					      {options, [TestOpt | ClientOpts]}]),
-	 Check(Client, Server, TestOpt),
-	 ok
-     end || TestOpt <- TestOpts],
-    ok.
+    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),  
 
-%%--------------------------------------------------------------------
-tls_shutdown() ->
-    [{doc,"Test API function ssl:shutdown/2"}].
-tls_shutdown(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
     Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
 					{from, self()}, 
-			   {mfa, {?MODULE, tls_shutdown_result, [server]}},
-			   {options, [{exit_on_close, false},
-				      {active, false} | ServerOpts]}]),
+					{mfa, {?MODULE, protocol_info_result, []}},
+					{options, ServerOpts }]),
     Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, 
-					 {?MODULE, tls_shutdown_result, [client]}},
-					{options, 
-					 [{exit_on_close, false},
-					  {active, false} | ClientOpts]}]),
     
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-tls_shutdown_write() ->
-    [{doc,"Test API function ssl:shutdown/2 with option write."}].
-tls_shutdown_write(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-			   {mfa, {?MODULE, tls_shutdown_write_result, [server]}},
-			   {options, [{active, 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, tls_shutdown_write_result, [client]}},
-			   {options, [{active, false} | ClientOpts]}]),
-    
-    ssl_test_lib:check_result(Server, ok, Client, {error, closed}).
-
-%%--------------------------------------------------------------------
-tls_shutdown_both() ->
-    [{doc,"Test API function ssl:shutdown/2 with option both."}].
-tls_shutdown_both(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
 					{from, self()}, 
-			   {mfa, {?MODULE, tls_shutdown_both_result, [server]}},
-			   {options, [{active, 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, tls_shutdown_both_result, [client]}},
-			   {options, [{active, false} | ClientOpts]}]),
-    
-    ssl_test_lib:check_result(Server, ok, Client, {error, closed}).
-
-%%--------------------------------------------------------------------
-tls_shutdown_error() ->
-    [{doc,"Test ssl:shutdown/2 error handling"}].
-tls_shutdown_error(Config) when is_list(Config) ->
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    Port = ssl_test_lib:inet_port(node()),
-    {ok, Listen} = ssl:listen(Port, ServerOpts),
-    {error, enotconn} = ssl:shutdown(Listen, read_write),
-    ok = ssl:close(Listen),
-    {error, closed} = ssl:shutdown(Listen, read_write).
-
-%%-------------------------------------------------------------------
-ciphers_rsa_signed_certs() ->
-    [{doc,"Test all rsa ssl cipher suites in highest support ssl/tls version"}].
-       
-ciphers_rsa_signed_certs(Config) when is_list(Config) ->  
-    Ciphers = ssl_test_lib:rsa_suites(crypto),
-    run_suites(Ciphers, Config, rsa).
-%%-------------------------------------------------------------------
-ciphers_rsa_signed_certs_openssl_names() ->
-    [{doc,"Test all rsa ssl cipher suites in highest support ssl/tls version"}].
-       
-ciphers_rsa_signed_certs_openssl_names(Config) when is_list(Config) ->
-    Ciphers = ssl_test_lib:openssl_rsa_suites(),  
-    run_suites(Ciphers, Config, rsa).
-
-%%-------------------------------------------------------------------
-ciphers_dsa_signed_certs() ->
-    [{doc,"Test all dsa ssl cipher suites in highest support ssl/tls version"}].
-       
-ciphers_dsa_signed_certs(Config) when is_list(Config) ->
-    NVersion = ssl_test_lib:protocol_version(Config, tuple),
-    Ciphers = ssl_test_lib:dsa_suites(NVersion),
-    run_suites(Ciphers, Config, dsa).
-%%-------------------------------------------------------------------
-ciphers_dsa_signed_certs_openssl_names() ->
-    [{doc,"Test all dsa ssl cipher suites in highest support ssl/tls version"}].
-       
-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) ->
-    NVersion = ssl_test_lib:protocol_version(Config, tuple),
-    Ciphers = ssl_test_lib:ecdh_dh_anonymous_suites(NVersion),
-    run_suites(Ciphers, Config, anonymous).
-%%-------------------------------------------------------------------
-psk_cipher_suites() ->
-    [{doc, "Test the PSK ciphersuites WITHOUT server supplied identity hint"}].
-psk_cipher_suites(Config) when is_list(Config) ->
-    NVersion = ssl_test_lib:protocol_version(Config, tuple),
-    Ciphers = ssl_test_lib:psk_suites(NVersion),
-    run_suites(Ciphers, Config, psk).
-%%-------------------------------------------------------------------
-psk_with_hint_cipher_suites()->
-    [{doc, "Test the PSK ciphersuites WITH server supplied identity hint"}].
-psk_with_hint_cipher_suites(Config) when is_list(Config) ->
-    NVersion = ssl_test_lib:protocol_version(Config, tuple),
-    Ciphers = ssl_test_lib:psk_suites(NVersion),
-    run_suites(Ciphers, Config, psk_with_hint).
-%%-------------------------------------------------------------------
-psk_anon_cipher_suites() ->
-    [{doc, "Test the anonymous PSK ciphersuites WITHOUT server supplied identity hint"}].
-psk_anon_cipher_suites(Config) when is_list(Config) ->
-    NVersion = ssl_test_lib:protocol_version(Config, tuple),
-    Ciphers = ssl_test_lib:psk_anon_suites(NVersion),
-    run_suites(Ciphers, Config, psk_anon).
-%%-------------------------------------------------------------------
-psk_anon_with_hint_cipher_suites()->
-    [{doc, "Test the anonymous PSK ciphersuites WITH server supplied identity hint"}].
-psk_anon_with_hint_cipher_suites(Config) when is_list(Config) ->
-    NVersion = ssl_test_lib:protocol_version(Config, tuple),
-    Ciphers = ssl_test_lib:psk_anon_suites(NVersion),
-    run_suites(Ciphers, Config, psk_anon_with_hint).
-%%-------------------------------------------------------------------
-srp_cipher_suites()->
-    [{doc, "Test the SRP ciphersuites"}].
-srp_cipher_suites(Config) when is_list(Config) ->
-    Ciphers = ssl_test_lib:srp_suites(),
-    run_suites(Ciphers, Config, srp).
-%%-------------------------------------------------------------------
-srp_anon_cipher_suites()->
-    [{doc, "Test the anonymous SRP ciphersuites"}].
-srp_anon_cipher_suites(Config) when is_list(Config) ->
-    Ciphers = ssl_test_lib:srp_anon_suites(),
-    run_suites(Ciphers, Config, srp_anon).
-%%-------------------------------------------------------------------
-srp_dsa_cipher_suites()->
-    [{doc, "Test the SRP DSA ciphersuites"}].
-srp_dsa_cipher_suites(Config) when is_list(Config) ->
-    Ciphers = ssl_test_lib:srp_dss_suites(),
-    run_suites(Ciphers, Config, srp_dsa).
-%%-------------------------------------------------------------------
-rc4_rsa_cipher_suites()->
-    [{doc, "Test the RC4 ciphersuites"}].
-rc4_rsa_cipher_suites(Config) when is_list(Config) ->
-    NVersion = ssl_test_lib:protocol_version(Config, tuple),
-    Ciphers = [S || {rsa,_,_} = S <- ssl_test_lib:rc4_suites(NVersion)],
-    run_suites(Ciphers, Config, rc4_rsa).
-%-------------------------------------------------------------------
-rc4_ecdh_rsa_cipher_suites()->
-    [{doc, "Test the RC4 ciphersuites"}].
-rc4_ecdh_rsa_cipher_suites(Config) when is_list(Config) ->
-    NVersion = ssl_test_lib:protocol_version(Config, tuple),
-    Ciphers = [S || {ecdh_rsa,_,_} = S <- ssl_test_lib:rc4_suites(NVersion)],
-    run_suites(Ciphers, Config, rc4_ecdh_rsa).
-
-%%-------------------------------------------------------------------
-rc4_ecdsa_cipher_suites()->
-    [{doc, "Test the RC4 ciphersuites"}].
-rc4_ecdsa_cipher_suites(Config) when is_list(Config) ->
-    NVersion = tls_record:highest_protocol_version([]),
-    Ciphers = [S || {ecdhe_ecdsa,_,_} = S <- ssl_test_lib:rc4_suites(NVersion)],
-    run_suites(Ciphers, Config, rc4_ecdsa).
-
-%%-------------------------------------------------------------------
-des_rsa_cipher_suites()->
-    [{doc, "Test the des_rsa ciphersuites"}].
-des_rsa_cipher_suites(Config) when is_list(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 = [S || {dhe_rsa,_,_} = S <- ssl_test_lib:des_suites(NVersion)],
-    run_suites(Ciphers, Config, des_dhe_rsa).
-
-%%--------------------------------------------------------------------
-default_reject_anonymous()->
-    [{doc,"Test that by default anonymous cipher suites are rejected "}].
-default_reject_anonymous(Config) when is_list(Config) ->
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    Version = ssl_test_lib:protocol_version(Config),
-    TLSVersion = ssl_test_lib:tls_version(Version),
-    
-   [CipherSuite | _] = ssl_test_lib:ecdh_dh_anonymous_suites(TLSVersion),
-    
-    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
-					      {from, self()},
-					      {options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
-                                              {host, Hostname},
-                                              {from, self()},
-                                              {options,
-                                               [{ciphers,[CipherSuite]} |
-                                                ClientOpts]}]),
-
-    ssl_test_lib:check_result(Server, {error, {tls_alert, "insufficient security"}},
-                              Client, {error, {tls_alert, "insufficient security"}}).
-
-%%--------------------------------------------------------------------
-ciphers_ecdsa_signed_certs() ->
-    [{doc, "Test all ecdsa ssl cipher suites in highest support ssl/tls version"}].
-
-ciphers_ecdsa_signed_certs(Config) when is_list(Config) ->
-    NVersion = ssl_test_lib:protocol_version(Config, tuple),
-    Ciphers = ssl_test_lib:ecdsa_suites(NVersion),
-    run_suites(Ciphers, Config, ecdsa).
-%%--------------------------------------------------------------------
-ciphers_ecdsa_signed_certs_openssl_names() ->
-    [{doc, "Test all ecdsa ssl cipher suites in highest support ssl/tls version"}].
-
-ciphers_ecdsa_signed_certs_openssl_names(Config) when is_list(Config) ->
-    Ciphers = ssl_test_lib:openssl_ecdsa_suites(),
-    run_suites(Ciphers, Config, ecdsa).
-%%--------------------------------------------------------------------
-ciphers_ecdh_rsa_signed_certs() ->
-    [{doc, "Test all ecdh_rsa ssl cipher suites in highest support ssl/tls version"}].
-
-ciphers_ecdh_rsa_signed_certs(Config) when is_list(Config) ->
-    NVersion = ssl_test_lib:protocol_version(Config, tuple),
-    Ciphers = ssl_test_lib:ecdh_rsa_suites(NVersion),
-    run_suites(Ciphers, Config, ecdh_rsa).
-%%--------------------------------------------------------------------
-ciphers_ecdh_rsa_signed_certs_openssl_names() ->
-    [{doc, "Test all ecdh_rsa ssl cipher suites in highest support ssl/tls version"}].
-
-ciphers_ecdh_rsa_signed_certs_openssl_names(Config) when is_list(Config) ->
-    Ciphers = ssl_test_lib:openssl_ecdh_rsa_suites(),
-    run_suites(Ciphers, Config, ecdh_rsa).
-%%--------------------------------------------------------------------
-reuse_session() ->
-    [{doc,"Test reuse of sessions (short handshake)"}].
-reuse_session(Config) when is_list(Config) -> 
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, 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, session_info_result, []}},
-				   {options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client0 =
-	ssl_test_lib:start_client([{node, ClientNode}, 
-		      {port, Port}, {host, Hostname},
-				   {mfa, {ssl_test_lib, no_result, []}},
-		      {from, self()},  {options, ClientOpts}]),   
-    SessionInfo = 
-	receive
-	    {Server, Info} ->
-		Info
-	end,
-       
-    Server ! {listen, {mfa, {ssl_test_lib, no_result, []}}},
-    
-    %% Make sure session is registered
-    ct:sleep(?SLEEP),
-
-    Client1 =
-	ssl_test_lib:start_client([{node, ClientNode},
-				   {port, Port}, {host, Hostname},
-				   {mfa, {ssl_test_lib, session_info_result, []}},
-				   {from, self()},  {options, ClientOpts}]),
-    receive
-	{Client1, SessionInfo} ->
-	    ok;
-	{Client1, Other} ->
-	    ct:log("Expected: ~p,  Unexpected: ~p~n",
-			       [SessionInfo, Other]),
-	    ct:fail(session_not_reused)
-    end,
-    
-    Server !  {listen, {mfa, {ssl_test_lib, no_result, []}}},
-    
-    Client2 =
-	ssl_test_lib:start_client([{node, ClientNode},
-		      {port, Port}, {host, Hostname},
-			    {mfa, {ssl_test_lib, session_info_result, []}},
-		      {from, self()},  {options, [{reuse_sessions, false}
-						  | ClientOpts]}]),   
-    receive
-	{Client2, SessionInfo} ->
-	    ct:fail(
-	      session_reused_when_session_reuse_disabled_by_client);
-	{Client2, _} ->
-	    ok
-    end,
-    
-    ssl_test_lib:close(Server),
-
-    Server1 = 
-	ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-				   {from, self()},
-		      {mfa, {ssl_test_lib, session_info_result, []}},
-		      {options, [{reuse_sessions, false} | ServerOpts]}]),
-    
-    Port1 = ssl_test_lib:inet_port(Server1),
-    Client3 =
-	ssl_test_lib:start_client([{node, ClientNode}, 
-				   {port, Port1}, {host, Hostname},
-				   {mfa, {ssl_test_lib, no_result, []}},
-				   {from, self()},  {options, ClientOpts}]), 
-
-    SessionInfo1 = 
-	receive
-	    {Server1, Info1} ->
-		Info1
-	end,
-       
-    Server1 ! {listen, {mfa, {ssl_test_lib, no_result, []}}},
-    
-    %% Make sure session is registered
-    ct:sleep(?SLEEP),
-
-    Client4 = 
-	ssl_test_lib:start_client([{node, ClientNode}, 
-				   {port, Port1}, {host, Hostname},
-				   {mfa, {ssl_test_lib, session_info_result, []}},
-				   {from, self()},  {options, ClientOpts}]),
-    
-    receive
-	{Client4, SessionInfo1} ->
-	    ct:fail(
-	      session_reused_when_session_reuse_disabled_by_server);
-	{Client4, _Other} ->
-	    ct:log("OTHER: ~p ~n", [_Other]),
-	    ok
-    end,
-
-    ssl_test_lib:close(Server1),
-    ssl_test_lib:close(Client0),
-    ssl_test_lib:close(Client1),
-    ssl_test_lib:close(Client2),
-    ssl_test_lib:close(Client3),
-    ssl_test_lib:close(Client4).
-
-%%--------------------------------------------------------------------
-reuse_session_expired() ->
-    [{doc,"Test sessions is not reused when it has expired"}].
-reuse_session_expired(Config) when is_list(Config) -> 
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, 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, session_info_result, []}},
-		      {options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client0 =
-	ssl_test_lib:start_client([{node, ClientNode}, 
-		      {port, Port}, {host, Hostname},
-			    {mfa, {ssl_test_lib, no_result, []}},
-		      {from, self()},  {options, ClientOpts}]),   
-    SessionInfo = 
-	receive
-	    {Server, Info} ->
-		Info
-	end,
-
-    Server ! {listen, {mfa, {ssl_test_lib, no_result, []}}},
-    
-    %% Make sure session is registered
-    ct:sleep(?SLEEP),
-
-    Client1 =
-	ssl_test_lib:start_client([{node, ClientNode}, 
-		      {port, Port}, {host, Hostname},
-		      {mfa, {ssl_test_lib, session_info_result, []}},
-		      {from, self()},  {options, ClientOpts}]),    
-    receive
-	{Client1, SessionInfo} ->
-	    ok;
-	{Client1, Other} ->
-	    ct:log("Expected: ~p,  Unexpected: ~p~n",
-			       [SessionInfo, Other]),
-	    ct:fail(session_not_reused)
-    end,
-    
-    Server ! listen,
-
-    %% Make sure session is unregistered due to expiration
-    ct:sleep((?EXPIRE+1)),
-    [{session_id, Id} |_] = SessionInfo,
-
-    make_sure_expired(Hostname, Port, Id),
-    
-    Client2 =
-	ssl_test_lib:start_client([{node, ClientNode}, 
-				   {port, Port}, {host, Hostname},
-				   {mfa, {ssl_test_lib, session_info_result, []}},
-				   {from, self()}, {options, ClientOpts}]),   
-    receive
-	{Client2, SessionInfo} ->
-	    ct:fail(session_reused_when_session_expired);
-	{Client2, _} ->
-	    ok
-    end,
-    process_flag(trap_exit, false),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client0),
-    ssl_test_lib:close(Client1),
-    ssl_test_lib:close(Client2).
-
-make_sure_expired(Host, Port, Id) ->
-    {status, _, _, StatusInfo} = sys:get_status(whereis(ssl_manager)),
-    [_, _,_, _, Prop] = StatusInfo,
-    State = ssl_test_lib:state(Prop),
-    Cache = element(2, State),
-
-    case ssl_session_cache:lookup(Cache, {{Host,  Port}, Id}) of
-	undefined ->
-	   ok;
-	#session{is_resumable = false} ->
-	   ok;
-	_ ->
-	    ct:sleep(?SLEEP),
-	    make_sure_expired(Host, Port, Id)
-    end.     
-
-%%--------------------------------------------------------------------
-server_does_not_want_to_reuse_session() ->
-    [{doc,"Test reuse of sessions (short handshake)"}].
-server_does_not_want_to_reuse_session(Config) when is_list(Config) -> 
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, 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, session_info_result, []}},
-				   {options, [{reuse_session, fun(_,_,_,_) ->
-								      false
-							      end} | 
-					      ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client0 =
-	ssl_test_lib:start_client([{node, ClientNode}, 
-		      {port, Port}, {host, Hostname},
-			    {mfa, {ssl_test_lib, no_result, []}},
-		      {from, self()},  {options, ClientOpts}]),   
-    SessionInfo = 
-	receive
-	    {Server, Info} ->
-		Info
-	end,
-       
-    Server ! {listen, {mfa, {ssl_test_lib, no_result, []}}},
-    
-    %% Make sure session is registered
-    ct:sleep(?SLEEP),
-    ssl_test_lib:close(Client0),
-
-    Client1 =
-	ssl_test_lib:start_client([{node, ClientNode}, 
-		      {port, Port}, {host, Hostname},
-		      {mfa, {ssl_test_lib, session_info_result, []}},
-		      {from, self()},  {options, ClientOpts}]),    
-    receive
-	{Client1, SessionInfo} ->
-	    ct:fail(session_reused_when_server_does_not_want_to);
-	{Client1, _Other} ->
-	   ok
-    end,
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client1).
-
-%%--------------------------------------------------------------------
-client_renegotiate() ->
-    [{doc,"Test ssl:renegotiate/1 on client."}].
-client_renegotiate(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, 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} | ClientOpts]}]),
-    
-    ssl_test_lib:check_result(Client, ok, Server, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-client_secure_renegotiate() ->
-    [{doc,"Test ssl:renegotiate/1 on client."}].
-client_secure_renegotiate(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, true} | 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, true}| ClientOpts]}]),
-    
-    ssl_test_lib:check_result(Client, ok, Server, ok),
-    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),
+					{mfa, {?MODULE, protocol_info_result, []}},
+					{options,  [{versions, ['tlsv1.1', 'tlsv1.2']} | ClientOpts]}]),
 
-    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).
+    ServerMsg = ClientMsg = {ok, 'tlsv1.2'},    
+    ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg).
+  
+connect_dist() ->
+    [{doc,"Test a simple connect as is used by distribution"}].
 
-%%--------------------------------------------------------------------
-server_renegotiate() ->
-    [{doc,"Test ssl:renegotiate/1 on server."}].
-server_renegotiate(Config) when is_list(Config) ->
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
+connect_dist(Config) when is_list(Config) -> 
+    ClientOpts0 = ssl_test_lib:ssl_options(client_kc_opts, Config),
+    ClientOpts = [{ssl_imp, new},{active, false}, {packet,4}|ClientOpts0],
+    ServerOpts0 = ssl_test_lib:ssl_options(server_kc_opts, Config),
+    ServerOpts = [{ssl_imp, new},{active, false}, {packet,4}|ServerOpts0],
 
     {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,
-					       renegotiate, [Data]}},
+					{mfa, {?MODULE, connect_dist_s, []}},
 					{options, ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
-
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
 					{host, Hostname},
-					{from, self()},
-					{mfa, {?MODULE, erlang_ssl_receive, [Data]}},
-					{options, [{reuse_sessions, false} | ClientOpts]}]),
-    
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-client_renegotiate_reused_session() ->
-    [{doc,"Test ssl:renegotiate/1 on client when the ssl session will be reused."}].
-client_renegotiate_reused_session(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, 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_reuse_session, [Data]}},
-					{options, [{reuse_sessions, true} | ClientOpts]}]),
-    
-    ssl_test_lib:check_result(Client, ok, Server, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-%%--------------------------------------------------------------------
-server_renegotiate_reused_session() ->
-    [{doc,"Test ssl:renegotiate/1 on server when the ssl session will be reused."}].
-server_renegotiate_reused_session(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,
-					       renegotiate_reuse_session, [Data]}},
-					{options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
-					{host, Hostname},
-					{from, self()},
-					{mfa, {?MODULE, erlang_ssl_receive, [Data]}},
-					{options, [{reuse_sessions, true} | ClientOpts]}]),
-
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-%%--------------------------------------------------------------------
-client_no_wrap_sequence_number() ->
-    [{doc,"Test that erlang client will renegotiate session when",
-     "max sequence number celing is about to be reached. Although"
-     "in the testcase we use the test option renegotiate_at"
-     " to lower treashold substantially."}].
-
-client_no_wrap_sequence_number(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),
-
-    ErlData = "From erlang to erlang",
-    N = 12,
-
-    Server =
-	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-				   {from, self()},
-				   {mfa, {ssl_test_lib, no_result, []}},
-				   {options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-
-    Version = ssl_test_lib:protocol_version(Config, tuple),
-
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
-					{host, Hostname},
-					{from, self()},
-					{mfa, {ssl_test_lib,
-					       trigger_renegotiate, [[ErlData, treashold(N, Version)]]}},
-					{options, [{reuse_sessions, false},
-						   {renegotiate_at, N} | ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-server_no_wrap_sequence_number() ->
-    [{doc, "Test that erlang server will renegotiate session when",
-     "max sequence number celing is about to be reached. Although"
-     "in the testcase we use the test option renegotiate_at"
-     " to lower treashold substantially."}].
-
-server_no_wrap_sequence_number(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",
-    N = 12,
-
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-					{from, self()},
-					{mfa, {ssl_test_lib,
-					       trigger_renegotiate, [[Data, N+2]]}},
-					{options, [{renegotiate_at, N} | ServerOpts]}]),
-    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, no_result, []}},
-					{options, [{reuse_sessions, false} | ClientOpts]}]),
-
-    ssl_test_lib:check_result(Server, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-der_input() ->
-    [{doc,"Test to input certs and key as der"}].
-
-der_input(Config) when is_list(Config) ->
-    DataDir = proplists:get_value(data_dir, Config),
-    DHParamFile = filename:join(DataDir, "dHParam.pem"),
-
-    {status, _, _, StatusInfo} = sys:get_status(whereis(ssl_manager)),
-    [_, _,_, _, Prop] = StatusInfo,
-    State = ssl_test_lib:state(Prop),
-    [CADb | _] = element(6, State),
-
-    Size = ets:info(CADb, size),
-
-    SeverVerifyOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
-    {ServerCert, ServerKey, ServerCaCerts, DHParams} = der_input_opts([{dhfile, DHParamFile} |
-								       SeverVerifyOpts]),
-    ClientVerifyOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
-    {ClientCert, ClientKey, ClientCaCerts, DHParams} = der_input_opts([{dhfile, DHParamFile} |
-								       ClientVerifyOpts]),
-    ServerOpts = [{verify, verify_peer}, {fail_if_no_peer_cert, true},
-		  {dh, DHParams},
-		  {cert, ServerCert}, {key, ServerKey}, {cacerts, ServerCaCerts}],
-    ClientOpts = [{verify, verify_peer}, {fail_if_no_peer_cert, true},
-		  {dh, DHParams},
-		  {cert, ClientCert}, {key, ClientKey}, {cacerts, ClientCaCerts}],
-    {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, []}},
-					{options, [{active, false} | ServerOpts]}]),
-    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, []}},
-					{options, [{active, false} | ClientOpts]}]),
-
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client),
-    Size = ets:info(CADb, size).
-
-%%--------------------------------------------------------------------
-der_input_opts(Opts) ->
-    Certfile = proplists:get_value(certfile, Opts),
-    CaCertsfile = proplists:get_value(cacertfile, Opts),
-    Keyfile = proplists:get_value(keyfile, Opts),
-    Dhfile = proplists:get_value(dhfile, Opts),
-    [{_, Cert, _}] = ssl_test_lib:pem_to_der(Certfile),
-    [{Asn1Type, Key, _}]  = ssl_test_lib:pem_to_der(Keyfile),
-    [{_, DHParams, _}]  = ssl_test_lib:pem_to_der(Dhfile),
-    CaCerts =
-	lists:map(fun(Entry) ->
-			  {_, CaCert, _} = Entry,
-			  CaCert
-		  end, ssl_test_lib:pem_to_der(CaCertsfile)),
-    {Cert, {Asn1Type, Key}, CaCerts, DHParams}.
-
-%%--------------------------------------------------------------------
-no_reuses_session_server_restart_new_cert() ->
-    [{doc,"Check that a session is not reused if the server is restarted with a new cert."}].
-no_reuses_session_server_restart_new_cert(Config) when is_list(Config) ->
-
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    DsaServerOpts = ssl_test_lib:ssl_options(server_dsa_opts, 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, session_info_result, []}},
-				   {options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client0 =
-	ssl_test_lib:start_client([{node, ClientNode},
-		      {port, Port}, {host, Hostname},
-			    {mfa, {ssl_test_lib, no_result, []}},
-		      {from, self()},  {options, ClientOpts}]),
-    SessionInfo =
-	receive
-	    {Server, Info} ->
-		Info
-	end,
-
-    %% Make sure session is registered
-    ct:sleep(?SLEEP),
-    Monitor = erlang:monitor(process, Server),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client0),
-    receive
-	{'DOWN', Monitor, _, _, _} ->
-	    ok
-    end,
-    
-    Server1 =
-	ssl_test_lib:start_server([{node, ServerNode}, {port, Port},
-				   {from, self()},
-		      {mfa, {ssl_test_lib, no_result, []}},
-				   {options, [{reuseaddr, true} | DsaServerOpts]}]),
-
-    Client1 =
-	ssl_test_lib:start_client([{node, ClientNode},
-		      {port, Port}, {host, Hostname},
-		      {mfa, {ssl_test_lib, session_info_result, []}},
-		      {from, self()},  {options, ClientOpts}]),
-    receive
-	{Client1, SessionInfo} ->
-	    ct:fail(session_reused_when_server_has_new_cert);
-	{Client1, _Other} ->
-	   ok
-    end,
-    ssl_test_lib:close(Server1),
-    ssl_test_lib:close(Client1).
-
-%%--------------------------------------------------------------------
-no_reuses_session_server_restart_new_cert_file() ->
-    [{doc,"Check that a session is not reused if a server is restarted with a new "
-      "cert contained in a file with the same name as the old cert."}].
-
-no_reuses_session_server_restart_new_cert_file(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_verification_opts, Config),
-    DsaServerOpts = ssl_test_lib:ssl_options(server_dsa_opts, Config),
-    PrivDir =  proplists:get_value(priv_dir, Config),
-
-    NewServerOpts0 = new_config(PrivDir, ServerOpts),
-    {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, session_info_result, []}},
-				   {options, NewServerOpts0}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client0 =
-	ssl_test_lib:start_client([{node, ClientNode},
-		      {port, Port}, {host, Hostname},
-			    {mfa, {ssl_test_lib, no_result, []}},
-		      {from, self()},  {options, ClientOpts}]),
-    SessionInfo =
-	receive
-	    {Server, Info} ->
-		Info
-	end,
-
-    %% Make sure session is registered and we get
-    %% new file time stamp when calling new_config!
-    ct:sleep(?SLEEP* 2),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client0),
-
-    ssl:clear_pem_cache(),
-
-    NewServerOpts1 = new_config(PrivDir, DsaServerOpts),
-
-    Server1 =
-	ssl_test_lib:start_server([{node, ServerNode}, {port, Port},
-				   {from, self()},
-		      {mfa, {ssl_test_lib, no_result, []}},
-				   {options,  [{reuseaddr, true} | NewServerOpts1]}]),
-    Client1 =
-	ssl_test_lib:start_client([{node, ClientNode},
-		      {port, Port}, {host, Hostname},
-		      {mfa, {ssl_test_lib, session_info_result, []}},
-				   {from, self()},  {options, ClientOpts}]),
-    receive
-	{Client1, SessionInfo} ->
-	    ct:fail(session_reused_when_server_has_new_cert);
-	{Client1, _Other} ->
-	   ok
-    end,
-    ssl_test_lib:close(Server1),
-    ssl_test_lib:close(Client1).
-
-%%--------------------------------------------------------------------
-defaults(Config) when is_list(Config)->
-    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('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() ->
-    [{doc,"Test reuseaddr option"}].
-
-reuseaddr(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, 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, no_result, []}},
-				   {options,  [{active, false} | ServerOpts]}]),
-    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, no_result, []}},
-				   {options, [{active, false} | ClientOpts]}]),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client),
-    
-    Server1 =
-	ssl_test_lib:start_server([{node, ServerNode}, {port, Port},
-				   {from, self()},
-				   {mfa, {ssl_test_lib, send_recv_result, []}},
-				   {options,  [{active, false} | ServerOpts]}]),
-    Client1 =
-	ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
-				   {host, Hostname},
-				   {from, self()},
-				   {mfa, {ssl_test_lib, send_recv_result, []}},
-				   {options, [{active, false} | ClientOpts]}]),
-
-    ssl_test_lib:check_result(Server1, ok, Client1, ok),
-    ssl_test_lib:close(Server1),
-    ssl_test_lib:close(Client1).
-
-%%--------------------------------------------------------------------
-tls_tcp_reuseaddr() ->
-    [{doc, "Reference test case."}].
-tls_tcp_reuseaddr(Config) when is_list(Config) ->
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server =
-	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-				   {from, self()},
-				   {transport, gen_tcp},
-				   {mfa, {ssl_test_lib, no_result, []}},
-				   {options,  [{active, false}, {reuseaddr, true}]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client =
-	ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
-				   {host, Hostname},
-                                   {transport, gen_tcp},
-				   {from, self()},
-				   {mfa, {ssl_test_lib, no_result, []}},
-				   {options, [{active, false}]}]),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client),
-    
-    Server1 =
-	ssl_test_lib:start_server([{node, ServerNode}, {port, Port},
-				   {from, self()},
-				   {transport, gen_tcp},
-				   {mfa, {?MODULE, tcp_send_recv_result, []}},
-				   {options,  [{active, false}, {reuseaddr, true}]}]),
-    Client1 =
-	ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
-				   {host, Hostname},
-				   {from, self()},
-                                   {transport, gen_tcp}, 
-				   {mfa, {?MODULE, tcp_send_recv_result, []}},
-				   {options, [{active, false}]}]),
-
-    ssl_test_lib:check_result(Server1, ok, Client1, ok),
-    ssl_test_lib:close(Server1),
-    ssl_test_lib:close(Client1).
-
-%%--------------------------------------------------------------------
-
-honor_server_cipher_order() ->
-    [{doc,"Test API honor server cipher order."}].
-honor_server_cipher_order(Config) when is_list(Config) ->
-     ClientCiphers = [#{key_exchange => dhe_rsa, 
-                       cipher => aes_128_cbc, 
-                       mac => sha,
-                       prf => default_prf}, 
-                     #{key_exchange => dhe_rsa, 
-                       cipher => aes_256_cbc, 
-                       mac => sha,
-                       prf => default_prf}],
-    ServerCiphers = [#{key_exchange => dhe_rsa, 
-                       cipher => aes_256_cbc,   
-                       mac =>sha,
-                       prf => default_prf},
-                     #{key_exchange => dhe_rsa, 
-                       cipher => aes_128_cbc, 
-                       mac => sha,
-                       prf => default_prf}],
-    honor_cipher_order(Config, true, ServerCiphers, ClientCiphers, #{key_exchange => dhe_rsa, 
-                                                                     cipher => aes_256_cbc, 
-                                                                     mac => sha,
-                                                                     prf => default_prf}).
-
-honor_client_cipher_order() ->
-    [{doc,"Test API honor server cipher order."}].
-honor_client_cipher_order(Config) when is_list(Config) ->
-    ClientCiphers = [#{key_exchange => dhe_rsa, 
-                       cipher => aes_128_cbc, 
-                       mac => sha,
-                       prf => default_prf}, 
-                     #{key_exchange => dhe_rsa, 
-                       cipher => aes_256_cbc, 
-                       mac => sha,
-                       prf => default_prf}],
-    ServerCiphers = [#{key_exchange => dhe_rsa, 
-                       cipher => aes_256_cbc,   
-                       mac =>sha,
-                       prf => default_prf},
-                     #{key_exchange => dhe_rsa, 
-                       cipher => aes_128_cbc, 
-                       mac => sha,
-                       prf => default_prf}],
-honor_cipher_order(Config, false, ServerCiphers, ClientCiphers, #{key_exchange => dhe_rsa, 
-                                                                  cipher => aes_128_cbc, 
-                                                                  mac => sha,
-                                                                  prf => default_prf}).
-
-honor_cipher_order(Config, Honor, ServerCiphers, ClientCiphers, Expected) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-					{from, self()},
-					{mfa, {?MODULE, connection_info_result, []}},
-					{options, [{ciphers, ServerCiphers}, {honor_cipher_order, Honor}
-						   | ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
-					{host, Hostname},
-					{from, self()},
-					{mfa, {?MODULE, connection_info_result, []}},
-					{options, [{ciphers, ClientCiphers}, {honor_cipher_order, Honor}
-						   | ClientOpts]}]),
-
-    Version = ssl_test_lib:protocol_version(Config),
-
-    ServerMsg = ClientMsg = {ok, {Version, Expected}},
-
-    ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-tls_ciphersuite_vs_version()  ->
-    [{doc,"Test a SSLv3 client can not negotiate a TLSv* cipher suite."}].
-tls_ciphersuite_vs_version(Config) when is_list(Config) ->
-    
-    {_ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    
-    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
-					      {from, self()},
-					      {options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    
-    {ok, Socket} = gen_tcp:connect(Hostname, Port, [binary, {active, false}]),
-    ok = gen_tcp:send(Socket, 
-		      <<22, 3,0, 49:16, % handshake, SSL 3.0, length
-			1, 45:24, % client_hello, length
-			3,0, % SSL 3.0
-			16#deadbeef:256, % 32 'random' bytes = 256 bits
-			0, % no session ID
-			%% three cipher suites -- null, one with sha256 hash and one with sha hash
-			6:16, 0,255, 0,61, 0,57, 
-			1, 0 % no compression
-		      >>),
-    {ok, <<22, RecMajor:8, RecMinor:8, _RecLen:16, 2, HelloLen:24>>} = gen_tcp:recv(Socket, 9, 10000),
-    {ok, <<HelloBin:HelloLen/binary>>} = gen_tcp:recv(Socket, HelloLen, 5000),
-    ServerHello = tls_handshake:decode_handshake({RecMajor, RecMinor}, 2, HelloBin),
-    case ServerHello of
-	#server_hello{server_version = {3,0}, cipher_suite = <<0,57>>} -> 
-	    ok;
-	_ ->
-	    ct:fail({unexpected_server_hello, ServerHello})
-    end.
-			
-%%--------------------------------------------------------------------
-conf_signature_algs() ->
-    [{doc,"Test to set the signature_algs option on both client and server"}].
-conf_signature_algs(Config) when is_list(Config) -> 
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, 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, []}},
-				   {options,  [{active, false}, {signature_algs, [{sha256, rsa}]} | ServerOpts]}]),
-    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, []}},
-				   {options, [{active, false}, {signature_algs, [{sha256, rsa}]} | ClientOpts]}]),
-    
-    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
-			 [self(), Client, Server]),
-    
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-
-%%--------------------------------------------------------------------
-no_common_signature_algs()  ->
-    [{doc,"Set the signature_algs option so that there client and server does not share any hash sign algorithms"}].
-no_common_signature_algs(Config) when is_list(Config) ->
-    
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-
-    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
-					      {from, self()},
-					      {options, [{signature_algs, [{sha256, rsa}]}
-							 | ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
-                                              {host, Hostname},
-                                              {from, self()},
-                                              {options, [{signature_algs, [{sha384, rsa}]}
-                                                         | ClientOpts]}]),
-    
-    ssl_test_lib:check_result(Server, {error, {tls_alert, "insufficient security"}},
-                              Client, {error, {tls_alert, "insufficient security"}}).
-
-%%--------------------------------------------------------------------
-
-tls_dont_crash_on_handshake_garbage() ->
-    [{doc, "Ensure SSL server worker thows an alert on garbage during handshake "
-      "instead of crashing and exposing state to user code"}].
-
-tls_dont_crash_on_handshake_garbage(Config) ->
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, 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, ServerOpts}]),
-    unlink(Server), monitor(process, Server),
-    Port = ssl_test_lib:inet_port(Server),
-
-    {ok, Socket} = gen_tcp:connect(Hostname, Port, [binary, {active, false}]),
-
-    % Send hello and garbage record
-    ok = gen_tcp:send(Socket,
-                      [<<22, 3,3, 49:16, 1, 45:24, 3,3, % client_hello
-                         16#deadbeef:256, % 32 'random' bytes = 256 bits
-                         0, 6:16, 0,255, 0,61, 0,57, 1, 0 >>, % some hello values
-
-                       <<22, 3,3, 5:16, 92,64,37,228,209>> % garbage
-                      ]),
-    % Send unexpected change_cipher_spec
-    ok = gen_tcp:send(Socket, <<20, 0,0,12, 111,40,244,7,137,224,16,109,197,110,249,152>>),
-
-    % Ensure we receive an alert, not sudden disconnect
-    {ok, <<21, _/binary>>} = drop_handshakes(Socket, 1000).
-
-drop_handshakes(Socket, Timeout) ->
-    {ok, <<RecType:8, _RecMajor:8, _RecMinor:8, RecLen:16>> = Header} = gen_tcp:recv(Socket, 5, Timeout),
-    {ok, <<Frag:RecLen/binary>>} = gen_tcp:recv(Socket, RecLen, Timeout),
-    case RecType of
-        22 -> drop_handshakes(Socket, Timeout);
-        _ -> {ok, <<Header/binary, Frag/binary>>}
-    end.
-
-
-%%--------------------------------------------------------------------
-
-hibernate() ->
-    [{doc,"Check that an SSL connection that is started with option "
-      "{hibernate_after, 1000} indeed hibernates after 1000ms of "
-      "inactivity"}].
-
-hibernate(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, 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, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    {Client, #sslsocket{pid=[Pid|_]}} = ssl_test_lib:start_client([return_socket,
-                    {node, ClientNode}, {port, Port},
-					{host, Hostname},
-					{from, self()},
-					{mfa, {ssl_test_lib, send_recv_result_active, []}},
-					{options, [{hibernate_after, 1000}|ClientOpts]}]),
-    {current_function, _} =
-        process_info(Pid, current_function),
-
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    
-    timer:sleep(1500),
-    {current_function, {erlang, hibernate, 3}} =
-	process_info(Pid, current_function),
-    
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-
-hibernate_right_away() ->
-    [{doc,"Check that an SSL connection that is configured to hibernate "
-    "after 0 or 1 milliseconds hibernates as soon as possible and not "
-    "crashes"}].
-
-hibernate_right_away(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-    StartServerOpts = [{node, ServerNode}, {port, 0},
-                    {from, self()},
-                    {mfa, {ssl_test_lib, send_recv_result_active, []}},
-                    {options, ServerOpts}],
-    StartClientOpts = [return_socket,
-                    {node, ClientNode},
-                    {host, Hostname},
-                    {from, self()},
-                    {mfa, {ssl_test_lib, send_recv_result_active, []}}],
-
-    Server1 = ssl_test_lib:start_server(StartServerOpts),
-    Port1 = ssl_test_lib:inet_port(Server1),
-    {Client1, #sslsocket{pid = [Pid1|_]}} = ssl_test_lib:start_client(StartClientOpts ++
-                    [{port, Port1}, {options, [{hibernate_after, 0}|ClientOpts]}]),
-
-    ssl_test_lib:check_result(Server1, ok, Client1, ok),
-  
-     {current_function, {erlang, hibernate, 3}} =
-	process_info(Pid1, current_function),
-    ssl_test_lib:close(Server1),
-    ssl_test_lib:close(Client1),
-    
-    Server2 = ssl_test_lib:start_server(StartServerOpts),
-    Port2 = ssl_test_lib:inet_port(Server2),
-    {Client2, #sslsocket{pid = [Pid2|_]}} = ssl_test_lib:start_client(StartClientOpts ++
-                    [{port, Port2}, {options, [{hibernate_after, 1}|ClientOpts]}]),
-
-    ssl_test_lib:check_result(Server2, ok, Client2, ok),
-
-    ct:sleep(1000), %% Schedule out
-    
-    {current_function, {erlang, hibernate, 3}} =
-	process_info(Pid2, current_function),
-
-    ssl_test_lib:close(Server2),
-    ssl_test_lib:close(Client2).
-
-%%--------------------------------------------------------------------
-listen_socket() ->
-    [{doc,"Check error handling and inet compliance when calling API functions with listen sockets."}].
-
-listen_socket(Config) ->
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {ok, ListenSocket} = ssl:listen(0, ServerOpts),
-
-    %% This can be a valid thing to do as
-    %% options are inherited by the accept socket
-    ok = ssl:controlling_process(ListenSocket, self()),
-
-    {ok, _} = ssl:sockname(ListenSocket),
-
-    {error, enotconn} = ssl:send(ListenSocket, <<"data">>),
-    {error, enotconn} = ssl:recv(ListenSocket, 0),
-    {error, enotconn} = ssl:connection_information(ListenSocket),
-    {error, enotconn} = ssl:peername(ListenSocket),
-    {error, enotconn} = ssl:peercert(ListenSocket),
-    {error, enotconn} = ssl:renegotiate(ListenSocket),
-    {error, enotconn} = ssl:prf(ListenSocket, 'master_secret', <<"Label">>, client_random, 256),
-    {error, enotconn} = ssl:shutdown(ListenSocket, read_write),
-
-    ok = ssl:close(ListenSocket).
-%%--------------------------------------------------------------------
-tls_ssl_accept_timeout() ->
-    [{doc,"Test ssl:ssl_accept timeout"}].
-
-tls_ssl_accept_timeout(Config) ->
-    process_flag(trap_exit, true),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-					{from, self()},
-					{timeout, 5000},
-					{mfa, {ssl_test_lib,
-					       no_result_msg, []}},
-					{options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    {ok, CSocket} = gen_tcp:connect(Hostname, Port, [binary, {active, true}]),
-
-    receive
-	{tcp_closed, CSocket} ->
-	    ssl_test_lib:check_result(Server, {error, timeout}),
-	    receive
-		{'EXIT', Server, _} ->
-		    %% Make sure supervisor had time to react on process exit
-		    %% Could we come up with a better solution to this?
-		    ct:sleep(500), 
-		    [] = supervisor:which_children(tls_connection_sup)
-	    end
-    end.
-
-%%--------------------------------------------------------------------
-ssl_recv_timeout() ->
-    [{doc,"Test ssl:ssl_accept timeout"}].
-
-ssl_recv_timeout(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),
-
-    Server =
-	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-				   {from, self()},
-				   {mfa, {?MODULE, send_recv_result_timeout_server, []}},
-				   {options, [{active, 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,
-					       send_recv_result_timeout_client, []}},
-					{options, [{active, false} | ClientOpts]}]),
-
-    ssl_test_lib:check_result(Client, ok, Server, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-connect_twice() ->
-    [{doc,""}].
-connect_twice(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, 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, []}},
-				   {options,  [{keepalive, true},{active, false}
-					       | ServerOpts]}]),
-    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, []}},
-				   {options, [{keepalive, true},{active, false}
-					      | ClientOpts]}]),
-    Server ! listen,
-
-    {Client1, #sslsocket{}} =
-	ssl_test_lib:start_client([return_socket,
-				   {node, ClientNode}, {port, Port},
-				   {host, Hostname},
-				   {from, self()},
-				   {mfa, {ssl_test_lib, send_recv_result, []}},
-				   {options, [{keepalive, true},{active, false}
-					      | ClientOpts]}]),
-
-    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
-			 [self(), Client, Server]),
-
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    ssl_test_lib:check_result(Server, ok, Client1, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client),
-    ssl_test_lib:close(Client1).
-
-%%--------------------------------------------------------------------
-renegotiate_dos_mitigate_active() ->
-    [{doc, "Mitigate DOS computational attack by not allowing client to renegotiate many times in a row",
-      "immediately after each other"}].
-renegotiate_dos_mitigate_active(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),
-
-    Server =
-	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-				   {from, self()},
-				   {mfa, {ssl_test_lib, send_recv_result_active, []}},
-				   {options, 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_immediately, []}},
-					{options, ClientOpts}]),
-
-    ssl_test_lib:check_result(Client, ok, Server, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-renegotiate_dos_mitigate_passive() ->
-    [{doc, "Mitigate DOS computational attack by not allowing client to renegotiate many times in a row",
-      "immediately after each other"}].
-renegotiate_dos_mitigate_passive(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),
-
-    Server =
-	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-				   {from, self()},
-				   {mfa, {ssl_test_lib, send_recv_result, []}},
-				   {options, [{active, 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_immediately, []}},
+					{mfa, {?MODULE, connect_dist_c, []}},
 					{options, ClientOpts}]),
     
-    ssl_test_lib:check_result(Client, ok, Server, ok), 
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-renegotiate_dos_mitigate_absolute() ->
-    [{doc, "Mitigate DOS computational attack by not allowing client to initiate renegotiation"}].
-renegotiate_dos_mitigate_absolute(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),
-
-    Server =
-	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-				   {from, self()},
-				   {mfa, {ssl_test_lib, send_recv_result_active, []}},
-				   {options, [{client_renegotiation, 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_rejected,
-					       []}},
-					{options, ClientOpts}]),
-
-    ssl_test_lib:check_result(Client, ok, Server, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-tls_tcp_error_propagation_in_active_mode() ->
-    [{doc,"Test that process recives {ssl_error, Socket, closed} when tcp error ocurres"}].
-tls_tcp_error_propagation_in_active_mode(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, 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, no_result, []}},
-					 {options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    {Client, #sslsocket{pid=[Pid|_]} = SslSocket} = ssl_test_lib:start_client([return_socket,
-                                                                               {node, ClientNode}, {port, Port},
-                                                                               {host, Hostname},
-                                                                               {from, self()},
-                                                                               {mfa, {?MODULE, receive_msg, []}},
-                                                                               {options, ClientOpts}]),
-    
-    {status, _, _, StatusInfo} = sys:get_status(Pid),
-    [_, _,_, _, Prop] = StatusInfo,
-    State = ssl_test_lib:state(Prop),
-    Socket = element(11, State),
-
-    %% Fake tcp error
-    Pid ! {tcp_error, Socket, etimedout},
-
-    ssl_test_lib:check_result(Client, {ssl_closed, SslSocket}).
-
-%%--------------------------------------------------------------------
-recv_error_handling() ->
-    [{doc,"Special case of call error handling"}].
-recv_error_handling(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server  = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-					  {from, self()},
-					  {mfa, {?MODULE, recv_close, []}},
-					 {options, [{active, false} | ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    {_Client, #sslsocket{} = SslSocket} = ssl_test_lib:start_client([return_socket,
-									   {node, ClientNode}, {port, Port},
-									   {host, Hostname},
-									   {from, self()},
-									   {mfa, {ssl_test_lib, no_result, []}},
-									   {options, ClientOpts}]),
-    ssl:close(SslSocket),
-    ssl_test_lib:check_result(Server, ok).
-
-
-
-%%--------------------------------------------------------------------
-call_in_error_state() ->
-    [{doc,"Special case of call error handling"}].
-call_in_error_state(Config) when is_list(Config) ->
-    ServerOpts0 = ssl_test_lib:ssl_options(server_opts, Config),
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = [{cacertfile, "foo.pem"} | proplists:delete(cacertfile, ServerOpts0)],
-    Pid = spawn_link(?MODULE, run_error_server, [[self() | ServerOpts]]),
-    receive
-        {Pid, Port} ->
-            spawn_link(?MODULE, run_client_error, [[Port, ClientOpts]])
-    end,
-    receive
-        {error, closed} ->
-            ok;
-        Other ->
-            ct:fail(Other)
-    end.
-
-run_client_error([Port, Opts]) ->
-    ssl:connect("localhost", Port, Opts).
-    
-run_error_server([ Pid | Opts]) ->
-    {ok, Listen} = ssl:listen(0, Opts),
-    {ok,{_, Port}} = ssl:sockname(Listen),
-    Pid ! {self(), Port},
-    {ok, Socket} = ssl:transport_accept(Listen),
-    Pid ! ssl:controlling_process(Socket, self()).
-
-%%--------------------------------------------------------------------
-
-close_in_error_state() ->
-    [{doc,"Special case of closing socket in error state"}].
-close_in_error_state(Config) when is_list(Config) ->
-    ServerOpts0 = ssl_test_lib:ssl_options(server_opts, Config),
-    ServerOpts = [{cacertfile, "foo.pem"} | proplists:delete(cacertfile, ServerOpts0)],
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    _ = spawn_link(?MODULE, run_error_server_close, [[self() | ServerOpts]]),
-    receive
-        {_Pid, Port} ->
-            spawn_link(?MODULE, run_client_error, [[Port, ClientOpts]])
-    end,
-    receive
-        ok ->
-            ok;
-        Other ->
-            ct:fail(Other)
-    end.
-%%--------------------------------------------------------------------
-abuse_transport_accept_socket() ->
-    [{doc,"Only ssl:handshake and ssl:controlling_process is allowed for transport_accept:sockets"}].
-abuse_transport_accept_socket(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),
+    ssl_test_lib:check_result(Server, ok, Client, ok),
 
-    Server = ssl_test_lib:start_server_transport_abuse_socket([{node, ServerNode}, 
-                                                               {port, 0},
-                                                               {from, self()},
-                                                               {options, ServerOpts}]),
-    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, no_result, []}},
-                                        {options, ClientOpts}]),
-    ssl_test_lib:check_result(Server, ok),
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
-    
-
-%%--------------------------------------------------------------------
-controlling_process_transport_accept_socket() ->
-    [{doc,"Only ssl:handshake and ssl:controlling_process is allowed for transport_accept:sockets"}].
-controlling_process_transport_accept_socket(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),
-
-    Server = ssl_test_lib:start_server_transport_control([{node, ServerNode}, 
-                                                          {port, 0},
-                                                          {from, self()},
-                                                          {options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    
-    _Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
-                                              {host, Hostname},
-                                              {from, self()},
-                                              {options, ClientOpts}]),
-    ssl_test_lib:check_result(Server, ok),
-    ssl_test_lib:close(Server).
-
-%%--------------------------------------------------------------------
-run_error_server_close([Pid | Opts]) ->
-    {ok, Listen} = ssl:listen(0, Opts),
-    {ok,{_, Port}} = ssl:sockname(Listen),
-    Pid ! {self(), Port},
-    {ok, Socket} = ssl:transport_accept(Listen),
-    Pid ! ssl:close(Socket).
-
-%%--------------------------------------------------------------------
-
-rizzo() ->
-    [{doc, "Test that there is a 1/n-1-split for non RC4 in 'TLS < 1.1' as it is
-    vunrable to Rizzo/Dungon attack"}].
-
-rizzo(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),
-    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, []}).
-%%--------------------------------------------------------------------
-no_rizzo_rc4() ->
-    [{doc,"Test that there is no 1/n-1-split for RC4 as it is not vunrable to Rizzo/Dungon attack"}].
-
-no_rizzo_rc4(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),
-    %% Test uses RSA certs
-    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, []}).
-
-rizzo_one_n_minus_one() ->
-    [{doc,"Test that the 1/n-1-split mitigation of Rizzo/Dungon attack can be explicitly selected"}].
-
-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),
-    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, []}).
-
-rizzo_zero_n() ->
-    [{doc,"Test that the 0/n-split mitigation of Rizzo/Dungon attack can be explicitly selected"}].
-
-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),
-    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, []}).
-
-rizzo_disabled() ->
-    [{doc,"Test that the mitigation of Rizzo/Dungon attack can be explicitly disabled"}].
-
-rizzo_disabled(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),
-    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, []}).
-
-%%--------------------------------------------------------------------
-new_server_wants_peer_cert() ->
-    [{doc, "Test that server configured to do client certification does"
-      " not reuse session without a client certificate."}].
-new_server_wants_peer_cert(Config) when is_list(Config) ->
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
-    VServerOpts = [{verify, verify_peer}, {fail_if_no_peer_cert, true}
-		  | ssl_test_lib:ssl_options(server_verification_opts, Config)],
-    ClientOpts = ssl_test_lib:ssl_options(client_verification_opts, Config),
-
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-    Server =
-	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-				   {from, self()},
-				   {mfa, {?MODULE, peercert_result, []}},
-				   {options,  [ServerOpts]}]),
-    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, no_result, []}},
-				   {options, ClientOpts}]),
-
-    Monitor = erlang:monitor(process, Server),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client),
-    receive
-	{'DOWN', Monitor, _, _, _} ->
-	    ok
-    end,
-    
-    Server1 = ssl_test_lib:start_server([{node, ServerNode}, {port, Port},
-					 {from, self()},
-					 {mfa, {?MODULE, peercert_result, []}},
-					 {options,  VServerOpts}]), 
-    Client1 =
-	ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
-				   {host, Hostname},
-				   {from, self()},
-				   {mfa, {ssl_test_lib, no_result, []}},
-				   {options, [ClientOpts]}]),
-
-    CertFile = proplists:get_value(certfile, ClientOpts),
-    [{'Certificate', BinCert, _}]= ssl_test_lib:pem_to_der(CertFile),
-
-    ServerMsg = {error, no_peercert},
-    Sever1Msg = {ok, BinCert},
-   
-    ssl_test_lib:check_result(Server, ServerMsg, Server1, Sever1Msg),
-
-    ssl_test_lib:close(Server1),
-    ssl_test_lib:close(Client),
-    ssl_test_lib:close(Client1).
-
-%%--------------------------------------------------------------------
-session_cache_process_list() ->
-    [{doc,"Test reuse of sessions (short handshake)"}].
-session_cache_process_list(Config) when is_list(Config) ->
-    session_cache_process(list,Config).
-%%--------------------------------------------------------------------
-session_cache_process_mnesia() ->
-    [{doc,"Test reuse of sessions (short handshake)"}].
-session_cache_process_mnesia(Config) when is_list(Config) ->
-    session_cache_process(mnesia,Config).
+eccs() ->
+    [{doc, "Test API functions eccs/0 and eccs/1"}].
 
-%%--------------------------------------------------------------------
+eccs(Config) when is_list(Config) ->
+    [_|_] = All = ssl:eccs(),
+    [] = ssl:eccs(sslv3),
+    [_|_] = Tls = ssl:eccs(tlsv1),
+    [_|_] = Tls1 = ssl:eccs('tlsv1.1'),
+    [_|_] = Tls2 = ssl:eccs('tlsv1.2'),
+    [_|_] = Tls1 = ssl:eccs('dtlsv1'),
+    [_|_] = Tls2 = ssl:eccs('dtlsv1.2'),
+    %% ordering is currently not verified by the test
+    true = lists:sort(All) =:= lists:usort(Tls ++ Tls1 ++ Tls2),
+    ok.
 
 tls_versions_option() ->
     [{doc,"Test API versions option to connect/listen."}].
@@ -4314,168 +448,8 @@ tls_versions_option(Config) when is_list(Config) ->
 	{Server, _} ->
 	    ok
     end,	    
-   
-    ssl_test_lib:check_result(ErrClient, {error, {tls_alert, "protocol version"}}).
-
-
-%%--------------------------------------------------------------------
-unordered_protocol_versions_server() ->
-    [{doc,"Test that the highest protocol is selected even" 
-      " when it is not first in the versions list."}].
-
-unordered_protocol_versions_server(Config) when is_list(Config) -> 
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),  
-
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, protocol_info_result, []}},
-					{options, [{versions, ['tlsv1.1', 'tlsv1.2']} | ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {?MODULE, protocol_info_result, []}},
-					{options, ClientOpts}]),
-
-    ServerMsg = ClientMsg = {ok,'tlsv1.2'},    
-    ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg).
-
-%%--------------------------------------------------------------------
-unordered_protocol_versions_client() ->
-    [{doc,"Test that the highest protocol is selected even" 
-      " when it is not first in the versions list."}].
-
-unordered_protocol_versions_client(Config) when is_list(Config) -> 
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),  
-
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-					{mfa, {?MODULE, protocol_info_result, []}},
-					{options, ServerOpts }]),
-    Port = ssl_test_lib:inet_port(Server),
-    
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					{host, Hostname},
-					{from, self()}, 
-					{mfa, {?MODULE, protocol_info_result, []}},
-					{options,  [{versions, ['tlsv1.1', 'tlsv1.2']} | ClientOpts]}]),
-
-    ServerMsg = ClientMsg = {ok, 'tlsv1.2'},    
-    ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg).
-  
-%%--------------------------------------------------------------------
-max_handshake_size() ->
-    [{doc,"Test that we can set max_handshake_size to max value."}].
-
-max_handshake_size(Config) when is_list(Config) -> 
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, 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,  [{max_handshake_size, 8388607} |ServerOpts]}]),
-    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, [{max_handshake_size, 8388607} | ClientOpts]}]),
- 
-    ssl_test_lib:check_result(Server, ok, Client, ok).
-  
-%%--------------------------------------------------------------------
+    ssl_test_lib:check_client_alert(ErrClient, protocol_version).
 
-server_name_indication_option() ->
-    [{doc,"Test API server_name_indication option to connect."}].
-server_name_indication_option(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, 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, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    
-    Client0 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					 {host, Hostname},
-					 {from, self()}, 
-					 {mfa, {ssl_test_lib, send_recv_result_active, []}},
-					 {options,  
-					  [{server_name_indication, disable} | 
-					   ClientOpts]}
-					]),
-    
-    ssl_test_lib:check_result(Server, ok, Client0, ok),
-    Server ! listen,				       
-    
-    Client1 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					 {host, Hostname},
-					 {from, self()}, 
-					 {mfa, {ssl_test_lib, send_recv_result_active, []}},
-					 {options,
-					  [{server_name_indication, Hostname} | ClientOpts]
-					 }]),    
-    ssl_test_lib:check_result(Server, ok, Client1, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client0),
-    ssl_test_lib:close(Client1).
-%%--------------------------------------------------------------------
-
-accept_pool() ->
-    [{doc,"Test having an accept pool."}].
-accept_pool(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),  
-
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server0 = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-					{from, self()}, 
-					{accepters, 3},
-					{mfa, {ssl_test_lib, send_recv_result_active, []}},
-					{options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server0),
-    [Server1, Server2] = ssl_test_lib:accepters(2),
-
-    Client0 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					 {host, Hostname},
-					 {from, self()}, 
-					 {mfa, {ssl_test_lib, send_recv_result_active, []}},
-					 {options, ClientOpts}
-					]),
-    
-    Client1 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					 {host, Hostname},
-					 {from, self()}, 
-					 {mfa, {ssl_test_lib, send_recv_result_active, []}},
-					 {options, ClientOpts}
-					]),
-    
-    Client2 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-					 {host, Hostname},
-					 {from, self()}, 
-					 {mfa, {ssl_test_lib, send_recv_result_active, []}},
-					 {options, ClientOpts}
-					]),
-
-    ssl_test_lib:check_ok([Server0, Server1, Server2, Client0, Client1, Client2]),
-    
-    ssl_test_lib:close(Server0),
-    ssl_test_lib:close(Server1),
-    ssl_test_lib:close(Server2),
-    ssl_test_lib:close(Client0),
-    ssl_test_lib:close(Client1),
-    ssl_test_lib:close(Client2).
-    
 
 %%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
@@ -4489,670 +463,9 @@ tcp_send_recv_result(Socket) ->
     {ok,"Hello world"} = gen_tcp:recv(Socket, 11),
     ok.
 
-basic_verify_test_no_close(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_verification_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_verification_opts, 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, ServerOpts}]),
-    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, ClientOpts}]),
-
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    {Server, Client}.
-
-basic_test(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, 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, ServerOpts}]),
-    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, ClientOpts}]),
-
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-prf_create_plan(TlsVersions, PRFs, Results) ->
-    lists:foldl(fun(Ver, Acc) ->
-                        A = prf_ciphers_and_expected(Ver, PRFs, Results),
-                        [A|Acc]
-                end, [], TlsVersions).
-prf_ciphers_and_expected(TlsVer, PRFs, Results) ->
-    case TlsVer of
-        TlsVer when TlsVer == sslv3 orelse TlsVer == tlsv1
-                    orelse TlsVer == 'tlsv1.1' orelse TlsVer == 'dtlsv1' ->
-            Ciphers = ssl:cipher_suites(),
-            {_, Expected} = lists:keyfind(md5sha, 1, Results),
-            [[{tls_ver, TlsVer}, {ciphers, Ciphers}, {expected, Expected}, {prf, md5sha}]];
-        TlsVer when  TlsVer == 'tlsv1.2' orelse  TlsVer == 'dtlsv1.2'->
-            lists:foldl(
-              fun(PRF, Acc) ->
-                      Ciphers = prf_get_ciphers(TlsVer, PRF),
-                      case Ciphers of
-                          [] ->
-                              ct:log("No ciphers for PRF algorithm ~p. Skipping.", [PRF]),
-                              Acc;
-                          Ciphers ->
-                              {_, Expected} = lists:keyfind(PRF, 1, Results),
-                              [[{tls_ver, TlsVer}, {ciphers, Ciphers}, {expected, Expected},
-                                {prf, PRF}] | Acc]
-                      end
-              end, [], PRFs)
-    end.
-prf_get_ciphers(_, PRF) ->
-    lists:filter(
-      fun(C) when tuple_size(C) == 4 andalso
-                  element(4, C) == PRF -> 
-              true;
-         (_) -> 
-              false
-      end, 
-      ssl:cipher_suites()).
-prf_run_test(_, TlsVer, [], _, Prf) ->
-    ct:fail({error, cipher_list_empty, TlsVer, Prf});
-prf_run_test(Config, TlsVer, Ciphers, Expected, Prf) ->
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    BaseOpts = [{active, true}, {versions, [TlsVer]}, {ciphers, Ciphers}, {protocol, tls_or_dtls(TlsVer)}],
-    ServerOpts = BaseOpts ++ proplists:get_value(server_opts, Config),
-    ClientOpts = BaseOpts ++ proplists:get_value(client_opts, Config),
-    Server = ssl_test_lib:start_server(
-               [{node, ServerNode}, {port, 0}, {from, self()},
-                {mfa, {?MODULE, prf_verify_value, [TlsVer, Expected, Prf]}},
-                {options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client(
-               [{node, ClientNode}, {port, Port},
-                {host, Hostname}, {from, self()},
-                {mfa, {?MODULE, prf_verify_value, [TlsVer, Expected, Prf]}},
-                {options, ClientOpts}]),
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-prf_verify_value(Socket, TlsVer, Expected, Algo) ->
-    Ret = ssl:prf(Socket, <<>>, <<>>, [<<>>], 16),
-    case TlsVer of
-        sslv3 ->
-            case Ret of
-                {error, undefined} -> ok;
-                _ ->
-                    {error, {expected, {error, undefined},
-                             got, Ret, tls_ver, TlsVer, prf_algorithm, Algo}}
-            end;
-        _ ->
-            case Ret of
-                {ok, Expected} -> ok;
-                {ok, Val} -> {error, {expected, Expected, got, Val, tls_ver, TlsVer,
-                                      prf_algorithm, Algo}}
-            end
-    end.
-
-send_recv_result_timeout_client(Socket) ->
-    {error, timeout} = ssl:recv(Socket, 11, 500),
-    {error, timeout} = ssl:recv(Socket, 11, 0),
-    ssl:send(Socket, "Hello world"),
-    receive
-	Msg ->
-	    io:format("Msg ~p~n",[Msg])
-    after 500 ->
-	    ok
-    end,
-    {ok, "Hello world"} = ssl:recv(Socket, 11, 500),
-    ok.
-send_recv_result_timeout_server(Socket) ->
-    ssl:send(Socket, "Hello"),
-    {ok, "Hello world"} = ssl:recv(Socket, 11),
-    ssl:send(Socket, " world"),
-    ok.
-
-recv_close(Socket) ->
-    {error, closed} = ssl:recv(Socket, 11),
-    receive
-	{_,{error,closed}} ->
-	    error_extra_close_sent_to_user_process
-    after 500 ->
-	    ok
-    end.
-
-
-send_recv_result_active_rizzo(Socket) ->
-    ssl:send(Socket, "Hello world"),
-    receive 
-	{ssl, Socket, "H"} ->
-	    receive 
-		{ssl, Socket, "ello world"} ->
-		    ok
-	    end
-    end.
-
-send_recv_result_active_no_rizzo(Socket) ->
-    ssl:send(Socket, "Hello world"),
-    receive 
-	{ssl, Socket, "Hello world"} ->
-	    ok
-    end.
-
 result_ok(_Socket) ->
     ok.
 
-renegotiate(Socket, Data) ->
-    ct:log("Renegotiating ~n", []),
-    Result = ssl:renegotiate(Socket),
-    ct:log("Result ~p~n", [Result]),
-    ssl:send(Socket, Data),
-    case Result of
-	ok ->
-	    ok;
-	Other ->
-	    Other
-    end.
-
-renegotiate_reuse_session(Socket, Data) ->
-    %% Make sure session is registered
-    ct:sleep(?SLEEP),
-    renegotiate(Socket, Data).
-
-renegotiate_immediately(Socket) ->
-    receive
-	{ssl, Socket, "Hello world"} ->
-	    ok;
-	%% Handle 1/n-1 splitting countermeasure Rizzo/Duong-Beast
-	{ssl, Socket, "H"} ->
-	    receive
-		{ssl, Socket, "ello world"} ->
-		    ok
-	    end
-    end,
-    ok = ssl:renegotiate(Socket),  
-    {error, renegotiation_rejected} = ssl:renegotiate(Socket),
-    ct:sleep(?RENEGOTIATION_DISABLE_TIME + ?SLEEP),
-    ok = ssl:renegotiate(Socket),
-    ct:log("Renegotiated again"),
-    ssl:send(Socket, "Hello world"),
-    ok.
-
-renegotiate_rejected(Socket) ->
-    receive
-	{ssl, Socket, "Hello world"} ->
-	    ok;
-	%% Handle 1/n-1 splitting countermeasure Rizzo/Duong-Beast
-	{ssl, Socket, "H"} ->
-
-	    receive
-		{ssl, Socket, "ello world"} ->
-		    ok
-	    end
-    end,
-    {error, renegotiation_rejected} = ssl:renegotiate(Socket),
-    {error, renegotiation_rejected} = ssl:renegotiate(Socket),
-    ct:sleep(?RENEGOTIATION_DISABLE_TIME +1),
-    {error, renegotiation_rejected} = ssl:renegotiate(Socket),
-    ct:log("Failed to renegotiate again"),
-    ssl:send(Socket, "Hello world"),
-    ok.
-
-rizzo_add_mitigation_option(Value, Config) ->
-    lists:foldl(fun(Opt, Acc) ->
-                    case proplists:get_value(Opt, Acc) of
-                      undefined -> Acc;
-                      C ->
-                        N = lists:keystore(beast_mitigation, 1, C,
-                                           {beast_mitigation, Value}),
-                        lists:keystore(Opt, 1, Acc, {Opt, N})
-                    end
-                end, Config,
-                [client_opts, client_dsa_opts, server_opts, server_dsa_opts,
-                 server_ecdsa_opts, server_ecdh_rsa_opts]).
-    
-new_config(PrivDir, ServerOpts0) ->
-    CaCertFile = proplists:get_value(cacertfile, ServerOpts0),
-    CertFile = proplists:get_value(certfile, ServerOpts0),
-    KeyFile = proplists:get_value(keyfile, ServerOpts0),
-    NewCaCertFile = filename:join(PrivDir, "new_ca.pem"),
-    NewCertFile = filename:join(PrivDir, "new_cert.pem"),
-    NewKeyFile = filename:join(PrivDir, "new_key.pem"),
-    file:copy(CaCertFile, NewCaCertFile),
-    file:copy(CertFile, NewCertFile),
-    file:copy(KeyFile, NewKeyFile),
-    ServerOpts1 = proplists:delete(cacertfile, ServerOpts0),
-    ServerOpts2 = proplists:delete(certfile, ServerOpts1),
-    ServerOpts = proplists:delete(keyfile, ServerOpts2),
-
-    {ok, PEM} = file:read_file(NewCaCertFile),
-    ct:log("CA file content: ~p~n", [public_key:pem_decode(PEM)]),
-
-    [{cacertfile, NewCaCertFile}, {certfile, NewCertFile},
-     {keyfile, NewKeyFile} | ServerOpts].
-
-session_cache_process(_Type,Config) when is_list(Config) ->
-    reuse_session(Config).
-
-init([Type]) ->
-    ets:new(ssl_test, [named_table, public, set]),
-    ets:insert(ssl_test, {type, Type}),
-    case Type of
-	list ->
-	    spawn(fun() -> session_loop([]) end);
-	mnesia ->
-	    mnesia:start(),
-	    {atomic,ok} = mnesia:create_table(sess_cache, []),
-	    sess_cache
-    end.
-
-session_cb() ->
-    [{type, Type}] = ets:lookup(ssl_test, type),
-    Type.
-
-terminate(Cache) ->
-    case session_cb() of
-	list ->
-	    Cache ! terminate;
-	mnesia ->
-	    catch {atomic,ok} = 
-		mnesia:delete_table(sess_cache)
-    end.
-
-lookup(Cache, Key) ->        
-    case session_cb() of
-	list ->
-	    Cache ! {self(), lookup, Key},
-	    receive {Cache, Res} -> Res end;
-	mnesia ->
-	    case mnesia:transaction(fun() -> 
-					    mnesia:read(sess_cache, 
-							Key, read) 
-				    end) of
-		{atomic, [{sess_cache, Key, Value}]} -> 
-		    Value;
-		_ -> 
-		    undefined
-	    end
-	end.
-
-update(Cache, Key, Value) ->
-    case session_cb() of
-	list ->
-	    Cache ! {update, Key, Value};
-	mnesia ->
-	    {atomic, ok} = 
-		mnesia:transaction(fun() -> 
-					   mnesia:write(sess_cache, 
-							{sess_cache, Key, Value}, write) 
-				   end)
-    end.
-
-delete(Cache, Key) -> 
-    case session_cb() of
-	list ->
-	    Cache ! {delete, Key};
-	mnesia ->
-	    {atomic, ok} = 
-		mnesia:transaction(fun() -> 
-					   mnesia:delete(sess_cache, Key) 
-				   end)
-    end.
-
-foldl(Fun, Acc, Cache) -> 
-    case session_cb() of
-	list ->
-	    Cache ! {self(),foldl,Fun,Acc},
-	    receive {Cache, Res} -> Res end;
-	mnesia ->
-	    Foldl = fun() ->
-			    mnesia:foldl(Fun, Acc, sess_cache)
-		    end,
-	    {atomic, Res} = mnesia:transaction(Foldl),
-	    Res
-    end.
-    
-select_session(Cache, PartialKey) ->
-    case session_cb() of
-	list ->
-	    Cache ! {self(),select_session, PartialKey},
-	    receive 
-		{Cache, Res} -> 
-		    Res 
-	    end;
-	mnesia ->
-	    Sel = fun() ->
-			  mnesia:select(Cache,
-					[{{sess_cache,{PartialKey,'$1'}, '$2'},
-					  [],['$$']}])
-		  end,
-	    {atomic, Res} = mnesia:transaction(Sel),
-	    Res
-    end.
-
-session_loop(Sess) ->
-    receive 
-	terminate ->
-	    ok;
-	{Pid, lookup, Key} ->
-	    case lists:keysearch(Key,1,Sess) of
-		{value, {Key,Value}} ->
-		    Pid ! {self(), Value};
-		_ -> 
-		    Pid ! {self(), undefined}
-	    end,
-	    session_loop(Sess);
-	{update, Key, Value} ->
-	    NewSess = [{Key,Value}| lists:keydelete(Key,1,Sess)],
-	    session_loop(NewSess);
-	{delete, Key} ->
-	    session_loop(lists:keydelete(Key,1,Sess));
-	{Pid,foldl,Fun,Acc} ->
-	    Res = lists:foldl(Fun, Acc,Sess),
-	    Pid ! {self(), Res},
-	    session_loop(Sess);
-	{Pid,select_session,PKey} ->
-	    Sel = fun({{PKey0, Id},Session}, Acc) when PKey == PKey0 -> 
-			  [[Id, Session]|Acc];
-		     (_,Acc) -> 
-			  Acc
-		  end, 
-	    Sessions = lists:foldl(Sel, [], Sess),
-	    Pid ! {self(), Sessions},
-	    session_loop(Sess)
-    end.
-	    
-
-erlang_ssl_receive(Socket, Data) ->
-    receive
-	{ssl, Socket, Data} ->
-	    io:format("Received ~p~n",[Data]),
-	    ok;
-	{ssl, Socket, Byte} when length(Byte) == 1 ->  %% Handle 1/n-1 splitting countermeasure Rizzo/Duong-Beast
-	    io:format("Received ~p~n",[Byte]),
-	    erlang_ssl_receive(Socket, tl(Data));
-	Other ->
-	    ct:fail({unexpected_message, Other})
-    after timer:seconds(?SEC_RENEGOTIATION_TIMEOUT) * test_server:timetrap_scale_factor() ->
-	    ct:fail({did_not_get, Data})
-    end.
-
-receive_msg(_) ->
-    receive
-	Msg ->
-	   Msg
-    end.
-
-controlling_process_result(Socket, Pid, Msg) ->
-    ok = ssl:controlling_process(Socket, Pid),
-    %% Make sure other side has evaluated controlling_process
-    %% before message is sent
-    ct:sleep(?SLEEP),
-    ssl:send(Socket, Msg),
-    no_result_msg.
-
-receive_s_rizzo_duong_beast() ->
-    receive
-	{ssl, _, "erver hello"} ->
-	    receive
-		{ssl, _, "C"} ->
-		    receive
-			{ssl, _, "lient hello"} ->
-			    ok
-		    end
-	    end
-    end.
-receive_c_rizzo_duong_beast() ->
-    receive
-	{ssl, _, "lient hello"} ->
-	    receive
-		{ssl, _, "S"} ->
-		    receive
-			{ssl, _, "erver hello"} ->
-			    ok
-		    end
-	    end
-    end.
-
-controller_dies_result(_Socket, _Pid, _Msg) ->
-    receive Result -> Result end.
-
-get_close(Pid, Where) ->
-    receive
-	{'EXIT', Pid, _Reason} ->
-	    receive
-		{_, {ssl_closed, Socket}} ->
-		    ct:log("Socket closed ~p~n",[Socket]);
-		Unexpected ->
-		    ct:log("Unexpected ~p~n",[Unexpected]),
-		    ct:fail({line, ?LINE-1})
-	    after 5000 ->
-		    ct:fail({timeout, {line, ?LINE, Where}})
-	    end;
-	Unexpected ->
-	    ct:log("Unexpected ~p~n",[Unexpected]),
-	    ct:fail({line, ?LINE-1})
-    after 5000 ->
-	    ct:fail({timeout, {line, ?LINE, Where}})
-    end.
-
-run_send_recv_rizzo(Ciphers, Config, Version, Mfa) ->
-    Result =  lists:map(fun(Cipher) ->
-				rizzo_test(Cipher, Config, Version, Mfa) end,
-			Ciphers),
-    case lists:flatten(Result) of
-	[] ->
-	    ok;
-	Error ->
-	    ct:log("Cipher suite errors: ~p~n", [Error]),
-	    ct:fail(cipher_suite_failed_see_test_case_log)
-    end.
-
-rizzo_test(Cipher, Config, Version, Mfa) ->
-   {ClientOpts, ServerOpts} = client_server_opts(Cipher, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-					{from, self()},
-			   {mfa, Mfa},
-			   {options, [{active, true}, {ciphers, [Cipher]},
-				       {versions, [Version]}
-				      | ServerOpts]}]),
-    Port  = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
-					{host, Hostname},
-			   {from, self()},
-			   {mfa, Mfa},
-			   {options, [{active, true}, {ciphers, [Cipher]}| ClientOpts]}]),
-
-    Result = ssl_test_lib:check_result(Server, ok, Client, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client),
-    case Result of
-	ok ->
-	    [];
-	Error ->
-	    [{Cipher, Error}]
-    end.
-
-client_server_opts(#{key_exchange := KeyAlgo}, Config)
-  when KeyAlgo == rsa orelse
-       KeyAlgo == dhe_rsa orelse
-       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(#{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(#{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(#{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) ->
-    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),
-                 [{ciphers, Ciphers} |
-                  ssl_test_lib:ssl_options(server_verification_opts, Config)]};
-	    dsa ->
-		{ssl_test_lib:ssl_options(client_verification_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),
-		 [{ciphers, Ciphers} |
-                  ssl_test_lib:ssl_options([], Config)]};
-	    psk ->
-		{ssl_test_lib:ssl_options(client_psk, Config),
-                 [{ciphers, Ciphers} | 
-                  ssl_test_lib:ssl_options(server_psk, Config)]};
-	    psk_with_hint ->
-		{ssl_test_lib:ssl_options(client_psk, Config),
-		 [{ciphers, Ciphers} |
-                  ssl_test_lib:ssl_options(server_psk_hint, Config)
-                 ]};
-	    psk_anon ->
-		{ssl_test_lib:ssl_options(client_psk, Config),
-                 [{ciphers, Ciphers} |
-                  ssl_test_lib:ssl_options(server_psk_anon, Config)]};
-	    psk_anon_with_hint ->
-		{ssl_test_lib:ssl_options(client_psk, Config),
-                 [{ciphers, Ciphers} |
-		 ssl_test_lib:ssl_options(server_psk_anon_hint, Config)]};
-	    srp ->
-		{ssl_test_lib:ssl_options(client_srp, Config),
-		 ssl_test_lib:ssl_options(server_srp, Config)};
-	    srp_anon ->
-		{ssl_test_lib:ssl_options(client_srp, Config),
-		 ssl_test_lib:ssl_options(server_srp_anon, Config)};
-	    srp_dsa ->
-		{ssl_test_lib:ssl_options(client_srp_dsa, Config),
-		 ssl_test_lib:ssl_options(server_srp_dsa, Config)};
-	    ecdsa ->
-		{ssl_test_lib:ssl_options(client_verification_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)};
-	    rc4_rsa ->
-		{ssl_test_lib:ssl_options(client_verification_opts, Config),
-		 [{ciphers, Ciphers} |
-		  ssl_test_lib:ssl_options(server_verification_opts, Config)]};
-	    rc4_ecdh_rsa ->
-		{ssl_test_lib:ssl_options(client_verification_opts, Config),
-		 [{ciphers, Ciphers} |
-		  ssl_test_lib:ssl_options(server_ecdh_rsa_opts, Config)]};
-	    rc4_ecdsa ->
-		{ssl_test_lib:ssl_options(client_verification_opts, Config),
-		 [{ciphers, Ciphers} |
-		  ssl_test_lib:ssl_options(server_ecdsa_opts, Config)]};
-	    des_dhe_rsa ->
-		{ssl_test_lib:ssl_options(client_verification_opts, Config),
-		 [{ciphers, Ciphers} |
-		  ssl_test_lib:ssl_options(server_verification_opts, Config)]};
-	    des_rsa ->
-		{ssl_test_lib:ssl_options(client_verification_opts, Config),
-		 [{ciphers, Ciphers} |
-		  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,
-    Suites = ssl_test_lib:filter_suites(Ciphers, Version),
-    ct:pal("ssl_test_lib:filter_suites(~p ~p) -> ~p ", [Ciphers, Version, Suites]),
-    Results0 =  lists:map(fun(Cipher) ->
-                                 cipher(Cipher, Version, Config, ClientOpts, ServerOpts) end,
-                         ssl_test_lib:filter_suites(Ciphers, Version)),
-    Results = lists:flatten(Results0),
-    true = length(Results) == length(Suites),
-    check_cipher_result(Results).
-
-check_cipher_result([]) ->
-    ok;
-check_cipher_result([ok | Rest]) ->
-    check_cipher_result(Rest);
-check_cipher_result([_ |_] = Error) ->
-    ct:fail(Error).
-    
-erlang_cipher_suite(Suite) when is_list(Suite)->
-    ssl_cipher_format:suite_definition(ssl_cipher_format:openssl_suite(Suite));
-erlang_cipher_suite(Suite) ->
-    Suite.
-
-cipher(CipherSuite, Version, Config, ClientOpts, ServerOpts) ->
-    %% process_flag(trap_exit, true),
-    ct:log("Testing CipherSuite ~p~n", [CipherSuite]),
-    ct:log("Server Opts ~p~n", [ServerOpts]),
-    ct:log("Client Opts ~p~n", [ClientOpts]),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-    ErlangCipherSuite = erlang_cipher_suite(CipherSuite),
-
-    ConnectionInfo = {ok, {Version, ErlangCipherSuite}},
-
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-					{from, self()},
-			   {mfa, {ssl_test_lib, cipher_result, [ConnectionInfo]}},
-			   {options, ServerOpts}]),
-    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, cipher_result, [ConnectionInfo]}},
-					{options,
-					 [{ciphers,[CipherSuite]} |
-					  ClientOpts]}]),
-
-    Result = ssl_test_lib:wait_for_result(Server, ok, Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client),
-
-    case Result of
-	ok ->
-	    [ok];
-	Error ->
-	    [{ErlangCipherSuite, Error}]
-    end.
-
-connection_information_result(Socket) ->
-    {ok, Info = [_ | _]} = ssl:connection_information(Socket),
-    case  length(Info) > 3 of
-	true -> 
-	    %% Atleast one ssl_option() is set
-	    ct:log("Info ~p", [Info]),
-	    ok;
-	false ->
-	    ct:fail(no_ssl_options_returned)
-    end.
-
-connection_info_result(Socket) ->
-    {ok, Info} = ssl:connection_information(Socket, [protocol, selected_cipher_suite]),
-    {ok, {proplists:get_value(protocol, Info), proplists:get_value(selected_cipher_suite, Info)}}.
 
 protocol_info_result(Socket) ->
     {ok, [{protocol, PVersion}]} = ssl:connection_information(Socket, [protocol]),
@@ -5162,11 +475,7 @@ version_info_result(Socket) ->
     {ok, [{version, Version}]} = ssl:connection_information(Socket, [version]),
     {ok, Version}.
 
-secret_connection_info_result(Socket) ->
-    {ok, [{client_random, ClientRand}, {server_random, ServerRand}, {master_secret, MasterSecret}]} 
-        = ssl:connection_information(Socket, [client_random, server_random, master_secret]),
-    is_binary(ClientRand) andalso is_binary(ServerRand) andalso is_binary(MasterSecret). 
-    
+  
 connect_dist_s(S) ->
     Msg = term_to_binary({erlang,term}),
     ok = ssl:send(S, Msg).
@@ -5176,83 +485,11 @@ connect_dist_c(S) ->
     {ok, Test} = ssl:recv(S, 0, 10000),
     ok.
 
-tls_downgrade_result(Socket) ->
-    ok = ssl_test_lib:send_recv_result(Socket),
-    case ssl:close(Socket, {self(), 10000})  of
-	{ok, TCPSocket} -> 
-	    inet:setopts(TCPSocket, [{active, true}]),
-	    gen_tcp:send(TCPSocket, "Downgraded"),
-	    receive 
-		{tcp, TCPSocket, <<"Downgraded">>} ->
-		    ok;
-		{tcp_closed, TCPSocket} ->
-		    ct:pal("Peer timed out, downgrade aborted"),
-		    ok;
-		Other ->
-		   {error, Other}
-	    end;
-	{error, timeout} ->
-	    ct:pal("Timed out, downgrade aborted"),
-	    ok;
-	Fail ->
-	    {error, Fail}
-    end.
-
-tls_close(Socket) ->
-    ok = ssl_test_lib:send_recv_result(Socket),
-    case ssl:close(Socket, 5000) of
-        ok ->
-            ok;
-        {error, closed} ->
-            ok;
-        Other ->
-            ct:fail(Other)
-    end.
-
- %% First two clauses handles 1/n-1 splitting countermeasure Rizzo/Duong-Beast
-treashold(N, {3,0}) ->
-    (N div 2) + 1;
-treashold(N, {3,1}) ->
-    (N div 2) + 1;
-treashold(N, _) ->
-    N + 1.
-
-get_invalid_inet_option(Socket) ->
-    {error, {options, {socket_options, foo, _}}} = ssl:getopts(Socket, [foo]),
-    ok.
-
-tls_shutdown_result(Socket, server) ->
-    ssl:send(Socket, "Hej"),
-    ok = ssl:shutdown(Socket, write),
-    {ok, "Hej hopp"} = ssl:recv(Socket, 8),
-    ok;
-
-tls_shutdown_result(Socket, client) ->
-    ssl:send(Socket, "Hej hopp"),
-    ok = ssl:shutdown(Socket, write),
-    {ok, "Hej"} = ssl:recv(Socket, 3),
-    ok.
-
-tls_shutdown_write_result(Socket, server) ->
-    ct:sleep(?SLEEP),
-    ssl:shutdown(Socket, write);
-tls_shutdown_write_result(Socket, client) ->
-    ssl:recv(Socket, 0).
-
 dummy(_Socket) ->
     %% Should not happen as the ssl connection will not be established
     %% due to fatal handshake failiure
     exit(kill).
 
-tls_shutdown_both_result(Socket, server) ->
-    ct:sleep(?SLEEP),
-    ssl:shutdown(Socket, read_write);
-tls_shutdown_both_result(Socket, client) ->
-    ssl:recv(Socket, 0).
-
-peername_result(S) ->
-    ssl:peername(S).
-
 version_option_test(Config, Version) ->
     ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
     ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
@@ -5278,22 +515,3 @@ version_option_test(Config, Version) ->
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 
-try_recv_active(Socket) ->
-    ssl:send(Socket, "Hello world"),
-    {error, einval} = ssl:recv(Socket, 11),
-    ok.
-try_recv_active_once(Socket) ->
-    {error, einval} = ssl:recv(Socket, 11),
-    ok.
-
-    
-wait_for_send(Socket) ->
-    %% Make sure TLS process processed send message event
-    _ = ssl:connection_information(Socket).
-
-tls_or_dtls('dtlsv1') ->
-    dtls;
-tls_or_dtls('dtlsv1.2') ->
-    dtls;
-tls_or_dtls(_) ->
-    tls.
diff --git a/lib/ssl/test/ssl_bench.spec b/lib/ssl/test/ssl_bench.spec
index 8b746c5ca9..217cc6fc83 100644
--- a/lib/ssl/test/ssl_bench.spec
+++ b/lib/ssl/test/ssl_bench.spec
@@ -1 +1,2 @@
 {suites,"../ssl_test",[ssl_bench_SUITE, ssl_dist_bench_SUITE]}.
+{skip_groups,"../ssl_test",ssl_bench_SUITE,basic,"Benchmarks run separately"}.
diff --git a/lib/ssl/test/ssl_bench_SUITE.erl b/lib/ssl/test/ssl_bench_SUITE.erl
index 13097b08b6..a297539c36 100644
--- a/lib/ssl/test/ssl_bench_SUITE.erl
+++ b/lib/ssl/test/ssl_bench_SUITE.erl
@@ -25,10 +25,11 @@
 
 suite() -> [{ct_hooks,[{ts_install_cth,[{nodenames,2}]}]}].
 
-all() -> [{group, setup}, {group, payload}, {group, pem_cache}].
+all() -> [{group, basic}, {group, setup}, {group, payload}, {group, pem_cache}].
 
 groups() ->
-    [{setup, [{repeat, 3}], [setup_sequential, setup_concurrent]},
+    [{basic, [], [basic_pem_cache]},
+     {setup, [{repeat, 3}], [setup_sequential, setup_concurrent]},
      {payload, [{repeat, 3}], [payload_simple]},
      {pem_cache, [{repeat, 3}], [use_pem_cache, bypass_pem_cache]}
     ].
@@ -40,6 +41,7 @@ end_per_group(_GroupName, _Config) ->
     ok.
 
 init_per_suite(Config) ->
+    ct:timetrap({minutes, 1}),
     case node() of
         nonode@nohost ->
             {skipped, "Node not distributed"};
@@ -51,29 +53,21 @@ init_per_suite(Config) ->
 end_per_suite(_Config) ->
     ok.
 
-init_per_testcase(use_pem_cache, Conf) ->
+init_per_testcase(TC, Conf) when TC =:= use_pem_cache;
+                                 TC =:= bypass_pem_cache;
+                                 TC =:= basic_pem_cache ->
     case bypass_pem_cache_supported() of
         false -> {skipped, "PEM cache bypass support required"};
         true ->
             application:set_env(ssl, bypass_pem_cache, false),
             Conf
     end;
-init_per_testcase(bypass_pem_cache, Conf) ->
-    case bypass_pem_cache_supported() of
-        false -> {skipped, "PEM cache bypass support required"};
-        true ->
-            application:set_env(ssl, bypass_pem_cache, true),
-            Conf
-    end;
 init_per_testcase(_Func, Conf) ->
     Conf.
 
-end_per_testcase(use_pem_cache, _Config) ->
-    case bypass_pem_cache_supported() of
-        false -> ok;
-        true -> application:set_env(ssl, bypass_pem_cache, false)
-    end;
-end_per_testcase(bypass_pem_cache, _Config) ->
+end_per_testcase(TC, _Config) when TC =:= use_pem_cache;
+                                   TC =:= bypass_pem_cache;
+                                   TC =:= basic_pem_cache ->
     case bypass_pem_cache_supported() of
         false -> ok;
         true -> application:set_env(ssl, bypass_pem_cache, false)
@@ -119,6 +113,9 @@ payload_simple(Config) ->
 				 {suite, "ssl"}, {name, "Payload simple"}]}),
     ok.
 
+basic_pem_cache(_Config) ->
+    do_test(ssl, pem_cache, 10, 5, node()).
+
 use_pem_cache(_Config) ->
     {ok, Result} = do_test(ssl, pem_cache, 100, 500, node()),
     ct_event:notify(#event{name = benchmark_data,
@@ -167,7 +164,7 @@ do_test(Type, TC, Loop, ParallellConnections, Server) ->
 		   end
 	   end,
     Spawn = fun(Id) ->
-		    Pid = spawn(fun() -> Test(Id) end),
+		    Pid = spawn_link(fun() -> Test(Id) end),
 		    receive {Pid, init} -> Pid end
 	    end,
     Pids = [Spawn(Id) || Id <- lists:seq(ParallellConnections, 1, -1)],
@@ -177,49 +174,54 @@ do_test(Type, TC, Loop, ParallellConnections, Server) ->
 	   end,
     {TimeInMicro, _} = timer:tc(Run),
     TotalTests = ParallellConnections * Loop,
-    TestPerSecond = 1000000 * TotalTests div TimeInMicro,
+    TestPerSecond = case TimeInMicro of
+                        0 ->
+                            undefined;
+                        _ -> 
+                            1000000 * TotalTests div TimeInMicro
+                    end,
     io:format("TC ~p ~p ~p ~p 1/s~n", [TC, Type, ParallellConnections, TestPerSecond]),
     unlink(SPid),
     SPid ! quit,
     {ok, TestPerSecond}.
 
 server_init(ssl, setup_connection, _, _, Server) ->
-    {ok, Socket} = ssl:listen(0, ssl_opts(listen)),
-    {ok, {_Host, Port}} = ssl:sockname(Socket),
+    {ok, LSocket} = ssl:listen(0, ssl_opts(listen)),
+    {ok, {_Host, Port}} = ssl:sockname(LSocket),
     {ok, Host} = inet:gethostname(),
     ?FPROF_SERVER andalso start_profile(fprof, [whereis(ssl_manager), new]),
     %%?EPROF_SERVER andalso start_profile(eprof, [ssl_connection_sup, ssl_manager]),
     ?EPROF_SERVER andalso start_profile(eprof, [ssl_manager]),
     Server ! {self(), {init, Host, Port}},
     Test = fun(TSocket) ->
-		   ok = ssl:ssl_accept(TSocket),
-		   ssl:close(TSocket)
+		   {ok, Socket} = ssl:handshake(TSocket),
+		   ssl:close(Socket)
 	   end,
-    setup_server_connection(Socket, Test);
+    setup_server_connection(LSocket, Test);
 server_init(ssl, payload, Loop, _, Server) ->
-    {ok, Socket} = ssl:listen(0, ssl_opts(listen)),
-    {ok, {_Host, Port}} = ssl:sockname(Socket),
+    {ok, LSocket} = ssl:listen(0, ssl_opts(listen)),
+    {ok, {_Host, Port}} = ssl:sockname(LSocket),
     {ok, Host} = inet:gethostname(),
     Server ! {self(), {init, Host, Port}},
     Test = fun(TSocket) ->
-		   ok = ssl:ssl_accept(TSocket),
+		   {ok, Socket} = ssl:handshake(TSocket),
 		   Size = byte_size(msg()),
-		   server_echo(TSocket, Size, Loop),
-		   ssl:close(TSocket)
+		   server_echo(Socket, Size, Loop),
+		   ssl:close(Socket)
 	   end,
-    setup_server_connection(Socket, Test);
+    setup_server_connection(LSocket, Test);
 server_init(ssl, pem_cache, Loop, _, Server) ->
-    {ok, Socket} = ssl:listen(0, ssl_opts(listen_der)),
-    {ok, {_Host, Port}} = ssl:sockname(Socket),
+    {ok, LSocket} = ssl:listen(0, ssl_opts(listen_der)),
+    {ok, {_Host, Port}} = ssl:sockname(LSocket),
     {ok, Host} = inet:gethostname(),
     Server ! {self(), {init, Host, Port}},
     Test = fun(TSocket) ->
-		   ok = ssl:ssl_accept(TSocket),
+		   {ok, Socket} = ssl:handshake(TSocket),
 		   Size = byte_size(msg()),
-		   server_echo(TSocket, Size, Loop),
-		   ssl:close(TSocket)
+		   server_echo(Socket, Size, Loop),
+		   ssl:close(Socket)
 	   end,
-    setup_server_connection(Socket, Test);
+    setup_server_connection(LSocket, Test);
 
 server_init(Type, Tc, _, _, Server) ->
     io:format("No server init code for ~p ~p~n",[Type, Tc]),
diff --git a/lib/ssl/test/ssl_cert_SUITE.erl b/lib/ssl/test/ssl_cert_SUITE.erl
new file mode 100644
index 0000000000..fb1695f38a
--- /dev/null
+++ b/lib/ssl/test/ssl_cert_SUITE.erl
@@ -0,0 +1,563 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019-2019. 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_cert_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() ->
+    [
+     {group, 'tlsv1.3'},
+     {group, 'tlsv1.2'},
+     {group, 'tlsv1.1'},
+     {group, 'tlsv1'},
+     {group, 'sslv3'},
+     {group, 'dtlsv1.2'},
+     {group, 'dtlsv1'}
+    ].
+
+groups() ->
+    [
+     {'tlsv1.3', [], tls_1_3_protocol_groups()}, 
+     {'tlsv1.2', [], pre_tls_1_3_protocol_groups()},
+     {'tlsv1.1', [], pre_tls_1_3_protocol_groups()},
+     {'tlsv1', [], pre_tls_1_3_protocol_groups()},
+     {'sslv3', [], ssl_protocol_groups()},
+     {'dtlsv1.2', [], pre_tls_1_3_protocol_groups()},
+     {'dtlsv1', [], pre_tls_1_3_protocol_groups()},
+     {rsa, [], all_version_tests()},
+     {ecdsa, [], all_version_tests()},
+     {dsa, [], all_version_tests()},
+     {rsa_1_3, [], all_version_tests() ++ tls_1_3_tests() ++ [unsupported_sign_algo_client_auth,
+                                                              unsupported_sign_algo_cert_client_auth]},
+     {ecdsa_1_3, [], all_version_tests() ++ tls_1_3_tests()}
+    ].
+
+ssl_protocol_groups() ->
+    [{group, rsa},
+     {group, dsa}].
+
+pre_tls_1_3_protocol_groups() ->
+    [{group, rsa},
+     {group, ecdsa},
+     {group, dsa}].
+
+tls_1_3_protocol_groups() ->
+    [{group, rsa_1_3},
+     {group, ecdsa_1_3}].
+
+tls_1_3_tests() ->
+    [
+     hello_retry_request,
+     custom_groups,
+     hello_retry_client_auth,
+     hello_retry_client_auth_empty_cert_accepted,
+     hello_retry_client_auth_empty_cert_rejected
+    ].
+
+all_version_tests() ->
+    [
+     no_auth,
+     auth,
+     client_auth_empty_cert_accepted,
+     client_auth_empty_cert_rejected,
+     client_auth_partial_chain,
+     client_auth_allow_partial_chain,
+     client_auth_do_not_allow_partial_chain,
+     client_auth_partial_chain_fun_fail,
+     missing_root_cert_no_auth,
+     missing_root_cert_auth,
+     missing_root_cert_auth_user_verify_fun_accept,
+     missing_root_cert_auth_user_verify_fun_reject,
+     verify_fun_always_run_client,
+     verify_fun_always_run_server,
+     incomplete_chain_auth
+     %%invalid_signature_client
+    ].
+
+init_per_suite(Config) ->
+    catch crypto:stop(),
+    try crypto:start() of
+	ok ->
+	    ssl_test_lib:clean_start(),
+            Config
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:unload(ssl),
+    application:stop(crypto).
+
+init_per_group(Group, Config0) when Group == rsa;
+                                    Group == rsa_1_3 ->
+    Config = ssl_test_lib:make_rsa_cert(Config0),
+    COpts = proplists:get_value(client_rsa_opts, Config),
+    SOpts = proplists:get_value(server_rsa_opts, Config),
+    [{cert_key_alg, rsa} |
+     lists:delete(cert_key_alg,                                 
+                  [{client_cert_opts, COpts}, 
+                   {server_cert_opts, SOpts} | 
+                   lists:delete(server_cert_opts, 
+                                lists:delete(client_cert_opts, Config))])];
+init_per_group(Group, Config0) when Group == ecdsa;
+                                    Group == ecdsa_1_3 ->
+
+    PKAlg = crypto:supports(public_keys),
+    case lists:member(ecdsa, PKAlg) andalso (lists:member(ecdh, PKAlg) orelse lists:member(dh, PKAlg)) of
+        true ->
+            Config = ssl_test_lib:make_ecdsa_cert(Config0),
+            COpts = proplists:get_value(client_ecdsa_opts, Config),
+            SOpts = proplists:get_value(server_ecdsa_opts, Config),
+            [{cert_key_alg, ecdsa} |
+             lists:delete(cert_key_alg,
+                          [{client_cert_opts, COpts}, 
+                           {server_cert_opts, SOpts} | 
+                           lists:delete(server_cert_opts, 
+                                        lists:delete(client_cert_opts, Config))]
+                         )];
+        false ->
+            {skip, "Missing EC crypto support"}
+    end;
+
+init_per_group(Group, Config0) when Group == dsa ->
+    PKAlg = crypto:supports(public_keys),
+    case lists:member(dss, PKAlg) andalso lists:member(dh, PKAlg) of
+        true ->
+            Config = ssl_test_lib:make_dsa_cert(Config0),    
+            COpts = proplists:get_value(client_dsa_opts, Config),
+            SOpts = proplists:get_value(server_dsa_opts, Config),
+            [{cert_key_alg, dsa} |
+             lists:delete(cert_key_alg,
+                          [{client_cert_opts, COpts}, 
+                           {server_cert_opts, SOpts} | 
+                           lists:delete(server_cert_opts, 
+                                        lists:delete(client_cert_opts, Config))])];
+        false ->
+            {skip, "Missing DSS crypto support"}
+    end;    
+init_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+	true ->
+	    case ssl_test_lib:sufficient_crypto_support(GroupName) of
+		true ->
+		    [{client_type, erlang},
+                     {server_type, erlang}, {version, GroupName} 
+                     | ssl_test_lib:init_tls_version(GroupName, Config)];
+		false ->
+		    {skip, "Missing crypto support"}
+	    end;
+	_ ->
+	    ssl:start(),
+	    Config
+    end.
+
+end_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+        true ->
+            ssl_test_lib:clean_tls_version(Config);
+        false ->
+            Config
+    end.
+
+init_per_testcase(_TestCase, Config) ->
+    ssl_test_lib:ct_log_supported_protocol_versions(Config),
+    ct:timetrap({seconds, 10}),
+    Config.
+
+end_per_testcase(_TestCase, Config) ->     
+    Config.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+no_auth() ->
+     ssl_cert_tests:no_auth().
+
+no_auth(Config) ->
+      ssl_cert_tests:no_auth(Config).
+%%--------------------------------------------------------------------
+auth() ->
+    ssl_cert_tests:auth().
+auth(Config) ->
+    ssl_cert_tests:auth(Config).
+%%--------------------------------------------------------------------
+client_auth_empty_cert_accepted() ->
+    ssl_cert_tests:client_auth_empty_cert_accepted().
+client_auth_empty_cert_accepted(Config) ->
+    ssl_cert_tests:client_auth_empty_cert_accepted(Config).
+%%--------------------------------------------------------------------
+client_auth_empty_cert_rejected() ->
+    ssl_cert_tests:client_auth_empty_cert_rejected().
+client_auth_empty_cert_rejected(Config) ->
+    ssl_cert_tests:client_auth_empty_cert_rejected(Config).
+%%--------------------------------------------------------------------
+client_auth_partial_chain() ->
+    ssl_cert_tests:client_auth_partial_chain().
+client_auth_partial_chain(Config) when is_list(Config) ->
+    ssl_cert_tests:client_auth_partial_chain(Config).
+
+%%--------------------------------------------------------------------
+client_auth_allow_partial_chain() ->
+    ssl_cert_tests:client_auth_allow_partial_chain().
+client_auth_allow_partial_chain(Config) when is_list(Config) ->
+    ssl_cert_tests:client_auth_allow_partial_chain(Config).
+%%--------------------------------------------------------------------
+client_auth_do_not_allow_partial_chain() ->
+   ssl_cert_tests:client_auth_do_not_allow_partial_chain().
+client_auth_do_not_allow_partial_chain(Config) when is_list(Config) ->
+    ssl_cert_tests:client_auth_do_not_allow_partial_chain(Config).
+
+%%--------------------------------------------------------------------
+client_auth_partial_chain_fun_fail() ->
+   ssl_cert_tests:client_auth_partial_chain_fun_fail().
+client_auth_partial_chain_fun_fail(Config) when is_list(Config) ->
+    ssl_cert_tests:client_auth_partial_chain_fun_fail(Config).
+
+%%--------------------------------------------------------------------
+missing_root_cert_no_auth() ->
+   ssl_cert_tests:missing_root_cert_no_auth().
+missing_root_cert_no_auth(Config) when is_list(Config) ->
+    ssl_cert_tests:missing_root_cert_no_auth(Config).
+
+%%--------------------------------------------------------------------
+missing_root_cert_auth() ->
+    [{doc,"Must have ROOT certs to be able to verify verify peer"}].
+missing_root_cert_auth(Config) when is_list(Config) ->
+    ServerOpts =  proplists:delete(cacertfile, ssl_test_lib:ssl_options(server_cert_opts, Config)),
+    {ClientNode, ServerNode, _} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
+					      {from, self()},
+					      {options, [{verify, verify_peer}
+							 | ServerOpts]}]),
+
+    ssl_test_lib:check_result(Server, {error, {options, {cacertfile, ""}}}),
+    
+    ClientOpts =  proplists:delete(cacertfile, ssl_test_lib:ssl_options(client_cert_opts, Config)),
+    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, 0},
+					      {from, self()},
+					      {options, [{verify, verify_peer}
+							 | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Client, {error, {options, {cacertfile, ""}}}).
+    
+%%--------------------------------------------------------------------
+missing_root_cert_auth_user_verify_fun_accept() ->
+    [{doc, "Test that the client succeds if the ROOT CA is unknown in verify_peer mode"
+     " with a verify_fun that accepts the unknown CA error"}].
+
+missing_root_cert_auth_user_verify_fun_accept(Config) ->
+    ServerOpts = ssl_test_lib:ssl_options(server_cert_opts, Config),
+    FunAndState =  {fun(_,{bad_cert, unknown_ca}, UserState) ->
+			    {valid, UserState};
+		       (_,{bad_cert, _} = Reason, _) ->
+			    {fail, Reason};
+		       (_,{extension, _}, UserState) ->
+			    {unknown, UserState};
+		       (_, valid, UserState) ->
+			    {valid, UserState};
+		       (_, valid_peer, UserState) ->
+			    {valid, UserState}
+		    end, []},
+    ClientOpts = ssl_test_lib:ssl_options([{verify, verify_peer},
+                                            {verify_fun, FunAndState}], Config),
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+
+%%--------------------------------------------------------------------
+missing_root_cert_auth_user_backwardscompatibility_verify_fun_accept() ->
+    [{doc, "Test old style verify fun"}].
+
+missing_root_cert_auth_user_backwardscompatibility_verify_fun_accept(Config) ->
+    ServerOpts = ssl_test_lib:ssl_options(server_cert_opts, Config),
+    AcceptBadCa = fun({bad_cert,unknown_ca}, Acc) ->  Acc;
+                     (Other, Acc) -> [Other | Acc]
+		  end,
+    VerifyFun =
+	fun(ErrorList) ->
+		case lists:foldl(AcceptBadCa, [], ErrorList) of
+		    [] ->    true;
+		    [_|_] -> false
+		end
+	end,
+    
+    ClientOpts = ssl_test_lib:ssl_options([{verify, verify_peer},
+                                           {verify_fun, VerifyFun}], Config),
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+
+%%--------------------------------------------------------------------
+missing_root_cert_auth_user_verify_fun_reject() ->
+    [{doc, "Test that the client fails if the ROOT CA is unknown in verify_peer mode"
+     " with a verify_fun that rejects the unknown CA error"}].
+
+missing_root_cert_auth_user_verify_fun_reject(Config) ->
+    ServerOpts = ssl_test_lib:ssl_options(server_cert_opts, Config),
+    FunAndState =  {fun(_,{bad_cert, unknown_ca} = Reason, _UserState) ->
+			    {fail, Reason};
+		       (_,{bad_cert, _} = Reason, _) ->
+			    {fail, Reason};
+		       (_,{extension, UserState}, _) ->
+			    {unknown, UserState};
+		       (_, valid, UserState) ->
+			    {valid, UserState};
+		       (_, valid_peer, UserState) ->
+			    {valid, UserState}
+		    end, []},
+    ClientOpts =  ssl_test_lib:ssl_options([{verify, verify_peer},
+                                            {verify_fun, FunAndState}], Config),
+    ssl_test_lib:basic_alert(ClientOpts, ServerOpts, Config, unknown_ca).
+%%--------------------------------------------------------------------
+incomplete_chain_auth() ->
+    [{doc,"Test that we can verify an incompleat chain when we have the certs to rebuild it"}].
+incomplete_chain_auth(Config) when is_list(Config) ->
+    DefaultCertConf = ssl_test_lib:default_cert_chain_conf(),
+    #{client_config := ClientOpts0,
+      server_config := ServerOpts0} = ssl_test_lib:make_cert_chains_der(proplists:get_value(cert_key_alg, Config),
+                                                                        [{server_chain, DefaultCertConf},
+                                                                         {client_chain, DefaultCertConf}]),   
+    [ServerRoot| _] = ServerCas = proplists:get_value(cacerts, ServerOpts0),
+    ClientCas = proplists:get_value(cacerts, ClientOpts0),
+    ClientOpts = ssl_test_lib:ssl_options([{verify, verify_peer},
+                                            {cacerts,  ServerCas ++ ClientCas} | 
+                                            proplists:delete(cacerts, ClientOpts0)], Config),
+    ServerOpts = ssl_test_lib:ssl_options([{verify, verify_peer},
+                                           {cacerts, [ServerRoot]} |  
+                                           proplists:delete(cacerts, ServerOpts0)], Config),
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+
+%%--------------------------------------------------------------------
+verify_fun_always_run_client() ->
+    [{doc,"Verify that user verify_fun is always run (for valid and valid_peer not only unknown_extension)"}].
+
+verify_fun_always_run_client(Config) when is_list(Config) ->
+    ClientOpts =  ssl_test_lib:ssl_options(client_cert_opts, Config),
+    ServerOpts =  ssl_test_lib:ssl_options(server_cert_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
+					      {from, self()},
+					      {mfa, {ssl_test_lib,
+						     no_result, []}},
+					      {options, ServerOpts}]),
+    Port  = ssl_test_lib:inet_port(Server),
+
+    %% If user verify fun is called correctly we fail the connection.
+    %% otherwise we cannot tell this case apart form where we miss
+    %% to call users verify fun
+    FunAndState =  {fun(_,{extension, _}, UserState) ->
+			    {unknown, UserState};
+		       (_, valid, [ChainLen]) ->
+			    {valid, [ChainLen + 1]};
+		       (_, valid_peer, [1]) ->
+			    {fail, "verify_fun_was_always_run"};
+		       (_, valid_peer, UserState) ->
+			    {valid, UserState}
+		    end, [0]},
+
+    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
+					      {host, Hostname},
+					      {from, self()},
+					      {mfa, {ssl_test_lib,
+						     no_result, []}},
+					      {options,
+					       [{verify, verify_peer},
+						{verify_fun, FunAndState}
+						| ClientOpts]}]),
+
+    ssl_test_lib:check_client_alert(Server, Client, handshake_failure).
+
+%%--------------------------------------------------------------------
+verify_fun_always_run_server() ->
+    [{doc,"Verify that user verify_fun is always run (for valid and valid_peer not only unknown_extension)"}].
+verify_fun_always_run_server(Config) when is_list(Config) ->
+    ClientOpts =  ssl_test_lib:ssl_options(client_cert_opts, Config),
+    ServerOpts =  ssl_test_lib:ssl_options(server_cert_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    %% If user verify fun is called correctly we fail the connection.
+    %% otherwise we cannot tell this case apart form where we miss
+    %% to call users verify fun
+    FunAndState =  {fun(_,{extension, _}, UserState) ->
+			    {unknown, UserState};
+		       (_, valid, [ChainLen]) ->
+			    {valid, [ChainLen + 1]};
+		       (_, valid_peer, [1]) ->
+			    {fail, "verify_fun_was_always_run"};
+		       (_, valid_peer, UserState) ->
+			    {valid, UserState}
+		    end, [0]},
+
+    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
+					      {from, self()},
+					      {mfa, {ssl_test_lib,
+						     no_result, []}},
+					      {options,
+					       [{verify, verify_peer},
+						{verify_fun, FunAndState} |
+						ServerOpts]}]),
+    Port  = ssl_test_lib:inet_port(Server),
+
+    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
+					      {host, Hostname},
+					      {from, self()},
+					      {mfa, {ssl_test_lib,
+						     no_result, []}},
+					      {options, ClientOpts}]),
+    
+    ssl_test_lib:check_client_alert(Server, Client, handshake_failure).
+
+%%--------------------------------------------------------------------
+invalid_signature_client() ->
+    ssl_cert_tests:invalid_signature_client().
+invalid_signature_client(Config) when is_list(Config) ->
+    ssl_cert_tests:invalid_signature_client(Config).
+%%--------------------------------------------------------------------
+invalid_signature_server() ->
+    ssl_cert_tests:invalid_signature_client().
+invalid_signature_server(Config) when is_list(Config) ->
+    ssl_cert_tests:invalid_signature_client(Config).
+
+%%--------------------------------------------------------------------
+%% TLS 1.3 Test cases  -----------------------------------------------
+%%--------------------------------------------------------------------
+hello_retry_request() ->
+    [{doc,"Test that ssl server can request a new group when the client's first key share"
+      "is not supported"}].
+
+hello_retry_request(Config) ->
+    ClientOpts0 = ssl_test_lib:ssl_options(client_cert_opts, Config),
+    ServerOpts0 = ssl_test_lib:ssl_options(server_cert_opts, Config),
+    ServerOpts = [{versions, ['tlsv1.2','tlsv1.3']},
+                  {supported_groups, [x448, x25519]}|ServerOpts0],
+    ClientOpts = [{versions, ['tlsv1.2','tlsv1.3']},
+                  {supported_groups, [secp256r1, x25519]}|ClientOpts0],
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+%%--------------------------------------------------------------------
+custom_groups() ->
+    [{doc,"Test that ssl server can select a common group for key-exchange"}].
+
+custom_groups(Config) ->
+    ClientOpts0 = ssl_test_lib:ssl_options(client_cert_opts, Config),
+    ServerOpts0 = ssl_test_lib:ssl_options(server_cert_opts, Config),
+
+    %% Set versions
+    ServerOpts = [{versions, ['tlsv1.2','tlsv1.3']},
+                  {supported_groups, [x448, secp256r1, secp384r1]}|ServerOpts0],
+    ClientOpts1 = [{versions, ['tlsv1.2','tlsv1.3']}|ClientOpts0],
+    ClientOpts = [{supported_groups,[secp384r1, secp256r1, x25519]}|ClientOpts1],
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+
+%%--------------------------------------------------------------------
+%% Triggers a Server Alert as ssl client does not have a certificate with a
+%% signature algorithm supported by the server (signature_algorithms_cert extension
+%% of CertificateRequest does not contain the algorithm of the client certificate).
+%% ssl client sends an empty certificate.
+unsupported_sign_algo_cert_client_auth() ->
+     [{doc,"TLS 1.3: Test client authentication with unsupported signature_algorithm_cert"}].
+
+unsupported_sign_algo_cert_client_auth(Config) ->
+    ClientOpts0 = ssl_test_lib:ssl_options(client_cert_opts, Config),
+    ServerOpts0 = ssl_test_lib:ssl_options(server_cert_opts, Config),
+    ServerOpts = [{versions, ['tlsv1.2','tlsv1.3']},
+                  {verify, verify_peer},
+                  {signature_algs, [rsa_pkcs1_sha256, rsa_pkcs1_sha384, rsa_pss_rsae_sha256]},
+                  %% Skip rsa_pkcs1_sha256!
+                  {signature_algs_cert, [rsa_pkcs1_sha384, rsa_pkcs1_sha512]},
+                  {fail_if_no_peer_cert, true}|ServerOpts0],
+    ClientOpts = [{versions, ['tlsv1.2','tlsv1.3']}|ClientOpts0],
+    ssl_test_lib:basic_alert(ClientOpts, ServerOpts, Config, certificate_required).
+
+%%--------------------------------------------------------------------
+unsupported_sign_algo_client_auth() ->
+     [{doc,"TLS 1.3: Test client authentication with unsupported signature_algorithm"}].
+
+unsupported_sign_algo_client_auth(Config) ->
+    ClientOpts0 = ssl_test_lib:ssl_options(client_cert_opts, Config),
+    ServerOpts0 = ssl_test_lib:ssl_options(server_cert_opts, Config),
+    ServerOpts = [{versions, ['tlsv1.2','tlsv1.3']},
+                  {verify, verify_peer},
+                  %% Skip rsa_pkcs1_sha256!
+                  {signature_algs, [rsa_pkcs1_sha384, rsa_pkcs1_sha512]},
+                  {fail_if_no_peer_cert, true}|ServerOpts0],
+    ClientOpts = [{versions, ['tlsv1.2','tlsv1.3']}|ClientOpts0],
+    ssl_test_lib:basic_alert(ClientOpts, ServerOpts, Config, insufficient_security).
+%%--------------------------------------------------------------------
+hello_retry_client_auth() ->
+    [{doc, "TLS 1.3 (HelloRetryRequest): Test client authentication."}].
+
+hello_retry_client_auth(Config) ->
+    ClientOpts0 = ssl_test_lib:ssl_options(client_cert_opts, Config),
+    ServerOpts0 = ssl_test_lib:ssl_options(server_cert_opts, Config),
+    ServerOpts1 = [{versions, ['tlsv1.2','tlsv1.3']},
+                  {supported_groups, [x448, x25519]}|ServerOpts0],
+    ClientOpts = [{versions, ['tlsv1.2','tlsv1.3']},
+                  {supported_groups, [secp256r1, x25519]}|ClientOpts0],
+    ServerOpts = [{verify, verify_peer},
+                  {fail_if_no_peer_cert, true} | ServerOpts1],
+    
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+%%--------------------------------------------------------------------
+hello_retry_client_auth_empty_cert_accepted() ->
+     [{doc,"TLS 1.3 (HelloRetryRequest): Test client authentication when client sends an empty " 
+       "certificate and fail_if_no_peer_cert is set to true."}].
+
+hello_retry_client_auth_empty_cert_accepted(Config) ->
+    ClientOpts0 = ssl_test_lib:ssl_options(client_cert_opts, Config),
+    %% Delete Client Cert and Key
+    ClientOpts1 = proplists:delete(certfile, ClientOpts0),
+    ClientOpts2 = proplists:delete(keyfile, ClientOpts1),
+
+    ServerOpts0 = ssl_test_lib:ssl_options(server_cert_opts, Config),
+    %% Set versions
+    ServerOpts = [{versions, ['tlsv1.2','tlsv1.3']},
+                  {verify, verify_peer},
+                  {fail_if_no_peer_cert, false},
+                  {supported_groups, [x448, x25519]}|ServerOpts0],
+    ClientOpts = [{versions, ['tlsv1.2','tlsv1.3']},
+                  {supported_groups, [secp256r1, x25519]}|ClientOpts2],
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+%%--------------------------------------------------------------------
+hello_retry_client_auth_empty_cert_rejected() ->
+     [{doc,"TLS 1.3 (HelloRetryRequest): Test client authentication when client "
+       "sends an empty certificate and fail_if_no_peer_cert is set to true."}].
+
+hello_retry_client_auth_empty_cert_rejected(Config) ->
+    ClientOpts0 = ssl_test_lib:ssl_options(client_cert_opts, Config),
+    %% Delete Client Cert and Key
+    ClientOpts1 = proplists:delete(certfile, ClientOpts0),
+    ClientOpts2 = proplists:delete(keyfile, ClientOpts1),
+
+    ServerOpts0 = ssl_test_lib:ssl_options(server_cert_opts, Config),
+    %% Set versions
+    ServerOpts = [{versions, ['tlsv1.2','tlsv1.3']},
+                  {verify, verify_peer},
+                  {fail_if_no_peer_cert, true},
+                  {supported_groups, [x448, x25519]}|ServerOpts0],
+    ClientOpts = [{versions, ['tlsv1.2','tlsv1.3']},
+                  {supported_groups, [secp256r1, x25519]}|ClientOpts2],
+   
+    ssl_test_lib:basic_alert(ClientOpts, ServerOpts, Config, certificate_required).
diff --git a/lib/ssl/test/ssl_cert_tests.erl b/lib/ssl/test/ssl_cert_tests.erl
new file mode 100644
index 0000000000..c88daa2185
--- /dev/null
+++ b/lib/ssl/test/ssl_cert_tests.erl
@@ -0,0 +1,386 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019-2019. 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_cert_tests).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include_lib("public_key/include/public_key.hrl").
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+no_auth() ->
+     [{doc,"Test connection without authentication"}].
+
+no_auth(Config) ->
+    ClientOpts = [{verify, verify_none} | ssl_test_lib:ssl_options(client_cert_opts, Config)],
+    ServerOpts =  [{verify, verify_none} | ssl_test_lib:ssl_options(server_cert_opts, Config)],
+    
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+%%--------------------------------------------------------------------
+auth() ->
+     [{doc,"Test connection with mutual authentication"}].
+
+auth(Config) ->
+    ClientOpts = [{verify, verify_peer} | ssl_test_lib:ssl_options(client_cert_opts, Config)],
+    ServerOpts =  [{verify, verify_peer} | ssl_test_lib:ssl_options(server_cert_opts, Config)],
+    
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+
+%%--------------------------------------------------------------------
+client_auth_empty_cert_accepted() ->
+    [{doc,"Test client authentication when client sends an empty certificate and " 
+      "fail_if_no_peer_cert is set to false."}].
+
+client_auth_empty_cert_accepted(Config) ->
+    ClientOpts = proplists:delete(keyfile,
+                                  proplists:delete(certfile, 
+                                                   ssl_test_lib:ssl_options(client_cert_opts, Config))),
+    ServerOpts0 = ssl_test_lib:ssl_options(server_cert_opts, Config),
+    ServerOpts = [{verify, verify_peer},
+                  {fail_if_no_peer_cert, false} | ServerOpts0],
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+%%--------------------------------------------------------------------
+client_auth_empty_cert_rejected() ->
+     [{doc,"Test client authentication when client sends an empty certificate and " 
+       "fail_if_no_peer_cert is set to true."}].
+
+client_auth_empty_cert_rejected(Config) ->
+    ServerOpts = [{verify, verify_peer}, {fail_if_no_peer_cert, true}
+		  | ssl_test_lib:ssl_options(server_cert_opts, Config)],
+    ClientOpts0 = ssl_test_lib:ssl_options([], Config),
+    %% Delete Client Cert and Key
+    ClientOpts1 = proplists:delete(certfile, ClientOpts0),
+    ClientOpts = proplists:delete(keyfile, ClientOpts1),
+    
+    Version = proplists:get_value(version,Config),
+    case Version of
+        'tlsv1.3' ->
+            ssl_test_lib:basic_alert(ClientOpts, ServerOpts, Config, certificate_required);
+        _ ->
+            ssl_test_lib:basic_alert(ClientOpts, ServerOpts, Config, handshake_failure)
+    end.
+%%--------------------------------------------------------------------
+client_auth_partial_chain() ->
+    [{doc, "Client sends an incompleate chain, by default not acceptable."}].
+
+client_auth_partial_chain(Config) when is_list(Config) ->
+    ServerOpts = [{verify, verify_peer}, {fail_if_no_peer_cert, true}
+		  | ssl_test_lib:ssl_options(server_cert_opts, Config)],
+    ClientOpts0 = ssl_test_lib:ssl_options(client_cert_opts, Config),
+    {ok, ClientCAs} = file:read_file(proplists:get_value(cacertfile, ClientOpts0)),
+    [{_,RootCA,_} | _] = public_key:pem_decode(ClientCAs),
+    ClientOpts =  [{cacerts, [RootCA]} |
+                   proplists:delete(cacertfile, ClientOpts0)],
+    ssl_test_lib:basic_alert(ClientOpts, ServerOpts, Config, unknown_ca).
+    
+%%--------------------------------------------------------------------
+client_auth_allow_partial_chain() ->
+    [{doc, "Server trusts intermediat CA and accepts a partial chain. (partial_chain option)"}].
+
+client_auth_allow_partial_chain(Config) when is_list(Config) ->
+    ServerOpts0 = [{verify, verify_peer}, {fail_if_no_peer_cert, true}
+		  | ssl_test_lib:ssl_options(server_cert_opts, Config)],
+    ClientOpts = ssl_test_lib:ssl_options(client_cert_opts, Config),
+    {ok, ClientCAs} = file:read_file(proplists:get_value(cacertfile, ClientOpts)),
+    [{_,_,_}, {_, IntermidiateCA, _} | _] = public_key:pem_decode(ClientCAs),
+
+    PartialChain =  fun(CertChain) ->
+			    case lists:member(IntermidiateCA, CertChain) of
+				true ->
+				    {trusted_ca, IntermidiateCA};
+				false ->
+				    unknown_ca
+			    end
+		    end,
+    ServerOpts = [{cacerts, [IntermidiateCA]},
+                  {partial_chain, PartialChain} |
+                  proplists:delete(cacertfile, ServerOpts0)],
+
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+
+ %%--------------------------------------------------------------------
+client_auth_do_not_allow_partial_chain() ->
+    [{doc, "Server does not accept the chain sent by the client as ROOT CA is unkown, "
+      "and we do not choose to trust the intermediate CA. (partial_chain option)"}].
+
+client_auth_do_not_allow_partial_chain(Config) when is_list(Config) ->
+    ServerOpts0 = [{verify, verify_peer}, {fail_if_no_peer_cert, true}
+		  | ssl_test_lib:ssl_options(server_cert_opts, Config)],
+    ClientOpts = ssl_test_lib:ssl_options(client_cert_opts, Config),
+    {ok, ServerCAs} = file:read_file(proplists:get_value(cacertfile, ServerOpts0)),
+    [{_,_,_}, {_, IntermidiateCA, _} | _] = public_key:pem_decode(ServerCAs),
+
+    PartialChain =  fun(_CertChain) ->
+			    unknown_ca
+		    end,
+    ServerOpts = [{cacerts, [IntermidiateCA]},
+                  {partial_chain, PartialChain} |
+                  proplists:delete(cacertfile, ServerOpts0)],
+    ssl_test_lib:basic_alert(ClientOpts, ServerOpts, Config, unknown_ca).
+    
+ %%--------------------------------------------------------------------
+client_auth_partial_chain_fun_fail() ->
+    [{doc, "If parial_chain fun crashes, treat it as if it returned unkown_ca"}].
+
+client_auth_partial_chain_fun_fail(Config) when is_list(Config) ->
+    ServerOpts0 = [{verify, verify_peer}, {fail_if_no_peer_cert, true}
+                   | ssl_test_lib:ssl_options(server_cert_opts, Config)],
+    ClientOpts = ssl_test_lib:ssl_options(client_cert_opts, Config),
+
+    {ok, ServerCAs} = file:read_file(proplists:get_value(cacertfile, ServerOpts0)),
+    [{_,_,_}, {_, IntermidiateCA, _} | _] = public_key:pem_decode(ServerCAs),
+
+    PartialChain =  fun(_CertChain) ->
+                            true = false %% crash on purpose
+		    end,
+    ServerOpts = [{cacerts, [IntermidiateCA]},
+                  {partial_chain, PartialChain} |
+                  proplists:delete(cacertfile, ServerOpts0)],
+    
+    ssl_test_lib:basic_alert(ClientOpts, ServerOpts, Config, unknown_ca).
+
+%%--------------------------------------------------------------------
+missing_root_cert_no_auth() ->
+     [{doc,"Test that the client succeds if the ROOT CA is unknown in verify_none mode"}].
+
+missing_root_cert_no_auth(Config) ->
+    ClientOpts = [{verify, verify_none} | ssl_test_lib:ssl_options(client_cert_opts, Config)],
+    ServerOpts =  [{verify, verify_none} | ssl_test_lib:ssl_options(server_cert_opts, Config)],
+    
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+
+%%--------------------------------------------------------------------
+invalid_signature_client() ->
+    [{doc,"Test server with invalid signature"}].
+
+invalid_signature_client(Config) when is_list(Config) ->
+    ClientOpts0 = ssl_test_lib:ssl_options(client_cert_opts, Config),
+    ServerOpts0 = ssl_test_lib:ssl_options(server_cert_opts, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
+
+    KeyFile =  proplists:get_value(keyfile, ClientOpts0),
+    [KeyEntry] = ssl_test_lib:pem_to_der(KeyFile),
+    Key = ssl_test_lib:public_key(public_key:pem_entry_decode(KeyEntry)),
+
+    ClientCertFile = proplists:get_value(certfile, ClientOpts0),
+    NewClientCertFile = filename:join(PrivDir, "client_invalid_cert.pem"),
+    [{'Certificate', ClientDerCert, _}] = ssl_test_lib:pem_to_der(ClientCertFile),
+    ClientOTPCert = public_key:pkix_decode_cert(ClientDerCert, otp),
+    ClientOTPTbsCert = ClientOTPCert#'OTPCertificate'.tbsCertificate,
+    NewClientDerCert = public_key:pkix_sign(ClientOTPTbsCert, Key),
+    ssl_test_lib:der_to_pem(NewClientCertFile, [{'Certificate', NewClientDerCert, not_encrypted}]),
+    ClientOpts = [{certfile, NewClientCertFile} | proplists:delete(certfile, ClientOpts0)],
+    ServerOpts = [{verify, verify_peer} | ServerOpts0],
+    ssl_test_lib:basic_alert(ClientOpts, ServerOpts, Config, unknown_ca).
+
+%%--------------------------------------------------------------------
+invalid_signature_server() ->
+    [{doc,"Test client with invalid signature"}].
+
+invalid_signature_server(Config) when is_list(Config) ->
+    ClientOpts0 = ssl_test_lib:ssl_options(client_cert_opts, Config),
+    ServerOpts0 = ssl_test_lib:ssl_options(server_cert_opts, Config),
+    PrivDir = proplists:get_value(priv_dir, Config),
+
+    KeyFile =  proplists:get_value(keyfile, ServerOpts0),
+    [KeyEntry] = ssl_test_lib:pem_to_der(KeyFile),
+    Key = ssl_test_lib:public_key(public_key:pem_entry_decode(KeyEntry)),
+
+    ServerCertFile = proplists:get_value(certfile, ServerOpts0),
+    NewServerCertFile = filename:join(PrivDir, "server_invalid_cert.pem"),
+    [{'Certificate', ServerDerCert, _}] = ssl_test_lib:pem_to_der(ServerCertFile),
+    ServerOTPCert = public_key:pkix_decode_cert(ServerDerCert, otp),
+    ServerOTPTbsCert = ServerOTPCert#'OTPCertificate'.tbsCertificate,
+    NewServerDerCert = public_key:pkix_sign(ServerOTPTbsCert, Key),
+    ssl_test_lib:der_to_pem(NewServerCertFile, [{'Certificate', NewServerDerCert, not_encrypted}]),
+    ServerOpts = [{certfile, NewServerCertFile} | proplists:delete(certfile, ServerOpts0)],
+    ClientOpts = [{verify, verify_peer} | ClientOpts0],
+    ssl_test_lib:basic_alert(ClientOpts, ServerOpts, Config, unknown_ca).
+   
+%%--------------------------------------------------------------------
+%% TLS 1.3 Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+hello_retry_request() ->
+    [{doc,"Test that ssl server can request a new group when the client's first key share"
+      "is not supported"}].
+
+hello_retry_request(Config) ->
+    ClientOpts0 = ssl_test_lib:ssl_options(client_cert_opts, Config),
+    ServerOpts0 = ssl_test_lib:ssl_options(server_cert_opts, Config),
+    
+    {ServerOpts, ClientOpts} = group_config(Config,                                           
+                                            [{versions, ['tlsv1.2','tlsv1.3']} | ServerOpts0],
+                                            [{versions, ['tlsv1.2','tlsv1.3']} | ClientOpts0]), 
+
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+%%--------------------------------------------------------------------
+custom_groups() ->
+    [{doc,"Test that ssl server can select a common group for key-exchange"}].
+
+custom_groups(Config) ->
+    ClientOpts0 = ssl_test_lib:ssl_options(client_cert_opts, Config),
+    ServerOpts0 = ssl_test_lib:ssl_options(server_cert_opts, Config),
+
+    {ServerOpts, ClientOpts} = group_config_custom(Config,
+                                                   [{versions, ['tlsv1.2','tlsv1.3']} | ServerOpts0],
+                                                   [{versions, ['tlsv1.2','tlsv1.3']} | ClientOpts0]),
+    
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+
+%%--------------------------------------------------------------------
+%% Triggers a Server Alert as ssl client does not have a certificate with a
+%% signature algorithm supported by the server (signature_algorithms_cert extension
+%% of CertificateRequest does not contain the algorithm of the client certificate).
+%% ssl client sends an empty certificate.
+unsupported_sign_algo_cert_client_auth() ->
+     [{doc,"TLS 1.3: Test client authentication with unsupported signature_algorithm_cert"}].
+
+unsupported_sign_algo_cert_client_auth(Config) ->
+    ClientOpts0 = ssl_test_lib:ssl_options(client_cert_opts, Config),
+    ServerOpts0 = ssl_test_lib:ssl_options(server_cert_opts, Config),
+    ServerOpts = [{versions, ['tlsv1.2','tlsv1.3']},
+                  {verify, verify_peer},
+                  {signature_algs, [rsa_pkcs1_sha256, rsa_pkcs1_sha384, rsa_pss_rsae_sha256]},
+                  %% Skip rsa_pkcs1_sha256!
+                  {signature_algs_cert, [rsa_pkcs1_sha384, rsa_pkcs1_sha512]},
+                  {fail_if_no_peer_cert, true}|ServerOpts0],
+    ClientOpts = [{versions, ['tlsv1.2','tlsv1.3']}|ClientOpts0],
+    ssl_test_lib:basic_alert(ClientOpts, ServerOpts, Config, certificate_required).
+%%--------------------------------------------------------------------
+unsupported_sign_algo_client_auth() ->
+     [{doc,"TLS 1.3: Test client authentication with unsupported signature_algorithm"}].
+
+unsupported_sign_algo_client_auth(Config) ->
+    ClientOpts0 = ssl_test_lib:ssl_options(client_cert_opts, Config),
+    ServerOpts0 = ssl_test_lib:ssl_options(server_cert_opts, Config),
+    ServerOpts = [{versions, ['tlsv1.2','tlsv1.3']},
+                  {verify, verify_peer},
+                  %% Skip rsa_pkcs1_sha256!
+                  {signature_algs, [rsa_pkcs1_sha384, rsa_pkcs1_sha512]},
+                  {fail_if_no_peer_cert, true}|ServerOpts0],
+    ClientOpts = [{versions, ['tlsv1.2','tlsv1.3']}|ClientOpts0],
+    ssl_test_lib:basic_alert(ClientOpts, ServerOpts, Config, insufficient_security).
+%%--------------------------------------------------------------------
+hello_retry_client_auth() ->
+    [{doc, "TLS 1.3 (HelloRetryRequest): Test client authentication."}].
+
+hello_retry_client_auth(Config) ->
+    ClientOpts0 = ssl_test_lib:ssl_options(client_cert_opts, Config),
+    ServerOpts0 = ssl_test_lib:ssl_options(server_cert_opts, Config),
+   
+    {ServerOpts, ClientOpts} = group_config(Config,                                           
+                                            [{versions, ['tlsv1.2','tlsv1.3']},
+                                             {verify, verify_peer},
+                                             {fail_if_no_peer_cert, true} | ServerOpts0],
+                                            [{versions, ['tlsv1.2','tlsv1.3']}, {verify, verify_peer} | ClientOpts0]), 
+    
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+%%--------------------------------------------------------------------
+hello_retry_client_auth_empty_cert_accepted() ->
+     [{doc,"TLS 1.3 (HelloRetryRequest): Test client authentication when client sends an empty " 
+       "certificate and fail_if_no_peer_cert is set to false."}].
+
+hello_retry_client_auth_empty_cert_accepted(Config) ->
+    ClientOpts0 = proplists:delete(keyfile,
+                                   proplists:delete(certfile, 
+                                                    ssl_test_lib:ssl_options(client_cert_opts, Config))),
+    ServerOpts0 = ssl_test_lib:ssl_options(server_cert_opts, Config),
+
+    {ServerOpts, ClientOpts} = group_config(Config,                                           
+                                            [{versions, ['tlsv1.2','tlsv1.3']},
+                                             {verify, verify_peer},
+                                             {fail_if_no_peer_cert, false} | ServerOpts0],
+                                            [{versions, ['tlsv1.2','tlsv1.3']}, {verify, verify_peer} | ClientOpts0]), 
+            
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+%%--------------------------------------------------------------------
+hello_retry_client_auth_empty_cert_rejected() ->
+     [{doc,"TLS 1.3 (HelloRetryRequest): Test client authentication when client "
+       "sends an empty certificate and fail_if_no_peer_cert is set to true."}].
+
+hello_retry_client_auth_empty_cert_rejected(Config) ->
+    ClientOpts0 = proplists:delete(keyfile,
+                                   proplists:delete(certfile, 
+                                                    ssl_test_lib:ssl_options(client_cert_opts, Config))),
+    ServerOpts0 = ssl_test_lib:ssl_options(server_cert_opts, Config),
+    
+    {ServerOpts, ClientOpts} = group_config(Config,                                           
+                                            [{versions, ['tlsv1.2','tlsv1.3']},
+                                             {verify, verify_peer},
+                                             {fail_if_no_peer_cert, true} | ServerOpts0],
+                                            [{versions, ['tlsv1.2','tlsv1.3']}, {verify, verify_peer} | ClientOpts0]), 
+       
+    ssl_test_lib:basic_alert(ClientOpts, ServerOpts, Config, certificate_required).
+
+
+%%--------------------------------------------------------------------
+%% Internal functions  -----------------------------------------------
+%%--------------------------------------------------------------------
+
+group_config_custom(Config, ServerOpts, ClientOpts) ->
+        case proplists:get_value(client_type, Config) of
+            erlang ->
+                {[{groups,"X448:P-256:P-384"} | ServerOpts],
+                 [{supported_groups, [secp384r1, secp256r1, x25519]} | ClientOpts]};
+            openssl ->
+                {[{supported_groups, [x448, secp256r1, secp384r1]} | ServerOpts],
+                 [{groups,"P-384:P-256:X25519"} | ClientOpts]}
+        end.
+
+group_config(Config, ServerOpts, ClientOpts) ->
+        case proplists:get_value(client_type, Config) of
+            erlang ->
+                {[{groups,"X448:X25519"} | ServerOpts],
+                 [{supported_groups, [secp256r1, x25519]} | ClientOpts]};
+            openssl ->
+                {[{supported_groups, [x448, x25519]} | ServerOpts],
+                 [{groups,"P-256:X25519"} | ClientOpts]}
+        end.
+
+test_ciphers(_, 'tlsv1.3' = Version) ->
+    Ciphers = ssl:cipher_suites(default, Version),
+    ct:log("Version ~p Testing  ~p~n", [Version, Ciphers]),
+    OpenSSLCiphers = openssl_ciphers(),
+    ct:log("OpenSSLCiphers ~p~n", [OpenSSLCiphers]),
+    lists:filter(fun(C) ->
+                         ct:log("Cipher ~p~n", [C]),
+                         lists:member(ssl_cipher_format:suite_map_to_openssl_str(C), OpenSSLCiphers)
+                 end, Ciphers);
+test_ciphers(Kex, Version) ->
+    Ciphers = ssl:filter_cipher_suites(ssl:cipher_suites(default, Version), 
+                                       [{key_exchange, Kex}]),
+    ct:log("Version ~p Testing  ~p~n", [Version, Ciphers]),
+    OpenSSLCiphers = openssl_ciphers(),
+    ct:log("OpenSSLCiphers ~p~n", [OpenSSLCiphers]),
+    lists:filter(fun(C) ->
+                         ct:log("Cipher ~p~n", [C]),
+                         lists:member(ssl_cipher_format:suite_map_to_openssl_str(C), OpenSSLCiphers)
+                 end, Ciphers).
+
+
+
+openssl_ciphers() ->
+    Str = os:cmd("openssl ciphers"),
+    string:split(string:strip(Str, right, $\n), ":", all).
diff --git a/lib/ssl/test/ssl_certificate_verify_SUITE.erl b/lib/ssl/test/ssl_certificate_verify_SUITE.erl
index 588ca153a9..f38858e0bf 100644
--- a/lib/ssl/test/ssl_certificate_verify_SUITE.erl
+++ b/lib/ssl/test/ssl_certificate_verify_SUITE.erl
@@ -40,6 +40,7 @@
 %%--------------------------------------------------------------------
 all() ->
     [
+     {group, 'tlsv1.3'},
      {group, 'tlsv1.2'},
      {group, 'tlsv1.1'},
      {group, 'tlsv1'},
@@ -50,6 +51,7 @@ all() ->
 
 groups() ->
     [
+     {'tlsv1.3', [], all_protocol_groups()},
      {'tlsv1.2', [], all_protocol_groups()},
      {'tlsv1.1', [], all_protocol_groups()},
      {'tlsv1', [], all_protocol_groups()},
@@ -69,36 +71,20 @@ all_protocol_groups() ->
      {group, error_handling}].
 
 tests() ->
-    [verify_peer,
-     verify_none,
-     server_require_peer_cert_ok,
-     server_require_peer_cert_fail,
-     server_require_peer_cert_empty_ok,
-     server_require_peer_cert_partial_chain,
-     server_require_peer_cert_allow_partial_chain,
-     server_require_peer_cert_do_not_allow_partial_chain,
-     server_require_peer_cert_partial_chain_fun_fail,
-     verify_fun_always_run_client,
-     verify_fun_always_run_server,
-     cert_expired,
-     invalid_signature_client,
-     invalid_signature_server,
+    [cert_expired,
+     %invalid_signature_client,
+     %%invalid_signature_server,
      extended_key_usage_verify_both,
      extended_key_usage_verify_server,
      critical_extension_verify_client,
      critical_extension_verify_server,
      critical_extension_verify_none,
-     customize_hostname_check,
-     incomplete_chain
+     long_chain
     ].
 
 error_handling_tests()->
     [client_with_cert_cipher_suites_handshake,
-     server_verify_no_cacerts,
-     unknown_server_ca_fail,
-     unknown_server_ca_accept_verify_none,
-     unknown_server_ca_accept_verify_peer,
-     unknown_server_ca_accept_backwardscompatibility,
+     %%unknown_server_ca_accept_backwardscompatibility,
      no_authority_key_identifier,
      no_authority_key_identifier_keyEncipherment].
 
@@ -147,6 +133,7 @@ init_per_testcase(_TestCase, Config) ->
     ssl:stop(),
     ssl:start(),
     ssl_test_lib:ct_log_supported_protocol_versions(Config),
+    ct:pal(" ~p", [ dtls_record:supported_protocol_versions()]),
     ct:timetrap({seconds, 10}),
     Config.
 
@@ -156,61 +143,6 @@ end_per_testcase(_TestCase, Config) ->
 %%--------------------------------------------------------------------
 %% Test Cases --------------------------------------------------------
 %%--------------------------------------------------------------------
-
-verify_peer() ->
-    [{doc,"Test option verify_peer"}].
-verify_peer(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
-    Active = proplists:get_value(active, Config),
-    ReceiveFunction =  proplists:get_value(receive_function, 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, ReceiveFunction, []}},
-                                        {options, [{active, Active}, {verify, verify_peer}
-                                                   | ServerOpts]}]),
-    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, ReceiveFunction, []}},
-                                        {options, [{active, Active}, {verify, verify_peer} | ClientOpts]}]),
-    
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-verify_none() ->
-    [{doc,"Test option verify_none"}].
-
-verify_none(Config) when is_list(Config) ->
-    ClientOpts =  ssl_test_lib:ssl_options(client_rsa_opts, Config),
-    ServerOpts =  ssl_test_lib:ssl_options(server_rsa_opts, Config),
-    Active = proplists:get_value(active, Config),
-    ReceiveFunction =  proplists:get_value(receive_function, 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, ReceiveFunction, []}},
-                                        {options, [{active, Active}, {verify, verify_none}
-                                                   | ServerOpts]}]),
-    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, ReceiveFunction, []}},
-                                        {options, [{active, Active}, 
-                                                   {verify, verify_none} | ClientOpts]}]),
-
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-
 server_verify_client_once() ->
     [{doc,"Test server option verify_client_once"}].
 
@@ -249,350 +181,6 @@ server_verify_client_once(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-server_require_peer_cert_ok() ->
-    [{doc,"Test server option fail_if_no_peer_cert when peer sends cert"}].
-
-server_require_peer_cert_ok(Config) when is_list(Config) ->
-    ServerOpts = [{verify, verify_peer}, {fail_if_no_peer_cert, true}
-		  | ssl_test_lib:ssl_options(server_rsa_opts, Config)],
-    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
-    Active = proplists:get_value(active, Config),
-    ReceiveFunction =  proplists:get_value(receive_function, 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, ReceiveFunction, []}},
-			   {options, [{active, Active} | ServerOpts]}]),
-    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, ReceiveFunction, []}},
-			   {options, [{active, Active} | ClientOpts]}]),
-
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-
-server_require_peer_cert_fail() ->
-    [{doc,"Test server option fail_if_no_peer_cert when peer doesn't send cert"}].
-
-server_require_peer_cert_fail(Config) when is_list(Config) ->
-    ServerOpts = [{verify, verify_peer}, {fail_if_no_peer_cert, true}
-		  | ssl_test_lib:ssl_options(server_rsa_opts, Config)],
-    BadClientOpts = ssl_test_lib:ssl_options(empty_client_opts, Config),
-    Active = proplists:get_value(active, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
-					      {from, self()},
-			   {options, [{active, Active} | ServerOpts]}]),
-
-    Port  = ssl_test_lib:inet_port(Server),
-
-    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
-					      {host, Hostname},
-					      {from, self()},
-					      {options, [{active, Active} | BadClientOpts]}]),
-    receive
-	{Server, {error, {tls_alert, "handshake failure"}}} ->
-	    receive
-		{Client, {error, {tls_alert, "handshake failure"}}} ->
-		    ok;
-		{Client, {error, closed}} ->
-		    ok
-	    end
-    end.
-
-%%--------------------------------------------------------------------
-server_require_peer_cert_empty_ok() ->
-    [{doc,"Test server option fail_if_no_peer_cert when peer sends cert"}].
-
-server_require_peer_cert_empty_ok(Config) when is_list(Config) ->
-    ServerOpts = [{verify, verify_peer}, {fail_if_no_peer_cert, false}
-		  | ssl_test_lib:ssl_options(server_rsa_opts, Config)],
-    ClientOpts0 = ssl_test_lib:ssl_options(client_rsa_opts, Config),
-    Active = proplists:get_value(active, Config),
-    ReceiveFunction =  proplists:get_value(receive_function, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-    ClientOpts = proplists:delete(keyfile, proplists:delete(certfile, ClientOpts0)),
-
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-					{from, self()},
-			   {mfa, {ssl_test_lib, ReceiveFunction, []}},
-			   {options, [{active, Active} | ServerOpts]}]),
-    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, ReceiveFunction, []}},
-			   {options, [{active, Active} | ClientOpts]}]),
-
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-
-server_require_peer_cert_partial_chain() ->
-    [{doc, "Client sends an incompleate chain, by default not acceptable."}].
-
-server_require_peer_cert_partial_chain(Config) when is_list(Config) ->
-    ServerOpts = [{verify, verify_peer}, {fail_if_no_peer_cert, true}
-		  | ssl_test_lib:ssl_options(server_rsa_opts, Config)],
-    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
-    Active = proplists:get_value(active, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-    {ok, ClientCAs} = file:read_file(proplists:get_value(cacertfile, ClientOpts)),
-    [{_,RootCA,_} | _] = public_key:pem_decode(ClientCAs),
-
-
-    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
-					      {from, self()},
-					      {mfa, {ssl_test_lib, no_result, []}},
-					      {options, [{active, Active} | ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
-					      {host, Hostname},
-					      {from, self()},
-					      {mfa, {ssl_test_lib, no_result, []}},
-					      {options, [{active, Active},
-							 {cacerts, [RootCA]} |
-							 proplists:delete(cacertfile, ClientOpts)]}]),
-    receive
-	{Server, {error, {tls_alert, "unknown ca"}}} ->
-	    receive
-		{Client, {error, {tls_alert, "unknown ca"}}} ->
-		    ok;
-		{Client, {error, closed}} ->
-		    ok
-	    end
-    end.
-%%--------------------------------------------------------------------
-server_require_peer_cert_allow_partial_chain() ->
-    [{doc, "Server trusts intermediat CA and accepts a partial chain. (partial_chain option)"}].
-
-server_require_peer_cert_allow_partial_chain(Config) when is_list(Config) ->
-    ServerOpts = [{verify, verify_peer}, {fail_if_no_peer_cert, true}
-		  | ssl_test_lib:ssl_options(server_rsa_opts, Config)],
-    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Active = proplists:get_value(active, Config),
-    ReceiveFunction =  proplists:get_value(receive_function, Config),
-
-    {ok, ClientCAs} = file:read_file(proplists:get_value(cacertfile, ClientOpts)),
-    [{_,_,_}, {_, IntermidiateCA, _} | _] = public_key:pem_decode(ClientCAs),
-
-    PartialChain =  fun(CertChain) ->
-			    case lists:member(IntermidiateCA, CertChain) of
-				true ->
-				    {trusted_ca, IntermidiateCA};
-				false ->
-				    unknown_ca
-			    end
-		    end,
-
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-					{from, self()},
-					{mfa, {ssl_test_lib, ReceiveFunction, []}},
-					{options, [{active, Active},
-						   {cacerts, [IntermidiateCA]},
-						   {partial_chain, PartialChain} |
-						   proplists:delete(cacertfile, ServerOpts)]}]),
-    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, ReceiveFunction, []}},
-					{options, [{active, Active} | ClientOpts]}]),
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
- %%--------------------------------------------------------------------
-server_require_peer_cert_do_not_allow_partial_chain() ->
-    [{doc, "Server does not accept the chain sent by the client as ROOT CA is unkown, "
-      "and we do not choose to trust the intermediate CA. (partial_chain option)"}].
-
-server_require_peer_cert_do_not_allow_partial_chain(Config) when is_list(Config) ->
-    ServerOpts = [{verify, verify_peer}, {fail_if_no_peer_cert, true}
-		  | ssl_test_lib:ssl_options(server_rsa_opts, Config)],
-    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-    {ok, ServerCAs} = file:read_file(proplists:get_value(cacertfile, ServerOpts)),
-    [{_,_,_}, {_, IntermidiateCA, _} | _] = public_key:pem_decode(ServerCAs),
-
-    PartialChain =  fun(_CertChain) ->
-			    unknown_ca
-		    end,
-
-    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
-					       {from, self()},
-					       {mfa, {ssl_test_lib, no_result, []}},
-					      {options, [{cacerts, [IntermidiateCA]},
-							 {partial_chain, PartialChain} |
-							 proplists:delete(cacertfile, ServerOpts)]}]),
-
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
-					      {host, Hostname},
-					      {from, self()},
-					      {mfa, {ssl_test_lib, no_result, []}},
-					      {options, ClientOpts}]),
-
-    receive
-	 {Server, {error, {tls_alert, "unknown ca"}}} ->
-	    receive
-		{Client, {error, {tls_alert, "unknown ca"}}} ->
-		    ok;
-		{Client, {error, closed}} ->
-		    ok
-	    end
-    end.
-
- %%--------------------------------------------------------------------
-server_require_peer_cert_partial_chain_fun_fail() ->
-    [{doc, "If parial_chain fun crashes, treat it as if it returned unkown_ca"}].
-
-server_require_peer_cert_partial_chain_fun_fail(Config) when is_list(Config) ->
-    ServerOpts = [{verify, verify_peer}, {fail_if_no_peer_cert, true}
-		  | ssl_test_lib:ssl_options(server_rsa_opts, Config)],
-    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-    {ok, ServerCAs} = file:read_file(proplists:get_value(cacertfile, ServerOpts)),
-    [{_,_,_}, {_, IntermidiateCA, _} | _] = public_key:pem_decode(ServerCAs),
-
-    PartialChain =  fun(_CertChain) ->
-                            ture = false %% crash on purpose
-		    end,
-
-    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
-					       {from, self()},
-					       {mfa, {ssl_test_lib, no_result, []}},
-					      {options, [{cacerts, [IntermidiateCA]},
-							 {partial_chain, PartialChain} |
-							 proplists:delete(cacertfile, ServerOpts)]}]),
-
-    Port = ssl_test_lib:inet_port(Server),
-    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
-					      {host, Hostname},
-					      {from, self()},
-					      {mfa, {ssl_test_lib, no_result, []}},
-					      {options, ClientOpts}]),
-
-    receive
-	 {Server, {error, {tls_alert, "unknown ca"}}} ->
-	    receive
-		{Client, {error, {tls_alert, "unknown ca"}}} ->
-		    ok;
-		{Client, {error, closed}} ->
-		    ok
-	    end
-    end.
-
-%%--------------------------------------------------------------------
-verify_fun_always_run_client() ->
-    [{doc,"Verify that user verify_fun is always run (for valid and valid_peer not only unknown_extension)"}].
-
-verify_fun_always_run_client(Config) when is_list(Config) ->
-    ClientOpts =  ssl_test_lib:ssl_options(client_rsa_opts, Config),
-    ServerOpts =  ssl_test_lib:ssl_options(server_rsa_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
-					      {from, self()},
-					      {mfa, {ssl_test_lib,
-						     no_result, []}},
-					      {options, ServerOpts}]),
-    Port  = ssl_test_lib:inet_port(Server),
-
-    %% If user verify fun is called correctly we fail the connection.
-    %% otherwise we can not tell this case apart form where we miss
-    %% to call users verify fun
-    FunAndState =  {fun(_,{extension, _}, UserState) ->
-			    {unknown, UserState};
-		       (_, valid, [ChainLen]) ->
-			    {valid, [ChainLen + 1]};
-		       (_, valid_peer, [1]) ->
-			    {fail, "verify_fun_was_always_run"};
-		       (_, valid_peer, UserState) ->
-			    {valid, UserState}
-		    end, [0]},
-
-    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
-					      {host, Hostname},
-					      {from, self()},
-					      {mfa, {ssl_test_lib,
-						     no_result, []}},
-					      {options,
-					       [{verify, verify_peer},
-						{verify_fun, FunAndState}
-						| ClientOpts]}]),
-    %% Server error may be {tls_alert,"handshake failure"} or closed depending on timing
-    %% this is not a bug it is a circumstance of how tcp works!
-    receive
-	{Server, ServerError} ->
-	    ct:log("Server Error ~p~n", [ServerError])
-    end,
-
-    ssl_test_lib:check_result(Client, {error, {tls_alert, "handshake failure"}}).
-
-%%--------------------------------------------------------------------
-verify_fun_always_run_server() ->
-    [{doc,"Verify that user verify_fun is always run (for valid and valid_peer not only unknown_extension)"}].
-verify_fun_always_run_server(Config) when is_list(Config) ->
-    ClientOpts =  ssl_test_lib:ssl_options(client_rsa_opts, Config),
-    ServerOpts =  ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-    %% If user verify fun is called correctly we fail the connection.
-    %% otherwise we can not tell this case apart form where we miss
-    %% to call users verify fun
-    FunAndState =  {fun(_,{extension, _}, UserState) ->
-			    {unknown, UserState};
-		       (_, valid, [ChainLen]) ->
-			    {valid, [ChainLen + 1]};
-		       (_, valid_peer, [1]) ->
-			    {fail, "verify_fun_was_always_run"};
-		       (_, valid_peer, UserState) ->
-			    {valid, UserState}
-		    end, [0]},
-
-    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
-					      {from, self()},
-					      {mfa, {ssl_test_lib,
-						     no_result, []}},
-					      {options,
-					       [{verify, verify_peer},
-						{verify_fun, FunAndState} |
-						ServerOpts]}]),
-    Port  = ssl_test_lib:inet_port(Server),
-
-    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
-					      {host, Hostname},
-					      {from, self()},
-					      {mfa, {ssl_test_lib,
-						     no_result, []}},
-					      {options, ClientOpts}]),
-
-    %% Client error may be {tls_alert, "handshake failure" } or closed depending on timing
-    %% this is not a bug it is a circumstance of how tcp works!
-    receive
-	{Client, ClientError} ->
-	    ct:log("Client Error ~p~n", [ClientError])
-    end,
-
-    ssl_test_lib:check_result(Server, {error, {tls_alert, "handshake failure"}}).
-
-%%--------------------------------------------------------------------
-
 cert_expired() ->
     [{doc,"Test server with expired certificate"}].
 
@@ -620,8 +208,7 @@ cert_expired(Config) when is_list(Config) ->
 					      {from, self()},
 					      {options, [{verify, verify_peer}, {active, Active}  | ClientOpts]}]),    
     
-    ssl_test_lib:check_result(Server, {error, {tls_alert, "certificate expired"}},
-                              Client, {error, {tls_alert, "certificate expired"}}).
+    ssl_test_lib:check_client_alert(Server, Client, certificate_expired).
 
 two_digits_str(N) when N < 10 ->
     lists:flatten(io_lib:format("0~p", [N]));
@@ -727,12 +314,8 @@ critical_extension_verify_server(Config) when is_list(Config) ->
                 {options, [{verify, verify_none}, {active, Active} | ClientOpts]}]),
 
     %% This certificate has a critical extension that we don't
-    %% understand.  Therefore, verification should fail.      
-
-    ssl_test_lib:check_result(Server, {error, {tls_alert, "unsupported certificate"}},
-                              Client, {error, {tls_alert, "unsupported certificate"}}),
-    
-    ssl_test_lib:close(Server).
+    %% understand.  Therefore, verification should fail.          
+    ssl_test_lib:check_server_alert(Server, Client, unsupported_certificate).
 %%--------------------------------------------------------------------
 
 critical_extension_verify_client() ->
@@ -763,12 +346,7 @@ critical_extension_verify_client(Config) when is_list(Config) ->
                 {mfa, {ssl_test_lib, ReceiveFunction, []}},
                 {options, [{verify, verify_peer}, {active, Active} | ClientOpts]}]),
 
-    %% This certificate has a critical extension that we don't
-    %% understand.  Therefore, verification should fail.
-    ssl_test_lib:check_result(Server, {error, {tls_alert, "unsupported certificate"}},
-                              Client, {error, {tls_alert, "unsupported certificate"}}),
-
-    ssl_test_lib:close(Server).
+    ssl_test_lib:check_client_alert(Server, Client, unsupported_certificate).
 
 %%--------------------------------------------------------------------
 critical_extension_verify_none() ->
@@ -908,9 +486,7 @@ invalid_signature_server(Config) when is_list(Config) ->
 					      {host, Hostname},
 					      {from, self()},
 					      {options, [{verify, verify_peer} | ClientOpts]}]),
-
-    ssl_test_lib:check_result(Server, {error, {tls_alert, "unknown ca"}},
-                              Client, {error, {tls_alert, "unknown ca"}}).
+    ssl_test_lib:check_server_alert(Server, Client, unknown_ca).
 
 %%--------------------------------------------------------------------
 
@@ -946,9 +522,7 @@ invalid_signature_client(Config) when is_list(Config) ->
 					      {from, self()},
 					      {options, NewClientOpts}]),
 
-    ssl_test_lib:check_result(Server, {error, {tls_alert, "unknown ca"}},
-                              Client, {error, {tls_alert, "unknown ca"}}).
-
+    ssl_test_lib:check_client_alert(Server, Client, unknown_ca).
 
 %%--------------------------------------------------------------------
 
@@ -988,227 +562,22 @@ client_with_cert_cipher_suites_handshake(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
-server_verify_no_cacerts() ->
-    [{doc,"Test server must have cacerts if it wants to verify client"}].
-server_verify_no_cacerts(Config) when is_list(Config) ->
-    ServerOpts =  proplists:delete(cacertfile, ssl_test_lib:ssl_options(server_rsa_opts, Config)),
-    {_, ServerNode, _} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
-					      {from, self()},
-					      {options, [{verify, verify_peer}
-							 | ServerOpts]}]),
-
-    ssl_test_lib:check_result(Server, {error, {options, {cacertfile, ""}}}).
-
-
-%%--------------------------------------------------------------------
-unknown_server_ca_fail() ->
-    [{doc,"Test that the client fails if the ca is unknown in verify_peer mode"}].
-unknown_server_ca_fail(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(empty_client_opts, Config),
-    ServerOpts =  ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
-    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
-					      {from, self()},
-					      {mfa, {ssl_test_lib,
-						     no_result, []}},
-					      {options, ServerOpts}]),
-    Port  = ssl_test_lib:inet_port(Server),
-
-    FunAndState =  {fun(_,{bad_cert, unknown_ca} = Reason, _) ->
-			    {fail, Reason};
-		       (_,{extension, _}, UserState) ->
-			    {unknown, UserState};
-		       (_, valid, UserState) ->
-			    {valid, [test_to_update_user_state | UserState]};
-		       (_, valid_peer, UserState) ->
-			    {valid, UserState}
-		    end, []},
-
-    Client = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port},
-					      {host, Hostname},
-					      {from, self()},
-					      {mfa, {ssl_test_lib,
-						     no_result, []}},
-					      {options,
-					       [{verify, verify_peer},
-						{verify_fun, FunAndState}
-						| ClientOpts]}]),
-    receive
-	{Client, {error, {tls_alert, "unknown ca"}}} ->
-	    receive
-		{Server, {error, {tls_alert, "unknown ca"}}} ->
-		    ok;
-		{Server, {error, closed}} ->
-		    ok
-	    end
-    end.
-
 
-%%--------------------------------------------------------------------
-unknown_server_ca_accept_verify_none() ->
-    [{doc,"Test that the client succeds if the ca is unknown in verify_none mode"}].
-unknown_server_ca_accept_verify_none(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(empty_client_opts, Config),
-    ServerOpts =  ssl_test_lib:ssl_options(server_rsa_verify_opts, 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, ServerOpts}]),
-    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_none}| ClientOpts]}]),
-
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-%%--------------------------------------------------------------------
-unknown_server_ca_accept_verify_peer() ->
-    [{doc, "Test that the client succeds if the ca is unknown in verify_peer mode"
-     " with a verify_fun that accepts the unknown ca error"}].
-unknown_server_ca_accept_verify_peer(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(empty_client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, 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, ServerOpts}]),
-    Port  = ssl_test_lib:inet_port(Server),
-
-    FunAndState =  {fun(_,{bad_cert, unknown_ca}, UserState) ->
-			    {valid, UserState};
-		       (_,{bad_cert, _} = Reason, _) ->
-			    {fail, Reason};
-		       (_,{extension, _}, UserState) ->
-			    {unknown, UserState};
-		       (_, valid, UserState) ->
-			    {valid, UserState};
-		       (_, valid_peer, UserState) ->
-			    {valid, UserState}
-		    end, []},
-
-    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},
-					  {verify_fun, FunAndState}| ClientOpts]}]),
-
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-unknown_server_ca_accept_backwardscompatibility() ->
-    [{doc,"Test that old style verify_funs will work"}].
-unknown_server_ca_accept_backwardscompatibility(Config) when is_list(Config) ->
-    ClientOpts = ssl_test_lib:ssl_options(empty_client_opts, Config),
-    ServerOpts =  ssl_test_lib:ssl_options(server_rsa_verify_opts, 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, ServerOpts}]),
-    Port  = ssl_test_lib:inet_port(Server),
-
-    AcceptBadCa = fun({bad_cert,unknown_ca}, Acc) ->  Acc;
-		     (Other, Acc) -> [Other | Acc]
-		  end,
-    VerifyFun =
-	fun(ErrorList) ->
-		case lists:foldl(AcceptBadCa, [], ErrorList) of
-		    [] ->    true;
-		    [_|_] -> false
-		end
-	end,
-
-    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},
-					  {verify_fun, VerifyFun}| ClientOpts]}]),
-
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-%%--------------------------------------------------------------------
-
-customize_hostname_check() ->
-    [{doc,"Test option customize_hostname_check."}].
-customize_hostname_check(Config) when is_list(Config) ->
-    Ext = [#'Extension'{extnID = ?'id-ce-subjectAltName',
-                        extnValue = [{dNSName, "*.example.org"}],
-                        critical = false}
-          ],
-    {ClientOpts0, ServerOpts0} = ssl_test_lib:make_rsa_cert_chains([{server_chain,
-                                                                     [[], 
-                                                                      [],
-                                                                      [{extensions, Ext}]
-                                                                     ]}], 
-                                                                   Config, "https_hostname_convention"),
-    ClientOpts = ssl_test_lib:ssl_options(ClientOpts0, Config),
-    ServerOpts = ssl_test_lib:ssl_options(ServerOpts0, 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, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    
-    CustomFun = public_key:pkix_verify_hostname_match_fun(https),
-    
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-                                        {host, Hostname},
-					 {from, self()}, 
-                                        {mfa, {ssl_test_lib, send_recv_result_active, []}},
-                                        {options,
-                                         [{server_name_indication, "other.example.org"},
-                                          {customize_hostname_check, 
-                                           [{match_fun, CustomFun}]} | ClientOpts]
-					 }]),    
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-    
-    Server ! {listen, {mfa, {ssl_test_lib, no_result, []}}},
-                                        
-    Client1 = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port}, 
-                                               {host, Hostname},
-                                               {from, self()}, 
-                                               {mfa, {ssl_test_lib, no_result, []}},
-                                               {options, ClientOpts}
-                                              ]),    
-    ssl_test_lib:check_result(Client1, {error, {tls_alert, "handshake failure"}},
-                              Server,  {error, {tls_alert, "handshake failure"}}),
-    
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
-
-incomplete_chain() ->
+long_chain() ->
     [{doc,"Test option verify_peer"}].
-incomplete_chain(Config) when is_list(Config) ->
-    DefConf = ssl_test_lib:default_cert_chain_conf(),
-    CertChainConf = ssl_test_lib:gen_conf(rsa, rsa, DefConf, DefConf),
+long_chain(Config) when is_list(Config) ->      
     #{server_config := ServerConf,
-      client_config := ClientConf} = public_key:pkix_test_data(CertChainConf),
+      client_config := ClientConf} = 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)}], 
+                                                                                                    [{key, ssl_test_lib:hardcode_rsa_key(3)}],
+                                                                                                    [{key, ssl_test_lib:hardcode_rsa_key(4)}]],
+                                                                                  peer => [{key, ssl_test_lib:hardcode_rsa_key(5)}]},
+                                                                 client_chain => #{root => [{key, ssl_test_lib:hardcode_rsa_key(3)}], 
+                                                                                  intermediates => [[{key, ssl_test_lib:hardcode_rsa_key(2)}]],
+                                                                                  peer => [{key, ssl_test_lib:hardcode_rsa_key(1)}]}}), 
     [ServerRoot| _] = ServerCas = proplists:get_value(cacerts, ServerConf),
     ClientCas = proplists:get_value(cacerts, ClientConf),
-
+    
     Active = proplists:get_value(active, Config),
     ReceiveFunction =  proplists:get_value(receive_function, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
@@ -1225,6 +594,7 @@ incomplete_chain(Config) when is_list(Config) ->
                                         {mfa, {ssl_test_lib, ReceiveFunction, []}},
                                         {options, [{active, Active}, 
                                                    {verify, verify_peer},
+                                                   {depth, 5},
                                                    {cacerts,  ServerCas ++ ClientCas} | 
                                                    proplists:delete(cacerts, ClientConf)]}]),
     ssl_test_lib:check_result(Server, ok, Client, ok),
diff --git a/lib/ssl/test/ssl_cipher_suite_SUITE.erl b/lib/ssl/test/ssl_cipher_suite_SUITE.erl
new file mode 100644
index 0000000000..e598d662e9
--- /dev/null
+++ b/lib/ssl/test/ssl_cipher_suite_SUITE.erl
@@ -0,0 +1,777 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019-2019. 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_cipher_suite_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+all() -> 
+    [
+     {group, 'tlsv1.2'},
+     {group, 'tlsv1.1'},
+     {group, 'tlsv1'},
+     {group, 'sslv3'},
+     {group, 'dtlsv1.2'},
+     {group, 'dtlsv1'}
+    ].
+
+groups() ->
+    [
+     {'tlsv1.2', [], kex()},
+     {'tlsv1.1', [], kex()},
+     {'tlsv1', [], kex()},
+     {'sslv3', [], ssl3_kex()},
+     {'dtlsv1.2', [], kex()},
+     {'dtlsv1', [], kex()},
+     {dhe_rsa, [],[dhe_rsa_3des_ede_cbc, 
+                   dhe_rsa_aes_128_cbc,
+                   dhe_rsa_aes_256_cbc,
+                   dhe_rsa_chacha20_poly1305
+                  ]},
+     {ecdhe_rsa, [], [ecdhe_rsa_3des_ede_cbc, 
+                      ecdhe_rsa_aes_128_cbc,
+                      ecdhe_rsa_aes_128_gcm,
+                      ecdhe_rsa_aes_256_cbc,
+                      ecdhe_rsa_aes_256_gcm,
+                      ecdhe_rsa_chacha20_poly1305
+                    ]},
+     {ecdhe_ecdsa, [],[ecdhe_ecdsa_rc4_128, 
+                       ecdhe_ecdsa_3des_ede_cbc, 
+                       ecdhe_ecdsa_aes_128_cbc,
+                       ecdhe_ecdsa_aes_128_gcm,
+                       ecdhe_ecdsa_aes_256_cbc,
+                       ecdhe_ecdsa_aes_256_gcm,
+                       ecdhe_ecdsa_chacha20_poly1305
+                      ]},
+     {rsa, [], [rsa_3des_ede_cbc, 
+                rsa_aes_128_cbc,
+                rsa_aes_256_cbc,
+                rsa_rc4_128
+               ]},
+     {dhe_dss, [], [dhe_dss_3des_ede_cbc, 
+                    dhe_dss_aes_128_cbc,
+                    dhe_dss_aes_256_cbc]},
+     {srp_rsa, [], [srp_rsa_3des_ede_cbc, 
+                    srp_rsa_aes_128_cbc,
+                    srp_rsa_aes_256_cbc]},
+     {srp_dss, [], [srp_dss_3des_ede_cbc, 
+                    srp_dss_aes_128_cbc,
+                    srp_dss_aes_256_cbc]},
+     {rsa_psk, [], [rsa_psk_3des_ede_cbc,                    
+                    rsa_psk_rc4_128,
+                    rsa_psk_aes_128_cbc,
+                    rsa_psk_aes_256_cbc
+                   ]},
+     {dh_anon, [], [dh_anon_rc4_128,
+                    dh_anon_3des_ede_cbc, 
+                    dh_anon_aes_128_cbc,
+                    dh_anon_aes_128_gcm,
+                    dh_anon_aes_256_cbc,
+                    dh_anon_aes_256_gcm]},
+     {ecdh_anon, [], [ecdh_anon_3des_ede_cbc, 
+                      ecdh_anon_aes_128_cbc,
+                      ecdh_anon_aes_256_cbc
+                     ]},     
+     {srp_anon, [], [srp_anon_3des_ede_cbc, 
+                     srp_anon_aes_128_cbc,
+                     srp_anon_aes_256_cbc]},
+     {psk, [], [psk_3des_ede_cbc,                    
+                psk_rc4_128,
+                psk_aes_128_cbc,
+                psk_aes_128_ccm,
+                psk_aes_128_ccm_8,
+                psk_aes_256_cbc,
+                psk_aes_256_ccm,
+                psk_aes_256_ccm_8
+               ]},
+     {dhe_psk, [], [dhe_psk_3des_ede_cbc,                    
+                    dhe_psk_rc4_128,
+                    dhe_psk_aes_128_cbc,
+                    dhe_psk_aes_128_ccm,
+                    dhe_psk_aes_128_ccm_8,
+                    dhe_psk_aes_256_cbc,
+                    dhe_psk_aes_256_ccm,
+                    dhe_psk_aes_256_ccm_8
+               ]},
+     {ecdhe_psk, [], [ecdhe_psk_3des_ede_cbc,                    
+                     ecdhe_psk_rc4_128,
+                     ecdhe_psk_aes_128_cbc,
+                     ecdhe_psk_aes_128_ccm,
+                     ecdhe_psk_aes_128_ccm_8,
+                     ecdhe_psk_aes_256_cbc
+               ]}
+    ].
+
+kex() ->
+     rsa() ++ ecdsa() ++ dss() ++ anonymous().
+
+
+ssl3_kex() ->
+    ssl3_rsa() ++ ssl3_dss() ++ ssl3_anonymous().
+
+
+rsa() ->
+    [{group, dhe_rsa},
+     {group, ecdhe_rsa},
+     {group, rsa},
+     {group, srp_rsa},
+     {group, rsa_psk}
+    ].
+
+ssl3_rsa() ->
+    [{group, dhe_rsa},
+     {group, rsa}
+    ].
+
+ecdsa() ->
+    [{group, ecdhe_ecdsa}].
+    
+dss() ->
+    [{group, dhe_dss},
+     {group, srp_dss}].
+
+ssl3_dss() ->
+    [{group, dhe_dss}
+    ].
+
+anonymous() ->
+    [{group, dh_anon},
+     {group, ecdh_anon},
+     {group, psk},
+     {group, dhe_psk},
+     {group, ecdhe_psk},
+     {group, srp_anon}
+    ].
+
+ssl3_anonymous() ->
+    [{group, dh_anon}].
+
+
+init_per_suite(Config) ->
+    catch crypto:stop(),
+    try crypto:start() of
+	ok ->
+	    ssl_test_lib:clean_start(),
+            Config
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:stop(crypto).
+
+
+init_per_group(GroupName, Config) when GroupName == ecdh_anon;
+                                       GroupName == ecdhe_rsa;
+                                       GroupName == ecdhe_psk ->
+    case proplists:get_bool(ecdh, proplists:get_value(public_keys, crypto:supports())) of
+        true ->
+            init_certs(GroupName, Config);
+        false ->
+            {skip, "Missing EC crypto support"}
+    end;
+init_per_group(ecdhe_ecdsa = GroupName, Config) ->
+    PKAlg = proplists:get_value(public_keys, crypto:supports()),
+    case lists:member(ecdh, PKAlg) andalso lists:member(ecdsa, PKAlg) of
+        true ->
+            init_certs(GroupName, Config);
+        false ->
+            {skip, "Missing EC crypto support"}
+    end;
+init_per_group(dhe_dss = GroupName, Config) ->
+    PKAlg = proplists:get_value(public_keys, crypto:supports()),
+    case lists:member(dss, PKAlg) andalso lists:member(dh, PKAlg) of
+        true ->
+            init_certs(GroupName, Config);
+        false ->
+            {skip, "Missing DSS crypto support"}
+    end;
+init_per_group(srp_dss = GroupName, Config) ->
+    PKAlg = proplists:get_value(public_keys, crypto:supports()),
+    case lists:member(dss, PKAlg) andalso lists:member(srp, PKAlg) of
+        true ->
+            init_certs(GroupName, Config);
+        false ->
+            {skip, "Missing DSS_SRP crypto support"}
+    end;
+init_per_group(GroupName, Config) when GroupName == srp_anon;
+                                       GroupName == srp_rsa ->
+    PKAlg = proplists:get_value(public_keys, crypto:supports()),
+    case lists:member(srp, PKAlg) of
+        true ->
+            init_certs(GroupName, Config);
+        false ->
+            {skip, "Missing SRP crypto support"}
+    end;
+init_per_group(dhe_psk = GroupName, Config) ->
+    PKAlg = proplists:get_value(public_keys, crypto:supports()),
+    case lists:member(dh, PKAlg) of
+        true ->
+            init_certs(GroupName, Config);
+        false ->
+            {skip, "Missing SRP crypto support"}
+    end;
+init_per_group(GroupName, Config0) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+        true ->
+            ssl_test_lib:init_tls_version(GroupName, end_per_group(GroupName, Config0));
+        false ->
+            init_certs(GroupName, Config0)
+    end.
+  
+end_per_group(GroupName, Config) ->
+  case ssl_test_lib:is_tls_version(GroupName) of
+      true ->
+          ssl_test_lib:clean_tls_version(Config);
+      false ->
+          Config
+  end.
+
+init_per_testcase(TestCase, Config) when TestCase == psk_3des_ede_cbc;
+                                         TestCase == srp_anon_3des_ede_cbc;
+                                         TestCase == dhe_psk_3des_ede_cbc;
+                                         TestCase == ecdhe_psk_3des_ede_cbc;
+                                         TestCase == srp_rsa_3des_ede_cbc;
+                                         TestCase == srp_dss_3des_ede_cbc;
+                                         TestCase == rsa_psk_3des_ede_cbc;
+                                         TestCase == rsa_3des_ede_cbc;
+                                         TestCase == dhe_rsa_3des_ede_cbc;
+                                         TestCase == dhe_dss_3des_ede_cbc;
+                                         TestCase == ecdhe_rsa_3des_ede_cbc;
+                                         TestCase == srp_anon_dss_3des_ede_cbc;
+                                         TestCase == dh_anon_3des_ede_cbc;
+                                         TestCase == ecdh_anon_3des_ede_cbc;
+                                         TestCase == ecdhe_ecdsa_3des_ede_cbc ->
+    SupCiphers = proplists:get_value(ciphers, crypto:supports()),
+    case lists:member(des_ede3, SupCiphers) of
+        true ->
+            ct:timetrap({seconds, 5}),
+            Config;
+        _ ->
+            {skip, "Missing 3DES crypto support"}
+    end;
+init_per_testcase(TestCase, Config) when TestCase == psk_rc4_128;
+                                         TestCase == ecdhe_psk_rc4_128;
+                                         TestCase == dhe_psk_rc4_128;
+                                         TestCase == rsa_psk_rc4_128;
+                                         TestCase == rsa_rc4_128;
+                                         TestCase == ecdhe_rsa_rc4_128;
+                                         TestCase == ecdhe_ecdsa_rc4_128;
+                                         TestCase == dh_anon_rc4_128 ->
+    SupCiphers = proplists:get_value(ciphers, crypto:supports()),
+    case lists:member(rc4, SupCiphers) of
+        true ->
+            ct:timetrap({seconds, 5}),
+            Config;
+        _ ->
+            {skip, "Missing RC4 crypto support"}
+    end;
+init_per_testcase(TestCase, Config) when  TestCase == psk_aes_128_ccm_8;
+                                          TestCase == rsa_psk_aes_128_ccm_8;
+                                          TestCase == psk_aes_128_ccm_8;
+                                          TestCase == dhe_psk_aes_128_ccm_8;
+                                          TestCase == ecdhe_psk_aes_128_ccm_8 ->
+    SupCiphers = proplists:get_value(ciphers, crypto:supports()),
+    case lists:member(aes_128_ccm, SupCiphers) of
+        true ->
+            ct:timetrap({seconds, 5}),
+            Config;
+        _ ->
+            {skip, "Missing AES_128_CCM crypto support"}
+    end;
+init_per_testcase(TestCase, Config) when TestCase == psk_aes_256_ccm_8;
+                                         TestCase == rsa_psk_aes_256_ccm_8;
+                                         TestCase == psk_aes_256_ccm_8;
+                                         TestCase == dhe_psk_aes_256_ccm_8;
+                                         TestCase == ecdhe_psk_aes_256_ccm_8 ->
+    SupCiphers = proplists:get_value(ciphers, crypto:supports()),
+    case lists:member(aes_256_ccm, SupCiphers) of
+        true ->
+            ct:timetrap({seconds, 5}),
+            Config;
+        _ ->
+            {skip, "Missing AES_256_CCM crypto support"}
+    end;
+init_per_testcase(TestCase, Config) ->
+    Cipher = ssl_test_lib:test_cipher(TestCase, Config),
+    SupCiphers = proplists:get_value(ciphers, crypto:supports()),
+    case lists:member(Cipher, SupCiphers) of
+        true ->
+            ct:timetrap({seconds, 5}),
+            Config;
+        _ ->
+            {skip, {Cipher, SupCiphers}}
+    end.
+
+end_per_testcase(_TestCase, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Initializtion   ------------------------------------------
+%%--------------------------------------------------------------------
+
+init_certs(srp_rsa, Config) ->
+    DefConf = ssl_test_lib:default_cert_chain_conf(),
+    CertChainConf = ssl_test_lib:gen_conf(rsa, rsa, DefConf, DefConf),
+    #{server_config := ServerOpts,
+      client_config := ClientOpts} 
+        = public_key:pkix_test_data(CertChainConf),
+    [{tls_config, #{server_config => [{user_lookup_fun, {fun ssl_test_lib:user_lookup/3, undefined}} | ServerOpts],
+                    client_config => [{srp_identity, {"Test-User", "secret"}} | ClientOpts]}} |
+     proplists:delete(tls_config, Config)];
+init_certs(srp_anon, Config) ->
+    [{tls_config, #{server_config => [{user_lookup_fun, {fun ssl_test_lib:user_lookup/3, undefined}}],
+                    client_config => [{srp_identity, {"Test-User", "secret"}}]}} |
+     proplists:delete(tls_config, Config)];
+init_certs(rsa_psk, Config) ->
+    ClientExt = x509_test:extensions([{key_usage, [digitalSignature, keyEncipherment]}]),
+    {ClientOpts, ServerOpts} = ssl_test_lib:make_rsa_cert_chains([{server_chain, 
+                                                                   [[],[],[{extensions, ClientExt}]]}], 
+                                                                 Config, "_peer_keyEncipherment"),
+    PskSharedSecret = <<1,2,3,4,5,6,7,8,9,10,11,12,13,14,15>>,
+    [{tls_config, #{server_config => [{user_lookup_fun, {fun ssl_test_lib:user_lookup/3, PskSharedSecret}} | ServerOpts],
+                    client_config => [{psk_identity, "Test-User"},
+                                      {user_lookup_fun, {fun ssl_test_lib:user_lookup/3, PskSharedSecret}} | ClientOpts]}} |
+     proplists:delete(tls_config, Config)];
+init_certs(rsa, Config) ->
+    ClientExt = x509_test:extensions([{key_usage, [digitalSignature, keyEncipherment]}]),
+    {ClientOpts, ServerOpts} = ssl_test_lib:make_rsa_cert_chains([{server_chain, 
+                                                                   [[],[],[{extensions, ClientExt}]]}], 
+                                                                 Config, "_peer_keyEncipherment"),
+    [{tls_config, #{server_config => ServerOpts,
+                    client_config => ClientOpts}} |
+     proplists:delete(tls_config, Config)];
+init_certs(dhe_dss, Config) ->
+    DefConf = ssl_test_lib:default_cert_chain_conf(),
+    CertChainConf = ssl_test_lib:gen_conf(dsa, dsa, DefConf, DefConf),
+    #{server_config := ServerOpts,
+      client_config := ClientOpts} 
+        = public_key:pkix_test_data(CertChainConf),
+    [{tls_config, #{server_config => ServerOpts,
+                    client_config => ClientOpts}} |
+     proplists:delete(tls_config, Config)];
+init_certs(srp_dss, Config) ->
+    DefConf = ssl_test_lib:default_cert_chain_conf(),
+    CertChainConf = ssl_test_lib:gen_conf(dsa, dsa, DefConf, DefConf),
+    #{server_config := ServerOpts,
+      client_config := ClientOpts} 
+        = public_key:pkix_test_data(CertChainConf),
+    [{tls_config, #{server_config => [{user_lookup_fun, {fun ssl_test_lib:user_lookup/3, undefined}} | ServerOpts],
+                    client_config => [{srp_identity, {"Test-User", "secret"}} | ClientOpts]}} |
+       proplists:delete(tls_config, Config)];
+init_certs(GroupName, Config) when GroupName == dhe_rsa;
+                                   GroupName == ecdhe_rsa ->
+    DefConf = ssl_test_lib:default_cert_chain_conf(),
+    CertChainConf = ssl_test_lib:gen_conf(rsa, rsa, DefConf, DefConf),
+    #{server_config := ServerOpts,
+      client_config := ClientOpts} 
+        = public_key:pkix_test_data(CertChainConf),
+    [{tls_config, #{server_config => ServerOpts,
+                    client_config => ClientOpts}} |
+     proplists:delete(tls_config, Config)];
+init_certs(GroupName, Config) when GroupName == dhe_ecdsa;
+                                   GroupName == ecdhe_ecdsa ->
+    DefConf = ssl_test_lib:default_cert_chain_conf(),
+    CertChainConf = ssl_test_lib:gen_conf(ecdsa, ecdsa, DefConf, DefConf),
+    #{server_config := ServerOpts,
+      client_config := ClientOpts} 
+        = public_key:pkix_test_data(CertChainConf),
+    [{tls_config, #{server_config => ServerOpts,
+                    client_config => ClientOpts}} |
+     proplists:delete(tls_config, Config)];
+init_certs(GroupName, Config) when GroupName == psk;
+                                   GroupName == dhe_psk;
+                                   GroupName == ecdhe_psk ->
+    PskSharedSecret = <<1,2,3,4,5,6,7,8,9,10,11,12,13,14,15>>,
+    [{tls_config, #{server_config => [{user_lookup_fun, {fun ssl_test_lib:user_lookup/3, PskSharedSecret}}],
+                    client_config => [{psk_identity, "Test-User"},
+                                      {user_lookup_fun, {fun ssl_test_lib:user_lookup/3, PskSharedSecret}}]}} |
+     proplists:delete(tls_config, Config)]; 
+init_certs(srp, Config) -> 
+      [{tls_config, #{server_config => [{user_lookup_fun, {fun ssl_test_lib:user_lookup/3, undefined}}],
+                      client_config => [{srp_identity, {"Test-User", "secret"}}]}} |
+       proplists:delete(tls_config, Config)];
+init_certs(_GroupName, Config) -> 
+    %% Anonymous does not need certs
+     [{tls_config, #{server_config => [],
+                     client_config => []}} |
+       proplists:delete(tls_config, Config)].
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% SRP --------------------------------------------------------
+%%--------------------------------------------------------------------
+srp_rsa_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(srp_rsa, '3des_ede_cbc', Config).                 
+    
+srp_rsa_aes_128_cbc(Config) when is_list(Config) ->
+   run_ciphers_test(srp_rsa, 'aes_128_cbc', Config).             
+
+srp_rsa_aes_256_cbc(Config) when is_list(Config) ->
+   run_ciphers_test(srp_rsa, 'aes_256_cbc', Config).             
+
+srp_dss_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(srp_dss, '3des_ede_cbc', Config).                 
+    
+srp_dss_aes_128_cbc(Config) when is_list(Config) ->
+   run_ciphers_test(srp_dss, 'aes_128_cbc', Config).             
+
+srp_dss_aes_256_cbc(Config) when is_list(Config) ->
+   run_ciphers_test(srp_dss, 'aes_256_cbc', Config).     
+
+%%--------------------------------------------------------------------
+%% PSK --------------------------------------------------------
+%%--------------------------------------------------------------------
+rsa_psk_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(rsa_psk, '3des_ede_cbc', Config).            
+
+rsa_psk_aes_128_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(rsa_psk, 'aes_128_cbc', Config).             
+
+rsa_psk_aes_128_ccm(Config) when is_list(Config) ->
+    run_ciphers_test(rsa_psk, 'aes_128_ccm', Config).             
+
+rsa_psk_aes_128_ccm_8(Config) when is_list(Config) ->
+    run_ciphers_test(rsa_psk, 'aes_128_ccm_8', Config).             
+
+rsa_psk_aes_256_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(rsa_psk, 'aes_256_cbc', Config). 
+
+rsa_psk_aes_256_ccm(Config) when is_list(Config) ->
+    run_ciphers_test(rsa_psk, 'aes_256_ccm', Config).             
+
+rsa_psk_aes_256_ccm_8(Config) when is_list(Config) ->
+    run_ciphers_test(rsa_psk, 'aes_256_ccm_8', Config).             
+     
+rsa_psk_rc4_128(Config) when is_list(Config) ->
+    run_ciphers_test(rsa_psk, 'rc4_128', Config).    
+         
+%%--------------------------------------------------------------------
+%% RSA --------------------------------------------------------
+%%--------------------------------------------------------------------
+rsa_des_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(rsa, 'des_cbc', Config).            
+
+rsa_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(rsa, '3des_ede_cbc', Config).            
+
+rsa_aes_128_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(rsa, 'aes_128_cbc', Config).             
+
+rsa_aes_256_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(rsa, 'aes_256_cbc', Config).
+
+rsa_aes_128_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(rsa, 'aes_128_gcm', Config).             
+
+rsa_aes_256_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(rsa, 'aes_256_gcm', Config).
+
+rsa_rc4_128(Config) when is_list(Config) ->
+    run_ciphers_test(rsa, 'rc4_128', Config).    
+%%--------------------------------------------------------------------
+%% DHE_RSA --------------------------------------------------------
+%%--------------------------------------------------------------------
+dhe_rsa_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_rsa, '3des_ede_cbc', Config).         
+
+dhe_rsa_aes_128_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_rsa, 'aes_128_cbc', Config).   
+
+dhe_rsa_aes_128_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_rsa, 'aes_128_gcm', Config).   
+
+dhe_rsa_aes_256_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_rsa, 'aes_256_cbc', Config).   
+
+dhe_rsa_aes_256_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_rsa, 'aes_256_gcm', Config).
+
+dhe_rsa_chacha20_poly1305(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_rsa, 'chacha20_poly1305', Config).
+%%--------------------------------------------------------------------
+%% ECDHE_RSA --------------------------------------------------------
+%%--------------------------------------------------------------------
+ecdhe_rsa_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_rsa, '3des_ede_cbc', Config).         
+
+ecdhe_rsa_aes_128_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_rsa, 'aes_128_cbc', Config).         
+
+ecdhe_rsa_aes_128_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_rsa, 'aes_128_gcm', Config).         
+
+ecdhe_rsa_aes_256_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_rsa, 'aes_256_cbc', Config).   
+
+ecdhe_rsa_aes_256_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_rsa, 'aes_256_gcm', Config).   
+
+ecdhe_rsa_rc4_128(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_rsa, 'rc4_128', Config).      
+
+ecdhe_rsa_chacha20_poly1305(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_rsa, 'chacha20_poly1305', Config).
+
+%%--------------------------------------------------------------------
+%% ECDHE_ECDSA --------------------------------------------------------
+%%--------------------------------------------------------------------
+ecdhe_ecdsa_rc4_128(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_ecdsa, 'rc4_128', Config).         
+
+ecdhe_ecdsa_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_ecdsa, '3des_ede_cbc', Config).         
+
+ecdhe_ecdsa_aes_128_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_ecdsa, 'aes_128_cbc', Config).         
+
+ecdhe_ecdsa_aes_128_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_ecdsa, 'aes_128_gcm', Config).         
+
+ecdhe_ecdsa_aes_256_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_ecdsa, 'aes_256_cbc', Config).   
+
+ecdhe_ecdsa_aes_256_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_ecdsa, 'aes_256_gcm', Config).   
+
+ecdhe_ecdsa_chacha20_poly1305(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_ecdsa, 'chacha20_poly1305', Config).
+%%--------------------------------------------------------------------
+%% DHE_DSS --------------------------------------------------------
+%%--------------------------------------------------------------------
+dhe_dss_des_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_dss, 'des_cbc', Config).            
+
+dhe_dss_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_dss, '3des_ede_cbc', Config).            
+
+dhe_dss_aes_128_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_dss, 'aes_128_cbc', Config).             
+
+dhe_dss_aes_256_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_dss, 'aes_256_cbc', Config).
+
+dhe_dss_aes_128_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_dss, 'aes_128_gcm', Config).             
+
+dhe_dss_aes_256_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_dss, 'aes_256_gcm', Config).
+
+%%--------------------------------------------------------------------
+%% Anonymous --------------------------------------------------------
+%%--------------------------------------------------------------------
+dh_anon_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dh_anon, '3des_ede_cbc', Config).         
+
+dh_anon_aes_128_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dh_anon, 'aes_128_cbc', Config).         
+
+dh_anon_aes_128_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(dh_anon, 'aes_128_gcm', Config).         
+
+dh_anon_aes_256_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dh_anon, 'aes_256_cbc', Config).   
+
+dh_anon_aes_256_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(dh_anon, 'aes_256_gcm', Config).   
+
+dh_anon_rc4_128(Config) when is_list(Config) ->
+    run_ciphers_test(dh_anon, 'rc4_128', Config).      
+
+ecdh_anon_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdh_anon, '3des_ede_cbc', Config).         
+
+ecdh_anon_aes_128_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdh_anon, 'aes_128_cbc', Config).   
+
+ecdh_anon_aes_256_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdh_anon, 'aes_256_cbc', Config).   
+
+srp_anon_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(srp_anon, '3des_ede_cbc', Config).                 
+    
+srp_anon_aes_128_cbc(Config) when is_list(Config) ->
+   run_ciphers_test(srp_anon, 'aes_128_cbc', Config).             
+
+srp_anon_aes_256_cbc(Config) when is_list(Config) ->
+   run_ciphers_test(srp_anon, 'aes_256_cbc', Config).     
+
+dhe_psk_des_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_psk, 'des_cbc', Config).            
+
+dhe_psk_rc4_128(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_psk, 'rc4_128', Config).            
+
+dhe_psk_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_psk, '3des_ede_cbc', Config).            
+
+dhe_psk_aes_128_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_psk, 'aes_128_cbc', Config).             
+
+dhe_psk_aes_256_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_psk, 'aes_256_cbc', Config).
+
+dhe_psk_aes_128_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_psk, 'aes_128_gcm', Config).             
+
+dhe_psk_aes_256_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_psk, 'aes_256_gcm', Config).
+
+dhe_psk_aes_128_ccm(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_psk, 'aes_128_ccm', Config).             
+
+dhe_psk_aes_256_ccm(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_psk, 'aes_256_ccm', Config).
+
+dhe_psk_aes_128_ccm_8(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_psk, 'aes_128_ccm_8', Config).
+
+dhe_psk_aes_256_ccm_8(Config) when is_list(Config) ->
+    run_ciphers_test(dhe_psk, 'aes_256_ccm_8', Config).
+
+ecdhe_psk_des_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, 'des_cbc', Config).            
+
+ecdhe_psk_rc4_128(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, 'rc4_128', Config).            
+
+ecdhe_psk_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, '3des_ede_cbc', Config).            
+
+ecdhe_psk_aes_128_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, 'aes_128_cbc', Config).             
+
+ecdhe_psk_aes_256_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, 'aes_256_cbc', Config).
+
+ecdhe_psk_aes_128_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, 'aes_128_gcm', Config).             
+
+ecdhe_psk_aes_256_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, 'aes_256_gcm', Config).
+
+ecdhe_psk_aes_128_ccm(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, 'aes_128_ccm', Config).             
+
+ecdhe_psk_aes_128_ccm_8(Config) when is_list(Config) ->
+    run_ciphers_test(ecdhe_psk, 'aes_128_ccm_8', Config).
+
+psk_des_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(psk, 'des_cbc', Config).            
+
+psk_rc4_128(Config) when is_list(Config) ->
+    run_ciphers_test(psk, 'rc4_128', Config).            
+
+psk_3des_ede_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(psk, '3des_ede_cbc', Config).            
+
+psk_aes_128_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(psk, 'aes_128_cbc', Config).             
+
+psk_aes_256_cbc(Config) when is_list(Config) ->
+    run_ciphers_test(psk, 'aes_256_cbc', Config).
+
+psk_aes_128_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(psk, 'aes_128_gcm', Config).             
+
+psk_aes_256_gcm(Config) when is_list(Config) ->
+    run_ciphers_test(psk, 'aes_256_gcm', Config).
+
+psk_aes_128_ccm(Config) when is_list(Config) ->
+    run_ciphers_test(psk, 'aes_128_ccm', Config).             
+
+psk_aes_256_ccm(Config) when is_list(Config) ->
+    run_ciphers_test(psk, 'aes_256_ccm', Config).
+
+psk_aes_128_ccm_8(Config) when is_list(Config) ->
+    run_ciphers_test(psk, 'aes_128_ccm_8', Config).             
+
+psk_aes_256_ccm_8(Config) when is_list(Config) ->
+    run_ciphers_test(psk, 'aes_256_ccm_8', Config).
+
+%%--------------------------------------------------------------------
+%% Internal functions  ----------------------------------------------
+%%--------------------------------------------------------------------
+run_ciphers_test(Kex, Cipher, Config) ->
+    Version = ssl_test_lib:protocol_version(Config),
+    TestCiphers = test_ciphers(Kex, Cipher, Version),                  
+    
+    case TestCiphers of
+        [_|_] -> 
+            lists:foreach(fun(TestCipher) -> 
+                                  cipher_suite_test(TestCipher, Version, Config)
+                          end, TestCiphers);
+        []  ->
+            {skip, {not_sup, Kex, Cipher, Version}}
+    end.
+
+cipher_suite_test(ErlangCipherSuite, Version, Config) ->
+    #{server_config := SOpts,
+      client_config := COpts} = proplists:get_value(tls_config, Config),
+    ServerOpts = ssl_test_lib:ssl_options(SOpts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(COpts, Config),
+    ct:log("Testing CipherSuite ~p~n", [ErlangCipherSuite]),
+    ct:log("Server Opts ~p~n", [ServerOpts]),
+    ct:log("Client Opts ~p~n", [ClientOpts]),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    ConnectionInfo = {ok, {Version, ErlangCipherSuite}},
+    
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+                                        {mfa, {ssl_test_lib, cipher_result, [ConnectionInfo]}},
+                                        {options, [{versions, [Version]}, {ciphers, [ErlangCipherSuite]} | ServerOpts]}]),
+    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, cipher_result, [ConnectionInfo]}},
+					{options, [{versions, [Version]}, {ciphers, [ErlangCipherSuite]} |
+                                                   ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+
+test_ciphers(Kex, Cipher, Version) ->
+    ssl:filter_cipher_suites(ssl:cipher_suites(all, Version) ++ ssl:cipher_suites(anonymous, Version), 
+                             [{key_exchange, 
+                               fun(Kex0) when Kex0 == Kex -> true; 
+                                  (_) -> false 
+                               end}, 
+                              {cipher,  
+                               fun(Cipher0) when Cipher0 == Cipher -> true; 
+                                  (_) -> false 
+                               end}]).
+
diff --git a/lib/ssl/test/ssl_crl_SUITE.erl b/lib/ssl/test/ssl_crl_SUITE.erl
index 23c5eaf84d..b2fd3874a8 100644
--- a/lib/ssl/test/ssl_crl_SUITE.erl
+++ b/lib/ssl/test/ssl_crl_SUITE.erl
@@ -238,7 +238,7 @@ crl_verify_revoked(Config)  when is_list(Config) ->
 		  end,	
     
     crl_verify_error(Hostname, ServerNode, ServerOpts, ClientNode, ClientOpts,
-                     "certificate revoked").
+                     certificate_revoked).
 
 crl_verify_no_crl() ->
     [{doc,"Verify a simple CRL chain when the CRL is missing"}].
@@ -277,10 +277,10 @@ crl_verify_no_crl(Config) when is_list(Config) ->
             %% The error "revocation status undetermined" gets turned
             %% into "bad certificate".
             crl_verify_error(Hostname, ServerNode, ServerOpts, ClientNode, ClientOpts,
-                             "bad certificate");
+                             bad_certificate);
         peer ->
             crl_verify_error(Hostname, ServerNode, ServerOpts, ClientNode, ClientOpts,
-                             "bad certificate");
+                             bad_certificate);
         best_effort ->
             %% In "best effort" mode, we consider the certificate not
             %% to be revoked if we can't find the appropriate CRL.
@@ -341,7 +341,7 @@ crl_hash_dir_collision(Config) when is_list(Config) ->
 
     %% First certificate revoked; first fails, second succeeds.
     crl_verify_error(Hostname, ServerNode, ServerOpts1, ClientNode, ClientOpts,
-                     "certificate revoked"),
+                     certificate_revoked),
     crl_verify_valid(Hostname, ServerNode, ServerOpts2, ClientNode, ClientOpts),
 
     make_certs:revoke(PrivDir, CA2, "collision-client-2", CertsConfig),
@@ -352,9 +352,9 @@ crl_hash_dir_collision(Config) when is_list(Config) ->
 
     %% Second certificate revoked; both fail.
     crl_verify_error(Hostname, ServerNode, ServerOpts1, ClientNode, ClientOpts,
-                     "certificate revoked"),
+                     certificate_revoked),
     crl_verify_error(Hostname, ServerNode, ServerOpts2, ClientNode, ClientOpts,
-                     "certificate revoked"),
+                     certificate_revoked),
 
     ok.
 
@@ -383,8 +383,11 @@ crl_hash_dir_expired(Config) when is_list(Config) ->
 	 {verify, verify_peer}],
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
 
-    %% First make a CRL that expired yesterday.
-    make_certs:gencrl(PrivDir, CA, CertsConfig, -24),
+    %% First make a CRL that will expire in one second.
+    make_certs:gencrl_sec(PrivDir, CA, CertsConfig, 1),
+    %% Sleep until the next CRL is due
+    ct:sleep({seconds, 1}),
+
     CrlDir = filename:join(PrivDir, "crls"),
     populate_crl_hash_dir(PrivDir, CrlDir,
 			  [{CA, "1627b4b0"}],
@@ -397,10 +400,10 @@ crl_hash_dir_expired(Config) when is_list(Config) ->
             %% The error "revocation status undetermined" gets turned
             %% into "bad certificate".
             crl_verify_error(Hostname, ServerNode, ServerOpts, ClientNode, ClientOpts,
-                             "bad certificate");
+                             bad_certificate);
         peer ->
             crl_verify_error(Hostname, ServerNode, ServerOpts, ClientNode, ClientOpts,
-                             "bad certificate");
+                             bad_certificate);
         best_effort ->
             %% In "best effort" mode, we consider the certificate not
             %% to be revoked if we can't find the appropriate CRL.
@@ -448,11 +451,8 @@ crl_verify_error(Hostname, ServerNode, ServerOpts, ClientNode, ClientOpts, Expec
 					      {host, Hostname},
 					      {from, self()},
 					      {options, ClientOpts}]),
-    receive
-	{Server, AlertOrClose} ->
-	    ct:pal("Server Alert or Close ~p", [AlertOrClose])
-    end,
-    ssl_test_lib:check_result(Client, {error, {tls_alert, ExpectedAlert}}).
+
+    ssl_test_lib:check_client_alert(Server, Client, ExpectedAlert).
 
 %%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
diff --git a/lib/ssl/test/ssl_dist_SUITE.erl b/lib/ssl/test/ssl_dist_SUITE.erl
index 003e1fc448..7cfb2ac0c5 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-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2019. 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.
@@ -311,9 +311,11 @@ listen_port_options(Config) when is_list(Config) ->
     catch
 	_:Reason ->
 	    stop_ssl_node(NH2),
+	    stop_ssl_node(NH1),
 	    ct:fail(Reason)
     end,
     stop_ssl_node(NH2),
+    stop_ssl_node(NH1),
     success(Config).
 
 %%--------------------------------------------------------------------
diff --git a/lib/ssl/test/ssl_dist_bench_SUITE.erl b/lib/ssl/test/ssl_dist_bench_SUITE.erl
index 7409b69639..67944c74d2 100644
--- a/lib/ssl/test/ssl_dist_bench_SUITE.erl
+++ b/lib/ssl/test/ssl_dist_bench_SUITE.erl
@@ -1,7 +1,7 @@
 %%%-------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2017-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2017-2019. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@
 -export(
    [setup/1,
     roundtrip/1,
+    sched_utilization/1,
     throughput_0/1,
     throughput_64/1,
     throughput_1024/1,
@@ -42,20 +43,25 @@
     throughput_1048576/1]).
 
 %% Debug
--export([payload/1]).
+-export([payload/1, roundtrip_runner/3, setup_runner/3, throughput_runner/4]).
 
 %%%-------------------------------------------------------------------
 
 suite() -> [{ct_hooks, [{ts_install_cth, [{nodenames, 2}]}]}].
 
-all() -> [{group, ssl}, {group, plain}].
+all() ->
+    [{group, ssl},
+     {group, crypto},
+     {group, plain}].
 
 groups() ->
     [{ssl, all_groups()},
+     {crypto, all_groups()},
      {plain, all_groups()},
      %%
      {setup, [{repeat, 1}], [setup]},
      {roundtrip, [{repeat, 1}], [roundtrip]},
+     {sched_utilization,[{repeat, 1}], [sched_utilization]},
      {throughput, [{repeat, 1}],
       [throughput_0,
        throughput_64,
@@ -69,7 +75,9 @@ groups() ->
 all_groups() ->
     [{group, setup},
      {group, roundtrip},
-     {group, throughput}].
+     {group, throughput},
+     {group, sched_utilization}
+    ].
 
 init_per_suite(Config) ->
     Digest = sha1,
@@ -160,6 +168,11 @@ end_per_suite(Config) ->
 
 init_per_group(ssl, Config) ->
     [{ssl_dist, true}, {ssl_dist_prefix, "SSL"}|Config];
+init_per_group(crypto, Config) ->
+    [{ssl_dist, false}, {ssl_dist_prefix, "Crypto"},
+     {ssl_dist_args,
+      "-proto_dist inet_crypto"}
+     |Config];
 init_per_group(plain, Config) ->
     [{ssl_dist, false}, {ssl_dist_prefix, "Plain"}|Config];
 init_per_group(_GroupName, Config) ->
@@ -351,6 +364,120 @@ roundtrip_client(Pid, Mon, StartTime, N) ->
             roundtrip_client(Pid, Mon, StartTime, N - 1)
     end.
 
+%%---------------------------------------
+%% Scheduler utilization at constant load
+
+
+sched_utilization(Config) ->
+    run_nodepair_test(
+      fun(A, B, Prefix, HA, HB) ->
+              sched_utilization(A, B, Prefix, HA, HB, proplists:get_value(ssl_dist, Config))
+      end, Config).
+
+sched_utilization(A, B, Prefix, HA, HB, SSL) ->
+    [] = ssl_apply(HA, erlang, nodes, []),
+    [] = ssl_apply(HB, erlang, nodes, []),
+    {ClientMsacc, ServerMsacc, Msgs} =
+        ssl_apply(HA, fun () -> sched_util_runner(A, B, SSL) end),
+    [B] = ssl_apply(HA, erlang, nodes, []),
+    [A] = ssl_apply(HB, erlang, nodes, []),
+    msacc:print(ClientMsacc),
+    msacc:print(ServerMsacc),
+    ct:pal("Got ~p busy_dist_port msgs",[length(Msgs)]),
+    ct:log("Stats of B from A: ~p",
+           [ssl_apply(HA, net_kernel, node_info, [B])]),
+    ct:log("Stats of A from B: ~p",
+           [ssl_apply(HB, net_kernel, node_info, [A])]),
+    SchedUtilClient =
+        round(10000 * msacc:stats(system_runtime,ClientMsacc) /
+                  msacc:stats(system_realtime,ClientMsacc)),
+    SchedUtilServer =
+        round(10000 * msacc:stats(system_runtime,ServerMsacc) /
+                  msacc:stats(system_realtime,ServerMsacc)),
+    Verdict =
+        case Msgs of
+            [] ->
+                "";
+            _ ->
+                " ???"
+        end,
+    {comment, ClientComment} =
+        report(Prefix ++ " Sched Utilization Client" ++ Verdict,
+               SchedUtilClient, "/100 %" ++ Verdict),
+    {comment, ServerComment} =
+        report(Prefix++" Sched Utilization Server" ++ Verdict,
+               SchedUtilServer, "/100 %" ++ Verdict),
+    {comment, "Client " ++ ClientComment ++ ", Server " ++ ServerComment}.
+
+%% Runs on node A and spawns a server on node B
+%% We want to avoid getting busy_dist_port as it hides the true SU usage
+%% of the receiver and sender.
+sched_util_runner(A, B, true) ->
+    sched_util_runner(A, B, 250);
+sched_util_runner(A, B, false) ->
+    sched_util_runner(A, B, 250);
+sched_util_runner(A, B, Senders) ->
+    Payload = payload(5),
+    [A] = rpc:call(B, erlang, nodes, []),
+    ServerPids =
+        [erlang:spawn_link(
+           B, fun () -> throughput_server() end)
+         || _ <- lists:seq(1, Senders)],
+    ServerMsacc =
+        erlang:spawn(
+          B,
+          fun() ->
+                  receive
+                      {start,Pid} ->
+                          msacc:start(10000),
+                          receive
+                              {done,Pid} ->
+                                  Pid ! {self(),msacc:stats()}
+                          end
+                  end
+          end),
+    erlang:system_monitor(self(),[busy_dist_port]),
+    %% We spawn 250 senders which should mean that we
+    %% have a load of 250 msgs/msec
+    [spawn_link(
+       fun() ->
+               throughput_client(Pid, Payload)
+       end) || Pid <- ServerPids],
+    %%
+    receive after 1000 -> ok end,
+    ServerMsacc ! {start,self()},
+    msacc:start(10000),
+    ClientMsaccStats = msacc:stats(),
+    receive after 1000 -> ok end,
+    ServerMsacc ! {done,self()},
+    ServerMsaccStats = receive {ServerMsacc,Stats} -> Stats end,
+    %%
+    {ClientMsaccStats,ServerMsaccStats, flush()}.
+
+flush() ->
+    receive
+        M ->
+            [M | flush()]
+    after 0 ->
+            []
+    end.
+
+throughput_server() ->
+    receive _ -> ok end,
+    receive _ -> ok end,
+    receive _ -> ok end,
+    receive _ -> ok end,
+    receive _ -> ok end,
+    receive _ -> ok end,
+    receive _ -> ok end,
+    receive _ -> ok end,
+    receive _ -> ok end,
+    receive _ -> ok end,
+    throughput_server().
+
+throughput_client(Pid, Payload) ->
+    Pid ! Payload,
+    receive after 1 -> throughput_client(Pid, Payload) end.
 
 %%-----------------
 %% Throughput speed
@@ -407,37 +534,46 @@ throughput(A, B, Prefix, HA, HB, Packets, Size) ->
     [] = ssl_apply(HA, erlang, nodes, []),
     [] = ssl_apply(HB, erlang, nodes, []),
     #{time := Time,
-      dist_stats := DistStats,
+      client_dist_stats := ClientDistStats,
       client_msacc_stats := ClientMsaccStats,
       client_prof := ClientProf,
       server_msacc_stats := ServerMsaccStats,
-      server_prof := ServerProf} =
+      server_prof := ServerProf,
+      server_gc_before := Server_GC_Before,
+      server_gc_after := Server_GC_After} =
         ssl_apply(HA, fun () -> throughput_runner(A, B, Packets, Size) end),
     [B] = ssl_apply(HA, erlang, nodes, []),
     [A] = ssl_apply(HB, erlang, nodes, []),
     ClientMsaccStats =:= undefined orelse
         msacc:print(ClientMsaccStats),
-    io:format("DistStats: ~p~n", [DistStats]),
+    io:format("ClientDistStats: ~p~n", [ClientDistStats]),
     Overhead =
         50 % Distribution protocol headers (empirical) (TLS+=54)
         + byte_size(erlang:term_to_binary([0|<<>>])), % Benchmark overhead
     Bytes = Packets * (Size + Overhead),
     io:format("~w bytes, ~.4g s~n", [Bytes,Time/1000000]),
+    SizeString = integer_to_list(Size),
     ClientMsaccStats =:= undefined orelse
-        io:format(
-          "Sender core usage ratio: ~.4g ns/byte~n",
-          [msacc:stats(system_runtime, ClientMsaccStats)*1000/Bytes]),
+        report(
+          Prefix ++ " Sender_RelativeCoreLoad_" ++ SizeString,
+          round(msacc:stats(system_runtime, ClientMsaccStats)
+                * 1000000 / Bytes),
+          "ps/byte"),
     ServerMsaccStats =:= undefined orelse
         begin
-            io:format(
-              "Receiver core usage ratio: ~.4g ns/byte~n",
-              [msacc:stats(system_runtime, ServerMsaccStats)*1000/Bytes]),
+            report(
+              Prefix ++ " Receiver_RelativeCoreLoad_" ++ SizeString,
+              round(msacc:stats(system_runtime, ServerMsaccStats)
+                    * 1000000 / Bytes),
+              "ps/byte"),
             msacc:print(ServerMsaccStats)
         end,
     io:format("******* ClientProf:~n", []), prof_print(ClientProf),
     io:format("******* ServerProf:~n", []), prof_print(ServerProf),
+    io:format("******* Server GC Before:~n~p~n", [Server_GC_Before]),
+    io:format("******* Server GC After:~n~p~n", [Server_GC_After]),
     Speed = round((Bytes * 1000000) / (1024 * Time)),
-    report(Prefix++" Throughput_"++integer_to_list(Size), Speed, "kB/s").
+    report(Prefix ++ " Throughput_" ++ SizeString, Speed, "kB/s").
 
 %% Runs on node A and spawns a server on node B
 throughput_runner(A, B, Rounds, Size) ->
@@ -445,11 +581,12 @@ throughput_runner(A, B, Rounds, Size) ->
     [A] = rpc:call(B, erlang, nodes, []),
     ClientPid = self(),
     ServerPid =
-        erlang:spawn(
+        erlang:spawn_opt(
           B,
-          fun () -> throughput_server(ClientPid, Rounds) end),
+          fun () -> throughput_server(ClientPid, Rounds) end,
+          [{message_queue_data, off_heap}]),
     ServerMon = erlang:monitor(process, ServerPid),
-    msacc:available() andalso
+    msacc_available() andalso
         begin
             msacc:stop(),
             msacc:reset(),
@@ -457,11 +594,11 @@ throughput_runner(A, B, Rounds, Size) ->
             ok
         end,
     prof_start(),
-    {Time,ServerMsaccStats,ServerProf} =
+    #{time := Time} = Result =
         throughput_client(ServerPid, ServerMon, Payload, Rounds),
     prof_stop(),
-    ClientMsaccStats =
-        case msacc:available() of
+    MsaccStats =
+        case msacc_available() of
             true ->
                 MStats = msacc:stats(),
                 msacc:stop(),
@@ -469,15 +606,13 @@ throughput_runner(A, B, Rounds, Size) ->
             false ->
                 undefined
         end,
-    ClientProf = prof_end(),
+    Prof = prof_end(),
     [{_Node,Socket}] = dig_dist_node_sockets(),
     DistStats = inet:getstat(Socket),
-    #{time => microseconds(Time),
-      dist_stats => DistStats,
-      client_msacc_stats => ClientMsaccStats,
-      client_prof => ClientProf,
-      server_msacc_stats => ServerMsaccStats,
-      server_prof => ServerProf}.
+    Result#{time := microseconds(Time),
+            client_dist_stats => DistStats,
+            client_msacc_stats => MsaccStats,
+            client_prof => Prof}.
 
 dig_dist_node_sockets() ->
     [case DistCtrl of
@@ -500,7 +635,10 @@ dig_dist_node_sockets() ->
 
 
 throughput_server(Pid, N) ->
-    msacc:available() andalso
+    GC_Before = get_server_gc_info(),
+    %% dbg:tracer(port, dbg:trace_port(file, "throughput_server_gc.log")),
+    %% dbg:p(TLSDistReceiver, garbage_collection),
+    msacc_available() andalso
         begin
             msacc:stop(),
             msacc:reset(),
@@ -508,12 +646,12 @@ throughput_server(Pid, N) ->
             ok
         end,
     prof_start(),
-    throughput_server_loop(Pid, N).
+    throughput_server_loop(Pid, GC_Before, N).
 
-throughput_server_loop(_Pid, 0) ->
+throughput_server_loop(_Pid, GC_Before, 0) ->
     prof_stop(),
     MsaccStats =
-        case msacc:available() of
+        case msacc_available() of
             true ->
                 msacc:stop(),
                 MStats = msacc:stats(),
@@ -523,11 +661,31 @@ throughput_server_loop(_Pid, 0) ->
                 undefined
         end,
     Prof = prof_end(),
-    exit({ok,MsaccStats,Prof});
-throughput_server_loop(Pid, N) ->
+    %% dbg:flush_trace_port(),
+    exit(#{server_msacc_stats => MsaccStats,
+           server_prof => Prof,
+           server_gc_before => GC_Before,
+           server_gc_after => get_server_gc_info()});
+throughput_server_loop(Pid, GC_Before, N) ->
     receive
-        {Pid, N, _} ->
-            throughput_server_loop(Pid, N-1)
+        Msg ->
+            case Msg of
+                {Pid, N, _} ->
+                    throughput_server_loop(Pid, GC_Before, N - 1);
+                Other ->
+                    erlang:error({self(),?FUNCTION_NAME,Other})
+            end
+    end.
+
+get_server_gc_info() ->
+    case whereis(ssl_connection_sup_dist) of
+        undefined ->
+            undefined;
+        SupPid ->
+            [{_Id,TLSDistReceiver,_Type,_Modules}|_] =
+                supervisor:which_children(SupPid),
+            erlang:process_info(
+              TLSDistReceiver, [garbage_collection,garbage_collection_info])
     end.
 
 throughput_client(Pid, Mon, Payload, N) ->
@@ -535,8 +693,8 @@ throughput_client(Pid, Mon, Payload, N) ->
 
 throughput_client_loop(_Pid, Mon, _Payload, 0, StartTime) ->
     receive
-        {'DOWN', Mon, _, _, {ok,MsaccStats,Prof}} ->
-            {elapsed_time(StartTime),MsaccStats,Prof};
+        {'DOWN', Mon, _, _, #{} = Result} ->
+            Result#{time => elapsed_time(StartTime)};
         {'DOWN', Mon, _, _, Other} ->
             exit(Other)
     end;
@@ -554,6 +712,7 @@ prof_start() ->
     ok.
 -elif(?prof =:= eprof).
 prof_start() ->
+    catch eprof:stop(),
     {ok,_} = eprof:start(),
     profiling = eprof:start_profiling(processes()),
     ok.
@@ -655,7 +814,7 @@ get_node_args(Tag, Config) ->
         true ->
             proplists:get_value(Tag, Config);
         false ->
-            ""
+            proplists:get_value(ssl_dist_args, Config, "")
     end.
 
 
@@ -710,3 +869,6 @@ report(Name, Value, Unit) ->
 term_to_string(Term) ->
     unicode:characters_to_list(
       io_lib:write(Term, [{encoding, unicode}])).
+
+msacc_available() ->
+    msacc:available().
diff --git a/lib/ssl/test/ssl_dist_test_lib.erl b/lib/ssl/test/ssl_dist_test_lib.erl
index 1b9c853fc4..b8b805b2c4 100644
--- a/lib/ssl/test/ssl_dist_test_lib.erl
+++ b/lib/ssl/test/ssl_dist_test_lib.erl
@@ -144,6 +144,8 @@ mk_node_cmdline(ListenPort, Name, Args) ->
 	++ integer_to_list(ListenPort) ++ " "
 	++ Args ++ " "
 	++ "-env ERL_CRASH_DUMP " ++ Pwd ++ "/erl_crash_dump." ++ Name ++ " "
+        ++ "-kernel inet_dist_connect_options \"[{recbuf,12582912},{sndbuf,12582912},{high_watermark,8388608},{low_watermark,4194304}]\" "
+        ++ "-kernel inet_dist_listen_options \"[{recbuf,12582912},{sndbuf,12582912},{high_watermark,8388608},{low_watermark,4194304}]\" "
 	++ "-kernel error_logger \"{file,\\\"" ++ Pwd ++ "/error_log." ++ Name ++ "\\\"}\" "
 	++ "-setcookie " ++ atom_to_list(erlang:get_cookie()).
 
@@ -179,8 +181,9 @@ check_ssl_node_up(Socket, Name, Bin) ->
 		    Parent = self(),
 		    Go = make_ref(),
 		    %% Spawn connection handler on test server side
-		    Pid = spawn_link(
+		    Pid = spawn(
 			    fun () ->
+                                    link(group_leader()),
 				    receive Go -> ok end,
                                     process_flag(trap_exit, true),
 				    tstsrvr_con_loop(Name, Socket, Parent)
diff --git a/lib/ssl/test/ssl_eqc_SUITE.erl b/lib/ssl/test/ssl_eqc_SUITE.erl
new file mode 100644
index 0000000000..bfdb1a3d54
--- /dev/null
+++ b/lib/ssl/test/ssl_eqc_SUITE.erl
@@ -0,0 +1,70 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2015-2015. All Rights Reserved.
+%% 
+%% 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.
+%% 
+%% %CopyrightEnd%
+%%
+%%
+
+-module(ssl_eqc_SUITE).
+
+-compile(export_all).
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+
+all() -> 
+    [
+     tls_handshake_encoding,
+     tls_cipher_suite_names,
+     tls_cipher_openssl_suite_names
+    ].
+
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    ct_property_test:init_per_suite(Config).
+end_per_suite(Config) ->
+    Config.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_,Config) ->
+    Config.
+
+init_per_testcase(_, Config0) ->
+    Config0.
+
+end_per_testcase(_TestCase, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+tls_handshake_encoding(Config) when is_list(Config) ->
+    %% manual test:  proper:quickcheck(ssl_eqc_handshake:prop_tls_hs_encode_decode()).
+    true =  ct_property_test:quickcheck(ssl_eqc_handshake:prop_tls_hs_encode_decode(),
+                                        Config).
+
+tls_cipher_suite_names(Config) when is_list(Config) ->
+    %% manual test:  proper:quickcheck(ssl_eqc_cipher_format:prop_tls_cipher_suite_rfc_name()).
+    true =  ct_property_test:quickcheck(ssl_eqc_cipher_format:prop_tls_cipher_suite_rfc_name(),
+                                        Config).
+
+tls_cipher_openssl_suite_names(Config) when is_list(Config) ->
+    %% manual test:  proper:quickcheck(ssl_eqc_handshake:prop_tls_cipher_suite_openssl_name()).
+    true =  ct_property_test:quickcheck(ssl_eqc_cipher_format:prop_tls_cipher_suite_openssl_name(),
+                                        Config).
diff --git a/lib/ssl/test/ssl_handshake_SUITE.erl b/lib/ssl/test/ssl_handshake_SUITE.erl
index b8b9989d30..2750a4a9dc 100644
--- a/lib/ssl/test/ssl_handshake_SUITE.erl
+++ b/lib/ssl/test/ssl_handshake_SUITE.erl
@@ -25,6 +25,8 @@
 -compile(export_all).
 
 -include_lib("common_test/include/ct.hrl").
+-include("ssl_alert.hrl").
+-include("ssl_handshake.hrl").
 -include("ssl_internal.hrl").
 -include("tls_handshake.hrl").
 -include_lib("public_key/include/public_key.hrl").
@@ -41,7 +43,8 @@ all() -> [decode_hello_handshake,
 	  decode_empty_server_sni_correctly,
 	  select_proper_tls_1_2_rsa_default_hashsign,
 	  ignore_hassign_extension_pre_tls_1_2,
-          unorded_chain].
+	  unorded_chain, signature_algorithms,
+	  encode_decode_srp].
 
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
@@ -55,7 +58,9 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_,Config) ->
     Config.
 
-init_per_testcase(ignore_hassign_extension_pre_tls_1_2, Config0) ->
+init_per_testcase(TC, Config0) when
+      TC =:= ignore_hassign_extension_pre_tls_1_2 orelse
+      TC =:= signature_algorithms ->
     catch crypto:stop(),
     try crypto:start() of
 	ok ->
@@ -104,15 +109,13 @@ decode_hello_handshake(_Config) ->
 							 #ssl_options{}),
 
     {Hello, _Data} = hd(Records),
-    #renegotiation_info{renegotiated_connection = <<0>>}
-	= (Hello#server_hello.extensions)#hello_extensions.renegotiation_info.
-
+    Extensions = Hello#server_hello.extensions,
+    #{renegotiation_info := #renegotiation_info{renegotiated_connection = <<0>>}} = Extensions.
 
 decode_single_hello_extension_correctly(_Config) -> 
     Renegotiation = <<?UINT16(?RENEGOTIATION_EXT), ?UINT16(1), 0>>,
-    Extensions = ssl_handshake:decode_hello_extensions(Renegotiation),
-    #renegotiation_info{renegotiated_connection = <<0>>}
-	= Extensions#hello_extensions.renegotiation_info.
+    Extensions = ssl_handshake:decode_extensions(Renegotiation, {3,3}, undefined),
+    #{renegotiation_info := #renegotiation_info{renegotiated_connection = <<0>>}} = Extensions.
 
 decode_supported_elliptic_curves_hello_extension_correctly(_Config) ->
     % List of supported and unsupported curves (RFC4492:S5.1.1)
@@ -123,37 +126,34 @@ decode_supported_elliptic_curves_hello_extension_correctly(_Config) ->
     Len = ListLen + 2,
     Extension = <<?UINT16(?ELLIPTIC_CURVES_EXT), ?UINT16(Len), ?UINT16(ListLen), EllipticCurveList/binary>>,
     % after decoding we should see only valid curves
-    #hello_extensions{elliptic_curves = DecodedCurves} = ssl_handshake:decode_hello_extensions(Extension),
-    #elliptic_curves{elliptic_curve_list = [?sect233k1, ?sect193r2]} = DecodedCurves.
+    Extensions = ssl_handshake:decode_hello_extensions(Extension, {3,2}, {3,2}, client),
+    #{elliptic_curves := #elliptic_curves{elliptic_curve_list = [?sect233k1, ?sect193r2]}} = Extensions. 
 
 decode_unknown_hello_extension_correctly(_Config) ->
     FourByteUnknown = <<16#CA,16#FE, ?UINT16(4), 3, 0, 1, 2>>,
     Renegotiation = <<?UINT16(?RENEGOTIATION_EXT), ?UINT16(1), 0>>,
-    Extensions = ssl_handshake:decode_hello_extensions(<<FourByteUnknown/binary, Renegotiation/binary>>),
-     #renegotiation_info{renegotiated_connection = <<0>>}
-	= Extensions#hello_extensions.renegotiation_info.
+    Extensions = ssl_handshake:decode_hello_extensions(<<FourByteUnknown/binary, Renegotiation/binary>>, {3,2}, {3,2}, client),
+    #{renegotiation_info := #renegotiation_info{renegotiated_connection = <<0>>}} = Extensions.
+
 
 encode_single_hello_sni_extension_correctly(_Config) ->
-    Exts = #hello_extensions{sni = #sni{hostname = "test.com"}},
     SNI = <<16#00, 16#00, 16#00, 16#0d, 16#00, 16#0b, 16#00, 16#00, 16#08,
 	    $t,    $e,    $s,    $t,    $.,    $c,    $o,    $m>>,
     ExtSize = byte_size(SNI),
     HelloExt = <<ExtSize:16/unsigned-big-integer, SNI/binary>>,
-    Encoded = ssl_handshake:encode_hello_extensions(Exts),
+    Encoded = ssl_handshake:encode_extensions([#sni{hostname = "test.com"}]),
     HelloExt = Encoded.
 
 decode_single_hello_sni_extension_correctly(_Config) ->
-    Exts = #hello_extensions{sni = #sni{hostname = "test.com"}},
     SNI = <<16#00, 16#00, 16#00, 16#0d, 16#00, 16#0b, 16#00, 16#00, 16#08,
 	    $t,    $e,    $s,    $t,    $.,    $c,    $o,    $m>>,
-    Decoded = ssl_handshake:decode_hello_extensions(SNI),
-    Exts = Decoded.
+    Decoded = ssl_handshake:decode_hello_extensions(SNI, {3,3}, {3,3}, client),
+    #{sni := #sni{hostname = "test.com"}} = Decoded.
 
 decode_empty_server_sni_correctly(_Config) ->
-    Exts = #hello_extensions{sni = #sni{hostname = ""}},
     SNI = <<?UINT16(?SNI_EXT),?UINT16(0)>>,
-    Decoded = ssl_handshake:decode_hello_extensions(SNI),
-    Exts = Decoded.
+    Decoded = ssl_handshake:decode_hello_extensions(SNI, {3,3}, {3,3}, server),
+    #{sni := #sni{hostname = ""}} = Decoded.
 
 
 select_proper_tls_1_2_rsa_default_hashsign(_Config) ->
@@ -168,11 +168,11 @@ ignore_hassign_extension_pre_tls_1_2(Config) ->
     Opts = proplists:get_value(server_opts, Config),
     CertFile = proplists:get_value(certfile, Opts),
     [{_, Cert, _}] = ssl_test_lib:pem_to_der(CertFile),
-    HashSigns = #hash_sign_algos{hash_sign_algos = [{sha512, rsa}, {sha, dsa}]},
-    {sha512, rsa} = ssl_handshake:select_hashsign(HashSigns, Cert, ecdhe_rsa, tls_v1:default_signature_algs({3,3}), {3,3}),
+    HashSigns = #hash_sign_algos{hash_sign_algos = [{sha512, rsa}, {sha, dsa}, {sha, rsa}]},
+    {sha512, rsa} = ssl_handshake:select_hashsign({HashSigns, undefined}, Cert, ecdhe_rsa, tls_v1:default_signature_algs({3,3}), {3,3}),
     %%% Ignore
-    {md5sha, rsa} = ssl_handshake:select_hashsign(HashSigns, Cert, ecdhe_rsa, tls_v1:default_signature_algs({3,2}), {3,2}),
-    {md5sha, rsa} = ssl_handshake:select_hashsign(HashSigns, Cert, ecdhe_rsa, tls_v1:default_signature_algs({3,0}), {3,0}).
+    {md5sha, rsa} = ssl_handshake:select_hashsign({HashSigns, undefined}, Cert, ecdhe_rsa, tls_v1:default_signature_algs({3,2}), {3,2}),
+    {md5sha, rsa} = ssl_handshake:select_hashsign({HashSigns, undefined}, Cert, ecdhe_rsa, tls_v1:default_signature_algs({3,0}), {3,0}).
 
 unorded_chain(Config) when is_list(Config) ->
     DefConf = ssl_test_lib:default_cert_chain_conf(),
@@ -192,6 +192,79 @@ unorded_chain(Config) when is_list(Config) ->
     {ok, _, OrderedChain} = 
         ssl_certificate:certificate_chain(PeerCert, ets:new(foo, []), ExtractedCerts, UnordedChain).
 
+encode_decode_srp(_Config) ->
+    Exts = #{srp => #srp{username = <<"foo">>},
+             sni => #sni{hostname = "bar"},
+             renegotiation_info => undefined,
+             signature_algs => undefined,
+             alpn => undefined,
+             next_protocol_negotiation => undefined,
+             ec_point_formats => undefined,
+             elliptic_curves => undefined
+            },
+    EncodedExts0 = <<0,20,          % Length
+                    0,12,          % SRP extension
+                    0,4,           % Length
+                    3,             % srp_I length
+                    102,111,111, % username = "foo"
+                    0,0,           % SNI extension
+                    0,8,           % Length
+                    0,6,           % ServerNameLength
+                    0,             % NameType (host_name)
+                    0,3,           % HostNameLength
+                    98,97,114>>,     % hostname = "bar"
+    EncodedExts0 = <<?UINT16(_),EncodedExts/binary>> =
+        ssl_handshake:encode_hello_extensions(Exts, {3,3}),
+    Exts = ssl_handshake:decode_hello_extensions(EncodedExts, {3,3}, {3,3}, client).
+
+signature_algorithms(Config) ->
+    Opts = proplists:get_value(server_opts, Config),
+    CertFile = proplists:get_value(certfile, Opts),
+    io:format("Cert = ~p~n", [CertFile]),
+    [{_, Cert, _}] = ssl_test_lib:pem_to_der(CertFile),
+    HashSigns0 = #hash_sign_algos{
+                   hash_sign_algos = [{sha512, rsa},
+                                      {sha, dsa},
+                                      {sha, rsa}]},
+    Schemes0 = #signature_algorithms_cert{
+                 signature_scheme_list = [rsa_pkcs1_sha1,
+                                          ecdsa_sha1]},
+    {sha512, rsa} = ssl_handshake:select_hashsign(
+                      {HashSigns0, Schemes0},
+                      Cert, ecdhe_rsa,
+                      tls_v1:default_signature_algs({3,3}),
+                      {3,3}),
+    HashSigns1 = #hash_sign_algos{
+                    hash_sign_algos = [{sha, dsa},
+                                      {sha, rsa}]},
+    {sha, rsa} = ssl_handshake:select_hashsign(
+                      {HashSigns1, Schemes0},
+                      Cert, ecdhe_rsa,
+                      tls_v1:default_signature_algs({3,3}),
+                   {3,3}),
+    Schemes1 = #signature_algorithms_cert{
+                  signature_scheme_list = [rsa_pkcs1_sha256,
+                                           ecdsa_sha1]},
+    %% Signature not supported
+    #alert{} = ssl_handshake:select_hashsign(
+                 {HashSigns1, Schemes1},
+                 Cert, ecdhe_rsa,
+                 tls_v1:default_signature_algs({3,3}),
+                 {3,3}),
+    %% No scheme, hashsign is used
+    {sha, rsa} = ssl_handshake:select_hashsign(
+                   {HashSigns1, undefined},
+                   Cert, ecdhe_rsa,
+                   tls_v1:default_signature_algs({3,3}),
+                   {3,3}),
+    HashSigns2 = #hash_sign_algos{
+                    hash_sign_algos = [{sha, dsa}]},
+    %% Signature not supported
+    #alert{} = ssl_handshake:select_hashsign(
+                 {HashSigns2, Schemes1},
+                 Cert, ecdhe_rsa,
+                 tls_v1:default_signature_algs({3,3}),
+                 {3,3}).
 
 %%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
diff --git a/lib/ssl/test/ssl_npn_handshake_SUITE.erl b/lib/ssl/test/ssl_npn_SUITE.erl
index 1c7d6b5f9f..8a76a3a82b 100644
--- a/lib/ssl/test/ssl_npn_handshake_SUITE.erl
+++ b/lib/ssl/test/ssl_npn_SUITE.erl
@@ -19,7 +19,7 @@
 %%
 
 %%
--module(ssl_npn_handshake_SUITE).
+-module(ssl_npn_SUITE).
 
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
@@ -64,13 +64,12 @@ next_protocol_not_supported() ->
      npn_not_supported_server
     ].
 
-init_per_suite(Config) ->
+init_per_suite(Config0) ->
     catch crypto:stop(),
     try crypto:start() of
 	ok ->
 	    ssl_test_lib:clean_start(),
-	    {ok, _} = make_certs:all(proplists:get_value(data_dir, Config),
-				      proplists:get_value(priv_dir, Config)),
+	    Config = ssl_test_lib:make_rsa_cert(Config0),
 	    ssl_test_lib:cert_options(Config)
     catch _:_ ->
 	    {skip, "Crypto did not start"}
@@ -196,10 +195,10 @@ client_negotiate_server_does_not_support(Config) when is_list(Config) ->
 renegotiate_from_client_after_npn_handshake(Config) when is_list(Config) ->
     Data = "hello world",
     
-    ClientOpts0 = ssl_test_lib:ssl_options(client_opts, Config),
+    ClientOpts0 = ssl_test_lib:ssl_options(client_rsa_verify_opts, Config),
     ClientOpts = [{client_preferred_next_protocols,
 		   {client, [<<"http/1.0">>], <<"http/1.1">>}}] ++ ClientOpts0,
-    ServerOpts0 = ssl_test_lib:ssl_options(server_opts, Config),
+    ServerOpts0 = ssl_test_lib:ssl_options(server_rsa_opts, Config),
     ServerOpts = [{next_protocols_advertised,
 		   [<<"spdy/2">>, <<"http/1.1">>, <<"http/1.0">>]}] ++  ServerOpts0,
     ExpectedProtocol = {ok, <<"http/1.0">>},
@@ -221,7 +220,7 @@ renegotiate_from_client_after_npn_handshake(Config) when is_list(Config) ->
 
 %--------------------------------------------------------------------------------
 npn_not_supported_client(Config) when is_list(Config) ->
-    ClientOpts0 = ssl_test_lib:ssl_options(client_opts, Config),
+    ClientOpts0 = ssl_test_lib:ssl_options(client_rsa_verify_opts, Config),
     PrefProtocols = {client_preferred_next_protocols,
 		     {client, [<<"http/1.0">>], <<"http/1.1">>}},
     ClientOpts = [PrefProtocols] ++ ClientOpts0,
@@ -236,7 +235,7 @@ npn_not_supported_client(Config) when is_list(Config) ->
 
 %--------------------------------------------------------------------------------
 npn_not_supported_server(Config) when is_list(Config)->
-    ServerOpts0 = ssl_test_lib:ssl_options(server_opts, Config),
+    ServerOpts0 = ssl_test_lib:ssl_options(server_rsa_opts, Config),
     AdvProtocols = {next_protocols_advertised, [<<"spdy/2">>, <<"http/1.1">>, <<"http/1.0">>]},
     ServerOpts = [AdvProtocols] ++  ServerOpts0,
   
@@ -244,63 +243,24 @@ npn_not_supported_server(Config) when is_list(Config)->
 
 %--------------------------------------------------------------------------------
 npn_handshake_session_reused(Config) when  is_list(Config)->
-    ClientOpts0 = ssl_test_lib:ssl_options(client_opts, Config),
+    ClientOpts0 = ssl_test_lib:ssl_options(client_rsa_verify_opts, Config),
     ClientOpts = [{client_preferred_next_protocols,
 		   {client, [<<"http/1.0">>], <<"http/1.1">>}}] ++ ClientOpts0,
-    ServerOpts0 = ssl_test_lib:ssl_options(server_opts, Config),
+    ServerOpts0 = ssl_test_lib:ssl_options(server_rsa_opts, Config),
     ServerOpts =[{next_protocols_advertised,
 		   [<<"spdy/2">>, <<"http/1.1">>, <<"http/1.0">>]}]  ++ ServerOpts0,
 
-    {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, session_info_result, []}},
-					{options, ServerOpts}]),
-
-    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, no_result_msg, []}},
-               {options, ClientOpts}]),
-
-    SessionInfo = 
-	receive
-	    {Server, Info} ->
-		Info
-	end,
-        
-    Server ! {listen, {mfa, {ssl_test_lib, no_result, []}}},
-    
-    %% Make sure session is registered
-    ct:sleep(?SLEEP),
-
-    Client1 =
-	ssl_test_lib:start_client([{node, ClientNode},
-				   {port, Port}, {host, Hostname},
-				   {mfa, {ssl_test_lib, session_info_result, []}},
-				   {from, self()},  {options, ClientOpts}]),
-
-      receive
-	{Client1, SessionInfo} ->
-	    ok;
-	{Client1, Other} ->
-	    ct:fail(Other)
-      end,
+    ssl_test_lib:reuse_session(ClientOpts, ServerOpts, Config).
     
-    ssl_test_lib:close(Server), 
-    ssl_test_lib:close(Client),
-    ssl_test_lib:close(Client1).
-
 %%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
 run_npn_handshake(Config, ClientExtraOpts, ServerExtraOpts, ExpectedProtocol) ->
     Data = "hello world",
 
-    ClientOpts0 = ssl_test_lib:ssl_options(client_opts, Config),
+    ClientOpts0 = ssl_test_lib:ssl_options(client_rsa_verify_opts, Config),
     ClientOpts = ClientExtraOpts ++ ClientOpts0,
-    ServerOpts0 = ssl_test_lib:ssl_options(server_opts, Config),
+    ServerOpts0 = ssl_test_lib:ssl_options(server_rsa_opts, Config),
     ServerOpts = ServerExtraOpts ++  ServerOpts0,
 
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
diff --git a/lib/ssl/test/ssl_npn_hello_SUITE.erl b/lib/ssl/test/ssl_npn_hello_SUITE.erl
index 35af666e9e..7dbc0c5134 100644
--- a/lib/ssl/test/ssl_npn_hello_SUITE.erl
+++ b/lib/ssl/test/ssl_npn_hello_SUITE.erl
@@ -24,10 +24,11 @@
 
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
--include("ssl_cipher.hrl").
--include("ssl_internal.hrl").
--include("tls_handshake.hrl").
--include("tls_record.hrl").
+
+-include_lib("ssl/src/tls_record.hrl").
+-include_lib("ssl/src/tls_handshake.hrl").
+-include_lib("ssl/src/ssl_cipher.hrl").
+-include_lib("ssl/src/ssl_internal.hrl").
 -include_lib("common_test/include/ct.hrl").
 
 %%--------------------------------------------------------------------
@@ -71,44 +72,46 @@ encode_and_decode_client_hello_test(Config) ->
     Version = ssl_test_lib:protocol_version(Config),
     {[{DecodedHandshakeMessage, _Raw}], _} =
 	tls_handshake:get_tls_handshake(Version, list_to_binary(HandShakeData), <<>>, #ssl_options{}),
-    NextProtocolNegotiation = (DecodedHandshakeMessage#client_hello.extensions)#hello_extensions.next_protocol_negotiation,
-    NextProtocolNegotiation = undefined.
+    Extensions = DecodedHandshakeMessage#client_hello.extensions,
+    #{next_protocol_negotiation := undefined} = Extensions.
 %%--------------------------------------------------------------------
 encode_and_decode_npn_client_hello_test(Config) ->
     HandShakeData = create_client_handshake(#next_protocol_negotiation{extension_data = <<>>}),
     Version = ssl_test_lib:protocol_version(Config),
     {[{DecodedHandshakeMessage, _Raw}], _} =
 	tls_handshake:get_tls_handshake(Version, list_to_binary(HandShakeData), <<>>,  #ssl_options{}),
-    NextProtocolNegotiation = (DecodedHandshakeMessage#client_hello.extensions)#hello_extensions.next_protocol_negotiation,
-    NextProtocolNegotiation = #next_protocol_negotiation{extension_data = <<>>}.
+    Extensions = DecodedHandshakeMessage#client_hello.extensions,
+    #{next_protocol_negotiation := #next_protocol_negotiation{extension_data = <<>>}} = Extensions.
 %%--------------------------------------------------------------------
 encode_and_decode_server_hello_test(Config) ->
     HandShakeData = create_server_handshake(undefined),
     Version = ssl_test_lib:protocol_version(Config),
     {[{DecodedHandshakeMessage, _Raw}], _} =
 	tls_handshake:get_tls_handshake(Version, list_to_binary(HandShakeData), <<>>, #ssl_options{}),
-    NextProtocolNegotiation = (DecodedHandshakeMessage#server_hello.extensions)#hello_extensions.next_protocol_negotiation,
-    NextProtocolNegotiation = undefined.
+    Extensions = DecodedHandshakeMessage#server_hello.extensions,
+    #{next_protocol_negotiation := undefined} = Extensions.
+
 %%--------------------------------------------------------------------
 encode_and_decode_npn_server_hello_test(Config) ->
     HandShakeData = create_server_handshake(#next_protocol_negotiation{extension_data = <<6, "spdy/2">>}),
     Version = ssl_test_lib:protocol_version(Config),
     {[{DecodedHandshakeMessage, _Raw}], _} =
 	tls_handshake:get_tls_handshake(Version, list_to_binary(HandShakeData), <<>>,  #ssl_options{}),
-    NextProtocolNegotiation = (DecodedHandshakeMessage#server_hello.extensions)#hello_extensions.next_protocol_negotiation,
-    ct:log("~p ~n", [NextProtocolNegotiation]),
-    NextProtocolNegotiation = #next_protocol_negotiation{extension_data = <<6, "spdy/2">>}.
+    Extensions = DecodedHandshakeMessage#server_hello.extensions, 
+    ct:log("~p ~n", [Extensions]),
+    #{next_protocol_negotiation := #next_protocol_negotiation{extension_data = <<6, "spdy/2">>}} = Extensions.
 
 %%--------------------------------------------------------------------
 create_server_hello_with_no_advertised_protocols_test(_Config) ->
-    Hello = ssl_handshake:server_hello(<<>>, {3, 0}, create_connection_states(), #hello_extensions{}),
-    undefined = (Hello#server_hello.extensions)#hello_extensions.next_protocol_negotiation.
+    Hello = ssl_handshake:server_hello(<<>>, {3, 0}, create_connection_states(), #{}),
+    Extensions = Hello#server_hello.extensions,
+    #{} = Extensions.
 %%--------------------------------------------------------------------
 create_server_hello_with_advertised_protocols_test(_Config) ->
     Hello = ssl_handshake:server_hello(<<>>, {3, 0}, create_connection_states(),
-				       #hello_extensions{next_protocol_negotiation = [<<"spdy/1">>, <<"http/1.0">>, <<"http/1.1">>]}),
-    [<<"spdy/1">>, <<"http/1.0">>, <<"http/1.1">>] =
-	(Hello#server_hello.extensions)#hello_extensions.next_protocol_negotiation.
+				       #{next_protocol_negotiation => [<<"spdy/1">>, <<"http/1.0">>, <<"http/1.1">>]}),
+    Extensions = Hello#server_hello.extensions,
+    #{next_protocol_negotiation := [<<"spdy/1">>, <<"http/1.0">>, <<"http/1.1">>]} = Extensions.
 %%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
@@ -120,9 +123,8 @@ create_client_handshake(Npn) ->
 				      session_id = <<>>,
 				      cipher_suites = [?TLS_DHE_DSS_WITH_DES_CBC_SHA],
 				      compression_methods = "",
-				      extensions = #hello_extensions{
-						      next_protocol_negotiation = Npn,
-						      renegotiation_info = #renegotiation_info{}}
+				      extensions = #{next_protocol_negotiation => Npn,
+						      renegotiation_info => #renegotiation_info{}}
 				     }, Vsn).
 
 create_server_handshake(Npn) ->
@@ -133,9 +135,8 @@ create_server_handshake(Npn) ->
 				      session_id = <<>>,
 				      cipher_suite = ?TLS_DHE_DSS_WITH_DES_CBC_SHA,
 				      compression_method = 1,
-				      extensions = #hello_extensions{
-						      next_protocol_negotiation = Npn,
-						      renegotiation_info = #renegotiation_info{}}
+				      extensions = #{next_protocol_negotiation => Npn,
+                                                     renegotiation_info => #renegotiation_info{}}
 				     }, Vsn).
 
 create_connection_states() ->
@@ -146,5 +147,5 @@ create_connection_states() ->
 						 }
 		       },
       current_read => #{secure_renegotiation => false
-       }
+                       }
      }.
diff --git a/lib/ssl/test/ssl_packet_SUITE.erl b/lib/ssl/test/ssl_packet_SUITE.erl
index 9af1ae0e3f..6d26b2df33 100644
--- a/lib/ssl/test/ssl_packet_SUITE.erl
+++ b/lib/ssl/test/ssl_packet_SUITE.erl
@@ -2122,26 +2122,13 @@ active_once_packet(Socket, Data, N) ->
     active_once_packet(Socket, Data, N-1).
 
 active_raw(Socket, Data, N) ->
-    active_raw(Socket, Data, N, []).
-
-active_raw(_Socket, _, 0, _) ->
+    active_raw(Socket, (length(Data) * N)).
+active_raw(_Socket, 0) ->
     ok;
-active_raw(Socket, Data, N, Acc) ->
+active_raw(Socket, N) ->
     receive 
-	{ssl, Socket, Byte} when length(Byte) == 1 ->
-	    receive
-		{ssl, Socket, _} ->
-		    active_raw(Socket, Data, N -1)
-	    end;
-	{ssl, Socket, Data} ->
-	    active_raw(Socket, Data, N-1, []);
-	{ssl, Socket, Other} ->
-	    case Acc ++ Other of
-		Data ->
-		    active_raw(Socket, Data, N-1, []);
-		NewAcc ->
-		    active_raw(Socket, Data, NewAcc)
-	    end
+	{ssl, Socket, Bytes} ->
+            active_raw(Socket, N-length(Bytes))
     end.
 
 active_packet(Socket, _, 0) ->
diff --git a/lib/ssl/test/ssl_payload_SUITE.erl b/lib/ssl/test/ssl_payload_SUITE.erl
index 1f9b6a5772..2d0ffd03d7 100644
--- a/lib/ssl/test/ssl_payload_SUITE.erl
+++ b/lib/ssl/test/ssl_payload_SUITE.erl
@@ -48,23 +48,30 @@ groups() ->
 
 payload_tests() ->
     [server_echos_passive_small,
+     server_echos_passive_chunk_small,
      server_echos_active_once_small,
      server_echos_active_small,
      client_echos_passive_small,
+     client_echos_passive_chunk_small,
      client_echos_active_once_small,
      client_echos_active_small,
      server_echos_passive_big,
+     server_echos_passive_chunk_big,
      server_echos_active_once_big,
      server_echos_active_big,
      client_echos_passive_big,
+     client_echos_passive_chunk_big,
      client_echos_active_once_big,
      client_echos_active_big,
      server_echos_passive_huge,
+     server_echos_passive_chunk_huge,
      server_echos_active_once_huge,
      server_echos_active_huge,
      client_echos_passive_huge,
+     client_echos_passive_chunk_huge,
      client_echos_active_once_huge,
-     client_echos_active_huge].
+     client_echos_active_huge,
+     client_active_once_server_close].
 
 init_per_suite(Config) ->
     catch crypto:stop(),
@@ -108,9 +115,11 @@ end_per_group(GroupName, Config) ->
 
 init_per_testcase(TestCase, Config)
   when TestCase == server_echos_passive_huge;
+       TestCase == server_echos_passive_chunk_huge;
        TestCase == server_echos_active_once_huge;
        TestCase == server_echos_active_huge;
        TestCase == client_echos_passive_huge;
+       TestCase == client_echos_passive_chunk_huge;
        TestCase == client_echos_active_once_huge;
        TestCase == client_echos_active_huge ->
     case erlang:system_info(system_architecture) of
@@ -123,9 +132,11 @@ init_per_testcase(TestCase, Config)
 
 init_per_testcase(TestCase, Config)
   when TestCase == server_echos_passive_big;
+       TestCase == server_echos_passive_chunk_big;
        TestCase == server_echos_active_once_big;
        TestCase == server_echos_active_big;
        TestCase == client_echos_passive_big;
+       TestCase == client_echos_passive_chunk_big;
        TestCase == client_echos_active_once_big;
        TestCase == client_echos_active_big ->
     ct:timetrap({seconds, 60}),
@@ -156,6 +167,22 @@ server_echos_passive_small(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
+server_echos_passive_chunk_small() ->
+    [{doc, "Client sends 1000 bytes in passive mode to server, that receives them in chunks, "
+     "sends them back, and closes."}].
+
+server_echos_passive_chunk_small(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    %%
+    Data = binary:copy(<<"1234567890">>, 100),
+    server_echos_passive_chunk(
+      Data, ClientOpts, ServerOpts, ClientNode, ServerNode, Hostname).
+
+
+%%--------------------------------------------------------------------
+
 server_echos_active_once_small() ->
     [{doc, "Client sends 1000 bytes in active once mode to server, that receives "
      " them, sends them back, and closes."}].
@@ -199,6 +226,21 @@ client_echos_passive_small(Config) when is_list(Config) ->
       Data, ClientOpts, ServerOpts, ClientNode, ServerNode, Hostname).
 
 %%--------------------------------------------------------------------
+client_echos_passive_chunk__small() ->
+    [{doc, "Server sends 1000 bytes in passive mode to client, that receives them in chunks, "
+      "sends them back, and closes."}].
+
+client_echos_passive_chunk_small(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    %%
+    Data = binary:copy(<<"1234567890">>, 100),
+    client_echos_passive_chunk(
+      Data, ClientOpts, ServerOpts, ClientNode, ServerNode, Hostname).
+
+
+%%--------------------------------------------------------------------
 client_echos_active_once_small() ->
     ["Server sends 1000 bytes in active once mode to client, that receives "
      "them, sends them back, and closes."].
@@ -240,6 +282,19 @@ server_echos_passive_big(Config) when is_list(Config) ->
     Data = binary:copy(<<"1234567890">>, 5000),
     server_echos_passive(
       Data, ClientOpts, ServerOpts, ClientNode, ServerNode, Hostname).
+%%--------------------------------------------------------------------
+server_echos_passive_chunk_big() ->
+    [{doc, "Client sends 50000 bytes to server in passive mode, that receives them, "
+     "sends them back, and closes."}].
+
+server_echos_passive_chunk_big(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    %%
+    Data = binary:copy(<<"1234567890">>, 5000),
+    server_echos_passive_chunk(
+      Data, ClientOpts, ServerOpts, ClientNode, ServerNode, Hostname).
 
 %%--------------------------------------------------------------------
 
@@ -285,6 +340,22 @@ client_echos_passive_big(Config) when is_list(Config) ->
     client_echos_passive(
       Data, ClientOpts, ServerOpts, ClientNode, ServerNode, Hostname).
 
+
+%%--------------------------------------------------------------------
+client_echos_passive_chunk_big() ->
+    [{doc, "Server sends 50000 bytes to client in passive mode, that receives them, "
+     "sends them back, and closes."}].
+
+client_echos_passive_chunk_big(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    %%
+    Data = binary:copy(<<"1234567890">>, 5000),
+    client_echos_passive_chunk(
+      Data, ClientOpts, ServerOpts, ClientNode, ServerNode, Hostname).
+
+
 %%--------------------------------------------------------------------
 client_echos_active_once_big() ->
     [{doc, "Server sends 50000 bytes to client in active once mode, that receives"
@@ -328,6 +399,20 @@ server_echos_passive_huge(Config) when is_list(Config) ->
       Data, ClientOpts, ServerOpts, ClientNode, ServerNode, Hostname).
 
 %%--------------------------------------------------------------------
+server_echos_passive_chunk_huge() ->
+    [{doc, "Client sends 500000 bytes to server in passive mode, that receives "
+      " them, sends them back, and closes."}].
+
+server_echos_passive_chunk_huge(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    %%
+    Data = binary:copy(<<"1234567890">>, 50000),
+    server_echos_passive_chunk(
+      Data, ClientOpts, ServerOpts, ClientNode, ServerNode, Hostname).
+
+%%--------------------------------------------------------------------
 server_echos_active_once_huge() ->
     [{doc, "Client sends 500000 bytes to server in active once mode, that receives "
       "them, sends them back, and closes."}].
@@ -368,7 +453,19 @@ client_echos_passive_huge(Config) when is_list(Config) ->
     Data = binary:copy(<<"1234567890">>, 50000),
     client_echos_passive(
       Data, ClientOpts, ServerOpts, ClientNode, ServerNode, Hostname).
+%%--------------------------------------------------------------------
+client_echos_passive_chunk_huge() ->
+    [{doc, "Server sends 500000 bytes to client in passive mode, that receives "
+     "them, sends them back, and closes."}].
 
+client_echos_passive_chunk_huge(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    %%
+    Data = binary:copy(<<"1234567890">>, 50000),
+    client_echos_passive_chunk(
+      Data, ClientOpts, ServerOpts, ClientNode, ServerNode, Hostname).
 %%--------------------------------------------------------------------
 client_echos_active_once_huge() ->
     [{doc, "Server sends 500000 bytes to client in active once mode, that receives "
@@ -397,6 +494,23 @@ client_echos_active_huge(Config) when is_list(Config) ->
     client_echos_active(
       Data, ClientOpts, ServerOpts, ClientNode, ServerNode, Hostname).
  
+
+%%--------------------------------------------------------------------
+client_active_once_server_close() ->
+    [{doc, "Server sends 500000 bytes and immediately after closes the connection"
+     "Make sure client recives all data if possible"}].
+
+client_active_once_server_close(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    %%
+    Data = binary:copy(<<"1234567890">>, 50000),
+    client_active_once_server_close(
+      Data, ClientOpts, ServerOpts, ClientNode, ServerNode, Hostname).
+ 
+
+
 %%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
@@ -424,6 +538,28 @@ server_echos_passive(
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 
+server_echos_passive_chunk(
+  Data, ClientOpts, ServerOpts, ClientNode, ServerNode, Hostname) ->
+    Length = byte_size(Data),
+    Server =
+        ssl_test_lib:start_server(
+          [{node, ServerNode}, {port, 0},
+           {from, self()},
+           {mfa, {?MODULE, echoer_chunk, [Length]}},
+           {options, [{active, false}, {mode, binary} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client =
+        ssl_test_lib:start_client(
+          [{node, ClientNode}, {port, Port},
+           {host, Hostname},
+           {from, self()},
+           {mfa, {?MODULE, sender, [Data]}},
+           {options, [{active, false}, {mode, binary} | ClientOpts]}]),
+    %%
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    %%
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
 
 server_echos_active_once(
   Data, ClientOpts, ServerOpts, ClientNode, ServerNode, Hostname) ->
@@ -495,6 +631,31 @@ client_echos_passive(
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 
+
+client_echos_passive_chunk(
+  Data, ClientOpts, ServerOpts, ClientNode, ServerNode, Hostname) ->
+    Length = byte_size(Data),
+    Server =
+        ssl_test_lib:start_server(
+          [{node, ServerNode}, {port, 0},
+           {from, self()},
+           {mfa, {?MODULE, sender, [Data]}},
+           {options, [{active, false}, {mode, binary} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client =
+        ssl_test_lib:start_client(
+          [{node, ClientNode}, {port, Port},
+           {host, Hostname},
+           {from, self()},
+           {mfa, {?MODULE, echoer_chunk, [Length]}},
+           {options, [{active, false}, {mode, binary} | ClientOpts]}]),
+    %%
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    %%
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+
 client_echos_active_once(
   Data, ClientOpts, ServerOpts, ClientNode, ServerNode, Hostname) ->
     Length = byte_size(Data),
@@ -541,47 +702,66 @@ client_echos_active(
     ssl_test_lib:close(Server),
     ssl_test_lib:close(Client).
 
+client_active_once_server_close(
+  Data, ClientOpts, ServerOpts, ClientNode, ServerNode, Hostname) ->
+    Length = byte_size(Data),
+    Server =
+        ssl_test_lib:start_server(
+          [{node, ServerNode}, {port, 0},
+           {from, self()},
+           {mfa, {?MODULE, send_close, [Data]}},
+           {options, [{active, once}, {mode, binary} | ServerOpts]}]),
+    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, active_once_recv, [Length]}},
+           {options,[{active, once}, {mode, binary} | ClientOpts]}]),
+    %%
+    ssl_test_lib:check_result(Server, ok, Client, ok).
 
-send(Socket, Data, Count, Verify) ->
-    send(Socket, Data, Count, <<>>, Verify).
-%%
-send(_Socket, _Data, 0, Acc, _Verify) ->
-    Acc;
-send(Socket, Data, Count, Acc, Verify) ->
+send(_Socket, _Data, 0, _) ->
+    ok;
+send(Socket, Data, Count, RecvEcho) ->
     ok = ssl:send(Socket, Data),
-    NewAcc = Verify(Acc),
-    send(Socket, Data, Count - 1, NewAcc, Verify).
+    RecvEcho(),
+    send(Socket, Data, Count - 1, RecvEcho).
+
+send_close(Socket, Data) ->
+    ok = ssl:send(Socket, Data),
+    ssl:close(Socket).
 
- 
 sender(Socket, Data) ->
     ct:log("Sender recv: ~p~n", [ssl:getopts(Socket, [active])]),
-    <<>> =
-        send(
-          Socket, Data, 100,
-          fun(Acc) -> verify_recv(Socket, Data, Acc) end),
-    ok.
+    send(Socket, Data, 100,
+              fun() -> 
+                      ssl_test_lib:recv_disregard(Socket, byte_size(Data)) 
+              end).
 
 sender_active_once(Socket, Data) ->
     ct:log("Sender active once: ~p~n", [ssl:getopts(Socket, [active])]),
-    <<>> =
-        send(
-          Socket, Data, 100,
-          fun(Acc) -> verify_active_once(Socket, Data, Acc) end),
-    ok.
+    send(Socket, Data, 100,
+         fun() -> 
+                 ssl_test_lib:active_once_disregard(Socket, byte_size(Data)) 
+         end).
 
 sender_active(Socket, Data) ->
     ct:log("Sender active: ~p~n", [ssl:getopts(Socket, [active])]),
-    <<>> =
-        send(
-          Socket, Data, 100,
-          fun(Acc) -> verify_active(Socket, Data, Acc) end),
-    ok.
-
+    send(Socket, Data, 100,
+         fun() -> 
+                 ssl_test_lib:active_disregard(Socket, byte_size(Data)) 
+         end).
 
 echoer(Socket, Size) ->
     ct:log("Echoer recv: ~p~n", [ssl:getopts(Socket, [active])]),
     echo_recv(Socket, Size * 100).
 
+echoer_chunk(Socket, Size) ->
+    ct:log("Echoer recv: ~p~n", [ssl:getopts(Socket, [active])]),
+    echo_recv_chunk(Socket, Size, Size * 100).
+
 echoer_active_once(Socket, Size) ->
     ct:log("Echoer active once: ~p~n", [ssl:getopts(Socket, [active])]),
     echo_active_once(Socket, Size * 100).
@@ -592,99 +772,42 @@ echoer_active(Socket, Size) ->
 
 
 %% Receive Size bytes
+echo_recv(_Socket, 0) ->
+    ok;
 echo_recv(Socket, Size) ->
     {ok, Data} = ssl:recv(Socket, 0),
     ok = ssl:send(Socket, Data),
-    NewSize = Size - byte_size(Data),
-    if
-        0 < NewSize ->
-            echo_recv(Socket, NewSize);
-        0 == NewSize ->
-            ok
-    end.
+    echo_recv(Socket, Size - byte_size(Data)).
+
+
+%% Receive Size bytes
+echo_recv_chunk(_Socket, _, 0) ->
+    ok;
+echo_recv_chunk(Socket, ChunkSize, Size) ->
+    {ok, Data} = ssl:recv(Socket, ChunkSize),
+    ok = ssl:send(Socket, Data),
+    echo_recv_chunk(Socket, ChunkSize, Size - ChunkSize).
 
-%% Verify that received data is SentData, return any superflous data
-verify_recv(Socket, SentData, Acc) ->
-    {ok, NewData} = ssl:recv(Socket, 0),
-    SentSize = byte_size(SentData),
-    NewAcc = <<Acc/binary, NewData/binary>>,
-    NewSize = byte_size(NewAcc),
-    if
-        SentSize < NewSize ->
-            {SentData,Rest} = split_binary(NewAcc, SentSize),
-            Rest;
-        NewSize < SentSize ->
-            verify_recv(Socket, SentData, NewAcc);
-        true ->
-            SentData = NewAcc,
-            <<>>
-    end.
 
 %% Receive Size bytes
+echo_active_once(_Socket, 0) ->
+    ok;
 echo_active_once(Socket, Size) ->
     receive
         {ssl, Socket, Data} ->
             ok = ssl:send(Socket, Data),
             NewSize = Size - byte_size(Data),
             ssl:setopts(Socket, [{active, once}]),
-            if
-                0 < NewSize ->
-                    echo_active_once(Socket, NewSize);
-                0 == NewSize ->
-                    ok
-            end
-    end.
-
-%% Verify that received data is SentData, return any superflous data
-verify_active_once(Socket, SentData, Acc) ->
-    receive
-        {ssl, Socket, Data} ->
-            SentSize = byte_size(SentData),
-            NewAcc = <<Acc/binary, Data/binary>>,
-            NewSize = byte_size(NewAcc),
-            ssl:setopts(Socket, [{active, once}]),
-            if
-                SentSize < NewSize ->
-                    {SentData,Rest} = split_binary(NewAcc, SentSize),
-                    Rest;
-                NewSize < SentSize ->
-                    verify_active_once(Socket, SentData, NewAcc);
-                true ->
-                    SentData = NewAcc,
-                    <<>>
-            end
+            echo_active_once(Socket, NewSize)
     end.
 
-
 %% Receive Size bytes
+echo_active(_Socket, 0) ->
+    ok;
 echo_active(Socket, Size) ->
     receive
         {ssl, Socket, Data} ->
             ok = ssl:send(Socket, Data),
-            NewSize = Size - byte_size(Data),
-            if
-                0 < NewSize ->
-                    echo_active(Socket, NewSize);
-                0 == NewSize ->
-                    ok
-            end
-    end.
-
-%% Verify that received data is SentData, return any superflous data
-verify_active(Socket, SentData, Acc) ->
-    receive
-        {ssl, Socket, Data} ->
-            SentSize = byte_size(SentData),
-            NewAcc = <<Acc/binary, Data/binary>>,
-            NewSize = byte_size(NewAcc),
-            if
-                SentSize < NewSize ->
-                    {SentData,Rest} = split_binary(NewAcc, SentSize),
-                    Rest;
-                NewSize < SentSize ->
-                    verify_active(Socket, SentData, NewAcc);
-                true ->
-                    SentData = NewAcc,
-                    <<>>
-            end
-    end.
+            echo_active(Socket, Size - byte_size(Data))
+    end.    
+        
diff --git a/lib/ssl/test/ssl_pem_cache_SUITE.erl b/lib/ssl/test/ssl_pem_cache_SUITE.erl
index 25d2cb300d..3c7f6ab20f 100644
--- a/lib/ssl/test/ssl_pem_cache_SUITE.erl
+++ b/lib/ssl/test/ssl_pem_cache_SUITE.erl
@@ -34,7 +34,10 @@
 %% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
 all() ->
-    [pem_cleanup, invalid_insert].
+    [
+     pem_cleanup, 
+     clear_pem_cache,
+     invalid_insert].
 
 groups() ->
     [].
@@ -44,11 +47,8 @@ init_per_suite(Config0) ->
     try crypto:start() of
 	ok ->
 	    ssl_test_lib:clean_start(),
-	    %% make rsa certs using oppenssl
-	    {ok, _} =  make_certs:all(proplists:get_value(data_dir, Config0),
-				      proplists:get_value(priv_dir, Config0)),
-	    Config1 = ssl_test_lib:make_dsa_cert(Config0),
-	    ssl_test_lib:cert_options(Config1)
+	    %% make rsa certs  
+            ssl_test_lib:make_rsa_cert(Config0)
     catch _:_ ->
 	    {skip, "Crypto did not start"}
     end.
@@ -86,8 +86,8 @@ pem_cleanup() ->
     [{doc, "Test pem cache invalidate mechanism"}].
 pem_cleanup(Config)when is_list(Config) ->
     process_flag(trap_exit, true),
-    ClientOpts = proplists:get_value(client_verification_opts, Config),
-    ServerOpts = proplists:get_value(server_verification_opts, Config),
+    ClientOpts = proplists:get_value(client_rsa_verify_opts, Config),
+    ServerOpts = proplists:get_value(server_rsa_verify_opts, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
 
     Server =
@@ -113,13 +113,44 @@ pem_cleanup(Config)when is_list(Config) ->
     ssl_test_lib:close(Client),
     false = Size == Size1.
 
+clear_pem_cache() ->
+    [{doc,"Test that internal reference tabel is cleaned properly even when "
+     " the PEM cache is cleared" }].
+clear_pem_cache(Config) when is_list(Config) -> 
+    {status, _, _, StatusInfo} = sys:get_status(whereis(ssl_manager)),
+    [_, _,_, _, Prop] = StatusInfo,
+    State = ssl_test_lib:state(Prop),
+    [_,{FilRefDb, _} |_] = element(6, State),
+    {Server, Client} = basic_verify_test_no_close(Config),
+    CountReferencedFiles = fun({_, -1}, Acc) ->
+				   Acc;
+			      ({_, N}, Acc) ->
+				   N + Acc
+			   end,
+    
+    2 = ets:foldl(CountReferencedFiles, 0, FilRefDb), 
+    ssl:clear_pem_cache(),
+    _ = sys:get_status(whereis(ssl_manager)),
+    {Server1, Client1} = basic_verify_test_no_close(Config),
+    4 =  ets:foldl(CountReferencedFiles, 0, FilRefDb), 
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client),
+    ct:sleep(2000),
+    _ = sys:get_status(whereis(ssl_manager)),
+    2 =  ets:foldl(CountReferencedFiles, 0, FilRefDb), 
+    ssl_test_lib:close(Server1),
+    ssl_test_lib:close(Client1),
+    ct:sleep(2000),
+    _ = sys:get_status(whereis(ssl_manager)),
+    0 =  ets:foldl(CountReferencedFiles, 0, FilRefDb).
+
 invalid_insert() ->
     [{doc, "Test that insert of invalid pem does not cause empty cache entry"}].
 invalid_insert(Config)when is_list(Config) ->      
     process_flag(trap_exit, true),
     
-    ClientOpts = proplists:get_value(client_verification_opts, Config),
-    ServerOpts = proplists:get_value(server_verification_opts, Config),
+    ClientOpts = proplists:get_value(client_rsa_verify_opts, Config),
+    ServerOpts = proplists:get_value(server_rsa_verify_opts, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
     BadClientOpts = [{cacertfile, "tmp/does_not_exist.pem"} | proplists:delete(cacertfile, ClientOpts)],
     Server =
@@ -166,3 +197,22 @@ later()->
     Gregorian = calendar:datetime_to_gregorian_seconds(DateTime),
     calendar:gregorian_seconds_to_datetime(Gregorian + (2 * ?CLEANUP_INTERVAL)).
 	
+basic_verify_test_no_close(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, 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, ServerOpts}]),
+    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, ClientOpts}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    {Server, Client}.
diff --git a/lib/ssl/test/ssl_renegotiate_SUITE.erl b/lib/ssl/test/ssl_renegotiate_SUITE.erl
new file mode 100644
index 0000000000..ef3f9ebb52
--- /dev/null
+++ b/lib/ssl/test/ssl_renegotiate_SUITE.erl
@@ -0,0 +1,499 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019-2019. 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_renegotiate_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").
+
+-define(SLEEP, 500).
+-define(RENEGOTIATION_DISABLE_TIME, 12000).
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+all() -> 
+    [
+     {group, 'tlsv1.2'},
+     {group, 'tlsv1.1'},
+     {group, 'tlsv1'},
+     {group, 'sslv3'},
+     {group, 'dtlsv1.2'},
+     {group, 'dtlsv1'}
+    ].
+
+groups() ->
+    [{'dtlsv1.2', [], renegotiate_tests()},
+     {'dtlsv1', [], renegotiate_tests()},
+     {'tlsv1.3', [], renegotiate_tests()},
+     {'tlsv1.2', [], renegotiate_tests()},
+     {'tlsv1.1', [], renegotiate_tests()},
+     {'tlsv1', [], renegotiate_tests()},
+     {'sslv3', [], ssl3_renegotiate_tests()}
+    ].
+
+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,
+     server_no_wrap_sequence_number,
+     renegotiate_dos_mitigate_active,
+     renegotiate_dos_mitigate_passive,
+     renegotiate_dos_mitigate_absolute].
+
+ssl3_renegotiate_tests() ->
+    [client_renegotiate,
+     server_renegotiate,
+     client_renegotiate_reused_session,
+     server_renegotiate_reused_session,
+     client_no_wrap_sequence_number,
+     server_no_wrap_sequence_number,
+     renegotiate_dos_mitigate_active,
+     renegotiate_dos_mitigate_passive,
+     renegotiate_dos_mitigate_absolute].
+
+init_per_suite(Config) ->
+    catch crypto:stop(),
+    try crypto:start() of
+	ok ->
+	    ssl_test_lib:clean_start(),
+            ssl_test_lib:make_rsa_cert(Config)
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:stop(crypto).
+
+init_per_group(GroupName, Config) ->
+    ssl_test_lib:clean_tls_version(Config),                          
+    case ssl_test_lib:is_tls_version(GroupName) andalso ssl_test_lib:sufficient_crypto_support(GroupName) of
+	true ->
+	    ssl_test_lib:init_tls_version(GroupName, Config);
+	_ ->
+	    case ssl_test_lib:sufficient_crypto_support(GroupName) of
+		true ->
+		    ssl:start(),
+		    Config;
+		false ->
+		    {skip, "Missing crypto support"}
+	    end
+    end.
+
+end_per_group(GroupName, Config) ->
+  case ssl_test_lib:is_tls_version(GroupName) of
+      true ->
+          ssl_test_lib:clean_tls_version(Config);
+      false ->
+          Config
+  end.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+client_renegotiate() ->
+    [{doc,"Test ssl:renegotiate/1 on client."}].
+client_renegotiate(Config) when is_list(Config) ->
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_verify_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, 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} | ClientOpts]}]),
+    
+    ssl_test_lib:check_result(Client, ok, Server, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+client_secure_renegotiate() ->
+    [{doc,"Test ssl:renegotiate/1 on client."}].
+client_secure_renegotiate(Config) when is_list(Config) ->
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_verify_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, true} | 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, true}| ClientOpts]}]),
+    
+    ssl_test_lib:check_result(Client, ok, Server, ok),
+    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_rsa_verify_opts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_verify_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() ->
+    [{doc,"Test ssl:renegotiate/1 on server."}].
+server_renegotiate(Config) when is_list(Config) ->
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_verify_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,
+					       renegotiate, [Data]}},
+					{options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, erlang_ssl_receive, [Data]}},
+					{options, [{reuse_sessions, false} | ClientOpts]}]),
+    
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+client_renegotiate_reused_session() ->
+    [{doc,"Test ssl:renegotiate/1 on client when the ssl session will be reused."}].
+client_renegotiate_reused_session(Config) when is_list(Config) ->
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_verify_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, 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_reuse_session, [Data]}},
+					{options, [{reuse_sessions, true} | ClientOpts]}]),
+    
+    ssl_test_lib:check_result(Client, ok, Server, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+%%--------------------------------------------------------------------
+server_renegotiate_reused_session() ->
+    [{doc,"Test ssl:renegotiate/1 on server when the ssl session will be reused."}].
+server_renegotiate_reused_session(Config) when is_list(Config) ->
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_verify_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,
+					       renegotiate_reuse_session, [Data]}},
+					{options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, erlang_ssl_receive, [Data]}},
+					{options, [{reuse_sessions, true} | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+%%--------------------------------------------------------------------
+client_no_wrap_sequence_number() ->
+    [{doc,"Test that erlang client will renegotiate session when",
+     "max sequence number celing is about to be reached. Although"
+     "in the testcase we use the test option renegotiate_at"
+     " to lower treashold substantially."}].
+
+client_no_wrap_sequence_number(Config) when is_list(Config) ->
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_verify_opts, Config),
+
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    ErlData = "From erlang to erlang",
+    N = 12,
+
+    Server =
+	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+				   {from, self()},
+				   {mfa, {ssl_test_lib, no_result, []}},
+				   {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+
+    Version = ssl_test_lib:protocol_version(Config, tuple),
+
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {ssl_test_lib,
+					       trigger_renegotiate, [[ErlData, treashold(N, Version)]]}},
+					{options, [{reuse_sessions, false},
+						   {renegotiate_at, N} | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Client, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+server_no_wrap_sequence_number() ->
+    [{doc, "Test that erlang server will renegotiate session when",
+     "max sequence number celing is about to be reached. Although"
+     "in the testcase we use the test option renegotiate_at"
+     " to lower treashold substantially."}].
+
+server_no_wrap_sequence_number(Config) when is_list(Config) ->
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_verify_opts, Config),
+
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Data = "From erlang to erlang",
+    N = 12,
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+					{mfa, {ssl_test_lib,
+					       trigger_renegotiate, [[Data, N+2]]}},
+					{options, [{renegotiate_at, N} | ServerOpts]}]),
+    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, no_result, []}},
+					{options, [{reuse_sessions, false} | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+renegotiate_dos_mitigate_active() ->
+    [{doc, "Mitigate DOS computational attack by not allowing client to renegotiate many times in a row",
+      "immediately after each other"}].
+renegotiate_dos_mitigate_active(Config) when is_list(Config) ->
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_verify_opts, 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, 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_immediately, []}},
+					{options, ClientOpts}]),
+
+    ssl_test_lib:check_result(Client, ok, Server, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+renegotiate_dos_mitigate_passive() ->
+    [{doc, "Mitigate DOS computational attack by not allowing client to renegotiate many times in a row",
+      "immediately after each other"}].
+renegotiate_dos_mitigate_passive(Config) when is_list(Config) ->
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_verify_opts, 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, []}},
+				   {options, [{active, 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_immediately, []}},
+					{options, ClientOpts}]),
+    
+    ssl_test_lib:check_result(Client, ok, Server, ok), 
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+renegotiate_dos_mitigate_absolute() ->
+    [{doc, "Mitigate DOS computational attack by not allowing client to initiate renegotiation"}].
+renegotiate_dos_mitigate_absolute(Config) when is_list(Config) ->
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_verify_opts, 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, [{client_renegotiation, 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_rejected,
+					       []}},
+					{options, ClientOpts}]),
+
+    ssl_test_lib:check_result(Client, ok, Server, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
+%%--------------------------------------------------------------------
+renegotiate(Socket, Data) ->
+    ct:log("Renegotiating ~n", []),
+    Result = ssl:renegotiate(Socket),
+    ct:log("Result ~p~n", [Result]),
+    ssl:send(Socket, Data),
+    case Result of
+	ok ->
+	    ok;
+	Other ->
+	    Other
+    end.
+
+renegotiate_reuse_session(Socket, Data) ->
+    %% Make sure session is registered
+    ct:sleep(?SLEEP),
+    renegotiate(Socket, Data).
+
+renegotiate_immediately(Socket) ->
+    _ = ssl_test_lib:active_recv(Socket, 11),
+    ok = ssl:renegotiate(Socket),  
+    {error, renegotiation_rejected} = ssl:renegotiate(Socket),
+    ct:sleep(?RENEGOTIATION_DISABLE_TIME + ?SLEEP),
+    ok = ssl:renegotiate(Socket),
+    ct:log("Renegotiated again"),
+    ssl:send(Socket, "Hello world"),
+    ok.
+
+renegotiate_rejected(Socket) ->
+    _ = ssl_test_lib:active_recv(Socket, 11),
+    {error, renegotiation_rejected} = ssl:renegotiate(Socket),
+    {error, renegotiation_rejected} = ssl:renegotiate(Socket),
+    ct:sleep(?RENEGOTIATION_DISABLE_TIME +1),
+    {error, renegotiation_rejected} = ssl:renegotiate(Socket),
+    ct:log("Failed to renegotiate again"),
+    ssl:send(Socket, "Hello world"),
+    ok.
+
+%% First two clauses handles 1/n-1 splitting countermeasure Rizzo/Duong-Beast
+treashold(N, {3,0}) ->
+    (N div 2) + 1;
+treashold(N, {3,1}) ->
+    (N div 2) + 1;
+treashold(N, _) ->
+    N + 1.
+
+erlang_ssl_receive(Socket, Data) ->
+    case ssl_test_lib:active_recv(Socket, length(Data)) of
+        Data ->
+            ok;
+        Other ->
+            ct:fail({{expected, Data}, {got, Other}})
+    end.
diff --git a/lib/ssl/test/ssl_rfc_5869_SUITE.erl b/lib/ssl/test/ssl_rfc_5869_SUITE.erl
new file mode 100644
index 0000000000..8b2d1c2082
--- /dev/null
+++ b/lib/ssl/test/ssl_rfc_5869_SUITE.erl
@@ -0,0 +1,316 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018-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(ssl_rfc_5869_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+all() -> 
+    [sha_256_basic,
+     sha_256_long,
+     sha_256_no_salt,
+     sha_basic,
+     sha_long,
+     sha_no_salt,
+     sha_default_salt
+    ].
+
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    catch crypto:stop(),
+    try crypto:start() of
+	ok ->
+            Config
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    application:stop(crypto).
+
+%%--------------------------------------------------------------------
+init_per_testcase(_TestCase, Config) ->
+    ct:timetrap({seconds, 5}),
+    Config.
+
+end_per_testcase(_TestCase, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+  
+sha_256_basic() ->
+    [{doc, "Basic test case with SHA-256"}].
+sha_256_basic(Config) when is_list(Config) ->
+    %% Hash = SHA-256
+    %% IKM  = 0x0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b (22 octets)
+    %% salt = 0x000102030405060708090a0b0c (13 octets)
+    %% info = 0xf0f1f2f3f4f5f6f7f8f9 (10 octets)
+    %% L    = 42
+    %% PRK  = 0x077709362c2e32df0ddc3f0dc47bba63
+    %%        90b6c73bb50f9c3122ec844ad7c2b3e5 (32 octets)
+    %% OKM  = 0x3cb25f25faacd57a90434f64d0362f2a
+    %%        2d2d0a90cf1a5a4c5db02d56ecc4c5bf
+    %%        34007208d5b887185865 (42 octets)
+    IKM  = hexstr2bin("0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b"),
+    Salt = hexstr2bin("000102030405060708090a0b0c"),
+    Info = hexstr2bin("f0f1f2f3f4f5f6f7f8f9"),
+    PRK  = hexstr2bin("077709362c2e32df0ddc3f0dc47bba63"
+                      "90b6c73bb50f9c3122ec844ad7c2b3e5"),
+    OKM  = hexstr2bin("3cb25f25faacd57a90434f64d0362f2a"
+                      "2d2d0a90cf1a5a4c5db02d56ecc4c5bf"
+                      "34007208d5b887185865"),
+    hkdf_test(sha256, Salt, IKM, PRK, Info, 42, OKM).
+
+sha_256_long() ->
+    [{doc, "Test with SHA-256 and longer inputs/outputs"}].
+sha_256_long(Config) when is_list(Config) ->
+    %% Hash = SHA-256
+    %% IKM  = 0x000102030405060708090a0b0c0d0e0f
+    %%        101112131415161718191a1b1c1d1e1f
+    %%        202122232425262728292a2b2c2d2e2f
+    %%        303132333435363738393a3b3c3d3e3f
+    %%        404142434445464748494a4b4c4d4e4f (80 octets)
+    %% salt = 0x606162636465666768696a6b6c6d6e6f
+    %%        707172737475767778797a7b7c7d7e7f
+    %%        808182838485868788898a8b8c8d8e8f
+    %%        909192939495969798999a9b9c9d9e9f
+    %%        a0a1a2a3a4a5a6a7a8a9aaabacadaeaf (80 octets)
+    %% info = 0xb0b1b2b3b4b5b6b7b8b9babbbcbdbebf
+    %%        c0c1c2c3c4c5c6c7c8c9cacbcccdcecf
+    %%        d0d1d2d3d4d5d6d7d8d9dadbdcdddedf
+    %%        e0e1e2e3e4e5e6e7e8e9eaebecedeeef
+    %%        f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff (80 octets)
+    %% L    = 82
+    
+    %% PRK  = 0x06a6b88c5853361a06104c9ceb35b45c
+    %%        ef760014904671014a193f40c15fc244 (32 octets)
+    %% OKM  = 0xb11e398dc80327a1c8e7f78c596a4934
+    %%        4f012eda2d4efad8a050cc4c19afa97c
+    %%        59045a99cac7827271cb41c65e590e09
+    %%        da3275600c2f09b8367793a9aca3db71
+    %%        cc30c58179ec3e87c14c01d5c1f3434f
+    %%        1d87 (82 octets)
+    IKM  = hexstr2bin("000102030405060708090a0b0c0d0e0f"
+                      "101112131415161718191a1b1c1d1e1f"
+                      "202122232425262728292a2b2c2d2e2f"
+                      "303132333435363738393a3b3c3d3e3f"
+                      "404142434445464748494a4b4c4d4e4f"
+                     ),
+    Salt = hexstr2bin("606162636465666768696a6b6c6d6e6f"
+                      "707172737475767778797a7b7c7d7e7f"
+                      "808182838485868788898a8b8c8d8e8f"
+                      "909192939495969798999a9b9c9d9e9f"
+                      "a0a1a2a3a4a5a6a7a8a9aaabacadaeaf"
+                     ),
+    Info = hexstr2bin("b0b1b2b3b4b5b6b7b8b9babbbcbdbebf"
+                      "c0c1c2c3c4c5c6c7c8c9cacbcccdcecf"
+                      "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf"
+                      "e0e1e2e3e4e5e6e7e8e9eaebecedeeef"
+                      "f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff"
+                     ),
+    PRK  = hexstr2bin("06a6b88c5853361a06104c9ceb35b45c"
+                      "ef760014904671014a193f40c15fc244"),
+    OKM  = hexstr2bin("b11e398dc80327a1c8e7f78c596a4934"
+                      "4f012eda2d4efad8a050cc4c19afa97c"
+                      "59045a99cac7827271cb41c65e590e09"
+                      "da3275600c2f09b8367793a9aca3db71"
+                      "cc30c58179ec3e87c14c01d5c1f3434f"
+                      "1d87"
+                     ),
+    hkdf_test(sha256, Salt, IKM, PRK, Info, 82, OKM).
+sha_256_no_salt() ->
+    [{doc, "Test with SHA-256 and zero-length salt/info"}].
+sha_256_no_salt(Config) when is_list(Config) ->
+    %% Hash = SHA-256
+    %% IKM  = 0x0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b (22 octets)
+    %% salt = (0 octets)
+    %% info = (0 octets)
+    %% L    = 42
+    
+    %% PRK  = 0x19ef24a32c717b167f33a91d6f648bdf
+    %%        96596776afdb6377ac434c1c293ccb04 (32 octets)
+    %% OKM  = 0x8da4e775a563c18f715f802a063c5a31
+    %%        b8a11f5c5ee1879ec3454e5f3c738d2d
+    %%        9d201395faa4b61a96c8 (42 octets)
+    IKM  = hexstr2bin("0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b"),
+    Salt = <<>>,
+    Info = <<>>,
+    PRK  = hexstr2bin("19ef24a32c717b167f33a91d6f648bdf"
+                      "96596776afdb6377ac434c1c293ccb04"),
+    OKM  = hexstr2bin("8da4e775a563c18f715f802a063c5a31"
+                      "b8a11f5c5ee1879ec3454e5f3c738d2d"
+                      "9d201395faa4b61a96c8"),
+    hkdf_test(sha256, Salt, IKM, PRK, Info, 42, OKM).
+
+sha_basic() ->
+    [{doc, " Basic test case with SHA-1"}].
+sha_basic(Config) when is_list(Config) ->
+    %% Hash = SHA-1
+    %% IKM  = 0x0b0b0b0b0b0b0b0b0b0b0b (11 octets)
+    %% salt = 0x000102030405060708090a0b0c (13 octets)
+    %% info = 0xf0f1f2f3f4f5f6f7f8f9 (10 octets)
+    %% L    = 42
+    
+    %% PRK  = 0x9b6c18c432a7bf8f0e71c8eb88f4b30baa2ba243 (20 octets)
+    %% OKM  = 0x085a01ea1b10f36933068b56efa5ad81
+    %%        a4f14b822f5b091568a9cdd4f155fda2
+    %%        c22e422478d305f3f896 (42 octets)
+    IKM  = hexstr2bin("0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b"),
+    Salt = hexstr2bin("000102030405060708090a0b0c"),
+    Info = hexstr2bin("f0f1f2f3f4f5f6f7f8f9"),
+    PRK  = hexstr2bin("077709362c2e32df0ddc3f0dc47bba63"
+                      "90b6c73bb50f9c3122ec844ad7c2b3e5"),
+    OKM  = hexstr2bin("3cb25f25faacd57a90434f64d0362f2a"
+                      "2d2d0a90cf1a5a4c5db02d56ecc4c5bf"
+                      "34007208d5b887185865"),
+    hkdf_test(sha256, Salt, IKM, PRK, Info, 42, OKM).
+
+sha_long() ->
+    [{doc, "Test with SHA-1 and longer inputs/outputs"}].
+sha_long(Config) when is_list(Config) ->
+    %% Hash = SHA-1
+    %% IKM  = 0x000102030405060708090a0b0c0d0e0f
+    %%        101112131415161718191a1b1c1d1e1f
+    %%        202122232425262728292a2b2c2d2e2f
+    %%        303132333435363738393a3b3c3d3e3f
+    %%        404142434445464748494a4b4c4d4e4f (80 octets)
+    %% salt = 0x606162636465666768696a6b6c6d6e6f
+    %%        707172737475767778797a7b7c7d7e7f
+    %%        808182838485868788898a8b8c8d8e8f
+    %%        909192939495969798999a9b9c9d9e9f
+    %%        a0a1a2a3a4a5a6a7a8a9aaabacadaeaf (80 octets)
+    %% info = 0xb0b1b2b3b4b5b6b7b8b9babbbcbdbebf
+    %%        c0c1c2c3c4c5c6c7c8c9cacbcccdcecf
+    %%        d0d1d2d3d4d5d6d7d8d9dadbdcdddedf
+    %%        e0e1e2e3e4e5e6e7e8e9eaebecedeeef
+    %%        f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff (80 octets)
+    %% L    = 82
+    
+    %% PRK  = 0x8adae09a2a307059478d309b26c4115a224cfaf6 (20 octets)
+    %% OKM  = 0x0bd770a74d1160f7c9f12cd5912a06eb
+    %%        ff6adcae899d92191fe4305673ba2ffe
+    %%        8fa3f1a4e5ad79f3f334b3b202b2173c
+    %%        486ea37ce3d397ed034c7f9dfeb15c5e
+    %%        927336d0441f4c4300e2cff0d0900b52
+    %%        d3b4 (82 octets)
+    IKM  = hexstr2bin("000102030405060708090a0b0c0d0e0f"
+                      "101112131415161718191a1b1c1d1e1f"
+                      "202122232425262728292a2b2c2d2e2f"
+                      "303132333435363738393a3b3c3d3e3f"
+                      "404142434445464748494a4b4c4d4e4f"
+                     ),
+    Salt = hexstr2bin("606162636465666768696a6b6c6d6e6f"
+                      "707172737475767778797a7b7c7d7e7f"
+                      "808182838485868788898a8b8c8d8e8f"
+                      "909192939495969798999a9b9c9d9e9f"
+                      "a0a1a2a3a4a5a6a7a8a9aaabacadaeaf"
+                     ),
+    Info = hexstr2bin("b0b1b2b3b4b5b6b7b8b9babbbcbdbebf"
+                      "c0c1c2c3c4c5c6c7c8c9cacbcccdcecf"
+                      "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf"
+                      "e0e1e2e3e4e5e6e7e8e9eaebecedeeef"
+                      "f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff"
+                     ),
+    PRK  = hexstr2bin("8adae09a2a307059478d309b26c4115a224cfaf6"),
+    OKM  = hexstr2bin("0bd770a74d1160f7c9f12cd5912a06eb"
+                      "ff6adcae899d92191fe4305673ba2ffe"
+                      "8fa3f1a4e5ad79f3f334b3b202b2173c"
+                      "486ea37ce3d397ed034c7f9dfeb15c5e"
+                      "927336d0441f4c4300e2cff0d0900b52"
+                      "d3b4"
+                     ),
+    hkdf_test(sha, Salt, IKM, PRK, Info, 82, OKM).
+
+sha_no_salt() ->
+    [{doc, "Test with SHA-1 and zero-length salt/info"}].
+sha_no_salt(Config) when is_list(Config) ->
+    %%   Hash = SHA-1
+    %% IKM  = 0x0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b (22 octets)
+    %% salt = (0 octets)
+    %% info = (0 octets)
+    %% L    = 42
+
+    %% PRK  = 0xda8c8a73c7fa77288ec6f5e7c297786aa0d32d01 (20 octets)
+    %% OKM  = 0x0ac1af7002b3d761d1e55298da9d0506
+    %%        b9ae52057220a306e07b6b87e8df21d0
+    %%        ea00033de03984d34918 (42 octets)
+    IKM  = hexstr2bin("0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b"),
+    Salt = <<>>,
+    Info = <<>>,
+    PRK  = hexstr2bin("da8c8a73c7fa77288ec6f5e7c297786aa0d32d01"),
+    OKM  = hexstr2bin("0ac1af7002b3d761d1e55298da9d0506"
+                      "b9ae52057220a306e07b6b87e8df21d0"
+                      "ea00033de03984d34918"),
+    hkdf_test(sha, Salt, IKM, PRK, Info, 42, OKM).
+
+
+sha_default_salt() ->
+    [{doc, "Test with SHA-1, salt not provided (defaults to HashLen zero octets),
+   zero-length info"}].
+sha_default_salt(Config) when is_list(Config) ->     
+    %% Hash = SHA-1
+    %% IKM  = 0x0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c (22 octets)
+    %% salt = not provided (defaults to HashLen zero octets)
+    %% info = (0 octets)
+    %% L    = 42
+
+    %% PRK  = 0x2adccada18779e7c2077ad2eb19d3f3e731385dd (20 octets)
+    %% OKM  = 0x2c91117204d745f3500d636a62f64f0a
+    %%        b3bae548aa53d423b0d1f27ebba6f5e5
+    %%        673a081d70cce7acfc48 (42 octets)
+    IKM  = hexstr2bin("0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c"),
+    Salt = binary:copy(<<0>>, 20),
+    Info = <<>>,
+    PRK  = hexstr2bin("2adccada18779e7c2077ad2eb19d3f3e731385dd"),
+    OKM  = hexstr2bin("2c91117204d745f3500d636a62f64f0a"
+                      "b3bae548aa53d423b0d1f27ebba6f5e5"
+                      "673a081d70cce7acfc48"),
+    hkdf_test(sha, Salt, IKM, PRK, Info, 42, OKM).
+
+hkdf_test(HashAlg, Salt, KeyingMaterial, PsedoRandKey, ContextInfo, Length, Key) ->   
+    PsedoRandKey = tls_v1:hkdf_extract(HashAlg, Salt, KeyingMaterial),
+    Key = tls_v1:hkdf_expand(PsedoRandKey, ContextInfo, Length, HashAlg).
+    
+hexstr2bin(S) when is_binary(S) ->
+    list_to_binary(hexstr2list(binary_to_list(S)));
+hexstr2bin(S) ->
+    list_to_binary(hexstr2list(S)).
+
+hexstr2list([$ |T]) ->
+    hexstr2list(T);
+hexstr2list([X,Y|T]) ->
+    [mkint(X)*16 + mkint(Y) | hexstr2list(T)];
+hexstr2list([]) ->
+    [].
+mkint(C) when $0 =< C, C =< $9 ->
+    C - $0;
+mkint(C) when $A =< C, C =< $F ->
+    C - $A + 10;
+mkint(C) when $a =< C, C =< $f ->
+    C - $a + 10.
diff --git a/lib/ssl/test/ssl_session_SUITE.erl b/lib/ssl/test/ssl_session_SUITE.erl
new file mode 100644
index 0000000000..aa79698a72
--- /dev/null
+++ b/lib/ssl/test/ssl_session_SUITE.erl
@@ -0,0 +1,377 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2007-2019. 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_session_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include("tls_handshake.hrl").
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("public_key/include/public_key.hrl").
+
+-define(SLEEP, 500).
+-define(EXPIRE, 10).
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+all() -> 
+    [
+     {group, 'tlsv1.2'},
+     {group, 'tlsv1.1'},
+     {group, 'tlsv1'},
+     {group, 'sslv3'},
+     {group, 'dtlsv1.2'},
+     {group, 'dtlsv1'}
+    ].
+
+groups() ->
+    [{'dtlsv1.2', [], session_tests()},
+     {'dtlsv1', [], session_tests()},
+     {'tlsv1.3', [], session_tests()},
+     {'tlsv1.2', [], session_tests()},
+     {'tlsv1.1', [], session_tests()},
+     {'tlsv1', [], session_tests()},
+     {'sslv3', [], session_tests()}
+    ].
+
+session_tests() ->
+    [reuse_session,
+     reuse_session_expired,
+     server_does_not_want_to_reuse_session,
+     no_reuses_session_server_restart_new_cert,
+     no_reuses_session_server_restart_new_cert_file].
+
+
+init_per_suite(Config0) ->
+    catch crypto:stop(),
+    try crypto:start() of
+	ok ->
+	    ssl_test_lib:clean_start(),
+            Config = ssl_test_lib:make_rsa_cert(Config0),
+            ssl_test_lib:make_dsa_cert(Config)
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:stop(crypto).
+
+init_per_group(GroupName, Config) ->
+    ssl_test_lib:clean_tls_version(Config),                          
+    case ssl_test_lib:is_tls_version(GroupName) andalso ssl_test_lib:sufficient_crypto_support(GroupName) of
+	true ->
+	    ssl_test_lib:init_tls_version(GroupName, Config);
+	_ ->
+	    case ssl_test_lib:sufficient_crypto_support(GroupName) of
+		true ->
+		    ssl:start(),
+		    Config;
+		false ->
+		    {skip, "Missing crypto support"}
+	    end
+    end.
+
+end_per_group(GroupName, Config) ->
+  case ssl_test_lib:is_tls_version(GroupName) of
+      true ->
+          ssl_test_lib:clean_tls_version(Config);
+      false ->
+          Config
+  end.
+
+init_per_testcase(reuse_session_expired, Config)  ->
+    ssl:stop(),
+    application:load(ssl),
+    ssl_test_lib:clean_env(),
+    application:set_env(ssl, session_lifetime, ?EXPIRE),
+    application:set_env(ssl, session_delay_cleanup_time, 500),
+    ssl:start(),
+    ct:timetrap({seconds, 30}),
+    Config;
+init_per_testcase(_, Config)  ->
+    ct:timetrap({seconds, 15}),
+    Config.
+
+end_per_testcase(_TestCase, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+reuse_session() ->
+    [{doc,"Test reuse of sessions (short handshake)"}].
+reuse_session(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_verify_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
+    
+    ssl_test_lib:reuse_session(ClientOpts, ServerOpts, Config).
+%%--------------------------------------------------------------------
+reuse_session_expired() ->
+    [{doc,"Test sessions is not reused when it has expired"}].
+reuse_session_expired(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_verify_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    
+    Server0 =
+	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+				   {from, self()},
+				   {mfa, {ssl_test_lib, no_result, []}},
+				   {tcp_options, [{active, false}]},
+				   {options, ServerOpts}]),
+    Port0 = ssl_test_lib:inet_port(Server0),
+    
+    Client0 = ssl_test_lib:start_client([{node, ClientNode},
+                                         {port, Port0}, {host, Hostname},
+                                         {mfa, {ssl_test_lib, session_id, []}},
+                                         {from, self()},  {options, [{reuse_sessions, save} | ClientOpts]}]),
+    Server0 ! listen,
+    
+    Client1 = ssl_test_lib:start_client([{node, ClientNode},
+                                         {port, Port0}, {host, Hostname},
+                                         {mfa, {ssl_test_lib, session_id, []}},
+                                         {from, self()},  {options, ClientOpts}]),    
+    
+    SID = receive
+              {Client0, Id0} ->
+                  Id0
+          end,
+       
+    receive
+        {Client1, SID} ->
+            ok
+    after ?SLEEP ->
+              ct:fail(session_not_reused)
+    end,
+    
+    Server0 ! listen,
+    
+    %% Make sure session is unregistered due to expiration
+    ct:sleep((?EXPIRE*2)),
+
+    make_sure_expired(Hostname, Port0, SID),
+    
+    Client2 =
+	ssl_test_lib:start_client([{node, ClientNode}, 
+				   {port, Port0}, {host, Hostname},
+				   {mfa, {ssl_test_lib, session_id, []}},
+				   {from, self()}, {options, ClientOpts}]),   
+    receive
+	{Client2, SID} ->
+	    ct:fail(session_reused_when_session_expired);
+	{Client2, _} ->
+	    ok
+    end,
+    process_flag(trap_exit, false),
+    ssl_test_lib:close(Server0),
+    ssl_test_lib:close(Client0),
+    ssl_test_lib:close(Client1),
+    ssl_test_lib:close(Client2).
+
+make_sure_expired(Host, Port, Id) ->
+    {status, _, _, StatusInfo} = sys:get_status(whereis(ssl_manager)),
+    [_, _,_, _, Prop] = StatusInfo,
+    State = ssl_test_lib:state(Prop),
+    ClientCache = element(2, State),
+
+    case ssl_session_cache:lookup(ClientCache, {{Host,  Port}, Id}) of
+	undefined ->
+   	   ok; 
+	#session{is_resumable = false} ->
+   	   ok;
+	_ ->
+	    ct:sleep(?SLEEP),
+            make_sure_expired(Host, Port, Id)
+    end.     
+
+%%--------------------------------------------------------------------
+server_does_not_want_to_reuse_session() ->
+    [{doc,"Test reuse of sessions (short handshake)"}].
+server_does_not_want_to_reuse_session(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_verify_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, 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, session_info_result, []}},
+				   {options, [{reuse_session, fun(_,_,_,_) ->
+								      false
+							      end} | 
+					      ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client0 =
+	ssl_test_lib:start_client([{node, ClientNode}, 
+		      {port, Port}, {host, Hostname},
+			    {mfa, {ssl_test_lib, no_result, []}},
+		      {from, self()},  {options, ClientOpts}]),   
+    SessionInfo = 
+	receive
+	    {Server, Info} ->
+		Info
+	end,
+       
+    Server ! {listen, {mfa, {ssl_test_lib, no_result, []}}},
+    
+    %% Make sure session is registered
+    ct:sleep(?SLEEP),
+
+    Client1 =
+	ssl_test_lib:start_client([{node, ClientNode}, 
+		      {port, Port}, {host, Hostname},
+		      {mfa, {ssl_test_lib, session_info_result, []}},
+		      {from, self()},  {options, ClientOpts}]),    
+    receive
+	{Client1, SessionInfo} ->
+	    ct:fail(session_reused_when_server_does_not_want_to);
+	{Client1, _Other} ->
+	   ok
+    end,
+    ssl_test_lib:close(Client0),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client1).
+
+no_reuses_session_server_restart_new_cert() ->
+    [{doc,"Check that a session is not reused if the server is restarted with a new cert."}].
+no_reuses_session_server_restart_new_cert(Config) when is_list(Config) ->
+
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
+    DsaServerOpts = ssl_test_lib:ssl_options(server_dsa_verify_opts, Config),
+    DsaClientOpts = ssl_test_lib:ssl_options(client_dsa_opts, 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, session_info_result, []}},
+				   {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client0 =
+	ssl_test_lib:start_client([{node, ClientNode},
+		      {port, Port}, {host, Hostname},
+			    {mfa, {ssl_test_lib, no_result, []}},
+		      {from, self()},  {options, ClientOpts}]),
+    SessionInfo =
+	receive
+	    {Server, Info} ->
+		Info
+	end,
+
+    %% Make sure session is registered
+    ct:sleep(?SLEEP),
+    Monitor = erlang:monitor(process, Server),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client0),
+    receive
+	{'DOWN', Monitor, _, _, _} ->
+	    ok
+    end,
+    
+    Server1 =
+	ssl_test_lib:start_server([{node, ServerNode}, {port, Port},
+				   {from, self()},
+		      {mfa, {ssl_test_lib, no_result, []}},
+				   {options, [{reuseaddr, true} | DsaServerOpts]}]),
+
+    Client1 =
+	ssl_test_lib:start_client([{node, ClientNode},
+		      {port, Port}, {host, Hostname},
+		      {mfa, {ssl_test_lib, session_info_result, []}},
+		      {from, self()},  {options, DsaClientOpts}]),
+    receive
+	{Client1, SessionInfo} ->
+	    ct:fail(session_reused_when_server_has_new_cert);
+	{Client1, _Other} ->
+	   ok
+    end,
+    ssl_test_lib:close(Server1),
+    ssl_test_lib:close(Client1).
+
+%%--------------------------------------------------------------------
+no_reuses_session_server_restart_new_cert_file() ->
+    [{doc,"Check that a session is not reused if a server is restarted with a new "
+      "cert contained in a file with the same name as the old cert."}].
+
+no_reuses_session_server_restart_new_cert_file(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
+    DsaServerOpts = ssl_test_lib:ssl_options(server_dsa_verify_opts, Config),
+    PrivDir =  proplists:get_value(priv_dir, Config),
+
+    NewServerOpts0 = ssl_test_lib:new_config(PrivDir, ServerOpts),
+    {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, session_info_result, []}},
+				   {options, NewServerOpts0}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client0 =
+	ssl_test_lib:start_client([{node, ClientNode},
+		      {port, Port}, {host, Hostname},
+			    {mfa, {ssl_test_lib, no_result, []}},
+		      {from, self()},  {options, ClientOpts}]),
+    SessionInfo =
+	receive
+	    {Server, Info} ->
+		Info
+	end,
+
+    %% Make sure session is registered and we get
+    %% new file time stamp when calling new_config!
+    ct:sleep(?SLEEP* 2),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client0),
+
+    ssl:clear_pem_cache(),
+
+    NewServerOpts1 = ssl_test_lib:new_config(PrivDir, DsaServerOpts),
+
+    Server1 =
+	ssl_test_lib:start_server([{node, ServerNode}, {port, Port},
+				   {from, self()},
+		      {mfa, {ssl_test_lib, no_result, []}},
+				   {options,  [{reuseaddr, true} | NewServerOpts1]}]),
+    Client1 =
+	ssl_test_lib:start_client([{node, ClientNode},
+		      {port, Port}, {host, Hostname},
+		      {mfa, {ssl_test_lib, session_info_result, []}},
+				   {from, self()},  {options, ClientOpts}]),
+    receive
+	{Client1, SessionInfo} ->
+	    ct:fail(session_reused_when_server_has_new_cert);
+	{Client1, _Other} ->
+	   ok
+    end,
+    ssl_test_lib:close(Server1),
+    ssl_test_lib:close(Client1).
+
+%%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
+%%--------------------------------------------------------------------
diff --git a/lib/ssl/test/ssl_session_cache_SUITE.erl b/lib/ssl/test/ssl_session_cache_SUITE.erl
index a0fab58b9d..b71b15b028 100644
--- a/lib/ssl/test/ssl_session_cache_SUITE.erl
+++ b/lib/ssl/test/ssl_session_cache_SUITE.erl
@@ -48,7 +48,8 @@ all() ->
      session_cache_process_list,
      session_cache_process_mnesia,
      client_unique_session,
-     max_table_size
+     max_table_size,
+     save_specific_session
      ].
 
 groups() ->
@@ -60,10 +61,7 @@ init_per_suite(Config0) ->
 	ok ->
 	    ssl_test_lib:clean_start(),
 	    %% make rsa certs using 
-	    {ok, _} = make_certs:all(proplists:get_value(data_dir, Config0),
-				     proplists:get_value(priv_dir, Config0)),
-	    Config = ssl_test_lib:make_dsa_cert(Config0),
-	    ssl_test_lib:cert_options(Config)
+            ssl_test_lib:make_rsa_cert(Config0)
     catch _:_ ->
 	    {skip, "Crypto did not start"}
     end.
@@ -97,7 +95,10 @@ init_per_testcase(session_cleanup, Config) ->
 init_per_testcase(client_unique_session, Config) ->
     ct:timetrap({seconds, 40}),
     Config;
-
+init_per_testcase(save_specific_session, Config) ->
+    ssl_test_lib:clean_start(),
+    ct:timetrap({seconds, 5}),
+    Config;
 init_per_testcase(max_table_size, Config) ->
     ssl:stop(),
     application:load(ssl),
@@ -141,7 +142,7 @@ end_per_testcase(max_table_size, Config) ->
     end_per_testcase(default_action, Config);
 end_per_testcase(Case, Config) when Case == session_cache_process_list;
 				    Case == session_cache_process_mnesia ->
-    ets:delete(ssl_test),
+    catch ets:delete(ssl_test),
     Config;
 end_per_testcase(_, Config) ->
     Config.
@@ -154,8 +155,8 @@ client_unique_session() ->
       "sets up many connections"}].
 client_unique_session(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
-    ClientOpts = proplists:get_value(client_opts, Config),
-    ServerOpts = proplists:get_value(server_opts, Config),
+    ClientOpts = proplists:get_value(client_rsa_verify_opts, Config),
+    ServerOpts = proplists:get_value(server_rsa_opts, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
     Server =
 	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
@@ -164,8 +165,7 @@ client_unique_session(Config) when is_list(Config) ->
 				   {tcp_options, [{active, false}]},
 				   {options, ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
-    LastClient = clients_start(Server, 
-			    ClientNode, Hostname, Port, ClientOpts, client_unique_session, 20),
+    LastClient = clients_start(Server, ClientNode, Hostname, Port, ClientOpts, 20),
     receive 
 	{LastClient, {ok, _}} ->
 	    ok
@@ -185,8 +185,8 @@ session_cleanup() ->
      "does not grow and grow ..."}].
 session_cleanup(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
-    ClientOpts = ssl_test_lib:ssl_options(client_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_verify_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
 
     Server =
@@ -254,13 +254,75 @@ session_cache_process_mnesia(Config) when is_list(Config) ->
     session_cache_process(mnesia,Config).
 
 %%--------------------------------------------------------------------
+save_specific_session() ->
+    [{doc, "Test that we can save a specific client session"
+     }].
+save_specific_session(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    ClientOpts = proplists:get_value(client_rsa_verify_opts, Config),
+    ServerOpts = proplists:get_value(server_rsa_opts, 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, no_result, []}},
+				   {tcp_options, [{active, false}]},
+				   {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    
+    Client1 = ssl_test_lib:start_client([{node, ClientNode},
+                                         {port, Port}, {host, Hostname},
+                                         {mfa, {ssl_test_lib, session_id, []}},
+                                         {from, self()},  {options, ClientOpts}]),
+    Server ! listen,
+    
+    Client2 = ssl_test_lib:start_client([{node, ClientNode},
+                                         {port, Port}, {host, Hostname},
+                                         {mfa, {ssl_test_lib, session_id, []}},
+                                         {from, self()},  {options, [{reuse_sessions, save} | ClientOpts]}]),    
+    SessionID1 =
+        receive 
+            {Client1, S1} ->
+                S1
+        end,
+    
+    SessionID2 =
+        receive 
+            {Client2, S2} ->
+                S2
+        end,
+    
+    true = SessionID1 =/= SessionID2,
+
+    {status, _, _, StatusInfo} = sys:get_status(whereis(ssl_manager)),
+    [_, _,_, _, Prop] = StatusInfo,
+    State = ssl_test_lib:state(Prop),
+    ClientCache = element(2, State),
+    2 = ssl_session_cache:size(ClientCache),
+
+    Server ! listen,
+
+    Client3 = ssl_test_lib:start_client([{node, ClientNode},
+                                         {port, Port}, {host, Hostname},
+                                         {mfa, {ssl_test_lib, session_id, []}},
+                                         {from, self()},  {options, [{reuse_session, SessionID2} | ClientOpts]}]), 
+    receive 
+        {Client3, SessionID2} ->
+            ok;
+        {Client3, SessionID3}->
+            ct:fail({got, SessionID3, expected, SessionID2});
+        Other ->
+            ct:fail({got,Other})
+    end.
+
+%%--------------------------------------------------------------------
 
 max_table_size() ->
     [{doc,"Test max limit on session table"}].
 max_table_size(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
-    ClientOpts = proplists:get_value(client_verification_opts, Config),
-    ServerOpts = proplists:get_value(server_verification_opts, Config),
+    ClientOpts = proplists:get_value(client_rsa_verify_opts, Config),
+    ServerOpts = proplists:get_value(server_rsa_verify_opts, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
     Server =
 	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
@@ -270,7 +332,7 @@ max_table_size(Config) when is_list(Config) ->
 				   {options, ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
     LastClient = clients_start(Server, 
-			    ClientNode, Hostname, Port, ClientOpts, max_table_size, 20),
+			    ClientNode, Hostname, Port, ClientOpts, 20),
     receive 
 	{LastClient, {ok, _}} ->
 	    ok
@@ -426,25 +488,27 @@ session_loop(Sess) ->
 %%--------------------------------------------------------------------
 
 session_cache_process(_Type,Config) when is_list(Config) ->
-    ssl_basic_SUITE:reuse_session(Config).
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_verify_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    ssl_test_lib:reuse_session(ClientOpts, ServerOpts, Config).
 
 
-clients_start(_Server, ClientNode, Hostname, Port, ClientOpts, Test, 0) ->
+clients_start(_Server, ClientNode, Hostname, Port, ClientOpts, 0) ->
     %% Make sure session is registered
     ct:sleep(?SLEEP * 2),
     ssl_test_lib:start_client([{node, ClientNode},
 			       {port, Port}, {host, Hostname},
 			       {mfa, {?MODULE, connection_info_result, []}},
-			       {from, self()},  {options, test_copts(Test, 0, ClientOpts)}]);
-clients_start(Server, ClientNode, Hostname, Port, ClientOpts, Test, N) ->
+			       {from, self()},  {options, ClientOpts}]);
+clients_start(Server, ClientNode, Hostname, Port, ClientOpts, N) ->
     spawn_link(ssl_test_lib, start_client, 
 	       [[{node, ClientNode},
 		 {port, Port}, {host, Hostname},
 		 {mfa, {ssl_test_lib, no_result, []}},
-		 {from, self()},  {options, test_copts(Test, N, ClientOpts)}]]),
+		 {from, self()},  {options, ClientOpts}]]),
     Server ! listen,
     wait_for_server(),
-    clients_start(Server, ClientNode, Hostname, Port, ClientOpts, Test, N-1).
+    clients_start(Server, ClientNode, Hostname, Port, ClientOpts, N-1).
 	
 connection_info_result(Socket) ->
     ssl:connection_information(Socket, [protocol, cipher_suite]).
@@ -481,21 +545,3 @@ get_delay_timers() ->
     
 wait_for_server() ->
     ct:sleep(100).	
-
-
-test_copts(_, 0, ClientOpts) ->
-      ClientOpts;		 
-test_copts(max_table_size, N, ClientOpts) ->
-    Version = tls_record:highest_protocol_version([]),		   
-    CipherSuites = %%lists:map(fun(X) -> ssl_cipher_format:suite_definition(X) end, ssl_cipher:filter_suites(ssl_cipher:suites(Version))),
-[ Y|| Y = {Alg,_, _, _} <- lists:map(fun(X) -> ssl_cipher_format:suite_definition(X) end, ssl_cipher:filter_suites(ssl_cipher:suites(Version))), Alg =/=  ecdhe_ecdsa,  Alg =/=  ecdh_ecdsa, Alg =/=  ecdh_rsa, Alg =/=  ecdhe_rsa, Alg =/= dhe_dss, Alg =/= dss], 
-    case length(CipherSuites) of 
-        M when M >= N ->		      
-          Cipher = lists:nth(N, CipherSuites),
-	  ct:pal("~p",[Cipher]),
-          [{ciphers, [Cipher]} | ClientOpts];
-       _ -> 	   		 
-        ClientOpts
-    end;
-test_copts(_, _, ClientOpts) ->
-     ClientOpts.
diff --git a/lib/ssl/test/ssl_sni_SUITE.erl b/lib/ssl/test/ssl_sni_SUITE.erl
index 251b6a2639..e68ea2c99d 100644
--- a/lib/ssl/test/ssl_sni_SUITE.erl
+++ b/lib/ssl/test/ssl_sni_SUITE.erl
@@ -36,7 +36,6 @@ all() ->
     [{group, 'tlsv1.2'},
      {group, 'tlsv1.1'},
      {group, 'tlsv1'},
-     {group, 'sslv3'},
      {group, 'dtlsv1.2'},
      {group, 'dtlsv1'}
     ].
@@ -46,7 +45,6 @@ groups() ->
      {'tlsv1.2', [], sni_tests()},
      {'tlsv1.1', [], sni_tests()},
      {'tlsv1', [], sni_tests()},
-     {'sslv3', [], sni_tests()},
      {'dtlsv1.2', [], sni_tests()},
      {'dtlsv1', [], sni_tests()}
     ].
@@ -61,7 +59,8 @@ sni_tests() ->
      dns_name,
      ip_fallback,
      no_ip_fallback,
-     dns_name_reuse].
+     dns_name_reuse,
+     customize_hostname_check].
 
 init_per_suite(Config0) ->
     catch crypto:stop(),
@@ -88,12 +87,10 @@ end_per_suite(_) ->
     ssl:stop(),
     application:stop(crypto).
 
-init_per_testcase(TestCase, Config) when TestCase == ip_fallback;
-                                         TestCase == no_ip_fallback;
-                                         TestCase == dns_name_reuse ->
+init_per_testcase(customize_hostname_check, Config) ->
     ssl_test_lib:ct_log_supported_protocol_versions(Config),
-    ct:log("Ciphers: ~p~n ", [ ssl:cipher_suites()]),
-    ct:timetrap({seconds, 20}),
+    ssl_test_lib:clean_start(),
+    ct:timetrap({seconds, 5}),
     Config;
 init_per_testcase(_TestCase, Config) ->
     ssl_test_lib:ct_log_supported_protocol_versions(Config),
@@ -236,8 +233,61 @@ dns_name_reuse(Config) ->
                                          {mfa, {ssl_test_lib, session_info_result, []}},
                                          {from, self()},  {options, [{verify, verify_peer} | ClientConf]}]),
     
-    ssl_test_lib:check_result(Client1, {error, {tls_alert, "handshake failure"}}),
+    ssl_test_lib:check_client_alert(Client1, handshake_failure),
     ssl_test_lib:close(Client0).
+
+
+customize_hostname_check() ->
+    [{doc,"Test option customize_hostname_check."}].
+customize_hostname_check(Config) when is_list(Config) ->
+    Ext = [#'Extension'{extnID = ?'id-ce-subjectAltName',
+                        extnValue = [{dNSName, "*.example.org"}],
+                        critical = false}
+          ],
+    #{server_config := ServerOpts0,
+      client_config := ClientOpts0} = ssl_test_lib:make_cert_chains_pem(rsa, [{server_chain,
+                                                                               [[], 
+                                                                                [],
+                                                                                [{extensions, Ext}]
+                                                                               ]}], 
+                                                                        Config, "https_hostname_convention"),
+    ClientOpts = ssl_test_lib:ssl_options(ClientOpts0, Config),
+    ServerOpts = ssl_test_lib:ssl_options(ServerOpts0, Config),  
+                                        
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+  
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+                                        {host, Hostname},
+					{from, self()}, 
+					{mfa, {ssl_test_lib, send_recv_result_active, []}},
+					{options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    
+    CustomFun = public_key:pkix_verify_hostname_match_fun(https),
+    
+    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},
+                                          {server_name_indication, "other.example.org"},
+                                          {customize_hostname_check, 
+                                           [{match_fun, CustomFun}]} | ClientOpts]
+					 }]),    
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    
+    Server ! {listen, {mfa, {ssl_test_lib, no_result, []}}},
+                                        
+    Client1 = ssl_test_lib:start_client_error([{node, ClientNode}, {port, Port}, 
+                                               {host, Hostname},
+                                               {from, self()}, 
+                                               {mfa, {ssl_test_lib, no_result, []}},
+                                               {options, [{verify, verify_peer},
+                                                          {server_name_indication, "other.example.org"} | ClientOpts]}
+                                              ]),    
+    ssl_test_lib:check_client_alert(Server, Client1, handshake_failure).
+
 %%--------------------------------------------------------------------
 %% Internal Functions ------------------------------------------------
 %%--------------------------------------------------------------------
@@ -370,8 +420,8 @@ unsuccessfull_connect(ServerOptions, ClientOptions, Hostname0, Config) ->
 					      {from, self()}, 
 					      {options, ClientOptions}]),
     
-    ssl_test_lib:check_result(Server, {error, {tls_alert, "handshake failure"}},
-			      Client, {error, {tls_alert, "handshake failure"}}).
+    ssl_test_lib:check_server_alert(Server, Client, handshake_failure).
+
 host_name(undefined, Hostname) ->
     Hostname;
 host_name(Hostname, _) ->
diff --git a/lib/ssl/test/ssl_socket_SUITE.erl b/lib/ssl/test/ssl_socket_SUITE.erl
new file mode 100644
index 0000000000..d648f2f9e1
--- /dev/null
+++ b/lib/ssl/test/ssl_socket_SUITE.erl
@@ -0,0 +1,437 @@
+%%
+%% Copyright Ericsson AB 2019-2019. 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_socket_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").
+
+-define(SLEEP, 500).
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+all() -> 
+    [
+    {group, tls},
+    {group, dtls}  
+    ].
+
+groups() ->
+    [
+     {tls,[], socket_tests() ++ raw_inet_opt()},
+     {dtls,[], socket_tests()}
+    ].
+
+socket_tests() ->
+    [
+     getstat,
+     socket_options,
+     invalid_inet_get_option,
+     invalid_inet_get_option_not_list,
+     invalid_inet_get_option_improper_list,
+     invalid_inet_set_option,
+     invalid_inet_set_option_not_list,
+     invalid_inet_set_option_improper_list
+    ].
+
+raw_inet_opt() ->
+    [
+     raw_inet_option
+    ].
+
+
+init_per_suite(Config0) ->
+    catch crypto:stop(),
+    try crypto:start() of
+	ok ->
+	    ssl_test_lib:clean_start(),
+	    ssl_test_lib:make_rsa_cert(Config0)
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:unload(ssl),
+    application:stop(crypto).
+
+init_per_group(dtls, Config) ->    
+    [{protocol_opts, [{protocol, dtls}]} | proplists:delete(protocol_opts, Config)];
+init_per_group(tls, Config) ->    
+    [{protocol_opts, [{protocol, tls}]} | proplists:delete(protocol_opts, Config)];
+init_per_group(_GroupName, Config) ->    
+    [{client_type, erlang},
+     {server_type, erlang} | Config].
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+init_per_testcase(raw_inet_option, Config) ->
+    ct:timetrap({seconds, 5}),
+    case os:type() of
+        {unix,linux} ->
+            Config;
+        _ ->
+            {skip, "Raw options are platform-specific"}
+    end;
+init_per_testcase(_TestCase, Config) ->
+    ct:timetrap({seconds, 5}),
+    Config.
+
+end_per_testcase(_TestCase, Config) ->     
+    Config.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+getstat() ->
+    [{doc,"Test API function getstat/2"}].
+
+getstat(Config) when is_list(Config) ->
+    ClientOpts = ?config(client_rsa_opts, Config),
+    ServerOpts = ?config(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server1 =
+        ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+                                   {from, self()},
+                                   {mfa, {ssl_test_lib, send_recv_result, []}},
+                                   {options,  [{active, false} | ServerOpts]}]),
+    Port1 = ssl_test_lib:inet_port(Server1),
+    Server2 =
+        ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+                                   {from, self()},
+                                   {mfa, {ssl_test_lib, send_recv_result, []}},
+                                   {options,  [{active, false} | ServerOpts]}]),
+    Port2 = ssl_test_lib:inet_port(Server2),
+    {ok, ActiveC} = rpc:call(ClientNode, ssl, connect,
+                          [Hostname,Port1,[{active, once}|ClientOpts]]),
+    {ok, PassiveC} = rpc:call(ClientNode, ssl, connect,
+                          [Hostname,Port2,[{active, false}|ClientOpts]]),
+
+    ct:log("Testcase ~p, Client ~p  Servers ~p, ~p ~n",
+                       [self(), self(), Server1, Server2]),
+
+    %% We only check that the values are non-zero initially
+    %% (due to the handshake), and that sending more changes the values.
+
+    %% Passive socket.
+
+    {ok, InitialStats} = ssl:getstat(PassiveC),
+    ct:pal("InitialStats  ~p~n", [InitialStats]),
+    [true] = lists:usort([0 =/= proplists:get_value(Name, InitialStats)
+        || Name <- [recv_cnt, recv_oct, recv_avg, recv_max, send_cnt, send_oct, send_avg, send_max]]),
+
+    ok = ssl:send(PassiveC, "Hello world"),
+    wait_for_send(PassiveC),
+    {ok, SStats} = ssl:getstat(PassiveC, [send_cnt, send_oct]),
+    ct:pal("SStats  ~p~n", [SStats]),
+    [true] = lists:usort([proplists:get_value(Name, SStats) =/= proplists:get_value(Name, InitialStats)
+        || Name <- [send_cnt, send_oct]]),
+
+    %% Active socket.
+
+    {ok, InitialAStats} = ssl:getstat(ActiveC),
+    ct:pal("InitialAStats  ~p~n", [InitialAStats]),
+    [true] = lists:usort([0 =/= proplists:get_value(Name, InitialAStats)
+        || Name <- [recv_cnt, recv_oct, recv_avg, recv_max, send_cnt, send_oct, send_avg, send_max]]),
+
+    _ = receive
+        {ssl, ActiveC, _} ->
+            ok
+    after
+        ?SLEEP ->
+            exit(timeout)
+    end,
+
+    ok = ssl:send(ActiveC, "Hello world"),
+    wait_for_send(ActiveC),
+    {ok, ASStats} = ssl:getstat(ActiveC, [send_cnt, send_oct]),
+    ct:pal("ASStats  ~p~n", [ASStats]),
+    [true] = lists:usort([proplists:get_value(Name, ASStats) =/= proplists:get_value(Name, InitialAStats)
+        || Name <- [send_cnt, send_oct]]),
+
+    ok.
+%%--------------------------------------------------------------------
+socket_options() ->
+    [{doc,"Test API function getopts/2 and setopts/2"}].
+
+socket_options(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Values = [{mode, list}, {active, true}],    
+    %% Shall be the reverse order of Values! 
+    Options = [active, mode],
+    
+    NewValues = [{mode, binary}, {active, once}],
+    %% Shall be the reverse order of NewValues! 
+    NewOptions = [active, mode],
+    
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+					{from, self()}, 
+			   {mfa, {?MODULE, socket_options_result, 
+				  [Options, Values, NewOptions, NewValues]}},
+			   {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
+					{host, Hostname},
+			   {from, self()}, 
+			   {mfa, {?MODULE, socket_options_result, 
+				  [Options, Values, NewOptions, NewValues]}},
+			   {options, ClientOpts}]),
+    
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    
+    {ok, Listen} = ssl:listen(0, ServerOpts),
+    {ok,[{mode,list}]} = ssl:getopts(Listen, [mode]),
+    ok = ssl:setopts(Listen, [{mode, binary}]),
+    {ok,[{mode, binary}]} = ssl:getopts(Listen, [mode]),
+    {ok,[{recbuf, _}]} = ssl:getopts(Listen, [recbuf]),
+    ssl:close(Listen).
+
+%%--------------------------------------------------------------------
+raw_inet_option() ->
+    [{doc,"Ensure that a single 'raw' option is passed to ssl:listen correctly."}].
+
+raw_inet_option(Config) when is_list(Config) ->
+    % 'raw' option values are platform-specific; these are the Linux values:
+    IpProtoTcp = 6,
+    % Use TCP_KEEPIDLE, because (e.g.) TCP_MAXSEG can't be read back reliably.
+    TcpKeepIdle = 4,
+    KeepAliveTimeSecs = 55,
+    LOptions = [{raw, IpProtoTcp, TcpKeepIdle, <<KeepAliveTimeSecs:32/native>>}],
+    {ok, LSocket} = ssl:listen(0, LOptions),
+    % Per http://www.erlang.org/doc/man/inet.html#getopts-2, we have to specify
+    % exactly which raw option we want, and the size of the buffer.
+    {ok, [{raw, IpProtoTcp, TcpKeepIdle, <<KeepAliveTimeSecs:32/native>>}]} = 
+        ssl:getopts(LSocket, [{raw, IpProtoTcp, TcpKeepIdle, 4}]).
+
+%%--------------------------------------------------------------------
+
+invalid_inet_get_option() ->
+    [{doc,"Test handling of invalid inet options in getopts"}].
+
+invalid_inet_get_option(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+			   {mfa, {?MODULE, get_invalid_inet_option, []}},
+			   {options, ServerOpts}]),
+    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, no_result, []}},
+			   {options, ClientOpts}]),
+
+    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
+		       [self(), Client, Server]),
+
+    ssl_test_lib:check_result(Server, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+invalid_inet_get_option_not_list() ->
+    [{doc,"Test handling of invalid type in getopts"}].
+
+invalid_inet_get_option_not_list(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+			   {mfa, {?MODULE, get_invalid_inet_option_not_list, []}},
+			   {options, ServerOpts}]),
+    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, no_result, []}},
+			   {options, ClientOpts}]),
+
+    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
+		       [self(), Client, Server]),
+    
+    ssl_test_lib:check_result(Server, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+invalid_inet_get_option_improper_list() ->
+    [{doc,"Test handling of invalid type in getopts"}].
+
+invalid_inet_get_option_improper_list(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+			   {mfa, {?MODULE, get_invalid_inet_option_improper_list, []}},
+			   {options, ServerOpts}]),
+    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, no_result, []}},
+			   {options, ClientOpts}]),
+
+    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
+		       [self(), Client, Server]),
+
+    ssl_test_lib:check_result(Server, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+invalid_inet_set_option() ->
+    [{doc,"Test handling of invalid inet options in setopts"}].
+
+invalid_inet_set_option(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+			   {mfa, {?MODULE, set_invalid_inet_option, []}},
+			   {options, ServerOpts}]),
+    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, no_result, []}},
+			   {options, ClientOpts}]),
+
+    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
+		       [self(), Client, Server]),
+
+    ssl_test_lib:check_result(Server, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+invalid_inet_set_option_not_list() ->
+    [{doc,"Test handling of invalid type in setopts"}].
+
+invalid_inet_set_option_not_list(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+			   {mfa, {?MODULE, set_invalid_inet_option_not_list, []}},
+			   {options, ServerOpts}]),
+    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, no_result, []}},
+			   {options, ClientOpts}]),
+
+    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
+		       [self(), Client, Server]),
+
+    ssl_test_lib:check_result(Server, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+invalid_inet_set_option_improper_list() ->
+    [{doc,"Test handling of invalid tye in setopts"}].
+
+invalid_inet_set_option_improper_list(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+			   {mfa, {?MODULE, set_invalid_inet_option_improper_list, []}},
+			   {options, ServerOpts}]),
+    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, no_result, []}},
+			   {options, ClientOpts}]),
+
+    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
+		       [self(), Client, Server]),
+
+    ssl_test_lib:check_result(Server, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+
+%%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
+%%--------------------------------------------------------------------
+socket_options_result(Socket, Options, DefaultValues, NewOptions, NewValues) ->
+    %% Test get/set emulated opts
+    {ok, DefaultValues} = ssl:getopts(Socket, Options), 
+    ssl:setopts(Socket, NewValues),
+    {ok, NewValues} = ssl:getopts(Socket, NewOptions),
+    %% Test get/set inet opts
+    {ok,[{reuseaddr, _}]} = ssl:getopts(Socket, [reuseaddr]),  
+    {ok, All} = ssl:getopts(Socket, []),
+    ct:log("All opts ~p~n", [All]),
+    ok.
+
+get_invalid_inet_option(Socket) ->
+    {error, {options, {socket_options, foo, _}}} = ssl:getopts(Socket, [foo]),
+    ok.
+
+get_invalid_inet_option_not_list(Socket) ->
+    {error, {options, {socket_options, some_invalid_atom_here}}}
+     = ssl:getopts(Socket, some_invalid_atom_here),
+     ok.
+
+get_invalid_inet_option_improper_list(Socket) ->
+    {error, {options, {socket_options, foo,_}}} = ssl:getopts(Socket, [packet | foo]),
+    ok.
+
+set_invalid_inet_option(Socket) ->
+    {error, {options, {socket_options, {packet, foo}}}} = ssl:setopts(Socket, [{packet, foo}]),
+    {error, {options, {socket_options, {header, foo}}}} = ssl:setopts(Socket, [{header, foo}]),
+    {error, {options, {socket_options, {active, foo}}}} = ssl:setopts(Socket, [{active, foo}]),
+    {error, {options, {socket_options, {mode, foo}}}}   = ssl:setopts(Socket, [{mode, foo}]),
+    ok.
+
+set_invalid_inet_option_not_list(Socket) ->
+    {error, {options, {not_a_proplist, some_invalid_atom_here}}}
+	= ssl:setopts(Socket, some_invalid_atom_here),
+    ok.
+
+set_invalid_inet_option_improper_list(Socket) ->
+    {error, {options, {not_a_proplist, [{packet, 0} | {foo, 2}]}}} =
+	ssl:setopts(Socket, [{packet, 0} | {foo, 2}]),
+    ok.
+
+wait_for_send(Socket) ->
+    %% Make sure TLS process processed send message event
+    _ = ssl:connection_information(Socket).
+
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index a8d62d6c4e..7dd27fb5cb 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -30,6 +30,7 @@
 
 -record(sslsocket, { fd = nil, pid = nil}).
 -define(SLEEP, 1000).
+-define(DEFAULT_CURVE, secp256r1).
 
 %% For now always run locally
 run_where(_) ->
@@ -44,26 +45,35 @@ run_where(_, ipv6) ->
     Host = rpc:call(ServerNode, net_adm, localhost, []),
     {ClientNode, ServerNode, Host}.
 
-node_to_hostip(Node) ->
+node_to_hostip(Node, Role) ->
     [_ , Host] = string:tokens(atom_to_list(Node), "@"),
     {ok, Address} = inet:getaddr(Host, inet),
+    %% Convert client addresses in 127.0.0.0/24 subnet to the atom 'localhost'.
+    %% This is a workaround for testcase problems caused by the fact that
+    %% inet:peername/1 and inet:getaddr/2 return different addresses when
+    %% running on localhost.
+    normalize_loopback(Address, Role).
+
+normalize_loopback({127,_,_,_}, client) ->
+    localhost;
+normalize_loopback(Address, _) ->
     Address.
 
 start_server(Args) ->
-    Result = spawn_link(?MODULE, run_server, [Args]),
+    Node = proplists:get_value(node, Args),
+    Result = spawn_link(Node, ?MODULE, run_server, [Args]),
     receive
 	{listen, up} ->
 	    Result
     end.
 
 run_server(Opts) ->
-    Node = proplists:get_value(node, Opts),
     Port = proplists:get_value(port, Opts),
     Options = proplists:get_value(options, Opts),
     Pid = proplists:get_value(from, Opts),
     Transport =  proplists:get_value(transport, Opts, ssl),
     ct:log("~p:~p~nssl:listen(~p, ~p)~n", [?MODULE,?LINE, Port, Options]),
-    {ok, ListenSocket} = rpc:call(Node, Transport, listen, [Port, Options]),
+    {ok, ListenSocket} = Transport:listen(Port, Options),
     Pid ! {listen, up},
     send_selected_port(Pid, Port, ListenSocket),
     run_server(ListenSocket, Opts).
@@ -89,13 +99,12 @@ do_run_server(_, ok = Result, Opts) ->
     Pid = proplists:get_value(from, Opts),
     Pid ! {self(), Result};
 do_run_server(ListenSocket, AcceptSocket, Opts) ->
-    Node = proplists:get_value(node, Opts),
     Pid = proplists:get_value(from, Opts),
     Transport = proplists:get_value(transport, Opts, ssl),
     {Module, Function, Args} = proplists:get_value(mfa, Opts),
     ct:log("~p:~p~nServer: apply(~p,~p,~p)~n",
            [?MODULE,?LINE, Module, Function, [AcceptSocket | Args]]),
-    case rpc:call(Node, Module, Function, [AcceptSocket | Args]) of
+    case apply(Module, Function, [AcceptSocket | Args]) of
 	no_result_msg ->
 	    ok;
 	Msg ->
@@ -109,8 +118,8 @@ do_run_server(ListenSocket, AcceptSocket, Opts) ->
 	    run_server(ListenSocket, [MFA | proplists:delete(mfa, Opts)]);
 	close ->
 	    ct:log("~p:~p~nServer closing  ~p ~n", [?MODULE,?LINE, self()]),
-	    Result = rpc:call(Node, Transport, close, [AcceptSocket], 500),
-	    Result1 = rpc:call(Node, Transport, close, [ListenSocket], 500),
+	    Result = Transport:close(AcceptSocket),
+	    Result1 = Transport:close(ListenSocket),
 	    ct:log("~p:~p~nResult ~p : ~p ~n", [?MODULE,?LINE, Result, Result1]);
 	{ssl_closed, _} ->
 	    ok
@@ -131,41 +140,38 @@ connect(#sslsocket{} = ListenSocket, Opts) ->
 	  remove_close_msg(ReconnectTimes),
 	  AcceptSocket
     end;
-connect(ListenSocket, Opts) ->
-    Node = proplists:get_value(node, Opts),
+connect(ListenSocket, _Opts) ->
     ct:log("~p:~p~ngen_tcp:accept(~p)~n", [?MODULE,?LINE, ListenSocket]),
-    {ok, AcceptSocket} = rpc:call(Node, gen_tcp, accept, 
-				  [ListenSocket]),
+    {ok, AcceptSocket} = gen_tcp:accept(ListenSocket),
     AcceptSocket.
 
 connect(_, _, 0, AcceptSocket, _, _, _) ->
     AcceptSocket;
 connect(ListenSocket, Node, _N, _, Timeout, SslOpts, cancel) ->
     ct:log("ssl:transport_accept(~p)~n", [ListenSocket]),
-    {ok, AcceptSocket} = rpc:call(Node, ssl, transport_accept, 
-				  [ListenSocket]),    
+    {ok, AcceptSocket} = ssl:transport_accept(ListenSocket),    
     ct:log("~p:~p~nssl:handshake(~p,~p,~p)~n", [?MODULE,?LINE, AcceptSocket, SslOpts,Timeout]),
 
-    case rpc:call(Node, ssl, handshake, [AcceptSocket, SslOpts, Timeout]) of
+    case ssl:handshake(AcceptSocket, SslOpts, Timeout) of
 	{ok, Socket0, Ext} ->
             ct:log("Ext ~p:~n", [Ext]),            
             ct:log("~p:~p~nssl:handshake_cancel(~p)~n", [?MODULE,?LINE, Socket0]),            
-            rpc:call(Node, ssl, handshake_cancel, [Socket0]);
+            ssl:handshake_cancel(Socket0);
         Result ->
 	    ct:log("~p:~p~nssl:handshake@~p ret ~p",[?MODULE,?LINE, Node,Result]),
 	    Result
     end;
 connect(ListenSocket, Node, N, _, Timeout, SslOpts, [_|_] =ContOpts) ->
     ct:log("ssl:transport_accept(~p)~n", [ListenSocket]),
-    {ok, AcceptSocket} = rpc:call(Node, ssl, transport_accept, 
-				  [ListenSocket]),    
+    {ok, AcceptSocket} = ssl:transport_accept(ListenSocket),    
     ct:log("~p:~p~nssl:handshake(~p,~p,~p)~n", [?MODULE,?LINE, AcceptSocket, SslOpts,Timeout]),
 
-    case rpc:call(Node, ssl, handshake, [AcceptSocket, SslOpts, Timeout]) of
+    case ssl:handshake(AcceptSocket, SslOpts, Timeout) of
 	{ok, Socket0, Ext} ->
+            [_|_] = maps:get(sni, Ext),
             ct:log("Ext ~p:~n", [Ext]),            
             ct:log("~p:~p~nssl:handshake_continue(~p,~p,~p)~n", [?MODULE,?LINE, Socket0, ContOpts,Timeout]),            
-            case rpc:call(Node, ssl, handshake_continue, [Socket0, ContOpts, Timeout]) of
+            case ssl:handshake_continue(Socket0, ContOpts, Timeout) of
                 {ok, Socket} ->
                     connect(ListenSocket, Node, N-1, Socket, Timeout, SslOpts, ContOpts);
                 Error ->
@@ -178,71 +184,144 @@ connect(ListenSocket, Node, N, _, Timeout, SslOpts, [_|_] =ContOpts) ->
     end;
 connect(ListenSocket, Node, N, _, Timeout, [], ContOpts) ->
     ct:log("ssl:transport_accept(~p)~n", [ListenSocket]),
-    {ok, AcceptSocket} = rpc:call(Node, ssl, transport_accept, 
-				  [ListenSocket]),    
+    {ok, AcceptSocket} = ssl:transport_accept(ListenSocket),    
     ct:log("~p:~p~nssl:ssl_accept(~p, ~p)~n", [?MODULE,?LINE, AcceptSocket, Timeout]),
 
-    case rpc:call(Node, ssl, ssl_accept, [AcceptSocket, Timeout]) of
-	ok ->
-	    connect(ListenSocket, Node, N-1, AcceptSocket, Timeout, [], ContOpts);
+    case ssl:handshake(AcceptSocket, Timeout) of
+	{ok, Socket} ->
+	    connect(ListenSocket, Node, N-1, Socket, Timeout, [], ContOpts);
 	Result ->
-	    ct:log("~p:~p~nssl:ssl_accept@~p ret ~p",[?MODULE,?LINE, Node,Result]),
+	    ct:log("~p:~p~nssl:handshake@~p ret ~p",[?MODULE,?LINE, Node,Result]),
 	    Result
     end;
-connect(ListenSocket, Node, _, _, Timeout, Opts, _) ->
+connect(ListenSocket, _Node, _, _, Timeout, Opts, _) ->
     ct:log("ssl:transport_accept(~p)~n", [ListenSocket]),
-    {ok, AcceptSocket} = rpc:call(Node, ssl, transport_accept, 
-				  [ListenSocket]),    
-    ct:log("ssl:ssl_accept(~p,~p, ~p)~n", [AcceptSocket, Opts, Timeout]),
-    rpc:call(Node, ssl, ssl_accept, [AcceptSocket, Opts, Timeout]),
+    {ok, AcceptSocket} = ssl:transport_accept(ListenSocket),    
+    ct:log("ssl:handshake(~p,~p, ~p)~n", [AcceptSocket, Opts, Timeout]),
+    ssl:handshake(AcceptSocket, Opts, Timeout),
     AcceptSocket.
 
 
 start_server_transport_abuse_socket(Args) ->
-    Result = spawn_link(?MODULE, transport_accept_abuse, [Args]),
+    Node = proplists:get_value(node, Args),
+    Result = spawn_link(Node, ?MODULE, transport_accept_abuse, [Args]),
     receive
 	{listen, up} ->
 	    Result
     end.
 
 start_server_transport_control(Args) ->
-    Result = spawn_link(?MODULE, transport_switch_control, [Args]),
+    Node = proplists:get_value(node, Args),
+    Result = spawn_link(Node, ?MODULE, transport_switch_control, [Args]),
     receive
 	{listen, up} ->
 	    Result
     end.
 
+start_erlang_client_and_openssl_server_with_opts(Config, ErlangClientOpts, OpensslServerOpts, Data, Callback) ->
+    process_flag(trap_exit, true),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
+    ClientOpts0 = ssl_test_lib:ssl_options(client_rsa_verify_opts, Config),
+    ClientOpts = ErlangClientOpts ++ ClientOpts0,
+
+    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
+
+    Data = "From openssl to erlang",
+
+    Port = ssl_test_lib:inet_port(node()),
+    CaCertFile = proplists:get_value(cacertfile, ServerOpts),
+    CertFile = proplists:get_value(certfile, ServerOpts),
+    KeyFile = proplists:get_value(keyfile, ServerOpts),
+    Version = ssl_test_lib:protocol_version(Config),
+
+    Exe = "openssl",
+    Args = case OpensslServerOpts of
+	       [] -> 
+		   ["s_server", "-accept", 
+		    integer_to_list(Port), ssl_test_lib:version_flag(Version),
+                    "-CAfile", CaCertFile,
+		    "-cert", CertFile,"-key", KeyFile];
+	       [Opt, Value] ->
+		   ["s_server", Opt, Value, "-accept", 
+		    integer_to_list(Port), ssl_test_lib:version_flag(Version),
+                    "-CAfile", CaCertFile,
+		    "-cert", CertFile,"-key", KeyFile]
+	   end,
+		   
+    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,
+                           active_recv, [length(Data)]}},
+                    {options, ClientOpts}]),
+
+    Callback(Client, OpensslPort),
+
+    %% 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).
+
 
 transport_accept_abuse(Opts) ->
-    Node = proplists:get_value(node, Opts),
     Port = proplists:get_value(port, Opts),
     Options = proplists:get_value(options, Opts),
     Pid = proplists:get_value(from, Opts),
     Transport =  proplists:get_value(transport, Opts, ssl),
     ct:log("~p:~p~nssl:listen(~p, ~p)~n", [?MODULE,?LINE, Port, Options]),
-    {ok, ListenSocket} = rpc:call(Node, Transport, listen, [Port, Options]),
+    {ok, ListenSocket} = Transport:listen(Port, Options),
     Pid ! {listen, up},
     send_selected_port(Pid, Port, ListenSocket),
-    {ok, AcceptSocket} = rpc:call(Node, ssl, transport_accept, 
-                                  [ListenSocket]),    
-    {error, _} = rpc:call(Node, ssl, connection_information, [AcceptSocket]),
-    _ = rpc:call(Node, ssl, handshake, [AcceptSocket, infinity]),
+    {ok, AcceptSocket} = ssl:transport_accept(ListenSocket),    
+    {error, _} = ssl:connection_information(AcceptSocket),
+    _ = ssl:handshake(AcceptSocket, infinity),
     Pid ! {self(), ok}.
 
+start_erlang_server_and_openssl_client_with_opts(Config, ErlangServerOpts, OpenSSLClientOpts, Data, Callback) ->
+    process_flag(trap_exit, true),
+    ServerOpts0 = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    ServerOpts = ErlangServerOpts ++  ServerOpts0,
+
+    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+                    {from, self()},
+                    {mfa, {?MODULE, active_recv, [length(Data)]}},
+                    {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Version = ssl_test_lib:protocol_version(Config),
+   
+    Exe = "openssl",
+    Args = ["s_client"] ++ OpenSSLClientOpts ++ ["-msg",  "-connect", 
+                                                 hostname_format(Hostname) ++ ":" ++ integer_to_list(Port),
+                                                 ssl_test_lib:version_flag(Version)],
+
+    OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args),
+
+    Callback(Server, OpenSslPort),
+
+    ssl_test_lib:close(Server),
+
+    ssl_test_lib:close_port(OpenSslPort),
+    process_flag(trap_exit, false).
 
 transport_switch_control(Opts) ->
-    Node = proplists:get_value(node, Opts),
     Port = proplists:get_value(port, Opts),
     Options = proplists:get_value(options, Opts),
     Pid = proplists:get_value(from, Opts),
     Transport =  proplists:get_value(transport, Opts, ssl),
     ct:log("~p:~p~nssl:listen(~p, ~p)~n", [?MODULE,?LINE, Port, Options]),
-    {ok, ListenSocket} = rpc:call(Node, Transport, listen, [Port, Options]),
+    {ok, ListenSocket} = Transport:listen(Port, Options),
     Pid ! {listen, up},
     send_selected_port(Pid, Port, ListenSocket),
-    {ok, AcceptSocket} = rpc:call(Node, ssl, transport_accept, 
-                                  [ListenSocket]),    
-    ok = rpc:call(Node, ssl, controlling_process, [AcceptSocket, self()]),
+    {ok, AcceptSocket} = ssl:transport_accept(ListenSocket),    
+    ok = ssl:controlling_process(AcceptSocket, self()),
     Pid ! {self(), ok}.
 
 
@@ -255,7 +334,8 @@ remove_close_msg(ReconnectTimes) ->
     end.
 	    
 start_client(Args) ->
-    Result = spawn_link(?MODULE, run_client_init, [lists:delete(return_socket, Args)]),
+    Node = proplists:get_value(node, Args),
+    Result = spawn_link(Node, ?MODULE, run_client_init, [lists:delete(return_socket, Args)]),
     receive 
 	{connected, Socket} ->
 	    case lists:member(return_socket, Args) of
@@ -287,8 +367,8 @@ run_client(Opts) ->
             client_cont_loop(Node, Host, Port, Pid, Transport, Options, ContOpts, Opts)
     end.
 
-client_loop(Node, Host, Port, Pid, Transport, Options, Opts) ->
-    case rpc:call(Node, Transport, connect, [Host, Port, Options]) of
+client_loop(_Node, Host, Port, Pid, Transport, Options, Opts) ->
+    case Transport:connect(Host, Port, Options) of
 	{ok, Socket} ->
 	    Pid ! {connected, Socket},
 	    ct:log("~p:~p~nClient: connected~n", [?MODULE,?LINE]),
@@ -298,7 +378,7 @@ client_loop(Node, Host, Port, Pid, Transport, Options, Opts) ->
 	    {Module, Function, Args} = proplists:get_value(mfa, Opts),
 	    ct:log("~p:~p~nClient: apply(~p,~p,~p)~n",
 			       [?MODULE,?LINE, Module, Function, [Socket | Args]]),
-	    case rpc:call(Node, Module, Function, [Socket | Args]) of
+	    case apply(Module, Function, [Socket | Args]) of
 		no_result_msg ->
 		    ok;
 		Msg ->
@@ -308,7 +388,7 @@ client_loop(Node, Host, Port, Pid, Transport, Options, Opts) ->
 	    receive
 		close ->
 		    ct:log("~p:~p~nClient closing~n", [?MODULE,?LINE]),
-		    rpc:call(Node, Transport, close, [Socket]);
+		    Transport:close(Socket);
 		{ssl_closed, Socket} ->
 		    ok;
 		{gen_tcp, closed} ->
@@ -338,16 +418,13 @@ client_loop(Node, Host, Port, Pid, Transport, Options, Opts) ->
 	    end;
 	{error, Reason} ->
 	    ct:log("~p:~p~nClient: connection failed: ~p ~n", [?MODULE,?LINE, Reason]),
-	    Pid ! {connect_failed, Reason};
-	{badrpc,BadRPC} ->
-            ct:log("~p:~p~nBad rpc: ~p",[?MODULE,?LINE, BadRPC]),
-            Pid ! {connect_failed, {badrpc,BadRPC}}
+	    Pid ! {connect_failed, Reason}
     end.
 
-client_cont_loop(Node, Host, Port, Pid, Transport, Options, cancel, _Opts) ->
-    case rpc:call(Node, Transport, connect, [Host, Port, Options]) of
+client_cont_loop(_Node, Host, Port, Pid, Transport, Options, cancel, _Opts) ->
+    case Transport:connect(Host, Port, Options) of
         {ok, Socket, _} ->
-           Result = rpc:call(Node, Transport, handshake_cancel, [Socket]),
+           Result = Transport:handshake_cancel(Socket),
             ct:log("~p:~p~nClient: Cancel: ~p ~n", [?MODULE,?LINE, Result]),
             Pid ! {connect_failed, Result};
         {error, Reason} ->
@@ -355,17 +432,17 @@ client_cont_loop(Node, Host, Port, Pid, Transport, Options, cancel, _Opts) ->
 	    Pid ! {connect_failed, Reason}
     end;
 
-client_cont_loop(Node, Host, Port, Pid, Transport, Options, ContOpts, Opts) ->
-    case rpc:call(Node, Transport, connect, [Host, Port, Options]) of
+client_cont_loop(_Node, Host, Port, Pid, Transport, Options, ContOpts, Opts) ->
+    case Transport:connect(Host, Port, Options) of
         {ok, Socket0, _} ->
             ct:log("~p:~p~nClient: handshake_continue(~p, ~p, infinity) ~n", [?MODULE, ?LINE, Socket0, ContOpts]),
-            case rpc:call(Node, Transport, handshake_continue, [Socket0, ContOpts]) of
+            case Transport:handshake_continue(Socket0, ContOpts) of
                 {ok, Socket} ->
                     Pid ! {connected, Socket},
                     {Module, Function, Args} = proplists:get_value(mfa, Opts),
                     ct:log("~p:~p~nClient: apply(~p,~p,~p)~n",
                            [?MODULE,?LINE, Module, Function, [Socket | Args]]),
-                    case rpc:call(Node, Module, Function, [Socket | Args]) of
+                    case apply(Module, Function, [Socket | Args]) of
                         no_result_msg ->
                             ok;
                         Msg ->
@@ -402,14 +479,16 @@ close(Pid, Timeout) ->
 	    exit(Pid, kill)
     end.
 
-check_result(Server, ServerMsg, Client, ClientMsg) -> 
+check_result(Server, ServerMsg, Client, ClientMsg) ->
+    {ClientIP, ClientPort} = get_ip_port(ServerMsg),
     receive 
 	{Server, ServerMsg} ->
 	    check_result(Client, ClientMsg);
-
+        %% Workaround to accept local addresses (127.0.0.0/24)
+        {Server, {ok, {{127,_,_,_}, ClientPort}}} when ClientIP =:= localhost  ->
+            check_result(Client, ClientMsg);
 	{Client, ClientMsg} ->
 	    check_result(Server, ServerMsg);
-
 	{Port, {data,Debug}} when is_port(Port) ->
 	    ct:log("~p:~p~n Openssl ~s~n",[?MODULE,?LINE, Debug]),
 	    check_result(Server, ServerMsg, Client, ClientMsg);
@@ -422,10 +501,14 @@ check_result(Server, ServerMsg, Client, ClientMsg) ->
 	    ct:fail(Reason)
     end.
 
-check_result(Pid, Msg) -> 
+check_result(Pid, Msg) ->
+    {ClientIP, ClientPort} = get_ip_port(Msg),
     receive 
 	{Pid, Msg} -> 
 	    ok;
+        %% Workaround to accept local addresses (127.0.0.0/24)
+        {Pid, {ok, {{127,_,_,_}, ClientPort}}} when ClientIP =:= localhost ->
+            ok;
 	{Port, {data,Debug}} when is_port(Port) ->
 	    ct:log("~p:~p~n Openssl ~s~n",[?MODULE,?LINE, Debug]),
 	    check_result(Pid,Msg);
@@ -438,6 +521,63 @@ check_result(Pid, Msg) ->
 	    ct:fail(Reason)
     end.
 
+
+get_ip_port({ok,{ClientIP, ClientPort}}) ->
+    {ClientIP, ClientPort};
+get_ip_port(_) ->
+    {undefined, undefined}.
+
+
+check_server_alert(Pid, Alert) ->
+    receive
+	{Pid, {error, {tls_alert, {Alert, STxt}}}} ->
+            check_server_txt(STxt),
+            ok;
+        {Pid, {error, closed}} ->
+            ok
+    end.
+check_server_alert(Server, Client, Alert) ->
+    receive
+	{Server, {error, {tls_alert, {Alert, STxt}}}} ->
+            check_server_txt(STxt),
+            check_client_alert(Client, Alert)
+    end.
+check_client_alert(Pid, Alert) ->
+    receive
+	{Pid, {error, {tls_alert, {Alert, CTxt}}}} ->
+            check_client_txt(CTxt),
+            ok;
+        {Pid, {ssl_error, _, {tls_alert, {Alert, CTxt}}}} ->
+            check_client_txt(CTxt),
+            ok;
+        {Pid, {error, closed}} ->
+            ok
+    end.
+check_client_alert(Server, Client, Alert) ->
+    receive
+	{Client, {error, {tls_alert, {Alert, CTxt}}}} ->
+            check_client_txt(CTxt),
+            check_server_alert(Server, Alert);
+        {Client, {ssl_error, _, {tls_alert, {Alert, CTxt}}}} ->
+            check_client_txt(CTxt),
+            ok;
+        {Client, {error, closed}} ->
+            ok
+    end.
+check_server_txt("TLS server" ++ _) ->
+    ok;
+check_server_txt("DTLS server" ++ _) ->
+    ok;
+check_server_txt(Txt) ->
+    ct:fail({expected_server, {got, Txt}}).
+
+check_client_txt("TLS client" ++ _) ->
+    ok;
+check_client_txt("DTLS client" ++ _) ->
+    ok;
+check_client_txt(Txt) ->
+    ct:fail({expected_server, {got, Txt}}).
+
 wait_for_result(Server, ServerMsg, Client, ClientMsg) -> 
     receive 
 	{Server, ServerMsg} -> 
@@ -482,13 +622,6 @@ wait_for_result(Pid, Msg) ->
 	%%     Unexpected
     end.
 
-user_lookup(psk, _Identity, UserState) ->
-    {ok, UserState};
-user_lookup(srp, Username, _UserState) ->
-    Salt = ssl_cipher:random_bytes(16),
-    UserPassHash = crypto:hash(sha, [Salt, crypto:hash(sha, [Username, <<$:>>, <<"secret">>])]),
-    {ok, {srp_1024, Salt, UserPassHash}}.
-
 cert_options(Config) ->
     ClientCaCertFile = filename:join([proplists:get_value(priv_dir, Config), 
 				      "client", "cacerts.pem"]),
@@ -515,45 +648,20 @@ cert_options(Config) ->
 				   "badcert.pem"]),
     BadKeyFile = filename:join([proplists:get_value(priv_dir, Config), 
 			      "badkey.pem"]),
-    PskSharedSecret = <<1,2,3,4,5,6,7,8,9,10,11,12,13,14,15>>,
-
+    
     [{client_opts, [{cacertfile, ClientCaCertFile}, 
 		    {certfile, ClientCertFile},  
 		    {keyfile, ClientKeyFile}]}, 
      {client_verification_opts, [{cacertfile, ServerCaCertFile}, 
 				{certfile, ClientCertFile},  
 				{keyfile, ClientKeyFile},
-				{ssl_imp, new}]}, 
+				{verify, verify_peer}]}, 
      {client_verification_opts_digital_signature_only, [{cacertfile, ServerCaCertFile},
 				{certfile, ClientCertFileDigitalSignatureOnly},
 				{keyfile, ClientKeyFile},
 				{ssl_imp, new}]},
      {server_opts, [{ssl_imp, new},{reuseaddr, true}, {cacertfile, ServerCaCertFile}, 
 		    {certfile, ServerCertFile}, {keyfile, ServerKeyFile}]},
-     {client_psk, [{ssl_imp, new},
-		   {psk_identity, "Test-User"},
-		   {user_lookup_fun, {fun user_lookup/3, PskSharedSecret}}]},
-     {server_psk, [{ssl_imp, new},{reuseaddr, true},
-		   {certfile, ServerCertFile}, {keyfile, ServerKeyFile},
-		   {user_lookup_fun, {fun user_lookup/3, PskSharedSecret}}]},
-     {server_psk_hint, [{ssl_imp, new},{reuseaddr, true},
-			{certfile, ServerCertFile}, {keyfile, ServerKeyFile},
-			{psk_identity, "HINT"},
-			{user_lookup_fun, {fun user_lookup/3, PskSharedSecret}}]},
-     {server_psk_anon, [{ssl_imp, new},{reuseaddr, true},
-			{user_lookup_fun, {fun user_lookup/3, PskSharedSecret}}]},
-     {server_psk_anon_hint, [{ssl_imp, new},{reuseaddr, true},
-			     {psk_identity, "HINT"},
-			     {user_lookup_fun, {fun user_lookup/3, PskSharedSecret}}]},
-     {client_srp, [{ssl_imp, new},
-		   {srp_identity, {"Test-User", "secret"}}]},
-     {server_srp, [{ssl_imp, new},{reuseaddr, true},
-		   {certfile, ServerCertFile}, {keyfile, ServerKeyFile},
-		   {user_lookup_fun, {fun user_lookup/3, undefined}},
-		   {ciphers, srp_suites()}]},
-     {server_srp_anon, [{ssl_imp, new},{reuseaddr, true},
-			{user_lookup_fun, {fun user_lookup/3, undefined}},
-			{ciphers, srp_anon_suites()}]},
      {server_verification_opts, [{ssl_imp, new},{reuseaddr, true}, 
 		    {cacertfile, ClientCaCertFile},
 		    {certfile, ServerCertFile}, {keyfile, ServerKeyFile}]},
@@ -594,15 +702,32 @@ make_dsa_cert(Config) ->
             
           [{server_dsa_opts, ServerConf},
            {server_dsa_verify_opts, [{verify, verify_peer} | ServerConf]},
-           {client_dsa_opts, ClientConf},
-           {server_srp_dsa, [{user_lookup_fun, {fun user_lookup/3, undefined}},
-                             {ciphers, srp_dss_suites()} | ServerConf]},
-           {client_srp_dsa, [{srp_identity, {"Test-User", "secret"}}
-                             | ClientConf]}
+           {client_dsa_opts, ClientConf}
            | Config];
       false ->
           Config
   end.
+
+
+make_cert_chains_der(Alg, UserConf) ->
+    ClientChain = proplists:get_value(client_chain, UserConf, default_cert_chain_conf()),
+    ServerChain = proplists:get_value(server_chain, UserConf, default_cert_chain_conf()),
+    CertChainConf = gen_conf(Alg, Alg, ClientChain, ServerChain),
+    public_key:pkix_test_data(CertChainConf).
+
+make_cert_chains_pem(Alg, UserConf, Config, Suffix) ->
+    ClientChain = proplists:get_value(client_chain, UserConf, default_cert_chain_conf()),
+    ServerChain = proplists:get_value(server_chain, UserConf, default_cert_chain_conf()),
+    CertChainConf = gen_conf(Alg, Alg, ClientChain, ServerChain),
+    ClientFileBase = filename:join([proplists:get_value(priv_dir, Config), atom_to_list(Alg) ++ Suffix]),
+    ServerFileBase = filename:join([proplists:get_value(priv_dir, Config), atom_to_list(Alg) ++ Suffix]),
+    GenCertData = public_key:pkix_test_data(CertChainConf),
+    Conf = x509_test:gen_pem_config_files(GenCertData, ClientFileBase, ServerFileBase),               
+    CConf = proplists:get_value(client_config, Conf),
+    SConf = proplists:get_value(server_config, Conf),
+    #{server_config => SConf,
+      client_config => CConf}.
+
 make_rsa_cert_chains(UserConf, Config, Suffix) ->
     ClientChain = proplists:get_value(client_chain, UserConf, default_cert_chain_conf()),
     ServerChain = proplists:get_value(server_chain, UserConf, default_cert_chain_conf()),
@@ -617,10 +742,47 @@ make_rsa_cert_chains(UserConf, Config, Suffix) ->
      [{reuseaddr, true}, {verify, verify_peer} | ServerConf]
     }.
 
+make_ecc_cert_chains(UserConf, Config, Suffix) ->
+    ClientChain = proplists:get_value(client_chain, UserConf, default_cert_chain_conf()),
+    ServerChain = proplists:get_value(server_chain, UserConf, default_cert_chain_conf()),
+    CertChainConf = gen_conf(ecdsa, ecdsa, ClientChain, ServerChain),
+    ClientFileBase = filename:join([proplists:get_value(priv_dir, Config), "ecdsa" ++ Suffix]),
+    ServerFileBase = filename:join([proplists:get_value(priv_dir, Config), "ecdsa" ++ Suffix]),
+    GenCertData = public_key:pkix_test_data(CertChainConf),
+    [{server_config, ServerConf}, 
+     {client_config, ClientConf}] = 
+        x509_test:gen_pem_config_files(GenCertData, ClientFileBase, ServerFileBase),               
+    {[{verify, verify_peer} | ClientConf],
+     [{reuseaddr, true}, {verify, verify_peer} | ServerConf]
+    }.
+
+
+make_dsa_cert_chains(UserConf, Config, Suffix) ->  
+    CryptoSupport = crypto:supports(),
+    case proplists:get_bool(dss, proplists:get_value(public_keys, CryptoSupport)) of
+        true ->
+            ClientChain = proplists:get_value(client_chain, UserConf, default_cert_chain_conf()),
+            ServerChain = proplists:get_value(server_chain, UserConf, default_cert_chain_conf()),
+            CertChainConf = gen_conf(dsa, dsa, ClientChain, ServerChain),
+            ClientFileBase = filename:join([proplists:get_value(priv_dir, Config), "dsa" ++ Suffix]),
+            ServerFileBase = filename:join([proplists:get_value(priv_dir, Config), "dsa" ++ Suffix]),
+            GenCertData = public_key:pkix_test_data(CertChainConf),
+            [{server_config, ServerConf}, 
+             {client_config, ClientConf}] = 
+                x509_test:gen_pem_config_files(GenCertData, ClientFileBase, ServerFileBase),
+            {[{verify, verify_peer} | ClientConf],
+             [{reuseaddr, true}, {verify, verify_peer} | ServerConf]};
+      false ->
+          Config
+  end.
+
 make_ec_cert_chains(UserConf, ClientChainType, ServerChainType, Config) ->
+    make_ec_cert_chains(UserConf, ClientChainType, ServerChainType, Config, ?DEFAULT_CURVE).
+%%
+make_ec_cert_chains(UserConf, ClientChainType, ServerChainType, Config, Curve) ->
     ClientChain = proplists:get_value(client_chain, UserConf, default_cert_chain_conf()),
     ServerChain = proplists:get_value(server_chain, UserConf, default_cert_chain_conf()),
-    CertChainConf = gen_conf(ClientChainType, ServerChainType, ClientChain, ServerChain),
+    CertChainConf = gen_conf(ClientChainType, ServerChainType, ClientChain, ServerChain, Curve),
     ClientFileBase = filename:join([proplists:get_value(priv_dir, Config), atom_to_list(ClientChainType)]),
     ServerFileBase = filename:join([proplists:get_value(priv_dir, Config), atom_to_list(ServerChainType)]),
     GenCertData = public_key:pkix_test_data(CertChainConf),
@@ -635,7 +797,11 @@ default_cert_chain_conf() ->
     %% Use only default options
     [[],[],[]].
 
-gen_conf(mix, mix, UserClient, UserServer) ->
+
+gen_conf(ClientChainType, ServerChainType, UserClient, UserServer) ->
+    gen_conf(ClientChainType, ServerChainType, UserClient, UserServer, ?DEFAULT_CURVE).
+%%
+gen_conf(mix, mix, UserClient, UserServer, _) ->
     ClientTag = conf_tag("client"),
     ServerTag = conf_tag("server"),
 
@@ -646,12 +812,12 @@ gen_conf(mix, mix, UserClient, UserServer) ->
     ServerConf = merge_chain_spec(UserServer, DefaultServer, []),
     
     new_format([{ClientTag, ClientConf}, {ServerTag, ServerConf}]);
-gen_conf(ClientChainType, ServerChainType, UserClient, UserServer) ->
+gen_conf(ClientChainType, ServerChainType, UserClient, UserServer, Curve) ->
     ClientTag = conf_tag("client"),
     ServerTag = conf_tag("server"),
 
-    DefaultClient = chain_spec(client, ClientChainType), 
-    DefaultServer = chain_spec(server, ServerChainType),
+    DefaultClient = chain_spec(client, ClientChainType, Curve),
+    DefaultServer = chain_spec(server, ServerChainType, Curve),
     
     ClientConf = merge_chain_spec(UserClient, DefaultClient, []),
     ServerConf = merge_chain_spec(UserServer, DefaultServer, []),
@@ -673,43 +839,43 @@ proplist_to_map([Head | Rest]) ->
 conf_tag(Role) ->
     list_to_atom(Role ++ "_chain").
 
-chain_spec(_Role, ecdh_rsa) ->
+chain_spec(_Role, ecdh_rsa, Curve) ->
     Digest = {digest, appropriate_sha(crypto:supports())},
-    CurveOid = hd(tls_v1:ecc_curves(0)),
+    CurveOid = pubkey_cert_records:namedCurves(Curve),
      [[Digest, {key, {namedCurve, CurveOid}}],
       [Digest, {key, hardcode_rsa_key(1)}],
       [Digest, {key, {namedCurve, CurveOid}}]];
 
-chain_spec(_Role, ecdhe_ecdsa) ->
+chain_spec(_Role, ecdhe_ecdsa, Curve) ->
     Digest = {digest, appropriate_sha(crypto:supports())},
-    CurveOid = hd(tls_v1:ecc_curves(0)),
+    CurveOid = pubkey_cert_records:namedCurves(Curve),
     [[Digest, {key, {namedCurve, CurveOid}}],
      [Digest, {key, {namedCurve, CurveOid}}],
      [Digest, {key, {namedCurve, CurveOid}}]];
 
-chain_spec(_Role, ecdh_ecdsa) ->
+chain_spec(_Role, ecdh_ecdsa, Curve) ->
     Digest = {digest, appropriate_sha(crypto:supports())},
-    CurveOid = hd(tls_v1:ecc_curves(0)),
+    CurveOid = pubkey_cert_records:namedCurves(Curve),
     [[Digest, {key, {namedCurve, CurveOid}}],
      [Digest, {key, {namedCurve, CurveOid}}],
      [Digest, {key, {namedCurve, CurveOid}}]];
-chain_spec(_Role, ecdhe_rsa) ->
+chain_spec(_Role, ecdhe_rsa, _) ->
     Digest = {digest, appropriate_sha(crypto:supports())},
     [[Digest, {key, hardcode_rsa_key(1)}],
      [Digest, {key, hardcode_rsa_key(2)}],
      [Digest, {key, hardcode_rsa_key(3)}]];
-chain_spec(_Role, ecdsa) ->
+chain_spec(_Role, ecdsa, Curve) ->
     Digest = {digest, appropriate_sha(crypto:supports())},
-    CurveOid = hd(tls_v1:ecc_curves(0)),
+    CurveOid = pubkey_cert_records:namedCurves(Curve),
     [[Digest, {key, {namedCurve, CurveOid}}],
      [Digest, {key, {namedCurve, CurveOid}}],
      [Digest, {key, {namedCurve, CurveOid}}]];
-chain_spec(_Role, rsa) ->
+chain_spec(_Role, rsa, _) ->
     Digest = {digest, appropriate_sha(crypto:supports())},
     [[Digest, {key, hardcode_rsa_key(1)}],
                                       [Digest, {key, hardcode_rsa_key(2)}],
                                       [Digest, {key, hardcode_rsa_key(3)}]];
-chain_spec(_Role, dsa) ->
+chain_spec(_Role, dsa, _) ->
     Digest = {digest, appropriate_sha(crypto:supports())},
     [[Digest, {key, hardcode_dsa_key(1)}],
      [Digest, {key, hardcode_dsa_key(2)}],
@@ -742,7 +908,7 @@ merge_spec(User, Default, [Conf | Rest], Acc) ->
 make_mix_cert(Config) ->
     Ext = x509_test:extensions([{key_usage, [digitalSignature]}]),
     Digest = {digest, appropriate_sha(crypto:supports())},
-    CurveOid = hd(tls_v1:ecc_curves(0)),
+    CurveOid = pubkey_cert_records:namedCurves(?DEFAULT_CURVE),
     Mix = proplists:get_value(mix, Config, peer_ecc),
     ClientChainType =ServerChainType = mix,
     {ClientChain, ServerChain} = mix(Mix, Digest, CurveOid, Ext),
@@ -825,7 +991,8 @@ make_rsa_cert(Config) ->
 	    Config
     end.
 appropriate_sha(CryptoSupport) ->
-    case proplists:get_bool(sha256, CryptoSupport) of
+    Hashes = proplists:get_value(hashs, CryptoSupport),
+    case lists:member(sha256, Hashes) of
 	true ->
 	    sha256;
 	false ->
@@ -863,14 +1030,14 @@ make_ecdh_rsa_cert(Config) ->
     end.
 
 start_upgrade_server(Args) ->
-    Result = spawn_link(?MODULE, run_upgrade_server, [Args]),
+    Node = proplists:get_value(node, Args),
+    Result = spawn_link(Node, ?MODULE, run_upgrade_server, [Args]),
     receive
 	{listen, up} ->
 	    Result
     end.
 
 run_upgrade_server(Opts) ->
-    Node = proplists:get_value(node, Opts),
     Port = proplists:get_value(port, Opts),
     TimeOut = proplists:get_value(timeout, Opts, infinity),
     TcpOptions = proplists:get_value(tcp_options, Opts),
@@ -878,43 +1045,41 @@ run_upgrade_server(Opts) ->
     Pid = proplists:get_value(from, Opts),
 
     ct:log("~p:~p~ngen_tcp:listen(~p, ~p)~n", [?MODULE,?LINE, Port, TcpOptions]),
-    {ok, ListenSocket} = rpc:call(Node, gen_tcp, listen, [Port, TcpOptions]),
+    {ok, ListenSocket} = gen_tcp:listen(Port, TcpOptions),
     Pid ! {listen, up},
     send_selected_port(Pid, Port, ListenSocket),
     ct:log("~p:~p~ngen_tcp:accept(~p)~n", [?MODULE,?LINE, ListenSocket]),
-    {ok, AcceptSocket} = rpc:call(Node, gen_tcp, accept, [ListenSocket]),
+    {ok, AcceptSocket} = gen_tcp:accept(ListenSocket),
 
     try
 	{ok, SslAcceptSocket} = case TimeOut of
 				    infinity ->
-					ct:log("~p:~p~nssl:ssl_accept(~p, ~p)~n",
+					ct:log("~p:~p~nssl:handshake(~p, ~p)~n",
 							   [?MODULE,?LINE, AcceptSocket, SslOptions]),
-					rpc:call(Node, ssl, ssl_accept,
-						 [AcceptSocket, SslOptions]);
+					ssl:handshake(AcceptSocket, SslOptions);
 				    _ ->
-					ct:log("~p:~p~nssl:ssl_accept(~p, ~p, ~p)~n",
+					ct:log("~p:~p~nssl:handshake(~p, ~p, ~p)~n",
 							   [?MODULE,?LINE, AcceptSocket, SslOptions, TimeOut]),
-					rpc:call(Node, ssl, ssl_accept,
-						 [AcceptSocket, SslOptions, TimeOut])
+					ssl:handshake(AcceptSocket, SslOptions, TimeOut)
 				end,
 	{Module, Function, Args} = proplists:get_value(mfa, Opts),
-	Msg = rpc:call(Node, Module, Function, [SslAcceptSocket | Args]),
+	Msg = apply(Module, Function, [SslAcceptSocket | Args]),
 	ct:log("~p:~p~nUpgrade Server Msg: ~p ~n", [?MODULE,?LINE, Msg]),
 	Pid ! {self(), Msg},
 	receive
 	    close ->
 		ct:log("~p:~p~nUpgrade Server closing~n", [?MODULE,?LINE]),
-		rpc:call(Node, ssl, close, [SslAcceptSocket])
+		ssl:close(SslAcceptSocket)
 	end
     catch error:{badmatch, Error} ->
 	    Pid ! {self(), Error}
     end.
 
 start_upgrade_client(Args) ->
-    spawn_link(?MODULE, run_upgrade_client, [Args]).
+    Node = proplists:get_value(node, Args),
+    spawn_link(Node, ?MODULE, run_upgrade_client, [Args]).
 
 run_upgrade_client(Opts) ->
-    Node = proplists:get_value(node, Opts),
     Host = proplists:get_value(host, Opts),
     Port = proplists:get_value(port, Opts),
     Pid = proplists:get_value(from, Opts),
@@ -923,34 +1088,34 @@ run_upgrade_client(Opts) ->
     
     ct:log("~p:~p~ngen_tcp:connect(~p, ~p, ~p)~n",
 		       [?MODULE,?LINE, Host, Port, TcpOptions]),
-    {ok, Socket} = rpc:call(Node, gen_tcp, connect, [Host, Port, TcpOptions]),
+    {ok, Socket} = gen_tcp:connect(Host, Port, TcpOptions),
 
     send_selected_port(Pid, Port, Socket),
 
     ct:log("~p:~p~nssl:connect(~p, ~p)~n", [?MODULE,?LINE, Socket, SslOptions]),
-    {ok, SslSocket} = rpc:call(Node, ssl, connect, [Socket, SslOptions]),
+    {ok, SslSocket} = ssl:connect(Socket, SslOptions),
 
     {Module, Function, Args} = proplists:get_value(mfa, Opts),
     ct:log("~p:~p~napply(~p, ~p, ~p)~n",
 		       [?MODULE,?LINE, Module, Function, [SslSocket | Args]]),
-    Msg = rpc:call(Node, Module, Function, [SslSocket | Args]),
+    Msg = apply(Module, Function, [SslSocket | Args]),
     ct:log("~p:~p~nUpgrade Client Msg: ~p ~n", [?MODULE,?LINE, Msg]),
     Pid ! {self(), Msg},
     receive 
 	close ->
 	    ct:log("~p:~p~nUpgrade Client closing~n", [?MODULE,?LINE]),
-	    rpc:call(Node, ssl, close, [SslSocket])
+	    ssl:close(SslSocket)
     end.
 
 start_upgrade_server_error(Args) ->
-    Result = spawn_link(?MODULE, run_upgrade_server_error, [Args]),
+    Node = proplists:get_value(node, Args),
+    Result = spawn_link(Node,?MODULE, run_upgrade_server_error, [Args]),
     receive
 	{listen, up} ->
 	    Result
     end.
 
 run_upgrade_server_error(Opts) ->
-    Node = proplists:get_value(node, Opts),
     Port = proplists:get_value(port, Opts),
     TimeOut = proplists:get_value(timeout, Opts, infinity),
     TcpOptions = proplists:get_value(tcp_options, Opts),
@@ -958,22 +1123,20 @@ run_upgrade_server_error(Opts) ->
     Pid = proplists:get_value(from, Opts),
 
     ct:log("~p:~p~ngen_tcp:listen(~p, ~p)~n", [?MODULE,?LINE, Port, TcpOptions]),
-    {ok, ListenSocket} = rpc:call(Node, gen_tcp, listen, [Port, TcpOptions]),
+    {ok, ListenSocket} = gen_tcp:listen(Port, TcpOptions),
     Pid ! {listen, up},
     send_selected_port(Pid, Port, ListenSocket),
     ct:log("~p:~p~ngen_tcp:accept(~p)~n", [?MODULE,?LINE, ListenSocket]),
-    {ok, AcceptSocket} = rpc:call(Node, gen_tcp, accept, [ListenSocket]),
+    {ok, AcceptSocket} = gen_tcp:accept(ListenSocket),
     Error = case TimeOut of
 		infinity ->
-		    ct:log("~p:~p~nssl:ssl_accept(~p, ~p)~n",
+		    ct:log("~p:~p~nssl:handshake(~p, ~p)~n",
 				       [?MODULE,?LINE, AcceptSocket, SslOptions]),
-		    rpc:call(Node, ssl, ssl_accept,
-			     [AcceptSocket, SslOptions]);
+		    ssl:handshake(AcceptSocket, SslOptions);
 		_ ->
-		    ct:log("~p:~p~nssl:ssl_accept(~p, ~p, ~p)~n",
+		    ct:log("~p:~p~nssl:ssl_handshake(~p, ~p, ~p)~n",
 				       [?MODULE,?LINE, AcceptSocket, SslOptions, TimeOut]),
-		    rpc:call(Node, ssl, ssl_accept,
-			     [AcceptSocket, SslOptions, TimeOut])
+		    ssl:handshake(AcceptSocket, SslOptions, TimeOut)
 	    end,
     Pid ! {self(), Error}.
 
@@ -985,32 +1148,31 @@ start_server_error(Args) ->
     end.
 
 run_server_error(Opts) ->
-    Node = proplists:get_value(node, Opts),
     Port = proplists:get_value(port, Opts),
     Options = proplists:get_value(options, Opts),
     Pid = proplists:get_value(from, Opts),
     Transport =  proplists:get_value(transport, Opts, ssl),
     ct:log("~p:~p~nssl:listen(~p, ~p)~n", [?MODULE,?LINE, Port, Options]),
-    case rpc:call(Node, Transport, listen, [Port, Options]) of
+    case Transport:listen(Port, Options) of
 	{ok, #sslsocket{} = ListenSocket} ->
 	    %% To make sure error_client will
 	    %% get {error, closed} and not {error, connection_refused}
 	    Pid ! {listen, up},
 	    send_selected_port(Pid, Port, ListenSocket),
 	    ct:log("~p:~p~nssl:transport_accept(~p)~n", [?MODULE,?LINE, ListenSocket]),
-	    case rpc:call(Node, Transport, transport_accept, [ListenSocket]) of
+	    case Transport:transport_accept(ListenSocket) of
 		{error, _} = Error ->
 		    Pid ! {self(), Error};
 		{ok, AcceptSocket} ->
 		    ct:log("~p:~p~nssl:ssl_accept(~p)~n", [?MODULE,?LINE, AcceptSocket]),
-		    Error = rpc:call(Node, ssl, ssl_accept, [AcceptSocket]),
+		    Error = ssl:handshake(AcceptSocket),
 		    Pid ! {self(), Error}
 	    end;
 	{ok, ListenSocket} ->
 	    Pid ! {listen, up},
 	    send_selected_port(Pid, Port, ListenSocket),
 	    ct:log("~p:~p~n~p:accept(~p)~n", [?MODULE,?LINE, Transport, ListenSocket]),
-	     case rpc:call(Node, Transport, accept, [ListenSocket]) of
+	     case Transport:accept(ListenSocket) of
 		{error, _} = Error ->
 		     Pid ! {self(), Error}
 	     end;
@@ -1022,18 +1184,26 @@ run_server_error(Opts) ->
     end.
 
 start_client_error(Args) ->
-    spawn_link(?MODULE, run_client_error, [Args]).
+    Node = proplists:get_value(node, Args),
+    spawn_link(Node, ?MODULE, run_client_error, [Args]).
 
 run_client_error(Opts) ->
-    Node = proplists:get_value(node, Opts),
     Host = proplists:get_value(host, Opts),
     Port = proplists:get_value(port, Opts),
     Pid = proplists:get_value(from, Opts),
     Transport = proplists:get_value(transport, Opts, ssl),
     Options = proplists:get_value(options, Opts),
     ct:log("~p:~p~nssl:connect(~p, ~p, ~p)~n", [?MODULE,?LINE, Host, Port, Options]),
-    Error = rpc:call(Node, Transport, connect, [Host, Port, Options]),
-    Pid ! {self(), Error}.
+    Error = Transport:connect(Host, Port, Options),
+    case Error of
+        {error, _} ->
+            Pid ! {self(), Error};
+        {ok, _Socket} ->
+            receive
+                {ssl_error, _, {tls_alert, _}} = SslError ->
+                                Pid ! {self(), SslError}
+            end
+    end.
 
 accepters(N) ->
     accepters([], N).
@@ -1050,11 +1220,57 @@ accepters(Acc, N) ->
 basic_test(COpts, SOpts, Config) ->
     SType = proplists:get_value(server_type, Config),
     CType = proplists:get_value(client_type, Config),
-    {Server, Port} = start_server(SType, SOpts, Config),
+    {Server, Port} = start_server(SType, COpts, SOpts, Config),
     Client = start_client(CType, Port, COpts, Config),
     gen_check_result(Server, SType, Client, CType),
     stop(Server, Client).    
 
+basic_alert(ClientOpts, ServerOpts, Config, Alert) ->
+    SType = proplists:get_value(server_type, Config),
+    CType = proplists:get_value(client_type, Config),
+    run_basic_alert(SType, CType, ClientOpts, ServerOpts, Config, Alert).
+
+run_basic_alert(erlang, erlang, ClientOpts, ServerOpts, Config, Alert) ->
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    
+    Server = start_server_error([{node, ServerNode}, {port, 0},
+                                 {from, self()},
+                                 {mfa, {ssl_test_lib, no_result, []}},
+                                 {options, ServerOpts}]),
+    
+    Port  = inet_port(Server),
+    
+    Client = start_client_error([{node, ClientNode}, {port, Port},
+					      {host, Hostname},
+					      {from, self()},
+                                              {mfa, {ssl_test_lib, no_result, []}},
+					      {options, ClientOpts}]),
+
+    check_server_alert(Server, Client, Alert);
+run_basic_alert(openssl = SType, erlang, ClientOpts, ServerOpts, Config, Alert) ->
+    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
+    {_Server, Port} = start_server(SType, ClientOpts, ServerOpts, Config),
+    ssl_test_lib:wait_for_openssl_server(Port, proplists:get_value(protocol, Config)),
+    Client = start_client_error([{node, ClientNode}, {port, Port},
+                                 {host, Hostname},
+                                 {from, self()},
+                                 {mfa, {ssl_test_lib, no_result, []}},
+					      {options, ClientOpts}]),
+    
+    check_client_alert(Client, Alert);
+run_basic_alert(erlang, openssl = CType, ClientOpts, ServerOpts, Config, Alert) ->
+    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = start_server_error([{node, ServerNode}, {port, 0},
+                                 {host, Hostname},
+                                 {from, self()},
+                                 {mfa, {ssl_test_lib, no_result, []}},
+                                 {options, ServerOpts}]),
+    Port  = inet_port(Server),
+    start_client(CType, Port, ClientOpts, Config),
+
+    check_server_alert(Server, Alert).
+    
+
 ecc_test(Expect, COpts, SOpts, CECCOpts, SECCOpts, Config) ->
     {Server, Port} = start_server_ecc(erlang, SOpts, Expect, SECCOpts, Config),
     Client = start_client_ecc(erlang, Port, COpts, Expect, CECCOpts, Config),
@@ -1064,20 +1280,55 @@ ecc_test(Expect, COpts, SOpts, CECCOpts, SECCOpts, Config) ->
 ecc_test_error(COpts, SOpts, CECCOpts, SECCOpts, Config) ->
     {Server, Port} = start_server_ecc_error(erlang, SOpts, SECCOpts, Config),
     Client = start_client_ecc_error(erlang, Port, COpts, CECCOpts, Config),
-    Error = {error, {tls_alert, "insufficient security"}},
-    check_result(Server, Error, Client, Error).
+    check_server_alert(Server, Client, insufficient_security).
 
-start_client(openssl, Port, ClientOpts, Config) ->
+start_basic_client(openssl, Version, Port, ClientOpts) ->
     Cert = proplists:get_value(certfile, ClientOpts),
     Key = proplists:get_value(keyfile, ClientOpts),
     CA = proplists:get_value(cacertfile, ClientOpts),
-    Version = ssl_test_lib:protocol_version(Config),
+    Groups0 = proplists:get_value(groups, ClientOpts),
     Exe = "openssl",
-    Args = ["s_client", "-verify", "2", "-port", integer_to_list(Port),
+    Args0 = ["s_client", "-verify", "2", "-port", integer_to_list(Port),
 	    ssl_test_lib:version_flag(Version),
-	    "-cert", Cert, "-CAfile", CA,
-	    "-key", Key, "-host","localhost", "-msg", "-debug"],
+	    "-CAfile", CA, "-host", "localhost", "-msg", "-debug"],
+    Args1 =
+       case Groups0 of
+           undefined ->
+               Args0;
+           G ->
+               Args0 ++ ["-groups", G]
+       end,
+    Args =
+       case {Cert, Key} of
+           {C, K} when C =:= undefined orelse
+                       K =:= undefined ->
+               Args1;
+           {C, K} ->
+               Args1 ++ ["-cert", C, "-key", K]
+       end,
+
+    OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args),
+    true = port_command(OpenSslPort, "Hello world"),
+    OpenSslPort.
 
+start_client(openssl, Port, ClientOpts, Config) ->
+    Version = ssl_test_lib:protocol_version(Config),
+    Exe = "openssl",
+    Ciphers = proplists:get_value(ciphers, ClientOpts, ssl:cipher_suites(default,Version)),
+    Groups0 = proplists:get_value(groups, ClientOpts),
+    CertArgs = openssl_cert_options(ClientOpts, client),
+    Exe = "openssl",
+    Args0 =  case Groups0 of
+                undefined ->
+                    ["s_client", "-verify", "2", "-port", integer_to_list(Port), cipher_flag(Version),
+                     ciphers(Ciphers, Version),
+                     ssl_test_lib:version_flag(Version)] ++ CertArgs ++ ["-msg", "-debug"];
+                Group ->
+                    ["s_client", "-verify", "2", "-port", integer_to_list(Port), cipher_flag(Version),
+                     ciphers(Ciphers, Version), "-groups", Group, 
+                     ssl_test_lib:version_flag(Version)] ++ CertArgs ++ ["-msg", "-debug"]
+            end,
+    Args = maybe_force_ipv4(Args0),
     OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args), 
     true = port_command(OpenSslPort, "Hello world"),
     OpenSslPort;
@@ -1089,8 +1340,20 @@ start_client(erlang, Port, ClientOpts, Config) ->
 			       {host, Hostname},
 			       {from, self()},
 			       {mfa, {ssl_test_lib, check_key_exchange_send_active, [KeyEx]}},
-			       {options, [{verify, verify_peer} | ClientOpts]}]).
-
+			       {options, ClientOpts}]).
+
+%% Workaround for running tests on machines where openssl
+%% s_client would use an IPv6 address with localhost. As
+%% this test suite and the ssl application is not prepared
+%% for that we have to force s_client to use IPv4 if
+%% OpenSSL supports IPv6.
+maybe_force_ipv4(Args0) ->
+    case is_ipv6_supported() of
+        true ->
+            Args0 ++ ["-4"];
+        false ->
+            Args0
+    end.
 
 start_client_ecc(erlang, Port, ClientOpts, Expect, ECCOpts, Config) ->
     {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
@@ -1112,29 +1375,58 @@ start_client_ecc_error(erlang, Port, ClientOpts, ECCOpts, Config) ->
                                       [{verify, verify_peer} | ClientOpts]}]).
 
 
-start_server(openssl, ServerOpts, Config) ->
-    Cert = proplists:get_value(certfile, ServerOpts),
-    Key = proplists:get_value(keyfile, ServerOpts),
-    CA = proplists:get_value(cacertfile, ServerOpts),
+start_server(openssl, ClientOpts, ServerOpts, Config) ->
     Port = inet_port(node()),
     Version = protocol_version(Config),
     Exe = "openssl",
-    Args = ["s_server", "-accept", integer_to_list(Port), ssl_test_lib:version_flag(Version),
-	    "-verify", "2", "-cert", Cert, "-CAfile", CA,
-	    "-key", Key, "-msg", "-debug"],
+    CertArgs = openssl_cert_options(ServerOpts, server),
+    Ciphers = proplists:get_value(ciphers, ClientOpts, ssl:cipher_suites(default,Version)),
+    Groups0 = proplists:get_value(groups, ServerOpts),
+    Args =  case Groups0 of
+                undefined ->
+                    ["s_server", "-accept", integer_to_list(Port), cipher_flag(Version),
+                     ciphers(Ciphers, Version),
+                     ssl_test_lib:version_flag(Version)] ++ CertArgs ++ ["-msg", "-debug"];
+                Group ->
+                       ["s_server", "-accept", integer_to_list(Port), cipher_flag(Version),
+                        ciphers(Ciphers, Version), "-groups", Group, 
+                        ssl_test_lib:version_flag(Version)] ++ CertArgs ++ ["-msg", "-debug"]
+            end,
     OpenSslPort = portable_open_port(Exe, Args),
     true = port_command(OpenSslPort, "Hello world"),
     {OpenSslPort, Port};
-start_server(erlang, ServerOpts, Config) ->
+start_server(erlang, _, ServerOpts, Config) ->
     {_, ServerNode, _} = ssl_test_lib:run_where(Config),
     KeyEx = proplists:get_value(check_keyex, Config, false),
+    Versions = protocol_versions(Config),
     Server = start_server([{node, ServerNode}, {port, 0},
                            {from, self()},
                            {mfa, {ssl_test_lib,
                                   check_key_exchange_send_active,
                                   [KeyEx]}},
-                           {options, [{verify, verify_peer} | ServerOpts]}]),
+                           {options, [{verify, verify_peer}, {versions, Versions} | ServerOpts]}]),
     {Server, inet_port(Server)}.
+ 
+cipher_flag('tlsv1.3') ->
+     "-ciphersuites";
+cipher_flag(_) ->
+    "-cipher".
+
+ciphers(Ciphers, Version) ->
+    Strs = [ssl_cipher_format:suite_map_to_openssl_str(Cipher) || Cipher <- Ciphers],
+    ciphers_concat(Version, Strs, "").
+
+ciphers_concat(_, [], [":" | Acc]) ->
+    lists:append(lists:reverse(Acc));
+ciphers_concat('tlsv1.3' = Version, [Head| Tail], Acc) ->
+    case Head of
+        "TLS" ++ _ ->
+            ciphers_concat(Version, Tail, [":", Head | Acc]);
+        _ ->
+            ciphers_concat(Version, Tail, Acc)
+    end;
+ciphers_concat(Version,  [Head| Tail], Acc) ->
+    ciphers_concat(Version, Tail, [":", Head | Acc]).
 
 start_server_with_raw_key(erlang, ServerOpts, Config) ->
     {_, ServerNode, _} = ssl_test_lib:run_where(Config),
@@ -1188,6 +1480,37 @@ stop(Client, Server)  ->
     close(Server),
     close(Client).
 
+
+openssl_cert_options(Opts, Role) ->
+    Cert = proplists:get_value(certfile, Opts, undefined),
+    Key = proplists:get_value(keyfile, Opts, undefined),
+    CA = proplists:get_value(cacertfile, Opts, undefined),
+    case CA of
+        undefined ->
+            case cert_option("-cert", Cert) ++ cert_option("-key", Key) of
+                [] when Role == server ->
+                    ["-nocert"];
+                Other ->
+                    Other
+            end;
+        _ ->
+            cert_option("-cert", Cert) ++  cert_option("-CAfile", CA) ++
+                cert_option("-key", Key) ++ openssl_verify(Opts) ++ ["2"]
+    end.
+
+openssl_verify(Opts) ->
+      case proplists:get_value(fail_if_no_peer_cert, Opts, undefined) of
+          true ->
+              ["-Verify"];
+          _ ->
+              ["-verify"]
+      end.
+    
+cert_option(_, undefined) ->
+    [];
+cert_option(Opt, Value) ->
+    [Opt, Value].
+
 supported_eccs(Opts) ->
     ToCheck = proplists:get_value(eccs, Opts, []),
     Supported = ssl:eccs(),
@@ -1284,13 +1607,13 @@ common_ciphers(crypto) ->
 common_ciphers(openssl) ->
     OpenSslSuites =
         string:tokens(string:strip(os:cmd("openssl ciphers"), right, $\n), ":"),
-    [ssl_cipher_format:suite_definition(S)
+    [ssl_cipher_format:suite_bin_to_map(S)
      || S <- ssl_cipher:suites(tls_record:highest_protocol_version([])),
-        lists:member(ssl_cipher_format:openssl_suite_name(S), OpenSslSuites)
+        lists:member(ssl_cipher_format:suite_map_to_openssl_str(ssl_cipher_format:suite_bin_to_map(S)), OpenSslSuites)
     ].
 
 available_suites(Version) ->
-    [ssl_cipher_format:suite_definition(Suite) || 
+    [ssl_cipher_format:suite_bin_to_map(Suite) || 
 	Suite  <-  ssl_cipher:filter_suites(ssl_cipher:suites(Version))].
 
 
@@ -1363,7 +1686,7 @@ string_regex_filter(_Str, _Search) ->
     false.
 
 ecdh_dh_anonymous_suites(Version) ->
-    ssl:filter_cipher_suites([ssl_cipher_format:suite_definition(S) || S <- ssl_cipher:anonymous_suites(Version)],
+    ssl:filter_cipher_suites([ssl_cipher_format:suite_bin_to_map(S) || S <- ssl_cipher:anonymous_suites(Version)],
                              [{key_exchange, 
                                fun(dh_anon) -> 
                                        true;
@@ -1373,7 +1696,7 @@ ecdh_dh_anonymous_suites(Version) ->
                                        false 
                                end}]).
 psk_suites({3,_} = Version) ->
-    ssl:filter_cipher_suites([ssl_cipher_format:suite_definition(S) || S <- ssl_cipher:psk_suites(Version)], []);
+    ssl:filter_cipher_suites([ssl_cipher_format:suite_bin_to_map(S) || S <- ssl_cipher:psk_suites(Version)], []);
 psk_suites(Version) ->
     ssl:filter_cipher_suites(psk_suites(dtls_v1:corresponding_tls_version(Version)), 
                              [{cipher, 
@@ -1384,7 +1707,7 @@ psk_suites(Version) ->
                                end}]).
 
 psk_anon_suites({3,_} = Version) ->
-    ssl:filter_cipher_suites([ssl_cipher_format:suite_definition(S) || S <- ssl_cipher:psk_suites_anon(Version)], 
+    ssl:filter_cipher_suites([ssl_cipher_format:suite_bin_to_map(S) || S <- ssl_cipher:psk_suites_anon(Version)], 
                              [{key_exchange, 
                                fun(psk) -> 
                                        true;
@@ -1407,7 +1730,7 @@ psk_anon_suites(Version) ->
 
 
 srp_suites() ->
-    ssl:filter_cipher_suites([ssl_cipher_format:suite_definition(S) || S <- ssl_cipher:srp_suites()],
+    ssl:filter_cipher_suites([ssl_cipher_format:suite_bin_to_map(S) || S <- ssl_cipher:srp_suites()],
                              [{key_exchange, 
                                fun(srp_rsa) -> 
                                        true;
@@ -1415,10 +1738,10 @@ srp_suites() ->
                                        false 
                                end}]).
 srp_anon_suites() ->
-    ssl:filter_cipher_suites([ssl_cipher_format:suite_definition(S) || S <-  ssl_cipher:srp_suites_anon()],
+    ssl:filter_cipher_suites([ssl_cipher_format:suite_bin_to_map(S) || S <-  ssl_cipher:srp_suites_anon()],
                              []).
 srp_dss_suites() ->
-    ssl:filter_cipher_suites([ssl_cipher_format:suite_definition(S) || S <- ssl_cipher:srp_suites()], 
+    ssl:filter_cipher_suites([ssl_cipher_format:suite_bin_to_map(S) || S <- ssl_cipher:srp_suites()], 
                              [{key_exchange, 
                                fun(srp_dss) -> 
                                        true;
@@ -1426,14 +1749,14 @@ srp_dss_suites() ->
                                        false 
                                end}]).
 chacha_suites(Version) ->
-    [ssl_cipher_format:suite_definition(S) || S <- ssl_cipher:filter_suites(ssl_cipher:chacha_suites(Version))].
+    [ssl_cipher_format:suite_bin_to_map(S) || S <- ssl_cipher:filter_suites(ssl_cipher:chacha_suites(Version))].
 
 
 rc4_suites(Version) ->
-     ssl:filter_cipher_suites([ssl_cipher_format:suite_definition(S) || S <-ssl_cipher:rc4_suites(Version)], []).
+     ssl:filter_cipher_suites([ssl_cipher_format:suite_bin_to_map(S) || S <-ssl_cipher:rc4_suites(Version)], []).
 
 des_suites(Version) ->
-     ssl:filter_cipher_suites([ssl_cipher_format:suite_definition(S) || S <-ssl_cipher:des_suites(Version)], []).
+     ssl:filter_cipher_suites([ssl_cipher_format:suite_bin_to_map(S) || S <-ssl_cipher:des_suites(Version)], []).
 
 tuple_to_map({Kex, Cipher, Mac}) ->
     #{key_exchange => Kex,
@@ -1460,20 +1783,14 @@ cipher_result(Socket, Result) ->
     ct:log("~p:~p~nSuccessfull connect: ~p~n", [?MODULE,?LINE, Result]),
     %% Importante to send two packets here
     %% to properly test "cipher state" handling
-    ssl:send(Socket, "Hello\n"),
-    receive 
-	{ssl, Socket, "H"} ->
-	    ssl:send(Socket, " world\n"),
-	    receive_rizzo_duong_beast();
-	{ssl, Socket, "Hello\n"} ->
-	    ssl:send(Socket, " world\n"),
-	    receive
-		{ssl, Socket, " world\n"} ->
-		    ok
-	    end;       
-	Other ->
-	    {unexpected, Other}
-    end.
+    Hello = "Hello\n",
+    World = " world\n",
+    ssl:send(Socket, Hello),
+    ct:sleep(500),
+    ssl:send(Socket, World),
+    Expected = Hello ++ World,
+    Expected = active_recv(Socket, length(Expected)),
+    ok.
 
 session_info_result(Socket) ->
     {ok, Info} = ssl:connection_information(Socket,  [session_id, cipher_suite]),
@@ -1516,6 +1833,8 @@ is_tls_version('dtlsv1.2') ->
     true;
 is_tls_version('dtlsv1') ->
     true;
+is_tls_version('tlsv1.3') ->
+    true;
 is_tls_version('tlsv1.2') ->
     true;
 is_tls_version('tlsv1.1') ->
@@ -1546,7 +1865,12 @@ init_tls_version(Version, Config) ->
 
 clean_tls_version(Config) ->
     proplists:delete(protocol_opts, proplists:delete(protocol, Config)).
-    
+
+sufficient_crypto_support(Version)
+  when Version == 'tlsv1.3' ->
+    CryptoSupport = crypto:supports(),
+    lists:member(rsa_pkcs1_pss_padding, proplists:get_value(rsa_opts, CryptoSupport)) andalso
+    lists:member(x448, proplists:get_value(curves, CryptoSupport));
 sufficient_crypto_support(Version)
   when Version == 'tlsv1.2'; Version == 'dtlsv1.2' ->
     CryptoSupport = crypto:supports(),
@@ -1592,34 +1916,81 @@ v_1_2_check(ecdh_rsa, ecdh_ecdsa) ->
 v_1_2_check(_, _) ->
     false.
 
-send_recv_result_active(Socket) ->
-    ssl:send(Socket, "Hello world"),
-    receive
-	{ssl, Socket, "H"} ->
-	    receive
-		{ssl, Socket, "ello world"} ->
-		    ok
-	    end;
-	{ssl, Socket, "Hello world"} ->
-	    ok
-    end.
-
 send_recv_result(Socket) ->
-    ssl:send(Socket, "Hello world"),
-    {ok,"Hello world"} = ssl:recv(Socket, 11),
+    Data =  "Hello world",
+    ssl:send(Socket, Data),
+    {ok, Data} = ssl:recv(Socket, length(Data)),
+    ok.
+
+send_recv_result_active(Socket) ->
+    Data =  "Hello world",
+    ssl:send(Socket, Data),
+    Data = active_recv(Socket, length(Data)),
     ok.
 
 send_recv_result_active_once(Socket) ->
-    ssl:send(Socket, "Hello world"),
-    receive
-	{ssl, Socket, "H"} ->
-	    ssl:setopts(Socket, [{active, once}]),
-	    receive
-		{ssl, Socket, "ello world"} ->
-		    ok
-	    end;
-	{ssl, Socket, "Hello world"} ->
-	    ok
+    Data = "Hello world",
+    ssl:send(Socket, Data),
+    active_once_recv_list(Socket, length(Data)).
+
+active_recv(Socket, N) ->
+    active_recv(Socket, N, []).
+
+active_recv(_Socket, 0, Acc) ->
+    Acc;
+active_recv(Socket, N, Acc) ->
+    receive 
+	{ssl, Socket, Bytes} ->
+            active_recv(Socket, N-length(Bytes),  Acc ++ Bytes)
+    end.
+
+active_once_recv(_Socket, 0) ->
+    ok;
+active_once_recv(Socket, N) ->
+    receive 
+	{ssl, Socket, Bytes} ->
+            ssl:setopts(Socket, [{active, once}]),
+            active_once_recv(Socket, N-byte_size(Bytes))
+    end.
+
+active_once_recv_list(_Socket, 0) ->
+    ok;
+active_once_recv_list(Socket, N) ->
+    receive 
+	{ssl, Socket, Bytes} ->
+            ssl:setopts(Socket, [{active, once}]),
+            active_once_recv_list(Socket, N-length(Bytes))
+    end.
+recv_disregard(_Socket, 0) ->
+    ok;
+recv_disregard(Socket, N) ->
+    {ok, Bytes} = ssl:recv(Socket, 0),
+    recv_disregard(Socket, N-byte_size(Bytes)).
+
+active_disregard(_Socket, 0) ->
+    ok;
+active_disregard(Socket, N) ->
+    receive 
+	{ssl, Socket, Bytes} ->
+            active_disregard(Socket, N-byte_size(Bytes))
+    end.
+active_once_disregard(_Socket, 0) ->
+    ok;
+active_once_disregard(Socket, N) ->
+    receive 
+	{ssl, Socket, Bytes} ->
+            ssl:setopts(Socket, [{active, once}]),
+            active_once_disregard(Socket, N-byte_size(Bytes))
+    end.
+
+is_ipv6_supported() ->
+    case os:cmd("openssl version") of
+        "OpenSSL 0.9.8" ++ _ -> % Does not support IPv6
+            false;
+        "OpenSSL 1.0" ++ _ ->   % Does not support IPv6
+            false;
+        _ ->
+            true
     end.
 
 is_sane_ecc(openssl) ->
@@ -1653,6 +2024,15 @@ is_sane_ecc(crypto) ->
 is_sane_ecc(_) ->
     sufficient_crypto_support(cipher_ec).
 
+is_sane_oppenssl_client() ->
+    [{_,_, Bin}]  = crypto:info_lib(), 
+    case binary_to_list(Bin) of
+	"OpenSSL 0.9" ++ _ -> 
+	    false;
+	_ ->
+	    true
+    end.
+
 is_fips(openssl) ->
     VersionStr = os:cmd("openssl version"),
     case re:split(VersionStr, "fips") of
@@ -1761,6 +2141,14 @@ check_sane_openssl_version(Version) ->
 	    case {Version, os:cmd("openssl version")} of
                 {'sslv3', "OpenSSL 1.0.2" ++ _} ->
                     false;
+                {'dtlsv1', "OpenSSL 0" ++ _} ->
+		    false;
+		{'dtlsv1.2', "OpenSSL 0" ++ _} ->
+		    false;
+                {'dtlsv1.2', "OpenSSL 1.0.2" ++ _} ->
+		    false;
+		{'dtlsv1',  "OpenSSL 1.0.0" ++ _} ->
+		    false;
                 {'dtlsv1', _} ->
 		    not is_fips(openssl);
 		{'dtlsv1.2', _} ->
@@ -1773,17 +2161,11 @@ check_sane_openssl_version(Version) ->
 		    false;
 		{'tlsv1.1', "OpenSSL 1.0.0" ++ _} ->
 		    false;
-                {'dtlsv1.2', "OpenSSL 1.0.2" ++ _} ->
-		    false;
-		{'dtlsv1',  "OpenSSL 1.0.0" ++ _} ->
-		    false;
 		{'tlsv1.2', "OpenSSL 0" ++ _} ->
 		    false;
 		{'tlsv1.1', "OpenSSL 0" ++ _} ->
 		    false;
-                {'dtlsv1', "OpenSSL 0" ++ _} ->
-		    false;
-		{'dtlsv1.2', "OpenSSL 0" ++ _} ->
+                {'tlsv1', "OpenSSL 0" ++ _} ->
 		    false;
 		{_, _} ->
 		    true
@@ -1791,6 +2173,53 @@ check_sane_openssl_version(Version) ->
 	false ->
 	    false
     end.
+check_sane_openssl_renegotaite(Config, Version) when Version == 'tlsv1.1';
+						     Version == 'tlsv1.2' ->
+    case os:cmd("openssl version") of     
+	"OpenSSL 1.0.1c" ++ _ ->
+	    {skip, "Known renegotiation bug in OpenSSL"};
+	"OpenSSL 1.0.1b" ++ _ ->
+	    {skip, "Known renegotiation bug in OpenSSL"};
+	"OpenSSL 1.0.1a" ++ _ ->
+	    {skip, "Known renegotiation bug in OpenSSL"};
+	"OpenSSL 1.0.1 " ++ _ ->
+	    {skip, "Known renegotiation bug in OpenSSL"};
+	_ ->
+	    check_sane_openssl_renegotaite(Config)
+    end;
+check_sane_openssl_renegotaite(Config, _) ->
+    check_sane_openssl_renegotaite(Config).
+	
+check_sane_openssl_renegotaite(Config) ->
+    case os:cmd("openssl version") of  
+	"OpenSSL 1.0.0" ++ _ ->
+	    {skip, "Known renegotiation bug in OpenSSL"};
+	"OpenSSL 0.9.8" ++ _ ->
+	    {skip, "Known renegotiation bug in OpenSSL"};
+	"OpenSSL 0.9.7" ++ _ ->
+	    {skip, "Known renegotiation bug in OpenSSL"};
+	_ ->
+	    Config
+    end.
+
+workaround_openssl_s_clinent() ->
+    %% http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=683159
+    %% https://bugs.archlinux.org/task/33919
+    %% Bug seems to manifests it self if TLS version is not
+    %% explicitly specified 
+    case os:cmd("openssl version") of 
+	"OpenSSL 1.0.1c" ++ _ ->
+	    ["-no_tls1_2"];
+	"OpenSSL 1.0.1d" ++ _ ->
+	    ["-no_tls1_2"];
+	"OpenSSL 1.0.1e" ++ _ ->
+	    ["-no_tls1_2"];
+	"OpenSSL 1.0.1f" ++ _ ->
+	    ["-no_tls1_2"];
+	_  ->
+	    []
+    end.
+
 enough_openssl_crl_support("OpenSSL 0." ++ _) -> false;
 enough_openssl_crl_support(_) -> true.
 
@@ -1817,6 +2246,8 @@ version_flag('tlsv1.1') ->
     "-tls1_1";
 version_flag('tlsv1.2') ->
     "-tls1_2";
+version_flag('tlsv1.3') ->
+    "-tls1_3";
 version_flag(sslv3) ->
     "-ssl3";
 version_flag(sslv2) ->
@@ -1827,10 +2258,10 @@ version_flag('dtlsv1') ->
     "-dtls1".
 
 filter_suites([Cipher | _] = Ciphers, AtomVersion) when is_list(Cipher)->
-    filter_suites([ssl_cipher_format:openssl_suite(S) || S <- Ciphers], 
+    filter_suites([ssl_cipher_format:suite_openssl_str_to_map(S) || S <- Ciphers], 
                   AtomVersion);
 filter_suites([Cipher | _] = Ciphers, AtomVersion) when is_binary(Cipher)->
-    filter_suites([ssl_cipher_format:suite_definition(S) || S <- Ciphers], 
+    filter_suites([ssl_cipher_format:suite_bin_to_map(S) || S <- Ciphers], 
                   AtomVersion);
 filter_suites(Ciphers0, AtomVersion) ->
     Version = tls_version(AtomVersion),
@@ -1838,11 +2269,11 @@ filter_suites(Ciphers0, AtomVersion) ->
 	++ 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:srp_suites(Version) 
+        ++ ssl_cipher:srp_suites_anon(Version) 
 	++ ssl_cipher:rc4_suites(Version),
     Supported1 = ssl_cipher:filter_suites(Supported0),
-    Supported2 = [ssl_cipher_format:suite_definition(S) || S <- Supported1],
+    Supported2 = [ssl_cipher_format:suite_bin_to_map(S) || S <- Supported1],
     [Cipher || Cipher <- Ciphers0, lists:member(Cipher, Supported2)].
 
 -define(OPENSSL_QUIT, "Q\n").
@@ -1956,6 +2387,14 @@ protocol_version(Config, atom) ->
            tls_record:protocol_version(protocol_version(Config, tuple))	
    end.
 
+protocol_versions(Config) ->
+    Version = protocol_version(Config),
+    case Version of
+        'tlsv1.3' -> %% TLS-1.3 servers shall also support 1.2
+            ['tlsv1.3', 'tlsv1.2'];
+        _ ->
+            [Version]
+    end.
 protocol_options(Config, Options) ->
     Protocol = proplists:get_value(protocol, Config, tls),
     {Protocol, Opts} = lists:keyfind(Protocol, 1, Options),
@@ -1979,7 +2418,8 @@ clean_env() ->
     application:unset_env(ssl, session_cache_server_max),
     application:unset_env(ssl, ssl_pem_cache_clean),
     application:unset_env(ssl, bypass_pem_cache),
-    application:unset_env(ssl, alert_timeout).
+    application:unset_env(ssl, alert_timeout),
+    application:unset_env(ssl, internal_active_n).
 
 clean_start() ->
     ssl:stop(),
@@ -2159,3 +2599,192 @@ server_msg(Server, ServerMsg) ->
 	Unexpected ->
 	    ct:fail(Unexpected)
     end.
+
+session_id(Socket) ->
+    {ok, [{session_id, ID}]} = ssl:connection_information(Socket, [session_id]),
+    ID.
+    
+reuse_session(ClientOpts, ServerOpts, Config) ->
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    
+    Server0 =
+	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+				   {from, self()},
+				   {mfa, {ssl_test_lib, no_result, []}},
+				   {tcp_options, [{active, false}]},
+				   {options, ServerOpts}]),
+    Port0 = ssl_test_lib:inet_port(Server0),
+    
+    Client0 = ssl_test_lib:start_client([{node, ClientNode},
+                                         {port, Port0}, {host, Hostname},
+                                         {mfa, {ssl_test_lib, session_id, []}},
+                                         {from, self()},  {options, [{reuse_sessions, save} | ClientOpts]}]),
+    Server0 ! listen,
+    
+    Client1 = ssl_test_lib:start_client([{node, ClientNode},
+                                         {port, Port0}, {host, Hostname},
+                                         {mfa, {ssl_test_lib, session_id, []}},
+                                         {from, self()},  {options, ClientOpts}]),    
+
+    SID = receive
+              {Client0, Id0} ->
+                  Id0
+          end,
+       
+    receive
+        {Client1, SID} ->
+            ok
+    after ?SLEEP ->
+              ct:fail(session_not_reused)
+    end,
+  
+    Server0 ! listen,
+    
+    Client2 =
+        ssl_test_lib:start_client([{node, ClientNode},
+                                   {port, Port0}, {host, Hostname},
+                                   {mfa, {ssl_test_lib, session_id, []}},
+                                   {from, self()},  {options, [{reuse_sessions, false}
+         					  | ClientOpts]}]),   
+    receive
+         {Client2, SID} ->
+            ct:fail(session_reused_when_session_reuse_disabled_by_client);
+         {Client2, _} ->
+            ok
+    end,
+    
+    ssl_test_lib:close(Server0),
+    ssl_test_lib:close(Client0),
+    ssl_test_lib:close(Client1),
+    ssl_test_lib:close(Client2),
+    
+    Server1 =
+	ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+				   {from, self()},
+				   {mfa, {ssl_test_lib, no_result, []}},
+				   {tcp_options, [{active, false}]},
+				   {options, [{reuse_sessions, false} |ServerOpts]}]),
+    Port1 = ssl_test_lib:inet_port(Server1),
+    
+    Client3 = ssl_test_lib:start_client([{node, ClientNode},
+                                         {port, Port1}, {host, Hostname},
+                                         {mfa, {ssl_test_lib, session_id, []}},
+                                         {from, self()},  {options, [{reuse_sessions, save} | ClientOpts]}]),
+    SID1 = receive
+               {Client3, Id3} ->
+                   Id3
+           end,
+
+    Server1 ! listen,
+    
+    Client4 =
+        ssl_test_lib:start_client([{node, ClientNode},
+                                   {port, Port1}, {host, Hostname},
+                                   {mfa, {ssl_test_lib, session_id, []}},
+                                   {from, self()},  {options, ClientOpts}]),   
+   
+    receive
+        {Client4, SID1} ->
+            ct:fail(session_reused_when_session_reuse_disabled_by_server);
+        {Client4, _} ->
+            ok
+    end,
+    
+    ssl_test_lib:close(Server1),
+    ssl_test_lib:close(Client3),
+    ssl_test_lib:close(Client4).
+
+user_lookup(psk, _Identity, UserState) ->
+    {ok, UserState};
+user_lookup(srp, Username, _UserState) ->
+    Salt = ssl_cipher:random_bytes(16),
+    UserPassHash = crypto:hash(sha, [Salt, crypto:hash(sha, [Username, <<$:>>, <<"secret">>])]),
+    {ok, {srp_1024, Salt, UserPassHash}}.
+
+test_cipher(TestCase, Config) ->
+    [{name, Group} |_] = proplists:get_value(tc_group_properties, Config),
+    list_to_atom(re:replace(atom_to_list(TestCase), atom_to_list(Group) ++ "_",  "", [{return, list}])).
+
+digest() ->
+    case application:get_env(ssl, protocol_version, application:get_env(ssl, dtls_protocol_version)) of
+        Ver when Ver == 'tlsv1.2';
+                 Ver == 'dtlsv1.2' ->
+            {digest, sha256};
+        _ ->
+            {digest, sha1}
+    end.
+
+kill_openssl() ->
+    case os:type() of
+        {unix, _} ->
+            os:cmd("pkill openssl");
+        {win32, _} ->
+            os:cmd("cmd.exe /C \"taskkill /IM openssl.exe /F\"")
+    end.
+
+hostname_format(Hostname) ->
+    case lists:member($., Hostname) of
+        true ->  
+            Hostname;
+        false ->
+            "localhost"   
+    end.
+
+erlang_ssl_receive_and_assert_negotiated_protocol(Socket, Protocol, Data) ->
+    case ssl:negotiated_protocol(Socket) of
+        {ok, Protocol} ->
+            active_recv(Socket, length(Data));
+        Result ->
+            {error, {{expected, Protocol}, {got, Result}}}
+    end. 
+
+check_openssl_npn_support(Config) ->
+    HelpText = os:cmd("openssl s_client --help"),
+    case string:str(HelpText, "nextprotoneg") of
+        0 ->
+            {skip, "Openssl not compiled with nextprotoneg support"};
+        _ ->
+            Config
+    end.
+
+new_config(PrivDir, ServerOpts0) ->
+    CaCertFile = proplists:get_value(cacertfile, ServerOpts0),
+    CertFile = proplists:get_value(certfile, ServerOpts0),
+    KeyFile = proplists:get_value(keyfile, ServerOpts0),
+    NewCaCertFile = filename:join(PrivDir, "new_ca.pem"),
+    NewCertFile = filename:join(PrivDir, "new_cert.pem"),
+    NewKeyFile = filename:join(PrivDir, "new_key.pem"),
+    file:copy(CaCertFile, NewCaCertFile),
+    file:copy(CertFile, NewCertFile),
+    file:copy(KeyFile, NewKeyFile),
+    ServerOpts1 = proplists:delete(cacertfile, ServerOpts0),
+    ServerOpts2 = proplists:delete(certfile, ServerOpts1),
+    ServerOpts = proplists:delete(keyfile, ServerOpts2),
+
+    {ok, PEM} = file:read_file(NewCaCertFile),
+    ct:log("CA file content: ~p~n", [public_key:pem_decode(PEM)]),
+
+    [{cacertfile, NewCaCertFile}, {certfile, NewCertFile},
+     {keyfile, NewKeyFile} | ServerOpts].
+
+sane_openssl_alpn_npn_renegotiate() ->
+     case os:cmd("openssl version") of 
+         "LibreSSL 2.9.1" ++ _ ->
+             false;
+         "LibreSSL 2.6.4" ++ _ ->
+             false;
+         "OpenSSL 1.1.1a-freebsd" ++ _ ->
+             false;
+         _  ->
+             true
+     end.
+
+openssl_sane_dtls_alpn() ->
+    case os:cmd("openssl version") of
+        "OpenSSL 1.1.0g" ++ _ ->
+            false;
+        "OpenSSL 1.1.1a" ++ _ ->
+            false;
+        _->
+            openssl_sane_dtls()
+    end.
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl
deleted file mode 100644
index 5a38f5f9c1..0000000000
--- a/lib/ssl/test/ssl_to_openssl_SUITE.erl
+++ /dev/null
@@ -1,2045 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% 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.
-%% 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_to_openssl_SUITE).
-
-%% Note: This directive should only be used in test suites.
--compile(export_all).
-
--include_lib("common_test/include/ct.hrl").
-
--define(SLEEP, 1000).
--define(OPENSSL_RENEGOTIATE, "R\n").
--define(OPENSSL_QUIT, "Q\n").
--define(OPENSSL_GARBAGE, "P\n").
--define(EXPIRE, 10).
-
-%%--------------------------------------------------------------------
-%% Common Test interface functions -----------------------------------
-%%--------------------------------------------------------------------
-
-all() -> 
-    case ssl_test_lib:openssl_sane_dtls() of 
-        true ->
-            [{group, basic},
-             {group, 'tlsv1.2'},
-             {group, 'tlsv1.1'},
-             {group, 'tlsv1'},
-             {group, 'sslv3'},
-             {group, 'dtlsv1.2'},
-             {group, 'dtlsv1'}];
-        false ->
-            [{group, basic},
-             {group, 'tlsv1.2'},
-             {group, 'tlsv1.1'},
-             {group, 'tlsv1'},
-             {group, 'sslv3'}]
-    end.
-
-groups() ->
-     case ssl_test_lib:openssl_sane_dtls() of 
-         true ->
-             [{basic, [], basic_tests()},
-              {'tlsv1.2', [], all_versions_tests() ++ alpn_tests() ++ npn_tests() ++ sni_server_tests()},
-              {'tlsv1.1', [], all_versions_tests() ++ alpn_tests() ++ npn_tests() ++ sni_server_tests()},
-              {'tlsv1', [], all_versions_tests()++ alpn_tests() ++ npn_tests() ++ sni_server_tests()},
-              {'sslv3', [], all_versions_tests()},
-              {'dtlsv1.2', [], dtls_all_versions_tests()},
-              {'dtlsv1', [], dtls_all_versions_tests()}
-             ];
-        false ->
-             [{basic, [], basic_tests()},
-              {'tlsv1.2', [], all_versions_tests() ++ alpn_tests() ++ npn_tests() ++ sni_server_tests()},
-              {'tlsv1.1', [], all_versions_tests() ++ alpn_tests() ++ npn_tests() ++ sni_server_tests()},
-              {'tlsv1', [], all_versions_tests()++ alpn_tests() ++ npn_tests() ++ sni_server_tests()},
-              {'sslv3', [], all_versions_tests()}
-           ]
-     end.
-  
-basic_tests() ->
-    [basic_erlang_client_openssl_server,
-     basic_erlang_server_openssl_client,
-     expired_session
-    ].
-
-all_versions_tests() ->
-    [
-     erlang_client_openssl_server,
-     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,
-     erlang_server_openssl_client_nowrap_seqnum,
-     erlang_client_openssl_server_no_server_ca_cert,
-     erlang_client_openssl_server_client_cert,
-     erlang_server_openssl_client_client_cert,
-     ciphers_rsa_signed_certs,
-     ciphers_dsa_signed_certs,
-     erlang_client_bad_openssl_server,
-     expired_session,
-     ssl2_erlang_server_openssl_client
-    ].
-
-dtls_all_versions_tests() ->
-   case ssl_test_lib:openssl_sane_client_cert() of
-       true ->
-           [erlang_server_openssl_client_client_cert,
-            erlang_client_openssl_server_no_server_ca_cert,
-            erlang_client_openssl_server_client_cert
-            | dtls_all_versions_tests_2()];
-       false ->
-          dtls_all_versions_tests_2()
-   end. 
-  
-dtls_all_versions_tests_2() ->
-    [erlang_client_openssl_server,
-     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,
-     erlang_server_openssl_client_nowrap_seqnum,
-     ciphers_rsa_signed_certs,
-     ciphers_dsa_signed_certs
-     %%expired_session
-    ].
-
-alpn_tests() ->
-    [erlang_client_alpn_openssl_server_alpn,
-     erlang_server_alpn_openssl_client_alpn,
-     erlang_client_alpn_openssl_server,
-     erlang_client_openssl_server_alpn,
-     erlang_server_alpn_openssl_client,
-     erlang_server_openssl_client_alpn,
-     erlang_client_alpn_openssl_server_alpn_renegotiate,
-     erlang_server_alpn_openssl_client_alpn_renegotiate,
-     erlang_client_alpn_npn_openssl_server_alpn_npn,
-     erlang_server_alpn_npn_openssl_client_alpn_npn].
-
-npn_tests() ->
-    [erlang_client_openssl_server_npn,
-     erlang_server_openssl_client_npn,
-     erlang_server_openssl_client_npn_renegotiate,
-     erlang_client_openssl_server_npn_renegotiate,
-     erlang_server_openssl_client_npn_only_client,
-     erlang_server_openssl_client_npn_only_server,
-     erlang_client_openssl_server_npn_only_client,
-     erlang_client_openssl_server_npn_only_server].
-
-sni_server_tests() ->
-    [erlang_server_openssl_client_sni_match,
-     erlang_server_openssl_client_sni_match_fun,
-     erlang_server_openssl_client_sni_no_match,
-     erlang_server_openssl_client_sni_no_match_fun,
-     erlang_server_openssl_client_sni_no_header,
-     erlang_server_openssl_client_sni_no_header_fun].
-
-
-init_per_suite(Config0) ->
-    case os:find_executable("openssl") of
-        false ->
-            {skip, "Openssl not found"};
-        _ ->
-            ct:pal("Version: ~p", [os:cmd("openssl version")]),
-            catch crypto:stop(),
-            try crypto:start() of
-                ok ->
-                    ssl_test_lib:clean_start(),
-                    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
-    end.
-
-end_per_suite(_Config) ->
-    ssl:stop(),
-    application:stop(crypto).
-
-init_per_group(basic, Config0) ->
-    case ssl_test_lib:supports_ssl_tls_version('tlsv1.2')
-        orelse ssl_test_lib:supports_ssl_tls_version('tlsv1.1')
-        orelse ssl_test_lib:supports_ssl_tls_version('tlsv1')
-    of
-        true ->
-            ssl_test_lib:clean_tls_version(Config0);
-        false ->
-            {skip, "only sslv3 supported by OpenSSL"}
-    end;
-
-init_per_group(GroupName, Config) ->
-    case ssl_test_lib:is_tls_version(GroupName) of
-        true ->
-            case ssl_test_lib:supports_ssl_tls_version(GroupName) of
-                 true ->
-                    case ssl_test_lib:check_sane_openssl_version(GroupName) of
-                         true ->
-                            ssl_test_lib:init_tls_version(GroupName, Config);
-                         false ->
-                            {skip, openssl_does_not_support_version}
-                    end;
-                false ->
-                    {skip, openssl_does_not_support_version}
-            end; 
-         _ ->
-            ssl:start(),
-            Config
-    end.
-
-end_per_group(GroupName, Config) ->
-    case ssl_test_lib:is_tls_version(GroupName) of
-        true ->
-            ssl_test_lib:clean_tls_version(Config);
-       false ->
-            Config
-    end.
-
-init_per_testcase(expired_session, Config) ->
-    ct:timetrap(?EXPIRE * 1000 * 5),
-    ssl:stop(),
-    application:load(ssl),
-    application:set_env(ssl, session_lifetime, ?EXPIRE),
-    ssl:start(),
-     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, 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;
-       TestCase == erlang_server_openssl_client_nowrap_seqnum
-        ->
-    {ok, Version} = application:get_env(ssl, protocol_version),
-    check_sane_openssl_renegotaite(Config, Version);
-
-special_init(ssl2_erlang_server_openssl_client, Config) ->
-    case ssl_test_lib:supports_ssl_tls_version(sslv2) of
-        true ->
-            Config;
-        false ->
-            {skip, "sslv2 not supported by openssl"}
-     end;
-
-special_init(TestCase, Config)
-     when TestCase == erlang_client_alpn_openssl_server_alpn;
-          TestCase == erlang_server_alpn_openssl_client_alpn;
-          TestCase == erlang_client_alpn_openssl_server;
-          TestCase == erlang_client_openssl_server_alpn;
-          TestCase == erlang_server_alpn_openssl_client;
-          TestCase == erlang_server_openssl_client_alpn ->
-    check_openssl_alpn_support(Config);
-
-special_init(TestCase, Config)
-     when TestCase == erlang_client_alpn_openssl_server_alpn_renegotiate;
-          TestCase == erlang_server_alpn_openssl_client_alpn_renegotiate ->
-     {ok, Version} = application:get_env(ssl, protocol_version),
-     case check_sane_openssl_renegotaite(Config, Version) of
-         {skip, _} = Skip ->
-             Skip;
-         _ ->
-             check_openssl_alpn_support(Config)
-     end;
-
-special_init(TestCase, Config)
-  when TestCase == erlang_client_alpn_npn_openssl_server_alpn_npn;
-       TestCase == erlang_server_alpn_npn_openssl_client_alpn_npn ->
-    case check_openssl_alpn_support(Config) of
-        {skip, _} = Skip ->
-            Skip;
-        _ ->
-             check_openssl_npn_support(Config)
-    end;
-
-special_init(TestCase, Config)
-  when TestCase == erlang_client_openssl_server_npn;
-       TestCase == erlang_server_openssl_client_npn;
-       TestCase == erlang_server_openssl_client_npn_only_server;
-       TestCase == erlang_server_openssl_client_npn_only_client;
-       TestCase == erlang_client_openssl_server_npn_only_client;
-       TestCase == erlang_client_openssl_server_npn_only_server ->
-    check_openssl_npn_support(Config);
-
-special_init(TestCase, Config)
-  when TestCase == erlang_server_openssl_client_npn_renegotiate;
-       TestCase == erlang_client_openssl_server_npn_renegotiate ->
-    {ok, Version} = application:get_env(ssl, protocol_version),
-     case check_sane_openssl_renegotaite(Config, Version) of
-         {skip, _} = Skip ->
-             Skip;
-         _ ->
-             check_openssl_npn_support(Config)
-     end;
-
-special_init(TestCase, Config0)
-  when TestCase == erlang_server_openssl_client_sni_match;
-       TestCase == erlang_server_openssl_client_sni_no_match;
-       TestCase == erlang_server_openssl_client_sni_no_header;
-       TestCase == erlang_server_openssl_client_sni_match_fun;
-       TestCase == erlang_server_openssl_client_sni_no_match_fun;
-       TestCase == erlang_server_openssl_client_sni_no_header_fun ->
-     RsaOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config0),
-    Config = [{sni_server_opts, [{sni_hosts,
-                                  [{"a.server", [
-                                                 {certfile, proplists:get_value(certfile, RsaOpts)},
-                                                 {keyfile,  proplists:get_value(keyfile, RsaOpts)}
-                                                ]},
-                                   {"b.server", [
-                                                  {certfile, proplists:get_value(certfile, RsaOpts)},
-                                                 {keyfile, proplists:get_value(keyfile, RsaOpts)}
-                                                ]}
-                                  ]}]} | Config0], 
-    check_openssl_sni_support(Config);
-
-special_init(_, Config) ->
-     Config.
-
-end_per_testcase(reuse_session_expired, Config) ->
-    application:unset_env(ssl, session_lifetime),
-     Config;
-end_per_testcase(_, Config) ->
-    Config.
-
-%%--------------------------------------------------------------------
-%% Test Cases --------------------------------------------------------
-%%--------------------------------------------------------------------
-basic_erlang_client_openssl_server() ->
-    [{doc,"Test erlang client with openssl server"}].
-basic_erlang_client_openssl_server(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
-    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
-
-    {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),
-
-    Exe = "openssl",
-     Args = ["s_server", "-accept", integer_to_list(Port),
-             "-cert", CertFile, "-key", KeyFile],
-
-    OpensslPort = ssl_test_lib:portable_open_port(Exe, Args), 
-
-
-    ssl_test_lib:wait_for_openssl_server(Port, tls),
-
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-                                         {host, Hostname},
-                                        {from, self()},
-                                        {mfa, {?MODULE,
-                                               erlang_ssl_receive, [Data]}},
-                                         {options, 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).
-
-%%--------------------------------------------------------------------    
-basic_erlang_server_openssl_client() ->
-    [{doc,"Test erlang server with openssl client"}].
-basic_erlang_server_openssl_client(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
-
-    {_, 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,ServerOpts}]),
-
-    Port = ssl_test_lib:inet_port(Server),
-    
-    Exe = "openssl",
-    Args = case no_low_flag("-no_ssl2") of
-               [] ->
-                   ["s_client", "-connect", hostname_format(Hostname) ++
-                        ":" ++ integer_to_list(Port), no_low_flag("-no_ssl3")
-                    | workaround_openssl_s_clinent()];
-               Flag ->
-                   ["s_client", "-connect", hostname_format(Hostname) ++
-                        ":" ++ integer_to_list(Port), no_low_flag("-no_ssl3"), Flag
-                    | workaround_openssl_s_clinent()]
-           end, 
-    
-    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_client_openssl_server() ->
-    [{doc,"Test erlang client with openssl server"}].
-erlang_client_openssl_server(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
-    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
-
-    {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],
-
-    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, 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).
-
-%%--------------------------------------------------------------------
-erlang_server_openssl_client() ->
-    [{doc,"Test erlang server with openssl client"}].
-erlang_server_openssl_client(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
-    
-    {_, 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, 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)],
-    
-    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_client_openssl_server_dsa_cert() ->
-    [{doc,"Test erlang server with openssl client"}].
-erlang_client_openssl_server_dsa_cert(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ClientOpts = ssl_test_lib:ssl_options(client_dsa_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_dsa_verify_opts, Config),
-
-     {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
-
-    Data = "From openssl to erlang",
-
-    Port = ssl_test_lib:inet_port(node()),
-    CaCertFile =  proplists:get_value(cacertfile, ServerOpts),
-    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, "-CAfile", CaCertFile,
-             "-key", KeyFile, "-Verify", "2", "-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, 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_dsa_cert() ->
-    [{doc,"Test erlang server with openssl client"}].
-erlang_server_openssl_client_dsa_cert(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ClientOpts = ssl_test_lib:ssl_options(client_dsa_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_dsa_verify_opts, Config),
-
-    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-    Data = "From openssl to erlang",
-    CaCertFile =  proplists:get_value(cacertfile, ClientOpts),
-    CertFile = proplists:get_value(certfile, ClientOpts),
-    KeyFile = proplists:get_value(keyfile, ClientOpts),
-
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-                                        {from, self()},
-                                        {mfa, {?MODULE, erlang_ssl_receive, [Data]}},
-                                        {options, 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),
-            "-cert", CertFile,
-            "-CAfile", CaCertFile,
-            "-key", KeyFile, "-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_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:ecdh_dh_anonymous_suites(VersionTuple),
-
-    case openssl_has_common_ciphers(Ciphers) of
-        false ->
-            {skip, not_supported_by_openssl};
-        true ->
-            
-            {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)
-    end.
-%%--------------------------------------------------------------------
-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:ecdh_dh_anonymous_suites(VersionTuple),
-
-    case openssl_has_common_ciphers(Ciphers) of
-        false ->
-            {skip, not_supported_by_openssl};
-        true ->
-            {_, 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)
-    end.
-
-%%--------------------------------------------------------------------
-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:ecdh_dh_anonymous_suites(VersionTuple),
-
-    case openssl_has_common_ciphers(Ciphers) of
-        false ->
-            {skip, not_supported_by_openssl};
-        true ->
-            {_, 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)
-    end.
-
- %%--------------------------------------------------------------------
-erlang_server_openssl_client_reuse_session() ->
-    [{doc, "Test erlang server with openssl client that reconnects with the"
-      "same session id, to test reusing of sessions."}].
-erlang_server_openssl_client_reuse_session(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
-
-    {_, 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]}},
-                                        {reconnect_times, 5},
-                                        {options, 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),
-            "-reconnect"],
-    
-    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),
-    ok.
-
-%%--------------------------------------------------------------------
-
-erlang_client_openssl_server_renegotiate() ->
-    [{doc,"Test erlang client when openssl server issuses a renegotiate"}].
-erlang_client_openssl_server_renegotiate(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
-    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
-
-    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
-    
-    ErlData = "From erlang to openssl",
-    OpenSslData = "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, "-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,
-                                               delayed_send, [[ErlData, OpenSslData]]}},
-                                         {options, ClientOpts}]),
-
-    true = port_command(OpensslPort, ?OPENSSL_RENEGOTIATE),
-    ct:sleep(?SLEEP),
-    true = port_command(OpensslPort, OpenSslData),
-    
-    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_client_openssl_server_nowrap_seqnum() ->
-    [{doc, "Test that erlang client will renegotiate session when",
-      "max sequence number celing is about to be reached. Although"
-      "in the testcase we use the test option renegotiate_at"
-      " to lower treashold substantially."}].
-erlang_client_openssl_server_nowrap_seqnum(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
-    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
-
-    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
-
-    ErlData = "From erlang to openssl\n",
-    N = 10,
-
-    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, "-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, {ssl_test_lib,
-                                               trigger_renegotiate, [[ErlData, N+2]]}},
-                                        {options, [{reuse_sessions, false},
-                                                   {renegotiate_at, N} | ClientOpts]}]),
-
-    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).
-%%--------------------------------------------------------------------
-erlang_server_openssl_client_nowrap_seqnum() ->
-    [{doc, "Test that erlang client will renegotiate session when",
-      "max sequence number celing is about to be reached. Although"
-      "in the testcase we use the test option renegotiate_at"
-      " to lower treashold substantially."}].
-erlang_server_openssl_client_nowrap_seqnum(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
-
-    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-    Data = "From openssl to erlang",
-
-    N = 10,
-
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
-                                        {from, self()},
-                                        {mfa, {ssl_test_lib,
-                                               trigger_renegotiate, [[Data, N+2]]}},
-                                        {options, [{renegotiate_at, N}, {reuse_sessions, false} | 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),
-            "-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_client_openssl_server_no_server_ca_cert() ->
-    [{doc, "Test erlang client when openssl server sends a cert chain not"
-      "including the ca cert. Explicitly test this even if it is"
-      "implicitly tested eleswhere."}].
-erlang_client_openssl_server_no_server_ca_cert(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
-    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
-
-    {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, "-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, 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).
-
-%%--------------------------------------------------------------------
-erlang_client_openssl_server_client_cert() ->
-    [{doc,"Test erlang client with openssl server when client sends cert"}].
-erlang_client_openssl_server_client_cert(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
-    ClientOpts = ssl_test_lib:ssl_options(client_rsa_verify_opts, Config),
-
-    {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),
-    CaCertFile = proplists:get_value(cacertfile, 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, "-CAfile", CaCertFile,
-            "-key", KeyFile, "-Verify", "2"],
-
-    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, 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).
-
-%%--------------------------------------------------------------------  
-erlang_server_openssl_client_client_cert() ->
-    [{doc,"Test erlang server with openssl client when client sends cert"}].
-erlang_server_openssl_client_client_cert(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ServerOpts = ssl_test_lib:ssl_options(server_rsa_verify_opts, Config),
-    ClientOpts = ssl_test_lib:ssl_options(client_rsa_verify_opts, Config),
-
-    {_, 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,
-                                         [{verify , verify_peer}
-                                          | ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-
-    CaCertFile = proplists:get_value(cacertfile, ClientOpts),
-    CertFile = proplists:get_value(certfile, ClientOpts),
-    KeyFile = proplists:get_value(keyfile, ClientOpts),
-    Version = ssl_test_lib:protocol_version(Config),
-    Exe = "openssl",
-    Args = ["s_client", "-cert", CertFile,
-            "-CAfile", CaCertFile,
-            "-key", KeyFile,"-connect", hostname_format(Hostname) ++ ":" ++ integer_to_list(Port),
-            ssl_test_lib:version_flag(Version)],
-    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_port(OpenSslPort),
-    ssl_test_lib:close(Server),
-    process_flag(trap_exit, false).
-
-%%--------------------------------------------------------------------  
-erlang_server_erlang_client_client_cert() ->
-    [{doc,"Test erlang server with erlang client when client sends cert"}].
-erlang_server_erlang_client_client_cert(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ServerOpts = proplists:get_value(server_rsa_verify_opts, Config),  
-    ClientOpts = proplists:get_value(client_rsa_verify_opts, Config),  
-    Version = ssl_test_lib:protocol_version(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,
-                                               %% Due to 1/n-1 splitting countermeasure Rizzo/Duong-Beast
-                                               [Data]}},
-                                        {options,
-                                         [{verify , verify_peer}
-                                          | ServerOpts]}]),
-    Port = ssl_test_lib:inet_port(Server),
-
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-                                        {host, Hostname},
-                                        {from, self()},
-                                        %% Due to 1/n-1 splitting countermeasure Rizzo/Duong-Beast
-                                        {mfa, {ssl, send, [Data]}},
-                                        {options,
-                                         [{versions, [Version]} | ClientOpts]}]),
-
-    ssl_test_lib:check_result(Server, ok, Client, ok),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client),
-    process_flag(trap_exit, false).
-
-%%--------------------------------------------------------------------
-
-ciphers_rsa_signed_certs() ->
-    [{doc,"Test cipher suites that uses rsa certs"}].
-ciphers_rsa_signed_certs(Config) when is_list(Config) ->
-    Version = ssl_test_lib:protocol_version(Config),
-    Ciphers = ssl_test_lib:rsa_suites(openssl),
-    run_suites(Ciphers, Version, Config, rsa).
-%%--------------------------------------------------------------------
-
-ciphers_dsa_signed_certs() ->
-    [{doc,"Test cipher suites that uses dsa certs"}].
-ciphers_dsa_signed_certs(Config) when is_list(Config) ->
-    Version = ssl_test_lib:protocol_version(Config),
-    NVersion = ssl_test_lib:protocol_version(Config, tuple),
-    Ciphers = ssl_test_lib:dsa_suites(NVersion),
-    run_suites(Ciphers, Version, Config, dsa).
-
-%%--------------------------------------------------------------------
-erlang_client_bad_openssl_server() ->
-    [{doc,"Test what happens if openssl server sends garbage to erlang ssl client"}].
-erlang_client_bad_openssl_server(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
-    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
-
-    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
-
-    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],
-    OpensslPort = ssl_test_lib:portable_open_port(Exe, Args), 
-
-    ssl_test_lib:wait_for_openssl_server(Port, proplists:get_value(protocol, Config)),
-
-    Client0 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
-                                         {host, Hostname},
-                                         {from, self()},
-                                         {mfa, {?MODULE, server_sent_garbage, []}},
-                                         {options,
-                                          [{versions, [Version]} | ClientOpts]}]),
-
-    %% Send garbage
-    true = port_command(OpensslPort, ?OPENSSL_GARBAGE),
-
-    ct:sleep(?SLEEP),
-
-    Client0 ! server_sent_garbage,
-
-    ssl_test_lib:check_result(Client0, true),
-
-    ssl_test_lib:close(Client0),
-
-    %% Make sure openssl does not hang and leave zombie process
-    Client1 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
-                                         {host, Hostname},
-                                         {from, self()},
-                                         {mfa, {ssl_test_lib, no_result_msg, []}},
-                                         {options,
-                                          [{versions, [Version]} | ClientOpts]}]),
-
-    %% Clean close down!   Server needs to be closed first !!
-    ssl_test_lib:close_port(OpensslPort),
-    ssl_test_lib:close(Client1),
-    process_flag(trap_exit, false),
-    ok.
-
-%%--------------------------------------------------------------------
-
-expired_session() ->
-    [{doc, "Test our ssl client handling of expired sessions. Will make"
-      "better code coverage of the ssl_manager module"}].
-expired_session(Config) when is_list(Config) -> 
-    process_flag(trap_exit, true),
-    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
-    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
-    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
-
-    Port = ssl_test_lib:inet_port(node()),
-    CertFile = proplists:get_value(certfile, ServerOpts),
-    KeyFile = proplists:get_value(keyfile, ServerOpts),
-
-    Exe = "openssl",
-    Args = ["s_server", "-accept", integer_to_list(Port),
-            "-cert", CertFile,"-key", KeyFile],
-
-    OpensslPort = ssl_test_lib:portable_open_port(Exe, Args), 
-
-    ssl_test_lib:wait_for_openssl_server(Port, tls),
-
-    Client0 =
-        ssl_test_lib:start_client([{node, ClientNode},
-                                   {port, Port}, {host, Hostname},
-                                   {mfa, {ssl_test_lib, no_result, []}},
-                                   {from, self()},  {options, ClientOpts}]),
-
-    ssl_test_lib:close(Client0),
-
-    %% Make sure session is registered
-    ct:sleep(?SLEEP),
-
-    Client1 =
-        ssl_test_lib:start_client([{node, ClientNode},
-                                   {port, Port}, {host, Hostname},
-                                   {mfa, {ssl_test_lib, no_result, []}},
-                                   {from, self()},  {options, ClientOpts}]),
-
-    ssl_test_lib:close(Client1),
-    %% Make sure session is unregistered due to expiration
-    ct:sleep((?EXPIRE+1) * 1000),
-
-    Client2 =
-        ssl_test_lib:start_client([{node, ClientNode},
-                                   {port, Port}, {host, Hostname},
-                                   {mfa, {ssl_test_lib, no_result, []}},
-                                   {from, self()},  {options, ClientOpts}]),
-
-    %% Clean close down!   Server needs to be closed first !!
-    ssl_test_lib:close_port(OpensslPort),
-    ssl_test_lib:close(Client2),
-    process_flag(trap_exit, false).
-
-%%--------------------------------------------------------------------
-ssl2_erlang_server_openssl_client() ->
-    [{doc,"Test that ssl v2 clients are rejected"}].
-
-ssl2_erlang_server_openssl_client(Config) when is_list(Config) ->
-    process_flag(trap_exit, true),
-    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
-
-    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0}, 
-                                              {from, self()},
-                                              {options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-
-    Exe = "openssl",
-    Args = ["s_client", "-connect", hostname_format(Hostname) ++ ":" ++ integer_to_list(Port), 
-            "-ssl2", "-msg"],
-
-    OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args),  
-
-    ct:log("Ports ~p~n", [[erlang:port_info(P) || P <- erlang:ports()]]), 
-    ssl_test_lib:consume_port_exit(OpenSslPort),
-    ssl_test_lib:check_result(Server, {error, {tls_alert, "bad record mac"}}),
-    process_flag(trap_exit, false).
-
-%%--------------------------------------------------------------------
-
-erlang_client_alpn_openssl_server_alpn(Config) when is_list(Config) ->
-    Data = "From openssl to erlang",
-    start_erlang_client_and_openssl_server_for_alpn_negotiation(Config, Data, fun(Client, OpensslPort) ->
-        true = port_command(OpensslPort, Data),
-
-        ssl_test_lib:check_result(Client, ok)
-    end),
-    ok.
-
-%%--------------------------------------------------------------------
-
-erlang_server_alpn_openssl_client_alpn(Config) when is_list(Config) ->
-    Data = "From openssl to erlang",
-    start_erlang_server_and_openssl_client_for_alpn_negotiation(Config, Data, fun(Client, OpensslPort) ->
-        true = port_command(OpensslPort, Data),
-
-        ssl_test_lib:check_result(Client, ok)
-    end),
-    ok.
-
-%%--------------------------------------------------------------------------
-
-erlang_client_alpn_openssl_server(Config) when is_list(Config) ->
-    Data = "From openssl to erlang",
-    start_erlang_client_and_openssl_server_with_opts(Config,
-						     [{alpn_advertised_protocols, [<<"spdy/2">>]}],
-                                                     [],
-						     Data, fun(Server, OpensslPort) ->
-        true = port_command(OpensslPort, Data),
-        ssl_test_lib:check_result(Server, ok)
-    end),
-    ok.
-
-%%--------------------------------------------------------------------------
-
-erlang_client_openssl_server_alpn(Config) when is_list(Config) ->
-    Data = "From openssl to erlang",
-    start_erlang_client_and_openssl_server_with_opts(Config,
-						     [],
-                                                     ["-alpn", "spdy/2"],
-						     Data, fun(Server, OpensslPort) ->
-        true = port_command(OpensslPort, Data),
-        ssl_test_lib:check_result(Server, ok)
-    end),
-    ok.
-
-%%--------------------------------------------------------------------------
-
-erlang_server_alpn_openssl_client(Config) when is_list(Config) ->
-    Data = "From openssl to erlang",
-    start_erlang_server_and_openssl_client_with_opts(Config,
-						     [{alpn_preferred_protocols, [<<"spdy/2">>]}],
-                                                     [],
-						     Data, fun(Server, OpensslPort) ->
-        true = port_command(OpensslPort, Data),
-        ssl_test_lib:check_result(Server, ok)
-    end),
-    ok.
-
-%%--------------------------------------------------------------------------
-
-erlang_server_openssl_client_alpn(Config) when is_list(Config) ->
-    Data = "From openssl to erlang",
-    start_erlang_server_and_openssl_client_with_opts(Config,
-						     [],
-                                                     ["-alpn", "spdy/2"],
-						     Data, fun(Server, OpensslPort) ->
-        true = port_command(OpensslPort, Data),
-        ssl_test_lib:check_result(Server, ok)
-    end),
-    ok.
-
-%%--------------------------------------------------------------------
-
-erlang_client_alpn_openssl_server_alpn_renegotiate(Config) when is_list(Config) ->
-    Data = "From openssl to erlang",
-    start_erlang_client_and_openssl_server_for_alpn_negotiation(Config, Data, fun(Client, OpensslPort) ->
-        true = port_command(OpensslPort, ?OPENSSL_RENEGOTIATE),
-        ct:sleep(?SLEEP),
-        true = port_command(OpensslPort, Data),
-
-        ssl_test_lib:check_result(Client, ok)
-    end),
-    ok.
-
-%%--------------------------------------------------------------------
-
-erlang_server_alpn_openssl_client_alpn_renegotiate(Config) when is_list(Config) ->
-    Data = "From openssl to erlang",
-    start_erlang_server_and_openssl_client_for_alpn_negotiation(Config, Data, fun(Client, OpensslPort) ->
-        true = port_command(OpensslPort, ?OPENSSL_RENEGOTIATE),
-        ct:sleep(?SLEEP),
-        true = port_command(OpensslPort, Data),
-
-        ssl_test_lib:check_result(Client, ok)
-    end),
-    ok.
-
-%%--------------------------------------------------------------------
-
-erlang_client_alpn_npn_openssl_server_alpn_npn(Config) when is_list(Config) ->
-    Data = "From openssl to erlang",
-    start_erlang_client_and_openssl_server_for_alpn_npn_negotiation(Config, Data, fun(Client, OpensslPort) ->
-        true = port_command(OpensslPort, Data),
-
-        ssl_test_lib:check_result(Client, ok)
-    end),
-    ok.
-
-%%--------------------------------------------------------------------
-
-erlang_server_alpn_npn_openssl_client_alpn_npn(Config) when is_list(Config) ->
-    Data = "From openssl to erlang",
-    start_erlang_server_and_openssl_client_for_alpn_npn_negotiation(Config, Data, fun(Client, OpensslPort) ->
-        true = port_command(OpensslPort, Data),
-
-        ssl_test_lib:check_result(Client, ok)
-    end),
-    ok.
-
-%%--------------------------------------------------------------------
-erlang_client_openssl_server_npn() ->
-    [{doc,"Test erlang client with openssl server doing npn negotiation"}].
-
-erlang_client_openssl_server_npn(Config) when is_list(Config) ->
-    Data = "From openssl to erlang",
-    start_erlang_client_and_openssl_server_for_npn_negotiation(Config, Data, fun(Client, OpensslPort) ->
-        true = port_command(OpensslPort, Data),
-
-        ssl_test_lib:check_result(Client, ok)
-    end),
-    ok.
-
-%%--------------------------------------------------------------------
-erlang_client_openssl_server_npn_renegotiate() ->
-    [{doc,"Test erlang client with openssl server doing npn negotiation and renegotiate"}].
-
-erlang_client_openssl_server_npn_renegotiate(Config) when is_list(Config) ->
-    Data = "From openssl to erlang",
-    start_erlang_client_and_openssl_server_for_npn_negotiation(Config, Data, fun(Client, OpensslPort) ->
-        true = port_command(OpensslPort, ?OPENSSL_RENEGOTIATE),
-        ct:sleep(?SLEEP),
-        true = port_command(OpensslPort, Data),
-        ssl_test_lib:check_result(Client, ok)
-    end),
-    ok.
-%%--------------------------------------------------------------------------
-erlang_server_openssl_client_npn() ->
-    [{doc,"Test erlang server with openssl client and npn negotiation"}].
-
-erlang_server_openssl_client_npn(Config) when is_list(Config) ->
-
-    Data = "From openssl to erlang",
-    start_erlang_server_and_openssl_client_for_npn_negotiation(Config, Data, fun(Server, OpensslPort) ->
-        true = port_command(OpensslPort, Data),
-        ssl_test_lib:check_result(Server, ok)
-    end),
-    ok.
-
-%%--------------------------------------------------------------------------
-erlang_server_openssl_client_npn_renegotiate() ->
-    [{doc,"Test erlang server with openssl client and npn negotiation with renegotiation"}].
-
-erlang_server_openssl_client_npn_renegotiate(Config) when is_list(Config) ->
-    Data = "From openssl to erlang",
-    start_erlang_server_and_openssl_client_for_npn_negotiation(Config, Data, fun(Server, OpensslPort) ->
-        true = port_command(OpensslPort, ?OPENSSL_RENEGOTIATE),
-        ct:sleep(?SLEEP),
-        true = port_command(OpensslPort, Data),
-        ssl_test_lib:check_result(Server, ok)
-    end),
-    ok.
-%%--------------------------------------------------------------------------
-erlang_client_openssl_server_npn_only_server(Config) when is_list(Config) ->
-    Data = "From openssl to erlang",
-    start_erlang_client_and_openssl_server_with_opts(Config, [],
-						     ["-nextprotoneg", "spdy/2"], Data, fun(Server, OpensslPort) ->
-        true = port_command(OpensslPort, Data),
-        ssl_test_lib:check_result(Server, ok)
-    end),
-    ok.
-
-%%--------------------------------------------------------------------------
-
-erlang_client_openssl_server_npn_only_client(Config) when is_list(Config) ->
-    Data = "From openssl to erlang",
-    start_erlang_client_and_openssl_server_with_opts(Config,
-						     [{client_preferred_next_protocols,
-						       {client, [<<"spdy/2">>], <<"http/1.1">>}}], [],
-						     Data, fun(Server, OpensslPort) ->
-        true = port_command(OpensslPort, Data),
-        ssl_test_lib:check_result(Server, ok)
-    end),
-    ok.
-
-%%--------------------------------------------------------------------------
-erlang_server_openssl_client_npn_only_server(Config) when is_list(Config) ->
-    Data = "From openssl to erlang",
-    start_erlang_server_and_openssl_client_with_opts(Config, [{next_protocols_advertised, [<<"spdy/2">>]}], [],
-						     Data, fun(Server, OpensslPort) ->
-        true = port_command(OpensslPort, Data),
-        ssl_test_lib:check_result(Server, ok)
-    end),
-    ok.
-
-erlang_server_openssl_client_npn_only_client(Config) when is_list(Config) ->
-    Data = "From openssl to erlang",
-    start_erlang_server_and_openssl_client_with_opts(Config, [], ["-nextprotoneg", "spdy/2"],
-						     Data, fun(Server, OpensslPort) ->
-        true = port_command(OpensslPort, Data),
-        ssl_test_lib:check_result(Server, ok)
-    end),
-    ok.
-%--------------------------------------------------------------------------
-erlang_server_openssl_client_sni_no_header(Config) when is_list(Config) ->
-    erlang_server_openssl_client_sni_test(Config, undefined, undefined, "server Peer cert").
-
-erlang_server_openssl_client_sni_no_header_fun(Config) when is_list(Config) ->
-    erlang_server_openssl_client_sni_test_sni_fun(Config, undefined, undefined, "server Peer cert").
-
-erlang_server_openssl_client_sni_match(Config) when is_list(Config) ->  
-    erlang_server_openssl_client_sni_test(Config, "a.server", "a.server", "server Peer cert").
-
-erlang_server_openssl_client_sni_match_fun(Config) when is_list(Config) ->
-    erlang_server_openssl_client_sni_test_sni_fun(Config, "a.server", "a.server", "server Peer cert").
-
-erlang_server_openssl_client_sni_no_match(Config) when is_list(Config) ->
-    erlang_server_openssl_client_sni_test(Config, "c.server", undefined, "server Peer cert").
-
-erlang_server_openssl_client_sni_no_match_fun(Config) when is_list(Config) ->
-    erlang_server_openssl_client_sni_test_sni_fun(Config, "c.server", undefined, "server Peer cert").
-
-
-%%--------------------------------------------------------------------
-%% Internal functions ------------------------------------------------
-%%--------------------------------------------------------------------
-run_suites(Ciphers, Version, Config, Type) ->
-    {ClientOpts, ServerOpts} =
-	case Type of
-	    rsa ->
-		{ssl_test_lib:ssl_options(client_rsa_opts, Config),
-		 ssl_test_lib:ssl_options(server_rsa_opts, Config)};
-	    dsa ->
-		{ssl_test_lib:ssl_options(client_dsa_opts, Config),
-		 ssl_test_lib:ssl_options(server_dsa_verify_opts, Config)}
-	end,
-
-    Result =  lists:map(fun(Cipher) ->
-				cipher(Cipher, Version, Config, ClientOpts, ServerOpts) end,
-			Ciphers),
-    case lists:flatten(Result) of
-	[] ->
-	    ok;
-	Error ->
-	    ct:log("Cipher suite errors: ~p~n", [Error]),
-	    ct:fail(cipher_suite_failed_see_test_case_log)
-    end.
-
-client_read_check([], _Data) -> 
-    ok;
-client_read_check([Hd | T], Data) ->
-    case binary:match(Data, list_to_binary(Hd)) of
-        nomatch ->
-            nomatch;
-        _ ->
-            client_read_check(T, Data)
-    end.
-client_check_result(Port, DataExpected, DataReceived) ->
-    receive
-        {Port, {data, TheData}} ->
-            Data = list_to_binary(TheData),
-            NewData = <<DataReceived/binary, Data/binary>>,
-            ct:log("New Data: ~p", [NewData]),
-            case client_read_check(DataExpected, NewData) of
-                ok ->
-                    ok;
-                _ ->
-                    client_check_result(Port, DataExpected, NewData)
-            end
-    after 20000 ->
-	    ct:fail({"Time out on openSSL Client", {expected, DataExpected},
-		     {got, DataReceived}})   
-    end.
-client_check_result(Port, DataExpected) ->
-    client_check_result(Port, DataExpected, <<"">>).
-
-send_and_hostname(SSLSocket) ->
-    ssl:send(SSLSocket, "OK"),
-    case ssl:connection_information(SSLSocket, [sni_hostname]) of
-	{ok, []} ->
-	    undefined;
-	{ok, [{sni_hostname, Hostname}]} ->
-	    Hostname
-    end.
-
-erlang_server_openssl_client_sni_test(Config, SNIHostname, ExpectedSNIHostname, ExpectedCN) ->
-    ct:log("Start running handshake, Config: ~p, SNIHostname: ~p, ExpectedSNIHostname: ~p, ExpectedCN: ~p", [Config, SNIHostname, ExpectedSNIHostname, ExpectedCN]),
-    ServerOptions = proplists:get_value(sni_server_opts, Config) ++ proplists:get_value(server_rsa_opts, Config),
-    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-                                        {from, self()}, {mfa, {?MODULE, send_and_hostname, []}},
-                                        {options, ServerOptions}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Exe = "openssl",
-    ClientArgs = case SNIHostname of
-		     undefined ->
-			 openssl_client_args(ssl_test_lib:supports_ssl_tls_version(sslv2), Hostname,Port);
-		     _ ->
-			 openssl_client_args(ssl_test_lib:supports_ssl_tls_version(sslv2), Hostname, Port, SNIHostname)
-		 end,       
-    ClientPort = ssl_test_lib:portable_open_port(Exe, ClientArgs),  
-  
-    ssl_test_lib:check_result(Server, ExpectedSNIHostname),
-    ssl_test_lib:close_port(ClientPort),
-    ssl_test_lib:close(Server),
-    ok.
-
-
-erlang_server_openssl_client_sni_test_sni_fun(Config, SNIHostname, ExpectedSNIHostname, ExpectedCN) ->
-    ct:log("Start running handshake for sni_fun, Config: ~p, SNIHostname: ~p, ExpectedSNIHostname: ~p, ExpectedCN: ~p", [Config, SNIHostname, ExpectedSNIHostname, ExpectedCN]),
-    [{sni_hosts, ServerSNIConf}] = proplists:get_value(sni_server_opts, Config),
-    SNIFun = fun(Domain) -> proplists:get_value(Domain, ServerSNIConf, undefined) end,
-    ServerOptions = proplists:get_value(server_rsa_opts, Config) ++ [{sni_fun, SNIFun}],
-    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-                                        {from, self()}, {mfa, {?MODULE, send_and_hostname, []}},
-                                        {options, ServerOptions}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Exe = "openssl",
-    ClientArgs = case SNIHostname of
-		     undefined ->
-			 openssl_client_args(ssl_test_lib:supports_ssl_tls_version(sslv2), Hostname,Port);
-		     _ ->
-			 openssl_client_args(ssl_test_lib:supports_ssl_tls_version(sslv2), Hostname, Port, SNIHostname)
-		 end,       
-
-    ClientPort = ssl_test_lib:portable_open_port(Exe, ClientArgs), 
-    
-    ssl_test_lib:check_result(Server, ExpectedSNIHostname),
-    ssl_test_lib:close_port(ClientPort),
-    ssl_test_lib:close(Server).
-
-
-cipher(CipherSuite, Version, Config, ClientOpts, ServerOpts) ->
-    process_flag(trap_exit, true),
-    ct:log("Testing CipherSuite ~p~n", [CipherSuite]),
-    {ClientNode, _ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-    Port = ssl_test_lib:inet_port(node()),
-    CertFile = proplists:get_value(certfile, ServerOpts),
-    KeyFile = proplists:get_value(keyfile, ServerOpts),
-
-    Exe = "openssl",
-    Args = ["s_server", "-accept", integer_to_list(Port), ssl_test_lib:version_flag(Version),
-	    "-cert", CertFile, "-key", KeyFile],
-
-    OpenSslPort =  ssl_test_lib:portable_open_port(Exe, Args), 
-
-    ssl_test_lib:wait_for_openssl_server(Port, proplists:get_value(protocol, Config)),
-
-    ConnectionInfo = {ok, {Version, CipherSuite}},
-
-    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
-					{host, Hostname},
-					{from, self()},
-					{mfa, {ssl_test_lib, cipher_result, [ConnectionInfo]}},
-					{options,
-					 [{ciphers,[CipherSuite]} |
-			     ClientOpts]}]),
-
-    true = port_command(OpenSslPort, "Hello\n"),
-
-    receive
-	{Port, {data, _}} when is_port(Port) ->
-	    ok
-    after 500 ->
-	    ct:log("Time out on openssl port, check that"
-			       " the messages Hello and world are received"
-			       " during close of port" , []),
-	    ok
-    end,
-
-    true = port_command(OpenSslPort, " world\n"),
-
-    Result = ssl_test_lib:wait_for_result(Client, ok),
-
-    %% Clean close down!   Server needs to be closed first !!
-    ssl_test_lib:close_port(OpenSslPort),
-    ssl_test_lib:close(Client),
-
-    Return = case Result of
-		 ok ->
-		     [];
-		 Error ->
-		     [{CipherSuite, Error}]
-	     end,
-    process_flag(trap_exit, false),
-    Return.
-
-start_erlang_client_and_openssl_server_with_opts(Config, ErlangClientOpts, OpensslServerOpts, Data, Callback) ->
-    process_flag(trap_exit, true),
-    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
-    ClientOpts0 = ssl_test_lib:ssl_options(client_rsa_opts, Config),
-    ClientOpts = ErlangClientOpts ++ ClientOpts0,
-
-    {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 = case OpensslServerOpts of
-	       [] -> 
-		   ["s_server", "-accept", 
-		    integer_to_list(Port), ssl_test_lib:version_flag(Version),
-		    "-cert", CertFile,"-key", KeyFile];
-	       [Opt, Value] ->
-		   ["s_server", Opt, Value, "-accept", 
-		    integer_to_list(Port), ssl_test_lib:version_flag(Version),
-		    "-cert", CertFile,"-key", KeyFile]
-	   end,
-		   
-    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, ClientOpts}]),
-
-    Callback(Client, OpensslPort),
-
-    %% 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).
-
-start_erlang_client_and_openssl_server_for_alpn_negotiation(Config, Data, Callback) ->
-    process_flag(trap_exit, true),
-    ServerOpts = proplists:get_value(server_rsa_opts, Config),
-    ClientOpts0 = proplists:get_value(client_rsa_opts, Config),
-    ClientOpts = [{alpn_advertised_protocols, [<<"spdy/2">>]} | ClientOpts0],
-
-    {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", "-msg", "-alpn", "http/1.1,spdy/2", "-accept", integer_to_list(Port), ssl_test_lib:version_flag(Version),
-	    "-cert", CertFile, "-key", KeyFile],
-    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_and_assert_negotiated_protocol, [<<"spdy/2">>, Data]}},
-                    {options, ClientOpts}]),
-
-    Callback(Client, OpensslPort),
-
-    %% 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).
-
-start_erlang_server_and_openssl_client_for_alpn_negotiation(Config, Data, Callback) ->
-    process_flag(trap_exit, true),
-    ServerOpts0 = proplists:get_value(server_rsa_opts, Config),
-    ServerOpts = [{alpn_preferred_protocols, [<<"spdy/2">>]} | ServerOpts0],
-
-    {_, ServerNode, _} = ssl_test_lib:run_where(Config),
-
-
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-                    {from, self()},
-                    {mfa, {?MODULE, erlang_ssl_receive_and_assert_negotiated_protocol, [<<"spdy/2">>, Data]}},
-                    {options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Version = ssl_test_lib:protocol_version(Config),
-
-    Exe = "openssl",
-    Args = ["s_client", "-alpn", "http/1.0,spdy/2", "-msg", "-port", 
-	    integer_to_list(Port), ssl_test_lib:version_flag(Version),
-	    "-host", "localhost"],
-
-    OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args),  
-
-    Callback(Server, OpenSslPort),
-
-    ssl_test_lib:close(Server),
-
-    ssl_test_lib:close_port(OpenSslPort),
-    process_flag(trap_exit, false).
-
-start_erlang_client_and_openssl_server_for_alpn_npn_negotiation(Config, Data, Callback) ->
-    process_flag(trap_exit, true),
-    ServerOpts = proplists:get_value(server_rsa_opts, Config),
-    ClientOpts0 = proplists:get_value(client_rsa_opts, Config),
-    ClientOpts = [{alpn_advertised_protocols, [<<"spdy/2">>]},
-        {client_preferred_next_protocols, {client, [<<"spdy/3">>, <<"http/1.1">>]}} | ClientOpts0],
-
-    {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", "-msg", "-alpn", "http/1.1,spdy/2", "-nextprotoneg", 
-	    "spdy/3", "-accept", integer_to_list(Port), ssl_test_lib:version_flag(Version),
-	    "-cert", CertFile, "-key",  KeyFile],
-
-    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_and_assert_negotiated_protocol, [<<"spdy/2">>, Data]}},
-                    {options, ClientOpts}]),
-
-    Callback(Client, OpensslPort),
-
-    %% 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).
-
-start_erlang_server_and_openssl_client_for_alpn_npn_negotiation(Config, Data, Callback) ->
-    process_flag(trap_exit, true),
-    ServerOpts0 = proplists:get_value(server_rsa_opts, Config),
-    ServerOpts = [{alpn_preferred_protocols, [<<"spdy/2">>]},
-        {next_protocols_advertised, [<<"spdy/3">>, <<"http/1.1">>]} | ServerOpts0],
-
-    {_, ServerNode, _} = ssl_test_lib:run_where(Config),
-
-
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-                    {from, self()},
-                    {mfa, {?MODULE, erlang_ssl_receive_and_assert_negotiated_protocol, [<<"spdy/2">>, Data]}},
-                    {options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Version = ssl_test_lib:protocol_version(Config),
-    Exe = "openssl",
-    Args = ["s_client", "-alpn", "http/1.1,spdy/2", "-nextprotoneg", "spdy/3", 
-	    "-msg", "-port", integer_to_list(Port), ssl_test_lib:version_flag(Version),
-	    "-host", "localhost"],
-    OpenSslPort =  ssl_test_lib:portable_open_port(Exe, Args),  
-
-    Callback(Server, OpenSslPort),
-
-    ssl_test_lib:close(Server),
-    ssl_test_lib:close_port(OpenSslPort),
-    process_flag(trap_exit, false).
-
-start_erlang_client_and_openssl_server_for_npn_negotiation(Config, Data, Callback) ->
-    process_flag(trap_exit, true),
-    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
-    ClientOpts0 = ssl_test_lib:ssl_options(client_rsa_opts, Config),
-    ClientOpts = [{client_preferred_next_protocols, {client, [<<"spdy/2">>], <<"http/1.1">>}} | ClientOpts0],
-
-    {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", "-msg", "-nextprotoneg", "http/1.1,spdy/2", "-accept", integer_to_list(Port),
-	    ssl_test_lib:version_flag(Version),
-	    "-cert", CertFile, "-key", KeyFile],
-    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_and_assert_negotiated_protocol, [<<"spdy/2">>, Data]}},
-                    {options, ClientOpts}]),
-
-    Callback(Client, OpensslPort),
-
-    %% 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).
-
-start_erlang_server_and_openssl_client_for_npn_negotiation(Config, Data, Callback) ->
-    process_flag(trap_exit, true),
-    ServerOpts0 = ssl_test_lib:ssl_options(server_rsa_opts, Config),
-    ServerOpts = [{next_protocols_advertised, [<<"spdy/2">>]}, ServerOpts0],
-
-    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-                    {from, self()},
-                    {mfa, {?MODULE, erlang_ssl_receive_and_assert_negotiated_protocol, [<<"spdy/2">>, Data]}},
-                    {options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Version = ssl_test_lib:protocol_version(Config),
-
-    Exe = "openssl",
-    Args = ["s_client", "-nextprotoneg", "http/1.0,spdy/2", "-msg", "-connect", 
-            hostname_format(Hostname) ++ ":" 
-	    ++ integer_to_list(Port), ssl_test_lib:version_flag(Version)],
-
-    OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args),  
-
-    Callback(Server, OpenSslPort),
-
-    ssl_test_lib:close(Server),
-
-    ssl_test_lib:close_port(OpenSslPort),
-    process_flag(trap_exit, false).
-
-
-start_erlang_server_and_openssl_client_with_opts(Config, ErlangServerOpts, OpenSSLClientOpts, Data, Callback) ->
-    process_flag(trap_exit, true),
-    ServerOpts0 = ssl_test_lib:ssl_options(server_rsa_opts, Config),
-    ServerOpts = ErlangServerOpts ++  ServerOpts0,
-
-    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
-
-
-    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
-                    {from, self()},
-                    {mfa, {?MODULE, erlang_ssl_receive, [Data]}},
-                    {options, ServerOpts}]),
-    Port = ssl_test_lib:inet_port(Server),
-    Version = ssl_test_lib:protocol_version(Config),
-   
-    Exe = "openssl",
-    Args = ["s_client"] ++ OpenSSLClientOpts ++ ["-msg",  "-connect", 
-                                                 hostname_format(Hostname) ++ ":" ++ integer_to_list(Port),
-                                                 ssl_test_lib:version_flag(Version)],
-
-    OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args),
-
-    Callback(Server, OpenSslPort),
-
-    ssl_test_lib:close(Server),
-
-    ssl_test_lib:close_port(OpenSslPort),
-    process_flag(trap_exit, false).
-
-
-erlang_ssl_receive_and_assert_negotiated_protocol(Socket, Protocol, Data) ->
-    {ok, Protocol} = ssl:negotiated_protocol(Socket),
-    erlang_ssl_receive(Socket, Data),
-    {ok, Protocol} = ssl:negotiated_protocol(Socket),
-    ok.
-
-erlang_ssl_receive(Socket, Data) ->
-    ct:log("Connection info: ~p~n",
-		       [ssl:connection_information(Socket)]),
-    receive
-	{ssl, Socket, Data} ->
-	    io:format("Received ~p~n",[Data]),
-	    %% open_ssl server sometimes hangs waiting in blocking read
-	    ssl:send(Socket, "Got it"), 
-	    ok;
-	{ssl, Socket, Byte} when length(Byte) == 1 ->
-	    erlang_ssl_receive(Socket, tl(Data));
-	{Port, {data,Debug}} when is_port(Port) ->
-	    io:format("openssl ~s~n",[Debug]),
-	    erlang_ssl_receive(Socket,Data);
-	Other ->
-	    ct:fail({unexpected_message, Other})
-    end.
- 
-connection_info(Socket, Version) ->
-    case ssl:connection_information(Socket, [version]) of
-	{ok, [{version, Version}] = Info} ->
-	    ct:log("Connection info: ~p~n", [Info]),
-	    ok;
-	{ok,  [{version, OtherVersion}]} ->
-	    {wrong_version, OtherVersion}
-    end.
-
-connection_info_result(Socket) ->                                            
-    ssl:connection_information(Socket).
-
-
-delayed_send(Socket, [ErlData, OpenSslData]) ->
-    ct:sleep(?SLEEP),
-    ssl:send(Socket, ErlData),
-    erlang_ssl_receive(Socket, OpenSslData).
-
-server_sent_garbage(Socket) ->
-    receive 
-	server_sent_garbage ->
-	    {error, closed} == ssl:send(Socket, "data")
-	    
-    end.
-    
-check_openssl_sni_support(Config) ->
-    HelpText = os:cmd("openssl s_client --help"),
-    case string:str(HelpText, "-servername") of
-        0 ->
-            {skip, "Current openssl doesn't support SNI"};
-        _ ->
-            Config
-    end.
-
-check_openssl_npn_support(Config) ->
-    HelpText = os:cmd("openssl s_client --help"),
-    case string:str(HelpText, "nextprotoneg") of
-        0 ->
-            {skip, "Openssl not compiled with nextprotoneg support"};
-        _ ->
-            Config
-    end.
-
-check_openssl_alpn_support(Config) ->
-    HelpText = os:cmd("openssl s_client --help"),
-    case string:str(HelpText, "alpn") of
-        0 ->
-            {skip, "Openssl not compiled with alpn support"};
-        _ ->
-            Config
-    end.
-
-check_sane_openssl_renegotaite(Config, Version) when Version == 'tlsv1.1';
-						     Version == 'tlsv1.2' ->
-    case os:cmd("openssl version") of     
-	"OpenSSL 1.0.1c" ++ _ ->
-	    {skip, "Known renegotiation bug in OpenSSL"};
-	"OpenSSL 1.0.1b" ++ _ ->
-	    {skip, "Known renegotiation bug in OpenSSL"};
-	"OpenSSL 1.0.1a" ++ _ ->
-	    {skip, "Known renegotiation bug in OpenSSL"};
-	"OpenSSL 1.0.1 " ++ _ ->
-	    {skip, "Known renegotiation bug in OpenSSL"};
-	_ ->
-	    check_sane_openssl_renegotaite(Config)
-    end;
-check_sane_openssl_renegotaite(Config, _) ->
-    check_sane_openssl_renegotaite(Config).
-	
-check_sane_openssl_renegotaite(Config) ->
-    case os:cmd("openssl version") of  
-	"OpenSSL 1.0.0" ++ _ ->
-	    {skip, "Known renegotiation bug in OpenSSL"};
-	"OpenSSL 0.9.8" ++ _ ->
-	    {skip, "Known renegotiation bug in OpenSSL"};
-	"OpenSSL 0.9.7" ++ _ ->
-	    {skip, "Known renegotiation bug in OpenSSL"};
-	_ ->
-	    Config
-    end.
-
-workaround_openssl_s_clinent() ->
-    %% http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=683159
-    %% https://bugs.archlinux.org/task/33919
-    %% Bug seems to manifests it self if TLS version is not
-    %% explicitly specified 
-    case os:cmd("openssl version") of 
-	"OpenSSL 1.0.1c" ++ _ ->
-	    ["-no_tls1_2"];
-	"OpenSSL 1.0.1d" ++ _ ->
-	    ["-no_tls1_2"];
-	"OpenSSL 1.0.1e" ++ _ ->
-	    ["-no_tls1_2"];
-	"OpenSSL 1.0.1f" ++ _ ->
-	    ["-no_tls1_2"];
-	_  ->
-	    []
-    end.
-
-openssl_client_args(false, Hostname, Port) ->
-    ["s_client", "-connect", Hostname ++ ":" ++ integer_to_list(Port)];
-openssl_client_args(true, Hostname, Port) ->
-    ["s_client",  "-no_ssl2", "-connect", Hostname ++ ":" ++ integer_to_list(Port)].
-
-openssl_client_args(false, Hostname, Port, ServerName) ->
-    ["s_client",  "-connect", Hostname ++ ":" ++ 
-	 integer_to_list(Port), "-servername", ServerName];
-openssl_client_args(true, Hostname, Port, ServerName) ->
-    ["s_client",  "-no_ssl2", "-connect", Hostname ++ ":" ++ 
-	 integer_to_list(Port), "-servername", ServerName].
-
-hostname_format(Hostname) ->
-    case lists:member($., Hostname) of
-        true ->  
-            Hostname;
-        false ->
-            "localhost"   
-    end.
-
-no_low_flag("-no_ssl2" = Flag) ->
-    case ssl_test_lib:supports_ssl_tls_version(sslv2) of
-        true ->
-            Flag;
-        false ->
-            ""
-    end;
-no_low_flag(Flag) ->
-    Flag.
-
-
-openssl_has_common_ciphers(Ciphers) ->
-    OCiphers = ssl_test_lib:common_ciphers(openssl),
-    has_common_ciphers(Ciphers, OCiphers).
-
-has_common_ciphers([], OCiphers) ->
-    false;
-has_common_ciphers([Cipher | Rest], OCiphers) ->
-    case lists:member(Cipher, OCiphers) of
-        true  ->
-            true;
-        _ ->
-            has_common_ciphers(Rest, OCiphers) 
-    end.
diff --git a/lib/ssl/test/ssl_upgrade_SUITE.erl b/lib/ssl/test/ssl_upgrade_SUITE.erl
index 875399db76..ead18aeb73 100644
--- a/lib/ssl/test/ssl_upgrade_SUITE.erl
+++ b/lib/ssl/test/ssl_upgrade_SUITE.erl
@@ -47,10 +47,7 @@ init_per_suite(Config0) ->
                 {skip, Reason} ->
                     {skip, Reason};
                 Config ->
-                    Result =
-                    {ok, _} = make_certs:all(proplists:get_value(data_dir, Config),
-                                             proplists:get_value(priv_dir, Config)),
-                    ssl_test_lib:cert_options(Config)
+                    ssl_test_lib:make_rsa_cert(Config)
             end
     catch _:_ ->
               {skip, "Crypto did not start"}
@@ -149,8 +146,8 @@ use_connection(Socket) ->
     end.
 
 soft_start_connection(Config, ResulProxy) ->
-    ClientOpts = proplists:get_value(client_verification_opts, Config),
-    ServerOpts = proplists:get_value(server_verification_opts, Config),
+    ClientOpts = proplists:get_value(client_rsa_verify_opts, Config),
+    ServerOpts = proplists:get_value(server_rsa_verify_opts, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
     Server = start_server([{node, ServerNode}, {port, 0},
 			   {from, ResulProxy},
@@ -166,8 +163,8 @@ soft_start_connection(Config, ResulProxy) ->
     {Server, Client}.
 
 restart_start_connection(Config, ResulProxy) ->
-    ClientOpts = proplists:get_value(client_verification_opts, Config),
-    ServerOpts = proplists:get_value(server_verification_opts, Config),
+    ClientOpts = proplists:get_value(client_rsa_verify_opts, Config),
+    ServerOpts = proplists:get_value(server_rsa_verify_opts, Config),
     {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
     Server = start_server([{node, ServerNode}, {port, 0},
 					{from, ResulProxy},
diff --git a/lib/ssl/test/tls_1_3_record_SUITE.erl b/lib/ssl/test/tls_1_3_record_SUITE.erl
new file mode 100644
index 0000000000..5df8853b1b
--- /dev/null
+++ b/lib/ssl/test/tls_1_3_record_SUITE.erl
@@ -0,0 +1,973 @@
+%%
+%% %CopyrightBegin%
+%%
+%% 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.
+%% 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(tls_1_3_record_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("ssl/src/tls_record.hrl").
+-include_lib("ssl/src/tls_handshake.hrl").
+-include_lib("ssl/src/ssl_cipher.hrl").
+-include_lib("ssl/src/ssl_internal.hrl").
+
+all() ->
+    [encode_decode,
+     finished_verify_data,
+     '1_RTT_handshake'].
+
+init_per_suite(Config) ->
+    catch crypto:stop(),
+    try (ok == crypto:start()) andalso ssl_test_lib:sufficient_crypto_support('tlsv1.3') of
+	true ->
+	    ssl_test_lib:clean_start(),
+            Config;
+        false ->
+            {skip, "Not enough crypto support for TLS-1.3"} 
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:unload(ssl),
+    application:stop(crypto).
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+encode_decode() ->
+     [{doc,"Test TLS 1.3 record encode/decode functions"}].
+
+encode_decode(_Config) ->
+    ConnectionStates =
+        #{current_read =>
+              #{beast_mitigation => one_n_minus_one,
+                cipher_state =>
+                    {cipher_state,
+                     <<14,172,111,243,199,170,242,203,126,205,34,93,122,115,226,14,
+                       15,117,155,48,24,112,61,15,113,208,127,51,179,227,194,232>>,
+                     <<197,54,168,218,54,91,157,58,30,201,197,142,51,58,53,231,228,
+                       131,57,122,170,78,82,196,30,48,23,16,95,255,185,236>>,
+                     undefined,undefined,undefined,16},
+                client_verify_data => undefined,compression_state => undefined,
+                mac_secret => undefined,secure_renegotiation => undefined,
+                security_parameters =>
+                    {security_parameters,
+                     <<19,2>>,
+                     0,8,2,undefined,undefined,undefined,undefined,undefined,
+                     sha384,undefined,undefined,
+                     {handshake_secret,
+                      <<128,229,186,211,62,127,182,20,62,166,233,23,135,64,121,
+                        3,104,251,214,161,253,31,3,2,232,37,8,221,189,72,64,218,
+                        121,41,112,148,254,34,68,164,228,60,161,201,132,55,56,
+                        157>>},
+                     undefined,
+                     <<92,24,205,75,244,60,136,212,250,32,214,20,37,3,213,87,61,207,
+                       147,61,168,145,177,118,160,153,33,53,48,108,191,174>>,
+                     undefined},
+                sequence_number => 0,server_verify_data => undefined},
+          current_write =>
+              #{beast_mitigation => one_n_minus_one,
+                cipher_state =>
+                    {cipher_state,
+                     <<14,172,111,243,199,170,242,203,126,205,34,93,122,115,226,14,
+                       15,117,155,48,24,112,61,15,113,208,127,51,179,227,194,232>>,
+                     <<197,54,168,218,54,91,157,58,30,201,197,142,51,58,53,231,228,
+                       131,57,122,170,78,82,196,30,48,23,16,95,255,185,236>>,
+                     undefined,undefined,undefined,16},
+                client_verify_data => undefined,compression_state => undefined,
+                mac_secret => undefined,secure_renegotiation => undefined,
+                security_parameters =>
+                    {security_parameters,
+                     <<19,2>>,
+                     0,8,2,undefined,undefined,undefined,undefined,undefined,
+                     sha384,undefined,undefined,
+                     {handshake_secret,
+                      <<128,229,186,211,62,127,182,20,62,166,233,23,135,64,121,
+                        3,104,251,214,161,253,31,3,2,232,37,8,221,189,72,64,218,
+                        121,41,112,148,254,34,68,164,228,60,161,201,132,55,56,
+                        157>>},
+                     undefined,
+                     <<92,24,205,75,244,60,136,212,250,32,214,20,37,3,213,87,61,207,
+                       147,61,168,145,177,118,160,153,33,53,48,108,191,174>>,
+                     undefined},
+                sequence_number => 0,server_verify_data => undefined}},
+
+    PlainText = [11,
+                 <<0,2,175>>,
+                 <<0,0,2,171,0,2,166,48,130,2,162,48,130,1,138,2,9,0,186,57,220,137,88,255,
+                   191,235,48,13,6,9,42,134,72,134,247,13,1,1,11,5,0,48,18,49,16,48,14,6,3,85,
+                   4,3,12,7,84,101,115,116,32,67,65,48,30,23,13,49,56,48,53,48,52,49,52,49,50,
+                   51,56,90,23,13,50,56,48,50,48,52,49,52,49,50,51,56,90,48,20,49,18,48,16,6,
+                   3,85,4,3,12,9,108,111,99,97,108,104,111,115,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,169,40,
+                   144,176,121,63,134,97,144,126,243,183,225,157,37,131,183,225,87,243,23,88,
+                   230,70,9,134,32,147,7,27,167,98,51,81,224,75,199,12,229,251,195,207,75,179,
+                   181,78,128,3,255,44,58,39,43,172,142,45,186,58,51,65,187,199,154,153,245,
+                   70,133,137,1,27,87,42,116,65,251,129,109,145,233,97,171,71,54,213,185,74,
+                   209,166,11,218,189,119,206,86,170,60,212,213,85,189,30,50,215,23,185,53,
+                   132,238,132,176,198,250,139,251,198,221,225,128,109,113,23,220,39,143,71,
+                   30,59,189,51,244,61,158,214,146,180,196,103,169,189,221,136,78,129,216,148,
+                   2,9,8,65,37,224,215,233,13,209,21,235,20,143,33,74,59,53,208,90,152,94,251,
+                   54,114,171,39,88,230,227,158,211,135,37,182,67,205,161,59,20,138,58,253,15,
+                   53,48,8,157,9,95,197,9,177,116,21,54,9,125,78,109,182,83,20,16,234,223,116,
+                   41,155,123,87,77,17,120,153,246,239,124,130,105,219,166,146,242,151,66,198,
+                   75,72,63,28,246,86,16,244,223,22,36,50,15,247,222,98,6,152,136,154,72,150,
+                   73,127,2,3,1,0,1,48,13,6,9,42,134,72,134,247,13,1,1,11,5,0,3,130,1,1,0,76,
+                   33,54,160,229,219,219,193,150,116,245,252,18,39,235,145,86,12,167,171,52,
+                   117,166,30,83,5,216,245,177,217,247,95,1,136,94,246,212,108,248,230,111,
+                   225,202,189,6,129,8,70,128,245,18,204,215,87,82,129,253,227,122,66,182,184,
+                   189,30,193,169,144,218,216,109,105,110,215,144,60,104,162,178,101,164,218,
+                   122,60,37,41,143,57,150,52,59,51,112,238,113,239,168,114,69,183,143,154,73,
+                   61,58,80,247,172,95,251,55,28,186,28,200,206,230,118,243,92,202,189,49,76,
+                   124,252,76,0,247,112,85,194,69,59,222,163,228,103,49,110,104,109,251,155,
+                   138,9,37,167,49,189,48,134,52,158,185,129,24,96,153,196,251,90,206,76,239,
+                   175,119,174,165,133,108,222,125,237,125,187,149,152,83,190,16,202,94,202,
+                   201,40,218,22,254,63,189,41,174,97,140,203,70,18,196,118,237,175,134,79,78,
+                   246,2,61,54,77,186,112,32,17,193,192,188,217,252,215,200,7,245,180,179,132,
+                   183,212,229,155,15,152,206,135,56,81,88,3,123,244,149,110,182,72,109,70,62,
+                   146,152,146,151,107,126,216,210,9,93,0,0>>],
+
+    {[_Header|Encoded], _} = tls_record_1_3:encode_plain_text(22, PlainText, ConnectionStates),
+    CipherText = #ssl_tls{type = 23, version = {3,3}, fragment = Encoded},
+
+    {#ssl_tls{type = 22, version = {3,4}, fragment = DecodedText}, _} =
+        tls_record_1_3:decode_cipher_text(CipherText, ConnectionStates),
+
+    DecodedText = iolist_to_binary(PlainText),
+    ct:log("Decoded: ~p ~n", [DecodedText]),
+    ok.
+%%--------------------------------------------------------------------
+'1_RTT_handshake'() ->
+     [{doc,"Test TLS 1.3 1-RTT Handshake"}].
+
+'1_RTT_handshake'(_Config) ->
+    %% ConnectionStates with NULL cipher
+    ConnStatesNull =
+       #{current_write =>
+             #{security_parameters =>
+                   #security_parameters{cipher_suite = ?TLS_NULL_WITH_NULL_NULL},
+               sequence_number => 0
+              }
+        },
+
+    %% {client}  construct a ClientHello handshake message:
+    %%
+    %%    ClientHello (196 octets):  01 00 00 c0 03 03 cb 34 ec b1 e7 81 63
+    %%       ba 1c 38 c6 da cb 19 6a 6d ff a2 1a 8d 99 12 ec 18 a2 ef 62 83
+    %%       02 4d ec e7 00 00 06 13 01 13 03 13 02 01 00 00 91 00 00 00 0b
+    %%       00 09 00 00 06 73 65 72 76 65 72 ff 01 00 01 00 00 0a 00 14 00
+    %%       12 00 1d 00 17 00 18 00 19 01 00 01 01 01 02 01 03 01 04 00 23
+    %%       00 00 00 33 00 26 00 24 00 1d 00 20 99 38 1d e5 60 e4 bd 43 d2
+    %%       3d 8e 43 5a 7d ba fe b3 c0 6e 51 c1 3c ae 4d 54 13 69 1e 52 9a
+    %%       af 2c 00 2b 00 03 02 03 04 00 0d 00 20 00 1e 04 03 05 03 06 03
+    %%       02 03 08 04 08 05 08 06 04 01 05 01 06 01 02 01 04 02 05 02 06
+    %%       02 02 02 00 2d 00 02 01 01 00 1c 00 02 40 01
+    %%
+    %% {client}  send handshake record:
+    %%
+    %%    payload (196 octets):  01 00 00 c0 03 03 cb 34 ec b1 e7 81 63 ba
+    %%       1c 38 c6 da cb 19 6a 6d ff a2 1a 8d 99 12 ec 18 a2 ef 62 83 02
+    %%       4d ec e7 00 00 06 13 01 13 03 13 02 01 00 00 91 00 00 00 0b 00
+    %%       09 00 00 06 73 65 72 76 65 72 ff 01 00 01 00 00 0a 00 14 00 12
+    %%       00 1d 00 17 00 18 00 19 01 00 01 01 01 02 01 03 01 04 00 23 00
+    %%       00 00 33 00 26 00 24 00 1d 00 20 99 38 1d e5 60 e4 bd 43 d2 3d
+    %%       8e 43 5a 7d ba fe b3 c0 6e 51 c1 3c ae 4d 54 13 69 1e 52 9a af
+    %%       2c 00 2b 00 03 02 03 04 00 0d 00 20 00 1e 04 03 05 03 06 03 02
+    %%       03 08 04 08 05 08 06 04 01 05 01 06 01 02 01 04 02 05 02 06 02
+    %%       02 02 00 2d 00 02 01 01 00 1c 00 02 40 01
+    %%
+    %%    complete record (201 octets):  16 03 01 00 c4 01 00 00 c0 03 03 cb
+    %%       34 ec b1 e7 81 63 ba 1c 38 c6 da cb 19 6a 6d ff a2 1a 8d 99 12
+    %%       ec 18 a2 ef 62 83 02 4d ec e7 00 00 06 13 01 13 03 13 02 01 00
+    %%       00 91 00 00 00 0b 00 09 00 00 06 73 65 72 76 65 72 ff 01 00 01
+    %%       00 00 0a 00 14 00 12 00 1d 00 17 00 18 00 19 01 00 01 01 01 02
+    %%       01 03 01 04 00 23 00 00 00 33 00 26 00 24 00 1d 00 20 99 38 1d
+    %%       e5 60 e4 bd 43 d2 3d 8e 43 5a 7d ba fe b3 c0 6e 51 c1 3c ae 4d
+    %%       54 13 69 1e 52 9a af 2c 00 2b 00 03 02 03 04 00 0d 00 20 00 1e
+    %%       04 03 05 03 06 03 02 03 08 04 08 05 08 06 04 01 05 01 06 01 02
+    %%       01 04 02 05 02 06 02 02 02 00 2d 00 02 01 01 00 1c 00 02 40 01
+    ClientHello =
+        hexstr2bin("01 00 00 c0 03 03 cb 34 ec b1 e7 81 63
+          ba 1c 38 c6 da cb 19 6a 6d ff a2 1a 8d 99 12 ec 18 a2 ef 62 83
+          02 4d ec e7 00 00 06 13 01 13 03 13 02 01 00 00 91 00 00 00 0b
+          00 09 00 00 06 73 65 72 76 65 72 ff 01 00 01 00 00 0a 00 14 00
+          12 00 1d 00 17 00 18 00 19 01 00 01 01 01 02 01 03 01 04 00 23
+          00 00 00 33 00 26 00 24 00 1d 00 20 99 38 1d e5 60 e4 bd 43 d2
+          3d 8e 43 5a 7d ba fe b3 c0 6e 51 c1 3c ae 4d 54 13 69 1e 52 9a
+          af 2c 00 2b 00 03 02 03 04 00 0d 00 20 00 1e 04 03 05 03 06 03
+          02 03 08 04 08 05 08 06 04 01 05 01 06 01 02 01 04 02 05 02 06
+          02 02 02 00 2d 00 02 01 01 00 1c 00 02 40 01"),
+
+    ClientHelloRecord =
+        %% Current implementation always sets
+        %% legacy_record_version to Ox0303
+        hexstr2bin("16 03 03 00 c4 01 00 00 c0 03 03 cb
+          34 ec b1 e7 81 63 ba 1c 38 c6 da cb 19 6a 6d ff a2 1a 8d 99 12
+          ec 18 a2 ef 62 83 02 4d ec e7 00 00 06 13 01 13 03 13 02 01 00
+          00 91 00 00 00 0b 00 09 00 00 06 73 65 72 76 65 72 ff 01 00 01
+          00 00 0a 00 14 00 12 00 1d 00 17 00 18 00 19 01 00 01 01 01 02
+          01 03 01 04 00 23 00 00 00 33 00 26 00 24 00 1d 00 20 99 38 1d
+          e5 60 e4 bd 43 d2 3d 8e 43 5a 7d ba fe b3 c0 6e 51 c1 3c ae 4d
+          54 13 69 1e 52 9a af 2c 00 2b 00 03 02 03 04 00 0d 00 20 00 1e
+          04 03 05 03 06 03 02 03 08 04 08 05 08 06 04 01 05 01 06 01 02
+          01 04 02 05 02 06 02 02 02 00 2d 00 02 01 01 00 1c 00 02 40 01"),
+
+    {CHEncrypted, _} =
+	tls_record:encode_handshake(ClientHello, {3,4}, ConnStatesNull),
+    ClientHelloRecord = iolist_to_binary(CHEncrypted),
+
+    %% {server}  extract secret "early":
+    %%
+    %%    salt:  0 (all zero octets)
+    %%
+    %%    IKM (32 octets):  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    %%                      00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    %%
+    %%    secret (32 octets):  33 ad 0a 1c 60 7e c0 3b 09 e6 cd 98 93 68 0c
+    %%       e2 10 ad f3 00 aa 1f 26 60 e1 b2 2e 10 f1 70 f9 2a
+    HKDFAlgo = sha256,
+    Salt = binary:copy(<<?BYTE(0)>>, 32),
+    IKM = binary:copy(<<?BYTE(0)>>, 32),
+    EarlySecret =
+        hexstr2bin("33 ad 0a 1c 60 7e c0 3b 09 e6 cd 98 93 68 0c
+          e2 10 ad f3 00 aa 1f 26 60 e1 b2 2e 10 f1 70 f9 2a"),
+
+    {early_secret, EarlySecret} = tls_v1:key_schedule(early_secret, HKDFAlgo, {psk, Salt}),
+
+    %% {client}  create an ephemeral x25519 key pair:
+    %%
+    %%    private key (32 octets):  49 af 42 ba 7f 79 94 85 2d 71 3e f2 78
+    %%       4b cb ca a7 91 1d e2 6a dc 56 42 cb 63 45 40 e7 ea 50 05
+    %%
+    %%    public key (32 octets):  99 38 1d e5 60 e4 bd 43 d2 3d 8e 43 5a 7d
+    %%       ba fe b3 c0 6e 51 c1 3c ae 4d 54 13 69 1e 52 9a af 2c
+    CPublicKey =
+        hexstr2bin("99 38 1d e5 60 e4 bd 43 d2 3d 8e 43 5a 7d
+          ba fe b3 c0 6e 51 c1 3c ae 4d 54 13 69 1e 52 9a af 2c"),
+
+    %% {server}  create an ephemeral x25519 key pair:
+    %%
+    %%   private key (32 octets):  b1 58 0e ea df 6d d5 89 b8 ef 4f 2d 56
+    %%      52 57 8c c8 10 e9 98 01 91 ec 8d 05 83 08 ce a2 16 a2 1e
+    %%
+    %%   public key (32 octets):  c9 82 88 76 11 20 95 fe 66 76 2b db f7 c6
+    %%      72 e1 56 d6 cc 25 3b 83 3d f1 dd 69 b1 b0 4e 75 1f 0f
+    SPrivateKey =
+        hexstr2bin("b1 58 0e ea df 6d d5 89 b8 ef 4f 2d 56
+         52 57 8c c8 10 e9 98 01 91 ec 8d 05 83 08 ce a2 16 a2 1e"),
+
+    SPublicKey =
+        hexstr2bin("c9 82 88 76 11 20 95 fe 66 76 2b db f7 c6
+         72 e1 56 d6 cc 25 3b 83 3d f1 dd 69 b1 b0 4e 75 1f 0f"),
+
+    %% {server}  construct a ServerHello handshake message:
+    %%
+    %%    ServerHello (90 octets):  02 00 00 56 03 03 a6 af 06 a4 12 18 60
+    %%       dc 5e 6e 60 24 9c d3 4c 95 93 0c 8a c5 cb 14 34 da c1 55 77 2e
+    %%       d3 e2 69 28 00 13 01 00 00 2e 00 33 00 24 00 1d 00 20 c9 82 88
+    %%       76 11 20 95 fe 66 76 2b db f7 c6 72 e1 56 d6 cc 25 3b 83 3d f1
+    %%       dd 69 b1 b0 4e 75 1f 0f 00 2b 00 02 03 04
+    ServerHello =
+        hexstr2bin("02 00 00 56 03 03 a6 af 06 a4 12 18 60
+          dc 5e 6e 60 24 9c d3 4c 95 93 0c 8a c5 cb 14 34 da c1 55 77 2e
+          d3 e2 69 28 00 13 01 00 00 2e 00 33 00 24 00 1d 00 20 c9 82 88
+          76 11 20 95 fe 66 76 2b db f7 c6 72 e1 56 d6 cc 25 3b 83 3d f1
+          dd 69 b1 b0 4e 75 1f 0f 00 2b 00 02 03 04"),
+
+    %% {server}  derive secret for handshake "tls13 derived":
+    %%
+    %%    PRK (32 octets):  33 ad 0a 1c 60 7e c0 3b 09 e6 cd 98 93 68 0c e2
+    %%       10 ad f3 00 aa 1f 26 60 e1 b2 2e 10 f1 70 f9 2a
+    %%
+    %%    hash (32 octets):  e3 b0 c4 42 98 fc 1c 14 9a fb f4 c8 99 6f b9 24
+    %%       27 ae 41 e4 64 9b 93 4c a4 95 99 1b 78 52 b8 55
+    %%
+    %%    info (49 octets):  00 20 0d 74 6c 73 31 33 20 64 65 72 69 76 65 64
+    %%       20 e3 b0 c4 42 98 fc 1c 14 9a fb f4 c8 99 6f b9 24 27 ae 41 e4
+    %%       64 9b 93 4c a4 95 99 1b 78 52 b8 55
+    %%
+    %%    expanded (32 octets):  6f 26 15 a1 08 c7 02 c5 67 8f 54 fc 9d ba
+    %%       b6 97 16 c0 76 18 9c 48 25 0c eb ea c3 57 6c 36 11 ba
+    Hash =
+        hexstr2bin("e3 b0 c4 42 98 fc 1c 14 9a fb f4 c8 99 6f b9 24
+          27 ae 41 e4 64 9b 93 4c a4 95 99 1b 78 52 b8 55"),
+
+    Hash = crypto:hash(HKDFAlgo, <<>>),
+
+    Info =
+        hexstr2bin("00 20 0d 74 6c 73 31 33 20 64 65 72 69 76 65 64
+          20 e3 b0 c4 42 98 fc 1c 14 9a fb f4 c8 99 6f b9 24 27 ae 41 e4
+          64 9b 93 4c a4 95 99 1b 78 52 b8 55"),
+
+    Info = tls_v1:create_info(<<"derived">>, Hash,  ssl_cipher:hash_size(HKDFAlgo)),
+
+    Expanded =
+        hexstr2bin("6f 26 15 a1 08 c7 02 c5 67 8f 54 fc 9d ba
+          b6 97 16 c0 76 18 9c 48 25 0c eb ea c3 57 6c 36 11 ba"),
+
+    Expanded = tls_v1:derive_secret(EarlySecret, <<"derived">>, <<>>, HKDFAlgo),
+
+    %% {server}  extract secret "handshake":
+    %%
+    %%    salt (32 octets):  6f 26 15 a1 08 c7 02 c5 67 8f 54 fc 9d ba b6 97
+    %%       16 c0 76 18 9c 48 25 0c eb ea c3 57 6c 36 11 ba
+    %%
+    %%    IKM (32 octets):  8b d4 05 4f b5 5b 9d 63 fd fb ac f9 f0 4b 9f 0d
+    %%       35 e6 d6 3f 53 75 63 ef d4 62 72 90 0f 89 49 2d
+    %%
+    %%    secret (32 octets):  1d c8 26 e9 36 06 aa 6f dc 0a ad c1 2f 74 1b
+    %%       01 04 6a a6 b9 9f 69 1e d2 21 a9 f0 ca 04 3f be ac
+
+    %% salt = Expanded
+    HandshakeIKM =
+        hexstr2bin("8b d4 05 4f b5 5b 9d 63 fd fb ac f9 f0 4b 9f 0d
+          35 e6 d6 3f 53 75 63 ef d4 62 72 90 0f 89 49 2d"),
+
+    HandshakeSecret =
+        hexstr2bin("1d c8 26 e9 36 06 aa 6f dc 0a ad c1 2f 74 1b
+          01 04 6a a6 b9 9f 69 1e d2 21 a9 f0 ca 04 3f be ac"),
+
+    HandshakeIKM = crypto:compute_key(ecdh, CPublicKey, SPrivateKey, x25519),
+
+    {handshake_secret, HandshakeSecret} =
+        tls_v1:key_schedule(handshake_secret, HKDFAlgo, HandshakeIKM,
+                            {early_secret, EarlySecret}),
+
+    %% {server}  derive secret "tls13 c hs traffic":
+    %%
+    %%    PRK (32 octets):  1d c8 26 e9 36 06 aa 6f dc 0a ad c1 2f 74 1b 01
+    %%       04 6a a6 b9 9f 69 1e d2 21 a9 f0 ca 04 3f be ac
+    %%
+    %%    hash (32 octets):  86 0c 06 ed c0 78 58 ee 8e 78 f0 e7 42 8c 58 ed
+    %%       d6 b4 3f 2c a3 e6 e9 5f 02 ed 06 3c f0 e1 ca d8
+    %%
+    %%    info (54 octets):  00 20 12 74 6c 73 31 33 20 63 20 68 73 20 74 72
+    %%       61 66 66 69 63 20 86 0c 06 ed c0 78 58 ee 8e 78 f0 e7 42 8c 58
+    %%       ed d6 b4 3f 2c a3 e6 e9 5f 02 ed 06 3c f0 e1 ca d8
+    %%
+    %%    expanded (32 octets):  b3 ed db 12 6e 06 7f 35 a7 80 b3 ab f4 5e
+    %%       2d 8f 3b 1a 95 07 38 f5 2e 96 00 74 6a 0e 27 a5 5a 21
+
+    %% PRK = HandshakeSecret
+    CHSTHash =
+        hexstr2bin("86 0c 06 ed c0 78 58 ee 8e 78 f0 e7 42 8c 58 ed
+          d6 b4 3f 2c a3 e6 e9 5f 02 ed 06 3c f0 e1 ca d8"),
+
+    CHSTInfo =
+        hexstr2bin("00 20 12 74 6c 73 31 33 20 63 20 68 73 20 74 72
+          61 66 66 69 63 20 86 0c 06 ed c0 78 58 ee 8e 78 f0 e7 42 8c 58
+          ed d6 b4 3f 2c a3 e6 e9 5f 02 ed 06 3c f0 e1 ca d8"),
+
+    CHSTrafficSecret =
+        hexstr2bin(" b3 ed db 12 6e 06 7f 35 a7 80 b3 ab f4 5e
+          2d 8f 3b 1a 95 07 38 f5 2e 96 00 74 6a 0e 27 a5 5a 21"),
+
+    CHSH =  <<ClientHello/binary,ServerHello/binary>>,
+    CHSTHash = crypto:hash(HKDFAlgo, CHSH),
+    CHSTInfo =  tls_v1:create_info(<<"c hs traffic">>, CHSTHash,  ssl_cipher:hash_size(HKDFAlgo)),
+
+    CHSTrafficSecret =
+        tls_v1:client_handshake_traffic_secret(HKDFAlgo, {handshake_secret, HandshakeSecret}, CHSH),
+
+    %% {server}  derive secret "tls13 s hs traffic":
+    %%
+    %%    PRK (32 octets):  1d c8 26 e9 36 06 aa 6f dc 0a ad c1 2f 74 1b 01
+    %%       04 6a a6 b9 9f 69 1e d2 21 a9 f0 ca 04 3f be ac
+    %%
+    %%    hash (32 octets):  86 0c 06 ed c0 78 58 ee 8e 78 f0 e7 42 8c 58 ed
+    %%       d6 b4 3f 2c a3 e6 e9 5f 02 ed 06 3c f0 e1 ca d8
+    %%
+    %%    info (54 octets):  00 20 12 74 6c 73 31 33 20 73 20 68 73 20 74 72
+    %%       61 66 66 69 63 20 86 0c 06 ed c0 78 58 ee 8e 78 f0 e7 42 8c 58
+    %%       ed d6 b4 3f 2c a3 e6 e9 5f 02 ed 06 3c f0 e1 ca d8
+    %%
+    %%    expanded (32 octets):  b6 7b 7d 69 0c c1 6c 4e 75 e5 42 13 cb 2d
+    %%       37 b4 e9 c9 12 bc de d9 10 5d 42 be fd 59 d3 91 ad 38
+
+    %% PRK = HandshakeSecret
+    %% hash = CHSTHash
+    SHSTInfo =
+        hexstr2bin("00 20 12 74 6c 73 31 33 20 73 20 68 73 20 74 72
+          61 66 66 69 63 20 86 0c 06 ed c0 78 58 ee 8e 78 f0 e7 42 8c 58
+          ed d6 b4 3f 2c a3 e6 e9 5f 02 ed 06 3c f0 e1 ca d8"),
+
+    SHSTrafficSecret =
+        hexstr2bin("b6 7b 7d 69 0c c1 6c 4e 75 e5 42 13 cb 2d
+          37 b4 e9 c9 12 bc de d9 10 5d 42 be fd 59 d3 91 ad 38"),
+
+    SHSTInfo =  tls_v1:create_info(<<"s hs traffic">>, CHSTHash,  ssl_cipher:hash_size(HKDFAlgo)),
+
+    SHSTrafficSecret =
+        tls_v1:server_handshake_traffic_secret(HKDFAlgo, {handshake_secret, HandshakeSecret}, CHSH),
+
+
+    %% {server}  derive secret for master "tls13 derived":
+    %%
+    %%    PRK (32 octets):  1d c8 26 e9 36 06 aa 6f dc 0a ad c1 2f 74 1b 01
+    %%       04 6a a6 b9 9f 69 1e d2 21 a9 f0 ca 04 3f be ac
+    %%
+    %%    hash (32 octets):  e3 b0 c4 42 98 fc 1c 14 9a fb f4 c8 99 6f b9 24
+    %%       27 ae 41 e4 64 9b 93 4c a4 95 99 1b 78 52 b8 55
+    %%
+    %%    info (49 octets):  00 20 0d 74 6c 73 31 33 20 64 65 72 69 76 65 64
+    %%       20 e3 b0 c4 42 98 fc 1c 14 9a fb f4 c8 99 6f b9 24 27 ae 41 e4
+    %%       64 9b 93 4c a4 95 99 1b 78 52 b8 55
+    %%
+    %%    expanded (32 octets):  43 de 77 e0 c7 77 13 85 9a 94 4d b9 db 25
+    %%       90 b5 31 90 a6 5b 3e e2 e4 f1 2d d7 a0 bb 7c e2 54 b4
+
+    %% PRK = HandshakeSecret
+    %% hash = Hash
+    %% info = Info
+    MasterDeriveSecret =
+        hexstr2bin("43 de 77 e0 c7 77 13 85 9a 94 4d b9 db 25
+          90 b5 31 90 a6 5b 3e e2 e4 f1 2d d7 a0 bb 7c e2 54 b4"),
+
+    MasterDeriveSecret = tls_v1:derive_secret(HandshakeSecret, <<"derived">>, <<>>, HKDFAlgo),
+
+    %% {server}  extract secret "master":
+    %%
+    %%    salt (32 octets):  43 de 77 e0 c7 77 13 85 9a 94 4d b9 db 25 90 b5
+    %%       31 90 a6 5b 3e e2 e4 f1 2d d7 a0 bb 7c e2 54 b4
+    %%
+    %%    IKM (32 octets):  00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    %%       00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+    %%
+    %%    secret (32 octets):  18 df 06 84 3d 13 a0 8b f2 a4 49 84 4c 5f 8a
+    %%       47 80 01 bc 4d 4c 62 79 84 d5 a4 1d a8 d0 40 29 19
+
+    %% salt = MasterDeriveSecret
+    %% IKM = IKM
+    MasterSecret =
+        hexstr2bin("18 df 06 84 3d 13 a0 8b f2 a4 49 84 4c 5f 8a
+          47 80 01 bc 4d 4c 62 79 84 d5 a4 1d a8 d0 40 29 19"),
+
+    {master_secret, MasterSecret} =
+        tls_v1:key_schedule(master_secret, HKDFAlgo, {handshake_secret, HandshakeSecret}),
+
+    %% {server}  send handshake record:
+    %%
+    %%    payload (90 octets):  02 00 00 56 03 03 a6 af 06 a4 12 18 60 dc 5e
+    %%       6e 60 24 9c d3 4c 95 93 0c 8a c5 cb 14 34 da c1 55 77 2e d3 e2
+    %%       69 28 00 13 01 00 00 2e 00 33 00 24 00 1d 00 20 c9 82 88 76 11
+    %%       20 95 fe 66 76 2b db f7 c6 72 e1 56 d6 cc 25 3b 83 3d f1 dd 69
+    %%       b1 b0 4e 75 1f 0f 00 2b 00 02 03 04
+    %%
+    %%    complete record (95 octets):  16 03 03 00 5a 02 00 00 56 03 03 a6
+    %%       af 06 a4 12 18 60 dc 5e 6e 60 24 9c d3 4c 95 93 0c 8a c5 cb 14
+    %%       34 da c1 55 77 2e d3 e2 69 28 00 13 01 00 00 2e 00 33 00 24 00
+    %%       1d 00 20 c9 82 88 76 11 20 95 fe 66 76 2b db f7 c6 72 e1 56 d6
+    %%       cc 25 3b 83 3d f1 dd 69 b1 b0 4e 75 1f 0f 00 2b 00 02 03 04
+
+    %% payload = ServerHello
+    ServerHelloRecord =
+        hexstr2bin("16 03 03 00 5a 02 00 00 56 03 03 a6
+          af 06 a4 12 18 60 dc 5e 6e 60 24 9c d3 4c 95 93 0c 8a c5 cb 14
+          34 da c1 55 77 2e d3 e2 69 28 00 13 01 00 00 2e 00 33 00 24 00
+          1d 00 20 c9 82 88 76 11 20 95 fe 66 76 2b db f7 c6 72 e1 56 d6
+          cc 25 3b 83 3d f1 dd 69 b1 b0 4e 75 1f 0f 00 2b 00 02 03 04"),
+
+    {SHEncrypted, _} =
+	tls_record:encode_handshake(ServerHello, {3,4}, ConnStatesNull),
+    ServerHelloRecord = iolist_to_binary(SHEncrypted),
+
+    %% {server}  derive write traffic keys for handshake data:
+    %%
+    %%    PRK (32 octets):  b6 7b 7d 69 0c c1 6c 4e 75 e5 42 13 cb 2d 37 b4
+    %%       e9 c9 12 bc de d9 10 5d 42 be fd 59 d3 91 ad 38
+    %%
+    %%    key info (13 octets):  00 10 09 74 6c 73 31 33 20 6b 65 79 00
+    %%
+    %%    key expanded (16 octets):  3f ce 51 60 09 c2 17 27 d0 f2 e4 e8 6e
+    %%       e4 03 bc
+    %%
+    %%    iv info (12 octets):  00 0c 08 74 6c 73 31 33 20 69 76 00
+    %%
+    %%    iv expanded (12 octets):  5d 31 3e b2 67 12 76 ee 13 00 0b 30
+
+    %% PRK = SHSTrafficSecret
+    WriteKeyInfo =
+        hexstr2bin("00 10 09 74 6c 73 31 33 20 6b 65 79 00"),
+
+    WriteKey =
+        hexstr2bin("3f ce 51 60 09 c2 17 27 d0 f2 e4 e8 6e e4 03 bc"),
+
+    WriteIVInfo =
+        hexstr2bin("00 0c 08 74 6c 73 31 33 20 69 76 00"),
+
+    WriteIV =
+        hexstr2bin(" 5d 31 3e b2 67 12 76 ee 13 00 0b 30"),
+
+    Cipher = aes_128_gcm, %% TODO: get from ServerHello
+
+    WriteKeyInfo = tls_v1:create_info(<<"key">>, <<>>,  ssl_cipher:key_material(Cipher)),
+    %% TODO: remove hardcoded IV size
+    WriteIVInfo = tls_v1:create_info(<<"iv">>, <<>>,  12),
+
+    {WriteKey, WriteIV} = tls_v1:calculate_traffic_keys(HKDFAlgo, Cipher, SHSTrafficSecret),
+
+    %% {server}  construct an EncryptedExtensions handshake message:
+    %%
+    %%    EncryptedExtensions (40 octets):  08 00 00 24 00 22 00 0a 00 14 00
+    %%       12 00 1d 00 17 00 18 00 19 01 00 01 01 01 02 01 03 01 04 00 1c
+    %%       00 02 40 01 00 00 00 00
+    %%
+    %% {server}  construct a Certificate handshake message:
+    %%
+    %%    Certificate (445 octets):  0b 00 01 b9 00 00 01 b5 00 01 b0 30 82
+    %%       01 ac 30 82 01 15 a0 03 02 01 02 02 01 02 30 0d 06 09 2a 86 48
+    %%       86 f7 0d 01 01 0b 05 00 30 0e 31 0c 30 0a 06 03 55 04 03 13 03
+    %%       72 73 61 30 1e 17 0d 31 36 30 37 33 30 30 31 32 33 35 39 5a 17
+    %%       0d 32 36 30 37 33 30 30 31 32 33 35 39 5a 30 0e 31 0c 30 0a 06
+    %%       03 55 04 03 13 03 72 73 61 30 81 9f 30 0d 06 09 2a 86 48 86 f7
+    %%       0d 01 01 01 05 00 03 81 8d 00 30 81 89 02 81 81 00 b4 bb 49 8f
+    %%       82 79 30 3d 98 08 36 39 9b 36 c6 98 8c 0c 68 de 55 e1 bd b8 26
+    %%       d3 90 1a 24 61 ea fd 2d e4 9a 91 d0 15 ab bc 9a 95 13 7a ce 6c
+    %%       1a f1 9e aa 6a f9 8c 7c ed 43 12 09 98 e1 87 a8 0e e0 cc b0 52
+    %%       4b 1b 01 8c 3e 0b 63 26 4d 44 9a 6d 38 e2 2a 5f da 43 08 46 74
+    %%       80 30 53 0e f0 46 1c 8c a9 d9 ef bf ae 8e a6 d1 d0 3e 2b d1 93
+    %%       ef f0 ab 9a 80 02 c4 74 28 a6 d3 5a 8d 88 d7 9f 7f 1e 3f 02 03
+    %%       01 00 01 a3 1a 30 18 30 09 06 03 55 1d 13 04 02 30 00 30 0b 06
+    %%       03 55 1d 0f 04 04 03 02 05 a0 30 0d 06 09 2a 86 48 86 f7 0d 01
+    %%       01 0b 05 00 03 81 81 00 85 aa d2 a0 e5 b9 27 6b 90 8c 65 f7 3a
+    %%       72 67 17 06 18 a5 4c 5f 8a 7b 33 7d 2d f7 a5 94 36 54 17 f2 ea
+    %%       e8 f8 a5 8c 8f 81 72 f9 31 9c f3 6b 7f d6 c5 5b 80 f2 1a 03 01
+    %%       51 56 72 60 96 fd 33 5e 5e 67 f2 db f1 02 70 2e 60 8c ca e6 be
+    %%       c1 fc 63 a4 2a 99 be 5c 3e b7 10 7c 3c 54 e9 b9 eb 2b d5 20 3b
+    %%       1c 3b 84 e0 a8 b2 f7 59 40 9b a3 ea c9 d9 1d 40 2d cc 0c c8 f8
+    %%       96 12 29 ac 91 87 b4 2b 4d e1 00 00
+    %%
+    %% {server}  construct a CertificateVerify handshake message:
+    %%
+    %%    CertificateVerify (136 octets):  0f 00 00 84 08 04 00 80 5a 74 7c
+    %%       5d 88 fa 9b d2 e5 5a b0 85 a6 10 15 b7 21 1f 82 4c d4 84 14 5a
+    %%       b3 ff 52 f1 fd a8 47 7b 0b 7a bc 90 db 78 e2 d3 3a 5c 14 1a 07
+    %%       86 53 fa 6b ef 78 0c 5e a2 48 ee aa a7 85 c4 f3 94 ca b6 d3 0b
+    %%       be 8d 48 59 ee 51 1f 60 29 57 b1 54 11 ac 02 76 71 45 9e 46 44
+    %%       5c 9e a5 8c 18 1e 81 8e 95 b8 c3 fb 0b f3 27 84 09 d3 be 15 2a
+    %%       3d a5 04 3e 06 3d da 65 cd f5 ae a2 0d 53 df ac d4 2f 74 f3
+    EncryptedExtensions =
+        hexstr2bin("08 00 00 24 00 22 00 0a 00 14 00
+          12 00 1d 00 17 00 18 00 19 01 00 01 01 01 02 01 03 01 04 00 1c
+          00 02 40 01 00 00 00 00"),
+
+    Certificate =
+        hexstr2bin("0b 00 01 b9 00 00 01 b5 00 01 b0 30 82
+          01 ac 30 82 01 15 a0 03 02 01 02 02 01 02 30 0d 06 09 2a 86 48
+          86 f7 0d 01 01 0b 05 00 30 0e 31 0c 30 0a 06 03 55 04 03 13 03
+          72 73 61 30 1e 17 0d 31 36 30 37 33 30 30 31 32 33 35 39 5a 17
+          0d 32 36 30 37 33 30 30 31 32 33 35 39 5a 30 0e 31 0c 30 0a 06
+          03 55 04 03 13 03 72 73 61 30 81 9f 30 0d 06 09 2a 86 48 86 f7
+          0d 01 01 01 05 00 03 81 8d 00 30 81 89 02 81 81 00 b4 bb 49 8f
+          82 79 30 3d 98 08 36 39 9b 36 c6 98 8c 0c 68 de 55 e1 bd b8 26
+          d3 90 1a 24 61 ea fd 2d e4 9a 91 d0 15 ab bc 9a 95 13 7a ce 6c
+          1a f1 9e aa 6a f9 8c 7c ed 43 12 09 98 e1 87 a8 0e e0 cc b0 52
+          4b 1b 01 8c 3e 0b 63 26 4d 44 9a 6d 38 e2 2a 5f da 43 08 46 74
+          80 30 53 0e f0 46 1c 8c a9 d9 ef bf ae 8e a6 d1 d0 3e 2b d1 93
+          ef f0 ab 9a 80 02 c4 74 28 a6 d3 5a 8d 88 d7 9f 7f 1e 3f 02 03
+          01 00 01 a3 1a 30 18 30 09 06 03 55 1d 13 04 02 30 00 30 0b 06
+          03 55 1d 0f 04 04 03 02 05 a0 30 0d 06 09 2a 86 48 86 f7 0d 01
+          01 0b 05 00 03 81 81 00 85 aa d2 a0 e5 b9 27 6b 90 8c 65 f7 3a
+          72 67 17 06 18 a5 4c 5f 8a 7b 33 7d 2d f7 a5 94 36 54 17 f2 ea
+          e8 f8 a5 8c 8f 81 72 f9 31 9c f3 6b 7f d6 c5 5b 80 f2 1a 03 01
+          51 56 72 60 96 fd 33 5e 5e 67 f2 db f1 02 70 2e 60 8c ca e6 be
+          c1 fc 63 a4 2a 99 be 5c 3e b7 10 7c 3c 54 e9 b9 eb 2b d5 20 3b
+          1c 3b 84 e0 a8 b2 f7 59 40 9b a3 ea c9 d9 1d 40 2d cc 0c c8 f8
+          96 12 29 ac 91 87 b4 2b 4d e1 00 00"),
+
+    CertificateVerify =
+        hexstr2bin("0f 00 00 84 08 04 00 80 5a 74 7c
+          5d 88 fa 9b d2 e5 5a b0 85 a6 10 15 b7 21 1f 82 4c d4 84 14 5a
+          b3 ff 52 f1 fd a8 47 7b 0b 7a bc 90 db 78 e2 d3 3a 5c 14 1a 07
+          86 53 fa 6b ef 78 0c 5e a2 48 ee aa a7 85 c4 f3 94 ca b6 d3 0b
+          be 8d 48 59 ee 51 1f 60 29 57 b1 54 11 ac 02 76 71 45 9e 46 44
+          5c 9e a5 8c 18 1e 81 8e 95 b8 c3 fb 0b f3 27 84 09 d3 be 15 2a
+          3d a5 04 3e 06 3d da 65 cd f5 ae a2 0d 53 df ac d4 2f 74 f3"),
+
+    %% {server}  calculate finished "tls13 finished":
+    %%
+    %%    PRK (32 octets):  b6 7b 7d 69 0c c1 6c 4e 75 e5 42 13 cb 2d 37 b4
+    %%       e9 c9 12 bc de d9 10 5d 42 be fd 59 d3 91 ad 38
+    %%
+    %%    hash (0 octets):  (empty)
+    %%
+    %%    info (18 octets):  00 20 0e 74 6c 73 31 33 20 66 69 6e 69 73 68 65
+    %%       64 00
+    %%
+    %%    expanded (32 octets):  00 8d 3b 66 f8 16 ea 55 9f 96 b5 37 e8 85
+    %%       c3 1f c0 68 bf 49 2c 65 2f 01 f2 88 a1 d8 cd c1 9f c8
+    %%
+    %%    finished (32 octets):  9b 9b 14 1d 90 63 37 fb d2 cb dc e7 1d f4
+    %%       de da 4a b4 2c 30 95 72 cb 7f ff ee 54 54 b7 8f 07 18
+
+    %% PRK = SHSTrafficSecret
+    FInfo =
+        hexstr2bin("00 20 0e 74 6c 73 31 33 20 66 69 6e 69 73 68 65
+          64 00"),
+
+    FExpanded =
+        hexstr2bin("00 8d 3b 66 f8 16 ea 55 9f 96 b5 37 e8 85
+          c3 1f c0 68 bf 49 2c 65 2f 01 f2 88 a1 d8 cd c1 9f c8"),
+
+    FinishedVerifyData =
+        hexstr2bin("9b 9b 14 1d 90 63 37 fb d2 cb dc e7 1d f4
+          de da 4a b4 2c 30 95 72 cb 7f ff ee 54 54 b7 8f 07 18"),
+
+    FInfo = tls_v1:create_info(<<"finished">>, <<>>,  ssl_cipher:hash_size(HKDFAlgo)),
+
+    FExpanded = tls_v1:finished_key(SHSTrafficSecret, HKDFAlgo),
+
+    MessageHistory0 = [CertificateVerify,
+                       Certificate,
+                       EncryptedExtensions,
+                       ServerHello,
+                       ClientHello],
+
+    FinishedVerifyData = tls_v1:finished_verify_data(FExpanded, HKDFAlgo, MessageHistory0),
+
+    %% {server}  construct a Finished handshake message:
+    %%
+    %%    Finished (36 octets):  14 00 00 20 9b 9b 14 1d 90 63 37 fb d2 cb
+    %%       dc e7 1d f4 de da 4a b4 2c 30 95 72 cb 7f ff ee 54 54 b7 8f 07
+    %%       18
+    FinishedHSBin =
+        hexstr2bin("14 00 00 20 9b 9b 14 1d 90 63 37 fb d2 cb
+          dc e7 1d f4 de da 4a b4 2c 30 95 72 cb 7f ff ee 54 54 b7 8f 07
+          18"),
+
+    FinishedHS = #finished{verify_data = FinishedVerifyData},
+
+    FinishedIOList = tls_handshake:encode_handshake(FinishedHS, {3,4}),
+    FinishedHSBin = iolist_to_binary(FinishedIOList),
+
+    %% {server}  derive secret "tls13 c ap traffic":
+    %%
+    %%    PRK (32 octets):  18 df 06 84 3d 13 a0 8b f2 a4 49 84 4c 5f 8a 47
+    %%       80 01 bc 4d 4c 62 79 84 d5 a4 1d a8 d0 40 29 19
+    %%
+    %%    hash (32 octets):  96 08 10 2a 0f 1c cc 6d b6 25 0b 7b 7e 41 7b 1a
+    %%       00 0e aa da 3d aa e4 77 7a 76 86 c9 ff 83 df 13
+    %%
+    %%    info (54 octets):  00 20 12 74 6c 73 31 33 20 63 20 61 70 20 74 72
+    %%       61 66 66 69 63 20 96 08 10 2a 0f 1c cc 6d b6 25 0b 7b 7e 41 7b
+    %%       1a 00 0e aa da 3d aa e4 77 7a 76 86 c9 ff 83 df 13
+    %%
+    %%    expanded (32 octets):  9e 40 64 6c e7 9a 7f 9d c0 5a f8 88 9b ce
+    %%       65 52 87 5a fa 0b 06 df 00 87 f7 92 eb b7 c1 75 04 a5
+
+    %% PRK = MasterSecret
+    CAPTHash =
+        hexstr2bin("96 08 10 2a 0f 1c cc 6d b6 25 0b 7b 7e 41 7b 1a
+          00 0e aa da 3d aa e4 77 7a 76 86 c9 ff 83 df 13"),
+    CAPTInfo =
+        hexstr2bin("00 20 12 74 6c 73 31 33 20 63 20 61 70 20 74 72
+          61 66 66 69 63 20 96 08 10 2a 0f 1c cc 6d b6 25 0b 7b 7e 41 7b
+          1a 00 0e aa da 3d aa e4 77 7a 76 86 c9 ff 83 df 13"),
+
+    CAPTrafficSecret =
+        hexstr2bin("9e 40 64 6c e7 9a 7f 9d c0 5a f8 88 9b ce
+          65 52 87 5a fa 0b 06 df 00 87 f7 92 eb b7 c1 75 04 a5"),
+
+    CHSF = <<ClientHello/binary,
+             ServerHello/binary,
+             EncryptedExtensions/binary,
+             Certificate/binary,
+             CertificateVerify/binary,
+             FinishedHSBin/binary>>,
+
+    CAPTHash = crypto:hash(HKDFAlgo, CHSF),
+
+    CAPTInfo =
+        tls_v1:create_info(<<"c ap traffic">>, CAPTHash, ssl_cipher:hash_size(HKDFAlgo)),
+
+    CAPTrafficSecret =
+        tls_v1:client_application_traffic_secret_0(HKDFAlgo, {master_secret, MasterSecret}, CHSF),
+
+    %% {server}  derive secret "tls13 s ap traffic":
+    %%
+    %%    PRK (32 octets):  18 df 06 84 3d 13 a0 8b f2 a4 49 84 4c 5f 8a 47
+    %%       80 01 bc 4d 4c 62 79 84 d5 a4 1d a8 d0 40 29 19
+    %%
+    %%    hash (32 octets):  96 08 10 2a 0f 1c cc 6d b6 25 0b 7b 7e 41 7b 1a
+    %%       00 0e aa da 3d aa e4 77 7a 76 86 c9 ff 83 df 13
+    %%
+    %%    info (54 octets):  00 20 12 74 6c 73 31 33 20 73 20 61 70 20 74 72
+    %%       61 66 66 69 63 20 96 08 10 2a 0f 1c cc 6d b6 25 0b 7b 7e 41 7b
+    %%       1a 00 0e aa da 3d aa e4 77 7a 76 86 c9 ff 83 df 13
+    %%
+    %%    expanded (32 octets):  a1 1a f9 f0 55 31 f8 56 ad 47 11 6b 45 a9
+    %%       50 32 82 04 b4 f4 4b fb 6b 3a 4b 4f 1f 3f cb 63 16 43
+
+    %% PRK = MasterSecret
+    %% hash = CAPTHash
+    SAPTInfo =
+        hexstr2bin(" 00 20 12 74 6c 73 31 33 20 73 20 61 70 20 74 72
+          61 66 66 69 63 20 96 08 10 2a 0f 1c cc 6d b6 25 0b 7b 7e 41 7b
+          1a 00 0e aa da 3d aa e4 77 7a 76 86 c9 ff 83 df 13"),
+
+    SAPTrafficSecret =
+        hexstr2bin("a1 1a f9 f0 55 31 f8 56 ad 47 11 6b 45 a9
+          50 32 82 04 b4 f4 4b fb 6b 3a 4b 4f 1f 3f cb 63 16 43"),
+
+    SAPTInfo =
+        tls_v1:create_info(<<"s ap traffic">>, CAPTHash, ssl_cipher:hash_size(HKDFAlgo)),
+
+    SAPTrafficSecret =
+        tls_v1:server_application_traffic_secret_0(HKDFAlgo, {master_secret, MasterSecret}, CHSF),
+
+    %% {server}  derive secret "tls13 exp master":
+    %%
+    %%    PRK (32 octets):  18 df 06 84 3d 13 a0 8b f2 a4 49 84 4c 5f 8a 47
+    %%       80 01 bc 4d 4c 62 79 84 d5 a4 1d a8 d0 40 29 19
+    %%
+    %%    hash (32 octets):  96 08 10 2a 0f 1c cc 6d b6 25 0b 7b 7e 41 7b 1a
+    %%       00 0e aa da 3d aa e4 77 7a 76 86 c9 ff 83 df 13
+    %%
+    %%    info (52 octets):  00 20 10 74 6c 73 31 33 20 65 78 70 20 6d 61 73
+    %%       74 65 72 20 96 08 10 2a 0f 1c cc 6d b6 25 0b 7b 7e 41 7b 1a 00
+    %%       0e aa da 3d aa e4 77 7a 76 86 c9 ff 83 df 13
+    %%
+    %%    expanded (32 octets):  fe 22 f8 81 17 6e da 18 eb 8f 44 52 9e 67
+    %%       92 c5 0c 9a 3f 89 45 2f 68 d8 ae 31 1b 43 09 d3 cf 50
+
+    %% PRK = MasterSecret
+    %% hash = CAPTHash
+    ExporterInfo =
+        hexstr2bin("00 20 10 74 6c 73 31 33 20 65 78 70 20 6d 61 73
+          74 65 72 20 96 08 10 2a 0f 1c cc 6d b6 25 0b 7b 7e 41 7b 1a 00
+          0e aa da 3d aa e4 77 7a 76 86 c9 ff 83 df 13"),
+
+    ExporterMasterSecret =
+        hexstr2bin("fe 22 f8 81 17 6e da 18 eb 8f 44 52 9e 67
+          92 c5 0c 9a 3f 89 45 2f 68 d8 ae 31 1b 43 09 d3 cf 50"),
+
+    ExporterInfo =
+        tls_v1:create_info(<<"exp master">>, CAPTHash, ssl_cipher:hash_size(HKDFAlgo)),
+
+    ExporterMasterSecret =
+        tls_v1:exporter_master_secret(HKDFAlgo, {master_secret, MasterSecret}, CHSF),
+
+    %% {server}  derive write traffic keys for application data:
+    %%
+    %%    PRK (32 octets):  a1 1a f9 f0 55 31 f8 56 ad 47 11 6b 45 a9 50 32
+    %%       82 04 b4 f4 4b fb 6b 3a 4b 4f 1f 3f cb 63 16 43
+    %%
+    %%    key info (13 octets):  00 10 09 74 6c 73 31 33 20 6b 65 79 00
+    %%
+    %%    key expanded (16 octets):  9f 02 28 3b 6c 9c 07 ef c2 6b b9 f2 ac
+    %%       92 e3 56
+    %%
+    %%    iv info (12 octets):  00 0c 08 74 6c 73 31 33 20 69 76 00
+    %%
+    %%    iv expanded (12 octets):  cf 78 2b 88 dd 83 54 9a ad f1 e9 84
+
+    %% PRK = SAPTrafficsecret
+    %% key info = WriteKeyInfo
+    %% iv info = WrtieIVInfo
+    SWKey =
+        hexstr2bin("9f 02 28 3b 6c 9c 07 ef c2 6b b9 f2 ac 92 e3 56"),
+
+    SWIV =
+        hexstr2bin("cf 78 2b 88 dd 83 54 9a ad f1 e9 84"),
+
+    {SWKey, SWIV} = tls_v1:calculate_traffic_keys(HKDFAlgo, Cipher, SAPTrafficSecret),
+
+    %% {server}  derive read traffic keys for handshake data:
+    %%
+    %%    PRK (32 octets):  b3 ed db 12 6e 06 7f 35 a7 80 b3 ab f4 5e 2d 8f
+    %%       3b 1a 95 07 38 f5 2e 96 00 74 6a 0e 27 a5 5a 21
+    %%
+    %%    key info (13 octets):  00 10 09 74 6c 73 31 33 20 6b 65 79 00
+    %%
+    %%    key expanded (16 octets):  db fa a6 93 d1 76 2c 5b 66 6a f5 d9 50
+    %%       25 8d 01
+    %%
+    %%    iv info (12 octets):  00 0c 08 74 6c 73 31 33 20 69 76 00
+    %%
+    %%    iv expanded (12 octets):  5b d3 c7 1b 83 6e 0b 76 bb 73 26 5f
+
+    %% PRK = CHSTrafficsecret
+    %% key info = WriteKeyInfo
+    %% iv info = WrtieIVInfo
+    SRKey =
+        hexstr2bin("db fa a6 93 d1 76 2c 5b 66 6a f5 d9 50 25 8d 01"),
+
+    SRIV =
+        hexstr2bin("5b d3 c7 1b 83 6e 0b 76 bb 73 26 5f"),
+
+    {SRKey, SRIV} = tls_v1:calculate_traffic_keys(HKDFAlgo, Cipher, CHSTrafficSecret).
+
+%%--------------------------------------------------------------------
+finished_verify_data() ->
+     [{doc,"Test TLS 1.3 Finished message handling"}].
+
+finished_verify_data(_Config) ->
+    ClientHello =
+        hexstr2bin("01 00 00 c6 03 03 00 01  02 03 04 05 06 07 08 09
+                    0a 0b 0c 0d 0e 0f 10 11  12 13 14 15 16 17 18 19
+                    1a 1b 1c 1d 1e 1f 20 e0  e1 e2 e3 e4 e5 e6 e7 e8
+                    e9 ea eb ec ed ee ef f0  f1 f2 f3 f4 f5 f6 f7 f8
+                    f9 fa fb fc fd fe ff 00  06 13 01 13 02 13 03 01
+                    00 00 77 00 00 00 18 00  16 00 00 13 65 78 61 6d
+                    70 6c 65 2e 75 6c 66 68  65 69 6d 2e 6e 65 74 00
+                    0a 00 08 00 06 00 1d 00  17 00 18 00 0d 00 14 00
+                    12 04 03 08 04 04 01 05  03 08 05 05 01 08 06 06
+                    01 02 01 00 33 00 26 00  24 00 1d 00 20 35 80 72
+                    d6 36 58 80 d1 ae ea 32  9a df 91 21 38 38 51 ed
+                    21 a2 8e 3b 75 e9 65 d0  d2 cd 16 62 54 00 2d 00
+                    02 01 01 00 2b 00 03 02  03 04"),
+
+    ServerHello =
+        hexstr2bin("02 00 00 76 03 03 70 71  72 73 74 75 76 77 78 79
+                    7a 7b 7c 7d 7e 7f 80 81  82 83 84 85 86 87 88 89
+                    8a 8b 8c 8d 8e 8f 20 e0  e1 e2 e3 e4 e5 e6 e7 e8
+                    e9 ea eb ec ed ee ef f0  f1 f2 f3 f4 f5 f6 f7 f8
+                    f9 fa fb fc fd fe ff 13  01 00 00 2e 00 33 00 24
+                    00 1d 00 20 9f d7 ad 6d  cf f4 29 8d d3 f9 6d 5b
+                    1b 2a f9 10 a0 53 5b 14  88 d7 f8 fa bb 34 9a 98
+                    28 80 b6 15 00 2b 00 02  03 04"),
+
+    EncryptedExtensions =
+        hexstr2bin("08 00 00 02 00 00"),
+
+    Certificate =
+        hexstr2bin("0b 00 03 2e 00 00 03 2a  00 03 25 30 82 03 21 30
+                    82 02 09 a0 03 02 01 02  02 08 15 5a 92 ad c2 04
+                    8f 90 30 0d 06 09 2a 86  48 86 f7 0d 01 01 0b 05
+                    00 30 22 31 0b 30 09 06  03 55 04 06 13 02 55 53
+                    31 13 30 11 06 03 55 04  0a 13 0a 45 78 61 6d 70
+                    6c 65 20 43 41 30 1e 17  0d 31 38 31 30 30 35 30
+                    31 33 38 31 37 5a 17 0d  31 39 31 30 30 35 30 31
+                    33 38 31 37 5a 30 2b 31  0b 30 09 06 03 55 04 06
+                    13 02 55 53 31 1c 30 1a  06 03 55 04 03 13 13 65
+                    78 61 6d 70 6c 65 2e 75  6c 66 68 65 69 6d 2e 6e
+                    65 74 30 82 01 22 30 0d  06 09 2a 86 48 86 f7 0d
+                    01 01 01 05 00 03 82 01  0f 00 30 82 01 0a 02 82
+                    01 01 00 c4 80 36 06 ba  e7 47 6b 08 94 04 ec a7
+                    b6 91 04 3f f7 92 bc 19  ee fb 7d 74 d7 a8 0d 00
+                    1e 7b 4b 3a 4a e6 0f e8  c0 71 fc 73 e7 02 4c 0d
+                    bc f4 bd d1 1d 39 6b ba  70 46 4a 13 e9 4a f8 3d
+                    f3 e1 09 59 54 7b c9 55  fb 41 2d a3 76 52 11 e1
+                    f3 dc 77 6c aa 53 37 6e  ca 3a ec be c3 aa b7 3b
+                    31 d5 6c b6 52 9c 80 98  bc c9 e0 28 18 e2 0b f7
+                    f8 a0 3a fd 17 04 50 9e  ce 79 bd 9f 39 f1 ea 69
+                    ec 47 97 2e 83 0f b5 ca  95 de 95 a1 e6 04 22 d5
+                    ee be 52 79 54 a1 e7 bf  8a 86 f6 46 6d 0d 9f 16
+                    95 1a 4c f7 a0 46 92 59  5c 13 52 f2 54 9e 5a fb
+                    4e bf d7 7a 37 95 01 44  e4 c0 26 87 4c 65 3e 40
+                    7d 7d 23 07 44 01 f4 84  ff d0 8f 7a 1f a0 52 10
+                    d1 f4 f0 d5 ce 79 70 29  32 e2 ca be 70 1f df ad
+                    6b 4b b7 11 01 f4 4b ad  66 6a 11 13 0f e2 ee 82
+                    9e 4d 02 9d c9 1c dd 67  16 db b9 06 18 86 ed c1
+                    ba 94 21 02 03 01 00 01  a3 52 30 50 30 0e 06 03
+                    55 1d 0f 01 01 ff 04 04  03 02 05 a0 30 1d 06 03
+                    55 1d 25 04 16 30 14 06  08 2b 06 01 05 05 07 03
+                    02 06 08 2b 06 01 05 05  07 03 01 30 1f 06 03 55
+                    1d 23 04 18 30 16 80 14  89 4f de 5b cc 69 e2 52
+                    cf 3e a3 00 df b1 97 b8  1d e1 c1 46 30 0d 06 09
+                    2a 86 48 86 f7 0d 01 01  0b 05 00 03 82 01 01 00
+                    59 16 45 a6 9a 2e 37 79  e4 f6 dd 27 1a ba 1c 0b
+                    fd 6c d7 55 99 b5 e7 c3  6e 53 3e ff 36 59 08 43
+                    24 c9 e7 a5 04 07 9d 39  e0 d4 29 87 ff e3 eb dd
+                    09 c1 cf 1d 91 44 55 87  0b 57 1d d1 9b df 1d 24
+                    f8 bb 9a 11 fe 80 fd 59  2b a0 39 8c de 11 e2 65
+                    1e 61 8c e5 98 fa 96 e5  37 2e ef 3d 24 8a fd e1
+                    74 63 eb bf ab b8 e4 d1  ab 50 2a 54 ec 00 64 e9
+                    2f 78 19 66 0d 3f 27 cf  20 9e 66 7f ce 5a e2 e4
+                    ac 99 c7 c9 38 18 f8 b2  51 07 22 df ed 97 f3 2e
+                    3e 93 49 d4 c6 6c 9e a6  39 6d 74 44 62 a0 6b 42
+                    c6 d5 ba 68 8e ac 3a 01  7b dd fc 8e 2c fc ad 27
+                    cb 69 d3 cc dc a2 80 41  44 65 d3 ae 34 8c e0 f3
+                    4a b2 fb 9c 61 83 71 31  2b 19 10 41 64 1c 23 7f
+                    11 a5 d6 5c 84 4f 04 04  84 99 38 71 2b 95 9e d6
+                    85 bc 5c 5d d6 45 ed 19  90 94 73 40 29 26 dc b4
+                    0e 34 69 a1 59 41 e8 e2  cc a8 4b b6 08 46 36 a0
+                    00 00"),
+
+    CertificateVerify =
+        hexstr2bin("0f 00 01 04 08 04 01 00  17 fe b5 33 ca 6d 00 7d
+                    00 58 25 79 68 42 4b bc  3a a6 90 9e 9d 49 55 75
+                    76 a5 20 e0 4a 5e f0 5f  0e 86 d2 4f f4 3f 8e b8
+                    61 ee f5 95 22 8d 70 32  aa 36 0f 71 4e 66 74 13
+                    92 6e f4 f8 b5 80 3b 69  e3 55 19 e3 b2 3f 43 73
+                    df ac 67 87 06 6d cb 47  56 b5 45 60 e0 88 6e 9b
+                    96 2c 4a d2 8d ab 26 ba  d1 ab c2 59 16 b0 9a f2
+                    86 53 7f 68 4f 80 8a ef  ee 73 04 6c b7 df 0a 84
+                    fb b5 96 7a ca 13 1f 4b  1c f3 89 79 94 03 a3 0c
+                    02 d2 9c bd ad b7 25 12  db 9c ec 2e 5e 1d 00 e5
+                    0c af cf 6f 21 09 1e bc  4f 25 3c 5e ab 01 a6 79
+                    ba ea be ed b9 c9 61 8f  66 00 6b 82 44 d6 62 2a
+                    aa 56 88 7c cf c6 6a 0f  38 51 df a1 3a 78 cf f7
+                    99 1e 03 cb 2c 3a 0e d8  7d 73 67 36 2e b7 80 5b
+                    00 b2 52 4f f2 98 a4 da  48 7c ac de af 8a 23 36
+                    c5 63 1b 3e fa 93 5b b4  11 e7 53 ca 13 b0 15 fe
+                    c7 e4 a7 30 f1 36 9f 9e"),
+
+    BaseKey =
+        hexstr2bin("a2 06 72 65 e7 f0 65 2a  92 3d 5d 72 ab 04 67 c4
+                    61 32 ee b9 68 b6 a3 2d  31 1c 80 58 68 54 88 14"),
+
+    VerifyData =
+        hexstr2bin("ea 6e e1 76 dc cc 4a f1  85 9e 9e 4e 93 f7 97 ea
+                    c9 a7 8c e4 39 30 1e 35  27 5a d4 3f 3c dd bd e3"),
+
+    Messages = [CertificateVerify,
+                Certificate,
+                EncryptedExtensions,
+                ServerHello,
+                ClientHello],
+
+    FinishedKey = tls_v1:finished_key(BaseKey, sha256),
+    VerifyData = tls_v1:finished_verify_data(FinishedKey, sha256, Messages).
+
+%%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
+%%--------------------------------------------------------------------
+
+hexstr2int(S) ->
+    B = hexstr2bin(S),
+    Bits = size(B) * 8,
+    <<Integer:Bits/integer>> = B,
+    Integer.
+
+hexstr2bin(S) when is_binary(S) ->
+    hexstr2bin(S, <<>>);
+hexstr2bin(S) ->
+    hexstr2bin(list_to_binary(S), <<>>).
+%%
+hexstr2bin(<<>>, Acc) ->
+    Acc;
+hexstr2bin(<<C,T/binary>>, Acc) when C =:= 32;   %% SPACE
+                                     C =:= 10;   %% LF
+                                     C =:= 13 -> %% CR
+    hexstr2bin(T, Acc);
+hexstr2bin(<<X,Y,T/binary>>, Acc) ->
+    I = hex2int(X) * 16 + hex2int(Y),
+    hexstr2bin(T, <<Acc/binary,I>>).
+
+hex2int(C) when $0 =< C, C =< $9 ->
+    C - $0;
+hex2int(C) when $A =< C, C =< $F ->
+    C - $A + 10;
+hex2int(C) when $a =< C, C =< $f ->
+    C - $a + 10.
diff --git a/lib/ssl/test/tls_1_3_version_SUITE.erl b/lib/ssl/test/tls_1_3_version_SUITE.erl
new file mode 100644
index 0000000000..f0b224d4e5
--- /dev/null
+++ b/lib/ssl/test/tls_1_3_version_SUITE.erl
@@ -0,0 +1,153 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019-2019. 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(tls_1_3_version_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() -> 
+    [
+     {group, 'tlsv1.3'}
+    ].
+
+groups() ->
+    [
+     {'tlsv1.3', [], cert_groups()},
+     {rsa, [], tests()},
+     {ecdsa, [], tests()}
+    ].
+
+cert_groups() ->
+    [{group, rsa},
+     {group, ecdsa}].
+
+tests() ->
+    [tls13_client_tls12_server,
+     tls13_client_with_ext_tls12_server,
+     tls12_client_tls13_server].
+    
+init_per_suite(Config) ->
+    catch crypto:stop(),
+    try crypto:start() of
+	ok ->
+            ssl_test_lib:clean_start(),
+	    [{client_type, erlang}, {server_type, erlang} | 
+             Config]
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:stop(crypto).
+
+init_per_group(rsa, Config0) ->
+    Config = ssl_test_lib:make_rsa_cert(Config0),
+    COpts = proplists:get_value(client_rsa_opts, Config),
+    SOpts = proplists:get_value(server_rsa_opts, Config),
+    [{client_cert_opts, COpts}, {server_cert_opts, SOpts} | 
+     lists:delete(server_cert_opts, lists:delete(client_cert_opts, Config))];
+init_per_group(ecdsa, Config0) ->
+    PKAlg = crypto:supports(public_keys),
+    case lists:member(ecdsa, PKAlg) andalso 
+        (lists:member(ecdh, PKAlg) orelse lists:member(dh, PKAlg)) of
+        true ->
+            Config = ssl_test_lib:make_ecdsa_cert(Config0),
+            COpts = proplists:get_value(client_ecdsa_opts, Config),
+            SOpts = proplists:get_value(server_ecdsa_opts, Config),
+            [{client_cert_opts, COpts}, {server_cert_opts, SOpts} | 
+             lists:delete(server_cert_opts, lists:delete(client_cert_opts, Config))];
+        false ->
+            {skip, "Missing EC crypto support"}
+    end;
+init_per_group(GroupName, Config) ->
+    ssl_test_lib:clean_tls_version(Config),                          
+    case ssl_test_lib:is_tls_version(GroupName) andalso 
+        ssl_test_lib:sufficient_crypto_support(GroupName) of
+	true ->
+	    ssl_test_lib:init_tls_version(GroupName, Config);
+	_ ->
+	    case ssl_test_lib:sufficient_crypto_support(GroupName) of
+		true ->
+		    ssl:start(),
+		    Config;
+		false ->
+		    {skip, "Missing crypto support"}
+	    end
+    end.
+
+end_per_group(GroupName, Config) ->
+  case ssl_test_lib:is_tls_version(GroupName) of
+      true ->
+          ssl_test_lib:clean_tls_version(Config);
+      false ->
+          Config
+  end.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+tls13_client_tls12_server() ->
+    [{doc,"Test that a TLS 1.3 client can connect to a TLS 1.2 server."}].
+
+tls13_client_tls12_server(Config) when is_list(Config) ->
+    ClientOpts = [{versions,
+                   ['tlsv1.3', 'tlsv1.2']} | ssl_test_lib:ssl_options(client_cert_opts, Config)],
+    ServerOpts =  [{versions,
+                   ['tlsv1.1', 'tlsv1.2']} | ssl_test_lib:ssl_options(server_cert_opts, Config)],
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+    
+tls13_client_with_ext_tls12_server() ->
+     [{doc,"Test basic connection between TLS 1.2 server and TLS 1.3 client when " 
+       "client has TLS 1.3 specsific extensions"}].
+
+tls13_client_with_ext_tls12_server(Config) ->
+    ClientOpts0 = ssl_test_lib:ssl_options(client_cert_opts, Config),
+    ServerOpts0 = ssl_test_lib:ssl_options(server_cert_opts, Config),
+  
+    ServerOpts = [{versions, ['tlsv1.2']}|ServerOpts0],
+    ClientOpts = [{versions, ['tlsv1.2','tlsv1.3']},
+                  {signature_algs_cert, [ecdsa_secp384r1_sha384,
+                                         ecdsa_secp256r1_sha256,
+                                         rsa_pss_rsae_sha256,
+                                         rsa_pkcs1_sha256,
+                                         {sha256,rsa},{sha256,dsa}]}|ClientOpts0],
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+   
+tls12_client_tls13_server() ->
+    [{doc,"Test that a TLS 1.2 client can connect to a TLS 1.3 server."}].
+
+tls12_client_tls13_server(Config) when is_list(Config) ->    
+    ClientOpts = [{versions,
+                   ['tlsv1.1', 'tlsv1.2']} | ssl_test_lib:ssl_options(client_cert_opts, Config)],
+    ServerOpts =  [{versions,
+                   ['tlsv1.3', 'tlsv1.2']} | ssl_test_lib:ssl_options(server_cert_opts, Config)],
+    ssl_test_lib:basic_test(ClientOpts, ServerOpts, Config).
+   
diff --git a/lib/ssl/test/tls_api_SUITE.erl b/lib/ssl/test/tls_api_SUITE.erl
new file mode 100644
index 0000000000..5a74ec1892
--- /dev/null
+++ b/lib/ssl/test/tls_api_SUITE.erl
@@ -0,0 +1,880 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2019-2019. 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(tls_api_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+-include_lib("common_test/include/ct.hrl").
+-include_lib("ssl/src/ssl_record.hrl").
+-include_lib("ssl/src/ssl_internal.hrl").
+-include_lib("ssl/src/ssl_api.hrl").
+-include_lib("ssl/src/tls_handshake.hrl").
+
+-define(SLEEP, 500).
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+
+all() ->
+    [
+     {group, 'tlsv1.3'},
+     {group, 'tlsv1.2'},
+     {group, 'tlsv1.1'},
+     {group, 'tlsv1'},
+     {group, 'sslv3'}
+    ].
+
+groups() ->
+    [
+     {'tlsv1.3', [], api_tests() -- [sockname]},
+     {'tlsv1.2', [],  api_tests()},
+     {'tlsv1.1', [],  api_tests()},
+     {'tlsv1', [],  api_tests()},
+     {'sslv3', [],  api_tests() ++ [ssl3_cipher_suite_limitation]}
+    ].
+
+api_tests() ->
+    [
+     tls_upgrade,
+     tls_upgrade_with_timeout,
+     tls_downgrade,
+     tls_shutdown,
+     tls_shutdown_write,
+     tls_shutdown_both,
+     tls_shutdown_error,
+     tls_client_closes_socket,
+     tls_closed_in_active_once,
+     tls_tcp_msg,
+     tls_tcp_msg_big,
+     tls_dont_crash_on_handshake_garbage,
+     tls_tcp_error_propagation_in_active_mode,
+     peername,
+     sockname,
+     tls_server_handshake_timeout,
+     transport_close,
+     emulated_options,
+     accept_pool,
+     reuseaddr
+    ].
+
+init_per_suite(Config0) ->
+    catch crypto:stop(),
+    try crypto:start() of
+	ok ->
+	    ssl_test_lib:clean_start(),
+	    ssl_test_lib:make_rsa_cert(Config0)
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:unload(ssl),
+    application:stop(crypto).
+
+
+init_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+	true ->
+	    case ssl_test_lib:sufficient_crypto_support(GroupName) of
+		true ->
+		    ssl_test_lib:init_tls_version(GroupName, Config);
+		false ->
+		    {skip, "Missing crypto support"}
+	    end;
+	_ ->
+	    ssl:start(),
+	    Config
+    end.
+
+end_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+        true ->
+            ssl_test_lib:clean_tls_version(Config);
+        false ->
+            Config
+    end.
+
+init_per_testcase(_TestCase, Config) ->
+    ssl_test_lib:ct_log_supported_protocol_versions(Config),
+    ct:timetrap({seconds, 10}),
+    Config.
+
+end_per_testcase(_TestCase, Config) ->     
+    Config.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+tls_upgrade() ->
+    [{doc,"Test that you can upgrade an tcp connection to an ssl connection"}].
+
+tls_upgrade(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    TcpOpts = [binary, {reuseaddr, true}],
+
+    Server = ssl_test_lib:start_upgrade_server([{node, ServerNode}, {port, 0}, 
+						{from, self()}, 
+						{mfa, {?MODULE, 
+						       upgrade_result, []}},
+						{tcp_options, 
+						 [{active, false} | TcpOpts]},
+						{ssl_options, [{verify, verify_peer} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_upgrade_client([{node, ClientNode}, 
+						{port, Port}, 
+				   {host, Hostname},
+				   {from, self()}, 
+				   {mfa, {?MODULE, upgrade_result, []}},
+				   {tcp_options, [binary]},
+				   {ssl_options,  [{verify, verify_peer},
+                                                   {server_name_indication, Hostname} | ClientOpts]}]),
+    
+    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
+		       [self(), Client, Server]),
+    
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+%%--------------------------------------------------------------------
+tls_upgrade_with_timeout() ->
+    [{doc,"Test ssl_accept/3"}].
+
+tls_upgrade_with_timeout(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    TcpOpts = [binary, {reuseaddr, true}],
+
+    Server = ssl_test_lib:start_upgrade_server([{node, ServerNode}, {port, 0}, 
+						{from, self()}, 
+						{timeout, 5000},
+						{mfa, {?MODULE, 
+						       upgrade_result, []}},
+						{tcp_options, 
+						 [{active, false} | TcpOpts]},
+						{ssl_options, [{verify, verify_peer} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_upgrade_client([{node, ClientNode}, 
+						{port, Port}, 
+						{host, Hostname},
+						{from, self()}, 
+						{mfa, {?MODULE, upgrade_result, []}},
+						{tcp_options, TcpOpts},
+						{ssl_options, [{verify, verify_peer},
+                                                               {server_name_indication, Hostname} | ClientOpts]}]),
+    
+    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
+		       [self(), Client, Server]),
+    
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+tls_downgrade() ->
+      [{doc,"Test that you can downgarde an ssl connection to an tcp connection"}].
+tls_downgrade(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+					{mfa, {?MODULE, tls_downgrade_result, [self()]}},
+					{options, [{active, false}, {verify, verify_peer} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, tls_downgrade_result, [self()]}},
+					{options, [{active, false}, {verify, verify_peer} | ClientOpts]}]),
+                                                   
+    ssl_test_lib:check_result(Server, ready, Client, ready),
+
+    Server ! go,
+    Client ! go,
+
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+
+%%--------------------------------------------------------------------
+tls_shutdown() ->
+    [{doc,"Test API function ssl:shutdown/2"}].
+tls_shutdown(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+					{from, self()}, 
+			   {mfa, {?MODULE, tls_shutdown_result, [server]}},
+			   {options, [{exit_on_close, false},
+				      {active, 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, tls_shutdown_result, [client]}},
+					{options, 
+					 [{exit_on_close, false},
+					  {active, false} | ClientOpts]}]),
+    
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+tls_shutdown_write() ->
+    [{doc,"Test API function ssl:shutdown/2 with option write."}].
+tls_shutdown_write(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+					{from, self()}, 
+			   {mfa, {?MODULE, tls_shutdown_write_result, [server]}},
+			   {options, [{active, 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, tls_shutdown_write_result, [client]}},
+			   {options, [{active, false} | ClientOpts]}]),
+    
+    ssl_test_lib:check_result(Server, ok, Client, {error, closed}).
+
+%%--------------------------------------------------------------------
+tls_shutdown_both() ->
+    [{doc,"Test API function ssl:shutdown/2 with option both."}].
+tls_shutdown_both(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+					{from, self()}, 
+			   {mfa, {?MODULE, tls_shutdown_both_result, [server]}},
+			   {options, [{active, 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, tls_shutdown_both_result, [client]}},
+			   {options, [{active, false} | ClientOpts]}]),
+    
+    ssl_test_lib:check_result(Server, ok, Client, {error, closed}).
+
+%%--------------------------------------------------------------------
+tls_shutdown_error() ->
+    [{doc,"Test ssl:shutdown/2 error handling"}].
+tls_shutdown_error(Config) when is_list(Config) ->
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    Port = ssl_test_lib:inet_port(node()),
+    {ok, Listen} = ssl:listen(Port, ServerOpts),
+    {error, enotconn} = ssl:shutdown(Listen, read_write),
+    ok = ssl:close(Listen),
+    {error, closed} = ssl:shutdown(Listen, read_write).
+%%--------------------------------------------------------------------
+tls_client_closes_socket() ->
+    [{doc,"Test what happens when client closes socket before handshake is compleated"}].
+
+tls_client_closes_socket(Config) when is_list(Config) -> 
+    ServerOpts = ssl_test_lib:ssl_options(server_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    TcpOpts = [binary, {reuseaddr, true}],
+    
+    Server = ssl_test_lib:start_upgrade_server_error([{node, ServerNode}, {port, 0}, 
+						      {from, self()}, 
+						      {tcp_options, TcpOpts},
+						      {ssl_options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+
+    Connect = fun() ->
+		      {ok, _Socket} = rpc:call(ClientNode, gen_tcp, connect, 
+					      [Hostname, Port, [binary]]),	      
+		      %% Make sure that ssl_accept is called before 
+		      %% client process ends and closes socket.
+		      ct:sleep(?SLEEP)
+	      end,
+    
+    _Client = spawn_link(Connect),
+
+    ssl_test_lib:check_result(Server, {error,closed}).
+
+%%--------------------------------------------------------------------
+tls_closed_in_active_once() ->
+    [{doc, "Test that ssl_closed is delivered in active once with non-empty buffer, check ERL-420."}].
+
+tls_closed_in_active_once(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {_ClientNode, _ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    TcpOpts = [binary, {reuseaddr, true}],
+    Port = ssl_test_lib:inet_port(node()),
+    Server = fun() ->
+		     {ok, Listen} = gen_tcp:listen(Port, TcpOpts),
+		     {ok, TcpServerSocket} = gen_tcp:accept(Listen),
+		     {ok, ServerSocket} = ssl:handshake(TcpServerSocket, ServerOpts),
+		     lists:foreach(
+		       fun(_) ->
+			       ssl:send(ServerSocket, "some random message\r\n")
+		       end, lists:seq(1, 20)),
+		     %% Close TCP instead of SSL socket to trigger the bug:
+		     gen_tcp:close(TcpServerSocket),
+		     gen_tcp:close(Listen)
+	     end,
+    spawn_link(Server),
+    {ok, Socket} = ssl:connect(Hostname, Port, [{active, false} | ClientOpts]),
+    Result = tls_closed_in_active_once_loop(Socket),
+    ssl:close(Socket),
+    case Result of
+	ok -> ok;
+	_ -> ct:fail(Result)
+    end.
+%%--------------------------------------------------------------------
+tls_tcp_msg() ->
+    [{doc,"Test what happens when a tcp tries to connect, i,e. a bad (ssl) packet is sent first"}].
+
+tls_tcp_msg(Config) when is_list(Config) ->
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    TcpOpts = [binary, {reuseaddr, true}, {active, false}],
+
+    Server = ssl_test_lib:start_upgrade_server_error([{node, ServerNode}, {port, 0},
+						      {from, self()},
+						      {timeout, 5000},
+						      {mfa, {?MODULE, dummy, []}},
+						      {tcp_options, TcpOpts},
+						      {ssl_options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+
+    {ok, Socket} = gen_tcp:connect(Hostname, Port, [binary, {packet, 0}]),
+    ct:log("Testcase ~p connected to Server ~p ~n", [self(), Server]),
+    gen_tcp:send(Socket, "<SOME GARBLED NON SSL MESSAGE>"),
+
+    receive 
+	{tcp_closed, Socket} ->
+	    receive 
+		{Server, {error, Error}} ->
+		    ct:log("Error ~p", [Error])
+	    end
+    end.
+%%--------------------------------------------------------------------
+tls_tcp_msg_big() ->
+    [{doc,"Test what happens when a tcp tries to connect, i,e. a bad big (ssl) packet is sent first"}].
+
+tls_tcp_msg_big(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    TcpOpts = [binary, {reuseaddr, true}],
+
+    Rand = crypto:strong_rand_bytes(?MAX_CIPHER_TEXT_LENGTH+1),
+    Server = ssl_test_lib:start_upgrade_server_error([{node, ServerNode}, {port, 0},
+						      {from, self()},
+						      {timeout, 5000},
+						      {mfa, {?MODULE, dummy, []}},
+						      {tcp_options, TcpOpts},
+						      {ssl_options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+
+    {ok, Socket} = gen_tcp:connect(Hostname, Port, [binary, {packet, 0}]),
+    ct:log("Testcase ~p connected to Server ~p ~n", [self(), Server]),
+
+    gen_tcp:send(Socket, <<?BYTE(0),
+			   ?BYTE(3), ?BYTE(1), ?UINT16(?MAX_CIPHER_TEXT_LENGTH), Rand/binary>>),
+
+    receive
+	{tcp_closed, Socket} ->
+	    receive
+		{Server, {error, timeout}} ->
+		    ct:fail("hangs");
+		{Server, {error, Error}} ->
+		    ct:log("Error ~p", [Error]);
+		{'EXIT', Server, _} ->
+		    ok	 
+	    end
+    end.
+
+%%--------------------------------------------------------------------
+tls_dont_crash_on_handshake_garbage() ->
+    [{doc, "Ensure SSL server worker thows an alert on garbage during handshake "
+      "instead of crashing and exposing state to user code"}].
+
+tls_dont_crash_on_handshake_garbage(Config) ->
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, 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, ServerOpts}]),
+    unlink(Server), monitor(process, Server),
+    Port = ssl_test_lib:inet_port(Server),
+
+    {ok, Socket} = gen_tcp:connect(Hostname, Port, [binary, {active, false}]),
+
+    % Send hello and garbage record
+    ok = gen_tcp:send(Socket,
+                      [<<22, 3,3, 49:16, 1, 45:24, 3,3, % client_hello
+                         16#deadbeef:256, % 32 'random' bytes = 256 bits
+                         0, 6:16, 0,255, 0,61, 0,57, 1, 0 >>, % some hello values
+
+                       <<22, 3,3, 5:16, 92,64,37,228,209>> % garbage
+                      ]),
+    % Send unexpected change_cipher_spec
+    ok = gen_tcp:send(Socket, <<20, 3,3, 12:16, 111,40,244,7,137,224,16,109,197,110,249,152>>),
+
+    % Ensure we receive an alert, not sudden disconnect
+    {ok, <<21, _/binary>>} = drop_handshakes(Socket, 1000).
+
+%%--------------------------------------------------------------------
+tls_tcp_error_propagation_in_active_mode() ->
+    [{doc,"Test that process recives {ssl_error, Socket, closed} when tcp error ocurres"}].
+tls_tcp_error_propagation_in_active_mode(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, 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, no_result, []}},
+					 {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    {Client, #sslsocket{pid=[Pid|_]} = SslSocket} = ssl_test_lib:start_client([return_socket,
+                                                                               {node, ClientNode}, {port, Port},
+                                                                               {host, Hostname},
+                                                                               {from, self()},
+                                                                               {mfa, {?MODULE, receive_msg, []}},
+                                                                               {options, ClientOpts}]),
+    
+    {status, _, _, StatusInfo} = sys:get_status(Pid),
+    [_, _,_, _, Prop] = StatusInfo,
+    State = ssl_test_lib:state(Prop),
+    StaticEnv = element(2, State),
+    Socket = element(11, StaticEnv),
+    %% Fake tcp error
+    Pid ! {tcp_error, Socket, etimedout},
+
+    ssl_test_lib:check_result(Client, {ssl_closed, SslSocket}).
+
+%%--------------------------------------------------------------------
+peername() ->
+    [{doc,"Test API function peername/1"}].
+
+peername(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+					{from, self()}, 
+			   {mfa, {?MODULE, peername_result, []}},
+			   {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
+					{host, Hostname},
+					{from, self()}, 
+					{mfa, {?MODULE, peername_result, []}},
+					{options, [{port, 0} | ClientOpts]}]),
+    
+    ClientPort = ssl_test_lib:inet_port(Client),
+    ServerIp = ssl_test_lib:node_to_hostip(ServerNode, server),
+    ClientIp = ssl_test_lib:node_to_hostip(ClientNode, client),
+    ServerMsg = {ok, {ClientIp, ClientPort}},
+    ClientMsg = {ok, {ServerIp, Port}},
+
+    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
+		       [self(), Client, Server]),
+
+    ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
+    
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+sockname() ->
+    [{doc,"Test API function sockname/1"}].
+sockname(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+					{from, self()}, 
+			   {mfa, {?MODULE, sockname_result, []}},
+			   {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
+					{host, Hostname},
+                                        {from, self()}, 
+                                        {mfa, {?MODULE, sockname_result, []}},
+                                        {options, [{port, 0} | ClientOpts]}]),
+                                       
+    ClientPort = ssl_test_lib:inet_port(Client),
+    ServerIp = ssl_test_lib:node_to_hostip(ServerNode, server),
+    ClientIp = ssl_test_lib:node_to_hostip(ClientNode, client),
+    ServerMsg = {ok, {ServerIp, Port}},
+    ClientMsg = {ok, {ClientIp, ClientPort}},
+			   
+    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
+			 [self(), Client, Server]),
+    
+    ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
+    
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+%%--------------------------------------------------------------------
+tls_server_handshake_timeout() ->
+    [{doc,"Test server handshake timeout"}].
+
+tls_server_handshake_timeout(Config) ->
+    process_flag(trap_exit, true),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+					{from, self()},
+					{timeout, 5000},
+					{mfa, {ssl_test_lib,
+					       no_result_msg, []}},
+					{options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    {ok, CSocket} = gen_tcp:connect(Hostname, Port, [binary, {active, true}]),
+
+    receive
+	{tcp_closed, CSocket} ->
+	    ssl_test_lib:check_result(Server, {error, timeout}),
+	    receive
+		{'EXIT', Server, _} ->
+		    %% Make sure supervisor had time to react on process exit
+		    %% Could we come up with a better solution to this?
+		    ct:sleep(500), 
+		    [] = supervisor:which_children(tls_connection_sup)
+	    end
+    end.
+transport_close() ->
+    [{doc, "Test what happens if socket is closed on TCP level after a while of normal operation"}].
+transport_close(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, 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, []}},
+				   {options,  [{active, false} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    {ok, TcpS} = rpc:call(ClientNode, gen_tcp, connect, 
+			  [Hostname,Port,[binary, {active, false}]]),
+    {ok, SslS} = rpc:call(ClientNode, ssl, connect, 
+			  [TcpS,[{active, false}|ClientOpts]]),
+    
+    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
+		       [self(), self(), Server]),
+    ok = ssl:send(SslS, "Hello world"),      
+    {ok,<<"Hello world">>} = ssl:recv(SslS, 11),    
+    gen_tcp:close(TcpS),    
+    {error, _} = ssl:send(SslS, "Hello world").
+
+%%--------------------------------------------------------------------
+ssl3_cipher_suite_limitation()  ->
+    [{doc,"Test a SSLv3 client cannot negotiate a TLSv* cipher suite."}].
+ssl3_cipher_suite_limitation(Config) when is_list(Config) ->
+    
+    {_ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    
+    Server = ssl_test_lib:start_server_error([{node, ServerNode}, {port, 0},
+					      {from, self()},
+					      {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    
+    {ok, Socket} = gen_tcp:connect(Hostname, Port, [binary, {active, false}]),
+    ok = gen_tcp:send(Socket, 
+		      <<22, 3,0, 49:16, % handshake, SSL 3.0, length
+			1, 45:24, % client_hello, length
+			3,0, % SSL 3.0
+			16#deadbeef:256, % 32 'random' bytes = 256 bits
+			0, % no session ID
+			%% three cipher suites -- null, one with sha256 hash and one with sha hash
+			6:16, 0,255, 0,61, 0,57, 
+			1, 0 % no compression
+		      >>),
+    {ok, <<22, RecMajor:8, RecMinor:8, _RecLen:16, 2, HelloLen:24>>} = gen_tcp:recv(Socket, 9, 10000),
+    {ok, <<HelloBin:HelloLen/binary>>} = gen_tcp:recv(Socket, HelloLen, 5000),
+    ServerHello = tls_handshake:decode_handshake({RecMajor, RecMinor}, 2, HelloBin),
+    case ServerHello of
+	#server_hello{server_version = {3,0}, cipher_suite = <<0,57>>} -> 
+	    ok;
+	_ ->
+	    ct:fail({unexpected_server_hello, ServerHello})
+    end.
+%%--------------------------------------------------------------------
+emulated_options() ->
+    [{doc,"Test API function getopts/2 and setopts/2"}].
+
+emulated_options(Config) when is_list(Config) -> 
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Values = [{mode, list}, {packet, 0}, {header, 0},
+		      {active, true}],    
+    %% Shall be the reverse order of Values! 
+    Options = [active, header, packet, mode],
+    
+    NewValues = [{mode, binary}, {active, once}],
+    %% Shall be the reverse order of NewValues! 
+    NewOptions = [active, mode],
+    
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+					{from, self()}, 
+			   {mfa, {?MODULE, tls_socket_options_result, 
+				  [Options, Values, NewOptions, NewValues]}},
+			   {options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
+					{host, Hostname},
+			   {from, self()}, 
+			   {mfa, {?MODULE, tls_socket_options_result, 
+				  [Options, Values, NewOptions, NewValues]}},
+			   {options, ClientOpts}]),
+    
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+
+    ssl_test_lib:close(Server),
+    
+    {ok, Listen} = ssl:listen(0, ServerOpts),
+    {ok,[{mode,list}]} = ssl:getopts(Listen, [mode]),
+    ok = ssl:setopts(Listen, [{mode, binary}]),
+    {ok,[{mode, binary}]} = ssl:getopts(Listen, [mode]),
+    {ok,[{recbuf, _}]} = ssl:getopts(Listen, [recbuf]),
+    ssl:close(Listen).
+accept_pool() ->
+    [{doc,"Test having an accept pool."}].
+accept_pool(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),  
+
+    {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
+    Server0 = ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, 
+					{from, self()}, 
+					{accepters, 3},
+					{mfa, {ssl_test_lib, send_recv_result_active, []}},
+					{options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server0),
+    [Server1, Server2] = ssl_test_lib:accepters(2),
+
+    Client0 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
+					 {host, Hostname},
+					 {from, self()}, 
+					 {mfa, {ssl_test_lib, send_recv_result_active, []}},
+					 {options, ClientOpts}
+					]),
+    
+    Client1 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
+					 {host, Hostname},
+					 {from, self()}, 
+					 {mfa, {ssl_test_lib, send_recv_result_active, []}},
+					 {options, ClientOpts}
+					]),
+    
+    Client2 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
+					 {host, Hostname},
+					 {from, self()}, 
+					 {mfa, {ssl_test_lib, send_recv_result_active, []}},
+					 {options, ClientOpts}
+					]),
+
+    ssl_test_lib:check_ok([Server0, Server1, Server2, Client0, Client1, Client2]),
+    
+    ssl_test_lib:close(Server0),
+    ssl_test_lib:close(Server1),
+    ssl_test_lib:close(Server2),
+    ssl_test_lib:close(Client0),
+    ssl_test_lib:close(Client1),
+    ssl_test_lib:close(Client2).
+
+%%--------------------------------------------------------------------
+reuseaddr() ->
+    [{doc,"Test reuseaddr option"}].
+
+reuseaddr(Config) when is_list(Config) ->
+    ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
+    ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, 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, no_result, []}},
+				   {options,  [{active, false}, {reuseaddr, true}| ServerOpts]}]),
+    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, no_result, []}},
+				   {options, [{active, false} | ClientOpts]}]),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client),
+    
+    Server1 =
+	ssl_test_lib:start_server([{node, ServerNode}, {port, Port},
+				   {from, self()},
+				   {mfa, {ssl_test_lib, send_recv_result, []}},
+				   {options,  [{active, false}, {reuseaddr, true} | ServerOpts]}]),
+    Client1 =
+	ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+				   {host, Hostname},
+				   {from, self()},
+				   {mfa, {ssl_test_lib, send_recv_result, []}},
+				   {options, [{active, false} | ClientOpts]}]),
+
+    ssl_test_lib:check_result(Server1, ok, Client1, ok),
+    ssl_test_lib:close(Server1),
+    ssl_test_lib:close(Client1).
+
+%%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
+%%--------------------------------------------------------------------
+
+upgrade_result(Socket) ->
+    ssl:setopts(Socket, [{active, true}]),
+    ok = ssl:send(Socket, "Hello world"),
+    %% Make sure binary is inherited from tcp socket and that we do
+    %% not get the list default!
+    receive 
+	{ssl, _, <<"H">>} ->
+	    receive 
+		{ssl, _, <<"ello world">>} ->
+		    ok
+	    end;
+	{ssl, _, <<"Hello world">>}  ->
+	    ok
+    end.
+tls_downgrade_result(Socket, Pid) ->
+    ok = ssl_test_lib:send_recv_result(Socket),
+    Pid ! {self(), ready},
+    receive 
+        go ->
+            ok
+    end,
+    case ssl:close(Socket, {self(), 10000})  of
+	{ok, TCPSocket} -> 
+            inet:setopts(TCPSocket, [{active, true}]),
+	    gen_tcp:send(TCPSocket, "Downgraded"),
+            receive 
+                {tcp, TCPSocket, <<"Downgraded">>} ->
+	             ok;
+                {tcp_closed, TCPSocket} ->
+                    ct:fail("Peer timed out, downgrade aborted"),
+	            ok;
+	        Other ->
+                    {error, Other}
+            end;
+	{error, timeout} ->
+	    ct:fail("Timed out, downgrade aborted"),
+	    ok;
+	Fail ->
+	    {error, Fail}
+    end.
+
+tls_shutdown_result(Socket, server) ->
+    ssl:send(Socket, "Hej"),
+    ok = ssl:shutdown(Socket, write),
+    {ok, "Hej hopp"} = ssl:recv(Socket, 8),
+    ok;
+
+tls_shutdown_result(Socket, client) ->
+    ssl:send(Socket, "Hej hopp"),
+    ok = ssl:shutdown(Socket, write),
+    {ok, "Hej"} = ssl:recv(Socket, 3),
+    ok.
+
+tls_shutdown_write_result(Socket, server) ->
+    ct:sleep(?SLEEP),
+    ssl:shutdown(Socket, write);
+tls_shutdown_write_result(Socket, client) ->
+    ssl:recv(Socket, 0).
+
+tls_shutdown_both_result(Socket, server) ->
+    ct:sleep(?SLEEP),
+    ssl:shutdown(Socket, read_write);
+tls_shutdown_both_result(Socket, client) ->
+    ssl:recv(Socket, 0).
+
+tls_closed_in_active_once_loop(Socket) ->
+    case ssl:setopts(Socket, [{active, once}]) of
+        ok ->
+            receive
+                {ssl, Socket, _} ->
+                    tls_closed_in_active_once_loop(Socket);
+                {ssl_closed, Socket} ->
+                    ok
+            after 5000 ->
+                    no_ssl_closed_received
+            end;
+        {error, closed} ->
+            ok
+    end.
+
+drop_handshakes(Socket, Timeout) ->
+    {ok, <<RecType:8, _RecMajor:8, _RecMinor:8, RecLen:16>> = Header} = gen_tcp:recv(Socket, 5, Timeout),
+    {ok, <<Frag:RecLen/binary>>} = gen_tcp:recv(Socket, RecLen, Timeout),
+    case RecType of
+        22 -> drop_handshakes(Socket, Timeout);
+        _ -> {ok, <<Header/binary, Frag/binary>>}
+    end.
+
+receive_msg(_) ->
+    receive
+	Msg ->
+	   Msg
+    end.
+ 
+sockname_result(S) ->
+    ssl:sockname(S).
+
+peername_result(S) ->
+    ssl:peername(S).
+
+tls_socket_options_result(Socket, Options, DefaultValues, NewOptions, NewValues) ->
+    %% Test get/set emulated opts
+    {ok, DefaultValues} = ssl:getopts(Socket, Options), 
+    ssl:setopts(Socket, NewValues),
+    {ok, NewValues} = ssl:getopts(Socket, NewOptions),
+    %% Test get/set inet opts
+    {ok,[{nodelay,false}]} = ssl:getopts(Socket, [nodelay]),  
+    ssl:setopts(Socket, [{nodelay, true}]),
+    {ok,[{nodelay, true}]} = ssl:getopts(Socket, [nodelay]),
+    {ok, All} = ssl:getopts(Socket, []),
+    ct:log("All opts ~p~n", [All]),
+    ok.
+	
diff --git a/lib/ssl/test/x509_test.erl b/lib/ssl/test/x509_test.erl
index fea01efdaf..faf223ae35 100644
--- a/lib/ssl/test/x509_test.erl
+++ b/lib/ssl/test/x509_test.erl
@@ -22,7 +22,7 @@
 
  -module(x509_test).
 
- -include_lib("public_key/include/public_key.hrl").
+-include_lib("public_key/include/public_key.hrl").
 
 -export([extensions/1, gen_pem_config_files/3]).
 
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 75d959accf..c9547cae36 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 9.1
+SSL_VSN = 9.3.5
diff --git a/lib/stdlib/doc/src/array.xml b/lib/stdlib/doc/src/array.xml
index db0ab42372..aa1577a067 100644
--- a/lib/stdlib/doc/src/array.xml
+++ b/lib/stdlib/doc/src/array.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>array.xml</file>
   </header>
-  <module>array</module>
+  <module since="">array</module>
   <modulesummary>Functional, extendible arrays.</modulesummary>
   <description>
     <p>Functional, extendible arrays. Arrays can have fixed size, or can grow
@@ -137,7 +137,7 @@ A3 = array:fix(A2).</pre>
 
   <funcs>
     <func>
-      <name name="default" arity="1"/>
+      <name name="default" arity="1" since=""/>
       <fsummary>Get the value used for uninitialized entries.</fsummary>
       <desc><marker id="default-1"/>
         <p>Gets the value used for uninitialized entries.</p>
@@ -146,7 +146,7 @@ A3 = array:fix(A2).</pre>
     </func>
 
     <func>
-      <name name="fix" arity="1"/>
+      <name name="fix" arity="1" since=""/>
       <fsummary>Fix the array size.</fsummary>
       <desc><marker id="fix-1"/>
         <p>Fixes the array size. This prevents it from growing automatically
@@ -157,7 +157,7 @@ A3 = array:fix(A2).</pre>
     </func>
 
     <func>
-      <name name="foldl" arity="3"/>
+      <name name="foldl" arity="3" since=""/>
       <fsummary>Fold the array elements using the specified function and initial
         accumulator value.</fsummary>
       <desc><marker id="foldl-3"/>
@@ -172,7 +172,7 @@ A3 = array:fix(A2).</pre>
     </func>
 
     <func>
-      <name name="foldr" arity="3"/>
+      <name name="foldr" arity="3" since=""/>
       <fsummary>Fold the array elements right-to-left using the specified
         function and initial accumulator value.</fsummary>
       <desc><marker id="foldr-3"/>
@@ -186,7 +186,7 @@ A3 = array:fix(A2).</pre>
     </func>
 
     <func>
-      <name name="from_list" arity="1"/>
+      <name name="from_list" arity="1" since=""/>
       <fsummary>Equivalent to <c>from_list(List, undefined)</c>.</fsummary>
       <desc><marker id="from_list-1"/>
         <p>Equivalent to
@@ -195,7 +195,7 @@ A3 = array:fix(A2).</pre>
     </func>
 
     <func>
-      <name name="from_list" arity="2"/>
+      <name name="from_list" arity="2" since=""/>
       <fsummary>Convert a list to an extendible array.</fsummary>
       <desc><marker id="from_list-2"/>
         <p>Converts a list to an extendible array. <c><anno>Default</anno></c>
@@ -208,7 +208,7 @@ A3 = array:fix(A2).</pre>
     </func>
 
     <func>
-      <name name="from_orddict" arity="1"/>
+      <name name="from_orddict" arity="1" since=""/>
       <fsummary>Equivalent to <c>from_orddict(Orddict, undefined)</c>.
       </fsummary>
       <desc><marker id="from_orddict-1"/>
@@ -218,7 +218,7 @@ A3 = array:fix(A2).</pre>
     </func>
 
     <func>
-      <name name="from_orddict" arity="2"/>
+      <name name="from_orddict" arity="2" since=""/>
       <fsummary>Convert an ordered list of pairs <c>{Index, Value}</c> to a
         corresponding extendible array.</fsummary>
       <desc><marker id="from_orddict-2"/>
@@ -234,7 +234,7 @@ A3 = array:fix(A2).</pre>
     </func>
 
     <func>
-      <name name="get" arity="2"/>
+      <name name="get" arity="2" since=""/>
       <fsummary>Get the value of entry <c>I</c>.</fsummary>
       <desc><marker id="get-2"/>
         <p>Gets the value of entry <c><anno>I</anno></c>. If
@@ -249,7 +249,7 @@ A3 = array:fix(A2).</pre>
     </func>
 
     <func>
-      <name name="is_array" arity="1"/>
+      <name name="is_array" arity="1" since=""/>
       <fsummary>Returns <c>true</c> if <c>X</c> is an array, otherwise
         <c>false</c>.</fsummary>
       <desc><marker id="is_array-1"/>
@@ -261,7 +261,7 @@ A3 = array:fix(A2).</pre>
     </func>
 
     <func>
-      <name name="is_fix" arity="1"/>
+      <name name="is_fix" arity="1" since=""/>
       <fsummary>Check if the array has fixed size.</fsummary>
       <desc><marker id="is_fix-1"/>
         <p>Checks if the array has fixed size. Returns <c>true</c> if the array
@@ -271,7 +271,7 @@ A3 = array:fix(A2).</pre>
     </func>
 
     <func>
-      <name name="map" arity="2"/>
+      <name name="map" arity="2" since=""/>
       <fsummary>Map the specified function onto each array element.</fsummary>
       <desc><marker id="map-2"/>
         <p>Maps the specified function onto each array element. The elements are
@@ -285,7 +285,7 @@ A3 = array:fix(A2).</pre>
     </func>
 
     <func>
-      <name name="new" arity="0"/>
+      <name name="new" arity="0" since=""/>
       <fsummary>Create a new, extendible array with initial size zero.
       </fsummary>
       <desc><marker id="new-0"/>
@@ -296,7 +296,7 @@ A3 = array:fix(A2).</pre>
     </func>
 
     <func>
-      <name name="new" arity="1"/>
+      <name name="new" arity="1" since=""/>
       <fsummary>Create a new array according to the specified options.
       </fsummary>
       <desc><marker id="new-1"/>
@@ -346,7 +346,7 @@ array:new([{size,10},{fixed,false},{default,-1}])</pre>
     </func>
 
     <func>
-      <name name="new" arity="2"/>
+      <name name="new" arity="2" since=""/>
       <fsummary>Create a new array according to the specified size and options.
       </fsummary>
       <desc><marker id="new-2"/>
@@ -370,7 +370,7 @@ array:new(100, {default,0})</pre>
     </func>
 
     <func>
-      <name name="relax" arity="1"/>
+      <name name="relax" arity="1" since=""/>
       <fsummary>Make the array resizable.</fsummary>
       <desc><marker id="relax-1"/>
         <p>Makes the array resizable. (Reverses the effects of
@@ -380,7 +380,7 @@ array:new(100, {default,0})</pre>
     </func>
 
     <func>
-      <name name="reset" arity="2"/>
+      <name name="reset" arity="2" since=""/>
       <fsummary>Reset entry <c>I</c> to the default value for the array.
       </fsummary>
       <desc><marker id="reset-2"/>
@@ -399,7 +399,7 @@ array:new(100, {default,0})</pre>
     </func>
 
     <func>
-      <name name="resize" arity="1"/>
+      <name name="resize" arity="1" since=""/>
       <fsummary>Change the array size to that reported by <c>sparse_size/1</c>.
       </fsummary>
       <desc><marker id="resize-1"/>
@@ -413,7 +413,7 @@ array:new(100, {default,0})</pre>
     </func>
 
     <func>
-      <name name="resize" arity="2"/>
+      <name name="resize" arity="2" since=""/>
       <fsummary>Change the array size.</fsummary>
       <desc><marker id="resize-2"/>
         <p>Change the array size. If <c><anno>Size</anno></c> is not a
@@ -424,7 +424,7 @@ array:new(100, {default,0})</pre>
     </func>
 
     <func>
-      <name name="set" arity="3"/>
+      <name name="set" arity="3" since=""/>
       <fsummary>Set entry <c>I</c> of the array to <c>Value</c>.</fsummary>
       <desc><marker id="set-3"/>
         <p>Sets entry <c><anno>I</anno></c> of the array to
@@ -441,7 +441,7 @@ array:new(100, {default,0})</pre>
     </func>
 
     <func>
-      <name name="size" arity="1"/>
+      <name name="size" arity="1" since=""/>
       <fsummary>Get the number of entries in the array.</fsummary>
       <desc><marker id="size-1"/>
         <p>Gets the number of entries in the array. Entries are numbered from
@@ -454,7 +454,7 @@ array:new(100, {default,0})</pre>
     </func>
 
     <func>
-      <name name="sparse_foldl" arity="3"/>
+      <name name="sparse_foldl" arity="3" since=""/>
       <fsummary>Fold the array elements using the specified function and initial
         accumulator value, skipping default-valued entries.</fsummary>
       <desc><marker id="sparse_foldl-3"/>
@@ -469,7 +469,7 @@ array:new(100, {default,0})</pre>
     </func>
 
     <func>
-      <name name="sparse_foldr" arity="3"/>
+      <name name="sparse_foldr" arity="3" since=""/>
       <fsummary>Fold the array elements right-to-left using the specified
         function and initial accumulator value, skipping default-valued
         entries.</fsummary>
@@ -485,7 +485,7 @@ array:new(100, {default,0})</pre>
     </func>
 
     <func>
-      <name name="sparse_map" arity="2"/>
+      <name name="sparse_map" arity="2" since=""/>
       <fsummary>Map the specified function onto each array element, skipping
         default-valued entries.</fsummary>
       <desc><marker id="sparse_map-2"/>
@@ -498,7 +498,7 @@ array:new(100, {default,0})</pre>
     </func>
 
     <func>
-      <name name="sparse_size" arity="1"/>
+      <name name="sparse_size" arity="1" since=""/>
       <fsummary>Get the number of entries in the array up until the last
         non-default-valued entry.</fsummary>
       <desc><marker id="sparse_size-1"/>
@@ -512,7 +512,7 @@ array:new(100, {default,0})</pre>
     </func>
 
     <func>
-      <name name="sparse_to_list" arity="1"/>
+      <name name="sparse_to_list" arity="1" since=""/>
       <fsummary>Convert the array to a list, skipping default-valued entries.
       </fsummary>
       <desc><marker id="sparse_to_list-1"/>
@@ -522,7 +522,7 @@ array:new(100, {default,0})</pre>
     </func>
 
     <func>
-      <name name="sparse_to_orddict" arity="1"/>
+      <name name="sparse_to_orddict" arity="1" since=""/>
       <fsummary>Convert the array to an ordered list of pairs <c>{Index,
         Value}</c>, skipping default-valued entries.</fsummary>
       <desc><marker id="sparse_to_orddict-1"/>
@@ -534,7 +534,7 @@ array:new(100, {default,0})</pre>
     </func>
 
     <func>
-      <name name="to_list" arity="1"/>
+      <name name="to_list" arity="1" since=""/>
       <fsummary>Convert the array to a list.</fsummary>
       <desc><marker id="to_list-1"/>
         <p>Converts the array to a list.</p>
@@ -545,7 +545,7 @@ array:new(100, {default,0})</pre>
     </func>
 
     <func>
-      <name name="to_orddict" arity="1"/>
+      <name name="to_orddict" arity="1" since=""/>
       <fsummary>Convert the array to an ordered list of pairs <c>{Index,
         Value}</c>.</fsummary>
       <desc><marker id="to_orddict-1"/>
diff --git a/lib/stdlib/doc/src/base64.xml b/lib/stdlib/doc/src/base64.xml
index cfa1ecc006..479072ba4f 100644
--- a/lib/stdlib/doc/src/base64.xml
+++ b/lib/stdlib/doc/src/base64.xml
@@ -29,7 +29,7 @@
     <rev></rev>
     <file>base64.xml</file>
   </header>
-  <module>base64</module>
+  <module since="">base64</module>
   <modulesummary>Provides base64 encode and decode, see
     RFC 2045.</modulesummary>
   <description>
@@ -51,10 +51,10 @@
 
   <funcs>
     <func>
-      <name name="decode" arity="1"/>
-      <name name="decode_to_string" arity="1"/>
-      <name name="mime_decode" arity="1"/>
-      <name name="mime_decode_to_string" arity="1"/>
+      <name name="decode" arity="1" since=""/>
+      <name name="decode_to_string" arity="1" since=""/>
+      <name name="mime_decode" arity="1" since=""/>
+      <name name="mime_decode_to_string" arity="1" since=""/>
       <fsummary>Decode a base64 encoded string to data.</fsummary>
       <type variable="Base64" name_i="1"/>
       <type variable="Data" name_i="1"/>
@@ -69,8 +69,8 @@
     </func>
 
     <func>
-      <name name="encode" arity="1"/>
-      <name name="encode_to_string" arity="1"/>
+      <name name="encode" arity="1" since=""/>
+      <name name="encode_to_string" arity="1" since=""/>
       <fsummary>Encode data into base64.</fsummary>
       <type variable="Data"/>
       <type variable="Base64" name_i="1"/>
diff --git a/lib/stdlib/doc/src/beam_lib.xml b/lib/stdlib/doc/src/beam_lib.xml
index 213170df7f..bb44ca3201 100644
--- a/lib/stdlib/doc/src/beam_lib.xml
+++ b/lib/stdlib/doc/src/beam_lib.xml
@@ -28,7 +28,7 @@
     <date>1999-10-30</date>
     <rev>PA1</rev>
   </header>
-  <module>beam_lib</module>
+  <module since="">beam_lib</module>
   <modulesummary>An interface to the BEAM file format.</modulesummary>
   <description>
     <p>This module provides an interface to files created by
@@ -267,7 +267,7 @@ io:fwrite("~s~n", [erl_prettypr:format(erl_syntax:form_list(AC))]).</code>
 
   <funcs>
     <func>
-      <name name="all_chunks" arity="1"/>
+      <name name="all_chunks" arity="1" since="OTP 18.2"/>
       <fsummary>Read all chunks from a BEAM file or binary</fsummary>
       <desc>
         <p>Reads chunk data for all chunks.</p>
@@ -275,7 +275,7 @@ io:fwrite("~s~n", [erl_prettypr:format(erl_syntax:form_list(AC))]).</code>
     </func>
 
     <func>
-      <name name="build_module" arity="1"/>
+      <name name="build_module" arity="1" since="OTP 18.2"/>
       <fsummary>Create a BEAM module from a list of chunks.</fsummary>
       <desc>
         <p>Builds a BEAM module (as a binary) from a list of chunks.</p>
@@ -283,7 +283,7 @@ io:fwrite("~s~n", [erl_prettypr:format(erl_syntax:form_list(AC))]).</code>
     </func>
 
     <func>
-      <name name="chunks" arity="2"/>
+      <name name="chunks" arity="2" since=""/>
       <fsummary>Read selected chunks from a BEAM file or binary.</fsummary>
       <desc>
         <p>Reads chunk data for selected chunks references. The order of
@@ -293,7 +293,7 @@ io:fwrite("~s~n", [erl_prettypr:format(erl_syntax:form_list(AC))]).</code>
     </func>
 
     <func>
-      <name name="chunks" arity="3"/>
+      <name name="chunks" arity="3" since=""/>
       <fsummary>Read selected chunks from a BEAM file or binary.</fsummary>
       <desc>
         <p>Reads chunk data for selected chunks references. The order of
@@ -312,7 +312,7 @@ io:fwrite("~s~n", [erl_prettypr:format(erl_syntax:form_list(AC))]).</code>
     </func>
 
     <func>
-      <name name="clear_crypto_key_fun" arity="0"/>
+      <name name="clear_crypto_key_fun" arity="0" since=""/>
       <fsummary>Unregister the current crypto key fun.</fsummary>
       <desc>
         <p>Unregisters the crypto key fun and terminates the process
@@ -327,7 +327,7 @@ io:fwrite("~s~n", [erl_prettypr:format(erl_syntax:form_list(AC))]).</code>
     </func>
 
     <func>
-      <name name="cmp" arity="2"/>
+      <name name="cmp" arity="2" since=""/>
       <fsummary>Compare two BEAM files.</fsummary>
       <type name="cmp_rsn"/>
       <desc>
@@ -341,7 +341,7 @@ io:fwrite("~s~n", [erl_prettypr:format(erl_syntax:form_list(AC))]).</code>
     </func>
 
     <func>
-      <name name="cmp_dirs" arity="2"/>
+      <name name="cmp_dirs" arity="2" since=""/>
       <fsummary>Compare the BEAM files in two directories.</fsummary>
       <desc>
         <p>Compares the BEAM files in
@@ -359,7 +359,7 @@ io:fwrite("~s~n", [erl_prettypr:format(erl_syntax:form_list(AC))]).</code>
     </func>
 
     <func>
-      <name name="crypto_key_fun" arity="1"/>
+      <name name="crypto_key_fun" arity="1" since=""/>
       <fsummary>Register a fun that provides a crypto key.</fsummary>
       <type name="crypto_fun"/>
       <type name="crypto_fun_arg"/>
@@ -398,7 +398,7 @@ CryptoKeyFun(clear) -> term()</code>
     </func>
 
     <func>
-      <name name="diff_dirs" arity="2"/>
+      <name name="diff_dirs" arity="2" since=""/>
       <fsummary>Compare the BEAM files in two directories.</fsummary>
       <desc>
         <p>Compares the BEAM files in two directories as
@@ -409,7 +409,7 @@ CryptoKeyFun(clear) -> term()</code>
     </func>
 
     <func>
-      <name name="format_error" arity="1"/>
+      <name name="format_error" arity="1" since=""/>
       <fsummary>Return an English description of a BEAM read error reply.
       </fsummary>
       <desc>
@@ -422,7 +422,7 @@ CryptoKeyFun(clear) -> term()</code>
     </func>
 
     <func>
-      <name name="info" arity="1"/>
+      <name name="info" arity="1" since=""/>
       <fsummary>Information about a BEAM file.</fsummary>
       <desc>
         <p>Returns a list containing some information about a BEAM file
@@ -449,7 +449,7 @@ CryptoKeyFun(clear) -> term()</code>
     </func>
 
     <func>
-      <name name="md5" arity="1"/>
+      <name name="md5" arity="1" since=""/>
       <fsummary>Read the module version of the BEAM file.</fsummary>
       <desc>
         <p>Calculates an MD5 redundancy check for the code of the module
@@ -458,7 +458,7 @@ CryptoKeyFun(clear) -> term()</code>
     </func>
 
     <func>
-      <name name="strip" arity="1"/>
+      <name name="strip" arity="1" since=""/>
       <fsummary>Remove chunks not needed by the loader from a BEAM file.
       </fsummary>
       <desc>
@@ -470,7 +470,19 @@ CryptoKeyFun(clear) -> term()</code>
     </func>
 
     <func>
-      <name name="strip_files" arity="1"/>
+      <name name="strip" arity="2" since=""/>
+      <fsummary>Remove chunks not needed by the loader from a BEAM file.
+      </fsummary>
+      <desc>
+        <p>Removes all chunks from a BEAM
+          file except those needed by the loader or passed in. In particular,
+          the debug information (chunk <c>debug_info</c> and <c>abstract_code</c>)
+          is removed.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="strip_files" arity="1" since=""/>
       <fsummary>Removes chunks not needed by the loader from BEAM files.
       </fsummary>
       <desc>
@@ -483,7 +495,20 @@ CryptoKeyFun(clear) -> term()</code>
     </func>
 
     <func>
-      <name name="strip_release" arity="1"/>
+      <name name="strip_files" arity="2" since=""/>
+      <fsummary>Removes chunks not needed by the loader from BEAM files.
+      </fsummary>
+      <desc>
+        <p>Removes all chunks except
+          those needed by the loader or passed in from BEAM files. In particular,
+          the debug information (chunk <c>debug_info</c> and <c>abstract_code</c>)
+          is removed. The returned list contains one element for each
+          specified filename, in the same order as in <c>Files</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="strip_release" arity="1" since=""/>
       <fsummary>Remove chunks not needed by the loader from all BEAM files of
         a release.</fsummary>
       <desc>
@@ -497,7 +522,21 @@ CryptoKeyFun(clear) -> term()</code>
     </func>
 
     <func>
-      <name name="version" arity="1"/>
+      <name name="strip_release" arity="2" since=""/>
+      <fsummary>Remove chunks not needed by the loader from all BEAM files of
+        a release.</fsummary>
+      <desc>
+        <p>Removes all chunks
+          except those needed by the loader or passed in from the BEAM files of a
+          release. <c><anno>Dir</anno></c> is to be the installation root
+          directory. For example, the current OTP release can be
+          stripped with the call
+          <c>beam_lib:strip_release(code:root_dir())</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="version" arity="1" since=""/>
       <fsummary>Read the module version of the BEAM file.</fsummary>
       <desc>
         <p>Returns the module version or versions. A version is defined by
diff --git a/lib/stdlib/doc/src/binary.xml b/lib/stdlib/doc/src/binary.xml
index 6a86d6c7ba..fd991f258b 100644
--- a/lib/stdlib/doc/src/binary.xml
+++ b/lib/stdlib/doc/src/binary.xml
@@ -34,7 +34,7 @@
     <rev>A</rev>
     <file>binary.xml</file>
   </header>
-  <module>binary</module>
+  <module since="OTP R14B">binary</module>
   <modulesummary>Library for handling binary data.</modulesummary>
   <description>
 
@@ -79,7 +79,7 @@
 
   <funcs>
     <func>
-    <name name="at" arity="2"/>
+    <name name="at" arity="2" since="OTP R14B"/>
       <fsummary>Return the byte at a specific position in a binary.</fsummary>
       <desc>
       <p>Returns the byte at position <c><anno>Pos</anno></c> (zero-based) in
@@ -90,7 +90,7 @@
     </func>
 
     <func>
-      <name name="bin_to_list" arity="1"/>
+      <name name="bin_to_list" arity="1" since="OTP R14B"/>
       <fsummary>Convert a binary to a list of integers.</fsummary>
       <desc>
       <p>Same as <c>bin_to_list(<anno>Subject</anno>, {0,byte_size(<anno>Subject</anno>)})</c>.</p>
@@ -98,7 +98,7 @@
     </func>
 
     <func>
-      <name name="bin_to_list" arity="2"/>
+      <name name="bin_to_list" arity="2" since="OTP R14B"/>
       <fsummary>Convert a binary to a list of integers.</fsummary>
       <desc>
       <p>Converts <c><anno>Subject</anno></c> to a list of <c>byte()</c>s, each
@@ -118,7 +118,7 @@
     </func>
 
     <func>
-      <name name="bin_to_list" arity="3"/>
+      <name name="bin_to_list" arity="3" since="OTP R14B"/>
       <fsummary>Convert a binary to a list of integers.</fsummary>
       <desc>
       <p>Same as<c> bin_to_list(<anno>Subject</anno>, {<anno>Pos</anno>, <anno>Len</anno>})</c>.</p>
@@ -126,7 +126,7 @@
     </func>
 
     <func>
-      <name name="compile_pattern" arity="1"/>
+      <name name="compile_pattern" arity="1" since="OTP R14B"/>
       <fsummary>Precompile a binary search pattern.</fsummary>
       <desc>
       <p>Builds an internal structure representing a compilation of a
@@ -158,7 +158,7 @@
     </func>
 
     <func>
-      <name name="copy" arity="1"/>
+      <name name="copy" arity="1" since="OTP R14B"/>
       <fsummary>Create a duplicate of a binary.</fsummary>
       <desc>
       <p>Same as <c>copy(<anno>Subject</anno>, 1)</c>.</p>
@@ -166,7 +166,7 @@
     </func>
 
     <func>
-      <name name="copy" arity="2"/>
+      <name name="copy" arity="2" since="OTP R14B"/>
       <fsummary>Duplicate a binary <c>N</c> times and create a new.</fsummary>
       <desc>
       <p>Creates a binary with the content of <c><anno>Subject</anno></c>
@@ -193,7 +193,7 @@
     </func>
 
     <func>
-      <name name="decode_unsigned" arity="1"/>
+      <name name="decode_unsigned" arity="1" since="OTP R14B"/>
       <fsummary>Decode a whole binary into an integer of arbitrary size.
       </fsummary>
       <desc>
@@ -202,7 +202,7 @@
     </func>
 
     <func>
-      <name name="decode_unsigned" arity="2"/>
+      <name name="decode_unsigned" arity="2" since="OTP R14B"/>
       <fsummary>Decode a whole binary into an integer of arbitrary size.
       </fsummary>
       <desc>
@@ -219,7 +219,7 @@
     </func>
 
     <func>
-      <name name="encode_unsigned" arity="1"/>
+      <name name="encode_unsigned" arity="1" since="OTP R14B"/>
       <fsummary>Encode an unsigned integer into the minimal binary.</fsummary>
       <desc>
       <p>Same as <c>encode_unsigned(<anno>Unsigned</anno>, big)</c>.</p>
@@ -227,7 +227,7 @@
     </func>
 
     <func>
-      <name name="encode_unsigned" arity="2"/>
+      <name name="encode_unsigned" arity="2" since="OTP R14B"/>
       <fsummary>Encode an unsigned integer into the minimal binary.</fsummary>
       <desc>
       <p>Converts a positive integer to the smallest possible
@@ -243,7 +243,7 @@
     </func>
 
     <func>
-      <name name="first" arity="1"/>
+      <name name="first" arity="1" since="OTP R14B"/>
       <fsummary>Return the first byte of a binary.</fsummary>
       <desc>
       <p>Returns the first byte of binary <c><anno>Subject</anno></c> as an
@@ -253,7 +253,7 @@
     </func>
 
     <func>
-      <name name="last" arity="1"/>
+      <name name="last" arity="1" since="OTP R14B"/>
       <fsummary>Return the last byte of a binary.</fsummary>
       <desc>
       <p>Returns the last byte of binary <c><anno>Subject</anno></c> as an
@@ -263,7 +263,7 @@
     </func>
 
     <func>
-      <name name="list_to_bin" arity="1"/>
+      <name name="list_to_bin" arity="1" since="OTP R14B"/>
       <fsummary>Convert a list of integers and binaries to a binary.</fsummary>
       <desc>
       <p>Works exactly as
@@ -273,7 +273,7 @@
     </func>
 
     <func>
-      <name name="longest_common_prefix" arity="1"/>
+      <name name="longest_common_prefix" arity="1" since="OTP R14B"/>
       <fsummary>Return length of longest common prefix for a set of binaries.
       </fsummary>
       <desc>
@@ -294,7 +294,7 @@
     </func>
 
     <func>
-      <name name="longest_common_suffix" arity="1"/>
+      <name name="longest_common_suffix" arity="1" since="OTP R14B"/>
       <fsummary>Return length of longest common suffix for a set of binaries.
       </fsummary>
       <desc>
@@ -315,7 +315,7 @@
     </func>
 
     <func>
-      <name name="match" arity="2"/>
+      <name name="match" arity="2" since="OTP R14B"/>
       <fsummary>Search for the first match of a pattern in a binary.</fsummary>
       <desc>
       <p>Same as <c>match(<anno>Subject</anno>, <anno>Pattern</anno>, [])</c>.
@@ -324,7 +324,7 @@
     </func>
 
     <func>
-      <name name="match" arity="3"/>
+      <name name="match" arity="3" since="OTP R14B"/>
       <fsummary>Search for the first match of a pattern in a binary.</fsummary>
       <type name="part"/>
       <desc>
@@ -372,7 +372,7 @@
     </func>
 
     <func>
-      <name name="matches" arity="2"/>
+      <name name="matches" arity="2" since="OTP R14B"/>
       <fsummary>Search for all matches of a pattern in a binary.</fsummary>
       <desc>
       <p>Same as <c>matches(<anno>Subject</anno>, <anno>Pattern</anno>, [])</c>.
@@ -381,7 +381,7 @@
     </func>
 
     <func>
-      <name name="matches" arity="3"/>
+      <name name="matches" arity="3" since="OTP R14B"/>
       <fsummary>Search for all matches of a pattern in a binary.</fsummary>
       <type name="part"/>
       <desc>
@@ -425,7 +425,7 @@
     </func>
 
     <func>
-      <name name="part" arity="2"/>
+      <name name="part" arity="2" since="OTP R14B"/>
       <fsummary>Extract a part of a binary.</fsummary>
       <desc>
       <p>Extracts the part of binary <c><anno>Subject</anno></c> described by
@@ -453,7 +453,7 @@
     </func>
 
     <func>
-      <name name="part" arity="3"/>
+      <name name="part" arity="3" since="OTP R14B"/>
       <fsummary>Extract a part of a binary.</fsummary>
       <desc>
       <p>Same as <c>part(<anno>Subject</anno>, {<anno>Pos</anno>,
@@ -462,7 +462,7 @@
     </func>
 
     <func>
-      <name name="referenced_byte_size" arity="1"/>
+      <name name="referenced_byte_size" arity="1" since="OTP R14B"/>
       <fsummary>Determine the size of the binary pointed out by a subbinary.
       </fsummary>
       <desc>
@@ -505,15 +505,16 @@ store(Binary, GBSet) ->
 &lt;&lt;1,1,1,1,1 ...
 2> byte_size(A).
 100
-3> binary:referenced_byte_size(A)
+3> binary:referenced_byte_size(A).
 100
-4> &lt;&lt;_:10/binary,B:10/binary,_/binary&gt;&gt; = A.
+4> &lt;&lt;B:10/binary, C:90/binary&gt;&gt; = A.
 &lt;&lt;1,1,1,1,1 ...
-5> byte_size(B).
-10
-6> binary:referenced_byte_size(B)
-100</code>
-
+5> {byte_size(B), binary:referenced_byte_size(B)}.
+{10,10}
+6> {byte_size(C), binary:referenced_byte_size(C)}.
+{90,100}</code>
+      <p>In the above example, the small binary <c>B</c> was copied while the
+      larger binary <c>C</c> references binary <c>A</c>.</p>
       <note>
       <p>Binary data is shared among processes. If another process
       still references the larger binary, copying the part this
@@ -525,7 +526,7 @@ store(Binary, GBSet) ->
     </func>
 
     <func>
-      <name name="replace" arity="3"/>
+      <name name="replace" arity="3" since="OTP R14B"/>
       <fsummary>Replace bytes in a binary according to a pattern.</fsummary>
       <desc>
       <p>Same as <c>replace(<anno>Subject</anno>, <anno>Pattern</anno>, <anno>Replacement</anno>,[])</c>.</p>
@@ -533,7 +534,7 @@ store(Binary, GBSet) ->
     </func>
 
     <func>
-      <name name="replace" arity="4"/>
+      <name name="replace" arity="4" since="OTP R14B"/>
       <fsummary>Replace bytes in a binary according to a pattern.</fsummary>
       <type_desc variable="OnePos">An integer() =&lt; byte_size(<anno>Replacement</anno>)
       </type_desc>
@@ -575,7 +576,7 @@ store(Binary, GBSet) ->
     </func>
 
     <func>
-      <name name="split" arity="2"/>
+      <name name="split" arity="2" since="OTP R14B"/>
       <fsummary>Split a binary according to a pattern.</fsummary>
       <desc>
       <p>Same as <c>split(<anno>Subject</anno>, <anno>Pattern</anno>,
@@ -584,7 +585,7 @@ store(Binary, GBSet) ->
     </func>
 
     <func>
-      <name name="split" arity="3"/>
+      <name name="split" arity="3" since="OTP R14B"/>
       <fsummary>Split a binary according to a pattern.</fsummary>
       <desc>
       <p>Splits <c><anno>Subject</anno></c> into a list of binaries based on
diff --git a/lib/stdlib/doc/src/c.xml b/lib/stdlib/doc/src/c.xml
index b6cb6f5aae..29edc373c7 100644
--- a/lib/stdlib/doc/src/c.xml
+++ b/lib/stdlib/doc/src/c.xml
@@ -28,7 +28,7 @@
     <date>1996-10-30</date>
     <rev>B</rev>
   </header>
-  <module>c</module>
+  <module since="">c</module>
   <modulesummary>Command interface module.</modulesummary>
   <description>
     <p>This module enables users to enter the short form of
@@ -41,7 +41,7 @@
 
   <funcs>
     <func>
-      <name name="bt" arity="1"/>
+      <name name="bt" arity="1" since=""/>
       <fsummary>Stack backtrace for a process.</fsummary>
       <desc>
         <p>Stack backtrace for a process. Equivalent to
@@ -50,9 +50,9 @@
     </func>
 
     <func>
-      <name name="c" arity="1"/>
-      <name name="c" arity="2"/>
-      <name name="c" arity="3"/>
+      <name name="c" arity="1" since=""/>
+      <name name="c" arity="2" since=""/>
+      <name name="c" arity="3" since="OTP 20.0"/>
       <fsummary>Compile and load a file or module.</fsummary>
       <desc>
         <p>Compiles and then purges and loads the code for a module.
@@ -80,7 +80,7 @@
     </func>
 
     <func>
-      <name name="cd" arity="1"/>
+      <name name="cd" arity="1" since=""/>
       <fsummary>Change working directory.</fsummary>
       <desc>
         <p>Changes working directory to <c><anno>Dir</anno></c>, which can be a
@@ -94,7 +94,7 @@
     </func>
 
     <func>
-      <name name="erlangrc" arity="1"/>
+      <name name="erlangrc" arity="1" since="OTP 21.0"/>
       <fsummary>Load an erlang resource file.</fsummary>
       <desc>
         <p>Search <c>PathList</c> and load <c>.erlang</c> resource file if
@@ -103,7 +103,7 @@
     </func>
 
     <func>
-      <name name="flush" arity="0"/>
+      <name name="flush" arity="0" since=""/>
       <fsummary>Flush any messages sent to the shell.</fsummary>
       <desc>
         <p>Flushes any messages sent to the shell.</p>
@@ -111,7 +111,7 @@
     </func>
 
     <func>
-      <name name="help" arity="0"/>
+      <name name="help" arity="0" since=""/>
       <fsummary>Help information.</fsummary>
       <desc>
         <p>Displays help information: all valid shell internal commands,
@@ -120,8 +120,8 @@
     </func>
 
     <func>
-      <name name="i" arity="0"/>
-      <name name="ni" arity="0"/>
+      <name name="i" arity="0" since=""/>
+      <name name="ni" arity="0" since=""/>
       <fsummary>System information.</fsummary>
       <desc>
         <p><c>i/0</c> displays system information, listing
@@ -131,7 +131,7 @@
     </func>
 
     <func>
-      <name name="i" arity="3"/>
+      <name name="i" arity="3" since=""/>
       <fsummary>Information about pid &lt;X.Y.Z&gt;.</fsummary>
       <desc>
         <p>Displays information about a process, Equivalent to
@@ -141,7 +141,7 @@
     </func>
 
     <func>
-      <name name="l" arity="1"/>
+      <name name="l" arity="1" since=""/>
       <fsummary>Load or reload a module.</fsummary>
       <desc>
         <p>Purges and loads, or reloads, a module by calling
@@ -154,7 +154,7 @@
     </func>
 
     <func>
-      <name>lc(Files) -> ok</name>
+      <name since="">lc(Files) -> ok</name>
       <fsummary>Compile a list of files.</fsummary>
       <type>
         <v>Files = [File]</v>
@@ -171,7 +171,7 @@
     </func>
 
     <func>
-      <name name="lm" arity="0"/>
+      <name name="lm" arity="0" since="OTP 20.0"/>
       <fsummary>Loads all modified modules.</fsummary>
       <desc>
         <p>Reloads all currently loaded modules that have changed on disk (see <c>mm()</c>).
@@ -180,7 +180,7 @@
     </func>
 
     <func>
-      <name name="ls" arity="0"/>
+      <name name="ls" arity="0" since=""/>
       <fsummary>List files in the current directory.</fsummary>
       <desc>
         <p>Lists files in the current directory.</p>
@@ -188,7 +188,7 @@
     </func>
 
     <func>
-      <name name="ls" arity="1"/>
+      <name name="ls" arity="1" since=""/>
       <fsummary>List files in a directory or a single file.</fsummary>
       <desc>
         <p>Lists files in directory <c><anno>Dir</anno></c> or, if <c>Dir</c>
@@ -197,7 +197,7 @@
     </func>
 
     <func>
-      <name name="m" arity="0"/>
+      <name name="m" arity="0" since=""/>
       <fsummary>Which modules are loaded.</fsummary>
       <desc>
         <p>Displays information about the loaded modules, including
@@ -206,7 +206,7 @@
     </func>
 
     <func>
-      <name name="m" arity="1"/>
+      <name name="m" arity="1" since=""/>
       <fsummary>Information about a module.</fsummary>
       <desc>
         <p>Displays information about <c><anno>Module</anno></c>.</p>
@@ -214,7 +214,7 @@
     </func>
 
     <func>
-      <name name="mm" arity="0"/>
+      <name name="mm" arity="0" since="OTP 20.0"/>
       <fsummary>Lists all modified modules.</fsummary>
       <desc>
         <p>Lists all modified modules. Shorthand for
@@ -223,7 +223,7 @@
     </func>
 
     <func>
-      <name name="memory" arity="0"/>
+      <name name="memory" arity="0" since=""/>
       <fsummary>Memory allocation information.</fsummary>
       <desc>
         <p>Memory allocation information. Equivalent to
@@ -232,8 +232,8 @@
     </func>
 
     <func>
-      <name name="memory" arity="1" clause_i="1"/>
-      <name name="memory" arity="1" clause_i="2"/>
+      <name name="memory" arity="1" clause_i="1" since=""/>
+      <name name="memory" arity="1" clause_i="2" since=""/>
       <fsummary>Memory allocation information.</fsummary>
       <desc>
         <p>Memory allocation information. Equivalent to
@@ -242,8 +242,8 @@
     </func>
 
     <func>
-      <name name="nc" arity="1"/>
-      <name name="nc" arity="2"/>
+      <name name="nc" arity="1" since=""/>
+      <name name="nc" arity="2" since=""/>
       <fsummary>Compile and load code in a file on all nodes.</fsummary>
       <desc>
         <p>Compiles and then loads the code for a file on all nodes.
@@ -255,7 +255,7 @@ compile:file(<anno>File</anno>, <anno>Options</anno> ++ [report_errors, report_w
     </func>
 
     <func>
-      <name name="nl" arity="1"/>
+      <name name="nl" arity="1" since=""/>
       <fsummary>Load module on all nodes.</fsummary>
       <desc>
         <p>Loads <c><anno>Module</anno></c> on all nodes.</p>
@@ -263,7 +263,7 @@ compile:file(<anno>File</anno>, <anno>Options</anno> ++ [report_errors, report_w
     </func>
 
     <func>
-      <name name="pid" arity="3"/>
+      <name name="pid" arity="3" since=""/>
       <fsummary>Convert <c>X,Y,Z</c> to a pid.</fsummary>
       <desc>
         <p>Converts <c><anno>X</anno></c>, <c><anno>Y</anno></c>,
@@ -273,7 +273,7 @@ compile:file(<anno>File</anno>, <anno>Options</anno> ++ [report_errors, report_w
     </func>
 
     <func>
-      <name name="pwd" arity="0"/>
+      <name name="pwd" arity="0" since=""/>
       <fsummary>Print working directory.</fsummary>
       <desc>
         <p>Prints the name of the working directory.</p>
@@ -281,7 +281,7 @@ compile:file(<anno>File</anno>, <anno>Options</anno> ++ [report_errors, report_w
     </func>
 
     <func>
-      <name name="q" arity="0"/>
+      <name name="q" arity="0" since=""/>
       <fsummary>Quit - shorthand for <c>init:stop()</c>.</fsummary>
       <desc>
         <p>This function is shorthand for <c>init:stop()</c>, that is,
@@ -290,8 +290,8 @@ compile:file(<anno>File</anno>, <anno>Options</anno> ++ [report_errors, report_w
     </func>
 
     <func>
-      <name name="regs" arity="0"/>
-      <name name="nregs" arity="0"/>
+      <name name="regs" arity="0" since=""/>
+      <name name="nregs" arity="0" since=""/>
       <fsummary>Information about registered processes.</fsummary>
       <desc>
         <p><c>regs/0</c> displays information about all registered
@@ -301,7 +301,7 @@ compile:file(<anno>File</anno>, <anno>Options</anno> ++ [report_errors, report_w
     </func>
 
     <func>
-      <name name="uptime" arity="0"/>
+      <name name="uptime" arity="0" since="OTP 18.0"/>
       <fsummary>Print node uptime.</fsummary>
       <desc>
         <p>Prints the node uptime (as specified by
@@ -310,7 +310,7 @@ compile:file(<anno>File</anno>, <anno>Options</anno> ++ [report_errors, report_w
     </func>
 
     <func>
-      <name>xm(ModSpec) -> void()</name>
+      <name since="">xm(ModSpec) -> void()</name>
       <fsummary>Cross-reference check a module.</fsummary>
       <type>
         <v>ModSpec = Module | Filename</v>
@@ -325,7 +325,7 @@ compile:file(<anno>File</anno>, <anno>Options</anno> ++ [report_errors, report_w
     </func>
 
     <func>
-      <name>y(File) -> YeccRet</name>
+      <name since="">y(File) -> YeccRet</name>
       <fsummary>Generate an LALR-1 parser.</fsummary>
       <type>
         <v>File = name()</v>
@@ -344,7 +344,7 @@ yecc:file(File)</code>
     </func>
 
     <func>
-      <name>y(File, Options) -> YeccRet</name>
+      <name since="">y(File, Options) -> YeccRet</name>
       <fsummary>Generate an LALR-1 parser.</fsummary>
       <type>
         <v>File = name()</v>
diff --git a/lib/stdlib/doc/src/calendar.xml b/lib/stdlib/doc/src/calendar.xml
index 5aee635c38..6308420c52 100644
--- a/lib/stdlib/doc/src/calendar.xml
+++ b/lib/stdlib/doc/src/calendar.xml
@@ -28,7 +28,7 @@
     <date>1996-11-05</date>
     <rev>B</rev>
   </header>
-  <module>calendar</module>
+  <module since="">calendar</module>
   <modulesummary>Local and universal time, day of the week, date and time
     conversions.</modulesummary>
   <description>
@@ -128,8 +128,8 @@
 
   <funcs>
     <func>
-      <name name="date_to_gregorian_days" arity="1"/>
-      <name name="date_to_gregorian_days" arity="3"/>
+      <name name="date_to_gregorian_days" arity="1" since=""/>
+      <name name="date_to_gregorian_days" arity="3" since=""/>
       <fsummary>Compute the number of days from year 0 up to the specified
         date.</fsummary>
       <type variable="Date" name_i="1"/>
@@ -143,7 +143,7 @@
     </func>
 
     <func>
-      <name name="datetime_to_gregorian_seconds" arity="1"/>
+      <name name="datetime_to_gregorian_seconds" arity="1" since=""/>
       <fsummary>Compute the number of seconds from year 0 up to the specified
         date and time.</fsummary>
       <desc>
@@ -153,8 +153,8 @@
     </func>
 
     <func>
-      <name name="day_of_the_week" arity="1"/>
-      <name name="day_of_the_week" arity="3"/>
+      <name name="day_of_the_week" arity="1" since=""/>
+      <name name="day_of_the_week" arity="3" since=""/>
       <fsummary>Compute the day of the week.</fsummary>
       <type variable="Date" name_i="1"/>
       <type variable="Year"/>
@@ -169,7 +169,7 @@
     </func>
 
     <func>
-      <name name="gregorian_days_to_date" arity="1"/>
+      <name name="gregorian_days_to_date" arity="1" since=""/>
       <fsummary>Compute the date from the number of gregorian days.</fsummary>
       <desc>
         <p>Computes the date from the specified number of gregorian days.</p>
@@ -177,7 +177,7 @@
     </func>
 
     <func>
-      <name name="gregorian_seconds_to_datetime" arity="1"/>
+      <name name="gregorian_seconds_to_datetime" arity="1" since=""/>
       <fsummary>Compute the date and time from the number of gregorian seconds.
       </fsummary>
       <desc>
@@ -187,7 +187,7 @@
     </func>
 
     <func>
-      <name name="is_leap_year" arity="1"/>
+      <name name="is_leap_year" arity="1" since=""/>
       <fsummary>Check if the year is a leap year.</fsummary>
       <desc>
         <p>Checks if the specified year is a leap year.</p>
@@ -195,7 +195,7 @@
     </func>
 
     <func>
-      <name name="iso_week_number" arity="0"/>
+      <name name="iso_week_number" arity="0" since="OTP R14B02"/>
       <fsummary>Compute the ISO week number for the actual date.</fsummary>
       <desc>
         <p>Returns tuple <c>{Year, WeekNum}</c> representing
@@ -206,7 +206,7 @@
     </func>
 
     <func>
-      <name name="iso_week_number" arity="1"/>
+      <name name="iso_week_number" arity="1" since="OTP R14B02"/>
       <fsummary>Compute the ISO week number for the specified date.</fsummary>
       <desc>
         <p>Returns tuple <c>{Year, WeekNum}</c> representing
@@ -215,7 +215,7 @@
     </func>
 
     <func>
-      <name name="last_day_of_the_month" arity="2"/>
+      <name name="last_day_of_the_month" arity="2" since=""/>
       <fsummary>Compute the number of days in a month.</fsummary>
       <desc>
         <p>Computes the number of days in a month.</p>
@@ -223,7 +223,7 @@
     </func>
 
     <func>
-      <name name="local_time" arity="0"/>
+      <name name="local_time" arity="0" since=""/>
       <fsummary>Compute local time.</fsummary>
       <desc>
         <p>Returns the local time reported by
@@ -232,7 +232,7 @@
     </func>
 
     <func>
-      <name name="local_time_to_universal_time" arity="1"/>
+      <name name="local_time_to_universal_time" arity="1" since=""/>
       <fsummary>Convert from local time to universal time (deprecated).
       </fsummary>
       <desc>
@@ -253,7 +253,7 @@
     </func>
 
     <func>
-      <name name="local_time_to_universal_time_dst" arity="1"/>
+      <name name="local_time_to_universal_time_dst" arity="1" since=""/>
       <fsummary>Convert from local time to universal time(s).</fsummary>
       <desc>
         <p>Converts from local time to Universal Coordinated Time (UTC).
@@ -285,7 +285,7 @@
     </func>
 
     <func>
-      <name name="now_to_datetime" arity="1"/>
+      <name name="now_to_datetime" arity="1" since=""/>
       <fsummary>Convert now to date and time.</fsummary>
       <desc>
         <p>Returns Universal Coordinated Time (UTC)
@@ -296,7 +296,7 @@
     </func>
 
     <func>
-      <name name="now_to_local_time" arity="1"/>
+      <name name="now_to_local_time" arity="1" since=""/>
       <fsummary>Convert now to local date and time.</fsummary>
       <desc>
         <p>Returns local date and time converted from the return value from
@@ -306,7 +306,7 @@
     </func>
 
     <func>
-      <name name="now_to_universal_time" arity="1"/>
+      <name name="now_to_universal_time" arity="1" since=""/>
       <fsummary>Convert now to date and time.</fsummary>
       <desc>
         <p>Returns Universal Coordinated Time (UTC)
@@ -317,8 +317,8 @@
     </func>
 
     <func>
-      <name name="rfc3339_to_system_time" arity="1"/>
-      <name name="rfc3339_to_system_time" arity="2"/>
+      <name name="rfc3339_to_system_time" arity="1" since="OTP 21.0"/>
+      <name name="rfc3339_to_system_time" arity="2" since="OTP 21.0"/>
       <fsummary>Convert from RFC 3339 timestamp to system time.</fsummary>
       <type name="rfc3339_string"/>
       <type name="rfc3339_time_unit"/>
@@ -343,7 +343,7 @@
     </func>
 
     <func>
-      <name name="seconds_to_daystime" arity="1"/>
+      <name name="seconds_to_daystime" arity="1" since=""/>
       <fsummary>Compute days and time from seconds.</fsummary>
       <desc>
         <p>Converts a specified number of seconds into days, hours, minutes,
@@ -354,7 +354,7 @@
     </func>
 
     <func>
-      <name name="seconds_to_time" arity="1"/>
+      <name name="seconds_to_time" arity="1" since=""/>
       <fsummary>Compute time from seconds.</fsummary>
       <type name="secs_per_day"/>
       <desc>
@@ -365,7 +365,7 @@
     </func>
 
     <func>
-      <name name="system_time_to_local_time" arity="2"/>
+      <name name="system_time_to_local_time" arity="2" since="OTP 21.0"/>
       <fsummary>Convert system time to local date and time.</fsummary>
       <desc>
 	<p>Converts a specified system time into local date and time.</p>
@@ -373,8 +373,8 @@
     </func>
 
     <func>
-      <name name="system_time_to_rfc3339" arity="1"/>
-      <name name="system_time_to_rfc3339" arity="2"/>
+      <name name="system_time_to_rfc3339" arity="1" since="OTP 21.0"/>
+      <name name="system_time_to_rfc3339" arity="2" since="OTP 21.0"/>
       <fsummary>Convert from system to RFC 3339 timestamp.</fsummary>
       <type name="offset"/>
       <type name="rfc3339_string"/>
@@ -426,7 +426,7 @@
     </func>
 
     <func>
-      <name name="system_time_to_universal_time" arity="2"/>
+      <name name="system_time_to_universal_time" arity="2" since="OTP 21.0"/>
       <fsummary>Convert system time to universal date and time.</fsummary>
       <desc>
 	<p>Converts a specified system time into universal date and time.</p>
@@ -434,7 +434,7 @@
     </func>
 
     <func>
-      <name name="time_difference" arity="2"/>
+      <name name="time_difference" arity="2" since=""/>
       <fsummary>Compute the difference between two times (deprecated).
       </fsummary>
       <desc>
@@ -449,7 +449,7 @@
     </func>
 
     <func>
-      <name name="time_to_seconds" arity="1"/>
+      <name name="time_to_seconds" arity="1" since=""/>
       <fsummary>Compute the number of seconds since midnight up to the
         specified time.</fsummary>
       <type name="secs_per_day"/>
@@ -460,7 +460,7 @@
     </func>
 
     <func>
-      <name name="universal_time" arity="0"/>
+      <name name="universal_time" arity="0" since=""/>
       <fsummary>Compute universal time.</fsummary>
       <desc>
         <p>Returns the Universal Coordinated Time (UTC)
@@ -470,7 +470,7 @@
     </func>
 
     <func>
-      <name name="universal_time_to_local_time" arity="1"/>
+      <name name="universal_time_to_local_time" arity="1" since=""/>
       <fsummary>Convert from universal time to local time.</fsummary>
       <desc>
         <p>Converts from Universal Coordinated Time (UTC) to local time.
@@ -480,8 +480,8 @@
     </func>
 
     <func>
-      <name name="valid_date" arity="1"/>
-      <name name="valid_date" arity="3"/>
+      <name name="valid_date" arity="1" since=""/>
+      <name name="valid_date" arity="3" since=""/>
       <fsummary>Check if a date is valid</fsummary>
       <type variable="Date" name_i="1"/>
       <type variable="Year"/>
@@ -513,7 +513,7 @@
     <title>Date and Time Source</title>
     <p>Local time is obtained from the Erlang BIF <c>localtime/0</c>.
       Universal time is computed from the BIF <c>universaltime/0</c>.</p>
-    <p>The following fapply:</p>
+    <p>The following apply:</p>
     <list type="bulleted">
       <item>There are 86400 seconds in a day.</item>
       <item>There are 365 days in an ordinary year.</item>
diff --git a/lib/stdlib/doc/src/dets.xml b/lib/stdlib/doc/src/dets.xml
index eb6e32aecf..8b9502a3b1 100644
--- a/lib/stdlib/doc/src/dets.xml
+++ b/lib/stdlib/doc/src/dets.xml
@@ -32,7 +32,7 @@
     <rev>B</rev>
     <file>dets.xml</file>
   </header>
-  <module>dets</module>
+  <module since="">dets</module>
   <modulesummary>A disk-based term storage.</modulesummary>
   <description>
     <p>This module provides a term storage on file. The
@@ -188,7 +188,7 @@
 
   <funcs>
     <func>
-      <name name="all" arity="0"/>
+      <name name="all" arity="0" since=""/>
       <fsummary>Return a list of the names of all open Dets tables on
         this node.</fsummary>
       <desc>
@@ -197,7 +197,7 @@
     </func>
 
     <func>
-      <name name="bchunk" arity="2"/>
+      <name name="bchunk" arity="2" since=""/>
       <fsummary>Return a chunk of objects stored in a Dets table.
       </fsummary>
       <desc>
@@ -227,7 +227,7 @@
     </func>
 
     <func>
-      <name name="close" arity="1"/>
+      <name name="close" arity="1" since=""/>
       <fsummary>Close a Dets table.</fsummary>
       <desc>
         <p>Closes a table. Only processes that have opened a table are
@@ -239,7 +239,7 @@
     </func>
 
     <func>
-      <name name="delete" arity="2"/>
+      <name name="delete" arity="2" since=""/>
       <fsummary>Delete all objects with a specified key from a Dets
         table.</fsummary>
       <desc>
@@ -249,7 +249,7 @@
     </func>
 
     <func>
-      <name name="delete_all_objects" arity="1"/>
+      <name name="delete_all_objects" arity="1" since=""/>
       <fsummary>Delete all objects from a Dets table.</fsummary>
       <desc>
         <p>Deletes all objects from a table in almost constant time.
@@ -259,7 +259,7 @@
     </func>
 
     <func>
-      <name name="delete_object" arity="2"/>
+      <name name="delete_object" arity="2" since=""/>
       <fsummary>Delete a specified object from a Dets table.</fsummary>
       <desc>
         <p>Deletes all instances of a specified object from a table. If a
@@ -270,7 +270,7 @@
     </func>
 
     <func>
-      <name name="first" arity="1"/>
+      <name name="first" arity="1" since=""/>
       <fsummary>Return the first key stored in a Dets table.</fsummary>
       <desc>
         <p>Returns the first key stored in table <c><anno>Name</anno></c>
@@ -295,8 +295,8 @@
     </func>
 
     <func>
-      <name name="foldl" arity="3"/>
-      <name name="foldr" arity="3"/>
+      <name name="foldl" arity="3" since=""/>
+      <name name="foldr" arity="3" since=""/>
       <fsummary>Fold a function over a Dets table.</fsummary>
       <desc>
         <p>Calls <c><anno>Function</anno></c> on successive elements of
@@ -309,7 +309,7 @@
     </func>
 
     <func>
-      <name name="from_ets" arity="2"/>
+      <name name="from_ets" arity="2" since=""/>
       <fsummary>Replace the objects of a Dets table with the objects
         of an ETS table.</fsummary>
       <desc>
@@ -322,7 +322,7 @@
     </func>
 
     <func>
-      <name name="info" arity="1"/>
+      <name name="info" arity="1" since=""/>
       <fsummary>Return information about a Dets table.</fsummary>
       <desc>
         <p>Returns information about table <c><anno>Name</anno></c>
@@ -354,7 +354,7 @@
     </func>
 
     <func>
-      <name name="info" arity="2"/>
+      <name name="info" arity="2" since=""/>
       <fsummary>Return the information associated with a specified item for
         a Dets table.</fsummary>
       <desc>
@@ -455,8 +455,8 @@
     </func>
 
     <func>
-      <name name="init_table" arity="2"/>
-      <name name="init_table" arity="3"/>
+      <name name="init_table" arity="2" since=""/>
+      <name name="init_table" arity="3" since=""/>
       <fsummary>Replace all objects of a Dets table.</fsummary>
       <desc>
         <p>Replaces the existing objects of table <c><anno>Name</anno></c>
@@ -516,7 +516,7 @@
     </func>
 
     <func>
-      <name name="insert" arity="2"/>
+      <name name="insert" arity="2" since=""/>
       <fsummary>Insert one or more objects into a Dets table.</fsummary>
       <desc>
         <p>Inserts one or more objects into the table <c><anno>Name</anno></c>.
@@ -527,7 +527,7 @@
     </func>
 
     <func>
-      <name name="insert_new" arity="2"/>
+      <name name="insert_new" arity="2" since=""/>
       <fsummary>Insert one or more objects into a Dets table.</fsummary>
       <desc>
         <p>Inserts one or more objects into table <c><anno>Name</anno></c>.
@@ -539,7 +539,7 @@
     </func>
 
     <func>
-      <name name="is_compatible_bchunk_format" arity="2"/>
+      <name name="is_compatible_bchunk_format" arity="2" since=""/>
       <fsummary>Test compatibility of chunk data of a table.</fsummary>
       <desc>
         <p>Returns <c>true</c> if it would be possible to initialize
@@ -554,7 +554,7 @@
     </func>
 
     <func>
-      <name name="is_dets_file" arity="1"/>
+      <name name="is_dets_file" arity="1" since=""/>
       <fsummary>Test for a Dets table.</fsummary>
       <desc>
         <p>Returns <c>true</c> if file <c><anno>Filename</anno></c>
@@ -563,7 +563,7 @@
     </func>
 
     <func>
-      <name name="lookup" arity="2"/>
+      <name name="lookup" arity="2" since=""/>
       <fsummary>Return all objects with a specified key stored in a
         Dets table.</fsummary>
       <desc>
@@ -590,7 +590,7 @@ ok
     </func>
 
     <func>
-      <name name="match" arity="1"/>
+      <name name="match" arity="1" since=""/>
       <fsummary>Match a chunk of objects stored in a Dets table and
         return a list of variable bindings.</fsummary>
       <desc>
@@ -606,7 +606,7 @@ ok
     </func>
 
     <func>
-      <name name="match" arity="2"/>
+      <name name="match" arity="2" since=""/>
       <fsummary>Match the objects stored in a Dets table and return a
         list of variable bindings.</fsummary>
       <desc>
@@ -622,7 +622,7 @@ ok
     </func>
 
     <func>
-      <name name="match" arity="3"/>
+      <name name="match" arity="3" since=""/>
       <fsummary>Match the first chunk of objects stored in a Dets table
         and return a list of variable bindings.</fsummary>
       <desc>
@@ -654,7 +654,7 @@ ok
     </func>
 
     <func>
-      <name name="match_delete" arity="2"/>
+      <name name="match_delete" arity="2" since=""/>
       <fsummary>Delete all objects that match a given pattern from a
         Dets table.</fsummary>
       <desc>
@@ -667,7 +667,7 @@ ok
     </func>
 
     <func>
-      <name name="match_object" arity="1"/>
+      <name name="match_object" arity="1" since=""/>
       <fsummary>Match a chunk of objects stored in a Dets table and
         return a list of objects.</fsummary>
       <desc>
@@ -683,7 +683,7 @@ ok
     </func>
 
     <func>
-      <name name="match_object" arity="2"/>
+      <name name="match_object" arity="2" since=""/>
       <fsummary>Match the objects stored in a Dets table and return
         a list of objects.</fsummary>
       <desc>
@@ -702,7 +702,7 @@ ok
     </func>
 
     <func>
-      <name name="match_object" arity="3"/>
+      <name name="match_object" arity="3" since=""/>
       <fsummary>Match the first chunk of objects stored in a Dets table
         and return a list of objects.</fsummary>
       <desc>
@@ -735,7 +735,7 @@ ok
     </func>
 
     <func>
-      <name name="member" arity="2"/>
+      <name name="member" arity="2" since=""/>
       <fsummary>Test for occurrence of a key in a Dets table.</fsummary>
       <desc>
         <p>Works like <seealso marker="#lookup/2"><c>lookup/2</c></seealso>,
@@ -746,7 +746,7 @@ ok
     </func>
 
     <func>
-      <name name="next" arity="2"/>
+      <name name="next" arity="2" since=""/>
       <fsummary>Return the next key in a Dets table.</fsummary>
       <desc>
         <p>Returns either the key following <c><anno>Key1</anno></c> in table
@@ -760,7 +760,7 @@ ok
     </func>
 
     <func>
-      <name name="open_file" arity="1"/>
+      <name name="open_file" arity="1" since=""/>
       <fsummary>Open an existing Dets table.</fsummary>
       <desc>
         <p>Opens an existing table. If the table is not properly closed,
@@ -770,7 +770,7 @@ ok
     </func>
 
     <func>
-      <name name="open_file" arity="2"/>
+      <name name="open_file" arity="2" since=""/>
       <fsummary>Open a Dets table.</fsummary>
       <desc>
         <p>Opens a table. An empty Dets table is created if no file
@@ -872,7 +872,7 @@ ok
     </func>
 
     <func>
-      <name name="pid2name" arity="1"/>
+      <name name="pid2name" arity="1" since=""/>
       <fsummary>Return the name of the Dets table handled by a pid.</fsummary>
       <desc>
         <p>Returns the table name given the pid of a process
@@ -883,7 +883,7 @@ ok
     </func>
 
     <func>
-      <name name="repair_continuation" arity="2"/>
+      <name name="repair_continuation" arity="2" since=""/>
       <fsummary>Repair a continuation from <c>select/1</c> or <c>select/3</c>.
       </fsummary>
       <desc>
@@ -917,7 +917,7 @@ ok
     </func>
 
     <func>
-      <name name="safe_fixtable" arity="2"/>
+      <name name="safe_fixtable" arity="2" since=""/>
       <fsummary>Fix a Dets table for safe traversal.</fsummary>
       <desc>
         <p>If <c><anno>Fix</anno></c> is <c>true</c>, table
@@ -945,7 +945,7 @@ ok
     </func>
 
     <func>
-      <name name="select" arity="1"/>
+      <name name="select" arity="1" since=""/>
       <fsummary>Apply a match specification to some objects stored in a
         Dets table.</fsummary>
       <desc>
@@ -962,7 +962,7 @@ ok
     </func>
 
     <func>
-      <name name="select" arity="2"/>
+      <name name="select" arity="2" since=""/>
       <fsummary>Apply a match specification to all objects stored in a
         Dets table.</fsummary>
       <desc>
@@ -984,7 +984,7 @@ ok
     </func>
 
     <func>
-      <name name="select" arity="3"/>
+      <name name="select" arity="3" since=""/>
       <fsummary>Apply a match specification to the first chunk of objects
         stored in a Dets table.</fsummary>
       <desc>
@@ -1019,7 +1019,7 @@ ok
     </func>
 
     <func>
-      <name name="select_delete" arity="2"/>
+      <name name="select_delete" arity="2" since=""/>
       <fsummary>Delete all objects that match a given pattern from a
         Dets table.</fsummary>
       <desc>
@@ -1036,7 +1036,7 @@ ok
     </func>
 
     <func>
-      <name name="slot" arity="2"/>
+      <name name="slot" arity="2" since=""/>
       <fsummary>Return the list of objects associated with a slot of a
         Dets table.</fsummary>
       <desc>
@@ -1049,7 +1049,7 @@ ok
     </func>
 
     <func>
-      <name name="sync" arity="1"/>
+      <name name="sync" arity="1" since=""/>
       <fsummary>Ensure that all updates made to a Dets table are written
         to disk.</fsummary>
       <desc>
@@ -1064,8 +1064,8 @@ ok
     </func>
 
     <func>
-      <name name="table" arity="1"/>
-      <name name="table" arity="2"/>
+      <name name="table" arity="1" since=""/>
+      <name name="table" arity="2" since=""/>
       <fsummary>Return a QLC query handle.</fsummary>
       <desc>
         <p>Returns a Query List
@@ -1090,8 +1090,8 @@ ok
           </item>
           <item>
             <p><c>select</c> - The table is traversed by calling
-              <seealso marker="dets:select/3"><c>dets:select/3</c></seealso> and
-              <seealso marker="dets:select/1"><c>dets:select/1</c></seealso>.
+              <seealso marker="dets#select/3"><c>dets:select/3</c></seealso> and
+              <seealso marker="dets#select/1"><c>dets:select/1</c></seealso>.
               Option <c>n_objects</c> determines the number of objects
               returned (the third argument of <c>select/3</c>). The
               match specification (the second argument of
@@ -1140,7 +1140,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="to_ets" arity="2"/>
+      <name name="to_ets" arity="2" since=""/>
       <fsummary>Insert all objects of a Dets table into an ETS
         table.</fsummary>
       <desc>
@@ -1153,7 +1153,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="traverse" arity="2"/>
+      <name name="traverse" arity="2" since=""/>
       <fsummary>Apply a function to all or some objects stored in a Dets
         table.</fsummary>
       <desc>
@@ -1192,7 +1192,7 @@ fun(X) -> {continue, X} end.</pre>
     </func>
 
     <func>
-      <name name="update_counter" arity="3"/>
+      <name name="update_counter" arity="3" since=""/>
       <fsummary>Update a counter object stored in a Dets table.
       </fsummary>
       <desc>
diff --git a/lib/stdlib/doc/src/dict.xml b/lib/stdlib/doc/src/dict.xml
index c229a18721..95a98cef12 100644
--- a/lib/stdlib/doc/src/dict.xml
+++ b/lib/stdlib/doc/src/dict.xml
@@ -28,7 +28,7 @@
     <date>1997-01-15</date>
     <rev>B</rev>
   </header>
-  <module>dict</module>
+  <module since="">dict</module>
   <modulesummary>Key-value dictionary.</modulesummary>
   <description>
     <p>This module provides a <c>Key</c>-<c>Value</c> dictionary.
@@ -55,7 +55,7 @@
 
   <funcs>
     <func>
-      <name name="append" arity="3"/>
+      <name name="append" arity="3" since=""/>
       <fsummary>Append a value to keys in a dictionary.</fsummary>
       <desc>
         <p>Appends a new <c><anno>Value</anno></c> to the current list
@@ -65,7 +65,7 @@
     </func>
 
     <func>
-      <name name="append_list" arity="3"/>
+      <name name="append_list" arity="3" since=""/>
       <fsummary>Append new values to keys in a dictionary.</fsummary>
       <desc>
         <p>Appends a list of values <c><anno>ValList</anno></c> to
@@ -77,7 +77,7 @@
     </func>
 
     <func>
-      <name name="erase" arity="2"/>
+      <name name="erase" arity="2" since=""/>
       <fsummary>Erase a key from a dictionary.</fsummary>
       <desc>
         <p>Erases all items with a given key from a dictionary.</p>
@@ -85,7 +85,7 @@
     </func>
 
     <func>
-      <name name="fetch" arity="2"/>
+      <name name="fetch" arity="2" since=""/>
       <fsummary>Look up values in a dictionary.</fsummary>
       <desc>
         <p>Returns the value associated with <c><anno>Key</anno></c>
@@ -98,7 +98,7 @@
     </func>
 
     <func>
-      <name name="fetch_keys" arity="1"/>
+      <name name="fetch_keys" arity="1" since=""/>
       <fsummary>Return all keys in a dictionary.</fsummary>
       <desc>
         <p>Returns a list of all keys in dictionary <c>Dict</c>.</p>
@@ -106,7 +106,7 @@
     </func>
 
     <func>
-      <name name="take" arity="2"/>
+      <name name="take" arity="2" since="OTP 20.0"/>
       <fsummary>Return value and new dictionary without element with this value.</fsummary>
       <desc>
         <p>This function returns value from dictionary and a
@@ -116,7 +116,7 @@
     </func>
 
     <func>
-      <name name="filter" arity="2"/>
+      <name name="filter" arity="2" since=""/>
       <fsummary>Select elements that satisfy a predicate.</fsummary>
       <desc>
         <p><c><anno>Dict2</anno></c> is a dictionary of all keys and values in
@@ -127,7 +127,7 @@
     </func>
 
     <func>
-      <name name="find" arity="2"/>
+      <name name="find" arity="2" since=""/>
       <fsummary>Search for a key in a dictionary.</fsummary>
       <desc>
         <p>Searches for a key in dictionary <c>Dict</c>. Returns
@@ -139,7 +139,7 @@
     </func>
 
     <func>
-      <name name="fold" arity="3"/>
+      <name name="fold" arity="3" since=""/>
       <fsummary>Fold a function over a dictionary.</fsummary>
       <desc>
         <p>Calls <c><anno>Fun</anno></c> on successive keys and values of
@@ -153,7 +153,7 @@
     </func>
 
     <func>
-      <name name="from_list" arity="1"/>
+      <name name="from_list" arity="1" since=""/>
       <fsummary>Convert a list of pairs to a dictionary.</fsummary>
       <desc>
         <p>Converts the <c><anno>Key</anno></c>-<c><anno>Value</anno></c> list
@@ -162,7 +162,7 @@
     </func>
 
     <func>
-      <name name="is_empty" arity="1"/>
+      <name name="is_empty" arity="1" since="OTP 17.0"/>
       <fsummary>Return <c>true</c> if the dictionary is empty.</fsummary>
       <desc>
         <p>Returns <c>true</c> if dictionary <c><anno>Dict</anno></c> has no
@@ -171,7 +171,7 @@
     </func>
 
     <func>
-      <name name="is_key" arity="2"/>
+      <name name="is_key" arity="2" since=""/>
       <fsummary>Test if a key is in a dictionary.</fsummary>
       <desc>
         <p>Tests if <c><anno>Key</anno></c> is contained in
@@ -180,7 +180,7 @@
     </func>
 
     <func>
-      <name name="map" arity="2"/>
+      <name name="map" arity="2" since=""/>
       <fsummary>Map a function over a dictionary.</fsummary>
       <desc>
         <p>Calls <c><anno>Fun</anno></c> on successive keys and values
@@ -190,7 +190,7 @@
     </func>
 
     <func>
-      <name name="merge" arity="3"/>
+      <name name="merge" arity="3" since=""/>
       <fsummary>Merge two dictionaries.</fsummary>
       <desc>
         <p>Merges two dictionaries, <c><anno>Dict1</anno></c> and
@@ -209,7 +209,7 @@ merge(Fun, D1, D2) ->
     </func>
 
     <func>
-      <name name="new" arity="0"/>
+      <name name="new" arity="0" since=""/>
       <fsummary>Create a dictionary.</fsummary>
       <desc>
         <p>Creates a new dictionary.</p>
@@ -217,7 +217,7 @@ merge(Fun, D1, D2) ->
     </func>
 
     <func>
-      <name name="size" arity="1"/>
+      <name name="size" arity="1" since=""/>
       <fsummary>Return the number of elements in a dictionary.</fsummary>
       <desc>
         <p>Returns the number of elements in dictionary
@@ -226,7 +226,7 @@ merge(Fun, D1, D2) ->
     </func>
 
     <func>
-      <name name="store" arity="3"/>
+      <name name="store" arity="3" since=""/>
       <fsummary>Store a value in a dictionary.</fsummary>
       <desc>
         <p>Stores a <c><anno>Key</anno></c>-<c><anno>Value</anno></c> pair in
@@ -237,7 +237,7 @@ merge(Fun, D1, D2) ->
     </func>
 
     <func>
-      <name name="to_list" arity="1"/>
+      <name name="to_list" arity="1" since=""/>
       <fsummary>Convert a dictionary to a list of pairs.</fsummary>
       <desc>
         <p>Converts dictionary <c>Dict</c> to a list representation.</p>
@@ -245,7 +245,7 @@ merge(Fun, D1, D2) ->
     </func>
 
     <func>
-      <name name="update" arity="3"/>
+      <name name="update" arity="3" since=""/>
       <fsummary>Update a value in a dictionary.</fsummary>
       <desc>
         <p>Updates a value in a dictionary by calling <c><anno>Fun</anno></c> on
@@ -255,7 +255,7 @@ merge(Fun, D1, D2) ->
     </func>
 
     <func>
-      <name name="update" arity="4"/>
+      <name name="update" arity="4" since=""/>
       <fsummary>Update a value in a dictionary.</fsummary>
       <desc>
         <p>Updates a value in a dictionary by calling <c><anno>Fun</anno></c> on
@@ -269,7 +269,7 @@ append(Key, Val, D) ->
     </func>
 
     <func>
-      <name name="update_counter" arity="3"/>
+      <name name="update_counter" arity="3" since=""/>
       <fsummary>Increment a value in a dictionary.</fsummary>
       <desc>
         <p>Adds <c><anno>Increment</anno></c> to the value associated with
diff --git a/lib/stdlib/doc/src/digraph.xml b/lib/stdlib/doc/src/digraph.xml
index a5252b443b..cf2c0844c9 100644
--- a/lib/stdlib/doc/src/digraph.xml
+++ b/lib/stdlib/doc/src/digraph.xml
@@ -32,7 +32,7 @@
     <rev>C</rev>
     <file>digraph.xml</file>
   </header>
-  <module>digraph</module>
+  <module since="">digraph</module>
   <modulesummary>Directed graphs.</modulesummary>
   <description>
     <p>This module provides a version of labeled
@@ -144,9 +144,9 @@
 
   <funcs>
     <func>
-      <name name="add_edge" arity="3"/>
-      <name name="add_edge" arity="4"/>
-      <name name="add_edge" arity="5"/>
+      <name name="add_edge" arity="3" since=""/>
+      <name name="add_edge" arity="4" since=""/>
+      <name name="add_edge" arity="5" since=""/>
       <fsummary>Add an edge to a digraph.</fsummary>
       <type name="add_edge_err_rsn"/>
       <desc>
@@ -183,9 +183,9 @@
     </func>
 
     <func>
-      <name name="add_vertex" arity="1"/>
-      <name name="add_vertex" arity="2"/>
-      <name name="add_vertex" arity="3"/>
+      <name name="add_vertex" arity="1" since=""/>
+      <name name="add_vertex" arity="2" since=""/>
+      <name name="add_vertex" arity="3" since=""/>
       <fsummary>Add or modify a vertex of a digraph.</fsummary>
       <desc>
         <p><c>add_vertex/3</c> creates (or modifies) vertex
@@ -204,7 +204,7 @@
     </func>
 
     <func>
-      <name name="del_edge" arity="2"/>
+      <name name="del_edge" arity="2" since=""/>
       <fsummary>Delete an edge from a digraph.</fsummary>
       <desc>
         <p>Deletes edge <c><anno>E</anno></c> from digraph
@@ -213,7 +213,7 @@
     </func>
 
     <func>
-      <name name="del_edges" arity="2"/>
+      <name name="del_edges" arity="2" since=""/>
       <fsummary>Delete edges from a digraph.</fsummary>
       <desc>
         <p>Deletes the edges in list <c><anno>Edges</anno></c> from digraph
@@ -222,7 +222,7 @@
     </func>
 
     <func>
-      <name name="del_path" arity="3"/>
+      <name name="del_path" arity="3" since=""/>
       <fsummary>Delete paths from a digraph.</fsummary>
       <desc>
         <p>Deletes edges from digraph <c><anno>G</anno></c> until there are no
@@ -252,7 +252,7 @@
     </func>
 
     <func>
-      <name name="del_vertex" arity="2"/>
+      <name name="del_vertex" arity="2" since=""/>
       <fsummary>Delete a vertex from a digraph.</fsummary>
       <desc>
         <p>Deletes vertex <c><anno>V</anno></c> from digraph
@@ -265,7 +265,7 @@
     </func>
 
     <func>
-      <name name="del_vertices" arity="2"/>
+      <name name="del_vertices" arity="2" since=""/>
       <fsummary>Delete vertices from a digraph.</fsummary>
       <desc>
         <p>Deletes the vertices in list <c><anno>Vertices</anno></c> from
@@ -274,7 +274,7 @@
     </func>
 
     <func>
-      <name name="delete" arity="1"/>
+      <name name="delete" arity="1" since=""/>
       <fsummary>Delete a digraph.</fsummary>
       <desc>
         <p>Deletes digraph <c><anno>G</anno></c>. This call is important
@@ -285,7 +285,7 @@
     </func>
 
     <func>
-      <name name="edge" arity="2"/>
+      <name name="edge" arity="2" since=""/>
       <fsummary>Return the vertices and the label of an edge of a digraph.
       </fsummary>
       <desc>
@@ -303,7 +303,7 @@
     </func>
 
     <func>
-      <name name="edges" arity="1"/>
+      <name name="edges" arity="1" since=""/>
       <fsummary>Return all edges of a digraph.</fsummary>
       <desc>
         <p>Returns a list of all edges of digraph <c><anno>G</anno></c>, in
@@ -312,7 +312,7 @@
     </func>
 
     <func>
-      <name name="edges" arity="2"/>
+      <name name="edges" arity="2" since=""/>
       <fsummary>Return the edges emanating from or incident on a vertex of
         a digraph.</fsummary>
       <desc>
@@ -324,7 +324,7 @@
     </func>
 
     <func>
-      <name name="get_cycle" arity="2"/>
+      <name name="get_cycle" arity="2" since=""/>
       <fsummary>Find one cycle in a digraph.</fsummary>
       <desc>
         <p>If a <seealso marker="#simple_cycle">simple cycle</seealso> of
@@ -341,7 +341,7 @@
     </func>
 
     <func>
-      <name name="get_path" arity="3"/>
+      <name name="get_path" arity="3" since=""/>
       <fsummary>Find one path in a digraph.</fsummary>
       <desc>
         <p>Tries to find
@@ -357,7 +357,7 @@
     </func>
 
     <func>
-      <name name="get_short_cycle" arity="2"/>
+      <name name="get_short_cycle" arity="2" since=""/>
       <fsummary>Find one short cycle in a digraph.</fsummary>
       <desc>
         <p>Tries to find an as short as possible
@@ -375,7 +375,7 @@
     </func>
 
     <func>
-      <name name="get_short_path" arity="3"/>
+      <name name="get_short_path" arity="3" since=""/>
       <fsummary>Find one short path in a digraph.</fsummary>
       <desc>
         <p>Tries to find an as short as possible
@@ -392,7 +392,7 @@
     </func>
 
     <func>
-      <name name="in_degree" arity="2"/>
+      <name name="in_degree" arity="2" since=""/>
       <fsummary>Return the in-degree of a vertex of a digraph.</fsummary>
       <desc>
         <p>Returns the <seealso marker="#in_degree">in-degree</seealso> of
@@ -401,7 +401,7 @@
     </func>
 
     <func>
-      <name name="in_edges" arity="2"/>
+      <name name="in_edges" arity="2" since=""/>
       <fsummary>Return all edges incident on a vertex of a digraph.</fsummary>
       <desc>
         <p>Returns a list of all
@@ -412,7 +412,7 @@
     </func>
 
     <func>
-      <name name="in_neighbours" arity="2"/>
+      <name name="in_neighbours" arity="2" since=""/>
       <fsummary>Return all in-neighbors of a vertex of  a digraph.</fsummary>
       <desc>
         <p>Returns a list of
@@ -423,7 +423,7 @@
     </func>
 
     <func>
-      <name name="info" arity="1"/>
+      <name name="info" arity="1" since=""/>
       <fsummary>Return information about a digraph.</fsummary>
       <type name="d_cyclicity"/>
       <type name="d_protection"/>
@@ -453,7 +453,7 @@
     </func>
 
     <func>
-      <name name="new" arity="0"/>
+      <name name="new" arity="0" since=""/>
       <fsummary>Return a protected empty digraph, where cycles are allowed.
       </fsummary>
       <desc>
@@ -462,7 +462,7 @@
     </func>
 
     <func>
-      <name name="new" arity="1"/>
+      <name name="new" arity="1" since=""/>
       <fsummary>Create a new empty digraph.</fsummary>
       <type variable="Type"/>
       <type name="d_type"/>
@@ -492,7 +492,7 @@
     </func>
 
     <func>
-      <name name="no_edges" arity="1"/>
+      <name name="no_edges" arity="1" since=""/>
       <fsummary>Return the number of edges of a digraph.</fsummary>
       <desc>
         <p>Returns the number of edges of digraph <c><anno>G</anno></c>.</p>
@@ -500,7 +500,7 @@
     </func>
 
     <func>
-      <name name="no_vertices" arity="1"/>
+      <name name="no_vertices" arity="1" since=""/>
       <fsummary>Return the number of vertices of a digraph.</fsummary>
       <desc>
         <p>Returns the number of vertices of digraph <c><anno>G</anno></c>.</p>
@@ -508,7 +508,7 @@
     </func>
 
     <func>
-      <name name="out_degree" arity="2"/>
+      <name name="out_degree" arity="2" since=""/>
       <fsummary>Return the out-degree of a vertex of a digraph.</fsummary>
       <desc>
         <p>Returns the <seealso marker="#out_degree">out-degree</seealso> of
@@ -517,7 +517,7 @@
     </func>
 
     <func>
-      <name name="out_edges" arity="2"/>
+      <name name="out_edges" arity="2" since=""/>
       <fsummary>Return all edges emanating from a vertex of a digraph.
       </fsummary>
       <desc>
@@ -529,7 +529,7 @@
     </func>
 
     <func>
-      <name name="out_neighbours" arity="2"/>
+      <name name="out_neighbours" arity="2" since=""/>
       <fsummary>Return all out-neighbors of a vertex of a digraph.</fsummary>
       <desc>
         <p>Returns a list of 
@@ -540,7 +540,7 @@
     </func>
 
     <func>
-      <name name="vertex" arity="2"/>
+      <name name="vertex" arity="2" since=""/>
       <fsummary>Return the label of a vertex of a digraph.</fsummary>
       <desc>
         <p>Returns <c>{<anno>V</anno>,&nbsp;<anno>Label</anno>}</c>,
@@ -553,7 +553,7 @@
     </func>
 
     <func>
-      <name name="vertices" arity="1"/>
+      <name name="vertices" arity="1" since=""/>
       <fsummary>Return all vertices of a digraph.</fsummary>
       <desc>
         <p>Returns a list of all vertices of digraph <c><anno>G</anno></c>, in
diff --git a/lib/stdlib/doc/src/digraph_utils.xml b/lib/stdlib/doc/src/digraph_utils.xml
index cb316e5b93..a23b02c6c1 100644
--- a/lib/stdlib/doc/src/digraph_utils.xml
+++ b/lib/stdlib/doc/src/digraph_utils.xml
@@ -32,7 +32,7 @@
     <rev>PA1</rev>
     <file>digraph_utils.xml</file>
   </header>
-  <module>digraph_utils</module>
+  <module since="">digraph_utils</module>
   <modulesummary>Algorithms for directed graphs.</modulesummary>
   <description>
     <p>This module provides algorithms based on depth-first traversal of
@@ -154,7 +154,7 @@
 
   <funcs>
     <func>
-      <name name="arborescence_root" arity="1"/>
+      <name name="arborescence_root" arity="1" since=""/>
       <fsummary>Check if a digraph is an arborescence.</fsummary>
       <desc>
         <p>Returns <c>{yes, <anno>Root</anno>}</c> if <c><anno>Root</anno></c>
@@ -164,7 +164,7 @@
     </func>
 
     <func>
-      <name name="components" arity="1"/>
+      <name name="components" arity="1" since=""/>
       <fsummary>Return the components of a digraph.</fsummary>
       <desc>
         <p>Returns a list
@@ -177,7 +177,7 @@
     </func>
 
     <func>
-      <name name="condensation" arity="1"/>
+      <name name="condensation" arity="1" since=""/>
       <fsummary>Return a condensed graph of a digraph.</fsummary>
       <desc>
         <p>Creates a digraph where the vertices are
@@ -202,7 +202,7 @@
     </func>
 
     <func>
-      <name name="cyclic_strong_components" arity="1"/>
+      <name name="cyclic_strong_components" arity="1" since=""/>
       <fsummary>Return the cyclic strong components of a digraph.</fsummary>
       <desc>
         <p>Returns a list of <seealso marker="#strong_components">strongly
@@ -218,7 +218,7 @@
     </func>
 
     <func>
-      <name name="is_acyclic" arity="1"/>
+      <name name="is_acyclic" arity="1" since=""/>
       <fsummary>Check if a digraph is acyclic.</fsummary>
       <desc>
         <p>Returns <c>true</c> if and only if digraph
@@ -228,7 +228,7 @@
     </func>
 
     <func>
-      <name name="is_arborescence" arity="1"/>
+      <name name="is_arborescence" arity="1" since=""/>
       <fsummary>Check if a digraph is an arborescence.</fsummary>
       <desc>
         <p>Returns <c>true</c> if and only if digraph
@@ -238,7 +238,7 @@
     </func>
 
     <func>
-      <name name="is_tree" arity="1"/>
+      <name name="is_tree" arity="1" since=""/>
       <fsummary>Check if a digraph is a tree.</fsummary>
       <desc>
         <p>Returns <c>true</c> if and only if digraph
@@ -248,7 +248,7 @@
     </func>
 
     <func>
-      <name name="loop_vertices" arity="1"/>
+      <name name="loop_vertices" arity="1" since=""/>
       <fsummary>Return the vertices of a digraph included in some loop.
       </fsummary>
       <desc>
@@ -258,7 +258,7 @@
     </func>
 
     <func>
-      <name name="postorder" arity="1"/>
+      <name name="postorder" arity="1" since=""/>
       <fsummary>Return the vertices of a digraph in postorder.</fsummary>
       <desc>
         <p>Returns all vertices of digraph <c><anno>Digraph</anno></c>.
@@ -273,7 +273,7 @@
     </func>
 
     <func>
-      <name name="preorder" arity="1"/>
+      <name name="preorder" arity="1" since=""/>
       <fsummary>Return the vertices of a digraph in preorder.</fsummary>
       <desc>
         <p>Returns all vertices of digraph <c><anno>Digraph</anno></c>.
@@ -285,7 +285,7 @@
     </func>
 
     <func>
-      <name name="reachable" arity="2"/>
+      <name name="reachable" arity="2" since=""/>
       <fsummary>Return the vertices reachable from some vertices of a digraph.
       </fsummary>
       <desc>
@@ -300,7 +300,7 @@
     </func>
 
     <func>
-      <name name="reachable_neighbours" arity="2"/>
+      <name name="reachable_neighbours" arity="2" since=""/>
       <fsummary>Return the neighbors reachable from some vertices of a
         digraph.</fsummary>
       <desc>
@@ -316,7 +316,7 @@
     </func>
 
     <func>
-      <name name="reaching" arity="2"/>
+      <name name="reaching" arity="2" since=""/>
       <fsummary>Return the vertices that reach some vertices of a digraph.
       </fsummary>
       <desc>
@@ -330,7 +330,7 @@
     </func>
 
     <func>
-      <name name="reaching_neighbours" arity="2"/>
+      <name name="reaching_neighbours" arity="2" since=""/>
       <fsummary>Return the neighbors that reach some vertices of a digraph.
       </fsummary>
       <desc>
@@ -345,7 +345,7 @@
     </func>
 
     <func>
-      <name name="strong_components" arity="1"/>
+      <name name="strong_components" arity="1" since=""/>
       <fsummary>Return the strong components of a digraph.</fsummary>
       <desc>
         <p>Returns a list of <seealso marker="#strong_components">strongly
@@ -359,8 +359,8 @@
     </func>
 
     <func>
-      <name name="subgraph" arity="2"/>
-      <name name="subgraph" arity="3"/>
+      <name name="subgraph" arity="2" since=""/>
+      <name name="subgraph" arity="3" since=""/>
       <fsummary>Return a subgraph of a digraph.</fsummary>
       <desc>
         <p>Creates a maximal <seealso marker="#subgraph">subgraph</seealso>
@@ -371,7 +371,7 @@
           the default, the type of <c><anno>Digraph</anno></c> is used
           for the subgraph as well. Otherwise the option value of <c>type</c>
           is used as argument to
-          <seealso marker="digraph:new/1"><c>digraph:new/1</c></seealso>.</p>
+        <seealso marker="digraph#new/1"><c>digraph:new/1</c></seealso>.</p>
         <p>If the value of option <c>keep_labels</c> is <c>true</c>,
           which is the default,
           the <seealso marker="#label">labels</seealso> of vertices and edges
@@ -387,7 +387,7 @@
     </func>
 
     <func>
-      <name name="topsort" arity="1"/>
+      <name name="topsort" arity="1" since=""/>
       <fsummary>Return a topological sorting of the vertices of a digraph.
       </fsummary>
       <desc>
diff --git a/lib/stdlib/doc/src/epp.xml b/lib/stdlib/doc/src/epp.xml
index d803d259aa..110c1cea2c 100644
--- a/lib/stdlib/doc/src/epp.xml
+++ b/lib/stdlib/doc/src/epp.xml
@@ -32,7 +32,7 @@
     <rev>B</rev>
     <file>epp.xml</file>
   </header>
-  <module>epp</module>
+  <module since="">epp</module>
   <modulesummary>An Erlang code preprocessor.</modulesummary>
   <description>
     <p>The Erlang code preprocessor includes functions that are used by the
@@ -76,7 +76,7 @@
 
   <funcs>
     <func>
-      <name name="close" arity="1"/>
+      <name name="close" arity="1" since=""/>
       <fsummary>Close the preprocessing of the file associated with <c>Epp</c>.
       </fsummary>
       <desc>
@@ -85,7 +85,7 @@
     </func>
 
     <func>
-      <name name="default_encoding" arity="0"/>
+      <name name="default_encoding" arity="0" since="OTP R16B"/>
       <fsummary>Return the default encoding of Erlang source files.</fsummary>
       <desc>
         <p>Returns the default encoding of Erlang source files.</p>
@@ -93,7 +93,7 @@
     </func>
 
     <func>
-      <name name="encoding_to_string" arity="1"/>
+      <name name="encoding_to_string" arity="1" since="OTP R16B"/>
       <fsummary>Return a string representation of an encoding.</fsummary>
       <desc>
         <p>Returns a string representation of an encoding. The string
@@ -107,7 +107,7 @@
     </func>
 
     <func>
-      <name name="format_error" arity="1"/>
+      <name name="format_error" arity="1" since="OTP R14B03"/>
       <fsummary>Format an error descriptor.</fsummary>
       <desc>
         <p>Takes an <c><anno>ErrorDescriptor</anno></c> and returns
@@ -120,7 +120,7 @@
     </func>
 
     <func>
-      <name name="open" arity="1"/>
+      <name name="open" arity="1" since="OTP 17.0"/>
       <fsummary>Open a file for preprocessing.</fsummary>
       <desc>
         <p>Opens a file for preprocessing.</p>
@@ -136,7 +136,7 @@
     </func>
 
     <func>
-      <name name="open" arity="2"/>
+      <name name="open" arity="2" since=""/>
       <fsummary>Open a file for preprocessing.</fsummary>
       <desc>
         <p>Equivalent to
@@ -145,7 +145,7 @@
     </func>
 
     <func>
-      <name name="open" arity="3"/>
+      <name name="open" arity="3" since=""/>
       <fsummary>Open a file for preprocessing.</fsummary>
       <desc>
         <p>Equivalent to <c>epp:open([{name, FileName}, {includes, IncludePath},
@@ -154,7 +154,7 @@
     </func>
 
     <func>
-      <name name="parse_erl_form" arity="1"/>
+      <name name="parse_erl_form" arity="1" since=""/>
       <fsummary>Return the next Erlang form from the opened Erlang source file.
       </fsummary>
       <type name="warning_info"/>
@@ -167,7 +167,7 @@
     </func>
 
     <func>
-      <name name="parse_file" arity="2"/>
+      <name name="parse_file" arity="2" since="OTP 17.0"/>
       <fsummary>Preprocess and parse an Erlang source file.</fsummary>
       <desc>
         <p>Preprocesses and parses an Erlang source file.
@@ -185,7 +185,7 @@
     </func>
 
     <func>
-      <name name="parse_file" arity="3"/>
+      <name name="parse_file" arity="3" since=""/>
       <fsummary>Preprocess and parse an Erlang source file.</fsummary>
       <desc>
         <p>Equivalent to <c>epp:parse_file(FileName, [{includes, IncludePath},
@@ -194,8 +194,8 @@
     </func>
 
     <func>
-      <name name="read_encoding" arity="1"/>
-      <name name="read_encoding" arity="2"/>
+      <name name="read_encoding" arity="1" since="OTP R16B"/>
+      <name name="read_encoding" arity="2" since="OTP R16B"/>
       <fsummary>Read the encoding from a file.</fsummary>
       <desc>
         <p>Read the <seealso marker="#encoding">encoding</seealso> from
@@ -209,8 +209,8 @@
     </func>
 
     <func>
-      <name name="read_encoding_from_binary" arity="1"/>
-      <name name="read_encoding_from_binary" arity="2"/>
+      <name name="read_encoding_from_binary" arity="1" since="OTP R16B"/>
+      <name name="read_encoding_from_binary" arity="2" since="OTP R16B"/>
       <fsummary>Read the encoding from a binary.</fsummary>
       <desc>
         <p>Read the <seealso marker="#encoding">encoding</seealso> from
@@ -224,7 +224,7 @@
     </func>
 
     <func>
-      <name name="set_encoding" arity="1"/>
+      <name name="set_encoding" arity="1" since="OTP R16B"/>
       <fsummary>Read and set the encoding of an I/O device.</fsummary>
       <desc>
         <p>Reads the <seealso marker="#encoding">encoding</seealso> from
@@ -239,7 +239,7 @@
     </func>
 
     <func>
-      <name name="set_encoding" arity="2"/>
+      <name name="set_encoding" arity="2" since="OTP 17.0"/>
       <fsummary>Read and set the encoding of an I/O device.</fsummary>
       <desc>
         <p>Reads the <seealso marker="#encoding">encoding</seealso> from
diff --git a/lib/stdlib/doc/src/erl_anno.xml b/lib/stdlib/doc/src/erl_anno.xml
index f316f63d98..dff93619ab 100644
--- a/lib/stdlib/doc/src/erl_anno.xml
+++ b/lib/stdlib/doc/src/erl_anno.xml
@@ -34,7 +34,7 @@
     <rev>A</rev>
     <file>erl_anno.xml</file>
   </header>
-  <module>erl_anno</module>
+  <module since="OTP 18.0">erl_anno</module>
   <modulesummary>Abstract datatype for the annotations of the Erlang Compiler.
   </modulesummary>
 
@@ -135,7 +135,7 @@
 
   <funcs>
     <func>
-      <name name="column" arity="1"/>
+      <name name="column" arity="1" since="OTP 18.0"/>
       <fsummary>Return the column.</fsummary>
       <type name="column"></type>
       <desc>
@@ -144,7 +144,7 @@
     </func>
 
     <func>
-      <name name="end_location" arity="1"/>
+      <name name="end_location" arity="1" since="OTP 18.0"/>
       <fsummary>Return the end location of the text.</fsummary>
       <type name="location"></type>
       <desc>
@@ -155,7 +155,7 @@
     </func>
 
     <func>
-      <name name="file" arity="1"/>
+      <name name="file" arity="1" since="OTP 18.0"/>
       <fsummary>Return the filename.</fsummary>
       <type name="filename"></type>
       <desc>
@@ -165,7 +165,7 @@
     </func>
 
     <func>
-      <name name="from_term" arity="1"/>
+      <name name="from_term" arity="1" since="OTP 18.0"/>
       <fsummary>Return annotations given a term.</fsummary>
       <desc>
         <p>Returns annotations with representation <anno>Term</anno>.</p>
@@ -174,7 +174,7 @@
     </func>
 
     <func>
-      <name name="generated" arity="1"/>
+      <name name="generated" arity="1" since="OTP 18.0"/>
       <fsummary>Return the generated Boolean.</fsummary>
       <type name="generated"></type>
       <desc>
@@ -185,7 +185,7 @@
     </func>
 
     <func>
-      <name name="is_anno" arity="1"/>
+      <name name="is_anno" arity="1" since="OTP 18.0"/>
       <fsummary>Test for a collection of annotations.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <anno>Term</anno> is a collection of
@@ -194,7 +194,7 @@
     </func>
 
     <func>
-      <name name="line" arity="1"/>
+      <name name="line" arity="1" since="OTP 18.0"/>
       <fsummary>Return the line.</fsummary>
       <type name="line"></type>
       <desc>
@@ -203,7 +203,7 @@
     </func>
 
     <func>
-      <name name="location" arity="1"/>
+      <name name="location" arity="1" since="OTP 18.0"/>
       <fsummary>Return the location.</fsummary>
       <type name="location"></type>
       <desc>
@@ -212,7 +212,7 @@
     </func>
 
     <func>
-      <name name="new" arity="1"/>
+      <name name="new" arity="1" since="OTP 18.0"/>
       <fsummary>Create a new collection of annotations.</fsummary>
       <type name="location"></type>
       <desc>
@@ -221,7 +221,7 @@
     </func>
 
     <func>
-      <name name="set_file" arity="2"/>
+      <name name="set_file" arity="2" since="OTP 18.0"/>
       <fsummary>Modify the filename.</fsummary>
       <type name="filename"></type>
       <desc>
@@ -230,7 +230,7 @@
     </func>
 
     <func>
-      <name name="set_generated" arity="2"/>
+      <name name="set_generated" arity="2" since="OTP 18.0"/>
       <fsummary>Modify the generated marker.</fsummary>
       <type name="generated"></type>
       <desc>
@@ -240,7 +240,7 @@
     </func>
 
     <func>
-      <name name="set_line" arity="2"/>
+      <name name="set_line" arity="2" since="OTP 18.0"/>
       <fsummary>Modify the line.</fsummary>
       <type name="line"></type>
       <desc>
@@ -249,7 +249,7 @@
     </func>
 
     <func>
-      <name name="set_location" arity="2"/>
+      <name name="set_location" arity="2" since="OTP 18.0"/>
       <fsummary>Modify the location.</fsummary>
       <type name="location"></type>
       <desc>
@@ -258,7 +258,7 @@
     </func>
 
     <func>
-      <name name="set_record" arity="2"/>
+      <name name="set_record" arity="2" since="OTP 18.0"/>
       <fsummary>Modify the record marker.</fsummary>
       <type name="record"></type>
       <desc>
@@ -267,7 +267,7 @@
     </func>
 
     <func>
-      <name name="set_text" arity="2"/>
+      <name name="set_text" arity="2" since="OTP 18.0"/>
       <fsummary>Modify the text.</fsummary>
       <type name="text"></type>
       <desc>
@@ -276,7 +276,7 @@
     </func>
     <func>
 
-      <name name="text" arity="1"/>
+      <name name="text" arity="1" since="OTP 18.0"/>
       <fsummary>Return the text.</fsummary>
       <type name="text"></type>
       <desc>
@@ -286,7 +286,7 @@
     </func>
 
     <func>
-      <name name="to_term" arity="1"/>
+      <name name="to_term" arity="1" since="OTP 18.0"/>
       <fsummary>Return the term representing a collection of annotations.
       </fsummary>
       <desc>
diff --git a/lib/stdlib/doc/src/erl_eval.xml b/lib/stdlib/doc/src/erl_eval.xml
index 1c0f7f062f..813cbecd89 100644
--- a/lib/stdlib/doc/src/erl_eval.xml
+++ b/lib/stdlib/doc/src/erl_eval.xml
@@ -32,7 +32,7 @@
     <rev>B</rev>
     <file>erl_eval.xml</file>
   </header>
-  <module>erl_eval</module>
+  <module since="">erl_eval</module>
   <modulesummary>The Erlang meta interpreter.</modulesummary>
   <description>
     <p>This module provides an interpreter for Erlang expressions. The
@@ -96,7 +96,7 @@
 
   <funcs>
     <func>
-      <name name="add_binding" arity="3"/>
+      <name name="add_binding" arity="3" since=""/>
       <fsummary>Add a binding.</fsummary>
       <desc>
         <p>Adds binding <c><anno>Name</anno>=<anno>Value</anno></c>
@@ -106,7 +106,7 @@
     </func>
 
     <func>
-      <name name="binding" arity="2"/>
+      <name name="binding" arity="2" since=""/>
       <fsummary>Return bindings.</fsummary>
       <desc>
         <p>Returns the binding of <c><anno>Name</anno></c>
@@ -115,7 +115,7 @@
     </func>
 
     <func>
-      <name name="bindings" arity="1"/>
+      <name name="bindings" arity="1" since=""/>
       <fsummary>Return bindings.</fsummary>
       <desc>
         <p>Returns the list of bindings contained in the binding
@@ -124,7 +124,7 @@
     </func>
 
     <func>
-      <name name="del_binding" arity="2"/>
+      <name name="del_binding" arity="2" since=""/>
       <fsummary>Delete a binding.</fsummary>
       <desc>
         <p>Removes the binding of <c><anno>Name</anno></c>
@@ -134,10 +134,10 @@
     </func>
 
     <func>
-      <name name="expr" arity="2"/>
-      <name name="expr" arity="3"/>
-      <name name="expr" arity="4"/>
-      <name name="expr" arity="5"/>
+      <name name="expr" arity="2" since=""/>
+      <name name="expr" arity="3" since=""/>
+      <name name="expr" arity="4" since=""/>
+      <name name="expr" arity="5" since=""/>
       <fsummary>Evaluate expression.</fsummary>
       <desc>
         <p>Evaluates <c><anno>Expression</anno></c> with the set of bindings
@@ -157,9 +157,9 @@
     </func>
 
     <func>
-      <name name="expr_list" arity="2"/>
-      <name name="expr_list" arity="3"/>
-      <name name="expr_list" arity="4"/>
+      <name name="expr_list" arity="2" since=""/>
+      <name name="expr_list" arity="3" since=""/>
+      <name name="expr_list" arity="4" since=""/>
       <fsummary>Evaluate a list of expressions.</fsummary>
       <desc>
         <p>Evaluates a list of expressions in parallel, using the same
@@ -174,9 +174,9 @@
     </func>
 
     <func>
-      <name name="exprs" arity="2"/>
-      <name name="exprs" arity="3"/>
-      <name name="exprs" arity="4"/>
+      <name name="exprs" arity="2" since=""/>
+      <name name="exprs" arity="3" since=""/>
+      <name name="exprs" arity="4" since=""/>
       <fsummary>Evaluate expressions.</fsummary>
       <desc>
         <p>Evaluates <c><anno>Expressions</anno></c> with the set of bindings
@@ -197,7 +197,7 @@
     </func>
 
     <func>
-      <name name="new_bindings" arity="0"/>
+      <name name="new_bindings" arity="0" since=""/>
       <fsummary>Return a bindings structure.</fsummary>
       <desc>
         <p>Returns an empty binding structure.</p>
diff --git a/lib/stdlib/doc/src/erl_expand_records.xml b/lib/stdlib/doc/src/erl_expand_records.xml
index b6aa75ed03..20e5f1960b 100644
--- a/lib/stdlib/doc/src/erl_expand_records.xml
+++ b/lib/stdlib/doc/src/erl_expand_records.xml
@@ -34,7 +34,7 @@
     <rev>PA1</rev>
     <file>erl_expand_records.xml</file>
   </header>
-  <module>erl_expand_records</module>
+  <module since="">erl_expand_records</module>
   <modulesummary>Expands records in a module.</modulesummary>
   <description>
     <p>This module expands records in a module.</p>
@@ -42,7 +42,7 @@
 
   <funcs>
     <func>
-      <name name="module" arity="2"/>
+      <name name="module" arity="2" since=""/>
       <fsummary>Expand all records in a module.</fsummary>
       <desc>
         <p>Expands all records in a module to use explicit tuple
diff --git a/lib/stdlib/doc/src/erl_id_trans.xml b/lib/stdlib/doc/src/erl_id_trans.xml
index 16952a9582..ec66842ac0 100644
--- a/lib/stdlib/doc/src/erl_id_trans.xml
+++ b/lib/stdlib/doc/src/erl_id_trans.xml
@@ -34,7 +34,7 @@
     <rev>B</rev>
     <file>erl_id_trans.xml</file>
   </header>
-  <module>erl_id_trans</module>
+  <module since="">erl_id_trans</module>
   <modulesummary>An identity parse transform.</modulesummary>
   <description>
     <p>This module performs an identity parse transformation of Erlang code.
@@ -46,7 +46,7 @@
 
   <funcs>
     <func>
-      <name>parse_transform(Forms, Options) -> Forms</name>
+      <name since="">parse_transform(Forms, Options) -> Forms</name>
       <fsummary>Transform Erlang forms.</fsummary>
       <type>
         <v>Forms = [<seealso marker="erl_parse#type-abstract_form">erl_parse:abstract_form()</seealso>
diff --git a/lib/stdlib/doc/src/erl_internal.xml b/lib/stdlib/doc/src/erl_internal.xml
index 17cd0fb240..77551ffed7 100644
--- a/lib/stdlib/doc/src/erl_internal.xml
+++ b/lib/stdlib/doc/src/erl_internal.xml
@@ -34,7 +34,7 @@
     <rev>B</rev>
     <file>erl_internal.xml</file>
   </header>
-  <module>erl_internal</module>
+  <module since="">erl_internal</module>
   <modulesummary>Internal Erlang definitions.</modulesummary>
   <description>
     <p>This module defines Erlang BIFs, guard tests, and operators.
@@ -44,7 +44,7 @@
 
   <funcs>
     <func>
-      <name name="add_predefined_functions" arity="1"/>
+      <name name="add_predefined_functions" arity="1" since="OTP 20.0"/>
       <fsummary>Add code for pre-defined functions.</fsummary>
       <desc>
         <p>Adds to <c><anno>Forms</anno></c> the code for the standard
@@ -54,7 +54,7 @@
     </func>
 
     <func>
-      <name name="arith_op" arity="2"/>
+      <name name="arith_op" arity="2" since=""/>
       <fsummary>Test for an arithmetic operator.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>OpName</anno>/<anno>Arity</anno></c>
@@ -63,7 +63,7 @@
     </func>
 
     <func>
-      <name name="bif" arity="2"/>
+      <name name="bif" arity="2" since=""/>
       <fsummary>Test for an Erlang BIF.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Name</anno>/<anno>Arity</anno></c>
@@ -73,7 +73,7 @@
     </func>
 
     <func>
-      <name name="bool_op" arity="2"/>
+      <name name="bool_op" arity="2" since=""/>
       <fsummary>Test for a Boolean operator.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>OpName</anno>/<anno>Arity</anno></c>
@@ -82,7 +82,7 @@
     </func>
 
     <func>
-      <name name="comp_op" arity="2"/>
+      <name name="comp_op" arity="2" since=""/>
       <fsummary>Test for a comparison operator.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>OpName</anno>/<anno>Arity</anno></c>
@@ -91,7 +91,7 @@
     </func>
 
     <func>
-      <name name="guard_bif" arity="2"/>
+      <name name="guard_bif" arity="2" since=""/>
       <fsummary>Test for an Erlang BIF allowed in guards.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Name</anno>/<anno>Arity</anno></c> is
@@ -100,7 +100,7 @@
     </func>
 
     <func>
-      <name name="list_op" arity="2"/>
+      <name name="list_op" arity="2" since=""/>
       <fsummary>Test for a list operator.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>OpName</anno>/<anno>Arity</anno></c>
@@ -109,7 +109,7 @@
     </func>
 
     <func>
-      <name name="op_type" arity="2"/>
+      <name name="op_type" arity="2" since=""/>
       <fsummary>Return operator type.</fsummary>
       <desc>
         <p>Returns the <c><anno>Type</anno></c> of operator that
@@ -120,7 +120,7 @@
     </func>
 
     <func>
-      <name name="send_op" arity="2"/>
+      <name name="send_op" arity="2" since=""/>
       <fsummary>Test for a send operator.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>OpName</anno>/<anno>Arity</anno></c>
@@ -129,7 +129,7 @@
     </func>
 
     <func>
-      <name name="type_test" arity="2"/>
+      <name name="type_test" arity="2" since=""/>
       <fsummary>Test for a valid type test.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Name</anno>/<anno>Arity</anno></c> is
diff --git a/lib/stdlib/doc/src/erl_lint.xml b/lib/stdlib/doc/src/erl_lint.xml
index 77cb7a9916..12eaafc3a8 100644
--- a/lib/stdlib/doc/src/erl_lint.xml
+++ b/lib/stdlib/doc/src/erl_lint.xml
@@ -32,7 +32,7 @@
     <rev>B</rev>
     <file>erl_lint.xml</file>
   </header>
-  <module>erl_lint</module>
+  <module since="">erl_lint</module>
   <modulesummary>The Erlang code linter.</modulesummary>
   <description>
     <p>This module is used to check Erlang code for illegal syntax and
@@ -78,7 +78,7 @@
 
   <funcs>
     <func>
-      <name name="format_error" arity="1"/>
+      <name name="format_error" arity="1" since=""/>
       <fsummary>Format an error descriptor.</fsummary>
       <desc>
         <p>Takes an <c><anno>ErrorDescriptor</anno></c> and returns a string
@@ -90,7 +90,7 @@
     </func>
 
     <func>
-      <name name="is_guard_test" arity="1"/>
+      <name name="is_guard_test" arity="1" since=""/>
       <fsummary>Test for a guard test.</fsummary>
       <desc>
         <p>Tests if <c><anno>Expr</anno></c> is a legal guard test.
@@ -102,9 +102,9 @@
     </func>
 
     <func>
-      <name name="module" arity="1"/>
-      <name name="module" arity="2"/>
-      <name name="module" arity="3"/>
+      <name name="module" arity="1" since=""/>
+      <name name="module" arity="2" since=""/>
+      <name name="module" arity="3" since=""/>
       <fsummary>Check a module for errors.</fsummary>
       <desc>
         <p>Checks all the forms in a module for errors. It returns:</p>
diff --git a/lib/stdlib/doc/src/erl_parse.xml b/lib/stdlib/doc/src/erl_parse.xml
index 647f36883c..8142e5c0aa 100644
--- a/lib/stdlib/doc/src/erl_parse.xml
+++ b/lib/stdlib/doc/src/erl_parse.xml
@@ -32,7 +32,7 @@
     <rev>B</rev>
     <file>erl_parse.xml</file>
   </header>
-  <module>erl_parse</module>
+  <module since="">erl_parse</module>
   <modulesummary>The Erlang parser.</modulesummary>
   <description>
     <p>This module is the basic Erlang parser that converts tokens into
@@ -89,7 +89,7 @@
 
   <funcs>
     <func>
-      <name name="abstract" arity="1"/>
+      <name name="abstract" arity="1" since=""/>
       <fsummary>Convert an Erlang term into an abstract form.</fsummary>
       <desc>
         <p>Converts the Erlang data structure <c><anno>Data</anno></c> into an
@@ -102,7 +102,7 @@
     </func>
 
     <func>
-      <name name="abstract" arity="2"/>
+      <name name="abstract" arity="2" since="OTP R16B01"/>
       <fsummary>Convert an Erlang term into an abstract form.</fsummary>
       <type name="encoding_func"/>
       <desc>
@@ -124,7 +124,7 @@
     </func>
 
     <func>
-      <name name="anno_from_term" arity="1"/>
+      <name name="anno_from_term" arity="1" since="OTP 18.0"/>
       <fsummary>Return annotations as terms.</fsummary>
       <desc>
         <p>Assumes that <c><anno>Term</anno></c> is a term with the same
@@ -140,7 +140,7 @@
     </func>
 
     <func>
-      <name name="anno_to_term" arity="1"/>
+      <name name="anno_to_term" arity="1" since="OTP 18.0"/>
       <fsummary>Return the representation of annotations.</fsummary>
       <desc>
         <p>Returns a term where each collection of annotations
@@ -154,7 +154,7 @@
     </func>
 
     <func>
-      <name name="fold_anno" arity="3"/>
+      <name name="fold_anno" arity="3" since="OTP 18.0"/>
       <fsummary>Fold a function over the annotations of an <c>erl_parse</c> tree.
       </fsummary>
       <desc>
@@ -171,7 +171,7 @@
     </func>
 
     <func>
-      <name>format_error(ErrorDescriptor) -> Chars</name>
+      <name since="">format_error(ErrorDescriptor) -> Chars</name>
       <fsummary>Format an error descriptor.</fsummary>
       <type>
         <v>ErrorDescriptor = <seealso
@@ -188,7 +188,7 @@
     </func>
 
     <func>
-      <name name="map_anno" arity="2"/>
+      <name name="map_anno" arity="2" since="OTP 18.0"/>
       <fsummary>Map a function over the annotations of an <c>erl_parse</c> tree.
       </fsummary>
       <desc>
@@ -201,7 +201,7 @@
     </func>
 
     <func>
-      <name name="mapfold_anno" arity="3"/>
+      <name name="mapfold_anno" arity="3" since="OTP 18.0"/>
       <fsummary>Map and fold a function over the annotations of an
         <c>erl_parse</c> tree.</fsummary>
       <desc>
@@ -220,7 +220,7 @@
     </func>
 
     <func>
-      <name name="new_anno" arity="1"/>
+      <name name="new_anno" arity="1" since="OTP 18.0"/>
       <fsummary>Create new annotations.</fsummary>
       <desc>
         <p>Assumes that <c><anno>Term</anno></c> is a term with the same
@@ -236,7 +236,7 @@
     </func>
 
     <func>
-      <name name="normalise" arity="1"/>
+      <name name="normalise" arity="1" since=""/>
       <fsummary>Convert abstract form to an Erlang term.</fsummary>
       <desc>
         <p>Converts the abstract form <c><anno>AbsTerm</anno></c> of a
@@ -247,7 +247,7 @@
     </func>
 
     <func>
-      <name name="parse_exprs" arity="1"/>
+      <name name="parse_exprs" arity="1" since=""/>
       <fsummary>Parse Erlang expressions.</fsummary>
       <desc>
         <p>Parses <c><anno>Tokens</anno></c> as if it was a list of expressions.
@@ -267,7 +267,7 @@
     </func>
 
     <func>
-      <name name="parse_form" arity="1"/>
+      <name name="parse_form" arity="1" since=""/>
       <fsummary>Parse an Erlang form.</fsummary>
       <desc>
         <p>Parses <c><anno>Tokens</anno></c> as if it was a form. Returns one
@@ -287,7 +287,7 @@
     </func>
 
     <func>
-      <name name="parse_term" arity="1"/>
+      <name name="parse_term" arity="1" since=""/>
       <fsummary>Parse an Erlang term.</fsummary>
       <desc>
         <p>Parses <c><anno>Tokens</anno></c> as if it was a term. Returns
@@ -307,8 +307,8 @@
     </func>
 
     <func>
-      <name name="tokens" arity="1"/>
-      <name name="tokens" arity="2"/>
+      <name name="tokens" arity="1" since=""/>
+      <name name="tokens" arity="2" since=""/>
       <fsummary>Generate a list of tokens for an expression.</fsummary>
       <desc>
         <p>Generates a list of tokens representing the abstract
diff --git a/lib/stdlib/doc/src/erl_pp.xml b/lib/stdlib/doc/src/erl_pp.xml
index 77a7f1e8d1..0a46139db6 100644
--- a/lib/stdlib/doc/src/erl_pp.xml
+++ b/lib/stdlib/doc/src/erl_pp.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>1996</year>
-      <year>2016</year>
+      <year>2019</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>            
     <legalnotice>
@@ -34,7 +34,7 @@
     <rev>B</rev>
     <file>erl_pp.xml</file>
   </header>
-  <module>erl_pp</module>
+  <module since="">erl_pp</module>
   <modulesummary>The Erlang pretty printer.</modulesummary>
   <description>
     <p>The functions in this module are used to generate
@@ -65,6 +65,10 @@
     </datatype>
     <datatype>
       <name name="option"/>
+      <desc>
+        <p>The option <c>quote_singleton_atom_types</c>
+          is used to add quotes to all singleton atom types.</p>
+      </desc>
     </datatype>
     <datatype>
       <name name="options"/>
@@ -73,8 +77,8 @@
 
   <funcs>
     <func>
-      <name name="attribute" arity="1"/>
-      <name name="attribute" arity="2"/>
+      <name name="attribute" arity="1" since=""/>
+      <name name="attribute" arity="2" since=""/>
       <fsummary>Pretty print an attribute.</fsummary>
       <desc>
         <p>Same as <seealso marker="#form/1"><c>form/1,2</c></seealso>,
@@ -83,10 +87,10 @@
     </func>
 
     <func>
-      <name name="expr" arity="1"/>
-      <name name="expr" arity="2"/>
-      <name name="expr" arity="3"/>
-      <name name="expr" arity="4"/>
+      <name name="expr" arity="1" since=""/>
+      <name name="expr" arity="2" since=""/>
+      <name name="expr" arity="3" since=""/>
+      <name name="expr" arity="4" since=""/>
       <fsummary>Pretty print one <c>Expression</c>.</fsummary>
       <desc>
         <p>Prints one expression. It is useful for implementing hooks (see
@@ -96,9 +100,9 @@
     </func>
 
     <func>
-      <name name="exprs" arity="1"/>
-      <name name="exprs" arity="2"/>
-      <name name="exprs" arity="3"/>
+      <name name="exprs" arity="1" since=""/>
+      <name name="exprs" arity="2" since=""/>
+      <name name="exprs" arity="3" since=""/>
       <fsummary>Pretty print <c>Expressions</c>.</fsummary>
       <desc>
         <p>Same as <seealso marker="#form/1"><c>form/1,2</c></seealso>,
@@ -108,8 +112,8 @@
     </func>
 
     <func>
-      <name name="form" arity="1"/>
-      <name name="form" arity="2"/>
+      <name name="form" arity="1" since=""/>
+      <name name="form" arity="2" since=""/>
       <fsummary>Pretty print a form.</fsummary>
       <desc>
         <p>Pretty prints a
@@ -120,8 +124,8 @@
     </func>
 
     <func>
-      <name name="function" arity="1"/>
-      <name name="function" arity="2"/>
+      <name name="function" arity="1" since=""/>
+      <name name="function" arity="2" since=""/>
       <fsummary>Pretty print a function.</fsummary>
       <desc>
         <p>Same as <seealso marker="#form/1"><c>form/1,2</c></seealso>,
@@ -130,8 +134,8 @@
     </func>
 
     <func>
-      <name name="guard" arity="1"/>
-      <name name="guard" arity="2"/>
+      <name name="guard" arity="1" since=""/>
+      <name name="guard" arity="2" since=""/>
       <fsummary>Pretty print a guard.</fsummary>
       <desc>
         <p>Same as <seealso marker="#form/1"><c>form/1,2</c></seealso>,
diff --git a/lib/stdlib/doc/src/erl_scan.xml b/lib/stdlib/doc/src/erl_scan.xml
index 137ccd3416..38111f73bc 100644
--- a/lib/stdlib/doc/src/erl_scan.xml
+++ b/lib/stdlib/doc/src/erl_scan.xml
@@ -32,7 +32,7 @@
     <rev>B</rev>
     <file>erl_scan.xml</file>
   </header>
-  <module>erl_scan</module>
+  <module since="">erl_scan</module>
   <modulesummary>The Erlang token scanner.</modulesummary>
   <description>
     <p>This module contains functions for tokenizing (scanning) characters into
@@ -74,7 +74,7 @@
  
   <funcs>
     <func>
-      <name name="category" arity="1"/>
+      <name name="category" arity="1" since="OTP 18.0"/>
       <fsummary>Return the category.</fsummary>
       <desc>
         <p>Returns the category of <c><anno>Token</anno></c>.</p>
@@ -82,7 +82,7 @@
     </func>
 
     <func>
-      <name name="column" arity="1"/>
+      <name name="column" arity="1" since="OTP 18.0"/>
       <fsummary>Return the column.</fsummary>
       <desc>
         <p>Returns the column of <c><anno>Token</anno></c>'s
@@ -91,7 +91,7 @@
     </func>
 
     <func>
-      <name name="end_location" arity="1"/>
+      <name name="end_location" arity="1" since="OTP 18.0"/>
       <fsummary>Return the end location of the text.</fsummary>
       <desc>
         <p>Returns the end location of the text of
@@ -101,7 +101,7 @@
     </func>
 
     <func>
-      <name name="format_error" arity="1"/>
+      <name name="format_error" arity="1" since=""/>
       <fsummary>Format an error descriptor.</fsummary>
       <desc>
         <p>Uses an <c><anno>ErrorDescriptor</anno></c> and returns a string 
@@ -113,7 +113,7 @@
     </func>
 
     <func>
-      <name name="line" arity="1"/>
+      <name name="line" arity="1" since="OTP 18.0"/>
       <fsummary>Return the line.</fsummary>
       <desc>
         <p>Returns the line of <c><anno>Token</anno></c>'s collection
@@ -122,7 +122,7 @@
     </func>
 
     <func>
-      <name name="location" arity="1"/>
+      <name name="location" arity="1" since="OTP 18.0"/>
       <fsummary>Return the location.</fsummary>
       <desc>
         <p>Returns the location of <c><anno>Token</anno></c>'s
@@ -131,7 +131,7 @@
     </func>
 
     <func>
-      <name name="reserved_word" arity="1"/>
+      <name name="reserved_word" arity="1" since=""/>
       <fsummary>Test for a reserved word.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Atom</anno></c> is an
@@ -140,9 +140,9 @@
     </func>
 
     <func>
-      <name name="string" arity="1"/>
-      <name name="string" arity="2"/>
-      <name name="string" arity="3"/>
+      <name name="string" arity="1" since=""/>
+      <name name="string" arity="2" since=""/>
+      <name name="string" arity="3" since=""/>
       <fsummary>Scan a string and return the Erlang tokens.</fsummary>
       <desc>
         <p>Takes the list of characters <c><anno>String</anno></c> and tries to
@@ -229,7 +229,7 @@
     </func>
 
     <func>
-      <name name="symbol" arity="1"/>
+      <name name="symbol" arity="1" since="OTP 18.0"/>
       <fsummary>Return the symbol.</fsummary>
       <desc>
         <p>Returns the symbol of <c><anno>Token</anno></c>.</p>
@@ -237,7 +237,7 @@
     </func>
 
     <func>
-      <name name="text" arity="1"/>
+      <name name="text" arity="1" since="OTP 18.0"/>
       <fsummary>Return the text.</fsummary>
       <desc>
         <p>Returns the text of <c><anno>Token</anno></c>'s collection
@@ -247,8 +247,8 @@
     </func>
 
     <func>
-      <name name="tokens" arity="3"/>
-      <name name="tokens" arity="4"/>
+      <name name="tokens" arity="3" since=""/>
+      <name name="tokens" arity="4" since=""/>
       <fsummary>Re-entrant scanner.</fsummary>
       <type name="char_spec"/>
       <type name="return_cont"/>
diff --git a/lib/stdlib/doc/src/erl_tar.xml b/lib/stdlib/doc/src/erl_tar.xml
index 68fa071090..ea8173748a 100644
--- a/lib/stdlib/doc/src/erl_tar.xml
+++ b/lib/stdlib/doc/src/erl_tar.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>erl_tar.xml</file>
   </header>
-  <module>erl_tar</module>
+  <module since="">erl_tar</module>
   <modulesummary>Unix 'tar' utility for reading and writing tar archives.
   </modulesummary>
   <description>
@@ -127,7 +127,7 @@
 
   <funcs>
     <func>
-      <name>add(TarDescriptor, Filename, Options) -> RetValue</name>
+      <name since="">add(TarDescriptor, Filename, Options) -> RetValue</name>
       <fsummary>Add a file to an open tar file.</fsummary>
       <type>
         <v>TarDescriptor = term()</v>
@@ -211,7 +211,7 @@
     </func>
 
     <func>
-      <name>add(TarDescriptor, FilenameOrBin, NameInArchive, Options) ->
+      <name since="">add(TarDescriptor, FilenameOrBin, NameInArchive, Options) ->
         RetValue </name>
       <fsummary>Add a file to an open tar file.</fsummary>
       <type>
@@ -233,7 +233,7 @@
     </func>
 
     <func>
-      <name>close(TarDescriptor)</name>
+      <name since="">close(TarDescriptor)</name>
       <fsummary>Close an open tar file.</fsummary>
       <type>
         <v>TarDescriptor = term()</v>
@@ -245,7 +245,7 @@
     </func>
 
     <func>
-      <name>create(Name, FileList) ->RetValue </name>
+      <name since="">create(Name, FileList) ->RetValue </name>
       <fsummary>Create a tar archive.</fsummary>
       <type>
         <v>Name = filename()</v>
@@ -264,7 +264,7 @@
     </func>
 
     <func>
-      <name>create(Name, FileList, OptionList)</name>
+      <name since="">create(Name, FileList, OptionList)</name>
       <fsummary>Create a tar archive with options.</fsummary>
       <type>
         <v>Name = filename()</v>
@@ -315,7 +315,7 @@
     </func>
 
     <func>
-      <name>extract(Name) -> RetValue</name>
+      <name since="">extract(Name) -> RetValue</name>
       <fsummary>Extract all files from a tar file.</fsummary>
       <type>
         <v>Name = filename() | {binary,binary()} | {file,Fd}</v>
@@ -339,7 +339,7 @@
     </func>
 
     <func>
-      <name>extract(Name, OptionList)</name>
+      <name since="">extract(Name, OptionList)</name>
       <fsummary>Extract files from a tar file.</fsummary>
       <type>
         <v>Name = filename() | {binary,binary()} | {file,Fd}</v>
@@ -411,7 +411,7 @@
     </func>
 
     <func>
-      <name>format_error(Reason) -> string()</name>
+      <name since="">format_error(Reason) -> string()</name>
       <fsummary>Convert error term to a readable string.</fsummary>
       <type>
         <v>Reason = term()</v>
@@ -423,7 +423,7 @@
     </func>
 
     <func>
-      <name>init(UserPrivate, AccessMode, Fun) ->
+      <name since="OTP 17.4">init(UserPrivate, AccessMode, Fun) ->
         {ok,TarDescriptor} | {error,Reason}</name>
       <fsummary>Create a <c>TarDescriptor</c> used in subsequent tar operations
         when defining own low-level storage access functions.</fsummary>
@@ -518,7 +518,7 @@ erl_tar:close(TarDesc)</code>
     </func>
 
     <func>
-      <name>open(Name, OpenModeList) -> RetValue</name>
+      <name since="">open(Name, OpenModeList) -> RetValue</name>
       <fsummary>Open a tar file for writing.</fsummary>
       <type>
         <v>Name = filename()</v>
@@ -565,7 +565,7 @@ erl_tar:close(TarDesc)</code>
     </func>
 
     <func>
-      <name>table(Name) -> RetValue</name>
+      <name since="">table(Name) -> RetValue</name>
       <fsummary>Retrieve the name of all files in a tar file.</fsummary>
       <type>
         <v>Name = filename()|{binary,binary()}|{file,file_descriptor()}</v>
@@ -578,7 +578,7 @@ erl_tar:close(TarDesc)</code>
     </func>
 
     <func>
-      <name>table(Name, Options)</name>
+      <name since="">table(Name, Options)</name>
       <fsummary>Retrieve name and information of all files in a tar file.
       </fsummary>
       <type>
@@ -590,7 +590,7 @@ erl_tar:close(TarDesc)</code>
     </func>
 
     <func>
-      <name>t(Name)</name>
+      <name since="">t(Name)</name>
       <fsummary>Print the name of each file in a tar file.</fsummary>
       <type>
         <v>Name = filename()|{binary,binary()}|{file,file_descriptor()}</v>
@@ -602,7 +602,7 @@ erl_tar:close(TarDesc)</code>
     </func>
 
     <func>
-      <name>tt(Name)</name>
+      <name since="">tt(Name)</name>
       <fsummary>Print name and information for each file in a tar file.
       </fsummary>
       <type>
diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml
index ad006f9a2b..2cb677785d 100644
--- a/lib/stdlib/doc/src/ets.xml
+++ b/lib/stdlib/doc/src/ets.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>ets</module>
+  <module since="">ets</module>
   <modulesummary>Built-in term storage.</modulesummary>
   <description>
     <p>This module is an interface to the Erlang built-in term storage
@@ -138,23 +138,96 @@
        operation. In database terms the isolation level can be seen as
        "serializable", as if all isolated operations are carried out serially,
        one after the other in a strict order.</p>
+  </section>
 
-      <p>No other support is available within this module that would guarantee
-       consistency between objects. However, function
-       <seealso marker="#safe_fixtable/2"><c>safe_fixtable/2</c></seealso>
-       can be used to guarantee that a sequence of
-       <seealso marker="#first/1"><c>first/1</c></seealso> and
-       <seealso marker="#next/2"><c>next/2</c></seealso> calls traverse the
-       table without errors and that each existing object in the table is
-       visited exactly once, even if another (or the same) process
-       simultaneously deletes or inserts objects into the table.
-       Nothing else is guaranteed; in particular objects that are inserted
-       or deleted during such a traversal can be visited once or not at all.
-       Functions that internally traverse over a table, like
-       <seealso marker="#select/1"><c>select</c></seealso> and
-       <seealso marker="#match/1"><c>match</c></seealso>,
-       give the same guarantee as
-       <seealso marker="#safe_fixtable/2"><c>safe_fixtable</c></seealso>.</p>
+  <section><marker id="traversal"></marker>
+    <title>Table traversal</title>
+    <p>There are different ways to traverse through the objects of a table.</p>
+    <list type="bulleted">
+      <item><p><em>Single-step</em> traversal one key at at time, using
+	<seealso marker="#first/1"><c>first/1</c></seealso>,
+	<seealso marker="#next/2"><c>next/2</c></seealso>,
+	<seealso marker="#last/1"><c>last/1</c></seealso> and
+	<seealso marker="#prev/2"><c>prev/2</c></seealso>.</p>
+      </item>
+      <item><p>Search with simple <em>match patterns</em>, using
+	<seealso marker="#match/1"><c>match/1/2/3</c></seealso>,
+	<seealso marker="#match_delete/2"><c>match_delete/2</c></seealso> and
+	<seealso marker="#match_object/1"><c>match_object/1/2/3</c></seealso>.</p>
+      </item>
+      <item><p>Search with more powerful <em>match specifications</em>, using
+	<seealso marker="#select/1"><c>select/1/2/3</c></seealso>,
+	<seealso marker="#select_count/2"><c>select_count/2</c></seealso>,
+	<seealso marker="#select_delete/2"><c>select_delete/2</c></seealso>,
+	<seealso marker="#select_replace/2"><c>select_replace/2</c></seealso> and
+	<seealso marker="#select_reverse/1"><c>select_reverse/1/2/3</c></seealso>.</p>
+      </item>
+      <item><p><em>Table conversions</em>, using
+	<seealso marker="#tab2file/2"><c>tab2file/2/3</c></seealso> and
+        <seealso marker="#tab2list/1"><c>tab2list/1</c></seealso>.</p>
+      </item>
+    </list>
+    <p>None of these ways of table traversal will guarantee a consistent table snapshot
+    if the table is also updated during the traversal. Moreover, traversals not
+    done in a <em>safe</em> way, on tables where keys are inserted or deleted
+    during the traversal, may yield the following undesired effects:</p>
+    <list type="bulleted">
+      <item><p>Any key may be missed.</p></item>
+      <item><p>Any key may be found more than once.</p></item>
+      <item><p>The traversal may fail with <c>badarg</c> exception if keys are deleted.</p>
+      </item>
+    </list>
+    <p>A table traversal is <em>safe</em> if either</p>
+    <list type="bulleted">
+      <item><p>the table is of type <c>ordered_set</c>.</p>
+      </item>
+      <item><p>the entire table traversal is done within one ETS function
+        call.</p>
+      </item>
+      <item><p>function <seealso marker="#safe_fixtable/2"><c>safe_fixtable/2</c></seealso>
+        is used to keep the table fixated during the entire traversal.</p>
+      </item>
+    </list>
+    <note>
+      <p>Even though the access of a single object is always guaranteed to be
+      <seealso marker="#concurrency">atomic and isolated</seealso>, each traversal
+      through a table to find the next key is not done with such guarantees. This is often
+      not a problem, but may cause rare subtle "unexpected" effects if a concurrent
+      process inserts objects during a traversal. For example, consider one
+      process doing</p>
+<pre>
+ets:new(t, [ordered_set, named_table]),
+ets:insert(t, {1}),
+ets:insert(t, {2}),
+ets:insert(t, {3}),
+</pre>
+      <p>A concurrent call to <c>ets:first(t)</c>, done by another
+      process, may then in rare cases return <c>2</c> even though
+      <c>2</c> has never existed in the table ordered as the first key. In
+      the same way, a concurrent call to <c>ets:next(t, 1)</c> may return
+      <c>3</c> even though <c>3</c> never existed in the table
+      ordered directly after <c>1</c>.</p>
+      <p>Effects like this are improbable but possible. The probability will
+      further be reduced (if not vanish) if table option
+      <seealso marker="#new_2_write_concurrency"><c>write_concurrency</c></seealso>
+      is not enabled. This can also only be a potential concern for
+      <c>ordered_set</c> where the traversal order is defined.</p>
+    </note>
+    <p>Traversals using <c>match</c> and <c>select</c> functions may not need to
+    scan the entire table depending on how the key is specified. A match
+    pattern with a <em>fully bound key</em> (without any match variables) will
+    optimize the operation to a single key lookup without any table traversal
+    at all. For <c>ordered_set</c> a <em>partially bound key</em> will limit the
+    traversal to only scan a subset of the table based on term order. A
+    partially bound key is either a list or a tuple with a prefix that is fully
+    bound. Example:</p>
+<pre>
+1> <input>T = ets:new(t,[ordered_set]), ets:insert(T, {"555-1234", "John Smith"}).</input>
+true
+2> <input>%% Efficient search of all with area code 555</input>
+2> <input>ets:match(T,{[$5,$5,$5,$- |'$1'],'$2'}).</input>
+[["1234","John Smith"]]
+</pre>
   </section>
 
   <section>
@@ -207,7 +280,7 @@
 
   <funcs>
     <func>
-      <name name="all" arity="0"/>
+      <name name="all" arity="0" since=""/>
       <fsummary>Return a list of all ETS tables.</fsummary>
       <desc>
         <p>Returns a list of all tables at the node. Named tables are
@@ -222,7 +295,7 @@
     </func>
 
     <func>
-      <name name="delete" arity="1"/>
+      <name name="delete" arity="1" since=""/>
       <fsummary>Delete an entire ETS table.</fsummary>
       <desc>
         <p>Deletes the entire table <c><anno>Tab</anno></c>.</p>
@@ -230,7 +303,7 @@
     </func>
 
     <func>
-      <name name="delete" arity="2"/>
+      <name name="delete" arity="2" since=""/>
       <fsummary>Delete all objects with a specified key from an ETS
         table.</fsummary>
       <desc>
@@ -240,7 +313,7 @@
     </func>
 
     <func>
-      <name name="delete_all_objects" arity="1"/>
+      <name name="delete_all_objects" arity="1" since=""/>
       <fsummary>Delete all objects in an ETS table.</fsummary>
       <desc>
         <p>Delete all objects in the ETS table <c><anno>Tab</anno></c>.
@@ -250,7 +323,7 @@
     </func>
 
     <func>
-      <name name="delete_object" arity="2"/>
+      <name name="delete_object" arity="2" since=""/>
       <fsummary>Deletes a specific from an ETS table.</fsummary>
       <desc>
         <p>Delete the exact object <c><anno>Object</anno></c> from the
@@ -262,7 +335,7 @@
     </func>
 
     <func>
-      <name name="file2tab" arity="1"/>
+      <name name="file2tab" arity="1" since=""/>
       <fsummary>Read an ETS table from a file.</fsummary>
       <desc>
         <p>Reads a file produced by <seealso marker="#tab2file/2">
@@ -274,7 +347,7 @@
     </func>
 
     <func>
-      <name name="file2tab" arity="2"/>
+      <name name="file2tab" arity="2" since=""/>
       <fsummary>Read an ETS table from a file.</fsummary>
       <desc>
         <p>Reads a file produced by <seealso marker="#tab2file/2">
@@ -306,7 +379,7 @@
     </func>
 
     <func>
-      <name name="first" arity="1"/>
+      <name name="first" arity="1" since=""/>
       <fsummary>Return the first key in an ETS table.</fsummary>
       <desc>
         <p>Returns the first key <c><anno>Key</anno></c> in table
@@ -321,7 +394,7 @@
     </func>
 
     <func>
-      <name name="foldl" arity="3"/>
+      <name name="foldl" arity="3" since=""/>
       <fsummary>Fold a function over an ETS table.</fsummary>
       <desc>
         <p><c><anno>Acc0</anno></c> is returned if the table is empty.
@@ -337,7 +410,7 @@
     </func>
 
     <func>
-      <name name="foldr" arity="3"/>
+      <name name="foldr" arity="3" since=""/>
       <fsummary>Fold a function over an ETS table.</fsummary>
       <desc>
         <p><c><anno>Acc0</anno></c> is returned if the table is empty.
@@ -353,7 +426,7 @@
     </func>
 
     <func>
-      <name name="from_dets" arity="2"/>
+      <name name="from_dets" arity="2" since=""/>
       <fsummary>Fill an ETS table with objects from a Dets
         table.</fsummary>
       <desc>
@@ -367,7 +440,7 @@
     </func>
 
     <func>
-      <name name="fun2ms" arity="1"/>
+      <name name="fun2ms" arity="1" since=""/>
       <fsummary>Pseudo function that transforms fun syntax to a match
         specification.</fsummary>
       <desc>
@@ -436,7 +509,7 @@ Error: fun containing local Erlang function calls
     </func>
 
     <func>
-      <name name="give_away" arity="3"/>
+      <name name="give_away" arity="3" since=""/>
       <fsummary>Change owner of a table.</fsummary>
       <desc>
         <p>Make process <c><anno>Pid</anno></c> the new owner of table
@@ -454,7 +527,7 @@ Error: fun containing local Erlang function calls
     </func>
 
     <func>
-      <name name="i" arity="0"/>
+      <name name="i" arity="0" since=""/>
       <fsummary>Display information about all ETS tables on a terminal.
       </fsummary>
       <desc>
@@ -463,7 +536,7 @@ Error: fun containing local Erlang function calls
     </func>
 
     <func>
-      <name name="i" arity="1"/>
+      <name name="i" arity="1" since=""/>
       <fsummary>Browse an ETS table on a terminal.</fsummary>
       <desc>
         <p>Browses table <c><anno>Tab</anno></c> on a terminal.</p>
@@ -471,7 +544,7 @@ Error: fun containing local Erlang function calls
     </func>
 
     <func>
-      <name name="info" arity="1"/>
+      <name name="info" arity="1" since=""/>
       <fsummary>Return information about an <c>table</c>.</fsummary>
       <desc>
         <p>Returns information about table <c><anno>Tab</anno></c> as a list of
@@ -547,7 +620,7 @@ Error: fun containing local Erlang function calls
     </func>
 
     <func>
-      <name name="info" arity="2"/>
+      <name name="info" arity="2" since=""/>
       <fsummary>Return the information associated with the specified item for
         an ETS table.</fsummary>
       <desc>
@@ -569,12 +642,11 @@ Error: fun containing local Erlang function calls
             <p><marker id="info_2_safe_fixed_monotonic_time"/></p>
             <p><c>Item=safe_fixed|safe_fixed_monotonic_time,
               Value={FixationTime,Info}|false</c></p>
-            <p>If the table has been fixed using
+            <p>If the table is fixed using
               <seealso marker="#safe_fixtable/2">
               <c>safe_fixtable/2</c></seealso>,
               the call returns a tuple where <c>FixationTime</c> is the
-              time when the table was first fixed by a process, which either
-              is or is not one of the processes it is fixed by now.</p>
+              last time when the table changed from unfixed to fixed.</p>
             <p>The format and value of <c>FixationTime</c> depends on
               <c>Item</c>:</p>
             <taglist>
@@ -606,20 +678,26 @@ Error: fun containing local Erlang function calls
               table is fixed by now. <c>RefCount</c> is the value
               of the reference counter and it keeps track of how many times
               the table has been fixed by the process.</p>
-            <p>If the table never has been fixed, the call returns
-              <c>false</c>.</p>
+	    <p>Table fixations are not limited to <seealso marker="#safe_fixtable/2">
+	      <c>safe_fixtable/2</c></seealso>. Temporary fixations may also
+	      be done by for example <seealso marker="#traversal">traversing
+	      functions</seealso> like <c>select</c> and <c>match</c>. Such
+	      table fixations are automatically released before the
+	      corresponding functions returns, but they may be seen by a
+	      concurrent call to
+	      <c>ets:info(T,safe_fixed|safe_fixed_monotonic_time)</c>.</p>
+            <p>If the table is not fixed at all, the call returns <c>false</c>.</p>
           </item>
           <item>
             <p><c>Item=stats, Value=tuple()</c></p>
-            <p>Returns internal statistics about <c>set</c>, <c>bag</c>, and
-              <c>duplicate_bag</c> tables on an internal format used by OTP
-              test suites. Not for production use.</p></item>
+            <p>Returns internal statistics about tables on an internal format
+	    used by OTP test suites. Not for production use.</p></item>
         </list>
       </desc>
     </func>
 
     <func>
-      <name name="init_table" arity="2"/>
+      <name name="init_table" arity="2" since=""/>
       <fsummary>Replace all objects of an ETS table.</fsummary>
       <desc>
         <p>Replaces the existing objects of table <c><anno>Tab</anno></c> with
@@ -649,7 +727,7 @@ Error: fun containing local Erlang function calls
     </func>
 
     <func>
-      <name name="insert" arity="2"/>
+      <name name="insert" arity="2" since=""/>
       <fsummary>Insert an object into an ETS table.</fsummary>
       <desc>
         <p>Inserts the object or all of the objects in list
@@ -681,7 +759,7 @@ Error: fun containing local Erlang function calls
     </func>
 
     <func>
-      <name name="insert_new" arity="2"/>
+      <name name="insert_new" arity="2" since=""/>
       <fsummary>Insert an object into an ETS table if the key is not
         already present.</fsummary>
       <desc>
@@ -700,7 +778,7 @@ Error: fun containing local Erlang function calls
     </func>
 
     <func>
-      <name name="is_compiled_ms" arity="1"/>
+      <name name="is_compiled_ms" arity="1" since=""/>
       <fsummary>Check if an Erlang term is the result of
         <c>match_spec_compile</c>.</fsummary>
       <desc>
@@ -732,7 +810,7 @@ ets:is_compiled_ms(Broken).</code>
     </func>
 
     <func>
-      <name name="last" arity="1"/>
+      <name name="last" arity="1" since=""/>
       <fsummary>Return the last key in an ETS table of type
         <c>ordered_set</c>.</fsummary>
       <desc>
@@ -747,7 +825,7 @@ ets:is_compiled_ms(Broken).</code>
     </func>
 
     <func>
-      <name name="lookup" arity="2"/>
+      <name name="lookup" arity="2" since=""/>
       <fsummary>Return all objects with a specified key in an ETS table.
       </fsummary>
       <desc>
@@ -787,7 +865,7 @@ ets:is_compiled_ms(Broken).</code>
     </func>
 
     <func>
-      <name name="lookup_element" arity="3"/>
+      <name name="lookup_element" arity="3" since=""/>
       <fsummary>Return the <c>Pos</c>:th element of all objects with a
         specified key in an ETS table.</fsummary>
       <desc>
@@ -810,7 +888,7 @@ ets:is_compiled_ms(Broken).</code>
     </func>
 
     <func>
-      <name name="match" arity="1"/>
+      <name name="match" arity="1" since=""/>
       <fsummary>Continues matching objects in an ETS table.</fsummary>
       <desc>
         <p>Continues a match started with
@@ -824,7 +902,7 @@ ets:is_compiled_ms(Broken).</code>
     </func>
 
     <func>
-      <name name="match" arity="2"/>
+      <name name="match" arity="2" since=""/>
       <fsummary>Match the objects in an ETS table against a pattern.
       </fsummary>
       <desc>
@@ -856,7 +934,7 @@ ets:is_compiled_ms(Broken).</code>
     </func>
 
     <func>
-      <name name="match" arity="3"/>
+      <name name="match" arity="3" since=""/>
       <fsummary>Match the objects in an ETS table against a pattern
         and return part of the answers.</fsummary>
       <desc>
@@ -871,11 +949,14 @@ ets:is_compiled_ms(Broken).</code>
           <seealso marker="#first/1"><c>first/1</c></seealso> and
           <seealso marker="#next/2"><c>next/2</c></seealso>.</p>
         <p>If the table is empty, <c>'$end_of_table'</c> is returned.</p>
+	<p>Use <seealso marker="#safe_fixtable/2"><c>safe_fixtable/2</c></seealso>
+	  to guarantee <seealso marker="#traversal">safe traversal</seealso>
+	  for subsequent calls to <seealso marker="#match/1"><c>match/1</c></seealso>.</p>
       </desc>
     </func>
 
     <func>
-      <name name="match_delete" arity="2"/>
+      <name name="match_delete" arity="2" since=""/>
       <fsummary>Delete all objects that match a specified pattern from an
         ETS table.</fsummary>
       <desc>
@@ -886,7 +967,7 @@ ets:is_compiled_ms(Broken).</code>
     </func>
 
     <func>
-      <name name="match_object" arity="1"/>
+      <name name="match_object" arity="1" since=""/>
       <fsummary>Continues matching objects in an ETS table.</fsummary>
       <desc>
         <p>Continues a match started with
@@ -901,7 +982,7 @@ ets:is_compiled_ms(Broken).</code>
     </func>
 
     <func>
-      <name name="match_object" arity="2"/>
+      <name name="match_object" arity="2" since=""/>
       <fsummary>Match the objects in an ETS table against a pattern.
       </fsummary>
       <desc>
@@ -920,7 +1001,7 @@ ets:is_compiled_ms(Broken).</code>
     </func>
 
     <func>
-      <name name="match_object" arity="3"/>
+      <name name="match_object" arity="3" since=""/>
       <fsummary>Match the objects in an ETS table against a pattern and
         return part of the answers.</fsummary>
       <desc>
@@ -936,11 +1017,15 @@ ets:is_compiled_ms(Broken).</code>
           <seealso marker="#first/1"><c>first/1</c></seealso> and
           <seealso marker="#next/2"><c>next/2</c></seealso>.</p>
         <p>If the table is empty, <c>'$end_of_table'</c> is returned.</p>
+	<p>Use <seealso marker="#safe_fixtable/2"><c>safe_fixtable/2</c></seealso>
+	  to guarantee <seealso marker="#traversal">safe traversal</seealso>
+	  for subsequent calls to <seealso marker="#match_object/1">
+	  <c>match_object/1</c></seealso>.</p>
       </desc>
     </func>
 
     <func>
-      <name name="match_spec_compile" arity="1"/>
+      <name name="match_spec_compile" arity="1" since=""/>
       <fsummary>Compile a match specification into its internal representation.
       </fsummary>
       <desc>
@@ -968,7 +1053,7 @@ ets:is_compiled_ms(Broken).</code>
     </func>
 
     <func>
-      <name name="match_spec_run" arity="2"/>
+      <name name="match_spec_run" arity="2" since=""/>
       <fsummary>Perform matching, using a compiled match specification on a
         list of terms.</fsummary>
       <desc>
@@ -1005,7 +1090,7 @@ ets:select(Table, MatchSpec),</code>
     </func>
 
     <func>
-      <name name="member" arity="2"/>
+      <name name="member" arity="2" since=""/>
       <fsummary>Tests for occurrence of a key in an ETS table.</fsummary>
       <desc>
         <p>Works like <seealso marker="#lookup/2"><c>lookup/2</c></seealso>,
@@ -1016,7 +1101,7 @@ ets:select(Table, MatchSpec),</code>
     </func>
 
     <func>
-      <name name="new" arity="2"/>
+      <name name="new" arity="2" since=""/>
       <fsummary>Create a new ETS table.</fsummary>
       <desc>
         <p>Creates a new table and returns a table identifier that can
@@ -1135,11 +1220,17 @@ ets:select(Table, MatchSpec),</code>
               Functions that makes such promises over many objects (like
               <seealso marker="#insert/2"><c>insert/2</c></seealso>)
               gain less (or nothing) from this option.</p>
-            <p>Table type <c>ordered_set</c> is not affected by this option.
-              Also, the memory consumption inflicted by
-              both <c>write_concurrency</c> and <c>read_concurrency</c> is a
-              constant overhead per table. This overhead can be especially
-              large when both options are combined.</p>
+            <p>The memory consumption inflicted by both <c>write_concurrency</c>
+	      and <c>read_concurrency</c> is a constant overhead per table for
+	      <c>set</c>, <c>bag</c> and <c>duplicate_bag</c>. For
+	      <c>ordered_set</c> the memory overhead depends on the number
+	      of inserted objects and the amount of actual detected
+	      concurrency in runtime. The memory overhead can be especially
+	      large when both options are combined.</p>
+	    <note>
+              <p>Prior to stdlib-3.7 (OTP-22.0) <c>write_concurrency</c> had no
+	      effect on <c>ordered_set</c>.</p>
+            </note>
             <marker id="new_2_read_concurrency"></marker>
           </item>
           <tag><c>{read_concurrency,boolean()}</c></tag>
@@ -1180,7 +1271,7 @@ ets:select(Table, MatchSpec),</code>
     </func>
 
     <func>
-      <name name="next" arity="2"/>
+      <name name="next" arity="2" since=""/>
       <fsummary>Return the next key in an ETS table.</fsummary>
       <desc>
         <p>Returns the next key <c><anno>Key2</anno></c>, following key
@@ -1192,17 +1283,18 @@ ets:select(Table, MatchSpec),</code>
         <p>To find the first key in the table, use
           <seealso marker="#first/1"><c>first/1</c></seealso>.</p>
         <p>Unless a table of type <c>set</c>, <c>bag</c>, or
-          <c>duplicate_bag</c> is protected using
+          <c>duplicate_bag</c> is fixated using
           <seealso marker="#safe_fixtable/2"><c>safe_fixtable/2</c></seealso>,
-          a traversal can fail if
-          concurrent updates are made to the table. For table
-          type <c>ordered_set</c>, the function returns the next key in
-          order, even if the object does no longer exist.</p>
+          a call to <c>next/2</c> will fail if <c><anno>Key1</anno></c> no longer
+	  exists in the table. For table type <c>ordered_set</c>, the function
+	  always returns the next key after <c><anno>Key1</anno></c> in term
+	  order, regardless whether <c><anno>Key1</anno></c> ever existed in the
+	  table.</p>
       </desc>
     </func>
 
     <func>
-      <name name="prev" arity="2"/>
+      <name name="prev" arity="2" since=""/>
       <fsummary>Return the previous key in an ETS table of type
         <c>ordered_set</c>.</fsummary>
       <desc>
@@ -1212,13 +1304,13 @@ ets:select(Table, MatchSpec),</code>
           table types, the function is synonymous to
           <seealso marker="#next/2"><c>next/2</c></seealso>.
           If no previous key exists, <c>'$end_of_table'</c> is returned.</p>
-        <p>To find the last key in the table, use
+        <p>To find the last key in an <c>ordered_set</c> table, use
           <seealso marker="#last/1"><c>last/1</c></seealso>.</p>
       </desc>
     </func>
 
     <func>
-      <name name="rename" arity="2"/>
+      <name name="rename" arity="2" since=""/>
       <fsummary>Rename a named ETS table.</fsummary>
       <desc>
         <p>Renames the named table <c><anno>Tab</anno></c> to the new name
@@ -1228,7 +1320,7 @@ ets:select(Table, MatchSpec),</code>
     </func>
 
     <func>
-      <name name="repair_continuation" arity="2"/>
+      <name name="repair_continuation" arity="2" since=""/>
       <fsummary>Repair a continuation from <c>ets:select/1 or ets:select/3</c>
         that has passed through external representation.</fsummary>
       <desc>
@@ -1283,11 +1375,20 @@ ets:select(ets:repair_continuation(Broken,MS)).</code>
     </func>
 
     <func>
-      <name name="safe_fixtable" arity="2"/>
+      <name name="safe_fixtable" arity="2" since=""/>
       <fsummary>Fix an ETS table for safe traversal.</fsummary>
       <desc>
         <p>Fixes a table of type <c>set</c>, <c>bag</c>, or
-          <c>duplicate_bag</c> for safe traversal.</p>
+        <c>duplicate_bag</c> for <seealso marker="#traversal">
+	safe traversal</seealso> using
+	<seealso marker="#first/1"><c>first/1</c></seealso> &amp;
+	<seealso marker="#next/2"><c>next/2</c></seealso>,
+	<seealso marker="#match/3"><c>match/3</c></seealso> &amp;
+	<seealso marker="#match/1"><c>match/1</c></seealso>,
+	<seealso marker="#match_object/3"><c>match_object/3</c></seealso> &amp;
+	<seealso marker="#match_object/1"><c>match_object/1</c></seealso>, or
+	<seealso marker="#select/3"><c>select/3</c></seealso> &amp;
+	<seealso marker="#select/1"><c>select/1</c></seealso>.</p>
         <p>A process fixes a table by calling
           <c>safe_fixtable(<anno>Tab</anno>, true)</c>. The table remains
           fixed until the process releases it by calling
@@ -1300,11 +1401,11 @@ ets:select(ets:repair_continuation(Broken,MS)).</code>
         <p>When a table is fixed, a sequence of
           <seealso marker="#first/1"><c>first/1</c></seealso> and
           <seealso marker="#next/2"><c>next/2</c></seealso> calls are
-          guaranteed to succeed, and each object in
-          the table is returned only once, even if objects
-          are removed or inserted during the traversal. The keys for new
-          objects inserted during the traversal <em>can</em> be returned by
-          <c>next/2</c> (it depends on the internal ordering of the keys).</p>
+          guaranteed to succeed even if keys are removed during the
+	  traversal. The keys for objects inserted or deleted during a
+	  traversal may or may not be returned by <c>next/2</c> depending on
+	  the ordering of keys within the table and if the key exists at the time
+	  <c>next/2</c> is called.</p>
         <p><em>Example:</em></p>
         <code type="none">
 clean_all_with_value(Tab,X) ->
@@ -1322,7 +1423,7 @@ clean_all_with_value(Tab,X,Key) ->
             true
     end,
     clean_all_with_value(Tab,X,ets:next(Tab,Key)).</code>
-        <p>Notice that no deleted objects are removed from a
+        <p>Notice that deleted objects are not freed from a
           fixed table until it has been released. If a process fixes a
           table but never releases it, the memory used by the deleted
           objects is never freed. The performance of operations on
@@ -1332,14 +1433,14 @@ clean_all_with_value(Tab,X,Key) ->
           <c>info(Tab, safe_fixed_monotonic_time)</c></seealso>. A system with
           many processes fixing tables can need a monitor that sends alarms
           when tables have been fixed for too long.</p>
-        <p>Notice that for table type <c>ordered_set</c>,
-          <c>safe_fixtable/2</c> is not necessary, as calls to
-          <c>first/1</c> and <c>next/2</c> always succeed.</p>
+        <p>Notice that <c>safe_fixtable/2</c> is not necessary for table type
+	<c>ordered_set</c> and for traversals done by a single ETS function call,
+	like <seealso marker="#select/2"><c>select/2</c></seealso>.</p>
       </desc>
     </func>
 
     <func>
-      <name name="select" arity="1"/>
+      <name name="select" arity="1" since=""/>
       <fsummary>Continue matching objects in an ETS table.</fsummary>
       <desc>
         <p>Continues a match started with
@@ -1353,7 +1454,7 @@ clean_all_with_value(Tab,X,Key) ->
     </func>
 
     <func>
-      <name name="select" arity="2"/>
+      <name name="select" arity="2" since=""/>
       <fsummary>Match the objects in an ETS table against a
         match specification.</fsummary>
       <desc>
@@ -1448,7 +1549,7 @@ is_integer(X), is_integer(Y), X + Y < 4711]]></code>
     </func>
 
     <func>
-      <name name="select" arity="3"/>
+      <name name="select" arity="3" since=""/>
       <fsummary>Match the objects in an ETS table against a match
         specification and return part of the answers.</fsummary>
       <desc>
@@ -1462,12 +1563,15 @@ is_integer(X), is_integer(Y), X + Y < 4711]]></code>
           table, which is still faster than traversing the table object by
           object using <seealso marker="#first/1"><c>first/1</c></seealso>
           and <seealso marker="#next/2"><c>next/2</c></seealso>.</p>
-        <p>If the table is empty, <c>'$end_of_table'</c> is returned.</p>
+          <p>If the table is empty, <c>'$end_of_table'</c> is returned.</p>
+	  <p>Use <seealso marker="#safe_fixtable/2"><c>safe_fixtable/2</c></seealso>
+	  to guarantee <seealso marker="#traversal">safe traversal</seealso>
+	  for subsequent calls to <seealso marker="#select/1"><c>select/1</c></seealso>.</p>
       </desc>
     </func>
 
     <func>
-      <name name="select_count" arity="2"/>
+      <name name="select_count" arity="2" since=""/>
       <fsummary>Match the objects in an ETS table against a match
         specification and return the number of objects for which the match
         specification returned <c>true</c>.</fsummary>
@@ -1486,7 +1590,7 @@ is_integer(X), is_integer(Y), X + Y < 4711]]></code>
     </func>
 
     <func>
-      <name name="select_delete" arity="2"/>
+      <name name="select_delete" arity="2" since=""/>
       <fsummary>Match the objects in an ETS table against a match
         specification and delete objects where the match specification
         returns <c>true</c>.</fsummary>
@@ -1510,7 +1614,7 @@ is_integer(X), is_integer(Y), X + Y < 4711]]></code>
     </func>
 
     <func>
-      <name name="select_replace" arity="2"/>
+      <name name="select_replace" arity="2" since="OTP 20.0"/>
       <fsummary>Match and replace objects atomically in an ETS table</fsummary>
       <desc>
         <p>Matches the objects in the table <c><anno>Tab</anno></c> using a
@@ -1519,7 +1623,7 @@ is_integer(X), is_integer(Y), X + Y < 4711]]></code>
           the match specification result.</p>
 	<p>The match-and-replace operation for each individual object is guaranteed to be
 	  <seealso marker="#concurrency">atomic and isolated</seealso>. The
-	  <c>select_replace</c> table iteration as a whole, like all other select functions,
+	  <c>select_replace</c> table traversal as a whole, like all other select functions,
 	  does not give such guarantees.</p>
 	<p>The match specifiction must be guaranteed to <em>retain the key</em>
 	  of any matched object. If not, <c>select_replace</c> will fail with <c>badarg</c>
@@ -1549,7 +1653,7 @@ Success = (1 =:= ets:select_replace(T, [{Old, [], [{const, New}]}])),
     </func>
 
     <func>
-      <name name="select_reverse" arity="1"/>
+      <name name="select_reverse" arity="1" since="OTP R14B"/>
       <fsummary>Continue matching objects in an ETS table.</fsummary>
       <desc>
       <p>Continues a match started with <seealso marker="#select_reverse/3">
@@ -1582,7 +1686,7 @@ Success = (1 =:= ets:select_replace(T, [{Old, [], [{const, New}]}])),
     </func>
 
     <func>
-      <name name="select_reverse" arity="2"/>
+      <name name="select_reverse" arity="2" since="OTP R14B"/>
       <fsummary>Match the objects in an ETS table against a
         match specification.</fsummary>
       <desc>
@@ -1594,7 +1698,7 @@ Success = (1 =:= ets:select_replace(T, [{Old, [], [{const, New}]}])),
     </func>
 
     <func>
-      <name name="select_reverse" arity="3"/>
+      <name name="select_reverse" arity="3" since="OTP R14B"/>
       <fsummary>Match the objects in an ETS table against a
         match specification and return part of the answers.</fsummary>
       <desc>
@@ -1612,7 +1716,7 @@ Success = (1 =:= ets:select_replace(T, [{Old, [], [{const, New}]}])),
     </func>
 
     <func>
-      <name name="setopts" arity="2"/>
+      <name name="setopts" arity="2" since=""/>
       <fsummary>Set table options.</fsummary>
       <desc>
         <p>Sets table options. The only allowed option to be set after the
@@ -1623,7 +1727,7 @@ Success = (1 =:= ets:select_replace(T, [{Old, [], [{const, New}]}])),
     </func>
 
     <func>
-      <name name="slot" arity="2"/>
+      <name name="slot" arity="2" since=""/>
       <fsummary>Return all objects in a specified slot of an ETS table.
       </fsummary>
       <desc>
@@ -1648,7 +1752,7 @@ Success = (1 =:= ets:select_replace(T, [{Old, [], [{const, New}]}])),
     </func>
 
     <func>
-      <name name="tab2file" arity="2"/>
+      <name name="tab2file" arity="2" since=""/>
       <fsummary>Dump an ETS table to a file.</fsummary>
       <desc>
         <p>Dumps table <c><anno>Tab</anno></c> to file
@@ -1659,7 +1763,7 @@ Success = (1 =:= ets:select_replace(T, [{Old, [], [{const, New}]}])),
     </func>
 
     <func>
-      <name name="tab2file" arity="3"/>
+      <name name="tab2file" arity="3" since=""/>
       <fsummary>Dump an ETS table to a file.</fsummary>
       <desc>
         <p>Dumps table <c><anno>Tab</anno></c> to file
@@ -1706,7 +1810,7 @@ Success = (1 =:= ets:select_replace(T, [{Old, [], [{const, New}]}])),
     </func>
 
     <func>
-      <name name="tab2list" arity="1"/>
+      <name name="tab2list" arity="1" since=""/>
       <fsummary>Return a list of all objects in an ETS table.</fsummary>
       <desc>
         <p>Returns a list of all objects in table <c><anno>Tab</anno></c>.</p>
@@ -1714,7 +1818,7 @@ Success = (1 =:= ets:select_replace(T, [{Old, [], [{const, New}]}])),
     </func>
 
     <func>
-      <name name="tabfile_info" arity="1"/>
+      <name name="tabfile_info" arity="1" since=""/>
       <fsummary>Return a list of all objects in an ETS table.</fsummary>
       <desc>
         <p>Returns information about the table dumped to file by
@@ -1792,8 +1896,8 @@ Success = (1 =:= ets:select_replace(T, [{Old, [], [{const, New}]}])),
     </func>
 
     <func>
-      <name name="table" arity="1"/>
-      <name name="table" arity="2"/>
+      <name name="table" arity="1" since=""/>
+      <name name="table" arity="2" since=""/>
       <fsummary>Return a QLC query handle.</fsummary>
       <desc>
         <p>Returns a Query List
@@ -1869,7 +1973,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="take" arity="2"/>
+      <name name="take" arity="2" since="OTP 18.0"/>
       <fsummary>Return and remove all objects with a specified key from an
         ETS table.</fsummary>
       <desc>
@@ -1884,7 +1988,7 @@ true</pre>
       </desc>
     </func>
     <func>
-      <name name="test_ms" arity="2"/>
+      <name name="test_ms" arity="2" since=""/>
       <fsummary>Test a match specification for use in <c>select/2</c>.
       </fsummary>
       <desc>
@@ -1911,7 +2015,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="to_dets" arity="2"/>
+      <name name="to_dets" arity="2" since=""/>
       <fsummary>Fill a Dets table with objects from an ETS table.
       </fsummary>
       <desc>
@@ -1922,12 +2026,12 @@ true</pre>
     </func>
 
     <func> 
-      <name name="update_counter" arity="3" clause_i="1"/>
-      <name name="update_counter" arity="4" clause_i="1"/>
-      <name name="update_counter" arity="3" clause_i="2"/>
-      <name name="update_counter" arity="4" clause_i="2"/>
-      <name name="update_counter" arity="3" clause_i="3"/>
-      <name name="update_counter" arity="4" clause_i="3"/>
+      <name name="update_counter" arity="3" clause_i="1" since=""/>
+      <name name="update_counter" arity="4" clause_i="1" since="OTP 18.0"/>
+      <name name="update_counter" arity="3" clause_i="2" since=""/>
+      <name name="update_counter" arity="4" clause_i="2" since="OTP 18.0"/>
+      <name name="update_counter" arity="3" clause_i="3" since=""/>
+      <name name="update_counter" arity="4" clause_i="3" since="OTP 18.0"/>
       <fsummary>Update a counter object in an ETS table.</fsummary>
       <type variable="Tab"/>
       <type variable="Key"/>
@@ -1940,9 +2044,8 @@ true</pre>
         <p>This function provides an efficient way to update one or more 
           counters, without the trouble of having to look up an object, update 
           the object by incrementing an element, and insert the resulting
-          object into the table again. (The update is done atomically,
-          that is, no process 
-          can access the ETS table in the middle of the operation.)</p>
+          object into the table again. The operation is guaranteed to be
+          <seealso marker="#concurrency">atomic and isolated</seealso>.</p>
         <p>This function destructively update the object with key
           <c><anno>Key</anno></c> in table <c><anno>Tab</anno></c> by adding
           <c><anno>Incr</anno></c> to the element at position
@@ -2006,8 +2109,8 @@ true</pre>
     </func>
 
     <func>
-      <name name="update_element" arity="3" clause_i="1"/>
-      <name name="update_element" arity="3" clause_i="2"/>
+      <name name="update_element" arity="3" clause_i="1" since=""/>
+      <name name="update_element" arity="3" clause_i="2" since=""/>
       <fsummary>Update the <c>Pos</c>:th element of the object with a
         specified key in an ETS table.</fsummary>
       <type variable="Tab"/>
@@ -2049,7 +2152,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="whereis" arity="1"/>
+      <name name="whereis" arity="1" since="OTP 21.0"/>
       <fsummary>Retrieves the tid() of a named table.</fsummary>
       <desc>
         <p>This function returns the
diff --git a/lib/stdlib/doc/src/file_sorter.xml b/lib/stdlib/doc/src/file_sorter.xml
index e988d58c2f..942d98fe61 100644
--- a/lib/stdlib/doc/src/file_sorter.xml
+++ b/lib/stdlib/doc/src/file_sorter.xml
@@ -32,7 +32,7 @@
     <rev>PA1</rev>
     <file>file_sorter.xml</file>
   </header>
-  <module>file_sorter</module>
+  <module since="">file_sorter</module>
   <modulesummary>File sorter.</modulesummary>
   <description>
     <p>This module contains functions for sorting terms on files, merging
@@ -334,8 +334,8 @@ output(L) ->
 
   <funcs>
     <func>
-      <name name="check" arity="1"/>
-      <name name="check" arity="2"/>
+      <name name="check" arity="1" since=""/>
+      <name name="check" arity="2" since=""/>
       <fsummary>Check whether terms on files are sorted.</fsummary>
       <desc>
         <p>Checks files for sortedness. If a file is not sorted, the
@@ -347,8 +347,8 @@ output(L) ->
     </func>
 
     <func>
-      <name name="keycheck" arity="2"/>
-      <name name="keycheck" arity="3"/>
+      <name name="keycheck" arity="2" since=""/>
+      <name name="keycheck" arity="3" since=""/>
       <fsummary>Check whether terms on files are sorted by key.</fsummary>
       <desc>
         <p>Checks files for sortedness. If a file is not sorted, the
@@ -360,8 +360,8 @@ output(L) ->
     </func>
 
     <func>
-      <name name="keymerge" arity="3"/>
-      <name name="keymerge" arity="4"/>
+      <name name="keymerge" arity="3" since=""/>
+      <name name="keymerge" arity="4" since=""/>
       <fsummary>Merge terms on files by key.</fsummary>
       <desc>
         <p>Merges tuples on files. Each input file is assumed to be
@@ -372,7 +372,7 @@ output(L) ->
     </func>
 
     <func>
-      <name name="keysort" arity="2"/>
+      <name name="keysort" arity="2" since=""/>
       <fsummary>Sort terms on files by key.</fsummary>
       <desc>
         <p>Sorts tuples on files.</p>
@@ -382,8 +382,8 @@ output(L) ->
     </func>
 
     <func>
-      <name name="keysort" arity="3"/>
-      <name name="keysort" arity="4"/>
+      <name name="keysort" arity="3" since=""/>
+      <name name="keysort" arity="4" since=""/>
       <fsummary>Sort terms on files by key.</fsummary>
       <desc>
         <p>Sorts tuples on files. The sort is performed on the
@@ -397,8 +397,8 @@ output(L) ->
     </func>
 
     <func>
-      <name name="merge" arity="2"/>
-      <name name="merge" arity="3"/>
+      <name name="merge" arity="2" since=""/>
+      <name name="merge" arity="3" since=""/>
       <fsummary>Merge terms on files.</fsummary>
       <desc>
         <p>Merges terms on files. Each input file is assumed to be
@@ -409,7 +409,7 @@ output(L) ->
     </func>
 
     <func>
-      <name name="sort" arity="1"/>
+      <name name="sort" arity="1" since=""/>
       <fsummary>Sort terms on files.</fsummary>
       <desc>
         <p>Sorts terms on files.</p>
@@ -419,8 +419,8 @@ output(L) ->
     </func>
 
     <func>
-      <name name="sort" arity="2"/>
-      <name name="sort" arity="3"/>
+      <name name="sort" arity="2" since=""/>
+      <name name="sort" arity="3" since=""/>
       <fsummary>Sort terms on files.</fsummary>
       <desc>
         <p>Sorts terms on files.</p>
diff --git a/lib/stdlib/doc/src/filelib.xml b/lib/stdlib/doc/src/filelib.xml
index 3b5be75bc0..5df415834f 100644
--- a/lib/stdlib/doc/src/filelib.xml
+++ b/lib/stdlib/doc/src/filelib.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>filelib.xml</file>
   </header>
-  <module>filelib</module>
+  <module since="">filelib</module>
   <modulesummary>File utilities, such as wildcard matching of filenames.
   </modulesummary>
   <description>
@@ -94,7 +94,7 @@
 
   <funcs>
     <func>
-      <name name="ensure_dir" arity="1"/>
+      <name name="ensure_dir" arity="1" since=""/>
       <fsummary>Ensure that all parent directories for a file or directory
         exist.</fsummary>
       <desc>
@@ -108,7 +108,7 @@
     </func>
 
     <func>
-      <name name="file_size" arity="1"/>
+      <name name="file_size" arity="1" since=""/>
       <fsummary>Return the size in bytes of a file.</fsummary>
       <desc>
         <p>Returns the size of the specified file.</p>
@@ -116,7 +116,7 @@
     </func>
 
     <func>
-      <name name="fold_files" arity="5"/>
+      <name name="fold_files" arity="5" since=""/>
       <fsummary>Fold over all files matching a regular expression.</fsummary>
       <desc>
         <p>Folds function <c><anno>Fun</anno></c> over all (regular) files
@@ -142,7 +142,7 @@
     </func>
 
     <func>
-      <name name="is_dir" arity="1"/>
+      <name name="is_dir" arity="1" since=""/>
       <fsummary>Test whether <c>Name</c> refers to a directory.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Name</anno></c>
@@ -151,7 +151,7 @@
     </func>
 
     <func>
-      <name name="is_file" arity="1"/>
+      <name name="is_file" arity="1" since=""/>
       <fsummary>Test whether <c>Name</c> refers to a file or directory.
       </fsummary>
       <desc>
@@ -161,7 +161,7 @@
     </func>
 
     <func>
-      <name name="is_regular" arity="1"/>
+      <name name="is_regular" arity="1" since=""/>
       <fsummary>Test whether <c>Name</c> refers to a (regular) file.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Name</anno></c>
@@ -170,7 +170,7 @@
     </func>
 
     <func>
-      <name name="last_modified" arity="1"/>
+      <name name="last_modified" arity="1" since=""/>
       <fsummary>Return the local date and time when a file was last modified.
       </fsummary>
       <desc>
@@ -180,7 +180,7 @@
     </func>
 
     <func>
-      <name name="wildcard" arity="1"/>
+      <name name="wildcard" arity="1" since=""/>
       <fsummary>Match filenames using Unix-style wildcards.</fsummary>
       <desc>
         <p>Returns a list of all files that match Unix-style wildcard string
@@ -252,7 +252,7 @@ filelib:wildcard("lib/**/*.{erl,hrl}")</code>
     </func>
 
     <func>
-      <name name="wildcard" arity="2"/>
+      <name name="wildcard" arity="2" since=""/>
       <fsummary>Match filenames using Unix-style wildcards starting at a
         specified directory.</fsummary>
       <desc>
@@ -263,8 +263,8 @@ filelib:wildcard("lib/**/*.{erl,hrl}")</code>
     </func>
 
     <func>
-      <name name="find_file" arity="2"/>
-      <name name="find_file" arity="3"/>
+      <name name="find_file" arity="2" since="OTP 20.0"/>
+      <name name="find_file" arity="3" since="OTP 20.0"/>
       <fsummary>Find a file relative to a given directory.</fsummary>
       <desc>
         <p>Looks for a file of the given name by applying suffix rules to
@@ -278,7 +278,7 @@ filelib:wildcard("lib/**/*.{erl,hrl}")</code>
       </desc>
     </func>
     <func>
-      <name name="find_source" arity="1"/>
+      <name name="find_source" arity="1" since="OTP 20.0"/>
       <fsummary>Find the source file for a given object file.</fsummary>
       <desc>
         <p>Equivalent to <c>find_source(Base, Dir)</c>, where <c>Dir</c> is
@@ -287,8 +287,8 @@ filelib:wildcard("lib/**/*.{erl,hrl}")</code>
       </desc>
     </func>
     <func>
-      <name name="find_source" arity="2"/>
-      <name name="find_source" arity="3"/>
+      <name name="find_source" arity="2" since="OTP 20.0"/>
+      <name name="find_source" arity="3" since="OTP 20.0"/>
       <fsummary>Find a source file relative to a given directory.</fsummary>
       <desc>
         <p>Applies file extension specific rules to find the source file for
diff --git a/lib/stdlib/doc/src/filename.xml b/lib/stdlib/doc/src/filename.xml
index 36254c2d00..60b7eb3436 100644
--- a/lib/stdlib/doc/src/filename.xml
+++ b/lib/stdlib/doc/src/filename.xml
@@ -28,7 +28,7 @@
     <date>1997-11-13</date>
     <rev>B</rev>
   </header>
-  <module>filename</module>
+  <module since="">filename</module>
   <modulesummary>Filename manipulation functions.</modulesummary>
   <description>
     <p>This module provides functions
@@ -87,7 +87,7 @@
  
   <funcs>
     <func>
-      <name name="absname" arity="1"/>
+      <name name="absname" arity="1" since=""/>
       <fsummary>Convert a filename to an absolute name, relative the working
         directory.</fsummary>
       <desc>
@@ -119,7 +119,7 @@
     </func>
 
     <func>
-      <name name="absname" arity="2"/>
+      <name name="absname" arity="2" since=""/>
       <fsummary>Convert a filename to an absolute name, relative a specified
         directory.</fsummary>
       <desc>
@@ -130,7 +130,7 @@
     </func>
 
     <func>
-      <name name="absname_join" arity="2"/>
+      <name name="absname_join" arity="2" since=""/>
       <fsummary>Join an absolute directory with a relative filename.</fsummary>
       <desc>
         <p>Joins an absolute directory with a relative filename. Similar to
@@ -144,8 +144,8 @@
     </func>
 
     <func>
-      <name name="basedir" arity="2" clause_i="1"/>
-      <name name="basedir" arity="2" clause_i="2"/>
+      <name name="basedir" arity="2" clause_i="1" since="OTP 19.0"/>
+      <name name="basedir" arity="2" clause_i="2" since="OTP 19.0"/>
       <fsummary>Equivalent to <c>basedir(<anno>PathType</anno>,
            <anno>Application</anno>,#{})</c> or
 	   <c>basedir(<anno>PathsType</anno>, <anno>Application</anno>,#{})</c>.
@@ -165,8 +165,8 @@ basedir(<anno>PathsType</anno>, <anno>Application</anno>, #{})</seealso>.
       </desc>
     </func>
     <func>
-      <name name="basedir" arity="3" clause_i="1" anchor="basedir_3_1"/>
-      <name name="basedir" arity="3" clause_i="2" anchor="basedir_3_2"/>
+      <name name="basedir" arity="3" clause_i="1" anchor="basedir_3_1" since="OTP 19.0"/>
+      <name name="basedir" arity="3" clause_i="2" anchor="basedir_3_2" since="OTP 19.0"/>
       <fsummary></fsummary>
       <type variable="PathType" name_i="1"/>
       <type name="basedir_path_type"/>
@@ -314,7 +314,7 @@ true
       </desc>
     </func>
     <func>
-      <name name="basename" arity="1"/>
+      <name name="basename" arity="1" since=""/>
       <fsummary>Return the last component of a filename.</fsummary>
       <desc>
         <p>Returns the last component of <c><anno>Filename</anno></c>, or
@@ -332,7 +332,7 @@ true
     </func>
 
     <func>
-      <name name="basename" arity="2"/>
+      <name name="basename" arity="2" since=""/>
       <fsummary>Return the last component of a filename, stripped of the
         specified extension.</fsummary>
       <desc>
@@ -357,7 +357,7 @@ true
     </func>
 
     <func>
-      <name name="dirname" arity="1"/>
+      <name name="dirname" arity="1" since=""/>
       <fsummary>Return the directory part of a path name.</fsummary>
       <desc>
         <p>Returns the directory part of <c><anno>Filename</anno></c>.</p>
@@ -374,7 +374,7 @@ true
     </func>
 
     <func>
-      <name name="extension" arity="1"/>
+      <name name="extension" arity="1" since=""/>
       <fsummary>Return the file extension.</fsummary>
       <desc>
         <p>Returns the file extension of <c><anno>Filename</anno></c>,
@@ -390,8 +390,8 @@ true
     </func>
 
     <func>
-      <name name="find_src" arity="1"/>
-      <name name="find_src" arity="2"/>
+      <name name="find_src" arity="1" since=""/>
+      <name name="find_src" arity="2" since=""/>
       <fsummary>Find the filename and compiler options for a module.</fsummary>
       <desc>
         <p>Finds the source filename and compiler options for a module.
@@ -438,7 +438,7 @@ true
     </func>
 
     <func>
-      <name name="flatten" arity="1"/>
+      <name name="flatten" arity="1" since=""/>
       <fsummary>Convert a filename to a flat string.</fsummary>
       <desc>
         <p>Converts a possibly deep list filename consisting of
@@ -448,7 +448,7 @@ true
     </func>
 
     <func>
-      <name name="join" arity="1"/>
+      <name name="join" arity="1" since=""/>
       <fsummary>Join a list of filename components with directory separators.
       </fsummary>
       <desc>
@@ -476,7 +476,7 @@ true
     </func>
 
     <func>
-      <name name="join" arity="2"/>
+      <name name="join" arity="2" since=""/>
       <fsummary>Join two filename components with directory separators.
       </fsummary>
       <desc>
@@ -487,7 +487,7 @@ true
     </func>
 
     <func>
-      <name name="nativename" arity="1"/>
+      <name name="nativename" arity="1" since=""/>
       <fsummary>Return the native form of a file path.</fsummary>
       <desc>
         <p>Converts <c><anno>Path</anno></c> to a form accepted by the command
@@ -506,7 +506,7 @@ true
     </func>
 
     <func>
-      <name name="pathtype" arity="1"/>
+      <name name="pathtype" arity="1" since=""/>
       <fsummary>Return the path type.</fsummary>
       <desc>
         <p>Returns the path type, which is one of the following:</p>
@@ -536,8 +536,8 @@ true
     </func>
 
     <func>
-      <name name="rootname" arity="1"/>
-      <name name="rootname" arity="2"/>
+      <name name="rootname" arity="1" since=""/>
+      <name name="rootname" arity="2" since=""/>
       <fsummary>Remove a filename extension.</fsummary>
       <desc>
         <p>Removes a filename extension. <c>rootname/2</c> works as
@@ -546,7 +546,7 @@ true
         <p><em>Examples:</em></p>
         <pre>
 20> <input>filename:rootname("/beam.src/kalle").</input>
-/beam.src/kalle"
+"/beam.src/kalle"
 21> <input>filename:rootname("/beam.src/foo.erl").</input>
 "/beam.src/foo"
 22> <input>filename:rootname("/beam.src/foo.erl", ".erl").</input>
@@ -557,7 +557,7 @@ true
     </func>
 
     <func>
-      <name name="safe_relative_path" arity="1"/>
+      <name name="safe_relative_path" arity="1" since="OTP 19.3"/>
       <fsummary>Sanitize a relative path to avoid directory traversal attacks.</fsummary>
       <desc>
         <p>Sanitizes the relative path by eliminating ".." and "."
@@ -584,7 +584,7 @@ unsafe</pre>
     </func>
 
     <func>
-      <name name="split" arity="1"/>
+      <name name="split" arity="1" since=""/>
       <fsummary>Split a filename into its path components.</fsummary>
       <desc>
         <p>Returns a list whose elements are the path components of
diff --git a/lib/stdlib/doc/src/gb_sets.xml b/lib/stdlib/doc/src/gb_sets.xml
index 03397b4503..a9596c6e4d 100644
--- a/lib/stdlib/doc/src/gb_sets.xml
+++ b/lib/stdlib/doc/src/gb_sets.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>gb_sets</module>
+  <module since="">gb_sets</module>
   <modulesummary>General balanced trees.</modulesummary>
   <description>
     <p>This module provides ordered sets using Prof. Arne Andersson's
@@ -123,8 +123,8 @@
 
   <funcs>
     <func>
-      <name name="add" arity="2"/>
-      <name name="add_element" arity="2"/>
+      <name name="add" arity="2" since=""/>
+      <name name="add_element" arity="2" since=""/>
       <fsummary>Add a (possibly existing) element to a set.</fsummary>
       <desc>
         <p>Returns a new set formed from <c><anno>Set1</anno></c> with
@@ -135,7 +135,7 @@
     </func>
 
     <func>
-      <name name="balance" arity="1"/>
+      <name name="balance" arity="1" since=""/>
       <fsummary>Rebalance tree representation of a set.</fsummary>
       <desc>
         <p>Rebalances the tree representation of <c><anno>Set1</anno></c>.
@@ -149,7 +149,7 @@
     </func>
 
     <func>
-      <name name="del_element" arity="2"/>
+      <name name="del_element" arity="2" since=""/>
       <fsummary>Remove a (possibly non-existing) element from a set.</fsummary>
       <desc>
         <p>Returns a new set formed from <c><anno>Set1</anno></c> with
@@ -160,7 +160,7 @@
     </func>
 
     <func>
-      <name name="delete" arity="2"/>
+      <name name="delete" arity="2" since=""/>
       <fsummary>Remove an element from a set.</fsummary>
       <desc>
         <p>Returns a new set formed from <c><anno>Set1</anno></c> with
@@ -171,7 +171,7 @@
     </func>
 
     <func>
-      <name name="delete_any" arity="2"/>
+      <name name="delete_any" arity="2" since=""/>
       <fsummary>Remove a (possibly non-existing) element from a set.</fsummary>
       <desc>
         <p>Returns a new set formed from <c><anno>Set1</anno></c> with
@@ -182,7 +182,7 @@
     </func>
 
     <func>
-      <name name="difference" arity="2"/>
+      <name name="difference" arity="2" since=""/>
       <fsummary>Return the difference of two sets.</fsummary>
       <desc>
         <p>Returns only the elements of <c><anno>Set1</anno></c> that are not
@@ -191,7 +191,7 @@
     </func>
 
     <func>
-      <name name="empty" arity="0"/>
+      <name name="empty" arity="0" since=""/>
       <fsummary>Return an empty set.</fsummary>
       <desc>
         <p>Returns a new empty set.</p>
@@ -199,7 +199,7 @@
     </func>
 
     <func>
-      <name name="filter" arity="2"/>
+      <name name="filter" arity="2" since=""/>
       <fsummary>Filter set elements.</fsummary>
       <desc>
         <p>Filters elements in <c><anno>Set1</anno></c> using predicate function
@@ -208,7 +208,7 @@
     </func>
 
     <func>
-      <name name="fold" arity="3"/>
+      <name name="fold" arity="3" since=""/>
       <fsummary>Fold over set elements.</fsummary>
       <desc>
         <p>Folds <c><anno>Function</anno></c> over every element in
@@ -218,7 +218,7 @@
     </func>
 
     <func>
-      <name name="from_list" arity="1"/>
+      <name name="from_list" arity="1" since=""/>
       <fsummary>Convert a list into a set.</fsummary>
       <desc>
         <p>Returns a set of the elements in <c><anno>List</anno></c>, where
@@ -227,7 +227,7 @@
     </func>
 
     <func>
-      <name name="from_ordset" arity="1"/>
+      <name name="from_ordset" arity="1" since=""/>
       <fsummary>Make a set from an ordset list.</fsummary>
       <desc>
         <p>Turns an ordered-set list <c><anno>List</anno></c> into a set.
@@ -236,7 +236,7 @@
     </func>
 
     <func>
-      <name name="insert" arity="2"/>
+      <name name="insert" arity="2" since=""/>
       <fsummary>Add a new element to a set.</fsummary>
       <desc>
         <p>Returns a new set formed from <c><anno>Set1</anno></c> with
@@ -247,7 +247,7 @@
     </func>
 
     <func>
-      <name name="intersection" arity="1"/>
+      <name name="intersection" arity="1" since=""/>
       <fsummary>Return the intersection of a list of sets.</fsummary>
       <desc>
         <p>Returns the intersection of the non-empty list of sets.</p>
@@ -255,7 +255,7 @@
     </func>
 
     <func>
-      <name name="intersection" arity="2"/>
+      <name name="intersection" arity="2" since=""/>
       <fsummary>Return the intersection of two sets.</fsummary>
       <desc>
         <p>Returns the intersection of <c><anno>Set1</anno></c> and
@@ -264,7 +264,7 @@
     </func>
 
     <func>
-      <name name="is_disjoint" arity="2"/>
+      <name name="is_disjoint" arity="2" since=""/>
       <fsummary>Check whether two sets are disjoint.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Set1</anno></c> and
@@ -274,7 +274,7 @@
     </func>
 
     <func>
-      <name name="is_element" arity="2"/>
+      <name name="is_element" arity="2" since=""/>
       <fsummary>Test for membership of a set.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Element</anno></c> is an element of
@@ -283,7 +283,7 @@
     </func>
 
     <func>
-      <name name="is_empty" arity="1"/>
+      <name name="is_empty" arity="1" since=""/>
       <fsummary>Test for empty set.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Set</anno></c> is an empty set,
@@ -292,7 +292,7 @@
     </func>
 
     <func>
-      <name name="is_member" arity="2"/>
+      <name name="is_member" arity="2" since=""/>
       <fsummary>Test for membership of a set.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Element</anno></c> is an element of
@@ -301,7 +301,7 @@
     </func>
 
     <func>
-      <name name="is_set" arity="1"/>
+      <name name="is_set" arity="1" since=""/>
       <fsummary>Test for a set.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> appears to be a set,
@@ -310,7 +310,7 @@
     </func>
 
     <func>
-      <name name="is_subset" arity="2"/>
+      <name name="is_subset" arity="2" since=""/>
       <fsummary>Test for subset.</fsummary>
       <desc>
         <p>Returns <c>true</c> when every element of <c><anno>Set1</anno></c> is
@@ -319,7 +319,7 @@
     </func>
 
     <func>
-      <name name="iterator" arity="1"/>
+      <name name="iterator" arity="1" since=""/>
       <fsummary>Return an iterator for a set.</fsummary>
       <desc>
         <p>Returns an iterator that can be used for traversing the entries of
@@ -336,7 +336,7 @@
     </func>
 
     <func>
-      <name name="iterator_from" arity="2"/>
+      <name name="iterator_from" arity="2" since="OTP 18.0"/>
       <fsummary>Return an iterator for a set starting from a specified element.
       </fsummary>
       <desc>
@@ -351,7 +351,7 @@
     </func>
 
     <func>
-      <name name="largest" arity="1"/>
+      <name name="largest" arity="1" since=""/>
       <fsummary>Return largest element.</fsummary>
       <desc>
         <p>Returns the largest element in <c><anno>Set</anno></c>. Assumes that
@@ -360,7 +360,7 @@
     </func>
 
     <func>
-      <name name="new" arity="0"/>
+      <name name="new" arity="0" since=""/>
       <fsummary>Return an empty set.</fsummary>
       <desc>
         <p>Returns a new empty set.</p>
@@ -368,7 +368,7 @@
     </func>
 
     <func>
-      <name name="next" arity="1"/>
+      <name name="next" arity="1" since=""/>
       <fsummary>Traverse a set with an iterator.</fsummary>
       <desc>
         <p>Returns <c>{<anno>Element</anno>, <anno>Iter2</anno>}</c>, where
@@ -381,7 +381,7 @@
     </func>
 
     <func>
-      <name name="singleton" arity="1"/>
+      <name name="singleton" arity="1" since=""/>
       <fsummary>Return a set with one element.</fsummary>
       <desc>
         <p>Returns a set containing only element <c><anno>Element</anno></c>.
@@ -390,7 +390,7 @@
     </func>
 
     <func>
-      <name name="size" arity="1"/>
+      <name name="size" arity="1" since=""/>
       <fsummary>Return the number of elements in a set.</fsummary>
       <desc>
         <p>Returns the number of elements in <c><anno>Set</anno></c>.</p>
@@ -398,7 +398,7 @@
     </func>
 
     <func>
-      <name name="smallest" arity="1"/>
+      <name name="smallest" arity="1" since=""/>
       <fsummary>Return smallest element.</fsummary>
       <desc>
         <p>Returns the smallest element in <c><anno>Set</anno></c>. Assumes that
@@ -407,7 +407,7 @@
     </func>
 
     <func>
-      <name  name="subtract" arity="2"/>
+      <name  name="subtract" arity="2" since=""/>
       <fsummary>Return the difference of two sets.</fsummary>
       <desc>
         <p>Returns only the elements of <c><anno>Set1</anno></c> that are not
@@ -416,7 +416,7 @@
     </func>
 
     <func>
-      <name name="take_largest" arity="1"/>
+      <name name="take_largest" arity="1" since=""/>
       <fsummary>Extract largest element.</fsummary>
       <desc>
         <p>Returns <c>{<anno>Element</anno>, <anno>Set2</anno>}</c>, where
@@ -428,7 +428,7 @@
     </func>
 
     <func>
-      <name name="take_smallest" arity="1"/>
+      <name name="take_smallest" arity="1" since=""/>
       <fsummary>Extract smallest element.</fsummary>
       <desc>
         <p>Returns <c>{<anno>Element</anno>, <anno>Set2</anno>}</c>, where
@@ -440,7 +440,7 @@
     </func>
 
     <func>
-      <name name="to_list" arity="1"/>
+      <name name="to_list" arity="1" since=""/>
       <fsummary>Convert a set into a list.</fsummary>
       <desc>
         <p>Returns the elements of <c><anno>Set</anno></c> as a list.</p>
@@ -448,7 +448,7 @@
     </func>
 
     <func>
-      <name name="union" arity="1"/>
+      <name name="union" arity="1" since=""/>
       <fsummary>Return the union of a list of sets.</fsummary>
       <desc>
         <p>Returns the merged (union) set of the list of sets.</p>
@@ -456,7 +456,7 @@
     </func>
 
     <func>
-      <name name="union" arity="2"/>
+      <name name="union" arity="2" since=""/>
       <fsummary>Return the union of two sets.</fsummary>
       <desc>
         <p>Returns the merged (union) set of <c><anno>Set1</anno></c> and
diff --git a/lib/stdlib/doc/src/gb_trees.xml b/lib/stdlib/doc/src/gb_trees.xml
index 5cfff021c1..08aa1865e8 100644
--- a/lib/stdlib/doc/src/gb_trees.xml
+++ b/lib/stdlib/doc/src/gb_trees.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>gb_trees</module>
+  <module since="">gb_trees</module>
   <modulesummary>General balanced trees.</modulesummary>
   <description>
     <p>This module provides Prof. Arne Andersson's General
@@ -42,11 +42,8 @@
 
   <section>
     <title>Data Structure</title>
-    <code type="none">
-{Size, Tree}</code>
-
-    <p><c>Tree</c> is composed of nodes of the form <c>{Key, Value, Smaller,
-      Bigger}</c> and the "empty tree" node <c>nil</c>.</p>
+    <p>Trees and iterators are built using opaque data structures that should
+      not be pattern-matched from outside this module.</p>
 
     <p>There is no attempt to balance trees after deletions. As
       deletions do not increase the height of a tree, this should be OK.</p>
@@ -75,7 +72,7 @@
 
   <funcs>
     <func>
-      <name name="balance" arity="1"/>
+      <name name="balance" arity="1" since=""/>
       <fsummary>Rebalance a tree.</fsummary>
       <desc>
         <p>Rebalances <c><anno>Tree1</anno></c>. Notice that this is
@@ -88,7 +85,7 @@
     </func>
 
     <func>
-      <name name="delete" arity="2"/>
+      <name name="delete" arity="2" since=""/>
       <fsummary>Remove a node from a tree.</fsummary>
       <desc>
         <p>Removes the node with key <c><anno>Key</anno></c> from
@@ -98,7 +95,7 @@
     </func>
 
     <func>
-      <name name="delete_any" arity="2"/>
+      <name name="delete_any" arity="2" since=""/>
       <fsummary>Remove a (possibly non-existing) node from a tree.</fsummary>
       <desc>
         <p>Removes the node with key <c><anno>Key</anno></c> from
@@ -109,7 +106,7 @@
     </func>
 
     <func>
-      <name name="take" arity="2"/>
+      <name name="take" arity="2" since="OTP 20.0"/>
       <fsummary>Returns a value and new tree without node with key <c>Key</c>.</fsummary>
       <desc>
         <p>Returns a value <c><anno>Value</anno></c> from node with key <c><anno>Key</anno></c>
@@ -120,7 +117,7 @@
     </func>
 
     <func>
-      <name name="take_any" arity="2"/>
+      <name name="take_any" arity="2" since="OTP 20.0"/>
       <fsummary>Returns a value and new tree without node with key <c>Key</c>.</fsummary>
       <desc>
         <p>Returns a value <c><anno>Value</anno></c> from node with key <c><anno>Key</anno></c>
@@ -131,7 +128,7 @@
     </func>
 
     <func>
-      <name name="empty" arity="0"/>
+      <name name="empty" arity="0" since=""/>
       <fsummary>Return an empty tree.</fsummary>
       <desc>
         <p>Returns a new empty tree.</p>
@@ -139,7 +136,7 @@
     </func>
 
     <func>
-      <name name="enter" arity="3"/>
+      <name name="enter" arity="3" since=""/>
       <fsummary>Insert or update key with value in a tree.</fsummary>
       <desc>
         <p>Inserts <c><anno>Key</anno></c> with value <c><anno>Value</anno></c>
@@ -151,7 +148,7 @@
     </func>
 
     <func>
-      <name name="from_orddict" arity="1"/>
+      <name name="from_orddict" arity="1" since=""/>
       <fsummary>Make a tree from an orddict.</fsummary>
       <desc>
         <p>Turns an ordered list <c><anno>List</anno></c> of key-value tuples
@@ -160,7 +157,7 @@
     </func>
 
     <func>
-      <name name="get" arity="2"/>
+      <name name="get" arity="2" since=""/>
       <fsummary>Look up a key in a tree, if present.</fsummary>
       <desc>
         <p>Retrieves the value stored with <c><anno>Key</anno></c> in
@@ -171,7 +168,7 @@
     </func>
 
     <func>
-      <name name="insert" arity="3"/>
+      <name name="insert" arity="3" since=""/>
       <fsummary>Insert a new key and value in a tree.</fsummary>
       <desc>
         <p>Inserts <c><anno>Key</anno></c> with value <c><anno>Value</anno></c>
@@ -182,7 +179,7 @@
     </func>
 
     <func>
-      <name name="is_defined" arity="2"/>
+      <name name="is_defined" arity="2" since=""/>
       <fsummary>Test for membership of a tree.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Key</anno></c> is present in
@@ -191,7 +188,7 @@
     </func>
 
     <func>
-      <name name="is_empty" arity="1"/>
+      <name name="is_empty" arity="1" since=""/>
       <fsummary>Test for empty tree.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Tree</anno></c> is an empty tree,
@@ -200,7 +197,7 @@
     </func>
 
     <func>
-      <name name="iterator" arity="1"/>
+      <name name="iterator" arity="1" since=""/>
       <fsummary>Return an iterator for a tree.</fsummary>
       <desc>
         <p>Returns an iterator that can be used for traversing the
@@ -218,7 +215,7 @@
     </func>
 
     <func>
-      <name name="iterator_from" arity="2"/>
+      <name name="iterator_from" arity="2" since="OTP 18.0"/>
       <fsummary>Return an iterator for a tree starting from a specified key.
       </fsummary>
       <desc>
@@ -233,7 +230,7 @@
     </func>
 
     <func>
-      <name name="keys" arity="1"/>
+      <name name="keys" arity="1" since=""/>
       <fsummary>Return a list of the keys in a tree.</fsummary>
       <desc>
         <p>Returns the keys in <c><anno>Tree</anno></c> as an ordered list.</p>
@@ -241,7 +238,7 @@
     </func>
 
     <func>
-      <name name="largest" arity="1"/>
+      <name name="largest" arity="1" since=""/>
       <fsummary>Return largest key and value.</fsummary>
       <desc>
         <p>Returns <c>{<anno>Key</anno>, <anno>Value</anno>}</c>, where
@@ -253,7 +250,7 @@
     </func>
 
     <func>
-      <name name="lookup" arity="2"/>
+      <name name="lookup" arity="2" since=""/>
       <fsummary>Look up a key in a tree.</fsummary>
       <desc>
         <p>Looks up <c><anno>Key</anno></c> in <c><anno>Tree</anno></c>.
@@ -263,7 +260,7 @@
     </func>
 
     <func>
-      <name name="map" arity="2"/>
+      <name name="map" arity="2" since=""/>
       <fsummary>Return largest key and value.</fsummary>
       <desc>
         <p>Maps function F(<anno>K</anno>, <anno>V1</anno>) -> <anno>V2</anno>
@@ -275,7 +272,7 @@
     </func>
 
     <func>
-      <name name="next" arity="1"/>
+      <name name="next" arity="1" since=""/>
       <fsummary>Traverse a tree with an iterator.</fsummary>
       <desc>
         <p>Returns <c>{<anno>Key</anno>, <anno>Value</anno>,
@@ -288,7 +285,7 @@
     </func>
 
     <func>
-      <name name="size" arity="1"/>
+      <name name="size" arity="1" since=""/>
       <fsummary>Return the number of nodes in a tree.</fsummary>
       <desc>
         <p>Returns the number of nodes in <c><anno>Tree</anno></c>.</p>
@@ -296,7 +293,7 @@
     </func>
 
     <func>
-      <name name="smallest" arity="1"/>
+      <name name="smallest" arity="1" since=""/>
       <fsummary>Return smallest key and value.</fsummary>
       <desc>
         <p>Returns <c>{<anno>Key</anno>, <anno>Value</anno>}</c>, where
@@ -308,7 +305,7 @@
     </func>
 
     <func>
-      <name name="take_largest" arity="1"/>
+      <name name="take_largest" arity="1" since=""/>
       <fsummary>Extract largest key and value.</fsummary>
       <desc>
         <p>Returns <c>{<anno>Key</anno>, <anno>Value</anno>,
@@ -321,7 +318,7 @@
     </func>
 
     <func>
-      <name name="take_smallest" arity="1"/>
+      <name name="take_smallest" arity="1" since=""/>
       <fsummary>Extract smallest key and value.</fsummary>
       <desc>
         <p>Returns <c>{<anno>Key</anno>, <anno>Value</anno>,
@@ -334,7 +331,7 @@
     </func>
 
     <func>
-      <name name="to_list" arity="1"/>
+      <name name="to_list" arity="1" since=""/>
       <fsummary>Convert a tree into a list.</fsummary>
       <desc>
         <p>Converts a tree into an ordered list of key-value tuples.</p>
@@ -342,7 +339,7 @@
     </func>
 
     <func>
-      <name name="update" arity="3"/>
+      <name name="update" arity="3" since=""/>
       <fsummary>Update a key to new value in a tree.</fsummary>
       <desc>
         <p>Updates <c><anno>Key</anno></c> to value <c><anno>Value</anno></c>
@@ -352,7 +349,7 @@
     </func>
 
     <func>
-      <name name="values" arity="1"/>
+      <name name="values" arity="1" since=""/>
       <fsummary>Return a list of the values in a tree.</fsummary>
       <desc>
         <p>Returns the values in <c><anno>Tree</anno></c> as an ordered list,
diff --git a/lib/stdlib/doc/src/gen_event.xml b/lib/stdlib/doc/src/gen_event.xml
index fc34e51216..2915c4f507 100644
--- a/lib/stdlib/doc/src/gen_event.xml
+++ b/lib/stdlib/doc/src/gen_event.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>gen_event</module>
+  <module since="">gen_event</module>
   <modulesummary>Generic event handling behavior.</modulesummary>
   <description>
     <p>This behavior module provides event handling functionality. It
@@ -130,7 +130,7 @@ gen_event:stop             ----->  Module:terminate/2
 
   <funcs>
     <func>
-      <name>add_handler(EventMgrRef, Handler, Args) -> Result</name>
+      <name since="">add_handler(EventMgrRef, Handler, Args) -> Result</name>
       <fsummary>Add an event handler to a generic event manager.</fsummary>
       <type>
         <v>EventMgrRef = Name | {Name,Node} | {global,GlobalName}
@@ -178,7 +178,7 @@ gen_event:stop             ----->  Module:terminate/2
     </func>
 
     <func>
-      <name>add_sup_handler(EventMgrRef, Handler, Args) -> Result</name>
+      <name since="">add_sup_handler(EventMgrRef, Handler, Args) -> Result</name>
       <fsummary>Add a supervised event handler to a generic event manager.
       </fsummary>
       <type>
@@ -241,8 +241,8 @@ gen_event:stop             ----->  Module:terminate/2
     </func>
 
     <func>
-      <name>call(EventMgrRef, Handler, Request) -> Result</name>
-      <name>call(EventMgrRef, Handler, Request, Timeout) -> Result</name>
+      <name since="">call(EventMgrRef, Handler, Request) -> Result</name>
+      <name since="">call(EventMgrRef, Handler, Request, Timeout) -> Result</name>
       <fsummary>Make a synchronous call to a generic event manager.</fsummary>
       <type>
         <v>EventMgrRef = Name | {Name,Node} | {global,GlobalName}
@@ -285,7 +285,7 @@ gen_event:stop             ----->  Module:terminate/2
     </func>
 
     <func> 
-      <name>delete_handler(EventMgrRef, Handler, Args) -> Result</name>
+      <name since="">delete_handler(EventMgrRef, Handler, Args) -> Result</name>
       <fsummary>Delete an event handler from a generic event manager.</fsummary>
       <type>
         <v>EventMgrRef = Name | {Name,Node} | {global,GlobalName}
@@ -318,8 +318,8 @@ gen_event:stop             ----->  Module:terminate/2
     </func>
 
     <func>
-      <name>notify(EventMgrRef, Event) -> ok</name>
-      <name>sync_notify(EventMgrRef, Event) -> ok</name>
+      <name since="">notify(EventMgrRef, Event) -> ok</name>
+      <name since="">sync_notify(EventMgrRef, Event) -> ok</name>
       <fsummary>Notify an event manager about an event.</fsummary>
       <type>
         <v>EventMgrRef = Name | {Name,Node} | {global,GlobalName}
@@ -349,9 +349,9 @@ gen_event:stop             ----->  Module:terminate/2
     </func>
 
     <func>
-      <name>start() -> Result</name>
-      <name>start(EventMgrName | Options) -> Result</name>
-      <name>start(EventMgrName, Options) -> Result</name>
+      <name since="">start() -> Result</name>
+      <name since="">start(EventMgrName | Options) -> Result</name>
+      <name since="OTP 20.0">start(EventMgrName, Options) -> Result</name>
       <fsummary>Create a stand-alone event manager process.</fsummary>
       <type>
         <v>EventMgrName = {local,Name} | {global,GlobalName} | {via,Module,ViaName}</v>
@@ -375,9 +375,9 @@ gen_event:stop             ----->  Module:terminate/2
     </func>
 
     <func>
-      <name>start_link() -> Result</name>
-      <name>start_link(EventMgrName | Options) -> Result</name>
-      <name>start_link(EventMgrName, Options) -> Result</name>
+      <name since="">start_link() -> Result</name>
+      <name since="">start_link(EventMgrName | Options) -> Result</name>
+      <name since="OTP 20.0">start_link(EventMgrName, Options) -> Result</name>
       <fsummary>Create a generic event manager process in a supervision tree.
       </fsummary>
       <type>
@@ -436,8 +436,8 @@ gen_event:stop             ----->  Module:terminate/2
     </func>
 
     <func>
-      <name>stop(EventMgrRef) -> ok</name>
-      <name>stop(EventMgrRef, Reason, Timeout) -> ok</name>
+      <name since="">stop(EventMgrRef) -> ok</name>
+      <name since="OTP 18.0">stop(EventMgrRef, Reason, Timeout) -> ok</name>
       <fsummary>Terminate a generic event manager.</fsummary>
       <type>
         <v>EventMgrRef = Name | {Name,Node} | {global,GlobalName}
@@ -474,7 +474,7 @@ gen_event:stop             ----->  Module:terminate/2
     </func>
 
     <func>
-      <name>swap_handler(EventMgrRef, {Handler1,Args1}, {Handler2,Args2}) -> Result</name>
+      <name since="">swap_handler(EventMgrRef, {Handler1,Args1}, {Handler2,Args2}) -> Result</name>
       <fsummary>Replace an event handler in a generic event manager.</fsummary>
       <type>
         <v>EventMgrRef = Name | {Name,Node} | {global,GlobalName}
@@ -521,7 +521,7 @@ gen_event:stop             ----->  Module:terminate/2
     </func>
 
     <func>
-      <name>swap_sup_handler(EventMgrRef, {Handler1,Args1}, {Handler2,Args2}) -> Result</name>
+      <name since="">swap_sup_handler(EventMgrRef, {Handler1,Args1}, {Handler2,Args2}) -> Result</name>
       <fsummary>Replace an event handler in a generic event manager.</fsummary>
       <type>
         <v>EventMgrRef = Name | {Name,Node} | {global,GlobalName}
@@ -546,7 +546,7 @@ gen_event:stop             ----->  Module:terminate/2
     </func>
 
     <func>
-      <name>which_handlers(EventMgrRef) -> [Handler]</name>
+      <name since="">which_handlers(EventMgrRef) -> [Handler]</name>
       <fsummary>Return all event handlers installed in a generic event manager.
       </fsummary>
       <type>
@@ -575,7 +575,7 @@ gen_event:stop             ----->  Module:terminate/2
 
   <funcs>
     <func>
-      <name>Module:code_change(OldVsn, State, Extra) -> {ok, NewState}</name>
+      <name since="">Module:code_change(OldVsn, State, Extra) -> {ok, NewState}</name>
       <fsummary>Update the internal state during upgrade/downgrade.</fsummary>
       <type>
         <v>OldVsn = Vsn | {down, Vsn}</v>
@@ -611,7 +611,7 @@ gen_event:stop             ----->  Module:terminate/2
     </func>
 
     <func>
-      <name>Module:format_status(Opt, [PDict, State]) -> Status</name>
+      <name since="OTP R14B">Module:format_status(Opt, [PDict, State]) -> Status</name>
       <fsummary>Optional function for providing a term describing the
         current event handler state.</fsummary>
       <type>
@@ -667,7 +667,7 @@ gen_event:stop             ----->  Module:terminate/2
     </func>
 
     <func>
-      <name>Module:handle_call(Request, State) -> Result</name>
+      <name since="">Module:handle_call(Request, State) -> Result</name>
       <fsummary>Handle a synchronous request.</fsummary>
       <type>
         <v>Request = term()</v>
@@ -698,7 +698,7 @@ gen_event:stop             ----->  Module:terminate/2
     </func>
 
     <func>
-      <name>Module:handle_event(Event, State) -> Result</name>
+      <name since="">Module:handle_event(Event, State) -> Result</name>
       <fsummary>Handle an event.</fsummary>
       <type>
         <v>Event = term()</v>
@@ -756,7 +756,7 @@ gen_event:stop             ----->  Module:terminate/2
     </func>
 
     <func>
-      <name>Module:handle_info(Info, State) -> Result</name>
+      <name since="">Module:handle_info(Info, State) -> Result</name>
       <fsummary>Handle an incoming message.</fsummary>
       <type>
         <v>Info = term()</v>
@@ -788,7 +788,7 @@ gen_event:stop             ----->  Module:terminate/2
     </func>
 
     <func>
-      <name>Module:init(InitArgs) -> {ok,State} | {ok,State,hibernate} | {error,Reason}</name>
+      <name since="">Module:init(InitArgs) -> {ok,State} | {ok,State,hibernate} | {error,Reason}</name>
       <fsummary>Initialize an event handler.</fsummary>
       <type>
         <v>InitArgs = Args | {Args,Term}</v>
@@ -825,7 +825,7 @@ gen_event:stop             ----->  Module:terminate/2
     </func>
 
     <func>
-      <name>Module:terminate(Arg, State) -> term()</name>
+      <name since="">Module:terminate(Arg, State) -> term()</name>
       <fsummary>Clean up before deletion.</fsummary>
       <type>
         <v>Arg = Args | {stop,Reason} | stop | remove_handler</v>
diff --git a/lib/stdlib/doc/src/gen_server.xml b/lib/stdlib/doc/src/gen_server.xml
index 106bda85f5..a4554d7657 100644
--- a/lib/stdlib/doc/src/gen_server.xml
+++ b/lib/stdlib/doc/src/gen_server.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>gen_server</module>
+  <module since="">gen_server</module>
   <modulesummary>Generic server behavior.</modulesummary>
   <description>
     <p>This behavior module provides the server of a client-server
@@ -101,8 +101,8 @@ gen_server:abcast     -----> Module:handle_cast/2
 
   <funcs>
     <func>
-      <name>abcast(Name, Request) -> abcast</name>
-      <name>abcast(Nodes, Name, Request) -> abcast</name>
+      <name since="">abcast(Name, Request) -> abcast</name>
+      <name since="">abcast(Nodes, Name, Request) -> abcast</name>
       <fsummary>Send an asynchronous request to many generic servers.</fsummary>
       <type>
         <v>Nodes = [Node]</v>
@@ -124,8 +124,8 @@ gen_server:abcast     -----> Module:handle_cast/2
     </func>
 
     <func>
-      <name>call(ServerRef, Request) -> Reply</name>
-      <name>call(ServerRef, Request, Timeout) -> Reply</name>
+      <name since="">call(ServerRef, Request) -> Reply</name>
+      <name since="">call(ServerRef, Request, Timeout) -> Reply</name>
       <fsummary>Make a synchronous call to a generic server.</fsummary>
       <type>
         <v>ServerRef = Name | {Name,Node} | {global,GlobalName}</v>
@@ -175,7 +175,7 @@ gen_server:abcast     -----> Module:handle_cast/2
     </func>
 
     <func>
-      <name>cast(ServerRef, Request) -> ok</name>
+      <name since="">cast(ServerRef, Request) -> ok</name>
       <fsummary>Send an asynchronous request to a generic server.</fsummary>
       <type>
         <v>ServerRef = Name | {Name,Node} | {global,GlobalName}</v>
@@ -200,10 +200,10 @@ gen_server:abcast     -----> Module:handle_cast/2
     </func>
 
     <func>
-      <name>enter_loop(Module, Options, State)</name>
-      <name>enter_loop(Module, Options, State, ServerName)</name>
-      <name>enter_loop(Module, Options, State, Timeout)</name>
-      <name>enter_loop(Module, Options, State, ServerName, Timeout)</name>
+      <name since="">enter_loop(Module, Options, State)</name>
+      <name since="">enter_loop(Module, Options, State, ServerName)</name>
+      <name since="">enter_loop(Module, Options, State, Timeout)</name>
+      <name since="">enter_loop(Module, Options, State, ServerName, Timeout)</name>
       <fsummary>Enter the <c>gen_server</c> receive loop.</fsummary>
       <type>
         <v>Module = atom()</v>
@@ -248,9 +248,9 @@ gen_server:abcast     -----> Module:handle_cast/2
     </func>
 
     <func>
-      <name>multi_call(Name, Request) -> Result</name>
-      <name>multi_call(Nodes, Name, Request) -> Result</name>
-      <name>multi_call(Nodes, Name, Request, Timeout) -> Result</name>
+      <name since="">multi_call(Name, Request) -> Result</name>
+      <name since="">multi_call(Nodes, Name, Request) -> Result</name>
+      <name since="">multi_call(Nodes, Name, Request, Timeout) -> Result</name>
       <fsummary>Make a synchronous call to many generic servers.</fsummary>
       <type>
         <v>Nodes = [Node]</v>
@@ -307,7 +307,7 @@ gen_server:abcast     -----> Module:handle_cast/2
     </func>
 
     <func>
-      <name>reply(Client, Reply) -> Result</name>
+      <name since="">reply(Client, Reply) -> Result</name>
       <fsummary>Send a reply to a client.</fsummary>
       <type>
         <v>Client - see below</v>
@@ -332,8 +332,8 @@ gen_server:abcast     -----> Module:handle_cast/2
     </func>
 
     <func>
-      <name>start(Module, Args, Options) -> Result</name>
-      <name>start(ServerName, Module, Args, Options) -> Result</name>
+      <name since="">start(Module, Args, Options) -> Result</name>
+      <name since="">start(ServerName, Module, Args, Options) -> Result</name>
       <fsummary>Create a standalone <c>gen_server</c> process.</fsummary>
       <type>
         <v>ServerName = {local,Name} | {global,GlobalName}</v>
@@ -361,8 +361,8 @@ gen_server:abcast     -----> Module:handle_cast/2
     </func>
 
     <func>
-      <name>start_link(Module, Args, Options) -> Result</name>
-      <name>start_link(ServerName, Module, Args, Options) -> Result</name>
+      <name since="">start_link(Module, Args, Options) -> Result</name>
+      <name since="">start_link(ServerName, Module, Args, Options) -> Result</name>
       <fsummary>Create a <c>gen_server</c> process in a supervision tree.
       </fsummary>
       <type>
@@ -466,8 +466,8 @@ gen_server:abcast     -----> Module:handle_cast/2
     </func>
 
     <func>
-      <name>stop(ServerRef) -> ok</name>
-      <name>stop(ServerRef, Reason, Timeout) -> ok</name>
+      <name since="OTP 18.0">stop(ServerRef) -> ok</name>
+      <name since="OTP 18.0">stop(ServerRef, Reason, Timeout) -> ok</name>
       <fsummary>Synchronously stop a generic server.</fsummary>
       <type>
         <v>ServerRef = Name | {Name,Node} | {global,GlobalName}</v>
@@ -508,7 +508,7 @@ gen_server:abcast     -----> Module:handle_cast/2
 
   <funcs>
     <func>
-      <name>Module:code_change(OldVsn, State, Extra) -> {ok, NewState} | {error, Reason}</name>
+      <name since="">Module:code_change(OldVsn, State, Extra) -> {ok, NewState} | {error, Reason}</name>
       <fsummary>Update the internal state during upgrade/downgrade.</fsummary>
       <type>
         <v>OldVsn = Vsn | {down, Vsn}</v>
@@ -550,7 +550,7 @@ gen_server:abcast     -----> Module:handle_cast/2
     </func>
 
     <func>
-      <name>Module:format_status(Opt, [PDict, State]) -> Status</name>
+      <name since="OTP R13B04">Module:format_status(Opt, [PDict, State]) -> Status</name>
       <fsummary>Optional function for providing a term describing the
         current <c>gen_server</c> status.</fsummary>
       <type>
@@ -610,7 +610,7 @@ gen_server:abcast     -----> Module:handle_cast/2
     </func>
 
     <func>
-      <name>Module:handle_call(Request, From, State) -> Result</name>
+      <name since="">Module:handle_call(Request, From, State) -> Result</name>
       <fsummary>Handle a synchronous request.</fsummary>
       <type>
         <v>Request = term()</v>
@@ -677,7 +677,7 @@ gen_server:abcast     -----> Module:handle_cast/2
     </func>
 
     <func>
-      <name>Module:handle_cast(Request, State) -> Result</name>
+      <name since="">Module:handle_cast(Request, State) -> Result</name>
       <fsummary>Handle an asynchronous request.</fsummary>
       <type>
         <v>Request = term()</v>
@@ -703,7 +703,7 @@ gen_server:abcast     -----> Module:handle_cast/2
     </func>
 
     <func>
-      <name>Module:handle_continue(Continue, State) -> Result</name>
+      <name since="OTP 21.0">Module:handle_continue(Continue, State) -> Result</name>
       <fsummary>Handle a continue instruction.</fsummary>
       <type>
         <v>Continue = term()</v>
@@ -738,7 +738,7 @@ gen_server:abcast     -----> Module:handle_cast/2
     </func>
 
     <func>
-      <name>Module:handle_info(Info, State) -> Result</name>
+      <name since="">Module:handle_info(Info, State) -> Result</name>
       <fsummary>Handle an incoming message.</fsummary>
       <type>
         <v>Info = timeout | term()</v>
@@ -770,7 +770,7 @@ gen_server:abcast     -----> Module:handle_cast/2
     </func>
 
     <func>
-      <name>Module:init(Args) -> Result</name>
+      <name since="">Module:init(Args) -> Result</name>
       <fsummary>Initialize process and internal state.</fsummary>
       <type>
         <v>Args = term()</v>
@@ -811,7 +811,7 @@ gen_server:abcast     -----> Module:handle_cast/2
     </func>
 
     <func>
-      <name>Module:terminate(Reason, State)</name>
+      <name since="">Module:terminate(Reason, State)</name>
       <fsummary>Clean up before termination.</fsummary>
       <type>
         <v>Reason = normal | shutdown | {shutdown,term()} | term()</v>
diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml
index a808d3af55..ef548ad643 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>2018</year>
+      <year>2016</year><year>2019</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>gen_statem</module>
+  <module since="OTP 19.0">gen_statem</module>
   <modulesummary>Generic state machine behavior.</modulesummary>
   <description>
     <p>
@@ -40,7 +40,7 @@
     <p>
       This reference manual describes types generated from the types
       in the <c>gen_statem</c> source code, so they are correct.
-      However, the generated descriptions also reflect the type hiearchy,
+      However, the generated descriptions also reflect the type hierarchy,
       which makes them kind of hard to read.
     </p>
     <p>
@@ -167,7 +167,7 @@ erlang:'!'            -----> Module:StateName/3
     </p>
     <marker id="state callback"/>
     <p>
-      The "<em>state callback</em>" for a specific
+      The <em>state callback</em> for a specific
       <seealso marker="#type-state">state</seealso>
       in a <c>gen_statem</c> is the callback function that is called
       for all events in this state. It is selected depending on which
@@ -179,7 +179,7 @@ erlang:'!'            -----> Module:StateName/3
       When the
       <seealso marker="#type-callback_mode"><em>callback mode</em></seealso>
       is <c>state_functions</c>, the state must be an atom and
-      is used as the state callback name; see
+      is used as the <em>state callback</em> name; see
       <seealso marker="#Module:StateName/3"><c>Module:StateName/3</c></seealso>.
       This co-locates all code for a specific state
       in one function as the <c>gen_statem</c> engine
@@ -192,7 +192,7 @@ erlang:'!'            -----> Module:StateName/3
       When the
       <seealso marker="#type-callback_mode"><em>callback mode</em></seealso>
       is <c>handle_event_function</c>, the state can be any term
-      and the state callback name is
+      and the <em>state callback</em> name is
       <seealso marker="#Module:handle_event/4"><c>Module:handle_event/4</c></seealso>.
       This makes it easy to branch depending on state or event as you desire.
       Be careful about which events you handle in which
@@ -200,12 +200,36 @@ erlang:'!'            -----> Module:StateName/3
       forever creating an infinite busy loop.
     </p>
     <p>
-      The <c>gen_statem</c> enqueues incoming events in order of arrival
-      and presents these to the
-      <seealso marker="#state callback">state callback</seealso>
-      in that order. The state callback can postpone an event
-      so it is not retried in the current state.
-      After a state change the queue restarts with the postponed events.
+      When <c>gen_statem</c> receives a process message it is
+      converted into an event and the
+      <seealso marker="#state callback"><em>state callback</em></seealso>
+      is called with the event as two arguments: type and content.
+      When the
+      <seealso marker="#state callback"><em>state callback</em></seealso>
+      has processed the event it returns to <c>gen_statem</c>
+      which does a <em>state transition</em>.
+      If this <em>state transition</em> is to a different state,
+      that is: <c>NextState =/= State</c>, it is a <em>state change</em>.
+    </p>
+    <p>
+      The
+      <seealso marker="#state callback"><em>state callback</em></seealso>
+      may return
+      <seealso marker="#type-action"><em>transition actions</em></seealso>
+      for <c>gen_statem</c>
+      to execute during the <em>state transition</em>,
+      for example to reply to a
+      <seealso marker="#call/2"><c>gen_statem:call/2,3</c></seealso>.
+    </p>
+    <p>
+      One of the possible <em>transition actions</em>
+      is to postpone the current event.
+      Then it is not retried in the current state.
+      The <c>gen_statem</c> engine keeps a queue of events
+      divided into the postponed events
+      and the events still to process.
+      After a <em>state change</em> the queue restarts
+      with the postponed events.
     </p>
     <p>
       The <c>gen_statem</c> event queue model is sufficient
@@ -215,13 +239,17 @@ erlang:'!'            -----> Module:StateName/3
       to entering a new receive statement.
     </p>
     <p>
-      The <seealso marker="#state callback">state callback</seealso>
+      The
+      <seealso marker="#state callback"><em>state callback</em></seealso>
       can insert events using the
-      <seealso marker="#type-action"><c>action()</c></seealso>
+      <seealso marker="#type-action"><em>transition actions</em></seealso>
       <c>next_event</c>
-      and such an event is inserted as the next to present
-      to the state callback. That is, as if it is
-      the oldest incoming event. A dedicated
+      and such an event is inserted in the event queue
+      as the next to call the
+      <seealso marker="#state callback"><em>state callback</em></seealso>
+      with.
+      That is, as if it is the oldest incoming event.
+      A dedicated
       <seealso marker="#type-event_type"><c>event_type()</c></seealso>
       <c>internal</c> can be used for such events making them impossible
       to mistake for external events.
@@ -236,24 +264,26 @@ erlang:'!'            -----> Module:StateName/3
     <p>
       The <c>gen_statem</c> engine can automatically
       make a specialized call to the
-      <seealso marker="#state callback">state callback</seealso>
+      <seealso marker="#state callback"><em>state callback</em></seealso>
       whenever a new state is entered; see 
       <seealso marker="#type-state_enter"><c>state_enter()</c></seealso>.
       This is for writing code common to all state entries.
-      Another way to do it is to insert an event at the state transition,
-      and/or to use a dedicated state transition function,
+      Another way to do it is to explicitly insert an event
+      at the <em>state transition</em>,
+      and/or to use a dedicated <em>state transition</em> function,
       but that is something you will have to remember
-      at every state transition to the state(s) that need it.
+      at every <em>state transition</em> to the state(s) that need it.
     </p>
     <note>
       <p>If you in <c>gen_statem</c>, for example, postpone
-        an event in one state and then call another state callback
-        of yours, you have not changed states and hence the postponed event
-        is not retried, which is logical but can be confusing.
+        an event in one state and then call another <em>state callback</em>
+        of yours, you have not done a <em>state change</em>
+	and hence the postponed event is not retried,
+	which is logical but can be confusing.
       </p>
     </note>
     <p>
-      For the details of a state transition, see type
+      For the details of a <em>state transition</em>, see type
       <seealso marker="#type-transition_option"><c>transition_option()</c></seealso>.
     </p>
     <p>
@@ -276,7 +306,8 @@ erlang:'!'            -----> Module:StateName/3
       The <c>gen_statem</c> process can go into hibernation; see
       <seealso marker="proc_lib#hibernate/3"><c>proc_lib:hibernate/3</c></seealso>.
       It is done when a
-      <seealso marker="#state callback">state callback</seealso> or
+      <seealso marker="#state callback"><em>state callback</em></seealso>
+      or
       <seealso marker="#Module:init/1"><c>Module:init/1</c></seealso>
       specifies <c>hibernate</c> in the returned
       <seealso marker="#type-action"><c>Actions</c></seealso>
@@ -289,12 +320,13 @@ erlang:'!'            -----> Module:StateName/3
     </p>
     <p>
       There is also a server start option
-      <seealso marker="#type-hibernate_after_opt">
+      <seealso marker="#type-enter_loop_opt">
 	<c>{hibernate_after, Timeout}</c>
       </seealso>
       for
-      <seealso marker="#start/3"><c>start/3,4</c></seealso> or
-      <seealso marker="#start_link/3"><c>start_link/3,4</c></seealso>
+      <seealso marker="#start/3"><c>start/3,4</c></seealso>,
+      <seealso marker="#start_link/3"><c>start_link/3,4</c></seealso> or
+      <seealso marker="#enter_loop/4"><c>enter_loop/4,5,6</c></seealso>,
       that may be used to automatically hibernate the server.
     </p>
   </description>
@@ -483,36 +515,6 @@ handle_event(_, _, State, Data) ->
       </desc>
     </datatype>
     <datatype>
-      <name name="debug_opt"/>
-      <desc>
-	<p>
-	  Debug option that can be used when starting
-	  a <c>gen_statem</c> server through,
-	  <seealso marker="#enter_loop/4"><c>enter_loop/4-6</c></seealso>.
-	</p>
-	<p>
-	  For every entry in <c><anno>Dbgs</anno></c>,
-	  the corresponding function in
-	  <seealso marker="sys"><c>sys</c></seealso> is called.
-	</p>
-      </desc>
-    </datatype>
-    <datatype>
-      <name name="hibernate_after_opt"/>
-      <desc>
-	<p>
-          hibernate_after option that can be used when starting
-	  a <c>gen_statem</c> server through,
-	  <seealso marker="#enter_loop/4"><c>enter_loop/4-6</c></seealso>.
-	</p>
-    <p>If option<seealso marker="#type-hibernate_after_opt"><c>{hibernate_after,HibernateAfterTimeout}</c></seealso> is present, the <c>gen_statem</c>
-        process awaits any message for <c>HibernateAfterTimeout</c> milliseconds and
-        if no message is received, the process goes into hibernation automatically
-        (by calling <seealso marker="proc_lib#hibernate/3"><c>proc_lib:hibernate/3</c></seealso>).
-    </p>
-      </desc>
-    </datatype>
-    <datatype>
       <name name="start_opt"/>
       <desc>
 	<p>
@@ -532,6 +534,37 @@ handle_event(_, _, State, Data) ->
       </desc>
     </datatype>
     <datatype>
+      <name name="enter_loop_opt"/>
+      <desc>
+	<p>
+	  Options that can be used when starting
+	  a <c>gen_statem</c> server through,
+	  <seealso marker="#enter_loop/4"><c>enter_loop/4-6</c></seealso>.
+	</p>
+	<taglist>
+	  <tag><c>hibernate_after</c></tag>
+	  <item>
+	    <p>
+	      <c>HibernateAfterTimeout</c>
+	      specifies that the <c>gen_statem</c> process awaits
+	      any message for <c>HibernateAfterTimeout</c> milliseconds and
+              if no message is received, the process goes into hibernation
+	      automatically (by calling
+	      <seealso marker="proc_lib#hibernate/3"><c>proc_lib:hibernate/3</c></seealso>).
+	    </p>
+	  </item>
+	  <tag><c>debug</c></tag>
+	  <item>
+	    <p>
+	      For every entry in <c><anno>Dbgs</anno></c>,
+	      the corresponding function in
+	      <seealso marker="sys"><c>sys</c></seealso> is called.
+	    </p>
+	  </item>
+	</taglist>
+      </desc>
+    </datatype>
+    <datatype>
       <name name="from"/>
       <desc>
 	<p>
@@ -551,7 +584,7 @@ handle_event(_, _, State, Data) ->
 	  <seealso marker="#type-callback_mode"><em>callback mode</em></seealso>
 	  is <c>handle_event_function</c>,
 	  the state can be any term.
-	  After a state change (<c>NextState =/= State</c>),
+	  After a <em>state change</em> (<c>NextState =/= State</c>),
 	  all postponed events are retried.
 	</p>
       </desc>
@@ -564,7 +597,7 @@ handle_event(_, _, State, Data) ->
 	  <seealso marker="#type-callback_mode"><em>callback mode</em></seealso>
 	  is <c>state_functions</c>,
 	  the state must be of this type.
-	  After a state change (<c>NextState =/= State</c>),
+	  After a <em>state change</em> (<c>NextState =/= State</c>),
 	  all postponed events are retried.
 	</p>
       </desc>
@@ -595,7 +628,7 @@ handle_event(_, _, State, Data) ->
 	</p>
 	<p>
 	  <c>internal</c> events can only be generated by the
-	  state machine itself through the state transition action
+	  state machine itself through the <em>transition action</em>
 	  <seealso marker="#type-action"><c>next_event</c></seealso>.
 	</p>
       </desc>
@@ -633,9 +666,9 @@ handle_event(_, _, State, Data) ->
 	  This is the return type from
 	  <seealso marker="#Module:callback_mode/0"><c>Module:callback_mode/0</c></seealso>
 	  and selects 
-	  <seealso marker="#type-callback_mode">callback mode</seealso>
+	  <seealso marker="#type-callback_mode"><em>callback mode</em></seealso>
 	  and whether to do
-	  <seealso marker="#type-state_enter">state enter calls</seealso>,
+	  <seealso marker="#type-state_enter"><em>state enter calls</em></seealso>,
 	  or not.
 	</p>
       </desc>
@@ -684,13 +717,15 @@ handle_event(_, _, State, Data) ->
 	  If 
 	  <seealso marker="#Module:callback_mode/0"><c>Module:callback_mode/0</c></seealso>
 	  returns a list containing <c>state_enter</c>,
-	  the <c>gen_statem</c> engine will, at every state change,
+	  the <c>gen_statem</c> engine will, at every <em>state change</em>,
 	  call the
 	  <seealso marker="#state callback">state callback</seealso>
 	  with arguments <c>(enter, OldState, Data)</c>.
 	  This may look like an event but is really a call
-	  performed after the previous state callback returned
-	  and before any event is delivered to the new state callback.
+	  performed after the previous
+	  <seealso marker="#state callback"><em>state callback</em></seealso>
+	  returned and before any event is delivered to the new
+	  <seealso marker="#state callback"><em>state callback</em></seealso>.
 	  See
 	  <seealso marker="#Module:StateName/3"><c>Module:StateName/3</c></seealso>
 	  and
@@ -703,27 +738,27 @@ handle_event(_, _, State, Data) ->
 	  <seealso marker="#type-state_callback_result">
 	    <c>repeat_state_and_data</c>
 	  </seealso>
-	  tuple from the state callback.
+	  tuple from the <em>state callback</em>.
 	</p>
 	<p>
 	  If 
 	  <seealso marker="#Module:callback_mode/0"><c>Module:callback_mode/0</c></seealso>
-	  does not return such a list, no state enter calls are done.
+	  does not return such a list, no <em>state enter calls</em> are done.
 	</p>
 	<p>
 	  If 
 	  <seealso marker="#Module:code_change/4"><c>Module:code_change/4</c></seealso>
 	  should transform the state,
-	  it is regarded as a state rename and not a state change,
-	  which will not cause a state enter call.
+	  it is regarded as a state rename and not a <em>state change</em>,
+	  which will not cause a <em>state enter call</em>.
 	</p>
 	<p>
-	  Note that a state enter call <em>will</em> be done
+	  Note that a <em>state enter call</em> <em>will</em> be done
 	  right before entering the initial state even though this
-	  formally is not a state change.
-	  In this case <c>OldState</c> will be the same as <c>State</c>,
-	  which can not happen for a subsequent state change,
-	  but will happen when repeating the state enter call.
+	  actually is not a <em>state change</em>.
+	  In this case <c>OldState =:= State</c>,
+	  which cannot happen for a subsequent state change,
+	  but will happen when repeating the <em>state enter call</em>.
 	</p>
       </desc>
     </datatype>
@@ -733,8 +768,11 @@ handle_event(_, _, State, Data) ->
 	<p>
 	  Transition options can be set by
 	  <seealso marker="#type-action">actions</seealso>
-	  and modify the state transition.
-	  Here are the sequence of steps for a state transition:
+	  and modify the <em>state transition</em>.
+	  The <em>state transition</em> takes place when the
+	  <seealso marker="#state callback"><em>state callback</em></seealso>
+	  has processed an event and returns.
+	  Here are the sequence of steps for a <em>state transition</em>:
 	</p>
 	<list type="ordered">
 	  <item>
@@ -765,7 +803,7 @@ handle_event(_, _, State, Data) ->
 	      returned by the state callback that caused the state entry.
 	    </p>
 	    <p>
-	      Should this state enter call return any of
+	      Should this <em>state enter call</em> return any of
 	      the mentioned <c>repeat_*</c> callback results
 	      it is repeated again, with the updated <c>Data</c>.
             </p>
@@ -787,7 +825,8 @@ handle_event(_, _, State, Data) ->
 	  </item>
 	  <item>
 	    <p>
-	      If the state changes, the queue of incoming events
+	      If this is a <em>state change</em>,
+	      the queue of incoming events
               is reset to start with the oldest postponed.
 	    </p>
 	  </item>
@@ -821,7 +860,7 @@ handle_event(_, _, State, Data) ->
 	      if the event queue is empty.
 	    </p>
 	    <p>
-	      A state change cancels a
+	      A <em>state change</em> cancels a
               <seealso marker="#type-state_timeout"><c>state_timeout()</c></seealso>
 	      and any new transition option of this type
 	      belongs to the new state.
@@ -830,7 +869,7 @@ handle_event(_, _, State, Data) ->
 	  <item>
 	    <p>
 	      If there are enqueued events the
-	      <seealso marker="#state callback">state callback</seealso>
+	      <seealso marker="#state callback"><em>state callback</em></seealso>
 	      for the possibly new state
 	      is called with the oldest enqueued event,
 	      and we start again from the top of this list.
@@ -848,7 +887,7 @@ handle_event(_, _, State, Data) ->
 	      the next incoming message awakens the <c>gen_statem</c>,
 	      but if it is a system event it goes right back into hibernation.
 	      When a new message arrives the 
-	      <seealso marker="#state callback">state callback</seealso>
+	      <seealso marker="#state callback"><em>state callback</em></seealso>
 	      is called with the corresponding event,
 	      and we start again from the top of this sequence.
 	    </p>
@@ -861,7 +900,7 @@ handle_event(_, _, State, Data) ->
       <desc>
 	<p>
 	  If <c>true</c>, postpones the current event and retries
-	  it when the state changes
+	  it after a <em>state change</em>
 	  (<c>NextState =/= State</c>).
 	</p>
       </desc>
@@ -1021,9 +1060,9 @@ handle_event(_, _, State, Data) ->
       <name name="action"/>
       <desc>
 	<p>
-	  These state transition actions can be invoked by
+	  These <em>transition actions</em> can be invoked by
 	  returning them from the
-	  <seealso marker="#state callback">state callback</seealso>
+	  <seealso marker="#state callback"><em>state callback</em></seealso>
 	  when it is called with an
 	  <seealso marker="#type-event_type">event</seealso>,
 	  from
@@ -1054,7 +1093,7 @@ handle_event(_, _, State, Data) ->
 		<c>transition_option()</c>
 	      </seealso>
 	      <seealso marker="#type-postpone"><c>postpone()</c></seealso>
-	      for this state transition.
+	      for this <em>state transition</em>.
 	      This action is ignored when returned from
 	      <seealso marker="#Module:init/1"><c>Module:init/1</c></seealso>
 	      or given to
@@ -1093,9 +1132,9 @@ handle_event(_, _, State, Data) ->
       <name name="enter_action"/>
       <desc>
 	<p>
-	  These state transition actions can be invoked by
+	  These <em>transition actions</em> can be invoked by
 	  returning them from the
-	  <seealso marker="#state callback">state callback</seealso>, from
+	  <seealso marker="#state callback"><em>state callback</em></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>.
@@ -1119,7 +1158,7 @@ handle_event(_, _, State, Data) ->
 	      Sets the
 	      <seealso marker="#type-transition_option"><c>transition_option()</c></seealso>
 	      <seealso marker="#type-hibernate"><c>hibernate()</c></seealso>
-	      for this state transition.
+	      for this <em>state transition</em>.
 	    </p>
 	  </item>
 	</taglist>
@@ -1129,9 +1168,9 @@ handle_event(_, _, State, Data) ->
       <name name="timeout_action"/>
       <desc>
 	<p>
-	  These state transition actions can be invoked by
+	  These <em>transition actions</em> can be invoked by
 	  returning them from the
-	  <seealso marker="#state callback">state callback</seealso>, from
+	  <seealso marker="#state callback"><em>state callback</em></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>.
@@ -1147,7 +1186,7 @@ handle_event(_, _, State, Data) ->
 	      Short for <c>{timeout,Time,Time}</c>, that is,
 	      the time-out message is the time-out time.
 	      This form exists to make the
-	      <seealso marker="#state callback">state callback</seealso>
+	      <seealso marker="#state callback"><em>state callback</em></seealso>
 	      return value <c>{next_state,NextState,NewData,Time}</c>
 	      allowed like for <c>gen_fsm</c>.
 	    </p>
@@ -1193,9 +1232,9 @@ handle_event(_, _, State, Data) ->
       <name name="reply_action"/>
       <desc>
 	<p>
-	  This state transition action can be invoked by
+	  This <em>transition action</em> can be invoked by
 	  returning it from the
-	  <seealso marker="#state callback">state callback</seealso>, from
+	  <seealso marker="#state callback"><em>state callback</em></seealso>, from
 	  <seealso marker="#Module:init/1"><c>Module:init/1</c></seealso>
 	  or by giving it to
 	  <seealso marker="#enter_loop/5"><c>enter_loop/5,6</c></seealso>.
@@ -1210,7 +1249,7 @@ handle_event(_, _, State, Data) ->
 	  <c><anno>From</anno></c> must be the term from argument
 	  <seealso marker="#type-event_type"><c>{call,<anno>From</anno>}</c></seealso>
 	  in a call to a
-	  <seealso marker="#state callback">state callback</seealso>.
+	  <seealso marker="#state callback"><em>state callback</em></seealso>.
 	</p>
 	<p>
 	  Note that using this action from 
@@ -1219,7 +1258,7 @@ handle_event(_, _, State, Data) ->
 	  <seealso marker="#enter_loop/5"><c>enter_loop/5,6</c></seealso>
 	  would be weird on the border of witchcraft
 	  since there has been no earlier call to a
-	  <seealso marker="#state callback">state callback</seealso>
+	  <seealso marker="#state callback"><em>state callback</em></seealso>
 	  in this server.
 	</p>
       </desc>
@@ -1239,7 +1278,7 @@ handle_event(_, _, State, Data) ->
 	  The <seealso marker="#type-action"><c>Actions</c></seealso>
 	  are executed when entering the first
 	  <seealso marker="#type-state">state</seealso> just as for a
-	  <seealso marker="#state callback">state callback</seealso>,
+	  <seealso marker="#state callback"><em>state callback</em></seealso>,
 	  except that the action <c>postpone</c> is forced to
 	  <c>false</c> since there is no event to postpone.
 	</p>
@@ -1256,7 +1295,7 @@ handle_event(_, _, State, Data) ->
       <desc>
 	<p>
 	  <c><anno>State</anno></c> is the current state
-	  and it can not be changed since the state callback
+	  and it cannot be changed since the state callback
 	  was called with a
 	  <seealso marker="#type-state_enter"><em>state enter call</em></seealso>.
 	</p>
@@ -1292,11 +1331,13 @@ handle_event(_, _, State, Data) ->
 	  <tag><c>next_state</c></tag>
 	  <item>
 	    <p>
-	      The <c>gen_statem</c> does a state transition to
+	      The <c>gen_statem</c> does a <em>state transition</em> to
 	      <c><anno>NextState</anno></c>
 	      (which can be the same as the current state),
 	      sets <c><anno>NewData</anno></c>,
 	      and executes all <c><anno>Actions</anno></c>.
+	      If <c><anno>NextState</anno> =/= CurrentState</c>
+	      the <em>state transition</em> is a <em>state change</em>.
 	    </p>
 	  </item>
 	</taglist>
@@ -1318,54 +1359,33 @@ handle_event(_, _, State, Data) ->
 	  <tag><c>keep_state</c></tag>
 	  <item>
 	    <p>
-	      The <c>gen_statem</c> keeps the current state, or
-	      does a state transition to the current state if you like,
-	      sets <c><anno>NewData</anno></c>,
-	      and executes all <c><anno>Actions</anno></c>.
-	      This is the same as
+	      The same as
 	      <c>{next_state,CurrentState,<anno>NewData</anno>,<anno>Actions</anno>}</c>.
 	    </p>
 	  </item>
 	  <tag><c>keep_state_and_data</c></tag>
 	  <item>
 	    <p>
-	      The <c>gen_statem</c> keeps the current state or
-	      does a state transition to the current state if you like,
-	      keeps the current server data,
-	      and executes all <c><anno>Actions</anno></c>.
-	      This is the same as
-	      <c>{next_state,CurrentState,CurrentData,<anno>Actions</anno>}</c>.
+	      The same as
+	      <c>{keep_state,CurrentData,<anno>Actions</anno>}</c>.
 	    </p>
 	  </item>
 	  <tag><c>repeat_state</c></tag>
 	  <item>
 	    <p>
-	      The <c>gen_statem</c> keeps the current state, or
-	      does a state transition to the current state if you like,
-	      sets <c><anno>NewData</anno></c>,
-	      and executes all <c><anno>Actions</anno></c>.
 	      If the <c>gen_statem</c> runs with
 	      <seealso marker="#type-state_enter"><em>state enter calls</em></seealso>,
-	      the state enter call is repeated, see type
+	      the <em>state enter call</em> is repeated, see type
 	      <seealso marker="#type-transition_option"><c>transition_option()</c></seealso>,
-	      otherwise <c>repeat_state</c> is the same as
+	      other than that <c>repeat_state</c> is the same as
 	      <c>keep_state</c>.
 	    </p>
 	  </item>
 	  <tag><c>repeat_state_and_data</c></tag>
 	  <item>
 	    <p>
-	      The <c>gen_statem</c> keeps the current state and data, or
-	      does a state transition to the current state if you like,
-	      and executes all <c><anno>Actions</anno></c>.
-	      This is the same as
+	      The same as
 	      <c>{repeat_state,CurrentData,<anno>Actions</anno>}</c>.
-	      If the <c>gen_statem</c> runs with
-	      <seealso marker="#type-state_enter"><em>state enter calls</em></seealso>,
-	      the state enter call is repeated, see type
-	      <seealso marker="#type-transition_option"><c>transition_option()</c></seealso>,
-	      otherwise <c>repeat_state_and_data</c> is the same as
-	      <c>keep_state_and_data</c>.
 	    </p>
 	  </item>
 	  <tag><c>stop</c></tag>
@@ -1398,8 +1418,8 @@ handle_event(_, _, State, Data) ->
 
   <funcs>
     <func>
-      <name name="call" arity="2"/>
-      <name name="call" arity="3"/>
+      <name name="call" arity="2" since="OTP 19.0"/>
+      <name name="call" arity="3" since="OTP 19.0"/>
       <fsummary>Make a synchronous call to a <c>gen_statem</c>.</fsummary>
       <desc>
         <p>
@@ -1408,14 +1428,15 @@ handle_event(_, _, State, Data) ->
 	  by sending a request
 	  and waiting until its reply arrives.
 	  The <c>gen_statem</c> calls the
-	  <seealso marker="#state callback">state callback</seealso> with
+	  <seealso marker="#state callback"><em>state callback</em></seealso>
+	  with
 	  <seealso marker="#type-event_type"><c>event_type()</c></seealso>
 	  <c>{call,From}</c> and event content
 	  <c><anno>Request</anno></c>.
 	</p>
 	<p>
 	  A <c><anno>Reply</anno></c> is generated when a
-	  <seealso marker="#state callback">state callback</seealso>
+	  <seealso marker="#state callback"><em>state callback</em></seealso>
 	  returns with
 	  <c>{reply,From,<anno>Reply</anno>}</c> as one
 	  <seealso marker="#type-action"><c>action()</c></seealso>,
@@ -1474,7 +1495,7 @@ handle_event(_, _, State, Data) ->
     </func>
 
     <func>
-      <name name="cast" arity="2"/>
+      <name name="cast" arity="2" since="OTP 19.0"/>
       <fsummary>Send an asynchronous event to a <c>gen_statem</c>.</fsummary>
       <desc>
 	<p>
@@ -1484,7 +1505,8 @@ handle_event(_, _, State, Data) ->
 	  ignoring if the destination node or <c>gen_statem</c>
 	  does not exist.
 	  The <c>gen_statem</c> calls the
-	  <seealso marker="#state callback">state callback</seealso> with
+	  <seealso marker="#state callback"><em>state callback</em></seealso>
+	  with
 	  <seealso marker="#type-event_type"><c>event_type()</c></seealso>
 	  <c>cast</c> and event content
 	  <c><anno>Msg</anno></c>.
@@ -1493,7 +1515,7 @@ handle_event(_, _, State, Data) ->
     </func>
 
     <func>
-      <name name="enter_loop" arity="4"/>
+      <name name="enter_loop" arity="4" since="OTP 19.1"/>
       <fsummary>Enter the <c>gen_statem</c> receive loop.</fsummary>
       <desc>
 	<p>
@@ -1507,7 +1529,7 @@ handle_event(_, _, State, Data) ->
     </func>
 
     <func>
-      <name name="enter_loop" arity="5"/>
+      <name name="enter_loop" arity="5" since="OTP 19.0"/>
       <fsummary>Enter the <c>gen_statem</c> receive loop.</fsummary>
       <desc>
 	<p>
@@ -1531,7 +1553,7 @@ handle_event(_, _, State, Data) ->
     </func>
 
     <func>
-      <name name="enter_loop" arity="6"/>
+      <name name="enter_loop" arity="6" since="OTP 19.0"/>
       <fsummary>Enter the <c>gen_statem</c> receive loop.</fsummary>
       <desc>
 	<p>
@@ -1588,8 +1610,8 @@ handle_event(_, _, State, Data) ->
     </func>
 
     <func>
-      <name name="reply" arity="1"/>
-      <name name="reply" arity="2"/>
+      <name name="reply" arity="1" since="OTP 19.0"/>
+      <name name="reply" arity="2" since="OTP 19.0"/>
       <fsummary>Reply to a caller.</fsummary>
       <desc>
         <p>
@@ -1598,18 +1620,18 @@ handle_event(_, _, State, Data) ->
 	  <seealso marker="#call/2"><c>call/2</c></seealso>
 	  when the reply cannot be defined in
 	  the return value of a
-	  <seealso marker="#state callback">state callback</seealso>.
+	  <seealso marker="#state callback"><em>state callback</em></seealso>.
 	</p>
 	<p>
 	  <c><anno>From</anno></c> must be the term from argument
 	  <seealso marker="#type-event_type"><c>{call,<anno>From</anno>}</c></seealso>
 	  to the
-	  <seealso marker="#state callback">state callback</seealso>.
+	  <seealso marker="#state callback"><em>state callback</em></seealso>.
 	  A reply or multiple replies canalso be sent
 	  using one or several
 	  <seealso marker="#type-reply_action"><c>reply_action()</c></seealso>s
 	  from a
-	  <seealso marker="#state callback">state callback</seealso>.
+	  <seealso marker="#state callback"><em>state callback</em></seealso>.
 	</p>
 	<note>
 	  <p>
@@ -1621,8 +1643,8 @@ handle_event(_, _, State, Data) ->
     </func>
 
     <func>
-      <name name="start" arity="3"/>
-      <name name="start" arity="4"/>
+      <name name="start" arity="3" since="OTP 19.0"/>
+      <name name="start" arity="4" since="OTP 19.0"/>
       <fsummary>Create a standalone <c>gen_statem</c> process.</fsummary>
       <desc>
         <p>
@@ -1642,8 +1664,8 @@ handle_event(_, _, State, Data) ->
     </func>
 
     <func>
-      <name name="start_link" arity="3"/>
-      <name name="start_link" arity="4"/>
+      <name name="start_link" arity="3" since="OTP 19.0"/>
+      <name name="start_link" arity="4" since="OTP 19.0"/>
       <fsummary>Create a linked <c>gen_statem</c> process.</fsummary>
       <desc>
         <p>
@@ -1681,7 +1703,11 @@ handle_event(_, _, State, Data) ->
         <list type="bulleted">
           <item>
 	    <p>
-	      If option <c>{timeout,Time}</c> is present in
+	      If option
+	      <seealso marker="#type-start_opt">
+		<c>{timeout,Time}</c>
+	      </seealso>
+	      is present in
 	      <c><anno>Opts</anno></c>, the <c>gen_statem</c>
 	      is allowed to spend <c>Time</c> milliseconds initializing
 	      or it terminates and the start function returns
@@ -1689,23 +1715,33 @@ handle_event(_, _, State, Data) ->
             </p>
           </item>
           <item>
-            <p>If option<seealso marker="#type-hibernate_after_opt"><c>{hibernate_after,HibernateAfterTimeout}</c></seealso> is present, the <c>gen_statem</c>
-              process awaits any message for <c>HibernateAfterTimeout</c> milliseconds and
-              if no message is received, the process goes into hibernation automatically
-              (by calling <seealso marker="proc_lib#hibernate/3"><c>proc_lib:hibernate/3</c></seealso>).
+            <p>If option
+	    <seealso marker="#type-enter_loop_opt">
+	      <c>{hibernate_after,HibernateAfterTimeout}</c>
+	    </seealso>
+	    is present, the <c>gen_statem</c>
+            process awaits any message for <c>HibernateAfterTimeout</c> milliseconds and
+            if no message is received, the process goes into hibernation automatically
+            (by calling <seealso marker="proc_lib#hibernate/3"><c>proc_lib:hibernate/3</c></seealso>).
             </p>
           </item>
           <item>
             <p>
               If option
-              <seealso marker="#type-debug_opt"><c>{debug,Dbgs}</c></seealso>
+              <seealso marker="#type-enter_loop_opt">
+		<c>{debug,Dbgs}</c>
+	      </seealso>
               is present in <c><anno>Opts</anno></c>, debugging through
               <seealso marker="sys"><c>sys</c></seealso> is activated.
             </p>
           </item>
           <item>
             <p>
-              If option <c>{spawn_opt,SpawnOpts}</c> is present in
+              If option
+              <seealso marker="#type-start_opt">
+		<c>{spawn_opt,SpawnOpts}</c>
+	      </seealso>
+	      is present in
               <c><anno>Opts</anno></c>, <c>SpawnOpts</c> is passed
               as option list to
 	      <seealso marker="erts:erlang#spawn_opt/2"><c>erlang:spawn_opt/2</c></seealso>,
@@ -1750,7 +1786,7 @@ handle_event(_, _, State, Data) ->
     </func>
 
     <func>
-      <name name="stop" arity="1"/>
+      <name name="stop" arity="1" since="OTP 19.0"/>
       <fsummary>Synchronously stop a generic server.</fsummary>
       <desc>
 	<p>
@@ -1761,7 +1797,7 @@ handle_event(_, _, State, Data) ->
     </func>
 
     <func>
-      <name name="stop" arity="3"/>
+      <name name="stop" arity="3" since="OTP 19.0"/>
       <fsummary>Synchronously stop a generic server.</fsummary>
       <desc>
 	<p>
@@ -1807,7 +1843,7 @@ handle_event(_, _, State, Data) ->
 
   <funcs>
     <func>
-      <name>Module:callback_mode() -> CallbackMode</name>
+      <name since="OTP 19.1">Module:callback_mode() -> CallbackMode</name>
       <fsummary>Update the internal state during upgrade/downgrade.</fsummary>
       <type>
 	<v>
@@ -1826,7 +1862,7 @@ handle_event(_, _, State, Data) ->
 	  for efficiency reasons, so this function is only called
 	  once after server start and after code change,
 	  but before the first
-	  <seealso marker="#state callback">state callback</seealso>
+	  <seealso marker="#state callback"><em>state callback</em></seealso>
 	  in the current code version is called.
 	  More occasions may be added in future versions
 	  of <c>gen_statem</c>.
@@ -1858,7 +1894,7 @@ handle_event(_, _, State, Data) ->
     </func>
 
     <func>
-      <name>Module:code_change(OldVsn, OldState, OldData, Extra) ->
+      <name since="OTP 19.0">Module:code_change(OldVsn, OldState, OldData, Extra) ->
         Result
       </name>
       <fsummary>Update the internal state during upgrade/downgrade.</fsummary>
@@ -1883,7 +1919,7 @@ handle_event(_, _, State, Data) ->
           <p>
 	    This callback is optional, so callback modules need not export it.
             If a release upgrade/downgrade with
-	    <c>Change={advanced,Extra}</c>
+	    <c>Change = {advanced,Extra}</c>
 	    specified in the <c>.appup</c> file is made
 	    when <c>code_change/4</c> is not implemented
 	    the process will crash with exit reason <c>undef</c>.
@@ -1893,7 +1929,7 @@ handle_event(_, _, State, Data) ->
 	  This function is called by a <c>gen_statem</c> when it is to
 	  update its internal state during a release upgrade/downgrade,
 	  that is, when the instruction <c>{update,Module,Change,...}</c>,
-	  where <c>Change={advanced,Extra}</c>, is specified in the
+	  where <c>Change = {advanced,Extra}</c>, is specified in the
 	  <seealso marker="sasl:appup"><c>appup</c></seealso>
 	  file. For more information, see
 	  <seealso marker="doc/design_principles:release_handling#instr">OTP Design Principles</seealso>.
@@ -1922,7 +1958,7 @@ handle_event(_, _, State, Data) ->
 	<p>
 	  If the function returns a failure <c>Reason</c>, the ongoing
 	  upgrade fails and rolls back to the old release.
-	  Note that <c>Reason</c> can not be an <c>{ok,_,_}</c> tuple
+	  Note that <c>Reason</c> cannot be an <c>{ok,_,_}</c> tuple
 	  since that will be regarded as a
 	  <c>{ok,NewState,NewData}</c> tuple,
 	  and that a tuple matching <c>{ok,_}</c>
@@ -1933,13 +1969,13 @@ handle_event(_, _, State, Data) ->
 	<p>
 	  Also note when upgrading a <c>gen_statem</c>,
 	  this function and hence
-	  the <c>Change={advanced,Extra}</c> parameter in the
+	  the <c>Change = {advanced,Extra}</c> parameter in the
 	  <seealso marker="sasl:appup"><c>appup</c></seealso> file
 	  is not only needed to update the internal state
 	  or to act on the <c>Extra</c> argument.
 	  It is also needed if an upgrade or downgrade should change 
 	  <seealso marker="#type-callback_mode"><em>callback mode</em></seealso>,
-	  or else the callback mode after the code change
+	  or else the <em>callback mode</em> after the code change
 	  will not be honoured,
 	  most probably causing a server crash.
 	</p>
@@ -1947,7 +1983,7 @@ handle_event(_, _, State, Data) ->
     </func>
 
     <func>
-      <name>Module:init(Args) -> Result(StateType)</name>
+      <name since="OTP 19.0">Module:init(Args) -> Result(StateType)</name>
       <fsummary>
 	Initializing process and internal state.
       </fsummary>
@@ -1989,7 +2025,7 @@ init(Args) -> erlang:error(not_implemented, [Args]).</pre>
     </func>
 
     <func>
-      <name>Module:format_status(Opt, [PDict,State,Data]) ->
+      <name since="OTP 19.0">Module:format_status(Opt, [PDict,State,Data]) ->
         Status
       </name>
       <fsummary>Optional function for providing a term describing the
@@ -2088,16 +2124,16 @@ init(Args) -> erlang:error(not_implemented, [Args]).</pre>
     </func>
 
     <func>
-      <name>Module:StateName(enter, OldState, Data) ->
+      <name since="OTP 19.0">Module:StateName(enter, OldState, Data) ->
         StateEnterResult(StateName)
       </name>
-      <name>Module:StateName(EventType, EventContent, Data) ->
+      <name since="OTP 19.0">Module:StateName(EventType, EventContent, Data) ->
         StateFunctionResult
       </name>
-      <name>Module:handle_event(enter, OldState, State, Data) ->
+      <name since="OTP 19.0">Module:handle_event(enter, OldState, State, Data) ->
 	StateEnterResult(State)
       </name>
-      <name>Module:handle_event(EventType, EventContent, State, Data) ->
+      <name since="OTP 19.0">Module:handle_event(EventType, EventContent, State, Data) ->
 	HandleEventResult
       </name>
       <fsummary>Handle an event.</fsummary>
@@ -2148,7 +2184,7 @@ init(Args) -> erlang:error(not_implemented, [Args]).</pre>
 	  <seealso marker="#type-event_type"><c>{call,From}</c></seealso>,
 	  the caller waits for a reply. The reply can be sent
 	  from this or from any other
-	  <seealso marker="#state callback">state callback</seealso>
+	  <seealso marker="#state callback"><em>state callback</em></seealso>
 	  by returning with <c>{reply,From,Reply}</c> in
 	  <seealso marker="#type-action"><c>Actions</c></seealso>, in
 	  <seealso marker="#type-reply_action"><c>Replies</c></seealso>,
@@ -2173,9 +2209,9 @@ init(Args) -> erlang:error(not_implemented, [Args]).</pre>
 	</p>
 	<p>
 	  When the <c>gen_statem</c> runs with
-	  <seealso marker="#type-state_enter">state enter calls</seealso>,
+	  <seealso marker="#type-state_enter"><em>state enter calls</em></seealso>,
 	  these functions are also called with arguments
-	  <c>(enter, OldState, ...)</c> whenever the state changes.
+	  <c>(enter, OldState, ...)</c> during every <em>state change</em>.
 	  In this case there are some restrictions on the
 	  <seealso marker="#type-enter_action">actions</seealso>
 	  that may be returned:
@@ -2208,7 +2244,7 @@ init(Args) -> erlang:error(not_implemented, [Args]).</pre>
 	  <seealso marker="erts:erlang#throw/1"><c>throw</c></seealso>
 	  to return the result, which can be useful.
 	  For example to bail out with <c>throw(keep_state_and_data)</c>
-	  from deep within complex code that can not
+	  from deep within complex code that cannot
 	  return <c>{next_state,State,Data}</c> because
 	  <c>State</c> or <c>Data</c> is no longer in scope.
 	</p>
@@ -2216,7 +2252,7 @@ init(Args) -> erlang:error(not_implemented, [Args]).</pre>
     </func>
 
     <func>
-      <name>Module:terminate(Reason, State, Data) -> Ignored</name>
+      <name since="OTP 19.0">Module:terminate(Reason, State, Data) -> Ignored</name>
       <fsummary>Clean up before termination.</fsummary>
       <type>
         <v>Reason = normal | shutdown | {shutdown,term()} | term()</v>
diff --git a/lib/stdlib/doc/src/io.xml b/lib/stdlib/doc/src/io.xml
index d4a2713840..d69e808586 100644
--- a/lib/stdlib/doc/src/io.xml
+++ b/lib/stdlib/doc/src/io.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>io</module>
+  <module since="">io</module>
   <modulesummary>Standard I/O server interface functions.</modulesummary>
   <description>
     <p>This module provides an interface to standard Erlang I/O servers.
@@ -104,8 +104,8 @@
 
   <funcs>
     <func>
-      <name name="columns" arity="0"/>
-      <name name="columns" arity="1"/>
+      <name name="columns" arity="0" since=""/>
+      <name name="columns" arity="1" since=""/>
       <fsummary>Get the number of columns of an I/O device.</fsummary>
       <desc>
           <p>Retrieves the number of columns of the
@@ -116,12 +116,12 @@
     </func>
 
     <func>
-      <name name="format" arity="1"/>
-      <name name="format" arity="2"/>
-      <name name="format" arity="3"/>
-      <name name="fwrite" arity="1"/>
-      <name name="fwrite" arity="2"/>
-      <name name="fwrite" arity="3"/>
+      <name name="format" arity="1" since=""/>
+      <name name="format" arity="2" since=""/>
+      <name name="format" arity="3" since=""/>
+      <name name="fwrite" arity="1" since=""/>
+      <name name="fwrite" arity="2" since=""/>
+      <name name="fwrite" arity="3" since=""/>
       <fsummary>Write formatted output.</fsummary>
       <desc>
         <p>Writes the items in <c><anno>Data</anno></c> (<c>[]</c>) on the
@@ -523,8 +523,8 @@ ok
     </func>
 
     <func>
-      <name name="fread" arity="2"/>
-      <name name="fread" arity="3"/>
+      <name name="fread" arity="2" since=""/>
+      <name name="fread" arity="3" since=""/>
       <fsummary>Read formatted input.</fsummary>
       <type name="server_no_data"/>
       <desc>
@@ -690,8 +690,8 @@ enter><input>:</input>   <input>alan</input>   <input>:</input>   <input>joe</in
     </func>
 
     <func>
-      <name name="get_chars" arity="2"/>
-      <name name="get_chars" arity="3"/>
+      <name name="get_chars" arity="2" since=""/>
+      <name name="get_chars" arity="3" since=""/>
       <fsummary>Read a specified number of characters.</fsummary>
       <type name="server_no_data"/>
       <desc>
@@ -722,8 +722,8 @@ enter><input>:</input>   <input>alan</input>   <input>:</input>   <input>joe</in
     </func>
 
     <func>
-      <name name="get_line" arity="1"/>
-      <name name="get_line" arity="2"/>
+      <name name="get_line" arity="1" since=""/>
+      <name name="get_line" arity="2" since=""/>
       <fsummary>Read a line.</fsummary>
       <type name="server_no_data"/>
       <desc>
@@ -754,8 +754,8 @@ enter><input>:</input>   <input>alan</input>   <input>:</input>   <input>joe</in
     </func>
 
     <func>
-      <name name="getopts" arity="0"/>
-      <name name="getopts" arity="1"/>
+      <name name="getopts" arity="0" since=""/>
+      <name name="getopts" arity="1" since=""/>
       <fsummary>Get the supported options and values from an I/O server.
       </fsummary>
       <desc>
@@ -781,8 +781,8 @@ enter><input>:</input>   <input>alan</input>   <input>:</input>   <input>joe</in
     </func>
 
     <func>
-      <name name="nl" arity="0"/>
-      <name name="nl" arity="1"/>
+      <name name="nl" arity="0" since=""/>
+      <name name="nl" arity="1" since=""/>
       <fsummary>Write a newline.</fsummary>
       <desc>
         <p>Writes new line to the standard output
@@ -791,10 +791,10 @@ enter><input>:</input>   <input>alan</input>   <input>:</input>   <input>joe</in
     </func>
 
     <func>
-      <name name="parse_erl_exprs" arity="1"/>
-      <name name="parse_erl_exprs" arity="2"/>
-      <name name="parse_erl_exprs" arity="3"/>
-      <name name="parse_erl_exprs" arity="4"/>
+      <name name="parse_erl_exprs" arity="1" since=""/>
+      <name name="parse_erl_exprs" arity="2" since=""/>
+      <name name="parse_erl_exprs" arity="3" since=""/>
+      <name name="parse_erl_exprs" arity="4" since="OTP R16B"/>
       <fsummary>Read, tokenize, and parse Erlang expressions.</fsummary>
       <type name="parse_ret"/>
       <type name="server_no_data"/>
@@ -844,10 +844,10 @@ enter><input>abc("hey".</input>
     </func>
 
     <func>
-      <name name="parse_erl_form" arity="1"/>
-      <name name="parse_erl_form" arity="2"/>
-      <name name="parse_erl_form" arity="3"/>
-      <name name="parse_erl_form" arity="4"/>
+      <name name="parse_erl_form" arity="1" since=""/>
+      <name name="parse_erl_form" arity="2" since=""/>
+      <name name="parse_erl_form" arity="3" since=""/>
+      <name name="parse_erl_form" arity="4" since="OTP R16B"/>
       <fsummary>Read, tokenize, and parse an Erlang form.</fsummary>
       <type name="parse_form_ret"/>
       <type name="server_no_data"/>
@@ -888,7 +888,7 @@ enter><input>abc("hey".</input>
     </func>
 
     <func>
-      <name name="printable_range" arity="0"/>
+      <name name="printable_range" arity="0" since="OTP R16B"/>
       <fsummary>Get user-requested printable character range.</fsummary>
       <desc>
         <p>Returns the user-requested range of printable Unicode characters.</p>
@@ -918,8 +918,8 @@ enter><input>abc("hey".</input>
     </func>
 
     <func>
-      <name name="put_chars" arity="1"/>
-      <name name="put_chars" arity="2"/>
+      <name name="put_chars" arity="1" since=""/>
+      <name name="put_chars" arity="2" since=""/>
       <fsummary>Write a list of characters.</fsummary>
       <desc>
         <p>Writes the characters of <c><anno>CharData</anno></c> to the I/O
@@ -928,8 +928,8 @@ enter><input>abc("hey".</input>
     </func>
 
     <func>
-      <name name="read" arity="1"/>
-      <name name="read" arity="2"/>
+      <name name="read" arity="1" since=""/>
+      <name name="read" arity="2" since=""/>
       <fsummary>Read a term.</fsummary>
       <type name="server_no_data"/>
       <desc>
@@ -960,8 +960,8 @@ enter><input>abc("hey".</input>
     </func>
 
     <func>
-      <name name="read" arity="3"/>
-      <name name="read" arity="4"/>
+      <name name="read" arity="3" since=""/>
+      <name name="read" arity="4" since="OTP R16B"/>
       <fsummary>Read a term.</fsummary>
       <type name="server_no_data"/>
       <desc>
@@ -997,8 +997,8 @@ enter><input>abc("hey".</input>
     </func>
 
     <func>
-      <name name="rows" arity="0"/>
-      <name name="rows" arity="1"/>
+      <name name="rows" arity="0" since=""/>
+      <name name="rows" arity="1" since=""/>
       <fsummary>Get the number of rows of an I/O device.</fsummary>
       <desc>
           <p>Retrieves the number of rows of <c><anno>IoDevice</anno></c>
@@ -1009,10 +1009,10 @@ enter><input>abc("hey".</input>
     </func>
 
     <func>
-      <name name="scan_erl_exprs" arity="1"/>
-      <name name="scan_erl_exprs" arity="2"/>
-      <name name="scan_erl_exprs" arity="3"/>
-      <name name="scan_erl_exprs" arity="4"/>
+      <name name="scan_erl_exprs" arity="1" since=""/>
+      <name name="scan_erl_exprs" arity="2" since=""/>
+      <name name="scan_erl_exprs" arity="3" since=""/>
+      <name name="scan_erl_exprs" arity="4" since="OTP R16B"/>
       <fsummary>Read and tokenize Erlang expressions.</fsummary>
       <type name="server_no_data"/>
       <desc>
@@ -1060,10 +1060,10 @@ enter><input>1.0er.</input>
     </func>
 
     <func>
-      <name name="scan_erl_form" arity="1"/>
-      <name name="scan_erl_form" arity="2"/>
-      <name name="scan_erl_form" arity="3"/>
-      <name name="scan_erl_form" arity="4"/>
+      <name name="scan_erl_form" arity="1" since=""/>
+      <name name="scan_erl_form" arity="2" since=""/>
+      <name name="scan_erl_form" arity="3" since=""/>
+      <name name="scan_erl_form" arity="4" since="OTP R16B"/>
       <fsummary>Read and tokenize an Erlang form.</fsummary>
       <type name="server_no_data"/>
       <desc>
@@ -1083,8 +1083,8 @@ enter><input>1.0er.</input>
     </func>
 
     <func>
-      <name name="setopts" arity="1"/>
-      <name name="setopts" arity="2"/>
+      <name name="setopts" arity="1" since=""/>
+      <name name="setopts" arity="2" since=""/>
       <fsummary>Set options.</fsummary>
       <desc>
         <p>Set options for the standard I/O device
@@ -1198,8 +1198,8 @@ fun("") -> {yes, "quit", []};
     </func>
 
     <func>
-      <name name="write" arity="1"/>
-      <name name="write" arity="2"/>
+      <name name="write" arity="1" since=""/>
+      <name name="write" arity="2" since=""/>
       <fsummary>Write a term.</fsummary>
       <desc>
         <p>Writes term <c><anno>Term</anno></c> to the standard output
diff --git a/lib/stdlib/doc/src/io_lib.xml b/lib/stdlib/doc/src/io_lib.xml
index a3df2897ac..4d527f8ed3 100644
--- a/lib/stdlib/doc/src/io_lib.xml
+++ b/lib/stdlib/doc/src/io_lib.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>io_lib</module>
+  <module since="">io_lib</module>
   <modulesummary>I/O library functions.</modulesummary>
   <description>
     <p>This module contains functions for converting to and from
@@ -99,7 +99,7 @@
 
   <funcs>
     <func>
-      <name name="build_text" arity="1"/>
+      <name name="build_text" arity="1" since="OTP 18.0"/>
       <fsummary>Build the output text for a preparsed format list.</fsummary>
       <desc>
         <p>For details, see
@@ -108,7 +108,7 @@
     </func>
 
     <func>
-      <name name="char_list" arity="1"/>
+      <name name="char_list" arity="1" since=""/>
       <fsummary>Test for a list of characters.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a flat list of
@@ -117,7 +117,7 @@
     </func>
 
     <func>
-      <name name="deep_char_list" arity="1"/>
+      <name name="deep_char_list" arity="1" since=""/>
       <fsummary>Test for a deep list of characters.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a, possibly deep,
@@ -126,7 +126,7 @@
     </func>
 
     <func>
-      <name name="deep_latin1_char_list" arity="1"/>
+      <name name="deep_latin1_char_list" arity="1" since="OTP R16B"/>
       <fsummary>Test for a deep list of characters.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a, possibly deep,
@@ -136,8 +136,8 @@
     </func>
 
     <func>
-      <name name="format" arity="2"/>
-      <name name="fwrite" arity="2"/>
+      <name name="format" arity="2" since=""/>
+      <name name="fwrite" arity="2" since=""/>
       <fsummary>Write formatted output.</fsummary>
       <desc>
         <p>Returns a character list that represents <c><anno>Data</anno></c>
@@ -156,8 +156,8 @@
     </func>
 
     <func>
-      <name name="format" arity="3"/>
-      <name name="fwrite" arity="3"/>
+      <name name="format" arity="3" since="OTP 21.0"/>
+      <name name="fwrite" arity="3" since="OTP 21.0"/>
       <fsummary>Write formatted output.</fsummary>
       <desc>
         <p>Returns a character list that represents <c><anno>Data</anno></c>
@@ -181,7 +181,7 @@
     </func>
 
     <func>
-      <name name="fread" arity="2"/>
+      <name name="fread" arity="2" since=""/>
       <fsummary>Read formatted input.</fsummary>
       <desc>
         <p>Tries to read <c><anno>String</anno></c> in accordance with the
@@ -222,7 +222,7 @@
     </func>
 
     <func>
-      <name name="fread" arity="3"/>
+      <name name="fread" arity="3" since=""/>
       <fsummary>Re-entrant formatted reader</fsummary>
       <desc>
         <p>This is the re-entrant formatted reader. The continuation of
@@ -268,7 +268,7 @@
     </func>
 
     <func>
-      <name name="indentation" arity="2"/>
+      <name name="indentation" arity="2" since=""/>
       <fsummary>Indentation after printing string.</fsummary>
       <desc>
         <p>Returns the indentation if <c><anno>String</anno></c> has been
@@ -277,7 +277,7 @@
     </func>
 
     <func>
-      <name name="latin1_char_list" arity="1"/>
+      <name name="latin1_char_list" arity="1" since="OTP R16B"/>
       <fsummary>Test for a list of ISO Latin-1 characters.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a flat list of
@@ -286,7 +286,7 @@
     </func>
 
     <func>
-      <name name="nl" arity="0"/>
+      <name name="nl" arity="0" since=""/>
       <fsummary>Write a newline.</fsummary>
       <desc>
         <p>Returns a character list that represents a new line character.</p>
@@ -294,8 +294,8 @@
     </func>
 
     <func>
-      <name name="print" arity="1"/>
-      <name name="print" arity="4"/>
+      <name name="print" arity="1" since=""/>
+      <name name="print" arity="4" since=""/>
       <fsummary>Pretty print a term.</fsummary>
       <desc>
         <p>Returns a list of characters that represents
@@ -315,7 +315,7 @@
     </func>
 
     <func>
-      <name name="printable_latin1_list" arity="1"/>
+      <name name="printable_latin1_list" arity="1" since="OTP R16B"/>
       <fsummary>Test for a list of printable ISO Latin-1 characters.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a flat list of
@@ -324,7 +324,7 @@
     </func>
 
     <func>
-      <name name="printable_list" arity="1"/>
+      <name name="printable_list" arity="1" since=""/>
       <fsummary>Test for a list of printable characters.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a flat list of
@@ -338,7 +338,7 @@
     </func>
 
     <func>
-      <name name="printable_unicode_list" arity="1"/>
+      <name name="printable_unicode_list" arity="1" since="OTP R16B"/>
       <fsummary>Test for a list of printable Unicode characters.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is a flat list of
@@ -347,7 +347,7 @@
     </func>
 
     <func>
-      <name name="scan_format" arity="2"/>
+      <name name="scan_format" arity="2" since="OTP 18.0"/>
       <fsummary>Parse all control sequences in the format string.</fsummary>
       <desc>
         <p>Returns a list corresponding to the specified format string,
@@ -373,7 +373,7 @@
     </func>
 
     <func>
-      <name name="unscan_format" arity="1"/>
+      <name name="unscan_format" arity="1" since="OTP 18.0"/>
       <fsummary>Revert a preparsed format list to a plain character list
         and a list of arguments.</fsummary>
       <desc>
@@ -383,9 +383,9 @@
     </func>
 
     <func>
-      <name name="write" arity="1"/>
-      <name name="write" arity="2" clause_i="1"/>
-      <name name="write" arity="2" clause_i="2"/>
+      <name name="write" arity="1" since=""/>
+      <name name="write" arity="2" clause_i="1" since=""/>
+      <name name="write" arity="2" clause_i="2" since="OTP 20.0"/>
       <fsummary>Write a term.</fsummary>
       <desc>
         <p>Returns a character list that represents <c><anno>Term</anno></c>.
@@ -411,7 +411,7 @@
     </func>
 
     <func>
-      <name name="write_atom" arity="1"/>
+      <name name="write_atom" arity="1" since=""/>
       <fsummary>Write an atom.</fsummary>
       <desc>
         <p>Returns the list of characters needed to print atom
@@ -420,7 +420,7 @@
     </func>
 
     <func>
-      <name name="write_atom_as_latin1" arity="1"/>
+      <name name="write_atom_as_latin1" arity="1" since="OTP 20.0"/>
       <fsummary>Write an atom.</fsummary>
       <desc>
         <p>Returns the list of characters needed to print atom
@@ -430,7 +430,7 @@
     </func>
 
     <func>
-      <name name="write_char" arity="1"/>
+      <name name="write_char" arity="1" since=""/>
       <fsummary>Write a character.</fsummary>
       <desc>
         <p>Returns the list of characters needed to print a character
@@ -439,7 +439,7 @@
     </func>
 
     <func>
-      <name name="write_char_as_latin1" arity="1"/>
+      <name name="write_char_as_latin1" arity="1" since="OTP R16B"/>
       <fsummary>Write a character.</fsummary>
       <desc>
         <p>Returns the list of characters needed to print a character
@@ -449,7 +449,7 @@
     </func>
 
     <func>
-      <name name="write_latin1_char" arity="1"/>
+      <name name="write_latin1_char" arity="1" since="OTP R16B"/>
       <fsummary>Write an ISO Latin-1 character.</fsummary>
       <desc>
         <p>Returns the list of characters needed to print a character
@@ -458,7 +458,7 @@
     </func>
 
     <func>
-      <name name="write_latin1_string" arity="1"/>
+      <name name="write_latin1_string" arity="1" since="OTP R16B"/>
       <fsummary>Write an ISO Latin-1 string.</fsummary>
       <desc>
         <p>Returns the list of characters needed to print
@@ -467,7 +467,7 @@
     </func>
 
     <func>
-      <name name="write_string" arity="1"/>
+      <name name="write_string" arity="1" since=""/>
       <fsummary>Write a string.</fsummary>
       <desc>
         <p>Returns the list of characters needed to print
@@ -476,7 +476,7 @@
     </func>
 
     <func>
-      <name name="write_string_as_latin1" arity="1"/>
+      <name name="write_string_as_latin1" arity="1" since="OTP R16B"/>
       <fsummary>Write a string.</fsummary>
       <desc>
         <p>Returns the list of characters needed to print
diff --git a/lib/stdlib/doc/src/lists.xml b/lib/stdlib/doc/src/lists.xml
index e4215a5336..2755fb3dce 100644
--- a/lib/stdlib/doc/src/lists.xml
+++ b/lib/stdlib/doc/src/lists.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2018</year>
+      <year>1996</year><year>2019</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -28,7 +28,7 @@
     <date>1996-09-28</date>
     <rev>A</rev>
   </header>
-  <module>lists</module>
+  <module since="">lists</module>
   <modulesummary>List processing functions.</modulesummary>
   <description>
     <p>This module contains functions for list processing.</p>
@@ -63,7 +63,7 @@
 
   <funcs>
     <func>
-      <name name="all" arity="2"/>
+      <name name="all" arity="2" since=""/>
       <fsummary>Return <c>true</c> if all elements in a list satisfy
         <c>Pred</c>.</fsummary>
       <desc>
@@ -74,7 +74,7 @@
     </func>
 
     <func>
-      <name name="any" arity="2"/>
+      <name name="any" arity="2" since=""/>
       <fsummary>Return <c>true</c> if any of the elements in a list
         satisfies <c>Pred</c>.</fsummary>
       <desc>
@@ -85,7 +85,7 @@
     </func>
 
     <func>
-      <name name="append" arity="1"/>
+      <name name="append" arity="1" since=""/>
       <fsummary>Append a list of lists.</fsummary>
       <desc>
         <p>Returns a list in which all the sublists of
@@ -98,7 +98,7 @@
     </func>
 
     <func>
-      <name name="append" arity="2"/>
+      <name name="append" arity="2" since=""/>
       <fsummary>Append two lists.</fsummary>
       <desc>
         <p>Returns a new list <c><anno>List3</anno></c>, which is made from
@@ -113,7 +113,7 @@
     </func>
 
     <func>
-      <name name="concat" arity="1"/>
+      <name name="concat" arity="1" since=""/>
       <fsummary>Concatenate a list of atoms.</fsummary>
       <desc>
         <p>Concatenates the text representation of the elements of
@@ -127,7 +127,7 @@
     </func>
 
     <func>
-      <name name="delete" arity="2"/>
+      <name name="delete" arity="2" since=""/>
       <fsummary>Delete an element from a list.</fsummary>
       <desc>
         <p>Returns a copy of <c><anno>List1</anno></c> where the first element
@@ -137,7 +137,7 @@
     </func>
 
     <func>
-      <name name="droplast" arity="1"/>
+      <name name="droplast" arity="1" since="OTP 17.0"/>
       <fsummary>Drop the last element of a list.</fsummary>
       <desc>
         <p>Drops the last element of a <c><anno>List</anno></c>. The list is to
@@ -147,7 +147,7 @@
     </func>
 
     <func>
-      <name name="dropwhile" arity="2"/>
+      <name name="dropwhile" arity="2" since=""/>
       <fsummary>Drop elements from a list while a predicate is <c>true</c>.
       </fsummary>
       <desc>
@@ -159,7 +159,7 @@
     </func>
 
     <func>
-      <name name="duplicate" arity="2"/>
+      <name name="duplicate" arity="2" since=""/>
       <fsummary>Make <c>N</c> copies of element.</fsummary>
       <desc>
         <p>Returns a list containing <c><anno>N</anno></c> copies of term
@@ -172,7 +172,7 @@
     </func>
 
     <func>
-      <name name="filter" arity="2"/>
+      <name name="filter" arity="2" since=""/>
       <fsummary>Select elements that satisfy a predicate.</fsummary>
       <desc>
         <p><c><anno>List2</anno></c> is a list of all elements
@@ -182,7 +182,7 @@
     </func>
 
     <func>
-      <name name="filtermap" arity="2"/>
+      <name name="filtermap" arity="2" since="OTP R16B01"/>
       <fsummary>Filter and map elements that satisfy a function.</fsummary>
       <desc>
         <p>Calls <c><anno>Fun</anno>(<anno>Elem</anno>)</c> on successive
@@ -211,7 +211,7 @@ filtermap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="flatlength" arity="1"/>
+      <name name="flatlength" arity="1" since=""/>
       <fsummary>Length of flattened deep list.</fsummary>
       <desc>
         <p>Equivalent to <c>length(flatten(<anno>DeepList</anno>))</c>, but
@@ -220,7 +220,7 @@ filtermap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="flatmap" arity="2"/>
+      <name name="flatmap" arity="2" since=""/>
       <fsummary>Map and flatten in one pass.</fsummary>
       <desc>
         <p>Takes a function from <c><anno>A</anno></c>s to lists of
@@ -241,7 +241,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="flatten" arity="1"/>
+      <name name="flatten" arity="1" since=""/>
       <fsummary>Flatten a deep list.</fsummary>
       <desc>
         <p>Returns a flattened version of <c><anno>DeepList</anno></c>.</p>
@@ -249,7 +249,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="flatten" arity="2"/>
+      <name name="flatten" arity="2" since=""/>
       <fsummary>Flatten a deep list.</fsummary>
       <desc>
         <p>Returns a flattened version of <c><anno>DeepList</anno></c> with tail
@@ -258,7 +258,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="foldl" arity="3"/>
+      <name name="foldl" arity="3" since=""/>
       <fsummary>Fold a function over a list.</fsummary>
       <desc>
         <p>Calls <c><anno>Fun</anno>(<anno>Elem</anno>, <anno>AccIn</anno>)</c>
@@ -278,7 +278,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="foldr" arity="3"/>
+      <name name="foldr" arity="3" since=""/>
       <fsummary>Fold a function over a list.</fsummary>
       <desc>
         <p>Like <seealso marker="#foldl/3"><c>foldl/3</c></seealso>, but the
@@ -297,7 +297,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="join" arity="2"/>
+      <name name="join" arity="2" since="OTP 19.0"/>
       <fsummary>Insert an element between elements in a list</fsummary>
       <desc>
         <p>Inserts <c><anno>Sep</anno></c> between each element in <c><anno>List1</anno></c>. Has no
@@ -312,7 +312,7 @@ flatmap(Fun, List1) ->
       </desc>
     </func>
     <func>
-      <name name="foreach" arity="2"/>
+      <name name="foreach" arity="2" since=""/>
       <fsummary>Apply a function to each element of a list.</fsummary>
       <desc>
         <p>Calls <c><anno>Fun</anno>(<anno>Elem</anno>)</c> for each element
@@ -324,7 +324,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="keydelete" arity="3"/>
+      <name name="keydelete" arity="3" since=""/>
       <fsummary>Delete an element from a list of tuples.</fsummary>
       <type_desc variable="N">1..tuple_size(<anno>Tuple</anno>)</type_desc>
       <desc>
@@ -336,7 +336,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="keyfind" arity="3"/>
+      <name name="keyfind" arity="3" since=""/>
       <fsummary>Search for an element in a list of tuples.</fsummary>
       <type_desc variable="N">1..tuple_size(<anno>Tuple</anno>)</type_desc>
       <desc>
@@ -349,7 +349,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="keymap" arity="3"/>
+      <name name="keymap" arity="3" since=""/>
       <fsummary>Map a function over a list of tuples.</fsummary>
       <type_desc variable="N">1..tuple_size(<anno>Tuple</anno>)</type_desc>
       <desc>
@@ -368,7 +368,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="keymember" arity="3"/>
+      <name name="keymember" arity="3" since=""/>
       <fsummary>Test for membership of a list of tuples.</fsummary>
       <type_desc variable="N">1..tuple_size(<anno>Tuple</anno>)</type_desc>
       <desc>
@@ -379,7 +379,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="keymerge" arity="3"/>
+      <name name="keymerge" arity="3" since=""/>
       <fsummary>Merge two key-sorted lists of tuples.</fsummary>
       <type_desc variable="N">1..tuple_size(<anno>Tuple</anno>)</type_desc>
       <desc>
@@ -395,7 +395,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="keyreplace" arity="4"/>
+      <name name="keyreplace" arity="4" since=""/>
       <fsummary>Replace an element in a list of tuples.</fsummary>
       <type_desc variable="N">1..tuple_size(<anno>Tuple</anno>)</type_desc>
       <desc>
@@ -407,7 +407,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="keysearch" arity="3"/>
+      <name name="keysearch" arity="3" since=""/>
       <fsummary>Search for an element in a list of tuples.</fsummary>
       <type_desc variable="N">1..tuple_size(<anno>Tuple</anno>)</type_desc>
       <desc>
@@ -425,7 +425,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="keysort" arity="2"/>
+      <name name="keysort" arity="2" since=""/>
       <fsummary>Sort a list of tuples.</fsummary>
       <type_desc variable="N">1..tuple_size(<anno>Tuple</anno>)</type_desc>
       <desc>
@@ -436,7 +436,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="keystore" arity="4"/>
+      <name name="keystore" arity="4" since=""/>
       <fsummary>Store an element in a list of tuples.</fsummary>
       <type_desc variable="N">1..tuple_size(<anno>Tuple</anno>)</type_desc>
       <desc>
@@ -452,7 +452,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="keytake" arity="3"/>
+      <name name="keytake" arity="3" since=""/>
       <fsummary>Extract an element from a list of tuples.</fsummary>
       <type_desc variable="N">1..tuple_size(<anno>Tuple</anno>)</type_desc>
       <desc>
@@ -467,7 +467,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="last" arity="1"/>
+      <name name="last" arity="1" since=""/>
       <fsummary>Return last element in a list.</fsummary>
       <desc>
         <p>Returns the last element in <c><anno>List</anno></c>.</p>
@@ -475,7 +475,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="map" arity="2"/>
+      <name name="map" arity="2" since=""/>
       <fsummary>Map a function over a list.</fsummary>
       <desc>
         <p>Takes a function from <c><anno>A</anno></c>s to
@@ -488,7 +488,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="mapfoldl" arity="3"/>
+      <name name="mapfoldl" arity="3" since=""/>
       <fsummary>Map and fold in one pass.</fsummary>
       <desc>
         <p>Combines the operations of
@@ -504,7 +504,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="mapfoldr" arity="3"/>
+      <name name="mapfoldr" arity="3" since=""/>
       <fsummary>Map and fold in one pass.</fsummary>
       <desc>
         <p>Combines the operations of
@@ -514,7 +514,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="max" arity="1"/>
+      <name name="max" arity="1" since=""/>
       <fsummary>Return maximum element of a list.</fsummary>
       <desc>
         <p>Returns the first element of <c><anno>List</anno></c> that compares
@@ -524,7 +524,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="member" arity="2"/>
+      <name name="member" arity="2" since=""/>
       <fsummary>Test for membership of a list.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Elem</anno></c> matches some element
@@ -533,7 +533,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="merge" arity="1"/>
+      <name name="merge" arity="1" since=""/>
       <fsummary>Merge a list of sorted lists.</fsummary>
       <desc>
         <p>Returns the sorted list formed by merging all the sublists of
@@ -546,7 +546,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="merge" arity="2"/>
+      <name name="merge" arity="2" since=""/>
       <fsummary>Merge two sorted lists.</fsummary>
       <desc>
         <p>Returns the sorted list formed by merging <c><anno>List1</anno></c>
@@ -559,7 +559,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="merge" arity="3"/>
+      <name name="merge" arity="3" since=""/>
       <fsummary>Merge two sorted list.</fsummary>
       <desc>
         <p>Returns the sorted list formed by merging <c><anno>List1</anno></c>
@@ -577,7 +577,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="merge3" arity="3"/>
+      <name name="merge3" arity="3" since=""/>
       <fsummary>Merge three sorted lists.</fsummary>
       <desc>
         <p>Returns the sorted list formed by merging <c><anno>List1</anno></c>,
@@ -593,7 +593,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="min" arity="1"/>
+      <name name="min" arity="1" since=""/>
       <fsummary>Return minimum element of a list.</fsummary>
       <desc>
         <p>Returns the first element of <c><anno>List</anno></c> that compares
@@ -603,7 +603,7 @@ flatmap(Fun, List1) ->
     </func>
 
     <func>
-      <name name="nth" arity="2"/>
+      <name name="nth" arity="2" since=""/>
       <fsummary>Return the <c>N</c>th element of a list.</fsummary>
       <type_desc variable="N">1..length(<anno>List</anno>)</type_desc>
       <desc>
@@ -617,7 +617,7 @@ c</pre>
     </func>
 
     <func>
-      <name name="nthtail" arity="2"/>
+      <name name="nthtail" arity="2" since=""/>
       <fsummary>Return the <c>N</c>th tail of a list.</fsummary>
       <type_desc variable="N">0..length(<anno>List</anno>)</type_desc>
       <desc>
@@ -638,7 +638,7 @@ c</pre>
     </func>
 
     <func>
-      <name name="partition" arity="2"/>
+      <name name="partition" arity="2" since=""/>
       <fsummary>Partition a list into two lists based on a predicate.</fsummary>
       <desc>
         <p>Partitions <c><anno>List</anno></c> into two lists, where the first
@@ -658,7 +658,7 @@ c</pre>
     </func>
 
     <func>
-      <name name="prefix" arity="2"/>
+      <name name="prefix" arity="2" since=""/>
       <fsummary>Test for list prefix.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>List1</anno></c> is a prefix of
@@ -667,7 +667,7 @@ c</pre>
     </func>
 
     <func>
-      <name name="reverse" arity="1"/>
+      <name name="reverse" arity="1" since=""/>
       <fsummary>Reverse a list.</fsummary>
       <desc>
         <p>Returns a list with the elements in <c><anno>List1</anno></c>
@@ -676,7 +676,7 @@ c</pre>
     </func>
 
     <func>
-      <name name="reverse" arity="2"/>
+      <name name="reverse" arity="2" since=""/>
       <fsummary>Reverse a list appending a tail.</fsummary>
       <desc>
         <p>Returns a list with the elements in <c><anno>List1</anno></c>
@@ -689,8 +689,20 @@ c</pre>
     </func>
 
     <func>
-      <name name="seq" arity="2"/>
-      <name name="seq" arity="3"/>
+      <name name="search" arity="2" since="OTP 21.0"/>
+      <fsummary>Find the first element that satisfies a predicate.</fsummary>
+      <desc>
+        <p>If there is a <c><anno>Value</anno></c> in <c><anno>List</anno></c>
+          such that <c><anno>Pred</anno>(<anno>Value</anno>)</c> returns
+          <c>true</c>, returns <c>{value, <anno>Value</anno>}</c>
+          for the first such <c><anno>Value</anno></c>,
+          otherwise returns <c>false</c>.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name name="seq" arity="2" since=""/>
+      <name name="seq" arity="3" since=""/>
       <fsummary>Generate a sequence of integers.</fsummary>
       <desc>
         <p>Returns a sequence of integers that starts with
@@ -736,7 +748,7 @@ length(lists:seq(From, To, Incr)) =:= (To - From + Incr) div Incr</code>
     </func>
 
     <func>
-      <name name="sort" arity="1"/>
+      <name name="sort" arity="1" since=""/>
       <fsummary>Sort a list.</fsummary>
       <desc>
         <p>Returns a list containing the sorted elements of
@@ -745,7 +757,7 @@ length(lists:seq(From, To, Incr)) =:= (To - From + Incr) div Incr</code>
     </func>
 
     <func>
-      <name name="sort" arity="2"/>
+      <name name="sort" arity="2" since=""/>
       <fsummary>Sort a list.</fsummary>
       <desc>
         <p>Returns a list containing the sorted elements of
@@ -759,7 +771,7 @@ length(lists:seq(From, To, Incr)) =:= (To - From + Incr) div Incr</code>
     </func>
 
     <func>
-      <name name="split" arity="2"/>
+      <name name="split" arity="2" since=""/>
       <fsummary>Split a list into two lists.</fsummary>
       <type_desc variable="N">0..length(<anno>List1</anno>)</type_desc>
       <desc>
@@ -771,19 +783,7 @@ length(lists:seq(From, To, Incr)) =:= (To - From + Incr) div Incr</code>
     </func>
 
     <func>
-      <name name="search" arity="2"/>
-      <fsummary>Find the first element that satisfies a predicate.</fsummary>
-      <desc>
-        <p>If there is a <c><anno>Value</anno></c> in <c><anno>List</anno></c>
-          such that <c><anno>Pred</anno>(<anno>Value</anno>)</c> returns
-          <c>true</c>, returns <c>{value, <anno>Value</anno>}</c>
-          for the first such <c><anno>Value</anno></c>,
-          otherwise returns <c>false</c>.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name name="splitwith" arity="2"/>
+      <name name="splitwith" arity="2" since=""/>
       <fsummary>Split a list into two lists based on a predicate.</fsummary>
       <desc>
         <p>Partitions <c><anno>List</anno></c> into two lists according to
@@ -804,7 +804,7 @@ splitwith(Pred, List) ->
     </func>
 
     <func>
-      <name name="sublist" arity="2"/>
+      <name name="sublist" arity="2" since=""/>
       <fsummary>Return a sublist of a certain length, starting at the first
         position.</fsummary>
       <desc>
@@ -816,7 +816,7 @@ splitwith(Pred, List) ->
     </func>
 
     <func>
-      <name name="sublist" arity="3"/>
+      <name name="sublist" arity="3" since=""/>
       <fsummary>Return a sublist starting at a specified position and with a
         specified number of elements.</fsummary>
       <type_desc variable="Start">1..(length(<anno>List1</anno>)+1)</type_desc>
@@ -838,7 +838,7 @@ splitwith(Pred, List) ->
     </func>
 
     <func>
-      <name name="subtract" arity="2"/>
+      <name name="subtract" arity="2" since=""/>
       <fsummary>Subtract the element in one list from another list.</fsummary>
       <desc>
         <p>Returns a new list <c><anno>List3</anno></c> that is a copy of
@@ -854,7 +854,7 @@ splitwith(Pred, List) ->
     </func>
 
     <func>
-      <name name="suffix" arity="2"/>
+      <name name="suffix" arity="2" since=""/>
       <fsummary>Test for list suffix.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>List1</anno></c> is a suffix of
@@ -863,7 +863,7 @@ splitwith(Pred, List) ->
     </func>
 
     <func>
-      <name name="sum" arity="1"/>
+      <name name="sum" arity="1" since=""/>
       <fsummary>Return the sum of elements in a list.</fsummary>
       <desc>
         <p>Returns the sum of the elements in <c><anno>List</anno></c>.</p>
@@ -871,7 +871,7 @@ splitwith(Pred, List) ->
     </func>
 
     <func>
-      <name name="takewhile" arity="2"/>
+      <name name="takewhile" arity="2" since=""/>
       <fsummary>Take elements from a list while a predicate is <c>true</c>.
       </fsummary>
       <desc>
@@ -884,7 +884,7 @@ splitwith(Pred, List) ->
     </func>
 
     <func>
-      <name name="ukeymerge" arity="3"/>
+      <name name="ukeymerge" arity="3" since=""/>
       <fsummary>Merge two key-sorted lists of tuples, removing duplicates.
       </fsummary>
       <type_desc variable="N">1..tuple_size(<anno>Tuple</anno>)</type_desc>
@@ -902,7 +902,7 @@ splitwith(Pred, List) ->
     </func>
 
     <func>
-      <name name="ukeysort" arity="2"/>
+      <name name="ukeysort" arity="2" since=""/>
       <fsummary>Sort a list of tuples, removing duplicates.</fsummary>
       <type_desc variable="N">1..tuple_size(<anno>Tuple</anno>)</type_desc>
       <desc>
@@ -914,7 +914,7 @@ splitwith(Pred, List) ->
     </func>
 
     <func>
-      <name name="umerge" arity="1"/>
+      <name name="umerge" arity="1" since=""/>
       <fsummary>Merge a list of sorted lists, removing duplicates.</fsummary>
       <desc>
         <p>Returns the sorted list formed by merging all the sublists
@@ -927,7 +927,7 @@ splitwith(Pred, List) ->
     </func>
 
     <func>
-      <name name="umerge" arity="2"/>
+      <name name="umerge" arity="2" since=""/>
       <fsummary>Merge two sorted lists, removing duplicates.</fsummary>
       <desc>
         <p>Returns the sorted list formed by merging <c><anno>List1</anno></c>
@@ -941,7 +941,7 @@ splitwith(Pred, List) ->
     </func>
 
     <func>
-      <name name="umerge" arity="3"/>
+      <name name="umerge" arity="3" since=""/>
       <fsummary>Merge two sorted lists, removing duplicates.</fsummary>
       <desc>
         <p>Returns the sorted list formed by merging <c><anno>List1</anno></c>
@@ -958,7 +958,7 @@ splitwith(Pred, List) ->
     </func>
 
     <func>
-      <name name="umerge3" arity="3"/>
+      <name name="umerge3" arity="3" since=""/>
       <fsummary>Merge three sorted lists, removing duplicates.</fsummary>
       <desc>
         <p>Returns the sorted list formed by merging <c><anno>List1</anno></c>,
@@ -973,7 +973,7 @@ splitwith(Pred, List) ->
     </func>
 
     <func>
-      <name name="unzip" arity="1"/>
+      <name name="unzip" arity="1" since=""/>
       <fsummary>Unzip a list of two-tuples into two lists.</fsummary>
       <desc>
         <p>"Unzips" a list of two-tuples into two lists, where the first
@@ -983,7 +983,7 @@ splitwith(Pred, List) ->
     </func>
 
     <func>
-      <name name="unzip3" arity="1"/>
+      <name name="unzip3" arity="1" since=""/>
       <fsummary>Unzip a list of three-tuples into three lists.</fsummary>
       <desc>
         <p>"Unzips" a list of three-tuples into three lists, where
@@ -994,7 +994,7 @@ splitwith(Pred, List) ->
     </func>
 
     <func>
-      <name name="usort" arity="1"/>
+      <name name="usort" arity="1" since=""/>
       <fsummary>Sort a list, removing duplicates.</fsummary>
       <desc>
         <p>Returns a list containing the sorted elements of
@@ -1004,7 +1004,7 @@ splitwith(Pred, List) ->
     </func>
 
     <func>
-      <name name="usort" arity="2"/>
+      <name name="usort" arity="2" since=""/>
       <fsummary>Sort a list, removing duplicates.</fsummary>
       <desc>
         <p>Returns a list containing the sorted elements of
@@ -1019,7 +1019,7 @@ splitwith(Pred, List) ->
     </func>
 
     <func>
-      <name name="zip" arity="2"/>
+      <name name="zip" arity="2" since=""/>
       <fsummary>Zip two lists into a list of two-tuples.</fsummary>
       <desc>
         <p>"Zips" two lists of equal length into one list of two-tuples,
@@ -1030,7 +1030,7 @@ splitwith(Pred, List) ->
     </func>
 
     <func>
-      <name name="zip3" arity="3"/>
+      <name name="zip3" arity="3" since=""/>
       <fsummary>Zip three lists into a list of three-tuples.</fsummary>
       <desc>
         <p>"Zips" three lists of equal length into one list of
@@ -1042,7 +1042,7 @@ splitwith(Pred, List) ->
     </func>
 
     <func>
-      <name name="zipwith" arity="3"/>
+      <name name="zipwith" arity="3" since=""/>
       <fsummary>Zip two lists into one list according to a fun.</fsummary>
       <desc>
         <p>Combines the elements of two lists of equal length into one list.
@@ -1059,7 +1059,7 @@ splitwith(Pred, List) ->
     </func>
 
     <func>
-      <name name="zipwith3" arity="4"/>
+      <name name="zipwith3" arity="4" since=""/>
       <fsummary>Zip three lists into one list according to a fun.</fsummary>
       <desc>
         <p>Combines the elements of three lists of equal length into one
diff --git a/lib/stdlib/doc/src/log_mf_h.xml b/lib/stdlib/doc/src/log_mf_h.xml
index edc3d31025..b922006cc0 100644
--- a/lib/stdlib/doc/src/log_mf_h.xml
+++ b/lib/stdlib/doc/src/log_mf_h.xml
@@ -34,7 +34,7 @@
     <rev>A</rev>
     <file>log_mf_h.xml</file>
   </header>
-  <module>log_mf_h</module>
+  <module since="">log_mf_h</module>
   <modulesummary>An event handler that logs events to disk.</modulesummary>
   <description>
     <p>This module is a <c>gen_event</c> handler module that can be installed
@@ -60,8 +60,8 @@
 
   <funcs>
     <func>
-      <name name="init" arity="3"/>
-      <name name="init" arity="4"/>
+      <name name="init" arity="3" since=""/>
+      <name name="init" arity="4" since=""/>
       <fsummary>Initiate the event handler.</fsummary>
       <desc>
         <p>Initiates the event handler. Returns <c><anno>Args</anno></c>, which
diff --git a/lib/stdlib/doc/src/maps.xml b/lib/stdlib/doc/src/maps.xml
index a225dea3b5..8e88882b56 100644
--- a/lib/stdlib/doc/src/maps.xml
+++ b/lib/stdlib/doc/src/maps.xml
@@ -27,7 +27,7 @@
     <date>2014-02-28</date>
     <rev>A</rev>
   </header>
-  <module>maps</module>
+  <module since="OTP 17.0">maps</module>
   <modulesummary>Maps processing functions.</modulesummary>
   <description>
     <p>This module contains functions for maps processing.</p>
@@ -35,9 +35,10 @@
 
   <datatypes>
     <datatype>
-      <name name="iterator"/>
+      <name name="iterator" n_vars="2"/>
       <desc>
-        <p>An iterator representing the key value associations in a map.</p>
+        <p>An iterator representing the associations in a map with keys of type
+          <c><anno>Key</anno></c> and values of type <c><anno>Value</anno></c>.</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>,
@@ -45,11 +46,15 @@
           <seealso marker="#map-2"><c>maps:map/2</c></seealso>.</p>
       </desc>
     </datatype>
+
+    <datatype>
+      <name name="iterator" n_vars="0"/>
+    </datatype>
   </datatypes>
 
   <funcs>
     <func>
-      <name name="filter" arity="2"/>
+      <name name="filter" arity="2" since="OTP 18.0"/>
       <fsummary>Select pairs that satisfy a predicate.</fsummary>
       <desc>
         <p>Returns a map <c><anno>Map</anno></c> for which predicate
@@ -68,7 +73,7 @@
     </func>
 
     <func>
-      <name name="find" arity="2"/>
+      <name name="find" arity="2" since="OTP 17.0"/>
       <fsummary></fsummary>
       <desc>
         <p>Returns a tuple <c>{ok, Value}</c>, where <c><anno>Value</anno></c>
@@ -87,16 +92,16 @@
     </func>
 
     <func>
-      <name name="fold" arity="3"/>
+      <name name="fold" arity="3" since="OTP 17.0"/>
       <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>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>Calls <c>F(Key, Value, AccIn)</c> for every <c><anno>Key</anno></c>
+          to value <c><anno>Value</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
@@ -111,7 +116,7 @@
     </func>
 
     <func>
-      <name name="from_list" arity="1"/>
+      <name name="from_list" arity="1" since="OTP 17.0"/>
       <fsummary></fsummary>
       <desc>
         <p>Takes a list of key-value tuples elements and builds a map. The
@@ -128,7 +133,7 @@
     </func>
 
     <func>
-      <name name="get" arity="2"/>
+      <name name="get" arity="2" since="OTP 17.0"/>
       <fsummary></fsummary>
       <desc>
         <p>Returns value <c><anno>Value</anno></c> associated with
@@ -147,7 +152,7 @@
     </func>
 
     <func>
-      <name name="get" arity="3"/>
+      <name name="get" arity="3" since="OTP 17.1"/>
       <fsummary></fsummary>
       <desc>
         <p>Returns value <c><anno>Value</anno></c> associated with
@@ -168,7 +173,7 @@ val1
     </func>
 
     <func>
-      <name name="is_key" arity="2"/>
+      <name name="is_key" arity="2" since="OTP 17.0"/>
       <fsummary></fsummary>
       <desc>
         <p>Returns <c>true</c> if map <c><anno>Map</anno></c> contains
@@ -188,7 +193,7 @@ false</code>
     </func>
 
     <func>
-      <name name="iterator" arity="1"/>
+      <name name="iterator" arity="1" since="OTP 21.0"/>
       <fsummary>Create a map iterator.</fsummary>
       <desc>
         <p>Returns a map iterator <c><anno>Iterator</anno></c> that can
@@ -202,19 +207,19 @@ false</code>
         <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,[]}
+> I = maps:iterator(M), ok.
+ok
+> {K1, V1, I2} = maps:next(I), {K1, V1}.
+{a,1}
+> {K2, V2, I3} = maps:next(I2),{K2, V2}.
+{b,2}
 > maps:next(I3).
 none</code>
       </desc>
     </func>
 
     <func>
-      <name name="keys" arity="1"/>
+      <name name="keys" arity="1" since="OTP 17.0"/>
       <fsummary></fsummary>
       <desc>
         <p>Returns a complete list of keys, in any order, which resides
@@ -230,15 +235,16 @@ none</code>
     </func>
 
     <func>
-      <name name="map" arity="2"/>
+      <name name="map" arity="2" since="OTP 17.0"/>
       <fsummary></fsummary>
       <desc>
         <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>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>Map</anno></c>.</p>
+          <c>fun F(Key, Value1)</c> for every <c><anno>Key</anno></c> to value
+          <c><anno>Value1</anno></c> association in
+          <c><anno>MapOrIter</anno></c> in any order. Function <c>fun Fun/2</c>
+          must return value <c><anno>Value2</anno></c> to be associated with
+          key <c><anno>Key</anno></c> 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
@@ -253,7 +259,7 @@ none</code>
     </func>
 
     <func>
-      <name name="merge" arity="2"/>
+      <name name="merge" arity="2" since="OTP 17.0"/>
       <fsummary></fsummary>
       <desc>
         <p>Merges two maps into a single map <c><anno>Map3</anno></c>. If two
@@ -271,7 +277,7 @@ none</code>
     </func>
 
     <func>
-      <name name="new" arity="0"/>
+      <name name="new" arity="0" since="OTP 17.0"/>
       <fsummary></fsummary>
       <desc>
         <p>Returns a new empty map.</p>
@@ -283,7 +289,7 @@ none</code>
     </func>
 
     <func>
-      <name name="next" arity="1"/>
+      <name name="next" arity="1" since="OTP 21.0"/>
       <fsummary>Get the next key and value from an iterator.</fsummary>
       <desc>
         <p>Returns the next key-value association in
@@ -298,21 +304,21 @@ none</code>
         <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).
+> I = maps:iterator(Map), ok.
+ok
+> {K1, V1, I1} = maps:next(I), {K1, V1}.
+{a,1}
+> {K2, V2, I2} = maps:next(I1), {K2, V2}.
+{b,2}
+> {K3, V3, I3} = maps:next(I2), {K3, V3}.
+{c,3}
+> maps:next(I3).
 none</code>
       </desc>
     </func>
 
     <func>
-      <name name="put" arity="3"/>
+      <name name="put" arity="3" since="OTP 17.0"/>
       <fsummary></fsummary>
       <desc>
         <p>Associates <c><anno>Key</anno></c> with value
@@ -336,7 +342,7 @@ none</code>
     </func>
 
     <func>
-      <name name="remove" arity="2"/>
+      <name name="remove" arity="2" since="OTP 17.0"/>
       <fsummary></fsummary>
       <desc>
         <p>Removes the <c><anno>Key</anno></c>, if it exists, and its
@@ -356,7 +362,7 @@ none</code>
     </func>
 
     <func>
-      <name name="size" arity="1"/>
+      <name name="size" arity="1" since="OTP 17.0"/>
       <fsummary></fsummary>
       <desc>
         <p>Returns the number of key-value associations in
@@ -370,7 +376,7 @@ none</code>
     </func>
 
     <func>
-      <name name="take" arity="2"/>
+      <name name="take" arity="2" since="OTP 19.0"/>
       <fsummary></fsummary>
       <desc>
 	<p>The function removes the <c><anno>Key</anno></c>, if it
@@ -395,7 +401,7 @@ error</code>
     </func>
 
     <func>
-      <name name="to_list" arity="1"/>
+      <name name="to_list" arity="1" since="OTP 17.0"/>
       <fsummary></fsummary>
       <desc>
         <p>Returns a list of pairs representing the key-value associations of
@@ -412,7 +418,7 @@ error</code>
     </func>
 
     <func>
-      <name name="update" arity="3"/>
+      <name name="update" arity="3" since="OTP 17.0"/>
       <fsummary></fsummary>
       <desc>
         <p>If <c><anno>Key</anno></c> exists in <c><anno>Map1</anno></c>, the
@@ -432,7 +438,7 @@ error</code>
     </func>
 
     <func>
-      <name name="update_with" arity="3"/>
+      <name name="update_with" arity="3" since="OTP 19.0"/>
       <fsummary></fsummary>
       <desc>
         <p>Update a value in a <c><anno>Map1</anno></c> associated
@@ -451,7 +457,7 @@ error</code>
     </func>
 
     <func>
-      <name name="update_with" arity="4"/>
+      <name name="update_with" arity="4" since="OTP 19.0"/>
       <fsummary></fsummary>
       <desc>
         <p>Update a value in a <c><anno>Map1</anno></c> associated
@@ -471,7 +477,7 @@ error</code>
         </func>
 
     <func>
-      <name name="values" arity="1"/>
+      <name name="values" arity="1" since="OTP 17.0"/>
       <fsummary></fsummary>
       <desc>
         <p>Returns a complete list of values, in arbitrary order, contained in
@@ -487,7 +493,7 @@ error</code>
     </func>
 
     <func>
-      <name name="with" arity="2"/>
+      <name name="with" arity="2" since="OTP 17.3"/>
       <fsummary></fsummary>
       <desc>
         <p>Returns a new map <c><anno>Map2</anno></c> with the keys <c>K1</c>
@@ -504,7 +510,7 @@ error</code>
     </func>
 
     <func>
-      <name name="without" arity="2"/>
+      <name name="without" arity="2" since="OTP 17.0"/>
       <fsummary></fsummary>
       <desc>
         <p>Returns a new map <c><anno>Map2</anno></c> without keys <c>K1</c>
diff --git a/lib/stdlib/doc/src/math.xml b/lib/stdlib/doc/src/math.xml
index b4f096217a..d89310e2c8 100644
--- a/lib/stdlib/doc/src/math.xml
+++ b/lib/stdlib/doc/src/math.xml
@@ -34,7 +34,7 @@
     <rev>B</rev>
     <file>math.xml</file>
   </header>
-  <module>math</module>
+  <module since="">math</module>
   <modulesummary>Mathematical functions.</modulesummary>
   <description>
     <p>This module provides an interface to a number of mathematical
@@ -50,28 +50,28 @@
 
   <funcs>
     <func>
-      <name name="acos" arity="1"/>
-      <name name="acosh" arity="1"/>
-      <name name="asin" arity="1"/>
-      <name name="asinh" arity="1"/>
-      <name name="atan" arity="1"/>
-      <name name="atan2" arity="2"/>
-      <name name="atanh" arity="1"/>
-      <name name="ceil" arity="1"/>
-      <name name="cos" arity="1"/>
-      <name name="cosh" arity="1"/>
-      <name name="exp" arity="1"/>
-      <name name="floor" arity="1"/>
-      <name name="fmod" arity="2"/>
-      <name name="log" arity="1"/>
-      <name name="log10" arity="1"/>
-      <name name="log2" arity="1"/>
-      <name name="pow" arity="2"/>
-      <name name="sin" arity="1"/>
-      <name name="sinh" arity="1"/>
-      <name name="sqrt" arity="1"/>
-      <name name="tan" arity="1"/>
-      <name name="tanh" arity="1"/>
+      <name name="acos" arity="1" since=""/>
+      <name name="acosh" arity="1" since=""/>
+      <name name="asin" arity="1" since=""/>
+      <name name="asinh" arity="1" since=""/>
+      <name name="atan" arity="1" since=""/>
+      <name name="atan2" arity="2" since=""/>
+      <name name="atanh" arity="1" since=""/>
+      <name name="ceil" arity="1" since="OTP 20.0"/>
+      <name name="cos" arity="1" since=""/>
+      <name name="cosh" arity="1" since=""/>
+      <name name="exp" arity="1" since=""/>
+      <name name="floor" arity="1" since="OTP 20.0"/>
+      <name name="fmod" arity="2" since="OTP 20.0"/>
+      <name name="log" arity="1" since=""/>
+      <name name="log10" arity="1" since=""/>
+      <name name="log2" arity="1" since="OTP 18.0"/>
+      <name name="pow" arity="2" since=""/>
+      <name name="sin" arity="1" since=""/>
+      <name name="sinh" arity="1" since=""/>
+      <name name="sqrt" arity="1" since=""/>
+      <name name="tan" arity="1" since=""/>
+      <name name="tanh" arity="1" since=""/>
       <fsummary>Diverse math functions.</fsummary>
       <type variable="X" name_i="6"/>
       <type variable="Y" name_i="6"/>
@@ -82,7 +82,7 @@
     </func>
 
     <func>
-      <name name="erf" arity="1"/>
+      <name name="erf" arity="1" since=""/>
       <fsummary>Error function.</fsummary>
       <desc>
         <p>Returns the error function of <c><anno>X</anno></c>, where:</p>
@@ -92,7 +92,7 @@ erf(X) = 2/sqrt(pi)*integral from 0 to X of exp(-t*t) dt.</pre>
     </func>
 
     <func>
-      <name name="erfc" arity="1"/>
+      <name name="erfc" arity="1" since=""/>
       <fsummary>Another error function.</fsummary>
       <desc>
         <p><c>erfc(X)</c> returns <c>1.0</c> - <c>erf(X)</c>, computed by
@@ -101,7 +101,7 @@ erf(X) = 2/sqrt(pi)*integral from 0 to X of exp(-t*t) dt.</pre>
     </func>
 
     <func>
-      <name name="pi" arity="0"/>
+      <name name="pi" arity="0" since=""/>
       <fsummary>A useful number.</fsummary>
       <desc>
         <p>A useful number.</p>
diff --git a/lib/stdlib/doc/src/ms_transform.xml b/lib/stdlib/doc/src/ms_transform.xml
index 0a05fa37c5..65cc150507 100644
--- a/lib/stdlib/doc/src/ms_transform.xml
+++ b/lib/stdlib/doc/src/ms_transform.xml
@@ -32,7 +32,7 @@
     <rev>C</rev>
     <file>ms_transform.xml</file>
   </header>
-  <module>ms_transform</module>
+  <module since="">ms_transform</module>
   <modulesummary>A parse transformation that translates fun syntax into match
     specifications.</modulesummary>
   <description>
@@ -731,7 +731,7 @@ ets:select(Table, [{{'$1',test,'$2'},[],['$_']}]).</code>
 
   <funcs>
     <func>
-      <name name="format_error" arity="1"/>
+      <name name="format_error" arity="1" since=""/>
       <fsummary>Error formatting function as required by the parse transformation interface.</fsummary>
       <desc>
         <p>Takes an error code returned by one of the other functions
@@ -741,7 +741,7 @@ ets:select(Table, [{{'$1',test,'$2'},[],['$_']}]).</code>
     </func>
 
     <func>
-      <name name="parse_transform" arity="2"/>
+      <name name="parse_transform" arity="2" since=""/>
       <fsummary>Transforms Erlang abstract format containing calls to
         ets/dbg:fun2ms/1 into literal match specifications.</fsummary>
       <type_desc variable="Options">Option list, required but not used.
@@ -762,7 +762,7 @@ ets:select(Table, [{{'$1',test,'$2'},[],['$_']}]).</code>
     </func>
 
     <func>
-      <name name="transform_from_shell" arity="3"/>
+      <name name="transform_from_shell" arity="3" since=""/>
       <fsummary>Used when transforming funs created in the shell into
         match_specifications.</fsummary>
       <type_desc variable="BoundEnvironment">List of variable bindings in the
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index 7ba19a98ea..66624c43be 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -31,6 +31,414 @@
   </header>
   <p>This document describes the changes made to the STDLIB application.</p>
 
+<section><title>STDLIB 3.9.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fix a bug that could cause a loop when formatting
+	    terms using the control sequences <c>p</c> or <c>P</c>
+	    and limiting the output with the option
+	    <c>chars_limit</c>. </p>
+          <p>
+	    Own Id: OTP-15875 Aux Id: ERL-967 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>STDLIB 3.9.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fix a bug that could cause a failure when formatting
+	    binaries using the control sequences <c>p</c> or <c>P</c>
+	    and limiting the output with the option
+	    <c>chars_limit</c>. </p>
+          <p>
+	    Own Id: OTP-15847 Aux Id: ERL-957 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>STDLIB 3.9</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fix a bug in <c>string:lexemes/2</c>. </p> <p> The
+	    bug was found when optimizing the handling of deep lists
+	    of Unicode characters in the <c>string</c> module. </p>
+          <p>
+	    Own Id: OTP-15649</p>
+        </item>
+        <item>
+	    <p>A bug has been fixed in the <c>maps</c> implementation
+	    that could cause a crash or memory usage to grow until
+	    the machine ran out of memory. This could happen when
+	    inserting a new key-value pair with a key <c>K1</c>
+	    containing a binary <c>B1</c> into a map <c>M</c> having
+	    a key <c>K2</c> with a binary <c>B2</c> if the following
+	    conditions were met:</p> <list> <item><c>B1 =/=
+	    B2</c></item> <item><c>size(B1) >= 4294967296</c></item>
+	    <item><c>size(B2) >= 4294967296</c></item>
+	    <item><c>size(M) >= 32</c></item> <item><c>(size(B1) rem
+	    4294967296) == (size(B2) rem 4294967296)</c></item>
+	    <item>the first <c>(size(B1) rem 4294967296)</c> bytes
+	    are the same both in <c>B1</c> and <c>B2</c></item>
+	    <item>substituting <c>B1</c> in <c>K1</c> with <c>B2</c>
+	    would create a term with the same value as
+	    <c>K2</c></item> </list> <p>The root cause of the problem
+	    is that the <c>maps</c> implementation only hashed the
+	    first <c>(X rem 4294967296)</c> bytes of binaries so that
+	    different binaries could get the same hash value
+	    independently of the hash seed.</p>
+          <p>
+	    Own Id: OTP-15707</p>
+        </item>
+        <item>
+	    <p> Since the introduction of the stack trace variable,
+	    the Erlang Pretty Printer has left out the exception
+	    class <c>throw</c> even when the stack trace variable
+	    cannot be left out, which is not correct Erlang code. The
+	    fix is to always include the exception class
+	    <c>throw</c>. </p>
+          <p>
+	    Own Id: OTP-15751</p>
+        </item>
+        <item>
+	    <p><c>record_info/2</c> is a pseudo-function that
+	    requires literal arguments known at compile time.
+	    Therefore, the following usage is illegal: <c>fun
+	    record/info/2</c>. The compiler would crash when during
+	    compilation of that kind of code. Corrected to issue a
+	    compilation error.</p>
+          <p>
+	    Own Id: OTP-15760 Aux Id: ERL-907 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> A new <c>rand</c> module algorithm, <c>exro928ss</c>
+	    (Xoroshiro928**), has been implemented. It has got a
+	    really long period and good statistical quality for all
+	    output bits, while still being only about 50% slower than
+	    the default algorithm. </p><p> The same generator is also
+	    used as a long period counter in a new <c>crypto</c>
+	    plugin for the <c>rand</c> module, algorithm
+	    <c>crypto_aes</c>. This plugin uses AES-256 to scramble
+	    the counter which buries any detectable statistical
+	    artifacts. Scrambling is done in chunks which are cached
+	    to get good amortized speed (about half of the default
+	    algorithm). </p>
+          <p>
+	    Own Id: OTP-14461 Aux Id: PR-1857 </p>
+        </item>
+        <item>
+          <p>
+	    Types related to server naming and starting have been
+	    exported from <c>gen_statem</c>. These are:
+	    <c>server_name/0</c>, <c>server_ref/0</c>,
+	    <c>start_opt/0</c>, <c>start_ret/0</c> and
+	    <c>enter_loop_opt/0</c>.</p>
+          <p>
+	    Own Id: OTP-14724 Aux Id: PR-2056 </p>
+        </item>
+        <item>
+          <p>
+	    The default algorithm for the <c>rand</c> module has been
+	    changed to <c>exsss</c> (Xorshift116**) which is a
+	    combination of the Xorshift116 (<c>exsp</c>) state update
+	    and a new scrambler "StarStar" from the 2018 paper
+	    "Scrambled Linear Pseudorandom Number Generators" by
+	    David Blackman and Sebastiano Vigna. This combination
+	    should not have the caveat of weak low bits that the
+	    previous default algorithm(s) have had, with the cost of
+	    about 10% lower speed. See GitHub pull request #1969.</p>
+          <p>
+	    Own Id: OTP-14731 Aux Id: PR-1969 </p>
+        </item>
+        <item>
+          <p>
+	    The generic state machine behaviour <c>gen_statem</c> has
+	    gotten code cleanup and documentation improvements from
+	    GitHub Pull Request #1855, even though the PR itself was
+	    rejected.</p>
+          <p>
+	    Own Id: OTP-14737 Aux Id: PR-1855 </p>
+        </item>
+        <item>
+          <p>
+	    Update Unicode specification to version 11.0.</p>
+          <p>
+	    Own Id: OTP-15111</p>
+        </item>
+        <item>
+          <p>
+	    ETS option <c>write_concurrency</c> now also affects and
+	    improves the scalability of <c>ordered_set</c> tables.
+	    The implementation is based on a data structure called
+	    contention adapting search tree, where the lock
+	    granularity adapts to the actual amount of concurrency
+	    exploited by the applications in runtime.</p>
+          <p>
+	    Own Id: OTP-15128</p>
+        </item>
+        <item>
+          <p>
+	    Optimized <c>maps:new/0</c> with trivial Erlang
+	    implementation, making use of literal terms (the empty
+	    map) not needing dynamic heap allocation.</p>
+          <p>
+	    Own Id: OTP-15200 Aux Id: PR-1878 </p>
+        </item>
+        <item>
+	    <p>The <c>gen_*</c> behaviours have been changed so that
+	    if logging of the last N messages through
+	    <c>sys:log/2,3</c> is active for the server, this log is
+	    included in the terminate report.</p> <p>To accomplish
+	    this the format of "System Events" as defined in the man
+	    page for <c>sys</c> has been clarified and cleaned up, a
+	    new function <c>sys:get_log/1</c> has been added, and
+	    <c>sys:get_debug/3</c> has been deprecated. Due to these
+	    changes, code that relies on the internal badly
+	    documented format of "System Events", need to be
+	    corrected.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15381</p>
+        </item>
+        <item>
+          <p>
+	    The <c>gen_statem</c> behaviour engine loop has been
+	    optimized for better performance in particular when the
+	    callback module returns some actions, that is better
+	    performance for more realistic applications than the Echo
+	    Benchmark.</p>
+          <p>
+	    Own Id: OTP-15452</p>
+        </item>
+        <item>
+	    <p> Do not allow function specifications for functions
+	    residing in other modules. </p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15563 Aux Id: ERL-845, OTP-15562 </p>
+        </item>
+        <item>
+          <p>
+	    The <c>persistent_term</c> functions <c>put/2</c> and
+	    <c>erase/1</c> are now yielding.</p>
+          <p>
+	    Own Id: OTP-15615</p>
+        </item>
+        <item>
+	    <p>Previously, all ETS tables used centralized counter
+	    variables to keep track of the number of items stored and
+	    the amount of memory consumed. These counters can cause
+	    scalability problems (especially on big NUMA systems).
+	    This change adds an implementation of a decentralized
+	    counter and modifies the implementation of ETS so that
+	    ETS tables of type <c>ordered_set</c> with
+	    <c>write_concurrency</c> enabled use the decentralized
+	    counter. Experiments indicate that this change
+	    substantially improves the scalability of ETS
+	    <c>ordered_set</c> tables with <c>write_concurrency</c>
+	    enabled in scenarios with frequent <c>ets:insert/2</c>
+	    and <c>ets:delete/2</c> calls.</p>
+          <p>
+	    Own Id: OTP-15623 Aux Id: PR-2190 </p>
+        </item>
+        <item>
+	    <p> Use <c>ssh</c> instead of <c>rsh</c> as the default
+	    remote shell. </p>
+          <p>
+	    Own Id: OTP-15633 Aux Id: PR-1787 </p>
+        </item>
+        <item>
+	    <p>Added <c>beam_lib:strip/2</c> and friends, which
+	    accept a list of chunks that should be preserved when
+	    stripping.</p>
+          <p>
+	    Own Id: OTP-15680 Aux Id: PR-2114 </p>
+        </item>
+        <item>
+	    <p> Optimize printing of maps with <c>io_lib:write()</c>.
+	    Also optimize pretty printing of strings (<c>~s</c> and
+	    <c>~ts</c>) when limiting the output with the
+	    <c>chars_limit</c> option. </p>
+          <p>
+	    Own Id: OTP-15705</p>
+        </item>
+        <item>
+	    <p> There are new compiler options <c>nowarn_removed</c>
+	    and <c>{nowarn_removed,Items}</c> to suppress warnings
+	    for functions and modules that have been removed from
+	    OTP.</p>
+          <p>
+	    Own Id: OTP-15749 Aux Id: ERL-904 </p>
+        </item>
+        <item>
+	    <p> Let the Erlang Pretty Printer put atomic parts on the
+	    same line. </p>
+          <p>
+	    Own Id: OTP-15755</p>
+        </item>
+        <item>
+	    <p> Add option <c>quote_singleton_atom_types</c> to the
+	    Erlang Pretty Printer's functions. Setting the option to
+	    <c>true</c> adds quotes to all singleton atom types. </p>
+          <p>
+	    Own Id: OTP-15756</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>STDLIB 3.8.2.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fix a bug that could cause a loop when formatting
+	    terms using the control sequences <c>p</c> or <c>P</c>
+	    and limiting the output with the option
+	    <c>chars_limit</c>. </p>
+          <p>
+	    Own Id: OTP-15875 Aux Id: ERL-967 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>STDLIB 3.8.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fix a bug that could cause a failure when formatting
+	    binaries using the control sequences <c>p</c> or <c>P</c>
+	    and limiting the output with the option
+	    <c>chars_limit</c>. </p>
+          <p>
+	    Own Id: OTP-15847 Aux Id: ERL-957 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>STDLIB 3.8.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    A bug in gen_statem has been fixed where the internal
+	    timeout message could arrive as an info to the callback
+	    module during high load due to incorrect use of
+	    asynchronous timer cancel.</p>
+          <p>
+	    Own Id: OTP-15295</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>STDLIB 3.8.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixed a performance regression when reading files
+	    opened with the <c>compressed</c> flag.</p>
+          <p>
+	    Own Id: OTP-15706 Aux Id: ERIERL-336 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>STDLIB 3.8</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fix a bug in the Erlang Pretty Printer: long atom
+	    names in combination with <c>&lt;&lt;&gt;&gt;</c> could
+	    cause a crash. </p>
+          <p>
+	    Own Id: OTP-15592 Aux Id: ERL-818 </p>
+        </item>
+        <item>
+	    <p> Fix bugs that could cause wrong results or bad
+	    performance when formatting lists of characters using the
+	    control sequences <c>p</c> or <c>P</c> and limiting the
+	    output with the option <c>chars_limit</c>. </p>
+          <p>
+	    Own Id: OTP-15639</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Improved ETS documentation about safe table traversal and
+	    the partially bound key optimization for
+	    <c>ordered_set</c>.</p>
+          <p>
+	    Own Id: OTP-15545 Aux Id: PR-2103, PR-2139 </p>
+        </item>
+        <item>
+	    <p> Optimize <c>calendar:gregorian_days_to_date/1</c>.
+	    </p>
+          <p>
+	    Own Id: OTP-15572 Aux Id: PR-2121 </p>
+        </item>
+        <item>
+	    <p> Optimize functions
+	    <c>calendar:rfc3339_to_system_time()</c> and
+	    <c>calendar:system_time_to_rfc3339()</c>. </p>
+          <p>
+	    Own Id: OTP-15630</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>STDLIB 3.7.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Optimize pretty printing of terms. The slower
+	    behaviour was introduced in Erlang/OTP 20. </p>
+          <p>
+	    Own Id: OTP-15573 Aux Id: ERIERL-306 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>STDLIB 3.7</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -3803,7 +4211,7 @@
 	    you use erlang:halt/2 with an integer first argument and
 	    an option list containing {flush,false} as the second
 	    argument. Note that now is flushing not dependant of the
-	    exit code, and you can not only flush async threads
+	    exit code, and you cannot only flush async threads
 	    operations which we deemed as a strange behaviour anyway.
 	    </p>
 	    <p>Also, erlang:halt/1,2 has gotten a new feature: If the
@@ -4317,9 +4725,9 @@
 	    Supervisors should not save child-specs for temporary
 	    processes when they terminate as they should not be
 	    restarted. Saving the temporary child spec will result in
-	    that you can not start a new temporary process with the
+	    that you cannot start a new temporary process with the
 	    same child spec as an already terminated temporary
-	    process. Since R14B02 you can not restart a temporary
+	    process. Since R14B02 you cannot restart a temporary
 	    temporary process as arguments are no longer saved, it
 	    has however always been semantically incorrect to restart
 	    a temporary process. Thanks to Filipe David Manana for
diff --git a/lib/stdlib/doc/src/orddict.xml b/lib/stdlib/doc/src/orddict.xml
index 26bbf499c6..27ccccee7e 100644
--- a/lib/stdlib/doc/src/orddict.xml
+++ b/lib/stdlib/doc/src/orddict.xml
@@ -32,7 +32,7 @@
     <rev>B</rev>
     <file>orddict.xml</file>
   </header>
-  <module>orddict</module>
+  <module since="">orddict</module>
   <modulesummary>Key-value dictionary as ordered list.</modulesummary>
   <description>
     <p>This module provides a <c>Key</c>-<c>Value</c> dictionary.
@@ -61,7 +61,7 @@
 
   <funcs>
     <func>
-      <name name="append" arity="3"/>
+      <name name="append" arity="3" since=""/>
       <fsummary>Append a value to keys in a dictionary.</fsummary>
       <desc>
         <p>Appends a new <c><anno>Value</anno></c> to the current list
@@ -73,7 +73,7 @@
     </func>
 
     <func>
-      <name name="append_list" arity="3"/>
+      <name name="append_list" arity="3" since=""/>
       <fsummary>Append new values to keys in a dictionary.</fsummary>
       <desc>
         <p>Appends a list of values <c><anno>ValList</anno></c> to
@@ -85,7 +85,7 @@
     </func>
 
     <func>
-      <name name="erase" arity="2"/>
+      <name name="erase" arity="2" since=""/>
       <fsummary>Erase a key from a dictionary.</fsummary>
       <desc>
         <p>Erases all items with a specified key from a dictionary.</p>
@@ -93,7 +93,7 @@
     </func>
 
     <func>
-      <name name="fetch" arity="2"/>
+      <name name="fetch" arity="2" since=""/>
       <fsummary>Look up values in a dictionary.</fsummary>
       <desc>
         <p>Returns the value associated with <c><anno>Key</anno></c>
@@ -105,7 +105,7 @@
     </func>
 
     <func>
-      <name name="fetch_keys" arity="1"/>
+      <name name="fetch_keys" arity="1" since=""/>
       <fsummary>Return all keys in a dictionary.</fsummary>
       <desc>
         <p>Returns a list of all keys in a dictionary.</p>
@@ -113,7 +113,7 @@
     </func>
 
     <func>
-      <name name="take" arity="2"/>
+      <name name="take" arity="2" since="OTP 20.0"/>
       <fsummary>Return value and new dictionary without element with this value.</fsummary>
       <desc>
         <p>This function returns value from dictionary and new dictionary without this value.
@@ -122,7 +122,7 @@
     </func>
 
     <func>
-      <name name="filter" arity="2"/>
+      <name name="filter" arity="2" since=""/>
       <fsummary>Select elements that satisfy a predicate.</fsummary>
       <desc>
         <p><c><anno>Orddict2</anno></c> is a dictionary of all keys and values
@@ -133,7 +133,7 @@
     </func>
 
     <func>
-      <name name="find" arity="2"/>
+      <name name="find" arity="2" since=""/>
       <fsummary>Search for a key in a dictionary.</fsummary>
       <desc>
         <p>Searches for a key in a dictionary. Returns
@@ -145,7 +145,7 @@
     </func>
 
     <func>
-      <name name="fold" arity="3"/>
+      <name name="fold" arity="3" since=""/>
       <fsummary>Fold a function over a dictionary.</fsummary>
       <desc>
         <p>Calls <c><anno>Fun</anno></c> on successive keys and values of
@@ -157,7 +157,7 @@
     </func>
 
     <func>
-      <name name="from_list" arity="1"/>
+      <name name="from_list" arity="1" since=""/>
       <fsummary>Convert a list of pairs to a dictionary.</fsummary>
       <desc>
         <p>Converts the <c><anno>Key</anno></c>-<c><anno>Value</anno></c> list
@@ -166,7 +166,7 @@
     </func>
 
     <func>
-      <name name="is_empty" arity="1"/>
+      <name name="is_empty" arity="1" since="OTP 17.0"/>
       <fsummary>Return true if the dictionary is empty.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Orddict</anno></c> has no elements,
@@ -175,7 +175,7 @@
     </func>
 
     <func>
-      <name name="is_key" arity="2"/>
+      <name name="is_key" arity="2" since=""/>
       <fsummary>Test if a key is in a dictionary.</fsummary>
       <desc>
         <p>Tests if <c><anno>Key</anno></c> is contained in
@@ -184,7 +184,7 @@
     </func>
 
     <func>
-      <name name="map" arity="2"/>
+      <name name="map" arity="2" since=""/>
       <fsummary>Map a function over a dictionary.</fsummary>
       <desc>
         <p>Calls <c><anno>Fun</anno></c> on successive keys and values of
@@ -193,7 +193,7 @@
     </func>
 
     <func>
-      <name name="merge" arity="3"/>
+      <name name="merge" arity="3" since=""/>
       <fsummary>Merge two dictionaries.</fsummary>
       <desc>
         <p>Merges two dictionaries, <c><anno>Orddict1</anno></c> and
@@ -212,7 +212,7 @@ merge(Fun, D1, D2) ->
     </func>
 
     <func>
-      <name name="new" arity="0"/>
+      <name name="new" arity="0" since=""/>
       <fsummary>Create a dictionary.</fsummary>
       <desc>
         <p>Creates a new dictionary.</p>
@@ -220,7 +220,7 @@ merge(Fun, D1, D2) ->
     </func>
 
     <func>
-      <name name="size" arity="1"/>
+      <name name="size" arity="1" since=""/>
       <fsummary>Return the number of elements in an ordered dictionary.
       </fsummary>
       <desc>
@@ -229,7 +229,7 @@ merge(Fun, D1, D2) ->
     </func>
 
     <func>
-      <name name="store" arity="3"/>
+      <name name="store" arity="3" since=""/>
       <fsummary>Store a value in a dictionary.</fsummary>
       <desc>
         <p>Stores a <c><anno>Key</anno></c>-<c><anno>Value</anno></c> pair in a
@@ -240,7 +240,7 @@ merge(Fun, D1, D2) ->
     </func>
 
     <func>
-      <name name="to_list" arity="1"/>
+      <name name="to_list" arity="1" since=""/>
       <fsummary>Convert a dictionary to a list of pairs.</fsummary>
       <desc>
         <p>Converts a dictionary to a list representation.</p>
@@ -248,7 +248,7 @@ merge(Fun, D1, D2) ->
     </func>
 
     <func>
-      <name name="update" arity="3"/>
+      <name name="update" arity="3" since=""/>
       <fsummary>Update a value in a dictionary.</fsummary>
       <desc>
         <p>Updates a value in a dictionary by calling <c><anno>Fun</anno></c>
@@ -258,7 +258,7 @@ merge(Fun, D1, D2) ->
     </func>
 
     <func>
-      <name name="update" arity="4"/>
+      <name name="update" arity="4" since=""/>
       <fsummary>Update a value in a dictionary.</fsummary>
       <desc>
         <p>Updates a value in a dictionary by calling <c><anno>Fun</anno></c>
@@ -273,7 +273,7 @@ append(Key, Val, D) ->
     </func>
 
     <func>
-      <name name="update_counter" arity="3"/>
+      <name name="update_counter" arity="3" since=""/>
       <fsummary>Increment a value in a dictionary.</fsummary>
       <desc>
         <p>Adds <c><anno>Increment</anno></c> to the value associated with
diff --git a/lib/stdlib/doc/src/ordsets.xml b/lib/stdlib/doc/src/ordsets.xml
index 11f98c8fb7..fbe334c009 100644
--- a/lib/stdlib/doc/src/ordsets.xml
+++ b/lib/stdlib/doc/src/ordsets.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>ordsets.xml</file>
   </header>
-  <module>ordsets</module>
+  <module since="">ordsets</module>
   <modulesummary>Functions for manipulating sets as ordered lists.
   </modulesummary>
   <description>
@@ -60,7 +60,7 @@
 
   <funcs>
     <func>
-      <name name="add_element" arity="2"/>
+      <name name="add_element" arity="2" since=""/>
       <fsummary>Add an element to an <c>Ordset</c>.</fsummary>
       <desc>
         <p>Returns a new ordered set formed from <c><anno>Ordset1</anno></c>
@@ -69,7 +69,7 @@
     </func>
 
     <func>
-      <name name="del_element" arity="2"/>
+      <name name="del_element" arity="2" since=""/>
       <fsummary>Remove an element from an <c>Ordset</c>.</fsummary>
       <desc>
         <p>Returns <c><anno>Ordset1</anno></c>, but with
@@ -78,7 +78,7 @@
     </func>
 
     <func>
-      <name name="filter" arity="2"/>
+      <name name="filter" arity="2" since=""/>
       <fsummary>Filter set elements.</fsummary>
       <desc>
         <p>Filters elements in <c><anno>Ordset1</anno></c> with boolean function
@@ -87,7 +87,7 @@
     </func>
 
     <func>
-      <name name="fold" arity="3"/>
+      <name name="fold" arity="3" since=""/>
       <fsummary>Fold over set elements.</fsummary>
       <desc>
         <p>Folds <c><anno>Function</anno></c> over every element in
@@ -97,7 +97,7 @@
     </func>
 
     <func>
-      <name name="from_list" arity="1"/>
+      <name name="from_list" arity="1" since=""/>
       <fsummary>Convert a list into an <c>Ordset</c>.</fsummary>
       <desc>
         <p>Returns an ordered set of the elements in <c><anno>List</anno></c>.
@@ -106,7 +106,7 @@
     </func>
 
     <func>
-      <name name="intersection" arity="1"/>
+      <name name="intersection" arity="1" since=""/>
       <fsummary>Return the intersection of a list of <c>Ordsets</c></fsummary>
       <desc>
         <p>Returns the intersection of the non-empty list of sets.</p>
@@ -114,7 +114,7 @@
     </func>
 
     <func>
-      <name name="intersection" arity="2"/>
+      <name name="intersection" arity="2" since=""/>
       <fsummary>Return the intersection of two <c>Ordsets</c>.</fsummary>
       <desc>
         <p>Returns the intersection of <c><anno>Ordset1</anno></c> and
@@ -123,7 +123,7 @@
     </func>
 
     <func>
-      <name name="is_disjoint" arity="2"/>
+      <name name="is_disjoint" arity="2" since=""/>
       <fsummary>Check whether two <c>Ordsets</c> are disjoint.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Ordset1</anno></c> and
@@ -133,7 +133,7 @@
     </func>
 
     <func>
-      <name name="is_element" arity="2"/>
+      <name name="is_element" arity="2" since=""/>
       <fsummary>Test for membership of an <c>Ordset</c>.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Element</anno></c> is an element of
@@ -142,7 +142,7 @@
     </func>
 
     <func>
-      <name name="is_empty" arity="1"/>
+      <name name="is_empty" arity="1" since="OTP 21.0"/>
       <fsummary>Test for empty set.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Ordset</anno></c> is an empty set,
@@ -151,7 +151,7 @@
     </func>
 
     <func>
-      <name name="is_set" arity="1"/>
+      <name name="is_set" arity="1" since=""/>
       <fsummary>Test for an <c>Ordset</c>.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Ordset</anno></c> is an ordered set
@@ -160,7 +160,7 @@
     </func>
 
     <func>
-      <name name="is_subset" arity="2"/>
+      <name name="is_subset" arity="2" since=""/>
       <fsummary>Test for subset.</fsummary>
       <desc>
         <p>Returns <c>true</c> when every element of <c><anno>Ordset1</anno></c>
@@ -170,7 +170,7 @@
     </func>
 
     <func>
-      <name name="new" arity="0"/>
+      <name name="new" arity="0" since=""/>
       <fsummary>Return an empty set.</fsummary>
       <desc>
         <p>Returns a new empty ordered set.</p>
@@ -178,7 +178,7 @@
     </func>
 
     <func>
-      <name name="size" arity="1"/>
+      <name name="size" arity="1" since=""/>
       <fsummary>Return the number of elements in a set.</fsummary>
       <desc>
         <p>Returns the number of elements in <c><anno>Ordset</anno></c>.</p>
@@ -186,7 +186,7 @@
     </func>
 
     <func>
-      <name name="subtract" arity="2"/>
+      <name name="subtract" arity="2" since=""/>
       <fsummary>Return the difference of two <c>Ordsets</c>.</fsummary>
       <desc>
         <p>Returns only the elements of <c><anno>Ordset1</anno></c> that are not
@@ -195,7 +195,7 @@
     </func>
 
     <func>
-      <name name="to_list" arity="1"/>
+      <name name="to_list" arity="1" since=""/>
       <fsummary>Convert an <c>Ordset</c> into a list.</fsummary>
       <desc>
         <p>Returns the elements of <c><anno>Ordset</anno></c> as a list.</p>
@@ -203,7 +203,7 @@
     </func>
 
     <func>
-      <name name="union" arity="1"/>
+      <name name="union" arity="1" since=""/>
       <fsummary>Return the union of a list of <c>Ordsets</c>.</fsummary>
       <desc>
         <p>Returns the merged (union) set of the list of sets.</p>
@@ -211,7 +211,7 @@
     </func>
 
     <func>
-      <name name="union" arity="2"/>
+      <name name="union" arity="2" since=""/>
       <fsummary>Return the union of two <c>Ordsets</c>.</fsummary>
       <desc>
         <p>Returns the merged (union) set of <c><anno>Ordset1</anno></c> and
diff --git a/lib/stdlib/doc/src/pool.xml b/lib/stdlib/doc/src/pool.xml
index 05d12ade28..675ee08bfb 100644
--- a/lib/stdlib/doc/src/pool.xml
+++ b/lib/stdlib/doc/src/pool.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>pool</module>
+  <module since="">pool</module>
   <modulesummary>Load distribution facility.</modulesummary>
   <description>
     <p>This module can be used to run a set of Erlang nodes as a pool
@@ -54,7 +54,7 @@
 
   <funcs>
     <func>
-      <name name="attach" arity="1"/>
+      <name name="attach" arity="1" since=""/>
       <fsummary>Ensure that a pool master is running.</fsummary>
       <desc>
         <p>Ensures that a pool master is running and includes
@@ -63,7 +63,7 @@
     </func>
 
     <func>
-      <name name="get_node" arity="0"/>
+      <name name="get_node" arity="0" since=""/>
       <fsummary>Return the node with the expected lowest future load.</fsummary>
       <desc>
         <p>Returns the node with the expected lowest future load.</p>
@@ -71,7 +71,7 @@
     </func>
 
     <func>
-      <name name="get_nodes" arity="0"/>
+      <name name="get_nodes" arity="0" since=""/>
       <fsummary>Return a list of the current member nodes of the pool.
       </fsummary>
       <desc>
@@ -80,7 +80,7 @@
     </func>
 
     <func>
-      <name name="pspawn" arity="3"/>
+      <name name="pspawn" arity="3" since=""/>
       <fsummary>Spawn a process on the pool node with expected lowest future
         load.</fsummary>
       <desc>
@@ -90,7 +90,7 @@
     </func>
 
     <func>
-      <name name="pspawn_link" arity="3"/>
+      <name name="pspawn_link" arity="3" since=""/>
       <fsummary>Spawn and link to a process on the pool node with expected
         lowest future load.</fsummary>
       <desc>
@@ -100,8 +100,8 @@
     </func>
 
     <func>
-      <name name="start" arity="1"/>
-      <name name="start" arity="2"/>
+      <name name="start" arity="1" since=""/>
+      <name name="start" arity="2" since=""/>
       <fsummary>>Start a new pool.</fsummary>
       <desc>
         <p>Starts a new pool. The file <c>.hosts.erlang</c> is read to
@@ -122,7 +122,7 @@
     </func>
 
     <func>
-      <name name="stop" arity="0"/>
+      <name name="stop" arity="0" since=""/>
       <fsummary>Stop the pool and kill all the slave nodes.</fsummary>
       <desc>
         <p>Stops the pool and kills all the slave nodes.</p>
diff --git a/lib/stdlib/doc/src/proc_lib.xml b/lib/stdlib/doc/src/proc_lib.xml
index b85fab67d5..bb983903a9 100644
--- a/lib/stdlib/doc/src/proc_lib.xml
+++ b/lib/stdlib/doc/src/proc_lib.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>proc_lib</module>
+  <module since="">proc_lib</module>
   <modulesummary>Functions for asynchronous and synchronous start of processes
     adhering to the OTP design principles.</modulesummary>
   <description>
@@ -102,7 +102,7 @@
 
   <funcs>
     <func>
-      <name name="format" arity="1"/>
+      <name name="format" arity="1" since=""/>
       <fsummary>Format a crash report.</fsummary>
       <desc>
         <p>Equivalent to <seealso marker="#format/2">
@@ -111,7 +111,7 @@
     </func>
 
     <func>
-      <name name="format" arity="2"/>
+      <name name="format" arity="2" since="OTP R16B"/>
       <fsummary>Format a crash report.</fsummary>
       <desc>
 	<note>
@@ -138,7 +138,7 @@
     </func>
 
     <func>
-      <name name="format" arity="3"/>
+      <name name="format" arity="3" since="OTP 18.1"/>
       <fsummary>Format a crash report.</fsummary>
       <desc>
 	<note>
@@ -162,11 +162,11 @@
     </func>
 
     <func>
-      <name name="hibernate" arity="3"/>
+      <name name="hibernate" arity="3" since=""/>
       <fsummary>Hibernate a process until a message is sent to it.</fsummary>
       <desc>
         <p>This function does the same as (and does call) the
-          <seealso marker="erts:erlang#erlang:hibernate/3">
+          <seealso marker="erts:erlang#hibernate/3">
           <c>hibernate/3</c></seealso> BIF,
           but ensures that exception handling and logging continues to
           work as expected when the process wakes up.</p>
@@ -176,8 +176,8 @@
     </func>
 
     <func>
-      <name name="init_ack" arity="1"/>
-      <name name="init_ack" arity="2"/>
+      <name name="init_ack" arity="1" since=""/>
+      <name name="init_ack" arity="2" since=""/>
       <fsummary>Used by a process when it has started.</fsummary>
       <desc>
         <p>This function must be used by a process that has been started by
@@ -214,7 +214,7 @@ init(Parent) ->
     </func>
 
     <func>
-      <name name="initial_call" arity="1"/>
+      <name name="initial_call" arity="1" since=""/>
       <fsummary>Extract the initial call of a <c>proc_lib</c>spawned process.
       </fsummary>
       <desc>
@@ -244,10 +244,10 @@ init(Parent) ->
     </func>
 
     <func>
-      <name name="spawn" arity="1"/>
-      <name name="spawn" arity="2"/>
-      <name name="spawn" arity="3"/>
-      <name name="spawn" arity="4"/>
+      <name name="spawn" arity="1" since=""/>
+      <name name="spawn" arity="2" since=""/>
+      <name name="spawn" arity="3" since=""/>
+      <name name="spawn" arity="4" since=""/>
       <fsummary>Spawn a new process.</fsummary>
       <type variable="Node"/>
       <type variable="Fun" name_i="1"/>
@@ -262,10 +262,10 @@ init(Parent) ->
     </func>
 
     <func>
-      <name name="spawn_link" arity="1"/>
-      <name name="spawn_link" arity="2"/>
-      <name name="spawn_link" arity="3"/>
-      <name name="spawn_link" arity="4"/>
+      <name name="spawn_link" arity="1" since=""/>
+      <name name="spawn_link" arity="2" since=""/>
+      <name name="spawn_link" arity="3" since=""/>
+      <name name="spawn_link" arity="4" since=""/>
       <fsummary>Spawn and link to a new process.</fsummary>
       <type variable="Node"/>
       <type variable="Fun" name_i="1"/>
@@ -281,10 +281,10 @@ init(Parent) ->
     </func>
 
     <func>
-      <name name="spawn_opt" arity="2"/>
-      <name name="spawn_opt" arity="3"/>
-      <name name="spawn_opt" arity="4"/>
-      <name name="spawn_opt" arity="5"/>
+      <name name="spawn_opt" arity="2" since=""/>
+      <name name="spawn_opt" arity="3" since=""/>
+      <name name="spawn_opt" arity="4" since=""/>
+      <name name="spawn_opt" arity="5" since=""/>
       <fsummary>Spawn a new process with specified options.</fsummary>
       <type variable="Node"/>
       <type variable="Fun" name_i="1"/>
@@ -306,12 +306,12 @@ init(Parent) ->
     </func>
 
     <func>
-      <name name="start" arity="3"/>
-      <name name="start" arity="4"/>
-      <name name="start" arity="5"/>
-      <name name="start_link" arity="3"/>
-      <name name="start_link" arity="4"/>
-      <name name="start_link" arity="5"/>
+      <name name="start" arity="3" since=""/>
+      <name name="start" arity="4" since=""/>
+      <name name="start" arity="5" since=""/>
+      <name name="start_link" arity="3" since=""/>
+      <name name="start_link" arity="4" since=""/>
+      <name name="start_link" arity="5" since=""/>
       <fsummary>Start a new process synchronously.</fsummary>
       <desc>
         <p>Starts a new process synchronously. Spawns the process and
@@ -341,7 +341,7 @@ init(Parent) ->
     </func>
 
     <func>
-      <name name="stop" arity="1"/>
+      <name name="stop" arity="1" since="OTP 18.0"/>
       <fsummary>Terminate a process synchronously.</fsummary>
       <type variable="Process"/>
       <desc>
@@ -351,7 +351,7 @@ init(Parent) ->
     </func>
 
     <func>
-      <name name="stop" arity="3"/>
+      <name name="stop" arity="3" since="OTP 18.0"/>
       <fsummary>Terminate a process synchronously.</fsummary>
       <type variable="Process"/>
       <type variable="Reason"/>
@@ -375,7 +375,7 @@ init(Parent) ->
     </func>
 
     <func>
-      <name name="translate_initial_call" arity="1"/>
+      <name name="translate_initial_call" arity="1" since=""/>
       <fsummary>Extract and translate the initial call of a
         <c>proc_lib</c>spawned process.</fsummary>
       <desc>
diff --git a/lib/stdlib/doc/src/proplists.xml b/lib/stdlib/doc/src/proplists.xml
index f9a54bf804..4465103469 100644
--- a/lib/stdlib/doc/src/proplists.xml
+++ b/lib/stdlib/doc/src/proplists.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>proplists.xml</file>
   </header>
-  <module>proplists</module>
+  <module since="">proplists</module>
   <modulesummary>Support functions for property lists.</modulesummary>
   <description>
     <p>Property lists are ordinary lists containing entries in the form
@@ -57,11 +57,16 @@
     <datatype>
       <name name="property"/>
     </datatype>
+
+    <datatype>
+      <name name="proplist"/>
+    </datatype>
+
   </datatypes>
 
   <funcs>
     <func>
-      <name name="append_values" arity="2"/>
+      <name name="append_values" arity="2" since=""/>
       <fsummary></fsummary>
       <desc>
         <p>Similar to
@@ -79,7 +84,7 @@ append_values(a, [{a, [1,2]}, {b, 0}, {a, 3}, {c, -1}, {a, [4]}])</code>
     </func>
 
     <func>
-      <name name="compact" arity="1"/>
+      <name name="compact" arity="1" since=""/>
       <fsummary></fsummary>
       <desc>
         <p>Minimizes the representation of all entries in the list. This is
@@ -91,7 +96,7 @@ append_values(a, [{a, [1,2]}, {b, 0}, {a, 3}, {c, -1}, {a, [4]}])</code>
     </func>
 
     <func>
-      <name name="delete" arity="2"/>
+      <name name="delete" arity="2" since=""/>
       <fsummary></fsummary>
       <desc>
         <p>Deletes all entries associated with <c><anno>Key</anno></c> from
@@ -100,7 +105,7 @@ append_values(a, [{a, [1,2]}, {b, 0}, {a, 3}, {c, -1}, {a, [4]}])</code>
     </func>
 
     <func>
-      <name name="expand" arity="2"/>
+      <name name="expand" arity="2" since=""/>
       <fsummary></fsummary>
       <desc>
         <p>Expands particular properties to corresponding sets of
@@ -133,7 +138,7 @@ expand([{{foo, true}, [bar, baz]}], [{foo, false}, fie, foo, fum])</code>
     </func>
 
     <func>
-      <name name="get_all_values" arity="2"/>
+      <name name="get_all_values" arity="2" since=""/>
       <fsummary></fsummary>
       <desc>
         <p>Similar to 
@@ -145,7 +150,7 @@ expand([{{foo, true}, [bar, baz]}], [{foo, false}, fie, foo, fum])</code>
     </func>
 
     <func>
-      <name name="get_bool" arity="2"/>
+      <name name="get_bool" arity="2" since=""/>
       <fsummary></fsummary>
       <desc>
         <p>Returns the value of a boolean key/value option. If
@@ -159,7 +164,7 @@ expand([{{foo, true}, [bar, baz]}], [{foo, false}, fie, foo, fum])</code>
     </func>
 
     <func>
-      <name name="get_keys" arity="1"/>
+      <name name="get_keys" arity="1" since=""/>
       <fsummary></fsummary>
       <desc>
         <p>Returns an unordered list of the keys used in
@@ -168,7 +173,7 @@ expand([{{foo, true}, [bar, baz]}], [{foo, false}, fie, foo, fum])</code>
     </func>
 
     <func>
-      <name name="get_value" arity="2"/>
+      <name name="get_value" arity="2" since=""/>
       <fsummary></fsummary>
       <desc>
         <p>Equivalent to
@@ -177,7 +182,7 @@ expand([{{foo, true}, [bar, baz]}], [{foo, false}, fie, foo, fum])</code>
     </func>
 
     <func>
-      <name name="get_value" arity="3"/>
+      <name name="get_value" arity="3" since=""/>
       <fsummary></fsummary>
       <desc>
         <p>Returns the value of a simple key/value property in
@@ -194,7 +199,7 @@ expand([{{foo, true}, [bar, baz]}], [{foo, false}, fie, foo, fum])</code>
     </func>
 
     <func>
-      <name name="is_defined" arity="2"/>
+      <name name="is_defined" arity="2" since=""/>
       <fsummary></fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>List</anno></c> contains at least
@@ -204,7 +209,7 @@ expand([{{foo, true}, [bar, baz]}], [{foo, false}, fie, foo, fum])</code>
     </func>
 
     <func>
-      <name name="lookup" arity="2"/>
+      <name name="lookup" arity="2" since=""/>
       <fsummary></fsummary>
       <desc>
         <p>Returns the first entry associated with <c><anno>Key</anno></c> in
@@ -219,7 +224,7 @@ expand([{{foo, true}, [bar, baz]}], [{foo, false}, fie, foo, fum])</code>
     </func>
 
     <func>
-      <name name="lookup_all" arity="2"/>
+      <name name="lookup_all" arity="2" since=""/>
       <fsummary></fsummary>
       <desc>
         <p>Returns the list of all entries associated with
@@ -231,7 +236,7 @@ expand([{{foo, true}, [bar, baz]}], [{foo, false}, fie, foo, fum])</code>
     </func>
 
     <func>
-      <name name="normalize" arity="2"/>
+      <name name="normalize" arity="2" since=""/>
       <fsummary></fsummary>
       <desc>
         <p>Passes <c><anno>ListIn</anno></c> through a sequence of
@@ -263,7 +268,7 @@ expand([{{foo, true}, [bar, baz]}], [{foo, false}, fie, foo, fum])</code>
     </func>
 
     <func>
-      <name name="property" arity="1"/>
+      <name name="property" arity="1" since=""/>
       <fsummary></fsummary>
       <desc>
         <p>Creates a normal form (minimal) representation of a property. If
@@ -276,7 +281,7 @@ expand([{{foo, true}, [bar, baz]}], [{foo, false}, fie, foo, fum])</code>
     </func>
 
     <func>
-      <name name="property" arity="2"/>
+      <name name="property" arity="2" since=""/>
       <fsummary></fsummary>
       <desc>
         <p>Creates a normal form (minimal) representation of a simple key/value
@@ -289,7 +294,7 @@ expand([{{foo, true}, [bar, baz]}], [{foo, false}, fie, foo, fum])</code>
     </func>
 
     <func>
-      <name name="split" arity="2"/>
+      <name name="split" arity="2" since=""/>
       <fsummary></fsummary>
       <desc>
         <p>Partitions <c><anno>List</anno></c> into a list of sublists and a
@@ -310,7 +315,7 @@ split([{c, 2}, {e, 1}, a, {c, 3, 4}, d, {b, 5}, b], [a, b, c])</code>
     </func>
 
     <func>
-      <name name="substitute_aliases" arity="2"/>
+      <name name="substitute_aliases" arity="2" since=""/>
       <fsummary></fsummary>
       <desc>
         <p>Substitutes keys of properties. For each entry in
@@ -332,7 +337,7 @@ split([{c, 2}, {e, 1}, a, {c, 3, 4}, d, {b, 5}, b], [a, b, c])</code>
     </func>
 
     <func>
-      <name name="substitute_negations" arity="2"/>
+      <name name="substitute_negations" arity="2" since=""/>
       <fsummary></fsummary>
       <desc>
         <p>Substitutes keys of boolean-valued properties and
@@ -360,7 +365,7 @@ split([{c, 2}, {e, 1}, a, {c, 3, 4}, d, {b, 5}, b], [a, b, c])</code>
     </func>
 
     <func>
-      <name name="unfold" arity="1"/>
+      <name name="unfold" arity="1" since=""/>
       <fsummary></fsummary>
       <desc>
         <p>Unfolds all occurrences of atoms in <c><anno>ListIn</anno></c> to
diff --git a/lib/stdlib/doc/src/qlc.xml b/lib/stdlib/doc/src/qlc.xml
index fe14a6334c..34f7c5bab9 100644
--- a/lib/stdlib/doc/src/qlc.xml
+++ b/lib/stdlib/doc/src/qlc.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2016</year>
+      <year>2004</year><year>2019</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,7 +32,7 @@
     <rev>PA1</rev>
     <file>qlc.xml</file>
   </header>
-  <module>qlc</module>
+  <module since="">qlc</module>
   <modulesummary>Query interface to Mnesia, ETS, Dets, and so on.
   </modulesummary>
   <description>
@@ -581,11 +581,13 @@ gb_iter(I0, N, EFun) ->
 <input>{K} &lt;- ets:table(E1),</input>
 <input>K == 2.71 orelse K == a]),</input>
 <input>io:format("~s~n", [qlc:info(Q1)]).</input>
-ets:match_spec_run(lists:flatmap(fun(V) ->
-                                        ets:lookup(20493, V)
-                                 end,
-                                 [a,2.71]),
-                   ets:match_spec_compile([{{'$1'},[],['$1']}]))</pre>
+ets:match_spec_run(
+       lists:flatmap(fun(V) ->
+			    ets:lookup(#Ref&lt;0.3098908599.2283929601.256025>,
+				       V)
+		     end,
+		     [a, 2.71]),
+       ets:match_spec_compile([{{'$1'}, [], ['$1']}]))</pre>
 
     <p>In the example, operator <c>==/2</c> has been handled
       exactly as <c>=:=/2</c> would have been handled. However,
@@ -607,9 +609,10 @@ ets:match_spec_run(lists:flatmap(fun(V) ->
 <input>end,</input>
 <input>Q2 = F2({2,2}),</input>
 <input>io:format("~s~n", [qlc:info(Q2)]).</input>
-ets:table(53264,
+ets:table(#Ref&lt;0.3098908599.2283929601.256125>,
           [{traverse,
-            {select,[{{'$1','$2'},[{'==','$1',{const,{2,2}}}],['$2']}]}}])
+            {select,
+             [{{'$1', '$2'}, [{'==', '$1', {const, {2, 2}}}], ['$2']}]}}])
 3> <input>lists:sort(qlc:e(Q2)).</input>
 [a,b,c]</pre>
 
@@ -629,8 +632,9 @@ ets:table(53264,
 <input>end,</input>
 <input>Q3 = F3({2,2}),</input>
 <input>io:format("~s~n", [qlc:info(Q3)]).</input>
-ets:match_spec_run(ets:lookup(86033, {2,2}),
-                   ets:match_spec_compile([{{'$1','$2'},[],['$2']}]))
+ets:match_spec_run(ets:lookup(#Ref&lt;0.3098908599.2283929601.256211>,
+                              {2, 2}),
+                   ets:match_spec_compile([{{'$1', '$2'}, [], ['$2']}]))
 5> <input>qlc:e(Q3).</input>
 [b]</pre>
 
@@ -720,7 +724,7 @@ ets:match_spec_run(ets:lookup(86033, {2,2}),
 
   <funcs>
     <func>
-      <name name="append" arity="1"/>
+      <name name="append" arity="1" since=""/>
       <fsummary>Return a query handle.</fsummary>
       <desc>
         <p>Returns a query handle. When evaluating query handle
@@ -731,7 +735,7 @@ ets:match_spec_run(ets:lookup(86033, {2,2}),
     </func>
 
     <func>
-      <name name="append" arity="2"/>
+      <name name="append" arity="2" since=""/>
       <fsummary>Return a query handle.</fsummary>
       <desc>
         <p>Returns a query handle. When evaluating query handle
@@ -744,8 +748,8 @@ ets:match_spec_run(ets:lookup(86033, {2,2}),
     </func>
 
     <func>
-      <name name="cursor" arity="1"/>
-      <name name="cursor" arity="2"/>
+      <name name="cursor" arity="1" since=""/>
+      <name name="cursor" arity="2" since=""/>
       <fsummary>Create a query cursor.</fsummary>
       <desc>
         <p>Creates a query cursor and
@@ -777,7 +781,7 @@ ok</pre>
     </func>
 
     <func>
-      <name name="delete_cursor" arity="1"/>
+      <name name="delete_cursor" arity="1" since=""/>
       <fsummary>Delete a query cursor.</fsummary>
       <desc>
         <p>Deletes a query cursor. Only the owner of the cursor can
@@ -786,10 +790,10 @@ ok</pre>
     </func>
 
     <func>
-      <name name="e" arity="1"/>
-      <name name="e" arity="2"/>
-      <name name="eval" arity="1"/>
-      <name name="eval" arity="2"/>
+      <name name="e" arity="1" since=""/>
+      <name name="e" arity="2" since=""/>
+      <name name="eval" arity="1" since=""/>
+      <name name="eval" arity="2" since=""/>
       <fsummary>Return all answers to a query.</fsummary>
       <desc>
         <p>Evaluates a query handle in the
@@ -805,8 +809,8 @@ ok</pre>
     </func>
 
     <func>
-      <name name="fold" arity="3"/>
-      <name name="fold" arity="4"/>
+      <name name="fold" arity="3" since=""/>
+      <name name="fold" arity="4" since=""/>
       <fsummary>Fold a function over the answers to a query.</fsummary>
       <desc>
         <p>Calls <c><anno>Function</anno></c> on successive answers to
@@ -830,7 +834,7 @@ ok</pre>
     </func>
 
     <func>
-      <name name="format_error" arity="1"/>
+      <name name="format_error" arity="1" since=""/>
       <fsummary>Return an English description of a an error tuple.</fsummary>
       <desc>
         <p>Returns a descriptive string in English of an error tuple
@@ -841,8 +845,8 @@ ok</pre>
     </func>
 
     <func>
-      <name name="info" arity="1"/>
-      <name name="info" arity="2"/>
+      <name name="info" arity="1" since=""/>
+      <name name="info" arity="2" since=""/>
       <fsummary>Return code describing a query handle.</fsummary>
       <desc>
         <p>Returns information about a
@@ -892,21 +896,21 @@ begin
     V1 =
         qlc:q([
                SQV ||
-                   SQV &lt;- [x,y]
+                   SQV &lt;- [x, y]
               ],
-              [{unique,true}]),
+              [{unique, true}]),
     V2 =
         qlc:q([
                SQV ||
-                   SQV &lt;- [a,b]
+                   SQV &lt;- [a, b]
               ],
-              [{unique,true}]),
+              [{unique, true}]),
     qlc:q([
            {X,Y} ||
                X &lt;- V1,
                Y &lt;- V2
           ],
-          [{unique,true}])
+          [{unique, true}])
 end</pre>
         <p>In the following example QLC <c>V2</c> has
           been inserted to show the joined generators and the join
@@ -927,27 +931,29 @@ begin
     V1 =
         qlc:q([
                P0 ||
-                   P0 = {W,Y} &lt;- ets:table(17)
+                   P0 = {W, Y} &lt;-
+                       ets:table(#Ref&lt;0.3098908599.2283929601.256549>)
               ]),
     V2 =
         qlc:q([
-               [G1|G2] ||
+               [G1 | G2] ||
                    G2 &lt;- V1,
-                   G1 &lt;- ets:table(16),
+                   G1 &lt;-
+                       ets:table(#Ref&lt;0.3098908599.2283929601.256548>),
                    element(2, G1) =:= element(1, G2)
               ],
-              [{join,lookup}]),
+              [{join, lookup}]),
     qlc:q([
-           {X,Z,W} ||
-               [{X,Z}|{W,Y}] &lt;- V2
+           {X, Z, W} ||
+               [{X, Z} | {W, Y}] &lt;- V2
           ])
 end</pre>
       </desc>
     </func>
 
     <func>
-      <name name="keysort" arity="2"/>
-      <name name="keysort" arity="3"/>
+      <name name="keysort" arity="2" since=""/>
+      <name name="keysort" arity="3" since=""/>
       <fsummary>Return a query handle.</fsummary>
       <desc>
         <p>Returns a query handle. When evaluating query handle
@@ -967,8 +973,8 @@ end</pre>
     </func>
 
     <func>
-      <name name="next_answers" arity="1"/>
-      <name name="next_answers" arity="2"/>
+      <name name="next_answers" arity="1" since=""/>
+      <name name="next_answers" arity="2" since=""/>
       <fsummary>Return some or all answers to a query.</fsummary>
       <desc>
         <p>Returns some or all of the remaining answers to a query
@@ -983,8 +989,8 @@ end</pre>
     </func>
 
     <func>
-      <name name="q" arity="1"/>
-      <name name="q" arity="2"/>
+      <name name="q" arity="1" since=""/>
+      <name name="q" arity="2" since=""/>
       <fsummary>Return a handle for a query list comprehension.</fsummary>
       <desc>
         <p>Returns a query handle for a QLC.
@@ -1080,27 +1086,27 @@ begin
     V1 =
         qlc:q([
                P0 ||
-                   P0 = {X,Z} &lt;-
-                       qlc:keysort(1, [{a,1},{b,4},{c,6}], [])
+                   P0 = {X, Z} &lt;-
+                       qlc:keysort(1, [{a, 1}, {b, 4}, {c, 6}], [])
               ]),
     V2 =
         qlc:q([
                P0 ||
-                   P0 = {W,Y} &lt;-
-                       qlc:keysort(2, [{2,a},{3,b},{4,c}], [])
+                   P0 = {W, Y} &lt;-
+                       qlc:keysort(2, [{2, a}, {3, b}, {4, c}], [])
               ]),
     V3 =
         qlc:q([
-               [G1|G2] ||
+               [G1 | G2] ||
                    G1 &lt;- V1,
                    G2 &lt;- V2,
                    element(1, G1) == element(2, G2)
               ],
-              [{join,merge},{cache,list}]),
+              [{join, merge}, {cache, list}]),
     qlc:q([
-           {A,X,Z,W} ||
-               A &lt;- [a,b,c],
-               [{X,Z}|{W,Y}] &lt;- V3,
+           {A, X, Z, W} ||
+               A &lt;- [a, b, c],
+               [{X, Z} | {W, Y}] &lt;- V3,
                X =:= Y
           ])
 end</pre>
@@ -1141,14 +1147,21 @@ ets:match_spec_run(
                                 gb_trees:lookup(K,
                                                 gb_trees:from_orddict([]))
                             of
-                                {value,V} ->
-                                    [{K,V}];
+                                {value, V} ->
+                                    [{K, V}];
                                 none ->
                                     []
                             end
                      end,
-                     [{1,a},{1,b},{1,c},{2,a},{2,b},{2,c}]),
-       ets:match_spec_compile([{{{'$1','$2'},'_'},[],['$1']}]))</pre>
+                     [{1, a},
+                      {1, b},
+                      {1, c},
+                      {2, a},
+                      {2, b},
+                      {2, c}]),
+       ets:match_spec_compile([{{{'$1', '$2'}, '_'},
+                                [],
+                                ['$1']}]))</pre>
         <p>Options:</p>
         <list type="bulleted">
           <item>
@@ -1188,8 +1201,8 @@ ets:match_spec_run(
     </func>
 
     <func>
-      <name name="sort" arity="1"/>
-      <name name="sort" arity="2"/>
+      <name name="sort" arity="1" since=""/>
+      <name name="sort" arity="2" since=""/>
       <fsummary>Return a query handle.</fsummary>
       <desc>
         <p>Returns a query handle. When evaluating query handle
@@ -1208,9 +1221,9 @@ ets:match_spec_run(
     </func>
 
     <func>
-      <name name="string_to_handle" arity="1"/>
-      <name name="string_to_handle" arity="2"/>
-      <name name="string_to_handle" arity="3"/>
+      <name name="string_to_handle" arity="1" since=""/>
+      <name name="string_to_handle" arity="2" since=""/>
+      <name name="string_to_handle" arity="3" since=""/>
       <fsummary>Return a handle for a query list comprehension.</fsummary>
       <desc>
         <p>A string version of <seealso marker="#q/1"><c>q/1,2</c></seealso>.
@@ -1238,7 +1251,7 @@ ets:match_spec_run(
     </func>
 
     <func>
-      <name name="table" arity="2"/>
+      <name name="table" arity="2" since=""/>
       <fsummary>Return a query handle for a table.</fsummary>
       <desc>
         <p>Returns a query handle for a QLC table.
diff --git a/lib/stdlib/doc/src/queue.xml b/lib/stdlib/doc/src/queue.xml
index 9f3aff03a3..89cce6d85b 100644
--- a/lib/stdlib/doc/src/queue.xml
+++ b/lib/stdlib/doc/src/queue.xml
@@ -32,7 +32,7 @@
     <rev>B</rev>
     <file>queue.xml</file>
   </header>
-  <module>queue</module>
+  <module since="">queue</module>
   <modulesummary>Abstract data type for FIFO queues.</modulesummary>
   <description>
     <p>This module provides (double-ended) FIFO queues
@@ -113,7 +113,7 @@
 
   <funcs>
     <func>
-      <name name="filter" arity="2"/>
+      <name name="filter" arity="2" since=""/>
       <fsummary>Filter a queue.</fsummary>
       <desc>
         <p>Returns a queue <c><anno>Q2</anno></c> that is the result of calling
@@ -134,7 +134,7 @@
     </func>
 
     <func>
-      <name name="from_list" arity="1"/>
+      <name name="from_list" arity="1" since=""/>
       <fsummary>Convert a list to a queue.</fsummary>
       <desc>
         <p>Returns a queue containing the items in <c><anno>L</anno></c> in the
@@ -144,7 +144,7 @@
     </func>
 
     <func>
-      <name name="in" arity="2"/>
+      <name name="in" arity="2" since=""/>
       <fsummary>Insert an item at the rear of a queue.</fsummary>
       <desc>
         <p>Inserts <c><anno>Item</anno></c> at the rear of queue
@@ -154,7 +154,7 @@
     </func>
 
     <func>
-      <name name="in_r" arity="2"/>
+      <name name="in_r" arity="2" since=""/>
       <fsummary>Insert an item at the front of a queue.</fsummary>
       <desc>
         <p>Inserts <c><anno>Item</anno></c> at the front of queue
@@ -164,16 +164,16 @@
     </func>
 
     <func>
-      <name name="is_empty" arity="1"/>
+      <name name="is_empty" arity="1" since=""/>
       <fsummary>Test if a queue is empty.</fsummary>
       <desc>
         <p>Tests if <c><anno>Q</anno></c> is empty and returns <c>true</c> if
-          so, otherwise otherwise.</p>
+          so, otherwise <c>false</c>.</p>
       </desc>
     </func>
 
     <func>
-      <name name="is_queue" arity="1"/>
+      <name name="is_queue" arity="1" since=""/>
       <fsummary>Test if a term is a queue.</fsummary>
       <desc>
         <p>Tests if <c><anno>Term</anno></c> is a queue and returns <c>true</c>
@@ -182,7 +182,7 @@
     </func>
 
     <func>
-      <name name="join" arity="2"/>
+      <name name="join" arity="2" since=""/>
       <fsummary>Join two queues.</fsummary>
       <desc>
         <p>Returns a queue <c><anno>Q3</anno></c> that is the result of joining
@@ -192,7 +192,7 @@
     </func>
 
     <func>
-      <name name="len" arity="1"/>
+      <name name="len" arity="1" since=""/>
       <fsummary>Get the length of a queue.</fsummary>
       <desc>
         <p>Calculates and returns the length of queue <c><anno>Q</anno></c>.</p>
@@ -200,7 +200,7 @@
     </func>
 
     <func>
-      <name name="member" arity="2"/>
+      <name name="member" arity="2" since=""/>
       <fsummary>Test if an item is in a queue.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Item</anno></c> matches some element
@@ -209,7 +209,7 @@
     </func>
 
     <func>
-      <name name="new" arity="0"/>
+      <name name="new" arity="0" since=""/>
       <fsummary>Create an empty queue.</fsummary>
       <desc>
         <p>Returns an empty queue.</p>
@@ -217,7 +217,7 @@
     </func>
 
     <func>
-      <name name="out" arity="1"/>
+      <name name="out" arity="1" since=""/>
       <fsummary>Remove the front item from a queue.</fsummary>
       <desc>
         <p>Removes the item at the front of queue <c><anno>Q1</anno></c>.
@@ -230,7 +230,7 @@
     </func>
 
     <func>
-      <name name="out_r" arity="1"/>
+      <name name="out_r" arity="1" since=""/>
       <fsummary>Remove the rear item from a queue.</fsummary>
       <desc>
         <p>Removes the item at the rear of queue <c><anno>Q1</anno></c>.
@@ -242,7 +242,7 @@
     </func>
 
     <func>
-      <name name="reverse" arity="1"/>
+      <name name="reverse" arity="1" since=""/>
       <fsummary>Reverse a queue.</fsummary>
       <desc>
         <p>Returns a queue <c><anno>Q2</anno></c> containing the items of
@@ -251,7 +251,7 @@
     </func>
 
     <func>
-      <name name="split" arity="2"/>
+      <name name="split" arity="2" since=""/>
       <fsummary>Split a queue in two.</fsummary>
       <desc>
         <p>Splits <c><anno>Q1</anno></c> in two. The <c><anno>N</anno></c>
@@ -261,7 +261,7 @@
     </func>
 
     <func>
-      <name name="to_list" arity="1"/>
+      <name name="to_list" arity="1" since=""/>
       <fsummary>Convert a queue to a list.</fsummary>
       <desc>
         <p>Returns a list of the items in the queue in the same order;
@@ -276,7 +276,7 @@
 
   <funcs>
     <func>
-      <name name="drop" arity="1"/>
+      <name name="drop" arity="1" since=""/>
       <fsummary>Remove the front item from a queue.</fsummary>
       <desc>
         <p>Returns a queue <c><anno>Q2</anno></c> that is the result of removing
@@ -286,7 +286,7 @@
     </func>
 
     <func>
-      <name name="drop_r" arity="1"/>
+      <name name="drop_r" arity="1" since=""/>
       <fsummary>Remove the rear item from a queue.</fsummary>
       <desc>
         <p>Returns a queue <c><anno>Q2</anno></c> that is the result of removing
@@ -296,7 +296,7 @@
     </func>
 
     <func>
-      <name name="get" arity="1"/>
+      <name name="get" arity="1" since=""/>
       <fsummary>Return the front item of a queue.</fsummary>
       <desc>
         <p>Returns <c><anno>Item</anno></c> at the front of queue
@@ -306,7 +306,7 @@
     </func>
 
     <func>
-      <name name="get_r" arity="1"/>
+      <name name="get_r" arity="1" since=""/>
       <fsummary>Return the rear item of a queue.</fsummary>
       <desc>
         <p>Returns <c><anno>Item</anno></c> at the rear of queue
@@ -316,7 +316,7 @@
     </func>
 
     <func>
-      <name name="peek" arity="1"/>
+      <name name="peek" arity="1" since=""/>
       <fsummary>Return the front item of a queue.</fsummary>
       <desc>
         <p>Returns tuple <c>{value, <anno>Item</anno>}</c>, where
@@ -326,7 +326,7 @@
     </func>
 
     <func>
-      <name name="peek_r" arity="1"/>
+      <name name="peek_r" arity="1" since=""/>
       <fsummary>Return the rear item of a queue.</fsummary>
       <desc>
         <p>Returns tuple <c>{value, <anno>Item</anno>}</c>, where
@@ -342,7 +342,7 @@
 
   <funcs>
     <func>
-      <name name="cons" arity="2"/>
+      <name name="cons" arity="2" since=""/>
       <fsummary>Insert an item at the head of a queue.</fsummary>
       <desc>
         <p>Inserts <c><anno>Item</anno></c> at the head of queue
@@ -352,7 +352,7 @@
     </func>
 
     <func>
-      <name name="daeh" arity="1"/>
+      <name name="daeh" arity="1" since=""/>
       <fsummary>Return the tail item of a queue.</fsummary>
       <desc>
         <p>Returns the tail item of queue <c><anno>Q</anno></c>.</p>
@@ -361,7 +361,7 @@
     </func>
 
     <func>
-      <name name="head" arity="1"/>
+      <name name="head" arity="1" since=""/>
       <fsummary>Return the item at the head of a queue.</fsummary>
       <desc>
         <p>Returns <c><anno>Item</anno></c> from the head of queue
@@ -371,7 +371,7 @@
     </func>
 
     <func>
-      <name name="init" arity="1"/>
+      <name name="init" arity="1" since=""/>
       <fsummary>Remove the tail item from a queue.</fsummary>
       <desc>
         <p>Returns a queue <c><anno>Q2</anno></c> that is the result of removing
@@ -381,7 +381,7 @@
     </func>
 
     <func>
-      <name name="lait" arity="1"/>
+      <name name="lait" arity="1" since=""/>
       <fsummary>Remove the tail item from a queue.</fsummary>
       <desc>
         <p>Returns a queue <c><anno>Q2</anno></c> that is the result of removing
@@ -392,7 +392,7 @@
     </func>
 
     <func>
-      <name name="last" arity="1"/>
+      <name name="last" arity="1" since=""/>
       <fsummary>Return the tail item of a queue.</fsummary>
       <desc>
         <p>Returns the tail item of queue <c><anno>Q</anno></c>.</p>
@@ -401,7 +401,7 @@
     </func>
 
     <func>
-      <name name="liat" arity="1"/>
+      <name name="liat" arity="1" since=""/>
       <fsummary>Remove the tail item from a queue.</fsummary>
       <desc>
         <p>Returns a queue <c><anno>Q2</anno></c> that is the result of removing
@@ -411,7 +411,7 @@
     </func>
 
     <func>
-      <name name="snoc" arity="2"/>
+      <name name="snoc" arity="2" since=""/>
       <fsummary>Insert an item at the tail of a queue.</fsummary>
       <desc>
         <p>Inserts <c><anno>Item</anno></c> as the tail item of queue
@@ -421,7 +421,7 @@
     </func>
 
     <func>
-      <name name="tail" arity="1"/>
+      <name name="tail" arity="1" since=""/>
       <fsummary>Remove the head item from a queue.</fsummary>
       <desc>
         <p>Returns a queue <c><anno>Q2</anno></c> that is the result of removing
diff --git a/lib/stdlib/doc/src/rand.xml b/lib/stdlib/doc/src/rand.xml
index 21f680a0ee..b4737b48f8 100644
--- a/lib/stdlib/doc/src/rand.xml
+++ b/lib/stdlib/doc/src/rand.xml
@@ -32,31 +32,77 @@
     <rev>A</rev>
     <file>rand.xml</file>
   </header>
-  <module>rand</module>
+  <module since="OTP 18.0">rand</module>
   <modulesummary>Pseudo random number generation.</modulesummary>
   <description>
     <p>
       This module provides a pseudo random number generator.
       The module contains a number of algorithms.
-      The uniform distribution algorithms use the
+      The uniform distribution algorithms are based on the
       <url href="http://xorshift.di.unimi.it">
-	xoroshiro116+ and xorshift1024* algorithms by Sebastiano Vigna.
+	Xoroshiro and Xorshift algorithms
       </url>
+      by Sebastiano Vigna.
       The normal distribution algorithm uses the
       <url href="http://www.jstatsoft.org/v05/i08">
 	Ziggurat Method by Marsaglia and Tsang
       </url>
       on top of the uniform distribution algorithm.
     </p>
-    <p>For some algorithms, jump functions are provided for generating
-        non-overlapping sequences for parallel computations.
-        The jump functions perform calculations
-        equivalent to perform a large number of repeated calls
-        for calculating new states. </p>
+    <p>
+      For most algorithms, jump functions are provided for generating
+      non-overlapping sequences for parallel computations.
+      The jump functions perform calculations
+      equivalent to perform a large number of repeated calls
+      for calculating new states.
+    </p>
 
     <p>The following algorithms are provided:</p>
 
     <taglist>
+      <tag><c>exsss</c></tag>
+      <item>
+        <p>Xorshift116**, 58 bits precision and period of 2^116-1</p>
+        <p>Jump function: equivalent to 2^64 calls</p>
+	<p>
+	  This is the Xorshift116 generator combined with the StarStar scrambler
+	  from the 2018 paper by David Blackman and Sebastiano Vigna:
+	  <url href="http://vigna.di.unimi.it/ftp/papers/ScrambledLinear.pdf">
+	    Scrambled Linear Pseudorandom Number Generators
+	  </url>
+	</p>
+	<p>
+	  The generator does not need 58-bit rotates so it is faster
+	  than the Xoroshiro116 generator, and when combined with
+	  the StarStar scrambler it does not have any weak low bits
+	  like <c>exrop</c> (Xoroshiro116+).
+	</p>
+	<p>
+	  Alas, this combination is about 10% slower than <c>exrop</c>,
+	  but is despite that the default algorithm thanks to its
+	  statistical qualities.
+	</p>
+      </item>
+      <tag><c>exro928ss</c></tag>
+      <item>
+        <p>Xoroshiro928**, 58 bits precision and a period of 2^928-1</p>
+        <p>Jump function: equivalent to 2^512 calls</p>
+	<p>
+	  This is a 58 bit version of Xoroshiro1024**,
+	  from the 2018 paper by David Blackman and Sebastiano Vigna:
+	  <url href="http://vigna.di.unimi.it/ftp/papers/ScrambledLinear.pdf">
+	    Scrambled Linear Pseudorandom Number Generators
+	  </url>
+	  that on a 64 bit Erlang system executes only about 40% slower than
+	  the default <c>exsss</c> algorithm but with much longer period
+	  and better statistical properties, and on the flip side
+	  a larger state.
+	</p>
+	<p>
+	  Many thanks to Sebastiano Vigna for his help with
+	  the 58 bit adaption.
+	</p>
+      </item>
       <tag><c>exrop</c></tag>
       <item>
         <p>Xoroshiro116+, 58 bits precision and period of 2^116-1</p>
@@ -83,7 +129,7 @@
     </taglist>
 
     <p>
-      The default algorithm is <c>exrop</c> (Xoroshiro116+).
+      The default algorithm is <c>exsss</c> (Xorshift116**).
       If a specific algorithm is
       required, ensure to always use <seealso marker="#seed-1">
       <c>seed/1</c></seealso> to initialize the state.
@@ -154,19 +200,19 @@ R1 = rand:uniform(),</pre>
     <p>Use a specified algorithm:</p>
 
     <pre>
-_ = rand:seed(exs1024s),
+_ = rand:seed(exs928ss),
 R2 = rand:uniform(),</pre>
 
     <p>Use a specified algorithm with a constant seed:</p>
 
     <pre>
-_ = rand:seed(exs1024s, {123, 123534, 345345}),
+_ = rand:seed(exs928ss, {123, 123534, 345345}),
 R3 = rand:uniform(),</pre>
 
    <p>Use the functional API with a non-constant seed:</p>
 
    <pre>
-S0 = rand:seed_s(exrop),
+S0 = rand:seed_s(exsss),
 {R4, S1} = rand:uniform_s(S0),</pre>
 
    <p>Textbook basic form Box-Muller standard normal deviate</p>
@@ -195,8 +241,9 @@ SND0 = math:sqrt(-2 * math:log(R5)) * math:cos(math:pi() * R6)</pre>
     </note>
 
     <p>
-      For all these generators the lowest bit(s) has got
-      a slightly less random behaviour than all other bits.
+      For all these generators except <c>exro928ss</c> and <c>exsss</c>
+      the lowest bit(s) has got a slightly less
+      random behaviour than all other bits.
       1 bit for <c>exrop</c> (and <c>exsp</c>),
       and 3 bits for <c>exs1024s</c>.
       See for example the explanation in the
@@ -211,7 +258,7 @@ up to (and included) 16TB, with the exception of binary rank tests,
 which fail due to the lowest bit being an LFSR; all other bits pass all
 tests. We suggest to use a sign test to extract a random Boolean value.</pre>
     <p>
-      If this is a problem; to generate a boolean
+      If this is a problem; to generate a boolean with these algorithms
       use something like this:
     </p>
     <pre>(rand:uniform(16) > 8)</pre>
@@ -254,26 +301,55 @@ tests. We suggest to use a sign test to extract a random Boolean value.</pre>
       </desc>
     </datatype>
     <datatype>
-      <name name="exs64_state"/>
-      <desc><p>Algorithm specific internal state</p></desc>
+      <name name="seed"/>
+      <desc>
+	<p>
+	  A seed value for the generator.
+	</p>
+	<p>
+	  A list of integers sets the generator's internal state directly,
+	  after algorithm-dependent checks of the value
+	  and masking to the proper word size.
+	</p>
+	<p>
+	  An integer is used as the initial state for a SplitMix64 generator.
+	  The output values of that is then used for setting
+	  the generator's internal state
+	  after masking to the proper word size
+	  and if needed avoiding zero values.
+	</p>
+	<p>
+	  A traditional 3-tuple of integers seed is passed through
+	  algorithm-dependent hashing functions to create
+	  the generator's initial state.
+	</p>
+      </desc>
     </datatype>
     <datatype>
       <name name="exsplus_state"/>
       <desc><p>Algorithm specific internal state</p></desc>
     </datatype>
     <datatype>
-      <name name="exs1024_state"/>
+      <name name="exro928_state"/>
       <desc><p>Algorithm specific internal state</p></desc>
     </datatype>
     <datatype>
       <name name="exrop_state"/>
       <desc><p>Algorithm specific internal state</p></desc>
     </datatype>
+    <datatype>
+      <name name="exs1024_state"/>
+      <desc><p>Algorithm specific internal state</p></desc>
+    </datatype>
+    <datatype>
+      <name name="exs64_state"/>
+      <desc><p>Algorithm specific internal state</p></desc>
+    </datatype>
   </datatypes>
 
   <funcs>
     <func>
-      <name name="export_seed" arity="0"/>
+      <name name="export_seed" arity="0" since="OTP 18.0"/>
       <fsummary>Export the random number generation state.</fsummary>
       <desc><marker id="export_seed-0"/>
         <p>Returns the random number state in an external format.
@@ -282,7 +358,7 @@ tests. We suggest to use a sign test to extract a random Boolean value.</pre>
     </func>
 
     <func>
-      <name name="export_seed_s" arity="1"/>
+      <name name="export_seed_s" arity="1" since="OTP 18.0"/>
       <fsummary>Export the random number generation state.</fsummary>
       <desc><marker id="export_seed_s-1"/>
         <p>Returns the random number generator state in an external format.
@@ -291,7 +367,7 @@ tests. We suggest to use a sign test to extract a random Boolean value.</pre>
     </func>
 
     <func>
-      <name name="jump" arity="0"/>
+      <name name="jump" arity="0" since="OTP 20.0"/>
       <fsummary>Return the seed after performing jump calculation
           to the state in the process dictionary.</fsummary>
       <desc><marker id="jump-0" />
@@ -306,7 +382,7 @@ tests. We suggest to use a sign test to extract a random Boolean value.</pre>
     </func>
 
     <func>
-      <name name="jump" arity="1"/>
+      <name name="jump" arity="1" since="OTP 20.0"/>
       <fsummary>Return the seed after performing jump calculation.</fsummary>
       <desc><marker id="jump-1" />
           <p>Returns the state after performing jump calculation
@@ -318,7 +394,7 @@ tests. We suggest to use a sign test to extract a random Boolean value.</pre>
     </func>
 
     <func>
-      <name name="normal" arity="0"/>
+      <name name="normal" arity="0" since="OTP 18.0"/>
       <fsummary>Return a standard normal distributed random float.</fsummary>
       <desc>
         <p>Returns a standard normal deviate float (that is, the mean
@@ -328,7 +404,7 @@ tests. We suggest to use a sign test to extract a random Boolean value.</pre>
     </func>
 
     <func>
-      <name name="normal" arity="2"/>
+      <name name="normal" arity="2" since="OTP 20.0"/>
       <fsummary>Return a normal distributed random float.</fsummary>
       <desc>
         <p>Returns a normal N(Mean, Variance) deviate float
@@ -337,7 +413,7 @@ tests. We suggest to use a sign test to extract a random Boolean value.</pre>
     </func>
 
     <func>
-      <name name="normal_s" arity="1"/>
+      <name name="normal_s" arity="1" since="OTP 18.0"/>
       <fsummary>Return a standard normal distributed random float.</fsummary>
       <desc>
         <p>Returns, for a specified state, a standard normal
@@ -347,7 +423,7 @@ tests. We suggest to use a sign test to extract a random Boolean value.</pre>
     </func>
 
     <func>
-      <name name="normal_s" arity="3"/>
+      <name name="normal_s" arity="3" since="OTP 20.0"/>
       <fsummary>Return a normal distributed random float.</fsummary>
       <desc>
         <p>Returns, for a specified state, a normal N(Mean, Variance)
@@ -356,7 +432,7 @@ tests. We suggest to use a sign test to extract a random Boolean value.</pre>
     </func>
 
     <func>
-      <name name="seed" arity="1"/>
+      <name name="seed" arity="1" since="OTP 18.0"/>
       <fsummary>Seed random number generator.</fsummary>
       <desc>
         <marker id="seed-1"/>
@@ -372,7 +448,7 @@ tests. We suggest to use a sign test to extract a random Boolean value.</pre>
     </func>
 
     <func>
-      <name name="seed" arity="2"/>
+      <name name="seed" arity="2" since="OTP 18.0"/>
       <fsummary>Seed the random number generation.</fsummary>
       <desc>
         <p>Seeds random number generation with the specified algorithm and
@@ -381,7 +457,7 @@ tests. We suggest to use a sign test to extract a random Boolean value.</pre>
     </func>
 
     <func>
-      <name name="seed_s" arity="1"/>
+      <name name="seed_s" arity="1" since="OTP 18.0"/>
       <fsummary>Seed random number generator.</fsummary>
       <desc>
         <p>
@@ -396,7 +472,7 @@ tests. We suggest to use a sign test to extract a random Boolean value.</pre>
     </func>
 
     <func>
-      <name name="seed_s" arity="2"/>
+      <name name="seed_s" arity="2" since="OTP 18.0"/>
       <fsummary>Seed the random number generation.</fsummary>
       <desc>
         <p>Seeds random number generation with the specified algorithm and
@@ -405,7 +481,7 @@ tests. We suggest to use a sign test to extract a random Boolean value.</pre>
     </func>
 
     <func>
-      <name name="uniform" arity="0"/>
+      <name name="uniform" arity="0" since="OTP 18.0"/>
       <fsummary>Return a random float.</fsummary>
       <desc><marker id="uniform-0"/>
         <p>
@@ -441,7 +517,7 @@ end.</pre>
     </func>
 
     <func>
-      <name name="uniform_real" arity="0"/>
+      <name name="uniform_real" arity="0" since="OTP 21.0"/>
       <fsummary>Return a random float.</fsummary>
       <desc><marker id="uniform_real-0"/>
         <p>
@@ -477,7 +553,7 @@ end.</pre>
     </func>
 
     <func>
-      <name name="uniform" arity="1"/>
+      <name name="uniform" arity="1" since="OTP 18.0"/>
       <fsummary>Return a random integer.</fsummary>
       <desc><marker id="uniform-1"/>
         <p>Returns, for a specified integer <c><anno>N</anno> >= 1</c>,
@@ -488,7 +564,7 @@ end.</pre>
     </func>
 
     <func>
-      <name name="uniform_s" arity="1"/>
+      <name name="uniform_s" arity="1" since="OTP 18.0"/>
       <fsummary>Return a random float.</fsummary>
       <desc>
         <p>
@@ -524,7 +600,7 @@ end.</pre>
     </func>
 
     <func>
-      <name name="uniform_real_s" arity="1"/>
+      <name name="uniform_real_s" arity="1" since="OTP 21.0"/>
       <fsummary>Return a random float.</fsummary>
       <desc>
         <p>
@@ -586,7 +662,7 @@ end.</pre>
     </func>
 
     <func>
-      <name name="uniform_s" arity="2"/>
+      <name name="uniform_s" arity="2" since="OTP 18.0"/>
       <fsummary>Return a random integer.</fsummary>
       <desc>
         <p>Returns, for a specified integer <c><anno>N</anno> >= 1</c>
diff --git a/lib/stdlib/doc/src/random.xml b/lib/stdlib/doc/src/random.xml
index 8d090d20b3..f0261ed009 100644
--- a/lib/stdlib/doc/src/random.xml
+++ b/lib/stdlib/doc/src/random.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>random.xml</file>
   </header>
-  <module>random</module>
+  <module since="">random</module>
   <modulesummary>Pseudo-random number generation.</modulesummary>
   <description>
     <p>This module provides a random number generator. The method is attributed
@@ -73,7 +73,7 @@
 
   <funcs>
     <func>
-      <name name="seed" arity="0"/>
+      <name name="seed" arity="0" since=""/>
       <fsummary>Seed random number generation with default values.</fsummary>
       <desc>
         <p>Seeds random number generation with default (fixed) values
@@ -82,7 +82,7 @@
     </func>
 
     <func>
-      <name name="seed" arity="1"/>
+      <name name="seed" arity="1" since=""/>
       <fsummary>Seed random number generator.</fsummary>
       <desc>
         <p><c>seed({<anno>A1</anno>, <anno>A2</anno>, <anno>A3</anno>})</c>
@@ -92,7 +92,7 @@
     </func>
 
    <func>
-      <name name="seed" arity="3"/>
+      <name name="seed" arity="3" since=""/>
       <fsummary>Seed random number generator.</fsummary>
       <desc>
         <p>Seeds random number generation with integer values in the process
@@ -116,7 +116,7 @@ random:seed(erlang:phash2([node()]),
     </func>
 
     <func>
-      <name name="seed0" arity="0"/>
+      <name name="seed0" arity="0" since=""/>
       <fsummary>Return default state for random number generation.</fsummary>
       <desc>
         <p>Returns the default state.</p>
@@ -124,7 +124,7 @@ random:seed(erlang:phash2([node()]),
     </func>
 
     <func>
-      <name name="uniform" arity="0"/>
+      <name name="uniform" arity="0" since=""/>
       <fsummary>Return a random float.</fsummary>
       <desc>
         <p>Returns a random float uniformly distributed between <c>0.0</c>
@@ -133,7 +133,7 @@ random:seed(erlang:phash2([node()]),
     </func>
 
     <func>
-      <name name="uniform" arity="1"/>
+      <name name="uniform" arity="1" since=""/>
       <fsummary>Return a random integer.</fsummary>
       <desc>
         <p>Returns, for a specified integer <c><anno>N</anno> >= 1</c>,
@@ -144,7 +144,7 @@ random:seed(erlang:phash2([node()]),
     </func>
 
     <func>
-      <name name="uniform_s" arity="1"/>
+      <name name="uniform_s" arity="1" since=""/>
       <fsummary>Return a random float.</fsummary>
       <desc>
         <p>Returns, for a specified state, a random float uniformly
@@ -153,7 +153,7 @@ random:seed(erlang:phash2([node()]),
     </func>
 
     <func>
-      <name name="uniform_s" arity="2"/>
+      <name name="uniform_s" arity="2" since=""/>
       <fsummary>Return a random integer.</fsummary>
       <desc>
         <p>Returns, for a specified integer <c><anno>N</anno> >= 1</c> and a
diff --git a/lib/stdlib/doc/src/re.xml b/lib/stdlib/doc/src/re.xml
index 078ca0e38c..b04434492d 100644
--- a/lib/stdlib/doc/src/re.xml
+++ b/lib/stdlib/doc/src/re.xml
@@ -34,7 +34,7 @@
     <rev>A</rev>
     <file>re.xml</file>
   </header>
-  <module>re</module>
+  <module since="">re</module>
   <modulesummary>Perl-like regular expressions for Erlang.</modulesummary>
   <description>
     <p>This module contains regular expression matching functions for
@@ -79,7 +79,7 @@
 
   <funcs>
     <func>
-      <name name="version" arity="0"/>
+      <name name="version" arity="0" since="OTP 20.0"/>
       <fsummary>Gives the PCRE version of the system in a string format</fsummary>
       <desc>
       <p>The return of this function is a string with the PCRE version of the system that was used in the Erlang/OTP compilation.</p>
@@ -87,7 +87,7 @@
     </func>
 
     <func>
-      <name name="compile" arity="1"/>
+      <name name="compile" arity="1" since=""/>
       <fsummary>Compile a regular expression into a match program</fsummary>
       <desc>
       <p>The same as <c>compile(<anno>Regexp</anno>,[])</c></p>
@@ -95,7 +95,7 @@
     </func> 
 
     <func>
-      <name name="compile" arity="2"/>
+      <name name="compile" arity="2" since=""/>
       <fsummary>Compile a regular expression into a match program.</fsummary>
       <desc>
         <p>Compiles a regular expression, with the syntax
@@ -304,7 +304,7 @@
     </func> 
 
     <func>
-      <name name="inspect" arity="2"/>
+      <name name="inspect" arity="2" since="OTP 17.0"/>
       <fsummary>Inspects a compiled regular expression.</fsummary>
       <desc>
         <p>Takes a compiled regular expression and an item, and returns the
@@ -348,7 +348,7 @@
     </func>
 
     <func>
-      <name name="replace" arity="3"/>
+      <name name="replace" arity="3" since=""/>
       <fsummary>Match a subject against regular expression and replace matching
         elements with Replacement.</fsummary>
       <desc>
@@ -358,7 +358,7 @@
     </func> 
 
     <func>
-      <name name="replace" arity="4"/>
+      <name name="replace" arity="4" since=""/>
       <fsummary>Match a subject against regular expression and replace matching
         elements with Replacement.</fsummary>
       <desc>
@@ -408,7 +408,7 @@ re:replace("abcd","c","[\\&amp;]",[{return,list}]).</code>
     </func>
 
     <func>
-      <name name="run" arity="2"/>
+      <name name="run" arity="2" since=""/>
       <fsummary>Match a subject against regular expression and capture
         subpatterns.</fsummary>
       <desc>
@@ -417,7 +417,7 @@ re:replace("abcd","c","[\\&amp;]",[{return,list}]).</code>
     </func> 
 
     <func>
-      <name name="run" arity="3"/>
+      <name name="run" arity="3" since=""/>
       <fsummary>Match a subject against regular expression and capture
         subpatterns.</fsummary>
       <type_desc variable="CompileOpt">See <seealso marker="#compile_options">
@@ -992,7 +992,7 @@ re:run("cacb","c(a|b)",[global,{capture,[1],list}]).</code>
     </func>
 
     <func>
-      <name name="split" arity="2"/>
+      <name name="split" arity="2" since=""/>
       <fsummary>Split a string by tokens specified as a regular expression.
       </fsummary>
       <desc>
@@ -1001,7 +1001,7 @@ re:run("cacb","c(a|b)",[global,{capture,[1],list}]).</code>
     </func>
 
     <func>
-      <name name="split" arity="3"/>
+      <name name="split" arity="3" since=""/>
       <fsummary>Split a string by tokens specified as a regular expression</fsummary>
       <type_desc variable="CompileOpt">See <seealso marker="#compile_options">
         <c>compile/2</c></seealso>.</type_desc>
diff --git a/lib/stdlib/doc/src/sets.xml b/lib/stdlib/doc/src/sets.xml
index 8db3e1e623..07ce41b7a7 100644
--- a/lib/stdlib/doc/src/sets.xml
+++ b/lib/stdlib/doc/src/sets.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>sets.xml</file>
   </header>
-  <module>sets</module>
+  <module since="">sets</module>
   <modulesummary>Functions for set manipulation.</modulesummary>
   <description>
     <p>Sets are collections of elements with no duplicate elements.
@@ -59,7 +59,7 @@
 
   <funcs>
     <func>
-      <name name="add_element" arity="2"/>
+      <name name="add_element" arity="2" since=""/>
       <fsummary>Add an element to a <c>Set</c>.</fsummary>
       <desc>
         <p>Returns a new set formed from <c><anno>Set1</anno></c> with
@@ -68,7 +68,7 @@
     </func>
 
     <func>
-      <name name="del_element" arity="2"/>
+      <name name="del_element" arity="2" since=""/>
       <fsummary>Remove an element from a <c>Set</c>.</fsummary>
       <desc>
         <p>Returns <c><anno>Set1</anno></c>, but with
@@ -77,7 +77,7 @@
     </func>
 
     <func>
-      <name name="filter" arity="2"/>
+      <name name="filter" arity="2" since=""/>
       <fsummary>Filter set elements.</fsummary>
       <desc>
         <p>Filters elements in <c><anno>Set1</anno></c> with boolean function
@@ -86,7 +86,7 @@
     </func>
 
     <func>
-      <name name="fold" arity="3"/>
+      <name name="fold" arity="3" since=""/>
       <fsummary>Fold over set elements.</fsummary>
       <desc>
         <p>Folds <c><anno>Function</anno></c> over every element in
@@ -96,7 +96,7 @@
     </func>
 
     <func>
-      <name name="from_list" arity="1"/>
+      <name name="from_list" arity="1" since=""/>
       <fsummary>Convert a list into a <c>Set</c>.</fsummary>
       <desc>
         <p>Returns a set of the elements in <c><anno>List</anno></c>.</p>
@@ -104,7 +104,7 @@
     </func>
 
     <func>
-      <name name="intersection" arity="1"/>
+      <name name="intersection" arity="1" since=""/>
       <fsummary>Return the intersection of a list of <c>Sets</c>.</fsummary>
       <desc>
         <p>Returns the intersection of the non-empty list of sets.</p>
@@ -112,7 +112,7 @@
     </func>
 
     <func>
-      <name name="intersection" arity="2"/>
+      <name name="intersection" arity="2" since=""/>
       <fsummary>Return the intersection of two <c>Sets</c>.</fsummary>
       <desc>
         <p>Returns the intersection of <c><anno>Set1</anno></c> and
@@ -121,7 +121,7 @@
     </func>
 
     <func>
-      <name name="is_disjoint" arity="2"/>
+      <name name="is_disjoint" arity="2" since=""/>
       <fsummary>Check whether two <c>Sets</c> are disjoint.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Set1</anno></c> and
@@ -131,7 +131,7 @@
     </func>
 
     <func>
-      <name name="is_element" arity="2"/>
+      <name name="is_element" arity="2" since=""/>
       <fsummary>Test for membership of a <c>Set</c>.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Element</anno></c> is an element of
@@ -140,7 +140,7 @@
     </func>
 
     <func>
-      <name name="is_empty" arity="1"/>
+      <name name="is_empty" arity="1" since="OTP 21.0"/>
       <fsummary>Test for empty set.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Set</anno></c> is an empty set,
@@ -149,7 +149,7 @@
     </func>
 
     <func>
-      <name name="is_set" arity="1"/>
+      <name name="is_set" arity="1" since=""/>
       <fsummary>Test for a <c>Set</c>.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Set</anno></c> is a set of
@@ -158,7 +158,7 @@
     </func>
 
     <func>
-      <name name="is_subset" arity="2"/>
+      <name name="is_subset" arity="2" since=""/>
       <fsummary>Test for subset.</fsummary>
       <desc>
         <p>Returns <c>true</c> when every element of <c><anno>Set1</anno></c> is
@@ -167,7 +167,7 @@
     </func>
 
     <func>
-      <name name="new" arity="0"/>
+      <name name="new" arity="0" since=""/>
       <fsummary>Return an empty set.</fsummary>
       <desc>
         <p>Returns a new empty set.</p>
@@ -175,7 +175,7 @@
     </func>
 
     <func>
-      <name name="size" arity="1"/>
+      <name name="size" arity="1" since=""/>
       <fsummary>Return the number of elements in a set.</fsummary>
       <desc>
         <p>Returns the number of elements in <c><anno>Set</anno></c>.</p>
@@ -183,7 +183,7 @@
     </func>
 
     <func>
-      <name name="subtract" arity="2"/>
+      <name name="subtract" arity="2" since=""/>
       <fsummary>Return the difference of two <c>Sets</c>.</fsummary>
       <desc>
         <p>Returns only the elements of <c><anno>Set1</anno></c> that are not
@@ -192,7 +192,7 @@
     </func>
 
     <func>
-      <name name="to_list" arity="1"/>
+      <name name="to_list" arity="1" since=""/>
       <fsummary>Convert a <c>Set</c>into a list.</fsummary>
       <desc>
         <p>Returns the elements of <c><anno>Set</anno></c> as a list.
@@ -201,7 +201,7 @@
     </func>
 
     <func>
-      <name name="union" arity="1"/>
+      <name name="union" arity="1" since=""/>
       <fsummary>Return the union of a list of <c>Sets</c>.</fsummary>
       <desc>
         <p>Returns the merged (union) set of the list of sets.</p>
@@ -209,7 +209,7 @@
     </func>
 
     <func>
-      <name name="union" arity="2"/>
+      <name name="union" arity="2" since=""/>
       <fsummary>Return the union of two <c>Sets</c>.</fsummary>
       <desc>
         <p>Returns the merged (union) set of <c><anno>Set1</anno></c> and
diff --git a/lib/stdlib/doc/src/shell.xml b/lib/stdlib/doc/src/shell.xml
index 2593d3690b..50a0968531 100644
--- a/lib/stdlib/doc/src/shell.xml
+++ b/lib/stdlib/doc/src/shell.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>shell.xml</file>
   </header>
-  <module>shell</module>
+  <module since="">shell</module>
   <modulesummary>The Erlang shell.</modulesummary>
   <description>
     <p>This module provides an Erlang shell.</p>
@@ -874,7 +874,7 @@ q                 - quit erlang
 
   <funcs>
     <func>
-      <name>catch_exception(Bool) -> boolean()</name>
+      <name since="">catch_exception(Bool) -> boolean()</name>
       <fsummary>Set the exception handling of the shell.</fsummary>
       <type>
         <v>Bool = boolean()</v>
@@ -892,7 +892,7 @@ q                 - quit erlang
     </func>
 
     <func>
-      <name name="history" arity="1"/>
+      <name name="history" arity="1" since=""/>
       <fsummary>Set the number of previous commands to keep.</fsummary>
       <desc>
         <p>Sets the number of previous commands to keep in the
@@ -902,7 +902,7 @@ q                 - quit erlang
     </func>
 
     <func>
-      <name name="prompt_func" arity="1"/>
+      <name name="prompt_func" arity="1" since="OTP R13B04"/>
       <fsummary>Set the shell prompt.</fsummary>
       <desc>
         <p>Sets the shell prompt function to <c><anno>PromptFunc</anno></c>.
@@ -911,7 +911,7 @@ q                 - quit erlang
     </func>
 
     <func>
-      <name name="results" arity="1"/>
+      <name name="results" arity="1" since=""/>
       <fsummary>Set the number of previous results to keep.</fsummary>
       <desc>
         <p>Sets the number of results from previous commands to keep in
@@ -921,7 +921,7 @@ q                 - quit erlang
     </func>
 
     <func>
-      <name name="start_restricted" arity="1"/>
+      <name name="start_restricted" arity="1" since=""/>
       <fsummary>Exit a normal shell and starts a restricted shell.</fsummary>
       <desc>
         <p>Exits a normal shell and starts a restricted shell.
@@ -936,7 +936,7 @@ q                 - quit erlang
     </func>
 
     <func>
-      <name name="stop_restricted" arity="0"/>
+      <name name="stop_restricted" arity="0" since=""/>
       <fsummary>Exit a restricted shell and starts a normal shell.</fsummary>
       <desc>
         <p>Exits a restricted shell and starts a normal shell. The function
@@ -945,7 +945,7 @@ q                 - quit erlang
     </func>
 
     <func>
-      <name name="strings" arity="1"/>
+      <name name="strings" arity="1" since="OTP R16B"/>
       <fsummary>Set the shell's string recognition flag.</fsummary>
       <desc>
         <p>Sets pretty printing of lists to <c><anno>Strings</anno></c>.
diff --git a/lib/stdlib/doc/src/slave.xml b/lib/stdlib/doc/src/slave.xml
index e53ec8231b..f9e42ad47d 100644
--- a/lib/stdlib/doc/src/slave.xml
+++ b/lib/stdlib/doc/src/slave.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>slave</module>
+  <module since="">slave</module>
   <modulesummary>Functions for starting and controlling slave nodes.
   </modulesummary>
   <description>
@@ -39,23 +39,30 @@
       done through the master.</p>
 
     <p>Slave nodes on other hosts than the current one are started with
-      the <c>rsh</c> program. The user must be allowed to <c>rsh</c> to
+      the <c>ssh</c> program. The user must be allowed to <c>ssh</c> to
       the remote hosts without being prompted for a password. This can
-      be arranged in a number of ways (for details, see the <c>rsh</c>
+      be arranged in a number of ways (for details, see the <c>ssh</c>
       documentation). A slave node started on the same host
       as the master inherits certain environment values from the master,
       such as the current directory and the environment variables. For
       what can be assumed about the environment when a slave is started
-      on another host, see the documentation for the <c>rsh</c>
+      on another host, see the documentation for the <c>ssh</c>
       program.</p>
 
-    <p>An alternative to the <c>rsh</c> program can be specified on
+    <p>An alternative to the <c>ssh</c> program can be specified on
       the command line to
-      <seealso marker="erts:erl#erl"><c>erl(1)</c></seealso> as follows:</p>
+      <seealso marker="erts:erl"><c>erl(1)</c></seealso> as follows:</p>
 
     <pre>
 -rsh Program</pre>
 
+    <p>Note that the command specified with the <c>-rsh</c> flag is
+      treated as a file name which may contain spaces. It is thus not
+      possible to include any command line options. The remote node will
+      be launched as <c>"$RSH" "$REMOTE_HOSTNAME" erl -detached -noinput
+      ...</c>, so the
+      <c>erl</c> command must be found in the path on the remote host.</p>
+
     <p>The slave node is to use the same file system at the master. At
       least, Erlang/OTP is to be installed in the same place on both
       computers and the same version of Erlang is to be used.</p>
@@ -68,7 +75,7 @@
 
   <funcs>
     <func>
-      <name>pseudo([Master | ServerList]) -> ok</name>
+      <name since="">pseudo([Master | ServerList]) -> ok</name>
       <fsummary>Start a number of pseudo servers.</fsummary>
       <type>
         <v>Master = node()</v>
@@ -84,7 +91,7 @@
     </func>
 
     <func>
-      <name name="pseudo" arity="2"/>
+      <name name="pseudo" arity="2" since=""/>
       <fsummary>Start a number of pseudo servers.</fsummary>
       <desc>
         <p>Starts a number of pseudo servers. A pseudo server is a
@@ -102,7 +109,7 @@ rpc:call(N, slave, pseudo, [node(), [pxw_server]]).</code>
     </func>
 
     <func>
-      <name name="relay" arity="1"/>
+      <name name="relay" arity="1" since=""/>
       <fsummary>Run a pseudo server.</fsummary>
       <desc>
         <p>Runs a pseudo server. This function never returns any value
@@ -113,9 +120,9 @@ rpc:call(N, slave, pseudo, [node(), [pxw_server]]).</code>
     </func>
 
     <func>
-      <name name="start" arity="1"/>
-      <name name="start" arity="2"/>
-      <name name="start" arity="3"/>
+      <name name="start" arity="1" since=""/>
+      <name name="start" arity="2" since=""/>
+      <name name="start" arity="3" since=""/>
       <fsummary>Start a slave node on a host.</fsummary>
       <desc>
         <p>Starts a slave node on host <c><anno>Host</anno></c>. Host names
@@ -133,7 +140,7 @@ rpc:call(N, slave, pseudo, [node(), [pxw_server]]).</code>
         <p>Argument <c><anno>Args</anno></c> is used to set <c>erl</c>
           command-line arguments. If provided, it is passed to the new
           node and can be used for a variety of purposes; see
-          <seealso marker="erts:erl#erl"><c>erl(1)</c></seealso>.</p>
+          <seealso marker="erts:erl"><c>erl(1)</c></seealso>.</p>
         <p>As an example, suppose that you want to start a slave node at
           host <c>H</c> with node name <c>Name@H</c> and
           want the slave node to have the following properties:</p>
@@ -166,7 +173,9 @@ slave:start(H, Name, Arg).</code>
           </item>
           <tag><c>no_rsh</c></tag>
           <item>
-            <p>There is no <c>rsh</c> program on the computer.</p>
+            <p>No remote shell program was found on the computer. Note
+            that <c>ssh</c> is used by default, but this can be overridden
+            with the <c>-rsh</c> flag.</p>
           </item>
           <tag><c>{already_running, <anno>Node</anno>}</c></tag>
           <item>
@@ -178,9 +187,9 @@ slave:start(H, Name, Arg).</code>
     </func>
 
     <func>
-      <name name="start_link" arity="1"/>
-      <name name="start_link" arity="2"/>
-      <name name="start_link" arity="3"/>
+      <name name="start_link" arity="1" since=""/>
+      <name name="start_link" arity="2" since=""/>
+      <name name="start_link" arity="3" since=""/>
       <fsummary>Start and link to a slave node on a host.</fsummary>
       <desc>
         <p>Starts a slave node in the same way as <c>start/1,2,3</c>,
@@ -193,7 +202,7 @@ slave:start(H, Name, Arg).</code>
     </func>
 
     <func>
-      <name name="stop" arity="1"/>
+      <name name="stop" arity="1" since=""/>
       <fsummary>Stop (kill) a node.</fsummary>
       <desc>
         <p>Stops (kills) a node.</p>
diff --git a/lib/stdlib/doc/src/sofs.xml b/lib/stdlib/doc/src/sofs.xml
index 4cf1984d46..a0759d2f52 100644
--- a/lib/stdlib/doc/src/sofs.xml
+++ b/lib/stdlib/doc/src/sofs.xml
@@ -32,7 +32,7 @@
     <rev>PA1</rev>
     <file>sofs.xml</file>
   </header>
-  <module>sofs</module>
+  <module since="">sofs</module>
   <modulesummary>Functions for manipulating sets of sets.</modulesummary>
   <description>
     <p>This module provides operations on finite sets and
@@ -456,8 +456,8 @@ fun(S) -> sofs:partition(1, S) end
 
   <funcs>
     <func>
-      <name name="a_function" arity="1"/>
-      <name name="a_function" arity="2"/>
+      <name name="a_function" arity="1" since=""/>
+      <name name="a_function" arity="2" since=""/>
       <fsummary>Create a function.</fsummary>
       <desc>
         <p>Creates a <seealso marker="#function">function</seealso>.
@@ -470,7 +470,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="canonical_relation" arity="1"/>
+      <name name="canonical_relation" arity="1" since=""/>
       <fsummary>Return the canonical map.</fsummary>
       <desc>
         <p>Returns the binary relation containing the elements
@@ -490,7 +490,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="composite" arity="2"/>
+      <name name="composite" arity="2" since=""/>
       <fsummary>Return the composite of two functions.</fsummary>
       <desc>
         <p>Returns the <seealso marker="#composite">composite</seealso> of 
@@ -506,7 +506,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="constant_function" arity="2"/>
+      <name name="constant_function" arity="2" since=""/>
       <fsummary>Create the function that maps each element of a
         set onto another set.</fsummary>
       <desc>
@@ -522,7 +522,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="converse" arity="1"/>
+      <name name="converse" arity="1" since=""/>
       <fsummary>Return the converse of a binary relation.</fsummary>
       <desc>
         <p>Returns the <seealso marker="#converse">converse</seealso>
@@ -536,7 +536,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="difference" arity="2"/>
+      <name name="difference" arity="2" since=""/>
       <fsummary>Return the difference of two sets.</fsummary>
       <desc>
         <p>Returns the <seealso marker="#difference">difference</seealso> of
@@ -545,8 +545,8 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="digraph_to_family" arity="1"/>
-      <name name="digraph_to_family" arity="2"/>
+      <name name="digraph_to_family" arity="1" since=""/>
+      <name name="digraph_to_family" arity="2" since=""/>
       <fsummary>Create a family from a directed graph.</fsummary>
       <desc>
         <p>Creates a <seealso marker="#family">family</seealso> from
@@ -565,7 +565,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="domain" arity="1"/>
+      <name name="domain" arity="1" since=""/>
       <fsummary>Return the domain of a binary relation.</fsummary>
       <desc>
         <p>Returns the <seealso marker="#domain">domain</seealso> of
@@ -579,7 +579,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="drestriction" arity="2"/>
+      <name name="drestriction" arity="2" since=""/>
       <fsummary>Return a restriction of a binary relation.</fsummary>
       <desc>
         <p>Returns the difference between the binary relation
@@ -598,7 +598,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="drestriction" arity="3"/>
+      <name name="drestriction" arity="3" since=""/>
       <fsummary>Return a restriction of a relation.</fsummary>
       <desc>
         <p>Returns a subset of <c><anno>Set1</anno></c> containing those
@@ -618,7 +618,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="empty_set" arity="0"/>
+      <name name="empty_set" arity="0" since=""/>
       <fsummary>Return the untyped empty set.</fsummary>
       <desc>
         <p>Returns the <seealso marker="#sets_definition">untyped empty
@@ -628,7 +628,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="extension" arity="3"/>
+      <name name="extension" arity="3" since=""/>
       <fsummary>Extend the domain of a binary relation.</fsummary>
       <desc>
         <p>Returns the <seealso marker="#extension">extension</seealso> of
@@ -648,8 +648,8 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="family" arity="1"/>
-      <name name="family" arity="2"/>
+      <name name="family" arity="1" since=""/>
+      <name name="family" arity="2" since=""/>
       <fsummary>Create a family of subsets.</fsummary>
       <desc>
         <p>Creates a <seealso marker="#family">family of subsets</seealso>.
@@ -662,7 +662,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="family_difference" arity="2"/>
+      <name name="family_difference" arity="2" since=""/>
       <fsummary>Return the difference of two families.</fsummary>
       <desc>
         <p>If <c><anno>Family1</anno></c> and <c><anno>Family2</anno></c>
@@ -683,7 +683,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="family_domain" arity="1"/>
+      <name name="family_domain" arity="1" since=""/>
       <fsummary>Return a family of domains.</fsummary>
       <desc>
         <p>If <c><anno>Family1</anno></c> is
@@ -704,7 +704,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="family_field" arity="1"/>
+      <name name="family_field" arity="1" since=""/>
       <fsummary>Return a family of fields.</fsummary>
       <desc>
         <p>If <c><anno>Family1</anno></c> is
@@ -728,7 +728,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="family_intersection" arity="1"/>
+      <name name="family_intersection" arity="1" since=""/>
       <fsummary>Return the intersection of a family
          of sets of sets.</fsummary>
       <desc>
@@ -752,7 +752,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="family_intersection" arity="2"/>
+      <name name="family_intersection" arity="2" since=""/>
       <fsummary>Return the intersection of two families.</fsummary>
       <desc>
         <p>If <c><anno>Family1</anno></c> and <c><anno>Family2</anno></c>
@@ -772,7 +772,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="family_projection" arity="2"/>
+      <name name="family_projection" arity="2" since=""/>
       <fsummary>Return a family of modified subsets.</fsummary>
       <desc>
         <p>If <c><anno>Family1</anno></c> is
@@ -791,7 +791,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="family_range" arity="1"/>
+      <name name="family_range" arity="1" since=""/>
       <fsummary>Return a family of ranges.</fsummary>
       <desc>
         <p>If <c><anno>Family1</anno></c> is
@@ -812,7 +812,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="family_specification" arity="2"/>
+      <name name="family_specification" arity="2" since=""/>
       <fsummary>Select a subset of a family using a predicate.</fsummary>
       <desc>
         <p>If <c><anno>Family1</anno></c> is
@@ -837,8 +837,8 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="family_to_digraph" arity="1"/>
-      <name name="family_to_digraph" arity="2"/>
+      <name name="family_to_digraph" arity="1" since=""/>
+      <name name="family_to_digraph" arity="2" since=""/>
       <fsummary>Create a directed graph from a family.</fsummary>
       <desc>
         <p>Creates a directed graph from
@@ -863,7 +863,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="family_to_relation" arity="1"/>
+      <name name="family_to_relation" arity="1" since=""/>
       <fsummary>Create a binary relation from a family.</fsummary>
       <desc>
         <p>If <c><anno>Family</anno></c> is
@@ -881,7 +881,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="family_union" arity="1"/>
+      <name name="family_union" arity="1" since=""/>
       <fsummary>Return the union of a family of sets of sets.</fsummary>
       <desc>
         <p>If <c><anno>Family1</anno></c> is
@@ -904,7 +904,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="family_union" arity="2"/>
+      <name name="family_union" arity="2" since=""/>
       <fsummary>Return the union of two families.</fsummary>
       <desc>
         <p>If <c><anno>Family1</anno></c> and <c><anno>Family2</anno></c>
@@ -926,7 +926,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="field" arity="1"/>
+      <name name="field" arity="1" since=""/>
       <fsummary>Return the field of a binary relation.</fsummary>
       <desc>
         <p>Returns the <seealso marker="#field">field</seealso> of the
@@ -942,7 +942,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="from_external" arity="2"/>
+      <name name="from_external" arity="2" since=""/>
       <fsummary>Create a set.</fsummary>
       <desc>
         <p>Creates a set from the <seealso marker="#external_set">external 
@@ -955,7 +955,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="from_sets" arity="1" clause_i="1"/>
+      <name name="from_sets" arity="1" clause_i="1" since=""/>
       <fsummary>Create a set out of a list of sets.</fsummary>
       <desc>
         <p>Returns the <seealso marker="#sets_definition">unordered
@@ -971,7 +971,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="from_sets" arity="1" clause_i="2"/>
+      <name name="from_sets" arity="1" clause_i="2" since=""/>
       <fsummary>Create an ordered set out of a tuple of sets.</fsummary>
       <desc>
         <p>Returns the <seealso marker="#sets_definition">ordered
@@ -981,8 +981,8 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="from_term" arity="1"/>
-      <name name="from_term" arity="2"/>
+      <name name="from_term" arity="1" since=""/>
+      <name name="from_term" arity="2" since=""/>
       <fsummary>Create a set.</fsummary>
       <desc>
         <p><marker id="from_term"></marker>Creates an element
@@ -1031,7 +1031,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="image" arity="2"/>
+      <name name="image" arity="2" since=""/>
       <fsummary>Return the image of a set under a binary relation.</fsummary>
       <desc>
         <p>Returns the <seealso marker="#image">image</seealso> of
@@ -1047,7 +1047,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="intersection" arity="1"/>
+      <name name="intersection" arity="1" since=""/>
       <fsummary>Return the intersection of a set of sets.</fsummary>
       <desc>
         <p>Returns
@@ -1059,7 +1059,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="intersection" arity="2"/>
+      <name name="intersection" arity="2" since=""/>
       <fsummary>Return the intersection of two sets.</fsummary>
       <desc>
         <p>Returns
@@ -1069,7 +1069,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="intersection_of_family" arity="1"/>
+      <name name="intersection_of_family" arity="1" since=""/>
       <fsummary>Return the intersection of a family.</fsummary>
       <desc>
         <p>Returns the intersection of
@@ -1086,7 +1086,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="inverse" arity="1"/>
+      <name name="inverse" arity="1" since=""/>
       <fsummary>Return the inverse of a function.</fsummary>
       <desc>
         <p>Returns the <seealso marker="#inverse">inverse</seealso>
@@ -1100,7 +1100,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="inverse_image" arity="2"/>
+      <name name="inverse_image" arity="2" since=""/>
       <fsummary>Return the inverse image of a set under
         a binary relation.</fsummary>
       <desc>
@@ -1117,7 +1117,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="is_a_function" arity="1"/>
+      <name name="is_a_function" arity="1" since=""/>
       <fsummary>Test for a function.</fsummary>
       <desc>
         <p>Returns <c>true</c> if the binary relation <c><anno>BinRel</anno></c>
@@ -1127,7 +1127,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="is_disjoint" arity="2"/>
+      <name name="is_disjoint" arity="2" since=""/>
       <fsummary>Test for disjoint sets.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Set1</anno></c>
@@ -1138,7 +1138,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="is_empty_set" arity="1"/>
+      <name name="is_empty_set" arity="1" since=""/>
       <fsummary>Test for an empty set.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>AnySet</anno></c> is an empty
@@ -1147,7 +1147,7 @@ fun(S) -> sofs:partition(1, S) end
     </func>
 
     <func>
-      <name name="is_equal" arity="2"/>
+      <name name="is_equal" arity="2" since=""/>
       <fsummary>Test two sets for equality.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>AnySet1</anno></c>
@@ -1164,7 +1164,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="is_set" arity="1"/>
+      <name name="is_set" arity="1" since=""/>
       <fsummary>Test for an unordered set.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>AnySet</anno></c> is
@@ -1175,7 +1175,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="is_sofs_set" arity="1"/>
+      <name name="is_sofs_set" arity="1" since=""/>
       <fsummary>Test for an unordered set.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Term</anno></c> is
@@ -1185,7 +1185,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="is_subset" arity="2"/>
+      <name name="is_subset" arity="2" since=""/>
       <fsummary>Test two sets for subset.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Set1</anno></c> is
@@ -1195,7 +1195,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="is_type" arity="1"/>
+      <name name="is_type" arity="1" since=""/>
       <fsummary>Test for a type.</fsummary>
       <desc>
         <p>Returns <c>true</c> if term <c><anno>Term</anno></c> is
@@ -1204,7 +1204,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="join" arity="4"/>
+      <name name="join" arity="4" since=""/>
       <fsummary>Return the join of two relations.</fsummary>
       <desc>
         <p>Returns the <seealso marker="#natural_join">natural
@@ -1221,7 +1221,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="multiple_relative_product" arity="2"/>
+      <name name="multiple_relative_product" arity="2" since=""/>
       <fsummary>Return the multiple relative product of a tuple of binary
         relations and a relation.</fsummary>
       <desc>
@@ -1242,7 +1242,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="no_elements" arity="1"/>
+      <name name="no_elements" arity="1" since=""/>
       <fsummary>Return the number of elements of a set.</fsummary>
       <desc>
         <p>Returns the number of elements of the ordered or unordered
@@ -1251,7 +1251,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="partition" arity="1"/>
+      <name name="partition" arity="1" since=""/>
       <fsummary>Return the coarsest partition given a set of sets.</fsummary>
       <desc>
         <p>Returns the <seealso marker="#partition">partition</seealso> of
@@ -1268,7 +1268,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="partition" arity="2"/>
+      <name name="partition" arity="2" since=""/>
       <fsummary>Return a partition of a set.</fsummary>
       <desc>
         <p>Returns the <seealso marker="#partition">partition</seealso> of
@@ -1284,7 +1284,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="partition" arity="3"/>
+      <name name="partition" arity="3" since=""/>
       <fsummary>Return a partition of a set.</fsummary>
       <desc>
         <p>Returns a pair of sets that, regarded as constituting a
@@ -1307,7 +1307,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="partition_family" arity="2"/>
+      <name name="partition_family" arity="2" since=""/>
       <fsummary>Return a family indexing a partition.</fsummary>
       <desc>
         <p>Returns <seealso marker="#family">family</seealso>
@@ -1328,7 +1328,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="product" arity="1"/>
+      <name name="product" arity="1" since=""/>
       <fsummary>Return the Cartesian product of a tuple of sets.</fsummary>
       <desc>
         <p>Returns the <seealso marker="#Cartesian_product_tuple">Cartesian
@@ -1347,7 +1347,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="product" arity="2"/>
+      <name name="product" arity="2" since=""/>
       <fsummary>Return the Cartesian product of two sets.</fsummary>
       <desc>
         <p>Returns the <seealso marker="#Cartesian_product">Cartesian
@@ -1365,7 +1365,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="projection" arity="2"/>
+      <name name="projection" arity="2" since=""/>
       <fsummary>Return a set of substituted elements.</fsummary>
       <desc>
         <p>Returns the set created by substituting each element of
@@ -1384,7 +1384,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="range" arity="1"/>
+      <name name="range" arity="1" since=""/>
       <fsummary>Return the range of a binary relation.</fsummary>
       <desc>
         <p>Returns the <seealso marker="#range">range</seealso> of the
@@ -1398,8 +1398,8 @@ true</pre>
     </func>
 
     <func>
-      <name name="relation" arity="1"/>
-      <name name="relation" arity="2"/>
+      <name name="relation" arity="1" since=""/>
+      <name name="relation" arity="2" since=""/>
       <fsummary>Create a relation.</fsummary>
       <desc>
         <p>Creates a <seealso marker="#relation">relation</seealso>.
@@ -1417,7 +1417,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="relation_to_family" arity="1"/>
+      <name name="relation_to_family" arity="1" since=""/>
       <fsummary>Create a family from a binary relation.</fsummary>
       <desc>
         <p>Returns <seealso marker="#family">family</seealso>
@@ -1435,8 +1435,8 @@ true</pre>
     </func>
 
     <func>
-      <name name="relative_product" arity="1"/>
-      <name name="relative_product" arity="2" clause_i="1"/>
+      <name name="relative_product" arity="1" since=""/>
+      <name name="relative_product" arity="2" clause_i="1" since=""/>
       <fsummary>Return the relative product of a list of binary relations
         and a binary relation.</fsummary>
       <desc>
@@ -1466,7 +1466,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="relative_product" arity="2" clause_i="2"/>
+      <name name="relative_product" arity="2" clause_i="2" since=""/>
       <fsummary>Return the relative product of
         two binary relations.</fsummary>
       <desc>
@@ -1477,7 +1477,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="relative_product1" arity="2"/>
+      <name name="relative_product1" arity="2" since=""/>
       <fsummary>Return the relative_product of
         two binary relations.</fsummary>
       <desc>
@@ -1498,7 +1498,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="restriction" arity="2"/>
+      <name name="restriction" arity="2" since=""/>
       <fsummary>Return a restriction of a binary relation.</fsummary>
       <desc>
         <p>Returns the <seealso marker="#restriction">restriction</seealso> of
@@ -1514,7 +1514,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="restriction" arity="3"/>
+      <name name="restriction" arity="3" since=""/>
       <fsummary>Return a restriction of a set.</fsummary>
       <desc>
         <p>Returns a subset of <c><anno>Set1</anno></c> containing those
@@ -1530,8 +1530,8 @@ true</pre>
     </func>
 
     <func>
-      <name name="set" arity="1"/>
-      <name name="set" arity="2"/>
+      <name name="set" arity="1" since=""/>
+      <name name="set" arity="2" since=""/>
       <fsummary>Create a set of atoms or any type of sets.</fsummary>
       <desc>
         <p>Creates an <seealso marker="#sets_definition">unordered
@@ -1543,7 +1543,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="specification" arity="2"/>
+      <name name="specification" arity="2" since=""/>
       <fsummary>Select a subset using a predicate.</fsummary>
       <desc>
         <p>Returns the set containing every element
@@ -1564,7 +1564,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="strict_relation" arity="1"/>
+      <name name="strict_relation" arity="1" since=""/>
       <fsummary>Return the strict relation corresponding to
         a given relation.</fsummary>
       <desc>
@@ -1580,7 +1580,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="substitution" arity="2"/>
+      <name name="substitution" arity="2" since=""/>
       <fsummary>Return a function with a given set as domain.</fsummary>
       <desc>
         <p>Returns a function, the domain of which
@@ -1629,7 +1629,7 @@ images2(SetOfSets, BinRel) ->
     </func>
 
     <func>
-      <name name="symdiff" arity="2"/>
+      <name name="symdiff" arity="2" since=""/>
       <fsummary>Return the symmetric difference of two sets.</fsummary>
       <desc>
         <p>Returns the <seealso marker="#symmetric_difference">symmetric
@@ -1645,7 +1645,7 @@ images2(SetOfSets, BinRel) ->
     </func>
 
     <func>
-      <name name="symmetric_partition" arity="2"/>
+      <name name="symmetric_partition" arity="2" since=""/>
       <fsummary>Return a partition of two sets.</fsummary>
       <desc>
         <p>Returns a triple of sets:</p>
@@ -1666,7 +1666,7 @@ images2(SetOfSets, BinRel) ->
     </func>
 
     <func>
-      <name name="to_external" arity="1"/>
+      <name name="to_external" arity="1" since=""/>
       <fsummary>Return the elements of a set.</fsummary>
       <desc>
         <p>Returns the <seealso marker="#external_set">external
@@ -1675,7 +1675,7 @@ images2(SetOfSets, BinRel) ->
     </func>
 
     <func>
-      <name name="to_sets" arity="1"/>
+      <name name="to_sets" arity="1" since=""/>
       <fsummary>Return a list or a tuple of the elements of a set.</fsummary>
       <desc>
         <p>Returns the elements of the ordered set <c><anno>ASet</anno></c>
@@ -1686,7 +1686,7 @@ images2(SetOfSets, BinRel) ->
     </func>
 
     <func>
-      <name name="type" arity="1"/>
+      <name name="type" arity="1" since=""/>
       <fsummary>Return the type of a set.</fsummary>
       <desc>
         <p>Returns the <seealso marker="#type">type</seealso> of an
@@ -1695,7 +1695,7 @@ images2(SetOfSets, BinRel) ->
     </func>
 
     <func>
-      <name name="union" arity="1"/>
+      <name name="union" arity="1" since=""/>
       <fsummary>Return the union of a set of sets.</fsummary>
       <desc>
         <p>Returns the <seealso marker="#union_n">union</seealso> of the
@@ -1704,7 +1704,7 @@ images2(SetOfSets, BinRel) ->
     </func>
 
     <func>
-      <name name="union" arity="2"/>
+      <name name="union" arity="2" since=""/>
       <fsummary>Return the union of two sets.</fsummary>
       <desc>
         <p>Returns the <seealso marker="#union">union</seealso> of
@@ -1713,7 +1713,7 @@ images2(SetOfSets, BinRel) ->
     </func>
 
     <func>
-      <name name="union_of_family" arity="1"/>
+      <name name="union_of_family" arity="1" since=""/>
       <fsummary>Return the union of a family.</fsummary>
       <desc>
         <p>Returns the union of <seealso marker="#family">family</seealso>
@@ -1727,7 +1727,7 @@ images2(SetOfSets, BinRel) ->
     </func>
 
     <func>
-      <name name="weak_relation" arity="1"/>
+      <name name="weak_relation" arity="1" since=""/>
       <fsummary>Return the weak relation corresponding to
         a given relation.</fsummary>
       <desc>
diff --git a/lib/stdlib/doc/src/string.xml b/lib/stdlib/doc/src/string.xml
index 3348464eba..d102191a57 100644
--- a/lib/stdlib/doc/src/string.xml
+++ b/lib/stdlib/doc/src/string.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>string.xml</file>
   </header>
-  <module>string</module>
+  <module since="">string</module>
   <modulesummary>String processing functions.</modulesummary>
   <description>
     <p>This module provides functions for string processing.</p>
@@ -130,7 +130,7 @@
   <funcs>
 
     <func>
-      <name name="casefold" arity="1"/>
+      <name name="casefold" arity="1" since="OTP 20.0"/>
       <fsummary>Convert a string to a comparable string.</fsummary>
       <desc>
         <p>
@@ -147,7 +147,7 @@
     </func>
 
     <func>
-      <name name="chomp" arity="1"/>
+      <name name="chomp" arity="1" since="OTP 20.0"/>
       <fsummary>Remove trailing end of line control characters.</fsummary>
       <desc>
         <p>
@@ -164,9 +164,9 @@
     </func>
 
     <func>
-      <name name="equal" arity="2"/>
-      <name name="equal" arity="3"/>
-      <name name="equal" arity="4"/>
+      <name name="equal" arity="2" since=""/>
+      <name name="equal" arity="3" since="OTP 20.0"/>
+      <name name="equal" arity="4" since="OTP 20.0"/>
       <fsummary>Test string equality.</fsummary>
       <desc>
         <p>
@@ -201,8 +201,8 @@ true</pre>
     </func>
 
     <func>
-      <name name="find" arity="2"/>
-      <name name="find" arity="3"/>
+      <name name="find" arity="2" since="OTP 20.0"/>
+      <name name="find" arity="3" since="OTP 20.0"/>
       <fsummary>Find start of substring.</fsummary>
       <desc>
         <p>
@@ -230,7 +230,7 @@ nomatch</pre>
     </func>
 
     <func>
-      <name name="is_empty" arity="1"/>
+      <name name="is_empty" arity="1" since="OTP 20.0"/>
       <fsummary>Check if the string is empty.</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>String</anno></c> is the
@@ -245,7 +245,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="length" arity="1"/>
+      <name name="length" arity="1" since="OTP 20.0"/>
       <fsummary>Calculate length of the string.</fsummary>
       <desc>
         <p>
@@ -261,7 +261,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="lexemes" arity="2"/>
+      <name name="lexemes" arity="2" since="OTP 20.0"/>
       <fsummary>Split string into lexemes.</fsummary>
       <desc>
 	<p>
@@ -287,7 +287,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="lowercase" arity="1"/>
+      <name name="lowercase" arity="1" since="OTP 20.0"/>
       <fsummary>Convert a string to lowercase</fsummary>
       <desc>
         <p>
@@ -306,7 +306,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="next_codepoint" arity="1"/>
+      <name name="next_codepoint" arity="1" since="OTP 20.0"/>
       <fsummary>Pick the first codepoint.</fsummary>
       <desc>
         <p>
@@ -323,7 +323,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="next_grapheme" arity="1"/>
+      <name name="next_grapheme" arity="1" since="OTP 20.0"/>
       <fsummary>Pick the first grapheme cluster.</fsummary>
       <desc>
         <p>
@@ -340,7 +340,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="nth_lexeme" arity="3"/>
+      <name name="nth_lexeme" arity="3" since="OTP 20.0"/>
       <fsummary>Pick the nth lexeme.</fsummary>
       <desc>
 	<p>Returns lexeme number <c><anno>N</anno></c> in
@@ -355,9 +355,9 @@ true</pre>
     </func>
 
     <func>
-      <name name="pad" arity="2"/>
-      <name name="pad" arity="3"/>
-      <name name="pad" arity="4"/>
+      <name name="pad" arity="2" since="OTP 20.0"/>
+      <name name="pad" arity="3" since="OTP 20.0"/>
+      <name name="pad" arity="4" since="OTP 20.0"/>
       <fsummary>Pad a string to given length.</fsummary>
       <desc>
         <p>
@@ -381,7 +381,7 @@ true</pre>
     </func>
 
     <func>
-      <name name="prefix" arity="2"/>
+      <name name="prefix" arity="2" since="OTP 20.0"/>
       <fsummary>Remove prefix from string.</fsummary>
       <desc>
         <p>
@@ -400,8 +400,8 @@ nomatch</pre>
     </func>
 
     <func>
-      <name name="replace" arity="3"/>
-      <name name="replace" arity="4"/>
+      <name name="replace" arity="3" since="OTP 20.0"/>
+      <name name="replace" arity="4" since="OTP 20.0"/>
       <fsummary>Replace a pattern in string.</fsummary>
       <desc>
         <p>
@@ -423,7 +423,7 @@ nomatch</pre>
     </func>
 
     <func>
-      <name name="reverse" arity="1"/>
+      <name name="reverse" arity="1" since="OTP 20.0"/>
       <fsummary>Reverses a string</fsummary>
       <desc>
         <p>
@@ -439,8 +439,8 @@ ÖÄÅ</pre>
     </func>
 
     <func>
-      <name name="slice" arity="2"/>
-      <name name="slice" arity="3"/>
+      <name name="slice" arity="2" since="OTP 20.0"/>
+      <name name="slice" arity="3" since="OTP 20.0"/>
       <fsummary>Extract a part of string</fsummary>
       <desc>
 	<p>Returns a substring of <c><anno>String</anno></c> of
@@ -459,8 +459,8 @@ ÖÄÅ</pre>
     </func>
 
     <func>
-      <name name="split" arity="2"/>
-      <name name="split" arity="3"/>
+      <name name="split" arity="2" since="OTP 20.0"/>
+      <name name="split" arity="3" since="OTP 20.0"/>
       <fsummary>Split a string into substrings.</fsummary>
       <desc>
         <p>
@@ -482,9 +482,9 @@ ÖÄÅ</pre>
     </func>
 
     <func>
-      <name name="take" arity="2"/>
-      <name name="take" arity="3"/>
-      <name name="take" arity="4"/>
+      <name name="take" arity="2" since="OTP 20.0"/>
+      <name name="take" arity="3" since="OTP 20.0"/>
+      <name name="take" arity="4" since="OTP 20.0"/>
       <fsummary>Take leading or trailing parts.</fsummary>
       <desc>
         <p>Takes characters from <c><anno>String</anno></c> as long as
@@ -508,7 +508,7 @@ ÖÄÅ</pre>
     </func>
 
     <func>
-      <name name="titlecase" arity="1"/>
+      <name name="titlecase" arity="1" since="OTP 20.0"/>
       <fsummary>Convert a string to titlecase.</fsummary>
       <desc>
         <p>
@@ -522,7 +522,7 @@ ÖÄÅ</pre>
     </func>
 
     <func>
-      <name name="to_float" arity="1"/>
+      <name name="to_float" arity="1" since=""/>
       <fsummary>Return a float whose text representation is the integers
         (ASCII values) of a string.</fsummary>
       <desc>
@@ -544,7 +544,7 @@ ÖÄÅ</pre>
     </func>
 
     <func>
-      <name name="to_integer" arity="1"/>
+      <name name="to_integer" arity="1" since=""/>
       <fsummary>Return an integer whose text representation is the integers
         (ASCII values) of a string.</fsummary>
       <desc>
@@ -566,7 +566,7 @@ ÖÄÅ</pre>
     </func>
 
     <func>
-      <name name="to_graphemes" arity="1"/>
+      <name name="to_graphemes" arity="1" since="OTP 20.0"/>
       <fsummary>Convert a string to a list of grapheme clusters.</fsummary>
       <desc>
         <p>
@@ -582,9 +582,9 @@ ÖÄÅ</pre>
     </func>
 
     <func>
-      <name name="trim" arity="1"/>
-      <name name="trim" arity="2"/>
-      <name name="trim" arity="3"/>
+      <name name="trim" arity="1" since="OTP 20.0"/>
+      <name name="trim" arity="2" since="OTP 20.0"/>
+      <name name="trim" arity="3" since="OTP 20.0"/>
       <fsummary>Trim leading or trailing, or both, characters.</fsummary>
       <desc>
 	<p>
@@ -616,7 +616,7 @@ ÖÄÅ</pre>
     </func>
 
     <func>
-      <name name="uppercase" arity="1"/>
+      <name name="uppercase" arity="1" since="OTP 20.0"/>
       <fsummary>Convert a string to uppercase.</fsummary>
       <desc>
         <p>
@@ -649,8 +649,8 @@ ÖÄÅ</pre>
 
   <funcs>
     <func>
-      <name name="centre" arity="2"/>
-      <name name="centre" arity="3"/>
+      <name name="centre" arity="2" since=""/>
+      <name name="centre" arity="3" since=""/>
       <fsummary>Center a string.</fsummary>
       <desc>
         <p>Returns a string, where <c><anno>String</anno></c> is centered in the
@@ -664,8 +664,8 @@ ÖÄÅ</pre>
     </func>
 
     <func>
-      <name name="chars" arity="2"/>
-      <name name="chars" arity="3"/>
+      <name name="chars" arity="2" since=""/>
+      <name name="chars" arity="3" since=""/>
       <fsummary>Return a string consisting of numbers of characters.</fsummary>
       <desc>
         <p>Returns a string consisting of <c><anno>Number</anno></c> characters
@@ -678,7 +678,7 @@ ÖÄÅ</pre>
     </func>
 
     <func>
-      <name name="chr" arity="2"/>
+      <name name="chr" arity="2" since=""/>
       <fsummary>Return the index of the first occurrence of
         a character in a string.</fsummary>
       <desc>
@@ -692,7 +692,7 @@ ÖÄÅ</pre>
     </func>
 
     <func>
-      <name name="concat" arity="2"/>
+      <name name="concat" arity="2" since=""/>
       <fsummary>Concatenate two strings.</fsummary>
       <desc>
         <p>Concatenates <c><anno>String1</anno></c> and
@@ -712,7 +712,7 @@ ÖÄÅ</pre>
     </func>
 
     <func>
-      <name name="copies" arity="2"/>
+      <name name="copies" arity="2" since=""/>
       <fsummary>Copy a string.</fsummary>
       <desc>
         <p>Returns a string containing <c><anno>String</anno></c> repeated
@@ -724,7 +724,7 @@ ÖÄÅ</pre>
     </func>
 
     <func>
-      <name name="cspan" arity="2"/>
+      <name name="cspan" arity="2" since=""/>
       <fsummary>Span characters at start of a string.</fsummary>
       <desc>
         <p>Returns the length of the maximum initial segment of
@@ -741,7 +741,7 @@ ÖÄÅ</pre>
     </func>
 
     <func>
-      <name name="join" arity="2"/>
+      <name name="join" arity="2" since=""/>
       <fsummary>Join a list of strings with separator.</fsummary>
       <desc>
         <p>Returns a string with the elements of <c><anno>StringList</anno></c>
@@ -757,8 +757,8 @@ ÖÄÅ</pre>
     </func>
 
     <func>
-      <name name="left" arity="2"/>
-      <name name="left" arity="3"/>
+      <name name="left" arity="2" since=""/>
+      <name name="left" arity="3" since=""/>
       <fsummary>Adjust left end of a string.</fsummary>
       <desc>
         <p>Returns <c><anno>String</anno></c> with the length adjusted in
@@ -778,7 +778,7 @@ ÖÄÅ</pre>
     </func>
 
     <func>
-      <name name="len" arity="1"/>
+      <name name="len" arity="1" since=""/>
       <fsummary>Return the length of a string.</fsummary>
       <desc>
         <p>Returns the number of characters in <c><anno>String</anno></c>.</p>
@@ -789,7 +789,7 @@ ÖÄÅ</pre>
     </func>
 
     <func>
-      <name name="rchr" arity="2"/>
+      <name name="rchr" arity="2" since=""/>
       <fsummary>Return the index of the last occurrence of
         a character in a string.</fsummary>
       <desc>
@@ -803,8 +803,8 @@ ÖÄÅ</pre>
     </func>
 
     <func>
-      <name name="right" arity="2"/>
-      <name name="right" arity="3"/>
+      <name name="right" arity="2" since=""/>
+      <name name="right" arity="3" since=""/>
       <fsummary>Adjust right end of a string.</fsummary>
       <desc>
         <p>Returns <c><anno>String</anno></c> with the length adjusted in
@@ -823,7 +823,7 @@ ÖÄÅ</pre>
     </func>
 
     <func>
-      <name name="rstr" arity="2"/>
+      <name name="rstr" arity="2" since=""/>
       <fsummary>Find the index of a substring.</fsummary>
       <desc>
         <p>Returns the position where the last occurrence of
@@ -841,7 +841,7 @@ ÖÄÅ</pre>
     </func>
 
     <func>
-      <name name="span" arity="2"/>
+      <name name="span" arity="2" since=""/>
       <fsummary>Span characters at start of a string.</fsummary>
       <desc>
         <p>Returns the length of the maximum initial segment of
@@ -858,7 +858,7 @@ ÖÄÅ</pre>
     </func>
 
     <func>
-      <name name="str" arity="2"/>
+      <name name="str" arity="2" since=""/>
       <fsummary>Find the index of a substring.</fsummary>
       <desc>
         <p>Returns the position where the first occurrence of
@@ -876,9 +876,9 @@ ÖÄÅ</pre>
     </func>
 
     <func>
-      <name name="strip" arity="1"/>
-      <name name="strip" arity="2"/>
-      <name name="strip" arity="3"/>
+      <name name="strip" arity="1" since=""/>
+      <name name="strip" arity="2" since=""/>
+      <name name="strip" arity="3" since=""/>
       <fsummary>Strip leading or trailing characters.</fsummary>
       <desc>
         <p>Returns a string, where leading or trailing, or both, blanks or a
@@ -898,8 +898,8 @@ ÖÄÅ</pre>
     </func>
 
     <func>
-      <name name="sub_string" arity="2"/>
-      <name name="sub_string" arity="3"/>
+      <name name="sub_string" arity="2" since=""/>
+      <name name="sub_string" arity="3" since=""/>
       <fsummary>Extract a substring.</fsummary>
       <desc>
         <p>Returns a substring of <c><anno>String</anno></c>, starting at
@@ -916,8 +916,8 @@ sub_string("Hello World", 4, 8).
     </func>
 
     <func>
-      <name name="substr" arity="2"/>
-      <name name="substr" arity="3"/>
+      <name name="substr" arity="2" since=""/>
+      <name name="substr" arity="3" since=""/>
       <fsummary>Return a substring of a string.</fsummary>
       <desc>
         <p>Returns a substring of <c><anno>String</anno></c>, starting at
@@ -934,8 +934,8 @@ sub_string("Hello World", 4, 8).
     </func>
 
     <func>
-      <name name="sub_word" arity="2"/>
-      <name name="sub_word" arity="3"/>
+      <name name="sub_word" arity="2" since=""/>
+      <name name="sub_word" arity="3" since=""/>
       <fsummary>Extract subword.</fsummary>
       <desc>
         <p>Returns the word in position <c><anno>Number</anno></c> of
@@ -952,10 +952,10 @@ sub_string("Hello World", 4, 8).
     </func>
 
     <func>
-      <name name="to_lower" arity="1" clause_i="1"/>
-      <name name="to_lower" arity="1" clause_i="2"/>
-      <name name="to_upper" arity="1" clause_i="1"/>
-      <name name="to_upper" arity="1" clause_i="2"/>
+      <name name="to_lower" arity="1" clause_i="1" since=""/>
+      <name name="to_lower" arity="1" clause_i="2" since=""/>
+      <name name="to_upper" arity="1" clause_i="1" since=""/>
+      <name name="to_upper" arity="1" clause_i="2" since=""/>
       <fsummary>Convert case of string (ISO/IEC 8859-1).</fsummary>
       <type variable="String" name_i="1"/>
       <type variable="Result" name_i="1"/>
@@ -974,7 +974,7 @@ sub_string("Hello World", 4, 8).
     </func>
 
     <func>
-      <name name="tokens" arity="2"/>
+      <name name="tokens" arity="2" since=""/>
       <fsummary>Split string into tokens.</fsummary>
       <desc>
         <p>Returns a list of tokens in <c><anno>String</anno></c>, separated
@@ -994,8 +994,8 @@ sub_string("Hello World", 4, 8).
     </func>
 
     <func>
-      <name name="words" arity="1"/>
-      <name name="words" arity="2"/>
+      <name name="words" arity="1" since=""/>
+      <name name="words" arity="2" since=""/>
       <fsummary>Count blank separated words.</fsummary>
       <desc>
         <p>Returns the number of words in <c><anno>String</anno></c>, separated
diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml
index 5fd5760499..f15b1a2dd3 100644
--- a/lib/stdlib/doc/src/supervisor.xml
+++ b/lib/stdlib/doc/src/supervisor.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>supervisor</module>
+  <module since="">supervisor</module>
   <modulesummary>Generic supervisor behavior.</modulesummary>
   <description>
     <p>This behavior module provides a supervisor, a process that
@@ -318,7 +318,7 @@ child_spec() = #{id => child_id(),       % mandatory
 
   <funcs>
     <func>
-      <name name="check_childspecs" arity="1"/>
+      <name name="check_childspecs" arity="1" since=""/>
       <fsummary>Check if children specifications are syntactically correct.
       </fsummary>
       <desc>
@@ -329,7 +329,7 @@ child_spec() = #{id => child_id(),       % mandatory
     </func>
 
     <func>
-      <name name="count_children" arity="1"/>
+      <name name="count_children" arity="1" since="OTP R13B04"/>
       <fsummary>Return counts for the number of child specifications,
         active children, supervisors, and workers.</fsummary>
       <desc>
@@ -366,7 +366,7 @@ child_spec() = #{id => child_id(),       % mandatory
     </func>
 
     <func>
-      <name name="delete_child" arity="2"/>
+      <name name="delete_child" arity="2" since=""/>
       <fsummary>Delete a child specification from a supervisor.</fsummary>
       <desc>
         <p>Tells supervisor <c><anno>SupRef</anno></c> to delete the child
@@ -387,7 +387,7 @@ child_spec() = #{id => child_id(),       % mandatory
     </func>
 
     <func>
-      <name name="get_childspec" arity="2"/>
+      <name name="get_childspec" arity="2" since="OTP 18.0"/>
       <fsummary>Return the child specification map for the specified
         child.</fsummary>
       <desc>
@@ -400,7 +400,7 @@ child_spec() = #{id => child_id(),       % mandatory
     </func>
 
     <func>
-      <name name="restart_child" arity="2"/>
+      <name name="restart_child" arity="2" since=""/>
       <fsummary>Restart a terminated child process belonging to a supervisor.
       </fsummary>
       <desc>
@@ -436,7 +436,7 @@ child_spec() = #{id => child_id(),       % mandatory
     </func>
 
     <func>
-      <name name="start_child" arity="2"/>
+      <name name="start_child" arity="2" since=""/>
       <fsummary>Dynamically add a child process to a supervisor.</fsummary>
       <type name="startchild_ret"/>
       <type name="startchild_err"/>
@@ -503,8 +503,8 @@ child_spec() = #{id => child_id(),       % mandatory
     </func>
 
     <func>
-      <name name="start_link" arity="2"/>
-      <name name="start_link" arity="3"/>
+      <name name="start_link" arity="2" since=""/>
+      <name name="start_link" arity="3" since=""/>
       <fsummary>Create a supervisor process.</fsummary>
       <type name="startlink_ret"/>
       <type name="startlink_err"/>
@@ -584,7 +584,7 @@ child_spec() = #{id => child_id(),       % mandatory
     </func>
 
     <func>
-      <name name="terminate_child" arity="2"/>
+      <name name="terminate_child" arity="2" since=""/>
       <fsummary>Terminate a child process belonging to a supervisor.</fsummary>
       <desc>
         <p>Tells supervisor <c><anno>SupRef</anno></c> to terminate the
@@ -621,7 +621,7 @@ child_spec() = #{id => child_id(),       % mandatory
     </func>
 
     <func>
-      <name name="which_children" arity="1"/>
+      <name name="which_children" arity="1" since=""/>
       <fsummary>Return information about all children specifications and
         child processes belonging to a supervisor.</fsummary>
       <desc>
@@ -666,7 +666,7 @@ child_spec() = #{id => child_id(),       % mandatory
 
   <funcs>
     <func>
-      <name>Module:init(Args) -> Result</name>
+      <name since="">Module:init(Args) -> Result</name>
       <fsummary>Return a supervisor specification.</fsummary>
       <type>
         <v>Args = term()</v>
diff --git a/lib/stdlib/doc/src/supervisor_bridge.xml b/lib/stdlib/doc/src/supervisor_bridge.xml
index c4c1b37548..ee5d97fea1 100644
--- a/lib/stdlib/doc/src/supervisor_bridge.xml
+++ b/lib/stdlib/doc/src/supervisor_bridge.xml
@@ -30,7 +30,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>supervisor_bridge</module>
+  <module since="">supervisor_bridge</module>
   <modulesummary>Generic supervisor bridge behavior.</modulesummary>
   <description>
     <p>This behavior module provides a supervisor bridge, a process
@@ -57,8 +57,8 @@
 
   <funcs>
     <func>
-      <name name="start_link" arity="2"/>
-      <name name="start_link" arity="3"/>
+      <name name="start_link" arity="2" since=""/>
+      <name name="start_link" arity="3" since=""/>
       <fsummary>Create a supervisor bridge process.</fsummary>
       <desc>
         <p>Creates a supervisor bridge process, linked to the calling process,
@@ -133,7 +133,7 @@
 
   <funcs>
     <func>
-      <name>Module:init(Args) -> Result</name>
+      <name since="">Module:init(Args) -> Result</name>
       <fsummary>Initialize process and start subsystem.</fsummary>
       <type>
         <v>Args = term()</v>
@@ -164,7 +164,7 @@
     </func>
 
     <func>
-      <name>Module:terminate(Reason, State)</name>
+      <name since="">Module:terminate(Reason, State)</name>
       <fsummary>Clean up and stop subsystem.</fsummary>
       <type>
         <v>Reason = shutdown | term()</v>
diff --git a/lib/stdlib/doc/src/sys.xml b/lib/stdlib/doc/src/sys.xml
index 9fe816e33a..e22ca89ef5 100644
--- a/lib/stdlib/doc/src/sys.xml
+++ b/lib/stdlib/doc/src/sys.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2018</year>
+      <year>1996</year><year>2019</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,7 +32,7 @@
     <rev></rev>
     <file>sys.xml</file>
   </header>
-  <module>sys</module>
+  <module since="">sys</module>
   <modulesummary>A functional interface to system messages.</modulesummary>
   <description>
     <p>This module contains functions for sending system messages used by
@@ -114,6 +114,154 @@
     </datatype>
     <datatype>
       <name name="system_event"/>
+      <desc>
+	<taglist>
+	  <tag><c>{in,<anno>Msg</anno>}</c></tag>
+	  <item>
+	    <p>
+	      Is produced by <c>gen_server</c> and <c>gen_event</c>
+	      when the message <c>Msg</c> arrives.
+	    </p>
+	  </item>
+	  <tag><c>{in,<anno>Msg</anno>,<anno>State</anno>}</c></tag>
+	  <item>
+	    <p>
+	      Is produced by <c>gen_statem</c>
+	      when the message <c>Msg</c> arrives in state <c>State</c>.
+	    </p>
+	    <p>
+	      For <c>gen_statem</c> the <c><anno>Msg</anno></c> term is
+	      an <c>{EventType,EventContent}</c> tuple.
+	    </p>
+	  </item>
+	  <tag><c>{out,<anno>Msg</anno>,<anno>To</anno>}</c></tag>
+	  <item>
+	    <p>
+	      Is produced by <c>gen_statem</c> when the reply <c>Msg</c>
+	      is sent back to <c>To</c> by returning
+	      a <c>{reply,To,Msg}</c> action from the callback module.
+	    </p>
+	    <p>
+	      <c><anno>To</anno></c> is of the same type
+	      as the first argument to <c>gen_statem:reply/2</c>.
+	    </p>
+	  </item>
+	  <tag>
+	    <c>{out,<anno>Msg</anno>,<anno>To</anno>,<anno>State</anno>}</c>
+	  </tag>
+	  <item>
+	    <p>
+	      Is produced by <c>gen_server</c>
+	      when the reply <c><anno>Msg</anno></c>
+	      is sent back to <c><anno>To</anno></c>
+	      by returning a <c>{reply,...}</c> tuple
+	      from the callback module.
+	    </p>
+	    <p>
+	      <c><anno>To</anno></c> is of the same type
+	      as the first argument to <c>gen_server:reply/2</c>.
+	    </p>
+	    <p>
+	      <c><anno>State</anno></c> is the new server state.
+	    </p>
+	  </item>
+	  <tag>
+	    <c>{noreply,<anno>State</anno>}</c>
+	  </tag>
+	  <item>
+	    <p>
+	      Is produced by <c>gen_server</c>
+	      when a <c>{noreply,...}</c> tuple is returned
+	      from the callback module.
+	    </p>
+	    <p>
+	      <c><anno>State</anno></c> is the new server state.
+	    </p>
+	  </item>
+	  <tag>
+	    <c>{continue,<anno>Continuation</anno>}</c>
+	  </tag>
+	  <item>
+	    <p>
+	      Is produced by <c>gen_server</c>
+	      when a <c>{continue,<anno>Continuation</anno>}</c>
+	      tuple is returned from the callback module.
+	    </p>
+	  </item>
+	  <tag>
+	    <c>{code_change,<anno>Event</anno>,<anno>State</anno>}</c>
+	  </tag>
+	  <item>
+	    <p>
+	      Is produced by <c>gen_statem</c>
+	      when the message <c><anno>Event</anno></c>
+	      arrives in state <c><anno>State</anno></c>
+	      as the first event after a code change.
+	    </p>
+	    <p>
+	      <c><anno>Event</anno></c> is
+	      an <c>{EventType,EventContent}</c> tuple.
+	    </p>
+	  </item>
+	  <tag>
+	    <c>
+	      {postpone,<anno>Event</anno>,<anno>State</anno>,<anno>NextState</anno>}
+	    </c>
+	  </tag>
+	  <item>
+	    <p>
+	      Is produced by <c>gen_statem</c>
+	      when the message <c><anno>Event</anno></c>
+	      is postponed in state <c><anno>State</anno></c>.
+	      <c><anno>NextState</anno></c> is the new state.
+	    </p>
+	    <p>
+	      <c><anno>Event</anno></c> is
+	      an <c>{EventType,EventContent}</c> tuple.
+	    </p>
+	  </item>
+	  <tag>
+	    <c>
+	      {consume,<anno>Event</anno>,<anno>State</anno>,<anno>NextState</anno>}
+	    </c>
+	  </tag>
+	  <item>
+	    <p>
+	      Is produced by <c>gen_statem</c>
+	      when the message <c><anno>Event</anno></c>
+	      is consumed in state <c><anno>State</anno></c>.
+	      <c><anno>NextState</anno></c> is the new state.
+	    </p>
+	    <p>
+	      <c><anno>Event</anno></c> is
+	      an <c>{EventType,EventContent}</c> tuple.
+	    </p>
+	  </item>
+	  <tag>
+	    <c>
+	      {enter,<anno>State</anno>}
+	    </c>
+	  </tag>
+	  <item>
+	    <p>
+	      Is produced by <c>gen_statem</c>
+	      when the first state <c><anno>State</anno></c> is entered.
+	    </p>
+	  </item>
+	  <tag>
+	    <c>
+	      {terminate,<anno>Reason</anno>,<anno>State</anno>}
+	    </c>
+	  </tag>
+	  <item>
+	    <p>
+	      Is produced by <c>gen_statem</c>
+	      when it terminates with reason <c><anno>Reason</anno></c>
+	      in state <c><anno>State</anno></c>.
+	    </p>
+	  </item>
+	</taglist>
+      </desc>
     </datatype>
     <datatype>
       <name name="dbg_opt"/>
@@ -123,14 +271,17 @@
       <name name="dbg_fun"/>
     </datatype>
     <datatype>
+      <name name="debug_option"/>
+    </datatype>
+    <datatype>
       <name name="format_fun"/>
     </datatype>
   </datatypes>
 
   <funcs>
     <func>
-      <name name="change_code" arity="4"/>
-      <name name="change_code" arity="5"/>
+      <name name="change_code" arity="4" since=""/>
+      <name name="change_code" arity="5" since=""/>
       <fsummary>Send the code change system message to the process.</fsummary>
       <desc>
         <p>Tells the process to change code. The process must be
@@ -143,8 +294,8 @@
     </func>
 
     <func>
-      <name name="get_state" arity="1"/>
-      <name name="get_state" arity="2"/>
+      <name name="get_state" arity="1" since="OTP R16B01"/>
+      <name name="get_state" arity="2" since="OTP R16B01"/>
       <fsummary>Get the state of the process.</fsummary>
       <desc>
         <p>Gets the state of the process.</p>
@@ -227,8 +378,8 @@
     </func>
 
     <func>
-      <name name="get_status" arity="1"/>
-      <name name="get_status" arity="2"/>
+      <name name="get_status" arity="1" since=""/>
+      <name name="get_status" arity="2" since=""/>
       <fsummary>Get the status of the process.</fsummary>
       <desc>
         <p>Gets the status of the process.</p>
@@ -265,8 +416,8 @@
     </func>
 
     <func>
-      <name name="install" arity="2"/>
-      <name name="install" arity="3"/>
+      <name name="install" arity="2" since=""/>
+      <name name="install" arity="3" since=""/>
       <fsummary>Install a debug function in the process.</fsummary>
       <desc>
         <p>Enables installation of alternative debug functions. An example of
@@ -283,8 +434,8 @@
     </func>
 
     <func>
-      <name name="log" arity="2"/>
-      <name name="log" arity="3"/>
+      <name name="log" arity="2" since=""/>
+      <name name="log" arity="3" since=""/>
       <fsummary>Log system events in memory.</fsummary>
       <desc>
         <p>Turns the logging of system events on or off. If on, a
@@ -302,8 +453,8 @@
     </func>
 
     <func>
-      <name name="log_to_file" arity="2"/>
-      <name name="log_to_file" arity="3"/>
+      <name name="log_to_file" arity="2" since=""/>
+      <name name="log_to_file" arity="3" since=""/>
       <fsummary>Log system events to the specified file.</fsummary>
       <desc>
         <p>Enables or disables the logging of all system events in text
@@ -315,8 +466,8 @@
     </func>
 
     <func>
-      <name name="no_debug" arity="1"/>
-      <name name="no_debug" arity="2"/>
+      <name name="no_debug" arity="1" since=""/>
+      <name name="no_debug" arity="2" since=""/>
       <fsummary>Turn off debugging.</fsummary>
       <desc>
         <p>Turns off all debugging for the process. This includes
@@ -327,8 +478,8 @@
     </func>
 
     <func>
-      <name name="remove" arity="2"/>
-      <name name="remove" arity="3"/>
+      <name name="remove" arity="2" since=""/>
+      <name name="remove" arity="3" since=""/>
       <fsummary>Remove a debug function from the process.</fsummary>
       <desc>
         <p>Removes an installed debug function from the
@@ -338,8 +489,8 @@
     </func>
 
     <func>
-      <name name="replace_state" arity="2"/>
-      <name name="replace_state" arity="3"/>
+      <name name="replace_state" arity="2" since="OTP R16B01"/>
+      <name name="replace_state" arity="3" since="OTP R16B01"/>
       <fsummary>Replace the state of the process.</fsummary>
       <desc>
         <p>Replaces the state of the process, and returns the new state.</p>
@@ -451,8 +602,8 @@
     </func>
 
     <func>
-      <name name="resume" arity="1"/>
-      <name name="resume" arity="2"/>
+      <name name="resume" arity="1" since=""/>
+      <name name="resume" arity="2" since=""/>
       <fsummary>Resume a suspended process.</fsummary>
       <desc>
         <p>Resumes a suspended process.</p>
@@ -460,8 +611,8 @@
     </func>
 
     <func>
-      <name name="statistics" arity="2"/>
-      <name name="statistics" arity="3"/>
+      <name name="statistics" arity="2" since=""/>
+      <name name="statistics" arity="3" since=""/>
       <fsummary>Enable or disable the collections of statistics.</fsummary>
       <desc>
         <p>Enables or disables the collection of statistics. If 
@@ -471,8 +622,8 @@
     </func>
 
     <func>
-      <name name="suspend" arity="1"/>
-      <name name="suspend" arity="2"/>
+      <name name="suspend" arity="1" since=""/>
+      <name name="suspend" arity="2" since=""/>
       <fsummary>Suspend the process.</fsummary>
       <desc>
         <p>Suspends the process. When the process is suspended, it
@@ -482,8 +633,8 @@
     </func>
 
     <func>
-      <name name="terminate" arity="2"/>
-      <name name="terminate" arity="3"/>
+      <name name="terminate" arity="2" since="OTP 18.0"/>
+      <name name="terminate" arity="3" since="OTP 18.0"/>
       <fsummary>Terminate the process.</fsummary>
       <desc>
         <p>Orders the process to terminate with the
@@ -494,8 +645,8 @@
     </func>
 
     <func>
-      <name name="trace" arity="2"/>
-      <name name="trace" arity="3"/>
+      <name name="trace" arity="2" since=""/>
+      <name name="trace" arity="3" since=""/>
       <fsummary>Print all system events on <c>standard_io</c>.</fsummary>
       <desc>
         <p>Prints all system events on <c>standard_io</c>. The events are
@@ -518,7 +669,7 @@
 
   <funcs>
     <func>
-      <name name="debug_options" arity="1"/>
+      <name name="debug_options" arity="1" since=""/>
       <fsummary>Convert a list of options to a debug structure.</fsummary>
       <desc>
         <p>Can be used by a process that initiates a debug
@@ -529,9 +680,15 @@
     </func>
 
     <func>
-      <name name="get_debug" arity="3"/>
+      <name name="get_debug" arity="3" since=""/>
       <fsummary>Get the data associated with a debug option.</fsummary>
       <desc>
+	<warning>
+	  <p>
+	    <c>get_debug/3</c> is deprecated since it returns
+	    data of an internal type only useful for debugging.
+	  </p>
+	</warning>
         <p>Gets the data associated with a debug option.
           <c><anno>Default</anno></c>
           is returned if <c><anno>Item</anno></c> is not found. Can be
@@ -541,7 +698,7 @@
     </func>
 
     <func>
-      <name name="handle_debug" arity="4"/>
+      <name name="handle_debug" arity="4" since=""/>
       <fsummary>Generate a system event.</fsummary>
       <desc>
         <p>This function is called by a process when it generates a
@@ -556,7 +713,7 @@
     </func>
 
     <func>
-      <name name="handle_system_msg" arity="6"/>
+      <name name="handle_system_msg" arity="6" since=""/>
       <fsummary>Take care of system messages.</fsummary>
       <desc>
         <p>This function is used by a process module to take care of system
@@ -594,7 +751,7 @@
     </func>
 
     <func>
-      <name name="print_log" arity="1"/>
+      <name name="print_log" arity="1" since=""/>
       <fsummary>Print the logged events in the debug structure.</fsummary>
       <desc>
         <p>Prints the logged system events in the debug structure,
@@ -605,7 +762,19 @@
     </func>
 
     <func>
-      <name>Module:system_code_change(Misc, Module, OldVsn, Extra) ->
+      <name name="get_log" arity="1" since="OTP-22.0"/>
+      <fsummary>Return the logged events in the debug structure.</fsummary>
+      <desc>
+        <p>
+	  Returns the logged system events in the debug structure,
+	  that is the last argument to
+          <seealso marker="#handle_debug/4"><c>handle_debug/4</c></seealso>.
+	</p>
+      </desc>
+    </func>
+
+    <func>
+      <name since="">Module:system_code_change(Misc, Module, OldVsn, Extra) ->
         {ok, NMisc}</name>
       <fsummary>Called when the process is to perform a code change.</fsummary>
       <type>
@@ -628,7 +797,7 @@
     </func>
 
     <func>
-      <name>Module:system_continue(Parent, Debug, Misc) -> none()</name>
+      <name since="">Module:system_continue(Parent, Debug, Misc) -> none()</name>
       <fsummary>Called when the process is to continue its execution.</fsummary>
       <type>
         <v>Parent = pid()</v>
@@ -644,7 +813,7 @@
     </func>
 
     <func>
-      <name>Module:system_get_state(Misc) -> {ok, State}</name>
+      <name since="OTP 17.0">Module:system_get_state(Misc) -> {ok, State}</name>
       <fsummary>Called when the process is to return its current state.
       </fsummary>
       <type>
@@ -661,7 +830,7 @@
     </func>
 
     <func>
-      <name>Module:system_replace_state(StateFun, Misc) ->
+      <name since="OTP 17.0">Module:system_replace_state(StateFun, Misc) ->
         {ok, NState, NMisc}</name>
       <fsummary>Called when the process is to replace its current state.
       </fsummary>
@@ -681,7 +850,7 @@
     </func>
 
     <func>
-      <name>Module:system_terminate(Reason, Parent, Debug, Misc) -> none()</name>
+      <name since="">Module:system_terminate(Reason, Parent, Debug, Misc) -> none()</name>
       <fsummary>Called when the process is to terminate.</fsummary>
       <type>
         <v>Reason = term()</v>
diff --git a/lib/stdlib/doc/src/timer.xml b/lib/stdlib/doc/src/timer.xml
index e913e33589..165eecfbb0 100644
--- a/lib/stdlib/doc/src/timer.xml
+++ b/lib/stdlib/doc/src/timer.xml
@@ -32,7 +32,7 @@
     <rev>D</rev>
     <file>timer.xml</file>
   </header>
-  <module>timer</module>
+  <module since="">timer</module>
   <modulesummary>Timer functions.</modulesummary>
   <description>
     <p>This module provides useful functions related to time. Unless otherwise
@@ -62,7 +62,7 @@
 
   <funcs>
     <func>
-      <name name="apply_after" arity="4"/>
+      <name name="apply_after" arity="4" since=""/>
       <fsummary>Apply <c>Module:Function(Arguments)</c> after a specified
         <c>Time</c>.</fsummary>
       <desc>
@@ -75,7 +75,7 @@
     </func>
 
     <func>
-      <name name="apply_interval" arity="4"/>
+      <name name="apply_interval" arity="4" since=""/>
       <fsummary>Evaluate <c>Module:Function(Arguments)</c> repeatedly at
         intervals of <c>Time</c>.</fsummary>
       <desc>
@@ -88,7 +88,7 @@
     </func>
 
     <func>
-      <name name="cancel" arity="1"/>
+      <name name="cancel" arity="1" since=""/>
       <fsummary>Cancel a previously requested time-out identified by
         <c>TRef</c>.</fsummary>
       <desc>
@@ -101,8 +101,8 @@
     </func>
 
     <func>
-      <name name="exit_after" arity="2"/>
-      <name name="exit_after" arity="3"/>
+      <name name="exit_after" arity="2" since=""/>
+      <name name="exit_after" arity="3" since=""/>
       <fsummary>Send an exit signal with <c>Reason</c> after a specified
         <c>Time</c>.</fsummary>
       <desc>
@@ -117,7 +117,7 @@
     </func>
 
     <func>
-      <name name="hms" arity="3"/>
+      <name name="hms" arity="3" since=""/>
       <fsummary>Convert <c>Hours</c>+<c>Minutes</c>+<c>Seconds</c> to
         <c>Milliseconds</c>.</fsummary>
       <desc>
@@ -127,7 +127,7 @@
     </func>
 
     <func>
-      <name name="hours" arity="1"/>
+      <name name="hours" arity="1" since=""/>
       <fsummary>Convert <c>Hours</c> to <c>Milliseconds</c>.</fsummary>
       <desc>
         <p>Returns the number of milliseconds in <c><anno>Hours</anno></c>.</p>
@@ -135,8 +135,8 @@
     </func>
 
     <func>
-      <name name="kill_after" arity="1"/>
-      <name name="kill_after" arity="2"/>
+      <name name="kill_after" arity="1" since=""/>
+      <name name="kill_after" arity="2" since=""/>
       <fsummary>Send an exit signal with <c>Reason</c> after a specified
         <c>Time</c>.</fsummary>
       <desc>
@@ -148,7 +148,7 @@
     </func>
 
     <func>
-      <name name="minutes" arity="1"/>
+      <name name="minutes" arity="1" since=""/>
       <fsummary>Converts <c>Minutes</c> to <c>Milliseconds</c>.</fsummary>
       <desc>
         <p>Returns the number of milliseconds in
@@ -157,7 +157,7 @@
     </func>
 
     <func>
-      <name name="now_diff" arity="2"/>
+      <name name="now_diff" arity="2" since=""/>
       <fsummary>Calculate time difference between time stamps.</fsummary>
       <type_desc variable="Tdiff">In microseconds</type_desc>
       <desc>
@@ -173,7 +173,7 @@
     </func>
 
     <func>
-      <name name="seconds" arity="1"/>
+      <name name="seconds" arity="1" since=""/>
       <fsummary>Convert <c>Seconds</c> to <c>Milliseconds</c>.</fsummary>
       <desc>
         <p>Returns the number of milliseconds in
@@ -182,8 +182,8 @@
     </func>
 
     <func>
-      <name name="send_after" arity="2"/>
-      <name name="send_after" arity="3"/>
+      <name name="send_after" arity="2" since=""/>
+      <name name="send_after" arity="3" since=""/>
       <fsummary>Send <c>Message</c> to <c>Pid</c> after a specified
         <c>Time</c>.</fsummary>
       <desc>
@@ -206,8 +206,8 @@
     </func>
 
     <func>
-      <name name="send_interval" arity="2"/>
-      <name name="send_interval" arity="3"/>
+      <name name="send_interval" arity="2" since=""/>
+      <name name="send_interval" arity="3" since=""/>
       <fsummary>Send <c>Message</c> repeatedly at intervals of <c>Time</c>.
       </fsummary>
       <desc>
@@ -231,7 +231,7 @@
     </func>
 
     <func>
-      <name name="sleep" arity="1"/>
+      <name name="sleep" arity="1" since=""/>
       <fsummary>Suspend the calling process for <c>Time</c> milliseconds.
       </fsummary>
       <desc>
@@ -244,7 +244,7 @@
     </func>
 
     <func>
-      <name name="start" arity="0"/>
+      <name name="start" arity="0" since=""/>
       <fsummary>Start a global timer server (named <c>timer_server</c>).
       </fsummary>
       <desc>
@@ -258,9 +258,9 @@
     </func>
 
     <func>
-      <name name="tc" arity="1"/>
-      <name name="tc" arity="2"/>
-      <name name="tc" arity="3"/>
+      <name name="tc" arity="1" since="OTP R14B03"/>
+      <name name="tc" arity="2" since="OTP R14B"/>
+      <name name="tc" arity="3" since=""/>
       <fsummary>Measure the real time it takes to evaluate <c>apply(Module,
         Function, Arguments)</c> or <c>apply(Fun, Arguments)</c>.</fsummary>
       <type_desc variable="Time">In microseconds</type_desc>
diff --git a/lib/stdlib/doc/src/unicode.xml b/lib/stdlib/doc/src/unicode.xml
index d822aca89c..b7696a4b7e 100644
--- a/lib/stdlib/doc/src/unicode.xml
+++ b/lib/stdlib/doc/src/unicode.xml
@@ -30,7 +30,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>unicode</module>
+  <module since="">unicode</module>
   <modulesummary>Functions for converting Unicode characters.</modulesummary>
   <description>
   <p>This module contains functions for converting between different character 
@@ -139,7 +139,7 @@
 
   <funcs>
     <func>
-      <name name="bom_to_encoding" arity="1"/>
+      <name name="bom_to_encoding" arity="1" since=""/>
       <fsummary>Identify UTF byte order marks in a binary.</fsummary>
       <type name="endian"/>
       <type_desc variable="Bin">
@@ -156,7 +156,7 @@
     </func>
 
     <func>
-     <name name="characters_to_binary" arity="1"/>
+     <name name="characters_to_binary" arity="1" since=""/>
       <fsummary>Convert a collection of characters to a UTF-8 binary.</fsummary>
       <desc>
         <p>Same as <c>characters_to_binary(<anno>Data</anno>, unicode,
@@ -165,7 +165,7 @@
     </func>
 
     <func>    
-     <name name="characters_to_binary" arity="2"/>
+     <name name="characters_to_binary" arity="2" since=""/>
       <fsummary>Convert a collection of characters to a UTF-8 binary.</fsummary>
       <desc>
         <p>Same as <c>characters_to_binary(<anno>Data</anno>, 
@@ -174,7 +174,7 @@
     </func>
 
     <func>
-      <name name="characters_to_binary" arity="3"/>
+      <name name="characters_to_binary" arity="3" since=""/>
       <fsummary>Convert a collection of characters to a UTF-8 binary.</fsummary>
       <desc>
         <p>Behaves as <seealso marker="#characters_to_list/2">
@@ -211,7 +211,7 @@
     </func>
 
     <func>
-      <name name="characters_to_list" arity="1"/>
+      <name name="characters_to_list" arity="1" since=""/>
       <fsummary>Convert a collection of characters to a list of Unicode
         characters.</fsummary>
       <desc>
@@ -220,7 +220,7 @@
     </func>
 
     <func>
-      <name name="characters_to_list" arity="2"/>
+      <name name="characters_to_list" arity="2" since=""/>
       <fsummary>Convert a collection of characters to a list of Unicode
         characters.</fsummary>
       <desc>
@@ -367,7 +367,7 @@ decode_data(Data) ->
     </func>
 
     <func>
-      <name name="characters_to_nfc_list" arity="1"/>
+      <name name="characters_to_nfc_list" arity="1" since="OTP 20.0"/>
       <fsummary>Normalize characters to a list of canonical equivalent
       composed Unicode characters.</fsummary>
       <desc>
@@ -386,7 +386,7 @@ decode_data(Data) ->
     </func>
 
     <func>
-      <name name="characters_to_nfc_binary" arity="1"/>
+      <name name="characters_to_nfc_binary" arity="1" since="OTP 20.0"/>
       <fsummary>Normalize characters to a utf8 binary of canonical equivalent
       composed Unicode characters.</fsummary>
       <desc>
@@ -404,7 +404,7 @@ decode_data(Data) ->
     </func>
 
     <func>
-      <name name="characters_to_nfd_list" arity="1"/>
+      <name name="characters_to_nfd_list" arity="1" since="OTP 20.0"/>
       <fsummary>Normalize characters to a list of canonical equivalent
       decomposed Unicode characters.</fsummary>
       <desc>
@@ -423,7 +423,7 @@ decode_data(Data) ->
     </func>
 
     <func>
-      <name name="characters_to_nfd_binary" arity="1"/>
+      <name name="characters_to_nfd_binary" arity="1" since="OTP 20.0"/>
       <fsummary>Normalize characters to a utf8 binary of canonical equivalent
       decomposed Unicode characters.</fsummary>
       <desc>
@@ -441,7 +441,7 @@ decode_data(Data) ->
     </func>
 
     <func>
-      <name name="characters_to_nfkc_list" arity="1"/>
+      <name name="characters_to_nfkc_list" arity="1" since="OTP 20.0"/>
       <fsummary>Normalize characters to a list of canonical equivalent
       composed Unicode characters.</fsummary>
       <desc>
@@ -460,7 +460,7 @@ decode_data(Data) ->
     </func>
 
     <func>
-      <name name="characters_to_nfkc_binary" arity="1"/>
+      <name name="characters_to_nfkc_binary" arity="1" since="OTP 20.0"/>
       <fsummary>Normalize characters to a utf8 binary of compatibly equivalent
       composed Unicode characters.</fsummary>
       <desc>
@@ -478,7 +478,7 @@ decode_data(Data) ->
     </func>
 
     <func>
-      <name name="characters_to_nfkd_list" arity="1"/>
+      <name name="characters_to_nfkd_list" arity="1" since="OTP 20.0"/>
       <fsummary>Normalize characters to a list of compatibly equivalent
       decomposed Unicode characters.</fsummary>
       <desc>
@@ -497,7 +497,7 @@ decode_data(Data) ->
     </func>
 
     <func>
-      <name name="characters_to_nfkd_binary" arity="1"/>
+      <name name="characters_to_nfkd_binary" arity="1" since="OTP 20.0"/>
       <fsummary>Normalize characters to a utf8 binary of compatibly equivalent
       decomposed Unicode characters.</fsummary>
       <desc>
@@ -515,7 +515,7 @@ decode_data(Data) ->
     </func>
 
     <func>
-      <name name="encoding_to_bom" arity="1"/>
+      <name name="encoding_to_bom" arity="1" since=""/>
       <fsummary>Create a binary UTF byte order mark from encoding.</fsummary>
       <type_desc variable="Bin">
         A <c>binary()</c> such that <c>byte_size(<anno>Bin</anno>) >= 4</c>.
diff --git a/lib/stdlib/doc/src/uri_string.xml b/lib/stdlib/doc/src/uri_string.xml
index 88d4600611..ad443486c5 100644
--- a/lib/stdlib/doc/src/uri_string.xml
+++ b/lib/stdlib/doc/src/uri_string.xml
@@ -27,7 +27,7 @@
     <date>2018-02-07</date>
     <rev>A</rev>
   </header>
-  <module>uri_string</module>
+  <module since="OTP 21.0">uri_string</module>
   <modulesummary>URI processing functions.</modulesummary>
   <description>
     <p>This module contains functions for parsing and handling URIs
@@ -150,7 +150,7 @@
   <funcs>
 
     <func>
-      <name name="compose_query" arity="1"/>
+      <name name="compose_query" arity="1" since="OTP 21.0"/>
       <fsummary>Compose urlencoded query string.</fsummary>
       <desc>
         <p>Composes a form-urlencoded <c><anno>QueryString</anno></c> based on a
@@ -176,7 +176,7 @@
     </func>
 
     <func>
-      <name name="compose_query" arity="2"/>
+      <name name="compose_query" arity="2" since="OTP 21.0"/>
       <fsummary>Compose urlencoded query string.</fsummary>
       <desc>
         <p>Same as <c>compose_query/1</c> but with an additional
@@ -210,7 +210,7 @@
     </func>
 
     <func>
-      <name name="dissect_query" arity="1"/>
+      <name name="dissect_query" arity="1" since="OTP 21.0"/>
       <fsummary>Dissect query string.</fsummary>
       <desc>
         <p>Dissects an urlencoded <c><anno>QueryString</anno></c> and returns a
@@ -236,7 +236,7 @@
     </func>
 
     <func>
-      <name name="normalize" arity="1"/>
+      <name name="normalize" arity="1" since="OTP 21.0"/>
       <fsummary>Syntax-based normalization.</fsummary>
       <desc>
         <p>Transforms an <c><anno>URI</anno></c> into a normalized form
@@ -261,7 +261,7 @@
     </func>
 
     <func>
-      <name name="normalize" arity="2"/>
+      <name name="normalize" arity="2" since="OTP 21.0"/>
       <fsummary>Syntax-based normalization.</fsummary>
       <desc>
 	<p>Same as <c>normalize/1</c> but with an additional
@@ -285,7 +285,7 @@
     </func>
 
     <func>
-      <name name="parse" arity="1"/>
+      <name name="parse" arity="1" since="OTP 21.0"/>
       <fsummary>Parse URI into a map.</fsummary>
       <desc>
         <p>Parses an <url href="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986</url>
@@ -309,7 +309,7 @@
     </func>
 
     <func>
-      <name name="recompose" arity="1"/>
+      <name name="recompose" arity="1" since="OTP 21.0"/>
       <fsummary>Recompose URI.</fsummary>
       <desc>
         <p>Creates an <url href="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986</url> compliant
@@ -332,7 +332,7 @@
     </func>
 
     <func>
-      <name name="transcode" arity="2"/>
+      <name name="transcode" arity="2" since="OTP 21.0"/>
       <fsummary>Transcode URI.</fsummary>
       <desc>
         <p>Transcodes an <url href="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986</url>
diff --git a/lib/stdlib/doc/src/win32reg.xml b/lib/stdlib/doc/src/win32reg.xml
index f4a4fa1626..5e2aed6062 100644
--- a/lib/stdlib/doc/src/win32reg.xml
+++ b/lib/stdlib/doc/src/win32reg.xml
@@ -32,7 +32,7 @@
     <rev>PA1</rev>
     <file>win32reg.xml</file>
   </header>
-  <module>win32reg</module>
+  <module since="">win32reg</module>
   <modulesummary>Provides access to the registry on Windows.</modulesummary>
   <description>
     <p>This module provides read and write access to the
@@ -112,7 +112,7 @@ hkdd             HKEY_DYN_DATA</pre>
 
   <funcs>
     <func>
-      <name name="change_key" arity="2"/>
+      <name name="change_key" arity="2" since=""/>
       <fsummary>Move to a key in the registry.</fsummary>
       <desc>
         <p>Changes the current key to another key. Works like <c>cd</c>.
@@ -122,7 +122,7 @@ hkdd             HKEY_DYN_DATA</pre>
     </func>
 
     <func>
-      <name name="change_key_create" arity="2"/>
+      <name name="change_key_create" arity="2" since=""/>
       <fsummary>Move to a key, create it if it is not there.</fsummary>
       <desc>
         <p>Creates a key, or just changes to it, if it is already there. Works
@@ -133,7 +133,7 @@ hkdd             HKEY_DYN_DATA</pre>
     </func>
 
     <func>
-      <name name="close" arity="1"/>
+      <name name="close" arity="1" since=""/>
       <fsummary>Close the registry.</fsummary>
       <desc>
         <p>Closes the registry. After that, the <c><anno>RegHandle</anno></c>
@@ -142,7 +142,7 @@ hkdd             HKEY_DYN_DATA</pre>
     </func>
 
     <func>
-      <name name="current_key" arity="1"/>
+      <name name="current_key" arity="1" since=""/>
       <fsummary>Return the path to the current key.</fsummary>
       <desc>
         <p>Returns the path to the current key. This is the equivalent of
@@ -153,7 +153,7 @@ hkdd             HKEY_DYN_DATA</pre>
     </func>
 
     <func>
-      <name name="delete_key" arity="1"/>
+      <name name="delete_key" arity="1" since=""/>
       <fsummary>Delete the current key.</fsummary>
       <desc>
         <p>Deletes the current key, if it is valid. Calls the Win32 API
@@ -166,7 +166,7 @@ hkdd             HKEY_DYN_DATA</pre>
     </func>
 
     <func>
-      <name name="delete_value" arity="2"/>
+      <name name="delete_value" arity="2" since=""/>
       <fsummary>Delete the named value on the current key.</fsummary>
       <desc>
         <p>Deletes a named value on the current key. The atom <c>default</c> is
@@ -176,7 +176,7 @@ hkdd             HKEY_DYN_DATA</pre>
     </func>
 
     <func>
-      <name name="expand" arity="1"/>
+      <name name="expand" arity="1" since=""/>
       <fsummary>Expand a string with environment variables.</fsummary>
       <desc>
         <p>Expands a string containing environment variables between percent
@@ -189,7 +189,7 @@ hkdd             HKEY_DYN_DATA</pre>
     </func>
 
     <func>
-      <name name="format_error" arity="1"/>
+      <name name="format_error" arity="1" since=""/>
       <fsummary>Convert a POSIX error code to a string.</fsummary>
       <desc>
         <p>Converts a POSIX error code to a string
@@ -198,7 +198,7 @@ hkdd             HKEY_DYN_DATA</pre>
     </func>
 
     <func>
-      <name name="open" arity="1"/>
+      <name name="open" arity="1" since=""/>
       <fsummary>Open the registry for reading or writing.</fsummary>
       <desc>
         <p>Opens the registry for reading or writing. The current key is the
@@ -211,7 +211,7 @@ hkdd             HKEY_DYN_DATA</pre>
     </func>
 
     <func>
-      <name name="set_value" arity="3"/>
+      <name name="set_value" arity="3" since=""/>
       <fsummary>Set value at the current registry key with specified name.
       </fsummary>
       <desc>
@@ -230,7 +230,7 @@ hkdd             HKEY_DYN_DATA</pre>
     </func>
 
     <func>
-      <name name="sub_keys" arity="1"/>
+      <name name="sub_keys" arity="1" since=""/>
       <fsummary>Get subkeys to the current key.</fsummary>
       <desc>
         <p>Returns a list of subkeys to the current key. Calls the Win32
@@ -240,7 +240,7 @@ hkdd             HKEY_DYN_DATA</pre>
     </func>
 
     <func>
-      <name name="value" arity="2"/>
+      <name name="value" arity="2" since=""/>
       <fsummary>Get the named value on the current key.</fsummary>
       <desc>
         <p>Retrieves the named value (or default) on the current key.
@@ -251,7 +251,7 @@ hkdd             HKEY_DYN_DATA</pre>
     </func>
 
     <func>
-      <name name="values" arity="1"/>
+      <name name="values" arity="1" since=""/>
       <fsummary>Get all values on the current key.</fsummary>
       <desc>
         <p>Retrieves a list of all values on the current key. The values
diff --git a/lib/stdlib/doc/src/zip.xml b/lib/stdlib/doc/src/zip.xml
index 0b5eac1e16..bb2ed7727a 100644
--- a/lib/stdlib/doc/src/zip.xml
+++ b/lib/stdlib/doc/src/zip.xml
@@ -32,7 +32,7 @@
     <rev>PA1</rev>
     <file>zip.xml</file>
   </header>
-  <module>zip</module>
+  <module since="">zip</module>
   <modulesummary>Utility for reading and creating 'zip' archives.
   </modulesummary>
   <description>
@@ -180,7 +180,7 @@
 
   <funcs>
     <func>
-      <name name="foldl" arity="3"/>
+      <name name="foldl" arity="3" since="OTP R14B"/>
       <fsummary>Fold a function over all files in a zip archive.</fsummary>
       <desc>
         <p>Calls <c><anno>Fun</anno>(<anno>FileInArchive</anno>, <anno>GetInfo
@@ -234,10 +234,10 @@
     </func>
 
     <func>
-      <name name="list_dir" arity="1"/>
-      <name name="list_dir" arity="2"/>
-      <name name="table" arity="1" />
-      <name name="table" arity="2"/>
+      <name name="list_dir" arity="1" since=""/>
+      <name name="list_dir" arity="2" since=""/>
+      <name name="table" arity="1"  since=""/>
+      <name name="table" arity="2" since=""/>
       <fsummary>Retrieve the name of all files in a zip archive.</fsummary>
       <desc>
         <p><c>list_dir/1</c> retrieves all filenames in the zip archive
@@ -263,7 +263,7 @@
     </func>
 
     <func>
-      <name name="t" arity="1"/>
+      <name name="t" arity="1" since=""/>
       <fsummary>Print the name of each file in a zip archive.</fsummary>
       <desc>
         <p>Prints all filenames in the zip archive <c><anno>Archive</anno></c>
@@ -272,7 +272,7 @@
     </func>
 
     <func>
-      <name name="tt" arity="1"/>
+      <name name="tt" arity="1" since=""/>
       <fsummary>Print name and information for each file in a zip archive.
       </fsummary>
       <desc>
@@ -283,10 +283,10 @@
     </func>
 
     <func>
-      <name name="unzip" arity="1"/>
-      <name name="unzip" arity="2"/>
-      <name name="extract" arity="1"/>
-      <name name="extract" arity="2"/>
+      <name name="unzip" arity="1" since=""/>
+      <name name="unzip" arity="2" since=""/>
+      <name name="extract" arity="1" since=""/>
+      <name name="extract" arity="2" since=""/>
       <fsummary>Extract files from a zip archive.</fsummary>
       <desc>
         <p><c>unzip/1</c> extracts all files from a zip archive.</p>
@@ -353,10 +353,10 @@
     </func>
 
     <func>
-      <name name="zip" arity="2"/>
-      <name name="zip" arity="3"/>
-      <name name="create" arity="2"/>
-      <name name="create" arity="3"/>
+      <name name="zip" arity="2" since=""/>
+      <name name="zip" arity="3" since=""/>
+      <name name="create" arity="2" since=""/>
+      <name name="create" arity="3" since=""/>
       <fsummary>Create a zip archive with options.</fsummary>
       <desc>
         <p>Creates a zip archive containing the files specified in
@@ -481,7 +481,7 @@
     </func>
 
     <func>
-      <name name="zip_close" arity="1"/>
+      <name name="zip_close" arity="1" since=""/>
       <fsummary>Close an open archive.</fsummary>
       <desc>
         <p>Closes a zip archive, previously opened with
@@ -492,8 +492,8 @@
     </func>
 
     <func>
-      <name name="zip_get" arity="1"/>
-      <name name="zip_get" arity="2"/>
+      <name name="zip_get" arity="1" since=""/>
+      <name name="zip_get" arity="2" since=""/>
       <fsummary>Extract files from an open archive.</fsummary>
       <desc>
         <p>Extracts one or all files from an open archive.</p>
@@ -505,7 +505,7 @@
     </func>
 
     <func>
-      <name name="zip_list_dir" arity="1"/>
+      <name name="zip_list_dir" arity="1" since=""/>
       <fsummary>Return a table of files in open zip archive.</fsummary>
       <desc>
         <p>Returns the file list of an open zip archive. The first returned
@@ -514,8 +514,8 @@
     </func>
 
     <func>
-      <name name="zip_open" arity="1"/>
-      <name name="zip_open" arity="2"/>
+      <name name="zip_open" arity="1" since=""/>
+      <name name="zip_open" arity="2" since=""/>
       <fsummary>Open an archive and return a handle to it.</fsummary>
       <desc>
         <p>Opens a zip archive, and reads and saves its directory. This
diff --git a/lib/stdlib/include/assert.hrl b/lib/stdlib/include/assert.hrl
index 2ec89e7d8a..28d25c6589 100644
--- a/lib/stdlib/include/assert.hrl
+++ b/lib/stdlib/include/assert.hrl
@@ -140,7 +140,7 @@
 -endif.
 
 %% This is mostly a convenience which gives more detailed reports.
-%% Note: Guard is a guarded pattern, and can not be used for value.
+%% Note: Guard is a guarded pattern, and cannot be used for value.
 -ifdef(NOASSERT).
 -define(assertMatch(Guard, Expr), ok).
 -define(assertMatch(Guard, Expr, Comment), ok).
@@ -289,7 +289,7 @@
         end).
 -endif.
 
-%% Note: Class and Term are patterns, and can not be used for value.
+%% Note: Class and Term are patterns, and cannot be used for value.
 %% Term can be a guarded pattern, but Class cannot.
 -ifdef(NOASSERT).
 -define(assertException(Class, Term, Expr), ok).
@@ -364,7 +364,7 @@
         ?assertException(throw, Term, Expr, Comment)).
 
 %% This is the inverse case of assertException, for convenience.
-%% Note: Class and Term are patterns, and can not be used for value.
+%% Note: Class and Term are patterns, and cannot be used for value.
 %% Both Class and Term can be guarded patterns.
 -ifdef(NOASSERT).
 -define(assertNotException(Class, Term, Expr), ok).
diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile
index c95f7637f7..86003c953d 100644
--- a/lib/stdlib/src/Makefile
+++ b/lib/stdlib/src/Makefile
@@ -155,8 +155,10 @@ APPUP_TARGET= $(EBIN)/$(APPUP_FILE)
 
 ifeq ($(NATIVE_LIBS_ENABLED),yes)
 ERL_COMPILE_FLAGS += +native
+else
+ERL_COMPILE_FLAGS += -Werror
 endif
-ERL_COMPILE_FLAGS += -I../include -I../../kernel/include -Werror
+ERL_COMPILE_FLAGS += -I../include -I../../kernel/include
 
 # ----------------------------------------------------
 # Targets
diff --git a/lib/stdlib/src/array.erl b/lib/stdlib/src/array.erl
index 939b1fb488..1504326c61 100644
--- a/lib/stdlib/src/array.erl
+++ b/lib/stdlib/src/array.erl
@@ -126,11 +126,12 @@
 %% per write than base 10, but the speedup is only 21%.)
 
 -define(DEFAULT, undefined).
--define(LEAFSIZE, 10).		% the "base"
--define(NODESIZE, ?LEAFSIZE).   % (no reason to have a different size)
+-define(LEAFSIZE, 10).         % the "base" (assumed to be > 1)
+-define(NODESIZE, ?LEAFSIZE).  % must not be LEAFSIZE-1; keep same as leaf
 -define(NODEPATTERN(S), {_,_,_,_,_,_,_,_,_,_,S}). % NODESIZE+1 elements!
--define(NEW_NODE(S),  % beware of argument duplication!
-	setelement((?NODESIZE+1),erlang:make_tuple((?NODESIZE+1),(S)),(S))).
+-define(NEW_NODE(E,S),  % general case (currently unused)
+        setelement((?NODESIZE+1),erlang:make_tuple((?NODESIZE+1),(E)),(S))).
+-define(NEW_NODE(S), erlang:make_tuple((?NODESIZE+1),(S))).  % when E = S
 -define(NEW_LEAF(D), erlang:make_tuple(?LEAFSIZE,(D))).
 -define(NODELEAFS, ?NODESIZE*?LEAFSIZE).
 
@@ -605,7 +606,7 @@ grow(I, E, M) ->
     grow_1(I, E, M).
 
 grow_1(I, E, M) when I >= M ->
-    grow(I, setelement(1, ?NEW_NODE(M), E), ?extend(M));
+    grow_1(I, setelement(1, ?NEW_NODE(M), E), ?extend(M));
 grow_1(_I, E, M) ->
     {E, M}.
 
@@ -1631,12 +1632,11 @@ foldl_test_() ->
      ?_assert(foldl(Sum, 0, from_list(lists:seq(0,10))) =:= 55),
      ?_assert(foldl(Reverse, [], from_list(lists:seq(0,1000)))
 	      =:= lists:reverse(lists:seq(0,1000))),
-     ?_assert({999,[N0*100+1+2,N0*2+1+1,0]} =:= 
-	      foldl(Vals, {0,[]}, 
+     ?_assertEqual({N0*100+1-2,[N0*100+1+2,N0*2+1+1,0]},
+	      foldl(Vals, {0,[]},
 		    set(N0*100+1,2,
 			set(N0*2+1,1,
 			    set(0,0,new())))))
-     
     ].
 -endif.
 
@@ -1786,12 +1786,11 @@ foldr_test_() ->
      ?_assert(foldr(Sum, 0, from_list(lists:seq(0,10))) =:= 55),
      ?_assert(foldr(List, [], from_list(lists:seq(0,1000)))
  	      =:= lists:seq(0,1000)),
-     ?_assert({999,[0,N0*2+1+1,N0*100+1+2]} =:= 
-	      foldr(Vals, {0,[]}, 
+     ?_assertEqual({N0*100+1-2,[0,N0*2+1+1,N0*100+1+2]},
+	      foldr(Vals, {0,[]},
 		    set(N0*100+1,2,
 			set(N0*2+1,1,
 			    set(0,0,new())))))
-     
     ].
 -endif.
 
diff --git a/lib/stdlib/src/beam_lib.erl b/lib/stdlib/src/beam_lib.erl
index 3386cfcbe6..aa992f17ab 100644
--- a/lib/stdlib/src/beam_lib.erl
+++ b/lib/stdlib/src/beam_lib.erl
@@ -32,8 +32,12 @@
 	 all_chunks/1,
 	 diff_dirs/2,
 	 strip/1,
+	 strip/2,
 	 strip_files/1,
+	 strip_files/2,
 	 strip_release/1,
+	 strip_release/2,
+	 significant_chunks/0,
 	 build_module/1,
 	 version/1,
 	 md5/1,
@@ -188,7 +192,16 @@ diff_dirs(Dir1, Dir2) ->
       Beam2 :: beam().
 
 strip(FileName) ->
-    try strip_file(FileName)
+    strip(FileName, []).
+
+-spec strip(Beam1, AdditionalChunks) ->
+        {'ok', {module(), Beam2}} | {'error', 'beam_lib', info_rsn()} when
+      Beam1 :: beam(),
+      AdditionalChunks :: [chunkid()],
+      Beam2 :: beam().
+
+strip(FileName, AdditionalChunks) ->
+    try strip_file(FileName, AdditionalChunks)
     catch Error -> Error end.
     
 -spec strip_files(Files) ->
@@ -196,8 +209,17 @@ strip(FileName) ->
       Files :: [beam()],
       Beam :: beam().
 
-strip_files(Files) when is_list(Files) ->
-    try strip_fils(Files)
+strip_files(Files) ->
+    strip_files(Files, []).
+
+-spec strip_files(Files, AdditionalChunks) ->
+        {'ok', [{module(), Beam}]} | {'error', 'beam_lib', info_rsn()} when
+      Files :: [beam()],
+      AdditionalChunks :: [chunkid()],
+      Beam :: beam().
+
+strip_files(Files, AdditionalChunks) when is_list(Files) ->
+    try strip_fils(Files, AdditionalChunks)
     catch Error -> Error end.
 
 -spec strip_release(Dir) ->
@@ -207,7 +229,17 @@ strip_files(Files) when is_list(Files) ->
       Reason :: {'not_a_directory', term()} | info_rsn().
 
 strip_release(Root) ->
-    catch strip_rel(Root).
+    strip_release(Root, []).
+
+-spec strip_release(Dir, AdditionalChunks) ->
+        {'ok', [{module(), file:filename()}]}
+      | {'error', 'beam_lib', Reason} when
+      Dir :: atom() | file:filename(),
+      AdditionalChunks :: [chunkid()],
+      Reason :: {'not_a_directory', term()} | info_rsn().
+
+strip_release(Root, AdditionalChunks) ->
+    catch strip_rel(Root, AdditionalChunks).
 
 -spec version(Beam) ->
                      {'ok', {module(), [Version :: term()]}} |
@@ -401,17 +433,17 @@ cmp_lists([{Id, C1} | R1], [{Id, C2} | R2]) ->
 cmp_lists(_, _) ->
     error(different_chunks).
     
-strip_rel(Root) ->
+strip_rel(Root, AdditionalChunks) ->
     ok = assert_directory(Root),
-    strip_fils(filelib:wildcard(filename:join(Root, "lib/*/ebin/*.beam"))).
+    strip_fils(filelib:wildcard(filename:join(Root, "lib/*/ebin/*.beam")), AdditionalChunks).
 
 %% -> {ok, [{Mod, BinaryOrFileName}]} | throw(Error)
-strip_fils(Files) ->
-    {ok, [begin {ok, Reply} = strip_file(F), Reply end || F <- Files]}.
+strip_fils(Files, AdditionalChunks) ->
+    {ok, [begin {ok, Reply} = strip_file(F, AdditionalChunks), Reply end || F <- Files]}.
 
 %% -> {ok, {Mod, FileName}} | {ok, {Mod, binary()}} | throw(Error)
-strip_file(File) ->
-    {ok, {Mod, Chunks}} = read_significant_chunks(File, significant_chunks()),
+strip_file(File, AdditionalChunks) ->
+    {ok, {Mod, Chunks}} = read_significant_chunks(File, AdditionalChunks ++ significant_chunks()),
     {ok, Stripped0} = build_module(Chunks),
     Stripped = compress(Stripped0),
     case File of
diff --git a/lib/stdlib/src/calendar.erl b/lib/stdlib/src/calendar.erl
index bb5d450cd6..3a8fe2211b 100644
--- a/lib/stdlib/src/calendar.erl
+++ b/lib/stdlib/src/calendar.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. 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,13 +357,17 @@ rfc3339_to_system_time(DateTimeString) ->
 rfc3339_to_system_time(DateTimeString, Options) ->
     Unit = proplists:get_value(unit, Options, second),
     %% _T is the character separating the date and the time:
-    {DateStr, [_T|TimeStr]} = lists:split(10, DateTimeString),
-    {TimeStr2, TimeStr3} = lists:split(8, TimeStr),
-    {ok, [Hour, Min, Sec], []} = io_lib:fread("~d:~d:~d", TimeStr2),
-    {ok, [Year, Month, Day], []} = io_lib:fread("~d-~d-~d", DateStr),
+    [Y1, Y2, Y3, Y4, $-, Mon1, Mon2, $-, D1, D2, _T,
+     H1, H2, $:, Min1, Min2, $:, S1, S2 | TimeStr] = DateTimeString,
+    Hour = list_to_integer([H1, H2]),
+    Min = list_to_integer([Min1, Min2]),
+    Sec = list_to_integer([S1, S2]),
+    Year = list_to_integer([Y1, Y2, Y3, Y4]),
+    Month = list_to_integer([Mon1, Mon2]),
+    Day = list_to_integer([D1, D2]),
     DateTime = {{Year, Month, Day}, {Hour, Min, Sec}},
     IsFractionChar = fun(C) -> C >= $0 andalso C =< $9 orelse C =:= $. end,
-    {FractionStr, UtcOffset} = lists:splitwith(IsFractionChar, TimeStr3),
+    {FractionStr, UtcOffset} = lists:splitwith(IsFractionChar, TimeStr),
     Time = datetime_to_system_time(DateTime),
     Secs = Time - offset_adjustment(Time, second, UtcOffset),
     check(DateTimeString, Options, Secs),
@@ -451,8 +455,9 @@ system_time_to_rfc3339(Time, Options) ->
     DateTime = system_time_to_datetime(Secs),
     {{Year, Month, Day}, {Hour, Min, Sec}} = DateTime,
     FractionStr = fraction_str(Factor, AdjustedTime),
-    flat_fwrite("~4.10.0B-~2.10.0B-~2.10.0B~c~2.10.0B:~2.10.0B:~2.10.0B~s~s",
-                [Year, Month, Day, T, Hour, Min, Sec, FractionStr, Offset]).
+    L = [pad4(Year), "-", pad2(Month), "-", pad2(Day), [T],
+         pad2(Hour), ":", pad2(Min), ":", pad2(Sec), FractionStr, Offset],
+    lists:append(L).
 
 %% time_difference(T1, T2) = Tdiff
 %%
@@ -529,24 +534,41 @@ valid_date({Y, M, D}) ->
 
 %% day_to_year(DayOfEpoch) = {Year, DayOfYear}
 %%
-%% The idea here is to first guess a year, and then adjust. Although
-%% the implementation is recursive, at most 1 or 2 recursive steps
+%% The idea here is to first set the upper and lower bounds for a year,
+%% and then adjust a range by interpolation search. Although complexity
+%% of the algorithm is log(log(n)), at most 1 or 2 recursive steps
 %% are taken.
-%% If DayOfEpoch is very large, we need far more than 1 or 2 iterations,
-%% since we just subtract a yearful of days at a time until we're there.
 %%
 -spec day_to_year(non_neg_integer()) -> {year(), day_of_year()}.
 day_to_year(DayOfEpoch) when DayOfEpoch >= 0 ->
-    Y0 = DayOfEpoch div ?DAYS_PER_YEAR,
-    {Y1, D1} = dty(Y0, DayOfEpoch, dy(Y0)),
+    YMax = DayOfEpoch div ?DAYS_PER_YEAR,
+    YMin = DayOfEpoch div ?DAYS_PER_LEAP_YEAR,
+    {Y1, D1} = dty(YMin, YMax, DayOfEpoch, dy(YMin), dy(YMax)),
     {Y1, DayOfEpoch - D1}.
 
--spec dty(year(), non_neg_integer(), non_neg_integer()) ->
+-spec dty(year(), year(), non_neg_integer(), non_neg_integer(),
+    non_neg_integer()) ->
 		{year(), non_neg_integer()}.
-dty(Y, D1, D2) when D1 < D2 -> 
-    dty(Y-1, D1, dy(Y-1));
-dty(Y, _D1, D2) ->
-    {Y, D2}.
+dty(Min, Max, _D1, DMin, _DMax) when Min == Max ->
+    {Min, DMin};
+dty(Min, Max, D1, DMin, DMax) ->
+    Diff = Max - Min,
+    Mid = Min + (Diff * (D1 - DMin)) div (DMax - DMin),
+    MidLength =
+        case is_leap_year(Mid) of
+            true -> ?DAYS_PER_LEAP_YEAR;
+            false -> ?DAYS_PER_YEAR
+        end,
+    case dy(Mid) of
+        D2 when D1 < D2 ->
+            NewMax = Mid - 1,
+            dty(Min, NewMax, D1, DMin, dy(NewMax));
+        D2 when D1 - D2 >= MidLength ->
+            NewMin = Mid + 1,
+            dty(NewMin, Max, D1, dy(NewMin), DMax);
+        D2 ->
+            {Mid, D2}
+    end.
 
 %%
 %% The Gregorian days of the iso week 01 day 1 for a given year.
@@ -663,7 +685,7 @@ offset(OffsetOption, Secs0) when OffsetOption =:= "";
     Secs = abs(Secs0),
     Hour = Secs div 3600,
     Min = (Secs rem 3600) div 60,
-    io_lib:fwrite("~c~2.10.0B:~2.10.0B", [Sign, Hour, Min]);
+    [Sign | lists:append([pad2(Hour), ":", pad2(Min)])];
 offset(OffsetOption, _Secs) ->
     OffsetOption.
 
@@ -678,8 +700,10 @@ offset_string_adjustment(_Time, _Unit, "Z") ->
     0;
 offset_string_adjustment(_Time, _Unit, "z") ->
     0;
-offset_string_adjustment(_Time, _Unit, [Sign|Tz]) ->
-    {ok, [Hour, Min], []} = io_lib:fread("~d:~d", Tz),
+offset_string_adjustment(_Time, _Unit, Tz) ->
+    [Sign, H1, H2, $:, M1, M2] = Tz,
+    Hour = list_to_integer([H1, H2]),
+    Min = list_to_integer([M1, M2]),
     Adjustment = 3600 * Hour + 60 * Min,
     case Sign of
         $- -> -Adjustment;
@@ -687,8 +711,9 @@ offset_string_adjustment(_Time, _Unit, [Sign|Tz]) ->
     end.
 
 local_offset(SystemTime, Unit) ->
-    LocalTime = system_time_to_local_time(SystemTime, Unit),
+    %% Not optimized for special cases.
     UniversalTime = system_time_to_universal_time(SystemTime, Unit),
+    LocalTime = erlang:universaltime_to_localtime(UniversalTime),
     LocalSecs = datetime_to_gregorian_seconds(LocalTime),
     UniversalSecs = datetime_to_gregorian_seconds(UniversalTime),
     LocalSecs - UniversalSecs.
@@ -697,7 +722,8 @@ fraction_str(1, _Time) ->
     "";
 fraction_str(Factor, Time) ->
     Fraction = Time rem Factor,
-    io_lib:fwrite(".~*..0B", [log10(Factor), abs(Fraction)]).
+    S = integer_to_list(abs(Fraction)),
+    [$. | pad(log10(Factor) - length(S), S)].
 
 fraction(second, _) ->
     0;
@@ -718,5 +744,21 @@ log10(1000) -> 3;
 log10(1000000) -> 6;
 log10(1000000000) -> 9.
 
-flat_fwrite(F, S) ->
-    lists:flatten(io_lib:fwrite(F, S)).
+pad(0, S) ->
+    S;
+pad(I, S) ->
+    [$0 | pad(I - 1, S)].
+
+pad2(N) when N < 10 ->
+    [$0 | integer_to_list(N)];
+pad2(N) ->
+    integer_to_list(N).
+
+pad4(N) when N < 10 ->
+    [$0, $0, $0 | integer_to_list(N)];
+pad4(N) when N < 100 ->
+    [$0, $0 | integer_to_list(N)];
+pad4(N) when N < 1000 ->
+    [$0 | integer_to_list(N)];
+pad4(N) ->
+    integer_to_list(N).
diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl
index e0cd68617b..0cd0aef124 100644
--- a/lib/stdlib/src/erl_lint.erl
+++ b/lib/stdlib/src/erl_lint.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. 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.
@@ -79,6 +79,8 @@ value_option(Flag, Default, On, OnVal, Off, OffVal, Opts) ->
 -type fa()   :: {atom(), arity()}.   % function+arity
 -type ta()   :: {atom(), arity()}.   % type+arity
 
+-type module_or_mfa() :: module() | mfa().
+
 -record(typeinfo, {attr, line}).
 
 %% Usage of records, functions, and imports. The variable table, which
@@ -115,6 +117,8 @@ value_option(Flag, Default, On, OnVal, Off, OffVal, Opts) ->
                    :: erl_anno:anno(),
 	       clashes=[],			%Exported functions named as BIFs
                not_deprecated=[],               %Not considered deprecated
+               not_removed=gb_sets:empty()      %Not considered removed
+                   :: gb_sets:set(module_or_mfa()),
                func=[],                         %Current function
                warn_format=0,                   %Warn format calls
 	       enabled_warnings=[],		%All enabled warnings (ordset).
@@ -382,6 +386,8 @@ format_error({redefine_callback, {F, A}}) ->
 format_error({bad_callback, {M, F, A}}) ->
     io_lib:format("explicit module not allowed for callback ~tw:~tw/~w",
                   [M, F, A]);
+format_error({bad_module, {M, F, A}}) ->
+    io_lib:format("spec for function ~w:~tw/~w from other module", [M, F, A]);
 format_error({spec_fun_undefined, {F, A}}) ->
     io_lib:format("spec for undefined function ~tw/~w", [F, A]);
 format_error({missing_spec, {F,A}}) ->
@@ -573,7 +579,10 @@ start(File, Opts) ->
 		      false, Opts)},
 	 {missing_spec_all,
 	  bool_option(warn_missing_spec_all, nowarn_missing_spec_all,
-		      false, Opts)}
+		      false, Opts)},
+         {removed,
+          bool_option(warn_removed, nowarn_removed,
+                      true, Opts)}
 	],
     Enabled1 = [Category || {Category,true} <- Enabled0],
     Enabled = ordsets:from_list(Enabled1),
@@ -670,8 +679,9 @@ forms(Forms0, St0) ->
 						    no_auto = AutoImportSuppressed}),
     St2 = bif_clashes(Forms, St1),
     St3 = not_deprecated(Forms, St2),
-    St4 = foldl(fun form/2, pre_scan(Forms, St3), Forms),
-    post_traversal_check(Forms, St4).
+    St4 = not_removed(Forms, St3),
+    St5 = foldl(fun form/2, pre_scan(Forms, St4), Forms),
+    post_traversal_check(Forms, St5).
 
 pre_scan([{attribute,L,compile,C} | Fs], St) ->
     case is_warn_enabled(export_all, St) andalso
@@ -831,19 +841,39 @@ bif_clashes(Forms, #lint{nowarn_bif_clash=Nowarn} = St) ->
 
 %% not_deprecated(Forms, State0) -> State
 
-not_deprecated(Forms, St0) ->
+not_deprecated(Forms, #lint{compile=Opts}=St0) ->
     %% There are no line numbers in St0#lint.compile.
     MFAsL = [{MFA,L} ||
                 {attribute, L, compile, Args} <- Forms,
                 {nowarn_deprecated_function, MFAs0} <- lists:flatten([Args]),
                 MFA <- lists:flatten([MFAs0])],
-    Nowarn = [MFA || {MFA,_L} <- MFAsL],
+    Nowarn = [MFA ||
+                 {nowarn_deprecated_function, MFAs0} <- Opts,
+                 MFA <- lists:flatten([MFAs0])],
     ML = [{M,L} || {{M,_F,_A},L} <- MFAsL, is_atom(M)],
     St1 = foldl(fun ({M,L}, St2) ->
                         check_module_name(M, L, St2)
                 end, St0, ML),
     St1#lint{not_deprecated = ordsets:from_list(Nowarn)}.
 
+%% not_removed(Forms, State0) -> State
+
+not_removed(Forms, #lint{compile=Opts}=St0) ->
+    %% There are no line numbers in St0#lint.compile.
+    MFAsL = [{MFA,L} ||
+                {attribute, L, compile, Args} <- Forms,
+                {nowarn_removed, MFAs0} <- lists:flatten([Args]),
+                MFA <- lists:flatten([MFAs0])],
+    Nowarn = [MFA ||
+                 {nowarn_removed, MFAs0} <- Opts,
+                 MFA <- lists:flatten([MFAs0])],
+    St1 = foldl(fun ({{M, _F, _A}, L}, St2) ->
+                        check_module_name(M, L, St2);
+                    ({M,L}, St2) ->
+                        check_module_name(M, L, St2)
+                end, St0, MFAsL),
+    St1#lint{not_removed = gb_sets:from_list(Nowarn)}.
+
 %% The nowarn_bif_clash directive is not only deprecated, it's actually an error from R14A
 disallowed_compile_flags(Forms, St0) ->
     %% There are (still) no line numbers in St0#lint.compile.
@@ -2248,6 +2278,9 @@ expr({'fun',Line,Body}, Vt, St) ->
     case Body of
         {clauses,Cs} ->
             fun_clauses(Cs, Vt, St);
+        {function,record_info,2} ->
+            %% It is illegal to call record_info/2 with unknown arguments.
+            {[],add_error(Line, illegal_record_info, St)};
         {function,F,A} ->
 	    %% BifClash - Fun expression
             %% N.B. Only allows BIFs here as well, NO IMPORTS!!
@@ -2979,7 +3012,13 @@ spec_decl(Line, MFA0, TypeSpecs, St00 = #lint{specs = Specs, module = Mod}) ->
     St1 = St0#lint{specs = dict:store(MFA, Line, Specs)},
     case dict:is_key(MFA, Specs) of
 	true -> add_error(Line, {redefine_spec, MFA0}, St1);
-	false -> check_specs(TypeSpecs, spec_wrong_arity, Arity, St1)
+	false ->
+            case MFA of
+                {Mod, _, _} ->
+                    check_specs(TypeSpecs, spec_wrong_arity, Arity, St1);
+                _ ->
+                    add_error(Line, {bad_module, MFA}, St1)
+            end
     end.
 
 %% callback_decl(Line, Fun, Types, State) -> State.
@@ -3767,13 +3806,23 @@ deprecated_function(Line, M, F, As, St) ->
 		    add_warning(Line, {deprecated, MFA, Replacement, Rel}, St)
             end;
 	{removed, String} when is_list(String) ->
-	    add_warning(Line, {removed, MFA, String}, St);
+	    add_removed_warning(Line, MFA, {removed, MFA, String}, St);
 	{removed, Replacement, Rel} ->
-	    add_warning(Line, {removed, MFA, Replacement, Rel}, St);
+	    add_removed_warning(Line, MFA, {removed, MFA, Replacement, Rel}, St);
         no ->
 	    St
     end.
 
+add_removed_warning(Line, {M, _, _}=MFA, Warning, #lint{not_removed=NotRemoved}=St) ->
+    case is_warn_enabled(removed, St) andalso
+        not gb_sets:is_element(M, NotRemoved) andalso
+        not gb_sets:is_element(MFA, NotRemoved) of
+        true ->
+            add_warning(Line, Warning, St);
+        false ->
+            St
+    end.
+
 -dialyzer({no_match, deprecated_type/5}).
 
 deprecated_type(L, M, N, As, St) ->
diff --git a/lib/stdlib/src/erl_parse.yrl b/lib/stdlib/src/erl_parse.yrl
index 9602f0bcd9..4ad94f2507 100644
--- a/lib/stdlib/src/erl_parse.yrl
+++ b/lib/stdlib/src/erl_parse.yrl
@@ -841,7 +841,7 @@ Erlang code.
 -type af_record_field(T) :: {'record_field', anno(), af_field_name(), T}.
 
 -type af_map_pattern() ::
-        {'map', anno(), [af_assoc_exact(abstract_expr)]}.
+        {'map', anno(), [af_assoc_exact(abstract_expr())]}.
 
 -type abstract_type() :: af_annotated_type()
                        | af_atom()
@@ -872,7 +872,7 @@ Erlang code.
 -type af_fun_type() :: {'type', anno(), 'fun', []}
                      | {'type', anno(), 'fun', [{'type', anno(), 'any'} |
                                                 abstract_type()]}
-                     | {'type', anno(), 'fun', af_function_type()}.
+                     | af_function_type().
 
 -type af_integer_range_type() ::
         {'type', anno(), 'range', [af_singleton_integer_type()]}.
@@ -924,10 +924,11 @@ Erlang code.
 -type af_function_constraint() :: [af_constraint()].
 
 -type af_constraint() :: {'type', anno(), 'constraint',
-                          af_lit_atom('is_subtype'),
-                          [af_type_variable() | abstract_type()]}. % [V, T]
+                          [af_lit_atom('is_subtype') |
+                           [af_type_variable() | abstract_type()]]}. % [IsSubtype, [V, T]]
 
 -type af_singleton_integer_type() :: af_integer()
+                                   | af_character()
                                    | af_unary_op(af_singleton_integer_type())
                                    | af_binary_op(af_singleton_integer_type()).
 
diff --git a/lib/stdlib/src/erl_posix_msg.erl b/lib/stdlib/src/erl_posix_msg.erl
index 8959fea498..b9ed4a3a9d 100644
--- a/lib/stdlib/src/erl_posix_msg.erl
+++ b/lib/stdlib/src/erl_posix_msg.erl
@@ -81,9 +81,9 @@ message_1(el2hlt) -> <<"level 2 halted">>;
 message_1(el2nsync) -> <<"level 2 not synchronized">>;
 message_1(el3hlt) -> <<"level 3 halted">>;
 message_1(el3rst) -> <<"level 3 reset">>;
-message_1(elibacc) -> <<"can not access a needed shared library">>;
+message_1(elibacc) -> <<"cannot access a needed shared library">>;
 message_1(elibbad) -> <<"accessing a corrupted shared library">>;
-message_1(elibexec) -> <<"can not exec a shared library directly">>;
+message_1(elibexec) -> <<"cannot exec a shared library directly">>;
 message_1(elibmax) ->
     <<"attempting to link in more shared libraries than system limit">>;
 message_1(elibscn) -> <<".lib section in a.out corrupted">>;
diff --git a/lib/stdlib/src/erl_pp.erl b/lib/stdlib/src/erl_pp.erl
index dd302a2880..255c0ae81f 100644
--- a/lib/stdlib/src/erl_pp.erl
+++ b/lib/stdlib/src/erl_pp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. 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,7 +26,7 @@
          attribute/1,attribute/2,function/1,function/2,
          guard/1,guard/2,exprs/1,exprs/2,exprs/3,expr/1,expr/2,expr/3,expr/4]).
 
--import(lists, [append/1,foldr/3,mapfoldl/3,reverse/1,reverse/2]).
+-import(lists, [append/1,foldr/3,map/2,mapfoldl/3,reverse/1,reverse/2]).
 -import(io_lib, [write/1,format/2]).
 -import(erl_parse, [inop_prec/1,preop_prec/1,func_prec/0,max_prec/0,
                     type_inop_prec/1, type_preop_prec/1]).
@@ -41,10 +41,11 @@
                                    io_lib:chars())).
 
 -type(option() :: {hook, hook_function()}
-                | {encoding, latin1 | unicode | utf8}).
+                | {encoding, latin1 | unicode | utf8}
+                | {quote_singleton_atom_types, boolean()}).
 -type(options() :: hook_function() | [option()]).
 
--record(pp, {value_fun, string_fun, char_fun}).
+-record(pp, {value_fun, singleton_atom_type_fun, string_fun, char_fun}).
 
 -record(options, {hook, encoding, opts}).
 
@@ -206,22 +207,43 @@ options(Hook) ->
     #options{hook = Hook, encoding = encoding([]), opts = Hook}.
 
 state(Options) when is_list(Options) ->
+    Quote = proplists:get_bool(quote_singleton_atom_types, Options),
     case encoding(Options) of
-        latin1 -> state();
-        unicode -> unicode_state()
+        latin1 -> latin1_state(Quote);
+        unicode -> unicode_state(Quote)
     end;
 state(_Hook) ->
-    state().
+    latin1_state(false).
 
-state() ->
+latin1_state(Quote) ->
     Options = [{encoding,latin1}],
-    #pp{value_fun  = fun(V) -> io_lib_pretty:print(V, Options) end,
+    ValueFun = fun(V) -> io_lib_pretty:print(V, Options) end,
+    SingletonFun =
+        case Quote of
+            true ->
+                fun(A) ->
+                        io_lib:write_string_as_latin1(atom_to_list(A), $')
+                end; %'
+            false ->
+                ValueFun
+        end,
+    #pp{value_fun  = ValueFun,
+        singleton_atom_type_fun = SingletonFun,
         string_fun = fun io_lib:write_string_as_latin1/1,
         char_fun   = fun io_lib:write_char_as_latin1/1}.
 
-unicode_state() ->
+unicode_state(Quote) ->
     Options = [{encoding,unicode}],
-    #pp{value_fun  = fun(V) -> io_lib_pretty:print(V, Options) end,
+    ValueFun = fun(V) -> io_lib_pretty:print(V, Options) end,
+    SingletonFun =
+        case Quote of
+            true ->
+                fun(A) -> io_lib:write_string(atom_to_list(A), $') end; %'
+            false ->
+                ValueFun
+        end,
+    #pp{value_fun = ValueFun,
+        singleton_atom_type_fun = SingletonFun,
         string_fun = fun io_lib:write_string/1,
         char_fun   = fun io_lib:write_char/1}.
 
@@ -350,7 +372,7 @@ ltype({user_type,Line,T,Ts}, _) ->
 ltype({remote_type,Line,[M,F,Ts]}, _) ->
     simple_type({remote,Line,M,F}, Ts);
 ltype({atom,_,T}, _) ->
-    {atom,T};
+    {singleton_atom_type,T};
 ltype(E, P) ->
     lexpr(E, P, options(none)).
 
@@ -360,7 +382,12 @@ binary_type(I1, I2) ->
     P = max_prec(),
     E1 = [[leaf("_:"),lexpr(I1, P, options(none))] || B],
     E2 = [[leaf("_:_*"),lexpr(I2, P, options(none))] || U],
-    {seq,'<<','>>',[$,],E1++E2}.
+    case E1++E2 of
+        [] ->
+            leaf("<<>>");
+        Es ->
+            {seq,'<<','>>',[$,],Es}
+    end.
 
 map_type(Fs) ->
     {first,[$#],map_pair_types(Fs)}.
@@ -386,6 +413,8 @@ typed(B, Type) ->
     {_L,_P,R} = type_inop_prec('::'),
     {list,[{cstep,[B,' ::'],ltype(Type, R)}]}.
 
+tuple_type([], _) ->
+    leaf("{}");
 tuple_type(Ts, F) ->
     {seq,${,$},[$,],ltypes(Ts, F, 0)}.
 
@@ -454,7 +483,7 @@ pname(A) when is_atom(A) ->
     write(A).
 
 falist([]) ->
-    [leaf("[]")];
+    ['[]'];
 falist(Falist) ->
     L = [begin
              {Name,Arity} = Fa,
@@ -562,22 +591,22 @@ lexpr({map, _, Map, Fs}, Prec, Opts) ->
     El = {first,[Rl,$#],map_fields(Fs, Opts)},
     maybe_paren(P, Prec, El);
 lexpr({block,_,Es}, _, Opts) ->
-    {list,[{step,'begin',body(Es, Opts)},'end']};
+    {list,[{step,'begin',body(Es, Opts)},{reserved,'end'}]};
 lexpr({'if',_,Cs}, _, Opts) ->
-    {list,[{step,'if',if_clauses(Cs, Opts)},'end']};
+    {list,[{step,'if',if_clauses(Cs, Opts)},{reserved,'end'}]};
 lexpr({'case',_,Expr,Cs}, _, Opts) ->
-    {list,[{step,{list,[{step,'case',lexpr(Expr, Opts)},'of']},
+    {list,[{step,{list,[{step,'case',lexpr(Expr, Opts)},{reserved,'of'}]},
             cr_clauses(Cs, Opts)},
-           'end']};
+           {reserved,'end'}]};
 lexpr({'cond',_,Cs}, _, Opts) ->
-    {list,[{step,leaf("cond"),cond_clauses(Cs, Opts)},'end']};
+    {list,[{step,leaf("cond"),cond_clauses(Cs, Opts)},{reserved,'end'}]};
 lexpr({'receive',_,Cs}, _, Opts) ->
-    {list,[{step,'receive',cr_clauses(Cs, Opts)},'end']};
+    {list,[{step,'receive',cr_clauses(Cs, Opts)},{reserved,'end'}]};
 lexpr({'receive',_,Cs,To,ToOpt}, _, Opts) ->
     Al = {list,[{step,[lexpr(To, Opts),' ->'],body(ToOpt, Opts)}]},
     {list,[{step,'receive',cr_clauses(Cs, Opts)},
            {step,'after',Al},
-           'end']};
+           {reserved,'end'}]};
 lexpr({'fun',_,{function,F,A}}, _Prec, _Opts) ->
     [leaf("fun "),{atom,F},leaf(format("/~w", [A]))];
 lexpr({'fun',L,{function,_,_}=Func,Extra}, Prec, Opts) ->
@@ -596,15 +625,17 @@ lexpr({'fun',_,{function,M,F,A}}, _Prec, Opts) ->
     ArityItem = lexpr(A, Opts),
     ["fun ",NameItem,$:,CallItem,$/,ArityItem];
 lexpr({'fun',_,{clauses,Cs}}, _Prec, Opts) ->
-    {list,[{first,'fun',fun_clauses(Cs, Opts, unnamed)},'end']};
+    {list,[{first,'fun',fun_clauses(Cs, Opts, unnamed)},{reserved,'end'}]};
 lexpr({named_fun,_,Name,Cs}, _Prec, Opts) ->
-    {list,[{first,['fun', " "],fun_clauses(Cs, Opts, {named, Name})},'end']};
+    {list,[{first,['fun', " "],fun_clauses(Cs, Opts, {named, Name})},
+           {reserved,'end'}]};
 lexpr({'fun',_,{clauses,Cs},Extra}, _Prec, Opts) ->
     {force_nl,fun_info(Extra),
-     {list,[{first,'fun',fun_clauses(Cs, Opts, unnamed)},'end']}};
+     {list,[{first,'fun',fun_clauses(Cs, Opts, unnamed)},{reserved,'end'}]}};
 lexpr({named_fun,_,Name,Cs,Extra}, _Prec, Opts) ->
     {force_nl,fun_info(Extra),
-     {list,[{first,['fun', " "],fun_clauses(Cs, Opts, {named, Name})},'end']}};
+     {list,[{first,['fun', " "],fun_clauses(Cs, Opts, {named, Name})},
+            {reserved,'end'}]}};
 lexpr({call,_,{remote,_,{atom,_,M},{atom,_,F}=N}=Name,Args}, Prec, Opts) ->
     case erl_internal:bif(M, F, length(Args)) of
         true ->
@@ -619,7 +650,7 @@ lexpr({'try',_,Es,Scs,Ccs,As}, _, Opts) ->
                Scs =:= [] ->
                    {step,'try',body(Es, Opts)};
                true ->
-                   {step,{list,[{step,'try',body(Es, Opts)},'of']},
+                   {step,{list,[{step,'try',body(Es, Opts)},{reserved,'of'}]},
                     cr_clauses(Scs, Opts)}
            end,
            if
@@ -634,7 +665,7 @@ lexpr({'try',_,Es,Scs,Ccs,As}, _, Opts) ->
                true ->
                    {step,'after',body(As, Opts)}
            end,
-           'end']};
+           {reserved,'end'}]};
 lexpr({'catch',_,Expr}, Prec, Opts) ->
     {P,R} = preop_prec('catch'),
     El = {list,[{step,'catch',lexpr(Expr, R, Opts)}]},
@@ -647,7 +678,7 @@ lexpr({match,_,Lhs,Rhs}, Prec, Opts) ->
     maybe_paren(P, Prec, El);
 lexpr({op,_,Op,Arg}, Prec, Opts) ->
     {P,R} = preop_prec(Op),
-    Ol = leaf(format("~s ", [Op])),
+    Ol = {reserved, leaf(format("~s ", [Op]))},
     El = [Ol,lexpr(Arg, R, Opts)],
     maybe_paren(P, Prec, El);
 lexpr({op,_,Op,Larg,Rarg}, Prec, Opts)  when Op =:= 'orelse';
@@ -655,14 +686,14 @@ lexpr({op,_,Op,Larg,Rarg}, Prec, Opts)  when Op =:= 'orelse';
     %% Breaks lines since R12B.
     {L,P,R} = inop_prec(Op),
     Ll = lexpr(Larg, L, Opts),
-    Ol = leaf(format("~s", [Op])),
+    Ol = {reserved, leaf(format("~s", [Op]))},
     Lr = lexpr(Rarg, R, Opts),
     El = {prefer_nl,[[]],[Ll,Ol,Lr]},
     maybe_paren(P, Prec, El);
 lexpr({op,_,Op,Larg,Rarg}, Prec, Opts) ->
     {L,P,R} = inop_prec(Op),
     Ll = lexpr(Larg, L, Opts),
-    Ol = leaf(format("~s", [Op])),
+    Ol = {reserved, leaf(format("~s", [Op]))},
     Lr = lexpr(Rarg, R, Opts),
     El = {list,[Ll,Ol,Lr]},
     maybe_paren(P, Prec, El);
@@ -697,6 +728,8 @@ fun_info(Extra) ->
 
 %% BITS:
 
+bit_grp([], _Opts) ->
+    leaf("<<>>");
 bit_grp(Fs, Opts) ->
     append([['<<'], [bit_elems(Fs, Opts)], ['>>']]).
 
@@ -880,16 +913,18 @@ lc_qual(Q, Opts) ->
     lexpr(Q, 0, Opts).
 
 proper_list(Es, Opts) ->
-    {seq,$[,$],$,,lexprs(Es, Opts)}.
+    {seq,$[,$],[$,],lexprs(Es, Opts)}.
 
 improper_list(Es, Opts) ->
-    {seq,$[,$],{$,,$|},lexprs(Es, Opts)}.
+    {seq,$[,$],[{$,,' |'}],lexprs(Es, Opts)}.
 
 tuple(L, Opts) ->
     tuple(L, fun lexpr/2, Opts).
 
+tuple([], _F, _Opts) ->
+    leaf("{}");
 tuple(Es, F, Opts) ->
-    {seq,${,$},$,,lexprs(Es, F, Opts)}.
+    {seq,${,$},[$,],lexprs(Es, F, Opts)}.
 
 args(As, Opts) ->
     {seq,$(,$),[$,],lexprs(As, Opts)}.
@@ -937,6 +972,7 @@ frmt(Item, I, PP) ->
 %%% - {prefer_nl,Sep,IPs}: forces linebreak between Is unlesss negative
 %%%   indentation.
 %%% - {atom,A}: an atom
+%%% - {singleton_atom_type,A}: an singleton atom type
 %%% - {char,C}: a character
 %%% - {string,S}: a string.
 %%% - {value,T}: a term.
@@ -981,8 +1017,10 @@ f({seq,Before,After,Sep,LItems}, I0, ST, WT, PP) ->
                     end,
             {BCharsL++Chars,Size};
         no ->
-            {BCharsL++insert_newlines(CharsSizeL, I, ST),
-             nsz(lists:last(Sizes), I0)}
+            CharsList = handle_step(CharsSizeL, I, ST),
+            {LChars, LSize} =
+                maybe_newlines(CharsList, LItems, I, NSepChars, ST),
+            {[BCharsL,LChars],nsz(LSize, I0)}
     end;
 f({force_nl,_ExtraInfoItem,Item}, I, ST, WT, PP) when I < 0 ->
     %% Extra info is a comment; cannot have that on the same line
@@ -998,23 +1036,28 @@ f({prefer_nl,Sep,LItems}, I0, ST, WT, PP) ->
         Sizes =:= [] ->
             {[], 0};
         true ->
-            {insert_newlines(CharsSize2L, I0, ST),nsz(lists:last(Sizes), I0)}
+            {insert_newlines(CharsSize2L, I0, ST),
+             nsz(lists:last(Sizes), I0)}
     end;
 f({value,V}, I, ST, WT, PP) ->
     f(write_a_value(V, PP), I, ST, WT, PP);
 f({atom,A}, I, ST, WT, PP) ->
     f(write_an_atom(A, PP), I, ST, WT, PP);
+f({singleton_atom_type,A}, I, ST, WT, PP) ->
+    f(write_a_singleton_atom_type(A, PP), I, ST, WT, PP);
 f({char,C}, I, ST, WT, PP) ->
     f(write_a_char(C, PP), I, ST, WT, PP);
 f({string,S}, I, ST, WT, PP) ->
     f(write_a_string(S, I, PP), I, ST, WT, PP);
+f({reserved,R}, I, ST, WT, PP) ->
+    f(R, I, ST, WT, PP);
 f({hook,HookExpr,Precedence,Func,Options}, I, _ST, _WT, _PP) ->
     Chars = Func(HookExpr, I, Precedence, Options),
     {Chars,indentation(Chars, I)};
 f({ehook,HookExpr,Precedence,{Mod,Func,Eas}=ModFuncEas}, I, _ST, _WT, _PP) ->
     Chars = apply(Mod, Func, [HookExpr,I,Precedence,ModFuncEas|Eas]),
     {Chars,indentation(Chars, I)};
-f(WordName, _I, _ST, WT, _PP) -> % when is_atom(WordName)
+f(WordName, _I, _ST, WT, _PP) when is_atom(WordName) ->
     word(WordName, WT).
 
 -define(IND, 4).
@@ -1036,12 +1079,18 @@ fl(CItems, Sep0, I0, After, ST, WT, PP) ->
                     true ->
                         [CharSize1,f([Item2,S], incr(I0, ?IND), ST, WT, PP)]
                 end;
+           ({reserved,Word}, S) ->
+                [f([Word,S], I0, ST, WT, PP),{[],0}];
            (Item, S) ->
                 [f([Item,S], I0, ST, WT, PP),{[],0}]
         end,
-    {Sep,LastSep}  = case Sep0 of {_,_} -> Sep0; _ -> {Sep0,Sep0} end,
+    {Sep,LastSep} = sep(Sep0),
     fl1(CItems, F, Sep, LastSep, After).
 
+sep([{S,LS}]) -> {[S],[LS]};
+sep({_,_}=Sep) -> Sep;
+sep(S) -> {S, S}.
+
 fl1([CItem], F, _Sep, _LastSep, After) ->
     [F(CItem,After)];
 fl1([CItem1,CItem2], F, _Sep, LastSep, After) ->
@@ -1067,20 +1116,64 @@ unz1(CharSizes) ->
 nonzero(CharSizes) ->
     lists:filter(fun({_,Sz}) -> Sz =/= 0 end, CharSizes).
 
-insert_newlines(CharsSizesL, I, ST) when I >= 0 ->
-    insert_nl(foldr(fun([{_C1,0},{_C2,0}], A) ->
-                            A;
-                       ([{C1,_Sz1},{_C2,0}], A) ->
-                            [C1|A];
-                       ([{C1,_Sz1},{C2,Sz2}], A) when Sz2 > 0 ->
-                            [insert_nl([C1,C2], I+?IND, ST)|A]
-                    end, [], CharsSizesL), I, ST).
+maybe_newlines([{Chars,Size}], [], _I, _NSepChars, _ST) ->
+    {Chars,Size};
+maybe_newlines(CharsSizeList, Items, I, NSepChars, ST) when I >= 0 ->
+    maybe_sep(CharsSizeList, Items, I, NSepChars, nl_indent(I, ST)).
+
+maybe_sep([{Chars1,Size1}|CharsSizeL], [Item|Items], I0, NSepChars, Sep) ->
+    I1 = case classify_item(Item) of
+             atomic ->
+                 I0 + Size1;
+             _ ->
+                 ?MAXLINE+1
+         end,
+    maybe_sep1(CharsSizeL, Items, I0, I1, Sep, NSepChars, Size1, [Chars1]).
+
+maybe_sep1([{Chars,Size}|CharsSizeL], [Item|Items],
+           I0, I, Sep, NSepChars, Sz0, A) ->
+    case classify_item(Item) of
+        atomic when is_integer(Size) ->
+            Size1 = Size + 1,
+            I1 = I + Size1,
+            if
+                I1 =< ?MAXLINE ->
+                    A1 = if
+                             NSepChars > 0 -> [Chars,$\s|A];
+                             true -> [Chars|A]
+                         end,
+                    maybe_sep1(CharsSizeL, Items, I0, I1, Sep, NSepChars,
+                               Sz0 + Size1, A1);
+                true ->
+                    A1 = [Chars,Sep|A],
+                    maybe_sep1(CharsSizeL, Items, I0, I0 + Size, Sep,
+                               NSepChars, Size1, A1)
+            end;
+        _ ->
+            A1 = [Chars,Sep|A],
+            maybe_sep1(CharsSizeL, Items, I0, ?MAXLINE+1, Sep, NSepChars,
+                       0, A1)
+    end;
+maybe_sep1(_CharsSizeL, _Items, _Io, _I, _Sep, _NSepChars, Sz, A) ->
+    {lists:reverse(A), Sz}.
 
+insert_newlines(CharsSizesL, I, ST) when I >= 0 ->
+    {CharsL, _} = unz1(handle_step(CharsSizesL, I, ST)),
+    insert_nl(CharsL, I, ST).
+
+handle_step(CharsSizesL, I, ST) ->
+    map(fun([{_C1,0},{_C2,0}]) ->
+                {[], 0};
+           ([{C1,Sz1},{_C2,0}]) ->
+                {C1, Sz1};
+           ([{C1,Sz1},{C2,Sz2}]) when Sz2 > 0 ->
+                {insert_nl([C1,C2], I+?IND, ST),line_size([Sz1,Sz2])}
+        end, CharsSizesL).
 
 insert_nl(CharsL, I, ST) ->
     insert_sep(CharsL, nl_indent(I, ST)).
 
-insert_sep([Chars1 | CharsL], Sep) ->
+insert_sep([Chars1|CharsL], Sep) ->
     [Chars1 | [[Sep,Chars] || Chars <- CharsL]].
 
 nl_indent(0, _T) ->
@@ -1088,6 +1181,12 @@ nl_indent(0, _T) ->
 nl_indent(I, T) when I > 0 ->
     [$\n|spaces(I, T)].
 
+classify_item({atom, _}) -> atomic;
+classify_item({singleton_atom_type, _}) -> atomic;
+classify_item(Atom) when is_atom(Atom) -> atomic;
+classify_item({leaf, _, _}) -> atomic;
+classify_item(_) -> complex.
+
 same_line(I0, SizeL, NSepChars) ->
     try
         Size = lists:sum(SizeL) + NSepChars,
@@ -1148,6 +1247,9 @@ write_a_value(V, PP) ->
 write_an_atom(A, PP) ->
     flat_leaf(write_atom(A, PP)).
 
+write_a_singleton_atom_type(A, PP) ->
+    flat_leaf(write_singleton_atom_type(A, PP)).
+
 write_a_char(C, PP) ->
     flat_leaf(write_char(C, PP)).
 
@@ -1182,6 +1284,9 @@ write_value(V, PP) ->
 write_atom(A, PP) ->
     (PP#pp.value_fun)(A).
 
+write_singleton_atom_type(A, PP) ->
+    (PP#pp.singleton_atom_type_fun)(A).
+
 write_string(S, PP) ->
     (PP#pp.string_fun)(S).
 
diff --git a/lib/stdlib/src/erl_tar.erl b/lib/stdlib/src/erl_tar.erl
index d8b8f466b1..7064fcacfa 100644
--- a/lib/stdlib/src/erl_tar.erl
+++ b/lib/stdlib/src/erl_tar.erl
@@ -324,7 +324,7 @@ do_open(Name, Mode) when is_list(Mode) ->
 open1({binary,Bin}, read, _Raw, Opts) when is_binary(Bin) ->
     case file:open(Bin, [ram,binary,read]) of
         {ok,File} ->
-            _ = [ram_file:uncompress(File) || Opts =:= [compressed]],
+            _ = [ram_file:uncompress(File) || lists:member(compressed, Opts)],
             {ok, #reader{handle=File,access=read,func=fun file_op/2}};
         Error ->
             Error
@@ -357,7 +357,7 @@ open_mode([read|Rest], false, Raw, Opts) ->
 open_mode([write|Rest], false, Raw, Opts) ->
     open_mode(Rest, write, Raw, Opts);
 open_mode([compressed|Rest], Access, Raw, Opts) ->
-    open_mode(Rest, Access, Raw, [compressed|Opts]);
+    open_mode(Rest, Access, Raw, [compressed,read_ahead|Opts]);
 open_mode([cooked|Rest], Access, _Raw, Opts) ->
     open_mode(Rest, Access, [], Opts);
 open_mode([], Access, Raw, Opts) ->
diff --git a/lib/stdlib/src/gen_fsm.erl b/lib/stdlib/src/gen_fsm.erl
index caaaf8fa2e..1e18710738 100644
--- a/lib/stdlib/src/gen_fsm.erl
+++ b/lib/stdlib/src/gen_fsm.erl
@@ -411,12 +411,13 @@ decode_msg(Msg,Parent, Name, StateName, StateData, Mod, Time, HibernateAfterTime
 	    sys:handle_system_msg(Req, From, Parent, ?MODULE, Debug,
 				  [Name, StateName, StateData, Mod, Time, HibernateAfterTimeout], Hib);
 	{'EXIT', Parent, Reason} ->
-	    terminate(Reason, Name, Msg, Mod, StateName, StateData, Debug);
+	    terminate(
+              Reason, Name, undefined, Msg, Mod, StateName, StateData, Debug);
 	_Msg when Debug =:= [] ->
 	    handle_msg(Msg, Parent, Name, StateName, StateData, Mod, Time, HibernateAfterTimeout);
 	_Msg ->
 	    Debug1 = sys:handle_debug(Debug, fun print_event/3,
-				      {Name, StateName}, {in, Msg}),
+				      Name, {in, Msg, StateName}),
 	    handle_msg(Msg, Parent, Name, StateName, StateData,
 		       Mod, Time, HibernateAfterTimeout, Debug1)
     end.
@@ -431,7 +432,7 @@ system_continue(Parent, Debug, [Name, StateName, StateData, Mod, Time, Hibernate
 
 system_terminate(Reason, _Parent, Debug,
 		 [Name, StateName, StateData, Mod, _Time, _HibernateAfterTimeout]) ->
-    terminate(Reason, Name, [], Mod, StateName, StateData, Debug).
+    terminate(Reason, Name, undefined, [], Mod, StateName, StateData, Debug).
 
 system_code_change([Name, StateName, StateData, Mod, Time, HibernateAfterTimeout],
 		   _Module, OldVsn, Extra) ->
@@ -452,7 +453,7 @@ system_replace_state(StateFun, [Name, StateName, StateData, Mod, Time, Hibernate
 %% Format debug messages.  Print them as the call-back module sees
 %% them, not as the real erlang messages.  Use trace for that.
 %%-----------------------------------------------------------------
-print_event(Dev, {in, Msg}, {Name, StateName}) ->
+print_event(Dev, {in, Msg, StateName}, Name) ->
     case Msg of
 	{'$gen_event', Event} ->
 	    io:format(Dev, "*DBG* ~tp got event ~tp in state ~tw~n",
@@ -461,6 +462,16 @@ print_event(Dev, {in, Msg}, {Name, StateName}) ->
 	    io:format(Dev,
 		      "*DBG* ~tp got all_state_event ~tp in state ~tw~n",
 		      [Name, Event, StateName]);
+	{'$gen_sync_event', {From,_Tag}, Event} ->
+	    io:format(Dev,
+                      "*DBG* ~tp got sync_event ~tp "
+                      "from ~tw in state ~tw~n",
+		      [Name, Event, From, StateName]);
+	{'$gen_sync_all_state_event', {From,_Tag}, Event} ->
+	    io:format(Dev,
+		      "*DBG* ~tp got sync_all_state_event ~tp "
+                      "from ~tw in state ~tw~n",
+		      [Name, Event, From, StateName]);
 	{timeout, Ref, {'$gen_timer', Message}} ->
 	    io:format(Dev,
 		      "*DBG* ~tp got timer ~tp in state ~tw~n",
@@ -473,11 +484,11 @@ print_event(Dev, {in, Msg}, {Name, StateName}) ->
 	    io:format(Dev, "*DBG* ~tp got ~tp in state ~tw~n",
 		      [Name, Msg, StateName])
     end;
-print_event(Dev, {out, Msg, To, StateName}, Name) ->
+print_event(Dev, {out, Msg, {To,_Tag}, StateName}, Name) ->
     io:format(Dev, "*DBG* ~tp sent ~tp to ~tw~n"
 	           "      and switched to state ~tw~n",
 	      [Name, Msg, To, StateName]);
-print_event(Dev, return, {Name, StateName}) ->
+print_event(Dev, {noreply, StateName}, Name) ->
     io:format(Dev, "*DBG* ~tp switched to state ~tw~n",
 	      [Name, StateName]).
 
@@ -495,9 +506,9 @@ handle_msg(Msg, Parent, Name, StateName, StateData, Mod, _Time, HibernateAfterTi
 	    reply(From, Reply),
 	    loop(Parent, Name, NStateName, NStateData, Mod, Time1, HibernateAfterTimeout, []);
 	{stop, Reason, NStateData} ->
-	    terminate(Reason, Name, Msg, Mod, StateName, NStateData, []);
+	    terminate(Reason, Name, From, Msg, Mod, StateName, NStateData, []);
 	{stop, Reason, Reply, NStateData} when From =/= undefined ->
-	    {'EXIT', R} = (catch terminate(Reason, Name, Msg, Mod,
+	    {'EXIT', R} = (catch terminate(Reason, Name, From, Msg, Mod,
 					   StateName, NStateData, [])),
 	    reply(From, Reply),
 	    exit(R);
@@ -510,10 +521,10 @@ handle_msg(Msg, Parent, Name, StateName, StateData, Mod, _Time, HibernateAfterTi
                            error_logger=>#{tag=>warning_msg}}),
             loop(Parent, Name, StateName, StateData, Mod, infinity, HibernateAfterTimeout, []);
 	{'EXIT', What} ->
-	    terminate(What, Name, Msg, Mod, StateName, StateData, []);
+	    terminate(What, Name, From, Msg, Mod, StateName, StateData, []);
 	Reply ->
 	    terminate({bad_return_value, Reply},
-		      Name, Msg, Mod, StateName, StateData, [])
+		      Name, From, Msg, Mod, StateName, StateData, [])
     end.
 
 handle_msg(Msg, Parent, Name, StateName, StateData, Mod, _Time, HibernateAfterTimeout, Debug) ->
@@ -521,11 +532,11 @@ handle_msg(Msg, Parent, Name, StateName, StateData, Mod, _Time, HibernateAfterTi
     case catch dispatch(Msg, Mod, StateName, StateData) of
 	{next_state, NStateName, NStateData} ->
 	    Debug1 = sys:handle_debug(Debug, fun print_event/3,
-				      {Name, NStateName}, return),
+				      Name, {noreply, NStateName}),
 	    loop(Parent, Name, NStateName, NStateData, Mod, infinity, HibernateAfterTimeout, Debug1);
 	{next_state, NStateName, NStateData, Time1} ->
 	    Debug1 = sys:handle_debug(Debug, fun print_event/3,
-				      {Name, NStateName}, return),
+				      Name, {noreply, NStateName}),
 	    loop(Parent, Name, NStateName, NStateData, Mod, Time1, HibernateAfterTimeout, Debug1);
         {reply, Reply, NStateName, NStateData} when From =/= undefined ->
 	    Debug1 = reply(Name, From, Reply, Debug, NStateName),
@@ -534,17 +545,18 @@ handle_msg(Msg, Parent, Name, StateName, StateData, Mod, _Time, HibernateAfterTi
 	    Debug1 = reply(Name, From, Reply, Debug, NStateName),
 	    loop(Parent, Name, NStateName, NStateData, Mod, Time1, HibernateAfterTimeout, Debug1);
 	{stop, Reason, NStateData} ->
-	    terminate(Reason, Name, Msg, Mod, StateName, NStateData, Debug);
+	    terminate(
+              Reason, Name, From, Msg, Mod, StateName, NStateData, Debug);
 	{stop, Reason, Reply, NStateData} when From =/= undefined ->
-	    {'EXIT', R} = (catch terminate(Reason, Name, Msg, Mod,
+	    {'EXIT', R} = (catch terminate(Reason, Name, From, Msg, Mod,
 					   StateName, NStateData, Debug)),
 	    _ = reply(Name, From, Reply, Debug, StateName),
 	    exit(R);
 	{'EXIT', What} ->
-	    terminate(What, Name, Msg, Mod, StateName, StateData, Debug);
+	    terminate(What, Name, From, Msg, Mod, StateName, StateData, Debug);
 	Reply ->
 	    terminate({bad_return_value, Reply},
-		      Name, Msg, Mod, StateName, StateData, Debug)
+		      Name, From, Msg, Mod, StateName, StateData, Debug)
     end.
 
 dispatch({'$gen_event', Event}, Mod, StateName, StateData) ->
@@ -571,24 +583,25 @@ from(_) -> undefined.
 reply({To, Tag}, Reply) ->
     catch To ! {Tag, Reply}.
 
-reply(Name, {To, Tag}, Reply, Debug, StateName) ->
-    reply({To, Tag}, Reply),
+reply(Name, From, Reply, Debug, StateName) ->
+    reply(From, Reply),
     sys:handle_debug(Debug, fun print_event/3, Name,
-		     {out, Reply, To, StateName}).
+		     {out, Reply, From, StateName}).
 
 %%% ---------------------------------------------------
 %%% Terminate the server.
 %%% ---------------------------------------------------
 
--spec terminate(term(), _, _, atom(), _, _, _) -> no_return().
+-spec terminate(term(), _, _, _, atom(), _, _, _) -> no_return().
 
-terminate(Reason, Name, Msg, Mod, StateName, StateData, Debug) ->
+terminate(Reason, Name, From, Msg, Mod, StateName, StateData, Debug) ->
     case erlang:function_exported(Mod, terminate, 3) of
 	true ->
 	    case catch Mod:terminate(Reason, StateName, StateData) of
 		{'EXIT', R} ->
 		    FmtStateData = format_status(terminate, Mod, get(), StateData),
-		    error_info(R, Name, Msg, StateName, FmtStateData, Debug),
+		    error_info(
+                      R, Name, From, Msg, StateName, FmtStateData, Debug),
 		    exit(R);
 		_ ->
 		    ok
@@ -605,29 +618,51 @@ terminate(Reason, Name, Msg, Mod, StateName, StateData, Debug) ->
  	    exit(Shutdown);
 	_ ->
 	    FmtStateData1 = format_status(terminate, Mod, get(), StateData),
-	    error_info(Reason,Name,Msg,StateName,FmtStateData1,Debug),
+	    error_info(
+              Reason, Name, From, Msg, StateName, FmtStateData1, Debug),
 	    exit(Reason)
     end.
 
-error_info(Reason, Name, Msg, StateName, StateData, Debug) ->
+error_info(Reason, Name, From, Msg, StateName, StateData, Debug) ->
+    Log = sys:get_log(Debug),
     ?LOG_ERROR(#{label=>{gen_fsm,terminate},
                  name=>Name,
                  last_message=>Msg,
                  state_name=>StateName,
                  state_data=>StateData,
-                 reason=>Reason},
+                 log=>Log,
+                 reason=>Reason,
+                 client_info=>client_stacktrace(From)},
                #{domain=>[otp],
                  report_cb=>fun gen_fsm:format_log/1,
                  error_logger=>#{tag=>error}}),
-    sys:print_log(Debug),
     ok.
 
+client_stacktrace(undefined) ->
+    undefined;
+client_stacktrace({Pid,_Tag}) ->
+    client_stacktrace(Pid);
+client_stacktrace(Pid) when is_pid(Pid), node(Pid) =:= node() ->
+    case process_info(Pid, [current_stacktrace, registered_name]) of
+        undefined ->
+            {Pid,dead};
+        [{current_stacktrace, Stacktrace}, {registered_name, []}]  ->
+            {Pid,{Pid,Stacktrace}};
+        [{current_stacktrace, Stacktrace}, {registered_name, Name}]  ->
+            {Pid,{Name,Stacktrace}}
+    end;
+client_stacktrace(Pid) when is_pid(Pid) ->
+    {Pid,remote}.
+
+
 format_log(#{label:={gen_fsm,terminate},
              name:=Name,
              last_message:=Msg,
              state_name:=StateName,
              state_data:=StateData,
-             reason:=Reason}) ->
+             log:=Log,
+             reason:=Reason,
+             client_info:=ClientInfo}) ->
     Reason1 = 
 	case Reason of
 	    {undef,[{M,F,A,L}|MFAs]} ->
@@ -645,27 +680,39 @@ format_log(#{label:={gen_fsm,terminate},
 	    _ ->
 		Reason
 	end,
+    {ClientFmt,ClientArgs} = format_client_log(ClientInfo),
     {"** State machine ~tp terminating \n" ++
          get_msg_str(Msg) ++
      "** When State == ~tp~n"
      "**      Data  == ~tp~n"
-     "** Reason for termination = ~n** ~tp~n",
-     [Name, get_msg(Msg), StateName, StateData, Reason1]};
+     "** Reason for termination ==~n** ~tp~n" ++
+         case Log of
+             [] -> [];
+             _ -> "** Log ==~n** ~tp~n"
+         end ++ ClientFmt,
+     [Name|error_logger:limit_term(get_msg(Msg))] ++
+         [StateName,
+          error_logger:limit_term(StateData),
+          error_logger:limit_term(Reason1) |
+          case Log of
+              [] -> [];
+              _ -> [[error_logger:limit_term(D) || D <- Log]]
+          end] ++ ClientArgs};
 format_log(#{label:={gen_fsm,no_handle_info},
              module:=Mod,
              message:=Msg}) ->
     {"** Undefined handle_info in ~p~n"
      "** Unhandled message: ~tp~n",
-     [Mod, Msg]}.
+     [Mod, error_logger:limit_term(Msg)]}.
 
 get_msg_str({'$gen_event', _Event}) ->
     "** Last event in was ~tp~n";
-get_msg_str({'$gen_sync_event', _Event}) ->
-    "** Last sync event in was ~tp~n";
+get_msg_str({'$gen_sync_event', _From, _Event}) ->
+    "** Last sync event in was ~tp from ~tw~n";
 get_msg_str({'$gen_all_state_event', _Event}) ->
     "** Last event in was ~tp (for all states)~n";
-get_msg_str({'$gen_sync_all_state_event', _Event}) ->
-    "** Last sync event in was ~tp (for all states)~n";
+get_msg_str({'$gen_sync_all_state_event', _From, _Event}) ->
+    "** Last sync event in was ~tp (for all states) from ~tw~n";
 get_msg_str({timeout, _Ref, {'$gen_timer', _Msg}}) ->
     "** Last timer event in was ~tp~n";
 get_msg_str({timeout, _Ref, {'$gen_event', _Msg}}) ->
@@ -673,13 +720,24 @@ get_msg_str({timeout, _Ref, {'$gen_event', _Msg}}) ->
 get_msg_str(_Msg) ->
     "** Last message in was ~tp~n".
 
-get_msg({'$gen_event', Event}) -> Event;
-get_msg({'$gen_sync_event', Event}) -> Event;
-get_msg({'$gen_all_state_event', Event}) -> Event;
-get_msg({'$gen_sync_all_state_event', Event}) -> Event;
-get_msg({timeout, Ref, {'$gen_timer', Msg}}) -> {timeout, Ref, Msg};
-get_msg({timeout, _Ref, {'$gen_event', Event}}) -> Event;
-get_msg(Msg) -> Msg.
+get_msg({'$gen_event', Event}) -> [Event];
+get_msg({'$gen_sync_event', {From,_Tag}, Event}) -> [Event,From];
+get_msg({'$gen_all_state_event', Event}) -> [Event];
+get_msg({'$gen_sync_all_state_event', {From,_Tag}, Event}) -> [Event,From];
+get_msg({timeout, Ref, {'$gen_timer', Msg}}) -> [{timeout, Ref, Msg}];
+get_msg({timeout, _Ref, {'$gen_event', Event}}) -> [Event];
+get_msg(Msg) -> [Msg].
+
+format_client_log(undefined) ->
+    {"", []};
+format_client_log({From,dead}) ->
+    {"** Client ~p is dead~n", [From]};
+format_client_log({From,remote}) ->
+    {"** Client ~p is remote on node ~p~n", [From, node(From)]};
+format_client_log({_From,{Name,Stacktrace}}) ->
+    {"** Client ~tp stacktrace~n"
+     "** ~tp~n",
+     [Name, error_logger:limit_term(Stacktrace)]}.
 
 %%-----------------------------------------------------------------
 %% Status information
@@ -689,18 +747,18 @@ format_status(Opt, StatusData) ->
 	StatusData,
     Header = gen:format_status_header("Status for state machine",
                                       Name),
-    Log = sys:get_debug(log, Debug, []),
-    Specfic = format_status(Opt, Mod, PDict, StateData),
-    Specfic = case format_status(Opt, Mod, PDict, StateData) of
-		  S when is_list(S) -> S;
-		  S -> [S]
-	      end,
+    Log = sys:get_log(Debug),
+    Specific =
+        case format_status(Opt, Mod, PDict, StateData) of
+            S when is_list(S) -> S;
+            S -> [S]
+        end,
     [{header, Header},
      {data, [{"Status", SysState},
 	     {"Parent", Parent},
 	     {"Logged events", Log},
 	     {"StateName", StateName}]} |
-     Specfic].
+     Specific].
 
 format_status(Opt, Mod, PDict, State) ->
     DefStatus = case Opt of
diff --git a/lib/stdlib/src/gen_server.erl b/lib/stdlib/src/gen_server.erl
index 44e9231ebe..c7b6406f54 100644
--- a/lib/stdlib/src/gen_server.erl
+++ b/lib/stdlib/src/gen_server.erl
@@ -773,10 +773,10 @@ handle_common_reply(Reply, Parent, Name, From, Msg, Mod, HibernateAfterTimeout,
 	    terminate({bad_return_value, BadReply}, ?STACKTRACE(), Name, From, Msg, Mod, State, Debug)
     end.
 
-reply(Name, {To, Tag}, Reply, State, Debug) ->
-    reply({To, Tag}, Reply),
+reply(Name, From, Reply, State, Debug) ->
+    reply(From, Reply),
     sys:handle_debug(Debug, fun print_event/3, Name,
-		     {out, Reply, To, State} ).
+		     {out, Reply, From, State} ).
 
 
 %%-----------------------------------------------------------------
@@ -810,7 +810,7 @@ system_replace_state(StateFun, [Name, State, Mod, Time, HibernateAfterTimeout])
 print_event(Dev, {in, Msg}, Name) ->
     case Msg of
 	{'$gen_call', {From, _Tag}, Call} ->
-	    io:format(Dev, "*DBG* ~tp got call ~tp from ~w~n",
+	    io:format(Dev, "*DBG* ~tp got call ~tp from ~tw~n",
 		      [Name, Call, From]);
 	{'$gen_cast', Cast} ->
 	    io:format(Dev, "*DBG* ~tp got cast ~tp~n",
@@ -818,8 +818,8 @@ print_event(Dev, {in, Msg}, Name) ->
 	_ ->
 	    io:format(Dev, "*DBG* ~tp got ~tp~n", [Name, Msg])
     end;
-print_event(Dev, {out, Msg, To, State}, Name) ->
-    io:format(Dev, "*DBG* ~tp sent ~tp to ~w, new state ~tp~n",
+print_event(Dev, {out, Msg, {To,_Tag}, State}, Name) ->
+    io:format(Dev, "*DBG* ~tp sent ~tp to ~tw, new state ~tp~n",
 	      [Name, Msg, To, State]);
 print_event(Dev, {noreply, State}, Name) ->
     io:format(Dev, "*DBG* ~tp new state ~tp~n", [Name, State]);
@@ -885,16 +885,17 @@ error_info(_Reason, application_controller, _From, _Msg, _Mod, _State, _Debug) -
     %% of it instead
     ok;
 error_info(Reason, Name, From, Msg, Mod, State, Debug) ->
+    Log = sys:get_log(Debug),
     ?LOG_ERROR(#{label=>{gen_server,terminate},
                  name=>Name,
                  last_message=>Msg,
                  state=>format_status(terminate, Mod, get(), State),
+                 log=>format_log_state(Mod, Log),
                  reason=>Reason,
                  client_info=>client_stacktrace(From)},
                #{domain=>[otp],
                  report_cb=>fun gen_server:format_log/1,
                  error_logger=>#{tag=>error}}),
-    sys:print_log(Debug),
     ok.
 
 client_stacktrace(undefined) ->
@@ -917,6 +918,7 @@ format_log(#{label:={gen_server,terminate},
              name:=Name,
              last_message:=Msg,
              state:=State,
+             log:=Log,
              reason:=Reason,
              client_info:=Client}) ->
     Reason1 = 
@@ -934,20 +936,30 @@ format_log(#{label:={gen_server,terminate},
 			end
 		end;
 	    _ ->
-		error_logger:limit_term(Reason)
+		Reason
 	end,    
     {ClientFmt,ClientArgs} = format_client_log(Client),
+    [LimitedMsg,LimitedState,LimitedReason|LimitedLog] =
+        [error_logger:limit_term(D) || D <- [Msg,State,Reason1|Log]],
     {"** Generic server ~tp terminating \n"
      "** Last message in was ~tp~n"
      "** When Server state == ~tp~n"
-     "** Reason for termination == ~n** ~tp~n" ++ ClientFmt,
-     [Name, Msg, error_logger:limit_term(State), Reason1] ++ ClientArgs};
+     "** Reason for termination ==~n** ~tp~n" ++
+         case LimitedLog of
+             [] -> [];
+             _ -> "** Log ==~n** ~tp~n"
+         end ++ ClientFmt,
+     [Name, LimitedMsg, LimitedState, LimitedReason] ++
+         case LimitedLog of
+             [] -> [];
+             _ -> [LimitedLog]
+         end ++ ClientArgs};
 format_log(#{label:={gen_server,no_handle_info},
              module:=Mod,
              message:=Msg}) ->
     {"** Undefined handle_info in ~p~n"
      "** Unhandled message: ~tp~n",
-     [Mod, Msg]}.
+     [Mod, error_logger:limit_term(Msg)]}.
 
 format_client_log(undefined) ->
     {"", []};
@@ -958,7 +970,7 @@ format_client_log({From,remote}) ->
 format_client_log({_From,{Name,Stacktrace}}) ->
     {"** Client ~tp stacktrace~n"
      "** ~tp~n",
-     [Name, Stacktrace]}.
+     [Name, error_logger:limit_term(Stacktrace)]}.
 
 %%-----------------------------------------------------------------
 %% Status information
@@ -966,16 +978,25 @@ format_client_log({_From,{Name,Stacktrace}}) ->
 format_status(Opt, StatusData) ->
     [PDict, SysState, Parent, Debug, [Name, State, Mod, _Time, _HibernateAfterTimeout]] = StatusData,
     Header = gen:format_status_header("Status for generic server", Name),
-    Log = sys:get_debug(log, Debug, []),
-    Specfic = case format_status(Opt, Mod, PDict, State) of
+    Log = sys:get_log(Debug),
+    Specific = case format_status(Opt, Mod, PDict, State) of
 		  S when is_list(S) -> S;
 		  S -> [S]
 	      end,
     [{header, Header},
      {data, [{"Status", SysState},
 	     {"Parent", Parent},
-	     {"Logged events", Log}]} |
-     Specfic].
+	     {"Logged events", format_log_state(Mod, Log)}]} |
+     Specific].
+
+format_log_state(Mod, Log) ->
+    [case Event of
+         {out,Msg,From,State} ->
+             {out,Msg,From,format_status(terminate, Mod, get(), State)};
+         {noreply,State} ->
+             {noreply,format_status(terminate, Mod, get(), State)};
+         _ -> Event
+     end || Event <- Log].
 
 format_status(Opt, Mod, PDict, State) ->
     DefStatus = case Opt of
diff --git a/lib/stdlib/src/gen_statem.erl b/lib/stdlib/src/gen_statem.erl
index faa43fbc1e..49911eac2c 100644
--- a/lib/stdlib/src/gen_statem.erl
+++ b/lib/stdlib/src/gen_statem.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2016-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2016-2019. 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.
@@ -67,6 +67,14 @@
 %% Type that is exported just to be documented
 -export_type([transition_option/0]).
 
+%% Type exports for start_link & friends
+-export_type(
+   [server_name/0,
+    server_ref/0,
+    start_opt/0,
+    start_ret/0,
+    enter_loop_opt/0]).
+
 %%%==========================================================================
 %%% Interface functions.
 %%%==========================================================================
@@ -330,6 +338,7 @@
 
 
 %% Type validation functions
+%% - return true if the value is of the type, false otherwise
 -compile(
    {inline,
     [callback_mode/1, state_enter/1,
@@ -373,77 +382,76 @@ timeout_event_type(Type) ->
 
 
 -define(
+   relative_timeout(T),
+   ((is_integer(T) andalso 0 =< (T)) orelse (T) =:= infinity)).
+
+-define(
+   absolute_timeout(T),
+   (is_integer(T) orelse (T) =:= infinity)).
+
+-define(
    STACKTRACE(),
    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.
+%% Debug is evaluated 2 times.
 -define(
-   sys_debug(Debug, NameState, Entry),
+   sys_debug(Debug, Extra, SystemEvent),
    case begin Debug end of
        ?not_sys_debug ->
            begin Debug end;
        _ ->
-           sys_debug(begin Debug end, begin NameState end, begin Entry end)
+           sys_debug(
+             begin Debug end, begin Extra end, begin SystemEvent end)
     end).
 
--record(state,
+-record(params,
         {callback_mode = undefined :: callback_mode() | undefined,
          state_enter = false :: boolean(),
+         parent :: pid(),
          module :: atom(),
-         name :: atom(),
-         state :: term(),
-         data :: term(),
+         name :: atom() | pid(),
+         hibernate_after = infinity :: timeout()
+        }).
+
+-record(state,
+        {state_data = {undefined,undefined} ::
+           {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 = []}).
+         timers = {#{},#{}} ::
+           {%% TimerRef => TimeoutType
+            TimerRefs :: #{reference() => timeout_event_type()},
+            %% TimeoutType => TimerRef
+            TimeoutTypes :: #{timeout_event_type() => reference()}},
+          hibernate = false :: boolean()
+        }).
 
 %%%==========================================================================
 %%% API
 
 -type server_name() ::
-      {'global', GlobalName :: term()}
+        {'global', GlobalName :: term()}
       | {'via', RegMod :: module(), Name :: term()}
       | {'local', atom()}.
 -type server_ref() ::
-      pid()
+        pid()
       | (LocalName :: atom())
       | {Name :: atom(), Node :: atom()}
       | {'global', GlobalName :: term()}
       | {'via', RegMod :: module(), ViaName :: term()}.
--type debug_opt() ::
-	{'debug',
-	 Dbgs ::
-	   ['trace' | 'log' | 'statistics' | 'debug'
-	    | {'logfile', string()}]}.
--type hibernate_after_opt() ::
-	{'hibernate_after', HibernateAfterTimeout :: timeout()}.
 -type start_opt() ::
-	debug_opt()
-      | {'timeout', Time :: timeout()}
-	  | hibernate_after_opt()
-      | {'spawn_opt', [proc_lib:spawn_option()]}.
--type start_ret() ::  {'ok', pid()} | 'ignore' | {'error', term()}.
+        {'timeout', Time :: timeout()}
+      | {'spawn_opt', [proc_lib:spawn_option()]}
+      | enter_loop_opt().
+-type start_ret() ::
+        {'ok', pid()}
+      | 'ignore'
+      | {'error', term()}.
+-type enter_loop_opt() ::
+	{'hibernate_after', HibernateAfterTimeout :: timeout()}
+      | {'debug', Dbgs :: [sys:debug_option()]}.
 
 
 
@@ -556,14 +564,14 @@ reply({To,Tag}, Reply) when is_pid(To) ->
 %% started by proc_lib into a state machine using
 %% the same arguments as you would have returned from init/1
 -spec enter_loop(
-	Module :: module(), Opts :: [debug_opt() | hibernate_after_opt()],
+	Module :: module(), Opts :: [enter_loop_opt()],
 	State :: state(), Data :: data()) ->
 			no_return().
 enter_loop(Module, Opts, State, Data) ->
     enter_loop(Module, Opts, State, Data, self()).
 %%
 -spec enter_loop(
-	Module :: module(), Opts :: [debug_opt() | hibernate_after_opt()],
+	Module :: module(), Opts :: [enter_loop_opt()],
 	State :: state(), Data :: data(),
 	Server_or_Actions ::
 	  server_name() | pid() | [action()]) ->
@@ -577,7 +585,7 @@ enter_loop(Module, Opts, State, Data, Server_or_Actions) ->
     end.
 %%
 -spec enter_loop(
-	Module :: module(), Opts :: [debug_opt() | hibernate_after_opt()],
+	Module :: module(), Opts :: [enter_loop_opt()],
 	State :: state(), Data :: data(),
 	Server :: server_name() | pid(),
 	Actions :: [action()] | action()) ->
@@ -585,7 +593,12 @@ enter_loop(Module, Opts, State, Data, Server_or_Actions) ->
 enter_loop(Module, Opts, State, Data, Server, Actions) ->
     is_atom(Module) orelse error({atom,Module}),
     Parent = gen:get_parent(),
-    enter(Module, Opts, State, Data, Server, Actions, Parent).
+    Name = gen:get_proc_name(Server),
+    Debug = gen:debug_options(Name, Opts),
+    HibernateAfterTimeout = gen:hibernate_after(Opts),
+    enter(
+      Parent, Debug, Module, Name, HibernateAfterTimeout,
+      State, Data, Actions).
 
 %%---------------------------------------------------------------------------
 %% API helpers
@@ -657,36 +670,29 @@ send(Proc, Msg) ->
     ok.
 
 %% Here the init_it/6 and enter_loop/5,6,7 functions converge
-enter(Module, Opts, State, Data, Server, Actions, Parent) ->
+enter(
+  Parent, Debug, Module, Name, HibernateAfterTimeout,
+  State, Data, Actions) ->
     %% 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 = [],
-    Event = {internal,init_state},
+    Q = [{internal,init_state}],
     %% We enforce {postpone,false} to ensure that
     %% our fake Event gets discarded, thought it might get logged
-    NewActions = listify(Actions) ++ [{postpone,false}],
-    S =
-        #state{
+    Actions_1 = listify(Actions) ++ [{postpone,false}],
+    P =
+        #params{
+           parent = Parent,
            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
-	#state{} = NewS ->
-	    loop_event_actions_list(
-	      Parent, NewDebug, NewS,
-	      Events, Event, State, Data, false,
-              NewActions, CallEnter);
-	[Class,Reason,Stacktrace] ->
-	    terminate(
-	      Class, Reason, Stacktrace, NewDebug,
-	      S, [Event|Events])
-    end.
+    S = #state{state_data = {State,Data}},
+    Debug_1 = ?sys_debug(Debug, Name, {enter,State}),
+    loop_callback_mode(
+      P, Debug_1, S, Q, {State,Data},
+      %% Tunneling Actions through CallbackEvent here...
+      %% Special path to go to action handling, after first
+      %% finding out the callback mode.  CallbackEvent is
+      %% a 2-tuple and Actions a list, which achieves this distinction.
+      Actions_1).
 
 %%%==========================================================================
 %%%  gen callbacks
@@ -694,34 +700,46 @@ enter(Module, Opts, State, Data, Server, Actions, Parent) ->
 init_it(Starter, self, ServerRef, Module, Args, Opts) ->
     init_it(Starter, self(), ServerRef, Module, Args, Opts);
 init_it(Starter, Parent, ServerRef, Module, Args, Opts) ->
+    Name = gen:get_proc_name(ServerRef),
+    Debug = gen:debug_options(Name, Opts),
+    HibernateAfterTimeout = gen:hibernate_after(Opts),
     try Module:init(Args) of
 	Result ->
-	    init_result(Starter, Parent, ServerRef, Module, Result, Opts)
+	    init_result(
+              Starter, Parent, ServerRef, Module, Result,
+              Name, Debug, HibernateAfterTimeout)
     catch
 	Result ->
-	    init_result(Starter, Parent, ServerRef, Module, Result, Opts);
+	    init_result(
+              Starter, Parent, ServerRef, Module, Result,
+              Name, Debug, HibernateAfterTimeout);
 	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,
-	      #state{name = Name},
-	      []),
+	      Class, Reason, Stacktrace, Debug,
+              #params{parent = Parent, name = Name, module = Module},
+              #state{}, []),
 	    erlang:raise(Class, Reason, Stacktrace)
     end.
 
 %%---------------------------------------------------------------------------
 %% gen callbacks helpers
 
-init_result(Starter, Parent, ServerRef, Module, Result, Opts) ->
+init_result(
+  Starter, Parent, ServerRef, Module, Result,
+  Name, Debug, HibernateAfterTimeout) ->
     case Result of
 	{ok,State,Data} ->
 	    proc_lib:init_ack(Starter, {ok,self()}),
-	    enter(Module, Opts, State, Data, ServerRef, [], Parent);
+            enter(
+              Parent, Debug, Module, Name, HibernateAfterTimeout,
+              State, Data, []);
 	{ok,State,Data,Actions} ->
 	    proc_lib:init_ack(Starter, {ok,self()}),
-	    enter(Module, Opts, State, Data, ServerRef, Actions, Parent);
+            enter(
+              Parent, Debug, Module, Name, HibernateAfterTimeout,
+              State, Data, Actions);
 	{stop,Reason} ->
 	    gen:unregister_name(ServerRef),
 	    proc_lib:init_ack(Starter, {error,Reason}),
@@ -731,31 +749,34 @@ init_result(Starter, Parent, ServerRef, Module, Result, Opts) ->
 	    proc_lib:init_ack(Starter, ignore),
 	    exit(normal);
 	_ ->
-	    Name = gen:get_proc_name(ServerRef),
 	    gen:unregister_name(ServerRef),
 	    Error = {bad_return_from_init,Result},
 	    proc_lib:init_ack(Starter, {error,Error}),
 	    error_info(
-	      error, Error, ?STACKTRACE(),
-	      #state{name = Name},
-	      []),
+	      error, Error, ?STACKTRACE(), Debug,
+              #params{parent = Parent, name = Name, module = Module},
+              #state{}, []),
 	    exit(Error)
     end.
 
 %%%==========================================================================
 %%% sys callbacks
+%%%
+%%% We use {P,S} as state (Misc) for the sys module,
+%%% wrap/unwrap it for the server loop* and update
+%%% P#params{parent = Parent}.
 
-system_continue(Parent, Debug, S) ->
-    loop(Parent, Debug, S).
+system_continue(Parent, Debug, {P,S}) ->
+    loop(update_parent(P, Parent), Debug, S).
 
-system_terminate(Reason, _Parent, Debug, S) ->
-    terminate(exit, Reason, ?STACKTRACE(), Debug, S, []).
+system_terminate(Reason, Parent, Debug, {P,S}) ->
+    terminate(
+      exit, Reason, ?STACKTRACE(),
+      update_parent(P, Parent), Debug, S, []).
 
 system_code_change(
-  #state{
-     module = Module,
-     state = State,
-     data = Data} = S,
+  {#params{module = Module} = P,
+   #state{state_data = {State,Data}} = S},
   _Mod, OldVsn, Extra) ->
     case
 	try Module:code_change(OldVsn, State, Data, Extra)
@@ -765,44 +786,54 @@ system_code_change(
     of
 	{ok,NewState,NewData} ->
 	    {ok,
-	     S#state{
-               callback_mode = undefined,
-               state = NewState,
-               data = NewData}};
+	     {P#params{callback_mode = undefined},
+              S#state{state_data = {NewState,NewData}}}};
 	{ok,_} = Error ->
 	    error({case_clause,Error});
 	Error ->
 	    Error
     end.
 
-system_get_state(#state{state = State, data = Data}) ->
-    {ok,{State,Data}}.
+system_get_state({_P,#state{state_data = State_Data}}) ->
+    {ok,State_Data}.
 
 system_replace_state(
-  StateFun,
-  #state{
-     state = State,
-     data = Data} = S) ->
-    {NewState,NewData} = Result = StateFun({State,Data}),
-    {ok,Result,S#state{state = NewState, data = NewData}}.
+  StateFun, {P,#state{state_data = State_Data} = S}) ->
+    %%
+    NewState_NewData = StateFun(State_Data),
+    {ok,NewState_NewData,{P,S#state{state_data = NewState_NewData}}}.
 
 format_status(
   Opt,
   [PDict,SysState,Parent,Debug,
-   #state{name = Name, postponed = P} = S]) ->
+   {#params{name = Name} = P,
+    #state{postponed = Postponed} = S}]) ->
     Header = gen:format_status_header("Status for state machine", Name),
-    Log = sys:get_debug(log, Debug, []),
+    Log = sys:get_log(Debug),
     [{header,Header},
      {data,
       [{"Status",SysState},
        {"Parent",Parent},
        {"Logged Events",Log},
-       {"Postponed",P}]} |
-     case format_status(Opt, PDict, S) of
+       {"Postponed",Postponed}]} |
+     case format_status(Opt, PDict, update_parent(P, Parent), S) of
 	 L when is_list(L) -> L;
 	 T -> [T]
      end].
 
+%% Update #params.parent only if it differs.  This should not
+%% be possible today (OTP-22.0), but could happen for example
+%% if someone implements changing a server's parent
+%% in a new sys call.
+-compile({inline, update_parent/2}).
+update_parent(P, Parent) ->
+    case P of
+        #params{parent = Parent} ->
+            P;
+        #params{} ->
+            P#params{parent = Parent}
+    end.
+
 %%---------------------------------------------------------------------------
 %% Format debug messages.  Print them as the call-back module sees
 %% them, not as the real erlang messages.  Use trace for that.
@@ -811,34 +842,46 @@ format_status(
 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",
-      [Name,event_string(Event),State]);
-print_event(Dev, {out,Reply,{To,_Tag}}, {Name,State}) ->
-    io:format(
-      Dev, "*DBG* ~tp send ~tp to ~p from state ~tp~n",
-      [Name,Reply,To,State]);
-print_event(Dev, {terminate,Reason}, {Name,State}) ->
-    io:format(
-      Dev, "*DBG* ~tp terminate ~tp in state ~tp~n",
-      [Name,Reason,State]);
-print_event(Dev, {Tag,Event,NextState}, {Name,State}) ->
-    StateString =
-	case NextState of
-	    State ->
-		io_lib:format("~tp", [State]);
-	    _ ->
-		io_lib:format("~tp => ~tp", [State,NextState])
-	end,
-    io:format(
-      Dev, "*DBG* ~tp ~tw ~ts in state ~ts~n",
-      [Name,Tag,event_string(Event),StateString]).
+print_event(Dev, SystemEvent, Name) ->
+    case SystemEvent of
+        {in,Event,State} ->
+            io:format(
+              Dev, "*DBG* ~tp receive ~ts in state ~tp~n",
+              [Name,event_string(Event),State]);
+        {code_change,Event,State} ->
+            io:format(
+              Dev, "*DBG* ~tp receive ~ts after code change in state ~tp~n",
+              [Name,event_string(Event),State]);
+        {out,Reply,{To,_Tag}} ->
+            io:format(
+              Dev, "*DBG* ~tp send ~tp to ~tw~n",
+              [Name,Reply,To]);
+        {enter,State} ->
+            io:format(
+              Dev, "*DBG* ~tp enter in state ~tp~n",
+              [Name,State]);
+        {terminate,Reason,State} ->
+            io:format(
+              Dev, "*DBG* ~tp terminate ~tp in state ~tp~n",
+              [Name,Reason,State]);
+        {Tag,Event,State,NextState}
+          when Tag =:= postpone; Tag =:= consume ->
+            StateString =
+                case NextState of
+                    State ->
+                        io_lib:format("~tp", [State]);
+                    _ ->
+                        io_lib:format("~tp => ~tp", [State,NextState])
+                end,
+            io:format(
+              Dev, "*DBG* ~tp ~tw ~ts in state ~ts~n",
+              [Name,Tag,event_string(Event),StateString])
+    end.
 
 event_string(Event) ->
     case Event of
 	{{call,{Pid,_Tag}},Request} ->
-	    io_lib:format("call ~tp from ~w", [Request,Pid]);
+	    io_lib:format("call ~tp from ~tw", [Request,Pid]);
 	{EventType,EventContent} ->
 	    io_lib:format("~tw ~tp", [EventType,EventContent])
     end.
@@ -846,942 +889,1169 @@ event_string(Event) ->
 %%%==========================================================================
 %%% Internal callbacks
 
-wakeup_from_hibernate(Parent, Debug, S) ->
+wakeup_from_hibernate(P, Debug, S) ->
     %% It is a new message that woke us up so we have to receive it now
-    loop_receive(Parent, Debug, S).
+    loop_receive(P, Debug, S).
 
 %%%==========================================================================
-%%% State Machine engine implementation of proc_lib/gen server
+%%% State Machine engine implementation on proc_lib/gen
 
 %% Server loop, consists of all loop* functions
 %% and detours through sys:handle_system_message/7 and proc_lib:hibernate/3
+%%
+%% The loop tries to keep all temporary values in arguments
+%% and takes shortcuts for ?not_sys_debug, empty lists, etc.
+%% The engine state #state{} is picked apart during the loop,
+%% new values are kept in arguments, and a new #state{} is
+%% composed at the end of the loop.  #params{} collect engine
+%% state fields that rarely changes.
+%%
+%% The loop is optimized a bit for staying in the loop, assuming that
+%% system events are rare.  So a detour to sys requires re-packing
+%% of the engine state.
 
 %% Entry point for system_continue/3
-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(P, Debug, #state{hibernate = true} = S) ->
+    loop_hibernate(P, Debug, S);
+loop(P, Debug, S) ->
+    loop_receive(P, Debug, S).
 
-loop_hibernate(Parent, Debug, S) ->
+%% Go to hibernation
+%%
+loop_hibernate(P, 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]),
+    proc_lib:hibernate(?MODULE, wakeup_from_hibernate, [P, Debug, S]),
     error(
       {should_not_have_arrived_here_but_instead_in,
-       {wakeup_from_hibernate,3}}).
+       {?MODULE,wakeup_from_hibernate,3}}).
+
 
 %% Entry point for wakeup_from_hibernate/3
+%%
+%% Receive a new process message
+%%
 loop_receive(
-  Parent, Debug, #state{hibernate_after = HibernateAfterTimeout} = S) ->
+  #params{hibernate_after = HibernateAfterTimeout} = P, Debug, S) ->
     %%
     receive
 	Msg ->
 	    case Msg of
+                {'$gen_call',From,Request} ->
+                    loop_receive_result(P, Debug, S, {{call,From},Request});
+                {'$gen_cast',Cast} ->
+                    loop_receive_result(P, Debug, S, {cast,Cast});
+                %%
+		{timeout,TimerRef,TimeoutMsg} ->
+                    {TimerRefs,TimeoutTypes} = S#state.timers,
+                    case TimerRefs of
+                        #{TimerRef := TimeoutType} ->
+                            %% Our timer
+                            Timers =
+                                {maps:remove(TimerRef, TimerRefs),
+                                 maps:remove(TimeoutType, TimeoutTypes)},
+                            S_1 = S#state{timers = Timers},
+                            loop_receive_result(
+                              P, Debug, S_1, {TimeoutType,TimeoutMsg});
+                        #{} ->
+			    loop_receive_result(P, Debug, S, {info,Msg})
+		    end;
+                %%
 		{system,Pid,Req} ->
 		    %% 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,
+		      Req, Pid, P#params.parent, ?MODULE, Debug,
+                      {P,S},
 		      S#state.hibernate);
-		{'EXIT',Parent,Reason} = EXIT ->
-		    %% EXIT is not a 2-tuple therefore
-		    %% not an event but this will stand out
-		    %% in the crash report...
-		    Q = [EXIT],
-		    terminate(exit, Reason, ?STACKTRACE(), Debug, S, Q);
-		{timeout,TimerRef,TimerMsg} ->
-		    #state{
-                       timer_refs = TimerRefs,
-                       timer_types = TimerTypes} = S,
-		    case TimerRefs of
-			#{TimerRef := TimerType} ->
-			    %% We know of this timer; is it a running
-			    %% timer or a timer being cancelled that
-			    %% managed to send a late timeout message?
-			    case TimerTypes of
-				#{TimerType := TimerRef} ->
-				    %% The timer type maps back to this
-				    %% timer ref, so it was a running timer
-				    %% Unregister the triggered timeout
-				    NewTimerRefs =
-					maps:remove(TimerRef, TimerRefs),
-				    NewTimerTypes =
-					maps:remove(TimerType, TimerTypes),
-				    loop_receive_result(
-				      Parent, Debug,
-				      S#state{
-					timer_refs = NewTimerRefs,
-					timer_types = NewTimerTypes},
-				      TimerType, TimerMsg);
-				_ ->
-				    %% This was a late timeout message
-				    %% from timer being cancelled, so
-				    %% ignore it and expect a cancel_timer
-				    %% msg shortly
-				    loop_receive(Parent, Debug, S)
-			    end;
-			_ ->
-			    %% Not our timer; present it as an event
-			    loop_receive_result(Parent, Debug, S, info, Msg)
-		    end;
-		{cancel_timer,TimerRef,_} ->
-		    #state{
-                       timer_refs = TimerRefs,
-                       cancel_timers = CancelTimers,
-                       hibernate = Hibernate} = S,
-		    case TimerRefs of
-			#{TimerRef := _} ->
-			    %% We must have requested a cancel
-			    %% of this timer so it is already
-			    %% removed from TimerTypes
-			    NewTimerRefs =
-				maps:remove(TimerRef, TimerRefs),
-			    NewCancelTimers = CancelTimers - 1,
-			    NewS =
-				S#state{
-				  timer_refs = NewTimerRefs,
-				  cancel_timers = NewCancelTimers},
-			    if
-				Hibernate =:= true, NewCancelTimers =:= 0 ->
-				    %% No more cancel_timer msgs to expect;
-				    %% we can hibernate
-				    loop_hibernate(Parent, Debug, NewS);
-				NewCancelTimers >= 0 -> % Assert
-				    loop_receive(Parent, Debug, NewS)
-			    end;
-			_ ->
-			    %% Not our cancel_timer msg;
-			    %% present it as an event
-			    loop_receive_result(Parent, Debug, S, info, Msg)
-		    end;
-		_ ->
-		    %% External msg
-                    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);
+		{'EXIT',Pid,Reason} ->
+                    case P#params.parent of
+                        Pid ->
+                            terminate(
+                              exit, Reason, ?STACKTRACE(), P, Debug, S, []);
                         _ ->
-                            loop_receive_result(Parent, Debug, S, info, Msg)
-                    end
+                            loop_receive_result(P, Debug, S, {info,Msg})
+                    end;
+                %%
+                _ ->
+                    loop_receive_result(P, Debug, S, {info,Msg})
 	    end
     after
-	    HibernateAfterTimeout ->
-		    loop_hibernate(Parent, Debug, S)
+        HibernateAfterTimeout ->
+            loop_hibernate(P, Debug, S)
     end.
 
-loop_receive_result(Parent, ?not_sys_debug, S, Type, Content) ->
+%% We have received an event
+%%
+loop_receive_result(P, ?not_sys_debug = Debug, S, Event) ->
     %% Here is the queue of not yet handled events created
     Events = [],
-    loop_event(Parent, ?not_sys_debug, S, Events, Type, Content);
+    loop_event(P, Debug, S, Event, Events);
 loop_receive_result(
-  Parent, Debug, #state{name = Name, state = State} = S, Type, Content) ->
-    NewDebug = sys_debug(Debug, {Name,State}, {in,{Type,Content}}),
+  #params{name = Name, callback_mode = CallbackMode} = P, Debug,
+  #state{state_data = {State,_Data}} = S, Event) ->
+    Debug_1 =
+        case CallbackMode of
+            undefined ->
+                sys_debug(Debug, Name, {code_change,Event,State});
+            _ ->
+                sys_debug(Debug, Name, {in,Event,State})
+        end,
     %% Here is the queue of not yet handled events created
     Events = [],
-    loop_event(Parent, NewDebug, S, Events, Type, Content).
+    loop_event(P, Debug_1, S, Event, Events).
 
-%% Entry point for handling an event, received or enqueued
+%% Handle one event; received or enqueued
+%%
 loop_event(
-  Parent, Debug, #state{hibernate = Hibernate} = S,
-  Events, Type, Content) ->
+  P, Debug, #state{hibernate = true} = S, Event, Events) ->
     %%
-    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.
+    %% 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_handler(P, Debug, S, Event, Events);
+loop_event(P, Debug, S, Event, Events) ->
+    loop_event_handler(P, Debug, S, Event, Events).
 
-%% Call the state function
-loop_event_state_function(
-  Parent, Debug,
-  #state{state = State, data = Data} = S,
-  Events, Type, Content) ->
+%% Call the state function, eventually
+%%
+-compile({inline, [loop_event_handler/5]}).
+loop_event_handler(
+  P, Debug, #state{state_data = State_Data} = S, Event, Events) ->
     %%
     %% The field 'hibernate' in S is now invalid and will be
-    %% restored when looping back to loop/3 or loop_event/6.
+    %% restored when looping back to loop/3 or loop_event/5.
     %%
-    Event = {Type,Content},
-    TransOpts = false,
-    case call_state_function(S, Type, Content, State, Data) of
-        {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])
-    end.
+    Q = [Event|Events],
+    loop_callback_mode(P, Debug, S, Q, State_Data, Event).
 
-%% Make a state enter call to the state function
-loop_event_state_enter(
-  Parent, Debug, #state{state = PrevState} = S,
-  Events, Event, NextState, NewData, TransOpts) ->
+%% Figure out the callback mode
+%%
+loop_callback_mode(
+  #params{callback_mode = undefined} = P, Debug, S,
+  Q, State_Data, CallbackEvent) ->
     %%
-    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] ->
+    Module = P#params.module,
+    try Module:callback_mode() of
+	CallbackMode ->
+	    loop_callback_mode_result(
+              P, Debug, S,
+              Q, State_Data, CallbackEvent,
+              CallbackMode, listify(CallbackMode), undefined, false)
+    catch
+	CallbackMode ->
+	    loop_callback_mode_result(
+              P, Debug, S,
+              Q, State_Data, CallbackEvent,
+              CallbackMode, listify(CallbackMode), undefined, false);
+	Class:Reason:Stacktrace ->
 	    terminate(
-	      Class, Reason, Stacktrace, Debug, S, [Event|Events])
+	      Class, Reason, Stacktrace, P, Debug, S, Q)
+    end;
+loop_callback_mode(P, Debug, S, Q, State_Data, CallbackEvent) ->
+    loop_state_callback(P, Debug, S, Q, State_Data, CallbackEvent).
+
+%% Check the result of Module:callback_mode()
+%%
+loop_callback_mode_result(
+  P, Debug, S, Q, State_Data, CallbackEvent,
+  CallbackMode, [H|T], NewCallbackMode, NewStateEnter) ->
+    %%
+    case callback_mode(H) of
+        true ->
+            loop_callback_mode_result(
+              P, Debug, S, Q, State_Data, CallbackEvent,
+              CallbackMode, T, H, NewStateEnter);
+        false ->
+            case state_enter(H) of
+                true ->
+                    loop_callback_mode_result(
+                      P, Debug, S, Q, State_Data, CallbackEvent,
+                      CallbackMode, T, NewCallbackMode, true);
+                false ->
+                    terminate(
+                      error,
+                      {bad_return_from_callback_mode,CallbackMode},
+                      ?STACKTRACE(),
+                      P, Debug, S, Q)
+            end
+    end;
+loop_callback_mode_result(
+  P, Debug, S, Q, State_Data, CallbackEvent,
+  CallbackMode, [], NewCallbackMode, NewStateEnter) ->
+    %%
+    case NewCallbackMode of
+        undefined ->
+            terminate(
+              error,
+              {bad_return_from_callback_mode,CallbackMode},
+              ?STACKTRACE(),
+              P, Debug, S, Q);
+        _ ->
+            P_1 =
+                P#params{
+                  callback_mode = NewCallbackMode,
+                  state_enter = NewStateEnter},
+            loop_state_callback(
+              P_1, Debug, S, Q, State_Data, CallbackEvent)
     end.
 
-%% 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.
+
+%% Make a state enter call to the state function, we loop back here
+%% from further down if state enter calls are enabled
+%%
+loop_state_enter(
+  P, Debug, #state{state_data = {PrevState,_PrevData}} = S,
+  Q, NextState_NewData,
+  NextEventsR, Hibernate, TimeoutsR, Postpone) ->
+    %%
+    StateCall = false,
+    CallbackEvent = {enter,PrevState},
+    loop_state_callback(
+      P, Debug, S, Q, NextState_NewData,
+      NextEventsR, Hibernate, TimeoutsR, Postpone,
+      StateCall, CallbackEvent).
+
+%% Make a state call (not state enter call) to the state function
+%%
+loop_state_callback(P, Debug, S, Q, State_Data, CallbackEvent) ->
+    NextEventsR = [],
+    Hibernate = false,
+    TimeoutsR = [],
+    Postpone = false,
+    StateCall = true,
+    loop_state_callback(
+      P, Debug, S, Q, State_Data,
+      NextEventsR, Hibernate, TimeoutsR, Postpone,
+      StateCall, CallbackEvent).
+%%
+loop_state_callback(
+  #params{callback_mode = CallbackMode, module = Module} = P,
+  Debug, S, Q, {State,Data} = State_Data,
+  NextEventsR, Hibernate, TimeoutsR, Postpone,
+  StateCall, {Type,Content}) ->
+    try
+	case CallbackMode of
+	    state_functions ->
+		Module:State(Type, Content, Data);
+	    handle_event_function ->
+		Module:handle_event(Type, Content, State, Data)
+	end
+    of
+	Result ->
+            loop_state_callback_result(
+              P, Debug, S, Q, State_Data,
+              NextEventsR, Hibernate, TimeoutsR, Postpone,
+              StateCall, Result)
+    catch
+	Result ->
+            loop_state_callback_result(
+              P, Debug, S, Q, State_Data,
+              NextEventsR, Hibernate, TimeoutsR, Postpone,
+              StateCall, Result);
+	Class:Reason:Stacktrace ->
+	    terminate(Class, Reason, Stacktrace, P, Debug, S, Q)
+    end;
+loop_state_callback(
+  P, Debug, S, Q, State_Data,
+  NextEventsR, Hibernate, TimeoutsR, Postpone,
+  StateCall, Actions) when is_list(Actions) ->
+    %% Tunneled actions from enter/8
+    CallEnter = true,
+    loop_actions_list(
+      P, Debug, S, Q, State_Data,
+      NextEventsR, Hibernate, TimeoutsR, Postpone,
+      CallEnter, StateCall, Actions).
+
+%% Process the result from the state function
 %%
-loop_event_result(
-  Parent, Debug, S,
-  Events, Event, State, Data, TransOpts, Result) ->
+loop_state_callback_result(
+  P, Debug, S, Q, {State,_Data} = State_Data,
+  NextEventsR, Hibernate, TimeoutsR, Postpone,
+  StateCall, Result) ->
     %%
     case Result of
 	{next_state,State,NewData} ->
-            loop_event_actions(
-              Parent, Debug, S,
-              Events, Event, State, NewData, TransOpts,
-              [], false);
+            loop_actions(
+              P, Debug, S, Q, {State,NewData},
+              NextEventsR, Hibernate, TimeoutsR, Postpone,
+              false);
 	{next_state,NextState,NewData}
-          when TransOpts =:= false ->
-            loop_event_actions(
-              Parent, Debug, S,
-              Events, Event, NextState, NewData, TransOpts,
-              [], true);
+          when StateCall ->
+            loop_actions(
+              P, Debug, S, Q, {NextState,NewData},
+              NextEventsR, Hibernate, TimeoutsR, Postpone,
+              true);
 	{next_state,_NextState,_NewData} ->
             terminate(
               error,
               {bad_state_enter_return_from_state_function,Result},
-              ?STACKTRACE(), Debug,
+              ?STACKTRACE(), P, Debug,
               S#state{
-                state = State, data = Data,
-                hibernate = hibernate_in_trans_opts(TransOpts)},
-              [Event|Events]);
+                state_data = State_Data,
+                hibernate = Hibernate},
+              Q);
 	{next_state,State,NewData,Actions} ->
-            loop_event_actions(
-              Parent, Debug, S,
-              Events, Event, State, NewData, TransOpts,
-              Actions, false);
+            loop_actions(
+              P, Debug, S, Q, {State,NewData},
+              NextEventsR, Hibernate, TimeoutsR, Postpone,
+              false, StateCall, Actions);
 	{next_state,NextState,NewData,Actions}
-          when TransOpts =:= false ->
-            loop_event_actions(
-              Parent, Debug, S,
-              Events, Event, NextState, NewData, TransOpts,
-              Actions, true);
+          when StateCall ->
+            loop_actions(
+              P, Debug, S, Q, {NextState,NewData},
+              NextEventsR, Hibernate, TimeoutsR, Postpone,
+              true, StateCall, Actions);
 	{next_state,_NextState,_NewData,_Actions} ->
             terminate(
               error,
               {bad_state_enter_return_from_state_function,Result},
-              ?STACKTRACE(), Debug,
+              ?STACKTRACE(), P, Debug,
               S#state{
-                state = State, data = Data,
-                hibernate = hibernate_in_trans_opts(TransOpts)},
-              [Event|Events]);
+                state_data = State_Data,
+                hibernate = Hibernate},
+              Q);
         %%
         {keep_state,NewData} ->
-            loop_event_actions(
-              Parent, Debug, S,
-              Events, Event, State, NewData, TransOpts,
-              [], false);
+            loop_actions(
+              P, Debug, S, Q, {State,NewData},
+              NextEventsR, Hibernate, TimeoutsR, Postpone,
+              false);
         {keep_state,NewData,Actions} ->
-            loop_event_actions(
-              Parent, Debug, S,
-              Events, Event, State, NewData, TransOpts,
-              Actions, false);
+            loop_actions(
+              P, Debug, S, Q, {State,NewData},
+              NextEventsR, Hibernate, TimeoutsR, Postpone,
+              false, StateCall, Actions);
         %%
         keep_state_and_data ->
-            loop_event_actions(
-              Parent, Debug, S,
-              Events, Event, State, Data, TransOpts,
-              [], false);
+            loop_actions(
+              P, Debug, S, Q, State_Data,
+              NextEventsR, Hibernate, TimeoutsR, Postpone,
+              false);
         {keep_state_and_data,Actions} ->
-            loop_event_actions(
-              Parent, Debug, S,
-              Events, Event, State, Data, TransOpts,
-              Actions, false);
+            loop_actions(
+              P, Debug, S, Q, State_Data,
+              NextEventsR, Hibernate, TimeoutsR, Postpone,
+              false, StateCall, Actions);
         %%
         {repeat_state,NewData} ->
-            loop_event_actions(
-              Parent, Debug, S,
-              Events, Event, State, NewData, TransOpts,
-              [], true);
+            loop_actions(
+              P, Debug, S, Q, {State,NewData},
+              NextEventsR, Hibernate, TimeoutsR, Postpone,
+              true);
         {repeat_state,NewData,Actions} ->
-            loop_event_actions(
-              Parent, Debug, S,
-              Events, Event, State, NewData, TransOpts,
-              Actions, true);
+            loop_actions(
+              P, Debug, S, Q, {State,NewData},
+              NextEventsR, Hibernate, TimeoutsR, Postpone,
+              true, StateCall, Actions);
         %%
         repeat_state_and_data ->
-            loop_event_actions(
-              Parent, Debug, S,
-              Events, Event, State, Data, TransOpts,
-              [], true);
+            loop_actions(
+              P, Debug, S, Q, State_Data,
+              NextEventsR, Hibernate, TimeoutsR, Postpone,
+              true);
         {repeat_state_and_data,Actions} ->
-            loop_event_actions(
-              Parent, Debug, S,
-              Events, Event, State, Data, TransOpts,
-              Actions, true);
+            loop_actions(
+              P, Debug, S, Q, State_Data,
+              NextEventsR, Hibernate, TimeoutsR, Postpone,
+              true, StateCall, Actions);
         %%
 	stop ->
             terminate(
-              exit, normal, ?STACKTRACE(), Debug,
+              exit, normal, ?STACKTRACE(), P, Debug,
               S#state{
-                state = State, data = Data,
-                hibernate = hibernate_in_trans_opts(TransOpts)},
-              [Event|Events]);
+                state_data = State_Data,
+                hibernate = Hibernate},
+              Q);
 	{stop,Reason} ->
             terminate(
-              exit, Reason, ?STACKTRACE(), Debug,
+              exit, Reason, ?STACKTRACE(), P, Debug,
               S#state{
-                state = State, data = Data,
-                hibernate = hibernate_in_trans_opts(TransOpts)},
-              [Event|Events]);
+                state_data = State_Data,
+                hibernate = Hibernate},
+              Q);
 	{stop,Reason,NewData} ->
             terminate(
-              exit, Reason, ?STACKTRACE(), Debug,
+              exit, Reason, ?STACKTRACE(), P, Debug,
               S#state{
-                state = State, data = NewData,
-                hibernate = hibernate_in_trans_opts(TransOpts)},
-              [Event|Events]);
+                state_data = {State,NewData},
+                hibernate = Hibernate},
+              Q);
 	%%
 	{stop_and_reply,Reason,Replies} ->
             reply_then_terminate(
-              exit, Reason, ?STACKTRACE(), Debug,
+              exit, Reason, ?STACKTRACE(), P, Debug,
               S#state{
-                state = State, data = Data,
-                hibernate = hibernate_in_trans_opts(TransOpts)},
-              [Event|Events], Replies);
+                state_data = State_Data,
+                hibernate = Hibernate},
+              Q, Replies);
 	{stop_and_reply,Reason,Replies,NewData} ->
             reply_then_terminate(
-              exit, Reason, ?STACKTRACE(), Debug,
+              exit, Reason, ?STACKTRACE(), P, Debug,
               S#state{
-                state = State, data = NewData,
-                hibernate = hibernate_in_trans_opts(TransOpts)},
-              [Event|Events], Replies);
+                state_data = {State,NewData},
+                hibernate = Hibernate},
+              Q, Replies);
 	%%
 	_ ->
             terminate(
               error,
               {bad_return_from_state_function,Result},
-              ?STACKTRACE(), Debug,
+              ?STACKTRACE(), P, Debug,
               S#state{
-                state = State, data = Data,
-                hibernate = hibernate_in_trans_opts(TransOpts)},
-              [Event|Events])
+                state_data = State_Data,
+                hibernate = Hibernate},
+              Q)
     end.
 
 %% 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) ->
+%%
+loop_actions(
+  P, Debug, S, Q, NextState_NewData,
+  NextEventsR, Hibernate, TimeoutsR, Postpone,
+  CallEnter, _StateCall, []) ->
+    loop_actions(
+      P, Debug, S, Q, NextState_NewData,
+      NextEventsR, Hibernate, TimeoutsR, Postpone,
+      CallEnter);
+loop_actions(
+  P, Debug, S, Q, NextState_NewData,
+  NextEventsR, Hibernate, TimeoutsR, Postpone,
+  CallEnter, StateCall, Actions) ->
     %%
-    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 = hibernate_in_trans_opts(TransOpts)},
-              [Event|Events])
+    loop_actions_list(
+      P, Debug, S, Q, NextState_NewData,
+      NextEventsR, Hibernate, TimeoutsR, Postpone,
+      CallEnter, StateCall, listify(Actions)).
+%%
+%% Shortcut for no actions
+-compile({inline, [loop_actions/10]}).
+loop_actions(
+  P, Debug, S, Q, NextState_NewData,
+  NextEventsR, Hibernate, TimeoutsR, Postpone,
+  CallEnter) ->
+    %%
+    %% Shortcut for no actions
+    case CallEnter andalso P#params.state_enter of
+	true ->
+            loop_state_enter(
+              P, Debug, S, Q, NextState_NewData,
+              NextEventsR, Hibernate, TimeoutsR, Postpone);
+	false ->
+            loop_state_transition(
+              P, Debug, S, Q, NextState_NewData,
+              NextEventsR, Hibernate, TimeoutsR, Postpone)
     end.
 
--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.
-
-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).
+%% Process the returned actions
 %%
-parse_actions(_StateCall, Debug, _S, [], TransOpts) ->
-    {Debug,TransOpts};
-parse_actions(StateCall, Debug, S, [Action|Actions], TransOpts) ->
+loop_actions_list(
+  P, Debug, S, Q, NextState_NewData,
+  NextEventsR, Hibernate, TimeoutsR, Postpone,
+  CallEnter, _StateCall, []) ->
+    %%
+    case P#params.state_enter of
+        true when CallEnter ->
+            loop_state_enter(
+              P, Debug, S, Q, NextState_NewData,
+              NextEventsR, Hibernate, TimeoutsR, Postpone);
+        _ ->
+            loop_state_transition(
+              P, Debug, S, Q, NextState_NewData,
+              NextEventsR, Hibernate, TimeoutsR, Postpone)
+    end;
+loop_actions_list(
+  P, Debug, S, Q, NextState_NewData,
+  NextEventsR, Hibernate, TimeoutsR, Postpone,
+  CallEnter, StateCall, [Action|Actions]) ->
+    %%
     case Action of
 	%% Actual actions
 	{reply,From,Reply} ->
-            parse_actions_reply(
-              StateCall, Debug, S, Actions, TransOpts, From, Reply);
+            loop_actions_reply(
+              P, Debug, S, Q, NextState_NewData,
+              NextEventsR, Hibernate, TimeoutsR, Postpone,
+              CallEnter, StateCall, Actions,
+              From, Reply);
 	%%
 	%% Actions that set options
-	{hibernate,NewHibernate} when is_boolean(NewHibernate) ->
-            parse_actions(
-              StateCall, Debug, S, Actions,
-              TransOpts#trans_opts{hibernate = NewHibernate});
+	{hibernate,Hibernate_1} when is_boolean(Hibernate_1) ->
+            loop_actions_list(
+              P, Debug, S, Q, NextState_NewData,
+              NextEventsR, Hibernate_1, TimeoutsR, Postpone,
+              CallEnter, StateCall, Actions);
 	hibernate ->
-            parse_actions(
-              StateCall, Debug, S, Actions,
-              TransOpts#trans_opts{hibernate = true});
+            loop_actions_list(
+              P, Debug, S, Q, NextState_NewData,
+              NextEventsR, true, TimeoutsR, Postpone,
+              CallEnter, StateCall, Actions);
 	%%
-	{postpone,NewPostpone} when not NewPostpone orelse StateCall ->
-            parse_actions(
-              StateCall, Debug, S, Actions,
-              TransOpts#trans_opts{postpone = NewPostpone});
+	{postpone,Postpone_1} when not Postpone_1 orelse StateCall ->
+            loop_actions_list(
+              P, Debug, S, Q, NextState_NewData,
+              NextEventsR, Hibernate, TimeoutsR, Postpone_1,
+              CallEnter, StateCall, Actions);
 	postpone when StateCall ->
-            parse_actions(
-              StateCall, Debug, S, Actions,
-              TransOpts#trans_opts{postpone = true});
+            loop_actions_list(
+              P, Debug, S, Q, NextState_NewData,
+              NextEventsR, Hibernate, TimeoutsR, true,
+              CallEnter, StateCall, Actions);
 	postpone ->
-            [error,
-             {bad_state_enter_action_from_state_function,Action},
-             ?STACKTRACE(),
-             Debug];
+            terminate(
+              error,
+              {bad_state_enter_action_from_state_function,Action},
+              ?STACKTRACE(), P, Debug,
+              S#state{
+                state_data = NextState_NewData,
+                hibernate = Hibernate},
+              Q);
 	%%
 	{next_event,Type,Content} ->
-            parse_actions_next_event(
-              StateCall, Debug, S, Actions, TransOpts, Type, Content);
+            loop_actions_next_event(
+              P, Debug, S, Q, NextState_NewData,
+              NextEventsR, Hibernate, TimeoutsR, Postpone,
+              CallEnter, StateCall, Actions, Type, Content);
 	%%
-        _ ->
-            parse_actions_timeout(
-              StateCall, Debug, S, Actions, TransOpts, Action)
+        Timeout ->
+            loop_actions_timeout(
+              P, Debug, S, Q, NextState_NewData,
+              NextEventsR, Hibernate, TimeoutsR, Postpone,
+              CallEnter, StateCall, Actions, Timeout)
     end.
 
-parse_actions_reply(
-  StateCall, ?not_sys_debug, S, Actions, TransOpts,
+%% Process a reply action
+%%
+loop_actions_reply(
+  P, Debug, S, Q, NextState_NewData,
+  NextEventsR, Hibernate, TimeoutsR, Postpone,
+  CallEnter, StateCall, Actions,
   From, Reply) ->
     %%
     case from(From) of
         true ->
+            %% No need for a separate ?not_sys_debug clause here
+            %% since the external call to erlang:'!'/2 in reply/2
+            %% will cause swap out of all live registers anyway
             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);
+            Debug_1 = ?sys_debug(Debug, P#params.name, {out,Reply,From}),
+            loop_actions_list(
+              P, Debug_1, S, Q, NextState_NewData,
+              NextEventsR, Hibernate, TimeoutsR, Postpone,
+              CallEnter, StateCall, Actions);
         false ->
-            [error,
-             {bad_action_from_state_function,{reply,From,Reply}},
-             ?STACKTRACE(),
-             Debug]
+            terminate(
+              error,
+              {bad_action_from_state_function,{reply,From,Reply}},
+              ?STACKTRACE(), P, Debug,
+              S#state{
+                state_data = NextState_NewData,
+                hibernate = Hibernate},
+              Q)
     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_state_enter_action_from_state_function,
-	      {next_event,Type,Content}},
-             ?STACKTRACE(),
-             ?not_sys_debug]
-    end;
-parse_actions_next_event(
-  StateCall, Debug, #state{name = Name, state = State} = S,
-  Actions, TransOpts, Type, Content) ->
+%% Process a next_event action
+%%
+loop_actions_next_event(
+  P, Debug, S, Q, NextState_NewData,
+  NextEventsR, Hibernate, TimeoutsR, Postpone,
+  CallEnter, StateCall, Actions, 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]});
+            NextEvent = {Type,Content},
+            case Debug of
+                ?not_sys_debug ->
+                    loop_actions_list(
+                      P, Debug, S, Q, NextState_NewData,
+                      [NextEvent|NextEventsR],
+                      Hibernate, TimeoutsR, Postpone,
+                      CallEnter, StateCall, Actions);
+                _ ->
+                    Name = P#params.name,
+                    {State,_Data} = S#state.state_data,
+                    Debug_1 =
+                        sys_debug(Debug, Name, {in,{Type,Content},State}),
+                    loop_actions_list(
+                      P, Debug_1, S, Q, NextState_NewData,
+                      [NextEvent|NextEventsR],
+                      Hibernate, TimeoutsR, Postpone,
+                      CallEnter, StateCall, Actions)
+              end;
         _ ->
-            [error,
-             {bad_state_enter_action_from_state_function,
-	      {next_event,Type,Content}},
-             ?STACKTRACE(),
-             Debug]
+            terminate(
+              error,
+              {if
+                   StateCall ->
+                       bad_action_from_state_function;
+                   true ->
+                       bad_state_enter_action_from_state_function
+               end,
+               {next_event,Type,Content}},
+              ?STACKTRACE(), P, Debug,
+              S#state{
+                state_data = NextState_NewData,
+                hibernate = Hibernate},
+              Q)
     end.
 
-parse_actions_timeout(
-  StateCall, Debug, S, Actions, TransOpts,
-  {TimeoutType,Time,TimerMsg,TimerOpts} = AbsoluteTimeout) ->
+%% Process a timeout action, or also any unrecognized action
+%%
+loop_actions_timeout(
+  P, Debug, S, Q, NextState_NewData,
+  NextEventsR, Hibernate, TimeoutsR, Postpone,
+  CallEnter, StateCall, Actions,
+  {TimeoutType,Time,TimeoutMsg,TimeoutOpts} = Timeout) ->
     %%
-    case classify_timeout(TimeoutType, Time, listify(TimerOpts)) of
-        absolute ->
-            parse_actions_timeout_add(
-              StateCall, Debug, S, Actions,
-              TransOpts, AbsoluteTimeout);
-        relative ->
-            RelativeTimeout = {TimeoutType,Time,TimerMsg},
-            parse_actions_timeout_add(
-              StateCall, Debug, S, Actions,
-              TransOpts, RelativeTimeout);
-        badarg ->
-            [error,
-             {bad_action_from_state_function,AbsoluteTimeout},
-             ?STACKTRACE(),
-             Debug]
+    case timeout_event_type(TimeoutType) of
+        true ->
+            case listify(TimeoutOpts) of
+                %% Optimization cases
+                [] when ?relative_timeout(Time) ->
+                    RelativeTimeout = {TimeoutType,Time,TimeoutMsg},
+                    loop_actions_list(
+                      P, Debug, S, Q, NextState_NewData,
+                      NextEventsR, Hibernate,
+                      [RelativeTimeout|TimeoutsR], Postpone,
+                      CallEnter, StateCall, Actions);
+                [{abs,true}] when ?absolute_timeout(Time) ->
+                    loop_actions_list(
+                      P, Debug, S, Q, NextState_NewData,
+                      NextEventsR, Hibernate,
+                      [Timeout|TimeoutsR], Postpone,
+                      CallEnter, StateCall, Actions);
+                [{abs,false}] when ?relative_timeout(Time) ->
+                    RelativeTimeout = {TimeoutType,Time,TimeoutMsg},
+                    loop_actions_list(
+                      P, Debug, S, Q, NextState_NewData,
+                      NextEventsR, Hibernate,
+                      [RelativeTimeout|TimeoutsR], Postpone,
+                      CallEnter, StateCall, Actions);
+                %% Generic case
+                TimeoutOptsList ->
+                    case parse_timeout_opts_abs(TimeoutOptsList) of
+                        true when ?absolute_timeout(Time) ->
+                            loop_actions_list(
+                              P, Debug, S, Q, NextState_NewData,
+                              NextEventsR, Hibernate,
+                              [Timeout|TimeoutsR], Postpone,
+                              CallEnter, StateCall, Actions);
+                        false when ?relative_timeout(Time) ->
+                            RelativeTimeout =
+                                {TimeoutType,Time,TimeoutMsg},
+                            loop_actions_list(
+                              P, Debug, S, Q, NextState_NewData,
+                              NextEventsR, Hibernate,
+                              [RelativeTimeout|TimeoutsR], Postpone,
+                              CallEnter, StateCall, Actions);
+                        badarg ->
+                            terminate(
+                              error,
+                              {bad_action_from_state_function,Timeout},
+                              ?STACKTRACE(), P, Debug,
+                              S#state{
+                                state_data = NextState_NewData,
+                                hibernate = Hibernate},
+                              Q)
+                    end
+            end;
+        false ->
+            terminate(
+              error,
+              {bad_action_from_state_function,Timeout},
+              ?STACKTRACE(), P, Debug,
+              S#state{
+                state_data = NextState_NewData,
+                hibernate = Hibernate},
+              Q)
     end;
-parse_actions_timeout(
-  StateCall, Debug, S, Actions, TransOpts,
-  {TimeoutType,Time,_} = RelativeTimeout) ->
-    case classify_timeout(TimeoutType, Time, []) of
-        relative ->
-            parse_actions_timeout_add(
-              StateCall, Debug, S, Actions,
-              TransOpts, RelativeTimeout);
-        badarg ->
-            [error,
-             {bad_action_from_state_function,RelativeTimeout},
-             ?STACKTRACE(),
-             Debug]
+loop_actions_timeout(
+  P, Debug, S, Q, NextState_NewData,
+  NextEventsR, Hibernate, TimeoutsR, Postpone,
+  CallEnter, StateCall, Actions,
+  {TimeoutType,Time,_} = Timeout) ->
+    %%
+    case timeout_event_type(TimeoutType) of
+        true when ?relative_timeout(Time) ->
+            loop_actions_list(
+              P, Debug, S, Q, NextState_NewData,
+              NextEventsR, Hibernate,
+              [Timeout|TimeoutsR], Postpone,
+              CallEnter, StateCall, Actions);
+        _ ->
+            terminate(
+              error,
+              {bad_action_from_state_function,Timeout},
+              ?STACKTRACE(), P, Debug,
+              S#state{
+                state_data = NextState_NewData,
+                hibernate = Hibernate},
+              Q)
     end;
-parse_actions_timeout(
-  StateCall, Debug, S, Actions, TransOpts,
-  Time) ->
-    case classify_timeout(timeout, Time, []) of
-        relative ->
+loop_actions_timeout(
+  P, Debug, S, Q, NextState_NewData,
+  NextEventsR, Hibernate, TimeoutsR, Postpone,
+  CallEnter, StateCall, Actions, Time) ->
+    %%
+    if
+        ?relative_timeout(Time) ->
             RelativeTimeout = {timeout,Time,Time},
-            parse_actions_timeout_add(
-              StateCall, Debug, S, Actions,
-              TransOpts, RelativeTimeout);
-        badarg ->
-            [error,
-             {bad_action_from_state_function,Time},
-             ?STACKTRACE(),
-             Debug]
+            loop_actions_list(
+              P, Debug, S, Q, NextState_NewData,
+              NextEventsR, Hibernate,
+              [RelativeTimeout|TimeoutsR], Postpone,
+              CallEnter, StateCall, Actions);
+        true ->
+            terminate(
+              error,
+              {bad_action_from_state_function,Time},
+              ?STACKTRACE(), P, Debug,
+              S#state{
+                state_data = NextState_NewData,
+                hibernate = Hibernate},
+              Q)
     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 = State, postponed = P_0,
-     timer_refs = TimerRefs_0, timer_types = TimerTypes_0,
-     cancel_timers = CancelTimers_0} = S,
-  Events_0, Event_0, NextState, NewData,
-  #trans_opts{
-     hibernate = Hibernate, timeouts_r = TimeoutsR,
-     postpone = Postpone, next_events_r = NextEventsR}) ->
+%%
+loop_state_transition(
+  P, Debug, #state{state_data = {State,_Data}, postponed = Postponed} = S,
+  [Event|Events], {NextState,_NewData} = NextState_NewData,
+  NextEventsR, Hibernate, TimeoutsR, Postpone) ->
     %%
     %% All options have been collected and next_events are buffered.
     %% Do the actual state transition.
     %%
-    %% Full feature path
-    %%
-    [Debug_1|P_1] = % Move current event to postponed if Postpone
+    Postponed_1 = % Move current event to postponed if Postpone
 	case Postpone of
 	    true ->
-		[?sys_debug(
-                    Debug_0,
-                    {S#state.name,State},
-                    {postpone,Event_0,NextState}),
-		 Event_0|P_0];
+                [Event|Postponed];
 	    false ->
-		[?sys_debug(
-                    Debug_0,
-                    {S#state.name,State},
-                    {consume,Event_0,NextState})|P_0]
-	end,
-    {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,
-                 cancel_timer_by_type(
-                   timeout, {TimerTypes_0,CancelTimers_0})};
-	    true ->
-		{lists:reverse(P_1, Events_0),
-		 [],
-		 cancel_timer_by_type(
-		   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
+                Postponed
 	end,
-    {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_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
+    case Debug of
+        ?not_sys_debug ->
+	    %% Optimization for no sys_debug
+	    %% - avoid calling sys_debug/3
+	    if
+		NextState =:= State ->
+		    loop_keep_state(
+                      P, Debug, S,
+                      Events, NextState_NewData,
+                      NextEventsR, Hibernate, TimeoutsR, Postponed_1);
+		true ->
+		    loop_state_change(
+                      P, Debug, S,
+                      Events, NextState_NewData,
+                      NextEventsR, Hibernate, TimeoutsR, Postponed_1)
+	    end;
+        _ ->
+            %% With sys_debug
+            Name = P#params.name,
+	    Debug_1 =
+		case Postpone of
+		    true ->
+			sys_debug(
+			   Debug, Name,
+			   {postpone,Event,State,NextState});
+		    false ->
+			sys_debug(
+			   Debug, Name,
+			   {consume,Event,State,NextState})
+		end,
+	    if
+		NextState =:= State ->
+		    loop_keep_state(
+                      P, Debug_1, S,
+                      Events, NextState_NewData,
+                      NextEventsR, Hibernate, TimeoutsR, Postponed_1);
+		true ->
+		    loop_state_change(
+                      P, Debug_1, S,
+                      Events, NextState_NewData,
+                      NextEventsR, Hibernate, TimeoutsR, Postponed_1)
+	    end
+    end.
+
+%% State transition to the same state
+%%
+loop_keep_state(
+  P, Debug, #state{timers = {TimerRefs,TimeoutTypes} = Timers} = S,
+  Events, NextState_NewData,
+  NextEventsR, Hibernate, TimeoutsR, Postponed) ->
     %%
-    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) ->
+    %% Cancel event timeout
     %%
-    %% State change, event timeout active
+    case TimeoutTypes of
+	%% Optimization
+	%% - only cancel timer when there is a timer to cancel
+	#{timeout := TimerRef} ->
+	    %% Event timeout active
+	    loop_next_events(
+              P, Debug, S,
+              Events, NextState_NewData,
+              NextEventsR, Hibernate, TimeoutsR, Postponed,
+	      cancel_timer_by_ref_and_type(
+                TimerRef, timeout, TimerRefs, TimeoutTypes));
+	_ ->
+	    %% No event timeout active
+	    loop_next_events(
+              P, Debug, S,
+              Events, NextState_NewData,
+              NextEventsR, Hibernate, TimeoutsR, Postponed,
+              Timers)
+    end.
+
+%% State transition to a different state
+%%
+loop_state_change(
+  P, Debug, S, Events, NextState_NewData,
+  NextEventsR, Hibernate, TimeoutsR, Postponed) ->
     %%
-    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) ->
+    %% Retry postponed events
     %%
-    %% State change, state timeout active
+    case Postponed of
+        [] ->
+            loop_state_change(
+              P, Debug, S,
+              Events, NextState_NewData,
+              NextEventsR, Hibernate, TimeoutsR);
+        [E1] ->
+            loop_state_change(
+              P, Debug, S,
+              [E1|Events], NextState_NewData,
+              NextEventsR, Hibernate, TimeoutsR);
+        [E2,E1] ->
+            loop_state_change(
+              P, Debug, S,
+              [E1,E2|Events], NextState_NewData,
+              NextEventsR, Hibernate, TimeoutsR);
+        _ ->
+            loop_state_change(
+              P, Debug, S,
+              lists:reverse(Postponed, Events), NextState_NewData,
+              NextEventsR, Hibernate, TimeoutsR)
+    end.
+%%
+loop_state_change(
+  P, Debug, #state{timers = {TimerRefs,TimeoutTypes} = Timers} = S,
+  Events, NextState_NewData,
+  NextEventsR, Hibernate, TimeoutsR) ->
     %%
-    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) ->
+    %% Cancel state and event timeout
     %%
-    %% State change, no timeout to automatically cancel
+    case TimeoutTypes of
+	%% Optimization
+	%% - only cancel timeout when there is an active timeout
+	%%
+	#{state_timeout := TimerRef} ->
+	    %% State timeout active
+            %% - cancel event timeout too since it is faster than inspecting
+	    loop_next_events(
+              P, Debug, S, Events, NextState_NewData,
+              NextEventsR, Hibernate, TimeoutsR, [],
+              cancel_timer_by_type(
+                timeout,
+                cancel_timer_by_ref_and_type(
+                  TimerRef, state_timeout, TimerRefs, TimeoutTypes)));
+        #{timeout := TimerRef} ->
+            %% Event timeout active but not state timeout
+            %% - cancel event timeout only
+            loop_next_events(
+              P, Debug, S, Events, NextState_NewData,
+              NextEventsR, Hibernate, TimeoutsR, [],
+              cancel_timer_by_ref_and_type(
+                TimerRef, timeout, TimerRefs, TimeoutTypes));
+        _ ->
+            %% No state nor event timeout active.
+            loop_next_events(
+              P, Debug, S, Events, NextState_NewData,
+              NextEventsR, Hibernate, TimeoutsR, [],
+              Timers)
+    end.
+
+%% Continue state transition with processing of
+%% inserted events and timeout events
+%%
+loop_next_events(
+  P, Debug, S,
+  Events, NextState_NewData,
+  NextEventsR, Hibernate, [], Postponed,
+  Timers) ->
     %%
-    loop_event_done(
-      Parent, ?not_sys_debug,
+    %% Optimization when there are no timeout actions
+    %% hence no timeout zero events to append to Events
+    %% - avoid loop_timeouts
+    loop_done(
+      P, 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}) ->
+        state_data = NextState_NewData,
+	postponed = Postponed,
+        timers = Timers,
+	hibernate = Hibernate},
+      NextEventsR, Events);
+loop_next_events(
+  P, Debug, S,
+  Events, NextState_NewData,
+  NextEventsR, Hibernate, TimeoutsR, Postponed,
+  Timers) ->
     %%
-    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
+    Seen = #{},
+    TimeoutEvents = [],
+    loop_timeouts(
+      P, Debug, S,
+      Events, NextState_NewData,
+      NextEventsR, Hibernate, TimeoutsR, Postponed,
+      Timers, Seen, TimeoutEvents).
+
+%% Continue state transition with processing of timeout events
+%%
+loop_timeouts(
+  P, Debug, S,
+  Events, NextState_NewData,
+  NextEventsR, Hibernate, [], Postponed,
+  Timers, _Seen, TimeoutEvents) ->
+    %%
+    S_1 =
+        S#state{
+          state_data = NextState_NewData,
+          postponed = Postponed,
+          timers = Timers,
+          hibernate = Hibernate},
+    case TimeoutEvents of
         [] ->
-            %% Get a new event
-            loop(Parent, Debug, S);
-        [{Type,Content}|Events] ->
-	    %% Loop until out of enqueued events
-	    loop_event(Parent, Debug, S, Events, Type, Content)
+            loop_done(P, Debug, S_1, NextEventsR, Events);
+        _ ->
+            case Events of
+                [] ->
+                    loop_prepend_timeout_events(
+                      P, Debug, S_1, TimeoutEvents,
+                      NextEventsR);
+                [E1] ->
+                    loop_prepend_timeout_events(
+                      P, Debug, S_1, TimeoutEvents,
+                      [E1|NextEventsR]);
+                [E2,E1] ->
+                    loop_prepend_timeout_events(
+                      P, Debug, S_1, TimeoutEvents,
+                      [E1,E2|NextEventsR]);
+                _ ->
+                    loop_prepend_timeout_events(
+                      P, Debug, S_1, TimeoutEvents,
+                      lists:reverse(Events, NextEventsR))
+            end
+    end;
+loop_timeouts(
+  P, Debug, S,
+  Events, NextState_NewData,
+  NextEventsR, Hibernate, [Timeout|TimeoutsR], Postponed,
+  Timers, Seen, TimeoutEvents) ->
+    %%
+    case Timeout of
+        {TimeoutType,Time,TimeoutMsg} ->
+            %% Relative timeout
+            case Seen of
+                #{TimeoutType := _} ->
+                    %% Type seen before - ignore
+                    loop_timeouts(
+                      P, Debug, S,
+                      Events, NextState_NewData,
+                      NextEventsR, Hibernate, TimeoutsR, Postponed,
+                      Timers, Seen, TimeoutEvents);
+                #{} ->
+                    loop_timeouts(
+                      P, Debug, S,
+                      Events, NextState_NewData,
+                      NextEventsR, Hibernate, TimeoutsR, Postponed,
+                      Timers, Seen, TimeoutEvents,
+                      TimeoutType, Time, TimeoutMsg, [])
+            end;
+        {TimeoutType,Time,TimeoutMsg,TimeoutOpts} ->
+            %% Absolute timeout
+            case Seen of
+                #{TimeoutType := _} ->
+                    %% Type seen before - ignore
+                    loop_timeouts(
+                      P, Debug, S,
+                      Events, NextState_NewData,
+                      NextEventsR, Hibernate, TimeoutsR, Postponed,
+                      Timers, Seen, TimeoutEvents);
+                #{} ->
+                    loop_timeouts(
+                      P, Debug, S,
+                      Events, NextState_NewData,
+                      NextEventsR, Hibernate, TimeoutsR, Postponed,
+                      Timers, Seen, TimeoutEvents,
+                      TimeoutType, Time, TimeoutMsg, listify(TimeoutOpts))
+            end
     end.
-
-
-%%---------------------------------------------------------------------------
-%% Server loop helpers
-
-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:Stacktrace ->
-	    [Class,Reason,Stacktrace]
+%%
+loop_timeouts(
+  P, Debug, S,
+  Events, NextState_NewData,
+  NextEventsR, Hibernate, TimeoutsR, Postponed,
+  Timers, Seen, TimeoutEvents,
+  TimeoutType, Time, TimeoutMsg, TimeoutOpts) ->
+    %%
+    case Time of
+        infinity ->
+            %% Cancel any running timer
+            loop_timeouts_cancel(
+              P, Debug, S,
+              Events, NextState_NewData,
+              NextEventsR, Hibernate, TimeoutsR, Postponed,
+              Timers, Seen, TimeoutEvents,
+              TimeoutType);
+        0 when TimeoutOpts =:= [] ->
+            %% Relative timeout zero
+            %% - cancel any running timer
+            %%   handle timeout zero events later
+            %%
+            loop_timeouts_cancel(
+              P, Debug, S,
+              Events, NextState_NewData,
+              NextEventsR, Hibernate, TimeoutsR, Postponed,
+              Timers, Seen, [{TimeoutType,TimeoutMsg}|TimeoutEvents],
+              TimeoutType);
+        _ ->
+            %% (Re)start the timer
+            TimerRef =
+                erlang:start_timer(Time, self(), TimeoutMsg, TimeoutOpts),
+            {TimerRefs,TimeoutTypes} = Timers,
+            case TimeoutTypes of
+                #{TimeoutType := OldTimerRef} ->
+                    %% Cancel the running timer,
+                    %% update the timeout type,
+                    %% insert the new timer ref,
+                    %% and remove the old timer ref
+                    Timers_1 =
+                        {maps:remove(
+                           OldTimerRef,
+                           TimerRefs#{TimerRef => TimeoutType}),
+                         TimeoutTypes#{TimeoutType := TimerRef}},
+                    cancel_timer(OldTimerRef),
+                    loop_timeouts(
+                      P, Debug, S,
+                      Events, NextState_NewData,
+                      NextEventsR, Hibernate, TimeoutsR, Postponed,
+                      Timers_1, Seen#{TimeoutType => true}, TimeoutEvents);
+                #{} ->
+                    %% Insert the new timer type and ref
+                    Timers_1 =
+                        {TimerRefs#{TimerRef => TimeoutType},
+                         TimeoutTypes#{TimeoutType => TimerRef}},
+                    loop_timeouts(
+                      P, Debug, S,
+                      Events, NextState_NewData,
+                      NextEventsR, Hibernate, TimeoutsR, Postponed,
+                      Timers_1, Seen#{TimeoutType => true}, TimeoutEvents)
+            end
     end.
 
-callback_mode_result(S, CallbackMode) ->
-    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 ->
-            callback_mode_result(S, CallbackMode, T, H, StateEnter);
-	false ->
-	    case state_enter(H) of
-		true ->
-                    callback_mode_result(S, CallbackMode, T, CBMode, true);
-		false ->
-                    [error,
-                     {bad_return_from_callback_mode,CallbackMode},
-                     ?STACKTRACE()]
-	    end
+%% Loop helper to cancel a timeout
+%%
+loop_timeouts_cancel(
+  P, Debug, S,
+  Events, NextState_NewData,
+  NextEventsR, Hibernate, TimeoutsR, Postponed,
+  {TimerRefs,TimeoutTypes} = Timers, Seen, TimeoutEvents,
+  TimeoutType) ->
+    %% This function body should have been:
+    %%    Timers_1 = cancel_timer_by_type(TimeoutType, Timers),
+    %%    loop_timeouts(
+    %%      P, Debug, S,
+    %%      Events, NextState_NewData,
+    %%      NextEventsR, Hibernate, TimeoutsR, Postponed,
+    %%      Timers_1, Seen#{TimeoutType => true}, TimeoutEvents).
+    %%
+    %% Explicitly separate cases to get separate code paths for when
+    %% the map key exists vs. not, since otherwise the external call
+    %% to erlang:cancel_timer/1 and to map:remove/2 within
+    %% cancel_timer_by_type/2 would cause all live registers
+    %% to be saved to and restored from the stack also for
+    %% the case when the map key TimeoutType does not exist
+    case TimeoutTypes of
+        #{TimeoutType := TimerRef} ->
+            Timers_1 =
+                cancel_timer_by_ref_and_type(
+                  TimerRef, TimeoutType, TimerRefs, TimeoutTypes),
+            loop_timeouts(
+              P, Debug, S,
+              Events, NextState_NewData,
+              NextEventsR, Hibernate, TimeoutsR, Postponed,
+              Timers_1, Seen#{TimeoutType => true}, TimeoutEvents);
+        #{} ->
+            loop_timeouts(
+              P, Debug, S,
+              Events, NextState_NewData,
+              NextEventsR, Hibernate, TimeoutsR, Postponed,
+              Timers, Seen#{TimeoutType => true}, TimeoutEvents)
     end.
 
+%% Continue state transition with prepending timeout zero events
+%% before event queue reversal i.e appending timeout zero events
+%%
+loop_prepend_timeout_events(P, Debug, S, TimeoutEvents, EventsR) ->
+    {Debug_1,Events_1R} =
+        prepend_timeout_events(P, Debug, S, TimeoutEvents, EventsR),
+    loop_done(P, Debug_1, S, Events_1R, []).
 
-call_state_function(
-  #state{callback_mode = undefined} = S, Type, Content, State, Data) ->
-    case call_callback_mode(S) of
-	#state{} = NewS ->
-	    call_state_function(NewS, Type, Content, State, Data);
-	Error ->
-	    Error
-    end;
-call_state_function(
-  #state{callback_mode = CallbackMode, module = Module} = S,
-  Type, Content, State, Data) ->
-    try
-	case CallbackMode of
-	    state_functions ->
-		Module:State(Type, Content, Data);
-	    handle_event_function ->
-		Module:handle_event(Type, Content, State, Data)
-	end
-    of
-	Result ->
-	    {Result,S}
-    catch
-	Result ->
-	    {Result,S};
-	Class:Reason:Stacktrace ->
-	    [Class,Reason,Stacktrace]
+%% Place inserted events first in the event queue
+%%
+loop_done(P, Debug, S, NextEventsR, Events) ->
+    case NextEventsR of
+        [] ->
+            loop_done(P, Debug, S, Events);
+        [E1] ->
+            loop_done(P, Debug, S, [E1|Events]);
+        [E2,E1] ->
+            loop_done(P, Debug, S, [E1,E2|Events]);
+        _ ->
+            loop_done(P, Debug, S, lists:reverse(NextEventsR, Events))
     end.
-
-
-%% -> absolute | relative | badarg
-classify_timeout(TimeoutType, Time, Opts) ->
-    case timeout_event_type(TimeoutType) of
-        true ->
-            classify_time(false, Time, Opts);
-        false ->
-            badarg
+%%
+%% State transition is done, keep looping if there are
+%% enqueued events, otherwise get a new event
+%%
+loop_done(P, Debug, S, Q) ->
+%%%    io:format(
+%%%      "loop_done: state_data = ~p,~n"
+%%%      "    postponed = ~p, Q = ~p,~n",
+%%%      "    timers = ~p.~n"
+%%%      [S#state.state_data,,S#state.postponed,Q,S#state.timers]),
+    case Q of
+        [] ->
+            %% Get a new event
+            loop(P, Debug, S);
+        [Event|Events] ->
+	    %% Loop until out of enqueued events
+	    loop_event(P, Debug, S, Event, Events)
     end.
 
-classify_time(Abs, Time, []) ->
-    case Abs of
-        true when
-              is_integer(Time);
-              Time =:= infinity ->
-            absolute;
-        false when
-              is_integer(Time), 0 =< Time;
-              Time =:= infinity ->
-            relative;
-        _ ->
-            badarg
-    end;
-classify_time(_, Time, [{abs,Abs}|Opts]) when is_boolean(Abs) ->
-    classify_time(Abs, Time, Opts);
-classify_time(_, _, Opts) when is_list(Opts) ->
-    badarg.
+%%---------------------------------------------------------------------------
+%% Server loop helpers
 
-%% Stop and start timers as well as create timeout zero events
-%% and pending event timer
+%% Parse an option list for erlang:start_timer/4 to figure out
+%% if the timeout will be absolute or relative
 %%
-%% Stop and start timers non-event timers
-parse_timers(TimerRefs, Timers, TimeoutsR) ->
-    parse_timers(TimerRefs, Timers, TimeoutsR, #{}, []).
+parse_timeout_opts_abs(Opts) ->
+    parse_timeout_opts_abs(Opts, false).
 %%
-parse_timers(
-  TimerRefs, Timers, [], _Seen, TimeoutEvents) ->
-    %%
-    {TimerRefs,Timers,TimeoutEvents};
-parse_timers(
-  TimerRefs, Timers, [Timeout|TimeoutsR], Seen, TimeoutEvents) ->
-    %%
-    case Timeout of
-	{TimerType,Time,TimerMsg,TimerOpts} ->
-	    %% Absolute timer
-	    parse_timers(
-	      TimerRefs, Timers, TimeoutsR, Seen, TimeoutEvents,
-	      TimerType, Time, TimerMsg, listify(TimerOpts));
-	%% Relative timers below
-	{TimerType,0,TimerMsg} ->
-	    parse_timers(
-	      TimerRefs, Timers, TimeoutsR, Seen, TimeoutEvents,
-	      TimerType, zero, TimerMsg, []);
-	{TimerType,Time,TimerMsg} ->
-	    parse_timers(
-	      TimerRefs, Timers, TimeoutsR, Seen, TimeoutEvents,
-	      TimerType, Time, TimerMsg, [])
-    end.
-
-parse_timers(
-  TimerRefs, Timers, TimeoutsR, Seen, TimeoutEvents,
-  TimerType, Time, TimerMsg, TimerOpts) ->
-    case Seen of
-	#{TimerType := _} ->
-	    %% Type seen before - ignore
-	    parse_timers(
-              TimerRefs, Timers, TimeoutsR, Seen, TimeoutEvents);
-	#{} ->
-	    %% Unseen type - handle
-	    NewSeen = Seen#{TimerType => true},
-	    case Time of
-		infinity ->
-		    %% Cancel any running timer
-		    parse_timers(
-		      TimerRefs, cancel_timer_by_type(TimerType, Timers),
-                      TimeoutsR, NewSeen, TimeoutEvents);
-		zero ->
-		    %% Cancel any running timer
-		    %% Handle zero time timeouts later
-		    parse_timers(
-		      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 Timers of
-			{#{TimerType := OldTimerRef} = TimerTypes,
-                         CancelTimers} ->
-			    %% Cancel the running timer
-			    cancel_timer(OldTimerRef),
-			    NewCancelTimers = CancelTimers + 1,
-			    %% Insert the new timer into
-			    %% both TimerRefs and TimerTypes
-			    parse_timers(
-			      TimerRefs#{TimerRef => TimerType},
-			      {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)
-		    end
-	    end
+parse_timeout_opts_abs(Opts, Abs) ->
+    case Opts of
+        [] ->
+            Abs;
+        [{abs,Abs_1}|Opts] when is_boolean(Abs_1) ->
+            parse_timeout_opts_abs(Opts, Abs_1);
+        _ ->
+            badarg
     end.
 
 %% Enqueue immediate timeout events (timeout 0 events)
@@ -1791,62 +2061,94 @@ parse_timers(
 %% so if there are enqueued events before the event timer
 %% timeout 0 event - the event timer is cancelled hence no event.
 %%
-%% Other (state_timeout) timeout 0 events that are after
-%% the event timer timeout 0 events are considered to
+%% Other (state_timeout and {timeout,Name}) timeout 0 events
+%% that are after an event timer timeout 0 event are considered to
 %% belong to timers that were started after the event timer
 %% timeout 0 event fired, so they do not cancel the event timer.
 %%
-prepend_timeout_events([], EventsR) ->
-    EventsR;
-prepend_timeout_events([{timeout,_} = TimeoutEvent|TimeoutEvents], []) ->
-    prepend_timeout_events(TimeoutEvents, [TimeoutEvent]);
-prepend_timeout_events([{timeout,_}|TimeoutEvents], EventsR) ->
+prepend_timeout_events(_P, Debug, _S, [], EventsR) ->
+    {Debug,EventsR};
+prepend_timeout_events(
+  P, Debug, S, [{timeout,_} = TimeoutEvent|TimeoutEvents], []) ->
+    %% Prepend this since there are no other events in queue
+    case Debug of
+        ?not_sys_debug ->
+            prepend_timeout_events(
+              P, Debug, S, TimeoutEvents, [TimeoutEvent]);
+        _ ->
+            {State,_Data} = S#state.state_data,
+            Debug_1 =
+              sys_debug(
+                Debug, P#params.name, {in,TimeoutEvent,State}),
+            prepend_timeout_events(
+              P, Debug_1, S, TimeoutEvents, [TimeoutEvent])
+    end;
+prepend_timeout_events(
+  P, Debug, S, [{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) ->
+    prepend_timeout_events(P, Debug, S, TimeoutEvents, EventsR);
+prepend_timeout_events(
+  P, Debug, S, [TimeoutEvent|TimeoutEvents], EventsR) ->
     %% Just prepend all others
-    prepend_timeout_events(TimeoutEvents, [TimeoutEvent|EventsR]).
+    case Debug of
+        ?not_sys_debug ->
+            prepend_timeout_events(
+              P, Debug, S, TimeoutEvents, [TimeoutEvent|EventsR]);
+        _ ->
+            {State,_Data} = S#state.state_data,
+            Debug_1 =
+                sys_debug(
+                  Debug, P#params.name, {in,TimeoutEvent,State}),
+            prepend_timeout_events(
+              P, Debug_1, S, TimeoutEvents, [TimeoutEvent|EventsR])
+    end.
 
 
 
 %%---------------------------------------------------------------------------
 %% Server helpers
 
-reply_then_terminate(Class, Reason, Stacktrace, Debug, S, Q, Replies) ->
+reply_then_terminate(Class, Reason, Stacktrace, P, Debug, S, Q, Replies) ->
     do_reply_then_terminate(
-      Class, Reason, Stacktrace, Debug, S, Q, listify(Replies)).
+      Class, Reason, Stacktrace, P, Debug, S, Q, listify(Replies)).
 %%
 do_reply_then_terminate(
-  Class, Reason, Stacktrace, Debug, S, Q, []) ->
-    terminate(Class, Reason, Stacktrace, Debug, S, Q);
+  Class, Reason, Stacktrace, P, Debug, S, Q, []) ->
+    terminate(Class, Reason, Stacktrace, P, Debug, S, Q);
 do_reply_then_terminate(
-  Class, Reason, Stacktrace, Debug, S, Q, [R|Rs]) ->
+  Class, Reason, Stacktrace, P, Debug, S, Q, [R|Rs]) ->
     case R of
-	{reply,{_To,_Tag}=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);
+        {reply,From,Reply} ->
+            case from(From) of
+                true ->
+                    reply(From, Reply),
+                    Debug_1 =
+                        ?sys_debug(
+                           Debug,
+                           P#params.name,
+                           {out,Reply,From}),
+                    do_reply_then_terminate(
+                      Class, Reason, Stacktrace, P, Debug_1, S, Q, Rs);
+                false ->
+                    terminate(
+                      error,
+                      {bad_reply_action_from_state_function,R},
+                      ?STACKTRACE(),
+                      P, Debug, S, Q)
+            end;
 	_ ->
 	    terminate(
 	      error,
 	      {bad_reply_action_from_state_function,R},
 	      ?STACKTRACE(),
-	      Debug, S, Q)
+	      P, Debug, S, Q)
     end.
 
 terminate(
-  Class, Reason, Stacktrace, Debug,
-  #state{module = Module, state = State, data = Data} = S,
-  Q) ->
+  Class, Reason, Stacktrace,
+  #params{module = Module} = P, Debug,
+  #state{state_data = {State,Data}} = S, Q) ->
     case erlang:function_exported(Module, terminate, 3) of
 	true ->
 	    try Module:terminate(Reason, State, Data) of
@@ -1854,8 +2156,7 @@ terminate(
 	    catch
 		_ -> ok;
 		C:R:ST ->
-		    error_info(C, R, ST, S, Q),
-		    sys:print_log(Debug),
+		    error_info(C, R, ST, Debug, P, S, Q),
 		    erlang:raise(C, R, ST)
 	    end;
 	false ->
@@ -1864,14 +2165,13 @@ terminate(
     _ =
 	case Reason of
 	    normal ->
-                terminate_sys_debug(Debug, S, State, Reason);
+                terminate_sys_debug(Debug, P, State, Reason);
 	    shutdown ->
-                terminate_sys_debug(Debug, S, State, Reason);
+                terminate_sys_debug(Debug, P, State, Reason);
 	    {shutdown,_} ->
-                terminate_sys_debug(Debug, S, State, Reason);
+                terminate_sys_debug(Debug, P, State, Reason);
 	    _ ->
-		error_info(Class, Reason, Stacktrace, S, Q),
-		sys:print_log(Debug)
+		error_info(Class, Reason, Stacktrace, Debug, P, S, Q)
 	end,
     case Stacktrace of
 	[] ->
@@ -1880,38 +2180,67 @@ terminate(
 	    erlang:raise(Class, Reason, Stacktrace)
     end.
 
-terminate_sys_debug(Debug, S, State, Reason) ->
-    ?sys_debug(Debug, {S#state.name,State}, {terminate,Reason}).
+terminate_sys_debug(Debug, P, State, Reason) ->
+    ?sys_debug(Debug, P#params.name, {terminate,Reason,State}).
 
 
 error_info(
-  Class, Reason, Stacktrace,
-  #state{
+  Class, Reason, Stacktrace, Debug,
+  #params{
      name = Name,
      callback_mode = CallbackMode,
-     state_enter = StateEnter,
-     postponed = P} = S,
+     state_enter = StateEnter} = P,
+  #state{postponed = Postponed} = S,
   Q) ->
+    Log = sys:get_log(Debug),
     ?LOG_ERROR(#{label=>{gen_statem,terminate},
                  name=>Name,
                  queue=>Q,
-                 postponed=>P,
+                 postponed=>Postponed,
                  callback_mode=>CallbackMode,
                  state_enter=>StateEnter,
-                 state=>format_status(terminate, get(), S),
-                 reason=>{Class,Reason,Stacktrace}},
+                 state=>format_status(terminate, get(), P, S),
+                 log=>Log,
+                 reason=>{Class,Reason,Stacktrace},
+                 client_info=>client_stacktrace(Q)},
                #{domain=>[otp],
                  report_cb=>fun gen_statem:format_log/1,
                  error_logger=>#{tag=>error}}).
 
+client_stacktrace([]) ->
+    undefined;
+client_stacktrace([{{call,{Pid,_Tag}},_Req}|_]) when is_pid(Pid) ->
+    if
+        node(Pid) =:= node() ->
+            case
+                process_info(Pid, [current_stacktrace, registered_name])
+            of
+                undefined ->
+                    {Pid,dead};
+                [{current_stacktrace, Stacktrace},
+                 {registered_name, []}] ->
+                    {Pid,{Pid,Stacktrace}};
+                [{current_stacktrace, Stacktrace},
+                 {registered_name, Name}] ->
+                    {Pid,{Name,Stacktrace}}
+            end;
+        true ->
+            {Pid,remote}
+    end;
+client_stacktrace([_|_]) ->
+    undefined.
+
+
 format_log(#{label:={gen_statem,terminate},
              name:=Name,
              queue:=Q,
-             postponed:=P,
+             postponed:=Postponed,
              callback_mode:=CallbackMode,
              state_enter:=StateEnter,
              state:=FmtData,
-             reason:={Class,Reason,Stacktrace}}) ->
+             log:=Log,
+             reason:={Class,Reason,Stacktrace},
+             client_info:=ClientInfo}) ->
     {FixedReason,FixedStacktrace} =
 	case Stacktrace of
 	    [{M,F,Args,_}|ST]
@@ -1931,14 +2260,12 @@ format_log(#{label:={gen_statem,terminate},
 			    true ->
 				{Reason,Stacktrace};
 			    false ->
-				{{'function not exported',{M,F,Arity}},
-				 ST}
+				{{'function not exported',{M,F,Arity}},ST}
 			end
 		end;
 	    _ -> {Reason,Stacktrace}
 	end,
-    [LimitedP, LimitedFmtData, LimitedFixedReason] =
-        [error_logger:limit_term(D) || D <- [P, FmtData, FixedReason]],
+    {ClientFmt,ClientArgs} = format_client_log(ClientInfo),
     CBMode =
 	 case StateEnter of
 	     true ->
@@ -1958,39 +2285,60 @@ format_log(#{label:={gen_statem,terminate},
              [_,_|_] -> "** Queued = ~tp~n";
              _ -> ""
          end ++
-         case P of
+         case Postponed of
              [] -> "";
              _ -> "** Postponed = ~tp~n"
          end ++
          case FixedStacktrace of
              [] -> "";
              _ -> "** Stacktrace =~n**  ~tp~n"
-         end,
+         end ++
+         case Log of
+             [] -> "";
+             _ -> "** Log =~n**  ~tp~n"
+         end ++ ClientFmt,
      [Name |
       case Q of
           [] -> [];
-          [Event|_] -> [Event]
+          [Event|_] -> [error_logger:limit_term(Event)]
       end] ++
-         [LimitedFmtData,
-          Class,LimitedFixedReason,
+         [error_logger:limit_term(FmtData),
+          Class,error_logger:limit_term(FixedReason),
           CBMode] ++
          case Q of
-             [_|[_|_] = Events] -> [Events];
+             [_|[_|_] = Events] -> [error_logger:limit_term(Events)];
              _ -> []
          end ++
-         case P of
+         case Postponed of
              [] -> [];
-             _ -> [LimitedP]
+             _ -> [error_logger:limit_term(Postponed)]
          end ++
          case FixedStacktrace of
              [] -> [];
-             _ -> [FixedStacktrace]
-         end}.
+             _ -> [error_logger:limit_term(FixedStacktrace)]
+         end ++
+         case Log of
+             [] -> [];
+             _ -> [[error_logger:limit_term(T) || T <- Log]]
+         end ++ ClientArgs}.
+
+format_client_log(undefined) ->
+    {"", []};
+format_client_log({Pid,dead}) ->
+    {"** Client ~p is dead~n", [Pid]};
+format_client_log({Pid,remote}) ->
+    {"** Client ~p is remote on node ~p~n", [Pid, node(Pid)]};
+format_client_log({_Pid,{Name,Stacktrace}}) ->
+    {"** Client ~tp stacktrace~n"
+     "** ~tp~n",
+     [Name, error_logger:limit_term(Stacktrace)]}.
+
 
 %% Call Module:format_status/2 or return a default value
 format_status(
   Opt, PDict,
-  #state{module = Module, state = State, data = Data}) ->
+  #params{module = Module},
+  #state{state_data = {State,Data} = State_Data}) ->
     case erlang:function_exported(Module, format_status, 2) of
 	true ->
 	    try Module:format_status(Opt, [PDict,State,Data])
@@ -1998,21 +2346,21 @@ format_status(
 		Result -> Result;
 		_:_ ->
 		    format_status_default(
-		      Opt, State,
-		      atom_to_list(Module) ++ ":format_status/2 crashed")
+		      Opt,
+                      {State,
+                       atom_to_list(Module) ++ ":format_status/2 crashed"})
 	    end;
 	false ->
-	    format_status_default(Opt, State, Data)
+	    format_status_default(Opt, State_Data)
     end.
 
-%% The default Module:format_status/2
-format_status_default(Opt, State, Data) ->
-    StateData = {State,Data},
+%% The default Module:format_status/3
+format_status_default(Opt, State_Data) ->
     case Opt of
 	terminate ->
-	    StateData;
+	    State_Data;
 	_ ->
-	    [{data,[{"State",StateData}]}]
+	    [{data,[{"State",State_Data}]}]
     end.
 
 -compile({inline, [listify/1]}).
@@ -2021,24 +2369,41 @@ listify(Item) when is_list(Item) ->
 listify(Item) ->
     [Item].
 
+
+-define(cancel_timer(TimerRef),
+    case erlang:cancel_timer(TimerRef) of
+        false ->
+            %% No timer found and we have not seen the timeout message
+            receive
+                {timeout,(TimerRef),_} ->
+                    ok
+            end;
+        _ ->
+            %% Timer was running
+            ok
+    end).
+
+-compile({inline, [cancel_timer/1]}).
+cancel_timer(TimerRef) ->
+    ?cancel_timer(TimerRef).
+
 %% Cancel timer if running, otherwise no op
 %%
-%% This is an asynchronous cancel so the timer is not really cancelled
-%% until we get a cancel_timer msg i.e {cancel_timer,TimerRef,_}.
-%% In the mean time we might get a timeout message.
-%%
-%% Remove the timer from TimerTypes.
-%% When we get the cancel_timer msg we remove it from TimerRefs.
+%% Remove the timer from Timers
 -compile({inline, [cancel_timer_by_type/2]}).
-cancel_timer_by_type(TimerType, {TimerTypes,CancelTimers} = TT_CT) ->
-    case TimerTypes of
-	#{TimerType := TimerRef} ->
-            ok = erlang:cancel_timer(TimerRef, [{async,true}]),
-	    {maps:remove(TimerType, TimerTypes),CancelTimers + 1};
-	#{} ->
-	    TT_CT
+cancel_timer_by_type(TimeoutType, {TimerRefs,TimeoutTypes} = Timers) ->
+    case TimeoutTypes of
+        #{TimeoutType := TimerRef} ->
+            ?cancel_timer(TimerRef),
+            {maps:remove(TimerRef, TimerRefs),
+             maps:remove(TimeoutType, TimeoutTypes)};
+        #{} ->
+            Timers
     end.
 
--compile({inline, [cancel_timer/1]}).
-cancel_timer(TimerRef) ->
-    ok = erlang:cancel_timer(TimerRef, [{async,true}]).
+-compile({inline, [cancel_timer_by_ref_and_type/4]}).
+cancel_timer_by_ref_and_type(
+  TimerRef, TimeoutType, TimerRefs, TimeoutTypes) ->
+    ?cancel_timer(TimerRef),
+    {maps:remove(TimerRef, TimerRefs),
+     maps:remove(TimeoutType, TimeoutTypes)}.
diff --git a/lib/stdlib/src/io_lib.erl b/lib/stdlib/src/io_lib.erl
index 8223a52873..21d66c5529 100644
--- a/lib/stdlib/src/io_lib.erl
+++ b/lib/stdlib/src/io_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. 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.
@@ -87,6 +87,8 @@
 
 -export([limit_term/2]).
 
+-export([chars_length/1]).
+
 -export_type([chars/0, latin1_string/0, continuation/0,
               fread_error/0, fread_item/0, format_spec/0, chars_limit/0]).
 
@@ -410,14 +412,25 @@ write_port(Port) ->
 write_ref(Ref) ->
     erlang:ref_to_list(Ref).
 
+write_map(_, 1, _E) -> "#{}";
 write_map(Map, D, E) when is_integer(D) ->
-    [$#,${,write_map_body(maps:to_list(Map), D, D - 1, E),$}].
+    I = maps:iterator(Map),
+    case maps:next(I) of
+        {K, V, NextI} ->
+            D0 = D - 1,
+            W = write_map_assoc(K, V, D0, E),
+            [$#,${,[W | write_map_body(NextI, D0, D0, E)],$}];
+        none -> "#{}"
+    end.
 
-write_map_body(_, 1, _D0, _E) -> "...";
-write_map_body([], _, _D0, _E) -> [];
-write_map_body([{K,V}], _D, D0, E) -> write_map_assoc(K, V, D0, E);
-write_map_body([{K,V}|KVs], D, D0, E) ->
-    [write_map_assoc(K, V, D0, E),$, | write_map_body(KVs, D - 1, D0, E)].
+write_map_body(_, 1, _D0, _E) -> ",...";
+write_map_body(I, D, D0, E) ->
+    case maps:next(I) of
+        {K, V, NextI} ->
+            W = write_map_assoc(K, V, D0, E),
+            [$,,W|write_map_body(NextI, D - 1, D0, E)];
+        none -> ""
+    end.
 
 write_map_assoc(K, V, D, E) ->
     [write1(K, D, E)," => ",write1(V, D, E)].
@@ -1131,3 +1144,17 @@ test_limit_map_assoc(K, V, D) ->
     test_limit(V, D - 1).
 
 test_limit_bitstring(_, _) -> ok.
+
+-spec chars_length(chars()) -> non_neg_integer().
+%% Optimized for deep lists S such that deep_latin1_char_list(S) is
+%% true. No binaries allowed! It is assumed that $\r is never followed
+%% by $\n if S is an iolist() (string:length() assigns such a
+%% sub-sequence length 1).
+chars_length(S) ->
+    try
+        %% true = deep_latin1_char_list(S),
+        iolist_size(S)
+    catch
+        _:_ ->
+            string:length(S)
+    end.
diff --git a/lib/stdlib/src/io_lib_format.erl b/lib/stdlib/src/io_lib_format.erl
index ab9031573b..157cc07e19 100644
--- a/lib/stdlib/src/io_lib_format.erl
+++ b/lib/stdlib/src/io_lib_format.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. 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.
@@ -248,7 +248,7 @@ count_small([#{control_char := $s}|Cs], #{w := W} = Cnts) ->
     count_small(Cs, Cnts#{w := W + 1});
 count_small([S|Cs], #{other := Other} = Cnts) when is_list(S);
                                                    is_binary(S) ->
-    count_small(Cs, Cnts#{other := Other + string:length(S)});
+    count_small(Cs, Cnts#{other := Other + io_lib:chars_length(S)});
 count_small([C|Cs], #{other := Other} = Cnts) when is_integer(C) ->
     count_small(Cs, Cnts#{other := Other + 1});
 count_small([], #{p := P, s := S, w := W, other := Other}) ->
@@ -280,10 +280,15 @@ build_limited([#{control_char := C, args := As, width := F, adjust := Ad,
                    true -> MaxLen0 div Count0
                end,
     S = control_limited(C, As, F, Ad, P, Pad, Enc, Str, MaxChars, I),
-    Len = string:length(S),
     NumOfPs = decr_pc(C, NumOfPs0),
     Count = Count0 - 1,
-    MaxLen = sub(MaxLen0, Len),
+    MaxLen = if
+                 MaxLen0 < 0 -> % optimization
+                     MaxLen0;
+                 true ->
+                     Len = io_lib:chars_length(S),
+                     sub(MaxLen0, Len)
+             end,
     if
 	NumOfPs > 0 -> [S|build_limited(Cs, NumOfPs, Count,
                                         MaxLen, indentation(S, I))];
@@ -322,11 +327,11 @@ indentation([], I) -> I.
 %%                 PadChar, Encoding, StringP, ChrsLim, Indentation) -> String
 %%  These are the dispatch functions for the various formatting controls.
 
-control_small($s, [A], F, Adj, P, Pad, latin1) when is_atom(A) ->
+control_small($s, [A], F, Adj, P, Pad, latin1=Enc) when is_atom(A) ->
     L = iolist_to_chars(atom_to_list(A)),
-    string(L, F, Adj, P, Pad);
-control_small($s, [A], F, Adj, P, Pad, unicode) when is_atom(A) ->
-    string(atom_to_list(A), F, Adj, P, Pad);
+    string(L, F, Adj, P, Pad, Enc);
+control_small($s, [A], F, Adj, P, Pad, unicode=Enc) when is_atom(A) ->
+    string(atom_to_list(A), F, Adj, P, Pad, Enc);
 control_small($e, [A], F, Adj, P, Pad, _Enc) when is_float(A) ->
     fwrite_e(A, F, Adj, P, Pad);
 control_small($f, [A], F, Adj, P, Pad, _Enc) when is_float(A) ->
@@ -366,12 +371,12 @@ control_small($n, [], F, Adj, P, Pad, _Enc) -> newline(F, Adj, P, Pad);
 control_small($i, [_A], _F, _Adj, _P, _Pad, _Enc) -> [];
 control_small(_C, _As, _F, _Adj, _P, _Pad, _Enc) -> not_small.
 
-control_limited($s, [L0], F, Adj, P, Pad, latin1, _Str, CL, _I) ->
-    L = iolist_to_chars(L0),
-    string(limit_string(L, F, CL), limit_field(F, CL), Adj, P, Pad);
-control_limited($s, [L0], F, Adj, P, Pad, unicode, _Str, CL, _I) ->
-    L = cdata_to_chars(L0),
-    uniconv(string(limit_string(L, F, CL), limit_field(F, CL), Adj, P, Pad));
+control_limited($s, [L0], F, Adj, P, Pad, latin1=Enc, _Str, CL, _I) ->
+    L = iolist_to_chars(L0, F, CL),
+    string(L, limit_field(F, CL), Adj, P, Pad, Enc);
+control_limited($s, [L0], F, Adj, P, Pad, unicode=Enc, _Str, CL, _I) ->
+    L = cdata_to_chars(L0, F, CL),
+    uniconv(string(L, limit_field(F, CL), Adj, P, Pad, Enc));
 control_limited($w, [A], F, Adj, P, Pad, Enc, _Str, CL, _I) ->
     Chars = io_lib:write(A, [{depth, -1}, {encoding, Enc}, {chars_limit, CL}]),
     term(Chars, F, Adj, P, Pad);
@@ -406,7 +411,7 @@ base(B) when is_integer(B) ->
 term(T, none, _Adj, none, _Pad) -> T;
 term(T, none, Adj, P, Pad) -> term(T, P, Adj, P, Pad);
 term(T, F, Adj, P0, Pad) ->
-    L = string:length(T),
+    L = io_lib:chars_length(T),
     P = erlang:min(L, case P0 of none -> F; _ -> min(P0, F) end),
     if
 	L > P ->
@@ -713,7 +718,10 @@ fwrite_g(Fl, F, Adj, P, Pad) when P >= 1 ->
     end.
 
 
-%% iolist_to_chars(iolist()) -> deep_char_list()
+iolist_to_chars(Cs, F, CharsLimit) when CharsLimit < 0; CharsLimit >= F ->
+    iolist_to_chars(Cs);
+iolist_to_chars(Cs, _, CharsLimit) ->
+    limit_iolist_to_chars(Cs, sub(CharsLimit, 3), [], normal). % three dots
 
 iolist_to_chars([C|Cs]) when is_integer(C), C >= $\000, C =< $\377 ->
     [C | iolist_to_chars(Cs)];
@@ -724,12 +732,34 @@ iolist_to_chars([]) ->
 iolist_to_chars(B) when is_binary(B) ->
     binary_to_list(B).
 
-%% cdata() :: clist() | cbinary()
-%% clist() ::  maybe_improper_list(char() | cbinary() | clist(),
-%%                                 cbinary() | nil())
-%% cbinary() :: unicode:unicode_binary() | unicode:latin1_binary()
+limit_iolist_to_chars(Cs, 0, S, normal) ->
+    L = limit_iolist_to_chars(Cs, 4, S, final),
+    case iolist_size(L) of
+        N when N < 4 -> L;
+        4 -> "..."
+    end;
+limit_iolist_to_chars(_Cs, 0, _S, final) -> [];
+limit_iolist_to_chars([C|Cs], Limit, S, Mode) when C >= $\000, C =< $\377 ->
+    [C | limit_iolist_to_chars(Cs, Limit - 1, S, Mode)];
+limit_iolist_to_chars([I|Cs], Limit, S, Mode) ->
+    limit_iolist_to_chars(I, Limit, [Cs|S], Mode);
+limit_iolist_to_chars([], _Limit, [], _Mode) ->
+    [];
+limit_iolist_to_chars([], Limit, [Cs|S], Mode) ->
+    limit_iolist_to_chars(Cs, Limit, S, Mode);
+limit_iolist_to_chars(B, Limit, S, Mode) when is_binary(B) ->
+    case byte_size(B) of
+        Sz when Sz > Limit ->
+            {B1, B2} = split_binary(B, Limit),
+            [binary_to_list(B1) | limit_iolist_to_chars(B2, 0, S, Mode)];
+        Sz ->
+            [binary_to_list(B) | limit_iolist_to_chars([], Limit-Sz, S, Mode)]
+    end.
 
-%% cdata_to_chars(cdata()) -> io_lib:deep_char_list()
+cdata_to_chars(Cs, F, CharsLimit) when CharsLimit < 0; CharsLimit >= F ->
+    cdata_to_chars(Cs);
+cdata_to_chars(Cs, _, CharsLimit) ->
+    limit_cdata_to_chars(Cs, sub(CharsLimit, 3), normal). % three dots
 
 cdata_to_chars([C|Cs]) when is_integer(C), C >= $\000 ->
     [C | cdata_to_chars(Cs)];
@@ -743,11 +773,25 @@ cdata_to_chars(B) when is_binary(B) ->
         _ -> binary_to_list(B)
     end.
 
-limit_string(S, F, CharsLimit) when CharsLimit < 0; CharsLimit >= F -> S;
-limit_string(S, _F, CharsLimit) ->
-    case string:length(S) =< CharsLimit of
-        true -> S;
-        false -> [string:slice(S, 0, sub(CharsLimit, 3)), "..."]
+limit_cdata_to_chars(Cs, 0, normal) ->
+    L = limit_cdata_to_chars(Cs, 4, final),
+    case string:length(L) of
+        N when N < 4 -> L;
+        4 -> "..."
+    end;
+limit_cdata_to_chars(_Cs, 0, final) -> [];
+limit_cdata_to_chars(Cs, Limit, Mode) ->
+    case string:next_grapheme(Cs) of
+        {error, <<C,Cs1/binary>>} ->
+            %% This is how ~ts handles Latin1 binaries with option
+            %% chars_limit.
+            [C | limit_cdata_to_chars(Cs1, Limit - 1, Mode)];
+        {error, [C|Cs1]} -> % not all versions of module string return this
+            [C | limit_cdata_to_chars(Cs1, Limit - 1, Mode)];
+        [] ->
+            [];
+        [GC|Cs1] ->
+            [GC | limit_cdata_to_chars(Cs1, Limit - 1, Mode)]
     end.
 
 limit_field(F, CharsLimit) when CharsLimit < 0; F =:= none ->
@@ -757,30 +801,30 @@ limit_field(F, CharsLimit) ->
 
 %% string(String, Field, Adjust, Precision, PadChar)
 
-string(S, none, _Adj, none, _Pad) -> S;
-string(S, F, Adj, none, Pad) ->
-    string_field(S, F, Adj, string:length(S), Pad);
-string(S, none, _Adj, P, Pad) ->
-    string_field(S, P, left, string:length(S), Pad);
-string(S, F, Adj, P, Pad) when F >= P ->
-    N = string:length(S),
+string(S, none, _Adj, none, _Pad, _Enc) -> S;
+string(S, F, Adj, none, Pad, Enc) ->
+    string_field(S, F, Adj, io_lib:chars_length(S), Pad, Enc);
+string(S, none, _Adj, P, Pad, Enc) ->
+    string_field(S, P, left, io_lib:chars_length(S), Pad, Enc);
+string(S, F, Adj, P, Pad, Enc) when F >= P ->
+    N = io_lib:chars_length(S),
     if F > P ->
 	    if N > P ->
-		    adjust(flat_trunc(S, P), chars(Pad, F-P), Adj);
+		    adjust(flat_trunc(S, P, Enc), chars(Pad, F-P), Adj);
 	       N < P ->
 		    adjust([S|chars(Pad, P-N)], chars(Pad, F-P), Adj);
 	       true -> % N == P
 		    adjust(S, chars(Pad, F-P), Adj)
 	    end;
        true -> % F == P
-	    string_field(S, F, Adj, N, Pad)
+	    string_field(S, F, Adj, N, Pad, Enc)
     end.
 
-string_field(S, F, _Adj, N, _Pad) when N > F ->
-    flat_trunc(S, F);
-string_field(S, F, Adj, N, Pad) when N < F ->
+string_field(S, F, _Adj, N, _Pad, Enc) when N > F ->
+    flat_trunc(S, F, Enc);
+string_field(S, F, Adj, N, Pad, _Enc) when N < F ->
     adjust(S, chars(Pad, F-N), Adj);
-string_field(S, _, _, _, _) -> % N == F
+string_field(S, _, _, _, _, _) -> % N == F
     S.
 
 %% unprefixed_integer(Int, Field, Adjust, Base, PadChar, Lowercase)
@@ -832,7 +876,10 @@ adjust(Data, Pad, right) -> [Pad|Data].
 
 %% Flatten and truncate a deep list to at most N elements.
 
-flat_trunc(List, N) when is_integer(N), N >= 0 ->
+flat_trunc(List, N, latin1) when is_integer(N), N >= 0 ->
+    {S, _} = lists:split(N, lists:flatten(List)),
+    S;
+flat_trunc(List, N, unicode) when is_integer(N), N >= 0 ->
     string:slice(List, 0, N).
 
 %% A deep version of lists:duplicate/2
diff --git a/lib/stdlib/src/io_lib_pretty.erl b/lib/stdlib/src/io_lib_pretty.erl
index ba9d9e8434..77f02eafe0 100644
--- a/lib/stdlib/src/io_lib_pretty.erl
+++ b/lib/stdlib/src/io_lib_pretty.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. 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.
@@ -462,7 +462,9 @@ find_upper(Lower, Term, T, Dl, Dd, D, RF, Enc, Str) ->
     case If of
         {_, _, _Dots=0, _} -> % even if Len > T
             If;
-        {_, Len, _, _} when Len =< T, D1 < D orelse D < 0 ->
+        {_, _Len=T, _, _} ->  % increasing the depth is meaningless
+            If;
+        {_, Len, _, _} when Len < T, D1 < D orelse D < 0 ->
 	    find_upper(If, Term, T, D1, Dd2, D, RF, Enc, Str);
         _ ->
 	    search_depth(Lower, If, Term, T, Dl, D1, RF, Enc, Str)
@@ -507,20 +509,20 @@ print_length(#{}=M, _D, _T, _RF, _Enc, _Str) when map_size(M) =:= 0 ->
     {"#{}", 3, 0, no_more};
 print_length(Atom, _D, _T, _RF, Enc, _Str) when is_atom(Atom) ->
     S = write_atom(Atom, Enc),
-    {S, string:length(S), 0, no_more};
+    {S, io_lib:chars_length(S), 0, no_more};
 print_length(List, D, T, RF, Enc, Str) when is_list(List) ->
     %% only flat lists are "printable"
     case Str andalso printable_list(List, D, T, Enc) of
         true ->
             %% print as string, escaping double-quotes in the list
             S = write_string(List, Enc),
-            {S, string:length(S), 0, no_more};
+            {S, io_lib:chars_length(S), 0, no_more};
         {true, Prefix} ->
             %% Truncated lists when T < 0 could break some existing code.
             S = write_string(Prefix, Enc),
             %% NumOfDots = 0 to avoid looping--increasing the depth
             %% does not make Prefix longer.
-            {[S | "..."], 3 + string:length(S), 0, no_more};
+            {[S | "..."], 3 + io_lib:chars_length(S), 0, no_more};
         false ->
             case print_length_list(List, D, T, RF, Enc, Str) of
                 {What, Len, Dots, _More} when Dots > 0 ->
@@ -564,7 +566,7 @@ print_length(<<_/bitstring>> = Bin, D, T, RF, Enc, Str) ->
             {[$<,$<,S,$>,$>], 4 + length(S), 0, no_more};
         {false, List} when is_list(List) ->
             S = io_lib:write_string(List, $"), %"
-            {[$<,$<,S,"/utf8>>"], 9 + string:length(S), 0, no_more};
+            {[$<,$<,S,"/utf8>>"], 9 + io_lib:chars_length(S), 0, no_more};
         {true, true, Prefix} ->
             S = io_lib:write_string(Prefix, $"), %"
             More = fun(T1, Dd) ->
@@ -576,7 +578,7 @@ print_length(<<_/bitstring>> = Bin, D, T, RF, Enc, Str) ->
             More = fun(T1, Dd) ->
                            ?FUNCTION_NAME(Bin, D+Dd, T1, RF, Enc, Str)
                    end,
-            {[$<,$<,S|"/utf8...>>"], 12 + string:length(S), 3, More};
+            {[$<,$<,S|"/utf8...>>"], 12 + io_lib:chars_length(S), 3, More};
         false ->
             case io_lib:write_binary(Bin, D, T) of
                 {S, <<>>} ->
@@ -591,7 +593,7 @@ print_length(<<_/bitstring>> = Bin, D, T, RF, Enc, Str) ->
 print_length(Term, _D, _T, _RF, _Enc, _Str) ->
     S = io_lib:write(Term),
     %% S can contain unicode, so iolist_size(S) cannot be used here
-    {S, string:length(S), 0, no_more}.
+    {S, io_lib:chars_length(S), 0, no_more}.
 
 print_length_map(Map, 1, _T, RF, Enc, Str) ->
     More = fun(T1, Dd) -> ?FUNCTION_NAME(Map, 1+Dd, T1, RF, Enc, Str) end,
@@ -651,7 +653,7 @@ print_length_record(Tuple, 1, _T, RF, RDefs, Enc, Str) ->
     {"{...}", 5, 3, More};
 print_length_record(Tuple, D, T, RF, RDefs, Enc, Str) ->
     Name = [$# | write_atom(element(1, Tuple), Enc)],
-    NameL = string:length(Name),
+    NameL = io_lib:chars_length(Name),
     T1 = tsub(T, NameL+2),
     L = print_length_fields(RDefs, D - 1, T1, Tuple, 2, RF, Enc, Str),
     {Len, Dots} = list_length(L, NameL + 2, 0),
@@ -677,7 +679,7 @@ print_length_fields([Def | Defs], D, T, Tuple, I, RF, Enc, Str) ->
 
 print_length_field(Def, D, T, E, RF, Enc, Str) ->
     Name = write_atom(Def, Enc),
-    NameL = string:length(Name) + 3,
+    NameL = io_lib:chars_length(Name) + 3,
     {_, Len, Dots, _} =
         Field = print_length(E, D, tsub(T, NameL), RF, Enc, Str),
     {{field, Name, NameL, Field}, NameL + Len, Dots, no_more}.
@@ -720,36 +722,47 @@ printable_list(_L, 1, _T, _Enc) ->
     false;
 printable_list(L, _D, T, latin1) when T < 0 ->
     io_lib:printable_latin1_list(L);
-printable_list(L, _D, T, Enc) when T >= 0 ->
-    case slice(L, tsub(T, 2)) of
-        false ->
-            false;
-        {prefix, Prefix} when Enc =:= latin1 ->
-            io_lib:printable_latin1_list(Prefix) andalso {true, Prefix};
-        {prefix, Prefix} ->
-            %% Probably an overestimation.
-            io_lib:printable_list(Prefix) andalso {true, Prefix};
-        all when Enc =:= latin1 ->
-            io_lib:printable_latin1_list(L);
+printable_list(L, _D, T, latin1) when T >= 0 ->
+    N = tsub(T, 2),
+    case printable_latin1_list(L, N) of
         all ->
-            io_lib:printable_list(L)
+            true;
+        0 ->
+            {L1, _} = lists:split(N, L),
+            {true, L1};
+        _NC ->
+            false
+    end;
+printable_list(L, _D, T, _Unicode) when T >= 0 ->
+    N = tsub(T, 2),
+    %% Be careful not to traverse more of L than necessary.
+    try string:slice(L, 0, N) of
+        "" ->
+            false;
+        Prefix ->
+            case is_flat(L, lists:flatlength(Prefix)) of
+                true ->
+                    case string:equal(Prefix, L) of
+                        true ->
+                            io_lib:printable_list(L);
+                        false ->
+                            io_lib:printable_list(Prefix)
+                            andalso {true, Prefix}
+                    end;
+                false ->
+                    false
+            end
+    catch _:_ -> false
     end;
 printable_list(L, _D, T, _Uni) when T < 0->
     io_lib:printable_list(L).
 
-slice(L, N) ->
-    try string:length(L) =< N of
-        true ->
-            all;
-        false ->
-            case string:slice(L, 0, N) of
-                "" ->
-                    false;
-                Prefix ->
-                    {prefix, Prefix}
-            end
-    catch _:_ -> false
-    end.
+is_flat(_L, 0) ->
+    true;
+is_flat([C|Cs], N) when is_integer(C) ->
+    is_flat(Cs, N - 1);
+is_flat(_, _N) ->
+    false.
 
 printable_bin0(Bin, D, T, Enc) ->
     Len = case D >= 0 of
@@ -769,6 +782,8 @@ printable_bin0(Bin, D, T, Enc) ->
           end,
     printable_bin(Bin, Len, D, Enc).
 
+printable_bin(_Bin, 0, _D, _Enc) ->
+    false;
 printable_bin(Bin, Len, D, latin1) ->
     N = erlang:min(20, Len),
     L = binary_to_list(Bin, 1, N),
@@ -819,7 +834,7 @@ printable_bin1(Bin, Start, Len) ->
     end.
 
 %% -> all | integer() >=0. Adopted from io_lib.erl.
-% printable_latin1_list([_ | _], 0) -> 0;
+printable_latin1_list([_ | _], 0) -> 0;
 printable_latin1_list([C | Cs], N) when C >= $\s, C =< $~ ->
     printable_latin1_list(Cs, N - 1);
 printable_latin1_list([C | Cs], N) when C >= $\240, C =< $\377 ->
diff --git a/lib/stdlib/src/maps.erl b/lib/stdlib/src/maps.erl
index 60463feec2..51965ddb57 100644
--- a/lib/stdlib/src/maps.erl
+++ b/lib/stdlib/src/maps.erl
@@ -21,7 +21,7 @@
 -module(maps).
 
 -export([get/3, filter/2,fold/3,
-         map/2, size/1,
+         map/2, size/1, new/0,
          update_with/3, update_with/4,
          without/2, with/2,
          iterator/1, next/1]).
@@ -29,13 +29,15 @@
 %% BIFs
 -export([get/2, find/2, from_list/1,
          is_key/2, keys/1, merge/2,
-         new/0, put/3, remove/2, take/2,
+         put/3, remove/2, take/2,
          to_list/1, update/3, values/1]).
 
--opaque iterator() :: {term(), term(), iterator()}
-                      | none | nonempty_improper_list(integer(),map()).
+-opaque iterator(Key, Value) :: {Key, Value, iterator(Key, Value)} | none
+                              | nonempty_improper_list(integer(), #{Key => Value}).
 
--export_type([iterator/0]).
+-type iterator() :: iterator(term(), term()).
+
+-export_type([iterator/2, iterator/0]).
 
 -dialyzer({no_improper_lists, iterator/1}).
 
@@ -50,9 +52,7 @@
 get(_,_) -> erlang:nif_error(undef).
 
 -spec find(Key,Map) -> {ok, Value} | error when
-    Key :: term(),
-    Map :: map(),
-    Value :: term().
+    Map :: #{Key => Value, _ => _}.
 
 find(_,_) -> erlang:nif_error(undef).
 
@@ -75,9 +75,8 @@ is_key(_,_) -> erlang:nif_error(undef).
 
 
 -spec keys(Map) -> Keys when
-    Map :: map(),
-    Keys :: [Key],
-    Key :: term().
+    Map :: #{Key => _},
+    Keys :: [Key].
 
 keys(_) -> erlang:nif_error(undef).
 
@@ -91,13 +90,6 @@ keys(_) -> erlang:nif_error(undef).
 merge(_,_) -> erlang:nif_error(undef).
 
 
-
--spec new() -> Map when
-    Map :: map().
-
-new() -> erlang:nif_error(undef).
-
-
 %% Shadowed by erl_bif_types: maps:put/3
 -spec put(Key,Value,Map1) -> Map2 when
     Key :: term(),
@@ -116,17 +108,13 @@ put(_,_,_) -> erlang:nif_error(undef).
 remove(_,_) -> erlang:nif_error(undef).
 
 -spec take(Key,Map1) -> {Value,Map2} | error when
-    Key :: term(),
-    Map1 :: map(),
-    Value :: term(),
-    Map2 :: map().
+    Map1 :: #{Key => Value, _ => _},
+    Map2 :: #{_ => _}.
 
 take(_,_) -> erlang:nif_error(undef).
 
 -spec to_list(Map) -> [{Key,Value}] when
-    Map :: map(),
-    Key :: term(),
-    Value :: term().
+    Map :: #{Key => Value}.
 
 to_list(Map) when is_map(Map) ->
     to_list_internal(erts_internal:map_next(0, Map, []));
@@ -140,79 +128,69 @@ to_list_internal(Acc) ->
 
 %% Shadowed by erl_bif_types: maps:update/3
 -spec update(Key,Value,Map1) -> Map2 when
-    Key :: term(),
-    Value :: term(),
-    Map1 :: map(),
-    Map2 :: map().
+    Map1 :: #{Key := _, _ => _},
+    Map2 :: #{Key := Value, _ => _}.
 
 update(_,_,_) -> erlang:nif_error(undef).
 
 
 -spec values(Map) -> Values when
-    Map :: map(),
-    Values :: [Value],
-    Value :: term().
+    Map :: #{_ => Value},
+    Values :: [Value].
 
 values(_) -> erlang:nif_error(undef).
 
 %% End of BIFs
 
+-spec new() -> Map when
+    Map :: #{}.
+
+new() -> #{}.
+
 -spec update_with(Key,Fun,Map1) -> Map2 when
-      Key :: term(),
-      Map1 :: map(),
-      Map2 :: map(),
-      Fun :: fun((Value1 :: term()) -> Value2 :: term()).
+      Map1 :: #{Key := Value1, _ => _},
+      Map2 :: #{Key := Value2, _ => _},
+      Fun :: fun((Value1) -> Value2).
 
 update_with(Key,Fun,Map) when is_function(Fun,1), is_map(Map) ->
-    try maps:get(Key,Map) of
-        Val -> maps:update(Key,Fun(Val),Map)
-    catch
-        error:{badkey,_} ->
-            erlang:error({badkey,Key},[Key,Fun,Map])
+    case Map of
+        #{Key := Value} -> Map#{Key := Fun(Value)};
+        #{} -> erlang:error({badkey,Key},[Key,Fun,Map])
     end;
 update_with(Key,Fun,Map) ->
     erlang:error(error_type(Map),[Key,Fun,Map]).
 
 
 -spec update_with(Key,Fun,Init,Map1) -> Map2 when
-      Key :: term(),
-      Map1 :: Map1,
-      Map2 :: Map2,
-      Fun :: fun((Value1 :: term()) -> Value2 :: term()),
-      Init :: term().
+      Map1 :: #{Key => Value1, _ => _},
+      Map2 :: #{Key := Value2 | Init, _ => _},
+      Fun :: fun((Value1) -> Value2).
 
 update_with(Key,Fun,Init,Map) when is_function(Fun,1), is_map(Map) ->
-    case maps:find(Key,Map) of
-        {ok,Val} -> maps:update(Key,Fun(Val),Map);
-        error -> maps:put(Key,Init,Map)
+    case Map of
+        #{Key := Value} -> Map#{Key := Fun(Value)};
+        #{} -> Map#{Key => Init}
     end;
 update_with(Key,Fun,Init,Map) ->
     erlang:error(error_type(Map),[Key,Fun,Init,Map]).
 
 
 -spec get(Key, Map, Default) -> Value | Default when
-        Key :: term(),
-        Map :: map(),
-        Value :: term(),
-        Default :: term().
+      Map :: #{Key => Value, _ => _}.
 
 get(Key,Map,Default) when is_map(Map) ->
-    case maps:find(Key, Map) of
-        {ok, Value} ->
-            Value;
-        error ->
-            Default
+    case Map of
+        #{Key := Value} -> Value;
+        #{} -> Default
     end;
 get(Key,Map,Default) ->
     erlang:error({badmap,Map},[Key,Map,Default]).
 
 
--spec filter(Pred,MapOrIter) -> Map when
+-spec filter(Pred, MapOrIter) -> Map when
       Pred :: fun((Key, Value) -> boolean()),
-      Key  :: term(),
-      Value :: term(),
-      MapOrIter :: map() | iterator(),
-      Map :: map().
+      MapOrIter :: #{Key => Value} | iterator(Key, Value),
+      Map :: #{Key => Value}.
 
 filter(Pred,Map) when is_function(Pred,2), is_map(Map) ->
     maps:from_list(filter_1(Pred, iterator(Map)));
@@ -235,14 +213,11 @@ filter_1(Pred, Iter) ->
     end.
 
 -spec fold(Fun,Init,MapOrIter) -> Acc when
-    Fun :: fun((K, V, AccIn) -> AccOut),
+    Fun :: fun((Key, Value, AccIn) -> AccOut),
     Init :: term(),
-    Acc :: term(),
-    AccIn :: term(),
-    AccOut :: term(),
-    MapOrIter :: map() | iterator(),
-    K :: term(),
-    V :: term().
+    Acc :: AccOut,
+    AccIn :: Init | AccOut,
+    MapOrIter :: #{Key => Value} | iterator(Key, Value).
 
 fold(Fun,Init,Map) when is_function(Fun,3), is_map(Map) ->
     fold_1(Fun,Init,iterator(Map));
@@ -260,12 +235,9 @@ fold_1(Fun, Acc, Iter) ->
     end.
 
 -spec map(Fun,MapOrIter) -> Map when
-    Fun :: fun((K, V1) -> V2),
-    MapOrIter :: map() | iterator(),
-    Map :: map(),
-    K :: term(),
-    V1 :: term(),
-    V2 :: term().
+    Fun :: fun((Key, Value1) -> Value2),
+    MapOrIter :: #{Key => Value1} | iterator(Key, Value1),
+    Map :: #{Key => Value2}.
 
 map(Fun,Map) when is_function(Fun, 2), is_map(Map) ->
     maps:from_list(map_1(Fun, iterator(Map)));
@@ -291,17 +263,15 @@ size(Val) ->
     erlang:error({badmap,Val},[Val]).
 
 -spec iterator(Map) -> Iterator when
-      Map :: map(),
-      Iterator :: iterator().
+      Map :: #{Key => Value},
+      Iterator :: iterator(Key, Value).
 
 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().
+      Iterator :: iterator(Key, Value),
+      NextIterator :: iterator(Key, Value).
 next({K, V, I}) ->
     {K, V, I};
 next([Path | Map]) when is_integer(Path), is_map(Map) ->
@@ -318,29 +288,26 @@ next(Iter) ->
     K :: term().
 
 without(Ks,M) when is_list(Ks), is_map(M) ->
-    lists:foldl(fun(K, M1) -> maps:remove(K, M1) end, M, Ks);
+    lists:foldl(fun maps:remove/2, M, Ks);
 without(Ks,M) ->
     erlang:error(error_type(M),[Ks,M]).
 
 -spec with(Ks, Map1) -> Map2 when
     Ks :: [K],
-    Map1 :: map(),
-    Map2 :: map(),
-    K :: term().
+    Map1 :: #{K => V, _ => _},
+    Map2 :: #{K => V}.
 
 with(Ks,Map1) when is_list(Ks), is_map(Map1) ->
-    Fun = fun(K, List) ->
-                  case maps:find(K, Map1) of
-                      {ok, V} ->
-                          [{K, V} | List];
-                      error ->
-                          List
-                  end
-          end,
-    maps:from_list(lists:foldl(Fun, [], Ks));
+    maps:from_list(with_1(Ks, Map1));
 with(Ks,M) ->
     erlang:error(error_type(M),[Ks,M]).
 
+with_1([K|Ks], Map) ->
+    case Map of
+        #{K := V} -> [{K,V}|with_1(Ks, Map)];
+        #{} -> with_1(Ks, Map)
+    end;
+with_1([], _Map) -> [].
 
 error_type(M) when is_map(M) -> badarg;
 error_type(V) -> {badmap, V}.
diff --git a/lib/stdlib/src/ms_transform.erl b/lib/stdlib/src/ms_transform.erl
index 6d243e1bec..97ec785c62 100644
--- a/lib/stdlib/src/ms_transform.erl
+++ b/lib/stdlib/src/ms_transform.erl
@@ -556,8 +556,8 @@ tg({call, Line, {remote,_,{atom,_,erlang},{atom, Line2, FunName}},ParaList},
 			       FunName,length(ParaList)}}) 
     end;
 tg({call, Line, {remote,_,{atom,_,ModuleName},
-		 {atom, _, FunName}},_ParaList},B) ->
-    throw({error,Line,{?ERR_GENREMOTECALL+B#tgd.eb,ModuleName,FunName}});
+		 {atom, _, FunName}},ParaList},B) ->
+    throw({error,Line,{?ERR_GENREMOTECALL+B#tgd.eb,ModuleName,FunName,length(ParaList)}});
 tg({cons,Line, H, T},B) -> 
     {cons, Line, tg(H,B), tg(T,B)};
 tg({nil, Line},_B) ->
diff --git a/lib/stdlib/src/ordsets.erl b/lib/stdlib/src/ordsets.erl
index 176047079b..95b83ded8c 100644
--- a/lib/stdlib/src/ordsets.erl
+++ b/lib/stdlib/src/ordsets.erl
@@ -150,13 +150,8 @@ union(Es1, []) -> Es1.
       OrdsetList :: [ordset(T)],
       Ordset :: ordset(T).
 
-union([S1,S2|Ss]) ->
-    union1(union(S1, S2), Ss);
-union([S]) -> S;
-union([]) -> [].
-
-union1(S1, [S2|Ss]) -> union1(union(S1, S2), Ss);
-union1(S1, []) -> S1.
+union(OrdsetList) ->
+    lists:umerge(OrdsetList).
 
 %% intersection(OrdSet1, OrdSet2) -> OrdSet.
 %%  Return the intersection of OrdSet1 and OrdSet2.
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index aaed13ba3a..fa34f19637 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -44,8 +44,19 @@ obsolete(Module, Name, Arity) ->
 	    no
     end.
 
-obsolete_1(net, _, _) ->
-    {deprecated, "module 'net' obsolete; use 'net_adm'"};
+obsolete_1(net, call, 4) ->
+    {deprecated, {rpc, call, 4}};
+obsolete_1(net, cast, 4) ->
+    {deprecated, {rpc, cast, 4}};
+obsolete_1(net, broadcast, 3) ->
+    {deprecated, {rpc, eval_everywhere, 3}};
+obsolete_1(net, ping, 1) ->
+    {deprecated, {net_adm, ping, 1}};
+obsolete_1(net, sleep, 1) ->
+    {deprecated, "Use 'receive after T -> ok end' instead"};
+obsolete_1(net, relay, 1) ->
+    {deprecated, {slave, relay, 1}};
+
 
 obsolete_1(erlang, now, 0) ->
     {deprecated,
@@ -55,6 +66,14 @@ obsolete_1(erlang, now, 0) ->
 obsolete_1(calendar, local_time_to_universal_time, 1) ->
     {deprecated, {calendar, local_time_to_universal_time_dst, 1}};
 
+%% *** STDLIB added in OTP 22 ***
+
+obsolete_1(sys, get_debug, 3) ->
+    {deprecated,
+     "Deprecated function. "
+     "Incorrectly documented and in fact only for internal use. "
+     "Can often be replaced with sys:get_log/1."};
+
 %% *** STDLIB added in OTP 20 ***
 
 obsolete_1(gen_fsm, start, 3) ->
@@ -304,90 +323,6 @@ obsolete_1(snmp, N, A) ->
 
 obsolete_1(snmpa, old_info_format, 1) ->
     {deprecated, "Deprecated; (will be removed in OTP 18); use \"new\" format instead"};
-obsolete_1(snmpm, agent_info, 3) ->
-    {removed, {snmpm, agent_info, 2}, "R16B"};
-obsolete_1(snmpm, update_agent_info, 5) ->
-    {removed, {snmpm, update_agent_info, 4}, "R16B"};
-obsolete_1(snmpm, g, 3) ->
-    {removed, {snmpm, sync_get, 3}, "R16B"};
-obsolete_1(snmpm, g, 4) ->
-    {removed, {snmpm, sync_get, [3,4]}, "R16B"};
-obsolete_1(snmpm, g, 5) ->
-    {removed, {snmpm, sync_get, [4,5]}, "R16B"};
-obsolete_1(snmpm, g, 6) ->
-    {removed, {snmpm, sync_get, [5,6]}, "R16B"};
-obsolete_1(snmpm, g, 7) ->
-    {removed, {snmpm, sync_get, 6}, "R16B"};
-obsolete_1(snmpm, ag, 3) ->
-    {removed, {snmpm, async_get, 3}, "R16B"};
-obsolete_1(snmpm, ag, 4) ->
-    {removed, {snmpm, async_get, [3,4]}, "R16B"};
-obsolete_1(snmpm, ag, 5) ->
-    {removed, {snmpm, async_get, [4,5]}, "R16B"};
-obsolete_1(snmpm, ag, 6) ->
-    {removed, {snmpm, async_get, [5,6]}, "R16B"};
-obsolete_1(snmpm, ag, 7) ->
-    {removed, {snmpm, async_get, 6}, "R16B"};
-obsolete_1(snmpm, gn, 3) ->
-    {removed, {snmpm, sync_get_next, 3}, "R16B"};
-obsolete_1(snmpm, gn, 4) ->
-    {removed, {snmpm, sync_get_next, [3,4]}, "R16B"};
-obsolete_1(snmpm, gn, 5) ->
-    {removed, {snmpm, sync_get_next, [4,5]}, "R16B"};
-obsolete_1(snmpm, gn, 6) ->
-    {removed, {snmpm, sync_get_next, [5,6]}, "R16B"};
-obsolete_1(snmpm, gn, 7) ->
-    {removed, {snmpm, sync_get_next, 6}, "R16B"};
-obsolete_1(snmpm, agn, 3) ->
-    {removed, {snmpm, async_get_next, 3}, "R16B"};
-obsolete_1(snmpm, agn, 4) ->
-    {removed, {snmpm, async_get_next, [3,4]}, "R16B"};
-obsolete_1(snmpm, agn, 5) ->
-    {removed, {snmpm, async_get_next, [4,5]}, "R16B"};
-obsolete_1(snmpm, agn, 6) ->
-    {removed, {snmpm, async_get_next, [5,6]}, "R16B"};
-obsolete_1(snmpm, agn, 7) ->
-    {removed, {snmpm, async_get_next, 6}, "R16B"};
-obsolete_1(snmpm, s, 3) ->
-    {removed, {snmpm, sync_set, 3}, "R16B"};
-obsolete_1(snmpm, s, 4) ->
-    {removed, {snmpm, sync_set, [3,4]}, "R16B"};
-obsolete_1(snmpm, s, 5) ->
-    {removed, {snmpm, sync_set, [4,5]}, "R16B"};
-obsolete_1(snmpm, s, 6) ->
-    {removed, {snmpm, sync_set, [5,6]}, "R16B"};
-obsolete_1(snmpm, s, 7) ->
-    {removed, {snmpm, sync_set, 6}, "R16B"};
-obsolete_1(snmpm, as, 3) ->
-    {removed, {snmpm, async_set, 3}, "R16B"};
-obsolete_1(snmpm, as, 4) ->
-    {removed, {snmpm, async_set, [3,4]}, "R16B"};
-obsolete_1(snmpm, as, 5) ->
-    {removed, {snmpm, async_set, [4,5]}, "R16B"};
-obsolete_1(snmpm, as, 6) ->
-    {removed, {snmpm, async_set, [5,6]}, "R16B"};
-obsolete_1(snmpm, as, 7) ->
-    {removed, {snmpm, async_set, 6}, "R16B"};
-obsolete_1(snmpm, gb, 5) ->
-    {removed, {snmpm, sync_get_bulk, 5}, "R16B"};
-obsolete_1(snmpm, gb, 6) ->
-    {removed, {snmpm, sync_get_bulk, [5,6]}, "R16B"};
-obsolete_1(snmpm, gb, 7) ->
-    {removed, {snmpm, sync_get_bulk, [6,7]}, "R16B"};
-obsolete_1(snmpm, gb, 8) ->
-    {removed, {snmpm, sync_get_bulk, [7,8]}, "R16B"};
-obsolete_1(snmpm, gb, 9) ->
-    {removed, {snmpm, sync_get_bulk, 8}, "R16B"};
-obsolete_1(snmpm, agb, 5) ->
-    {removed, {snmpm, async_get_bulk, 5}, "R16B"};
-obsolete_1(snmpm, agb, 6) ->
-    {removed, {snmpm, async_get_bulk, [5,6]}, "R16B"};
-obsolete_1(snmpm, agb, 7) ->
-    {removed, {snmpm, async_get_bulk, [6,7]}, "R16B"};
-obsolete_1(snmpm, agb, 8) ->
-    {removed, {snmpm, async_get_bulk, [7,8]}, "R16B"};
-obsolete_1(snmpm, agb, 9) ->
-    {removed, {snmpm, async_get_bulk, 8}, "R16B"};
 
 
 %% *** MEGACO ***
@@ -398,10 +333,9 @@ obsolete_1(megaco, format_versions, 1) ->
 
 %% *** OS-MON-MIB ***
 
-obsolete_1(os_mon_mib, init, 1) ->
-    {deprecated, {os_mon_mib, load, 1}};
-obsolete_1(os_mon_mib, stop, 1) ->
-    {deprecated, {os_mon_mib, unload, 1}};
+%% FIXME: Remove this warning in OTP 24.
+obsolete_1(os_mon_mib, _, _) ->
+    {removed, "was removed in 22.0"};
 
 obsolete_1(auth, is_auth, 1) ->
     {deprecated, {net_adm, ping, 1}};
@@ -414,64 +348,6 @@ obsolete_1(auth, node_cookie, 1) ->
 obsolete_1(auth, node_cookie, 2) ->
     {deprecated, "Deprecated; use erlang:set_cookie/2 and net_adm:ping/1 instead"};
 
-obsolete_1(http, request, 1) 	      -> {removed,{httpc,request,1},"R15B"};
-obsolete_1(http, request, 2) 	      -> {removed,{httpc,request,2},"R15B"};
-obsolete_1(http, request, 4) 	      -> {removed,{httpc,request,4},"R15B"};
-obsolete_1(http, request, 5) 	      -> {removed,{httpc,request,5},"R15B"};
-obsolete_1(http, cancel_request, 1)   -> {removed,{httpc,cancel_request,1},"R15B"};
-obsolete_1(http, cancel_request, 2)   -> {removed,{httpc,cancel_request,2},"R15B"};
-obsolete_1(http, set_option, 2)       -> {removed,{httpc,set_option,2},"R15B"};
-obsolete_1(http, set_option, 3)       -> {removed,{httpc,set_option,3},"R15B"};
-obsolete_1(http, set_options, 1)      -> {removed,{httpc,set_options,1},"R15B"};
-obsolete_1(http, set_options, 2)      -> {removed,{httpc,set_options,2},"R15B"};
-obsolete_1(http, verify_cookies, 2)   -> {removed,{httpc,store_cookies,2},"R15B"};
-obsolete_1(http, verify_cookies, 3)   -> {removed,{httpc,store_cookies,3},"R15B"};
-obsolete_1(http, cookie_header, 1)    -> {removed,{httpc,cookie_header,1},"R15B"};
-obsolete_1(http, cookie_header, 2)    -> {removed,{httpc,cookie_header,2},"R15B"};
-obsolete_1(http, stream_next, 1)      -> {removed,{httpc,stream_next,1},"R15B"};
-obsolete_1(http, default_profile, 0)  -> {removed,{httpc,default_profile,0},"R15B"};
-
-%% Added in R13A.
-obsolete_1(regexp, _, _) ->
-    {removed, "removed in R15; use the re module instead"};
-
-%% Added in R13B04.
-obsolete_1(erlang, concat_binary, 1) ->
-    {removed,{erlang,list_to_binary,1},"R15B"};
-
-%% Added in R14A.
-obsolete_1(ssl, peercert, 2) ->
-    {removed ,"removed in R15A; use ssl:peercert/1 and public_key:pkix_decode_cert/2 instead"};
-
-%% Added in R14B.
-obsolete_1(public_key, pem_to_der, 1) ->
-    {removed,"removed in R15A; use file:read_file/1 and public_key:pem_decode/1"};
-obsolete_1(public_key, decode_private_key, A) when A =:= 1; A =:= 2 ->
-    {removed, "removed in R15A; use public_key:pem_entry_decode/1"};
-
-%% Added in R14B03.
-obsolete_1(docb_gen, _, _) ->
-    {removed,"the DocBuilder application was removed in R15B"};
-obsolete_1(docb_transform, _, _) ->
-    {removed,"the DocBuilder application was removed in R15B"};
-obsolete_1(docb_xml_check, _, _) ->
-    {removed,"the DocBuilder application was removed in R15B"};
-
-%% Added in R15B
-obsolete_1(asn1rt, F, _) when F == load_driver; F == unload_driver ->
-    {removed,"removed (will be removed in OTP 18); has no effect as drivers are no longer used"};
-obsolete_1(ssl, pid, 1) ->
-    {removed,"was removed in R16; is no longer needed"};
-obsolete_1(inviso, _, _) ->
-    {removed,"the inviso application was removed in R16"};
-
-%% Added in R15B01.
-obsolete_1(ssh, sign_data, 2) ->
-    {removed,"removed in R16A; use public_key:pem_decode/1, public_key:pem_entry_decode/1 "
-     "and public_key:sign/3 instead"};
-obsolete_1(ssh, verify_data, 3) ->
-    {removed,"removed in R16A; use public_key:ssh_decode/1, and public_key:verify/4 instead"};
-
 %% Added in R16
 obsolete_1(wxCalendarCtrl, enableYearChange, _) -> %% wx bug documented?
     {deprecated,"deprecated function not available in wxWidgets-2.9 and later"};
@@ -592,10 +468,8 @@ obsolete_1(queue, lait, 1) ->
 
 %% Removed in OTP 19.
 
-obsolete_1(overload, _, _) ->
-    {removed, "removed in OTP 19"};
 obsolete_1(rpc, safe_multi_server_call, A) when A =:= 2; A =:= 3 ->
-    {removed, {rpc, multi_server_call, A}, "removed in OTP 19"};
+    {removed, {rpc, multi_server_call, A}, "19.0"};
 
 %% Added in OTP 20.
 
diff --git a/lib/stdlib/src/rand.erl b/lib/stdlib/src/rand.erl
index 362e98006e..3a9a1e007b 100644
--- a/lib/stdlib/src/rand.erl
+++ b/lib/stdlib/src/rand.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2015-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2015-2018. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -32,18 +32,24 @@
          uniform/0, uniform/1, uniform_s/1, uniform_s/2,
          uniform_real/0, uniform_real_s/1,
          jump/0, jump/1,
-	     normal/0, normal/2, normal_s/1, normal_s/3
+         normal/0, normal/2, normal_s/1, normal_s/3
 	]).
 
+%% Test, dev and internal
+-export([exro928_jump_2pow512/1, exro928_jump_2pow20/1,
+	 exro928_seed/1, exro928_next/1, exro928_next_state/1,
+	 format_jumpconst58/1, seed58/2]).
+
 %% Debug
 -export([make_float/3, float2str/1, bc64/1]).
 
--compile({inline, [exs64_next/1, exsplus_next/1,
+-compile({inline, [exs64_next/1, exsplus_next/1, exsss_next/1,
 		   exs1024_next/1, exs1024_calc/2,
+                   exro928_next_state/4,
                    exrop_next/1, exrop_next_s/2,
 		   get_52/1, normal_kiwi/1]}).
 
--define(DEFAULT_ALG_HANDLER, exrop).
+-define(DEFAULT_ALG_HANDLER, exsss).
 -define(SEED_DICT, rand_seed).
 
 %% =====================================================================
@@ -80,8 +86,8 @@
 
 %% This depends on the algorithm handler function
 -type alg_state() ::
-        exs64_state() | exsplus_state() | exs1024_state() |
-        exrop_state() | term().
+	exsplus_state() | exro928_state() |  exrop_state() | exs1024_state() |
+	exs64_state() | term().
 
 %% This is the algorithm handling definition within this module,
 %% and the type to use for plugins.
@@ -124,14 +130,17 @@
 
 %% Algorithm state
 -type state() :: {alg_handler(), alg_state()}.
--type builtin_alg() :: exs64 | exsplus | exsp | exs1024 | exs1024s | exrop.
+-type builtin_alg() ::
+	exsss | exro928ss | exrop | exs1024s | exsp | exs64 | exsplus | exs1024.
 -type alg() :: builtin_alg() | atom().
 -type export_state() :: {alg(), alg_state()}.
+-type seed() :: [integer()] | integer() | {integer(), integer(), integer()}.
 -export_type(
    [builtin_alg/0, alg/0, alg_handler/0, alg_state/0,
-    state/0, export_state/0]).
+    state/0, export_state/0, seed/0]).
 -export_type(
-   [exs64_state/0, exsplus_state/0, exs1024_state/0, exrop_state/0]).
+   [exsplus_state/0, exro928_state/0, exrop_state/0, exs1024_state/0,
+    exs64_state/0]).
 
 %% =====================================================================
 %% Range macro and helper
@@ -229,12 +238,12 @@ export_seed() ->
     end.
 
 -spec export_seed_s(State :: state()) -> export_state().
-export_seed_s({#{type:=Alg}, Seed}) -> {Alg, Seed}.
+export_seed_s({#{type:=Alg}, AlgState}) -> {Alg, AlgState}.
 
 %% seed(Alg) seeds RNG with runtime dependent values
 %% and return the NEW state
 
-%% seed({Alg,Seed}) setup RNG with a previously exported seed
+%% seed({Alg,AlgState}) setup RNG with a previously exported seed
 %% and return the NEW state
 
 -spec seed(
@@ -246,11 +255,11 @@ seed(Alg) ->
 -spec seed_s(
         AlgOrStateOrExpState :: builtin_alg() | state() | export_state()) ->
                     state().
-seed_s({AlgHandler, _Seed} = State) when is_map(AlgHandler) ->
+seed_s({AlgHandler, _AlgState} = State) when is_map(AlgHandler) ->
     State;
-seed_s({Alg0, Seed}) ->
-    {Alg,_SeedFun} = mk_alg(Alg0),
-    {Alg, Seed};
+seed_s({Alg, AlgState}) when is_atom(Alg) ->
+    {AlgHandler,_SeedFun} = mk_alg(Alg),
+    {AlgHandler,AlgState};
 seed_s(Alg) ->
     seed_s(Alg, {erlang:phash2([{node(),self()}]),
 		 erlang:system_time(),
@@ -259,19 +268,15 @@ seed_s(Alg) ->
 %% seed/2: seeds RNG with the algorithm and given values
 %% and returns the NEW state.
 
--spec seed(
-        Alg :: builtin_alg(), Seed :: {integer(), integer(), integer()}) ->
-                  state().
-seed(Alg0, S0) ->
-    seed_put(seed_s(Alg0, S0)).
+-spec seed(Alg :: builtin_alg(),  Seed :: seed()) -> state().
+seed(Alg, Seed) ->
+    seed_put(seed_s(Alg, Seed)).
 
--spec seed_s(
-        Alg :: builtin_alg(), Seed :: {integer(), integer(), integer()}) ->
-                    state().
-seed_s(Alg0, S0 = {_, _, _}) ->
-    {Alg, Seed} = mk_alg(Alg0),
-    AS = Seed(S0),
-    {Alg, AS}.
+-spec seed_s(Alg :: builtin_alg(), Seed :: seed()) -> state().
+seed_s(Alg, Seed) ->
+    {AlgHandler,SeedFun} = mk_alg(Alg),
+    AlgState = SeedFun(Seed),
+    {AlgHandler,AlgState}.
 
 %%% uniform/0, uniform/1, uniform_s/1, uniform_s/2 are all
 %%% uniformly distributed random numbers.
@@ -281,8 +286,8 @@ seed_s(Alg0, S0 = {_, _, _}) ->
 
 -spec uniform() -> X :: float().
 uniform() ->
-    {X, Seed} = uniform_s(seed_get()),
-    _ = seed_put(Seed),
+    {X, State} = uniform_s(seed_get()),
+    _ = seed_put(State),
     X.
 
 %% uniform/1: given an integer N >= 1,
@@ -291,8 +296,8 @@ uniform() ->
 
 -spec uniform(N :: pos_integer()) -> X :: pos_integer().
 uniform(N) ->
-    {X, Seed} = uniform_s(N, seed_get()),
-    _ = seed_put(Seed),
+    {X, State} = uniform_s(N, seed_get()),
+    _ = seed_put(State),
     X.
 
 %% uniform_s/1: given a state, uniform_s/1
@@ -486,7 +491,7 @@ uniform_real_s(Alg, Next, M0, BitNo, R1, V1, Bits) ->
                     {M1 * math:pow(2.0, BitNo - 56), {Alg, R1}};
                 BitNo =:= -1008 ->
                     %% Endgame
-                    %% For the last round we can not have 14 zeros or more
+                    %% For the last round we cannot have 14 zeros or more
                     %% at the top of M1 because then we will underflow,
                     %% so we need at least 43 bits
                     if
@@ -613,6 +618,11 @@ mk_alg(exsp) ->
        uniform=>fun exsp_uniform/1, uniform_n=>fun exsp_uniform/2,
        jump=>fun exsplus_jump/1},
      fun exsplus_seed/1};
+mk_alg(exsss) ->
+    {#{type=>exsss, bits=>58, next=>fun exsss_next/1,
+       uniform=>fun exsss_uniform/1, uniform_n=>fun exsss_uniform/2,
+       jump=>fun exsplus_jump/1},
+     fun exsss_seed/1};
 mk_alg(exs1024) ->
     {#{type=>exs1024, max=>?MASK(64), next=>fun exs1024_next/1,
        jump=>fun exs1024_jump/1},
@@ -625,7 +635,13 @@ mk_alg(exrop) ->
     {#{type=>exrop, bits=>58, weak_low_bits=>1, next=>fun exrop_next/1,
        uniform=>fun exrop_uniform/1, uniform_n=>fun exrop_uniform/2,
        jump=>fun exrop_jump/1},
-     fun exrop_seed/1}.
+     fun exrop_seed/1};
+mk_alg(exro928ss) ->
+    {#{type=>exro928ss, bits=>58, next=>fun exro928ss_next/1,
+       uniform=>fun exro928ss_uniform/1,
+       uniform_n=>fun exro928ss_uniform/2,
+       jump=>fun exro928_jump/1},
+     fun exro928_seed/1}.
 
 %% =====================================================================
 %% exs64 PRNG: Xorshift64*
@@ -635,6 +651,14 @@ mk_alg(exrop) ->
 
 -opaque exs64_state() :: uint64().
 
+exs64_seed(L) when is_list(L) ->
+    [R] = seed64_nz(1, L),
+    R;
+exs64_seed(A) when is_integer(A) ->
+    [R] = seed64(1, ?MASK(64, A)),
+    R;
+%%
+%% Traditional integer triplet seed
 exs64_seed({A1, A2, A3}) ->
     {V1, _} = exs64_next((?MASK(32, A1) * 4294967197 + 1)),
     {V2, _} = exs64_next((?MASK(32, A2) * 4294967231 + 1)),
@@ -656,11 +680,49 @@ exs64_next(R) ->
 %% 58 bits fits into an immediate on 64bits erlang and is thus much faster.
 %% Modification of the original Xorshift128+ algorithm to 116
 %% by Sebastiano Vigna, a lot of thanks for his help and work.
+%%
+%% Reference C code for Xorshift116+ and Xorshift116**
+%%
+%% #include <stdint.h>
+%%
+%% #define MASK(b, v) (((UINT64_C(1) << (b)) - 1) & (v))
+%% #define BSL(b, v, n) (MASK((b)-(n), (v)) << (n))
+%% #define ROTL(b, v, n) (BSL((b), (v), (n)) | ((v) >> ((b)-(n))))
+%%
+%% uint64_t s[2];
+%%
+%% uint64_t next(void) {
+%%     uint64_t s1 = s[0];
+%%     const uint64_t s0 = s[1];
+%%
+%%     s1 ^= BSL(58, s1, 24); // a
+%%     s1 ^= s0 ^ (s1 >> 11) ^ (s0 >> 41); // b, c
+%%     s[0] = s0;
+%%     s[1] = s1;
+%%
+%%     const uint64_t result_plus = MASK(58, s0 + s1);
+%%     uint64_t result_starstar = s0;
+%%     result_starstar = MASK(58, result_starstar * 5);
+%%     result_starstar = ROTL(58, result_starstar, 7);
+%%     result_starstar = MASK(58, result_starstar * 9);
+%%
+%%     return result_plus;
+%%     return result_starstar;
+%% }
+%%
 %% =====================================================================
 -opaque exsplus_state() :: nonempty_improper_list(uint58(), uint58()).
 
 -dialyzer({no_improper_lists, exsplus_seed/1}).
 
+exsplus_seed(L) when is_list(L) ->
+    [S0,S1] = seed58_nz(2, L),
+    [S0|S1];
+exsplus_seed(X) when is_integer(X) ->
+    [S0,S1] = seed58(2, ?MASK(64, X)),
+    [S0|S1];
+%%
+%% Traditional integer triplet seed
 exsplus_seed({A1, A2, A3}) ->
     {_, R1} = exsplus_next(
                 [?MASK(58, (A1 * 4294967197) + 1)|
@@ -670,16 +732,62 @@ exsplus_seed({A1, A2, A3}) ->
                  tl(R1)]),
     R2.
 
+-dialyzer({no_improper_lists, exsss_seed/1}).
+
+exsss_seed(L) when is_list(L) ->
+    [S0,S1] = seed58_nz(2, L),
+    [S0|S1];
+exsss_seed(X) when is_integer(X) ->
+    [S0,S1] = seed58(2, ?MASK(64, X)),
+    [S0|S1];
+%%
+%% Seed from traditional integer triple - mix into splitmix
+exsss_seed({A1, A2, A3}) ->
+    {_, X0} = seed58(?MASK(64, A1)),
+    {S0, X1} = seed58(?MASK(64, A2) bxor X0),
+    {S1, _} = seed58(?MASK(64, A3) bxor X1),
+    [S0|S1].
+
+%% Advance Xorshift116 state one step
+-define(
+   exs_next(S0, S1, S1_b),
+   begin
+       S1_b = S1 bxor ?BSL(58, S1, 24),
+       S1_b bxor S0 bxor (S1_b bsr 11) bxor (S0 bsr 41)
+   end).
+
+-define(
+   scramble_starstar(S, V_a, V_b),
+   begin
+       %% The multiply by add shifted trick avoids creating bignums
+       %% which improves performance significantly
+       %%
+       V_a = ?MASK(58, S + ?BSL(58, S, 2)), % V_a = S * 5
+       V_b = ?ROTL(58, V_a, 7),
+       ?MASK(58, V_b + ?BSL(58, V_b, 3)) % V_b * 9
+   end).
+
 -dialyzer({no_improper_lists, exsplus_next/1}).
 
-%% Advance xorshift116+ state for one step and generate 58bit unsigned integer
+%% Advance state and generate 58bit unsigned integer
 -spec exsplus_next(exsplus_state()) -> {uint58(), exsplus_state()}.
 exsplus_next([S1|S0]) ->
     %% Note: members s0 and s1 are swapped here
-    S11 = S1 bxor ?BSL(58, S1, 24),
-    S12 = S11 bxor S0 bxor (S11 bsr 11) bxor (S0 bsr 41),
-    {?MASK(58, S0 + S12), [S0|S12]}.
+    NewS1 = ?exs_next(S0, S1, S1_1),
+    {?MASK(58, S0 + NewS1), [S0|NewS1]}.
+%%    %% Note: members s0 and s1 are swapped here
+%%    S11 = S1 bxor ?BSL(58, S1, 24),
+%%    S12 = S11 bxor S0 bxor (S11 bsr 11) bxor (S0 bsr 41),
+%%    {?MASK(58, S0 + S12), [S0|S12]}.
+
+-dialyzer({no_improper_lists, exsss_next/1}).
 
+-spec exsss_next(exsplus_state()) -> {uint58(), exsplus_state()}.
+exsss_next([S1|S0]) ->
+    %% Note: members s0 and s1 are swapped here
+    NewS1 = ?exs_next(S0, S1, S1_1),
+    {?scramble_starstar(S0, V_0, V_1), [S0|NewS1]}.
+%%    {?MASK(58, S0 + NewS1), [S0|NewS1]}.
 
 exsp_uniform({Alg, R0}) ->
     {I, R1} = exsplus_next(R0),
@@ -687,18 +795,48 @@ exsp_uniform({Alg, R0}) ->
     %% randomness quality than the others
     {(I bsr (58-53)) * ?TWO_POW_MINUS53, {Alg, R1}}.
 
+exsss_uniform({Alg, R0}) ->
+    {I, R1} = exsss_next(R0),
+    {(I bsr (58-53)) * ?TWO_POW_MINUS53, {Alg, R1}}.
+
 exsp_uniform(Range, {Alg, R}) ->
     {V, R1} = exsplus_next(R),
     MaxMinusRange = ?BIT(58) - Range,
     ?uniform_range(Range, Alg, R1, V, MaxMinusRange, I).
 
+exsss_uniform(Range, {Alg, R}) ->
+    {V, R1} = exsss_next(R),
+    MaxMinusRange = ?BIT(58) - Range,
+    ?uniform_range(Range, Alg, R1, V, MaxMinusRange, I).
 
-%% This is the jump function for the exsplus generator, equivalent
+
+%% This is the jump function for the exs* generators,
+%% i.e the Xorshift116 generators,  equivalent
 %% to 2^64 calls to next/1; it can be used to generate 2^52
 %% non-overlapping subsequences for parallel computations.
 %% Note: the jump function takes 116 times of the execution time of
 %% next/1.
-
+%%
+%% #include <stdint.h>
+%%
+%% void jump(void) {
+%%   static const uint64_t JUMP[] = { 0x02f8ea6bc32c797,
+%% 				   0x345d2a0f85f788c };
+%%   int i, b;
+%%   uint64_t s0 = 0;
+%%   uint64_t s1 = 0;
+%%   for(i = 0; i < sizeof JUMP / sizeof *JUMP; i++)
+%%     for(b = 0; b < 58; b++) {
+%%       if (JUMP[i] & 1ULL << b) {
+%% 	s0 ^= s[0];
+%% 	s1 ^= s[1];
+%%       }
+%%       next();
+%%     }
+%%   s[0] = s0;
+%%   s[1] = s1;
+%% }
+%%
 %% -define(JUMPCONST, 16#000d174a83e17de2302f8ea6bc32c797).
 %% split into 58-bit chunks
 %% and two iterative executions
@@ -708,7 +846,8 @@ exsp_uniform(Range, {Alg, R}) ->
 -define(JUMPELEMLEN, 58).
 
 -dialyzer({no_improper_lists, exsplus_jump/1}).
--spec exsplus_jump(state()) -> state().
+-spec exsplus_jump({alg_handler(), exsplus_state()}) ->
+                          {alg_handler(), exsplus_state()}.
 exsplus_jump({Alg, S}) ->
     {S1, AS1} = exsplus_jump(S, [0|0], ?JUMPCONST1, ?JUMPELEMLEN),
     {_,  AS2} = exsplus_jump(S1, AS1,  ?JUMPCONST2, ?JUMPELEMLEN),
@@ -735,6 +874,12 @@ exsplus_jump(S, [AS0|AS1], J, N) ->
 
 -opaque exs1024_state() :: {list(uint64()), list(uint64())}.
 
+exs1024_seed(L) when is_list(L) ->
+    {seed64_nz(16, L), []};
+exs1024_seed(X) when is_integer(X) ->
+    {seed64(16, ?MASK(64, X)), []};
+%%
+%% Seed from traditional triple, remain backwards compatible
 exs1024_seed({A1, A2, A3}) ->
     B1 = ?MASK(21, (?MASK(21, A1) + 1) * 2097131),
     B2 = ?MASK(21, (?MASK(21, A2) + 1) * 2097133),
@@ -806,8 +951,8 @@ exs1024_next({[H], RL}) ->
 -define(JUMPTOTALLEN, 1024).
 -define(RINGLEN, 16).
 
--spec exs1024_jump(state()) -> state().
-
+-spec exs1024_jump({alg_handler(), exs1024_state()}) ->
+                          {alg_handler(), exs1024_state()}.
 exs1024_jump({Alg, {L, RL}}) ->
     P = length(RL),
     AS = exs1024_jump({L, RL},
@@ -832,6 +977,195 @@ exs1024_jump({L, RL}, AS, JL, J, N, TN) ->
     end.
 
 %% =====================================================================
+%% exro928ss PRNG: Xoroshiro928**
+%%
+%% Reference URL: http://vigna.di.unimi.it/ftp/papers/ScrambledLinear.pdf
+%% i.e the Xoroshiro1024 generator with ** scrambler
+%% with {S, R, T} = {5, 7, 9} as recommended in the paper.
+%%
+%% {A, B, C} were tried out and selected as {44, 9, 45}
+%% and the jump coefficients calculated.
+%%
+%% Standard jump function pseudocode:
+%% 
+%%     Jump constant j = 0xb10773cb...44085302f77130ca
+%%     Generator state: s
+%%     New generator state: t = 0
+%%     foreach bit in j, low to high:
+%%         if the bit is one:
+%%             t ^= s
+%%         next s
+%%     s = t
+%%
+%% Generator used for reference value calculation:
+%%
+%%     #include <stdint.h>
+%%     #include <stdio.h>
+%%     
+%%     int p = 0;
+%%     uint64_t s[16];
+%%     
+%%     #define MASK(x) ((x) & ((UINT64_C(1) << 58) - 1))
+%%     static __inline uint64_t rotl(uint64_t x, int n) {
+%%         return MASK(x << n) | (x >> (58 - n));
+%%     }
+%%     
+%%     uint64_t next() {
+%%         const int q = p;
+%%         const uint64_t s0 = s[p = (p + 1) & 15];
+%%         uint64_t s15 = s[q];
+%%     
+%%         const uint64_t result_starstar = MASK(rotl(MASK(s0 * 5), 7) * 9);
+%%     
+%%         s15 ^= s0;
+%%         s[q] = rotl(s0, 44) ^ s15 ^ MASK(s15 << 9);
+%%         s[p] = rotl(s15, 45);
+%%     
+%%         return result_starstar;
+%%     }
+%%
+%%     static const uint64_t jump_2pow512[15] =
+%%         { 0x44085302f77130ca, 0xba05381fdfd14902, 0x10a1de1d7d6813d2,
+%%           0xb83fe51a1eb3be19, 0xa81b0090567fd9f0, 0x5ac26d5d20f9b49f,
+%%           0x4ddd98ee4be41e01, 0x0657e19f00d4b358, 0xf02f778573cf0f0a,
+%%           0xb45a3a8a3cef3cc0, 0x6e62a33cc2323831, 0xbcb3b7c4cc049c53,
+%%           0x83f240c6007e76ce, 0xe19f5fc1a1504acd, 0x00000000b10773cb };
+%%
+%%     static const uint64_t jump_2pow20[15] =
+%%         { 0xbdb966a3daf905e6, 0x644807a56270cf78, 0xda90f4a806c17e9e,
+%%           0x4a426866bfad3c77, 0xaf699c306d8e7566, 0x8ebc73c700b8b091,
+%%           0xc081a7bf148531fb, 0xdc4d3af15f8a4dfd, 0x90627c014098f4b6,
+%%           0x06df2eb1feaf0fb6, 0x5bdeb1a5a90f2e6b, 0xa480c5878c3549bd,
+%%           0xff45ef33c82f3d48, 0xa30bebc15fefcc78, 0x00000000cb3d181c };
+%%
+%%     void jump(const uint64_t *jump) {
+%%         uint64_t j, t[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+%%         int m, n, k;
+%%         for (m = 0;  m < 15;  m++, jump++) {
+%%             for (n = 0, j = *jump;  n < 64;  n++, j >>= 1) {
+%%                 if ((j & 1) != 0) {
+%%                     for (k = 0;  k < 16;  k++) {
+%%                         t[k] ^= s[(p + k) & 15];
+%%                     }
+%%                 }
+%%                 next();
+%%             }
+%%         }
+%%         for (k = 0;  k < 16;  k++) {
+%%             s[(p + k) & 15] = t[k];
+%%         }
+%%     }
+%%
+%% =====================================================================
+
+-opaque exro928_state() :: {list(uint58()), list(uint58())}.
+
+-spec exro928_seed(
+        list(uint58()) | integer() | {integer(), integer(), integer()}) ->
+                          exro928_state().
+exro928_seed(L) when is_list(L) ->
+    {seed58_nz(16, L), []};
+exro928_seed(X) when is_integer(X) ->
+    {seed58(16, ?MASK(64, X)), []};
+%%
+%% Seed from traditional integer triple - mix into splitmix
+exro928_seed({A1, A2, A3}) ->
+    {S0, X0} = seed58(?MASK(64, A1)),
+    {S1, X1} = seed58(?MASK(64, A2) bxor X0),
+    {S2, X2} = seed58(?MASK(64, A3) bxor X1),
+    {[S0,S1,S2|seed58(13, X2)], []}.
+
+
+%% Update the state and calculate output word
+-spec exro928ss_next(exro928_state()) -> {uint58(), exro928_state()}.
+exro928ss_next({[S15,S0|Ss], Rs}) ->
+    SR = exro928_next_state(Ss, Rs, S15, S0),
+    %%
+    %% {S, R, T} = {5, 7, 9}
+    %% const uint64_t result_starstar = rotl(s0 * S, R) * T;
+    %%
+    {?scramble_starstar(S0, V_0, V_1), SR};
+%%    %% The multiply by add shifted trick avoids creating bignums
+%%    %% which improves performance significantly
+%%    %%
+%%    V0 = ?MASK(58, S0 + ?BSL(58, S0, 2)), % V0 = S0 * 5
+%%    V1 = ?ROTL(58, V0, 7),
+%%    V = ?MASK(58, V1 + ?BSL(58, V1, 3)), % V = V1 * 9
+%%    {V, SR};
+exro928ss_next({[S15], Rs}) ->
+    exro928ss_next({[S15|lists:reverse(Rs)], []}).
+
+-spec exro928_next(exro928_state()) -> {{uint58(),uint58()}, exro928_state()}.
+exro928_next({[S15,S0|Ss], Rs}) ->
+    SR = exro928_next_state(Ss, Rs, S15, S0),
+    {{S15,S0}, SR};
+exro928_next({[S15], Rs}) ->
+    exro928_next({[S15|lists:reverse(Rs)], []}).
+
+%% Just update the state
+-spec exro928_next_state(exro928_state()) -> exro928_state().
+exro928_next_state({[S15,S0|Ss], Rs}) ->
+    exro928_next_state(Ss, Rs, S15, S0);
+exro928_next_state({[S15], Rs}) ->
+    [S0|Ss] = lists:reverse(Rs),
+    exro928_next_state(Ss, [], S15, S0).
+
+exro928_next_state(Ss, Rs, S15, S0) ->
+    %% {A, B, C} = {44, 9, 45},
+    %% s15 ^= s0;
+    %% NewS15: s[q] = rotl(s0, A) ^ s15 ^ (s15 << B);
+    %% NewS0: s[p] = rotl(s15, C);
+    %%
+    Q = S15 bxor S0,
+    NewS15 = ?ROTL(58, S0, 44) bxor Q bxor ?BSL(58, Q, 9),
+    NewS0 = ?ROTL(58, Q, 45),
+    {[NewS0|Ss], [NewS15|Rs]}.
+
+
+exro928ss_uniform({Alg, SR}) ->
+    {V, NewSR} = exro928ss_next(SR),
+    {(V bsr (58-53)) * ?TWO_POW_MINUS53, {Alg, NewSR}}.
+
+exro928ss_uniform(Range, {Alg, SR}) ->
+    {V, NewSR} = exro928ss_next(SR),
+    MaxMinusRange = ?BIT(58) - Range,
+    ?uniform_range(Range, Alg, NewSR, V, MaxMinusRange, I).
+
+
+-spec exro928_jump({alg_handler(), exro928_state()}) ->
+                          {alg_handler(), exro928_state()}.
+exro928_jump({Alg, SR}) ->
+    {Alg,exro928_jump_2pow512(SR)}.
+
+-spec exro928_jump_2pow512(exro928_state()) -> exro928_state().
+exro928_jump_2pow512(SR) ->
+    polyjump(
+      SR, fun exro928_next_state/1,
+      %% 2^512
+      [16#4085302F77130CA, 16#54E07F7F4524091,
+       16#5E1D7D6813D2BA0, 16#4687ACEF8644287,
+       16#4567FD9F0B83FE5, 16#43E6D27EA06C024,
+       16#641E015AC26D5D2, 16#6CD61377663B92F,
+       16#70A0657E19F00D4, 16#43C0BDDE15CF3C3,
+       16#745A3A8A3CEF3CC, 16#58A8CF308C8E0C6,
+       16#7B7C4CC049C536E, 16#431801F9DB3AF2C,
+       16#41A1504ACD83F24, 16#6C41DCF2F867D7F]).
+
+-spec exro928_jump_2pow20(exro928_state()) -> exro928_state().
+exro928_jump_2pow20(SR) ->
+    polyjump(
+      SR, fun exro928_next_state/1,
+      %% 2^20
+      [16#5B966A3DAF905E6, 16#601E9589C33DE2F,
+       16#74A806C17E9E644, 16#59AFEB4F1DF6A43,
+       16#46D8E75664A4268, 16#42E2C246BDA670C,
+       16#4531FB8EBC73C70, 16#537F702069EFC52,
+       16#4B6DC4D3AF15F8A, 16#5A4189F0050263D,
+       16#46DF2EB1FEAF0FB, 16#77AC696A43CB9AC,
+       16#4C5878C3549BD5B, 16#7CCF20BCF522920,
+       16#415FEFCC78FF45E, 16#72CF460728C2FAF]).
+
+%% =====================================================================
 %% exrop PRNG: Xoroshiro116+
 %%
 %% Reference URL: http://xorshift.di.unimi.it/
@@ -899,6 +1233,15 @@ exs1024_jump({L, RL}, AS, JL, J, N, TN) ->
 -opaque exrop_state() :: nonempty_improper_list(uint58(), uint58()).
 
 -dialyzer({no_improper_lists, exrop_seed/1}).
+
+exrop_seed(L) when is_list(L) ->
+    [S0,S1] = seed58_nz(2, L),
+    [S0|S1];
+exrop_seed(X) when is_integer(X) ->
+    [S0,S1] = seed58(2, ?MASK(64, X)),
+    [S0|S1];
+%%
+%% Traditional integer triplet seed
 exrop_seed({A1, A2, A3}) ->
     [_|S1] =
         exrop_next_s(
@@ -962,6 +1305,142 @@ exrop_jump([S__0|S__1] = _S, S0, S1, J, Js) ->
     end.
 
 %% =====================================================================
+%% Mask and fill state list, ensure not all zeros
+%% =====================================================================
+
+seed58_nz(N, Ss) ->
+    seed_nz(N, Ss, 58, false).
+
+seed64_nz(N, Ss) ->
+    seed_nz(N, Ss, 64, false).
+
+seed_nz(_N, [], _M, false) ->
+    erlang:error(zero_seed);
+seed_nz(0, [_|_], _M, _NZ) ->
+    erlang:error(too_many_seed_integers);
+seed_nz(0, [], _M, _NZ) ->
+    [];
+seed_nz(N, [], M, true) ->
+    [0|seed_nz(N - 1, [], M, true)];
+seed_nz(N, [S|Ss], M, NZ) ->
+    if
+	is_integer(S) ->
+	    R = ?MASK(M, S),
+	    [R|seed_nz(N - 1, Ss, M, NZ orelse R =/= 0)];
+	true ->
+	    erlang:error(non_integer_seed)
+    end.
+
+%% =====================================================================
+%% Splitmix seeders, lowest bits of SplitMix64, zeros skipped
+%% =====================================================================
+
+-spec seed58(non_neg_integer(), uint64()) -> list(uint58()).
+seed58(0, _X) ->
+    [];
+seed58(N, X) ->
+    {Z,NewX} = seed58(X),
+    [Z|seed58(N - 1, NewX)].
+%%
+seed58(X_0) ->
+    {Z0,X} = splitmix64_next(X_0),
+    case ?MASK(58, Z0) of
+	0 ->
+	    seed58(X);
+	Z ->
+	    {Z,X}
+    end.
+
+-spec seed64(non_neg_integer(), uint64()) -> list(uint64()).
+seed64(0, _X) ->
+    [];
+seed64(N, X) ->
+    {Z,NewX} = seed64(X),
+    [Z|seed64(N - 1, NewX)].
+%%
+seed64(X_0) ->
+    {Z,X} = ZX = splitmix64_next(X_0),
+    if
+	Z =:= 0 ->
+	    seed64(X);
+	true ->
+	    ZX
+    end.
+
+%% The SplitMix64 generator:
+%%
+%% uint64_t splitmix64_next() {
+%% 	uint64_t z = (x += 0x9e3779b97f4a7c15);
+%% 	z = (z ^ (z >> 30)) * 0xbf58476d1ce4e5b9;
+%% 	z = (z ^ (z >> 27)) * 0x94d049bb133111eb;
+%% 	return z ^ (z >> 31);
+%% }
+%%
+splitmix64_next(X_0) ->
+    X = ?MASK(64, X_0 + 16#9e3779b97f4a7c15),
+    Z_0 = ?MASK(64, (X bxor (X bsr 30)) * 16#bf58476d1ce4e5b9),
+    Z_1 = ?MASK(64, (Z_0 bxor (Z_0 bsr 27)) * 16#94d049bb133111eb),
+    {?MASK(64, Z_1 bxor (Z_1 bsr 31)),X}.
+
+%% =====================================================================
+%% Polynomial jump with a jump constant word list,
+%% high bit in each word marking top of word,
+%% SR is a {Forward, Reverse} queue tuple with Forward never empty
+%% =====================================================================
+
+polyjump({Ss, Rs} = SR, NextState, JumpConst) ->
+    %% Create new state accumulator T
+    Ts = lists:duplicate(length(Ss) + length(Rs), 0),
+    polyjump(SR, NextState, JumpConst, Ts).
+%%
+%% Foreach jump word
+polyjump(_SR, _NextState, [], Ts) ->
+    %% Return new calculated state
+    {Ts, []};
+polyjump(SR, NextState, [J|Js], Ts) ->
+    polyjump(SR, NextState, Js, Ts, J).
+%%
+%% Foreach bit in jump word until top bit
+polyjump(SR, NextState, Js, Ts, 1) ->
+    polyjump(SR, NextState, Js, Ts);
+polyjump({Ss, Rs} = SR, NextState, Js, Ts, J) when J =/= 0 ->
+    NewSR = NextState(SR),
+    NewJ = J bsr 1,
+    case ?MASK(1, J) of
+        0 ->
+            polyjump(NewSR, NextState, Js, Ts, NewJ);
+        1 ->
+            %% Xor this state onto T
+            polyjump(NewSR, NextState, Js, xorzip_sr(Ts, Ss, Rs), NewJ)
+    end.
+
+xorzip_sr([], [], undefined) ->
+    [];
+xorzip_sr(Ts, [], Rs) ->
+    xorzip_sr(Ts, lists:reverse(Rs), undefined);
+xorzip_sr([T|Ts], [S|Ss], Rs) ->
+    [T bxor S|xorzip_sr(Ts, Ss, Rs)].
+
+%% =====================================================================
+
+format_jumpconst58(String) ->
+    ReOpts = [{newline,any},{capture,all_but_first,binary},global],
+    {match,Matches} = re:run(String, "0x([a-zA-Z0-9]+)", ReOpts),
+    format_jumcons58_matches(lists:reverse(Matches), 0).
+
+format_jumcons58_matches([], J) ->
+    format_jumpconst58_value(J);
+format_jumcons58_matches([[Bin]|Matches], J) ->
+    NewJ = (J bsl 64) bor binary_to_integer(Bin, 16),
+    format_jumcons58_matches(Matches, NewJ).
+
+format_jumpconst58_value(0) ->
+    ok;
+format_jumpconst58_value(J) ->
+    io:format("16#~s,~n", [integer_to_list(?MASK(58, J) bor ?BIT(58), 16)]),
+    format_jumpconst58_value(J bsr 58).
+
+%% =====================================================================
 %% Ziggurat cont
 %% =====================================================================
 -define(NOR_R, 3.6541528853610087963519472518).
diff --git a/lib/stdlib/src/re.erl b/lib/stdlib/src/re.erl
index 726b409d4d..197564b895 100644
--- a/lib/stdlib/src/re.erl
+++ b/lib/stdlib/src/re.erl
@@ -33,6 +33,8 @@
 
 %%% BIFs
 
+-export([internal_run/4]).
+
 -export([version/0, compile/1, compile/2, run/2, run/3, inspect/2]).
 
 -spec version() -> binary().
@@ -100,6 +102,40 @@ run(_, _) ->
 run(_, _, _) ->
     erlang:nif_error(undef).
 
+-spec internal_run(Subject, RE, Options, FirstCall) -> {match, Captured} |
+                                                       match |
+                                                       nomatch |
+                                                       {error, ErrType} when
+      Subject :: iodata() | unicode:charlist(),
+      RE :: mp() | iodata() | unicode:charlist(),
+      Options :: [Option],
+      Option :: anchored | global | notbol | noteol | notempty 
+	      | notempty_atstart | report_errors
+              | {offset, non_neg_integer()} |
+		{match_limit, non_neg_integer()} |
+		{match_limit_recursion, non_neg_integer()} |
+                {newline, NLSpec :: nl_spec()} |
+                bsr_anycrlf | bsr_unicode | {capture, ValueSpec} |
+                {capture, ValueSpec, Type} | CompileOpt,
+      Type :: index | list | binary,
+      ValueSpec :: all | all_but_first | all_names | first | none | ValueList,
+      ValueList :: [ValueID],
+      ValueID :: integer() | string() | atom(),
+      CompileOpt :: compile_option(),
+      Captured :: [CaptureData] | [[CaptureData]],
+      CaptureData :: {integer(), integer()}
+                   | ListConversionData
+                   | binary(),
+      ListConversionData :: string()
+                          | {error, string(), binary()}
+                          | {incomplete, string(), binary()},
+      ErrType :: match_limit | match_limit_recursion | {compile,  CompileErr}, 
+      CompileErr :: {ErrString :: string(), Position :: non_neg_integer()},
+      FirstCall :: boolean().
+
+internal_run(_, _, _, _) ->
+    erlang:nif_error(undef).
+
 -spec inspect(MP,Item) -> {namelist, [ binary() ]} when
       MP :: mp(),
       Item :: namelist.
@@ -765,17 +801,17 @@ do_grun(FlatSubject,Subject,Unicode,CRLF,RE,{Options0,NeedClean}) ->
     try
 	postprocess(loopexec(FlatSubject,RE,InitialOffset,
 			     byte_size(FlatSubject),
-			     Unicode,CRLF,StrippedOptions),
+			     Unicode,CRLF,StrippedOptions,true),
 		    SelectReturn,ConvertReturn,FlatSubject,Unicode)
     catch
 	throw:ErrTuple ->
 	    ErrTuple
     end.
 
-loopexec(_,_,X,Y,_,_,_) when X > Y ->
+loopexec(_,_,X,Y,_,_,_,_) when X > Y ->
     {match,[]};
-loopexec(Subject,RE,X,Y,Unicode,CRLF,Options) ->
-    case re:run(Subject,RE,[{offset,X}]++Options) of
+loopexec(Subject,RE,X,Y,Unicode,CRLF,Options, First) ->
+    case re:internal_run(Subject,RE,[{offset,X}]++Options,First) of
 	{error, Err} ->
 	    throw({error,Err});
 	nomatch ->
@@ -784,11 +820,11 @@ loopexec(Subject,RE,X,Y,Unicode,CRLF,Options) ->
 	    {match,Rest} = 
 		case B>0 of
 		    true ->
-			loopexec(Subject,RE,A+B,Y,Unicode,CRLF,Options);
+			loopexec(Subject,RE,A+B,Y,Unicode,CRLF,Options,false);
 		    false ->
 			{match,M} = 
-			    case re:run(Subject,RE,[{offset,X},notempty_atstart,
-						anchored]++Options) of
+			    case re:internal_run(Subject,RE,[{offset,X},notempty_atstart,
+                                                             anchored]++Options,false) of
 				nomatch ->
 				    {match,[]};
 				{match,Other} ->
@@ -801,7 +837,7 @@ loopexec(Subject,RE,X,Y,Unicode,CRLF,Options) ->
 				       forward(Subject,A,1,Unicode,CRLF)
 			       end,
 			{match,MM} = loopexec(Subject,RE,NewA,Y,
-					      Unicode,CRLF,Options),
+					      Unicode,CRLF,Options,false),
 			case M of 
 			    [] ->
 				{match,MM};
diff --git a/lib/stdlib/src/slave.erl b/lib/stdlib/src/slave.erl
index 5e8c1a43ea..4791e3ebda 100644
--- a/lib/stdlib/src/slave.erl
+++ b/lib/stdlib/src/slave.erl
@@ -104,18 +104,17 @@ relay1(Pid) ->
 %% this to work is that the 'erl' program can be found in PATH.
 %%
 %% If the master and slave are on different hosts, start/N uses
-%% the 'rsh' program to spawn an Erlang node on the other host.
+%% the 'ssh' program to spawn an Erlang node on the other host.
 %% Alternative, if the master was started as
 %% 'erl -sname xxx -rsh my_rsh...', then 'my_rsh' will be used instead
-%% of 'rsh' (this is useful for systems where the rsh program is named
-%% 'remsh').
+%% of 'ssh' (this is useful for systems still using rsh or remsh).
 %%
 %% For this to work, the following conditions must be fulfilled:
 %%
-%% 1. There must be an Rsh program on computer; if not an error
+%% 1. There must be an ssh program on computer; if not an error
 %%    is returned.
 %%
-%% 2. The hosts must be configured to allowed 'rsh' access without
+%% 2. The hosts must be configured to allow 'ssh' access without
 %%    prompts for password.
 %%
 %% The slave node will have its filer and user server redirected
@@ -286,7 +285,7 @@ register_unique_name(Number) ->
 
 %% Makes up the command to start the nodes.
 %% If the node should run on the local host, there is
-%% no need to use rsh.
+%% no need to use a remote shell.
 
 mk_cmd(Host, Name, Args, Waiter, Prog0) ->
     Prog = quote_progname(Prog0),
@@ -342,9 +341,7 @@ do_quote_progname([Prog,Arg|Args]) ->
 		lists:flatten(lists:map(fun(X) -> [" ",X] end, [Arg|Args]))
     end.
 
-%% Give the user an opportunity to run another program,
-%% than the "rsh".  On HP-UX rsh is called remsh; thus HP users
-%% must start erlang as erl -rsh remsh.
+%% Give the user an opportunity to run another program than "ssh".
 %%
 %% Also checks that the given program exists.
 %%
@@ -354,7 +351,7 @@ rsh() ->
     Rsh =
 	case init:get_argument(rsh) of
 	    {ok, [[Prog]]} -> Prog;
-	    _ -> "rsh"
+	    _ -> "ssh"
 	end,
     case os:find_executable(Rsh) of
 	false -> {error, no_rsh};
diff --git a/lib/stdlib/src/stdlib.app.src b/lib/stdlib/src/stdlib.app.src
index cd09872b87..e6c42b9aac 100644
--- a/lib/stdlib/src/stdlib.app.src
+++ b/lib/stdlib/src/stdlib.app.src
@@ -108,7 +108,7 @@
                dets]},
   {applications, [kernel]},
   {env, []},
-  {runtime_dependencies, ["sasl-3.0","kernel-6.0","erts-10.0","crypto-3.3",
+  {runtime_dependencies, ["sasl-3.0","kernel-6.0","erts-@OTP-15831:OTP-15836:OTP-15889@","crypto-3.3",
 			  "compiler-5.0"]}
 ]}.
 
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index 2a324aef82..0c270e9dd5 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -19,35 +19,41 @@
 %%
 %% We allow upgrade from, and downgrade to all previous
 %% versions from the following OTP releases:
-%% - OTP 20
 %% - OTP 21
+%% - OTP 22
 %%
 %% We also allow upgrade from, and downgrade to all
 %% versions that have branched off from the above
 %% stated previous versions.
 %%
 {"%VSN%",
- [{<<"^3\\.4$">>,[restart_new_emulator]},
-  {<<"^3\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^3\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^3\\.4\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^3\\.4\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^3\\.4\\.4(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^3\\.4\\.5(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^3\\.5$">>,[restart_new_emulator]},
+ [{<<"^3\\.5$">>,[restart_new_emulator]},
   {<<"^3\\.5\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.5\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^3\\.6$">>,[restart_new_emulator]},
-  {<<"^3\\.6\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
- [{<<"^3\\.4$">>,[restart_new_emulator]},
-  {<<"^3\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
-  {<<"^3\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^3\\.4\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^3\\.4\\.3(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^3\\.4\\.4(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^3\\.4\\.5(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^3\\.5$">>,[restart_new_emulator]},
+  {<<"^3\\.6\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.7$">>,[restart_new_emulator]},
+  {<<"^3\\.7\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.7\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.8$">>,[restart_new_emulator]},
+  {<<"^3\\.8\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.8\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.8\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.9$">>,[restart_new_emulator]},
+  {<<"^3\\.9\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.9\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
+ [{<<"^3\\.5$">>,[restart_new_emulator]},
   {<<"^3\\.5\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.5\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^3\\.6$">>,[restart_new_emulator]},
-  {<<"^3\\.6\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
+  {<<"^3\\.6\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.7$">>,[restart_new_emulator]},
+  {<<"^3\\.7\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.7\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.8$">>,[restart_new_emulator]},
+  {<<"^3\\.8\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.8\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.8\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.9$">>,[restart_new_emulator]},
+  {<<"^3\\.9\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.9\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
diff --git a/lib/stdlib/src/string.erl b/lib/stdlib/src/string.erl
index 2939e78d9d..a418754caf 100644
--- a/lib/stdlib/src/string.erl
+++ b/lib/stdlib/src/string.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. 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.
@@ -128,7 +128,8 @@ length(CD) ->
 to_graphemes(CD0) ->
     case unicode_util:gc(CD0) of
         [GC|CD] -> [GC|to_graphemes(CD)];
-        [] -> []
+        [] -> [];
+        {error, Err} -> error({badarg, Err})
     end.
 
 %% Compare two strings return boolean, assumes that the input are
@@ -332,7 +333,10 @@ uppercase(<<CP1/utf8, Rest/binary>>=Orig) ->
     catch unchanged -> Orig
     end;
 uppercase(<<>>) ->
-    <<>>.
+    <<>>;
+uppercase(Bin) ->
+    error({badarg, Bin}).
+
 
 %% Lowercase all chars in Str
 -spec lowercase(String::unicode:chardata()) -> unicode:chardata().
@@ -346,7 +350,10 @@ lowercase(<<CP1/utf8, Rest/binary>>=Orig) ->
     catch unchanged -> Orig
     end;
 lowercase(<<>>) ->
-    <<>>.
+    <<>>;
+lowercase(Bin) ->
+    error({badarg, Bin}).
+
 
 %% Make a titlecase of the first char in Str
 -spec titlecase(String::unicode:chardata()) -> unicode:chardata().
@@ -375,7 +382,9 @@ casefold(<<CP1/utf8, Rest/binary>>=Orig) ->
     catch unchanged -> Orig
     end;
 casefold(<<>>) ->
-    <<>>.
+    <<>>;
+casefold(Bin) ->
+    error({badarg, Bin}).
 
 -spec to_integer(String) -> {Int, Rest} | {'error', Reason} when
       String :: unicode:chardata(),
@@ -544,7 +553,8 @@ length_1([CP1|[CP2|_]=Cont], N) when ?ASCII_LIST(CP1,CP2) ->
 length_1(Str, N) ->
     case unicode_util:gc(Str) of
         [] -> N;
-        [_|Rest] -> length_1(Rest, N+1)
+        [_|Rest] -> length_1(Rest, N+1);
+        {error, Err} -> error({badarg, Err})
     end.
 
 length_b(<<CP2/utf8, Rest/binary>>, CP1, N)
@@ -554,7 +564,8 @@ 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)
+        [CP3|Bin] -> length_b(Bin, CP3, N+1);
+        {error, Err} -> error({badarg, Err})
     end.
 
 equal_1([A|AR], [B|BR]) when is_integer(A), is_integer(B) ->
@@ -599,7 +610,8 @@ reverse_1([CP1|[CP2|_]=Cont], Acc) when ?ASCII_LIST(CP1,CP2) ->
 reverse_1(CD, Acc) ->
     case unicode_util:gc(CD) of
         [GC|Rest] -> reverse_1(Rest, [GC|Acc]);
-        [] -> Acc
+        [] -> Acc;
+        {error, Err} -> error({badarg, Err})
     end.
 
 reverse_b(<<CP2/utf8, Rest/binary>>, CP1, Acc)
@@ -609,7 +621,8 @@ 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])
+        [CP3|Bin] -> reverse_b(Bin, CP3, [GC|Acc]);
+        {error, Err} -> error({badarg, Err})
     end.
 
 slice_l0(<<CP1/utf8, Bin/binary>>, N) when N > 0 ->
@@ -622,7 +635,8 @@ slice_l([CP1|[CP2|_]=Cont], N) when ?ASCII_LIST(CP1,CP2),N > 0 ->
 slice_l(CD, N) when N > 0 ->
     case unicode_util:gc(CD) of
         [_|Cont] -> slice_l(Cont, N-1);
-        [] -> []
+        [] -> [];
+        {error, Err} -> error({badarg, Err})
     end;
 slice_l(Cont, 0) ->
     Cont.
@@ -634,7 +648,8 @@ slice_lb(Bin, CP1, N) ->
     if N > 1 ->
             case unicode_util:cp(Rest) of
                 [CP2|Cont] -> slice_lb(Cont, CP2, N-1);
-                [] -> <<>>
+                [] -> <<>>;
+                {error, Err} -> error({badarg, Err})
             end;
        N =:= 1 ->
             Rest
@@ -647,7 +662,10 @@ slice_trail(Orig, N) when is_binary(Orig) ->
             Sz = byte_size(Orig) - Length,
             <<Keep:Sz/binary, _/binary>> = Orig,
             Keep;
-        _ -> <<>>
+        <<_, _/binary>> when N > 0 ->
+            error({badarg, Orig});
+        _ ->
+            <<>>
     end;
 slice_trail(CD, N) when is_list(CD) ->
     slice_list(CD, N).
@@ -657,7 +675,8 @@ slice_list([CP1|[CP2|_]=Cont], N) when ?ASCII_LIST(CP1,CP2),N > 0 ->
 slice_list(CD, N) when N > 0 ->
     case unicode_util:gc(CD) of
         [GC|Cont] -> append(GC, slice_list(Cont, N-1));
-        [] -> []
+        [] -> [];
+        {error, Err} -> error({badarg, Err})
     end;
 slice_list(_, 0) ->
     [].
@@ -668,7 +687,8 @@ 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
+        [] -> 0;
+        {error, Err} -> error({badarg, Err})
     end;
 slice_bin(CD, CP1, 0) ->
     byte_size(CD)+byte_size(<<CP1/utf8>>).
@@ -703,14 +723,18 @@ uppercase_bin(CP1, Bin, Changed) ->
                 [] when Changed ->
                     [CP1];
                 [] ->
-                    throw(unchanged)
+                    throw(unchanged);
+                {error, Err} ->
+                    error({badarg, Err})
             end;
         [Char|CPs] ->
             case unicode_util:cp(CPs) of
                 [Next|Rest] ->
                     [Char|uppercase_bin(Next, Rest, true)];
                 [] ->
-                    [Char]
+                    [Char];
+                {error, Err} ->
+                    error({badarg, Err})
             end
     end.
 
@@ -744,14 +768,18 @@ lowercase_bin(CP1, Bin, Changed) ->
                 [] when Changed ->
                     [CP1];
                 [] ->
-                    throw(unchanged)
+                    throw(unchanged);
+                {error, Err} ->
+                    error({badarg, Err})
             end;
         [Char|CPs] ->
             case unicode_util:cp(CPs) of
                 [Next|Rest] ->
                     [Char|lowercase_bin(Next, Rest, true)];
                 [] ->
-                    [Char]
+                    [Char];
+                {error, Err} ->
+                    error({badarg, Err})
             end
     end.
 
@@ -785,14 +813,18 @@ casefold_bin(CP1, Bin, Changed) ->
                 [] when Changed ->
                     [CP1];
                 [] ->
-                    throw(unchanged)
+                    throw(unchanged);
+                {error, Err} ->
+                    error({badarg, Err})
             end;
         [Char|CPs] ->
             case unicode_util:cp(CPs) of
                 [Next|Rest] ->
                     [Char|casefold_bin(Next, Rest, true)];
                 [] ->
-                    [Char]
+                    [Char];
+                {error, Err} ->
+                    error({badarg, Err})
             end
     end.
 
@@ -1247,18 +1279,20 @@ split_1(Bin, [_C|_]=Needle, Start, Where, Curr0, Acc) ->
             end
     end.
 
-lexemes_m([CP|_]=Cs0, {GCs,CPs,_}=Seps, Ts) when is_integer(CP) ->
+lexemes_m([CP|_]=Cs0, {GCs,CPs,_}=Seps0, 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);
+                    lexemes_m(Cs2, Seps0, Ts);
                 false ->
+                    Seps = search_compile(Seps0),
                     {Lexeme,Rest} = lexeme_pick(Cs0, Seps, []),
                     lexemes_m(Rest, Seps, [Lexeme|Ts])
             end;
         false ->
+            Seps = search_compile(Seps0),
             {Lexeme,Rest} = lexeme_pick(Cs0, Seps, []),
             lexemes_m(Rest, Seps, [Lexeme|Ts])
     end;
@@ -1632,7 +1666,9 @@ bin_search_inv_1(<<CP1/utf8, BinRest/binary>>=Bin0, Cont, Sep) ->
 bin_search_inv_1(<<>>, Cont, _Sep) ->
     {nomatch, Cont};
 bin_search_inv_1([], Cont, _Sep) ->
-    {nomatch, Cont}.
+    {nomatch, Cont};
+bin_search_inv_1(Bin, _, _) ->
+    error({badarg, Bin}).
 
 
 bin_search_inv_n(<<CP1/utf8, BinRest/binary>>=Bin0, Cont, Seps) ->
@@ -1664,7 +1700,9 @@ bin_search_inv_n(<<CP1/utf8, BinRest/binary>>=Bin0, Cont, Seps) ->
 bin_search_inv_n(<<>>, Cont, _Sep) ->
     {nomatch, Cont};
 bin_search_inv_n([], Cont, _Sep) ->
-    {nomatch, Cont}.
+    {nomatch, Cont};
+bin_search_inv_n(Bin, _, _) ->
+    error({badarg, Bin}).
 
 bin_search_str(Bin0, Start, [], SearchCPs) ->
     Compiled = binary:compile_pattern(unicode:characters_to_binary(SearchCPs)),
diff --git a/lib/stdlib/src/sys.erl b/lib/stdlib/src/sys.erl
index 0064414d6f..6ff9aa33b4 100644
--- a/lib/stdlib/src/sys.erl
+++ b/lib/stdlib/src/sys.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. 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.
@@ -30,22 +30,30 @@
 	 log_to_file/2, log_to_file/3, no_debug/1, no_debug/2,
 	 install/2, install/3, remove/2, remove/3]).
 -export([handle_system_msg/6, handle_system_msg/7, handle_debug/4,
-	 print_log/1, get_debug/3, debug_options/1, suspend_loop_hib/6]).
+	 print_log/1, get_log/1, get_debug/3, debug_options/1, suspend_loop_hib/6]).
+-deprecated([{get_debug,3,eventually}]).
 
 %%-----------------------------------------------------------------
 %% Types
 %%-----------------------------------------------------------------
 
--export_type([dbg_opt/0]).
+-export_type([dbg_opt/0, dbg_fun/0, debug_option/0]).
 
 -type name()         :: pid() | atom()
                       | {'global', term()}
                       | {'via', module(), term()}.
 -type system_event() :: {'in', Msg :: _}
-                      | {'in', Msg :: _, From :: _}
+                      | {'in', Msg :: _, State :: _}
                       | {'out', Msg :: _, To :: _}
                       | {'out', Msg :: _, To :: _, State :: _}
-                        | term().
+                      | {'noreply', State :: _}
+                      | {'continue', Continuation :: _}
+                      | {'code_change', Event :: _, State :: _}
+                      | {'postpone', Event :: _, State :: _, NextState :: _}
+                      | {'consume', Event :: _, State :: _, NextState :: _}
+                      | {'enter', State :: _}
+                      | {'terminate', Reason :: _, State :: _}
+                      | term().
 -opaque dbg_opt()    :: {'trace', 'true'}
                       | {'log',
                          {N :: non_neg_integer(),
@@ -67,6 +75,16 @@
 			     Event :: system_event(),
 			     Extra :: term()) -> any()).
 
+-type debug_option() ::
+        'trace'
+      | 'log'
+      | {'log', N :: pos_integer()}
+      | 'statistics'
+      | {'log_to_file', FileName :: file:name()}
+      | {'install',
+         {Func :: dbg_fun(), FuncState :: term()}
+         | {FuncId :: term(), Func :: dbg_fun(), FuncState :: term()}}.
+
 %%-----------------------------------------------------------------
 %% System messages
 %%-----------------------------------------------------------------
@@ -385,31 +403,41 @@ handle_system_msg(SysState, Msg, From, Parent, Mod, Debug, Misc, Hib) ->
       FormFunc :: format_fun(),
       Extra :: term(),
       Event :: system_event().
-handle_debug([{trace, true} | T], FormFunc, State, Event) ->
+handle_debug([{trace, true} = DbgOpt | T], FormFunc, State, Event) ->
     print_event({Event, State, FormFunc}),
-    [{trace, true} | handle_debug(T, FormFunc, State, Event)];
-handle_debug([{log, {N, LogData}} | T], FormFunc, State, Event) ->
-    NLogData = [{Event, State, FormFunc} | trim(N, LogData)],
-    [{log, {N, NLogData}} | handle_debug(T, FormFunc, State, Event)];
-handle_debug([{log_to_file, Fd} | T], FormFunc, State, Event) ->
+    [DbgOpt | handle_debug(T, FormFunc, State, Event)];
+handle_debug([{log, NLog} | T], FormFunc, State, Event) ->
+    Item = {Event, State, FormFunc},
+    [{log, nlog_put(Item, NLog)} | handle_debug(T, FormFunc, State, Event)];
+handle_debug([{log_to_file, Fd} = DbgOpt | T], FormFunc, State, Event) ->
     print_event(Fd, {Event, State, FormFunc}),
-    [{log_to_file, Fd} | handle_debug(T, FormFunc, State, Event)];
+    [DbgOpt | handle_debug(T, FormFunc, State, Event)];
 handle_debug([{statistics, StatData} | T], FormFunc, State, Event) ->
     NStatData = stat(Event, StatData),
     [{statistics, NStatData} | handle_debug(T, FormFunc, State, Event)];
 handle_debug([{FuncId, {Func, FuncState}} | T], FormFunc, State, Event) ->
-    case catch Func(FuncState, Event, State) of
+    try Func(FuncState, Event, State) of
+        done -> handle_debug(T, FormFunc, State, Event);
+        NFuncState ->
+            [{FuncId, {Func, NFuncState}} |
+             handle_debug(T, FormFunc, State, Event)]
+    catch
         done -> handle_debug(T, FormFunc, State, Event);
-        {'EXIT', _} -> handle_debug(T, FormFunc, State, Event);
         NFuncState ->
-            [{FuncId, {Func, NFuncState}} | handle_debug(T, FormFunc, State, Event)]
+            [{FuncId, {Func, NFuncState}} |
+             handle_debug(T, FormFunc, State, Event)];
+        _:_ -> handle_debug(T, FormFunc, State, Event)
     end;
 handle_debug([{Func, FuncState} | T], FormFunc, State, Event) ->
-    case catch Func(FuncState, Event, State) of
+    try Func(FuncState, Event, State) of
 	done -> handle_debug(T, FormFunc, State, Event);
-	{'EXIT', _} -> handle_debug(T, FormFunc, State, Event);
-	NFuncState ->		     
+	NFuncState ->
 	    [{Func, NFuncState} | handle_debug(T, FormFunc, State, Event)]
+    catch
+	done -> handle_debug(T, FormFunc, State, Event);
+	NFuncState ->
+	    [{Func, NFuncState} | handle_debug(T, FormFunc, State, Event)];
+        _:_ -> handle_debug(T, FormFunc, State, Event)
     end;
 handle_debug([], _FormFunc, _State, _Event) ->
     [].
@@ -526,19 +554,19 @@ debug_cmd({trace, true}, Debug) ->
 debug_cmd({trace, false}, Debug) ->
     {ok, remove_debug(trace, Debug)};
 debug_cmd({log, true}, Debug) ->
-    {_N, Logs} = get_debug(log, Debug, {0, []}),
-    {ok, install_debug(log, {10, trim(10, Logs)}, Debug)};
-debug_cmd({log, {true, N}}, Debug) when is_integer(N), N > 0 ->
-    {_N, Logs} = get_debug(log, Debug, {0, []}),
-    {ok, install_debug(log, {N, trim(N, Logs)}, Debug)};
+    NLog = get_debug(log, Debug, nlog_new()),
+    {ok, install_debug(log, nlog_new(NLog), Debug)};
+debug_cmd({log, {true, N}}, Debug) when is_integer(N), 1 =< N ->
+    NLog = get_debug(log, Debug, nlog_new(N)),
+    {ok, install_debug(log, nlog_new(N, NLog), Debug)};
 debug_cmd({log, false}, Debug) ->
     {ok, remove_debug(log, Debug)};
 debug_cmd({log, print}, Debug) ->
     print_log(Debug),
     {ok, Debug};
 debug_cmd({log, get}, Debug) ->
-    {_N, Logs} = get_debug(log, Debug, {0, []}),
-    {{ok, lists:reverse(Logs)}, Debug};
+    NLog = get_debug(log, Debug, nlog_new()),
+    {{ok, [Event || {Event, _State, _FormFunc} <- nlog_get(NLog)]}, Debug};
 debug_cmd({log_to_file, false}, Debug) ->
     NDebug = close_log_file(Debug),
     {ok, NDebug};
@@ -595,9 +623,6 @@ stat({out, _Msg, _To}, {Time, Reds, In, Out}) -> {Time, Reds, In, Out+1};
 stat({out, _Msg, _To, _State}, {Time, Reds, In, Out}) -> {Time, Reds, In, Out+1};
 stat(_, StatData) -> StatData.
 
-trim(N, LogData) ->
-    lists:sublist(LogData, 1, N-1).
-
 %%-----------------------------------------------------------------
 %% Debug structure manipulating functions
 %%-----------------------------------------------------------------
@@ -625,9 +650,14 @@ get_debug2(Item, Debug, Default) ->
 -spec print_log(Debug) -> 'ok' when
       Debug :: [dbg_opt()].
 print_log(Debug) ->
-    {_N, Logs} = get_debug(log, Debug, {0, []}),
-    lists:foreach(fun print_event/1,
-		  lists:reverse(Logs)).
+    NLog = get_debug(log, Debug, nlog_new()),
+    lists:foreach(fun print_event/1, nlog_get(NLog)).
+
+-spec get_log(Debug) -> [system_event()] when
+      Debug :: [dbg_opt()].
+get_log(Debug) ->
+    NLog = get_debug(log, Debug, nlog_new()),
+    [Event || {Event, _State, _FormFunc} <- nlog_get(NLog)].
     
 close_log_file(Debug) ->
     case get_debug2(log_to_file, Debug, []) of
@@ -639,6 +669,74 @@ close_log_file(Debug) ->
     end.
 
 %%-----------------------------------------------------------------
+%% Keep the last N Log functions
+%%-----------------------------------------------------------------
+%%
+%% Streamlined Okasaki queue as base for "keep the last N" log.
+%%
+%% To the reverse list head we cons new items.
+%% The forward list contains elements in insertion order,
+%% so the head is the oldest and the one to drop off
+%% when the log is full.
+%%
+%% Here is how we can get away with only using one cons cell
+%% to wrap the forward and reverse list, and the log size:
+%%
+%% A full log does not need a counter; we just cons one
+%% and drop one:
+%%
+%%     [ReverseList|ForwardList]
+%%
+%% A non-full log is filling up to N elements;
+%% use a down counter instead of a list as first element:
+%%
+%%     [RemainingToFullCount|ReverseList]
+
+nlog_new() ->
+    nlog_new(10).
+%%
+nlog_new([_|_] = NLog) ->
+    nlog_new(10, NLog);
+nlog_new(N) ->
+    [N]. % Empty log size N >= 1
+%%
+nlog_new(N, NLog) ->
+    lists:foldl(
+      fun (Item, NL) -> nlog_put(Item, NL) end,
+      nlog_new(N),
+      nlog_get(NLog)).
+
+%%
+nlog_put(Item, NLog) ->
+    case NLog of
+        [R|FF] when is_list(R) ->
+            %% Full log
+            case FF of
+                [_|F] ->
+                    %% Cons to reverse list, drop from forward list
+                    [[Item|R]|F];
+                [] ->
+                    %% Create new forward list from reverse list,
+                    %% create new empty reverse list
+                    [_|F] = lists:reverse(R, [Item]),
+                    [[]|F]
+            end;
+        [1|R] ->
+            %% Log now gets full
+            [[Item|R]];
+        [J|R] ->
+            %% Filling up to N elements
+            [J - 1,Item|R]
+    end.
+
+nlog_get([[]|F]) ->
+    F;
+nlog_get([[_|_] = R|F]) ->
+    F ++ lists:reverse(R);
+nlog_get([_J|R]) ->
+    lists:reverse(R).
+
+%%-----------------------------------------------------------------
 %% Func: debug_options/1
 %% Purpose: Initiate a debug structure.  Called by a process that
 %%          wishes to initiate the debug structure without the
@@ -646,28 +744,16 @@ close_log_file(Debug) ->
 %% Returns: [debug_opts()]
 %%-----------------------------------------------------------------
 
--spec debug_options(Options) -> [dbg_opt()] when
-      Options :: [Opt],
-      Opt :: 'trace'
-           | 'log'
-           | {'log', pos_integer()}
-           | 'statistics'
-           | {'log_to_file', FileName}
-           | {'install', FuncSpec},
-      FileName :: file:name(),
-      FuncSpec :: {Func, FuncState} | {FuncId, Func, FuncState},
-      FuncId :: term(),
-      Func :: dbg_fun(),
-      FuncState :: term().
+-spec debug_options([Opt :: debug_option()]) -> [dbg_opt()].
 debug_options(Options) ->
     debug_options(Options, []).
 
 debug_options([trace | T], Debug) ->
     debug_options(T, install_debug(trace, true, Debug));
 debug_options([log | T], Debug) ->
-    debug_options(T, install_debug(log, {10, []}, Debug));
+    debug_options(T, install_debug(log, nlog_new(), Debug));
 debug_options([{log, N} | T], Debug) when is_integer(N), N > 0 ->
-    debug_options(T, install_debug(log, {N, []}, Debug));
+    debug_options(T, install_debug(log, nlog_new(N), Debug));
 debug_options([statistics | T], Debug) ->
     debug_options(T, install_debug(statistics, init_stat(), Debug));
 debug_options([{log_to_file, FileName} | T], Debug) ->
diff --git a/lib/stdlib/src/uri_string.erl b/lib/stdlib/src/uri_string.erl
index f07307c039..d33dc89af8 100644
--- a/lib/stdlib/src/uri_string.erl
+++ b/lib/stdlib/src/uri_string.erl
@@ -415,7 +415,7 @@ transcode(URIString, Options) when is_list(URIString) ->
 %% (application/x-www-form-urlencoded encoding algorithm)
 %%-------------------------------------------------------------------------
 -spec compose_query(QueryList) -> QueryString when
-      QueryList :: [{unicode:chardata(), unicode:chardata()}],
+      QueryList :: [{unicode:chardata(), unicode:chardata() | true}],
       QueryString :: uri_string()
                    | error().
 compose_query(List) ->
@@ -423,7 +423,7 @@ compose_query(List) ->
 
 
 -spec compose_query(QueryList, Options) -> QueryString when
-      QueryList :: [{unicode:chardata(), unicode:chardata()}],
+      QueryList :: [{unicode:chardata(), unicode:chardata() | true}],
       Options :: [{encoding, atom()}],
       QueryString :: uri_string()
                    | error().
@@ -435,6 +435,11 @@ compose_query(List, Options) ->
       throw:{error, Atom, RestData} -> {error, Atom, RestData}
     end.
 %%
+compose_query([{Key,true}|Rest], Options, IsList, Acc) ->
+    Separator = get_separator(Rest),
+    K = form_urlencode(Key, Options),
+    IsListNew = IsList orelse is_list(Key),
+    compose_query(Rest, Options, IsListNew, <<Acc/binary,K/binary,Separator/binary>>);
 compose_query([{Key,Value}|Rest], Options, IsList, Acc) ->
     Separator = get_separator(Rest),
     K = form_urlencode(Key, Options),
@@ -454,7 +459,7 @@ compose_query([], _Options, IsList, Acc) ->
 %%-------------------------------------------------------------------------
 -spec dissect_query(QueryString) -> QueryList when
       QueryString :: uri_string(),
-      QueryList :: [{unicode:chardata(), unicode:chardata()}]
+      QueryList :: [{unicode:chardata(), unicode:chardata() | true}]
                  | error().
 dissect_query(<<>>) ->
     [];
@@ -1889,13 +1894,12 @@ 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(T = <<$&,_/binary>>, IsList, Acc, Key, <<>>) ->
+    dissect_query_value(T, IsList, Acc, Key, true);
 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_key(T = <<>>, IsList, Acc, Key, <<>>) ->
+    dissect_query_value(T, IsList, Acc, Key, true).
 
 dissect_query_value(<<$&,T/binary>>, IsList, Acc, Key, Value) ->
     K = form_urldecode(IsList, Key),
@@ -1908,9 +1912,10 @@ dissect_query_value(<<>>, IsList, Acc, Key, Value) ->
     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) ->
+    true;
 form_urldecode(true, B) ->
     Result = base10_decode(form_urldecode(B, <<>>)),
     convert_to_list(Result, utf8);
diff --git a/lib/stdlib/test/Makefile b/lib/stdlib/test/Makefile
index bbe3cefa42..712b1b92fb 100644
--- a/lib/stdlib/test/Makefile
+++ b/lib/stdlib/test/Makefile
@@ -99,11 +99,9 @@ MODULES= \
 	maps_SUITE \
 	zzz_SUITE
 
-ERL_FILES= $(MODULES:%=%.erl)
+ERTS_MODULES= erts_test_utils
 
-TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
-
-INSTALL_PROGS= $(TARGET_FILES)
+ERL_FILES= $(MODULES:%=%.erl) $(ERTS_MODULES:%=$(ERL_TOP)/erts/emulator/test/%.erl)
 
 # ----------------------------------------------------
 # Release directory specification
@@ -128,7 +126,7 @@ COVERFILE=stdlib.cover
 # ----------------------------------------------------
 
 make_emakefile:
-	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES) \
+	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES) $(ERTS_MODULES) \
 	> $(EMAKEFILE)
 
 tests debug opt: make_emakefile
diff --git a/lib/stdlib/test/beam_lib_SUITE.erl b/lib/stdlib/test/beam_lib_SUITE.erl
index 6418dc7eb6..4b2694320e 100644
--- a/lib/stdlib/test/beam_lib_SUITE.erl
+++ b/lib/stdlib/test/beam_lib_SUITE.erl
@@ -35,7 +35,7 @@
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2, 
-	 normal/1, error/1, cmp/1, cmp_literals/1, strip/1, otp_6711/1,
+	 normal/1, error/1, cmp/1, cmp_literals/1, strip/1, strip_add_chunks/1, otp_6711/1,
          building/1, md5/1, encrypted_abstr/1, encrypted_abstr_file/1]).
 
 -export([init_per_testcase/2, end_per_testcase/2]).
@@ -45,7 +45,7 @@ suite() ->
      {timetrap,{minutes,2}}].
 
 all() -> 
-    [error, normal, cmp, cmp_literals, strip, otp_6711,
+    [error, normal, cmp, cmp_literals, strip, strip_add_chunks, otp_6711,
      building, md5, encrypted_abstr, encrypted_abstr_file].
 
 groups() -> 
@@ -401,6 +401,69 @@ strip(Conf) when is_list(Conf) ->
 		  Source5D1, BeamFile5D1]),
     ok.
 
+strip_add_chunks(Conf) when is_list(Conf) ->
+    PrivDir = ?privdir,
+    {SourceD1, BeamFileD1} = make_beam(PrivDir, simple, member),
+    {Source2D1, BeamFile2D1} = make_beam(PrivDir, simple2, concat),
+    {Source3D1, BeamFile3D1} = make_beam(PrivDir, make_fun, make_fun),
+    {Source4D1, BeamFile4D1} = make_beam(PrivDir, constant, constant),
+    {Source5D1, BeamFile5D1} = make_beam(PrivDir, lines, lines),
+
+    NoOfTables = erlang:system_info(ets_count),
+    P0 = pps(),
+
+    %% strip binary
+    verify(not_a_beam_file, beam_lib:strip(<<>>)),
+    {ok, B1} = file:read_file(BeamFileD1),
+    {ok, {simple, NB1}} = beam_lib:strip(B1),
+
+    BId1 = chunk_ids(B1),
+    NBId1 = chunk_ids(NB1),
+    true = length(BId1) > length(NBId1),
+    compare_chunks(B1, NB1, NBId1),
+
+    %% Keep all the extra chunks
+    ExtraChunks = ["Abst" , "Dbgi" , "Attr" , "CInf" , "LocT" , "Atom" ],
+    {ok, {simple, AB1}} = beam_lib:strip(B1, ExtraChunks),
+    ABId1 = chunk_ids(AB1),
+    true = length(BId1) == length(ABId1),
+    compare_chunks(B1, AB1, ABId1),
+
+    %% strip file - Keep extra chunks
+    verify(file_error, beam_lib:strip(foo)),
+    {ok, {simple, _}} = beam_lib:strip(BeamFileD1, ExtraChunks),
+    compare_chunks(B1, BeamFileD1, ABId1),
+
+    %% strip_files
+    {ok, B2} = file:read_file(BeamFile2D1),
+    {ok, [{simple,_},{simple2,_}]} = beam_lib:strip_files([B1, B2], ExtraChunks),
+    {ok, [{simple,_},{simple2,_},{make_fun,_},{constant,_}]} =
+	beam_lib:strip_files([BeamFileD1, BeamFile2D1, BeamFile3D1, BeamFile4D1], ExtraChunks),
+
+    %% check that each module can be loaded.
+    {module, simple} = code:load_abs(filename:rootname(BeamFileD1)),
+    {module, simple2} = code:load_abs(filename:rootname(BeamFile2D1)),
+    {module, make_fun} = code:load_abs(filename:rootname(BeamFile3D1)),
+    {module, constant} = code:load_abs(filename:rootname(BeamFile4D1)),
+
+    %% check that line number information is still present after stripping
+    {module, lines} = code:load_abs(filename:rootname(BeamFile5D1)),
+    {'EXIT',{badarith,[{lines,t,1,Info}|_]}} = (catch lines:t(atom)),
+    false = code:purge(lines),
+    true = code:delete(lines),
+    {ok, {lines,BeamFile5D1}} = beam_lib:strip(BeamFile5D1),
+    {module, lines} = code:load_abs(filename:rootname(BeamFile5D1)),
+    {'EXIT',{badarith,[{lines,t,1,Info}|_]}} = (catch lines:t(atom)),
+
+    true = (P0 == pps()),
+    NoOfTables = erlang:system_info(ets_count),
+
+    delete_files([SourceD1, BeamFileD1,
+		  Source2D1, BeamFile2D1,
+		  Source3D1, BeamFile3D1,
+		  Source4D1, BeamFile4D1,
+		  Source5D1, BeamFile5D1]),
+    ok.
 
 otp_6711(Conf) when is_list(Conf) ->
     {'EXIT',{function_clause,_}} = (catch {a, beam_lib:info(3)}),
@@ -729,6 +792,7 @@ make_beam(Dir, Module, F) ->
     FileBase = filename:join(Dir, atom_to_list(Module)),
     Source = FileBase ++ ".erl",
     BeamFile = FileBase ++ ".beam",
+    file:delete(BeamFile),
     simple_file(Source, Module, F),
     {ok, _} = compile:file(Source, [{outdir,Dir}, debug_info, report]),
     {Source, BeamFile}.
diff --git a/lib/stdlib/test/binary_module_SUITE.erl b/lib/stdlib/test/binary_module_SUITE.erl
index c5cfea5e9e..be8ab3b98e 100644
--- a/lib/stdlib/test/binary_module_SUITE.erl
+++ b/lib/stdlib/test/binary_module_SUITE.erl
@@ -22,7 +22,8 @@
 -export([all/0, suite/0,
 	 interesting/1,scope_return/1,random_ref_comp/1,random_ref_sr_comp/1,
 	 random_ref_fla_comp/1,parts/1, bin_to_list/1, list_to_bin/1,
-	 copy/1, referenced/1,guard/1,encode_decode/1,badargs/1,longest_common_trap/1]).
+	 copy/1, referenced/1,guard/1,encode_decode/1,badargs/1,longest_common_trap/1,
+         check_no_invalid_read_bug/1]).
 
 -export([random_number/1, make_unaligned/1]).
 
@@ -36,7 +37,7 @@ all() ->
     [scope_return,interesting, random_ref_fla_comp, random_ref_sr_comp,
      random_ref_comp, parts, bin_to_list, list_to_bin, copy,
      referenced, guard, encode_decode, badargs,
-     longest_common_trap].
+     longest_common_trap, check_no_invalid_read_bug].
 
 
 -define(MASK_ERROR(EXPR),mask_error((catch (EXPR)))).
@@ -715,22 +716,22 @@ referenced(Config) when is_list(Config) ->
     badarg = ?MASK_ERROR(binary:referenced_byte_size(apa)),
     badarg = ?MASK_ERROR(binary:referenced_byte_size({})),
     badarg = ?MASK_ERROR(binary:referenced_byte_size(1)),
-    A = <<1,2,3>>,
-    B = binary:copy(A,1000),
-    3 = binary:referenced_byte_size(A),
-    3000 = binary:referenced_byte_size(B),
-    <<_:8,C:2/binary>> = A,
-    3 = binary:referenced_byte_size(C),
-    2 = binary:referenced_byte_size(binary:copy(C)),
-    <<_:7,D:2/binary,_:1>> = A,
-    2 = binary:referenced_byte_size(binary:copy(D)),
-    3 = binary:referenced_byte_size(D),
-    <<_:8,E:2/binary,_/binary>> = B,
-    3000 = binary:referenced_byte_size(E),
-    2 = binary:referenced_byte_size(binary:copy(E)),
-    <<_:7,F:2/binary,_:1,_/binary>> = B,
-    2 = binary:referenced_byte_size(binary:copy(F)),
-    3000 = binary:referenced_byte_size(F),
+    A = <<0:(1024 * 8)>>,
+    B = binary:copy(A, 1000),
+    1024 = binary:referenced_byte_size(A),
+    1024000 = binary:referenced_byte_size(B),
+    <<_:8,C:1023/binary>> = A,
+    1024 = binary:referenced_byte_size(C),
+    1023 = binary:referenced_byte_size(binary:copy(C)),
+    <<_:7,D:1023/binary,_:1>> = A,
+    1023 = binary:referenced_byte_size(binary:copy(D)),
+    1024 = binary:referenced_byte_size(D),
+    <<_:8,E:128/binary,_/binary>> = B,
+    1024000 = binary:referenced_byte_size(E),
+    128 = binary:referenced_byte_size(binary:copy(E)),
+    <<_:7,F:128/binary,_:1,_/binary>> = B,
+    128 = binary:referenced_byte_size(binary:copy(F)),
+    1024000 = binary:referenced_byte_size(F),
     ok.
 
 
@@ -754,8 +755,9 @@ list_to_bin(Config) when is_list(Config) ->
 copy(Config) when is_list(Config) ->
     <<1,2,3>> = binary:copy(<<1,2,3>>),
     RS = random_string({1,10000}),
-    RS = RS2 = binary:copy(RS),
-    false = erts_debug:same(RS,RS2),
+    RS2 = binary:copy(RS),
+    true = RS =:= RS2,
+    false = erts_debug:same(RS, RS2),
     <<>> = ?MASK_ERROR(binary:copy(<<1,2,3>>,0)),
     badarg = ?MASK_ERROR(binary:copy(<<1,2,3:3>>,2)),
     badarg = ?MASK_ERROR(binary:copy([],0)),
@@ -1361,3 +1363,13 @@ make_unaligned2(Bin0) when is_binary(Bin0) ->
     Bin.
 
 id(I) -> I.
+
+check_no_invalid_read_bug(Config) when is_list(Config) ->
+    check_no_invalid_read_bug(24);
+check_no_invalid_read_bug(60) ->
+    ok;
+check_no_invalid_read_bug(I) ->
+    N = 1 bsl I,
+    binary:encode_unsigned(N+N),
+    binary:encode_unsigned(N+N, little),
+    check_no_invalid_read_bug(I+1).
diff --git a/lib/stdlib/test/calendar_SUITE.erl b/lib/stdlib/test/calendar_SUITE.erl
index df62c0921d..224c0d5625 100644
--- a/lib/stdlib/test/calendar_SUITE.erl
+++ b/lib/stdlib/test/calendar_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2019. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2, 
 	 gregorian_days/1,
+	 big_gregorian_days/1,
 	 gregorian_seconds/1,
 	 day_of_the_week/1,
 	 day_of_the_week_calibrate/1,
@@ -36,13 +37,16 @@
 -define(START_YEAR, 1947).			
 -define(END_YEAR, 2012).
 
+-define(BIG_START_YEAR, 20000000).
+-define(BIG_END_YEAR, 20000020).
+
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [gregorian_days, gregorian_seconds, day_of_the_week,
      day_of_the_week_calibrate, leap_years,
      last_day_of_the_month, local_time_to_universal_time_dst,
-     iso_week_number, system_time, rfc3339].
+     iso_week_number, system_time, rfc3339, big_gregorian_days].
 
 groups() -> 
     [].
@@ -67,6 +71,14 @@ gregorian_days(Config) when is_list(Config) ->
     MaxDays = calendar:date_to_gregorian_days({?END_YEAR, 1, 1}),
     check_gregorian_days(Days, MaxDays).
 
+%% Tests that date_to_gregorian_days and gregorian_days_to_date
+%% are each others inverses from ?BIG_START_YEAR-01-01 up to ?BIG_END_YEAR-01-01.
+%% At the same time valid_date is tested.
+big_gregorian_days(Config) when is_list(Config) ->
+    Days = calendar:date_to_gregorian_days({?BIG_START_YEAR, 1, 1}),
+    MaxDays = calendar:date_to_gregorian_days({?BIG_END_YEAR, 1, 1}),
+    check_gregorian_days(Days, MaxDays).
+
 %% Tests that datetime_to_gregorian_seconds and
 %% gregorian_seconds_to_date are each others inverses for a sampled
 %% number of seconds from ?START_YEAR-01-01 up to ?END_YEAR-01-01: We check
diff --git a/lib/stdlib/test/epp_SUITE.erl b/lib/stdlib/test/epp_SUITE.erl
index 0ac99ad03a..a90beed4f3 100644
--- a/lib/stdlib/test/epp_SUITE.erl
+++ b/lib/stdlib/test/epp_SUITE.erl
@@ -1372,7 +1372,7 @@ otp_8562(Config) when is_list(Config) ->
 otp_8911(Config) when is_list(Config) ->
     case test_server:is_cover() of
 	true ->
-	    {skip, "Testing cover, so can not run when cover is already running"};
+	    {skip, "Testing cover, so cannot run when cover is already running"};
 	false ->
 	    do_otp_8911(Config)
     end.
diff --git a/lib/stdlib/test/erl_eval_SUITE.erl b/lib/stdlib/test/erl_eval_SUITE.erl
index f4019d477b..2436c8091c 100644
--- a/lib/stdlib/test/erl_eval_SUITE.erl
+++ b/lib/stdlib/test/erl_eval_SUITE.erl
@@ -1156,7 +1156,17 @@ simple() ->
     {A}.
 
 simple1() ->
-    erlang:error(simple).
+    %% If the compiler could see that this function would always
+    %% throw an error exception, it would rewrite simple() like this:
+    %%
+    %%   simple() -> simple1().
+    %%
+    %% That would change the stacktrace. To prevent the compiler from
+    %% doing that optimization, we must obfuscate the code.
+    case get(a_key_that_is_not_defined) of
+        undefined -> erlang:error(simple);
+        WillNeverHappen -> WillNeverHappen
+    end.
 
 %% Simple cases, just to cover some code.
 funs(Config) when is_list(Config) ->
diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index d18c7c255c..e7882e0daf 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-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2019. 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.
@@ -68,7 +68,7 @@
          non_latin1_module/1, otp_14323/1,
          stacktrace_syntax/1,
          otp_14285/1, otp_14378/1,
-         external_funs/1]).
+         external_funs/1,otp_15456/1,otp_15563/1]).
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
@@ -89,7 +89,8 @@ all() ->
      maps, maps_type, maps_parallel_match,
      otp_11851, otp_11879, otp_13230,
      record_errors, otp_11879_cont, non_latin1_module, otp_14323,
-     stacktrace_syntax, otp_14285, otp_14378, external_funs].
+     stacktrace_syntax, otp_14285, otp_14378, external_funs,
+     otp_15456, otp_15563].
 
 groups() -> 
     [{unused_vars_warn, [],
@@ -2108,17 +2109,93 @@ otp_5362(Config) when is_list(Config) ->
 			  {calendar,local_time_to_universal_time_dst,1}, "a future release"}}]}},
 
 	  {call_removed_function,
-	   <<"t(X) -> regexp:match(X).">>,
+	   <<"t(X) -> erlang:hash(X, 10000).">>,
 	   [],
 	   {warnings,
-            [{1,erl_lint,{removed,{regexp,match,1},
-			  "removed in R15; use the re module instead"}}]}}
+            [{1,erl_lint,{removed,{erlang,hash,2},{erlang,phash2,2},"20.0"}}]}},
+
+	  {nowarn_call_removed_function_1,
+	   <<"t(X) -> erlang:hash(X, 10000).">>,
+	   [{nowarn_removed,{erlang,hash,2}}],
+	   []},
+
+	  {nowarn_call_removed_function_2,
+	   <<"t(X) -> os_mon_mib:any_function_really(erlang:hash(X, 10000)).">>,
+	   [nowarn_removed],
+	   []},
+
+	  {call_removed_module,
+	   <<"t(X) -> os_mon_mib:any_function_really(X).">>,
+	   [],
+           {warnings,[{1,erl_lint,
+                       {removed,{os_mon_mib,any_function_really,1},
+                        "was removed in 22.0"}}]}},
+
+	  {nowarn_call_removed_module,
+	   <<"t(X) -> os_mon_mib:any_function_really(X).">>,
+	   [{nowarn_removed,os_mon_mib}],
+	   []}
 
 	 ],
 
     [] = run(Config, Ts),
     ok.
 
+%% OTP-15456. All compiler options can now be given in the option list
+%% (as opposed to only in files).
+otp_15456(Config) when is_list(Config) ->
+    Ts = [
+          %% {nowarn_deprecated_function,[{M,F,A}]} can now be given
+          %% in the option list as well as in an attribute.
+          %% Wherever it occurs, it is not affected by
+          %% warn_deprecated_function.
+          {otp_15456_1,
+           <<"-compile({nowarn_deprecated_function,{erlang,now,0}}).
+              -export([foo/0]).
+
+              foo() ->
+                  {erlang:now(), random:seed0(), random:seed(1, 2, 3),
+                   random:uniform(), random:uniform(42)}.
+           ">>,
+           {[{nowarn_deprecated_function,{random,seed0,0}},
+             {nowarn_deprecated_function,[{random,uniform,0},
+                                          {random,uniform,1}]},
+             %% There should be no warnings when attempting to
+             %% turn of warnings for functions that are not
+             %% deprecated or not used in the module.
+             {nowarn_deprecated_function,{random,uniform_s,1}},
+             {nowarn_deprecated_function,{erlang,abs,1}},
+             warn_deprecated_function]},
+           {warnings,[{5,erl_lint,
+                       {deprecated,{random,seed,3},
+                        "the 'random' module is deprecated; "
+                        "use the 'rand' module instead"}}]}},
+
+          %% {nowarn_unused_function,[{M,F,A}]} can be given
+          %% in the option list as well as in an attribute.
+          %% It was incorrectly documented to only work when
+          %% given in an attribute.
+          {otp_15456_2,
+           <<"-compile({nowarn_unused_function,foo/0}).
+              foo() -> ok.
+              bar() -> ok.
+              foobar() -> ok.
+              barf(_) -> ok.
+              other() -> ok.
+           ">>,
+           {[{nowarn_unused_function,[{bar,0},{foobar,0}]},
+             {nowarn_unused_function,{barf,1}},
+             %% There should be no warnings when attempting to
+             %% turn of warnings for unused functions that are not
+             %% defined in the module.
+             {nowarn_unused_function,{not_defined_in_module,1}},
+             warn_unused_function]},
+           {warnings,[{6,erl_lint,{unused_function,{other,0}}}]}
+          }],
+
+    [] = run(Config, Ts),
+    ok.
+
 %% OTP-5371. Aliases for bit syntax expressions are no longer allowed.
 otp_5371(Config) when is_list(Config) ->
     Ts = [{otp_5371_1,
@@ -2731,7 +2808,7 @@ bif_clash(Config) when is_list(Config) ->
            [],
 	   {errors,[{2,erl_lint,{call_to_redefined_old_bif,{size,1}}}],[]}},
 
-	  %% Verify that warnings can not be turned off in the old way.
+	  %% Verify that warnings cannot be turned off in the old way.
 	  {clash2,
            <<"-export([t/1,size/1]).
               t(X) ->
@@ -3499,10 +3576,12 @@ basic_errors(Config) ->
 
 	  {illegal_record_info,
 	   <<"f1() -> record_info(42, record).
-	      f2() -> record_info(shoe_size, record).">>,
+	      f2() -> record_info(shoe_size, record).
+              f3() -> fun record_info/2.">>,
 	   [],
 	   {errors,[{1,erl_lint,illegal_record_info},
-		    {2,erl_lint,illegal_record_info}],[]}},
+		    {2,erl_lint,illegal_record_info},
+                    {3,erl_lint,illegal_record_info}],[]}},
 
 	  {illegal_expr,
 	   <<"f() -> a:b.">>,
@@ -3931,6 +4010,8 @@ non_latin1_module(Config) ->
         format_error(non_latin1_module_unsupported),
     BadCallback =
         {bad_callback,{'кирилли́ческий атом','кирилли́ческий атом',0}},
+    BadModule =
+        {bad_module,{'кирилли́ческий атом','кирилли́ческий атом',0}},
     "explicit module not allowed for callback "
     "'кирилли́ческий атом':'кирилли́ческий атом'/0" =
         format_error(BadCallback),
@@ -3973,6 +4054,7 @@ non_latin1_module(Config) ->
              {11,erl_lint,illegal_guard_expr},
              {15,erl_lint,non_latin1_module_unsupported},
              {17,erl_lint,non_latin1_module_unsupported},
+             {17,erl_lint,BadModule},
              {20,erl_lint,non_latin1_module_unsupported},
              {23,erl_lint,non_latin1_module_unsupported},
              {25,erl_lint,non_latin1_module_unsupported}],
@@ -4150,6 +4232,21 @@ external_funs(Config) when is_list(Config) ->
     run(Config, Ts),
     ok.
 
+otp_15563(Config) when is_list(Config) ->
+    Ts = [{otp_15563,
+           <<"-type deep_list(A) :: [A | deep_list(A)].
+              -spec lists:flatten(deep_list(A)) -> [A].
+              -callback lists:concat([_]) -> string().
+              -spec ?MODULE:foo() -> any().
+              foo() -> a.
+           ">>,
+           [warn_unused_vars],
+           {errors,[{2,erl_lint,{bad_module,{lists,flatten,1}}},
+                    {3,erl_lint,{bad_callback,{lists,concat,1}}}],
+            []}}],
+    [] = run(Config, Ts),
+    ok.
+
 format_error(E) ->
     lists:flatten(erl_lint:format_error(E)).
 
diff --git a/lib/stdlib/test/erl_pp_SUITE.erl b/lib/stdlib/test/erl_pp_SUITE.erl
index dda8d0a12e..c0cfd26925 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-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2019. 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,11 +47,12 @@
 	  hook/1,
 	  neg_indent/1,
 	  maps_syntax/1,
+          quoted_atom_types/1,
 
 	  otp_6321/1, otp_6911/1, otp_6914/1, otp_8150/1, otp_8238/1,
 	  otp_8473/1, otp_8522/1, otp_8567/1, otp_8664/1, otp_9147/1,
           otp_10302/1, otp_10820/1, otp_11100/1, otp_11861/1, pr_1014/1,
-          otp_13662/1, otp_14285/1]).
+          otp_13662/1, otp_14285/1, otp_15592/1, otp_15751/1, otp_15755/1]).
 
 %% Internal export.
 -export([ehook/6]).
@@ -74,14 +75,14 @@ groups() ->
     [{expr, [],
       [func, call, recs, try_catch, if_then, receive_after,
        bits, head_tail, cond1, block, case1, ops,
-       messages, maps_syntax
+       messages, maps_syntax, quoted_atom_types
     ]},
      {attributes, [], [misc_attrs, import_export, dialyzer_attrs]},
      {tickets, [],
       [otp_6321, otp_6911, otp_6914, otp_8150, otp_8238,
        otp_8473, otp_8522, otp_8567, otp_8664, otp_9147,
        otp_10302, otp_10820, otp_11100, otp_11861, pr_1014, otp_13662,
-       otp_14285]}].
+       otp_14285, otp_15592, otp_15751, otp_15755]}].
 
 init_per_suite(Config) ->
     Config.
@@ -473,10 +474,10 @@ cond1(Config) when is_list(Config) ->
                     [{tuple,5,[{atom,5,x},{atom,5,y}]}]}]},
     CChars = flat_expr1(C),
     "cond\n"
-          "    {foo,bar} ->\n"
-          "        [a,b];\n"
+          "    {foo, bar} ->\n"
+          "        [a, b];\n"
           "    true ->\n"
-          "        {x,y}\n"
+          "        {x, y}\n"
           "end" = CChars,
     ok.
 
@@ -711,7 +712,7 @@ otp_6321(Config) when is_list(Config) ->
     Str = "S = hopp, {hej, S}. ",
     {done, {ok, Tokens, _EndLine}, ""} = erl_scan:tokens("", Str, _L=1),
     {ok, Exprs} = erl_parse:parse_exprs(Tokens),
-    "S = hopp, {hej,S}" = lists:flatten(erl_pp:exprs(Exprs)),
+    "S = hopp, {hej, S}" = lists:flatten(erl_pp:exprs(Exprs)),
     ok.
 
 %% OTP_6911. More newlines.
@@ -828,7 +829,7 @@ type_examples() ->
 	     "(t24()) -> D when is_subtype(D, atom()),"
 	     "                      is_subtype(D, t14()),"
 	     "                      is_subtype(D, '\\'t::4'()).">>},
-     {ex32,<<"-spec mod:t2() -> any(). ">>},
+     {ex32,<<"-spec erl_pp_test:t2() -> any(). ">>},
      {ex33,<<"-opaque attributes_data() :: "
        "[{'column', column()} | {'line', info_line()} |"
        " {'text', string()}] |  {line(),column()}. ">>},
@@ -912,6 +913,21 @@ maps_syntax(Config) when is_list(Config) ->
     ok = pp_forms(F),
     ok.
 
+quoted_atom_types(Config) when is_list(Config) ->
+    Q = [{quote_singleton_atom_types, true}],
+    U = [{encoding,unicode}],
+    L = [{encoding,latin1}],
+    F = "-type t() :: a | a().",
+    "-type t() :: 'a' | a().\n" =
+        lists:flatten(parse_and_pp_forms(F, Q ++ L)),
+    "-type t() :: 'a' | a().\n" =
+        lists:flatten(parse_and_pp_forms(F, Q ++ U)),
+    UF = "-type t() :: '\x{400}' | '\x{400}'().",
+    "-type t() :: '\\x{400}' | '\\x{400}'().\n" =
+        lists:flatten(parse_and_pp_forms(UF, Q ++ L)),
+    "-type t() :: '\x{400}' | '\x{400}'().\n" =
+        lists:flatten(parse_and_pp_forms(UF, Q ++ U)),
+    ok.
 
 %% OTP_8567. Avoid duplicated 'undefined' in record field types.
 otp_8567(Config) when is_list(Config) ->
@@ -1096,7 +1112,7 @@ otp_11861(Config) when is_list(Config) ->
     A3 = erl_anno:new(3),
     "-optional_callbacks([bar/0]).\n" =
         pf({attribute,A3,optional_callbacks,[{bar,0}]}),
-    "-optional_callbacks([{bar,1,bad}]).\n" =
+    "-optional_callbacks([{bar, 1, bad}]).\n" =
         pf({attribute,A3,optional_callbacks,[{bar,1,bad}]}),
     ok.
 
@@ -1167,6 +1183,84 @@ otp_14285(_Config) ->
                                   [{encoding,latin1}])),
     ok.
 
+otp_15592(_Config) ->
+    ok = pp_expr(<<"long12345678901234567890123456789012345678901234"
+                   "56789012345678901234:f(<<>>)">>),
+    ok.
+
+otp_15751(_Config) ->
+    ok = pp_expr(<<"try foo:bar()
+                        catch
+                            Reason : Stacktrace ->
+                                {Reason, Stacktrace}
+                    end">>),
+    ok = pp_expr(<<"try foo:bar()
+                        catch
+                            throw: Reason : Stacktrace ->
+                                {Reason, Stacktrace}
+                    end">>),
+    ok = pp_expr(<<"try foo:bar()
+                        catch
+                            Reason : _ ->
+                                Reason
+                    end">>),
+    ok = pp_expr(<<"try foo:bar()
+                        catch
+                            throw: Reason : _ ->
+                                Reason
+                    end">>),
+    ok = pp_expr(<<"try foo:bar()
+                        catch
+                            Reason ->
+                                Reason
+                    end">>),
+    ok = pp_expr(<<"try foo:bar()
+                        catch
+                            throw: Reason ->
+                                Reason
+                    end">>),
+    ok.
+
+otp_15755(_Config) ->
+    "[{a, b}, c, {d, e} | t]" =
+        flat_parse_and_pp_expr("[{a, b}, c, {d, e} | t]", 0, []),
+    "[{a, b},\n c, d,\n {d, e},\n 1, 2.0,\n {d, e},\n <<>>, {},\n {d, e},\n"
+    " [], [],\n {d, e} |\n t]" =
+        flat_parse_and_pp_expr("[{a,b},c,d,{d,e},1,2.0,{d,e},<<>>,"
+                               "{},{d,e},[],[],{d,e}|t]", 0, []),
+    "[{a, b},\n c, d,\n {d, e},\n 1, 2.0,\n {d, e},\n <<>>, {},\n {d, e},\n"
+    " [], [], d, e | t]" =
+        flat_parse_and_pp_expr("[{a,b},c,d,{d,e},1,2.0,{d,e},<<>>,"
+                               "{},{d,e},[],[],d,e|t]", 0, []),
+
+    "-type t() ::
+          a | b | c | a | b | a | b | a | b | a | b | a | b | a | b |
+          a | b | a | b | a | b.\n" =
+        lists:flatten(parse_and_pp_forms(
+             "-type t() :: a | b | c| a | b | a | b | a | b | a |"
+             " b | a | b | a | b | a | b | a | b |a | b.", [])),
+
+    "-type t() ::
+          {dict, 0, 16, 16, 8, 80, 48,
+           {[], [], [], [], [], [], [], [], [], [], [], [], [], [], [],
+            []},
+           {{[], [], [], [], [], [], [], [], [], [], [], [], [], [], []}}}.\n" =
+        lists:flatten(parse_and_pp_forms(
+             "-type t() :: {dict,0,16,16,8,80,48,"
+             "{[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]},"
+             "{{[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]}}}.", [])),
+
+    "-type t() ::
+          {{a},
+           0, 16,
+           {16},
+           8, 80, 48, a, b, e, f, 'sf s sdf', [], {},
+           {[]}}.\n" =
+        lists:flatten(parse_and_pp_forms(
+             "-type t() :: {{a}, 0, 16, {16}, 8, 80, 48, a, b, e, f,"
+             " 'sf s sdf', [], {}, {[]}}.", [])),
+    ok.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 compile(Config, Tests) ->
@@ -1298,6 +1392,9 @@ pp_expr(List, Options) when is_list(List) ->
             not_ok
     end.
 
+flat_parse_and_pp_expr(String, Indent, Options) ->
+    lists:flatten(parse_and_pp_expr(String, Indent, Options)).
+
 parse_and_pp_expr(String, Indent, Options) ->
     StringDot = lists:flatten(String) ++ ".",
     erl_pp:expr(parse_expr(StringDot), Indent, Options).
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index aa2e352c29..09238ae2b4 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -24,7 +24,7 @@
 -export([default/1,setbag/1,badnew/1,verybadnew/1,named/1,keypos2/1,
 	 privacy/1]).
 -export([empty/1,badinsert/1]).
--export([time_lookup/1,badlookup/1,lookup_order/1]).
+-export([badlookup/1,lookup_order/1]).
 -export([delete_elem/1,delete_tab/1,delete_large_tab/1,
 	 delete_large_named_table/1,
 	 evil_delete/1,baddelete/1,match_delete/1,table_leak/1]).
@@ -42,6 +42,8 @@
          select_bound_chunk/1,
 	 t_delete_all_objects/1, t_insert_list/1, t_test_ms/1,
 	 t_select_delete/1,t_select_replace/1,t_select_replace_next_bug/1,t_ets_dets/1]).
+-export([test_table_size_concurrency/1,test_table_memory_concurrency/1,
+         test_delete_table_while_size_snapshot/1, test_delete_table_while_size_snapshot_helper/0]).
 
 -export([ordered/1, ordered_match/1, interface_equality/1,
 	 fixtable_next/1, fixtable_insert/1, rename/1, rename_unnamed/1, evil_rename/1,
@@ -56,9 +58,11 @@
 -export([t_match_spec_run/1]).
 -export([t_bucket_disappears/1]).
 -export([t_named_select/1]).
+-export([select_fixtab_owner_change/1]).
 -export([otp_5340/1]).
 -export([otp_6338/1]).
 -export([otp_6842_select_1000/1]).
+-export([select_mbuf_trapping/1]).
 -export([otp_7665/1]).
 -export([meta_wb/1]).
 -export([grow_shrink/1, grow_pseudo_deleted/1, shrink_pseudo_deleted/1]).
@@ -66,7 +70,13 @@
 	 meta_lookup_named_read/1, meta_lookup_named_write/1,
 	 meta_newdel_unnamed/1, meta_newdel_named/1]).
 -export([smp_insert/1, smp_fixed_delete/1, smp_unfix_fix/1, smp_select_delete/1,
+         smp_ordered_iteration/1,
          smp_select_replace/1, otp_8166/1, otp_8732/1, delete_unfix_race/1]).
+-export([throughput_benchmark/0,
+         throughput_benchmark/1,
+         test_throughput_benchmark/1,
+         long_throughput_benchmark/1,
+         lookup_catree_par_vs_seq_init_benchmark/0]).
 -export([exit_large_table_owner/1,
 	 exit_many_large_table_owner/1,
 	 exit_many_tables_owner/1,
@@ -89,6 +99,7 @@
 
 -include_lib("stdlib/include/ms_transform.hrl"). % ets:fun2ms
 -include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
 
 -define(m(A,B), assert_eq(A,B)).
 -define(heap_binary_size, 64).
@@ -127,12 +138,14 @@ all() ->
      t_insert_list, t_test_ms, t_select_delete, t_select_replace,
      t_select_replace_next_bug,
      t_ets_dets, memory, t_select_reverse, t_bucket_disappears,
-     t_named_select,
+     t_named_select, select_fixtab_owner_change,
      select_fail, t_insert_new, t_repair_continuation,
      otp_5340, otp_6338, otp_6842_select_1000, otp_7665,
+     select_mbuf_trapping,
      otp_8732, meta_wb, grow_shrink, grow_pseudo_deleted,
      shrink_pseudo_deleted, {group, meta_smp}, smp_insert,
-     smp_fixed_delete, smp_unfix_fix, smp_select_replace, 
+     smp_fixed_delete, smp_unfix_fix, smp_select_replace,
+     smp_ordered_iteration,
      smp_select_delete, otp_8166, exit_large_table_owner,
      exit_many_large_table_owner, exit_many_tables_owner,
      exit_many_many_tables_owner, write_concurrency, heir,
@@ -144,14 +157,20 @@ all() ->
      massive_ets_all,
      take,
      whereis_table,
-     delete_unfix_race].
+     delete_unfix_race,
+     test_throughput_benchmark,
+     {group, benchmark},
+     test_table_size_concurrency,
+     test_table_memory_concurrency,
+     test_delete_table_while_size_snapshot].
+
 
 groups() ->
     [{new, [],
       [default, setbag, badnew, verybadnew, named, keypos2,
        privacy]},
      {insert, [], [empty, badinsert]},
-     {lookup, [], [time_lookup, badlookup, lookup_order]},
+     {lookup, [], [badlookup, lookup_order]},
      {lookup_element, [], [lookup_element_mult]},
      {delete, [],
       [delete_elem, delete_tab, delete_large_tab,
@@ -172,7 +191,9 @@ groups() ->
      {meta_smp, [],
       [meta_lookup_unnamed_read, meta_lookup_unnamed_write,
        meta_lookup_named_read, meta_lookup_named_write,
-       meta_newdel_unnamed, meta_newdel_named]}].
+       meta_newdel_unnamed, meta_newdel_named]},
+     {benchmark, [],
+      [long_throughput_benchmark]}].
 
 init_per_suite(Config) ->
     erts_debug:set_internal_state(available_internal_state, true),
@@ -185,9 +206,61 @@ end_per_suite(_Config) ->
     catch erts_debug:set_internal_state(available_internal_state, false),
     ok.
 
+init_per_group(benchmark, Config) ->
+    P = self(),
+    %% Spawn owner of ETS table that is alive until end_per_group is run
+    EtsProcess =
+        spawn(
+          fun()->
+                  Tab = ets:new(ets_benchmark_result_summary_tab, [public]),
+                  P ! {the_table, Tab},
+                  receive
+                      kill -> ok
+                  end
+          end),
+    Tab = receive {the_table, T} -> T end,
+    CounterNames = [nr_of_benchmarks,
+                    total_throughput,
+                    nr_of_set_benchmarks,
+                    total_throughput_set,
+                    nr_of_ordered_set_benchmarks,
+                    total_throughput_ordered_set],
+    lists:foreach(fun(CtrName) ->
+                          ets:insert(Tab, {CtrName, 0.0})
+                  end,
+                  CounterNames),
+    [{ets_benchmark_result_summary_tab, Tab},
+     {ets_benchmark_result_summary_tab_process, EtsProcess} | Config];
 init_per_group(_GroupName, Config) ->
     Config.
 
+end_per_group(benchmark, Config) ->
+    T = proplists:get_value(ets_benchmark_result_summary_tab, Config),
+    EtsProcess = proplists:get_value(ets_benchmark_result_summary_tab_process, Config),
+    Report = 
+        fun(NOfBenchmarksCtr, TotThroughoutCtr, Name) ->
+                Average =
+                    ets:lookup_element(T, TotThroughoutCtr, 2) / 
+                    ets:lookup_element(T, NOfBenchmarksCtr, 2),
+                io:format("~p ~p~n", [Name, Average]),
+                ct_event:notify(
+                  #event{name = benchmark_data, 
+                         data = [{suite,"ets_bench"},
+                                 {name, Name},
+                                 {value, Average}]})
+        end,
+    Report(nr_of_benchmarks,
+           total_throughput,
+           "Average Throughput"),
+    Report(nr_of_set_benchmarks,
+           total_throughput_set,
+           "Average Throughput Set"),
+    Report(nr_of_ordered_set_benchmarks,
+           total_throughput_ordered_set,
+           "Average Throughput Ordered Set"),
+    ets:delete(T),
+    EtsProcess ! kill,
+    Config;
 end_per_group(_GroupName, Config) ->
     Config.
 
@@ -243,7 +316,64 @@ t_named_select_do(Opts) ->
     verify_etsmem(EtsMem).
 
 
+%% Verify select and friends release fixtab as they should
+%% even when owneship is changed between traps.
+select_fixtab_owner_change(_Config) ->
+    T = ets:new(xxx, [protected]),
+    NKeys = 2000,
+    [ets:insert(T,{K,K band 7}) || K <- lists:seq(1,NKeys)],
+
+    %% Buddy and Papa will ping-pong table ownership between them
+    %% and the aim is to give Buddy the table when he is
+    %% in the middle of a yielding select* call.
+    {Buddy,_} = spawn_opt(fun() -> sfoc_buddy_loop(T, 1, undefined) end,
+                          [link,monitor]),
 
+    sfoc_papa_loop(T, Buddy),
+
+    receive {'DOWN', _, process, Buddy, _} -> ok end,
+    ets:delete(T),
+    ok.
+
+sfoc_buddy_loop(T, I, State0) ->
+    receive
+        {'ETS-TRANSFER', T, Papa, _} ->
+            ets:give_away(T, Papa, State0),
+            case State0 of
+                done ->
+                    ok;
+                _ ->
+                    State1 = sfoc_traverse(T, I, State0),
+                    %% Verify no fixation left
+                    {I, false} = {I, ets:info(T, safe_fixed_monotonic_time)},
+                    sfoc_buddy_loop(T, I+1, State1)
+            end
+    end.
+
+sfoc_papa_loop(T, Buddy) ->
+    ets:give_away(T, Buddy, "Catch!"),
+    receive
+        {'ETS-TRANSFER', T, Buddy, State} ->
+            case State of
+                done ->
+                    ok;
+                _ ->
+                    sfoc_papa_loop(T, Buddy)
+            end
+    end.
+
+sfoc_traverse(T, 1, S) ->
+    ets:select(T, [{{'$1',7}, [], ['$1']}]), S;
+sfoc_traverse(T, 2, S) ->
+    0 = ets:select_count(T, [{{'$1',7}, [], [false]}]), S;
+sfoc_traverse(T, 3, _) ->
+    Limit = ets:info(T, size) div 2,
+    {_, Continuation} = ets:select(T, [{{'$1',7}, [], ['$1']}],
+                                   Limit),
+    Continuation;
+sfoc_traverse(_T, 4, Continuation) ->
+    _ = ets:select(Continuation),
+    done.
 
 %% Check ets:match_spec_run/2.
 t_match_spec_run(Config) when is_list(Config) ->
@@ -705,7 +835,11 @@ adjust_xmem([_T1,_T2,_T3,_T4], {A0,B0,C0,D0} = _Mem0, EstCnt) ->
 
     {TabSz, EstSz} = erts_debug:get_internal_state('DbTable_words'),
     HTabSz = TabSz + EstCnt*EstSz,
-    {A0+TabSz, B0+HTabSz, C0+HTabSz, D0+HTabSz}.
+    OrdSetExtra = case erlang:system_info(wordsize) of
+                      8 -> 40; % larger stack on 64 bit architectures
+                      _ -> 0
+                  end,
+    {A0+TabSz+OrdSetExtra, B0+HTabSz, C0+HTabSz, D0+HTabSz}.
 
 %% Misc. whitebox tests
 t_whitebox(Config) when is_list(Config) ->
@@ -743,7 +877,7 @@ select_bound_chunk(_Config) ->
     repeat_for_opts(fun select_bound_chunk_do/1, [all_types]).
 
 select_bound_chunk_do(Opts) ->
-    T = ets:new(x, Opts),
+    T = ets_new(x, Opts),
     ets:insert(T, [{key, 1}]),
     {[{key, 1}], '$end_of_table'} = ets:select(T, [{{key,1},[],['$_']}], 100000),
     ok.
@@ -789,38 +923,42 @@ check_badarg({'EXIT', {badarg, [{M,F,A,_} | _]}}, M, F, Args)  ->
 %% Test ets:delete_all_objects/1.
 t_delete_all_objects(Config) when is_list(Config) ->
     EtsMem = etsmem(),
-    repeat_for_opts(fun t_delete_all_objects_do/1),
+    repeat_for_opts_all_set_table_types(fun t_delete_all_objects_do/1),
     verify_etsmem(EtsMem).
 
 get_kept_objects(T) ->
     case ets:info(T,stats) of
-	false ->
-	    0;
 	{_,_,_,_,_,_,KO}  ->
-	    KO
+	    KO;
+        _ ->
+            0
     end.
 
 t_delete_all_objects_do(Opts) ->
-    T=ets_new(x,Opts),
-    filltabint(T,4000),
+    KeyRange = 4000,
+    T=ets_new(x, Opts, KeyRange),
+    filltabint(T,KeyRange),
     O=ets:first(T),
     ets:next(T,O),
     ets:safe_fixtable(T,true),
     true = ets:delete_all_objects(T),
     '$end_of_table' = ets:next(T,O),
     0 = ets:info(T,size),
-    4000 = get_kept_objects(T),
+    case ets:info(T,type) of
+        ordered_set -> ok;
+        _ -> KeyRange = get_kept_objects(T)
+    end,
     ets:safe_fixtable(T,false),
     0 = ets:info(T,size),
     0 = get_kept_objects(T),
-    filltabint(T,4000),
-    4000 = ets:info(T,size),
+    filltabint(T, KeyRange),
+    KeyRange = ets:info(T,size),
     true = ets:delete_all_objects(T),
     0 = ets:info(T,size),
     ets:delete(T),
 
     %% Test delete_all_objects is atomic
-    T2 = ets:new(t_delete_all_objects, [public | Opts]),
+    T2 = ets_new(t_delete_all_objects, [public | Opts]),
     Self = self(),
     Inserters = [spawn_link(fun() -> inserter(T2, 100*1000, 1, Self) end) || _ <- [1,2,3,4]],
     [receive {Ipid, running} -> ok end || Ipid <- Inserters],
@@ -2372,17 +2510,29 @@ write_concurrency(Config) when is_list(Config) ->
     Yes6 = ets_new(foo,[duplicate_bag,protected,{write_concurrency,true}]),
     No3 = ets_new(foo,[duplicate_bag,private,{write_concurrency,true}]),
 
-    No4 = ets_new(foo,[ordered_set,public,{write_concurrency,true}]),
-    No5 = ets_new(foo,[ordered_set,protected,{write_concurrency,true}]),
-    No6 = ets_new(foo,[ordered_set,private,{write_concurrency,true}]),
-
-    No7 = ets_new(foo,[public,{write_concurrency,false}]),
-    No8 = ets_new(foo,[protected,{write_concurrency,false}]),
+    Yes7 = ets_new(foo,[ordered_set,public,{write_concurrency,true}]),
+    Yes8 = ets_new(foo,[ordered_set,protected,{write_concurrency,true}]),
+    Yes9 = ets_new(foo,[ordered_set,{write_concurrency,true}]),
+    Yes10 = ets_new(foo,[{write_concurrency,true},ordered_set,public]),
+    Yes11 = ets_new(foo,[{write_concurrency,true},ordered_set,protected]),
+    Yes12 = ets_new(foo,[set,{write_concurrency,false},
+                         {write_concurrency,true},ordered_set,public]),
+    Yes13 = ets_new(foo,[private,public,set,{write_concurrency,false},
+                         {write_concurrency,true},ordered_set]),
+    No4 = ets_new(foo,[ordered_set,private,{write_concurrency,true}]),
+    No5 = ets_new(foo,[ordered_set,public,{write_concurrency,false}]),
+    No6 = ets_new(foo,[ordered_set,protected,{write_concurrency,false}]),
+    No7 = ets_new(foo,[ordered_set,private,{write_concurrency,false}]),
+
+    No8 = ets_new(foo,[public,{write_concurrency,false}]),
+    No9 = ets_new(foo,[protected,{write_concurrency,false}]),
 
     YesMem = ets:info(Yes1,memory),
     NoHashMem = ets:info(No1,memory),
+    YesTreeMem = ets:info(Yes7,memory),
     NoTreeMem = ets:info(No4,memory),
-    io:format("YesMem=~p NoHashMem=~p NoTreeMem=~p\n",[YesMem,NoHashMem,NoTreeMem]),
+    io:format("YesMem=~p NoHashMem=~p NoTreeMem=~p YesTreeMem=~p\n",[YesMem,NoHashMem,
+                                                                     NoTreeMem,YesTreeMem]),
 
     YesMem = ets:info(Yes2,memory),
     YesMem = ets:info(Yes3,memory),
@@ -2391,13 +2541,24 @@ write_concurrency(Config) when is_list(Config) ->
     YesMem = ets:info(Yes6,memory),
     NoHashMem = ets:info(No2,memory),
     NoHashMem = ets:info(No3,memory),
+    YesTreeMem = ets:info(Yes7,memory),
+    YesTreeMem = ets:info(Yes8,memory),
+    YesTreeMem = ets:info(Yes9,memory),
+    YesTreeMem = ets:info(Yes10,memory),
+    YesTreeMem = ets:info(Yes11,memory),
+    YesTreeMem = ets:info(Yes12,memory),
+    YesTreeMem = ets:info(Yes13,memory),
+    NoTreeMem = ets:info(No4,memory),
     NoTreeMem = ets:info(No5,memory),
     NoTreeMem = ets:info(No6,memory),
-    NoHashMem = ets:info(No7,memory),
+    NoTreeMem = ets:info(No7,memory),
     NoHashMem = ets:info(No8,memory),
+    NoHashMem = ets:info(No9,memory),
 
     true = YesMem > NoHashMem,
     true = YesMem > NoTreeMem,
+    true = YesMem > YesTreeMem,
+    true = YesTreeMem < NoTreeMem,
 
     {'EXIT',{badarg,_}} = (catch ets_new(foo,[public,{write_concurrency,foo}])),
     {'EXIT',{badarg,_}} = (catch ets_new(foo,[public,{write_concurrency}])),
@@ -2405,8 +2566,8 @@ write_concurrency(Config) when is_list(Config) ->
     {'EXIT',{badarg,_}} = (catch ets_new(foo,[public,write_concurrency])),
 
     lists:foreach(fun(T) -> ets:delete(T) end,
-		  [Yes1,Yes2,Yes3,Yes4,Yes5,Yes6,
-		   No1,No2,No3,No4,No5,No6,No7,No8]),
+        	  [Yes1,Yes2,Yes3,Yes4,Yes5,Yes6,Yes7,Yes8,Yes9,Yes10,Yes11,Yes12,Yes13,
+        	   No1,No2,No3,No4,No5,No6,No7,No8,No9]),
     verify_etsmem(EtsMem),
     ok.
 
@@ -3051,41 +3212,43 @@ pick_all_backwards(T) ->
 %% Small test case for both set and bag type ets tables.
 setbag(Config) when is_list(Config) ->
     EtsMem = etsmem(),
-    Set = ets_new(set,[set]),
-    Bag = ets_new(bag,[bag]),
-    Key = {foo,bar},
-
-    %% insert some value
-    ets:insert(Set,{Key,val1}),
-    ets:insert(Bag,{Key,val1}),
-
-    %% insert new value for same key again
-    ets:insert(Set,{Key,val2}),
-    ets:insert(Bag,{Key,val2}),
-
-    %% check
-    [{Key,val2}] = ets:lookup(Set,Key),
-    [{Key,val1},{Key,val2}] = ets:lookup(Bag,Key),
-
-    true = ets:delete(Set),
-    true = ets:delete(Bag),
+    lists:foreach(fun(SetType) -> 
+                          Set = ets_new(SetType,[SetType]),
+                          Bag = ets_new(bag,[bag]),
+                          Key = {foo,bar},
+                          
+                          %% insert some value
+                          ets:insert(Set,{Key,val1}),
+                          ets:insert(Bag,{Key,val1}),
+                          
+                          %% insert new value for same key again
+                          ets:insert(Set,{Key,val2}),
+                          ets:insert(Bag,{Key,val2}),
+                          
+                          %% check
+                          [{Key,val2}] = ets:lookup(Set,Key),
+                          [{Key,val1},{Key,val2}] = ets:lookup(Bag,Key),
+                          
+                          true = ets:delete(Set),
+                          true = ets:delete(Bag)
+                  end, [set, cat_ord_set,stim_cat_ord_set,ordered_set]),
     verify_etsmem(EtsMem).
 
 %% Test case to check proper return values for illegal ets_new() calls.
 badnew(Config) when is_list(Config) ->
     EtsMem = etsmem(),
-    {'EXIT',{badarg,_}} = (catch ets_new(12,[])),
-    {'EXIT',{badarg,_}} = (catch ets_new({a,b},[])),
-    {'EXIT',{badarg,_}} = (catch ets_new(name,[foo])),
-    {'EXIT',{badarg,_}} = (catch ets_new(name,{bag})),
-    {'EXIT',{badarg,_}} = (catch ets_new(name,bag)),
+    {'EXIT',{badarg,_}} = (catch ets:new(12,[])),
+    {'EXIT',{badarg,_}} = (catch ets:new({a,b},[])),
+    {'EXIT',{badarg,_}} = (catch ets:new(name,[foo])),
+    {'EXIT',{badarg,_}} = (catch ets:new(name,{bag})),
+    {'EXIT',{badarg,_}} = (catch ets:new(name,bag)),
     verify_etsmem(EtsMem).
 
 %% OTP-2314. Test case to check that a non-proper list does not
 %% crash the emulator.
 verybadnew(Config) when is_list(Config) ->
     EtsMem = etsmem(),
-    {'EXIT',{badarg,_}} = (catch ets_new(verybad,[set|protected])),
+    {'EXIT',{badarg,_}} = (catch ets:new(verybad,[set|protected])),
     verify_etsmem(EtsMem).
 
 %% Small check to see if named tables work.
@@ -3101,11 +3264,13 @@ named(Config) when is_list(Config) ->
 %% Test case to check if specified keypos works.
 keypos2(Config) when is_list(Config) ->
     EtsMem = etsmem(),
-    Tab = make_table(foo,
-		     [set,{keypos,2}],
-		     [{val,key}, {val2,key}]),
-    [{val2,key}] = ets:lookup(Tab,key),
-    true = ets:delete(Tab),
+    lists:foreach(fun(SetType) -> 
+                          Tab = make_table(foo,
+                                           [SetType,{keypos,2}],
+                                           [{val,key}, {val2,key}]),
+                          [{val2,key}] = ets:lookup(Tab,key),
+                          true = ets:delete(Tab)
+                  end, [set, cat_ord_set,stim_cat_ord_set,ordered_set]),
     verify_etsmem(EtsMem).
 
 %% Privacy check. Check that a named(public/private/protected) table
@@ -3197,7 +3362,7 @@ rotate_tuple(Tuple, N) ->
 
 %% Check lookup in an empty table and lookup of a non-existing key.
 empty(Config) when is_list(Config) ->
-    repeat_for_opts(fun empty_do/1).
+    repeat_for_opts_all_table_types(fun empty_do/1).
 
 empty_do(Opts) ->
     EtsMem = etsmem(),
@@ -3210,7 +3375,7 @@ empty_do(Opts) ->
 
 %% Check proper return values for illegal insert operations.
 badinsert(Config) when is_list(Config) ->
-    repeat_for_opts(fun badinsert_do/1).
+    repeat_for_opts_all_table_types(fun badinsert_do/1).
 
 badinsert_do(Opts) ->
     EtsMem = etsmem(),
@@ -3230,31 +3395,6 @@ badinsert_do(Opts) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-%% Test lookup timing.
-time_lookup(Config) when is_list(Config) ->
-    %% just for timing, really
-    EtsMem = etsmem(),
-    Values = repeat_for_opts(fun time_lookup_do/1),
-    verify_etsmem(EtsMem),
-    {comment,lists:flatten(io_lib:format(
-			     "~p ets lookups/s",[Values]))}.
-
-time_lookup_do(Opts) ->
-    Tab = ets_new(foo,Opts),
-    fill_tab(Tab,foo),
-    ets:insert(Tab,{{a,key},foo}),
-    N = 100000,
-    {Time,_} = timer:tc(fun() -> time_lookup_many(N, Tab) end),
-    Seconds = Time / 1000000,
-    true = ets:delete(Tab),
-    round(N / Seconds).				% lookups/s
-
-time_lookup_many(0, _Tab) ->
-    ok;
-time_lookup_many(N, Tab) ->
-    ets:lookup(Tab, {a,key}),
-    time_lookup_many(N-1, Tab).
-
 %% Check proper return values from bad lookups in existing/non existing
 %% ets tables.
 badlookup(Config) when is_list(Config) ->
@@ -3431,19 +3571,29 @@ delete_tab_do(Opts) ->
 
 %% Check that ets:delete/1 works and that other processes can run.
 delete_large_tab(Config) when is_list(Config) ->
-    ct:timetrap({minutes,30}), %% valgrind needs a lot
-    Data = [{erlang:phash2(I, 16#ffffff),I} || I <- lists:seq(1, 200000)],
+    ct:timetrap({minutes,60}), %% valgrind needs a lot
+    KeyRange = 16#ffffff,
+    Data = [{erlang:phash2(I, KeyRange),I} || I <- lists:seq(1, 200000)],
     EtsMem = etsmem(),
-    repeat_for_opts(fun(Opts) -> delete_large_tab_do(Opts,Data) end),
+    repeat_for_opts(fun(Opts) -> delete_large_tab_do(key_range(Opts,KeyRange),
+                                                     Data) end),
     verify_etsmem(EtsMem).
 
 delete_large_tab_do(Opts,Data) ->
     delete_large_tab_1(foo_hash, Opts, Data, false),
     delete_large_tab_1(foo_tree, [ordered_set | Opts], Data, false),
-    delete_large_tab_1(foo_hash, Opts, Data, true).
+    delete_large_tab_1(foo_tree, [stim_cat_ord_set | Opts], Data, false),
+    delete_large_tab_1(foo_hash_fix, Opts, Data, true).
 
 
 delete_large_tab_1(Name, Flags, Data, Fix) ->
+    case is_redundant_opts_combo(Flags) of
+        true -> skip;
+        false ->
+            delete_large_tab_2(Name, Flags, Data, Fix)
+    end.
+
+delete_large_tab_2(Name, Flags, Data, Fix) ->
     Tab = ets_new(Name, Flags),
     ets:insert(Tab, Data),
 
@@ -3502,18 +3652,30 @@ delete_large_tab_1(Name, Flags, Data, Fix) ->
 %% Delete a large name table and try to create a new table with
 %% the same name in another process.
 delete_large_named_table(Config) when is_list(Config) ->
-    Data = [{erlang:phash2(I, 16#ffffff),I} || I <- lists:seq(1, 200000)],
+    KeyRange = 16#ffffff,
+    Data = [{erlang:phash2(I, KeyRange),I} || I <- lists:seq(1, 200000)],
     EtsMem = etsmem(),
-    repeat_for_opts(fun(Opts) -> delete_large_named_table_do(Opts,Data) end),
+    repeat_for_opts(fun(Opts) ->
+                            delete_large_named_table_do(key_range(Opts,KeyRange),
+                                                        Data)
+                    end),
     verify_etsmem(EtsMem),
     ok.
 
 delete_large_named_table_do(Opts,Data) ->
     delete_large_named_table_1(foo_hash, [named_table | Opts], Data, false),
     delete_large_named_table_1(foo_tree, [ordered_set,named_table | Opts], Data, false),
+    delete_large_named_table_1(foo_tree, [stim_cat_ord_set,named_table | Opts], Data, false),
     delete_large_named_table_1(foo_hash, [named_table | Opts], Data, true).
 
 delete_large_named_table_1(Name, Flags, Data, Fix) ->
+    case is_redundant_opts_combo(Flags) of
+        true -> skip;
+        false ->
+            delete_large_named_table_2(Name, Flags, Data, Fix)
+    end.
+
+delete_large_named_table_2(Name, Flags, Data, Fix) ->
     Tab = ets_new(Name, Flags),
     ets:insert(Tab, Data),
 
@@ -3537,8 +3699,12 @@ delete_large_named_table_1(Name, Flags, Data, Fix) ->
 
 %% Delete a large table, and kill the process during the delete.
 evil_delete(Config) when is_list(Config) ->
-    Data = [{I,I*I} || I <- lists:seq(1, 100000)],
-    repeat_for_opts(fun(Opts) -> evil_delete_do(Opts,Data) end).
+    KeyRange = 100000,
+    Data = [{I,I*I} || I <- lists:seq(1, KeyRange)],
+    repeat_for_opts(fun(Opts) ->
+                            evil_delete_do(key_range(Opts,KeyRange),
+                                           Data)
+                    end).
 
 evil_delete_do(Opts,Data) ->
     EtsMem = etsmem(),
@@ -3548,16 +3714,27 @@ evil_delete_do(Opts,Data) ->
     verify_etsmem(EtsMem),
     evil_delete_owner(foo_tree, [ordered_set | Opts], Data, false),
     verify_etsmem(EtsMem),
+    evil_delete_owner(foo_catree, [stim_cat_ord_set | Opts], Data, false),
+    verify_etsmem(EtsMem),
     TabA = evil_delete_not_owner(foo_hash, Opts, Data, false),
     verify_etsmem(EtsMem),
     TabB = evil_delete_not_owner(foo_hash, Opts, Data, true),
     verify_etsmem(EtsMem),
     TabC = evil_delete_not_owner(foo_tree, [ordered_set | Opts], Data, false),
     verify_etsmem(EtsMem),
+    TabD = evil_delete_not_owner(foo_catree, [stim_cat_ord_set | Opts], Data, false),
+    verify_etsmem(EtsMem),
     lists:foreach(fun(T) -> undefined = ets:info(T) end,
-		  [TabA,TabB,TabC]).
+		  [TabA,TabB,TabC,TabD]).
 
 evil_delete_not_owner(Name, Flags, Data, Fix) ->
+    case is_redundant_opts_combo(Flags) of
+        true -> skip;
+        false ->
+            evil_delete_not_owner_1(Name, Flags, Data, Fix)
+    end.
+
+evil_delete_not_owner_1(Name, Flags, Data, Fix) ->
     io:format("Not owner: ~p, fix = ~p", [Name,Fix]),
     Tab = ets_new(Name, [public|Flags]),
     ets:insert(Tab, Data),
@@ -3583,6 +3760,13 @@ evil_delete_not_owner(Name, Flags, Data, Fix) ->
     Tab.
 
 evil_delete_owner(Name, Flags, Data, Fix) ->
+    case is_redundant_opts_combo(Flags) of
+        true -> skip;
+        false ->
+            evil_delete_owner_1(Name, Flags, Data, Fix)
+    end.
+
+evil_delete_owner_1(Name, Flags, Data, Fix) ->
     Fun = fun() ->
 		  Tab = ets_new(Name, [public|Flags]),
 		  ets:insert(Tab, Data),
@@ -3770,7 +3954,7 @@ verify_rescheduling_exit(Config, ForEachData, Flags, Fix, NOTabs, NOProcs) ->
 
 %% Make sure that slots for ets tables are cleared properly.
 table_leak(Config) when is_list(Config) ->
-    repeat_for_opts(fun(Opts) -> table_leak_1(Opts,20000) end).
+    repeat_for_opts_all_non_stim_table_types(fun(Opts) -> table_leak_1(Opts,20000) end).
 
 table_leak_1(_,0) -> ok;
 table_leak_1(Opts,N) ->
@@ -3833,7 +4017,7 @@ match_delete3_do(Opts) ->
 
 %% Test ets:first/1 & ets:next/2.
 firstnext(Config) when is_list(Config) ->
-    repeat_for_opts(fun firstnext_do/1).
+    repeat_for_opts_all_set_table_types(fun firstnext_do/1).
 
 firstnext_do(Opts) ->
     EtsMem = etsmem(),
@@ -3855,15 +4039,20 @@ firstnext_collect(Tab,Key,List) ->
 
 %% Tests ets:first/1 & ets:next/2.
 firstnext_concurrent(Config) when is_list(Config) ->
-    register(master, self()),
-    ets_init(?MODULE, 20),
-    [dynamic_go() || _ <- lists:seq(1, 2)],
-    receive
-    after 5000 -> ok
-    end.
+    lists:foreach(
+      fun(TableType) -> 
+              register(master, self()),
+              TableName = list_to_atom(atom_to_list(?MODULE) ++ atom_to_list(TableType)),
+              ets_init(TableName, 20, TableType),
+              [dynamic_go(TableName) || _ <- lists:seq(1, 2)],
+              receive
+              after 5000 -> ok
+              end,
+              unregister(master)
+      end, repeat_for_opts_atom2list(ord_set_types)).
 
-ets_init(Tab, N) ->
-    ets_new(Tab, [named_table,public,ordered_set]),
+ets_init(Tab, N, TableType) ->
+    ets_new(Tab, [named_table,public,TableType]),
     cycle(Tab, lists:seq(1,N+1)).
 
 cycle(_Tab, [H|T]) when H > length(T)-> ok;
@@ -3871,9 +4060,9 @@ cycle(Tab, L) ->
     ets:insert(Tab,list_to_tuple(L)),
     cycle(Tab, tl(L)++[hd(L)]).
 
-dynamic_go() -> my_spawn_link(fun dynamic_init/0).
+dynamic_go(TableName) -> my_spawn_link(fun() -> dynamic_init(TableName) end).
 
-dynamic_init() -> [dyn_lookup(?MODULE) || _ <- lists:seq(1, 10)].
+dynamic_init(TableName) -> [dyn_lookup(TableName) || _ <- lists:seq(1, 10)].
 
 dyn_lookup(T) -> dyn_lookup(T, ets:first(T)).
 
@@ -3891,7 +4080,7 @@ dyn_lookup(T, K) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 slot(Config) when is_list(Config) ->
-    repeat_for_opts(fun slot_do/1).
+    repeat_for_opts_all_set_table_types(fun slot_do/1).
 
 slot_do(Opts) ->
     EtsMem = etsmem(),
@@ -3899,6 +4088,11 @@ slot_do(Opts) ->
     fill_tab(Tab,foo),
     Elts = ets:info(Tab,size),
     Elts = slot_loop(Tab,0,0),
+    case ets:info(Tab, type) of
+        ordered_set ->
+            '$end_of_table' = ets:slot(Tab,Elts);
+        _ -> ok
+    end,
     true = ets:delete(Tab),
     verify_etsmem(EtsMem).
 
@@ -3916,7 +4110,7 @@ slot_loop(Tab,SlotNo,EltsSoFar) ->
 
 
 match1(Config) when is_list(Config) ->
-    repeat_for_opts(fun match1_do/1).
+    repeat_for_opts_all_set_table_types(fun match1_do/1).
 
 match1_do(Opts) ->
     EtsMem = etsmem(),
@@ -3979,7 +4173,7 @@ match2_do(Opts) ->
 
 %% Some ets:match_object tests.
 match_object(Config) when is_list(Config) ->
-    repeat_for_opts(fun match_object_do/1).
+    repeat_for_opts_all_set_table_types(fun match_object_do/1).
 
 match_object_do(Opts) ->
     EtsMem = etsmem(),
@@ -4079,23 +4273,16 @@ match_object_do(Opts) ->
 %% Tests that db_match_object does not generate a `badarg' when
 %% resuming a search with no previous matches.
 match_object2(Config) when is_list(Config) ->
-    repeat_for_opts(fun match_object2_do/1).
+    repeat_for_opts_all_table_types(fun match_object2_do/1).
 
 match_object2_do(Opts) ->
     EtsMem = etsmem(),
-    Tab = ets_new(foo, [bag, {keypos, 2} | Opts]),
-    fill_tab2(Tab, 0, 13005),     % match_db_object does 1000
+    KeyRange = 13005,
+    Tab = ets_new(foo, [{keypos, 2} | Opts], KeyRange),
+    fill_tab2(Tab, 0, KeyRange),     % match_db_object does 1000
 						% elements per pass, might
 						% change in the future.
-    case catch ets:match_object(Tab, {hej, '$1'}) of
-	{'EXIT', _} ->
-	    ets:delete(Tab),
-	    ct:fail("match_object EXIT:ed");
-	[] ->
-	    io:format("Nothing matched.");
-	List ->
-	    io:format("Matched:~p~n",[List])
-    end,
+    [] = ets:match_object(Tab, {hej, '$1'}),
     ets:delete(Tab),
     verify_etsmem(EtsMem).
 
@@ -4104,18 +4291,21 @@ match_object2_do(Opts) ->
 
 %% OTP-3319. Test tab2list.
 tab2list(Config) when is_list(Config) ->
-    EtsMem = etsmem(),
-    Tab = make_table(foo,
-		     [ordered_set],
-		     [{a,b}, {c,b}, {b,b}, {a,c}]),
-    [{a,c},{b,b},{c,b}] = ets:tab2list(Tab),
-    true = ets:delete(Tab),
-    verify_etsmem(EtsMem).
+    repeat_for_all_ord_set_table_types(
+      fun(Opts) ->
+              EtsMem = etsmem(),
+              Tab = make_table(foo,
+                               Opts,
+                               [{a,b}, {c,b}, {b,b}, {a,c}]),
+              [{a,c},{b,b},{c,b}] = ets:tab2list(Tab),
+              true = ets:delete(Tab),
+              verify_etsmem(EtsMem)
+      end).
 
 %% Simple general small test.  If this fails, ets is in really bad
 %% shape.
 misc1(Config) when is_list(Config) ->
-    repeat_for_opts(fun misc1_do/1).
+    repeat_for_opts_all_table_types(fun misc1_do/1).
 
 misc1_do(Opts) ->
     EtsMem = etsmem(),
@@ -4133,7 +4323,7 @@ misc1_do(Opts) ->
 
 %% Check the safe_fixtable function.
 safe_fixtable(Config) when is_list(Config) ->
-    repeat_for_opts(fun safe_fixtable_do/1).
+    repeat_for_opts_all_table_types(fun safe_fixtable_do/1).
 
 safe_fixtable_do(Opts) ->
     EtsMem = etsmem(),
@@ -4191,10 +4381,42 @@ safe_fixtable_do(Opts) ->
 
 %% Tests ets:info result for required tuples.
 info(Config) when is_list(Config) ->
-    repeat_for_opts(fun info_do/1).
+    repeat_for_opts_all_table_types(fun info_do/1).
 
 info_do(Opts) ->
     EtsMem = etsmem(),
+    TableType = lists:foldl(
+                  fun(Item, Curr) -> 
+                          case Item of
+                              set -> set;
+                              ordered_set -> ordered_set;
+                              cat_ord_set -> ordered_set;
+                              stim_cat_ord_set -> ordered_set;
+                              bag -> bag;
+                              duplicate_bag -> duplicate_bag; 
+                              _ -> Curr
+                          end
+                  end, set, Opts),
+    PublicOrCurr =
+        fun(Curr) ->
+                case lists:member({write_concurrency, false}, Opts) or
+                    lists:member(private, Opts) or
+                    lists:member(protected, Opts) of
+                    true -> Curr;
+                    false -> public
+                end
+        end,
+    Protection = lists:foldl(
+                   fun(Item, Curr) ->
+                           case Item of
+                               public -> public;
+                               protected -> protected;
+                               private -> private;
+                               cat_ord_set -> PublicOrCurr(Curr); %% Special items
+                               stim_cat_ord_set -> PublicOrCurr(Curr);
+                               _ -> Curr
+                           end
+                   end, protected, Opts),
     MeMyselfI=self(),
     ThisNode=node(),
     Tab = ets_new(foobar, [{keypos, 2} | Opts]),
@@ -4208,9 +4430,9 @@ info_do(Opts) ->
     {value, {size, 0}} = lists:keysearch(size, 1, Res),
     {value, {node, ThisNode}} = lists:keysearch(node, 1, Res),
     {value, {named_table, false}} = lists:keysearch(named_table, 1, Res),
-    {value, {type, set}} = lists:keysearch(type, 1, Res),
+    {value, {type, TableType}} = lists:keysearch(type, 1, Res),
     {value, {keypos, 2}} = lists:keysearch(keypos, 1, Res),
-    {value, {protection, protected}} =
+    {value, {protection, Protection}} =
 	lists:keysearch(protection, 1, Res),
     {value, {id, Tab}} = lists:keysearch(id, 1, Res),
     true = ets:delete(Tab),
@@ -4222,6 +4444,131 @@ info_do(Opts) ->
     undefined = ets:info(non_existing_table_xxyy,safe_fixed),
     verify_etsmem(EtsMem).
 
+size_loop(_T, 0, _, _) ->
+    ok;
+size_loop(T, I, PrevSize, WhatToTest) ->
+    Size = ets:info(T, WhatToTest),
+    case Size < PrevSize of
+        true -> ct:fail("Bad ets:info/2");
+        _ -> ok
+    end,
+    size_loop(T, I -1, Size, WhatToTest).
+
+add_loop(_T, 0) ->
+    ok;
+add_loop(T, I) ->
+    ets:insert(T, {I}),
+    add_loop(T, I -1).
+
+
+test_table_counter_concurrency(WhatToTest) ->
+    IntStatePrevOn =
+        erts_debug:set_internal_state(available_internal_state, true),
+    ItemsToAdd = 1000000,
+    SizeLoopSize = 1000,
+    T = ets:new(k, [public, ordered_set, {write_concurrency, true}]),
+    erts_debug:set_internal_state(ets_debug_random_split_join, {T, false}),
+    0 = ets:info(T, size),
+    P = self(),
+    SpawnedSizeProcs =
+        [spawn_link(fun() ->
+                            size_loop(T, SizeLoopSize, 0, WhatToTest),
+                            P ! done
+                    end)
+         || _ <- lists:seq(1, 6)],
+    spawn_link(fun() ->
+                       add_loop(T, ItemsToAdd),
+                       P ! done_add
+               end),
+    [receive
+         done -> ok;
+         done_add -> ok
+     end
+     || _ <- [ok|SpawnedSizeProcs]],
+    case WhatToTest =:= size of
+        true ->
+            ItemsToAdd = ets:info(T, size);
+        _ ->
+            ok
+    end,
+    erts_debug:set_internal_state(available_internal_state, IntStatePrevOn),
+    ok.
+
+test_table_size_concurrency(Config) when is_list(Config) ->
+    test_table_counter_concurrency(size).
+
+test_table_memory_concurrency(Config) when is_list(Config) ->
+    test_table_counter_concurrency(memory).
+
+%% Tests that calling the ets:delete operation on a table T with
+%% decentralized counters works while ets:info(T, size) operations are
+%% active
+test_delete_table_while_size_snapshot(Config) when is_list(Config) ->
+    %% Run test case in a slave node as other test suites in stdlib
+    %% depend on that pids are ordered in creation order which is no
+    %% longer the case when many processes have been started before
+    Node = start_slave(),
+    ok = rpc:call(Node, ?MODULE, test_delete_table_while_size_snapshot_helper, []),
+    test_server:stop_node(Node),
+    ok.
+
+test_delete_table_while_size_snapshot_helper()->
+    TopParent = self(),
+    repeat_par(
+      fun() ->
+              Table = ets:new(t, [public, ordered_set,
+                                  {write_concurrency, true}]),
+              Parent = self(),
+              NrOfSizeProcs = 100,
+              Pids = [ spawn(fun()-> size_process(Table, Parent) end)
+                       || _ <- lists:seq(1, NrOfSizeProcs)],
+              timer:sleep(1),
+              ets:delete(Table),
+              [receive 
+                   table_gone ->  ok;
+                   Problem -> TopParent ! Problem
+               end || _ <- Pids]
+      end,
+      15000),
+    receive
+        Problem -> throw(Problem)
+    after 0 -> ok
+    end.
+
+size_process(Table, Parent) ->
+    try ets:info(Table, size) of
+        N when is_integer(N) ->
+            size_process(Table, Parent);
+        undefined -> Parent ! table_gone;
+        E -> Parent ! {got_unexpected, E}
+    catch
+        E -> Parent ! {got_unexpected_exception, E}
+    end.
+
+start_slave() ->
+    MicroSecs = erlang:monotonic_time(),
+    Name = "ets_" ++ integer_to_list(MicroSecs),
+    Pa = filename:dirname(code:which(?MODULE)),
+    {ok, Node} = test_server:start_node(list_to_atom(Name), slave, [{args, "-pa " ++ Pa}]),
+    Node.
+
+repeat_par(FunToRepeat, NrOfTimes) ->
+    repeat_par_help(FunToRepeat, NrOfTimes, NrOfTimes).
+
+repeat_par_help(_FunToRepeat, 0, OrgNrOfTimes) ->
+    repeat(fun()-> receive done -> ok end end, OrgNrOfTimes);
+repeat_par_help(FunToRepeat, NrOfTimes, OrgNrOfTimes) ->
+    Parent = self(),
+    case NrOfTimes rem 5 of
+        0 -> timer:sleep(1);
+        _ -> ok
+    end,
+    spawn(fun()->
+                  FunToRepeat(),
+                  Parent ! done
+          end),
+    repeat_par_help(FunToRepeat, NrOfTimes-1, OrgNrOfTimes).
+
 %% Test various duplicate_bags stuff.
 dups(Config) when is_list(Config) ->
     repeat_for_opts(fun dups_do/1).
@@ -4255,20 +4602,29 @@ dups_do(Opts) ->
 %% Test the ets:tab2file function on an empty ets table.
 tab2file(Config) when is_list(Config) ->
     FName = filename:join([proplists:get_value(priv_dir, Config),"tab2file_case"]),
-    tab2file_do(FName, []),
-    tab2file_do(FName, [{sync,true}]),
-    tab2file_do(FName, [{sync,false}]),
-    {'EXIT',{{badmatch,{error,_}},_}} = (catch tab2file_do(FName, [{sync,yes}])),
-    {'EXIT',{{badmatch,{error,_}},_}} = (catch tab2file_do(FName, [sync])),
+    tab2file_do(FName, [], set),
+    tab2file_do(FName, [], ordered_set),
+    tab2file_do(FName, [], cat_ord_set),
+    tab2file_do(FName, [], stim_cat_ord_set),
+    tab2file_do(FName, [{sync,true}], set),
+    tab2file_do(FName, [{sync,false}], set),
+    {'EXIT',{{badmatch,{error,_}},_}} = (catch tab2file_do(FName, [{sync,yes}], set)),
+    {'EXIT',{{badmatch,{error,_}},_}} = (catch tab2file_do(FName, [sync], set)),
     ok.
 
-tab2file_do(FName, Opts) ->
+tab2file_do(FName, Opts, TableType) ->
     %% Write an empty ets table to a file, read back and check properties.
-    Tab = ets_new(ets_SUITE_foo_tab, [named_table, set, public,
+    Tab = ets_new(ets_SUITE_foo_tab, [named_table, TableType, public,
 				      {keypos, 2},
 				      compressed,
 				      {write_concurrency,true},
 				      {read_concurrency,true}]),
+    ActualTableType =
+        case TableType of
+            cat_ord_set -> ordered_set;
+            stim_cat_ord_set -> ordered_set;
+            _ -> TableType
+        end,
     catch file:delete(FName),
     Res = ets:tab2file(Tab, FName, Opts),
     true = ets:delete(Tab),
@@ -4279,7 +4635,7 @@ tab2file_do(FName, Opts) ->
     public = ets:info(Tab2, protection),
     true = ets:info(Tab2, named_table),
     2 = ets:info(Tab2, keypos),
-    set = ets:info(Tab2, type),
+    ActualTableType = ets:info(Tab2, type),
     true = ets:info(Tab2, compressed),
     Smp = erlang:system_info(smp_support),
     Smp = ets:info(Tab2, read_concurrency),
@@ -4292,14 +4648,15 @@ tab2file_do(FName, Opts) ->
 tab2file2(Config) when is_list(Config) ->
     repeat_for_opts(fun(Opts) ->
                             tab2file2_do(Opts, Config)
-                    end, [[set,bag],compressed]).
+                    end, [[stim_cat_ord_set,cat_ord_set,set,bag],compressed]).
 
 tab2file2_do(Opts, Config) ->
     EtsMem = etsmem(),
-    Tab = ets_new(ets_SUITE_foo_tab, [named_table, private,
-				      {keypos, 2} | Opts]),
+    KeyRange = 10000,
+    Tab = ets_new(ets_SUITE_foo_tab, [named_table, private, {keypos, 2} | Opts],
+                  KeyRange),
     FName = filename:join([proplists:get_value(priv_dir, Config),"tab2file2_case"]),
-    ok = fill_tab2(Tab, 0, 10000),   % Fill up the table (grucho mucho!)
+    ok = fill_tab2(Tab, 0, KeyRange),   % Fill up the table (grucho mucho!)
     Len = length(ets:tab2list(Tab)),
     Mem = ets:info(Tab, memory),
     Type = ets:info(Tab, type),
@@ -4353,13 +4710,14 @@ fill_tab2(Tab, Val, Num) ->
 
 %% Test verification of tables with object count extended_info.
 tabfile_ext1(Config) when is_list(Config) ->
-    repeat_for_opts(fun(Opts) -> tabfile_ext1_do(Opts, Config) end).
+    repeat_for_opts_all_set_table_types(fun(Opts) -> tabfile_ext1_do(Opts, Config) end).
 
 tabfile_ext1_do(Opts,Config) ->
     FName = filename:join([proplists:get_value(priv_dir, Config),"nisse.dat"]),
     FName2 = filename:join([proplists:get_value(priv_dir, Config),"countflip.dat"]),
-    L = lists:seq(1,10),
-    T = ets_new(x,Opts),
+    KeyRange = 10,
+    L = lists:seq(1,KeyRange),
+    T = ets_new(x,Opts,KeyRange),
     Name = make_ref(),
     [ets:insert(T,{X,integer_to_list(X)}) || X <- L],
     ok = ets:tab2file(T,FName,[{extended_info,[object_count]}]),
@@ -4391,13 +4749,14 @@ tabfile_ext1_do(Opts,Config) ->
 
 %% Test verification of tables with md5sum extended_info.
 tabfile_ext2(Config) when is_list(Config) ->
-    repeat_for_opts(fun(Opts) -> tabfile_ext2_do(Opts,Config) end).
+    repeat_for_opts_all_set_table_types(fun(Opts) -> tabfile_ext2_do(Opts,Config) end).
 
 tabfile_ext2_do(Opts,Config) ->
     FName = filename:join([proplists:get_value(priv_dir, Config),"olle.dat"]),
     FName2 = filename:join([proplists:get_value(priv_dir, Config),"bitflip.dat"]),
-    L = lists:seq(1,10),
-    T = ets_new(x,Opts),
+    KeyRange = 10,
+    L = lists:seq(1, KeyRange),
+    T = ets_new(x, Opts, KeyRange),
     Name = make_ref(),
     [ets:insert(T,{X,integer_to_list(X)}) || X <- L],
     ok = ets:tab2file(T,FName,[{extended_info,[md5sum]}]),
@@ -4428,71 +4787,77 @@ tabfile_ext2_do(Opts,Config) ->
 
 %% Test verification of (named) tables without extended info.
 tabfile_ext3(Config) when is_list(Config) ->
-    FName = filename:join([proplists:get_value(priv_dir, Config),"namn.dat"]),
-    FName2 = filename:join([proplists:get_value(priv_dir, Config),"ncountflip.dat"]),
-    L = lists:seq(1,10),
-    Name = make_ref(),
-    ?MODULE = ets_new(?MODULE,[named_table]),
-    [ets:insert(?MODULE,{X,integer_to_list(X)}) || X <- L],
-    ets:tab2file(?MODULE,FName),
-    {error,cannot_create_table} = ets:file2tab(FName),
-    true = ets:delete(?MODULE),
-    {ok,?MODULE} = ets:file2tab(FName),
-    true = ets:delete(?MODULE),
-    disk_log:open([{name,Name},{file,FName}]),
-    {_,[H2|T2]} = disk_log:chunk(Name,start),
-    disk_log:close(Name),
-    NewT2=lists:keydelete(8,1,T2),
-    file:delete(FName2),
-    disk_log:open([{name,Name},{file,FName2},{mode,read_write}]),
-    disk_log:log_terms(Name,[H2|NewT2]),
-    disk_log:close(Name),
-    9 = length(ets:tab2list(element(2,ets:file2tab(FName2)))),
-    true = ets:delete(?MODULE),
-    {error,invalid_object_count} = ets:file2tab(FName2,[{verify,true}]),
-    {'EXIT',_} = (catch ets:delete(?MODULE)),
-    {ok,_} = ets:tabfile_info(FName2),
-    {ok,_} = ets:tabfile_info(FName),
-    file:delete(FName),
-    file:delete(FName2),
+    repeat_for_all_set_table_types(
+      fun(Opts) ->
+              FName = filename:join([proplists:get_value(priv_dir, Config),"namn.dat"]),
+              FName2 = filename:join([proplists:get_value(priv_dir, Config),"ncountflip.dat"]),
+              L = lists:seq(1,10),
+              Name = make_ref(),
+              ?MODULE = ets_new(?MODULE,[named_table|Opts]),
+              [ets:insert(?MODULE,{X,integer_to_list(X)}) || X <- L],
+              ets:tab2file(?MODULE,FName),
+              {error,cannot_create_table} = ets:file2tab(FName),
+              true = ets:delete(?MODULE),
+              {ok,?MODULE} = ets:file2tab(FName),
+              true = ets:delete(?MODULE),
+              disk_log:open([{name,Name},{file,FName}]),
+              {_,[H2|T2]} = disk_log:chunk(Name,start),
+              disk_log:close(Name),
+              NewT2=lists:keydelete(8,1,T2),
+              file:delete(FName2),
+              disk_log:open([{name,Name},{file,FName2},{mode,read_write}]),
+              disk_log:log_terms(Name,[H2|NewT2]),
+              disk_log:close(Name),
+              9 = length(ets:tab2list(element(2,ets:file2tab(FName2)))),
+              true = ets:delete(?MODULE),
+              {error,invalid_object_count} = ets:file2tab(FName2,[{verify,true}]),
+              {'EXIT',_} = (catch ets:delete(?MODULE)),
+              {ok,_} = ets:tabfile_info(FName2),
+              {ok,_} = ets:tabfile_info(FName),
+              file:delete(FName),
+              file:delete(FName2)
+      end),
     ok.
 
 %% Tests verification of large table with md5 sum.
 tabfile_ext4(Config) when is_list(Config) ->
-    FName = filename:join([proplists:get_value(priv_dir, Config),"bauta.dat"]),
-    LL = lists:seq(1,10000),
-    TL = ets_new(x,[]),
-    Name2 = make_ref(),
-    [ets:insert(TL,{X,integer_to_list(X)}) || X <- LL],
-    ok = ets:tab2file(TL,FName,[{extended_info,[md5sum]}]),
-    {ok, Name2} = disk_log:open([{name, Name2}, {file, FName},
-				 {mode, read_only}]),
-    {C,[_|_]} = disk_log:chunk(Name2,start),
-    {_,[_|_]} = disk_log:chunk(Name2,C),
-    disk_log:close(Name2),
-    true = lists:sort(ets:tab2list(TL)) =:=
-	lists:sort(ets:tab2list(element(2,ets:file2tab(FName)))),
-    Res = [begin
-	       {ok,FD} = file:open(FName,[binary,read,write]),
-	       {ok, Bin} = file:pread(FD,0,1000),
-	       <<B1:N/binary,Ch:8,B2/binary>> = Bin,
-	       Ch2 = (Ch + 1) rem 255,
-	       Bin2 = <<B1/binary,Ch2:8,B2/binary>>,
-	       ok = file:pwrite(FD,0,Bin2),
-	       ok = file:close(FD),
-	       X = case ets:file2tab(FName) of
-		       {ok,TL2} ->
-			   true = lists:sort(ets:tab2list(TL)) =/=
-			       lists:sort(ets:tab2list(TL2));
-		       _ ->
-			   totally_broken
-		   end,
-	       {error,Y} = ets:file2tab(FName,[{verify,true}]),
-	       ets:tab2file(TL,FName,[{extended_info,[md5sum]}]),
-	       {X,Y}
-	   end || N <- lists:seq(500,600)],
-    io:format("~p~n",[Res]),
-    file:delete(FName),
+    repeat_for_all_set_table_types(
+      fun(Opts) ->
+              FName = filename:join([proplists:get_value(priv_dir, Config),"bauta.dat"]),
+              LL = lists:seq(1,10000),
+              TL = ets_new(x,Opts),
+              Name2 = make_ref(),
+              [ets:insert(TL,{X,integer_to_list(X)}) || X <- LL],
+              ok = ets:tab2file(TL,FName,[{extended_info,[md5sum]}]),
+              {ok, Name2} = disk_log:open([{name, Name2}, {file, FName},
+                                           {mode, read_only}]),
+              {C,[_|_]} = disk_log:chunk(Name2,start),
+              {_,[_|_]} = disk_log:chunk(Name2,C),
+              disk_log:close(Name2),
+              true = lists:sort(ets:tab2list(TL)) =:=
+                  lists:sort(ets:tab2list(element(2,ets:file2tab(FName)))),
+              Res = [begin
+                         {ok,FD} = file:open(FName,[binary,read,write]),
+                         {ok, Bin} = file:pread(FD,0,1000),
+                         <<B1:N/binary,Ch:8,B2/binary>> = Bin,
+                         Ch2 = (Ch + 1) rem 255,
+                         Bin2 = <<B1/binary,Ch2:8,B2/binary>>,
+                         ok = file:pwrite(FD,0,Bin2),
+                         ok = file:close(FD),
+                         X = case ets:file2tab(FName) of
+                                 {ok,TL2} ->
+                                     true = lists:sort(ets:tab2list(TL)) =/=
+                                         lists:sort(ets:tab2list(TL2));
+                                 _ ->
+                                     totally_broken
+                             end,
+                         {error,Y} = ets:file2tab(FName,[{verify,true}]),
+                         ets:tab2file(TL,FName,[{extended_info,[md5sum]}]),
+                         {X,Y}
+                     end || N <- lists:seq(500,600)],
+              io:format("~p~n",[Res]),
+              file:delete(FName)
+      end),
     ok.
 
 %% Test that no disk_log is left open when file has been corrupted.
@@ -4556,13 +4921,14 @@ make_sub_binary(List, Num) when is_list(List) ->
 
 %% Perform multiple lookups for every key in a large table.
 heavy_lookup(Config) when is_list(Config) ->
-    repeat_for_opts(fun heavy_lookup_do/1).
+    repeat_for_opts_all_set_table_types(fun heavy_lookup_do/1).
 
 heavy_lookup_do(Opts) ->
     EtsMem = etsmem(),
-    Tab = ets_new(foobar_table, [set, protected, {keypos, 2} | Opts]),
-    ok = fill_tab2(Tab, 0, 7000),
-    _ = [do_lookup(Tab, 6999) || _ <- lists:seq(1, 50)],
+    KeyRange = 7000,
+    Tab = ets_new(foobar_table, [{keypos, 2} | Opts], KeyRange),
+    ok = fill_tab2(Tab, 0, KeyRange),
+    _ = [do_lookup(Tab, KeyRange-1) || _ <- lists:seq(1, 50)],
     true = ets:delete(Tab),
     verify_etsmem(EtsMem).
 
@@ -4579,15 +4945,16 @@ do_lookup(Tab, N) ->
 
 %% Perform multiple lookups for every element in a large table.
 heavy_lookup_element(Config) when is_list(Config) ->
-    repeat_for_opts(fun heavy_lookup_element_do/1).
+    repeat_for_opts_all_set_table_types(fun heavy_lookup_element_do/1).
 
 heavy_lookup_element_do(Opts) ->
     EtsMem = etsmem(),
-    Tab = ets_new(foobar_table, [set, protected, {keypos, 2} | Opts]),
-    ok = fill_tab2(Tab, 0, 7000),
+    KeyRange = 7000,
+    Tab = ets_new(foobar_table, [{keypos, 2} | Opts], KeyRange),
+    ok = fill_tab2(Tab, 0, KeyRange),
     %% lookup ALL elements 50 times
     Laps = 50 div syrup_factor(),
-    _ = [do_lookup_element(Tab, 6999, 1) || _ <- lists:seq(1, Laps)],
+    _ = [do_lookup_element(Tab, KeyRange-1, 1) || _ <- lists:seq(1, Laps)],
     true = ets:delete(Tab),
     verify_etsmem(EtsMem).
 
@@ -4606,15 +4973,15 @@ do_lookup_element(Tab, N, M) ->
 
 
 heavy_concurrent(Config) when is_list(Config) ->
-    ct:timetrap({minutes,30}), %% valgrind needs a lot of time
-    repeat_for_opts(fun do_heavy_concurrent/1).
+    ct:timetrap({minutes,120}), %% valgrind needs a lot of time
+    repeat_for_opts_all_set_table_types(fun do_heavy_concurrent/1).
 
 do_heavy_concurrent(Opts) ->
-    Size = 10000,
+    KeyRange = 10000,
     Laps = 10000 div syrup_factor(),
     EtsMem = etsmem(),
-    Tab = ets_new(blupp, [set, public, {keypos, 2} | Opts]),
-    ok = fill_tab2(Tab, 0, Size),
+    Tab = ets_new(blupp, [public, {keypos, 2} | Opts], KeyRange),
+    ok = fill_tab2(Tab, 0, KeyRange),
     Procs = lists:map(
 	      fun (N) ->
 		      my_spawn_link(
@@ -4647,48 +5014,68 @@ do_heavy_concurrent_proc(Tab, N, Offs) ->
 
 
 fold_empty(Config) when is_list(Config) ->
-    EtsMem = etsmem(),
-    Tab = make_table(a, [], []),
-    [] = ets:foldl(fun(_X) -> exit(hej) end, [], Tab),
-    [] = ets:foldr(fun(_X) -> exit(hej) end, [], Tab),
-    true = ets:delete(Tab),
-    verify_etsmem(EtsMem).
+    repeat_for_opts_all_set_table_types(
+      fun(Opts) ->
+              EtsMem = etsmem(),
+              Tab = make_table(a, Opts, []),
+              [] = ets:foldl(fun(_X) -> exit(hej) end, [], Tab),
+              [] = ets:foldr(fun(_X) -> exit(hej) end, [], Tab),
+              true = ets:delete(Tab),
+              verify_etsmem(EtsMem)
+      end),
+    ok.
 
 foldl(Config) when is_list(Config) ->
-    EtsMem = etsmem(),
-    L = [{a,1}, {c,3}, {b,2}],
-    LS = lists:sort(L),
-    Tab = make_table(a, [bag], L),
-    LS = lists:sort(ets:foldl(fun(E,A) -> [E|A] end, [], Tab)),
-    true = ets:delete(Tab),
-    verify_etsmem(EtsMem).
+    repeat_for_opts_all_table_types(
+      fun(Opts) ->
+              EtsMem = etsmem(),
+              L = [{a,1}, {c,3}, {b,2}],
+              LS = lists:sort(L),
+              Tab = make_table(a, Opts, L),
+              LS = lists:sort(ets:foldl(fun(E,A) -> [E|A] end, [], Tab)),
+              true = ets:delete(Tab),
+              verify_etsmem(EtsMem)
+      end),
+    ok.
 
 foldr(Config) when is_list(Config) ->
-    EtsMem = etsmem(),
-    L = [{a,1}, {c,3}, {b,2}],
-    LS = lists:sort(L),
-    Tab = make_table(a, [bag], L),
-    LS = lists:sort(ets:foldr(fun(E,A) -> [E|A] end, [], Tab)),
-    true = ets:delete(Tab),
-    verify_etsmem(EtsMem).
+    repeat_for_opts_all_table_types(
+      fun(Opts) ->
+              EtsMem = etsmem(),
+              L = [{a,1}, {c,3}, {b,2}],
+              LS = lists:sort(L),
+              Tab = make_table(a, Opts, L),
+              LS = lists:sort(ets:foldr(fun(E,A) -> [E|A] end, [], Tab)),
+              true = ets:delete(Tab),
+              verify_etsmem(EtsMem)
+      end),
+    ok.
 
 foldl_ordered(Config) when is_list(Config) ->
-    EtsMem = etsmem(),
-    L = [{a,1}, {c,3}, {b,2}],
-    LS = lists:sort(L),
-    Tab = make_table(a, [ordered_set], L),
-    LS = lists:reverse(ets:foldl(fun(E,A) -> [E|A] end, [], Tab)),
-    true = ets:delete(Tab),
-    verify_etsmem(EtsMem).
+    repeat_for_opts_all_ord_set_table_types(
+      fun(Opts) ->
+              EtsMem = etsmem(),
+              L = [{a,1}, {c,3}, {b,2}],
+              LS = lists:sort(L),
+              Tab = make_table(a, Opts, L),
+              LS = lists:reverse(ets:foldl(fun(E,A) -> [E|A] end, [], Tab)),
+              true = ets:delete(Tab),
+              verify_etsmem(EtsMem)
+      end),
+    ok.
 
 foldr_ordered(Config) when is_list(Config) ->
-    EtsMem = etsmem(),
-    L = [{a,1}, {c,3}, {b,2}],
-    LS = lists:sort(L),
-    Tab = make_table(a, [ordered_set], L),
-    LS = ets:foldr(fun(E,A) -> [E|A] end, [], Tab),
-    true = ets:delete(Tab),
-    verify_etsmem(EtsMem).
+    repeat_for_opts_all_ord_set_table_types(
+      fun(Opts) ->
+              EtsMem = etsmem(),
+              L = [{a,1}, {c,3}, {b,2}],
+              LS = lists:sort(L),
+              Tab = make_table(a, Opts, L),
+              LS = ets:foldr(fun(E,A) -> [E|A] end, [], Tab),
+              true = ets:delete(Tab),
+              verify_etsmem(EtsMem)
+      end),
+    ok.
 
 %% Test ets:member BIF.
 member(Config) when is_list(Config) ->
@@ -4873,6 +5260,7 @@ filltabint(Tab,0) ->
 filltabint(Tab,N) ->
     ets:insert(Tab,{N,integer_to_list(N)}),
     filltabint(Tab,N-1).
+
 filltabint2(Tab,0) ->
     Tab;
 filltabint2(Tab,N) ->
@@ -5087,27 +5475,31 @@ gen_dets_filename(Config,N) ->
 		  "testdets_" ++ integer_to_list(N) ++ ".dets").
 
 otp_6842_select_1000(Config) when is_list(Config) ->
-    Tab = ets_new(xxx,[ordered_set]),
-    [ets:insert(Tab,{X,X}) || X <- lists:seq(1,10000)],
-    AllTrue = lists:duplicate(10,true),
-    AllTrue =
-	[ length(
-	    element(1,
-		    ets:select(Tab,[{'_',[],['$_']}],X*1000))) =:=
-	      X*1000 || X <- lists:seq(1,10) ],
-    Sequences = [[1000,1000,1000,1000,1000,1000,1000,1000,1000,1000],
-		 [2000,2000,2000,2000,2000],
-		 [3000,3000,3000,1000],
-		 [4000,4000,2000],
-		 [5000,5000],
-		 [6000,4000],
-		 [7000,3000],
-		 [8000,2000],
-		 [9000,1000],
-		 [10000]],
-    AllTrue = [ check_seq(Tab, ets:select(Tab,[{'_',[],['$_']}],hd(L)),L) ||
-		  L <- Sequences ],
-    ets:delete(Tab),
+    repeat_for_opts_all_ord_set_table_types(
+      fun(Opts) ->
+              KeyRange = 10000,
+              Tab = ets_new(xxx, Opts, KeyRange),
+              [ets:insert(Tab,{X,X}) || X <- lists:seq(1,KeyRange)],
+              AllTrue = lists:duplicate(10,true),
+              AllTrue =
+                  [ length(
+                      element(1,
+                              ets:select(Tab,[{'_',[],['$_']}],X*1000))) =:=
+                        X*1000 || X <- lists:seq(1,10) ],
+              Sequences = [[1000,1000,1000,1000,1000,1000,1000,1000,1000,1000],
+                           [2000,2000,2000,2000,2000],
+                           [3000,3000,3000,1000],
+                           [4000,4000,2000],
+                           [5000,5000],
+                           [6000,4000],
+                           [7000,3000],
+                           [8000,2000],
+                           [9000,1000],
+                           [10000]],
+              AllTrue = [ check_seq(Tab, ets:select(Tab,[{'_',[],['$_']}],hd(L)),L) ||
+                            L <- Sequences ],
+              ets:delete(Tab)
+      end),
     ok.
 
 check_seq(_,'$end_of_table',[]) ->
@@ -5119,17 +5511,76 @@ check_seq(A,B,C) ->
     false.
 
 otp_6338(Config) when is_list(Config) ->
-    L = binary_to_term(<<131,108,0,0,0,2,104,2,108,0,0,0,2,103,100,0,19,112,112,
-                         98,49,95,98,115,49,50,64,98,108,97,100,101,95,48,95,53,
-                         0,0,33,50,0,0,0,4,1,98,0,0,23,226,106,100,0,4,101,120,
-                         105,116,104,2,108,0,0,0,2,104,2,100,0,3,115,98,109,100,
-                         0,19,112,112,98,50,95,98,115,49,50,64,98,108,97,100,
-                         101,95,48,95,56,98,0,0,18,231,106,100,0,4,114,101,99,
-                         118,106>>),
-    T = ets_new(xxx,[ordered_set]),
-    lists:foreach(fun(X) -> ets:insert(T,X) end,L),
-    [[4839,recv]] = ets:match(T,{[{sbm,ppb2_bs12@blade_0_8},'$1'],'$2'}),
-    ets:delete(T).
+    repeat_for_opts_all_ord_set_table_types(
+      fun(Opts) ->
+              L = binary_to_term(<<131,108,0,0,0,2,104,2,108,0,0,0,2,103,100,0,19,112,112,
+                                   98,49,95,98,115,49,50,64,98,108,97,100,101,95,48,95,53,
+                                   0,0,33,50,0,0,0,4,1,98,0,0,23,226,106,100,0,4,101,120,
+                                   105,116,104,2,108,0,0,0,2,104,2,100,0,3,115,98,109,100,
+                                   0,19,112,112,98,50,95,98,115,49,50,64,98,108,97,100,
+                                   101,95,48,95,56,98,0,0,18,231,106,100,0,4,114,101,99,
+                                   118,106>>),
+              T = ets_new(xxx,Opts),
+              lists:foreach(fun(X) -> ets:insert(T,X) end,L),
+              [[4839,recv]] = ets:match(T,{[{sbm,ppb2_bs12@blade_0_8},'$1'],'$2'}),
+              ets:delete(T)
+      end),
+    ok.
+
+%% OTP-15660: Verify select not doing excessive trapping
+%%            when process have mbuf heap fragments.
+select_mbuf_trapping(Config) when is_list(Config) ->
+    select_mbuf_trapping_do(set),
+    select_mbuf_trapping_do(ordered_set).
+
+select_mbuf_trapping_do(Type) ->
+    T = ets:new(xxx, [Type]),
+    NKeys = 50,
+    [ets:insert(T, {K, value}) || K <- lists:seq(1,NKeys)],
+
+    {priority, Prio} = process_info(self(), priority),
+    Tracee = self(),
+    [SchedTracer]
+	= start_loopers(1, Prio,
+			fun (SC) ->
+				receive
+				    {trace, Tracee, out, _} ->
+					SC+1;
+				    done ->
+					Tracee ! {schedule_count, SC},
+                                        exit(normal)
+				end
+			end,
+			0),
+
+    erlang:garbage_collect(),
+    1 = erlang:trace(self(), true, [running,{tracer,SchedTracer}]),
+
+    %% Artificially create an mbuf heap fragment
+    MbufTerm = "Frag me up",
+    MbufTerm = erts_debug:set_internal_state(mbuf, MbufTerm),
+
+    Keys = ets:select(T, [{{'$1', value}, [], ['$1']}]),
+    NKeys = length(Keys),
+
+    1 = erlang:trace(self(), false, [running]),
+    Ref = erlang:trace_delivered(Tracee),
+    receive
+        {trace_delivered, Tracee, Ref} ->
+            SchedTracer ! done
+    end,
+    receive
+	{schedule_count, N} ->
+	    io:format("~p context switches: ~p", [Type,N]),
+	    if
+		N < 3 -> ok;
+		true -> ct:fail(failed)
+	    end
+    end,
+    true = ets:delete(T),
+    ok.
+
+
 
 %% Elements could come in the wrong order in a bag if a rehash occurred.
 otp_5340(Config) when is_list(Config) ->
@@ -5199,7 +5650,7 @@ otp_7665_act(Tab,Min,Max,DelNr) ->
 %% Whitebox testing of meta name table hashing.
 meta_wb(Config) when is_list(Config) ->
     EtsMem = etsmem(),
-    repeat_for_opts(fun meta_wb_do/1),
+    repeat_for_opts_all_non_stim_table_types(fun meta_wb_do/1),
     verify_etsmem(EtsMem).
 
 
@@ -5268,13 +5719,16 @@ colliding_names(Name) ->
 %% OTP_6913: Grow and shrink.
 
 grow_shrink(Config) when is_list(Config) ->
-    EtsMem = etsmem(),
-
-    Set = ets_new(a, [set]),
-    grow_shrink_0(0, 3071, 3000, 5000, Set),
-    ets:delete(Set),
-
-    verify_etsmem(EtsMem).
+    repeat_for_all_set_table_types(
+      fun(Opts) ->
+              EtsMem = etsmem(),
+              
+              Set = ets_new(a, Opts, 5000),
+              grow_shrink_0(0, 3071, 3000, 5000, Set),
+              ets:delete(Set),
+              
+              verify_etsmem(EtsMem)
+      end).
 
 grow_shrink_0(N, _, _, Max, _) when N >= Max ->
     ok;
@@ -5298,7 +5752,7 @@ grow_shrink_3(N, ShrinkTo, T) ->
     true = ets:delete(T, N),
     grow_shrink_3(N-1, ShrinkTo, T).
 
-%% Grow a table that still contains pseudo-deleted objects.
+%% Grow a hash table that still contains pseudo-deleted objects.
 grow_pseudo_deleted(Config) when is_list(Config) ->
     only_if_smp(fun() -> grow_pseudo_deleted_do() end).
 
@@ -5351,7 +5805,7 @@ grow_pseudo_deleted_do(Type) ->
     ets:delete(T),
     process_flag(scheduler,0).
 
-%% Shrink a table that still contains pseudo-deleted objects.
+%% Shrink a hash table that still contains pseudo-deleted objects.
 shrink_pseudo_deleted(Config) when is_list(Config) ->
     only_if_smp(fun()->shrink_pseudo_deleted_do() end).
 
@@ -5471,10 +5925,16 @@ meta_newdel_named(Config) when is_list(Config) ->
 
 %% Concurrent insert's on same table.
 smp_insert(Config) when is_list(Config) ->
-    ets_new(smp_insert,[named_table,public,{write_concurrency,true}]),
+    repeat_for_opts(fun smp_insert_do/1,
+                    [[set,ordered_set,stim_cat_ord_set]]).
+
+smp_insert_do(Opts) ->
+    KeyRange = 10000,
+    ets_new(smp_insert,[named_table,public,{write_concurrency,true}|Opts],
+            KeyRange),
     InitF = fun(_) -> ok end,
-    ExecF = fun(_) -> true = ets:insert(smp_insert,{rand:uniform(10000)})
-	    end,
+    ExecF = fun(_) -> true = ets:insert(smp_insert,{rand:uniform(KeyRange)})
+            end,
     FiniF = fun(_) -> ok end,
     run_smp_workers(InitF,ExecF,FiniF,100000),
     verify_table_load(smp_insert),
@@ -5482,7 +5942,7 @@ smp_insert(Config) when is_list(Config) ->
 
 %% Concurrent deletes on same fixated table.
 smp_fixed_delete(Config) when is_list(Config) ->
-    only_if_smp(fun()->smp_fixed_delete_do() end).
+    only_if_smp(fun() -> smp_fixed_delete_do() end).
 
 smp_fixed_delete_do() ->
     T = ets_new(foo,[public,{write_concurrency,true}]),
@@ -5493,17 +5953,20 @@ smp_fixed_delete_do() ->
     Buckets = num_of_buckets(T),
     InitF = fun([ProcN,NumOfProcs|_]) -> {ProcN,NumOfProcs} end,
     ExecF = fun({Key,_}) when Key > NumOfObjs ->
-		    [end_of_work];
-	       ({Key,Increment}) ->
-		    true = ets:delete(T,Key),
-		    {Key+Increment,Increment}
-	    end,
+                    [end_of_work];
+               ({Key,Increment}) ->
+                    true = ets:delete(T,Key),
+                    {Key+Increment,Increment}
+            end,
     FiniF = fun(_) -> ok end,
     run_sched_workers(InitF,ExecF,FiniF,NumOfObjs),
     0 = ets:info(T,size),
     true = ets:info(T,fixed),
     Buckets = num_of_buckets(T),
-    NumOfObjs = get_kept_objects(T),
+    case ets:info(T,type) of
+        set -> NumOfObjs = get_kept_objects(T);
+        _ -> ok
+    end,
     ets:safe_fixtable(T,false),
     %% Will fail as unfix does not shrink the table:
     %%Mem = ets:info(T,memory),
@@ -5551,7 +6014,12 @@ delete_unfix_race(Config) when is_list(Config) ->
     verify_etsmem(EtsMem).
 
 num_of_buckets(T) ->
-    element(1,ets:info(T,stats)).
+    case ets:info(T,type) of
+        set -> element(1,ets:info(T,stats));
+        bag -> element(1,ets:info(T,stats));
+        duplicate_bag -> element(1,ets:info(T,stats));
+        _ -> ok
+    end.
 
 %% Fixate hash table while other process is busy doing unfix.
 smp_unfix_fix(Config) when is_list(Config) ->
@@ -5716,106 +6184,126 @@ otp_8166_zombie_creator(T,Deleted) ->
 
 
 verify_table_load(T) ->
-    Stats = ets:info(T,stats),
-    {Buckets,AvgLen,StdDev,ExpSD,_MinLen,_MaxLen,_} = Stats,
-    ok = if
-	     AvgLen > 1.2 ->
-		 io:format("Table overloaded: Stats=~p\n~p\n",
-			   [Stats, ets:info(T)]),
-		 false;
-
-	     Buckets>256, AvgLen < 0.47 ->
-		 io:format("Table underloaded: Stats=~p\n~p\n",
-			   [Stats, ets:info(T)]),
-		 false;
-
-	     StdDev > ExpSD*2 ->
-		 io:format("Too large standard deviation (poor hashing?),"
-			   " stats=~p\n~p\n",[Stats, ets:info(T)]),
-		 false;
-
-	     true ->
-		 io:format("Stats = ~p\n",[Stats]),
-		 ok
-	 end.
+    case ets:info(T,type) of
+        ordered_set -> ok;
+        _ ->
+            Stats = ets:info(T,stats),
+            {Buckets,AvgLen,StdDev,ExpSD,_MinLen,_MaxLen,_} = Stats,
+            ok = if
+                     AvgLen > 1.2 ->
+                         io:format("Table overloaded: Stats=~p\n~p\n",
+                                   [Stats, ets:info(T)]),
+                         false;
+
+                     Buckets>256, AvgLen < 0.47 ->
+                         io:format("Table underloaded: Stats=~p\n~p\n",
+                                   [Stats, ets:info(T)]),
+                         false;
+
+                     StdDev > ExpSD*2 ->
+                         io:format("Too large standard deviation (poor hashing?),"
+                                   " stats=~p\n~p\n",[Stats, ets:info(T)]),
+                         false;
+
+                     true ->
+                         io:format("Stats = ~p\n",[Stats]),
+                         ok
+                 end
+    end.
 
 
 %% ets:select on a tree with NIL key object.
 otp_8732(Config) when is_list(Config) ->
-    Tab = ets_new(noname,[ordered_set]),
-    filltabstr(Tab,999),
-    ets:insert(Tab,{[],"nasty NIL object"}),
-    [] = ets:match(Tab,{'_',nomatch}), %% Will hang if bug not fixed
+    repeat_for_all_ord_set_table_types(
+      fun(Opts) ->
+              KeyRange = 999,
+              KeyFun = fun(K) -> integer_to_list(K) end,
+              Tab = ets_new(noname,Opts, KeyRange, KeyFun),
+              filltabstr(Tab, KeyRange),
+              ets:insert(Tab,{[],"nasty NIL object"}),
+              [] = ets:match(Tab,{'_',nomatch}) %% Will hang if bug not fixed
+      end),
     ok.
 
 
 %% Run concurrent select_delete (and inserts) on same table.
 smp_select_delete(Config) when is_list(Config) ->
-    T = ets_new(smp_select_delete,[named_table,public,{write_concurrency,true}]),
-    Mod = 17,
-    Zeros = erlang:make_tuple(Mod,0),
-    InitF = fun(_) -> Zeros end,
-    ExecF = fun(Diffs0) ->
-		    case rand:uniform(20) of
-			1 ->
-			    Mod = 17,
-			    Eq = rand:uniform(Mod) - 1,
-			    Deleted = ets:select_delete(T,
-							[{{'_', '$1'},
-							  [{'=:=', {'rem', '$1', Mod}, Eq}],
-							  [true]}]),
-			    Diffs1 = setelement(Eq+1, Diffs0,
-						element(Eq+1,Diffs0) - Deleted),
-			    Diffs1;
-			_ ->
-			    Key = rand:uniform(10000),
-			    Eq = Key rem Mod,
-			    case ets:insert_new(T,{Key,Key}) of
-				true ->
-				    Diffs1 = setelement(Eq+1, Diffs0,
-							element(Eq+1,Diffs0)+1),
-				    Diffs1;
-				false -> Diffs0
-			    end
-		    end
-	    end,
-    FiniF = fun(Result) -> Result end,
-    Results = run_sched_workers(InitF,ExecF,FiniF,20000),
-    TotCnts = lists:foldl(fun(Diffs, Sum) -> add_lists(Sum,tuple_to_list(Diffs)) end,
-			  lists:duplicate(Mod, 0), Results),
-    io:format("TotCnts = ~p\n",[TotCnts]),
-    LeftInTab = lists:foldl(fun(N,Sum) -> Sum+N end,
-			    0, TotCnts),
-    io:format("LeftInTab = ~p\n",[LeftInTab]),
-    LeftInTab = ets:info(T,size),
-    lists:foldl(fun(Cnt,Eq) ->
-			WasCnt = ets:select_count(T,
-						  [{{'_', '$1'},
-						    [{'=:=', {'rem', '$1', Mod}, Eq}],
-						    [true]}]),
-			io:format("~p: ~p =?= ~p\n",[Eq,Cnt,WasCnt]),
-			Cnt = WasCnt,
-			Eq+1
-		end,
-		0, TotCnts),
-    %% May fail as select_delete does not shrink table (enough)
-    %%verify_table_load(T),
-    LeftInTab = ets:select_delete(T, [{{'$1','$1'}, [], [true]}]),
-    0 = ets:info(T,size),
-    false = ets:info(T,fixed),
-    ets:delete(T).
+    repeat_for_opts(fun smp_select_delete_do/1,
+                    [[set,ordered_set,stim_cat_ord_set],
+                     read_concurrency, compressed]).
+
+smp_select_delete_do(Opts) ->
+    KeyRange = 10000,
+    begin % indentation
+              T = ets_new(smp_select_delete,[named_table,public,{write_concurrency,true}|Opts],
+                          KeyRange),
+              Mod = 17,
+              Zeros = erlang:make_tuple(Mod,0),
+              InitF = fun(_) -> Zeros end,
+              ExecF = fun(Diffs0) ->
+                              case rand:uniform(20) of
+                                  1 ->
+                                      Mod = 17,
+                                      Eq = rand:uniform(Mod) - 1,
+                                      Deleted = ets:select_delete(T,
+                                                                  [{{'_', '$1'},
+                                                                    [{'=:=', {'rem', '$1', Mod}, Eq}],
+                                                                    [true]}]),
+                                      Diffs1 = setelement(Eq+1, Diffs0,
+                                                          element(Eq+1,Diffs0) - Deleted),
+                                      Diffs1;
+                                  _ ->
+                                      Key = rand:uniform(KeyRange),
+                                      Eq = Key rem Mod,
+                                      case ets:insert_new(T,{Key,Key}) of
+                                          true ->
+                                              Diffs1 = setelement(Eq+1, Diffs0,
+                                                                  element(Eq+1,Diffs0)+1),
+                                              Diffs1;
+                                          false -> Diffs0
+                                      end
+                              end
+                      end,
+              FiniF = fun(Result) -> Result end,
+              Results = run_sched_workers(InitF,ExecF,FiniF,20000),
+              TotCnts = lists:foldl(fun(Diffs, Sum) -> add_lists(Sum,tuple_to_list(Diffs)) end,
+                                    lists:duplicate(Mod, 0), Results),
+              io:format("TotCnts = ~p\n",[TotCnts]),
+              LeftInTab = lists:foldl(fun(N,Sum) -> Sum+N end,
+                                      0, TotCnts),
+              io:format("LeftInTab = ~p\n",[LeftInTab]),
+              LeftInTab = ets:info(T,size),
+              lists:foldl(fun(Cnt,Eq) ->
+                                  WasCnt = ets:select_count(T,
+                                                            [{{'_', '$1'},
+                                                              [{'=:=', {'rem', '$1', Mod}, Eq}],
+                                                              [true]}]),
+                                  io:format("~p: ~p =?= ~p\n",[Eq,Cnt,WasCnt]),
+                                  Cnt = WasCnt,
+                                  Eq+1
+                          end,
+                          0, TotCnts),
+              %% May fail as select_delete does not shrink table (enough)
+              %%verify_table_load(T),
+              LeftInTab = ets:select_delete(T, [{{'$1','$1'}, [], [true]}]),
+              0 = ets:info(T,size),
+              false = ets:info(T,fixed),
+              ets:delete(T)
+    end, % indentation
+    ok.
 
 smp_select_replace(Config) when is_list(Config) ->
     repeat_for_opts(fun smp_select_replace_do/1,
-                    [[set,ordered_set,duplicate_bag]]).
+                    [[set,ordered_set,stim_cat_ord_set,duplicate_bag]]).
 
 smp_select_replace_do(Opts) ->
+    KeyRange = 20,
     T = ets_new(smp_select_replace,
-                [public, {write_concurrency, true} | Opts]),
-    ObjCount = 20,
+                [public, {write_concurrency, true} | Opts],
+                KeyRange),
     InitF = fun (_) -> 0 end,
     ExecF = fun (Cnt0) ->
-                    CounterId = rand:uniform(ObjCount),
+                    CounterId = rand:uniform(KeyRange),
                     Match = [{{'$1', '$2'},
                               [{'=:=', '$1', CounterId}],
                               [{{'$1', {'+', '$2', 1}}}]}],
@@ -5839,15 +6327,143 @@ smp_select_replace_do(Opts) ->
     FinalCounts = ets:select(T, [{{'_', '$1'}, [], ['$1']}]),
     Total = lists:sum(FinalCounts),
     Total = lists:sum(Results),
-    ObjCount = ets:select_delete(T, [{{'_', '_'}, [], [true]}]),
+    KeyRange = ets:select_delete(T, [{{'_', '_'}, [], [true]}]),
     0 = ets:info(T, size),
     true = ets:delete(T),
     ok.
 
+%% Iterate ordered_set with write_concurrency
+%% and make sure we hit all "stable" long lived keys
+%% while "volatile" objects are randomly inserted and deleted.
+smp_ordered_iteration(Config) when is_list(Config) ->
+    repeat_for_opts(fun smp_ordered_iteration_do/1,
+                    [[cat_ord_set,stim_cat_ord_set]]).
+
+
+smp_ordered_iteration_do(Opts) ->
+    KeyRange = 1000,
+    OffHeap = erts_test_utils:mk_ext_pid({a@b,1}, 4711, 1),
+    KeyFun = fun(K, Type) ->
+                     {K div 10, K rem 10, Type, OffHeap}
+             end,
+    StimKeyFun = fun(K) ->
+                         KeyFun(K, element(rand:uniform(3),
+                                           {stable, other, volatile}))
+                 end,
+    T = ets_new(smp_ordered_iteration, [public, {write_concurrency,true} | Opts],
+                KeyRange, StimKeyFun),
+    NStable = KeyRange div 4,
+    prefill_table(T, KeyRange, NStable, fun(K) -> {KeyFun(K, stable), 0} end),
+    NStable = ets:info(T, size),
+    NVolatile = KeyRange div 2,
+    prefill_table(T, KeyRange, NVolatile, fun(K) -> {KeyFun(K, volatile), 0} end),
+
+    InitF = fun (_) -> #{insert => 0, delete => 0,
+                         select_delete_bk => 0, select_delete_pbk => 0,
+                         select_replace_bk => 0, select_replace_pbk => 0}
+            end,
+    ExecF = fun (Counters) ->
+                    K = rand:uniform(KeyRange),
+                    Key = KeyFun(K, volatile),
+                    Acc = case rand:uniform(22) of
+                              R when R =< 10 ->
+                                  ets:insert(T, {Key}),
+                                  incr_counter(insert, Counters);
+                              R when R =< 15 ->
+                                  ets:delete(T, Key),
+                                  incr_counter(delete, Counters);
+                              R when R =< 19 ->
+                                  %% Delete bound key
+                                  ets:select_delete(T, [{{Key, '_'}, [], [true]}]),
+                                  incr_counter(select_delete_bk, Counters);
+                              R when R =< 20 ->
+                                  %% Delete partially bound key
+                                  ets:select_delete(T, [{{{K div 10, '_', volatile, '_'}, '_'}, [], [true]}]),
+                                  incr_counter(select_delete_pbk, Counters);
+                              R when R =< 21 ->
+                                  %% Replace bound key
+                                  ets:select_replace(T, [{{Key, '$1'}, [],
+                                                          [{{{const,Key}, {'+','$1',1}}}]}]),
+                                  incr_counter(select_replace_bk, Counters);
+                              _ ->
+                                  %% Replace partially bound key
+                                  ets:select_replace(T, [{{{K div 10, '_', volatile, '_'}, '$1'}, [],
+                                                          [{{{element,1,'$_'}, {'+','$1',1}}}]}]),
+                                  incr_counter(select_replace_pbk, Counters)
+                    end,
+                    receive stop ->
+                            [end_of_work | Acc]
+                    after 0 ->
+                            Acc
+                    end
+            end,
+    FiniF = fun (Acc) -> Acc end,
+    Pids = run_sched_workers(InitF, ExecF, FiniF, infinite),
+    timer:send_after(1000, stop),
+
+    Log2ChunkMax = math:log2(NStable*2),
+    Rounds = fun Loop(N) ->
+                     MS = [{{{'_', '_', stable, '_'}, '_'}, [], [true]}],
+                     NStable = ets:select_count(T, MS),
+                     NStable = count_stable(T, next, ets:first(T), 0),
+                     NStable = count_stable(T, prev, ets:last(T), 0),
+                     NStable = length(ets:select(T, MS)),
+                     NStable = length(ets:select_reverse(T, MS)),
+                     Chunk = round(math:pow(2, rand:uniform()*Log2ChunkMax)),
+                     NStable = ets_select_chunks_count(T, MS, Chunk),
+                     receive stop -> N
+                     after 0 -> Loop(N+1)
+                     end
+             end (1),
+    [P ! stop || P <- Pids],
+    Results = wait_pids(Pids),
+    io:format("Ops = ~p\n", [maps_sum(Results)]),
+    io:format("Diff = ~p\n", [ets:info(T,size) - NStable - NVolatile]),
+    io:format("Stats = ~p\n", [ets:info(T,stats)]),
+    io:format("Rounds = ~p\n", [Rounds]),
+    true = ets:delete(T),
+
+    %% Verify no leakage of offheap key data
+    ok = erts_test_utils:check_node_dist(),
+    ok.
+
+incr_counter(Name, Counters) ->
+    Counters#{Name => maps:get(Name, Counters, 0) + 1}.
+
+count_stable(T, Next, {_, _, stable, _}=Key, N) ->
+    count_stable(T, Next, ets:Next(T, Key), N+1);
+count_stable(T, Next, {_, _, volatile, _}=Key, N) ->
+    count_stable(T, Next, ets:Next(T, Key), N);
+count_stable(_, _, '$end_of_table', N) ->
+    N.
+
+ets_select_chunks_count(T, MS, Chunk) ->
+    ets_select_chunks_count(ets:select(T, MS, Chunk), 0).
+
+ets_select_chunks_count('$end_of_table', N) ->
+    N;
+ets_select_chunks_count({List, Continuation}, N) ->
+    ets_select_chunks_count(ets:select(Continuation),
+                           length(List) + N).
+
+maps_sum([Ma | Tail]) when is_map(Ma) ->
+    maps_sum([lists:sort(maps:to_list(Ma)) | Tail]);
+maps_sum([La, Mb | Tail]) ->
+    Lab = lists:zipwith(fun({K,Va}, {K,Vb}) -> {K,Va+Vb} end,
+                        La,
+                        lists:sort(maps:to_list(Mb))),
+    maps_sum([Lab | Tail]);
+maps_sum([L]) ->
+    L.
+
+
+
+
 %% Test different types.
 types(Config) when is_list(Config) ->
     init_externals(),
-    repeat_for_opts(fun types_do/1, [[set,ordered_set],compressed]).
+    repeat_for_opts(fun types_do/1, [repeat_for_opts_atom2list(set_types),
+                                     compressed]).
 
 types_do(Opts) ->
     EtsMem = etsmem(),
@@ -5874,7 +6490,7 @@ types_do(Opts) ->
 %% OTP-9932: Memory overwrite when inserting large integers in compressed bag.
 %% Will crash with segv on 64-bit opt if not fixed.
 otp_9932(Config) when is_list(Config) ->
-    T = ets:new(xxx, [bag, compressed]),
+    T = ets_new(xxx, [bag, compressed]),
     Fun = fun(N) ->
 		  Key = {1316110174588445 bsl N,1316110174588583 bsl N},
 		  S = {Key, Key},
@@ -5890,48 +6506,56 @@ otp_9932(Config) when is_list(Config) ->
 %% vm-deadlock caused by race between ets:delete and others on
 %% write_concurrency table.
 otp_9423(Config) when is_list(Config) ->
-    InitF = fun(_) -> {0,0} end,
-    ExecF = fun({S,F}) ->
-		    receive
-			stop ->
-			    io:format("~p got stop\n", [self()]),
-			    [end_of_work | {"Succeded=",S,"Failed=",F}]
-		    after 0 ->
-			    %%io:format("~p (~p) doing lookup\n", [self(), {S,F}]),
-			    try ets:lookup(otp_9423, key) of
-				[] -> {S+1,F}
-			    catch
-				error:badarg -> {S,F+1}
-			    end
-		    end
-	    end,
-    FiniF = fun(R) -> R end,
-    case run_smp_workers(InitF, ExecF, FiniF, infinite, 1) of
-	Pids when is_list(Pids) ->
-	    %%[P ! start || P <- Pids],
-	    repeat(fun() -> ets:new(otp_9423, [named_table, public, {write_concurrency,true}]),
-			    ets:delete(otp_9423)
-		   end, 10000),
-	    [P ! stop || P <- Pids],
-	    wait_pids(Pids),
-	    ok;
+    repeat_for_all_non_stim_set_table_types(
+      fun(Opts) ->
+              InitF = fun(_) -> {0,0} end,
+              ExecF = fun({S,F}) ->
+                              receive
+                                  stop ->
+                                      io:format("~p got stop\n", [self()]),
+                                      [end_of_work | {"Succeded=",S,"Failed=",F}]
+                              after 0 ->
+                                      %%io:format("~p (~p) doing lookup\n", [self(), {S,F}]),
+                                      try ets:lookup(otp_9423, key) of
+                                          [] -> {S+1,F}
+                                      catch
+                                          error:badarg -> {S,F+1}
+                                      end
+                              end
+                      end,
+              FiniF = fun(R) -> R end,
+              case run_smp_workers(InitF, ExecF, FiniF, infinite, 1) of
+                  Pids when is_list(Pids) ->
+                      %%[P ! start || P <- Pids],
+                      repeat(fun() -> ets_new(otp_9423, [named_table, public, 
+                                                         {write_concurrency,true}|Opts]),
+                                      ets:delete(otp_9423)
+                             end, 10000),
+                      [P ! stop || P <- Pids],
+                      wait_pids(Pids),
+                      ok;
+
+                  Skipped -> Skipped
+              end
+      end).
 
-	Skipped -> Skipped
-    end.
 
 
 %% Corrupted binary in compressed table
 otp_10182(Config) when is_list(Config) ->
-    Bin = <<"aHR0cDovL2hvb3RzdWl0ZS5jb20vYy9wcm8tYWRyb2xsLWFi">>,
-    Key = {test, Bin},
-    Value = base64:decode(Bin),
-    In = {Key,Value},
-    Db = ets:new(undefined, [set, protected, {read_concurrency, true}, compressed]),
-    ets:insert(Db, In),
-    [Out] = ets:lookup(Db, Key),
-    io:format("In :  ~p\nOut: ~p\n", [In,Out]),
-    ets:delete(Db),
-    In = Out.
+    repeat_for_opts_all_table_types(
+      fun(Opts) -> 
+              Bin = <<"aHR0cDovL2hvb3RzdWl0ZS5jb20vYy9wcm8tYWRyb2xsLWFi">>,
+              Key = {test, Bin},
+              Value = base64:decode(Bin),
+              In = {Key,Value},
+              Db = ets_new(undefined, Opts),
+              ets:insert(Db, In),
+              [Out] = ets:lookup(Db, Key),
+              io:format("In :  ~p\nOut: ~p\n", [In,Out]),
+              ets:delete(Db),
+              In = Out
+      end).
 
 %% Test that ets:all include/exclude tables that we know are created/deleted
 ets_all(Config) when is_list(Config) ->
@@ -6022,19 +6646,23 @@ take(Config) when is_list(Config) ->
     ets:insert(T1, {{'not',<<"immediate">>},ok}),
     [{{'not',<<"immediate">>},ok}] = ets:take(T1, {'not',<<"immediate">>}),
     %% Same with ordered tables.
-    T2 = ets_new(b, [ordered_set]),
-    [] = ets:take(T2, foo),
-    ets:insert(T2, {foo,bar}),
-    [] = ets:take(T2, bar),
-    [{foo,bar}] = ets:take(T2, foo),
-    [] = ets:tab2list(T2),
-    ets:insert(T2, {{'not',<<"immediate">>},ok}),
-    [{{'not',<<"immediate">>},ok}] = ets:take(T2, {'not',<<"immediate">>}),
-    %% Arithmetically-equal keys.
-    ets:insert(T2, [{1.0,float},{2,integer}]),
-    [{1.0,float}] = ets:take(T2, 1),
-    [{2,integer}] = ets:take(T2, 2.0),
-    [] = ets:tab2list(T2),
+    repeat_for_all_ord_set_table_types(
+      fun(Opts) ->
+              T2 = ets_new(b, Opts),
+              [] = ets:take(T2, foo),
+              ets:insert(T2, {foo,bar}),
+              [] = ets:take(T2, bar),
+              [{foo,bar}] = ets:take(T2, foo),
+              [] = ets:tab2list(T2),
+              ets:insert(T2, {{'not',<<"immediate">>},ok}),
+              [{{'not',<<"immediate">>},ok}] = ets:take(T2, {'not',<<"immediate">>}),
+              %% Arithmetically-equal keys.
+              ets:insert(T2, [{1.0,float},{2,integer}]),
+              [{1.0,float}] = ets:take(T2, 1),
+              [{2,integer}] = ets:take(T2, 2.0),
+              [] = ets:tab2list(T2),
+              ets:delete(T2)
+      end),
     %% Same with bag.
     T3 = ets_new(c, [bag]),
     ets:insert(T3, [{1,1},{1,2},{3,3}]),
@@ -6042,7 +6670,6 @@ take(Config) when is_list(Config) ->
     [{3,3}] = ets:take(T3, 3),
     [] = ets:tab2list(T3),
     ets:delete(T1),
-    ets:delete(T2),
     ets:delete(T3),
     ok.
 
@@ -6077,9 +6704,650 @@ whereis_table(Config) when is_list(Config) ->
 
     ok.
 
+
+%% The following help functions are used by
+%% throughput_benchmark. They are declared on the top level beacuse
+%% declaring them as function local funs cause a scalability issue.
+get_op([{_,O}], _RandNum) ->
+    O;
+get_op([{Prob,O}|Rest], RandNum) ->
+    case RandNum < Prob of
+        true -> O;
+        false -> get_op(Rest, RandNum)
+    end.
+do_op(Table, ProbHelpTab, Range, Operations) ->
+    RandNum = rand:uniform(),
+    Op = get_op(ProbHelpTab, RandNum),
+    #{ Op := TheOp} = Operations,
+    TheOp(Table, Range).
+do_work(WorksDoneSoFar, Table, ProbHelpTab, Range, Operations) ->
+    receive
+        stop -> WorksDoneSoFar
+    after
+        0 -> do_op(Table, ProbHelpTab, Range, Operations),
+             do_work(WorksDoneSoFar + 1, Table, ProbHelpTab, Range, Operations)
+    end.
+
+prefill_table(T, KeyRange, Num, ObjFun) ->
+    Parent = self(),
+    spawn_link(fun() ->
+                       prefill_table_helper(T, KeyRange, Num, ObjFun),
+                       Parent ! done
+               end),
+    receive done -> ok end.
+
+prefill_table_helper(T, KeyRange, Num, ObjFun) ->
+    Seed = rand:uniform(KeyRange),
+    %%io:format("prefill_table: Seed = ~p\n", [Seed]),
+    RState = unique_rand_start(KeyRange, Seed),
+    prefill_table_loop(T, RState, Num, ObjFun).
+
+prefill_table_loop(_, _, 0, _) ->
+    ok;
+prefill_table_loop(T, RS0, N, ObjFun) ->
+    {Key, RS1} = unique_rand_next(RS0),
+    ets:insert(T, ObjFun(Key)),
+    prefill_table_loop(T, RS1, N-1, ObjFun).
+
+inserter_proc_starter(T, ToInsert, Parent) ->
+    receive
+        start -> ok
+    end,
+    inserter_proc(T, ToInsert, [], Parent, false).
+
+inserter_proc(T, [], Inserted, Parent, _) ->
+    inserter_proc(T, Inserted, [], Parent, true);
+inserter_proc(T, [I | ToInsert], Inserted, Parent, CanStop) ->
+    Stop =
+        case CanStop of
+            true ->
+                receive
+                    stop -> Parent ! stopped
+                after 0 -> no_stop
+                end;
+            false -> no_stop
+        end,
+    case Stop of
+        no_stop ->
+            ets:insert(T, I),
+            inserter_proc(T, ToInsert, [I | Inserted], Parent, CanStop);
+        _ -> ok
+    end.
+
+prefill_table_parallel(T, KeyRange, Num, ObjFun) ->
+    Parent = self(),
+    spawn_link(fun() ->
+                       prefill_table_parallel_helper(T, KeyRange, Num, ObjFun),
+                       Parent ! done
+               end),
+    receive done -> ok end.
+
+prefill_table_parallel_helper(T, KeyRange, Num, ObjFun) ->
+    NrOfSchedulers = erlang:system_info(schedulers),
+    Seed = rand:uniform(KeyRange),
+    %%io:format("prefill_table: Seed = ~p\n", [Seed]),
+    RState = unique_rand_start(KeyRange, Seed),
+    InsertMap = prefill_insert_map_loop(T, RState, Num, ObjFun, #{}, NrOfSchedulers),
+    Self = self(),
+    Pids = [
+        begin
+            InserterFun =
+                fun() ->
+                    inserter_proc_starter(T, ToInsert, Self)
+                end,
+            spawn_link(InserterFun)
+        end
+        || ToInsert <- maps:values(InsertMap)],
+    [Pid ! start || Pid <- Pids],
+    timer:sleep(1000),
+    [Pid ! stop || Pid <- Pids],
+    [receive stopped -> ok end || _Pid <- Pids].
+
+prefill_insert_map_loop(_, _, 0, _, InsertMap, _NrOfSchedulers) ->
+    InsertMap;
+prefill_insert_map_loop(T, RS0, N, ObjFun, InsertMap, NrOfSchedulers) ->
+    {Key, RS1} = unique_rand_next(RS0),
+    Sched = N rem NrOfSchedulers,
+    PrevInserts = maps:get(Sched, InsertMap, []),
+    NewPrevInserts = [ObjFun(Key) | PrevInserts],
+    NewInsertMap = maps:put(Sched, NewPrevInserts, InsertMap),
+    prefill_insert_map_loop(T, RS1, N-1, ObjFun, NewInsertMap, NrOfSchedulers).
+
+-record(ets_throughput_bench_config,
+        {benchmark_duration_ms = 3000,
+         recover_time_ms = 1000,
+         thread_counts = not_set,
+         key_ranges = [1000000],
+         init_functions = [fun prefill_table/4],
+         nr_of_repeats = 1,
+         scenarios =
+             [
+              [
+               {0.5, insert},
+               {0.5, delete}
+              ],
+              [
+               {0.1, insert},
+               {0.1, delete},
+               {0.8, lookup}
+              ],
+              [
+               {0.01, insert},
+               {0.01, delete},
+               {0.98, lookup}
+              ],
+              [
+               {1.0, lookup}
+              ],
+              [
+               {0.1, insert},
+               {0.1, delete},
+               {0.4, lookup},
+               {0.4, nextseq10}
+              ],
+              [
+               {0.1, insert},
+               {0.1, delete},
+               {0.4, lookup},
+               {0.4, nextseq100}
+              ],
+              [
+               {0.1, insert},
+               {0.1, delete},
+               {0.4, lookup},
+               {0.4, nextseq1000}
+              ],
+              [
+               {1.0, nextseq1000}
+              ],
+              [
+               {0.1, insert},
+               {0.1, delete},
+               {0.79, lookup},
+               {0.01, selectAll}
+              ],
+              [
+               {0.1, insert},
+               {0.1, delete},
+               {0.7999, lookup},
+               {0.0001, selectAll}
+              ],
+              [
+               {0.1, insert},
+               {0.1, delete},
+               {0.799999, lookup},
+               {0.000001, selectAll}
+              ],
+              [
+               {0.1, insert},
+               {0.1, delete},
+               {0.79, lookup},
+               {0.01, partial_select1000}
+              ],
+              [
+               {0.1, insert},
+               {0.1, delete},
+               {0.7999, lookup},
+               {0.0001, partial_select1000}
+              ],
+              [
+               {0.1, insert},
+               {0.1, delete},
+               {0.799999, lookup},
+               {0.000001, partial_select1000}
+              ]
+             ],
+         table_types =
+             [
+              [ordered_set, public],
+              [ordered_set, public, {write_concurrency, true}],
+              [ordered_set, public, {read_concurrency, true}],
+              [ordered_set, public, {write_concurrency, true}, {read_concurrency, true}],
+              [set, public],
+              [set, public, {write_concurrency, true}],
+              [set, public, {read_concurrency, true}],
+              [set, public, {write_concurrency, true}, {read_concurrency, true}]
+             ],
+         etsmem_fun = fun() -> ok end,
+         verify_etsmem_fun = fun(_) -> true end,
+         notify_res_fun = fun(_Name, _Throughput) -> ok end,
+         print_result_paths_fun =
+             fun(ResultPath, _LatestResultPath) ->
+                     Comment =
+                         io_lib:format("<a href=\"file:///~s\">Result visualization</a>",[ResultPath]),
+                     {comment, Comment}
+             end
+       }).
+
+stdout_notify_res(ResultPath, LatestResultPath) ->
+    io:format("Result Location: /~s~n", [ResultPath]),
+    io:format("Latest Result Location: ~s~n", [LatestResultPath]).
+
+throughput_benchmark() ->
+    throughput_benchmark(
+      #ets_throughput_bench_config{
+         print_result_paths_fun = fun stdout_notify_res/2}).
+
+throughput_benchmark(
+  #ets_throughput_bench_config{
+     benchmark_duration_ms  = BenchmarkDurationMs,
+     recover_time_ms        = RecoverTimeMs,
+     thread_counts          = ThreadCountsOpt,
+     key_ranges             = KeyRanges,
+     init_functions         = InitFuns,
+     nr_of_repeats          = NrOfRepeats,
+     scenarios              = Scenarios,
+     table_types            = TableTypes,
+     etsmem_fun             = ETSMemFun,
+     verify_etsmem_fun      = VerifyETSMemFun,
+     notify_res_fun         = NotifyResFun,
+     print_result_paths_fun = PrintResultPathsFun}) ->
+    NrOfSchedulers = erlang:system_info(schedulers),
+    %% Definitions of operations that are supported by the benchmark
+    NextSeqOp =
+        fun (T, KeyRange, SeqSize) ->
+                Start = rand:uniform(KeyRange),
+                Last =
+                    lists:foldl(
+                      fun(_, Prev) ->
+                              case Prev of
+                                  '$end_of_table'-> ok;
+                                  _ ->
+                                      try ets:next(T, Prev) of
+                                           Normal -> Normal
+                                       catch
+                                           error:badarg ->
+                                               % sets (not ordered_sets) cannot handle when the argument
+                                               % to next is not in the set
+                                               rand:uniform(KeyRange)
+                                       end
+                              end
+                      end,
+                      Start,
+                      lists:seq(1, SeqSize)),
+                case Last =:= -1 of
+                    true -> io:format("Will never be printed");
+                    false -> ok
+                end
+        end,
+    PartialSelectOp =
+        fun (T, KeyRange, SeqSize) ->
+                Start = rand:uniform(KeyRange),
+                Last = Start + SeqSize,
+                case -1 =:= ets:select_count(T,
+                                             ets:fun2ms(fun({X}) when X > Start andalso X =< Last  -> true end)) of
+                    true -> io:format("Will never be printed");
+                    false -> ok
+                end
+
+        end,
+    %% Mapping benchmark operation names to their corresponding functions that do them
+    Operations =
+        #{insert =>
+              fun(T,KeyRange) ->
+                      Num = rand:uniform(KeyRange),
+                      ets:insert(T, {Num})
+              end,
+          delete =>
+              fun(T,KeyRange) ->
+                      Num = rand:uniform(KeyRange),
+                      ets:delete(T, Num)
+              end,
+          lookup =>
+              fun(T,KeyRange) ->
+                      Num = rand:uniform(KeyRange),
+                      ets:lookup(T, Num)
+              end,
+          nextseq10 =>
+              fun(T,KeyRange) -> NextSeqOp(T,KeyRange,10) end,
+          nextseq100 =>
+              fun(T,KeyRange) -> NextSeqOp(T,KeyRange,100) end,
+          nextseq1000 =>
+              fun(T,KeyRange) -> NextSeqOp(T,KeyRange,1000) end,
+          selectAll =>
+              fun(T,_KeyRange) ->
+                      case -1 =:= ets:select_count(T, ets:fun2ms(fun(_X) -> true end)) of
+                          true -> io:format("Will never be printed");
+                          false -> ok
+                      end
+              end,
+          partial_select1000 =>
+              fun(T,KeyRange) -> PartialSelectOp(T,KeyRange,1000) end
+         },
+    %% Helper functions
+    CalculateThreadCounts = fun Calculate([Count|Rest]) ->
+                                    case Count > NrOfSchedulers of
+                                        true -> lists:reverse(Rest);
+                                        false -> Calculate([Count*2,Count|Rest])
+                                    end
+                            end,
+    CalculateOpsProbHelpTab =
+        fun Calculate([{_, OpName}], _) ->
+                [{1.0, OpName}];
+            Calculate([{OpPropability, OpName}|Res], Current) ->
+                NewCurrent = Current + OpPropability,
+                [{NewCurrent, OpName}| Calculate(Res, NewCurrent)]
+        end,
+    RenderScenario =
+        fun R([], StringSoFar) ->
+                StringSoFar;
+            R([{Fraction, Operation}], StringSoFar) ->
+                io_lib:format("~s ~f% ~p",[StringSoFar, Fraction * 100.0, Operation]);
+            R([{Fraction, Operation}|Rest], StringSoFar) ->
+                R(Rest,
+                  io_lib:format("~s ~f% ~p, ",[StringSoFar, Fraction * 100.0, Operation]))
+        end,
+    SafeFixTableIfRequired =
+        fun(Table, Scenario, On) ->
+                case set =:= ets:info(Table, type) of
+                    true ->
+                        HasNotRequiringOp  =
+                            lists:search(
+                              fun({_,nextseq10}) -> true;
+                                 ({_,nextseq100}) -> true;
+                                 ({_,nextseq1000}) -> true;
+                                 (_) -> false
+                              end, Scenario),
+                        case HasNotRequiringOp of
+                            false -> ok;
+                            _ -> ets:safe_fixtable(Table, On)
+                        end;
+                    false -> ok
+                end
+        end,
+    DataHolder =
+        fun DataHolderFun(Data)->
+                receive
+                    {get_data, Pid} -> Pid ! {ets_bench_data, Data};
+                    D -> DataHolderFun([Data,D])
+                end
+        end,
+    DataHolderPid = spawn_link(fun()-> DataHolder([]) end),
+    PrintData =
+        fun (Str, List) ->
+                io:format(Str, List),
+                DataHolderPid ! io_lib:format(Str, List)
+        end,
+    GetData =
+        fun () ->
+                DataHolderPid ! {get_data, self()},
+                receive {ets_bench_data, Data} -> Data end
+        end,
+    %% Function that runs a benchmark instance and returns the number
+    %% of operations that were performed
+    RunBenchmark =
+        fun({NrOfProcs, TableConfig, Scenario, Range, Duration, InitFun}) ->
+                ProbHelpTab = CalculateOpsProbHelpTab(Scenario, 0),
+                Table = ets:new(t, TableConfig),
+                Nobj = Range div 2,
+                case InitFun of
+                    not_set -> prefill_table(Table, Range, Nobj, fun(K) -> {K} end);
+                    _ -> InitFun(Table, Range, Nobj, fun(K) -> {K} end)
+                end,
+                Nobj = ets:info(Table, size),
+                SafeFixTableIfRequired(Table, Scenario, true),
+                ParentPid = self(),
+                Worker =
+                    fun() ->
+                            receive start -> ok end,
+                            WorksDone =
+                                do_work(0, Table, ProbHelpTab, Range, Operations),
+                            ParentPid ! WorksDone
+                    end,
+                ChildPids =
+                    lists:map(fun(_N) ->spawn_link(Worker)end, lists:seq(1, NrOfProcs)),
+                erlang:garbage_collect(),
+                timer:sleep(RecoverTimeMs),
+                lists:foreach(fun(Pid) -> Pid ! start end, ChildPids),
+                timer:sleep(Duration),
+                lists:foreach(fun(Pid) -> Pid ! stop end, ChildPids),
+                TotalWorksDone = lists:foldl(
+                                   fun(_, Sum) ->
+                                           receive
+                                               Count -> Sum + Count
+                                           end
+                                   end, 0, ChildPids),
+                SafeFixTableIfRequired(Table, Scenario, false),
+                ets:delete(Table),
+                TotalWorksDone
+        end,
+    RunBenchmarkInSepProcess =
+        fun(ParameterTuple) ->
+                P = self(),
+                Results =
+                    [begin
+                         spawn_link(fun()-> P ! {bench_result, RunBenchmark(ParameterTuple)} end),
+                         receive {bench_result, Res} -> Res end
+                     end || _ <- lists:seq(1, NrOfRepeats)],
+                lists:sum(Results) / NrOfRepeats
+        end,
+    RunBenchmarkAndReport =
+        fun(ThreadCount,
+            TableType,
+            Scenario,
+            KeyRange,
+            Duration,
+            InitFunName,
+            InitFun) ->
+                Result = RunBenchmarkInSepProcess({ThreadCount,
+                                                   TableType,
+                                                   Scenario,
+                                                   KeyRange,
+                                                   Duration,
+                                                   InitFun}),
+                Throughput = Result/(Duration/1000.0),
+                PrintData("; ~f",[Throughput]),
+                Name = io_lib:format("Scenario: ~s, ~w, Key Range Size: ~w, "
+                                     "# of Processes: ~w, Table Type: ~w",
+                                     [InitFunName, Scenario, KeyRange, ThreadCount, TableType]),
+                NotifyResFun(Name, Throughput)
+        end,
+    ThreadCounts =
+        case ThreadCountsOpt of
+            not_set ->
+                CalculateThreadCounts([1]);
+            _ -> ThreadCountsOpt
+        end,
+    %% Run the benchmark
+    PrintData("# Each instance of the benchmark runs for ~w seconds:~n", [BenchmarkDurationMs/1000]),
+    PrintData("# The result of a benchmark instance is presented as a number representing~n",[]),
+    PrintData("# the number of operations performed per second:~n~n~n",[]),
+    PrintData("# To plot graphs for the results below:~n",[]),
+    PrintData("# 1. Open \"$ERL_TOP/lib/stdlib/test/ets_SUITE_data/visualize_throughput.html\" in a web browser~n",[]),
+    PrintData("# 2. Copy the lines between \"#BENCHMARK STARTED$\" and \"#BENCHMARK ENDED$\" below~n",[]),
+    PrintData("# 3. Paste the lines copied in step 2 to the text box in the browser window opened in~n",[]),
+    PrintData("#    step 1 and press the Render button~n~n",[]),
+    PrintData("#BENCHMARK STARTED$~n",[]),
+    EtsMem = ETSMemFun(),
+    %% The following loop runs all benchmark scenarios and prints the results (i.e, operations/second)
+    lists:foreach(
+      fun(KeyRange) ->
+              lists:foreach(
+                fun(Scenario) ->
+                        PrintData("Scenario: ~s | Key Range Size: ~w$~n",
+                                  [RenderScenario(Scenario, ""), KeyRange]),
+                        lists:foreach(
+                          fun(ThreadCount) ->
+                                  PrintData("; ~w",[ThreadCount])
+                          end,
+                          ThreadCounts),
+                        PrintData("$~n",[]),
+                        lists:foreach(
+                          fun(TableType) ->
+                                  lists:foreach(
+                                    fun(InitFunArg) ->
+                                            {InitFunName, InitFun} =
+                                                case InitFunArg of
+                                                    {FunName, Fun} -> {FunName, Fun};
+                                                    Fun -> {"", Fun}
+                                                end,
+                                            PrintData("~s,~w ",[InitFunName,TableType]),
+                                            lists:foreach(
+                                              fun(ThreadCount) ->
+                                                      RunBenchmarkAndReport(ThreadCount,
+                                                                            TableType,
+                                                                            Scenario,
+                                                                            KeyRange,
+                                                                            BenchmarkDurationMs,
+                                                                            InitFunName,
+                                                                            InitFun)
+                                              end,
+                                              ThreadCounts),
+                                            PrintData("$~n",[])
+                                    end,
+                                    InitFuns)
+
+                          end,
+                          TableTypes)
+                end,
+                Scenarios)
+      end,
+      KeyRanges),
+    PrintData("~n#BENCHMARK ENDED$~n~n",[]),
+    VerifyETSMemFun(EtsMem),
+    DataDir = filename:join(filename:dirname(code:which(?MODULE)), "ets_SUITE_data"),
+    TemplatePath = filename:join(DataDir, "visualize_throughput.html"),
+    {ok, Template} = file:read_file(TemplatePath),
+    OutputData = string:replace(Template, "#bench_data_placeholder", GetData()),
+    OutputPath1 = filename:join(DataDir, "ets_bench_result.html"),
+    {{Year, Month, Day}, {Hour, Minute, Second}} = calendar:now_to_datetime(erlang:timestamp()),
+    StrTime = lists:flatten(io_lib:format("~4..0w-~2..0w-~2..0wT~2..0w:~2..0w:~2..0w",[Year,Month,Day,Hour,Minute,Second])),
+    OutputPath2 = filename:join(DataDir, io_lib:format("ets_bench_result_~s.html", [StrTime])),
+    file:write_file(OutputPath1, OutputData),
+    file:write_file(OutputPath2, OutputData),
+    PrintResultPathsFun(OutputPath2, OutputPath1).
+
+test_throughput_benchmark(Config) when is_list(Config) ->
+    throughput_benchmark(
+      #ets_throughput_bench_config{
+         benchmark_duration_ms = 100,
+         recover_time_ms = 0,
+         thread_counts = [1, erlang:system_info(schedulers)],
+         key_ranges = [50000],
+         etsmem_fun = fun etsmem/0,
+         verify_etsmem_fun = fun verify_etsmem/1}).
+
+long_throughput_benchmark(Config) when is_list(Config) ->
+    N = erlang:system_info(schedulers),
+    throughput_benchmark(
+      #ets_throughput_bench_config{
+         benchmark_duration_ms = 3000,
+         recover_time_ms = 1000,
+         thread_counts = [1, N div 2, N],
+         key_ranges = [1000000],
+         scenarios =
+             [
+              [
+               {0.5, insert},
+               {0.5, delete}
+              ],
+              [
+               {0.1, insert},
+               {0.1, delete},
+               {0.8, lookup}
+              ],
+              [
+               {0.01, insert},
+               {0.01, delete},
+               {0.98, lookup}
+              ],
+              [
+               {0.1, insert},
+               {0.1, delete},
+               {0.4, lookup},
+               {0.4, nextseq100}
+              ],
+              [
+               {0.1, insert},
+               {0.1, delete},
+               {0.79, lookup},
+               {0.01, selectAll}
+              ],
+              [
+               {0.1, insert},
+               {0.1, delete},
+               {0.79, lookup},
+               {0.01, partial_select1000}
+              ]
+             ],
+         table_types =
+             [
+              [ordered_set, public, {write_concurrency, true}, {read_concurrency, true}],
+              [set, public, {write_concurrency, true}, {read_concurrency, true}]
+             ],
+         etsmem_fun = fun etsmem/0,
+         verify_etsmem_fun = fun verify_etsmem/1,
+         notify_res_fun =
+             fun(Name, Throughput) ->
+                     SummaryTable =
+                         proplists:get_value(ets_benchmark_result_summary_tab, Config),
+                     AddToSummaryCounter =
+                         case SummaryTable of
+                             undefined ->
+                                 fun(_, _) ->
+                                         ok
+                                 end;
+                             Tab ->
+                                 fun(CounterName, ToAdd) ->
+                                         OldVal = ets:lookup_element(Tab, CounterName, 2),
+                                         NewVal = OldVal + ToAdd,
+                                         ets:insert(Tab, {CounterName, NewVal})
+                                 end
+                         end,
+                     Record =
+                         fun(NoOfBenchsCtr, TotThrputCtr) ->
+                                 AddToSummaryCounter(NoOfBenchsCtr, 1),
+                                 AddToSummaryCounter(TotThrputCtr, Throughput)
+                         end,
+                     Record(nr_of_benchmarks, total_throughput),
+                     case string:find(Name, "ordered_set") of
+                         nomatch ->
+                             Record(nr_of_set_benchmarks, total_throughput_set);
+                         _ ->
+                             Record(nr_of_ordered_set_benchmarks,
+                                    total_throughput_ordered_set)
+                     end,
+                     ct_event:notify(
+                          #event{name = benchmark_data,
+                                 data = [{suite,"ets_bench"},
+                                         {name, Name},
+                                         {value,Throughput}]})
+             end
+        }).
+
+%% This function compares the lookup operation's performance for
+%% ordered_set ETS tables with and without write_concurrency enabled
+%% when the data structures have been populated in parallel and
+%% sequentially.
 %%
-%% Utility functions:
-%%
+%% The main purpose of this function is to check that the
+%% implementation of ordered_set with write_concurrency (CA tree)
+%% adapts its structure to contention even when only lookup operations
+%% are used.
+lookup_catree_par_vs_seq_init_benchmark() ->
+    N = erlang:system_info(schedulers),
+    throughput_benchmark(
+      #ets_throughput_bench_config{
+         benchmark_duration_ms = 600000,
+         recover_time_ms = 1000,
+         thread_counts = [1, N div 2, N],
+         key_ranges = [1000000],
+         init_functions = [{"seq_init", fun prefill_table/4},
+                           {"par_init", fun prefill_table_parallel/4}],
+         nr_of_repeats = 1,
+         scenarios =
+             [
+              [
+               {1.0, lookup}
+              ]
+             ],
+         table_types =
+             [
+              [ordered_set, public, {write_concurrency, true}],
+              [ordered_set, public]
+             ],
+          print_result_paths_fun = fun stdout_notify_res/2
+        }).
 
 add_lists(L1,L2) ->
     add_lists(L1,L2,[]).
@@ -6140,8 +7408,11 @@ wait_pids(Pids, Acc) ->
 	{Pid,Result} ->
 	    true = lists:member(Pid,Pids),
 	    Others = lists:delete(Pid,Pids),
-	    io:format("wait_pid got ~p from ~p, still waiting for ~p\n",[Result,Pid,Others]),
+	    %%io:format("wait_pid got ~p from ~p\n",[Result,Pid]),
 	    wait_pids(Others,[Result | Acc])
+    after 60*1000 ->
+	    io:format("Still waiting for workers ~p\n",[Pids]),
+            wait_pids(Pids, Acc)
     end.
 
 
@@ -6165,48 +7436,25 @@ wait_for_memory_deallocations() ->
 	    wait_for_memory_deallocations()
     end.
 
-
 etsmem() ->
-    wait_for_memory_deallocations(),
-
-    AllTabs = lists:map(fun(T) -> {T,ets:info(T,name),ets:info(T,size),
-				   ets:info(T,memory),ets:info(T,type)}
-			end, ets:all()),
-
-    EtsAllocInfo = erlang:system_info({allocator,ets_alloc}),
-    ErlangMemoryEts = try erlang:memory(ets) catch error:notsup -> notsup end,
-
-    Mem =
-	{ErlangMemoryEts,
-	 case EtsAllocInfo of
-	     false -> undefined;
-	     MemInfo ->
-		 CS = lists:foldl(
-			fun ({instance, _, L}, Acc) ->
-				{value,{mbcs,MBCS}} = lists:keysearch(mbcs, 1, L),
-				{value,{sbcs,SBCS}} = lists:keysearch(sbcs, 1, L),
-				NewAcc = [MBCS, SBCS | Acc],
-				case lists:keysearch(mbcs_pool, 1, L) of
-				    {value,{mbcs_pool, MBCS_POOL}} ->
-					[MBCS_POOL|NewAcc];
-				    _ -> NewAcc
-				end
-			end,
-			[],
-			MemInfo),
-		 lists:foldl(
-		   fun(L, {Bl0,BlSz0}) ->
-			   {value,BlTup} = lists:keysearch(blocks, 1, L),
-			   blocks = element(1, BlTup),
-			   Bl = element(2, BlTup),
-			   {value,BlSzTup} = lists:keysearch(blocks_size, 1, L),
-			   blocks_size = element(1, BlSzTup),
-			   BlSz = element(2, BlSzTup),
-			   {Bl0+Bl,BlSz0+BlSz}
-		   end, {0,0}, CS)
-	 end},
-    {Mem,AllTabs}.
+    % The following is done twice to avoid an inconsistent memory
+    % "snapshot" (see verify_etsmem/2).
+    lists:foldl(
+      fun(_,_) ->
+              wait_for_memory_deallocations(),
 
+              AllTabs = lists:map(fun(T) -> {T,ets:info(T,name),ets:info(T,size),
+                                             ets:info(T,memory),ets:info(T,type)}
+                                  end, ets:all()),
+
+              EtsAllocSize = erts_debug:alloc_blocks_size(ets_alloc),
+              ErlangMemoryEts = try erlang:memory(ets) catch error:notsup -> notsup end,
+
+              Mem = {ErlangMemoryEts, EtsAllocSize},
+              {Mem, AllTabs}
+      end,
+      not_used,
+      lists:seq(1,2)).
 
 verify_etsmem(MI) ->
     wait_for_test_procs(),
@@ -6227,15 +7475,15 @@ verify_etsmem({MemInfo,AllTabs}, Try) ->
 	    end;
 
 	{MemInfo2, AllTabs2} ->
-	    io:format("Expected: ~p", [MemInfo]),
-	    io:format("Actual:   ~p", [MemInfo2]),
-	    io:format("Changed tables before: ~p\n",[AllTabs -- AllTabs2]),
-	    io:format("Changed tables after: ~p\n", [AllTabs2 -- AllTabs]),
+	    io:format("#Expected: ~p", [MemInfo]),
+	    io:format("#Actual:   ~p", [MemInfo2]),
+	    io:format("#Changed tables before: ~p\n",[AllTabs -- AllTabs2]),
+	    io:format("#Changed tables after: ~p\n", [AllTabs2 -- AllTabs]),
             case Try < 2 of
                 true ->
-                    io:format("\nThis discrepancy could be caused by an "
+                    io:format("\n#This discrepancy could be caused by an "
                               "inconsistent memory \"snapshot\""
-                              "\nTry again...\n", []),
+                              "\n#Try again...\n", []),
                     verify_etsmem({MemInfo, AllTabs}, Try+1);
                 false ->
                     ct:fail("Failed memory check")
@@ -6709,22 +7957,49 @@ make_unaligned_sub_binary(List) ->
 repeat_for_opts(F) ->
     repeat_for_opts(F, [write_concurrency, read_concurrency, compressed]).
 
+repeat_for_opts_all_table_types(F) ->
+    repeat_for_opts(F, [all_types, write_concurrency, read_concurrency, compressed]).
+
+repeat_for_opts_all_non_stim_table_types(F) ->
+    repeat_for_opts(F, [all_non_stim_types, write_concurrency, read_concurrency, compressed]).
+
+repeat_for_opts_all_set_table_types(F) ->
+    repeat_for_opts(F, [set_types, write_concurrency, read_concurrency, compressed]).
+
+repeat_for_all_set_table_types(F) ->
+    repeat_for_opts(F, [set_types]).
+
+repeat_for_all_ord_set_table_types(F) ->
+    repeat_for_opts(F, [ord_set_types]).
+
+repeat_for_all_non_stim_set_table_types(F) ->
+    repeat_for_opts(F, [all_non_stim_set_types]).
+
+repeat_for_opts_all_ord_set_table_types(F) ->
+    repeat_for_opts(F, [ord_set_types, write_concurrency, read_concurrency, compressed]).
+
 repeat_for_opts(F, OptGenList) when is_function(F, 1) ->
     repeat_for_opts(F, OptGenList, []).
 
 repeat_for_opts(F, [], Acc) ->
     lists:foldl(fun(Opts, RV_Acc) ->
 			OptList = lists:filter(fun(E) -> E =/= void end, Opts),
-			io:format("Calling with options ~p\n",[OptList]),
-			RV = F(OptList),
-			case RV_Acc of
-			    {comment,_} -> RV_Acc;
-			    _ -> case RV of
-				     {comment,_} -> RV;
-				     _ -> [RV | RV_Acc]
-				 end
-			end
-		end, [], Acc);
+                        case is_redundant_opts_combo(OptList) of
+                            true ->
+                                %%io:format("Ignoring redundant options ~p\n",[OptList]),
+                                ok;
+                            false ->
+                                io:format("Calling with options ~p\n",[OptList]),
+                                RV = F(OptList),
+                                case RV_Acc of
+                                    {comment,_} -> RV_Acc;
+                                    _ -> case RV of
+                                             {comment,_} -> RV;
+                                             _ -> [RV | RV_Acc]
+                                         end
+                                end
+                        end
+                end, [], Acc);
 repeat_for_opts(F, [OptList | Tail], []) when is_list(OptList) ->
     repeat_for_opts(F, Tail, [[Opt] || Opt <- OptList]);
 repeat_for_opts(F, [OptList | Tail], AccList) when is_list(OptList) ->
@@ -6732,14 +8007,127 @@ repeat_for_opts(F, [OptList | Tail], AccList) when is_list(OptList) ->
 repeat_for_opts(F, [Atom | Tail], AccList) when is_atom(Atom) ->
     repeat_for_opts(F, [repeat_for_opts_atom2list(Atom) | Tail ], AccList).
 
-repeat_for_opts_atom2list(all_types) -> [set,ordered_set,bag,duplicate_bag];
+repeat_for_opts_atom2list(set_types) -> [set,ordered_set,stim_cat_ord_set,cat_ord_set];
+repeat_for_opts_atom2list(ord_set_types) -> [ordered_set,stim_cat_ord_set,cat_ord_set];
+repeat_for_opts_atom2list(all_types) -> [set,ordered_set,stim_cat_ord_set,cat_ord_set,bag,duplicate_bag];
+repeat_for_opts_atom2list(all_non_stim_types) -> [set,ordered_set,cat_ord_set,bag,duplicate_bag];
+repeat_for_opts_atom2list(all_non_stim_set_types) -> [set,ordered_set,cat_ord_set];
 repeat_for_opts_atom2list(write_concurrency) -> [{write_concurrency,false},{write_concurrency,true}];
 repeat_for_opts_atom2list(read_concurrency) -> [{read_concurrency,false},{read_concurrency,true}];
 repeat_for_opts_atom2list(compressed) -> [compressed,void].
 
-ets_new(Name, Opts) ->
-    %%ets:new(Name, [compressed | Opts]).
-    ets:new(Name, Opts).
+is_redundant_opts_combo(Opts) ->
+    (lists:member(stim_cat_ord_set, Opts) orelse
+     lists:member(cat_ord_set, Opts))
+        andalso
+    (lists:member({write_concurrency, false}, Opts) orelse
+     lists:member(private, Opts) orelse
+     lists:member(protected, Opts)).
+
+%% Add fake table option with info about key range.
+%% Will be consumed by ets_new and used for stim_cat_ord_set.
+key_range(Opts, KeyRange) ->
+    [{key_range, KeyRange} | Opts].
+
+ets_new(Name, Opts0) ->
+    {KeyRange, Opts1} = case lists:keytake(key_range, 1, Opts0) of
+                            {value, {key_range, KR}, Rest1} ->
+                                {KR, Rest1};
+                            false ->
+                                {1000*1000, Opts0}
+                        end,
+    ets_new(Name, Opts1, KeyRange).
+
+ets_new(Name, Opts, KeyRange) ->
+    ets_new(Name, Opts, KeyRange, fun id/1).
+
+ets_new(Name, Opts0, KeyRange, KeyFun) ->
+    {CATree, Stimulate, RevOpts} =
+        lists:foldl(fun(cat_ord_set, {false, false, Lacc}) ->
+                            {true, false, [ordered_set | Lacc]};
+                       (stim_cat_ord_set, {false, false, Lacc}) ->
+                            {true, true, [ordered_set | Lacc]};
+                       (Other, {CAT, STIM, Lacc}) ->
+                            {CAT, STIM, [Other | Lacc]}
+                    end,
+                    {false, false, []},
+                    Opts0),
+    Opts = lists:reverse(RevOpts),
+    EtsNewHelper = 
+        fun (UseOpts) ->
+                case get(ets_new_opts) of
+                    UseOpts ->
+                        silence; %% suppress identical table opts spam
+                    _ ->
+                        put(ets_new_opts, UseOpts),
+                        io:format("ets:new(~p, ~p)~n", [Name, UseOpts])
+                end,
+                ets:new(Name, UseOpts)
+        end,
+    case CATree andalso
+        (not lists:member({write_concurrency, false}, Opts)) andalso
+        (not lists:member(private, Opts)) andalso
+        (not lists:member(protected, Opts)) of
+        true ->
+            NewOpts1 = 
+                case lists:member({write_concurrency, true}, Opts) of
+                    true -> Opts;
+                    false -> [{write_concurrency, true}|Opts]
+                end,
+            NewOpts2 = 
+                case lists:member(public, NewOpts1) of
+                    true -> NewOpts1;
+                    false -> [public|NewOpts1]
+                end,
+            T = EtsNewHelper(NewOpts2),
+            case Stimulate of
+                false -> ok;
+                true -> stimulate_contention(T, KeyRange, KeyFun)
+            end,
+            T;
+        false ->
+            EtsNewHelper(Opts)
+    end.
+
+% The purpose of this function is to stimulate fine grained locking in
+% tables of types ordered_set with the write_concurrency options
+% turned on. The erts_debug feature 'ets_force_split' is used to easier
+% generate a routing tree with fine grained locking without having to
+% provoke lots of actual lock contentions.
+stimulate_contention(Tid, KeyRange, KeyFun) ->
+    T = case Tid of
+            A when is_atom(A) -> ets:whereis(A);
+            _ -> Tid
+        end,
+    erts_debug:set_internal_state(ets_force_split, {T, true}),
+    Num = case KeyRange > 50 of
+              true -> 50;
+              false -> KeyRange
+          end,
+    Seed = rand:uniform(KeyRange),
+    %%io:format("prefill_table: Seed = ~p\n", [Seed]),
+    RState = unique_rand_start(KeyRange, Seed),
+    stim_inserter_loop(T, RState, Num, KeyFun),
+    Num = ets:info(T, size),
+    ets:match_delete(T, {'$1','$1','$1'}),
+    0 = ets:info(T, size),
+    erts_debug:set_internal_state(ets_force_split, {T, false}),
+    case ets:info(T,stats) of
+        {0, _, _} ->
+            io:format("No routing nodes in table?\n"
+                      "Debug feature 'ets_force_split' does not seem to work.\n", []),
+            ct:fail("No ets_force_split?");
+        Stats ->
+            io:format("stimulated ordered_set: ~p\n", [Stats])
+    end.
+
+stim_inserter_loop(_, _, 0, _) ->
+    ok;
+stim_inserter_loop(T, RS0, N, KeyFun) ->
+    {K, RS1} = unique_rand_next(RS0),
+    Key = KeyFun(K),
+    ets:insert(T, {Key, Key, Key}),
+    stim_inserter_loop(T, RS1, N-1, KeyFun).
 
 do_tc(Do, Report) ->
     T1 = erlang:monotonic_time(),
@@ -6753,3 +8141,50 @@ syrup_factor() ->
         valgrind -> 20;
         _ -> 1
     end.
+
+
+%%
+%% This is a pseudo random number generator for UNIQUE integers.
+%% All integers between 1 and Max will be generated before it repeat itself.
+%% It's a variant of this one using quadratic residues by Jeff Preshing:
+%% http://preshing.com/20121224/how-to-generate-a-sequence-of-unique-random-integers/
+%%
+unique_rand_start(Max, Seed) ->
+    L = lists:dropwhile(fun(P) -> P < Max end,
+                        primes_3mod4()),
+    [P | _] = case L of
+                      [] ->
+                          error("Random range too large");
+                      _ ->
+                          L
+                  end,
+    3 = P rem 4,
+    {0, {Max, P, Seed}}.
+
+unique_rand_next({N, {Max, P, Seed}=Const}) ->
+    case dquad(P, N, Seed) + 1 of
+        RND when RND > Max ->  % Too large, skip
+            unique_rand_next({N+1, Const});
+        RND ->
+            {RND, {N+1, Const}}
+    end.
+
+%% A one-to-one relation between all integers 0 =< X < Prime
+%% if Prime rem 4 == 3.
+quad(Prime, X) ->
+    Rem = X*X rem Prime,
+    case 2*X < Prime of
+        true ->
+            Rem;
+        false ->
+            Prime - Rem
+    end.
+
+dquad(Prime, X, Seed) ->
+    quad(Prime, (quad(Prime, X) + Seed) rem Prime).
+
+%% Primes where P rem 4 == 3.
+primes_3mod4() ->
+    [103, 211, 503, 1019, 2003, 5003, 10007, 20011, 50023,
+     100003, 200003, 500083, 1000003, 2000003, 5000011,
+     10000019, 20000003, 50000047, 100000007].
diff --git a/lib/stdlib/test/ets_SUITE_data/visualize_throughput.html b/lib/stdlib/test/ets_SUITE_data/visualize_throughput.html
new file mode 100644
index 0000000000..27d6849c60
--- /dev/null
+++ b/lib/stdlib/test/ets_SUITE_data/visualize_throughput.html
@@ -0,0 +1,253 @@
+<!doctype html>
+<html lang="en">
+
+<!-- %% -->
+<!-- %% %CopyrightBegin% -->
+<!-- %% -->
+<!-- %% Copyright Ericsson AB and Kjell Winblad 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. -->
+<!-- %% 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% -->
+<!-- %% -->
+<!-- %% Author: Kjell Winblad -->
+<!-- %% -->
+  
+  <head>
+    <meta charset="utf-8">
+    <title>ETS Benchmark Result Viewer</title>
+  </head>
+
+  <body>
+    <div id="insertPlaceholder"></div>
+    <h1>ETS Benchmark Result Viewer</h1>
+    <p>
+      This page generates graphs from data produced by the ETS benchmark which is defined in the function <code>ets_SUITE:throughput_benchmark/0</code> (see "<code>$ERL_TOP/lib/stdlib/test/ets_SUITE.erl</code>").
+    </p>
+    <p>
+      Note that one can paste results from several benchmark runs into the field below. Results from the same scenario but from different benchmark runs will be relabeled and ploted in the same graph automatically. This makes comparisons of different ETS versions easy. 
+    </p>
+    <p>
+      Note also that that lines can be hidden by clicking on the corresponding label.
+    </p>
+    Paste the generated data in the field below and press the Render button:
+    <br>
+    <textarea id="dataField" rows="4" cols="50">#bench_data_placeholder</textarea> 
+    <br>
+    <input type="checkbox" id="barPlot"> Bar Plot
+    <br>
+    <input type="checkbox" id="sameSpacing" checked> Same X Spacing Between Points
+    <br>
+    <input type="checkbox" class="showCheck" value="[ordered_set,public]" checked> Show <code>[ordered_set,public]</code>
+    <br>
+    <input type="checkbox" class="showCheck" value="[ordered_set,public,{write_concurrency,true}]" checked> Show <code>[ordered_set,public,{write_concurrency,true}]</code>
+    <br>
+    <input type="checkbox" class="showCheck" value="[ordered_set,public,{read_concurrency,true}]" checked> Show <code>[ordered_set,public,{read_concurrency,true}]</code>
+    <br>
+    <input type="checkbox" class="showCheck" value="[ordered_set,public,{write_concurrency,true},{read_concurrency,true}]" checked> Show <code>[ordered_set,public,{write_concurrency,true},{read_concurrency,true}]</code>
+    <br>
+    <input type="checkbox" class="showCheck" value="[set,public]" checked> Show <code>[set,public]</code>
+    <br>
+    <input type="checkbox" class="showCheck" value="[set,public,{write_concurrency,true}]" checked> Show <code>[set,public,{write_concurrency,true}]</code>
+    <br>
+    <input type="checkbox" class="showCheck" value="[set,public,{read_concurrency,true}]" checked> Show <code>[set,public,{read_concurrency,true}]</code>
+    <br>
+    <input type="checkbox" class="showCheck" value="[set,public,{write_concurrency,true},{read_concurrency,true}]" checked> Show <code>[set,public,{write_concurrency,true},{read_concurrency,true}]</code>
+    <br>
+    <button id="renderButton" type="button">Render</button> 
+    
+    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
+	    integrity="sha256-3edrmyuQ0w65f8gfBsqowzjJe2iM6n0nKciPUp8y+7E="
+	    crossorigin="anonymous"></script>
+    <script>
+      var loading = false;
+      function toggleLoadingScreen(){
+          if(loading){
+              $("#loading").remove();
+              loading = false;
+          }else{
+              $('<div id="loading">'+
+                '<span style="position: fixed; top: 50%;left: 50%;color: white;"><b>Loading...</b></span>'+
+                '</div>')
+                  .css({position: "fixed",
+                        top: 0,
+                        left: 0,
+                        width: "100%",
+                        height: "100%",
+                        'background-color': "#000",
+                        filter:"alpha(opacity=50)",
+                        '-moz-opacity':"0.5",
+                        '-khtml-opacity': "0.5",
+                        opacity: "0.5",
+                        'z-index': "10000"})
+                  .appendTo(document.body);
+              loading = true;
+
+          }
+      }
+      //Start loading screen before downloading plotly which is quite large
+      toggleLoadingScreen();
+    </script>
+    <script src="https://cdn.plot.ly/plotly-1.5.0.min.js"></script>    
+    <script>
+      String.prototype.replaceAll = function(search, replacement) {
+          var target = this;
+          return target.split(search).join(replacement);
+      };
+      String.prototype.myTrim = function() {
+          var target = this;
+          return target.replace(/^\s+|\s+$/g, '');
+      };
+      function plotGraph(lines, sameSpacing, barPlot, prefix) {
+          var xvals = null;
+          var data = [];
+          while(lines.length > 0 &&
+                (lines[0].myTrim() == "" ||
+                 lines[0].myTrim().indexOf(";") !== -1)){
+              var line = lines.shift().myTrim();
+              if(line == "" || line.startsWith("#")){
+                  continue;
+              } else if(line.startsWith(";")) {
+                  xvals = line.split(";")
+                  xvals.shift(); // Remove first
+                  xvals = $.map(xvals, function (i){
+                      if(sameSpacing){
+                          return "_"+i.myTrim();
+                      }else{
+                          return parseInt(i.myTrim(), 10);
+                      }
+                  });
+              }else{
+                  line = line.split(";")
+                  var label = prefix + line.shift().myTrim();
+                  var yvals = $.map(line, function (i){
+                      return parseFloat(i.myTrim(), 10);
+                  });
+                  var trace = {
+                      x: xvals,
+                      y: yvals,
+                      mode: 'lines+markers',
+                      name: label
+                  };
+                  if(barPlot){
+                      trace['type'] = "bar";
+                  }
+                  data.push(trace);
+              }
+              
+          }
+          return data;
+      }
+      function plotGraphs(){
+          var insertPlaceholder = $("#insertPlaceholder");
+          var sameSpacing = $('#sameSpacing').is(":checked");
+          var barPlot = $('#barPlot').is(":checked");
+          var lines = $("#dataField").val();
+          $('.showCheck').each(function() {
+              var item = $(this);
+              if(!item.is(":checked")){
+                  lines = lines.replaceAll(item.val(), "#"+item.val())
+              }
+          });
+          lines = lines.split("$");
+          var nrOfGraphs = 0;
+          var scenarioDataMap = {};
+          var scenarioNrOfVersionsMap = {};
+          var scenarioList = [];
+          while(lines.length > 0){
+              var line = lines.shift().myTrim();
+              if(line == ""){
+                  continue;
+              } else if(line.startsWith("Scenario:")) {
+                  nrOfGraphs = nrOfGraphs + 1;
+                  var name = line;
+                  if(scenarioDataMap[name] === undefined){
+                      scenarioDataMap[name] = [];
+                      scenarioNrOfVersionsMap[name] = 0;
+                      scenarioList.push(line);
+                  }
+                  scenarioNrOfVersionsMap[name] = scenarioNrOfVersionsMap[name] + 1;
+                  var prefix = undefined;
+                  if(scenarioNrOfVersionsMap[name] === 1){
+                      prefix = "";
+                  }else{
+                      prefix = "Ver: " + scenarioNrOfVersionsMap[name] + " ";
+                  }
+                  scenarioDataMap[name] =
+                      scenarioDataMap[name].concat(
+                          plotGraph(lines, sameSpacing, barPlot, prefix));
+              }
+          }
+          $.each(scenarioList,
+                 function( index, name ) {
+                     var nrOfGraphs = index + 1;
+                     var data = scenarioDataMap[name];
+                     $( "<div class='added' id='graph"+nrOfGraphs+"'>")
+                         .insertBefore( insertPlaceholder );
+                     $( "<button type='button' class='added' id='fullscreenButton"+nrOfGraphs+"'>Fill screen</button>")
+                         .insertBefore( insertPlaceholder );
+                     $( "<span class='added'><br><hr><br></span>")
+                         .insertBefore( insertPlaceholder );
+                     var layout = {
+                         title:name,
+                         xaxis: {
+                             title: '# of Processes'
+                         },
+                         yaxis: {
+                             title: 'Operations/Second'
+                         }
+                         
+                     };
+                     
+                     $("#fullscreenButton"+nrOfGraphs).click(
+                         function(){
+                             $('#graph'+nrOfGraphs).replaceWith(
+                                 $("<div class='added' id='graph"+nrOfGraphs+"'>"));
+                             layout = $.extend({}, layout, {
+                                 width:$(window).width()-40,
+                                 height:$(window).height()-40
+                             });      
+                             Plotly.newPlot('graph'+nrOfGraphs,  data, layout);                         
+                         });
+                     Plotly.newPlot('graph'+nrOfGraphs,  data, layout);
+
+                 });
+          
+          
+      }
+    $(document).ready(function(){
+        $('#renderButton').click(
+            function(){
+                toggleLoadingScreen();
+                setTimeout(function(){
+                    try {                       
+                        $( ".added" ).remove();
+                        plotGraphs();
+                        toggleLoadingScreen();
+                    } catch(e){
+                        toggleLoadingScreen();
+                        console.log(e);
+                        alert("Error happened when parsing data.\n" +
+                              "See console for more info");
+                    }
+                }, 10);
+            });
+        setTimeout(function(){
+            $( ".added" ).remove();
+            plotGraphs();
+            toggleLoadingScreen();
+        }, 10);
+    });
+  </script>
+  </body>
+</html>
diff --git a/lib/stdlib/test/gen_fsm_SUITE.erl b/lib/stdlib/test/gen_fsm_SUITE.erl
index a8264e5a84..62d9d0e0ae 100644
--- a/lib/stdlib/test/gen_fsm_SUITE.erl
+++ b/lib/stdlib/test/gen_fsm_SUITE.erl
@@ -521,14 +521,16 @@ error_format_status(Config) when is_list(Config) ->
     error_logger_forwarder:register(),
     OldFl = process_flag(trap_exit, true),
     StateData = "called format_status",
+    Parent = self(),
     {ok, Pid} = gen_fsm:start(gen_fsm_SUITE, {state_data, StateData}, []),
     %% bad return value in the gen_fsm loop
     {'EXIT',{{bad_return_value, badreturn},_}} =
 	(catch gen_fsm:sync_send_event(Pid, badreturn)),
     receive
 	{error,_GroupLeader,{Pid,
-			     "** State machine"++_,
-			     [Pid,{_,_,badreturn},idle,{formatted,StateData},_]}} ->
+			     "** State machine "++_,
+			     [Pid,badreturn,Parent,idle,{formatted,StateData},
+                              {bad_return_value,badreturn}|_]}} ->
 	    ok;
 	Other ->
 	    io:format("Unexpected: ~p", [Other]),
@@ -541,12 +543,14 @@ terminate_crash_format(Config) when is_list(Config) ->
     error_logger_forwarder:register(),
     OldFl = process_flag(trap_exit, true),
     StateData = crash_terminate,
+    Parent = self(),
     {ok, Pid} = gen_fsm:start(gen_fsm_SUITE, {state_data, StateData}, []),
     stop_it(Pid),
     receive
 	{error,_GroupLeader,{Pid,
-			     "** State machine"++_,
-			     [Pid,{_,_,_},idle,{formatted, StateData},_]}} ->
+			     "** State machine "++_,
+			     [Pid,stop,Parent,idle,{formatted, StateData},
+                              {crash,terminate}|_]}} ->
 	    ok;
 	Other ->
 	    io:format("Unexpected: ~p", [Other]),
diff --git a/lib/stdlib/test/gen_statem_SUITE.erl b/lib/stdlib/test/gen_statem_SUITE.erl
index 053233df9b..16cf8f43f9 100644
--- a/lib/stdlib/test/gen_statem_SUITE.erl
+++ b/lib/stdlib/test/gen_statem_SUITE.erl
@@ -121,7 +121,8 @@ end_per_testcase(_CaseName, Config) ->
 start1(Config) ->
     %%OldFl = process_flag(trap_exit, true),
 
-    {ok,Pid0} = gen_statem:start_link(?MODULE, start_arg(Config, []), []),
+    {ok,Pid0} =
+	gen_statem:start_link(?MODULE, start_arg(Config, []), [{debug,[trace]}]),
     ok = do_func_test(Pid0),
     ok = do_sync_func_test(Pid0),
     stop_it(Pid0),
@@ -135,7 +136,8 @@ start1(Config) ->
 %% anonymous w. shutdown
 start2(Config) ->
     %% Dont link when shutdown
-    {ok,Pid0} = gen_statem:start(?MODULE, start_arg(Config, []), []),
+    {ok,Pid0} =
+	gen_statem:start(?MODULE, start_arg(Config, []), []),
     ok = do_func_test(Pid0),
     ok = do_sync_func_test(Pid0),
     stopped = gen_statem:call(Pid0, {stop,shutdown}),
@@ -511,7 +513,9 @@ abnormal1dirty(Config) ->
 %% trap exit since we must link to get the real bad_return_ error
 abnormal2(Config) ->
     OldFl = process_flag(trap_exit, true),
-    {ok,Pid} = gen_statem:start_link(?MODULE, start_arg(Config, []), []),
+    {ok,Pid} =
+        gen_statem:start_link(
+          ?MODULE, start_arg(Config, []), [{debug,[log]}]),
 
     %% bad return value in the gen_statem loop
     {{{bad_return_from_state_function,badreturn},_},_} =
@@ -529,7 +533,9 @@ abnormal2(Config) ->
 %% trap exit since we must link to get the real bad_return_ error
 abnormal3(Config) ->
     OldFl = process_flag(trap_exit, true),
-    {ok,Pid} = gen_statem:start_link(?MODULE, start_arg(Config, []), []),
+    {ok,Pid} =
+        gen_statem:start_link(
+          ?MODULE, start_arg(Config, []), [{debug,[log]}]),
 
     %% bad return value in the gen_statem loop
     {{{bad_action_from_state_function,badaction},_},_} =
@@ -547,7 +553,9 @@ abnormal3(Config) ->
 %% trap exit since we must link to get the real bad_return_ error
 abnormal4(Config) ->
     OldFl = process_flag(trap_exit, true),
-    {ok,Pid} = gen_statem:start_link(?MODULE, start_arg(Config, []), []),
+    {ok,Pid} =
+        gen_statem:start_link(
+          ?MODULE, start_arg(Config, []), [{debug,[log]}]),
 
     %% bad return value in the gen_statem loop
     BadTimeout = {badtimeout,4711,ouch},
@@ -641,51 +649,80 @@ state_enter(_Config) ->
 	      end,
 	  start =>
 	      fun (enter, Prev, N) ->
-		      Self ! {enter,start,Prev,N},
+		      Self ! {N,enter,start,Prev},
 		      {keep_state,N + 1};
 		  (internal, Prev, N) ->
-		      Self ! {internal,start,Prev,N},
+		      Self ! {N,internal,start,Prev},
 		      {keep_state,N + 1};
+                  (timeout, M, N) ->
+                      {keep_state, N + 1,
+                       {reply, {Self,N}, {timeout,M}}};
 		  ({call,From}, repeat, N) ->
 		      {repeat_state,N + 1,
-		       [{reply,From,{repeat,start,N}}]};
+		       [{reply,From,{N,repeat,start}}]};
 		  ({call,From}, echo, N) ->
 		      {next_state,wait,N + 1,
-		       {reply,From,{echo,start,N}}};
+		       [{reply,From,{N,echo,start}},{timeout,0,N}]};
 		  ({call,From}, {stop,Reason}, N) ->
 		      {stop_and_reply,Reason,
-		       [{reply,From,{stop,N}}],N + 1}
+		       [{reply,From,{N,stop}}],N + 1}
 	      end,
 	  wait =>
 	      fun (enter, Prev, N) when N < 5 ->
 		      {repeat_state,N + 1,
-		       {reply,{Self,N},{enter,Prev}}};
+		       [{reply,{Self,N},{enter,Prev}},
+                        {timeout,0,N},
+                        {state_timeout,0,N}]};
 		  (enter, Prev, N) ->
-		      Self ! {enter,wait,Prev,N},
-		      {keep_state,N + 1};
+		      Self ! {N,enter,wait,Prev},
+		      {keep_state,N + 1,
+                       [{timeout,0,N},
+                        {state_timeout,0,N}]};
+                  (timeout, M, N) ->
+                      {keep_state, N + 1,
+                       {reply, {Self,N}, {timeout,M}}};
+                  (state_timeout, M, N) ->
+                      {keep_state, N + 1,
+                       {reply, {Self,N}, {state_timeout,M}}};
 		  ({call,From}, repeat, N) ->
 		      {repeat_state_and_data,
-		       [{reply,From,{repeat,wait,N}}]};
+		       [{reply,From,{N,repeat,wait}},
+                        {timeout,0,N}]};
 		  ({call,From}, echo, N) ->
 		      {next_state,start,N + 1,
 		       [{next_event,internal,wait},
-			{reply,From,{echo,wait,N}}]}
+			{reply,From,{N,echo,wait}}]}
 	      end},
     {ok,STM} =
 	gen_statem:start_link(
-	  ?MODULE, {map_statem,Machine,[state_enter]}, []),
-
-    [{enter,start,start,1}] = flush(),
-    {echo,start,2} = gen_statem:call(STM, echo),
-    [{3,{enter,start}},{4,{enter,start}},{enter,wait,start,5}] = flush(),
-    {wait,[6|_]} = sys:get_state(STM),
-    {repeat,wait,6} = gen_statem:call(STM, repeat),
-    [{enter,wait,wait,6}] = flush(),
-    {echo,wait,7} = gen_statem:call(STM, echo),
-    [{enter,start,wait,8},{internal,start,wait,9}] = flush(),
-    {repeat,start,10} = gen_statem:call(STM, repeat),
-    [{enter,start,start,11}] = flush(),
-    {stop,12} = gen_statem:call(STM, {stop,bye}),
+	  ?MODULE, {map_statem,Machine,[state_enter]},
+          [{debug,[trace,{log,17}]}]),
+    ok = sys:log(STM, false),
+    ok = sys:log(STM, true),
+
+    [{1,enter,start,start}] = flush(),
+    {2,echo,start} = gen_statem:call(STM, echo),
+    [{3,{enter,start}},
+     {4,{enter,start}},
+     {5,enter,wait,start},
+     {6,{timeout,5}},
+     {7,{state_timeout,5}}] = flush(),
+    {wait,[8|_]} = sys:get_state(STM),
+    {8,repeat,wait} = gen_statem:call(STM, repeat),
+    [{8,enter,wait,wait},
+     {9,{timeout,8}},
+     {10,{state_timeout,8}}] = flush(),
+    {11,echo,wait} = gen_statem:call(STM, echo),
+    [{12,enter,start,wait},
+     {13,internal,start,wait}] = flush(),
+    {14,repeat,start} = gen_statem:call(STM, repeat),
+    [{15,enter,start,start}] = flush(),
+
+    {ok,Log} = sys:log(STM, get),
+    io:format("sys:log ~p~n", [Log]),
+    ok = sys:log(STM, print),
+
+    {16,stop} = gen_statem:call(STM, {stop,bye}),
     [{'EXIT',STM,bye}] = flush(),
 
     {noproc,_} =
@@ -1447,7 +1484,8 @@ enter_loop(_Config) ->
 
     %% Locally registered process + {local,Name}
     {ok,Pid1a} =
-	proc_lib:start_link(?MODULE, enter_loop, [local,local]),
+	proc_lib:start_link(
+          ?MODULE, enter_loop, [local,local,[{debug,[{log,7}]}]]),
     yes = gen_statem:call(Pid1a, 'alive?'),
     stopped = gen_statem:call(Pid1a, stop),
     receive
@@ -1459,7 +1497,8 @@ enter_loop(_Config) ->
 
     %% Unregistered process + {local,Name}
     {ok,Pid1b} =
-	proc_lib:start_link(?MODULE, enter_loop, [anon,local]),
+	proc_lib:start_link(
+          ?MODULE, enter_loop, [anon,local,[{debug,[log]}]]),
     receive
 	{'EXIT',Pid1b,process_not_registered} ->
 	    ok
@@ -1568,6 +1607,9 @@ enter_loop(_Config) ->
     ok = verify_empty_msgq().
 
 enter_loop(Reg1, Reg2) ->
+    enter_loop(Reg1, Reg2, []).
+%%
+enter_loop(Reg1, Reg2, Opts) ->
     process_flag(trap_exit, true),
     case Reg1 of
 	local -> register(armitage, self());
@@ -1579,15 +1621,15 @@ enter_loop(Reg1, Reg2) ->
     case Reg2 of
 	local ->
 	    gen_statem:enter_loop(
-	      ?MODULE, [], state0, [], {local,armitage});
+	      ?MODULE, Opts, state0, [], {local,armitage});
 	global ->
 	    gen_statem:enter_loop(
-	      ?MODULE, [], state0, [], {global,armitage});
+	      ?MODULE, Opts, state0, [], {global,armitage});
 	via ->
 	    gen_statem:enter_loop(
-	      ?MODULE, [], state0, [], {via, dummy_via, armitage});
+	      ?MODULE, Opts, state0, [], {via, dummy_via, armitage});
 	anon ->
-	    gen_statem:enter_loop(?MODULE, [], state0, [])
+	    gen_statem:enter_loop(?MODULE, Opts, state0, [])
     end.
 
 undef_code_change(_Config) ->
@@ -1619,7 +1661,9 @@ undef_terminate2(_Config) ->
 
 undef_in_terminate(_Config) ->
     Data =  {undef_in_terminate, {?MODULE, terminate}},
-    {ok, Statem} = gen_statem:start(?MODULE, {data, Data}, []),
+    {ok, Statem} =
+        gen_statem:start(
+          ?MODULE, {data, Data}, [{debug,[log]}]),
     try
         gen_statem:stop(Statem),
         ct:fail(should_crash)
diff --git a/lib/stdlib/test/io_SUITE.erl b/lib/stdlib/test/io_SUITE.erl
index f097552e8c..4eb5b1772c 100644
--- a/lib/stdlib/test/io_SUITE.erl
+++ b/lib/stdlib/test/io_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
          io_with_huge_message_queue/1, format_string/1,
 	 maps/1, coverage/1, otp_14178_unicode_atoms/1, otp_14175/1,
          otp_14285/1, limit_term/1, otp_14983/1, otp_15103/1, otp_15076/1,
-         otp_15159/1]).
+         otp_15159/1, otp_15639/1, otp_15705/1, otp_15847/1, otp_15875/1]).
 
 -export([pretty/2, trf/3]).
 
@@ -64,7 +64,8 @@ all() ->
      io_lib_print_binary_depth_one, otp_10302, otp_10755, otp_10836,
      io_lib_width_too_small, io_with_huge_message_queue,
      format_string, maps, coverage, otp_14178_unicode_atoms, otp_14175,
-     otp_14285, limit_term, otp_14983, otp_15103, otp_15076, otp_15159].
+     otp_14285, limit_term, otp_14983, otp_15103, otp_15076, otp_15159,
+     otp_15639, otp_15705, otp_15847, otp_15875].
 
 %% Error cases for output.
 error_1(Config) when is_list(Config) ->
@@ -2503,9 +2504,11 @@ otp_14983(_Config) ->
 
 trunc_string() ->
     "str " = trf("str ", [], 10),
-    "str ..." = trf("str ~s", ["str"], 6),
+    "str str" = trf("str ~s", ["str"], 6),
+    "str ..." = trf("str ~s", ["str1"], 6),
     "str str" = trf("str ~s", ["str"], 7),
-    "str ..." = trf("str ~8s", ["str"], 6),
+    "str str" = trf("str ~8s", ["str"], 6),
+    "str ..." = trf("str ~8s", ["str1"], 6),
     Pa = filename:dirname(code:which(?MODULE)),
     {ok, UNode} = test_server:start_node(printable_range_unicode, slave,
 					 [{args, " +pc unicode -pa " ++ Pa}]),
@@ -2647,3 +2650,71 @@ otp_15076(_Config) ->
     {'EXIT', {badarg, _}} = (catch io_lib:build_text(L)),
     {'EXIT', {badarg, _}} = (catch io_lib:build_text(L, [])),
     ok.
+
+otp_15639(_Config) ->
+    L = lists:duplicate(10, "a"),
+    LOpts = [{encoding, latin1},  {chars_limit, 10}],
+    UOpts = [{encoding, unicode}, {chars_limit, 10}],
+    "[[...]|...]" = pretty(L, LOpts),
+    "[[...]|...]" = pretty(L, UOpts),
+    "[\"a\",[...]|...]" =
+        pretty(L, [{chars_limit, 12}, {encoding, latin1}]),
+    "[\"a\",[...]|...]" =
+        pretty(L, [{chars_limit, 12}, {encoding, unicode}]),
+
+    %% Latin-1
+    "\"12345678\"" = pretty("12345678", LOpts),
+    "\"12345678\"..." = pretty("123456789", LOpts),
+    "\"\\r\\n123456\"..." = pretty("\r\n1234567", LOpts),
+    "\"\\r1234567\"..." = pretty("\r12345678", LOpts),
+    "\"\\r\\n123456\"..." = pretty("\r\n12345678", LOpts),
+    "\"12345678\"..." = pretty("12345678"++[x], LOpts),
+    "[49,50|...]" = pretty("1234567"++[x], LOpts),
+    "[49,x]" = pretty("1"++[x], LOpts),
+    "[[...]|...]" = pretty(["1","2","3","4","5","6","7","8"], LOpts),
+    %% Unicode
+    "\"12345678\"" = pretty("12345678", UOpts),
+    "\"12345678\"..." = pretty("123456789", UOpts),
+    "\"\\r\\n1234567\"" = pretty("\r\n1234567", UOpts),
+    "\"\\r1234567\"..." = pretty("\r12345678", UOpts),
+    "\"\\r\\n1234567\"..." = pretty("\r\n12345678", UOpts),
+    "[49,50|...]" = pretty("12345678"++[x], UOpts),
+    "\"12345678\"..." = pretty("123456789"++[x], UOpts),
+    "[[...]|...]" = pretty(["1","2","3","4","5","6","7","8"], UOpts),
+    ok.
+
+otp_15705(_Config) ->
+    L = [<<"an">>,["at"],[["om"]]],
+    "..." = trf("~s", [L], 0),
+    "..." = trf("~s", [L], 1),
+    "..." = trf("~s", [L], 2),
+    "..." = trf("~s", [L], 3),
+    "a..." = trf("~s", [L], 4),
+    "an..." = trf("~s", [L], 5),
+    "anatom" = trf("~s", [L], 6),
+    L2 = ["a",[<<"na">>],[["tom"]]],
+    "..." = trf("~s", [L2], 3),
+    "a..." = trf("~s", [L2], 4),
+    "an..." = trf("~s", [L2], 5),
+    "anatom" = trf("~s", [L2], 6),
+
+    A = [[<<"äpple"/utf8>>, "plus", <<"äpple">>]],
+    "äp..." = trf("~ts", [A], 5),
+    "äppleplusäpple" = trf("~ts", [A], 14),
+    U = [["ки"],"рилл","и́ческий атом"],
+    "ки..." = trf("~ts", [U], 5),
+    "кирилли́ческий..." = trf("~ts", [U], 16),
+    "кирилли́ческий атом" = trf("~ts", [U], 20),
+
+    "|кирилли́чес|" = trf("|~10ts|", [U], -1),
+    ok.
+
+otp_15847(_Config) ->
+    T = {someRecord,<<"1234567890">>,some,more},
+    "{someRecord,<<...>>,...}" =
+        pretty(T, [{chars_limit,20}, {encoding,latin1}]),
+    ok.
+
+otp_15875(_Config) ->
+    S = io_lib:format("~tp", [[{0, [<<"00">>]}]], [{chars_limit, 18}]),
+    "[{0,[<<48,...>>]}]" = lists:flatten(S).
diff --git a/lib/stdlib/test/lists_SUITE.erl b/lib/stdlib/test/lists_SUITE.erl
index 984b51e7ae..c3c54710eb 100644
--- a/lib/stdlib/test/lists_SUITE.erl
+++ b/lib/stdlib/test/lists_SUITE.erl
@@ -158,6 +158,20 @@ append_2(Config) when is_list(Config) ->
     "abcdef"=lists:append("abc", "def"),
     [hej, du]=lists:append([hej], [du]),
     [10, [elem]]=lists:append([10], [[elem]]),
+
+    %% Trapping, both crashing and otherwise.
+    [append_trapping_1(N) || N <- lists:seq(0, 20)],
+
+    ok.
+
+append_trapping_1(N) ->
+    List = lists:duplicate(N + (1 bsl N), gurka),
+    ImproperList = List ++ crash,
+
+    {'EXIT',_} = (catch (ImproperList ++ [])),
+
+    [3, 2, 1 | List] = lists:reverse(List ++ [1, 2, 3]),
+
     ok.
 
 %% Tests the lists:reverse() implementation. The function is
@@ -1679,7 +1693,7 @@ make_fun() ->
     receive {Pid, Fun} -> Fun end.
 
 make_fun(Pid) ->
-    Pid ! {self(), fun make_fun/1}.
+    Pid ! {self(), fun (X) -> {X, Pid} end}.
 
 fun_pid(Fun) ->
     erlang:fun_info(Fun, pid).
@@ -2586,6 +2600,15 @@ subtract(Config) when is_list(Config) ->
     [1,2,3,4,5,6,7,8,9,9999,10000,20,21,22] =
 	sub(lists:seq(1, 10000)++[20,21,22], lists:seq(10, 9998)),
 
+    %% ERL-986; an integer overflow relating to term comparison
+    %% caused subtraction to be inconsistent.
+    Ids = [2985095936,47540628,135460048,1266126295,240535295,
+           115724671,161800351,4187206564,4178142725,234897063,
+           14773162,6662515191,133150693,378034895,1874402262,
+           3507611978,22850922,415521280,253360400,71683243],
+
+    [] = id(Ids) -- id(Ids),
+
     %% Floats/integers.
     [42.0,42.0] = sub([42.0,42,42.0], [42,42,42]),
     [1,2,3,4,43.0] = sub([1,2,3,4,5,42.0,43.0], [42.0,5]),
@@ -2613,6 +2636,8 @@ subtract(Config) when is_list(Config) ->
 
     ok.
 
+id(I) -> I.
+
 sub_non_matching(A, B) ->
     A = sub(A, B).
 
diff --git a/lib/stdlib/test/qlc_SUITE.erl b/lib/stdlib/test/qlc_SUITE.erl
index d7354438f9..8a43f15d2c 100644
--- a/lib/stdlib/test/qlc_SUITE.erl
+++ b/lib/stdlib/test/qlc_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. 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.
@@ -2436,7 +2436,7 @@ info(Config) when is_list(Config) ->
        <<"{'EXIT', {badarg, _}} = 
                (catch qlc:info([X || {X} <- []], {n_elements, 0})),
           L = lists:seq(1, 1000),
-          \"[1,2,3,4,5,6,7,8,9,10|'...']\" = qlc:info(L, {n_elements, 10}),
+          \"[1, 2, 3, 4, 5, 6, 7, 8, 9, 10 | '...']\" = qlc:info(L, {n_elements, 10}),
           {cons,A1,{integer,A2,1},{atom,A3,'...'}} =
             qlc:info(L, [{n_elements, 1},{format,abstract_code}]),
           1 = erl_anno:line(A1),
@@ -2447,8 +2447,8 @@ info(Config) when is_list(Config) ->
                                                             {atom,_,'...'}}}},
                      {call,_,_,_}]} = 
           qlc:info(Q, [{n_elements, 3},{format,abstract_code}]),
-          \"ets:match_spec_run([a,b,c,d,e,f],\n\"
-          \"                   ets:match_spec_compile([{'$1',[true],\"
+          \"ets:match_spec_run([a, b, c, d, e, f],\n\"
+          \"                   ets:match_spec_compile([{'$1', [true], \"
           \"[{{'$1'}}]}]))\" = 
              qlc:info(Q, [{n_elements, infinity}])">>,
 
@@ -3163,19 +3163,13 @@ lookup2(Config) when is_list(Config) ->
                 [a] = lookup_keys(Q)
         end, [{a},{b},{c}])">>,
 
-       {cres,
-        <<"etsc(fun(E) ->
+       <<"etsc(fun(E) ->
                  Q = qlc:q([X || {X}=Y <- ets:table(E), 
                                  element(2, Y) == b, 
                                  X =:= 1]),
                  [] = qlc:e(Q),
                  false = lookup_keys(Q)
-         end, [{1,b},{2,3}])">>,
-        %% {warnings,[{2,sys_core_fold,nomatch_guard},
-	%% 	   {3,qlc,nomatch_filter},
-	%% 	   {3,sys_core_fold,{eval_failure,badarg}}]}},
-        {warnings,[{2,sys_core_fold,nomatch_guard},
-		   {3,sys_core_fold,{eval_failure,badarg}}]}},
+        end, [{1,b},{2,3}])">>,
 
        <<"etsc(fun(E) ->
                 Q = qlc:q([X || {X} <- ets:table(E), element(1,{X}) =:= 1]),
@@ -6553,7 +6547,7 @@ otp_7114(Config) when is_list(Config) ->
 otp_7232(Config) when is_list(Config) ->
     Ts = [<<"L = [fun math:sqrt/1, list_to_pid(\"<0.4.1>\"),
                   erlang:make_ref()],
-             \"[fun math:sqrt/1,<0.4.1>,#Ref<\" ++ _  = qlc:info(L),
+             \"[fun math:sqrt/1, <0.4.1>, #Ref<\" ++ _  = qlc:info(L),
              {call,_,
                {remote,_,{atom,_,qlc},{atom,_,sort}},
                [{cons,_,
@@ -6569,7 +6563,7 @@ otp_7232(Config) when is_list(Config) ->
              \"qlc:sort([55296,56296],[{order,fun'-function/0-fun-2-'/2}])\" =
                 format_info(Q, true),
              AC = qlc:info(Q, {format, abstract_code}),
-             \"qlc:sort([55296,56296], [{order,fun '-function/0-fun-2-'/2}])\" =
+             \"qlc:sort([55296, 56296], [{order, fun '-function/0-fun-2-'/2}])\" =
                 binary_to_list(iolist_to_binary(erl_pp:expr(AC)))">>,
 
          %% OTP-7234. erl_parse:abstract() handles bit strings
@@ -7094,21 +7088,21 @@ manpage(Config) when is_list(Config) ->
               \"    V1 =\n\"
               \"        qlc:q([ \n\"
               \"               SQV ||\n\"
-              \"                   SQV <- [x,y]\n\"
+              \"                   SQV <- [x, y]\n\"
               \"              ],\n\"
-              \"              [{unique,true}]),\n\"
+              \"              [{unique, true}]),\n\"
               \"    V2 =\n\"
               \"        qlc:q([ \n\"
               \"               SQV ||\n\"
-              \"                   SQV <- [a,b]\n\"
+              \"                   SQV <- [a, b]\n\"
               \"              ],\n\"
-              \"              [{unique,true}]),\n\"
+              \"              [{unique, true}]),\n\"
               \"    qlc:q([ \n\"
-              \"           {X,Y} ||\n\"
+              \"           {X, Y} ||\n\"
               \"               X <- V1,\n\"
               \"               Y <- V2\n\"
               \"          ],\n\"
-              \"          [{unique,true}])\n\"
+              \"          [{unique, true}])\n\"
               \"end\",
           true = B =:= qlc:info(QH, unique_all)">>,
 
@@ -7124,19 +7118,19 @@ manpage(Config) when is_list(Config) ->
               \"    V1 =\n\"
               \"        qlc:q([ \n\"
               \"               P0 ||\n\"
-              \"                   P0 = {W,Y} <- ets:table(_)\n\"
+              \"                   P0 = {W, Y} <- ets:table(_)\n\"
               \"              ]),\n\"
               \"    V2 =\n\"
               \"        qlc:q([ \n\"
-              \"               [G1|G2] ||\n\"
+              \"               [G1 | G2] ||\n\"
               \"                   G2 <- V1,\n\"
               \"                   G1 <- ets:table(_),\n\"
               \"                   element(2, G1) =:= element(1, G2)\n\"
               \"              ],\n\"
-              \"              [{join,lookup}]),\n\"
+              \"              [{join, lookup}]),\n\"
               \"    qlc:q([ \n\"
-              \"           {X,Z,W} ||\n\"
-              \"               [{X,Z}|{W,Y}] <- V2\n\"
+              \"           {X, Z, W} ||\n\"
+              \"               [{X, Z} | {W, Y}] <- V2\n\"
               \"          ])\n\"
               \"end\",
           Info1 =
@@ -7161,25 +7155,28 @@ manpage(Config) when is_list(Config) ->
        \"    V1 =\n\"
        \"        qlc:q([ \n\"
        \"               P0 ||\n\"
-       \"                   P0 = {X,Z} <- qlc:keysort(1, [{a,1},{b,4},{c,6}], [])\n\"
+       \"                   P0 = {X, Z} <-\n\"
+       \"                       qlc:keysort(1, [{a, 1}, {b, 4}, {c, 6}], [])\n\"
        \"              ]),\n\"
        \"    V2 =\n\"
        \"        qlc:q([ \n\"
        \"               P0 ||\n\"
-       \"                   P0 = {W,Y} <- qlc:keysort(2, [{2,a},{3,b},{4,c}], [])\n\"
+       \"                   P0 = {W, Y} <-\n\"
+       \"                       qlc:keysort(2, [{2, a}, {3, b}, {4, c}], [])\n\"
+
        \"              ]),\n\"
        \"    V3 =\n\"
        \"        qlc:q([ \n\"
-       \"               [G1|G2] ||\n\"
+       \"               [G1 | G2] ||\n\"
        \"                   G1 <- V1,\n\"
        \"                   G2 <- V2,\n\"
        \"                   element(1, G1) == element(2, G2)\n\"
        \"              ],\n\"
-       \"              [{join,merge},{cache,list}]),\n\"
+       \"              [{join, merge}, {cache, list}]),\n\"
        \"    qlc:q([ \n\"
-       \"           {A,X,Z,W} ||\n\"
-       \"               A <- [a,b,c],\n\"
-       \"               [{X,Z}|{W,Y}] <- V3,\n\"
+       \"           {A, X, Z, W} ||\n\"
+       \"               A <- [a, b, c],\n\"
+       \"               [{X, Z} | {W, Y}] <- V3,\n\"
        \"               X =:= Y\n\"
        \"          ])\n\"
        \"end\",
@@ -7221,14 +7218,21 @@ manpage(Config) when is_list(Config) ->
                                             gb_trees:lookup(K,
                                                             gb_trees:from_orddict([]))
                                         of
-                                            {value,V} ->
-                                                [{K,V}];
+                                            {value, V} ->
+                                                [{K, V}];
                                             none ->
                                                 []
                                         end
                                  end,
-                                 [{1,a},{1,b},{1,c},{2,a},{2,b},{2,c}]),
-                   ets:match_spec_compile([{{{'$1','$2'},'_'},[],['$1']}]))\",
+                                 [{1, a},
+                                  {1, b},
+                                  {1, c},
+                                  {2, a},
+                                  {2, b},
+                                  {2, c}]),
+                   ets:match_spec_compile([{{{'$1', '$2'}, '_'},
+                                            [],
+                                            ['$1']}]))\",
           L = qlc:info(QH)">>
       ],
     run(Config, Ts),
diff --git a/lib/stdlib/test/rand_SUITE.erl b/lib/stdlib/test/rand_SUITE.erl
index b76c9f5341..7685c17967 100644
--- a/lib/stdlib/test/rand_SUITE.erl
+++ b/lib/stdlib/test/rand_SUITE.erl
@@ -21,24 +21,7 @@
 -compile({nowarn_deprecated_function,[{random,seed,1},
                                       {random,uniform_s,1},
                                       {random,uniform_s,2}]}).
-
--export([all/0, suite/0, groups/0, group/1]).
-
--export([interval_int/1, interval_float/1, seed/1,
-         api_eq/1, reference/1,
-	 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]).
-
--export([test/0, gen/1]).
-
--export([uniform_real_gen/1, uniform_gen/2]).
+-compile([export_all, nowarn_export_all]).
 
 -include_lib("common_test/include/ct.hrl").
 
@@ -56,7 +39,8 @@ all() ->
      {group, distr_stats},
      uniform_real_conv,
      plugin, measure,
-     {group, reference_jump}
+     {group, reference_jump},
+     short_jump
     ].
 
 groups() ->
@@ -95,7 +79,7 @@ test() ->
       end, Tests).
 
 algs() ->
-    [exrop, exsp, exs1024s, exs64, exsplus, exs1024].
+    [exsss, exrop, exsp, exs1024s, exs64, exsplus, exs1024, exro928ss].
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -125,7 +109,7 @@ seed_1(Alg) ->
     S0 = get(rand_seed),
     S0 = rand:seed_s(Alg, {0, 0, 0}),
     %% Check that process_dict should not be used for seed_s functionality
-    _ = rand:seed_s(Alg, {1, 0, 0}),
+    _ = rand:seed_s(Alg, 4711),
     S0 = get(rand_seed),
     %% Test export
     ES0 = rand:export_seed(),
@@ -262,31 +246,43 @@ reference(Config) when is_list(Config) ->
     ok.
 
 reference_1(Alg) ->
-    Refval  = reference_val(Alg),
-    Testval = gen(Alg),
-    case Refval =:= Testval of
-        true -> ok;
-        false when Refval =:= not_implemented ->
-            exit({not_implemented,Alg});
-        false ->
-	    io:format("Failed: ~p~n",[Alg]),
-	    io:format("Length ~p ~p~n",[length(Refval), length(Testval)]),
-	    io:format("Head ~p ~p~n",[hd(Refval), hd(Testval)]),
-	    exit(wrong_value)
+    Refval = reference_val(Alg),
+    if
+	Refval =:= not_implemented -> Refval;
+	true ->
+	    case gen(Alg) of
+		Refval ->
+		    io:format("Ok: ~p~n",[Alg]),
+                    ok;
+		Testval ->
+		    io:format("Failed: ~p~n",[Alg]),
+		    io:format("Length ~p ~p~n",[length(Refval), length(Testval)]),
+		    io:format("Head ~p ~p~n",[hd(Refval), hd(Testval)]),
+                    show_wrong(Refval, Testval),
+		    exit(wrong_value)
+	    end
     end.
 
+show_wrong([], []) ->
+    ok;
+show_wrong([H|T1], [H|T2]) ->
+    show_wrong(T1, T2);
+show_wrong([H1|_], [H2|_]) ->
+    io:format("Wrong ~p ~p~n",[H1,H2]).
+
+
 gen(Algo) ->
     State =
-        case Algo of
-            exs64 -> %% Printed with orig 'C' code and this seed
-                rand:seed_s({exs64, 12345678});
-            _ when Algo =:= exsplus; Algo =:= exsp; Algo =:= exrop ->
+        if
+            Algo =:= exs64 -> %% Printed with orig 'C' code and this seed
+                rand:seed_s(exs64, [12345678]);
+            Algo =:= exsplus; Algo =:= exsp; Algo =:= exrop; Algo =:= exsss ->
                 %% Printed with orig 'C' code and this seed
-                rand:seed_s({Algo, [12345678|12345678]});
-            _ when Algo =:= exs1024; Algo =:= exs1024s ->
+                rand:seed_s(Algo, [12345678,12345678]);
+            Algo =:= exs1024; Algo =:= exs1024s; Algo =:= exro928ss ->
                 %% Printed with orig 'C' code and this seed
-                rand:seed_s({Algo, {lists:duplicate(16, 12345678), []}});
-            _ ->
+                rand:seed_s(Algo, lists:duplicate(16, 12345678));
+            true ->
                 rand:seed(Algo, {100, 200, 300})
         end,
     Max = range(State),
@@ -442,7 +438,7 @@ stats_standard_normal_box_muller(Config) when is_list(Config) ->
                     ([S|Z]) ->
                         {Z, [S]}
                 end,
-            State = [rand:seed(exrop)],
+            State = [rand:seed(exsss)],
             stats_standard_normal(NormalS, State, 3)
     catch error:_ ->
             {skip, "math:erfc/1 not supported"}
@@ -467,7 +463,7 @@ stats_standard_normal_box_muller_2(Config) when is_list(Config) ->
                     ([S|Z]) ->
                         {Z, [S]}
                 end,
-            State = [rand:seed(exrop)],
+            State = [rand:seed(exsss)],
             stats_standard_normal(NormalS, State, 3)
     catch error:_ ->
             {skip, "math:erfc/1 not supported"}
@@ -479,7 +475,7 @@ 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), Retries)
+              fun rand:normal_s/1, rand:seed_s(exsss), Retries)
     catch error:_ ->
             {skip, "math:erfc/1 not supported"}
     end.
@@ -853,7 +849,8 @@ do_measure(_Config) ->
     Algs =
         algs() ++
         try crypto:strong_rand_bytes(1) of
-            <<_>> -> [crypto64, crypto_cache, crypto]
+            <<_>> ->
+		[crypto64, crypto_cache, crypto_aes, crypto]
         catch
             error:low_entropy -> [];
             error:undef -> []
@@ -1074,7 +1071,7 @@ do_measure(_Config) ->
                     end,
                     State)
           end,
-          exrop, TMarkNormalFloat),
+          exsss, TMarkNormalFloat),
     ok.
 
 -define(LOOP_MEASURE, (?LOOP div 5)).
@@ -1102,6 +1099,10 @@ measure_1(RangeFun, Fun, Alg, TMark) ->
                 {rand, crypto:rand_seed_alg(crypto_cache)};
             crypto ->
                 {rand, crypto:rand_seed_s()};
+            crypto_aes ->
+                {rand,
+		 crypto:rand_seed_alg(
+		   crypto_aes, crypto:strong_rand_bytes(256))};
             random ->
                 {random, random:seed(os:timestamp()), get(random_seed)};
             _ ->
@@ -1117,7 +1118,7 @@ measure_1(RangeFun, Fun, Alg, TMark) ->
                             _ -> (Time * 100 + 50) div TMark
                         end,
                     io:format(
-                      "~.12w: ~p ns ~p% [16#~.16b]~n",
+                      "~.20w: ~p ns ~p% [16#~.16b]~n",
                       [Alg, (Time * 1000 + 500) div ?LOOP_MEASURE,
                        Percent, Range]),
                     Parent ! {self(), Time},
@@ -1142,104 +1143,156 @@ reference_jump_state(Config) when is_list(Config) ->
     ok.
 
 reference_jump_1(Alg) ->
-    Refval  = reference_jump_val(Alg),
-    Testval = gen_jump_1(Alg),
-    case Refval =:= Testval of
-        true -> ok;
-        false ->
-	    io:format("Failed: ~p~n",[Alg]),
-	    io:format("Length ~p ~p~n",[length(Refval), length(Testval)]),
-	    io:format("Head ~p ~p~n",[hd(Refval), hd(Testval)]),
-	    io:format("Vals ~p ~p~n",[Refval, Testval]),
-	    exit(wrong_value)
+    Refval = reference_jump_val(Alg),
+    if
+	Refval =:= not_implemented -> Refval;
+	true ->
+	    case gen_jump_1(Alg) of
+		Refval -> ok;
+		Testval ->
+		    io:format(
+		      "Failed: ~p~n",[Alg]),
+		    io:format(
+		      "Length ~p ~p~n",
+		      [length(Refval), length(Testval)]),
+		    io:format(
+		      "Head ~p ~p~n",[hd(Refval), hd(Testval)]),
+		    io:format(
+		      "Vals ~p ~p~n",[Refval, Testval]),
+		    exit(wrong_value)
+	    end
     end.
 
 gen_jump_1(Algo) ->
-    State =
-        case Algo of
-            exs64 -> %% Test exception of not_implemented notice
-                try rand:jump(rand:seed_s(exs64))
-                catch
-                    error:not_implemented -> not_implemented
-                end;
-            _ when Algo =:= exsplus; Algo =:= exsp; Algo =:= exrop ->
-                %% Printed with orig 'C' code and this seed
-                rand:seed_s({Algo, [12345678|12345678]});
-            _ when Algo =:= exs1024; Algo =:= exs1024s ->
-                %% Printed with orig 'C' code and this seed
-                rand:seed_s({Algo, {lists:duplicate(16, 12345678), []}});
-            _ -> % unimplemented
-                not_implemented
-        end,
-    case State of
-        not_implemented -> [not_implemented];
-        _ ->
-            Max = range(State),
-            gen_jump_1(?LOOP_JUMP, State, Max, [])
+    case Algo of
+	exs64 -> %% Test exception of not_implemented notice
+	    try rand:jump(rand:seed_s(exs64))
+	    catch
+		error:not_implemented -> [error_not_implemented]
+	    end;
+	_ when Algo =:= exsplus; Algo =:= exsp; Algo =:= exrop; Algo =:= exsss ->
+	    %% Printed with orig 'C' code and this seed
+	    gen_jump_2(
+	      rand:seed_s(Algo, [12345678,12345678]));
+	_ when Algo =:= exs1024; Algo =:= exs1024s; Algo =:= exro928ss ->
+	    %% Printed with orig 'C' code and this seed
+	    gen_jump_2(
+	      rand:seed_s(Algo, lists:duplicate(16, 12345678)))
     end.
 
-gen_jump_1(N, State0, Max, Acc) when N > 0 ->
+gen_jump_2(State) ->
+    Max = range(State),
+    gen_jump_3(?LOOP_JUMP, State, Max, []).
+
+gen_jump_3(N, State0, Max, Acc) when N > 0 ->
     {_, State1} = rand:uniform_s(Max, State0),
     {Random, State2} = rand:uniform_s(Max, rand:jump(State1)),
     case N rem (?LOOP_JUMP div 100) of
-	0 -> gen_jump_1(N-1, State2, Max, [Random|Acc]);
-	_ -> gen_jump_1(N-1, State2, Max, Acc)
+	0 -> gen_jump_3(N-1, State2, Max, [Random|Acc]);
+	_ -> gen_jump_3(N-1, State2, Max, Acc)
     end;
-gen_jump_1(_, _, _, Acc) -> lists:reverse(Acc).
+gen_jump_3(_, _, _, Acc) -> lists:reverse(Acc).
 
 
 %% Check if each algorithm generates the proper jump sequence
 %% with the internal state in the process dictionary.
 reference_jump_procdict(Config) when is_list(Config) ->
-    [reference_jump_0(Alg) || Alg <- algs()],
+    [reference_jump_p1(Alg) || Alg <- algs()],
     ok.
 
-reference_jump_0(Alg) ->
+reference_jump_p1(Alg) ->
     Refval  = reference_jump_val(Alg),
-    Testval = gen_jump_0(Alg),
-    case Refval =:= Testval of
-        true -> ok;
-        false ->
-	    io:format("Failed: ~p~n",[Alg]),
-	    io:format("Length ~p ~p~n",[length(Refval), length(Testval)]),
-	    io:format("Head ~p ~p~n",[hd(Refval), hd(Testval)]),
-	    exit(wrong_value)
+    if
+	Refval =:= not_implemented -> Refval;
+	true ->
+	    case gen_jump_p1(Alg) of
+		Refval -> ok;
+		Testval ->
+		    io:format("Failed: ~p~n",[Alg]),
+		    io:format("Length ~p ~p~n",[length(Refval), length(Testval)]),
+		    io:format("Head ~p ~p~n",[hd(Refval), hd(Testval)]),
+		    exit(wrong_value)
+	    end
     end.
 
-gen_jump_0(Algo) ->
-    Seed = case Algo of
-	       exs64 -> %% Test exception of not_implemented notice
-                   try
-                       _ = rand:seed(exs64),
-                       rand:jump()
-                   catch
-                       error:not_implemented -> not_implemented
-                   end;
-	       _ when Algo =:= exsplus; Algo =:= exsp; Algo =:= exrop ->
-                   %% Printed with orig 'C' code and this seed
-		   rand:seed({Algo, [12345678|12345678]});
-	       _ when Algo =:= exs1024; Algo =:= exs1024s ->
-                   %% Printed with orig 'C' code and this seed
-		   rand:seed({Algo, {lists:duplicate(16, 12345678), []}});
-	       _ -> % unimplemented
-		   not_implemented
-	   end,
-    case Seed of
-        not_implemented -> [not_implemented];
-        _ ->
-            Max = range(Seed),
-            gen_jump_0(?LOOP_JUMP, Max, [])
+gen_jump_p1(Algo) ->
+    case Algo of
+	exs64 -> %% Test exception of not_implemented notice
+	    try
+		_ = rand:seed(exs64),
+		rand:jump()
+	    catch
+		error:not_implemented -> [error_not_implemented]
+	    end;
+	_ when Algo =:= exsplus; Algo =:= exsp; Algo =:= exrop; Algo =:= exsss ->
+	    %% Printed with orig 'C' code and this seed
+	    gen_jump_p2(
+	      rand:seed(Algo, [12345678,12345678]));
+	_ when Algo =:= exs1024; Algo =:= exs1024s; Algo =:= exro928ss ->
+	    %% Printed with orig 'C' code and this seed
+	    gen_jump_p2(
+	      rand:seed(Algo, lists:duplicate(16, 12345678)))
     end.
 
-gen_jump_0(N, Max, Acc) when N > 0 ->
+gen_jump_p2(Seed) ->
+    Max = range(Seed),
+    gen_jump_p3(?LOOP_JUMP, Max, []).
+
+gen_jump_p3(N, Max, Acc) when N > 0 ->
     _ = rand:uniform(Max),
     _ = rand:jump(),
     Random = rand:uniform(Max),
     case N rem (?LOOP_JUMP div 100) of
-	0 -> gen_jump_0(N-1, Max, [Random|Acc]);
-	_ -> gen_jump_0(N-1, Max, Acc)
+	0 -> gen_jump_p3(N-1, Max, [Random|Acc]);
+	_ -> gen_jump_p3(N-1, Max, Acc)
     end;
-gen_jump_0(_, _, Acc) -> lists:reverse(Acc).
+gen_jump_p3(_, _, Acc) -> lists:reverse(Acc).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+short_jump(Config) when is_list(Config) ->
+    Seed = erlang:system_time(),
+    short_jump(
+      rand:seed_s(exro928ss, Seed),
+      fun ({Alg,AlgState}) ->
+	      {Alg,rand:exro928_jump_2pow20(AlgState)}
+      end),
+    short_jump(
+      crypto:rand_seed_alg_s(crypto_aes, integer_to_list(Seed)),
+      fun ({Alg,AlgState}) ->
+	      {Alg,crypto:rand_plugin_aes_jump_2pow20(AlgState)}
+      end),
+    ok.
+
+short_jump({#{bits := Bits},_} = State_0, Jump2Pow20) ->
+    Range = 1 bsl Bits,
+    State_1 = repeat(7, Range, State_0),
+    %%
+    State_2a = repeat(1 bsl 20, Range, State_1),
+    State_2b = Jump2Pow20(State_1),
+    check(17, Range, State_2a, State_2b),
+    %%
+    {_,State_3a} = rand:uniform_s(Range, State_2a),
+    State_4a = Jump2Pow20(State_3a),
+    State_4b = repeat((1 bsl 20) + 1, Range, State_2b),
+    check(17, Range, State_4a, State_4b).
+
+repeat(0, _Range, State) ->
+    State;
+repeat(N, Range, State) ->
+    {_, NewState} = rand:uniform_s(Range, State),
+    repeat(N - 1, Range, NewState).
+
+check(0, _Range, _StateA, _StateB) ->
+    ok;
+check(N, Range, StateA, StateB) ->
+    {V,NewStateA} = rand:uniform_s(Range, StateA),
+    case rand:uniform_s(Range, StateB) of
+	{V,NewStateB} ->
+	    check(N - 1, Range, NewStateA, NewStateB);
+	{Wrong,_} ->
+	    ct:fail({Wrong,neq,V,for,N})
+    end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Data
@@ -1324,6 +1377,34 @@ reference_val(exsplus) ->
      16#3dd493b8012970f,16#be13bed1e00e5c,16#ceef033b74ae10,16#3da38c6a50abe03,
      16#15cbd1a421c7a8c,16#22794e3ec6ef3b1,16#26154d26e7ea99f,16#3a66681359a6ab6];
 
+reference_val(exsss) ->
+    [16#108e8d5b01,16#33b72092117209a,16#224d4d2961a2d0a,16#2c4c81aac3da48d,
+     16#2f4bc39bfc36f3a,16#41826d4c4d243a,16#19871b8bb4e23ee,16#3e2112cdf9384b1,
+     16#69801943bf91ab,16#2de1a603c31ec45,16#a90ca1991b831e,16#51ca29571a69a7,
+     16#93ce3e511906cf,16#93ebc5768aef75,16#2412f284b902ae7,16#1ac10e758410c52,
+     16#3f32494560368f6,16#39a5e82dcf0de95,16#3f4b14d59cc6a21,16#3174668db0b36ae,
+     16#1449812fb8bd54e,16#eaca1f8ece51e1,16#2564b2545fd23c1,16#3cf3a2d2217e0d7,
+     16#226f4164ba1d054,16#10dac9ae207ceef,16#17f2c4b2d40fcb9,16#1c1b282d386fdcb,
+     16#a264f450ba2912,16#2a0a1dd67e52666,16#2be84eb835cb1e1,16#2a1cd9aa16ccc37,
+     16#7dd5e8c2b3f490,16#254a3db4976c05b,16#2a0a67971ec1e63,16#13a0cbf7c0eed8a,
+     16#3192d7edc0a20bc,16#2705ad756292e84,16#3ec429a18119c81,16#25944b38baa975b,
+     16#291dcc43e3256f4,16#30d10b759237db,16#c1522a652058a,16#8ef1e9378381e6,
+     16#1f442f33c2439f4,16#186087710a73818,16#12887f94b2b8387,16#3e42e8b1f3c9b4b,
+     16#e462859d55f9d8,16#2356ae85be908de,16#15e96a927b3bc52,16#35c6dc52511ce46,
+     16#7bc0624ce66e01,16#33ab7d95b738322,16#26f01effc182aa0,16#1b66ae7eaafea88,
+     16#278f3dc14943b90,16#22178bc8d8faf28,16#396c37d53c11985,16#5e0d79d0b10f18,
+     16#1be3de3b5675ec,16#d4db298f1f4b50,16#2da6cb99bb5c7b1,16#130b2dc17d03be8,
+     16#f1847e7e059e9f,16#2da6591788326e7,16#222e4a18c24211c,16#949213ca49baab,
+     16#b5129fec56f6a2,16#30f25f1e926f43e,16#1ddd8d04445fb4d,16#15995b542514150,
+     16#1595fe879296296,16#e2f237a488453b,16#23e5cd2d6047890,16#3a5dc88fc954666,
+     16#89bca9969b103,16#5e6893cd35dc63,16#1fed534feeeef5a,16#26f40e2147ee558,
+     16#30c131a00625837,16#2618a7e617422e9,16#23630b297e45e7,16#1143b17502f3219,
+     16#15607dac41168da,16#2886bdc314b3fb8,16#465d1cc1536546,16#30b09123e3a02e4,
+     16#245a375f810be52,16#6a1b0792376a03,16#221425f59f2470f,16#867ce16dfac81c,
+     16#9c62d95fae9b58,16#380381db1394426,16#34908dedc01c324,16#1f0ff517089b561,
+     16#1571366dd873d32,16#3ee353dc56e192,16#15a1dee8d889b11,16#41036ad76d9888
+    ];
+
 reference_val(exsp) ->
     reference_val(exsplus);
 reference_val(exs1024s) ->
@@ -1390,7 +1471,50 @@ reference_val(exrop) ->
      250789092615679985,78848633178610658,72059442721196128,
      98223942961505519,191144652663779840,
      102425686803727694,89058927716079076,80721467542933080,
-     8462479817391645,2774921106204163].
+     8462479817391645,2774921106204163];
+
+reference_val(exro928ss) ->
+%% Same as for exrop, but this state init:
+%%     for (n = 0;  n < 16;  n++) {
+%%         s[n] = 12345678;
+    [16#000000108e8d5b01,16#03604028f2769dff,16#007f92f60bc7170c,
+     16#035ea81a9898a5e2,16#0104c90c5a0c8178,16#0313514025cca717,
+     16#03c5506b2a2e98cf,16#0098a5405961552e,16#004ad29eabb785a0,
+     16#033ea8ec4efb8058,16#00b21545e62bef1c,16#0333fc5320703482,
+     16#02c3c650e51a8d47,16#03a3b7fc848c9cda,16#03775adea6cddff5,
+     16#01ae5499c9049973,16#03d3c90e5504e16b,16#0383cd6b6cb852e6,
+     16#009c8d0996ef543a,16#0059cf671371af60,16#03dfd68ed980b719,
+     16#0290f2a0acf2c5b0,16#029061df18d63b55,16#02e702ea4b45137b,
+     16#029a0ccca604d848,16#01664c7cd31f0fa6,16#00dced83e60ccddc,
+     16#008764d2c9a05f3e,16#02b9ca5f6a80c4ba,16#02daf93d2c566750,
+     16#0147d326ead18ace,16#014b452efc19297f,16#0242d3f7a7237eca,
+     16#0141bb68c2abce39,16#02d798e1230baf45,16#0216bf8f25c1ec2d,
+     16#003a43ea733f1e1f,16#036c75390db736f3,16#028cca5f5f48c6f9,
+     16#0186e4a17174d6cf,16#02152679dfa4c25c,16#01429b9f15e3b9d6,
+     16#0134a61411d22bb0,16#01593f7d970d1c94,16#0205a7d8a305490f,
+     16#01dd092272595a9c,16#0028c95208aad2d4,16#016347c25cc24162,
+     16#025306acfb891309,16#0207a07e2bebef2f,16#024ee78d86ff5288,
+     16#030b53192db97613,16#03f765cb9e98e611,16#025ec35a1e237377,
+     16#03d81fd73102ef6f,16#0242dc8fea9a68b2,16#00abb876c1d4ea1b,
+     16#00871ffd2b7e45fb,16#03593ff73c9be08d,16#00b96b2b8aca3688,
+     16#0174aba957b7cf7b,16#012b7a5d4cf4a5b7,16#032a5260f2123db8,
+     16#00f9374d88ee0080,16#030df39bec2ad657,16#00dce0cb81d006c4,
+     16#038213b806303c76,16#03940aafdbfabf84,16#0398dbb26aeba037,
+     16#01eb28d61951587f,16#00fed3d2aacfeef4,16#03499587547d6e40,
+     16#01b192fe6e979e3c,16#00e974bf5f0a26d0,16#012ed94f76459c83,
+     16#02d76859e7a82587,16#00d1d2c7b791f51b,16#03988058017a031b,
+     16#00bbcf4b59d8e86d,16#015ed8b73a1b767c,16#0277283ea6a5ee74,
+     16#002211460dd6d422,16#001ad62761ee9fbd,16#037311b44518b067,
+     16#02b5ed61bf70904e,16#011862a05c1929fa,16#014be68683c3bab4,
+     16#025c29aa5c508b07,16#00895c6106f97378,16#026ce91a3d671c7f,
+     16#02591f4c74784293,16#02f0ed2a70bc1853,16#00a2762ff614bfbc,
+     16#008f4e354f0c20d4,16#038b66fb587ed430,16#00636296e188de89,
+     16#0278fadd143e74f5,16#029697ccf1b3a4c2,16#011eccb273404458,
+     16#03f204064a9fe0c0];
+
+reference_val(_) ->
+    not_implemented.
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -1421,6 +1545,33 @@ reference_jump_val(exsplus) ->
      12504080415362731, 45083100453836317, 270968267812126657, 93505647407734103,
      252852934678537969, 258758309277167202, 74250882143432077, 141629095984552833];
 
+reference_jump_val(exsss) ->
+    [16#304ae783d40db2b,16#1dfb196b3a5600a,16#2a24116effc6a0d,16#1f138d68c56725,
+     16#9360a445e2f989,16#32ed8080390e242,16#294ca85a270cff6,16#1418e6296a88bf,
+     16#114fae3dc578ba7,16#479c42c760eb72,16#334a40655df22d6,16#e7a85dd4d37d72,
+     16#181db16c8925c77,16#1b8a5a8afd16cbd,16#329107bf9777a39,16#2fc915c08535e42,
+     16#16696d142c6078,16#2e2a2601c919448,16#2246150d1000568,16#26109007cb3dd44,
+     16#3761360723e3175,16#169abd352db74de,16#1c97d520983684f,16#12455f0adee8c66,
+     16#46719cff00622d,16#1fc92792ed4e437,16#18e2edae21affb5,16#3a67fa9e3e7d46e,
+     16#1313fdc2728aa74,16#1c1a2b577581db8,16#db49357ea196b1,16#10e219a21d93fc7,
+     16#3c43abede083666,16#3eef5055a58bbf9,16#1975056f95d90e3,16#3916c133ab16d87,
+     16#2bc0bea891c26f1,16#391e4b369fc6b36,16#183f83155a359f6,16#1d9f137e9d2e488,
+     16#ef084de5f4cd3c,16#36a9cf7e29e55d3,16#19eca704e0409a7,16#1bdb99902896c69,
+     16#21777e2ad128203,16#5d0369ec0563e4,16#36db40b863bd74a,16#33feb71b7515159,
+     16#208d923ce26f257,16#3841b32891c082d,16#2748f224c2ba226,16#2fcd93b2daf79bb,
+     16#2c8e6cacad58ec4,16#39850131a1a85f,16#134648d6eea624d,16#2e102e197d5725c,
+     16#12ac280fa744758,16#1c18266c7442d16,16#22b5f91b15fe17e,16#316740ca870f7c8,
+     16#720ed4836c426,16#1aac0f738d04f8c,16#34fcd2a647b462c,16#3d430ac755114a3,
+     16#3692e3670fdf2a,16#265279ab0fc0a15,16#10bd883dee80945,16#10e7843413175e4,
+     16#b291deba08cee2,16#3915a8234caf11,16#34b911b96707dbd,16#ae63fcda15fde6,
+     16#b13b9091e82e41,16#29de1b6d70dc04f,16#23fbcbc409617e8,16#1389a0738061066,
+     16#360f39af790f5d1,16#f436da2a7d12f5,16#2d06ba8da21e08,16#3601a6492b887d,
+     16#2b2590b8c6cc186,16#f8d613b6904464,16#e5456786e46b78,16#201b8b1f96ed80c,
+     16#1b75b86d9b843f2,16#2e8bfaa7243a630,16#125ff068a78c3b4,16#3875a28c48bd26e,
+     16#f09a06941fc9d7,16#107c4de8ca77744,16#357c34144bb9ed6,16#3ccc55d3ebb3378,
+     16#28db7cea7d3fdee,16#3197fd0b49f6370,16#11af6fedb708ea6,16#2bde0382e37469e,
+     16#10666171abddb3f,16#1a8876c1f4e78a8,16#169c0efd4422043,16#1501c49abf0440f];
+
 reference_jump_val(exs1024) ->
     [2655961906500790629, 17003395417078685063, 10466831598958356428, 7603399148503548021,
      1650550950190587188, 12294992315080723704, 15743995773860389219, 5492181000145247327,
@@ -1452,7 +1603,7 @@ reference_jump_val(exsp) ->
     reference_jump_val(exsplus);
 reference_jump_val(exs1024s) ->
     reference_jump_val(exs1024);
-reference_jump_val(exs64) -> [not_implemented];
+reference_jump_val(exs64) -> [error_not_implemented];
 reference_jump_val(exrop) ->
 %% #include <stdint.h>
 %% #include <stdio.h>
@@ -1517,7 +1668,50 @@ reference_jump_val(exrop) ->
      250227633882474729,171181147785250210,55437891969696407,
      241227318715885854,77323084015890802,
      1663590009695191,234064400749487599,222983191707424780,
-     254956809144783896,203898972156838252].
+     254956809144783896,203898972156838252];
+
+reference_jump_val(exro928ss) ->
+%% Same as for exrop, but this state init:
+%%     for (n = 0;  n < 16;  n++) {
+%%         s[n] = 12345678;
+    [16#031ee449e53b6689,16#001afeee12813137,16#005e2172711df36b,
+     16#02850aea3a595d36,16#0029705187e891c7,16#001794badd489667,
+     16#00ab621be15be56c,16#024b663a6924786b,16#03cab70b8ab854bf,
+     16#01daa37601285320,16#02db955a53c40e89,16#01fbef51d5c65891,
+     16#02fecf4116ed5f77,16#0349c2057246ac5d,16#01217f257c4fa148,
+     16#0367ee84d020697d,16#01d5cf647fe23335,16#020941838adfb750,
+     16#02c2da26b1d7b3e5,16#00d1583d34cea6c0,16#038be9cb5b527f50,
+     16#00bfa93c1d7f4864,16#03778912a4f56b14,16#037fcabc483fa5c5,
+     16#00a3c9de6aaf5fc7,16#03600b883b2f2b42,16#03797a99ffddfdfb,
+     16#0189fead429945b7,16#0103ac90cd912508,16#03e3d872fd950d64,
+     16#0214fc3e77dc2f02,16#02a084f4f0e580ca,16#035d2fe72266a7f3,
+     16#02887c49ae7e41a4,16#0011dc026af83c51,16#02d28bfd32c2c517,
+     16#022e4165c33ad4f3,16#01f053cf0687b052,16#035315e6e53c8918,
+     16#01255312da07b572,16#0237f1da11ec9221,16#02faf2e282fb1fb1,
+     16#0227423ec1787ebc,16#011fa5eb1505571c,16#0275ff9eaaa1abdd,
+     16#03e2d032c3981cb4,16#0181bb32d51d3072,16#01b1d3939b9f16ec,
+     16#0259f09f55d1112f,16#0396464a2767e428,16#039777c0368bdb9e,
+     16#0320925f35f36c5f,16#02a35289e0af1248,16#02e80bd4bc72254b,
+     16#00a8b11af1674d68,16#027735036100a69e,16#03c8c268ded7f254,
+     16#03de80aa57c65217,16#00f2247754d24000,16#005582a42b467f89,
+     16#0031906569729477,16#00fd523f2ca4fefe,16#00ad223113d1e336,
+     16#0238ddf026cbfca9,16#028b98211cfed876,16#0354353ebcc0de9a,
+     16#009ee370c1e154f4,16#033131af3b8a7f88,16#032291baa45801e3,
+     16#00941fc2b45eb217,16#035d6a61fa101647,16#03fdb51f736f1bbc,
+     16#0232f7b98539faa0,16#0311b35319e3a61e,16#0048356b17860eb5,
+     16#01a205b2554ce71e,16#03f873ea136e29d6,16#003c67d5c3df5ffd,
+     16#00cd19e7a8641648,16#0149a8c54e4ba45e,16#0329498d134d2f6a,
+     16#03b69421ae65ee2b,16#01a8d20b59447429,16#006b2292571032a2,
+     16#00c193b17da22ba5,16#01faa7ab62181249,16#00acd401cd596a00,
+     16#005b5086c3531402,16#0259113d5d3d058d,16#00bef3f3ce4a43b2,
+     16#014837a4070b893c,16#00460a26ac2eeec1,16#026219a8b8c63d7e,
+     16#03c7b8ed032cf5a6,16#004da912a1fff131,16#0297de3716215741,
+     16#0079fb9b4c715466,16#00a73bad4ae5a356,16#0072e606c0d4ab86,
+     16#02374382d5f9bd2e];
+
+reference_jump_val(_) ->
+    not_implemented.
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
diff --git a/lib/stdlib/test/rand_Xoroshiro928ss_dev.txt b/lib/stdlib/test/rand_Xoroshiro928ss_dev.txt
new file mode 100644
index 0000000000..150f37fcfa
--- /dev/null
+++ b/lib/stdlib/test/rand_Xoroshiro928ss_dev.txt
@@ -0,0 +1,343 @@
+%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%
+
+
+Memorable facts from designing the Xoroshiro928** generator
+===========================================================
+AKA: exro928ss in the rand module
+
+Author: Raimo Niskanen, for the Erlang/OTP team @ Ericsson.
+
+Reference URL: http://vigna.di.unimi.it/ftp/papers/ScrambledLinear.pdf
+i.e the Xoroshiro1024 generator with ** scrambler:
+
+    int p;
+    uint64_t s[16];
+    
+    const int q = p;
+    const uint64_t s0 = s[p = (p + 1) & 15];
+    
+    uint64_t s15 = s[q];
+    
+    const uint64_t result_starstar = rotl(s0 * S, R) * T;
+    
+    s15 ^= s0;
+    s[q] = rotl(s0, A) ^ s15 ^ (s15 << B);
+    s[p] = rotl(s15, C);
+
+Where {S, R, T} = {5, 7, 9} as recommended in the paper.
+
+We want to scale down to 58 bit words (16 of them)
+so we get a generator with period 2^928 - 1.
+
+{A, B, C} were deduced as follows
+---------------------------------
+
+First, to find which triplets that give a full period generator
+one have to factor 2^928 - 1.
+
+https://www.alpertron.com.ar/ECM.HTM actually could do that
+and gave the result:
+
+    Value
+    2^928 - 1
+    
+    2269 007733 883335 972287 082669 296112 915239 349672 942191 252221 331572
+    442536 403137 824056 312817 862695 551072 066953 619064 625508 194663
+    368599 769448 406663 254670 871573 830845 597595 897613 333042 429214
+    224697 474472 410882 236254 024057 110212 260250 671521 235807 709272
+    244389 361641 091086 035023 229622 419455 (280 digits) = 3 × 5 × 17 × 59 ×
+    233 × 257 × 929 × 1103 × 2089 × 5569 × 8353 × 59393 × 65537 × 3 033169 ×
+    39 594977 × 107 367629 × 536 903681 × 748 264961 × 2245 984577 × 239
+    686663 718401 × 15 929619 591127 520827 829953 × 82280 195167 144119
+    832390 568177 × 6033 312171 721035 031651 315652 130497 (34 digits) × 18
+    774318 450142 955120 650303 957350 521748 903233 (44 digits) × 15 694604
+    006012 505869 851221 169365 594050 637743 819041 (50 digits) 
+
+Sebastiano Vigna from that calculated all full period triplets, at the
+end of this document, and the ones with the highest degree were:
+
+    23-25-12  411
+    36-2-35   411
+    55-5-54   411
+    14-19-11  415
+    34-37-5   415
+    37-3-56   415
+    55-11-54  417
+    30-3-41   419
+    11-45-50  423
+    50-19-47  423
+    52-27-13  427
+    54-9-25   433
+    56-43-35  433
+    44-9-45   441
+
+All these candidates were tested with TestU01-1.2.3:
+
+    http://simul.iro.umontreal.ca/testu01/tu01.html
+
+A plugin was created with parameters for {A, B, C} and, since
+TestU01 is a 32-bit test tool, with parameters to reverse
+the generated bits or not, and to take the 32 highest or lowest
+bits from the reversed or non-reversed 58 bit output.
+
+The generators were seeded with a SplitMix64 generator like the
+one used for seeding this generator in the rand module,
+taking the 58 lowest bits and wasting all zero values.
+
+3 runs were made with all candidates and all four bit selection variants.
+For these runs the seeder was initialized with 12345678, 876543212345678
+and 1234567890.
+
+After all these runs the candidate with the highest degree: 44-9-45
+had not gotten any suspicious p-value at all.  All the other
+got p-values around 5.0e-4 worst 9.8e-6 suggesting only random
+failures, so they would probably have worked about as well.
+
+Finally 44-9-45 was run through PractRand-0.93:
+
+    http://pracrand.sourceforge.net/
+
+Again, all 4 bit selection variants of 32 bits were run.
+Random failures with p-values around e-3..e-4 for the "smaller"
+tests, but for 8, 16 and 32 TB tests no anomalies were found
+(with the internal seeder masked to 58 bits):
+
+    Xoroshiro928High seed:        0x3178ec5d
+    Xoroshiro928Low seed:         0xa9a04fb9
+    Xoroshiro928ReverseHigh seed: 0xfa0bdbab
+    Xoroshiro928ReverseLow seed:  0xada51705
+
+
+Then, S. Vigna calculated the 2^512 jump coefficient as well
+as a 2^20 jump coefficient (for testing purposes) for 44-9-45.
+
+2^512:
+  { 0x44085302f77130ca, 0xba05381fdfd14902, 0x10a1de1d7d6813d2,
+    0xb83fe51a1eb3be19, 0xa81b0090567fd9f0, 0x5ac26d5d20f9b49f,
+    0x4ddd98ee4be41e01, 0x0657e19f00d4b358, 0xf02f778573cf0f0a,
+    0xb45a3a8a3cef3cc0, 0x6e62a33cc2323831, 0xbcb3b7c4cc049c53,
+    0x83f240c6007e76ce, 0xe19f5fc1a1504acd, 0x00000000b10773cb }
+
+2^20:
+  { 0xbdb966a3daf905e6, 0x644807a56270cf78, 0xda90f4a806c17e9e,
+    0x4a426866bfad3c77, 0xaf699c306d8e7566, 0x8ebc73c700b8b091,
+    0xc081a7bf148531fb, 0xdc4d3af15f8a4dfd, 0x90627c014098f4b6,
+    0x06df2eb1feaf0fb6, 0x5bdeb1a5a90f2e6b, 0xa480c5878c3549bd,
+    0xff45ef33c82f3d48, 0xa30bebc15fefcc78, 0x00000000cb3d181c }
+
+Standard jump function pseudocode:
+
+    Jump constant j = 0xb10773cb...44085302f77130ca
+    Generator state: s
+    New generator state: t = 0
+    foreach bit in j, low to high:
+        if the bit is one:
+            t ^= s
+        next s
+    s = t
+
+
+The complete list of full period constants
+------------------------------------------
+
+29-48-54	27	x^928 + x^874 + x^870 + x^840 + x^814 + x^784 + x^759 + x^750 + x^724 + x^720 + x^634 + x^630 + x^600 + x^574 + x^544 + x^519 + x^510 + x^484 + x^480 + x^390 + x^360 + x^270 + x^240 + x^150 + x^120 + x^30 + 1
+
+29-18-56	65	x^928 + x^870 + x^850 + x^840 + x^832 + x^821 + x^802 + x^791 + x^761 + x^750 + x^734 + x^731 + x^720 + x^712 + x^701 + x^686 + x^674 + x^671 + x^663 + x^641 + x^630 + x^611 + x^610 + x^603 + x^600 + x^596 + x^577 + x^566 + x^547 + x^524 + x^517 + x^510 + x^487 + x^480 + x^476 + x^464 + x^457 + x^446 + x^427 + x^423 + x^397 + x^390 + x^367 + x^363 + x^360 + x^356 + x^352 + x^341 + x^326 + x^322 + x^311 + x^281 + x^270 + x^251 + x^240 + x^236 + x^232 + x^221 + x^191 + x^161 + x^150 + x^131 + x^120 + x^30 + 1
+
+29-32-36	81	x^928 + x^874 + x^870 + x^840 + x^820 + x^819 + x^794 + x^790 + x^770 + x^765 + x^764 + x^760 + x^754 + x^750 + x^740 + x^739 + x^735 + x^734 + x^730 + x^709 + x^704 + x^674 + x^670 + x^665 + x^660 + x^650 + x^649 + x^635 + x^634 + x^619 + x^614 + x^605 + x^595 + x^585 + x^584 + x^579 + x^564 + x^555 + x^545 + x^540 + x^524 + x^515 + x^514 + x^495 + x^490 + x^485 + x^460 + x^455 + x^435 + x^425 + x^400 + x^395 + x^375 + x^370 + x^365 + x^340 + x^315 + x^310 + x^305 + x^300 + x^290 + x^285 + x^275 + x^260 + x^250 + x^245 + x^240 + x^215 + x^190 + x^180 + x^170 + x^150 + x^130 + x^120 + x^115 + x^105 + x^100 + x^75 + x^40 + x^30 + 1
+
+39-10-20	105	x^928 + x^898 + x^870 + x^841 + x^840 + x^808 + x^783 + x^782 + x^781 + x^780 + x^778 + x^754 + x^752 + x^724 + x^721 + x^720 + x^696 + x^692 + x^688 + x^667 + x^666 + x^661 + x^660 + x^658 + x^638 + x^636 + x^632 + x^609 + x^607 + x^606 + x^605 + x^604 + x^601 + x^600 + x^580 + x^578 + x^576 + x^572 + x^568 + x^549 + x^548 + x^541 + x^540 + x^538 + x^516 + x^512 + x^489 + x^485 + x^484 + x^481 + x^480 + x^456 + x^452 + x^448 + x^429 + x^428 + x^421 + x^420 + x^418 + x^400 + x^398 + x^396 + x^392 + x^368 + x^365 + x^364 + x^336 + x^328 + x^319 + x^318 + x^315 + x^314 + x^298 + x^286 + x^278 + x^276 + x^274 + x^255 + x^254 + x^249 + x^245 + x^228 + x^226 + x^220 + x^208 + x^199 + x^198 + x^189 + x^188 + x^178 + x^168 + x^166 + x^160 + x^129 + x^128 + x^108 + x^100 + x^88 + x^79 + x^78 + x^69 + x^68 + x^58 + x^40 + 1
+
+4-4-9	149	x^928 + x^898 + x^886 + x^870 + x^856 + x^826 + x^823 + x^808 + x^796 + x^793 + x^784 + x^778 + x^772 + x^766 + x^760 + x^754 + x^751 + x^742 + x^736 + x^734 + x^724 + x^713 + x^709 + x^706 + x^703 + x^694 + x^691 + x^688 + x^676 + x^674 + x^673 + x^664 + x^662 + x^658 + x^653 + x^641 + x^640 + x^634 + x^632 + x^631 + x^620 + x^614 + x^611 + x^608 + x^604 + x^602 + x^599 + x^590 + x^583 + x^581 + x^578 + x^574 + x^572 + x^571 + x^569 + x^568 + x^561 + x^554 + x^553 + x^551 + x^544 + x^542 + x^540 + x^538 + x^532 + x^531 + x^518 + x^514 + x^512 + x^502 + x^498 + x^489 + x^488 + x^484 + x^482 + x^480 + x^479 + x^468 + x^463 + x^456 + x^454 + x^452 + x^449 + x^448 + x^438 + x^433 + x^429 + x^424 + x^422 + x^420 + x^418 + x^408 + x^406 + x^401 + x^396 + x^394 + x^392 + x^380 + x^378 + x^376 + x^371 + x^367 + x^364 + x^362 + x^360 + x^350 + x^348 + x^346 + x^341 + x^334 + x^332 + x^328 + x^318 + x^311 + x^307 + x^304 + x^302 + x^300 + x^298 + x^288 + x^274 + x^272 + x^254 + x^249 + x^242 + x^240 + x^233 + x^212 + x^208 + x^189 + x^180 + x^178 + x^166 + x^152 + x^143 + x^136 + x^127 + x^122 + x^120 + x^113 + x^106 + x^88 + x^83 + x^81 + x^67 + x^58 + x^51 + x^14 + 1
+
+44-44-45	157	x^928 + x^898 + x^870 + x^850 + x^830 + x^820 + x^808 + x^800 + x^790 + x^782 + x^778 + x^777 + x^760 + x^757 + x^752 + x^747 + x^742 + x^727 + x^702 + x^694 + x^689 + x^688 + x^679 + x^674 + x^659 + x^658 + x^657 + x^644 + x^642 + x^637 + x^634 + x^627 + x^619 + x^612 + x^607 + x^606 + x^601 + x^596 + x^594 + x^591 + x^590 + x^584 + x^576 + x^568 + x^566 + x^561 + x^560 + x^556 + x^554 + x^546 + x^541 + x^539 + x^538 + x^518 + x^516 + x^511 + x^509 + x^503 + x^502 + x^499 + x^496 + x^488 + x^476 + x^471 + x^468 + x^466 + x^464 + x^448 + x^446 + x^441 + x^436 + x^421 + x^420 + x^415 + x^411 + x^408 + x^404 + x^400 + x^388 + x^383 + x^381 + x^379 + x^376 + x^363 + x^358 + x^356 + x^354 + x^346 + x^344 + x^340 + x^333 + x^330 + x^328 + x^325 + x^316 + x^312 + x^307 + x^305 + x^302 + x^284 + x^282 + x^277 + x^270 + x^268 + x^267 + x^256 + x^252 + x^249 + x^245 + x^244 + x^239 + x^238 + x^236 + x^231 + x^228 + x^226 + x^224 + x^222 + x^215 + x^208 + x^207 + x^205 + x^203 + x^201 + x^199 + x^196 + x^194 + x^192 + x^189 + x^185 + x^184 + x^182 + x^180 + x^175 + x^171 + x^168 + x^166 + x^162 + x^161 + x^155 + x^152 + x^150 + x^141 + x^134 + x^132 + x^131 + x^127 + x^122 + x^111 + x^104 + x^92 + x^90 + x^83 + x^81 + x^58 + x^37 + 1
+
+40-40-7	167	x^928 + x^898 + x^870 + x^866 + x^838 + x^836 + x^807 + x^806 + x^804 + x^778 + x^777 + x^774 + x^745 + x^744 + x^742 + x^718 + x^714 + x^713 + x^712 + x^687 + x^658 + x^657 + x^656 + x^655 + x^654 + x^626 + x^620 + x^619 + x^598 + x^596 + x^592 + x^591 + x^589 + x^566 + x^564 + x^563 + x^562 + x^560 + x^558 + x^538 + x^534 + x^530 + x^529 + x^504 + x^503 + x^502 + x^500 + x^499 + x^498 + x^496 + x^478 + x^474 + x^470 + x^469 + x^443 + x^442 + x^441 + x^439 + x^438 + x^436 + x^434 + x^432 + x^418 + x^416 + x^414 + x^410 + x^409 + x^407 + x^406 + x^405 + x^402 + x^386 + x^383 + x^380 + x^374 + x^373 + x^372 + x^370 + x^356 + x^350 + x^349 + x^348 + x^347 + x^346 + x^345 + x^340 + x^328 + x^326 + x^324 + x^323 + x^321 + x^316 + x^314 + x^308 + x^298 + x^296 + x^294 + x^289 + x^285 + x^283 + x^282 + x^281 + x^280 + x^278 + x^263 + x^262 + x^259 + x^257 + x^255 + x^251 + x^249 + x^248 + x^246 + x^233 + x^232 + x^229 + x^220 + x^218 + x^217 + x^216 + x^208 + x^202 + x^201 + x^199 + x^195 + x^190 + x^188 + x^187 + x^186 + x^178 + x^172 + x^169 + x^167 + x^162 + x^161 + x^159 + x^158 + x^157 + x^146 + x^142 + x^139 + x^135 + x^125 + x^123 + x^116 + x^112 + x^107 + x^105 + x^94 + x^93 + x^88 + x^86 + x^84 + x^82 + x^75 + x^73 + x^69 + x^64 + x^58 + x^56 + x^54 + x^52 + x^43 + x^41 + x^39 + x^32 + 1
+
+47-47-18	217	x^928 + x^898 + x^871 + x^870 + x^843 + x^842 + x^841 + x^813 + x^812 + x^811 + x^808 + x^787 + x^786 + x^785 + x^783 + x^781 + x^778 + x^759 + x^757 + x^754 + x^753 + x^751 + x^729 + x^727 + x^726 + x^723 + x^721 + x^701 + x^700 + x^699 + x^697 + x^693 + x^691 + x^688 + x^673 + x^672 + x^670 + x^667 + x^663 + x^661 + x^658 + x^647 + x^644 + x^641 + x^637 + x^633 + x^631 + x^618 + x^617 + x^614 + x^613 + x^612 + x^611 + x^610 + x^607 + x^603 + x^601 + x^586 + x^585 + x^582 + x^581 + x^580 + x^577 + x^573 + x^571 + x^568 + x^562 + x^560 + x^556 + x^555 + x^554 + x^553 + x^551 + x^547 + x^543 + x^541 + x^538 + x^532 + x^530 + x^528 + x^524 + x^522 + x^521 + x^517 + x^513 + x^511 + x^506 + x^504 + x^502 + x^500 + x^497 + x^495 + x^491 + x^487 + x^483 + x^481 + x^478 + x^474 + x^472 + x^467 + x^466 + x^465 + x^461 + x^457 + x^453 + x^451 + x^444 + x^438 + x^437 + x^436 + x^435 + x^431 + x^427 + x^423 + x^412 + x^408 + x^407 + x^405 + x^401 + x^397 + x^390 + x^384 + x^377 + x^375 + x^371 + x^367 + x^366 + x^365 + x^363 + x^362 + x^360 + x^358 + x^356 + x^352 + x^350 + x^347 + x^345 + x^341 + x^337 + x^336 + x^334 + x^332 + x^324 + x^317 + x^315 + x^311 + x^307 + x^306 + x^305 + x^304 + x^302 + x^300 + x^298 + x^296 + x^287 + x^285 + x^281 + x^279 + x^277 + x^276 + x^274 + x^268 + x^266 + x^257 + x^255 + x^247 + x^244 + x^242 + x^240 + x^238 + x^234 + x^227 + x^221 + x^219 + x^216 + x^214 + x^206 + x^197 + x^195 + x^193 + x^182 + x^176 + x^161 + x^156 + x^152 + x^146 + x^139 + x^133 + x^116 + x^111 + x^109 + x^107 + x^96 + x^94 + x^92 + x^90 + x^88 + x^85 + x^81 + x^79 + x^77 + x^73 + x^66 + x^64 + x^62 + x^60 + x^53 + x^51 + x^47 + x^45 + x^36 + x^34 + x^32 + x^19 + x^17 + x^15 + 1
+
+31-52-54	249	x^928 + x^898 + x^872 + x^870 + x^842 + x^841 + x^838 + x^836 + x^812 + x^810 + x^782 + x^781 + x^779 + x^778 + x^774 + x^753 + x^752 + x^750 + x^748 + x^723 + x^722 + x^721 + x^719 + x^717 + x^714 + x^712 + x^694 + x^690 + x^689 + x^688 + x^686 + x^684 + x^664 + x^663 + x^662 + x^661 + x^660 + x^658 + x^657 + x^656 + x^655 + x^654 + x^653 + x^652 + x^650 + x^634 + x^633 + x^631 + x^630 + x^629 + x^628 + x^622 + x^604 + x^599 + x^597 + x^596 + x^593 + x^592 + x^590 + x^588 + x^570 + x^567 + x^566 + x^562 + x^560 + x^536 + x^534 + x^533 + x^531 + x^530 + x^526 + x^513 + x^512 + x^510 + x^509 + x^508 + x^507 + x^506 + x^505 + x^504 + x^502 + x^498 + x^483 + x^482 + x^481 + x^479 + x^478 + x^476 + x^466 + x^464 + x^454 + x^445 + x^438 + x^424 + x^423 + x^422 + x^421 + x^419 + x^418 + x^411 + x^404 + x^402 + x^394 + x^393 + x^392 + x^391 + x^390 + x^387 + x^386 + x^383 + x^380 + x^379 + x^378 + x^377 + x^376 + x^374 + x^364 + x^362 + x^361 + x^359 + x^357 + x^356 + x^355 + x^354 + x^351 + x^349 + x^348 + x^347 + x^345 + x^342 + x^340 + x^332 + x^330 + x^329 + x^328 + x^327 + x^325 + x^324 + x^323 + x^321 + x^319 + x^318 + x^316 + x^314 + x^312 + x^302 + x^301 + x^300 + x^296 + x^295 + x^294 + x^291 + x^289 + x^287 + x^286 + x^283 + x^278 + x^266 + x^265 + x^264 + x^263 + x^262 + x^260 + x^259 + x^255 + x^250 + x^234 + x^232 + x^229 + x^227 + x^226 + x^225 + x^222 + x^218 + x^216 + x^208 + x^204 + x^200 + x^198 + x^197 + x^195 + x^194 + x^193 + x^190 + x^188 + x^178 + x^174 + x^173 + x^172 + x^171 + x^170 + x^169 + x^168 + x^166 + x^165 + x^164 + x^162 + x^161 + x^160 + x^159 + x^158 + x^157 + x^156 + x^154 + x^142 + x^141 + x^139 + x^138 + x^135 + x^131 + x^128 + x^126 + x^116 + x^112 + x^110 + x^107 + x^106 + x^105 + x^104 + x^102 + x^100 + x^98 + x^96 + x^95 + x^94 + x^92 + x^88 + x^80 + x^79 + x^76 + x^74 + x^73 + x^71 + x^70 + x^69 + x^66 + x^65 + x^64 + x^56 + x^54 + x^48 + x^46 + x^45 + x^43 + x^38 + x^35 + x^33 + x^30 + 1
+
+57-54-32	249	x^928 + x^898 + x^870 + x^855 + x^848 + x^834 + x^826 + x^825 + x^808 + x^806 + x^805 + x^804 + x^798 + x^796 + x^788 + x^778 + x^776 + x^775 + x^766 + x^763 + x^756 + x^752 + x^745 + x^742 + x^736 + x^735 + x^734 + x^731 + x^715 + x^714 + x^713 + x^705 + x^703 + x^694 + x^688 + x^684 + x^682 + x^671 + x^660 + x^658 + x^652 + x^642 + x^641 + x^639 + x^634 + x^630 + x^621 + x^620 + x^616 + x^612 + x^609 + x^604 + x^602 + x^593 + x^591 + x^584 + x^579 + x^570 + x^568 + x^566 + x^565 + x^562 + x^558 + x^554 + x^550 + x^544 + x^536 + x^535 + x^533 + x^530 + x^529 + x^528 + x^524 + x^522 + x^517 + x^512 + x^505 + x^496 + x^494 + x^492 + x^491 + x^489 + x^480 + x^478 + x^475 + x^471 + x^464 + x^461 + x^454 + x^452 + x^450 + x^446 + x^445 + x^441 + x^438 + x^437 + x^436 + x^434 + x^430 + x^429 + x^427 + x^425 + x^420 + x^418 + x^416 + x^415 + x^413 + x^411 + x^409 + x^402 + x^397 + x^394 + x^392 + x^388 + x^386 + x^384 + x^377 + x^375 + x^371 + x^368 + x^367 + x^365 + x^364 + x^363 + x^362 + x^360 + x^358 + x^356 + x^353 + x^351 + x^346 + x^342 + x^341 + x^338 + x^335 + x^333 + x^330 + x^328 + x^326 + x^325 + x^317 + x^307 + x^304 + x^300 + x^296 + x^295 + x^293 + x^292 + x^288 + x^286 + x^285 + x^284 + x^283 + x^278 + x^277 + x^276 + x^273 + x^271 + x^270 + x^262 + x^261 + x^255 + x^253 + x^249 + x^248 + x^246 + x^245 + x^240 + x^236 + x^232 + x^231 + x^227 + x^224 + x^223 + x^221 + x^220 + x^217 + x^216 + x^212 + x^208 + x^205 + x^204 + x^198 + x^196 + x^192 + x^191 + x^190 + x^189 + x^187 + x^186 + x^178 + x^176 + x^175 + x^171 + x^169 + x^165 + x^160 + x^159 + x^158 + x^154 + x^152 + x^150 + x^148 + x^146 + x^144 + x^141 + x^134 + x^132 + x^131 + x^129 + x^127 + x^125 + x^123 + x^120 + x^118 + x^114 + x^113 + x^111 + x^106 + x^104 + x^103 + x^102 + x^101 + x^100 + x^99 + x^97 + x^95 + x^93 + x^88 + x^85 + x^77 + x^67 + x^62 + x^60 + x^55 + x^54 + x^53 + x^52 + x^51 + x^50 + x^48 + x^46 + x^40 + x^37 + x^33 + x^28 + x^27 + x^24 + 1
+
+1-38-28	251	x^928 + x^898 + x^870 + x^866 + x^836 + x^834 + x^832 + x^818 + x^808 + x^806 + x^804 + x^797 + x^788 + x^778 + x^776 + x^770 + x^767 + x^765 + x^738 + x^736 + x^733 + x^724 + x^717 + x^708 + x^706 + x^703 + x^701 + x^690 + x^688 + x^685 + x^678 + x^677 + x^676 + x^674 + x^672 + x^664 + x^658 + x^656 + x^652 + x^647 + x^645 + x^640 + x^626 + x^624 + x^621 + x^620 + x^616 + x^610 + x^608 + x^604 + x^600 + x^594 + x^593 + x^592 + x^590 + x^580 + x^578 + x^576 + x^575 + x^574 + x^572 + x^568 + x^566 + x^565 + x^564 + x^562 + x^560 + x^558 + x^552 + x^550 + x^549 + x^548 + x^544 + x^541 + x^538 + x^536 + x^533 + x^532 + x^529 + x^526 + x^522 + x^520 + x^519 + x^517 + x^514 + x^513 + x^509 + x^508 + x^504 + x^501 + x^494 + x^493 + x^484 + x^482 + x^469 + x^468 + x^466 + x^461 + x^453 + x^452 + x^448 + x^447 + x^436 + x^428 + x^424 + x^422 + x^420 + x^416 + x^414 + x^413 + x^412 + x^409 + x^408 + x^406 + x^405 + x^404 + x^400 + x^399 + x^397 + x^393 + x^391 + x^388 + x^385 + x^382 + x^381 + x^376 + x^374 + x^372 + x^370 + x^368 + x^366 + x^365 + x^360 + x^350 + x^349 + x^344 + x^341 + x^340 + x^336 + x^335 + x^334 + x^333 + x^332 + x^328 + x^326 + x^322 + x^319 + x^318 + x^308 + x^304 + x^300 + x^298 + x^293 + x^292 + x^290 + x^289 + x^287 + x^284 + x^281 + x^279 + x^278 + x^272 + x^271 + x^269 + x^264 + x^263 + x^261 + x^256 + x^254 + x^253 + x^250 + x^240 + x^238 + x^234 + x^229 + x^228 + x^226 + x^223 + x^221 + x^218 + x^213 + x^210 + x^208 + x^204 + x^198 + x^197 + x^196 + x^194 + x^191 + x^188 + x^186 + x^180 + x^176 + x^174 + x^172 + x^170 + x^169 + x^167 + x^165 + x^161 + x^159 + x^157 + x^153 + x^150 + x^149 + x^148 + x^145 + x^136 + x^135 + x^134 + x^133 + x^132 + x^130 + x^128 + x^127 + x^125 + x^122 + x^120 + x^118 + x^113 + x^110 + x^109 + x^108 + x^100 + x^96 + x^94 + x^92 + x^90 + x^88 + x^86 + x^85 + x^84 + x^81 + x^80 + x^72 + x^70 + x^66 + x^58 + x^53 + x^45 + x^36 + x^34 + x^32 + x^30 + x^24 + x^20 + x^16 + x^12 + x^8 + x^2 + 1
+
+47-57-20	279	x^928 + x^898 + x^880 + x^870 + x^864 + x^851 + x^850 + x^846 + x^830 + x^821 + x^820 + x^817 + x^812 + x^808 + x^807 + x^804 + x^796 + x^790 + x^783 + x^782 + x^777 + x^773 + x^762 + x^757 + x^753 + x^744 + x^743 + x^739 + x^731 + x^728 + x^714 + x^713 + x^710 + x^709 + x^705 + x^701 + x^694 + x^692 + x^688 + x^684 + x^683 + x^675 + x^672 + x^671 + x^668 + x^662 + x^660 + x^654 + x^653 + x^646 + x^642 + x^641 + x^637 + x^626 + x^624 + x^623 + x^608 + x^607 + x^603 + x^598 + x^593 + x^592 + x^590 + x^585 + x^578 + x^577 + x^574 + x^573 + x^572 + x^569 + x^568 + x^567 + x^563 + x^559 + x^558 + x^555 + x^551 + x^548 + x^547 + x^542 + x^539 + x^538 + x^537 + x^536 + x^535 + x^532 + x^530 + x^529 + x^525 + x^524 + x^521 + x^518 + x^517 + x^506 + x^505 + x^501 + x^496 + x^491 + x^490 + x^487 + x^471 + x^467 + x^462 + x^456 + x^452 + x^448 + x^446 + x^441 + x^440 + x^437 + x^433 + x^428 + x^420 + x^412 + x^411 + x^404 + x^403 + x^402 + x^401 + x^399 + x^398 + x^396 + x^394 + x^381 + x^378 + x^376 + x^371 + x^370 + x^366 + x^365 + x^360 + x^355 + x^354 + x^351 + x^348 + x^346 + x^344 + x^342 + x^340 + x^339 + x^337 + x^335 + x^333 + x^331 + x^330 + x^329 + x^328 + x^327 + x^320 + x^318 + x^313 + x^307 + x^299 + x^298 + x^297 + x^296 + x^295 + x^294 + x^293 + x^291 + x^283 + x^282 + x^281 + x^280 + x^279 + x^277 + x^276 + x^266 + x^265 + x^264 + x^263 + x^262 + x^261 + x^259 + x^258 + x^257 + x^256 + x^251 + x^248 + x^247 + x^242 + x^240 + x^235 + x^234 + x^233 + x^231 + x^230 + x^229 + x^227 + x^225 + x^224 + x^219 + x^214 + x^212 + x^210 + x^206 + x^204 + x^203 + x^200 + x^196 + x^195 + x^194 + x^192 + x^191 + x^190 + x^188 + x^185 + x^182 + x^178 + x^176 + x^173 + x^159 + x^158 + x^157 + x^156 + x^151 + x^146 + x^144 + x^143 + x^142 + x^140 + x^138 + x^136 + x^131 + x^130 + x^128 + x^127 + x^126 + x^123 + x^122 + x^118 + x^117 + x^115 + x^114 + x^113 + x^108 + x^105 + x^99 + x^98 + x^94 + x^90 + x^88 + x^87 + x^86 + x^84 + x^82 + x^81 + x^80 + x^79 + x^78 + x^75 + x^74 + x^72 + x^71 + x^70 + x^65 + x^64 + x^58 + x^57 + x^56 + x^55 + x^52 + x^50 + x^48 + x^47 + x^46 + x^45 + x^42 + x^39 + x^26 + x^24 + x^23 + x^22 + x^20 + x^18 + x^15 + x^8 + x^4 + 1
+
+3-16-56	281	x^928 + x^898 + x^882 + x^870 + x^836 + x^820 + x^816 + x^808 + x^803 + x^802 + x^799 + x^778 + x^773 + x^770 + x^762 + x^757 + x^754 + x^753 + x^750 + x^737 + x^733 + x^720 + x^717 + x^713 + x^700 + x^688 + x^683 + x^680 + x^679 + x^674 + x^660 + x^658 + x^656 + x^654 + x^653 + x^650 + x^646 + x^644 + x^641 + x^640 + x^637 + x^634 + x^633 + x^623 + x^618 + x^617 + x^616 + x^613 + x^597 + x^590 + x^585 + x^584 + x^581 + x^577 + x^574 + x^572 + x^563 + x^562 + x^560 + x^555 + x^554 + x^553 + x^551 + x^547 + x^544 + x^537 + x^536 + x^533 + x^525 + x^521 + x^520 + x^519 + x^517 + x^515 + x^513 + x^510 + x^508 + x^505 + x^502 + x^501 + x^498 + x^493 + x^490 + x^485 + x^480 + x^477 + x^476 + x^475 + x^472 + x^469 + x^461 + x^458 + x^453 + x^449 + x^448 + x^445 + x^444 + x^442 + x^435 + x^433 + x^432 + x^431 + x^426 + x^425 + x^422 + x^420 + x^418 + x^412 + x^411 + x^409 + x^405 + x^403 + x^401 + x^400 + x^397 + x^393 + x^385 + x^381 + x^368 + x^366 + x^365 + x^362 + x^361 + x^359 + x^356 + x^353 + x^350 + x^346 + x^341 + x^338 + x^335 + x^334 + x^333 + x^332 + x^328 + x^326 + x^325 + x^323 + x^322 + x^320 + x^319 + x^317 + x^316 + x^315 + x^313 + x^312 + x^310 + x^309 + x^307 + x^305 + x^300 + x^295 + x^293 + x^291 + x^290 + x^289 + x^288 + x^286 + x^285 + x^282 + x^277 + x^274 + x^273 + x^266 + x^265 + x^263 + x^261 + x^259 + x^255 + x^253 + x^251 + x^248 + x^247 + x^246 + x^242 + x^241 + x^239 + x^234 + x^233 + x^232 + x^230 + x^229 + x^228 + x^226 + x^225 + x^224 + x^222 + x^218 + x^217 + x^215 + x^212 + x^210 + x^208 + x^206 + x^205 + x^203 + x^201 + x^200 + x^194 + x^193 + x^191 + x^189 + x^183 + x^181 + x^180 + x^178 + x^177 + x^176 + x^174 + x^172 + x^171 + x^169 + x^167 + x^166 + x^163 + x^162 + x^159 + x^157 + x^155 + x^151 + x^150 + x^149 + x^147 + x^140 + x^139 + x^138 + x^137 + x^136 + x^134 + x^131 + x^128 + x^127 + x^126 + x^121 + x^119 + x^118 + x^117 + x^111 + x^106 + x^104 + x^102 + x^101 + x^99 + x^98 + x^91 + x^90 + x^88 + x^86 + x^85 + x^81 + x^79 + x^75 + x^74 + x^73 + x^72 + x^71 + x^69 + x^68 + x^65 + x^64 + x^63 + x^62 + x^61 + x^58 + x^57 + x^56 + x^55 + x^51 + x^50 + x^49 + x^41 + x^38 + x^36 + x^34 + x^33 + x^32 + x^24 + x^21 + x^9 + x^6 + 1
+
+10-38-9	285	x^928 + x^898 + x^870 + x^841 + x^840 + x^838 + x^836 + x^811 + x^810 + x^781 + x^777 + x^774 + x^751 + x^748 + x^723 + x^721 + x^720 + x^719 + x^718 + x^717 + x^716 + x^714 + x^712 + x^694 + x^692 + x^691 + x^688 + x^686 + x^664 + x^663 + x^661 + x^660 + x^659 + x^657 + x^652 + x^650 + x^632 + x^631 + x^630 + x^628 + x^627 + x^625 + x^624 + x^623 + x^605 + x^604 + x^603 + x^599 + x^597 + x^594 + x^593 + x^591 + x^590 + x^588 + x^576 + x^575 + x^574 + x^572 + x^571 + x^570 + x^569 + x^567 + x^565 + x^560 + x^544 + x^543 + x^542 + x^540 + x^539 + x^537 + x^535 + x^531 + x^526 + x^514 + x^510 + x^509 + x^507 + x^506 + x^505 + x^504 + x^503 + x^502 + x^498 + x^485 + x^484 + x^478 + x^474 + x^471 + x^470 + x^468 + x^466 + x^464 + x^458 + x^455 + x^452 + x^450 + x^449 + x^448 + x^445 + x^441 + x^439 + x^428 + x^419 + x^416 + x^415 + x^411 + x^407 + x^406 + x^405 + x^404 + x^402 + x^398 + x^392 + x^388 + x^385 + x^384 + x^383 + x^382 + x^381 + x^380 + x^379 + x^376 + x^374 + x^364 + x^359 + x^357 + x^356 + x^355 + x^354 + x^353 + x^351 + x^349 + x^346 + x^345 + x^343 + x^340 + x^338 + x^334 + x^328 + x^326 + x^325 + x^324 + x^321 + x^320 + x^319 + x^318 + x^315 + x^314 + x^312 + x^306 + x^298 + x^297 + x^295 + x^294 + x^293 + x^291 + x^288 + x^287 + x^286 + x^285 + x^283 + x^282 + x^281 + x^278 + x^276 + x^274 + x^270 + x^269 + x^268 + x^263 + x^261 + x^256 + x^255 + x^254 + x^244 + x^242 + x^237 + x^236 + x^235 + x^234 + x^233 + x^232 + x^229 + x^225 + x^222 + x^219 + x^216 + x^214 + x^212 + x^210 + x^209 + x^208 + x^207 + x^206 + x^202 + x^198 + x^194 + x^193 + x^192 + x^191 + x^190 + x^184 + x^182 + x^178 + x^176 + x^175 + x^174 + x^173 + x^168 + x^166 + x^164 + x^160 + x^159 + x^157 + x^154 + x^152 + x^151 + x^150 + x^145 + x^144 + x^142 + x^136 + x^135 + x^134 + x^129 + x^128 + x^122 + x^121 + x^119 + x^118 + x^116 + x^114 + x^113 + x^112 + x^111 + x^108 + x^105 + x^103 + x^100 + x^98 + x^97 + x^95 + x^94 + x^92 + x^89 + x^88 + x^87 + x^85 + x^84 + x^83 + x^78 + x^76 + x^74 + x^73 + x^71 + x^70 + x^69 + x^67 + x^66 + x^64 + x^61 + x^59 + x^57 + x^56 + x^54 + x^53 + x^51 + x^49 + x^48 + x^46 + x^45 + x^43 + x^42 + x^41 + x^40 + x^38 + x^37 + x^36 + x^35 + x^34 + x^33 + x^32 + x^30 + x^4 + 1
+
+15-22-28	289	x^928 + x^898 + x^870 + x^838 + x^821 + x^806 + x^805 + x^792 + x^790 + x^778 + x^774 + x^762 + x^745 + x^744 + x^718 + x^697 + x^682 + x^672 + x^670 + x^667 + x^666 + x^658 + x^656 + x^653 + x^652 + x^651 + x^650 + x^642 + x^641 + x^638 + x^637 + x^623 + x^608 + x^607 + x^598 + x^594 + x^588 + x^575 + x^574 + x^573 + x^566 + x^565 + x^564 + x^563 + x^562 + x^557 + x^548 + x^547 + x^542 + x^538 + x^533 + x^531 + x^529 + x^526 + x^517 + x^516 + x^514 + x^513 + x^505 + x^504 + x^503 + x^502 + x^501 + x^499 + x^498 + x^497 + x^488 + x^487 + x^484 + x^483 + x^482 + x^474 + x^470 + x^468 + x^467 + x^466 + x^464 + x^457 + x^454 + x^453 + x^449 + x^447 + x^444 + x^443 + x^442 + x^441 + x^440 + x^439 + x^437 + x^436 + x^435 + x^428 + x^427 + x^426 + x^425 + x^422 + x^418 + x^417 + x^414 + x^409 + x^406 + x^405 + x^392 + x^391 + x^389 + x^388 + x^387 + x^386 + x^379 + x^378 + x^374 + x^372 + x^371 + x^368 + x^367 + x^362 + x^361 + x^358 + x^357 + x^354 + x^350 + x^349 + x^347 + x^342 + x^341 + x^340 + x^334 + x^333 + x^332 + x^331 + x^330 + x^329 + x^328 + x^327 + x^324 + x^323 + x^320 + x^319 + x^313 + x^308 + x^307 + x^305 + x^303 + x^302 + x^301 + x^300 + x^299 + x^298 + x^297 + x^296 + x^295 + x^294 + x^293 + x^292 + x^288 + x^287 + x^286 + x^283 + x^282 + x^280 + x^279 + x^278 + x^277 + x^276 + x^271 + x^269 + x^268 + x^267 + x^266 + x^265 + x^255 + x^254 + x^253 + x^249 + x^247 + x^241 + x^238 + x^237 + x^236 + x^235 + x^226 + x^225 + x^224 + x^223 + x^220 + x^219 + x^215 + x^214 + x^212 + x^210 + x^209 + x^205 + x^202 + x^201 + x^200 + x^199 + x^197 + x^190 + x^186 + x^182 + x^181 + x^180 + x^177 + x^174 + x^173 + x^172 + x^171 + x^170 + x^169 + x^168 + x^165 + x^163 + x^161 + x^160 + x^158 + x^155 + x^153 + x^151 + x^150 + x^146 + x^143 + x^142 + x^137 + x^136 + x^135 + x^131 + x^130 + x^128 + x^127 + x^126 + x^125 + x^124 + x^123 + x^122 + x^120 + x^119 + x^117 + x^114 + x^113 + x^111 + x^105 + x^104 + x^103 + x^102 + x^101 + x^99 + x^97 + x^93 + x^90 + x^89 + x^88 + x^87 + x^86 + x^84 + x^83 + x^82 + x^81 + x^80 + x^79 + x^77 + x^75 + x^72 + x^71 + x^70 + x^69 + x^68 + x^65 + x^60 + x^59 + x^58 + x^55 + x^54 + x^52 + x^51 + x^50 + x^48 + x^43 + x^42 + x^40 + x^39 + x^30 + x^28 + x^27 + x^24 + x^23 + x^19 + x^16 + x^15 + 1
+
+12-41-35	291	x^928 + x^898 + x^886 + x^873 + x^870 + x^860 + x^856 + x^847 + x^844 + x^834 + x^830 + x^826 + x^818 + x^817 + x^805 + x^804 + x^796 + x^795 + x^791 + x^784 + x^782 + x^779 + x^769 + x^765 + x^762 + x^758 + x^756 + x^753 + x^752 + x^743 + x^739 + x^736 + x^735 + x^732 + x^731 + x^730 + x^727 + x^726 + x^723 + x^722 + x^717 + x^713 + x^710 + x^705 + x^701 + x^700 + x^692 + x^685 + x^683 + x^680 + x^676 + x^671 + x^663 + x^659 + x^657 + x^654 + x^653 + x^645 + x^642 + x^637 + x^632 + x^628 + x^624 + x^623 + x^619 + x^616 + x^615 + x^612 + x^610 + x^607 + x^606 + x^603 + x^598 + x^597 + x^594 + x^593 + x^590 + x^589 + x^585 + x^580 + x^577 + x^576 + x^572 + x^567 + x^564 + x^560 + x^559 + x^556 + x^550 + x^545 + x^543 + x^538 + x^537 + x^534 + x^533 + x^532 + x^528 + x^520 + x^516 + x^513 + x^508 + x^507 + x^506 + x^504 + x^499 + x^496 + x^491 + x^490 + x^487 + x^486 + x^485 + x^481 + x^477 + x^474 + x^466 + x^465 + x^457 + x^452 + x^448 + x^447 + x^446 + x^438 + x^436 + x^435 + x^434 + x^430 + x^425 + x^422 + x^421 + x^417 + x^413 + x^409 + x^404 + x^395 + x^393 + x^392 + x^388 + x^387 + x^386 + x^384 + x^382 + x^380 + x^379 + x^374 + x^373 + x^370 + x^367 + x^366 + x^362 + x^361 + x^358 + x^357 + x^354 + x^353 + x^352 + x^350 + x^349 + x^345 + x^344 + x^343 + x^340 + x^337 + x^336 + x^332 + x^331 + x^328 + x^324 + x^323 + x^317 + x^315 + x^314 + x^313 + x^311 + x^305 + x^302 + x^298 + x^297 + x^296 + x^295 + x^292 + x^291 + x^288 + x^283 + x^280 + x^276 + x^275 + x^272 + x^268 + x^266 + x^262 + x^259 + x^258 + x^255 + x^251 + x^250 + x^242 + x^241 + x^240 + x^232 + x^227 + x^225 + x^224 + x^223 + x^216 + x^214 + x^212 + x^211 + x^210 + x^206 + x^203 + x^198 + x^189 + x^188 + x^177 + x^176 + x^175 + x^173 + x^168 + x^164 + x^162 + x^160 + x^159 + x^156 + x^155 + x^154 + x^152 + x^149 + x^147 + x^146 + x^145 + x^142 + x^139 + x^138 + x^137 + x^134 + x^132 + x^130 + x^124 + x^123 + x^122 + x^115 + x^113 + x^112 + x^111 + x^110 + x^108 + x^106 + x^103 + x^102 + x^98 + x^97 + x^96 + x^95 + x^94 + x^92 + x^91 + x^90 + x^88 + x^85 + x^80 + x^78 + x^77 + x^76 + x^73 + x^71 + x^70 + x^69 + x^68 + x^67 + x^65 + x^64 + x^63 + x^54 + x^53 + x^52 + x^51 + x^50 + x^49 + x^48 + x^47 + x^44 + x^43 + x^42 + x^40 + x^39 + x^31 + x^30 + x^29 + x^21 + x^13 + 1
+
+35-54-56	293	x^928 + x^898 + x^870 + x^862 + x^832 + x^826 + x^808 + x^796 + x^794 + x^790 + x^778 + x^765 + x^758 + x^754 + x^734 + x^729 + x^728 + x^722 + x^718 + x^715 + x^706 + x^700 + x^699 + x^698 + x^693 + x^686 + x^682 + x^676 + x^673 + x^672 + x^669 + x^668 + x^662 + x^658 + x^656 + x^655 + x^652 + x^650 + x^649 + x^646 + x^645 + x^642 + x^639 + x^638 + x^636 + x^630 + x^622 + x^614 + x^613 + x^612 + x^610 + x^608 + x^607 + x^600 + x^596 + x^595 + x^592 + x^590 + x^589 + x^587 + x^582 + x^574 + x^571 + x^568 + x^566 + x^560 + x^558 + x^554 + x^553 + x^552 + x^548 + x^544 + x^542 + x^538 + x^536 + x^534 + x^530 + x^528 + x^527 + x^524 + x^523 + x^522 + x^520 + x^518 + x^516 + x^515 + x^511 + x^506 + x^499 + x^497 + x^493 + x^492 + x^490 + x^487 + x^482 + x^478 + x^474 + x^467 + x^462 + x^461 + x^452 + x^445 + x^442 + x^439 + x^437 + x^436 + x^433 + x^428 + x^427 + x^422 + x^418 + x^413 + x^412 + x^410 + x^409 + x^407 + x^406 + x^403 + x^401 + x^398 + x^396 + x^392 + x^390 + x^386 + x^384 + x^383 + x^382 + x^380 + x^378 + x^377 + x^373 + x^372 + x^371 + x^366 + x^365 + x^362 + x^353 + x^352 + x^350 + x^348 + x^346 + x^344 + x^342 + x^340 + x^338 + x^336 + x^335 + x^334 + x^332 + x^331 + x^328 + x^326 + x^320 + x^318 + x^317 + x^316 + x^313 + x^312 + x^311 + x^310 + x^308 + x^304 + x^300 + x^299 + x^298 + x^296 + x^295 + x^293 + x^290 + x^288 + x^284 + x^282 + x^275 + x^271 + x^269 + x^268 + x^266 + x^265 + x^264 + x^263 + x^262 + x^260 + x^259 + x^253 + x^250 + x^247 + x^246 + x^244 + x^242 + x^240 + x^239 + x^238 + x^235 + x^233 + x^232 + x^228 + x^227 + x^226 + x^224 + x^221 + x^220 + x^218 + x^216 + x^214 + x^212 + x^208 + x^203 + x^199 + x^198 + x^196 + x^195 + x^194 + x^193 + x^192 + x^189 + x^187 + x^182 + x^178 + x^176 + x^175 + x^173 + x^168 + x^167 + x^166 + x^163 + x^161 + x^160 + x^156 + x^152 + x^150 + x^148 + x^146 + x^140 + x^138 + x^135 + x^133 + x^131 + x^130 + x^129 + x^128 + x^127 + x^126 + x^125 + x^123 + x^122 + x^120 + x^118 + x^116 + x^115 + x^113 + x^112 + x^109 + x^106 + x^105 + x^104 + x^103 + x^101 + x^100 + x^95 + x^94 + x^92 + x^84 + x^82 + x^80 + x^79 + x^77 + x^76 + x^74 + x^71 + x^69 + x^68 + x^66 + x^65 + x^64 + x^63 + x^55 + x^54 + x^53 + x^49 + x^48 + x^46 + x^45 + x^43 + x^42 + x^41 + x^40 + x^38 + x^36 + x^34 + x^24 + x^18 + x^6 + 1
+
+44-42-5	307	x^928 + x^898 + x^880 + x^870 + x^856 + x^850 + x^839 + x^832 + x^826 + x^820 + x^816 + x^815 + x^808 + x^792 + x^791 + x^790 + x^784 + x^779 + x^778 + x^768 + x^762 + x^760 + x^756 + x^754 + x^753 + x^747 + x^744 + x^738 + x^737 + x^736 + x^731 + x^726 + x^723 + x^720 + x^719 + x^717 + x^713 + x^707 + x^696 + x^693 + x^689 + x^688 + x^682 + x^678 + x^677 + x^670 + x^666 + x^665 + x^663 + x^660 + x^658 + x^657 + x^653 + x^646 + x^633 + x^630 + x^628 + x^624 + x^617 + x^616 + x^612 + x^611 + x^606 + x^605 + x^604 + x^603 + x^600 + x^599 + x^597 + x^594 + x^592 + x^588 + x^587 + x^586 + x^582 + x^580 + x^576 + x^575 + x^568 + x^563 + x^556 + x^552 + x^546 + x^544 + x^542 + x^540 + x^539 + x^537 + x^534 + x^533 + x^526 + x^522 + x^521 + x^520 + x^518 + x^517 + x^516 + x^514 + x^511 + x^510 + x^508 + x^505 + x^503 + x^494 + x^492 + x^488 + x^485 + x^481 + x^475 + x^474 + x^470 + x^467 + x^464 + x^463 + x^462 + x^454 + x^452 + x^449 + x^447 + x^446 + x^444 + x^443 + x^442 + x^439 + x^438 + x^437 + x^432 + x^431 + x^430 + x^427 + x^426 + x^424 + x^422 + x^419 + x^418 + x^413 + x^410 + x^409 + x^406 + x^404 + x^401 + x^398 + x^396 + x^393 + x^392 + x^391 + x^390 + x^389 + x^385 + x^383 + x^380 + x^379 + x^376 + x^374 + x^372 + x^370 + x^368 + x^367 + x^366 + x^365 + x^364 + x^363 + x^361 + x^358 + x^355 + x^354 + x^353 + x^349 + x^348 + x^347 + x^344 + x^343 + x^342 + x^341 + x^338 + x^337 + x^336 + x^334 + x^332 + x^329 + x^328 + x^318 + x^317 + x^312 + x^310 + x^308 + x^307 + x^306 + x^305 + x^304 + x^299 + x^296 + x^294 + x^293 + x^291 + x^289 + x^281 + x^280 + x^278 + x^277 + x^276 + x^274 + x^272 + x^270 + x^267 + x^265 + x^264 + x^263 + x^260 + x^253 + x^252 + x^251 + x^250 + x^247 + x^242 + x^241 + x^239 + x^234 + x^233 + x^231 + x^230 + x^229 + x^224 + x^223 + x^222 + x^217 + x^214 + x^212 + x^210 + x^209 + x^208 + x^203 + x^200 + x^199 + x^198 + x^196 + x^195 + x^192 + x^191 + x^186 + x^185 + x^184 + x^181 + x^180 + x^179 + x^178 + x^177 + x^176 + x^175 + x^172 + x^171 + x^170 + x^169 + x^168 + x^166 + x^165 + x^161 + x^160 + x^159 + x^151 + x^146 + x^144 + x^143 + x^142 + x^141 + x^139 + x^137 + x^136 + x^135 + x^133 + x^131 + x^130 + x^120 + x^116 + x^114 + x^113 + x^108 + x^107 + x^106 + x^104 + x^101 + x^98 + x^97 + x^96 + x^91 + x^90 + x^89 + x^87 + x^82 + x^80 + x^78 + x^73 + x^72 + x^67 + x^62 + x^58 + x^56 + x^55 + x^53 + x^49 + x^46 + x^44 + x^39 + x^32 + x^26 + x^17 + 1
+
+18-7-29	311	x^928 + x^926 + x^920 + x^918 + x^912 + x^910 + x^904 + x^902 + x^898 + x^896 + x^894 + x^890 + x^888 + x^886 + x^882 + x^880 + x^878 + x^874 + x^872 + x^870 + x^866 + x^858 + x^850 + x^842 + x^808 + x^806 + x^792 + x^790 + x^778 + x^776 + x^774 + x^762 + x^760 + x^758 + x^746 + x^730 + x^688 + x^686 + x^680 + x^678 + x^669 + x^667 + x^661 + x^659 + x^658 + x^656 + x^655 + x^654 + x^651 + x^650 + x^648 + x^647 + x^646 + x^643 + x^626 + x^618 + x^611 + x^605 + x^595 + x^589 + x^587 + x^575 + x^569 + x^568 + x^566 + x^561 + x^553 + x^541 + x^539 + x^538 + x^537 + x^536 + x^534 + x^533 + x^515 + x^511 + x^509 + x^507 + x^506 + x^503 + x^501 + x^497 + x^495 + x^493 + x^489 + x^485 + x^483 + x^481 + x^479 + x^475 + x^473 + x^471 + x^469 + x^457 + x^455 + x^453 + x^451 + x^449 + x^448 + x^447 + x^446 + x^443 + x^440 + x^439 + x^438 + x^437 + x^435 + x^433 + x^432 + x^431 + x^429 + x^426 + x^425 + x^424 + x^421 + x^418 + x^417 + x^416 + x^415 + x^414 + x^412 + x^409 + x^408 + x^406 + x^405 + x^404 + x^401 + x^398 + x^396 + x^395 + x^393 + x^392 + x^390 + x^388 + x^387 + x^380 + x^379 + x^377 + x^376 + x^372 + x^371 + x^370 + x^369 + x^367 + x^364 + x^363 + x^362 + x^361 + x^359 + x^358 + x^354 + x^352 + x^350 + x^349 + x^348 + x^341 + x^340 + x^337 + x^336 + x^335 + x^331 + x^330 + x^328 + x^326 + x^320 + x^319 + x^318 + x^317 + x^315 + x^314 + x^313 + x^312 + x^310 + x^308 + x^307 + x^302 + x^301 + x^299 + x^297 + x^295 + x^293 + x^291 + x^287 + x^284 + x^283 + x^282 + x^281 + x^280 + x^279 + x^278 + x^274 + x^271 + x^267 + x^266 + x^264 + x^263 + x^257 + x^256 + x^255 + x^252 + x^251 + x^250 + x^246 + x^241 + x^240 + x^239 + x^234 + x^233 + x^231 + x^230 + x^229 + x^226 + x^225 + x^224 + x^223 + x^222 + x^218 + x^216 + x^214 + x^212 + x^211 + x^206 + x^203 + x^202 + x^199 + x^198 + x^197 + x^193 + x^191 + x^190 + x^188 + x^185 + x^183 + x^181 + x^180 + x^179 + x^176 + x^171 + x^169 + x^167 + x^158 + x^156 + x^155 + x^154 + x^153 + x^151 + x^150 + x^148 + x^145 + x^143 + x^142 + x^141 + x^138 + x^133 + x^132 + x^130 + x^127 + x^125 + x^123 + x^121 + x^118 + x^109 + x^108 + x^105 + x^104 + x^103 + x^102 + x^100 + x^97 + x^95 + x^94 + x^92 + x^90 + x^85 + x^84 + x^82 + x^80 + x^76 + x^74 + x^73 + x^71 + x^70 + x^68 + x^67 + x^66 + x^65 + x^64 + x^61 + x^59 + x^57 + x^55 + x^53 + x^52 + x^48 + x^47 + x^45 + x^41 + x^38 + x^36 + x^34 + x^31 + x^28 + x^26 + x^24 + x^22 + x^18 + x^16 + x^12 + x^10 + x^2 + 1
+
+48-55-49	313	x^928 + x^898 + x^894 + x^893 + x^870 + x^864 + x^860 + x^858 + x^838 + x^836 + x^832 + x^831 + x^830 + x^828 + x^804 + x^802 + x^796 + x^794 + x^778 + x^774 + x^773 + x^770 + x^769 + x^768 + x^741 + x^740 + x^737 + x^736 + x^734 + x^732 + x^731 + x^718 + x^712 + x^711 + x^706 + x^704 + x^702 + x^701 + x^684 + x^681 + x^679 + x^678 + x^676 + x^675 + x^672 + x^671 + x^669 + x^658 + x^656 + x^654 + x^653 + x^652 + x^651 + x^647 + x^646 + x^645 + x^621 + x^618 + x^617 + x^616 + x^615 + x^614 + x^611 + x^610 + x^609 + x^598 + x^596 + x^592 + x^590 + x^589 + x^583 + x^582 + x^580 + x^579 + x^576 + x^561 + x^559 + x^558 + x^557 + x^554 + x^548 + x^547 + x^545 + x^538 + x^534 + x^533 + x^531 + x^529 + x^527 + x^526 + x^524 + x^522 + x^521 + x^515 + x^512 + x^500 + x^497 + x^486 + x^484 + x^478 + x^474 + x^470 + x^469 + x^468 + x^467 + x^466 + x^465 + x^464 + x^462 + x^460 + x^458 + x^456 + x^454 + x^453 + x^450 + x^444 + x^438 + x^436 + x^435 + x^434 + x^433 + x^432 + x^429 + x^424 + x^422 + x^421 + x^418 + x^416 + x^413 + x^412 + x^407 + x^406 + x^405 + x^404 + x^402 + x^399 + x^398 + x^397 + x^396 + x^394 + x^392 + x^391 + x^388 + x^384 + x^380 + x^378 + x^377 + x^375 + x^373 + x^372 + x^371 + x^364 + x^359 + x^356 + x^354 + x^353 + x^352 + x^351 + x^350 + x^347 + x^343 + x^342 + x^340 + x^339 + x^334 + x^331 + x^328 + x^327 + x^325 + x^324 + x^322 + x^316 + x^312 + x^311 + x^310 + x^308 + x^306 + x^305 + x^304 + x^302 + x^301 + x^300 + x^298 + x^297 + x^295 + x^294 + x^292 + x^291 + x^290 + x^289 + x^288 + x^282 + x^280 + x^279 + x^278 + x^277 + x^276 + x^275 + x^273 + x^271 + x^268 + x^264 + x^261 + x^258 + x^256 + x^254 + x^253 + x^251 + x^249 + x^248 + x^246 + x^245 + x^244 + x^242 + x^241 + x^240 + x^239 + x^237 + x^236 + x^232 + x^231 + x^229 + x^228 + x^227 + x^226 + x^224 + x^223 + x^219 + x^216 + x^215 + x^211 + x^210 + x^207 + x^206 + x^204 + x^203 + x^199 + x^198 + x^194 + x^188 + x^187 + x^186 + x^182 + x^181 + x^180 + x^174 + x^171 + x^170 + x^168 + x^165 + x^164 + x^160 + x^152 + x^151 + x^150 + x^149 + x^148 + x^147 + x^144 + x^143 + x^142 + x^141 + x^139 + x^134 + x^129 + x^127 + x^124 + x^121 + x^119 + x^115 + x^108 + x^107 + x^105 + x^104 + x^103 + x^102 + x^95 + x^94 + x^90 + x^89 + x^88 + x^86 + x^84 + x^79 + x^77 + x^73 + x^72 + x^69 + x^66 + x^64 + x^63 + x^62 + x^60 + x^57 + x^56 + x^55 + x^54 + x^53 + x^52 + x^50 + x^49 + x^48 + x^46 + x^45 + x^41 + x^36 + x^34 + x^31 + x^29 + x^28 + x^26 + x^25 + 1
+
+40-44-57	319	x^928 + x^898 + x^870 + x^846 + x^822 + x^819 + x^808 + x^800 + x^794 + x^792 + x^786 + x^778 + x^770 + x^764 + x^759 + x^748 + x^746 + x^740 + x^732 + x^716 + x^713 + x^697 + x^696 + x^691 + x^686 + x^674 + x^664 + x^661 + x^658 + x^650 + x^648 + x^645 + x^644 + x^636 + x^629 + x^626 + x^624 + x^623 + x^621 + x^620 + x^618 + x^615 + x^594 + x^593 + x^591 + x^590 + x^586 + x^583 + x^580 + x^579 + x^577 + x^575 + x^574 + x^572 + x^571 + x^568 + x^564 + x^563 + x^561 + x^558 + x^556 + x^555 + x^553 + x^550 + x^547 + x^545 + x^544 + x^542 + x^541 + x^538 + x^536 + x^533 + x^528 + x^526 + x^525 + x^522 + x^519 + x^513 + x^512 + x^510 + x^509 + x^508 + x^507 + x^504 + x^503 + x^501 + x^495 + x^488 + x^487 + x^485 + x^484 + x^483 + x^482 + x^480 + x^479 + x^474 + x^473 + x^471 + x^470 + x^466 + x^463 + x^460 + x^458 + x^457 + x^454 + x^453 + x^450 + x^449 + x^446 + x^444 + x^443 + x^441 + x^440 + x^439 + x^436 + x^434 + x^433 + x^432 + x^431 + x^430 + x^427 + x^425 + x^424 + x^422 + x^420 + x^417 + x^416 + x^415 + x^413 + x^412 + x^411 + x^410 + x^409 + x^408 + x^407 + x^406 + x^405 + x^403 + x^398 + x^397 + x^395 + x^392 + x^390 + x^387 + x^386 + x^385 + x^383 + x^375 + x^370 + x^369 + x^368 + x^367 + x^365 + x^364 + x^363 + x^360 + x^359 + x^357 + x^356 + x^353 + x^351 + x^349 + x^342 + x^340 + x^339 + x^336 + x^335 + x^329 + x^327 + x^326 + x^324 + x^323 + x^320 + x^319 + x^318 + x^317 + x^316 + x^315 + x^312 + x^311 + x^307 + x^306 + x^302 + x^299 + x^298 + x^297 + x^295 + x^294 + x^293 + x^291 + x^290 + x^287 + x^285 + x^284 + x^283 + x^282 + x^281 + x^279 + x^277 + x^276 + x^275 + x^272 + x^271 + x^268 + x^266 + x^263 + x^262 + x^261 + x^255 + x^251 + x^249 + x^248 + x^245 + x^244 + x^243 + x^240 + x^239 + x^238 + x^236 + x^235 + x^234 + x^230 + x^229 + x^228 + x^227 + x^226 + x^224 + x^221 + x^217 + x^214 + x^212 + x^209 + x^208 + x^204 + x^202 + x^201 + x^197 + x^194 + x^193 + x^192 + x^191 + x^189 + x^188 + x^185 + x^184 + x^182 + x^181 + x^178 + x^176 + x^173 + x^172 + x^171 + x^169 + x^166 + x^163 + x^161 + x^160 + x^158 + x^156 + x^155 + x^154 + x^152 + x^151 + x^149 + x^148 + x^146 + x^145 + x^144 + x^142 + x^141 + x^134 + x^132 + x^129 + x^122 + x^121 + x^119 + x^117 + x^116 + x^113 + x^112 + x^110 + x^109 + x^103 + x^102 + x^101 + x^100 + x^97 + x^95 + x^94 + x^93 + x^92 + x^91 + x^87 + x^86 + x^85 + x^84 + x^81 + x^80 + x^75 + x^74 + x^71 + x^70 + x^68 + x^66 + x^63 + x^52 + x^51 + x^50 + x^47 + x^45 + x^44 + x^43 + x^39 + x^38 + x^34 + x^24 + x^16 + x^8 + 1
+
+21-52-12	321	x^928 + x^898 + x^870 + x^868 + x^856 + x^838 + x^828 + x^826 + x^816 + x^815 + x^808 + x^804 + x^786 + x^784 + x^778 + x^748 + x^744 + x^736 + x^734 + x^733 + x^732 + x^731 + x^726 + x^722 + x^718 + x^710 + x^706 + x^704 + x^703 + x^694 + x^692 + x^691 + x^688 + x^683 + x^680 + x^679 + x^678 + x^674 + x^672 + x^668 + x^664 + x^660 + x^658 + x^656 + x^653 + x^649 + x^648 + x^644 + x^643 + x^638 + x^632 + x^630 + x^625 + x^623 + x^619 + x^618 + x^616 + x^615 + x^613 + x^610 + x^607 + x^606 + x^602 + x^601 + x^600 + x^595 + x^593 + x^589 + x^588 + x^586 + x^585 + x^580 + x^579 + x^578 + x^571 + x^570 + x^566 + x^565 + x^564 + x^563 + x^560 + x^559 + x^555 + x^554 + x^550 + x^548 + x^547 + x^546 + x^544 + x^543 + x^541 + x^539 + x^538 + x^537 + x^535 + x^531 + x^530 + x^529 + x^522 + x^520 + x^514 + x^513 + x^509 + x^507 + x^504 + x^501 + x^500 + x^499 + x^498 + x^496 + x^495 + x^494 + x^492 + x^491 + x^490 + x^486 + x^483 + x^480 + x^479 + x^476 + x^473 + x^469 + x^466 + x^463 + x^460 + x^459 + x^457 + x^451 + x^449 + x^443 + x^441 + x^440 + x^436 + x^433 + x^432 + x^431 + x^424 + x^420 + x^418 + x^416 + x^414 + x^411 + x^410 + x^409 + x^408 + x^406 + x^404 + x^403 + x^401 + x^400 + x^398 + x^393 + x^390 + x^388 + x^385 + x^384 + x^381 + x^375 + x^372 + x^366 + x^365 + x^361 + x^358 + x^356 + x^354 + x^352 + x^347 + x^346 + x^341 + x^340 + x^338 + x^335 + x^334 + x^333 + x^331 + x^330 + x^326 + x^323 + x^320 + x^319 + x^318 + x^317 + x^315 + x^312 + x^311 + x^309 + x^305 + x^303 + x^301 + x^299 + x^297 + x^296 + x^295 + x^290 + x^289 + x^283 + x^282 + x^277 + x^276 + x^273 + x^268 + x^267 + x^266 + x^264 + x^262 + x^261 + x^260 + x^256 + x^254 + x^251 + x^250 + x^247 + x^245 + x^244 + x^243 + x^240 + x^238 + x^235 + x^234 + x^233 + x^231 + x^229 + x^225 + x^224 + x^217 + x^212 + x^211 + x^209 + x^208 + x^205 + x^204 + x^202 + x^200 + x^198 + x^196 + x^195 + x^191 + x^190 + x^188 + x^187 + x^186 + x^182 + x^181 + x^180 + x^175 + x^174 + x^172 + x^171 + x^170 + x^169 + x^166 + x^164 + x^158 + x^154 + x^153 + x^152 + x^149 + x^148 + x^147 + x^146 + x^144 + x^142 + x^141 + x^140 + x^138 + x^137 + x^136 + x^135 + x^133 + x^131 + x^127 + x^125 + x^123 + x^122 + x^121 + x^120 + x^119 + x^115 + x^113 + x^112 + x^111 + x^106 + x^102 + x^101 + x^100 + x^98 + x^96 + x^95 + x^93 + x^92 + x^91 + x^90 + x^89 + x^88 + x^87 + x^81 + x^79 + x^76 + x^72 + x^71 + x^70 + x^64 + x^60 + x^57 + x^56 + x^55 + x^54 + x^50 + x^49 + x^48 + x^47 + x^43 + x^39 + x^38 + x^30 + x^29 + x^26 + x^25 + x^14 + x^10 + 1
+
+25-44-4	331	x^928 + x^898 + x^870 + x^866 + x^862 + x^859 + x^836 + x^834 + x^829 + x^822 + x^808 + x^806 + x^804 + x^800 + x^799 + x^798 + x^797 + x^795 + x^778 + x^776 + x^770 + x^769 + x^767 + x^762 + x^753 + x^739 + x^735 + x^734 + x^731 + x^721 + x^713 + x^709 + x^708 + x^706 + x^705 + x^703 + x^701 + x^698 + x^688 + x^679 + x^677 + x^676 + x^674 + x^670 + x^669 + x^667 + x^666 + x^661 + x^659 + x^658 + x^649 + x^647 + x^645 + x^643 + x^642 + x^638 + x^635 + x^633 + x^629 + x^626 + x^624 + x^620 + x^618 + x^617 + x^614 + x^611 + x^605 + x^603 + x^598 + x^596 + x^594 + x^593 + x^590 + x^587 + x^581 + x^580 + x^579 + x^571 + x^570 + x^568 + x^566 + x^562 + x^558 + x^557 + x^551 + x^550 + x^548 + x^547 + x^546 + x^544 + x^542 + x^541 + x^539 + x^536 + x^533 + x^532 + x^530 + x^527 + x^526 + x^525 + x^524 + x^523 + x^521 + x^520 + x^519 + x^518 + x^517 + x^515 + x^514 + x^513 + x^507 + x^506 + x^504 + x^501 + x^497 + x^493 + x^492 + x^490 + x^488 + x^483 + x^482 + x^481 + x^478 + x^477 + x^476 + x^475 + x^473 + x^467 + x^466 + x^465 + x^463 + x^462 + x^461 + x^460 + x^456 + x^454 + x^453 + x^452 + x^450 + x^448 + x^446 + x^444 + x^443 + x^442 + x^433 + x^426 + x^423 + x^422 + x^420 + x^419 + x^416 + x^413 + x^412 + x^411 + x^410 + x^406 + x^404 + x^403 + x^402 + x^401 + x^400 + x^398 + x^396 + x^395 + x^392 + x^391 + x^389 + x^387 + x^386 + x^385 + x^380 + x^372 + x^366 + x^365 + x^363 + x^362 + x^359 + x^357 + x^354 + x^353 + x^352 + x^348 + x^346 + x^345 + x^342 + x^340 + x^338 + x^335 + x^334 + x^333 + x^332 + x^325 + x^324 + x^323 + x^320 + x^319 + x^318 + x^314 + x^312 + x^309 + x^308 + x^303 + x^302 + x^301 + x^299 + x^295 + x^294 + x^292 + x^291 + x^290 + x^289 + x^286 + x^284 + x^279 + x^278 + x^274 + x^273 + x^268 + x^266 + x^265 + x^263 + x^261 + x^257 + x^256 + x^255 + x^254 + x^253 + x^248 + x^245 + x^244 + x^241 + x^240 + x^237 + x^235 + x^234 + x^233 + x^232 + x^230 + x^229 + x^228 + x^226 + x^223 + x^222 + x^220 + x^218 + x^214 + x^212 + x^211 + x^209 + x^207 + x^206 + x^203 + x^202 + x^201 + x^200 + x^199 + x^198 + x^196 + x^191 + x^189 + x^184 + x^178 + x^177 + x^176 + x^175 + x^172 + x^171 + x^169 + x^166 + x^165 + x^162 + x^161 + x^159 + x^157 + x^156 + x^155 + x^150 + x^149 + x^148 + x^147 + x^143 + x^142 + x^141 + x^140 + x^137 + x^136 + x^135 + x^133 + x^131 + x^130 + x^129 + x^127 + x^126 + x^125 + x^124 + x^123 + x^120 + x^113 + x^112 + x^108 + x^105 + x^104 + x^98 + x^96 + x^92 + x^90 + x^82 + x^81 + x^80 + x^78 + x^76 + x^74 + x^73 + x^68 + x^66 + x^64 + x^62 + x^60 + x^58 + x^54 + x^42 + x^38 + x^36 + x^32 + x^26 + x^18 + x^16 + x^10 + x^8 + x^2 + 1
+
+16-8-37	341	x^928 + x^898 + x^870 + x^842 + x^814 + x^808 + x^788 + x^786 + x^784 + x^778 + x^777 + x^775 + x^773 + x^762 + x^756 + x^751 + x^745 + x^736 + x^723 + x^721 + x^717 + x^715 + x^713 + x^710 + x^700 + x^697 + x^693 + x^691 + x^688 + x^685 + x^678 + x^674 + x^673 + x^672 + x^667 + x^654 + x^650 + x^647 + x^645 + x^644 + x^643 + x^642 + x^641 + x^635 + x^634 + x^632 + x^631 + x^630 + x^622 + x^621 + x^618 + x^615 + x^614 + x^612 + x^608 + x^605 + x^604 + x^603 + x^601 + x^596 + x^595 + x^592 + x^590 + x^589 + x^588 + x^587 + x^586 + x^585 + x^584 + x^583 + x^581 + x^579 + x^578 + x^576 + x^575 + x^573 + x^571 + x^569 + x^565 + x^564 + x^561 + x^560 + x^557 + x^556 + x^555 + x^554 + x^552 + x^544 + x^543 + x^540 + x^535 + x^533 + x^530 + x^528 + x^527 + x^524 + x^522 + x^520 + x^519 + x^517 + x^516 + x^515 + x^514 + x^513 + x^510 + x^509 + x^508 + x^507 + x^503 + x^502 + x^500 + x^497 + x^496 + x^493 + x^491 + x^490 + x^486 + x^480 + x^477 + x^476 + x^475 + x^474 + x^473 + x^472 + x^471 + x^467 + x^464 + x^463 + x^461 + x^458 + x^457 + x^453 + x^446 + x^444 + x^441 + x^439 + x^436 + x^434 + x^433 + x^432 + x^430 + x^427 + x^426 + x^422 + x^418 + x^417 + x^416 + x^414 + x^412 + x^411 + x^410 + x^405 + x^404 + x^401 + x^399 + x^396 + x^395 + x^392 + x^391 + x^390 + x^388 + x^387 + x^386 + x^385 + x^384 + x^383 + x^378 + x^377 + x^375 + x^373 + x^372 + x^371 + x^366 + x^364 + x^358 + x^357 + x^356 + x^352 + x^348 + x^345 + x^342 + x^340 + x^339 + x^338 + x^336 + x^335 + x^331 + x^330 + x^329 + x^327 + x^324 + x^323 + x^322 + x^321 + x^320 + x^317 + x^316 + x^315 + x^314 + x^310 + x^307 + x^306 + x^303 + x^297 + x^295 + x^294 + x^293 + x^292 + x^291 + x^290 + x^288 + x^286 + x^284 + x^283 + x^282 + x^278 + x^276 + x^275 + x^274 + x^269 + x^268 + x^267 + x^263 + x^262 + x^261 + x^260 + x^259 + x^258 + x^256 + x^251 + x^249 + x^248 + x^247 + x^245 + x^242 + x^241 + x^239 + x^238 + x^236 + x^235 + x^234 + x^233 + x^232 + x^230 + x^229 + x^225 + x^224 + x^223 + x^222 + x^220 + x^218 + x^216 + x^214 + x^213 + x^212 + x^211 + x^209 + x^206 + x^201 + x^200 + x^199 + x^197 + x^196 + x^194 + x^193 + x^190 + x^186 + x^184 + x^181 + x^180 + x^179 + x^178 + x^177 + x^176 + x^175 + x^169 + x^168 + x^166 + x^164 + x^160 + x^158 + x^157 + x^156 + x^153 + x^152 + x^147 + x^146 + x^136 + x^134 + x^132 + x^129 + x^126 + x^125 + x^124 + x^123 + x^122 + x^120 + x^119 + x^116 + x^114 + x^112 + x^108 + x^107 + x^106 + x^104 + x^102 + x^98 + x^95 + x^91 + x^85 + x^84 + x^82 + x^81 + x^80 + x^79 + x^77 + x^76 + x^73 + x^72 + x^70 + x^62 + x^60 + x^59 + x^58 + x^56 + x^55 + x^53 + x^49 + x^44 + x^42 + x^41 + x^39 + x^38 + x^35 + x^34 + x^32 + x^28 + x^26 + x^24 + x^22 + 1
+
+17-12-36	341	x^928 + x^898 + x^870 + x^868 + x^860 + x^848 + x^838 + x^830 + x^829 + x^806 + x^798 + x^797 + x^789 + x^788 + x^772 + x^770 + x^767 + x^762 + x^761 + x^756 + x^751 + x^749 + x^748 + x^746 + x^742 + x^740 + x^738 + x^730 + x^726 + x^721 + x^718 + x^716 + x^714 + x^710 + x^709 + x^707 + x^706 + x^705 + x^696 + x^688 + x^684 + x^681 + x^677 + x^676 + x^674 + x^669 + x^666 + x^664 + x^659 + x^658 + x^657 + x^656 + x^655 + x^654 + x^651 + x^650 + x^647 + x^645 + x^639 + x^637 + x^636 + x^634 + x^631 + x^627 + x^625 + x^624 + x^622 + x^621 + x^619 + x^615 + x^614 + x^608 + x^605 + x^601 + x^599 + x^597 + x^596 + x^594 + x^593 + x^592 + x^591 + x^588 + x^587 + x^586 + x^585 + x^583 + x^582 + x^580 + x^578 + x^577 + x^576 + x^575 + x^574 + x^573 + x^572 + x^569 + x^568 + x^567 + x^565 + x^564 + x^561 + x^560 + x^559 + x^558 + x^557 + x^554 + x^553 + x^546 + x^545 + x^543 + x^542 + x^541 + x^539 + x^538 + x^536 + x^533 + x^530 + x^529 + x^527 + x^526 + x^525 + x^521 + x^520 + x^513 + x^509 + x^508 + x^504 + x^501 + x^500 + x^499 + x^498 + x^497 + x^496 + x^494 + x^488 + x^486 + x^484 + x^480 + x^479 + x^478 + x^475 + x^471 + x^469 + x^466 + x^463 + x^458 + x^456 + x^455 + x^452 + x^450 + x^449 + x^445 + x^437 + x^436 + x^433 + x^432 + x^430 + x^428 + x^426 + x^425 + x^423 + x^417 + x^416 + x^415 + x^413 + x^401 + x^400 + x^395 + x^394 + x^392 + x^391 + x^387 + x^386 + x^385 + x^384 + x^383 + x^379 + x^375 + x^373 + x^372 + x^371 + x^368 + x^366 + x^361 + x^360 + x^359 + x^358 + x^357 + x^354 + x^352 + x^350 + x^349 + x^348 + x^347 + x^345 + x^344 + x^343 + x^340 + x^334 + x^332 + x^330 + x^328 + x^327 + x^325 + x^323 + x^321 + x^318 + x^317 + x^316 + x^315 + x^314 + x^311 + x^310 + x^309 + x^308 + x^307 + x^306 + x^304 + x^299 + x^298 + x^296 + x^295 + x^294 + x^292 + x^291 + x^288 + x^287 + x^286 + x^282 + x^281 + x^280 + x^272 + x^271 + x^268 + x^267 + x^262 + x^256 + x^253 + x^252 + x^250 + x^244 + x^242 + x^241 + x^240 + x^238 + x^234 + x^233 + x^232 + x^231 + x^229 + x^228 + x^227 + x^226 + x^223 + x^222 + x^221 + x^220 + x^219 + x^218 + x^217 + x^215 + x^214 + x^212 + x^211 + x^208 + x^206 + x^203 + x^201 + x^199 + x^198 + x^195 + x^194 + x^193 + x^192 + x^189 + x^185 + x^182 + x^180 + x^179 + x^177 + x^176 + x^173 + x^172 + x^170 + x^164 + x^163 + x^160 + x^157 + x^155 + x^153 + x^152 + x^150 + x^147 + x^146 + x^139 + x^137 + x^132 + x^131 + x^127 + x^126 + x^125 + x^123 + x^122 + x^120 + x^115 + x^113 + x^111 + x^109 + x^107 + x^106 + x^104 + x^103 + x^101 + x^100 + x^99 + x^98 + x^97 + x^94 + x^88 + x^85 + x^78 + x^77 + x^76 + x^71 + x^68 + x^66 + x^64 + x^51 + x^47 + x^45 + x^39 + x^38 + x^36 + x^31 + x^30 + x^26 + x^24 + x^22 + x^20 + x^15 + 1
+
+2-30-27	343	x^928 + x^898 + x^881 + x^870 + x^868 + x^866 + x^851 + x^838 + x^819 + x^817 + x^808 + x^806 + x^804 + x^778 + x^776 + x^774 + x^772 + x^761 + x^759 + x^755 + x^753 + x^748 + x^742 + x^740 + x^731 + x^725 + x^718 + x^716 + x^712 + x^710 + x^706 + x^695 + x^693 + x^691 + x^689 + x^688 + x^682 + x^678 + x^674 + x^665 + x^663 + x^661 + x^658 + x^657 + x^652 + x^646 + x^644 + x^642 + x^641 + x^637 + x^629 + x^628 + x^627 + x^626 + x^625 + x^618 + x^616 + x^614 + x^612 + x^611 + x^610 + x^607 + x^601 + x^598 + x^597 + x^593 + x^592 + x^588 + x^580 + x^579 + x^577 + x^575 + x^573 + x^571 + x^569 + x^568 + x^566 + x^564 + x^563 + x^562 + x^561 + x^560 + x^554 + x^552 + x^550 + x^548 + x^543 + x^539 + x^538 + x^536 + x^534 + x^531 + x^530 + x^529 + x^528 + x^524 + x^521 + x^519 + x^517 + x^515 + x^513 + x^509 + x^508 + x^507 + x^505 + x^502 + x^500 + x^499 + x^498 + x^497 + x^492 + x^491 + x^487 + x^486 + x^484 + x^479 + x^478 + x^477 + x^476 + x^473 + x^470 + x^468 + x^466 + x^465 + x^464 + x^458 + x^454 + x^450 + x^448 + x^447 + x^446 + x^445 + x^439 + x^436 + x^435 + x^434 + x^433 + x^432 + x^428 + x^426 + x^422 + x^420 + x^416 + x^415 + x^413 + x^411 + x^409 + x^407 + x^406 + x^404 + x^399 + x^396 + x^392 + x^389 + x^384 + x^383 + x^382 + x^381 + x^379 + x^377 + x^376 + x^374 + x^372 + x^370 + x^367 + x^359 + x^355 + x^352 + x^347 + x^346 + x^344 + x^342 + x^341 + x^339 + x^338 + x^336 + x^335 + x^334 + x^328 + x^327 + x^324 + x^320 + x^318 + x^316 + x^314 + x^313 + x^309 + x^308 + x^304 + x^303 + x^300 + x^298 + x^297 + x^296 + x^294 + x^292 + x^287 + x^286 + x^284 + x^283 + x^282 + x^278 + x^276 + x^272 + x^269 + x^266 + x^265 + x^264 + x^261 + x^256 + x^252 + x^250 + x^248 + x^247 + x^245 + x^244 + x^243 + x^242 + x^239 + x^238 + x^237 + x^236 + x^235 + x^234 + x^233 + x^231 + x^229 + x^226 + x^225 + x^224 + x^220 + x^219 + x^216 + x^213 + x^212 + x^210 + x^205 + x^204 + x^203 + x^201 + x^199 + x^197 + x^194 + x^192 + x^191 + x^190 + x^189 + x^188 + x^186 + x^184 + x^183 + x^182 + x^178 + x^177 + x^176 + x^175 + x^173 + x^171 + x^170 + x^169 + x^166 + x^165 + x^163 + x^162 + x^161 + x^157 + x^156 + x^155 + x^153 + x^152 + x^150 + x^148 + x^147 + x^146 + x^144 + x^143 + x^141 + x^139 + x^137 + x^134 + x^133 + x^129 + x^128 + x^127 + x^126 + x^125 + x^123 + x^119 + x^117 + x^116 + x^115 + x^114 + x^113 + x^111 + x^110 + x^102 + x^101 + x^100 + x^99 + x^97 + x^96 + x^94 + x^93 + x^89 + x^88 + x^84 + x^83 + x^81 + x^78 + x^74 + x^72 + x^71 + x^69 + x^67 + x^62 + x^61 + x^59 + x^57 + x^56 + x^55 + x^53 + x^51 + x^47 + x^44 + x^42 + x^39 + x^37 + x^36 + x^35 + x^33 + x^30 + x^26 + x^24 + x^23 + x^21 + x^19 + x^18 + x^17 + x^16 + x^10 + x^8 + x^2 + 1
+
+26-55-39	345	x^928 + x^904 + x^898 + x^870 + x^861 + x^856 + x^851 + x^850 + x^831 + x^821 + x^820 + x^818 + x^813 + x^802 + x^796 + x^794 + x^790 + x^788 + x^783 + x^778 + x^775 + x^772 + x^770 + x^765 + x^760 + x^754 + x^746 + x^745 + x^741 + x^740 + x^736 + x^735 + x^734 + x^732 + x^731 + x^729 + x^727 + x^723 + x^722 + x^721 + x^716 + x^715 + x^710 + x^708 + x^705 + x^701 + x^699 + x^686 + x^685 + x^684 + x^681 + x^679 + x^678 + x^676 + x^674 + x^673 + x^672 + x^668 + x^664 + x^663 + x^661 + x^660 + x^658 + x^656 + x^650 + x^648 + x^645 + x^643 + x^641 + x^638 + x^637 + x^636 + x^632 + x^622 + x^621 + x^618 + x^616 + x^615 + x^614 + x^612 + x^608 + x^603 + x^600 + x^598 + x^595 + x^594 + x^593 + x^591 + x^590 + x^589 + x^588 + x^585 + x^582 + x^581 + x^576 + x^574 + x^571 + x^569 + x^568 + x^564 + x^562 + x^557 + x^556 + x^553 + x^550 + x^549 + x^548 + x^547 + x^546 + x^545 + x^544 + x^543 + x^538 + x^535 + x^530 + x^525 + x^520 + x^517 + x^515 + x^514 + x^510 + x^509 + x^506 + x^501 + x^497 + x^495 + x^489 + x^486 + x^484 + x^483 + x^482 + x^480 + x^479 + x^476 + x^474 + x^473 + x^471 + x^470 + x^469 + x^467 + x^464 + x^462 + x^460 + x^453 + x^452 + x^450 + x^449 + x^448 + x^446 + x^444 + x^443 + x^441 + x^436 + x^435 + x^434 + x^433 + x^432 + x^429 + x^428 + x^427 + x^424 + x^419 + x^418 + x^417 + x^416 + x^413 + x^412 + x^410 + x^407 + x^404 + x^403 + x^401 + x^399 + x^398 + x^397 + x^396 + x^394 + x^393 + x^392 + x^390 + x^386 + x^385 + x^383 + x^379 + x^378 + x^377 + x^376 + x^375 + x^373 + x^372 + x^366 + x^362 + x^359 + x^357 + x^355 + x^354 + x^351 + x^350 + x^347 + x^346 + x^344 + x^340 + x^339 + x^338 + x^337 + x^333 + x^332 + x^331 + x^330 + x^328 + x^326 + x^325 + x^323 + x^319 + x^315 + x^314 + x^313 + x^311 + x^310 + x^308 + x^307 + x^306 + x^304 + x^301 + x^300 + x^298 + x^296 + x^294 + x^293 + x^292 + x^291 + x^290 + x^286 + x^283 + x^280 + x^277 + x^274 + x^272 + x^265 + x^264 + x^263 + x^261 + x^260 + x^258 + x^255 + x^252 + x^251 + x^250 + x^249 + x^247 + x^245 + x^244 + x^241 + x^238 + x^235 + x^234 + x^230 + x^228 + x^225 + x^221 + x^218 + x^212 + x^211 + x^210 + x^208 + x^206 + x^204 + x^203 + x^202 + x^199 + x^198 + x^196 + x^195 + x^193 + x^188 + x^186 + x^184 + x^183 + x^177 + x^176 + x^167 + x^166 + x^165 + x^163 + x^161 + x^160 + x^158 + x^156 + x^153 + x^151 + x^146 + x^144 + x^141 + x^140 + x^134 + x^133 + x^129 + x^128 + x^127 + x^124 + x^123 + x^121 + x^119 + x^117 + x^115 + x^114 + x^113 + x^112 + x^111 + x^110 + x^109 + x^105 + x^104 + x^103 + x^100 + x^99 + x^93 + x^92 + x^91 + x^86 + x^84 + x^81 + x^80 + x^77 + x^75 + x^72 + x^71 + x^70 + x^68 + x^66 + x^65 + x^64 + x^61 + x^54 + x^53 + x^47 + x^45 + x^36 + x^35 + x^34 + x^32 + x^29 + x^18 + x^7 + 1
+
+40-36-23	345	x^928 + x^898 + x^886 + x^870 + x^862 + x^844 + x^838 + x^826 + x^820 + x^816 + x^814 + x^808 + x^797 + x^792 + x^791 + x^790 + x^784 + x^778 + x^777 + x^772 + x^768 + x^767 + x^766 + x^762 + x^761 + x^756 + x^753 + x^749 + x^747 + x^744 + x^742 + x^738 + x^735 + x^734 + x^726 + x^724 + x^723 + x^720 + x^712 + x^702 + x^701 + x^695 + x^689 + x^684 + x^683 + x^681 + x^677 + x^675 + x^670 + x^669 + x^664 + x^663 + x^660 + x^659 + x^658 + x^653 + x^648 + x^646 + x^644 + x^634 + x^629 + x^628 + x^627 + x^626 + x^625 + x^622 + x^621 + x^617 + x^616 + x^611 + x^609 + x^605 + x^604 + x^603 + x^602 + x^597 + x^595 + x^594 + x^593 + x^592 + x^586 + x^585 + x^584 + x^578 + x^575 + x^574 + x^573 + x^572 + x^571 + x^569 + x^565 + x^563 + x^561 + x^559 + x^557 + x^555 + x^554 + x^547 + x^545 + x^543 + x^539 + x^537 + x^536 + x^535 + x^534 + x^529 + x^528 + x^527 + x^525 + x^524 + x^521 + x^520 + x^519 + x^518 + x^517 + x^515 + x^514 + x^512 + x^510 + x^509 + x^508 + x^507 + x^506 + x^504 + x^503 + x^501 + x^499 + x^496 + x^494 + x^490 + x^489 + x^487 + x^485 + x^484 + x^482 + x^481 + x^480 + x^479 + x^478 + x^477 + x^475 + x^473 + x^470 + x^466 + x^465 + x^464 + x^463 + x^460 + x^457 + x^456 + x^454 + x^453 + x^452 + x^447 + x^446 + x^442 + x^441 + x^439 + x^436 + x^434 + x^432 + x^430 + x^428 + x^427 + x^423 + x^421 + x^416 + x^415 + x^414 + x^413 + x^411 + x^408 + x^405 + x^402 + x^401 + x^399 + x^396 + x^394 + x^393 + x^391 + x^390 + x^389 + x^388 + x^387 + x^386 + x^384 + x^381 + x^379 + x^378 + x^377 + x^375 + x^374 + x^372 + x^369 + x^367 + x^366 + x^364 + x^363 + x^361 + x^360 + x^359 + x^358 + x^356 + x^355 + x^354 + x^353 + x^352 + x^349 + x^345 + x^343 + x^342 + x^338 + x^336 + x^335 + x^334 + x^333 + x^331 + x^329 + x^328 + x^327 + x^320 + x^318 + x^317 + x^316 + x^312 + x^307 + x^304 + x^303 + x^300 + x^298 + x^296 + x^295 + x^294 + x^293 + x^291 + x^290 + x^288 + x^287 + x^286 + x^285 + x^284 + x^276 + x^275 + x^274 + x^273 + x^272 + x^271 + x^269 + x^268 + x^266 + x^263 + x^262 + x^259 + x^257 + x^255 + x^254 + x^251 + x^248 + x^246 + x^244 + x^240 + x^238 + x^237 + x^235 + x^234 + x^232 + x^228 + x^226 + x^225 + x^224 + x^222 + x^220 + x^217 + x^213 + x^212 + x^211 + x^209 + x^208 + x^207 + x^202 + x^200 + x^199 + x^198 + x^192 + x^190 + x^187 + x^183 + x^182 + x^180 + x^175 + x^172 + x^171 + x^170 + x^169 + x^167 + x^166 + x^165 + x^164 + x^163 + x^160 + x^157 + x^154 + x^153 + x^152 + x^150 + x^149 + x^148 + x^147 + x^146 + x^144 + x^142 + x^140 + x^137 + x^136 + x^134 + x^132 + x^129 + x^128 + x^124 + x^119 + x^117 + x^116 + x^115 + x^110 + x^108 + x^106 + x^103 + x^98 + x^88 + x^82 + x^76 + x^75 + x^74 + x^69 + x^68 + x^64 + x^62 + x^51 + x^47 + x^46 + x^39 + x^32 + x^23 + x^22 + 1
+
+24-36-37	347	x^928 + x^898 + x^878 + x^870 + x^854 + x^830 + x^824 + x^821 + x^818 + x^816 + x^813 + x^808 + x^806 + x^800 + x^792 + x^791 + x^789 + x^783 + x^780 + x^778 + x^776 + x^768 + x^765 + x^759 + x^753 + x^750 + x^747 + x^745 + x^744 + x^741 + x^740 + x^736 + x^734 + x^729 + x^721 + x^717 + x^715 + x^714 + x^708 + x^705 + x^704 + x^702 + x^699 + x^694 + x^690 + x^688 + x^684 + x^682 + x^681 + x^680 + x^679 + x^670 + x^669 + x^666 + x^664 + x^663 + x^660 + x^652 + x^649 + x^646 + x^645 + x^643 + x^639 + x^636 + x^634 + x^633 + x^631 + x^629 + x^627 + x^622 + x^621 + x^620 + x^614 + x^613 + x^612 + x^611 + x^610 + x^609 + x^605 + x^603 + x^601 + x^600 + x^599 + x^596 + x^593 + x^590 + x^587 + x^586 + x^585 + x^584 + x^583 + x^582 + x^581 + x^579 + x^577 + x^573 + x^565 + x^564 + x^563 + x^562 + x^561 + x^560 + x^559 + x^558 + x^557 + x^554 + x^550 + x^549 + x^546 + x^545 + x^544 + x^543 + x^542 + x^539 + x^538 + x^536 + x^535 + x^534 + x^529 + x^527 + x^525 + x^524 + x^523 + x^521 + x^519 + x^518 + x^516 + x^515 + x^512 + x^510 + x^505 + x^504 + x^503 + x^501 + x^500 + x^499 + x^493 + x^492 + x^488 + x^484 + x^483 + x^479 + x^474 + x^472 + x^470 + x^465 + x^464 + x^459 + x^457 + x^455 + x^454 + x^450 + x^440 + x^435 + x^434 + x^433 + x^427 + x^426 + x^424 + x^421 + x^420 + x^419 + x^414 + x^413 + x^412 + x^409 + x^407 + x^406 + x^405 + x^403 + x^401 + x^400 + x^399 + x^398 + x^395 + x^393 + x^391 + x^390 + x^388 + x^383 + x^381 + x^376 + x^374 + x^370 + x^367 + x^365 + x^363 + x^359 + x^356 + x^355 + x^353 + x^352 + x^348 + x^347 + x^346 + x^345 + x^344 + x^343 + x^342 + x^339 + x^336 + x^330 + x^327 + x^326 + x^325 + x^324 + x^323 + x^321 + x^318 + x^316 + x^315 + x^314 + x^312 + x^311 + x^310 + x^302 + x^300 + x^298 + x^295 + x^294 + x^292 + x^284 + x^282 + x^279 + x^278 + x^277 + x^276 + x^271 + x^268 + x^267 + x^266 + x^265 + x^264 + x^262 + x^260 + x^256 + x^253 + x^250 + x^249 + x^248 + x^244 + x^243 + x^242 + x^239 + x^236 + x^235 + x^232 + x^231 + x^229 + x^227 + x^226 + x^222 + x^220 + x^219 + x^216 + x^215 + x^214 + x^213 + x^211 + x^209 + x^208 + x^204 + x^202 + x^200 + x^199 + x^198 + x^196 + x^193 + x^191 + x^190 + x^189 + x^188 + x^187 + x^186 + x^179 + x^178 + x^177 + x^176 + x^175 + x^174 + x^170 + x^169 + x^167 + x^163 + x^162 + x^161 + x^160 + x^153 + x^150 + x^149 + x^147 + x^145 + x^140 + x^138 + x^136 + x^135 + x^133 + x^131 + x^130 + x^128 + x^127 + x^119 + x^117 + x^113 + x^111 + x^110 + x^108 + x^104 + x^103 + x^102 + x^101 + x^100 + x^99 + x^97 + x^96 + x^93 + x^88 + x^87 + x^86 + x^85 + x^84 + x^83 + x^82 + x^80 + x^78 + x^77 + x^72 + x^71 + x^70 + x^67 + x^66 + x^64 + x^63 + x^62 + x^61 + x^59 + x^58 + x^56 + x^54 + x^53 + x^50 + x^47 + x^46 + x^38 + x^24 + x^16 + 1
+
+26-38-9	353	x^928 + x^898 + x^875 + x^870 + x^848 + x^822 + x^808 + x^806 + x^800 + x^798 + x^797 + x^795 + x^792 + x^788 + x^778 + x^776 + x^769 + x^767 + x^765 + x^762 + x^758 + x^756 + x^747 + x^741 + x^732 + x^730 + x^728 + x^727 + x^723 + x^719 + x^714 + x^712 + x^711 + x^709 + x^706 + x^703 + x^700 + x^697 + x^695 + x^689 + x^688 + x^686 + x^684 + x^682 + x^680 + x^678 + x^676 + x^674 + x^673 + x^667 + x^666 + x^664 + x^661 + x^658 + x^653 + x^652 + x^649 + x^648 + x^646 + x^645 + x^635 + x^634 + x^633 + x^629 + x^626 + x^625 + x^620 + x^616 + x^614 + x^612 + x^611 + x^610 + x^607 + x^606 + x^604 + x^603 + x^599 + x^595 + x^594 + x^591 + x^583 + x^580 + x^578 + x^577 + x^572 + x^569 + x^568 + x^567 + x^566 + x^564 + x^559 + x^558 + x^555 + x^554 + x^550 + x^549 + x^548 + x^543 + x^542 + x^541 + x^539 + x^533 + x^532 + x^531 + x^528 + x^527 + x^526 + x^523 + x^519 + x^518 + x^515 + x^514 + x^513 + x^512 + x^511 + x^510 + x^509 + x^508 + x^507 + x^506 + x^502 + x^497 + x^495 + x^491 + x^488 + x^487 + x^485 + x^483 + x^482 + x^481 + x^478 + x^477 + x^476 + x^475 + x^473 + x^469 + x^466 + x^463 + x^462 + x^460 + x^458 + x^457 + x^456 + x^451 + x^447 + x^444 + x^443 + x^442 + x^440 + x^438 + x^437 + x^435 + x^433 + x^432 + x^430 + x^427 + x^424 + x^418 + x^417 + x^416 + x^414 + x^410 + x^409 + x^403 + x^401 + x^398 + x^397 + x^396 + x^394 + x^393 + x^391 + x^389 + x^388 + x^386 + x^385 + x^384 + x^382 + x^381 + x^380 + x^375 + x^374 + x^368 + x^364 + x^363 + x^359 + x^358 + x^357 + x^356 + x^354 + x^350 + x^349 + x^347 + x^346 + x^339 + x^337 + x^336 + x^334 + x^332 + x^330 + x^329 + x^328 + x^327 + x^326 + x^325 + x^324 + x^320 + x^318 + x^317 + x^315 + x^313 + x^309 + x^307 + x^305 + x^304 + x^303 + x^300 + x^299 + x^295 + x^293 + x^290 + x^288 + x^286 + x^285 + x^281 + x^279 + x^277 + x^274 + x^273 + x^269 + x^267 + x^266 + x^265 + x^263 + x^262 + x^257 + x^256 + x^255 + x^251 + x^249 + x^247 + x^246 + x^243 + x^241 + x^237 + x^236 + x^233 + x^230 + x^228 + x^227 + x^226 + x^225 + x^224 + x^223 + x^222 + x^221 + x^220 + x^212 + x^211 + x^210 + x^209 + x^208 + x^205 + x^204 + x^202 + x^201 + x^200 + x^197 + x^192 + x^191 + x^186 + x^184 + x^183 + x^181 + x^177 + x^175 + x^174 + x^170 + x^167 + x^165 + x^164 + x^162 + x^156 + x^154 + x^149 + x^148 + x^147 + x^144 + x^143 + x^142 + x^141 + x^139 + x^138 + x^137 + x^133 + x^131 + x^130 + x^128 + x^127 + x^126 + x^120 + x^116 + x^115 + x^113 + x^111 + x^108 + x^107 + x^105 + x^101 + x^99 + x^97 + x^95 + x^91 + x^90 + x^88 + x^87 + x^85 + x^81 + x^79 + x^78 + x^75 + x^72 + x^71 + x^70 + x^69 + x^66 + x^65 + x^63 + x^59 + x^57 + x^55 + x^54 + x^52 + x^51 + x^50 + x^49 + x^46 + x^44 + x^43 + x^39 + x^36 + x^34 + x^33 + x^32 + x^31 + x^30 + x^26 + x^24 + x^22 + x^16 + x^14 + x^8 + x^6 + 1
+
+31-6-30	353	x^928 + x^898 + x^870 + x^834 + x^814 + x^796 + x^790 + x^788 + x^784 + x^774 + x^772 + x^770 + x^762 + x^760 + x^756 + x^748 + x^740 + x^734 + x^732 + x^728 + x^727 + x^726 + x^718 + x^716 + x^712 + x^707 + x^701 + x^700 + x^697 + x^692 + x^688 + x^686 + x^684 + x^682 + x^681 + x^678 + x^677 + x^676 + x^674 + x^671 + x^670 + x^668 + x^665 + x^660 + x^658 + x^655 + x^652 + x^651 + x^650 + x^649 + x^646 + x^642 + x^641 + x^639 + x^638 + x^637 + x^636 + x^635 + x^630 + x^625 + x^624 + x^623 + x^622 + x^621 + x^620 + x^619 + x^617 + x^612 + x^611 + x^610 + x^609 + x^608 + x^607 + x^606 + x^604 + x^601 + x^598 + x^597 + x^593 + x^592 + x^591 + x^590 + x^582 + x^579 + x^578 + x^572 + x^570 + x^567 + x^566 + x^565 + x^563 + x^561 + x^559 + x^558 + x^555 + x^554 + x^544 + x^543 + x^542 + x^540 + x^539 + x^536 + x^533 + x^529 + x^528 + x^525 + x^522 + x^517 + x^516 + x^512 + x^511 + x^510 + x^507 + x^505 + x^502 + x^501 + x^499 + x^494 + x^492 + x^491 + x^489 + x^488 + x^487 + x^486 + x^484 + x^483 + x^481 + x^480 + x^476 + x^473 + x^469 + x^468 + x^466 + x^465 + x^464 + x^457 + x^451 + x^449 + x^448 + x^445 + x^444 + x^441 + x^440 + x^438 + x^436 + x^435 + x^433 + x^432 + x^431 + x^428 + x^425 + x^422 + x^420 + x^418 + x^414 + x^413 + x^412 + x^411 + x^410 + x^406 + x^405 + x^402 + x^401 + x^400 + x^394 + x^390 + x^389 + x^387 + x^384 + x^382 + x^380 + x^376 + x^375 + x^372 + x^371 + x^370 + x^369 + x^366 + x^363 + x^362 + x^361 + x^359 + x^357 + x^356 + x^354 + x^352 + x^351 + x^349 + x^347 + x^346 + x^344 + x^343 + x^342 + x^341 + x^340 + x^338 + x^337 + x^336 + x^334 + x^333 + x^331 + x^328 + x^323 + x^322 + x^318 + x^315 + x^313 + x^312 + x^310 + x^309 + x^308 + x^307 + x^301 + x^300 + x^298 + x^296 + x^295 + x^294 + x^292 + x^287 + x^285 + x^284 + x^283 + x^282 + x^279 + x^276 + x^275 + x^272 + x^270 + x^269 + x^268 + x^267 + x^263 + x^261 + x^259 + x^258 + x^256 + x^250 + x^248 + x^247 + x^246 + x^245 + x^244 + x^240 + x^239 + x^238 + x^237 + x^236 + x^235 + x^232 + x^231 + x^230 + x^229 + x^226 + x^223 + x^220 + x^217 + x^216 + x^213 + x^212 + x^210 + x^208 + x^205 + x^204 + x^201 + x^195 + x^194 + x^192 + x^191 + x^189 + x^188 + x^182 + x^181 + x^177 + x^175 + x^174 + x^173 + x^171 + x^169 + x^167 + x^162 + x^161 + x^159 + x^158 + x^154 + x^153 + x^148 + x^146 + x^145 + x^144 + x^143 + x^142 + x^141 + x^140 + x^139 + x^138 + x^135 + x^134 + x^133 + x^122 + x^119 + x^118 + x^115 + x^111 + x^110 + x^108 + x^107 + x^106 + x^105 + x^101 + x^99 + x^97 + x^96 + x^95 + x^94 + x^93 + x^92 + x^90 + x^87 + x^84 + x^83 + x^80 + x^74 + x^73 + x^71 + x^70 + x^67 + x^66 + x^63 + x^55 + x^53 + x^52 + x^51 + x^49 + x^45 + x^44 + x^43 + x^40 + x^35 + x^34 + x^33 + x^32 + x^27 + x^25 + x^24 + x^22 + x^21 + x^20 + x^17 + x^16 + x^11 + x^4 + 1
+
+54-21-7	353	x^928 + x^898 + x^870 + x^861 + x^860 + x^859 + x^858 + x^846 + x^842 + x^837 + x^836 + x^835 + x^831 + x^830 + x^829 + x^828 + x^822 + x^818 + x^811 + x^810 + x^808 + x^807 + x^804 + x^798 + x^792 + x^788 + x^781 + x^778 + x^758 + x^756 + x^751 + x^750 + x^746 + x^745 + x^740 + x^739 + x^738 + x^722 + x^720 + x^716 + x^703 + x^701 + x^696 + x^695 + x^688 + x^686 + x^674 + x^666 + x^659 + x^658 + x^656 + x^655 + x^654 + x^649 + x^644 + x^643 + x^641 + x^637 + x^632 + x^630 + x^629 + x^626 + x^623 + x^621 + x^620 + x^618 + x^614 + x^613 + x^606 + x^601 + x^599 + x^597 + x^595 + x^592 + x^591 + x^589 + x^588 + x^586 + x^584 + x^582 + x^577 + x^576 + x^575 + x^568 + x^567 + x^565 + x^564 + x^562 + x^558 + x^556 + x^553 + x^551 + x^550 + x^548 + x^547 + x^541 + x^540 + x^535 + x^534 + x^528 + x^527 + x^526 + x^522 + x^521 + x^520 + x^517 + x^514 + x^512 + x^510 + x^504 + x^503 + x^502 + x^498 + x^497 + x^496 + x^487 + x^482 + x^474 + x^473 + x^469 + x^468 + x^466 + x^463 + x^462 + x^459 + x^454 + x^453 + x^452 + x^451 + x^447 + x^442 + x^441 + x^433 + x^431 + x^430 + x^429 + x^426 + x^424 + x^423 + x^422 + x^421 + x^419 + x^417 + x^415 + x^412 + x^411 + x^409 + x^405 + x^402 + x^397 + x^396 + x^393 + x^392 + x^391 + x^385 + x^384 + x^382 + x^381 + x^380 + x^370 + x^369 + x^367 + x^365 + x^364 + x^361 + x^359 + x^356 + x^355 + x^351 + x^350 + x^349 + x^343 + x^342 + x^341 + x^340 + x^339 + x^338 + x^336 + x^335 + x^333 + x^332 + x^331 + x^330 + x^326 + x^325 + x^324 + x^323 + x^318 + x^317 + x^315 + x^313 + x^310 + x^309 + x^306 + x^301 + x^300 + x^298 + x^295 + x^294 + x^293 + x^292 + x^291 + x^290 + x^289 + x^288 + x^282 + x^281 + x^278 + x^277 + x^276 + x^275 + x^273 + x^271 + x^268 + x^266 + x^265 + x^263 + x^261 + x^260 + x^259 + x^257 + x^252 + x^249 + x^247 + x^244 + x^243 + x^238 + x^236 + x^232 + x^231 + x^229 + x^228 + x^227 + x^226 + x^225 + x^224 + x^221 + x^220 + x^219 + x^215 + x^214 + x^211 + x^209 + x^207 + x^204 + x^201 + x^198 + x^196 + x^195 + x^194 + x^193 + x^191 + x^189 + x^186 + x^185 + x^182 + x^181 + x^179 + x^178 + x^174 + x^173 + x^172 + x^170 + x^168 + x^166 + x^164 + x^162 + x^160 + x^159 + x^156 + x^155 + x^154 + x^152 + x^151 + x^149 + x^148 + x^147 + x^146 + x^145 + x^143 + x^140 + x^134 + x^133 + x^130 + x^129 + x^128 + x^126 + x^124 + x^123 + x^122 + x^121 + x^119 + x^118 + x^117 + x^116 + x^115 + x^113 + x^110 + x^107 + x^106 + x^105 + x^104 + x^103 + x^102 + x^101 + x^99 + x^97 + x^96 + x^95 + x^94 + x^93 + x^92 + x^91 + x^90 + x^89 + x^86 + x^85 + x^82 + x^81 + x^80 + x^79 + x^78 + x^76 + x^73 + x^71 + x^69 + x^65 + x^63 + x^60 + x^58 + x^57 + x^56 + x^55 + x^54 + x^52 + x^49 + x^47 + x^46 + x^45 + x^43 + x^42 + x^40 + x^39 + x^38 + x^36 + x^33 + x^32 + x^28 + x^25 + x^19 + x^18 + x^7 + 1
+
+8-36-47	355	x^928 + x^898 + x^870 + x^860 + x^856 + x^830 + x^818 + x^814 + x^813 + x^808 + x^800 + x^797 + x^796 + x^792 + x^788 + x^783 + x^778 + x^776 + x^772 + x^771 + x^770 + x^767 + x^766 + x^762 + x^755 + x^750 + x^740 + x^737 + x^736 + x^734 + x^730 + x^729 + x^724 + x^719 + x^711 + x^710 + x^707 + x^706 + x^698 + x^693 + x^692 + x^690 + x^688 + x^687 + x^680 + x^676 + x^674 + x^673 + x^672 + x^669 + x^665 + x^663 + x^662 + x^658 + x^657 + x^656 + x^653 + x^651 + x^650 + x^648 + x^647 + x^642 + x^635 + x^632 + x^631 + x^630 + x^627 + x^625 + x^624 + x^623 + x^622 + x^620 + x^619 + x^618 + x^609 + x^600 + x^595 + x^593 + x^592 + x^591 + x^589 + x^587 + x^583 + x^582 + x^579 + x^578 + x^577 + x^574 + x^570 + x^566 + x^565 + x^561 + x^559 + x^558 + x^557 + x^556 + x^555 + x^552 + x^550 + x^548 + x^544 + x^542 + x^541 + x^540 + x^537 + x^536 + x^534 + x^533 + x^532 + x^531 + x^528 + x^527 + x^525 + x^524 + x^521 + x^519 + x^518 + x^517 + x^516 + x^515 + x^514 + x^513 + x^512 + x^511 + x^509 + x^507 + x^505 + x^504 + x^502 + x^501 + x^497 + x^496 + x^493 + x^492 + x^491 + x^490 + x^488 + x^486 + x^485 + x^480 + x^478 + x^476 + x^475 + x^473 + x^469 + x^468 + x^467 + x^466 + x^463 + x^462 + x^453 + x^452 + x^451 + x^449 + x^447 + x^446 + x^445 + x^444 + x^443 + x^440 + x^438 + x^437 + x^436 + x^435 + x^427 + x^426 + x^423 + x^421 + x^419 + x^416 + x^411 + x^410 + x^409 + x^408 + x^406 + x^405 + x^404 + x^403 + x^402 + x^400 + x^398 + x^397 + x^395 + x^391 + x^390 + x^389 + x^385 + x^384 + x^380 + x^378 + x^377 + x^374 + x^373 + x^372 + x^370 + x^367 + x^366 + x^365 + x^363 + x^361 + x^360 + x^354 + x^352 + x^351 + x^350 + x^347 + x^342 + x^339 + x^337 + x^334 + x^333 + x^330 + x^328 + x^326 + x^324 + x^323 + x^315 + x^314 + x^309 + x^306 + x^304 + x^302 + x^298 + x^297 + x^296 + x^295 + x^293 + x^291 + x^289 + x^284 + x^282 + x^281 + x^279 + x^275 + x^274 + x^273 + x^269 + x^267 + x^265 + x^263 + x^261 + x^260 + x^259 + x^257 + x^256 + x^254 + x^252 + x^248 + x^247 + x^246 + x^244 + x^243 + x^242 + x^241 + x^238 + x^235 + x^234 + x^232 + x^229 + x^227 + x^225 + x^224 + x^223 + x^219 + x^217 + x^215 + x^211 + x^208 + x^206 + x^205 + x^203 + x^200 + x^197 + x^195 + x^190 + x^189 + x^187 + x^185 + x^176 + x^174 + x^172 + x^169 + x^165 + x^160 + x^159 + x^158 + x^156 + x^155 + x^154 + x^153 + x^152 + x^150 + x^146 + x^141 + x^139 + x^137 + x^135 + x^132 + x^131 + x^130 + x^127 + x^124 + x^120 + x^119 + x^116 + x^114 + x^111 + x^110 + x^109 + x^108 + x^105 + x^102 + x^99 + x^98 + x^95 + x^94 + x^93 + x^92 + x^90 + x^87 + x^86 + x^76 + x^75 + x^74 + x^72 + x^70 + x^68 + x^67 + x^65 + x^64 + x^63 + x^60 + x^59 + x^58 + x^57 + x^54 + x^51 + x^50 + x^48 + x^46 + x^45 + x^44 + x^43 + x^41 + x^39 + x^38 + x^36 + x^30 + x^27 + x^26 + x^24 + x^18 + x^14 + x^12 + 1
+
+44-14-41	357	x^928 + x^898 + x^870 + x^856 + x^852 + x^847 + x^831 + x^822 + x^817 + x^814 + x^808 + x^796 + x^795 + x^792 + x^784 + x^778 + x^777 + x^775 + x^772 + x^771 + x^766 + x^763 + x^756 + x^754 + x^747 + x^746 + x^745 + x^744 + x^742 + x^736 + x^733 + x^732 + x^730 + x^727 + x^726 + x^724 + x^721 + x^717 + x^716 + x^715 + x^714 + x^711 + x^705 + x^704 + x^694 + x^693 + x^691 + x^684 + x^682 + x^678 + x^674 + x^670 + x^664 + x^662 + x^655 + x^653 + x^647 + x^645 + x^644 + x^643 + x^637 + x^636 + x^635 + x^633 + x^631 + x^627 + x^626 + x^625 + x^624 + x^620 + x^618 + x^605 + x^604 + x^603 + x^601 + x^597 + x^588 + x^585 + x^583 + x^578 + x^575 + x^574 + x^569 + x^568 + x^567 + x^566 + x^565 + x^563 + x^558 + x^556 + x^554 + x^553 + x^552 + x^551 + x^550 + x^548 + x^544 + x^543 + x^542 + x^539 + x^538 + x^537 + x^535 + x^533 + x^532 + x^530 + x^528 + x^525 + x^523 + x^521 + x^520 + x^516 + x^515 + x^514 + x^513 + x^510 + x^509 + x^506 + x^504 + x^502 + x^497 + x^496 + x^491 + x^487 + x^485 + x^484 + x^482 + x^481 + x^480 + x^473 + x^471 + x^470 + x^468 + x^466 + x^464 + x^463 + x^462 + x^461 + x^459 + x^458 + x^455 + x^452 + x^450 + x^449 + x^447 + x^446 + x^443 + x^442 + x^440 + x^438 + x^436 + x^435 + x^432 + x^429 + x^428 + x^423 + x^420 + x^418 + x^417 + x^416 + x^413 + x^412 + x^411 + x^410 + x^407 + x^406 + x^405 + x^403 + x^402 + x^401 + x^400 + x^397 + x^396 + x^393 + x^392 + x^391 + x^390 + x^389 + x^386 + x^385 + x^384 + x^382 + x^380 + x^378 + x^376 + x^371 + x^370 + x^369 + x^368 + x^365 + x^364 + x^363 + x^359 + x^358 + x^357 + x^356 + x^353 + x^351 + x^350 + x^349 + x^348 + x^346 + x^345 + x^343 + x^342 + x^340 + x^339 + x^338 + x^335 + x^333 + x^332 + x^327 + x^324 + x^322 + x^317 + x^316 + x^315 + x^313 + x^311 + x^308 + x^307 + x^306 + x^304 + x^303 + x^301 + x^300 + x^299 + x^296 + x^294 + x^293 + x^292 + x^291 + x^290 + x^289 + x^284 + x^281 + x^279 + x^278 + x^276 + x^275 + x^273 + x^272 + x^271 + x^269 + x^266 + x^264 + x^260 + x^258 + x^256 + x^255 + x^251 + x^250 + x^248 + x^247 + x^244 + x^243 + x^241 + x^240 + x^239 + x^236 + x^235 + x^233 + x^232 + x^230 + x^226 + x^224 + x^223 + x^221 + x^220 + x^218 + x^217 + x^216 + x^215 + x^211 + x^210 + x^209 + x^208 + x^206 + x^204 + x^201 + x^200 + x^197 + x^196 + x^192 + x^187 + x^185 + x^183 + x^182 + x^181 + x^179 + x^178 + x^177 + x^175 + x^173 + x^170 + x^169 + x^168 + x^166 + x^159 + x^158 + x^157 + x^155 + x^154 + x^150 + x^149 + x^146 + x^144 + x^139 + x^138 + x^134 + x^132 + x^131 + x^128 + x^125 + x^123 + x^122 + x^120 + x^119 + x^116 + x^115 + x^111 + x^110 + x^109 + x^108 + x^101 + x^100 + x^99 + x^97 + x^96 + x^93 + x^92 + x^90 + x^87 + x^77 + x^74 + x^71 + x^70 + x^63 + x^58 + x^56 + x^54 + x^53 + x^52 + x^51 + x^50 + x^46 + x^42 + x^40 + x^38 + x^37 + x^36 + x^30 + x^28 + x^26 + x^14 + x^12 + 1
+
+22-40-11	359	x^928 + x^898 + x^870 + x^829 + x^816 + x^814 + x^808 + x^803 + x^799 + x^786 + x^784 + x^778 + x^777 + x^773 + x^764 + x^762 + x^743 + x^738 + x^736 + x^734 + x^725 + x^723 + x^719 + x^713 + x^710 + x^708 + x^699 + x^691 + x^688 + x^686 + x^684 + x^682 + x^673 + x^672 + x^665 + x^661 + x^657 + x^656 + x^654 + x^652 + x^650 + x^648 + x^645 + x^644 + x^642 + x^639 + x^637 + x^633 + x^631 + x^630 + x^626 + x^624 + x^622 + x^621 + x^620 + x^619 + x^618 + x^615 + x^614 + x^612 + x^611 + x^609 + x^606 + x^605 + x^604 + x^603 + x^601 + x^600 + x^599 + x^598 + x^594 + x^591 + x^587 + x^586 + x^585 + x^582 + x^580 + x^578 + x^577 + x^576 + x^572 + x^562 + x^561 + x^559 + x^558 + x^557 + x^556 + x^554 + x^553 + x^552 + x^550 + x^549 + x^548 + x^545 + x^543 + x^541 + x^540 + x^537 + x^535 + x^534 + x^533 + x^531 + x^530 + x^528 + x^527 + x^526 + x^522 + x^521 + x^518 + x^517 + x^516 + x^515 + x^514 + x^512 + x^511 + x^510 + x^509 + x^508 + x^507 + x^501 + x^499 + x^494 + x^491 + x^490 + x^489 + x^488 + x^486 + x^484 + x^483 + x^481 + x^480 + x^479 + x^478 + x^476 + x^475 + x^474 + x^472 + x^471 + x^469 + x^468 + x^466 + x^465 + x^464 + x^463 + x^461 + x^459 + x^457 + x^450 + x^449 + x^448 + x^446 + x^445 + x^439 + x^438 + x^437 + x^436 + x^435 + x^433 + x^431 + x^430 + x^429 + x^427 + x^426 + x^423 + x^418 + x^417 + x^415 + x^413 + x^403 + x^402 + x^401 + x^399 + x^398 + x^397 + x^395 + x^394 + x^393 + x^386 + x^382 + x^379 + x^378 + x^377 + x^368 + x^367 + x^366 + x^364 + x^363 + x^362 + x^360 + x^359 + x^356 + x^354 + x^352 + x^344 + x^343 + x^342 + x^341 + x^340 + x^337 + x^336 + x^331 + x^330 + x^325 + x^323 + x^321 + x^320 + x^319 + x^318 + x^315 + x^313 + x^311 + x^310 + x^308 + x^306 + x^303 + x^302 + x^300 + x^298 + x^297 + x^296 + x^294 + x^293 + x^292 + x^291 + x^290 + x^288 + x^286 + x^285 + x^283 + x^278 + x^277 + x^275 + x^274 + x^273 + x^271 + x^269 + x^268 + x^267 + x^265 + x^261 + x^260 + x^259 + x^257 + x^256 + x^255 + x^254 + x^251 + x^249 + x^248 + x^245 + x^244 + x^242 + x^240 + x^238 + x^237 + x^236 + x^231 + x^229 + x^227 + x^225 + x^224 + x^223 + x^222 + x^221 + x^216 + x^215 + x^213 + x^211 + x^205 + x^202 + x^196 + x^194 + x^193 + x^192 + x^191 + x^190 + x^184 + x^180 + x^179 + x^178 + x^177 + x^176 + x^175 + x^174 + x^171 + x^169 + x^164 + x^162 + x^161 + x^160 + x^155 + x^153 + x^149 + x^143 + x^142 + x^139 + x^138 + x^135 + x^134 + x^133 + x^132 + x^130 + x^128 + x^127 + x^126 + x^124 + x^123 + x^120 + x^118 + x^117 + x^115 + x^114 + x^113 + x^112 + x^111 + x^109 + x^108 + x^107 + x^104 + x^103 + x^101 + x^98 + x^95 + x^93 + x^92 + x^89 + x^88 + x^86 + x^82 + x^80 + x^76 + x^75 + x^69 + x^67 + x^65 + x^64 + x^60 + x^58 + x^57 + x^55 + x^53 + x^50 + x^49 + x^47 + x^46 + x^45 + x^44 + x^43 + x^42 + x^39 + x^37 + x^36 + x^35 + x^34 + x^32 + x^24 + x^22 + x^20 + 1
+
+33-20-8	359	x^928 + x^898 + x^874 + x^870 + x^845 + x^840 + x^824 + x^808 + x^794 + x^790 + x^787 + x^786 + x^780 + x^778 + x^764 + x^762 + x^761 + x^760 + x^756 + x^752 + x^741 + x^737 + x^736 + x^734 + x^731 + x^729 + x^728 + x^726 + x^720 + x^716 + x^712 + x^710 + x^707 + x^706 + x^703 + x^700 + x^697 + x^696 + x^688 + x^686 + x^683 + x^682 + x^681 + x^675 + x^671 + x^669 + x^667 + x^666 + x^660 + x^658 + x^657 + x^654 + x^653 + x^652 + x^649 + x^647 + x^646 + x^640 + x^639 + x^637 + x^636 + x^634 + x^629 + x^628 + x^627 + x^625 + x^624 + x^618 + x^613 + x^609 + x^608 + x^607 + x^600 + x^598 + x^597 + x^596 + x^595 + x^594 + x^593 + x^592 + x^591 + x^589 + x^587 + x^586 + x^585 + x^583 + x^582 + x^581 + x^580 + x^579 + x^577 + x^570 + x^567 + x^562 + x^554 + x^553 + x^550 + x^549 + x^548 + x^547 + x^546 + x^545 + x^544 + x^542 + x^539 + x^537 + x^535 + x^533 + x^531 + x^530 + x^524 + x^523 + x^521 + x^520 + x^517 + x^516 + x^512 + x^511 + x^504 + x^503 + x^502 + x^501 + x^497 + x^494 + x^492 + x^490 + x^489 + x^486 + x^480 + x^478 + x^477 + x^476 + x^475 + x^472 + x^467 + x^465 + x^463 + x^462 + x^461 + x^460 + x^459 + x^458 + x^456 + x^452 + x^449 + x^447 + x^446 + x^442 + x^440 + x^439 + x^438 + x^437 + x^436 + x^435 + x^434 + x^433 + x^432 + x^431 + x^430 + x^429 + x^426 + x^425 + x^423 + x^422 + x^421 + x^420 + x^415 + x^414 + x^413 + x^412 + x^411 + x^410 + x^408 + x^404 + x^402 + x^400 + x^399 + x^398 + x^395 + x^394 + x^392 + x^390 + x^387 + x^386 + x^385 + x^383 + x^379 + x^377 + x^376 + x^374 + x^373 + x^372 + x^371 + x^368 + x^366 + x^365 + x^362 + x^361 + x^360 + x^359 + x^358 + x^350 + x^347 + x^342 + x^341 + x^338 + x^337 + x^335 + x^331 + x^330 + x^326 + x^325 + x^322 + x^321 + x^320 + x^319 + x^318 + x^317 + x^312 + x^311 + x^308 + x^307 + x^305 + x^303 + x^301 + x^298 + x^295 + x^292 + x^289 + x^286 + x^282 + x^280 + x^277 + x^273 + x^271 + x^270 + x^265 + x^263 + x^262 + x^261 + x^260 + x^257 + x^253 + x^252 + x^251 + x^249 + x^248 + x^247 + x^246 + x^245 + x^243 + x^240 + x^239 + x^236 + x^234 + x^230 + x^228 + x^226 + x^225 + x^224 + x^222 + x^220 + x^219 + x^218 + x^215 + x^214 + x^213 + x^210 + x^205 + x^203 + x^201 + x^195 + x^194 + x^192 + x^191 + x^187 + x^185 + x^184 + x^183 + x^181 + x^178 + x^176 + x^174 + x^173 + x^172 + x^171 + x^170 + x^168 + x^165 + x^164 + x^163 + x^160 + x^157 + x^155 + x^154 + x^153 + x^152 + x^151 + x^150 + x^149 + x^148 + x^139 + x^138 + x^135 + x^134 + x^132 + x^131 + x^129 + x^128 + x^127 + x^126 + x^125 + x^122 + x^121 + x^119 + x^118 + x^115 + x^114 + x^111 + x^110 + x^106 + x^103 + x^101 + x^99 + x^98 + x^95 + x^91 + x^90 + x^89 + x^83 + x^78 + x^77 + x^75 + x^74 + x^70 + x^65 + x^64 + x^61 + x^56 + x^55 + x^52 + x^51 + x^49 + x^46 + x^41 + x^38 + x^36 + x^35 + x^34 + x^32 + x^29 + x^28 + x^27 + x^23 + x^16 + x^12 + x^8 + x^4 + 1
+
+6-42-43	359	x^928 + x^898 + x^877 + x^870 + x^847 + x^846 + x^844 + x^822 + x^808 + x^799 + x^794 + x^793 + x^790 + x^786 + x^778 + x^775 + x^774 + x^772 + x^771 + x^769 + x^766 + x^764 + x^750 + x^749 + x^748 + x^747 + x^744 + x^743 + x^742 + x^739 + x^736 + x^724 + x^721 + x^718 + x^715 + x^712 + x^710 + x^706 + x^702 + x^699 + x^695 + x^693 + x^692 + x^689 + x^687 + x^685 + x^684 + x^683 + x^682 + x^679 + x^674 + x^671 + x^670 + x^668 + x^667 + x^664 + x^662 + x^653 + x^652 + x^650 + x^649 + x^645 + x^644 + x^642 + x^639 + x^638 + x^637 + x^634 + x^633 + x^630 + x^624 + x^622 + x^619 + x^618 + x^616 + x^614 + x^613 + x^611 + x^610 + x^609 + x^608 + x^603 + x^601 + x^598 + x^595 + x^592 + x^589 + x^587 + x^586 + x^585 + x^584 + x^583 + x^582 + x^578 + x^574 + x^572 + x^568 + x^567 + x^565 + x^562 + x^561 + x^559 + x^558 + x^557 + x^555 + x^554 + x^550 + x^549 + x^547 + x^545 + x^541 + x^534 + x^528 + x^527 + x^523 + x^520 + x^518 + x^515 + x^510 + x^503 + x^502 + x^501 + x^500 + x^499 + x^498 + x^497 + x^496 + x^495 + x^494 + x^492 + x^489 + x^486 + x^483 + x^482 + x^479 + x^476 + x^475 + x^473 + x^472 + x^468 + x^467 + x^465 + x^464 + x^463 + x^461 + x^459 + x^458 + x^455 + x^452 + x^451 + x^450 + x^449 + x^448 + x^446 + x^445 + x^444 + x^443 + x^441 + x^440 + x^437 + x^434 + x^431 + x^430 + x^429 + x^425 + x^423 + x^422 + x^421 + x^419 + x^418 + x^417 + x^411 + x^408 + x^406 + x^405 + x^403 + x^401 + x^398 + x^397 + x^396 + x^393 + x^390 + x^382 + x^378 + x^376 + x^373 + x^372 + x^370 + x^369 + x^366 + x^361 + x^359 + x^358 + x^356 + x^354 + x^352 + x^351 + x^350 + x^349 + x^348 + x^347 + x^344 + x^340 + x^339 + x^336 + x^335 + x^333 + x^332 + x^329 + x^325 + x^324 + x^322 + x^321 + x^317 + x^316 + x^311 + x^310 + x^309 + x^303 + x^302 + x^301 + x^299 + x^298 + x^295 + x^294 + x^290 + x^289 + x^288 + x^287 + x^283 + x^282 + x^280 + x^279 + x^278 + x^277 + x^272 + x^271 + x^270 + x^268 + x^263 + x^261 + x^260 + x^259 + x^257 + x^256 + x^254 + x^250 + x^248 + x^247 + x^245 + x^244 + x^243 + x^241 + x^239 + x^238 + x^237 + x^235 + x^231 + x^230 + x^229 + x^228 + x^226 + x^225 + x^224 + x^221 + x^219 + x^217 + x^214 + x^210 + x^209 + x^208 + x^205 + x^204 + x^202 + x^199 + x^196 + x^191 + x^190 + x^189 + x^186 + x^184 + x^183 + x^180 + x^179 + x^178 + x^177 + x^175 + x^174 + x^170 + x^168 + x^167 + x^166 + x^165 + x^164 + x^162 + x^161 + x^160 + x^159 + x^157 + x^154 + x^153 + x^151 + x^143 + x^137 + x^135 + x^134 + x^129 + x^127 + x^126 + x^122 + x^121 + x^119 + x^118 + x^113 + x^111 + x^106 + x^104 + x^101 + x^100 + x^99 + x^98 + x^96 + x^92 + x^91 + x^90 + x^83 + x^82 + x^81 + x^79 + x^75 + x^74 + x^72 + x^71 + x^68 + x^64 + x^63 + x^60 + x^57 + x^56 + x^54 + x^52 + x^51 + x^49 + x^48 + x^46 + x^45 + x^43 + x^42 + x^39 + x^38 + x^37 + x^36 + x^32 + x^28 + x^26 + x^24 + x^16 + x^14 + 1
+
+33-22-4	361	x^928 + x^898 + x^870 + x^832 + x^822 + x^812 + x^808 + x^805 + x^802 + x^792 + x^784 + x^778 + x^775 + x^774 + x^762 + x^757 + x^756 + x^754 + x^746 + x^744 + x^740 + x^738 + x^736 + x^732 + x^728 + x^726 + x^720 + x^716 + x^711 + x^701 + x^697 + x^692 + x^684 + x^682 + x^680 + x^678 + x^673 + x^672 + x^671 + x^670 + x^658 + x^655 + x^653 + x^652 + x^651 + x^644 + x^637 + x^636 + x^630 + x^626 + x^622 + x^615 + x^613 + x^612 + x^611 + x^610 + x^608 + x^607 + x^606 + x^600 + x^599 + x^594 + x^593 + x^592 + x^590 + x^589 + x^588 + x^587 + x^586 + x^585 + x^583 + x^580 + x^578 + x^577 + x^574 + x^569 + x^567 + x^564 + x^562 + x^561 + x^559 + x^554 + x^553 + x^552 + x^549 + x^548 + x^544 + x^543 + x^538 + x^537 + x^536 + x^535 + x^533 + x^530 + x^525 + x^524 + x^523 + x^522 + x^521 + x^519 + x^517 + x^516 + x^515 + x^514 + x^511 + x^507 + x^506 + x^500 + x^499 + x^498 + x^496 + x^494 + x^487 + x^486 + x^485 + x^483 + x^480 + x^473 + x^468 + x^466 + x^465 + x^464 + x^463 + x^461 + x^460 + x^454 + x^452 + x^448 + x^447 + x^445 + x^441 + x^440 + x^439 + x^438 + x^436 + x^435 + x^434 + x^433 + x^429 + x^427 + x^425 + x^423 + x^421 + x^420 + x^418 + x^416 + x^415 + x^413 + x^411 + x^410 + x^409 + x^408 + x^404 + x^402 + x^401 + x^399 + x^397 + x^396 + x^393 + x^391 + x^390 + x^388 + x^387 + x^386 + x^383 + x^381 + x^380 + x^379 + x^376 + x^375 + x^374 + x^371 + x^370 + x^369 + x^368 + x^366 + x^364 + x^363 + x^361 + x^359 + x^356 + x^355 + x^354 + x^353 + x^350 + x^349 + x^344 + x^341 + x^338 + x^337 + x^336 + x^335 + x^332 + x^330 + x^329 + x^328 + x^327 + x^323 + x^322 + x^319 + x^318 + x^315 + x^314 + x^313 + x^309 + x^308 + x^307 + x^306 + x^304 + x^303 + x^301 + x^300 + x^298 + x^296 + x^295 + x^294 + x^292 + x^290 + x^289 + x^288 + x^286 + x^284 + x^282 + x^280 + x^279 + x^278 + x^275 + x^273 + x^271 + x^268 + x^266 + x^262 + x^261 + x^259 + x^258 + x^256 + x^255 + x^254 + x^253 + x^250 + x^245 + x^241 + x^240 + x^239 + x^237 + x^235 + x^234 + x^232 + x^231 + x^229 + x^226 + x^225 + x^221 + x^220 + x^218 + x^217 + x^215 + x^213 + x^211 + x^209 + x^206 + x^205 + x^201 + x^200 + x^196 + x^195 + x^192 + x^189 + x^188 + x^187 + x^186 + x^184 + x^183 + x^181 + x^180 + x^178 + x^177 + x^176 + x^175 + x^174 + x^172 + x^171 + x^169 + x^166 + x^165 + x^162 + x^160 + x^157 + x^154 + x^152 + x^150 + x^149 + x^145 + x^141 + x^138 + x^137 + x^133 + x^131 + x^129 + x^127 + x^125 + x^124 + x^123 + x^120 + x^118 + x^117 + x^115 + x^114 + x^112 + x^109 + x^108 + x^105 + x^102 + x^100 + x^99 + x^97 + x^96 + x^91 + x^90 + x^88 + x^87 + x^86 + x^85 + x^82 + x^80 + x^79 + x^77 + x^75 + x^74 + x^70 + x^66 + x^65 + x^63 + x^62 + x^61 + x^60 + x^59 + x^54 + x^52 + x^50 + x^49 + x^46 + x^42 + x^41 + x^40 + x^39 + x^38 + x^37 + x^36 + x^35 + x^33 + x^31 + x^27 + x^26 + x^22 + x^21 + x^19 + x^16 + x^14 + x^12 + 1
+
+46-48-7	361	x^928 + x^898 + x^870 + x^862 + x^848 + x^837 + x^829 + x^820 + x^815 + x^808 + x^807 + x^806 + x^802 + x^799 + x^798 + x^795 + x^790 + x^788 + x^787 + x^785 + x^776 + x^769 + x^765 + x^762 + x^760 + x^756 + x^755 + x^740 + x^739 + x^737 + x^732 + x^730 + x^727 + x^725 + x^717 + x^715 + x^714 + x^710 + x^709 + x^706 + x^704 + x^695 + x^688 + x^687 + x^686 + x^684 + x^682 + x^680 + x^679 + x^678 + x^676 + x^675 + x^667 + x^664 + x^661 + x^658 + x^657 + x^655 + x^654 + x^653 + x^652 + x^650 + x^649 + x^647 + x^646 + x^644 + x^643 + x^638 + x^637 + x^636 + x^634 + x^633 + x^627 + x^624 + x^623 + x^622 + x^620 + x^619 + x^618 + x^615 + x^612 + x^611 + x^606 + x^604 + x^601 + x^594 + x^591 + x^590 + x^589 + x^588 + x^587 + x^585 + x^583 + x^580 + x^575 + x^574 + x^572 + x^571 + x^569 + x^568 + x^567 + x^564 + x^563 + x^558 + x^557 + x^556 + x^552 + x^551 + x^546 + x^544 + x^542 + x^541 + x^535 + x^534 + x^532 + x^531 + x^530 + x^529 + x^528 + x^526 + x^525 + x^523 + x^521 + x^519 + x^518 + x^516 + x^514 + x^513 + x^506 + x^505 + x^504 + x^499 + x^498 + x^497 + x^496 + x^495 + x^493 + x^491 + x^490 + x^488 + x^487 + x^486 + x^485 + x^484 + x^481 + x^480 + x^477 + x^476 + x^473 + x^472 + x^471 + x^466 + x^465 + x^463 + x^462 + x^461 + x^460 + x^459 + x^455 + x^451 + x^449 + x^448 + x^447 + x^446 + x^444 + x^443 + x^441 + x^440 + x^439 + x^437 + x^431 + x^429 + x^428 + x^426 + x^424 + x^421 + x^420 + x^419 + x^418 + x^417 + x^416 + x^414 + x^411 + x^410 + x^408 + x^407 + x^406 + x^405 + x^403 + x^402 + x^401 + x^400 + x^397 + x^394 + x^392 + x^390 + x^388 + x^382 + x^381 + x^379 + x^378 + x^377 + x^376 + x^374 + x^367 + x^364 + x^363 + x^360 + x^357 + x^356 + x^354 + x^353 + x^352 + x^351 + x^350 + x^348 + x^343 + x^342 + x^341 + x^337 + x^334 + x^333 + x^330 + x^326 + x^316 + x^313 + x^309 + x^306 + x^305 + x^300 + x^299 + x^296 + x^294 + x^293 + x^292 + x^287 + x^285 + x^282 + x^281 + x^278 + x^276 + x^275 + x^271 + x^269 + x^267 + x^263 + x^262 + x^261 + x^260 + x^257 + x^256 + x^255 + x^253 + x^249 + x^248 + x^244 + x^243 + x^242 + x^240 + x^239 + x^238 + x^236 + x^235 + x^234 + x^231 + x^226 + x^224 + x^221 + x^217 + x^216 + x^214 + x^211 + x^210 + x^209 + x^208 + x^206 + x^205 + x^202 + x^200 + x^197 + x^196 + x^195 + x^190 + x^186 + x^184 + x^183 + x^181 + x^176 + x^172 + x^171 + x^167 + x^166 + x^165 + x^164 + x^159 + x^157 + x^154 + x^153 + x^151 + x^150 + x^146 + x^145 + x^144 + x^142 + x^141 + x^140 + x^139 + x^137 + x^136 + x^134 + x^131 + x^130 + x^129 + x^125 + x^124 + x^123 + x^120 + x^118 + x^117 + x^111 + x^110 + x^108 + x^107 + x^106 + x^105 + x^98 + x^96 + x^95 + x^94 + x^92 + x^88 + x^83 + x^81 + x^78 + x^76 + x^72 + x^71 + x^67 + x^66 + x^65 + x^63 + x^60 + x^58 + x^57 + x^56 + x^52 + x^51 + x^49 + x^48 + x^46 + x^44 + x^40 + x^38 + x^34 + x^33 + x^32 + x^31 + x^30 + x^28 + x^20 + 1
+
+49-44-52	361	x^928 + x^898 + x^870 + x^864 + x^842 + x^837 + x^834 + x^812 + x^810 + x^808 + x^804 + x^788 + x^786 + x^783 + x^782 + x^780 + x^778 + x^774 + x^758 + x^756 + x^753 + x^752 + x^734 + x^732 + x^729 + x^727 + x^724 + x^723 + x^722 + x^717 + x^704 + x^702 + x^699 + x^696 + x^693 + x^692 + x^690 + x^680 + x^678 + x^672 + x^667 + x^665 + x^663 + x^662 + x^661 + x^660 + x^650 + x^646 + x^637 + x^636 + x^633 + x^631 + x^626 + x^621 + x^618 + x^616 + x^614 + x^612 + x^611 + x^610 + x^609 + x^605 + x^603 + x^602 + x^601 + x^599 + x^597 + x^596 + x^594 + x^589 + x^588 + x^586 + x^576 + x^575 + x^573 + x^572 + x^571 + x^569 + x^568 + x^565 + x^562 + x^561 + x^560 + x^558 + x^557 + x^555 + x^554 + x^551 + x^549 + x^548 + x^543 + x^542 + x^539 + x^536 + x^532 + x^529 + x^528 + x^527 + x^526 + x^525 + x^518 + x^517 + x^514 + x^513 + x^512 + x^511 + x^509 + x^508 + x^506 + x^505 + x^499 + x^496 + x^495 + x^493 + x^492 + x^491 + x^489 + x^486 + x^483 + x^482 + x^479 + x^477 + x^476 + x^474 + x^468 + x^467 + x^462 + x^461 + x^457 + x^456 + x^454 + x^453 + x^452 + x^451 + x^449 + x^444 + x^442 + x^441 + x^439 + x^438 + x^437 + x^436 + x^432 + x^431 + x^429 + x^428 + x^427 + x^425 + x^424 + x^423 + x^422 + x^420 + x^419 + x^418 + x^416 + x^414 + x^413 + x^409 + x^407 + x^406 + x^404 + x^403 + x^402 + x^401 + x^395 + x^394 + x^393 + x^392 + x^390 + x^389 + x^387 + x^386 + x^384 + x^380 + x^378 + x^377 + x^376 + x^372 + x^371 + x^370 + x^369 + x^365 + x^363 + x^362 + x^361 + x^358 + x^357 + x^356 + x^355 + x^352 + x^351 + x^350 + x^347 + x^346 + x^344 + x^343 + x^342 + x^340 + x^339 + x^338 + x^332 + x^331 + x^328 + x^326 + x^325 + x^323 + x^322 + x^321 + x^319 + x^317 + x^316 + x^314 + x^313 + x^309 + x^305 + x^303 + x^301 + x^300 + x^299 + x^298 + x^297 + x^294 + x^292 + x^290 + x^285 + x^284 + x^282 + x^280 + x^279 + x^278 + x^276 + x^272 + x^267 + x^266 + x^265 + x^264 + x^263 + x^262 + x^259 + x^256 + x^254 + x^253 + x^251 + x^250 + x^249 + x^248 + x^247 + x^245 + x^243 + x^241 + x^240 + x^238 + x^234 + x^231 + x^229 + x^228 + x^227 + x^224 + x^222 + x^221 + x^215 + x^214 + x^211 + x^210 + x^209 + x^207 + x^206 + x^205 + x^204 + x^197 + x^196 + x^194 + x^192 + x^191 + x^189 + x^188 + x^187 + x^186 + x^182 + x^180 + x^178 + x^175 + x^172 + x^168 + x^167 + x^166 + x^163 + x^162 + x^158 + x^154 + x^153 + x^150 + x^148 + x^146 + x^145 + x^144 + x^138 + x^136 + x^132 + x^131 + x^130 + x^129 + x^124 + x^122 + x^120 + x^116 + x^115 + x^113 + x^112 + x^109 + x^108 + x^107 + x^106 + x^103 + x^102 + x^101 + x^99 + x^98 + x^97 + x^96 + x^94 + x^92 + x^90 + x^86 + x^85 + x^84 + x^83 + x^82 + x^80 + x^79 + x^77 + x^76 + x^65 + x^60 + x^59 + x^57 + x^54 + x^52 + x^47 + x^45 + x^44 + x^42 + x^38 + x^37 + x^34 + x^33 + x^31 + x^29 + x^26 + x^25 + x^24 + x^22 + x^21 + x^19 + x^18 + x^17 + x^15 + x^14 + x^12 + x^10 + 1
+
+34-42-39	365	x^928 + x^898 + x^870 + x^860 + x^850 + x^840 + x^831 + x^830 + x^811 + x^808 + x^801 + x^800 + x^792 + x^790 + x^780 + x^778 + x^771 + x^770 + x^762 + x^753 + x^744 + x^742 + x^740 + x^734 + x^720 + x^715 + x^712 + x^710 + x^703 + x^702 + x^694 + x^693 + x^691 + x^688 + x^685 + x^682 + x^680 + x^676 + x^674 + x^672 + x^664 + x^663 + x^662 + x^660 + x^658 + x^657 + x^656 + x^653 + x^652 + x^650 + x^647 + x^646 + x^645 + x^643 + x^637 + x^634 + x^628 + x^627 + x^623 + x^622 + x^618 + x^617 + x^615 + x^614 + x^608 + x^607 + x^604 + x^603 + x^600 + x^597 + x^593 + x^592 + x^589 + x^588 + x^587 + x^586 + x^585 + x^584 + x^579 + x^578 + x^577 + x^574 + x^570 + x^567 + x^565 + x^563 + x^562 + x^560 + x^558 + x^555 + x^550 + x^549 + x^547 + x^544 + x^542 + x^541 + x^536 + x^533 + x^532 + x^529 + x^527 + x^526 + x^521 + x^520 + x^518 + x^517 + x^516 + x^514 + x^510 + x^509 + x^508 + x^506 + x^504 + x^503 + x^502 + x^501 + x^497 + x^496 + x^489 + x^488 + x^487 + x^486 + x^484 + x^481 + x^480 + x^476 + x^475 + x^473 + x^472 + x^471 + x^470 + x^467 + x^466 + x^463 + x^462 + x^459 + x^458 + x^457 + x^456 + x^453 + x^451 + x^450 + x^446 + x^445 + x^444 + x^443 + x^442 + x^439 + x^438 + x^437 + x^436 + x^433 + x^432 + x^430 + x^428 + x^427 + x^425 + x^421 + x^420 + x^413 + x^412 + x^411 + x^408 + x^406 + x^405 + x^404 + x^403 + x^401 + x^399 + x^398 + x^396 + x^391 + x^388 + x^385 + x^381 + x^378 + x^376 + x^375 + x^374 + x^372 + x^370 + x^368 + x^364 + x^363 + x^360 + x^359 + x^357 + x^354 + x^353 + x^350 + x^349 + x^348 + x^347 + x^346 + x^344 + x^343 + x^342 + x^340 + x^339 + x^337 + x^335 + x^334 + x^333 + x^331 + x^330 + x^329 + x^327 + x^326 + x^325 + x^324 + x^323 + x^321 + x^320 + x^317 + x^312 + x^310 + x^309 + x^303 + x^300 + x^298 + x^296 + x^295 + x^292 + x^291 + x^290 + x^288 + x^287 + x^286 + x^285 + x^284 + x^282 + x^278 + x^277 + x^275 + x^274 + x^273 + x^267 + x^266 + x^265 + x^264 + x^263 + x^262 + x^261 + x^260 + x^257 + x^254 + x^250 + x^249 + x^244 + x^243 + x^242 + x^239 + x^238 + x^237 + x^236 + x^231 + x^230 + x^229 + x^228 + x^226 + x^224 + x^223 + x^222 + x^221 + x^220 + x^217 + x^214 + x^213 + x^212 + x^211 + x^208 + x^207 + x^206 + x^205 + x^204 + x^202 + x^198 + x^197 + x^195 + x^194 + x^192 + x^189 + x^187 + x^186 + x^185 + x^181 + x^180 + x^179 + x^178 + x^175 + x^173 + x^170 + x^168 + x^167 + x^166 + x^165 + x^164 + x^157 + x^155 + x^154 + x^150 + x^149 + x^148 + x^144 + x^143 + x^140 + x^138 + x^137 + x^135 + x^134 + x^132 + x^126 + x^124 + x^123 + x^120 + x^119 + x^117 + x^115 + x^113 + x^105 + x^104 + x^102 + x^100 + x^97 + x^96 + x^94 + x^91 + x^88 + x^87 + x^85 + x^84 + x^83 + x^82 + x^80 + x^79 + x^77 + x^76 + x^69 + x^68 + x^64 + x^61 + x^60 + x^55 + x^53 + x^51 + x^50 + x^48 + x^45 + x^44 + x^43 + x^40 + x^39 + x^38 + x^37 + x^36 + x^34 + x^33 + x^30 + x^22 + x^20 + x^19 + x^18 + x^16 + x^14 + 1
+
+34-2-25	367	x^928 + x^898 + x^870 + x^868 + x^866 + x^850 + x^838 + x^832 + x^822 + x^820 + x^808 + x^804 + x^802 + x^797 + x^792 + x^790 + x^788 + x^786 + x^778 + x^770 + x^768 + x^767 + x^760 + x^754 + x^748 + x^747 + x^746 + x^744 + x^738 + x^736 + x^735 + x^728 + x^726 + x^720 + x^717 + x^712 + x^708 + x^696 + x^694 + x^692 + x^690 + x^688 + x^687 + x^685 + x^684 + x^678 + x^677 + x^675 + x^673 + x^669 + x^667 + x^662 + x^658 + x^657 + x^654 + x^652 + x^647 + x^643 + x^642 + x^640 + x^639 + x^638 + x^637 + x^634 + x^633 + x^624 + x^613 + x^612 + x^611 + x^610 + x^609 + x^607 + x^606 + x^603 + x^600 + x^598 + x^597 + x^593 + x^591 + x^590 + x^588 + x^587 + x^586 + x^584 + x^583 + x^582 + x^581 + x^577 + x^576 + x^574 + x^571 + x^570 + x^568 + x^567 + x^564 + x^563 + x^562 + x^560 + x^558 + x^557 + x^554 + x^553 + x^551 + x^549 + x^548 + x^547 + x^546 + x^545 + x^539 + x^538 + x^535 + x^533 + x^531 + x^530 + x^529 + x^527 + x^525 + x^524 + x^523 + x^522 + x^520 + x^517 + x^515 + x^514 + x^511 + x^510 + x^507 + x^506 + x^504 + x^503 + x^500 + x^499 + x^498 + x^496 + x^493 + x^491 + x^490 + x^489 + x^487 + x^485 + x^483 + x^482 + x^480 + x^478 + x^477 + x^474 + x^473 + x^471 + x^469 + x^468 + x^465 + x^464 + x^460 + x^459 + x^457 + x^455 + x^451 + x^450 + x^449 + x^447 + x^446 + x^442 + x^441 + x^438 + x^430 + x^428 + x^427 + x^426 + x^425 + x^421 + x^420 + x^417 + x^416 + x^415 + x^414 + x^411 + x^410 + x^409 + x^406 + x^405 + x^404 + x^402 + x^396 + x^394 + x^393 + x^390 + x^389 + x^388 + x^386 + x^384 + x^382 + x^381 + x^380 + x^379 + x^378 + x^377 + x^376 + x^374 + x^373 + x^372 + x^371 + x^369 + x^366 + x^365 + x^364 + x^363 + x^356 + x^354 + x^352 + x^351 + x^344 + x^342 + x^338 + x^336 + x^335 + x^334 + x^327 + x^323 + x^321 + x^319 + x^318 + x^317 + x^312 + x^308 + x^305 + x^303 + x^302 + x^301 + x^299 + x^298 + x^297 + x^289 + x^286 + x^285 + x^283 + x^277 + x^276 + x^275 + x^272 + x^271 + x^269 + x^268 + x^267 + x^266 + x^263 + x^258 + x^255 + x^254 + x^252 + x^251 + x^247 + x^246 + x^235 + x^233 + x^232 + x^229 + x^226 + x^225 + x^223 + x^220 + x^219 + x^216 + x^212 + x^210 + x^209 + x^208 + x^206 + x^205 + x^204 + x^202 + x^201 + x^200 + x^198 + x^196 + x^193 + x^190 + x^187 + x^185 + x^184 + x^182 + x^180 + x^179 + x^174 + x^173 + x^172 + x^171 + x^169 + x^167 + x^166 + x^165 + x^164 + x^159 + x^158 + x^156 + x^155 + x^154 + x^151 + x^150 + x^149 + x^148 + x^147 + x^146 + x^144 + x^143 + x^141 + x^137 + x^133 + x^132 + x^131 + x^130 + x^129 + x^126 + x^124 + x^123 + x^122 + x^118 + x^112 + x^111 + x^109 + x^108 + x^107 + x^105 + x^104 + x^103 + x^102 + x^99 + x^96 + x^93 + x^92 + x^91 + x^89 + x^86 + x^84 + x^83 + x^82 + x^81 + x^79 + x^77 + x^76 + x^75 + x^71 + x^70 + x^67 + x^65 + x^63 + x^53 + x^49 + x^44 + x^40 + x^38 + x^37 + x^36 + x^35 + x^34 + x^32 + x^31 + x^28 + x^26 + x^25 + x^24 + x^22 + x^18 + x^16 + x^10 + x^8 + x^4 + 1
+
+34-39-1	367	x^928 + x^898 + x^894 + x^874 + x^870 + x^864 + x^855 + x^844 + x^840 + x^835 + x^834 + x^825 + x^820 + x^815 + x^814 + x^808 + x^805 + x^804 + x^801 + x^800 + x^796 + x^790 + x^785 + x^784 + x^778 + x^776 + x^770 + x^766 + x^761 + x^760 + x^756 + x^754 + x^751 + x^750 + x^746 + x^741 + x^740 + x^735 + x^732 + x^731 + x^730 + x^727 + x^724 + x^722 + x^721 + x^720 + x^716 + x^715 + x^712 + x^706 + x^705 + x^700 + x^697 + x^694 + x^692 + x^688 + x^686 + x^685 + x^682 + x^677 + x^676 + x^672 + x^667 + x^664 + x^657 + x^655 + x^653 + x^651 + x^650 + x^648 + x^642 + x^638 + x^632 + x^631 + x^630 + x^628 + x^627 + x^625 + x^622 + x^620 + x^618 + x^617 + x^616 + x^612 + x^611 + x^602 + x^600 + x^598 + x^597 + x^591 + x^588 + x^586 + x^582 + x^581 + x^579 + x^578 + x^577 + x^574 + x^573 + x^572 + x^568 + x^566 + x^564 + x^560 + x^552 + x^541 + x^538 + x^537 + x^535 + x^534 + x^532 + x^531 + x^529 + x^528 + x^523 + x^522 + x^521 + x^519 + x^518 + x^516 + x^515 + x^510 + x^509 + x^508 + x^506 + x^504 + x^500 + x^499 + x^498 + x^497 + x^495 + x^492 + x^490 + x^489 + x^488 + x^484 + x^482 + x^477 + x^475 + x^474 + x^472 + x^471 + x^470 + x^469 + x^467 + x^466 + x^465 + x^464 + x^462 + x^461 + x^460 + x^457 + x^455 + x^454 + x^453 + x^448 + x^447 + x^446 + x^444 + x^443 + x^442 + x^441 + x^440 + x^437 + x^431 + x^430 + x^429 + x^426 + x^424 + x^423 + x^421 + x^419 + x^418 + x^417 + x^416 + x^412 + x^411 + x^409 + x^408 + x^407 + x^406 + x^405 + x^403 + x^402 + x^397 + x^395 + x^394 + x^389 + x^388 + x^384 + x^383 + x^382 + x^380 + x^379 + x^377 + x^376 + x^375 + x^374 + x^373 + x^372 + x^370 + x^369 + x^368 + x^367 + x^366 + x^361 + x^360 + x^359 + x^357 + x^355 + x^353 + x^350 + x^349 + x^344 + x^342 + x^341 + x^340 + x^338 + x^337 + x^336 + x^335 + x^334 + x^333 + x^332 + x^331 + x^329 + x^328 + x^326 + x^321 + x^320 + x^318 + x^317 + x^316 + x^313 + x^311 + x^310 + x^309 + x^306 + x^303 + x^302 + x^300 + x^299 + x^296 + x^295 + x^294 + x^293 + x^292 + x^291 + x^288 + x^287 + x^286 + x^284 + x^279 + x^276 + x^274 + x^270 + x^269 + x^268 + x^265 + x^264 + x^262 + x^259 + x^257 + x^256 + x^255 + x^251 + x^248 + x^247 + x^245 + x^244 + x^243 + x^240 + x^237 + x^234 + x^232 + x^230 + x^227 + x^224 + x^223 + x^219 + x^214 + x^212 + x^206 + x^204 + x^201 + x^198 + x^197 + x^194 + x^192 + x^190 + x^189 + x^186 + x^185 + x^182 + x^179 + x^178 + x^174 + x^172 + x^171 + x^168 + x^166 + x^163 + x^162 + x^161 + x^159 + x^158 + x^154 + x^153 + x^152 + x^151 + x^149 + x^148 + x^146 + x^143 + x^142 + x^140 + x^138 + x^137 + x^135 + x^134 + x^133 + x^132 + x^131 + x^128 + x^126 + x^125 + x^124 + x^123 + x^119 + x^118 + x^116 + x^115 + x^109 + x^108 + x^106 + x^105 + x^103 + x^100 + x^98 + x^91 + x^89 + x^86 + x^84 + x^83 + x^81 + x^79 + x^78 + x^70 + x^69 + x^67 + x^66 + x^65 + x^59 + x^58 + x^56 + x^48 + x^45 + x^43 + x^42 + x^38 + x^37 + x^34 + x^29 + x^26 + x^21 + x^10 + 1
+
+8-38-53	367	x^928 + x^898 + x^870 + x^843 + x^838 + x^833 + x^830 + x^820 + x^816 + x^811 + x^808 + x^800 + x^786 + x^781 + x^778 + x^773 + x^768 + x^760 + x^756 + x^752 + x^750 + x^743 + x^742 + x^738 + x^733 + x^732 + x^730 + x^728 + x^726 + x^723 + x^720 + x^718 + x^711 + x^710 + x^708 + x^700 + x^699 + x^698 + x^696 + x^695 + x^693 + x^691 + x^690 + x^688 + x^686 + x^685 + x^683 + x^681 + x^672 + x^670 + x^667 + x^666 + x^665 + x^664 + x^663 + x^662 + x^661 + x^658 + x^657 + x^655 + x^654 + x^650 + x^648 + x^646 + x^645 + x^644 + x^642 + x^640 + x^639 + x^638 + x^636 + x^634 + x^626 + x^622 + x^620 + x^617 + x^615 + x^614 + x^613 + x^612 + x^606 + x^605 + x^603 + x^600 + x^597 + x^596 + x^592 + x^591 + x^590 + x^589 + x^588 + x^585 + x^584 + x^581 + x^578 + x^577 + x^576 + x^575 + x^574 + x^572 + x^569 + x^568 + x^564 + x^562 + x^561 + x^556 + x^554 + x^551 + x^549 + x^544 + x^543 + x^542 + x^540 + x^539 + x^538 + x^533 + x^532 + x^530 + x^529 + x^527 + x^526 + x^524 + x^521 + x^520 + x^517 + x^515 + x^514 + x^510 + x^507 + x^504 + x^503 + x^502 + x^501 + x^500 + x^499 + x^498 + x^497 + x^495 + x^493 + x^489 + x^487 + x^486 + x^483 + x^482 + x^480 + x^477 + x^474 + x^471 + x^469 + x^468 + x^463 + x^461 + x^459 + x^456 + x^453 + x^450 + x^447 + x^443 + x^442 + x^441 + x^439 + x^438 + x^437 + x^436 + x^435 + x^431 + x^424 + x^422 + x^415 + x^411 + x^410 + x^409 + x^407 + x^406 + x^405 + x^404 + x^401 + x^400 + x^396 + x^395 + x^392 + x^391 + x^389 + x^388 + x^385 + x^382 + x^381 + x^380 + x^379 + x^377 + x^374 + x^369 + x^368 + x^367 + x^366 + x^365 + x^364 + x^359 + x^357 + x^353 + x^351 + x^349 + x^345 + x^344 + x^342 + x^341 + x^340 + x^339 + x^337 + x^335 + x^334 + x^333 + x^331 + x^330 + x^329 + x^327 + x^326 + x^324 + x^323 + x^322 + x^320 + x^319 + x^318 + x^314 + x^313 + x^312 + x^311 + x^309 + x^307 + x^304 + x^303 + x^300 + x^298 + x^294 + x^288 + x^285 + x^284 + x^281 + x^280 + x^279 + x^277 + x^276 + x^275 + x^273 + x^271 + x^270 + x^269 + x^268 + x^266 + x^261 + x^254 + x^253 + x^251 + x^250 + x^249 + x^248 + x^247 + x^245 + x^244 + x^242 + x^240 + x^238 + x^236 + x^233 + x^231 + x^230 + x^227 + x^226 + x^224 + x^223 + x^222 + x^221 + x^220 + x^219 + x^218 + x^216 + x^215 + x^213 + x^212 + x^209 + x^208 + x^207 + x^202 + x^198 + x^195 + x^189 + x^186 + x^183 + x^182 + x^180 + x^179 + x^177 + x^175 + x^172 + x^170 + x^168 + x^167 + x^159 + x^158 + x^154 + x^153 + x^150 + x^149 + x^144 + x^141 + x^140 + x^138 + x^136 + x^135 + x^134 + x^133 + x^132 + x^130 + x^129 + x^126 + x^125 + x^124 + x^123 + x^122 + x^121 + x^117 + x^116 + x^114 + x^113 + x^112 + x^111 + x^110 + x^108 + x^106 + x^105 + x^102 + x^98 + x^97 + x^96 + x^95 + x^92 + x^91 + x^90 + x^87 + x^79 + x^77 + x^74 + x^73 + x^72 + x^69 + x^64 + x^61 + x^60 + x^59 + x^58 + x^57 + x^56 + x^55 + x^53 + x^50 + x^49 + x^47 + x^46 + x^44 + x^43 + x^36 + x^35 + x^30 + x^29 + x^22 + x^16 + 1
+
+40-6-51	369	x^928 + x^898 + x^870 + x^859 + x^840 + x^830 + x^819 + x^790 + x^780 + x^779 + x^771 + x^770 + x^768 + x^761 + x^760 + x^757 + x^752 + x^750 + x^748 + x^742 + x^741 + x^740 + x^739 + x^738 + x^732 + x^728 + x^727 + x^721 + x^719 + x^718 + x^717 + x^712 + x^709 + x^708 + x^702 + x^699 + x^692 + x^690 + x^687 + x^684 + x^678 + x^677 + x^673 + x^672 + x^671 + x^668 + x^666 + x^659 + x^658 + x^657 + x^655 + x^654 + x^653 + x^652 + x^651 + x^648 + x^647 + x^645 + x^644 + x^643 + x^637 + x^636 + x^634 + x^632 + x^631 + x^624 + x^622 + x^621 + x^620 + x^616 + x^614 + x^613 + x^612 + x^611 + x^609 + x^608 + x^607 + x^598 + x^596 + x^594 + x^593 + x^592 + x^591 + x^588 + x^585 + x^583 + x^579 + x^578 + x^576 + x^575 + x^574 + x^573 + x^572 + x^571 + x^570 + x^567 + x^566 + x^563 + x^562 + x^560 + x^557 + x^555 + x^554 + x^549 + x^547 + x^546 + x^544 + x^542 + x^538 + x^537 + x^535 + x^534 + x^533 + x^531 + x^529 + x^527 + x^526 + x^522 + x^520 + x^518 + x^517 + x^515 + x^514 + x^513 + x^511 + x^510 + x^509 + x^508 + x^505 + x^504 + x^500 + x^497 + x^496 + x^494 + x^492 + x^481 + x^477 + x^475 + x^473 + x^471 + x^470 + x^468 + x^467 + x^466 + x^465 + x^464 + x^463 + x^462 + x^460 + x^457 + x^456 + x^453 + x^451 + x^450 + x^449 + x^447 + x^446 + x^444 + x^443 + x^441 + x^436 + x^435 + x^434 + x^429 + x^428 + x^427 + x^423 + x^422 + x^421 + x^419 + x^418 + x^416 + x^414 + x^413 + x^412 + x^410 + x^408 + x^406 + x^405 + x^402 + x^401 + x^400 + x^399 + x^398 + x^396 + x^395 + x^394 + x^393 + x^391 + x^390 + x^388 + x^385 + x^384 + x^382 + x^381 + x^379 + x^378 + x^377 + x^376 + x^375 + x^374 + x^373 + x^372 + x^371 + x^370 + x^367 + x^366 + x^365 + x^363 + x^360 + x^358 + x^355 + x^354 + x^353 + x^352 + x^350 + x^347 + x^344 + x^342 + x^340 + x^339 + x^338 + x^335 + x^334 + x^331 + x^330 + x^328 + x^324 + x^323 + x^322 + x^321 + x^318 + x^316 + x^315 + x^313 + x^307 + x^306 + x^304 + x^303 + x^301 + x^300 + x^299 + x^298 + x^297 + x^290 + x^287 + x^285 + x^283 + x^282 + x^281 + x^280 + x^279 + x^278 + x^276 + x^275 + x^274 + x^270 + x^264 + x^263 + x^262 + x^261 + x^259 + x^258 + x^254 + x^253 + x^252 + x^244 + x^242 + x^241 + x^240 + x^239 + x^237 + x^236 + x^235 + x^230 + x^228 + x^224 + x^220 + x^217 + x^214 + x^210 + x^209 + x^208 + x^206 + x^203 + x^202 + x^201 + x^200 + x^199 + x^196 + x^195 + x^194 + x^192 + x^189 + x^188 + x^186 + x^185 + x^184 + x^181 + x^176 + x^175 + x^173 + x^172 + x^171 + x^170 + x^165 + x^163 + x^161 + x^159 + x^156 + x^154 + x^153 + x^144 + x^143 + x^137 + x^135 + x^134 + x^132 + x^130 + x^129 + x^126 + x^125 + x^122 + x^120 + x^118 + x^114 + x^113 + x^110 + x^109 + x^108 + x^107 + x^98 + x^97 + x^95 + x^92 + x^88 + x^87 + x^86 + x^85 + x^84 + x^83 + x^80 + x^76 + x^74 + x^71 + x^70 + x^69 + x^64 + x^63 + x^62 + x^61 + x^57 + x^53 + x^52 + x^50 + x^46 + x^40 + x^38 + x^37 + x^34 + x^33 + x^32 + x^31 + x^28 + x^25 + x^22 + x^18 + x^6 + 1
+
+48-40-25	371	x^928 + x^898 + x^878 + x^870 + x^851 + x^844 + x^832 + x^828 + x^818 + x^809 + x^808 + x^802 + x^790 + x^782 + x^779 + x^772 + x^755 + x^751 + x^749 + x^744 + x^742 + x^740 + x^738 + x^732 + x^731 + x^728 + x^725 + x^719 + x^718 + x^714 + x^713 + x^712 + x^708 + x^705 + x^695 + x^691 + x^690 + x^688 + x^687 + x^686 + x^684 + x^683 + x^679 + x^676 + x^674 + x^671 + x^668 + x^665 + x^663 + x^662 + x^661 + x^656 + x^655 + x^652 + x^650 + x^649 + x^648 + x^647 + x^646 + x^641 + x^640 + x^638 + x^636 + x^635 + x^633 + x^630 + x^627 + x^626 + x^625 + x^624 + x^621 + x^620 + x^619 + x^618 + x^617 + x^614 + x^613 + x^608 + x^607 + x^606 + x^605 + x^604 + x^603 + x^602 + x^599 + x^597 + x^596 + x^591 + x^589 + x^586 + x^585 + x^584 + x^582 + x^578 + x^576 + x^572 + x^569 + x^566 + x^564 + x^558 + x^555 + x^553 + x^550 + x^549 + x^548 + x^545 + x^543 + x^541 + x^540 + x^538 + x^537 + x^533 + x^530 + x^527 + x^524 + x^523 + x^521 + x^520 + x^519 + x^517 + x^516 + x^515 + x^513 + x^510 + x^504 + x^503 + x^501 + x^500 + x^498 + x^497 + x^496 + x^494 + x^492 + x^491 + x^488 + x^485 + x^482 + x^478 + x^476 + x^474 + x^473 + x^471 + x^469 + x^468 + x^464 + x^461 + x^460 + x^459 + x^454 + x^450 + x^449 + x^448 + x^444 + x^439 + x^438 + x^437 + x^436 + x^435 + x^433 + x^431 + x^428 + x^426 + x^424 + x^420 + x^417 + x^416 + x^413 + x^411 + x^408 + x^407 + x^406 + x^403 + x^400 + x^399 + x^398 + x^397 + x^396 + x^392 + x^390 + x^389 + x^388 + x^387 + x^386 + x^385 + x^381 + x^378 + x^374 + x^370 + x^369 + x^368 + x^367 + x^365 + x^364 + x^359 + x^356 + x^354 + x^350 + x^348 + x^346 + x^344 + x^343 + x^342 + x^340 + x^338 + x^337 + x^334 + x^332 + x^330 + x^329 + x^327 + x^322 + x^317 + x^316 + x^314 + x^311 + x^308 + x^307 + x^301 + x^300 + x^299 + x^296 + x^295 + x^292 + x^291 + x^290 + x^286 + x^284 + x^282 + x^279 + x^278 + x^276 + x^273 + x^270 + x^269 + x^265 + x^263 + x^259 + x^258 + x^257 + x^256 + x^255 + x^253 + x^251 + x^249 + x^247 + x^245 + x^244 + x^243 + x^242 + x^241 + x^240 + x^238 + x^236 + x^231 + x^230 + x^229 + x^228 + x^226 + x^223 + x^221 + x^220 + x^219 + x^218 + x^217 + x^215 + x^214 + x^212 + x^211 + x^210 + x^208 + x^207 + x^206 + x^205 + x^202 + x^200 + x^198 + x^193 + x^192 + x^191 + x^187 + x^186 + x^184 + x^182 + x^179 + x^173 + x^171 + x^169 + x^168 + x^164 + x^163 + x^162 + x^161 + x^157 + x^156 + x^155 + x^154 + x^153 + x^151 + x^149 + x^147 + x^146 + x^145 + x^143 + x^140 + x^137 + x^136 + x^133 + x^127 + x^122 + x^121 + x^119 + x^115 + x^114 + x^112 + x^111 + x^110 + x^108 + x^104 + x^103 + x^101 + x^98 + x^94 + x^88 + x^87 + x^85 + x^83 + x^81 + x^80 + x^79 + x^78 + x^77 + x^75 + x^74 + x^73 + x^70 + x^69 + x^68 + x^67 + x^65 + x^63 + x^62 + x^60 + x^59 + x^58 + x^57 + x^56 + x^54 + x^53 + x^52 + x^50 + x^49 + x^47 + x^46 + x^45 + x^41 + x^39 + x^36 + x^34 + x^33 + x^32 + x^31 + x^30 + x^29 + x^28 + x^26 + x^25 + x^21 + x^16 + x^14 + x^4 + 1
+
+19-22-10	373	x^928 + x^898 + x^870 + x^866 + x^842 + x^836 + x^834 + x^821 + x^808 + x^807 + x^806 + x^804 + x^802 + x^794 + x^792 + x^782 + x^778 + x^777 + x^776 + x^770 + x^766 + x^761 + x^757 + x^753 + x^748 + x^743 + x^739 + x^738 + x^736 + x^735 + x^734 + x^732 + x^728 + x^725 + x^722 + x^721 + x^718 + x^716 + x^713 + x^711 + x^710 + x^709 + x^708 + x^705 + x^703 + x^702 + x^693 + x^686 + x^681 + x^680 + x^677 + x^664 + x^662 + x^659 + x^652 + x^651 + x^649 + x^646 + x^644 + x^643 + x^641 + x^638 + x^636 + x^629 + x^627 + x^625 + x^623 + x^622 + x^619 + x^617 + x^616 + x^615 + x^614 + x^612 + x^611 + x^609 + x^606 + x^605 + x^600 + x^597 + x^596 + x^595 + x^592 + x^591 + x^590 + x^586 + x^582 + x^580 + x^577 + x^576 + x^574 + x^572 + x^570 + x^569 + x^567 + x^565 + x^563 + x^562 + x^560 + x^557 + x^556 + x^555 + x^554 + x^552 + x^549 + x^548 + x^546 + x^545 + x^544 + x^542 + x^540 + x^538 + x^536 + x^534 + x^533 + x^532 + x^530 + x^528 + x^525 + x^520 + x^519 + x^518 + x^516 + x^514 + x^513 + x^511 + x^509 + x^504 + x^501 + x^497 + x^496 + x^495 + x^488 + x^487 + x^485 + x^482 + x^481 + x^480 + x^479 + x^478 + x^476 + x^475 + x^474 + x^472 + x^470 + x^468 + x^466 + x^465 + x^463 + x^458 + x^453 + x^451 + x^449 + x^448 + x^447 + x^446 + x^445 + x^444 + x^443 + x^439 + x^438 + x^437 + x^436 + x^433 + x^428 + x^424 + x^418 + x^417 + x^414 + x^412 + x^411 + x^408 + x^407 + x^406 + x^404 + x^403 + x^401 + x^400 + x^399 + x^396 + x^395 + x^393 + x^390 + x^389 + x^388 + x^387 + x^386 + x^385 + x^384 + x^382 + x^380 + x^379 + x^375 + x^371 + x^370 + x^369 + x^365 + x^363 + x^362 + x^357 + x^355 + x^354 + x^351 + x^348 + x^346 + x^345 + x^344 + x^342 + x^340 + x^338 + x^336 + x^334 + x^331 + x^328 + x^327 + x^326 + x^324 + x^323 + x^322 + x^320 + x^315 + x^308 + x^306 + x^298 + x^295 + x^292 + x^287 + x^286 + x^285 + x^284 + x^282 + x^281 + x^280 + x^279 + x^278 + x^276 + x^274 + x^273 + x^272 + x^270 + x^269 + x^268 + x^267 + x^265 + x^262 + x^258 + x^256 + x^253 + x^252 + x^251 + x^250 + x^246 + x^245 + x^244 + x^243 + x^242 + x^240 + x^239 + x^238 + x^237 + x^235 + x^232 + x^228 + x^226 + x^224 + x^217 + x^215 + x^213 + x^211 + x^210 + x^208 + x^206 + x^201 + x^199 + x^196 + x^195 + x^192 + x^190 + x^187 + x^186 + x^185 + x^184 + x^182 + x^180 + x^178 + x^175 + x^174 + x^173 + x^172 + x^165 + x^160 + x^159 + x^158 + x^157 + x^155 + x^154 + x^153 + x^148 + x^146 + x^145 + x^143 + x^142 + x^137 + x^135 + x^133 + x^132 + x^131 + x^128 + x^127 + x^124 + x^123 + x^122 + x^121 + x^117 + x^115 + x^114 + x^113 + x^112 + x^108 + x^107 + x^106 + x^105 + x^103 + x^102 + x^101 + x^100 + x^94 + x^93 + x^92 + x^89 + x^87 + x^86 + x^85 + x^83 + x^80 + x^79 + x^78 + x^77 + x^75 + x^74 + x^72 + x^70 + x^67 + x^66 + x^62 + x^61 + x^59 + x^58 + x^57 + x^55 + x^51 + x^50 + x^49 + x^42 + x^41 + x^39 + x^36 + x^34 + x^32 + x^30 + x^26 + x^24 + x^23 + x^22 + x^21 + x^18 + x^16 + x^14 + x^10 + x^9 + x^8 + x^2 + 1
+
+52-17-25	375	x^928 + x^898 + x^870 + x^861 + x^860 + x^859 + x^858 + x^849 + x^848 + x^847 + x^846 + x^842 + x^836 + x^835 + x^831 + x^830 + x^829 + x^828 + x^823 + x^822 + x^811 + x^810 + x^808 + x^807 + x^806 + x^804 + x^800 + x^799 + x^793 + x^792 + x^789 + x^788 + x^786 + x^780 + x^778 + x^777 + x^775 + x^774 + x^770 + x^769 + x^768 + x^764 + x^763 + x^762 + x^758 + x^757 + x^756 + x^755 + x^751 + x^750 + x^744 + x^740 + x^739 + x^738 + x^733 + x^731 + x^728 + x^721 + x^720 + x^716 + x^715 + x^714 + x^713 + x^710 + x^709 + x^702 + x^701 + x^697 + x^696 + x^695 + x^692 + x^688 + x^686 + x^684 + x^683 + x^680 + x^679 + x^678 + x^677 + x^674 + x^673 + x^672 + x^665 + x^662 + x^658 + x^654 + x^647 + x^643 + x^636 + x^635 + x^631 + x^628 + x^626 + x^625 + x^622 + x^621 + x^619 + x^618 + x^617 + x^614 + x^613 + x^612 + x^611 + x^609 + x^608 + x^598 + x^595 + x^591 + x^589 + x^588 + x^587 + x^586 + x^584 + x^582 + x^576 + x^574 + x^571 + x^569 + x^567 + x^564 + x^563 + x^560 + x^557 + x^550 + x^549 + x^548 + x^547 + x^546 + x^544 + x^539 + x^537 + x^536 + x^529 + x^527 + x^526 + x^523 + x^522 + x^521 + x^516 + x^513 + x^512 + x^509 + x^508 + x^505 + x^503 + x^502 + x^499 + x^493 + x^492 + x^491 + x^487 + x^486 + x^484 + x^482 + x^479 + x^478 + x^477 + x^475 + x^474 + x^471 + x^468 + x^467 + x^465 + x^463 + x^462 + x^461 + x^460 + x^455 + x^452 + x^445 + x^443 + x^442 + x^437 + x^433 + x^432 + x^429 + x^427 + x^426 + x^424 + x^423 + x^422 + x^421 + x^417 + x^411 + x^410 + x^408 + x^407 + x^403 + x^402 + x^400 + x^399 + x^393 + x^391 + x^390 + x^389 + x^386 + x^384 + x^381 + x^379 + x^375 + x^373 + x^372 + x^369 + x^367 + x^366 + x^364 + x^363 + x^362 + x^361 + x^360 + x^357 + x^356 + x^353 + x^352 + x^348 + x^345 + x^344 + x^342 + x^341 + x^340 + x^335 + x^332 + x^330 + x^329 + x^328 + x^327 + x^322 + x^321 + x^319 + x^318 + x^317 + x^315 + x^312 + x^311 + x^310 + x^308 + x^305 + x^302 + x^300 + x^299 + x^298 + x^297 + x^296 + x^292 + x^290 + x^289 + x^288 + x^286 + x^284 + x^283 + x^282 + x^281 + x^278 + x^277 + x^276 + x^274 + x^272 + x^269 + x^267 + x^263 + x^262 + x^260 + x^259 + x^256 + x^254 + x^253 + x^251 + x^250 + x^249 + x^248 + x^242 + x^241 + x^240 + x^235 + x^234 + x^231 + x^226 + x^225 + x^221 + x^219 + x^214 + x^212 + x^211 + x^209 + x^207 + x^206 + x^205 + x^202 + x^199 + x^198 + x^195 + x^190 + x^189 + x^187 + x^185 + x^182 + x^181 + x^180 + x^179 + x^177 + x^176 + x^175 + x^174 + x^171 + x^169 + x^165 + x^164 + x^163 + x^162 + x^161 + x^160 + x^155 + x^154 + x^153 + x^152 + x^146 + x^145 + x^142 + x^139 + x^137 + x^136 + x^128 + x^127 + x^124 + x^121 + x^120 + x^119 + x^117 + x^114 + x^113 + x^112 + x^110 + x^109 + x^108 + x^104 + x^102 + x^101 + x^99 + x^97 + x^87 + x^85 + x^84 + x^83 + x^82 + x^78 + x^76 + x^73 + x^72 + x^69 + x^64 + x^62 + x^59 + x^52 + x^51 + x^50 + x^49 + x^46 + x^45 + x^44 + x^42 + x^41 + x^40 + x^36 + x^35 + x^33 + x^28 + x^26 + x^25 + x^21 + x^19 + x^13 + x^12 + x^7 + x^6 + 1
+
+35-28-44	377	x^928 + x^898 + x^894 + x^870 + x^859 + x^829 + x^828 + x^825 + x^808 + x^804 + x^800 + x^799 + x^795 + x^794 + x^789 + x^778 + x^774 + x^769 + x^768 + x^759 + x^758 + x^755 + x^754 + x^748 + x^744 + x^739 + x^735 + x^734 + x^727 + x^726 + x^722 + x^718 + x^714 + x^713 + x^709 + x^708 + x^705 + x^704 + x^700 + x^694 + x^691 + x^690 + x^688 + x^687 + x^685 + x^682 + x^681 + x^675 + x^668 + x^665 + x^659 + x^657 + x^656 + x^655 + x^653 + x^652 + x^651 + x^649 + x^647 + x^644 + x^640 + x^638 + x^635 + x^634 + x^631 + x^630 + x^629 + x^628 + x^625 + x^624 + x^619 + x^617 + x^614 + x^613 + x^612 + x^611 + x^610 + x^608 + x^602 + x^599 + x^598 + x^593 + x^592 + x^591 + x^590 + x^586 + x^585 + x^583 + x^582 + x^581 + x^580 + x^579 + x^578 + x^576 + x^575 + x^573 + x^569 + x^566 + x^560 + x^559 + x^558 + x^557 + x^553 + x^552 + x^551 + x^549 + x^542 + x^536 + x^535 + x^533 + x^524 + x^522 + x^521 + x^520 + x^518 + x^517 + x^516 + x^515 + x^512 + x^509 + x^507 + x^506 + x^504 + x^502 + x^500 + x^499 + x^498 + x^497 + x^496 + x^491 + x^489 + x^485 + x^484 + x^483 + x^482 + x^481 + x^480 + x^477 + x^476 + x^474 + x^467 + x^466 + x^465 + x^462 + x^460 + x^459 + x^454 + x^450 + x^447 + x^446 + x^445 + x^443 + x^439 + x^434 + x^433 + x^432 + x^431 + x^430 + x^429 + x^428 + x^427 + x^426 + x^425 + x^424 + x^423 + x^421 + x^419 + x^417 + x^413 + x^412 + x^411 + x^409 + x^408 + x^407 + x^406 + x^405 + x^404 + x^403 + x^401 + x^400 + x^394 + x^389 + x^386 + x^383 + x^381 + x^380 + x^379 + x^378 + x^376 + x^375 + x^373 + x^372 + x^371 + x^369 + x^368 + x^367 + x^366 + x^365 + x^364 + x^362 + x^359 + x^356 + x^349 + x^347 + x^346 + x^345 + x^343 + x^342 + x^341 + x^340 + x^339 + x^338 + x^337 + x^336 + x^335 + x^332 + x^331 + x^330 + x^329 + x^325 + x^324 + x^320 + x^319 + x^318 + x^317 + x^316 + x^315 + x^311 + x^309 + x^307 + x^304 + x^303 + x^301 + x^300 + x^298 + x^297 + x^296 + x^295 + x^294 + x^292 + x^291 + x^289 + x^288 + x^285 + x^283 + x^282 + x^281 + x^274 + x^272 + x^271 + x^269 + x^262 + x^261 + x^260 + x^258 + x^257 + x^252 + x^251 + x^250 + x^249 + x^247 + x^246 + x^244 + x^241 + x^236 + x^234 + x^231 + x^230 + x^227 + x^226 + x^219 + x^218 + x^216 + x^215 + x^213 + x^206 + x^205 + x^204 + x^203 + x^202 + x^201 + x^200 + x^198 + x^196 + x^195 + x^194 + x^193 + x^192 + x^190 + x^186 + x^185 + x^184 + x^182 + x^176 + x^174 + x^167 + x^166 + x^164 + x^163 + x^162 + x^161 + x^159 + x^155 + x^154 + x^153 + x^151 + x^150 + x^146 + x^145 + x^143 + x^140 + x^138 + x^135 + x^131 + x^130 + x^129 + x^125 + x^124 + x^123 + x^118 + x^116 + x^113 + x^110 + x^107 + x^101 + x^100 + x^99 + x^95 + x^94 + x^93 + x^92 + x^91 + x^88 + x^86 + x^82 + x^81 + x^80 + x^79 + x^78 + x^76 + x^75 + x^73 + x^72 + x^71 + x^70 + x^69 + x^68 + x^67 + x^65 + x^63 + x^62 + x^60 + x^58 + x^57 + x^56 + x^55 + x^52 + x^50 + x^48 + x^46 + x^44 + x^42 + x^40 + x^39 + x^38 + x^33 + x^31 + x^30 + x^29 + x^28 + x^27 + x^24 + x^21 + x^16 + x^13 + x^8 + 1
+
+45-7-6	377	x^928 + x^898 + x^897 + x^870 + x^868 + x^854 + x^853 + x^850 + x^836 + x^835 + x^832 + x^821 + x^810 + x^809 + x^808 + x^807 + x^805 + x^803 + x^802 + x^801 + x^798 + x^794 + x^792 + x^791 + x^790 + x^780 + x^778 + x^775 + x^770 + x^767 + x^766 + x^765 + x^764 + x^760 + x^754 + x^750 + x^743 + x^740 + x^737 + x^735 + x^732 + x^726 + x^723 + x^722 + x^721 + x^720 + x^716 + x^714 + x^710 + x^707 + x^706 + x^703 + x^701 + x^700 + x^699 + x^695 + x^691 + x^689 + x^687 + x^686 + x^685 + x^683 + x^680 + x^676 + x^675 + x^672 + x^671 + x^670 + x^668 + x^667 + x^666 + x^665 + x^662 + x^658 + x^655 + x^653 + x^652 + x^648 + x^644 + x^643 + x^642 + x^637 + x^629 + x^628 + x^627 + x^626 + x^624 + x^621 + x^617 + x^616 + x^612 + x^610 + x^609 + x^608 + x^607 + x^603 + x^602 + x^600 + x^595 + x^594 + x^592 + x^591 + x^589 + x^586 + x^585 + x^582 + x^578 + x^576 + x^574 + x^573 + x^571 + x^570 + x^566 + x^563 + x^561 + x^560 + x^558 + x^557 + x^556 + x^555 + x^554 + x^553 + x^552 + x^551 + x^549 + x^548 + x^545 + x^538 + x^533 + x^530 + x^524 + x^520 + x^519 + x^512 + x^509 + x^508 + x^505 + x^503 + x^502 + x^497 + x^495 + x^493 + x^492 + x^486 + x^485 + x^484 + x^482 + x^480 + x^479 + x^477 + x^472 + x^470 + x^469 + x^466 + x^464 + x^462 + x^460 + x^459 + x^458 + x^456 + x^455 + x^454 + x^452 + x^451 + x^448 + x^446 + x^442 + x^441 + x^440 + x^437 + x^431 + x^430 + x^427 + x^426 + x^425 + x^424 + x^423 + x^420 + x^417 + x^415 + x^414 + x^413 + x^412 + x^410 + x^408 + x^406 + x^405 + x^404 + x^403 + x^401 + x^399 + x^395 + x^393 + x^392 + x^384 + x^381 + x^375 + x^370 + x^368 + x^367 + x^364 + x^363 + x^361 + x^360 + x^356 + x^355 + x^354 + x^353 + x^351 + x^349 + x^346 + x^343 + x^341 + x^340 + x^339 + x^335 + x^334 + x^333 + x^330 + x^328 + x^326 + x^325 + x^324 + x^323 + x^319 + x^318 + x^316 + x^315 + x^312 + x^306 + x^303 + x^302 + x^301 + x^299 + x^294 + x^292 + x^291 + x^290 + x^289 + x^283 + x^281 + x^276 + x^275 + x^274 + x^273 + x^271 + x^270 + x^269 + x^268 + x^267 + x^265 + x^264 + x^263 + x^262 + x^261 + x^260 + x^259 + x^258 + x^257 + x^255 + x^254 + x^253 + x^252 + x^250 + x^247 + x^246 + x^245 + x^243 + x^241 + x^240 + x^239 + x^235 + x^228 + x^224 + x^223 + x^220 + x^217 + x^216 + x^215 + x^209 + x^205 + x^204 + x^203 + x^202 + x^197 + x^196 + x^195 + x^192 + x^191 + x^189 + x^187 + x^183 + x^181 + x^180 + x^179 + x^178 + x^173 + x^172 + x^170 + x^165 + x^163 + x^161 + x^159 + x^156 + x^155 + x^153 + x^148 + x^146 + x^141 + x^138 + x^134 + x^133 + x^131 + x^130 + x^127 + x^126 + x^125 + x^123 + x^122 + x^119 + x^117 + x^116 + x^110 + x^109 + x^108 + x^107 + x^106 + x^95 + x^93 + x^92 + x^91 + x^88 + x^87 + x^86 + x^84 + x^82 + x^80 + x^79 + x^76 + x^75 + x^73 + x^72 + x^69 + x^68 + x^64 + x^63 + x^61 + x^59 + x^57 + x^55 + x^54 + x^53 + x^51 + x^49 + x^46 + x^43 + x^41 + x^40 + x^36 + x^35 + x^34 + x^33 + x^31 + x^27 + x^25 + x^23 + x^22 + x^21 + x^19 + x^15 + x^13 + x^12 + x^11 + x^10 + x^9 + x^8 + 1
+
+23-49-24	379	x^928 + x^898 + x^872 + x^870 + x^856 + x^843 + x^842 + x^827 + x^826 + x^824 + x^818 + x^813 + x^812 + x^811 + x^797 + x^796 + x^795 + x^792 + x^789 + x^788 + x^781 + x^780 + x^772 + x^767 + x^765 + x^759 + x^757 + x^752 + x^743 + x^742 + x^741 + x^740 + x^737 + x^735 + x^730 + x^729 + x^728 + x^727 + x^724 + x^722 + x^721 + x^720 + x^718 + x^714 + x^712 + x^710 + x^707 + x^706 + x^704 + x^703 + x^702 + x^700 + x^699 + x^698 + x^696 + x^694 + x^692 + x^691 + x^690 + x^689 + x^688 + x^686 + x^682 + x^681 + x^679 + x^677 + x^675 + x^674 + x^665 + x^663 + x^661 + x^660 + x^657 + x^656 + x^655 + x^651 + x^649 + x^647 + x^646 + x^644 + x^642 + x^640 + x^637 + x^635 + x^633 + x^625 + x^622 + x^620 + x^619 + x^617 + x^616 + x^615 + x^613 + x^612 + x^610 + x^609 + x^607 + x^606 + x^605 + x^601 + x^600 + x^597 + x^596 + x^595 + x^593 + x^592 + x^590 + x^588 + x^584 + x^583 + x^582 + x^579 + x^578 + x^574 + x^571 + x^570 + x^567 + x^566 + x^564 + x^561 + x^560 + x^559 + x^558 + x^554 + x^553 + x^547 + x^543 + x^539 + x^536 + x^535 + x^534 + x^533 + x^529 + x^527 + x^526 + x^525 + x^518 + x^516 + x^515 + x^510 + x^509 + x^508 + x^506 + x^505 + x^504 + x^503 + x^499 + x^498 + x^497 + x^495 + x^493 + x^491 + x^489 + x^488 + x^487 + x^486 + x^485 + x^484 + x^482 + x^479 + x^475 + x^473 + x^472 + x^469 + x^468 + x^464 + x^463 + x^462 + x^459 + x^457 + x^455 + x^453 + x^448 + x^446 + x^444 + x^443 + x^442 + x^438 + x^435 + x^431 + x^429 + x^427 + x^424 + x^423 + x^418 + x^416 + x^414 + x^406 + x^404 + x^403 + x^401 + x^397 + x^396 + x^390 + x^387 + x^384 + x^380 + x^377 + x^375 + x^373 + x^369 + x^366 + x^365 + x^364 + x^358 + x^356 + x^355 + x^354 + x^353 + x^352 + x^348 + x^346 + x^340 + x^338 + x^336 + x^334 + x^329 + x^326 + x^325 + x^322 + x^320 + x^318 + x^312 + x^307 + x^305 + x^302 + x^301 + x^299 + x^297 + x^296 + x^294 + x^293 + x^291 + x^288 + x^287 + x^286 + x^281 + x^278 + x^277 + x^276 + x^274 + x^273 + x^272 + x^271 + x^269 + x^268 + x^267 + x^266 + x^262 + x^261 + x^258 + x^256 + x^255 + x^253 + x^251 + x^250 + x^249 + x^248 + x^247 + x^243 + x^240 + x^237 + x^236 + x^235 + x^233 + x^231 + x^230 + x^223 + x^222 + x^220 + x^218 + x^216 + x^212 + x^211 + x^208 + x^207 + x^205 + x^203 + x^202 + x^201 + x^200 + x^199 + x^198 + x^197 + x^195 + x^193 + x^192 + x^191 + x^187 + x^186 + x^183 + x^181 + x^180 + x^179 + x^176 + x^174 + x^173 + x^169 + x^166 + x^161 + x^159 + x^158 + x^157 + x^156 + x^154 + x^152 + x^151 + x^149 + x^145 + x^144 + x^143 + x^142 + x^141 + x^139 + x^136 + x^135 + x^131 + x^128 + x^127 + x^126 + x^125 + x^123 + x^122 + x^120 + x^118 + x^117 + x^116 + x^114 + x^111 + x^110 + x^108 + x^107 + x^106 + x^103 + x^100 + x^99 + x^97 + x^96 + x^95 + x^93 + x^92 + x^91 + x^90 + x^87 + x^84 + x^81 + x^80 + x^79 + x^78 + x^77 + x^74 + x^73 + x^71 + x^67 + x^64 + x^61 + x^59 + x^58 + x^54 + x^49 + x^47 + x^44 + x^43 + x^41 + x^38 + x^37 + x^33 + x^30 + x^25 + x^17 + x^16 + x^15 + x^14 + x^12 + x^11 + x^8 + x^7 + x^4 + 1
+
+19-18-26	381	x^928 + x^898 + x^870 + x^844 + x^836 + x^832 + x^820 + x^814 + x^808 + x^802 + x^798 + x^794 + x^791 + x^790 + x^784 + x^778 + x^774 + x^770 + x^769 + x^766 + x^764 + x^761 + x^754 + x^748 + x^743 + x^734 + x^732 + x^731 + x^727 + x^726 + x^724 + x^723 + x^721 + x^718 + x^716 + x^715 + x^713 + x^711 + x^709 + x^706 + x^704 + x^703 + x^702 + x^701 + x^700 + x^699 + x^697 + x^696 + x^695 + x^693 + x^692 + x^691 + x^690 + x^685 + x^684 + x^676 + x^674 + x^667 + x^664 + x^663 + x^658 + x^657 + x^656 + x^654 + x^653 + x^651 + x^650 + x^646 + x^645 + x^644 + x^643 + x^639 + x^638 + x^637 + x^633 + x^631 + x^630 + x^627 + x^626 + x^625 + x^624 + x^620 + x^611 + x^610 + x^607 + x^606 + x^604 + x^603 + x^598 + x^597 + x^595 + x^593 + x^590 + x^589 + x^588 + x^586 + x^585 + x^584 + x^582 + x^580 + x^577 + x^575 + x^570 + x^569 + x^568 + x^563 + x^562 + x^561 + x^558 + x^557 + x^556 + x^555 + x^552 + x^551 + x^550 + x^548 + x^547 + x^546 + x^545 + x^542 + x^541 + x^540 + x^539 + x^538 + x^537 + x^535 + x^534 + x^533 + x^531 + x^530 + x^528 + x^523 + x^522 + x^521 + x^517 + x^515 + x^514 + x^512 + x^510 + x^509 + x^508 + x^506 + x^497 + x^494 + x^493 + x^490 + x^487 + x^486 + x^483 + x^481 + x^479 + x^476 + x^474 + x^472 + x^471 + x^467 + x^465 + x^464 + x^463 + x^462 + x^460 + x^456 + x^454 + x^452 + x^450 + x^449 + x^448 + x^447 + x^445 + x^444 + x^440 + x^439 + x^438 + x^437 + x^436 + x^432 + x^431 + x^430 + x^429 + x^428 + x^427 + x^425 + x^424 + x^422 + x^420 + x^419 + x^418 + x^416 + x^414 + x^413 + x^409 + x^407 + x^405 + x^404 + x^402 + x^397 + x^396 + x^392 + x^391 + x^389 + x^386 + x^385 + x^384 + x^381 + x^377 + x^376 + x^373 + x^371 + x^368 + x^366 + x^364 + x^362 + x^360 + x^359 + x^357 + x^355 + x^354 + x^353 + x^352 + x^351 + x^350 + x^349 + x^348 + x^346 + x^343 + x^341 + x^340 + x^338 + x^337 + x^336 + x^334 + x^331 + x^329 + x^328 + x^327 + x^325 + x^324 + x^323 + x^320 + x^316 + x^314 + x^313 + x^311 + x^309 + x^307 + x^306 + x^305 + x^304 + x^302 + x^301 + x^299 + x^297 + x^291 + x^289 + x^288 + x^285 + x^283 + x^282 + x^280 + x^279 + x^272 + x^271 + x^270 + x^269 + x^268 + x^264 + x^263 + x^260 + x^259 + x^257 + x^249 + x^245 + x^242 + x^241 + x^238 + x^234 + x^233 + x^232 + x^230 + x^229 + x^227 + x^226 + x^225 + x^223 + x^221 + x^214 + x^211 + x^210 + x^209 + x^206 + x^205 + x^204 + x^203 + x^201 + x^200 + x^199 + x^197 + x^195 + x^188 + x^186 + x^181 + x^180 + x^177 + x^174 + x^173 + x^171 + x^160 + x^159 + x^158 + x^157 + x^154 + x^148 + x^147 + x^144 + x^142 + x^141 + x^140 + x^139 + x^135 + x^134 + x^129 + x^124 + x^123 + x^120 + x^118 + x^117 + x^116 + x^113 + x^112 + x^110 + x^109 + x^108 + x^107 + x^106 + x^104 + x^103 + x^100 + x^97 + x^95 + x^94 + x^89 + x^86 + x^84 + x^83 + x^79 + x^76 + x^75 + x^73 + x^72 + x^70 + x^67 + x^66 + x^65 + x^63 + x^61 + x^60 + x^59 + x^58 + x^56 + x^53 + x^52 + x^51 + x^50 + x^45 + x^41 + x^40 + x^39 + x^37 + x^36 + x^35 + x^29 + x^26 + x^22 + x^19 + x^18 + x^17 + x^16 + x^13 + x^11 + x^6 + 1
+
+26-3-47	381	x^928 + x^898 + x^878 + x^870 + x^869 + x^860 + x^859 + x^858 + x^850 + x^849 + x^848 + x^840 + x^839 + x^838 + x^830 + x^820 + x^818 + x^810 + x^808 + x^807 + x^798 + x^788 + x^780 + x^778 + x^777 + x^769 + x^767 + x^758 + x^750 + x^740 + x^730 + x^729 + x^728 + x^727 + x^721 + x^720 + x^719 + x^717 + x^716 + x^711 + x^701 + x^700 + x^696 + x^690 + x^689 + x^687 + x^686 + x^681 + x^679 + x^678 + x^676 + x^670 + x^668 + x^667 + x^661 + x^660 + x^657 + x^656 + x^652 + x^650 + x^649 + x^648 + x^647 + x^646 + x^641 + x^638 + x^637 + x^636 + x^632 + x^629 + x^627 + x^625 + x^622 + x^620 + x^619 + x^617 + x^616 + x^610 + x^607 + x^606 + x^602 + x^601 + x^600 + x^599 + x^597 + x^596 + x^592 + x^591 + x^590 + x^588 + x^587 + x^586 + x^585 + x^581 + x^578 + x^576 + x^572 + x^571 + x^570 + x^567 + x^562 + x^560 + x^559 + x^558 + x^557 + x^555 + x^551 + x^550 + x^549 + x^548 + x^546 + x^542 + x^541 + x^536 + x^534 + x^531 + x^530 + x^528 + x^525 + x^523 + x^522 + x^520 + x^519 + x^518 + x^515 + x^514 + x^511 + x^510 + x^509 + x^508 + x^505 + x^504 + x^502 + x^501 + x^500 + x^499 + x^494 + x^493 + x^485 + x^484 + x^481 + x^480 + x^479 + x^477 + x^476 + x^475 + x^473 + x^466 + x^464 + x^462 + x^461 + x^460 + x^458 + x^457 + x^453 + x^447 + x^444 + x^442 + x^441 + x^440 + x^439 + x^438 + x^433 + x^432 + x^429 + x^428 + x^426 + x^425 + x^424 + x^422 + x^421 + x^420 + x^419 + x^418 + x^414 + x^412 + x^411 + x^407 + x^404 + x^401 + x^398 + x^396 + x^393 + x^392 + x^391 + x^389 + x^387 + x^385 + x^383 + x^382 + x^381 + x^380 + x^378 + x^377 + x^374 + x^372 + x^371 + x^368 + x^365 + x^363 + x^362 + x^359 + x^357 + x^356 + x^355 + x^354 + x^350 + x^347 + x^344 + x^343 + x^341 + x^338 + x^337 + x^335 + x^334 + x^333 + x^331 + x^330 + x^329 + x^328 + x^324 + x^322 + x^319 + x^317 + x^314 + x^310 + x^306 + x^300 + x^299 + x^295 + x^294 + x^291 + x^290 + x^289 + x^288 + x^287 + x^286 + x^285 + x^284 + x^282 + x^281 + x^279 + x^278 + x^275 + x^272 + x^271 + x^270 + x^269 + x^266 + x^264 + x^262 + x^260 + x^259 + x^258 + x^254 + x^250 + x^249 + x^247 + x^246 + x^244 + x^243 + x^241 + x^239 + x^237 + x^236 + x^233 + x^232 + x^231 + x^229 + x^227 + x^226 + x^221 + x^220 + x^218 + x^217 + x^216 + x^215 + x^214 + x^213 + x^212 + x^210 + x^209 + x^207 + x^206 + x^202 + x^201 + x^200 + x^199 + x^198 + x^197 + x^195 + x^193 + x^192 + x^189 + x^188 + x^180 + x^176 + x^174 + x^173 + x^172 + x^170 + x^167 + x^165 + x^164 + x^162 + x^160 + x^157 + x^155 + x^153 + x^152 + x^151 + x^149 + x^148 + x^147 + x^144 + x^142 + x^140 + x^139 + x^136 + x^134 + x^133 + x^128 + x^127 + x^124 + x^123 + x^122 + x^121 + x^119 + x^117 + x^115 + x^113 + x^112 + x^110 + x^107 + x^105 + x^101 + x^100 + x^99 + x^98 + x^94 + x^92 + x^91 + x^90 + x^89 + x^87 + x^85 + x^83 + x^81 + x^80 + x^78 + x^77 + x^74 + x^72 + x^71 + x^70 + x^69 + x^65 + x^64 + x^63 + x^62 + x^61 + x^57 + x^56 + x^55 + x^54 + x^53 + x^49 + x^48 + x^42 + x^41 + x^39 + x^36 + x^34 + x^32 + x^31 + x^24 + x^23 + x^21 + x^14 + x^10 + 1
+
+37-33-14	381	x^928 + x^898 + x^874 + x^870 + x^849 + x^845 + x^841 + x^837 + x^836 + x^832 + x^824 + x^820 + x^812 + x^811 + x^804 + x^802 + x^794 + x^789 + x^785 + x^783 + x^781 + x^777 + x^775 + x^771 + x^770 + x^764 + x^761 + x^757 + x^754 + x^751 + x^746 + x^742 + x^741 + x^740 + x^738 + x^736 + x^734 + x^733 + x^731 + x^727 + x^726 + x^725 + x^724 + x^723 + x^721 + x^720 + x^718 + x^717 + x^716 + x^715 + x^714 + x^713 + x^712 + x^711 + x^709 + x^705 + x^704 + x^703 + x^701 + x^695 + x^692 + x^691 + x^690 + x^688 + x^687 + x^686 + x^685 + x^684 + x^682 + x^680 + x^679 + x^676 + x^671 + x^670 + x^665 + x^663 + x^662 + x^661 + x^660 + x^659 + x^653 + x^652 + x^651 + x^650 + x^648 + x^644 + x^643 + x^642 + x^641 + x^637 + x^635 + x^634 + x^631 + x^630 + x^629 + x^627 + x^626 + x^623 + x^622 + x^621 + x^619 + x^617 + x^616 + x^614 + x^613 + x^611 + x^610 + x^603 + x^601 + x^600 + x^599 + x^597 + x^596 + x^594 + x^593 + x^592 + x^591 + x^589 + x^587 + x^585 + x^583 + x^582 + x^579 + x^575 + x^573 + x^571 + x^570 + x^567 + x^566 + x^560 + x^557 + x^556 + x^554 + x^553 + x^552 + x^551 + x^548 + x^546 + x^541 + x^540 + x^538 + x^535 + x^534 + x^531 + x^527 + x^526 + x^525 + x^524 + x^523 + x^517 + x^516 + x^511 + x^509 + x^507 + x^499 + x^496 + x^493 + x^491 + x^490 + x^485 + x^482 + x^481 + x^479 + x^477 + x^475 + x^474 + x^470 + x^469 + x^468 + x^465 + x^462 + x^461 + x^459 + x^458 + x^453 + x^451 + x^446 + x^444 + x^441 + x^436 + x^435 + x^434 + x^432 + x^429 + x^420 + x^419 + x^416 + x^414 + x^411 + x^410 + x^409 + x^407 + x^405 + x^404 + x^403 + x^402 + x^401 + x^397 + x^395 + x^393 + x^392 + x^390 + x^388 + x^384 + x^381 + x^379 + x^376 + x^374 + x^368 + x^367 + x^365 + x^362 + x^361 + x^360 + x^359 + x^357 + x^355 + x^351 + x^349 + x^346 + x^345 + x^344 + x^342 + x^341 + x^339 + x^337 + x^336 + x^335 + x^333 + x^331 + x^326 + x^320 + x^318 + x^316 + x^315 + x^314 + x^313 + x^312 + x^311 + x^310 + x^309 + x^306 + x^304 + x^303 + x^302 + x^301 + x^300 + x^298 + x^297 + x^296 + x^295 + x^294 + x^293 + x^292 + x^290 + x^289 + x^288 + x^284 + x^283 + x^282 + x^278 + x^277 + x^274 + x^273 + x^272 + x^270 + x^266 + x^265 + x^261 + x^258 + x^256 + x^255 + x^254 + x^248 + x^246 + x^245 + x^239 + x^237 + x^234 + x^230 + x^229 + x^225 + x^224 + x^222 + x^221 + x^217 + x^215 + x^214 + x^213 + x^212 + x^208 + x^206 + x^204 + x^203 + x^202 + x^201 + x^199 + x^198 + x^195 + x^194 + x^191 + x^189 + x^188 + x^186 + x^184 + x^182 + x^181 + x^179 + x^177 + x^176 + x^175 + x^171 + x^169 + x^168 + x^162 + x^161 + x^159 + x^157 + x^156 + x^151 + x^150 + x^148 + x^146 + x^145 + x^142 + x^140 + x^139 + x^138 + x^135 + x^134 + x^131 + x^129 + x^126 + x^124 + x^119 + x^118 + x^117 + x^116 + x^108 + x^106 + x^105 + x^103 + x^99 + x^97 + x^93 + x^92 + x^91 + x^90 + x^87 + x^86 + x^84 + x^83 + x^78 + x^76 + x^73 + x^66 + x^65 + x^64 + x^62 + x^61 + x^58 + x^53 + x^52 + x^51 + x^48 + x^47 + x^46 + x^45 + x^44 + x^42 + x^41 + x^38 + x^34 + x^29 + x^28 + x^26 + x^23 + x^16 + x^8 + x^6 + 1
+
+36-46-33	383	x^928 + x^898 + x^870 + x^857 + x^828 + x^827 + x^816 + x^815 + x^809 + x^808 + x^804 + x^797 + x^792 + x^786 + x^785 + x^780 + x^778 + x^775 + x^773 + x^768 + x^767 + x^762 + x^755 + x^751 + x^750 + x^737 + x^734 + x^732 + x^728 + x^727 + x^725 + x^722 + x^716 + x^715 + x^714 + x^710 + x^708 + x^707 + x^704 + x^703 + x^701 + x^698 + x^697 + x^695 + x^689 + x^688 + x^685 + x^681 + x^680 + x^679 + x^678 + x^677 + x^674 + x^665 + x^658 + x^656 + x^651 + x^650 + x^649 + x^648 + x^647 + x^640 + x^637 + x^635 + x^634 + x^633 + x^631 + x^628 + x^626 + x^624 + x^620 + x^619 + x^617 + x^616 + x^610 + x^607 + x^605 + x^603 + x^602 + x^601 + x^598 + x^591 + x^590 + x^587 + x^584 + x^582 + x^580 + x^577 + x^574 + x^573 + x^571 + x^567 + x^563 + x^562 + x^560 + x^559 + x^558 + x^557 + x^555 + x^553 + x^551 + x^550 + x^549 + x^548 + x^547 + x^544 + x^542 + x^540 + x^539 + x^538 + x^537 + x^535 + x^534 + x^533 + x^531 + x^528 + x^527 + x^525 + x^519 + x^517 + x^516 + x^515 + x^510 + x^509 + x^508 + x^507 + x^505 + x^500 + x^499 + x^496 + x^495 + x^494 + x^493 + x^489 + x^488 + x^487 + x^486 + x^485 + x^484 + x^482 + x^480 + x^479 + x^477 + x^475 + x^473 + x^470 + x^468 + x^467 + x^466 + x^465 + x^463 + x^461 + x^460 + x^455 + x^451 + x^450 + x^448 + x^444 + x^443 + x^442 + x^439 + x^438 + x^437 + x^435 + x^434 + x^433 + x^427 + x^426 + x^425 + x^423 + x^421 + x^420 + x^419 + x^418 + x^416 + x^413 + x^411 + x^410 + x^408 + x^407 + x^404 + x^402 + x^400 + x^399 + x^398 + x^397 + x^396 + x^395 + x^394 + x^393 + x^387 + x^386 + x^382 + x^379 + x^378 + x^377 + x^376 + x^375 + x^374 + x^372 + x^371 + x^370 + x^369 + x^366 + x^364 + x^363 + x^362 + x^361 + x^359 + x^358 + x^357 + x^356 + x^355 + x^354 + x^352 + x^347 + x^346 + x^345 + x^344 + x^343 + x^341 + x^340 + x^336 + x^335 + x^332 + x^330 + x^329 + x^328 + x^325 + x^324 + x^323 + x^322 + x^321 + x^320 + x^318 + x^316 + x^315 + x^312 + x^302 + x^301 + x^298 + x^295 + x^288 + x^287 + x^286 + x^285 + x^280 + x^279 + x^278 + x^275 + x^273 + x^272 + x^270 + x^267 + x^266 + x^264 + x^261 + x^259 + x^258 + x^255 + x^253 + x^252 + x^250 + x^249 + x^248 + x^247 + x^244 + x^243 + x^242 + x^241 + x^240 + x^237 + x^236 + x^235 + x^231 + x^230 + x^228 + x^225 + x^224 + x^222 + x^220 + x^218 + x^217 + x^216 + x^215 + x^212 + x^211 + x^205 + x^204 + x^203 + x^201 + x^196 + x^194 + x^193 + x^192 + x^191 + x^190 + x^187 + x^186 + x^184 + x^183 + x^182 + x^180 + x^179 + x^178 + x^174 + x^173 + x^172 + x^164 + x^163 + x^162 + x^161 + x^160 + x^159 + x^158 + x^156 + x^154 + x^153 + x^150 + x^149 + x^148 + x^146 + x^144 + x^143 + x^140 + x^134 + x^131 + x^127 + x^125 + x^124 + x^120 + x^119 + x^118 + x^116 + x^115 + x^113 + x^112 + x^109 + x^108 + x^107 + x^106 + x^103 + x^100 + x^99 + x^97 + x^96 + x^95 + x^94 + x^91 + x^87 + x^86 + x^83 + x^81 + x^80 + x^78 + x^77 + x^75 + x^74 + x^72 + x^71 + x^69 + x^68 + x^66 + x^64 + x^63 + x^59 + x^57 + x^55 + x^53 + x^48 + x^47 + x^44 + x^42 + x^41 + x^40 + x^37 + x^28 + x^27 + x^26 + x^20 + x^18 + x^16 + 1
+
+40-1-13	383	x^928 + x^898 + x^870 + x^864 + x^861 + x^858 + x^855 + x^852 + x^837 + x^834 + x^825 + x^808 + x^804 + x^801 + x^798 + x^792 + x^791 + x^788 + x^785 + x^778 + x^777 + x^774 + x^773 + x^758 + x^755 + x^752 + x^743 + x^740 + x^738 + x^737 + x^735 + x^734 + x^725 + x^721 + x^719 + x^718 + x^716 + x^715 + x^713 + x^710 + x^707 + x^705 + x^704 + x^703 + x^698 + x^695 + x^691 + x^689 + x^686 + x^682 + x^680 + x^678 + x^677 + x^676 + x^674 + x^673 + x^671 + x^668 + x^667 + x^664 + x^662 + x^661 + x^659 + x^658 + x^656 + x^652 + x^650 + x^648 + x^647 + x^645 + x^644 + x^643 + x^642 + x^641 + x^640 + x^636 + x^633 + x^630 + x^629 + x^628 + x^627 + x^626 + x^623 + x^621 + x^618 + x^615 + x^612 + x^608 + x^607 + x^605 + x^603 + x^602 + x^600 + x^598 + x^596 + x^594 + x^593 + x^588 + x^583 + x^582 + x^579 + x^574 + x^573 + x^569 + x^568 + x^567 + x^565 + x^564 + x^562 + x^558 + x^557 + x^556 + x^555 + x^552 + x^551 + x^548 + x^545 + x^544 + x^542 + x^540 + x^537 + x^535 + x^534 + x^533 + x^532 + x^531 + x^530 + x^526 + x^525 + x^524 + x^523 + x^521 + x^520 + x^519 + x^518 + x^517 + x^515 + x^513 + x^509 + x^508 + x^507 + x^502 + x^500 + x^499 + x^496 + x^495 + x^491 + x^489 + x^488 + x^485 + x^482 + x^480 + x^478 + x^476 + x^474 + x^471 + x^468 + x^466 + x^463 + x^462 + x^461 + x^460 + x^459 + x^457 + x^456 + x^453 + x^451 + x^450 + x^447 + x^443 + x^440 + x^439 + x^436 + x^435 + x^434 + x^433 + x^432 + x^426 + x^425 + x^424 + x^422 + x^421 + x^419 + x^417 + x^416 + x^410 + x^409 + x^408 + x^406 + x^405 + x^402 + x^401 + x^399 + x^398 + x^396 + x^389 + x^388 + x^387 + x^385 + x^383 + x^382 + x^381 + x^379 + x^378 + x^377 + x^376 + x^375 + x^373 + x^371 + x^368 + x^366 + x^364 + x^363 + x^360 + x^358 + x^356 + x^355 + x^353 + x^350 + x^349 + x^346 + x^345 + x^344 + x^340 + x^339 + x^338 + x^332 + x^331 + x^329 + x^326 + x^324 + x^323 + x^321 + x^316 + x^315 + x^313 + x^312 + x^310 + x^309 + x^307 + x^306 + x^305 + x^303 + x^302 + x^300 + x^299 + x^296 + x^294 + x^293 + x^292 + x^289 + x^288 + x^286 + x^285 + x^283 + x^282 + x^279 + x^277 + x^274 + x^273 + x^272 + x^270 + x^269 + x^268 + x^267 + x^265 + x^264 + x^261 + x^259 + x^256 + x^251 + x^249 + x^245 + x^241 + x^240 + x^239 + x^238 + x^236 + x^235 + x^234 + x^232 + x^230 + x^226 + x^222 + x^220 + x^217 + x^215 + x^211 + x^210 + x^208 + x^203 + x^200 + x^199 + x^197 + x^195 + x^194 + x^193 + x^190 + x^187 + x^186 + x^184 + x^183 + x^182 + x^178 + x^176 + x^174 + x^169 + x^168 + x^167 + x^164 + x^162 + x^161 + x^160 + x^159 + x^158 + x^154 + x^153 + x^147 + x^142 + x^138 + x^137 + x^129 + x^128 + x^127 + x^126 + x^124 + x^123 + x^121 + x^119 + x^116 + x^115 + x^112 + x^110 + x^109 + x^107 + x^106 + x^103 + x^101 + x^100 + x^99 + x^98 + x^95 + x^94 + x^93 + x^92 + x^91 + x^89 + x^85 + x^83 + x^80 + x^79 + x^77 + x^75 + x^73 + x^72 + x^71 + x^63 + x^61 + x^59 + x^58 + x^57 + x^55 + x^51 + x^48 + x^47 + x^46 + x^45 + x^39 + x^38 + x^37 + x^34 + x^33 + x^32 + x^29 + x^28 + x^25 + x^23 + x^20 + x^17 + x^11 + x^10 + x^7 + 1
+
+46-53-31	383	x^928 + x^898 + x^896 + x^875 + x^870 + x^864 + x^856 + x^854 + x^848 + x^845 + x^834 + x^833 + x^827 + x^817 + x^814 + x^812 + x^808 + x^807 + x^806 + x^804 + x^801 + x^796 + x^794 + x^791 + x^787 + x^786 + x^778 + x^777 + x^776 + x^774 + x^773 + x^772 + x^770 + x^767 + x^765 + x^764 + x^761 + x^757 + x^756 + x^754 + x^746 + x^745 + x^744 + x^741 + x^735 + x^734 + x^730 + x^727 + x^725 + x^723 + x^716 + x^715 + x^714 + x^713 + x^712 + x^705 + x^704 + x^703 + x^702 + x^697 + x^696 + x^692 + x^688 + x^685 + x^684 + x^683 + x^682 + x^681 + x^674 + x^673 + x^672 + x^671 + x^670 + x^667 + x^666 + x^664 + x^663 + x^661 + x^660 + x^658 + x^655 + x^654 + x^653 + x^652 + x^651 + x^650 + x^645 + x^639 + x^637 + x^634 + x^631 + x^630 + x^626 + x^625 + x^624 + x^621 + x^620 + x^618 + x^615 + x^610 + x^608 + x^607 + x^606 + x^605 + x^604 + x^602 + x^596 + x^594 + x^588 + x^586 + x^584 + x^582 + x^580 + x^578 + x^574 + x^573 + x^571 + x^570 + x^568 + x^567 + x^560 + x^553 + x^551 + x^548 + x^545 + x^543 + x^542 + x^538 + x^537 + x^536 + x^534 + x^533 + x^532 + x^530 + x^529 + x^528 + x^523 + x^521 + x^513 + x^512 + x^509 + x^508 + x^505 + x^502 + x^491 + x^490 + x^489 + x^487 + x^481 + x^479 + x^468 + x^466 + x^465 + x^464 + x^461 + x^460 + x^459 + x^457 + x^455 + x^454 + x^453 + x^451 + x^450 + x^444 + x^442 + x^440 + x^438 + x^431 + x^430 + x^429 + x^428 + x^427 + x^426 + x^425 + x^424 + x^423 + x^422 + x^421 + x^416 + x^415 + x^414 + x^412 + x^410 + x^409 + x^408 + x^402 + x^400 + x^399 + x^398 + x^396 + x^395 + x^393 + x^392 + x^391 + x^388 + x^385 + x^384 + x^381 + x^380 + x^379 + x^377 + x^376 + x^374 + x^373 + x^371 + x^368 + x^366 + x^365 + x^364 + x^362 + x^358 + x^357 + x^356 + x^351 + x^348 + x^345 + x^342 + x^339 + x^338 + x^336 + x^334 + x^331 + x^330 + x^328 + x^327 + x^323 + x^320 + x^319 + x^318 + x^312 + x^311 + x^307 + x^306 + x^305 + x^304 + x^303 + x^302 + x^301 + x^298 + x^295 + x^293 + x^292 + x^291 + x^287 + x^286 + x^285 + x^284 + x^283 + x^280 + x^279 + x^278 + x^276 + x^275 + x^271 + x^269 + x^266 + x^264 + x^263 + x^262 + x^260 + x^257 + x^255 + x^254 + x^253 + x^252 + x^251 + x^250 + x^248 + x^242 + x^241 + x^238 + x^234 + x^231 + x^225 + x^223 + x^222 + x^221 + x^220 + x^219 + x^218 + x^217 + x^214 + x^211 + x^209 + x^208 + x^207 + x^206 + x^204 + x^200 + x^196 + x^194 + x^191 + x^188 + x^186 + x^185 + x^182 + x^181 + x^178 + x^176 + x^175 + x^174 + x^169 + x^168 + x^166 + x^164 + x^160 + x^159 + x^158 + x^155 + x^154 + x^153 + x^151 + x^149 + x^147 + x^145 + x^143 + x^138 + x^135 + x^132 + x^131 + x^130 + x^128 + x^127 + x^124 + x^123 + x^121 + x^120 + x^119 + x^117 + x^116 + x^115 + x^112 + x^111 + x^110 + x^109 + x^106 + x^105 + x^104 + x^101 + x^99 + x^96 + x^87 + x^85 + x^84 + x^83 + x^81 + x^80 + x^79 + x^75 + x^73 + x^70 + x^69 + x^68 + x^67 + x^66 + x^63 + x^61 + x^60 + x^58 + x^56 + x^54 + x^53 + x^51 + x^49 + x^47 + x^45 + x^44 + x^43 + x^42 + x^41 + x^39 + x^36 + x^34 + x^31 + x^30 + x^29 + x^27 + x^24 + x^22 + x^14 + x^13 + x^12 + 1
+
+1-41-10	385	x^928 + x^898 + x^879 + x^870 + x^855 + x^850 + x^849 + x^831 + x^826 + x^825 + x^819 + x^816 + x^808 + x^807 + x^802 + x^801 + x^800 + x^796 + x^792 + x^789 + x^777 + x^776 + x^768 + x^766 + x^762 + x^758 + x^756 + x^754 + x^748 + x^746 + x^744 + x^742 + x^738 + x^736 + x^735 + x^733 + x^729 + x^728 + x^725 + x^720 + x^716 + x^710 + x^705 + x^704 + x^701 + x^700 + x^696 + x^688 + x^686 + x^682 + x^681 + x^680 + x^679 + x^678 + x^677 + x^676 + x^675 + x^674 + x^671 + x^670 + x^669 + x^666 + x^665 + x^661 + x^660 + x^658 + x^655 + x^653 + x^652 + x^649 + x^648 + x^645 + x^640 + x^637 + x^633 + x^629 + x^628 + x^624 + x^623 + x^621 + x^620 + x^619 + x^618 + x^617 + x^616 + x^610 + x^609 + x^607 + x^605 + x^604 + x^601 + x^600 + x^595 + x^591 + x^589 + x^586 + x^584 + x^581 + x^579 + x^575 + x^573 + x^569 + x^568 + x^561 + x^559 + x^556 + x^555 + x^546 + x^542 + x^540 + x^538 + x^537 + x^534 + x^533 + x^531 + x^530 + x^528 + x^526 + x^525 + x^523 + x^518 + x^517 + x^513 + x^511 + x^507 + x^497 + x^496 + x^494 + x^493 + x^491 + x^489 + x^488 + x^487 + x^485 + x^484 + x^483 + x^482 + x^479 + x^477 + x^476 + x^475 + x^474 + x^471 + x^470 + x^468 + x^466 + x^465 + x^464 + x^463 + x^462 + x^461 + x^459 + x^458 + x^454 + x^453 + x^452 + x^451 + x^449 + x^447 + x^446 + x^442 + x^441 + x^440 + x^434 + x^431 + x^428 + x^427 + x^426 + x^424 + x^421 + x^418 + x^417 + x^416 + x^414 + x^412 + x^411 + x^408 + x^405 + x^401 + x^400 + x^399 + x^398 + x^395 + x^394 + x^393 + x^392 + x^391 + x^388 + x^386 + x^385 + x^381 + x^380 + x^379 + x^378 + x^376 + x^375 + x^373 + x^372 + x^370 + x^367 + x^366 + x^365 + x^364 + x^361 + x^360 + x^359 + x^356 + x^354 + x^353 + x^349 + x^348 + x^346 + x^344 + x^340 + x^335 + x^332 + x^330 + x^325 + x^324 + x^321 + x^318 + x^316 + x^315 + x^314 + x^312 + x^310 + x^309 + x^307 + x^304 + x^301 + x^300 + x^299 + x^298 + x^297 + x^295 + x^291 + x^290 + x^289 + x^288 + x^287 + x^286 + x^285 + x^284 + x^281 + x^280 + x^276 + x^274 + x^269 + x^268 + x^267 + x^265 + x^264 + x^261 + x^260 + x^259 + x^257 + x^256 + x^255 + x^254 + x^251 + x^250 + x^245 + x^242 + x^239 + x^236 + x^233 + x^229 + x^227 + x^225 + x^223 + x^222 + x^219 + x^217 + x^214 + x^213 + x^210 + x^207 + x^205 + x^204 + x^203 + x^202 + x^201 + x^200 + x^199 + x^198 + x^197 + x^196 + x^195 + x^192 + x^190 + x^189 + x^181 + x^180 + x^178 + x^177 + x^175 + x^174 + x^173 + x^172 + x^169 + x^168 + x^165 + x^162 + x^159 + x^158 + x^154 + x^153 + x^152 + x^150 + x^148 + x^144 + x^143 + x^142 + x^141 + x^139 + x^138 + x^137 + x^133 + x^132 + x^128 + x^127 + x^124 + x^123 + x^122 + x^121 + x^118 + x^116 + x^106 + x^102 + x^101 + x^98 + x^96 + x^92 + x^91 + x^90 + x^89 + x^88 + x^86 + x^85 + x^84 + x^83 + x^81 + x^80 + x^78 + x^76 + x^73 + x^72 + x^71 + x^69 + x^67 + x^66 + x^65 + x^63 + x^58 + x^54 + x^53 + x^52 + x^51 + x^50 + x^47 + x^46 + x^45 + x^44 + x^43 + x^40 + x^39 + x^38 + x^37 + x^34 + x^33 + x^32 + x^30 + x^25 + x^23 + x^21 + x^20 + x^19 + x^17 + x^16 + x^15 + x^12 + x^9 + x^8 + x^4 + 1
+
+11-33-48	385	x^928 + x^898 + x^882 + x^870 + x^860 + x^853 + x^844 + x^835 + x^828 + x^827 + x^822 + x^819 + x^815 + x^811 + x^808 + x^806 + x^805 + x^794 + x^793 + x^786 + x^784 + x^781 + x^778 + x^773 + x^772 + x^769 + x^765 + x^762 + x^760 + x^759 + x^756 + x^755 + x^748 + x^746 + x^743 + x^739 + x^735 + x^734 + x^733 + x^731 + x^729 + x^727 + x^723 + x^718 + x^713 + x^709 + x^707 + x^706 + x^704 + x^702 + x^699 + x^696 + x^693 + x^692 + x^691 + x^686 + x^685 + x^683 + x^679 + x^677 + x^673 + x^670 + x^669 + x^666 + x^657 + x^656 + x^655 + x^649 + x^648 + x^646 + x^641 + x^639 + x^638 + x^635 + x^633 + x^632 + x^630 + x^628 + x^627 + x^625 + x^620 + x^616 + x^614 + x^613 + x^611 + x^610 + x^609 + x^607 + x^606 + x^600 + x^595 + x^593 + x^592 + x^589 + x^587 + x^584 + x^581 + x^580 + x^579 + x^577 + x^572 + x^570 + x^568 + x^567 + x^566 + x^564 + x^560 + x^559 + x^557 + x^555 + x^554 + x^552 + x^551 + x^546 + x^542 + x^538 + x^535 + x^534 + x^533 + x^531 + x^530 + x^528 + x^526 + x^524 + x^523 + x^520 + x^519 + x^511 + x^509 + x^506 + x^504 + x^503 + x^502 + x^501 + x^500 + x^499 + x^498 + x^495 + x^494 + x^491 + x^490 + x^489 + x^488 + x^487 + x^485 + x^484 + x^479 + x^475 + x^473 + x^466 + x^459 + x^457 + x^456 + x^455 + x^454 + x^451 + x^450 + x^449 + x^448 + x^447 + x^446 + x^444 + x^443 + x^442 + x^441 + x^440 + x^433 + x^432 + x^430 + x^428 + x^427 + x^425 + x^423 + x^419 + x^418 + x^417 + x^414 + x^409 + x^408 + x^406 + x^404 + x^402 + x^400 + x^398 + x^397 + x^396 + x^395 + x^393 + x^389 + x^388 + x^385 + x^379 + x^377 + x^375 + x^374 + x^369 + x^365 + x^364 + x^363 + x^362 + x^361 + x^359 + x^355 + x^354 + x^350 + x^348 + x^345 + x^344 + x^339 + x^336 + x^335 + x^334 + x^333 + x^332 + x^331 + x^330 + x^329 + x^328 + x^326 + x^319 + x^318 + x^316 + x^315 + x^314 + x^313 + x^312 + x^309 + x^308 + x^304 + x^303 + x^302 + x^299 + x^298 + x^297 + x^295 + x^294 + x^293 + x^292 + x^291 + x^290 + x^288 + x^285 + x^282 + x^281 + x^279 + x^277 + x^276 + x^274 + x^272 + x^271 + x^270 + x^269 + x^268 + x^267 + x^265 + x^264 + x^262 + x^261 + x^260 + x^257 + x^253 + x^251 + x^250 + x^247 + x^246 + x^243 + x^242 + x^241 + x^240 + x^237 + x^236 + x^233 + x^232 + x^230 + x^229 + x^226 + x^223 + x^222 + x^221 + x^220 + x^217 + x^215 + x^211 + x^210 + x^209 + x^207 + x^206 + x^205 + x^203 + x^201 + x^200 + x^198 + x^196 + x^195 + x^193 + x^189 + x^188 + x^186 + x^184 + x^180 + x^179 + x^177 + x^176 + x^170 + x^168 + x^163 + x^162 + x^160 + x^159 + x^158 + x^157 + x^156 + x^154 + x^151 + x^149 + x^148 + x^145 + x^144 + x^141 + x^140 + x^138 + x^137 + x^136 + x^135 + x^134 + x^133 + x^132 + x^131 + x^130 + x^129 + x^125 + x^124 + x^121 + x^117 + x^116 + x^110 + x^109 + x^108 + x^106 + x^104 + x^103 + x^102 + x^99 + x^98 + x^96 + x^95 + x^93 + x^92 + x^90 + x^89 + x^88 + x^85 + x^83 + x^81 + x^78 + x^76 + x^72 + x^71 + x^70 + x^68 + x^67 + x^66 + x^62 + x^59 + x^58 + x^56 + x^51 + x^48 + x^46 + x^45 + x^44 + x^43 + x^41 + x^40 + x^38 + x^37 + x^35 + x^34 + x^33 + x^32 + x^27 + x^22 + x^19 + x^13 + 1
+
+19-8-4	387	x^928 + x^898 + x^870 + x^844 + x^838 + x^834 + x^828 + x^818 + x^814 + x^806 + x^804 + x^803 + x^797 + x^782 + x^778 + x^776 + x^774 + x^773 + x^772 + x^768 + x^767 + x^764 + x^752 + x^751 + x^745 + x^744 + x^742 + x^740 + x^738 + x^736 + x^733 + x^730 + x^721 + x^718 + x^715 + x^714 + x^710 + x^707 + x^704 + x^702 + x^700 + x^699 + x^698 + x^697 + x^694 + x^692 + x^691 + x^688 + x^686 + x^685 + x^682 + x^676 + x^673 + x^671 + x^670 + x^669 + x^666 + x^662 + x^661 + x^658 + x^656 + x^655 + x^654 + x^652 + x^649 + x^648 + x^647 + x^645 + x^644 + x^642 + x^640 + x^638 + x^636 + x^632 + x^631 + x^630 + x^623 + x^622 + x^621 + x^616 + x^614 + x^612 + x^611 + x^606 + x^605 + x^602 + x^598 + x^597 + x^594 + x^593 + x^591 + x^590 + x^588 + x^587 + x^586 + x^584 + x^582 + x^581 + x^579 + x^577 + x^574 + x^572 + x^571 + x^568 + x^567 + x^566 + x^563 + x^562 + x^560 + x^559 + x^558 + x^556 + x^553 + x^551 + x^550 + x^549 + x^546 + x^545 + x^543 + x^542 + x^538 + x^536 + x^535 + x^534 + x^533 + x^531 + x^530 + x^529 + x^527 + x^525 + x^524 + x^522 + x^521 + x^520 + x^518 + x^517 + x^513 + x^512 + x^510 + x^509 + x^507 + x^506 + x^505 + x^504 + x^501 + x^500 + x^499 + x^493 + x^492 + x^491 + x^489 + x^488 + x^486 + x^485 + x^484 + x^480 + x^479 + x^478 + x^477 + x^474 + x^473 + x^472 + x^470 + x^468 + x^464 + x^462 + x^458 + x^456 + x^455 + x^454 + x^453 + x^452 + x^451 + x^450 + x^449 + x^447 + x^446 + x^445 + x^441 + x^439 + x^438 + x^437 + x^436 + x^434 + x^433 + x^432 + x^431 + x^429 + x^426 + x^425 + x^424 + x^423 + x^421 + x^419 + x^418 + x^416 + x^414 + x^412 + x^410 + x^407 + x^405 + x^404 + x^398 + x^397 + x^394 + x^393 + x^392 + x^391 + x^387 + x^386 + x^385 + x^382 + x^381 + x^379 + x^377 + x^375 + x^374 + x^369 + x^368 + x^365 + x^364 + x^363 + x^362 + x^361 + x^359 + x^358 + x^356 + x^355 + x^352 + x^351 + x^350 + x^345 + x^343 + x^341 + x^340 + x^338 + x^333 + x^331 + x^330 + x^329 + x^328 + x^327 + x^325 + x^324 + x^323 + x^322 + x^318 + x^315 + x^312 + x^310 + x^308 + x^305 + x^304 + x^303 + x^299 + x^296 + x^295 + x^294 + x^290 + x^289 + x^288 + x^285 + x^284 + x^281 + x^280 + x^275 + x^274 + x^273 + x^271 + x^268 + x^266 + x^264 + x^263 + x^262 + x^261 + x^260 + x^258 + x^256 + x^255 + x^254 + x^251 + x^245 + x^240 + x^237 + x^236 + x^231 + x^230 + x^229 + x^228 + x^223 + x^221 + x^219 + x^218 + x^215 + x^210 + x^208 + x^207 + x^206 + x^204 + x^202 + x^197 + x^196 + x^195 + x^194 + x^193 + x^192 + x^187 + x^186 + x^184 + x^183 + x^182 + x^180 + x^178 + x^177 + x^175 + x^174 + x^169 + x^168 + x^166 + x^165 + x^163 + x^160 + x^159 + x^156 + x^155 + x^152 + x^150 + x^145 + x^140 + x^138 + x^137 + x^136 + x^135 + x^134 + x^133 + x^131 + x^128 + x^127 + x^126 + x^122 + x^121 + x^118 + x^117 + x^114 + x^109 + x^105 + x^102 + x^101 + x^100 + x^99 + x^96 + x^94 + x^93 + x^91 + x^90 + x^89 + x^88 + x^87 + x^81 + x^79 + x^76 + x^74 + x^71 + x^70 + x^64 + x^63 + x^61 + x^59 + x^56 + x^55 + x^49 + x^47 + x^46 + x^44 + x^43 + x^40 + x^35 + x^34 + x^33 + x^31 + x^28 + x^26 + x^23 + x^21 + x^18 + x^13 + 1
+
+36-23-57	387	x^928 + x^898 + x^897 + x^890 + x^870 + x^860 + x^859 + x^854 + x^853 + x^846 + x^836 + x^835 + x^824 + x^816 + x^810 + x^809 + x^808 + x^804 + x^802 + x^792 + x^791 + x^785 + x^784 + x^780 + x^778 + x^777 + x^776 + x^775 + x^774 + x^773 + x^765 + x^755 + x^753 + x^748 + x^747 + x^744 + x^742 + x^733 + x^732 + x^728 + x^725 + x^724 + x^721 + x^716 + x^714 + x^713 + x^703 + x^701 + x^700 + x^699 + x^697 + x^693 + x^692 + x^691 + x^690 + x^689 + x^680 + x^679 + x^675 + x^673 + x^672 + x^666 + x^663 + x^662 + x^661 + x^658 + x^656 + x^655 + x^653 + x^652 + x^649 + x^647 + x^645 + x^642 + x^641 + x^639 + x^638 + x^637 + x^633 + x^630 + x^629 + x^625 + x^620 + x^619 + x^614 + x^613 + x^612 + x^611 + x^610 + x^606 + x^605 + x^604 + x^603 + x^601 + x^600 + x^599 + x^597 + x^593 + x^591 + x^589 + x^587 + x^586 + x^584 + x^583 + x^581 + x^579 + x^576 + x^572 + x^571 + x^566 + x^565 + x^563 + x^559 + x^554 + x^552 + x^549 + x^548 + x^545 + x^544 + x^543 + x^540 + x^535 + x^534 + x^533 + x^531 + x^529 + x^524 + x^522 + x^517 + x^516 + x^513 + x^512 + x^511 + x^509 + x^507 + x^506 + x^505 + x^503 + x^502 + x^496 + x^495 + x^494 + x^492 + x^491 + x^490 + x^489 + x^487 + x^478 + x^477 + x^475 + x^474 + x^472 + x^471 + x^470 + x^469 + x^466 + x^463 + x^461 + x^459 + x^458 + x^457 + x^456 + x^455 + x^454 + x^453 + x^452 + x^448 + x^447 + x^446 + x^444 + x^442 + x^440 + x^439 + x^438 + x^437 + x^434 + x^431 + x^428 + x^427 + x^426 + x^425 + x^424 + x^423 + x^414 + x^409 + x^408 + x^407 + x^403 + x^401 + x^400 + x^396 + x^395 + x^394 + x^390 + x^389 + x^388 + x^387 + x^386 + x^379 + x^378 + x^377 + x^375 + x^374 + x^370 + x^366 + x^360 + x^359 + x^358 + x^357 + x^356 + x^355 + x^353 + x^351 + x^350 + x^349 + x^348 + x^347 + x^345 + x^343 + x^342 + x^341 + x^340 + x^339 + x^338 + x^336 + x^335 + x^330 + x^329 + x^327 + x^325 + x^324 + x^323 + x^322 + x^319 + x^318 + x^315 + x^313 + x^309 + x^305 + x^304 + x^302 + x^300 + x^298 + x^296 + x^291 + x^289 + x^286 + x^285 + x^284 + x^283 + x^282 + x^281 + x^279 + x^275 + x^274 + x^272 + x^271 + x^265 + x^264 + x^263 + x^259 + x^258 + x^257 + x^253 + x^252 + x^249 + x^246 + x^245 + x^244 + x^242 + x^239 + x^233 + x^232 + x^231 + x^230 + x^229 + x^228 + x^221 + x^217 + x^216 + x^212 + x^211 + x^209 + x^208 + x^205 + x^202 + x^201 + x^200 + x^199 + x^198 + x^197 + x^196 + x^195 + x^193 + x^192 + x^191 + x^189 + x^187 + x^186 + x^183 + x^182 + x^181 + x^177 + x^174 + x^172 + x^170 + x^166 + x^164 + x^163 + x^162 + x^160 + x^156 + x^155 + x^152 + x^151 + x^147 + x^144 + x^143 + x^142 + x^141 + x^138 + x^137 + x^135 + x^133 + x^130 + x^129 + x^126 + x^125 + x^123 + x^121 + x^120 + x^117 + x^114 + x^112 + x^107 + x^106 + x^103 + x^102 + x^100 + x^98 + x^95 + x^94 + x^93 + x^91 + x^90 + x^89 + x^87 + x^85 + x^84 + x^82 + x^81 + x^80 + x^78 + x^76 + x^75 + x^71 + x^70 + x^69 + x^68 + x^66 + x^65 + x^61 + x^60 + x^59 + x^58 + x^56 + x^55 + x^51 + x^49 + x^48 + x^46 + x^44 + x^42 + x^36 + x^34 + x^33 + x^32 + x^29 + x^24 + x^23 + x^20 + x^14 + x^13 + x^12 + x^11 + x^10 + 1
+
+44-4-19	389	x^928 + x^898 + x^874 + x^870 + x^836 + x^832 + x^824 + x^812 + x^809 + x^802 + x^794 + x^793 + x^789 + x^785 + x^781 + x^766 + x^764 + x^763 + x^762 + x^759 + x^758 + x^751 + x^750 + x^746 + x^744 + x^742 + x^738 + x^734 + x^733 + x^732 + x^729 + x^721 + x^719 + x^716 + x^715 + x^714 + x^713 + x^710 + x^706 + x^705 + x^703 + x^702 + x^700 + x^699 + x^698 + x^696 + x^693 + x^691 + x^690 + x^689 + x^688 + x^684 + x^680 + x^678 + x^677 + x^674 + x^672 + x^669 + x^667 + x^665 + x^663 + x^662 + x^660 + x^659 + x^658 + x^656 + x^652 + x^651 + x^649 + x^646 + x^645 + x^642 + x^641 + x^640 + x^633 + x^632 + x^630 + x^627 + x^626 + x^622 + x^617 + x^612 + x^611 + x^610 + x^606 + x^605 + x^604 + x^603 + x^602 + x^601 + x^599 + x^597 + x^596 + x^594 + x^593 + x^592 + x^591 + x^582 + x^581 + x^580 + x^578 + x^577 + x^575 + x^574 + x^573 + x^568 + x^567 + x^564 + x^560 + x^559 + x^558 + x^556 + x^554 + x^550 + x^548 + x^547 + x^545 + x^544 + x^541 + x^540 + x^539 + x^538 + x^536 + x^535 + x^534 + x^532 + x^531 + x^529 + x^523 + x^521 + x^518 + x^517 + x^516 + x^514 + x^511 + x^510 + x^508 + x^507 + x^505 + x^504 + x^499 + x^498 + x^495 + x^494 + x^492 + x^491 + x^489 + x^488 + x^487 + x^486 + x^484 + x^483 + x^482 + x^481 + x^478 + x^477 + x^476 + x^475 + x^471 + x^470 + x^468 + x^465 + x^464 + x^460 + x^459 + x^455 + x^454 + x^453 + x^451 + x^445 + x^438 + x^434 + x^432 + x^431 + x^430 + x^429 + x^428 + x^427 + x^424 + x^423 + x^419 + x^418 + x^417 + x^416 + x^415 + x^413 + x^411 + x^409 + x^408 + x^406 + x^405 + x^404 + x^403 + x^402 + x^400 + x^397 + x^395 + x^390 + x^389 + x^387 + x^386 + x^385 + x^384 + x^382 + x^380 + x^379 + x^377 + x^376 + x^374 + x^373 + x^370 + x^369 + x^366 + x^365 + x^364 + x^362 + x^360 + x^359 + x^357 + x^356 + x^355 + x^354 + x^352 + x^349 + x^345 + x^342 + x^341 + x^340 + x^338 + x^334 + x^333 + x^326 + x^324 + x^322 + x^321 + x^319 + x^318 + x^317 + x^315 + x^312 + x^311 + x^309 + x^305 + x^304 + x^302 + x^298 + x^297 + x^296 + x^294 + x^293 + x^290 + x^289 + x^287 + x^286 + x^285 + x^279 + x^277 + x^275 + x^273 + x^268 + x^265 + x^264 + x^263 + x^260 + x^258 + x^254 + x^251 + x^249 + x^248 + x^247 + x^245 + x^244 + x^242 + x^241 + x^240 + x^239 + x^232 + x^229 + x^226 + x^225 + x^223 + x^222 + x^220 + x^219 + x^218 + x^215 + x^214 + x^213 + x^212 + x^210 + x^209 + x^206 + x^203 + x^202 + x^199 + x^197 + x^195 + x^194 + x^192 + x^191 + x^189 + x^188 + x^185 + x^184 + x^181 + x^177 + x^176 + x^175 + x^174 + x^172 + x^171 + x^170 + x^169 + x^167 + x^164 + x^162 + x^160 + x^159 + x^157 + x^156 + x^154 + x^153 + x^152 + x^150 + x^148 + x^145 + x^144 + x^139 + x^138 + x^137 + x^136 + x^133 + x^126 + x^124 + x^123 + x^122 + x^121 + x^120 + x^119 + x^113 + x^111 + x^108 + x^105 + x^104 + x^103 + x^102 + x^101 + x^98 + x^97 + x^96 + x^95 + x^92 + x^86 + x^85 + x^83 + x^81 + x^80 + x^77 + x^74 + x^73 + x^72 + x^71 + x^70 + x^68 + x^67 + x^66 + x^64 + x^62 + x^61 + x^60 + x^59 + x^57 + x^53 + x^51 + x^43 + x^41 + x^40 + x^39 + x^35 + x^30 + x^29 + x^27 + x^26 + x^24 + x^20 + x^18 + x^14 + x^6 + 1
+
+8-3-35	389	x^928 + x^898 + x^895 + x^870 + x^865 + x^835 + x^832 + x^824 + x^821 + x^812 + x^810 + x^808 + x^807 + x^805 + x^804 + x^794 + x^791 + x^788 + x^778 + x^777 + x^774 + x^772 + x^771 + x^763 + x^755 + x^752 + x^750 + x^747 + x^746 + x^742 + x^739 + x^733 + x^731 + x^728 + x^725 + x^722 + x^721 + x^720 + x^719 + x^716 + x^714 + x^713 + x^712 + x^711 + x^708 + x^705 + x^704 + x^701 + x^700 + x^698 + x^695 + x^694 + x^692 + x^689 + x^683 + x^680 + x^675 + x^674 + x^670 + x^668 + x^667 + x^664 + x^662 + x^661 + x^658 + x^656 + x^654 + x^651 + x^650 + x^645 + x^643 + x^640 + x^639 + x^637 + x^635 + x^634 + x^633 + x^631 + x^630 + x^628 + x^621 + x^620 + x^616 + x^615 + x^614 + x^613 + x^608 + x^605 + x^604 + x^602 + x^601 + x^598 + x^597 + x^591 + x^590 + x^588 + x^587 + x^581 + x^579 + x^578 + x^577 + x^576 + x^573 + x^572 + x^571 + x^570 + x^569 + x^568 + x^566 + x^564 + x^563 + x^562 + x^559 + x^557 + x^553 + x^550 + x^549 + x^547 + x^546 + x^540 + x^537 + x^536 + x^534 + x^530 + x^527 + x^526 + x^525 + x^524 + x^522 + x^521 + x^520 + x^519 + x^518 + x^510 + x^509 + x^505 + x^504 + x^498 + x^496 + x^493 + x^492 + x^490 + x^489 + x^488 + x^487 + x^484 + x^483 + x^482 + x^481 + x^480 + x^479 + x^477 + x^475 + x^474 + x^472 + x^470 + x^468 + x^465 + x^464 + x^463 + x^461 + x^458 + x^457 + x^455 + x^454 + x^453 + x^452 + x^451 + x^450 + x^448 + x^447 + x^445 + x^441 + x^440 + x^437 + x^435 + x^434 + x^433 + x^432 + x^431 + x^425 + x^421 + x^418 + x^415 + x^413 + x^412 + x^411 + x^410 + x^409 + x^408 + x^404 + x^403 + x^402 + x^399 + x^398 + x^394 + x^393 + x^391 + x^390 + x^389 + x^384 + x^383 + x^381 + x^380 + x^379 + x^378 + x^375 + x^374 + x^372 + x^370 + x^369 + x^367 + x^365 + x^364 + x^363 + x^362 + x^358 + x^357 + x^355 + x^354 + x^353 + x^351 + x^349 + x^347 + x^343 + x^342 + x^338 + x^337 + x^336 + x^334 + x^332 + x^329 + x^328 + x^327 + x^326 + x^323 + x^321 + x^320 + x^319 + x^317 + x^315 + x^311 + x^308 + x^305 + x^304 + x^303 + x^300 + x^298 + x^294 + x^293 + x^292 + x^290 + x^283 + x^281 + x^280 + x^279 + x^276 + x^274 + x^273 + x^269 + x^268 + x^267 + x^266 + x^264 + x^263 + x^259 + x^256 + x^248 + x^247 + x^246 + x^245 + x^244 + x^243 + x^242 + x^241 + x^240 + x^239 + x^235 + x^234 + x^231 + x^228 + x^227 + x^226 + x^225 + x^224 + x^220 + x^219 + x^218 + x^217 + x^216 + x^213 + x^211 + x^210 + x^206 + x^203 + x^200 + x^197 + x^196 + x^195 + x^193 + x^192 + x^191 + x^185 + x^184 + x^180 + x^178 + x^176 + x^175 + x^173 + x^170 + x^169 + x^167 + x^166 + x^165 + x^164 + x^162 + x^161 + x^160 + x^159 + x^154 + x^153 + x^152 + x^147 + x^141 + x^140 + x^138 + x^135 + x^133 + x^132 + x^131 + x^129 + x^127 + x^126 + x^125 + x^119 + x^115 + x^112 + x^111 + x^108 + x^106 + x^99 + x^97 + x^95 + x^94 + x^93 + x^92 + x^91 + x^89 + x^87 + x^84 + x^82 + x^81 + x^78 + x^76 + x^74 + x^69 + x^68 + x^67 + x^65 + x^63 + x^61 + x^58 + x^57 + x^56 + x^55 + x^54 + x^53 + x^51 + x^49 + x^48 + x^47 + x^46 + x^43 + x^40 + x^39 + x^35 + x^34 + x^32 + x^30 + x^28 + x^27 + x^25 + x^24 + x^21 + x^20 + x^15 + x^14 + x^10 + 1
+
+1-12-46	393	x^928 + x^898 + x^896 + x^870 + x^866 + x^836 + x^834 + x^828 + x^826 + x^808 + x^806 + x^804 + x^802 + x^796 + x^794 + x^778 + x^774 + x^767 + x^766 + x^758 + x^756 + x^744 + x^742 + x^740 + x^738 + x^736 + x^732 + x^731 + x^730 + x^727 + x^726 + x^718 + x^712 + x^710 + x^708 + x^707 + x^706 + x^704 + x^703 + x^701 + x^700 + x^699 + x^698 + x^697 + x^696 + x^695 + x^692 + x^686 + x^685 + x^680 + x^676 + x^672 + x^669 + x^668 + x^665 + x^664 + x^662 + x^661 + x^657 + x^656 + x^655 + x^653 + x^647 + x^646 + x^643 + x^640 + x^639 + x^638 + x^635 + x^628 + x^626 + x^623 + x^622 + x^621 + x^615 + x^612 + x^610 + x^609 + x^608 + x^607 + x^605 + x^604 + x^603 + x^602 + x^600 + x^599 + x^598 + x^597 + x^590 + x^589 + x^587 + x^586 + x^584 + x^583 + x^582 + x^581 + x^579 + x^578 + x^577 + x^576 + x^574 + x^573 + x^571 + x^567 + x^563 + x^561 + x^560 + x^559 + x^556 + x^554 + x^550 + x^548 + x^545 + x^544 + x^542 + x^535 + x^530 + x^529 + x^528 + x^526 + x^524 + x^522 + x^521 + x^519 + x^517 + x^516 + x^515 + x^512 + x^508 + x^507 + x^506 + x^505 + x^504 + x^499 + x^498 + x^497 + x^496 + x^495 + x^494 + x^489 + x^488 + x^487 + x^486 + x^484 + x^483 + x^481 + x^477 + x^476 + x^475 + x^474 + x^473 + x^471 + x^469 + x^466 + x^465 + x^464 + x^461 + x^460 + x^459 + x^457 + x^455 + x^452 + x^451 + x^449 + x^448 + x^447 + x^446 + x^445 + x^443 + x^442 + x^440 + x^439 + x^438 + x^433 + x^427 + x^425 + x^424 + x^422 + x^421 + x^419 + x^416 + x^415 + x^414 + x^413 + x^412 + x^408 + x^405 + x^404 + x^403 + x^402 + x^399 + x^398 + x^397 + x^396 + x^394 + x^393 + x^392 + x^391 + x^389 + x^388 + x^387 + x^386 + x^384 + x^381 + x^380 + x^376 + x^375 + x^374 + x^373 + x^366 + x^363 + x^362 + x^359 + x^358 + x^357 + x^356 + x^355 + x^353 + x^352 + x^351 + x^347 + x^344 + x^343 + x^342 + x^341 + x^339 + x^337 + x^336 + x^333 + x^331 + x^329 + x^328 + x^327 + x^326 + x^325 + x^321 + x^320 + x^317 + x^316 + x^315 + x^312 + x^311 + x^310 + x^307 + x^306 + x^303 + x^300 + x^298 + x^296 + x^295 + x^292 + x^291 + x^290 + x^287 + x^283 + x^279 + x^278 + x^277 + x^276 + x^273 + x^272 + x^271 + x^270 + x^269 + x^263 + x^262 + x^257 + x^256 + x^255 + x^254 + x^252 + x^249 + x^247 + x^245 + x^242 + x^241 + x^240 + x^235 + x^234 + x^233 + x^232 + x^231 + x^230 + x^229 + x^227 + x^225 + x^224 + x^223 + x^222 + x^219 + x^218 + x^217 + x^216 + x^215 + x^214 + x^213 + x^211 + x^206 + x^205 + x^203 + x^200 + x^199 + x^196 + x^194 + x^191 + x^186 + x^185 + x^183 + x^180 + x^179 + x^177 + x^176 + x^175 + x^174 + x^172 + x^171 + x^170 + x^169 + x^167 + x^160 + x^159 + x^158 + x^157 + x^156 + x^155 + x^154 + x^152 + x^146 + x^145 + x^144 + x^143 + x^142 + x^141 + x^139 + x^138 + x^137 + x^134 + x^133 + x^129 + x^126 + x^125 + x^124 + x^122 + x^121 + x^119 + x^118 + x^117 + x^113 + x^111 + x^110 + x^109 + x^108 + x^99 + x^98 + x^97 + x^95 + x^93 + x^92 + x^90 + x^85 + x^78 + x^76 + x^75 + x^70 + x^69 + x^65 + x^64 + x^63 + x^62 + x^59 + x^56 + x^54 + x^53 + x^51 + x^50 + x^49 + x^45 + x^44 + x^42 + x^41 + x^39 + x^36 + x^35 + x^34 + x^32 + x^31 + x^30 + x^23 + x^20 + x^16 + x^13 + x^12 + 1
+
+21-29-14	393	x^928 + x^898 + x^885 + x^870 + x^858 + x^856 + x^855 + x^831 + x^829 + x^828 + x^826 + x^815 + x^813 + x^812 + x^808 + x^804 + x^802 + x^801 + x^799 + x^798 + x^796 + x^788 + x^785 + x^778 + x^777 + x^775 + x^774 + x^772 + x^769 + x^768 + x^766 + x^765 + x^758 + x^752 + x^748 + x^747 + x^742 + x^741 + x^739 + x^738 + x^736 + x^735 + x^732 + x^728 + x^726 + x^725 + x^721 + x^718 + x^717 + x^714 + x^712 + x^709 + x^708 + x^706 + x^705 + x^702 + x^701 + x^699 + x^698 + x^694 + x^691 + x^687 + x^685 + x^684 + x^682 + x^681 + x^680 + x^679 + x^676 + x^675 + x^674 + x^671 + x^667 + x^664 + x^658 + x^657 + x^655 + x^653 + x^652 + x^650 + x^649 + x^648 + x^647 + x^646 + x^644 + x^641 + x^640 + x^637 + x^635 + x^632 + x^627 + x^625 + x^623 + x^622 + x^619 + x^618 + x^617 + x^613 + x^610 + x^608 + x^601 + x^595 + x^593 + x^592 + x^586 + x^585 + x^583 + x^582 + x^577 + x^572 + x^571 + x^570 + x^568 + x^565 + x^563 + x^561 + x^559 + x^557 + x^555 + x^553 + x^550 + x^548 + x^545 + x^544 + x^538 + x^537 + x^534 + x^532 + x^529 + x^526 + x^525 + x^521 + x^520 + x^518 + x^512 + x^511 + x^510 + x^508 + x^507 + x^503 + x^501 + x^500 + x^499 + x^498 + x^497 + x^496 + x^494 + x^489 + x^486 + x^485 + x^481 + x^480 + x^477 + x^476 + x^475 + x^466 + x^464 + x^462 + x^461 + x^460 + x^459 + x^458 + x^454 + x^452 + x^451 + x^449 + x^447 + x^446 + x^444 + x^441 + x^440 + x^439 + x^433 + x^431 + x^430 + x^429 + x^427 + x^425 + x^424 + x^422 + x^416 + x^414 + x^412 + x^408 + x^406 + x^403 + x^402 + x^401 + x^399 + x^398 + x^395 + x^393 + x^390 + x^389 + x^387 + x^386 + x^385 + x^384 + x^383 + x^381 + x^380 + x^378 + x^375 + x^374 + x^372 + x^371 + x^370 + x^368 + x^367 + x^362 + x^361 + x^358 + x^356 + x^354 + x^353 + x^351 + x^350 + x^347 + x^346 + x^343 + x^340 + x^339 + x^337 + x^335 + x^331 + x^330 + x^329 + x^328 + x^326 + x^325 + x^323 + x^322 + x^319 + x^318 + x^316 + x^315 + x^311 + x^310 + x^309 + x^308 + x^306 + x^304 + x^303 + x^298 + x^296 + x^295 + x^294 + x^292 + x^291 + x^290 + x^289 + x^287 + x^284 + x^281 + x^280 + x^276 + x^274 + x^272 + x^271 + x^270 + x^268 + x^267 + x^259 + x^258 + x^257 + x^256 + x^255 + x^254 + x^249 + x^248 + x^247 + x^246 + x^244 + x^243 + x^241 + x^240 + x^236 + x^234 + x^233 + x^232 + x^229 + x^224 + x^221 + x^220 + x^217 + x^216 + x^215 + x^213 + x^211 + x^210 + x^208 + x^207 + x^200 + x^199 + x^198 + x^197 + x^196 + x^195 + x^193 + x^192 + x^191 + x^190 + x^185 + x^184 + x^183 + x^181 + x^179 + x^176 + x^173 + x^170 + x^169 + x^168 + x^164 + x^162 + x^160 + x^157 + x^155 + x^154 + x^152 + x^151 + x^150 + x^149 + x^146 + x^144 + x^143 + x^142 + x^140 + x^136 + x^134 + x^132 + x^130 + x^129 + x^128 + x^126 + x^123 + x^120 + x^117 + x^112 + x^111 + x^108 + x^107 + x^105 + x^103 + x^100 + x^99 + x^96 + x^95 + x^91 + x^90 + x^89 + x^87 + x^86 + x^84 + x^83 + x^81 + x^79 + x^78 + x^76 + x^69 + x^68 + x^67 + x^66 + x^62 + x^61 + x^57 + x^56 + x^55 + x^53 + x^52 + x^51 + x^49 + x^48 + x^46 + x^43 + x^40 + x^38 + x^37 + x^36 + x^35 + x^34 + x^33 + x^31 + x^30 + x^29 + x^28 + x^27 + x^26 + x^24 + x^21 + x^20 + x^17 + x^13 + 1
+
+37-29-44	393	x^928 + x^898 + x^885 + x^870 + x^858 + x^856 + x^855 + x^831 + x^829 + x^828 + x^826 + x^815 + x^813 + x^812 + x^808 + x^804 + x^802 + x^801 + x^799 + x^798 + x^796 + x^788 + x^785 + x^778 + x^777 + x^775 + x^774 + x^772 + x^769 + x^768 + x^766 + x^765 + x^758 + x^752 + x^748 + x^747 + x^742 + x^741 + x^739 + x^738 + x^736 + x^735 + x^732 + x^728 + x^726 + x^725 + x^721 + x^718 + x^717 + x^714 + x^712 + x^709 + x^708 + x^706 + x^705 + x^702 + x^701 + x^699 + x^698 + x^694 + x^691 + x^687 + x^685 + x^684 + x^682 + x^681 + x^680 + x^679 + x^676 + x^675 + x^674 + x^671 + x^667 + x^664 + x^658 + x^657 + x^655 + x^653 + x^652 + x^650 + x^649 + x^648 + x^647 + x^646 + x^644 + x^641 + x^640 + x^637 + x^635 + x^632 + x^627 + x^625 + x^623 + x^622 + x^619 + x^618 + x^617 + x^613 + x^610 + x^608 + x^601 + x^595 + x^593 + x^592 + x^586 + x^585 + x^583 + x^582 + x^577 + x^572 + x^571 + x^570 + x^568 + x^565 + x^563 + x^561 + x^559 + x^557 + x^555 + x^553 + x^550 + x^548 + x^545 + x^544 + x^538 + x^537 + x^534 + x^532 + x^529 + x^526 + x^525 + x^521 + x^520 + x^518 + x^512 + x^511 + x^510 + x^508 + x^507 + x^503 + x^501 + x^500 + x^499 + x^498 + x^497 + x^496 + x^494 + x^489 + x^486 + x^485 + x^481 + x^480 + x^477 + x^476 + x^475 + x^466 + x^464 + x^462 + x^461 + x^460 + x^459 + x^458 + x^454 + x^452 + x^451 + x^449 + x^447 + x^446 + x^444 + x^441 + x^440 + x^439 + x^433 + x^431 + x^430 + x^429 + x^427 + x^425 + x^424 + x^422 + x^416 + x^414 + x^412 + x^408 + x^406 + x^403 + x^402 + x^401 + x^399 + x^398 + x^395 + x^393 + x^390 + x^389 + x^387 + x^386 + x^385 + x^384 + x^383 + x^381 + x^380 + x^378 + x^375 + x^374 + x^372 + x^371 + x^370 + x^368 + x^367 + x^362 + x^361 + x^358 + x^356 + x^354 + x^353 + x^351 + x^350 + x^347 + x^346 + x^343 + x^340 + x^339 + x^337 + x^335 + x^331 + x^330 + x^329 + x^328 + x^326 + x^325 + x^323 + x^322 + x^319 + x^318 + x^316 + x^315 + x^311 + x^310 + x^309 + x^308 + x^306 + x^304 + x^303 + x^298 + x^296 + x^295 + x^294 + x^292 + x^291 + x^290 + x^289 + x^287 + x^284 + x^281 + x^280 + x^276 + x^274 + x^272 + x^271 + x^270 + x^268 + x^267 + x^259 + x^258 + x^257 + x^256 + x^255 + x^254 + x^249 + x^248 + x^247 + x^246 + x^244 + x^243 + x^241 + x^240 + x^236 + x^234 + x^233 + x^232 + x^229 + x^224 + x^221 + x^220 + x^217 + x^216 + x^215 + x^213 + x^211 + x^210 + x^208 + x^207 + x^200 + x^199 + x^198 + x^197 + x^196 + x^195 + x^193 + x^192 + x^191 + x^190 + x^185 + x^184 + x^183 + x^181 + x^179 + x^176 + x^173 + x^170 + x^169 + x^168 + x^164 + x^162 + x^160 + x^157 + x^155 + x^154 + x^152 + x^151 + x^150 + x^149 + x^146 + x^144 + x^143 + x^142 + x^140 + x^136 + x^134 + x^132 + x^130 + x^129 + x^128 + x^126 + x^123 + x^120 + x^117 + x^112 + x^111 + x^108 + x^107 + x^105 + x^103 + x^100 + x^99 + x^96 + x^95 + x^91 + x^90 + x^89 + x^87 + x^86 + x^84 + x^83 + x^81 + x^79 + x^78 + x^76 + x^69 + x^68 + x^67 + x^66 + x^62 + x^61 + x^57 + x^56 + x^55 + x^53 + x^52 + x^51 + x^49 + x^48 + x^46 + x^43 + x^40 + x^38 + x^37 + x^36 + x^35 + x^34 + x^33 + x^31 + x^30 + x^29 + x^28 + x^27 + x^26 + x^24 + x^21 + x^20 + x^17 + x^13 + 1
+
+7-48-42	393	x^928 + x^898 + x^892 + x^870 + x^862 + x^843 + x^820 + x^813 + x^808 + x^800 + x^794 + x^784 + x^783 + x^780 + x^778 + x^774 + x^771 + x^770 + x^767 + x^760 + x^757 + x^753 + x^750 + x^748 + x^743 + x^741 + x^740 + x^737 + x^731 + x^727 + x^724 + x^723 + x^718 + x^713 + x^707 + x^705 + x^704 + x^701 + x^700 + x^697 + x^695 + x^693 + x^688 + x^684 + x^683 + x^682 + x^681 + x^678 + x^677 + x^674 + x^671 + x^669 + x^667 + x^664 + x^663 + x^660 + x^653 + x^652 + x^651 + x^650 + x^649 + x^645 + x^644 + x^641 + x^639 + x^638 + x^637 + x^634 + x^633 + x^630 + x^628 + x^625 + x^623 + x^621 + x^620 + x^619 + x^615 + x^612 + x^611 + x^608 + x^607 + x^605 + x^604 + x^603 + x^599 + x^595 + x^593 + x^585 + x^584 + x^581 + x^580 + x^578 + x^577 + x^575 + x^573 + x^572 + x^569 + x^568 + x^565 + x^564 + x^563 + x^561 + x^558 + x^557 + x^551 + x^550 + x^548 + x^547 + x^544 + x^538 + x^537 + x^534 + x^533 + x^532 + x^530 + x^529 + x^524 + x^522 + x^521 + x^519 + x^518 + x^516 + x^515 + x^514 + x^513 + x^512 + x^510 + x^508 + x^506 + x^505 + x^502 + x^501 + x^500 + x^499 + x^496 + x^493 + x^492 + x^491 + x^488 + x^487 + x^483 + x^482 + x^481 + x^479 + x^478 + x^476 + x^475 + x^474 + x^473 + x^472 + x^471 + x^470 + x^469 + x^467 + x^463 + x^460 + x^458 + x^453 + x^452 + x^451 + x^447 + x^446 + x^445 + x^439 + x^435 + x^434 + x^433 + x^432 + x^431 + x^430 + x^428 + x^427 + x^425 + x^421 + x^420 + x^419 + x^417 + x^415 + x^413 + x^412 + x^410 + x^407 + x^406 + x^405 + x^404 + x^402 + x^400 + x^397 + x^395 + x^394 + x^393 + x^392 + x^391 + x^390 + x^388 + x^385 + x^381 + x^378 + x^377 + x^376 + x^374 + x^373 + x^370 + x^369 + x^368 + x^366 + x^365 + x^364 + x^363 + x^361 + x^358 + x^356 + x^355 + x^354 + x^351 + x^350 + x^348 + x^347 + x^344 + x^341 + x^340 + x^337 + x^335 + x^334 + x^329 + x^326 + x^325 + x^324 + x^322 + x^321 + x^319 + x^318 + x^314 + x^312 + x^311 + x^310 + x^309 + x^308 + x^307 + x^303 + x^302 + x^301 + x^298 + x^293 + x^292 + x^291 + x^288 + x^281 + x^280 + x^279 + x^278 + x^275 + x^271 + x^270 + x^267 + x^265 + x^264 + x^263 + x^262 + x^261 + x^260 + x^259 + x^258 + x^257 + x^256 + x^253 + x^252 + x^251 + x^250 + x^249 + x^248 + x^247 + x^244 + x^243 + x^242 + x^240 + x^237 + x^236 + x^233 + x^227 + x^226 + x^224 + x^222 + x^221 + x^220 + x^219 + x^218 + x^217 + x^216 + x^213 + x^212 + x^210 + x^208 + x^207 + x^206 + x^205 + x^202 + x^201 + x^200 + x^197 + x^195 + x^194 + x^193 + x^192 + x^191 + x^190 + x^189 + x^186 + x^184 + x^183 + x^182 + x^181 + x^178 + x^177 + x^176 + x^170 + x^168 + x^167 + x^166 + x^162 + x^159 + x^157 + x^149 + x^148 + x^147 + x^143 + x^141 + x^139 + x^138 + x^136 + x^135 + x^131 + x^127 + x^121 + x^119 + x^117 + x^114 + x^110 + x^109 + x^107 + x^103 + x^99 + x^98 + x^96 + x^95 + x^94 + x^92 + x^90 + x^89 + x^88 + x^87 + x^86 + x^85 + x^84 + x^82 + x^80 + x^79 + x^78 + x^77 + x^76 + x^74 + x^71 + x^69 + x^68 + x^66 + x^64 + x^62 + x^61 + x^58 + x^57 + x^53 + x^50 + x^46 + x^44 + x^43 + x^42 + x^41 + x^40 + x^37 + x^35 + x^34 + x^32 + x^31 + x^29 + x^27 + x^26 + x^25 + x^22 + x^20 + x^16 + x^12 + x^10 + 1
+
+57-51-22	397	x^928 + x^898 + x^895 + x^870 + x^866 + x^865 + x^862 + x^860 + x^857 + x^835 + x^833 + x^832 + x^828 + x^822 + x^819 + x^810 + x^808 + x^805 + x^797 + x^796 + x^791 + x^790 + x^789 + x^786 + x^784 + x^782 + x^781 + x^778 + x^777 + x^773 + x^767 + x^766 + x^762 + x^757 + x^752 + x^743 + x^742 + x^737 + x^734 + x^717 + x^715 + x^713 + x^708 + x^707 + x^706 + x^705 + x^703 + x^702 + x^701 + x^698 + x^696 + x^690 + x^688 + x^685 + x^683 + x^682 + x^680 + x^677 + x^673 + x^671 + x^668 + x^667 + x^666 + x^663 + x^662 + x^661 + x^656 + x^654 + x^653 + x^649 + x^647 + x^646 + x^645 + x^643 + x^637 + x^635 + x^632 + x^630 + x^629 + x^627 + x^626 + x^625 + x^624 + x^622 + x^619 + x^613 + x^610 + x^608 + x^602 + x^597 + x^594 + x^593 + x^591 + x^590 + x^587 + x^586 + x^584 + x^583 + x^582 + x^580 + x^577 + x^575 + x^574 + x^573 + x^570 + x^569 + x^568 + x^562 + x^556 + x^553 + x^552 + x^551 + x^550 + x^547 + x^546 + x^545 + x^543 + x^541 + x^539 + x^538 + x^535 + x^534 + x^533 + x^528 + x^527 + x^526 + x^524 + x^522 + x^521 + x^515 + x^512 + x^509 + x^505 + x^503 + x^502 + x^501 + x^500 + x^499 + x^498 + x^497 + x^493 + x^491 + x^483 + x^480 + x^477 + x^474 + x^473 + x^472 + x^471 + x^470 + x^468 + x^467 + x^463 + x^459 + x^458 + x^457 + x^455 + x^453 + x^452 + x^451 + x^448 + x^447 + x^446 + x^445 + x^444 + x^443 + x^440 + x^439 + x^436 + x^435 + x^434 + x^432 + x^430 + x^429 + x^428 + x^427 + x^426 + x^423 + x^422 + x^421 + x^420 + x^417 + x^416 + x^415 + x^414 + x^413 + x^411 + x^410 + x^407 + x^406 + x^403 + x^401 + x^400 + x^391 + x^390 + x^387 + x^386 + x^385 + x^381 + x^380 + x^379 + x^377 + x^374 + x^373 + x^370 + x^369 + x^362 + x^359 + x^357 + x^356 + x^355 + x^354 + x^349 + x^346 + x^345 + x^344 + x^343 + x^340 + x^339 + x^338 + x^337 + x^336 + x^334 + x^331 + x^330 + x^328 + x^323 + x^322 + x^321 + x^319 + x^318 + x^317 + x^316 + x^314 + x^313 + x^312 + x^311 + x^310 + x^305 + x^303 + x^299 + x^295 + x^294 + x^293 + x^290 + x^289 + x^286 + x^285 + x^284 + x^281 + x^280 + x^278 + x^275 + x^272 + x^271 + x^269 + x^267 + x^266 + x^263 + x^262 + x^261 + x^260 + x^258 + x^257 + x^256 + x^255 + x^254 + x^253 + x^252 + x^251 + x^247 + x^246 + x^241 + x^240 + x^239 + x^238 + x^236 + x^233 + x^232 + x^230 + x^228 + x^224 + x^223 + x^220 + x^216 + x^215 + x^213 + x^212 + x^211 + x^208 + x^206 + x^205 + x^204 + x^201 + x^199 + x^197 + x^195 + x^194 + x^193 + x^191 + x^189 + x^188 + x^187 + x^186 + x^185 + x^184 + x^182 + x^179 + x^178 + x^176 + x^172 + x^171 + x^170 + x^169 + x^168 + x^167 + x^166 + x^163 + x^162 + x^161 + x^160 + x^157 + x^156 + x^155 + x^153 + x^152 + x^148 + x^145 + x^142 + x^140 + x^139 + x^137 + x^134 + x^133 + x^131 + x^123 + x^119 + x^118 + x^114 + x^112 + x^111 + x^110 + x^108 + x^107 + x^105 + x^104 + x^102 + x^99 + x^98 + x^95 + x^94 + x^93 + x^89 + x^88 + x^86 + x^84 + x^82 + x^80 + x^78 + x^76 + x^73 + x^71 + x^70 + x^68 + x^67 + x^66 + x^64 + x^62 + x^60 + x^59 + x^57 + x^53 + x^52 + x^49 + x^48 + x^47 + x^46 + x^40 + x^37 + x^36 + x^35 + x^34 + x^32 + x^31 + x^28 + x^26 + x^25 + x^24 + x^22 + x^20 + x^19 + x^18 + x^15 + x^10 + x^8 + x^5 + 1
+
+41-40-20	399	x^928 + x^898 + x^870 + x^846 + x^844 + x^821 + x^820 + x^816 + x^814 + x^808 + x^804 + x^801 + x^800 + x^798 + x^795 + x^778 + x^771 + x^770 + x^769 + x^768 + x^765 + x^760 + x^749 + x^748 + x^744 + x^743 + x^741 + x^738 + x^734 + x^729 + x^726 + x^719 + x^717 + x^716 + x^715 + x^714 + x^713 + x^712 + x^711 + x^710 + x^709 + x^706 + x^704 + x^703 + x^702 + x^701 + x^694 + x^693 + x^691 + x^690 + x^685 + x^684 + x^682 + x^681 + x^680 + x^678 + x^677 + x^676 + x^675 + x^674 + x^673 + x^671 + x^669 + x^667 + x^665 + x^661 + x^660 + x^659 + x^658 + x^656 + x^652 + x^651 + x^649 + x^648 + x^643 + x^642 + x^639 + x^637 + x^634 + x^631 + x^629 + x^628 + x^624 + x^620 + x^619 + x^618 + x^617 + x^616 + x^615 + x^614 + x^613 + x^611 + x^610 + x^605 + x^604 + x^603 + x^601 + x^599 + x^598 + x^595 + x^594 + x^593 + x^590 + x^589 + x^585 + x^584 + x^583 + x^579 + x^577 + x^575 + x^573 + x^572 + x^571 + x^570 + x^569 + x^566 + x^564 + x^562 + x^561 + x^560 + x^557 + x^555 + x^554 + x^553 + x^552 + x^551 + x^550 + x^549 + x^547 + x^545 + x^542 + x^540 + x^539 + x^538 + x^537 + x^536 + x^535 + x^533 + x^532 + x^530 + x^529 + x^524 + x^518 + x^516 + x^514 + x^513 + x^512 + x^510 + x^509 + x^504 + x^503 + x^501 + x^493 + x^490 + x^489 + x^487 + x^486 + x^485 + x^484 + x^481 + x^479 + x^478 + x^475 + x^473 + x^471 + x^470 + x^468 + x^467 + x^466 + x^462 + x^460 + x^455 + x^454 + x^451 + x^450 + x^449 + x^447 + x^446 + x^445 + x^444 + x^443 + x^442 + x^441 + x^440 + x^439 + x^438 + x^436 + x^430 + x^429 + x^424 + x^423 + x^420 + x^419 + x^418 + x^415 + x^414 + x^413 + x^410 + x^409 + x^408 + x^407 + x^406 + x^405 + x^403 + x^402 + x^400 + x^398 + x^397 + x^396 + x^395 + x^394 + x^392 + x^391 + x^389 + x^387 + x^386 + x^385 + x^383 + x^382 + x^381 + x^379 + x^375 + x^374 + x^369 + x^367 + x^366 + x^365 + x^363 + x^360 + x^359 + x^358 + x^357 + x^355 + x^354 + x^351 + x^339 + x^338 + x^337 + x^336 + x^335 + x^334 + x^332 + x^330 + x^329 + x^323 + x^320 + x^317 + x^315 + x^312 + x^311 + x^309 + x^305 + x^302 + x^301 + x^300 + x^299 + x^298 + x^297 + x^296 + x^295 + x^292 + x^291 + x^288 + x^286 + x^285 + x^284 + x^283 + x^282 + x^280 + x^279 + x^278 + x^273 + x^268 + x^267 + x^264 + x^263 + x^258 + x^257 + x^256 + x^255 + x^254 + x^253 + x^250 + x^249 + x^248 + x^244 + x^243 + x^242 + x^238 + x^237 + x^236 + x^234 + x^233 + x^231 + x^230 + x^222 + x^218 + x^215 + x^214 + x^211 + x^208 + x^206 + x^205 + x^201 + x^200 + x^198 + x^197 + x^195 + x^194 + x^193 + x^191 + x^189 + x^185 + x^182 + x^179 + x^176 + x^174 + x^173 + x^164 + x^163 + x^162 + x^159 + x^158 + x^156 + x^155 + x^152 + x^150 + x^148 + x^142 + x^140 + x^139 + x^138 + x^137 + x^135 + x^134 + x^133 + x^132 + x^131 + x^128 + x^124 + x^122 + x^121 + x^120 + x^119 + x^117 + x^116 + x^114 + x^111 + x^110 + x^108 + x^107 + x^105 + x^104 + x^103 + x^101 + x^95 + x^94 + x^93 + x^91 + x^89 + x^88 + x^87 + x^84 + x^83 + x^82 + x^81 + x^80 + x^79 + x^78 + x^77 + x^76 + x^74 + x^73 + x^72 + x^66 + x^65 + x^64 + x^59 + x^57 + x^56 + x^53 + x^49 + x^47 + x^44 + x^43 + x^39 + x^38 + x^37 + x^34 + x^33 + x^32 + x^31 + x^28 + x^23 + x^22 + x^19 + x^12 + x^8 + 1
+
+55-27-24	399	x^928 + x^898 + x^864 + x^847 + x^846 + x^834 + x^824 + x^818 + x^817 + x^816 + x^812 + x^810 + x^808 + x^806 + x^801 + x^800 + x^795 + x^794 + x^788 + x^783 + x^781 + x^777 + x^776 + x^775 + x^771 + x^765 + x^764 + x^753 + x^750 + x^749 + x^747 + x^746 + x^745 + x^743 + x^742 + x^741 + x^737 + x^734 + x^731 + x^728 + x^726 + x^725 + x^724 + x^721 + x^719 + x^717 + x^716 + x^714 + x^712 + x^706 + x^704 + x^703 + x^702 + x^701 + x^699 + x^698 + x^697 + x^695 + x^694 + x^691 + x^690 + x^688 + x^687 + x^684 + x^683 + x^681 + x^680 + x^673 + x^672 + x^670 + x^667 + x^666 + x^664 + x^663 + x^661 + x^659 + x^657 + x^655 + x^650 + x^649 + x^647 + x^640 + x^639 + x^637 + x^636 + x^634 + x^630 + x^626 + x^625 + x^623 + x^622 + x^620 + x^618 + x^617 + x^615 + x^612 + x^611 + x^609 + x^608 + x^607 + x^605 + x^604 + x^602 + x^600 + x^599 + x^596 + x^594 + x^592 + x^590 + x^587 + x^581 + x^578 + x^576 + x^575 + x^574 + x^570 + x^567 + x^566 + x^565 + x^564 + x^563 + x^561 + x^560 + x^555 + x^554 + x^553 + x^552 + x^551 + x^550 + x^549 + x^548 + x^543 + x^537 + x^536 + x^533 + x^532 + x^531 + x^529 + x^528 + x^527 + x^525 + x^524 + x^523 + x^522 + x^519 + x^518 + x^516 + x^515 + x^514 + x^513 + x^512 + x^511 + x^509 + x^507 + x^505 + x^500 + x^498 + x^497 + x^496 + x^494 + x^489 + x^486 + x^481 + x^480 + x^479 + x^476 + x^471 + x^469 + x^467 + x^466 + x^463 + x^459 + x^455 + x^451 + x^450 + x^449 + x^448 + x^447 + x^445 + x^444 + x^441 + x^440 + x^432 + x^430 + x^429 + x^428 + x^426 + x^424 + x^420 + x^418 + x^416 + x^415 + x^413 + x^411 + x^408 + x^406 + x^405 + x^404 + x^400 + x^398 + x^392 + x^390 + x^387 + x^386 + x^382 + x^379 + x^378 + x^377 + x^376 + x^374 + x^373 + x^371 + x^370 + x^368 + x^367 + x^365 + x^364 + x^363 + x^362 + x^360 + x^358 + x^351 + x^350 + x^344 + x^343 + x^341 + x^340 + x^339 + x^338 + x^337 + x^332 + x^331 + x^329 + x^327 + x^323 + x^321 + x^320 + x^318 + x^317 + x^314 + x^313 + x^312 + x^311 + x^309 + x^308 + x^306 + x^304 + x^301 + x^300 + x^299 + x^296 + x^295 + x^294 + x^291 + x^290 + x^287 + x^286 + x^285 + x^280 + x^275 + x^274 + x^271 + x^270 + x^268 + x^264 + x^263 + x^258 + x^257 + x^256 + x^254 + x^252 + x^249 + x^248 + x^246 + x^245 + x^242 + x^241 + x^239 + x^238 + x^236 + x^233 + x^231 + x^228 + x^226 + x^225 + x^222 + x^219 + x^218 + x^217 + x^216 + x^215 + x^213 + x^210 + x^209 + x^207 + x^205 + x^203 + x^202 + x^198 + x^197 + x^196 + x^193 + x^192 + x^189 + x^188 + x^187 + x^184 + x^183 + x^182 + x^181 + x^179 + x^178 + x^177 + x^175 + x^172 + x^171 + x^170 + x^169 + x^164 + x^162 + x^161 + x^160 + x^159 + x^155 + x^154 + x^152 + x^151 + x^148 + x^147 + x^143 + x^140 + x^139 + x^137 + x^134 + x^133 + x^132 + x^131 + x^126 + x^125 + x^120 + x^119 + x^118 + x^117 + x^113 + x^111 + x^110 + x^108 + x^104 + x^102 + x^101 + x^100 + x^97 + x^96 + x^90 + x^89 + x^85 + x^82 + x^81 + x^77 + x^76 + x^73 + x^69 + x^68 + x^67 + x^65 + x^64 + x^63 + x^62 + x^61 + x^55 + x^54 + x^53 + x^52 + x^49 + x^47 + x^46 + x^40 + x^39 + x^37 + x^36 + x^35 + x^34 + x^33 + x^32 + x^31 + x^29 + x^26 + x^25 + x^24 + x^23 + x^22 + x^19 + x^17 + x^16 + x^12 + x^9 + x^8 + x^5 + 1
+
+39-32-32	401	x^928 + x^898 + x^870 + x^867 + x^842 + x^837 + x^836 + x^832 + x^807 + x^806 + x^805 + x^802 + x^801 + x^780 + x^778 + x^775 + x^773 + x^771 + x^770 + x^768 + x^766 + x^758 + x^752 + x^749 + x^747 + x^740 + x^730 + x^724 + x^721 + x^719 + x^717 + x^716 + x^715 + x^714 + x^713 + x^711 + x^709 + x^708 + x^707 + x^704 + x^702 + x^700 + x^696 + x^693 + x^691 + x^689 + x^687 + x^686 + x^685 + x^683 + x^682 + x^680 + x^679 + x^677 + x^676 + x^674 + x^670 + x^669 + x^668 + x^665 + x^663 + x^661 + x^660 + x^659 + x^655 + x^653 + x^652 + x^651 + x^648 + x^647 + x^646 + x^645 + x^644 + x^642 + x^641 + x^640 + x^639 + x^638 + x^637 + x^635 + x^634 + x^633 + x^632 + x^631 + x^630 + x^625 + x^624 + x^620 + x^618 + x^615 + x^613 + x^611 + x^606 + x^605 + x^604 + x^602 + x^599 + x^597 + x^596 + x^593 + x^592 + x^591 + x^590 + x^589 + x^585 + x^584 + x^583 + x^580 + x^578 + x^577 + x^576 + x^575 + x^574 + x^572 + x^571 + x^570 + x^568 + x^567 + x^566 + x^563 + x^562 + x^560 + x^556 + x^554 + x^552 + x^549 + x^548 + x^547 + x^546 + x^544 + x^538 + x^536 + x^535 + x^534 + x^533 + x^530 + x^529 + x^528 + x^527 + x^526 + x^525 + x^524 + x^521 + x^519 + x^517 + x^516 + x^514 + x^513 + x^512 + x^510 + x^509 + x^507 + x^506 + x^504 + x^502 + x^500 + x^499 + x^498 + x^497 + x^493 + x^492 + x^490 + x^489 + x^485 + x^484 + x^481 + x^476 + x^475 + x^473 + x^467 + x^463 + x^462 + x^461 + x^459 + x^456 + x^453 + x^450 + x^449 + x^448 + x^445 + x^443 + x^442 + x^440 + x^438 + x^436 + x^433 + x^432 + x^431 + x^430 + x^429 + x^427 + x^421 + x^420 + x^419 + x^416 + x^415 + x^414 + x^413 + x^411 + x^410 + x^408 + x^407 + x^406 + x^405 + x^403 + x^400 + x^398 + x^397 + x^396 + x^394 + x^390 + x^389 + x^388 + x^385 + x^384 + x^383 + x^379 + x^376 + x^374 + x^373 + x^372 + x^370 + x^369 + x^368 + x^364 + x^362 + x^358 + x^355 + x^354 + x^353 + x^351 + x^348 + x^347 + x^344 + x^343 + x^339 + x^337 + x^336 + x^334 + x^333 + x^329 + x^328 + x^323 + x^321 + x^320 + x^319 + x^318 + x^317 + x^315 + x^314 + x^311 + x^309 + x^307 + x^306 + x^304 + x^302 + x^300 + x^297 + x^295 + x^294 + x^291 + x^289 + x^287 + x^285 + x^284 + x^283 + x^282 + x^281 + x^280 + x^278 + x^277 + x^276 + x^270 + x^269 + x^268 + x^267 + x^263 + x^261 + x^259 + x^257 + x^255 + x^253 + x^252 + x^250 + x^248 + x^247 + x^245 + x^244 + x^242 + x^241 + x^240 + x^238 + x^234 + x^233 + x^230 + x^227 + x^226 + x^224 + x^220 + x^219 + x^217 + x^216 + x^215 + x^209 + x^208 + x^207 + x^206 + x^205 + x^204 + x^203 + x^201 + x^199 + x^198 + x^197 + x^196 + x^193 + x^191 + x^187 + x^184 + x^183 + x^182 + x^173 + x^172 + x^169 + x^167 + x^166 + x^165 + x^162 + x^161 + x^160 + x^158 + x^157 + x^156 + x^155 + x^154 + x^152 + x^151 + x^149 + x^147 + x^141 + x^138 + x^137 + x^136 + x^135 + x^134 + x^131 + x^129 + x^126 + x^125 + x^122 + x^121 + x^117 + x^116 + x^113 + x^110 + x^109 + x^108 + x^104 + x^102 + x^101 + x^100 + x^98 + x^97 + x^95 + x^94 + x^87 + x^83 + x^82 + x^78 + x^77 + x^74 + x^73 + x^72 + x^70 + x^69 + x^66 + x^65 + x^62 + x^60 + x^55 + x^54 + x^52 + x^51 + x^49 + x^46 + x^45 + x^41 + x^40 + x^37 + x^33 + x^31 + x^29 + x^27 + x^26 + x^24 + x^20 + x^18 + x^17 + x^15 + x^6 + 1
+
+40-7-11	401	x^928 + x^898 + x^897 + x^882 + x^870 + x^866 + x^860 + x^854 + x^852 + x^851 + x^836 + x^832 + x^830 + x^829 + x^826 + x^824 + x^820 + x^814 + x^812 + x^811 + x^808 + x^806 + x^804 + x^800 + x^796 + x^793 + x^792 + x^790 + x^786 + x^780 + x^778 + x^777 + x^774 + x^770 + x^769 + x^767 + x^762 + x^761 + x^760 + x^756 + x^749 + x^748 + x^746 + x^742 + x^736 + x^733 + x^730 + x^728 + x^726 + x^725 + x^724 + x^723 + x^719 + x^718 + x^717 + x^716 + x^715 + x^712 + x^709 + x^708 + x^707 + x^705 + x^701 + x^700 + x^699 + x^698 + x^695 + x^689 + x^688 + x^687 + x^684 + x^683 + x^680 + x^678 + x^675 + x^672 + x^670 + x^669 + x^666 + x^664 + x^663 + x^656 + x^655 + x^654 + x^651 + x^647 + x^641 + x^639 + x^638 + x^636 + x^635 + x^633 + x^632 + x^631 + x^630 + x^629 + x^627 + x^626 + x^625 + x^623 + x^621 + x^620 + x^619 + x^617 + x^613 + x^611 + x^610 + x^609 + x^608 + x^607 + x^606 + x^604 + x^603 + x^600 + x^598 + x^596 + x^595 + x^592 + x^591 + x^590 + x^587 + x^586 + x^585 + x^584 + x^582 + x^581 + x^578 + x^577 + x^576 + x^575 + x^574 + x^569 + x^566 + x^565 + x^564 + x^560 + x^558 + x^557 + x^556 + x^554 + x^552 + x^550 + x^549 + x^548 + x^545 + x^539 + x^538 + x^536 + x^535 + x^534 + x^533 + x^532 + x^527 + x^524 + x^523 + x^522 + x^520 + x^518 + x^517 + x^514 + x^513 + x^512 + x^510 + x^507 + x^504 + x^501 + x^499 + x^497 + x^496 + x^494 + x^492 + x^491 + x^490 + x^489 + x^487 + x^485 + x^483 + x^479 + x^478 + x^477 + x^476 + x^475 + x^473 + x^472 + x^470 + x^469 + x^468 + x^465 + x^464 + x^462 + x^460 + x^457 + x^452 + x^449 + x^448 + x^447 + x^445 + x^443 + x^441 + x^440 + x^436 + x^434 + x^432 + x^430 + x^428 + x^426 + x^424 + x^420 + x^416 + x^415 + x^410 + x^408 + x^407 + x^406 + x^404 + x^397 + x^395 + x^394 + x^390 + x^389 + x^387 + x^384 + x^382 + x^380 + x^374 + x^370 + x^368 + x^366 + x^365 + x^364 + x^362 + x^360 + x^359 + x^358 + x^356 + x^352 + x^350 + x^349 + x^347 + x^346 + x^344 + x^342 + x^341 + x^337 + x^336 + x^332 + x^331 + x^327 + x^325 + x^323 + x^322 + x^320 + x^317 + x^316 + x^315 + x^314 + x^312 + x^309 + x^307 + x^306 + x^305 + x^304 + x^303 + x^301 + x^300 + x^298 + x^296 + x^294 + x^293 + x^290 + x^289 + x^287 + x^285 + x^282 + x^281 + x^279 + x^277 + x^273 + x^265 + x^264 + x^259 + x^258 + x^257 + x^255 + x^254 + x^253 + x^251 + x^250 + x^249 + x^248 + x^247 + x^246 + x^244 + x^237 + x^235 + x^233 + x^232 + x^231 + x^230 + x^229 + x^228 + x^227 + x^225 + x^221 + x^215 + x^214 + x^211 + x^208 + x^206 + x^204 + x^200 + x^199 + x^198 + x^196 + x^192 + x^188 + x^186 + x^185 + x^184 + x^183 + x^181 + x^179 + x^176 + x^175 + x^173 + x^171 + x^170 + x^168 + x^165 + x^164 + x^160 + x^158 + x^155 + x^154 + x^152 + x^151 + x^149 + x^147 + x^144 + x^141 + x^140 + x^139 + x^137 + x^136 + x^133 + x^131 + x^130 + x^128 + x^127 + x^126 + x^125 + x^123 + x^122 + x^121 + x^120 + x^119 + x^117 + x^116 + x^115 + x^112 + x^109 + x^106 + x^102 + x^101 + x^98 + x^92 + x^89 + x^87 + x^86 + x^81 + x^74 + x^72 + x^71 + x^69 + x^65 + x^61 + x^57 + x^55 + x^53 + x^51 + x^50 + x^47 + x^45 + x^44 + x^43 + x^42 + x^40 + x^39 + x^38 + x^37 + x^35 + x^31 + x^30 + x^29 + x^27 + x^24 + x^22 + x^21 + x^20 + x^19 + 1
+
+44-24-27	401	x^928 + x^898 + x^870 + x^858 + x^824 + x^821 + x^820 + x^798 + x^792 + x^791 + x^790 + x^789 + x^784 + x^776 + x^771 + x^770 + x^768 + x^764 + x^762 + x^761 + x^760 + x^759 + x^755 + x^754 + x^751 + x^742 + x^738 + x^735 + x^734 + x^731 + x^730 + x^729 + x^728 + x^725 + x^722 + x^721 + x^715 + x^711 + x^710 + x^706 + x^705 + x^701 + x^700 + x^698 + x^695 + x^692 + x^691 + x^689 + x^686 + x^685 + x^681 + x^676 + x^675 + x^674 + x^672 + x^671 + x^669 + x^668 + x^667 + x^666 + x^665 + x^658 + x^656 + x^654 + x^653 + x^651 + x^650 + x^648 + x^646 + x^644 + x^642 + x^635 + x^634 + x^633 + x^629 + x^626 + x^625 + x^624 + x^622 + x^621 + x^620 + x^618 + x^616 + x^614 + x^612 + x^608 + x^607 + x^606 + x^605 + x^604 + x^603 + x^602 + x^594 + x^593 + x^590 + x^589 + x^588 + x^586 + x^585 + x^584 + x^583 + x^582 + x^580 + x^577 + x^576 + x^575 + x^574 + x^569 + x^568 + x^566 + x^565 + x^564 + x^561 + x^559 + x^556 + x^554 + x^553 + x^552 + x^547 + x^543 + x^542 + x^541 + x^540 + x^539 + x^538 + x^536 + x^535 + x^534 + x^531 + x^530 + x^529 + x^527 + x^526 + x^524 + x^519 + x^514 + x^512 + x^511 + x^507 + x^504 + x^503 + x^502 + x^499 + x^498 + x^494 + x^493 + x^491 + x^489 + x^488 + x^486 + x^485 + x^483 + x^482 + x^480 + x^478 + x^476 + x^473 + x^468 + x^465 + x^463 + x^461 + x^460 + x^459 + x^458 + x^457 + x^455 + x^454 + x^453 + x^452 + x^451 + x^450 + x^449 + x^447 + x^446 + x^445 + x^443 + x^442 + x^439 + x^437 + x^436 + x^435 + x^433 + x^432 + x^429 + x^424 + x^423 + x^421 + x^418 + x^416 + x^412 + x^411 + x^406 + x^404 + x^403 + x^401 + x^400 + x^399 + x^398 + x^397 + x^394 + x^390 + x^388 + x^384 + x^383 + x^382 + x^381 + x^380 + x^378 + x^377 + x^376 + x^374 + x^373 + x^372 + x^368 + x^367 + x^366 + x^363 + x^361 + x^360 + x^359 + x^355 + x^353 + x^351 + x^350 + x^349 + x^348 + x^347 + x^345 + x^344 + x^342 + x^341 + x^340 + x^338 + x^337 + x^334 + x^329 + x^328 + x^326 + x^325 + x^319 + x^316 + x^314 + x^312 + x^311 + x^310 + x^308 + x^307 + x^305 + x^300 + x^296 + x^292 + x^291 + x^290 + x^287 + x^286 + x^284 + x^282 + x^280 + x^279 + x^277 + x^275 + x^274 + x^273 + x^272 + x^269 + x^268 + x^265 + x^264 + x^263 + x^262 + x^261 + x^258 + x^257 + x^256 + x^255 + x^254 + x^253 + x^252 + x^250 + x^249 + x^244 + x^242 + x^239 + x^238 + x^237 + x^235 + x^234 + x^232 + x^231 + x^228 + x^226 + x^225 + x^224 + x^221 + x^220 + x^219 + x^218 + x^216 + x^214 + x^213 + x^211 + x^210 + x^207 + x^205 + x^204 + x^203 + x^202 + x^200 + x^199 + x^198 + x^194 + x^186 + x^185 + x^184 + x^183 + x^182 + x^180 + x^179 + x^177 + x^174 + x^171 + x^169 + x^168 + x^165 + x^164 + x^163 + x^161 + x^159 + x^158 + x^157 + x^154 + x^152 + x^151 + x^148 + x^146 + x^145 + x^144 + x^142 + x^141 + x^139 + x^136 + x^135 + x^134 + x^132 + x^131 + x^130 + x^129 + x^128 + x^127 + x^124 + x^123 + x^120 + x^119 + x^117 + x^116 + x^114 + x^112 + x^106 + x^103 + x^101 + x^100 + x^98 + x^94 + x^93 + x^91 + x^86 + x^83 + x^82 + x^78 + x^76 + x^74 + x^73 + x^71 + x^69 + x^66 + x^65 + x^61 + x^60 + x^59 + x^58 + x^57 + x^56 + x^55 + x^54 + x^47 + x^45 + x^44 + x^43 + x^42 + x^40 + x^39 + x^38 + x^34 + x^31 + x^29 + x^28 + x^19 + x^16 + x^12 + x^6 + 1
+
+10-49-23	403	x^928 + x^900 + x^898 + x^893 + x^872 + x^870 + x^865 + x^858 + x^842 + x^840 + x^835 + x^833 + x^826 + x^823 + x^821 + x^816 + x^814 + x^809 + x^808 + x^807 + x^805 + x^802 + x^796 + x^793 + x^782 + x^780 + x^778 + x^775 + x^772 + x^770 + x^767 + x^766 + x^765 + x^760 + x^758 + x^756 + x^754 + x^753 + x^751 + x^747 + x^744 + x^740 + x^739 + x^738 + x^736 + x^735 + x^732 + x^728 + x^724 + x^723 + x^722 + x^720 + x^718 + x^717 + x^714 + x^712 + x^709 + x^708 + x^707 + x^706 + x^705 + x^702 + x^701 + x^700 + x^698 + x^697 + x^696 + x^694 + x^693 + x^691 + x^689 + x^688 + x^684 + x^682 + x^681 + x^680 + x^679 + x^677 + x^676 + x^674 + x^673 + x^672 + x^670 + x^668 + x^667 + x^666 + x^664 + x^661 + x^658 + x^657 + x^655 + x^652 + x^649 + x^646 + x^645 + x^643 + x^641 + x^640 + x^639 + x^638 + x^636 + x^635 + x^634 + x^632 + x^631 + x^628 + x^623 + x^622 + x^620 + x^619 + x^615 + x^612 + x^610 + x^607 + x^604 + x^602 + x^599 + x^598 + x^596 + x^593 + x^590 + x^588 + x^587 + x^585 + x^582 + x^581 + x^578 + x^576 + x^575 + x^573 + x^571 + x^570 + x^569 + x^568 + x^567 + x^565 + x^564 + x^563 + x^559 + x^557 + x^556 + x^552 + x^550 + x^549 + x^548 + x^546 + x^545 + x^543 + x^537 + x^536 + x^535 + x^534 + x^533 + x^532 + x^529 + x^526 + x^525 + x^523 + x^521 + x^520 + x^518 + x^515 + x^513 + x^512 + x^511 + x^508 + x^503 + x^502 + x^499 + x^498 + x^495 + x^494 + x^493 + x^492 + x^491 + x^480 + x^479 + x^475 + x^474 + x^472 + x^470 + x^469 + x^466 + x^465 + x^460 + x^453 + x^452 + x^451 + x^447 + x^444 + x^443 + x^438 + x^436 + x^431 + x^428 + x^426 + x^424 + x^423 + x^421 + x^420 + x^418 + x^417 + x^414 + x^413 + x^411 + x^410 + x^404 + x^401 + x^396 + x^395 + x^390 + x^389 + x^386 + x^384 + x^380 + x^378 + x^377 + x^376 + x^373 + x^372 + x^371 + x^369 + x^364 + x^361 + x^360 + x^359 + x^357 + x^356 + x^354 + x^353 + x^348 + x^347 + x^346 + x^342 + x^341 + x^339 + x^338 + x^333 + x^332 + x^331 + x^329 + x^328 + x^324 + x^322 + x^320 + x^315 + x^314 + x^312 + x^311 + x^310 + x^307 + x^306 + x^303 + x^295 + x^294 + x^292 + x^289 + x^288 + x^283 + x^281 + x^279 + x^274 + x^272 + x^271 + x^270 + x^268 + x^267 + x^266 + x^265 + x^264 + x^261 + x^258 + x^257 + x^256 + x^255 + x^252 + x^251 + x^248 + x^245 + x^243 + x^242 + x^238 + x^237 + x^236 + x^235 + x^233 + x^232 + x^231 + x^229 + x^228 + x^226 + x^225 + x^224 + x^222 + x^221 + x^220 + x^216 + x^215 + x^213 + x^212 + x^210 + x^209 + x^208 + x^202 + x^200 + x^199 + x^197 + x^194 + x^193 + x^192 + x^191 + x^190 + x^189 + x^187 + x^186 + x^184 + x^183 + x^181 + x^179 + x^178 + x^177 + x^176 + x^174 + x^173 + x^172 + x^171 + x^169 + x^166 + x^164 + x^163 + x^160 + x^158 + x^157 + x^155 + x^152 + x^151 + x^150 + x^148 + x^146 + x^145 + x^143 + x^142 + x^137 + x^133 + x^129 + x^126 + x^118 + x^116 + x^114 + x^113 + x^112 + x^110 + x^106 + x^102 + x^99 + x^98 + x^97 + x^96 + x^92 + x^91 + x^88 + x^86 + x^85 + x^83 + x^82 + x^81 + x^79 + x^78 + x^77 + x^76 + x^73 + x^71 + x^67 + x^66 + x^65 + x^64 + x^63 + x^61 + x^60 + x^58 + x^53 + x^52 + x^51 + x^48 + x^47 + x^44 + x^43 + x^42 + x^41 + x^39 + x^37 + x^36 + x^35 + x^34 + x^33 + x^31 + x^26 + x^21 + x^20 + x^16 + x^10 + x^5 + 1
+
+16-2-49	403	x^928 + x^898 + x^870 + x^858 + x^855 + x^846 + x^831 + x^828 + x^822 + x^818 + x^808 + x^800 + x^798 + x^795 + x^788 + x^786 + x^784 + x^783 + x^776 + x^775 + x^770 + x^768 + x^764 + x^759 + x^753 + x^751 + x^750 + x^746 + x^743 + x^740 + x^736 + x^735 + x^734 + x^724 + x^723 + x^719 + x^712 + x^708 + x^706 + x^703 + x^699 + x^698 + x^696 + x^695 + x^694 + x^693 + x^691 + x^690 + x^688 + x^686 + x^684 + x^683 + x^676 + x^675 + x^673 + x^672 + x^671 + x^670 + x^668 + x^664 + x^663 + x^662 + x^660 + x^655 + x^654 + x^652 + x^649 + x^644 + x^642 + x^636 + x^634 + x^633 + x^623 + x^622 + x^620 + x^619 + x^616 + x^614 + x^613 + x^611 + x^609 + x^608 + x^606 + x^604 + x^603 + x^602 + x^601 + x^600 + x^599 + x^598 + x^596 + x^595 + x^594 + x^592 + x^591 + x^588 + x^586 + x^585 + x^584 + x^583 + x^579 + x^578 + x^577 + x^576 + x^575 + x^574 + x^572 + x^569 + x^562 + x^560 + x^555 + x^553 + x^550 + x^549 + x^548 + x^547 + x^546 + x^545 + x^544 + x^543 + x^542 + x^538 + x^536 + x^533 + x^532 + x^531 + x^530 + x^529 + x^528 + x^527 + x^526 + x^523 + x^518 + x^516 + x^515 + x^511 + x^509 + x^507 + x^503 + x^501 + x^500 + x^498 + x^497 + x^496 + x^494 + x^491 + x^490 + x^487 + x^485 + x^484 + x^483 + x^482 + x^478 + x^477 + x^475 + x^474 + x^472 + x^470 + x^468 + x^467 + x^466 + x^465 + x^464 + x^462 + x^461 + x^460 + x^458 + x^457 + x^456 + x^455 + x^454 + x^453 + x^448 + x^446 + x^444 + x^443 + x^442 + x^441 + x^440 + x^437 + x^436 + x^435 + x^434 + x^433 + x^432 + x^431 + x^430 + x^429 + x^428 + x^427 + x^426 + x^425 + x^422 + x^421 + x^420 + x^419 + x^417 + x^414 + x^413 + x^411 + x^410 + x^406 + x^405 + x^400 + x^399 + x^397 + x^395 + x^394 + x^393 + x^392 + x^391 + x^389 + x^387 + x^382 + x^380 + x^379 + x^377 + x^375 + x^371 + x^370 + x^366 + x^365 + x^364 + x^363 + x^362 + x^358 + x^356 + x^354 + x^353 + x^351 + x^348 + x^346 + x^344 + x^343 + x^342 + x^340 + x^339 + x^337 + x^334 + x^333 + x^332 + x^331 + x^328 + x^327 + x^326 + x^325 + x^324 + x^323 + x^322 + x^321 + x^320 + x^318 + x^317 + x^316 + x^315 + x^314 + x^312 + x^310 + x^306 + x^304 + x^303 + x^301 + x^297 + x^295 + x^293 + x^290 + x^285 + x^283 + x^282 + x^273 + x^271 + x^268 + x^266 + x^262 + x^260 + x^259 + x^258 + x^253 + x^252 + x^251 + x^249 + x^248 + x^246 + x^245 + x^244 + x^243 + x^242 + x^241 + x^240 + x^239 + x^238 + x^237 + x^234 + x^233 + x^231 + x^229 + x^228 + x^227 + x^223 + x^222 + x^217 + x^216 + x^214 + x^213 + x^211 + x^209 + x^208 + x^203 + x^202 + x^201 + x^198 + x^197 + x^196 + x^194 + x^193 + x^189 + x^188 + x^187 + x^183 + x^182 + x^181 + x^177 + x^176 + x^174 + x^170 + x^166 + x^163 + x^162 + x^161 + x^160 + x^158 + x^157 + x^155 + x^153 + x^152 + x^151 + x^149 + x^148 + x^147 + x^146 + x^144 + x^142 + x^141 + x^140 + x^138 + x^132 + x^131 + x^129 + x^128 + x^126 + x^125 + x^123 + x^122 + x^120 + x^119 + x^117 + x^116 + x^115 + x^112 + x^109 + x^107 + x^105 + x^101 + x^97 + x^95 + x^94 + x^92 + x^91 + x^90 + x^87 + x^86 + x^85 + x^83 + x^82 + x^81 + x^79 + x^78 + x^77 + x^73 + x^72 + x^71 + x^68 + x^67 + x^65 + x^64 + x^63 + x^60 + x^58 + x^54 + x^50 + x^45 + x^44 + x^43 + x^42 + x^39 + x^37 + x^26 + x^24 + x^20 + x^16 + x^14 + x^10 + 1
+
+17-2-46	405	x^928 + x^898 + x^870 + x^860 + x^848 + x^831 + x^830 + x^818 + x^812 + x^808 + x^804 + x^801 + x^800 + x^792 + x^791 + x^790 + x^784 + x^780 + x^778 + x^775 + x^774 + x^770 + x^763 + x^762 + x^761 + x^760 + x^756 + x^754 + x^750 + x^748 + x^746 + x^745 + x^736 + x^733 + x^732 + x^731 + x^729 + x^728 + x^726 + x^720 + x^719 + x^712 + x^710 + x^706 + x^703 + x^702 + x^701 + x^700 + x^690 + x^686 + x^682 + x^679 + x^676 + x^675 + x^673 + x^672 + x^671 + x^669 + x^668 + x^666 + x^664 + x^663 + x^658 + x^652 + x^651 + x^648 + x^647 + x^646 + x^645 + x^644 + x^643 + x^642 + x^638 + x^633 + x^628 + x^626 + x^624 + x^623 + x^621 + x^617 + x^616 + x^614 + x^613 + x^611 + x^610 + x^609 + x^607 + x^606 + x^604 + x^599 + x^595 + x^594 + x^593 + x^592 + x^590 + x^589 + x^588 + x^584 + x^580 + x^579 + x^578 + x^577 + x^576 + x^574 + x^573 + x^569 + x^568 + x^567 + x^566 + x^564 + x^563 + x^561 + x^560 + x^559 + x^558 + x^557 + x^555 + x^549 + x^548 + x^547 + x^544 + x^543 + x^542 + x^540 + x^535 + x^534 + x^532 + x^531 + x^530 + x^528 + x^527 + x^526 + x^525 + x^520 + x^519 + x^516 + x^513 + x^510 + x^509 + x^500 + x^499 + x^498 + x^497 + x^496 + x^493 + x^492 + x^490 + x^489 + x^487 + x^484 + x^482 + x^480 + x^479 + x^476 + x^473 + x^471 + x^470 + x^468 + x^467 + x^465 + x^464 + x^463 + x^462 + x^461 + x^460 + x^457 + x^453 + x^452 + x^450 + x^448 + x^447 + x^443 + x^440 + x^439 + x^438 + x^437 + x^431 + x^430 + x^429 + x^428 + x^427 + x^426 + x^424 + x^423 + x^420 + x^418 + x^416 + x^415 + x^408 + x^407 + x^406 + x^405 + x^404 + x^403 + x^397 + x^395 + x^391 + x^389 + x^388 + x^386 + x^384 + x^382 + x^381 + x^380 + x^379 + x^378 + x^375 + x^374 + x^373 + x^372 + x^371 + x^369 + x^368 + x^365 + x^364 + x^363 + x^362 + x^360 + x^359 + x^358 + x^357 + x^353 + x^351 + x^350 + x^345 + x^341 + x^338 + x^336 + x^335 + x^334 + x^332 + x^331 + x^329 + x^328 + x^327 + x^323 + x^321 + x^320 + x^319 + x^317 + x^316 + x^314 + x^313 + x^312 + x^310 + x^308 + x^307 + x^304 + x^303 + x^300 + x^297 + x^295 + x^293 + x^291 + x^289 + x^288 + x^287 + x^285 + x^284 + x^282 + x^280 + x^279 + x^277 + x^273 + x^272 + x^269 + x^268 + x^267 + x^266 + x^265 + x^264 + x^262 + x^260 + x^259 + x^256 + x^255 + x^254 + x^253 + x^249 + x^247 + x^245 + x^243 + x^241 + x^240 + x^239 + x^238 + x^237 + x^236 + x^235 + x^234 + x^232 + x^228 + x^226 + x^225 + x^224 + x^223 + x^220 + x^219 + x^217 + x^209 + x^207 + x^206 + x^204 + x^203 + x^202 + x^201 + x^200 + x^199 + x^195 + x^194 + x^189 + x^187 + x^186 + x^185 + x^184 + x^182 + x^180 + x^178 + x^174 + x^173 + x^172 + x^170 + x^167 + x^166 + x^165 + x^164 + x^162 + x^161 + x^160 + x^159 + x^158 + x^157 + x^156 + x^155 + x^154 + x^153 + x^152 + x^151 + x^147 + x^143 + x^141 + x^138 + x^131 + x^130 + x^129 + x^127 + x^122 + x^121 + x^120 + x^118 + x^117 + x^114 + x^111 + x^109 + x^106 + x^105 + x^104 + x^103 + x^102 + x^101 + x^100 + x^99 + x^98 + x^97 + x^93 + x^92 + x^91 + x^90 + x^88 + x^87 + x^86 + x^82 + x^81 + x^80 + x^79 + x^78 + x^77 + x^75 + x^74 + x^73 + x^72 + x^71 + x^68 + x^59 + x^58 + x^51 + x^50 + x^43 + x^42 + x^40 + x^39 + x^34 + x^27 + x^25 + x^24 + x^23 + x^19 + x^18 + x^17 + x^15 + x^14 + x^13 + x^11 + x^10 + 1
+
+55-23-24	407	x^928 + x^898 + x^894 + x^870 + x^865 + x^849 + x^846 + x^842 + x^834 + x^833 + x^830 + x^826 + x^820 + x^819 + x^816 + x^813 + x^808 + x^804 + x^803 + x^794 + x^782 + x^778 + x^772 + x^769 + x^767 + x^765 + x^764 + x^762 + x^760 + x^759 + x^756 + x^751 + x^745 + x^743 + x^740 + x^739 + x^737 + x^733 + x^730 + x^729 + x^728 + x^726 + x^722 + x^720 + x^718 + x^717 + x^716 + x^713 + x^710 + x^709 + x^708 + x^707 + x^702 + x^699 + x^697 + x^694 + x^692 + x^691 + x^688 + x^687 + x^682 + x^680 + x^679 + x^678 + x^676 + x^675 + x^674 + x^670 + x^668 + x^666 + x^662 + x^661 + x^657 + x^652 + x^651 + x^649 + x^647 + x^646 + x^643 + x^640 + x^639 + x^637 + x^635 + x^634 + x^633 + x^630 + x^618 + x^616 + x^614 + x^613 + x^611 + x^610 + x^609 + x^608 + x^604 + x^603 + x^602 + x^597 + x^593 + x^591 + x^590 + x^585 + x^582 + x^579 + x^575 + x^574 + x^573 + x^572 + x^569 + x^567 + x^566 + x^564 + x^562 + x^561 + x^560 + x^557 + x^556 + x^555 + x^554 + x^551 + x^550 + x^547 + x^545 + x^542 + x^541 + x^539 + x^537 + x^534 + x^531 + x^530 + x^529 + x^528 + x^526 + x^525 + x^523 + x^522 + x^521 + x^520 + x^519 + x^518 + x^517 + x^515 + x^514 + x^513 + x^511 + x^510 + x^509 + x^508 + x^506 + x^505 + x^500 + x^498 + x^492 + x^485 + x^484 + x^480 + x^479 + x^478 + x^477 + x^476 + x^471 + x^470 + x^469 + x^467 + x^465 + x^464 + x^462 + x^458 + x^457 + x^454 + x^453 + x^452 + x^451 + x^450 + x^445 + x^444 + x^443 + x^441 + x^439 + x^437 + x^436 + x^435 + x^433 + x^431 + x^430 + x^429 + x^425 + x^424 + x^421 + x^419 + x^414 + x^411 + x^410 + x^409 + x^408 + x^407 + x^406 + x^405 + x^396 + x^395 + x^394 + x^390 + x^388 + x^385 + x^383 + x^381 + x^379 + x^378 + x^377 + x^376 + x^375 + x^373 + x^371 + x^369 + x^368 + x^367 + x^360 + x^358 + x^353 + x^351 + x^350 + x^348 + x^347 + x^346 + x^344 + x^343 + x^341 + x^338 + x^336 + x^335 + x^334 + x^331 + x^330 + x^329 + x^327 + x^326 + x^324 + x^322 + x^318 + x^314 + x^313 + x^311 + x^307 + x^305 + x^304 + x^302 + x^299 + x^295 + x^294 + x^293 + x^289 + x^284 + x^282 + x^281 + x^277 + x^272 + x^271 + x^270 + x^268 + x^265 + x^262 + x^259 + x^257 + x^254 + x^252 + x^251 + x^250 + x^249 + x^244 + x^243 + x^240 + x^239 + x^237 + x^235 + x^234 + x^233 + x^231 + x^230 + x^227 + x^224 + x^223 + x^220 + x^219 + x^218 + x^217 + x^215 + x^214 + x^213 + x^212 + x^211 + x^210 + x^209 + x^208 + x^207 + x^205 + x^203 + x^201 + x^200 + x^197 + x^193 + x^190 + x^187 + x^185 + x^184 + x^181 + x^180 + x^179 + x^178 + x^177 + x^176 + x^175 + x^173 + x^172 + x^169 + x^168 + x^166 + x^165 + x^162 + x^159 + x^157 + x^156 + x^155 + x^154 + x^153 + x^152 + x^150 + x^146 + x^145 + x^143 + x^142 + x^141 + x^139 + x^138 + x^137 + x^136 + x^135 + x^134 + x^132 + x^129 + x^123 + x^119 + x^115 + x^114 + x^112 + x^108 + x^107 + x^102 + x^100 + x^98 + x^97 + x^95 + x^93 + x^91 + x^90 + x^87 + x^86 + x^85 + x^83 + x^80 + x^79 + x^78 + x^77 + x^75 + x^74 + x^72 + x^69 + x^68 + x^65 + x^64 + x^61 + x^60 + x^59 + x^58 + x^57 + x^56 + x^55 + x^52 + x^51 + x^50 + x^45 + x^44 + x^43 + x^42 + x^41 + x^40 + x^39 + x^38 + x^37 + x^34 + x^33 + x^31 + x^30 + x^29 + x^26 + x^25 + x^23 + x^21 + x^20 + x^19 + x^18 + x^17 + x^13 + x^12 + x^10 + x^8 + x^7 + 1
+
+15-3-26	409	x^928 + x^898 + x^892 + x^870 + x^863 + x^862 + x^858 + x^856 + x^852 + x^833 + x^828 + x^827 + x^826 + x^824 + x^823 + x^820 + x^818 + x^816 + x^812 + x^808 + x^803 + x^801 + x^799 + x^798 + x^797 + x^795 + x^794 + x^792 + x^791 + x^790 + x^788 + x^787 + x^784 + x^783 + x^782 + x^773 + x^772 + x^771 + x^768 + x^767 + x^763 + x^760 + x^757 + x^753 + x^750 + x^746 + x^744 + x^737 + x^732 + x^731 + x^730 + x^729 + x^728 + x^726 + x^725 + x^724 + x^721 + x^717 + x^716 + x^713 + x^711 + x^710 + x^707 + x^706 + x^705 + x^703 + x^702 + x^699 + x^698 + x^697 + x^696 + x^694 + x^692 + x^691 + x^690 + x^689 + x^688 + x^681 + x^678 + x^673 + x^668 + x^666 + x^662 + x^658 + x^657 + x^656 + x^653 + x^651 + x^650 + x^648 + x^644 + x^643 + x^642 + x^641 + x^640 + x^638 + x^636 + x^635 + x^634 + x^633 + x^632 + x^630 + x^628 + x^626 + x^625 + x^623 + x^622 + x^620 + x^618 + x^617 + x^616 + x^614 + x^611 + x^609 + x^607 + x^605 + x^603 + x^596 + x^595 + x^593 + x^592 + x^590 + x^587 + x^586 + x^585 + x^584 + x^583 + x^582 + x^580 + x^577 + x^576 + x^571 + x^569 + x^568 + x^567 + x^565 + x^564 + x^562 + x^561 + x^560 + x^559 + x^558 + x^557 + x^556 + x^555 + x^554 + x^553 + x^552 + x^548 + x^547 + x^546 + x^545 + x^544 + x^542 + x^538 + x^537 + x^534 + x^533 + x^532 + x^529 + x^527 + x^526 + x^524 + x^523 + x^518 + x^517 + x^509 + x^505 + x^503 + x^501 + x^494 + x^493 + x^492 + x^488 + x^485 + x^484 + x^483 + x^480 + x^479 + x^477 + x^475 + x^474 + x^473 + x^472 + x^471 + x^469 + x^467 + x^466 + x^465 + x^464 + x^461 + x^458 + x^456 + x^453 + x^449 + x^446 + x^445 + x^444 + x^443 + x^442 + x^441 + x^440 + x^436 + x^435 + x^432 + x^431 + x^427 + x^426 + x^423 + x^418 + x^415 + x^413 + x^412 + x^411 + x^410 + x^407 + x^406 + x^403 + x^400 + x^398 + x^396 + x^385 + x^383 + x^382 + x^381 + x^375 + x^374 + x^373 + x^364 + x^363 + x^362 + x^360 + x^358 + x^357 + x^355 + x^353 + x^352 + x^350 + x^349 + x^345 + x^344 + x^343 + x^342 + x^340 + x^337 + x^331 + x^329 + x^328 + x^325 + x^324 + x^323 + x^322 + x^315 + x^314 + x^312 + x^311 + x^308 + x^304 + x^303 + x^299 + x^297 + x^295 + x^289 + x^284 + x^282 + x^281 + x^279 + x^278 + x^275 + x^274 + x^273 + x^272 + x^271 + x^270 + x^264 + x^263 + x^262 + x^260 + x^259 + x^258 + x^256 + x^253 + x^252 + x^251 + x^250 + x^248 + x^247 + x^246 + x^245 + x^243 + x^242 + x^240 + x^238 + x^237 + x^234 + x^233 + x^232 + x^231 + x^230 + x^228 + x^221 + x^220 + x^218 + x^213 + x^212 + x^211 + x^210 + x^204 + x^201 + x^200 + x^196 + x^195 + x^194 + x^191 + x^190 + x^189 + x^185 + x^183 + x^181 + x^180 + x^178 + x^176 + x^175 + x^170 + x^168 + x^167 + x^165 + x^164 + x^163 + x^160 + x^159 + x^158 + x^157 + x^156 + x^153 + x^151 + x^150 + x^149 + x^146 + x^145 + x^141 + x^139 + x^138 + x^137 + x^133 + x^132 + x^131 + x^130 + x^129 + x^128 + x^127 + x^125 + x^124 + x^122 + x^121 + x^120 + x^116 + x^115 + x^114 + x^112 + x^110 + x^106 + x^103 + x^101 + x^100 + x^97 + x^96 + x^94 + x^93 + x^92 + x^89 + x^88 + x^87 + x^86 + x^85 + x^84 + x^82 + x^80 + x^77 + x^73 + x^72 + x^71 + x^70 + x^68 + x^67 + x^65 + x^61 + x^60 + x^59 + x^56 + x^55 + x^48 + x^47 + x^42 + x^41 + x^36 + x^35 + x^33 + x^29 + x^27 + x^26 + x^25 + x^18 + x^14 + x^12 + x^10 + x^8 + x^4 + 1
+
+33-51-22	409	x^928 + x^898 + x^886 + x^870 + x^859 + x^858 + x^857 + x^844 + x^842 + x^832 + x^831 + x^830 + x^826 + x^815 + x^812 + x^808 + x^805 + x^804 + x^803 + x^799 + x^798 + x^789 + x^787 + x^786 + x^785 + x^782 + x^777 + x^776 + x^775 + x^771 + x^769 + x^766 + x^763 + x^758 + x^756 + x^752 + x^749 + x^745 + x^744 + x^743 + x^741 + x^739 + x^738 + x^735 + x^734 + x^731 + x^730 + x^721 + x^720 + x^715 + x^714 + x^711 + x^708 + x^705 + x^704 + x^703 + x^700 + x^698 + x^695 + x^693 + x^692 + x^690 + x^689 + x^684 + x^682 + x^681 + x^680 + x^677 + x^676 + x^673 + x^672 + x^671 + x^667 + x^666 + x^662 + x^661 + x^658 + x^656 + x^653 + x^652 + x^650 + x^649 + x^647 + x^646 + x^645 + x^644 + x^642 + x^641 + x^640 + x^638 + x^636 + x^634 + x^633 + x^632 + x^631 + x^629 + x^625 + x^624 + x^623 + x^621 + x^620 + x^619 + x^616 + x^615 + x^614 + x^612 + x^611 + x^609 + x^606 + x^605 + x^602 + x^601 + x^599 + x^596 + x^595 + x^592 + x^591 + x^588 + x^587 + x^586 + x^583 + x^582 + x^578 + x^577 + x^576 + x^574 + x^572 + x^570 + x^566 + x^562 + x^560 + x^555 + x^552 + x^550 + x^546 + x^545 + x^544 + x^543 + x^542 + x^539 + x^537 + x^535 + x^534 + x^533 + x^532 + x^531 + x^530 + x^528 + x^525 + x^524 + x^523 + x^519 + x^516 + x^513 + x^511 + x^509 + x^508 + x^507 + x^506 + x^504 + x^500 + x^499 + x^497 + x^495 + x^494 + x^491 + x^488 + x^487 + x^484 + x^480 + x^479 + x^476 + x^474 + x^472 + x^471 + x^470 + x^469 + x^468 + x^464 + x^463 + x^462 + x^460 + x^459 + x^458 + x^457 + x^456 + x^455 + x^454 + x^451 + x^449 + x^448 + x^447 + x^446 + x^445 + x^441 + x^440 + x^439 + x^437 + x^436 + x^435 + x^431 + x^430 + x^427 + x^423 + x^421 + x^419 + x^412 + x^410 + x^407 + x^406 + x^405 + x^404 + x^402 + x^400 + x^398 + x^396 + x^395 + x^394 + x^392 + x^389 + x^387 + x^386 + x^384 + x^382 + x^381 + x^379 + x^378 + x^377 + x^375 + x^372 + x^370 + x^369 + x^363 + x^361 + x^360 + x^351 + x^350 + x^347 + x^343 + x^342 + x^340 + x^336 + x^328 + x^327 + x^326 + x^325 + x^323 + x^322 + x^321 + x^319 + x^318 + x^315 + x^314 + x^313 + x^312 + x^311 + x^308 + x^307 + x^305 + x^301 + x^299 + x^298 + x^295 + x^293 + x^292 + x^290 + x^289 + x^288 + x^286 + x^284 + x^283 + x^282 + x^280 + x^279 + x^275 + x^273 + x^272 + x^269 + x^266 + x^265 + x^264 + x^255 + x^251 + x^249 + x^248 + x^246 + x^244 + x^243 + x^242 + x^238 + x^237 + x^235 + x^234 + x^232 + x^230 + x^229 + x^228 + x^226 + x^224 + x^222 + x^221 + x^218 + x^213 + x^210 + x^209 + x^208 + x^206 + x^203 + x^200 + x^195 + x^193 + x^189 + x^187 + x^186 + x^185 + x^182 + x^181 + x^179 + x^177 + x^174 + x^173 + x^170 + x^163 + x^160 + x^159 + x^155 + x^154 + x^153 + x^152 + x^151 + x^147 + x^146 + x^143 + x^141 + x^133 + x^130 + x^128 + x^125 + x^123 + x^118 + x^116 + x^115 + x^114 + x^110 + x^108 + x^106 + x^105 + x^104 + x^102 + x^100 + x^98 + x^97 + x^96 + x^95 + x^94 + x^93 + x^92 + x^91 + x^89 + x^85 + x^84 + x^83 + x^82 + x^81 + x^80 + x^78 + x^77 + x^74 + x^72 + x^71 + x^69 + x^67 + x^65 + x^64 + x^63 + x^61 + x^58 + x^56 + x^55 + x^53 + x^52 + x^51 + x^50 + x^48 + x^47 + x^46 + x^45 + x^44 + x^43 + x^40 + x^39 + x^37 + x^36 + x^35 + x^33 + x^32 + x^30 + x^29 + x^28 + x^27 + x^25 + x^23 + x^21 + x^16 + x^13 + x^11 + x^10 + x^8 + 1
+
+23-25-12	411	x^928 + x^898 + x^873 + x^870 + x^852 + x^847 + x^844 + x^842 + x^838 + x^836 + x^831 + x^828 + x^822 + x^821 + x^818 + x^817 + x^816 + x^814 + x^813 + x^812 + x^811 + x^801 + x^800 + x^798 + x^797 + x^796 + x^792 + x^791 + x^790 + x^787 + x^780 + x^776 + x^774 + x^770 + x^768 + x^766 + x^765 + x^762 + x^761 + x^759 + x^758 + x^757 + x^756 + x^755 + x^752 + x^749 + x^748 + x^747 + x^744 + x^741 + x^740 + x^739 + x^737 + x^735 + x^731 + x^730 + x^729 + x^728 + x^726 + x^725 + x^722 + x^720 + x^718 + x^714 + x^712 + x^711 + x^709 + x^708 + x^707 + x^706 + x^705 + x^704 + x^698 + x^694 + x^693 + x^691 + x^689 + x^686 + x^685 + x^682 + x^676 + x^674 + x^670 + x^669 + x^668 + x^667 + x^666 + x^665 + x^662 + x^661 + x^658 + x^655 + x^653 + x^652 + x^650 + x^647 + x^644 + x^643 + x^640 + x^638 + x^637 + x^635 + x^634 + x^632 + x^629 + x^627 + x^626 + x^625 + x^624 + x^619 + x^618 + x^614 + x^612 + x^611 + x^606 + x^604 + x^602 + x^601 + x^595 + x^592 + x^591 + x^590 + x^589 + x^586 + x^585 + x^581 + x^579 + x^578 + x^575 + x^574 + x^573 + x^568 + x^567 + x^565 + x^564 + x^562 + x^560 + x^559 + x^558 + x^555 + x^554 + x^553 + x^552 + x^549 + x^548 + x^546 + x^544 + x^543 + x^542 + x^541 + x^538 + x^533 + x^532 + x^529 + x^527 + x^526 + x^523 + x^522 + x^521 + x^517 + x^511 + x^508 + x^507 + x^506 + x^505 + x^504 + x^502 + x^497 + x^496 + x^494 + x^490 + x^489 + x^486 + x^485 + x^483 + x^482 + x^481 + x^477 + x^475 + x^473 + x^472 + x^471 + x^468 + x^464 + x^462 + x^461 + x^460 + x^459 + x^455 + x^454 + x^453 + x^449 + x^448 + x^447 + x^446 + x^438 + x^437 + x^435 + x^432 + x^429 + x^427 + x^426 + x^424 + x^423 + x^421 + x^419 + x^418 + x^416 + x^415 + x^413 + x^412 + x^410 + x^409 + x^407 + x^406 + x^405 + x^402 + x^401 + x^399 + x^397 + x^396 + x^394 + x^393 + x^390 + x^385 + x^384 + x^383 + x^380 + x^379 + x^378 + x^376 + x^375 + x^374 + x^372 + x^370 + x^368 + x^367 + x^366 + x^365 + x^363 + x^359 + x^357 + x^356 + x^355 + x^354 + x^353 + x^352 + x^351 + x^350 + x^348 + x^345 + x^341 + x^337 + x^335 + x^334 + x^333 + x^325 + x^319 + x^317 + x^316 + x^314 + x^305 + x^301 + x^298 + x^294 + x^293 + x^292 + x^289 + x^284 + x^281 + x^279 + x^272 + x^271 + x^269 + x^268 + x^267 + x^266 + x^264 + x^263 + x^262 + x^261 + x^256 + x^255 + x^254 + x^252 + x^251 + x^249 + x^248 + x^244 + x^242 + x^239 + x^235 + x^234 + x^233 + x^227 + x^226 + x^223 + x^221 + x^220 + x^216 + x^214 + x^211 + x^209 + x^207 + x^205 + x^204 + x^200 + x^198 + x^197 + x^196 + x^193 + x^188 + x^187 + x^185 + x^183 + x^182 + x^181 + x^179 + x^177 + x^175 + x^173 + x^172 + x^170 + x^169 + x^167 + x^163 + x^162 + x^158 + x^157 + x^156 + x^155 + x^154 + x^152 + x^151 + x^150 + x^149 + x^145 + x^144 + x^143 + x^142 + x^140 + x^139 + x^138 + x^136 + x^135 + x^133 + x^131 + x^130 + x^127 + x^126 + x^124 + x^122 + x^120 + x^118 + x^116 + x^114 + x^111 + x^110 + x^106 + x^105 + x^103 + x^102 + x^101 + x^100 + x^99 + x^98 + x^97 + x^95 + x^94 + x^93 + x^92 + x^91 + x^90 + x^86 + x^85 + x^82 + x^81 + x^78 + x^75 + x^70 + x^66 + x^64 + x^63 + x^61 + x^60 + x^55 + x^54 + x^53 + x^52 + x^50 + x^49 + x^46 + x^45 + x^44 + x^41 + x^38 + x^37 + x^36 + x^32 + x^30 + x^29 + x^27 + x^22 + x^18 + x^16 + x^13 + x^9 + x^8 + x^7 + x^5 + 1
+
+36-2-35	411	x^928 + x^898 + x^870 + x^860 + x^850 + x^842 + x^830 + x^824 + x^822 + x^812 + x^808 + x^806 + x^804 + x^794 + x^792 + x^790 + x^786 + x^782 + x^778 + x^776 + x^772 + x^768 + x^764 + x^754 + x^752 + x^747 + x^746 + x^745 + x^742 + x^738 + x^737 + x^736 + x^729 + x^728 + x^725 + x^724 + x^722 + x^721 + x^720 + x^718 + x^716 + x^715 + x^714 + x^712 + x^707 + x^706 + x^704 + x^703 + x^701 + x^699 + x^693 + x^691 + x^689 + x^688 + x^687 + x^684 + x^682 + x^680 + x^674 + x^672 + x^671 + x^669 + x^668 + x^663 + x^662 + x^661 + x^660 + x^659 + x^658 + x^654 + x^652 + x^651 + x^650 + x^649 + x^648 + x^644 + x^642 + x^640 + x^639 + x^638 + x^635 + x^633 + x^632 + x^624 + x^623 + x^620 + x^619 + x^618 + x^617 + x^611 + x^607 + x^606 + x^604 + x^602 + x^601 + x^600 + x^598 + x^596 + x^594 + x^593 + x^589 + x^585 + x^583 + x^580 + x^579 + x^577 + x^576 + x^575 + x^569 + x^568 + x^567 + x^565 + x^564 + x^563 + x^560 + x^558 + x^556 + x^555 + x^553 + x^552 + x^551 + x^549 + x^548 + x^545 + x^542 + x^541 + x^539 + x^536 + x^534 + x^533 + x^530 + x^528 + x^526 + x^524 + x^521 + x^519 + x^517 + x^515 + x^511 + x^510 + x^508 + x^506 + x^505 + x^504 + x^503 + x^502 + x^501 + x^500 + x^499 + x^498 + x^496 + x^494 + x^493 + x^492 + x^491 + x^490 + x^488 + x^487 + x^484 + x^480 + x^478 + x^474 + x^472 + x^471 + x^466 + x^465 + x^464 + x^463 + x^461 + x^459 + x^458 + x^457 + x^454 + x^453 + x^446 + x^445 + x^441 + x^440 + x^439 + x^438 + x^437 + x^436 + x^435 + x^433 + x^428 + x^427 + x^426 + x^425 + x^414 + x^407 + x^406 + x^405 + x^403 + x^402 + x^401 + x^399 + x^398 + x^397 + x^395 + x^393 + x^392 + x^391 + x^390 + x^387 + x^385 + x^384 + x^383 + x^382 + x^379 + x^378 + x^376 + x^374 + x^373 + x^371 + x^370 + x^369 + x^367 + x^365 + x^364 + x^363 + x^359 + x^357 + x^355 + x^354 + x^353 + x^350 + x^346 + x^345 + x^344 + x^343 + x^340 + x^338 + x^337 + x^336 + x^335 + x^330 + x^322 + x^321 + x^320 + x^317 + x^316 + x^311 + x^310 + x^309 + x^308 + x^307 + x^306 + x^305 + x^303 + x^299 + x^296 + x^295 + x^294 + x^293 + x^292 + x^289 + x^288 + x^284 + x^283 + x^282 + x^281 + x^280 + x^278 + x^277 + x^275 + x^269 + x^265 + x^263 + x^260 + x^258 + x^256 + x^255 + x^254 + x^253 + x^252 + x^250 + x^247 + x^246 + x^245 + x^242 + x^241 + x^240 + x^239 + x^234 + x^233 + x^232 + x^230 + x^226 + x^224 + x^222 + x^218 + x^217 + x^216 + x^215 + x^214 + x^213 + x^212 + x^211 + x^208 + x^204 + x^203 + x^202 + x^201 + x^200 + x^199 + x^198 + x^197 + x^194 + x^192 + x^191 + x^184 + x^181 + x^180 + x^178 + x^177 + x^176 + x^175 + x^174 + x^173 + x^171 + x^170 + x^168 + x^166 + x^161 + x^160 + x^157 + x^156 + x^153 + x^149 + x^148 + x^147 + x^145 + x^144 + x^143 + x^139 + x^137 + x^136 + x^134 + x^132 + x^131 + x^130 + x^129 + x^128 + x^127 + x^126 + x^125 + x^118 + x^117 + x^116 + x^115 + x^114 + x^113 + x^111 + x^107 + x^105 + x^104 + x^103 + x^101 + x^99 + x^98 + x^97 + x^96 + x^92 + x^91 + x^90 + x^89 + x^87 + x^86 + x^85 + x^84 + x^83 + x^82 + x^81 + x^79 + x^78 + x^76 + x^72 + x^70 + x^69 + x^68 + x^67 + x^65 + x^64 + x^62 + x^61 + x^58 + x^54 + x^53 + x^52 + x^50 + x^49 + x^48 + x^46 + x^44 + x^43 + x^40 + x^39 + x^38 + x^35 + x^32 + x^31 + x^30 + x^29 + x^28 + x^27 + x^25 + x^24 + x^18 + x^14 + x^10 + 1
+
+55-5-54	411	x^928 + x^898 + x^883 + x^870 + x^867 + x^854 + x^853 + x^840 + x^838 + x^837 + x^836 + x^834 + x^824 + x^822 + x^820 + x^812 + x^811 + x^810 + x^808 + x^807 + x^800 + x^797 + x^796 + x^795 + x^793 + x^792 + x^783 + x^779 + x^777 + x^776 + x^774 + x^770 + x^769 + x^768 + x^764 + x^762 + x^760 + x^754 + x^753 + x^752 + x^751 + x^749 + x^747 + x^746 + x^741 + x^740 + x^739 + x^738 + x^735 + x^734 + x^733 + x^732 + x^730 + x^728 + x^723 + x^721 + x^717 + x^715 + x^712 + x^711 + x^710 + x^709 + x^708 + x^707 + x^706 + x^704 + x^702 + x^701 + x^698 + x^697 + x^696 + x^694 + x^692 + x^690 + x^687 + x^683 + x^682 + x^681 + x^675 + x^674 + x^670 + x^669 + x^667 + x^666 + x^664 + x^663 + x^662 + x^657 + x^655 + x^654 + x^653 + x^652 + x^650 + x^646 + x^645 + x^644 + x^642 + x^637 + x^636 + x^635 + x^630 + x^629 + x^627 + x^626 + x^620 + x^615 + x^614 + x^612 + x^611 + x^610 + x^607 + x^606 + x^605 + x^604 + x^603 + x^601 + x^597 + x^594 + x^592 + x^591 + x^586 + x^584 + x^583 + x^582 + x^579 + x^577 + x^574 + x^573 + x^568 + x^565 + x^564 + x^563 + x^562 + x^557 + x^554 + x^553 + x^552 + x^550 + x^548 + x^546 + x^544 + x^543 + x^542 + x^540 + x^537 + x^536 + x^532 + x^531 + x^530 + x^524 + x^521 + x^520 + x^519 + x^517 + x^516 + x^515 + x^513 + x^512 + x^510 + x^509 + x^507 + x^505 + x^503 + x^502 + x^501 + x^500 + x^497 + x^496 + x^488 + x^486 + x^484 + x^481 + x^480 + x^478 + x^476 + x^475 + x^467 + x^465 + x^464 + x^463 + x^459 + x^458 + x^457 + x^455 + x^453 + x^452 + x^446 + x^445 + x^444 + x^441 + x^440 + x^439 + x^438 + x^434 + x^433 + x^432 + x^431 + x^427 + x^425 + x^421 + x^414 + x^412 + x^411 + x^409 + x^407 + x^406 + x^405 + x^403 + x^401 + x^400 + x^399 + x^398 + x^397 + x^396 + x^395 + x^394 + x^389 + x^385 + x^383 + x^380 + x^377 + x^376 + x^375 + x^374 + x^373 + x^372 + x^370 + x^367 + x^366 + x^365 + x^364 + x^363 + x^362 + x^360 + x^358 + x^356 + x^352 + x^351 + x^350 + x^349 + x^346 + x^342 + x^340 + x^338 + x^336 + x^335 + x^330 + x^329 + x^325 + x^324 + x^323 + x^321 + x^317 + x^314 + x^312 + x^307 + x^304 + x^303 + x^301 + x^298 + x^296 + x^295 + x^294 + x^293 + x^290 + x^289 + x^288 + x^287 + x^286 + x^285 + x^278 + x^277 + x^274 + x^273 + x^272 + x^270 + x^267 + x^265 + x^261 + x^260 + x^259 + x^258 + x^257 + x^256 + x^255 + x^254 + x^252 + x^249 + x^243 + x^241 + x^240 + x^239 + x^238 + x^235 + x^232 + x^231 + x^230 + x^227 + x^226 + x^224 + x^222 + x^221 + x^220 + x^219 + x^215 + x^214 + x^213 + x^211 + x^210 + x^209 + x^207 + x^206 + x^205 + x^200 + x^198 + x^195 + x^193 + x^192 + x^190 + x^186 + x^185 + x^181 + x^178 + x^176 + x^175 + x^172 + x^170 + x^169 + x^168 + x^166 + x^164 + x^158 + x^153 + x^152 + x^150 + x^149 + x^148 + x^147 + x^146 + x^143 + x^142 + x^140 + x^139 + x^136 + x^134 + x^133 + x^128 + x^125 + x^122 + x^121 + x^120 + x^116 + x^115 + x^114 + x^112 + x^111 + x^107 + x^106 + x^103 + x^101 + x^100 + x^99 + x^98 + x^96 + x^95 + x^94 + x^93 + x^92 + x^89 + x^88 + x^87 + x^86 + x^85 + x^84 + x^81 + x^79 + x^77 + x^76 + x^74 + x^72 + x^71 + x^70 + x^69 + x^65 + x^64 + x^62 + x^55 + x^53 + x^49 + x^48 + x^46 + x^44 + x^43 + x^39 + x^38 + x^37 + x^35 + x^33 + x^32 + x^31 + x^29 + x^27 + x^26 + x^24 + x^23 + x^22 + x^20 + x^18 + x^17 + x^8 + 1
+
+14-19-11	415	x^928 + x^898 + x^882 + x^870 + x^863 + x^862 + x^860 + x^854 + x^852 + x^844 + x^843 + x^833 + x^832 + x^825 + x^822 + x^819 + x^817 + x^816 + x^813 + x^811 + x^802 + x^798 + x^797 + x^795 + x^794 + x^790 + x^789 + x^787 + x^786 + x^781 + x^778 + x^776 + x^773 + x^772 + x^771 + x^768 + x^759 + x^754 + x^749 + x^746 + x^744 + x^743 + x^741 + x^740 + x^735 + x^734 + x^733 + x^730 + x^729 + x^725 + x^722 + x^717 + x^714 + x^711 + x^706 + x^705 + x^698 + x^697 + x^695 + x^691 + x^687 + x^686 + x^683 + x^681 + x^675 + x^674 + x^673 + x^672 + x^671 + x^670 + x^667 + x^665 + x^662 + x^661 + x^660 + x^658 + x^657 + x^656 + x^655 + x^654 + x^652 + x^649 + x^648 + x^645 + x^643 + x^642 + x^638 + x^636 + x^635 + x^634 + x^633 + x^632 + x^630 + x^629 + x^627 + x^626 + x^625 + x^624 + x^623 + x^622 + x^620 + x^617 + x^616 + x^615 + x^613 + x^612 + x^611 + x^608 + x^604 + x^603 + x^602 + x^599 + x^598 + x^597 + x^595 + x^594 + x^593 + x^592 + x^591 + x^590 + x^587 + x^586 + x^585 + x^584 + x^582 + x^580 + x^579 + x^578 + x^577 + x^570 + x^569 + x^568 + x^567 + x^566 + x^563 + x^562 + x^560 + x^558 + x^552 + x^550 + x^549 + x^546 + x^544 + x^543 + x^540 + x^537 + x^536 + x^535 + x^533 + x^532 + x^531 + x^530 + x^529 + x^527 + x^526 + x^522 + x^521 + x^519 + x^517 + x^514 + x^513 + x^512 + x^511 + x^510 + x^509 + x^507 + x^506 + x^504 + x^503 + x^502 + x^501 + x^500 + x^499 + x^498 + x^496 + x^494 + x^492 + x^491 + x^489 + x^488 + x^487 + x^485 + x^480 + x^479 + x^478 + x^475 + x^472 + x^463 + x^458 + x^455 + x^453 + x^452 + x^448 + x^443 + x^438 + x^436 + x^435 + x^432 + x^429 + x^428 + x^427 + x^421 + x^420 + x^419 + x^418 + x^417 + x^416 + x^414 + x^412 + x^411 + x^410 + x^406 + x^405 + x^404 + x^402 + x^401 + x^400 + x^399 + x^393 + x^388 + x^387 + x^386 + x^385 + x^384 + x^380 + x^379 + x^378 + x^376 + x^375 + x^373 + x^370 + x^368 + x^367 + x^365 + x^363 + x^362 + x^359 + x^358 + x^357 + x^356 + x^353 + x^350 + x^347 + x^343 + x^342 + x^341 + x^339 + x^338 + x^334 + x^333 + x^327 + x^325 + x^323 + x^321 + x^318 + x^317 + x^314 + x^310 + x^309 + x^308 + x^307 + x^306 + x^305 + x^304 + x^301 + x^300 + x^298 + x^295 + x^292 + x^288 + x^286 + x^285 + x^283 + x^282 + x^281 + x^278 + x^277 + x^275 + x^270 + x^269 + x^263 + x^260 + x^256 + x^254 + x^253 + x^250 + x^249 + x^248 + x^245 + x^244 + x^241 + x^239 + x^237 + x^233 + x^227 + x^225 + x^223 + x^222 + x^220 + x^219 + x^218 + x^216 + x^214 + x^212 + x^207 + x^203 + x^201 + x^200 + x^198 + x^197 + x^196 + x^195 + x^191 + x^189 + x^188 + x^184 + x^183 + x^181 + x^180 + x^179 + x^176 + x^174 + x^173 + x^170 + x^169 + x^168 + x^167 + x^165 + x^164 + x^163 + x^162 + x^161 + x^159 + x^158 + x^157 + x^155 + x^154 + x^152 + x^151 + x^150 + x^147 + x^144 + x^143 + x^142 + x^140 + x^139 + x^138 + x^134 + x^131 + x^130 + x^129 + x^124 + x^123 + x^122 + x^121 + x^120 + x^116 + x^115 + x^114 + x^111 + x^110 + x^108 + x^106 + x^104 + x^103 + x^99 + x^98 + x^95 + x^93 + x^91 + x^87 + x^84 + x^83 + x^80 + x^77 + x^76 + x^75 + x^74 + x^73 + x^70 + x^65 + x^64 + x^63 + x^62 + x^61 + x^57 + x^56 + x^55 + x^53 + x^51 + x^50 + x^49 + x^47 + x^46 + x^45 + x^43 + x^42 + x^41 + x^39 + x^37 + x^36 + x^33 + x^31 + x^29 + x^28 + x^24 + x^23 + x^22 + x^21 + x^18 + x^17 + x^16 + x^11 + x^10 + 1
+
+34-37-5	415	x^928 + x^898 + x^889 + x^874 + x^870 + x^861 + x^846 + x^844 + x^839 + x^835 + x^833 + x^831 + x^818 + x^816 + x^812 + x^809 + x^808 + x^805 + x^804 + x^794 + x^792 + x^790 + x^788 + x^787 + x^784 + x^783 + x^778 + x^776 + x^775 + x^773 + x^772 + x^770 + x^769 + x^768 + x^764 + x^760 + x^759 + x^757 + x^756 + x^755 + x^754 + x^749 + x^748 + x^744 + x^740 + x^737 + x^735 + x^730 + x^729 + x^728 + x^727 + x^726 + x^725 + x^721 + x^720 + x^719 + x^718 + x^716 + x^715 + x^713 + x^712 + x^710 + x^709 + x^706 + x^699 + x^695 + x^689 + x^686 + x^682 + x^681 + x^680 + x^677 + x^674 + x^673 + x^672 + x^671 + x^665 + x^664 + x^663 + x^662 + x^661 + x^660 + x^657 + x^656 + x^651 + x^649 + x^646 + x^640 + x^639 + x^635 + x^634 + x^633 + x^632 + x^629 + x^628 + x^624 + x^623 + x^621 + x^620 + x^616 + x^615 + x^614 + x^613 + x^611 + x^610 + x^609 + x^607 + x^606 + x^605 + x^604 + x^601 + x^599 + x^597 + x^596 + x^595 + x^593 + x^591 + x^590 + x^585 + x^584 + x^583 + x^582 + x^580 + x^577 + x^576 + x^573 + x^569 + x^567 + x^564 + x^560 + x^559 + x^558 + x^557 + x^556 + x^555 + x^552 + x^551 + x^550 + x^547 + x^545 + x^544 + x^542 + x^541 + x^540 + x^539 + x^538 + x^535 + x^534 + x^533 + x^526 + x^523 + x^520 + x^518 + x^517 + x^515 + x^514 + x^513 + x^511 + x^510 + x^509 + x^504 + x^503 + x^502 + x^501 + x^496 + x^495 + x^494 + x^493 + x^492 + x^489 + x^485 + x^484 + x^482 + x^481 + x^478 + x^475 + x^472 + x^469 + x^468 + x^467 + x^465 + x^464 + x^462 + x^460 + x^455 + x^453 + x^452 + x^451 + x^449 + x^448 + x^447 + x^446 + x^445 + x^443 + x^442 + x^441 + x^438 + x^435 + x^434 + x^432 + x^431 + x^430 + x^427 + x^424 + x^423 + x^422 + x^419 + x^412 + x^411 + x^409 + x^408 + x^406 + x^405 + x^404 + x^403 + x^401 + x^400 + x^399 + x^393 + x^390 + x^389 + x^387 + x^385 + x^384 + x^380 + x^378 + x^376 + x^374 + x^372 + x^371 + x^370 + x^369 + x^366 + x^365 + x^360 + x^359 + x^357 + x^350 + x^349 + x^347 + x^346 + x^345 + x^344 + x^342 + x^341 + x^340 + x^337 + x^335 + x^334 + x^332 + x^331 + x^330 + x^328 + x^327 + x^325 + x^323 + x^322 + x^321 + x^320 + x^316 + x^314 + x^310 + x^308 + x^306 + x^305 + x^304 + x^301 + x^300 + x^295 + x^291 + x^290 + x^289 + x^288 + x^287 + x^283 + x^281 + x^280 + x^279 + x^277 + x^274 + x^272 + x^271 + x^268 + x^266 + x^264 + x^263 + x^261 + x^259 + x^255 + x^254 + x^253 + x^250 + x^249 + x^246 + x^244 + x^242 + x^241 + x^237 + x^233 + x^230 + x^229 + x^227 + x^223 + x^222 + x^217 + x^216 + x^208 + x^207 + x^206 + x^205 + x^204 + x^203 + x^198 + x^196 + x^192 + x^191 + x^190 + x^189 + x^188 + x^187 + x^186 + x^185 + x^182 + x^181 + x^180 + x^178 + x^175 + x^171 + x^166 + x^165 + x^164 + x^163 + x^162 + x^161 + x^159 + x^157 + x^156 + x^149 + x^148 + x^146 + x^145 + x^143 + x^142 + x^141 + x^140 + x^139 + x^138 + x^136 + x^135 + x^131 + x^130 + x^129 + x^127 + x^125 + x^124 + x^117 + x^115 + x^113 + x^110 + x^108 + x^107 + x^106 + x^105 + x^103 + x^99 + x^98 + x^95 + x^93 + x^90 + x^87 + x^84 + x^83 + x^81 + x^80 + x^79 + x^78 + x^77 + x^72 + x^71 + x^68 + x^65 + x^64 + x^63 + x^62 + x^59 + x^58 + x^56 + x^55 + x^54 + x^53 + x^52 + x^51 + x^46 + x^45 + x^44 + x^43 + x^40 + x^39 + x^36 + x^35 + x^33 + x^32 + x^31 + x^30 + x^27 + x^25 + x^24 + x^22 + x^18 + x^17 + x^14 + x^13 + x^12 + x^10 + 1
+
+37-3-56	415	x^928 + x^898 + x^878 + x^870 + x^862 + x^860 + x^849 + x^840 + x^831 + x^822 + x^819 + x^818 + x^811 + x^802 + x^801 + x^796 + x^795 + x^794 + x^793 + x^790 + x^789 + x^784 + x^781 + x^780 + x^777 + x^775 + x^772 + x^766 + x^760 + x^758 + x^755 + x^753 + x^752 + x^747 + x^745 + x^744 + x^743 + x^740 + x^738 + x^737 + x^736 + x^732 + x^730 + x^729 + x^728 + x^726 + x^721 + x^716 + x^715 + x^713 + x^712 + x^711 + x^710 + x^709 + x^706 + x^705 + x^702 + x^700 + x^699 + x^698 + x^697 + x^696 + x^693 + x^692 + x^690 + x^687 + x^686 + x^684 + x^683 + x^682 + x^681 + x^680 + x^678 + x^675 + x^674 + x^673 + x^672 + x^670 + x^669 + x^667 + x^664 + x^662 + x^661 + x^660 + x^658 + x^657 + x^656 + x^654 + x^653 + x^652 + x^650 + x^649 + x^648 + x^645 + x^644 + x^641 + x^639 + x^635 + x^634 + x^631 + x^630 + x^629 + x^628 + x^622 + x^621 + x^620 + x^617 + x^616 + x^614 + x^610 + x^609 + x^608 + x^606 + x^604 + x^601 + x^600 + x^598 + x^597 + x^596 + x^593 + x^592 + x^590 + x^588 + x^587 + x^586 + x^585 + x^584 + x^583 + x^579 + x^578 + x^575 + x^574 + x^573 + x^569 + x^568 + x^566 + x^564 + x^563 + x^561 + x^559 + x^557 + x^556 + x^553 + x^552 + x^550 + x^548 + x^546 + x^543 + x^542 + x^541 + x^540 + x^538 + x^537 + x^536 + x^533 + x^532 + x^529 + x^528 + x^527 + x^525 + x^522 + x^520 + x^519 + x^518 + x^517 + x^515 + x^514 + x^513 + x^509 + x^507 + x^506 + x^504 + x^503 + x^502 + x^499 + x^495 + x^494 + x^493 + x^492 + x^490 + x^486 + x^482 + x^481 + x^480 + x^479 + x^477 + x^476 + x^475 + x^474 + x^473 + x^472 + x^470 + x^468 + x^467 + x^463 + x^457 + x^453 + x^451 + x^448 + x^446 + x^445 + x^440 + x^438 + x^437 + x^434 + x^433 + x^432 + x^431 + x^430 + x^425 + x^424 + x^423 + x^417 + x^414 + x^409 + x^407 + x^406 + x^405 + x^402 + x^400 + x^399 + x^398 + x^397 + x^396 + x^395 + x^394 + x^391 + x^389 + x^387 + x^386 + x^384 + x^383 + x^379 + x^377 + x^372 + x^371 + x^369 + x^368 + x^366 + x^365 + x^364 + x^361 + x^359 + x^357 + x^354 + x^351 + x^348 + x^347 + x^340 + x^339 + x^337 + x^336 + x^334 + x^329 + x^327 + x^326 + x^325 + x^322 + x^320 + x^318 + x^315 + x^314 + x^313 + x^312 + x^310 + x^309 + x^308 + x^306 + x^305 + x^301 + x^300 + x^298 + x^294 + x^293 + x^292 + x^291 + x^288 + x^285 + x^284 + x^282 + x^279 + x^275 + x^272 + x^271 + x^270 + x^269 + x^268 + x^266 + x^259 + x^257 + x^254 + x^253 + x^251 + x^250 + x^248 + x^246 + x^244 + x^243 + x^242 + x^238 + x^237 + x^234 + x^233 + x^232 + x^231 + x^230 + x^227 + x^223 + x^222 + x^221 + x^219 + x^216 + x^215 + x^212 + x^207 + x^205 + x^203 + x^200 + x^199 + x^198 + x^196 + x^195 + x^193 + x^191 + x^187 + x^185 + x^183 + x^181 + x^179 + x^178 + x^177 + x^174 + x^171 + x^170 + x^168 + x^166 + x^165 + x^163 + x^160 + x^156 + x^155 + x^154 + x^151 + x^150 + x^149 + x^146 + x^145 + x^142 + x^141 + x^136 + x^135 + x^134 + x^132 + x^128 + x^127 + x^125 + x^121 + x^118 + x^117 + x^116 + x^113 + x^112 + x^111 + x^108 + x^106 + x^105 + x^104 + x^102 + x^101 + x^100 + x^99 + x^96 + x^95 + x^94 + x^89 + x^85 + x^83 + x^81 + x^80 + x^79 + x^69 + x^65 + x^63 + x^62 + x^61 + x^59 + x^58 + x^57 + x^56 + x^52 + x^49 + x^46 + x^45 + x^43 + x^42 + x^41 + x^40 + x^39 + x^38 + x^37 + x^36 + x^33 + x^32 + x^28 + x^24 + x^23 + x^20 + x^18 + x^17 + x^14 + x^11 + x^10 + x^9 + x^8 + 1
+
+55-11-54	417	x^928 + x^898 + x^896 + x^870 + x^867 + x^866 + x^864 + x^853 + x^846 + x^837 + x^836 + x^835 + x^828 + x^826 + x^824 + x^823 + x^817 + x^814 + x^812 + x^810 + x^808 + x^807 + x^806 + x^805 + x^804 + x^803 + x^802 + x^800 + x^796 + x^791 + x^789 + x^786 + x^784 + x^781 + x^780 + x^777 + x^772 + x^771 + x^770 + x^767 + x^762 + x^761 + x^757 + x^753 + x^747 + x^742 + x^740 + x^739 + x^737 + x^736 + x^735 + x^734 + x^733 + x^731 + x^730 + x^725 + x^723 + x^722 + x^717 + x^715 + x^708 + x^707 + x^705 + x^704 + x^703 + x^699 + x^698 + x^695 + x^690 + x^689 + x^686 + x^685 + x^684 + x^682 + x^681 + x^680 + x^678 + x^677 + x^675 + x^669 + x^667 + x^666 + x^665 + x^664 + x^663 + x^662 + x^661 + x^660 + x^658 + x^657 + x^656 + x^655 + x^654 + x^651 + x^650 + x^646 + x^645 + x^643 + x^641 + x^640 + x^639 + x^637 + x^634 + x^633 + x^632 + x^631 + x^627 + x^624 + x^622 + x^620 + x^617 + x^616 + x^615 + x^614 + x^613 + x^608 + x^601 + x^600 + x^599 + x^595 + x^592 + x^591 + x^590 + x^586 + x^580 + x^579 + x^578 + x^577 + x^576 + x^575 + x^571 + x^570 + x^569 + x^567 + x^566 + x^565 + x^564 + x^563 + x^562 + x^561 + x^560 + x^558 + x^557 + x^555 + x^554 + x^553 + x^552 + x^551 + x^550 + x^549 + x^545 + x^543 + x^542 + x^539 + x^537 + x^532 + x^530 + x^526 + x^525 + x^520 + x^519 + x^517 + x^515 + x^513 + x^511 + x^510 + x^508 + x^504 + x^502 + x^501 + x^498 + x^493 + x^492 + x^490 + x^489 + x^488 + x^487 + x^485 + x^484 + x^483 + x^481 + x^480 + x^479 + x^477 + x^475 + x^473 + x^472 + x^469 + x^468 + x^467 + x^466 + x^463 + x^462 + x^461 + x^459 + x^455 + x^453 + x^451 + x^450 + x^449 + x^445 + x^444 + x^443 + x^442 + x^441 + x^440 + x^437 + x^435 + x^434 + x^431 + x^430 + x^429 + x^427 + x^426 + x^422 + x^421 + x^420 + x^413 + x^410 + x^409 + x^408 + x^407 + x^405 + x^403 + x^402 + x^401 + x^397 + x^396 + x^393 + x^389 + x^386 + x^384 + x^380 + x^379 + x^376 + x^373 + x^372 + x^370 + x^369 + x^367 + x^365 + x^364 + x^363 + x^358 + x^356 + x^355 + x^354 + x^353 + x^349 + x^345 + x^342 + x^334 + x^332 + x^331 + x^329 + x^325 + x^324 + x^322 + x^316 + x^315 + x^314 + x^312 + x^310 + x^307 + x^306 + x^298 + x^297 + x^296 + x^294 + x^293 + x^292 + x^288 + x^285 + x^284 + x^283 + x^282 + x^279 + x^273 + x^271 + x^267 + x^262 + x^257 + x^255 + x^253 + x^252 + x^251 + x^250 + x^248 + x^247 + x^245 + x^244 + x^243 + x^240 + x^238 + x^237 + x^236 + x^234 + x^232 + x^229 + x^224 + x^223 + x^222 + x^221 + x^218 + x^216 + x^215 + x^213 + x^211 + x^210 + x^209 + x^207 + x^205 + x^203 + x^202 + x^201 + x^198 + x^195 + x^194 + x^193 + x^192 + x^190 + x^189 + x^187 + x^186 + x^185 + x^184 + x^183 + x^182 + x^181 + x^179 + x^177 + x^176 + x^175 + x^174 + x^172 + x^170 + x^167 + x^160 + x^157 + x^156 + x^153 + x^151 + x^150 + x^149 + x^143 + x^140 + x^137 + x^136 + x^134 + x^133 + x^129 + x^128 + x^124 + x^123 + x^120 + x^118 + x^117 + x^116 + x^115 + x^114 + x^112 + x^111 + x^110 + x^108 + x^105 + x^104 + x^102 + x^101 + x^100 + x^98 + x^97 + x^93 + x^92 + x^91 + x^90 + x^88 + x^87 + x^85 + x^81 + x^79 + x^77 + x^76 + x^74 + x^73 + x^72 + x^70 + x^65 + x^63 + x^62 + x^61 + x^59 + x^55 + x^53 + x^51 + x^50 + x^47 + x^46 + x^45 + x^44 + x^43 + x^40 + x^38 + x^34 + x^32 + x^30 + x^29 + x^28 + x^27 + x^24 + x^22 + x^21 + x^18 + x^17 + x^14 + x^11 + x^4 + 1
+
+30-3-41	419	x^928 + x^906 + x^898 + x^884 + x^879 + x^876 + x^870 + x^862 + x^854 + x^852 + x^849 + x^844 + x^835 + x^832 + x^829 + x^825 + x^822 + x^819 + x^818 + x^813 + x^812 + x^807 + x^805 + x^803 + x^802 + x^798 + x^795 + x^794 + x^792 + x^790 + x^789 + x^788 + x^786 + x^785 + x^778 + x^777 + x^769 + x^768 + x^762 + x^760 + x^753 + x^751 + x^748 + x^747 + x^746 + x^742 + x^738 + x^735 + x^734 + x^733 + x^731 + x^729 + x^726 + x^725 + x^723 + x^719 + x^718 + x^716 + x^713 + x^706 + x^703 + x^702 + x^701 + x^700 + x^699 + x^696 + x^693 + x^690 + x^687 + x^686 + x^685 + x^684 + x^682 + x^679 + x^677 + x^673 + x^672 + x^671 + x^670 + x^664 + x^659 + x^656 + x^653 + x^651 + x^650 + x^647 + x^643 + x^642 + x^639 + x^637 + x^635 + x^633 + x^630 + x^627 + x^625 + x^624 + x^621 + x^616 + x^615 + x^614 + x^613 + x^612 + x^607 + x^604 + x^603 + x^600 + x^597 + x^596 + x^595 + x^593 + x^592 + x^591 + x^588 + x^586 + x^583 + x^581 + x^580 + x^578 + x^575 + x^574 + x^571 + x^569 + x^568 + x^567 + x^566 + x^565 + x^564 + x^562 + x^560 + x^559 + x^558 + x^557 + x^555 + x^554 + x^553 + x^552 + x^550 + x^546 + x^545 + x^543 + x^542 + x^537 + x^535 + x^534 + x^532 + x^530 + x^527 + x^525 + x^523 + x^521 + x^520 + x^512 + x^506 + x^505 + x^504 + x^503 + x^501 + x^500 + x^499 + x^498 + x^497 + x^495 + x^494 + x^493 + x^489 + x^487 + x^485 + x^484 + x^479 + x^478 + x^477 + x^475 + x^474 + x^471 + x^470 + x^469 + x^468 + x^467 + x^466 + x^464 + x^462 + x^459 + x^458 + x^457 + x^456 + x^451 + x^449 + x^448 + x^447 + x^446 + x^443 + x^441 + x^440 + x^439 + x^437 + x^435 + x^434 + x^433 + x^432 + x^431 + x^430 + x^427 + x^425 + x^424 + x^423 + x^420 + x^419 + x^418 + x^417 + x^416 + x^414 + x^412 + x^410 + x^409 + x^405 + x^404 + x^402 + x^401 + x^400 + x^396 + x^394 + x^393 + x^391 + x^390 + x^389 + x^388 + x^387 + x^386 + x^385 + x^380 + x^379 + x^369 + x^368 + x^363 + x^362 + x^361 + x^360 + x^359 + x^355 + x^354 + x^351 + x^347 + x^346 + x^345 + x^342 + x^337 + x^336 + x^332 + x^328 + x^324 + x^322 + x^321 + x^319 + x^318 + x^317 + x^315 + x^312 + x^310 + x^309 + x^307 + x^303 + x^302 + x^300 + x^298 + x^295 + x^289 + x^288 + x^287 + x^286 + x^285 + x^284 + x^283 + x^282 + x^281 + x^276 + x^275 + x^273 + x^272 + x^271 + x^268 + x^265 + x^263 + x^262 + x^260 + x^259 + x^255 + x^254 + x^253 + x^252 + x^249 + x^245 + x^244 + x^243 + x^242 + x^241 + x^240 + x^239 + x^236 + x^235 + x^233 + x^232 + x^231 + x^230 + x^224 + x^223 + x^222 + x^221 + x^218 + x^215 + x^214 + x^213 + x^209 + x^206 + x^204 + x^199 + x^197 + x^196 + x^194 + x^190 + x^186 + x^185 + x^183 + x^182 + x^181 + x^180 + x^179 + x^178 + x^177 + x^176 + x^175 + x^174 + x^173 + x^168 + x^167 + x^166 + x^165 + x^164 + x^163 + x^162 + x^161 + x^159 + x^158 + x^156 + x^155 + x^153 + x^151 + x^148 + x^144 + x^143 + x^142 + x^141 + x^139 + x^136 + x^135 + x^131 + x^129 + x^128 + x^127 + x^126 + x^125 + x^124 + x^123 + x^121 + x^119 + x^118 + x^116 + x^113 + x^111 + x^109 + x^107 + x^106 + x^103 + x^102 + x^100 + x^99 + x^98 + x^96 + x^93 + x^92 + x^90 + x^86 + x^85 + x^83 + x^82 + x^80 + x^76 + x^73 + x^72 + x^71 + x^70 + x^67 + x^66 + x^64 + x^61 + x^60 + x^59 + x^56 + x^53 + x^50 + x^49 + x^45 + x^44 + x^42 + x^39 + x^36 + x^35 + x^30 + x^28 + x^25 + x^22 + x^19 + x^18 + x^17 + x^15 + x^14 + x^11 + x^10 + x^5 + 1
+
+11-45-50	423	x^928 + x^898 + x^891 + x^870 + x^862 + x^861 + x^858 + x^857 + x^854 + x^851 + x^828 + x^825 + x^824 + x^822 + x^818 + x^814 + x^811 + x^808 + x^802 + x^800 + x^798 + x^797 + x^787 + x^786 + x^785 + x^783 + x^782 + x^781 + x^776 + x^772 + x^771 + x^770 + x^768 + x^765 + x^760 + x^758 + x^756 + x^754 + x^750 + x^749 + x^746 + x^742 + x^738 + x^737 + x^736 + x^735 + x^734 + x^732 + x^729 + x^723 + x^719 + x^718 + x^716 + x^715 + x^714 + x^713 + x^708 + x^707 + x^705 + x^704 + x^703 + x^702 + x^701 + x^700 + x^698 + x^697 + x^696 + x^694 + x^692 + x^688 + x^684 + x^683 + x^681 + x^680 + x^678 + x^666 + x^664 + x^663 + x^662 + x^660 + x^659 + x^658 + x^656 + x^654 + x^653 + x^652 + x^651 + x^650 + x^649 + x^647 + x^645 + x^642 + x^641 + x^639 + x^638 + x^637 + x^636 + x^634 + x^632 + x^631 + x^626 + x^625 + x^623 + x^620 + x^617 + x^616 + x^614 + x^612 + x^610 + x^609 + x^607 + x^605 + x^603 + x^601 + x^600 + x^598 + x^597 + x^596 + x^595 + x^594 + x^591 + x^589 + x^588 + x^586 + x^585 + x^584 + x^581 + x^579 + x^578 + x^577 + x^576 + x^575 + x^573 + x^572 + x^570 + x^569 + x^568 + x^566 + x^561 + x^559 + x^558 + x^557 + x^554 + x^552 + x^551 + x^550 + x^549 + x^548 + x^546 + x^544 + x^543 + x^541 + x^540 + x^538 + x^533 + x^531 + x^529 + x^528 + x^523 + x^519 + x^515 + x^512 + x^511 + x^510 + x^508 + x^507 + x^506 + x^501 + x^498 + x^497 + x^496 + x^495 + x^494 + x^492 + x^490 + x^489 + x^488 + x^487 + x^486 + x^485 + x^483 + x^477 + x^476 + x^474 + x^472 + x^470 + x^469 + x^467 + x^465 + x^462 + x^460 + x^458 + x^452 + x^451 + x^449 + x^447 + x^446 + x^445 + x^442 + x^441 + x^440 + x^437 + x^436 + x^434 + x^433 + x^431 + x^428 + x^427 + x^426 + x^425 + x^423 + x^422 + x^420 + x^419 + x^418 + x^417 + x^415 + x^414 + x^413 + x^412 + x^411 + x^409 + x^407 + x^404 + x^403 + x^402 + x^399 + x^398 + x^396 + x^395 + x^392 + x^391 + x^389 + x^388 + x^387 + x^386 + x^385 + x^384 + x^381 + x^379 + x^378 + x^377 + x^375 + x^373 + x^369 + x^367 + x^365 + x^364 + x^362 + x^359 + x^358 + x^357 + x^355 + x^351 + x^348 + x^347 + x^346 + x^345 + x^344 + x^343 + x^335 + x^334 + x^332 + x^328 + x^325 + x^324 + x^321 + x^319 + x^318 + x^316 + x^314 + x^312 + x^311 + x^310 + x^304 + x^300 + x^297 + x^296 + x^294 + x^293 + x^292 + x^291 + x^289 + x^288 + x^285 + x^283 + x^277 + x^276 + x^274 + x^271 + x^270 + x^269 + x^268 + x^265 + x^264 + x^260 + x^259 + x^258 + x^257 + x^256 + x^252 + x^251 + x^249 + x^248 + x^247 + x^246 + x^244 + x^242 + x^238 + x^236 + x^233 + x^232 + x^231 + x^230 + x^229 + x^228 + x^227 + x^222 + x^220 + x^218 + x^214 + x^212 + x^209 + x^208 + x^207 + x^204 + x^203 + x^202 + x^200 + x^193 + x^190 + x^189 + x^188 + x^186 + x^185 + x^183 + x^178 + x^176 + x^174 + x^171 + x^169 + x^168 + x^166 + x^165 + x^163 + x^162 + x^161 + x^158 + x^156 + x^155 + x^154 + x^153 + x^150 + x^147 + x^146 + x^145 + x^141 + x^136 + x^134 + x^132 + x^128 + x^127 + x^126 + x^123 + x^120 + x^119 + x^114 + x^112 + x^111 + x^105 + x^104 + x^101 + x^100 + x^98 + x^97 + x^96 + x^95 + x^94 + x^92 + x^91 + x^88 + x^87 + x^85 + x^84 + x^83 + x^80 + x^78 + x^77 + x^76 + x^74 + x^73 + x^72 + x^68 + x^64 + x^62 + x^61 + x^60 + x^56 + x^55 + x^54 + x^53 + x^50 + x^46 + x^42 + x^41 + x^40 + x^39 + x^36 + x^32 + x^31 + x^30 + x^28 + x^25 + x^24 + x^16 + x^15 + x^14 + x^13 + x^10 + x^9 + x^6 + x^3 + 1
+
+50-19-47	423	x^928 + x^906 + x^898 + x^897 + x^884 + x^876 + x^870 + x^862 + x^854 + x^840 + x^836 + x^835 + x^832 + x^831 + x^830 + x^821 + x^814 + x^813 + x^812 + x^810 + x^808 + x^805 + x^803 + x^796 + x^794 + x^792 + x^791 + x^786 + x^785 + x^783 + x^777 + x^774 + x^773 + x^767 + x^766 + x^764 + x^762 + x^761 + x^760 + x^759 + x^758 + x^754 + x^750 + x^748 + x^747 + x^746 + x^743 + x^742 + x^739 + x^734 + x^732 + x^728 + x^727 + x^724 + x^722 + x^720 + x^718 + x^716 + x^714 + x^713 + x^712 + x^711 + x^709 + x^708 + x^705 + x^704 + x^702 + x^699 + x^698 + x^695 + x^694 + x^693 + x^692 + x^691 + x^688 + x^686 + x^683 + x^682 + x^681 + x^679 + x^676 + x^674 + x^672 + x^671 + x^668 + x^664 + x^663 + x^661 + x^659 + x^657 + x^656 + x^654 + x^652 + x^646 + x^645 + x^641 + x^638 + x^635 + x^634 + x^632 + x^629 + x^628 + x^619 + x^618 + x^617 + x^615 + x^613 + x^612 + x^610 + x^609 + x^607 + x^606 + x^605 + x^604 + x^603 + x^602 + x^598 + x^597 + x^596 + x^595 + x^593 + x^591 + x^590 + x^589 + x^584 + x^583 + x^582 + x^581 + x^580 + x^579 + x^576 + x^575 + x^573 + x^569 + x^568 + x^567 + x^565 + x^564 + x^562 + x^556 + x^554 + x^552 + x^551 + x^550 + x^548 + x^547 + x^546 + x^545 + x^542 + x^541 + x^540 + x^539 + x^537 + x^535 + x^534 + x^532 + x^528 + x^526 + x^525 + x^524 + x^522 + x^521 + x^519 + x^515 + x^513 + x^510 + x^508 + x^507 + x^506 + x^505 + x^504 + x^502 + x^501 + x^500 + x^499 + x^496 + x^495 + x^494 + x^492 + x^490 + x^489 + x^486 + x^485 + x^484 + x^483 + x^481 + x^479 + x^478 + x^476 + x^474 + x^471 + x^469 + x^467 + x^465 + x^463 + x^458 + x^456 + x^455 + x^454 + x^451 + x^449 + x^448 + x^443 + x^442 + x^440 + x^439 + x^437 + x^436 + x^433 + x^432 + x^431 + x^430 + x^428 + x^427 + x^426 + x^425 + x^424 + x^421 + x^420 + x^416 + x^415 + x^413 + x^412 + x^411 + x^410 + x^409 + x^408 + x^406 + x^405 + x^403 + x^400 + x^399 + x^398 + x^396 + x^395 + x^393 + x^391 + x^388 + x^387 + x^386 + x^381 + x^380 + x^377 + x^376 + x^375 + x^374 + x^373 + x^371 + x^370 + x^369 + x^368 + x^361 + x^359 + x^358 + x^357 + x^355 + x^352 + x^350 + x^348 + x^347 + x^346 + x^343 + x^342 + x^339 + x^337 + x^335 + x^334 + x^332 + x^329 + x^325 + x^324 + x^323 + x^322 + x^318 + x^317 + x^315 + x^314 + x^311 + x^310 + x^306 + x^304 + x^300 + x^299 + x^297 + x^295 + x^294 + x^289 + x^286 + x^283 + x^279 + x^278 + x^276 + x^275 + x^273 + x^269 + x^268 + x^266 + x^264 + x^260 + x^258 + x^257 + x^254 + x^252 + x^250 + x^248 + x^247 + x^246 + x^245 + x^241 + x^239 + x^237 + x^236 + x^235 + x^234 + x^232 + x^228 + x^227 + x^226 + x^225 + x^218 + x^215 + x^214 + x^212 + x^211 + x^210 + x^208 + x^206 + x^205 + x^204 + x^203 + x^201 + x^198 + x^196 + x^193 + x^192 + x^190 + x^189 + x^188 + x^184 + x^181 + x^180 + x^178 + x^177 + x^176 + x^175 + x^174 + x^173 + x^171 + x^169 + x^168 + x^166 + x^165 + x^164 + x^162 + x^160 + x^159 + x^158 + x^153 + x^150 + x^148 + x^147 + x^146 + x^143 + x^142 + x^139 + x^136 + x^135 + x^134 + x^133 + x^132 + x^126 + x^124 + x^121 + x^118 + x^116 + x^112 + x^109 + x^108 + x^107 + x^104 + x^101 + x^98 + x^97 + x^95 + x^93 + x^88 + x^86 + x^85 + x^84 + x^83 + x^78 + x^77 + x^73 + x^70 + x^69 + x^68 + x^66 + x^64 + x^63 + x^62 + x^58 + x^57 + x^53 + x^52 + x^50 + x^48 + x^45 + x^43 + x^42 + x^41 + x^40 + x^39 + x^38 + x^33 + x^26 + x^22 + x^21 + x^20 + x^18 + x^17 + x^10 + x^8 + 1
+
+52-27-13	427	x^928 + x^898 + x^870 + x^866 + x^858 + x^855 + x^854 + x^847 + x^844 + x^836 + x^833 + x^832 + x^829 + x^828 + x^825 + x^822 + x^818 + x^817 + x^814 + x^811 + x^808 + x^807 + x^800 + x^799 + x^798 + x^796 + x^795 + x^792 + x^789 + x^781 + x^777 + x^774 + x^770 + x^769 + x^768 + x^767 + x^765 + x^762 + x^759 + x^756 + x^755 + x^754 + x^752 + x^751 + x^748 + x^746 + x^745 + x^744 + x^740 + x^739 + x^738 + x^736 + x^735 + x^734 + x^732 + x^730 + x^729 + x^728 + x^724 + x^721 + x^719 + x^718 + x^717 + x^716 + x^713 + x^712 + x^710 + x^709 + x^706 + x^705 + x^704 + x^702 + x^701 + x^699 + x^698 + x^697 + x^695 + x^693 + x^690 + x^689 + x^687 + x^686 + x^685 + x^683 + x^682 + x^681 + x^680 + x^677 + x^676 + x^675 + x^674 + x^671 + x^669 + x^668 + x^667 + x^666 + x^665 + x^663 + x^660 + x^659 + x^655 + x^654 + x^653 + x^652 + x^650 + x^648 + x^647 + x^643 + x^642 + x^640 + x^639 + x^638 + x^635 + x^634 + x^633 + x^632 + x^630 + x^629 + x^628 + x^626 + x^624 + x^620 + x^618 + x^617 + x^616 + x^615 + x^612 + x^610 + x^607 + x^606 + x^604 + x^603 + x^602 + x^598 + x^597 + x^593 + x^589 + x^588 + x^587 + x^585 + x^583 + x^581 + x^580 + x^579 + x^578 + x^570 + x^569 + x^566 + x^565 + x^564 + x^563 + x^561 + x^559 + x^558 + x^557 + x^556 + x^555 + x^551 + x^550 + x^548 + x^547 + x^545 + x^544 + x^540 + x^539 + x^538 + x^537 + x^536 + x^535 + x^534 + x^532 + x^529 + x^528 + x^527 + x^526 + x^525 + x^524 + x^523 + x^522 + x^519 + x^517 + x^516 + x^515 + x^513 + x^512 + x^511 + x^507 + x^504 + x^502 + x^495 + x^493 + x^492 + x^491 + x^490 + x^489 + x^484 + x^483 + x^481 + x^480 + x^478 + x^466 + x^464 + x^463 + x^460 + x^459 + x^457 + x^455 + x^454 + x^451 + x^450 + x^448 + x^447 + x^435 + x^434 + x^433 + x^432 + x^431 + x^428 + x^424 + x^423 + x^422 + x^421 + x^420 + x^419 + x^414 + x^413 + x^412 + x^411 + x^410 + x^409 + x^407 + x^404 + x^401 + x^396 + x^395 + x^394 + x^391 + x^390 + x^389 + x^388 + x^385 + x^382 + x^379 + x^377 + x^372 + x^370 + x^367 + x^365 + x^362 + x^361 + x^357 + x^355 + x^354 + x^351 + x^349 + x^348 + x^345 + x^343 + x^342 + x^340 + x^338 + x^334 + x^330 + x^328 + x^324 + x^323 + x^320 + x^319 + x^318 + x^317 + x^315 + x^313 + x^310 + x^309 + x^307 + x^303 + x^302 + x^301 + x^300 + x^299 + x^298 + x^297 + x^296 + x^295 + x^292 + x^289 + x^288 + x^287 + x^285 + x^283 + x^280 + x^274 + x^273 + x^271 + x^267 + x^265 + x^264 + x^261 + x^259 + x^258 + x^256 + x^254 + x^253 + x^248 + x^247 + x^244 + x^239 + x^238 + x^237 + x^233 + x^232 + x^230 + x^229 + x^228 + x^227 + x^224 + x^221 + x^217 + x^216 + x^215 + x^214 + x^209 + x^207 + x^206 + x^205 + x^203 + x^201 + x^200 + x^199 + x^196 + x^195 + x^194 + x^192 + x^191 + x^190 + x^189 + x^187 + x^186 + x^182 + x^180 + x^177 + x^176 + x^174 + x^173 + x^170 + x^169 + x^168 + x^167 + x^164 + x^160 + x^154 + x^153 + x^152 + x^148 + x^144 + x^143 + x^142 + x^141 + x^140 + x^139 + x^135 + x^134 + x^133 + x^132 + x^129 + x^125 + x^124 + x^122 + x^121 + x^120 + x^118 + x^117 + x^116 + x^115 + x^112 + x^111 + x^110 + x^109 + x^108 + x^107 + x^106 + x^104 + x^103 + x^101 + x^96 + x^95 + x^93 + x^90 + x^87 + x^86 + x^82 + x^79 + x^77 + x^75 + x^70 + x^68 + x^67 + x^66 + x^62 + x^60 + x^57 + x^54 + x^53 + x^52 + x^51 + x^49 + x^46 + x^45 + x^43 + x^42 + x^41 + x^40 + x^39 + x^38 + x^36 + x^33 + x^31 + x^30 + x^29 + x^27 + x^26 + x^24 + x^22 + x^18 + x^7 + x^6 + 1
+
+54-9-25	433	x^928 + x^898 + x^875 + x^870 + x^860 + x^850 + x^847 + x^840 + x^835 + x^832 + x^822 + x^819 + x^815 + x^812 + x^808 + x^807 + x^805 + x^804 + x^800 + x^797 + x^794 + x^792 + x^791 + x^790 + x^787 + x^785 + x^782 + x^778 + x^777 + x^776 + x^771 + x^770 + x^767 + x^766 + x^764 + x^763 + x^760 + x^759 + x^757 + x^755 + x^754 + x^753 + x^752 + x^748 + x^743 + x^742 + x^739 + x^738 + x^737 + x^735 + x^734 + x^733 + x^731 + x^730 + x^729 + x^725 + x^724 + x^723 + x^720 + x^719 + x^717 + x^716 + x^714 + x^713 + x^711 + x^710 + x^709 + x^706 + x^705 + x^700 + x^699 + x^697 + x^696 + x^695 + x^693 + x^692 + x^691 + x^688 + x^687 + x^686 + x^685 + x^683 + x^682 + x^680 + x^676 + x^671 + x^670 + x^664 + x^663 + x^662 + x^661 + x^660 + x^658 + x^657 + x^656 + x^654 + x^653 + x^649 + x^648 + x^646 + x^645 + x^642 + x^637 + x^635 + x^633 + x^632 + x^630 + x^627 + x^624 + x^623 + x^621 + x^620 + x^619 + x^617 + x^615 + x^614 + x^613 + x^610 + x^609 + x^608 + x^607 + x^604 + x^602 + x^601 + x^600 + x^599 + x^593 + x^592 + x^591 + x^589 + x^585 + x^584 + x^580 + x^576 + x^575 + x^574 + x^570 + x^569 + x^566 + x^565 + x^564 + x^563 + x^562 + x^561 + x^559 + x^558 + x^554 + x^552 + x^551 + x^547 + x^546 + x^545 + x^543 + x^541 + x^540 + x^535 + x^532 + x^531 + x^530 + x^529 + x^525 + x^524 + x^523 + x^521 + x^520 + x^519 + x^518 + x^517 + x^516 + x^515 + x^513 + x^512 + x^510 + x^509 + x^504 + x^503 + x^502 + x^501 + x^500 + x^497 + x^496 + x^494 + x^493 + x^488 + x^487 + x^486 + x^484 + x^482 + x^481 + x^480 + x^479 + x^475 + x^472 + x^465 + x^464 + x^462 + x^461 + x^460 + x^457 + x^456 + x^455 + x^454 + x^452 + x^451 + x^450 + x^449 + x^448 + x^446 + x^445 + x^444 + x^443 + x^441 + x^438 + x^437 + x^436 + x^434 + x^432 + x^430 + x^427 + x^425 + x^424 + x^421 + x^420 + x^419 + x^418 + x^417 + x^414 + x^413 + x^410 + x^409 + x^407 + x^404 + x^403 + x^402 + x^401 + x^400 + x^399 + x^398 + x^396 + x^393 + x^392 + x^391 + x^390 + x^389 + x^385 + x^382 + x^381 + x^380 + x^379 + x^378 + x^375 + x^373 + x^372 + x^367 + x^366 + x^362 + x^358 + x^356 + x^355 + x^354 + x^353 + x^349 + x^348 + x^347 + x^342 + x^340 + x^339 + x^336 + x^334 + x^331 + x^329 + x^328 + x^327 + x^326 + x^325 + x^323 + x^319 + x^317 + x^316 + x^314 + x^313 + x^312 + x^310 + x^309 + x^308 + x^307 + x^302 + x^299 + x^298 + x^297 + x^296 + x^293 + x^291 + x^289 + x^288 + x^286 + x^285 + x^284 + x^282 + x^279 + x^274 + x^272 + x^271 + x^268 + x^266 + x^263 + x^261 + x^258 + x^255 + x^252 + x^251 + x^249 + x^248 + x^247 + x^246 + x^243 + x^242 + x^240 + x^237 + x^236 + x^234 + x^233 + x^232 + x^231 + x^228 + x^226 + x^223 + x^222 + x^221 + x^220 + x^219 + x^217 + x^216 + x^215 + x^213 + x^212 + x^210 + x^205 + x^203 + x^202 + x^199 + x^197 + x^195 + x^194 + x^193 + x^191 + x^189 + x^188 + x^187 + x^184 + x^182 + x^178 + x^173 + x^172 + x^170 + x^169 + x^167 + x^165 + x^162 + x^159 + x^158 + x^157 + x^156 + x^154 + x^149 + x^148 + x^145 + x^144 + x^141 + x^140 + x^135 + x^134 + x^133 + x^131 + x^130 + x^129 + x^127 + x^126 + x^123 + x^120 + x^119 + x^118 + x^117 + x^115 + x^110 + x^108 + x^106 + x^105 + x^104 + x^99 + x^97 + x^95 + x^89 + x^86 + x^84 + x^82 + x^78 + x^75 + x^71 + x^70 + x^69 + x^68 + x^65 + x^63 + x^62 + x^61 + x^59 + x^58 + x^51 + x^50 + x^49 + x^48 + x^47 + x^44 + x^43 + x^42 + x^39 + x^38 + x^37 + x^35 + x^30 + x^27 + x^25 + x^21 + x^19 + x^17 + x^16 + x^13 + x^12 + x^10 + x^8 + x^6 + 1
+
+56-43-35	433	x^928 + x^898 + x^896 + x^871 + x^870 + x^864 + x^848 + x^847 + x^846 + x^841 + x^840 + x^834 + x^833 + x^832 + x^829 + x^821 + x^814 + x^811 + x^808 + x^806 + x^803 + x^798 + x^797 + x^796 + x^792 + x^788 + x^786 + x^784 + x^783 + x^781 + x^779 + x^777 + x^776 + x^774 + x^773 + x^770 + x^769 + x^766 + x^762 + x^760 + x^756 + x^754 + x^752 + x^751 + x^749 + x^746 + x^745 + x^740 + x^737 + x^736 + x^734 + x^730 + x^727 + x^723 + x^721 + x^720 + x^718 + x^716 + x^714 + x^712 + x^709 + x^707 + x^706 + x^705 + x^704 + x^703 + x^702 + x^701 + x^700 + x^699 + x^697 + x^696 + x^695 + x^690 + x^689 + x^687 + x^685 + x^684 + x^682 + x^678 + x^675 + x^672 + x^670 + x^669 + x^668 + x^666 + x^665 + x^663 + x^662 + x^661 + x^659 + x^657 + x^655 + x^651 + x^650 + x^648 + x^646 + x^641 + x^639 + x^634 + x^632 + x^631 + x^630 + x^629 + x^626 + x^625 + x^623 + x^620 + x^619 + x^614 + x^612 + x^610 + x^609 + x^608 + x^607 + x^606 + x^604 + x^603 + x^602 + x^601 + x^600 + x^597 + x^596 + x^595 + x^594 + x^593 + x^591 + x^588 + x^585 + x^584 + x^583 + x^582 + x^581 + x^580 + x^578 + x^576 + x^574 + x^573 + x^572 + x^571 + x^570 + x^569 + x^563 + x^561 + x^560 + x^558 + x^556 + x^553 + x^552 + x^551 + x^550 + x^549 + x^546 + x^545 + x^544 + x^543 + x^542 + x^539 + x^538 + x^537 + x^536 + x^534 + x^532 + x^531 + x^529 + x^523 + x^519 + x^518 + x^517 + x^515 + x^514 + x^513 + x^512 + x^510 + x^509 + x^508 + x^503 + x^502 + x^501 + x^500 + x^499 + x^498 + x^496 + x^495 + x^494 + x^491 + x^490 + x^489 + x^487 + x^486 + x^484 + x^482 + x^481 + x^473 + x^471 + x^468 + x^466 + x^465 + x^464 + x^461 + x^460 + x^457 + x^456 + x^455 + x^453 + x^450 + x^448 + x^444 + x^442 + x^436 + x^435 + x^434 + x^433 + x^432 + x^431 + x^430 + x^429 + x^422 + x^421 + x^420 + x^419 + x^418 + x^417 + x^416 + x^414 + x^413 + x^412 + x^411 + x^409 + x^408 + x^407 + x^406 + x^404 + x^403 + x^402 + x^401 + x^398 + x^395 + x^392 + x^391 + x^389 + x^387 + x^385 + x^380 + x^377 + x^374 + x^372 + x^371 + x^369 + x^366 + x^363 + x^362 + x^361 + x^359 + x^358 + x^356 + x^355 + x^354 + x^353 + x^352 + x^350 + x^349 + x^348 + x^347 + x^345 + x^344 + x^343 + x^336 + x^334 + x^331 + x^330 + x^327 + x^325 + x^324 + x^322 + x^317 + x^310 + x^308 + x^307 + x^304 + x^301 + x^300 + x^299 + x^298 + x^297 + x^293 + x^290 + x^286 + x^284 + x^283 + x^282 + x^281 + x^279 + x^277 + x^275 + x^274 + x^270 + x^269 + x^267 + x^264 + x^262 + x^259 + x^254 + x^253 + x^248 + x^247 + x^245 + x^243 + x^242 + x^241 + x^237 + x^236 + x^232 + x^231 + x^230 + x^229 + x^228 + x^226 + x^225 + x^224 + x^223 + x^221 + x^218 + x^215 + x^214 + x^213 + x^212 + x^210 + x^208 + x^204 + x^202 + x^201 + x^199 + x^196 + x^195 + x^193 + x^192 + x^191 + x^190 + x^186 + x^184 + x^179 + x^178 + x^177 + x^176 + x^175 + x^174 + x^173 + x^171 + x^169 + x^167 + x^166 + x^165 + x^160 + x^158 + x^155 + x^154 + x^153 + x^152 + x^151 + x^150 + x^149 + x^148 + x^147 + x^145 + x^143 + x^140 + x^139 + x^138 + x^134 + x^132 + x^130 + x^129 + x^128 + x^127 + x^120 + x^118 + x^117 + x^115 + x^113 + x^112 + x^109 + x^108 + x^107 + x^106 + x^105 + x^101 + x^100 + x^96 + x^95 + x^94 + x^93 + x^91 + x^89 + x^88 + x^87 + x^85 + x^84 + x^83 + x^82 + x^81 + x^79 + x^77 + x^75 + x^74 + x^73 + x^72 + x^70 + x^68 + x^67 + x^65 + x^64 + x^63 + x^60 + x^58 + x^57 + x^56 + x^54 + x^53 + x^52 + x^50 + x^45 + x^44 + x^43 + x^41 + x^35 + x^30 + x^23 + x^20 + x^18 + x^15 + x^6 + 1
+
+44-9-45	441	x^928 + x^898 + x^890 + x^885 + x^880 + x^872 + x^870 + x^867 + x^860 + x^850 + x^847 + x^842 + x^837 + x^834 + x^830 + x^825 + x^824 + x^817 + x^816 + x^811 + x^808 + x^806 + x^802 + x^800 + x^798 + x^797 + x^794 + x^792 + x^790 + x^787 + x^786 + x^782 + x^778 + x^777 + x^776 + x^774 + x^773 + x^772 + x^771 + x^769 + x^768 + x^767 + x^765 + x^760 + x^759 + x^758 + x^757 + x^754 + x^750 + x^749 + x^747 + x^746 + x^745 + x^743 + x^741 + x^738 + x^737 + x^736 + x^734 + x^732 + x^725 + x^724 + x^722 + x^721 + x^720 + x^717 + x^716 + x^714 + x^713 + x^710 + x^708 + x^707 + x^705 + x^704 + x^702 + x^701 + x^699 + x^698 + x^696 + x^694 + x^692 + x^691 + x^690 + x^686 + x^683 + x^681 + x^679 + x^676 + x^674 + x^673 + x^672 + x^671 + x^668 + x^667 + x^665 + x^664 + x^663 + x^662 + x^661 + x^659 + x^658 + x^657 + x^655 + x^654 + x^652 + x^651 + x^648 + x^644 + x^643 + x^641 + x^640 + x^635 + x^634 + x^633 + x^632 + x^631 + x^630 + x^629 + x^628 + x^624 + x^621 + x^619 + x^618 + x^617 + x^616 + x^614 + x^611 + x^610 + x^608 + x^607 + x^599 + x^598 + x^596 + x^594 + x^590 + x^589 + x^588 + x^587 + x^586 + x^584 + x^581 + x^579 + x^578 + x^577 + x^575 + x^573 + x^572 + x^570 + x^569 + x^568 + x^567 + x^565 + x^564 + x^563 + x^562 + x^561 + x^559 + x^558 + x^554 + x^553 + x^552 + x^551 + x^549 + x^546 + x^544 + x^541 + x^537 + x^536 + x^535 + x^532 + x^531 + x^529 + x^526 + x^517 + x^516 + x^514 + x^511 + x^509 + x^507 + x^502 + x^501 + x^498 + x^497 + x^495 + x^494 + x^493 + x^491 + x^487 + x^486 + x^485 + x^484 + x^483 + x^482 + x^481 + x^480 + x^477 + x^474 + x^473 + x^470 + x^469 + x^467 + x^466 + x^465 + x^463 + x^462 + x^461 + x^460 + x^459 + x^457 + x^455 + x^454 + x^453 + x^451 + x^449 + x^448 + x^446 + x^443 + x^442 + x^440 + x^437 + x^436 + x^435 + x^434 + x^433 + x^431 + x^430 + x^427 + x^423 + x^419 + x^418 + x^414 + x^412 + x^411 + x^410 + x^409 + x^407 + x^406 + x^405 + x^402 + x^397 + x^395 + x^394 + x^389 + x^388 + x^384 + x^381 + x^380 + x^379 + x^378 + x^376 + x^373 + x^372 + x^371 + x^370 + x^368 + x^367 + x^366 + x^365 + x^364 + x^362 + x^361 + x^355 + x^354 + x^352 + x^350 + x^347 + x^345 + x^344 + x^343 + x^342 + x^339 + x^337 + x^335 + x^333 + x^332 + x^329 + x^327 + x^323 + x^322 + x^321 + x^320 + x^319 + x^316 + x^312 + x^310 + x^309 + x^308 + x^307 + x^305 + x^303 + x^302 + x^301 + x^298 + x^294 + x^293 + x^283 + x^282 + x^276 + x^275 + x^274 + x^271 + x^267 + x^264 + x^262 + x^261 + x^259 + x^258 + x^257 + x^256 + x^253 + x^252 + x^251 + x^250 + x^246 + x^245 + x^244 + x^243 + x^242 + x^241 + x^240 + x^238 + x^237 + x^236 + x^235 + x^233 + x^232 + x^229 + x^228 + x^225 + x^224 + x^223 + x^220 + x^216 + x^211 + x^210 + x^207 + x^205 + x^204 + x^202 + x^201 + x^200 + x^197 + x^196 + x^195 + x^194 + x^190 + x^189 + x^185 + x^183 + x^182 + x^181 + x^180 + x^179 + x^177 + x^176 + x^174 + x^173 + x^172 + x^171 + x^168 + x^167 + x^164 + x^163 + x^157 + x^156 + x^152 + x^151 + x^150 + x^148 + x^147 + x^146 + x^143 + x^142 + x^141 + x^140 + x^139 + x^138 + x^137 + x^135 + x^134 + x^133 + x^132 + x^129 + x^128 + x^127 + x^125 + x^122 + x^120 + x^119 + x^113 + x^112 + x^110 + x^109 + x^108 + x^107 + x^106 + x^105 + x^104 + x^101 + x^98 + x^97 + x^96 + x^93 + x^92 + x^91 + x^87 + x^83 + x^80 + x^78 + x^77 + x^74 + x^72 + x^66 + x^64 + x^63 + x^60 + x^59 + x^56 + x^51 + x^50 + x^49 + x^46 + x^43 + x^42 + x^41 + x^39 + x^38 + x^32 + x^31 + x^29 + x^28 + x^26 + x^24 + x^23 + x^21 + x^20 + x^19 + x^18 + x^15 + x^10 + 1
diff --git a/lib/stdlib/test/re_SUITE.erl b/lib/stdlib/test/re_SUITE.erl
index c9ef9da990..06d8fe9255 100644
--- a/lib/stdlib/test/re_SUITE.erl
+++ b/lib/stdlib/test/re_SUITE.erl
@@ -28,7 +28,8 @@
 	 pcre_compile_workspace_overflow/1,re_infinite_loop/1, 
 	 re_backwards_accented/1,opt_dupnames/1,opt_all_names/1,inspect/1,
 	 opt_no_start_optimize/1,opt_never_utf/1,opt_ucp/1,
-	 match_limit/1,sub_binaries/1,copt/1]).
+	 match_limit/1,sub_binaries/1,copt/1,global_unicode_validation/1,
+         yield_on_subject_validation/1]).
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/file.hrl").
@@ -45,7 +46,8 @@ all() ->
      pcre_compile_workspace_overflow, re_infinite_loop, 
      re_backwards_accented, opt_dupnames, opt_all_names, 
      inspect, opt_no_start_optimize,opt_never_utf,opt_ucp,
-     match_limit, sub_binaries, re_version].
+     match_limit, sub_binaries, re_version, global_unicode_validation,
+     yield_on_subject_validation].
 
 groups() -> 
     [].
@@ -200,7 +202,58 @@ re_version(_Config) ->
     {match,[Version]} = re:run(Version,"^[0-9]\\.[0-9]{2} 20[0-9]{2}-[0-9]{2}-[0-9]{2}",[{capture,all,binary}]),
     ok.
 
+global_unicode_validation(Config) when is_list(Config) ->
+    %% Test that unicode validation of the subject is not done
+    %% for every match found...
+    Bin = binary:copy(<<"abc\n">>,100000),
+    {TimeAscii, _} = take_time(fun () ->
+                                       re:run(Bin, <<"b">>, [global])
+                               end),
+    {TimeUnicode, _} = take_time(fun () ->
+                                         re:run(Bin, <<"b">>, [unicode,global])
+                                 end),
+    if TimeAscii == 0; TimeUnicode == 0 ->
+            {comment, "Not good enough resolution to compare results"};
+       true ->
+            %% The time the operations takes should be in the
+            %% same order of magnitude. If validation of the
+            %% whole subject occurs for every match, the unicode
+            %% variant will take way longer time...
+            true = TimeUnicode div TimeAscii < 10
+    end.
+
+take_time(Fun) ->
+    Start = erlang:monotonic_time(nanosecond),
+    Res = Fun(),
+    End = erlang:monotonic_time(nanosecond),
+    {End-Start, Res}.
+
+yield_on_subject_validation(Config) when is_list(Config) ->
+    Go = make_ref(),
+    Bin = binary:copy(<<"abc\n">>,100000),
+    {P, M} = spawn_opt(fun () ->
+                               receive Go -> ok end,
+                               {match,[{1,1}]} = re:run(Bin, <<"b">>, [unicode])
+                       end,
+                       [link, monitor]),
+    1 = erlang:trace(P, true, [running]),
+    P ! Go,
+    N = count_re_run_trap_out(P, M),
+    true = N >= 5,
+    ok.
 
+count_re_run_trap_out(P, M) when is_reference(M) ->
+    receive {'DOWN',M,process,P,normal} -> ok end,
+    TD = erlang:trace_delivered(P),
+    receive {trace_delivered, P, TD} -> ok end,
+    count_re_run_trap_out(P, 0);
+count_re_run_trap_out(P, N) when is_integer(N) ->
+    receive
+        {trace,P,out,{erlang,re_run_trap,3}} ->
+            count_re_run_trap_out(P, N+1)
+    after 0 ->
+            N
+    end.
 
 %% Test compile options given directly to run.
 combined_options(Config) when is_list(Config) ->
diff --git a/lib/stdlib/test/re_SUITE_data/testoutput1 b/lib/stdlib/test/re_SUITE_data/testoutput1
index eff8ecc948..e6147e60b9 100644
--- a/lib/stdlib/test/re_SUITE_data/testoutput1
+++ b/lib/stdlib/test/re_SUITE_data/testoutput1
@@ -9446,4 +9446,28 @@ No match
     >XXX<
  0: X
 
+/   (?<word> \w+ )*    \.   /xi
+    pokus.
+ 0: pokus.
+ 1: pokus
+    
+/(?(DEFINE) (?<word> \w+ ) ) (?&word)*   \./xi
+    pokus.
+ 0: pokus.
+
+/(?(DEFINE) (?<word> \w+ ) ) ( (?&word)* )   \./xi 
+    pokus.
+ 0: pokus.
+ 1: <unset>
+ 2: pokus
+
+/(?&word)*  (?(DEFINE) (?<word> \w+ ) )  \./xi
+    pokus.
+ 0: pokus.
+
+/(?&word)*  \. (?<word> \w+ )/xi
+    pokus.hokus
+ 0: pokus.hokus
+ 1: hokus
+
 /-- End of testinput1 --/
diff --git a/lib/stdlib/test/re_SUITE_data/testoutput2 b/lib/stdlib/test/re_SUITE_data/testoutput2
index 61ed8d9d4e..4ccda27201 100644
--- a/lib/stdlib/test/re_SUITE_data/testoutput2
+++ b/lib/stdlib/test/re_SUITE_data/testoutput2
@@ -14721,4 +14721,8 @@ No need char
  0: ab
  1: a
 
+/(?(?=^))b/
+    abc
+ 0: b
+
 /-- End of testinput2 --/
diff --git a/lib/stdlib/test/re_SUITE_data/testoutput4 b/lib/stdlib/test/re_SUITE_data/testoutput4
index d43c12392d..69e812cd35 100644
--- a/lib/stdlib/test/re_SUITE_data/testoutput4
+++ b/lib/stdlib/test/re_SUITE_data/testoutput4
@@ -1277,4 +1277,8 @@ No match
     \\C(\\W?ſ)'?{{
 No match
 
+/[^\x{100}-\x{ffff}]*[\x80-\xff]/8
+    \x{99}\x{99}\x{99}
+ 0: \x{99}\x{99}\x{99}
+
 /-- End of testinput4 --/
diff --git a/lib/stdlib/test/re_testoutput1_replacement_test.erl b/lib/stdlib/test/re_testoutput1_replacement_test.erl
index f14df547ef..bb43047757 100644
--- a/lib/stdlib/test/re_testoutput1_replacement_test.erl
+++ b/lib/stdlib/test/re_testoutput1_replacement_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2019. 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.
@@ -20014,4 +20014,31 @@ run56() ->
     <<"  MumdPEeFred:099">> = iolist_to_binary(re:replace("  Fred:099","(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[,;:])(?=.{8,16})(?!.*[\\s])","\\1&M&umdPE&e",[global])), 
     <<"  ugxGKrBXEcHyG">> = iolist_to_binary(re:replace("  X","(?=.*X)X$","ugxGKrB&EcHyG",[])), 
     <<"  ugxGKrBXEcHyG">> = iolist_to_binary(re:replace("  X","(?=.*X)X$","ugxGKrB&EcHyG",[global])), 
+    <<">MHFvXX<">> = iolist_to_binary(re:replace(">XXX<","X+(?#comment)?","MHFv",[])), 
+    <<">MHFvMHFvMHFv<">> = iolist_to_binary(re:replace(">XXX<","X+(?#comment)?","MHFv",[global])), 
+    <<"lTpokusldxfHXOpokuswsrRorpokus.">> = iolist_to_binary(re:replace("pokus.","   (?<word> \\w+ )*    \\.   ","lT\\1ldxfHXO\\1wsrRor&",[extended,
+                                                                                                                                                                                                                                                                caseless])), 
+    <<"lTpokusldxfHXOpokuswsrRorpokus.">> = iolist_to_binary(re:replace("pokus.","   (?<word> \\w+ )*    \\.   ","lT\\1ldxfHXO\\1wsrRor&",[extended,
+                                                                                                                                                                                                                                                                 caseless,
+                                                                                                                                                                                                                                                                 global])), 
+    <<"Oeapokus.xo">> = iolist_to_binary(re:replace("pokus.","(?(DEFINE) (?<word> \\w+ ) ) (?&word)*   \\.","Oea&xo",[extended,
+                                                                                                                                                                                                                                                            caseless])), 
+    <<"Oeapokus.xo">> = iolist_to_binary(re:replace("pokus.","(?(DEFINE) (?<word> \\w+ ) ) (?&word)*   \\.","Oea&xo",[extended,
+                                                                                                                                                                                                                                                             caseless,
+                                                                                                                                                                                                                                                             global])), 
+    <<"Wpokus.pity">> = iolist_to_binary(re:replace("pokus.","(?(DEFINE) (?<word> \\w+ ) ) ( (?&word)* )   \\.","W&pity",[extended,
+                                                                                                                                                                                                                                                                    caseless])), 
+    <<"Wpokus.pity">> = iolist_to_binary(re:replace("pokus.","(?(DEFINE) (?<word> \\w+ ) ) ( (?&word)* )   \\.","W&pity",[extended,
+                                                                                                                                                                                                                                                                     caseless,
+                                                                                                                                                                                                                                                                     global])), 
+    <<"iujmNtBvmcyi">> = iolist_to_binary(re:replace("pokus.","(?&word)*  (?(DEFINE) (?<word> \\w+ ) )  \\.","iuj\\1m\\1NtBvmcyi\\1",[extended,
+                                                                                                                                                                                                                                                                                            caseless])), 
+    <<"iujmNtBvmcyi">> = iolist_to_binary(re:replace("pokus.","(?&word)*  (?(DEFINE) (?<word> \\w+ ) )  \\.","iuj\\1m\\1NtBvmcyi\\1",[extended,
+                                                                                                                                                                                                                                                                                             caseless,
+                                                                                                                                                                                                                                                                                             global])), 
+    <<"Ipokus.hokusbQpokus.hokusB">> = iolist_to_binary(re:replace("pokus.hokus","(?&word)*  \\. (?<word> \\w+ )","I&bQ&B",[extended,
+                                                                                                                                                                                                                                           caseless])), 
+    <<"Ipokus.hokusbQpokus.hokusB">> = iolist_to_binary(re:replace("pokus.hokus","(?&word)*  \\. (?<word> \\w+ )","I&bQ&B",[extended,
+                                                                                                                                                                                                                                            caseless,
+                                                                                                                                                                                                                                            global])), 
     ok.
diff --git a/lib/stdlib/test/re_testoutput1_split_test.erl b/lib/stdlib/test/re_testoutput1_split_test.erl
index 8218cd9bd2..fcffa89e3f 100644
--- a/lib/stdlib/test/re_testoutput1_split_test.erl
+++ b/lib/stdlib/test/re_testoutput1_split_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2019. 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.
@@ -84,1360 +84,1360 @@ run() ->
     run56(),
     ok.
 run0() ->
-    <<"">> = iolist_to_binary(join(re:split("the quick brown fox","the quick brown fox",[trim]))), 
+    <<"">> = iolist_to_binary(join(re:split("the quick brown fox","the quick brown fox",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("the quick brown fox","the quick brown fox",[{parts,
-                                                                                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("the quick brown fox","the quick brown fox",[]))), 
-    <<"The quick brown FOX">> = iolist_to_binary(join(re:split("The quick brown FOX","the quick brown fox",[trim]))), 
+                                                                                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("the quick brown fox","the quick brown fox",[]))),
+    <<"The quick brown FOX">> = iolist_to_binary(join(re:split("The quick brown FOX","the quick brown fox",[trim]))),
     <<"The quick brown FOX">> = iolist_to_binary(join(re:split("The quick brown FOX","the quick brown fox",[{parts,
-                                                                                                                                                                                                                            2}]))), 
-    <<"The quick brown FOX">> = iolist_to_binary(join(re:split("The quick brown FOX","the quick brown fox",[]))), 
-    <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about the quick brown fox?","the quick brown fox",[trim]))), 
+                                                                                                                                                                                                                            2}]))),
+    <<"The quick brown FOX">> = iolist_to_binary(join(re:split("The quick brown FOX","the quick brown fox",[]))),
+    <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about the quick brown fox?","the quick brown fox",[trim]))),
     <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about the quick brown fox?","the quick brown fox",[{parts,
-                                                                                                                                                                                                                                                                            2}]))), 
-    <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about the quick brown fox?","the quick brown fox",[]))), 
-    <<"What do you know about THE QUICK BROWN FOX?">> = iolist_to_binary(join(re:split("What do you know about THE QUICK BROWN FOX?","the quick brown fox",[trim]))), 
+                                                                                                                                                                                                                                                                            2}]))),
+    <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about the quick brown fox?","the quick brown fox",[]))),
+    <<"What do you know about THE QUICK BROWN FOX?">> = iolist_to_binary(join(re:split("What do you know about THE QUICK BROWN FOX?","the quick brown fox",[trim]))),
     <<"What do you know about THE QUICK BROWN FOX?">> = iolist_to_binary(join(re:split("What do you know about THE QUICK BROWN FOX?","the quick brown fox",[{parts,
-                                                                                                                                                                                                                                                                            2}]))), 
-    <<"What do you know about THE QUICK BROWN FOX?">> = iolist_to_binary(join(re:split("What do you know about THE QUICK BROWN FOX?","the quick brown fox",[]))), 
+                                                                                                                                                                                                                                                                            2}]))),
+    <<"What do you know about THE QUICK BROWN FOX?">> = iolist_to_binary(join(re:split("What do you know about THE QUICK BROWN FOX?","the quick brown fox",[]))),
     <<"">> = iolist_to_binary(join(re:split("the quick brown fox","The quick brown fox",[caseless,
-                                                                                                                                                                                                                          trim]))), 
+                                                                                                                                                                                                                          trim]))),
     <<":">> = iolist_to_binary(join(re:split("the quick brown fox","The quick brown fox",[caseless,
                                                                                                                                                                                                                             {parts,
-                                                                                                                                                                                                                             2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("the quick brown fox","The quick brown fox",[caseless]))), 
+                                                                                                                                                                                                                             2}]))),
+    <<":">> = iolist_to_binary(join(re:split("the quick brown fox","The quick brown fox",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("The quick brown FOX","The quick brown fox",[caseless,
-                                                                                                                                                                                                                          trim]))), 
+                                                                                                                                                                                                                          trim]))),
     <<":">> = iolist_to_binary(join(re:split("The quick brown FOX","The quick brown fox",[caseless,
                                                                                                                                                                                                                             {parts,
-                                                                                                                                                                                                                             2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("The quick brown FOX","The quick brown fox",[caseless]))), 
+                                                                                                                                                                                                                             2}]))),
+    <<":">> = iolist_to_binary(join(re:split("The quick brown FOX","The quick brown fox",[caseless]))),
     <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about the quick brown fox?","The quick brown fox",[caseless,
-                                                                                                                                                                                                                                                                          trim]))), 
+                                                                                                                                                                                                                                                                          trim]))),
     <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about the quick brown fox?","The quick brown fox",[caseless,
                                                                                                                                                                                                                                                                             {parts,
-                                                                                                                                                                                                                                                                             2}]))), 
-    <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about the quick brown fox?","The quick brown fox",[caseless]))), 
+                                                                                                                                                                                                                                                                             2}]))),
+    <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about the quick brown fox?","The quick brown fox",[caseless]))),
     <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about THE QUICK BROWN FOX?","The quick brown fox",[caseless,
-                                                                                                                                                                                                                                                                          trim]))), 
+                                                                                                                                                                                                                                                                          trim]))),
     <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about THE QUICK BROWN FOX?","The quick brown fox",[caseless,
                                                                                                                                                                                                                                                                             {parts,
-                                                                                                                                                                                                                                                                             2}]))), 
-    <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about THE QUICK BROWN FOX?","The quick brown fox",[caseless]))), 
+                                                                                                                                                                                                                                                                             2}]))),
+    <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about THE QUICK BROWN FOX?","The quick brown fox",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("abcd	
-
9;$\\?caxyz","abcd\\t\\n\\r\\f\\a\\e\\071\\x3b\\$\\\\\\?caxyz",[trim]))), 
+
9;$\\?caxyz","abcd\\t\\n\\r\\f\\a\\e\\071\\x3b\\$\\\\\\?caxyz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abcd	
 
9;$\\?caxyz","abcd\\t\\n\\r\\f\\a\\e\\071\\x3b\\$\\\\\\?caxyz",[{parts,
-                                                                                                    2}]))), 
+                                                                                                    2}]))),
     <<":">> = iolist_to_binary(join(re:split("abcd	
-
9;$\\?caxyz","abcd\\t\\n\\r\\f\\a\\e\\071\\x3b\\$\\\\\\?caxyz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+
9;$\\?caxyz","abcd\\t\\n\\r\\f\\a\\e\\071\\x3b\\$\\\\\\?caxyz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                      2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                      2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                      2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                      2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                          2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                          2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                          2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                          2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                          2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                          2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                                    2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                                    2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                                      2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                                      2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aabxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aabxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aabxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aabxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aabxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abcxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abcxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abcxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                          2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abcxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aabcxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                          2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abcxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aabcxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aabcxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aabcxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aabcxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                                    2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                                    2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                                      2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                                      2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypABzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypABzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypABzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypABzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypABBzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypABzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypABBzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypABBzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypABBzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<">>>">> = iolist_to_binary(join(re:split(">>>aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypABBzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<">>>">> = iolist_to_binary(join(re:split(">>>aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<">>>:">> = iolist_to_binary(join(re:split(">>>aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                                2}]))), 
-    <<">>>:">> = iolist_to_binary(join(re:split(">>>aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<">">> = iolist_to_binary(join(re:split(">aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                                2}]))),
+    <<">>>:">> = iolist_to_binary(join(re:split(">>>aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<">">> = iolist_to_binary(join(re:split(">aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<">:">> = iolist_to_binary(join(re:split(">aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                              2}]))), 
-    <<">:">> = iolist_to_binary(join(re:split(">aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<">>>>">> = iolist_to_binary(join(re:split(">>>>abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                              2}]))),
+    <<">:">> = iolist_to_binary(join(re:split(">aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<">>>>">> = iolist_to_binary(join(re:split(">>>>abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<">>>>:">> = iolist_to_binary(join(re:split(">>>>abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                                2}]))), 
-    <<">>>>:">> = iolist_to_binary(join(re:split(">>>>abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                                2}]))),
+    <<">>>>:">> = iolist_to_binary(join(re:split(">>>>abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                              2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"abxyzpqrrabbxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                              2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"abxyzpqrrabbxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<"abxyzpqrrabbxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                    2}]))), 
-    <<"abxyzpqrrabbxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"abxyzpqrrrrabbxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                    2}]))),
+    <<"abxyzpqrrabbxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"abxyzpqrrrrabbxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<"abxyzpqrrrrabbxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                        2}]))), 
-    <<"abxyzpqrrrrabbxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"abxyzpqrrrabxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrrabxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                        2}]))),
+    <<"abxyzpqrrrrabbxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"abxyzpqrrrabxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrrabxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<"abxyzpqrrrabxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrrabxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                    2}]))), 
-    <<"abxyzpqrrrabxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrrabxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                    2}]))),
+    <<"abxyzpqrrrabxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrrabxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<"aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                                          2}]))), 
-    <<"aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"aaaabcxyzzzzpqrrrabbbxyyypqAzz">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                                          2}]))),
+    <<"aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"aaaabcxyzzzzpqrrrabbbxyyypqAzz">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<"aaaabcxyzzzzpqrrrabbbxyyypqAzz">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                                    2}]))), 
-    <<"aaaabcxyzzzzpqrrrabbbxyyypqAzz">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<"aaabcxyzpqrrrabbxyyyypqqqqqqqAzz">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                                    2}]))),
+    <<"aaaabcxyzzzzpqrrrabbbxyyypqAzz">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<"aaabcxyzpqrrrabbxyyyypqqqqqqqAzz">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))),
     <<"aaabcxyzpqrrrabbxyyyypqqqqqqqAzz">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                                        2}]))), 
-    <<"aaabcxyzpqrrrabbxyyyypqqqqqqqAzz">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-    <<":abc">> = iolist_to_binary(join(re:split("abczz","^(abc){1,2}zz",[trim]))), 
+                                                                                                                                                                                                                                                                                                        2}]))),
+    <<"aaabcxyzpqrrrabbxyyyypqqqqqqqAzz">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))),
+    <<":abc">> = iolist_to_binary(join(re:split("abczz","^(abc){1,2}zz",[trim]))),
     <<":abc:">> = iolist_to_binary(join(re:split("abczz","^(abc){1,2}zz",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<":abc:">> = iolist_to_binary(join(re:split("abczz","^(abc){1,2}zz",[]))), 
-    <<":abc">> = iolist_to_binary(join(re:split("abcabczz","^(abc){1,2}zz",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<":abc:">> = iolist_to_binary(join(re:split("abczz","^(abc){1,2}zz",[]))),
+    <<":abc">> = iolist_to_binary(join(re:split("abcabczz","^(abc){1,2}zz",[trim]))),
     <<":abc:">> = iolist_to_binary(join(re:split("abcabczz","^(abc){1,2}zz",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<":abc:">> = iolist_to_binary(join(re:split("abcabczz","^(abc){1,2}zz",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(abc){1,2}zz",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<":abc:">> = iolist_to_binary(join(re:split("abcabczz","^(abc){1,2}zz",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(abc){1,2}zz",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(abc){1,2}zz",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(abc){1,2}zz",[]))), 
-    <<"zz">> = iolist_to_binary(join(re:split("zz","^(abc){1,2}zz",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(abc){1,2}zz",[]))),
+    <<"zz">> = iolist_to_binary(join(re:split("zz","^(abc){1,2}zz",[trim]))),
     <<"zz">> = iolist_to_binary(join(re:split("zz","^(abc){1,2}zz",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<"zz">> = iolist_to_binary(join(re:split("zz","^(abc){1,2}zz",[]))), 
-    <<"abcabcabczz">> = iolist_to_binary(join(re:split("abcabcabczz","^(abc){1,2}zz",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<"zz">> = iolist_to_binary(join(re:split("zz","^(abc){1,2}zz",[]))),
+    <<"abcabcabczz">> = iolist_to_binary(join(re:split("abcabcabczz","^(abc){1,2}zz",[trim]))),
     <<"abcabcabczz">> = iolist_to_binary(join(re:split("abcabcabczz","^(abc){1,2}zz",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"abcabcabczz">> = iolist_to_binary(join(re:split("abcabcabczz","^(abc){1,2}zz",[]))), 
-    <<">>abczz">> = iolist_to_binary(join(re:split(">>abczz","^(abc){1,2}zz",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<"abcabcabczz">> = iolist_to_binary(join(re:split("abcabcabczz","^(abc){1,2}zz",[]))),
+    <<">>abczz">> = iolist_to_binary(join(re:split(">>abczz","^(abc){1,2}zz",[trim]))),
     <<">>abczz">> = iolist_to_binary(join(re:split(">>abczz","^(abc){1,2}zz",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<">>abczz">> = iolist_to_binary(join(re:split(">>abczz","^(abc){1,2}zz",[]))), 
-    <<":b">> = iolist_to_binary(join(re:split("bc","^(b+?|a){1,2}?c",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<">>abczz">> = iolist_to_binary(join(re:split(">>abczz","^(abc){1,2}zz",[]))),
+    <<":b">> = iolist_to_binary(join(re:split("bc","^(b+?|a){1,2}?c",[trim]))),
     <<":b:">> = iolist_to_binary(join(re:split("bc","^(b+?|a){1,2}?c",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<":b:">> = iolist_to_binary(join(re:split("bc","^(b+?|a){1,2}?c",[]))), 
-    <<":b">> = iolist_to_binary(join(re:split("bbc","^(b+?|a){1,2}?c",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<":b:">> = iolist_to_binary(join(re:split("bc","^(b+?|a){1,2}?c",[]))),
+    <<":b">> = iolist_to_binary(join(re:split("bbc","^(b+?|a){1,2}?c",[trim]))),
     <<":b:">> = iolist_to_binary(join(re:split("bbc","^(b+?|a){1,2}?c",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<":b:">> = iolist_to_binary(join(re:split("bbc","^(b+?|a){1,2}?c",[]))), 
-    <<":bb">> = iolist_to_binary(join(re:split("bbbc","^(b+?|a){1,2}?c",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<":b:">> = iolist_to_binary(join(re:split("bbc","^(b+?|a){1,2}?c",[]))),
+    <<":bb">> = iolist_to_binary(join(re:split("bbbc","^(b+?|a){1,2}?c",[trim]))),
     <<":bb:">> = iolist_to_binary(join(re:split("bbbc","^(b+?|a){1,2}?c",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<":bb:">> = iolist_to_binary(join(re:split("bbbc","^(b+?|a){1,2}?c",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("bac","^(b+?|a){1,2}?c",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<":bb:">> = iolist_to_binary(join(re:split("bbbc","^(b+?|a){1,2}?c",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("bac","^(b+?|a){1,2}?c",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+?|a){1,2}?c",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+?|a){1,2}?c",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("bbac","^(b+?|a){1,2}?c",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+?|a){1,2}?c",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("bbac","^(b+?|a){1,2}?c",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+?|a){1,2}?c",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+?|a){1,2}?c",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aac","^(b+?|a){1,2}?c",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+?|a){1,2}?c",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aac","^(b+?|a){1,2}?c",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aac","^(b+?|a){1,2}?c",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aac","^(b+?|a){1,2}?c",[]))), 
-    <<":bbbbbbbbbbb">> = iolist_to_binary(join(re:split("abbbbbbbbbbbc","^(b+?|a){1,2}?c",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aac","^(b+?|a){1,2}?c",[]))),
+    <<":bbbbbbbbbbb">> = iolist_to_binary(join(re:split("abbbbbbbbbbbc","^(b+?|a){1,2}?c",[trim]))),
     <<":bbbbbbbbbbb:">> = iolist_to_binary(join(re:split("abbbbbbbbbbbc","^(b+?|a){1,2}?c",[{parts,
-                                                                                                                                                                                                        2}]))), 
-    <<":bbbbbbbbbbb:">> = iolist_to_binary(join(re:split("abbbbbbbbbbbc","^(b+?|a){1,2}?c",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("bbbbbbbbbbbac","^(b+?|a){1,2}?c",[trim]))), 
+                                                                                                                                                                                                        2}]))),
+    <<":bbbbbbbbbbb:">> = iolist_to_binary(join(re:split("abbbbbbbbbbbc","^(b+?|a){1,2}?c",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("bbbbbbbbbbbac","^(b+?|a){1,2}?c",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("bbbbbbbbbbbac","^(b+?|a){1,2}?c",[{parts,
-                                                                                                                                                                                                        2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("bbbbbbbbbbbac","^(b+?|a){1,2}?c",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b+?|a){1,2}?c",[trim]))), 
+                                                                                                                                                                                                        2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("bbbbbbbbbbbac","^(b+?|a){1,2}?c",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b+?|a){1,2}?c",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b+?|a){1,2}?c",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b+?|a){1,2}?c",[]))), 
-    <<"aaac">> = iolist_to_binary(join(re:split("aaac","^(b+?|a){1,2}?c",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b+?|a){1,2}?c",[]))),
+    <<"aaac">> = iolist_to_binary(join(re:split("aaac","^(b+?|a){1,2}?c",[trim]))),
     <<"aaac">> = iolist_to_binary(join(re:split("aaac","^(b+?|a){1,2}?c",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<"aaac">> = iolist_to_binary(join(re:split("aaac","^(b+?|a){1,2}?c",[]))), 
-    <<"abbbbbbbbbbbac">> = iolist_to_binary(join(re:split("abbbbbbbbbbbac","^(b+?|a){1,2}?c",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<"aaac">> = iolist_to_binary(join(re:split("aaac","^(b+?|a){1,2}?c",[]))),
+    <<"abbbbbbbbbbbac">> = iolist_to_binary(join(re:split("abbbbbbbbbbbac","^(b+?|a){1,2}?c",[trim]))),
     <<"abbbbbbbbbbbac">> = iolist_to_binary(join(re:split("abbbbbbbbbbbac","^(b+?|a){1,2}?c",[{parts,
-                                                                                                                                                                                                          2}]))), 
-    <<"abbbbbbbbbbbac">> = iolist_to_binary(join(re:split("abbbbbbbbbbbac","^(b+?|a){1,2}?c",[]))), 
-    <<":b">> = iolist_to_binary(join(re:split("bc","^(b+|a){1,2}c",[trim]))), 
+                                                                                                                                                                                                          2}]))),
+    <<"abbbbbbbbbbbac">> = iolist_to_binary(join(re:split("abbbbbbbbbbbac","^(b+?|a){1,2}?c",[]))),
+    <<":b">> = iolist_to_binary(join(re:split("bc","^(b+|a){1,2}c",[trim]))),
     <<":b:">> = iolist_to_binary(join(re:split("bc","^(b+|a){1,2}c",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":b:">> = iolist_to_binary(join(re:split("bc","^(b+|a){1,2}c",[]))), 
-    <<":bb">> = iolist_to_binary(join(re:split("bbc","^(b+|a){1,2}c",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":b:">> = iolist_to_binary(join(re:split("bc","^(b+|a){1,2}c",[]))),
+    <<":bb">> = iolist_to_binary(join(re:split("bbc","^(b+|a){1,2}c",[trim]))),
     <<":bb:">> = iolist_to_binary(join(re:split("bbc","^(b+|a){1,2}c",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<":bb:">> = iolist_to_binary(join(re:split("bbc","^(b+|a){1,2}c",[]))), 
-    <<":bbb">> = iolist_to_binary(join(re:split("bbbc","^(b+|a){1,2}c",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<":bb:">> = iolist_to_binary(join(re:split("bbc","^(b+|a){1,2}c",[]))),
+    <<":bbb">> = iolist_to_binary(join(re:split("bbbc","^(b+|a){1,2}c",[trim]))),
     <<":bbb:">> = iolist_to_binary(join(re:split("bbbc","^(b+|a){1,2}c",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<":bbb:">> = iolist_to_binary(join(re:split("bbbc","^(b+|a){1,2}c",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("bac","^(b+|a){1,2}c",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<":bbb:">> = iolist_to_binary(join(re:split("bbbc","^(b+|a){1,2}c",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("bac","^(b+|a){1,2}c",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+|a){1,2}c",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+|a){1,2}c",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("bbac","^(b+|a){1,2}c",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+|a){1,2}c",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("bbac","^(b+|a){1,2}c",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+|a){1,2}c",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+|a){1,2}c",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aac","^(b+|a){1,2}c",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+|a){1,2}c",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aac","^(b+|a){1,2}c",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aac","^(b+|a){1,2}c",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aac","^(b+|a){1,2}c",[]))), 
-    <<":bbbbbbbbbbb">> = iolist_to_binary(join(re:split("abbbbbbbbbbbc","^(b+|a){1,2}c",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aac","^(b+|a){1,2}c",[]))),
+    <<":bbbbbbbbbbb">> = iolist_to_binary(join(re:split("abbbbbbbbbbbc","^(b+|a){1,2}c",[trim]))),
     <<":bbbbbbbbbbb:">> = iolist_to_binary(join(re:split("abbbbbbbbbbbc","^(b+|a){1,2}c",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<":bbbbbbbbbbb:">> = iolist_to_binary(join(re:split("abbbbbbbbbbbc","^(b+|a){1,2}c",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("bbbbbbbbbbbac","^(b+|a){1,2}c",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<":bbbbbbbbbbb:">> = iolist_to_binary(join(re:split("abbbbbbbbbbbc","^(b+|a){1,2}c",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("bbbbbbbbbbbac","^(b+|a){1,2}c",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("bbbbbbbbbbbac","^(b+|a){1,2}c",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("bbbbbbbbbbbac","^(b+|a){1,2}c",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b+|a){1,2}c",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("bbbbbbbbbbbac","^(b+|a){1,2}c",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b+|a){1,2}c",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b+|a){1,2}c",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b+|a){1,2}c",[]))), 
-    <<"aaac">> = iolist_to_binary(join(re:split("aaac","^(b+|a){1,2}c",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b+|a){1,2}c",[]))),
+    <<"aaac">> = iolist_to_binary(join(re:split("aaac","^(b+|a){1,2}c",[trim]))),
     <<"aaac">> = iolist_to_binary(join(re:split("aaac","^(b+|a){1,2}c",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"aaac">> = iolist_to_binary(join(re:split("aaac","^(b+|a){1,2}c",[]))), 
-    <<"abbbbbbbbbbbac">> = iolist_to_binary(join(re:split("abbbbbbbbbbbac","^(b+|a){1,2}c",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"aaac">> = iolist_to_binary(join(re:split("aaac","^(b+|a){1,2}c",[]))),
+    <<"abbbbbbbbbbbac">> = iolist_to_binary(join(re:split("abbbbbbbbbbbac","^(b+|a){1,2}c",[trim]))),
     <<"abbbbbbbbbbbac">> = iolist_to_binary(join(re:split("abbbbbbbbbbbac","^(b+|a){1,2}c",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<"abbbbbbbbbbbac">> = iolist_to_binary(join(re:split("abbbbbbbbbbbac","^(b+|a){1,2}c",[]))), 
-    <<":b">> = iolist_to_binary(join(re:split("bbc","^(b+|a){1,2}?bc",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<"abbbbbbbbbbbac">> = iolist_to_binary(join(re:split("abbbbbbbbbbbac","^(b+|a){1,2}c",[]))),
+    <<":b">> = iolist_to_binary(join(re:split("bbc","^(b+|a){1,2}?bc",[trim]))),
     <<":b:">> = iolist_to_binary(join(re:split("bbc","^(b+|a){1,2}?bc",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<":b:">> = iolist_to_binary(join(re:split("bbc","^(b+|a){1,2}?bc",[]))), 
-    <<":ba">> = iolist_to_binary(join(re:split("babc","^(b*|ba){1,2}?bc",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<":b:">> = iolist_to_binary(join(re:split("bbc","^(b+|a){1,2}?bc",[]))),
+    <<":ba">> = iolist_to_binary(join(re:split("babc","^(b*|ba){1,2}?bc",[trim]))),
     <<":ba:">> = iolist_to_binary(join(re:split("babc","^(b*|ba){1,2}?bc",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<":ba:">> = iolist_to_binary(join(re:split("babc","^(b*|ba){1,2}?bc",[]))), 
-    <<":ba">> = iolist_to_binary(join(re:split("bbabc","^(b*|ba){1,2}?bc",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<":ba:">> = iolist_to_binary(join(re:split("babc","^(b*|ba){1,2}?bc",[]))),
+    <<":ba">> = iolist_to_binary(join(re:split("bbabc","^(b*|ba){1,2}?bc",[trim]))),
     <<":ba:">> = iolist_to_binary(join(re:split("bbabc","^(b*|ba){1,2}?bc",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<":ba:">> = iolist_to_binary(join(re:split("bbabc","^(b*|ba){1,2}?bc",[]))), 
-    <<":ba">> = iolist_to_binary(join(re:split("bababc","^(b*|ba){1,2}?bc",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<":ba:">> = iolist_to_binary(join(re:split("bbabc","^(b*|ba){1,2}?bc",[]))),
+    <<":ba">> = iolist_to_binary(join(re:split("bababc","^(b*|ba){1,2}?bc",[trim]))),
     <<":ba:">> = iolist_to_binary(join(re:split("bababc","^(b*|ba){1,2}?bc",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<":ba:">> = iolist_to_binary(join(re:split("bababc","^(b*|ba){1,2}?bc",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b*|ba){1,2}?bc",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<":ba:">> = iolist_to_binary(join(re:split("bababc","^(b*|ba){1,2}?bc",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b*|ba){1,2}?bc",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b*|ba){1,2}?bc",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b*|ba){1,2}?bc",[]))), 
-    <<"bababbc">> = iolist_to_binary(join(re:split("bababbc","^(b*|ba){1,2}?bc",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b*|ba){1,2}?bc",[]))),
+    <<"bababbc">> = iolist_to_binary(join(re:split("bababbc","^(b*|ba){1,2}?bc",[trim]))),
     <<"bababbc">> = iolist_to_binary(join(re:split("bababbc","^(b*|ba){1,2}?bc",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"bababbc">> = iolist_to_binary(join(re:split("bababbc","^(b*|ba){1,2}?bc",[]))), 
-    <<"babababc">> = iolist_to_binary(join(re:split("babababc","^(b*|ba){1,2}?bc",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<"bababbc">> = iolist_to_binary(join(re:split("bababbc","^(b*|ba){1,2}?bc",[]))),
+    <<"babababc">> = iolist_to_binary(join(re:split("babababc","^(b*|ba){1,2}?bc",[trim]))),
     <<"babababc">> = iolist_to_binary(join(re:split("babababc","^(b*|ba){1,2}?bc",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"babababc">> = iolist_to_binary(join(re:split("babababc","^(b*|ba){1,2}?bc",[]))), 
-    <<":ba">> = iolist_to_binary(join(re:split("babc","^(ba|b*){1,2}?bc",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<"babababc">> = iolist_to_binary(join(re:split("babababc","^(b*|ba){1,2}?bc",[]))),
+    <<":ba">> = iolist_to_binary(join(re:split("babc","^(ba|b*){1,2}?bc",[trim]))),
     <<":ba:">> = iolist_to_binary(join(re:split("babc","^(ba|b*){1,2}?bc",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<":ba:">> = iolist_to_binary(join(re:split("babc","^(ba|b*){1,2}?bc",[]))), 
-    <<":ba">> = iolist_to_binary(join(re:split("bbabc","^(ba|b*){1,2}?bc",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<":ba:">> = iolist_to_binary(join(re:split("babc","^(ba|b*){1,2}?bc",[]))),
+    <<":ba">> = iolist_to_binary(join(re:split("bbabc","^(ba|b*){1,2}?bc",[trim]))),
     <<":ba:">> = iolist_to_binary(join(re:split("bbabc","^(ba|b*){1,2}?bc",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<":ba:">> = iolist_to_binary(join(re:split("bbabc","^(ba|b*){1,2}?bc",[]))), 
-    <<":ba">> = iolist_to_binary(join(re:split("bababc","^(ba|b*){1,2}?bc",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<":ba:">> = iolist_to_binary(join(re:split("bbabc","^(ba|b*){1,2}?bc",[]))),
+    <<":ba">> = iolist_to_binary(join(re:split("bababc","^(ba|b*){1,2}?bc",[trim]))),
     <<":ba:">> = iolist_to_binary(join(re:split("bababc","^(ba|b*){1,2}?bc",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<":ba:">> = iolist_to_binary(join(re:split("bababc","^(ba|b*){1,2}?bc",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(ba|b*){1,2}?bc",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<":ba:">> = iolist_to_binary(join(re:split("bababc","^(ba|b*){1,2}?bc",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(ba|b*){1,2}?bc",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(ba|b*){1,2}?bc",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(ba|b*){1,2}?bc",[]))), 
-    <<"bababbc">> = iolist_to_binary(join(re:split("bababbc","^(ba|b*){1,2}?bc",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(ba|b*){1,2}?bc",[]))),
+    <<"bababbc">> = iolist_to_binary(join(re:split("bababbc","^(ba|b*){1,2}?bc",[trim]))),
     <<"bababbc">> = iolist_to_binary(join(re:split("bababbc","^(ba|b*){1,2}?bc",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"bababbc">> = iolist_to_binary(join(re:split("bababbc","^(ba|b*){1,2}?bc",[]))), 
-    <<"babababc">> = iolist_to_binary(join(re:split("babababc","^(ba|b*){1,2}?bc",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<"bababbc">> = iolist_to_binary(join(re:split("bababbc","^(ba|b*){1,2}?bc",[]))),
+    <<"babababc">> = iolist_to_binary(join(re:split("babababc","^(ba|b*){1,2}?bc",[trim]))),
     <<"babababc">> = iolist_to_binary(join(re:split("babababc","^(ba|b*){1,2}?bc",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"babababc">> = iolist_to_binary(join(re:split("babababc","^(ba|b*){1,2}?bc",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("

;z","^\\ca\\cA\\c[;\\c:",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<"babababc">> = iolist_to_binary(join(re:split("babababc","^(ba|b*){1,2}?bc",[]))),
+    <<"">> = iolist_to_binary(join(re:split("

;z","^\\ca\\cA\\c[;\\c:",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("

;z","^\\ca\\cA\\c[;\\c:",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("

;z","^\\ca\\cA\\c[;\\c:",[]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("athing","^[ab\\]cde]",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("

;z","^\\ca\\cA\\c[;\\c:",[]))),
+    <<":thing">> = iolist_to_binary(join(re:split("athing","^[ab\\]cde]",[trim]))),
     <<":thing">> = iolist_to_binary(join(re:split("athing","^[ab\\]cde]",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("athing","^[ab\\]cde]",[]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("bthing","^[ab\\]cde]",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<":thing">> = iolist_to_binary(join(re:split("athing","^[ab\\]cde]",[]))),
+    <<":thing">> = iolist_to_binary(join(re:split("bthing","^[ab\\]cde]",[trim]))),
     <<":thing">> = iolist_to_binary(join(re:split("bthing","^[ab\\]cde]",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("bthing","^[ab\\]cde]",[]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("]thing","^[ab\\]cde]",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<":thing">> = iolist_to_binary(join(re:split("bthing","^[ab\\]cde]",[]))),
+    <<":thing">> = iolist_to_binary(join(re:split("]thing","^[ab\\]cde]",[trim]))),
     <<":thing">> = iolist_to_binary(join(re:split("]thing","^[ab\\]cde]",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("]thing","^[ab\\]cde]",[]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("cthing","^[ab\\]cde]",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<":thing">> = iolist_to_binary(join(re:split("]thing","^[ab\\]cde]",[]))),
+    <<":thing">> = iolist_to_binary(join(re:split("cthing","^[ab\\]cde]",[trim]))),
     <<":thing">> = iolist_to_binary(join(re:split("cthing","^[ab\\]cde]",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("cthing","^[ab\\]cde]",[]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("dthing","^[ab\\]cde]",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<":thing">> = iolist_to_binary(join(re:split("cthing","^[ab\\]cde]",[]))),
+    <<":thing">> = iolist_to_binary(join(re:split("dthing","^[ab\\]cde]",[trim]))),
     <<":thing">> = iolist_to_binary(join(re:split("dthing","^[ab\\]cde]",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("dthing","^[ab\\]cde]",[]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("ething","^[ab\\]cde]",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<":thing">> = iolist_to_binary(join(re:split("dthing","^[ab\\]cde]",[]))),
+    <<":thing">> = iolist_to_binary(join(re:split("ething","^[ab\\]cde]",[trim]))),
     <<":thing">> = iolist_to_binary(join(re:split("ething","^[ab\\]cde]",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("ething","^[ab\\]cde]",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[ab\\]cde]",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<":thing">> = iolist_to_binary(join(re:split("ething","^[ab\\]cde]",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[ab\\]cde]",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[ab\\]cde]",[{parts,
-                                                                                                                                                                                             2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[ab\\]cde]",[]))), 
-    <<"fthing">> = iolist_to_binary(join(re:split("fthing","^[ab\\]cde]",[trim]))), 
+                                                                                                                                                                                             2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[ab\\]cde]",[]))),
+    <<"fthing">> = iolist_to_binary(join(re:split("fthing","^[ab\\]cde]",[trim]))),
     <<"fthing">> = iolist_to_binary(join(re:split("fthing","^[ab\\]cde]",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<"fthing">> = iolist_to_binary(join(re:split("fthing","^[ab\\]cde]",[]))), 
-    <<"[thing">> = iolist_to_binary(join(re:split("[thing","^[ab\\]cde]",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<"fthing">> = iolist_to_binary(join(re:split("fthing","^[ab\\]cde]",[]))),
+    <<"[thing">> = iolist_to_binary(join(re:split("[thing","^[ab\\]cde]",[trim]))),
     <<"[thing">> = iolist_to_binary(join(re:split("[thing","^[ab\\]cde]",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<"[thing">> = iolist_to_binary(join(re:split("[thing","^[ab\\]cde]",[]))), 
-    <<"\\thing">> = iolist_to_binary(join(re:split("\\thing","^[ab\\]cde]",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<"[thing">> = iolist_to_binary(join(re:split("[thing","^[ab\\]cde]",[]))),
+    <<"\\thing">> = iolist_to_binary(join(re:split("\\thing","^[ab\\]cde]",[trim]))),
     <<"\\thing">> = iolist_to_binary(join(re:split("\\thing","^[ab\\]cde]",[{parts,
-                                                                                                                                                                                       2}]))), 
-    <<"\\thing">> = iolist_to_binary(join(re:split("\\thing","^[ab\\]cde]",[]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("]thing","^[]cde]",[trim]))), 
+                                                                                                                                                                                       2}]))),
+    <<"\\thing">> = iolist_to_binary(join(re:split("\\thing","^[ab\\]cde]",[]))),
+    <<":thing">> = iolist_to_binary(join(re:split("]thing","^[]cde]",[trim]))),
     <<":thing">> = iolist_to_binary(join(re:split("]thing","^[]cde]",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("]thing","^[]cde]",[]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("cthing","^[]cde]",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<":thing">> = iolist_to_binary(join(re:split("]thing","^[]cde]",[]))),
+    <<":thing">> = iolist_to_binary(join(re:split("cthing","^[]cde]",[trim]))),
     <<":thing">> = iolist_to_binary(join(re:split("cthing","^[]cde]",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("cthing","^[]cde]",[]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("dthing","^[]cde]",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<":thing">> = iolist_to_binary(join(re:split("cthing","^[]cde]",[]))),
+    <<":thing">> = iolist_to_binary(join(re:split("dthing","^[]cde]",[trim]))),
     <<":thing">> = iolist_to_binary(join(re:split("dthing","^[]cde]",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("dthing","^[]cde]",[]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("ething","^[]cde]",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<":thing">> = iolist_to_binary(join(re:split("dthing","^[]cde]",[]))),
+    <<":thing">> = iolist_to_binary(join(re:split("ething","^[]cde]",[trim]))),
     <<":thing">> = iolist_to_binary(join(re:split("ething","^[]cde]",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("ething","^[]cde]",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[]cde]",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<":thing">> = iolist_to_binary(join(re:split("ething","^[]cde]",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[]cde]",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[]cde]",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[]cde]",[]))), 
-    <<"athing">> = iolist_to_binary(join(re:split("athing","^[]cde]",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[]cde]",[]))),
+    <<"athing">> = iolist_to_binary(join(re:split("athing","^[]cde]",[trim]))),
     <<"athing">> = iolist_to_binary(join(re:split("athing","^[]cde]",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<"athing">> = iolist_to_binary(join(re:split("athing","^[]cde]",[]))), 
-    <<"fthing">> = iolist_to_binary(join(re:split("fthing","^[]cde]",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<"athing">> = iolist_to_binary(join(re:split("athing","^[]cde]",[]))),
+    <<"fthing">> = iolist_to_binary(join(re:split("fthing","^[]cde]",[trim]))),
     <<"fthing">> = iolist_to_binary(join(re:split("fthing","^[]cde]",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<"fthing">> = iolist_to_binary(join(re:split("fthing","^[]cde]",[]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("fthing","^[^ab\\]cde]",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<"fthing">> = iolist_to_binary(join(re:split("fthing","^[]cde]",[]))),
+    <<":thing">> = iolist_to_binary(join(re:split("fthing","^[^ab\\]cde]",[trim]))),
     <<":thing">> = iolist_to_binary(join(re:split("fthing","^[^ab\\]cde]",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("fthing","^[^ab\\]cde]",[]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("[thing","^[^ab\\]cde]",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<":thing">> = iolist_to_binary(join(re:split("fthing","^[^ab\\]cde]",[]))),
+    <<":thing">> = iolist_to_binary(join(re:split("[thing","^[^ab\\]cde]",[trim]))),
     <<":thing">> = iolist_to_binary(join(re:split("[thing","^[^ab\\]cde]",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("[thing","^[^ab\\]cde]",[]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("\\thing","^[^ab\\]cde]",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<":thing">> = iolist_to_binary(join(re:split("[thing","^[^ab\\]cde]",[]))),
+    <<":thing">> = iolist_to_binary(join(re:split("\\thing","^[^ab\\]cde]",[trim]))),
     <<":thing">> = iolist_to_binary(join(re:split("\\thing","^[^ab\\]cde]",[{parts,
-                                                                                                                                                                                         2}]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("\\thing","^[^ab\\]cde]",[]))), 
-    <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[^ab\\]cde]",[trim]))), 
+                                                                                                                                                                                         2}]))),
+    <<":thing">> = iolist_to_binary(join(re:split("\\thing","^[^ab\\]cde]",[]))),
+    <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[^ab\\]cde]",[trim]))),
     <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[^ab\\]cde]",[{parts,
-                                                                                                                                                                                               2}]))), 
-    <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[^ab\\]cde]",[]))), 
-    <<"athing">> = iolist_to_binary(join(re:split("athing","^[^ab\\]cde]",[trim]))), 
+                                                                                                                                                                                               2}]))),
+    <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[^ab\\]cde]",[]))),
+    <<"athing">> = iolist_to_binary(join(re:split("athing","^[^ab\\]cde]",[trim]))),
     <<"athing">> = iolist_to_binary(join(re:split("athing","^[^ab\\]cde]",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<"athing">> = iolist_to_binary(join(re:split("athing","^[^ab\\]cde]",[]))), 
-    <<"bthing">> = iolist_to_binary(join(re:split("bthing","^[^ab\\]cde]",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<"athing">> = iolist_to_binary(join(re:split("athing","^[^ab\\]cde]",[]))),
+    <<"bthing">> = iolist_to_binary(join(re:split("bthing","^[^ab\\]cde]",[trim]))),
     <<"bthing">> = iolist_to_binary(join(re:split("bthing","^[^ab\\]cde]",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<"bthing">> = iolist_to_binary(join(re:split("bthing","^[^ab\\]cde]",[]))), 
-    <<"]thing">> = iolist_to_binary(join(re:split("]thing","^[^ab\\]cde]",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<"bthing">> = iolist_to_binary(join(re:split("bthing","^[^ab\\]cde]",[]))),
+    <<"]thing">> = iolist_to_binary(join(re:split("]thing","^[^ab\\]cde]",[trim]))),
     <<"]thing">> = iolist_to_binary(join(re:split("]thing","^[^ab\\]cde]",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<"]thing">> = iolist_to_binary(join(re:split("]thing","^[^ab\\]cde]",[]))), 
-    <<"cthing">> = iolist_to_binary(join(re:split("cthing","^[^ab\\]cde]",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<"]thing">> = iolist_to_binary(join(re:split("]thing","^[^ab\\]cde]",[]))),
+    <<"cthing">> = iolist_to_binary(join(re:split("cthing","^[^ab\\]cde]",[trim]))),
     <<"cthing">> = iolist_to_binary(join(re:split("cthing","^[^ab\\]cde]",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<"cthing">> = iolist_to_binary(join(re:split("cthing","^[^ab\\]cde]",[]))), 
-    <<"dthing">> = iolist_to_binary(join(re:split("dthing","^[^ab\\]cde]",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<"cthing">> = iolist_to_binary(join(re:split("cthing","^[^ab\\]cde]",[]))),
+    <<"dthing">> = iolist_to_binary(join(re:split("dthing","^[^ab\\]cde]",[trim]))),
     <<"dthing">> = iolist_to_binary(join(re:split("dthing","^[^ab\\]cde]",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<"dthing">> = iolist_to_binary(join(re:split("dthing","^[^ab\\]cde]",[]))), 
-    <<"ething">> = iolist_to_binary(join(re:split("ething","^[^ab\\]cde]",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<"dthing">> = iolist_to_binary(join(re:split("dthing","^[^ab\\]cde]",[]))),
+    <<"ething">> = iolist_to_binary(join(re:split("ething","^[^ab\\]cde]",[trim]))),
     <<"ething">> = iolist_to_binary(join(re:split("ething","^[^ab\\]cde]",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<"ething">> = iolist_to_binary(join(re:split("ething","^[^ab\\]cde]",[]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("athing","^[^]cde]",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<"ething">> = iolist_to_binary(join(re:split("ething","^[^ab\\]cde]",[]))),
+    <<":thing">> = iolist_to_binary(join(re:split("athing","^[^]cde]",[trim]))),
     <<":thing">> = iolist_to_binary(join(re:split("athing","^[^]cde]",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("athing","^[^]cde]",[]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("fthing","^[^]cde]",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<":thing">> = iolist_to_binary(join(re:split("athing","^[^]cde]",[]))),
+    <<":thing">> = iolist_to_binary(join(re:split("fthing","^[^]cde]",[trim]))),
     <<":thing">> = iolist_to_binary(join(re:split("fthing","^[^]cde]",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<":thing">> = iolist_to_binary(join(re:split("fthing","^[^]cde]",[]))), 
-    <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[^]cde]",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<":thing">> = iolist_to_binary(join(re:split("fthing","^[^]cde]",[]))),
+    <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[^]cde]",[trim]))),
     <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[^]cde]",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[^]cde]",[]))), 
-    <<"]thing">> = iolist_to_binary(join(re:split("]thing","^[^]cde]",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[^]cde]",[]))),
+    <<"]thing">> = iolist_to_binary(join(re:split("]thing","^[^]cde]",[trim]))),
     <<"]thing">> = iolist_to_binary(join(re:split("]thing","^[^]cde]",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"]thing">> = iolist_to_binary(join(re:split("]thing","^[^]cde]",[]))), 
-    <<"cthing">> = iolist_to_binary(join(re:split("cthing","^[^]cde]",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<"]thing">> = iolist_to_binary(join(re:split("]thing","^[^]cde]",[]))),
+    <<"cthing">> = iolist_to_binary(join(re:split("cthing","^[^]cde]",[trim]))),
     <<"cthing">> = iolist_to_binary(join(re:split("cthing","^[^]cde]",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"cthing">> = iolist_to_binary(join(re:split("cthing","^[^]cde]",[]))), 
-    <<"dthing">> = iolist_to_binary(join(re:split("dthing","^[^]cde]",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<"cthing">> = iolist_to_binary(join(re:split("cthing","^[^]cde]",[]))),
+    <<"dthing">> = iolist_to_binary(join(re:split("dthing","^[^]cde]",[trim]))),
     <<"dthing">> = iolist_to_binary(join(re:split("dthing","^[^]cde]",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"dthing">> = iolist_to_binary(join(re:split("dthing","^[^]cde]",[]))), 
-    <<"ething">> = iolist_to_binary(join(re:split("ething","^[^]cde]",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<"dthing">> = iolist_to_binary(join(re:split("dthing","^[^]cde]",[]))),
+    <<"ething">> = iolist_to_binary(join(re:split("ething","^[^]cde]",[trim]))),
     <<"ething">> = iolist_to_binary(join(re:split("ething","^[^]cde]",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"ething">> = iolist_to_binary(join(re:split("ething","^[^]cde]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("0","^[0-9]+$",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<"ething">> = iolist_to_binary(join(re:split("ething","^[^]cde]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("0","^[0-9]+$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("0","^[0-9]+$",[{parts,
-                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("0","^[0-9]+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("1","^[0-9]+$",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("0","^[0-9]+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("1","^[0-9]+$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("1","^[0-9]+$",[{parts,
-                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("1","^[0-9]+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("2","^[0-9]+$",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("1","^[0-9]+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("2","^[0-9]+$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("2","^[0-9]+$",[{parts,
-                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("2","^[0-9]+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("3","^[0-9]+$",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("2","^[0-9]+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("3","^[0-9]+$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("3","^[0-9]+$",[{parts,
-                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("3","^[0-9]+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("4","^[0-9]+$",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("3","^[0-9]+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("4","^[0-9]+$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("4","^[0-9]+$",[{parts,
-                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("4","^[0-9]+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("5","^[0-9]+$",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("4","^[0-9]+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("5","^[0-9]+$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("5","^[0-9]+$",[{parts,
-                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("5","^[0-9]+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("6","^[0-9]+$",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("5","^[0-9]+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("6","^[0-9]+$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("6","^[0-9]+$",[{parts,
-                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("6","^[0-9]+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("7","^[0-9]+$",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("6","^[0-9]+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("7","^[0-9]+$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("7","^[0-9]+$",[{parts,
-                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("7","^[0-9]+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("8","^[0-9]+$",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("7","^[0-9]+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("8","^[0-9]+$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("8","^[0-9]+$",[{parts,
-                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("8","^[0-9]+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("9","^[0-9]+$",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("8","^[0-9]+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("9","^[0-9]+$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("9","^[0-9]+$",[{parts,
-                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("9","^[0-9]+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("10","^[0-9]+$",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("9","^[0-9]+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("10","^[0-9]+$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("10","^[0-9]+$",[{parts,
-                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("10","^[0-9]+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("100","^[0-9]+$",[trim]))), 
+                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("10","^[0-9]+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("100","^[0-9]+$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("100","^[0-9]+$",[{parts,
-                                                                                                                                                                       2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("100","^[0-9]+$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[0-9]+$",[trim]))), 
+                                                                                                                                                                       2}]))),
+    <<":">> = iolist_to_binary(join(re:split("100","^[0-9]+$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[0-9]+$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[0-9]+$",[{parts,
-                                                                                                                                                                                       2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[0-9]+$",[]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","^[0-9]+$",[trim]))), 
+                                                                                                                                                                                       2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[0-9]+$",[]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^[0-9]+$",[trim]))),
     <<"abc">> = iolist_to_binary(join(re:split("abc","^[0-9]+$",[{parts,
-                                                                                                                                                                       2}]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","^[0-9]+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("enter","^.*nter",[trim]))), 
+                                                                                                                                                                       2}]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^[0-9]+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("enter","^.*nter",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("enter","^.*nter",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("enter","^.*nter",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("inter","^.*nter",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("enter","^.*nter",[]))),
+    <<"">> = iolist_to_binary(join(re:split("inter","^.*nter",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("inter","^.*nter",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("inter","^.*nter",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("uponter","^.*nter",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("inter","^.*nter",[]))),
+    <<"">> = iolist_to_binary(join(re:split("uponter","^.*nter",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("uponter","^.*nter",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("uponter","^.*nter",[]))), 
+                                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("uponter","^.*nter",[]))),
     ok.
 run1() ->
-    <<"">> = iolist_to_binary(join(re:split("xxx0","^xxx[0-9]+$",[trim]))), 
+    <<"">> = iolist_to_binary(join(re:split("xxx0","^xxx[0-9]+$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("xxx0","^xxx[0-9]+$",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("xxx0","^xxx[0-9]+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("xxx1234","^xxx[0-9]+$",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<":">> = iolist_to_binary(join(re:split("xxx0","^xxx[0-9]+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("xxx1234","^xxx[0-9]+$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("xxx1234","^xxx[0-9]+$",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("xxx1234","^xxx[0-9]+$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^xxx[0-9]+$",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("xxx1234","^xxx[0-9]+$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^xxx[0-9]+$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^xxx[0-9]+$",[{parts,
-                                                                                                                                                                                             2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^xxx[0-9]+$",[]))), 
-    <<"xxx">> = iolist_to_binary(join(re:split("xxx","^xxx[0-9]+$",[trim]))), 
+                                                                                                                                                                                             2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^xxx[0-9]+$",[]))),
+    <<"xxx">> = iolist_to_binary(join(re:split("xxx","^xxx[0-9]+$",[trim]))),
     <<"xxx">> = iolist_to_binary(join(re:split("xxx","^xxx[0-9]+$",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<"xxx">> = iolist_to_binary(join(re:split("xxx","^xxx[0-9]+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("x123","^.+[0-9][0-9][0-9]$",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<"xxx">> = iolist_to_binary(join(re:split("xxx","^xxx[0-9]+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("x123","^.+[0-9][0-9][0-9]$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("x123","^.+[0-9][0-9][0-9]$",[{parts,
-                                                                                                                                                                                               2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("x123","^.+[0-9][0-9][0-9]$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("xx123","^.+[0-9][0-9][0-9]$",[trim]))), 
+                                                                                                                                                                                               2}]))),
+    <<":">> = iolist_to_binary(join(re:split("x123","^.+[0-9][0-9][0-9]$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("xx123","^.+[0-9][0-9][0-9]$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("xx123","^.+[0-9][0-9][0-9]$",[{parts,
-                                                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("xx123","^.+[0-9][0-9][0-9]$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("123456","^.+[0-9][0-9][0-9]$",[trim]))), 
+                                                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("xx123","^.+[0-9][0-9][0-9]$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("123456","^.+[0-9][0-9][0-9]$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("123456","^.+[0-9][0-9][0-9]$",[{parts,
-                                                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("123456","^.+[0-9][0-9][0-9]$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.+[0-9][0-9][0-9]$",[trim]))), 
+                                                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("123456","^.+[0-9][0-9][0-9]$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.+[0-9][0-9][0-9]$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.+[0-9][0-9][0-9]$",[{parts,
-                                                                                                                                                                                                             2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.+[0-9][0-9][0-9]$",[]))), 
-    <<"123">> = iolist_to_binary(join(re:split("123","^.+[0-9][0-9][0-9]$",[trim]))), 
+                                                                                                                                                                                                             2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.+[0-9][0-9][0-9]$",[]))),
+    <<"123">> = iolist_to_binary(join(re:split("123","^.+[0-9][0-9][0-9]$",[trim]))),
     <<"123">> = iolist_to_binary(join(re:split("123","^.+[0-9][0-9][0-9]$",[{parts,
-                                                                                                                                                                                             2}]))), 
-    <<"123">> = iolist_to_binary(join(re:split("123","^.+[0-9][0-9][0-9]$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("x1234","^.+[0-9][0-9][0-9]$",[trim]))), 
+                                                                                                                                                                                             2}]))),
+    <<"123">> = iolist_to_binary(join(re:split("123","^.+[0-9][0-9][0-9]$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("x1234","^.+[0-9][0-9][0-9]$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("x1234","^.+[0-9][0-9][0-9]$",[{parts,
-                                                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("x1234","^.+[0-9][0-9][0-9]$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("x123","^.+?[0-9][0-9][0-9]$",[trim]))), 
+                                                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("x1234","^.+[0-9][0-9][0-9]$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("x123","^.+?[0-9][0-9][0-9]$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("x123","^.+?[0-9][0-9][0-9]$",[{parts,
-                                                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("x123","^.+?[0-9][0-9][0-9]$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("xx123","^.+?[0-9][0-9][0-9]$",[trim]))), 
+                                                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("x123","^.+?[0-9][0-9][0-9]$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("xx123","^.+?[0-9][0-9][0-9]$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("xx123","^.+?[0-9][0-9][0-9]$",[{parts,
-                                                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("xx123","^.+?[0-9][0-9][0-9]$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("123456","^.+?[0-9][0-9][0-9]$",[trim]))), 
+                                                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("xx123","^.+?[0-9][0-9][0-9]$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("123456","^.+?[0-9][0-9][0-9]$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("123456","^.+?[0-9][0-9][0-9]$",[{parts,
-                                                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("123456","^.+?[0-9][0-9][0-9]$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.+?[0-9][0-9][0-9]$",[trim]))), 
+                                                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("123456","^.+?[0-9][0-9][0-9]$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.+?[0-9][0-9][0-9]$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.+?[0-9][0-9][0-9]$",[{parts,
-                                                                                                                                                                                                               2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.+?[0-9][0-9][0-9]$",[]))), 
-    <<"123">> = iolist_to_binary(join(re:split("123","^.+?[0-9][0-9][0-9]$",[trim]))), 
+                                                                                                                                                                                                               2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.+?[0-9][0-9][0-9]$",[]))),
+    <<"123">> = iolist_to_binary(join(re:split("123","^.+?[0-9][0-9][0-9]$",[trim]))),
     <<"123">> = iolist_to_binary(join(re:split("123","^.+?[0-9][0-9][0-9]$",[{parts,
-                                                                                                                                                                                               2}]))), 
-    <<"123">> = iolist_to_binary(join(re:split("123","^.+?[0-9][0-9][0-9]$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("x1234","^.+?[0-9][0-9][0-9]$",[trim]))), 
+                                                                                                                                                                                               2}]))),
+    <<"123">> = iolist_to_binary(join(re:split("123","^.+?[0-9][0-9][0-9]$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("x1234","^.+?[0-9][0-9][0-9]$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("x1234","^.+?[0-9][0-9][0-9]$",[{parts,
-                                                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("x1234","^.+?[0-9][0-9][0-9]$",[]))), 
-    <<":abc:pqr">> = iolist_to_binary(join(re:split("abc!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[trim]))), 
+                                                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("x1234","^.+?[0-9][0-9][0-9]$",[]))),
+    <<":abc:pqr">> = iolist_to_binary(join(re:split("abc!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[trim]))),
     <<":abc:pqr:">> = iolist_to_binary(join(re:split("abc!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[{parts,
-                                                                                                                                                                                                                                                                                                   2}]))), 
-    <<":abc:pqr:">> = iolist_to_binary(join(re:split("abc!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[trim]))), 
+                                                                                                                                                                                                                                                                                                   2}]))),
+    <<":abc:pqr:">> = iolist_to_binary(join(re:split("abc!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[{parts,
-                                                                                                                                                                                                                                                                 2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[]))), 
-    <<"!pqr=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[trim]))), 
+                                                                                                                                                                                                                                                                 2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[]))),
+    <<"!pqr=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[trim]))),
     <<"!pqr=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[{parts,
-                                                                                                                                                                                                                                                                                             2}]))), 
-    <<"!pqr=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[]))), 
-    <<"abc!=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("abc!=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[trim]))), 
+                                                                                                                                                                                                                                                                                             2}]))),
+    <<"!pqr=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[]))),
+    <<"abc!=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("abc!=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[trim]))),
     <<"abc!=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("abc!=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[{parts,
-                                                                                                                                                                                                                                                                                             2}]))), 
-    <<"abc!=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("abc!=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[]))), 
-    <<"abc!pqr=apquxz:ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("abc!pqr=apquxz:ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[trim]))), 
+                                                                                                                                                                                                                                                                                             2}]))),
+    <<"abc!=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("abc!=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[]))),
+    <<"abc!pqr=apquxz:ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("abc!pqr=apquxz:ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[trim]))),
     <<"abc!pqr=apquxz:ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("abc!pqr=apquxz:ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[{parts,
-                                                                                                                                                                                                                                                                                                   2}]))), 
-    <<"abc!pqr=apquxz:ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("abc!pqr=apquxz:ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[]))), 
-    <<"abc!pqr=apquxz.ixr.zzz.ac.ukk">> = iolist_to_binary(join(re:split("abc!pqr=apquxz.ixr.zzz.ac.ukk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[trim]))), 
+                                                                                                                                                                                                                                                                                                   2}]))),
+    <<"abc!pqr=apquxz:ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("abc!pqr=apquxz:ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[]))),
+    <<"abc!pqr=apquxz.ixr.zzz.ac.ukk">> = iolist_to_binary(join(re:split("abc!pqr=apquxz.ixr.zzz.ac.ukk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[trim]))),
     <<"abc!pqr=apquxz.ixr.zzz.ac.ukk">> = iolist_to_binary(join(re:split("abc!pqr=apquxz.ixr.zzz.ac.ukk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[{parts,
-                                                                                                                                                                                                                                                                                                     2}]))), 
-    <<"abc!pqr=apquxz.ixr.zzz.ac.ukk">> = iolist_to_binary(join(re:split("abc!pqr=apquxz.ixr.zzz.ac.ukk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[]))), 
-    <<"Well, we need a colon: somewhere">> = iolist_to_binary(join(re:split("Well, we need a colon: somewhere",":",[trim]))), 
+                                                                                                                                                                                                                                                                                                     2}]))),
+    <<"abc!pqr=apquxz.ixr.zzz.ac.ukk">> = iolist_to_binary(join(re:split("abc!pqr=apquxz.ixr.zzz.ac.ukk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[]))),
+    <<"Well, we need a colon: somewhere">> = iolist_to_binary(join(re:split("Well, we need a colon: somewhere",":",[trim]))),
     <<"Well, we need a colon: somewhere">> = iolist_to_binary(join(re:split("Well, we need a colon: somewhere",":",[{parts,
-                                                                                                                                                                                                                  2}]))), 
-    <<"Well, we need a colon: somewhere">> = iolist_to_binary(join(re:split("Well, we need a colon: somewhere",":",[]))), 
-    <<"*** Fail if we don't">> = iolist_to_binary(join(re:split("*** Fail if we don't",":",[trim]))), 
+                                                                                                                                                                                                                  2}]))),
+    <<"Well, we need a colon: somewhere">> = iolist_to_binary(join(re:split("Well, we need a colon: somewhere",":",[]))),
+    <<"*** Fail if we don't">> = iolist_to_binary(join(re:split("*** Fail if we don't",":",[trim]))),
     <<"*** Fail if we don't">> = iolist_to_binary(join(re:split("*** Fail if we don't",":",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<"*** Fail if we don't">> = iolist_to_binary(join(re:split("*** Fail if we don't",":",[]))), 
+                                                                                                                                                                                                  2}]))),
+    <<"*** Fail if we don't">> = iolist_to_binary(join(re:split("*** Fail if we don't",":",[]))),
     <<":0abc">> = iolist_to_binary(join(re:split("0abc","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                  trim]))), 
+                                                                                                                                                                                  trim]))),
     <<":0abc:">> = iolist_to_binary(join(re:split("0abc","([\\da-f:]+)$",[caseless,
                                                                                                                                                                                     {parts,
-                                                                                                                                                                                     2}]))), 
-    <<":0abc:">> = iolist_to_binary(join(re:split("0abc","([\\da-f:]+)$",[caseless]))), 
+                                                                                                                                                                                     2}]))),
+    <<":0abc:">> = iolist_to_binary(join(re:split("0abc","([\\da-f:]+)$",[caseless]))),
     <<":abc">> = iolist_to_binary(join(re:split("abc","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                trim]))), 
+                                                                                                                                                                                trim]))),
     <<":abc:">> = iolist_to_binary(join(re:split("abc","([\\da-f:]+)$",[caseless,
                                                                                                                                                                                   {parts,
-                                                                                                                                                                                   2}]))), 
-    <<":abc:">> = iolist_to_binary(join(re:split("abc","([\\da-f:]+)$",[caseless]))), 
+                                                                                                                                                                                   2}]))),
+    <<":abc:">> = iolist_to_binary(join(re:split("abc","([\\da-f:]+)$",[caseless]))),
     <<":fed">> = iolist_to_binary(join(re:split("fed","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                trim]))), 
+                                                                                                                                                                                trim]))),
     <<":fed:">> = iolist_to_binary(join(re:split("fed","([\\da-f:]+)$",[caseless,
                                                                                                                                                                                   {parts,
-                                                                                                                                                                                   2}]))), 
-    <<":fed:">> = iolist_to_binary(join(re:split("fed","([\\da-f:]+)$",[caseless]))), 
+                                                                                                                                                                                   2}]))),
+    <<":fed:">> = iolist_to_binary(join(re:split("fed","([\\da-f:]+)$",[caseless]))),
     <<":E">> = iolist_to_binary(join(re:split("E","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                            trim]))), 
+                                                                                                                                                                            trim]))),
     <<":E:">> = iolist_to_binary(join(re:split("E","([\\da-f:]+)$",[caseless,
                                                                                                                                                                               {parts,
-                                                                                                                                                                               2}]))), 
-    <<":E:">> = iolist_to_binary(join(re:split("E","([\\da-f:]+)$",[caseless]))), 
+                                                                                                                                                                               2}]))),
+    <<":E:">> = iolist_to_binary(join(re:split("E","([\\da-f:]+)$",[caseless]))),
     <<":::">> = iolist_to_binary(join(re:split("::","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                              trim]))), 
+                                                                                                                                                                              trim]))),
     <<"::::">> = iolist_to_binary(join(re:split("::","([\\da-f:]+)$",[caseless,
                                                                                                                                                                                 {parts,
-                                                                                                                                                                                 2}]))), 
-    <<"::::">> = iolist_to_binary(join(re:split("::","([\\da-f:]+)$",[caseless]))), 
+                                                                                                                                                                                 2}]))),
+    <<"::::">> = iolist_to_binary(join(re:split("::","([\\da-f:]+)$",[caseless]))),
     <<":5f03:12C0::932e">> = iolist_to_binary(join(re:split("5f03:12C0::932e","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                                        trim]))), 
+                                                                                                                                                                                                        trim]))),
     <<":5f03:12C0::932e:">> = iolist_to_binary(join(re:split("5f03:12C0::932e","([\\da-f:]+)$",[caseless,
                                                                                                                                                                                                           {parts,
-                                                                                                                                                                                                           2}]))), 
-    <<":5f03:12C0::932e:">> = iolist_to_binary(join(re:split("5f03:12C0::932e","([\\da-f:]+)$",[caseless]))), 
+                                                                                                                                                                                                           2}]))),
+    <<":5f03:12C0::932e:">> = iolist_to_binary(join(re:split("5f03:12C0::932e","([\\da-f:]+)$",[caseless]))),
     <<"fed :def">> = iolist_to_binary(join(re:split("fed def","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                        trim]))), 
+                                                                                                                                                                                        trim]))),
     <<"fed :def:">> = iolist_to_binary(join(re:split("fed def","([\\da-f:]+)$",[caseless,
                                                                                                                                                                                           {parts,
-                                                                                                                                                                                           2}]))), 
-    <<"fed :def:">> = iolist_to_binary(join(re:split("fed def","([\\da-f:]+)$",[caseless]))), 
+                                                                                                                                                                                           2}]))),
+    <<"fed :def:">> = iolist_to_binary(join(re:split("fed def","([\\da-f:]+)$",[caseless]))),
     <<"Any old stu:ff">> = iolist_to_binary(join(re:split("Any old stuff","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                                    trim]))), 
+                                                                                                                                                                                                    trim]))),
     <<"Any old stu:ff:">> = iolist_to_binary(join(re:split("Any old stuff","([\\da-f:]+)$",[caseless,
                                                                                                                                                                                                       {parts,
-                                                                                                                                                                                                       2}]))), 
-    <<"Any old stu:ff:">> = iolist_to_binary(join(re:split("Any old stuff","([\\da-f:]+)$",[caseless]))), 
+                                                                                                                                                                                                       2}]))),
+    <<"Any old stu:ff:">> = iolist_to_binary(join(re:split("Any old stuff","([\\da-f:]+)$",[caseless]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                                trim]))), 
+                                                                                                                                                                                                trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","([\\da-f:]+)$",[caseless,
                                                                                                                                                                                                   {parts,
-                                                                                                                                                                                                   2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","([\\da-f:]+)$",[caseless]))), 
+                                                                                                                                                                                                   2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","([\\da-f:]+)$",[caseless]))),
     <<"0zzz">> = iolist_to_binary(join(re:split("0zzz","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                  trim]))), 
+                                                                                                                                                                                  trim]))),
     <<"0zzz">> = iolist_to_binary(join(re:split("0zzz","([\\da-f:]+)$",[caseless,
                                                                                                                                                                                     {parts,
-                                                                                                                                                                                     2}]))), 
-    <<"0zzz">> = iolist_to_binary(join(re:split("0zzz","([\\da-f:]+)$",[caseless]))), 
+                                                                                                                                                                                     2}]))),
+    <<"0zzz">> = iolist_to_binary(join(re:split("0zzz","([\\da-f:]+)$",[caseless]))),
     <<"gzzz">> = iolist_to_binary(join(re:split("gzzz","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                  trim]))), 
+                                                                                                                                                                                  trim]))),
     <<"gzzz">> = iolist_to_binary(join(re:split("gzzz","([\\da-f:]+)$",[caseless,
                                                                                                                                                                                     {parts,
-                                                                                                                                                                                     2}]))), 
-    <<"gzzz">> = iolist_to_binary(join(re:split("gzzz","([\\da-f:]+)$",[caseless]))), 
+                                                                                                                                                                                     2}]))),
+    <<"gzzz">> = iolist_to_binary(join(re:split("gzzz","([\\da-f:]+)$",[caseless]))),
     <<"fed ">> = iolist_to_binary(join(re:split("fed ","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                  trim]))), 
+                                                                                                                                                                                  trim]))),
     <<"fed ">> = iolist_to_binary(join(re:split("fed ","([\\da-f:]+)$",[caseless,
                                                                                                                                                                                     {parts,
-                                                                                                                                                                                     2}]))), 
-    <<"fed ">> = iolist_to_binary(join(re:split("fed ","([\\da-f:]+)$",[caseless]))), 
+                                                                                                                                                                                     2}]))),
+    <<"fed ">> = iolist_to_binary(join(re:split("fed ","([\\da-f:]+)$",[caseless]))),
     <<"Any old rubbish">> = iolist_to_binary(join(re:split("Any old rubbish","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                                        trim]))), 
+                                                                                                                                                                                                        trim]))),
     <<"Any old rubbish">> = iolist_to_binary(join(re:split("Any old rubbish","([\\da-f:]+)$",[caseless,
                                                                                                                                                                                                           {parts,
-                                                                                                                                                                                                           2}]))), 
-    <<"Any old rubbish">> = iolist_to_binary(join(re:split("Any old rubbish","([\\da-f:]+)$",[caseless]))), 
-    <<":1:2:3">> = iolist_to_binary(join(re:split(".1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[trim]))), 
+                                                                                                                                                                                                           2}]))),
+    <<"Any old rubbish">> = iolist_to_binary(join(re:split("Any old rubbish","([\\da-f:]+)$",[caseless]))),
+    <<":1:2:3">> = iolist_to_binary(join(re:split(".1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[trim]))),
     <<":1:2:3:">> = iolist_to_binary(join(re:split(".1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[{parts,
-                                                                                                                                                                                                                                                         2}]))), 
-    <<":1:2:3:">> = iolist_to_binary(join(re:split(".1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[]))), 
-    <<":12:123:0">> = iolist_to_binary(join(re:split("A.12.123.0","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[trim]))), 
+                                                                                                                                                                                                                                                         2}]))),
+    <<":1:2:3:">> = iolist_to_binary(join(re:split(".1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[]))),
+    <<":12:123:0">> = iolist_to_binary(join(re:split("A.12.123.0","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[trim]))),
     <<":12:123:0:">> = iolist_to_binary(join(re:split("A.12.123.0","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[{parts,
-                                                                                                                                                                                                                                                                 2}]))), 
-    <<":12:123:0:">> = iolist_to_binary(join(re:split("A.12.123.0","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[trim]))), 
+                                                                                                                                                                                                                                                                 2}]))),
+    <<":12:123:0:">> = iolist_to_binary(join(re:split("A.12.123.0","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[{parts,
-                                                                                                                                                                                                                                                                   2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[]))), 
-    <<".1.2.3333">> = iolist_to_binary(join(re:split(".1.2.3333","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[trim]))), 
+                                                                                                                                                                                                                                                                   2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[]))),
+    <<".1.2.3333">> = iolist_to_binary(join(re:split(".1.2.3333","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[trim]))),
     <<".1.2.3333">> = iolist_to_binary(join(re:split(".1.2.3333","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[{parts,
-                                                                                                                                                                                                                                                               2}]))), 
-    <<".1.2.3333">> = iolist_to_binary(join(re:split(".1.2.3333","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[]))), 
-    <<"1.2.3">> = iolist_to_binary(join(re:split("1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[trim]))), 
+                                                                                                                                                                                                                                                               2}]))),
+    <<".1.2.3333">> = iolist_to_binary(join(re:split(".1.2.3333","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[]))),
+    <<"1.2.3">> = iolist_to_binary(join(re:split("1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[trim]))),
     <<"1.2.3">> = iolist_to_binary(join(re:split("1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[{parts,
-                                                                                                                                                                                                                                                       2}]))), 
-    <<"1.2.3">> = iolist_to_binary(join(re:split("1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[]))), 
-    <<"1234.2.3">> = iolist_to_binary(join(re:split("1234.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[trim]))), 
+                                                                                                                                                                                                                                                       2}]))),
+    <<"1.2.3">> = iolist_to_binary(join(re:split("1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[]))),
+    <<"1234.2.3">> = iolist_to_binary(join(re:split("1234.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[trim]))),
     <<"1234.2.3">> = iolist_to_binary(join(re:split("1234.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[{parts,
-                                                                                                                                                                                                                                                             2}]))), 
-    <<"1234.2.3">> = iolist_to_binary(join(re:split("1234.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[]))), 
-    <<":1:non-sp1:non-sp2">> = iolist_to_binary(join(re:split("1 IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[trim]))), 
+                                                                                                                                                                                                                                                             2}]))),
+    <<"1234.2.3">> = iolist_to_binary(join(re:split("1234.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[]))),
+    <<":1:non-sp1:non-sp2">> = iolist_to_binary(join(re:split("1 IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[trim]))),
     <<":1:non-sp1:non-sp2:">> = iolist_to_binary(join(re:split("1 IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[{parts,
-                                                                                                                                                                                                                                                                                                                     2}]))), 
-    <<":1:non-sp1:non-sp2:">> = iolist_to_binary(join(re:split("1 IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[]))), 
-    <<":1:non-sp1:non-sp2">> = iolist_to_binary(join(re:split("1    IN    SOA    non-sp1    non-sp2   (","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[trim]))), 
+                                                                                                                                                                                                                                                                                                                     2}]))),
+    <<":1:non-sp1:non-sp2:">> = iolist_to_binary(join(re:split("1 IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[]))),
+    <<":1:non-sp1:non-sp2">> = iolist_to_binary(join(re:split("1    IN    SOA    non-sp1    non-sp2   (","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[trim]))),
     <<":1:non-sp1:non-sp2:">> = iolist_to_binary(join(re:split("1    IN    SOA    non-sp1    non-sp2   (","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[{parts,
-                                                                                                                                                                                                                                                                                                                                                   2}]))), 
-    <<":1:non-sp1:non-sp2:">> = iolist_to_binary(join(re:split("1    IN    SOA    non-sp1    non-sp2   (","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                                   2}]))),
+    <<":1:non-sp1:non-sp2:">> = iolist_to_binary(join(re:split("1    IN    SOA    non-sp1    non-sp2   (","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[{parts,
-                                                                                                                                                                                                                                                                                         2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[]))), 
-    <<"1IN SOA non-sp1 non-sp2(">> = iolist_to_binary(join(re:split("1IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[trim]))), 
+                                                                                                                                                                                                                                                                                         2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[]))),
+    <<"1IN SOA non-sp1 non-sp2(">> = iolist_to_binary(join(re:split("1IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[trim]))),
     <<"1IN SOA non-sp1 non-sp2(">> = iolist_to_binary(join(re:split("1IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[{parts,
-                                                                                                                                                                                                                                                                                                                   2}]))), 
-    <<"1IN SOA non-sp1 non-sp2(">> = iolist_to_binary(join(re:split("1IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))), 
+                                                                                                                                                                                                                                                                                                                   2}]))),
+    <<"1IN SOA non-sp1 non-sp2(">> = iolist_to_binary(join(re:split("1IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("a.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[{parts,
-                                                                                                                                                                                                                                                                                           2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("a.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("Z.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))), 
+                                                                                                                                                                                                                                                                                           2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("a.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("Z.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("Z.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[{parts,
-                                                                                                                                                                                                                                                                                           2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("Z.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("2.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))), 
+                                                                                                                                                                                                                                                                                           2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("Z.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("2.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("2.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[{parts,
-                                                                                                                                                                                                                                                                                           2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("2.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))), 
-    <<":.pq-r">> = iolist_to_binary(join(re:split("ab-c.pq-r.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))), 
+                                                                                                                                                                                                                                                                                           2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("2.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))),
+    <<":.pq-r">> = iolist_to_binary(join(re:split("ab-c.pq-r.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))),
     <<":.pq-r:">> = iolist_to_binary(join(re:split("ab-c.pq-r.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[{parts,
-                                                                                                                                                                                                                                                                                                           2}]))), 
-    <<":.pq-r:">> = iolist_to_binary(join(re:split("ab-c.pq-r.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))), 
-    <<":.uk">> = iolist_to_binary(join(re:split("sxk.zzz.ac.uk.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))), 
+                                                                                                                                                                                                                                                                                                           2}]))),
+    <<":.pq-r:">> = iolist_to_binary(join(re:split("ab-c.pq-r.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))),
+    <<":.uk">> = iolist_to_binary(join(re:split("sxk.zzz.ac.uk.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))),
     <<":.uk:">> = iolist_to_binary(join(re:split("sxk.zzz.ac.uk.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[{parts,
-                                                                                                                                                                                                                                                                                                                   2}]))), 
-    <<":.uk:">> = iolist_to_binary(join(re:split("sxk.zzz.ac.uk.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))), 
-    <<":.y-">> = iolist_to_binary(join(re:split("x-.y-.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))), 
+                                                                                                                                                                                                                                                                                                                   2}]))),
+    <<":.uk:">> = iolist_to_binary(join(re:split("sxk.zzz.ac.uk.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))),
+    <<":.y-">> = iolist_to_binary(join(re:split("x-.y-.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))),
     <<":.y-:">> = iolist_to_binary(join(re:split("x-.y-.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[{parts,
-                                                                                                                                                                                                                                                                                                   2}]))), 
-    <<":.y-:">> = iolist_to_binary(join(re:split("x-.y-.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))), 
+                                                                                                                                                                                                                                                                                                   2}]))),
+    <<":.y-:">> = iolist_to_binary(join(re:split("x-.y-.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[{parts,
-                                                                                                                                                                                                                                                                                                             2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))), 
-    <<"-abc.peq.">> = iolist_to_binary(join(re:split("-abc.peq.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))), 
+                                                                                                                                                                                                                                                                                                             2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))),
+    <<"-abc.peq.">> = iolist_to_binary(join(re:split("-abc.peq.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))),
     <<"-abc.peq.">> = iolist_to_binary(join(re:split("-abc.peq.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[{parts,
-                                                                                                                                                                                                                                                                                                         2}]))), 
-    <<"-abc.peq.">> = iolist_to_binary(join(re:split("-abc.peq.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("*.a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
+                                                                                                                                                                                                                                                                                                         2}]))),
+    <<"-abc.peq.">> = iolist_to_binary(join(re:split("-abc.peq.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("*.a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))),
     <<"::::">> = iolist_to_binary(join(re:split("*.a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
-                                                                                                                                                                                                                                                                                                                2}]))), 
-    <<"::::">> = iolist_to_binary(join(re:split("*.a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
-    <<":0-a">> = iolist_to_binary(join(re:split("*.b0-a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
+                                                                                                                                                                                                                                                                                                                2}]))),
+    <<"::::">> = iolist_to_binary(join(re:split("*.a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))),
+    <<":0-a">> = iolist_to_binary(join(re:split("*.b0-a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))),
     <<":0-a:::">> = iolist_to_binary(join(re:split("*.b0-a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
-                                                                                                                                                                                                                                                                                                                      2}]))), 
-    <<":0-a:::">> = iolist_to_binary(join(re:split("*.b0-a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
-    <<":3-b:.c">> = iolist_to_binary(join(re:split("*.c3-b.c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
+                                                                                                                                                                                                                                                                                                                      2}]))),
+    <<":0-a:::">> = iolist_to_binary(join(re:split("*.b0-a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))),
+    <<":3-b:.c">> = iolist_to_binary(join(re:split("*.c3-b.c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))),
     <<":3-b:.c::">> = iolist_to_binary(join(re:split("*.c3-b.c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
-                                                                                                                                                                                                                                                                                                                          2}]))), 
-    <<":3-b:.c::">> = iolist_to_binary(join(re:split("*.c3-b.c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
-    <<":-a:.b-c:-c">> = iolist_to_binary(join(re:split("*.c-a.b-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
+                                                                                                                                                                                                                                                                                                                          2}]))),
+    <<":3-b:.c::">> = iolist_to_binary(join(re:split("*.c3-b.c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))),
+    <<":-a:.b-c:-c">> = iolist_to_binary(join(re:split("*.c-a.b-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))),
     <<":-a:.b-c:-c:">> = iolist_to_binary(join(re:split("*.c-a.b-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
-                                                                                                                                                                                                                                                                                                                            2}]))), 
-    <<":-a:.b-c:-c:">> = iolist_to_binary(join(re:split("*.c-a.b-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
+                                                                                                                                                                                                                                                                                                                            2}]))),
+    <<":-a:.b-c:-c:">> = iolist_to_binary(join(re:split("*.c-a.b-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
-                                                                                                                                                                                                                                                                                                                                2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
-    <<"*.0">> = iolist_to_binary(join(re:split("*.0","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))),
+    <<"*.0">> = iolist_to_binary(join(re:split("*.0","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))),
     <<"*.0">> = iolist_to_binary(join(re:split("*.0","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
-                                                                                                                                                                                                                                                                                                                2}]))), 
-    <<"*.0">> = iolist_to_binary(join(re:split("*.0","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
-    <<"*.a-">> = iolist_to_binary(join(re:split("*.a-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
+                                                                                                                                                                                                                                                                                                                2}]))),
+    <<"*.0">> = iolist_to_binary(join(re:split("*.0","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))),
+    <<"*.a-">> = iolist_to_binary(join(re:split("*.a-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))),
     <<"*.a-">> = iolist_to_binary(join(re:split("*.a-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
-                                                                                                                                                                                                                                                                                                                  2}]))), 
-    <<"*.a-">> = iolist_to_binary(join(re:split("*.a-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
-    <<"*.a-b.c-">> = iolist_to_binary(join(re:split("*.a-b.c-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
+                                                                                                                                                                                                                                                                                                                  2}]))),
+    <<"*.a-">> = iolist_to_binary(join(re:split("*.a-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))),
+    <<"*.a-b.c-">> = iolist_to_binary(join(re:split("*.a-b.c-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))),
     <<"*.a-b.c-">> = iolist_to_binary(join(re:split("*.a-b.c-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
-                                                                                                                                                                                                                                                                                                                          2}]))), 
-    <<"*.a-b.c-">> = iolist_to_binary(join(re:split("*.a-b.c-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
-    <<"*.c-a.0-c">> = iolist_to_binary(join(re:split("*.c-a.0-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
+                                                                                                                                                                                                                                                                                                                          2}]))),
+    <<"*.a-b.c-">> = iolist_to_binary(join(re:split("*.a-b.c-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))),
+    <<"*.c-a.0-c">> = iolist_to_binary(join(re:split("*.c-a.0-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))),
     <<"*.c-a.0-c">> = iolist_to_binary(join(re:split("*.c-a.0-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
-                                                                                                                                                                                                                                                                                                                            2}]))), 
-    <<"*.c-a.0-c">> = iolist_to_binary(join(re:split("*.c-a.0-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
-    <<":de:abd:e">> = iolist_to_binary(join(re:split("abde","^(?=ab(de))(abd)(e)",[trim]))), 
+                                                                                                                                                                                                                                                                                                                            2}]))),
+    <<"*.c-a.0-c">> = iolist_to_binary(join(re:split("*.c-a.0-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))),
+    <<":de:abd:e">> = iolist_to_binary(join(re:split("abde","^(?=ab(de))(abd)(e)",[trim]))),
     <<":de:abd:e:">> = iolist_to_binary(join(re:split("abde","^(?=ab(de))(abd)(e)",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<":de:abd:e:">> = iolist_to_binary(join(re:split("abde","^(?=ab(de))(abd)(e)",[]))), 
-    <<"::abd:f">> = iolist_to_binary(join(re:split("abdf","^(?!(ab)de|x)(abd)(f)",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<":de:abd:e:">> = iolist_to_binary(join(re:split("abde","^(?=ab(de))(abd)(e)",[]))),
+    <<"::abd:f">> = iolist_to_binary(join(re:split("abdf","^(?!(ab)de|x)(abd)(f)",[trim]))),
     <<"::abd:f:">> = iolist_to_binary(join(re:split("abdf","^(?!(ab)de|x)(abd)(f)",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<"::abd:f:">> = iolist_to_binary(join(re:split("abdf","^(?!(ab)de|x)(abd)(f)",[]))), 
-    <<":abcd:cd:ab:cd">> = iolist_to_binary(join(re:split("abcd","^(?=(ab(cd)))(ab)",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<"::abd:f:">> = iolist_to_binary(join(re:split("abdf","^(?!(ab)de|x)(abd)(f)",[]))),
+    <<":abcd:cd:ab:cd">> = iolist_to_binary(join(re:split("abcd","^(?=(ab(cd)))(ab)",[trim]))),
     <<":abcd:cd:ab:cd">> = iolist_to_binary(join(re:split("abcd","^(?=(ab(cd)))(ab)",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<":abcd:cd:ab:cd">> = iolist_to_binary(join(re:split("abcd","^(?=(ab(cd)))(ab)",[]))), 
+                                                                                                                                                                                          2}]))),
+    <<":abcd:cd:ab:cd">> = iolist_to_binary(join(re:split("abcd","^(?=(ab(cd)))(ab)",[]))),
     <<":.d">> = iolist_to_binary(join(re:split("a.b.c.d","^[\\da-f](\\.[\\da-f])*$",[caseless,
-                                                                                                                                                                                                                trim]))), 
+                                                                                                                                                                                                                trim]))),
     <<":.d:">> = iolist_to_binary(join(re:split("a.b.c.d","^[\\da-f](\\.[\\da-f])*$",[caseless,
                                                                                                                                                                                                                   {parts,
-                                                                                                                                                                                                                   2}]))), 
-    <<":.d:">> = iolist_to_binary(join(re:split("a.b.c.d","^[\\da-f](\\.[\\da-f])*$",[caseless]))), 
+                                                                                                                                                                                                                   2}]))),
+    <<":.d:">> = iolist_to_binary(join(re:split("a.b.c.d","^[\\da-f](\\.[\\da-f])*$",[caseless]))),
     <<":.D">> = iolist_to_binary(join(re:split("A.B.C.D","^[\\da-f](\\.[\\da-f])*$",[caseless,
-                                                                                                                                                                                                                trim]))), 
+                                                                                                                                                                                                                trim]))),
     <<":.D:">> = iolist_to_binary(join(re:split("A.B.C.D","^[\\da-f](\\.[\\da-f])*$",[caseless,
                                                                                                                                                                                                                   {parts,
-                                                                                                                                                                                                                   2}]))), 
-    <<":.D:">> = iolist_to_binary(join(re:split("A.B.C.D","^[\\da-f](\\.[\\da-f])*$",[caseless]))), 
+                                                                                                                                                                                                                   2}]))),
+    <<":.D:">> = iolist_to_binary(join(re:split("A.B.C.D","^[\\da-f](\\.[\\da-f])*$",[caseless]))),
     <<":.C">> = iolist_to_binary(join(re:split("a.b.c.1.2.3.C","^[\\da-f](\\.[\\da-f])*$",[caseless,
-                                                                                                                                                                                                                            trim]))), 
+                                                                                                                                                                                                                            trim]))),
     <<":.C:">> = iolist_to_binary(join(re:split("a.b.c.1.2.3.C","^[\\da-f](\\.[\\da-f])*$",[caseless,
                                                                                                                                                                                                                               {parts,
-                                                                                                                                                                                                                               2}]))), 
-    <<":.C:">> = iolist_to_binary(join(re:split("a.b.c.1.2.3.C","^[\\da-f](\\.[\\da-f])*$",[caseless]))), 
-    <<"">> = iolist_to_binary(join(re:split("\"1234\"","^\\\".*\\\"\\s*(;.*)?$",[trim]))), 
+                                                                                                                                                                                                                               2}]))),
+    <<":.C:">> = iolist_to_binary(join(re:split("a.b.c.1.2.3.C","^[\\da-f](\\.[\\da-f])*$",[caseless]))),
+    <<"">> = iolist_to_binary(join(re:split("\"1234\"","^\\\".*\\\"\\s*(;.*)?$",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("\"1234\"","^\\\".*\\\"\\s*(;.*)?$",[{parts,
-                                                                                                                                                                                                                      2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("\"1234\"","^\\\".*\\\"\\s*(;.*)?$",[]))), 
-    <<":;">> = iolist_to_binary(join(re:split("\"abcd\" ;","^\\\".*\\\"\\s*(;.*)?$",[trim]))), 
+                                                                                                                                                                                                                      2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("\"1234\"","^\\\".*\\\"\\s*(;.*)?$",[]))),
+    <<":;">> = iolist_to_binary(join(re:split("\"abcd\" ;","^\\\".*\\\"\\s*(;.*)?$",[trim]))),
     <<":;:">> = iolist_to_binary(join(re:split("\"abcd\" ;","^\\\".*\\\"\\s*(;.*)?$",[{parts,
-                                                                                                                                                                                                                          2}]))), 
-    <<":;:">> = iolist_to_binary(join(re:split("\"abcd\" ;","^\\\".*\\\"\\s*(;.*)?$",[]))), 
-    <<":; rhubarb">> = iolist_to_binary(join(re:split("\"\" ; rhubarb","^\\\".*\\\"\\s*(;.*)?$",[trim]))), 
+                                                                                                                                                                                                                          2}]))),
+    <<":;:">> = iolist_to_binary(join(re:split("\"abcd\" ;","^\\\".*\\\"\\s*(;.*)?$",[]))),
+    <<":; rhubarb">> = iolist_to_binary(join(re:split("\"\" ; rhubarb","^\\\".*\\\"\\s*(;.*)?$",[trim]))),
     <<":; rhubarb:">> = iolist_to_binary(join(re:split("\"\" ; rhubarb","^\\\".*\\\"\\s*(;.*)?$",[{parts,
-                                                                                                                                                                                                                                  2}]))), 
-    <<":; rhubarb:">> = iolist_to_binary(join(re:split("\"\" ; rhubarb","^\\\".*\\\"\\s*(;.*)?$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\\".*\\\"\\s*(;.*)?$",[trim]))), 
+                                                                                                                                                                                                                                  2}]))),
+    <<":; rhubarb:">> = iolist_to_binary(join(re:split("\"\" ; rhubarb","^\\\".*\\\"\\s*(;.*)?$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\\".*\\\"\\s*(;.*)?$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\\".*\\\"\\s*(;.*)?$",[{parts,
-                                                                                                                                                                                                                        2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\\".*\\\"\\s*(;.*)?$",[]))), 
-    <<"\"1234\" : things">> = iolist_to_binary(join(re:split("\"1234\" : things","^\\\".*\\\"\\s*(;.*)?$",[trim]))), 
+                                                                                                                                                                                                                        2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\\".*\\\"\\s*(;.*)?$",[]))),
+    <<"\"1234\" : things">> = iolist_to_binary(join(re:split("\"1234\" : things","^\\\".*\\\"\\s*(;.*)?$",[trim]))),
     <<"\"1234\" : things">> = iolist_to_binary(join(re:split("\"1234\" : things","^\\\".*\\\"\\s*(;.*)?$",[{parts,
-                                                                                                                                                                                                                                        2}]))), 
-    <<"\"1234\" : things">> = iolist_to_binary(join(re:split("\"1234\" : things","^\\\".*\\\"\\s*(;.*)?$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("","^$",[trim]))), 
+                                                                                                                                                                                                                                        2}]))),
+    <<"\"1234\" : things">> = iolist_to_binary(join(re:split("\"1234\" : things","^\\\".*\\\"\\s*(;.*)?$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("","^$",[trim]))),
     <<"">> = iolist_to_binary(join(re:split("","^$",[{parts,
-                                                                                                                                                     2}]))), 
-    <<"">> = iolist_to_binary(join(re:split("","^$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^$",[trim]))), 
+                                                                                                                                                     2}]))),
+    <<"">> = iolist_to_binary(join(re:split("","^$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^$",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^$",[]))), 
+                                                                                                                                                                           2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^$",[]))),
     <<"">> = iolist_to_binary(join(re:split("ab c","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended,
-                                                                                                                                                                                                                                                                                              trim]))), 
+                                                                                                                                                                                                                                                                                              trim]))),
     <<":">> = iolist_to_binary(join(re:split("ab c","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended,
                                                                                                                                                                                                                                                                                                 {parts,
-                                                                                                                                                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ab c","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended]))), 
+                                                                                                                                                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ab c","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended,
-                                                                                                                                                                                                                                                                                                            trim]))), 
+                                                                                                                                                                                                                                                                                                            trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended,
                                                                                                                                                                                                                                                                                                               {parts,
-                                                                                                                                                                                                                                                                                                               2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended]))), 
+                                                                                                                                                                                                                                                                                                               2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended]))),
     <<"abc">> = iolist_to_binary(join(re:split("abc","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended,
-                                                                                                                                                                                                                                                                                            trim]))), 
+                                                                                                                                                                                                                                                                                            trim]))),
     <<"abc">> = iolist_to_binary(join(re:split("abc","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended,
                                                                                                                                                                                                                                                                                               {parts,
-                                                                                                                                                                                                                                                                                               2}]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended]))), 
+                                                                                                                                                                                                                                                                                               2}]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended]))),
     <<"ab cde">> = iolist_to_binary(join(re:split("ab cde","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended,
-                                                                                                                                                                                                                                                                                                  trim]))), 
+                                                                                                                                                                                                                                                                                                  trim]))),
     <<"ab cde">> = iolist_to_binary(join(re:split("ab cde","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended,
                                                                                                                                                                                                                                                                                                     {parts,
-                                                                                                                                                                                                                                                                                                     2}]))), 
-    <<"ab cde">> = iolist_to_binary(join(re:split("ab cde","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended]))), 
-    <<"">> = iolist_to_binary(join(re:split("ab c","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[trim]))), 
+                                                                                                                                                                                                                                                                                                     2}]))),
+    <<"ab cde">> = iolist_to_binary(join(re:split("ab cde","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended]))),
+    <<"">> = iolist_to_binary(join(re:split("ab c","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("ab c","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[{parts,
-                                                                                                                                                                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ab c","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[trim]))), 
+                                                                                                                                                                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ab c","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[{parts,
-                                                                                                                                                                                                                                                                                                                      2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[trim]))), 
+                                                                                                                                                                                                                                                                                                                      2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[trim]))),
     <<"abc">> = iolist_to_binary(join(re:split("abc","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[{parts,
-                                                                                                                                                                                                                                                                                                      2}]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[]))), 
-    <<"ab cde">> = iolist_to_binary(join(re:split("ab cde","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[trim]))), 
+                                                                                                                                                                                                                                                                                                      2}]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[]))),
+    <<"ab cde">> = iolist_to_binary(join(re:split("ab cde","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[trim]))),
     <<"ab cde">> = iolist_to_binary(join(re:split("ab cde","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[{parts,
-                                                                                                                                                                                                                                                                                                            2}]))), 
-    <<"ab cde">> = iolist_to_binary(join(re:split("ab cde","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[]))), 
+                                                                                                                                                                                                                                                                                                            2}]))),
+    <<"ab cde">> = iolist_to_binary(join(re:split("ab cde","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[]))),
     <<"">> = iolist_to_binary(join(re:split("a bcd","^   a\\ b[c ]d       $",[extended,
-                                                                                                                                                                                                      trim]))), 
+                                                                                                                                                                                                      trim]))),
     <<":">> = iolist_to_binary(join(re:split("a bcd","^   a\\ b[c ]d       $",[extended,
                                                                                                                                                                                                         {parts,
-                                                                                                                                                                                                         2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a bcd","^   a\\ b[c ]d       $",[extended]))), 
+                                                                                                                                                                                                         2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a bcd","^   a\\ b[c ]d       $",[extended]))),
     <<"">> = iolist_to_binary(join(re:split("a b d","^   a\\ b[c ]d       $",[extended,
-                                                                                                                                                                                                      trim]))), 
+                                                                                                                                                                                                      trim]))),
     <<":">> = iolist_to_binary(join(re:split("a b d","^   a\\ b[c ]d       $",[extended,
                                                                                                                                                                                                         {parts,
-                                                                                                                                                                                                         2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a b d","^   a\\ b[c ]d       $",[extended]))), 
+                                                                                                                                                                                                         2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a b d","^   a\\ b[c ]d       $",[extended]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^   a\\ b[c ]d       $",[extended,
-                                                                                                                                                                                                                  trim]))), 
+                                                                                                                                                                                                                  trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^   a\\ b[c ]d       $",[extended,
                                                                                                                                                                                                                     {parts,
-                                                                                                                                                                                                                     2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^   a\\ b[c ]d       $",[extended]))), 
+                                                                                                                                                                                                                     2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^   a\\ b[c ]d       $",[extended]))),
     <<"abcd">> = iolist_to_binary(join(re:split("abcd","^   a\\ b[c ]d       $",[extended,
-                                                                                                                                                                                                    trim]))), 
+                                                                                                                                                                                                    trim]))),
     <<"abcd">> = iolist_to_binary(join(re:split("abcd","^   a\\ b[c ]d       $",[extended,
                                                                                                                                                                                                       {parts,
-                                                                                                                                                                                                       2}]))), 
-    <<"abcd">> = iolist_to_binary(join(re:split("abcd","^   a\\ b[c ]d       $",[extended]))), 
+                                                                                                                                                                                                       2}]))),
+    <<"abcd">> = iolist_to_binary(join(re:split("abcd","^   a\\ b[c ]d       $",[extended]))),
     <<"ab d">> = iolist_to_binary(join(re:split("ab d","^   a\\ b[c ]d       $",[extended,
-                                                                                                                                                                                                    trim]))), 
+                                                                                                                                                                                                    trim]))),
     <<"ab d">> = iolist_to_binary(join(re:split("ab d","^   a\\ b[c ]d       $",[extended,
                                                                                                                                                                                                       {parts,
-                                                                                                                                                                                                       2}]))), 
-    <<"ab d">> = iolist_to_binary(join(re:split("ab d","^   a\\ b[c ]d       $",[extended]))), 
-    <<":abc:bc:c:def:ef:f:hij:ij:j:klm:lm:m">> = iolist_to_binary(join(re:split("abcdefhijklm","^(a(b(c)))(d(e(f)))(h(i(j)))(k(l(m)))$",[trim]))), 
+                                                                                                                                                                                                       2}]))),
+    <<"ab d">> = iolist_to_binary(join(re:split("ab d","^   a\\ b[c ]d       $",[extended]))),
+    <<":abc:bc:c:def:ef:f:hij:ij:j:klm:lm:m">> = iolist_to_binary(join(re:split("abcdefhijklm","^(a(b(c)))(d(e(f)))(h(i(j)))(k(l(m)))$",[trim]))),
     <<":abc:bc:c:def:ef:f:hij:ij:j:klm:lm:m:">> = iolist_to_binary(join(re:split("abcdefhijklm","^(a(b(c)))(d(e(f)))(h(i(j)))(k(l(m)))$",[{parts,
-                                                                                                                                                                                                                                                     2}]))), 
-    <<":abc:bc:c:def:ef:f:hij:ij:j:klm:lm:m:">> = iolist_to_binary(join(re:split("abcdefhijklm","^(a(b(c)))(d(e(f)))(h(i(j)))(k(l(m)))$",[]))), 
+                                                                                                                                                                                                                                                     2}]))),
+    <<":abc:bc:c:def:ef:f:hij:ij:j:klm:lm:m:">> = iolist_to_binary(join(re:split("abcdefhijklm","^(a(b(c)))(d(e(f)))(h(i(j)))(k(l(m)))$",[]))),
     ok.
 run2() ->
-    <<":bc:c:ef:f:ij:j:lm:m">> = iolist_to_binary(join(re:split("abcdefhijklm","^(?:a(b(c)))(?:d(e(f)))(?:h(i(j)))(?:k(l(m)))$",[trim]))), 
+    <<":bc:c:ef:f:ij:j:lm:m">> = iolist_to_binary(join(re:split("abcdefhijklm","^(?:a(b(c)))(?:d(e(f)))(?:h(i(j)))(?:k(l(m)))$",[trim]))),
     <<":bc:c:ef:f:ij:j:lm:m:">> = iolist_to_binary(join(re:split("abcdefhijklm","^(?:a(b(c)))(?:d(e(f)))(?:h(i(j)))(?:k(l(m)))$",[{parts,
-                                                                                                                                                                                                                                                                     2}]))), 
-    <<":bc:c:ef:f:ij:j:lm:m:">> = iolist_to_binary(join(re:split("abcdefhijklm","^(?:a(b(c)))(?:d(e(f)))(?:h(i(j)))(?:k(l(m)))$",[]))), 
+                                                                                                                                                                                                                                                                     2}]))),
+    <<":bc:c:ef:f:ij:j:lm:m:">> = iolist_to_binary(join(re:split("abcdefhijklm","^(?:a(b(c)))(?:d(e(f)))(?:h(i(j)))(?:k(l(m)))$",[]))),
     <<"">> = iolist_to_binary(join(re:split("a+ Z0+
-","^[\\w][\\W][\\s][\\S][\\d][\\D][\\b][\\n][\\c]][\\022]",[trim]))), 
+","^[\\w][\\W][\\s][\\S][\\d][\\D][\\b][\\n][\\c]][\\022]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a+ Z0+
 ","^[\\w][\\W][\\s][\\S][\\d][\\D][\\b][\\n][\\c]][\\022]",[{parts,
-                                                                                      2}]))), 
+                                                                                      2}]))),
     <<":">> = iolist_to_binary(join(re:split("a+ Z0+
-","^[\\w][\\W][\\s][\\S][\\d][\\D][\\b][\\n][\\c]][\\022]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split(".^$(*+)|{?,?}","^[.^$|()*+?{,}]+",[trim]))), 
+","^[\\w][\\W][\\s][\\S][\\d][\\D][\\b][\\n][\\c]][\\022]",[]))),
+    <<"">> = iolist_to_binary(join(re:split(".^$(*+)|{?,?}","^[.^$|()*+?{,}]+",[trim]))),
     <<":">> = iolist_to_binary(join(re:split(".^$(*+)|{?,?}","^[.^$|()*+?{,}]+",[{parts,
-                                                                                                                                                                                                             2}]))), 
-    <<":">> = iolist_to_binary(join(re:split(".^$(*+)|{?,?}","^[.^$|()*+?{,}]+",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("z","^a*\\w",[trim]))), 
+                                                                                                                                                                                                             2}]))),
+    <<":">> = iolist_to_binary(join(re:split(".^$(*+)|{?,?}","^[.^$|()*+?{,}]+",[]))),
+    <<"">> = iolist_to_binary(join(re:split("z","^a*\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("z","^a*\\w",[{parts,
-                                                                                                                                                               2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("z","^a*\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("az","^a*\\w",[trim]))), 
+                                                                                                                                                               2}]))),
+    <<":">> = iolist_to_binary(join(re:split("z","^a*\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("az","^a*\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("az","^a*\\w",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("az","^a*\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaz","^a*\\w",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("az","^a*\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaz","^a*\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaz","^a*\\w",[{parts,
-                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaz","^a*\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","^a*\\w",[trim]))), 
+                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaz","^a*\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","^a*\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a","^a*\\w",[{parts,
-                                                                                                                                                               2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a","^a*\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aa","^a*\\w",[trim]))), 
+                                                                                                                                                               2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a","^a*\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aa","^a*\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aa","^a*\\w",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aa","^a*\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaa","^a*\\w",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aa","^a*\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaa","^a*\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaa","^a*\\w",[{parts,
-                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaa","^a*\\w",[]))), 
-    <<":+">> = iolist_to_binary(join(re:split("a+","^a*\\w",[trim]))), 
+                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaa","^a*\\w",[]))),
+    <<":+">> = iolist_to_binary(join(re:split("a+","^a*\\w",[trim]))),
     <<":+">> = iolist_to_binary(join(re:split("a+","^a*\\w",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<":+">> = iolist_to_binary(join(re:split("a+","^a*\\w",[]))), 
-    <<":+">> = iolist_to_binary(join(re:split("aa+","^a*\\w",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<":+">> = iolist_to_binary(join(re:split("a+","^a*\\w",[]))),
+    <<":+">> = iolist_to_binary(join(re:split("aa+","^a*\\w",[trim]))),
     <<":+">> = iolist_to_binary(join(re:split("aa+","^a*\\w",[{parts,
-                                                                                                                                                                   2}]))), 
-    <<":+">> = iolist_to_binary(join(re:split("aa+","^a*\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("z","^a*?\\w",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<":+">> = iolist_to_binary(join(re:split("aa+","^a*\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("z","^a*?\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("z","^a*?\\w",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("z","^a*?\\w",[]))), 
-    <<":z">> = iolist_to_binary(join(re:split("az","^a*?\\w",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("z","^a*?\\w",[]))),
+    <<":z">> = iolist_to_binary(join(re:split("az","^a*?\\w",[trim]))),
     <<":z">> = iolist_to_binary(join(re:split("az","^a*?\\w",[{parts,
-                                                                                                                                                                   2}]))), 
-    <<":z">> = iolist_to_binary(join(re:split("az","^a*?\\w",[]))), 
-    <<":aaz">> = iolist_to_binary(join(re:split("aaaz","^a*?\\w",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<":z">> = iolist_to_binary(join(re:split("az","^a*?\\w",[]))),
+    <<":aaz">> = iolist_to_binary(join(re:split("aaaz","^a*?\\w",[trim]))),
     <<":aaz">> = iolist_to_binary(join(re:split("aaaz","^a*?\\w",[{parts,
-                                                                                                                                                                       2}]))), 
-    <<":aaz">> = iolist_to_binary(join(re:split("aaaz","^a*?\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","^a*?\\w",[trim]))), 
+                                                                                                                                                                       2}]))),
+    <<":aaz">> = iolist_to_binary(join(re:split("aaaz","^a*?\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","^a*?\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a","^a*?\\w",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a","^a*?\\w",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aa","^a*?\\w",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a","^a*?\\w",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aa","^a*?\\w",[trim]))),
     <<":a">> = iolist_to_binary(join(re:split("aa","^a*?\\w",[{parts,
-                                                                                                                                                                   2}]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aa","^a*?\\w",[]))), 
-    <<":aaa">> = iolist_to_binary(join(re:split("aaaa","^a*?\\w",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<":a">> = iolist_to_binary(join(re:split("aa","^a*?\\w",[]))),
+    <<":aaa">> = iolist_to_binary(join(re:split("aaaa","^a*?\\w",[trim]))),
     <<":aaa">> = iolist_to_binary(join(re:split("aaaa","^a*?\\w",[{parts,
-                                                                                                                                                                       2}]))), 
-    <<":aaa">> = iolist_to_binary(join(re:split("aaaa","^a*?\\w",[]))), 
-    <<":+">> = iolist_to_binary(join(re:split("a+","^a*?\\w",[trim]))), 
+                                                                                                                                                                       2}]))),
+    <<":aaa">> = iolist_to_binary(join(re:split("aaaa","^a*?\\w",[]))),
+    <<":+">> = iolist_to_binary(join(re:split("a+","^a*?\\w",[trim]))),
     <<":+">> = iolist_to_binary(join(re:split("a+","^a*?\\w",[{parts,
-                                                                                                                                                                   2}]))), 
-    <<":+">> = iolist_to_binary(join(re:split("a+","^a*?\\w",[]))), 
-    <<":a+">> = iolist_to_binary(join(re:split("aa+","^a*?\\w",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<":+">> = iolist_to_binary(join(re:split("a+","^a*?\\w",[]))),
+    <<":a+">> = iolist_to_binary(join(re:split("aa+","^a*?\\w",[trim]))),
     <<":a+">> = iolist_to_binary(join(re:split("aa+","^a*?\\w",[{parts,
-                                                                                                                                                                     2}]))), 
-    <<":a+">> = iolist_to_binary(join(re:split("aa+","^a*?\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("az","^a+\\w",[trim]))), 
+                                                                                                                                                                     2}]))),
+    <<":a+">> = iolist_to_binary(join(re:split("aa+","^a*?\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("az","^a+\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("az","^a+\\w",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("az","^a+\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaz","^a+\\w",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("az","^a+\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaz","^a+\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaz","^a+\\w",[{parts,
-                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaz","^a+\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aa","^a+\\w",[trim]))), 
+                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaz","^a+\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aa","^a+\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aa","^a+\\w",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aa","^a+\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaa","^a+\\w",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aa","^a+\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaa","^a+\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaa","^a+\\w",[{parts,
-                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaa","^a+\\w",[]))), 
-    <<":+">> = iolist_to_binary(join(re:split("aa+","^a+\\w",[trim]))), 
+                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaa","^a+\\w",[]))),
+    <<":+">> = iolist_to_binary(join(re:split("aa+","^a+\\w",[trim]))),
     <<":+">> = iolist_to_binary(join(re:split("aa+","^a+\\w",[{parts,
-                                                                                                                                                                   2}]))), 
-    <<":+">> = iolist_to_binary(join(re:split("aa+","^a+\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("az","^a+?\\w",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<":+">> = iolist_to_binary(join(re:split("aa+","^a+\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("az","^a+?\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("az","^a+?\\w",[{parts,
-                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("az","^a+?\\w",[]))), 
-    <<":az">> = iolist_to_binary(join(re:split("aaaz","^a+?\\w",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("az","^a+?\\w",[]))),
+    <<":az">> = iolist_to_binary(join(re:split("aaaz","^a+?\\w",[trim]))),
     <<":az">> = iolist_to_binary(join(re:split("aaaz","^a+?\\w",[{parts,
-                                                                                                                                                                       2}]))), 
-    <<":az">> = iolist_to_binary(join(re:split("aaaz","^a+?\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aa","^a+?\\w",[trim]))), 
+                                                                                                                                                                       2}]))),
+    <<":az">> = iolist_to_binary(join(re:split("aaaz","^a+?\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aa","^a+?\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aa","^a+?\\w",[{parts,
-                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aa","^a+?\\w",[]))), 
-    <<":aa">> = iolist_to_binary(join(re:split("aaaa","^a+?\\w",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aa","^a+?\\w",[]))),
+    <<":aa">> = iolist_to_binary(join(re:split("aaaa","^a+?\\w",[trim]))),
     <<":aa">> = iolist_to_binary(join(re:split("aaaa","^a+?\\w",[{parts,
-                                                                                                                                                                       2}]))), 
-    <<":aa">> = iolist_to_binary(join(re:split("aaaa","^a+?\\w",[]))), 
-    <<":+">> = iolist_to_binary(join(re:split("aa+","^a+?\\w",[trim]))), 
+                                                                                                                                                                       2}]))),
+    <<":aa">> = iolist_to_binary(join(re:split("aaaa","^a+?\\w",[]))),
+    <<":+">> = iolist_to_binary(join(re:split("aa+","^a+?\\w",[trim]))),
     <<":+">> = iolist_to_binary(join(re:split("aa+","^a+?\\w",[{parts,
-                                                                                                                                                                     2}]))), 
-    <<":+">> = iolist_to_binary(join(re:split("aa+","^a+?\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("1234567890","^\\d{8}\\w{2,}",[trim]))), 
+                                                                                                                                                                     2}]))),
+    <<":+">> = iolist_to_binary(join(re:split("aa+","^a+?\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("1234567890","^\\d{8}\\w{2,}",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("1234567890","^\\d{8}\\w{2,}",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("1234567890","^\\d{8}\\w{2,}",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("12345678ab","^\\d{8}\\w{2,}",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("1234567890","^\\d{8}\\w{2,}",[]))),
+    <<"">> = iolist_to_binary(join(re:split("12345678ab","^\\d{8}\\w{2,}",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("12345678ab","^\\d{8}\\w{2,}",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("12345678ab","^\\d{8}\\w{2,}",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("12345678__","^\\d{8}\\w{2,}",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("12345678ab","^\\d{8}\\w{2,}",[]))),
+    <<"">> = iolist_to_binary(join(re:split("12345678__","^\\d{8}\\w{2,}",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("12345678__","^\\d{8}\\w{2,}",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("12345678__","^\\d{8}\\w{2,}",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\d{8}\\w{2,}",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("12345678__","^\\d{8}\\w{2,}",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\d{8}\\w{2,}",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\d{8}\\w{2,}",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\d{8}\\w{2,}",[]))), 
-    <<"1234567">> = iolist_to_binary(join(re:split("1234567","^\\d{8}\\w{2,}",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\d{8}\\w{2,}",[]))),
+    <<"1234567">> = iolist_to_binary(join(re:split("1234567","^\\d{8}\\w{2,}",[trim]))),
     <<"1234567">> = iolist_to_binary(join(re:split("1234567","^\\d{8}\\w{2,}",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<"1234567">> = iolist_to_binary(join(re:split("1234567","^\\d{8}\\w{2,}",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("uoie","^[aeiou\\d]{4,5}$",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<"1234567">> = iolist_to_binary(join(re:split("1234567","^\\d{8}\\w{2,}",[]))),
+    <<"">> = iolist_to_binary(join(re:split("uoie","^[aeiou\\d]{4,5}$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("uoie","^[aeiou\\d]{4,5}$",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("uoie","^[aeiou\\d]{4,5}$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("1234","^[aeiou\\d]{4,5}$",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("uoie","^[aeiou\\d]{4,5}$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("1234","^[aeiou\\d]{4,5}$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("1234","^[aeiou\\d]{4,5}$",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("1234","^[aeiou\\d]{4,5}$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("12345","^[aeiou\\d]{4,5}$",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("1234","^[aeiou\\d]{4,5}$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("12345","^[aeiou\\d]{4,5}$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("12345","^[aeiou\\d]{4,5}$",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("12345","^[aeiou\\d]{4,5}$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaaa","^[aeiou\\d]{4,5}$",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("12345","^[aeiou\\d]{4,5}$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaaa","^[aeiou\\d]{4,5}$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaaa","^[aeiou\\d]{4,5}$",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaaa","^[aeiou\\d]{4,5}$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[aeiou\\d]{4,5}$",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaaa","^[aeiou\\d]{4,5}$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[aeiou\\d]{4,5}$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[aeiou\\d]{4,5}$",[{parts,
-                                                                                                                                                                                                          2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[aeiou\\d]{4,5}$",[]))), 
-    <<"123456">> = iolist_to_binary(join(re:split("123456","^[aeiou\\d]{4,5}$",[trim]))), 
+                                                                                                                                                                                                          2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[aeiou\\d]{4,5}$",[]))),
+    <<"123456">> = iolist_to_binary(join(re:split("123456","^[aeiou\\d]{4,5}$",[trim]))),
     <<"123456">> = iolist_to_binary(join(re:split("123456","^[aeiou\\d]{4,5}$",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"123456">> = iolist_to_binary(join(re:split("123456","^[aeiou\\d]{4,5}$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("uoie","^[aeiou\\d]{4,5}?",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<"123456">> = iolist_to_binary(join(re:split("123456","^[aeiou\\d]{4,5}$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("uoie","^[aeiou\\d]{4,5}?",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("uoie","^[aeiou\\d]{4,5}?",[{parts,
-                                                                                                                                                                                           2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("uoie","^[aeiou\\d]{4,5}?",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("1234","^[aeiou\\d]{4,5}?",[trim]))), 
+                                                                                                                                                                                           2}]))),
+    <<":">> = iolist_to_binary(join(re:split("uoie","^[aeiou\\d]{4,5}?",[]))),
+    <<"">> = iolist_to_binary(join(re:split("1234","^[aeiou\\d]{4,5}?",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("1234","^[aeiou\\d]{4,5}?",[{parts,
-                                                                                                                                                                                           2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("1234","^[aeiou\\d]{4,5}?",[]))), 
-    <<":5">> = iolist_to_binary(join(re:split("12345","^[aeiou\\d]{4,5}?",[trim]))), 
+                                                                                                                                                                                           2}]))),
+    <<":">> = iolist_to_binary(join(re:split("1234","^[aeiou\\d]{4,5}?",[]))),
+    <<":5">> = iolist_to_binary(join(re:split("12345","^[aeiou\\d]{4,5}?",[trim]))),
     <<":5">> = iolist_to_binary(join(re:split("12345","^[aeiou\\d]{4,5}?",[{parts,
-                                                                                                                                                                                             2}]))), 
-    <<":5">> = iolist_to_binary(join(re:split("12345","^[aeiou\\d]{4,5}?",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aaaaa","^[aeiou\\d]{4,5}?",[trim]))), 
+                                                                                                                                                                                             2}]))),
+    <<":5">> = iolist_to_binary(join(re:split("12345","^[aeiou\\d]{4,5}?",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aaaaa","^[aeiou\\d]{4,5}?",[trim]))),
     <<":a">> = iolist_to_binary(join(re:split("aaaaa","^[aeiou\\d]{4,5}?",[{parts,
-                                                                                                                                                                                             2}]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aaaaa","^[aeiou\\d]{4,5}?",[]))), 
-    <<":56">> = iolist_to_binary(join(re:split("123456","^[aeiou\\d]{4,5}?",[trim]))), 
+                                                                                                                                                                                             2}]))),
+    <<":a">> = iolist_to_binary(join(re:split("aaaaa","^[aeiou\\d]{4,5}?",[]))),
+    <<":56">> = iolist_to_binary(join(re:split("123456","^[aeiou\\d]{4,5}?",[trim]))),
     <<":56">> = iolist_to_binary(join(re:split("123456","^[aeiou\\d]{4,5}?",[{parts,
-                                                                                                                                                                                               2}]))), 
-    <<":56">> = iolist_to_binary(join(re:split("123456","^[aeiou\\d]{4,5}?",[]))), 
-    <<":abc:abc">> = iolist_to_binary(join(re:split("abc=abcabc","\\A(abc|def)=(\\1){2,3}\\Z",[trim]))), 
+                                                                                                                                                                                               2}]))),
+    <<":56">> = iolist_to_binary(join(re:split("123456","^[aeiou\\d]{4,5}?",[]))),
+    <<":abc:abc">> = iolist_to_binary(join(re:split("abc=abcabc","\\A(abc|def)=(\\1){2,3}\\Z",[trim]))),
     <<":abc:abc:">> = iolist_to_binary(join(re:split("abc=abcabc","\\A(abc|def)=(\\1){2,3}\\Z",[{parts,
-                                                                                                                                                                                                                           2}]))), 
-    <<":abc:abc:">> = iolist_to_binary(join(re:split("abc=abcabc","\\A(abc|def)=(\\1){2,3}\\Z",[]))), 
-    <<":def:def">> = iolist_to_binary(join(re:split("def=defdefdef","\\A(abc|def)=(\\1){2,3}\\Z",[trim]))), 
+                                                                                                                                                                                                                           2}]))),
+    <<":abc:abc:">> = iolist_to_binary(join(re:split("abc=abcabc","\\A(abc|def)=(\\1){2,3}\\Z",[]))),
+    <<":def:def">> = iolist_to_binary(join(re:split("def=defdefdef","\\A(abc|def)=(\\1){2,3}\\Z",[trim]))),
     <<":def:def:">> = iolist_to_binary(join(re:split("def=defdefdef","\\A(abc|def)=(\\1){2,3}\\Z",[{parts,
-                                                                                                                                                                                                                                 2}]))), 
-    <<":def:def:">> = iolist_to_binary(join(re:split("def=defdefdef","\\A(abc|def)=(\\1){2,3}\\Z",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\A(abc|def)=(\\1){2,3}\\Z",[trim]))), 
+                                                                                                                                                                                                                                 2}]))),
+    <<":def:def:">> = iolist_to_binary(join(re:split("def=defdefdef","\\A(abc|def)=(\\1){2,3}\\Z",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\A(abc|def)=(\\1){2,3}\\Z",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\A(abc|def)=(\\1){2,3}\\Z",[{parts,
-                                                                                                                                                                                                                             2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\A(abc|def)=(\\1){2,3}\\Z",[]))), 
-    <<"abc=defdef">> = iolist_to_binary(join(re:split("abc=defdef","\\A(abc|def)=(\\1){2,3}\\Z",[trim]))), 
+                                                                                                                                                                                                                             2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\A(abc|def)=(\\1){2,3}\\Z",[]))),
+    <<"abc=defdef">> = iolist_to_binary(join(re:split("abc=defdef","\\A(abc|def)=(\\1){2,3}\\Z",[trim]))),
     <<"abc=defdef">> = iolist_to_binary(join(re:split("abc=defdef","\\A(abc|def)=(\\1){2,3}\\Z",[{parts,
-                                                                                                                                                                                                                           2}]))), 
-    <<"abc=defdef">> = iolist_to_binary(join(re:split("abc=defdef","\\A(abc|def)=(\\1){2,3}\\Z",[]))), 
-    <<":a:b:c:d:e:f:g:h:i:j:k:cd">> = iolist_to_binary(join(re:split("abcdefghijkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$",[trim]))), 
+                                                                                                                                                                                                                           2}]))),
+    <<"abc=defdef">> = iolist_to_binary(join(re:split("abc=defdef","\\A(abc|def)=(\\1){2,3}\\Z",[]))),
+    <<":a:b:c:d:e:f:g:h:i:j:k:cd">> = iolist_to_binary(join(re:split("abcdefghijkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$",[trim]))),
     <<":a:b:c:d:e:f:g:h:i:j:k:cd:">> = iolist_to_binary(join(re:split("abcdefghijkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$",[{parts,
-                                                                                                                                                                                                                                                                                                   2}]))), 
-    <<":a:b:c:d:e:f:g:h:i:j:k:cd:">> = iolist_to_binary(join(re:split("abcdefghijkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$",[]))), 
-    <<":a:b:c:d:e:f:g:h:i:j:k:cd">> = iolist_to_binary(join(re:split("abcdefghijkkkkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$",[trim]))), 
+                                                                                                                                                                                                                                                                                                   2}]))),
+    <<":a:b:c:d:e:f:g:h:i:j:k:cd:">> = iolist_to_binary(join(re:split("abcdefghijkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$",[]))),
+    <<":a:b:c:d:e:f:g:h:i:j:k:cd">> = iolist_to_binary(join(re:split("abcdefghijkkkkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$",[trim]))),
     <<":a:b:c:d:e:f:g:h:i:j:k:cd:">> = iolist_to_binary(join(re:split("abcdefghijkkkkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$",[{parts,
-                                                                                                                                                                                                                                                                                                         2}]))), 
-    <<":a:b:c:d:e:f:g:h:i:j:k:cd:">> = iolist_to_binary(join(re:split("abcdefghijkkkkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$",[]))), 
-    <<":cataract:aract:ract::3">> = iolist_to_binary(join(re:split("cataract cataract23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[trim]))), 
+                                                                                                                                                                                                                                                                                                         2}]))),
+    <<":a:b:c:d:e:f:g:h:i:j:k:cd:">> = iolist_to_binary(join(re:split("abcdefghijkkkkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$",[]))),
+    <<":cataract:aract:ract::3">> = iolist_to_binary(join(re:split("cataract cataract23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[trim]))),
     <<":cataract:aract:ract::3:">> = iolist_to_binary(join(re:split("cataract cataract23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[{parts,
-                                                                                                                                                                                                                                                                     2}]))), 
-    <<":cataract:aract:ract::3:">> = iolist_to_binary(join(re:split("cataract cataract23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[]))), 
-    <<":catatonic:atonic:tonic::3">> = iolist_to_binary(join(re:split("catatonic catatonic23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[trim]))), 
+                                                                                                                                                                                                                                                                     2}]))),
+    <<":cataract:aract:ract::3:">> = iolist_to_binary(join(re:split("cataract cataract23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[]))),
+    <<":catatonic:atonic:tonic::3">> = iolist_to_binary(join(re:split("catatonic catatonic23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[trim]))),
     <<":catatonic:atonic:tonic::3:">> = iolist_to_binary(join(re:split("catatonic catatonic23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[{parts,
-                                                                                                                                                                                                                                                                         2}]))), 
-    <<":catatonic:atonic:tonic::3:">> = iolist_to_binary(join(re:split("catatonic catatonic23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[]))), 
-    <<":caterpillar:erpillar:::3">> = iolist_to_binary(join(re:split("caterpillar caterpillar23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[trim]))), 
+                                                                                                                                                                                                                                                                         2}]))),
+    <<":catatonic:atonic:tonic::3:">> = iolist_to_binary(join(re:split("catatonic catatonic23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[]))),
+    <<":caterpillar:erpillar:::3">> = iolist_to_binary(join(re:split("caterpillar caterpillar23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[trim]))),
     <<":caterpillar:erpillar:::3:">> = iolist_to_binary(join(re:split("caterpillar caterpillar23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[{parts,
-                                                                                                                                                                                                                                                                                 2}]))), 
-    <<":caterpillar:erpillar:::3:">> = iolist_to_binary(join(re:split("caterpillar caterpillar23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[]))), 
-    <<":abcd::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep 01 12:33:02 1997","^From +([^ ]+) +[a-zA-Z][a-zA-Z][a-zA-Z] +[a-zA-Z][a-zA-Z][a-zA-Z] +[0-9]?[0-9] +[0-9][0-9]:[0-9][0-9]",[trim]))), 
+                                                                                                                                                                                                                                                                                 2}]))),
+    <<":caterpillar:erpillar:::3:">> = iolist_to_binary(join(re:split("caterpillar caterpillar23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[]))),
+    <<":abcd::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep 01 12:33:02 1997","^From +([^ ]+) +[a-zA-Z][a-zA-Z][a-zA-Z] +[a-zA-Z][a-zA-Z][a-zA-Z] +[0-9]?[0-9] +[0-9][0-9]:[0-9][0-9]",[trim]))),
     <<":abcd::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep 01 12:33:02 1997","^From +([^ ]+) +[a-zA-Z][a-zA-Z][a-zA-Z] +[a-zA-Z][a-zA-Z][a-zA-Z] +[0-9]?[0-9] +[0-9][0-9]:[0-9][0-9]",[{parts,
-                                                                                                                                                                                                                                                                                                                                                                                                                                  2}]))), 
-    <<":abcd::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep 01 12:33:02 1997","^From +([^ ]+) +[a-zA-Z][a-zA-Z][a-zA-Z] +[a-zA-Z][a-zA-Z][a-zA-Z] +[0-9]?[0-9] +[0-9][0-9]:[0-9][0-9]",[]))), 
-    <<":Sep ::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                                                                                                                  2}]))),
+    <<":abcd::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep 01 12:33:02 1997","^From +([^ ]+) +[a-zA-Z][a-zA-Z][a-zA-Z] +[a-zA-Z][a-zA-Z][a-zA-Z] +[0-9]?[0-9] +[0-9][0-9]:[0-9][0-9]",[]))),
+    <<":Sep ::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[trim]))),
     <<":Sep ::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[{parts,
-                                                                                                                                                                                                                                                                                                                                                            2}]))), 
-    <<":Sep ::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[]))), 
-    <<":Sep  ::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep  1 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                                            2}]))),
+    <<":Sep ::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[]))),
+    <<":Sep  ::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep  1 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[trim]))),
     <<":Sep  ::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep  1 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[{parts,
-                                                                                                                                                                                                                                                                                                                                                            2}]))), 
-    <<":Sep  ::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep  1 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                                            2}]))),
+    <<":Sep  ::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep  1 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[{parts,
-                                                                                                                                                                                                                                                                                                            2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[]))), 
-    <<"From abcd  Sep 01 12:33:02 1997">> = iolist_to_binary(join(re:split("From abcd  Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[trim]))), 
+                                                                                                                                                                                                                                                                                                            2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[]))),
+    <<"From abcd  Sep 01 12:33:02 1997">> = iolist_to_binary(join(re:split("From abcd  Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[trim]))),
     <<"From abcd  Sep 01 12:33:02 1997">> = iolist_to_binary(join(re:split("From abcd  Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[{parts,
-                                                                                                                                                                                                                                                                                                                                                    2}]))), 
-    <<"From abcd  Sep 01 12:33:02 1997">> = iolist_to_binary(join(re:split("From abcd  Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[]))), 
+                                                                                                                                                                                                                                                                                                                                                    2}]))),
+    <<"From abcd  Sep 01 12:33:02 1997">> = iolist_to_binary(join(re:split("From abcd  Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[]))),
     <<"">> = iolist_to_binary(join(re:split("12
-34","^12.34",[dotall,trim]))), 
+34","^12.34",[dotall,trim]))),
     <<":">> = iolist_to_binary(join(re:split("12
-34","^12.34",[dotall,{parts,2}]))), 
+34","^12.34",[dotall,{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("12
-34","^12.34",[dotall]))), 
+34","^12.34",[dotall]))),
     <<"">> = iolist_to_binary(join(re:split("12
34","^12.34",[dotall,
-                                                                                                                                                                    trim]))), 
+                                                                                                                                                                    trim]))),
     <<":">> = iolist_to_binary(join(re:split("12
34","^12.34",[dotall,
                                                                                                                                                                       {parts,
-                                                                                                                                                                       2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("12
34","^12.34",[dotall]))), 
-    <<"the quick :	 fox">> = iolist_to_binary(join(re:split("the quick brown	 fox","\\w+(?=\\t)",[trim]))), 
+                                                                                                                                                                       2}]))),
+    <<":">> = iolist_to_binary(join(re:split("12
34","^12.34",[dotall]))),
+    <<"the quick :	 fox">> = iolist_to_binary(join(re:split("the quick brown	 fox","\\w+(?=\\t)",[trim]))),
     <<"the quick :	 fox">> = iolist_to_binary(join(re:split("the quick brown	 fox","\\w+(?=\\t)",[{parts,
-                                                                                                                                                                                                                             2}]))), 
-    <<"the quick :	 fox">> = iolist_to_binary(join(re:split("the quick brown	 fox","\\w+(?=\\t)",[]))), 
-    <<"foobar is :lish see?">> = iolist_to_binary(join(re:split("foobar is foolish see?","foo(?!bar)(.*)",[trim]))), 
+                                                                                                                                                                                                                             2}]))),
+    <<"the quick :	 fox">> = iolist_to_binary(join(re:split("the quick brown	 fox","\\w+(?=\\t)",[]))),
+    <<"foobar is :lish see?">> = iolist_to_binary(join(re:split("foobar is foolish see?","foo(?!bar)(.*)",[trim]))),
     <<"foobar is :lish see?:">> = iolist_to_binary(join(re:split("foobar is foolish see?","foo(?!bar)(.*)",[{parts,
-                                                                                                                                                                                                                        2}]))), 
-    <<"foobar is :lish see?:">> = iolist_to_binary(join(re:split("foobar is foolish see?","foo(?!bar)(.*)",[]))), 
-    <<"foobar c: etc">> = iolist_to_binary(join(re:split("foobar crowbar etc","(?:(?!foo)...|^.{0,2})bar(.*)",[trim]))), 
+                                                                                                                                                                                                                        2}]))),
+    <<"foobar is :lish see?:">> = iolist_to_binary(join(re:split("foobar is foolish see?","foo(?!bar)(.*)",[]))),
+    <<"foobar c: etc">> = iolist_to_binary(join(re:split("foobar crowbar etc","(?:(?!foo)...|^.{0,2})bar(.*)",[trim]))),
     <<"foobar c: etc:">> = iolist_to_binary(join(re:split("foobar crowbar etc","(?:(?!foo)...|^.{0,2})bar(.*)",[{parts,
-                                                                                                                                                                                                                                              2}]))), 
-    <<"foobar c: etc:">> = iolist_to_binary(join(re:split("foobar crowbar etc","(?:(?!foo)...|^.{0,2})bar(.*)",[]))), 
-    <<":rel">> = iolist_to_binary(join(re:split("barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[trim]))), 
+                                                                                                                                                                                                                                              2}]))),
+    <<"foobar c: etc:">> = iolist_to_binary(join(re:split("foobar crowbar etc","(?:(?!foo)...|^.{0,2})bar(.*)",[]))),
+    <<":rel">> = iolist_to_binary(join(re:split("barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[trim]))),
     <<":rel:">> = iolist_to_binary(join(re:split("barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[{parts,
-                                                                                                                                                                                                                      2}]))), 
-    <<":rel:">> = iolist_to_binary(join(re:split("barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[]))), 
-    <<":rel">> = iolist_to_binary(join(re:split("2barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[trim]))), 
+                                                                                                                                                                                                                      2}]))),
+    <<":rel:">> = iolist_to_binary(join(re:split("barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[]))),
+    <<":rel">> = iolist_to_binary(join(re:split("2barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[trim]))),
     <<":rel:">> = iolist_to_binary(join(re:split("2barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[{parts,
-                                                                                                                                                                                                                        2}]))), 
-    <<":rel:">> = iolist_to_binary(join(re:split("2barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[]))), 
-    <<":rel">> = iolist_to_binary(join(re:split("A barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[trim]))), 
+                                                                                                                                                                                                                        2}]))),
+    <<":rel:">> = iolist_to_binary(join(re:split("2barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[]))),
+    <<":rel">> = iolist_to_binary(join(re:split("A barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[trim]))),
     <<":rel:">> = iolist_to_binary(join(re:split("A barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[{parts,
-                                                                                                                                                                                                                          2}]))), 
-    <<":rel:">> = iolist_to_binary(join(re:split("A barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[]))), 
-    <<":abc:456">> = iolist_to_binary(join(re:split("abc456","^(\\D*)(?=\\d)(?!123)",[trim]))), 
+                                                                                                                                                                                                                          2}]))),
+    <<":rel:">> = iolist_to_binary(join(re:split("A barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[]))),
+    <<":abc:456">> = iolist_to_binary(join(re:split("abc456","^(\\D*)(?=\\d)(?!123)",[trim]))),
     <<":abc:456">> = iolist_to_binary(join(re:split("abc456","^(\\D*)(?=\\d)(?!123)",[{parts,
-                                                                                                                                                                                                        2}]))), 
-    <<":abc:456">> = iolist_to_binary(join(re:split("abc456","^(\\D*)(?=\\d)(?!123)",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\D*)(?=\\d)(?!123)",[trim]))), 
+                                                                                                                                                                                                        2}]))),
+    <<":abc:456">> = iolist_to_binary(join(re:split("abc456","^(\\D*)(?=\\d)(?!123)",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\D*)(?=\\d)(?!123)",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\D*)(?=\\d)(?!123)",[{parts,
-                                                                                                                                                                                                                  2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\D*)(?=\\d)(?!123)",[]))), 
-    <<"abc123">> = iolist_to_binary(join(re:split("abc123","^(\\D*)(?=\\d)(?!123)",[trim]))), 
+                                                                                                                                                                                                                  2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\D*)(?=\\d)(?!123)",[]))),
+    <<"abc123">> = iolist_to_binary(join(re:split("abc123","^(\\D*)(?=\\d)(?!123)",[trim]))),
     <<"abc123">> = iolist_to_binary(join(re:split("abc123","^(\\D*)(?=\\d)(?!123)",[{parts,
-                                                                                                                                                                                                        2}]))), 
-    <<"abc123">> = iolist_to_binary(join(re:split("abc123","^(\\D*)(?=\\d)(?!123)",[]))), 
+                                                                                                                                                                                                        2}]))),
+    <<"abc123">> = iolist_to_binary(join(re:split("abc123","^(\\D*)(?=\\d)(?!123)",[]))),
     ok.
 run3() ->
     <<"">> = iolist_to_binary(join(re:split("1234","^1234(?# test newlines
-  inside)",[trim]))), 
+  inside)",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("1234","^1234(?# test newlines
-  inside)",[{parts,2}]))), 
+  inside)",[{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("1234","^1234(?# test newlines
-  inside)",[]))), 
+  inside)",[]))),
     <<"">> = iolist_to_binary(join(re:split("1234","^1234 #comment in extended re
-  ",[extended,trim]))), 
+  ",[extended,trim]))),
     <<":">> = iolist_to_binary(join(re:split("1234","^1234 #comment in extended re
-  ",[extended,{parts,2}]))), 
+  ",[extended,{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("1234","^1234 #comment in extended re
-  ",[extended]))), 
+  ",[extended]))),
     <<"">> = iolist_to_binary(join(re:split("abcd","#rhubarb
-  abcd",[extended,trim]))), 
+  abcd",[extended,trim]))),
     <<":">> = iolist_to_binary(join(re:split("abcd","#rhubarb
-  abcd",[extended,{parts,2}]))), 
+  abcd",[extended,{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("abcd","#rhubarb
-  abcd",[extended]))), 
+  abcd",[extended]))),
     <<"">> = iolist_to_binary(join(re:split("abcd","^abcd#rhubarb",[extended,
-                                                                                                                                                                                trim]))), 
+                                                                                                                                                                                trim]))),
     <<":">> = iolist_to_binary(join(re:split("abcd","^abcd#rhubarb",[extended,
                                                                                                                                                                                   {parts,
-                                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abcd","^abcd#rhubarb",[extended]))), 
-    <<":a:b">> = iolist_to_binary(join(re:split("aaab","^(a)\\1{2,3}(.)",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abcd","^abcd#rhubarb",[extended]))),
+    <<":a:b">> = iolist_to_binary(join(re:split("aaab","^(a)\\1{2,3}(.)",[trim]))),
     <<":a:b:">> = iolist_to_binary(join(re:split("aaab","^(a)\\1{2,3}(.)",[{parts,
-                                                                                                                                                                                       2}]))), 
-    <<":a:b:">> = iolist_to_binary(join(re:split("aaab","^(a)\\1{2,3}(.)",[]))), 
-    <<":a:b">> = iolist_to_binary(join(re:split("aaaab","^(a)\\1{2,3}(.)",[trim]))), 
+                                                                                                                                                                                       2}]))),
+    <<":a:b:">> = iolist_to_binary(join(re:split("aaab","^(a)\\1{2,3}(.)",[]))),
+    <<":a:b">> = iolist_to_binary(join(re:split("aaaab","^(a)\\1{2,3}(.)",[trim]))),
     <<":a:b:">> = iolist_to_binary(join(re:split("aaaab","^(a)\\1{2,3}(.)",[{parts,
-                                                                                                                                                                                         2}]))), 
-    <<":a:b:">> = iolist_to_binary(join(re:split("aaaab","^(a)\\1{2,3}(.)",[]))), 
-    <<":a:a:b">> = iolist_to_binary(join(re:split("aaaaab","^(a)\\1{2,3}(.)",[trim]))), 
+                                                                                                                                                                                         2}]))),
+    <<":a:b:">> = iolist_to_binary(join(re:split("aaaab","^(a)\\1{2,3}(.)",[]))),
+    <<":a:a:b">> = iolist_to_binary(join(re:split("aaaaab","^(a)\\1{2,3}(.)",[trim]))),
     <<":a:a:b">> = iolist_to_binary(join(re:split("aaaaab","^(a)\\1{2,3}(.)",[{parts,
-                                                                                                                                                                                           2}]))), 
-    <<":a:a:b">> = iolist_to_binary(join(re:split("aaaaab","^(a)\\1{2,3}(.)",[]))), 
-    <<":a:a:ab">> = iolist_to_binary(join(re:split("aaaaaab","^(a)\\1{2,3}(.)",[trim]))), 
+                                                                                                                                                                                           2}]))),
+    <<":a:a:b">> = iolist_to_binary(join(re:split("aaaaab","^(a)\\1{2,3}(.)",[]))),
+    <<":a:a:ab">> = iolist_to_binary(join(re:split("aaaaaab","^(a)\\1{2,3}(.)",[trim]))),
     <<":a:a:ab">> = iolist_to_binary(join(re:split("aaaaaab","^(a)\\1{2,3}(.)",[{parts,
-                                                                                                                                                                                             2}]))), 
-    <<":a:a:ab">> = iolist_to_binary(join(re:split("aaaaaab","^(a)\\1{2,3}(.)",[]))), 
-    <<"the ">> = iolist_to_binary(join(re:split("the abc","(?!^)abc",[trim]))), 
+                                                                                                                                                                                             2}]))),
+    <<":a:a:ab">> = iolist_to_binary(join(re:split("aaaaaab","^(a)\\1{2,3}(.)",[]))),
+    <<"the ">> = iolist_to_binary(join(re:split("the abc","(?!^)abc",[trim]))),
     <<"the :">> = iolist_to_binary(join(re:split("the abc","(?!^)abc",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<"the :">> = iolist_to_binary(join(re:split("the abc","(?!^)abc",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?!^)abc",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<"the :">> = iolist_to_binary(join(re:split("the abc","(?!^)abc",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?!^)abc",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?!^)abc",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?!^)abc",[]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","(?!^)abc",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?!^)abc",[]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(?!^)abc",[trim]))),
     <<"abc">> = iolist_to_binary(join(re:split("abc","(?!^)abc",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","(?!^)abc",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","(?=^)abc",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(?!^)abc",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","(?=^)abc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","(?=^)abc",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","(?=^)abc",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?=^)abc",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","(?=^)abc",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?=^)abc",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?=^)abc",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?=^)abc",[]))), 
-    <<"the abc">> = iolist_to_binary(join(re:split("the abc","(?=^)abc",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?=^)abc",[]))),
+    <<"the abc">> = iolist_to_binary(join(re:split("the abc","(?=^)abc",[trim]))),
     <<"the abc">> = iolist_to_binary(join(re:split("the abc","(?=^)abc",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<"the abc">> = iolist_to_binary(join(re:split("the abc","(?=^)abc",[]))), 
-    <<":b:bbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}(ab*|b)",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<"the abc">> = iolist_to_binary(join(re:split("the abc","(?=^)abc",[]))),
+    <<":b:bbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}(ab*|b)",[trim]))),
     <<":b:bbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}(ab*|b)",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<":b:bbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}(ab*|b)",[]))), 
-    <<":abbbbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}?(ab*|b)",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<":b:bbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}(ab*|b)",[]))),
+    <<":abbbbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}?(ab*|b)",[trim]))),
     <<":abbbbb:">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}?(ab*|b)",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<":abbbbb:">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}?(ab*|b)",[]))), 
-    <<":a:bbbbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}?(ab*?|b)",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<":abbbbb:">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}?(ab*|b)",[]))),
+    <<":a:bbbbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}?(ab*?|b)",[trim]))),
     <<":a:bbbbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}?(ab*?|b)",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<":a:bbbbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}?(ab*?|b)",[]))), 
-    <<":b:bbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}(ab*?|b)",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<":a:bbbbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}?(ab*?|b)",[]))),
+    <<":b:bbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}(ab*?|b)",[trim]))),
     <<":b:bbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}(ab*?|b)",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<":b:bbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}(ab*?|b)",[]))), 
+                                                                                                                                                                                                  2}]))),
+    <<":b:bbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}(ab*?|b)",[]))),
     <<"Alan Other <user.ain>">> = iolist_to_binary(join(re:split("Alan Other <user.ain>","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -1630,7 +1630,7 @@ run3() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment",[extended,trim]))), 
+\\)  )*                       # optional trailing comment",[extended,trim]))),
     <<"Alan Other <user.ain>">> = iolist_to_binary(join(re:split("Alan Other <user.ain>","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -1824,7 +1824,7 @@ run3() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,
-                                                               {parts,2}]))), 
+                                                               {parts,2}]))),
     <<"Alan Other <user.ain>">> = iolist_to_binary(join(re:split("Alan Other <user.ain>","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -2017,7 +2017,7 @@ run3() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment",[extended]))), 
+\\)  )*                       # optional trailing comment",[extended]))),
     <<"<user.ain>">> = iolist_to_binary(join(re:split("<user.ain>","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -2210,7 +2210,7 @@ run3() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment",[extended,trim]))), 
+\\)  )*                       # optional trailing comment",[extended,trim]))),
     <<"<user.ain>">> = iolist_to_binary(join(re:split("<user.ain>","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -2404,7 +2404,7 @@ run3() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,
-                                                               {parts,2}]))), 
+                                                               {parts,2}]))),
     <<"<user.ain>">> = iolist_to_binary(join(re:split("<user.ain>","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -2597,7 +2597,7 @@ run3() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment",[extended]))), 
+\\)  )*                       # optional trailing comment",[extended]))),
     <<"user.ain">> = iolist_to_binary(join(re:split("user.ain","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -2790,7 +2790,7 @@ run3() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment",[extended,trim]))), 
+\\)  )*                       # optional trailing comment",[extended,trim]))),
     <<"user.ain">> = iolist_to_binary(join(re:split("user.ain","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -2984,7 +2984,7 @@ run3() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,
-                                                               {parts,2}]))), 
+                                                               {parts,2}]))),
     <<"user.ain">> = iolist_to_binary(join(re:split("user.ain","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -3177,7 +3177,7 @@ run3() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment",[extended]))), 
+\\)  )*                       # optional trailing comment",[extended]))),
     <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("\"A. Other\" <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -3370,7 +3370,7 @@ run3() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment",[extended,trim]))), 
+\\)  )*                       # optional trailing comment",[extended,trim]))),
     <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("\"A. Other\" <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -3564,7 +3564,7 @@ run3() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,
-                                                               {parts,2}]))), 
+                                                               {parts,2}]))),
     <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("\"A. Other\" <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -3757,7 +3757,7 @@ run3() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment",[extended]))), 
+\\)  )*                       # optional trailing comment",[extended]))),
     <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("A. Other <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -3950,7 +3950,7 @@ run3() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment",[extended,trim]))), 
+\\)  )*                       # optional trailing comment",[extended,trim]))),
     <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("A. Other <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -4144,7 +4144,7 @@ run3() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,
-                                                               {parts,2}]))), 
+                                                               {parts,2}]))),
     <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("A. Other <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -4337,7 +4337,7 @@ run3() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment",[extended]))), 
+\\)  )*                       # optional trailing comment",[extended]))),
     <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(join(re:split("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -4530,7 +4530,7 @@ run3() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment",[extended,trim]))), 
+\\)  )*                       # optional trailing comment",[extended,trim]))),
     <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(join(re:split("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -4724,7 +4724,7 @@ run3() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,
-                                                               {parts,2}]))), 
+                                                               {parts,2}]))),
     <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(join(re:split("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -4917,7 +4917,7 @@ run3() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment",[extended]))), 
+\\)  )*                       # optional trailing comment",[extended]))),
     <<"A missing angle <user.where">> = iolist_to_binary(join(re:split("A missing angle <user.where","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -5110,7 +5110,7 @@ run3() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment",[extended,trim]))), 
+\\)  )*                       # optional trailing comment",[extended,trim]))),
     <<"A missing angle <user.where">> = iolist_to_binary(join(re:split("A missing angle <user.where","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -5304,7 +5304,7 @@ run3() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,
-                                                               {parts,2}]))), 
+                                                               {parts,2}]))),
     <<"A missing angle <user.where">> = iolist_to_binary(join(re:split("A missing angle <user.where","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -5497,7 +5497,7 @@ run3() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment",[extended]))), 
+\\)  )*                       # optional trailing comment",[extended]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -5690,7 +5690,7 @@ run3() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment",[extended,trim]))), 
+\\)  )*                       # optional trailing comment",[extended,trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -5884,7 +5884,7 @@ run3() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,
-                                                               {parts,2}]))), 
+                                                               {parts,2}]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -6077,7 +6077,7 @@ run3() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment",[extended]))), 
+\\)  )*                       # optional trailing comment",[extended]))),
     <<"The quick brown fox">> = iolist_to_binary(join(re:split("The quick brown fox","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -6270,7 +6270,7 @@ run3() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment",[extended,trim]))), 
+\\)  )*                       # optional trailing comment",[extended,trim]))),
     <<"The quick brown fox">> = iolist_to_binary(join(re:split("The quick brown fox","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -6464,7 +6464,7 @@ run3() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,
-                                                               {parts,2}]))), 
+                                                               {parts,2}]))),
     <<"The quick brown fox">> = iolist_to_binary(join(re:split("The quick brown fox","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
@@ -6657,7 +6657,7 @@ run3() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment",[extended]))), 
+\\)  )*                       # optional trailing comment",[extended]))),
     <<"Alan Other <user.ain>">> = iolist_to_binary(join(re:split("Alan Other <user.ain>","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -7238,7 +7238,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended,trim]))), 
+)",[extended,trim]))),
     <<"Alan Other <user.ain>">> = iolist_to_binary(join(re:split("Alan Other <user.ain>","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -7819,7 +7819,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended,{parts,2}]))), 
+)",[extended,{parts,2}]))),
     <<"Alan Other <user.ain>">> = iolist_to_binary(join(re:split("Alan Other <user.ain>","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -8400,7 +8400,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended]))), 
+)",[extended]))),
     <<"<user.ain>">> = iolist_to_binary(join(re:split("<user.ain>","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -8981,7 +8981,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended,trim]))), 
+)",[extended,trim]))),
     <<"<user.ain>">> = iolist_to_binary(join(re:split("<user.ain>","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -9562,7 +9562,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended,{parts,2}]))), 
+)",[extended,{parts,2}]))),
     <<"<user.ain>">> = iolist_to_binary(join(re:split("<user.ain>","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -10143,7 +10143,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended]))), 
+)",[extended]))),
     <<"user.ain">> = iolist_to_binary(join(re:split("user.ain","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -10724,7 +10724,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended,trim]))), 
+)",[extended,trim]))),
     <<"user.ain">> = iolist_to_binary(join(re:split("user.ain","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -11305,7 +11305,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended,{parts,2}]))), 
+)",[extended,{parts,2}]))),
     <<"user.ain">> = iolist_to_binary(join(re:split("user.ain","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -11886,7 +11886,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended]))), 
+)",[extended]))),
     <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("\"A. Other\" <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -12467,7 +12467,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended,trim]))), 
+)",[extended,trim]))),
     <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("\"A. Other\" <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -13048,7 +13048,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended,{parts,2}]))), 
+)",[extended,{parts,2}]))),
     <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("\"A. Other\" <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -13629,7 +13629,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended]))), 
+)",[extended]))),
     <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("A. Other <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -14210,7 +14210,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended,trim]))), 
+)",[extended,trim]))),
     <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("A. Other <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -14791,7 +14791,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended,{parts,2}]))), 
+)",[extended,{parts,2}]))),
     <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("A. Other <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -15372,7 +15372,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended]))), 
+)",[extended]))),
     <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(join(re:split("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -15953,7 +15953,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended,trim]))), 
+)",[extended,trim]))),
     <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(join(re:split("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -16534,7 +16534,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended,{parts,2}]))), 
+)",[extended,{parts,2}]))),
     <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(join(re:split("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -17115,7 +17115,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended]))), 
+)",[extended]))),
     <<"A missing angle <user.where">> = iolist_to_binary(join(re:split("A missing angle <user.where","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -17696,7 +17696,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended,trim]))), 
+)",[extended,trim]))),
     <<"A missing angle <user.where">> = iolist_to_binary(join(re:split("A missing angle <user.where","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -18277,7 +18277,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended,{parts,2}]))), 
+)",[extended,{parts,2}]))),
     <<"A missing angle <user.where">> = iolist_to_binary(join(re:split("A missing angle <user.where","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -18858,7 +18858,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended]))), 
+)",[extended]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -19439,7 +19439,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended,trim]))), 
+)",[extended,trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -20020,7 +20020,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended,{parts,2}]))), 
+)",[extended,{parts,2}]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -20601,7 +20601,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended]))), 
+)",[extended]))),
     <<"The quick brown fox">> = iolist_to_binary(join(re:split("The quick brown fox","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -21182,7 +21182,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended,trim]))), 
+)",[extended,trim]))),
     <<"The quick brown fox">> = iolist_to_binary(join(re:split("The quick brown fox","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -21763,7 +21763,7 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended,{parts,2}]))), 
+)",[extended,{parts,2}]))),
     <<"The quick brown fox">> = iolist_to_binary(join(re:split("The quick brown fox","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
@@ -22344,5763 +22344,5763 @@ run3() ->
 #       address spec
 >                    #                 >
 # name and address
-)",[extended]))), 
-    <<"abcdefpqrxyz0AB">> = iolist_to_binary(join(re:split("abcdefpqrxyz0AB","abc\\0def\\00pqr\\000xyz\\0000AB",[trim]))), 
+)",[extended]))),
+    <<"abcdefpqrxyz0AB">> = iolist_to_binary(join(re:split("abcdefpqrxyz0AB","abc\\0def\\00pqr\\000xyz\\0000AB",[trim]))),
     <<"abcdefpqrxyz0AB">> = iolist_to_binary(join(re:split("abcdefpqrxyz0AB","abc\\0def\\00pqr\\000xyz\\0000AB",[{parts,
-                                                                                                                                                                                                                                                          2}]))), 
-    <<"abcdefpqrxyz0AB">> = iolist_to_binary(join(re:split("abcdefpqrxyz0AB","abc\\0def\\00pqr\\000xyz\\0000AB",[]))), 
-    <<"abc456 abcdefpqrxyz0ABCDE">> = iolist_to_binary(join(re:split("abc456 abcdefpqrxyz0ABCDE","abc\\0def\\00pqr\\000xyz\\0000AB",[trim]))), 
+                                                                                                                                                                                                                                                          2}]))),
+    <<"abcdefpqrxyz0AB">> = iolist_to_binary(join(re:split("abcdefpqrxyz0AB","abc\\0def\\00pqr\\000xyz\\0000AB",[]))),
+    <<"abc456 abcdefpqrxyz0ABCDE">> = iolist_to_binary(join(re:split("abc456 abcdefpqrxyz0ABCDE","abc\\0def\\00pqr\\000xyz\\0000AB",[trim]))),
     <<"abc456 abcdefpqrxyz0ABCDE">> = iolist_to_binary(join(re:split("abc456 abcdefpqrxyz0ABCDE","abc\\0def\\00pqr\\000xyz\\0000AB",[{parts,
-                                                                                                                                                                                                                                                                              2}]))), 
-    <<"abc456 abcdefpqrxyz0ABCDE">> = iolist_to_binary(join(re:split("abc456 abcdefpqrxyz0ABCDE","abc\\0def\\00pqr\\000xyz\\0000AB",[]))), 
-    <<"abc
efpqr0xyz00AB">> = iolist_to_binary(join(re:split("abc
efpqr0xyz00AB","abc\\x0def\\x00pqr\\x000xyz\\x0000AB",[trim]))), 
+                                                                                                                                                                                                                                                                              2}]))),
+    <<"abc456 abcdefpqrxyz0ABCDE">> = iolist_to_binary(join(re:split("abc456 abcdefpqrxyz0ABCDE","abc\\0def\\00pqr\\000xyz\\0000AB",[]))),
+    <<"abc
efpqr0xyz00AB">> = iolist_to_binary(join(re:split("abc
efpqr0xyz00AB","abc\\x0def\\x00pqr\\x000xyz\\x0000AB",[trim]))),
     <<"abc
efpqr0xyz00AB">> = iolist_to_binary(join(re:split("abc
efpqr0xyz00AB","abc\\x0def\\x00pqr\\x000xyz\\x0000AB",[{parts,
-                                                                                                                                                                                                                                                                    2}]))), 
-    <<"abc
efpqr0xyz00AB">> = iolist_to_binary(join(re:split("abc
efpqr0xyz00AB","abc\\x0def\\x00pqr\\x000xyz\\x0000AB",[]))), 
-    <<"abc456 abc
efpqr0xyz00ABCDE">> = iolist_to_binary(join(re:split("abc456 abc
efpqr0xyz00ABCDE","abc\\x0def\\x00pqr\\x000xyz\\x0000AB",[trim]))), 
+                                                                                                                                                                                                                                                                    2}]))),
+    <<"abc
efpqr0xyz00AB">> = iolist_to_binary(join(re:split("abc
efpqr0xyz00AB","abc\\x0def\\x00pqr\\x000xyz\\x0000AB",[]))),
+    <<"abc456 abc
efpqr0xyz00ABCDE">> = iolist_to_binary(join(re:split("abc456 abc
efpqr0xyz00ABCDE","abc\\x0def\\x00pqr\\x000xyz\\x0000AB",[trim]))),
     <<"abc456 abc
efpqr0xyz00ABCDE">> = iolist_to_binary(join(re:split("abc456 abc
efpqr0xyz00ABCDE","abc\\x0def\\x00pqr\\x000xyz\\x0000AB",[{parts,
-                                                                                                                                                                                                                                                                                        2}]))), 
-    <<"abc456 abc
efpqr0xyz00ABCDE">> = iolist_to_binary(join(re:split("abc456 abc
efpqr0xyz00ABCDE","abc\\x0def\\x00pqr\\x000xyz\\x0000AB",[]))), 
-    <<"A">> = iolist_to_binary(join(re:split("A","^[\\000-\\037]",[trim]))), 
+                                                                                                                                                                                                                                                                                        2}]))),
+    <<"abc456 abc
efpqr0xyz00ABCDE">> = iolist_to_binary(join(re:split("abc456 abc
efpqr0xyz00ABCDE","abc\\x0def\\x00pqr\\x000xyz\\x0000AB",[]))),
+    <<"A">> = iolist_to_binary(join(re:split("A","^[\\000-\\037]",[trim]))),
     <<"A">> = iolist_to_binary(join(re:split("A","^[\\000-\\037]",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"A">> = iolist_to_binary(join(re:split("A","^[\\000-\\037]",[]))), 
-    <<":B">> = iolist_to_binary(join(re:split("
B","^[\\000-\\037]",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"A">> = iolist_to_binary(join(re:split("A","^[\\000-\\037]",[]))),
+    <<":B">> = iolist_to_binary(join(re:split("
B","^[\\000-\\037]",[trim]))),
     <<":B">> = iolist_to_binary(join(re:split("
B","^[\\000-\\037]",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<":B">> = iolist_to_binary(join(re:split("
B","^[\\000-\\037]",[]))), 
-    <<":C">> = iolist_to_binary(join(re:split("C","^[\\000-\\037]",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<":B">> = iolist_to_binary(join(re:split("
B","^[\\000-\\037]",[]))),
+    <<":C">> = iolist_to_binary(join(re:split("C","^[\\000-\\037]",[trim]))),
     <<":C">> = iolist_to_binary(join(re:split("C","^[\\000-\\037]",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<":C">> = iolist_to_binary(join(re:split("C","^[\\000-\\037]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("","\\0*",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<":C">> = iolist_to_binary(join(re:split("C","^[\\000-\\037]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("","\\0*",[trim]))),
     <<"">> = iolist_to_binary(join(re:split("","\\0*",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<"">> = iolist_to_binary(join(re:split("","\\0*",[]))), 
-    <<"The AZ">> = iolist_to_binary(join(re:split("The AZ","A\\x0{2,3}Z",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<"">> = iolist_to_binary(join(re:split("","\\0*",[]))),
+    <<"The AZ">> = iolist_to_binary(join(re:split("The AZ","A\\x0{2,3}Z",[trim]))),
     <<"The AZ">> = iolist_to_binary(join(re:split("The AZ","A\\x0{2,3}Z",[{parts,
-                                                                                                                                                                                       2}]))), 
-    <<"The AZ">> = iolist_to_binary(join(re:split("The AZ","A\\x0{2,3}Z",[]))), 
-    <<"An AZ">> = iolist_to_binary(join(re:split("An AZ","A\\x0{2,3}Z",[trim]))), 
+                                                                                                                                                                                       2}]))),
+    <<"The AZ">> = iolist_to_binary(join(re:split("The AZ","A\\x0{2,3}Z",[]))),
+    <<"An AZ">> = iolist_to_binary(join(re:split("An AZ","A\\x0{2,3}Z",[trim]))),
     <<"An AZ">> = iolist_to_binary(join(re:split("An AZ","A\\x0{2,3}Z",[{parts,
-                                                                                                                                                                                       2}]))), 
-    <<"An AZ">> = iolist_to_binary(join(re:split("An AZ","A\\x0{2,3}Z",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","A\\x0{2,3}Z",[trim]))), 
+                                                                                                                                                                                       2}]))),
+    <<"An AZ">> = iolist_to_binary(join(re:split("An AZ","A\\x0{2,3}Z",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","A\\x0{2,3}Z",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","A\\x0{2,3}Z",[{parts,
-                                                                                                                                                                                             2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","A\\x0{2,3}Z",[]))), 
-    <<"AZ">> = iolist_to_binary(join(re:split("AZ","A\\x0{2,3}Z",[trim]))), 
+                                                                                                                                                                                             2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","A\\x0{2,3}Z",[]))),
+    <<"AZ">> = iolist_to_binary(join(re:split("AZ","A\\x0{2,3}Z",[trim]))),
     <<"AZ">> = iolist_to_binary(join(re:split("AZ","A\\x0{2,3}Z",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<"AZ">> = iolist_to_binary(join(re:split("AZ","A\\x0{2,3}Z",[]))), 
-    <<"AZ">> = iolist_to_binary(join(re:split("AZ","A\\x0{2,3}Z",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<"AZ">> = iolist_to_binary(join(re:split("AZ","A\\x0{2,3}Z",[]))),
+    <<"AZ">> = iolist_to_binary(join(re:split("AZ","A\\x0{2,3}Z",[trim]))),
     <<"AZ">> = iolist_to_binary(join(re:split("AZ","A\\x0{2,3}Z",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<"AZ">> = iolist_to_binary(join(re:split("AZ","A\\x0{2,3}Z",[]))), 
-    <<":cow:bell">> = iolist_to_binary(join(re:split("cowcowbell","^(cow|)\\1(bell)",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<"AZ">> = iolist_to_binary(join(re:split("AZ","A\\x0{2,3}Z",[]))),
+    <<":cow:bell">> = iolist_to_binary(join(re:split("cowcowbell","^(cow|)\\1(bell)",[trim]))),
     <<":cow:bell:">> = iolist_to_binary(join(re:split("cowcowbell","^(cow|)\\1(bell)",[{parts,
-                                                                                                                                                                                                     2}]))), 
-    <<":cow:bell:">> = iolist_to_binary(join(re:split("cowcowbell","^(cow|)\\1(bell)",[]))), 
-    <<"::bell">> = iolist_to_binary(join(re:split("bell","^(cow|)\\1(bell)",[trim]))), 
+                                                                                                                                                                                                     2}]))),
+    <<":cow:bell:">> = iolist_to_binary(join(re:split("cowcowbell","^(cow|)\\1(bell)",[]))),
+    <<"::bell">> = iolist_to_binary(join(re:split("bell","^(cow|)\\1(bell)",[trim]))),
     <<"::bell:">> = iolist_to_binary(join(re:split("bell","^(cow|)\\1(bell)",[{parts,
-                                                                                                                                                                                         2}]))), 
-    <<"::bell:">> = iolist_to_binary(join(re:split("bell","^(cow|)\\1(bell)",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(cow|)\\1(bell)",[trim]))), 
+                                                                                                                                                                                         2}]))),
+    <<"::bell:">> = iolist_to_binary(join(re:split("bell","^(cow|)\\1(bell)",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(cow|)\\1(bell)",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(cow|)\\1(bell)",[{parts,
-                                                                                                                                                                                                       2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(cow|)\\1(bell)",[]))), 
-    <<"cowbell">> = iolist_to_binary(join(re:split("cowbell","^(cow|)\\1(bell)",[trim]))), 
+                                                                                                                                                                                                       2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(cow|)\\1(bell)",[]))),
+    <<"cowbell">> = iolist_to_binary(join(re:split("cowbell","^(cow|)\\1(bell)",[trim]))),
     <<"cowbell">> = iolist_to_binary(join(re:split("cowbell","^(cow|)\\1(bell)",[{parts,
-                                                                                                                                                                                               2}]))), 
-    <<"cowbell">> = iolist_to_binary(join(re:split("cowbell","^(cow|)\\1(bell)",[]))), 
-    <<":abc">> = iolist_to_binary(join(re:split(" abc","^\\s",[trim]))), 
+                                                                                                                                                                                               2}]))),
+    <<"cowbell">> = iolist_to_binary(join(re:split("cowbell","^(cow|)\\1(bell)",[]))),
+    <<":abc">> = iolist_to_binary(join(re:split(" abc","^\\s",[trim]))),
     <<":abc">> = iolist_to_binary(join(re:split(" abc","^\\s",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<":abc">> = iolist_to_binary(join(re:split(" abc","^\\s",[]))), 
-    <<":abc">> = iolist_to_binary(join(re:split("abc","^\\s",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<":abc">> = iolist_to_binary(join(re:split(" abc","^\\s",[]))),
+    <<":abc">> = iolist_to_binary(join(re:split("abc","^\\s",[trim]))),
     <<":abc">> = iolist_to_binary(join(re:split("abc","^\\s",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<":abc">> = iolist_to_binary(join(re:split("abc","^\\s",[]))), 
+                                                                                                                                                                 2}]))),
+    <<":abc">> = iolist_to_binary(join(re:split("abc","^\\s",[]))),
     <<":abc">> = iolist_to_binary(join(re:split("
-abc","^\\s",[trim]))), 
+abc","^\\s",[trim]))),
     <<":abc">> = iolist_to_binary(join(re:split("
-abc","^\\s",[{parts,2}]))), 
+abc","^\\s",[{parts,2}]))),
     <<":abc">> = iolist_to_binary(join(re:split("
-abc","^\\s",[]))), 
-    <<":abc">> = iolist_to_binary(join(re:split("
abc","^\\s",[trim]))), 
+abc","^\\s",[]))),
+    <<":abc">> = iolist_to_binary(join(re:split("
abc","^\\s",[trim]))),
     <<":abc">> = iolist_to_binary(join(re:split("
abc","^\\s",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<":abc">> = iolist_to_binary(join(re:split("
abc","^\\s",[]))), 
-    <<":abc">> = iolist_to_binary(join(re:split("	abc","^\\s",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<":abc">> = iolist_to_binary(join(re:split("
abc","^\\s",[]))),
+    <<":abc">> = iolist_to_binary(join(re:split("	abc","^\\s",[trim]))),
     <<":abc">> = iolist_to_binary(join(re:split("	abc","^\\s",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<":abc">> = iolist_to_binary(join(re:split("	abc","^\\s",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\s",[trim]))), 
+                                                                                                                                                                           2}]))),
+    <<":abc">> = iolist_to_binary(join(re:split("	abc","^\\s",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\s",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\s",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\s",[]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","^\\s",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\s",[]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^\\s",[trim]))),
     <<"abc">> = iolist_to_binary(join(re:split("abc","^\\s",[{parts,
-                                                                                                                                                               2}]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","^\\s",[]))), 
+                                                                                                                                                               2}]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^\\s",[]))),
     ok.
 run4() ->
     <<"">> = iolist_to_binary(join(re:split("abc","^a	b
-      c",[extended,trim]))), 
+      c",[extended,trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","^a	b
-      c",[extended,{parts,2}]))), 
+      c",[extended,{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("abc","^a	b
-      c",[extended]))), 
-    <<":a">> = iolist_to_binary(join(re:split("ab","^(a|)\\1*b",[trim]))), 
+      c",[extended]))),
+    <<":a">> = iolist_to_binary(join(re:split("ab","^(a|)\\1*b",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("ab","^(a|)\\1*b",[{parts,
-                                                                                                                                                                         2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("ab","^(a|)\\1*b",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1*b",[trim]))), 
+                                                                                                                                                                         2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("ab","^(a|)\\1*b",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1*b",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1*b",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1*b",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("b","^(a|)\\1*b",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1*b",[]))),
+    <<"">> = iolist_to_binary(join(re:split("b","^(a|)\\1*b",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1*b",[{parts,
-                                                                                                                                                                       2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1*b",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1*b",[trim]))), 
+                                                                                                                                                                       2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1*b",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1*b",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1*b",[{parts,
-                                                                                                                                                                                           2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1*b",[]))), 
-    <<"acb">> = iolist_to_binary(join(re:split("acb","^(a|)\\1*b",[trim]))), 
+                                                                                                                                                                                           2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1*b",[]))),
+    <<"acb">> = iolist_to_binary(join(re:split("acb","^(a|)\\1*b",[trim]))),
     <<"acb">> = iolist_to_binary(join(re:split("acb","^(a|)\\1*b",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<"acb">> = iolist_to_binary(join(re:split("acb","^(a|)\\1*b",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aab","^(a|)\\1+b",[trim]))), 
+                                                                                                                                                                           2}]))),
+    <<"acb">> = iolist_to_binary(join(re:split("acb","^(a|)\\1*b",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aab","^(a|)\\1+b",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aab","^(a|)\\1+b",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aab","^(a|)\\1+b",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1+b",[trim]))), 
+                                                                                                                                                                           2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aab","^(a|)\\1+b",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1+b",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1+b",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1+b",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("b","^(a|)\\1+b",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1+b",[]))),
+    <<"">> = iolist_to_binary(join(re:split("b","^(a|)\\1+b",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1+b",[{parts,
-                                                                                                                                                                       2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1+b",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1+b",[trim]))), 
+                                                                                                                                                                       2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1+b",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1+b",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1+b",[{parts,
-                                                                                                                                                                                           2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1+b",[]))), 
-    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1+b",[trim]))), 
+                                                                                                                                                                                           2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1+b",[]))),
+    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1+b",[trim]))),
     <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1+b",[{parts,
-                                                                                                                                                                         2}]))), 
-    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1+b",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("ab","^(a|)\\1?b",[trim]))), 
+                                                                                                                                                                         2}]))),
+    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1+b",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("ab","^(a|)\\1?b",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("ab","^(a|)\\1?b",[{parts,
-                                                                                                                                                                         2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("ab","^(a|)\\1?b",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aab","^(a|)\\1?b",[trim]))), 
+                                                                                                                                                                         2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("ab","^(a|)\\1?b",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aab","^(a|)\\1?b",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aab","^(a|)\\1?b",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aab","^(a|)\\1?b",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("b","^(a|)\\1?b",[trim]))), 
+                                                                                                                                                                           2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aab","^(a|)\\1?b",[]))),
+    <<"">> = iolist_to_binary(join(re:split("b","^(a|)\\1?b",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1?b",[{parts,
-                                                                                                                                                                       2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1?b",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1?b",[trim]))), 
+                                                                                                                                                                       2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1?b",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1?b",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1?b",[{parts,
-                                                                                                                                                                                           2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1?b",[]))), 
-    <<"acb">> = iolist_to_binary(join(re:split("acb","^(a|)\\1?b",[trim]))), 
+                                                                                                                                                                                           2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1?b",[]))),
+    <<"acb">> = iolist_to_binary(join(re:split("acb","^(a|)\\1?b",[trim]))),
     <<"acb">> = iolist_to_binary(join(re:split("acb","^(a|)\\1?b",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<"acb">> = iolist_to_binary(join(re:split("acb","^(a|)\\1?b",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aaab","^(a|)\\1{2}b",[trim]))), 
+                                                                                                                                                                           2}]))),
+    <<"acb">> = iolist_to_binary(join(re:split("acb","^(a|)\\1?b",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aaab","^(a|)\\1{2}b",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aaab","^(a|)\\1{2}b",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aaab","^(a|)\\1{2}b",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("b","^(a|)\\1{2}b",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aaab","^(a|)\\1{2}b",[]))),
+    <<"">> = iolist_to_binary(join(re:split("b","^(a|)\\1{2}b",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1{2}b",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1{2}b",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1{2}b",[trim]))), 
+                                                                                                                                                                           2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1{2}b",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1{2}b",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1{2}b",[{parts,
-                                                                                                                                                                                               2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1{2}b",[]))), 
-    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1{2}b",[trim]))), 
+                                                                                                                                                                                               2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1{2}b",[]))),
+    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1{2}b",[trim]))),
     <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1{2}b",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1{2}b",[]))), 
-    <<"aab">> = iolist_to_binary(join(re:split("aab","^(a|)\\1{2}b",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1{2}b",[]))),
+    <<"aab">> = iolist_to_binary(join(re:split("aab","^(a|)\\1{2}b",[trim]))),
     <<"aab">> = iolist_to_binary(join(re:split("aab","^(a|)\\1{2}b",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<"aab">> = iolist_to_binary(join(re:split("aab","^(a|)\\1{2}b",[]))), 
-    <<"aaaab">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1{2}b",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<"aab">> = iolist_to_binary(join(re:split("aab","^(a|)\\1{2}b",[]))),
+    <<"aaaab">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1{2}b",[trim]))),
     <<"aaaab">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1{2}b",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<"aaaab">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1{2}b",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aaab","^(a|)\\1{2,3}b",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<"aaaab">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1{2}b",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aaab","^(a|)\\1{2,3}b",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aaab","^(a|)\\1{2,3}b",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aaab","^(a|)\\1{2,3}b",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1{2,3}b",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aaab","^(a|)\\1{2,3}b",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1{2,3}b",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1{2,3}b",[{parts,
-                                                                                                                                                                                       2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1{2,3}b",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("b","^(a|)\\1{2,3}b",[trim]))), 
+                                                                                                                                                                                       2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1{2,3}b",[]))),
+    <<"">> = iolist_to_binary(join(re:split("b","^(a|)\\1{2,3}b",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1{2,3}b",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1{2,3}b",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1{2,3}b",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1{2,3}b",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1{2,3}b",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1{2,3}b",[{parts,
-                                                                                                                                                                                                   2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1{2,3}b",[]))), 
-    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1{2,3}b",[trim]))), 
+                                                                                                                                                                                                   2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1{2,3}b",[]))),
+    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1{2,3}b",[trim]))),
     <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1{2,3}b",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1{2,3}b",[]))), 
-    <<"aab">> = iolist_to_binary(join(re:split("aab","^(a|)\\1{2,3}b",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1{2,3}b",[]))),
+    <<"aab">> = iolist_to_binary(join(re:split("aab","^(a|)\\1{2,3}b",[trim]))),
     <<"aab">> = iolist_to_binary(join(re:split("aab","^(a|)\\1{2,3}b",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<"aab">> = iolist_to_binary(join(re:split("aab","^(a|)\\1{2,3}b",[]))), 
-    <<"aaaaab">> = iolist_to_binary(join(re:split("aaaaab","^(a|)\\1{2,3}b",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<"aab">> = iolist_to_binary(join(re:split("aab","^(a|)\\1{2,3}b",[]))),
+    <<"aaaaab">> = iolist_to_binary(join(re:split("aaaaab","^(a|)\\1{2,3}b",[trim]))),
     <<"aaaaab">> = iolist_to_binary(join(re:split("aaaaab","^(a|)\\1{2,3}b",[{parts,
-                                                                                                                                                                                         2}]))), 
-    <<"aaaaab">> = iolist_to_binary(join(re:split("aaaaab","^(a|)\\1{2,3}b",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abbbbc","ab{1,3}bc",[trim]))), 
+                                                                                                                                                                                         2}]))),
+    <<"aaaaab">> = iolist_to_binary(join(re:split("aaaaab","^(a|)\\1{2,3}b",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abbbbc","ab{1,3}bc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{1,3}bc",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{1,3}bc",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abbbc","ab{1,3}bc",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{1,3}bc",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abbbc","ab{1,3}bc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abbbc","ab{1,3}bc",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abbbc","ab{1,3}bc",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abbc","ab{1,3}bc",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abbbc","ab{1,3}bc",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abbc","ab{1,3}bc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abbc","ab{1,3}bc",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abbc","ab{1,3}bc",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{1,3}bc",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abbc","ab{1,3}bc",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{1,3}bc",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{1,3}bc",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{1,3}bc",[]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","ab{1,3}bc",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{1,3}bc",[]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","ab{1,3}bc",[trim]))),
     <<"abc">> = iolist_to_binary(join(re:split("abc","ab{1,3}bc",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","ab{1,3}bc",[]))), 
-    <<"abbbbbc">> = iolist_to_binary(join(re:split("abbbbbc","ab{1,3}bc",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","ab{1,3}bc",[]))),
+    <<"abbbbbc">> = iolist_to_binary(join(re:split("abbbbbc","ab{1,3}bc",[trim]))),
     <<"abbbbbc">> = iolist_to_binary(join(re:split("abbbbbc","ab{1,3}bc",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<"abbbbbc">> = iolist_to_binary(join(re:split("abbbbbc","ab{1,3}bc",[]))), 
-    <<":track1:title:Blah blah blah">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<"abbbbbc">> = iolist_to_binary(join(re:split("abbbbbc","ab{1,3}bc",[]))),
+    <<":track1:title:Blah blah blah">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)",[trim]))),
     <<":track1:title:Blah blah blah:">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)",[{parts,
-                                                                                                                                                                                                                                                               2}]))), 
-    <<":track1:title:Blah blah blah:">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)",[]))), 
+                                                                                                                                                                                                                                                               2}]))),
+    <<":track1:title:Blah blah blah:">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)",[]))),
     <<":track1:title:Blah blah blah">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)",[caseless,
-                                                                                                                                                                                                                                                             trim]))), 
+                                                                                                                                                                                                                                                             trim]))),
     <<":track1:title:Blah blah blah:">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)",[caseless,
                                                                                                                                                                                                                                                                {parts,
-                                                                                                                                                                                                                                                                2}]))), 
-    <<":track1:title:Blah blah blah:">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)",[caseless]))), 
+                                                                                                                                                                                                                                                                2}]))),
+    <<":track1:title:Blah blah blah:">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)",[caseless]))),
     <<":track1:title:Blah blah blah">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[t ]+(.*)",[caseless,
-                                                                                                                                                                                                                                                             trim]))), 
+                                                                                                                                                                                                                                                             trim]))),
     <<":track1:title:Blah blah blah:">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[t ]+(.*)",[caseless,
                                                                                                                                                                                                                                                                {parts,
-                                                                                                                                                                                                                                                                2}]))), 
-    <<":track1:title:Blah blah blah:">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[t ]+(.*)",[caseless]))), 
-    <<"">> = iolist_to_binary(join(re:split("WXY_^abc","^[W-c]+$",[trim]))), 
+                                                                                                                                                                                                                                                                2}]))),
+    <<":track1:title:Blah blah blah:">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[t ]+(.*)",[caseless]))),
+    <<"">> = iolist_to_binary(join(re:split("WXY_^abc","^[W-c]+$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("WXY_^abc","^[W-c]+$",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("WXY_^abc","^[W-c]+$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-c]+$",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("WXY_^abc","^[W-c]+$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-c]+$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-c]+$",[{parts,
-                                                                                                                                                                                       2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-c]+$",[]))), 
-    <<"wxy">> = iolist_to_binary(join(re:split("wxy","^[W-c]+$",[trim]))), 
+                                                                                                                                                                                       2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-c]+$",[]))),
+    <<"wxy">> = iolist_to_binary(join(re:split("wxy","^[W-c]+$",[trim]))),
     <<"wxy">> = iolist_to_binary(join(re:split("wxy","^[W-c]+$",[{parts,
-                                                                                                                                                                       2}]))), 
-    <<"wxy">> = iolist_to_binary(join(re:split("wxy","^[W-c]+$",[]))), 
+                                                                                                                                                                       2}]))),
+    <<"wxy">> = iolist_to_binary(join(re:split("wxy","^[W-c]+$",[]))),
     <<"">> = iolist_to_binary(join(re:split("WXY_^abc","^[W-c]+$",[caseless,
-                                                                                                                                                                               trim]))), 
+                                                                                                                                                                               trim]))),
     <<":">> = iolist_to_binary(join(re:split("WXY_^abc","^[W-c]+$",[caseless,
                                                                                                                                                                                  {parts,
-                                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("WXY_^abc","^[W-c]+$",[caseless]))), 
+                                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("WXY_^abc","^[W-c]+$",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("wxy_^ABC","^[W-c]+$",[caseless,
-                                                                                                                                                                               trim]))), 
+                                                                                                                                                                               trim]))),
     <<":">> = iolist_to_binary(join(re:split("wxy_^ABC","^[W-c]+$",[caseless,
                                                                                                                                                                                  {parts,
-                                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("wxy_^ABC","^[W-c]+$",[caseless]))), 
+                                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("wxy_^ABC","^[W-c]+$",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("WXY_^abc","^[\\x3f-\\x5F]+$",[caseless,
-                                                                                                                                                                                                 trim]))), 
+                                                                                                                                                                                                 trim]))),
     <<":">> = iolist_to_binary(join(re:split("WXY_^abc","^[\\x3f-\\x5F]+$",[caseless,
                                                                                                                                                                                                    {parts,
-                                                                                                                                                                                                    2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("WXY_^abc","^[\\x3f-\\x5F]+$",[caseless]))), 
+                                                                                                                                                                                                    2}]))),
+    <<":">> = iolist_to_binary(join(re:split("WXY_^abc","^[\\x3f-\\x5F]+$",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("wxy_^ABC","^[\\x3f-\\x5F]+$",[caseless,
-                                                                                                                                                                                                 trim]))), 
+                                                                                                                                                                                                 trim]))),
     <<":">> = iolist_to_binary(join(re:split("wxy_^ABC","^[\\x3f-\\x5F]+$",[caseless,
                                                                                                                                                                                                    {parts,
-                                                                                                                                                                                                    2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("wxy_^ABC","^[\\x3f-\\x5F]+$",[caseless]))), 
+                                                                                                                                                                                                    2}]))),
+    <<":">> = iolist_to_binary(join(re:split("wxy_^ABC","^[\\x3f-\\x5F]+$",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("abc","^abc$",[multiline,
-                                                                                                                                                               trim]))), 
+                                                                                                                                                               trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","^abc$",[multiline,
                                                                                                                                                                  {parts,
-                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","^abc$",[multiline]))), 
+                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","^abc$",[multiline]))),
     <<"qqq
 ">> = iolist_to_binary(join(re:split("qqq
-abc","^abc$",[multiline,trim]))), 
+abc","^abc$",[multiline,trim]))),
     <<"qqq
 :">> = iolist_to_binary(join(re:split("qqq
-abc","^abc$",[multiline,{parts,2}]))), 
+abc","^abc$",[multiline,{parts,2}]))),
     <<"qqq
 :">> = iolist_to_binary(join(re:split("qqq
-abc","^abc$",[multiline]))), 
+abc","^abc$",[multiline]))),
     <<":
 zzz">> = iolist_to_binary(join(re:split("abc
-zzz","^abc$",[multiline,trim]))), 
+zzz","^abc$",[multiline,trim]))),
     <<":
 zzz">> = iolist_to_binary(join(re:split("abc
-zzz","^abc$",[multiline,{parts,2}]))), 
+zzz","^abc$",[multiline,{parts,2}]))),
     <<":
 zzz">> = iolist_to_binary(join(re:split("abc
-zzz","^abc$",[multiline]))), 
+zzz","^abc$",[multiline]))),
     <<"qqq
 :
 zzz">> = iolist_to_binary(join(re:split("qqq
 abc
-zzz","^abc$",[multiline,trim]))), 
+zzz","^abc$",[multiline,trim]))),
     <<"qqq
 :
 zzz">> = iolist_to_binary(join(re:split("qqq
 abc
-zzz","^abc$",[multiline,{parts,2}]))), 
+zzz","^abc$",[multiline,{parts,2}]))),
     <<"qqq
 :
 zzz">> = iolist_to_binary(join(re:split("qqq
 abc
-zzz","^abc$",[multiline]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","^abc$",[trim]))), 
+zzz","^abc$",[multiline]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","^abc$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","^abc$",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","^abc$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","^abc$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[]))), 
+                                                                                                                                                                                 2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[]))),
     <<"qqq
 abc">> = iolist_to_binary(join(re:split("qqq
-abc","^abc$",[trim]))), 
+abc","^abc$",[trim]))),
     <<"qqq
 abc">> = iolist_to_binary(join(re:split("qqq
-abc","^abc$",[{parts,2}]))), 
+abc","^abc$",[{parts,2}]))),
     <<"qqq
 abc">> = iolist_to_binary(join(re:split("qqq
-abc","^abc$",[]))), 
+abc","^abc$",[]))),
     <<"abc
 zzz">> = iolist_to_binary(join(re:split("abc
-zzz","^abc$",[trim]))), 
+zzz","^abc$",[trim]))),
     <<"abc
 zzz">> = iolist_to_binary(join(re:split("abc
-zzz","^abc$",[{parts,2}]))), 
+zzz","^abc$",[{parts,2}]))),
     <<"abc
 zzz">> = iolist_to_binary(join(re:split("abc
-zzz","^abc$",[]))), 
+zzz","^abc$",[]))),
     <<"qqq
 abc
 zzz">> = iolist_to_binary(join(re:split("qqq
 abc
-zzz","^abc$",[trim]))), 
+zzz","^abc$",[trim]))),
     <<"qqq
 abc
 zzz">> = iolist_to_binary(join(re:split("qqq
 abc
-zzz","^abc$",[{parts,2}]))), 
+zzz","^abc$",[{parts,2}]))),
     <<"qqq
 abc
 zzz">> = iolist_to_binary(join(re:split("qqq
 abc
-zzz","^abc$",[]))), 
+zzz","^abc$",[]))),
     <<"">> = iolist_to_binary(join(re:split("abc","\\Aabc\\Z",[multiline,
-                                                                                                                                                                        trim]))), 
+                                                                                                                                                                        trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\Z",[multiline,
                                                                                                                                                                           {parts,
-                                                                                                                                                                           2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\Z",[multiline]))), 
+                                                                                                                                                                           2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\Z",[multiline]))),
     <<"">> = iolist_to_binary(join(re:split("abc","\\Aabc\\Z",[multiline,
-                                                                                                                                                                        trim]))), 
+                                                                                                                                                                        trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\Z",[multiline,
                                                                                                                                                                           {parts,
-                                                                                                                                                                           2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\Z",[multiline]))), 
+                                                                                                                                                                           2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\Z",[multiline]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc\\Z",[multiline,
-                                                                                                                                                                                        trim]))), 
+                                                                                                                                                                                        trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc\\Z",[multiline,
                                                                                                                                                                                           {parts,
-                                                                                                                                                                                           2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc\\Z",[multiline]))), 
+                                                                                                                                                                                           2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc\\Z",[multiline]))),
     <<"qqq
 abc">> = iolist_to_binary(join(re:split("qqq
-abc","\\Aabc\\Z",[multiline,trim]))), 
+abc","\\Aabc\\Z",[multiline,trim]))),
     <<"qqq
 abc">> = iolist_to_binary(join(re:split("qqq
-abc","\\Aabc\\Z",[multiline,{parts,2}]))), 
+abc","\\Aabc\\Z",[multiline,{parts,2}]))),
     <<"qqq
 abc">> = iolist_to_binary(join(re:split("qqq
-abc","\\Aabc\\Z",[multiline]))), 
+abc","\\Aabc\\Z",[multiline]))),
     <<"abc
 zzz">> = iolist_to_binary(join(re:split("abc
-zzz","\\Aabc\\Z",[multiline,trim]))), 
+zzz","\\Aabc\\Z",[multiline,trim]))),
     <<"abc
 zzz">> = iolist_to_binary(join(re:split("abc
-zzz","\\Aabc\\Z",[multiline,{parts,2}]))), 
+zzz","\\Aabc\\Z",[multiline,{parts,2}]))),
     <<"abc
 zzz">> = iolist_to_binary(join(re:split("abc
-zzz","\\Aabc\\Z",[multiline]))), 
+zzz","\\Aabc\\Z",[multiline]))),
     <<"qqq
 abc
 zzz">> = iolist_to_binary(join(re:split("qqq
 abc
-zzz","\\Aabc\\Z",[multiline,trim]))), 
+zzz","\\Aabc\\Z",[multiline,trim]))),
     <<"qqq
 abc
 zzz">> = iolist_to_binary(join(re:split("qqq
 abc
-zzz","\\Aabc\\Z",[multiline,{parts,2}]))), 
+zzz","\\Aabc\\Z",[multiline,{parts,2}]))),
     <<"qqq
 abc
 zzz">> = iolist_to_binary(join(re:split("qqq
 abc
-zzz","\\Aabc\\Z",[multiline]))), 
+zzz","\\Aabc\\Z",[multiline]))),
     <<":f">> = iolist_to_binary(join(re:split("abc
-def","\\A(.)*\\Z",[dotall,trim]))), 
+def","\\A(.)*\\Z",[dotall,trim]))),
     <<":f:">> = iolist_to_binary(join(re:split("abc
-def","\\A(.)*\\Z",[dotall,{parts,2}]))), 
+def","\\A(.)*\\Z",[dotall,{parts,2}]))),
     <<":f:">> = iolist_to_binary(join(re:split("abc
-def","\\A(.)*\\Z",[dotall]))), 
+def","\\A(.)*\\Z",[dotall]))),
     <<":s">> = iolist_to_binary(join(re:split("*** Failers","\\A(.)*\\Z",[multiline,
-                                                                                                                                                                                          trim]))), 
+                                                                                                                                                                                          trim]))),
     <<":s:">> = iolist_to_binary(join(re:split("*** Failers","\\A(.)*\\Z",[multiline,
                                                                                                                                                                                             {parts,
-                                                                                                                                                                                             2}]))), 
-    <<":s:">> = iolist_to_binary(join(re:split("*** Failers","\\A(.)*\\Z",[multiline]))), 
+                                                                                                                                                                                             2}]))),
+    <<":s:">> = iolist_to_binary(join(re:split("*** Failers","\\A(.)*\\Z",[multiline]))),
     <<"abc
 def">> = iolist_to_binary(join(re:split("abc
-def","\\A(.)*\\Z",[multiline,trim]))), 
+def","\\A(.)*\\Z",[multiline,trim]))),
     <<"abc
 def">> = iolist_to_binary(join(re:split("abc
-def","\\A(.)*\\Z",[multiline,{parts,2}]))), 
+def","\\A(.)*\\Z",[multiline,{parts,2}]))),
     <<"abc
 def">> = iolist_to_binary(join(re:split("abc
-def","\\A(.)*\\Z",[multiline]))), 
-    <<"::c">> = iolist_to_binary(join(re:split("b::c","(?:b)|(?::+)",[trim]))), 
+def","\\A(.)*\\Z",[multiline]))),
+    <<"::c">> = iolist_to_binary(join(re:split("b::c","(?:b)|(?::+)",[trim]))),
     <<":::c">> = iolist_to_binary(join(re:split("b::c","(?:b)|(?::+)",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<"::c">> = iolist_to_binary(join(re:split("b::c","(?:b)|(?::+)",[]))), 
-    <<"c">> = iolist_to_binary(join(re:split("c::b","(?:b)|(?::+)",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<"::c">> = iolist_to_binary(join(re:split("b::c","(?:b)|(?::+)",[]))),
+    <<"c">> = iolist_to_binary(join(re:split("c::b","(?:b)|(?::+)",[trim]))),
     <<"c:b">> = iolist_to_binary(join(re:split("c::b","(?:b)|(?::+)",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<"c::">> = iolist_to_binary(join(re:split("c::b","(?:b)|(?::+)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("az-","[-az]+",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<"c::">> = iolist_to_binary(join(re:split("c::b","(?:b)|(?::+)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("az-","[-az]+",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("az-","[-az]+",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("az-","[-az]+",[]))), 
-    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[-az]+",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("az-","[-az]+",[]))),
+    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[-az]+",[trim]))),
     <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[-az]+",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[-az]+",[]))), 
-    <<"b">> = iolist_to_binary(join(re:split("b","[-az]+",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[-az]+",[]))),
+    <<"b">> = iolist_to_binary(join(re:split("b","[-az]+",[trim]))),
     <<"b">> = iolist_to_binary(join(re:split("b","[-az]+",[{parts,
-                                                                                                                                                              2}]))), 
-    <<"b">> = iolist_to_binary(join(re:split("b","[-az]+",[]))), 
+                                                                                                                                                              2}]))),
+    <<"b">> = iolist_to_binary(join(re:split("b","[-az]+",[]))),
     ok.
 run5() ->
-    <<"">> = iolist_to_binary(join(re:split("za-","[az-]+",[trim]))), 
+    <<"">> = iolist_to_binary(join(re:split("za-","[az-]+",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("za-","[az-]+",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("za-","[az-]+",[]))), 
-    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[az-]+",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("za-","[az-]+",[]))),
+    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[az-]+",[trim]))),
     <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[az-]+",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[az-]+",[]))), 
-    <<"b">> = iolist_to_binary(join(re:split("b","[az-]+",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[az-]+",[]))),
+    <<"b">> = iolist_to_binary(join(re:split("b","[az-]+",[trim]))),
     <<"b">> = iolist_to_binary(join(re:split("b","[az-]+",[{parts,
-                                                                                                                                                              2}]))), 
-    <<"b">> = iolist_to_binary(join(re:split("b","[az-]+",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a-z","[a\\-z]+",[trim]))), 
+                                                                                                                                                              2}]))),
+    <<"b">> = iolist_to_binary(join(re:split("b","[az-]+",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a-z","[a\\-z]+",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a-z","[a\\-z]+",[{parts,
-                                                                                                                                                                       2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a-z","[a\\-z]+",[]))), 
-    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[a\\-z]+",[trim]))), 
+                                                                                                                                                                       2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a-z","[a\\-z]+",[]))),
+    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[a\\-z]+",[trim]))),
     <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[a\\-z]+",[{parts,
-                                                                                                                                                                                       2}]))), 
-    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[a\\-z]+",[]))), 
-    <<"b">> = iolist_to_binary(join(re:split("b","[a\\-z]+",[trim]))), 
+                                                                                                                                                                                       2}]))),
+    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[a\\-z]+",[]))),
+    <<"b">> = iolist_to_binary(join(re:split("b","[a\\-z]+",[trim]))),
     <<"b">> = iolist_to_binary(join(re:split("b","[a\\-z]+",[{parts,
-                                                                                                                                                                   2}]))), 
-    <<"b">> = iolist_to_binary(join(re:split("b","[a\\-z]+",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abcdxyz","[a-z]+",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<"b">> = iolist_to_binary(join(re:split("b","[a\\-z]+",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abcdxyz","[a-z]+",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abcdxyz","[a-z]+",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abcdxyz","[a-z]+",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("12-34","[\\d-]+",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abcdxyz","[a-z]+",[]))),
+    <<"">> = iolist_to_binary(join(re:split("12-34","[\\d-]+",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("12-34","[\\d-]+",[{parts,
-                                                                                                                                                                         2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("12-34","[\\d-]+",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\d-]+",[trim]))), 
+                                                                                                                                                                         2}]))),
+    <<":">> = iolist_to_binary(join(re:split("12-34","[\\d-]+",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\d-]+",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\d-]+",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\d-]+",[]))), 
-    <<"aaa">> = iolist_to_binary(join(re:split("aaa","[\\d-]+",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\d-]+",[]))),
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","[\\d-]+",[trim]))),
     <<"aaa">> = iolist_to_binary(join(re:split("aaa","[\\d-]+",[{parts,
-                                                                                                                                                                     2}]))), 
-    <<"aaa">> = iolist_to_binary(join(re:split("aaa","[\\d-]+",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("12-34z","[\\d-z]+",[trim]))), 
+                                                                                                                                                                     2}]))),
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","[\\d-]+",[]))),
+    <<"">> = iolist_to_binary(join(re:split("12-34z","[\\d-z]+",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("12-34z","[\\d-z]+",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("12-34z","[\\d-z]+",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\d-z]+",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<":">> = iolist_to_binary(join(re:split("12-34z","[\\d-z]+",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\d-z]+",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\d-z]+",[{parts,
-                                                                                                                                                                                       2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\d-z]+",[]))), 
-    <<"aaa">> = iolist_to_binary(join(re:split("aaa","[\\d-z]+",[trim]))), 
+                                                                                                                                                                                       2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\d-z]+",[]))),
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","[\\d-z]+",[trim]))),
     <<"aaa">> = iolist_to_binary(join(re:split("aaa","[\\d-z]+",[{parts,
-                                                                                                                                                                       2}]))), 
-    <<"aaa">> = iolist_to_binary(join(re:split("aaa","[\\d-z]+",[]))), 
-    <<": ">> = iolist_to_binary(join(re:split("\\ ","\\x5c",[trim]))), 
+                                                                                                                                                                       2}]))),
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","[\\d-z]+",[]))),
+    <<": ">> = iolist_to_binary(join(re:split("\\ ","\\x5c",[trim]))),
     <<": ">> = iolist_to_binary(join(re:split("\\ ","\\x5c",[{parts,
-                                                                                                                                                                   2}]))), 
-    <<": ">> = iolist_to_binary(join(re:split("\\ ","\\x5c",[]))), 
-    <<"the:oo">> = iolist_to_binary(join(re:split("the Zoo","\\x20Z",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<": ">> = iolist_to_binary(join(re:split("\\ ","\\x5c",[]))),
+    <<"the:oo">> = iolist_to_binary(join(re:split("the Zoo","\\x20Z",[trim]))),
     <<"the:oo">> = iolist_to_binary(join(re:split("the Zoo","\\x20Z",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<"the:oo">> = iolist_to_binary(join(re:split("the Zoo","\\x20Z",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\x20Z",[trim]))), 
+                                                                                                                                                                           2}]))),
+    <<"the:oo">> = iolist_to_binary(join(re:split("the Zoo","\\x20Z",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\x20Z",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\x20Z",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\x20Z",[]))), 
-    <<"Zulu">> = iolist_to_binary(join(re:split("Zulu","\\x20Z",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\x20Z",[]))),
+    <<"Zulu">> = iolist_to_binary(join(re:split("Zulu","\\x20Z",[trim]))),
     <<"Zulu">> = iolist_to_binary(join(re:split("Zulu","\\x20Z",[{parts,
-                                                                                                                                                                     2}]))), 
-    <<"Zulu">> = iolist_to_binary(join(re:split("Zulu","\\x20Z",[]))), 
+                                                                                                                                                                     2}]))),
+    <<"Zulu">> = iolist_to_binary(join(re:split("Zulu","\\x20Z",[]))),
     <<":abc">> = iolist_to_binary(join(re:split("abcabc","(abc)\\1",[caseless,
-                                                                                                                                                                           trim]))), 
+                                                                                                                                                                           trim]))),
     <<":abc:">> = iolist_to_binary(join(re:split("abcabc","(abc)\\1",[caseless,
                                                                                                                                                                              {parts,
-                                                                                                                                                                              2}]))), 
-    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","(abc)\\1",[caseless]))), 
+                                                                                                                                                                              2}]))),
+    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","(abc)\\1",[caseless]))),
     <<":ABC">> = iolist_to_binary(join(re:split("ABCabc","(abc)\\1",[caseless,
-                                                                                                                                                                           trim]))), 
+                                                                                                                                                                           trim]))),
     <<":ABC:">> = iolist_to_binary(join(re:split("ABCabc","(abc)\\1",[caseless,
                                                                                                                                                                              {parts,
-                                                                                                                                                                              2}]))), 
-    <<":ABC:">> = iolist_to_binary(join(re:split("ABCabc","(abc)\\1",[caseless]))), 
+                                                                                                                                                                              2}]))),
+    <<":ABC:">> = iolist_to_binary(join(re:split("ABCabc","(abc)\\1",[caseless]))),
     <<":abc">> = iolist_to_binary(join(re:split("abcABC","(abc)\\1",[caseless,
-                                                                                                                                                                           trim]))), 
+                                                                                                                                                                           trim]))),
     <<":abc:">> = iolist_to_binary(join(re:split("abcABC","(abc)\\1",[caseless,
                                                                                                                                                                              {parts,
-                                                                                                                                                                              2}]))), 
-    <<":abc:">> = iolist_to_binary(join(re:split("abcABC","(abc)\\1",[caseless]))), 
-    <<"">> = iolist_to_binary(join(re:split("ab{3cd","ab{3cd",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":abc:">> = iolist_to_binary(join(re:split("abcABC","(abc)\\1",[caseless]))),
+    <<"">> = iolist_to_binary(join(re:split("ab{3cd","ab{3cd",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("ab{3cd","ab{3cd",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ab{3cd","ab{3cd",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("ab{3,cd","ab{3,cd",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ab{3cd","ab{3cd",[]))),
+    <<"">> = iolist_to_binary(join(re:split("ab{3,cd","ab{3,cd",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("ab{3,cd","ab{3,cd",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ab{3,cd","ab{3,cd",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("ab{3,4a}cd","ab{3,4a}cd",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ab{3,cd","ab{3,cd",[]))),
+    <<"">> = iolist_to_binary(join(re:split("ab{3,4a}cd","ab{3,4a}cd",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("ab{3,4a}cd","ab{3,4a}cd",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ab{3,4a}cd","ab{3,4a}cd",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("{4,5a}bc","{4,5a}bc",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ab{3,4a}cd","ab{3,4a}cd",[]))),
+    <<"">> = iolist_to_binary(join(re:split("{4,5a}bc","{4,5a}bc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("{4,5a}bc","{4,5a}bc",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("{4,5a}bc","{4,5a}bc",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","abc$",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("{4,5a}bc","{4,5a}bc",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","abc$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","abc$",[{parts,
-                                                                                                                                                               2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","abc$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","abc$",[trim]))), 
+                                                                                                                                                               2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","abc$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","abc$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","abc$",[{parts,
-                                                                                                                                                               2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","abc$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc$",[trim]))), 
+                                                                                                                                                               2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","abc$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc$",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc$",[]))), 
+                                                                                                                                                                               2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc$",[]))),
     <<"abc
 def">> = iolist_to_binary(join(re:split("abc
-def","abc$",[trim]))), 
+def","abc$",[trim]))),
     <<"abc
 def">> = iolist_to_binary(join(re:split("abc
-def","abc$",[{parts,2}]))), 
+def","abc$",[{parts,2}]))),
     <<"abc
 def">> = iolist_to_binary(join(re:split("abc
-def","abc$",[]))), 
-    <<":abc">> = iolist_to_binary(join(re:split("abcS","(abc)\\123",[trim]))), 
+def","abc$",[]))),
+    <<":abc">> = iolist_to_binary(join(re:split("abcS","(abc)\\123",[trim]))),
     <<":abc:">> = iolist_to_binary(join(re:split("abcS","(abc)\\123",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<":abc:">> = iolist_to_binary(join(re:split("abcS","(abc)\\123",[]))), 
-    <<":abc">> = iolist_to_binary(join(re:split("abc“","(abc)\\223",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<":abc:">> = iolist_to_binary(join(re:split("abcS","(abc)\\123",[]))),
+    <<":abc">> = iolist_to_binary(join(re:split("abc“","(abc)\\223",[trim]))),
     <<":abc:">> = iolist_to_binary(join(re:split("abc“","(abc)\\223",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<":abc:">> = iolist_to_binary(join(re:split("abc“","(abc)\\223",[]))), 
-    <<":abc">> = iolist_to_binary(join(re:split("abcÓ","(abc)\\323",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<":abc:">> = iolist_to_binary(join(re:split("abc“","(abc)\\223",[]))),
+    <<":abc">> = iolist_to_binary(join(re:split("abcÓ","(abc)\\323",[trim]))),
     <<":abc:">> = iolist_to_binary(join(re:split("abcÓ","(abc)\\323",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<":abc:">> = iolist_to_binary(join(re:split("abcÓ","(abc)\\323",[]))), 
-    <<":abc">> = iolist_to_binary(join(re:split("abc@","(abc)\\100",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<":abc:">> = iolist_to_binary(join(re:split("abcÓ","(abc)\\323",[]))),
+    <<":abc">> = iolist_to_binary(join(re:split("abc@","(abc)\\100",[trim]))),
     <<":abc:">> = iolist_to_binary(join(re:split("abc@","(abc)\\100",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<":abc:">> = iolist_to_binary(join(re:split("abc@","(abc)\\100",[]))), 
-    <<":abc">> = iolist_to_binary(join(re:split("abc@","(abc)\\100",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<":abc:">> = iolist_to_binary(join(re:split("abc@","(abc)\\100",[]))),
+    <<":abc">> = iolist_to_binary(join(re:split("abc@","(abc)\\100",[trim]))),
     <<":abc:">> = iolist_to_binary(join(re:split("abc@","(abc)\\100",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<":abc:">> = iolist_to_binary(join(re:split("abc@","(abc)\\100",[]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<":abc:">> = iolist_to_binary(join(re:split("abc@","(abc)\\100",[]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[trim]))),
     <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[trim]))),
     <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[trim]))),
     <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[trim]))),
     <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[trim]))),
     <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[trim]))),
     <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[]))), 
-    <<":A:B:C:D:E:F:G:H:I">> = iolist_to_binary(join(re:split("ABCDEFGHIHI","^(A)(B)(C)(D)(E)(F)(G)(H)(I)\\8\\9$",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[]))),
+    <<":A:B:C:D:E:F:G:H:I">> = iolist_to_binary(join(re:split("ABCDEFGHIHI","^(A)(B)(C)(D)(E)(F)(G)(H)(I)\\8\\9$",[trim]))),
     <<":A:B:C:D:E:F:G:H:I:">> = iolist_to_binary(join(re:split("ABCDEFGHIHI","^(A)(B)(C)(D)(E)(F)(G)(H)(I)\\8\\9$",[{parts,
-                                                                                                                                                                                                                                               2}]))), 
-    <<":A:B:C:D:E:F:G:H:I:">> = iolist_to_binary(join(re:split("ABCDEFGHIHI","^(A)(B)(C)(D)(E)(F)(G)(H)(I)\\8\\9$",[]))), 
+                                                                                                                                                                                                                                               2}]))),
+    <<":A:B:C:D:E:F:G:H:I:">> = iolist_to_binary(join(re:split("ABCDEFGHIHI","^(A)(B)(C)(D)(E)(F)(G)(H)(I)\\8\\9$",[]))),
     ok.
 run6() ->
-    <<"">> = iolist_to_binary(join(re:split("A8B9C","^[A\\8B\\9C]+$",[trim]))), 
+    <<"">> = iolist_to_binary(join(re:split("A8B9C","^[A\\8B\\9C]+$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("A8B9C","^[A\\8B\\9C]+$",[{parts,
-                                                                                                                                                                                         2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("A8B9C","^[A\\8B\\9C]+$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[A\\8B\\9C]+$",[trim]))), 
+                                                                                                                                                                                         2}]))),
+    <<":">> = iolist_to_binary(join(re:split("A8B9C","^[A\\8B\\9C]+$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[A\\8B\\9C]+$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[A\\8B\\9C]+$",[{parts,
-                                                                                                                                                                                                     2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[A\\8B\\9C]+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("A8B9C","^[A\\8B\\9C]+$",[trim]))), 
+                                                                                                                                                                                                     2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[A\\8B\\9C]+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("A8B9C","^[A\\8B\\9C]+$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("A8B9C","^[A\\8B\\9C]+$",[{parts,
-                                                                                                                                                                                           2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("A8B9C","^[A\\8B\\9C]+$",[]))), 
-    <<":a:b:c:d:e:f:g:h:i:j:k:l">> = iolist_to_binary(join(re:split("abcdefghijkllS","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)(l)\\12\\123",[trim]))), 
+                                                                                                                                                                                           2}]))),
+    <<":">> = iolist_to_binary(join(re:split("A8B9C","^[A\\8B\\9C]+$",[]))),
+    <<":a:b:c:d:e:f:g:h:i:j:k:l">> = iolist_to_binary(join(re:split("abcdefghijkllS","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)(l)\\12\\123",[trim]))),
     <<":a:b:c:d:e:f:g:h:i:j:k:l:">> = iolist_to_binary(join(re:split("abcdefghijkllS","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)(l)\\12\\123",[{parts,
-                                                                                                                                                                                                                                                                        2}]))), 
-    <<":a:b:c:d:e:f:g:h:i:j:k:l:">> = iolist_to_binary(join(re:split("abcdefghijkllS","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)(l)\\12\\123",[]))), 
+                                                                                                                                                                                                                                                                        2}]))),
+    <<":a:b:c:d:e:f:g:h:i:j:k:l:">> = iolist_to_binary(join(re:split("abcdefghijkllS","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)(l)\\12\\123",[]))),
     <<":a:b:c:d:e:f:g:h:i:j:k">> = iolist_to_binary(join(re:split("abcdefghijk
-S","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\12\\123",[trim]))), 
+S","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\12\\123",[trim]))),
     <<":a:b:c:d:e:f:g:h:i:j:k:">> = iolist_to_binary(join(re:split("abcdefghijk
-S","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\12\\123",[{parts,2}]))), 
+S","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\12\\123",[{parts,2}]))),
     <<":a:b:c:d:e:f:g:h:i:j:k:">> = iolist_to_binary(join(re:split("abcdefghijk
-S","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\12\\123",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abidef","ab\\idef",[trim]))), 
+S","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\12\\123",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abidef","ab\\idef",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abidef","ab\\idef",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abidef","ab\\idef",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("bc","a{0}bc",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abidef","ab\\idef",[]))),
+    <<"">> = iolist_to_binary(join(re:split("bc","a{0}bc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("bc","a{0}bc",[{parts,
-                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("bc","a{0}bc",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("xyz","(a|(bc)){0,0}?xyz",[trim]))), 
+                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("bc","a{0}bc",[]))),
+    <<"">> = iolist_to_binary(join(re:split("xyz","(a|(bc)){0,0}?xyz",[trim]))),
     <<":::">> = iolist_to_binary(join(re:split("xyz","(a|(bc)){0,0}?xyz",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<":::">> = iolist_to_binary(join(re:split("xyz","(a|(bc)){0,0}?xyz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abcde","abc[\\10]de",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<":::">> = iolist_to_binary(join(re:split("xyz","(a|(bc)){0,0}?xyz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abcde","abc[\\10]de",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abcde","abc[\\10]de",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abcde","abc[\\10]de",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc
de","abc[\\1]de",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abcde","abc[\\10]de",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc
de","abc[\\1]de",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc
de","abc[\\1]de",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc
de","abc[\\1]de",[]))), 
-    <<":abc">> = iolist_to_binary(join(re:split("abc
de","(abc)[\\1]de",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc
de","abc[\\1]de",[]))),
+    <<":abc">> = iolist_to_binary(join(re:split("abc
de","(abc)[\\1]de",[trim]))),
     <<":abc:">> = iolist_to_binary(join(re:split("abc
de","(abc)[\\1]de",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<":abc:">> = iolist_to_binary(join(re:split("abc
de","(abc)[\\1]de",[]))), 
+                                                                                                                                                                                     2}]))),
+    <<":abc:">> = iolist_to_binary(join(re:split("abc
de","(abc)[\\1]de",[]))),
     <<"">> = iolist_to_binary(join(re:split("a
-b","(?s)a.b",[trim]))), 
+b","(?s)a.b",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a
-b","(?s)a.b",[{parts,2}]))), 
+b","(?s)a.b",[{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("a
-b","(?s)a.b",[]))), 
-    <<":b:a:NOT:cccc:d">> = iolist_to_binary(join(re:split("baNOTccccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))), 
+b","(?s)a.b",[]))),
+    <<":b:a:NOT:cccc:d">> = iolist_to_binary(join(re:split("baNOTccccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))),
     <<":b:a:NOT:cccc:d">> = iolist_to_binary(join(re:split("baNOTccccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[{parts,
-                                                                                                                                                                                                                                       2}]))), 
-    <<":b:a:NOT:cccc:d">> = iolist_to_binary(join(re:split("baNOTccccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))), 
-    <<":b:a:NOT:ccc:d">> = iolist_to_binary(join(re:split("baNOTcccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))), 
+                                                                                                                                                                                                                                       2}]))),
+    <<":b:a:NOT:cccc:d">> = iolist_to_binary(join(re:split("baNOTccccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))),
+    <<":b:a:NOT:ccc:d">> = iolist_to_binary(join(re:split("baNOTcccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))),
     <<":b:a:NOT:ccc:d">> = iolist_to_binary(join(re:split("baNOTcccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[{parts,
-                                                                                                                                                                                                                                     2}]))), 
-    <<":b:a:NOT:ccc:d">> = iolist_to_binary(join(re:split("baNOTcccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))), 
-    <<":b:a:NO:Tcc:d">> = iolist_to_binary(join(re:split("baNOTccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))), 
+                                                                                                                                                                                                                                     2}]))),
+    <<":b:a:NOT:ccc:d">> = iolist_to_binary(join(re:split("baNOTcccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))),
+    <<":b:a:NO:Tcc:d">> = iolist_to_binary(join(re:split("baNOTccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))),
     <<":b:a:NO:Tcc:d">> = iolist_to_binary(join(re:split("baNOTccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[{parts,
-                                                                                                                                                                                                                                   2}]))), 
-    <<":b:a:NO:Tcc:d">> = iolist_to_binary(join(re:split("baNOTccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))), 
-    <<":b:a::ccc:d">> = iolist_to_binary(join(re:split("bacccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))), 
+                                                                                                                                                                                                                                   2}]))),
+    <<":b:a:NO:Tcc:d">> = iolist_to_binary(join(re:split("baNOTccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))),
+    <<":b:a::ccc:d">> = iolist_to_binary(join(re:split("bacccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))),
     <<":b:a::ccc:d">> = iolist_to_binary(join(re:split("bacccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[{parts,
-                                                                                                                                                                                                                               2}]))), 
-    <<":b:a::ccc:d">> = iolist_to_binary(join(re:split("bacccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))), 
-    <<":*:*:* Fail:ers">> = iolist_to_binary(join(re:split("*** Failers","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))), 
+                                                                                                                                                                                                                               2}]))),
+    <<":b:a::ccc:d">> = iolist_to_binary(join(re:split("bacccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))),
+    <<":*:*:* Fail:ers">> = iolist_to_binary(join(re:split("*** Failers","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))),
     <<":*:*:* Fail:ers:">> = iolist_to_binary(join(re:split("*** Failers","^([^a])([^\\b])([^c]*)([^d]{3,4})",[{parts,
-                                                                                                                                                                                                                                         2}]))), 
-    <<":*:*:* Fail:ers:">> = iolist_to_binary(join(re:split("*** Failers","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))), 
-    <<"anything">> = iolist_to_binary(join(re:split("anything","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))), 
+                                                                                                                                                                                                                                         2}]))),
+    <<":*:*:* Fail:ers:">> = iolist_to_binary(join(re:split("*** Failers","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))),
+    <<"anything">> = iolist_to_binary(join(re:split("anything","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))),
     <<"anything">> = iolist_to_binary(join(re:split("anything","^([^a])([^\\b])([^c]*)([^d]{3,4})",[{parts,
-                                                                                                                                                                                                                                   2}]))), 
-    <<"anything">> = iolist_to_binary(join(re:split("anything","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))), 
-    <<"bc">> = iolist_to_binary(join(re:split("bc","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))), 
+                                                                                                                                                                                                                                   2}]))),
+    <<"anything">> = iolist_to_binary(join(re:split("anything","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))),
+    <<"bc">> = iolist_to_binary(join(re:split("bc","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))),
     <<"bc">> = iolist_to_binary(join(re:split("bc","^([^a])([^\\b])([^c]*)([^d]{3,4})",[{parts,
-                                                                                                                                                                                                                         2}]))), 
-    <<"bc">> = iolist_to_binary(join(re:split("bc","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))), 
-    <<"baccd">> = iolist_to_binary(join(re:split("baccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))), 
+                                                                                                                                                                                                                         2}]))),
+    <<"bc">> = iolist_to_binary(join(re:split("bc","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))),
+    <<"baccd">> = iolist_to_binary(join(re:split("baccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))),
     <<"baccd">> = iolist_to_binary(join(re:split("baccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[{parts,
-                                                                                                                                                                                                                             2}]))), 
-    <<"baccd">> = iolist_to_binary(join(re:split("baccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("Abc","[^a]",[trim]))), 
+                                                                                                                                                                                                                             2}]))),
+    <<"baccd">> = iolist_to_binary(join(re:split("baccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))),
+    <<"">> = iolist_to_binary(join(re:split("Abc","[^a]",[trim]))),
     <<":bc">> = iolist_to_binary(join(re:split("Abc","[^a]",[{parts,
-                                                                                                                                                              2}]))), 
-    <<":::">> = iolist_to_binary(join(re:split("Abc","[^a]",[]))), 
+                                                                                                                                                              2}]))),
+    <<":::">> = iolist_to_binary(join(re:split("Abc","[^a]",[]))),
     <<"A">> = iolist_to_binary(join(re:split("Abc","[^a]",[caseless,
-                                                                                                                                                            trim]))), 
+                                                                                                                                                            trim]))),
     <<"A:c">> = iolist_to_binary(join(re:split("Abc","[^a]",[caseless,
                                                                                                                                                               {parts,
-                                                                                                                                                               2}]))), 
-    <<"A::">> = iolist_to_binary(join(re:split("Abc","[^a]",[caseless]))), 
-    <<":a">> = iolist_to_binary(join(re:split("AAAaAbc","[^a]+",[trim]))), 
+                                                                                                                                                               2}]))),
+    <<"A::">> = iolist_to_binary(join(re:split("Abc","[^a]",[caseless]))),
+    <<":a">> = iolist_to_binary(join(re:split("AAAaAbc","[^a]+",[trim]))),
     <<":aAbc">> = iolist_to_binary(join(re:split("AAAaAbc","[^a]+",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("AAAaAbc","[^a]+",[]))), 
+                                                                                                                                                                        2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("AAAaAbc","[^a]+",[]))),
     <<"AAAaA">> = iolist_to_binary(join(re:split("AAAaAbc","[^a]+",[caseless,
-                                                                                                                                                                      trim]))), 
+                                                                                                                                                                      trim]))),
     <<"AAAaA:">> = iolist_to_binary(join(re:split("AAAaAbc","[^a]+",[caseless,
                                                                                                                                                                         {parts,
-                                                                                                                                                                         2}]))), 
-    <<"AAAaA:">> = iolist_to_binary(join(re:split("AAAaAbc","[^a]+",[caseless]))), 
+                                                                                                                                                                         2}]))),
+    <<"AAAaA:">> = iolist_to_binary(join(re:split("AAAaAbc","[^a]+",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("bbb
-ccc","[^a]+",[trim]))), 
+ccc","[^a]+",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("bbb
-ccc","[^a]+",[{parts,2}]))), 
+ccc","[^a]+",[{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("bbb
-ccc","[^a]+",[]))), 
-    <<"ab">> = iolist_to_binary(join(re:split("abc","[^k]$",[trim]))), 
+ccc","[^a]+",[]))),
+    <<"ab">> = iolist_to_binary(join(re:split("abc","[^k]$",[trim]))),
     <<"ab:">> = iolist_to_binary(join(re:split("abc","[^k]$",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<"ab:">> = iolist_to_binary(join(re:split("abc","[^k]$",[]))), 
-    <<"*** Failer">> = iolist_to_binary(join(re:split("*** Failers","[^k]$",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<"ab:">> = iolist_to_binary(join(re:split("abc","[^k]$",[]))),
+    <<"*** Failer">> = iolist_to_binary(join(re:split("*** Failers","[^k]$",[trim]))),
     <<"*** Failer:">> = iolist_to_binary(join(re:split("*** Failers","[^k]$",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<"*** Failer:">> = iolist_to_binary(join(re:split("*** Failers","[^k]$",[]))), 
-    <<"abk">> = iolist_to_binary(join(re:split("abk","[^k]$",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<"*** Failer:">> = iolist_to_binary(join(re:split("*** Failers","[^k]$",[]))),
+    <<"abk">> = iolist_to_binary(join(re:split("abk","[^k]$",[trim]))),
     <<"abk">> = iolist_to_binary(join(re:split("abk","[^k]$",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<"abk">> = iolist_to_binary(join(re:split("abk","[^k]$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","[^k]{2,3}$",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<"abk">> = iolist_to_binary(join(re:split("abk","[^k]$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","[^k]{2,3}$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","[^k]{2,3}$",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","[^k]{2,3}$",[]))), 
-    <<"k">> = iolist_to_binary(join(re:split("kbc","[^k]{2,3}$",[trim]))), 
+                                                                                                                                                                           2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","[^k]{2,3}$",[]))),
+    <<"k">> = iolist_to_binary(join(re:split("kbc","[^k]{2,3}$",[trim]))),
     <<"k:">> = iolist_to_binary(join(re:split("kbc","[^k]{2,3}$",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<"k:">> = iolist_to_binary(join(re:split("kbc","[^k]{2,3}$",[]))), 
-    <<"k">> = iolist_to_binary(join(re:split("kabc","[^k]{2,3}$",[trim]))), 
+                                                                                                                                                                           2}]))),
+    <<"k:">> = iolist_to_binary(join(re:split("kbc","[^k]{2,3}$",[]))),
+    <<"k">> = iolist_to_binary(join(re:split("kabc","[^k]{2,3}$",[trim]))),
     <<"k:">> = iolist_to_binary(join(re:split("kabc","[^k]{2,3}$",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<"k:">> = iolist_to_binary(join(re:split("kabc","[^k]{2,3}$",[]))), 
-    <<"*** Fail">> = iolist_to_binary(join(re:split("*** Failers","[^k]{2,3}$",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<"k:">> = iolist_to_binary(join(re:split("kabc","[^k]{2,3}$",[]))),
+    <<"*** Fail">> = iolist_to_binary(join(re:split("*** Failers","[^k]{2,3}$",[trim]))),
     <<"*** Fail:">> = iolist_to_binary(join(re:split("*** Failers","[^k]{2,3}$",[{parts,
-                                                                                                                                                                                           2}]))), 
-    <<"*** Fail:">> = iolist_to_binary(join(re:split("*** Failers","[^k]{2,3}$",[]))), 
-    <<"abk">> = iolist_to_binary(join(re:split("abk","[^k]{2,3}$",[trim]))), 
+                                                                                                                                                                                           2}]))),
+    <<"*** Fail:">> = iolist_to_binary(join(re:split("*** Failers","[^k]{2,3}$",[]))),
+    <<"abk">> = iolist_to_binary(join(re:split("abk","[^k]{2,3}$",[trim]))),
     <<"abk">> = iolist_to_binary(join(re:split("abk","[^k]{2,3}$",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<"abk">> = iolist_to_binary(join(re:split("abk","[^k]{2,3}$",[]))), 
-    <<"akb">> = iolist_to_binary(join(re:split("akb","[^k]{2,3}$",[trim]))), 
+                                                                                                                                                                           2}]))),
+    <<"abk">> = iolist_to_binary(join(re:split("abk","[^k]{2,3}$",[]))),
+    <<"akb">> = iolist_to_binary(join(re:split("akb","[^k]{2,3}$",[trim]))),
     <<"akb">> = iolist_to_binary(join(re:split("akb","[^k]{2,3}$",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<"akb">> = iolist_to_binary(join(re:split("akb","[^k]{2,3}$",[]))), 
-    <<"akk">> = iolist_to_binary(join(re:split("akk","[^k]{2,3}$",[trim]))), 
+                                                                                                                                                                           2}]))),
+    <<"akb">> = iolist_to_binary(join(re:split("akb","[^k]{2,3}$",[]))),
+    <<"akk">> = iolist_to_binary(join(re:split("akk","[^k]{2,3}$",[trim]))),
     <<"akk">> = iolist_to_binary(join(re:split("akk","[^k]{2,3}$",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<"akk">> = iolist_to_binary(join(re:split("akk","[^k]{2,3}$",[]))), 
-    <<"12345678.b.c.d">> = iolist_to_binary(join(re:split("12345678.b.c.d","^\\d{8,}\\@.+[^k]$",[trim]))), 
+                                                                                                                                                                           2}]))),
+    <<"akk">> = iolist_to_binary(join(re:split("akk","[^k]{2,3}$",[]))),
+    <<"12345678.b.c.d">> = iolist_to_binary(join(re:split("12345678.b.c.d","^\\d{8,}\\@.+[^k]$",[trim]))),
     <<"12345678.b.c.d">> = iolist_to_binary(join(re:split("12345678.b.c.d","^\\d{8,}\\@.+[^k]$",[{parts,
-                                                                                                                                                                                                                       2}]))), 
-    <<"12345678.b.c.d">> = iolist_to_binary(join(re:split("12345678.b.c.d","^\\d{8,}\\@.+[^k]$",[]))), 
-    <<"123456789.y.z">> = iolist_to_binary(join(re:split("123456789.y.z","^\\d{8,}\\@.+[^k]$",[trim]))), 
+                                                                                                                                                                                                                       2}]))),
+    <<"12345678.b.c.d">> = iolist_to_binary(join(re:split("12345678.b.c.d","^\\d{8,}\\@.+[^k]$",[]))),
+    <<"123456789.y.z">> = iolist_to_binary(join(re:split("123456789.y.z","^\\d{8,}\\@.+[^k]$",[trim]))),
     <<"123456789.y.z">> = iolist_to_binary(join(re:split("123456789.y.z","^\\d{8,}\\@.+[^k]$",[{parts,
-                                                                                                                                                                                                                     2}]))), 
-    <<"123456789.y.z">> = iolist_to_binary(join(re:split("123456789.y.z","^\\d{8,}\\@.+[^k]$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\d{8,}\\@.+[^k]$",[trim]))), 
+                                                                                                                                                                                                                     2}]))),
+    <<"123456789.y.z">> = iolist_to_binary(join(re:split("123456789.y.z","^\\d{8,}\\@.+[^k]$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\d{8,}\\@.+[^k]$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\d{8,}\\@.+[^k]$",[{parts,
-                                                                                                                                                                                                             2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\d{8,}\\@.+[^k]$",[]))), 
-    <<"12345678.y.uk">> = iolist_to_binary(join(re:split("12345678.y.uk","^\\d{8,}\\@.+[^k]$",[trim]))), 
+                                                                                                                                                                                                             2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\d{8,}\\@.+[^k]$",[]))),
+    <<"12345678.y.uk">> = iolist_to_binary(join(re:split("12345678.y.uk","^\\d{8,}\\@.+[^k]$",[trim]))),
     <<"12345678.y.uk">> = iolist_to_binary(join(re:split("12345678.y.uk","^\\d{8,}\\@.+[^k]$",[{parts,
-                                                                                                                                                                                                                     2}]))), 
-    <<"12345678.y.uk">> = iolist_to_binary(join(re:split("12345678.y.uk","^\\d{8,}\\@.+[^k]$",[]))), 
-    <<"1234567.b.c.d">> = iolist_to_binary(join(re:split("1234567.b.c.d","^\\d{8,}\\@.+[^k]$",[trim]))), 
+                                                                                                                                                                                                                     2}]))),
+    <<"12345678.y.uk">> = iolist_to_binary(join(re:split("12345678.y.uk","^\\d{8,}\\@.+[^k]$",[]))),
+    <<"1234567.b.c.d">> = iolist_to_binary(join(re:split("1234567.b.c.d","^\\d{8,}\\@.+[^k]$",[trim]))),
     <<"1234567.b.c.d">> = iolist_to_binary(join(re:split("1234567.b.c.d","^\\d{8,}\\@.+[^k]$",[{parts,
-                                                                                                                                                                                                                     2}]))), 
-    <<"1234567.b.c.d">> = iolist_to_binary(join(re:split("1234567.b.c.d","^\\d{8,}\\@.+[^k]$",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aaaaaaaaa","(a)\\1{8,}",[trim]))), 
+                                                                                                                                                                                                                     2}]))),
+    <<"1234567.b.c.d">> = iolist_to_binary(join(re:split("1234567.b.c.d","^\\d{8,}\\@.+[^k]$",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aaaaaaaaa","(a)\\1{8,}",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaaa","(a)\\1{8,}",[{parts,
-                                                                                                                                                                                       2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaaa","(a)\\1{8,}",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aaaaaaaaaa","(a)\\1{8,}",[trim]))), 
+                                                                                                                                                                                       2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaaa","(a)\\1{8,}",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aaaaaaaaaa","(a)\\1{8,}",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","(a)\\1{8,}",[{parts,
-                                                                                                                                                                                         2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","(a)\\1{8,}",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a)\\1{8,}",[trim]))), 
+                                                                                                                                                                                         2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","(a)\\1{8,}",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a)\\1{8,}",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a)\\1{8,}",[{parts,
-                                                                                                                                                                                           2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a)\\1{8,}",[]))), 
-    <<"aaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaa","(a)\\1{8,}",[trim]))), 
+                                                                                                                                                                                           2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a)\\1{8,}",[]))),
+    <<"aaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaa","(a)\\1{8,}",[trim]))),
     <<"aaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaa","(a)\\1{8,}",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<"aaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaa","(a)\\1{8,}",[]))), 
+                                                                                                                                                                                   2}]))),
+    <<"aaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaa","(a)\\1{8,}",[]))),
     ok.
 run7() ->
-    <<"aaaa">> = iolist_to_binary(join(re:split("aaaabcd","[^a]",[trim]))), 
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaabcd","[^a]",[trim]))),
     <<"aaaa:cd">> = iolist_to_binary(join(re:split("aaaabcd","[^a]",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<"aaaa:::">> = iolist_to_binary(join(re:split("aaaabcd","[^a]",[]))), 
-    <<"aa:a">> = iolist_to_binary(join(re:split("aaAabcd","[^a]",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<"aaaa:::">> = iolist_to_binary(join(re:split("aaaabcd","[^a]",[]))),
+    <<"aa:a">> = iolist_to_binary(join(re:split("aaAabcd","[^a]",[trim]))),
     <<"aa:abcd">> = iolist_to_binary(join(re:split("aaAabcd","[^a]",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<"aa:a:::">> = iolist_to_binary(join(re:split("aaAabcd","[^a]",[]))), 
+                                                                                                                                                                      2}]))),
+    <<"aa:a:::">> = iolist_to_binary(join(re:split("aaAabcd","[^a]",[]))),
     <<"aaaa">> = iolist_to_binary(join(re:split("aaaabcd","[^a]",[caseless,
-                                                                                                                                                                    trim]))), 
+                                                                                                                                                                    trim]))),
     <<"aaaa:cd">> = iolist_to_binary(join(re:split("aaaabcd","[^a]",[caseless,
                                                                                                                                                                       {parts,
-                                                                                                                                                                       2}]))), 
-    <<"aaaa:::">> = iolist_to_binary(join(re:split("aaaabcd","[^a]",[caseless]))), 
+                                                                                                                                                                       2}]))),
+    <<"aaaa:::">> = iolist_to_binary(join(re:split("aaaabcd","[^a]",[caseless]))),
     <<"aaAa">> = iolist_to_binary(join(re:split("aaAabcd","[^a]",[caseless,
-                                                                                                                                                                    trim]))), 
+                                                                                                                                                                    trim]))),
     <<"aaAa:cd">> = iolist_to_binary(join(re:split("aaAabcd","[^a]",[caseless,
                                                                                                                                                                       {parts,
-                                                                                                                                                                       2}]))), 
-    <<"aaAa:::">> = iolist_to_binary(join(re:split("aaAabcd","[^a]",[caseless]))), 
-    <<"aaaa">> = iolist_to_binary(join(re:split("aaaabcd","[^az]",[trim]))), 
+                                                                                                                                                                       2}]))),
+    <<"aaAa:::">> = iolist_to_binary(join(re:split("aaAabcd","[^a]",[caseless]))),
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaabcd","[^az]",[trim]))),
     <<"aaaa:cd">> = iolist_to_binary(join(re:split("aaaabcd","[^az]",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"aaaa:::">> = iolist_to_binary(join(re:split("aaaabcd","[^az]",[]))), 
-    <<"aa:a">> = iolist_to_binary(join(re:split("aaAabcd","[^az]",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"aaaa:::">> = iolist_to_binary(join(re:split("aaaabcd","[^az]",[]))),
+    <<"aa:a">> = iolist_to_binary(join(re:split("aaAabcd","[^az]",[trim]))),
     <<"aa:abcd">> = iolist_to_binary(join(re:split("aaAabcd","[^az]",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"aa:a:::">> = iolist_to_binary(join(re:split("aaAabcd","[^az]",[]))), 
+                                                                                                                                                                        2}]))),
+    <<"aa:a:::">> = iolist_to_binary(join(re:split("aaAabcd","[^az]",[]))),
     <<"aaaa">> = iolist_to_binary(join(re:split("aaaabcd","[^az]",[caseless,
-                                                                                                                                                                      trim]))), 
+                                                                                                                                                                      trim]))),
     <<"aaaa:cd">> = iolist_to_binary(join(re:split("aaaabcd","[^az]",[caseless,
                                                                                                                                                                         {parts,
-                                                                                                                                                                         2}]))), 
-    <<"aaaa:::">> = iolist_to_binary(join(re:split("aaaabcd","[^az]",[caseless]))), 
+                                                                                                                                                                         2}]))),
+    <<"aaaa:::">> = iolist_to_binary(join(re:split("aaaabcd","[^az]",[caseless]))),
     <<"aaAa">> = iolist_to_binary(join(re:split("aaAabcd","[^az]",[caseless,
-                                                                                                                                                                      trim]))), 
+                                                                                                                                                                      trim]))),
     <<"aaAa:cd">> = iolist_to_binary(join(re:split("aaAabcd","[^az]",[caseless,
                                                                                                                                                                         {parts,
-                                                                                                                                                                         2}]))), 
-    <<"aaAa:::">> = iolist_to_binary(join(re:split("aaAabcd","[^az]",[caseless]))), 
-    <<"xxxxxxxxxxx:xxxxxxxxx">> = iolist_to_binary(join(re:split("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,6}?LL",[trim]))), 
+                                                                                                                                                                         2}]))),
+    <<"aaAa:::">> = iolist_to_binary(join(re:split("aaAabcd","[^az]",[caseless]))),
+    <<"xxxxxxxxxxx:xxxxxxxxx">> = iolist_to_binary(join(re:split("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,6}?LL",[trim]))),
     <<"xxxxxxxxxxx:xxxxxxxxx">> = iolist_to_binary(join(re:split("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,6}?LL",[{parts,
-                                                                                                                                                                                                                                                          2}]))), 
-    <<"xxxxxxxxxxx:xxxxxxxxx">> = iolist_to_binary(join(re:split("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,6}?LL",[]))), 
-    <<"xxxxxxxxxxx:xxxxxxxxx">> = iolist_to_binary(join(re:split("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,}?LL",[trim]))), 
+                                                                                                                                                                                                                                                          2}]))),
+    <<"xxxxxxxxxxx:xxxxxxxxx">> = iolist_to_binary(join(re:split("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,6}?LL",[]))),
+    <<"xxxxxxxxxxx:xxxxxxxxx">> = iolist_to_binary(join(re:split("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,}?LL",[trim]))),
     <<"xxxxxxxxxxx:xxxxxxxxx">> = iolist_to_binary(join(re:split("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,}?LL",[{parts,
-                                                                                                                                                                                                                                                        2}]))), 
-    <<"xxxxxxxxxxx:xxxxxxxxx">> = iolist_to_binary(join(re:split("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,}?LL",[]))), 
-    <<"1:.23">> = iolist_to_binary(join(re:split("1.230003938","(\\.\\d\\d[1-9]?)\\d+",[trim]))), 
+                                                                                                                                                                                                                                                        2}]))),
+    <<"xxxxxxxxxxx:xxxxxxxxx">> = iolist_to_binary(join(re:split("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,}?LL",[]))),
+    <<"1:.23">> = iolist_to_binary(join(re:split("1.230003938","(\\.\\d\\d[1-9]?)\\d+",[trim]))),
     <<"1:.23:">> = iolist_to_binary(join(re:split("1.230003938","(\\.\\d\\d[1-9]?)\\d+",[{parts,
-                                                                                                                                                                                                                    2}]))), 
-    <<"1:.23:">> = iolist_to_binary(join(re:split("1.230003938","(\\.\\d\\d[1-9]?)\\d+",[]))), 
-    <<"1:.875">> = iolist_to_binary(join(re:split("1.875000282","(\\.\\d\\d[1-9]?)\\d+",[trim]))), 
+                                                                                                                                                                                                                    2}]))),
+    <<"1:.23:">> = iolist_to_binary(join(re:split("1.230003938","(\\.\\d\\d[1-9]?)\\d+",[]))),
+    <<"1:.875">> = iolist_to_binary(join(re:split("1.875000282","(\\.\\d\\d[1-9]?)\\d+",[trim]))),
     <<"1:.875:">> = iolist_to_binary(join(re:split("1.875000282","(\\.\\d\\d[1-9]?)\\d+",[{parts,
-                                                                                                                                                                                                                    2}]))), 
-    <<"1:.875:">> = iolist_to_binary(join(re:split("1.875000282","(\\.\\d\\d[1-9]?)\\d+",[]))), 
-    <<"1:.23">> = iolist_to_binary(join(re:split("1.235","(\\.\\d\\d[1-9]?)\\d+",[trim]))), 
+                                                                                                                                                                                                                    2}]))),
+    <<"1:.875:">> = iolist_to_binary(join(re:split("1.875000282","(\\.\\d\\d[1-9]?)\\d+",[]))),
+    <<"1:.23">> = iolist_to_binary(join(re:split("1.235","(\\.\\d\\d[1-9]?)\\d+",[trim]))),
     <<"1:.23:">> = iolist_to_binary(join(re:split("1.235","(\\.\\d\\d[1-9]?)\\d+",[{parts,
-                                                                                                                                                                                                        2}]))), 
-    <<"1:.23:">> = iolist_to_binary(join(re:split("1.235","(\\.\\d\\d[1-9]?)\\d+",[]))), 
-    <<"1:.23::0003938">> = iolist_to_binary(join(re:split("1.230003938","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[trim]))), 
+                                                                                                                                                                                                        2}]))),
+    <<"1:.23:">> = iolist_to_binary(join(re:split("1.235","(\\.\\d\\d[1-9]?)\\d+",[]))),
+    <<"1:.23::0003938">> = iolist_to_binary(join(re:split("1.230003938","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[trim]))),
     <<"1:.23::0003938">> = iolist_to_binary(join(re:split("1.230003938","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[{parts,
-                                                                                                                                                                                                                                     2}]))), 
-    <<"1:.23::0003938">> = iolist_to_binary(join(re:split("1.230003938","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[]))), 
-    <<"1:.875:5:000282">> = iolist_to_binary(join(re:split("1.875000282","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[trim]))), 
+                                                                                                                                                                                                                                     2}]))),
+    <<"1:.23::0003938">> = iolist_to_binary(join(re:split("1.230003938","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[]))),
+    <<"1:.875:5:000282">> = iolist_to_binary(join(re:split("1.875000282","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[trim]))),
     <<"1:.875:5:000282">> = iolist_to_binary(join(re:split("1.875000282","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[{parts,
-                                                                                                                                                                                                                                     2}]))), 
-    <<"1:.875:5:000282">> = iolist_to_binary(join(re:split("1.875000282","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[trim]))), 
+                                                                                                                                                                                                                                     2}]))),
+    <<"1:.875:5:000282">> = iolist_to_binary(join(re:split("1.875000282","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[{parts,
-                                                                                                                                                                                                                                     2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[]))), 
-    <<"1.235">> = iolist_to_binary(join(re:split("1.235","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[trim]))), 
+                                                                                                                                                                                                                                     2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[]))),
+    <<"1.235">> = iolist_to_binary(join(re:split("1.235","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[trim]))),
     <<"1.235">> = iolist_to_binary(join(re:split("1.235","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[{parts,
-                                                                                                                                                                                                                         2}]))), 
-    <<"1.235">> = iolist_to_binary(join(re:split("1.235","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("ab","a(?)b",[trim]))), 
+                                                                                                                                                                                                                         2}]))),
+    <<"1.235">> = iolist_to_binary(join(re:split("1.235","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[]))),
+    <<"">> = iolist_to_binary(join(re:split("ab","a(?)b",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("ab","a(?)b",[{parts,
-                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ab","a(?)b",[]))), 
+                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ab","a(?)b",[]))),
     <<"Food is on the :foo:table">> = iolist_to_binary(join(re:split("Food is on the foo table","\\b(foo)\\s+(\\w+)",[caseless,
-                                                                                                                                                                                                                                     trim]))), 
+                                                                                                                                                                                                                                     trim]))),
     <<"Food is on the :foo:table:">> = iolist_to_binary(join(re:split("Food is on the foo table","\\b(foo)\\s+(\\w+)",[caseless,
                                                                                                                                                                                                                                        {parts,
-                                                                                                                                                                                                                                        2}]))), 
-    <<"Food is on the :foo:table:">> = iolist_to_binary(join(re:split("Food is on the foo table","\\b(foo)\\s+(\\w+)",[caseless]))), 
-    <<"The :d is under the bar in the :n.">> = iolist_to_binary(join(re:split("The food is under the bar in the barn.","foo(.*)bar",[trim]))), 
+                                                                                                                                                                                                                                        2}]))),
+    <<"Food is on the :foo:table:">> = iolist_to_binary(join(re:split("Food is on the foo table","\\b(foo)\\s+(\\w+)",[caseless]))),
+    <<"The :d is under the bar in the :n.">> = iolist_to_binary(join(re:split("The food is under the bar in the barn.","foo(.*)bar",[trim]))),
     <<"The :d is under the bar in the :n.">> = iolist_to_binary(join(re:split("The food is under the bar in the barn.","foo(.*)bar",[{parts,
-                                                                                                                                                                                                                                                2}]))), 
-    <<"The :d is under the bar in the :n.">> = iolist_to_binary(join(re:split("The food is under the bar in the barn.","foo(.*)bar",[]))), 
-    <<"The :d is under the : in the barn.">> = iolist_to_binary(join(re:split("The food is under the bar in the barn.","foo(.*?)bar",[trim]))), 
+                                                                                                                                                                                                                                                2}]))),
+    <<"The :d is under the bar in the :n.">> = iolist_to_binary(join(re:split("The food is under the bar in the barn.","foo(.*)bar",[]))),
+    <<"The :d is under the : in the barn.">> = iolist_to_binary(join(re:split("The food is under the bar in the barn.","foo(.*?)bar",[trim]))),
     <<"The :d is under the : in the barn.">> = iolist_to_binary(join(re:split("The food is under the bar in the barn.","foo(.*?)bar",[{parts,
-                                                                                                                                                                                                                                                  2}]))), 
-    <<"The :d is under the : in the barn.">> = iolist_to_binary(join(re:split("The food is under the bar in the barn.","foo(.*?)bar",[]))), 
-    <<":I have 2 numbers: 53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d*)",[trim]))), 
+                                                                                                                                                                                                                                                  2}]))),
+    <<"The :d is under the : in the barn.">> = iolist_to_binary(join(re:split("The food is under the bar in the barn.","foo(.*?)bar",[]))),
+    <<":I have 2 numbers: 53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d*)",[trim]))),
     <<":I have 2 numbers: 53147::">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d*)",[{parts,
-                                                                                                                                                                                                                   2}]))), 
-    <<":I have 2 numbers: 53147::">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d*)",[]))), 
-    <<":I have 2 numbers: 5314:7">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d+)",[trim]))), 
+                                                                                                                                                                                                                   2}]))),
+    <<":I have 2 numbers: 53147::">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d*)",[]))),
+    <<":I have 2 numbers: 5314:7">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d+)",[trim]))),
     <<":I have 2 numbers: 5314:7:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d+)",[{parts,
-                                                                                                                                                                                                                   2}]))), 
-    <<":I have 2 numbers: 5314:7:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d+)",[]))), 
-    <<":I::: :::h:::a:::v:::e::: :2:: :::n:::u:::m:::b:::e:::r:::s::::::: :53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d*)",[trim]))), 
+                                                                                                                                                                                                                   2}]))),
+    <<":I have 2 numbers: 5314:7:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d+)",[]))),
+    <<":I::: :::h:::a:::v:::e::: :2:: :::n:::u:::m:::b:::e:::r:::s::::::: :53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d*)",[trim]))),
     <<":I:: have 2 numbers: 53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d*)",[{parts,
-                                                                                                                                                                                                                     2}]))), 
-    <<":I::: :::h:::a:::v:::e::: :2:: :::n:::u:::m:::b:::e:::r:::s::::::: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d*)",[]))), 
-    <<":I have :2:: numbers: :53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d+)",[trim]))), 
+                                                                                                                                                                                                                     2}]))),
+    <<":I::: :::h:::a:::v:::e::: :2:: :::n:::u:::m:::b:::e:::r:::s::::::: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d*)",[]))),
+    <<":I have :2:: numbers: :53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d+)",[trim]))),
     <<":I have :2: numbers: 53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d+)",[{parts,
-                                                                                                                                                                                                                     2}]))), 
-    <<":I have :2:: numbers: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d+)",[]))), 
-    <<":I have 2 numbers: 5314:7">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d+)$",[trim]))), 
+                                                                                                                                                                                                                     2}]))),
+    <<":I have :2:: numbers: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d+)",[]))),
+    <<":I have 2 numbers: 5314:7">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d+)$",[trim]))),
     <<":I have 2 numbers: 5314:7:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d+)$",[{parts,
-                                                                                                                                                                                                                      2}]))), 
-    <<":I have 2 numbers: 5314:7:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d+)$",[]))), 
-    <<":I have 2 numbers: :53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d+)$",[trim]))), 
+                                                                                                                                                                                                                      2}]))),
+    <<":I have 2 numbers: 5314:7:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d+)$",[]))),
+    <<":I have 2 numbers: :53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d+)$",[trim]))),
     <<":I have 2 numbers: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d+)$",[{parts,
-                                                                                                                                                                                                                        2}]))), 
-    <<":I have 2 numbers: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d+)$",[]))), 
-    <<":I have 2 numbers: :53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)\\b(\\d+)$",[trim]))), 
+                                                                                                                                                                                                                        2}]))),
+    <<":I have 2 numbers: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d+)$",[]))),
+    <<":I have 2 numbers: :53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)\\b(\\d+)$",[trim]))),
     <<":I have 2 numbers: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)\\b(\\d+)$",[{parts,
-                                                                                                                                                                                                                             2}]))), 
-    <<":I have 2 numbers: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)\\b(\\d+)$",[]))), 
+                                                                                                                                                                                                                             2}]))),
+    <<":I have 2 numbers: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)\\b(\\d+)$",[]))),
     ok.
 run8() ->
-    <<":I have 2 numbers: :53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*\\D)(\\d+)$",[trim]))), 
+    <<":I have 2 numbers: :53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*\\D)(\\d+)$",[trim]))),
     <<":I have 2 numbers: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*\\D)(\\d+)$",[{parts,
-                                                                                                                                                                                                                             2}]))), 
-    <<":I have 2 numbers: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*\\D)(\\d+)$",[]))), 
-    <<":C123">> = iolist_to_binary(join(re:split("ABC123","^\\D*(?!123)",[trim]))), 
+                                                                                                                                                                                                                             2}]))),
+    <<":I have 2 numbers: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*\\D)(\\d+)$",[]))),
+    <<":C123">> = iolist_to_binary(join(re:split("ABC123","^\\D*(?!123)",[trim]))),
     <<":C123">> = iolist_to_binary(join(re:split("ABC123","^\\D*(?!123)",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<":C123">> = iolist_to_binary(join(re:split("ABC123","^\\D*(?!123)",[]))), 
-    <<":ABC:445">> = iolist_to_binary(join(re:split("ABC445","^(\\D*)(?=\\d)(?!123)",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<":C123">> = iolist_to_binary(join(re:split("ABC123","^\\D*(?!123)",[]))),
+    <<":ABC:445">> = iolist_to_binary(join(re:split("ABC445","^(\\D*)(?=\\d)(?!123)",[trim]))),
     <<":ABC:445">> = iolist_to_binary(join(re:split("ABC445","^(\\D*)(?=\\d)(?!123)",[{parts,
-                                                                                                                                                                                                        2}]))), 
-    <<":ABC:445">> = iolist_to_binary(join(re:split("ABC445","^(\\D*)(?=\\d)(?!123)",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\D*)(?=\\d)(?!123)",[trim]))), 
+                                                                                                                                                                                                        2}]))),
+    <<":ABC:445">> = iolist_to_binary(join(re:split("ABC445","^(\\D*)(?=\\d)(?!123)",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\D*)(?=\\d)(?!123)",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\D*)(?=\\d)(?!123)",[{parts,
-                                                                                                                                                                                                                  2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\D*)(?=\\d)(?!123)",[]))), 
-    <<"ABC123">> = iolist_to_binary(join(re:split("ABC123","^(\\D*)(?=\\d)(?!123)",[trim]))), 
+                                                                                                                                                                                                                  2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\D*)(?=\\d)(?!123)",[]))),
+    <<"ABC123">> = iolist_to_binary(join(re:split("ABC123","^(\\D*)(?=\\d)(?!123)",[trim]))),
     <<"ABC123">> = iolist_to_binary(join(re:split("ABC123","^(\\D*)(?=\\d)(?!123)",[{parts,
-                                                                                                                                                                                                        2}]))), 
-    <<"ABC123">> = iolist_to_binary(join(re:split("ABC123","^(\\D*)(?=\\d)(?!123)",[]))), 
-    <<":789">> = iolist_to_binary(join(re:split("W46]789","^[W-]46]",[trim]))), 
+                                                                                                                                                                                                        2}]))),
+    <<"ABC123">> = iolist_to_binary(join(re:split("ABC123","^(\\D*)(?=\\d)(?!123)",[]))),
+    <<":789">> = iolist_to_binary(join(re:split("W46]789","^[W-]46]",[trim]))),
     <<":789">> = iolist_to_binary(join(re:split("W46]789","^[W-]46]",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":789">> = iolist_to_binary(join(re:split("W46]789","^[W-]46]",[]))), 
-    <<":789">> = iolist_to_binary(join(re:split("-46]789","^[W-]46]",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":789">> = iolist_to_binary(join(re:split("W46]789","^[W-]46]",[]))),
+    <<":789">> = iolist_to_binary(join(re:split("-46]789","^[W-]46]",[trim]))),
     <<":789">> = iolist_to_binary(join(re:split("-46]789","^[W-]46]",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":789">> = iolist_to_binary(join(re:split("-46]789","^[W-]46]",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-]46]",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":789">> = iolist_to_binary(join(re:split("-46]789","^[W-]46]",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-]46]",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-]46]",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-]46]",[]))), 
-    <<"Wall">> = iolist_to_binary(join(re:split("Wall","^[W-]46]",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-]46]",[]))),
+    <<"Wall">> = iolist_to_binary(join(re:split("Wall","^[W-]46]",[trim]))),
     <<"Wall">> = iolist_to_binary(join(re:split("Wall","^[W-]46]",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"Wall">> = iolist_to_binary(join(re:split("Wall","^[W-]46]",[]))), 
-    <<"Zebra">> = iolist_to_binary(join(re:split("Zebra","^[W-]46]",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"Wall">> = iolist_to_binary(join(re:split("Wall","^[W-]46]",[]))),
+    <<"Zebra">> = iolist_to_binary(join(re:split("Zebra","^[W-]46]",[trim]))),
     <<"Zebra">> = iolist_to_binary(join(re:split("Zebra","^[W-]46]",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<"Zebra">> = iolist_to_binary(join(re:split("Zebra","^[W-]46]",[]))), 
-    <<"42">> = iolist_to_binary(join(re:split("42","^[W-]46]",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<"Zebra">> = iolist_to_binary(join(re:split("Zebra","^[W-]46]",[]))),
+    <<"42">> = iolist_to_binary(join(re:split("42","^[W-]46]",[trim]))),
     <<"42">> = iolist_to_binary(join(re:split("42","^[W-]46]",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<"42">> = iolist_to_binary(join(re:split("42","^[W-]46]",[]))), 
-    <<"[abcd]">> = iolist_to_binary(join(re:split("[abcd]","^[W-]46]",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<"42">> = iolist_to_binary(join(re:split("42","^[W-]46]",[]))),
+    <<"[abcd]">> = iolist_to_binary(join(re:split("[abcd]","^[W-]46]",[trim]))),
     <<"[abcd]">> = iolist_to_binary(join(re:split("[abcd]","^[W-]46]",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"[abcd]">> = iolist_to_binary(join(re:split("[abcd]","^[W-]46]",[]))), 
-    <<"]abcd[">> = iolist_to_binary(join(re:split("]abcd[","^[W-]46]",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<"[abcd]">> = iolist_to_binary(join(re:split("[abcd]","^[W-]46]",[]))),
+    <<"]abcd[">> = iolist_to_binary(join(re:split("]abcd[","^[W-]46]",[trim]))),
     <<"]abcd[">> = iolist_to_binary(join(re:split("]abcd[","^[W-]46]",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"]abcd[">> = iolist_to_binary(join(re:split("]abcd[","^[W-]46]",[]))), 
-    <<":46]789">> = iolist_to_binary(join(re:split("W46]789","^[W-\\]46]",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<"]abcd[">> = iolist_to_binary(join(re:split("]abcd[","^[W-]46]",[]))),
+    <<":46]789">> = iolist_to_binary(join(re:split("W46]789","^[W-\\]46]",[trim]))),
     <<":46]789">> = iolist_to_binary(join(re:split("W46]789","^[W-\\]46]",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<":46]789">> = iolist_to_binary(join(re:split("W46]789","^[W-\\]46]",[]))), 
-    <<":all">> = iolist_to_binary(join(re:split("Wall","^[W-\\]46]",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<":46]789">> = iolist_to_binary(join(re:split("W46]789","^[W-\\]46]",[]))),
+    <<":all">> = iolist_to_binary(join(re:split("Wall","^[W-\\]46]",[trim]))),
     <<":all">> = iolist_to_binary(join(re:split("Wall","^[W-\\]46]",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<":all">> = iolist_to_binary(join(re:split("Wall","^[W-\\]46]",[]))), 
-    <<":ebra">> = iolist_to_binary(join(re:split("Zebra","^[W-\\]46]",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<":all">> = iolist_to_binary(join(re:split("Wall","^[W-\\]46]",[]))),
+    <<":ebra">> = iolist_to_binary(join(re:split("Zebra","^[W-\\]46]",[trim]))),
     <<":ebra">> = iolist_to_binary(join(re:split("Zebra","^[W-\\]46]",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<":ebra">> = iolist_to_binary(join(re:split("Zebra","^[W-\\]46]",[]))), 
-    <<":ylophone">> = iolist_to_binary(join(re:split("Xylophone","^[W-\\]46]",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<":ebra">> = iolist_to_binary(join(re:split("Zebra","^[W-\\]46]",[]))),
+    <<":ylophone">> = iolist_to_binary(join(re:split("Xylophone","^[W-\\]46]",[trim]))),
     <<":ylophone">> = iolist_to_binary(join(re:split("Xylophone","^[W-\\]46]",[{parts,
-                                                                                                                                                                                       2}]))), 
-    <<":ylophone">> = iolist_to_binary(join(re:split("Xylophone","^[W-\\]46]",[]))), 
-    <<":2">> = iolist_to_binary(join(re:split("42","^[W-\\]46]",[trim]))), 
+                                                                                                                                                                                       2}]))),
+    <<":ylophone">> = iolist_to_binary(join(re:split("Xylophone","^[W-\\]46]",[]))),
+    <<":2">> = iolist_to_binary(join(re:split("42","^[W-\\]46]",[trim]))),
     <<":2">> = iolist_to_binary(join(re:split("42","^[W-\\]46]",[{parts,
-                                                                                                                                                                         2}]))), 
-    <<":2">> = iolist_to_binary(join(re:split("42","^[W-\\]46]",[]))), 
-    <<":abcd]">> = iolist_to_binary(join(re:split("[abcd]","^[W-\\]46]",[trim]))), 
+                                                                                                                                                                         2}]))),
+    <<":2">> = iolist_to_binary(join(re:split("42","^[W-\\]46]",[]))),
+    <<":abcd]">> = iolist_to_binary(join(re:split("[abcd]","^[W-\\]46]",[trim]))),
     <<":abcd]">> = iolist_to_binary(join(re:split("[abcd]","^[W-\\]46]",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<":abcd]">> = iolist_to_binary(join(re:split("[abcd]","^[W-\\]46]",[]))), 
-    <<":abcd[">> = iolist_to_binary(join(re:split("]abcd[","^[W-\\]46]",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<":abcd]">> = iolist_to_binary(join(re:split("[abcd]","^[W-\\]46]",[]))),
+    <<":abcd[">> = iolist_to_binary(join(re:split("]abcd[","^[W-\\]46]",[trim]))),
     <<":abcd[">> = iolist_to_binary(join(re:split("]abcd[","^[W-\\]46]",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<":abcd[">> = iolist_to_binary(join(re:split("]abcd[","^[W-\\]46]",[]))), 
-    <<":backslash">> = iolist_to_binary(join(re:split("\\backslash","^[W-\\]46]",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<":abcd[">> = iolist_to_binary(join(re:split("]abcd[","^[W-\\]46]",[]))),
+    <<":backslash">> = iolist_to_binary(join(re:split("\\backslash","^[W-\\]46]",[trim]))),
     <<":backslash">> = iolist_to_binary(join(re:split("\\backslash","^[W-\\]46]",[{parts,
-                                                                                                                                                                                             2}]))), 
-    <<":backslash">> = iolist_to_binary(join(re:split("\\backslash","^[W-\\]46]",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-\\]46]",[trim]))), 
+                                                                                                                                                                                             2}]))),
+    <<":backslash">> = iolist_to_binary(join(re:split("\\backslash","^[W-\\]46]",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-\\]46]",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-\\]46]",[{parts,
-                                                                                                                                                                                           2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-\\]46]",[]))), 
-    <<"-46]789">> = iolist_to_binary(join(re:split("-46]789","^[W-\\]46]",[trim]))), 
+                                                                                                                                                                                           2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-\\]46]",[]))),
+    <<"-46]789">> = iolist_to_binary(join(re:split("-46]789","^[W-\\]46]",[trim]))),
     <<"-46]789">> = iolist_to_binary(join(re:split("-46]789","^[W-\\]46]",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<"-46]789">> = iolist_to_binary(join(re:split("-46]789","^[W-\\]46]",[]))), 
-    <<"well">> = iolist_to_binary(join(re:split("well","^[W-\\]46]",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<"-46]789">> = iolist_to_binary(join(re:split("-46]789","^[W-\\]46]",[]))),
+    <<"well">> = iolist_to_binary(join(re:split("well","^[W-\\]46]",[trim]))),
     <<"well">> = iolist_to_binary(join(re:split("well","^[W-\\]46]",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<"well">> = iolist_to_binary(join(re:split("well","^[W-\\]46]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?:[a-zA-Z0-9]+ ){0,10}otherword",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<"well">> = iolist_to_binary(join(re:split("well","^[W-\\]46]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?:[a-zA-Z0-9]+ ){0,10}otherword",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?:[a-zA-Z0-9]+ ){0,10}otherword",[{parts,
-                                                                                                                                                                                                                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?:[a-zA-Z0-9]+ ){0,10}otherword",[]))), 
-    <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark","word (?:[a-zA-Z0-9]+ ){0,10}otherword",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?:[a-zA-Z0-9]+ ){0,10}otherword",[]))),
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark","word (?:[a-zA-Z0-9]+ ){0,10}otherword",[trim]))),
     <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark","word (?:[a-zA-Z0-9]+ ){0,10}otherword",[{parts,
-                                                                                                                                                                                                                                                                                                                                                          2}]))), 
-    <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark","word (?:[a-zA-Z0-9]+ ){0,10}otherword",[]))), 
-    <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?:[a-zA-Z0-9]+ ){0,300}otherword",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                                          2}]))),
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark","word (?:[a-zA-Z0-9]+ ){0,10}otherword",[]))),
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?:[a-zA-Z0-9]+ ){0,300}otherword",[trim]))),
     <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?:[a-zA-Z0-9]+ ){0,300}otherword",[{parts,
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  2}]))), 
-    <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?:[a-zA-Z0-9]+ ){0,300}otherword",[]))), 
-    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,0}",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  2}]))),
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?:[a-zA-Z0-9]+ ){0,300}otherword",[]))),
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,0}",[trim]))),
     <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,0}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,0}",[]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","^(a){0,0}",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,0}",[]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^(a){0,0}",[trim]))),
     <<"abc">> = iolist_to_binary(join(re:split("abc","^(a){0,0}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","^(a){0,0}",[]))), 
-    <<"aab">> = iolist_to_binary(join(re:split("aab","^(a){0,0}",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^(a){0,0}",[]))),
+    <<"aab">> = iolist_to_binary(join(re:split("aab","^(a){0,0}",[trim]))),
     <<"aab">> = iolist_to_binary(join(re:split("aab","^(a){0,0}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"aab">> = iolist_to_binary(join(re:split("aab","^(a){0,0}",[]))), 
-    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,1}",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"aab">> = iolist_to_binary(join(re:split("aab","^(a){0,0}",[]))),
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,1}",[trim]))),
     <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,1}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,1}",[]))), 
-    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,1}",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,1}",[]))),
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,1}",[trim]))),
     <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,1}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,1}",[]))), 
-    <<":a:ab">> = iolist_to_binary(join(re:split("aab","^(a){0,1}",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,1}",[]))),
+    <<":a:ab">> = iolist_to_binary(join(re:split("aab","^(a){0,1}",[trim]))),
     <<":a:ab">> = iolist_to_binary(join(re:split("aab","^(a){0,1}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":a:ab">> = iolist_to_binary(join(re:split("aab","^(a){0,1}",[]))), 
-    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,2}",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":a:ab">> = iolist_to_binary(join(re:split("aab","^(a){0,1}",[]))),
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,2}",[trim]))),
     <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,2}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,2}",[]))), 
-    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,2}",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,2}",[]))),
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,2}",[trim]))),
     <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,2}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,2}",[]))), 
-    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,2}",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,2}",[]))),
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,2}",[trim]))),
     <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,2}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,2}",[]))), 
-    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,3}",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,2}",[]))),
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,3}",[trim]))),
     <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,3}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,3}",[]))), 
-    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,3}",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,3}",[]))),
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,3}",[trim]))),
     <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,3}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,3}",[]))), 
-    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,3}",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,3}",[]))),
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,3}",[trim]))),
     <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,3}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,3}",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aaa","^(a){0,3}",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,3}",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aaa","^(a){0,3}",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){0,3}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){0,3}",[]))), 
-    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,}",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){0,3}",[]))),
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,}",[trim]))),
     <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,}",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,}",[]))), 
-    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,}",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,}",[]))),
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,}",[trim]))),
     <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,}",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,}",[]))), 
-    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,}",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,}",[]))),
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,}",[trim]))),
     <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,}",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,}",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aaa","^(a){0,}",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,}",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aaa","^(a){0,}",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){0,}",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){0,}",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a){0,}",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){0,}",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a){0,}",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a){0,}",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a){0,}",[]))), 
-    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,1}",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a){0,}",[]))),
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,1}",[trim]))),
     <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,1}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,1}",[]))), 
-    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,1}",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,1}",[]))),
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,1}",[trim]))),
     <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,1}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,1}",[]))), 
-    <<":a:ab">> = iolist_to_binary(join(re:split("aab","^(a){1,1}",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,1}",[]))),
+    <<":a:ab">> = iolist_to_binary(join(re:split("aab","^(a){1,1}",[trim]))),
     <<":a:ab">> = iolist_to_binary(join(re:split("aab","^(a){1,1}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":a:ab">> = iolist_to_binary(join(re:split("aab","^(a){1,1}",[]))), 
-    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,2}",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":a:ab">> = iolist_to_binary(join(re:split("aab","^(a){1,1}",[]))),
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,2}",[trim]))),
     <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,2}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,2}",[]))), 
-    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,2}",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,2}",[]))),
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,2}",[trim]))),
     <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,2}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,2}",[]))), 
-    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,2}",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,2}",[]))),
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,2}",[trim]))),
     <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,2}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,2}",[]))), 
-    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,3}",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,2}",[]))),
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,3}",[trim]))),
     <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,3}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,3}",[]))), 
-    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,3}",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,3}",[]))),
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,3}",[trim]))),
     <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,3}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,3}",[]))), 
-    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,3}",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,3}",[]))),
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,3}",[trim]))),
     <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,3}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,3}",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aaa","^(a){1,3}",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,3}",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aaa","^(a){1,3}",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){1,3}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){1,3}",[]))), 
-    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,}",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){1,3}",[]))),
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,}",[trim]))),
     <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,}",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,}",[]))), 
-    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,}",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,}",[]))),
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,}",[trim]))),
     <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,}",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,}",[]))), 
-    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,}",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,}",[]))),
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,}",[trim]))),
     <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,}",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,}",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aaa","^(a){1,}",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,}",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aaa","^(a){1,}",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){1,}",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){1,}",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a){1,}",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){1,}",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a){1,}",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a){1,}",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a){1,}",[]))), 
+                                                                                                                                                                                2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a){1,}",[]))),
     <<"borfle
 :
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*\\.gif",[trim]))), 
+no",".*\\.gif",[trim]))),
     <<"borfle
 :
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*\\.gif",[{parts,2}]))), 
+no",".*\\.gif",[{parts,2}]))),
     <<"borfle
 :
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*\\.gif",[]))), 
+no",".*\\.gif",[]))),
     <<"borfle
 :
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".{0,}\\.gif",[trim]))), 
+no",".{0,}\\.gif",[trim]))),
     <<"borfle
 :
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".{0,}\\.gif",[{parts,2}]))), 
+no",".{0,}\\.gif",[{parts,2}]))),
     <<"borfle
 :
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".{0,}\\.gif",[]))), 
+no",".{0,}\\.gif",[]))),
     <<"borfle
 :
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*\\.gif",[multiline,trim]))), 
+no",".*\\.gif",[multiline,trim]))),
     <<"borfle
 :
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*\\.gif",[multiline,{parts,2}]))), 
+no",".*\\.gif",[multiline,{parts,2}]))),
     <<"borfle
 :
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*\\.gif",[multiline]))), 
+no",".*\\.gif",[multiline]))),
     ok.
 run9() ->
     <<":
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*\\.gif",[dotall,trim]))), 
+no",".*\\.gif",[dotall,trim]))),
     <<":
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*\\.gif",[dotall,{parts,2}]))), 
+no",".*\\.gif",[dotall,{parts,2}]))),
     <<":
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*\\.gif",[dotall]))), 
+no",".*\\.gif",[dotall]))),
     <<":
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*\\.gif",[multiline,dotall,trim]))), 
+no",".*\\.gif",[multiline,dotall,trim]))),
     <<":
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*\\.gif",[multiline,dotall,{parts,2}]))), 
+no",".*\\.gif",[multiline,dotall,{parts,2}]))),
     <<":
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*\\.gif",[multiline,dotall]))), 
+no",".*\\.gif",[multiline,dotall]))),
     <<"borfle
 bib.gif
 ">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*$",[trim]))), 
+no",".*$",[trim]))),
     <<"borfle
 bib.gif
 :">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*$",[{parts,2}]))), 
+no",".*$",[{parts,2}]))),
     <<"borfle
 bib.gif
 :">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*$",[]))), 
+no",".*$",[]))),
     <<":
 :
 ">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*$",[multiline,trim]))), 
+no",".*$",[multiline,trim]))),
     <<":
 bib.gif
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*$",[multiline,{parts,2}]))), 
+no",".*$",[multiline,{parts,2}]))),
     <<":
 :
 :">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*$",[multiline]))), 
+no",".*$",[multiline]))),
     <<"">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*$",[dotall,trim]))), 
+no",".*$",[dotall,trim]))),
     <<":">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*$",[dotall,{parts,2}]))), 
+no",".*$",[dotall,{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*$",[dotall]))), 
+no",".*$",[dotall]))),
     <<"">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*$",[multiline,dotall,trim]))), 
+no",".*$",[multiline,dotall,trim]))),
     <<":">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*$",[multiline,dotall,{parts,2}]))), 
+no",".*$",[multiline,dotall,{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*$",[multiline,dotall]))), 
+no",".*$",[multiline,dotall]))),
     <<"borfle
 bib.gif
 ">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*$",[trim]))), 
+no",".*$",[trim]))),
     <<"borfle
 bib.gif
 :">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*$",[{parts,2}]))), 
+no",".*$",[{parts,2}]))),
     <<"borfle
 bib.gif
 :">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*$",[]))), 
+no",".*$",[]))),
     <<":
 :
 ">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*$",[multiline,trim]))), 
+no",".*$",[multiline,trim]))),
     <<":
 bib.gif
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*$",[multiline,{parts,2}]))), 
+no",".*$",[multiline,{parts,2}]))),
     <<":
 :
 :">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*$",[multiline]))), 
+no",".*$",[multiline]))),
     <<"">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*$",[dotall,trim]))), 
+no",".*$",[dotall,trim]))),
     <<":">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*$",[dotall,{parts,2}]))), 
+no",".*$",[dotall,{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*$",[dotall]))), 
+no",".*$",[dotall]))),
     <<"">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*$",[multiline,dotall,trim]))), 
+no",".*$",[multiline,dotall,trim]))),
     <<":">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*$",[multiline,dotall,{parts,2}]))), 
+no",".*$",[multiline,dotall,{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("borfle
 bib.gif
-no",".*$",[multiline,dotall]))), 
+no",".*$",[multiline,dotall]))),
     <<"abcde
 :1234X:yz">> = iolist_to_binary(join(re:split("abcde
-1234Xyz","(.*X|^B)",[trim]))), 
+1234Xyz","(.*X|^B)",[trim]))),
     <<"abcde
 :1234X:yz">> = iolist_to_binary(join(re:split("abcde
-1234Xyz","(.*X|^B)",[{parts,2}]))), 
+1234Xyz","(.*X|^B)",[{parts,2}]))),
     <<"abcde
 :1234X:yz">> = iolist_to_binary(join(re:split("abcde
-1234Xyz","(.*X|^B)",[]))), 
-    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[trim]))), 
+1234Xyz","(.*X|^B)",[]))),
+    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[trim]))),
     <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(.*X|^B)",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(.*X|^B)",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(.*X|^B)",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(.*X|^B)",[]))), 
+                                                                                                                                                                                      2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(.*X|^B)",[]))),
     <<"abcde
 Bar">> = iolist_to_binary(join(re:split("abcde
-Bar","(.*X|^B)",[trim]))), 
+Bar","(.*X|^B)",[trim]))),
     <<"abcde
 Bar">> = iolist_to_binary(join(re:split("abcde
-Bar","(.*X|^B)",[{parts,2}]))), 
+Bar","(.*X|^B)",[{parts,2}]))),
     <<"abcde
 Bar">> = iolist_to_binary(join(re:split("abcde
-Bar","(.*X|^B)",[]))), 
+Bar","(.*X|^B)",[]))),
     <<"abcde
 :1234X:yz">> = iolist_to_binary(join(re:split("abcde
-1234Xyz","(.*X|^B)",[multiline,trim]))), 
+1234Xyz","(.*X|^B)",[multiline,trim]))),
     <<"abcde
 :1234X:yz">> = iolist_to_binary(join(re:split("abcde
-1234Xyz","(.*X|^B)",[multiline,{parts,2}]))), 
+1234Xyz","(.*X|^B)",[multiline,{parts,2}]))),
     <<"abcde
 :1234X:yz">> = iolist_to_binary(join(re:split("abcde
-1234Xyz","(.*X|^B)",[multiline]))), 
+1234Xyz","(.*X|^B)",[multiline]))),
     <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[multiline,
-                                                                                                                                                                          trim]))), 
+                                                                                                                                                                          trim]))),
     <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[multiline,
                                                                                                                                                                             {parts,
-                                                                                                                                                                             2}]))), 
-    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[multiline]))), 
+                                                                                                                                                                             2}]))),
+    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[multiline]))),
     <<"abcde
 :B:ar">> = iolist_to_binary(join(re:split("abcde
-Bar","(.*X|^B)",[multiline,trim]))), 
+Bar","(.*X|^B)",[multiline,trim]))),
     <<"abcde
 :B:ar">> = iolist_to_binary(join(re:split("abcde
-Bar","(.*X|^B)",[multiline,{parts,2}]))), 
+Bar","(.*X|^B)",[multiline,{parts,2}]))),
     <<"abcde
 :B:ar">> = iolist_to_binary(join(re:split("abcde
-Bar","(.*X|^B)",[multiline]))), 
+Bar","(.*X|^B)",[multiline]))),
     <<":abcde
 1234X:yz">> = iolist_to_binary(join(re:split("abcde
-1234Xyz","(.*X|^B)",[dotall,trim]))), 
+1234Xyz","(.*X|^B)",[dotall,trim]))),
     <<":abcde
 1234X:yz">> = iolist_to_binary(join(re:split("abcde
-1234Xyz","(.*X|^B)",[dotall,{parts,2}]))), 
+1234Xyz","(.*X|^B)",[dotall,{parts,2}]))),
     <<":abcde
 1234X:yz">> = iolist_to_binary(join(re:split("abcde
-1234Xyz","(.*X|^B)",[dotall]))), 
+1234Xyz","(.*X|^B)",[dotall]))),
     <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[dotall,
-                                                                                                                                                                          trim]))), 
+                                                                                                                                                                          trim]))),
     <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[dotall,
                                                                                                                                                                             {parts,
-                                                                                                                                                                             2}]))), 
-    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[dotall]))), 
+                                                                                                                                                                             2}]))),
+    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[dotall]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(.*X|^B)",[dotall,
-                                                                                                                                                                                    trim]))), 
+                                                                                                                                                                                    trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(.*X|^B)",[dotall,
                                                                                                                                                                                       {parts,
-                                                                                                                                                                                       2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(.*X|^B)",[dotall]))), 
+                                                                                                                                                                                       2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(.*X|^B)",[dotall]))),
     <<"abcde
 Bar">> = iolist_to_binary(join(re:split("abcde
-Bar","(.*X|^B)",[dotall,trim]))), 
+Bar","(.*X|^B)",[dotall,trim]))),
     <<"abcde
 Bar">> = iolist_to_binary(join(re:split("abcde
-Bar","(.*X|^B)",[dotall,{parts,2}]))), 
+Bar","(.*X|^B)",[dotall,{parts,2}]))),
     <<"abcde
 Bar">> = iolist_to_binary(join(re:split("abcde
-Bar","(.*X|^B)",[dotall]))), 
+Bar","(.*X|^B)",[dotall]))),
     <<":abcde
 1234X:yz">> = iolist_to_binary(join(re:split("abcde
-1234Xyz","(.*X|^B)",[multiline,dotall,trim]))), 
+1234Xyz","(.*X|^B)",[multiline,dotall,trim]))),
     <<":abcde
 1234X:yz">> = iolist_to_binary(join(re:split("abcde
-1234Xyz","(.*X|^B)",[multiline,dotall,{parts,2}]))), 
+1234Xyz","(.*X|^B)",[multiline,dotall,{parts,2}]))),
     <<":abcde
 1234X:yz">> = iolist_to_binary(join(re:split("abcde
-1234Xyz","(.*X|^B)",[multiline,dotall]))), 
+1234Xyz","(.*X|^B)",[multiline,dotall]))),
     <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[multiline,
                                                                                                                                                                            dotall,
-                                                                                                                                                                           trim]))), 
+                                                                                                                                                                           trim]))),
     <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[multiline,
                                                                                                                                                                              dotall,
                                                                                                                                                                              {parts,
-                                                                                                                                                                              2}]))), 
+                                                                                                                                                                              2}]))),
     <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[multiline,
-                                                                                                                                                                              dotall]))), 
+                                                                                                                                                                              dotall]))),
     <<"abcde
 :B:ar">> = iolist_to_binary(join(re:split("abcde
-Bar","(.*X|^B)",[multiline,dotall,trim]))), 
+Bar","(.*X|^B)",[multiline,dotall,trim]))),
     <<"abcde
 :B:ar">> = iolist_to_binary(join(re:split("abcde
-Bar","(.*X|^B)",[multiline,dotall,{parts,2}]))), 
+Bar","(.*X|^B)",[multiline,dotall,{parts,2}]))),
     <<"abcde
 :B:ar">> = iolist_to_binary(join(re:split("abcde
-Bar","(.*X|^B)",[multiline,dotall]))), 
+Bar","(.*X|^B)",[multiline,dotall]))),
     <<":abcde
 1234X:yz">> = iolist_to_binary(join(re:split("abcde
-1234Xyz","(?s)(.*X|^B)",[trim]))), 
+1234Xyz","(?s)(.*X|^B)",[trim]))),
     <<":abcde
 1234X:yz">> = iolist_to_binary(join(re:split("abcde
-1234Xyz","(?s)(.*X|^B)",[{parts,2}]))), 
+1234Xyz","(?s)(.*X|^B)",[{parts,2}]))),
     <<":abcde
 1234X:yz">> = iolist_to_binary(join(re:split("abcde
-1234Xyz","(?s)(.*X|^B)",[]))), 
-    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(?s)(.*X|^B)",[trim]))), 
+1234Xyz","(?s)(.*X|^B)",[]))),
+    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(?s)(.*X|^B)",[trim]))),
     <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(?s)(.*X|^B)",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(?s)(.*X|^B)",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s)(.*X|^B)",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(?s)(.*X|^B)",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s)(.*X|^B)",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s)(.*X|^B)",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s)(.*X|^B)",[]))), 
+                                                                                                                                                                                              2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s)(.*X|^B)",[]))),
     <<"abcde
 Bar">> = iolist_to_binary(join(re:split("abcde
-Bar","(?s)(.*X|^B)",[trim]))), 
+Bar","(?s)(.*X|^B)",[trim]))),
     <<"abcde
 Bar">> = iolist_to_binary(join(re:split("abcde
-Bar","(?s)(.*X|^B)",[{parts,2}]))), 
+Bar","(?s)(.*X|^B)",[{parts,2}]))),
     <<"abcde
 Bar">> = iolist_to_binary(join(re:split("abcde
-Bar","(?s)(.*X|^B)",[]))), 
+Bar","(?s)(.*X|^B)",[]))),
     <<":yz">> = iolist_to_binary(join(re:split("abcde
-1234Xyz","(?s:.*X|^B)",[trim]))), 
+1234Xyz","(?s:.*X|^B)",[trim]))),
     <<":yz">> = iolist_to_binary(join(re:split("abcde
-1234Xyz","(?s:.*X|^B)",[{parts,2}]))), 
+1234Xyz","(?s:.*X|^B)",[{parts,2}]))),
     <<":yz">> = iolist_to_binary(join(re:split("abcde
-1234Xyz","(?s:.*X|^B)",[]))), 
-    <<":arFoo">> = iolist_to_binary(join(re:split("BarFoo","(?s:.*X|^B)",[trim]))), 
+1234Xyz","(?s:.*X|^B)",[]))),
+    <<":arFoo">> = iolist_to_binary(join(re:split("BarFoo","(?s:.*X|^B)",[trim]))),
     <<":arFoo">> = iolist_to_binary(join(re:split("BarFoo","(?s:.*X|^B)",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<":arFoo">> = iolist_to_binary(join(re:split("BarFoo","(?s:.*X|^B)",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s:.*X|^B)",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<":arFoo">> = iolist_to_binary(join(re:split("BarFoo","(?s:.*X|^B)",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s:.*X|^B)",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s:.*X|^B)",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s:.*X|^B)",[]))), 
+                                                                                                                                                                                            2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s:.*X|^B)",[]))),
     <<"abcde
 Bar">> = iolist_to_binary(join(re:split("abcde
-Bar","(?s:.*X|^B)",[trim]))), 
+Bar","(?s:.*X|^B)",[trim]))),
     <<"abcde
 Bar">> = iolist_to_binary(join(re:split("abcde
-Bar","(?s:.*X|^B)",[{parts,2}]))), 
+Bar","(?s:.*X|^B)",[{parts,2}]))),
     <<"abcde
 Bar">> = iolist_to_binary(join(re:split("abcde
-Bar","(?s:.*X|^B)",[]))), 
-    <<"**** Failers">> = iolist_to_binary(join(re:split("**** Failers","^.*B",[trim]))), 
+Bar","(?s:.*X|^B)",[]))),
+    <<"**** Failers">> = iolist_to_binary(join(re:split("**** Failers","^.*B",[trim]))),
     <<"**** Failers">> = iolist_to_binary(join(re:split("**** Failers","^.*B",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<"**** Failers">> = iolist_to_binary(join(re:split("**** Failers","^.*B",[]))), 
+                                                                                                                                                                                2}]))),
+    <<"**** Failers">> = iolist_to_binary(join(re:split("**** Failers","^.*B",[]))),
     <<"abc
 B">> = iolist_to_binary(join(re:split("abc
-B","^.*B",[trim]))), 
+B","^.*B",[trim]))),
     <<"abc
 B">> = iolist_to_binary(join(re:split("abc
-B","^.*B",[{parts,2}]))), 
+B","^.*B",[{parts,2}]))),
     <<"abc
 B">> = iolist_to_binary(join(re:split("abc
-B","^.*B",[]))), 
+B","^.*B",[]))),
     <<"">> = iolist_to_binary(join(re:split("abc
-B","(?s)^.*B",[trim]))), 
+B","(?s)^.*B",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc
-B","(?s)^.*B",[{parts,2}]))), 
+B","(?s)^.*B",[{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("abc
-B","(?s)^.*B",[]))), 
+B","(?s)^.*B",[]))),
     <<"abc
 ">> = iolist_to_binary(join(re:split("abc
-B","(?m)^.*B",[trim]))), 
+B","(?m)^.*B",[trim]))),
     <<"abc
 :">> = iolist_to_binary(join(re:split("abc
-B","(?m)^.*B",[{parts,2}]))), 
+B","(?m)^.*B",[{parts,2}]))),
     <<"abc
 :">> = iolist_to_binary(join(re:split("abc
-B","(?m)^.*B",[]))), 
+B","(?m)^.*B",[]))),
     <<"">> = iolist_to_binary(join(re:split("abc
-B","(?ms)^.*B",[trim]))), 
+B","(?ms)^.*B",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc
-B","(?ms)^.*B",[{parts,2}]))), 
+B","(?ms)^.*B",[{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("abc
-B","(?ms)^.*B",[]))), 
+B","(?ms)^.*B",[]))),
     ok.
 run10() ->
     <<"abc
 ">> = iolist_to_binary(join(re:split("abc
-B","(?ms)^B",[trim]))), 
+B","(?ms)^B",[trim]))),
     <<"abc
 :">> = iolist_to_binary(join(re:split("abc
-B","(?ms)^B",[{parts,2}]))), 
+B","(?ms)^B",[{parts,2}]))),
     <<"abc
 :">> = iolist_to_binary(join(re:split("abc
-B","(?ms)^B",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("B","(?s)B$",[trim]))), 
+B","(?ms)^B",[]))),
+    <<"">> = iolist_to_binary(join(re:split("B","(?s)B$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("B","(?s)B$",[{parts,
-                                                                                                                                                               2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("B","(?s)B$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("123456654321","^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]",[trim]))), 
+                                                                                                                                                               2}]))),
+    <<":">> = iolist_to_binary(join(re:split("B","(?s)B$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("123456654321","^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("123456654321","^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]",[{parts,
-                                                                                                                                                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("123456654321","^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("123456654321","^\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d",[trim]))), 
+                                                                                                                                                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("123456654321","^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("123456654321","^\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("123456654321","^\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d",[{parts,
-                                                                                                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("123456654321","^\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("123456654321","^[\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d]",[trim]))), 
+                                                                                                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("123456654321","^\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d",[]))),
+    <<"">> = iolist_to_binary(join(re:split("123456654321","^[\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("123456654321","^[\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d]",[{parts,
-                                                                                                                                                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("123456654321","^[\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abcabcabcabc","^[abc]{12}",[trim]))), 
+                                                                                                                                                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("123456654321","^[\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abcabcabcabc","^[abc]{12}",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abcabcabcabc","^[abc]{12}",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abcabcabcabc","^[abc]{12}",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abcabcabcabc","^[a-c]{12}",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abcabcabcabc","^[abc]{12}",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abcabcabcabc","^[a-c]{12}",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abcabcabcabc","^[a-c]{12}",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abcabcabcabc","^[a-c]{12}",[]))), 
-    <<":c">> = iolist_to_binary(join(re:split("abcabcabcabc","^(a|b|c){12}",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abcabcabcabc","^[a-c]{12}",[]))),
+    <<":c">> = iolist_to_binary(join(re:split("abcabcabcabc","^(a|b|c){12}",[trim]))),
     <<":c:">> = iolist_to_binary(join(re:split("abcabcabcabc","^(a|b|c){12}",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<":c:">> = iolist_to_binary(join(re:split("abcabcabcabc","^(a|b|c){12}",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("n","^[abcdefghijklmnopqrstuvwxy0123456789]",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<":c:">> = iolist_to_binary(join(re:split("abcabcabcabc","^(a|b|c){12}",[]))),
+    <<"">> = iolist_to_binary(join(re:split("n","^[abcdefghijklmnopqrstuvwxy0123456789]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("n","^[abcdefghijklmnopqrstuvwxy0123456789]",[{parts,
-                                                                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("n","^[abcdefghijklmnopqrstuvwxy0123456789]",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[abcdefghijklmnopqrstuvwxy0123456789]",[trim]))), 
+                                                                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("n","^[abcdefghijklmnopqrstuvwxy0123456789]",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[abcdefghijklmnopqrstuvwxy0123456789]",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[abcdefghijklmnopqrstuvwxy0123456789]",[{parts,
-                                                                                                                                                                                                                                                  2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[abcdefghijklmnopqrstuvwxy0123456789]",[]))), 
-    <<"z">> = iolist_to_binary(join(re:split("z","^[abcdefghijklmnopqrstuvwxy0123456789]",[trim]))), 
+                                                                                                                                                                                                                                                  2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[abcdefghijklmnopqrstuvwxy0123456789]",[]))),
+    <<"z">> = iolist_to_binary(join(re:split("z","^[abcdefghijklmnopqrstuvwxy0123456789]",[trim]))),
     <<"z">> = iolist_to_binary(join(re:split("z","^[abcdefghijklmnopqrstuvwxy0123456789]",[{parts,
-                                                                                                                                                                                                                              2}]))), 
-    <<"z">> = iolist_to_binary(join(re:split("z","^[abcdefghijklmnopqrstuvwxy0123456789]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abcd","abcde{0,0}",[trim]))), 
+                                                                                                                                                                                                                              2}]))),
+    <<"z">> = iolist_to_binary(join(re:split("z","^[abcdefghijklmnopqrstuvwxy0123456789]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abcd","abcde{0,0}",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abcd","abcde{0,0}",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abcd","abcde{0,0}",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abcde{0,0}",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abcd","abcde{0,0}",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abcde{0,0}",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abcde{0,0}",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abcde{0,0}",[]))), 
-    <<"abce">> = iolist_to_binary(join(re:split("abce","abcde{0,0}",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abcde{0,0}",[]))),
+    <<"abce">> = iolist_to_binary(join(re:split("abce","abcde{0,0}",[trim]))),
     <<"abce">> = iolist_to_binary(join(re:split("abce","abcde{0,0}",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"abce">> = iolist_to_binary(join(re:split("abce","abcde{0,0}",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abe","ab[cd]{0,0}e",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<"abce">> = iolist_to_binary(join(re:split("abce","abcde{0,0}",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abe","ab[cd]{0,0}e",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abe","ab[cd]{0,0}e",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abe","ab[cd]{0,0}e",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab[cd]{0,0}e",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abe","ab[cd]{0,0}e",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab[cd]{0,0}e",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab[cd]{0,0}e",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab[cd]{0,0}e",[]))), 
-    <<"abcde">> = iolist_to_binary(join(re:split("abcde","ab[cd]{0,0}e",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab[cd]{0,0}e",[]))),
+    <<"abcde">> = iolist_to_binary(join(re:split("abcde","ab[cd]{0,0}e",[trim]))),
     <<"abcde">> = iolist_to_binary(join(re:split("abcde","ab[cd]{0,0}e",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"abcde">> = iolist_to_binary(join(re:split("abcde","ab[cd]{0,0}e",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abd","ab(c){0,0}d",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"abcde">> = iolist_to_binary(join(re:split("abcde","ab[cd]{0,0}e",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abd","ab(c){0,0}d",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("abd","ab(c){0,0}d",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("abd","ab(c){0,0}d",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab(c){0,0}d",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("abd","ab(c){0,0}d",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab(c){0,0}d",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab(c){0,0}d",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab(c){0,0}d",[]))), 
-    <<"abcd">> = iolist_to_binary(join(re:split("abcd","ab(c){0,0}d",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab(c){0,0}d",[]))),
+    <<"abcd">> = iolist_to_binary(join(re:split("abcd","ab(c){0,0}d",[trim]))),
     <<"abcd">> = iolist_to_binary(join(re:split("abcd","ab(c){0,0}d",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<"abcd">> = iolist_to_binary(join(re:split("abcd","ab(c){0,0}d",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","a(b*)",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<"abcd">> = iolist_to_binary(join(re:split("abcd","ab(c){0,0}d",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","a(b*)",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("a","a(b*)",[{parts,
-                                                                                                                                                            2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("a","a(b*)",[]))), 
-    <<":b">> = iolist_to_binary(join(re:split("ab","a(b*)",[trim]))), 
+                                                                                                                                                            2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("a","a(b*)",[]))),
+    <<":b">> = iolist_to_binary(join(re:split("ab","a(b*)",[trim]))),
     <<":b:">> = iolist_to_binary(join(re:split("ab","a(b*)",[{parts,
-                                                                                                                                                              2}]))), 
-    <<":b:">> = iolist_to_binary(join(re:split("ab","a(b*)",[]))), 
-    <<":bbbb">> = iolist_to_binary(join(re:split("abbbb","a(b*)",[trim]))), 
+                                                                                                                                                              2}]))),
+    <<":b:">> = iolist_to_binary(join(re:split("ab","a(b*)",[]))),
+    <<":bbbb">> = iolist_to_binary(join(re:split("abbbb","a(b*)",[trim]))),
     <<":bbbb:">> = iolist_to_binary(join(re:split("abbbb","a(b*)",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<":bbbb:">> = iolist_to_binary(join(re:split("abbbb","a(b*)",[]))), 
-    <<"*** F::ilers">> = iolist_to_binary(join(re:split("*** Failers","a(b*)",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<":bbbb:">> = iolist_to_binary(join(re:split("abbbb","a(b*)",[]))),
+    <<"*** F::ilers">> = iolist_to_binary(join(re:split("*** Failers","a(b*)",[trim]))),
     <<"*** F::ilers">> = iolist_to_binary(join(re:split("*** Failers","a(b*)",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<"*** F::ilers">> = iolist_to_binary(join(re:split("*** Failers","a(b*)",[]))), 
-    <<"bbbbb">> = iolist_to_binary(join(re:split("bbbbb","a(b*)",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<"*** F::ilers">> = iolist_to_binary(join(re:split("*** Failers","a(b*)",[]))),
+    <<"bbbbb">> = iolist_to_binary(join(re:split("bbbbb","a(b*)",[trim]))),
     <<"bbbbb">> = iolist_to_binary(join(re:split("bbbbb","a(b*)",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<"bbbbb">> = iolist_to_binary(join(re:split("bbbbb","a(b*)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abe","ab\\d{0}e",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<"bbbbb">> = iolist_to_binary(join(re:split("bbbbb","a(b*)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abe","ab\\d{0}e",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abe","ab\\d{0}e",[{parts,
-                                                                                                                                                                         2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abe","ab\\d{0}e",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab\\d{0}e",[trim]))), 
+                                                                                                                                                                         2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abe","ab\\d{0}e",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab\\d{0}e",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab\\d{0}e",[{parts,
-                                                                                                                                                                                         2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab\\d{0}e",[]))), 
-    <<"ab1e">> = iolist_to_binary(join(re:split("ab1e","ab\\d{0}e",[trim]))), 
+                                                                                                                                                                                         2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab\\d{0}e",[]))),
+    <<"ab1e">> = iolist_to_binary(join(re:split("ab1e","ab\\d{0}e",[trim]))),
     <<"ab1e">> = iolist_to_binary(join(re:split("ab1e","ab\\d{0}e",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<"ab1e">> = iolist_to_binary(join(re:split("ab1e","ab\\d{0}e",[]))), 
-    <<"the :quick: brown fox">> = iolist_to_binary(join(re:split("the \"quick\" brown fox","\"([^\\\\\"]+|\\\\.)*\"",[trim]))), 
+                                                                                                                                                                           2}]))),
+    <<"ab1e">> = iolist_to_binary(join(re:split("ab1e","ab\\d{0}e",[]))),
+    <<"the :quick: brown fox">> = iolist_to_binary(join(re:split("the \"quick\" brown fox","\"([^\\\\\"]+|\\\\.)*\"",[trim]))),
     <<"the :quick: brown fox">> = iolist_to_binary(join(re:split("the \"quick\" brown fox","\"([^\\\\\"]+|\\\\.)*\"",[{parts,
-                                                                                                                                                                                                                                                       2}]))), 
-    <<"the :quick: brown fox">> = iolist_to_binary(join(re:split("the \"quick\" brown fox","\"([^\\\\\"]+|\\\\.)*\"",[]))), 
-    <<": brown fox">> = iolist_to_binary(join(re:split("\"the \\\"quick\\\" brown fox\"","\"([^\\\\\"]+|\\\\.)*\"",[trim]))), 
+                                                                                                                                                                                                                                                       2}]))),
+    <<"the :quick: brown fox">> = iolist_to_binary(join(re:split("the \"quick\" brown fox","\"([^\\\\\"]+|\\\\.)*\"",[]))),
+    <<": brown fox">> = iolist_to_binary(join(re:split("\"the \\\"quick\\\" brown fox\"","\"([^\\\\\"]+|\\\\.)*\"",[trim]))),
     <<": brown fox:">> = iolist_to_binary(join(re:split("\"the \\\"quick\\\" brown fox\"","\"([^\\\\\"]+|\\\\.)*\"",[{parts,
-                                                                                                                                                                                                                                                                               2}]))), 
-    <<": brown fox:">> = iolist_to_binary(join(re:split("\"the \\\"quick\\\" brown fox\"","\"([^\\\\\"]+|\\\\.)*\"",[]))), 
-    <<"a:b:c">> = iolist_to_binary(join(re:split("abc","",[trim]))), 
+                                                                                                                                                                                                                                                                               2}]))),
+    <<": brown fox:">> = iolist_to_binary(join(re:split("\"the \\\"quick\\\" brown fox\"","\"([^\\\\\"]+|\\\\.)*\"",[]))),
+    <<"a:b:c">> = iolist_to_binary(join(re:split("abc","",[trim]))),
     <<"a:bc">> = iolist_to_binary(join(re:split("abc","",[{parts,
-                                                                                                                                                      2}]))), 
-    <<"a:b:c:">> = iolist_to_binary(join(re:split("abc","",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("acb","a[^a]b",[trim]))), 
+                                                                                                                                                      2}]))),
+    <<"a:b:c:">> = iolist_to_binary(join(re:split("abc","",[]))),
+    <<"">> = iolist_to_binary(join(re:split("acb","a[^a]b",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("acb","a[^a]b",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("acb","a[^a]b",[]))), 
+                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("acb","a[^a]b",[]))),
     <<"">> = iolist_to_binary(join(re:split("a
-b","a[^a]b",[trim]))), 
+b","a[^a]b",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a
-b","a[^a]b",[{parts,2}]))), 
+b","a[^a]b",[{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("a
-b","a[^a]b",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("acb","a.b",[trim]))), 
+b","a[^a]b",[]))),
+    <<"">> = iolist_to_binary(join(re:split("acb","a.b",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("acb","a.b",[{parts,
-                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("acb","a.b",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a.b",[trim]))), 
+                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("acb","a.b",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a.b",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a.b",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a.b",[]))), 
+                                                                                                                                                                            2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a.b",[]))),
     <<"a
 b">> = iolist_to_binary(join(re:split("a
-b","a.b",[trim]))), 
+b","a.b",[trim]))),
     <<"a
 b">> = iolist_to_binary(join(re:split("a
-b","a.b",[{parts,2}]))), 
+b","a.b",[{parts,2}]))),
     <<"a
 b">> = iolist_to_binary(join(re:split("a
-b","a.b",[]))), 
+b","a.b",[]))),
     <<"">> = iolist_to_binary(join(re:split("acb","a[^a]b",[dotall,
-                                                                                                                                                                trim]))), 
+                                                                                                                                                                trim]))),
     <<":">> = iolist_to_binary(join(re:split("acb","a[^a]b",[dotall,
                                                                                                                                                                   {parts,
-                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("acb","a[^a]b",[dotall]))), 
+                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("acb","a[^a]b",[dotall]))),
     <<"">> = iolist_to_binary(join(re:split("a
-b","a[^a]b",[dotall,trim]))), 
+b","a[^a]b",[dotall,trim]))),
     <<":">> = iolist_to_binary(join(re:split("a
-b","a[^a]b",[dotall,{parts,2}]))), 
+b","a[^a]b",[dotall,{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("a
-b","a[^a]b",[dotall]))), 
+b","a[^a]b",[dotall]))),
     ok.
 run11() ->
     <<"">> = iolist_to_binary(join(re:split("acb","a.b",[dotall,
-                                                                                                                                                          trim]))), 
+                                                                                                                                                          trim]))),
     <<":">> = iolist_to_binary(join(re:split("acb","a.b",[dotall,
                                                                                                                                                             {parts,
-                                                                                                                                                             2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("acb","a.b",[dotall]))), 
+                                                                                                                                                             2}]))),
+    <<":">> = iolist_to_binary(join(re:split("acb","a.b",[dotall]))),
     <<"">> = iolist_to_binary(join(re:split("a
-b","a.b",[dotall,trim]))), 
+b","a.b",[dotall,trim]))),
     <<":">> = iolist_to_binary(join(re:split("a
-b","a.b",[dotall,{parts,2}]))), 
+b","a.b",[dotall,{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("a
-b","a.b",[dotall]))), 
-    <<":a">> = iolist_to_binary(join(re:split("bac","^(b+?|a){1,2}?c",[trim]))), 
+b","a.b",[dotall]))),
+    <<":a">> = iolist_to_binary(join(re:split("bac","^(b+?|a){1,2}?c",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+?|a){1,2}?c",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+?|a){1,2}?c",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("bbac","^(b+?|a){1,2}?c",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+?|a){1,2}?c",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("bbac","^(b+?|a){1,2}?c",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+?|a){1,2}?c",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+?|a){1,2}?c",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("bbbac","^(b+?|a){1,2}?c",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+?|a){1,2}?c",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("bbbac","^(b+?|a){1,2}?c",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("bbbac","^(b+?|a){1,2}?c",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("bbbac","^(b+?|a){1,2}?c",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("bbbbac","^(b+?|a){1,2}?c",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("bbbac","^(b+?|a){1,2}?c",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("bbbbac","^(b+?|a){1,2}?c",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("bbbbac","^(b+?|a){1,2}?c",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("bbbbac","^(b+?|a){1,2}?c",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("bbbbbac","^(b+?|a){1,2}?c",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("bbbbac","^(b+?|a){1,2}?c",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("bbbbbac","^(b+?|a){1,2}?c",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("bbbbbac","^(b+?|a){1,2}?c",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("bbbbbac","^(b+?|a){1,2}?c",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("bac","^(b+|a){1,2}?c",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("bbbbbac","^(b+?|a){1,2}?c",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("bac","^(b+|a){1,2}?c",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+|a){1,2}?c",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+|a){1,2}?c",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("bbac","^(b+|a){1,2}?c",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+|a){1,2}?c",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("bbac","^(b+|a){1,2}?c",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+|a){1,2}?c",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+|a){1,2}?c",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("bbbac","^(b+|a){1,2}?c",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+|a){1,2}?c",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("bbbac","^(b+|a){1,2}?c",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("bbbac","^(b+|a){1,2}?c",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("bbbac","^(b+|a){1,2}?c",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("bbbbac","^(b+|a){1,2}?c",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("bbbac","^(b+|a){1,2}?c",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("bbbbac","^(b+|a){1,2}?c",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("bbbbac","^(b+|a){1,2}?c",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("bbbbac","^(b+|a){1,2}?c",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("bbbbbac","^(b+|a){1,2}?c",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("bbbbac","^(b+|a){1,2}?c",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("bbbbbac","^(b+|a){1,2}?c",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("bbbbbac","^(b+|a){1,2}?c",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("bbbbbac","^(b+|a){1,2}?c",[]))), 
+                                                                                                                                                                                          2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("bbbbbac","^(b+|a){1,2}?c",[]))),
     <<"x
 b">> = iolist_to_binary(join(re:split("x
-b","(?!\\A)x",[multiline,trim]))), 
+b","(?!\\A)x",[multiline,trim]))),
     <<"x
 b">> = iolist_to_binary(join(re:split("x
-b","(?!\\A)x",[multiline,{parts,2}]))), 
+b","(?!\\A)x",[multiline,{parts,2}]))),
     <<"x
 b">> = iolist_to_binary(join(re:split("x
-b","(?!\\A)x",[multiline]))), 
+b","(?!\\A)x",[multiline]))),
     <<"a">> = iolist_to_binary(join(re:split("ax","(?!\\A)x",[multiline,
-                                                                                                                                                                     trim]))), 
+                                                                                                                                                                     trim]))),
     <<"a:">> = iolist_to_binary(join(re:split("ax","(?!\\A)x",[multiline,
                                                                                                                                                                        {parts,
-                                                                                                                                                                        2}]))), 
-    <<"a:">> = iolist_to_binary(join(re:split("ax","(?!\\A)x",[multiline]))), 
-    <<"{ab}">> = iolist_to_binary(join(re:split("{ab}","\\x0{ab}",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"a:">> = iolist_to_binary(join(re:split("ax","(?!\\A)x",[multiline]))),
+    <<"{ab}">> = iolist_to_binary(join(re:split("{ab}","\\x0{ab}",[trim]))),
     <<"{ab}">> = iolist_to_binary(join(re:split("{ab}","\\x0{ab}",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<"{ab}">> = iolist_to_binary(join(re:split("{ab}","\\x0{ab}",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("CD","(A|B)*?CD",[trim]))), 
+                                                                                                                                                                           2}]))),
+    <<"{ab}">> = iolist_to_binary(join(re:split("{ab}","\\x0{ab}",[]))),
+    <<"">> = iolist_to_binary(join(re:split("CD","(A|B)*?CD",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("CD","(A|B)*?CD",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("CD","(A|B)*?CD",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("CD","(A|B)*CD",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("CD","(A|B)*?CD",[]))),
+    <<"">> = iolist_to_binary(join(re:split("CD","(A|B)*CD",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("CD","(A|B)*CD",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("CD","(A|B)*CD",[]))), 
-    <<":AB:AB">> = iolist_to_binary(join(re:split("ABABAB","(AB)*?\\1",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("CD","(A|B)*CD",[]))),
+    <<":AB:AB">> = iolist_to_binary(join(re:split("ABABAB","(AB)*?\\1",[trim]))),
     <<":AB:AB">> = iolist_to_binary(join(re:split("ABABAB","(AB)*?\\1",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<":AB:AB">> = iolist_to_binary(join(re:split("ABABAB","(AB)*?\\1",[]))), 
-    <<":AB">> = iolist_to_binary(join(re:split("ABABAB","(AB)*\\1",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<":AB:AB">> = iolist_to_binary(join(re:split("ABABAB","(AB)*?\\1",[]))),
+    <<":AB">> = iolist_to_binary(join(re:split("ABABAB","(AB)*\\1",[trim]))),
     <<":AB:">> = iolist_to_binary(join(re:split("ABABAB","(AB)*\\1",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<":AB:">> = iolist_to_binary(join(re:split("ABABAB","(AB)*\\1",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("foo","(?<!bar)foo",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<":AB:">> = iolist_to_binary(join(re:split("ABABAB","(AB)*\\1",[]))),
+    <<"">> = iolist_to_binary(join(re:split("foo","(?<!bar)foo",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("foo","(?<!bar)foo",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("foo","(?<!bar)foo",[]))), 
-    <<"cat:d">> = iolist_to_binary(join(re:split("catfood","(?<!bar)foo",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("foo","(?<!bar)foo",[]))),
+    <<"cat:d">> = iolist_to_binary(join(re:split("catfood","(?<!bar)foo",[trim]))),
     <<"cat:d">> = iolist_to_binary(join(re:split("catfood","(?<!bar)foo",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<"cat:d">> = iolist_to_binary(join(re:split("catfood","(?<!bar)foo",[]))), 
-    <<"ar:tle">> = iolist_to_binary(join(re:split("arfootle","(?<!bar)foo",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<"cat:d">> = iolist_to_binary(join(re:split("catfood","(?<!bar)foo",[]))),
+    <<"ar:tle">> = iolist_to_binary(join(re:split("arfootle","(?<!bar)foo",[trim]))),
     <<"ar:tle">> = iolist_to_binary(join(re:split("arfootle","(?<!bar)foo",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<"ar:tle">> = iolist_to_binary(join(re:split("arfootle","(?<!bar)foo",[]))), 
-    <<"r:sh">> = iolist_to_binary(join(re:split("rfoosh","(?<!bar)foo",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<"ar:tle">> = iolist_to_binary(join(re:split("arfootle","(?<!bar)foo",[]))),
+    <<"r:sh">> = iolist_to_binary(join(re:split("rfoosh","(?<!bar)foo",[trim]))),
     <<"r:sh">> = iolist_to_binary(join(re:split("rfoosh","(?<!bar)foo",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"r:sh">> = iolist_to_binary(join(re:split("rfoosh","(?<!bar)foo",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<!bar)foo",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"r:sh">> = iolist_to_binary(join(re:split("rfoosh","(?<!bar)foo",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<!bar)foo",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<!bar)foo",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<!bar)foo",[]))), 
-    <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","(?<!bar)foo",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<!bar)foo",[]))),
+    <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","(?<!bar)foo",[trim]))),
     <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","(?<!bar)foo",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","(?<!bar)foo",[]))), 
-    <<"towbarfoo">> = iolist_to_binary(join(re:split("towbarfoo","(?<!bar)foo",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","(?<!bar)foo",[]))),
+    <<"towbarfoo">> = iolist_to_binary(join(re:split("towbarfoo","(?<!bar)foo",[trim]))),
     <<"towbarfoo">> = iolist_to_binary(join(re:split("towbarfoo","(?<!bar)foo",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"towbarfoo">> = iolist_to_binary(join(re:split("towbarfoo","(?<!bar)foo",[]))), 
-    <<":d">> = iolist_to_binary(join(re:split("catfood","\\w{3}(?<!bar)foo",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<"towbarfoo">> = iolist_to_binary(join(re:split("towbarfoo","(?<!bar)foo",[]))),
+    <<":d">> = iolist_to_binary(join(re:split("catfood","\\w{3}(?<!bar)foo",[trim]))),
     <<":d">> = iolist_to_binary(join(re:split("catfood","\\w{3}(?<!bar)foo",[{parts,
-                                                                                                                                                                                                 2}]))), 
-    <<":d">> = iolist_to_binary(join(re:split("catfood","\\w{3}(?<!bar)foo",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\w{3}(?<!bar)foo",[trim]))), 
+                                                                                                                                                                                                 2}]))),
+    <<":d">> = iolist_to_binary(join(re:split("catfood","\\w{3}(?<!bar)foo",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\w{3}(?<!bar)foo",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\w{3}(?<!bar)foo",[{parts,
-                                                                                                                                                                                                         2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\w{3}(?<!bar)foo",[]))), 
-    <<"foo">> = iolist_to_binary(join(re:split("foo","\\w{3}(?<!bar)foo",[trim]))), 
+                                                                                                                                                                                                         2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\w{3}(?<!bar)foo",[]))),
+    <<"foo">> = iolist_to_binary(join(re:split("foo","\\w{3}(?<!bar)foo",[trim]))),
     <<"foo">> = iolist_to_binary(join(re:split("foo","\\w{3}(?<!bar)foo",[{parts,
-                                                                                                                                                                                         2}]))), 
-    <<"foo">> = iolist_to_binary(join(re:split("foo","\\w{3}(?<!bar)foo",[]))), 
-    <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","\\w{3}(?<!bar)foo",[trim]))), 
+                                                                                                                                                                                         2}]))),
+    <<"foo">> = iolist_to_binary(join(re:split("foo","\\w{3}(?<!bar)foo",[]))),
+    <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","\\w{3}(?<!bar)foo",[trim]))),
     <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","\\w{3}(?<!bar)foo",[{parts,
-                                                                                                                                                                                               2}]))), 
-    <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","\\w{3}(?<!bar)foo",[]))), 
-    <<"towbarfoo">> = iolist_to_binary(join(re:split("towbarfoo","\\w{3}(?<!bar)foo",[trim]))), 
+                                                                                                                                                                                               2}]))),
+    <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","\\w{3}(?<!bar)foo",[]))),
+    <<"towbarfoo">> = iolist_to_binary(join(re:split("towbarfoo","\\w{3}(?<!bar)foo",[trim]))),
     <<"towbarfoo">> = iolist_to_binary(join(re:split("towbarfoo","\\w{3}(?<!bar)foo",[{parts,
-                                                                                                                                                                                                     2}]))), 
-    <<"towbarfoo">> = iolist_to_binary(join(re:split("towbarfoo","\\w{3}(?<!bar)foo",[]))), 
-    <<"fooa:foo">> = iolist_to_binary(join(re:split("fooabar","(?<=(foo)a)bar",[trim]))), 
+                                                                                                                                                                                                     2}]))),
+    <<"towbarfoo">> = iolist_to_binary(join(re:split("towbarfoo","\\w{3}(?<!bar)foo",[]))),
+    <<"fooa:foo">> = iolist_to_binary(join(re:split("fooabar","(?<=(foo)a)bar",[trim]))),
     <<"fooa:foo:">> = iolist_to_binary(join(re:split("fooabar","(?<=(foo)a)bar",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<"fooa:foo:">> = iolist_to_binary(join(re:split("fooabar","(?<=(foo)a)bar",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(foo)a)bar",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<"fooa:foo:">> = iolist_to_binary(join(re:split("fooabar","(?<=(foo)a)bar",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(foo)a)bar",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(foo)a)bar",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(foo)a)bar",[]))), 
-    <<"bar">> = iolist_to_binary(join(re:split("bar","(?<=(foo)a)bar",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(foo)a)bar",[]))),
+    <<"bar">> = iolist_to_binary(join(re:split("bar","(?<=(foo)a)bar",[trim]))),
     <<"bar">> = iolist_to_binary(join(re:split("bar","(?<=(foo)a)bar",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"bar">> = iolist_to_binary(join(re:split("bar","(?<=(foo)a)bar",[]))), 
-    <<"foobbar">> = iolist_to_binary(join(re:split("foobbar","(?<=(foo)a)bar",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"bar">> = iolist_to_binary(join(re:split("bar","(?<=(foo)a)bar",[]))),
+    <<"foobbar">> = iolist_to_binary(join(re:split("foobbar","(?<=(foo)a)bar",[trim]))),
     <<"foobbar">> = iolist_to_binary(join(re:split("foobbar","(?<=(foo)a)bar",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<"foobbar">> = iolist_to_binary(join(re:split("foobbar","(?<=(foo)a)bar",[]))), 
+                                                                                                                                                                                          2}]))),
+    <<"foobbar">> = iolist_to_binary(join(re:split("foobbar","(?<=(foo)a)bar",[]))),
     <<"">> = iolist_to_binary(join(re:split("abc","\\Aabc\\z",[multiline,
-                                                                                                                                                                        trim]))), 
+                                                                                                                                                                        trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\z",[multiline,
                                                                                                                                                                           {parts,
-                                                                                                                                                                           2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\z",[multiline]))), 
+                                                                                                                                                                           2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\z",[multiline]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc\\z",[multiline,
-                                                                                                                                                                                        trim]))), 
+                                                                                                                                                                                        trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc\\z",[multiline,
                                                                                                                                                                                           {parts,
-                                                                                                                                                                                           2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc\\z",[multiline]))), 
+                                                                                                                                                                                           2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc\\z",[multiline]))),
     <<"">> = iolist_to_binary(join(re:split("abc","\\Aabc\\z",[multiline,
-                                                                                                                                                                        trim]))), 
+                                                                                                                                                                        trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\z",[multiline,
                                                                                                                                                                           {parts,
-                                                                                                                                                                           2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\z",[multiline]))), 
+                                                                                                                                                                           2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\z",[multiline]))),
     <<"qqq
 abc">> = iolist_to_binary(join(re:split("qqq
-abc","\\Aabc\\z",[multiline,trim]))), 
+abc","\\Aabc\\z",[multiline,trim]))),
     <<"qqq
 abc">> = iolist_to_binary(join(re:split("qqq
-abc","\\Aabc\\z",[multiline,{parts,2}]))), 
+abc","\\Aabc\\z",[multiline,{parts,2}]))),
     <<"qqq
 abc">> = iolist_to_binary(join(re:split("qqq
-abc","\\Aabc\\z",[multiline]))), 
+abc","\\Aabc\\z",[multiline]))),
     <<"abc
 zzz">> = iolist_to_binary(join(re:split("abc
-zzz","\\Aabc\\z",[multiline,trim]))), 
+zzz","\\Aabc\\z",[multiline,trim]))),
     <<"abc
 zzz">> = iolist_to_binary(join(re:split("abc
-zzz","\\Aabc\\z",[multiline,{parts,2}]))), 
+zzz","\\Aabc\\z",[multiline,{parts,2}]))),
     <<"abc
 zzz">> = iolist_to_binary(join(re:split("abc
-zzz","\\Aabc\\z",[multiline]))), 
+zzz","\\Aabc\\z",[multiline]))),
     <<"qqq
 abc
 zzz">> = iolist_to_binary(join(re:split("qqq
 abc
-zzz","\\Aabc\\z",[multiline,trim]))), 
+zzz","\\Aabc\\z",[multiline,trim]))),
     <<"qqq
 abc
 zzz">> = iolist_to_binary(join(re:split("qqq
 abc
-zzz","\\Aabc\\z",[multiline,{parts,2}]))), 
+zzz","\\Aabc\\z",[multiline,{parts,2}]))),
     <<"qqq
 abc
 zzz">> = iolist_to_binary(join(re:split("qqq
 abc
-zzz","\\Aabc\\z",[multiline]))), 
-    <<"1:.23">> = iolist_to_binary(join(re:split("1.230003938","(?>(\\.\\d\\d[1-9]?))\\d+",[trim]))), 
+zzz","\\Aabc\\z",[multiline]))),
+    <<"1:.23">> = iolist_to_binary(join(re:split("1.230003938","(?>(\\.\\d\\d[1-9]?))\\d+",[trim]))),
     <<"1:.23:">> = iolist_to_binary(join(re:split("1.230003938","(?>(\\.\\d\\d[1-9]?))\\d+",[{parts,
-                                                                                                                                                                                                                            2}]))), 
-    <<"1:.23:">> = iolist_to_binary(join(re:split("1.230003938","(?>(\\.\\d\\d[1-9]?))\\d+",[]))), 
-    <<"1:.875">> = iolist_to_binary(join(re:split("1.875000282","(?>(\\.\\d\\d[1-9]?))\\d+",[trim]))), 
+                                                                                                                                                                                                                            2}]))),
+    <<"1:.23:">> = iolist_to_binary(join(re:split("1.230003938","(?>(\\.\\d\\d[1-9]?))\\d+",[]))),
+    <<"1:.875">> = iolist_to_binary(join(re:split("1.875000282","(?>(\\.\\d\\d[1-9]?))\\d+",[trim]))),
     <<"1:.875:">> = iolist_to_binary(join(re:split("1.875000282","(?>(\\.\\d\\d[1-9]?))\\d+",[{parts,
-                                                                                                                                                                                                                            2}]))), 
-    <<"1:.875:">> = iolist_to_binary(join(re:split("1.875000282","(?>(\\.\\d\\d[1-9]?))\\d+",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>(\\.\\d\\d[1-9]?))\\d+",[trim]))), 
+                                                                                                                                                                                                                            2}]))),
+    <<"1:.875:">> = iolist_to_binary(join(re:split("1.875000282","(?>(\\.\\d\\d[1-9]?))\\d+",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>(\\.\\d\\d[1-9]?))\\d+",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>(\\.\\d\\d[1-9]?))\\d+",[{parts,
-                                                                                                                                                                                                                            2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>(\\.\\d\\d[1-9]?))\\d+",[]))), 
-    <<"1.235">> = iolist_to_binary(join(re:split("1.235","(?>(\\.\\d\\d[1-9]?))\\d+",[trim]))), 
+                                                                                                                                                                                                                            2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>(\\.\\d\\d[1-9]?))\\d+",[]))),
+    <<"1.235">> = iolist_to_binary(join(re:split("1.235","(?>(\\.\\d\\d[1-9]?))\\d+",[trim]))),
     <<"1.235">> = iolist_to_binary(join(re:split("1.235","(?>(\\.\\d\\d[1-9]?))\\d+",[{parts,
-                                                                                                                                                                                                                2}]))), 
-    <<"1.235">> = iolist_to_binary(join(re:split("1.235","(?>(\\.\\d\\d[1-9]?))\\d+",[]))), 
-    <<":party">> = iolist_to_binary(join(re:split("now is the time for all good men to come to the aid of the party","^((?>\\w+)|(?>\\s+))*$",[trim]))), 
+                                                                                                                                                                                                                2}]))),
+    <<"1.235">> = iolist_to_binary(join(re:split("1.235","(?>(\\.\\d\\d[1-9]?))\\d+",[]))),
+    <<":party">> = iolist_to_binary(join(re:split("now is the time for all good men to come to the aid of the party","^((?>\\w+)|(?>\\s+))*$",[trim]))),
     <<":party:">> = iolist_to_binary(join(re:split("now is the time for all good men to come to the aid of the party","^((?>\\w+)|(?>\\s+))*$",[{parts,
-                                                                                                                                                                                                                                                                                                                               2}]))), 
-    <<":party:">> = iolist_to_binary(join(re:split("now is the time for all good men to come to the aid of the party","^((?>\\w+)|(?>\\s+))*$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^((?>\\w+)|(?>\\s+))*$",[trim]))), 
+                                                                                                                                                                                                                                                                                                                               2}]))),
+    <<":party:">> = iolist_to_binary(join(re:split("now is the time for all good men to come to the aid of the party","^((?>\\w+)|(?>\\s+))*$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^((?>\\w+)|(?>\\s+))*$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^((?>\\w+)|(?>\\s+))*$",[{parts,
-                                                                                                                                                                                                                     2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^((?>\\w+)|(?>\\s+))*$",[]))), 
-    <<"this is not a line with only words and spaces!">> = iolist_to_binary(join(re:split("this is not a line with only words and spaces!","^((?>\\w+)|(?>\\s+))*$",[trim]))), 
+                                                                                                                                                                                                                     2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^((?>\\w+)|(?>\\s+))*$",[]))),
+    <<"this is not a line with only words and spaces!">> = iolist_to_binary(join(re:split("this is not a line with only words and spaces!","^((?>\\w+)|(?>\\s+))*$",[trim]))),
     <<"this is not a line with only words and spaces!">> = iolist_to_binary(join(re:split("this is not a line with only words and spaces!","^((?>\\w+)|(?>\\s+))*$",[{parts,
-                                                                                                                                                                                                                                                                                           2}]))), 
-    <<"this is not a line with only words and spaces!">> = iolist_to_binary(join(re:split("this is not a line with only words and spaces!","^((?>\\w+)|(?>\\s+))*$",[]))), 
-    <<":12345:a">> = iolist_to_binary(join(re:split("12345a","(\\d+)(\\w)",[trim]))), 
+                                                                                                                                                                                                                                                                                           2}]))),
+    <<"this is not a line with only words and spaces!">> = iolist_to_binary(join(re:split("this is not a line with only words and spaces!","^((?>\\w+)|(?>\\s+))*$",[]))),
+    <<":12345:a">> = iolist_to_binary(join(re:split("12345a","(\\d+)(\\w)",[trim]))),
     <<":12345:a:">> = iolist_to_binary(join(re:split("12345a","(\\d+)(\\w)",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<":12345:a:">> = iolist_to_binary(join(re:split("12345a","(\\d+)(\\w)",[]))), 
-    <<":1234:5:+">> = iolist_to_binary(join(re:split("12345+","(\\d+)(\\w)",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<":12345:a:">> = iolist_to_binary(join(re:split("12345a","(\\d+)(\\w)",[]))),
+    <<":1234:5:+">> = iolist_to_binary(join(re:split("12345+","(\\d+)(\\w)",[trim]))),
     <<":1234:5:+">> = iolist_to_binary(join(re:split("12345+","(\\d+)(\\w)",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<":1234:5:+">> = iolist_to_binary(join(re:split("12345+","(\\d+)(\\w)",[]))), 
-    <<":12345:a">> = iolist_to_binary(join(re:split("12345a","((?>\\d+))(\\w)",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<":1234:5:+">> = iolist_to_binary(join(re:split("12345+","(\\d+)(\\w)",[]))),
+    <<":12345:a">> = iolist_to_binary(join(re:split("12345a","((?>\\d+))(\\w)",[trim]))),
     <<":12345:a:">> = iolist_to_binary(join(re:split("12345a","((?>\\d+))(\\w)",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<":12345:a:">> = iolist_to_binary(join(re:split("12345a","((?>\\d+))(\\w)",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?>\\d+))(\\w)",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<":12345:a:">> = iolist_to_binary(join(re:split("12345a","((?>\\d+))(\\w)",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?>\\d+))(\\w)",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?>\\d+))(\\w)",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?>\\d+))(\\w)",[]))), 
-    <<"12345+">> = iolist_to_binary(join(re:split("12345+","((?>\\d+))(\\w)",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?>\\d+))(\\w)",[]))),
+    <<"12345+">> = iolist_to_binary(join(re:split("12345+","((?>\\d+))(\\w)",[trim]))),
     <<"12345+">> = iolist_to_binary(join(re:split("12345+","((?>\\d+))(\\w)",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<"12345+">> = iolist_to_binary(join(re:split("12345+","((?>\\d+))(\\w)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaab","(?>a+)b",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<"12345+">> = iolist_to_binary(join(re:split("12345+","((?>\\d+))(\\w)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaab","(?>a+)b",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaab","(?>a+)b",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaab","(?>a+)b",[]))), 
+                                                                                                                                                                      2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaab","(?>a+)b",[]))),
     ok.
 run12() ->
-    <<":aaab">> = iolist_to_binary(join(re:split("aaab","((?>a+)b)",[trim]))), 
+    <<":aaab">> = iolist_to_binary(join(re:split("aaab","((?>a+)b)",[trim]))),
     <<":aaab:">> = iolist_to_binary(join(re:split("aaab","((?>a+)b)",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<":aaab:">> = iolist_to_binary(join(re:split("aaab","((?>a+)b)",[]))), 
-    <<":aaa">> = iolist_to_binary(join(re:split("aaab","(?>(a+))b",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<":aaab:">> = iolist_to_binary(join(re:split("aaab","((?>a+)b)",[]))),
+    <<":aaa">> = iolist_to_binary(join(re:split("aaab","(?>(a+))b",[trim]))),
     <<":aaa:">> = iolist_to_binary(join(re:split("aaab","(?>(a+))b",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<":aaa:">> = iolist_to_binary(join(re:split("aaab","(?>(a+))b",[]))), 
-    <<"aaa:ccc">> = iolist_to_binary(join(re:split("aaabbbccc","(?>b)+",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<":aaa:">> = iolist_to_binary(join(re:split("aaab","(?>(a+))b",[]))),
+    <<"aaa:ccc">> = iolist_to_binary(join(re:split("aaabbbccc","(?>b)+",[trim]))),
     <<"aaa:ccc">> = iolist_to_binary(join(re:split("aaabbbccc","(?>b)+",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<"aaa:ccc">> = iolist_to_binary(join(re:split("aaabbbccc","(?>b)+",[]))), 
-    <<"::::d">> = iolist_to_binary(join(re:split("aaabbbbccccd","(?>a+|b+|c+)*c",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<"aaa:ccc">> = iolist_to_binary(join(re:split("aaabbbccc","(?>b)+",[]))),
+    <<"::::d">> = iolist_to_binary(join(re:split("aaabbbbccccd","(?>a+|b+|c+)*c",[trim]))),
     <<":cccd">> = iolist_to_binary(join(re:split("aaabbbbccccd","(?>a+|b+|c+)*c",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<"::::d">> = iolist_to_binary(join(re:split("aaabbbbccccd","(?>a+|b+|c+)*c",[]))), 
-    <<"((:x">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<"::::d">> = iolist_to_binary(join(re:split("aaabbbbccccd","(?>a+|b+|c+)*c",[]))),
+    <<"((:x">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+",[trim]))),
     <<"((:x:">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+",[{parts,
-                                                                                                                                                                                                                                          2}]))), 
-    <<"((:x:">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+",[]))), 
-    <<":abc">> = iolist_to_binary(join(re:split("(abc)","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[trim]))), 
+                                                                                                                                                                                                                                          2}]))),
+    <<"((:x:">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+",[]))),
+    <<":abc">> = iolist_to_binary(join(re:split("(abc)","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[trim]))),
     <<":abc:">> = iolist_to_binary(join(re:split("(abc)","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[{parts,
-                                                                                                                                                                                                                              2}]))), 
-    <<":abc:">> = iolist_to_binary(join(re:split("(abc)","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[]))), 
-    <<":xyz">> = iolist_to_binary(join(re:split("(abc(def)xyz)","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[trim]))), 
+                                                                                                                                                                                                                              2}]))),
+    <<":abc:">> = iolist_to_binary(join(re:split("(abc)","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[]))),
+    <<":xyz">> = iolist_to_binary(join(re:split("(abc(def)xyz)","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[trim]))),
     <<":xyz:">> = iolist_to_binary(join(re:split("(abc(def)xyz)","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[{parts,
-                                                                                                                                                                                                                                              2}]))), 
-    <<":xyz:">> = iolist_to_binary(join(re:split("(abc(def)xyz)","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[trim]))), 
+                                                                                                                                                                                                                                              2}]))),
+    <<":xyz:">> = iolist_to_binary(join(re:split("(abc(def)xyz)","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[{parts,
-                                                                                                                                                                                                                                          2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[]))), 
-    <<"((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[trim]))), 
+                                                                                                                                                                                                                                          2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[]))),
+    <<"((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[trim]))),
     <<"((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[{parts,
-                                                                                                                                                                                                                                                                                                                    2}]))), 
-    <<"((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[]))), 
+                                                                                                                                                                                                                                                                                                                    2}]))),
+    <<"((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[]))),
     <<"">> = iolist_to_binary(join(re:split("ab","a(?-i)b",[caseless,
-                                                                                                                                                                trim]))), 
+                                                                                                                                                                trim]))),
     <<":">> = iolist_to_binary(join(re:split("ab","a(?-i)b",[caseless,
                                                                                                                                                                   {parts,
-                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ab","a(?-i)b",[caseless]))), 
+                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ab","a(?-i)b",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("Ab","a(?-i)b",[caseless,
-                                                                                                                                                                trim]))), 
+                                                                                                                                                                trim]))),
     <<":">> = iolist_to_binary(join(re:split("Ab","a(?-i)b",[caseless,
                                                                                                                                                                   {parts,
-                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("Ab","a(?-i)b",[caseless]))), 
+                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("Ab","a(?-i)b",[caseless]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?-i)b",[caseless,
-                                                                                                                                                                                  trim]))), 
+                                                                                                                                                                                  trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?-i)b",[caseless,
                                                                                                                                                                                     {parts,
-                                                                                                                                                                                     2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?-i)b",[caseless]))), 
+                                                                                                                                                                                     2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?-i)b",[caseless]))),
     <<"aB">> = iolist_to_binary(join(re:split("aB","a(?-i)b",[caseless,
-                                                                                                                                                                trim]))), 
+                                                                                                                                                                trim]))),
     <<"aB">> = iolist_to_binary(join(re:split("aB","a(?-i)b",[caseless,
                                                                                                                                                                   {parts,
-                                                                                                                                                                   2}]))), 
-    <<"aB">> = iolist_to_binary(join(re:split("aB","a(?-i)b",[caseless]))), 
+                                                                                                                                                                   2}]))),
+    <<"aB">> = iolist_to_binary(join(re:split("aB","a(?-i)b",[caseless]))),
     <<"AB">> = iolist_to_binary(join(re:split("AB","a(?-i)b",[caseless,
-                                                                                                                                                                trim]))), 
+                                                                                                                                                                trim]))),
     <<"AB">> = iolist_to_binary(join(re:split("AB","a(?-i)b",[caseless,
                                                                                                                                                                   {parts,
-                                                                                                                                                                   2}]))), 
-    <<"AB">> = iolist_to_binary(join(re:split("AB","a(?-i)b",[caseless]))), 
-    <<":a bc">> = iolist_to_binary(join(re:split("a bcd e","(a (?x)b c)d e",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<"AB">> = iolist_to_binary(join(re:split("AB","a(?-i)b",[caseless]))),
+    <<":a bc">> = iolist_to_binary(join(re:split("a bcd e","(a (?x)b c)d e",[trim]))),
     <<":a bc:">> = iolist_to_binary(join(re:split("a bcd e","(a (?x)b c)d e",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<":a bc:">> = iolist_to_binary(join(re:split("a bcd e","(a (?x)b c)d e",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a (?x)b c)d e",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<":a bc:">> = iolist_to_binary(join(re:split("a bcd e","(a (?x)b c)d e",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a (?x)b c)d e",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a (?x)b c)d e",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a (?x)b c)d e",[]))), 
-    <<"a b cd e">> = iolist_to_binary(join(re:split("a b cd e","(a (?x)b c)d e",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a (?x)b c)d e",[]))),
+    <<"a b cd e">> = iolist_to_binary(join(re:split("a b cd e","(a (?x)b c)d e",[trim]))),
     <<"a b cd e">> = iolist_to_binary(join(re:split("a b cd e","(a (?x)b c)d e",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<"a b cd e">> = iolist_to_binary(join(re:split("a b cd e","(a (?x)b c)d e",[]))), 
-    <<"abcd e">> = iolist_to_binary(join(re:split("abcd e","(a (?x)b c)d e",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<"a b cd e">> = iolist_to_binary(join(re:split("a b cd e","(a (?x)b c)d e",[]))),
+    <<"abcd e">> = iolist_to_binary(join(re:split("abcd e","(a (?x)b c)d e",[trim]))),
     <<"abcd e">> = iolist_to_binary(join(re:split("abcd e","(a (?x)b c)d e",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"abcd e">> = iolist_to_binary(join(re:split("abcd e","(a (?x)b c)d e",[]))), 
-    <<"a bcde">> = iolist_to_binary(join(re:split("a bcde","(a (?x)b c)d e",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<"abcd e">> = iolist_to_binary(join(re:split("abcd e","(a (?x)b c)d e",[]))),
+    <<"a bcde">> = iolist_to_binary(join(re:split("a bcde","(a (?x)b c)d e",[trim]))),
     <<"a bcde">> = iolist_to_binary(join(re:split("a bcde","(a (?x)b c)d e",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"a bcde">> = iolist_to_binary(join(re:split("a bcde","(a (?x)b c)d e",[]))), 
-    <<":a bcde f">> = iolist_to_binary(join(re:split("a bcde f","(a b(?x)c d (?-x)e f)",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<"a bcde">> = iolist_to_binary(join(re:split("a bcde","(a (?x)b c)d e",[]))),
+    <<":a bcde f">> = iolist_to_binary(join(re:split("a bcde f","(a b(?x)c d (?-x)e f)",[trim]))),
     <<":a bcde f:">> = iolist_to_binary(join(re:split("a bcde f","(a b(?x)c d (?-x)e f)",[{parts,
-                                                                                                                                                                                                          2}]))), 
-    <<":a bcde f:">> = iolist_to_binary(join(re:split("a bcde f","(a b(?x)c d (?-x)e f)",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a b(?x)c d (?-x)e f)",[trim]))), 
+                                                                                                                                                                                                          2}]))),
+    <<":a bcde f:">> = iolist_to_binary(join(re:split("a bcde f","(a b(?x)c d (?-x)e f)",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a b(?x)c d (?-x)e f)",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a b(?x)c d (?-x)e f)",[{parts,
-                                                                                                                                                                                                                2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a b(?x)c d (?-x)e f)",[]))), 
-    <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","(a b(?x)c d (?-x)e f)",[trim]))), 
+                                                                                                                                                                                                                2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a b(?x)c d (?-x)e f)",[]))),
+    <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","(a b(?x)c d (?-x)e f)",[trim]))),
     <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","(a b(?x)c d (?-x)e f)",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","(a b(?x)c d (?-x)e f)",[]))), 
-    <<":ab">> = iolist_to_binary(join(re:split("abc","(a(?i)b)c",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","(a b(?x)c d (?-x)e f)",[]))),
+    <<":ab">> = iolist_to_binary(join(re:split("abc","(a(?i)b)c",[trim]))),
     <<":ab:">> = iolist_to_binary(join(re:split("abc","(a(?i)b)c",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":ab:">> = iolist_to_binary(join(re:split("abc","(a(?i)b)c",[]))), 
-    <<":aB">> = iolist_to_binary(join(re:split("aBc","(a(?i)b)c",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":ab:">> = iolist_to_binary(join(re:split("abc","(a(?i)b)c",[]))),
+    <<":aB">> = iolist_to_binary(join(re:split("aBc","(a(?i)b)c",[trim]))),
     <<":aB:">> = iolist_to_binary(join(re:split("aBc","(a(?i)b)c",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":aB:">> = iolist_to_binary(join(re:split("aBc","(a(?i)b)c",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a(?i)b)c",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":aB:">> = iolist_to_binary(join(re:split("aBc","(a(?i)b)c",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a(?i)b)c",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a(?i)b)c",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a(?i)b)c",[]))), 
-    <<"abC">> = iolist_to_binary(join(re:split("abC","(a(?i)b)c",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a(?i)b)c",[]))),
+    <<"abC">> = iolist_to_binary(join(re:split("abC","(a(?i)b)c",[trim]))),
     <<"abC">> = iolist_to_binary(join(re:split("abC","(a(?i)b)c",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"abC">> = iolist_to_binary(join(re:split("abC","(a(?i)b)c",[]))), 
-    <<"aBC">> = iolist_to_binary(join(re:split("aBC","(a(?i)b)c",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"abC">> = iolist_to_binary(join(re:split("abC","(a(?i)b)c",[]))),
+    <<"aBC">> = iolist_to_binary(join(re:split("aBC","(a(?i)b)c",[trim]))),
     <<"aBC">> = iolist_to_binary(join(re:split("aBC","(a(?i)b)c",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"aBC">> = iolist_to_binary(join(re:split("aBC","(a(?i)b)c",[]))), 
-    <<"Abc">> = iolist_to_binary(join(re:split("Abc","(a(?i)b)c",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"aBC">> = iolist_to_binary(join(re:split("aBC","(a(?i)b)c",[]))),
+    <<"Abc">> = iolist_to_binary(join(re:split("Abc","(a(?i)b)c",[trim]))),
     <<"Abc">> = iolist_to_binary(join(re:split("Abc","(a(?i)b)c",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"Abc">> = iolist_to_binary(join(re:split("Abc","(a(?i)b)c",[]))), 
-    <<"ABc">> = iolist_to_binary(join(re:split("ABc","(a(?i)b)c",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"Abc">> = iolist_to_binary(join(re:split("Abc","(a(?i)b)c",[]))),
+    <<"ABc">> = iolist_to_binary(join(re:split("ABc","(a(?i)b)c",[trim]))),
     <<"ABc">> = iolist_to_binary(join(re:split("ABc","(a(?i)b)c",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"ABc">> = iolist_to_binary(join(re:split("ABc","(a(?i)b)c",[]))), 
-    <<"ABC">> = iolist_to_binary(join(re:split("ABC","(a(?i)b)c",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"ABc">> = iolist_to_binary(join(re:split("ABc","(a(?i)b)c",[]))),
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","(a(?i)b)c",[trim]))),
     <<"ABC">> = iolist_to_binary(join(re:split("ABC","(a(?i)b)c",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"ABC">> = iolist_to_binary(join(re:split("ABC","(a(?i)b)c",[]))), 
-    <<"AbC">> = iolist_to_binary(join(re:split("AbC","(a(?i)b)c",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","(a(?i)b)c",[]))),
+    <<"AbC">> = iolist_to_binary(join(re:split("AbC","(a(?i)b)c",[trim]))),
     <<"AbC">> = iolist_to_binary(join(re:split("AbC","(a(?i)b)c",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"AbC">> = iolist_to_binary(join(re:split("AbC","(a(?i)b)c",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","a(?i:b)c",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"AbC">> = iolist_to_binary(join(re:split("AbC","(a(?i)b)c",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","a(?i:b)c",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","a(?i:b)c",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","a(?i:b)c",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aBc","a(?i:b)c",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","a(?i:b)c",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aBc","a(?i:b)c",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aBc","a(?i:b)c",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aBc","a(?i:b)c",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?i:b)c",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aBc","a(?i:b)c",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?i:b)c",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?i:b)c",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?i:b)c",[]))), 
-    <<"ABC">> = iolist_to_binary(join(re:split("ABC","a(?i:b)c",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?i:b)c",[]))),
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","a(?i:b)c",[trim]))),
     <<"ABC">> = iolist_to_binary(join(re:split("ABC","a(?i:b)c",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<"ABC">> = iolist_to_binary(join(re:split("ABC","a(?i:b)c",[]))), 
-    <<"abC">> = iolist_to_binary(join(re:split("abC","a(?i:b)c",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","a(?i:b)c",[]))),
+    <<"abC">> = iolist_to_binary(join(re:split("abC","a(?i:b)c",[trim]))),
     <<"abC">> = iolist_to_binary(join(re:split("abC","a(?i:b)c",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<"abC">> = iolist_to_binary(join(re:split("abC","a(?i:b)c",[]))), 
-    <<"aBC">> = iolist_to_binary(join(re:split("aBC","a(?i:b)c",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<"abC">> = iolist_to_binary(join(re:split("abC","a(?i:b)c",[]))),
+    <<"aBC">> = iolist_to_binary(join(re:split("aBC","a(?i:b)c",[trim]))),
     <<"aBC">> = iolist_to_binary(join(re:split("aBC","a(?i:b)c",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<"aBC">> = iolist_to_binary(join(re:split("aBC","a(?i:b)c",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aBc","a(?i:b)*c",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<"aBC">> = iolist_to_binary(join(re:split("aBC","a(?i:b)c",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aBc","a(?i:b)*c",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aBc","a(?i:b)*c",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aBc","a(?i:b)*c",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aBBc","a(?i:b)*c",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aBc","a(?i:b)*c",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aBBc","a(?i:b)*c",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aBBc","a(?i:b)*c",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aBBc","a(?i:b)*c",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?i:b)*c",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aBBc","a(?i:b)*c",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?i:b)*c",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?i:b)*c",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?i:b)*c",[]))), 
-    <<"aBC">> = iolist_to_binary(join(re:split("aBC","a(?i:b)*c",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?i:b)*c",[]))),
+    <<"aBC">> = iolist_to_binary(join(re:split("aBC","a(?i:b)*c",[trim]))),
     <<"aBC">> = iolist_to_binary(join(re:split("aBC","a(?i:b)*c",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"aBC">> = iolist_to_binary(join(re:split("aBC","a(?i:b)*c",[]))), 
-    <<"aBBC">> = iolist_to_binary(join(re:split("aBBC","a(?i:b)*c",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"aBC">> = iolist_to_binary(join(re:split("aBC","a(?i:b)*c",[]))),
+    <<"aBBC">> = iolist_to_binary(join(re:split("aBBC","a(?i:b)*c",[trim]))),
     <<"aBBC">> = iolist_to_binary(join(re:split("aBBC","a(?i:b)*c",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<"aBBC">> = iolist_to_binary(join(re:split("aBBC","a(?i:b)*c",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abcd","a(?=b(?i)c)\\w\\wd",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<"aBBC">> = iolist_to_binary(join(re:split("aBBC","a(?i:b)*c",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abcd","a(?=b(?i)c)\\w\\wd",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abcd","a(?=b(?i)c)\\w\\wd",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abcd","a(?=b(?i)c)\\w\\wd",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abCd","a(?=b(?i)c)\\w\\wd",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abcd","a(?=b(?i)c)\\w\\wd",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abCd","a(?=b(?i)c)\\w\\wd",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abCd","a(?=b(?i)c)\\w\\wd",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abCd","a(?=b(?i)c)\\w\\wd",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?=b(?i)c)\\w\\wd",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abCd","a(?=b(?i)c)\\w\\wd",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?=b(?i)c)\\w\\wd",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?=b(?i)c)\\w\\wd",[{parts,
-                                                                                                                                                                                                            2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?=b(?i)c)\\w\\wd",[]))), 
-    <<"aBCd">> = iolist_to_binary(join(re:split("aBCd","a(?=b(?i)c)\\w\\wd",[trim]))), 
+                                                                                                                                                                                                            2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?=b(?i)c)\\w\\wd",[]))),
+    <<"aBCd">> = iolist_to_binary(join(re:split("aBCd","a(?=b(?i)c)\\w\\wd",[trim]))),
     <<"aBCd">> = iolist_to_binary(join(re:split("aBCd","a(?=b(?i)c)\\w\\wd",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"aBCd">> = iolist_to_binary(join(re:split("aBCd","a(?=b(?i)c)\\w\\wd",[]))), 
-    <<"abcD">> = iolist_to_binary(join(re:split("abcD","a(?=b(?i)c)\\w\\wd",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<"aBCd">> = iolist_to_binary(join(re:split("aBCd","a(?=b(?i)c)\\w\\wd",[]))),
+    <<"abcD">> = iolist_to_binary(join(re:split("abcD","a(?=b(?i)c)\\w\\wd",[trim]))),
     <<"abcD">> = iolist_to_binary(join(re:split("abcD","a(?=b(?i)c)\\w\\wd",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"abcD">> = iolist_to_binary(join(re:split("abcD","a(?=b(?i)c)\\w\\wd",[]))), 
+                                                                                                                                                                                              2}]))),
+    <<"abcD">> = iolist_to_binary(join(re:split("abcD","a(?=b(?i)c)\\w\\wd",[]))),
     <<"">> = iolist_to_binary(join(re:split("more than million","(?s-i:more.*than).*million",[caseless,
-                                                                                                                                                                                                                                    trim]))), 
+                                                                                                                                                                                                                                    trim]))),
     <<":">> = iolist_to_binary(join(re:split("more than million","(?s-i:more.*than).*million",[caseless,
                                                                                                                                                                                                                                       {parts,
-                                                                                                                                                                                                                                       2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("more than million","(?s-i:more.*than).*million",[caseless]))), 
+                                                                                                                                                                                                                                       2}]))),
+    <<":">> = iolist_to_binary(join(re:split("more than million","(?s-i:more.*than).*million",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("more than MILLION","(?s-i:more.*than).*million",[caseless,
-                                                                                                                                                                                                                                    trim]))), 
+                                                                                                                                                                                                                                    trim]))),
     <<":">> = iolist_to_binary(join(re:split("more than MILLION","(?s-i:more.*than).*million",[caseless,
                                                                                                                                                                                                                                       {parts,
-                                                                                                                                                                                                                                       2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("more than MILLION","(?s-i:more.*than).*million",[caseless]))), 
+                                                                                                                                                                                                                                       2}]))),
+    <<":">> = iolist_to_binary(join(re:split("more than MILLION","(?s-i:more.*than).*million",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("more 
- than Million","(?s-i:more.*than).*million",[caseless,trim]))), 
+ than Million","(?s-i:more.*than).*million",[caseless,trim]))),
     <<":">> = iolist_to_binary(join(re:split("more 
- than Million","(?s-i:more.*than).*million",[caseless,{parts,2}]))), 
+ than Million","(?s-i:more.*than).*million",[caseless,{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("more 
- than Million","(?s-i:more.*than).*million",[caseless]))), 
+ than Million","(?s-i:more.*than).*million",[caseless]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s-i:more.*than).*million",[caseless,
-                                                                                                                                                                                                                        trim]))), 
+                                                                                                                                                                                                                        trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s-i:more.*than).*million",[caseless,
                                                                                                                                                                                                                           {parts,
-                                                                                                                                                                                                                           2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s-i:more.*than).*million",[caseless]))), 
+                                                                                                                                                                                                                           2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s-i:more.*than).*million",[caseless]))),
     <<"MORE THAN MILLION">> = iolist_to_binary(join(re:split("MORE THAN MILLION","(?s-i:more.*than).*million",[caseless,
-                                                                                                                                                                                                                                    trim]))), 
+                                                                                                                                                                                                                                    trim]))),
     <<"MORE THAN MILLION">> = iolist_to_binary(join(re:split("MORE THAN MILLION","(?s-i:more.*than).*million",[caseless,
                                                                                                                                                                                                                                       {parts,
-                                                                                                                                                                                                                                       2}]))), 
-    <<"MORE THAN MILLION">> = iolist_to_binary(join(re:split("MORE THAN MILLION","(?s-i:more.*than).*million",[caseless]))), 
+                                                                                                                                                                                                                                       2}]))),
+    <<"MORE THAN MILLION">> = iolist_to_binary(join(re:split("MORE THAN MILLION","(?s-i:more.*than).*million",[caseless]))),
     <<"more 
  than 
  million">> = iolist_to_binary(join(re:split("more 
  than 
- million","(?s-i:more.*than).*million",[caseless,trim]))), 
+ million","(?s-i:more.*than).*million",[caseless,trim]))),
     <<"more 
  than 
  million">> = iolist_to_binary(join(re:split("more 
  than 
- million","(?s-i:more.*than).*million",[caseless,{parts,2}]))), 
+ million","(?s-i:more.*than).*million",[caseless,{parts,2}]))),
     <<"more 
  than 
  million">> = iolist_to_binary(join(re:split("more 
  than 
- million","(?s-i:more.*than).*million",[caseless]))), 
+ million","(?s-i:more.*than).*million",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("more than million","(?:(?s-i)more.*than).*million",[caseless,
-                                                                                                                                                                                                                                          trim]))), 
+                                                                                                                                                                                                                                          trim]))),
     <<":">> = iolist_to_binary(join(re:split("more than million","(?:(?s-i)more.*than).*million",[caseless,
                                                                                                                                                                                                                                             {parts,
-                                                                                                                                                                                                                                             2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("more than million","(?:(?s-i)more.*than).*million",[caseless]))), 
+                                                                                                                                                                                                                                             2}]))),
+    <<":">> = iolist_to_binary(join(re:split("more than million","(?:(?s-i)more.*than).*million",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("more than MILLION","(?:(?s-i)more.*than).*million",[caseless,
-                                                                                                                                                                                                                                          trim]))), 
+                                                                                                                                                                                                                                          trim]))),
     <<":">> = iolist_to_binary(join(re:split("more than MILLION","(?:(?s-i)more.*than).*million",[caseless,
                                                                                                                                                                                                                                             {parts,
-                                                                                                                                                                                                                                             2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("more than MILLION","(?:(?s-i)more.*than).*million",[caseless]))), 
+                                                                                                                                                                                                                                             2}]))),
+    <<":">> = iolist_to_binary(join(re:split("more than MILLION","(?:(?s-i)more.*than).*million",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("more 
- than Million","(?:(?s-i)more.*than).*million",[caseless,trim]))), 
+ than Million","(?:(?s-i)more.*than).*million",[caseless,trim]))),
     <<":">> = iolist_to_binary(join(re:split("more 
- than Million","(?:(?s-i)more.*than).*million",[caseless,{parts,2}]))), 
+ than Million","(?:(?s-i)more.*than).*million",[caseless,{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("more 
- than Million","(?:(?s-i)more.*than).*million",[caseless]))), 
+ than Million","(?:(?s-i)more.*than).*million",[caseless]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?s-i)more.*than).*million",[caseless,
-                                                                                                                                                                                                                              trim]))), 
+                                                                                                                                                                                                                              trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?s-i)more.*than).*million",[caseless,
                                                                                                                                                                                                                                 {parts,
-                                                                                                                                                                                                                                 2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?s-i)more.*than).*million",[caseless]))), 
+                                                                                                                                                                                                                                 2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?s-i)more.*than).*million",[caseless]))),
     <<"MORE THAN MILLION">> = iolist_to_binary(join(re:split("MORE THAN MILLION","(?:(?s-i)more.*than).*million",[caseless,
-                                                                                                                                                                                                                                          trim]))), 
+                                                                                                                                                                                                                                          trim]))),
     <<"MORE THAN MILLION">> = iolist_to_binary(join(re:split("MORE THAN MILLION","(?:(?s-i)more.*than).*million",[caseless,
                                                                                                                                                                                                                                             {parts,
-                                                                                                                                                                                                                                             2}]))), 
-    <<"MORE THAN MILLION">> = iolist_to_binary(join(re:split("MORE THAN MILLION","(?:(?s-i)more.*than).*million",[caseless]))), 
+                                                                                                                                                                                                                                             2}]))),
+    <<"MORE THAN MILLION">> = iolist_to_binary(join(re:split("MORE THAN MILLION","(?:(?s-i)more.*than).*million",[caseless]))),
     <<"more 
  than 
  million">> = iolist_to_binary(join(re:split("more 
  than 
- million","(?:(?s-i)more.*than).*million",[caseless,trim]))), 
+ million","(?:(?s-i)more.*than).*million",[caseless,trim]))),
     <<"more 
  than 
  million">> = iolist_to_binary(join(re:split("more 
  than 
- million","(?:(?s-i)more.*than).*million",[caseless,{parts,2}]))), 
+ million","(?:(?s-i)more.*than).*million",[caseless,{parts,2}]))),
     <<"more 
  than 
  million">> = iolist_to_binary(join(re:split("more 
  than 
- million","(?:(?s-i)more.*than).*million",[caseless]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","(?>a(?i)b+)+c",[trim]))), 
+ million","(?:(?s-i)more.*than).*million",[caseless]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","(?>a(?i)b+)+c",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","(?>a(?i)b+)+c",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","(?>a(?i)b+)+c",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aBbc","(?>a(?i)b+)+c",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","(?>a(?i)b+)+c",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aBbc","(?>a(?i)b+)+c",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aBbc","(?>a(?i)b+)+c",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aBbc","(?>a(?i)b+)+c",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aBBc","(?>a(?i)b+)+c",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aBbc","(?>a(?i)b+)+c",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aBBc","(?>a(?i)b+)+c",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aBBc","(?>a(?i)b+)+c",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aBBc","(?>a(?i)b+)+c",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>a(?i)b+)+c",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aBBc","(?>a(?i)b+)+c",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>a(?i)b+)+c",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>a(?i)b+)+c",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>a(?i)b+)+c",[]))), 
-    <<"Abc">> = iolist_to_binary(join(re:split("Abc","(?>a(?i)b+)+c",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>a(?i)b+)+c",[]))),
+    <<"Abc">> = iolist_to_binary(join(re:split("Abc","(?>a(?i)b+)+c",[trim]))),
     <<"Abc">> = iolist_to_binary(join(re:split("Abc","(?>a(?i)b+)+c",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<"Abc">> = iolist_to_binary(join(re:split("Abc","(?>a(?i)b+)+c",[]))), 
-    <<"abAb">> = iolist_to_binary(join(re:split("abAb","(?>a(?i)b+)+c",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<"Abc">> = iolist_to_binary(join(re:split("Abc","(?>a(?i)b+)+c",[]))),
+    <<"abAb">> = iolist_to_binary(join(re:split("abAb","(?>a(?i)b+)+c",[trim]))),
     <<"abAb">> = iolist_to_binary(join(re:split("abAb","(?>a(?i)b+)+c",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"abAb">> = iolist_to_binary(join(re:split("abAb","(?>a(?i)b+)+c",[]))), 
-    <<"abbC">> = iolist_to_binary(join(re:split("abbC","(?>a(?i)b+)+c",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"abAb">> = iolist_to_binary(join(re:split("abAb","(?>a(?i)b+)+c",[]))),
+    <<"abbC">> = iolist_to_binary(join(re:split("abbC","(?>a(?i)b+)+c",[trim]))),
     <<"abbC">> = iolist_to_binary(join(re:split("abbC","(?>a(?i)b+)+c",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"abbC">> = iolist_to_binary(join(re:split("abbC","(?>a(?i)b+)+c",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","(?=a(?i)b)\\w\\wc",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"abbC">> = iolist_to_binary(join(re:split("abbC","(?>a(?i)b+)+c",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","(?=a(?i)b)\\w\\wc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","(?=a(?i)b)\\w\\wc",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","(?=a(?i)b)\\w\\wc",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aBc","(?=a(?i)b)\\w\\wc",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","(?=a(?i)b)\\w\\wc",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aBc","(?=a(?i)b)\\w\\wc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aBc","(?=a(?i)b)\\w\\wc",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aBc","(?=a(?i)b)\\w\\wc",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?=a(?i)b)\\w\\wc",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aBc","(?=a(?i)b)\\w\\wc",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?=a(?i)b)\\w\\wc",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?=a(?i)b)\\w\\wc",[{parts,
-                                                                                                                                                                                                          2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?=a(?i)b)\\w\\wc",[]))), 
-    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?=a(?i)b)\\w\\wc",[trim]))), 
+                                                                                                                                                                                                          2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?=a(?i)b)\\w\\wc",[]))),
+    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?=a(?i)b)\\w\\wc",[trim]))),
     <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?=a(?i)b)\\w\\wc",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?=a(?i)b)\\w\\wc",[]))), 
-    <<"abC">> = iolist_to_binary(join(re:split("abC","(?=a(?i)b)\\w\\wc",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?=a(?i)b)\\w\\wc",[]))),
+    <<"abC">> = iolist_to_binary(join(re:split("abC","(?=a(?i)b)\\w\\wc",[trim]))),
     <<"abC">> = iolist_to_binary(join(re:split("abC","(?=a(?i)b)\\w\\wc",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<"abC">> = iolist_to_binary(join(re:split("abC","(?=a(?i)b)\\w\\wc",[]))), 
-    <<"aBC">> = iolist_to_binary(join(re:split("aBC","(?=a(?i)b)\\w\\wc",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<"abC">> = iolist_to_binary(join(re:split("abC","(?=a(?i)b)\\w\\wc",[]))),
+    <<"aBC">> = iolist_to_binary(join(re:split("aBC","(?=a(?i)b)\\w\\wc",[trim]))),
     <<"aBC">> = iolist_to_binary(join(re:split("aBC","(?=a(?i)b)\\w\\wc",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<"aBC">> = iolist_to_binary(join(re:split("aBC","(?=a(?i)b)\\w\\wc",[]))), 
-    <<"ab:xx">> = iolist_to_binary(join(re:split("abxxc","(?<=a(?i)b)(\\w\\w)c",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<"aBC">> = iolist_to_binary(join(re:split("aBC","(?=a(?i)b)\\w\\wc",[]))),
+    <<"ab:xx">> = iolist_to_binary(join(re:split("abxxc","(?<=a(?i)b)(\\w\\w)c",[trim]))),
     <<"ab:xx:">> = iolist_to_binary(join(re:split("abxxc","(?<=a(?i)b)(\\w\\w)c",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<"ab:xx:">> = iolist_to_binary(join(re:split("abxxc","(?<=a(?i)b)(\\w\\w)c",[]))), 
-    <<"aB:xx">> = iolist_to_binary(join(re:split("aBxxc","(?<=a(?i)b)(\\w\\w)c",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<"ab:xx:">> = iolist_to_binary(join(re:split("abxxc","(?<=a(?i)b)(\\w\\w)c",[]))),
+    <<"aB:xx">> = iolist_to_binary(join(re:split("aBxxc","(?<=a(?i)b)(\\w\\w)c",[trim]))),
     <<"aB:xx:">> = iolist_to_binary(join(re:split("aBxxc","(?<=a(?i)b)(\\w\\w)c",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<"aB:xx:">> = iolist_to_binary(join(re:split("aBxxc","(?<=a(?i)b)(\\w\\w)c",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=a(?i)b)(\\w\\w)c",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<"aB:xx:">> = iolist_to_binary(join(re:split("aBxxc","(?<=a(?i)b)(\\w\\w)c",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=a(?i)b)(\\w\\w)c",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=a(?i)b)(\\w\\w)c",[{parts,
-                                                                                                                                                                                                                2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=a(?i)b)(\\w\\w)c",[]))), 
-    <<"Abxxc">> = iolist_to_binary(join(re:split("Abxxc","(?<=a(?i)b)(\\w\\w)c",[trim]))), 
+                                                                                                                                                                                                                2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=a(?i)b)(\\w\\w)c",[]))),
+    <<"Abxxc">> = iolist_to_binary(join(re:split("Abxxc","(?<=a(?i)b)(\\w\\w)c",[trim]))),
     <<"Abxxc">> = iolist_to_binary(join(re:split("Abxxc","(?<=a(?i)b)(\\w\\w)c",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<"Abxxc">> = iolist_to_binary(join(re:split("Abxxc","(?<=a(?i)b)(\\w\\w)c",[]))), 
-    <<"ABxxc">> = iolist_to_binary(join(re:split("ABxxc","(?<=a(?i)b)(\\w\\w)c",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<"Abxxc">> = iolist_to_binary(join(re:split("Abxxc","(?<=a(?i)b)(\\w\\w)c",[]))),
+    <<"ABxxc">> = iolist_to_binary(join(re:split("ABxxc","(?<=a(?i)b)(\\w\\w)c",[trim]))),
     <<"ABxxc">> = iolist_to_binary(join(re:split("ABxxc","(?<=a(?i)b)(\\w\\w)c",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<"ABxxc">> = iolist_to_binary(join(re:split("ABxxc","(?<=a(?i)b)(\\w\\w)c",[]))), 
-    <<"abxxC">> = iolist_to_binary(join(re:split("abxxC","(?<=a(?i)b)(\\w\\w)c",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<"ABxxc">> = iolist_to_binary(join(re:split("ABxxc","(?<=a(?i)b)(\\w\\w)c",[]))),
+    <<"abxxC">> = iolist_to_binary(join(re:split("abxxC","(?<=a(?i)b)(\\w\\w)c",[trim]))),
     <<"abxxC">> = iolist_to_binary(join(re:split("abxxC","(?<=a(?i)b)(\\w\\w)c",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<"abxxC">> = iolist_to_binary(join(re:split("abxxC","(?<=a(?i)b)(\\w\\w)c",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aA","(?:(a)|b)(?(1)A|B)",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<"abxxC">> = iolist_to_binary(join(re:split("abxxC","(?<=a(?i)b)(\\w\\w)c",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aA","(?:(a)|b)(?(1)A|B)",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aA","(?:(a)|b)(?(1)A|B)",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aA","(?:(a)|b)(?(1)A|B)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("bB","(?:(a)|b)(?(1)A|B)",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aA","(?:(a)|b)(?(1)A|B)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("bB","(?:(a)|b)(?(1)A|B)",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("bB","(?:(a)|b)(?(1)A|B)",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("bB","(?:(a)|b)(?(1)A|B)",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(a)|b)(?(1)A|B)",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("bB","(?:(a)|b)(?(1)A|B)",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(a)|b)(?(1)A|B)",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(a)|b)(?(1)A|B)",[{parts,
-                                                                                                                                                                                                          2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(a)|b)(?(1)A|B)",[]))), 
-    <<"aB">> = iolist_to_binary(join(re:split("aB","(?:(a)|b)(?(1)A|B)",[trim]))), 
+                                                                                                                                                                                                          2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(a)|b)(?(1)A|B)",[]))),
+    <<"aB">> = iolist_to_binary(join(re:split("aB","(?:(a)|b)(?(1)A|B)",[trim]))),
     <<"aB">> = iolist_to_binary(join(re:split("aB","(?:(a)|b)(?(1)A|B)",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"aB">> = iolist_to_binary(join(re:split("aB","(?:(a)|b)(?(1)A|B)",[]))), 
-    <<"bA">> = iolist_to_binary(join(re:split("bA","(?:(a)|b)(?(1)A|B)",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<"aB">> = iolist_to_binary(join(re:split("aB","(?:(a)|b)(?(1)A|B)",[]))),
+    <<"bA">> = iolist_to_binary(join(re:split("bA","(?:(a)|b)(?(1)A|B)",[trim]))),
     <<"bA">> = iolist_to_binary(join(re:split("bA","(?:(a)|b)(?(1)A|B)",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"bA">> = iolist_to_binary(join(re:split("bA","(?:(a)|b)(?(1)A|B)",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aa","^(a)?(?(1)a|b)+$",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<"bA">> = iolist_to_binary(join(re:split("bA","(?:(a)|b)(?(1)A|B)",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aa","^(a)?(?(1)a|b)+$",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aa","^(a)?(?(1)a|b)+$",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aa","^(a)?(?(1)a|b)+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("b","^(a)?(?(1)a|b)+$",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aa","^(a)?(?(1)a|b)+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("b","^(a)?(?(1)a|b)+$",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("b","^(a)?(?(1)a|b)+$",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("b","^(a)?(?(1)a|b)+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("bb","^(a)?(?(1)a|b)+$",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("b","^(a)?(?(1)a|b)+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("bb","^(a)?(?(1)a|b)+$",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("bb","^(a)?(?(1)a|b)+$",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("bb","^(a)?(?(1)a|b)+$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a)?(?(1)a|b)+$",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("bb","^(a)?(?(1)a|b)+$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a)?(?(1)a|b)+$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a)?(?(1)a|b)+$",[{parts,
-                                                                                                                                                                                                       2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a)?(?(1)a|b)+$",[]))), 
-    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a)?(?(1)a|b)+$",[trim]))), 
+                                                                                                                                                                                                       2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a)?(?(1)a|b)+$",[]))),
+    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a)?(?(1)a|b)+$",[trim]))),
     <<"ab">> = iolist_to_binary(join(re:split("ab","^(a)?(?(1)a|b)+$",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a)?(?(1)a|b)+$",[]))), 
+                                                                                                                                                                                     2}]))),
+    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a)?(?(1)a|b)+$",[]))),
     ok.
 run13() ->
-    <<"">> = iolist_to_binary(join(re:split("abc:","^(?(?=abc)\\w{3}:|\\d\\d)$",[trim]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc:","^(?(?=abc)\\w{3}:|\\d\\d)$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc:","^(?(?=abc)\\w{3}:|\\d\\d)$",[{parts,
-                                                                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc:","^(?(?=abc)\\w{3}:|\\d\\d)$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("12","^(?(?=abc)\\w{3}:|\\d\\d)$",[trim]))), 
+                                                                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc:","^(?(?=abc)\\w{3}:|\\d\\d)$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("12","^(?(?=abc)\\w{3}:|\\d\\d)$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("12","^(?(?=abc)\\w{3}:|\\d\\d)$",[{parts,
-                                                                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("12","^(?(?=abc)\\w{3}:|\\d\\d)$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(?=abc)\\w{3}:|\\d\\d)$",[trim]))), 
+                                                                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("12","^(?(?=abc)\\w{3}:|\\d\\d)$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(?=abc)\\w{3}:|\\d\\d)$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(?=abc)\\w{3}:|\\d\\d)$",[{parts,
-                                                                                                                                                                                                                              2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(?=abc)\\w{3}:|\\d\\d)$",[]))), 
-    <<"123">> = iolist_to_binary(join(re:split("123","^(?(?=abc)\\w{3}:|\\d\\d)$",[trim]))), 
+                                                                                                                                                                                                                              2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(?=abc)\\w{3}:|\\d\\d)$",[]))),
+    <<"123">> = iolist_to_binary(join(re:split("123","^(?(?=abc)\\w{3}:|\\d\\d)$",[trim]))),
     <<"123">> = iolist_to_binary(join(re:split("123","^(?(?=abc)\\w{3}:|\\d\\d)$",[{parts,
-                                                                                                                                                                                                              2}]))), 
-    <<"123">> = iolist_to_binary(join(re:split("123","^(?(?=abc)\\w{3}:|\\d\\d)$",[]))), 
-    <<"xyz">> = iolist_to_binary(join(re:split("xyz","^(?(?=abc)\\w{3}:|\\d\\d)$",[trim]))), 
+                                                                                                                                                                                                              2}]))),
+    <<"123">> = iolist_to_binary(join(re:split("123","^(?(?=abc)\\w{3}:|\\d\\d)$",[]))),
+    <<"xyz">> = iolist_to_binary(join(re:split("xyz","^(?(?=abc)\\w{3}:|\\d\\d)$",[trim]))),
     <<"xyz">> = iolist_to_binary(join(re:split("xyz","^(?(?=abc)\\w{3}:|\\d\\d)$",[{parts,
-                                                                                                                                                                                                              2}]))), 
-    <<"xyz">> = iolist_to_binary(join(re:split("xyz","^(?(?=abc)\\w{3}:|\\d\\d)$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc:","^(?(?!abc)\\d\\d|\\w{3}:)$",[trim]))), 
+                                                                                                                                                                                                              2}]))),
+    <<"xyz">> = iolist_to_binary(join(re:split("xyz","^(?(?=abc)\\w{3}:|\\d\\d)$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc:","^(?(?!abc)\\d\\d|\\w{3}:)$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc:","^(?(?!abc)\\d\\d|\\w{3}:)$",[{parts,
-                                                                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc:","^(?(?!abc)\\d\\d|\\w{3}:)$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("12","^(?(?!abc)\\d\\d|\\w{3}:)$",[trim]))), 
+                                                                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc:","^(?(?!abc)\\d\\d|\\w{3}:)$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("12","^(?(?!abc)\\d\\d|\\w{3}:)$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("12","^(?(?!abc)\\d\\d|\\w{3}:)$",[{parts,
-                                                                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("12","^(?(?!abc)\\d\\d|\\w{3}:)$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(?!abc)\\d\\d|\\w{3}:)$",[trim]))), 
+                                                                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("12","^(?(?!abc)\\d\\d|\\w{3}:)$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(?!abc)\\d\\d|\\w{3}:)$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(?!abc)\\d\\d|\\w{3}:)$",[{parts,
-                                                                                                                                                                                                                              2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(?!abc)\\d\\d|\\w{3}:)$",[]))), 
-    <<"123">> = iolist_to_binary(join(re:split("123","^(?(?!abc)\\d\\d|\\w{3}:)$",[trim]))), 
+                                                                                                                                                                                                                              2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(?!abc)\\d\\d|\\w{3}:)$",[]))),
+    <<"123">> = iolist_to_binary(join(re:split("123","^(?(?!abc)\\d\\d|\\w{3}:)$",[trim]))),
     <<"123">> = iolist_to_binary(join(re:split("123","^(?(?!abc)\\d\\d|\\w{3}:)$",[{parts,
-                                                                                                                                                                                                              2}]))), 
-    <<"123">> = iolist_to_binary(join(re:split("123","^(?(?!abc)\\d\\d|\\w{3}:)$",[]))), 
-    <<"xyz">> = iolist_to_binary(join(re:split("xyz","^(?(?!abc)\\d\\d|\\w{3}:)$",[trim]))), 
+                                                                                                                                                                                                              2}]))),
+    <<"123">> = iolist_to_binary(join(re:split("123","^(?(?!abc)\\d\\d|\\w{3}:)$",[]))),
+    <<"xyz">> = iolist_to_binary(join(re:split("xyz","^(?(?!abc)\\d\\d|\\w{3}:)$",[trim]))),
     <<"xyz">> = iolist_to_binary(join(re:split("xyz","^(?(?!abc)\\d\\d|\\w{3}:)$",[{parts,
-                                                                                                                                                                                                              2}]))), 
-    <<"xyz">> = iolist_to_binary(join(re:split("xyz","^(?(?!abc)\\d\\d|\\w{3}:)$",[]))), 
-    <<"foo">> = iolist_to_binary(join(re:split("foobar","(?(?<=foo)bar|cat)",[trim]))), 
+                                                                                                                                                                                                              2}]))),
+    <<"xyz">> = iolist_to_binary(join(re:split("xyz","^(?(?!abc)\\d\\d|\\w{3}:)$",[]))),
+    <<"foo">> = iolist_to_binary(join(re:split("foobar","(?(?<=foo)bar|cat)",[trim]))),
     <<"foo:">> = iolist_to_binary(join(re:split("foobar","(?(?<=foo)bar|cat)",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"foo:">> = iolist_to_binary(join(re:split("foobar","(?(?<=foo)bar|cat)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("cat","(?(?<=foo)bar|cat)",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<"foo:">> = iolist_to_binary(join(re:split("foobar","(?(?<=foo)bar|cat)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("cat","(?(?<=foo)bar|cat)",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("cat","(?(?<=foo)bar|cat)",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("cat","(?(?<=foo)bar|cat)",[]))), 
-    <<"f">> = iolist_to_binary(join(re:split("fcat","(?(?<=foo)bar|cat)",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<":">> = iolist_to_binary(join(re:split("cat","(?(?<=foo)bar|cat)",[]))),
+    <<"f">> = iolist_to_binary(join(re:split("fcat","(?(?<=foo)bar|cat)",[trim]))),
     <<"f:">> = iolist_to_binary(join(re:split("fcat","(?(?<=foo)bar|cat)",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<"f:">> = iolist_to_binary(join(re:split("fcat","(?(?<=foo)bar|cat)",[]))), 
-    <<"fo">> = iolist_to_binary(join(re:split("focat","(?(?<=foo)bar|cat)",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<"f:">> = iolist_to_binary(join(re:split("fcat","(?(?<=foo)bar|cat)",[]))),
+    <<"fo">> = iolist_to_binary(join(re:split("focat","(?(?<=foo)bar|cat)",[trim]))),
     <<"fo:">> = iolist_to_binary(join(re:split("focat","(?(?<=foo)bar|cat)",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"fo:">> = iolist_to_binary(join(re:split("focat","(?(?<=foo)bar|cat)",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?<=foo)bar|cat)",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<"fo:">> = iolist_to_binary(join(re:split("focat","(?(?<=foo)bar|cat)",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?<=foo)bar|cat)",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?<=foo)bar|cat)",[{parts,
-                                                                                                                                                                                                          2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?<=foo)bar|cat)",[]))), 
-    <<"foocat">> = iolist_to_binary(join(re:split("foocat","(?(?<=foo)bar|cat)",[trim]))), 
+                                                                                                                                                                                                          2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?<=foo)bar|cat)",[]))),
+    <<"foocat">> = iolist_to_binary(join(re:split("foocat","(?(?<=foo)bar|cat)",[trim]))),
     <<"foocat">> = iolist_to_binary(join(re:split("foocat","(?(?<=foo)bar|cat)",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"foocat">> = iolist_to_binary(join(re:split("foocat","(?(?<=foo)bar|cat)",[]))), 
-    <<"foo">> = iolist_to_binary(join(re:split("foobar","(?(?<!foo)cat|bar)",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<"foocat">> = iolist_to_binary(join(re:split("foocat","(?(?<=foo)bar|cat)",[]))),
+    <<"foo">> = iolist_to_binary(join(re:split("foobar","(?(?<!foo)cat|bar)",[trim]))),
     <<"foo:">> = iolist_to_binary(join(re:split("foobar","(?(?<!foo)cat|bar)",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"foo:">> = iolist_to_binary(join(re:split("foobar","(?(?<!foo)cat|bar)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("cat","(?(?<!foo)cat|bar)",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<"foo:">> = iolist_to_binary(join(re:split("foobar","(?(?<!foo)cat|bar)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("cat","(?(?<!foo)cat|bar)",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("cat","(?(?<!foo)cat|bar)",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("cat","(?(?<!foo)cat|bar)",[]))), 
-    <<"f">> = iolist_to_binary(join(re:split("fcat","(?(?<!foo)cat|bar)",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<":">> = iolist_to_binary(join(re:split("cat","(?(?<!foo)cat|bar)",[]))),
+    <<"f">> = iolist_to_binary(join(re:split("fcat","(?(?<!foo)cat|bar)",[trim]))),
     <<"f:">> = iolist_to_binary(join(re:split("fcat","(?(?<!foo)cat|bar)",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<"f:">> = iolist_to_binary(join(re:split("fcat","(?(?<!foo)cat|bar)",[]))), 
-    <<"fo">> = iolist_to_binary(join(re:split("focat","(?(?<!foo)cat|bar)",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<"f:">> = iolist_to_binary(join(re:split("fcat","(?(?<!foo)cat|bar)",[]))),
+    <<"fo">> = iolist_to_binary(join(re:split("focat","(?(?<!foo)cat|bar)",[trim]))),
     <<"fo:">> = iolist_to_binary(join(re:split("focat","(?(?<!foo)cat|bar)",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"fo:">> = iolist_to_binary(join(re:split("focat","(?(?<!foo)cat|bar)",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?<!foo)cat|bar)",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<"fo:">> = iolist_to_binary(join(re:split("focat","(?(?<!foo)cat|bar)",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?<!foo)cat|bar)",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?<!foo)cat|bar)",[{parts,
-                                                                                                                                                                                                          2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?<!foo)cat|bar)",[]))), 
-    <<"foocat">> = iolist_to_binary(join(re:split("foocat","(?(?<!foo)cat|bar)",[trim]))), 
+                                                                                                                                                                                                          2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?<!foo)cat|bar)",[]))),
+    <<"foocat">> = iolist_to_binary(join(re:split("foocat","(?(?<!foo)cat|bar)",[trim]))),
     <<"foocat">> = iolist_to_binary(join(re:split("foocat","(?(?<!foo)cat|bar)",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"foocat">> = iolist_to_binary(join(re:split("foocat","(?(?<!foo)cat|bar)",[]))), 
+                                                                                                                                                                                                2}]))),
+    <<"foocat">> = iolist_to_binary(join(re:split("foocat","(?(?<!foo)cat|bar)",[]))),
     <<"">> = iolist_to_binary(join(re:split("abcd","( \\( )? [^()]+ (?(1) \\) |) ",[extended,
-                                                                                                                                                                                                                  trim]))), 
+                                                                                                                                                                                                                  trim]))),
     <<"::">> = iolist_to_binary(join(re:split("abcd","( \\( )? [^()]+ (?(1) \\) |) ",[extended,
                                                                                                                                                                                                                     {parts,
-                                                                                                                                                                                                                     2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("abcd","( \\( )? [^()]+ (?(1) \\) |) ",[extended]))), 
+                                                                                                                                                                                                                     2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("abcd","( \\( )? [^()]+ (?(1) \\) |) ",[extended]))),
     <<":(">> = iolist_to_binary(join(re:split("(abcd)","( \\( )? [^()]+ (?(1) \\) |) ",[extended,
-                                                                                                                                                                                                                      trim]))), 
+                                                                                                                                                                                                                      trim]))),
     <<":(:">> = iolist_to_binary(join(re:split("(abcd)","( \\( )? [^()]+ (?(1) \\) |) ",[extended,
                                                                                                                                                                                                                         {parts,
-                                                                                                                                                                                                                         2}]))), 
-    <<":(:">> = iolist_to_binary(join(re:split("(abcd)","( \\( )? [^()]+ (?(1) \\) |) ",[extended]))), 
+                                                                                                                                                                                                                         2}]))),
+    <<":(:">> = iolist_to_binary(join(re:split("(abcd)","( \\( )? [^()]+ (?(1) \\) |) ",[extended]))),
     <<":::(">> = iolist_to_binary(join(re:split("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) |) ",[extended,
-                                                                                                                                                                                                                                                  trim]))), 
+                                                                                                                                                                                                                                                  trim]))),
     <<"::(abcd) fox">> = iolist_to_binary(join(re:split("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) |) ",[extended,
                                                                                                                                                                                                                                                     {parts,
-                                                                                                                                                                                                                                                     2}]))), 
-    <<":::(:::">> = iolist_to_binary(join(re:split("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) |) ",[extended]))), 
+                                                                                                                                                                                                                                                     2}]))),
+    <<":::(:::">> = iolist_to_binary(join(re:split("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) |) ",[extended]))),
     <<"(">> = iolist_to_binary(join(re:split("(abcd","( \\( )? [^()]+ (?(1) \\) |) ",[extended,
-                                                                                                                                                                                                                    trim]))), 
+                                                                                                                                                                                                                    trim]))),
     <<"(::">> = iolist_to_binary(join(re:split("(abcd","( \\( )? [^()]+ (?(1) \\) |) ",[extended,
                                                                                                                                                                                                                       {parts,
-                                                                                                                                                                                                                       2}]))), 
-    <<"(::">> = iolist_to_binary(join(re:split("(abcd","( \\( )? [^()]+ (?(1) \\) |) ",[extended]))), 
+                                                                                                                                                                                                                       2}]))),
+    <<"(::">> = iolist_to_binary(join(re:split("(abcd","( \\( )? [^()]+ (?(1) \\) |) ",[extended]))),
     <<"">> = iolist_to_binary(join(re:split("abcd","( \\( )? [^()]+ (?(1) \\) ) ",[extended,
-                                                                                                                                                                                                                trim]))), 
+                                                                                                                                                                                                                trim]))),
     <<"::">> = iolist_to_binary(join(re:split("abcd","( \\( )? [^()]+ (?(1) \\) ) ",[extended,
                                                                                                                                                                                                                   {parts,
-                                                                                                                                                                                                                   2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("abcd","( \\( )? [^()]+ (?(1) \\) ) ",[extended]))), 
+                                                                                                                                                                                                                   2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("abcd","( \\( )? [^()]+ (?(1) \\) ) ",[extended]))),
     <<":(">> = iolist_to_binary(join(re:split("(abcd)","( \\( )? [^()]+ (?(1) \\) ) ",[extended,
-                                                                                                                                                                                                                    trim]))), 
+                                                                                                                                                                                                                    trim]))),
     <<":(:">> = iolist_to_binary(join(re:split("(abcd)","( \\( )? [^()]+ (?(1) \\) ) ",[extended,
                                                                                                                                                                                                                       {parts,
-                                                                                                                                                                                                                       2}]))), 
-    <<":(:">> = iolist_to_binary(join(re:split("(abcd)","( \\( )? [^()]+ (?(1) \\) ) ",[extended]))), 
+                                                                                                                                                                                                                       2}]))),
+    <<":(:">> = iolist_to_binary(join(re:split("(abcd)","( \\( )? [^()]+ (?(1) \\) ) ",[extended]))),
     <<":::(">> = iolist_to_binary(join(re:split("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) ) ",[extended,
-                                                                                                                                                                                                                                                trim]))), 
+                                                                                                                                                                                                                                                trim]))),
     <<"::(abcd) fox">> = iolist_to_binary(join(re:split("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) ) ",[extended,
                                                                                                                                                                                                                                                   {parts,
-                                                                                                                                                                                                                                                   2}]))), 
-    <<":::(:::">> = iolist_to_binary(join(re:split("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) ) ",[extended]))), 
+                                                                                                                                                                                                                                                   2}]))),
+    <<":::(:::">> = iolist_to_binary(join(re:split("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) ) ",[extended]))),
     <<"(">> = iolist_to_binary(join(re:split("(abcd","( \\( )? [^()]+ (?(1) \\) ) ",[extended,
-                                                                                                                                                                                                                  trim]))), 
+                                                                                                                                                                                                                  trim]))),
     <<"(::">> = iolist_to_binary(join(re:split("(abcd","( \\( )? [^()]+ (?(1) \\) ) ",[extended,
                                                                                                                                                                                                                     {parts,
-                                                                                                                                                                                                                     2}]))), 
-    <<"(::">> = iolist_to_binary(join(re:split("(abcd","( \\( )? [^()]+ (?(1) \\) ) ",[extended]))), 
-    <<":1:2">> = iolist_to_binary(join(re:split("12","^(?(2)a|(1)(2))+$",[trim]))), 
+                                                                                                                                                                                                                     2}]))),
+    <<"(::">> = iolist_to_binary(join(re:split("(abcd","( \\( )? [^()]+ (?(1) \\) ) ",[extended]))),
+    <<":1:2">> = iolist_to_binary(join(re:split("12","^(?(2)a|(1)(2))+$",[trim]))),
     <<":1:2:">> = iolist_to_binary(join(re:split("12","^(?(2)a|(1)(2))+$",[{parts,
-                                                                                                                                                                                       2}]))), 
-    <<":1:2:">> = iolist_to_binary(join(re:split("12","^(?(2)a|(1)(2))+$",[]))), 
-    <<":1:2">> = iolist_to_binary(join(re:split("12a","^(?(2)a|(1)(2))+$",[trim]))), 
+                                                                                                                                                                                       2}]))),
+    <<":1:2:">> = iolist_to_binary(join(re:split("12","^(?(2)a|(1)(2))+$",[]))),
+    <<":1:2">> = iolist_to_binary(join(re:split("12a","^(?(2)a|(1)(2))+$",[trim]))),
     <<":1:2:">> = iolist_to_binary(join(re:split("12a","^(?(2)a|(1)(2))+$",[{parts,
-                                                                                                                                                                                         2}]))), 
-    <<":1:2:">> = iolist_to_binary(join(re:split("12a","^(?(2)a|(1)(2))+$",[]))), 
-    <<":1:2">> = iolist_to_binary(join(re:split("12aa","^(?(2)a|(1)(2))+$",[trim]))), 
+                                                                                                                                                                                         2}]))),
+    <<":1:2:">> = iolist_to_binary(join(re:split("12a","^(?(2)a|(1)(2))+$",[]))),
+    <<":1:2">> = iolist_to_binary(join(re:split("12aa","^(?(2)a|(1)(2))+$",[trim]))),
     <<":1:2:">> = iolist_to_binary(join(re:split("12aa","^(?(2)a|(1)(2))+$",[{parts,
-                                                                                                                                                                                           2}]))), 
-    <<":1:2:">> = iolist_to_binary(join(re:split("12aa","^(?(2)a|(1)(2))+$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(2)a|(1)(2))+$",[trim]))), 
+                                                                                                                                                                                           2}]))),
+    <<":1:2:">> = iolist_to_binary(join(re:split("12aa","^(?(2)a|(1)(2))+$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(2)a|(1)(2))+$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(2)a|(1)(2))+$",[{parts,
-                                                                                                                                                                                                         2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(2)a|(1)(2))+$",[]))), 
-    <<"1234">> = iolist_to_binary(join(re:split("1234","^(?(2)a|(1)(2))+$",[trim]))), 
+                                                                                                                                                                                                         2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(2)a|(1)(2))+$",[]))),
+    <<"1234">> = iolist_to_binary(join(re:split("1234","^(?(2)a|(1)(2))+$",[trim]))),
     <<"1234">> = iolist_to_binary(join(re:split("1234","^(?(2)a|(1)(2))+$",[{parts,
-                                                                                                                                                                                           2}]))), 
-    <<"1234">> = iolist_to_binary(join(re:split("1234","^(?(2)a|(1)(2))+$",[]))), 
-    <<":blah">> = iolist_to_binary(join(re:split("blah blah","((?i)blah)\\s+\\1",[trim]))), 
+                                                                                                                                                                                           2}]))),
+    <<"1234">> = iolist_to_binary(join(re:split("1234","^(?(2)a|(1)(2))+$",[]))),
+    <<":blah">> = iolist_to_binary(join(re:split("blah blah","((?i)blah)\\s+\\1",[trim]))),
     <<":blah:">> = iolist_to_binary(join(re:split("blah blah","((?i)blah)\\s+\\1",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<":blah:">> = iolist_to_binary(join(re:split("blah blah","((?i)blah)\\s+\\1",[]))), 
-    <<":BLAH">> = iolist_to_binary(join(re:split("BLAH BLAH","((?i)blah)\\s+\\1",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<":blah:">> = iolist_to_binary(join(re:split("blah blah","((?i)blah)\\s+\\1",[]))),
+    <<":BLAH">> = iolist_to_binary(join(re:split("BLAH BLAH","((?i)blah)\\s+\\1",[trim]))),
     <<":BLAH:">> = iolist_to_binary(join(re:split("BLAH BLAH","((?i)blah)\\s+\\1",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<":BLAH:">> = iolist_to_binary(join(re:split("BLAH BLAH","((?i)blah)\\s+\\1",[]))), 
-    <<":Blah">> = iolist_to_binary(join(re:split("Blah Blah","((?i)blah)\\s+\\1",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<":BLAH:">> = iolist_to_binary(join(re:split("BLAH BLAH","((?i)blah)\\s+\\1",[]))),
+    <<":Blah">> = iolist_to_binary(join(re:split("Blah Blah","((?i)blah)\\s+\\1",[trim]))),
     <<":Blah:">> = iolist_to_binary(join(re:split("Blah Blah","((?i)blah)\\s+\\1",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<":Blah:">> = iolist_to_binary(join(re:split("Blah Blah","((?i)blah)\\s+\\1",[]))), 
-    <<":blaH">> = iolist_to_binary(join(re:split("blaH blaH","((?i)blah)\\s+\\1",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<":Blah:">> = iolist_to_binary(join(re:split("Blah Blah","((?i)blah)\\s+\\1",[]))),
+    <<":blaH">> = iolist_to_binary(join(re:split("blaH blaH","((?i)blah)\\s+\\1",[trim]))),
     <<":blaH:">> = iolist_to_binary(join(re:split("blaH blaH","((?i)blah)\\s+\\1",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<":blaH:">> = iolist_to_binary(join(re:split("blaH blaH","((?i)blah)\\s+\\1",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?i)blah)\\s+\\1",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<":blaH:">> = iolist_to_binary(join(re:split("blaH blaH","((?i)blah)\\s+\\1",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?i)blah)\\s+\\1",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?i)blah)\\s+\\1",[{parts,
-                                                                                                                                                                                                          2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?i)blah)\\s+\\1",[]))), 
-    <<"blah BLAH">> = iolist_to_binary(join(re:split("blah BLAH","((?i)blah)\\s+\\1",[trim]))), 
+                                                                                                                                                                                                          2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?i)blah)\\s+\\1",[]))),
+    <<"blah BLAH">> = iolist_to_binary(join(re:split("blah BLAH","((?i)blah)\\s+\\1",[trim]))),
     <<"blah BLAH">> = iolist_to_binary(join(re:split("blah BLAH","((?i)blah)\\s+\\1",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<"blah BLAH">> = iolist_to_binary(join(re:split("blah BLAH","((?i)blah)\\s+\\1",[]))), 
-    <<"Blah blah">> = iolist_to_binary(join(re:split("Blah blah","((?i)blah)\\s+\\1",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<"blah BLAH">> = iolist_to_binary(join(re:split("blah BLAH","((?i)blah)\\s+\\1",[]))),
+    <<"Blah blah">> = iolist_to_binary(join(re:split("Blah blah","((?i)blah)\\s+\\1",[trim]))),
     <<"Blah blah">> = iolist_to_binary(join(re:split("Blah blah","((?i)blah)\\s+\\1",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<"Blah blah">> = iolist_to_binary(join(re:split("Blah blah","((?i)blah)\\s+\\1",[]))), 
-    <<"blaH blah">> = iolist_to_binary(join(re:split("blaH blah","((?i)blah)\\s+\\1",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<"Blah blah">> = iolist_to_binary(join(re:split("Blah blah","((?i)blah)\\s+\\1",[]))),
+    <<"blaH blah">> = iolist_to_binary(join(re:split("blaH blah","((?i)blah)\\s+\\1",[trim]))),
     <<"blaH blah">> = iolist_to_binary(join(re:split("blaH blah","((?i)blah)\\s+\\1",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<"blaH blah">> = iolist_to_binary(join(re:split("blaH blah","((?i)blah)\\s+\\1",[]))), 
-    <<":blah">> = iolist_to_binary(join(re:split("blah blah","((?i)blah)\\s+(?i:\\1)",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<"blaH blah">> = iolist_to_binary(join(re:split("blaH blah","((?i)blah)\\s+\\1",[]))),
+    <<":blah">> = iolist_to_binary(join(re:split("blah blah","((?i)blah)\\s+(?i:\\1)",[trim]))),
     <<":blah:">> = iolist_to_binary(join(re:split("blah blah","((?i)blah)\\s+(?i:\\1)",[{parts,
-                                                                                                                                                                                                                2}]))), 
-    <<":blah:">> = iolist_to_binary(join(re:split("blah blah","((?i)blah)\\s+(?i:\\1)",[]))), 
-    <<":BLAH">> = iolist_to_binary(join(re:split("BLAH BLAH","((?i)blah)\\s+(?i:\\1)",[trim]))), 
+                                                                                                                                                                                                                2}]))),
+    <<":blah:">> = iolist_to_binary(join(re:split("blah blah","((?i)blah)\\s+(?i:\\1)",[]))),
+    <<":BLAH">> = iolist_to_binary(join(re:split("BLAH BLAH","((?i)blah)\\s+(?i:\\1)",[trim]))),
     <<":BLAH:">> = iolist_to_binary(join(re:split("BLAH BLAH","((?i)blah)\\s+(?i:\\1)",[{parts,
-                                                                                                                                                                                                                2}]))), 
-    <<":BLAH:">> = iolist_to_binary(join(re:split("BLAH BLAH","((?i)blah)\\s+(?i:\\1)",[]))), 
-    <<":Blah">> = iolist_to_binary(join(re:split("Blah Blah","((?i)blah)\\s+(?i:\\1)",[trim]))), 
+                                                                                                                                                                                                                2}]))),
+    <<":BLAH:">> = iolist_to_binary(join(re:split("BLAH BLAH","((?i)blah)\\s+(?i:\\1)",[]))),
+    <<":Blah">> = iolist_to_binary(join(re:split("Blah Blah","((?i)blah)\\s+(?i:\\1)",[trim]))),
     <<":Blah:">> = iolist_to_binary(join(re:split("Blah Blah","((?i)blah)\\s+(?i:\\1)",[{parts,
-                                                                                                                                                                                                                2}]))), 
-    <<":Blah:">> = iolist_to_binary(join(re:split("Blah Blah","((?i)blah)\\s+(?i:\\1)",[]))), 
-    <<":blaH">> = iolist_to_binary(join(re:split("blaH blaH","((?i)blah)\\s+(?i:\\1)",[trim]))), 
+                                                                                                                                                                                                                2}]))),
+    <<":Blah:">> = iolist_to_binary(join(re:split("Blah Blah","((?i)blah)\\s+(?i:\\1)",[]))),
+    <<":blaH">> = iolist_to_binary(join(re:split("blaH blaH","((?i)blah)\\s+(?i:\\1)",[trim]))),
     <<":blaH:">> = iolist_to_binary(join(re:split("blaH blaH","((?i)blah)\\s+(?i:\\1)",[{parts,
-                                                                                                                                                                                                                2}]))), 
-    <<":blaH:">> = iolist_to_binary(join(re:split("blaH blaH","((?i)blah)\\s+(?i:\\1)",[]))), 
-    <<":blah">> = iolist_to_binary(join(re:split("blah BLAH","((?i)blah)\\s+(?i:\\1)",[trim]))), 
+                                                                                                                                                                                                                2}]))),
+    <<":blaH:">> = iolist_to_binary(join(re:split("blaH blaH","((?i)blah)\\s+(?i:\\1)",[]))),
+    <<":blah">> = iolist_to_binary(join(re:split("blah BLAH","((?i)blah)\\s+(?i:\\1)",[trim]))),
     <<":blah:">> = iolist_to_binary(join(re:split("blah BLAH","((?i)blah)\\s+(?i:\\1)",[{parts,
-                                                                                                                                                                                                                2}]))), 
-    <<":blah:">> = iolist_to_binary(join(re:split("blah BLAH","((?i)blah)\\s+(?i:\\1)",[]))), 
-    <<":Blah">> = iolist_to_binary(join(re:split("Blah blah","((?i)blah)\\s+(?i:\\1)",[trim]))), 
+                                                                                                                                                                                                                2}]))),
+    <<":blah:">> = iolist_to_binary(join(re:split("blah BLAH","((?i)blah)\\s+(?i:\\1)",[]))),
+    <<":Blah">> = iolist_to_binary(join(re:split("Blah blah","((?i)blah)\\s+(?i:\\1)",[trim]))),
     <<":Blah:">> = iolist_to_binary(join(re:split("Blah blah","((?i)blah)\\s+(?i:\\1)",[{parts,
-                                                                                                                                                                                                                2}]))), 
-    <<":Blah:">> = iolist_to_binary(join(re:split("Blah blah","((?i)blah)\\s+(?i:\\1)",[]))), 
-    <<":blaH">> = iolist_to_binary(join(re:split("blaH blah","((?i)blah)\\s+(?i:\\1)",[trim]))), 
+                                                                                                                                                                                                                2}]))),
+    <<":Blah:">> = iolist_to_binary(join(re:split("Blah blah","((?i)blah)\\s+(?i:\\1)",[]))),
+    <<":blaH">> = iolist_to_binary(join(re:split("blaH blah","((?i)blah)\\s+(?i:\\1)",[trim]))),
     <<":blaH:">> = iolist_to_binary(join(re:split("blaH blah","((?i)blah)\\s+(?i:\\1)",[{parts,
-                                                                                                                                                                                                                2}]))), 
-    <<":blaH:">> = iolist_to_binary(join(re:split("blaH blah","((?i)blah)\\s+(?i:\\1)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","(?>a*)*",[trim]))), 
+                                                                                                                                                                                                                2}]))),
+    <<":blaH:">> = iolist_to_binary(join(re:split("blaH blah","((?i)blah)\\s+(?i:\\1)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","(?>a*)*",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a","(?>a*)*",[{parts,
-                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a","(?>a*)*",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aa","(?>a*)*",[trim]))), 
+                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a","(?>a*)*",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aa","(?>a*)*",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aa","(?>a*)*",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aa","(?>a*)*",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaa","(?>a*)*",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aa","(?>a*)*",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaa","(?>a*)*",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaa","(?>a*)*",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaa","(?>a*)*",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","(abc|)+",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaa","(?>a*)*",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","(abc|)+",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("abc","(abc|)+",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("abc","(abc|)+",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abcabc","(abc|)+",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("abc","(abc|)+",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abcabc","(abc|)+",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("abcabc","(abc|)+",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("abcabc","(abc|)+",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abcabcabc","(abc|)+",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("abcabc","(abc|)+",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abcabcabc","(abc|)+",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("abcabcabc","(abc|)+",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("abcabcabc","(abc|)+",[]))), 
-    <<"x::y::z">> = iolist_to_binary(join(re:split("xyz","(abc|)+",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("abcabcabc","(abc|)+",[]))),
+    <<"x::y::z">> = iolist_to_binary(join(re:split("xyz","(abc|)+",[trim]))),
     <<"x::yz">> = iolist_to_binary(join(re:split("xyz","(abc|)+",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<"x::y::z::">> = iolist_to_binary(join(re:split("xyz","(abc|)+",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","([a]*)*",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<"x::y::z::">> = iolist_to_binary(join(re:split("xyz","(abc|)+",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","([a]*)*",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("a","([a]*)*",[{parts,
-                                                                                                                                                                2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("a","([a]*)*",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaaa","([a]*)*",[trim]))), 
+                                                                                                                                                                2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("a","([a]*)*",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaaa","([a]*)*",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("aaaaa","([a]*)*",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("aaaaa","([a]*)*",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","([ab]*)*",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("aaaaa","([a]*)*",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","([ab]*)*",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("a","([ab]*)*",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("a","([ab]*)*",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("b","([ab]*)*",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("a","([ab]*)*",[]))),
+    <<"">> = iolist_to_binary(join(re:split("b","([ab]*)*",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("b","([ab]*)*",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("b","([ab]*)*",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("ababab","([ab]*)*",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("b","([ab]*)*",[]))),
+    <<"">> = iolist_to_binary(join(re:split("ababab","([ab]*)*",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("ababab","([ab]*)*",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("ababab","([ab]*)*",[]))), 
-    <<"::c::d::e">> = iolist_to_binary(join(re:split("aaaabcde","([ab]*)*",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("ababab","([ab]*)*",[]))),
+    <<"::c::d::e">> = iolist_to_binary(join(re:split("aaaabcde","([ab]*)*",[trim]))),
     <<"::cde">> = iolist_to_binary(join(re:split("aaaabcde","([ab]*)*",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<"::c::d::e::">> = iolist_to_binary(join(re:split("aaaabcde","([ab]*)*",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("bbbb","([ab]*)*",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<"::c::d::e::">> = iolist_to_binary(join(re:split("aaaabcde","([ab]*)*",[]))),
+    <<"">> = iolist_to_binary(join(re:split("bbbb","([ab]*)*",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("bbbb","([ab]*)*",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("bbbb","([ab]*)*",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("b","([^a]*)*",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("bbbb","([ab]*)*",[]))),
+    <<"">> = iolist_to_binary(join(re:split("b","([^a]*)*",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("b","([^a]*)*",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("b","([^a]*)*",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("bbbb","([^a]*)*",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("b","([^a]*)*",[]))),
+    <<"">> = iolist_to_binary(join(re:split("bbbb","([^a]*)*",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("bbbb","([^a]*)*",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("bbbb","([^a]*)*",[]))), 
-    <<"a::a::a">> = iolist_to_binary(join(re:split("aaa","([^a]*)*",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("bbbb","([^a]*)*",[]))),
+    <<"a::a::a">> = iolist_to_binary(join(re:split("aaa","([^a]*)*",[trim]))),
     <<"a::aa">> = iolist_to_binary(join(re:split("aaa","([^a]*)*",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<"a::a::a::">> = iolist_to_binary(join(re:split("aaa","([^a]*)*",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("cccc","([^ab]*)*",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<"a::a::a::">> = iolist_to_binary(join(re:split("aaa","([^a]*)*",[]))),
+    <<"">> = iolist_to_binary(join(re:split("cccc","([^ab]*)*",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("cccc","([^ab]*)*",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("cccc","([^ab]*)*",[]))), 
-    <<"a::b::a::b">> = iolist_to_binary(join(re:split("abab","([^ab]*)*",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("cccc","([^ab]*)*",[]))),
+    <<"a::b::a::b">> = iolist_to_binary(join(re:split("abab","([^ab]*)*",[trim]))),
     <<"a::bab">> = iolist_to_binary(join(re:split("abab","([^ab]*)*",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<"a::b::a::b::">> = iolist_to_binary(join(re:split("abab","([^ab]*)*",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","([a]*?)*",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<"a::b::a::b::">> = iolist_to_binary(join(re:split("abab","([^ab]*)*",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","([a]*?)*",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("a","([a]*?)*",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("a","([a]*?)*",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaa","([a]*?)*",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("a","([a]*?)*",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaa","([a]*?)*",[trim]))),
     <<"::aaa">> = iolist_to_binary(join(re:split("aaaa","([a]*?)*",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"::::::::">> = iolist_to_binary(join(re:split("aaaa","([a]*?)*",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","([ab]*?)*",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"::::::::">> = iolist_to_binary(join(re:split("aaaa","([a]*?)*",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","([ab]*?)*",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("a","([ab]*?)*",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("a","([ab]*?)*",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("b","([ab]*?)*",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("a","([ab]*?)*",[]))),
+    <<"">> = iolist_to_binary(join(re:split("b","([ab]*?)*",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("b","([ab]*?)*",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("b","([ab]*?)*",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abab","([ab]*?)*",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("b","([ab]*?)*",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abab","([ab]*?)*",[trim]))),
     <<"::bab">> = iolist_to_binary(join(re:split("abab","([ab]*?)*",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<"::::::::">> = iolist_to_binary(join(re:split("abab","([ab]*?)*",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("baba","([ab]*?)*",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<"::::::::">> = iolist_to_binary(join(re:split("abab","([ab]*?)*",[]))),
+    <<"">> = iolist_to_binary(join(re:split("baba","([ab]*?)*",[trim]))),
     <<"::aba">> = iolist_to_binary(join(re:split("baba","([ab]*?)*",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<"::::::::">> = iolist_to_binary(join(re:split("baba","([ab]*?)*",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("b","([^a]*?)*",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<"::::::::">> = iolist_to_binary(join(re:split("baba","([ab]*?)*",[]))),
+    <<"">> = iolist_to_binary(join(re:split("b","([^a]*?)*",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("b","([^a]*?)*",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("b","([^a]*?)*",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("bbbb","([^a]*?)*",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("b","([^a]*?)*",[]))),
+    <<"">> = iolist_to_binary(join(re:split("bbbb","([^a]*?)*",[trim]))),
     <<"::bbb">> = iolist_to_binary(join(re:split("bbbb","([^a]*?)*",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<"::::::::">> = iolist_to_binary(join(re:split("bbbb","([^a]*?)*",[]))), 
-    <<"a::a::a">> = iolist_to_binary(join(re:split("aaa","([^a]*?)*",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<"::::::::">> = iolist_to_binary(join(re:split("bbbb","([^a]*?)*",[]))),
+    <<"a::a::a">> = iolist_to_binary(join(re:split("aaa","([^a]*?)*",[trim]))),
     <<"a::aa">> = iolist_to_binary(join(re:split("aaa","([^a]*?)*",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"a::a::a::">> = iolist_to_binary(join(re:split("aaa","([^a]*?)*",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("c","([^ab]*?)*",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"a::a::a::">> = iolist_to_binary(join(re:split("aaa","([^a]*?)*",[]))),
+    <<"">> = iolist_to_binary(join(re:split("c","([^ab]*?)*",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("c","([^ab]*?)*",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("c","([^ab]*?)*",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("cccc","([^ab]*?)*",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("c","([^ab]*?)*",[]))),
+    <<"">> = iolist_to_binary(join(re:split("cccc","([^ab]*?)*",[trim]))),
     <<"::ccc">> = iolist_to_binary(join(re:split("cccc","([^ab]*?)*",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"::::::::">> = iolist_to_binary(join(re:split("cccc","([^ab]*?)*",[]))), 
-    <<"b::a::b::a">> = iolist_to_binary(join(re:split("baba","([^ab]*?)*",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<"::::::::">> = iolist_to_binary(join(re:split("cccc","([^ab]*?)*",[]))),
+    <<"b::a::b::a">> = iolist_to_binary(join(re:split("baba","([^ab]*?)*",[trim]))),
     <<"b::aba">> = iolist_to_binary(join(re:split("baba","([^ab]*?)*",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"b::a::b::a::">> = iolist_to_binary(join(re:split("baba","([^ab]*?)*",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","(?>a*)*",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<"b::a::b::a::">> = iolist_to_binary(join(re:split("baba","([^ab]*?)*",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","(?>a*)*",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a","(?>a*)*",[{parts,
-                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a","(?>a*)*",[]))), 
-    <<":b:c:d:e">> = iolist_to_binary(join(re:split("aaabcde","(?>a*)*",[trim]))), 
+                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a","(?>a*)*",[]))),
+    <<":b:c:d:e">> = iolist_to_binary(join(re:split("aaabcde","(?>a*)*",[trim]))),
     <<":bcde">> = iolist_to_binary(join(re:split("aaabcde","(?>a*)*",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<":b:c:d:e:">> = iolist_to_binary(join(re:split("aaabcde","(?>a*)*",[]))), 
+                                                                                                                                                                            2}]))),
+    <<":b:c:d:e:">> = iolist_to_binary(join(re:split("aaabcde","(?>a*)*",[]))),
     ok.
 run14() ->
-    <<"">> = iolist_to_binary(join(re:split("aaaaa","((?>a*))*",[trim]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaaa","((?>a*))*",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("aaaaa","((?>a*))*",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("aaaaa","((?>a*))*",[]))), 
-    <<"::b::b">> = iolist_to_binary(join(re:split("aabbaa","((?>a*))*",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("aaaaa","((?>a*))*",[]))),
+    <<"::b::b">> = iolist_to_binary(join(re:split("aabbaa","((?>a*))*",[trim]))),
     <<"::bbaa">> = iolist_to_binary(join(re:split("aabbaa","((?>a*))*",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<"::b::b::">> = iolist_to_binary(join(re:split("aabbaa","((?>a*))*",[]))), 
-    <<"a::a::a::a::a">> = iolist_to_binary(join(re:split("aaaaa","((?>a*?))*",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<"::b::b::">> = iolist_to_binary(join(re:split("aabbaa","((?>a*))*",[]))),
+    <<"a::a::a::a::a">> = iolist_to_binary(join(re:split("aaaaa","((?>a*?))*",[trim]))),
     <<"a::aaaa">> = iolist_to_binary(join(re:split("aaaaa","((?>a*?))*",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<"a::a::a::a::a::">> = iolist_to_binary(join(re:split("aaaaa","((?>a*?))*",[]))), 
-    <<"a::a::b::b::a::a">> = iolist_to_binary(join(re:split("aabbaa","((?>a*?))*",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<"a::a::a::a::a::">> = iolist_to_binary(join(re:split("aaaaa","((?>a*?))*",[]))),
+    <<"a::a::b::b::a::a">> = iolist_to_binary(join(re:split("aabbaa","((?>a*?))*",[trim]))),
     <<"a::abbaa">> = iolist_to_binary(join(re:split("aabbaa","((?>a*?))*",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<"a::a::b::b::a::a::">> = iolist_to_binary(join(re:split("aabbaa","((?>a*?))*",[]))), 
+                                                                                                                                                                                2}]))),
+    <<"a::a::b::b::a::a::">> = iolist_to_binary(join(re:split("aabbaa","((?>a*?))*",[]))),
     <<"">> = iolist_to_binary(join(re:split("12-sep-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended,
-                                                                                                                                                                                                                                                                                                                 trim]))), 
+                                                                                                                                                                                                                                                                                                                 trim]))),
     <<":">> = iolist_to_binary(join(re:split("12-sep-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended,
                                                                                                                                                                                                                                                                                                                    {parts,
-                                                                                                                                                                                                                                                                                                                    2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("12-sep-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended]))), 
+                                                                                                                                                                                                                                                                                                                    2}]))),
+    <<":">> = iolist_to_binary(join(re:split("12-sep-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended]))),
     <<"">> = iolist_to_binary(join(re:split("12-09-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended,
-                                                                                                                                                                                                                                                                                                               trim]))), 
+                                                                                                                                                                                                                                                                                                               trim]))),
     <<":">> = iolist_to_binary(join(re:split("12-09-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended,
                                                                                                                                                                                                                                                                                                                  {parts,
-                                                                                                                                                                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("12-09-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended]))), 
+                                                                                                                                                                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("12-09-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended,
-                                                                                                                                                                                                                                                                                                                     trim]))), 
+                                                                                                                                                                                                                                                                                                                     trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended,
                                                                                                                                                                                                                                                                                                                        {parts,
-                                                                                                                                                                                                                                                                                                                        2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended]))), 
+                                                                                                                                                                                                                                                                                                                        2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended]))),
     <<"sep-12-98">> = iolist_to_binary(join(re:split("sep-12-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended,
-                                                                                                                                                                                                                                                                                                                 trim]))), 
+                                                                                                                                                                                                                                                                                                                 trim]))),
     <<"sep-12-98">> = iolist_to_binary(join(re:split("sep-12-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended,
                                                                                                                                                                                                                                                                                                                    {parts,
-                                                                                                                                                                                                                                                                                                                    2}]))), 
-    <<"sep-12-98">> = iolist_to_binary(join(re:split("sep-12-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended]))), 
-    <<"foo:foo">> = iolist_to_binary(join(re:split("foobarfoo","(?<=(foo))bar\\1",[trim]))), 
+                                                                                                                                                                                                                                                                                                                    2}]))),
+    <<"sep-12-98">> = iolist_to_binary(join(re:split("sep-12-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended]))),
+    <<"foo:foo">> = iolist_to_binary(join(re:split("foobarfoo","(?<=(foo))bar\\1",[trim]))),
     <<"foo:foo:">> = iolist_to_binary(join(re:split("foobarfoo","(?<=(foo))bar\\1",[{parts,
-                                                                                                                                                                                                   2}]))), 
-    <<"foo:foo:">> = iolist_to_binary(join(re:split("foobarfoo","(?<=(foo))bar\\1",[]))), 
-    <<"foo:foo:tling">> = iolist_to_binary(join(re:split("foobarfootling","(?<=(foo))bar\\1",[trim]))), 
+                                                                                                                                                                                                   2}]))),
+    <<"foo:foo:">> = iolist_to_binary(join(re:split("foobarfoo","(?<=(foo))bar\\1",[]))),
+    <<"foo:foo:tling">> = iolist_to_binary(join(re:split("foobarfootling","(?<=(foo))bar\\1",[trim]))),
     <<"foo:foo:tling">> = iolist_to_binary(join(re:split("foobarfootling","(?<=(foo))bar\\1",[{parts,
-                                                                                                                                                                                                             2}]))), 
-    <<"foo:foo:tling">> = iolist_to_binary(join(re:split("foobarfootling","(?<=(foo))bar\\1",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(foo))bar\\1",[trim]))), 
+                                                                                                                                                                                                             2}]))),
+    <<"foo:foo:tling">> = iolist_to_binary(join(re:split("foobarfootling","(?<=(foo))bar\\1",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(foo))bar\\1",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(foo))bar\\1",[{parts,
-                                                                                                                                                                                                       2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(foo))bar\\1",[]))), 
-    <<"foobar">> = iolist_to_binary(join(re:split("foobar","(?<=(foo))bar\\1",[trim]))), 
+                                                                                                                                                                                                       2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(foo))bar\\1",[]))),
+    <<"foobar">> = iolist_to_binary(join(re:split("foobar","(?<=(foo))bar\\1",[trim]))),
     <<"foobar">> = iolist_to_binary(join(re:split("foobar","(?<=(foo))bar\\1",[{parts,
-                                                                                                                                                                                             2}]))), 
-    <<"foobar">> = iolist_to_binary(join(re:split("foobar","(?<=(foo))bar\\1",[]))), 
-    <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","(?<=(foo))bar\\1",[trim]))), 
+                                                                                                                                                                                             2}]))),
+    <<"foobar">> = iolist_to_binary(join(re:split("foobar","(?<=(foo))bar\\1",[]))),
+    <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","(?<=(foo))bar\\1",[trim]))),
     <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","(?<=(foo))bar\\1",[{parts,
-                                                                                                                                                                                             2}]))), 
-    <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","(?<=(foo))bar\\1",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("saturday","(?i:saturday|sunday)",[trim]))), 
+                                                                                                                                                                                             2}]))),
+    <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","(?<=(foo))bar\\1",[]))),
+    <<"">> = iolist_to_binary(join(re:split("saturday","(?i:saturday|sunday)",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("saturday","(?i:saturday|sunday)",[{parts,
-                                                                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("saturday","(?i:saturday|sunday)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("sunday","(?i:saturday|sunday)",[trim]))), 
+                                                                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("saturday","(?i:saturday|sunday)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("sunday","(?i:saturday|sunday)",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("sunday","(?i:saturday|sunday)",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("sunday","(?i:saturday|sunday)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("Saturday","(?i:saturday|sunday)",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<":">> = iolist_to_binary(join(re:split("sunday","(?i:saturday|sunday)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("Saturday","(?i:saturday|sunday)",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("Saturday","(?i:saturday|sunday)",[{parts,
-                                                                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("Saturday","(?i:saturday|sunday)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("Sunday","(?i:saturday|sunday)",[trim]))), 
+                                                                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("Saturday","(?i:saturday|sunday)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("Sunday","(?i:saturday|sunday)",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("Sunday","(?i:saturday|sunday)",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("Sunday","(?i:saturday|sunday)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("SATURDAY","(?i:saturday|sunday)",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<":">> = iolist_to_binary(join(re:split("Sunday","(?i:saturday|sunday)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("SATURDAY","(?i:saturday|sunday)",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("SATURDAY","(?i:saturday|sunday)",[{parts,
-                                                                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("SATURDAY","(?i:saturday|sunday)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("SUNDAY","(?i:saturday|sunday)",[trim]))), 
+                                                                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("SATURDAY","(?i:saturday|sunday)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("SUNDAY","(?i:saturday|sunday)",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("SUNDAY","(?i:saturday|sunday)",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("SUNDAY","(?i:saturday|sunday)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("SunDay","(?i:saturday|sunday)",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<":">> = iolist_to_binary(join(re:split("SUNDAY","(?i:saturday|sunday)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("SunDay","(?i:saturday|sunday)",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("SunDay","(?i:saturday|sunday)",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("SunDay","(?i:saturday|sunday)",[]))), 
-    <<":abc">> = iolist_to_binary(join(re:split("abcx","(a(?i)bc|BB)x",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<":">> = iolist_to_binary(join(re:split("SunDay","(?i:saturday|sunday)",[]))),
+    <<":abc">> = iolist_to_binary(join(re:split("abcx","(a(?i)bc|BB)x",[trim]))),
     <<":abc:">> = iolist_to_binary(join(re:split("abcx","(a(?i)bc|BB)x",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<":abc:">> = iolist_to_binary(join(re:split("abcx","(a(?i)bc|BB)x",[]))), 
-    <<":aBC">> = iolist_to_binary(join(re:split("aBCx","(a(?i)bc|BB)x",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<":abc:">> = iolist_to_binary(join(re:split("abcx","(a(?i)bc|BB)x",[]))),
+    <<":aBC">> = iolist_to_binary(join(re:split("aBCx","(a(?i)bc|BB)x",[trim]))),
     <<":aBC:">> = iolist_to_binary(join(re:split("aBCx","(a(?i)bc|BB)x",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<":aBC:">> = iolist_to_binary(join(re:split("aBCx","(a(?i)bc|BB)x",[]))), 
-    <<":bb">> = iolist_to_binary(join(re:split("bbx","(a(?i)bc|BB)x",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<":aBC:">> = iolist_to_binary(join(re:split("aBCx","(a(?i)bc|BB)x",[]))),
+    <<":bb">> = iolist_to_binary(join(re:split("bbx","(a(?i)bc|BB)x",[trim]))),
     <<":bb:">> = iolist_to_binary(join(re:split("bbx","(a(?i)bc|BB)x",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<":bb:">> = iolist_to_binary(join(re:split("bbx","(a(?i)bc|BB)x",[]))), 
-    <<":BB">> = iolist_to_binary(join(re:split("BBx","(a(?i)bc|BB)x",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<":bb:">> = iolist_to_binary(join(re:split("bbx","(a(?i)bc|BB)x",[]))),
+    <<":BB">> = iolist_to_binary(join(re:split("BBx","(a(?i)bc|BB)x",[trim]))),
     <<":BB:">> = iolist_to_binary(join(re:split("BBx","(a(?i)bc|BB)x",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<":BB:">> = iolist_to_binary(join(re:split("BBx","(a(?i)bc|BB)x",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a(?i)bc|BB)x",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<":BB:">> = iolist_to_binary(join(re:split("BBx","(a(?i)bc|BB)x",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a(?i)bc|BB)x",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a(?i)bc|BB)x",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a(?i)bc|BB)x",[]))), 
-    <<"abcX">> = iolist_to_binary(join(re:split("abcX","(a(?i)bc|BB)x",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a(?i)bc|BB)x",[]))),
+    <<"abcX">> = iolist_to_binary(join(re:split("abcX","(a(?i)bc|BB)x",[trim]))),
     <<"abcX">> = iolist_to_binary(join(re:split("abcX","(a(?i)bc|BB)x",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"abcX">> = iolist_to_binary(join(re:split("abcX","(a(?i)bc|BB)x",[]))), 
-    <<"aBCX">> = iolist_to_binary(join(re:split("aBCX","(a(?i)bc|BB)x",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"abcX">> = iolist_to_binary(join(re:split("abcX","(a(?i)bc|BB)x",[]))),
+    <<"aBCX">> = iolist_to_binary(join(re:split("aBCX","(a(?i)bc|BB)x",[trim]))),
     <<"aBCX">> = iolist_to_binary(join(re:split("aBCX","(a(?i)bc|BB)x",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"aBCX">> = iolist_to_binary(join(re:split("aBCX","(a(?i)bc|BB)x",[]))), 
-    <<"bbX">> = iolist_to_binary(join(re:split("bbX","(a(?i)bc|BB)x",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"aBCX">> = iolist_to_binary(join(re:split("aBCX","(a(?i)bc|BB)x",[]))),
+    <<"bbX">> = iolist_to_binary(join(re:split("bbX","(a(?i)bc|BB)x",[trim]))),
     <<"bbX">> = iolist_to_binary(join(re:split("bbX","(a(?i)bc|BB)x",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<"bbX">> = iolist_to_binary(join(re:split("bbX","(a(?i)bc|BB)x",[]))), 
-    <<"BBX">> = iolist_to_binary(join(re:split("BBX","(a(?i)bc|BB)x",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<"bbX">> = iolist_to_binary(join(re:split("bbX","(a(?i)bc|BB)x",[]))),
+    <<"BBX">> = iolist_to_binary(join(re:split("BBX","(a(?i)bc|BB)x",[trim]))),
     <<"BBX">> = iolist_to_binary(join(re:split("BBX","(a(?i)bc|BB)x",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<"BBX">> = iolist_to_binary(join(re:split("BBX","(a(?i)bc|BB)x",[]))), 
-    <<":ac">> = iolist_to_binary(join(re:split("ac","^([ab](?i)[cd]|[ef])",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<"BBX">> = iolist_to_binary(join(re:split("BBX","(a(?i)bc|BB)x",[]))),
+    <<":ac">> = iolist_to_binary(join(re:split("ac","^([ab](?i)[cd]|[ef])",[trim]))),
     <<":ac:">> = iolist_to_binary(join(re:split("ac","^([ab](?i)[cd]|[ef])",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<":ac:">> = iolist_to_binary(join(re:split("ac","^([ab](?i)[cd]|[ef])",[]))), 
-    <<":aC">> = iolist_to_binary(join(re:split("aC","^([ab](?i)[cd]|[ef])",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<":ac:">> = iolist_to_binary(join(re:split("ac","^([ab](?i)[cd]|[ef])",[]))),
+    <<":aC">> = iolist_to_binary(join(re:split("aC","^([ab](?i)[cd]|[ef])",[trim]))),
     <<":aC:">> = iolist_to_binary(join(re:split("aC","^([ab](?i)[cd]|[ef])",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<":aC:">> = iolist_to_binary(join(re:split("aC","^([ab](?i)[cd]|[ef])",[]))), 
-    <<":bD">> = iolist_to_binary(join(re:split("bD","^([ab](?i)[cd]|[ef])",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<":aC:">> = iolist_to_binary(join(re:split("aC","^([ab](?i)[cd]|[ef])",[]))),
+    <<":bD">> = iolist_to_binary(join(re:split("bD","^([ab](?i)[cd]|[ef])",[trim]))),
     <<":bD:">> = iolist_to_binary(join(re:split("bD","^([ab](?i)[cd]|[ef])",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<":bD:">> = iolist_to_binary(join(re:split("bD","^([ab](?i)[cd]|[ef])",[]))), 
-    <<":e:lephant">> = iolist_to_binary(join(re:split("elephant","^([ab](?i)[cd]|[ef])",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<":bD:">> = iolist_to_binary(join(re:split("bD","^([ab](?i)[cd]|[ef])",[]))),
+    <<":e:lephant">> = iolist_to_binary(join(re:split("elephant","^([ab](?i)[cd]|[ef])",[trim]))),
     <<":e:lephant">> = iolist_to_binary(join(re:split("elephant","^([ab](?i)[cd]|[ef])",[{parts,
-                                                                                                                                                                                                        2}]))), 
-    <<":e:lephant">> = iolist_to_binary(join(re:split("elephant","^([ab](?i)[cd]|[ef])",[]))), 
-    <<":E:urope">> = iolist_to_binary(join(re:split("Europe","^([ab](?i)[cd]|[ef])",[trim]))), 
+                                                                                                                                                                                                        2}]))),
+    <<":e:lephant">> = iolist_to_binary(join(re:split("elephant","^([ab](?i)[cd]|[ef])",[]))),
+    <<":E:urope">> = iolist_to_binary(join(re:split("Europe","^([ab](?i)[cd]|[ef])",[trim]))),
     <<":E:urope">> = iolist_to_binary(join(re:split("Europe","^([ab](?i)[cd]|[ef])",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<":E:urope">> = iolist_to_binary(join(re:split("Europe","^([ab](?i)[cd]|[ef])",[]))), 
-    <<":f:rog">> = iolist_to_binary(join(re:split("frog","^([ab](?i)[cd]|[ef])",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<":E:urope">> = iolist_to_binary(join(re:split("Europe","^([ab](?i)[cd]|[ef])",[]))),
+    <<":f:rog">> = iolist_to_binary(join(re:split("frog","^([ab](?i)[cd]|[ef])",[trim]))),
     <<":f:rog">> = iolist_to_binary(join(re:split("frog","^([ab](?i)[cd]|[ef])",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<":f:rog">> = iolist_to_binary(join(re:split("frog","^([ab](?i)[cd]|[ef])",[]))), 
-    <<":F:rance">> = iolist_to_binary(join(re:split("France","^([ab](?i)[cd]|[ef])",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<":f:rog">> = iolist_to_binary(join(re:split("frog","^([ab](?i)[cd]|[ef])",[]))),
+    <<":F:rance">> = iolist_to_binary(join(re:split("France","^([ab](?i)[cd]|[ef])",[trim]))),
     <<":F:rance">> = iolist_to_binary(join(re:split("France","^([ab](?i)[cd]|[ef])",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<":F:rance">> = iolist_to_binary(join(re:split("France","^([ab](?i)[cd]|[ef])",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^([ab](?i)[cd]|[ef])",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<":F:rance">> = iolist_to_binary(join(re:split("France","^([ab](?i)[cd]|[ef])",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^([ab](?i)[cd]|[ef])",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^([ab](?i)[cd]|[ef])",[{parts,
-                                                                                                                                                                                                              2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^([ab](?i)[cd]|[ef])",[]))), 
-    <<"Africa">> = iolist_to_binary(join(re:split("Africa","^([ab](?i)[cd]|[ef])",[trim]))), 
+                                                                                                                                                                                                              2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^([ab](?i)[cd]|[ef])",[]))),
+    <<"Africa">> = iolist_to_binary(join(re:split("Africa","^([ab](?i)[cd]|[ef])",[trim]))),
     <<"Africa">> = iolist_to_binary(join(re:split("Africa","^([ab](?i)[cd]|[ef])",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<"Africa">> = iolist_to_binary(join(re:split("Africa","^([ab](?i)[cd]|[ef])",[]))), 
-    <<":ab">> = iolist_to_binary(join(re:split("ab","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<"Africa">> = iolist_to_binary(join(re:split("Africa","^([ab](?i)[cd]|[ef])",[]))),
+    <<":ab">> = iolist_to_binary(join(re:split("ab","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))),
     <<":ab:">> = iolist_to_binary(join(re:split("ab","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
-                                                                                                                                                                                                                    2}]))), 
-    <<":ab:">> = iolist_to_binary(join(re:split("ab","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
-    <<":aBd">> = iolist_to_binary(join(re:split("aBd","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
+                                                                                                                                                                                                                    2}]))),
+    <<":ab:">> = iolist_to_binary(join(re:split("ab","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))),
+    <<":aBd">> = iolist_to_binary(join(re:split("aBd","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))),
     <<":aBd:">> = iolist_to_binary(join(re:split("aBd","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
-                                                                                                                                                                                                                      2}]))), 
-    <<":aBd:">> = iolist_to_binary(join(re:split("aBd","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
-    <<":xy">> = iolist_to_binary(join(re:split("xy","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
+                                                                                                                                                                                                                      2}]))),
+    <<":aBd:">> = iolist_to_binary(join(re:split("aBd","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))),
+    <<":xy">> = iolist_to_binary(join(re:split("xy","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))),
     <<":xy:">> = iolist_to_binary(join(re:split("xy","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
-                                                                                                                                                                                                                    2}]))), 
-    <<":xy:">> = iolist_to_binary(join(re:split("xy","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
-    <<":xY">> = iolist_to_binary(join(re:split("xY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
+                                                                                                                                                                                                                    2}]))),
+    <<":xy:">> = iolist_to_binary(join(re:split("xy","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))),
+    <<":xY">> = iolist_to_binary(join(re:split("xY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))),
     <<":xY:">> = iolist_to_binary(join(re:split("xY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
-                                                                                                                                                                                                                    2}]))), 
-    <<":xY:">> = iolist_to_binary(join(re:split("xY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
-    <<":z:ebra">> = iolist_to_binary(join(re:split("zebra","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
+                                                                                                                                                                                                                    2}]))),
+    <<":xY:">> = iolist_to_binary(join(re:split("xY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))),
+    <<":z:ebra">> = iolist_to_binary(join(re:split("zebra","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))),
     <<":z:ebra">> = iolist_to_binary(join(re:split("zebra","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
-                                                                                                                                                                                                                          2}]))), 
-    <<":z:ebra">> = iolist_to_binary(join(re:split("zebra","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
-    <<":Z:ambesi">> = iolist_to_binary(join(re:split("Zambesi","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
+                                                                                                                                                                                                                          2}]))),
+    <<":z:ebra">> = iolist_to_binary(join(re:split("zebra","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))),
+    <<":Z:ambesi">> = iolist_to_binary(join(re:split("Zambesi","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))),
     <<":Z:ambesi">> = iolist_to_binary(join(re:split("Zambesi","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
-                                                                                                                                                                                                                              2}]))), 
-    <<":Z:ambesi">> = iolist_to_binary(join(re:split("Zambesi","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
+                                                                                                                                                                                                                              2}]))),
+    <<":Z:ambesi">> = iolist_to_binary(join(re:split("Zambesi","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
-                                                                                                                                                                                                                                      2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
-    <<"aCD">> = iolist_to_binary(join(re:split("aCD","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
+                                                                                                                                                                                                                                      2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))),
+    <<"aCD">> = iolist_to_binary(join(re:split("aCD","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))),
     <<"aCD">> = iolist_to_binary(join(re:split("aCD","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
-                                                                                                                                                                                                                      2}]))), 
-    <<"aCD">> = iolist_to_binary(join(re:split("aCD","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
-    <<"XY">> = iolist_to_binary(join(re:split("XY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
+                                                                                                                                                                                                                      2}]))),
+    <<"aCD">> = iolist_to_binary(join(re:split("aCD","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))),
+    <<"XY">> = iolist_to_binary(join(re:split("XY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))),
     <<"XY">> = iolist_to_binary(join(re:split("XY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
-                                                                                                                                                                                                                    2}]))), 
-    <<"XY">> = iolist_to_binary(join(re:split("XY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
+                                                                                                                                                                                                                    2}]))),
+    <<"XY">> = iolist_to_binary(join(re:split("XY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))),
     <<"foo
 ">> = iolist_to_binary(join(re:split("foo
-bar","(?<=foo\\n)^bar",[multiline,trim]))), 
+bar","(?<=foo\\n)^bar",[multiline,trim]))),
     <<"foo
 :">> = iolist_to_binary(join(re:split("foo
-bar","(?<=foo\\n)^bar",[multiline,{parts,2}]))), 
+bar","(?<=foo\\n)^bar",[multiline,{parts,2}]))),
     <<"foo
 :">> = iolist_to_binary(join(re:split("foo
-bar","(?<=foo\\n)^bar",[multiline]))), 
+bar","(?<=foo\\n)^bar",[multiline]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=foo\\n)^bar",[multiline,
-                                                                                                                                                                                                   trim]))), 
+                                                                                                                                                                                                   trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=foo\\n)^bar",[multiline,
                                                                                                                                                                                                      {parts,
-                                                                                                                                                                                                      2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=foo\\n)^bar",[multiline]))), 
+                                                                                                                                                                                                      2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=foo\\n)^bar",[multiline]))),
     <<"bar">> = iolist_to_binary(join(re:split("bar","(?<=foo\\n)^bar",[multiline,
-                                                                                                                                                                                   trim]))), 
+                                                                                                                                                                                   trim]))),
     <<"bar">> = iolist_to_binary(join(re:split("bar","(?<=foo\\n)^bar",[multiline,
                                                                                                                                                                                      {parts,
-                                                                                                                                                                                      2}]))), 
-    <<"bar">> = iolist_to_binary(join(re:split("bar","(?<=foo\\n)^bar",[multiline]))), 
+                                                                                                                                                                                      2}]))),
+    <<"bar">> = iolist_to_binary(join(re:split("bar","(?<=foo\\n)^bar",[multiline]))),
     <<"baz
 bar">> = iolist_to_binary(join(re:split("baz
-bar","(?<=foo\\n)^bar",[multiline,trim]))), 
+bar","(?<=foo\\n)^bar",[multiline,trim]))),
     <<"baz
 bar">> = iolist_to_binary(join(re:split("baz
-bar","(?<=foo\\n)^bar",[multiline,{parts,2}]))), 
+bar","(?<=foo\\n)^bar",[multiline,{parts,2}]))),
     <<"baz
 bar">> = iolist_to_binary(join(re:split("baz
-bar","(?<=foo\\n)^bar",[multiline]))), 
-    <<"bar">> = iolist_to_binary(join(re:split("barbaz","(?<=(?<!foo)bar)baz",[trim]))), 
+bar","(?<=foo\\n)^bar",[multiline]))),
+    <<"bar">> = iolist_to_binary(join(re:split("barbaz","(?<=(?<!foo)bar)baz",[trim]))),
     <<"bar:">> = iolist_to_binary(join(re:split("barbaz","(?<=(?<!foo)bar)baz",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<"bar:">> = iolist_to_binary(join(re:split("barbaz","(?<=(?<!foo)bar)baz",[]))), 
-    <<"barbar">> = iolist_to_binary(join(re:split("barbarbaz","(?<=(?<!foo)bar)baz",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<"bar:">> = iolist_to_binary(join(re:split("barbaz","(?<=(?<!foo)bar)baz",[]))),
+    <<"barbar">> = iolist_to_binary(join(re:split("barbarbaz","(?<=(?<!foo)bar)baz",[trim]))),
     <<"barbar:">> = iolist_to_binary(join(re:split("barbarbaz","(?<=(?<!foo)bar)baz",[{parts,
-                                                                                                                                                                                                        2}]))), 
-    <<"barbar:">> = iolist_to_binary(join(re:split("barbarbaz","(?<=(?<!foo)bar)baz",[]))), 
-    <<"koobar">> = iolist_to_binary(join(re:split("koobarbaz","(?<=(?<!foo)bar)baz",[trim]))), 
+                                                                                                                                                                                                        2}]))),
+    <<"barbar:">> = iolist_to_binary(join(re:split("barbarbaz","(?<=(?<!foo)bar)baz",[]))),
+    <<"koobar">> = iolist_to_binary(join(re:split("koobarbaz","(?<=(?<!foo)bar)baz",[trim]))),
     <<"koobar:">> = iolist_to_binary(join(re:split("koobarbaz","(?<=(?<!foo)bar)baz",[{parts,
-                                                                                                                                                                                                        2}]))), 
-    <<"koobar:">> = iolist_to_binary(join(re:split("koobarbaz","(?<=(?<!foo)bar)baz",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(?<!foo)bar)baz",[trim]))), 
+                                                                                                                                                                                                        2}]))),
+    <<"koobar:">> = iolist_to_binary(join(re:split("koobarbaz","(?<=(?<!foo)bar)baz",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(?<!foo)bar)baz",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(?<!foo)bar)baz",[{parts,
-                                                                                                                                                                                                            2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(?<!foo)bar)baz",[]))), 
-    <<"baz">> = iolist_to_binary(join(re:split("baz","(?<=(?<!foo)bar)baz",[trim]))), 
+                                                                                                                                                                                                            2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(?<!foo)bar)baz",[]))),
+    <<"baz">> = iolist_to_binary(join(re:split("baz","(?<=(?<!foo)bar)baz",[trim]))),
     <<"baz">> = iolist_to_binary(join(re:split("baz","(?<=(?<!foo)bar)baz",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<"baz">> = iolist_to_binary(join(re:split("baz","(?<=(?<!foo)bar)baz",[]))), 
-    <<"foobarbaz">> = iolist_to_binary(join(re:split("foobarbaz","(?<=(?<!foo)bar)baz",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<"baz">> = iolist_to_binary(join(re:split("baz","(?<=(?<!foo)bar)baz",[]))),
+    <<"foobarbaz">> = iolist_to_binary(join(re:split("foobarbaz","(?<=(?<!foo)bar)baz",[trim]))),
     <<"foobarbaz">> = iolist_to_binary(join(re:split("foobarbaz","(?<=(?<!foo)bar)baz",[{parts,
-                                                                                                                                                                                                        2}]))), 
-    <<"foobarbaz">> = iolist_to_binary(join(re:split("foobarbaz","(?<=(?<!foo)bar)baz",[]))), 
-    <<"a">> = iolist_to_binary(join(re:split("a","^(a\\1?){4}$",[trim]))), 
+                                                                                                                                                                                                        2}]))),
+    <<"foobarbaz">> = iolist_to_binary(join(re:split("foobarbaz","(?<=(?<!foo)bar)baz",[]))),
+    <<"a">> = iolist_to_binary(join(re:split("a","^(a\\1?){4}$",[trim]))),
     <<"a">> = iolist_to_binary(join(re:split("a","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"a">> = iolist_to_binary(join(re:split("a","^(a\\1?){4}$",[]))), 
-    <<"aa">> = iolist_to_binary(join(re:split("aa","^(a\\1?){4}$",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<"a">> = iolist_to_binary(join(re:split("a","^(a\\1?){4}$",[]))),
+    <<"aa">> = iolist_to_binary(join(re:split("aa","^(a\\1?){4}$",[trim]))),
     <<"aa">> = iolist_to_binary(join(re:split("aa","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<"aa">> = iolist_to_binary(join(re:split("aa","^(a\\1?){4}$",[]))), 
-    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a\\1?){4}$",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<"aa">> = iolist_to_binary(join(re:split("aa","^(a\\1?){4}$",[]))),
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a\\1?){4}$",[trim]))),
     <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a\\1?){4}$",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aaaaa","^(a\\1?){4}$",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a\\1?){4}$",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aaaaa","^(a\\1?){4}$",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aaaaa","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aaaaa","^(a\\1?){4}$",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aaaaaaa","^(a\\1?){4}$",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aaaaa","^(a\\1?){4}$",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aaaaaaa","^(a\\1?){4}$",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aaaaaaa","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aaaaaaa","^(a\\1?){4}$",[]))), 
-    <<"aaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a\\1?){4}$",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aaaaaaa","^(a\\1?){4}$",[]))),
+    <<"aaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a\\1?){4}$",[trim]))),
     <<"aaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<"aaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a\\1?){4}$",[]))), 
-    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?){4}$",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<"aaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a\\1?){4}$",[]))),
+    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?){4}$",[trim]))),
     <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?){4}$",[]))), 
-    <<":aaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?){4}$",[]))),
+    <<":aaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?){4}$",[trim]))),
     <<":aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<":aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?){4}$",[]))), 
-    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<":aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?){4}$",[]))),
+    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?){4}$",[trim]))),
     <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?){4}$",[]))), 
-    <<"aaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?){4}$",[]))),
+    <<"aaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaa","^(a\\1?){4}$",[trim]))),
     <<"aaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaa","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<"aaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaa","^(a\\1?){4}$",[]))), 
-    <<"aaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<"aaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaa","^(a\\1?){4}$",[]))),
+    <<"aaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaa","^(a\\1?){4}$",[trim]))),
     <<"aaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaa","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<"aaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaa","^(a\\1?){4}$",[]))), 
-    <<"aaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<"aaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaa","^(a\\1?){4}$",[]))),
+    <<"aaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaa","^(a\\1?){4}$",[trim]))),
     <<"aaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaa","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<"aaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaa","^(a\\1?){4}$",[]))), 
-    <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<"aaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaa","^(a\\1?){4}$",[]))),
+    <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaa","^(a\\1?){4}$",[trim]))),
     <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaa","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                                                        2}]))), 
-    <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaa","^(a\\1?){4}$",[]))), 
-    <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
+                                                                                                                                                                                                        2}]))),
+    <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaa","^(a\\1?){4}$",[]))),
+    <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaa","^(a\\1?){4}$",[trim]))),
     <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaa","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                                                          2}]))), 
-    <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaa","^(a\\1?){4}$",[]))), 
-    <<"a">> = iolist_to_binary(join(re:split("a","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+                                                                                                                                                                                                          2}]))),
+    <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaa","^(a\\1?){4}$",[]))),
+    <<"a">> = iolist_to_binary(join(re:split("a","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))),
     <<"a">> = iolist_to_binary(join(re:split("a","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
-                                                                                                                                                                                                                   2}]))), 
-    <<"a">> = iolist_to_binary(join(re:split("a","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-    <<"aa">> = iolist_to_binary(join(re:split("aa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+                                                                                                                                                                                                                   2}]))),
+    <<"a">> = iolist_to_binary(join(re:split("a","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))),
+    <<"aa">> = iolist_to_binary(join(re:split("aa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))),
     <<"aa">> = iolist_to_binary(join(re:split("aa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
-                                                                                                                                                                                                                     2}]))), 
-    <<"aa">> = iolist_to_binary(join(re:split("aa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+                                                                                                                                                                                                                     2}]))),
+    <<"aa">> = iolist_to_binary(join(re:split("aa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))),
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))),
     <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
-                                                                                                                                                                                                                       2}]))), 
-    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-    <<":a:a:a:a">> = iolist_to_binary(join(re:split("aaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+                                                                                                                                                                                                                       2}]))),
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))),
+    <<":a:a:a:a">> = iolist_to_binary(join(re:split("aaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))),
     <<":a:a:a:a:">> = iolist_to_binary(join(re:split("aaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
-                                                                                                                                                                                                                         2}]))), 
-    <<":a:a:a:a:">> = iolist_to_binary(join(re:split("aaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-    <<":a:aa:a:a">> = iolist_to_binary(join(re:split("aaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+                                                                                                                                                                                                                         2}]))),
+    <<":a:a:a:a:">> = iolist_to_binary(join(re:split("aaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))),
+    <<":a:aa:a:a">> = iolist_to_binary(join(re:split("aaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))),
     <<":a:aa:a:a:">> = iolist_to_binary(join(re:split("aaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
-                                                                                                                                                                                                                           2}]))), 
-    <<":a:aa:a:a:">> = iolist_to_binary(join(re:split("aaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-    <<":a:aa:a:aa">> = iolist_to_binary(join(re:split("aaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+                                                                                                                                                                                                                           2}]))),
+    <<":a:aa:a:a:">> = iolist_to_binary(join(re:split("aaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))),
+    <<":a:aa:a:aa">> = iolist_to_binary(join(re:split("aaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))),
     <<":a:aa:a:aa:">> = iolist_to_binary(join(re:split("aaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
-                                                                                                                                                                                                                             2}]))), 
-    <<":a:aa:a:aa:">> = iolist_to_binary(join(re:split("aaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-    <<":a:aa:aaa:a">> = iolist_to_binary(join(re:split("aaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+                                                                                                                                                                                                                             2}]))),
+    <<":a:aa:a:aa:">> = iolist_to_binary(join(re:split("aaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))),
+    <<":a:aa:aaa:a">> = iolist_to_binary(join(re:split("aaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))),
     <<":a:aa:aaa:a:">> = iolist_to_binary(join(re:split("aaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
-                                                                                                                                                                                                                               2}]))), 
-    <<":a:aa:aaa:a:">> = iolist_to_binary(join(re:split("aaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-    <<"aaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+                                                                                                                                                                                                                               2}]))),
+    <<":a:aa:aaa:a:">> = iolist_to_binary(join(re:split("aaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))),
+    <<"aaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))),
     <<"aaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
-                                                                                                                                                                                                                                 2}]))), 
-    <<"aaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+                                                                                                                                                                                                                                 2}]))),
+    <<"aaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))),
+    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))),
     <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
-                                                                                                                                                                                                                                   2}]))), 
-    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-    <<":a:aa:aaa:aaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+                                                                                                                                                                                                                                   2}]))),
+    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))),
+    <<":a:aa:aaa:aaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))),
     <<":a:aa:aaa:aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
-                                                                                                                                                                                                                                     2}]))), 
-    <<":a:aa:aaa:aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+                                                                                                                                                                                                                                     2}]))),
+    <<":a:aa:aaa:aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))),
+    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))),
     <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
-                                                                                                                                                                                                                                       2}]))), 
-    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-    <<"aaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+                                                                                                                                                                                                                                       2}]))),
+    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))),
+    <<"aaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))),
     <<"aaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
-                                                                                                                                                                                                                                         2}]))), 
-    <<"aaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-    <<"aaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+                                                                                                                                                                                                                                         2}]))),
+    <<"aaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))),
+    <<"aaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))),
     <<"aaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
-                                                                                                                                                                                                                                           2}]))), 
-    <<"aaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-    <<"aaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+                                                                                                                                                                                                                                           2}]))),
+    <<"aaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))),
+    <<"aaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))),
     <<"aaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
-                                                                                                                                                                                                                                             2}]))), 
-    <<"aaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-    <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+                                                                                                                                                                                                                                             2}]))),
+    <<"aaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))),
+    <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))),
     <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
-                                                                                                                                                                                                                                               2}]))), 
-    <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-    <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+                                                                                                                                                                                                                                               2}]))),
+    <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))),
+    <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))),
     <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
-                                                                                                                                                                                                                                                 2}]))), 
-    <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","abc",[trim]))), 
+                                                                                                                                                                                                                                                 2}]))),
+    <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","abc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","abc",[{parts,
-                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","abc",[]))), 
-    <<"x:y">> = iolist_to_binary(join(re:split("xabcy","abc",[trim]))), 
+                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","abc",[]))),
+    <<"x:y">> = iolist_to_binary(join(re:split("xabcy","abc",[trim]))),
     <<"x:y">> = iolist_to_binary(join(re:split("xabcy","abc",[{parts,
-                                                                                                                                                                2}]))), 
-    <<"x:y">> = iolist_to_binary(join(re:split("xabcy","abc",[]))), 
-    <<"ab">> = iolist_to_binary(join(re:split("ababc","abc",[trim]))), 
+                                                                                                                                                                2}]))),
+    <<"x:y">> = iolist_to_binary(join(re:split("xabcy","abc",[]))),
+    <<"ab">> = iolist_to_binary(join(re:split("ababc","abc",[trim]))),
     <<"ab:">> = iolist_to_binary(join(re:split("ababc","abc",[{parts,
-                                                                                                                                                                2}]))), 
-    <<"ab:">> = iolist_to_binary(join(re:split("ababc","abc",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[trim]))), 
+                                                                                                                                                                2}]))),
+    <<"ab:">> = iolist_to_binary(join(re:split("ababc","abc",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[]))), 
-    <<"xbc">> = iolist_to_binary(join(re:split("xbc","abc",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[]))),
+    <<"xbc">> = iolist_to_binary(join(re:split("xbc","abc",[trim]))),
     <<"xbc">> = iolist_to_binary(join(re:split("xbc","abc",[{parts,
-                                                                                                                                                            2}]))), 
-    <<"xbc">> = iolist_to_binary(join(re:split("xbc","abc",[]))), 
-    <<"axc">> = iolist_to_binary(join(re:split("axc","abc",[trim]))), 
+                                                                                                                                                            2}]))),
+    <<"xbc">> = iolist_to_binary(join(re:split("xbc","abc",[]))),
+    <<"axc">> = iolist_to_binary(join(re:split("axc","abc",[trim]))),
     <<"axc">> = iolist_to_binary(join(re:split("axc","abc",[{parts,
-                                                                                                                                                            2}]))), 
-    <<"axc">> = iolist_to_binary(join(re:split("axc","abc",[]))), 
-    <<"abx">> = iolist_to_binary(join(re:split("abx","abc",[trim]))), 
+                                                                                                                                                            2}]))),
+    <<"axc">> = iolist_to_binary(join(re:split("axc","abc",[]))),
+    <<"abx">> = iolist_to_binary(join(re:split("abx","abc",[trim]))),
     <<"abx">> = iolist_to_binary(join(re:split("abx","abc",[{parts,
-                                                                                                                                                            2}]))), 
-    <<"abx">> = iolist_to_binary(join(re:split("abx","abc",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","ab*c",[trim]))), 
+                                                                                                                                                            2}]))),
+    <<"abx">> = iolist_to_binary(join(re:split("abx","abc",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","ab*c",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","ab*c",[{parts,
-                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","ab*c",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","ab*bc",[trim]))), 
+                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","ab*c",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","ab*bc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","ab*bc",[{parts,
-                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","ab*bc",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abbc","ab*bc",[trim]))), 
+                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","ab*bc",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abbc","ab*bc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abbc","ab*bc",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abbc","ab*bc",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abbbbc","ab*bc",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abbc","ab*bc",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abbbbc","ab*bc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abbbbc","ab*bc",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab*bc",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abbbbc",".{1}",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab*bc",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abbbbc",".{1}",[trim]))),
     <<":bbbbc">> = iolist_to_binary(join(re:split("abbbbc",".{1}",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<"::::::">> = iolist_to_binary(join(re:split("abbbbc",".{1}",[]))), 
-    <<":bc">> = iolist_to_binary(join(re:split("abbbbc",".{3,4}",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<"::::::">> = iolist_to_binary(join(re:split("abbbbc",".{1}",[]))),
+    <<":bc">> = iolist_to_binary(join(re:split("abbbbc",".{3,4}",[trim]))),
     <<":bc">> = iolist_to_binary(join(re:split("abbbbc",".{3,4}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":bc">> = iolist_to_binary(join(re:split("abbbbc",".{3,4}",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abbbbc","ab{0,}bc",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":bc">> = iolist_to_binary(join(re:split("abbbbc",".{3,4}",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abbbbc","ab{0,}bc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{0,}bc",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{0,}bc",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abbc","ab+bc",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{0,}bc",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abbc","ab+bc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abbc","ab+bc",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abbc","ab+bc",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab+bc",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abbc","ab+bc",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab+bc",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab+bc",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab+bc",[]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","ab+bc",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab+bc",[]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","ab+bc",[trim]))),
     <<"abc">> = iolist_to_binary(join(re:split("abc","ab+bc",[{parts,
-                                                                                                                                                                2}]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","ab+bc",[]))), 
-    <<"abq">> = iolist_to_binary(join(re:split("abq","ab+bc",[trim]))), 
+                                                                                                                                                                2}]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","ab+bc",[]))),
+    <<"abq">> = iolist_to_binary(join(re:split("abq","ab+bc",[trim]))),
     <<"abq">> = iolist_to_binary(join(re:split("abq","ab+bc",[{parts,
-                                                                                                                                                                2}]))), 
-    <<"abq">> = iolist_to_binary(join(re:split("abq","ab+bc",[]))), 
+                                                                                                                                                                2}]))),
+    <<"abq">> = iolist_to_binary(join(re:split("abq","ab+bc",[]))),
     ok.
 run15() ->
-    <<"">> = iolist_to_binary(join(re:split("abbbbc","ab+bc",[trim]))), 
+    <<"">> = iolist_to_binary(join(re:split("abbbbc","ab+bc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abbbbc","ab+bc",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab+bc",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abbbbc","ab{1,}bc",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab+bc",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abbbbc","ab{1,}bc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{1,}bc",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{1,}bc",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abbbbc","ab{1,3}bc",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{1,}bc",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abbbbc","ab{1,3}bc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{1,3}bc",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{1,3}bc",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abbbbc","ab{3,4}bc",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{1,3}bc",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abbbbc","ab{3,4}bc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{3,4}bc",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{3,4}bc",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{4,5}bc",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{3,4}bc",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{4,5}bc",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{4,5}bc",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{4,5}bc",[]))), 
-    <<"abq">> = iolist_to_binary(join(re:split("abq","ab{4,5}bc",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{4,5}bc",[]))),
+    <<"abq">> = iolist_to_binary(join(re:split("abq","ab{4,5}bc",[trim]))),
     <<"abq">> = iolist_to_binary(join(re:split("abq","ab{4,5}bc",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"abq">> = iolist_to_binary(join(re:split("abq","ab{4,5}bc",[]))), 
-    <<"abbbbc">> = iolist_to_binary(join(re:split("abbbbc","ab{4,5}bc",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"abq">> = iolist_to_binary(join(re:split("abq","ab{4,5}bc",[]))),
+    <<"abbbbc">> = iolist_to_binary(join(re:split("abbbbc","ab{4,5}bc",[trim]))),
     <<"abbbbc">> = iolist_to_binary(join(re:split("abbbbc","ab{4,5}bc",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<"abbbbc">> = iolist_to_binary(join(re:split("abbbbc","ab{4,5}bc",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abbc","ab?bc",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<"abbbbc">> = iolist_to_binary(join(re:split("abbbbc","ab{4,5}bc",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abbc","ab?bc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abbc","ab?bc",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abbc","ab?bc",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","ab?bc",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abbc","ab?bc",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","ab?bc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","ab?bc",[{parts,
-                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","ab?bc",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","ab{0,1}bc",[trim]))), 
+                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","ab?bc",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","ab{0,1}bc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","ab{0,1}bc",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","ab{0,1}bc",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","ab?c",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","ab{0,1}bc",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","ab?c",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","ab?c",[{parts,
-                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","ab?c",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","ab{0,1}c",[trim]))), 
+                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","ab?c",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","ab{0,1}c",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","ab{0,1}c",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","ab{0,1}c",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","^abc$",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","ab{0,1}c",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","^abc$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","^abc$",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","^abc$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","^abc$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[]))), 
-    <<"abbbbc">> = iolist_to_binary(join(re:split("abbbbc","^abc$",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[]))),
+    <<"abbbbc">> = iolist_to_binary(join(re:split("abbbbc","^abc$",[trim]))),
     <<"abbbbc">> = iolist_to_binary(join(re:split("abbbbc","^abc$",[{parts,
-                                                                                                                                                                       2}]))), 
-    <<"abbbbc">> = iolist_to_binary(join(re:split("abbbbc","^abc$",[]))), 
-    <<"abcc">> = iolist_to_binary(join(re:split("abcc","^abc$",[trim]))), 
+                                                                                                                                                                       2}]))),
+    <<"abbbbc">> = iolist_to_binary(join(re:split("abbbbc","^abc$",[]))),
+    <<"abcc">> = iolist_to_binary(join(re:split("abcc","^abc$",[trim]))),
     <<"abcc">> = iolist_to_binary(join(re:split("abcc","^abc$",[{parts,
-                                                                                                                                                                   2}]))), 
-    <<"abcc">> = iolist_to_binary(join(re:split("abcc","^abc$",[]))), 
-    <<":c">> = iolist_to_binary(join(re:split("abcc","^abc",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<"abcc">> = iolist_to_binary(join(re:split("abcc","^abc$",[]))),
+    <<":c">> = iolist_to_binary(join(re:split("abcc","^abc",[trim]))),
     <<":c">> = iolist_to_binary(join(re:split("abcc","^abc",[{parts,
-                                                                                                                                                                2}]))), 
-    <<":c">> = iolist_to_binary(join(re:split("abcc","^abc",[]))), 
-    <<"a">> = iolist_to_binary(join(re:split("aabc","abc$",[trim]))), 
+                                                                                                                                                                2}]))),
+    <<":c">> = iolist_to_binary(join(re:split("abcc","^abc",[]))),
+    <<"a">> = iolist_to_binary(join(re:split("aabc","abc$",[trim]))),
     <<"a:">> = iolist_to_binary(join(re:split("aabc","abc$",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<"a:">> = iolist_to_binary(join(re:split("aabc","abc$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc$",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<"a:">> = iolist_to_binary(join(re:split("aabc","abc$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc$",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc$",[]))), 
-    <<"a">> = iolist_to_binary(join(re:split("aabc","abc$",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc$",[]))),
+    <<"a">> = iolist_to_binary(join(re:split("aabc","abc$",[trim]))),
     <<"a:">> = iolist_to_binary(join(re:split("aabc","abc$",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<"a:">> = iolist_to_binary(join(re:split("aabc","abc$",[]))), 
-    <<"aabcd">> = iolist_to_binary(join(re:split("aabcd","abc$",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<"a:">> = iolist_to_binary(join(re:split("aabc","abc$",[]))),
+    <<"aabcd">> = iolist_to_binary(join(re:split("aabcd","abc$",[trim]))),
     <<"aabcd">> = iolist_to_binary(join(re:split("aabcd","abc$",[{parts,
-                                                                                                                                                                   2}]))), 
-    <<"aabcd">> = iolist_to_binary(join(re:split("aabcd","abc$",[]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","^",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<"aabcd">> = iolist_to_binary(join(re:split("aabcd","abc$",[]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^",[trim]))),
     <<"abc">> = iolist_to_binary(join(re:split("abc","^",[{parts,
-                                                                                                                                                        2}]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","^",[]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","$",[trim]))), 
+                                                                                                                                                        2}]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^",[]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","$",[trim]))),
     <<"abc:">> = iolist_to_binary(join(re:split("abc","$",[{parts,
-                                                                                                                                                         2}]))), 
-    <<"abc:">> = iolist_to_binary(join(re:split("abc","$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","a.c",[trim]))), 
+                                                                                                                                                         2}]))),
+    <<"abc:">> = iolist_to_binary(join(re:split("abc","$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","a.c",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","a.c",[{parts,
-                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","a.c",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("axc","a.c",[trim]))), 
+                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","a.c",[]))),
+    <<"">> = iolist_to_binary(join(re:split("axc","a.c",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("axc","a.c",[{parts,
-                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("axc","a.c",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("axyzc","a.*c",[trim]))), 
+                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("axc","a.c",[]))),
+    <<"">> = iolist_to_binary(join(re:split("axyzc","a.*c",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("axyzc","a.*c",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("axyzc","a.*c",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abd","a[bc]d",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("axyzc","a.*c",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abd","a[bc]d",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abd","a[bc]d",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abd","a[bc]d",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[bc]d",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abd","a[bc]d",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[bc]d",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[bc]d",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[bc]d",[]))), 
-    <<"axyzd">> = iolist_to_binary(join(re:split("axyzd","a[bc]d",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[bc]d",[]))),
+    <<"axyzd">> = iolist_to_binary(join(re:split("axyzd","a[bc]d",[trim]))),
     <<"axyzd">> = iolist_to_binary(join(re:split("axyzd","a[bc]d",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<"axyzd">> = iolist_to_binary(join(re:split("axyzd","a[bc]d",[]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","a[bc]d",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<"axyzd">> = iolist_to_binary(join(re:split("axyzd","a[bc]d",[]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","a[bc]d",[trim]))),
     <<"abc">> = iolist_to_binary(join(re:split("abc","a[bc]d",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","a[bc]d",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("ace","a[b-d]e",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","a[bc]d",[]))),
+    <<"">> = iolist_to_binary(join(re:split("ace","a[b-d]e",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("ace","a[b-d]e",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ace","a[b-d]e",[]))), 
+                                                                                                                                                                    2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ace","a[b-d]e",[]))),
     ok.
 run16() ->
-    <<"a">> = iolist_to_binary(join(re:split("aac","a[b-d]",[trim]))), 
+    <<"a">> = iolist_to_binary(join(re:split("aac","a[b-d]",[trim]))),
     <<"a:">> = iolist_to_binary(join(re:split("aac","a[b-d]",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<"a:">> = iolist_to_binary(join(re:split("aac","a[b-d]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a-","a[-b]",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<"a:">> = iolist_to_binary(join(re:split("aac","a[b-d]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a-","a[-b]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a-","a[-b]",[{parts,
-                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a-","a[-b]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a-","a[b-]",[trim]))), 
+                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a-","a[-b]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a-","a[b-]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a-","a[b-]",[{parts,
-                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a-","a[b-]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a]","a]",[trim]))), 
+                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a-","a[b-]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a]","a]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a]","a]",[{parts,
-                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a]","a]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a]b","a[]]b",[trim]))), 
+                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a]","a]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a]b","a[]]b",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a]b","a[]]b",[{parts,
-                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a]b","a[]]b",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aed","a[^bc]d",[trim]))), 
+                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a]b","a[]]b",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aed","a[^bc]d",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aed","a[^bc]d",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aed","a[^bc]d",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^bc]d",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aed","a[^bc]d",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^bc]d",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^bc]d",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^bc]d",[]))), 
-    <<"abd">> = iolist_to_binary(join(re:split("abd","a[^bc]d",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^bc]d",[]))),
+    <<"abd">> = iolist_to_binary(join(re:split("abd","a[^bc]d",[trim]))),
     <<"abd">> = iolist_to_binary(join(re:split("abd","a[^bc]d",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<"abd">> = iolist_to_binary(join(re:split("abd","a[^bc]d",[]))), 
-    <<"abd">> = iolist_to_binary(join(re:split("abd","a[^bc]d",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<"abd">> = iolist_to_binary(join(re:split("abd","a[^bc]d",[]))),
+    <<"abd">> = iolist_to_binary(join(re:split("abd","a[^bc]d",[trim]))),
     <<"abd">> = iolist_to_binary(join(re:split("abd","a[^bc]d",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<"abd">> = iolist_to_binary(join(re:split("abd","a[^bc]d",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("adc","a[^-b]c",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<"abd">> = iolist_to_binary(join(re:split("abd","a[^bc]d",[]))),
+    <<"">> = iolist_to_binary(join(re:split("adc","a[^-b]c",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("adc","a[^-b]c",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("adc","a[^-b]c",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("adc","a[^]b]c",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<":">> = iolist_to_binary(join(re:split("adc","a[^-b]c",[]))),
+    <<"">> = iolist_to_binary(join(re:split("adc","a[^]b]c",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("adc","a[^]b]c",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("adc","a[^]b]c",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^]b]c",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<":">> = iolist_to_binary(join(re:split("adc","a[^]b]c",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^]b]c",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^]b]c",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^]b]c",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a-c","a[^]b]c",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^]b]c",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a-c","a[^]b]c",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a-c","a[^]b]c",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a-c","a[^]b]c",[]))), 
-    <<"a]c">> = iolist_to_binary(join(re:split("a]c","a[^]b]c",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a-c","a[^]b]c",[]))),
+    <<"a]c">> = iolist_to_binary(join(re:split("a]c","a[^]b]c",[trim]))),
     <<"a]c">> = iolist_to_binary(join(re:split("a]c","a[^]b]c",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<"a]c">> = iolist_to_binary(join(re:split("a]c","a[^]b]c",[]))), 
-    <<":-">> = iolist_to_binary(join(re:split("a-","\\ba\\b",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<"a]c">> = iolist_to_binary(join(re:split("a]c","a[^]b]c",[]))),
+    <<":-">> = iolist_to_binary(join(re:split("a-","\\ba\\b",[trim]))),
     <<":-">> = iolist_to_binary(join(re:split("a-","\\ba\\b",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<":-">> = iolist_to_binary(join(re:split("a-","\\ba\\b",[]))), 
-    <<"-">> = iolist_to_binary(join(re:split("-a","\\ba\\b",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<":-">> = iolist_to_binary(join(re:split("a-","\\ba\\b",[]))),
+    <<"-">> = iolist_to_binary(join(re:split("-a","\\ba\\b",[trim]))),
     <<"-:">> = iolist_to_binary(join(re:split("-a","\\ba\\b",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<"-:">> = iolist_to_binary(join(re:split("-a","\\ba\\b",[]))), 
-    <<"-:-">> = iolist_to_binary(join(re:split("-a-","\\ba\\b",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<"-:">> = iolist_to_binary(join(re:split("-a","\\ba\\b",[]))),
+    <<"-:-">> = iolist_to_binary(join(re:split("-a-","\\ba\\b",[trim]))),
     <<"-:-">> = iolist_to_binary(join(re:split("-a-","\\ba\\b",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<"-:-">> = iolist_to_binary(join(re:split("-a-","\\ba\\b",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\by\\b",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<"-:-">> = iolist_to_binary(join(re:split("-a-","\\ba\\b",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\by\\b",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\by\\b",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\by\\b",[]))), 
-    <<"xy">> = iolist_to_binary(join(re:split("xy","\\by\\b",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\by\\b",[]))),
+    <<"xy">> = iolist_to_binary(join(re:split("xy","\\by\\b",[trim]))),
     <<"xy">> = iolist_to_binary(join(re:split("xy","\\by\\b",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<"xy">> = iolist_to_binary(join(re:split("xy","\\by\\b",[]))), 
-    <<"yz">> = iolist_to_binary(join(re:split("yz","\\by\\b",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<"xy">> = iolist_to_binary(join(re:split("xy","\\by\\b",[]))),
+    <<"yz">> = iolist_to_binary(join(re:split("yz","\\by\\b",[trim]))),
     <<"yz">> = iolist_to_binary(join(re:split("yz","\\by\\b",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<"yz">> = iolist_to_binary(join(re:split("yz","\\by\\b",[]))), 
-    <<"xyz">> = iolist_to_binary(join(re:split("xyz","\\by\\b",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<"yz">> = iolist_to_binary(join(re:split("yz","\\by\\b",[]))),
+    <<"xyz">> = iolist_to_binary(join(re:split("xyz","\\by\\b",[trim]))),
     <<"xyz">> = iolist_to_binary(join(re:split("xyz","\\by\\b",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<"xyz">> = iolist_to_binary(join(re:split("xyz","\\by\\b",[]))), 
-    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","\\Ba\\B",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<"xyz">> = iolist_to_binary(join(re:split("xyz","\\by\\b",[]))),
+    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","\\Ba\\B",[trim]))),
     <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","\\Ba\\B",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","\\Ba\\B",[]))), 
-    <<"a-">> = iolist_to_binary(join(re:split("a-","\\Ba\\B",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","\\Ba\\B",[]))),
+    <<"a-">> = iolist_to_binary(join(re:split("a-","\\Ba\\B",[trim]))),
     <<"a-">> = iolist_to_binary(join(re:split("a-","\\Ba\\B",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<"a-">> = iolist_to_binary(join(re:split("a-","\\Ba\\B",[]))), 
-    <<"-a">> = iolist_to_binary(join(re:split("-a","\\Ba\\B",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<"a-">> = iolist_to_binary(join(re:split("a-","\\Ba\\B",[]))),
+    <<"-a">> = iolist_to_binary(join(re:split("-a","\\Ba\\B",[trim]))),
     <<"-a">> = iolist_to_binary(join(re:split("-a","\\Ba\\B",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<"-a">> = iolist_to_binary(join(re:split("-a","\\Ba\\B",[]))), 
-    <<"-a-">> = iolist_to_binary(join(re:split("-a-","\\Ba\\B",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<"-a">> = iolist_to_binary(join(re:split("-a","\\Ba\\B",[]))),
+    <<"-a-">> = iolist_to_binary(join(re:split("-a-","\\Ba\\B",[trim]))),
     <<"-a-">> = iolist_to_binary(join(re:split("-a-","\\Ba\\B",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<"-a-">> = iolist_to_binary(join(re:split("-a-","\\Ba\\B",[]))), 
-    <<"x">> = iolist_to_binary(join(re:split("xy","\\By\\b",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<"-a-">> = iolist_to_binary(join(re:split("-a-","\\Ba\\B",[]))),
+    <<"x">> = iolist_to_binary(join(re:split("xy","\\By\\b",[trim]))),
     <<"x:">> = iolist_to_binary(join(re:split("xy","\\By\\b",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<"x:">> = iolist_to_binary(join(re:split("xy","\\By\\b",[]))), 
-    <<":z">> = iolist_to_binary(join(re:split("yz","\\by\\B",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<"x:">> = iolist_to_binary(join(re:split("xy","\\By\\b",[]))),
+    <<":z">> = iolist_to_binary(join(re:split("yz","\\by\\B",[trim]))),
     <<":z">> = iolist_to_binary(join(re:split("yz","\\by\\B",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<":z">> = iolist_to_binary(join(re:split("yz","\\by\\B",[]))), 
-    <<"x:z">> = iolist_to_binary(join(re:split("xyz","\\By\\B",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<":z">> = iolist_to_binary(join(re:split("yz","\\by\\B",[]))),
+    <<"x:z">> = iolist_to_binary(join(re:split("xyz","\\By\\B",[trim]))),
     <<"x:z">> = iolist_to_binary(join(re:split("xyz","\\By\\B",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<"x:z">> = iolist_to_binary(join(re:split("xyz","\\By\\B",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","\\w",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<"x:z">> = iolist_to_binary(join(re:split("xyz","\\By\\B",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a","\\w",[{parts,
-                                                                                                                                                         2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a","\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("-","\\W",[trim]))), 
+                                                                                                                                                         2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a","\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("-","\\W",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("-","\\W",[{parts,
-                                                                                                                                                         2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("-","\\W",[]))), 
-    <<"::::Failers">> = iolist_to_binary(join(re:split("*** Failers","\\W",[trim]))), 
+                                                                                                                                                         2}]))),
+    <<":">> = iolist_to_binary(join(re:split("-","\\W",[]))),
+    <<"::::Failers">> = iolist_to_binary(join(re:split("*** Failers","\\W",[trim]))),
     <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\W",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<"::::Failers">> = iolist_to_binary(join(re:split("*** Failers","\\W",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("-","\\W",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<"::::Failers">> = iolist_to_binary(join(re:split("*** Failers","\\W",[]))),
+    <<"">> = iolist_to_binary(join(re:split("-","\\W",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("-","\\W",[{parts,
-                                                                                                                                                         2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("-","\\W",[]))), 
-    <<"a">> = iolist_to_binary(join(re:split("a","\\W",[trim]))), 
+                                                                                                                                                         2}]))),
+    <<":">> = iolist_to_binary(join(re:split("-","\\W",[]))),
+    <<"a">> = iolist_to_binary(join(re:split("a","\\W",[trim]))),
     <<"a">> = iolist_to_binary(join(re:split("a","\\W",[{parts,
-                                                                                                                                                         2}]))), 
-    <<"a">> = iolist_to_binary(join(re:split("a","\\W",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a b","a\\sb",[trim]))), 
+                                                                                                                                                         2}]))),
+    <<"a">> = iolist_to_binary(join(re:split("a","\\W",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a b","a\\sb",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a b","a\\sb",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a b","a\\sb",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a-b","a\\Sb",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a b","a\\sb",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a-b","a\\Sb",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a-b","a\\Sb",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a-b","a\\Sb",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a\\Sb",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a-b","a\\Sb",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a\\Sb",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a\\Sb",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a\\Sb",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a-b","a\\Sb",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a\\Sb",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a-b","a\\Sb",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a-b","a\\Sb",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a-b","a\\Sb",[]))), 
-    <<"a b">> = iolist_to_binary(join(re:split("a b","a\\Sb",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a-b","a\\Sb",[]))),
+    <<"a b">> = iolist_to_binary(join(re:split("a b","a\\Sb",[trim]))),
     <<"a b">> = iolist_to_binary(join(re:split("a b","a\\Sb",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<"a b">> = iolist_to_binary(join(re:split("a b","a\\Sb",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("1","\\d",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<"a b">> = iolist_to_binary(join(re:split("a b","a\\Sb",[]))),
+    <<"">> = iolist_to_binary(join(re:split("1","\\d",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("1","\\d",[{parts,
-                                                                                                                                                         2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("1","\\d",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("-","\\D",[trim]))), 
+                                                                                                                                                         2}]))),
+    <<":">> = iolist_to_binary(join(re:split("1","\\d",[]))),
+    <<"">> = iolist_to_binary(join(re:split("-","\\D",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("-","\\D",[{parts,
-                                                                                                                                                         2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("-","\\D",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("*** Failers","\\D",[trim]))), 
+                                                                                                                                                         2}]))),
+    <<":">> = iolist_to_binary(join(re:split("-","\\D",[]))),
+    <<"">> = iolist_to_binary(join(re:split("*** Failers","\\D",[trim]))),
     <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\D",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<":::::::::::">> = iolist_to_binary(join(re:split("*** Failers","\\D",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("-","\\D",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<":::::::::::">> = iolist_to_binary(join(re:split("*** Failers","\\D",[]))),
+    <<"">> = iolist_to_binary(join(re:split("-","\\D",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("-","\\D",[{parts,
-                                                                                                                                                         2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("-","\\D",[]))), 
-    <<"1">> = iolist_to_binary(join(re:split("1","\\D",[trim]))), 
+                                                                                                                                                         2}]))),
+    <<":">> = iolist_to_binary(join(re:split("-","\\D",[]))),
+    <<"1">> = iolist_to_binary(join(re:split("1","\\D",[trim]))),
     <<"1">> = iolist_to_binary(join(re:split("1","\\D",[{parts,
-                                                                                                                                                         2}]))), 
-    <<"1">> = iolist_to_binary(join(re:split("1","\\D",[]))), 
+                                                                                                                                                         2}]))),
+    <<"1">> = iolist_to_binary(join(re:split("1","\\D",[]))),
     ok.
 run17() ->
-    <<"">> = iolist_to_binary(join(re:split("a","[\\w]",[trim]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","[\\w]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a","[\\w]",[{parts,
-                                                                                                                                                             2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a","[\\w]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("-","[\\W]",[trim]))), 
+                                                                                                                                                             2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a","[\\w]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("-","[\\W]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("-","[\\W]",[{parts,
-                                                                                                                                                             2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("-","[\\W]",[]))), 
-    <<"::::Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\W]",[trim]))), 
+                                                                                                                                                             2}]))),
+    <<":">> = iolist_to_binary(join(re:split("-","[\\W]",[]))),
+    <<"::::Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\W]",[trim]))),
     <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\W]",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<"::::Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\W]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("-","[\\W]",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<"::::Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\W]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("-","[\\W]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("-","[\\W]",[{parts,
-                                                                                                                                                             2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("-","[\\W]",[]))), 
-    <<"a">> = iolist_to_binary(join(re:split("a","[\\W]",[trim]))), 
+                                                                                                                                                             2}]))),
+    <<":">> = iolist_to_binary(join(re:split("-","[\\W]",[]))),
+    <<"a">> = iolist_to_binary(join(re:split("a","[\\W]",[trim]))),
     <<"a">> = iolist_to_binary(join(re:split("a","[\\W]",[{parts,
-                                                                                                                                                             2}]))), 
-    <<"a">> = iolist_to_binary(join(re:split("a","[\\W]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a b","a[\\s]b",[trim]))), 
+                                                                                                                                                             2}]))),
+    <<"a">> = iolist_to_binary(join(re:split("a","[\\W]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a b","a[\\s]b",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a b","a[\\s]b",[{parts,
-                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a b","a[\\s]b",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a-b","a[\\S]b",[trim]))), 
+                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a b","a[\\s]b",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a-b","a[\\S]b",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a-b","a[\\S]b",[{parts,
-                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a-b","a[\\S]b",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[\\S]b",[trim]))), 
+                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a-b","a[\\S]b",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[\\S]b",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[\\S]b",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[\\S]b",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a-b","a[\\S]b",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[\\S]b",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a-b","a[\\S]b",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a-b","a[\\S]b",[{parts,
-                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a-b","a[\\S]b",[]))), 
-    <<"a b">> = iolist_to_binary(join(re:split("a b","a[\\S]b",[trim]))), 
+                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a-b","a[\\S]b",[]))),
+    <<"a b">> = iolist_to_binary(join(re:split("a b","a[\\S]b",[trim]))),
     <<"a b">> = iolist_to_binary(join(re:split("a b","a[\\S]b",[{parts,
-                                                                                                                                                                     2}]))), 
-    <<"a b">> = iolist_to_binary(join(re:split("a b","a[\\S]b",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("1","[\\d]",[trim]))), 
+                                                                                                                                                                     2}]))),
+    <<"a b">> = iolist_to_binary(join(re:split("a b","a[\\S]b",[]))),
+    <<"">> = iolist_to_binary(join(re:split("1","[\\d]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("1","[\\d]",[{parts,
-                                                                                                                                                             2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("1","[\\d]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("-","[\\D]",[trim]))), 
+                                                                                                                                                             2}]))),
+    <<":">> = iolist_to_binary(join(re:split("1","[\\d]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("-","[\\D]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("-","[\\D]",[{parts,
-                                                                                                                                                             2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("-","[\\D]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("*** Failers","[\\D]",[trim]))), 
+                                                                                                                                                             2}]))),
+    <<":">> = iolist_to_binary(join(re:split("-","[\\D]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("*** Failers","[\\D]",[trim]))),
     <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\D]",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<":::::::::::">> = iolist_to_binary(join(re:split("*** Failers","[\\D]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("-","[\\D]",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<":::::::::::">> = iolist_to_binary(join(re:split("*** Failers","[\\D]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("-","[\\D]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("-","[\\D]",[{parts,
-                                                                                                                                                             2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("-","[\\D]",[]))), 
-    <<"1">> = iolist_to_binary(join(re:split("1","[\\D]",[trim]))), 
+                                                                                                                                                             2}]))),
+    <<":">> = iolist_to_binary(join(re:split("-","[\\D]",[]))),
+    <<"1">> = iolist_to_binary(join(re:split("1","[\\D]",[trim]))),
     <<"1">> = iolist_to_binary(join(re:split("1","[\\D]",[{parts,
-                                                                                                                                                             2}]))), 
-    <<"1">> = iolist_to_binary(join(re:split("1","[\\D]",[]))), 
-    <<":c">> = iolist_to_binary(join(re:split("abc","ab|cd",[trim]))), 
+                                                                                                                                                             2}]))),
+    <<"1">> = iolist_to_binary(join(re:split("1","[\\D]",[]))),
+    <<":c">> = iolist_to_binary(join(re:split("abc","ab|cd",[trim]))),
     <<":c">> = iolist_to_binary(join(re:split("abc","ab|cd",[{parts,
-                                                                                                                                                                2}]))), 
-    <<":c">> = iolist_to_binary(join(re:split("abc","ab|cd",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abcd","ab|cd",[trim]))), 
+                                                                                                                                                                2}]))),
+    <<":c">> = iolist_to_binary(join(re:split("abc","ab|cd",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abcd","ab|cd",[trim]))),
     <<":cd">> = iolist_to_binary(join(re:split("abcd","ab|cd",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("abcd","ab|cd",[]))), 
-    <<"d">> = iolist_to_binary(join(re:split("def","()ef",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("abcd","ab|cd",[]))),
+    <<"d">> = iolist_to_binary(join(re:split("def","()ef",[trim]))),
     <<"d::">> = iolist_to_binary(join(re:split("def","()ef",[{parts,
-                                                                                                                                                              2}]))), 
-    <<"d::">> = iolist_to_binary(join(re:split("def","()ef",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a(b","a\\(b",[trim]))), 
+                                                                                                                                                              2}]))),
+    <<"d::">> = iolist_to_binary(join(re:split("def","()ef",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a(b","a\\(b",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a(b","a\\(b",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a(b","a\\(b",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("ab","a\\(*b",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a(b","a\\(b",[]))),
+    <<"">> = iolist_to_binary(join(re:split("ab","a\\(*b",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("ab","a\\(*b",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ab","a\\(*b",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a((b","a\\(*b",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ab","a\\(*b",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a((b","a\\(*b",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a((b","a\\(*b",[{parts,
-                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a((b","a\\(*b",[]))), 
-    <<"a">> = iolist_to_binary(join(re:split("a","a\\\\b",[trim]))), 
+                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a((b","a\\(*b",[]))),
+    <<"a">> = iolist_to_binary(join(re:split("a","a\\\\b",[trim]))),
     <<"a">> = iolist_to_binary(join(re:split("a","a\\\\b",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<"a">> = iolist_to_binary(join(re:split("a","a\\\\b",[]))), 
-    <<":a:a:bc">> = iolist_to_binary(join(re:split("abc","((a))",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<"a">> = iolist_to_binary(join(re:split("a","a\\\\b",[]))),
+    <<":a:a:bc">> = iolist_to_binary(join(re:split("abc","((a))",[trim]))),
     <<":a:a:bc">> = iolist_to_binary(join(re:split("abc","((a))",[{parts,
-                                                                                                                                                                2}]))), 
-    <<":a:a:bc">> = iolist_to_binary(join(re:split("abc","((a))",[]))), 
-    <<":a:c">> = iolist_to_binary(join(re:split("abc","(a)b(c)",[trim]))), 
+                                                                                                                                                                2}]))),
+    <<":a:a:bc">> = iolist_to_binary(join(re:split("abc","((a))",[]))),
+    <<":a:c">> = iolist_to_binary(join(re:split("abc","(a)b(c)",[trim]))),
     <<":a:c:">> = iolist_to_binary(join(re:split("abc","(a)b(c)",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<":a:c:">> = iolist_to_binary(join(re:split("abc","(a)b(c)",[]))), 
-    <<"aabb">> = iolist_to_binary(join(re:split("aabbabc","a+b+c",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<":a:c:">> = iolist_to_binary(join(re:split("abc","(a)b(c)",[]))),
+    <<"aabb">> = iolist_to_binary(join(re:split("aabbabc","a+b+c",[trim]))),
     <<"aabb:">> = iolist_to_binary(join(re:split("aabbabc","a+b+c",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"aabb:">> = iolist_to_binary(join(re:split("aabbabc","a+b+c",[]))), 
-    <<"aabb">> = iolist_to_binary(join(re:split("aabbabc","a{1,}b{1,}c",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"aabb:">> = iolist_to_binary(join(re:split("aabbabc","a+b+c",[]))),
+    <<"aabb">> = iolist_to_binary(join(re:split("aabbabc","a{1,}b{1,}c",[trim]))),
     <<"aabb:">> = iolist_to_binary(join(re:split("aabbabc","a{1,}b{1,}c",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<"aabb:">> = iolist_to_binary(join(re:split("aabbabc","a{1,}b{1,}c",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abcabc","a.+?c",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<"aabb:">> = iolist_to_binary(join(re:split("aabbabc","a{1,}b{1,}c",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abcabc","a.+?c",[trim]))),
     <<":abc">> = iolist_to_binary(join(re:split("abcabc","a.+?c",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("abcabc","a.+?c",[]))), 
-    <<":b">> = iolist_to_binary(join(re:split("ab","(a+|b)*",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("abcabc","a.+?c",[]))),
+    <<":b">> = iolist_to_binary(join(re:split("ab","(a+|b)*",[trim]))),
     <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b)*",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b)*",[]))), 
-    <<":b">> = iolist_to_binary(join(re:split("ab","(a+|b){0,}",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b)*",[]))),
+    <<":b">> = iolist_to_binary(join(re:split("ab","(a+|b){0,}",[trim]))),
     <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b){0,}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b){0,}",[]))), 
-    <<":b">> = iolist_to_binary(join(re:split("ab","(a+|b)+",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b){0,}",[]))),
+    <<":b">> = iolist_to_binary(join(re:split("ab","(a+|b)+",[trim]))),
     <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b)+",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b)+",[]))), 
+                                                                                                                                                                  2}]))),
+    <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b)+",[]))),
     ok.
 run18() ->
-    <<":b">> = iolist_to_binary(join(re:split("ab","(a+|b){1,}",[trim]))), 
+    <<":b">> = iolist_to_binary(join(re:split("ab","(a+|b){1,}",[trim]))),
     <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b){1,}",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b){1,}",[]))), 
-    <<":a::b">> = iolist_to_binary(join(re:split("ab","(a+|b)?",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b){1,}",[]))),
+    <<":a::b">> = iolist_to_binary(join(re:split("ab","(a+|b)?",[trim]))),
     <<":a:b">> = iolist_to_binary(join(re:split("ab","(a+|b)?",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<":a::b:">> = iolist_to_binary(join(re:split("ab","(a+|b)?",[]))), 
-    <<":a::b">> = iolist_to_binary(join(re:split("ab","(a+|b){0,1}",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<":a::b:">> = iolist_to_binary(join(re:split("ab","(a+|b)?",[]))),
+    <<":a::b">> = iolist_to_binary(join(re:split("ab","(a+|b){0,1}",[trim]))),
     <<":a:b">> = iolist_to_binary(join(re:split("ab","(a+|b){0,1}",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<":a::b:">> = iolist_to_binary(join(re:split("ab","(a+|b){0,1}",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("cde","[^ab]*",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<":a::b:">> = iolist_to_binary(join(re:split("ab","(a+|b){0,1}",[]))),
+    <<"">> = iolist_to_binary(join(re:split("cde","[^ab]*",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("cde","[^ab]*",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("cde","[^ab]*",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("cde","[^ab]*",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[]))), 
-    <<"b">> = iolist_to_binary(join(re:split("b","abc",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[]))),
+    <<"b">> = iolist_to_binary(join(re:split("b","abc",[trim]))),
     <<"b">> = iolist_to_binary(join(re:split("b","abc",[{parts,
-                                                                                                                                                        2}]))), 
-    <<"b">> = iolist_to_binary(join(re:split("b","abc",[]))), 
-    <<":c">> = iolist_to_binary(join(re:split("abbbcd","([abc])*d",[trim]))), 
+                                                                                                                                                        2}]))),
+    <<"b">> = iolist_to_binary(join(re:split("b","abc",[]))),
+    <<":c">> = iolist_to_binary(join(re:split("abbbcd","([abc])*d",[trim]))),
     <<":c:">> = iolist_to_binary(join(re:split("abbbcd","([abc])*d",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":c:">> = iolist_to_binary(join(re:split("abbbcd","([abc])*d",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("abcd","([abc])*bcd",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":c:">> = iolist_to_binary(join(re:split("abbbcd","([abc])*d",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("abcd","([abc])*bcd",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("abcd","([abc])*bcd",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("abcd","([abc])*bcd",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("e","a|b|c|d|e",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("abcd","([abc])*bcd",[]))),
+    <<"">> = iolist_to_binary(join(re:split("e","a|b|c|d|e",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("e","a|b|c|d|e",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("e","a|b|c|d|e",[]))), 
-    <<":e">> = iolist_to_binary(join(re:split("ef","(a|b|c|d|e)f",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<":">> = iolist_to_binary(join(re:split("e","a|b|c|d|e",[]))),
+    <<":e">> = iolist_to_binary(join(re:split("ef","(a|b|c|d|e)f",[trim]))),
     <<":e:">> = iolist_to_binary(join(re:split("ef","(a|b|c|d|e)f",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<":e:">> = iolist_to_binary(join(re:split("ef","(a|b|c|d|e)f",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abcdefg","abcd*efg",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<":e:">> = iolist_to_binary(join(re:split("ef","(a|b|c|d|e)f",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abcdefg","abcd*efg",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abcdefg","abcd*efg",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abcdefg","abcd*efg",[]))), 
-    <<"x:y:z">> = iolist_to_binary(join(re:split("xabyabbbz","ab*",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abcdefg","abcd*efg",[]))),
+    <<"x:y:z">> = iolist_to_binary(join(re:split("xabyabbbz","ab*",[trim]))),
     <<"x:yabbbz">> = iolist_to_binary(join(re:split("xabyabbbz","ab*",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"x:y:z">> = iolist_to_binary(join(re:split("xabyabbbz","ab*",[]))), 
-    <<"x:y:z">> = iolist_to_binary(join(re:split("xayabbbz","ab*",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"x:y:z">> = iolist_to_binary(join(re:split("xabyabbbz","ab*",[]))),
+    <<"x:y:z">> = iolist_to_binary(join(re:split("xayabbbz","ab*",[trim]))),
     <<"x:yabbbz">> = iolist_to_binary(join(re:split("xayabbbz","ab*",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<"x:y:z">> = iolist_to_binary(join(re:split("xayabbbz","ab*",[]))), 
-    <<"ab:cd">> = iolist_to_binary(join(re:split("abcde","(ab|cd)e",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<"x:y:z">> = iolist_to_binary(join(re:split("xayabbbz","ab*",[]))),
+    <<"ab:cd">> = iolist_to_binary(join(re:split("abcde","(ab|cd)e",[trim]))),
     <<"ab:cd:">> = iolist_to_binary(join(re:split("abcde","(ab|cd)e",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<"ab:cd:">> = iolist_to_binary(join(re:split("abcde","(ab|cd)e",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("hij","[abhgefdc]ij",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<"ab:cd:">> = iolist_to_binary(join(re:split("abcde","(ab|cd)e",[]))),
+    <<"">> = iolist_to_binary(join(re:split("hij","[abhgefdc]ij",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("hij","[abhgefdc]ij",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("hij","[abhgefdc]ij",[]))), 
-    <<"abcd">> = iolist_to_binary(join(re:split("abcdef","(abc|)ef",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("hij","[abhgefdc]ij",[]))),
+    <<"abcd">> = iolist_to_binary(join(re:split("abcdef","(abc|)ef",[trim]))),
     <<"abcd::">> = iolist_to_binary(join(re:split("abcdef","(abc|)ef",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"abcd::">> = iolist_to_binary(join(re:split("abcdef","(abc|)ef",[]))), 
-    <<"a:b">> = iolist_to_binary(join(re:split("abcd","(a|b)c*d",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<"abcd::">> = iolist_to_binary(join(re:split("abcdef","(abc|)ef",[]))),
+    <<"a:b">> = iolist_to_binary(join(re:split("abcd","(a|b)c*d",[trim]))),
     <<"a:b:">> = iolist_to_binary(join(re:split("abcd","(a|b)c*d",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"a:b:">> = iolist_to_binary(join(re:split("abcd","(a|b)c*d",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("abc","(ab|ab*)bc",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"a:b:">> = iolist_to_binary(join(re:split("abcd","(a|b)c*d",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("abc","(ab|ab*)bc",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("abc","(ab|ab*)bc",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("abc","(ab|ab*)bc",[]))), 
-    <<":bc">> = iolist_to_binary(join(re:split("abc","a([bc]*)c*",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("abc","(ab|ab*)bc",[]))),
+    <<":bc">> = iolist_to_binary(join(re:split("abc","a([bc]*)c*",[trim]))),
     <<":bc:">> = iolist_to_binary(join(re:split("abc","a([bc]*)c*",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<":bc:">> = iolist_to_binary(join(re:split("abc","a([bc]*)c*",[]))), 
-    <<":bc:d">> = iolist_to_binary(join(re:split("abcd","a([bc]*)(c*d)",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<":bc:">> = iolist_to_binary(join(re:split("abc","a([bc]*)c*",[]))),
+    <<":bc:d">> = iolist_to_binary(join(re:split("abcd","a([bc]*)(c*d)",[trim]))),
     <<":bc:d:">> = iolist_to_binary(join(re:split("abcd","a([bc]*)(c*d)",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<":bc:d:">> = iolist_to_binary(join(re:split("abcd","a([bc]*)(c*d)",[]))), 
+                                                                                                                                                                                  2}]))),
+    <<":bc:d:">> = iolist_to_binary(join(re:split("abcd","a([bc]*)(c*d)",[]))),
     ok.
 run19() ->
-    <<":bc:d">> = iolist_to_binary(join(re:split("abcd","a([bc]+)(c*d)",[trim]))), 
+    <<":bc:d">> = iolist_to_binary(join(re:split("abcd","a([bc]+)(c*d)",[trim]))),
     <<":bc:d:">> = iolist_to_binary(join(re:split("abcd","a([bc]+)(c*d)",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<":bc:d:">> = iolist_to_binary(join(re:split("abcd","a([bc]+)(c*d)",[]))), 
-    <<":b:cd">> = iolist_to_binary(join(re:split("abcd","a([bc]*)(c+d)",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<":bc:d:">> = iolist_to_binary(join(re:split("abcd","a([bc]+)(c*d)",[]))),
+    <<":b:cd">> = iolist_to_binary(join(re:split("abcd","a([bc]*)(c+d)",[trim]))),
     <<":b:cd:">> = iolist_to_binary(join(re:split("abcd","a([bc]*)(c+d)",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<":b:cd:">> = iolist_to_binary(join(re:split("abcd","a([bc]*)(c+d)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("adcdcde","a[bcd]*dcdcde",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<":b:cd:">> = iolist_to_binary(join(re:split("abcd","a([bc]*)(c+d)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("adcdcde","a[bcd]*dcdcde",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("adcdcde","a[bcd]*dcdcde",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("adcdcde","a[bcd]*dcdcde",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[bcd]+dcdcde",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("adcdcde","a[bcd]*dcdcde",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[bcd]+dcdcde",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[bcd]+dcdcde",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[bcd]+dcdcde",[]))), 
-    <<"abcde">> = iolist_to_binary(join(re:split("abcde","a[bcd]+dcdcde",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[bcd]+dcdcde",[]))),
+    <<"abcde">> = iolist_to_binary(join(re:split("abcde","a[bcd]+dcdcde",[trim]))),
     <<"abcde">> = iolist_to_binary(join(re:split("abcde","a[bcd]+dcdcde",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<"abcde">> = iolist_to_binary(join(re:split("abcde","a[bcd]+dcdcde",[]))), 
-    <<"adcdcde">> = iolist_to_binary(join(re:split("adcdcde","a[bcd]+dcdcde",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<"abcde">> = iolist_to_binary(join(re:split("abcde","a[bcd]+dcdcde",[]))),
+    <<"adcdcde">> = iolist_to_binary(join(re:split("adcdcde","a[bcd]+dcdcde",[trim]))),
     <<"adcdcde">> = iolist_to_binary(join(re:split("adcdcde","a[bcd]+dcdcde",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"adcdcde">> = iolist_to_binary(join(re:split("adcdcde","a[bcd]+dcdcde",[]))), 
-    <<":ab">> = iolist_to_binary(join(re:split("abc","(ab|a)b*c",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<"adcdcde">> = iolist_to_binary(join(re:split("adcdcde","a[bcd]+dcdcde",[]))),
+    <<":ab">> = iolist_to_binary(join(re:split("abc","(ab|a)b*c",[trim]))),
     <<":ab:">> = iolist_to_binary(join(re:split("abc","(ab|a)b*c",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":ab:">> = iolist_to_binary(join(re:split("abc","(ab|a)b*c",[]))), 
-    <<":abc:a:b:d">> = iolist_to_binary(join(re:split("abcd","((a)(b)c)(d)",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":ab:">> = iolist_to_binary(join(re:split("abc","(ab|a)b*c",[]))),
+    <<":abc:a:b:d">> = iolist_to_binary(join(re:split("abcd","((a)(b)c)(d)",[trim]))),
     <<":abc:a:b:d:">> = iolist_to_binary(join(re:split("abcd","((a)(b)c)(d)",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<":abc:a:b:d:">> = iolist_to_binary(join(re:split("abcd","((a)(b)c)(d)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("alpha","[a-zA-Z_][a-zA-Z0-9_]*",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<":abc:a:b:d:">> = iolist_to_binary(join(re:split("abcd","((a)(b)c)(d)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("alpha","[a-zA-Z_][a-zA-Z0-9_]*",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("alpha","[a-zA-Z_][a-zA-Z0-9_]*",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("alpha","[a-zA-Z_][a-zA-Z0-9_]*",[]))), 
-    <<"a">> = iolist_to_binary(join(re:split("abh","^a(bc+|b[eh])g|.h$",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<":">> = iolist_to_binary(join(re:split("alpha","[a-zA-Z_][a-zA-Z0-9_]*",[]))),
+    <<"a">> = iolist_to_binary(join(re:split("abh","^a(bc+|b[eh])g|.h$",[trim]))),
     <<"a::">> = iolist_to_binary(join(re:split("abh","^a(bc+|b[eh])g|.h$",[{parts,
-                                                                                                                                                                                           2}]))), 
-    <<"a::">> = iolist_to_binary(join(re:split("abh","^a(bc+|b[eh])g|.h$",[]))), 
-    <<":effgz">> = iolist_to_binary(join(re:split("effgz","(bc+d$|ef*g.|h?i(j|k))",[trim]))), 
+                                                                                                                                                                                           2}]))),
+    <<"a::">> = iolist_to_binary(join(re:split("abh","^a(bc+|b[eh])g|.h$",[]))),
+    <<":effgz">> = iolist_to_binary(join(re:split("effgz","(bc+d$|ef*g.|h?i(j|k))",[trim]))),
     <<":effgz::">> = iolist_to_binary(join(re:split("effgz","(bc+d$|ef*g.|h?i(j|k))",[{parts,
-                                                                                                                                                                                                       2}]))), 
-    <<":effgz::">> = iolist_to_binary(join(re:split("effgz","(bc+d$|ef*g.|h?i(j|k))",[]))), 
-    <<":ij:j">> = iolist_to_binary(join(re:split("ij","(bc+d$|ef*g.|h?i(j|k))",[trim]))), 
+                                                                                                                                                                                                       2}]))),
+    <<":effgz::">> = iolist_to_binary(join(re:split("effgz","(bc+d$|ef*g.|h?i(j|k))",[]))),
+    <<":ij:j">> = iolist_to_binary(join(re:split("ij","(bc+d$|ef*g.|h?i(j|k))",[trim]))),
     <<":ij:j:">> = iolist_to_binary(join(re:split("ij","(bc+d$|ef*g.|h?i(j|k))",[{parts,
-                                                                                                                                                                                                 2}]))), 
-    <<":ij:j:">> = iolist_to_binary(join(re:split("ij","(bc+d$|ef*g.|h?i(j|k))",[]))), 
-    <<"r:effgz">> = iolist_to_binary(join(re:split("reffgz","(bc+d$|ef*g.|h?i(j|k))",[trim]))), 
+                                                                                                                                                                                                 2}]))),
+    <<":ij:j:">> = iolist_to_binary(join(re:split("ij","(bc+d$|ef*g.|h?i(j|k))",[]))),
+    <<"r:effgz">> = iolist_to_binary(join(re:split("reffgz","(bc+d$|ef*g.|h?i(j|k))",[trim]))),
     <<"r:effgz::">> = iolist_to_binary(join(re:split("reffgz","(bc+d$|ef*g.|h?i(j|k))",[{parts,
-                                                                                                                                                                                                         2}]))), 
-    <<"r:effgz::">> = iolist_to_binary(join(re:split("reffgz","(bc+d$|ef*g.|h?i(j|k))",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(bc+d$|ef*g.|h?i(j|k))",[trim]))), 
+                                                                                                                                                                                                         2}]))),
+    <<"r:effgz::">> = iolist_to_binary(join(re:split("reffgz","(bc+d$|ef*g.|h?i(j|k))",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(bc+d$|ef*g.|h?i(j|k))",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(bc+d$|ef*g.|h?i(j|k))",[{parts,
-                                                                                                                                                                                                                   2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(bc+d$|ef*g.|h?i(j|k))",[]))), 
-    <<"effg">> = iolist_to_binary(join(re:split("effg","(bc+d$|ef*g.|h?i(j|k))",[trim]))), 
+                                                                                                                                                                                                                   2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(bc+d$|ef*g.|h?i(j|k))",[]))),
+    <<"effg">> = iolist_to_binary(join(re:split("effg","(bc+d$|ef*g.|h?i(j|k))",[trim]))),
     <<"effg">> = iolist_to_binary(join(re:split("effg","(bc+d$|ef*g.|h?i(j|k))",[{parts,
-                                                                                                                                                                                                     2}]))), 
-    <<"effg">> = iolist_to_binary(join(re:split("effg","(bc+d$|ef*g.|h?i(j|k))",[]))), 
-    <<"bcdd">> = iolist_to_binary(join(re:split("bcdd","(bc+d$|ef*g.|h?i(j|k))",[trim]))), 
+                                                                                                                                                                                                     2}]))),
+    <<"effg">> = iolist_to_binary(join(re:split("effg","(bc+d$|ef*g.|h?i(j|k))",[]))),
+    <<"bcdd">> = iolist_to_binary(join(re:split("bcdd","(bc+d$|ef*g.|h?i(j|k))",[trim]))),
     <<"bcdd">> = iolist_to_binary(join(re:split("bcdd","(bc+d$|ef*g.|h?i(j|k))",[{parts,
-                                                                                                                                                                                                     2}]))), 
-    <<"bcdd">> = iolist_to_binary(join(re:split("bcdd","(bc+d$|ef*g.|h?i(j|k))",[]))), 
-    <<":a:a:a:a:a:a:a:a:a:a">> = iolist_to_binary(join(re:split("a","((((((((((a))))))))))",[trim]))), 
+                                                                                                                                                                                                     2}]))),
+    <<"bcdd">> = iolist_to_binary(join(re:split("bcdd","(bc+d$|ef*g.|h?i(j|k))",[]))),
+    <<":a:a:a:a:a:a:a:a:a:a">> = iolist_to_binary(join(re:split("a","((((((((((a))))))))))",[trim]))),
     <<":a:a:a:a:a:a:a:a:a:a:">> = iolist_to_binary(join(re:split("a","((((((((((a))))))))))",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<":a:a:a:a:a:a:a:a:a:a:">> = iolist_to_binary(join(re:split("a","((((((((((a))))))))))",[]))), 
-    <<":a:a:a:a:a:a:a:a:a:a">> = iolist_to_binary(join(re:split("aa","((((((((((a))))))))))\\10",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<":a:a:a:a:a:a:a:a:a:a:">> = iolist_to_binary(join(re:split("a","((((((((((a))))))))))",[]))),
+    <<":a:a:a:a:a:a:a:a:a:a">> = iolist_to_binary(join(re:split("aa","((((((((((a))))))))))\\10",[trim]))),
     <<":a:a:a:a:a:a:a:a:a:a:">> = iolist_to_binary(join(re:split("aa","((((((((((a))))))))))\\10",[{parts,
-                                                                                                                                                                                                       2}]))), 
-    <<":a:a:a:a:a:a:a:a:a:a:">> = iolist_to_binary(join(re:split("aa","((((((((((a))))))))))\\10",[]))), 
-    <<":a:a:a:a:a:a:a:a:a">> = iolist_to_binary(join(re:split("a","(((((((((a)))))))))",[trim]))), 
+                                                                                                                                                                                                       2}]))),
+    <<":a:a:a:a:a:a:a:a:a:a:">> = iolist_to_binary(join(re:split("aa","((((((((((a))))))))))\\10",[]))),
+    <<":a:a:a:a:a:a:a:a:a">> = iolist_to_binary(join(re:split("a","(((((((((a)))))))))",[trim]))),
     <<":a:a:a:a:a:a:a:a:a:">> = iolist_to_binary(join(re:split("a","(((((((((a)))))))))",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<":a:a:a:a:a:a:a:a:a:">> = iolist_to_binary(join(re:split("a","(((((((((a)))))))))",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","multiple words of text",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<":a:a:a:a:a:a:a:a:a:">> = iolist_to_binary(join(re:split("a","(((((((((a)))))))))",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","multiple words of text",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","multiple words of text",[{parts,
-                                                                                                                                                                                                                  2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","multiple words of text",[]))), 
-    <<"aa">> = iolist_to_binary(join(re:split("aa","multiple words of text",[trim]))), 
+                                                                                                                                                                                                                  2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","multiple words of text",[]))),
+    <<"aa">> = iolist_to_binary(join(re:split("aa","multiple words of text",[trim]))),
     <<"aa">> = iolist_to_binary(join(re:split("aa","multiple words of text",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"aa">> = iolist_to_binary(join(re:split("aa","multiple words of text",[]))), 
-    <<"uh-uh">> = iolist_to_binary(join(re:split("uh-uh","multiple words of text",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<"aa">> = iolist_to_binary(join(re:split("aa","multiple words of text",[]))),
+    <<"uh-uh">> = iolist_to_binary(join(re:split("uh-uh","multiple words of text",[trim]))),
     <<"uh-uh">> = iolist_to_binary(join(re:split("uh-uh","multiple words of text",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<"uh-uh">> = iolist_to_binary(join(re:split("uh-uh","multiple words of text",[]))), 
-    <<":, yeah">> = iolist_to_binary(join(re:split("multiple words, yeah","multiple words",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<"uh-uh">> = iolist_to_binary(join(re:split("uh-uh","multiple words of text",[]))),
+    <<":, yeah">> = iolist_to_binary(join(re:split("multiple words, yeah","multiple words",[trim]))),
     <<":, yeah">> = iolist_to_binary(join(re:split("multiple words, yeah","multiple words",[{parts,
-                                                                                                                                                                                                                    2}]))), 
-    <<":, yeah">> = iolist_to_binary(join(re:split("multiple words, yeah","multiple words",[]))), 
-    <<":ab:de">> = iolist_to_binary(join(re:split("abcde","(.*)c(.*)",[trim]))), 
+                                                                                                                                                                                                                    2}]))),
+    <<":, yeah">> = iolist_to_binary(join(re:split("multiple words, yeah","multiple words",[]))),
+    <<":ab:de">> = iolist_to_binary(join(re:split("abcde","(.*)c(.*)",[trim]))),
     <<":ab:de:">> = iolist_to_binary(join(re:split("abcde","(.*)c(.*)",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<":ab:de:">> = iolist_to_binary(join(re:split("abcde","(.*)c(.*)",[]))), 
-    <<":a:b">> = iolist_to_binary(join(re:split("(a, b)","\\((.*), (.*)\\)",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<":ab:de:">> = iolist_to_binary(join(re:split("abcde","(.*)c(.*)",[]))),
+    <<":a:b">> = iolist_to_binary(join(re:split("(a, b)","\\((.*), (.*)\\)",[trim]))),
     <<":a:b:">> = iolist_to_binary(join(re:split("(a, b)","\\((.*), (.*)\\)",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<":a:b:">> = iolist_to_binary(join(re:split("(a, b)","\\((.*), (.*)\\)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abcd","abcd",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<":a:b:">> = iolist_to_binary(join(re:split("(a, b)","\\((.*), (.*)\\)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abcd","abcd",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abcd","abcd",[{parts,
-                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abcd","abcd",[]))), 
-    <<":bc">> = iolist_to_binary(join(re:split("abcd","a(bc)d",[trim]))), 
+                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abcd","abcd",[]))),
+    <<":bc">> = iolist_to_binary(join(re:split("abcd","a(bc)d",[trim]))),
     <<":bc:">> = iolist_to_binary(join(re:split("abcd","a(bc)d",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<":bc:">> = iolist_to_binary(join(re:split("abcd","a(bc)d",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("ac","a[-]?c",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<":bc:">> = iolist_to_binary(join(re:split("abcd","a(bc)d",[]))),
+    <<"">> = iolist_to_binary(join(re:split("ac","a[-]?c",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("ac","a[-]?c",[{parts,
-                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ac","a[-]?c",[]))), 
+                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ac","a[-]?c",[]))),
     ok.
 run20() ->
-    <<":abc">> = iolist_to_binary(join(re:split("abcabc","(abc)\\1",[trim]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("abcabc","(abc)\\1",[trim]))),
     <<":abc:">> = iolist_to_binary(join(re:split("abcabc","(abc)\\1",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","(abc)\\1",[]))), 
-    <<":abc">> = iolist_to_binary(join(re:split("abcabc","([a-c]*)\\1",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","(abc)\\1",[]))),
+    <<":abc">> = iolist_to_binary(join(re:split("abcabc","([a-c]*)\\1",[trim]))),
     <<":abc:">> = iolist_to_binary(join(re:split("abcabc","([a-c]*)\\1",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","([a-c]*)\\1",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("a","(a)|\\1",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","([a-c]*)\\1",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("a","(a)|\\1",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("a","(a)|\\1",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("a","(a)|\\1",[]))), 
-    <<"*** F:a:ilers">> = iolist_to_binary(join(re:split("*** Failers","(a)|\\1",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("a","(a)|\\1",[]))),
+    <<"*** F:a:ilers">> = iolist_to_binary(join(re:split("*** Failers","(a)|\\1",[trim]))),
     <<"*** F:a:ilers">> = iolist_to_binary(join(re:split("*** Failers","(a)|\\1",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<"*** F:a:ilers">> = iolist_to_binary(join(re:split("*** Failers","(a)|\\1",[]))), 
-    <<":a:b">> = iolist_to_binary(join(re:split("ab","(a)|\\1",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<"*** F:a:ilers">> = iolist_to_binary(join(re:split("*** Failers","(a)|\\1",[]))),
+    <<":a:b">> = iolist_to_binary(join(re:split("ab","(a)|\\1",[trim]))),
     <<":a:b">> = iolist_to_binary(join(re:split("ab","(a)|\\1",[{parts,
-                                                                                                                                                                   2}]))), 
-    <<":a:b">> = iolist_to_binary(join(re:split("ab","(a)|\\1",[]))), 
-    <<"x">> = iolist_to_binary(join(re:split("x","(a)|\\1",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<":a:b">> = iolist_to_binary(join(re:split("ab","(a)|\\1",[]))),
+    <<"x">> = iolist_to_binary(join(re:split("x","(a)|\\1",[trim]))),
     <<"x">> = iolist_to_binary(join(re:split("x","(a)|\\1",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<"x">> = iolist_to_binary(join(re:split("x","(a)|\\1",[]))), 
-    <<":bb:b:b:cbc:c">> = iolist_to_binary(join(re:split("ababbbcbc","(([a-c])b*?\\2)*",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<"x">> = iolist_to_binary(join(re:split("x","(a)|\\1",[]))),
+    <<":bb:b:b:cbc:c">> = iolist_to_binary(join(re:split("ababbbcbc","(([a-c])b*?\\2)*",[trim]))),
     <<":bb:b:bcbc">> = iolist_to_binary(join(re:split("ababbbcbc","(([a-c])b*?\\2)*",[{parts,
-                                                                                                                                                                                                   2}]))), 
-    <<":bb:b:b:cbc:c:">> = iolist_to_binary(join(re:split("ababbbcbc","(([a-c])b*?\\2)*",[]))), 
-    <<":cbc:c">> = iolist_to_binary(join(re:split("ababbbcbc","(([a-c])b*?\\2){3}",[trim]))), 
+                                                                                                                                                                                                   2}]))),
+    <<":bb:b:b:cbc:c:">> = iolist_to_binary(join(re:split("ababbbcbc","(([a-c])b*?\\2)*",[]))),
+    <<":cbc:c">> = iolist_to_binary(join(re:split("ababbbcbc","(([a-c])b*?\\2){3}",[trim]))),
     <<":cbc:c:">> = iolist_to_binary(join(re:split("ababbbcbc","(([a-c])b*?\\2){3}",[{parts,
-                                                                                                                                                                                                       2}]))), 
-    <<":cbc:c:">> = iolist_to_binary(join(re:split("ababbbcbc","(([a-c])b*?\\2){3}",[]))), 
-    <<"aaaxabaxbaax:bbax:b:a">> = iolist_to_binary(join(re:split("aaaxabaxbaaxbbax","((\\3|b)\\2(a)x)+",[trim]))), 
+                                                                                                                                                                                                       2}]))),
+    <<":cbc:c:">> = iolist_to_binary(join(re:split("ababbbcbc","(([a-c])b*?\\2){3}",[]))),
+    <<"aaaxabaxbaax:bbax:b:a">> = iolist_to_binary(join(re:split("aaaxabaxbaaxbbax","((\\3|b)\\2(a)x)+",[trim]))),
     <<"aaaxabaxbaax:bbax:b:a:">> = iolist_to_binary(join(re:split("aaaxabaxbaaxbbax","((\\3|b)\\2(a)x)+",[{parts,
-                                                                                                                                                                                                                    2}]))), 
-    <<"aaaxabaxbaax:bbax:b:a:">> = iolist_to_binary(join(re:split("aaaxabaxbaaxbbax","((\\3|b)\\2(a)x)+",[]))), 
-    <<"bbaababbabaaaaa:bba:b:a">> = iolist_to_binary(join(re:split("bbaababbabaaaaabbaaaabba","((\\3|b)\\2(a)){2,}",[trim]))), 
+                                                                                                                                                                                                                    2}]))),
+    <<"aaaxabaxbaax:bbax:b:a:">> = iolist_to_binary(join(re:split("aaaxabaxbaaxbbax","((\\3|b)\\2(a)x)+",[]))),
+    <<"bbaababbabaaaaa:bba:b:a">> = iolist_to_binary(join(re:split("bbaababbabaaaaabbaaaabba","((\\3|b)\\2(a)){2,}",[trim]))),
     <<"bbaababbabaaaaa:bba:b:a:">> = iolist_to_binary(join(re:split("bbaababbabaaaaabbaaaabba","((\\3|b)\\2(a)){2,}",[{parts,
-                                                                                                                                                                                                                                        2}]))), 
-    <<"bbaababbabaaaaa:bba:b:a:">> = iolist_to_binary(join(re:split("bbaababbabaaaaabbaaaabba","((\\3|b)\\2(a)){2,}",[]))), 
+                                                                                                                                                                                                                                        2}]))),
+    <<"bbaababbabaaaaa:bba:b:a:">> = iolist_to_binary(join(re:split("bbaababbabaaaaabbaaaabba","((\\3|b)\\2(a)){2,}",[]))),
     <<"">> = iolist_to_binary(join(re:split("ABC","abc",[caseless,
-                                                                                                                                                          trim]))), 
+                                                                                                                                                          trim]))),
     <<":">> = iolist_to_binary(join(re:split("ABC","abc",[caseless,
                                                                                                                                                             {parts,
-                                                                                                                                                             2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ABC","abc",[caseless]))), 
+                                                                                                                                                             2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ABC","abc",[caseless]))),
     <<"X:Y">> = iolist_to_binary(join(re:split("XABCY","abc",[caseless,
-                                                                                                                                                              trim]))), 
+                                                                                                                                                              trim]))),
     <<"X:Y">> = iolist_to_binary(join(re:split("XABCY","abc",[caseless,
                                                                                                                                                                 {parts,
-                                                                                                                                                                 2}]))), 
-    <<"X:Y">> = iolist_to_binary(join(re:split("XABCY","abc",[caseless]))), 
+                                                                                                                                                                 2}]))),
+    <<"X:Y">> = iolist_to_binary(join(re:split("XABCY","abc",[caseless]))),
     <<"AB">> = iolist_to_binary(join(re:split("ABABC","abc",[caseless,
-                                                                                                                                                              trim]))), 
+                                                                                                                                                              trim]))),
     <<"AB:">> = iolist_to_binary(join(re:split("ABABC","abc",[caseless,
                                                                                                                                                                 {parts,
-                                                                                                                                                                 2}]))), 
-    <<"AB:">> = iolist_to_binary(join(re:split("ABABC","abc",[caseless]))), 
+                                                                                                                                                                 2}]))),
+    <<"AB:">> = iolist_to_binary(join(re:split("ABABC","abc",[caseless]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[caseless,
-                                                                                                                                                                          trim]))), 
+                                                                                                                                                                          trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[caseless,
                                                                                                                                                                             {parts,
-                                                                                                                                                                             2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[caseless]))), 
+                                                                                                                                                                             2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[caseless]))),
     <<"aaxabxbaxbbx">> = iolist_to_binary(join(re:split("aaxabxbaxbbx","abc",[caseless,
-                                                                                                                                                                            trim]))), 
+                                                                                                                                                                            trim]))),
     <<"aaxabxbaxbbx">> = iolist_to_binary(join(re:split("aaxabxbaxbbx","abc",[caseless,
                                                                                                                                                                               {parts,
-                                                                                                                                                                               2}]))), 
-    <<"aaxabxbaxbbx">> = iolist_to_binary(join(re:split("aaxabxbaxbbx","abc",[caseless]))), 
+                                                                                                                                                                               2}]))),
+    <<"aaxabxbaxbbx">> = iolist_to_binary(join(re:split("aaxabxbaxbbx","abc",[caseless]))),
     <<"XBC">> = iolist_to_binary(join(re:split("XBC","abc",[caseless,
-                                                                                                                                                          trim]))), 
+                                                                                                                                                          trim]))),
     <<"XBC">> = iolist_to_binary(join(re:split("XBC","abc",[caseless,
                                                                                                                                                             {parts,
-                                                                                                                                                             2}]))), 
-    <<"XBC">> = iolist_to_binary(join(re:split("XBC","abc",[caseless]))), 
+                                                                                                                                                             2}]))),
+    <<"XBC">> = iolist_to_binary(join(re:split("XBC","abc",[caseless]))),
     <<"AXC">> = iolist_to_binary(join(re:split("AXC","abc",[caseless,
-                                                                                                                                                          trim]))), 
+                                                                                                                                                          trim]))),
     <<"AXC">> = iolist_to_binary(join(re:split("AXC","abc",[caseless,
                                                                                                                                                             {parts,
-                                                                                                                                                             2}]))), 
-    <<"AXC">> = iolist_to_binary(join(re:split("AXC","abc",[caseless]))), 
+                                                                                                                                                             2}]))),
+    <<"AXC">> = iolist_to_binary(join(re:split("AXC","abc",[caseless]))),
     <<"ABX">> = iolist_to_binary(join(re:split("ABX","abc",[caseless,
-                                                                                                                                                          trim]))), 
+                                                                                                                                                          trim]))),
     <<"ABX">> = iolist_to_binary(join(re:split("ABX","abc",[caseless,
                                                                                                                                                             {parts,
-                                                                                                                                                             2}]))), 
-    <<"ABX">> = iolist_to_binary(join(re:split("ABX","abc",[caseless]))), 
+                                                                                                                                                             2}]))),
+    <<"ABX">> = iolist_to_binary(join(re:split("ABX","abc",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ABC","ab*c",[caseless,
-                                                                                                                                                            trim]))), 
+                                                                                                                                                            trim]))),
     <<":">> = iolist_to_binary(join(re:split("ABC","ab*c",[caseless,
                                                                                                                                                               {parts,
-                                                                                                                                                               2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ABC","ab*c",[caseless]))), 
+                                                                                                                                                               2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ABC","ab*c",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ABC","ab*bc",[caseless,
-                                                                                                                                                              trim]))), 
+                                                                                                                                                              trim]))),
     <<":">> = iolist_to_binary(join(re:split("ABC","ab*bc",[caseless,
                                                                                                                                                                 {parts,
-                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ABC","ab*bc",[caseless]))), 
+                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ABC","ab*bc",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ABBC","ab*bc",[caseless,
-                                                                                                                                                                trim]))), 
+                                                                                                                                                                trim]))),
     <<":">> = iolist_to_binary(join(re:split("ABBC","ab*bc",[caseless,
                                                                                                                                                                   {parts,
-                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ABBC","ab*bc",[caseless]))), 
+                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ABBC","ab*bc",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ABBBBC","ab*?bc",[caseless,
-                                                                                                                                                                      trim]))), 
+                                                                                                                                                                      trim]))),
     <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab*?bc",[caseless,
                                                                                                                                                                         {parts,
-                                                                                                                                                                         2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab*?bc",[caseless]))), 
+                                                                                                                                                                         2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab*?bc",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ABBBBC","ab{0,}?bc",[caseless,
-                                                                                                                                                                            trim]))), 
+                                                                                                                                                                            trim]))),
     <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{0,}?bc",[caseless,
                                                                                                                                                                               {parts,
-                                                                                                                                                                               2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{0,}?bc",[caseless]))), 
+                                                                                                                                                                               2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{0,}?bc",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ABBC","ab+?bc",[caseless,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<":">> = iolist_to_binary(join(re:split("ABBC","ab+?bc",[caseless,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ABBC","ab+?bc",[caseless]))), 
+                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ABBC","ab+?bc",[caseless]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab+bc",[caseless,
-                                                                                                                                                                              trim]))), 
+                                                                                                                                                                              trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab+bc",[caseless,
                                                                                                                                                                                 {parts,
-                                                                                                                                                                                 2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab+bc",[caseless]))), 
+                                                                                                                                                                                 2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab+bc",[caseless]))),
     <<"ABC">> = iolist_to_binary(join(re:split("ABC","ab+bc",[caseless,
-                                                                                                                                                              trim]))), 
+                                                                                                                                                              trim]))),
     <<"ABC">> = iolist_to_binary(join(re:split("ABC","ab+bc",[caseless,
                                                                                                                                                                 {parts,
-                                                                                                                                                                 2}]))), 
-    <<"ABC">> = iolist_to_binary(join(re:split("ABC","ab+bc",[caseless]))), 
+                                                                                                                                                                 2}]))),
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","ab+bc",[caseless]))),
     <<"ABQ">> = iolist_to_binary(join(re:split("ABQ","ab+bc",[caseless,
-                                                                                                                                                              trim]))), 
+                                                                                                                                                              trim]))),
     <<"ABQ">> = iolist_to_binary(join(re:split("ABQ","ab+bc",[caseless,
                                                                                                                                                                 {parts,
-                                                                                                                                                                 2}]))), 
-    <<"ABQ">> = iolist_to_binary(join(re:split("ABQ","ab+bc",[caseless]))), 
+                                                                                                                                                                 2}]))),
+    <<"ABQ">> = iolist_to_binary(join(re:split("ABQ","ab+bc",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ABBBBC","ab+bc",[caseless,
-                                                                                                                                                                    trim]))), 
+                                                                                                                                                                    trim]))),
     <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab+bc",[caseless,
                                                                                                                                                                       {parts,
-                                                                                                                                                                       2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab+bc",[caseless]))), 
+                                                                                                                                                                       2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab+bc",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ABBBBC","ab{1,}?bc",[caseless,
-                                                                                                                                                                            trim]))), 
+                                                                                                                                                                            trim]))),
     <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{1,}?bc",[caseless,
                                                                                                                                                                               {parts,
-                                                                                                                                                                               2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{1,}?bc",[caseless]))), 
+                                                                                                                                                                               2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{1,}?bc",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ABBBBC","ab{1,3}?bc",[caseless,
-                                                                                                                                                                              trim]))), 
+                                                                                                                                                                              trim]))),
     <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{1,3}?bc",[caseless,
                                                                                                                                                                                 {parts,
-                                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{1,3}?bc",[caseless]))), 
+                                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{1,3}?bc",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ABBBBC","ab{3,4}?bc",[caseless,
-                                                                                                                                                                              trim]))), 
+                                                                                                                                                                              trim]))),
     <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{3,4}?bc",[caseless,
                                                                                                                                                                                 {parts,
-                                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{3,4}?bc",[caseless]))), 
+                                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{3,4}?bc",[caseless]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{4,5}?bc",[caseless,
-                                                                                                                                                                                        trim]))), 
+                                                                                                                                                                                        trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{4,5}?bc",[caseless,
                                                                                                                                                                                           {parts,
-                                                                                                                                                                                           2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{4,5}?bc",[caseless]))), 
+                                                                                                                                                                                           2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{4,5}?bc",[caseless]))),
     <<"ABQ">> = iolist_to_binary(join(re:split("ABQ","ab{4,5}?bc",[caseless,
-                                                                                                                                                                        trim]))), 
+                                                                                                                                                                        trim]))),
     <<"ABQ">> = iolist_to_binary(join(re:split("ABQ","ab{4,5}?bc",[caseless,
                                                                                                                                                                           {parts,
-                                                                                                                                                                           2}]))), 
-    <<"ABQ">> = iolist_to_binary(join(re:split("ABQ","ab{4,5}?bc",[caseless]))), 
+                                                                                                                                                                           2}]))),
+    <<"ABQ">> = iolist_to_binary(join(re:split("ABQ","ab{4,5}?bc",[caseless]))),
     <<"ABBBBC">> = iolist_to_binary(join(re:split("ABBBBC","ab{4,5}?bc",[caseless,
-                                                                                                                                                                              trim]))), 
+                                                                                                                                                                              trim]))),
     <<"ABBBBC">> = iolist_to_binary(join(re:split("ABBBBC","ab{4,5}?bc",[caseless,
                                                                                                                                                                                 {parts,
-                                                                                                                                                                                 2}]))), 
-    <<"ABBBBC">> = iolist_to_binary(join(re:split("ABBBBC","ab{4,5}?bc",[caseless]))), 
+                                                                                                                                                                                 2}]))),
+    <<"ABBBBC">> = iolist_to_binary(join(re:split("ABBBBC","ab{4,5}?bc",[caseless]))),
     ok.
 run21() ->
     <<"">> = iolist_to_binary(join(re:split("ABBC","ab??bc",[caseless,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<":">> = iolist_to_binary(join(re:split("ABBC","ab??bc",[caseless,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ABBC","ab??bc",[caseless]))), 
+                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ABBC","ab??bc",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ABC","ab??bc",[caseless,
-                                                                                                                                                                trim]))), 
+                                                                                                                                                                trim]))),
     <<":">> = iolist_to_binary(join(re:split("ABC","ab??bc",[caseless,
                                                                                                                                                                   {parts,
-                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ABC","ab??bc",[caseless]))), 
+                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ABC","ab??bc",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ABC","ab{0,1}?bc",[caseless,
-                                                                                                                                                                        trim]))), 
+                                                                                                                                                                        trim]))),
     <<":">> = iolist_to_binary(join(re:split("ABC","ab{0,1}?bc",[caseless,
                                                                                                                                                                           {parts,
-                                                                                                                                                                           2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ABC","ab{0,1}?bc",[caseless]))), 
+                                                                                                                                                                           2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ABC","ab{0,1}?bc",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ABC","ab??c",[caseless,
-                                                                                                                                                              trim]))), 
+                                                                                                                                                              trim]))),
     <<":">> = iolist_to_binary(join(re:split("ABC","ab??c",[caseless,
                                                                                                                                                                 {parts,
-                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ABC","ab??c",[caseless]))), 
+                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ABC","ab??c",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ABC","ab{0,1}?c",[caseless,
-                                                                                                                                                                      trim]))), 
+                                                                                                                                                                      trim]))),
     <<":">> = iolist_to_binary(join(re:split("ABC","ab{0,1}?c",[caseless,
                                                                                                                                                                         {parts,
-                                                                                                                                                                         2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ABC","ab{0,1}?c",[caseless]))), 
+                                                                                                                                                                         2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ABC","ab{0,1}?c",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ABC","^abc$",[caseless,
-                                                                                                                                                               trim]))), 
+                                                                                                                                                               trim]))),
     <<":">> = iolist_to_binary(join(re:split("ABC","^abc$",[caseless,
                                                                                                                                                                  {parts,
-                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ABC","^abc$",[caseless]))), 
+                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ABC","^abc$",[caseless]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[caseless,
-                                                                                                                                                                               trim]))), 
+                                                                                                                                                                               trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[caseless,
                                                                                                                                                                                  {parts,
-                                                                                                                                                                                  2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[caseless]))), 
+                                                                                                                                                                                  2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[caseless]))),
     <<"ABBBBC">> = iolist_to_binary(join(re:split("ABBBBC","^abc$",[caseless,
-                                                                                                                                                                     trim]))), 
+                                                                                                                                                                     trim]))),
     <<"ABBBBC">> = iolist_to_binary(join(re:split("ABBBBC","^abc$",[caseless,
                                                                                                                                                                        {parts,
-                                                                                                                                                                        2}]))), 
-    <<"ABBBBC">> = iolist_to_binary(join(re:split("ABBBBC","^abc$",[caseless]))), 
+                                                                                                                                                                        2}]))),
+    <<"ABBBBC">> = iolist_to_binary(join(re:split("ABBBBC","^abc$",[caseless]))),
     <<"ABCC">> = iolist_to_binary(join(re:split("ABCC","^abc$",[caseless,
-                                                                                                                                                                 trim]))), 
+                                                                                                                                                                 trim]))),
     <<"ABCC">> = iolist_to_binary(join(re:split("ABCC","^abc$",[caseless,
                                                                                                                                                                    {parts,
-                                                                                                                                                                    2}]))), 
-    <<"ABCC">> = iolist_to_binary(join(re:split("ABCC","^abc$",[caseless]))), 
+                                                                                                                                                                    2}]))),
+    <<"ABCC">> = iolist_to_binary(join(re:split("ABCC","^abc$",[caseless]))),
     <<":C">> = iolist_to_binary(join(re:split("ABCC","^abc",[caseless,
-                                                                                                                                                              trim]))), 
+                                                                                                                                                              trim]))),
     <<":C">> = iolist_to_binary(join(re:split("ABCC","^abc",[caseless,
                                                                                                                                                                 {parts,
-                                                                                                                                                                 2}]))), 
-    <<":C">> = iolist_to_binary(join(re:split("ABCC","^abc",[caseless]))), 
+                                                                                                                                                                 2}]))),
+    <<":C">> = iolist_to_binary(join(re:split("ABCC","^abc",[caseless]))),
     <<"A">> = iolist_to_binary(join(re:split("AABC","abc$",[caseless,
-                                                                                                                                                               trim]))), 
+                                                                                                                                                               trim]))),
     <<"A:">> = iolist_to_binary(join(re:split("AABC","abc$",[caseless,
                                                                                                                                                                  {parts,
-                                                                                                                                                                  2}]))), 
-    <<"A:">> = iolist_to_binary(join(re:split("AABC","abc$",[caseless]))), 
+                                                                                                                                                                  2}]))),
+    <<"A:">> = iolist_to_binary(join(re:split("AABC","abc$",[caseless]))),
     <<"ABC">> = iolist_to_binary(join(re:split("ABC","^",[caseless,
-                                                                                                                                                      trim]))), 
+                                                                                                                                                      trim]))),
     <<"ABC">> = iolist_to_binary(join(re:split("ABC","^",[caseless,
                                                                                                                                                         {parts,
-                                                                                                                                                         2}]))), 
-    <<"ABC">> = iolist_to_binary(join(re:split("ABC","^",[caseless]))), 
+                                                                                                                                                         2}]))),
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","^",[caseless]))),
     <<"ABC">> = iolist_to_binary(join(re:split("ABC","$",[caseless,
-                                                                                                                                                       trim]))), 
+                                                                                                                                                       trim]))),
     <<"ABC:">> = iolist_to_binary(join(re:split("ABC","$",[caseless,
                                                                                                                                                          {parts,
-                                                                                                                                                          2}]))), 
-    <<"ABC:">> = iolist_to_binary(join(re:split("ABC","$",[caseless]))), 
+                                                                                                                                                          2}]))),
+    <<"ABC:">> = iolist_to_binary(join(re:split("ABC","$",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ABC","a.c",[caseless,
-                                                                                                                                                          trim]))), 
+                                                                                                                                                          trim]))),
     <<":">> = iolist_to_binary(join(re:split("ABC","a.c",[caseless,
                                                                                                                                                             {parts,
-                                                                                                                                                             2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ABC","a.c",[caseless]))), 
+                                                                                                                                                             2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ABC","a.c",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("AXC","a.c",[caseless,
-                                                                                                                                                          trim]))), 
+                                                                                                                                                          trim]))),
     <<":">> = iolist_to_binary(join(re:split("AXC","a.c",[caseless,
                                                                                                                                                             {parts,
-                                                                                                                                                             2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("AXC","a.c",[caseless]))), 
+                                                                                                                                                             2}]))),
+    <<":">> = iolist_to_binary(join(re:split("AXC","a.c",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("AXYZC","a.*?c",[caseless,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<":">> = iolist_to_binary(join(re:split("AXYZC","a.*?c",[caseless,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("AXYZC","a.*?c",[caseless]))), 
+                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("AXYZC","a.*?c",[caseless]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a.*c",[caseless,
-                                                                                                                                                                            trim]))), 
+                                                                                                                                                                            trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a.*c",[caseless,
                                                                                                                                                                               {parts,
-                                                                                                                                                                               2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a.*c",[caseless]))), 
+                                                                                                                                                                               2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a.*c",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("AABC","a.*c",[caseless,
-                                                                                                                                                              trim]))), 
+                                                                                                                                                              trim]))),
     <<":">> = iolist_to_binary(join(re:split("AABC","a.*c",[caseless,
                                                                                                                                                                 {parts,
-                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("AABC","a.*c",[caseless]))), 
+                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("AABC","a.*c",[caseless]))),
     <<"AXYZD">> = iolist_to_binary(join(re:split("AXYZD","a.*c",[caseless,
-                                                                                                                                                                trim]))), 
+                                                                                                                                                                trim]))),
     <<"AXYZD">> = iolist_to_binary(join(re:split("AXYZD","a.*c",[caseless,
                                                                                                                                                                   {parts,
-                                                                                                                                                                   2}]))), 
-    <<"AXYZD">> = iolist_to_binary(join(re:split("AXYZD","a.*c",[caseless]))), 
+                                                                                                                                                                   2}]))),
+    <<"AXYZD">> = iolist_to_binary(join(re:split("AXYZD","a.*c",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ABD","a[bc]d",[caseless,
-                                                                                                                                                                trim]))), 
+                                                                                                                                                                trim]))),
     <<":">> = iolist_to_binary(join(re:split("ABD","a[bc]d",[caseless,
                                                                                                                                                                   {parts,
-                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ABD","a[bc]d",[caseless]))), 
+                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ABD","a[bc]d",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ACE","a[b-d]e",[caseless,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<":">> = iolist_to_binary(join(re:split("ACE","a[b-d]e",[caseless,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ACE","a[b-d]e",[caseless]))), 
+                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ACE","a[b-d]e",[caseless]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[b-d]e",[caseless,
-                                                                                                                                                                                  trim]))), 
+                                                                                                                                                                                  trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[b-d]e",[caseless,
                                                                                                                                                                                     {parts,
-                                                                                                                                                                                     2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[b-d]e",[caseless]))), 
+                                                                                                                                                                                     2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[b-d]e",[caseless]))),
     <<"ABC">> = iolist_to_binary(join(re:split("ABC","a[b-d]e",[caseless,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<"ABC">> = iolist_to_binary(join(re:split("ABC","a[b-d]e",[caseless,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<"ABC">> = iolist_to_binary(join(re:split("ABC","a[b-d]e",[caseless]))), 
+                                                                                                                                                                     2}]))),
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","a[b-d]e",[caseless]))),
     <<"ABD">> = iolist_to_binary(join(re:split("ABD","a[b-d]e",[caseless,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<"ABD">> = iolist_to_binary(join(re:split("ABD","a[b-d]e",[caseless,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<"ABD">> = iolist_to_binary(join(re:split("ABD","a[b-d]e",[caseless]))), 
+                                                                                                                                                                     2}]))),
+    <<"ABD">> = iolist_to_binary(join(re:split("ABD","a[b-d]e",[caseless]))),
     <<"A">> = iolist_to_binary(join(re:split("AAC","a[b-d]",[caseless,
-                                                                                                                                                                trim]))), 
+                                                                                                                                                                trim]))),
     <<"A:">> = iolist_to_binary(join(re:split("AAC","a[b-d]",[caseless,
                                                                                                                                                                   {parts,
-                                                                                                                                                                   2}]))), 
-    <<"A:">> = iolist_to_binary(join(re:split("AAC","a[b-d]",[caseless]))), 
+                                                                                                                                                                   2}]))),
+    <<"A:">> = iolist_to_binary(join(re:split("AAC","a[b-d]",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("A-","a[-b]",[caseless,
-                                                                                                                                                            trim]))), 
+                                                                                                                                                            trim]))),
     <<":">> = iolist_to_binary(join(re:split("A-","a[-b]",[caseless,
                                                                                                                                                               {parts,
-                                                                                                                                                               2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("A-","a[-b]",[caseless]))), 
+                                                                                                                                                               2}]))),
+    <<":">> = iolist_to_binary(join(re:split("A-","a[-b]",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("A-","a[b-]",[caseless,
-                                                                                                                                                            trim]))), 
+                                                                                                                                                            trim]))),
     <<":">> = iolist_to_binary(join(re:split("A-","a[b-]",[caseless,
                                                                                                                                                               {parts,
-                                                                                                                                                               2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("A-","a[b-]",[caseless]))), 
+                                                                                                                                                               2}]))),
+    <<":">> = iolist_to_binary(join(re:split("A-","a[b-]",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("A]","a]",[caseless,
-                                                                                                                                                      trim]))), 
+                                                                                                                                                      trim]))),
     <<":">> = iolist_to_binary(join(re:split("A]","a]",[caseless,
                                                                                                                                                         {parts,
-                                                                                                                                                         2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("A]","a]",[caseless]))), 
+                                                                                                                                                         2}]))),
+    <<":">> = iolist_to_binary(join(re:split("A]","a]",[caseless]))),
     ok.
 run22() ->
     <<"">> = iolist_to_binary(join(re:split("A]B","a[]]b",[caseless,
-                                                                                                                                                              trim]))), 
+                                                                                                                                                              trim]))),
     <<":">> = iolist_to_binary(join(re:split("A]B","a[]]b",[caseless,
                                                                                                                                                                 {parts,
-                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("A]B","a[]]b",[caseless]))), 
+                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("A]B","a[]]b",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("AED","a[^bc]d",[caseless,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<":">> = iolist_to_binary(join(re:split("AED","a[^bc]d",[caseless,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("AED","a[^bc]d",[caseless]))), 
+                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("AED","a[^bc]d",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ADC","a[^-b]c",[caseless,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<":">> = iolist_to_binary(join(re:split("ADC","a[^-b]c",[caseless,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ADC","a[^-b]c",[caseless]))), 
+                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ADC","a[^-b]c",[caseless]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^-b]c",[caseless,
-                                                                                                                                                                                  trim]))), 
+                                                                                                                                                                                  trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^-b]c",[caseless,
                                                                                                                                                                                     {parts,
-                                                                                                                                                                                     2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^-b]c",[caseless]))), 
+                                                                                                                                                                                     2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^-b]c",[caseless]))),
     <<"ABD">> = iolist_to_binary(join(re:split("ABD","a[^-b]c",[caseless,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<"ABD">> = iolist_to_binary(join(re:split("ABD","a[^-b]c",[caseless,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<"ABD">> = iolist_to_binary(join(re:split("ABD","a[^-b]c",[caseless]))), 
+                                                                                                                                                                     2}]))),
+    <<"ABD">> = iolist_to_binary(join(re:split("ABD","a[^-b]c",[caseless]))),
     <<"A-C">> = iolist_to_binary(join(re:split("A-C","a[^-b]c",[caseless,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<"A-C">> = iolist_to_binary(join(re:split("A-C","a[^-b]c",[caseless,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<"A-C">> = iolist_to_binary(join(re:split("A-C","a[^-b]c",[caseless]))), 
+                                                                                                                                                                     2}]))),
+    <<"A-C">> = iolist_to_binary(join(re:split("A-C","a[^-b]c",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ADC","a[^]b]c",[caseless,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<":">> = iolist_to_binary(join(re:split("ADC","a[^]b]c",[caseless,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ADC","a[^]b]c",[caseless]))), 
+                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ADC","a[^]b]c",[caseless]))),
     <<":C">> = iolist_to_binary(join(re:split("ABC","ab|cd",[caseless,
-                                                                                                                                                              trim]))), 
+                                                                                                                                                              trim]))),
     <<":C">> = iolist_to_binary(join(re:split("ABC","ab|cd",[caseless,
                                                                                                                                                                 {parts,
-                                                                                                                                                                 2}]))), 
-    <<":C">> = iolist_to_binary(join(re:split("ABC","ab|cd",[caseless]))), 
+                                                                                                                                                                 2}]))),
+    <<":C">> = iolist_to_binary(join(re:split("ABC","ab|cd",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ABCD","ab|cd",[caseless,
-                                                                                                                                                                trim]))), 
+                                                                                                                                                                trim]))),
     <<":CD">> = iolist_to_binary(join(re:split("ABCD","ab|cd",[caseless,
                                                                                                                                                                   {parts,
-                                                                                                                                                                   2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("ABCD","ab|cd",[caseless]))), 
+                                                                                                                                                                   2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("ABCD","ab|cd",[caseless]))),
     <<"D">> = iolist_to_binary(join(re:split("DEF","()ef",[caseless,
-                                                                                                                                                            trim]))), 
+                                                                                                                                                            trim]))),
     <<"D::">> = iolist_to_binary(join(re:split("DEF","()ef",[caseless,
                                                                                                                                                               {parts,
-                                                                                                                                                               2}]))), 
-    <<"D::">> = iolist_to_binary(join(re:split("DEF","()ef",[caseless]))), 
+                                                                                                                                                               2}]))),
+    <<"D::">> = iolist_to_binary(join(re:split("DEF","()ef",[caseless]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","$b",[caseless,
-                                                                                                                                                                          trim]))), 
+                                                                                                                                                                          trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","$b",[caseless,
                                                                                                                                                                             {parts,
-                                                                                                                                                                             2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","$b",[caseless]))), 
+                                                                                                                                                                             2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","$b",[caseless]))),
     <<"A]C">> = iolist_to_binary(join(re:split("A]C","$b",[caseless,
-                                                                                                                                                          trim]))), 
+                                                                                                                                                          trim]))),
     <<"A]C">> = iolist_to_binary(join(re:split("A]C","$b",[caseless,
                                                                                                                                                             {parts,
-                                                                                                                                                             2}]))), 
-    <<"A]C">> = iolist_to_binary(join(re:split("A]C","$b",[caseless]))), 
+                                                                                                                                                             2}]))),
+    <<"A]C">> = iolist_to_binary(join(re:split("A]C","$b",[caseless]))),
     <<"B">> = iolist_to_binary(join(re:split("B","$b",[caseless,
-                                                                                                                                                      trim]))), 
+                                                                                                                                                      trim]))),
     <<"B">> = iolist_to_binary(join(re:split("B","$b",[caseless,
                                                                                                                                                         {parts,
-                                                                                                                                                         2}]))), 
-    <<"B">> = iolist_to_binary(join(re:split("B","$b",[caseless]))), 
+                                                                                                                                                         2}]))),
+    <<"B">> = iolist_to_binary(join(re:split("B","$b",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("A(B","a\\(b",[caseless,
-                                                                                                                                                               trim]))), 
+                                                                                                                                                               trim]))),
     <<":">> = iolist_to_binary(join(re:split("A(B","a\\(b",[caseless,
                                                                                                                                                                  {parts,
-                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("A(B","a\\(b",[caseless]))), 
+                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("A(B","a\\(b",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("AB","a\\(*b",[caseless,
-                                                                                                                                                               trim]))), 
+                                                                                                                                                               trim]))),
     <<":">> = iolist_to_binary(join(re:split("AB","a\\(*b",[caseless,
                                                                                                                                                                  {parts,
-                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("AB","a\\(*b",[caseless]))), 
+                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("AB","a\\(*b",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("A((B","a\\(*b",[caseless,
-                                                                                                                                                                   trim]))), 
+                                                                                                                                                                   trim]))),
     <<":">> = iolist_to_binary(join(re:split("A((B","a\\(*b",[caseless,
                                                                                                                                                                      {parts,
-                                                                                                                                                                      2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("A((B","a\\(*b",[caseless]))), 
+                                                                                                                                                                      2}]))),
+    <<":">> = iolist_to_binary(join(re:split("A((B","a\\(*b",[caseless]))),
     <<"A">> = iolist_to_binary(join(re:split("A","a\\\\b",[caseless,
                                                                                                                                                               notbol,
-                                                                                                                                                              trim]))), 
+                                                                                                                                                              trim]))),
     <<"A">> = iolist_to_binary(join(re:split("A","a\\\\b",[caseless,
                                                                                                                                                                 notbol,
                                                                                                                                                                 {parts,
-                                                                                                                                                                 2}]))), 
+                                                                                                                                                                 2}]))),
     <<"A">> = iolist_to_binary(join(re:split("A","a\\\\b",[caseless,
-                                                                                                                                                                 notbol]))), 
+                                                                                                                                                                 notbol]))),
     <<":A:A:BC">> = iolist_to_binary(join(re:split("ABC","((a))",[caseless,
-                                                                                                                                                              trim]))), 
+                                                                                                                                                              trim]))),
     <<":A:A:BC">> = iolist_to_binary(join(re:split("ABC","((a))",[caseless,
                                                                                                                                                                 {parts,
-                                                                                                                                                                 2}]))), 
-    <<":A:A:BC">> = iolist_to_binary(join(re:split("ABC","((a))",[caseless]))), 
+                                                                                                                                                                 2}]))),
+    <<":A:A:BC">> = iolist_to_binary(join(re:split("ABC","((a))",[caseless]))),
     <<":A:C">> = iolist_to_binary(join(re:split("ABC","(a)b(c)",[caseless,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<":A:C:">> = iolist_to_binary(join(re:split("ABC","(a)b(c)",[caseless,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<":A:C:">> = iolist_to_binary(join(re:split("ABC","(a)b(c)",[caseless]))), 
+                                                                                                                                                                     2}]))),
+    <<":A:C:">> = iolist_to_binary(join(re:split("ABC","(a)b(c)",[caseless]))),
     <<"AABB">> = iolist_to_binary(join(re:split("AABBABC","a+b+c",[caseless,
-                                                                                                                                                                      trim]))), 
+                                                                                                                                                                      trim]))),
     <<"AABB:">> = iolist_to_binary(join(re:split("AABBABC","a+b+c",[caseless,
                                                                                                                                                                         {parts,
-                                                                                                                                                                         2}]))), 
-    <<"AABB:">> = iolist_to_binary(join(re:split("AABBABC","a+b+c",[caseless]))), 
+                                                                                                                                                                         2}]))),
+    <<"AABB:">> = iolist_to_binary(join(re:split("AABBABC","a+b+c",[caseless]))),
     <<"AABB">> = iolist_to_binary(join(re:split("AABBABC","a{1,}b{1,}c",[caseless,
-                                                                                                                                                                                  trim]))), 
+                                                                                                                                                                                  trim]))),
     <<"AABB:">> = iolist_to_binary(join(re:split("AABBABC","a{1,}b{1,}c",[caseless,
                                                                                                                                                                                     {parts,
-                                                                                                                                                                                     2}]))), 
-    <<"AABB:">> = iolist_to_binary(join(re:split("AABBABC","a{1,}b{1,}c",[caseless]))), 
+                                                                                                                                                                                     2}]))),
+    <<"AABB:">> = iolist_to_binary(join(re:split("AABBABC","a{1,}b{1,}c",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ABCABC","a.+?c",[caseless,
-                                                                                                                                                                    trim]))), 
+                                                                                                                                                                    trim]))),
     <<":ABC">> = iolist_to_binary(join(re:split("ABCABC","a.+?c",[caseless,
                                                                                                                                                                       {parts,
-                                                                                                                                                                       2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("ABCABC","a.+?c",[caseless]))), 
+                                                                                                                                                                       2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("ABCABC","a.+?c",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ABCABC","a.*?c",[caseless,
-                                                                                                                                                                    trim]))), 
+                                                                                                                                                                    trim]))),
     <<":ABC">> = iolist_to_binary(join(re:split("ABCABC","a.*?c",[caseless,
                                                                                                                                                                       {parts,
-                                                                                                                                                                       2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("ABCABC","a.*?c",[caseless]))), 
+                                                                                                                                                                       2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("ABCABC","a.*?c",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ABCABC","a.{0,5}?c",[caseless,
-                                                                                                                                                                            trim]))), 
+                                                                                                                                                                            trim]))),
     <<":ABC">> = iolist_to_binary(join(re:split("ABCABC","a.{0,5}?c",[caseless,
                                                                                                                                                                               {parts,
-                                                                                                                                                                               2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("ABCABC","a.{0,5}?c",[caseless]))), 
+                                                                                                                                                                               2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("ABCABC","a.{0,5}?c",[caseless]))),
     <<":B">> = iolist_to_binary(join(re:split("AB","(a+|b)*",[caseless,
-                                                                                                                                                                trim]))), 
+                                                                                                                                                                trim]))),
     <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b)*",[caseless,
                                                                                                                                                                   {parts,
-                                                                                                                                                                   2}]))), 
-    <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b)*",[caseless]))), 
+                                                                                                                                                                   2}]))),
+    <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b)*",[caseless]))),
     <<":B">> = iolist_to_binary(join(re:split("AB","(a+|b){0,}",[caseless,
-                                                                                                                                                                      trim]))), 
+                                                                                                                                                                      trim]))),
     <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b){0,}",[caseless,
                                                                                                                                                                         {parts,
-                                                                                                                                                                         2}]))), 
-    <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b){0,}",[caseless]))), 
+                                                                                                                                                                         2}]))),
+    <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b){0,}",[caseless]))),
     <<":B">> = iolist_to_binary(join(re:split("AB","(a+|b)+",[caseless,
-                                                                                                                                                                trim]))), 
+                                                                                                                                                                trim]))),
     <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b)+",[caseless,
                                                                                                                                                                   {parts,
-                                                                                                                                                                   2}]))), 
-    <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b)+",[caseless]))), 
+                                                                                                                                                                   2}]))),
+    <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b)+",[caseless]))),
     ok.
 run23() ->
     <<":B">> = iolist_to_binary(join(re:split("AB","(a+|b){1,}",[caseless,
-                                                                                                                                                                      trim]))), 
+                                                                                                                                                                      trim]))),
     <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b){1,}",[caseless,
                                                                                                                                                                         {parts,
-                                                                                                                                                                         2}]))), 
-    <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b){1,}",[caseless]))), 
+                                                                                                                                                                         2}]))),
+    <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b){1,}",[caseless]))),
     <<":A::B">> = iolist_to_binary(join(re:split("AB","(a+|b)?",[caseless,
-                                                                                                                                                                trim]))), 
+                                                                                                                                                                trim]))),
     <<":A:B">> = iolist_to_binary(join(re:split("AB","(a+|b)?",[caseless,
                                                                                                                                                                   {parts,
-                                                                                                                                                                   2}]))), 
-    <<":A::B:">> = iolist_to_binary(join(re:split("AB","(a+|b)?",[caseless]))), 
+                                                                                                                                                                   2}]))),
+    <<":A::B:">> = iolist_to_binary(join(re:split("AB","(a+|b)?",[caseless]))),
     <<":A::B">> = iolist_to_binary(join(re:split("AB","(a+|b){0,1}",[caseless,
-                                                                                                                                                                        trim]))), 
+                                                                                                                                                                        trim]))),
     <<":A:B">> = iolist_to_binary(join(re:split("AB","(a+|b){0,1}",[caseless,
                                                                                                                                                                           {parts,
-                                                                                                                                                                           2}]))), 
-    <<":A::B:">> = iolist_to_binary(join(re:split("AB","(a+|b){0,1}",[caseless]))), 
+                                                                                                                                                                           2}]))),
+    <<":A::B:">> = iolist_to_binary(join(re:split("AB","(a+|b){0,1}",[caseless]))),
     <<":A::B">> = iolist_to_binary(join(re:split("AB","(a+|b){0,1}?",[caseless,
-                                                                                                                                                                          trim]))), 
+                                                                                                                                                                          trim]))),
     <<":A:B">> = iolist_to_binary(join(re:split("AB","(a+|b){0,1}?",[caseless,
                                                                                                                                                                             {parts,
-                                                                                                                                                                             2}]))), 
-    <<":A::B:">> = iolist_to_binary(join(re:split("AB","(a+|b){0,1}?",[caseless]))), 
+                                                                                                                                                                             2}]))),
+    <<":A::B:">> = iolist_to_binary(join(re:split("AB","(a+|b){0,1}?",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("CDE","[^ab]*",[caseless,
-                                                                                                                                                                trim]))), 
+                                                                                                                                                                trim]))),
     <<":">> = iolist_to_binary(join(re:split("CDE","[^ab]*",[caseless,
                                                                                                                                                                   {parts,
-                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("CDE","[^ab]*",[caseless]))), 
+                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("CDE","[^ab]*",[caseless]))),
     <<":C">> = iolist_to_binary(join(re:split("ABBBCD","([abc])*d",[caseless,
-                                                                                                                                                                            trim]))), 
+                                                                                                                                                                            trim]))),
     <<":C:">> = iolist_to_binary(join(re:split("ABBBCD","([abc])*d",[caseless,
                                                                                                                                                                               {parts,
-                                                                                                                                                                               2}]))), 
-    <<":C:">> = iolist_to_binary(join(re:split("ABBBCD","([abc])*d",[caseless]))), 
+                                                                                                                                                                               2}]))),
+    <<":C:">> = iolist_to_binary(join(re:split("ABBBCD","([abc])*d",[caseless]))),
     <<":A">> = iolist_to_binary(join(re:split("ABCD","([abc])*bcd",[caseless,
-                                                                                                                                                                            trim]))), 
+                                                                                                                                                                            trim]))),
     <<":A:">> = iolist_to_binary(join(re:split("ABCD","([abc])*bcd",[caseless,
                                                                                                                                                                               {parts,
-                                                                                                                                                                               2}]))), 
-    <<":A:">> = iolist_to_binary(join(re:split("ABCD","([abc])*bcd",[caseless]))), 
+                                                                                                                                                                               2}]))),
+    <<":A:">> = iolist_to_binary(join(re:split("ABCD","([abc])*bcd",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("E","a|b|c|d|e",[caseless,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<":">> = iolist_to_binary(join(re:split("E","a|b|c|d|e",[caseless,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("E","a|b|c|d|e",[caseless]))), 
+                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("E","a|b|c|d|e",[caseless]))),
     <<":E">> = iolist_to_binary(join(re:split("EF","(a|b|c|d|e)f",[caseless,
-                                                                                                                                                                          trim]))), 
+                                                                                                                                                                          trim]))),
     <<":E:">> = iolist_to_binary(join(re:split("EF","(a|b|c|d|e)f",[caseless,
                                                                                                                                                                             {parts,
-                                                                                                                                                                             2}]))), 
-    <<":E:">> = iolist_to_binary(join(re:split("EF","(a|b|c|d|e)f",[caseless]))), 
+                                                                                                                                                                             2}]))),
+    <<":E:">> = iolist_to_binary(join(re:split("EF","(a|b|c|d|e)f",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ABCDEFG","abcd*efg",[caseless,
-                                                                                                                                                                            trim]))), 
+                                                                                                                                                                            trim]))),
     <<":">> = iolist_to_binary(join(re:split("ABCDEFG","abcd*efg",[caseless,
                                                                                                                                                                               {parts,
-                                                                                                                                                                               2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ABCDEFG","abcd*efg",[caseless]))), 
+                                                                                                                                                                               2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ABCDEFG","abcd*efg",[caseless]))),
     <<"X:Y:Z">> = iolist_to_binary(join(re:split("XABYABBBZ","ab*",[caseless,
-                                                                                                                                                                      trim]))), 
+                                                                                                                                                                      trim]))),
     <<"X:YABBBZ">> = iolist_to_binary(join(re:split("XABYABBBZ","ab*",[caseless,
                                                                                                                                                                         {parts,
-                                                                                                                                                                         2}]))), 
-    <<"X:Y:Z">> = iolist_to_binary(join(re:split("XABYABBBZ","ab*",[caseless]))), 
+                                                                                                                                                                         2}]))),
+    <<"X:Y:Z">> = iolist_to_binary(join(re:split("XABYABBBZ","ab*",[caseless]))),
     <<"X:Y:Z">> = iolist_to_binary(join(re:split("XAYABBBZ","ab*",[caseless,
-                                                                                                                                                                    trim]))), 
+                                                                                                                                                                    trim]))),
     <<"X:YABBBZ">> = iolist_to_binary(join(re:split("XAYABBBZ","ab*",[caseless,
                                                                                                                                                                       {parts,
-                                                                                                                                                                       2}]))), 
-    <<"X:Y:Z">> = iolist_to_binary(join(re:split("XAYABBBZ","ab*",[caseless]))), 
+                                                                                                                                                                       2}]))),
+    <<"X:Y:Z">> = iolist_to_binary(join(re:split("XAYABBBZ","ab*",[caseless]))),
     <<"AB:CD">> = iolist_to_binary(join(re:split("ABCDE","(ab|cd)e",[caseless,
-                                                                                                                                                                        trim]))), 
+                                                                                                                                                                        trim]))),
     <<"AB:CD:">> = iolist_to_binary(join(re:split("ABCDE","(ab|cd)e",[caseless,
                                                                                                                                                                           {parts,
-                                                                                                                                                                           2}]))), 
-    <<"AB:CD:">> = iolist_to_binary(join(re:split("ABCDE","(ab|cd)e",[caseless]))), 
+                                                                                                                                                                           2}]))),
+    <<"AB:CD:">> = iolist_to_binary(join(re:split("ABCDE","(ab|cd)e",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("HIJ","[abhgefdc]ij",[caseless,
-                                                                                                                                                                            trim]))), 
+                                                                                                                                                                            trim]))),
     <<":">> = iolist_to_binary(join(re:split("HIJ","[abhgefdc]ij",[caseless,
                                                                                                                                                                               {parts,
-                                                                                                                                                                               2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("HIJ","[abhgefdc]ij",[caseless]))), 
+                                                                                                                                                                               2}]))),
+    <<":">> = iolist_to_binary(join(re:split("HIJ","[abhgefdc]ij",[caseless]))),
     <<"ABCDE">> = iolist_to_binary(join(re:split("ABCDE","^(ab|cd)e",[caseless,
-                                                                                                                                                                          trim]))), 
+                                                                                                                                                                          trim]))),
     <<"ABCDE">> = iolist_to_binary(join(re:split("ABCDE","^(ab|cd)e",[caseless,
                                                                                                                                                                             {parts,
-                                                                                                                                                                             2}]))), 
-    <<"ABCDE">> = iolist_to_binary(join(re:split("ABCDE","^(ab|cd)e",[caseless]))), 
+                                                                                                                                                                             2}]))),
+    <<"ABCDE">> = iolist_to_binary(join(re:split("ABCDE","^(ab|cd)e",[caseless]))),
     <<"ABCD">> = iolist_to_binary(join(re:split("ABCDEF","(abc|)ef",[caseless,
-                                                                                                                                                                          trim]))), 
+                                                                                                                                                                          trim]))),
     <<"ABCD::">> = iolist_to_binary(join(re:split("ABCDEF","(abc|)ef",[caseless,
                                                                                                                                                                             {parts,
-                                                                                                                                                                             2}]))), 
-    <<"ABCD::">> = iolist_to_binary(join(re:split("ABCDEF","(abc|)ef",[caseless]))), 
+                                                                                                                                                                             2}]))),
+    <<"ABCD::">> = iolist_to_binary(join(re:split("ABCDEF","(abc|)ef",[caseless]))),
     <<"A:B">> = iolist_to_binary(join(re:split("ABCD","(a|b)c*d",[caseless,
-                                                                                                                                                                      trim]))), 
+                                                                                                                                                                      trim]))),
     <<"A:B:">> = iolist_to_binary(join(re:split("ABCD","(a|b)c*d",[caseless,
                                                                                                                                                                         {parts,
-                                                                                                                                                                         2}]))), 
-    <<"A:B:">> = iolist_to_binary(join(re:split("ABCD","(a|b)c*d",[caseless]))), 
+                                                                                                                                                                         2}]))),
+    <<"A:B:">> = iolist_to_binary(join(re:split("ABCD","(a|b)c*d",[caseless]))),
     <<":A">> = iolist_to_binary(join(re:split("ABC","(ab|ab*)bc",[caseless,
-                                                                                                                                                                        trim]))), 
+                                                                                                                                                                        trim]))),
     <<":A:">> = iolist_to_binary(join(re:split("ABC","(ab|ab*)bc",[caseless,
                                                                                                                                                                           {parts,
-                                                                                                                                                                           2}]))), 
-    <<":A:">> = iolist_to_binary(join(re:split("ABC","(ab|ab*)bc",[caseless]))), 
+                                                                                                                                                                           2}]))),
+    <<":A:">> = iolist_to_binary(join(re:split("ABC","(ab|ab*)bc",[caseless]))),
     <<":BC">> = iolist_to_binary(join(re:split("ABC","a([bc]*)c*",[caseless,
-                                                                                                                                                                        trim]))), 
+                                                                                                                                                                        trim]))),
     <<":BC:">> = iolist_to_binary(join(re:split("ABC","a([bc]*)c*",[caseless,
                                                                                                                                                                           {parts,
-                                                                                                                                                                           2}]))), 
-    <<":BC:">> = iolist_to_binary(join(re:split("ABC","a([bc]*)c*",[caseless]))), 
+                                                                                                                                                                           2}]))),
+    <<":BC:">> = iolist_to_binary(join(re:split("ABC","a([bc]*)c*",[caseless]))),
     ok.
 run24() ->
     <<":BC:D">> = iolist_to_binary(join(re:split("ABCD","a([bc]*)(c*d)",[caseless,
-                                                                                                                                                                                trim]))), 
+                                                                                                                                                                                trim]))),
     <<":BC:D:">> = iolist_to_binary(join(re:split("ABCD","a([bc]*)(c*d)",[caseless,
                                                                                                                                                                                   {parts,
-                                                                                                                                                                                   2}]))), 
-    <<":BC:D:">> = iolist_to_binary(join(re:split("ABCD","a([bc]*)(c*d)",[caseless]))), 
+                                                                                                                                                                                   2}]))),
+    <<":BC:D:">> = iolist_to_binary(join(re:split("ABCD","a([bc]*)(c*d)",[caseless]))),
     <<":BC:D">> = iolist_to_binary(join(re:split("ABCD","a([bc]+)(c*d)",[caseless,
-                                                                                                                                                                                trim]))), 
+                                                                                                                                                                                trim]))),
     <<":BC:D:">> = iolist_to_binary(join(re:split("ABCD","a([bc]+)(c*d)",[caseless,
                                                                                                                                                                                   {parts,
-                                                                                                                                                                                   2}]))), 
-    <<":BC:D:">> = iolist_to_binary(join(re:split("ABCD","a([bc]+)(c*d)",[caseless]))), 
+                                                                                                                                                                                   2}]))),
+    <<":BC:D:">> = iolist_to_binary(join(re:split("ABCD","a([bc]+)(c*d)",[caseless]))),
     <<":B:CD">> = iolist_to_binary(join(re:split("ABCD","a([bc]*)(c+d)",[caseless,
-                                                                                                                                                                                trim]))), 
+                                                                                                                                                                                trim]))),
     <<":B:CD:">> = iolist_to_binary(join(re:split("ABCD","a([bc]*)(c+d)",[caseless,
                                                                                                                                                                                   {parts,
-                                                                                                                                                                                   2}]))), 
-    <<":B:CD:">> = iolist_to_binary(join(re:split("ABCD","a([bc]*)(c+d)",[caseless]))), 
+                                                                                                                                                                                   2}]))),
+    <<":B:CD:">> = iolist_to_binary(join(re:split("ABCD","a([bc]*)(c+d)",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ADCDCDE","a[bcd]*dcdcde",[caseless,
-                                                                                                                                                                                      trim]))), 
+                                                                                                                                                                                      trim]))),
     <<":">> = iolist_to_binary(join(re:split("ADCDCDE","a[bcd]*dcdcde",[caseless,
                                                                                                                                                                                         {parts,
-                                                                                                                                                                                         2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ADCDCDE","a[bcd]*dcdcde",[caseless]))), 
+                                                                                                                                                                                         2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ADCDCDE","a[bcd]*dcdcde",[caseless]))),
     <<":AB">> = iolist_to_binary(join(re:split("ABC","(ab|a)b*c",[caseless,
-                                                                                                                                                                      trim]))), 
+                                                                                                                                                                      trim]))),
     <<":AB:">> = iolist_to_binary(join(re:split("ABC","(ab|a)b*c",[caseless,
                                                                                                                                                                         {parts,
-                                                                                                                                                                         2}]))), 
-    <<":AB:">> = iolist_to_binary(join(re:split("ABC","(ab|a)b*c",[caseless]))), 
+                                                                                                                                                                         2}]))),
+    <<":AB:">> = iolist_to_binary(join(re:split("ABC","(ab|a)b*c",[caseless]))),
     <<":ABC:A:B:D">> = iolist_to_binary(join(re:split("ABCD","((a)(b)c)(d)",[caseless,
-                                                                                                                                                                              trim]))), 
+                                                                                                                                                                              trim]))),
     <<":ABC:A:B:D:">> = iolist_to_binary(join(re:split("ABCD","((a)(b)c)(d)",[caseless,
                                                                                                                                                                                 {parts,
-                                                                                                                                                                                 2}]))), 
-    <<":ABC:A:B:D:">> = iolist_to_binary(join(re:split("ABCD","((a)(b)c)(d)",[caseless]))), 
+                                                                                                                                                                                 2}]))),
+    <<":ABC:A:B:D:">> = iolist_to_binary(join(re:split("ABCD","((a)(b)c)(d)",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ALPHA","[a-zA-Z_][a-zA-Z0-9_]*",[caseless,
-                                                                                                                                                                                                    trim]))), 
+                                                                                                                                                                                                    trim]))),
     <<":">> = iolist_to_binary(join(re:split("ALPHA","[a-zA-Z_][a-zA-Z0-9_]*",[caseless,
                                                                                                                                                                                                       {parts,
-                                                                                                                                                                                                       2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ALPHA","[a-zA-Z_][a-zA-Z0-9_]*",[caseless]))), 
+                                                                                                                                                                                                       2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ALPHA","[a-zA-Z_][a-zA-Z0-9_]*",[caseless]))),
     <<"A">> = iolist_to_binary(join(re:split("ABH","^a(bc+|b[eh])g|.h$",[caseless,
-                                                                                                                                                                                         trim]))), 
+                                                                                                                                                                                         trim]))),
     <<"A::">> = iolist_to_binary(join(re:split("ABH","^a(bc+|b[eh])g|.h$",[caseless,
                                                                                                                                                                                            {parts,
-                                                                                                                                                                                            2}]))), 
-    <<"A::">> = iolist_to_binary(join(re:split("ABH","^a(bc+|b[eh])g|.h$",[caseless]))), 
+                                                                                                                                                                                            2}]))),
+    <<"A::">> = iolist_to_binary(join(re:split("ABH","^a(bc+|b[eh])g|.h$",[caseless]))),
     <<":EFFGZ">> = iolist_to_binary(join(re:split("EFFGZ","(bc+d$|ef*g.|h?i(j|k))",[caseless,
-                                                                                                                                                                                                     trim]))), 
+                                                                                                                                                                                                     trim]))),
     <<":EFFGZ::">> = iolist_to_binary(join(re:split("EFFGZ","(bc+d$|ef*g.|h?i(j|k))",[caseless,
                                                                                                                                                                                                        {parts,
-                                                                                                                                                                                                        2}]))), 
-    <<":EFFGZ::">> = iolist_to_binary(join(re:split("EFFGZ","(bc+d$|ef*g.|h?i(j|k))",[caseless]))), 
+                                                                                                                                                                                                        2}]))),
+    <<":EFFGZ::">> = iolist_to_binary(join(re:split("EFFGZ","(bc+d$|ef*g.|h?i(j|k))",[caseless]))),
     <<":IJ:J">> = iolist_to_binary(join(re:split("IJ","(bc+d$|ef*g.|h?i(j|k))",[caseless,
-                                                                                                                                                                                               trim]))), 
+                                                                                                                                                                                               trim]))),
     <<":IJ:J:">> = iolist_to_binary(join(re:split("IJ","(bc+d$|ef*g.|h?i(j|k))",[caseless,
                                                                                                                                                                                                  {parts,
-                                                                                                                                                                                                  2}]))), 
-    <<":IJ:J:">> = iolist_to_binary(join(re:split("IJ","(bc+d$|ef*g.|h?i(j|k))",[caseless]))), 
+                                                                                                                                                                                                  2}]))),
+    <<":IJ:J:">> = iolist_to_binary(join(re:split("IJ","(bc+d$|ef*g.|h?i(j|k))",[caseless]))),
     <<"R:EFFGZ">> = iolist_to_binary(join(re:split("REFFGZ","(bc+d$|ef*g.|h?i(j|k))",[caseless,
-                                                                                                                                                                                                       trim]))), 
+                                                                                                                                                                                                       trim]))),
     <<"R:EFFGZ::">> = iolist_to_binary(join(re:split("REFFGZ","(bc+d$|ef*g.|h?i(j|k))",[caseless,
                                                                                                                                                                                                          {parts,
-                                                                                                                                                                                                          2}]))), 
-    <<"R:EFFGZ::">> = iolist_to_binary(join(re:split("REFFGZ","(bc+d$|ef*g.|h?i(j|k))",[caseless]))), 
+                                                                                                                                                                                                          2}]))),
+    <<"R:EFFGZ::">> = iolist_to_binary(join(re:split("REFFGZ","(bc+d$|ef*g.|h?i(j|k))",[caseless]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(bc+d$|ef*g.|h?i(j|k))",[caseless,
-                                                                                                                                                                                                                 trim]))), 
+                                                                                                                                                                                                                 trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(bc+d$|ef*g.|h?i(j|k))",[caseless,
                                                                                                                                                                                                                    {parts,
-                                                                                                                                                                                                                    2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(bc+d$|ef*g.|h?i(j|k))",[caseless]))), 
+                                                                                                                                                                                                                    2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(bc+d$|ef*g.|h?i(j|k))",[caseless]))),
     <<"ADCDCDE">> = iolist_to_binary(join(re:split("ADCDCDE","(bc+d$|ef*g.|h?i(j|k))",[caseless,
-                                                                                                                                                                                                         trim]))), 
+                                                                                                                                                                                                         trim]))),
     <<"ADCDCDE">> = iolist_to_binary(join(re:split("ADCDCDE","(bc+d$|ef*g.|h?i(j|k))",[caseless,
                                                                                                                                                                                                            {parts,
-                                                                                                                                                                                                            2}]))), 
-    <<"ADCDCDE">> = iolist_to_binary(join(re:split("ADCDCDE","(bc+d$|ef*g.|h?i(j|k))",[caseless]))), 
+                                                                                                                                                                                                            2}]))),
+    <<"ADCDCDE">> = iolist_to_binary(join(re:split("ADCDCDE","(bc+d$|ef*g.|h?i(j|k))",[caseless]))),
     <<"EFFG">> = iolist_to_binary(join(re:split("EFFG","(bc+d$|ef*g.|h?i(j|k))",[caseless,
-                                                                                                                                                                                                   trim]))), 
+                                                                                                                                                                                                   trim]))),
     <<"EFFG">> = iolist_to_binary(join(re:split("EFFG","(bc+d$|ef*g.|h?i(j|k))",[caseless,
                                                                                                                                                                                                      {parts,
-                                                                                                                                                                                                      2}]))), 
-    <<"EFFG">> = iolist_to_binary(join(re:split("EFFG","(bc+d$|ef*g.|h?i(j|k))",[caseless]))), 
+                                                                                                                                                                                                      2}]))),
+    <<"EFFG">> = iolist_to_binary(join(re:split("EFFG","(bc+d$|ef*g.|h?i(j|k))",[caseless]))),
     <<"BCDD">> = iolist_to_binary(join(re:split("BCDD","(bc+d$|ef*g.|h?i(j|k))",[caseless,
-                                                                                                                                                                                                   trim]))), 
+                                                                                                                                                                                                   trim]))),
     <<"BCDD">> = iolist_to_binary(join(re:split("BCDD","(bc+d$|ef*g.|h?i(j|k))",[caseless,
                                                                                                                                                                                                      {parts,
-                                                                                                                                                                                                      2}]))), 
-    <<"BCDD">> = iolist_to_binary(join(re:split("BCDD","(bc+d$|ef*g.|h?i(j|k))",[caseless]))), 
+                                                                                                                                                                                                      2}]))),
+    <<"BCDD">> = iolist_to_binary(join(re:split("BCDD","(bc+d$|ef*g.|h?i(j|k))",[caseless]))),
     <<":A:A:A:A:A:A:A:A:A:A">> = iolist_to_binary(join(re:split("A","((((((((((a))))))))))",[caseless,
-                                                                                                                                                                                          trim]))), 
+                                                                                                                                                                                          trim]))),
     <<":A:A:A:A:A:A:A:A:A:A:">> = iolist_to_binary(join(re:split("A","((((((((((a))))))))))",[caseless,
                                                                                                                                                                                             {parts,
-                                                                                                                                                                                             2}]))), 
-    <<":A:A:A:A:A:A:A:A:A:A:">> = iolist_to_binary(join(re:split("A","((((((((((a))))))))))",[caseless]))), 
+                                                                                                                                                                                             2}]))),
+    <<":A:A:A:A:A:A:A:A:A:A:">> = iolist_to_binary(join(re:split("A","((((((((((a))))))))))",[caseless]))),
     <<":A:A:A:A:A:A:A:A:A:A">> = iolist_to_binary(join(re:split("AA","((((((((((a))))))))))\\10",[caseless,
-                                                                                                                                                                                                     trim]))), 
+                                                                                                                                                                                                     trim]))),
     <<":A:A:A:A:A:A:A:A:A:A:">> = iolist_to_binary(join(re:split("AA","((((((((((a))))))))))\\10",[caseless,
                                                                                                                                                                                                        {parts,
-                                                                                                                                                                                                        2}]))), 
-    <<":A:A:A:A:A:A:A:A:A:A:">> = iolist_to_binary(join(re:split("AA","((((((((((a))))))))))\\10",[caseless]))), 
+                                                                                                                                                                                                        2}]))),
+    <<":A:A:A:A:A:A:A:A:A:A:">> = iolist_to_binary(join(re:split("AA","((((((((((a))))))))))\\10",[caseless]))),
     <<":A:A:A:A:A:A:A:A:A">> = iolist_to_binary(join(re:split("A","(((((((((a)))))))))",[caseless,
-                                                                                                                                                                                      trim]))), 
+                                                                                                                                                                                      trim]))),
     <<":A:A:A:A:A:A:A:A:A:">> = iolist_to_binary(join(re:split("A","(((((((((a)))))))))",[caseless,
                                                                                                                                                                                         {parts,
-                                                                                                                                                                                         2}]))), 
-    <<":A:A:A:A:A:A:A:A:A:">> = iolist_to_binary(join(re:split("A","(((((((((a)))))))))",[caseless]))), 
+                                                                                                                                                                                         2}]))),
+    <<":A:A:A:A:A:A:A:A:A:">> = iolist_to_binary(join(re:split("A","(((((((((a)))))))))",[caseless]))),
     <<":A">> = iolist_to_binary(join(re:split("A","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a))))))))))",[caseless,
-                                                                                                                                                                                                                              trim]))), 
+                                                                                                                                                                                                                              trim]))),
     <<":A:">> = iolist_to_binary(join(re:split("A","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a))))))))))",[caseless,
                                                                                                                                                                                                                                 {parts,
-                                                                                                                                                                                                                                 2}]))), 
-    <<":A:">> = iolist_to_binary(join(re:split("A","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a))))))))))",[caseless]))), 
+                                                                                                                                                                                                                                 2}]))),
+    <<":A:">> = iolist_to_binary(join(re:split("A","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a))))))))))",[caseless]))),
     <<":C">> = iolist_to_binary(join(re:split("C","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a|b|c))))))))))",[caseless,
-                                                                                                                                                                                                                                      trim]))), 
+                                                                                                                                                                                                                                      trim]))),
     <<":C:">> = iolist_to_binary(join(re:split("C","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a|b|c))))))))))",[caseless,
                                                                                                                                                                                                                                         {parts,
-                                                                                                                                                                                                                                         2}]))), 
-    <<":C:">> = iolist_to_binary(join(re:split("C","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a|b|c))))))))))",[caseless]))), 
+                                                                                                                                                                                                                                         2}]))),
+    <<":C:">> = iolist_to_binary(join(re:split("C","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a|b|c))))))))))",[caseless]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","multiple words of text",[caseless,
-                                                                                                                                                                                                                trim]))), 
+                                                                                                                                                                                                                trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","multiple words of text",[caseless,
                                                                                                                                                                                                                   {parts,
-                                                                                                                                                                                                                   2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","multiple words of text",[caseless]))), 
+                                                                                                                                                                                                                   2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","multiple words of text",[caseless]))),
     <<"AA">> = iolist_to_binary(join(re:split("AA","multiple words of text",[caseless,
-                                                                                                                                                                                              trim]))), 
+                                                                                                                                                                                              trim]))),
     <<"AA">> = iolist_to_binary(join(re:split("AA","multiple words of text",[caseless,
                                                                                                                                                                                                 {parts,
-                                                                                                                                                                                                 2}]))), 
-    <<"AA">> = iolist_to_binary(join(re:split("AA","multiple words of text",[caseless]))), 
+                                                                                                                                                                                                 2}]))),
+    <<"AA">> = iolist_to_binary(join(re:split("AA","multiple words of text",[caseless]))),
     <<"UH-UH">> = iolist_to_binary(join(re:split("UH-UH","multiple words of text",[caseless,
-                                                                                                                                                                                                    trim]))), 
+                                                                                                                                                                                                    trim]))),
     <<"UH-UH">> = iolist_to_binary(join(re:split("UH-UH","multiple words of text",[caseless,
                                                                                                                                                                                                       {parts,
-                                                                                                                                                                                                       2}]))), 
-    <<"UH-UH">> = iolist_to_binary(join(re:split("UH-UH","multiple words of text",[caseless]))), 
+                                                                                                                                                                                                       2}]))),
+    <<"UH-UH">> = iolist_to_binary(join(re:split("UH-UH","multiple words of text",[caseless]))),
     <<":, YEAH">> = iolist_to_binary(join(re:split("MULTIPLE WORDS, YEAH","multiple words",[caseless,
-                                                                                                                                                                                                                  trim]))), 
+                                                                                                                                                                                                                  trim]))),
     <<":, YEAH">> = iolist_to_binary(join(re:split("MULTIPLE WORDS, YEAH","multiple words",[caseless,
                                                                                                                                                                                                                     {parts,
-                                                                                                                                                                                                                     2}]))), 
-    <<":, YEAH">> = iolist_to_binary(join(re:split("MULTIPLE WORDS, YEAH","multiple words",[caseless]))), 
+                                                                                                                                                                                                                     2}]))),
+    <<":, YEAH">> = iolist_to_binary(join(re:split("MULTIPLE WORDS, YEAH","multiple words",[caseless]))),
     <<":AB:DE">> = iolist_to_binary(join(re:split("ABCDE","(.*)c(.*)",[caseless,
-                                                                                                                                                                          trim]))), 
+                                                                                                                                                                          trim]))),
     <<":AB:DE:">> = iolist_to_binary(join(re:split("ABCDE","(.*)c(.*)",[caseless,
                                                                                                                                                                             {parts,
-                                                                                                                                                                             2}]))), 
-    <<":AB:DE:">> = iolist_to_binary(join(re:split("ABCDE","(.*)c(.*)",[caseless]))), 
+                                                                                                                                                                             2}]))),
+    <<":AB:DE:">> = iolist_to_binary(join(re:split("ABCDE","(.*)c(.*)",[caseless]))),
     <<":A:B">> = iolist_to_binary(join(re:split("(A, B)","\\((.*), (.*)\\)",[caseless,
-                                                                                                                                                                                            trim]))), 
+                                                                                                                                                                                            trim]))),
     <<":A:B:">> = iolist_to_binary(join(re:split("(A, B)","\\((.*), (.*)\\)",[caseless,
                                                                                                                                                                                               {parts,
-                                                                                                                                                                                               2}]))), 
-    <<":A:B:">> = iolist_to_binary(join(re:split("(A, B)","\\((.*), (.*)\\)",[caseless]))), 
+                                                                                                                                                                                               2}]))),
+    <<":A:B:">> = iolist_to_binary(join(re:split("(A, B)","\\((.*), (.*)\\)",[caseless]))),
     ok.
 run25() ->
     <<"">> = iolist_to_binary(join(re:split("ABCD","abcd",[caseless,
-                                                                                                                                                              trim]))), 
+                                                                                                                                                              trim]))),
     <<":">> = iolist_to_binary(join(re:split("ABCD","abcd",[caseless,
                                                                                                                                                                 {parts,
-                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ABCD","abcd",[caseless]))), 
+                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ABCD","abcd",[caseless]))),
     <<":BC">> = iolist_to_binary(join(re:split("ABCD","a(bc)d",[caseless,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<":BC:">> = iolist_to_binary(join(re:split("ABCD","a(bc)d",[caseless,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<":BC:">> = iolist_to_binary(join(re:split("ABCD","a(bc)d",[caseless]))), 
+                                                                                                                                                                     2}]))),
+    <<":BC:">> = iolist_to_binary(join(re:split("ABCD","a(bc)d",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("AC","a[-]?c",[caseless,
-                                                                                                                                                              trim]))), 
+                                                                                                                                                              trim]))),
     <<":">> = iolist_to_binary(join(re:split("AC","a[-]?c",[caseless,
                                                                                                                                                                 {parts,
-                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("AC","a[-]?c",[caseless]))), 
+                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("AC","a[-]?c",[caseless]))),
     <<":ABC">> = iolist_to_binary(join(re:split("ABCABC","(abc)\\1",[caseless,
-                                                                                                                                                                           trim]))), 
+                                                                                                                                                                           trim]))),
     <<":ABC:">> = iolist_to_binary(join(re:split("ABCABC","(abc)\\1",[caseless,
                                                                                                                                                                              {parts,
-                                                                                                                                                                              2}]))), 
-    <<":ABC:">> = iolist_to_binary(join(re:split("ABCABC","(abc)\\1",[caseless]))), 
+                                                                                                                                                                              2}]))),
+    <<":ABC:">> = iolist_to_binary(join(re:split("ABCABC","(abc)\\1",[caseless]))),
     <<":ABC">> = iolist_to_binary(join(re:split("ABCABC","([a-c]*)\\1",[caseless,
-                                                                                                                                                                                 trim]))), 
+                                                                                                                                                                                 trim]))),
     <<":ABC:">> = iolist_to_binary(join(re:split("ABCABC","([a-c]*)\\1",[caseless,
                                                                                                                                                                                    {parts,
-                                                                                                                                                                                    2}]))), 
-    <<":ABC:">> = iolist_to_binary(join(re:split("ABCABC","([a-c]*)\\1",[caseless]))), 
-    <<"ab">> = iolist_to_binary(join(re:split("abad","a(?!b).",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<":ABC:">> = iolist_to_binary(join(re:split("ABCABC","([a-c]*)\\1",[caseless]))),
+    <<"ab">> = iolist_to_binary(join(re:split("abad","a(?!b).",[trim]))),
     <<"ab:">> = iolist_to_binary(join(re:split("abad","a(?!b).",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<"ab:">> = iolist_to_binary(join(re:split("abad","a(?!b).",[]))), 
-    <<"ab">> = iolist_to_binary(join(re:split("abad","a(?=d).",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<"ab:">> = iolist_to_binary(join(re:split("abad","a(?!b).",[]))),
+    <<"ab">> = iolist_to_binary(join(re:split("abad","a(?=d).",[trim]))),
     <<"ab:">> = iolist_to_binary(join(re:split("abad","a(?=d).",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<"ab:">> = iolist_to_binary(join(re:split("abad","a(?=d).",[]))), 
-    <<"ab">> = iolist_to_binary(join(re:split("abad","a(?=c|d).",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<"ab:">> = iolist_to_binary(join(re:split("abad","a(?=d).",[]))),
+    <<"ab">> = iolist_to_binary(join(re:split("abad","a(?=c|d).",[trim]))),
     <<"ab:">> = iolist_to_binary(join(re:split("abad","a(?=c|d).",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<"ab:">> = iolist_to_binary(join(re:split("abad","a(?=c|d).",[]))), 
-    <<":e">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)(.)",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<"ab:">> = iolist_to_binary(join(re:split("abad","a(?=c|d).",[]))),
+    <<":e">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)(.)",[trim]))),
     <<":e:">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)(.)",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<":e:">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)(.)",[]))), 
-    <<":e">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)*(.)",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<":e:">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)(.)",[]))),
+    <<":e">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)*(.)",[trim]))),
     <<":e:">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)*(.)",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<":e:">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)*(.)",[]))), 
-    <<":e">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)+?(.)",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<":e:">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)*(.)",[]))),
+    <<":e">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)+?(.)",[trim]))),
     <<":e:">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)+?(.)",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<":e:">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)+?(.)",[]))), 
-    <<":d:bcdbe">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d)+?(.)",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<":e:">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)+?(.)",[]))),
+    <<":d:bcdbe">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d)+?(.)",[trim]))),
     <<":d:bcdbe">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d)+?(.)",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<":d:bcdbe">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d)+?(.)",[]))), 
-    <<":e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d)+(.)",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<":d:bcdbe">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d)+?(.)",[]))),
+    <<":e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d)+(.)",[trim]))),
     <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d)+(.)",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d)+(.)",[]))), 
-    <<":b:cdbe">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){2}(.)",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d)+(.)",[]))),
+    <<":b:cdbe">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){2}(.)",[trim]))),
     <<":b:cdbe">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){2}(.)",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<":b:cdbe">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){2}(.)",[]))), 
-    <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){4,5}(.)",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<":b:cdbe">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){2}(.)",[]))),
+    <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){4,5}(.)",[trim]))),
     <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){4,5}(.)",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){4,5}(.)",[]))), 
-    <<":d:be">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){4,5}?(.)",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){4,5}(.)",[]))),
+    <<":d:be">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){4,5}?(.)",[trim]))),
     <<":d:be">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){4,5}?(.)",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<":d:be">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){4,5}?(.)",[]))), 
-    <<":bar:foo:bar">> = iolist_to_binary(join(re:split("foobar","((foo)|(bar))*",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<":d:be">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){4,5}?(.)",[]))),
+    <<":bar:foo:bar">> = iolist_to_binary(join(re:split("foobar","((foo)|(bar))*",[trim]))),
     <<":bar:foo:bar:">> = iolist_to_binary(join(re:split("foobar","((foo)|(bar))*",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<":bar:foo:bar:">> = iolist_to_binary(join(re:split("foobar","((foo)|(bar))*",[]))), 
-    <<":e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){6,7}(.)",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<":bar:foo:bar:">> = iolist_to_binary(join(re:split("foobar","((foo)|(bar))*",[]))),
+    <<":e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){6,7}(.)",[trim]))),
     <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){6,7}(.)",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){6,7}(.)",[]))), 
-    <<":e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){6,7}?(.)",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){6,7}(.)",[]))),
+    <<":e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){6,7}?(.)",[trim]))),
     <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){6,7}?(.)",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){6,7}?(.)",[]))), 
-    <<":e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,6}(.)",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){6,7}?(.)",[]))),
+    <<":e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,6}(.)",[trim]))),
     <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,6}(.)",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,6}(.)",[]))), 
-    <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,6}?(.)",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,6}(.)",[]))),
+    <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,6}?(.)",[trim]))),
     <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,6}?(.)",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,6}?(.)",[]))), 
+                                                                                                                                                                                                      2}]))),
+    <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,6}?(.)",[]))),
     ok.
 run26() ->
-    <<":e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,7}(.)",[trim]))), 
+    <<":e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,7}(.)",[trim]))),
     <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,7}(.)",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,7}(.)",[]))), 
-    <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,7}?(.)",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,7}(.)",[]))),
+    <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,7}?(.)",[trim]))),
     <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,7}?(.)",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,7}?(.)",[]))), 
-    <<":c:e">> = iolist_to_binary(join(re:split("ace","a(?:b|(c|e){1,2}?|d)+?(.)",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,7}?(.)",[]))),
+    <<":c:e">> = iolist_to_binary(join(re:split("ace","a(?:b|(c|e){1,2}?|d)+?(.)",[trim]))),
     <<":c:e:">> = iolist_to_binary(join(re:split("ace","a(?:b|(c|e){1,2}?|d)+?(.)",[{parts,
-                                                                                                                                                                                                        2}]))), 
-    <<":c:e:">> = iolist_to_binary(join(re:split("ace","a(?:b|(c|e){1,2}?|d)+?(.)",[]))), 
-    <<":A">> = iolist_to_binary(join(re:split("AB","^(.+)?B",[trim]))), 
+                                                                                                                                                                                                        2}]))),
+    <<":c:e:">> = iolist_to_binary(join(re:split("ace","a(?:b|(c|e){1,2}?|d)+?(.)",[]))),
+    <<":A">> = iolist_to_binary(join(re:split("AB","^(.+)?B",[trim]))),
     <<":A:">> = iolist_to_binary(join(re:split("AB","^(.+)?B",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<":A:">> = iolist_to_binary(join(re:split("AB","^(.+)?B",[]))), 
-    <<":.">> = iolist_to_binary(join(re:split(".","^([^a-z])|(\\^)$",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<":A:">> = iolist_to_binary(join(re:split("AB","^(.+)?B",[]))),
+    <<":.">> = iolist_to_binary(join(re:split(".","^([^a-z])|(\\^)$",[trim]))),
     <<":.::">> = iolist_to_binary(join(re:split(".","^([^a-z])|(\\^)$",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<":.::">> = iolist_to_binary(join(re:split(".","^([^a-z])|(\\^)$",[]))), 
-    <<":OUT">> = iolist_to_binary(join(re:split("<&OUT","^[<>]&",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<":.::">> = iolist_to_binary(join(re:split(".","^([^a-z])|(\\^)$",[]))),
+    <<":OUT">> = iolist_to_binary(join(re:split("<&OUT","^[<>]&",[trim]))),
     <<":OUT">> = iolist_to_binary(join(re:split("<&OUT","^[<>]&",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<":OUT">> = iolist_to_binary(join(re:split("<&OUT","^[<>]&",[]))), 
-    <<":aaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<":OUT">> = iolist_to_binary(join(re:split("<&OUT","^[<>]&",[]))),
+    <<":aaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?){4}$",[trim]))),
     <<":aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<":aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?){4}$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a\\1?){4}$",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<":aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?){4}$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a\\1?){4}$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a\\1?){4}$",[]))), 
-    <<"AB">> = iolist_to_binary(join(re:split("AB","^(a\\1?){4}$",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a\\1?){4}$",[]))),
+    <<"AB">> = iolist_to_binary(join(re:split("AB","^(a\\1?){4}$",[trim]))),
     <<"AB">> = iolist_to_binary(join(re:split("AB","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<"AB">> = iolist_to_binary(join(re:split("AB","^(a\\1?){4}$",[]))), 
-    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?){4}$",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<"AB">> = iolist_to_binary(join(re:split("AB","^(a\\1?){4}$",[]))),
+    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?){4}$",[trim]))),
     <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?){4}$",[]))), 
-    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?){4}$",[]))),
+    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?){4}$",[trim]))),
     <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?){4}$",[]))), 
-    <<":aaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a(?(1)\\1)){4}$",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?){4}$",[]))),
+    <<":aaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a(?(1)\\1)){4}$",[trim]))),
     <<":aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a(?(1)\\1)){4}$",[{parts,
-                                                                                                                                                                                                        2}]))), 
-    <<":aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a(?(1)\\1)){4}$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a(?(1)\\1)){4}$",[trim]))), 
+                                                                                                                                                                                                        2}]))),
+    <<":aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a(?(1)\\1)){4}$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a(?(1)\\1)){4}$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a(?(1)\\1)){4}$",[{parts,
-                                                                                                                                                                                                          2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a(?(1)\\1)){4}$",[]))), 
-    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a(?(1)\\1)){4}$",[trim]))), 
+                                                                                                                                                                                                          2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a(?(1)\\1)){4}$",[]))),
+    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a(?(1)\\1)){4}$",[trim]))),
     <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a(?(1)\\1)){4}$",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a(?(1)\\1)){4}$",[]))), 
-    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a(?(1)\\1)){4}$",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a(?(1)\\1)){4}$",[]))),
+    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a(?(1)\\1)){4}$",[trim]))),
     <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a(?(1)\\1)){4}$",[{parts,
-                                                                                                                                                                                                          2}]))), 
-    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a(?(1)\\1)){4}$",[]))), 
-    <<":f:o:o:b:a:r">> = iolist_to_binary(join(re:split("foobar","(?:(f)(o)(o)|(b)(a)(r))*",[trim]))), 
+                                                                                                                                                                                                          2}]))),
+    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a(?(1)\\1)){4}$",[]))),
+    <<":f:o:o:b:a:r">> = iolist_to_binary(join(re:split("foobar","(?:(f)(o)(o)|(b)(a)(r))*",[trim]))),
     <<":f:o:o:b:a:r:">> = iolist_to_binary(join(re:split("foobar","(?:(f)(o)(o)|(b)(a)(r))*",[{parts,
-                                                                                                                                                                                                            2}]))), 
-    <<":f:o:o:b:a:r:">> = iolist_to_binary(join(re:split("foobar","(?:(f)(o)(o)|(b)(a)(r))*",[]))), 
-    <<"a">> = iolist_to_binary(join(re:split("ab","(?<=a)b",[trim]))), 
+                                                                                                                                                                                                            2}]))),
+    <<":f:o:o:b:a:r:">> = iolist_to_binary(join(re:split("foobar","(?:(f)(o)(o)|(b)(a)(r))*",[]))),
+    <<"a">> = iolist_to_binary(join(re:split("ab","(?<=a)b",[trim]))),
     <<"a:">> = iolist_to_binary(join(re:split("ab","(?<=a)b",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<"a:">> = iolist_to_binary(join(re:split("ab","(?<=a)b",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=a)b",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<"a:">> = iolist_to_binary(join(re:split("ab","(?<=a)b",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=a)b",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=a)b",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=a)b",[]))), 
-    <<"cb">> = iolist_to_binary(join(re:split("cb","(?<=a)b",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=a)b",[]))),
+    <<"cb">> = iolist_to_binary(join(re:split("cb","(?<=a)b",[trim]))),
     <<"cb">> = iolist_to_binary(join(re:split("cb","(?<=a)b",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<"cb">> = iolist_to_binary(join(re:split("cb","(?<=a)b",[]))), 
-    <<"b">> = iolist_to_binary(join(re:split("b","(?<=a)b",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<"cb">> = iolist_to_binary(join(re:split("cb","(?<=a)b",[]))),
+    <<"b">> = iolist_to_binary(join(re:split("b","(?<=a)b",[trim]))),
     <<"b">> = iolist_to_binary(join(re:split("b","(?<=a)b",[{parts,
-                                                                                                                                                                2}]))), 
-    <<"b">> = iolist_to_binary(join(re:split("b","(?<=a)b",[]))), 
-    <<"a">> = iolist_to_binary(join(re:split("ab","(?<!c)b",[trim]))), 
+                                                                                                                                                                2}]))),
+    <<"b">> = iolist_to_binary(join(re:split("b","(?<=a)b",[]))),
+    <<"a">> = iolist_to_binary(join(re:split("ab","(?<!c)b",[trim]))),
     <<"a:">> = iolist_to_binary(join(re:split("ab","(?<!c)b",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<"a:">> = iolist_to_binary(join(re:split("ab","(?<!c)b",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("b","(?<!c)b",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<"a:">> = iolist_to_binary(join(re:split("ab","(?<!c)b",[]))),
+    <<"">> = iolist_to_binary(join(re:split("b","(?<!c)b",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("b","(?<!c)b",[{parts,
-                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("b","(?<!c)b",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("b","(?<!c)b",[trim]))), 
+                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("b","(?<!c)b",[]))),
+    <<"">> = iolist_to_binary(join(re:split("b","(?<!c)b",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("b","(?<!c)b",[{parts,
-                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("b","(?<!c)b",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aba","(?:..)*a",[trim]))), 
+                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("b","(?<!c)b",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aba","(?:..)*a",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aba","(?:..)*a",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aba","(?:..)*a",[]))), 
-    <<":b">> = iolist_to_binary(join(re:split("aba","(?:..)*?a",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aba","(?:..)*a",[]))),
+    <<":b">> = iolist_to_binary(join(re:split("aba","(?:..)*?a",[trim]))),
     <<":ba">> = iolist_to_binary(join(re:split("aba","(?:..)*?a",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":b:">> = iolist_to_binary(join(re:split("aba","(?:..)*?a",[]))), 
-    <<":b:c">> = iolist_to_binary(join(re:split("abc","^(?:b|a(?=(.)))*\\1",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":b:">> = iolist_to_binary(join(re:split("aba","(?:..)*?a",[]))),
+    <<":b:c">> = iolist_to_binary(join(re:split("abc","^(?:b|a(?=(.)))*\\1",[trim]))),
     <<":b:c">> = iolist_to_binary(join(re:split("abc","^(?:b|a(?=(.)))*\\1",[{parts,
-                                                                                                                                                                                             2}]))), 
-    <<":b:c">> = iolist_to_binary(join(re:split("abc","^(?:b|a(?=(.)))*\\1",[]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","^(){3,5}",[trim]))), 
+                                                                                                                                                                                             2}]))),
+    <<":b:c">> = iolist_to_binary(join(re:split("abc","^(?:b|a(?=(.)))*\\1",[]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^(){3,5}",[trim]))),
     <<"abc">> = iolist_to_binary(join(re:split("abc","^(){3,5}",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","^(){3,5}",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aax","^(a+)*ax",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^(){3,5}",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aax","^(a+)*ax",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aax","^(a+)*ax",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aax","^(a+)*ax",[]))), 
-    <<":a:a">> = iolist_to_binary(join(re:split("aax","^((a|b)+)*ax",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aax","^(a+)*ax",[]))),
+    <<":a:a">> = iolist_to_binary(join(re:split("aax","^((a|b)+)*ax",[trim]))),
     <<":a:a:">> = iolist_to_binary(join(re:split("aax","^((a|b)+)*ax",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":a:a:">> = iolist_to_binary(join(re:split("aax","^((a|b)+)*ax",[]))), 
-    <<":a:a">> = iolist_to_binary(join(re:split("aax","^((a|bc)+)*ax",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":a:a:">> = iolist_to_binary(join(re:split("aax","^((a|b)+)*ax",[]))),
+    <<":a:a">> = iolist_to_binary(join(re:split("aax","^((a|bc)+)*ax",[trim]))),
     <<":a:a:">> = iolist_to_binary(join(re:split("aax","^((a|bc)+)*ax",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<":a:a:">> = iolist_to_binary(join(re:split("aax","^((a|bc)+)*ax",[]))), 
-    <<"c">> = iolist_to_binary(join(re:split("cab","(a|x)*ab",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<":a:a:">> = iolist_to_binary(join(re:split("aax","^((a|bc)+)*ax",[]))),
+    <<"c">> = iolist_to_binary(join(re:split("cab","(a|x)*ab",[trim]))),
     <<"c::">> = iolist_to_binary(join(re:split("cab","(a|x)*ab",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<"c::">> = iolist_to_binary(join(re:split("cab","(a|x)*ab",[]))), 
-    <<"c">> = iolist_to_binary(join(re:split("cab","(a)*ab",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<"c::">> = iolist_to_binary(join(re:split("cab","(a|x)*ab",[]))),
+    <<"c">> = iolist_to_binary(join(re:split("cab","(a)*ab",[trim]))),
     <<"c::">> = iolist_to_binary(join(re:split("cab","(a)*ab",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<"c::">> = iolist_to_binary(join(re:split("cab","(a)*ab",[]))), 
+                                                                                                                                                                  2}]))),
+    <<"c::">> = iolist_to_binary(join(re:split("cab","(a)*ab",[]))),
     ok.
 run27() ->
-    <<"">> = iolist_to_binary(join(re:split("ab","(?:(?i)a)b",[trim]))), 
+    <<"">> = iolist_to_binary(join(re:split("ab","(?:(?i)a)b",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("ab","(?:(?i)a)b",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ab","(?:(?i)a)b",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("ab","((?i)a)b",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ab","(?:(?i)a)b",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("ab","((?i)a)b",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("ab","((?i)a)b",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("ab","((?i)a)b",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("Ab","(?:(?i)a)b",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("ab","((?i)a)b",[]))),
+    <<"">> = iolist_to_binary(join(re:split("Ab","(?:(?i)a)b",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("Ab","(?:(?i)a)b",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("Ab","(?:(?i)a)b",[]))), 
-    <<":A">> = iolist_to_binary(join(re:split("Ab","((?i)a)b",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("Ab","(?:(?i)a)b",[]))),
+    <<":A">> = iolist_to_binary(join(re:split("Ab","((?i)a)b",[trim]))),
     <<":A:">> = iolist_to_binary(join(re:split("Ab","((?i)a)b",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<":A:">> = iolist_to_binary(join(re:split("Ab","((?i)a)b",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?i)a)b",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<":A:">> = iolist_to_binary(join(re:split("Ab","((?i)a)b",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?i)a)b",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?i)a)b",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?i)a)b",[]))), 
-    <<"cb">> = iolist_to_binary(join(re:split("cb","(?:(?i)a)b",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?i)a)b",[]))),
+    <<"cb">> = iolist_to_binary(join(re:split("cb","(?:(?i)a)b",[trim]))),
     <<"cb">> = iolist_to_binary(join(re:split("cb","(?:(?i)a)b",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"cb">> = iolist_to_binary(join(re:split("cb","(?:(?i)a)b",[]))), 
-    <<"aB">> = iolist_to_binary(join(re:split("aB","(?:(?i)a)b",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"cb">> = iolist_to_binary(join(re:split("cb","(?:(?i)a)b",[]))),
+    <<"aB">> = iolist_to_binary(join(re:split("aB","(?:(?i)a)b",[trim]))),
     <<"aB">> = iolist_to_binary(join(re:split("aB","(?:(?i)a)b",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"aB">> = iolist_to_binary(join(re:split("aB","(?:(?i)a)b",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("ab","(?i:a)b",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"aB">> = iolist_to_binary(join(re:split("aB","(?:(?i)a)b",[]))),
+    <<"">> = iolist_to_binary(join(re:split("ab","(?i:a)b",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("ab","(?i:a)b",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ab","(?i:a)b",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("ab","((?i:a))b",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ab","(?i:a)b",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("ab","((?i:a))b",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("ab","((?i:a))b",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("ab","((?i:a))b",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("Ab","(?i:a)b",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("ab","((?i:a))b",[]))),
+    <<"">> = iolist_to_binary(join(re:split("Ab","(?i:a)b",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("Ab","(?i:a)b",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("Ab","(?i:a)b",[]))), 
-    <<":A">> = iolist_to_binary(join(re:split("Ab","((?i:a))b",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("Ab","(?i:a)b",[]))),
+    <<":A">> = iolist_to_binary(join(re:split("Ab","((?i:a))b",[trim]))),
     <<":A:">> = iolist_to_binary(join(re:split("Ab","((?i:a))b",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<":A:">> = iolist_to_binary(join(re:split("Ab","((?i:a))b",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?i:a)b",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<":A:">> = iolist_to_binary(join(re:split("Ab","((?i:a))b",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?i:a)b",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?i:a)b",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?i:a)b",[]))), 
-    <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:a)b",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?i:a)b",[]))),
+    <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:a)b",[trim]))),
     <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:a)b",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:a)b",[]))), 
-    <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:a)b",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:a)b",[]))),
+    <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:a)b",[trim]))),
     <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:a)b",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:a)b",[]))), 
+                                                                                                                                                                  2}]))),
+    <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:a)b",[]))),
     <<"">> = iolist_to_binary(join(re:split("ab","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                        trim]))), 
+                                                                                                                                                                        trim]))),
     <<":">> = iolist_to_binary(join(re:split("ab","(?:(?-i)a)b",[caseless,
                                                                                                                                                                           {parts,
-                                                                                                                                                                           2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ab","(?:(?-i)a)b",[caseless]))), 
+                                                                                                                                                                           2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ab","(?:(?-i)a)b",[caseless]))),
     <<":a">> = iolist_to_binary(join(re:split("ab","((?-i)a)b",[caseless,
-                                                                                                                                                                    trim]))), 
+                                                                                                                                                                    trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("ab","((?-i)a)b",[caseless,
                                                                                                                                                                       {parts,
-                                                                                                                                                                       2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("ab","((?-i)a)b",[caseless]))), 
+                                                                                                                                                                       2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("ab","((?-i)a)b",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                        trim]))), 
+                                                                                                                                                                        trim]))),
     <<":">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless,
                                                                                                                                                                           {parts,
-                                                                                                                                                                           2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless]))), 
+                                                                                                                                                                           2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless]))),
     <<":a">> = iolist_to_binary(join(re:split("aB","((?-i)a)b",[caseless,
-                                                                                                                                                                    trim]))), 
+                                                                                                                                                                    trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i)a)b",[caseless,
                                                                                                                                                                       {parts,
-                                                                                                                                                                       2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i)a)b",[caseless]))), 
+                                                                                                                                                                       2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i)a)b",[caseless]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                                          trim]))), 
+                                                                                                                                                                                          trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?-i)a)b",[caseless,
                                                                                                                                                                                             {parts,
-                                                                                                                                                                                             2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?-i)a)b",[caseless]))), 
+                                                                                                                                                                                             2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?-i)a)b",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                        trim]))), 
+                                                                                                                                                                        trim]))),
     <<":">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless,
                                                                                                                                                                           {parts,
-                                                                                                                                                                           2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless]))), 
+                                                                                                                                                                           2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless]))),
     <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                        trim]))), 
+                                                                                                                                                                        trim]))),
     <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?:(?-i)a)b",[caseless,
                                                                                                                                                                           {parts,
-                                                                                                                                                                           2}]))), 
-    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?:(?-i)a)b",[caseless]))), 
+                                                                                                                                                                           2}]))),
+    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?:(?-i)a)b",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                        trim]))), 
+                                                                                                                                                                        trim]))),
     <<":">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless,
                                                                                                                                                                           {parts,
-                                                                                                                                                                           2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless]))), 
+                                                                                                                                                                           2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless]))),
     <<":a">> = iolist_to_binary(join(re:split("aB","((?-i)a)b",[caseless,
-                                                                                                                                                                    trim]))), 
+                                                                                                                                                                    trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i)a)b",[caseless,
                                                                                                                                                                       {parts,
-                                                                                                                                                                       2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i)a)b",[caseless]))), 
+                                                                                                                                                                       2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i)a)b",[caseless]))),
     ok.
 run28() ->
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                                          trim]))), 
+                                                                                                                                                                                          trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?-i)a)b",[caseless,
                                                                                                                                                                                             {parts,
-                                                                                                                                                                                             2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?-i)a)b",[caseless]))), 
+                                                                                                                                                                                             2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?-i)a)b",[caseless]))),
     <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                        trim]))), 
+                                                                                                                                                                        trim]))),
     <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?:(?-i)a)b",[caseless,
                                                                                                                                                                           {parts,
-                                                                                                                                                                           2}]))), 
-    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?:(?-i)a)b",[caseless]))), 
+                                                                                                                                                                           2}]))),
+    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?:(?-i)a)b",[caseless]))),
     <<"AB">> = iolist_to_binary(join(re:split("AB","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                        trim]))), 
+                                                                                                                                                                        trim]))),
     <<"AB">> = iolist_to_binary(join(re:split("AB","(?:(?-i)a)b",[caseless,
                                                                                                                                                                           {parts,
-                                                                                                                                                                           2}]))), 
-    <<"AB">> = iolist_to_binary(join(re:split("AB","(?:(?-i)a)b",[caseless]))), 
+                                                                                                                                                                           2}]))),
+    <<"AB">> = iolist_to_binary(join(re:split("AB","(?:(?-i)a)b",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("ab","(?-i:a)b",[caseless,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<":">> = iolist_to_binary(join(re:split("ab","(?-i:a)b",[caseless,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ab","(?-i:a)b",[caseless]))), 
+                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ab","(?-i:a)b",[caseless]))),
     <<":a">> = iolist_to_binary(join(re:split("ab","((?-i:a))b",[caseless,
-                                                                                                                                                                      trim]))), 
+                                                                                                                                                                      trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("ab","((?-i:a))b",[caseless,
                                                                                                                                                                         {parts,
-                                                                                                                                                                         2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("ab","((?-i:a))b",[caseless]))), 
+                                                                                                                                                                         2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("ab","((?-i:a))b",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("aB","(?-i:a)b",[caseless,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<":">> = iolist_to_binary(join(re:split("aB","(?-i:a)b",[caseless,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aB","(?-i:a)b",[caseless]))), 
+                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aB","(?-i:a)b",[caseless]))),
     <<":a">> = iolist_to_binary(join(re:split("aB","((?-i:a))b",[caseless,
-                                                                                                                                                                      trim]))), 
+                                                                                                                                                                      trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i:a))b",[caseless,
                                                                                                                                                                         {parts,
-                                                                                                                                                                         2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i:a))b",[caseless]))), 
+                                                                                                                                                                         2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i:a))b",[caseless]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?-i:a)b",[caseless,
-                                                                                                                                                                                    trim]))), 
+                                                                                                                                                                                    trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?-i:a)b",[caseless,
                                                                                                                                                                                       {parts,
-                                                                                                                                                                                       2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?-i:a)b",[caseless]))), 
+                                                                                                                                                                                       2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?-i:a)b",[caseless]))),
     <<"AB">> = iolist_to_binary(join(re:split("AB","(?-i:a)b",[caseless,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<"AB">> = iolist_to_binary(join(re:split("AB","(?-i:a)b",[caseless,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<"AB">> = iolist_to_binary(join(re:split("AB","(?-i:a)b",[caseless]))), 
+                                                                                                                                                                     2}]))),
+    <<"AB">> = iolist_to_binary(join(re:split("AB","(?-i:a)b",[caseless]))),
     <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?-i:a)b",[caseless,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?-i:a)b",[caseless,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?-i:a)b",[caseless]))), 
+                                                                                                                                                                     2}]))),
+    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?-i:a)b",[caseless]))),
     <<"">> = iolist_to_binary(join(re:split("aB","(?-i:a)b",[caseless,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<":">> = iolist_to_binary(join(re:split("aB","(?-i:a)b",[caseless,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aB","(?-i:a)b",[caseless]))), 
+                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aB","(?-i:a)b",[caseless]))),
     <<":a">> = iolist_to_binary(join(re:split("aB","((?-i:a))b",[caseless,
-                                                                                                                                                                      trim]))), 
+                                                                                                                                                                      trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i:a))b",[caseless,
                                                                                                                                                                         {parts,
-                                                                                                                                                                         2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i:a))b",[caseless]))), 
+                                                                                                                                                                         2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i:a))b",[caseless]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?-i:a)b",[caseless,
-                                                                                                                                                                                    trim]))), 
+                                                                                                                                                                                    trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?-i:a)b",[caseless,
                                                                                                                                                                                       {parts,
-                                                                                                                                                                                       2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?-i:a)b",[caseless]))), 
+                                                                                                                                                                                       2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?-i:a)b",[caseless]))),
     <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?-i:a)b",[caseless,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?-i:a)b",[caseless,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?-i:a)b",[caseless]))), 
+                                                                                                                                                                     2}]))),
+    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?-i:a)b",[caseless]))),
     <<"AB">> = iolist_to_binary(join(re:split("AB","(?-i:a)b",[caseless,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<"AB">> = iolist_to_binary(join(re:split("AB","(?-i:a)b",[caseless,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<"AB">> = iolist_to_binary(join(re:split("AB","(?-i:a)b",[caseless]))), 
+                                                                                                                                                                     2}]))),
+    <<"AB">> = iolist_to_binary(join(re:split("AB","(?-i:a)b",[caseless]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?-i:a.))b",[caseless,
-                                                                                                                                                                                          trim]))), 
+                                                                                                                                                                                          trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?-i:a.))b",[caseless,
                                                                                                                                                                                             {parts,
-                                                                                                                                                                                             2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?-i:a.))b",[caseless]))), 
+                                                                                                                                                                                             2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?-i:a.))b",[caseless]))),
     <<"AB">> = iolist_to_binary(join(re:split("AB","((?-i:a.))b",[caseless,
-                                                                                                                                                                        trim]))), 
+                                                                                                                                                                        trim]))),
     <<"AB">> = iolist_to_binary(join(re:split("AB","((?-i:a.))b",[caseless,
                                                                                                                                                                           {parts,
-                                                                                                                                                                           2}]))), 
-    <<"AB">> = iolist_to_binary(join(re:split("AB","((?-i:a.))b",[caseless]))), 
+                                                                                                                                                                           2}]))),
+    <<"AB">> = iolist_to_binary(join(re:split("AB","((?-i:a.))b",[caseless]))),
     <<"a
 B">> = iolist_to_binary(join(re:split("a
-B","((?-i:a.))b",[caseless,trim]))), 
+B","((?-i:a.))b",[caseless,trim]))),
     <<"a
 B">> = iolist_to_binary(join(re:split("a
-B","((?-i:a.))b",[caseless,{parts,2}]))), 
+B","((?-i:a.))b",[caseless,{parts,2}]))),
     <<"a
 B">> = iolist_to_binary(join(re:split("a
-B","((?-i:a.))b",[caseless]))), 
+B","((?-i:a.))b",[caseless]))),
     <<":a
 ">> = iolist_to_binary(join(re:split("a
-B","((?s-i:a.))b",[caseless,trim]))), 
+B","((?s-i:a.))b",[caseless,trim]))),
     <<":a
 :">> = iolist_to_binary(join(re:split("a
-B","((?s-i:a.))b",[caseless,{parts,2}]))), 
+B","((?s-i:a.))b",[caseless,{parts,2}]))),
     <<":a
 :">> = iolist_to_binary(join(re:split("a
-B","((?s-i:a.))b",[caseless]))), 
-    <<"">> = iolist_to_binary(join(re:split("cabbbb","(?:c|d)(?:)(?:a(?:)(?:b)(?:b(?:))(?:b(?:)(?:b)))",[trim]))), 
+B","((?s-i:a.))b",[caseless]))),
+    <<"">> = iolist_to_binary(join(re:split("cabbbb","(?:c|d)(?:)(?:a(?:)(?:b)(?:b(?:))(?:b(?:)(?:b)))",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("cabbbb","(?:c|d)(?:)(?:a(?:)(?:b)(?:b(?:))(?:b(?:)(?:b)))",[{parts,
-                                                                                                                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("cabbbb","(?:c|d)(?:)(?:a(?:)(?:b)(?:b(?:))(?:b(?:)(?:b)))",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("caaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb","(?:c|d)(?:)(?:aaaaaaaa(?:)(?:bbbbbbbb)(?:bbbbbbbb(?:))(?:bbbbbbbb(?:)(?:bbbbbbbb)))",[trim]))), 
+                                                                                                                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("cabbbb","(?:c|d)(?:)(?:a(?:)(?:b)(?:b(?:))(?:b(?:)(?:b)))",[]))),
+    <<"">> = iolist_to_binary(join(re:split("caaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb","(?:c|d)(?:)(?:aaaaaaaa(?:)(?:bbbbbbbb)(?:bbbbbbbb(?:))(?:bbbbbbbb(?:)(?:bbbbbbbb)))",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("caaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb","(?:c|d)(?:)(?:aaaaaaaa(?:)(?:bbbbbbbb)(?:bbbbbbbb(?:))(?:bbbbbbbb(?:)(?:bbbbbbbb)))",[{parts,
-                                                                                                                                                                                                                                                                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("caaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb","(?:c|d)(?:)(?:aaaaaaaa(?:)(?:bbbbbbbb)(?:bbbbbbbb(?:))(?:bbbbbbbb(?:)(?:bbbbbbbb)))",[]))), 
+                                                                                                                                                                                                                                                                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("caaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb","(?:c|d)(?:)(?:aaaaaaaa(?:)(?:bbbbbbbb)(?:bbbbbbbb(?:))(?:bbbbbbbb(?:)(?:bbbbbbbb)))",[]))),
     <<":Ab">> = iolist_to_binary(join(re:split("Ab4ab","(ab)\\d\\1",[caseless,
-                                                                                                                                                                              trim]))), 
+                                                                                                                                                                              trim]))),
     <<":Ab:">> = iolist_to_binary(join(re:split("Ab4ab","(ab)\\d\\1",[caseless,
                                                                                                                                                                                 {parts,
-                                                                                                                                                                                 2}]))), 
-    <<":Ab:">> = iolist_to_binary(join(re:split("Ab4ab","(ab)\\d\\1",[caseless]))), 
+                                                                                                                                                                                 2}]))),
+    <<":Ab:">> = iolist_to_binary(join(re:split("Ab4ab","(ab)\\d\\1",[caseless]))),
     <<":ab">> = iolist_to_binary(join(re:split("ab4Ab","(ab)\\d\\1",[caseless,
-                                                                                                                                                                              trim]))), 
+                                                                                                                                                                              trim]))),
     <<":ab:">> = iolist_to_binary(join(re:split("ab4Ab","(ab)\\d\\1",[caseless,
                                                                                                                                                                                 {parts,
-                                                                                                                                                                                 2}]))), 
-    <<":ab:">> = iolist_to_binary(join(re:split("ab4Ab","(ab)\\d\\1",[caseless]))), 
-    <<"">> = iolist_to_binary(join(re:split("foobar1234baz","foo\\w*\\d{4}baz",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<":ab:">> = iolist_to_binary(join(re:split("ab4Ab","(ab)\\d\\1",[caseless]))),
+    <<"">> = iolist_to_binary(join(re:split("foobar1234baz","foo\\w*\\d{4}baz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("foobar1234baz","foo\\w*\\d{4}baz",[{parts,
-                                                                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("foobar1234baz","foo\\w*\\d{4}baz",[]))), 
-    <<":~~">> = iolist_to_binary(join(re:split("x~~","x(~~)*(?:(?:F)?)?",[trim]))), 
+                                                                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("foobar1234baz","foo\\w*\\d{4}baz",[]))),
+    <<":~~">> = iolist_to_binary(join(re:split("x~~","x(~~)*(?:(?:F)?)?",[trim]))),
     <<":~~:">> = iolist_to_binary(join(re:split("x~~","x(~~)*(?:(?:F)?)?",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<":~~:">> = iolist_to_binary(join(re:split("x~~","x(~~)*(?:(?:F)?)?",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaac","^a(?#xxx){3}c",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<":~~:">> = iolist_to_binary(join(re:split("x~~","x(~~)*(?:(?:F)?)?",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaac","^a(?#xxx){3}c",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaac","^a(?#xxx){3}c",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaac","^a(?#xxx){3}c",[]))), 
+                                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaac","^a(?#xxx){3}c",[]))),
     ok.
 run29() ->
     <<"">> = iolist_to_binary(join(re:split("aaac","^a (?#xxx) (?#yyy) {3}c",[extended,
-                                                                                                                                                                                                    trim]))), 
+                                                                                                                                                                                                    trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaac","^a (?#xxx) (?#yyy) {3}c",[extended,
                                                                                                                                                                                                       {parts,
-                                                                                                                                                                                                       2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaac","^a (?#xxx) (?#yyy) {3}c",[extended]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<![cd])b",[trim]))), 
+                                                                                                                                                                                                       2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaac","^a (?#xxx) (?#yyy) {3}c",[extended]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<![cd])b",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<![cd])b",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<![cd])b",[]))), 
+                                                                                                                                                                                          2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<![cd])b",[]))),
     <<"B
 B">> = iolist_to_binary(join(re:split("B
-B","(?<![cd])b",[trim]))), 
+B","(?<![cd])b",[trim]))),
     <<"B
 B">> = iolist_to_binary(join(re:split("B
-B","(?<![cd])b",[{parts,2}]))), 
+B","(?<![cd])b",[{parts,2}]))),
     <<"B
 B">> = iolist_to_binary(join(re:split("B
-B","(?<![cd])b",[]))), 
-    <<"dbcb">> = iolist_to_binary(join(re:split("dbcb","(?<![cd])b",[trim]))), 
+B","(?<![cd])b",[]))),
+    <<"dbcb">> = iolist_to_binary(join(re:split("dbcb","(?<![cd])b",[trim]))),
     <<"dbcb">> = iolist_to_binary(join(re:split("dbcb","(?<![cd])b",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"dbcb">> = iolist_to_binary(join(re:split("dbcb","(?<![cd])b",[]))), 
-    <<"db::cb">> = iolist_to_binary(join(re:split("dbaacb","(?<![cd])[ab]",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<"dbcb">> = iolist_to_binary(join(re:split("dbcb","(?<![cd])b",[]))),
+    <<"db::cb">> = iolist_to_binary(join(re:split("dbaacb","(?<![cd])[ab]",[trim]))),
     <<"db:acb">> = iolist_to_binary(join(re:split("dbaacb","(?<![cd])[ab]",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<"db::cb">> = iolist_to_binary(join(re:split("dbaacb","(?<![cd])[ab]",[]))), 
-    <<"db::::cb">> = iolist_to_binary(join(re:split("dbaacb","(?<!(c|d))[ab]",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<"db::cb">> = iolist_to_binary(join(re:split("dbaacb","(?<![cd])[ab]",[]))),
+    <<"db::::cb">> = iolist_to_binary(join(re:split("dbaacb","(?<!(c|d))[ab]",[trim]))),
     <<"db::acb">> = iolist_to_binary(join(re:split("dbaacb","(?<!(c|d))[ab]",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"db::::cb">> = iolist_to_binary(join(re:split("dbaacb","(?<!(c|d))[ab]",[]))), 
-    <<"cdacc">> = iolist_to_binary(join(re:split("cdaccb","(?<!cd)[ab]",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<"db::::cb">> = iolist_to_binary(join(re:split("dbaacb","(?<!(c|d))[ab]",[]))),
+    <<"cdacc">> = iolist_to_binary(join(re:split("cdaccb","(?<!cd)[ab]",[trim]))),
     <<"cdacc:">> = iolist_to_binary(join(re:split("cdaccb","(?<!cd)[ab]",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"cdacc:">> = iolist_to_binary(join(re:split("cdaccb","(?<!cd)[ab]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("","^(?:a?b?)*$",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"cdacc:">> = iolist_to_binary(join(re:split("cdaccb","(?<!cd)[ab]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("","^(?:a?b?)*$",[trim]))),
     <<"">> = iolist_to_binary(join(re:split("","^(?:a?b?)*$",[{parts,
-                                                                                                                                                                       2}]))), 
-    <<"">> = iolist_to_binary(join(re:split("","^(?:a?b?)*$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","^(?:a?b?)*$",[trim]))), 
+                                                                                                                                                                       2}]))),
+    <<"">> = iolist_to_binary(join(re:split("","^(?:a?b?)*$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","^(?:a?b?)*$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a","^(?:a?b?)*$",[{parts,
-                                                                                                                                                                         2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a","^(?:a?b?)*$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("ab","^(?:a?b?)*$",[trim]))), 
+                                                                                                                                                                         2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a","^(?:a?b?)*$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("ab","^(?:a?b?)*$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("ab","^(?:a?b?)*$",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ab","^(?:a?b?)*$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaa","^(?:a?b?)*$",[trim]))), 
+                                                                                                                                                                           2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ab","^(?:a?b?)*$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaa","^(?:a?b?)*$",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaa","^(?:a?b?)*$",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaa","^(?:a?b?)*$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?:a?b?)*$",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaa","^(?:a?b?)*$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?:a?b?)*$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?:a?b?)*$",[{parts,
-                                                                                                                                                                                             2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?:a?b?)*$",[]))), 
-    <<"dbcb">> = iolist_to_binary(join(re:split("dbcb","^(?:a?b?)*$",[trim]))), 
+                                                                                                                                                                                             2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?:a?b?)*$",[]))),
+    <<"dbcb">> = iolist_to_binary(join(re:split("dbcb","^(?:a?b?)*$",[trim]))),
     <<"dbcb">> = iolist_to_binary(join(re:split("dbcb","^(?:a?b?)*$",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<"dbcb">> = iolist_to_binary(join(re:split("dbcb","^(?:a?b?)*$",[]))), 
-    <<"a--">> = iolist_to_binary(join(re:split("a--","^(?:a?b?)*$",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<"dbcb">> = iolist_to_binary(join(re:split("dbcb","^(?:a?b?)*$",[]))),
+    <<"a--">> = iolist_to_binary(join(re:split("a--","^(?:a?b?)*$",[trim]))),
     <<"a--">> = iolist_to_binary(join(re:split("a--","^(?:a?b?)*$",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<"a--">> = iolist_to_binary(join(re:split("a--","^(?:a?b?)*$",[]))), 
-    <<"aa--">> = iolist_to_binary(join(re:split("aa--","^(?:a?b?)*$",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<"a--">> = iolist_to_binary(join(re:split("a--","^(?:a?b?)*$",[]))),
+    <<"aa--">> = iolist_to_binary(join(re:split("aa--","^(?:a?b?)*$",[trim]))),
     <<"aa--">> = iolist_to_binary(join(re:split("aa--","^(?:a?b?)*$",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<"aa--">> = iolist_to_binary(join(re:split("aa--","^(?:a?b?)*$",[]))), 
+                                                                                                                                                                               2}]))),
+    <<"aa--">> = iolist_to_binary(join(re:split("aa--","^(?:a?b?)*$",[]))),
     <<":a
 :
 :b:
 c">> = iolist_to_binary(join(re:split("a
 b
-c","((?s)^a(.))((?m)^b$)",[trim]))), 
+c","((?s)^a(.))((?m)^b$)",[trim]))),
     <<":a
 :
 :b:
 c">> = iolist_to_binary(join(re:split("a
 b
-c","((?s)^a(.))((?m)^b$)",[{parts,2}]))), 
+c","((?s)^a(.))((?m)^b$)",[{parts,2}]))),
     <<":a
 :
 :b:
 c">> = iolist_to_binary(join(re:split("a
 b
-c","((?s)^a(.))((?m)^b$)",[]))), 
+c","((?s)^a(.))((?m)^b$)",[]))),
     <<"a
 :b:
 c">> = iolist_to_binary(join(re:split("a
 b
-c","((?m)^b$)",[trim]))), 
+c","((?m)^b$)",[trim]))),
     <<"a
 :b:
 c">> = iolist_to_binary(join(re:split("a
 b
-c","((?m)^b$)",[{parts,2}]))), 
+c","((?m)^b$)",[{parts,2}]))),
     <<"a
 :b:
 c">> = iolist_to_binary(join(re:split("a
 b
-c","((?m)^b$)",[]))), 
+c","((?m)^b$)",[]))),
     <<"a
 ">> = iolist_to_binary(join(re:split("a
-b","(?m)^b",[trim]))), 
+b","(?m)^b",[trim]))),
     <<"a
 :">> = iolist_to_binary(join(re:split("a
-b","(?m)^b",[{parts,2}]))), 
+b","(?m)^b",[{parts,2}]))),
     <<"a
 :">> = iolist_to_binary(join(re:split("a
-b","(?m)^b",[]))), 
+b","(?m)^b",[]))),
     <<"a
 :b">> = iolist_to_binary(join(re:split("a
-b","(?m)^(b)",[trim]))), 
+b","(?m)^(b)",[trim]))),
     <<"a
 :b:">> = iolist_to_binary(join(re:split("a
-b","(?m)^(b)",[{parts,2}]))), 
+b","(?m)^(b)",[{parts,2}]))),
     <<"a
 :b:">> = iolist_to_binary(join(re:split("a
-b","(?m)^(b)",[]))), 
+b","(?m)^(b)",[]))),
     <<"a
 :b">> = iolist_to_binary(join(re:split("a
-b","((?m)^b)",[trim]))), 
+b","((?m)^b)",[trim]))),
     <<"a
 :b:">> = iolist_to_binary(join(re:split("a
-b","((?m)^b)",[{parts,2}]))), 
+b","((?m)^b)",[{parts,2}]))),
     <<"a
 :b:">> = iolist_to_binary(join(re:split("a
-b","((?m)^b)",[]))), 
+b","((?m)^b)",[]))),
     <<"a:b">> = iolist_to_binary(join(re:split("a
-b","\\n((?m)^b)",[trim]))), 
+b","\\n((?m)^b)",[trim]))),
     <<"a:b:">> = iolist_to_binary(join(re:split("a
-b","\\n((?m)^b)",[{parts,2}]))), 
+b","\\n((?m)^b)",[{parts,2}]))),
     <<"a:b:">> = iolist_to_binary(join(re:split("a
-b","\\n((?m)^b)",[]))), 
+b","\\n((?m)^b)",[]))),
     <<"a
 b:
 ">> = iolist_to_binary(join(re:split("a
 b
-c","((?s).)c(?!.)",[trim]))), 
+c","((?s).)c(?!.)",[trim]))),
     <<"a
 b:
 :">> = iolist_to_binary(join(re:split("a
 b
-c","((?s).)c(?!.)",[{parts,2}]))), 
+c","((?s).)c(?!.)",[{parts,2}]))),
     <<"a
 b:
 :">> = iolist_to_binary(join(re:split("a
 b
-c","((?s).)c(?!.)",[]))), 
+c","((?s).)c(?!.)",[]))),
     <<"a
 b:
 ">> = iolist_to_binary(join(re:split("a
 b
-c","((?s).)c(?!.)",[trim]))), 
+c","((?s).)c(?!.)",[trim]))),
     <<"a
 b:
 :">> = iolist_to_binary(join(re:split("a
 b
-c","((?s).)c(?!.)",[{parts,2}]))), 
+c","((?s).)c(?!.)",[{parts,2}]))),
     <<"a
 b:
 :">> = iolist_to_binary(join(re:split("a
 b
-c","((?s).)c(?!.)",[]))), 
+c","((?s).)c(?!.)",[]))),
     <<"a
 :b
 ">> = iolist_to_binary(join(re:split("a
 b
-c","((?s)b.)c(?!.)",[trim]))), 
+c","((?s)b.)c(?!.)",[trim]))),
     <<"a
 :b
 :">> = iolist_to_binary(join(re:split("a
 b
-c","((?s)b.)c(?!.)",[{parts,2}]))), 
+c","((?s)b.)c(?!.)",[{parts,2}]))),
     <<"a
 :b
 :">> = iolist_to_binary(join(re:split("a
 b
-c","((?s)b.)c(?!.)",[]))), 
+c","((?s)b.)c(?!.)",[]))),
     <<"a
 :b
 ">> = iolist_to_binary(join(re:split("a
 b
-c","((?s)b.)c(?!.)",[trim]))), 
+c","((?s)b.)c(?!.)",[trim]))),
     <<"a
 :b
 :">> = iolist_to_binary(join(re:split("a
 b
-c","((?s)b.)c(?!.)",[{parts,2}]))), 
+c","((?s)b.)c(?!.)",[{parts,2}]))),
     <<"a
 :b
 :">> = iolist_to_binary(join(re:split("a
 b
-c","((?s)b.)c(?!.)",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","()^b",[trim]))), 
+c","((?s)b.)c(?!.)",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","()^b",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","()^b",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","()^b",[]))), 
+                                                                                                                                                                              2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","()^b",[]))),
     <<"a
 b
 c">> = iolist_to_binary(join(re:split("a
 b
-c","()^b",[trim]))), 
+c","()^b",[trim]))),
     <<"a
 b
 c">> = iolist_to_binary(join(re:split("a
 b
-c","()^b",[{parts,2}]))), 
+c","()^b",[{parts,2}]))),
     <<"a
 b
 c">> = iolist_to_binary(join(re:split("a
 b
-c","()^b",[]))), 
+c","()^b",[]))),
     <<"a
 b
 c">> = iolist_to_binary(join(re:split("a
 b
-c","()^b",[trim]))), 
+c","()^b",[trim]))),
     <<"a
 b
 c">> = iolist_to_binary(join(re:split("a
 b
-c","()^b",[{parts,2}]))), 
+c","()^b",[{parts,2}]))),
     <<"a
 b
 c">> = iolist_to_binary(join(re:split("a
 b
-c","()^b",[]))), 
+c","()^b",[]))),
     <<"a
 :b:
 c">> = iolist_to_binary(join(re:split("a
 b
-c","((?m)^b)",[trim]))), 
+c","((?m)^b)",[trim]))),
     <<"a
 :b:
 c">> = iolist_to_binary(join(re:split("a
 b
-c","((?m)^b)",[{parts,2}]))), 
+c","((?m)^b)",[{parts,2}]))),
     <<"a
 :b:
 c">> = iolist_to_binary(join(re:split("a
 b
-c","((?m)^b)",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(x)?(?(1)a|b)",[trim]))), 
+c","((?m)^b)",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(x)?(?(1)a|b)",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(x)?(?(1)a|b)",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(x)?(?(1)a|b)",[]))), 
-    <<"a">> = iolist_to_binary(join(re:split("a","(x)?(?(1)a|b)",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(x)?(?(1)a|b)",[]))),
+    <<"a">> = iolist_to_binary(join(re:split("a","(x)?(?(1)a|b)",[trim]))),
     <<"a">> = iolist_to_binary(join(re:split("a","(x)?(?(1)a|b)",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"a">> = iolist_to_binary(join(re:split("a","(x)?(?(1)a|b)",[]))), 
-    <<"a">> = iolist_to_binary(join(re:split("a","(x)?(?(1)a|b)",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<"a">> = iolist_to_binary(join(re:split("a","(x)?(?(1)a|b)",[]))),
+    <<"a">> = iolist_to_binary(join(re:split("a","(x)?(?(1)a|b)",[trim]))),
     <<"a">> = iolist_to_binary(join(re:split("a","(x)?(?(1)a|b)",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"a">> = iolist_to_binary(join(re:split("a","(x)?(?(1)a|b)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","(x)?(?(1)b|a)",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<"a">> = iolist_to_binary(join(re:split("a","(x)?(?(1)a|b)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","(x)?(?(1)b|a)",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("a","(x)?(?(1)b|a)",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("a","(x)?(?(1)b|a)",[]))), 
+                                                                                                                                                                            2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("a","(x)?(?(1)b|a)",[]))),
     ok.
 run30() ->
-    <<"">> = iolist_to_binary(join(re:split("a","()?(?(1)b|a)",[trim]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","()?(?(1)b|a)",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("a","()?(?(1)b|a)",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("a","()?(?(1)b|a)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","()?(?(1)a|b)",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("a","()?(?(1)b|a)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","()?(?(1)a|b)",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("a","()?(?(1)a|b)",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("a","()?(?(1)a|b)",[]))), 
-    <<":(:)">> = iolist_to_binary(join(re:split("(blah)","^(\\()?blah(?(1)(\\)))$",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("a","()?(?(1)a|b)",[]))),
+    <<":(:)">> = iolist_to_binary(join(re:split("(blah)","^(\\()?blah(?(1)(\\)))$",[trim]))),
     <<":(:):">> = iolist_to_binary(join(re:split("(blah)","^(\\()?blah(?(1)(\\)))$",[{parts,
-                                                                                                                                                                                                             2}]))), 
-    <<":(:):">> = iolist_to_binary(join(re:split("(blah)","^(\\()?blah(?(1)(\\)))$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("blah","^(\\()?blah(?(1)(\\)))$",[trim]))), 
+                                                                                                                                                                                                             2}]))),
+    <<":(:):">> = iolist_to_binary(join(re:split("(blah)","^(\\()?blah(?(1)(\\)))$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("blah","^(\\()?blah(?(1)(\\)))$",[trim]))),
     <<":::">> = iolist_to_binary(join(re:split("blah","^(\\()?blah(?(1)(\\)))$",[{parts,
-                                                                                                                                                                                                         2}]))), 
-    <<":::">> = iolist_to_binary(join(re:split("blah","^(\\()?blah(?(1)(\\)))$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\()?blah(?(1)(\\)))$",[trim]))), 
+                                                                                                                                                                                                         2}]))),
+    <<":::">> = iolist_to_binary(join(re:split("blah","^(\\()?blah(?(1)(\\)))$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\()?blah(?(1)(\\)))$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\()?blah(?(1)(\\)))$",[{parts,
-                                                                                                                                                                                                                       2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\()?blah(?(1)(\\)))$",[]))), 
-    <<"a">> = iolist_to_binary(join(re:split("a","^(\\()?blah(?(1)(\\)))$",[trim]))), 
+                                                                                                                                                                                                                       2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\()?blah(?(1)(\\)))$",[]))),
+    <<"a">> = iolist_to_binary(join(re:split("a","^(\\()?blah(?(1)(\\)))$",[trim]))),
     <<"a">> = iolist_to_binary(join(re:split("a","^(\\()?blah(?(1)(\\)))$",[{parts,
-                                                                                                                                                                                                   2}]))), 
-    <<"a">> = iolist_to_binary(join(re:split("a","^(\\()?blah(?(1)(\\)))$",[]))), 
-    <<"blah)">> = iolist_to_binary(join(re:split("blah)","^(\\()?blah(?(1)(\\)))$",[trim]))), 
+                                                                                                                                                                                                   2}]))),
+    <<"a">> = iolist_to_binary(join(re:split("a","^(\\()?blah(?(1)(\\)))$",[]))),
+    <<"blah)">> = iolist_to_binary(join(re:split("blah)","^(\\()?blah(?(1)(\\)))$",[trim]))),
     <<"blah)">> = iolist_to_binary(join(re:split("blah)","^(\\()?blah(?(1)(\\)))$",[{parts,
-                                                                                                                                                                                                           2}]))), 
-    <<"blah)">> = iolist_to_binary(join(re:split("blah)","^(\\()?blah(?(1)(\\)))$",[]))), 
-    <<"(blah">> = iolist_to_binary(join(re:split("(blah","^(\\()?blah(?(1)(\\)))$",[trim]))), 
+                                                                                                                                                                                                           2}]))),
+    <<"blah)">> = iolist_to_binary(join(re:split("blah)","^(\\()?blah(?(1)(\\)))$",[]))),
+    <<"(blah">> = iolist_to_binary(join(re:split("(blah","^(\\()?blah(?(1)(\\)))$",[trim]))),
     <<"(blah">> = iolist_to_binary(join(re:split("(blah","^(\\()?blah(?(1)(\\)))$",[{parts,
-                                                                                                                                                                                                           2}]))), 
-    <<"(blah">> = iolist_to_binary(join(re:split("(blah","^(\\()?blah(?(1)(\\)))$",[]))), 
-    <<":(:)">> = iolist_to_binary(join(re:split("(blah)","^(\\(+)?blah(?(1)(\\)))$",[trim]))), 
+                                                                                                                                                                                                           2}]))),
+    <<"(blah">> = iolist_to_binary(join(re:split("(blah","^(\\()?blah(?(1)(\\)))$",[]))),
+    <<":(:)">> = iolist_to_binary(join(re:split("(blah)","^(\\(+)?blah(?(1)(\\)))$",[trim]))),
     <<":(:):">> = iolist_to_binary(join(re:split("(blah)","^(\\(+)?blah(?(1)(\\)))$",[{parts,
-                                                                                                                                                                                                               2}]))), 
-    <<":(:):">> = iolist_to_binary(join(re:split("(blah)","^(\\(+)?blah(?(1)(\\)))$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("blah","^(\\(+)?blah(?(1)(\\)))$",[trim]))), 
+                                                                                                                                                                                                               2}]))),
+    <<":(:):">> = iolist_to_binary(join(re:split("(blah)","^(\\(+)?blah(?(1)(\\)))$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("blah","^(\\(+)?blah(?(1)(\\)))$",[trim]))),
     <<":::">> = iolist_to_binary(join(re:split("blah","^(\\(+)?blah(?(1)(\\)))$",[{parts,
-                                                                                                                                                                                                           2}]))), 
-    <<":::">> = iolist_to_binary(join(re:split("blah","^(\\(+)?blah(?(1)(\\)))$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\(+)?blah(?(1)(\\)))$",[trim]))), 
+                                                                                                                                                                                                           2}]))),
+    <<":::">> = iolist_to_binary(join(re:split("blah","^(\\(+)?blah(?(1)(\\)))$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\(+)?blah(?(1)(\\)))$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\(+)?blah(?(1)(\\)))$",[{parts,
-                                                                                                                                                                                                                         2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\(+)?blah(?(1)(\\)))$",[]))), 
-    <<"blah)">> = iolist_to_binary(join(re:split("blah)","^(\\(+)?blah(?(1)(\\)))$",[trim]))), 
+                                                                                                                                                                                                                         2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\(+)?blah(?(1)(\\)))$",[]))),
+    <<"blah)">> = iolist_to_binary(join(re:split("blah)","^(\\(+)?blah(?(1)(\\)))$",[trim]))),
     <<"blah)">> = iolist_to_binary(join(re:split("blah)","^(\\(+)?blah(?(1)(\\)))$",[{parts,
-                                                                                                                                                                                                             2}]))), 
-    <<"blah)">> = iolist_to_binary(join(re:split("blah)","^(\\(+)?blah(?(1)(\\)))$",[]))), 
-    <<"(blah">> = iolist_to_binary(join(re:split("(blah","^(\\(+)?blah(?(1)(\\)))$",[trim]))), 
+                                                                                                                                                                                                             2}]))),
+    <<"blah)">> = iolist_to_binary(join(re:split("blah)","^(\\(+)?blah(?(1)(\\)))$",[]))),
+    <<"(blah">> = iolist_to_binary(join(re:split("(blah","^(\\(+)?blah(?(1)(\\)))$",[trim]))),
     <<"(blah">> = iolist_to_binary(join(re:split("(blah","^(\\(+)?blah(?(1)(\\)))$",[{parts,
-                                                                                                                                                                                                             2}]))), 
-    <<"(blah">> = iolist_to_binary(join(re:split("(blah","^(\\(+)?blah(?(1)(\\)))$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","(?(?!a)b|a)",[trim]))), 
+                                                                                                                                                                                                             2}]))),
+    <<"(blah">> = iolist_to_binary(join(re:split("(blah","^(\\(+)?blah(?(1)(\\)))$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","(?(?!a)b|a)",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a","(?(?!a)b|a)",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a","(?(?!a)b|a)",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?=a)b|a)",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a","(?(?!a)b|a)",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?=a)b|a)",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?=a)b|a)",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?=a)b|a)",[]))), 
-    <<"a">> = iolist_to_binary(join(re:split("a","(?(?=a)b|a)",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?=a)b|a)",[]))),
+    <<"a">> = iolist_to_binary(join(re:split("a","(?(?=a)b|a)",[trim]))),
     <<"a">> = iolist_to_binary(join(re:split("a","(?(?=a)b|a)",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"a">> = iolist_to_binary(join(re:split("a","(?(?=a)b|a)",[]))), 
-    <<"a">> = iolist_to_binary(join(re:split("a","(?(?=a)b|a)",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"a">> = iolist_to_binary(join(re:split("a","(?(?=a)b|a)",[]))),
+    <<"a">> = iolist_to_binary(join(re:split("a","(?(?=a)b|a)",[trim]))),
     <<"a">> = iolist_to_binary(join(re:split("a","(?(?=a)b|a)",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"a">> = iolist_to_binary(join(re:split("a","(?(?=a)b|a)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","(?(?=a)a|b)",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"a">> = iolist_to_binary(join(re:split("a","(?(?=a)b|a)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","(?(?=a)a|b)",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a","(?(?=a)a|b)",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a","(?(?=a)a|b)",[]))), 
-    <<"a:a:aab">> = iolist_to_binary(join(re:split("aaab","(?=(a+?))(\\1ab)",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a","(?(?=a)a|b)",[]))),
+    <<"a:a:aab">> = iolist_to_binary(join(re:split("aaab","(?=(a+?))(\\1ab)",[trim]))),
     <<"a:a:aab:">> = iolist_to_binary(join(re:split("aaab","(?=(a+?))(\\1ab)",[{parts,
-                                                                                                                                                                                         2}]))), 
-    <<"a:a:aab:">> = iolist_to_binary(join(re:split("aaab","(?=(a+?))(\\1ab)",[]))), 
-    <<":one:">> = iolist_to_binary(join(re:split("one:","(\\w+:)+",[trim]))), 
+                                                                                                                                                                                         2}]))),
+    <<"a:a:aab:">> = iolist_to_binary(join(re:split("aaab","(?=(a+?))(\\1ab)",[]))),
+    <<":one:">> = iolist_to_binary(join(re:split("one:","(\\w+:)+",[trim]))),
     <<":one::">> = iolist_to_binary(join(re:split("one:","(\\w+:)+",[{parts,
-                                                                                                                                                                         2}]))), 
-    <<":one::">> = iolist_to_binary(join(re:split("one:","(\\w+:)+",[]))), 
-    <<"a:a">> = iolist_to_binary(join(re:split("a","$(?<=^(a))",[trim]))), 
+                                                                                                                                                                         2}]))),
+    <<":one::">> = iolist_to_binary(join(re:split("one:","(\\w+:)+",[]))),
+    <<"a:a">> = iolist_to_binary(join(re:split("a","$(?<=^(a))",[trim]))),
     <<"a:a:">> = iolist_to_binary(join(re:split("a","$(?<=^(a))",[{parts,
-                                                                                                                                                                       2}]))), 
-    <<"a:a:">> = iolist_to_binary(join(re:split("a","$(?<=^(a))",[]))), 
-    <<"a:a:aab">> = iolist_to_binary(join(re:split("aaab","(?=(a+?))(\\1ab)",[trim]))), 
+                                                                                                                                                                       2}]))),
+    <<"a:a:">> = iolist_to_binary(join(re:split("a","$(?<=^(a))",[]))),
+    <<"a:a:aab">> = iolist_to_binary(join(re:split("aaab","(?=(a+?))(\\1ab)",[trim]))),
     <<"a:a:aab:">> = iolist_to_binary(join(re:split("aaab","(?=(a+?))(\\1ab)",[{parts,
-                                                                                                                                                                                         2}]))), 
-    <<"a:a:aab:">> = iolist_to_binary(join(re:split("aaab","(?=(a+?))(\\1ab)",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?=(a+?))\\1ab",[trim]))), 
+                                                                                                                                                                                         2}]))),
+    <<"a:a:aab:">> = iolist_to_binary(join(re:split("aaab","(?=(a+?))(\\1ab)",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?=(a+?))\\1ab",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?=(a+?))\\1ab",[{parts,
-                                                                                                                                                                                                     2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?=(a+?))\\1ab",[]))), 
-    <<"aaab">> = iolist_to_binary(join(re:split("aaab","^(?=(a+?))\\1ab",[trim]))), 
+                                                                                                                                                                                                     2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?=(a+?))\\1ab",[]))),
+    <<"aaab">> = iolist_to_binary(join(re:split("aaab","^(?=(a+?))\\1ab",[trim]))),
     <<"aaab">> = iolist_to_binary(join(re:split("aaab","^(?=(a+?))\\1ab",[{parts,
-                                                                                                                                                                                       2}]))), 
-    <<"aaab">> = iolist_to_binary(join(re:split("aaab","^(?=(a+?))\\1ab",[]))), 
-    <<"aaab">> = iolist_to_binary(join(re:split("aaab","^(?=(a+?))\\1ab",[trim]))), 
+                                                                                                                                                                                       2}]))),
+    <<"aaab">> = iolist_to_binary(join(re:split("aaab","^(?=(a+?))\\1ab",[]))),
+    <<"aaab">> = iolist_to_binary(join(re:split("aaab","^(?=(a+?))\\1ab",[trim]))),
     <<"aaab">> = iolist_to_binary(join(re:split("aaab","^(?=(a+?))\\1ab",[{parts,
-                                                                                                                                                                                       2}]))), 
-    <<"aaab">> = iolist_to_binary(join(re:split("aaab","^(?=(a+?))\\1ab",[]))), 
-    <<"::abcd">> = iolist_to_binary(join(re:split("abcd","([\\w:]+::)?(\\w+)$",[trim]))), 
+                                                                                                                                                                                       2}]))),
+    <<"aaab">> = iolist_to_binary(join(re:split("aaab","^(?=(a+?))\\1ab",[]))),
+    <<"::abcd">> = iolist_to_binary(join(re:split("abcd","([\\w:]+::)?(\\w+)$",[trim]))),
     <<"::abcd:">> = iolist_to_binary(join(re:split("abcd","([\\w:]+::)?(\\w+)$",[{parts,
-                                                                                                                                                                                                 2}]))), 
-    <<"::abcd:">> = iolist_to_binary(join(re:split("abcd","([\\w:]+::)?(\\w+)$",[]))), 
-    <<":xy:z::::abcd">> = iolist_to_binary(join(re:split("xy:z:::abcd","([\\w:]+::)?(\\w+)$",[trim]))), 
+                                                                                                                                                                                                 2}]))),
+    <<"::abcd:">> = iolist_to_binary(join(re:split("abcd","([\\w:]+::)?(\\w+)$",[]))),
+    <<":xy:z::::abcd">> = iolist_to_binary(join(re:split("xy:z:::abcd","([\\w:]+::)?(\\w+)$",[trim]))),
     <<":xy:z::::abcd:">> = iolist_to_binary(join(re:split("xy:z:::abcd","([\\w:]+::)?(\\w+)$",[{parts,
-                                                                                                                                                                                                               2}]))), 
-    <<":xy:z::::abcd:">> = iolist_to_binary(join(re:split("xy:z:::abcd","([\\w:]+::)?(\\w+)$",[]))), 
-    <<":c:d">> = iolist_to_binary(join(re:split("aexycd","^[^bcd]*(c+)",[trim]))), 
+                                                                                                                                                                                                               2}]))),
+    <<":xy:z::::abcd:">> = iolist_to_binary(join(re:split("xy:z:::abcd","([\\w:]+::)?(\\w+)$",[]))),
+    <<":c:d">> = iolist_to_binary(join(re:split("aexycd","^[^bcd]*(c+)",[trim]))),
     <<":c:d">> = iolist_to_binary(join(re:split("aexycd","^[^bcd]*(c+)",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<":c:d">> = iolist_to_binary(join(re:split("aexycd","^[^bcd]*(c+)",[]))), 
-    <<"c:aa">> = iolist_to_binary(join(re:split("caab","(a*)b+",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<":c:d">> = iolist_to_binary(join(re:split("aexycd","^[^bcd]*(c+)",[]))),
+    <<"c:aa">> = iolist_to_binary(join(re:split("caab","(a*)b+",[trim]))),
     <<"c:aa:">> = iolist_to_binary(join(re:split("caab","(a*)b+",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<"c:aa:">> = iolist_to_binary(join(re:split("caab","(a*)b+",[]))), 
-    <<"::abcd">> = iolist_to_binary(join(re:split("abcd","([\\w:]+::)?(\\w+)$",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<"c:aa:">> = iolist_to_binary(join(re:split("caab","(a*)b+",[]))),
+    <<"::abcd">> = iolist_to_binary(join(re:split("abcd","([\\w:]+::)?(\\w+)$",[trim]))),
     <<"::abcd:">> = iolist_to_binary(join(re:split("abcd","([\\w:]+::)?(\\w+)$",[{parts,
-                                                                                                                                                                                                 2}]))), 
-    <<"::abcd:">> = iolist_to_binary(join(re:split("abcd","([\\w:]+::)?(\\w+)$",[]))), 
-    <<":xy:z::::abcd">> = iolist_to_binary(join(re:split("xy:z:::abcd","([\\w:]+::)?(\\w+)$",[trim]))), 
+                                                                                                                                                                                                 2}]))),
+    <<"::abcd:">> = iolist_to_binary(join(re:split("abcd","([\\w:]+::)?(\\w+)$",[]))),
+    <<":xy:z::::abcd">> = iolist_to_binary(join(re:split("xy:z:::abcd","([\\w:]+::)?(\\w+)$",[trim]))),
     <<":xy:z::::abcd:">> = iolist_to_binary(join(re:split("xy:z:::abcd","([\\w:]+::)?(\\w+)$",[{parts,
-                                                                                                                                                                                                               2}]))), 
-    <<":xy:z::::abcd:">> = iolist_to_binary(join(re:split("xy:z:::abcd","([\\w:]+::)?(\\w+)$",[]))), 
-    <<"*** ::Failers">> = iolist_to_binary(join(re:split("*** Failers","([\\w:]+::)?(\\w+)$",[trim]))), 
+                                                                                                                                                                                                               2}]))),
+    <<":xy:z::::abcd:">> = iolist_to_binary(join(re:split("xy:z:::abcd","([\\w:]+::)?(\\w+)$",[]))),
+    <<"*** ::Failers">> = iolist_to_binary(join(re:split("*** Failers","([\\w:]+::)?(\\w+)$",[trim]))),
     <<"*** ::Failers:">> = iolist_to_binary(join(re:split("*** Failers","([\\w:]+::)?(\\w+)$",[{parts,
-                                                                                                                                                                                                               2}]))), 
-    <<"*** ::Failers:">> = iolist_to_binary(join(re:split("*** Failers","([\\w:]+::)?(\\w+)$",[]))), 
-    <<"abcd:">> = iolist_to_binary(join(re:split("abcd:","([\\w:]+::)?(\\w+)$",[trim]))), 
+                                                                                                                                                                                                               2}]))),
+    <<"*** ::Failers:">> = iolist_to_binary(join(re:split("*** Failers","([\\w:]+::)?(\\w+)$",[]))),
+    <<"abcd:">> = iolist_to_binary(join(re:split("abcd:","([\\w:]+::)?(\\w+)$",[trim]))),
     <<"abcd:">> = iolist_to_binary(join(re:split("abcd:","([\\w:]+::)?(\\w+)$",[{parts,
-                                                                                                                                                                                                   2}]))), 
-    <<"abcd:">> = iolist_to_binary(join(re:split("abcd:","([\\w:]+::)?(\\w+)$",[]))), 
-    <<"abcd:">> = iolist_to_binary(join(re:split("abcd:","([\\w:]+::)?(\\w+)$",[trim]))), 
+                                                                                                                                                                                                   2}]))),
+    <<"abcd:">> = iolist_to_binary(join(re:split("abcd:","([\\w:]+::)?(\\w+)$",[]))),
+    <<"abcd:">> = iolist_to_binary(join(re:split("abcd:","([\\w:]+::)?(\\w+)$",[trim]))),
     <<"abcd:">> = iolist_to_binary(join(re:split("abcd:","([\\w:]+::)?(\\w+)$",[{parts,
-                                                                                                                                                                                                   2}]))), 
-    <<"abcd:">> = iolist_to_binary(join(re:split("abcd:","([\\w:]+::)?(\\w+)$",[]))), 
-    <<":c:d">> = iolist_to_binary(join(re:split("aexycd","^[^bcd]*(c+)",[trim]))), 
+                                                                                                                                                                                                   2}]))),
+    <<"abcd:">> = iolist_to_binary(join(re:split("abcd:","([\\w:]+::)?(\\w+)$",[]))),
+    <<":c:d">> = iolist_to_binary(join(re:split("aexycd","^[^bcd]*(c+)",[trim]))),
     <<":c:d">> = iolist_to_binary(join(re:split("aexycd","^[^bcd]*(c+)",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<":c:d">> = iolist_to_binary(join(re:split("aexycd","^[^bcd]*(c+)",[]))), 
+                                                                                                                                                                                    2}]))),
+    <<":c:d">> = iolist_to_binary(join(re:split("aexycd","^[^bcd]*(c+)",[]))),
     ok.
 run31() ->
-    <<"">> = iolist_to_binary(join(re:split("aaab","(?>a+)b",[trim]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaab","(?>a+)b",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaab","(?>a+)b",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaab","(?>a+)b",[]))), 
-    <<"a::[:b]::">> = iolist_to_binary(join(re:split("a:[b]:","([[:]+)",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaab","(?>a+)b",[]))),
+    <<"a::[:b]::">> = iolist_to_binary(join(re:split("a:[b]:","([[:]+)",[trim]))),
     <<"a::[:b]:">> = iolist_to_binary(join(re:split("a:[b]:","([[:]+)",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<"a::[:b]:::">> = iolist_to_binary(join(re:split("a:[b]:","([[:]+)",[]))), 
-    <<"a:=[:b]:=">> = iolist_to_binary(join(re:split("a=[b]=","([[=]+)",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<"a::[:b]:::">> = iolist_to_binary(join(re:split("a:[b]:","([[:]+)",[]))),
+    <<"a:=[:b]:=">> = iolist_to_binary(join(re:split("a=[b]=","([[=]+)",[trim]))),
     <<"a:=[:b]=">> = iolist_to_binary(join(re:split("a=[b]=","([[=]+)",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<"a:=[:b]:=:">> = iolist_to_binary(join(re:split("a=[b]=","([[=]+)",[]))), 
-    <<"a:.[:b]:.">> = iolist_to_binary(join(re:split("a.[b].","([[.]+)",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<"a:=[:b]:=:">> = iolist_to_binary(join(re:split("a=[b]=","([[=]+)",[]))),
+    <<"a:.[:b]:.">> = iolist_to_binary(join(re:split("a.[b].","([[.]+)",[trim]))),
     <<"a:.[:b].">> = iolist_to_binary(join(re:split("a.[b].","([[.]+)",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<"a:.[:b]:.:">> = iolist_to_binary(join(re:split("a.[b].","([[.]+)",[]))), 
-    <<":aaab">> = iolist_to_binary(join(re:split("aaab","((?>a+)b)",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<"a:.[:b]:.:">> = iolist_to_binary(join(re:split("a.[b].","([[.]+)",[]))),
+    <<":aaab">> = iolist_to_binary(join(re:split("aaab","((?>a+)b)",[trim]))),
     <<":aaab:">> = iolist_to_binary(join(re:split("aaab","((?>a+)b)",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<":aaab:">> = iolist_to_binary(join(re:split("aaab","((?>a+)b)",[]))), 
-    <<":aaa">> = iolist_to_binary(join(re:split("aaab","(?>(a+))b",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<":aaab:">> = iolist_to_binary(join(re:split("aaab","((?>a+)b)",[]))),
+    <<":aaa">> = iolist_to_binary(join(re:split("aaab","(?>(a+))b",[trim]))),
     <<":aaa:">> = iolist_to_binary(join(re:split("aaab","(?>(a+))b",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<":aaa:">> = iolist_to_binary(join(re:split("aaab","(?>(a+))b",[]))), 
-    <<"((:x">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<":aaa:">> = iolist_to_binary(join(re:split("aaab","(?>(a+))b",[]))),
+    <<"((:x">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+",[trim]))),
     <<"((:x:">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+",[{parts,
-                                                                                                                                                                                                                                          2}]))), 
-    <<"((:x:">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a\\Z",[trim]))), 
+                                                                                                                                                                                                                                          2}]))),
+    <<"((:x:">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a\\Z",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a\\Z",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a\\Z",[]))), 
-    <<"aaab">> = iolist_to_binary(join(re:split("aaab","a\\Z",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a\\Z",[]))),
+    <<"aaab">> = iolist_to_binary(join(re:split("aaab","a\\Z",[trim]))),
     <<"aaab">> = iolist_to_binary(join(re:split("aaab","a\\Z",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<"aaab">> = iolist_to_binary(join(re:split("aaab","a\\Z",[]))), 
+                                                                                                                                                                 2}]))),
+    <<"aaab">> = iolist_to_binary(join(re:split("aaab","a\\Z",[]))),
     <<"a
 b">> = iolist_to_binary(join(re:split("a
-b","a\\Z",[trim]))), 
+b","a\\Z",[trim]))),
     <<"a
 b">> = iolist_to_binary(join(re:split("a
-b","a\\Z",[{parts,2}]))), 
+b","a\\Z",[{parts,2}]))),
     <<"a
 b">> = iolist_to_binary(join(re:split("a
-b","a\\Z",[]))), 
+b","a\\Z",[]))),
     <<"a
 ">> = iolist_to_binary(join(re:split("a
-b","b\\Z",[trim]))), 
+b","b\\Z",[trim]))),
     <<"a
 :">> = iolist_to_binary(join(re:split("a
-b","b\\Z",[{parts,2}]))), 
+b","b\\Z",[{parts,2}]))),
     <<"a
 :">> = iolist_to_binary(join(re:split("a
-b","b\\Z",[]))), 
+b","b\\Z",[]))),
     <<"a
 ">> = iolist_to_binary(join(re:split("a
-b","b\\Z",[trim]))), 
+b","b\\Z",[trim]))),
     <<"a
 :">> = iolist_to_binary(join(re:split("a
-b","b\\Z",[{parts,2}]))), 
+b","b\\Z",[{parts,2}]))),
     <<"a
 :">> = iolist_to_binary(join(re:split("a
-b","b\\Z",[]))), 
+b","b\\Z",[]))),
     <<"a
 ">> = iolist_to_binary(join(re:split("a
-b","b\\z",[trim]))), 
+b","b\\z",[trim]))),
     <<"a
 :">> = iolist_to_binary(join(re:split("a
-b","b\\z",[{parts,2}]))), 
+b","b\\z",[{parts,2}]))),
     <<"a
 :">> = iolist_to_binary(join(re:split("a
-b","b\\z",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","b\\z",[trim]))), 
+b","b\\z",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","b\\z",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","b\\z",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","b\\z",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","b\\z",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                      2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+                                                                                                                                                                                                                                                      2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("abc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                          2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("abc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a-b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+                                                                                                                                                                                                                                                          2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("abc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a-b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("a-b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                          2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("a-b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("0-9","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+                                                                                                                                                                                                                                                          2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("a-b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("0-9","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("0-9","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                          2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("0-9","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a.b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+                                                                                                                                                                                                                                                          2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("0-9","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a.b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("a.b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                          2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("a.b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("5.6.7","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+                                                                                                                                                                                                                                                          2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("a.b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("5.6.7","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("5.6.7","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                              2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("5.6.7","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("the.quick.brown.fox","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+                                                                                                                                                                                                                                                              2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("5.6.7","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("the.quick.brown.fox","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("the.quick.brown.fox","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                                                          2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("the.quick.brown.fox","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a100.b200.300c","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+                                                                                                                                                                                                                                                                                          2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("the.quick.brown.fox","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a100.b200.300c","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("a100.b200.300c","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                                                2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("a100.b200.300c","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("12-ab.1245","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+                                                                                                                                                                                                                                                                                2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("a100.b200.300c","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("12-ab.1245","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("12-ab.1245","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                                        2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("12-ab.1245","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+                                                                                                                                                                                                                                                                        2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("12-ab.1245","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                                          2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+                                                                                                                                                                                                                                                                          2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))),
     <<"">> = iolist_to_binary(join(re:split("","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                    2}]))), 
-    <<"">> = iolist_to_binary(join(re:split("","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-    <<".a">> = iolist_to_binary(join(re:split(".a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+                                                                                                                                                                                                                                                    2}]))),
+    <<"">> = iolist_to_binary(join(re:split("","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))),
+    <<".a">> = iolist_to_binary(join(re:split(".a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))),
     <<".a">> = iolist_to_binary(join(re:split(".a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                        2}]))), 
-    <<".a">> = iolist_to_binary(join(re:split(".a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-    <<"-a">> = iolist_to_binary(join(re:split("-a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+                                                                                                                                                                                                                                                        2}]))),
+    <<".a">> = iolist_to_binary(join(re:split(".a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))),
+    <<"-a">> = iolist_to_binary(join(re:split("-a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))),
     <<"-a">> = iolist_to_binary(join(re:split("-a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                        2}]))), 
-    <<"-a">> = iolist_to_binary(join(re:split("-a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-    <<"a-">> = iolist_to_binary(join(re:split("a-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+                                                                                                                                                                                                                                                        2}]))),
+    <<"-a">> = iolist_to_binary(join(re:split("-a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))),
+    <<"a-">> = iolist_to_binary(join(re:split("a-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))),
     <<"a-">> = iolist_to_binary(join(re:split("a-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                        2}]))), 
-    <<"a-">> = iolist_to_binary(join(re:split("a-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-    <<"a.">> = iolist_to_binary(join(re:split("a.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+                                                                                                                                                                                                                                                        2}]))),
+    <<"a-">> = iolist_to_binary(join(re:split("a-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))),
+    <<"a.">> = iolist_to_binary(join(re:split("a.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))),
     <<"a.">> = iolist_to_binary(join(re:split("a.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                        2}]))), 
-    <<"a.">> = iolist_to_binary(join(re:split("a.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-    <<"a_b">> = iolist_to_binary(join(re:split("a_b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+                                                                                                                                                                                                                                                        2}]))),
+    <<"a.">> = iolist_to_binary(join(re:split("a.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))),
+    <<"a_b">> = iolist_to_binary(join(re:split("a_b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))),
     <<"a_b">> = iolist_to_binary(join(re:split("a_b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                          2}]))), 
-    <<"a_b">> = iolist_to_binary(join(re:split("a_b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-    <<"a.-">> = iolist_to_binary(join(re:split("a.-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+                                                                                                                                                                                                                                                          2}]))),
+    <<"a_b">> = iolist_to_binary(join(re:split("a_b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))),
+    <<"a.-">> = iolist_to_binary(join(re:split("a.-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))),
     <<"a.-">> = iolist_to_binary(join(re:split("a.-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                          2}]))), 
-    <<"a.-">> = iolist_to_binary(join(re:split("a.-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-    <<"a..">> = iolist_to_binary(join(re:split("a..","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+                                                                                                                                                                                                                                                          2}]))),
+    <<"a.-">> = iolist_to_binary(join(re:split("a.-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))),
+    <<"a..">> = iolist_to_binary(join(re:split("a..","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))),
     <<"a..">> = iolist_to_binary(join(re:split("a..","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                          2}]))), 
-    <<"a..">> = iolist_to_binary(join(re:split("a..","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-    <<"ab..bc">> = iolist_to_binary(join(re:split("ab..bc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+                                                                                                                                                                                                                                                          2}]))),
+    <<"a..">> = iolist_to_binary(join(re:split("a..","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))),
+    <<"ab..bc">> = iolist_to_binary(join(re:split("ab..bc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))),
     <<"ab..bc">> = iolist_to_binary(join(re:split("ab..bc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                                2}]))), 
-    <<"ab..bc">> = iolist_to_binary(join(re:split("ab..bc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-    <<"the.quick.brown.fox-">> = iolist_to_binary(join(re:split("the.quick.brown.fox-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+                                                                                                                                                                                                                                                                2}]))),
+    <<"ab..bc">> = iolist_to_binary(join(re:split("ab..bc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))),
+    <<"the.quick.brown.fox-">> = iolist_to_binary(join(re:split("the.quick.brown.fox-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))),
     <<"the.quick.brown.fox-">> = iolist_to_binary(join(re:split("the.quick.brown.fox-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                                                            2}]))), 
-    <<"the.quick.brown.fox-">> = iolist_to_binary(join(re:split("the.quick.brown.fox-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-    <<"the.quick.brown.fox.">> = iolist_to_binary(join(re:split("the.quick.brown.fox.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+                                                                                                                                                                                                                                                                                            2}]))),
+    <<"the.quick.brown.fox-">> = iolist_to_binary(join(re:split("the.quick.brown.fox-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))),
+    <<"the.quick.brown.fox.">> = iolist_to_binary(join(re:split("the.quick.brown.fox.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))),
     <<"the.quick.brown.fox.">> = iolist_to_binary(join(re:split("the.quick.brown.fox.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                                                            2}]))), 
-    <<"the.quick.brown.fox.">> = iolist_to_binary(join(re:split("the.quick.brown.fox.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-    <<"the.quick.brown.fox_">> = iolist_to_binary(join(re:split("the.quick.brown.fox_","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+                                                                                                                                                                                                                                                                                            2}]))),
+    <<"the.quick.brown.fox.">> = iolist_to_binary(join(re:split("the.quick.brown.fox.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))),
+    <<"the.quick.brown.fox_">> = iolist_to_binary(join(re:split("the.quick.brown.fox_","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))),
     <<"the.quick.brown.fox_">> = iolist_to_binary(join(re:split("the.quick.brown.fox_","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                                                            2}]))), 
-    <<"the.quick.brown.fox_">> = iolist_to_binary(join(re:split("the.quick.brown.fox_","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-    <<"the.quick.brown.fox+">> = iolist_to_binary(join(re:split("the.quick.brown.fox+","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+                                                                                                                                                                                                                                                                                            2}]))),
+    <<"the.quick.brown.fox_">> = iolist_to_binary(join(re:split("the.quick.brown.fox_","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))),
+    <<"the.quick.brown.fox+">> = iolist_to_binary(join(re:split("the.quick.brown.fox+","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))),
     <<"the.quick.brown.fox+">> = iolist_to_binary(join(re:split("the.quick.brown.fox+","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                                                            2}]))), 
-    <<"the.quick.brown.fox+">> = iolist_to_binary(join(re:split("the.quick.brown.fox+","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-    <<":abcd">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*)(?<=(abcd|wxyz))",[trim]))), 
+                                                                                                                                                                                                                                                                                            2}]))),
+    <<"the.quick.brown.fox+">> = iolist_to_binary(join(re:split("the.quick.brown.fox+","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))),
+    <<":abcd">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*)(?<=(abcd|wxyz))",[trim]))),
     <<":abcd:">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*)(?<=(abcd|wxyz))",[{parts,
-                                                                                                                                                                                                                    2}]))), 
-    <<":abcd:">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*)(?<=(abcd|wxyz))",[]))), 
-    <<":wxyz">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*)(?<=(abcd|wxyz))",[trim]))), 
+                                                                                                                                                                                                                    2}]))),
+    <<":abcd:">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*)(?<=(abcd|wxyz))",[]))),
+    <<":wxyz">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*)(?<=(abcd|wxyz))",[trim]))),
     <<":wxyz:">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*)(?<=(abcd|wxyz))",[{parts,
-                                                                                                                                                                                                                2}]))), 
-    <<":wxyz:">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*)(?<=(abcd|wxyz))",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>.*)(?<=(abcd|wxyz))",[trim]))), 
+                                                                                                                                                                                                                2}]))),
+    <<":wxyz:">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*)(?<=(abcd|wxyz))",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>.*)(?<=(abcd|wxyz))",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>.*)(?<=(abcd|wxyz))",[{parts,
-                                                                                                                                                                                                                  2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>.*)(?<=(abcd|wxyz))",[]))), 
-    <<"a rather long string that doesn't end with one of them">> = iolist_to_binary(join(re:split("a rather long string that doesn't end with one of them","(?>.*)(?<=(abcd|wxyz))",[trim]))), 
+                                                                                                                                                                                                                  2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>.*)(?<=(abcd|wxyz))",[]))),
+    <<"a rather long string that doesn't end with one of them">> = iolist_to_binary(join(re:split("a rather long string that doesn't end with one of them","(?>.*)(?<=(abcd|wxyz))",[trim]))),
     <<"a rather long string that doesn't end with one of them">> = iolist_to_binary(join(re:split("a rather long string that doesn't end with one of them","(?>.*)(?<=(abcd|wxyz))",[{parts,
-                                                                                                                                                                                                                                                                                                                2}]))), 
-    <<"a rather long string that doesn't end with one of them">> = iolist_to_binary(join(re:split("a rather long string that doesn't end with one of them","(?>.*)(?<=(abcd|wxyz))",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword",[trim]))), 
+                                                                                                                                                                                                                                                                                                                2}]))),
+    <<"a rather long string that doesn't end with one of them">> = iolist_to_binary(join(re:split("a rather long string that doesn't end with one of them","(?>.*)(?<=(abcd|wxyz))",[]))),
+    <<"">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword",[{parts,
-                                                                                                                                                                                                                                                                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword",[]))), 
-    <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword",[]))),
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword",[trim]))),
     <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword",[{parts,
-                                                                                                                                                                                                                                                                                                                                                                                            2}]))), 
-    <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword",[]))), 
-    <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?>[a-zA-Z0-9]+ ){0,30}otherword",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                                                                            2}]))),
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword",[]))),
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?>[a-zA-Z0-9]+ ){0,30}otherword",[trim]))),
     <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?>[a-zA-Z0-9]+ ){0,30}otherword",[{parts,
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                2}]))), 
-    <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?>[a-zA-Z0-9]+ ){0,30}otherword",[]))), 
-    <<"999">> = iolist_to_binary(join(re:split("999foo","(?<=\\d{3}(?!999))foo",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                2}]))),
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?>[a-zA-Z0-9]+ ){0,30}otherword",[]))),
+    <<"999">> = iolist_to_binary(join(re:split("999foo","(?<=\\d{3}(?!999))foo",[trim]))),
     <<"999:">> = iolist_to_binary(join(re:split("999foo","(?<=\\d{3}(?!999))foo",[{parts,
-                                                                                                                                                                                                       2}]))), 
-    <<"999:">> = iolist_to_binary(join(re:split("999foo","(?<=\\d{3}(?!999))foo",[]))), 
-    <<"123999">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}(?!999))foo",[trim]))), 
+                                                                                                                                                                                                       2}]))),
+    <<"999:">> = iolist_to_binary(join(re:split("999foo","(?<=\\d{3}(?!999))foo",[]))),
+    <<"123999">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}(?!999))foo",[trim]))),
     <<"123999:">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}(?!999))foo",[{parts,
-                                                                                                                                                                                                             2}]))), 
-    <<"123999:">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}(?!999))foo",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}(?!999))foo",[trim]))), 
+                                                                                                                                                                                                             2}]))),
+    <<"123999:">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}(?!999))foo",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}(?!999))foo",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}(?!999))foo",[{parts,
-                                                                                                                                                                                                                 2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}(?!999))foo",[]))), 
-    <<"123abcfoo">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}(?!999))foo",[trim]))), 
+                                                                                                                                                                                                                 2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}(?!999))foo",[]))),
+    <<"123abcfoo">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}(?!999))foo",[trim]))),
     <<"123abcfoo">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}(?!999))foo",[{parts,
-                                                                                                                                                                                                             2}]))), 
-    <<"123abcfoo">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}(?!999))foo",[]))), 
-    <<"999">> = iolist_to_binary(join(re:split("999foo","(?<=(?!...999)\\d{3})foo",[trim]))), 
+                                                                                                                                                                                                             2}]))),
+    <<"123abcfoo">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}(?!999))foo",[]))),
+    <<"999">> = iolist_to_binary(join(re:split("999foo","(?<=(?!...999)\\d{3})foo",[trim]))),
     <<"999:">> = iolist_to_binary(join(re:split("999foo","(?<=(?!...999)\\d{3})foo",[{parts,
-                                                                                                                                                                                                             2}]))), 
-    <<"999:">> = iolist_to_binary(join(re:split("999foo","(?<=(?!...999)\\d{3})foo",[]))), 
-    <<"123999">> = iolist_to_binary(join(re:split("123999foo","(?<=(?!...999)\\d{3})foo",[trim]))), 
+                                                                                                                                                                                                             2}]))),
+    <<"999:">> = iolist_to_binary(join(re:split("999foo","(?<=(?!...999)\\d{3})foo",[]))),
+    <<"123999">> = iolist_to_binary(join(re:split("123999foo","(?<=(?!...999)\\d{3})foo",[trim]))),
     <<"123999:">> = iolist_to_binary(join(re:split("123999foo","(?<=(?!...999)\\d{3})foo",[{parts,
-                                                                                                                                                                                                                   2}]))), 
-    <<"123999:">> = iolist_to_binary(join(re:split("123999foo","(?<=(?!...999)\\d{3})foo",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(?!...999)\\d{3})foo",[trim]))), 
+                                                                                                                                                                                                                   2}]))),
+    <<"123999:">> = iolist_to_binary(join(re:split("123999foo","(?<=(?!...999)\\d{3})foo",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(?!...999)\\d{3})foo",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(?!...999)\\d{3})foo",[{parts,
-                                                                                                                                                                                                                       2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(?!...999)\\d{3})foo",[]))), 
-    <<"123abcfoo">> = iolist_to_binary(join(re:split("123abcfoo","(?<=(?!...999)\\d{3})foo",[trim]))), 
+                                                                                                                                                                                                                       2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(?!...999)\\d{3})foo",[]))),
+    <<"123abcfoo">> = iolist_to_binary(join(re:split("123abcfoo","(?<=(?!...999)\\d{3})foo",[trim]))),
     <<"123abcfoo">> = iolist_to_binary(join(re:split("123abcfoo","(?<=(?!...999)\\d{3})foo",[{parts,
-                                                                                                                                                                                                                   2}]))), 
-    <<"123abcfoo">> = iolist_to_binary(join(re:split("123abcfoo","(?<=(?!...999)\\d{3})foo",[]))), 
-    <<"123abc">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}(?!999)...)foo",[trim]))), 
+                                                                                                                                                                                                                   2}]))),
+    <<"123abcfoo">> = iolist_to_binary(join(re:split("123abcfoo","(?<=(?!...999)\\d{3})foo",[]))),
+    <<"123abc">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}(?!999)...)foo",[trim]))),
     <<"123abc:">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}(?!999)...)foo",[{parts,
-                                                                                                                                                                                                                   2}]))), 
-    <<"123abc:">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}(?!999)...)foo",[]))), 
-    <<"123456">> = iolist_to_binary(join(re:split("123456foo","(?<=\\d{3}(?!999)...)foo",[trim]))), 
+                                                                                                                                                                                                                   2}]))),
+    <<"123abc:">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}(?!999)...)foo",[]))),
+    <<"123456">> = iolist_to_binary(join(re:split("123456foo","(?<=\\d{3}(?!999)...)foo",[trim]))),
     <<"123456:">> = iolist_to_binary(join(re:split("123456foo","(?<=\\d{3}(?!999)...)foo",[{parts,
-                                                                                                                                                                                                                   2}]))), 
-    <<"123456:">> = iolist_to_binary(join(re:split("123456foo","(?<=\\d{3}(?!999)...)foo",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}(?!999)...)foo",[trim]))), 
+                                                                                                                                                                                                                   2}]))),
+    <<"123456:">> = iolist_to_binary(join(re:split("123456foo","(?<=\\d{3}(?!999)...)foo",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}(?!999)...)foo",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}(?!999)...)foo",[{parts,
-                                                                                                                                                                                                                       2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}(?!999)...)foo",[]))), 
-    <<"123999foo">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}(?!999)...)foo",[trim]))), 
+                                                                                                                                                                                                                       2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}(?!999)...)foo",[]))),
+    <<"123999foo">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}(?!999)...)foo",[trim]))),
     <<"123999foo">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}(?!999)...)foo",[{parts,
-                                                                                                                                                                                                                   2}]))), 
-    <<"123999foo">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}(?!999)...)foo",[]))), 
+                                                                                                                                                                                                                   2}]))),
+    <<"123999foo">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}(?!999)...)foo",[]))),
     ok.
 run32() ->
-    <<"123abc">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}...)(?<!999)foo",[trim]))), 
+    <<"123abc">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}...)(?<!999)foo",[trim]))),
     <<"123abc:">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}...)(?<!999)foo",[{parts,
-                                                                                                                                                                                                                     2}]))), 
-    <<"123abc:">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}...)(?<!999)foo",[]))), 
-    <<"123456">> = iolist_to_binary(join(re:split("123456foo","(?<=\\d{3}...)(?<!999)foo",[trim]))), 
+                                                                                                                                                                                                                     2}]))),
+    <<"123abc:">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}...)(?<!999)foo",[]))),
+    <<"123456">> = iolist_to_binary(join(re:split("123456foo","(?<=\\d{3}...)(?<!999)foo",[trim]))),
     <<"123456:">> = iolist_to_binary(join(re:split("123456foo","(?<=\\d{3}...)(?<!999)foo",[{parts,
-                                                                                                                                                                                                                     2}]))), 
-    <<"123456:">> = iolist_to_binary(join(re:split("123456foo","(?<=\\d{3}...)(?<!999)foo",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}...)(?<!999)foo",[trim]))), 
+                                                                                                                                                                                                                     2}]))),
+    <<"123456:">> = iolist_to_binary(join(re:split("123456foo","(?<=\\d{3}...)(?<!999)foo",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}...)(?<!999)foo",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}...)(?<!999)foo",[{parts,
-                                                                                                                                                                                                                         2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}...)(?<!999)foo",[]))), 
-    <<"123999foo">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}...)(?<!999)foo",[trim]))), 
+                                                                                                                                                                                                                         2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}...)(?<!999)foo",[]))),
+    <<"123999foo">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}...)(?<!999)foo",[trim]))),
     <<"123999foo">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}...)(?<!999)foo",[{parts,
-                                                                                                                                                                                                                     2}]))), 
-    <<"123999foo">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}...)(?<!999)foo",[]))), 
+                                                                                                                                                                                                                     2}]))),
+    <<"123999foo">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}...)(?<!999)foo",[]))),
     <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
  ([\\\"\\'])?                       # find single or double quote
  (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended,
-                                                                              trim]))), 
+                                                                              trim]))),
     <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
  ([\\\"\\'])?                       # find single or double quote
  (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
@@ -28108,20 +28108,20 @@ run32() ->
                                                                               dotall,
                                                                               extended,
                                                                               {parts,
-                                                                               2}]))), 
+                                                                               2}]))),
     <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
  ([\\\"\\'])?                       # find single or double quote
  (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
-                                                                              extended]))), 
+                                                                              extended]))),
     <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
  ([\\\"\\'])?                       # find single or double quote
  (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended,
-                                                                              trim]))), 
+                                                                              trim]))),
     <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
  ([\\\"\\'])?                       # find single or double quote
  (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
@@ -28129,20 +28129,20 @@ run32() ->
                                                                               dotall,
                                                                               extended,
                                                                               {parts,
-                                                                               2}]))), 
+                                                                               2}]))),
     <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
  ([\\\"\\'])?                       # find single or double quote
  (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
-                                                                              extended]))), 
+                                                                              extended]))),
     <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href='abcd xyz pqr' cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
  ([\\\"\\'])?                       # find single or double quote
  (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended,
-                                                                              trim]))), 
+                                                                              trim]))),
     <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href='abcd xyz pqr' cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
  ([\\\"\\'])?                       # find single or double quote
  (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
@@ -28150,20 +28150,20 @@ run32() ->
                                                                               dotall,
                                                                               extended,
                                                                               {parts,
-                                                                               2}]))), 
+                                                                               2}]))),
     <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href='abcd xyz pqr' cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
  ([\\\"\\'])?                       # find single or double quote
  (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
-                                                                              extended]))), 
+                                                                              extended]))),
     <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a\\s+href\\s*=\\s*                # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended,
-                                                                              trim]))), 
+                                                                              trim]))),
     <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a\\s+href\\s*=\\s*                # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
@@ -28171,20 +28171,20 @@ run32() ->
                                                                               dotall,
                                                                               extended,
                                                                               {parts,
-                                                                               2}]))), 
+                                                                               2}]))),
     <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a\\s+href\\s*=\\s*                # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
-                                                                              extended]))), 
+                                                                              extended]))),
     <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a\\s+href\\s*=\\s*                # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended,
-                                                                              trim]))), 
+                                                                              trim]))),
     <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a\\s+href\\s*=\\s*                # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
@@ -28192,20 +28192,20 @@ run32() ->
                                                                               dotall,
                                                                               extended,
                                                                               {parts,
-                                                                               2}]))), 
+                                                                               2}]))),
     <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a\\s+href\\s*=\\s*                # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
-                                                                              extended]))), 
+                                                                              extended]))),
     <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href       =       'abcd xyz pqr' cats","<a\\s+href\\s*=\\s*                # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended,
-                                                                              trim]))), 
+                                                                              trim]))),
     <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href       =       'abcd xyz pqr' cats","<a\\s+href\\s*=\\s*                # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
@@ -28213,20 +28213,20 @@ run32() ->
                                                                               dotall,
                                                                               extended,
                                                                               {parts,
-                                                                               2}]))), 
+                                                                               2}]))),
     <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href       =       'abcd xyz pqr' cats","<a\\s+href\\s*=\\s*                # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
-                                                                              extended]))), 
+                                                                              extended]))),
     <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended,
-                                                                              trim]))), 
+                                                                              trim]))),
     <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
@@ -28234,20 +28234,20 @@ run32() ->
                                                                               dotall,
                                                                               extended,
                                                                               {parts,
-                                                                               2}]))), 
+                                                                               2}]))),
     <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
-                                                                              extended]))), 
+                                                                              extended]))),
     <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended,
-                                                                              trim]))), 
+                                                                              trim]))),
     <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
@@ -28255,20 +28255,20 @@ run32() ->
                                                                               dotall,
                                                                               extended,
                                                                               {parts,
-                                                                               2}]))), 
+                                                                               2}]))),
     <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
-                                                                              extended]))), 
+                                                                              extended]))),
     <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href       =       'abcd xyz pqr' cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended,
-                                                                              trim]))), 
+                                                                              trim]))),
     <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href       =       'abcd xyz pqr' cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
@@ -28276,303 +28276,303 @@ run32() ->
                                                                               dotall,
                                                                               extended,
                                                                               {parts,
-                                                                               2}]))), 
+                                                                               2}]))),
     <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href       =       'abcd xyz pqr' cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
-                                                                              extended]))), 
-    <<":A:Z:B:::C:::D:::E:::F:::G">> = iolist_to_binary(join(re:split("ZABCDEFG","((Z)+|A)*",[trim]))), 
+                                                                              extended]))),
+    <<":A:Z:B:::C:::D:::E:::F:::G">> = iolist_to_binary(join(re:split("ZABCDEFG","((Z)+|A)*",[trim]))),
     <<":A:Z:BCDEFG">> = iolist_to_binary(join(re:split("ZABCDEFG","((Z)+|A)*",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<":A:Z:B:::C:::D:::E:::F:::G:::">> = iolist_to_binary(join(re:split("ZABCDEFG","((Z)+|A)*",[]))), 
-    <<":A::B:::C:::D:::E:::F:::G">> = iolist_to_binary(join(re:split("ZABCDEFG","(Z()|A)*",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<":A:Z:B:::C:::D:::E:::F:::G:::">> = iolist_to_binary(join(re:split("ZABCDEFG","((Z)+|A)*",[]))),
+    <<":A::B:::C:::D:::E:::F:::G">> = iolist_to_binary(join(re:split("ZABCDEFG","(Z()|A)*",[trim]))),
     <<":A::BCDEFG">> = iolist_to_binary(join(re:split("ZABCDEFG","(Z()|A)*",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<":A::B:::C:::D:::E:::F:::G:::">> = iolist_to_binary(join(re:split("ZABCDEFG","(Z()|A)*",[]))), 
-    <<":A:::B::::C::::D::::E::::F::::G">> = iolist_to_binary(join(re:split("ZABCDEFG","(Z(())|A)*",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<":A::B:::C:::D:::E:::F:::G:::">> = iolist_to_binary(join(re:split("ZABCDEFG","(Z()|A)*",[]))),
+    <<":A:::B::::C::::D::::E::::F::::G">> = iolist_to_binary(join(re:split("ZABCDEFG","(Z(())|A)*",[trim]))),
     <<":A:::BCDEFG">> = iolist_to_binary(join(re:split("ZABCDEFG","(Z(())|A)*",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<":A:::B::::C::::D::::E::::F::::G::::">> = iolist_to_binary(join(re:split("ZABCDEFG","(Z(())|A)*",[]))), 
-    <<":A:B::C::D::E::F::G">> = iolist_to_binary(join(re:split("ZABCDEFG","((?>Z)+|A)*",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<":A:::B::::C::::D::::E::::F::::G::::">> = iolist_to_binary(join(re:split("ZABCDEFG","(Z(())|A)*",[]))),
+    <<":A:B::C::D::E::F::G">> = iolist_to_binary(join(re:split("ZABCDEFG","((?>Z)+|A)*",[trim]))),
     <<":A:BCDEFG">> = iolist_to_binary(join(re:split("ZABCDEFG","((?>Z)+|A)*",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<":A:B::C::D::E::F::G::">> = iolist_to_binary(join(re:split("ZABCDEFG","((?>Z)+|A)*",[]))), 
-    <<"Z::::B::C::D::E::F::G">> = iolist_to_binary(join(re:split("ZABCDEFG","((?>)+|A)*",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<":A:B::C::D::E::F::G::">> = iolist_to_binary(join(re:split("ZABCDEFG","((?>Z)+|A)*",[]))),
+    <<"Z::::B::C::D::E::F::G">> = iolist_to_binary(join(re:split("ZABCDEFG","((?>)+|A)*",[trim]))),
     <<"Z::ABCDEFG">> = iolist_to_binary(join(re:split("ZABCDEFG","((?>)+|A)*",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<"Z::::B::C::D::E::F::G::">> = iolist_to_binary(join(re:split("ZABCDEFG","((?>)+|A)*",[]))), 
-    <<":b:b:b">> = iolist_to_binary(join(re:split("abbab","a*",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<"Z::::B::C::D::E::F::G::">> = iolist_to_binary(join(re:split("ZABCDEFG","((?>)+|A)*",[]))),
+    <<":b:b:b">> = iolist_to_binary(join(re:split("abbab","a*",[trim]))),
     <<":bbab">> = iolist_to_binary(join(re:split("abbab","a*",[{parts,
-                                                                                                                                                              2}]))), 
-    <<":b:b:b:">> = iolist_to_binary(join(re:split("abbab","a*",[]))), 
-    <<":bcde">> = iolist_to_binary(join(re:split("abcde","^[\\d-a]",[trim]))), 
+                                                                                                                                                              2}]))),
+    <<":b:b:b:">> = iolist_to_binary(join(re:split("abbab","a*",[]))),
+    <<":bcde">> = iolist_to_binary(join(re:split("abcde","^[\\d-a]",[trim]))),
     <<":bcde">> = iolist_to_binary(join(re:split("abcde","^[\\d-a]",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<":bcde">> = iolist_to_binary(join(re:split("abcde","^[\\d-a]",[]))), 
-    <<":things">> = iolist_to_binary(join(re:split("-things","^[\\d-a]",[trim]))), 
+                                                                                                                                                                           2}]))),
+    <<":bcde">> = iolist_to_binary(join(re:split("abcde","^[\\d-a]",[]))),
+    <<":things">> = iolist_to_binary(join(re:split("-things","^[\\d-a]",[trim]))),
     <<":things">> = iolist_to_binary(join(re:split("-things","^[\\d-a]",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<":things">> = iolist_to_binary(join(re:split("-things","^[\\d-a]",[]))), 
-    <<":digit">> = iolist_to_binary(join(re:split("0digit","^[\\d-a]",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<":things">> = iolist_to_binary(join(re:split("-things","^[\\d-a]",[]))),
+    <<":digit">> = iolist_to_binary(join(re:split("0digit","^[\\d-a]",[trim]))),
     <<":digit">> = iolist_to_binary(join(re:split("0digit","^[\\d-a]",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<":digit">> = iolist_to_binary(join(re:split("0digit","^[\\d-a]",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[\\d-a]",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<":digit">> = iolist_to_binary(join(re:split("0digit","^[\\d-a]",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[\\d-a]",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[\\d-a]",[{parts,
-                                                                                                                                                                                       2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[\\d-a]",[]))), 
-    <<"bcdef">> = iolist_to_binary(join(re:split("bcdef","^[\\d-a]",[trim]))), 
+                                                                                                                                                                                       2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[\\d-a]",[]))),
+    <<"bcdef">> = iolist_to_binary(join(re:split("bcdef","^[\\d-a]",[trim]))),
     <<"bcdef">> = iolist_to_binary(join(re:split("bcdef","^[\\d-a]",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<"bcdef">> = iolist_to_binary(join(re:split("bcdef","^[\\d-a]",[]))), 
+                                                                                                                                                                           2}]))),
+    <<"bcdef">> = iolist_to_binary(join(re:split("bcdef","^[\\d-a]",[]))),
     <<">:<">> = iolist_to_binary(join(re:split("> 	
-
<","[[:space:]]+",[trim]))), 
+
<","[[:space:]]+",[trim]))),
     <<">:<">> = iolist_to_binary(join(re:split("> 	
-
<","[[:space:]]+",[{parts,2}]))), 
+
<","[[:space:]]+",[{parts,2}]))),
     <<">:<">> = iolist_to_binary(join(re:split("> 	
-
<","[[:space:]]+",[]))), 
+
<","[[:space:]]+",[]))),
     <<">:
 
<">> = iolist_to_binary(join(re:split("> 	
-
<","[[:blank:]]+",[trim]))), 
+
<","[[:blank:]]+",[trim]))),
     <<">:
 
<">> = iolist_to_binary(join(re:split("> 	
-
<","[[:blank:]]+",[{parts,2}]))), 
+
<","[[:blank:]]+",[{parts,2}]))),
     <<">:
 
<">> = iolist_to_binary(join(re:split("> 	
-
<","[[:blank:]]+",[]))), 
+
<","[[:blank:]]+",[]))),
     <<">:<">> = iolist_to_binary(join(re:split("> 	
-
<","[\\s]+",[trim]))), 
+
<","[\\s]+",[trim]))),
     <<">:<">> = iolist_to_binary(join(re:split("> 	
-
<","[\\s]+",[{parts,2}]))), 
+
<","[\\s]+",[{parts,2}]))),
     <<">:<">> = iolist_to_binary(join(re:split("> 	
-
<","[\\s]+",[]))), 
+
<","[\\s]+",[]))),
     <<">:<">> = iolist_to_binary(join(re:split("> 	
-
<","\\s+",[trim]))), 
+
<","\\s+",[trim]))),
     <<">:<">> = iolist_to_binary(join(re:split("> 	
-
<","\\s+",[{parts,2}]))), 
+
<","\\s+",[{parts,2}]))),
     <<">:<">> = iolist_to_binary(join(re:split("> 	
-
<","\\s+",[]))), 
+
<","\\s+",[]))),
     <<"">> = iolist_to_binary(join(re:split("ab","ab",[extended,
-                                                                                                                                                        trim]))), 
+                                                                                                                                                        trim]))),
     <<":">> = iolist_to_binary(join(re:split("ab","ab",[extended,
                                                                                                                                                           {parts,
-                                                                                                                                                           2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ab","ab",[extended]))), 
+                                                                                                                                                           2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ab","ab",[extended]))),
     <<"a
 :b">> = iolist_to_binary(join(re:split("a
-xb","(?!\\A)x",[multiline,trim]))), 
+xb","(?!\\A)x",[multiline,trim]))),
     <<"a
 :b">> = iolist_to_binary(join(re:split("a
-xb","(?!\\A)x",[multiline,{parts,2}]))), 
+xb","(?!\\A)x",[multiline,{parts,2}]))),
     <<"a
 :b">> = iolist_to_binary(join(re:split("a
-xb","(?!\\A)x",[multiline]))), 
+xb","(?!\\A)x",[multiline]))),
     <<"a
 xb">> = iolist_to_binary(join(re:split("a
-xb","(?!^)x",[multiline,trim]))), 
+xb","(?!^)x",[multiline,trim]))),
     <<"a
 xb">> = iolist_to_binary(join(re:split("a
-xb","(?!^)x",[multiline,{parts,2}]))), 
+xb","(?!^)x",[multiline,{parts,2}]))),
     <<"a
 xb">> = iolist_to_binary(join(re:split("a
-xb","(?!^)x",[multiline]))), 
-    <<"">> = iolist_to_binary(join(re:split("abcabcabc","abc\\Qabc\\Eabc",[trim]))), 
+xb","(?!^)x",[multiline]))),
+    <<"">> = iolist_to_binary(join(re:split("abcabcabc","abc\\Qabc\\Eabc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abcabcabc","abc\\Qabc\\Eabc",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abcabcabc","abc\\Qabc\\Eabc",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc(*+|abc","abc\\Q(*+|\\Eabc",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abcabcabc","abc\\Qabc\\Eabc",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc(*+|abc","abc\\Q(*+|\\Eabc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc(*+|abc","abc\\Q(*+|\\Eabc",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc(*+|abc","abc\\Q(*+|\\Eabc",[]))), 
+                                                                                                                                                                                                      2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc(*+|abc","abc\\Q(*+|\\Eabc",[]))),
     ok.
 run33() ->
     <<"">> = iolist_to_binary(join(re:split("abc abcabc","   abc\\Q abc\\Eabc",[extended,
-                                                                                                                                                                                                          trim]))), 
+                                                                                                                                                                                                          trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc abcabc","   abc\\Q abc\\Eabc",[extended,
                                                                                                                                                                                                             {parts,
-                                                                                                                                                                                                             2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc abcabc","   abc\\Q abc\\Eabc",[extended]))), 
+                                                                                                                                                                                                             2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc abcabc","   abc\\Q abc\\Eabc",[extended]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","   abc\\Q abc\\Eabc",[extended,
-                                                                                                                                                                                                            trim]))), 
+                                                                                                                                                                                                            trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","   abc\\Q abc\\Eabc",[extended,
                                                                                                                                                                                                               {parts,
-                                                                                                                                                                                                               2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","   abc\\Q abc\\Eabc",[extended]))), 
+                                                                                                                                                                                                               2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","   abc\\Q abc\\Eabc",[extended]))),
     <<"abcabcabc">> = iolist_to_binary(join(re:split("abcabcabc","   abc\\Q abc\\Eabc",[extended,
-                                                                                                                                                                                                        trim]))), 
+                                                                                                                                                                                                        trim]))),
     <<"abcabcabc">> = iolist_to_binary(join(re:split("abcabcabc","   abc\\Q abc\\Eabc",[extended,
                                                                                                                                                                                                           {parts,
-                                                                                                                                                                                                           2}]))), 
-    <<"abcabcabc">> = iolist_to_binary(join(re:split("abcabcabc","   abc\\Q abc\\Eabc",[extended]))), 
+                                                                                                                                                                                                           2}]))),
+    <<"abcabcabc">> = iolist_to_binary(join(re:split("abcabcabc","   abc\\Q abc\\Eabc",[extended]))),
     <<"">> = iolist_to_binary(join(re:split("abc#not comment
     literal","abc#comment
     \\Q#not comment
-    literal\\E",[extended,trim]))), 
+    literal\\E",[extended,trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc#not comment
     literal","abc#comment
     \\Q#not comment
-    literal\\E",[extended,{parts,2}]))), 
+    literal\\E",[extended,{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("abc#not comment
     literal","abc#comment
     \\Q#not comment
-    literal\\E",[extended]))), 
+    literal\\E",[extended]))),
     <<"">> = iolist_to_binary(join(re:split("abc#not comment
     literal","abc#comment
     \\Q#not comment
-    literal",[extended,trim]))), 
+    literal",[extended,trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc#not comment
     literal","abc#comment
     \\Q#not comment
-    literal",[extended,{parts,2}]))), 
+    literal",[extended,{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("abc#not comment
     literal","abc#comment
     \\Q#not comment
-    literal",[extended]))), 
+    literal",[extended]))),
     <<"">> = iolist_to_binary(join(re:split("abc#not comment
     literal","abc#comment
     \\Q#not comment
     literal\\E #more comment
-    ",[extended,trim]))), 
+    ",[extended,trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc#not comment
     literal","abc#comment
     \\Q#not comment
     literal\\E #more comment
-    ",[extended,{parts,2}]))), 
+    ",[extended,{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("abc#not comment
     literal","abc#comment
     \\Q#not comment
     literal\\E #more comment
-    ",[extended]))), 
+    ",[extended]))),
     <<"">> = iolist_to_binary(join(re:split("abc#not comment
     literal","abc#comment
     \\Q#not comment
-    literal\\E #more comment",[extended,trim]))), 
+    literal\\E #more comment",[extended,trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc#not comment
     literal","abc#comment
     \\Q#not comment
-    literal\\E #more comment",[extended,{parts,2}]))), 
+    literal\\E #more comment",[extended,{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("abc#not comment
     literal","abc#comment
     \\Q#not comment
-    literal\\E #more comment",[extended]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc\\$xyz","\\Qabc\\$xyz\\E",[trim]))), 
+    literal\\E #more comment",[extended]))),
+    <<"">> = iolist_to_binary(join(re:split("abc\\$xyz","\\Qabc\\$xyz\\E",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc\\$xyz","\\Qabc\\$xyz\\E",[{parts,
-                                                                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc\\$xyz","\\Qabc\\$xyz\\E",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc$xyz","\\Qabc\\E\\$\\Qxyz\\E",[trim]))), 
+                                                                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc\\$xyz","\\Qabc\\$xyz\\E",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc$xyz","\\Qabc\\E\\$\\Qxyz\\E",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc$xyz","\\Qabc\\E\\$\\Qxyz\\E",[{parts,
-                                                                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc$xyz","\\Qabc\\E\\$\\Qxyz\\E",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","\\Aabc",[trim]))), 
+                                                                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc$xyz","\\Qabc\\E\\$\\Qxyz\\E",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","\\Aabc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc",[{parts,
-                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc",[]))), 
-    <<"xyzabc">> = iolist_to_binary(join(re:split("xyzabc","\\Aabc",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc",[]))),
+    <<"xyzabc">> = iolist_to_binary(join(re:split("xyzabc","\\Aabc",[trim]))),
     <<"xyzabc">> = iolist_to_binary(join(re:split("xyzabc","\\Aabc",[{parts,
-                                                                                                                                                                         2}]))), 
-    <<"xyzabc">> = iolist_to_binary(join(re:split("xyzabc","\\Aabc",[]))), 
-    <<":abc2xyzabc3">> = iolist_to_binary(join(re:split("abc1abc2xyzabc3","\\Aabc.",[trim]))), 
+                                                                                                                                                                         2}]))),
+    <<"xyzabc">> = iolist_to_binary(join(re:split("xyzabc","\\Aabc",[]))),
+    <<":abc2xyzabc3">> = iolist_to_binary(join(re:split("abc1abc2xyzabc3","\\Aabc.",[trim]))),
     <<":abc2xyzabc3">> = iolist_to_binary(join(re:split("abc1abc2xyzabc3","\\Aabc.",[{parts,
-                                                                                                                                                                                             2}]))), 
-    <<":abc2xyzabc3">> = iolist_to_binary(join(re:split("abc1abc2xyzabc3","\\Aabc.",[]))), 
-    <<"::xyz">> = iolist_to_binary(join(re:split("abc1abc2xyzabc3","abc.",[trim]))), 
+                                                                                                                                                                                             2}]))),
+    <<":abc2xyzabc3">> = iolist_to_binary(join(re:split("abc1abc2xyzabc3","\\Aabc.",[]))),
+    <<"::xyz">> = iolist_to_binary(join(re:split("abc1abc2xyzabc3","abc.",[trim]))),
     <<":abc2xyzabc3">> = iolist_to_binary(join(re:split("abc1abc2xyzabc3","abc.",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<"::xyz:">> = iolist_to_binary(join(re:split("abc1abc2xyzabc3","abc.",[]))), 
-    <<"X:Y">> = iolist_to_binary(join(re:split("XabcdY","a(?x: b c )d",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<"::xyz:">> = iolist_to_binary(join(re:split("abc1abc2xyzabc3","abc.",[]))),
+    <<"X:Y">> = iolist_to_binary(join(re:split("XabcdY","a(?x: b c )d",[trim]))),
     <<"X:Y">> = iolist_to_binary(join(re:split("XabcdY","a(?x: b c )d",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<"X:Y">> = iolist_to_binary(join(re:split("XabcdY","a(?x: b c )d",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?x: b c )d",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<"X:Y">> = iolist_to_binary(join(re:split("XabcdY","a(?x: b c )d",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?x: b c )d",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?x: b c )d",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?x: b c )d",[]))), 
-    <<"Xa b c d Y">> = iolist_to_binary(join(re:split("Xa b c d Y","a(?x: b c )d",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?x: b c )d",[]))),
+    <<"Xa b c d Y">> = iolist_to_binary(join(re:split("Xa b c d Y","a(?x: b c )d",[trim]))),
     <<"Xa b c d Y">> = iolist_to_binary(join(re:split("Xa b c d Y","a(?x: b c )d",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<"Xa b c d Y">> = iolist_to_binary(join(re:split("Xa b c d Y","a(?x: b c )d",[]))), 
-    <<"X:abc:Y">> = iolist_to_binary(join(re:split("XabcY","((?x)x y z | a b c)",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<"Xa b c d Y">> = iolist_to_binary(join(re:split("Xa b c d Y","a(?x: b c )d",[]))),
+    <<"X:abc:Y">> = iolist_to_binary(join(re:split("XabcY","((?x)x y z | a b c)",[trim]))),
     <<"X:abc:Y">> = iolist_to_binary(join(re:split("XabcY","((?x)x y z | a b c)",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"X:abc:Y">> = iolist_to_binary(join(re:split("XabcY","((?x)x y z | a b c)",[]))), 
-    <<"A:xyz:B">> = iolist_to_binary(join(re:split("AxyzB","((?x)x y z | a b c)",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<"X:abc:Y">> = iolist_to_binary(join(re:split("XabcY","((?x)x y z | a b c)",[]))),
+    <<"A:xyz:B">> = iolist_to_binary(join(re:split("AxyzB","((?x)x y z | a b c)",[trim]))),
     <<"A:xyz:B">> = iolist_to_binary(join(re:split("AxyzB","((?x)x y z | a b c)",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"A:xyz:B">> = iolist_to_binary(join(re:split("AxyzB","((?x)x y z | a b c)",[]))), 
-    <<"X:Y">> = iolist_to_binary(join(re:split("XabCY","(?i)AB(?-i)C",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<"A:xyz:B">> = iolist_to_binary(join(re:split("AxyzB","((?x)x y z | a b c)",[]))),
+    <<"X:Y">> = iolist_to_binary(join(re:split("XabCY","(?i)AB(?-i)C",[trim]))),
     <<"X:Y">> = iolist_to_binary(join(re:split("XabCY","(?i)AB(?-i)C",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"X:Y">> = iolist_to_binary(join(re:split("XabCY","(?i)AB(?-i)C",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?i)AB(?-i)C",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"X:Y">> = iolist_to_binary(join(re:split("XabCY","(?i)AB(?-i)C",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?i)AB(?-i)C",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?i)AB(?-i)C",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?i)AB(?-i)C",[]))), 
-    <<"XabcY">> = iolist_to_binary(join(re:split("XabcY","(?i)AB(?-i)C",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?i)AB(?-i)C",[]))),
+    <<"XabcY">> = iolist_to_binary(join(re:split("XabcY","(?i)AB(?-i)C",[trim]))),
     <<"XabcY">> = iolist_to_binary(join(re:split("XabcY","(?i)AB(?-i)C",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"XabcY">> = iolist_to_binary(join(re:split("XabcY","(?i)AB(?-i)C",[]))), 
-    <<":abC">> = iolist_to_binary(join(re:split("abCE","((?i)AB(?-i)C|D)E",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"XabcY">> = iolist_to_binary(join(re:split("XabcY","(?i)AB(?-i)C",[]))),
+    <<":abC">> = iolist_to_binary(join(re:split("abCE","((?i)AB(?-i)C|D)E",[trim]))),
     <<":abC:">> = iolist_to_binary(join(re:split("abCE","((?i)AB(?-i)C|D)E",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<":abC:">> = iolist_to_binary(join(re:split("abCE","((?i)AB(?-i)C|D)E",[]))), 
-    <<":D">> = iolist_to_binary(join(re:split("DE","((?i)AB(?-i)C|D)E",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<":abC:">> = iolist_to_binary(join(re:split("abCE","((?i)AB(?-i)C|D)E",[]))),
+    <<":D">> = iolist_to_binary(join(re:split("DE","((?i)AB(?-i)C|D)E",[trim]))),
     <<":D:">> = iolist_to_binary(join(re:split("DE","((?i)AB(?-i)C|D)E",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<":D:">> = iolist_to_binary(join(re:split("DE","((?i)AB(?-i)C|D)E",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?i)AB(?-i)C|D)E",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<":D:">> = iolist_to_binary(join(re:split("DE","((?i)AB(?-i)C|D)E",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?i)AB(?-i)C|D)E",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?i)AB(?-i)C|D)E",[{parts,
-                                                                                                                                                                                                        2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?i)AB(?-i)C|D)E",[]))), 
-    <<"abcE">> = iolist_to_binary(join(re:split("abcE","((?i)AB(?-i)C|D)E",[trim]))), 
+                                                                                                                                                                                                        2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?i)AB(?-i)C|D)E",[]))),
+    <<"abcE">> = iolist_to_binary(join(re:split("abcE","((?i)AB(?-i)C|D)E",[trim]))),
     <<"abcE">> = iolist_to_binary(join(re:split("abcE","((?i)AB(?-i)C|D)E",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<"abcE">> = iolist_to_binary(join(re:split("abcE","((?i)AB(?-i)C|D)E",[]))), 
-    <<"abCe">> = iolist_to_binary(join(re:split("abCe","((?i)AB(?-i)C|D)E",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<"abcE">> = iolist_to_binary(join(re:split("abcE","((?i)AB(?-i)C|D)E",[]))),
+    <<"abCe">> = iolist_to_binary(join(re:split("abCe","((?i)AB(?-i)C|D)E",[trim]))),
     <<"abCe">> = iolist_to_binary(join(re:split("abCe","((?i)AB(?-i)C|D)E",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<"abCe">> = iolist_to_binary(join(re:split("abCe","((?i)AB(?-i)C|D)E",[]))), 
-    <<"dE">> = iolist_to_binary(join(re:split("dE","((?i)AB(?-i)C|D)E",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<"abCe">> = iolist_to_binary(join(re:split("abCe","((?i)AB(?-i)C|D)E",[]))),
+    <<"dE">> = iolist_to_binary(join(re:split("dE","((?i)AB(?-i)C|D)E",[trim]))),
     <<"dE">> = iolist_to_binary(join(re:split("dE","((?i)AB(?-i)C|D)E",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<"dE">> = iolist_to_binary(join(re:split("dE","((?i)AB(?-i)C|D)E",[]))), 
-    <<"De">> = iolist_to_binary(join(re:split("De","((?i)AB(?-i)C|D)E",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<"dE">> = iolist_to_binary(join(re:split("dE","((?i)AB(?-i)C|D)E",[]))),
+    <<"De">> = iolist_to_binary(join(re:split("De","((?i)AB(?-i)C|D)E",[trim]))),
     <<"De">> = iolist_to_binary(join(re:split("De","((?i)AB(?-i)C|D)E",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<"De">> = iolist_to_binary(join(re:split("De","((?i)AB(?-i)C|D)E",[]))), 
-    <<":abc">> = iolist_to_binary(join(re:split("abc123abc","(.*)\\d+\\1",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<"De">> = iolist_to_binary(join(re:split("De","((?i)AB(?-i)C|D)E",[]))),
+    <<":abc">> = iolist_to_binary(join(re:split("abc123abc","(.*)\\d+\\1",[trim]))),
     <<":abc:">> = iolist_to_binary(join(re:split("abc123abc","(.*)\\d+\\1",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<":abc:">> = iolist_to_binary(join(re:split("abc123abc","(.*)\\d+\\1",[]))), 
-    <<"a:bc">> = iolist_to_binary(join(re:split("abc123bc","(.*)\\d+\\1",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<":abc:">> = iolist_to_binary(join(re:split("abc123abc","(.*)\\d+\\1",[]))),
+    <<"a:bc">> = iolist_to_binary(join(re:split("abc123bc","(.*)\\d+\\1",[trim]))),
     <<"a:bc:">> = iolist_to_binary(join(re:split("abc123bc","(.*)\\d+\\1",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"a:bc:">> = iolist_to_binary(join(re:split("abc123bc","(.*)\\d+\\1",[]))), 
+                                                                                                                                                                                        2}]))),
+    <<"a:bc:">> = iolist_to_binary(join(re:split("abc123bc","(.*)\\d+\\1",[]))),
     <<":abc">> = iolist_to_binary(join(re:split("abc123abc","(.*)\\d+\\1",[dotall,
-                                                                                                                                                                                        trim]))), 
+                                                                                                                                                                                        trim]))),
     <<":abc:">> = iolist_to_binary(join(re:split("abc123abc","(.*)\\d+\\1",[dotall,
                                                                                                                                                                                           {parts,
-                                                                                                                                                                                           2}]))), 
-    <<":abc:">> = iolist_to_binary(join(re:split("abc123abc","(.*)\\d+\\1",[dotall]))), 
+                                                                                                                                                                                           2}]))),
+    <<":abc:">> = iolist_to_binary(join(re:split("abc123abc","(.*)\\d+\\1",[dotall]))),
     <<"a:bc">> = iolist_to_binary(join(re:split("abc123bc","(.*)\\d+\\1",[dotall,
-                                                                                                                                                                                      trim]))), 
+                                                                                                                                                                                      trim]))),
     <<"a:bc:">> = iolist_to_binary(join(re:split("abc123bc","(.*)\\d+\\1",[dotall,
                                                                                                                                                                                         {parts,
-                                                                                                                                                                                         2}]))), 
-    <<"a:bc:">> = iolist_to_binary(join(re:split("abc123bc","(.*)\\d+\\1",[dotall]))), 
-    <<":abc:abc">> = iolist_to_binary(join(re:split("abc123abc","((.*))\\d+\\1",[trim]))), 
+                                                                                                                                                                                         2}]))),
+    <<"a:bc:">> = iolist_to_binary(join(re:split("abc123bc","(.*)\\d+\\1",[dotall]))),
+    <<":abc:abc">> = iolist_to_binary(join(re:split("abc123abc","((.*))\\d+\\1",[trim]))),
     <<":abc:abc:">> = iolist_to_binary(join(re:split("abc123abc","((.*))\\d+\\1",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<":abc:abc:">> = iolist_to_binary(join(re:split("abc123abc","((.*))\\d+\\1",[]))), 
-    <<"a:bc:bc">> = iolist_to_binary(join(re:split("abc123bc","((.*))\\d+\\1",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<":abc:abc:">> = iolist_to_binary(join(re:split("abc123abc","((.*))\\d+\\1",[]))),
+    <<"a:bc:bc">> = iolist_to_binary(join(re:split("abc123bc","((.*))\\d+\\1",[trim]))),
     <<"a:bc:bc:">> = iolist_to_binary(join(re:split("abc123bc","((.*))\\d+\\1",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<"a:bc:bc:">> = iolist_to_binary(join(re:split("abc123bc","((.*))\\d+\\1",[]))), 
+                                                                                                                                                                                            2}]))),
+    <<"a:bc:bc:">> = iolist_to_binary(join(re:split("abc123bc","((.*))\\d+\\1",[]))),
     <<"">> = iolist_to_binary(join(re:split("a123::a123","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28581,7 +28581,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,trim]))), 
+  ",[extended,caseless,trim]))),
     <<"::">> = iolist_to_binary(join(re:split("a123::a123","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28590,7 +28590,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,{parts,2}]))), 
+  ",[extended,caseless,{parts,2}]))),
     <<"::">> = iolist_to_binary(join(re:split("a123::a123","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28599,7 +28599,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless]))), 
+  ",[extended,caseless]))),
     <<"">> = iolist_to_binary(join(re:split("a123:b342::abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28608,7 +28608,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,trim]))), 
+  ",[extended,caseless,trim]))),
     <<"::">> = iolist_to_binary(join(re:split("a123:b342::abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28617,7 +28617,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,{parts,2}]))), 
+  ",[extended,caseless,{parts,2}]))),
     <<"::">> = iolist_to_binary(join(re:split("a123:b342::abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28626,7 +28626,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless]))), 
+  ",[extended,caseless]))),
     <<"">> = iolist_to_binary(join(re:split("a123:b342::324e:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28635,7 +28635,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,trim]))), 
+  ",[extended,caseless,trim]))),
     <<"::">> = iolist_to_binary(join(re:split("a123:b342::324e:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28644,7 +28644,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,{parts,2}]))), 
+  ",[extended,caseless,{parts,2}]))),
     <<"::">> = iolist_to_binary(join(re:split("a123:b342::324e:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28653,7 +28653,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless]))), 
+  ",[extended,caseless]))),
     <<"">> = iolist_to_binary(join(re:split("a123:ddde:b342::324e:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28662,7 +28662,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,trim]))), 
+  ",[extended,caseless,trim]))),
     <<"::">> = iolist_to_binary(join(re:split("a123:ddde:b342::324e:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28671,7 +28671,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,{parts,2}]))), 
+  ",[extended,caseless,{parts,2}]))),
     <<"::">> = iolist_to_binary(join(re:split("a123:ddde:b342::324e:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28680,7 +28680,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless]))), 
+  ",[extended,caseless]))),
     <<"">> = iolist_to_binary(join(re:split("a123:ddde:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28689,7 +28689,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,trim]))), 
+  ",[extended,caseless,trim]))),
     <<"::">> = iolist_to_binary(join(re:split("a123:ddde:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28698,7 +28698,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,{parts,2}]))), 
+  ",[extended,caseless,{parts,2}]))),
     <<"::">> = iolist_to_binary(join(re:split("a123:ddde:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28707,7 +28707,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless]))), 
+  ",[extended,caseless]))),
     <<"">> = iolist_to_binary(join(re:split("a123:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28716,7 +28716,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,trim]))), 
+  ",[extended,caseless,trim]))),
     <<"::">> = iolist_to_binary(join(re:split("a123:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28725,7 +28725,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,{parts,2}]))), 
+  ",[extended,caseless,{parts,2}]))),
     <<"::">> = iolist_to_binary(join(re:split("a123:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28734,7 +28734,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless]))), 
+  ",[extended,caseless]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28743,7 +28743,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,trim]))), 
+  ",[extended,caseless,trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28752,7 +28752,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,{parts,2}]))), 
+  ",[extended,caseless,{parts,2}]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28761,7 +28761,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless]))), 
+  ",[extended,caseless]))),
     <<"1:2:3:4:5:6:7:8">> = iolist_to_binary(join(re:split("1:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28770,7 +28770,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,trim]))), 
+  ",[extended,caseless,trim]))),
     <<"1:2:3:4:5:6:7:8">> = iolist_to_binary(join(re:split("1:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28779,7 +28779,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,{parts,2}]))), 
+  ",[extended,caseless,{parts,2}]))),
     <<"1:2:3:4:5:6:7:8">> = iolist_to_binary(join(re:split("1:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28788,7 +28788,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless]))), 
+  ",[extended,caseless]))),
     <<"a123:bce:ddde:9999:b342::324e:dcba:abcd">> = iolist_to_binary(join(re:split("a123:bce:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28797,7 +28797,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,trim]))), 
+  ",[extended,caseless,trim]))),
     <<"a123:bce:ddde:9999:b342::324e:dcba:abcd">> = iolist_to_binary(join(re:split("a123:bce:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28806,7 +28806,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,{parts,2}]))), 
+  ",[extended,caseless,{parts,2}]))),
     <<"a123:bce:ddde:9999:b342::324e:dcba:abcd">> = iolist_to_binary(join(re:split("a123:bce:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28815,7 +28815,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless]))), 
+  ",[extended,caseless]))),
     <<"a123::9999:b342::324e:dcba:abcd">> = iolist_to_binary(join(re:split("a123::9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28824,7 +28824,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,trim]))), 
+  ",[extended,caseless,trim]))),
     <<"a123::9999:b342::324e:dcba:abcd">> = iolist_to_binary(join(re:split("a123::9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28833,7 +28833,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,{parts,2}]))), 
+  ",[extended,caseless,{parts,2}]))),
     <<"a123::9999:b342::324e:dcba:abcd">> = iolist_to_binary(join(re:split("a123::9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28842,7 +28842,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless]))), 
+  ",[extended,caseless]))),
     <<"abcde:2:3:4:5:6:7:8">> = iolist_to_binary(join(re:split("abcde:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28851,7 +28851,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,trim]))), 
+  ",[extended,caseless,trim]))),
     <<"abcde:2:3:4:5:6:7:8">> = iolist_to_binary(join(re:split("abcde:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28860,7 +28860,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,{parts,2}]))), 
+  ",[extended,caseless,{parts,2}]))),
     <<"abcde:2:3:4:5:6:7:8">> = iolist_to_binary(join(re:split("abcde:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28869,7 +28869,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless]))), 
+  ",[extended,caseless]))),
     <<"::1">> = iolist_to_binary(join(re:split("::1","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28878,7 +28878,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,trim]))), 
+  ",[extended,caseless,trim]))),
     <<"::1">> = iolist_to_binary(join(re:split("::1","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28887,7 +28887,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,{parts,2}]))), 
+  ",[extended,caseless,{parts,2}]))),
     <<"::1">> = iolist_to_binary(join(re:split("::1","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28896,7 +28896,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless]))), 
+  ",[extended,caseless]))),
     <<"abcd:fee0:123::">> = iolist_to_binary(join(re:split("abcd:fee0:123::","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28905,7 +28905,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,trim]))), 
+  ",[extended,caseless,trim]))),
     <<"abcd:fee0:123::">> = iolist_to_binary(join(re:split("abcd:fee0:123::","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28914,7 +28914,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,{parts,2}]))), 
+  ",[extended,caseless,{parts,2}]))),
     <<"abcd:fee0:123::">> = iolist_to_binary(join(re:split("abcd:fee0:123::","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28923,7 +28923,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless]))), 
+  ",[extended,caseless]))),
     <<":1">> = iolist_to_binary(join(re:split(":1","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28932,7 +28932,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,trim]))), 
+  ",[extended,caseless,trim]))),
     <<":1">> = iolist_to_binary(join(re:split(":1","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28941,7 +28941,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,{parts,2}]))), 
+  ",[extended,caseless,{parts,2}]))),
     <<":1">> = iolist_to_binary(join(re:split(":1","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28950,7 +28950,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless]))), 
+  ",[extended,caseless]))),
     <<"1:">> = iolist_to_binary(join(re:split("1:","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28959,7 +28959,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,trim]))), 
+  ",[extended,caseless,trim]))),
     <<"1:">> = iolist_to_binary(join(re:split("1:","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28968,7 +28968,7 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless,{parts,2}]))), 
+  ",[extended,caseless,{parts,2}]))),
     <<"1:">> = iolist_to_binary(join(re:split("1:","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
@@ -28977,3098 +28977,3147 @@ run33() ->
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ",[extended,caseless]))), 
-    <<"">> = iolist_to_binary(join(re:split("z","[z\\Qa-d]\\E]",[trim]))), 
+  ",[extended,caseless]))),
+    <<"">> = iolist_to_binary(join(re:split("z","[z\\Qa-d]\\E]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("z","[z\\Qa-d]\\E]",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("z","[z\\Qa-d]\\E]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","[z\\Qa-d]\\E]",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("z","[z\\Qa-d]\\E]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","[z\\Qa-d]\\E]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a","[z\\Qa-d]\\E]",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a","[z\\Qa-d]\\E]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("-","[z\\Qa-d]\\E]",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a","[z\\Qa-d]\\E]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("-","[z\\Qa-d]\\E]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("-","[z\\Qa-d]\\E]",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("-","[z\\Qa-d]\\E]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("d","[z\\Qa-d]\\E]",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("-","[z\\Qa-d]\\E]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("d","[z\\Qa-d]\\E]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("d","[z\\Qa-d]\\E]",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("d","[z\\Qa-d]\\E]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("]","[z\\Qa-d]\\E]",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("d","[z\\Qa-d]\\E]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("]","[z\\Qa-d]\\E]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("]","[z\\Qa-d]\\E]",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("]","[z\\Qa-d]\\E]",[]))), 
-    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[z\\Qa-d]\\E]",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("]","[z\\Qa-d]\\E]",[]))),
+    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[z\\Qa-d]\\E]",[trim]))),
     <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[z\\Qa-d]\\E]",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[z\\Qa-d]\\E]",[]))), 
-    <<"b">> = iolist_to_binary(join(re:split("b","[z\\Qa-d]\\E]",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[z\\Qa-d]\\E]",[]))),
+    <<"b">> = iolist_to_binary(join(re:split("b","[z\\Qa-d]\\E]",[trim]))),
     <<"b">> = iolist_to_binary(join(re:split("b","[z\\Qa-d]\\E]",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<"b">> = iolist_to_binary(join(re:split("b","[z\\Qa-d]\\E]",[]))), 
+                                                                                                                                                                              2}]))),
+    <<"b">> = iolist_to_binary(join(re:split("b","[z\\Qa-d]\\E]",[]))),
     ok.
 run34() ->
-    <<"">> = iolist_to_binary(join(re:split("z","[\\z\\C]",[trim]))), 
+    <<"">> = iolist_to_binary(join(re:split("z","[\\z\\C]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("z","[\\z\\C]",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("z","[\\z\\C]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("C","[\\z\\C]",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<":">> = iolist_to_binary(join(re:split("z","[\\z\\C]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("C","[\\z\\C]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("C","[\\z\\C]",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("C","[\\z\\C]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("M","\\M",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<":">> = iolist_to_binary(join(re:split("C","[\\z\\C]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("M","\\M",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("M","\\M",[{parts,
-                                                                                                                                                         2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("M","\\M",[]))), 
-    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a+)*b",[trim]))), 
+                                                                                                                                                         2}]))),
+    <<":">> = iolist_to_binary(join(re:split("M","\\M",[]))),
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a+)*b",[trim]))),
     <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a+)*b",[{parts,
-                                                                                                                                                                                                                                                                                                        2}]))), 
-    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a+)*b",[]))), 
-    <<"„XAZ">> = iolist_to_binary(join(re:split("„XAZXB","(?<=Z)X.",[trim]))), 
+                                                                                                                                                                                                                                                                                                        2}]))),
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a+)*b",[]))),
+    <<"„XAZ">> = iolist_to_binary(join(re:split("„XAZXB","(?<=Z)X.",[trim]))),
     <<"„XAZ:">> = iolist_to_binary(join(re:split("„XAZXB","(?<=Z)X.",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"„XAZ:">> = iolist_to_binary(join(re:split("„XAZXB","(?<=Z)X.",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("ab cd defg","ab cd (?x) de fg",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<"„XAZ:">> = iolist_to_binary(join(re:split("„XAZXB","(?<=Z)X.",[]))),
+    <<"">> = iolist_to_binary(join(re:split("ab cd defg","ab cd (?x) de fg",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("ab cd defg","ab cd (?x) de fg",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ab cd defg","ab cd (?x) de fg",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("ab cddefg","ab cd(?x) de fg",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ab cd defg","ab cd (?x) de fg",[]))),
+    <<"">> = iolist_to_binary(join(re:split("ab cddefg","ab cd(?x) de fg",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("ab cddefg","ab cd(?x) de fg",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ab cddefg","ab cd(?x) de fg",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","ab cd(?x) de fg",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ab cddefg","ab cd(?x) de fg",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","ab cd(?x) de fg",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","ab cd(?x) de fg",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","ab cd(?x) de fg",[]))), 
-    <<"abcddefg">> = iolist_to_binary(join(re:split("abcddefg","ab cd(?x) de fg",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","ab cd(?x) de fg",[]))),
+    <<"abcddefg">> = iolist_to_binary(join(re:split("abcddefg","ab cd(?x) de fg",[trim]))),
     <<"abcddefg">> = iolist_to_binary(join(re:split("abcddefg","ab cd(?x) de fg",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"abcddefg">> = iolist_to_binary(join(re:split("abcddefg","ab cd(?x) de fg",[]))), 
-    <<"foo:bar:X">> = iolist_to_binary(join(re:split("foobarX","(?<![^f]oo)(bar)",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<"abcddefg">> = iolist_to_binary(join(re:split("abcddefg","ab cd(?x) de fg",[]))),
+    <<"foo:bar:X">> = iolist_to_binary(join(re:split("foobarX","(?<![^f]oo)(bar)",[trim]))),
     <<"foo:bar:X">> = iolist_to_binary(join(re:split("foobarX","(?<![^f]oo)(bar)",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"foo:bar:X">> = iolist_to_binary(join(re:split("foobarX","(?<![^f]oo)(bar)",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<![^f]oo)(bar)",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<"foo:bar:X">> = iolist_to_binary(join(re:split("foobarX","(?<![^f]oo)(bar)",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<![^f]oo)(bar)",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<![^f]oo)(bar)",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<![^f]oo)(bar)",[]))), 
-    <<"boobarX">> = iolist_to_binary(join(re:split("boobarX","(?<![^f]oo)(bar)",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<![^f]oo)(bar)",[]))),
+    <<"boobarX">> = iolist_to_binary(join(re:split("boobarX","(?<![^f]oo)(bar)",[trim]))),
     <<"boobarX">> = iolist_to_binary(join(re:split("boobarX","(?<![^f]oo)(bar)",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"boobarX">> = iolist_to_binary(join(re:split("boobarX","(?<![^f]oo)(bar)",[]))), 
-    <<"off">> = iolist_to_binary(join(re:split("offX","(?<![^f])X",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<"boobarX">> = iolist_to_binary(join(re:split("boobarX","(?<![^f]oo)(bar)",[]))),
+    <<"off">> = iolist_to_binary(join(re:split("offX","(?<![^f])X",[trim]))),
     <<"off:">> = iolist_to_binary(join(re:split("offX","(?<![^f])X",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"off:">> = iolist_to_binary(join(re:split("offX","(?<![^f])X",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<![^f])X",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<"off:">> = iolist_to_binary(join(re:split("offX","(?<![^f])X",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<![^f])X",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<![^f])X",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<![^f])X",[]))), 
-    <<"onyX">> = iolist_to_binary(join(re:split("onyX","(?<![^f])X",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<![^f])X",[]))),
+    <<"onyX">> = iolist_to_binary(join(re:split("onyX","(?<![^f])X",[trim]))),
     <<"onyX">> = iolist_to_binary(join(re:split("onyX","(?<![^f])X",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"onyX">> = iolist_to_binary(join(re:split("onyX","(?<![^f])X",[]))), 
-    <<"ony">> = iolist_to_binary(join(re:split("onyX","(?<=[^f])X",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<"onyX">> = iolist_to_binary(join(re:split("onyX","(?<![^f])X",[]))),
+    <<"ony">> = iolist_to_binary(join(re:split("onyX","(?<=[^f])X",[trim]))),
     <<"ony:">> = iolist_to_binary(join(re:split("onyX","(?<=[^f])X",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"ony:">> = iolist_to_binary(join(re:split("onyX","(?<=[^f])X",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^f])X",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<"ony:">> = iolist_to_binary(join(re:split("onyX","(?<=[^f])X",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^f])X",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^f])X",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^f])X",[]))), 
-    <<"offX">> = iolist_to_binary(join(re:split("offX","(?<=[^f])X",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^f])X",[]))),
+    <<"offX">> = iolist_to_binary(join(re:split("offX","(?<=[^f])X",[trim]))),
     <<"offX">> = iolist_to_binary(join(re:split("offX","(?<=[^f])X",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"offX">> = iolist_to_binary(join(re:split("offX","(?<=[^f])X",[]))), 
+                                                                                                                                                                            2}]))),
+    <<"offX">> = iolist_to_binary(join(re:split("offX","(?<=[^f])X",[]))),
     <<"a
 :b
 :c">> = iolist_to_binary(join(re:split("a
 b
-c","^",[multiline,trim]))), 
+c","^",[multiline,trim]))),
     <<"a
 :b
 c">> = iolist_to_binary(join(re:split("a
 b
-c","^",[multiline,{parts,2}]))), 
+c","^",[multiline,{parts,2}]))),
     <<"a
 :b
 :c">> = iolist_to_binary(join(re:split("a
 b
-c","^",[multiline]))), 
+c","^",[multiline]))),
     <<"">> = iolist_to_binary(join(re:split("","^",[multiline,
-                                                                                                                                                trim]))), 
+                                                                                                                                                trim]))),
     <<"">> = iolist_to_binary(join(re:split("","^",[multiline,
                                                                                                                                                   {parts,
-                                                                                                                                                   2}]))), 
-    <<"">> = iolist_to_binary(join(re:split("","^",[multiline]))), 
+                                                                                                                                                   2}]))),
+    <<"">> = iolist_to_binary(join(re:split("","^",[multiline]))),
     <<"A
 C
 :C">> = iolist_to_binary(join(re:split("A
 C
-C","(?<=C\\n)^",[multiline,trim]))), 
+C","(?<=C\\n)^",[multiline,trim]))),
     <<"A
 C
 :C">> = iolist_to_binary(join(re:split("A
 C
-C","(?<=C\\n)^",[multiline,{parts,2}]))), 
+C","(?<=C\\n)^",[multiline,{parts,2}]))),
     <<"A
 C
 :C">> = iolist_to_binary(join(re:split("A
 C
-C","(?<=C\\n)^",[multiline]))), 
-    <<":X">> = iolist_to_binary(join(re:split("bXaX","(?:(?(1)a|b)(X))+",[trim]))), 
+C","(?<=C\\n)^",[multiline]))),
+    <<":X">> = iolist_to_binary(join(re:split("bXaX","(?:(?(1)a|b)(X))+",[trim]))),
     <<":X:">> = iolist_to_binary(join(re:split("bXaX","(?:(?(1)a|b)(X))+",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<":X:">> = iolist_to_binary(join(re:split("bXaX","(?:(?(1)a|b)(X))+",[]))), 
-    <<":Y">> = iolist_to_binary(join(re:split("bXXaYYaY","(?:(?(1)\\1a|b)(X|Y))+",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<":X:">> = iolist_to_binary(join(re:split("bXaX","(?:(?(1)a|b)(X))+",[]))),
+    <<":Y">> = iolist_to_binary(join(re:split("bXXaYYaY","(?:(?(1)\\1a|b)(X|Y))+",[trim]))),
     <<":Y:">> = iolist_to_binary(join(re:split("bXXaYYaY","(?:(?(1)\\1a|b)(X|Y))+",[{parts,
-                                                                                                                                                                                                             2}]))), 
-    <<":Y:">> = iolist_to_binary(join(re:split("bXXaYYaY","(?:(?(1)\\1a|b)(X|Y))+",[]))), 
-    <<":X:YaXXaX">> = iolist_to_binary(join(re:split("bXYaXXaX","(?:(?(1)\\1a|b)(X|Y))+",[trim]))), 
+                                                                                                                                                                                                             2}]))),
+    <<":Y:">> = iolist_to_binary(join(re:split("bXXaYYaY","(?:(?(1)\\1a|b)(X|Y))+",[]))),
+    <<":X:YaXXaX">> = iolist_to_binary(join(re:split("bXYaXXaX","(?:(?(1)\\1a|b)(X|Y))+",[trim]))),
     <<":X:YaXXaX">> = iolist_to_binary(join(re:split("bXYaXXaX","(?:(?(1)\\1a|b)(X|Y))+",[{parts,
-                                                                                                                                                                                                             2}]))), 
-    <<":X:YaXXaX">> = iolist_to_binary(join(re:split("bXYaXXaX","(?:(?(1)\\1a|b)(X|Y))+",[]))), 
-    <<"::::::::::X:XaYYaY">> = iolist_to_binary(join(re:split("bXXaYYaY","()()()()()()()()()(?:(?(10)\\10a|b)(X|Y))+",[trim]))), 
+                                                                                                                                                                                                             2}]))),
+    <<":X:YaXXaX">> = iolist_to_binary(join(re:split("bXYaXXaX","(?:(?(1)\\1a|b)(X|Y))+",[]))),
+    <<"::::::::::X:XaYYaY">> = iolist_to_binary(join(re:split("bXXaYYaY","()()()()()()()()()(?:(?(10)\\10a|b)(X|Y))+",[trim]))),
     <<"::::::::::X:XaYYaY">> = iolist_to_binary(join(re:split("bXXaYYaY","()()()()()()()()()(?:(?(10)\\10a|b)(X|Y))+",[{parts,
-                                                                                                                                                                                                                                                     2}]))), 
-    <<"::::::::::X:XaYYaY">> = iolist_to_binary(join(re:split("bXXaYYaY","()()()()()()()()()(?:(?(10)\\10a|b)(X|Y))+",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc]","[[,abc,]+]",[trim]))), 
+                                                                                                                                                                                                                                                     2}]))),
+    <<"::::::::::X:XaYYaY">> = iolist_to_binary(join(re:split("bXXaYYaY","()()()()()()()()()(?:(?(10)\\10a|b)(X|Y))+",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc]","[[,abc,]+]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc]","[[,abc,]+]",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc]","[[,abc,]+]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a,b]","[[,abc,]+]",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc]","[[,abc,]+]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a,b]","[[,abc,]+]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a,b]","[[,abc,]+]",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a,b]","[[,abc,]+]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("[a,b,c]","[[,abc,]+]",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a,b]","[[,abc,]+]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("[a,b,c]","[[,abc,]+]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("[a,b,c]","[[,abc,]+]",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("[a,b,c]","[[,abc,]+]",[]))), 
+                                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("[a,b,c]","[[,abc,]+]",[]))),
     <<"A:B">> = iolist_to_binary(join(re:split("A B","(?-x: )",[extended,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<"A:B">> = iolist_to_binary(join(re:split("A B","(?-x: )",[extended,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<"A:B">> = iolist_to_binary(join(re:split("A B","(?-x: )",[extended]))), 
-    <<"A:B">> = iolist_to_binary(join(re:split("A # B","(?x)(?-x: \\s*#\\s*)",[trim]))), 
+                                                                                                                                                                     2}]))),
+    <<"A:B">> = iolist_to_binary(join(re:split("A B","(?-x: )",[extended]))),
+    <<"A:B">> = iolist_to_binary(join(re:split("A # B","(?x)(?-x: \\s*#\\s*)",[trim]))),
     <<"A:B">> = iolist_to_binary(join(re:split("A # B","(?x)(?-x: \\s*#\\s*)",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<"A:B">> = iolist_to_binary(join(re:split("A # B","(?x)(?-x: \\s*#\\s*)",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?x)(?-x: \\s*#\\s*)",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<"A:B">> = iolist_to_binary(join(re:split("A # B","(?x)(?-x: \\s*#\\s*)",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?x)(?-x: \\s*#\\s*)",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?x)(?-x: \\s*#\\s*)",[{parts,
-                                                                                                                                                                                                              2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?x)(?-x: \\s*#\\s*)",[]))), 
-    <<"#">> = iolist_to_binary(join(re:split("#","(?x)(?-x: \\s*#\\s*)",[trim]))), 
+                                                                                                                                                                                                              2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?x)(?-x: \\s*#\\s*)",[]))),
+    <<"#">> = iolist_to_binary(join(re:split("#","(?x)(?-x: \\s*#\\s*)",[trim]))),
     <<"#">> = iolist_to_binary(join(re:split("#","(?x)(?-x: \\s*#\\s*)",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<"#">> = iolist_to_binary(join(re:split("#","(?x)(?-x: \\s*#\\s*)",[]))), 
-    <<"A">> = iolist_to_binary(join(re:split("A #include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<"#">> = iolist_to_binary(join(re:split("#","(?x)(?-x: \\s*#\\s*)",[]))),
+    <<"A">> = iolist_to_binary(join(re:split("A #include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[trim]))),
     <<"A:">> = iolist_to_binary(join(re:split("A #include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[{parts,
-                                                                                                                                                                                                                                              2}]))), 
-    <<"A:">> = iolist_to_binary(join(re:split("A #include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[trim]))), 
+                                                                                                                                                                                                                                              2}]))),
+    <<"A:">> = iolist_to_binary(join(re:split("A #include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[{parts,
-                                                                                                                                                                                                                                              2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[]))), 
-    <<"A#include">> = iolist_to_binary(join(re:split("A#include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[trim]))), 
+                                                                                                                                                                                                                                              2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[]))),
+    <<"A#include">> = iolist_to_binary(join(re:split("A#include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[trim]))),
     <<"A#include">> = iolist_to_binary(join(re:split("A#include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[{parts,
-                                                                                                                                                                                                                                            2}]))), 
-    <<"A#include">> = iolist_to_binary(join(re:split("A#include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[]))), 
-    <<"A #Include">> = iolist_to_binary(join(re:split("A #Include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[trim]))), 
+                                                                                                                                                                                                                                            2}]))),
+    <<"A#include">> = iolist_to_binary(join(re:split("A#include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[]))),
+    <<"A #Include">> = iolist_to_binary(join(re:split("A #Include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[trim]))),
     <<"A #Include">> = iolist_to_binary(join(re:split("A #Include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[{parts,
-                                                                                                                                                                                                                                              2}]))), 
-    <<"A #Include">> = iolist_to_binary(join(re:split("A #Include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[]))), 
+                                                                                                                                                                                                                                              2}]))),
+    <<"A #Include">> = iolist_to_binary(join(re:split("A #Include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[]))),
     ok.
 run35() ->
-    <<"">> = iolist_to_binary(join(re:split("aaabbbb","a*b*\\w",[trim]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaabbbb","a*b*\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaabbbb","a*b*\\w",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaabbbb","a*b*\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaa","a*b*\\w",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaabbbb","a*b*\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaa","a*b*\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaa","a*b*\\w",[{parts,
-                                                                                                                                                                       2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaa","a*b*\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","a*b*\\w",[trim]))), 
+                                                                                                                                                                       2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaa","a*b*\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","a*b*\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a","a*b*\\w",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a","a*b*\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaabbbb","a*b?\\w",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a","a*b*\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaabbbb","a*b?\\w",[trim]))),
     <<":bb">> = iolist_to_binary(join(re:split("aaabbbb","a*b?\\w",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("aaabbbb","a*b?\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaa","a*b?\\w",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("aaabbbb","a*b?\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaa","a*b?\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaa","a*b?\\w",[{parts,
-                                                                                                                                                                       2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaa","a*b?\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","a*b?\\w",[trim]))), 
+                                                                                                                                                                       2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaa","a*b?\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","a*b?\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a","a*b?\\w",[{parts,
-                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a","a*b?\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaabbbb","a*b{0,4}\\w",[trim]))), 
+                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a","a*b?\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaabbbb","a*b{0,4}\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaabbbb","a*b{0,4}\\w",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaabbbb","a*b{0,4}\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaa","a*b{0,4}\\w",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaabbbb","a*b{0,4}\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaa","a*b{0,4}\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaa","a*b{0,4}\\w",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaa","a*b{0,4}\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","a*b{0,4}\\w",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaa","a*b{0,4}\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","a*b{0,4}\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a","a*b{0,4}\\w",[{parts,
-                                                                                                                                                                         2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a","a*b{0,4}\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaabbbb","a*b{0,}\\w",[trim]))), 
+                                                                                                                                                                         2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a","a*b{0,4}\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaabbbb","a*b{0,}\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaabbbb","a*b{0,}\\w",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaabbbb","a*b{0,}\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaa","a*b{0,}\\w",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaabbbb","a*b{0,}\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaa","a*b{0,}\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaa","a*b{0,}\\w",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaa","a*b{0,}\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","a*b{0,}\\w",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaa","a*b{0,}\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","a*b{0,}\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a","a*b{0,}\\w",[{parts,
-                                                                                                                                                                       2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a","a*b{0,}\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("0a","a*\\d*\\w",[trim]))), 
+                                                                                                                                                                       2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a","a*b{0,}\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("0a","a*\\d*\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("0a","a*\\d*\\w",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("0a","a*\\d*\\w",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","a*\\d*\\w",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("0a","a*\\d*\\w",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","a*\\d*\\w",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a","a*\\d*\\w",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a","a*\\d*\\w",[]))), 
+                                                                                                                                                                      2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a","a*\\d*\\w",[]))),
     <<"">> = iolist_to_binary(join(re:split("a","a*b *\\w",[extended,
-                                                                                                                                                                 trim]))), 
+                                                                                                                                                                 trim]))),
     <<":">> = iolist_to_binary(join(re:split("a","a*b *\\w",[extended,
                                                                                                                                                                    {parts,
-                                                                                                                                                                    2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a","a*b *\\w",[extended]))), 
+                                                                                                                                                                    2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a","a*b *\\w",[extended]))),
     <<"">> = iolist_to_binary(join(re:split("a","a*b#comment
-  *\\w",[extended,trim]))), 
+  *\\w",[extended,trim]))),
     <<":">> = iolist_to_binary(join(re:split("a","a*b#comment
-  *\\w",[extended,{parts,2}]))), 
+  *\\w",[extended,{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("a","a*b#comment
-  *\\w",[extended]))), 
+  *\\w",[extended]))),
     <<"">> = iolist_to_binary(join(re:split("a","a* b *\\w",[extended,
-                                                                                                                                                                   trim]))), 
+                                                                                                                                                                   trim]))),
     <<":">> = iolist_to_binary(join(re:split("a","a* b *\\w",[extended,
                                                                                                                                                                      {parts,
-                                                                                                                                                                      2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a","a* b *\\w",[extended]))), 
+                                                                                                                                                                      2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a","a* b *\\w",[extended]))),
     <<"::
 pqr">> = iolist_to_binary(join(re:split("abc=xyz\\
-pqr","^\\w+=.*(\\\\\\n.*)*",[trim]))), 
+pqr","^\\w+=.*(\\\\\\n.*)*",[trim]))),
     <<"::
 pqr">> = iolist_to_binary(join(re:split("abc=xyz\\
-pqr","^\\w+=.*(\\\\\\n.*)*",[{parts,2}]))), 
+pqr","^\\w+=.*(\\\\\\n.*)*",[{parts,2}]))),
     <<"::
 pqr">> = iolist_to_binary(join(re:split("abc=xyz\\
-pqr","^\\w+=.*(\\\\\\n.*)*",[]))), 
-    <<":abcd">> = iolist_to_binary(join(re:split("abcd:","(?=(\\w+))\\1:",[trim]))), 
+pqr","^\\w+=.*(\\\\\\n.*)*",[]))),
+    <<":abcd">> = iolist_to_binary(join(re:split("abcd:","(?=(\\w+))\\1:",[trim]))),
     <<":abcd:">> = iolist_to_binary(join(re:split("abcd:","(?=(\\w+))\\1:",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<":abcd:">> = iolist_to_binary(join(re:split("abcd:","(?=(\\w+))\\1:",[]))), 
-    <<":abcd">> = iolist_to_binary(join(re:split("abcd:","^(?=(\\w+))\\1:",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<":abcd:">> = iolist_to_binary(join(re:split("abcd:","(?=(\\w+))\\1:",[]))),
+    <<":abcd">> = iolist_to_binary(join(re:split("abcd:","^(?=(\\w+))\\1:",[trim]))),
     <<":abcd:">> = iolist_to_binary(join(re:split("abcd:","^(?=(\\w+))\\1:",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<":abcd:">> = iolist_to_binary(join(re:split("abcd:","^(?=(\\w+))\\1:",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","^\\Eabc",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<":abcd:">> = iolist_to_binary(join(re:split("abcd:","^(?=(\\w+))\\1:",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","^\\Eabc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","^\\Eabc",[{parts,
-                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","^\\Eabc",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","^[\\Eabc]",[trim]))), 
+                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","^\\Eabc",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","^[\\Eabc]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a","^[\\Eabc]",[{parts,
-                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a","^[\\Eabc]",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\Eabc]",[trim]))), 
+                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a","^[\\Eabc]",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\Eabc]",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\Eabc]",[{parts,
-                                                                                                                                                                                       2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\Eabc]",[]))), 
-    <<"E">> = iolist_to_binary(join(re:split("E","^[\\Eabc]",[trim]))), 
+                                                                                                                                                                                       2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\Eabc]",[]))),
+    <<"E">> = iolist_to_binary(join(re:split("E","^[\\Eabc]",[trim]))),
     <<"E">> = iolist_to_binary(join(re:split("E","^[\\Eabc]",[{parts,
-                                                                                                                                                                     2}]))), 
-    <<"E">> = iolist_to_binary(join(re:split("E","^[\\Eabc]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("b","^[a-\\Ec]",[trim]))), 
+                                                                                                                                                                     2}]))),
+    <<"E">> = iolist_to_binary(join(re:split("E","^[\\Eabc]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("b","^[a-\\Ec]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("b","^[a-\\Ec]",[{parts,
-                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("b","^[a-\\Ec]",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[a-\\Ec]",[trim]))), 
+                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("b","^[a-\\Ec]",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[a-\\Ec]",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[a-\\Ec]",[{parts,
-                                                                                                                                                                                       2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[a-\\Ec]",[]))), 
-    <<"-">> = iolist_to_binary(join(re:split("-","^[a-\\Ec]",[trim]))), 
+                                                                                                                                                                                       2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[a-\\Ec]",[]))),
+    <<"-">> = iolist_to_binary(join(re:split("-","^[a-\\Ec]",[trim]))),
     <<"-">> = iolist_to_binary(join(re:split("-","^[a-\\Ec]",[{parts,
-                                                                                                                                                                     2}]))), 
-    <<"-">> = iolist_to_binary(join(re:split("-","^[a-\\Ec]",[]))), 
-    <<"E">> = iolist_to_binary(join(re:split("E","^[a-\\Ec]",[trim]))), 
+                                                                                                                                                                     2}]))),
+    <<"-">> = iolist_to_binary(join(re:split("-","^[a-\\Ec]",[]))),
+    <<"E">> = iolist_to_binary(join(re:split("E","^[a-\\Ec]",[trim]))),
     <<"E">> = iolist_to_binary(join(re:split("E","^[a-\\Ec]",[{parts,
-                                                                                                                                                                     2}]))), 
-    <<"E">> = iolist_to_binary(join(re:split("E","^[a-\\Ec]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("b","^[a\\E\\E-\\Ec]",[trim]))), 
+                                                                                                                                                                     2}]))),
+    <<"E">> = iolist_to_binary(join(re:split("E","^[a-\\Ec]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("b","^[a\\E\\E-\\Ec]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("b","^[a\\E\\E-\\Ec]",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("b","^[a\\E\\E-\\Ec]",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[a\\E\\E-\\Ec]",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("b","^[a\\E\\E-\\Ec]",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[a\\E\\E-\\Ec]",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[a\\E\\E-\\Ec]",[{parts,
-                                                                                                                                                                                                     2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[a\\E\\E-\\Ec]",[]))), 
-    <<"-">> = iolist_to_binary(join(re:split("-","^[a\\E\\E-\\Ec]",[trim]))), 
+                                                                                                                                                                                                     2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[a\\E\\E-\\Ec]",[]))),
+    <<"-">> = iolist_to_binary(join(re:split("-","^[a\\E\\E-\\Ec]",[trim]))),
     <<"-">> = iolist_to_binary(join(re:split("-","^[a\\E\\E-\\Ec]",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<"-">> = iolist_to_binary(join(re:split("-","^[a\\E\\E-\\Ec]",[]))), 
-    <<"E">> = iolist_to_binary(join(re:split("E","^[a\\E\\E-\\Ec]",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<"-">> = iolist_to_binary(join(re:split("-","^[a\\E\\E-\\Ec]",[]))),
+    <<"E">> = iolist_to_binary(join(re:split("E","^[a\\E\\E-\\Ec]",[trim]))),
     <<"E">> = iolist_to_binary(join(re:split("E","^[a\\E\\E-\\Ec]",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<"E">> = iolist_to_binary(join(re:split("E","^[a\\E\\E-\\Ec]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("b","^[\\E\\Qa\\E-\\Qz\\E]+",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<"E">> = iolist_to_binary(join(re:split("E","^[a\\E\\E-\\Ec]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("b","^[\\E\\Qa\\E-\\Qz\\E]+",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("b","^[\\E\\Qa\\E-\\Qz\\E]+",[{parts,
-                                                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("b","^[\\E\\Qa\\E-\\Qz\\E]+",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\E\\Qa\\E-\\Qz\\E]+",[trim]))), 
+                                                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("b","^[\\E\\Qa\\E-\\Qz\\E]+",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\E\\Qa\\E-\\Qz\\E]+",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\E\\Qa\\E-\\Qz\\E]+",[{parts,
-                                                                                                                                                                                                                     2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\E\\Qa\\E-\\Qz\\E]+",[]))), 
-    <<"-">> = iolist_to_binary(join(re:split("-","^[\\E\\Qa\\E-\\Qz\\E]+",[trim]))), 
+                                                                                                                                                                                                                     2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\E\\Qa\\E-\\Qz\\E]+",[]))),
+    <<"-">> = iolist_to_binary(join(re:split("-","^[\\E\\Qa\\E-\\Qz\\E]+",[trim]))),
     <<"-">> = iolist_to_binary(join(re:split("-","^[\\E\\Qa\\E-\\Qz\\E]+",[{parts,
-                                                                                                                                                                                                   2}]))), 
-    <<"-">> = iolist_to_binary(join(re:split("-","^[\\E\\Qa\\E-\\Qz\\E]+",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","^[a\\Q]bc\\E]",[trim]))), 
+                                                                                                                                                                                                   2}]))),
+    <<"-">> = iolist_to_binary(join(re:split("-","^[\\E\\Qa\\E-\\Qz\\E]+",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","^[a\\Q]bc\\E]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a","^[a\\Q]bc\\E]",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a","^[a\\Q]bc\\E]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("]","^[a\\Q]bc\\E]",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a","^[a\\Q]bc\\E]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("]","^[a\\Q]bc\\E]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("]","^[a\\Q]bc\\E]",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("]","^[a\\Q]bc\\E]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("c","^[a\\Q]bc\\E]",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("]","^[a\\Q]bc\\E]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("c","^[a\\Q]bc\\E]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("c","^[a\\Q]bc\\E]",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("c","^[a\\Q]bc\\E]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","^[a-\\Q\\E]",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("c","^[a\\Q]bc\\E]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","^[a-\\Q\\E]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a","^[a-\\Q\\E]",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a","^[a-\\Q\\E]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("-","^[a-\\Q\\E]",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a","^[a-\\Q\\E]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("-","^[a-\\Q\\E]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("-","^[a-\\Q\\E]",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("-","^[a-\\Q\\E]",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aaaa","^(a()*)*",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<":">> = iolist_to_binary(join(re:split("-","^[a-\\Q\\E]",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aaaa","^(a()*)*",[trim]))),
     <<":a::">> = iolist_to_binary(join(re:split("aaaa","^(a()*)*",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":a::">> = iolist_to_binary(join(re:split("aaaa","^(a()*)*",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaa","^(?:a(?:(?:))*)*",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":a::">> = iolist_to_binary(join(re:split("aaaa","^(a()*)*",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaa","^(?:a(?:(?:))*)*",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaa","^(?:a(?:(?:))*)*",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaa","^(?:a(?:(?:))*)*",[]))), 
+                                                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaa","^(?:a(?:(?:))*)*",[]))),
     ok.
 run36() ->
-    <<":a">> = iolist_to_binary(join(re:split("aaaa","^(a()+)+",[trim]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aaaa","^(a()+)+",[trim]))),
     <<":a::">> = iolist_to_binary(join(re:split("aaaa","^(a()+)+",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":a::">> = iolist_to_binary(join(re:split("aaaa","^(a()+)+",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaa","^(?:a(?:(?:))+)+",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":a::">> = iolist_to_binary(join(re:split("aaaa","^(a()+)+",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaa","^(?:a(?:(?:))+)+",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaa","^(?:a(?:(?:))+)+",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaa","^(?:a(?:(?:))+)+",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("abbD","(a){0,3}(?(1)b|(c|))*D",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaa","^(?:a(?:(?:))+)+",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("abbD","(a){0,3}(?(1)b|(c|))*D",[trim]))),
     <<":a::">> = iolist_to_binary(join(re:split("abbD","(a){0,3}(?(1)b|(c|))*D",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<":a::">> = iolist_to_binary(join(re:split("abbD","(a){0,3}(?(1)b|(c|))*D",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("ccccD","(a){0,3}(?(1)b|(c|))*D",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<":a::">> = iolist_to_binary(join(re:split("abbD","(a){0,3}(?(1)b|(c|))*D",[]))),
+    <<"">> = iolist_to_binary(join(re:split("ccccD","(a){0,3}(?(1)b|(c|))*D",[trim]))),
     <<":::">> = iolist_to_binary(join(re:split("ccccD","(a){0,3}(?(1)b|(c|))*D",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<":::">> = iolist_to_binary(join(re:split("ccccD","(a){0,3}(?(1)b|(c|))*D",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("D","(a){0,3}(?(1)b|(c|))*D",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<":::">> = iolist_to_binary(join(re:split("ccccD","(a){0,3}(?(1)b|(c|))*D",[]))),
+    <<"">> = iolist_to_binary(join(re:split("D","(a){0,3}(?(1)b|(c|))*D",[trim]))),
     <<":::">> = iolist_to_binary(join(re:split("D","(a){0,3}(?(1)b|(c|))*D",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<":::">> = iolist_to_binary(join(re:split("D","(a){0,3}(?(1)b|(c|))*D",[]))), 
-    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a|)*\\d",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<":::">> = iolist_to_binary(join(re:split("D","(a){0,3}(?(1)b|(c|))*D",[]))),
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a|)*\\d",[trim]))),
     <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a|)*\\d",[{parts,
-                                                                                                                                                                                                                                                                                         2}]))), 
-    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a|)*\\d",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(a|)*\\d",[trim]))), 
+                                                                                                                                                                                                                                                                                         2}]))),
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a|)*\\d",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(a|)*\\d",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(a|)*\\d",[{parts,
-                                                                                                                                                                                                                                                                                           2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(a|)*\\d",[]))), 
-    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?>a|)*\\d",[trim]))), 
+                                                                                                                                                                                                                                                                                           2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(a|)*\\d",[]))),
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?>a|)*\\d",[trim]))),
     <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?>a|)*\\d",[{parts,
-                                                                                                                                                                                                                                                                                             2}]))), 
-    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?>a|)*\\d",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?>a|)*\\d",[trim]))), 
+                                                                                                                                                                                                                                                                                             2}]))),
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?>a|)*\\d",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?>a|)*\\d",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?>a|)*\\d",[{parts,
-                                                                                                                                                                                                                                                                                               2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?>a|)*\\d",[]))), 
-    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?:a|)*\\d",[trim]))), 
+                                                                                                                                                                                                                                                                                               2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?>a|)*\\d",[]))),
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?:a|)*\\d",[trim]))),
     <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?:a|)*\\d",[{parts,
-                                                                                                                                                                                                                                                                                             2}]))), 
-    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?:a|)*\\d",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?:a|)*\\d",[trim]))), 
+                                                                                                                                                                                                                                                                                             2}]))),
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?:a|)*\\d",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?:a|)*\\d",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?:a|)*\\d",[{parts,
-                                                                                                                                                                                                                                                                                               2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?:a|)*\\d",[]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","\\Z",[trim]))), 
+                                                                                                                                                                                                                                                                                               2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?:a|)*\\d",[]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","\\Z",[trim]))),
     <<"abc:">> = iolist_to_binary(join(re:split("abc","\\Z",[{parts,
-                                                                                                                                                             2}]))), 
-    <<"abc:">> = iolist_to_binary(join(re:split("abc","\\Z",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","^(?s)(?>.*)(?<!\\n)",[trim]))), 
+                                                                                                                                                             2}]))),
+    <<"abc:">> = iolist_to_binary(join(re:split("abc","\\Z",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","^(?s)(?>.*)(?<!\\n)",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","^(?s)(?>.*)(?<!\\n)",[{parts,
-                                                                                                                                                                                             2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","^(?s)(?>.*)(?<!\\n)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","^(?s)(?>.*)(?<!\\n)",[trim]))), 
+                                                                                                                                                                                             2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","^(?s)(?>.*)(?<!\\n)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","^(?s)(?>.*)(?<!\\n)",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","^(?s)(?>.*)(?<!\\n)",[{parts,
-                                                                                                                                                                                             2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","^(?s)(?>.*)(?<!\\n)",[]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","^(?![^\\n]*\\n\\z)",[trim]))), 
+                                                                                                                                                                                             2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","^(?s)(?>.*)(?<!\\n)",[]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^(?![^\\n]*\\n\\z)",[trim]))),
     <<"abc">> = iolist_to_binary(join(re:split("abc","^(?![^\\n]*\\n\\z)",[{parts,
-                                                                                                                                                                                             2}]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","^(?![^\\n]*\\n\\z)",[]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","^(?![^\\n]*\\n\\z)",[trim]))), 
+                                                                                                                                                                                             2}]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^(?![^\\n]*\\n\\z)",[]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^(?![^\\n]*\\n\\z)",[trim]))),
     <<"abc">> = iolist_to_binary(join(re:split("abc","^(?![^\\n]*\\n\\z)",[{parts,
-                                                                                                                                                                                             2}]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","^(?![^\\n]*\\n\\z)",[]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","\\z(?<!\\n)",[trim]))), 
+                                                                                                                                                                                             2}]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^(?![^\\n]*\\n\\z)",[]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","\\z(?<!\\n)",[trim]))),
     <<"abc:">> = iolist_to_binary(join(re:split("abc","\\z(?<!\\n)",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<"abc:">> = iolist_to_binary(join(re:split("abc","\\z(?<!\\n)",[]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","\\z(?<!\\n)",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<"abc:">> = iolist_to_binary(join(re:split("abc","\\z(?<!\\n)",[]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","\\z(?<!\\n)",[trim]))),
     <<"abc:">> = iolist_to_binary(join(re:split("abc","\\z(?<!\\n)",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<"abc:">> = iolist_to_binary(join(re:split("abc","\\z(?<!\\n)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abcd","(.*(.)?)*",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<"abc:">> = iolist_to_binary(join(re:split("abc","\\z(?<!\\n)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abcd","(.*(.)?)*",[trim]))),
     <<":::">> = iolist_to_binary(join(re:split("abcd","(.*(.)?)*",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<":::">> = iolist_to_binary(join(re:split("abcd","(.*(.)?)*",[]))), 
+                                                                                                                                                                          2}]))),
+    <<":::">> = iolist_to_binary(join(re:split("abcd","(.*(.)?)*",[]))),
     <<"a:::b:::c:::d">> = iolist_to_binary(join(re:split("abcd","( (A | (?(1)0|) )*   )",[extended,
-                                                                                                                                                                                                  trim]))), 
+                                                                                                                                                                                                  trim]))),
     <<"a:::bcd">> = iolist_to_binary(join(re:split("abcd","( (A | (?(1)0|) )*   )",[extended,
                                                                                                                                                                                                     {parts,
-                                                                                                                                                                                                     2}]))), 
-    <<"a:::b:::c:::d:::">> = iolist_to_binary(join(re:split("abcd","( (A | (?(1)0|) )*   )",[extended]))), 
+                                                                                                                                                                                                     2}]))),
+    <<"a:::b:::c:::d:::">> = iolist_to_binary(join(re:split("abcd","( (A | (?(1)0|) )*   )",[extended]))),
     <<"a:::b:::c:::d">> = iolist_to_binary(join(re:split("abcd","( ( (?(1)0|) )*   )",[extended,
-                                                                                                                                                                                            trim]))), 
+                                                                                                                                                                                            trim]))),
     <<"a:::bcd">> = iolist_to_binary(join(re:split("abcd","( ( (?(1)0|) )*   )",[extended,
                                                                                                                                                                                               {parts,
-                                                                                                                                                                                               2}]))), 
-    <<"a:::b:::c:::d:::">> = iolist_to_binary(join(re:split("abcd","( ( (?(1)0|) )*   )",[extended]))), 
+                                                                                                                                                                                               2}]))),
+    <<"a:::b:::c:::d:::">> = iolist_to_binary(join(re:split("abcd","( ( (?(1)0|) )*   )",[extended]))),
     <<"a::b::c::d">> = iolist_to_binary(join(re:split("abcd","(  (?(1)0|)*   )",[extended,
-                                                                                                                                                                                      trim]))), 
+                                                                                                                                                                                      trim]))),
     <<"a::bcd">> = iolist_to_binary(join(re:split("abcd","(  (?(1)0|)*   )",[extended,
                                                                                                                                                                                         {parts,
-                                                                                                                                                                                         2}]))), 
-    <<"a::b::c::d::">> = iolist_to_binary(join(re:split("abcd","(  (?(1)0|)*   )",[extended]))), 
-    <<"">> = iolist_to_binary(join(re:split("a]","[[:abcd:xyz]]",[trim]))), 
+                                                                                                                                                                                         2}]))),
+    <<"a::b::c::d::">> = iolist_to_binary(join(re:split("abcd","(  (?(1)0|)*   )",[extended]))),
+    <<"">> = iolist_to_binary(join(re:split("a]","[[:abcd:xyz]]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a]","[[:abcd:xyz]]",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a]","[[:abcd:xyz]]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split(":]","[[:abcd:xyz]]",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a]","[[:abcd:xyz]]",[]))),
+    <<"">> = iolist_to_binary(join(re:split(":]","[[:abcd:xyz]]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split(":]","[[:abcd:xyz]]",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split(":]","[[:abcd:xyz]]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","[abc[:x\\]pqr]",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split(":]","[[:abcd:xyz]]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","[abc[:x\\]pqr]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("a","[abc[:x\\]pqr]",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("a","[abc[:x\\]pqr]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("[","[abc[:x\\]pqr]",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<":">> = iolist_to_binary(join(re:split("a","[abc[:x\\]pqr]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("[","[abc[:x\\]pqr]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("[","[abc[:x\\]pqr]",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("[","[abc[:x\\]pqr]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split(":","[abc[:x\\]pqr]",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<":">> = iolist_to_binary(join(re:split("[","[abc[:x\\]pqr]",[]))),
+    <<"">> = iolist_to_binary(join(re:split(":","[abc[:x\\]pqr]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split(":","[abc[:x\\]pqr]",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<":">> = iolist_to_binary(join(re:split(":","[abc[:x\\]pqr]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("]","[abc[:x\\]pqr]",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<":">> = iolist_to_binary(join(re:split(":","[abc[:x\\]pqr]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("]","[abc[:x\\]pqr]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("]","[abc[:x\\]pqr]",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("]","[abc[:x\\]pqr]",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("p","[abc[:x\\]pqr]",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<":">> = iolist_to_binary(join(re:split("]","[abc[:x\\]pqr]",[]))),
+    <<"">> = iolist_to_binary(join(re:split("p","[abc[:x\\]pqr]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("p","[abc[:x\\]pqr]",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("p","[abc[:x\\]pqr]",[]))), 
-    <<"fooabcfoo">> = iolist_to_binary(join(re:split("fooabcfoo",".*[op][xyz]",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<":">> = iolist_to_binary(join(re:split("p","[abc[:x\\]pqr]",[]))),
+    <<"fooabcfoo">> = iolist_to_binary(join(re:split("fooabcfoo",".*[op][xyz]",[trim]))),
     <<"fooabcfoo">> = iolist_to_binary(join(re:split("fooabcfoo",".*[op][xyz]",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"fooabcfoo">> = iolist_to_binary(join(re:split("fooabcfoo",".*[op][xyz]",[]))), 
-    <<"adc">> = iolist_to_binary(join(re:split("adc","(?(?=.*b)b|^)",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<"fooabcfoo">> = iolist_to_binary(join(re:split("fooabcfoo",".*[op][xyz]",[]))),
+    <<"adc">> = iolist_to_binary(join(re:split("adc","(?(?=.*b)b|^)",[trim]))),
     <<"adc">> = iolist_to_binary(join(re:split("adc","(?(?=.*b)b|^)",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<"adc">> = iolist_to_binary(join(re:split("adc","(?(?=.*b)b|^)",[]))), 
-    <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b)b|^)",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<"adc">> = iolist_to_binary(join(re:split("adc","(?(?=.*b)b|^)",[]))),
+    <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b)b|^)",[trim]))),
     <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b)b|^)",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b)b|^)",[]))), 
-    <<"adc">> = iolist_to_binary(join(re:split("adc","(?(?=^.*b)b|^)",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b)b|^)",[]))),
+    <<"adc">> = iolist_to_binary(join(re:split("adc","(?(?=^.*b)b|^)",[trim]))),
     <<"adc">> = iolist_to_binary(join(re:split("adc","(?(?=^.*b)b|^)",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"adc">> = iolist_to_binary(join(re:split("adc","(?(?=^.*b)b|^)",[]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","(?(?=^.*b)b|^)",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"adc">> = iolist_to_binary(join(re:split("adc","(?(?=^.*b)b|^)",[]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(?(?=^.*b)b|^)",[trim]))),
     <<"abc">> = iolist_to_binary(join(re:split("abc","(?(?=^.*b)b|^)",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","(?(?=^.*b)b|^)",[]))), 
-    <<"a:d:c">> = iolist_to_binary(join(re:split("adc","(?(?=.*b)b|^)*",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(?(?=^.*b)b|^)",[]))),
+    <<"a:d:c">> = iolist_to_binary(join(re:split("adc","(?(?=.*b)b|^)*",[trim]))),
     <<"a:dc">> = iolist_to_binary(join(re:split("adc","(?(?=.*b)b|^)*",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"a:d:c:">> = iolist_to_binary(join(re:split("adc","(?(?=.*b)b|^)*",[]))), 
-    <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b)b|^)*",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"a:d:c:">> = iolist_to_binary(join(re:split("adc","(?(?=.*b)b|^)*",[]))),
+    <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b)b|^)*",[trim]))),
     <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b)b|^)*",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"a:c:">> = iolist_to_binary(join(re:split("abc","(?(?=.*b)b|^)*",[]))), 
+                                                                                                                                                                                  2}]))),
+    <<"a:c:">> = iolist_to_binary(join(re:split("abc","(?(?=.*b)b|^)*",[]))),
     ok.
 run37() ->
-    <<"adc">> = iolist_to_binary(join(re:split("adc","(?(?=.*b)b|^)+",[trim]))), 
+    <<"adc">> = iolist_to_binary(join(re:split("adc","(?(?=.*b)b|^)+",[trim]))),
     <<"adc">> = iolist_to_binary(join(re:split("adc","(?(?=.*b)b|^)+",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"adc">> = iolist_to_binary(join(re:split("adc","(?(?=.*b)b|^)+",[]))), 
-    <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b)b|^)+",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"adc">> = iolist_to_binary(join(re:split("adc","(?(?=.*b)b|^)+",[]))),
+    <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b)b|^)+",[trim]))),
     <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b)b|^)+",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b)b|^)+",[]))), 
-    <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=b).*b|^d)",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b)b|^)+",[]))),
+    <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=b).*b|^d)",[trim]))),
     <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=b).*b|^d)",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=b).*b|^d)",[]))), 
-    <<":c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b).*b|^d)",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=b).*b|^d)",[]))),
+    <<":c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b).*b|^d)",[trim]))),
     <<":c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b).*b|^d)",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<":c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b).*b|^d)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("%ab%","^%((?(?=[a])[^%])|b)*%$",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<":c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b).*b|^d)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("%ab%","^%((?(?=[a])[^%])|b)*%$",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("%ab%","^%((?(?=[a])[^%])|b)*%$",[{parts,
-                                                                                                                                                                                                       2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("%ab%","^%((?(?=[a])[^%])|b)*%$",[]))), 
-    <<"X:X">> = iolist_to_binary(join(re:split("XabX","(?i)a(?-i)b|c",[trim]))), 
+                                                                                                                                                                                                       2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("%ab%","^%((?(?=[a])[^%])|b)*%$",[]))),
+    <<"X:X">> = iolist_to_binary(join(re:split("XabX","(?i)a(?-i)b|c",[trim]))),
     <<"X:X">> = iolist_to_binary(join(re:split("XabX","(?i)a(?-i)b|c",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"X:X">> = iolist_to_binary(join(re:split("XabX","(?i)a(?-i)b|c",[]))), 
-    <<"X:X">> = iolist_to_binary(join(re:split("XAbX","(?i)a(?-i)b|c",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"X:X">> = iolist_to_binary(join(re:split("XabX","(?i)a(?-i)b|c",[]))),
+    <<"X:X">> = iolist_to_binary(join(re:split("XAbX","(?i)a(?-i)b|c",[trim]))),
     <<"X:X">> = iolist_to_binary(join(re:split("XAbX","(?i)a(?-i)b|c",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"X:X">> = iolist_to_binary(join(re:split("XAbX","(?i)a(?-i)b|c",[]))), 
-    <<"C:C">> = iolist_to_binary(join(re:split("CcC","(?i)a(?-i)b|c",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"X:X">> = iolist_to_binary(join(re:split("XAbX","(?i)a(?-i)b|c",[]))),
+    <<"C:C">> = iolist_to_binary(join(re:split("CcC","(?i)a(?-i)b|c",[trim]))),
     <<"C:C">> = iolist_to_binary(join(re:split("CcC","(?i)a(?-i)b|c",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<"C:C">> = iolist_to_binary(join(re:split("CcC","(?i)a(?-i)b|c",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?i)a(?-i)b|c",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<"C:C">> = iolist_to_binary(join(re:split("CcC","(?i)a(?-i)b|c",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?i)a(?-i)b|c",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?i)a(?-i)b|c",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?i)a(?-i)b|c",[]))), 
-    <<"XABX">> = iolist_to_binary(join(re:split("XABX","(?i)a(?-i)b|c",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?i)a(?-i)b|c",[]))),
+    <<"XABX">> = iolist_to_binary(join(re:split("XABX","(?i)a(?-i)b|c",[trim]))),
     <<"XABX">> = iolist_to_binary(join(re:split("XABX","(?i)a(?-i)b|c",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"XABX">> = iolist_to_binary(join(re:split("XABX","(?i)a(?-i)b|c",[]))), 
+                                                                                                                                                                                  2}]))),
+    <<"XABX">> = iolist_to_binary(join(re:split("XABX","(?i)a(?-i)b|c",[]))),
     <<"">> = iolist_to_binary(join(re:split("
-
","[\\x00-\\xff\\s]+",[trim]))), 
+
","[\\x00-\\xff\\s]+",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("
-
","[\\x00-\\xff\\s]+",[{parts,2}]))), 
+
","[\\x00-\\xff\\s]+",[{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("
-
","[\\x00-\\xff\\s]+",[]))), 
+
","[\\x00-\\xff\\s]+",[]))),
     <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1",[caseless,
-                                                                                                                                                                     trim]))), 
+                                                                                                                                                                     trim]))),
     <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1",[caseless,
                                                                                                                                                                        {parts,
-                                                                                                                                                                        2}]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1",[caseless]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1",[caseless]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1",[trim]))),
     <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1",[{parts,
-                                                                                                                                                                       2}]))), 
-    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1",[]))), 
+                                                                                                                                                                       2}]))),
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1",[]))),
     <<":a">> = iolist_to_binary(join(re:split("12abc","[^a]*",[caseless,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<":abc">> = iolist_to_binary(join(re:split("12abc","[^a]*",[caseless,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("12abc","[^a]*",[caseless]))), 
+                                                                                                                                                                     2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("12abc","[^a]*",[caseless]))),
     <<":A">> = iolist_to_binary(join(re:split("12ABC","[^a]*",[caseless,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<":ABC">> = iolist_to_binary(join(re:split("12ABC","[^a]*",[caseless,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<":A:">> = iolist_to_binary(join(re:split("12ABC","[^a]*",[caseless]))), 
+                                                                                                                                                                     2}]))),
+    <<":A:">> = iolist_to_binary(join(re:split("12ABC","[^a]*",[caseless]))),
     <<":a">> = iolist_to_binary(join(re:split("12abc","[^a]*+",[caseless,
-                                                                                                                                                                    trim]))), 
+                                                                                                                                                                    trim]))),
     <<":abc">> = iolist_to_binary(join(re:split("12abc","[^a]*+",[caseless,
                                                                                                                                                                       {parts,
-                                                                                                                                                                       2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("12abc","[^a]*+",[caseless]))), 
+                                                                                                                                                                       2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("12abc","[^a]*+",[caseless]))),
     <<":A">> = iolist_to_binary(join(re:split("12ABC","[^a]*+",[caseless,
-                                                                                                                                                                    trim]))), 
+                                                                                                                                                                    trim]))),
     <<":ABC">> = iolist_to_binary(join(re:split("12ABC","[^a]*+",[caseless,
                                                                                                                                                                       {parts,
-                                                                                                                                                                       2}]))), 
-    <<":A:">> = iolist_to_binary(join(re:split("12ABC","[^a]*+",[caseless]))), 
+                                                                                                                                                                       2}]))),
+    <<":A:">> = iolist_to_binary(join(re:split("12ABC","[^a]*+",[caseless]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","[^a]*?X",[caseless,
-                                                                                                                                                                                trim]))), 
+                                                                                                                                                                                trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","[^a]*?X",[caseless,
                                                                                                                                                                                   {parts,
-                                                                                                                                                                                   2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","[^a]*?X",[caseless]))), 
+                                                                                                                                                                                   2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","[^a]*?X",[caseless]))),
     <<"12abc">> = iolist_to_binary(join(re:split("12abc","[^a]*?X",[caseless,
-                                                                                                                                                                      trim]))), 
+                                                                                                                                                                      trim]))),
     <<"12abc">> = iolist_to_binary(join(re:split("12abc","[^a]*?X",[caseless,
                                                                                                                                                                         {parts,
-                                                                                                                                                                         2}]))), 
-    <<"12abc">> = iolist_to_binary(join(re:split("12abc","[^a]*?X",[caseless]))), 
+                                                                                                                                                                         2}]))),
+    <<"12abc">> = iolist_to_binary(join(re:split("12abc","[^a]*?X",[caseless]))),
     <<"12ABC">> = iolist_to_binary(join(re:split("12ABC","[^a]*?X",[caseless,
-                                                                                                                                                                      trim]))), 
+                                                                                                                                                                      trim]))),
     <<"12ABC">> = iolist_to_binary(join(re:split("12ABC","[^a]*?X",[caseless,
                                                                                                                                                                         {parts,
-                                                                                                                                                                         2}]))), 
-    <<"12ABC">> = iolist_to_binary(join(re:split("12ABC","[^a]*?X",[caseless]))), 
+                                                                                                                                                                         2}]))),
+    <<"12ABC">> = iolist_to_binary(join(re:split("12ABC","[^a]*?X",[caseless]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","[^a]+?X",[caseless,
-                                                                                                                                                                                trim]))), 
+                                                                                                                                                                                trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","[^a]+?X",[caseless,
                                                                                                                                                                                   {parts,
-                                                                                                                                                                                   2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","[^a]+?X",[caseless]))), 
+                                                                                                                                                                                   2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","[^a]+?X",[caseless]))),
     <<"12abc">> = iolist_to_binary(join(re:split("12abc","[^a]+?X",[caseless,
-                                                                                                                                                                      trim]))), 
+                                                                                                                                                                      trim]))),
     <<"12abc">> = iolist_to_binary(join(re:split("12abc","[^a]+?X",[caseless,
                                                                                                                                                                         {parts,
-                                                                                                                                                                         2}]))), 
-    <<"12abc">> = iolist_to_binary(join(re:split("12abc","[^a]+?X",[caseless]))), 
+                                                                                                                                                                         2}]))),
+    <<"12abc">> = iolist_to_binary(join(re:split("12abc","[^a]+?X",[caseless]))),
     <<"12ABC">> = iolist_to_binary(join(re:split("12ABC","[^a]+?X",[caseless,
-                                                                                                                                                                      trim]))), 
+                                                                                                                                                                      trim]))),
     <<"12ABC">> = iolist_to_binary(join(re:split("12ABC","[^a]+?X",[caseless,
                                                                                                                                                                         {parts,
-                                                                                                                                                                         2}]))), 
-    <<"12ABC">> = iolist_to_binary(join(re:split("12ABC","[^a]+?X",[caseless]))), 
+                                                                                                                                                                         2}]))),
+    <<"12ABC">> = iolist_to_binary(join(re:split("12ABC","[^a]+?X",[caseless]))),
     <<"12a:b">> = iolist_to_binary(join(re:split("12aXbcX","[^a]?X",[caseless,
-                                                                                                                                                                        trim]))), 
+                                                                                                                                                                        trim]))),
     <<"12a:bcX">> = iolist_to_binary(join(re:split("12aXbcX","[^a]?X",[caseless,
                                                                                                                                                                           {parts,
-                                                                                                                                                                           2}]))), 
-    <<"12a:b:">> = iolist_to_binary(join(re:split("12aXbcX","[^a]?X",[caseless]))), 
+                                                                                                                                                                           2}]))),
+    <<"12a:b:">> = iolist_to_binary(join(re:split("12aXbcX","[^a]?X",[caseless]))),
     <<"12A:B">> = iolist_to_binary(join(re:split("12AXBCX","[^a]?X",[caseless,
-                                                                                                                                                                        trim]))), 
+                                                                                                                                                                        trim]))),
     <<"12A:BCX">> = iolist_to_binary(join(re:split("12AXBCX","[^a]?X",[caseless,
                                                                                                                                                                           {parts,
-                                                                                                                                                                           2}]))), 
-    <<"12A:B:">> = iolist_to_binary(join(re:split("12AXBCX","[^a]?X",[caseless]))), 
+                                                                                                                                                                           2}]))),
+    <<"12A:B:">> = iolist_to_binary(join(re:split("12AXBCX","[^a]?X",[caseless]))),
     <<"B">> = iolist_to_binary(join(re:split("BCX","[^a]?X",[caseless,
-                                                                                                                                                                trim]))), 
+                                                                                                                                                                trim]))),
     <<"B:">> = iolist_to_binary(join(re:split("BCX","[^a]?X",[caseless,
                                                                                                                                                                   {parts,
-                                                                                                                                                                   2}]))), 
-    <<"B:">> = iolist_to_binary(join(re:split("BCX","[^a]?X",[caseless]))), 
+                                                                                                                                                                   2}]))),
+    <<"B:">> = iolist_to_binary(join(re:split("BCX","[^a]?X",[caseless]))),
     <<"12a:b">> = iolist_to_binary(join(re:split("12aXbcX","[^a]??X",[caseless,
-                                                                                                                                                                          trim]))), 
+                                                                                                                                                                          trim]))),
     <<"12a:bcX">> = iolist_to_binary(join(re:split("12aXbcX","[^a]??X",[caseless,
                                                                                                                                                                             {parts,
-                                                                                                                                                                             2}]))), 
-    <<"12a:b:">> = iolist_to_binary(join(re:split("12aXbcX","[^a]??X",[caseless]))), 
+                                                                                                                                                                             2}]))),
+    <<"12a:b:">> = iolist_to_binary(join(re:split("12aXbcX","[^a]??X",[caseless]))),
     <<"12A:B">> = iolist_to_binary(join(re:split("12AXBCX","[^a]??X",[caseless,
-                                                                                                                                                                          trim]))), 
+                                                                                                                                                                          trim]))),
     <<"12A:BCX">> = iolist_to_binary(join(re:split("12AXBCX","[^a]??X",[caseless,
                                                                                                                                                                             {parts,
-                                                                                                                                                                             2}]))), 
-    <<"12A:B:">> = iolist_to_binary(join(re:split("12AXBCX","[^a]??X",[caseless]))), 
+                                                                                                                                                                             2}]))),
+    <<"12A:B:">> = iolist_to_binary(join(re:split("12AXBCX","[^a]??X",[caseless]))),
     <<"B">> = iolist_to_binary(join(re:split("BCX","[^a]??X",[caseless,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<"B:">> = iolist_to_binary(join(re:split("BCX","[^a]??X",[caseless,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<"B:">> = iolist_to_binary(join(re:split("BCX","[^a]??X",[caseless]))), 
+                                                                                                                                                                     2}]))),
+    <<"B:">> = iolist_to_binary(join(re:split("BCX","[^a]??X",[caseless]))),
     <<"12aXb">> = iolist_to_binary(join(re:split("12aXbcX","[^a]?+X",[caseless,
-                                                                                                                                                                          trim]))), 
+                                                                                                                                                                          trim]))),
     <<"12aXb:">> = iolist_to_binary(join(re:split("12aXbcX","[^a]?+X",[caseless,
                                                                                                                                                                             {parts,
-                                                                                                                                                                             2}]))), 
-    <<"12aXb:">> = iolist_to_binary(join(re:split("12aXbcX","[^a]?+X",[caseless]))), 
+                                                                                                                                                                             2}]))),
+    <<"12aXb:">> = iolist_to_binary(join(re:split("12aXbcX","[^a]?+X",[caseless]))),
     <<"12AXB">> = iolist_to_binary(join(re:split("12AXBCX","[^a]?+X",[caseless,
-                                                                                                                                                                          trim]))), 
+                                                                                                                                                                          trim]))),
     <<"12AXB:">> = iolist_to_binary(join(re:split("12AXBCX","[^a]?+X",[caseless,
                                                                                                                                                                             {parts,
-                                                                                                                                                                             2}]))), 
-    <<"12AXB:">> = iolist_to_binary(join(re:split("12AXBCX","[^a]?+X",[caseless]))), 
+                                                                                                                                                                             2}]))),
+    <<"12AXB:">> = iolist_to_binary(join(re:split("12AXBCX","[^a]?+X",[caseless]))),
     <<"B">> = iolist_to_binary(join(re:split("BCX","[^a]?+X",[caseless,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<"B:">> = iolist_to_binary(join(re:split("BCX","[^a]?+X",[caseless,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<"B:">> = iolist_to_binary(join(re:split("BCX","[^a]?+X",[caseless]))), 
+                                                                                                                                                                     2}]))),
+    <<"B:">> = iolist_to_binary(join(re:split("BCX","[^a]?+X",[caseless]))),
     <<"a">> = iolist_to_binary(join(re:split("abcdef","[^a]{2,3}",[caseless,
-                                                                                                                                                                            trim]))), 
+                                                                                                                                                                            trim]))),
     <<"a:ef">> = iolist_to_binary(join(re:split("abcdef","[^a]{2,3}",[caseless,
                                                                                                                                                                               {parts,
-                                                                                                                                                                               2}]))), 
-    <<"a::">> = iolist_to_binary(join(re:split("abcdef","[^a]{2,3}",[caseless]))), 
+                                                                                                                                                                               2}]))),
+    <<"a::">> = iolist_to_binary(join(re:split("abcdef","[^a]{2,3}",[caseless]))),
     <<"A">> = iolist_to_binary(join(re:split("ABCDEF","[^a]{2,3}",[caseless,
-                                                                                                                                                                            trim]))), 
+                                                                                                                                                                            trim]))),
     <<"A:EF">> = iolist_to_binary(join(re:split("ABCDEF","[^a]{2,3}",[caseless,
                                                                                                                                                                               {parts,
-                                                                                                                                                                               2}]))), 
-    <<"A::">> = iolist_to_binary(join(re:split("ABCDEF","[^a]{2,3}",[caseless]))), 
+                                                                                                                                                                               2}]))),
+    <<"A::">> = iolist_to_binary(join(re:split("ABCDEF","[^a]{2,3}",[caseless]))),
     <<"a::f">> = iolist_to_binary(join(re:split("abcdef","[^a]{2,3}?",[caseless,
-                                                                                                                                                                              trim]))), 
+                                                                                                                                                                              trim]))),
     <<"a:def">> = iolist_to_binary(join(re:split("abcdef","[^a]{2,3}?",[caseless,
                                                                                                                                                                                 {parts,
-                                                                                                                                                                                 2}]))), 
-    <<"a::f">> = iolist_to_binary(join(re:split("abcdef","[^a]{2,3}?",[caseless]))), 
+                                                                                                                                                                                 2}]))),
+    <<"a::f">> = iolist_to_binary(join(re:split("abcdef","[^a]{2,3}?",[caseless]))),
     <<"A::F">> = iolist_to_binary(join(re:split("ABCDEF","[^a]{2,3}?",[caseless,
-                                                                                                                                                                              trim]))), 
+                                                                                                                                                                              trim]))),
     <<"A:DEF">> = iolist_to_binary(join(re:split("ABCDEF","[^a]{2,3}?",[caseless,
                                                                                                                                                                                 {parts,
-                                                                                                                                                                                 2}]))), 
-    <<"A::F">> = iolist_to_binary(join(re:split("ABCDEF","[^a]{2,3}?",[caseless]))), 
+                                                                                                                                                                                 2}]))),
+    <<"A::F">> = iolist_to_binary(join(re:split("ABCDEF","[^a]{2,3}?",[caseless]))),
     <<"a">> = iolist_to_binary(join(re:split("abcdef","[^a]{2,3}+",[caseless,
-                                                                                                                                                                              trim]))), 
+                                                                                                                                                                              trim]))),
     <<"a:ef">> = iolist_to_binary(join(re:split("abcdef","[^a]{2,3}+",[caseless,
                                                                                                                                                                                 {parts,
-                                                                                                                                                                                 2}]))), 
-    <<"a::">> = iolist_to_binary(join(re:split("abcdef","[^a]{2,3}+",[caseless]))), 
+                                                                                                                                                                                 2}]))),
+    <<"a::">> = iolist_to_binary(join(re:split("abcdef","[^a]{2,3}+",[caseless]))),
     <<"A">> = iolist_to_binary(join(re:split("ABCDEF","[^a]{2,3}+",[caseless,
-                                                                                                                                                                              trim]))), 
+                                                                                                                                                                              trim]))),
     <<"A:EF">> = iolist_to_binary(join(re:split("ABCDEF","[^a]{2,3}+",[caseless,
                                                                                                                                                                                 {parts,
-                                                                                                                                                                                 2}]))), 
-    <<"A::">> = iolist_to_binary(join(re:split("ABCDEF","[^a]{2,3}+",[caseless]))), 
-    <<"">> = iolist_to_binary(join(re:split("Z","((a|)+)+Z",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<"A::">> = iolist_to_binary(join(re:split("ABCDEF","[^a]{2,3}+",[caseless]))),
+    <<"">> = iolist_to_binary(join(re:split("Z","((a|)+)+Z",[trim]))),
     <<":::">> = iolist_to_binary(join(re:split("Z","((a|)+)+Z",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<":::">> = iolist_to_binary(join(re:split("Z","((a|)+)+Z",[]))), 
+                                                                                                                                                                    2}]))),
+    <<":::">> = iolist_to_binary(join(re:split("Z","((a|)+)+Z",[]))),
     ok.
 run38() ->
-    <<"::a">> = iolist_to_binary(join(re:split("ac","(a)b|(a)c",[trim]))), 
+    <<"::a">> = iolist_to_binary(join(re:split("ac","(a)b|(a)c",[trim]))),
     <<"::a:">> = iolist_to_binary(join(re:split("ac","(a)b|(a)c",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<"::a:">> = iolist_to_binary(join(re:split("ac","(a)b|(a)c",[]))), 
-    <<"::a">> = iolist_to_binary(join(re:split("ac","(?>(a))b|(a)c",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<"::a:">> = iolist_to_binary(join(re:split("ac","(a)b|(a)c",[]))),
+    <<"::a">> = iolist_to_binary(join(re:split("ac","(?>(a))b|(a)c",[trim]))),
     <<"::a:">> = iolist_to_binary(join(re:split("ac","(?>(a))b|(a)c",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<"::a:">> = iolist_to_binary(join(re:split("ac","(?>(a))b|(a)c",[]))), 
-    <<"::a">> = iolist_to_binary(join(re:split("ac","(?=(a))ab|(a)c",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<"::a:">> = iolist_to_binary(join(re:split("ac","(?>(a))b|(a)c",[]))),
+    <<"::a">> = iolist_to_binary(join(re:split("ac","(?=(a))ab|(a)c",[trim]))),
     <<"::a:">> = iolist_to_binary(join(re:split("ac","(?=(a))ab|(a)c",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<"::a:">> = iolist_to_binary(join(re:split("ac","(?=(a))ab|(a)c",[]))), 
-    <<":ac::a">> = iolist_to_binary(join(re:split("ac","((?>(a))b|(a)c)",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<"::a:">> = iolist_to_binary(join(re:split("ac","(?=(a))ab|(a)c",[]))),
+    <<":ac::a">> = iolist_to_binary(join(re:split("ac","((?>(a))b|(a)c)",[trim]))),
     <<":ac::a:">> = iolist_to_binary(join(re:split("ac","((?>(a))b|(a)c)",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<":ac::a:">> = iolist_to_binary(join(re:split("ac","((?>(a))b|(a)c)",[]))), 
-    <<":ac::a">> = iolist_to_binary(join(re:split("ac","((?>(a))b|(a)c)++",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<":ac::a:">> = iolist_to_binary(join(re:split("ac","((?>(a))b|(a)c)",[]))),
+    <<":ac::a">> = iolist_to_binary(join(re:split("ac","((?>(a))b|(a)c)++",[trim]))),
     <<":ac::a:">> = iolist_to_binary(join(re:split("ac","((?>(a))b|(a)c)++",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<":ac::a:">> = iolist_to_binary(join(re:split("ac","((?>(a))b|(a)c)++",[]))), 
-    <<"::a">> = iolist_to_binary(join(re:split("ac","(?:(?>(a))b|(a)c)++",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<":ac::a:">> = iolist_to_binary(join(re:split("ac","((?>(a))b|(a)c)++",[]))),
+    <<"::a">> = iolist_to_binary(join(re:split("ac","(?:(?>(a))b|(a)c)++",[trim]))),
     <<"::a:">> = iolist_to_binary(join(re:split("ac","(?:(?>(a))b|(a)c)++",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<"::a:">> = iolist_to_binary(join(re:split("ac","(?:(?>(a))b|(a)c)++",[]))), 
-    <<"::a:ac">> = iolist_to_binary(join(re:split("ac","(?=(?>(a))b|(a)c)(..)",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<"::a:">> = iolist_to_binary(join(re:split("ac","(?:(?>(a))b|(a)c)++",[]))),
+    <<"::a:ac">> = iolist_to_binary(join(re:split("ac","(?=(?>(a))b|(a)c)(..)",[trim]))),
     <<"::a:ac:">> = iolist_to_binary(join(re:split("ac","(?=(?>(a))b|(a)c)(..)",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"::a:ac:">> = iolist_to_binary(join(re:split("ac","(?=(?>(a))b|(a)c)(..)",[]))), 
-    <<"::a">> = iolist_to_binary(join(re:split("ac","(?>(?>(a))b|(a)c)",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<"::a:ac:">> = iolist_to_binary(join(re:split("ac","(?=(?>(a))b|(a)c)(..)",[]))),
+    <<"::a">> = iolist_to_binary(join(re:split("ac","(?>(?>(a))b|(a)c)",[trim]))),
     <<"::a:">> = iolist_to_binary(join(re:split("ac","(?>(?>(a))b|(a)c)",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<"::a:">> = iolist_to_binary(join(re:split("ac","(?>(?>(a))b|(a)c)",[]))), 
-    <<":aaaabaaabaabab:aaa:aabab">> = iolist_to_binary(join(re:split("aaaabaaabaabab","((?>(a+)b)+(aabab))",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<"::a:">> = iolist_to_binary(join(re:split("ac","(?>(?>(a))b|(a)c)",[]))),
+    <<":aaaabaaabaabab:aaa:aabab">> = iolist_to_binary(join(re:split("aaaabaaabaabab","((?>(a+)b)+(aabab))",[trim]))),
     <<":aaaabaaabaabab:aaa:aabab:">> = iolist_to_binary(join(re:split("aaaabaaabaabab","((?>(a+)b)+(aabab))",[{parts,
-                                                                                                                                                                                                                  2}]))), 
-    <<":aaaabaaabaabab:aaa:aabab:">> = iolist_to_binary(join(re:split("aaaabaaabaabab","((?>(a+)b)+(aabab))",[]))), 
-    <<"aabc">> = iolist_to_binary(join(re:split("aabc","(?>a+|ab)+?c",[trim]))), 
+                                                                                                                                                                                                                  2}]))),
+    <<":aaaabaaabaabab:aaa:aabab:">> = iolist_to_binary(join(re:split("aaaabaaabaabab","((?>(a+)b)+(aabab))",[]))),
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","(?>a+|ab)+?c",[trim]))),
     <<"aabc">> = iolist_to_binary(join(re:split("aabc","(?>a+|ab)+?c",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<"aabc">> = iolist_to_binary(join(re:split("aabc","(?>a+|ab)+?c",[]))), 
-    <<"aabc">> = iolist_to_binary(join(re:split("aabc","(?>a+|ab)+c",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","(?>a+|ab)+?c",[]))),
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","(?>a+|ab)+c",[trim]))),
     <<"aabc">> = iolist_to_binary(join(re:split("aabc","(?>a+|ab)+c",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<"aabc">> = iolist_to_binary(join(re:split("aabc","(?>a+|ab)+c",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aabc","(?:a+|ab)+c",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","(?>a+|ab)+c",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aabc","(?:a+|ab)+c",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aabc","(?:a+|ab)+c",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aabc","(?:a+|ab)+c",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("a","(?(?=(a))a)",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aabc","(?:a+|ab)+c",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("a","(?(?=(a))a)",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("a","(?(?=(a))a)",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("a","(?(?=(a))a)",[]))), 
-    <<":a:b">> = iolist_to_binary(join(re:split("ab","(?(?=(a))a)(b)",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("a","(?(?=(a))a)",[]))),
+    <<":a:b">> = iolist_to_binary(join(re:split("ab","(?(?=(a))a)(b)",[trim]))),
     <<":a:b:">> = iolist_to_binary(join(re:split("ab","(?(?=(a))a)(b)",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<":a:b:">> = iolist_to_binary(join(re:split("ab","(?(?=(a))a)(b)",[]))), 
-    <<"aaaabc">> = iolist_to_binary(join(re:split("aaaabc","^(?:a|ab)++c",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<":a:b:">> = iolist_to_binary(join(re:split("ab","(?(?=(a))a)(b)",[]))),
+    <<"aaaabc">> = iolist_to_binary(join(re:split("aaaabc","^(?:a|ab)++c",[trim]))),
     <<"aaaabc">> = iolist_to_binary(join(re:split("aaaabc","^(?:a|ab)++c",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<"aaaabc">> = iolist_to_binary(join(re:split("aaaabc","^(?:a|ab)++c",[]))), 
-    <<"aaaabc">> = iolist_to_binary(join(re:split("aaaabc","^(?>a|ab)++c",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<"aaaabc">> = iolist_to_binary(join(re:split("aaaabc","^(?:a|ab)++c",[]))),
+    <<"aaaabc">> = iolist_to_binary(join(re:split("aaaabc","^(?>a|ab)++c",[trim]))),
     <<"aaaabc">> = iolist_to_binary(join(re:split("aaaabc","^(?>a|ab)++c",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<"aaaabc">> = iolist_to_binary(join(re:split("aaaabc","^(?>a|ab)++c",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaabc","^(?:a|ab)+c",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<"aaaabc">> = iolist_to_binary(join(re:split("aaaabc","^(?>a|ab)++c",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaabc","^(?:a|ab)+c",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaabc","^(?:a|ab)+c",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaabc","^(?:a|ab)+c",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("xyz","(?=abc){0}xyz",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaabc","^(?:a|ab)+c",[]))),
+    <<"">> = iolist_to_binary(join(re:split("xyz","(?=abc){0}xyz",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("xyz","(?=abc){0}xyz",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("xyz","(?=abc){0}xyz",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?=abc){1}xyz",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("xyz","(?=abc){0}xyz",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?=abc){1}xyz",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?=abc){1}xyz",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?=abc){1}xyz",[]))), 
-    <<"xyz">> = iolist_to_binary(join(re:split("xyz","(?=abc){1}xyz",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?=abc){1}xyz",[]))),
+    <<"xyz">> = iolist_to_binary(join(re:split("xyz","(?=abc){1}xyz",[trim]))),
     <<"xyz">> = iolist_to_binary(join(re:split("xyz","(?=abc){1}xyz",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<"xyz">> = iolist_to_binary(join(re:split("xyz","(?=abc){1}xyz",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("ab","(?=(a))?.",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<"xyz">> = iolist_to_binary(join(re:split("xyz","(?=abc){1}xyz",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("ab","(?=(a))?.",[trim]))),
     <<":a:b">> = iolist_to_binary(join(re:split("ab","(?=(a))?.",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<":a:::">> = iolist_to_binary(join(re:split("ab","(?=(a))?.",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("bc","(?=(a))?.",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<":a:::">> = iolist_to_binary(join(re:split("ab","(?=(a))?.",[]))),
+    <<"">> = iolist_to_binary(join(re:split("bc","(?=(a))?.",[trim]))),
     <<"::c">> = iolist_to_binary(join(re:split("bc","(?=(a))?.",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<"::::">> = iolist_to_binary(join(re:split("bc","(?=(a))?.",[]))), 
+                                                                                                                                                                      2}]))),
+    <<"::::">> = iolist_to_binary(join(re:split("bc","(?=(a))?.",[]))),
     ok.
 run39() ->
-    <<"">> = iolist_to_binary(join(re:split("ab","(?=(a))??.",[trim]))), 
+    <<"">> = iolist_to_binary(join(re:split("ab","(?=(a))??.",[trim]))),
     <<"::b">> = iolist_to_binary(join(re:split("ab","(?=(a))??.",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"::::">> = iolist_to_binary(join(re:split("ab","(?=(a))??.",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("bc","(?=(a))??.",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"::::">> = iolist_to_binary(join(re:split("ab","(?=(a))??.",[]))),
+    <<"">> = iolist_to_binary(join(re:split("bc","(?=(a))??.",[trim]))),
     <<"::c">> = iolist_to_binary(join(re:split("bc","(?=(a))??.",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"::::">> = iolist_to_binary(join(re:split("bc","(?=(a))??.",[]))), 
-    <<":b">> = iolist_to_binary(join(re:split("abd","^(?=(?1))?[az]([abc])d",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"::::">> = iolist_to_binary(join(re:split("bc","(?=(a))??.",[]))),
+    <<":b">> = iolist_to_binary(join(re:split("abd","^(?=(?1))?[az]([abc])d",[trim]))),
     <<":b:">> = iolist_to_binary(join(re:split("abd","^(?=(?1))?[az]([abc])d",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<":b:">> = iolist_to_binary(join(re:split("abd","^(?=(?1))?[az]([abc])d",[]))), 
-    <<":c:xx">> = iolist_to_binary(join(re:split("zcdxx","^(?=(?1))?[az]([abc])d",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<":b:">> = iolist_to_binary(join(re:split("abd","^(?=(?1))?[az]([abc])d",[]))),
+    <<":c:xx">> = iolist_to_binary(join(re:split("zcdxx","^(?=(?1))?[az]([abc])d",[trim]))),
     <<":c:xx">> = iolist_to_binary(join(re:split("zcdxx","^(?=(?1))?[az]([abc])d",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<":c:xx">> = iolist_to_binary(join(re:split("zcdxx","^(?=(?1))?[az]([abc])d",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaaa","^(?!a){0}\\w+",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<":c:xx">> = iolist_to_binary(join(re:split("zcdxx","^(?=(?1))?[az]([abc])d",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaaa","^(?!a){0}\\w+",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaaa","^(?!a){0}\\w+",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaaa","^(?!a){0}\\w+",[]))), 
-    <<"abc:abc">> = iolist_to_binary(join(re:split("abcxyz","(?<=(abc))?xyz",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaaa","^(?!a){0}\\w+",[]))),
+    <<"abc:abc">> = iolist_to_binary(join(re:split("abcxyz","(?<=(abc))?xyz",[trim]))),
     <<"abc:abc:">> = iolist_to_binary(join(re:split("abcxyz","(?<=(abc))?xyz",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"abc:abc:">> = iolist_to_binary(join(re:split("abcxyz","(?<=(abc))?xyz",[]))), 
-    <<"pqr">> = iolist_to_binary(join(re:split("pqrxyz","(?<=(abc))?xyz",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<"abc:abc:">> = iolist_to_binary(join(re:split("abcxyz","(?<=(abc))?xyz",[]))),
+    <<"pqr">> = iolist_to_binary(join(re:split("pqrxyz","(?<=(abc))?xyz",[trim]))),
     <<"pqr::">> = iolist_to_binary(join(re:split("pqrxyz","(?<=(abc))?xyz",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"pqr::">> = iolist_to_binary(join(re:split("pqrxyz","(?<=(abc))?xyz",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("ggg<<<aaa>>>","^[\\g<a>]+",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<"pqr::">> = iolist_to_binary(join(re:split("pqrxyz","(?<=(abc))?xyz",[]))),
+    <<"">> = iolist_to_binary(join(re:split("ggg<<<aaa>>>","^[\\g<a>]+",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("ggg<<<aaa>>>","^[\\g<a>]+",[{parts,
-                                                                                                                                                                                             2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ggg<<<aaa>>>","^[\\g<a>]+",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\g<a>]+",[trim]))), 
+                                                                                                                                                                                             2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ggg<<<aaa>>>","^[\\g<a>]+",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\g<a>]+",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\g<a>]+",[{parts,
-                                                                                                                                                                                         2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\g<a>]+",[]))), 
-    <<"\\ga">> = iolist_to_binary(join(re:split("\\ga","^[\\g<a>]+",[trim]))), 
+                                                                                                                                                                                         2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\g<a>]+",[]))),
+    <<"\\ga">> = iolist_to_binary(join(re:split("\\ga","^[\\g<a>]+",[trim]))),
     <<"\\ga">> = iolist_to_binary(join(re:split("\\ga","^[\\g<a>]+",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<"\\ga">> = iolist_to_binary(join(re:split("\\ga","^[\\g<a>]+",[]))), 
-    <<":xyz">> = iolist_to_binary(join(re:split("gggagagaxyz","^[\\ga]+",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<"\\ga">> = iolist_to_binary(join(re:split("\\ga","^[\\g<a>]+",[]))),
+    <<":xyz">> = iolist_to_binary(join(re:split("gggagagaxyz","^[\\ga]+",[trim]))),
     <<":xyz">> = iolist_to_binary(join(re:split("gggagagaxyz","^[\\ga]+",[{parts,
-                                                                                                                                                                                       2}]))), 
-    <<":xyz">> = iolist_to_binary(join(re:split("gggagagaxyz","^[\\ga]+",[]))), 
-    <<":Z">> = iolist_to_binary(join(re:split("aaaa444:::Z","^[:a[:digit:]]+",[trim]))), 
+                                                                                                                                                                                       2}]))),
+    <<":xyz">> = iolist_to_binary(join(re:split("gggagagaxyz","^[\\ga]+",[]))),
+    <<":Z">> = iolist_to_binary(join(re:split("aaaa444:::Z","^[:a[:digit:]]+",[trim]))),
     <<":Z">> = iolist_to_binary(join(re:split("aaaa444:::Z","^[:a[:digit:]]+",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<":Z">> = iolist_to_binary(join(re:split("aaaa444:::Z","^[:a[:digit:]]+",[]))), 
-    <<":Z">> = iolist_to_binary(join(re:split("aaaa444:::bbbZ","^[:a[:digit:]:b]+",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<":Z">> = iolist_to_binary(join(re:split("aaaa444:::Z","^[:a[:digit:]]+",[]))),
+    <<":Z">> = iolist_to_binary(join(re:split("aaaa444:::bbbZ","^[:a[:digit:]:b]+",[trim]))),
     <<":Z">> = iolist_to_binary(join(re:split("aaaa444:::bbbZ","^[:a[:digit:]:b]+",[{parts,
-                                                                                                                                                                                                              2}]))), 
-    <<":Z">> = iolist_to_binary(join(re:split("aaaa444:::bbbZ","^[:a[:digit:]:b]+",[]))), 
-    <<"">> = iolist_to_binary(join(re:split(":xxx:","[:a]xxx[b:]",[trim]))), 
+                                                                                                                                                                                                              2}]))),
+    <<":Z">> = iolist_to_binary(join(re:split("aaaa444:::bbbZ","^[:a[:digit:]:b]+",[]))),
+    <<"">> = iolist_to_binary(join(re:split(":xxx:","[:a]xxx[b:]",[trim]))),
     <<":">> = iolist_to_binary(join(re:split(":xxx:","[:a]xxx[b:]",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split(":xxx:","[:a]xxx[b:]",[]))), 
+                                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split(":xxx:","[:a]xxx[b:]",[]))),
     <<"xaa:c">> = iolist_to_binary(join(re:split("xaabc","(?<=a{2})b",[caseless,
-                                                                                                                                                                            trim]))), 
+                                                                                                                                                                            trim]))),
     <<"xaa:c">> = iolist_to_binary(join(re:split("xaabc","(?<=a{2})b",[caseless,
                                                                                                                                                                               {parts,
-                                                                                                                                                                               2}]))), 
-    <<"xaa:c">> = iolist_to_binary(join(re:split("xaabc","(?<=a{2})b",[caseless]))), 
+                                                                                                                                                                               2}]))),
+    <<"xaa:c">> = iolist_to_binary(join(re:split("xaabc","(?<=a{2})b",[caseless]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=a{2})b",[caseless,
-                                                                                                                                                                                      trim]))), 
+                                                                                                                                                                                      trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=a{2})b",[caseless,
                                                                                                                                                                                         {parts,
-                                                                                                                                                                                         2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=a{2})b",[caseless]))), 
+                                                                                                                                                                                         2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=a{2})b",[caseless]))),
     <<"xabc">> = iolist_to_binary(join(re:split("xabc","(?<=a{2})b",[caseless,
-                                                                                                                                                                          trim]))), 
+                                                                                                                                                                          trim]))),
     <<"xabc">> = iolist_to_binary(join(re:split("xabc","(?<=a{2})b",[caseless,
                                                                                                                                                                             {parts,
-                                                                                                                                                                             2}]))), 
-    <<"xabc">> = iolist_to_binary(join(re:split("xabc","(?<=a{2})b",[caseless]))), 
+                                                                                                                                                                             2}]))),
+    <<"xabc">> = iolist_to_binary(join(re:split("xabc","(?<=a{2})b",[caseless]))),
     <<"xa:c">> = iolist_to_binary(join(re:split("xabc","(?<!a{2})b",[caseless,
-                                                                                                                                                                          trim]))), 
+                                                                                                                                                                          trim]))),
     <<"xa:c">> = iolist_to_binary(join(re:split("xabc","(?<!a{2})b",[caseless,
                                                                                                                                                                             {parts,
-                                                                                                                                                                             2}]))), 
-    <<"xa:c">> = iolist_to_binary(join(re:split("xabc","(?<!a{2})b",[caseless]))), 
+                                                                                                                                                                             2}]))),
+    <<"xa:c">> = iolist_to_binary(join(re:split("xabc","(?<!a{2})b",[caseless]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<!a{2})b",[caseless,
-                                                                                                                                                                                      trim]))), 
+                                                                                                                                                                                      trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<!a{2})b",[caseless,
                                                                                                                                                                                         {parts,
-                                                                                                                                                                                         2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<!a{2})b",[caseless]))), 
+                                                                                                                                                                                         2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<!a{2})b",[caseless]))),
     <<"xaabc">> = iolist_to_binary(join(re:split("xaabc","(?<!a{2})b",[caseless,
-                                                                                                                                                                            trim]))), 
+                                                                                                                                                                            trim]))),
     <<"xaabc">> = iolist_to_binary(join(re:split("xaabc","(?<!a{2})b",[caseless,
                                                                                                                                                                               {parts,
-                                                                                                                                                                               2}]))), 
-    <<"xaabc">> = iolist_to_binary(join(re:split("xaabc","(?<!a{2})b",[caseless]))), 
-    <<"xa ">> = iolist_to_binary(join(re:split("xa c","(?<=a\\h)c",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<"xaabc">> = iolist_to_binary(join(re:split("xaabc","(?<!a{2})b",[caseless]))),
+    <<"xa ">> = iolist_to_binary(join(re:split("xa c","(?<=a\\h)c",[trim]))),
     <<"xa :">> = iolist_to_binary(join(re:split("xa c","(?<=a\\h)c",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<"xa :">> = iolist_to_binary(join(re:split("xa c","(?<=a\\h)c",[]))), 
-    <<"axx:c">> = iolist_to_binary(join(re:split("axxbc","(?<=[^a]{2})b",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<"xa :">> = iolist_to_binary(join(re:split("xa c","(?<=a\\h)c",[]))),
+    <<"axx:c">> = iolist_to_binary(join(re:split("axxbc","(?<=[^a]{2})b",[trim]))),
     <<"axx:c">> = iolist_to_binary(join(re:split("axxbc","(?<=[^a]{2})b",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<"axx:c">> = iolist_to_binary(join(re:split("axxbc","(?<=[^a]{2})b",[]))), 
-    <<"aAA:c">> = iolist_to_binary(join(re:split("aAAbc","(?<=[^a]{2})b",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<"axx:c">> = iolist_to_binary(join(re:split("axxbc","(?<=[^a]{2})b",[]))),
+    <<"aAA:c">> = iolist_to_binary(join(re:split("aAAbc","(?<=[^a]{2})b",[trim]))),
     <<"aAA:c">> = iolist_to_binary(join(re:split("aAAbc","(?<=[^a]{2})b",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<"aAA:c">> = iolist_to_binary(join(re:split("aAAbc","(?<=[^a]{2})b",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^a]{2})b",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<"aAA:c">> = iolist_to_binary(join(re:split("aAAbc","(?<=[^a]{2})b",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^a]{2})b",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^a]{2})b",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^a]{2})b",[]))), 
-    <<"xaabc">> = iolist_to_binary(join(re:split("xaabc","(?<=[^a]{2})b",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^a]{2})b",[]))),
+    <<"xaabc">> = iolist_to_binary(join(re:split("xaabc","(?<=[^a]{2})b",[trim]))),
     <<"xaabc">> = iolist_to_binary(join(re:split("xaabc","(?<=[^a]{2})b",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<"xaabc">> = iolist_to_binary(join(re:split("xaabc","(?<=[^a]{2})b",[]))), 
+                                                                                                                                                                                    2}]))),
+    <<"xaabc">> = iolist_to_binary(join(re:split("xaabc","(?<=[^a]{2})b",[]))),
     <<"axx:c">> = iolist_to_binary(join(re:split("axxbc","(?<=[^a]{2})b",[caseless,
-                                                                                                                                                                                  trim]))), 
+                                                                                                                                                                                  trim]))),
     <<"axx:c">> = iolist_to_binary(join(re:split("axxbc","(?<=[^a]{2})b",[caseless,
                                                                                                                                                                                     {parts,
-                                                                                                                                                                                     2}]))), 
-    <<"axx:c">> = iolist_to_binary(join(re:split("axxbc","(?<=[^a]{2})b",[caseless]))), 
+                                                                                                                                                                                     2}]))),
+    <<"axx:c">> = iolist_to_binary(join(re:split("axxbc","(?<=[^a]{2})b",[caseless]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^a]{2})b",[caseless,
-                                                                                                                                                                                            trim]))), 
+                                                                                                                                                                                            trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^a]{2})b",[caseless,
                                                                                                                                                                                               {parts,
-                                                                                                                                                                                               2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^a]{2})b",[caseless]))), 
+                                                                                                                                                                                               2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^a]{2})b",[caseless]))),
     <<"aAAbc">> = iolist_to_binary(join(re:split("aAAbc","(?<=[^a]{2})b",[caseless,
-                                                                                                                                                                                  trim]))), 
+                                                                                                                                                                                  trim]))),
     <<"aAAbc">> = iolist_to_binary(join(re:split("aAAbc","(?<=[^a]{2})b",[caseless,
                                                                                                                                                                                     {parts,
-                                                                                                                                                                                     2}]))), 
-    <<"aAAbc">> = iolist_to_binary(join(re:split("aAAbc","(?<=[^a]{2})b",[caseless]))), 
+                                                                                                                                                                                     2}]))),
+    <<"aAAbc">> = iolist_to_binary(join(re:split("aAAbc","(?<=[^a]{2})b",[caseless]))),
     <<"xaabc">> = iolist_to_binary(join(re:split("xaabc","(?<=[^a]{2})b",[caseless,
-                                                                                                                                                                                  trim]))), 
+                                                                                                                                                                                  trim]))),
     <<"xaabc">> = iolist_to_binary(join(re:split("xaabc","(?<=[^a]{2})b",[caseless,
                                                                                                                                                                                     {parts,
-                                                                                                                                                                                     2}]))), 
-    <<"xaabc">> = iolist_to_binary(join(re:split("xaabc","(?<=[^a]{2})b",[caseless]))), 
-    <<"ab">> = iolist_to_binary(join(re:split("abc","(?<=a\\H)c",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<"xaabc">> = iolist_to_binary(join(re:split("xaabc","(?<=[^a]{2})b",[caseless]))),
+    <<"ab">> = iolist_to_binary(join(re:split("abc","(?<=a\\H)c",[trim]))),
     <<"ab:">> = iolist_to_binary(join(re:split("abc","(?<=a\\H)c",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<"ab:">> = iolist_to_binary(join(re:split("abc","(?<=a\\H)c",[]))), 
-    <<"ab">> = iolist_to_binary(join(re:split("abc","(?<=a\\V)c",[trim]))), 
+                                                                                                                                                                           2}]))),
+    <<"ab:">> = iolist_to_binary(join(re:split("abc","(?<=a\\H)c",[]))),
+    <<"ab">> = iolist_to_binary(join(re:split("abc","(?<=a\\V)c",[trim]))),
     <<"ab:">> = iolist_to_binary(join(re:split("abc","(?<=a\\V)c",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<"ab:">> = iolist_to_binary(join(re:split("abc","(?<=a\\V)c",[]))), 
+                                                                                                                                                                           2}]))),
+    <<"ab:">> = iolist_to_binary(join(re:split("abc","(?<=a\\V)c",[]))),
     <<"a
 ">> = iolist_to_binary(join(re:split("a
-c","(?<=a\\v)c",[trim]))), 
+c","(?<=a\\v)c",[trim]))),
     <<"a
 :">> = iolist_to_binary(join(re:split("a
-c","(?<=a\\v)c",[{parts,2}]))), 
+c","(?<=a\\v)c",[{parts,2}]))),
     <<"a
 :">> = iolist_to_binary(join(re:split("a
-c","(?<=a\\v)c",[]))), 
-    <<"X:X">> = iolist_to_binary(join(re:split("XcccddYX","(?(?=c)c|d)++Y",[trim]))), 
+c","(?<=a\\v)c",[]))),
+    <<"X:X">> = iolist_to_binary(join(re:split("XcccddYX","(?(?=c)c|d)++Y",[trim]))),
     <<"X:X">> = iolist_to_binary(join(re:split("XcccddYX","(?(?=c)c|d)++Y",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<"X:X">> = iolist_to_binary(join(re:split("XcccddYX","(?(?=c)c|d)++Y",[]))), 
-    <<"X:X">> = iolist_to_binary(join(re:split("XcccddYX","(?(?=c)c|d)*+Y",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<"X:X">> = iolist_to_binary(join(re:split("XcccddYX","(?(?=c)c|d)++Y",[]))),
+    <<"X:X">> = iolist_to_binary(join(re:split("XcccddYX","(?(?=c)c|d)*+Y",[trim]))),
     <<"X:X">> = iolist_to_binary(join(re:split("XcccddYX","(?(?=c)c|d)*+Y",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<"X:X">> = iolist_to_binary(join(re:split("XcccddYX","(?(?=c)c|d)*+Y",[]))), 
-    <<":aaa">> = iolist_to_binary(join(re:split("aaaaaaa","^(a{2,3}){2,}+a",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<"X:X">> = iolist_to_binary(join(re:split("XcccddYX","(?(?=c)c|d)*+Y",[]))),
+    <<":aaa">> = iolist_to_binary(join(re:split("aaaaaaa","^(a{2,3}){2,}+a",[trim]))),
     <<":aaa:">> = iolist_to_binary(join(re:split("aaaaaaa","^(a{2,3}){2,}+a",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<":aaa:">> = iolist_to_binary(join(re:split("aaaaaaa","^(a{2,3}){2,}+a",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a{2,3}){2,}+a",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<":aaa:">> = iolist_to_binary(join(re:split("aaaaaaa","^(a{2,3}){2,}+a",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a{2,3}){2,}+a",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a{2,3}){2,}+a",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a{2,3}){2,}+a",[]))), 
-    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(a{2,3}){2,}+a",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a{2,3}){2,}+a",[]))),
+    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(a{2,3}){2,}+a",[trim]))),
     <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(a{2,3}){2,}+a",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(a{2,3}){2,}+a",[]))), 
-    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a{2,3}){2,}+a",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(a{2,3}){2,}+a",[]))),
+    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a{2,3}){2,}+a",[trim]))),
     <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a{2,3}){2,}+a",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a{2,3}){2,}+a",[]))), 
+                                                                                                                                                                                                2}]))),
+    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a{2,3}){2,}+a",[]))),
     ok.
 run40() ->
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a{2,3})++a",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a{2,3})++a",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a{2,3})++a",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a{2,3})++a",[]))), 
-    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(a{2,3})++a",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a{2,3})++a",[]))),
+    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(a{2,3})++a",[trim]))),
     <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(a{2,3})++a",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(a{2,3})++a",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a{2,3})*+a",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(a{2,3})++a",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a{2,3})*+a",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a{2,3})*+a",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a{2,3})*+a",[]))), 
-    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(a{2,3})*+a",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a{2,3})*+a",[]))),
+    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(a{2,3})*+a",[trim]))),
     <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(a{2,3})*+a",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(a{2,3})*+a",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abXde","ab\\Cde",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(a{2,3})*+a",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abXde","ab\\Cde",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abXde","ab\\Cde",[{parts,
-                                                                                                                                                                         2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abXde","ab\\Cde",[]))), 
-    <<"abZde">> = iolist_to_binary(join(re:split("abZdeX","(?<=ab\\Cde)X",[trim]))), 
+                                                                                                                                                                         2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abXde","ab\\Cde",[]))),
+    <<"abZde">> = iolist_to_binary(join(re:split("abZdeX","(?<=ab\\Cde)X",[trim]))),
     <<"abZde:">> = iolist_to_binary(join(re:split("abZdeX","(?<=ab\\Cde)X",[{parts,
-                                                                                                                                                                                       2}]))), 
-    <<"abZde:">> = iolist_to_binary(join(re:split("abZdeX","(?<=ab\\Cde)X",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aCb","a[\\CD]b",[trim]))), 
+                                                                                                                                                                                       2}]))),
+    <<"abZde:">> = iolist_to_binary(join(re:split("abZdeX","(?<=ab\\Cde)X",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aCb","a[\\CD]b",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aCb","a[\\CD]b",[{parts,
-                                                                                                                                                                       2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aCb","a[\\CD]b",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aDb","a[\\CD]b",[trim]))), 
+                                                                                                                                                                       2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aCb","a[\\CD]b",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aDb","a[\\CD]b",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aDb","a[\\CD]b",[{parts,
-                                                                                                                                                                       2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aDb","a[\\CD]b",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aJb","a[\\C-X]b",[trim]))), 
+                                                                                                                                                                       2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aDb","a[\\CD]b",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aJb","a[\\C-X]b",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aJb","a[\\C-X]b",[{parts,
-                                                                                                                                                                         2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aJb","a[\\C-X]b",[]))), 
-    <<"X X">> = iolist_to_binary(join(re:split("X X","\\H\\h\\V\\v",[trim]))), 
+                                                                                                                                                                         2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aJb","a[\\C-X]b",[]))),
+    <<"X X">> = iolist_to_binary(join(re:split("X X","\\H\\h\\V\\v",[trim]))),
     <<"X X">> = iolist_to_binary(join(re:split("X X","\\H\\h\\V\\v",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"X X">> = iolist_to_binary(join(re:split("X X","\\H\\h\\V\\v",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("X	X","\\H\\h\\V\\v",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"X X">> = iolist_to_binary(join(re:split("X X","\\H\\h\\V\\v",[]))),
+    <<"">> = iolist_to_binary(join(re:split("X	X","\\H\\h\\V\\v",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("X	X","\\H\\h\\V\\v",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("X	X","\\H\\h\\V\\v",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\H\\h\\V\\v",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("X	X","\\H\\h\\V\\v",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\H\\h\\V\\v",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\H\\h\\V\\v",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\H\\h\\V\\v",[]))), 
-    <<"  X">> = iolist_to_binary(join(re:split("  X","\\H\\h\\V\\v",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\H\\h\\V\\v",[]))),
+    <<"  X">> = iolist_to_binary(join(re:split("  X","\\H\\h\\V\\v",[trim]))),
     <<"  X">> = iolist_to_binary(join(re:split("  X","\\H\\h\\V\\v",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"  X">> = iolist_to_binary(join(re:split("  X","\\H\\h\\V\\v",[]))), 
+                                                                                                                                                                                  2}]))),
+    <<"  X">> = iolist_to_binary(join(re:split("  X","\\H\\h\\V\\v",[]))),
     <<"">> = iolist_to_binary(join(re:split("	  X
-
","\\H*\\h+\\V?\\v{3,4}",[trim]))), 
+
","\\H*\\h+\\V?\\v{3,4}",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("	  X
-
","\\H*\\h+\\V?\\v{3,4}",[{parts,2}]))), 
+
","\\H*\\h+\\V?\\v{3,4}",[{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("	  X
-
","\\H*\\h+\\V?\\v{3,4}",[]))), 
+
","\\H*\\h+\\V?\\v{3,4}",[]))),
     <<"">> = iolist_to_binary(join(re:split("	  
-
","\\H*\\h+\\V?\\v{3,4}",[trim]))), 
+
","\\H*\\h+\\V?\\v{3,4}",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("	  
-
","\\H*\\h+\\V?\\v{3,4}",[{parts,2}]))), 
+
","\\H*\\h+\\V?\\v{3,4}",[{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("	  
-
","\\H*\\h+\\V?\\v{3,4}",[]))), 
+
","\\H*\\h+\\V?\\v{3,4}",[]))),
     <<"">> = iolist_to_binary(join(re:split("	  
-","\\H*\\h+\\V?\\v{3,4}",[trim]))), 
+","\\H*\\h+\\V?\\v{3,4}",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("	  
-","\\H*\\h+\\V?\\v{3,4}",[{parts,2}]))), 
+","\\H*\\h+\\V?\\v{3,4}",[{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("	  
-","\\H*\\h+\\V?\\v{3,4}",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\H*\\h+\\V?\\v{3,4}",[trim]))), 
+","\\H*\\h+\\V?\\v{3,4}",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\H*\\h+\\V?\\v{3,4}",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\H*\\h+\\V?\\v{3,4}",[{parts,
-                                                                                                                                                                                                                2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\H*\\h+\\V?\\v{3,4}",[]))), 
+                                                                                                                                                                                                                2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\H*\\h+\\V?\\v{3,4}",[]))),
     <<"	  
 ">> = iolist_to_binary(join(re:split("	  
-","\\H*\\h+\\V?\\v{3,4}",[trim]))), 
+","\\H*\\h+\\V?\\v{3,4}",[trim]))),
     <<"	  
 ">> = iolist_to_binary(join(re:split("	  
-","\\H*\\h+\\V?\\v{3,4}",[{parts,2}]))), 
+","\\H*\\h+\\V?\\v{3,4}",[{parts,2}]))),
     <<"	  
 ">> = iolist_to_binary(join(re:split("	  
-","\\H*\\h+\\V?\\v{3,4}",[]))), 
-    <<"XY  :E">> = iolist_to_binary(join(re:split("XY  ABCDE","\\H{3,4}",[trim]))), 
+","\\H*\\h+\\V?\\v{3,4}",[]))),
+    <<"XY  :E">> = iolist_to_binary(join(re:split("XY  ABCDE","\\H{3,4}",[trim]))),
     <<"XY  :E">> = iolist_to_binary(join(re:split("XY  ABCDE","\\H{3,4}",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<"XY  :E">> = iolist_to_binary(join(re:split("XY  ABCDE","\\H{3,4}",[]))), 
-    <<"XY  : ST">> = iolist_to_binary(join(re:split("XY  PQR ST","\\H{3,4}",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<"XY  :E">> = iolist_to_binary(join(re:split("XY  ABCDE","\\H{3,4}",[]))),
+    <<"XY  : ST">> = iolist_to_binary(join(re:split("XY  PQR ST","\\H{3,4}",[trim]))),
     <<"XY  : ST">> = iolist_to_binary(join(re:split("XY  PQR ST","\\H{3,4}",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<"XY  : ST">> = iolist_to_binary(join(re:split("XY  PQR ST","\\H{3,4}",[]))), 
-    <<"XY  A:QRS">> = iolist_to_binary(join(re:split("XY  AB    PQRS",".\\h{3,4}.",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<"XY  : ST">> = iolist_to_binary(join(re:split("XY  PQR ST","\\H{3,4}",[]))),
+    <<"XY  A:QRS">> = iolist_to_binary(join(re:split("XY  AB    PQRS",".\\h{3,4}.",[trim]))),
     <<"XY  A:QRS">> = iolist_to_binary(join(re:split("XY  AB    PQRS",".\\h{3,4}.",[{parts,
-                                                                                                                                                                                                 2}]))), 
-    <<"XY  A:QRS">> = iolist_to_binary(join(re:split("XY  AB    PQRS",".\\h{3,4}.",[]))), 
-    <<">">> = iolist_to_binary(join(re:split(">XNNNYZ","\\h*X\\h?\\H+Y\\H?Z",[trim]))), 
+                                                                                                                                                                                                 2}]))),
+    <<"XY  A:QRS">> = iolist_to_binary(join(re:split("XY  AB    PQRS",".\\h{3,4}.",[]))),
+    <<">">> = iolist_to_binary(join(re:split(">XNNNYZ","\\h*X\\h?\\H+Y\\H?Z",[trim]))),
     <<">:">> = iolist_to_binary(join(re:split(">XNNNYZ","\\h*X\\h?\\H+Y\\H?Z",[{parts,
-                                                                                                                                                                                                        2}]))), 
-    <<">:">> = iolist_to_binary(join(re:split(">XNNNYZ","\\h*X\\h?\\H+Y\\H?Z",[]))), 
-    <<">">> = iolist_to_binary(join(re:split(">  X NYQZ","\\h*X\\h?\\H+Y\\H?Z",[trim]))), 
+                                                                                                                                                                                                        2}]))),
+    <<">:">> = iolist_to_binary(join(re:split(">XNNNYZ","\\h*X\\h?\\H+Y\\H?Z",[]))),
+    <<">">> = iolist_to_binary(join(re:split(">  X NYQZ","\\h*X\\h?\\H+Y\\H?Z",[trim]))),
     <<">:">> = iolist_to_binary(join(re:split(">  X NYQZ","\\h*X\\h?\\H+Y\\H?Z",[{parts,
-                                                                                                                                                                                                            2}]))), 
-    <<">:">> = iolist_to_binary(join(re:split(">  X NYQZ","\\h*X\\h?\\H+Y\\H?Z",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\h*X\\h?\\H+Y\\H?Z",[trim]))), 
+                                                                                                                                                                                                            2}]))),
+    <<">:">> = iolist_to_binary(join(re:split(">  X NYQZ","\\h*X\\h?\\H+Y\\H?Z",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\h*X\\h?\\H+Y\\H?Z",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\h*X\\h?\\H+Y\\H?Z",[{parts,
-                                                                                                                                                                                                              2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\h*X\\h?\\H+Y\\H?Z",[]))), 
-    <<">XYZ">> = iolist_to_binary(join(re:split(">XYZ","\\h*X\\h?\\H+Y\\H?Z",[trim]))), 
+                                                                                                                                                                                                              2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\h*X\\h?\\H+Y\\H?Z",[]))),
+    <<">XYZ">> = iolist_to_binary(join(re:split(">XYZ","\\h*X\\h?\\H+Y\\H?Z",[trim]))),
     <<">XYZ">> = iolist_to_binary(join(re:split(">XYZ","\\h*X\\h?\\H+Y\\H?Z",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<">XYZ">> = iolist_to_binary(join(re:split(">XYZ","\\h*X\\h?\\H+Y\\H?Z",[]))), 
-    <<">  X NY Z">> = iolist_to_binary(join(re:split(">  X NY Z","\\h*X\\h?\\H+Y\\H?Z",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<">XYZ">> = iolist_to_binary(join(re:split(">XYZ","\\h*X\\h?\\H+Y\\H?Z",[]))),
+    <<">  X NY Z">> = iolist_to_binary(join(re:split(">  X NY Z","\\h*X\\h?\\H+Y\\H?Z",[trim]))),
     <<">  X NY Z">> = iolist_to_binary(join(re:split(">  X NY Z","\\h*X\\h?\\H+Y\\H?Z",[{parts,
-                                                                                                                                                                                                            2}]))), 
-    <<">  X NY Z">> = iolist_to_binary(join(re:split(">  X NY Z","\\h*X\\h?\\H+Y\\H?Z",[]))), 
+                                                                                                                                                                                                            2}]))),
+    <<">  X NY Z">> = iolist_to_binary(join(re:split(">  X NY Z","\\h*X\\h?\\H+Y\\H?Z",[]))),
     <<">">> = iolist_to_binary(join(re:split(">XY
 Z
-ANN","\\v*X\\v?Y\\v+Z\\V*\\x0a\\V+\\x0b\\V{2,3}\\x0c",[trim]))), 
+ANN","\\v*X\\v?Y\\v+Z\\V*\\x0a\\V+\\x0b\\V{2,3}\\x0c",[trim]))),
     <<">:">> = iolist_to_binary(join(re:split(">XY
 Z
 ANN","\\v*X\\v?Y\\v+Z\\V*\\x0a\\V+\\x0b\\V{2,3}\\x0c",[{parts,
-                                                                               2}]))), 
+                                                                               2}]))),
     <<">:">> = iolist_to_binary(join(re:split(">XY
 Z
-ANN","\\v*X\\v?Y\\v+Z\\V*\\x0a\\V+\\x0b\\V{2,3}\\x0c",[]))), 
+ANN","\\v*X\\v?Y\\v+Z\\V*\\x0a\\V+\\x0b\\V{2,3}\\x0c",[]))),
     <<">">> = iolist_to_binary(join(re:split(">
 
X
 Y
 ZZZ
-AAANNN","\\v*X\\v?Y\\v+Z\\V*\\x0a\\V+\\x0b\\V{2,3}\\x0c",[trim]))), 
+AAANNN","\\v*X\\v?Y\\v+Z\\V*\\x0a\\V+\\x0b\\V{2,3}\\x0c",[trim]))),
     <<">:">> = iolist_to_binary(join(re:split(">
 
X
 Y
 ZZZ
 AAANNN","\\v*X\\v?Y\\v+Z\\V*\\x0a\\V+\\x0b\\V{2,3}\\x0c",[{parts,
-                                                                                  2}]))), 
+                                                                                  2}]))),
     <<">:">> = iolist_to_binary(join(re:split(">
 
X
 Y
 ZZZ
-AAANNN","\\v*X\\v?Y\\v+Z\\V*\\x0a\\V+\\x0b\\V{2,3}\\x0c",[]))), 
-    <<"foo:foo">> = iolist_to_binary(join(re:split("foobar","(foo)\\Kbar",[trim]))), 
+AAANNN","\\v*X\\v?Y\\v+Z\\V*\\x0a\\V+\\x0b\\V{2,3}\\x0c",[]))),
+    <<"foo:foo">> = iolist_to_binary(join(re:split("foobar","(foo)\\Kbar",[trim]))),
     <<"foo:foo:">> = iolist_to_binary(join(re:split("foobar","(foo)\\Kbar",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<"foo:foo:">> = iolist_to_binary(join(re:split("foobar","(foo)\\Kbar",[]))), 
-    <<"foo:foo:bar">> = iolist_to_binary(join(re:split("foobar","(foo)(\\Kbar|baz)",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<"foo:foo:">> = iolist_to_binary(join(re:split("foobar","(foo)\\Kbar",[]))),
+    <<"foo:foo:bar">> = iolist_to_binary(join(re:split("foobar","(foo)(\\Kbar|baz)",[trim]))),
     <<"foo:foo:bar:">> = iolist_to_binary(join(re:split("foobar","(foo)(\\Kbar|baz)",[{parts,
-                                                                                                                                                                                               2}]))), 
-    <<"foo:foo:bar:">> = iolist_to_binary(join(re:split("foobar","(foo)(\\Kbar|baz)",[]))), 
-    <<":foo:baz">> = iolist_to_binary(join(re:split("foobaz","(foo)(\\Kbar|baz)",[trim]))), 
+                                                                                                                                                                                               2}]))),
+    <<"foo:foo:bar:">> = iolist_to_binary(join(re:split("foobar","(foo)(\\Kbar|baz)",[]))),
+    <<":foo:baz">> = iolist_to_binary(join(re:split("foobaz","(foo)(\\Kbar|baz)",[trim]))),
     <<":foo:baz:">> = iolist_to_binary(join(re:split("foobaz","(foo)(\\Kbar|baz)",[{parts,
-                                                                                                                                                                                               2}]))), 
-    <<":foo:baz:">> = iolist_to_binary(join(re:split("foobaz","(foo)(\\Kbar|baz)",[]))), 
-    <<"foo:foobar">> = iolist_to_binary(join(re:split("foobarbaz","(foo\\Kbar)baz",[trim]))), 
+                                                                                                                                                                                               2}]))),
+    <<":foo:baz:">> = iolist_to_binary(join(re:split("foobaz","(foo)(\\Kbar|baz)",[]))),
+    <<"foo:foobar">> = iolist_to_binary(join(re:split("foobarbaz","(foo\\Kbar)baz",[trim]))),
     <<"foo:foobar:">> = iolist_to_binary(join(re:split("foobarbaz","(foo\\Kbar)baz",[{parts,
-                                                                                                                                                                                               2}]))), 
-    <<"foo:foobar:">> = iolist_to_binary(join(re:split("foobarbaz","(foo\\Kbar)baz",[]))), 
-    <<":tom">> = iolist_to_binary(join(re:split("tom-tom","(?<A>tom|bon)-\\g{A}",[trim]))), 
+                                                                                                                                                                                               2}]))),
+    <<"foo:foobar:">> = iolist_to_binary(join(re:split("foobarbaz","(foo\\Kbar)baz",[]))),
+    <<":tom">> = iolist_to_binary(join(re:split("tom-tom","(?<A>tom|bon)-\\g{A}",[trim]))),
     <<":tom:">> = iolist_to_binary(join(re:split("tom-tom","(?<A>tom|bon)-\\g{A}",[{parts,
-                                                                                                                                                                                                       2}]))), 
-    <<":tom:">> = iolist_to_binary(join(re:split("tom-tom","(?<A>tom|bon)-\\g{A}",[]))), 
-    <<":bon">> = iolist_to_binary(join(re:split("bon-bon","(?<A>tom|bon)-\\g{A}",[trim]))), 
+                                                                                                                                                                                                       2}]))),
+    <<":tom:">> = iolist_to_binary(join(re:split("tom-tom","(?<A>tom|bon)-\\g{A}",[]))),
+    <<":bon">> = iolist_to_binary(join(re:split("bon-bon","(?<A>tom|bon)-\\g{A}",[trim]))),
     <<":bon:">> = iolist_to_binary(join(re:split("bon-bon","(?<A>tom|bon)-\\g{A}",[{parts,
-                                                                                                                                                                                                       2}]))), 
-    <<":bon:">> = iolist_to_binary(join(re:split("bon-bon","(?<A>tom|bon)-\\g{A}",[]))), 
-    <<"bacxxx">> = iolist_to_binary(join(re:split("bacxxx","(^(a|b\\g{-1}))",[trim]))), 
+                                                                                                                                                                                                       2}]))),
+    <<":bon:">> = iolist_to_binary(join(re:split("bon-bon","(?<A>tom|bon)-\\g{A}",[]))),
+    <<"bacxxx">> = iolist_to_binary(join(re:split("bacxxx","(^(a|b\\g{-1}))",[trim]))),
     <<"bacxxx">> = iolist_to_binary(join(re:split("bacxxx","(^(a|b\\g{-1}))",[{parts,
-                                                                                                                                                                                           2}]))), 
-    <<"bacxxx">> = iolist_to_binary(join(re:split("bacxxx","(^(a|b\\g{-1}))",[]))), 
-    <<":abc">> = iolist_to_binary(join(re:split("abcabc","(?|(abc)|(xyz))\\1",[trim]))), 
+                                                                                                                                                                                           2}]))),
+    <<"bacxxx">> = iolist_to_binary(join(re:split("bacxxx","(^(a|b\\g{-1}))",[]))),
+    <<":abc">> = iolist_to_binary(join(re:split("abcabc","(?|(abc)|(xyz))\\1",[trim]))),
     <<":abc:">> = iolist_to_binary(join(re:split("abcabc","(?|(abc)|(xyz))\\1",[{parts,
-                                                                                                                                                                                                 2}]))), 
-    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","(?|(abc)|(xyz))\\1",[]))), 
-    <<":xyz">> = iolist_to_binary(join(re:split("xyzxyz","(?|(abc)|(xyz))\\1",[trim]))), 
+                                                                                                                                                                                                 2}]))),
+    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","(?|(abc)|(xyz))\\1",[]))),
+    <<":xyz">> = iolist_to_binary(join(re:split("xyzxyz","(?|(abc)|(xyz))\\1",[trim]))),
     <<":xyz:">> = iolist_to_binary(join(re:split("xyzxyz","(?|(abc)|(xyz))\\1",[{parts,
-                                                                                                                                                                                                 2}]))), 
-    <<":xyz:">> = iolist_to_binary(join(re:split("xyzxyz","(?|(abc)|(xyz))\\1",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?|(abc)|(xyz))\\1",[trim]))), 
+                                                                                                                                                                                                 2}]))),
+    <<":xyz:">> = iolist_to_binary(join(re:split("xyzxyz","(?|(abc)|(xyz))\\1",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?|(abc)|(xyz))\\1",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?|(abc)|(xyz))\\1",[{parts,
-                                                                                                                                                                                                         2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?|(abc)|(xyz))\\1",[]))), 
-    <<"abcxyz">> = iolist_to_binary(join(re:split("abcxyz","(?|(abc)|(xyz))\\1",[trim]))), 
+                                                                                                                                                                                                         2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?|(abc)|(xyz))\\1",[]))),
+    <<"abcxyz">> = iolist_to_binary(join(re:split("abcxyz","(?|(abc)|(xyz))\\1",[trim]))),
     <<"abcxyz">> = iolist_to_binary(join(re:split("abcxyz","(?|(abc)|(xyz))\\1",[{parts,
-                                                                                                                                                                                                 2}]))), 
-    <<"abcxyz">> = iolist_to_binary(join(re:split("abcxyz","(?|(abc)|(xyz))\\1",[]))), 
-    <<"xyzabc">> = iolist_to_binary(join(re:split("xyzabc","(?|(abc)|(xyz))\\1",[trim]))), 
+                                                                                                                                                                                                 2}]))),
+    <<"abcxyz">> = iolist_to_binary(join(re:split("abcxyz","(?|(abc)|(xyz))\\1",[]))),
+    <<"xyzabc">> = iolist_to_binary(join(re:split("xyzabc","(?|(abc)|(xyz))\\1",[trim]))),
     <<"xyzabc">> = iolist_to_binary(join(re:split("xyzabc","(?|(abc)|(xyz))\\1",[{parts,
-                                                                                                                                                                                                 2}]))), 
-    <<"xyzabc">> = iolist_to_binary(join(re:split("xyzabc","(?|(abc)|(xyz))\\1",[]))), 
-    <<":abc">> = iolist_to_binary(join(re:split("abcabc","(?|(abc)|(xyz))(?1)",[trim]))), 
+                                                                                                                                                                                                 2}]))),
+    <<"xyzabc">> = iolist_to_binary(join(re:split("xyzabc","(?|(abc)|(xyz))\\1",[]))),
+    <<":abc">> = iolist_to_binary(join(re:split("abcabc","(?|(abc)|(xyz))(?1)",[trim]))),
     <<":abc:">> = iolist_to_binary(join(re:split("abcabc","(?|(abc)|(xyz))(?1)",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","(?|(abc)|(xyz))(?1)",[]))), 
-    <<":xyz">> = iolist_to_binary(join(re:split("xyzabc","(?|(abc)|(xyz))(?1)",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","(?|(abc)|(xyz))(?1)",[]))),
+    <<":xyz">> = iolist_to_binary(join(re:split("xyzabc","(?|(abc)|(xyz))(?1)",[trim]))),
     <<":xyz:">> = iolist_to_binary(join(re:split("xyzabc","(?|(abc)|(xyz))(?1)",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<":xyz:">> = iolist_to_binary(join(re:split("xyzabc","(?|(abc)|(xyz))(?1)",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?|(abc)|(xyz))(?1)",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<":xyz:">> = iolist_to_binary(join(re:split("xyzabc","(?|(abc)|(xyz))(?1)",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?|(abc)|(xyz))(?1)",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?|(abc)|(xyz))(?1)",[{parts,
-                                                                                                                                                                                                          2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?|(abc)|(xyz))(?1)",[]))), 
-    <<"xyzxyz">> = iolist_to_binary(join(re:split("xyzxyz","(?|(abc)|(xyz))(?1)",[trim]))), 
+                                                                                                                                                                                                          2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?|(abc)|(xyz))(?1)",[]))),
+    <<"xyzxyz">> = iolist_to_binary(join(re:split("xyzxyz","(?|(abc)|(xyz))(?1)",[trim]))),
     <<"xyzxyz">> = iolist_to_binary(join(re:split("xyzxyz","(?|(abc)|(xyz))(?1)",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<"xyzxyz">> = iolist_to_binary(join(re:split("xyzxyz","(?|(abc)|(xyz))(?1)",[]))), 
+                                                                                                                                                                                                  2}]))),
+    <<"xyzxyz">> = iolist_to_binary(join(re:split("xyzxyz","(?|(abc)|(xyz))(?1)",[]))),
     ok.
 run41() ->
-    <<":a:b:c:d:Y">> = iolist_to_binary(join(re:split("XYabcdY","^X(?5)(a)(?|(b)|(q))(c)(d)(Y)",[trim]))), 
+    <<":a:b:c:d:Y">> = iolist_to_binary(join(re:split("XYabcdY","^X(?5)(a)(?|(b)|(q))(c)(d)(Y)",[trim]))),
     <<":a:b:c:d:Y:">> = iolist_to_binary(join(re:split("XYabcdY","^X(?5)(a)(?|(b)|(q))(c)(d)(Y)",[{parts,
-                                                                                                                                                                                                                        2}]))), 
-    <<":a:b:c:d:Y:">> = iolist_to_binary(join(re:split("XYabcdY","^X(?5)(a)(?|(b)|(q))(c)(d)(Y)",[]))), 
-    <<":a:b:::c:d:Y">> = iolist_to_binary(join(re:split("XYabcdY","^X(?7)(a)(?|(b|(r)(s))|(q))(c)(d)(Y)",[trim]))), 
+                                                                                                                                                                                                                        2}]))),
+    <<":a:b:c:d:Y:">> = iolist_to_binary(join(re:split("XYabcdY","^X(?5)(a)(?|(b)|(q))(c)(d)(Y)",[]))),
+    <<":a:b:::c:d:Y">> = iolist_to_binary(join(re:split("XYabcdY","^X(?7)(a)(?|(b|(r)(s))|(q))(c)(d)(Y)",[trim]))),
     <<":a:b:::c:d:Y:">> = iolist_to_binary(join(re:split("XYabcdY","^X(?7)(a)(?|(b|(r)(s))|(q))(c)(d)(Y)",[{parts,
-                                                                                                                                                                                                                                      2}]))), 
-    <<":a:b:::c:d:Y:">> = iolist_to_binary(join(re:split("XYabcdY","^X(?7)(a)(?|(b|(r)(s))|(q))(c)(d)(Y)",[]))), 
-    <<":a:b:::c:d:Y">> = iolist_to_binary(join(re:split("XYabcdY","^X(?7)(a)(?|(b|(?|(r)|(t))(s))|(q))(c)(d)(Y)",[trim]))), 
+                                                                                                                                                                                                                                      2}]))),
+    <<":a:b:::c:d:Y:">> = iolist_to_binary(join(re:split("XYabcdY","^X(?7)(a)(?|(b|(r)(s))|(q))(c)(d)(Y)",[]))),
+    <<":a:b:::c:d:Y">> = iolist_to_binary(join(re:split("XYabcdY","^X(?7)(a)(?|(b|(?|(r)|(t))(s))|(q))(c)(d)(Y)",[trim]))),
     <<":a:b:::c:d:Y:">> = iolist_to_binary(join(re:split("XYabcdY","^X(?7)(a)(?|(b|(?|(r)|(t))(s))|(q))(c)(d)(Y)",[{parts,
-                                                                                                                                                                                                                                                      2}]))), 
-    <<":a:b:::c:d:Y:">> = iolist_to_binary(join(re:split("XYabcdY","^X(?7)(a)(?|(b|(?|(r)|(t))(s))|(q))(c)(d)(Y)",[]))), 
-    <<":a:xyz">> = iolist_to_binary(join(re:split("a:aaxyz","(?'abc'\\w+):\\k<abc>{2}",[trim]))), 
+                                                                                                                                                                                                                                                      2}]))),
+    <<":a:b:::c:d:Y:">> = iolist_to_binary(join(re:split("XYabcdY","^X(?7)(a)(?|(b|(?|(r)|(t))(s))|(q))(c)(d)(Y)",[]))),
+    <<":a:xyz">> = iolist_to_binary(join(re:split("a:aaxyz","(?'abc'\\w+):\\k<abc>{2}",[trim]))),
     <<":a:xyz">> = iolist_to_binary(join(re:split("a:aaxyz","(?'abc'\\w+):\\k<abc>{2}",[{parts,
-                                                                                                                                                                                                                                2}]))), 
-    <<":a:xyz">> = iolist_to_binary(join(re:split("a:aaxyz","(?'abc'\\w+):\\k<abc>{2}",[]))), 
-    <<":ab:xyz">> = iolist_to_binary(join(re:split("ab:ababxyz","(?'abc'\\w+):\\k<abc>{2}",[trim]))), 
+                                                                                                                                                                                                                                2}]))),
+    <<":a:xyz">> = iolist_to_binary(join(re:split("a:aaxyz","(?'abc'\\w+):\\k<abc>{2}",[]))),
+    <<":ab:xyz">> = iolist_to_binary(join(re:split("ab:ababxyz","(?'abc'\\w+):\\k<abc>{2}",[trim]))),
     <<":ab:xyz">> = iolist_to_binary(join(re:split("ab:ababxyz","(?'abc'\\w+):\\k<abc>{2}",[{parts,
-                                                                                                                                                                                                                                      2}]))), 
-    <<":ab:xyz">> = iolist_to_binary(join(re:split("ab:ababxyz","(?'abc'\\w+):\\k<abc>{2}",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?'abc'\\w+):\\k<abc>{2}",[trim]))), 
+                                                                                                                                                                                                                                      2}]))),
+    <<":ab:xyz">> = iolist_to_binary(join(re:split("ab:ababxyz","(?'abc'\\w+):\\k<abc>{2}",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?'abc'\\w+):\\k<abc>{2}",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?'abc'\\w+):\\k<abc>{2}",[{parts,
-                                                                                                                                                                                                                                      2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?'abc'\\w+):\\k<abc>{2}",[]))), 
-    <<"a:axyz">> = iolist_to_binary(join(re:split("a:axyz","(?'abc'\\w+):\\k<abc>{2}",[trim]))), 
+                                                                                                                                                                                                                                      2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?'abc'\\w+):\\k<abc>{2}",[]))),
+    <<"a:axyz">> = iolist_to_binary(join(re:split("a:axyz","(?'abc'\\w+):\\k<abc>{2}",[trim]))),
     <<"a:axyz">> = iolist_to_binary(join(re:split("a:axyz","(?'abc'\\w+):\\k<abc>{2}",[{parts,
-                                                                                                                                                                                                                              2}]))), 
-    <<"a:axyz">> = iolist_to_binary(join(re:split("a:axyz","(?'abc'\\w+):\\k<abc>{2}",[]))), 
-    <<"ab:abxyz">> = iolist_to_binary(join(re:split("ab:abxyz","(?'abc'\\w+):\\k<abc>{2}",[trim]))), 
+                                                                                                                                                                                                                              2}]))),
+    <<"a:axyz">> = iolist_to_binary(join(re:split("a:axyz","(?'abc'\\w+):\\k<abc>{2}",[]))),
+    <<"ab:abxyz">> = iolist_to_binary(join(re:split("ab:abxyz","(?'abc'\\w+):\\k<abc>{2}",[trim]))),
     <<"ab:abxyz">> = iolist_to_binary(join(re:split("ab:abxyz","(?'abc'\\w+):\\k<abc>{2}",[{parts,
-                                                                                                                                                                                                                                  2}]))), 
-    <<"ab:abxyz">> = iolist_to_binary(join(re:split("ab:abxyz","(?'abc'\\w+):\\k<abc>{2}",[]))), 
-    <<":a:xyz">> = iolist_to_binary(join(re:split("a:aaxyz","(?'abc'\\w+):\\g{abc}{2}",[trim]))), 
+                                                                                                                                                                                                                                  2}]))),
+    <<"ab:abxyz">> = iolist_to_binary(join(re:split("ab:abxyz","(?'abc'\\w+):\\k<abc>{2}",[]))),
+    <<":a:xyz">> = iolist_to_binary(join(re:split("a:aaxyz","(?'abc'\\w+):\\g{abc}{2}",[trim]))),
     <<":a:xyz">> = iolist_to_binary(join(re:split("a:aaxyz","(?'abc'\\w+):\\g{abc}{2}",[{parts,
-                                                                                                                                                                                                                                2}]))), 
-    <<":a:xyz">> = iolist_to_binary(join(re:split("a:aaxyz","(?'abc'\\w+):\\g{abc}{2}",[]))), 
-    <<":ab:xyz">> = iolist_to_binary(join(re:split("ab:ababxyz","(?'abc'\\w+):\\g{abc}{2}",[trim]))), 
+                                                                                                                                                                                                                                2}]))),
+    <<":a:xyz">> = iolist_to_binary(join(re:split("a:aaxyz","(?'abc'\\w+):\\g{abc}{2}",[]))),
+    <<":ab:xyz">> = iolist_to_binary(join(re:split("ab:ababxyz","(?'abc'\\w+):\\g{abc}{2}",[trim]))),
     <<":ab:xyz">> = iolist_to_binary(join(re:split("ab:ababxyz","(?'abc'\\w+):\\g{abc}{2}",[{parts,
-                                                                                                                                                                                                                                      2}]))), 
-    <<":ab:xyz">> = iolist_to_binary(join(re:split("ab:ababxyz","(?'abc'\\w+):\\g{abc}{2}",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?'abc'\\w+):\\g{abc}{2}",[trim]))), 
+                                                                                                                                                                                                                                      2}]))),
+    <<":ab:xyz">> = iolist_to_binary(join(re:split("ab:ababxyz","(?'abc'\\w+):\\g{abc}{2}",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?'abc'\\w+):\\g{abc}{2}",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?'abc'\\w+):\\g{abc}{2}",[{parts,
-                                                                                                                                                                                                                                      2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?'abc'\\w+):\\g{abc}{2}",[]))), 
-    <<"a:axyz">> = iolist_to_binary(join(re:split("a:axyz","(?'abc'\\w+):\\g{abc}{2}",[trim]))), 
+                                                                                                                                                                                                                                      2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?'abc'\\w+):\\g{abc}{2}",[]))),
+    <<"a:axyz">> = iolist_to_binary(join(re:split("a:axyz","(?'abc'\\w+):\\g{abc}{2}",[trim]))),
     <<"a:axyz">> = iolist_to_binary(join(re:split("a:axyz","(?'abc'\\w+):\\g{abc}{2}",[{parts,
-                                                                                                                                                                                                                              2}]))), 
-    <<"a:axyz">> = iolist_to_binary(join(re:split("a:axyz","(?'abc'\\w+):\\g{abc}{2}",[]))), 
-    <<"ab:abxyz">> = iolist_to_binary(join(re:split("ab:abxyz","(?'abc'\\w+):\\g{abc}{2}",[trim]))), 
+                                                                                                                                                                                                                              2}]))),
+    <<"a:axyz">> = iolist_to_binary(join(re:split("a:axyz","(?'abc'\\w+):\\g{abc}{2}",[]))),
+    <<"ab:abxyz">> = iolist_to_binary(join(re:split("ab:abxyz","(?'abc'\\w+):\\g{abc}{2}",[trim]))),
     <<"ab:abxyz">> = iolist_to_binary(join(re:split("ab:abxyz","(?'abc'\\w+):\\g{abc}{2}",[{parts,
-                                                                                                                                                                                                                                  2}]))), 
-    <<"ab:abxyz">> = iolist_to_binary(join(re:split("ab:abxyz","(?'abc'\\w+):\\g{abc}{2}",[]))), 
+                                                                                                                                                                                                                                  2}]))),
+    <<"ab:abxyz">> = iolist_to_binary(join(re:split("ab:abxyz","(?'abc'\\w+):\\g{abc}{2}",[]))),
     <<":a">> = iolist_to_binary(join(re:split("abd","^(?<ab>a)? (?(<ab>)b|c) (?('ab')d|e)",[extended,
-                                                                                                                                                                                                                                            trim]))), 
+                                                                                                                                                                                                                                            trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("abd","^(?<ab>a)? (?(<ab>)b|c) (?('ab')d|e)",[extended,
                                                                                                                                                                                                                                               {parts,
-                                                                                                                                                                                                                                               2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("abd","^(?<ab>a)? (?(<ab>)b|c) (?('ab')d|e)",[extended]))), 
+                                                                                                                                                                                                                                               2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("abd","^(?<ab>a)? (?(<ab>)b|c) (?('ab')d|e)",[extended]))),
     <<"">> = iolist_to_binary(join(re:split("ce","^(?<ab>a)? (?(<ab>)b|c) (?('ab')d|e)",[extended,
-                                                                                                                                                                                                                                          trim]))), 
+                                                                                                                                                                                                                                          trim]))),
     <<"::">> = iolist_to_binary(join(re:split("ce","^(?<ab>a)? (?(<ab>)b|c) (?('ab')d|e)",[extended,
                                                                                                                                                                                                                                             {parts,
-                                                                                                                                                                                                                                             2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("ce","^(?<ab>a)? (?(<ab>)b|c) (?('ab')d|e)",[extended]))), 
-    <<":aX">> = iolist_to_binary(join(re:split("aXaXZ","^(a.)\\g-1Z",[trim]))), 
+                                                                                                                                                                                                                                             2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("ce","^(?<ab>a)? (?(<ab>)b|c) (?('ab')d|e)",[extended]))),
+    <<":aX">> = iolist_to_binary(join(re:split("aXaXZ","^(a.)\\g-1Z",[trim]))),
     <<":aX:">> = iolist_to_binary(join(re:split("aXaXZ","^(a.)\\g-1Z",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<":aX:">> = iolist_to_binary(join(re:split("aXaXZ","^(a.)\\g-1Z",[]))), 
-    <<":aX">> = iolist_to_binary(join(re:split("aXaXZ","^(a.)\\g{-1}Z",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<":aX:">> = iolist_to_binary(join(re:split("aXaXZ","^(a.)\\g-1Z",[]))),
+    <<":aX">> = iolist_to_binary(join(re:split("aXaXZ","^(a.)\\g{-1}Z",[trim]))),
     <<":aX:">> = iolist_to_binary(join(re:split("aXaXZ","^(a.)\\g{-1}Z",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<":aX:">> = iolist_to_binary(join(re:split("aXaXZ","^(a.)\\g{-1}Z",[]))), 
+                                                                                                                                                                                     2}]))),
+    <<":aX:">> = iolist_to_binary(join(re:split("aXaXZ","^(a.)\\g{-1}Z",[]))),
     <<":::cd">> = iolist_to_binary(join(re:split("abcd","^(?(DEFINE) (?<A> a) (?<B> b) )  (?&A) (?&B) ",[extended,
-                                                                                                                                                                                                                                                trim]))), 
+                                                                                                                                                                                                                                                trim]))),
     <<":::cd">> = iolist_to_binary(join(re:split("abcd","^(?(DEFINE) (?<A> a) (?<B> b) )  (?&A) (?&B) ",[extended,
                                                                                                                                                                                                                                                   {parts,
-                                                                                                                                                                                                                                                   2}]))), 
-    <<":::cd">> = iolist_to_binary(join(re:split("abcd","^(?(DEFINE) (?<A> a) (?<B> b) )  (?&A) (?&B) ",[extended]))), 
+                                                                                                                                                                                                                                                   2}]))),
+    <<":::cd">> = iolist_to_binary(join(re:split("abcd","^(?(DEFINE) (?<A> a) (?<B> b) )  (?&A) (?&B) ",[extended]))),
     <<":metcalfe:33">> = iolist_to_binary(join(re:split("metcalfe 33","(?<NAME>(?&NAME_PAT))\\s+(?<ADDR>(?&ADDRESS_PAT))
   (?(DEFINE)
   (?<NAME_PAT>[a-z]+)
   (?<ADDRESS_PAT>\\d+)
-  )",[extended,trim]))), 
+  )",[extended,trim]))),
     <<":metcalfe:33:::">> = iolist_to_binary(join(re:split("metcalfe 33","(?<NAME>(?&NAME_PAT))\\s+(?<ADDR>(?&ADDRESS_PAT))
   (?(DEFINE)
   (?<NAME_PAT>[a-z]+)
   (?<ADDRESS_PAT>\\d+)
-  )",[extended,{parts,2}]))), 
+  )",[extended,{parts,2}]))),
     <<":metcalfe:33:::">> = iolist_to_binary(join(re:split("metcalfe 33","(?<NAME>(?&NAME_PAT))\\s+(?<ADDR>(?&ADDRESS_PAT))
   (?(DEFINE)
   (?<NAME_PAT>[a-z]+)
   (?<ADDRESS_PAT>\\d+)
-  )",[extended]))), 
-    <<"::.4">> = iolist_to_binary(join(re:split("1.2.3.4","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[trim]))), 
+  )",[extended]))),
+    <<"::.4">> = iolist_to_binary(join(re:split("1.2.3.4","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[trim]))),
     <<"::.4:">> = iolist_to_binary(join(re:split("1.2.3.4","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[{parts,
-                                                                                                                                                                                                                                                                                                                                        2}]))), 
-    <<"::.4:">> = iolist_to_binary(join(re:split("1.2.3.4","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[]))), 
-    <<"::.206">> = iolist_to_binary(join(re:split("131.111.10.206","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                        2}]))),
+    <<"::.4:">> = iolist_to_binary(join(re:split("1.2.3.4","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[]))),
+    <<"::.206">> = iolist_to_binary(join(re:split("131.111.10.206","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[trim]))),
     <<"::.206:">> = iolist_to_binary(join(re:split("131.111.10.206","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[{parts,
-                                                                                                                                                                                                                                                                                                                                                      2}]))), 
-    <<"::.206:">> = iolist_to_binary(join(re:split("131.111.10.206","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[]))), 
-    <<"::.0">> = iolist_to_binary(join(re:split("10.0.0.0","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                                      2}]))),
+    <<"::.206:">> = iolist_to_binary(join(re:split("131.111.10.206","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[]))),
+    <<"::.0">> = iolist_to_binary(join(re:split("10.0.0.0","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[trim]))),
     <<"::.0:">> = iolist_to_binary(join(re:split("10.0.0.0","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[{parts,
-                                                                                                                                                                                                                                                                                                                                          2}]))), 
-    <<"::.0:">> = iolist_to_binary(join(re:split("10.0.0.0","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                          2}]))),
+    <<"::.0:">> = iolist_to_binary(join(re:split("10.0.0.0","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[{parts,
-                                                                                                                                                                                                                                                                                                                                              2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[]))), 
-    <<"10.6">> = iolist_to_binary(join(re:split("10.6","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                              2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[]))),
+    <<"10.6">> = iolist_to_binary(join(re:split("10.6","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[trim]))),
     <<"10.6">> = iolist_to_binary(join(re:split("10.6","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[{parts,
-                                                                                                                                                                                                                                                                                                                                  2}]))), 
-    <<"10.6">> = iolist_to_binary(join(re:split("10.6","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[]))), 
-    <<"455.3.4.5">> = iolist_to_binary(join(re:split("455.3.4.5","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                  2}]))),
+    <<"10.6">> = iolist_to_binary(join(re:split("10.6","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[]))),
+    <<"455.3.4.5">> = iolist_to_binary(join(re:split("455.3.4.5","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[trim]))),
     <<"455.3.4.5">> = iolist_to_binary(join(re:split("455.3.4.5","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[{parts,
-                                                                                                                                                                                                                                                                                                                                            2}]))), 
-    <<"455.3.4.5">> = iolist_to_binary(join(re:split("455.3.4.5","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[]))), 
-    <<":.4">> = iolist_to_binary(join(re:split("1.2.3.4","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                            2}]))),
+    <<"455.3.4.5">> = iolist_to_binary(join(re:split("455.3.4.5","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[]))),
+    <<":.4">> = iolist_to_binary(join(re:split("1.2.3.4","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[trim]))),
     <<":.4::">> = iolist_to_binary(join(re:split("1.2.3.4","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[{parts,
-                                                                                                                                                                                                                                                                                                                                        2}]))), 
-    <<":.4::">> = iolist_to_binary(join(re:split("1.2.3.4","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[]))), 
-    <<":.206">> = iolist_to_binary(join(re:split("131.111.10.206","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                        2}]))),
+    <<":.4::">> = iolist_to_binary(join(re:split("1.2.3.4","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[]))),
+    <<":.206">> = iolist_to_binary(join(re:split("131.111.10.206","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[trim]))),
     <<":.206::">> = iolist_to_binary(join(re:split("131.111.10.206","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[{parts,
-                                                                                                                                                                                                                                                                                                                                                      2}]))), 
-    <<":.206::">> = iolist_to_binary(join(re:split("131.111.10.206","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[]))), 
-    <<":.0">> = iolist_to_binary(join(re:split("10.0.0.0","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                                      2}]))),
+    <<":.206::">> = iolist_to_binary(join(re:split("131.111.10.206","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[]))),
+    <<":.0">> = iolist_to_binary(join(re:split("10.0.0.0","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[trim]))),
     <<":.0::">> = iolist_to_binary(join(re:split("10.0.0.0","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[{parts,
-                                                                                                                                                                                                                                                                                                                                          2}]))), 
-    <<":.0::">> = iolist_to_binary(join(re:split("10.0.0.0","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                          2}]))),
+    <<":.0::">> = iolist_to_binary(join(re:split("10.0.0.0","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[{parts,
-                                                                                                                                                                                                                                                                                                                                              2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[]))), 
-    <<"10.6">> = iolist_to_binary(join(re:split("10.6","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                              2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[]))),
+    <<"10.6">> = iolist_to_binary(join(re:split("10.6","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[trim]))),
     <<"10.6">> = iolist_to_binary(join(re:split("10.6","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[{parts,
-                                                                                                                                                                                                                                                                                                                                  2}]))), 
-    <<"10.6">> = iolist_to_binary(join(re:split("10.6","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[]))), 
-    <<"455.3.4.5">> = iolist_to_binary(join(re:split("455.3.4.5","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                  2}]))),
+    <<"10.6">> = iolist_to_binary(join(re:split("10.6","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[]))),
+    <<"455.3.4.5">> = iolist_to_binary(join(re:split("455.3.4.5","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[trim]))),
     <<"455.3.4.5">> = iolist_to_binary(join(re:split("455.3.4.5","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[{parts,
-                                                                                                                                                                                                                                                                                                                                            2}]))), 
-    <<"455.3.4.5">> = iolist_to_binary(join(re:split("455.3.4.5","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[]))), 
-    <<":party">> = iolist_to_binary(join(re:split("now is the time for all good men to come to the aid of the party","^(\\w++|\\s++)*$",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                            2}]))),
+    <<"455.3.4.5">> = iolist_to_binary(join(re:split("455.3.4.5","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[]))),
+    <<":party">> = iolist_to_binary(join(re:split("now is the time for all good men to come to the aid of the party","^(\\w++|\\s++)*$",[trim]))),
     <<":party:">> = iolist_to_binary(join(re:split("now is the time for all good men to come to the aid of the party","^(\\w++|\\s++)*$",[{parts,
-                                                                                                                                                                                                                                                                                                                   2}]))), 
-    <<":party:">> = iolist_to_binary(join(re:split("now is the time for all good men to come to the aid of the party","^(\\w++|\\s++)*$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\w++|\\s++)*$",[trim]))), 
+                                                                                                                                                                                                                                                                                                                   2}]))),
+    <<":party:">> = iolist_to_binary(join(re:split("now is the time for all good men to come to the aid of the party","^(\\w++|\\s++)*$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\w++|\\s++)*$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\w++|\\s++)*$",[{parts,
-                                                                                                                                                                                                         2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\w++|\\s++)*$",[]))), 
-    <<"this is not a line with only words and spaces!">> = iolist_to_binary(join(re:split("this is not a line with only words and spaces!","^(\\w++|\\s++)*$",[trim]))), 
+                                                                                                                                                                                                         2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\w++|\\s++)*$",[]))),
+    <<"this is not a line with only words and spaces!">> = iolist_to_binary(join(re:split("this is not a line with only words and spaces!","^(\\w++|\\s++)*$",[trim]))),
     <<"this is not a line with only words and spaces!">> = iolist_to_binary(join(re:split("this is not a line with only words and spaces!","^(\\w++|\\s++)*$",[{parts,
-                                                                                                                                                                                                                                                                               2}]))), 
-    <<"this is not a line with only words and spaces!">> = iolist_to_binary(join(re:split("this is not a line with only words and spaces!","^(\\w++|\\s++)*$",[]))), 
-    <<":12345:a">> = iolist_to_binary(join(re:split("12345a","(\\d++)(\\w)",[trim]))), 
+                                                                                                                                                                                                                                                                               2}]))),
+    <<"this is not a line with only words and spaces!">> = iolist_to_binary(join(re:split("this is not a line with only words and spaces!","^(\\w++|\\s++)*$",[]))),
+    <<":12345:a">> = iolist_to_binary(join(re:split("12345a","(\\d++)(\\w)",[trim]))),
     <<":12345:a:">> = iolist_to_binary(join(re:split("12345a","(\\d++)(\\w)",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<":12345:a:">> = iolist_to_binary(join(re:split("12345a","(\\d++)(\\w)",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(\\d++)(\\w)",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<":12345:a:">> = iolist_to_binary(join(re:split("12345a","(\\d++)(\\w)",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(\\d++)(\\w)",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(\\d++)(\\w)",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(\\d++)(\\w)",[]))), 
-    <<"12345+">> = iolist_to_binary(join(re:split("12345+","(\\d++)(\\w)",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(\\d++)(\\w)",[]))),
+    <<"12345+">> = iolist_to_binary(join(re:split("12345+","(\\d++)(\\w)",[trim]))),
     <<"12345+">> = iolist_to_binary(join(re:split("12345+","(\\d++)(\\w)",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<"12345+">> = iolist_to_binary(join(re:split("12345+","(\\d++)(\\w)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaab","a++b",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<"12345+">> = iolist_to_binary(join(re:split("12345+","(\\d++)(\\w)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaab","a++b",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaab","a++b",[{parts,
-                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaab","a++b",[]))), 
-    <<":aaab">> = iolist_to_binary(join(re:split("aaab","(a++b)",[trim]))), 
+                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaab","a++b",[]))),
+    <<":aaab">> = iolist_to_binary(join(re:split("aaab","(a++b)",[trim]))),
     <<":aaab:">> = iolist_to_binary(join(re:split("aaab","(a++b)",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<":aaab:">> = iolist_to_binary(join(re:split("aaab","(a++b)",[]))), 
-    <<":aaa">> = iolist_to_binary(join(re:split("aaab","(a++)b",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<":aaab:">> = iolist_to_binary(join(re:split("aaab","(a++b)",[]))),
+    <<":aaa">> = iolist_to_binary(join(re:split("aaab","(a++)b",[trim]))),
     <<":aaa:">> = iolist_to_binary(join(re:split("aaab","(a++)b",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<":aaa:">> = iolist_to_binary(join(re:split("aaab","(a++)b",[]))), 
-    <<"((:x">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","([^()]++|\\([^()]*\\))+",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<":aaa:">> = iolist_to_binary(join(re:split("aaab","(a++)b",[]))),
+    <<"((:x">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","([^()]++|\\([^()]*\\))+",[trim]))),
     <<"((:x:">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","([^()]++|\\([^()]*\\))+",[{parts,
-                                                                                                                                                                                                                                    2}]))), 
-    <<"((:x:">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","([^()]++|\\([^()]*\\))+",[]))), 
-    <<":abc">> = iolist_to_binary(join(re:split("(abc)","\\(([^()]++|\\([^()]+\\))+\\)",[trim]))), 
+                                                                                                                                                                                                                                    2}]))),
+    <<"((:x:">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","([^()]++|\\([^()]*\\))+",[]))),
+    <<":abc">> = iolist_to_binary(join(re:split("(abc)","\\(([^()]++|\\([^()]+\\))+\\)",[trim]))),
     <<":abc:">> = iolist_to_binary(join(re:split("(abc)","\\(([^()]++|\\([^()]+\\))+\\)",[{parts,
-                                                                                                                                                                                                                        2}]))), 
-    <<":abc:">> = iolist_to_binary(join(re:split("(abc)","\\(([^()]++|\\([^()]+\\))+\\)",[]))), 
-    <<":xyz">> = iolist_to_binary(join(re:split("(abc(def)xyz)","\\(([^()]++|\\([^()]+\\))+\\)",[trim]))), 
+                                                                                                                                                                                                                        2}]))),
+    <<":abc:">> = iolist_to_binary(join(re:split("(abc)","\\(([^()]++|\\([^()]+\\))+\\)",[]))),
+    <<":xyz">> = iolist_to_binary(join(re:split("(abc(def)xyz)","\\(([^()]++|\\([^()]+\\))+\\)",[trim]))),
     <<":xyz:">> = iolist_to_binary(join(re:split("(abc(def)xyz)","\\(([^()]++|\\([^()]+\\))+\\)",[{parts,
-                                                                                                                                                                                                                                        2}]))), 
-    <<":xyz:">> = iolist_to_binary(join(re:split("(abc(def)xyz)","\\(([^()]++|\\([^()]+\\))+\\)",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\(([^()]++|\\([^()]+\\))+\\)",[trim]))), 
+                                                                                                                                                                                                                                        2}]))),
+    <<":xyz:">> = iolist_to_binary(join(re:split("(abc(def)xyz)","\\(([^()]++|\\([^()]+\\))+\\)",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\(([^()]++|\\([^()]+\\))+\\)",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\(([^()]++|\\([^()]+\\))+\\)",[{parts,
-                                                                                                                                                                                                                                    2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\(([^()]++|\\([^()]+\\))+\\)",[]))), 
-    <<"((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","\\(([^()]++|\\([^()]+\\))+\\)",[trim]))), 
+                                                                                                                                                                                                                                    2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\(([^()]++|\\([^()]+\\))+\\)",[]))),
+    <<"((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","\\(([^()]++|\\([^()]+\\))+\\)",[trim]))),
     <<"((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","\\(([^()]++|\\([^()]+\\))+\\)",[{parts,
-                                                                                                                                                                                                                                                                                                              2}]))), 
-    <<"((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","\\(([^()]++|\\([^()]+\\))+\\)",[]))), 
-    <<":c">> = iolist_to_binary(join(re:split("abc","^([^()]|\\((?1)*\\))*$",[trim]))), 
+                                                                                                                                                                                                                                                                                                              2}]))),
+    <<"((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","\\(([^()]++|\\([^()]+\\))+\\)",[]))),
+    <<":c">> = iolist_to_binary(join(re:split("abc","^([^()]|\\((?1)*\\))*$",[trim]))),
     <<":c:">> = iolist_to_binary(join(re:split("abc","^([^()]|\\((?1)*\\))*$",[{parts,
-                                                                                                                                                                                                     2}]))), 
-    <<":c:">> = iolist_to_binary(join(re:split("abc","^([^()]|\\((?1)*\\))*$",[]))), 
-    <<":c">> = iolist_to_binary(join(re:split("a(b)c","^([^()]|\\((?1)*\\))*$",[trim]))), 
+                                                                                                                                                                                                     2}]))),
+    <<":c:">> = iolist_to_binary(join(re:split("abc","^([^()]|\\((?1)*\\))*$",[]))),
+    <<":c">> = iolist_to_binary(join(re:split("a(b)c","^([^()]|\\((?1)*\\))*$",[trim]))),
     <<":c:">> = iolist_to_binary(join(re:split("a(b)c","^([^()]|\\((?1)*\\))*$",[{parts,
-                                                                                                                                                                                                         2}]))), 
-    <<":c:">> = iolist_to_binary(join(re:split("a(b)c","^([^()]|\\((?1)*\\))*$",[]))), 
-    <<":d">> = iolist_to_binary(join(re:split("a(b(c))d","^([^()]|\\((?1)*\\))*$",[trim]))), 
+                                                                                                                                                                                                         2}]))),
+    <<":c:">> = iolist_to_binary(join(re:split("a(b)c","^([^()]|\\((?1)*\\))*$",[]))),
+    <<":d">> = iolist_to_binary(join(re:split("a(b(c))d","^([^()]|\\((?1)*\\))*$",[trim]))),
     <<":d:">> = iolist_to_binary(join(re:split("a(b(c))d","^([^()]|\\((?1)*\\))*$",[{parts,
-                                                                                                                                                                                                               2}]))), 
-    <<":d:">> = iolist_to_binary(join(re:split("a(b(c))d","^([^()]|\\((?1)*\\))*$",[]))), 
-    <<"*** Failers)">> = iolist_to_binary(join(re:split("*** Failers)","^([^()]|\\((?1)*\\))*$",[trim]))), 
+                                                                                                                                                                                                               2}]))),
+    <<":d:">> = iolist_to_binary(join(re:split("a(b(c))d","^([^()]|\\((?1)*\\))*$",[]))),
+    <<"*** Failers)">> = iolist_to_binary(join(re:split("*** Failers)","^([^()]|\\((?1)*\\))*$",[trim]))),
     <<"*** Failers)">> = iolist_to_binary(join(re:split("*** Failers)","^([^()]|\\((?1)*\\))*$",[{parts,
-                                                                                                                                                                                                                       2}]))), 
-    <<"*** Failers)">> = iolist_to_binary(join(re:split("*** Failers)","^([^()]|\\((?1)*\\))*$",[]))), 
-    <<"a(b(c)d">> = iolist_to_binary(join(re:split("a(b(c)d","^([^()]|\\((?1)*\\))*$",[trim]))), 
+                                                                                                                                                                                                                       2}]))),
+    <<"*** Failers)">> = iolist_to_binary(join(re:split("*** Failers)","^([^()]|\\((?1)*\\))*$",[]))),
+    <<"a(b(c)d">> = iolist_to_binary(join(re:split("a(b(c)d","^([^()]|\\((?1)*\\))*$",[trim]))),
     <<"a(b(c)d">> = iolist_to_binary(join(re:split("a(b(c)d","^([^()]|\\((?1)*\\))*$",[{parts,
-                                                                                                                                                                                                             2}]))), 
-    <<"a(b(c)d">> = iolist_to_binary(join(re:split("a(b(c)d","^([^()]|\\((?1)*\\))*$",[]))), 
+                                                                                                                                                                                                             2}]))),
+    <<"a(b(c)d">> = iolist_to_binary(join(re:split("a(b(c)d","^([^()]|\\((?1)*\\))*$",[]))),
     ok.
 run42() ->
-    <<":3">> = iolist_to_binary(join(re:split(">abc>123<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$",[trim]))), 
+    <<":3">> = iolist_to_binary(join(re:split(">abc>123<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$",[trim]))),
     <<":3:">> = iolist_to_binary(join(re:split(">abc>123<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$",[{parts,
-                                                                                                                                                                                                                                             2}]))), 
-    <<":3:">> = iolist_to_binary(join(re:split(">abc>123<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$",[]))), 
-    <<":3">> = iolist_to_binary(join(re:split(">abc>1(2)3<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$",[trim]))), 
+                                                                                                                                                                                                                                             2}]))),
+    <<":3:">> = iolist_to_binary(join(re:split(">abc>123<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$",[]))),
+    <<":3">> = iolist_to_binary(join(re:split(">abc>1(2)3<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$",[trim]))),
     <<":3:">> = iolist_to_binary(join(re:split(">abc>1(2)3<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$",[{parts,
-                                                                                                                                                                                                                                                 2}]))), 
-    <<":3:">> = iolist_to_binary(join(re:split(">abc>1(2)3<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$",[]))), 
-    <<":(1(2)3)">> = iolist_to_binary(join(re:split(">abc>(1(2)3)<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$",[trim]))), 
+                                                                                                                                                                                                                                                 2}]))),
+    <<":3:">> = iolist_to_binary(join(re:split(">abc>1(2)3<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$",[]))),
+    <<":(1(2)3)">> = iolist_to_binary(join(re:split(">abc>(1(2)3)<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$",[trim]))),
     <<":(1(2)3):">> = iolist_to_binary(join(re:split(">abc>(1(2)3)<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$",[{parts,
-                                                                                                                                                                                                                                                     2}]))), 
-    <<":(1(2)3):">> = iolist_to_binary(join(re:split(">abc>(1(2)3)<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$",[]))), 
+                                                                                                                                                                                                                                                     2}]))),
+    <<":(1(2)3):">> = iolist_to_binary(join(re:split(">abc>(1(2)3)<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$",[]))),
     <<":1221:1">> = iolist_to_binary(join(re:split("1221","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless,
-                                                                                                                                                                                                                             trim]))), 
+                                                                                                                                                                                                                             trim]))),
     <<":1221:1:::">> = iolist_to_binary(join(re:split("1221","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless,
                                                                                                                                                                                                                                {parts,
-                                                                                                                                                                                                                                2}]))), 
-    <<":1221:1:::">> = iolist_to_binary(join(re:split("1221","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless]))), 
+                                                                                                                                                                                                                                2}]))),
+    <<":1221:1:::">> = iolist_to_binary(join(re:split("1221","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless]))),
     <<":::Satanoscillatemymetallicsonatas:S">> = iolist_to_binary(join(re:split("Satanoscillatemymetallicsonatas","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless,
-                                                                                                                                                                                                                                                                                   trim]))), 
+                                                                                                                                                                                                                                                                                   trim]))),
     <<":::Satanoscillatemymetallicsonatas:S:">> = iolist_to_binary(join(re:split("Satanoscillatemymetallicsonatas","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless,
                                                                                                                                                                                                                                                                                      {parts,
-                                                                                                                                                                                                                                                                                      2}]))), 
-    <<":::Satanoscillatemymetallicsonatas:S:">> = iolist_to_binary(join(re:split("Satanoscillatemymetallicsonatas","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless]))), 
+                                                                                                                                                                                                                                                                                      2}]))),
+    <<":::Satanoscillatemymetallicsonatas:S:">> = iolist_to_binary(join(re:split("Satanoscillatemymetallicsonatas","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless]))),
     <<":::AmanaplanacanalPanama:A">> = iolist_to_binary(join(re:split("AmanaplanacanalPanama","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless,
-                                                                                                                                                                                                                                                               trim]))), 
+                                                                                                                                                                                                                                                               trim]))),
     <<":::AmanaplanacanalPanama:A:">> = iolist_to_binary(join(re:split("AmanaplanacanalPanama","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless,
                                                                                                                                                                                                                                                                  {parts,
-                                                                                                                                                                                                                                                                  2}]))), 
-    <<":::AmanaplanacanalPanama:A:">> = iolist_to_binary(join(re:split("AmanaplanacanalPanama","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless]))), 
+                                                                                                                                                                                                                                                                  2}]))),
+    <<":::AmanaplanacanalPanama:A:">> = iolist_to_binary(join(re:split("AmanaplanacanalPanama","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless]))),
     <<":::AblewasIereIsawElba:A">> = iolist_to_binary(join(re:split("AblewasIereIsawElba","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless,
-                                                                                                                                                                                                                                                           trim]))), 
+                                                                                                                                                                                                                                                           trim]))),
     <<":::AblewasIereIsawElba:A:">> = iolist_to_binary(join(re:split("AblewasIereIsawElba","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless,
                                                                                                                                                                                                                                                              {parts,
-                                                                                                                                                                                                                                                              2}]))), 
-    <<":::AblewasIereIsawElba:A:">> = iolist_to_binary(join(re:split("AblewasIereIsawElba","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless]))), 
+                                                                                                                                                                                                                                                              2}]))),
+    <<":::AblewasIereIsawElba:A:">> = iolist_to_binary(join(re:split("AblewasIereIsawElba","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless,
-                                                                                                                                                                                                                                           trim]))), 
+                                                                                                                                                                                                                                           trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless,
                                                                                                                                                                                                                                              {parts,
-                                                                                                                                                                                                                                              2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless]))), 
+                                                                                                                                                                                                                                              2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless]))),
     <<"Thequickbrownfox">> = iolist_to_binary(join(re:split("Thequickbrownfox","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless,
-                                                                                                                                                                                                                                                     trim]))), 
+                                                                                                                                                                                                                                                     trim]))),
     <<"Thequickbrownfox">> = iolist_to_binary(join(re:split("Thequickbrownfox","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless,
                                                                                                                                                                                                                                                        {parts,
-                                                                                                                                                                                                                                                        2}]))), 
-    <<"Thequickbrownfox">> = iolist_to_binary(join(re:split("Thequickbrownfox","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless]))), 
-    <<":12">> = iolist_to_binary(join(re:split("12","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[trim]))), 
+                                                                                                                                                                                                                                                        2}]))),
+    <<"Thequickbrownfox">> = iolist_to_binary(join(re:split("Thequickbrownfox","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless]))),
+    <<":12">> = iolist_to_binary(join(re:split("12","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[trim]))),
     <<":12::">> = iolist_to_binary(join(re:split("12","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[{parts,
-                                                                                                                                                                                                                                2}]))), 
-    <<":12::">> = iolist_to_binary(join(re:split("12","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[]))), 
-    <<":(((2+2)*-3)-7):-">> = iolist_to_binary(join(re:split("(((2+2)*-3)-7)","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[trim]))), 
+                                                                                                                                                                                                                                2}]))),
+    <<":12::">> = iolist_to_binary(join(re:split("12","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[]))),
+    <<":(((2+2)*-3)-7):-">> = iolist_to_binary(join(re:split("(((2+2)*-3)-7)","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[trim]))),
     <<":(((2+2)*-3)-7):-:">> = iolist_to_binary(join(re:split("(((2+2)*-3)-7)","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[{parts,
-                                                                                                                                                                                                                                                        2}]))), 
-    <<":(((2+2)*-3)-7):-:">> = iolist_to_binary(join(re:split("(((2+2)*-3)-7)","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[]))), 
-    <<":-12">> = iolist_to_binary(join(re:split("-12","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[trim]))), 
+                                                                                                                                                                                                                                                        2}]))),
+    <<":(((2+2)*-3)-7):-:">> = iolist_to_binary(join(re:split("(((2+2)*-3)-7)","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[]))),
+    <<":-12">> = iolist_to_binary(join(re:split("-12","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[trim]))),
     <<":-12::">> = iolist_to_binary(join(re:split("-12","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[{parts,
-                                                                                                                                                                                                                                  2}]))), 
-    <<":-12::">> = iolist_to_binary(join(re:split("-12","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[trim]))), 
+                                                                                                                                                                                                                                  2}]))),
+    <<":-12::">> = iolist_to_binary(join(re:split("-12","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[{parts,
-                                                                                                                                                                                                                                                  2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[]))), 
-    <<"((2+2)*-3)-7)">> = iolist_to_binary(join(re:split("((2+2)*-3)-7)","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[trim]))), 
+                                                                                                                                                                                                                                                  2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[]))),
+    <<"((2+2)*-3)-7)">> = iolist_to_binary(join(re:split("((2+2)*-3)-7)","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[trim]))),
     <<"((2+2)*-3)-7)">> = iolist_to_binary(join(re:split("((2+2)*-3)-7)","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[{parts,
-                                                                                                                                                                                                                                                      2}]))), 
-    <<"((2+2)*-3)-7)">> = iolist_to_binary(join(re:split("((2+2)*-3)-7)","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[]))), 
-    <<":xyz:y">> = iolist_to_binary(join(re:split("xyz","^(x(y|(?1){2})z)",[trim]))), 
+                                                                                                                                                                                                                                                      2}]))),
+    <<"((2+2)*-3)-7)">> = iolist_to_binary(join(re:split("((2+2)*-3)-7)","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[]))),
+    <<":xyz:y">> = iolist_to_binary(join(re:split("xyz","^(x(y|(?1){2})z)",[trim]))),
     <<":xyz:y:">> = iolist_to_binary(join(re:split("xyz","^(x(y|(?1){2})z)",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<":xyz:y:">> = iolist_to_binary(join(re:split("xyz","^(x(y|(?1){2})z)",[]))), 
-    <<":xxyzxyzz:xyzxyz">> = iolist_to_binary(join(re:split("xxyzxyzz","^(x(y|(?1){2})z)",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<":xyz:y:">> = iolist_to_binary(join(re:split("xyz","^(x(y|(?1){2})z)",[]))),
+    <<":xxyzxyzz:xyzxyz">> = iolist_to_binary(join(re:split("xxyzxyzz","^(x(y|(?1){2})z)",[trim]))),
     <<":xxyzxyzz:xyzxyz:">> = iolist_to_binary(join(re:split("xxyzxyzz","^(x(y|(?1){2})z)",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<":xxyzxyzz:xyzxyz:">> = iolist_to_binary(join(re:split("xxyzxyzz","^(x(y|(?1){2})z)",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(x(y|(?1){2})z)",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<":xxyzxyzz:xyzxyz:">> = iolist_to_binary(join(re:split("xxyzxyzz","^(x(y|(?1){2})z)",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(x(y|(?1){2})z)",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(x(y|(?1){2})z)",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(x(y|(?1){2})z)",[]))), 
-    <<"xxyzz">> = iolist_to_binary(join(re:split("xxyzz","^(x(y|(?1){2})z)",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(x(y|(?1){2})z)",[]))),
+    <<"xxyzz">> = iolist_to_binary(join(re:split("xxyzz","^(x(y|(?1){2})z)",[trim]))),
     <<"xxyzz">> = iolist_to_binary(join(re:split("xxyzz","^(x(y|(?1){2})z)",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<"xxyzz">> = iolist_to_binary(join(re:split("xxyzz","^(x(y|(?1){2})z)",[]))), 
-    <<"xxyzxyzxyzz">> = iolist_to_binary(join(re:split("xxyzxyzxyzz","^(x(y|(?1){2})z)",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<"xxyzz">> = iolist_to_binary(join(re:split("xxyzz","^(x(y|(?1){2})z)",[]))),
+    <<"xxyzxyzxyzz">> = iolist_to_binary(join(re:split("xxyzxyzxyzz","^(x(y|(?1){2})z)",[trim]))),
     <<"xxyzxyzxyzz">> = iolist_to_binary(join(re:split("xxyzxyzxyzz","^(x(y|(?1){2})z)",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<"xxyzxyzxyzz">> = iolist_to_binary(join(re:split("xxyzxyzxyzz","^(x(y|(?1){2})z)",[]))), 
+                                                                                                                                                                                                      2}]))),
+    <<"xxyzxyzxyzz">> = iolist_to_binary(join(re:split("xxyzxyzxyzz","^(x(y|(?1){2})z)",[]))),
     <<":<>:<>">> = iolist_to_binary(join(re:split("<>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
-                                                                                                                                                                                                                                             trim]))), 
+                                                                                                                                                                                                                                             trim]))),
     <<":<>:<>:">> = iolist_to_binary(join(re:split("<>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
                                                                                                                                                                                                                                                {parts,
-                                                                                                                                                                                                                                                2}]))), 
-    <<":<>:<>:">> = iolist_to_binary(join(re:split("<>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended]))), 
+                                                                                                                                                                                                                                                2}]))),
+    <<":<>:<>:">> = iolist_to_binary(join(re:split("<>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended]))),
     <<":<abcd>:<abcd>">> = iolist_to_binary(join(re:split("<abcd>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
-                                                                                                                                                                                                                                                     trim]))), 
+                                                                                                                                                                                                                                                     trim]))),
     <<":<abcd>:<abcd>:">> = iolist_to_binary(join(re:split("<abcd>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
                                                                                                                                                                                                                                                        {parts,
-                                                                                                                                                                                                                                                        2}]))), 
-    <<":<abcd>:<abcd>:">> = iolist_to_binary(join(re:split("<abcd>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended]))), 
+                                                                                                                                                                                                                                                        2}]))),
+    <<":<abcd>:<abcd>:">> = iolist_to_binary(join(re:split("<abcd>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended]))),
     <<":<abc <123> hij>:<abc <123> hij>">> = iolist_to_binary(join(re:split("<abc <123> hij>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
-                                                                                                                                                                                                                                                                       trim]))), 
+                                                                                                                                                                                                                                                                       trim]))),
     <<":<abc <123> hij>:<abc <123> hij>:">> = iolist_to_binary(join(re:split("<abc <123> hij>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
                                                                                                                                                                                                                                                                          {parts,
-                                                                                                                                                                                                                                                                          2}]))), 
-    <<":<abc <123> hij>:<abc <123> hij>:">> = iolist_to_binary(join(re:split("<abc <123> hij>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended]))), 
+                                                                                                                                                                                                                                                                          2}]))),
+    <<":<abc <123> hij>:<abc <123> hij>:">> = iolist_to_binary(join(re:split("<abc <123> hij>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended]))),
     <<"<abc :<def>:<def>: hij>">> = iolist_to_binary(join(re:split("<abc <def> hij>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
-                                                                                                                                                                                                                                                                       trim]))), 
+                                                                                                                                                                                                                                                                       trim]))),
     <<"<abc :<def>:<def>: hij>">> = iolist_to_binary(join(re:split("<abc <def> hij>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
                                                                                                                                                                                                                                                                          {parts,
-                                                                                                                                                                                                                                                                          2}]))), 
-    <<"<abc :<def>:<def>: hij>">> = iolist_to_binary(join(re:split("<abc <def> hij>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended]))), 
+                                                                                                                                                                                                                                                                          2}]))),
+    <<"<abc :<def>:<def>: hij>">> = iolist_to_binary(join(re:split("<abc <def> hij>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended]))),
     <<":<abc<>def>:<abc<>def>">> = iolist_to_binary(join(re:split("<abc<>def>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
-                                                                                                                                                                                                                                                             trim]))), 
+                                                                                                                                                                                                                                                             trim]))),
     <<":<abc<>def>:<abc<>def>:">> = iolist_to_binary(join(re:split("<abc<>def>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
                                                                                                                                                                                                                                                                {parts,
-                                                                                                                                                                                                                                                                2}]))), 
-    <<":<abc<>def>:<abc<>def>:">> = iolist_to_binary(join(re:split("<abc<>def>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended]))), 
+                                                                                                                                                                                                                                                                2}]))),
+    <<":<abc<>def>:<abc<>def>:">> = iolist_to_binary(join(re:split("<abc<>def>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended]))),
     <<"<abc:<>:<>">> = iolist_to_binary(join(re:split("<abc<>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
-                                                                                                                                                                                                                                                     trim]))), 
+                                                                                                                                                                                                                                                     trim]))),
     <<"<abc:<>:<>:">> = iolist_to_binary(join(re:split("<abc<>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
                                                                                                                                                                                                                                                        {parts,
-                                                                                                                                                                                                                                                        2}]))), 
-    <<"<abc:<>:<>:">> = iolist_to_binary(join(re:split("<abc<>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended]))), 
+                                                                                                                                                                                                                                                        2}]))),
+    <<"<abc:<>:<>:">> = iolist_to_binary(join(re:split("<abc<>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
-                                                                                                                                                                                                                                                               trim]))), 
+                                                                                                                                                                                                                                                               trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
                                                                                                                                                                                                                                                                  {parts,
-                                                                                                                                                                                                                                                                  2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended]))), 
+                                                                                                                                                                                                                                                                  2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended]))),
     <<"<abc">> = iolist_to_binary(join(re:split("<abc","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
-                                                                                                                                                                                                                                                 trim]))), 
+                                                                                                                                                                                                                                                 trim]))),
     <<"<abc">> = iolist_to_binary(join(re:split("<abc","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
                                                                                                                                                                                                                                                    {parts,
-                                                                                                                                                                                                                                                    2}]))), 
-    <<"<abc">> = iolist_to_binary(join(re:split("<abc","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended]))), 
-    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^a+(*FAIL)",[trim]))), 
+                                                                                                                                                                                                                                                    2}]))),
+    <<"<abc">> = iolist_to_binary(join(re:split("<abc","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended]))),
+    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^a+(*FAIL)",[trim]))),
     <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^a+(*FAIL)",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^a+(*FAIL)",[]))), 
-    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?c+(*FAIL)",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^a+(*FAIL)",[]))),
+    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?c+(*FAIL)",[trim]))),
     <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?c+(*FAIL)",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?c+(*FAIL)",[]))), 
-    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?(*PRUNE)c+(*FAIL)",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?c+(*FAIL)",[]))),
+    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?(*PRUNE)c+(*FAIL)",[trim]))),
     <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?(*PRUNE)c+(*FAIL)",[{parts,
-                                                                                                                                                                                                        2}]))), 
-    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?(*PRUNE)c+(*FAIL)",[]))), 
-    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?(*COMMIT)c+(*FAIL)",[trim]))), 
+                                                                                                                                                                                                        2}]))),
+    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?(*PRUNE)c+(*FAIL)",[]))),
+    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?(*COMMIT)c+(*FAIL)",[trim]))),
     <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?(*COMMIT)c+(*FAIL)",[{parts,
-                                                                                                                                                                                                          2}]))), 
-    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?(*COMMIT)c+(*FAIL)",[]))), 
-    <<"aaabcccaaabccc">> = iolist_to_binary(join(re:split("aaabcccaaabccc","a+b?(*SKIP)c+(*FAIL)",[trim]))), 
+                                                                                                                                                                                                          2}]))),
+    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?(*COMMIT)c+(*FAIL)",[]))),
+    <<"aaabcccaaabccc">> = iolist_to_binary(join(re:split("aaabcccaaabccc","a+b?(*SKIP)c+(*FAIL)",[trim]))),
     <<"aaabcccaaabccc">> = iolist_to_binary(join(re:split("aaabcccaaabccc","a+b?(*SKIP)c+(*FAIL)",[{parts,
-                                                                                                                                                                                                                    2}]))), 
-    <<"aaabcccaaabccc">> = iolist_to_binary(join(re:split("aaabcccaaabccc","a+b?(*SKIP)c+(*FAIL)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaxxxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+                                                                                                                                                                                                                    2}]))),
+    <<"aaabcccaaabccc">> = iolist_to_binary(join(re:split("aaabcccaaabccc","a+b?(*SKIP)c+(*FAIL)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaxxxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaxxxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
-                                                                                                                                                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaxxxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
-    <<":++++++">> = iolist_to_binary(join(re:split("aaa++++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+                                                                                                                                                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaxxxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))),
+    <<":++++++">> = iolist_to_binary(join(re:split("aaa++++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))),
     <<":++++++">> = iolist_to_binary(join(re:split("aaa++++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
-                                                                                                                                                                                                                                                                                                  2}]))), 
-    <<":++++++">> = iolist_to_binary(join(re:split("aaa++++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("bbbxxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+                                                                                                                                                                                                                                                                                                  2}]))),
+    <<":++++++">> = iolist_to_binary(join(re:split("aaa++++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))),
+    <<"">> = iolist_to_binary(join(re:split("bbbxxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("bbbxxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
-                                                                                                                                                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("bbbxxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
-    <<":+++++">> = iolist_to_binary(join(re:split("bbb+++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+                                                                                                                                                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("bbbxxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))),
+    <<":+++++">> = iolist_to_binary(join(re:split("bbb+++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))),
     <<":+++++">> = iolist_to_binary(join(re:split("bbb+++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
-                                                                                                                                                                                                                                                                                                2}]))), 
-    <<":+++++">> = iolist_to_binary(join(re:split("bbb+++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("cccxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+                                                                                                                                                                                                                                                                                                2}]))),
+    <<":+++++">> = iolist_to_binary(join(re:split("bbb+++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))),
+    <<"">> = iolist_to_binary(join(re:split("cccxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("cccxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
-                                                                                                                                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("cccxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
-    <<":++++">> = iolist_to_binary(join(re:split("ccc++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+                                                                                                                                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("cccxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))),
+    <<":++++">> = iolist_to_binary(join(re:split("ccc++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))),
     <<":++++">> = iolist_to_binary(join(re:split("ccc++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
-                                                                                                                                                                                                                                                                                              2}]))), 
-    <<":++++">> = iolist_to_binary(join(re:split("ccc++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
-    <<":ddddd">> = iolist_to_binary(join(re:split("dddddddd","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+                                                                                                                                                                                                                                                                                              2}]))),
+    <<":++++">> = iolist_to_binary(join(re:split("ccc++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))),
+    <<":ddddd">> = iolist_to_binary(join(re:split("dddddddd","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))),
     <<":ddddd">> = iolist_to_binary(join(re:split("dddddddd","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
-                                                                                                                                                                                                                                                                                                2}]))), 
-    <<":ddddd">> = iolist_to_binary(join(re:split("dddddddd","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
-    <<":aaaxxxxxx">> = iolist_to_binary(join(re:split("aaaxxxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+                                                                                                                                                                                                                                                                                                2}]))),
+    <<":ddddd">> = iolist_to_binary(join(re:split("dddddddd","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))),
+    <<":aaaxxxxxx">> = iolist_to_binary(join(re:split("aaaxxxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))),
     <<":aaaxxxxxx:">> = iolist_to_binary(join(re:split("aaaxxxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
-                                                                                                                                                                                                                                                                                              2}]))), 
-    <<":aaaxxxxxx:">> = iolist_to_binary(join(re:split("aaaxxxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
-    <<":aaa:++++++">> = iolist_to_binary(join(re:split("aaa++++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+                                                                                                                                                                                                                                                                                              2}]))),
+    <<":aaaxxxxxx:">> = iolist_to_binary(join(re:split("aaaxxxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))),
+    <<":aaa:++++++">> = iolist_to_binary(join(re:split("aaa++++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))),
     <<":aaa:++++++">> = iolist_to_binary(join(re:split("aaa++++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
-                                                                                                                                                                                                                                                                                              2}]))), 
-    <<":aaa:++++++">> = iolist_to_binary(join(re:split("aaa++++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
-    <<":bbbxxxxx">> = iolist_to_binary(join(re:split("bbbxxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+                                                                                                                                                                                                                                                                                              2}]))),
+    <<":aaa:++++++">> = iolist_to_binary(join(re:split("aaa++++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))),
+    <<":bbbxxxxx">> = iolist_to_binary(join(re:split("bbbxxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))),
     <<":bbbxxxxx:">> = iolist_to_binary(join(re:split("bbbxxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
-                                                                                                                                                                                                                                                                                            2}]))), 
-    <<":bbbxxxxx:">> = iolist_to_binary(join(re:split("bbbxxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
-    <<":bbb:+++++">> = iolist_to_binary(join(re:split("bbb+++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+                                                                                                                                                                                                                                                                                            2}]))),
+    <<":bbbxxxxx:">> = iolist_to_binary(join(re:split("bbbxxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))),
+    <<":bbb:+++++">> = iolist_to_binary(join(re:split("bbb+++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))),
     <<":bbb:+++++">> = iolist_to_binary(join(re:split("bbb+++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
-                                                                                                                                                                                                                                                                                            2}]))), 
-    <<":bbb:+++++">> = iolist_to_binary(join(re:split("bbb+++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
-    <<":cccxxxx">> = iolist_to_binary(join(re:split("cccxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+                                                                                                                                                                                                                                                                                            2}]))),
+    <<":bbb:+++++">> = iolist_to_binary(join(re:split("bbb+++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))),
+    <<":cccxxxx">> = iolist_to_binary(join(re:split("cccxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))),
     <<":cccxxxx:">> = iolist_to_binary(join(re:split("cccxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
-                                                                                                                                                                                                                                                                                          2}]))), 
-    <<":cccxxxx:">> = iolist_to_binary(join(re:split("cccxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
-    <<":ccc:++++">> = iolist_to_binary(join(re:split("ccc++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+                                                                                                                                                                                                                                                                                          2}]))),
+    <<":cccxxxx:">> = iolist_to_binary(join(re:split("cccxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))),
+    <<":ccc:++++">> = iolist_to_binary(join(re:split("ccc++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))),
     <<":ccc:++++">> = iolist_to_binary(join(re:split("ccc++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
-                                                                                                                                                                                                                                                                                          2}]))), 
-    <<":ccc:++++">> = iolist_to_binary(join(re:split("ccc++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
-    <<":ddd:ddddd">> = iolist_to_binary(join(re:split("dddddddd","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+                                                                                                                                                                                                                                                                                          2}]))),
+    <<":ccc:++++">> = iolist_to_binary(join(re:split("ccc++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))),
+    <<":ddd:ddddd">> = iolist_to_binary(join(re:split("dddddddd","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))),
     <<":ddd:ddddd">> = iolist_to_binary(join(re:split("dddddddd","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
-                                                                                                                                                                                                                                                                                            2}]))), 
-    <<":ddd:ddddd">> = iolist_to_binary(join(re:split("dddddddd","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
-    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?(*THEN)c+(*FAIL)",[trim]))), 
+                                                                                                                                                                                                                                                                                            2}]))),
+    <<":ddd:ddddd">> = iolist_to_binary(join(re:split("dddddddd","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))),
+    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?(*THEN)c+(*FAIL)",[trim]))),
     <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?(*THEN)c+(*FAIL)",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?(*THEN)c+(*FAIL)",[]))), 
+                                                                                                                                                                                                      2}]))),
+    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?(*THEN)c+(*FAIL)",[]))),
     <<":AB:B">> = iolist_to_binary(join(re:split("AB","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
-                                                                                                                                                                                                    trim]))), 
+                                                                                                                                                                                                    trim]))),
     <<":AB:B::">> = iolist_to_binary(join(re:split("AB","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
                                                                                                                                                                                                       {parts,
-                                                                                                                                                                                                       2}]))), 
-    <<":AB:B::">> = iolist_to_binary(join(re:split("AB","(A (A|B(*ACCEPT)|C) D)(E)",[extended]))), 
+                                                                                                                                                                                                       2}]))),
+    <<":AB:B::">> = iolist_to_binary(join(re:split("AB","(A (A|B(*ACCEPT)|C) D)(E)",[extended]))),
     <<":AB:B::X">> = iolist_to_binary(join(re:split("ABX","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
-                                                                                                                                                                                                      trim]))), 
+                                                                                                                                                                                                      trim]))),
     <<":AB:B::X">> = iolist_to_binary(join(re:split("ABX","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
                                                                                                                                                                                                         {parts,
-                                                                                                                                                                                                         2}]))), 
-    <<":AB:B::X">> = iolist_to_binary(join(re:split("ABX","(A (A|B(*ACCEPT)|C) D)(E)",[extended]))), 
+                                                                                                                                                                                                         2}]))),
+    <<":AB:B::X">> = iolist_to_binary(join(re:split("ABX","(A (A|B(*ACCEPT)|C) D)(E)",[extended]))),
     <<":AAD:A:E">> = iolist_to_binary(join(re:split("AADE","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
-                                                                                                                                                                                                        trim]))), 
+                                                                                                                                                                                                        trim]))),
     <<":AAD:A:E:">> = iolist_to_binary(join(re:split("AADE","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
                                                                                                                                                                                                           {parts,
-                                                                                                                                                                                                           2}]))), 
-    <<":AAD:A:E:">> = iolist_to_binary(join(re:split("AADE","(A (A|B(*ACCEPT)|C) D)(E)",[extended]))), 
+                                                                                                                                                                                                           2}]))),
+    <<":AAD:A:E:">> = iolist_to_binary(join(re:split("AADE","(A (A|B(*ACCEPT)|C) D)(E)",[extended]))),
     <<":ACD:C:E">> = iolist_to_binary(join(re:split("ACDE","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
-                                                                                                                                                                                                        trim]))), 
+                                                                                                                                                                                                        trim]))),
     <<":ACD:C:E:">> = iolist_to_binary(join(re:split("ACDE","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
                                                                                                                                                                                                           {parts,
-                                                                                                                                                                                                           2}]))), 
-    <<":ACD:C:E:">> = iolist_to_binary(join(re:split("ACDE","(A (A|B(*ACCEPT)|C) D)(E)",[extended]))), 
+                                                                                                                                                                                                           2}]))),
+    <<":ACD:C:E:">> = iolist_to_binary(join(re:split("ACDE","(A (A|B(*ACCEPT)|C) D)(E)",[extended]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
-                                                                                                                                                                                                                    trim]))), 
+                                                                                                                                                                                                                    trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
                                                                                                                                                                                                                       {parts,
-                                                                                                                                                                                                                       2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(A (A|B(*ACCEPT)|C) D)(E)",[extended]))), 
+                                                                                                                                                                                                                       2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(A (A|B(*ACCEPT)|C) D)(E)",[extended]))),
     <<"AD">> = iolist_to_binary(join(re:split("AD","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
-                                                                                                                                                                                                    trim]))), 
+                                                                                                                                                                                                    trim]))),
     <<"AD">> = iolist_to_binary(join(re:split("AD","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
                                                                                                                                                                                                       {parts,
-                                                                                                                                                                                                       2}]))), 
-    <<"AD">> = iolist_to_binary(join(re:split("AD","(A (A|B(*ACCEPT)|C) D)(E)",[extended]))), 
+                                                                                                                                                                                                       2}]))),
+    <<"AD">> = iolist_to_binary(join(re:split("AD","(A (A|B(*ACCEPT)|C) D)(E)",[extended]))),
     <<":1221:1">> = iolist_to_binary(join(re:split("1221","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless,
-                                                                                                                                                                                                                                                                                                                     trim]))), 
+                                                                                                                                                                                                                                                                                                                     trim]))),
     <<":1221:1:::">> = iolist_to_binary(join(re:split("1221","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless,
                                                                                                                                                                                                                                                                                                                        {parts,
-                                                                                                                                                                                                                                                                                                                        2}]))), 
-    <<":1221:1:::">> = iolist_to_binary(join(re:split("1221","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless]))), 
+                                                                                                                                                                                                                                                                                                                        2}]))),
+    <<":1221:1:::">> = iolist_to_binary(join(re:split("1221","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless]))),
     <<":::Satan, oscillate my metallic sonatas:S">> = iolist_to_binary(join(re:split("Satan, oscillate my metallic sonatas!","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless,
-                                                                                                                                                                                                                                                                                                                                                                                       trim]))), 
+                                                                                                                                                                                                                                                                                                                                                                                       trim]))),
     <<":::Satan, oscillate my metallic sonatas:S:">> = iolist_to_binary(join(re:split("Satan, oscillate my metallic sonatas!","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless,
                                                                                                                                                                                                                                                                                                                                                                                          {parts,
-                                                                                                                                                                                                                                                                                                                                                                                          2}]))), 
-    <<":::Satan, oscillate my metallic sonatas:S:">> = iolist_to_binary(join(re:split("Satan, oscillate my metallic sonatas!","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless]))), 
+                                                                                                                                                                                                                                                                                                                                                                                          2}]))),
+    <<":::Satan, oscillate my metallic sonatas:S:">> = iolist_to_binary(join(re:split("Satan, oscillate my metallic sonatas!","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless]))),
     <<":::A man, a plan, a canal: Panama:A">> = iolist_to_binary(join(re:split("A man, a plan, a canal: Panama!","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless,
-                                                                                                                                                                                                                                                                                                                                                                           trim]))), 
+                                                                                                                                                                                                                                                                                                                                                                           trim]))),
     <<":::A man, a plan, a canal: Panama:A:">> = iolist_to_binary(join(re:split("A man, a plan, a canal: Panama!","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless,
                                                                                                                                                                                                                                                                                                                                                                              {parts,
-                                                                                                                                                                                                                                                                                                                                                                              2}]))), 
-    <<":::A man, a plan, a canal: Panama:A:">> = iolist_to_binary(join(re:split("A man, a plan, a canal: Panama!","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless]))), 
+                                                                                                                                                                                                                                                                                                                                                                              2}]))),
+    <<":::A man, a plan, a canal: Panama:A:">> = iolist_to_binary(join(re:split("A man, a plan, a canal: Panama!","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless]))),
     <<":::Able was I ere I saw Elba:A">> = iolist_to_binary(join(re:split("Able was I ere I saw Elba.","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless,
-                                                                                                                                                                                                                                                                                                                                                                 trim]))), 
+                                                                                                                                                                                                                                                                                                                                                                 trim]))),
     <<":::Able was I ere I saw Elba:A:">> = iolist_to_binary(join(re:split("Able was I ere I saw Elba.","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless,
                                                                                                                                                                                                                                                                                                                                                                    {parts,
-                                                                                                                                                                                                                                                                                                                                                                    2}]))), 
-    <<":::Able was I ere I saw Elba:A:">> = iolist_to_binary(join(re:split("Able was I ere I saw Elba.","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless]))), 
+                                                                                                                                                                                                                                                                                                                                                                    2}]))),
+    <<":::Able was I ere I saw Elba:A:">> = iolist_to_binary(join(re:split("Able was I ere I saw Elba.","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless,
-                                                                                                                                                                                                                                                                                                                                   trim]))), 
+                                                                                                                                                                                                                                                                                                                                   trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless,
                                                                                                                                                                                                                                                                                                                                      {parts,
-                                                                                                                                                                                                                                                                                                                                      2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless]))), 
+                                                                                                                                                                                                                                                                                                                                      2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless]))),
     <<"The quick brown fox">> = iolist_to_binary(join(re:split("The quick brown fox","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless,
-                                                                                                                                                                                                                                                                                                                                                   trim]))), 
+                                                                                                                                                                                                                                                                                                                                                   trim]))),
     <<"The quick brown fox">> = iolist_to_binary(join(re:split("The quick brown fox","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless,
                                                                                                                                                                                                                                                                                                                                                      {parts,
-                                                                                                                                                                                                                                                                                                                                                      2}]))), 
-    <<"The quick brown fox">> = iolist_to_binary(join(re:split("The quick brown fox","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless]))), 
-    <<":a">> = iolist_to_binary(join(re:split("a","^((.)(?1)\\2|.)$",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                                      2}]))),
+    <<"The quick brown fox">> = iolist_to_binary(join(re:split("The quick brown fox","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless]))),
+    <<":a">> = iolist_to_binary(join(re:split("a","^((.)(?1)\\2|.)$",[trim]))),
     <<":a::">> = iolist_to_binary(join(re:split("a","^((.)(?1)\\2|.)$",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<":a::">> = iolist_to_binary(join(re:split("a","^((.)(?1)\\2|.)$",[]))), 
-    <<":aba:a">> = iolist_to_binary(join(re:split("aba","^((.)(?1)\\2|.)$",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<":a::">> = iolist_to_binary(join(re:split("a","^((.)(?1)\\2|.)$",[]))),
+    <<":aba:a">> = iolist_to_binary(join(re:split("aba","^((.)(?1)\\2|.)$",[trim]))),
     <<":aba:a:">> = iolist_to_binary(join(re:split("aba","^((.)(?1)\\2|.)$",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<":aba:a:">> = iolist_to_binary(join(re:split("aba","^((.)(?1)\\2|.)$",[]))), 
-    <<":aabaa:a">> = iolist_to_binary(join(re:split("aabaa","^((.)(?1)\\2|.)$",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<":aba:a:">> = iolist_to_binary(join(re:split("aba","^((.)(?1)\\2|.)$",[]))),
+    <<":aabaa:a">> = iolist_to_binary(join(re:split("aabaa","^((.)(?1)\\2|.)$",[trim]))),
     <<":aabaa:a:">> = iolist_to_binary(join(re:split("aabaa","^((.)(?1)\\2|.)$",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<":aabaa:a:">> = iolist_to_binary(join(re:split("aabaa","^((.)(?1)\\2|.)$",[]))), 
-    <<":abcdcba:a">> = iolist_to_binary(join(re:split("abcdcba","^((.)(?1)\\2|.)$",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<":aabaa:a:">> = iolist_to_binary(join(re:split("aabaa","^((.)(?1)\\2|.)$",[]))),
+    <<":abcdcba:a">> = iolist_to_binary(join(re:split("abcdcba","^((.)(?1)\\2|.)$",[trim]))),
     <<":abcdcba:a:">> = iolist_to_binary(join(re:split("abcdcba","^((.)(?1)\\2|.)$",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<":abcdcba:a:">> = iolist_to_binary(join(re:split("abcdcba","^((.)(?1)\\2|.)$",[]))), 
-    <<":pqaabaaqp:p">> = iolist_to_binary(join(re:split("pqaabaaqp","^((.)(?1)\\2|.)$",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<":abcdcba:a:">> = iolist_to_binary(join(re:split("abcdcba","^((.)(?1)\\2|.)$",[]))),
+    <<":pqaabaaqp:p">> = iolist_to_binary(join(re:split("pqaabaaqp","^((.)(?1)\\2|.)$",[trim]))),
     <<":pqaabaaqp:p:">> = iolist_to_binary(join(re:split("pqaabaaqp","^((.)(?1)\\2|.)$",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<":pqaabaaqp:p:">> = iolist_to_binary(join(re:split("pqaabaaqp","^((.)(?1)\\2|.)$",[]))), 
-    <<":ablewasiereisawelba:a">> = iolist_to_binary(join(re:split("ablewasiereisawelba","^((.)(?1)\\2|.)$",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<":pqaabaaqp:p:">> = iolist_to_binary(join(re:split("pqaabaaqp","^((.)(?1)\\2|.)$",[]))),
+    <<":ablewasiereisawelba:a">> = iolist_to_binary(join(re:split("ablewasiereisawelba","^((.)(?1)\\2|.)$",[trim]))),
     <<":ablewasiereisawelba:a:">> = iolist_to_binary(join(re:split("ablewasiereisawelba","^((.)(?1)\\2|.)$",[{parts,
-                                                                                                                                                                                                                        2}]))), 
-    <<":ablewasiereisawelba:a:">> = iolist_to_binary(join(re:split("ablewasiereisawelba","^((.)(?1)\\2|.)$",[]))), 
-    <<"rhubarb">> = iolist_to_binary(join(re:split("rhubarb","^((.)(?1)\\2|.)$",[trim]))), 
+                                                                                                                                                                                                                        2}]))),
+    <<":ablewasiereisawelba:a:">> = iolist_to_binary(join(re:split("ablewasiereisawelba","^((.)(?1)\\2|.)$",[]))),
+    <<"rhubarb">> = iolist_to_binary(join(re:split("rhubarb","^((.)(?1)\\2|.)$",[trim]))),
     <<"rhubarb">> = iolist_to_binary(join(re:split("rhubarb","^((.)(?1)\\2|.)$",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"rhubarb">> = iolist_to_binary(join(re:split("rhubarb","^((.)(?1)\\2|.)$",[]))), 
-    <<"the quick brown fox">> = iolist_to_binary(join(re:split("the quick brown fox","^((.)(?1)\\2|.)$",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<"rhubarb">> = iolist_to_binary(join(re:split("rhubarb","^((.)(?1)\\2|.)$",[]))),
+    <<"the quick brown fox">> = iolist_to_binary(join(re:split("the quick brown fox","^((.)(?1)\\2|.)$",[trim]))),
     <<"the quick brown fox">> = iolist_to_binary(join(re:split("the quick brown fox","^((.)(?1)\\2|.)$",[{parts,
-                                                                                                                                                                                                                        2}]))), 
-    <<"the quick brown fox">> = iolist_to_binary(join(re:split("the quick brown fox","^((.)(?1)\\2|.)$",[]))), 
-    <<"b:a:z">> = iolist_to_binary(join(re:split("baz","(a)(?<=b(?1))",[trim]))), 
+                                                                                                                                                                                                                        2}]))),
+    <<"the quick brown fox">> = iolist_to_binary(join(re:split("the quick brown fox","^((.)(?1)\\2|.)$",[]))),
+    <<"b:a:z">> = iolist_to_binary(join(re:split("baz","(a)(?<=b(?1))",[trim]))),
     <<"b:a:z">> = iolist_to_binary(join(re:split("baz","(a)(?<=b(?1))",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<"b:a:z">> = iolist_to_binary(join(re:split("baz","(a)(?<=b(?1))",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(a)(?<=b(?1))",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<"b:a:z">> = iolist_to_binary(join(re:split("baz","(a)(?<=b(?1))",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(a)(?<=b(?1))",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(a)(?<=b(?1))",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(a)(?<=b(?1))",[]))), 
-    <<"caz">> = iolist_to_binary(join(re:split("caz","(a)(?<=b(?1))",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(a)(?<=b(?1))",[]))),
+    <<"caz">> = iolist_to_binary(join(re:split("caz","(a)(?<=b(?1))",[trim]))),
     <<"caz">> = iolist_to_binary(join(re:split("caz","(a)(?<=b(?1))",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<"caz">> = iolist_to_binary(join(re:split("caz","(a)(?<=b(?1))",[]))), 
-    <<"zba:a:z">> = iolist_to_binary(join(re:split("zbaaz","(?<=b(?1))(a)",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<"caz">> = iolist_to_binary(join(re:split("caz","(a)(?<=b(?1))",[]))),
+    <<"zba:a:z">> = iolist_to_binary(join(re:split("zbaaz","(?<=b(?1))(a)",[trim]))),
     <<"zba:a:z">> = iolist_to_binary(join(re:split("zbaaz","(?<=b(?1))(a)",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<"zba:a:z">> = iolist_to_binary(join(re:split("zbaaz","(?<=b(?1))(a)",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=b(?1))(a)",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<"zba:a:z">> = iolist_to_binary(join(re:split("zbaaz","(?<=b(?1))(a)",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=b(?1))(a)",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=b(?1))(a)",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=b(?1))(a)",[]))), 
-    <<"aaa">> = iolist_to_binary(join(re:split("aaa","(?<=b(?1))(a)",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=b(?1))(a)",[]))),
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","(?<=b(?1))(a)",[trim]))),
     <<"aaa">> = iolist_to_binary(join(re:split("aaa","(?<=b(?1))(a)",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<"aaa">> = iolist_to_binary(join(re:split("aaa","(?<=b(?1))(a)",[]))), 
-    <<"b:a:z">> = iolist_to_binary(join(re:split("baz","(?<X>a)(?<=b(?&X))",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","(?<=b(?1))(a)",[]))),
+    <<"b:a:z">> = iolist_to_binary(join(re:split("baz","(?<X>a)(?<=b(?&X))",[trim]))),
     <<"b:a:z">> = iolist_to_binary(join(re:split("baz","(?<X>a)(?<=b(?&X))",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<"b:a:z">> = iolist_to_binary(join(re:split("baz","(?<X>a)(?<=b(?&X))",[]))), 
-    <<":abc">> = iolist_to_binary(join(re:split("abcabc","^(?|(abc)|(def))\\1",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<"b:a:z">> = iolist_to_binary(join(re:split("baz","(?<X>a)(?<=b(?&X))",[]))),
+    <<":abc">> = iolist_to_binary(join(re:split("abcabc","^(?|(abc)|(def))\\1",[trim]))),
     <<":abc:">> = iolist_to_binary(join(re:split("abcabc","^(?|(abc)|(def))\\1",[{parts,
-                                                                                                                                                                                                   2}]))), 
-    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","^(?|(abc)|(def))\\1",[]))), 
-    <<":def">> = iolist_to_binary(join(re:split("defdef","^(?|(abc)|(def))\\1",[trim]))), 
+                                                                                                                                                                                                   2}]))),
+    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","^(?|(abc)|(def))\\1",[]))),
+    <<":def">> = iolist_to_binary(join(re:split("defdef","^(?|(abc)|(def))\\1",[trim]))),
     <<":def:">> = iolist_to_binary(join(re:split("defdef","^(?|(abc)|(def))\\1",[{parts,
-                                                                                                                                                                                                   2}]))), 
-    <<":def:">> = iolist_to_binary(join(re:split("defdef","^(?|(abc)|(def))\\1",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?|(abc)|(def))\\1",[trim]))), 
+                                                                                                                                                                                                   2}]))),
+    <<":def:">> = iolist_to_binary(join(re:split("defdef","^(?|(abc)|(def))\\1",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?|(abc)|(def))\\1",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?|(abc)|(def))\\1",[{parts,
-                                                                                                                                                                                                           2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?|(abc)|(def))\\1",[]))), 
-    <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","^(?|(abc)|(def))\\1",[trim]))), 
+                                                                                                                                                                                                           2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?|(abc)|(def))\\1",[]))),
+    <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","^(?|(abc)|(def))\\1",[trim]))),
     <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","^(?|(abc)|(def))\\1",[{parts,
-                                                                                                                                                                                                   2}]))), 
-    <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","^(?|(abc)|(def))\\1",[]))), 
-    <<"defabc">> = iolist_to_binary(join(re:split("defabc","^(?|(abc)|(def))\\1",[trim]))), 
+                                                                                                                                                                                                   2}]))),
+    <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","^(?|(abc)|(def))\\1",[]))),
+    <<"defabc">> = iolist_to_binary(join(re:split("defabc","^(?|(abc)|(def))\\1",[trim]))),
     <<"defabc">> = iolist_to_binary(join(re:split("defabc","^(?|(abc)|(def))\\1",[{parts,
-                                                                                                                                                                                                   2}]))), 
-    <<"defabc">> = iolist_to_binary(join(re:split("defabc","^(?|(abc)|(def))\\1",[]))), 
+                                                                                                                                                                                                   2}]))),
+    <<"defabc">> = iolist_to_binary(join(re:split("defabc","^(?|(abc)|(def))\\1",[]))),
     ok.
 run43() ->
-    <<":abc">> = iolist_to_binary(join(re:split("abcabc","^(?|(abc)|(def))(?1)",[trim]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("abcabc","^(?|(abc)|(def))(?1)",[trim]))),
     <<":abc:">> = iolist_to_binary(join(re:split("abcabc","^(?|(abc)|(def))(?1)",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","^(?|(abc)|(def))(?1)",[]))), 
-    <<":def">> = iolist_to_binary(join(re:split("defabc","^(?|(abc)|(def))(?1)",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","^(?|(abc)|(def))(?1)",[]))),
+    <<":def">> = iolist_to_binary(join(re:split("defabc","^(?|(abc)|(def))(?1)",[trim]))),
     <<":def:">> = iolist_to_binary(join(re:split("defabc","^(?|(abc)|(def))(?1)",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<":def:">> = iolist_to_binary(join(re:split("defabc","^(?|(abc)|(def))(?1)",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?|(abc)|(def))(?1)",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<":def:">> = iolist_to_binary(join(re:split("defabc","^(?|(abc)|(def))(?1)",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?|(abc)|(def))(?1)",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?|(abc)|(def))(?1)",[{parts,
-                                                                                                                                                                                                            2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?|(abc)|(def))(?1)",[]))), 
-    <<"defdef">> = iolist_to_binary(join(re:split("defdef","^(?|(abc)|(def))(?1)",[trim]))), 
+                                                                                                                                                                                                            2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?|(abc)|(def))(?1)",[]))),
+    <<"defdef">> = iolist_to_binary(join(re:split("defdef","^(?|(abc)|(def))(?1)",[trim]))),
     <<"defdef">> = iolist_to_binary(join(re:split("defdef","^(?|(abc)|(def))(?1)",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<"defdef">> = iolist_to_binary(join(re:split("defdef","^(?|(abc)|(def))(?1)",[]))), 
-    <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","^(?|(abc)|(def))(?1)",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<"defdef">> = iolist_to_binary(join(re:split("defdef","^(?|(abc)|(def))(?1)",[]))),
+    <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","^(?|(abc)|(def))(?1)",[trim]))),
     <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","^(?|(abc)|(def))(?1)",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","^(?|(abc)|(def))(?1)",[]))), 
-    <<"A:C:D">> = iolist_to_binary(join(re:split("ABCD","(?:(?1)|B)(A(*F)|C)",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","^(?|(abc)|(def))(?1)",[]))),
+    <<"A:C:D">> = iolist_to_binary(join(re:split("ABCD","(?:(?1)|B)(A(*F)|C)",[trim]))),
     <<"A:C:D">> = iolist_to_binary(join(re:split("ABCD","(?:(?1)|B)(A(*F)|C)",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"A:C:D">> = iolist_to_binary(join(re:split("ABCD","(?:(?1)|B)(A(*F)|C)",[]))), 
-    <<":C:D">> = iolist_to_binary(join(re:split("CCD","(?:(?1)|B)(A(*F)|C)",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<"A:C:D">> = iolist_to_binary(join(re:split("ABCD","(?:(?1)|B)(A(*F)|C)",[]))),
+    <<":C:D">> = iolist_to_binary(join(re:split("CCD","(?:(?1)|B)(A(*F)|C)",[trim]))),
     <<":C:D">> = iolist_to_binary(join(re:split("CCD","(?:(?1)|B)(A(*F)|C)",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<":C:D">> = iolist_to_binary(join(re:split("CCD","(?:(?1)|B)(A(*F)|C)",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?:(?1)|B)(A(*F)|C)",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<":C:D">> = iolist_to_binary(join(re:split("CCD","(?:(?1)|B)(A(*F)|C)",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?:(?1)|B)(A(*F)|C)",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?:(?1)|B)(A(*F)|C)",[{parts,
-                                                                                                                                                                                                          2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?:(?1)|B)(A(*F)|C)",[]))), 
-    <<"CAD">> = iolist_to_binary(join(re:split("CAD","(?:(?1)|B)(A(*F)|C)",[trim]))), 
+                                                                                                                                                                                                          2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?:(?1)|B)(A(*F)|C)",[]))),
+    <<"CAD">> = iolist_to_binary(join(re:split("CAD","(?:(?1)|B)(A(*F)|C)",[trim]))),
     <<"CAD">> = iolist_to_binary(join(re:split("CAD","(?:(?1)|B)(A(*F)|C)",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<"CAD">> = iolist_to_binary(join(re:split("CAD","(?:(?1)|B)(A(*F)|C)",[]))), 
-    <<":C:D">> = iolist_to_binary(join(re:split("CCD","^(?:(?1)|B)(A(*F)|C)",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<"CAD">> = iolist_to_binary(join(re:split("CAD","(?:(?1)|B)(A(*F)|C)",[]))),
+    <<":C:D">> = iolist_to_binary(join(re:split("CCD","^(?:(?1)|B)(A(*F)|C)",[trim]))),
     <<":C:D">> = iolist_to_binary(join(re:split("CCD","^(?:(?1)|B)(A(*F)|C)",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<":C:D">> = iolist_to_binary(join(re:split("CCD","^(?:(?1)|B)(A(*F)|C)",[]))), 
-    <<":C:D">> = iolist_to_binary(join(re:split("BCD","^(?:(?1)|B)(A(*F)|C)",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<":C:D">> = iolist_to_binary(join(re:split("CCD","^(?:(?1)|B)(A(*F)|C)",[]))),
+    <<":C:D">> = iolist_to_binary(join(re:split("BCD","^(?:(?1)|B)(A(*F)|C)",[trim]))),
     <<":C:D">> = iolist_to_binary(join(re:split("BCD","^(?:(?1)|B)(A(*F)|C)",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<":C:D">> = iolist_to_binary(join(re:split("BCD","^(?:(?1)|B)(A(*F)|C)",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:(?1)|B)(A(*F)|C)",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<":C:D">> = iolist_to_binary(join(re:split("BCD","^(?:(?1)|B)(A(*F)|C)",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:(?1)|B)(A(*F)|C)",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:(?1)|B)(A(*F)|C)",[{parts,
-                                                                                                                                                                                                            2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:(?1)|B)(A(*F)|C)",[]))), 
-    <<"ABCD">> = iolist_to_binary(join(re:split("ABCD","^(?:(?1)|B)(A(*F)|C)",[trim]))), 
+                                                                                                                                                                                                            2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:(?1)|B)(A(*F)|C)",[]))),
+    <<"ABCD">> = iolist_to_binary(join(re:split("ABCD","^(?:(?1)|B)(A(*F)|C)",[trim]))),
     <<"ABCD">> = iolist_to_binary(join(re:split("ABCD","^(?:(?1)|B)(A(*F)|C)",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"ABCD">> = iolist_to_binary(join(re:split("ABCD","^(?:(?1)|B)(A(*F)|C)",[]))), 
-    <<"CAD">> = iolist_to_binary(join(re:split("CAD","^(?:(?1)|B)(A(*F)|C)",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<"ABCD">> = iolist_to_binary(join(re:split("ABCD","^(?:(?1)|B)(A(*F)|C)",[]))),
+    <<"CAD">> = iolist_to_binary(join(re:split("CAD","^(?:(?1)|B)(A(*F)|C)",[trim]))),
     <<"CAD">> = iolist_to_binary(join(re:split("CAD","^(?:(?1)|B)(A(*F)|C)",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"CAD">> = iolist_to_binary(join(re:split("CAD","^(?:(?1)|B)(A(*F)|C)",[]))), 
-    <<"BAD">> = iolist_to_binary(join(re:split("BAD","^(?:(?1)|B)(A(*F)|C)",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<"CAD">> = iolist_to_binary(join(re:split("CAD","^(?:(?1)|B)(A(*F)|C)",[]))),
+    <<"BAD">> = iolist_to_binary(join(re:split("BAD","^(?:(?1)|B)(A(*F)|C)",[trim]))),
     <<"BAD">> = iolist_to_binary(join(re:split("BAD","^(?:(?1)|B)(A(*F)|C)",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"BAD">> = iolist_to_binary(join(re:split("BAD","^(?:(?1)|B)(A(*F)|C)",[]))), 
-    <<":A:D">> = iolist_to_binary(join(re:split("AAD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<"BAD">> = iolist_to_binary(join(re:split("BAD","^(?:(?1)|B)(A(*F)|C)",[]))),
+    <<":A:D">> = iolist_to_binary(join(re:split("AAD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[trim]))),
     <<":A:D">> = iolist_to_binary(join(re:split("AAD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[{parts,
-                                                                                                                                                                                                            2}]))), 
-    <<":A:D">> = iolist_to_binary(join(re:split("AAD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[]))), 
-    <<":C">> = iolist_to_binary(join(re:split("ACD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[trim]))), 
+                                                                                                                                                                                                            2}]))),
+    <<":A:D">> = iolist_to_binary(join(re:split("AAD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[]))),
+    <<":C">> = iolist_to_binary(join(re:split("ACD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[trim]))),
     <<":C:">> = iolist_to_binary(join(re:split("ACD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[{parts,
-                                                                                                                                                                                                            2}]))), 
-    <<":C:">> = iolist_to_binary(join(re:split("ACD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[]))), 
-    <<":A:D">> = iolist_to_binary(join(re:split("BAD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[trim]))), 
+                                                                                                                                                                                                            2}]))),
+    <<":C:">> = iolist_to_binary(join(re:split("ACD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[]))),
+    <<":A:D">> = iolist_to_binary(join(re:split("BAD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[trim]))),
     <<":A:D">> = iolist_to_binary(join(re:split("BAD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[{parts,
-                                                                                                                                                                                                            2}]))), 
-    <<":A:D">> = iolist_to_binary(join(re:split("BAD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[]))), 
-    <<":C">> = iolist_to_binary(join(re:split("BCD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[trim]))), 
+                                                                                                                                                                                                            2}]))),
+    <<":A:D">> = iolist_to_binary(join(re:split("BAD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[]))),
+    <<":C">> = iolist_to_binary(join(re:split("BCD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[trim]))),
     <<":C:">> = iolist_to_binary(join(re:split("BCD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[{parts,
-                                                                                                                                                                                                            2}]))), 
-    <<":C:">> = iolist_to_binary(join(re:split("BCD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[]))), 
-    <<":A:X">> = iolist_to_binary(join(re:split("BAX","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[trim]))), 
+                                                                                                                                                                                                            2}]))),
+    <<":C:">> = iolist_to_binary(join(re:split("BCD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[]))),
+    <<":A:X">> = iolist_to_binary(join(re:split("BAX","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[trim]))),
     <<":A:X">> = iolist_to_binary(join(re:split("BAX","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[{parts,
-                                                                                                                                                                                                            2}]))), 
-    <<":A:X">> = iolist_to_binary(join(re:split("BAX","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[trim]))), 
+                                                                                                                                                                                                            2}]))),
+    <<":A:X">> = iolist_to_binary(join(re:split("BAX","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[{parts,
-                                                                                                                                                                                                                          2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[]))), 
-    <<"ACX">> = iolist_to_binary(join(re:split("ACX","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[trim]))), 
+                                                                                                                                                                                                                          2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[]))),
+    <<"ACX">> = iolist_to_binary(join(re:split("ACX","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[trim]))),
     <<"ACX">> = iolist_to_binary(join(re:split("ACX","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[{parts,
-                                                                                                                                                                                                            2}]))), 
-    <<"ACX">> = iolist_to_binary(join(re:split("ACX","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[]))), 
-    <<"ABC">> = iolist_to_binary(join(re:split("ABC","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[trim]))), 
+                                                                                                                                                                                                            2}]))),
+    <<"ACX">> = iolist_to_binary(join(re:split("ACX","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[]))),
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[trim]))),
     <<"ABC">> = iolist_to_binary(join(re:split("ABC","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[{parts,
-                                                                                                                                                                                                            2}]))), 
-    <<"ABC">> = iolist_to_binary(join(re:split("ABC","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("BAC","(?(DEFINE)(A))B(?1)C",[trim]))), 
+                                                                                                                                                                                                            2}]))),
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[]))),
+    <<"">> = iolist_to_binary(join(re:split("BAC","(?(DEFINE)(A))B(?1)C",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("BAC","(?(DEFINE)(A))B(?1)C",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("BAC","(?(DEFINE)(A))B(?1)C",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("BAAC","(?(DEFINE)((A)\\2))B(?1)C",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("BAC","(?(DEFINE)(A))B(?1)C",[]))),
+    <<"">> = iolist_to_binary(join(re:split("BAAC","(?(DEFINE)((A)\\2))B(?1)C",[trim]))),
     <<":::">> = iolist_to_binary(join(re:split("BAAC","(?(DEFINE)((A)\\2))B(?1)C",[{parts,
-                                                                                                                                                                                                           2}]))), 
-    <<":::">> = iolist_to_binary(join(re:split("BAAC","(?(DEFINE)((A)\\2))B(?1)C",[]))), 
+                                                                                                                                                                                                           2}]))),
+    <<":::">> = iolist_to_binary(join(re:split("BAAC","(?(DEFINE)((A)\\2))B(?1)C",[]))),
     <<":(ab(cd)ef):ef">> = iolist_to_binary(join(re:split("(ab(cd)ef)","(?<pn> \\( ( [^()]++ | (?&pn) )* \\) )",[extended,
-                                                                                                                                                                                                                                                trim]))), 
+                                                                                                                                                                                                                                                trim]))),
     <<":(ab(cd)ef):ef:">> = iolist_to_binary(join(re:split("(ab(cd)ef)","(?<pn> \\( ( [^()]++ | (?&pn) )* \\) )",[extended,
                                                                                                                                                                                                                                                   {parts,
-                                                                                                                                                                                                                                                   2}]))), 
-    <<":(ab(cd)ef):ef:">> = iolist_to_binary(join(re:split("(ab(cd)ef)","(?<pn> \\( ( [^()]++ | (?&pn) )* \\) )",[extended]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?=a(*SKIP)b|ac)",[trim]))), 
+                                                                                                                                                                                                                                                   2}]))),
+    <<":(ab(cd)ef):ef:">> = iolist_to_binary(join(re:split("(ab(cd)ef)","(?<pn> \\( ( [^()]++ | (?&pn) )* \\) )",[extended]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?=a(*SKIP)b|ac)",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?=a(*SKIP)b|ac)",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?=a(*SKIP)b|ac)",[]))), 
-    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?=a(*SKIP)b|ac)",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?=a(*SKIP)b|ac)",[]))),
+    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?=a(*SKIP)b|ac)",[trim]))),
     <<"ac">> = iolist_to_binary(join(re:split("ac","^(?=a(*SKIP)b|ac)",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?=a(*SKIP)b|ac)",[]))), 
-    <<"ab">> = iolist_to_binary(join(re:split("ab","^(?=a(*PRUNE)b)",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?=a(*SKIP)b|ac)",[]))),
+    <<"ab">> = iolist_to_binary(join(re:split("ab","^(?=a(*PRUNE)b)",[trim]))),
     <<"ab">> = iolist_to_binary(join(re:split("ab","^(?=a(*PRUNE)b)",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"ab">> = iolist_to_binary(join(re:split("ab","^(?=a(*PRUNE)b)",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?=a(*PRUNE)b)",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"ab">> = iolist_to_binary(join(re:split("ab","^(?=a(*PRUNE)b)",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?=a(*PRUNE)b)",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?=a(*PRUNE)b)",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?=a(*PRUNE)b)",[]))), 
-    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?=a(*PRUNE)b)",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?=a(*PRUNE)b)",[]))),
+    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?=a(*PRUNE)b)",[trim]))),
     <<"ac">> = iolist_to_binary(join(re:split("ac","^(?=a(*PRUNE)b)",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?=a(*PRUNE)b)",[]))), 
-    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?=a(*ACCEPT)b)",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?=a(*PRUNE)b)",[]))),
+    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?=a(*ACCEPT)b)",[trim]))),
     <<"ac">> = iolist_to_binary(join(re:split("ac","^(?=a(*ACCEPT)b)",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?=a(*ACCEPT)b)",[]))), 
-    <<"a">> = iolist_to_binary(join(re:split("ab","(?>a\\Kb)",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?=a(*ACCEPT)b)",[]))),
+    <<"a">> = iolist_to_binary(join(re:split("ab","(?>a\\Kb)",[trim]))),
     <<"a:">> = iolist_to_binary(join(re:split("ab","(?>a\\Kb)",[{parts,
-                                                                                                                                                                       2}]))), 
-    <<"a:">> = iolist_to_binary(join(re:split("ab","(?>a\\Kb)",[]))), 
-    <<"a:ab">> = iolist_to_binary(join(re:split("ab","((?>a\\Kb))",[trim]))), 
+                                                                                                                                                                       2}]))),
+    <<"a:">> = iolist_to_binary(join(re:split("ab","(?>a\\Kb)",[]))),
+    <<"a:ab">> = iolist_to_binary(join(re:split("ab","((?>a\\Kb))",[trim]))),
     <<"a:ab:">> = iolist_to_binary(join(re:split("ab","((?>a\\Kb))",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<"a:ab:">> = iolist_to_binary(join(re:split("ab","((?>a\\Kb))",[]))), 
-    <<"a:ab">> = iolist_to_binary(join(re:split("ab","(a\\Kb)",[trim]))), 
+                                                                                                                                                                           2}]))),
+    <<"a:ab:">> = iolist_to_binary(join(re:split("ab","((?>a\\Kb))",[]))),
+    <<"a:ab">> = iolist_to_binary(join(re:split("ab","(a\\Kb)",[trim]))),
     <<"a:ab:">> = iolist_to_binary(join(re:split("ab","(a\\Kb)",[{parts,
-                                                                                                                                                                   2}]))), 
-    <<"a:ab:">> = iolist_to_binary(join(re:split("ab","(a\\Kb)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("ac","^a\\Kcz|ac",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<"a:ab:">> = iolist_to_binary(join(re:split("ab","(a\\Kb)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("ac","^a\\Kcz|ac",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("ac","^a\\Kcz|ac",[{parts,
-                                                                                                                                                                         2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ac","^a\\Kcz|ac",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("ab","(?>a\\Kbz|ab)",[trim]))), 
+                                                                                                                                                                         2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ac","^a\\Kcz|ac",[]))),
+    <<"">> = iolist_to_binary(join(re:split("ab","(?>a\\Kbz|ab)",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("ab","(?>a\\Kbz|ab)",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ab","(?>a\\Kbz|ab)",[]))), 
-    <<"a">> = iolist_to_binary(join(re:split("ab","^(?&t)(?(DEFINE)(?<t>a\\Kb))$",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ab","(?>a\\Kbz|ab)",[]))),
+    <<"a">> = iolist_to_binary(join(re:split("ab","^(?&t)(?(DEFINE)(?<t>a\\Kb))$",[trim]))),
     <<"a::">> = iolist_to_binary(join(re:split("ab","^(?&t)(?(DEFINE)(?<t>a\\Kb))$",[{parts,
-                                                                                                                                                                                                                2}]))), 
-    <<"a::">> = iolist_to_binary(join(re:split("ab","^(?&t)(?(DEFINE)(?<t>a\\Kb))$",[]))), 
-    <<":c">> = iolist_to_binary(join(re:split("a(b)c","^([^()]|\\((?1)*\\))*$",[trim]))), 
+                                                                                                                                                                                                                2}]))),
+    <<"a::">> = iolist_to_binary(join(re:split("ab","^(?&t)(?(DEFINE)(?<t>a\\Kb))$",[]))),
+    <<":c">> = iolist_to_binary(join(re:split("a(b)c","^([^()]|\\((?1)*\\))*$",[trim]))),
     <<":c:">> = iolist_to_binary(join(re:split("a(b)c","^([^()]|\\((?1)*\\))*$",[{parts,
-                                                                                                                                                                                                         2}]))), 
-    <<":c:">> = iolist_to_binary(join(re:split("a(b)c","^([^()]|\\((?1)*\\))*$",[]))), 
-    <<":e">> = iolist_to_binary(join(re:split("a(b(c)d)e","^([^()]|\\((?1)*\\))*$",[trim]))), 
+                                                                                                                                                                                                         2}]))),
+    <<":c:">> = iolist_to_binary(join(re:split("a(b)c","^([^()]|\\((?1)*\\))*$",[]))),
+    <<":e">> = iolist_to_binary(join(re:split("a(b(c)d)e","^([^()]|\\((?1)*\\))*$",[trim]))),
     <<":e:">> = iolist_to_binary(join(re:split("a(b(c)d)e","^([^()]|\\((?1)*\\))*$",[{parts,
-                                                                                                                                                                                                                 2}]))), 
-    <<":e:">> = iolist_to_binary(join(re:split("a(b(c)d)e","^([^()]|\\((?1)*\\))*$",[]))), 
-    <<":0">> = iolist_to_binary(join(re:split("0","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))",[trim]))), 
+                                                                                                                                                                                                                 2}]))),
+    <<":e:">> = iolist_to_binary(join(re:split("a(b(c)d)e","^([^()]|\\((?1)*\\))*$",[]))),
+    <<":0">> = iolist_to_binary(join(re:split("0","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))",[trim]))),
     <<":0::">> = iolist_to_binary(join(re:split("0","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))",[{parts,
-                                                                                                                                                                                                                  2}]))), 
-    <<":0::">> = iolist_to_binary(join(re:split("0","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))",[]))), 
-    <<":00:0">> = iolist_to_binary(join(re:split("00","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))",[trim]))), 
+                                                                                                                                                                                                                  2}]))),
+    <<":0::">> = iolist_to_binary(join(re:split("0","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))",[]))),
+    <<":00:0">> = iolist_to_binary(join(re:split("00","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))",[trim]))),
     <<":00:0:">> = iolist_to_binary(join(re:split("00","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))",[{parts,
-                                                                                                                                                                                                                    2}]))), 
-    <<":00:0:">> = iolist_to_binary(join(re:split("00","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))",[]))), 
-    <<":0000:0">> = iolist_to_binary(join(re:split("0000","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))",[trim]))), 
+                                                                                                                                                                                                                    2}]))),
+    <<":00:0:">> = iolist_to_binary(join(re:split("00","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))",[]))),
+    <<":0000:0">> = iolist_to_binary(join(re:split("0000","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))",[trim]))),
     <<":0000:0:">> = iolist_to_binary(join(re:split("0000","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))",[{parts,
-                                                                                                                                                                                                                        2}]))), 
-    <<":0000:0:">> = iolist_to_binary(join(re:split("0000","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))",[]))), 
-    <<":0:0">> = iolist_to_binary(join(re:split("0","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))",[trim]))), 
+                                                                                                                                                                                                                        2}]))),
+    <<":0000:0:">> = iolist_to_binary(join(re:split("0000","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))",[]))),
+    <<":0:0">> = iolist_to_binary(join(re:split("0","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))",[trim]))),
     <<":0:0:">> = iolist_to_binary(join(re:split("0","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))",[{parts,
-                                                                                                                                                                                                                  2}]))), 
-    <<":0:0:">> = iolist_to_binary(join(re:split("0","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))",[]))), 
-    <<":0:0::0:0">> = iolist_to_binary(join(re:split("00","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))",[trim]))), 
+                                                                                                                                                                                                                  2}]))),
+    <<":0:0:">> = iolist_to_binary(join(re:split("0","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))",[]))),
+    <<":0:0::0:0">> = iolist_to_binary(join(re:split("00","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))",[trim]))),
     <<":0:0:0">> = iolist_to_binary(join(re:split("00","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))",[{parts,
-                                                                                                                                                                                                                    2}]))), 
-    <<":0:0::0:0:">> = iolist_to_binary(join(re:split("00","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))",[]))), 
-    <<":0:0::0:0::0:0::0:0">> = iolist_to_binary(join(re:split("0000","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))",[trim]))), 
+                                                                                                                                                                                                                    2}]))),
+    <<":0:0::0:0:">> = iolist_to_binary(join(re:split("00","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))",[]))),
+    <<":0:0::0:0::0:0::0:0">> = iolist_to_binary(join(re:split("0000","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))",[trim]))),
     <<":0:0:000">> = iolist_to_binary(join(re:split("0000","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))",[{parts,
-                                                                                                                                                                                                                        2}]))), 
-    <<":0:0::0:0::0:0::0:0:">> = iolist_to_binary(join(re:split("0000","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))",[]))), 
+                                                                                                                                                                                                                        2}]))),
+    <<":0:0::0:0::0:0::0:0:">> = iolist_to_binary(join(re:split("0000","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))",[]))),
     ok.
 run44() ->
-    <<"ACABX">> = iolist_to_binary(join(re:split("ACABX","A(*COMMIT)(B|D)",[trim]))), 
+    <<"ACABX">> = iolist_to_binary(join(re:split("ACABX","A(*COMMIT)(B|D)",[trim]))),
     <<"ACABX">> = iolist_to_binary(join(re:split("ACABX","A(*COMMIT)(B|D)",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"ACABX">> = iolist_to_binary(join(re:split("ACABX","A(*COMMIT)(B|D)",[]))), 
-    <<":A:B:C:DEFG">> = iolist_to_binary(join(re:split("ABCDEFG","(*COMMIT)(A|P)(B|P)(C|P)",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<"ACABX">> = iolist_to_binary(join(re:split("ACABX","A(*COMMIT)(B|D)",[]))),
+    <<":A:B:C:DEFG">> = iolist_to_binary(join(re:split("ABCDEFG","(*COMMIT)(A|P)(B|P)(C|P)",[trim]))),
     <<":A:B:C:DEFG">> = iolist_to_binary(join(re:split("ABCDEFG","(*COMMIT)(A|P)(B|P)(C|P)",[{parts,
-                                                                                                                                                                                                              2}]))), 
-    <<":A:B:C:DEFG">> = iolist_to_binary(join(re:split("ABCDEFG","(*COMMIT)(A|P)(B|P)(C|P)",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(*COMMIT)(A|P)(B|P)(C|P)",[trim]))), 
+                                                                                                                                                                                                              2}]))),
+    <<":A:B:C:DEFG">> = iolist_to_binary(join(re:split("ABCDEFG","(*COMMIT)(A|P)(B|P)(C|P)",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(*COMMIT)(A|P)(B|P)(C|P)",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(*COMMIT)(A|P)(B|P)(C|P)",[{parts,
-                                                                                                                                                                                                                    2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(*COMMIT)(A|P)(B|P)(C|P)",[]))), 
-    <<"DEFGABC">> = iolist_to_binary(join(re:split("DEFGABC","(*COMMIT)(A|P)(B|P)(C|P)",[trim]))), 
+                                                                                                                                                                                                                    2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(*COMMIT)(A|P)(B|P)(C|P)",[]))),
+    <<"DEFGABC">> = iolist_to_binary(join(re:split("DEFGABC","(*COMMIT)(A|P)(B|P)(C|P)",[trim]))),
     <<"DEFGABC">> = iolist_to_binary(join(re:split("DEFGABC","(*COMMIT)(A|P)(B|P)(C|P)",[{parts,
-                                                                                                                                                                                                              2}]))), 
-    <<"DEFGABC">> = iolist_to_binary(join(re:split("DEFGABC","(*COMMIT)(A|P)(B|P)(C|P)",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("abbb","(\\w+)(?>b(*COMMIT))\\w{2}",[trim]))), 
+                                                                                                                                                                                                              2}]))),
+    <<"DEFGABC">> = iolist_to_binary(join(re:split("DEFGABC","(*COMMIT)(A|P)(B|P)(C|P)",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("abbb","(\\w+)(?>b(*COMMIT))\\w{2}",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("abbb","(\\w+)(?>b(*COMMIT))\\w{2}",[{parts,
-                                                                                                                                                                                                              2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("abbb","(\\w+)(?>b(*COMMIT))\\w{2}",[]))), 
-    <<"abbb">> = iolist_to_binary(join(re:split("abbb","(\\w+)b(*COMMIT)\\w{2}",[trim]))), 
+                                                                                                                                                                                                              2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("abbb","(\\w+)(?>b(*COMMIT))\\w{2}",[]))),
+    <<"abbb">> = iolist_to_binary(join(re:split("abbb","(\\w+)b(*COMMIT)\\w{2}",[trim]))),
     <<"abbb">> = iolist_to_binary(join(re:split("abbb","(\\w+)b(*COMMIT)\\w{2}",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<"abbb">> = iolist_to_binary(join(re:split("abbb","(\\w+)b(*COMMIT)\\w{2}",[]))), 
-    <<"b::c">> = iolist_to_binary(join(re:split("bac","(?&t)(?#()(?(DEFINE)(?<t>a))",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<"abbb">> = iolist_to_binary(join(re:split("abbb","(\\w+)b(*COMMIT)\\w{2}",[]))),
+    <<"b::c">> = iolist_to_binary(join(re:split("bac","(?&t)(?#()(?(DEFINE)(?<t>a))",[trim]))),
     <<"b::c">> = iolist_to_binary(join(re:split("bac","(?&t)(?#()(?(DEFINE)(?<t>a))",[{parts,
-                                                                                                                                                                                                              2}]))), 
-    <<"b::c">> = iolist_to_binary(join(re:split("bac","(?&t)(?#()(?(DEFINE)(?<t>a))",[]))), 
-    <<"yes">> = iolist_to_binary(join(re:split("yes","(?>(*COMMIT)(?>yes|no)(*THEN)(*F))?",[trim]))), 
+                                                                                                                                                                                                              2}]))),
+    <<"b::c">> = iolist_to_binary(join(re:split("bac","(?&t)(?#()(?(DEFINE)(?<t>a))",[]))),
+    <<"yes">> = iolist_to_binary(join(re:split("yes","(?>(*COMMIT)(?>yes|no)(*THEN)(*F))?",[trim]))),
     <<"yes">> = iolist_to_binary(join(re:split("yes","(?>(*COMMIT)(?>yes|no)(*THEN)(*F))?",[{parts,
-                                                                                                                                                                                                                            2}]))), 
-    <<"yes">> = iolist_to_binary(join(re:split("yes","(?>(*COMMIT)(?>yes|no)(*THEN)(*F))?",[]))), 
-    <<"yes">> = iolist_to_binary(join(re:split("yes","(?>(*COMMIT)(yes|no)(*THEN)(*F))?",[trim]))), 
+                                                                                                                                                                                                                            2}]))),
+    <<"yes">> = iolist_to_binary(join(re:split("yes","(?>(*COMMIT)(?>yes|no)(*THEN)(*F))?",[]))),
+    <<"yes">> = iolist_to_binary(join(re:split("yes","(?>(*COMMIT)(yes|no)(*THEN)(*F))?",[trim]))),
     <<"yes">> = iolist_to_binary(join(re:split("yes","(?>(*COMMIT)(yes|no)(*THEN)(*F))?",[{parts,
-                                                                                                                                                                                                                        2}]))), 
-    <<"yes">> = iolist_to_binary(join(re:split("yes","(?>(*COMMIT)(yes|no)(*THEN)(*F))?",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("bc","b?(*SKIP)c",[trim]))), 
+                                                                                                                                                                                                                        2}]))),
+    <<"yes">> = iolist_to_binary(join(re:split("yes","(?>(*COMMIT)(yes|no)(*THEN)(*F))?",[]))),
+    <<"">> = iolist_to_binary(join(re:split("bc","b?(*SKIP)c",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("bc","b?(*SKIP)c",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("bc","b?(*SKIP)c",[]))), 
-    <<"a">> = iolist_to_binary(join(re:split("abc","b?(*SKIP)c",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<":">> = iolist_to_binary(join(re:split("bc","b?(*SKIP)c",[]))),
+    <<"a">> = iolist_to_binary(join(re:split("abc","b?(*SKIP)c",[trim]))),
     <<"a:">> = iolist_to_binary(join(re:split("abc","b?(*SKIP)c",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<"a:">> = iolist_to_binary(join(re:split("abc","b?(*SKIP)c",[]))), 
+                                                                                                                                                                          2}]))),
+    <<"a:">> = iolist_to_binary(join(re:split("abc","b?(*SKIP)c",[]))),
     ok.
 run45() ->
-    <<"a">> = iolist_to_binary(join(re:split("a","(*SKIP)bc",[trim]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","(*SKIP)bc",[trim]))),
     <<"a">> = iolist_to_binary(join(re:split("a","(*SKIP)bc",[{parts,
-                                                                                                                                                                    2}]))), 
-    <<"a">> = iolist_to_binary(join(re:split("a","(*SKIP)bc",[]))), 
-    <<"a">> = iolist_to_binary(join(re:split("a","(*SKIP)b",[trim]))), 
+                                                                                                                                                                    2}]))),
+    <<"a">> = iolist_to_binary(join(re:split("a","(*SKIP)bc",[]))),
+    <<"a">> = iolist_to_binary(join(re:split("a","(*SKIP)b",[trim]))),
     <<"a">> = iolist_to_binary(join(re:split("a","(*SKIP)b",[{parts,
-                                                                                                                                                                  2}]))), 
-    <<"a">> = iolist_to_binary(join(re:split("a","(*SKIP)b",[]))), 
-    <<"x::x::x">> = iolist_to_binary(join(re:split("xxx","(?P<abn>(?P=abn)xxx|)+",[trim]))), 
+                                                                                                                                                                  2}]))),
+    <<"a">> = iolist_to_binary(join(re:split("a","(*SKIP)b",[]))),
+    <<"x::x::x">> = iolist_to_binary(join(re:split("xxx","(?P<abn>(?P=abn)xxx|)+",[trim]))),
     <<"x::xx">> = iolist_to_binary(join(re:split("xxx","(?P<abn>(?P=abn)xxx|)+",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<"x::x::x::">> = iolist_to_binary(join(re:split("xxx","(?P<abn>(?P=abn)xxx|)+",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aa","(?i:([^b]))(?1)",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<"x::x::x::">> = iolist_to_binary(join(re:split("xxx","(?P<abn>(?P=abn)xxx|)+",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aa","(?i:([^b]))(?1)",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aa","(?i:([^b]))(?1)",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aa","(?i:([^b]))(?1)",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aA","(?i:([^b]))(?1)",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aa","(?i:([^b]))(?1)",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aA","(?i:([^b]))(?1)",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aA","(?i:([^b]))(?1)",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aA","(?i:([^b]))(?1)",[]))), 
-    <<":*:: ::a::l::r">> = iolist_to_binary(join(re:split("** Failers","(?i:([^b]))(?1)",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aA","(?i:([^b]))(?1)",[]))),
+    <<":*:: ::a::l::r">> = iolist_to_binary(join(re:split("** Failers","(?i:([^b]))(?1)",[trim]))),
     <<":*: Failers">> = iolist_to_binary(join(re:split("** Failers","(?i:([^b]))(?1)",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<":*:: ::a::l::r:">> = iolist_to_binary(join(re:split("** Failers","(?i:([^b]))(?1)",[]))), 
-    <<"ab">> = iolist_to_binary(join(re:split("ab","(?i:([^b]))(?1)",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<":*:: ::a::l::r:">> = iolist_to_binary(join(re:split("** Failers","(?i:([^b]))(?1)",[]))),
+    <<"ab">> = iolist_to_binary(join(re:split("ab","(?i:([^b]))(?1)",[trim]))),
     <<"ab">> = iolist_to_binary(join(re:split("ab","(?i:([^b]))(?1)",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"ab">> = iolist_to_binary(join(re:split("ab","(?i:([^b]))(?1)",[]))), 
-    <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:([^b]))(?1)",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"ab">> = iolist_to_binary(join(re:split("ab","(?i:([^b]))(?1)",[]))),
+    <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:([^b]))(?1)",[trim]))),
     <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:([^b]))(?1)",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:([^b]))(?1)",[]))), 
-    <<"Ba">> = iolist_to_binary(join(re:split("Ba","(?i:([^b]))(?1)",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:([^b]))(?1)",[]))),
+    <<"Ba">> = iolist_to_binary(join(re:split("Ba","(?i:([^b]))(?1)",[trim]))),
     <<"Ba">> = iolist_to_binary(join(re:split("Ba","(?i:([^b]))(?1)",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"Ba">> = iolist_to_binary(join(re:split("Ba","(?i:([^b]))(?1)",[]))), 
-    <<"ba">> = iolist_to_binary(join(re:split("ba","(?i:([^b]))(?1)",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"Ba">> = iolist_to_binary(join(re:split("Ba","(?i:([^b]))(?1)",[]))),
+    <<"ba">> = iolist_to_binary(join(re:split("ba","(?i:([^b]))(?1)",[trim]))),
     <<"ba">> = iolist_to_binary(join(re:split("ba","(?i:([^b]))(?1)",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"ba">> = iolist_to_binary(join(re:split("ba","(?i:([^b]))(?1)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaaaaX","^(?&t)*+(?(DEFINE)(?<t>a))\\w$",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"ba">> = iolist_to_binary(join(re:split("ba","(?i:([^b]))(?1)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaaaaX","^(?&t)*+(?(DEFINE)(?<t>a))\\w$",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("aaaaaaX","^(?&t)*+(?(DEFINE)(?<t>a))\\w$",[{parts,
-                                                                                                                                                                                                                            2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("aaaaaaX","^(?&t)*+(?(DEFINE)(?<t>a))\\w$",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?&t)*+(?(DEFINE)(?<t>a))\\w$",[trim]))), 
+                                                                                                                                                                                                                            2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("aaaaaaX","^(?&t)*+(?(DEFINE)(?<t>a))\\w$",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?&t)*+(?(DEFINE)(?<t>a))\\w$",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?&t)*+(?(DEFINE)(?<t>a))\\w$",[{parts,
-                                                                                                                                                                                                                                  2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?&t)*+(?(DEFINE)(?<t>a))\\w$",[]))), 
-    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(?&t)*+(?(DEFINE)(?<t>a))\\w$",[trim]))), 
+                                                                                                                                                                                                                                  2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?&t)*+(?(DEFINE)(?<t>a))\\w$",[]))),
+    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(?&t)*+(?(DEFINE)(?<t>a))\\w$",[trim]))),
     <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(?&t)*+(?(DEFINE)(?<t>a))\\w$",[{parts,
-                                                                                                                                                                                                                          2}]))), 
-    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(?&t)*+(?(DEFINE)(?<t>a))\\w$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaaaaX","^(?&t)*(?(DEFINE)(?<t>a))\\w$",[trim]))), 
+                                                                                                                                                                                                                          2}]))),
+    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(?&t)*+(?(DEFINE)(?<t>a))\\w$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaaaaX","^(?&t)*(?(DEFINE)(?<t>a))\\w$",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("aaaaaaX","^(?&t)*(?(DEFINE)(?<t>a))\\w$",[{parts,
-                                                                                                                                                                                                                          2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("aaaaaaX","^(?&t)*(?(DEFINE)(?<t>a))\\w$",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaaaa","^(?&t)*(?(DEFINE)(?<t>a))\\w$",[trim]))), 
+                                                                                                                                                                                                                          2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("aaaaaaX","^(?&t)*(?(DEFINE)(?<t>a))\\w$",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaaaa","^(?&t)*(?(DEFINE)(?<t>a))\\w$",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("aaaaaa","^(?&t)*(?(DEFINE)(?<t>a))\\w$",[{parts,
-                                                                                                                                                                                                                        2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("aaaaaa","^(?&t)*(?(DEFINE)(?<t>a))\\w$",[]))), 
-    <<":a:X">> = iolist_to_binary(join(re:split("aaaaX","^(a)*+(\\w)",[trim]))), 
+                                                                                                                                                                                                                        2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("aaaaaa","^(?&t)*(?(DEFINE)(?<t>a))\\w$",[]))),
+    <<":a:X">> = iolist_to_binary(join(re:split("aaaaX","^(a)*+(\\w)",[trim]))),
     <<":a:X:">> = iolist_to_binary(join(re:split("aaaaX","^(a)*+(\\w)",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<":a:X:">> = iolist_to_binary(join(re:split("aaaaX","^(a)*+(\\w)",[]))), 
-    <<"::Y:Z">> = iolist_to_binary(join(re:split("YZ","^(a)*+(\\w)",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<":a:X:">> = iolist_to_binary(join(re:split("aaaaX","^(a)*+(\\w)",[]))),
+    <<"::Y:Z">> = iolist_to_binary(join(re:split("YZ","^(a)*+(\\w)",[trim]))),
     <<"::Y:Z">> = iolist_to_binary(join(re:split("YZ","^(a)*+(\\w)",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<"::Y:Z">> = iolist_to_binary(join(re:split("YZ","^(a)*+(\\w)",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a)*+(\\w)",[trim]))), 
+                                                                                                                                                                           2}]))),
+    <<"::Y:Z">> = iolist_to_binary(join(re:split("YZ","^(a)*+(\\w)",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a)*+(\\w)",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a)*+(\\w)",[{parts,
-                                                                                                                                                                                           2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a)*+(\\w)",[]))), 
-    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(a)*+(\\w)",[trim]))), 
+                                                                                                                                                                                           2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a)*+(\\w)",[]))),
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(a)*+(\\w)",[trim]))),
     <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(a)*+(\\w)",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(a)*+(\\w)",[]))), 
-    <<":X">> = iolist_to_binary(join(re:split("aaaaX","^(?:a)*+(\\w)",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(a)*+(\\w)",[]))),
+    <<":X">> = iolist_to_binary(join(re:split("aaaaX","^(?:a)*+(\\w)",[trim]))),
     <<":X:">> = iolist_to_binary(join(re:split("aaaaX","^(?:a)*+(\\w)",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<":X:">> = iolist_to_binary(join(re:split("aaaaX","^(?:a)*+(\\w)",[]))), 
-    <<":Y:Z">> = iolist_to_binary(join(re:split("YZ","^(?:a)*+(\\w)",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<":X:">> = iolist_to_binary(join(re:split("aaaaX","^(?:a)*+(\\w)",[]))),
+    <<":Y:Z">> = iolist_to_binary(join(re:split("YZ","^(?:a)*+(\\w)",[trim]))),
     <<":Y:Z">> = iolist_to_binary(join(re:split("YZ","^(?:a)*+(\\w)",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<":Y:Z">> = iolist_to_binary(join(re:split("YZ","^(?:a)*+(\\w)",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:a)*+(\\w)",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<":Y:Z">> = iolist_to_binary(join(re:split("YZ","^(?:a)*+(\\w)",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:a)*+(\\w)",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:a)*+(\\w)",[{parts,
-                                                                                                                                                                                               2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:a)*+(\\w)",[]))), 
-    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(?:a)*+(\\w)",[trim]))), 
+                                                                                                                                                                                               2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:a)*+(\\w)",[]))),
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(?:a)*+(\\w)",[trim]))),
     <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(?:a)*+(\\w)",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(?:a)*+(\\w)",[]))), 
-    <<":a:X">> = iolist_to_binary(join(re:split("aaaaX","^(a)++(\\w)",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(?:a)*+(\\w)",[]))),
+    <<":a:X">> = iolist_to_binary(join(re:split("aaaaX","^(a)++(\\w)",[trim]))),
     <<":a:X:">> = iolist_to_binary(join(re:split("aaaaX","^(a)++(\\w)",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<":a:X:">> = iolist_to_binary(join(re:split("aaaaX","^(a)++(\\w)",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a)++(\\w)",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<":a:X:">> = iolist_to_binary(join(re:split("aaaaX","^(a)++(\\w)",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a)++(\\w)",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a)++(\\w)",[{parts,
-                                                                                                                                                                                           2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a)++(\\w)",[]))), 
-    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(a)++(\\w)",[trim]))), 
+                                                                                                                                                                                           2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a)++(\\w)",[]))),
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(a)++(\\w)",[trim]))),
     <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(a)++(\\w)",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(a)++(\\w)",[]))), 
-    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(a)++(\\w)",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(a)++(\\w)",[]))),
+    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(a)++(\\w)",[trim]))),
     <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(a)++(\\w)",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(a)++(\\w)",[]))), 
-    <<":X">> = iolist_to_binary(join(re:split("aaaaX","^(?:a)++(\\w)",[trim]))), 
+                                                                                                                                                                           2}]))),
+    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(a)++(\\w)",[]))),
+    <<":X">> = iolist_to_binary(join(re:split("aaaaX","^(?:a)++(\\w)",[trim]))),
     <<":X:">> = iolist_to_binary(join(re:split("aaaaX","^(?:a)++(\\w)",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<":X:">> = iolist_to_binary(join(re:split("aaaaX","^(?:a)++(\\w)",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:a)++(\\w)",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<":X:">> = iolist_to_binary(join(re:split("aaaaX","^(?:a)++(\\w)",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:a)++(\\w)",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:a)++(\\w)",[{parts,
-                                                                                                                                                                                               2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:a)++(\\w)",[]))), 
-    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(?:a)++(\\w)",[trim]))), 
+                                                                                                                                                                                               2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:a)++(\\w)",[]))),
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(?:a)++(\\w)",[trim]))),
     <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(?:a)++(\\w)",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(?:a)++(\\w)",[]))), 
-    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(?:a)++(\\w)",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(?:a)++(\\w)",[]))),
+    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(?:a)++(\\w)",[trim]))),
     <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(?:a)++(\\w)",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(?:a)++(\\w)",[]))), 
-    <<":a:a:aaX">> = iolist_to_binary(join(re:split("aaaaX","^(a)?+(\\w)",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(?:a)++(\\w)",[]))),
+    <<":a:a:aaX">> = iolist_to_binary(join(re:split("aaaaX","^(a)?+(\\w)",[trim]))),
     <<":a:a:aaX">> = iolist_to_binary(join(re:split("aaaaX","^(a)?+(\\w)",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<":a:a:aaX">> = iolist_to_binary(join(re:split("aaaaX","^(a)?+(\\w)",[]))), 
-    <<"::Y:Z">> = iolist_to_binary(join(re:split("YZ","^(a)?+(\\w)",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<":a:a:aaX">> = iolist_to_binary(join(re:split("aaaaX","^(a)?+(\\w)",[]))),
+    <<"::Y:Z">> = iolist_to_binary(join(re:split("YZ","^(a)?+(\\w)",[trim]))),
     <<"::Y:Z">> = iolist_to_binary(join(re:split("YZ","^(a)?+(\\w)",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<"::Y:Z">> = iolist_to_binary(join(re:split("YZ","^(a)?+(\\w)",[]))), 
-    <<":a:aaX">> = iolist_to_binary(join(re:split("aaaaX","^(?:a)?+(\\w)",[trim]))), 
+                                                                                                                                                                           2}]))),
+    <<"::Y:Z">> = iolist_to_binary(join(re:split("YZ","^(a)?+(\\w)",[]))),
+    <<":a:aaX">> = iolist_to_binary(join(re:split("aaaaX","^(?:a)?+(\\w)",[trim]))),
     <<":a:aaX">> = iolist_to_binary(join(re:split("aaaaX","^(?:a)?+(\\w)",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<":a:aaX">> = iolist_to_binary(join(re:split("aaaaX","^(?:a)?+(\\w)",[]))), 
-    <<":Y:Z">> = iolist_to_binary(join(re:split("YZ","^(?:a)?+(\\w)",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<":a:aaX">> = iolist_to_binary(join(re:split("aaaaX","^(?:a)?+(\\w)",[]))),
+    <<":Y:Z">> = iolist_to_binary(join(re:split("YZ","^(?:a)?+(\\w)",[trim]))),
     <<":Y:Z">> = iolist_to_binary(join(re:split("YZ","^(?:a)?+(\\w)",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<":Y:Z">> = iolist_to_binary(join(re:split("YZ","^(?:a)?+(\\w)",[]))), 
-    <<":a:X">> = iolist_to_binary(join(re:split("aaaaX","^(a){2,}+(\\w)",[trim]))), 
+                                                                                                                                                                               2}]))),
+    <<":Y:Z">> = iolist_to_binary(join(re:split("YZ","^(?:a)?+(\\w)",[]))),
+    <<":a:X">> = iolist_to_binary(join(re:split("aaaaX","^(a){2,}+(\\w)",[trim]))),
     <<":a:X:">> = iolist_to_binary(join(re:split("aaaaX","^(a){2,}+(\\w)",[{parts,
-                                                                                                                                                                                       2}]))), 
-    <<":a:X:">> = iolist_to_binary(join(re:split("aaaaX","^(a){2,}+(\\w)",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a){2,}+(\\w)",[trim]))), 
+                                                                                                                                                                                       2}]))),
+    <<":a:X:">> = iolist_to_binary(join(re:split("aaaaX","^(a){2,}+(\\w)",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a){2,}+(\\w)",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a){2,}+(\\w)",[{parts,
-                                                                                                                                                                                                 2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a){2,}+(\\w)",[]))), 
-    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a){2,}+(\\w)",[trim]))), 
+                                                                                                                                                                                                 2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a){2,}+(\\w)",[]))),
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a){2,}+(\\w)",[trim]))),
     <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a){2,}+(\\w)",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a){2,}+(\\w)",[]))), 
-    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(a){2,}+(\\w)",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a){2,}+(\\w)",[]))),
+    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(a){2,}+(\\w)",[trim]))),
     <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(a){2,}+(\\w)",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(a){2,}+(\\w)",[]))), 
-    <<":X">> = iolist_to_binary(join(re:split("aaaaX","^(?:a){2,}+(\\w)",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(a){2,}+(\\w)",[]))),
+    <<":X">> = iolist_to_binary(join(re:split("aaaaX","^(?:a){2,}+(\\w)",[trim]))),
     <<":X:">> = iolist_to_binary(join(re:split("aaaaX","^(?:a){2,}+(\\w)",[{parts,
-                                                                                                                                                                                           2}]))), 
-    <<":X:">> = iolist_to_binary(join(re:split("aaaaX","^(?:a){2,}+(\\w)",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:a){2,}+(\\w)",[trim]))), 
+                                                                                                                                                                                           2}]))),
+    <<":X:">> = iolist_to_binary(join(re:split("aaaaX","^(?:a){2,}+(\\w)",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:a){2,}+(\\w)",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:a){2,}+(\\w)",[{parts,
-                                                                                                                                                                                                     2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:a){2,}+(\\w)",[]))), 
-    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(?:a){2,}+(\\w)",[trim]))), 
+                                                                                                                                                                                                     2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:a){2,}+(\\w)",[]))),
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(?:a){2,}+(\\w)",[trim]))),
     <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(?:a){2,}+(\\w)",[{parts,
-                                                                                                                                                                                       2}]))), 
-    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(?:a){2,}+(\\w)",[]))), 
-    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(?:a){2,}+(\\w)",[trim]))), 
+                                                                                                                                                                                       2}]))),
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(?:a){2,}+(\\w)",[]))),
+    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(?:a){2,}+(\\w)",[trim]))),
     <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(?:a){2,}+(\\w)",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(?:a){2,}+(\\w)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("b","(a|)*(?1)b",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(?:a){2,}+(\\w)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("b","(a|)*(?1)b",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("b","(a|)*(?1)b",[{parts,
-                                                                                                                                                                      2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("b","(a|)*(?1)b",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("ab","(a|)*(?1)b",[trim]))), 
+                                                                                                                                                                      2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("b","(a|)*(?1)b",[]))),
+    <<"">> = iolist_to_binary(join(re:split("ab","(a|)*(?1)b",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("ab","(a|)*(?1)b",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("ab","(a|)*(?1)b",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aab","(a|)*(?1)b",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("ab","(a|)*(?1)b",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aab","(a|)*(?1)b",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("aab","(a|)*(?1)b",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("aab","(a|)*(?1)b",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(a)++(?1)b",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("aab","(a|)*(?1)b",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(a)++(?1)b",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(a)++(?1)b",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(a)++(?1)b",[]))), 
-    <<"ab">> = iolist_to_binary(join(re:split("ab","(a)++(?1)b",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(a)++(?1)b",[]))),
+    <<"ab">> = iolist_to_binary(join(re:split("ab","(a)++(?1)b",[trim]))),
     <<"ab">> = iolist_to_binary(join(re:split("ab","(a)++(?1)b",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"ab">> = iolist_to_binary(join(re:split("ab","(a)++(?1)b",[]))), 
-    <<"aab">> = iolist_to_binary(join(re:split("aab","(a)++(?1)b",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"ab">> = iolist_to_binary(join(re:split("ab","(a)++(?1)b",[]))),
+    <<"aab">> = iolist_to_binary(join(re:split("aab","(a)++(?1)b",[trim]))),
     <<"aab">> = iolist_to_binary(join(re:split("aab","(a)++(?1)b",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<"aab">> = iolist_to_binary(join(re:split("aab","(a)++(?1)b",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(a)*+(?1)b",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<"aab">> = iolist_to_binary(join(re:split("aab","(a)++(?1)b",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(a)*+(?1)b",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(a)*+(?1)b",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(a)*+(?1)b",[]))), 
-    <<"ab">> = iolist_to_binary(join(re:split("ab","(a)*+(?1)b",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(a)*+(?1)b",[]))),
+    <<"ab">> = iolist_to_binary(join(re:split("ab","(a)*+(?1)b",[trim]))),
     <<"ab">> = iolist_to_binary(join(re:split("ab","(a)*+(?1)b",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"ab">> = iolist_to_binary(join(re:split("ab","(a)*+(?1)b",[]))), 
-    <<"aab">> = iolist_to_binary(join(re:split("aab","(a)*+(?1)b",[trim]))), 
+                                                                                                                                                                        2}]))),
+    <<"ab">> = iolist_to_binary(join(re:split("ab","(a)*+(?1)b",[]))),
+    <<"aab">> = iolist_to_binary(join(re:split("aab","(a)*+(?1)b",[trim]))),
     <<"aab">> = iolist_to_binary(join(re:split("aab","(a)*+(?1)b",[{parts,
-                                                                                                                                                                          2}]))), 
-    <<"aab">> = iolist_to_binary(join(re:split("aab","(a)*+(?1)b",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("b","(?1)(?:(b)){0}",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<"aab">> = iolist_to_binary(join(re:split("aab","(a)*+(?1)b",[]))),
+    <<"">> = iolist_to_binary(join(re:split("b","(?1)(?:(b)){0}",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("b","(?1)(?:(b)){0}",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("b","(?1)(?:(b)){0}",[]))), 
+                                                                                                                                                                              2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("b","(?1)(?:(b)){0}",[]))),
     <<":foo(bar(baz)+baz(bop)):(bar(baz)+baz(bop)):bar(baz)+baz(bop)">> = iolist_to_binary(join(re:split("foo(bar(baz)+baz(bop))","(foo ( \\( ((?:(?> [^()]+ )|(?2))*) \\) ) )",[extended,
-                                                                                                                                                                                                                                                                                  trim]))), 
+                                                                                                                                                                                                                                                                                  trim]))),
     <<":foo(bar(baz)+baz(bop)):(bar(baz)+baz(bop)):bar(baz)+baz(bop):">> = iolist_to_binary(join(re:split("foo(bar(baz)+baz(bop))","(foo ( \\( ((?:(?> [^()]+ )|(?2))*) \\) ) )",[extended,
                                                                                                                                                                                                                                                                                     {parts,
-                                                                                                                                                                                                                                                                                     2}]))), 
-    <<":foo(bar(baz)+baz(bop)):(bar(baz)+baz(bop)):bar(baz)+baz(bop):">> = iolist_to_binary(join(re:split("foo(bar(baz)+baz(bop))","(foo ( \\( ((?:(?> [^()]+ )|(?2))*) \\) ) )",[extended]))), 
+                                                                                                                                                                                                                                                                                     2}]))),
+    <<":foo(bar(baz)+baz(bop)):(bar(baz)+baz(bop)):bar(baz)+baz(bop):">> = iolist_to_binary(join(re:split("foo(bar(baz)+baz(bop))","(foo ( \\( ((?:(?> [^()]+ )|(?2))*) \\) ) )",[extended]))),
     <<":AB:B">> = iolist_to_binary(join(re:split("AB","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
-                                                                                                                                                                                                    trim]))), 
+                                                                                                                                                                                                    trim]))),
     <<":AB:B::">> = iolist_to_binary(join(re:split("AB","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
                                                                                                                                                                                                       {parts,
-                                                                                                                                                                                                       2}]))), 
-    <<":AB:B::">> = iolist_to_binary(join(re:split("AB","(A (A|B(*ACCEPT)|C) D)(E)",[extended]))), 
+                                                                                                                                                                                                       2}]))),
+    <<":AB:B::">> = iolist_to_binary(join(re:split("AB","(A (A|B(*ACCEPT)|C) D)(E)",[extended]))),
     ok.
 run46() ->
-    <<":a">> = iolist_to_binary(join(re:split("ba","\\A.*?(a|bc)",[trim]))), 
+    <<":a">> = iolist_to_binary(join(re:split("ba","\\A.*?(a|bc)",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("ba","\\A.*?(a|bc)",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("ba","\\A.*?(a|bc)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("ba","\\A.*?(?:a|bc)++",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("ba","\\A.*?(a|bc)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("ba","\\A.*?(?:a|bc)++",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("ba","\\A.*?(?:a|bc)++",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ba","\\A.*?(?:a|bc)++",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("ba","\\A.*?(a|bc)++",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ba","\\A.*?(?:a|bc)++",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("ba","\\A.*?(a|bc)++",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("ba","\\A.*?(a|bc)++",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("ba","\\A.*?(a|bc)++",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("ba","\\A.*?(?:a|bc|d)",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("ba","\\A.*?(a|bc)++",[]))),
+    <<"">> = iolist_to_binary(join(re:split("ba","\\A.*?(?:a|bc|d)",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("ba","\\A.*?(?:a|bc|d)",[{parts,
-                                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ba","\\A.*?(?:a|bc|d)",[]))), 
-    <<":b:eetle">> = iolist_to_binary(join(re:split("beetle","(?:(b))++",[trim]))), 
+                                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ba","\\A.*?(?:a|bc|d)",[]))),
+    <<":b:eetle">> = iolist_to_binary(join(re:split("beetle","(?:(b))++",[trim]))),
     <<":b:eetle">> = iolist_to_binary(join(re:split("beetle","(?:(b))++",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":b:eetle">> = iolist_to_binary(join(re:split("beetle","(?:(b))++",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("a","(?(?=(a(*ACCEPT)z))a)",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":b:eetle">> = iolist_to_binary(join(re:split("beetle","(?:(b))++",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("a","(?(?=(a(*ACCEPT)z))a)",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("a","(?(?=(a(*ACCEPT)z))a)",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("a","(?(?=(a(*ACCEPT)z))a)",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aaaab","^(a)(?1)+ab",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("a","(?(?=(a(*ACCEPT)z))a)",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aaaab","^(a)(?1)+ab",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a)(?1)+ab",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a)(?1)+ab",[]))), 
-    <<"aaaab">> = iolist_to_binary(join(re:split("aaaab","^(a)(?1)++ab",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a)(?1)+ab",[]))),
+    <<"aaaab">> = iolist_to_binary(join(re:split("aaaab","^(a)(?1)++ab",[trim]))),
     <<"aaaab">> = iolist_to_binary(join(re:split("aaaab","^(a)(?1)++ab",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"aaaab">> = iolist_to_binary(join(re:split("aaaab","^(a)(?1)++ab",[]))), 
-    <<"::ckgammon">> = iolist_to_binary(join(re:split("backgammon","(?(DEFINE)(a))?b(?1)",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"aaaab">> = iolist_to_binary(join(re:split("aaaab","^(a)(?1)++ab",[]))),
+    <<"::ckgammon">> = iolist_to_binary(join(re:split("backgammon","(?(DEFINE)(a))?b(?1)",[trim]))),
     <<"::ckgammon">> = iolist_to_binary(join(re:split("backgammon","(?(DEFINE)(a))?b(?1)",[{parts,
-                                                                                                                                                                                                            2}]))), 
-    <<"::ckgammon">> = iolist_to_binary(join(re:split("backgammon","(?(DEFINE)(a))?b(?1)",[]))), 
+                                                                                                                                                                                                            2}]))),
+    <<"::ckgammon">> = iolist_to_binary(join(re:split("backgammon","(?(DEFINE)(a))?b(?1)",[]))),
     <<":
 def">> = iolist_to_binary(join(re:split("abc
-def","^\\N+",[trim]))), 
+def","^\\N+",[trim]))),
     <<":
 def">> = iolist_to_binary(join(re:split("abc
-def","^\\N+",[{parts,2}]))), 
+def","^\\N+",[{parts,2}]))),
     <<":
 def">> = iolist_to_binary(join(re:split("abc
-def","^\\N+",[]))), 
+def","^\\N+",[]))),
     <<":
 def">> = iolist_to_binary(join(re:split("abc
-def","^\\N{1,}",[trim]))), 
+def","^\\N{1,}",[trim]))),
     <<":
 def">> = iolist_to_binary(join(re:split("abc
-def","^\\N{1,}",[{parts,2}]))), 
+def","^\\N{1,}",[{parts,2}]))),
     <<":
 def">> = iolist_to_binary(join(re:split("abc
-def","^\\N{1,}",[]))), 
-    <<":cde">> = iolist_to_binary(join(re:split("aaaabcde","(?(R)a+|(?R)b)",[trim]))), 
+def","^\\N{1,}",[]))),
+    <<":cde">> = iolist_to_binary(join(re:split("aaaabcde","(?(R)a+|(?R)b)",[trim]))),
     <<":cde">> = iolist_to_binary(join(re:split("aaaabcde","(?(R)a+|(?R)b)",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<":cde">> = iolist_to_binary(join(re:split("aaaabcde","(?(R)a+|(?R)b)",[]))), 
-    <<":aaaa:cde">> = iolist_to_binary(join(re:split("aaaabcde","(?(R)a+|((?R))b)",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<":cde">> = iolist_to_binary(join(re:split("aaaabcde","(?(R)a+|(?R)b)",[]))),
+    <<":aaaa:cde">> = iolist_to_binary(join(re:split("aaaabcde","(?(R)a+|((?R))b)",[trim]))),
     <<":aaaa:cde">> = iolist_to_binary(join(re:split("aaaabcde","(?(R)a+|((?R))b)",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<":aaaa:cde">> = iolist_to_binary(join(re:split("aaaabcde","(?(R)a+|((?R))b)",[]))), 
-    <<":aaaab:cde">> = iolist_to_binary(join(re:split("aaaabcde","((?(R)a+|(?1)b))",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<":aaaa:cde">> = iolist_to_binary(join(re:split("aaaabcde","(?(R)a+|((?R))b)",[]))),
+    <<":aaaab:cde">> = iolist_to_binary(join(re:split("aaaabcde","((?(R)a+|(?1)b))",[trim]))),
     <<":aaaab:cde">> = iolist_to_binary(join(re:split("aaaabcde","((?(R)a+|(?1)b))",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<":aaaab:cde">> = iolist_to_binary(join(re:split("aaaabcde","((?(R)a+|(?1)b))",[]))), 
-    <<":aaaab:cde">> = iolist_to_binary(join(re:split("aaaabcde","((?(R1)a+|(?1)b))",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<":aaaab:cde">> = iolist_to_binary(join(re:split("aaaabcde","((?(R)a+|(?1)b))",[]))),
+    <<":aaaab:cde">> = iolist_to_binary(join(re:split("aaaabcde","((?(R1)a+|(?1)b))",[trim]))),
     <<":aaaab:cde">> = iolist_to_binary(join(re:split("aaaabcde","((?(R1)a+|(?1)b))",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<":aaaab:cde">> = iolist_to_binary(join(re:split("aaaabcde","((?(R1)a+|(?1)b))",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aaa","((?(R)a|(?1)))*",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<":aaaab:cde">> = iolist_to_binary(join(re:split("aaaabcde","((?(R1)a+|(?1)b))",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aaa","((?(R)a|(?1)))*",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aaa","((?(R)a|(?1)))*",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aaa","((?(R)a|(?1)))*",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("aaa","((?(R)a|(?1)))+",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aaa","((?(R)a|(?1)))*",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("aaa","((?(R)a|(?1)))+",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("aaa","((?(R)a|(?1)))+",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("aaa","((?(R)a|(?1)))+",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("a","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("aaa","((?(R)a|(?1)))+",[]))),
+    <<"">> = iolist_to_binary(join(re:split("a","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("a","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))",[{parts,
-                                                                                                                                                                                                                                            2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("a","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))",[]))), 
-    <<"b">> = iolist_to_binary(join(re:split("ba","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))",[trim]))), 
+                                                                                                                                                                                                                                            2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("a","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))",[]))),
+    <<"b">> = iolist_to_binary(join(re:split("ba","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))",[trim]))),
     <<"b::">> = iolist_to_binary(join(re:split("ba","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))",[{parts,
-                                                                                                                                                                                                                                              2}]))), 
-    <<"b::">> = iolist_to_binary(join(re:split("ba","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))",[]))), 
-    <<"bb">> = iolist_to_binary(join(re:split("bba","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))",[trim]))), 
+                                                                                                                                                                                                                                              2}]))),
+    <<"b::">> = iolist_to_binary(join(re:split("ba","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))",[]))),
+    <<"bb">> = iolist_to_binary(join(re:split("bba","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))",[trim]))),
     <<"bb::">> = iolist_to_binary(join(re:split("bba","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))",[{parts,
-                                                                                                                                                                                                                                                2}]))), 
-    <<"bb::">> = iolist_to_binary(join(re:split("bba","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))",[]))), 
+                                                                                                                                                                                                                                                2}]))),
+    <<"bb::">> = iolist_to_binary(join(re:split("bba","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))",[]))),
     ok.
 run47() ->
     <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b) c",[extended,
-                                                                                                                                                                                          trim]))), 
+                                                                                                                                                                                          trim]))),
     <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b) c",[extended,
                                                                                                                                                                                             {parts,
-                                                                                                                                                                                             2}]))), 
-    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b) c",[extended]))), 
+                                                                                                                                                                                             2}]))),
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b) c",[extended]))),
     <<":ab">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b|(*F)) c",[extended,
-                                                                                                                                                                                                    trim]))), 
+                                                                                                                                                                                                    trim]))),
     <<":ab:">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b|(*F)) c",[extended,
                                                                                                                                                                                                       {parts,
-                                                                                                                                                                                                       2}]))), 
-    <<":ab:">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b|(*F)) c",[extended]))), 
+                                                                                                                                                                                                       2}]))),
+    <<":ab:">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b|(*F)) c",[extended]))),
     <<":ab:ab">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b) | (*F) ) c",[extended,
-                                                                                                                                                                                                                trim]))), 
+                                                                                                                                                                                                                trim]))),
     <<":ab:ab:">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b) | (*F) ) c",[extended,
                                                                                                                                                                                                                   {parts,
-                                                                                                                                                                                                                   2}]))), 
-    <<":ab:ab:">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b) | (*F) ) c",[extended]))), 
+                                                                                                                                                                                                                   2}]))),
+    <<":ab:ab:">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b) | (*F) ) c",[extended]))),
     <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b) ) c",[extended,
-                                                                                                                                                                                                  trim]))), 
+                                                                                                                                                                                                  trim]))),
     <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b) ) c",[extended,
                                                                                                                                                                                                     {parts,
-                                                                                                                                                                                                     2}]))), 
-    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b) ) c",[extended]))), 
+                                                                                                                                                                                                     2}]))),
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b) ) c",[extended]))),
     <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b) c",[extended,
-                                                                                                                                                                                              trim]))), 
+                                                                                                                                                                                              trim]))),
     <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b) c",[extended,
                                                                                                                                                                                                 {parts,
-                                                                                                                                                                                                 2}]))), 
-    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b) c",[extended]))), 
+                                                                                                                                                                                                 2}]))),
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b) c",[extended]))),
     <<"">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b|(*F)) c",[extended,
-                                                                                                                                                                                                        trim]))), 
+                                                                                                                                                                                                        trim]))),
     <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b|(*F)) c",[extended,
                                                                                                                                                                                                           {parts,
-                                                                                                                                                                                                           2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b|(*F)) c",[extended]))), 
+                                                                                                                                                                                                           2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b|(*F)) c",[extended]))),
     <<"">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b) | (*F) ) c",[extended,
-                                                                                                                                                                                                                        trim]))), 
+                                                                                                                                                                                                                        trim]))),
     <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b) | (*F) ) c",[extended,
                                                                                                                                                                                                                           {parts,
-                                                                                                                                                                                                                           2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b) | (*F) ) c",[extended]))), 
+                                                                                                                                                                                                                           2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b) | (*F) ) c",[extended]))),
     <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b) ) c",[extended,
-                                                                                                                                                                                                          trim]))), 
+                                                                                                                                                                                                          trim]))),
     <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b) ) c",[extended,
                                                                                                                                                                                                             {parts,
-                                                                                                                                                                                                             2}]))), 
-    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b) ) c",[extended]))), 
+                                                                                                                                                                                                             2}]))),
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b) ) c",[extended]))),
     <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?>a(*THEN)b) c",[extended,
-                                                                                                                                                                                              trim]))), 
+                                                                                                                                                                                              trim]))),
     <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?>a(*THEN)b) c",[extended,
                                                                                                                                                                                                 {parts,
-                                                                                                                                                                                                 2}]))), 
-    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?>a(*THEN)b) c",[extended]))), 
+                                                                                                                                                                                                 2}]))),
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?>a(*THEN)b) c",[extended]))),
     <<"">> = iolist_to_binary(join(re:split("aabc","^.*? (?>a(*THEN)b|(*F)) c",[extended,
-                                                                                                                                                                                                        trim]))), 
+                                                                                                                                                                                                        trim]))),
     <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?>a(*THEN)b|(*F)) c",[extended,
                                                                                                                                                                                                           {parts,
-                                                                                                                                                                                                           2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?>a(*THEN)b|(*F)) c",[extended]))), 
+                                                                                                                                                                                                           2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?>a(*THEN)b|(*F)) c",[extended]))),
     <<"">> = iolist_to_binary(join(re:split("aabc","^.*? (?> (?>a(*THEN)b) | (*F) ) c",[extended,
-                                                                                                                                                                                                                        trim]))), 
+                                                                                                                                                                                                                        trim]))),
     <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?> (?>a(*THEN)b) | (*F) ) c",[extended,
                                                                                                                                                                                                                           {parts,
-                                                                                                                                                                                                                           2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?> (?>a(*THEN)b) | (*F) ) c",[extended]))), 
+                                                                                                                                                                                                                           2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?> (?>a(*THEN)b) | (*F) ) c",[extended]))),
     <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?> (?>a(*THEN)b) ) c",[extended,
-                                                                                                                                                                                                          trim]))), 
+                                                                                                                                                                                                          trim]))),
     <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?> (?>a(*THEN)b) ) c",[extended,
                                                                                                                                                                                                             {parts,
-                                                                                                                                                                                                             2}]))), 
-    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?> (?>a(*THEN)b) ) c",[extended]))), 
+                                                                                                                                                                                                             2}]))),
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?> (?>a(*THEN)b) ) c",[extended]))),
     <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b)++ c",[extended,
-                                                                                                                                                                                              trim]))), 
+                                                                                                                                                                                              trim]))),
     <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b)++ c",[extended,
                                                                                                                                                                                                 {parts,
-                                                                                                                                                                                                 2}]))), 
-    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b)++ c",[extended]))), 
+                                                                                                                                                                                                 2}]))),
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b)++ c",[extended]))),
     <<":ab">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b|(*F))++ c",[extended,
-                                                                                                                                                                                                        trim]))), 
+                                                                                                                                                                                                        trim]))),
     <<":ab:">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b|(*F))++ c",[extended,
                                                                                                                                                                                                           {parts,
-                                                                                                                                                                                                           2}]))), 
-    <<":ab:">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b|(*F))++ c",[extended]))), 
+                                                                                                                                                                                                           2}]))),
+    <<":ab:">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b|(*F))++ c",[extended]))),
     <<":ab:ab">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b)++ | (*F) )++ c",[extended,
-                                                                                                                                                                                                                        trim]))), 
+                                                                                                                                                                                                                        trim]))),
     <<":ab:ab:">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b)++ | (*F) )++ c",[extended,
                                                                                                                                                                                                                           {parts,
-                                                                                                                                                                                                                           2}]))), 
-    <<":ab:ab:">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b)++ | (*F) )++ c",[extended]))), 
+                                                                                                                                                                                                                           2}]))),
+    <<":ab:ab:">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b)++ | (*F) )++ c",[extended]))),
     <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b)++ )++ c",[extended,
-                                                                                                                                                                                                          trim]))), 
+                                                                                                                                                                                                          trim]))),
     <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b)++ )++ c",[extended,
                                                                                                                                                                                                             {parts,
-                                                                                                                                                                                                             2}]))), 
-    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b)++ )++ c",[extended]))), 
+                                                                                                                                                                                                             2}]))),
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b)++ )++ c",[extended]))),
     ok.
 run48() ->
     <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b)++ c",[extended,
-                                                                                                                                                                                                  trim]))), 
+                                                                                                                                                                                                  trim]))),
     <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b)++ c",[extended,
                                                                                                                                                                                                     {parts,
-                                                                                                                                                                                                     2}]))), 
-    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b)++ c",[extended]))), 
+                                                                                                                                                                                                     2}]))),
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b)++ c",[extended]))),
     <<"">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b|(*F))++ c",[extended,
-                                                                                                                                                                                                            trim]))), 
+                                                                                                                                                                                                            trim]))),
     <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b|(*F))++ c",[extended,
                                                                                                                                                                                                               {parts,
-                                                                                                                                                                                                               2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b|(*F))++ c",[extended]))), 
+                                                                                                                                                                                                               2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b|(*F))++ c",[extended]))),
     <<"">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b)++ | (*F) )++ c",[extended,
-                                                                                                                                                                                                                                trim]))), 
+                                                                                                                                                                                                                                trim]))),
     <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b)++ | (*F) )++ c",[extended,
                                                                                                                                                                                                                                   {parts,
-                                                                                                                                                                                                                                   2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b)++ | (*F) )++ c",[extended]))), 
+                                                                                                                                                                                                                                   2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b)++ | (*F) )++ c",[extended]))),
     <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b)++ )++ c",[extended,
-                                                                                                                                                                                                                  trim]))), 
+                                                                                                                                                                                                                  trim]))),
     <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b)++ )++ c",[extended,
                                                                                                                                                                                                                     {parts,
-                                                                                                                                                                                                                     2}]))), 
-    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b)++ )++ c",[extended]))), 
-    <<"">> = iolist_to_binary(join(re:split("ac","^(?(?=a(*THEN)b)ab|ac)",[trim]))), 
+                                                                                                                                                                                                                     2}]))),
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b)++ )++ c",[extended]))),
+    <<"">> = iolist_to_binary(join(re:split("ac","^(?(?=a(*THEN)b)ab|ac)",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("ac","^(?(?=a(*THEN)b)ab|ac)",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ac","^(?(?=a(*THEN)b)ab|ac)",[]))), 
-    <<"ba">> = iolist_to_binary(join(re:split("ba","^.*?(?(?=a)a|b(*THEN)c)",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ac","^(?(?=a(*THEN)b)ab|ac)",[]))),
+    <<"ba">> = iolist_to_binary(join(re:split("ba","^.*?(?(?=a)a|b(*THEN)c)",[trim]))),
     <<"ba">> = iolist_to_binary(join(re:split("ba","^.*?(?(?=a)a|b(*THEN)c)",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<"ba">> = iolist_to_binary(join(re:split("ba","^.*?(?(?=a)a|b(*THEN)c)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("ba","^.*?(?:(?(?=a)a|b(*THEN)c)|d)",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<"ba">> = iolist_to_binary(join(re:split("ba","^.*?(?(?=a)a|b(*THEN)c)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("ba","^.*?(?:(?(?=a)a|b(*THEN)c)|d)",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("ba","^.*?(?:(?(?=a)a|b(*THEN)c)|d)",[{parts,
-                                                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ba","^.*?(?:(?(?=a)a|b(*THEN)c)|d)",[]))), 
-    <<"ac">> = iolist_to_binary(join(re:split("ac","^.*?(?(?=a)a(*THEN)b|c)",[trim]))), 
+                                                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ba","^.*?(?:(?(?=a)a|b(*THEN)c)|d)",[]))),
+    <<"ac">> = iolist_to_binary(join(re:split("ac","^.*?(?(?=a)a(*THEN)b|c)",[trim]))),
     <<"ac">> = iolist_to_binary(join(re:split("ac","^.*?(?(?=a)a(*THEN)b|c)",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<"ac">> = iolist_to_binary(join(re:split("ac","^.*?(?(?=a)a(*THEN)b|c)",[]))), 
-    <<":abc">> = iolist_to_binary(join(re:split("aabc","^.*(?=a(*THEN)b)",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<"ac">> = iolist_to_binary(join(re:split("ac","^.*?(?(?=a)a(*THEN)b|c)",[]))),
+    <<":abc">> = iolist_to_binary(join(re:split("aabc","^.*(?=a(*THEN)b)",[trim]))),
     <<":abc">> = iolist_to_binary(join(re:split("aabc","^.*(?=a(*THEN)b)",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<":abc">> = iolist_to_binary(join(re:split("aabc","^.*(?=a(*THEN)b)",[]))), 
-    <<"xa:d">> = iolist_to_binary(join(re:split("xacd","(?<=a(*ACCEPT)b)c",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<":abc">> = iolist_to_binary(join(re:split("aabc","^.*(?=a(*THEN)b)",[]))),
+    <<"xa:d">> = iolist_to_binary(join(re:split("xacd","(?<=a(*ACCEPT)b)c",[trim]))),
     <<"xa:d">> = iolist_to_binary(join(re:split("xacd","(?<=a(*ACCEPT)b)c",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<"xa:d">> = iolist_to_binary(join(re:split("xacd","(?<=a(*ACCEPT)b)c",[]))), 
-    <<"xa:a:d">> = iolist_to_binary(join(re:split("xacd","(?<=(a(*ACCEPT)b))c",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<"xa:d">> = iolist_to_binary(join(re:split("xacd","(?<=a(*ACCEPT)b)c",[]))),
+    <<"xa:a:d">> = iolist_to_binary(join(re:split("xacd","(?<=(a(*ACCEPT)b))c",[trim]))),
     <<"xa:a:d">> = iolist_to_binary(join(re:split("xacd","(?<=(a(*ACCEPT)b))c",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"xa:a:d">> = iolist_to_binary(join(re:split("xacd","(?<=(a(*ACCEPT)b))c",[]))), 
-    <<"xab:ab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=(a(*COMMIT)b))c",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<"xa:a:d">> = iolist_to_binary(join(re:split("xacd","(?<=(a(*ACCEPT)b))c",[]))),
+    <<"xab:ab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=(a(*COMMIT)b))c",[trim]))),
     <<"xab:ab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=(a(*COMMIT)b))c",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"xab:ab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=(a(*COMMIT)b))c",[]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=(a(*COMMIT)b))c",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<"xab:ab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=(a(*COMMIT)b))c",[]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=(a(*COMMIT)b))c",[trim]))),
     <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=(a(*COMMIT)b))c",[{parts,
-                                                                                                                                                                                                          2}]))), 
-    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=(a(*COMMIT)b))c",[]))), 
-    <<"xacd">> = iolist_to_binary(join(re:split("xacd","(?<=(a(*COMMIT)b))c",[trim]))), 
+                                                                                                                                                                                                          2}]))),
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=(a(*COMMIT)b))c",[]))),
+    <<"xacd">> = iolist_to_binary(join(re:split("xacd","(?<=(a(*COMMIT)b))c",[trim]))),
     <<"xacd">> = iolist_to_binary(join(re:split("xacd","(?<=(a(*COMMIT)b))c",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"xacd">> = iolist_to_binary(join(re:split("xacd","(?<=(a(*COMMIT)b))c",[]))), 
-    <<"x:d">> = iolist_to_binary(join(re:split("xcd","(?<!a(*FAIL)b)c",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<"xacd">> = iolist_to_binary(join(re:split("xacd","(?<=(a(*COMMIT)b))c",[]))),
+    <<"x:d">> = iolist_to_binary(join(re:split("xcd","(?<!a(*FAIL)b)c",[trim]))),
     <<"x:d">> = iolist_to_binary(join(re:split("xcd","(?<!a(*FAIL)b)c",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<"x:d">> = iolist_to_binary(join(re:split("xcd","(?<!a(*FAIL)b)c",[]))), 
-    <<"a:d">> = iolist_to_binary(join(re:split("acd","(?<!a(*FAIL)b)c",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<"x:d">> = iolist_to_binary(join(re:split("xcd","(?<!a(*FAIL)b)c",[]))),
+    <<"a:d">> = iolist_to_binary(join(re:split("acd","(?<!a(*FAIL)b)c",[trim]))),
     <<"a:d">> = iolist_to_binary(join(re:split("acd","(?<!a(*FAIL)b)c",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<"a:d">> = iolist_to_binary(join(re:split("acd","(?<!a(*FAIL)b)c",[]))), 
-    <<"xab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=a(*PRUNE)b)c",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<"a:d">> = iolist_to_binary(join(re:split("acd","(?<!a(*FAIL)b)c",[]))),
+    <<"xab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=a(*PRUNE)b)c",[trim]))),
     <<"xab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=a(*PRUNE)b)c",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<"xab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=a(*PRUNE)b)c",[]))), 
-    <<"xab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=a(*SKIP)b)c",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<"xab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=a(*PRUNE)b)c",[]))),
+    <<"xab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=a(*SKIP)b)c",[trim]))),
     <<"xab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=a(*SKIP)b)c",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"xab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=a(*SKIP)b)c",[]))), 
-    <<"xab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=a(*THEN)b)c",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<"xab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=a(*SKIP)b)c",[]))),
+    <<"xab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=a(*THEN)b)c",[trim]))),
     <<"xab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=a(*THEN)b)c",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"xab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=a(*THEN)b)c",[]))), 
+                                                                                                                                                                                        2}]))),
+    <<"xab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=a(*THEN)b)c",[]))),
     ok.
 run49() ->
-    <<":a:d">> = iolist_to_binary(join(re:split("abcd","(a)(?2){2}(.)",[trim]))), 
+    <<":a:d">> = iolist_to_binary(join(re:split("abcd","(a)(?2){2}(.)",[trim]))),
     <<":a:d:">> = iolist_to_binary(join(re:split("abcd","(a)(?2){2}(.)",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<":a:d:">> = iolist_to_binary(join(re:split("abcd","(a)(?2){2}(.)",[]))), 
-    <<"hello world ">> = iolist_to_binary(join(re:split("hello world test","(another)?(\\1?)test",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<":a:d:">> = iolist_to_binary(join(re:split("abcd","(a)(?2){2}(.)",[]))),
+    <<"hello world ">> = iolist_to_binary(join(re:split("hello world test","(another)?(\\1?)test",[trim]))),
     <<"hello world :::">> = iolist_to_binary(join(re:split("hello world test","(another)?(\\1?)test",[{parts,
-                                                                                                                                                                                                                         2}]))), 
-    <<"hello world :::">> = iolist_to_binary(join(re:split("hello world test","(another)?(\\1?)test",[]))), 
-    <<"hello world test">> = iolist_to_binary(join(re:split("hello world test","(another)?(\\1+)test",[trim]))), 
+                                                                                                                                                                                                                         2}]))),
+    <<"hello world :::">> = iolist_to_binary(join(re:split("hello world test","(another)?(\\1?)test",[]))),
+    <<"hello world test">> = iolist_to_binary(join(re:split("hello world test","(another)?(\\1+)test",[trim]))),
     <<"hello world test">> = iolist_to_binary(join(re:split("hello world test","(another)?(\\1+)test",[{parts,
-                                                                                                                                                                                                                         2}]))), 
-    <<"hello world test">> = iolist_to_binary(join(re:split("hello world test","(another)?(\\1+)test",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aac","(a(*COMMIT)b){0}a(?1)|aac",[trim]))), 
+                                                                                                                                                                                                                         2}]))),
+    <<"hello world test">> = iolist_to_binary(join(re:split("hello world test","(another)?(\\1+)test",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aac","(a(*COMMIT)b){0}a(?1)|aac",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("aac","(a(*COMMIT)b){0}a(?1)|aac",[{parts,
-                                                                                                                                                                                                        2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("aac","(a(*COMMIT)b){0}a(?1)|aac",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aac","((?:a?)*)*c",[trim]))), 
+                                                                                                                                                                                                        2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("aac","(a(*COMMIT)b){0}a(?1)|aac",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aac","((?:a?)*)*c",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("aac","((?:a?)*)*c",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("aac","((?:a?)*)*c",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aac","((?>a?)*)*c",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("aac","((?:a?)*)*c",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aac","((?>a?)*)*c",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("aac","((?>a?)*)*c",[{parts,
-                                                                                                                                                                            2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("aac","((?>a?)*)*c",[]))), 
-    <<"a">> = iolist_to_binary(join(re:split("aba","(?>.*?a)(?<=ba)",[trim]))), 
+                                                                                                                                                                            2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("aac","((?>a?)*)*c",[]))),
+    <<"a">> = iolist_to_binary(join(re:split("aba","(?>.*?a)(?<=ba)",[trim]))),
     <<"a:">> = iolist_to_binary(join(re:split("aba","(?>.*?a)(?<=ba)",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<"a:">> = iolist_to_binary(join(re:split("aba","(?>.*?a)(?<=ba)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aba","(?:.*?a)(?<=ba)",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<"a:">> = iolist_to_binary(join(re:split("aba","(?>.*?a)(?<=ba)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aba","(?:.*?a)(?<=ba)",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aba","(?:.*?a)(?<=ba)",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aba","(?:.*?a)(?<=ba)",[]))), 
-    <<"a">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aba","(?:.*?a)(?<=ba)",[]))),
+    <<"a">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[trim]))),
     <<"a:">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<"a:">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[]))), 
+                                                                                                                                                                                2}]))),
+    <<"a:">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[]))),
     <<"a">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[dotall,
-                                                                                                                                                                              trim]))), 
+                                                                                                                                                                              trim]))),
     <<"a:">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[dotall,
                                                                                                                                                                                 {parts,
-                                                                                                                                                                                 2}]))), 
-    <<"a:">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[dotall]))), 
+                                                                                                                                                                                 2}]))),
+    <<"a:">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[dotall]))),
     <<"aab">> = iolist_to_binary(join(re:split("aab","^a(*PRUNE)b",[dotall,
-                                                                                                                                                                          trim]))), 
+                                                                                                                                                                          trim]))),
     <<"aab">> = iolist_to_binary(join(re:split("aab","^a(*PRUNE)b",[dotall,
                                                                                                                                                                             {parts,
-                                                                                                                                                                             2}]))), 
-    <<"aab">> = iolist_to_binary(join(re:split("aab","^a(*PRUNE)b",[dotall]))), 
-    <<"a">> = iolist_to_binary(join(re:split("aab",".*?a(*SKIP)b",[trim]))), 
+                                                                                                                                                                             2}]))),
+    <<"aab">> = iolist_to_binary(join(re:split("aab","^a(*PRUNE)b",[dotall]))),
+    <<"a">> = iolist_to_binary(join(re:split("aab",".*?a(*SKIP)b",[trim]))),
     <<"a:">> = iolist_to_binary(join(re:split("aab",".*?a(*SKIP)b",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<"a:">> = iolist_to_binary(join(re:split("aab",".*?a(*SKIP)b",[]))), 
+                                                                                                                                                                              2}]))),
+    <<"a:">> = iolist_to_binary(join(re:split("aab",".*?a(*SKIP)b",[]))),
     <<"a">> = iolist_to_binary(join(re:split("aab","(?>.*?a)b",[dotall,
-                                                                                                                                                                      trim]))), 
+                                                                                                                                                                      trim]))),
     <<"a:">> = iolist_to_binary(join(re:split("aab","(?>.*?a)b",[dotall,
                                                                                                                                                                         {parts,
-                                                                                                                                                                         2}]))), 
-    <<"a:">> = iolist_to_binary(join(re:split("aab","(?>.*?a)b",[dotall]))), 
+                                                                                                                                                                         2}]))),
+    <<"a:">> = iolist_to_binary(join(re:split("aab","(?>.*?a)b",[dotall]))),
     ok.
 run50() ->
-    <<"a">> = iolist_to_binary(join(re:split("aab","(?>.*?a)b",[trim]))), 
+    <<"a">> = iolist_to_binary(join(re:split("aab","(?>.*?a)b",[trim]))),
     <<"a:">> = iolist_to_binary(join(re:split("aab","(?>.*?a)b",[{parts,
-                                                                                                                                                                        2}]))), 
-    <<"a:">> = iolist_to_binary(join(re:split("aab","(?>.*?a)b",[]))), 
+                                                                                                                                                                        2}]))),
+    <<"a:">> = iolist_to_binary(join(re:split("aab","(?>.*?a)b",[]))),
     <<"aab">> = iolist_to_binary(join(re:split("aab","(?>^a)b",[dotall,
-                                                                                                                                                                  trim]))), 
+                                                                                                                                                                  trim]))),
     <<"aab">> = iolist_to_binary(join(re:split("aab","(?>^a)b",[dotall,
                                                                                                                                                                     {parts,
-                                                                                                                                                                     2}]))), 
-    <<"aab">> = iolist_to_binary(join(re:split("aab","(?>^a)b",[dotall]))), 
-    <<"alphabetabcd:abcd">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*?)(?<=(abcd)|(wxyz))",[trim]))), 
+                                                                                                                                                                     2}]))),
+    <<"aab">> = iolist_to_binary(join(re:split("aab","(?>^a)b",[dotall]))),
+    <<"alphabetabcd:abcd">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*?)(?<=(abcd)|(wxyz))",[trim]))),
     <<"alphabetabcd:abcd::">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*?)(?<=(abcd)|(wxyz))",[{parts,
-                                                                                                                                                                                                                          2}]))), 
-    <<"alphabetabcd:abcd::">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*?)(?<=(abcd)|(wxyz))",[]))), 
-    <<"endingwxyz::wxyz">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*?)(?<=(abcd)|(wxyz))",[trim]))), 
+                                                                                                                                                                                                                          2}]))),
+    <<"alphabetabcd:abcd::">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*?)(?<=(abcd)|(wxyz))",[]))),
+    <<"endingwxyz::wxyz">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*?)(?<=(abcd)|(wxyz))",[trim]))),
     <<"endingwxyz::wxyz:">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*?)(?<=(abcd)|(wxyz))",[{parts,
-                                                                                                                                                                                                                      2}]))), 
-    <<"endingwxyz::wxyz:">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*?)(?<=(abcd)|(wxyz))",[]))), 
-    <<":abcd">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*)(?<=(abcd)|(wxyz))",[trim]))), 
+                                                                                                                                                                                                                      2}]))),
+    <<"endingwxyz::wxyz:">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*?)(?<=(abcd)|(wxyz))",[]))),
+    <<":abcd">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*)(?<=(abcd)|(wxyz))",[trim]))),
     <<":abcd::">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*)(?<=(abcd)|(wxyz))",[{parts,
-                                                                                                                                                                                                                        2}]))), 
-    <<":abcd::">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*)(?<=(abcd)|(wxyz))",[]))), 
-    <<"::wxyz">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*)(?<=(abcd)|(wxyz))",[trim]))), 
+                                                                                                                                                                                                                        2}]))),
+    <<":abcd::">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*)(?<=(abcd)|(wxyz))",[]))),
+    <<"::wxyz">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*)(?<=(abcd)|(wxyz))",[trim]))),
     <<"::wxyz:">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*)(?<=(abcd)|(wxyz))",[{parts,
-                                                                                                                                                                                                                    2}]))), 
-    <<"::wxyz:">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*)(?<=(abcd)|(wxyz))",[]))), 
-    <<"abcdfooxyz">> = iolist_to_binary(join(re:split("abcdfooxyz","(?>.*)foo",[trim]))), 
+                                                                                                                                                                                                                    2}]))),
+    <<"::wxyz:">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*)(?<=(abcd)|(wxyz))",[]))),
+    <<"abcdfooxyz">> = iolist_to_binary(join(re:split("abcdfooxyz","(?>.*)foo",[trim]))),
     <<"abcdfooxyz">> = iolist_to_binary(join(re:split("abcdfooxyz","(?>.*)foo",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<"abcdfooxyz">> = iolist_to_binary(join(re:split("abcdfooxyz","(?>.*)foo",[]))), 
-    <<"abcd:xyz">> = iolist_to_binary(join(re:split("abcdfooxyz","(?>.*?)foo",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<"abcdfooxyz">> = iolist_to_binary(join(re:split("abcdfooxyz","(?>.*)foo",[]))),
+    <<"abcd:xyz">> = iolist_to_binary(join(re:split("abcdfooxyz","(?>.*?)foo",[trim]))),
     <<"abcd:xyz">> = iolist_to_binary(join(re:split("abcdfooxyz","(?>.*?)foo",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<"abcd:xyz">> = iolist_to_binary(join(re:split("abcdfooxyz","(?>.*?)foo",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("ac","(?:(a(*PRUNE)b)){0}(?:(?1)|ac)",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<"abcd:xyz">> = iolist_to_binary(join(re:split("abcdfooxyz","(?>.*?)foo",[]))),
+    <<"">> = iolist_to_binary(join(re:split("ac","(?:(a(*PRUNE)b)){0}(?:(?1)|ac)",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("ac","(?:(a(*PRUNE)b)){0}(?:(?1)|ac)",[{parts,
-                                                                                                                                                                                                                2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("ac","(?:(a(*PRUNE)b)){0}(?:(?1)|ac)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("ac","(?:(a(*SKIP)b)){0}(?:(?1)|ac)",[trim]))), 
+                                                                                                                                                                                                                2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("ac","(?:(a(*PRUNE)b)){0}(?:(?1)|ac)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("ac","(?:(a(*SKIP)b)){0}(?:(?1)|ac)",[trim]))),
     <<"::">> = iolist_to_binary(join(re:split("ac","(?:(a(*SKIP)b)){0}(?:(?1)|ac)",[{parts,
-                                                                                                                                                                                                              2}]))), 
-    <<"::">> = iolist_to_binary(join(re:split("ac","(?:(a(*SKIP)b)){0}(?:(?1)|ac)",[]))), 
-    <<"aa">> = iolist_to_binary(join(re:split("aa","(?<=(*SKIP)ac)a",[trim]))), 
+                                                                                                                                                                                                              2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("ac","(?:(a(*SKIP)b)){0}(?:(?1)|ac)",[]))),
+    <<"aa">> = iolist_to_binary(join(re:split("aa","(?<=(*SKIP)ac)a",[trim]))),
     <<"aa">> = iolist_to_binary(join(re:split("aa","(?<=(*SKIP)ac)a",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<"aa">> = iolist_to_binary(join(re:split("aa","(?<=(*SKIP)ac)a",[]))), 
-    <<"aa">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*PRUNE)b|a+c",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<"aa">> = iolist_to_binary(join(re:split("aa","(?<=(*SKIP)ac)a",[]))),
+    <<"aa">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*PRUNE)b|a+c",[trim]))),
     <<"aa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*PRUNE)b|a+c",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<"aa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*PRUNE)b|a+c",[]))), 
-    <<"aa">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP)(*PRUNE)b|a+c",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<"aa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*PRUNE)b|a+c",[]))),
+    <<"aa">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP)(*PRUNE)b|a+c",[trim]))),
     <<"aa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP)(*PRUNE)b|a+c",[{parts,
-                                                                                                                                                                                                                2}]))), 
-    <<"aa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP)(*PRUNE)b|a+c",[]))), 
-    <<"aa">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP:N)(*PRUNE)b|a+c",[trim]))), 
+                                                                                                                                                                                                                2}]))),
+    <<"aa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP)(*PRUNE)b|a+c",[]))),
+    <<"aa">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP:N)(*PRUNE)b|a+c",[trim]))),
     <<"aa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP:N)(*PRUNE)b|a+c",[{parts,
-                                                                                                                                                                                                                    2}]))), 
-    <<"aa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP:N)(*PRUNE)b|a+c",[]))), 
-    <<"aa">> = iolist_to_binary(join(re:split("aaaaaac","aaaa(*:N)a(*SKIP:N)(*PRUNE)b|a+c",[trim]))), 
+                                                                                                                                                                                                                    2}]))),
+    <<"aa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP:N)(*PRUNE)b|a+c",[]))),
+    <<"aa">> = iolist_to_binary(join(re:split("aaaaaac","aaaa(*:N)a(*SKIP:N)(*PRUNE)b|a+c",[trim]))),
     <<"aa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaa(*:N)a(*SKIP:N)(*PRUNE)b|a+c",[{parts,
-                                                                                                                                                                                                                              2}]))), 
-    <<"aa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaa(*:N)a(*SKIP:N)(*PRUNE)b|a+c",[]))), 
-    <<"aa">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*THEN)(*PRUNE)b|a+c",[trim]))), 
+                                                                                                                                                                                                                              2}]))),
+    <<"aa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaa(*:N)a(*SKIP:N)(*PRUNE)b|a+c",[]))),
+    <<"aa">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*THEN)(*PRUNE)b|a+c",[trim]))),
     <<"aa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*THEN)(*PRUNE)b|a+c",[{parts,
-                                                                                                                                                                                                                2}]))), 
-    <<"aa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*THEN)(*PRUNE)b|a+c",[]))), 
+                                                                                                                                                                                                                2}]))),
+    <<"aa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*THEN)(*PRUNE)b|a+c",[]))),
     ok.
 run51() ->
-    <<"aaaaa">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP)b|a+c",[trim]))), 
+    <<"aaaaa">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP)b|a+c",[trim]))),
     <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP)b|a+c",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP)b|a+c",[]))), 
-    <<"aaaaa">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*PRUNE)(*SKIP)b|a+c",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP)b|a+c",[]))),
+    <<"aaaaa">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*PRUNE)(*SKIP)b|a+c",[trim]))),
     <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*PRUNE)(*SKIP)b|a+c",[{parts,
-                                                                                                                                                                                                                2}]))), 
-    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*PRUNE)(*SKIP)b|a+c",[]))), 
-    <<"aaaaa">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*THEN)(*SKIP)b|a+c",[trim]))), 
+                                                                                                                                                                                                                2}]))),
+    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*PRUNE)(*SKIP)b|a+c",[]))),
+    <<"aaaaa">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*THEN)(*SKIP)b|a+c",[trim]))),
     <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*THEN)(*SKIP)b|a+c",[{parts,
-                                                                                                                                                                                                              2}]))), 
-    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*THEN)(*SKIP)b|a+c",[]))), 
-    <<"aaaaa">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*COMMIT)(*SKIP)b|a+c",[trim]))), 
+                                                                                                                                                                                                              2}]))),
+    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*THEN)(*SKIP)b|a+c",[]))),
+    <<"aaaaa">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*COMMIT)(*SKIP)b|a+c",[trim]))),
     <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*COMMIT)(*SKIP)b|a+c",[{parts,
-                                                                                                                                                                                                                  2}]))), 
-    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*COMMIT)(*SKIP)b|a+c",[]))), 
-    <<"aaaaaac">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*COMMIT)b|a+c",[trim]))), 
+                                                                                                                                                                                                                  2}]))),
+    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*COMMIT)(*SKIP)b|a+c",[]))),
+    <<"aaaaaac">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*COMMIT)b|a+c",[trim]))),
     <<"aaaaaac">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*COMMIT)b|a+c",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<"aaaaaac">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*COMMIT)b|a+c",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*THEN)b|a+c",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<"aaaaaac">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*COMMIT)b|a+c",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*THEN)b|a+c",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*THEN)b|a+c",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*THEN)b|a+c",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP)(*THEN)b|a+c",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*THEN)b|a+c",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP)(*THEN)b|a+c",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP)(*THEN)b|a+c",[{parts,
-                                                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP)(*THEN)b|a+c",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*PRUNE)(*THEN)b|a+c",[trim]))), 
+                                                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP)(*THEN)b|a+c",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*PRUNE)(*THEN)b|a+c",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*PRUNE)(*THEN)b|a+c",[{parts,
-                                                                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*PRUNE)(*THEN)b|a+c",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*COMMIT)(*THEN)b|a+c",[trim]))), 
+                                                                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*PRUNE)(*THEN)b|a+c",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*COMMIT)(*THEN)b|a+c",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*COMMIT)(*THEN)b|a+c",[{parts,
-                                                                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*COMMIT)(*THEN)b|a+c",[]))), 
+                                                                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*COMMIT)(*THEN)b|a+c",[]))),
     ok.
 run52() ->
-    <<"aaaaa">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:m)(*PRUNE:m)(*SKIP:m)m|a+",[trim]))), 
+    <<"aaaaa">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:m)(*PRUNE:m)(*SKIP:m)m|a+",[trim]))),
     <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:m)(*PRUNE:m)(*SKIP:m)m|a+",[{parts,
-                                                                                                                                                                                                                              2}]))), 
-    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:m)(*PRUNE:m)(*SKIP:m)m|a+",[]))), 
-    <<"aaaaa">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:m)(*MARK:m)(*PRUNE)(*SKIP:m)m|a+",[trim]))), 
+                                                                                                                                                                                                                              2}]))),
+    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:m)(*PRUNE:m)(*SKIP:m)m|a+",[]))),
+    <<"aaaaa">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:m)(*MARK:m)(*PRUNE)(*SKIP:m)m|a+",[trim]))),
     <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:m)(*MARK:m)(*PRUNE)(*SKIP:m)m|a+",[{parts,
-                                                                                                                                                                                                                                            2}]))), 
-    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:m)(*MARK:m)(*PRUNE)(*SKIP:m)m|a+",[]))), 
-    <<"aa">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:n)(*PRUNE:m)(*SKIP:m)m|a+",[trim]))), 
+                                                                                                                                                                                                                                            2}]))),
+    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:m)(*MARK:m)(*PRUNE)(*SKIP:m)m|a+",[]))),
+    <<"aa">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:n)(*PRUNE:m)(*SKIP:m)m|a+",[trim]))),
     <<"aa:">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:n)(*PRUNE:m)(*SKIP:m)m|a+",[{parts,
-                                                                                                                                                                                                                              2}]))), 
-    <<"aa:">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:n)(*PRUNE:m)(*SKIP:m)m|a+",[]))), 
-    <<"aaaaa">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:n)(*MARK:m)(*PRUNE)(*SKIP:m)m|a+",[trim]))), 
+                                                                                                                                                                                                                              2}]))),
+    <<"aa:">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:n)(*PRUNE:m)(*SKIP:m)m|a+",[]))),
+    <<"aaaaa">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:n)(*MARK:m)(*PRUNE)(*SKIP:m)m|a+",[trim]))),
     <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:n)(*MARK:m)(*PRUNE)(*SKIP:m)m|a+",[{parts,
-                                                                                                                                                                                                                                            2}]))), 
-    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:n)(*MARK:m)(*PRUNE)(*SKIP:m)m|a+",[]))), 
-    <<"aa">> = iolist_to_binary(join(re:split("aaaac","a(*MARK:A)aa(*PRUNE:A)a(*SKIP:A)b|a+c",[trim]))), 
+                                                                                                                                                                                                                                            2}]))),
+    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:n)(*MARK:m)(*PRUNE)(*SKIP:m)m|a+",[]))),
+    <<"aa">> = iolist_to_binary(join(re:split("aaaac","a(*MARK:A)aa(*PRUNE:A)a(*SKIP:A)b|a+c",[trim]))),
     <<"aa:">> = iolist_to_binary(join(re:split("aaaac","a(*MARK:A)aa(*PRUNE:A)a(*SKIP:A)b|a+c",[{parts,
-                                                                                                                                                                                                                                    2}]))), 
-    <<"aa:">> = iolist_to_binary(join(re:split("aaaac","a(*MARK:A)aa(*PRUNE:A)a(*SKIP:A)b|a+c",[]))), 
-    <<"aaa">> = iolist_to_binary(join(re:split("aaaac","a(*MARK:A)aa(*MARK:A)a(*SKIP:A)b|a+c",[trim]))), 
+                                                                                                                                                                                                                                    2}]))),
+    <<"aa:">> = iolist_to_binary(join(re:split("aaaac","a(*MARK:A)aa(*PRUNE:A)a(*SKIP:A)b|a+c",[]))),
+    <<"aaa">> = iolist_to_binary(join(re:split("aaaac","a(*MARK:A)aa(*MARK:A)a(*SKIP:A)b|a+c",[trim]))),
     <<"aaa:">> = iolist_to_binary(join(re:split("aaaac","a(*MARK:A)aa(*MARK:A)a(*SKIP:A)b|a+c",[{parts,
-                                                                                                                                                                                                                                  2}]))), 
-    <<"aaa:">> = iolist_to_binary(join(re:split("aaaac","a(*MARK:A)aa(*MARK:A)a(*SKIP:A)b|a+c",[]))), 
-    <<"aa">> = iolist_to_binary(join(re:split("aaaac","aaa(*PRUNE:A)a(*SKIP:A)b|a+c",[trim]))), 
+                                                                                                                                                                                                                                  2}]))),
+    <<"aaa:">> = iolist_to_binary(join(re:split("aaaac","a(*MARK:A)aa(*MARK:A)a(*SKIP:A)b|a+c",[]))),
+    <<"aa">> = iolist_to_binary(join(re:split("aaaac","aaa(*PRUNE:A)a(*SKIP:A)b|a+c",[trim]))),
     <<"aa:">> = iolist_to_binary(join(re:split("aaaac","aaa(*PRUNE:A)a(*SKIP:A)b|a+c",[{parts,
-                                                                                                                                                                                                                  2}]))), 
-    <<"aa:">> = iolist_to_binary(join(re:split("aaaac","aaa(*PRUNE:A)a(*SKIP:A)b|a+c",[]))), 
-    <<"aaa">> = iolist_to_binary(join(re:split("aaaac","aaa(*MARK:A)a(*SKIP:A)b|a+c",[trim]))), 
+                                                                                                                                                                                                                  2}]))),
+    <<"aa:">> = iolist_to_binary(join(re:split("aaaac","aaa(*PRUNE:A)a(*SKIP:A)b|a+c",[]))),
+    <<"aaa">> = iolist_to_binary(join(re:split("aaaac","aaa(*MARK:A)a(*SKIP:A)b|a+c",[trim]))),
     <<"aaa:">> = iolist_to_binary(join(re:split("aaaac","aaa(*MARK:A)a(*SKIP:A)b|a+c",[{parts,
-                                                                                                                                                                                                                2}]))), 
-    <<"aaa:">> = iolist_to_binary(join(re:split("aaaac","aaa(*MARK:A)a(*SKIP:A)b|a+c",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("ba",".?(a|b(*THEN)c)",[trim]))), 
+                                                                                                                                                                                                                2}]))),
+    <<"aaa:">> = iolist_to_binary(join(re:split("aaaac","aaa(*MARK:A)a(*SKIP:A)b|a+c",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("ba",".?(a|b(*THEN)c)",[trim]))),
     <<":a:">> = iolist_to_binary(join(re:split("ba",".?(a|b(*THEN)c)",[{parts,
-                                                                                                                                                                                  2}]))), 
-    <<":a:">> = iolist_to_binary(join(re:split("ba",".?(a|b(*THEN)c)",[]))), 
-    <<":ab">> = iolist_to_binary(join(re:split("abc","(a(*COMMIT)b)c|abd",[trim]))), 
+                                                                                                                                                                                  2}]))),
+    <<":a:">> = iolist_to_binary(join(re:split("ba",".?(a|b(*THEN)c)",[]))),
+    <<":ab">> = iolist_to_binary(join(re:split("abc","(a(*COMMIT)b)c|abd",[trim]))),
     <<":ab:">> = iolist_to_binary(join(re:split("abc","(a(*COMMIT)b)c|abd",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<":ab:">> = iolist_to_binary(join(re:split("abc","(a(*COMMIT)b)c|abd",[]))), 
-    <<"abd">> = iolist_to_binary(join(re:split("abd","(a(*COMMIT)b)c|abd",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<":ab:">> = iolist_to_binary(join(re:split("abc","(a(*COMMIT)b)c|abd",[]))),
+    <<"abd">> = iolist_to_binary(join(re:split("abd","(a(*COMMIT)b)c|abd",[trim]))),
     <<"abd">> = iolist_to_binary(join(re:split("abd","(a(*COMMIT)b)c|abd",[{parts,
-                                                                                                                                                                                          2}]))), 
-    <<"abd">> = iolist_to_binary(join(re:split("abd","(a(*COMMIT)b)c|abd",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","(?=a(*COMMIT)b)abc|abd",[trim]))), 
+                                                                                                                                                                                          2}]))),
+    <<"abd">> = iolist_to_binary(join(re:split("abd","(a(*COMMIT)b)c|abd",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","(?=a(*COMMIT)b)abc|abd",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","(?=a(*COMMIT)b)abc|abd",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","(?=a(*COMMIT)b)abc|abd",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abd","(?=a(*COMMIT)b)abc|abd",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","(?=a(*COMMIT)b)abc|abd",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abd","(?=a(*COMMIT)b)abc|abd",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abd","(?=a(*COMMIT)b)abc|abd",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abd","(?=a(*COMMIT)b)abc|abd",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","(?>a(*COMMIT)b)c|abd",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abd","(?=a(*COMMIT)b)abc|abd",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","(?>a(*COMMIT)b)c|abd",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","(?>a(*COMMIT)b)c|abd",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","(?>a(*COMMIT)b)c|abd",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abd","(?>a(*COMMIT)b)c|abd",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","(?>a(*COMMIT)b)c|abd",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abd","(?>a(*COMMIT)b)c|abd",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abd","(?>a(*COMMIT)b)c|abd",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abd","(?>a(*COMMIT)b)c|abd",[]))), 
-    <<"abd">> = iolist_to_binary(join(re:split("abd","a(?=b(*COMMIT)c)[^d]|abd",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abd","(?>a(*COMMIT)b)c|abd",[]))),
+    <<"abd">> = iolist_to_binary(join(re:split("abd","a(?=b(*COMMIT)c)[^d]|abd",[trim]))),
     <<"abd">> = iolist_to_binary(join(re:split("abd","a(?=b(*COMMIT)c)[^d]|abd",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<"abd">> = iolist_to_binary(join(re:split("abd","a(?=b(*COMMIT)c)[^d]|abd",[]))), 
-    <<":c">> = iolist_to_binary(join(re:split("abc","a(?=b(*COMMIT)c)[^d]|abd",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<"abd">> = iolist_to_binary(join(re:split("abd","a(?=b(*COMMIT)c)[^d]|abd",[]))),
+    <<":c">> = iolist_to_binary(join(re:split("abc","a(?=b(*COMMIT)c)[^d]|abd",[trim]))),
     <<":c">> = iolist_to_binary(join(re:split("abc","a(?=b(*COMMIT)c)[^d]|abd",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<":c">> = iolist_to_binary(join(re:split("abc","a(?=b(*COMMIT)c)[^d]|abd",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abd","a(?=bc).|abd",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<":c">> = iolist_to_binary(join(re:split("abc","a(?=b(*COMMIT)c)[^d]|abd",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abd","a(?=bc).|abd",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abd","a(?=bc).|abd",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abd","a(?=bc).|abd",[]))), 
-    <<":c">> = iolist_to_binary(join(re:split("abc","a(?=bc).|abd",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abd","a(?=bc).|abd",[]))),
+    <<":c">> = iolist_to_binary(join(re:split("abc","a(?=bc).|abd",[trim]))),
     <<":c">> = iolist_to_binary(join(re:split("abc","a(?=bc).|abd",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<":c">> = iolist_to_binary(join(re:split("abc","a(?=bc).|abd",[]))), 
-    <<"abceabd">> = iolist_to_binary(join(re:split("abceabd","a(?>b(*COMMIT)c)d|abd",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<":c">> = iolist_to_binary(join(re:split("abc","a(?=bc).|abd",[]))),
+    <<"abceabd">> = iolist_to_binary(join(re:split("abceabd","a(?>b(*COMMIT)c)d|abd",[trim]))),
     <<"abceabd">> = iolist_to_binary(join(re:split("abceabd","a(?>b(*COMMIT)c)d|abd",[{parts,
-                                                                                                                                                                                                        2}]))), 
-    <<"abceabd">> = iolist_to_binary(join(re:split("abceabd","a(?>b(*COMMIT)c)d|abd",[]))), 
-    <<"abce">> = iolist_to_binary(join(re:split("abceabd","a(?>bc)d|abd",[trim]))), 
+                                                                                                                                                                                                        2}]))),
+    <<"abceabd">> = iolist_to_binary(join(re:split("abceabd","a(?>b(*COMMIT)c)d|abd",[]))),
+    <<"abce">> = iolist_to_binary(join(re:split("abceabd","a(?>bc)d|abd",[trim]))),
     <<"abce:">> = iolist_to_binary(join(re:split("abceabd","a(?>bc)d|abd",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<"abce:">> = iolist_to_binary(join(re:split("abceabd","a(?>bc)d|abd",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abd","(?>a(*COMMIT)b)c|abd",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<"abce:">> = iolist_to_binary(join(re:split("abceabd","a(?>bc)d|abd",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abd","(?>a(*COMMIT)b)c|abd",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abd","(?>a(*COMMIT)b)c|abd",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abd","(?>a(*COMMIT)b)c|abd",[]))), 
-    <<"abd">> = iolist_to_binary(join(re:split("abd","(?>a(*COMMIT)c)d|abd",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abd","(?>a(*COMMIT)b)c|abd",[]))),
+    <<"abd">> = iolist_to_binary(join(re:split("abd","(?>a(*COMMIT)c)d|abd",[trim]))),
     <<"abd">> = iolist_to_binary(join(re:split("abd","(?>a(*COMMIT)c)d|abd",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<"abd">> = iolist_to_binary(join(re:split("abd","(?>a(*COMMIT)c)d|abd",[]))), 
-    <<"::c">> = iolist_to_binary(join(re:split("ac","((?=a(*COMMIT)b)ab|ac){0}(?:(?1)|a(c))",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<"abd">> = iolist_to_binary(join(re:split("abd","(?>a(*COMMIT)c)d|abd",[]))),
+    <<"::c">> = iolist_to_binary(join(re:split("ac","((?=a(*COMMIT)b)ab|ac){0}(?:(?1)|a(c))",[trim]))),
     <<"::c:">> = iolist_to_binary(join(re:split("ac","((?=a(*COMMIT)b)ab|ac){0}(?:(?1)|a(c))",[{parts,
-                                                                                                                                                                                                                                2}]))), 
-    <<"::c:">> = iolist_to_binary(join(re:split("ac","((?=a(*COMMIT)b)ab|ac){0}(?:(?1)|a(c))",[]))), 
+                                                                                                                                                                                                                                2}]))),
+    <<"::c:">> = iolist_to_binary(join(re:split("ac","((?=a(*COMMIT)b)ab|ac){0}(?:(?1)|a(c))",[]))),
     ok.
 run53() ->
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a)?(?(1)a|b)+$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a)?(?(1)a|b)+$",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a)?(?(1)a|b)+$",[{parts,
-                                                                                                                                                                                                       2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a)?(?(1)a|b)+$",[]))), 
-    <<"a">> = iolist_to_binary(join(re:split("a","^(a)?(?(1)a|b)+$",[trim]))), 
+                                                                                                                                                                                                       2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a)?(?(1)a|b)+$",[]))),
+    <<"a">> = iolist_to_binary(join(re:split("a","^(a)?(?(1)a|b)+$",[trim]))),
     <<"a">> = iolist_to_binary(join(re:split("a","^(a)?(?(1)a|b)+$",[{parts,
-                                                                                                                                                                                   2}]))), 
-    <<"a">> = iolist_to_binary(join(re:split("a","^(a)?(?(1)a|b)+$",[]))), 
-    <<"a">> = iolist_to_binary(join(re:split("ab","(?=a\\Kb)ab",[trim]))), 
+                                                                                                                                                                                   2}]))),
+    <<"a">> = iolist_to_binary(join(re:split("a","^(a)?(?(1)a|b)+$",[]))),
+    <<"a">> = iolist_to_binary(join(re:split("ab","(?=a\\Kb)ab",[trim]))),
     <<"a:">> = iolist_to_binary(join(re:split("ab","(?=a\\Kb)ab",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<"a:">> = iolist_to_binary(join(re:split("ab","(?=a\\Kb)ab",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("ac","(?!a\\Kb)ac",[trim]))), 
+                                                                                                                                                                           2}]))),
+    <<"a:">> = iolist_to_binary(join(re:split("ab","(?=a\\Kb)ab",[]))),
+    <<"">> = iolist_to_binary(join(re:split("ac","(?!a\\Kb)ac",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("ac","(?!a\\Kb)ac",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ac","(?!a\\Kb)ac",[]))), 
-    <<"ab">> = iolist_to_binary(join(re:split("abcd","^abc(?<=b\\Kc)d",[trim]))), 
+                                                                                                                                                                           2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ac","(?!a\\Kb)ac",[]))),
+    <<"ab">> = iolist_to_binary(join(re:split("abcd","^abc(?<=b\\Kc)d",[trim]))),
     <<"ab:">> = iolist_to_binary(join(re:split("abcd","^abc(?<=b\\Kc)d",[{parts,
-                                                                                                                                                                                       2}]))), 
-    <<"ab:">> = iolist_to_binary(join(re:split("abcd","^abc(?<=b\\Kc)d",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abcd","^abc(?<!b\\Kq)d",[trim]))), 
+                                                                                                                                                                                       2}]))),
+    <<"ab:">> = iolist_to_binary(join(re:split("abcd","^abc(?<=b\\Kc)d",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abcd","^abc(?<!b\\Kq)d",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abcd","^abc(?<!b\\Kq)d",[{parts,
-                                                                                                                                                                                       2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abcd","^abc(?<!b\\Kq)d",[]))), 
-    <<":abcd">> = iolist_to_binary(join(re:split("abcd","^((abc|abcx)(*THEN)y|abcd)",[trim]))), 
+                                                                                                                                                                                       2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abcd","^abc(?<!b\\Kq)d",[]))),
+    <<":abcd">> = iolist_to_binary(join(re:split("abcd","^((abc|abcx)(*THEN)y|abcd)",[trim]))),
     <<":abcd::">> = iolist_to_binary(join(re:split("abcd","^((abc|abcx)(*THEN)y|abcd)",[{parts,
-                                                                                                                                                                                                            2}]))), 
-    <<":abcd::">> = iolist_to_binary(join(re:split("abcd","^((abc|abcx)(*THEN)y|abcd)",[]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^((abc|abcx)(*THEN)y|abcd)",[trim]))), 
+                                                                                                                                                                                                            2}]))),
+    <<":abcd::">> = iolist_to_binary(join(re:split("abcd","^((abc|abcx)(*THEN)y|abcd)",[]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^((abc|abcx)(*THEN)y|abcd)",[trim]))),
     <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^((abc|abcx)(*THEN)y|abcd)",[{parts,
-                                                                                                                                                                                                                          2}]))), 
-    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^((abc|abcx)(*THEN)y|abcd)",[]))), 
-    <<"abcxy">> = iolist_to_binary(join(re:split("abcxy","^((abc|abcx)(*THEN)y|abcd)",[trim]))), 
+                                                                                                                                                                                                                          2}]))),
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^((abc|abcx)(*THEN)y|abcd)",[]))),
+    <<"abcxy">> = iolist_to_binary(join(re:split("abcxy","^((abc|abcx)(*THEN)y|abcd)",[trim]))),
     <<"abcxy">> = iolist_to_binary(join(re:split("abcxy","^((abc|abcx)(*THEN)y|abcd)",[{parts,
-                                                                                                                                                                                                              2}]))), 
-    <<"abcxy">> = iolist_to_binary(join(re:split("abcxy","^((abc|abcx)(*THEN)y|abcd)",[]))), 
-    <<"yes">> = iolist_to_binary(join(re:split("yes","^((yes|no)(*THEN)(*F))?",[trim]))), 
+                                                                                                                                                                                                              2}]))),
+    <<"abcxy">> = iolist_to_binary(join(re:split("abcxy","^((abc|abcx)(*THEN)y|abcd)",[]))),
+    <<"yes">> = iolist_to_binary(join(re:split("yes","^((yes|no)(*THEN)(*F))?",[trim]))),
     <<"yes">> = iolist_to_binary(join(re:split("yes","^((yes|no)(*THEN)(*F))?",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<"yes">> = iolist_to_binary(join(re:split("yes","^((yes|no)(*THEN)(*F))?",[]))), 
-    <<"ac">> = iolist_to_binary(join(re:split("ac","(?=a(*COMMIT)b|ac)ac|ac",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<"yes">> = iolist_to_binary(join(re:split("yes","^((yes|no)(*THEN)(*F))?",[]))),
+    <<"ac">> = iolist_to_binary(join(re:split("ac","(?=a(*COMMIT)b|ac)ac|ac",[trim]))),
     <<"ac">> = iolist_to_binary(join(re:split("ac","(?=a(*COMMIT)b|ac)ac|ac",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<"ac">> = iolist_to_binary(join(re:split("ac","(?=a(*COMMIT)b|ac)ac|ac",[]))), 
+                                                                                                                                                                                                  2}]))),
+    <<"ac">> = iolist_to_binary(join(re:split("ac","(?=a(*COMMIT)b|ac)ac|ac",[]))),
     <<"ac">> = iolist_to_binary(join(re:split("ac","(?=a(*COMMIT)b|(ac)) ac | (a)c",[extended,
-                                                                                                                                                                                                              trim]))), 
+                                                                                                                                                                                                              trim]))),
     <<"ac">> = iolist_to_binary(join(re:split("ac","(?=a(*COMMIT)b|(ac)) ac | (a)c",[extended,
                                                                                                                                                                                                                 {parts,
-                                                                                                                                                                                                                 2}]))), 
-    <<"ac">> = iolist_to_binary(join(re:split("ac","(?=a(*COMMIT)b|(ac)) ac | (a)c",[extended]))), 
-    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*THEN)a)bn|bnn)",[trim]))), 
+                                                                                                                                                                                                                 2}]))),
+    <<"ac">> = iolist_to_binary(join(re:split("ac","(?=a(*COMMIT)b|(ac)) ac | (a)c",[extended]))),
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*THEN)a)bn|bnn)",[trim]))),
     <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*THEN)a)bn|bnn)",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*THEN)a)bn|bnn)",[]))), 
-    <<":n">> = iolist_to_binary(join(re:split("bnn","(?!b(*SKIP)a)bn|bnn",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*THEN)a)bn|bnn)",[]))),
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?!b(*SKIP)a)bn|bnn",[trim]))),
     <<":n">> = iolist_to_binary(join(re:split("bnn","(?!b(*SKIP)a)bn|bnn",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<":n">> = iolist_to_binary(join(re:split("bnn","(?!b(*SKIP)a)bn|bnn",[]))), 
-    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*SKIP)a)bn|bnn)",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?!b(*SKIP)a)bn|bnn",[]))),
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*SKIP)a)bn|bnn)",[trim]))),
     <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*SKIP)a)bn|bnn)",[{parts,
-                                                                                                                                                                                                  2}]))), 
-    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*SKIP)a)bn|bnn)",[]))), 
-    <<":n">> = iolist_to_binary(join(re:split("bnn","(?!b(*PRUNE)a)bn|bnn",[trim]))), 
+                                                                                                                                                                                                  2}]))),
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*SKIP)a)bn|bnn)",[]))),
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?!b(*PRUNE)a)bn|bnn",[trim]))),
     <<":n">> = iolist_to_binary(join(re:split("bnn","(?!b(*PRUNE)a)bn|bnn",[{parts,
-                                                                                                                                                                                              2}]))), 
-    <<":n">> = iolist_to_binary(join(re:split("bnn","(?!b(*PRUNE)a)bn|bnn",[]))), 
-    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*PRUNE)a)bn|bnn)",[trim]))), 
+                                                                                                                                                                                              2}]))),
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?!b(*PRUNE)a)bn|bnn",[]))),
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*PRUNE)a)bn|bnn)",[trim]))),
     <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*PRUNE)a)bn|bnn)",[{parts,
-                                                                                                                                                                                                    2}]))), 
-    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*PRUNE)a)bn|bnn)",[]))), 
-    <<":n">> = iolist_to_binary(join(re:split("bnn","(?!b(*COMMIT)a)bn|bnn",[trim]))), 
+                                                                                                                                                                                                    2}]))),
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*PRUNE)a)bn|bnn)",[]))),
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?!b(*COMMIT)a)bn|bnn",[trim]))),
     <<":n">> = iolist_to_binary(join(re:split("bnn","(?!b(*COMMIT)a)bn|bnn",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<":n">> = iolist_to_binary(join(re:split("bnn","(?!b(*COMMIT)a)bn|bnn",[]))), 
-    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*COMMIT)a)bn|bnn)",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?!b(*COMMIT)a)bn|bnn",[]))),
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*COMMIT)a)bn|bnn)",[trim]))),
     <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*COMMIT)a)bn|bnn)",[{parts,
-                                                                                                                                                                                                      2}]))), 
-    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*COMMIT)a)bn|bnn)",[]))), 
-    <<"bnn">> = iolist_to_binary(join(re:split("bnn","(?=b(*SKIP)a)bn|bnn",[trim]))), 
+                                                                                                                                                                                                      2}]))),
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*COMMIT)a)bn|bnn)",[]))),
+    <<"bnn">> = iolist_to_binary(join(re:split("bnn","(?=b(*SKIP)a)bn|bnn",[trim]))),
     <<"bnn">> = iolist_to_binary(join(re:split("bnn","(?=b(*SKIP)a)bn|bnn",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<"bnn">> = iolist_to_binary(join(re:split("bnn","(?=b(*SKIP)a)bn|bnn",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("bnn","(?=b(*THEN)a)bn|bnn",[trim]))), 
+                                                                                                                                                                                            2}]))),
+    <<"bnn">> = iolist_to_binary(join(re:split("bnn","(?=b(*SKIP)a)bn|bnn",[]))),
+    <<"">> = iolist_to_binary(join(re:split("bnn","(?=b(*THEN)a)bn|bnn",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("bnn","(?=b(*THEN)a)bn|bnn",[{parts,
-                                                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("bnn","(?=b(*THEN)a)bn|bnn",[]))), 
+                                                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("bnn","(?=b(*THEN)a)bn|bnn",[]))),
     ok.
 run54() ->
-    <<":d">> = iolist_to_binary(join(re:split("acd","(?!a(*SKIP)b)..",[trim]))), 
+    <<":d">> = iolist_to_binary(join(re:split("acd","(?!a(*SKIP)b)..",[trim]))),
     <<":d">> = iolist_to_binary(join(re:split("acd","(?!a(*SKIP)b)..",[{parts,
-                                                                                                                                                                                    2}]))), 
-    <<":d">> = iolist_to_binary(join(re:split("acd","(?!a(*SKIP)b)..",[]))), 
-    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?(?!a(*SKIP)b))",[trim]))), 
+                                                                                                                                                                                    2}]))),
+    <<":d">> = iolist_to_binary(join(re:split("acd","(?!a(*SKIP)b)..",[]))),
+    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?(?!a(*SKIP)b))",[trim]))),
     <<"ac">> = iolist_to_binary(join(re:split("ac","^(?(?!a(*SKIP)b))",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?(?!a(*SKIP)b))",[]))), 
-    <<":d">> = iolist_to_binary(join(re:split("acd","^(?!a(*PRUNE)b)..",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?(?!a(*SKIP)b))",[]))),
+    <<":d">> = iolist_to_binary(join(re:split("acd","^(?!a(*PRUNE)b)..",[trim]))),
     <<":d">> = iolist_to_binary(join(re:split("acd","^(?!a(*PRUNE)b)..",[{parts,
-                                                                                                                                                                                        2}]))), 
-    <<":d">> = iolist_to_binary(join(re:split("acd","^(?!a(*PRUNE)b)..",[]))), 
-    <<":d">> = iolist_to_binary(join(re:split("acd","(?!a(*PRUNE)b)..",[trim]))), 
+                                                                                                                                                                                        2}]))),
+    <<":d">> = iolist_to_binary(join(re:split("acd","^(?!a(*PRUNE)b)..",[]))),
+    <<":d">> = iolist_to_binary(join(re:split("acd","(?!a(*PRUNE)b)..",[trim]))),
     <<":d">> = iolist_to_binary(join(re:split("acd","(?!a(*PRUNE)b)..",[{parts,
-                                                                                                                                                                                      2}]))), 
-    <<":d">> = iolist_to_binary(join(re:split("acd","(?!a(*PRUNE)b)..",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("ba","\\A.*?(?:a|bc)",[trim]))), 
+                                                                                                                                                                                      2}]))),
+    <<":d">> = iolist_to_binary(join(re:split("acd","(?!a(*PRUNE)b)..",[]))),
+    <<"">> = iolist_to_binary(join(re:split("ba","\\A.*?(?:a|bc)",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("ba","\\A.*?(?:a|bc)",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ba","\\A.*?(?:a|bc)",[]))), 
-    <<":CD">> = iolist_to_binary(join(re:split("CD","^(A(*THEN)B|C(*THEN)D)",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ba","\\A.*?(?:a|bc)",[]))),
+    <<":CD">> = iolist_to_binary(join(re:split("CD","^(A(*THEN)B|C(*THEN)D)",[trim]))),
     <<":CD:">> = iolist_to_binary(join(re:split("CD","^(A(*THEN)B|C(*THEN)D)",[{parts,
-                                                                                                                                                                                                2}]))), 
-    <<":CD:">> = iolist_to_binary(join(re:split("CD","^(A(*THEN)B|C(*THEN)D)",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("1234","^\\d*\\w{4}",[trim]))), 
+                                                                                                                                                                                                2}]))),
+    <<":CD:">> = iolist_to_binary(join(re:split("CD","^(A(*THEN)B|C(*THEN)D)",[]))),
+    <<"">> = iolist_to_binary(join(re:split("1234","^\\d*\\w{4}",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("1234","^\\d*\\w{4}",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("1234","^\\d*\\w{4}",[]))), 
-    <<"123">> = iolist_to_binary(join(re:split("123","^\\d*\\w{4}",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("1234","^\\d*\\w{4}",[]))),
+    <<"123">> = iolist_to_binary(join(re:split("123","^\\d*\\w{4}",[trim]))),
     <<"123">> = iolist_to_binary(join(re:split("123","^\\d*\\w{4}",[{parts,
-                                                                                                                                                                              2}]))), 
-    <<"123">> = iolist_to_binary(join(re:split("123","^\\d*\\w{4}",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaa","^[^b]*\\w{4}",[trim]))), 
+                                                                                                                                                                              2}]))),
+    <<"123">> = iolist_to_binary(join(re:split("123","^\\d*\\w{4}",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaa","^[^b]*\\w{4}",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaa","^[^b]*\\w{4}",[{parts,
-                                                                                                                                                                                 2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaa","^[^b]*\\w{4}",[]))), 
-    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^[^b]*\\w{4}",[trim]))), 
+                                                                                                                                                                                 2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaa","^[^b]*\\w{4}",[]))),
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^[^b]*\\w{4}",[trim]))),
     <<"aaa">> = iolist_to_binary(join(re:split("aaa","^[^b]*\\w{4}",[{parts,
-                                                                                                                                                                               2}]))), 
-    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^[^b]*\\w{4}",[]))), 
+                                                                                                                                                                               2}]))),
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^[^b]*\\w{4}",[]))),
     <<"">> = iolist_to_binary(join(re:split("aaaa","^[^b]*\\w{4}",[caseless,
-                                                                                                                                                                               trim]))), 
+                                                                                                                                                                               trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaa","^[^b]*\\w{4}",[caseless,
                                                                                                                                                                                  {parts,
-                                                                                                                                                                                  2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaa","^[^b]*\\w{4}",[caseless]))), 
+                                                                                                                                                                                  2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaa","^[^b]*\\w{4}",[caseless]))),
     <<"aaa">> = iolist_to_binary(join(re:split("aaa","^[^b]*\\w{4}",[caseless,
-                                                                                                                                                                             trim]))), 
+                                                                                                                                                                             trim]))),
     <<"aaa">> = iolist_to_binary(join(re:split("aaa","^[^b]*\\w{4}",[caseless,
                                                                                                                                                                                {parts,
-                                                                                                                                                                                2}]))), 
-    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^[^b]*\\w{4}",[caseless]))), 
-    <<"">> = iolist_to_binary(join(re:split("aaaa","^a*\\w{4}",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^[^b]*\\w{4}",[caseless]))),
+    <<"">> = iolist_to_binary(join(re:split("aaaa","^a*\\w{4}",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaa","^a*\\w{4}",[{parts,
-                                                                                                                                                                           2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaa","^a*\\w{4}",[]))), 
-    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^a*\\w{4}",[trim]))), 
+                                                                                                                                                                           2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaa","^a*\\w{4}",[]))),
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^a*\\w{4}",[trim]))),
     <<"aaa">> = iolist_to_binary(join(re:split("aaa","^a*\\w{4}",[{parts,
-                                                                                                                                                                         2}]))), 
-    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^a*\\w{4}",[]))), 
+                                                                                                                                                                         2}]))),
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^a*\\w{4}",[]))),
     <<"">> = iolist_to_binary(join(re:split("aaaa","^a*\\w{4}",[caseless,
-                                                                                                                                                                         trim]))), 
+                                                                                                                                                                         trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaa","^a*\\w{4}",[caseless,
                                                                                                                                                                            {parts,
-                                                                                                                                                                            2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaa","^a*\\w{4}",[caseless]))), 
+                                                                                                                                                                            2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaa","^a*\\w{4}",[caseless]))),
     <<"aaa">> = iolist_to_binary(join(re:split("aaa","^a*\\w{4}",[caseless,
-                                                                                                                                                                       trim]))), 
+                                                                                                                                                                       trim]))),
     <<"aaa">> = iolist_to_binary(join(re:split("aaa","^a*\\w{4}",[caseless,
                                                                                                                                                                          {parts,
-                                                                                                                                                                          2}]))), 
-    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^a*\\w{4}",[caseless]))), 
-    <<":1:non-sp1:non-sp2">> = iolist_to_binary(join(re:split("1 IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[trim]))), 
+                                                                                                                                                                          2}]))),
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^a*\\w{4}",[caseless]))),
+    <<":1:non-sp1:non-sp2">> = iolist_to_binary(join(re:split("1 IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[trim]))),
     <<":1:non-sp1:non-sp2:">> = iolist_to_binary(join(re:split("1 IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[{parts,
-                                                                                                                                                                                                                                                                                                                     2}]))), 
-    <<":1:non-sp1:non-sp2:">> = iolist_to_binary(join(re:split("1 IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[]))), 
-    <<"AZ">> = iolist_to_binary(join(re:split("AZ","^A\\xZ",[trim]))), 
+                                                                                                                                                                                                                                                                                                                     2}]))),
+    <<":1:non-sp1:non-sp2:">> = iolist_to_binary(join(re:split("1 IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[]))),
+    <<"AZ">> = iolist_to_binary(join(re:split("AZ","^A\\xZ",[trim]))),
     <<"AZ">> = iolist_to_binary(join(re:split("AZ","^A\\xZ",[{parts,
-                                                                                                                                                                   2}]))), 
-    <<"AZ">> = iolist_to_binary(join(re:split("AZ","^A\\xZ",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("ASB","^A\\o{123}B",[trim]))), 
+                                                                                                                                                                   2}]))),
+    <<"AZ">> = iolist_to_binary(join(re:split("AZ","^A\\xZ",[]))),
+    <<"">> = iolist_to_binary(join(re:split("ASB","^A\\o{123}B",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("ASB","^A\\o{123}B",[{parts,
-                                                                                                                                                                             2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("ASB","^A\\o{123}B",[]))), 
+                                                                                                                                                                             2}]))),
+    <<":">> = iolist_to_binary(join(re:split("ASB","^A\\o{123}B",[]))),
     <<"">> = iolist_to_binary(join(re:split("aaaab"," ^ a + + b $ ",[extended,
-                                                                                                                                                                                   trim]))), 
+                                                                                                                                                                                   trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaab"," ^ a + + b $ ",[extended,
                                                                                                                                                                                      {parts,
-                                                                                                                                                                                      2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaab"," ^ a + + b $ ",[extended]))), 
+                                                                                                                                                                                      2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaab"," ^ a + + b $ ",[extended]))),
     <<"">> = iolist_to_binary(join(re:split("aaaab"," ^ a + #comment
-  + b $ ",[extended,trim]))), 
+  + b $ ",[extended,trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaab"," ^ a + #comment
-  + b $ ",[extended,{parts,2}]))), 
+  + b $ ",[extended,{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("aaaab"," ^ a + #comment
-  + b $ ",[extended]))), 
+  + b $ ",[extended]))),
     <<"">> = iolist_to_binary(join(re:split("aaaab"," ^ a + #comment
   #comment
-  + b $ ",[extended,trim]))), 
+  + b $ ",[extended,trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaab"," ^ a + #comment
   #comment
-  + b $ ",[extended,{parts,2}]))), 
+  + b $ ",[extended,{parts,2}]))),
     <<":">> = iolist_to_binary(join(re:split("aaaab"," ^ a + #comment
   #comment
-  + b $ ",[extended]))), 
+  + b $ ",[extended]))),
     ok.
 run55() ->
     <<"">> = iolist_to_binary(join(re:split("aaaab"," ^ (?> a + ) b $ ",[extended,
-                                                                                                                                                                                           trim]))), 
+                                                                                                                                                                                           trim]))),
     <<":">> = iolist_to_binary(join(re:split("aaaab"," ^ (?> a + ) b $ ",[extended,
                                                                                                                                                                                              {parts,
-                                                                                                                                                                                              2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aaaab"," ^ (?> a + ) b $ ",[extended]))), 
+                                                                                                                                                                                              2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aaaab"," ^ (?> a + ) b $ ",[extended]))),
     <<":aaaa">> = iolist_to_binary(join(re:split("aaaab"," ^ ( a + ) + + \\w $ ",[extended,
-                                                                                                                                                                                                    trim]))), 
+                                                                                                                                                                                                    trim]))),
     <<":aaaa:">> = iolist_to_binary(join(re:split("aaaab"," ^ ( a + ) + + \\w $ ",[extended,
                                                                                                                                                                                                       {parts,
-                                                                                                                                                                                                       2}]))), 
-    <<":aaaa:">> = iolist_to_binary(join(re:split("aaaab"," ^ ( a + ) + + \\w $ ",[extended]))), 
-    <<"acb">> = iolist_to_binary(join(re:split("acb","(?:x|(?:(xx|yy)+|x|x|x|x|x)|a|a|a)bc",[trim]))), 
+                                                                                                                                                                                                       2}]))),
+    <<":aaaa:">> = iolist_to_binary(join(re:split("aaaab"," ^ ( a + ) + + \\w $ ",[extended]))),
+    <<"acb">> = iolist_to_binary(join(re:split("acb","(?:x|(?:(xx|yy)+|x|x|x|x|x)|a|a|a)bc",[trim]))),
     <<"acb">> = iolist_to_binary(join(re:split("acb","(?:x|(?:(xx|yy)+|x|x|x|x|x)|a|a|a)bc",[{parts,
-                                                                                                                                                                                                                              2}]))), 
-    <<"acb">> = iolist_to_binary(join(re:split("acb","(?:x|(?:(xx|yy)+|x|x|x|x|x)|a|a|a)bc",[]))), 
-    <<":\"NOT MATCHED">> = iolist_to_binary(join(re:split("NON QUOTED \"QUOT\"\"ED\" AFTER \"NOT MATCHED","\\A(?:[^\\\"]++|\\\"(?:[^\\\"]*+|\\\"\\\")*+\\\")++",[trim]))), 
+                                                                                                                                                                                                                              2}]))),
+    <<"acb">> = iolist_to_binary(join(re:split("acb","(?:x|(?:(xx|yy)+|x|x|x|x|x)|a|a|a)bc",[]))),
+    <<":\"NOT MATCHED">> = iolist_to_binary(join(re:split("NON QUOTED \"QUOT\"\"ED\" AFTER \"NOT MATCHED","\\A(?:[^\\\"]++|\\\"(?:[^\\\"]*+|\\\"\\\")*+\\\")++",[trim]))),
     <<":\"NOT MATCHED">> = iolist_to_binary(join(re:split("NON QUOTED \"QUOT\"\"ED\" AFTER \"NOT MATCHED","\\A(?:[^\\\"]++|\\\"(?:[^\\\"]*+|\\\"\\\")*+\\\")++",[{parts,
-                                                                                                                                                                                                                                                                                                                                                                       2}]))), 
-    <<":\"NOT MATCHED">> = iolist_to_binary(join(re:split("NON QUOTED \"QUOT\"\"ED\" AFTER \"NOT MATCHED","\\A(?:[^\\\"]++|\\\"(?:[^\\\"]*+|\\\"\\\")*+\\\")++",[]))), 
-    <<":\"NOT MATCHED">> = iolist_to_binary(join(re:split("NON QUOTED \"QUOT\"\"ED\" AFTER \"NOT MATCHED","\\A(?:[^\\\"]++|\\\"(?:[^\\\"]++|\\\"\\\")*+\\\")++",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                                                       2}]))),
+    <<":\"NOT MATCHED">> = iolist_to_binary(join(re:split("NON QUOTED \"QUOT\"\"ED\" AFTER \"NOT MATCHED","\\A(?:[^\\\"]++|\\\"(?:[^\\\"]*+|\\\"\\\")*+\\\")++",[]))),
+    <<":\"NOT MATCHED">> = iolist_to_binary(join(re:split("NON QUOTED \"QUOT\"\"ED\" AFTER \"NOT MATCHED","\\A(?:[^\\\"]++|\\\"(?:[^\\\"]++|\\\"\\\")*+\\\")++",[trim]))),
     <<":\"NOT MATCHED">> = iolist_to_binary(join(re:split("NON QUOTED \"QUOT\"\"ED\" AFTER \"NOT MATCHED","\\A(?:[^\\\"]++|\\\"(?:[^\\\"]++|\\\"\\\")*+\\\")++",[{parts,
-                                                                                                                                                                                                                                                                                                                                                                       2}]))), 
-    <<":\"NOT MATCHED">> = iolist_to_binary(join(re:split("NON QUOTED \"QUOT\"\"ED\" AFTER \"NOT MATCHED","\\A(?:[^\\\"]++|\\\"(?:[^\\\"]++|\\\"\\\")*+\\\")++",[]))), 
-    <<":\"NOT MATCHED">> = iolist_to_binary(join(re:split("NON QUOTED \"QUOT\"\"ED\" AFTER \"NOT MATCHED","\\A(?:[^\\\"]++|\\\"(?:[^\\\"]++|\\\"\\\")++\\\")++",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                                                       2}]))),
+    <<":\"NOT MATCHED">> = iolist_to_binary(join(re:split("NON QUOTED \"QUOT\"\"ED\" AFTER \"NOT MATCHED","\\A(?:[^\\\"]++|\\\"(?:[^\\\"]++|\\\"\\\")*+\\\")++",[]))),
+    <<":\"NOT MATCHED">> = iolist_to_binary(join(re:split("NON QUOTED \"QUOT\"\"ED\" AFTER \"NOT MATCHED","\\A(?:[^\\\"]++|\\\"(?:[^\\\"]++|\\\"\\\")++\\\")++",[trim]))),
     <<":\"NOT MATCHED">> = iolist_to_binary(join(re:split("NON QUOTED \"QUOT\"\"ED\" AFTER \"NOT MATCHED","\\A(?:[^\\\"]++|\\\"(?:[^\\\"]++|\\\"\\\")++\\\")++",[{parts,
-                                                                                                                                                                                                                                                                                                                                                                       2}]))), 
-    <<":\"NOT MATCHED">> = iolist_to_binary(join(re:split("NON QUOTED \"QUOT\"\"ED\" AFTER \"NOT MATCHED","\\A(?:[^\\\"]++|\\\"(?:[^\\\"]++|\\\"\\\")++\\\")++",[]))), 
-    <<": AFTER ::\"NOT MATCHED">> = iolist_to_binary(join(re:split("NON QUOTED \"QUOT\"\"ED\" AFTER \"NOT MATCHED","\\A([^\\\"1]++|[\\\"2]([^\\\"3]*+|[\\\"4][\\\"5])*+[\\\"6])++",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                                                       2}]))),
+    <<":\"NOT MATCHED">> = iolist_to_binary(join(re:split("NON QUOTED \"QUOT\"\"ED\" AFTER \"NOT MATCHED","\\A(?:[^\\\"]++|\\\"(?:[^\\\"]++|\\\"\\\")++\\\")++",[]))),
+    <<": AFTER ::\"NOT MATCHED">> = iolist_to_binary(join(re:split("NON QUOTED \"QUOT\"\"ED\" AFTER \"NOT MATCHED","\\A([^\\\"1]++|[\\\"2]([^\\\"3]*+|[\\\"4][\\\"5])*+[\\\"6])++",[trim]))),
     <<": AFTER ::\"NOT MATCHED">> = iolist_to_binary(join(re:split("NON QUOTED \"QUOT\"\"ED\" AFTER \"NOT MATCHED","\\A([^\\\"1]++|[\\\"2]([^\\\"3]*+|[\\\"4][\\\"5])*+[\\\"6])++",[{parts,
-                                                                                                                                                                                                                                                                                                                                                                                           2}]))), 
-    <<": AFTER ::\"NOT MATCHED">> = iolist_to_binary(join(re:split("NON QUOTED \"QUOT\"\"ED\" AFTER \"NOT MATCHED","\\A([^\\\"1]++|[\\\"2]([^\\\"3]*+|[\\\"4][\\\"5])*+[\\\"6])++",[]))), 
-    <<":t test">> = iolist_to_binary(join(re:split("test test","^\\w+(?>\\s*)(?<=\\w)",[trim]))), 
+                                                                                                                                                                                                                                                                                                                                                                                           2}]))),
+    <<": AFTER ::\"NOT MATCHED">> = iolist_to_binary(join(re:split("NON QUOTED \"QUOT\"\"ED\" AFTER \"NOT MATCHED","\\A([^\\\"1]++|[\\\"2]([^\\\"3]*+|[\\\"4][\\\"5])*+[\\\"6])++",[]))),
+    <<":t test">> = iolist_to_binary(join(re:split("test test","^\\w+(?>\\s*)(?<=\\w)",[trim]))),
     <<":t test">> = iolist_to_binary(join(re:split("test test","^\\w+(?>\\s*)(?<=\\w)",[{parts,
-                                                                                                                                                                                                               2}]))), 
-    <<":t test">> = iolist_to_binary(join(re:split("test test","^\\w+(?>\\s*)(?<=\\w)",[]))), 
-    <<":a">> = iolist_to_binary(join(re:split("acl","(?P<Name>a)?(?P<Name2>b)?(?(<Name>)c|d)*l",[trim]))), 
+                                                                                                                                                                                                               2}]))),
+    <<":t test">> = iolist_to_binary(join(re:split("test test","^\\w+(?>\\s*)(?<=\\w)",[]))),
+    <<":a">> = iolist_to_binary(join(re:split("acl","(?P<Name>a)?(?P<Name2>b)?(?(<Name>)c|d)*l",[trim]))),
     <<":a::">> = iolist_to_binary(join(re:split("acl","(?P<Name>a)?(?P<Name2>b)?(?(<Name>)c|d)*l",[{parts,
-                                                                                                                                                                                                                                        2}]))), 
-    <<":a::">> = iolist_to_binary(join(re:split("acl","(?P<Name>a)?(?P<Name2>b)?(?(<Name>)c|d)*l",[]))), 
-    <<"::b">> = iolist_to_binary(join(re:split("bdl","(?P<Name>a)?(?P<Name2>b)?(?(<Name>)c|d)*l",[trim]))), 
+                                                                                                                                                                                                                                        2}]))),
+    <<":a::">> = iolist_to_binary(join(re:split("acl","(?P<Name>a)?(?P<Name2>b)?(?(<Name>)c|d)*l",[]))),
+    <<"::b">> = iolist_to_binary(join(re:split("bdl","(?P<Name>a)?(?P<Name2>b)?(?(<Name>)c|d)*l",[trim]))),
     <<"::b:">> = iolist_to_binary(join(re:split("bdl","(?P<Name>a)?(?P<Name2>b)?(?(<Name>)c|d)*l",[{parts,
-                                                                                                                                                                                                                                        2}]))), 
-    <<"::b:">> = iolist_to_binary(join(re:split("bdl","(?P<Name>a)?(?P<Name2>b)?(?(<Name>)c|d)*l",[]))), 
-    <<"a">> = iolist_to_binary(join(re:split("adl","(?P<Name>a)?(?P<Name2>b)?(?(<Name>)c|d)*l",[trim]))), 
+                                                                                                                                                                                                                                        2}]))),
+    <<"::b:">> = iolist_to_binary(join(re:split("bdl","(?P<Name>a)?(?P<Name2>b)?(?(<Name>)c|d)*l",[]))),
+    <<"a">> = iolist_to_binary(join(re:split("adl","(?P<Name>a)?(?P<Name2>b)?(?(<Name>)c|d)*l",[trim]))),
     <<"a:::">> = iolist_to_binary(join(re:split("adl","(?P<Name>a)?(?P<Name2>b)?(?(<Name>)c|d)*l",[{parts,
-                                                                                                                                                                                                                                        2}]))), 
-    <<"a:::">> = iolist_to_binary(join(re:split("adl","(?P<Name>a)?(?P<Name2>b)?(?(<Name>)c|d)*l",[]))), 
-    <<"bc">> = iolist_to_binary(join(re:split("bcl","(?P<Name>a)?(?P<Name2>b)?(?(<Name>)c|d)*l",[trim]))), 
+                                                                                                                                                                                                                                        2}]))),
+    <<"a:::">> = iolist_to_binary(join(re:split("adl","(?P<Name>a)?(?P<Name2>b)?(?(<Name>)c|d)*l",[]))),
+    <<"bc">> = iolist_to_binary(join(re:split("bcl","(?P<Name>a)?(?P<Name2>b)?(?(<Name>)c|d)*l",[trim]))),
     <<"bc:::">> = iolist_to_binary(join(re:split("bcl","(?P<Name>a)?(?P<Name2>b)?(?(<Name>)c|d)*l",[{parts,
-                                                                                                                                                                                                                                        2}]))), 
-    <<"bc:::">> = iolist_to_binary(join(re:split("bcl","(?P<Name>a)?(?P<Name2>b)?(?(<Name>)c|d)*l",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("abc","\\sabc",[trim]))), 
+                                                                                                                                                                                                                                        2}]))),
+    <<"bc:::">> = iolist_to_binary(join(re:split("bcl","(?P<Name>a)?(?P<Name2>b)?(?(<Name>)c|d)*l",[]))),
+    <<"">> = iolist_to_binary(join(re:split("abc","\\sabc",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("abc","\\sabc",[{parts,
-                                                                                                                                                                     2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("abc","\\sabc",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aa]]","[\\Qa]\\E]+",[trim]))), 
+                                                                                                                                                                     2}]))),
+    <<":">> = iolist_to_binary(join(re:split("abc","\\sabc",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aa]]","[\\Qa]\\E]+",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aa]]","[\\Qa]\\E]+",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aa]]","[\\Qa]\\E]+",[]))), 
-    <<"">> = iolist_to_binary(join(re:split("aa]]","[\\Q]a\\E]+",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aa]]","[\\Qa]\\E]+",[]))),
+    <<"">> = iolist_to_binary(join(re:split("aa]]","[\\Q]a\\E]+",[trim]))),
     <<":">> = iolist_to_binary(join(re:split("aa]]","[\\Q]a\\E]+",[{parts,
-                                                                                                                                                                                2}]))), 
-    <<":">> = iolist_to_binary(join(re:split("aa]]","[\\Q]a\\E]+",[]))), 
-    <<"1::::::2::::::3::::::4:abcd:abcd">> = iolist_to_binary(join(re:split("1234abcd","(?:((abcd))|(((?:(?:(?:(?:abc|(?:abcdef))))b)abcdefghi)abc)|((*ACCEPT)))",[trim]))), 
+                                                                                                                                                                                2}]))),
+    <<":">> = iolist_to_binary(join(re:split("aa]]","[\\Q]a\\E]+",[]))),
+    <<"1::::::2::::::3::::::4:abcd:abcd">> = iolist_to_binary(join(re:split("1234abcd","(?:((abcd))|(((?:(?:(?:(?:abc|(?:abcdef))))b)abcdefghi)abc)|((*ACCEPT)))",[trim]))),
     <<"1::::::234abcd">> = iolist_to_binary(join(re:split("1234abcd","(?:((abcd))|(((?:(?:(?:(?:abc|(?:abcdef))))b)abcdefghi)abc)|((*ACCEPT)))",[{parts,
-                                                                                                                                                                                                                                                                                                                2}]))), 
-    <<"1::::::2::::::3::::::4:abcd:abcd::::">> = iolist_to_binary(join(re:split("1234abcd","(?:((abcd))|(((?:(?:(?:(?:abc|(?:abcdef))))b)abcdefghi)abc)|((*ACCEPT)))",[]))), 
+                                                                                                                                                                                                                                                                                                                2}]))),
+    <<"1::::::2::::::3::::::4:abcd:abcd::::">> = iolist_to_binary(join(re:split("1234abcd","(?:((abcd))|(((?:(?:(?:(?:abc|(?:abcdef))))b)abcdefghi)abc)|((*ACCEPT)))",[]))),
     ok.
 run56() ->
-    <<"b:a:c">> = iolist_to_binary(join(re:split("baaaaaaaaac","(?1)(?#?'){8}(a)",[trim]))), 
+    <<"b:a:c">> = iolist_to_binary(join(re:split("baaaaaaaaac","(?1)(?#?'){8}(a)",[trim]))),
     <<"b:a:c">> = iolist_to_binary(join(re:split("baaaaaaaaac","(?1)(?#?'){8}(a)",[{parts,
-                                                                                                                                                                                                              2}]))), 
-    <<"b:a:c">> = iolist_to_binary(join(re:split("baaaaaaaaac","(?1)(?#?'){8}(a)",[]))), 
-    <<"a::b::c::d">> = iolist_to_binary(join(re:split("abcd","(?|(\\k'Pm')|(?'Pm'))",[trim]))), 
+                                                                                                                                                                                                              2}]))),
+    <<"b:a:c">> = iolist_to_binary(join(re:split("baaaaaaaaac","(?1)(?#?'){8}(a)",[]))),
+    <<"a::b::c::d">> = iolist_to_binary(join(re:split("abcd","(?|(\\k'Pm')|(?'Pm'))",[trim]))),
     <<"a::bcd">> = iolist_to_binary(join(re:split("abcd","(?|(\\k'Pm')|(?'Pm'))",[{parts,
-                                                                                                                                                                                                                                   2}]))), 
-    <<"a::b::c::d::">> = iolist_to_binary(join(re:split("abcd","(?|(\\k'Pm')|(?'Pm'))",[]))), 
-    <<"  :Fred:099">> = iolist_to_binary(join(re:split("  Fred:099","(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[,;:])(?=.{8,16})(?!.*[\\s])",[trim]))), 
+                                                                                                                                                                                                                                   2}]))),
+    <<"a::b::c::d::">> = iolist_to_binary(join(re:split("abcd","(?|(\\k'Pm')|(?'Pm'))",[]))),
+    <<"  :Fred:099">> = iolist_to_binary(join(re:split("  Fred:099","(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[,;:])(?=.{8,16})(?!.*[\\s])",[trim]))),
     <<"  :Fred:099">> = iolist_to_binary(join(re:split("  Fred:099","(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[,;:])(?=.{8,16})(?!.*[\\s])",[{parts,
-                                                                                                                                                                                                                                                                                                         2}]))), 
-    <<"  :Fred:099">> = iolist_to_binary(join(re:split("  Fred:099","(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[,;:])(?=.{8,16})(?!.*[\\s])",[]))), 
-    <<"  ">> = iolist_to_binary(join(re:split("  X","(?=.*X)X$",[trim]))), 
+                                                                                                                                                                                                                                                                                                         2}]))),
+    <<"  :Fred:099">> = iolist_to_binary(join(re:split("  Fred:099","(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[,;:])(?=.{8,16})(?!.*[\\s])",[]))),
+    <<"  ">> = iolist_to_binary(join(re:split("  X","(?=.*X)X$",[trim]))),
     <<"  :">> = iolist_to_binary(join(re:split("  X","(?=.*X)X$",[{parts,
-                                                                                                                                                                         2}]))), 
-    <<"  :">> = iolist_to_binary(join(re:split("  X","(?=.*X)X$",[]))), 
+                                                                                                                                                                         2}]))),
+    <<"  :">> = iolist_to_binary(join(re:split("  X","(?=.*X)X$",[]))),
+    <<">:::<">> = iolist_to_binary(join(re:split(">XXX<","X+(?#comment)?",[trim]))),
+    <<">:XX<">> = iolist_to_binary(join(re:split(">XXX<","X+(?#comment)?",[{parts,
+                                                                                                                                                                                      2}]))),
+    <<">:::<">> = iolist_to_binary(join(re:split(">XXX<","X+(?#comment)?",[]))),
+    <<":pokus">> = iolist_to_binary(join(re:split("pokus.","   (?<word> \\w+ )*    \\.   ",[extended,
+                                                                                                                                                                                                                       caseless,
+                                                                                                                                                                                                                       trim]))),
+    <<":pokus:">> = iolist_to_binary(join(re:split("pokus.","   (?<word> \\w+ )*    \\.   ",[extended,
+                                                                                                                                                                                                                         caseless,
+                                                                                                                                                                                                                         {parts,
+                                                                                                                                                                                                                          2}]))),
+    <<":pokus:">> = iolist_to_binary(join(re:split("pokus.","   (?<word> \\w+ )*    \\.   ",[extended,
+                                                                                                                                                                                                                          caseless]))),
+    <<"">> = iolist_to_binary(join(re:split("pokus.","(?(DEFINE) (?<word> \\w+ ) ) (?&word)*   \\.",[extended,
+                                                                                                                                                                                                                                                     caseless,
+                                                                                                                                                                                                                                                     trim]))),
+    <<"::">> = iolist_to_binary(join(re:split("pokus.","(?(DEFINE) (?<word> \\w+ ) ) (?&word)*   \\.",[extended,
+                                                                                                                                                                                                                                                       caseless,
+                                                                                                                                                                                                                                                       {parts,
+                                                                                                                                                                                                                                                        2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("pokus.","(?(DEFINE) (?<word> \\w+ ) ) (?&word)*   \\.",[extended,
+                                                                                                                                                                                                                                                        caseless]))),
+    <<"::pokus">> = iolist_to_binary(join(re:split("pokus.","(?(DEFINE) (?<word> \\w+ ) ) ( (?&word)* )   \\.",[extended,
+                                                                                                                                                                                                                                                             caseless,
+                                                                                                                                                                                                                                                             trim]))),
+    <<"::pokus:">> = iolist_to_binary(join(re:split("pokus.","(?(DEFINE) (?<word> \\w+ ) ) ( (?&word)* )   \\.",[extended,
+                                                                                                                                                                                                                                                               caseless,
+                                                                                                                                                                                                                                                               {parts,
+                                                                                                                                                                                                                                                                2}]))),
+    <<"::pokus:">> = iolist_to_binary(join(re:split("pokus.","(?(DEFINE) (?<word> \\w+ ) ) ( (?&word)* )   \\.",[extended,
+                                                                                                                                                                                                                                                                caseless]))),
+    <<"">> = iolist_to_binary(join(re:split("pokus.","(?&word)*  (?(DEFINE) (?<word> \\w+ ) )  \\.",[extended,
+                                                                                                                                                                                                                                                     caseless,
+                                                                                                                                                                                                                                                     trim]))),
+    <<"::">> = iolist_to_binary(join(re:split("pokus.","(?&word)*  (?(DEFINE) (?<word> \\w+ ) )  \\.",[extended,
+                                                                                                                                                                                                                                                       caseless,
+                                                                                                                                                                                                                                                       {parts,
+                                                                                                                                                                                                                                                        2}]))),
+    <<"::">> = iolist_to_binary(join(re:split("pokus.","(?&word)*  (?(DEFINE) (?<word> \\w+ ) )  \\.",[extended,
+                                                                                                                                                                                                                                                        caseless]))),
+    <<":hokus">> = iolist_to_binary(join(re:split("pokus.hokus","(?&word)*  \\. (?<word> \\w+ )",[extended,
+                                                                                                                                                                                                                                   caseless,
+                                                                                                                                                                                                                                   trim]))),
+    <<":hokus:">> = iolist_to_binary(join(re:split("pokus.hokus","(?&word)*  \\. (?<word> \\w+ )",[extended,
+                                                                                                                                                                                                                                     caseless,
+                                                                                                                                                                                                                                     {parts,
+                                                                                                                                                                                                                                      2}]))),
+    <<":hokus:">> = iolist_to_binary(join(re:split("pokus.hokus","(?&word)*  \\. (?<word> \\w+ )",[extended,
+                                                                                                                                                                                                                                      caseless]))),
     ok.
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl
index 22136d687c..cdb6031b07 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. 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.
@@ -2591,7 +2591,7 @@ otp_7184(Config) when is_list(Config) ->
 otp_7232(Config) when is_list(Config) ->
     Info = <<"qlc:info(qlc:sort(qlc:q([X || X <- [55296,56296]]), "
              "{order, fun(A,B)-> A>B end})).">>,
-    "qlc:sort([55296,56296],\n"
+    "qlc:sort([55296, 56296],\n"
     "         [{order,\n"
     "           fun(A, B) ->\n"
     "                  A > B\n"
@@ -2752,7 +2752,7 @@ otp_10302(Config) when is_list(Config) ->
            h().">>,
 
     "ok.\n\"\x{400}\"\nA = \"\x{400}\".\nok.\n"
-    "1: io:setopts([{encoding,utf8}])\n-> ok.\n"
+    "1: io:setopts([{encoding, utf8}])\n-> ok.\n"
     "2: A = [1024] = \"\x{400}\"\n-> \"\x{400}\"\n"
     "3: b()\n-> ok.\nok.\n" = t({Node,Test4}),
 
diff --git a/lib/stdlib/test/stdlib.spec b/lib/stdlib/test/stdlib.spec
index 9c625091a8..bf64eae2c7 100644
--- a/lib/stdlib/test/stdlib.spec
+++ b/lib/stdlib/test/stdlib.spec
@@ -1,4 +1,7 @@
 {suites,"../stdlib_test",all}.
 {skip_groups,"../stdlib_test",stdlib_bench_SUITE,
-             [base64,gen_server,gen_statem,unicode],
+             [binary,base64,gen_server,gen_statem,unicode],
+             "Benchmark only"}.
+{skip_groups,"../stdlib_test",ets_SUITE,
+             [benchmark],
              "Benchmark only"}.
diff --git a/lib/stdlib/test/stdlib_bench.spec b/lib/stdlib/test/stdlib_bench.spec
index 7a0da811a0..6d665f22b6 100644
--- a/lib/stdlib/test/stdlib_bench.spec
+++ b/lib/stdlib/test/stdlib_bench.spec
@@ -8,3 +8,4 @@
 {skip_groups,"../stdlib_test",stdlib_bench_SUITE,
              [gen_server_comparison,gen_statem_comparison],
              "Not a benchmark"}.
+{groups,"../stdlib_test",ets_SUITE,[benchmark]}.
diff --git a/lib/stdlib/test/stdlib_bench_SUITE.erl b/lib/stdlib/test/stdlib_bench_SUITE.erl
index 2364e8376f..3456442088 100644
--- a/lib/stdlib/test/stdlib_bench_SUITE.erl
+++ b/lib/stdlib/test/stdlib_bench_SUITE.erl
@@ -29,7 +29,7 @@ suite() -> [{ct_hooks,[{ts_install_cth,[{nodenames,2}]}]}].
 
 
 all() ->
-    [{group,unicode},{group,base64},
+    [{group,unicode},{group,base64},{group,binary},
      {group,gen_server},{group,gen_statem},
      {group,gen_server_comparison},{group,gen_statem_comparison}].
 
@@ -38,6 +38,13 @@ groups() ->
       [norm_nfc_list, norm_nfc_deep_l, norm_nfc_binary,
        string_lexemes_list, string_lexemes_binary
       ]},
+     %% Only run 1 binary match repeat as it is very slow pre OTP-22.
+     %% The results seem to be stable enough anyway
+     {binary, [{repeat, 1}],
+      [match_single_pattern_no_match,
+       matches_single_pattern_no_match,
+       matches_single_pattern_eventual_match,
+       matches_single_pattern_frequent_match]},
      {base64,[{repeat,5}],
       [decode_binary, decode_binary_to_string,
        decode_list, decode_list_to_string,
@@ -60,9 +67,9 @@ 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].
+    [generic, generic_log, generic_log100, generic_fsm, generic_fsm_transit,
+     generic_statem, generic_statem_log, generic_statem_log100,
+     generic_statem_transit, generic_statem_complex].
 
 init_per_group(gen_server, Config) ->
     compile_servers(Config),
@@ -157,41 +164,59 @@ norm_data(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+match_single_pattern_no_match(_Config) ->
+    Binary = binary:copy(<<"ugbcfuysabfuqyfikgfsdalpaskfhgjsdgfjwsalp">>, 1000000),
+    comment(test(100, binary, match, [Binary, <<"o">>])).
+
+matches_single_pattern_no_match(_Config) ->
+    Binary = binary:copy(<<"ugbcfuysabfuqyfikgfsdalpaskfhgjsdgfjwsalp">>, 1000000),
+    comment(test(100, binary, matches, [Binary, <<"o">>])).
+
+matches_single_pattern_eventual_match(_Config) ->
+    Binary = binary:copy(<<"ugbcfuysabfuqyfikgfsdalpaskfhgjsdgfjwsal\n">>, 1000000),
+    comment(test(100, binary, matches, [Binary, <<"\n">>])).
+
+matches_single_pattern_frequent_match(_Config) ->
+    Binary = binary:copy(<<"abc\n">>, 1000000),
+    comment(test(100, binary, matches, [Binary, <<"abc">>])).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 decode_binary(_Config) ->
-    comment(test(decode, encoded_binary())).
+    comment(test(base64, decode, [encoded_binary()])).
 
 decode_binary_to_string(_Config) ->
-    comment(test(decode_to_string, encoded_binary())).
+    comment(test(base64, decode_to_string, [encoded_binary()])).
 
 decode_list(_Config) ->
-    comment(test(decode, encoded_list())).
+    comment(test(base64, decode, [encoded_list()])).
 
 decode_list_to_string(_Config) ->
-    comment(test(decode_to_string, encoded_list())).
+    comment(test(base64, decode_to_string, [encoded_list()])).
 
 encode_binary(_Config) ->
-    comment(test(encode, binary())).
+    comment(test(base64, encode, [binary()])).
 
 encode_binary_to_string(_Config) ->
-    comment(test(encode_to_string, binary())).
+    comment(test(base64, encode_to_string, [binary()])).
 
 encode_list(_Config) ->
-    comment(test(encode, list())).
+    comment(test(base64, encode, [list()])).
 
 encode_list_to_string(_Config) ->
-    comment(test(encode_to_string, list())).
+    comment(test(base64, encode_to_string, [list()])).
 
 mime_binary_decode(_Config) ->
-    comment(test(mime_decode, encoded_binary())).
+    comment(test(base64, mime_decode, [encoded_binary()])).
 
 mime_binary_decode_to_string(_Config) ->
-    comment(test(mime_decode_to_string, encoded_binary())).
+    comment(test(base64, mime_decode_to_string, [encoded_binary()])).
 
 mime_list_decode(_Config) ->
-    comment(test(mime_decode, encoded_list())).
+    comment(test(base64, mime_decode, [encoded_list()])).
 
 mime_list_decode_to_string(_Config) ->
-    comment(test(mime_decode_to_string, encoded_list())).
+    comment(test(base64, mime_decode_to_string, [encoded_list()])).
 
 -define(SIZE, 10000).
 -define(N, 1000).
@@ -209,15 +234,17 @@ binary() ->
 list() ->
     random_byte_list(?SIZE).
 
-test(Func, Data) ->
-    F = fun() -> loop(?N, Func, Data) end,
+test(Mod, Fun, Args) ->
+    test(?N, Mod, Fun, Args).
+test(Iter, Mod, Fun, Args) ->
+    F = fun() -> loop(Iter, Mod, Fun, Args) end,
     {Time, ok} = timer:tc(fun() -> lspawn(F) end),
-    report_base64(Time).
+    report_mfa(Iter, Time, Mod).
 
-loop(0, _F, _D) -> garbage_collect(), ok;
-loop(N, F, D) ->
-    _ = base64:F(D),
-    loop(N - 1, F, D).
+loop(0, _M, _F, _A) -> garbage_collect(), ok;
+loop(N, M, F, A) ->
+    _ = apply(M, F, A),
+    loop(N - 1, M, F, A).
 
 lspawn(Fun) ->
     {Pid, Ref} = spawn_monitor(fun() -> exit(Fun()) end),
@@ -225,10 +252,10 @@ lspawn(Fun) ->
         {'DOWN', Ref, process, Pid, Rep} -> Rep
     end.
 
-report_base64(Time) ->
-    Tps = round((?N*1000000)/Time),
+report_mfa(Iter, Time, Mod) ->
+    Tps = round((Iter*1000000)/Time),
     ct_event:notify(#event{name = benchmark_data,
-                           data = [{suite, "stdlib_base64"},
+                           data = [{suite, "stdlib_" ++ atom_to_list(Mod)},
                                    {value, Tps}]}),
     Tps.
 
@@ -267,12 +294,24 @@ simple_timer_mon(Config) when is_list(Config) ->
 generic(Config) when is_list(Config) ->
     comment(do_tests(generic, single_small, Config)).
 
+generic_log(Config) when is_list(Config) ->
+    comment(do_tests(generic_log, single_small, Config)).
+
+generic_log100(Config) when is_list(Config) ->
+    comment(do_tests(generic_log100, 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_log(Config) when is_list(Config) ->
+    comment(do_tests(generic_statem_log, single_small, Config)).
+
+generic_statem_log100(Config) when is_list(Config) ->
+    comment(do_tests(generic_statem_log100, single_small, Config)).
+
 generic_statem_transit(Config) when is_list(Config) ->
     comment(do_tests(generic_statem_transit, single_small, Config)).
 
@@ -344,9 +383,9 @@ norm(T, Ref) ->
 
 do_tests(Test, ParamSet, Config) ->
     BenchmarkSuite = ?config(benchmark_suite, Config),
-    {Client, ServerMod} = bench(Test),
+    {Client, ServerMod, ServerArg} = bench(Test),
     {Parallelism, Message} = bench_params(ParamSet),
-    Fun = create_clients(Message, ServerMod, Client, Parallelism),
+    Fun = create_clients(Message, ServerMod, ServerArg, Client, Parallelism),
     {TotalLoops, AllPidTime} = run_test(Fun),
     try ?CALLS_PER_LOOP * round((1000 * TotalLoops) / AllPidTime) of
         PerSecond ->
@@ -461,27 +500,35 @@ generic_fsm_transit_client(N, M, P) ->
     generic_fsm_transit_client(N+1, M, P).
 
 bench(simple) ->
-    {fun simple_client/3, simple_server};
+    {fun simple_client/3, simple_server, term};
 bench(simple_timer) ->
-    {fun simple_client_timer/3, simple_server_timer};
+    {fun simple_client_timer/3, simple_server_timer, term};
 bench(simple_mon) ->
-    {fun simple_client_mon/3, simple_server_mon};
+    {fun simple_client_mon/3, simple_server_mon, term};
 bench(simple_timer_mon) ->
-    {fun simple_client_timer_mon/3, simple_server_timer_mon};
+    {fun simple_client_timer_mon/3, simple_server_timer_mon, term};
 bench(generic) ->
-    {fun generic_client/3, generic_server};
+    {fun generic_client/3, generic_server, [term]};
+bench(generic_log) ->
+    {fun generic_client/3, generic_server, [term,{debug,[log]}]};
+bench(generic_log100) ->
+    {fun generic_client/3, generic_server, [term,{debug,[{log,100}]}]};
 bench(generic_timer) ->
-    {fun generic_timer_client/3, generic_server_timer};
+    {fun generic_timer_client/3, generic_server_timer, term};
 bench(generic_statem) ->
-    {fun generic_statem_client/3, generic_statem};
+    {fun generic_statem_client/3, generic_statem, [term]};
+bench(generic_statem_log) ->
+    {fun generic_statem_client/3, generic_statem, [term,{debug,[log]}]};
+bench(generic_statem_log100) ->
+    {fun generic_statem_client/3, generic_statem, [term,{debug,[{log,100}]}]};
 bench(generic_statem_transit) ->
-    {fun generic_statem_transit_client/3, generic_statem};
+    {fun generic_statem_transit_client/3, generic_statem, [term]};
 bench(generic_statem_complex) ->
-    {fun generic_statem_complex_client/3, generic_statem_complex};
+    {fun generic_statem_complex_client/3, generic_statem_complex, term};
 bench(generic_fsm) ->
-    {fun generic_fsm_client/3, generic_fsm};
+    {fun generic_fsm_client/3, generic_fsm, term};
 bench(generic_fsm_transit) ->
-    {fun generic_fsm_transit_client/3, generic_fsm}.
+    {fun generic_fsm_transit_client/3, generic_fsm, term}.
 
 %% -> {Parallelism, MessageTerm}
 bench_params(single_small) -> {1, small()};
@@ -509,10 +556,9 @@ parallelism() ->
         _ -> 1
     end.
 
-create_clients(M, ServerMod, Client, Parallel) ->
+create_clients(M, ServerMod, ServerArg, Client, Parallel) ->
     fun() ->
-            State = term,
-            ServerPid = ServerMod:start(State),
+            ServerPid = ServerMod:start(ServerArg),
             PidRefs = [spawn_monitor(fun() -> Client(0, M, ServerPid) end) ||
                           _ <- lists:seq(1, Parallel)],
             timer:sleep(?MAX_TIME),
diff --git a/lib/stdlib/test/stdlib_bench_SUITE_data/generic_fsm.erl b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_fsm.erl
index 50f7df7a2a..1abd9b1f2f 100644
--- a/lib/stdlib/test/stdlib_bench_SUITE_data/generic_fsm.erl
+++ b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_fsm.erl
@@ -24,7 +24,7 @@
 -export([init/1, terminate/3]).
 -export([state1/3, state2/3]).
 
--behaivour(gen_fsm).
+-behaviour(gen_fsm).
 
 
 %% API
diff --git a/lib/stdlib/test/stdlib_bench_SUITE_data/generic_server.erl b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_server.erl
index abd61dcdef..3707d00dee 100644
--- a/lib/stdlib/test/stdlib_bench_SUITE_data/generic_server.erl
+++ b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_server.erl
@@ -8,8 +8,8 @@
 
 -define(GEN_SERVER, gen_server).
 
-start(State) ->
-    {ok, Pid} = ?GEN_SERVER:start(?MODULE, State, []),
+start([State|Opts]) ->
+    {ok, Pid} = ?GEN_SERVER:start(?MODULE, State, Opts),
     Pid.
 
 init(State) ->
diff --git a/lib/stdlib/test/stdlib_bench_SUITE_data/generic_statem.erl b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_statem.erl
index 2e0491f060..b106619568 100644
--- a/lib/stdlib/test/stdlib_bench_SUITE_data/generic_statem.erl
+++ b/lib/stdlib/test/stdlib_bench_SUITE_data/generic_statem.erl
@@ -28,8 +28,8 @@
 
 %% API
 
-start(Data) ->
-    {ok, Pid} = gen_statem:start(?MODULE, Data, []),
+start([Data|Opts]) ->
+    {ok, Pid} = gen_statem:start(?MODULE, Data, Opts),
     Pid.
 
 stop(P) ->
@@ -52,7 +52,9 @@ init(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}}.
+    {next_state, state2, Data,
+     [{reply, From, M},{state_timeout,5000,5000}]}.
 
 state2({call, From}, {transit, M}, Data) ->
-    {next_state, state1, Data, {reply, From, M}}.
+    {next_state, state1, Data,
+     [{reply, From, M},{state_timeout,5000,5000}]}.
diff --git a/lib/stdlib/test/string_SUITE.erl b/lib/stdlib/test/string_SUITE.erl
index 251e09121c..c9aadd7f10 100644
--- a/lib/stdlib/test/string_SUITE.erl
+++ b/lib/stdlib/test/string_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2019. 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.
@@ -103,6 +103,15 @@ debug() ->
         test(?LINE,?FUNCTION_NAME,B,C,D, false),
         test(?LINE,?FUNCTION_NAME,hd(C),[B|tl(C)],D, false)).
 
+-define(TRY(Exp),
+        fun() ->
+                try Exp
+                catch _E:Reason:_ST ->
+                        %% io:format("~p:~w: ~p: ~.0p ~p~n",
+                        %%           [?FUNCTION_NAME, ?LINE,_E,Reason, hd(_ST)]),
+                        {'EXIT', Reason}
+                end
+        end()).
 
 is_empty(_) ->
     ?TEST("", [], true),
@@ -126,6 +135,10 @@ length(_) ->
     ?TEST(["abc"|<<"abc">>], [], 6),
     ?TEST(["abc",["def"]], [], 6),
     ?TEST([<<97/utf8, 778/utf8, 98/utf8>>, [776,111,776]], [], 3), %% åäö in nfd
+
+    InvalidUTF8 = <<192,192>>,
+    {'EXIT', {badarg, _}} = ?TRY(string:length(InvalidUTF8)),
+    {'EXIT', {badarg, _}} = ?TRY(string:length(<<$a, InvalidUTF8/binary, $z>>)),
     ok.
 
 equal(_) ->
@@ -226,6 +239,8 @@ to_graphemes(_) ->
     true = erlang:length(GCs) =:= erlang:length(string:to_graphemes(NFD)),
     true = erlang:length(GCs) =:=
         erlang:length(string:to_graphemes(unicode:characters_to_nfc_list(String))),
+
+    {'EXIT', {badarg, _}} = ?TRY(string:to_graphemes(<<$a,192,192,$z>>)),
     ok.
 
 reverse(_) ->
@@ -238,6 +253,11 @@ reverse(_) ->
     ?TEST(Str2, [], lists:reverse(Str2)),
     ?TEST(Str3, [], lists:reverse(Str3)),
     true = string:reverse(Str3) =:= lists:reverse(string:to_graphemes(Str3)),
+
+    InvalidUTF8 = <<192,192>>,
+    {'EXIT', {badarg, _}} = ?TRY(string:reverse(InvalidUTF8)),
+    {'EXIT', {badarg, _}} = ?TRY(string:reverse(<<$a, InvalidUTF8/binary, $z>>)),
+
     ok.
 
 slice(_) ->
@@ -258,6 +278,14 @@ slice(_) ->
     ?TEST([<<"aå"/utf8>>,"äöbcd"], [3,3], "öbc"),
     ?TEST([<<"aåä"/utf8>>,"öbcd"], [3,10], "öbcd"),
 
+    InvalidUTF8 = <<192,192>>,
+    [$b, $c|InvalidUTF8] = string:slice(["abc", InvalidUTF8], 1),
+    InvalidUTF8 = string:slice(["abc", InvalidUTF8], 3),
+    {'EXIT', {badarg, _}} = ?TRY(string:slice(["abc", InvalidUTF8], 1, 5)),
+    BadUtf8 = <<$a, InvalidUTF8/binary, "teststring">>,
+    {'EXIT', {badarg, _}} = ?TRY(string:slice(BadUtf8, 2)),
+    {'EXIT', {badarg, _}} = ?TRY(string:slice(BadUtf8, 1, 5)),
+    {'EXIT', {badarg, _}} = ?TRY(string:slice(BadUtf8, 0, 5)),
     ok.
 
 pad(_) ->
@@ -270,6 +298,10 @@ pad(_) ->
     ?TEST(Str, [10, trailing, $.], "Hallå....."),
     ?TEST(Str++["f"], [10, trailing, $.], "Hallåf...."),
     ?TEST(Str++[" flåwer"], [10, trailing, $.], "Hallå flåwer"),
+
+    InvalidUTF8 = <<192,192>>,
+    {'EXIT', {badarg, _}} = ?TRY(string:pad(InvalidUTF8, 10, both, $.)),
+    {'EXIT', {badarg, _}} = ?TRY(string:pad(<<$a, InvalidUTF8/binary, $z>>, 10, both, $.)),
     ok.
 
 trim(_) ->
@@ -300,6 +332,11 @@ trim(_) ->
     ?TEST([[<<"!v">>|<<204,128,$v,204,129>>]],[trailing, [[$v,769]]], [$!,$v,768]),
     ?TEST([[[<<"v">>|<<204,129,118,204,128,118>>],769,118,769]], [trailing, [[118,769]]], [$v,769,$v,768]),
     ?TEST([<<"vv">>|<<204,128,118,204,128>>], [trailing, [[118,768]]], "v"),
+
+    InvalidUTF8 = <<192,192>>,
+    {'EXIT', {badarg, _}} = ?TRY(string:trim(InvalidUTF8, both, "az")),
+    %% Not checked  (using binary search)
+    %% {'EXIT', {badarg, _}} = ?TRY(string:trim(<<$a, $b, InvalidUTF8/binary, $z>>, both, "az")),
     ok.
 
 chomp(_) ->
@@ -400,6 +437,13 @@ take(_) ->
     ?TEST([<<"e">>,778,"åäöe", <<778/utf8>>, $e, 779], [[[$e,778]], true, trailing],
           {[$e,778]++"åäöe"++[778], [$e,779]}),
 
+    InvalidUTF8 = <<192,192>>,
+    {'EXIT', {badarg, _}} = ?TRY(string:take(InvalidUTF8, [$.], false, leading)),
+    %% Not checked  (using binary search)
+    %% {'EXIT', {badarg, _}} = ?TRY(string:take(InvalidUTF8, [$.], true, leading)),
+    %% {'EXIT', {badarg, _}} = ?TRY(string:take(InvalidUTF8, [$.], false, trailing)),
+    {'EXIT', {badarg, _}} = ?TRY(string:take(InvalidUTF8, [$.], true, trailing)),
+
     ok.
 
 
@@ -416,6 +460,11 @@ uppercase(_) ->
     ?TEST("ljLJ", [], "LJLJ"),
     ?TEST("LJlj", [], "LJLJ"),
     ?TEST("ß sharp s", [], "SS SHARP S"),
+
+    InvalidUTF8 = <<192,192>>,
+    {'EXIT', {badarg, _}} = ?TRY(string:uppercase(InvalidUTF8)),
+    {'EXIT', {badarg, _}} = ?TRY(string:uppercase(<<$a, InvalidUTF8/binary, $z>>)),
+
     ok.
 
 lowercase(_) ->
@@ -429,6 +478,10 @@ lowercase(_) ->
     ?TEST(["Mic",<<"HAŁ"/utf8>>], [], "michał"),
     ?TEST("ß SHARP S", [], "ß sharp s"),
     ?TEST("İ I WITH DOT ABOVE", [], "i̇ i with dot above"),
+
+    InvalidUTF8 = <<192,192>>,
+    {'EXIT', {badarg, _}} = ?TRY(string:lowercase(InvalidUTF8)),
+    {'EXIT', {badarg, _}} = ?TRY(string:lowercase(<<$a, InvalidUTF8/binary, $z>>)),
     ok.
 
 titlecase(_) ->
@@ -442,6 +495,10 @@ titlecase(_) ->
     ?TEST("ljLJ", [], "LjLJ"),
     ?TEST("LJlj", [], "Ljlj"),
     ?TEST("ß sharp s", [], "Ss sharp s"),
+
+    InvalidUTF8 = <<192,192>>,
+    {'EXIT', {badarg, _}} = ?TRY(string:titlecase(InvalidUTF8)),
+    <<$A, _/binary>> = ?TRY(string:titlecase(<<$a, InvalidUTF8/binary, $z>>)),
     ok.
 
 casefold(_) ->
@@ -456,6 +513,10 @@ casefold(_) ->
     ?TEST("ß SHARP S", [], "ss sharp s"),
     ?TEST("ẞ SHARP S", [], "ss sharp s"),
     ?TEST("İ I WITH DOT ABOVE", [], "i̇ i with dot above"),
+
+    InvalidUTF8 = <<192,192>>,
+    {'EXIT', {badarg, _}} = ?TRY(string:casefold(InvalidUTF8)),
+    {'EXIT', {badarg, _}} = ?TRY(string:casefold(<<$a, InvalidUTF8/binary, $z>>)),
     ok.
 
 
@@ -740,7 +801,7 @@ meas(Config) ->
         _ -> % No scaling, run at most 1.5 min
             Tester = spawn(Exec),
             receive {test_done, Tester} -> ok
-            after 90000 ->
+            after 118000 ->
                     io:format("Timelimit reached stopping~n",[]),
                     exit(Tester, die)
             end,
@@ -754,19 +815,22 @@ do_measure(DataDir) ->
     io:format("~p~n",[byte_size(Bin)]),
     Do = fun(Name, Func, Mode) ->
                  {N, Mean, Stddev, _} = time_func(Func, Mode, Bin, 20),
-                 io:format("~15w ~6w ~6.2fms ±~5.2fms #~.2w gc included~n",
+                 io:format("~15w ~15w ~8.2fms ±~6.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",
+                  io:format("~15w ~15w ~8.2fms ±~6.2fms #~.2w gc included~n",
                             [Name, Mode, Mean/1000, Stddev/1000, N])
           end,
+    %% lefty_list means a list balanced to the left, like
+    %% [[[30],31],32]. Only some functions check such lists.
+    Modes = [list, lefty_list, binary, {many_lists,1}, {many_lists, 4}],
     io:format("----------------------~n"),
 
     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]],
+    [Do(Name,Fun,Mode) || {Name,Fun} <- [Tokens], Mode <- Modes],
 
     S0 = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxy.....",
     S0B = <<"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxy.....">>,
@@ -824,17 +888,17 @@ do_measure(DataDir) ->
 
     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]],
+    [Do(Name,Fun,Mode) || {Name,Fun} <- [NthTokens], Mode <- Modes],
     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]],
+    [Do(Name,Fun,Mode) || {Name,Fun} <- [Length], Mode <- Modes],
 
     Reverse = {reverse, fun(Str) -> string:reverse(Str) end},
-    [Do(Name,Fun,Mode) || {Name,Fun} <- [Reverse], Mode <- [list, binary]],
+    [Do(Name,Fun,Mode) || {Name,Fun} <- [Reverse], Mode <- Modes],
 
     ok.
 
@@ -1064,7 +1128,33 @@ time_func(N,Sum,SumSq, _, _, Res, _) ->
     {N, Mean, Stdev, Res}.
 
 mode(binary, Bin) -> Bin;
-mode(list, Bin) -> unicode:characters_to_list(Bin).
+mode(list, Bin) -> unicode:characters_to_list(Bin);
+mode(lefty_list, Bin) ->
+    L = unicode:characters_to_list(Bin),
+    to_left(L);
+mode({many_lists, N}, Bin) ->
+    group(unicode:characters_to_list(Bin), N).
+
+group([], _N) ->
+    [];
+group(L, N) ->
+    try lists:split(N, L) of
+        {L1, L2} ->
+            [L1 | group(L2, N)]
+    catch
+        _:_ ->
+            [L]
+    end.
+
+to_left([]) ->
+    [];
+to_left([H|L]) ->
+    to_left([H], L).
+
+to_left(V, []) ->
+    V;
+to_left(V, [H|L]) ->
+    to_left([V,H], L).
 
 %%
 %% Old string lists Test cases starts here.
diff --git a/lib/stdlib/test/unicode_util_SUITE.erl b/lib/stdlib/test/unicode_util_SUITE.erl
index 044b4e5834..6f55f204f4 100644
--- a/lib/stdlib/test/unicode_util_SUITE.erl
+++ b/lib/stdlib/test/unicode_util_SUITE.erl
@@ -428,7 +428,15 @@ mode(deep_l, Bin) -> [unicode:characters_to_list(Bin)].
 fetch(Str, F) ->
     case F(Str) of
         [] -> [];
-        [CP|R] -> [CP|fetch(R,F)]
+        [CP|R] ->
+            %% If input is a binary R should be binary
+            if is_binary(Str) == false -> ok;
+               is_binary(R); R =:= [] -> ok;
+               true ->
+                    io:format("Char: ~tc Tail:~tP~n", [CP,R,10]),
+                    exit({bug, F})
+            end,
+            [CP|fetch(R,F)]
     end.
 
 %% *Test.txt file helpers
diff --git a/lib/stdlib/test/unicode_util_SUITE_data/GraphemeBreakTest.txt b/lib/stdlib/test/unicode_util_SUITE_data/GraphemeBreakTest.txt
index d7d8f90de0..6847953c23 100644
--- a/lib/stdlib/test/unicode_util_SUITE_data/GraphemeBreakTest.txt
+++ b/lib/stdlib/test/unicode_util_SUITE_data/GraphemeBreakTest.txt
@@ -1,6 +1,6 @@
-# GraphemeBreakTest-10.0.0.txt
-# Date: 2017-04-14, 05:40:29 GMT
-# © 2017 Unicode®, Inc.
+# GraphemeBreakTest-11.0.0.txt
+# Date: 2018-03-18, 13:30:33 GMT
+# © 2018 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
@@ -23,828 +23,678 @@
 # These samples may be extended or changed in the future.
 #
 ÷ 0020 ÷ 0020 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0020 × 0308 ÷ 0020 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 0020 × 0308 ÷ 0020 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
 ÷ 0020 ÷ 000D ÷	#  ÷ [0.2] SPACE (Other) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0020 × 0308 ÷ 000D ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0020 × 0308 ÷ 000D ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
 ÷ 0020 ÷ 000A ÷	#  ÷ [0.2] SPACE (Other) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0020 × 0308 ÷ 000A ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0020 × 0308 ÷ 000A ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
 ÷ 0020 ÷ 0001 ÷	#  ÷ [0.2] SPACE (Other) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0020 × 0308 ÷ 0001 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0020 × 0300 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 0020 × 0308 × 0300 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
+÷ 0020 × 0308 ÷ 0001 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 0020 × 034F ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 0020 × 0308 × 034F ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 0020 ÷ 1F1E6 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0020 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ 0020 ÷ 0600 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0020 × 0308 ÷ 0600 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 0020 × 0308 ÷ 0600 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ 0020 × 0903 ÷	#  ÷ [0.2] SPACE (Other) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0020 × 0308 × 0903 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0020 × 0308 × 0903 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 0020 ÷ 1100 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0020 × 0308 ÷ 1100 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0020 × 0308 ÷ 1100 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 0020 ÷ 1160 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0020 × 0308 ÷ 1160 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0020 × 0308 ÷ 1160 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
 ÷ 0020 ÷ 11A8 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0020 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0020 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
 ÷ 0020 ÷ AC00 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0020 × 0308 ÷ AC00 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0020 × 0308 ÷ AC00 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 0020 ÷ AC01 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0020 × 0308 ÷ AC01 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0020 ÷ 1F1E6 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0020 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0020 ÷ 261D ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 0020 × 0308 ÷ 261D ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 0020 ÷ 1F3FB ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0020 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0020 × 200D ÷	#  ÷ [0.2] SPACE (Other) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 0020 × 0308 × 200D ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 0020 ÷ 2640 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 0020 × 0308 ÷ 2640 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 0020 ÷ 1F466 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ 0020 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
+÷ 0020 × 0308 ÷ AC01 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0020 ÷ 231A ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 0020 × 0308 ÷ 231A ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 0020 × 0300 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0020 × 0308 × 0300 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0020 × 200D ÷	#  ÷ [0.2] SPACE (Other) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 0020 × 0308 × 200D ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 0020 ÷ 0378 ÷	#  ÷ [0.2] SPACE (Other) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0020 × 0308 ÷ 0378 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 0020 × 0308 ÷ 0378 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
 ÷ 0020 ÷ D800 ÷	#  ÷ [0.2] SPACE (Other) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 0020 × 0308 ÷ D800 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ 0020 × 0308 ÷ D800 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
 ÷ 000D ÷ 0020 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] SPACE (Other) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 0020 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 0020 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
 ÷ 000D ÷ 000D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 000D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 000D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
 ÷ 000D × 000A ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) × [3.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 000A ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 000A ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
 ÷ 000D ÷ 0001 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 0001 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 000D ÷ 0300 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 000D ÷ 0308 × 0300 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 0001 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 000D ÷ 034F ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 000D ÷ 0308 × 034F ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 000D ÷ 1F1E6 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ 000D ÷ 0600 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 0600 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 0600 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ 000D ÷ 0903 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 000D ÷ 0308 × 0903 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 000D ÷ 0308 × 0903 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 000D ÷ 1100 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 1100 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 1100 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 000D ÷ 1160 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 1160 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 1160 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
 ÷ 000D ÷ 11A8 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 11A8 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 11A8 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
 ÷ 000D ÷ AC00 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ AC00 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ AC00 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 000D ÷ AC01 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ AC01 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 000D ÷ 1F1E6 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 000D ÷ 261D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 261D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 000D ÷ 1F3FB ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 1F3FB ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 000D ÷ 200D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 000D ÷ 0308 × 200D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 000D ÷ 2640 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 2640 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 000D ÷ 1F466 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] BOY (EBG) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 1F466 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ AC01 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 000D ÷ 231A ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] WATCH (ExtPict) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 231A ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 000D ÷ 0300 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 000D ÷ 0308 × 0300 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 000D ÷ 200D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 000D ÷ 0308 × 200D ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 000D ÷ 0378 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ 0378 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ 0378 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
 ÷ 000D ÷ D800 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 000D ÷ 0308 ÷ D800 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ 000D ÷ 0308 ÷ D800 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
 ÷ 000A ÷ 0020 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] SPACE (Other) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 0020 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 0020 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
 ÷ 000A ÷ 000D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 000D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 000D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
 ÷ 000A ÷ 000A ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 000A ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 000A ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
 ÷ 000A ÷ 0001 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 0001 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 000A ÷ 0300 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 000A ÷ 0308 × 0300 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 0001 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 000A ÷ 034F ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 000A ÷ 0308 × 034F ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 000A ÷ 1F1E6 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ 000A ÷ 0600 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 0600 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 0600 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ 000A ÷ 0903 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 000A ÷ 0308 × 0903 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 000A ÷ 0308 × 0903 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 000A ÷ 1100 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 1100 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 1100 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 000A ÷ 1160 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 1160 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 1160 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
 ÷ 000A ÷ 11A8 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 11A8 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 11A8 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
 ÷ 000A ÷ AC00 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ AC00 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ AC00 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 000A ÷ AC01 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ AC01 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 000A ÷ 1F1E6 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 000A ÷ 261D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 261D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 000A ÷ 1F3FB ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 1F3FB ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 000A ÷ 200D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 000A ÷ 0308 × 200D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 000A ÷ 2640 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 2640 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 000A ÷ 1F466 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] BOY (EBG) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 1F466 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ AC01 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 000A ÷ 231A ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] WATCH (ExtPict) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 231A ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 000A ÷ 0300 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 000A ÷ 0308 × 0300 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 000A ÷ 200D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 000A ÷ 0308 × 200D ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 000A ÷ 0378 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ 0378 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ 0378 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
 ÷ 000A ÷ D800 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 000A ÷ 0308 ÷ D800 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ 000A ÷ 0308 ÷ D800 ÷	#  ÷ [0.2] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
 ÷ 0001 ÷ 0020 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] SPACE (Other) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 0020 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 0001 ÷ 0308 ÷ 0020 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
 ÷ 0001 ÷ 000D ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 000D ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0001 ÷ 0308 ÷ 000D ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
 ÷ 0001 ÷ 000A ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 000A ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0001 ÷ 0308 ÷ 000A ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
 ÷ 0001 ÷ 0001 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 0001 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0001 ÷ 0300 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 0001 ÷ 0308 × 0300 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
+÷ 0001 ÷ 0308 ÷ 0001 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 0001 ÷ 034F ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 0001 ÷ 0308 × 034F ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 0001 ÷ 1F1E6 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0001 ÷ 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ 0001 ÷ 0600 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 0600 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 0001 ÷ 0308 ÷ 0600 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ 0001 ÷ 0903 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0001 ÷ 0308 × 0903 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0001 ÷ 0308 × 0903 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 0001 ÷ 1100 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 1100 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0001 ÷ 0308 ÷ 1100 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 0001 ÷ 1160 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 1160 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0001 ÷ 0308 ÷ 1160 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
 ÷ 0001 ÷ 11A8 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 11A8 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0001 ÷ 0308 ÷ 11A8 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
 ÷ 0001 ÷ AC00 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ AC00 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0001 ÷ 0308 ÷ AC00 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 0001 ÷ AC01 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ AC01 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0001 ÷ 1F1E6 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0001 ÷ 261D ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 261D ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 0001 ÷ 1F3FB ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 1F3FB ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0001 ÷ 200D ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 0001 ÷ 0308 × 200D ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 0001 ÷ 2640 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 2640 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 0001 ÷ 1F466 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] BOY (EBG) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 1F466 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
+÷ 0001 ÷ 0308 ÷ AC01 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0001 ÷ 231A ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] WATCH (ExtPict) ÷ [0.3]
+÷ 0001 ÷ 0308 ÷ 231A ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 0001 ÷ 0300 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0001 ÷ 0308 × 0300 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0001 ÷ 200D ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 0001 ÷ 0308 × 200D ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 0001 ÷ 0378 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ 0378 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 0001 ÷ 0308 ÷ 0378 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
 ÷ 0001 ÷ D800 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 0001 ÷ 0308 ÷ D800 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 0300 ÷ 0020 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0300 × 0308 ÷ 0020 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0300 ÷ 000D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0300 × 0308 ÷ 000D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0300 ÷ 000A ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0300 × 0308 ÷ 000A ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0300 ÷ 0001 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0300 × 0308 ÷ 0001 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0300 × 0300 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 0300 × 0308 × 0300 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 0300 ÷ 0600 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0300 × 0308 ÷ 0600 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0300 × 0903 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0300 × 0308 × 0903 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0300 ÷ 1100 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0300 × 0308 ÷ 1100 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0300 ÷ 1160 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0300 × 0308 ÷ 1160 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0300 ÷ 11A8 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0300 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0300 ÷ AC00 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0300 × 0308 ÷ AC00 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0300 ÷ AC01 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0300 × 0308 ÷ AC01 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0300 ÷ 1F1E6 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0300 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0300 ÷ 261D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 0300 × 0308 ÷ 261D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 0300 ÷ 1F3FB ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0300 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0300 × 200D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 0300 × 0308 × 200D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 0300 ÷ 2640 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 0300 × 0308 ÷ 2640 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 0300 ÷ 1F466 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ 0300 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ 0300 ÷ 0378 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0300 × 0308 ÷ 0378 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0300 ÷ D800 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 0300 × 0308 ÷ D800 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ 0001 ÷ 0308 ÷ D800 ÷	#  ÷ [0.2] <START OF HEADING> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ 034F ÷ 0020 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 034F × 0308 ÷ 0020 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 034F ÷ 000D ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 034F × 0308 ÷ 000D ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 034F ÷ 000A ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 034F × 0308 ÷ 000A ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 034F ÷ 0001 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 034F × 0308 ÷ 0001 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 034F × 034F ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 034F × 0308 × 034F ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 034F ÷ 1F1E6 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 034F × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 034F ÷ 0600 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 034F × 0308 ÷ 0600 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 034F × 0903 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 034F × 0308 × 0903 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 034F ÷ 1100 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 034F × 0308 ÷ 1100 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 034F ÷ 1160 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 034F × 0308 ÷ 1160 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 034F ÷ 11A8 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 034F × 0308 ÷ 11A8 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 034F ÷ AC00 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 034F × 0308 ÷ AC00 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 034F ÷ AC01 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 034F × 0308 ÷ AC01 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 034F ÷ 231A ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 034F × 0308 ÷ 231A ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 034F × 0300 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 034F × 0308 × 0300 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 034F × 200D ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 034F × 0308 × 200D ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 034F ÷ 0378 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 034F × 0308 ÷ 0378 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 034F ÷ D800 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ 034F × 0308 ÷ D800 ÷	#  ÷ [0.2] COMBINING GRAPHEME JOINER (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ 1F1E6 ÷ 0020 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 0020 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 1F1E6 ÷ 000D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 000D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 1F1E6 ÷ 000A ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 000A ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 1F1E6 ÷ 0001 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 0001 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 1F1E6 × 034F ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 1F1E6 × 0308 × 034F ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 1F1E6 × 1F1E6 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [12.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 1F1E6 ÷ 0600 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 0600 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 1F1E6 × 0903 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 1F1E6 × 0308 × 0903 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 1F1E6 ÷ 1100 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 1100 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 1F1E6 ÷ 1160 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 1160 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 1F1E6 ÷ 11A8 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 1F1E6 ÷ AC00 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ AC00 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 1F1E6 ÷ AC01 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ AC01 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 1F1E6 ÷ 231A ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 231A ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 1F1E6 × 0300 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 1F1E6 × 0308 × 0300 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 1F1E6 × 200D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 1F1E6 × 0308 × 200D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 1F1E6 ÷ 0378 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ 0378 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 1F1E6 ÷ D800 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ 1F1E6 × 0308 ÷ D800 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
 ÷ 0600 × 0020 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] SPACE (Other) ÷ [0.3]
-÷ 0600 × 0308 ÷ 0020 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 0600 × 0308 ÷ 0020 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
 ÷ 0600 ÷ 000D ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0600 × 0308 ÷ 000D ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0600 × 0308 ÷ 000D ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
 ÷ 0600 ÷ 000A ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0600 × 0308 ÷ 000A ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0600 × 0308 ÷ 000A ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
 ÷ 0600 ÷ 0001 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0600 × 0308 ÷ 0001 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0600 × 0300 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 0600 × 0308 × 0300 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
+÷ 0600 × 0308 ÷ 0001 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 0600 × 034F ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 0600 × 0308 × 034F ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 0600 × 1F1E6 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0600 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ 0600 × 0600 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0600 × 0308 ÷ 0600 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 0600 × 0308 ÷ 0600 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ 0600 × 0903 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0600 × 0308 × 0903 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0600 × 0308 × 0903 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 0600 × 1100 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0600 × 0308 ÷ 1100 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0600 × 0308 ÷ 1100 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 0600 × 1160 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0600 × 0308 ÷ 1160 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0600 × 0308 ÷ 1160 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
 ÷ 0600 × 11A8 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0600 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0600 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
 ÷ 0600 × AC00 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0600 × 0308 ÷ AC00 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0600 × 0308 ÷ AC00 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 0600 × AC01 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0600 × 0308 ÷ AC01 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0600 × 1F1E6 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0600 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0600 × 261D ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 0600 × 0308 ÷ 261D ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 0600 × 1F3FB ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0600 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0600 × 200D ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 0600 × 0308 × 200D ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 0600 × 2640 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 0600 × 0308 ÷ 2640 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 0600 × 1F466 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] BOY (EBG) ÷ [0.3]
-÷ 0600 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
+÷ 0600 × 0308 ÷ AC01 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0600 × 231A ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] WATCH (ExtPict) ÷ [0.3]
+÷ 0600 × 0308 ÷ 231A ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 0600 × 0300 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0600 × 0308 × 0300 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0600 × 200D ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 0600 × 0308 × 200D ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 0600 × 0378 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.2] <reserved-0378> (Other) ÷ [0.3]
-÷ 0600 × 0308 ÷ 0378 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 0600 × 0308 ÷ 0378 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
 ÷ 0600 ÷ D800 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 0600 × 0308 ÷ D800 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ 0600 × 0308 ÷ D800 ÷	#  ÷ [0.2] ARABIC NUMBER SIGN (Prepend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
 ÷ 0903 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0903 × 0308 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 0903 × 0308 ÷ 0020 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
 ÷ 0903 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0903 × 0308 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0903 × 0308 ÷ 000D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
 ÷ 0903 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0903 × 0308 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0903 × 0308 ÷ 000A ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
 ÷ 0903 ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0903 × 0308 ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0903 × 0300 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 0903 × 0308 × 0300 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
+÷ 0903 × 0308 ÷ 0001 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 0903 × 034F ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 0903 × 0308 × 034F ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 0903 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0903 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ 0903 ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0903 × 0308 ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 0903 × 0308 ÷ 0600 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ 0903 × 0903 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0903 × 0308 × 0903 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0903 × 0308 × 0903 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 0903 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0903 × 0308 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0903 × 0308 ÷ 1100 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 0903 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0903 × 0308 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0903 × 0308 ÷ 1160 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
 ÷ 0903 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0903 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0903 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
 ÷ 0903 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0903 × 0308 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0903 × 0308 ÷ AC00 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 0903 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0903 × 0308 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0903 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0903 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0903 ÷ 261D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 0903 × 0308 ÷ 261D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 0903 ÷ 1F3FB ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0903 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0903 × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 0903 × 0308 × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 0903 ÷ 2640 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 0903 × 0308 ÷ 2640 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 0903 ÷ 1F466 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ 0903 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
+÷ 0903 × 0308 ÷ AC01 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0903 ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 0903 × 0308 ÷ 231A ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 0903 × 0300 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0903 × 0308 × 0300 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0903 × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 0903 × 0308 × 200D ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 0903 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0903 × 0308 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 0903 × 0308 ÷ 0378 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
 ÷ 0903 ÷ D800 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 0903 × 0308 ÷ D800 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ 0903 × 0308 ÷ D800 ÷	#  ÷ [0.2] DEVANAGARI SIGN VISARGA (SpacingMark) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
 ÷ 1100 ÷ 0020 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 1100 × 0308 ÷ 0020 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 1100 × 0308 ÷ 0020 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
 ÷ 1100 ÷ 000D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 1100 × 0308 ÷ 000D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 1100 × 0308 ÷ 000D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
 ÷ 1100 ÷ 000A ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 1100 × 0308 ÷ 000A ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 1100 × 0308 ÷ 000A ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
 ÷ 1100 ÷ 0001 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 1100 × 0308 ÷ 0001 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 1100 × 0300 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 1100 × 0308 × 0300 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
+÷ 1100 × 0308 ÷ 0001 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 1100 × 034F ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 1100 × 0308 × 034F ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 1100 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 1100 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ 1100 ÷ 0600 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 1100 × 0308 ÷ 0600 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 1100 × 0308 ÷ 0600 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ 1100 × 0903 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 1100 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 1100 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 1100 × 1100 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [6.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 1100 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 1100 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 1100 × 1160 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [6.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 1100 × 0308 ÷ 1160 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 1100 × 0308 ÷ 1160 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
 ÷ 1100 ÷ 11A8 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 1100 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 1100 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
 ÷ 1100 × AC00 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [6.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 1100 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 1100 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 1100 × AC01 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [6.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 1100 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 1100 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 1100 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 1100 ÷ 261D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 1100 × 0308 ÷ 261D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 1100 ÷ 1F3FB ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 1100 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 1100 × 200D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 1100 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 1100 ÷ 2640 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 1100 × 0308 ÷ 2640 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 1100 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ 1100 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
+÷ 1100 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 1100 ÷ 231A ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 1100 × 0308 ÷ 231A ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 1100 × 0300 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 1100 × 0308 × 0300 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 1100 × 200D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 1100 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 1100 ÷ 0378 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 1100 × 0308 ÷ 0378 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 1100 × 0308 ÷ 0378 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
 ÷ 1100 ÷ D800 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 1100 × 0308 ÷ D800 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ 1100 × 0308 ÷ D800 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
 ÷ 1160 ÷ 0020 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 1160 × 0308 ÷ 0020 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 1160 × 0308 ÷ 0020 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
 ÷ 1160 ÷ 000D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 1160 × 0308 ÷ 000D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 1160 × 0308 ÷ 000D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
 ÷ 1160 ÷ 000A ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 1160 × 0308 ÷ 000A ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 1160 × 0308 ÷ 000A ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
 ÷ 1160 ÷ 0001 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 1160 × 0308 ÷ 0001 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 1160 × 0300 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 1160 × 0308 × 0300 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
+÷ 1160 × 0308 ÷ 0001 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 1160 × 034F ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 1160 × 0308 × 034F ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 1160 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 1160 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ 1160 ÷ 0600 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 1160 × 0308 ÷ 0600 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 1160 × 0308 ÷ 0600 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ 1160 × 0903 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 1160 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 1160 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 1160 ÷ 1100 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 1160 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 1160 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 1160 × 1160 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [7.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 1160 × 0308 ÷ 1160 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 1160 × 0308 ÷ 1160 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
 ÷ 1160 × 11A8 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [7.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 1160 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 1160 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
 ÷ 1160 ÷ AC00 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 1160 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 1160 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 1160 ÷ AC01 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 1160 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 1160 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 1160 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 1160 ÷ 261D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 1160 × 0308 ÷ 261D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 1160 ÷ 1F3FB ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 1160 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 1160 × 200D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 1160 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 1160 ÷ 2640 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 1160 × 0308 ÷ 2640 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 1160 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ 1160 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
+÷ 1160 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 1160 ÷ 231A ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 1160 × 0308 ÷ 231A ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 1160 × 0300 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 1160 × 0308 × 0300 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 1160 × 200D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 1160 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 1160 ÷ 0378 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 1160 × 0308 ÷ 0378 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 1160 × 0308 ÷ 0378 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
 ÷ 1160 ÷ D800 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 1160 × 0308 ÷ D800 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ 1160 × 0308 ÷ D800 ÷	#  ÷ [0.2] HANGUL JUNGSEONG FILLER (V) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
 ÷ 11A8 ÷ 0020 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 0020 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 0020 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
 ÷ 11A8 ÷ 000D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 000D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 000D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
 ÷ 11A8 ÷ 000A ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 000A ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 000A ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
 ÷ 11A8 ÷ 0001 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 0001 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 11A8 × 0300 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 11A8 × 0308 × 0300 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 0001 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 11A8 × 034F ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 11A8 × 0308 × 034F ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 11A8 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ 11A8 ÷ 0600 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 0600 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 0600 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ 11A8 × 0903 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 11A8 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 11A8 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 11A8 ÷ 1100 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 11A8 ÷ 1160 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 1160 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 1160 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
 ÷ 11A8 × 11A8 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [8.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
 ÷ 11A8 ÷ AC00 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 11A8 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 11A8 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 11A8 ÷ AC01 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 11A8 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 11A8 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 11A8 ÷ 261D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 261D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 11A8 ÷ 1F3FB ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 11A8 × 200D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 11A8 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 11A8 ÷ 2640 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 2640 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 11A8 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
+÷ 11A8 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 11A8 ÷ 231A ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 231A ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 11A8 × 0300 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 11A8 × 0308 × 0300 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 11A8 × 200D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 11A8 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 11A8 ÷ 0378 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 11A8 × 0308 ÷ 0378 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 11A8 × 0308 ÷ 0378 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
 ÷ 11A8 ÷ D800 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 11A8 × 0308 ÷ D800 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ 11A8 × 0308 ÷ D800 ÷	#  ÷ [0.2] HANGUL JONGSEONG KIYEOK (T) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
 ÷ AC00 ÷ 0020 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ AC00 × 0308 ÷ 0020 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ AC00 × 0308 ÷ 0020 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
 ÷ AC00 ÷ 000D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ AC00 × 0308 ÷ 000D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ AC00 × 0308 ÷ 000D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
 ÷ AC00 ÷ 000A ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ AC00 × 0308 ÷ 000A ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ AC00 × 0308 ÷ 000A ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
 ÷ AC00 ÷ 0001 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ AC00 × 0308 ÷ 0001 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ AC00 × 0300 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ AC00 × 0308 × 0300 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
+÷ AC00 × 0308 ÷ 0001 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ AC00 × 034F ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ AC00 × 0308 × 034F ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ AC00 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ AC00 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ AC00 ÷ 0600 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ AC00 × 0308 ÷ 0600 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ AC00 × 0308 ÷ 0600 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ AC00 × 0903 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ AC00 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ AC00 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ AC00 ÷ 1100 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ AC00 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ AC00 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ AC00 × 1160 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [7.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ AC00 × 0308 ÷ 1160 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ AC00 × 0308 ÷ 1160 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
 ÷ AC00 × 11A8 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [7.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ AC00 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ AC00 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
 ÷ AC00 ÷ AC00 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ AC00 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ AC00 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ AC00 ÷ AC01 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ AC00 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ AC00 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ AC00 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ AC00 ÷ 261D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ AC00 × 0308 ÷ 261D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ AC00 ÷ 1F3FB ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ AC00 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ AC00 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ AC00 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ AC00 ÷ 2640 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ AC00 × 0308 ÷ 2640 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ AC00 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ AC00 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
+÷ AC00 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ AC00 ÷ 231A ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ AC00 × 0308 ÷ 231A ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ AC00 × 0300 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ AC00 × 0308 × 0300 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ AC00 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ AC00 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ AC00 ÷ 0378 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ AC00 × 0308 ÷ 0378 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ AC00 × 0308 ÷ 0378 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
 ÷ AC00 ÷ D800 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ AC00 × 0308 ÷ D800 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ AC00 × 0308 ÷ D800 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
 ÷ AC01 ÷ 0020 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ AC01 × 0308 ÷ 0020 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ AC01 × 0308 ÷ 0020 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
 ÷ AC01 ÷ 000D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ AC01 × 0308 ÷ 000D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ AC01 × 0308 ÷ 000D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
 ÷ AC01 ÷ 000A ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ AC01 × 0308 ÷ 000A ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ AC01 × 0308 ÷ 000A ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
 ÷ AC01 ÷ 0001 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ AC01 × 0308 ÷ 0001 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ AC01 × 0300 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ AC01 × 0308 × 0300 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
+÷ AC01 × 0308 ÷ 0001 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ AC01 × 034F ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ AC01 × 0308 × 034F ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ AC01 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ AC01 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ AC01 ÷ 0600 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ AC01 × 0308 ÷ 0600 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ AC01 × 0308 ÷ 0600 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ AC01 × 0903 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ AC01 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ AC01 × 0308 × 0903 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ AC01 ÷ 1100 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ AC01 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ AC01 × 0308 ÷ 1100 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ AC01 ÷ 1160 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ AC01 × 0308 ÷ 1160 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ AC01 × 0308 ÷ 1160 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
 ÷ AC01 × 11A8 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [8.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ AC01 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ AC01 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
 ÷ AC01 ÷ AC00 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ AC01 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ AC01 × 0308 ÷ AC00 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ AC01 ÷ AC01 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ AC01 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ AC01 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ AC01 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ AC01 ÷ 261D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ AC01 × 0308 ÷ 261D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ AC01 ÷ 1F3FB ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ AC01 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ AC01 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ AC01 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ AC01 ÷ 2640 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ AC01 × 0308 ÷ 2640 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ AC01 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ AC01 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
+÷ AC01 × 0308 ÷ AC01 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ AC01 ÷ 231A ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ AC01 × 0308 ÷ 231A ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ AC01 × 0300 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ AC01 × 0308 × 0300 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ AC01 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ AC01 × 0308 × 200D ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ AC01 ÷ 0378 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ AC01 × 0308 ÷ 0378 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ AC01 × 0308 ÷ 0378 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
 ÷ AC01 ÷ D800 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ AC01 × 0308 ÷ D800 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 1F1E6 ÷ 0020 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 0020 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 1F1E6 ÷ 000D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 000D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 1F1E6 ÷ 000A ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 000A ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 1F1E6 ÷ 0001 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 0001 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 1F1E6 × 0300 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 1F1E6 × 0308 × 0300 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 1F1E6 ÷ 0600 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 0600 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 1F1E6 × 0903 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 1F1E6 × 0308 × 0903 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 1F1E6 ÷ 1100 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 1100 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 1F1E6 ÷ 1160 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 1160 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 1F1E6 ÷ 11A8 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 1F1E6 ÷ AC00 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ AC00 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 1F1E6 ÷ AC01 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ AC01 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 1F1E6 × 1F1E6 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [12.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 1F1E6 ÷ 261D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 261D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 1F1E6 ÷ 1F3FB ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 1F1E6 × 200D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 1F1E6 × 0308 × 200D ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 1F1E6 ÷ 2640 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 2640 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 1F1E6 ÷ 1F466 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ 1F1E6 ÷ 0378 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ 0378 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 1F1E6 ÷ D800 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 1F1E6 × 0308 ÷ D800 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 261D ÷ 0020 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 261D × 0308 ÷ 0020 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 261D ÷ 000D ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 261D × 0308 ÷ 000D ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 261D ÷ 000A ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 261D × 0308 ÷ 000A ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 261D ÷ 0001 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 261D × 0308 ÷ 0001 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 261D × 0300 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 261D × 0308 × 0300 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 261D ÷ 0600 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 261D × 0308 ÷ 0600 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 261D × 0903 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 261D × 0308 × 0903 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 261D ÷ 1100 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 261D × 0308 ÷ 1100 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 261D ÷ 1160 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 261D × 0308 ÷ 1160 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 261D ÷ 11A8 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 261D × 0308 ÷ 11A8 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 261D ÷ AC00 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 261D × 0308 ÷ AC00 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 261D ÷ AC01 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 261D × 0308 ÷ AC01 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 261D ÷ 1F1E6 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 261D × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 261D ÷ 261D ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 261D × 0308 ÷ 261D ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 261D × 1F3FB ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [10.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 261D × 0308 × 1F3FB ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) × [10.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 261D × 200D ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 261D × 0308 × 200D ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 261D ÷ 2640 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 261D × 0308 ÷ 2640 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 261D ÷ 1F466 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ 261D × 0308 ÷ 1F466 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ 261D ÷ 0378 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 261D × 0308 ÷ 0378 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 261D ÷ D800 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 261D × 0308 ÷ D800 ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 1F3FB ÷ 0020 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 1F3FB × 0308 ÷ 0020 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 1F3FB ÷ 000D ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 1F3FB × 0308 ÷ 000D ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 1F3FB ÷ 000A ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 1F3FB × 0308 ÷ 000A ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 1F3FB ÷ 0001 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 1F3FB × 0308 ÷ 0001 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 1F3FB × 0300 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 1F3FB × 0308 × 0300 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 1F3FB ÷ 0600 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 1F3FB × 0308 ÷ 0600 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 1F3FB × 0903 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 1F3FB × 0308 × 0903 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 1F3FB ÷ 1100 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 1F3FB × 0308 ÷ 1100 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 1F3FB ÷ 1160 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 1F3FB × 0308 ÷ 1160 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 1F3FB ÷ 11A8 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 1F3FB × 0308 ÷ 11A8 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 1F3FB ÷ AC00 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 1F3FB × 0308 ÷ AC00 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 1F3FB ÷ AC01 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 1F3FB × 0308 ÷ AC01 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 1F3FB ÷ 1F1E6 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 1F3FB × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 1F3FB ÷ 261D ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 1F3FB × 0308 ÷ 261D ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 1F3FB ÷ 1F3FB ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 1F3FB × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 1F3FB × 200D ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 1F3FB × 0308 × 200D ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 1F3FB ÷ 2640 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 1F3FB × 0308 ÷ 2640 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 1F3FB ÷ 1F466 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ 1F3FB × 0308 ÷ 1F466 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ 1F3FB ÷ 0378 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 1F3FB × 0308 ÷ 0378 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 1F3FB ÷ D800 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 1F3FB × 0308 ÷ D800 ÷	#  ÷ [0.2] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 200D ÷ 0020 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 200D × 0308 ÷ 0020 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 200D ÷ 000D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 200D × 0308 ÷ 000D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 200D ÷ 000A ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 200D × 0308 ÷ 000A ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 200D ÷ 0001 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 200D × 0308 ÷ 0001 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 200D × 0300 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 200D × 0308 × 0300 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 200D ÷ 0600 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 200D × 0308 ÷ 0600 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 200D × 0903 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 200D × 0308 × 0903 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 200D ÷ 1100 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 200D × 0308 ÷ 1100 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 200D ÷ 1160 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 200D × 0308 ÷ 1160 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 200D ÷ 11A8 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 200D × 0308 ÷ 11A8 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 200D ÷ AC00 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 200D × 0308 ÷ AC00 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 200D ÷ AC01 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 200D × 0308 ÷ AC01 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 200D ÷ 1F1E6 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 200D × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 200D ÷ 261D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 200D × 0308 ÷ 261D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 200D ÷ 1F3FB ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 200D × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 200D × 200D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 200D × 0308 × 200D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 200D × 2640 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [11.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 200D × 0308 ÷ 2640 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 200D × 1F466 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [11.0] BOY (EBG) ÷ [0.3]
-÷ 200D × 0308 ÷ 1F466 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ 200D ÷ 0378 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 200D × 0308 ÷ 0378 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 200D ÷ D800 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 200D × 0308 ÷ D800 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 2640 ÷ 0020 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 2640 × 0308 ÷ 0020 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 2640 ÷ 000D ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 2640 × 0308 ÷ 000D ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 2640 ÷ 000A ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 2640 × 0308 ÷ 000A ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 2640 ÷ 0001 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 2640 × 0308 ÷ 0001 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 2640 × 0300 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 2640 × 0308 × 0300 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 2640 ÷ 0600 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 2640 × 0308 ÷ 0600 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 2640 × 0903 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 2640 × 0308 × 0903 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 2640 ÷ 1100 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 2640 × 0308 ÷ 1100 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 2640 ÷ 1160 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 2640 × 0308 ÷ 1160 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 2640 ÷ 11A8 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 2640 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 2640 ÷ AC00 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 2640 × 0308 ÷ AC00 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 2640 ÷ AC01 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 2640 × 0308 ÷ AC01 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 2640 ÷ 1F1E6 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 2640 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 2640 ÷ 261D ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 2640 × 0308 ÷ 261D ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 2640 ÷ 1F3FB ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 2640 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 2640 × 200D ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 2640 × 0308 × 200D ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 2640 ÷ 2640 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 2640 × 0308 ÷ 2640 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 2640 ÷ 1F466 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ 2640 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ 2640 ÷ 0378 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 2640 × 0308 ÷ 0378 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 2640 ÷ D800 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 2640 × 0308 ÷ D800 ÷	#  ÷ [0.2] FEMALE SIGN (Glue_After_Zwj) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 1F466 ÷ 0020 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 1F466 × 0308 ÷ 0020 ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 1F466 ÷ 000D ÷	#  ÷ [0.2] BOY (EBG) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 1F466 × 0308 ÷ 000D ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 1F466 ÷ 000A ÷	#  ÷ [0.2] BOY (EBG) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 1F466 × 0308 ÷ 000A ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 1F466 ÷ 0001 ÷	#  ÷ [0.2] BOY (EBG) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 1F466 × 0308 ÷ 0001 ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 1F466 × 0300 ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 1F466 × 0308 × 0300 ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 1F466 ÷ 0600 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 1F466 × 0308 ÷ 0600 ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 1F466 × 0903 ÷	#  ÷ [0.2] BOY (EBG) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 1F466 × 0308 × 0903 ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 1F466 ÷ 1100 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 1F466 × 0308 ÷ 1100 ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 1F466 ÷ 1160 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 1F466 × 0308 ÷ 1160 ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 1F466 ÷ 11A8 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 1F466 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 1F466 ÷ AC00 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 1F466 × 0308 ÷ AC00 ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 1F466 ÷ AC01 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 1F466 × 0308 ÷ AC01 ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 1F466 ÷ 1F1E6 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 1F466 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 1F466 ÷ 261D ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 1F466 × 0308 ÷ 261D ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 1F466 × 1F3FB ÷	#  ÷ [0.2] BOY (EBG) × [10.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 1F466 × 0308 × 1F3FB ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) × [10.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 1F466 × 200D ÷	#  ÷ [0.2] BOY (EBG) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 1F466 × 0308 × 200D ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 1F466 ÷ 2640 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 1F466 × 0308 ÷ 2640 ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 1F466 ÷ 1F466 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ 1F466 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ 1F466 ÷ 0378 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 1F466 × 0308 ÷ 0378 ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 1F466 ÷ D800 ÷	#  ÷ [0.2] BOY (EBG) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 1F466 × 0308 ÷ D800 ÷	#  ÷ [0.2] BOY (EBG) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ AC01 × 0308 ÷ D800 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ 231A ÷ 0020 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 231A × 0308 ÷ 0020 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 231A ÷ 000D ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 231A × 0308 ÷ 000D ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 231A ÷ 000A ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 231A × 0308 ÷ 000A ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 231A ÷ 0001 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 231A × 0308 ÷ 0001 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 231A × 034F ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 231A × 0308 × 034F ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 231A ÷ 1F1E6 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 231A × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 231A ÷ 0600 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 231A × 0308 ÷ 0600 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 231A × 0903 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 231A × 0308 × 0903 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 231A ÷ 1100 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 231A × 0308 ÷ 1100 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 231A ÷ 1160 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 231A × 0308 ÷ 1160 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 231A ÷ 11A8 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 231A × 0308 ÷ 11A8 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 231A ÷ AC00 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 231A × 0308 ÷ AC00 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 231A ÷ AC01 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 231A × 0308 ÷ AC01 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 231A ÷ 231A ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 231A × 0308 ÷ 231A ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 231A × 0300 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 231A × 0308 × 0300 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 231A × 200D ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 231A × 0308 × 200D ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 231A ÷ 0378 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 231A × 0308 ÷ 0378 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 231A ÷ D800 ÷	#  ÷ [0.2] WATCH (ExtPict) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ 231A × 0308 ÷ D800 ÷	#  ÷ [0.2] WATCH (ExtPict) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ 0300 ÷ 0020 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 0300 × 0308 ÷ 0020 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 0300 ÷ 000D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0300 × 0308 ÷ 000D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0300 ÷ 000A ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0300 × 0308 ÷ 000A ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0300 ÷ 0001 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 0300 × 0308 ÷ 0001 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 0300 × 034F ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 0300 × 0308 × 034F ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 0300 ÷ 1F1E6 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0300 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0300 ÷ 0600 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 0300 × 0308 ÷ 0600 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 0300 × 0903 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0300 × 0308 × 0903 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0300 ÷ 1100 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0300 × 0308 ÷ 1100 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0300 ÷ 1160 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0300 × 0308 ÷ 1160 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0300 ÷ 11A8 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0300 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0300 ÷ AC00 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0300 × 0308 ÷ AC00 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0300 ÷ AC01 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0300 × 0308 ÷ AC01 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0300 ÷ 231A ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 0300 × 0308 ÷ 231A ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 0300 × 0300 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0300 × 0308 × 0300 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0300 × 200D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 0300 × 0308 × 200D ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 0300 ÷ 0378 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 0300 × 0308 ÷ 0378 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 0300 ÷ D800 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ 0300 × 0308 ÷ D800 ÷	#  ÷ [0.2] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ 200D ÷ 0020 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 200D × 0308 ÷ 0020 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 200D ÷ 000D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 200D × 0308 ÷ 000D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 200D ÷ 000A ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 200D × 0308 ÷ 000A ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 200D ÷ 0001 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 200D × 0308 ÷ 0001 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 200D × 034F ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 200D × 0308 × 034F ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 200D ÷ 1F1E6 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 200D × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 200D ÷ 0600 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 200D × 0308 ÷ 0600 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 200D × 0903 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 200D × 0308 × 0903 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 200D ÷ 1100 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 200D × 0308 ÷ 1100 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 200D ÷ 1160 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 200D × 0308 ÷ 1160 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 200D ÷ 11A8 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 200D × 0308 ÷ 11A8 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 200D ÷ AC00 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 200D × 0308 ÷ AC00 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 200D ÷ AC01 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 200D × 0308 ÷ AC01 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 200D ÷ 231A ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 200D × 0308 ÷ 231A ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 200D × 0300 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 200D × 0308 × 0300 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 200D × 200D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 200D × 0308 × 200D ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 200D ÷ 0378 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 200D × 0308 ÷ 0378 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 200D ÷ D800 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ 200D × 0308 ÷ D800 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
 ÷ 0378 ÷ 0020 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] SPACE (Other) ÷ [0.3]
-÷ 0378 × 0308 ÷ 0020 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ 0378 × 0308 ÷ 0020 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
 ÷ 0378 ÷ 000D ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ 0378 × 0308 ÷ 000D ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ 0378 × 0308 ÷ 000D ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
 ÷ 0378 ÷ 000A ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ 0378 × 0308 ÷ 000A ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ 0378 × 0308 ÷ 000A ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
 ÷ 0378 ÷ 0001 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0378 × 0308 ÷ 0001 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ 0378 × 0300 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ 0378 × 0308 × 0300 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
+÷ 0378 × 0308 ÷ 0001 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ 0378 × 034F ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 0378 × 0308 × 034F ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ 0378 ÷ 1F1E6 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ 0378 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ 0378 ÷ 0600 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ 0378 × 0308 ÷ 0600 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ 0378 × 0308 ÷ 0600 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ 0378 × 0903 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ 0378 × 0308 × 0903 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ 0378 × 0308 × 0903 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ 0378 ÷ 1100 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ 0378 × 0308 ÷ 1100 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ 0378 × 0308 ÷ 1100 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 0378 ÷ 1160 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ 0378 × 0308 ÷ 1160 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ 0378 × 0308 ÷ 1160 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
 ÷ 0378 ÷ 11A8 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ 0378 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ 0378 × 0308 ÷ 11A8 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
 ÷ 0378 ÷ AC00 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ 0378 × 0308 ÷ AC00 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ 0378 × 0308 ÷ AC00 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ 0378 ÷ AC01 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0378 × 0308 ÷ AC01 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ 0378 ÷ 1F1E6 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0378 × 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ 0378 ÷ 261D ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 0378 × 0308 ÷ 261D ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 0378 ÷ 1F3FB ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0378 × 0308 ÷ 1F3FB ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 0378 × 200D ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 0378 × 0308 × 200D ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 0378 ÷ 2640 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 0378 × 0308 ÷ 2640 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 0378 ÷ 1F466 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] BOY (EBG) ÷ [0.3]
-÷ 0378 × 0308 ÷ 1F466 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
+÷ 0378 × 0308 ÷ AC01 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ 0378 ÷ 231A ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 0378 × 0308 ÷ 231A ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ 0378 × 0300 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0378 × 0308 × 0300 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0378 × 200D ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 0378 × 0308 × 200D ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ 0378 ÷ 0378 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
-÷ 0378 × 0308 ÷ 0378 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ 0378 × 0308 ÷ 0378 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
 ÷ 0378 ÷ D800 ÷	#  ÷ [0.2] <reserved-0378> (Other) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 0378 × 0308 ÷ D800 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ 0378 × 0308 ÷ D800 ÷	#  ÷ [0.2] <reserved-0378> (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
 ÷ D800 ÷ 0020 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] SPACE (Other) ÷ [0.3]
-÷ D800 ÷ 0308 ÷ 0020 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ D800 ÷ 0308 ÷ 0020 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
 ÷ D800 ÷ 000D ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-÷ D800 ÷ 0308 ÷ 000D ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+÷ D800 ÷ 0308 ÷ 000D ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
 ÷ D800 ÷ 000A ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-÷ D800 ÷ 0308 ÷ 000A ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+÷ D800 ÷ 0308 ÷ 000A ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [0.3]
 ÷ D800 ÷ 0001 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ D800 ÷ 0308 ÷ 0001 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
-÷ D800 ÷ 0300 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
-÷ D800 ÷ 0308 × 0300 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) × [9.0] COMBINING GRAVE ACCENT (Extend) ÷ [0.3]
+÷ D800 ÷ 0308 ÷ 0001 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <START OF HEADING> (Control) ÷ [0.3]
+÷ D800 ÷ 034F ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ D800 ÷ 0308 × 034F ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAPHEME JOINER (Extend) ÷ [0.3]
+÷ D800 ÷ 1F1E6 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+÷ D800 ÷ 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 ÷ D800 ÷ 0600 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
-÷ D800 ÷ 0308 ÷ 0600 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
+÷ D800 ÷ 0308 ÷ 0600 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) ÷ [0.3]
 ÷ D800 ÷ 0903 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
-÷ D800 ÷ 0308 × 0903 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
+÷ D800 ÷ 0308 × 0903 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [0.3]
 ÷ D800 ÷ 1100 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
-÷ D800 ÷ 0308 ÷ 1100 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
+÷ D800 ÷ 0308 ÷ 1100 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ D800 ÷ 1160 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
-÷ D800 ÷ 0308 ÷ 1160 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
+÷ D800 ÷ 0308 ÷ 1160 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JUNGSEONG FILLER (V) ÷ [0.3]
 ÷ D800 ÷ 11A8 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
-÷ D800 ÷ 0308 ÷ 11A8 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
+÷ D800 ÷ 0308 ÷ 11A8 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL JONGSEONG KIYEOK (T) ÷ [0.3]
 ÷ D800 ÷ AC00 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
-÷ D800 ÷ 0308 ÷ AC00 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
+÷ D800 ÷ 0308 ÷ AC00 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GA (LV) ÷ [0.3]
 ÷ D800 ÷ AC01 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ D800 ÷ 0308 ÷ AC01 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
-÷ D800 ÷ 1F1E6 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ D800 ÷ 0308 ÷ 1F1E6 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-÷ D800 ÷ 261D ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ D800 ÷ 0308 ÷ 261D ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ D800 ÷ 1F3FB ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ D800 ÷ 0308 ÷ 1F3FB ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ D800 ÷ 200D ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ D800 ÷ 0308 × 200D ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ D800 ÷ 2640 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ D800 ÷ 0308 ÷ 2640 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ D800 ÷ 1F466 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] BOY (EBG) ÷ [0.3]
-÷ D800 ÷ 0308 ÷ 1F466 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] BOY (EBG) ÷ [0.3]
+÷ D800 ÷ 0308 ÷ AC01 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] HANGUL SYLLABLE GAG (LVT) ÷ [0.3]
+÷ D800 ÷ 231A ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] WATCH (ExtPict) ÷ [0.3]
+÷ D800 ÷ 0308 ÷ 231A ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] WATCH (ExtPict) ÷ [0.3]
+÷ D800 ÷ 0300 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ D800 ÷ 0308 × 0300 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] COMBINING GRAVE ACCENT (Extend_ExtCccZwj) ÷ [0.3]
+÷ D800 ÷ 200D ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ D800 ÷ 0308 × 200D ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
 ÷ D800 ÷ 0378 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] <reserved-0378> (Other) ÷ [0.3]
-÷ D800 ÷ 0308 ÷ 0378 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
+÷ D800 ÷ 0308 ÷ 0378 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] <reserved-0378> (Other) ÷ [0.3]
 ÷ D800 ÷ D800 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ D800 ÷ 0308 ÷ D800 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
-÷ 000D × 000A ÷ 0061 ÷ 000A ÷ 0308 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) × [3.0] <LINE FEED (LF)> (LF) ÷ [4.0] LATIN SMALL LETTER A (Other) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend) ÷ [0.3]
-÷ 0061 × 0308 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [0.3]
-÷ 0020 × 200D ÷ 0646 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] ARABIC LETTER NOON (Other) ÷ [0.3]
-÷ 0646 × 200D ÷ 0020 ÷	#  ÷ [0.2] ARABIC LETTER NOON (Other) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] SPACE (Other) ÷ [0.3]
+÷ D800 ÷ 0308 ÷ D800 ÷	#  ÷ [0.2] <surrogate-D800> (Control) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [5.0] <surrogate-D800> (Control) ÷ [0.3]
+÷ 000D × 000A ÷ 0061 ÷ 000A ÷ 0308 ÷	#  ÷ [0.2] <CARRIAGE RETURN (CR)> (CR) × [3.0] <LINE FEED (LF)> (LF) ÷ [4.0] LATIN SMALL LETTER A (Other) ÷ [5.0] <LINE FEED (LF)> (LF) ÷ [4.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0061 × 0308 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [0.3]
+÷ 0020 × 200D ÷ 0646 ÷	#  ÷ [0.2] SPACE (Other) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] ARABIC LETTER NOON (Other) ÷ [0.3]
+÷ 0646 × 200D ÷ 0020 ÷	#  ÷ [0.2] ARABIC LETTER NOON (Other) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] SPACE (Other) ÷ [0.3]
 ÷ 1100 × 1100 ÷	#  ÷ [0.2] HANGUL CHOSEONG KIYEOK (L) × [6.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ AC00 × 11A8 ÷ 1100 ÷	#  ÷ [0.2] HANGUL SYLLABLE GA (LV) × [7.0] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ AC01 × 11A8 ÷ 1100 ÷	#  ÷ [0.2] HANGUL SYLLABLE GAG (LVT) × [8.0] HANGUL JONGSEONG KIYEOK (T) ÷ [999.0] HANGUL CHOSEONG KIYEOK (L) ÷ [0.3]
 ÷ 1F1E6 × 1F1E7 ÷ 1F1E8 ÷ 0062 ÷	#  ÷ [0.2] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [12.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) ÷ [999.0] LATIN SMALL LETTER B (Other) ÷ [0.3]
 ÷ 0061 ÷ 1F1E6 × 1F1E7 ÷ 1F1E8 ÷ 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) ÷ [999.0] LATIN SMALL LETTER B (Other) ÷ [0.3]
-÷ 0061 ÷ 1F1E6 × 1F1E7 × 200D ÷ 1F1E8 ÷ 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) ÷ [999.0] LATIN SMALL LETTER B (Other) ÷ [0.3]
-÷ 0061 ÷ 1F1E6 × 200D ÷ 1F1E7 × 1F1E8 ÷ 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) ÷ [999.0] LATIN SMALL LETTER B (Other) ÷ [0.3]
+÷ 0061 ÷ 1F1E6 × 1F1E7 × 200D ÷ 1F1E8 ÷ 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) ÷ [999.0] LATIN SMALL LETTER B (Other) ÷ [0.3]
+÷ 0061 ÷ 1F1E6 × 200D ÷ 1F1E7 × 1F1E8 ÷ 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) ÷ [999.0] LATIN SMALL LETTER B (Other) ÷ [0.3]
 ÷ 0061 ÷ 1F1E6 × 1F1E7 ÷ 1F1E8 × 1F1E9 ÷ 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER B (RI) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER C (RI) × [13.0] REGIONAL INDICATOR SYMBOL LETTER D (RI) ÷ [999.0] LATIN SMALL LETTER B (Other) ÷ [0.3]
-÷ 0061 × 200D ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.0] ZERO WIDTH JOINER (ZWJ) ÷ [0.3]
-÷ 0061 × 0308 ÷ 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.0] COMBINING DIAERESIS (Extend) ÷ [999.0] LATIN SMALL LETTER B (Other) ÷ [0.3]
+÷ 0061 × 200D ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [0.3]
+÷ 0061 × 0308 ÷ 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) ÷ [999.0] LATIN SMALL LETTER B (Other) ÷ [0.3]
 ÷ 0061 × 0903 ÷ 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.1] DEVANAGARI SIGN VISARGA (SpacingMark) ÷ [999.0] LATIN SMALL LETTER B (Other) ÷ [0.3]
 ÷ 0061 ÷ 0600 × 0062 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) ÷ [999.0] ARABIC NUMBER SIGN (Prepend) × [9.2] LATIN SMALL LETTER B (Other) ÷ [0.3]
-÷ 261D × 1F3FB ÷ 261D ÷	#  ÷ [0.2] WHITE UP POINTING INDEX (E_Base) × [10.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [999.0] WHITE UP POINTING INDEX (E_Base) ÷ [0.3]
-÷ 1F466 × 1F3FB ÷	#  ÷ [0.2] BOY (EBG) × [10.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 200D × 1F466 × 1F3FB ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [11.0] BOY (EBG) × [10.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (E_Modifier) ÷ [0.3]
-÷ 200D × 2640 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [11.0] FEMALE SIGN (Glue_After_Zwj) ÷ [0.3]
-÷ 200D × 1F466 ÷	#  ÷ [0.2] ZERO WIDTH JOINER (ZWJ) × [11.0] BOY (EBG) ÷ [0.3]
-÷ 1F466 ÷ 1F466 ÷	#  ÷ [0.2] BOY (EBG) ÷ [999.0] BOY (EBG) ÷ [0.3]
+÷ 1F476 × 1F3FF ÷ 1F476 ÷	#  ÷ [0.2] BABY (ExtPict) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend) ÷ [999.0] BABY (ExtPict) ÷ [0.3]
+÷ 0061 × 1F3FF ÷ 1F476 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend) ÷ [999.0] BABY (ExtPict) ÷ [0.3]
+÷ 0061 × 1F3FF ÷ 1F476 × 200D × 1F6D1 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend) ÷ [999.0] BABY (ExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [11.0] OCTAGONAL SIGN (ExtPict) ÷ [0.3]
+÷ 1F476 × 1F3FF × 0308 × 200D × 1F476 × 1F3FF ÷	#  ÷ [0.2] BABY (ExtPict) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend) × [9.0] COMBINING DIAERESIS (Extend_ExtCccZwj) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [11.0] BABY (ExtPict) × [9.0] EMOJI MODIFIER FITZPATRICK TYPE-6 (Extend) ÷ [0.3]
+÷ 1F6D1 × 200D × 1F6D1 ÷	#  ÷ [0.2] OCTAGONAL SIGN (ExtPict) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [11.0] OCTAGONAL SIGN (ExtPict) ÷ [0.3]
+÷ 0061 × 200D ÷ 1F6D1 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] OCTAGONAL SIGN (ExtPict) ÷ [0.3]
+÷ 2701 × 200D × 2701 ÷	#  ÷ [0.2] UPPER BLADE SCISSORS (Other) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) × [11.0] UPPER BLADE SCISSORS (Other) ÷ [0.3]
+÷ 0061 × 200D ÷ 2701 ÷	#  ÷ [0.2] LATIN SMALL LETTER A (Other) × [9.0] ZERO WIDTH JOINER (ZWJ_ExtCccZwj) ÷ [999.0] UPPER BLADE SCISSORS (Other) ÷ [0.3]
 #
-# Lines: 822
+# Lines: 672
 #
 # EOF
diff --git a/lib/stdlib/test/unicode_util_SUITE_data/LineBreakTest.txt b/lib/stdlib/test/unicode_util_SUITE_data/LineBreakTest.txt
index 6715446aba..0e9e678a85 100644
--- a/lib/stdlib/test/unicode_util_SUITE_data/LineBreakTest.txt
+++ b/lib/stdlib/test/unicode_util_SUITE_data/LineBreakTest.txt
@@ -1,6 +1,6 @@
-# LineBreakTest-10.0.0.txt
-# Date: 2017-04-14, 05:40:30 GMT
-# © 2017 Unicode®, Inc.
+# LineBreakTest-11.0.0.txt
+# Date: 2018-05-20, 09:03:09 GMT
+# © 2018 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
@@ -6242,174 +6242,174 @@
 × 0001 × 0020 ÷ 3041 ÷	#  × [0.3] <START OF HEADING> (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] HIRAGANA LETTER SMALL A (CJ_NS) ÷ [0.3]
 × 0001 × 0308 × 3041 ÷	#  × [0.3] <START OF HEADING> (CM1_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [21.03] HIRAGANA LETTER SMALL A (CJ_NS) ÷ [0.3]
 × 0001 × 0308 × 0020 ÷ 3041 ÷	#  × [0.3] <START OF HEADING> (CM1_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] HIRAGANA LETTER SMALL A (CJ_NS) ÷ [0.3]
-× 200D × 0023 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [28.0] NUMBER SIGN (AL) ÷ [0.3]
+× 200D × 0023 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] NUMBER SIGN (AL) ÷ [0.3]
 × 200D × 0020 ÷ 0023 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] NUMBER SIGN (AL) ÷ [0.3]
-× 200D × 0308 × 0023 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [28.0] NUMBER SIGN (AL) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 0023 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] NUMBER SIGN (AL) ÷ [0.3]
-× 200D ÷ 2014 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) ÷ [999.0] EM DASH (B2) ÷ [0.3]
+× 200D × 0308 × 0023 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [28.0] NUMBER SIGN (AL) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 0023 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] NUMBER SIGN (AL) ÷ [0.3]
+× 200D × 2014 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] EM DASH (B2) ÷ [0.3]
 × 200D × 0020 ÷ 2014 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] EM DASH (B2) ÷ [0.3]
-× 200D × 0308 ÷ 2014 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) ÷ [999.0] EM DASH (B2) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 2014 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] EM DASH (B2) ÷ [0.3]
-× 200D × 0009 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [21.01] <CHARACTER TABULATION> (BA) ÷ [0.3]
+× 200D × 0308 ÷ 2014 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) ÷ [999.0] EM DASH (B2) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 2014 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] EM DASH (B2) ÷ [0.3]
+× 200D × 0009 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] <CHARACTER TABULATION> (BA) ÷ [0.3]
 × 200D × 0020 ÷ 0009 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] <CHARACTER TABULATION> (BA) ÷ [0.3]
-× 200D × 0308 × 0009 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [21.01] <CHARACTER TABULATION> (BA) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 0009 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] <CHARACTER TABULATION> (BA) ÷ [0.3]
-× 200D ÷ 00B4 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) ÷ [999.0] ACUTE ACCENT (BB) ÷ [0.3]
+× 200D × 0308 × 0009 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [21.01] <CHARACTER TABULATION> (BA) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 0009 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] <CHARACTER TABULATION> (BA) ÷ [0.3]
+× 200D × 00B4 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] ACUTE ACCENT (BB) ÷ [0.3]
 × 200D × 0020 ÷ 00B4 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] ACUTE ACCENT (BB) ÷ [0.3]
-× 200D × 0308 ÷ 00B4 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) ÷ [999.0] ACUTE ACCENT (BB) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 00B4 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] ACUTE ACCENT (BB) ÷ [0.3]
+× 200D × 0308 ÷ 00B4 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) ÷ [999.0] ACUTE ACCENT (BB) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 00B4 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] ACUTE ACCENT (BB) ÷ [0.3]
 × 200D × 000B ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [6.0] <LINE TABULATION> (BK) ÷ [0.3]
 × 200D × 0020 × 000B ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) × [6.0] <LINE TABULATION> (BK) ÷ [0.3]
-× 200D × 0308 × 000B ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [6.0] <LINE TABULATION> (BK) ÷ [0.3]
-× 200D × 0308 × 0020 × 000B ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) × [6.0] <LINE TABULATION> (BK) ÷ [0.3]
-× 200D ÷ FFFC ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) ÷ [20.01] OBJECT REPLACEMENT CHARACTER (CB) ÷ [0.3]
+× 200D × 0308 × 000B ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [6.0] <LINE TABULATION> (BK) ÷ [0.3]
+× 200D × 0308 × 0020 × 000B ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) × [6.0] <LINE TABULATION> (BK) ÷ [0.3]
+× 200D × FFFC ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] OBJECT REPLACEMENT CHARACTER (CB) ÷ [0.3]
 × 200D × 0020 ÷ FFFC ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] OBJECT REPLACEMENT CHARACTER (CB) ÷ [0.3]
-× 200D × 0308 ÷ FFFC ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) ÷ [20.01] OBJECT REPLACEMENT CHARACTER (CB) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ FFFC ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] OBJECT REPLACEMENT CHARACTER (CB) ÷ [0.3]
-× 200D × 007D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [13.04] RIGHT CURLY BRACKET (CL) ÷ [0.3]
+× 200D × 0308 ÷ FFFC ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) ÷ [20.01] OBJECT REPLACEMENT CHARACTER (CB) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ FFFC ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] OBJECT REPLACEMENT CHARACTER (CB) ÷ [0.3]
+× 200D × 007D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] RIGHT CURLY BRACKET (CL) ÷ [0.3]
 × 200D × 0020 × 007D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) × [13.02] RIGHT CURLY BRACKET (CL) ÷ [0.3]
-× 200D × 0308 × 007D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [13.04] RIGHT CURLY BRACKET (CL) ÷ [0.3]
-× 200D × 0308 × 0020 × 007D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) × [13.02] RIGHT CURLY BRACKET (CL) ÷ [0.3]
-× 200D × 0029 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [13.04] RIGHT PARENTHESIS (CP) ÷ [0.3]
+× 200D × 0308 × 007D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [13.04] RIGHT CURLY BRACKET (CL) ÷ [0.3]
+× 200D × 0308 × 0020 × 007D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) × [13.02] RIGHT CURLY BRACKET (CL) ÷ [0.3]
+× 200D × 0029 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] RIGHT PARENTHESIS (CP) ÷ [0.3]
 × 200D × 0020 × 0029 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) × [13.02] RIGHT PARENTHESIS (CP) ÷ [0.3]
-× 200D × 0308 × 0029 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [13.04] RIGHT PARENTHESIS (CP) ÷ [0.3]
-× 200D × 0308 × 0020 × 0029 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) × [13.02] RIGHT PARENTHESIS (CP) ÷ [0.3]
+× 200D × 0308 × 0029 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [13.04] RIGHT PARENTHESIS (CP) ÷ [0.3]
+× 200D × 0308 × 0020 × 0029 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) × [13.02] RIGHT PARENTHESIS (CP) ÷ [0.3]
 × 200D × 000D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [6.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
 × 200D × 0020 × 000D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) × [6.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-× 200D × 0308 × 000D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [6.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-× 200D × 0308 × 0020 × 000D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) × [6.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
-× 200D × 0021 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [13.01] EXCLAMATION MARK (EX) ÷ [0.3]
+× 200D × 0308 × 000D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [6.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+× 200D × 0308 × 0020 × 000D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) × [6.0] <CARRIAGE RETURN (CR)> (CR) ÷ [0.3]
+× 200D × 0021 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] EXCLAMATION MARK (EX) ÷ [0.3]
 × 200D × 0020 × 0021 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) × [13.01] EXCLAMATION MARK (EX) ÷ [0.3]
-× 200D × 0308 × 0021 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [13.01] EXCLAMATION MARK (EX) ÷ [0.3]
-× 200D × 0308 × 0020 × 0021 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) × [13.01] EXCLAMATION MARK (EX) ÷ [0.3]
-× 200D × 00A0 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [12.3] NO-BREAK SPACE (GL) ÷ [0.3]
+× 200D × 0308 × 0021 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [13.01] EXCLAMATION MARK (EX) ÷ [0.3]
+× 200D × 0308 × 0020 × 0021 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) × [13.01] EXCLAMATION MARK (EX) ÷ [0.3]
+× 200D × 00A0 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] NO-BREAK SPACE (GL) ÷ [0.3]
 × 200D × 0020 ÷ 00A0 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] NO-BREAK SPACE (GL) ÷ [0.3]
-× 200D × 0308 × 00A0 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [12.3] NO-BREAK SPACE (GL) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 00A0 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] NO-BREAK SPACE (GL) ÷ [0.3]
-× 200D ÷ AC00 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) ÷ [999.0] HANGUL SYLLABLE GA (H2) ÷ [0.3]
+× 200D × 0308 × 00A0 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [12.3] NO-BREAK SPACE (GL) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 00A0 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] NO-BREAK SPACE (GL) ÷ [0.3]
+× 200D × AC00 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] HANGUL SYLLABLE GA (H2) ÷ [0.3]
 × 200D × 0020 ÷ AC00 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] HANGUL SYLLABLE GA (H2) ÷ [0.3]
-× 200D × 0308 ÷ AC00 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) ÷ [999.0] HANGUL SYLLABLE GA (H2) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ AC00 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] HANGUL SYLLABLE GA (H2) ÷ [0.3]
-× 200D ÷ AC01 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) ÷ [999.0] HANGUL SYLLABLE GAG (H3) ÷ [0.3]
+× 200D × 0308 ÷ AC00 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) ÷ [999.0] HANGUL SYLLABLE GA (H2) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ AC00 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] HANGUL SYLLABLE GA (H2) ÷ [0.3]
+× 200D × AC01 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] HANGUL SYLLABLE GAG (H3) ÷ [0.3]
 × 200D × 0020 ÷ AC01 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] HANGUL SYLLABLE GAG (H3) ÷ [0.3]
-× 200D × 0308 ÷ AC01 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) ÷ [999.0] HANGUL SYLLABLE GAG (H3) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ AC01 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] HANGUL SYLLABLE GAG (H3) ÷ [0.3]
-× 200D × 05D0 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [28.0] HEBREW LETTER ALEF (HL) ÷ [0.3]
+× 200D × 0308 ÷ AC01 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) ÷ [999.0] HANGUL SYLLABLE GAG (H3) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ AC01 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] HANGUL SYLLABLE GAG (H3) ÷ [0.3]
+× 200D × 05D0 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] HEBREW LETTER ALEF (HL) ÷ [0.3]
 × 200D × 0020 ÷ 05D0 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] HEBREW LETTER ALEF (HL) ÷ [0.3]
-× 200D × 0308 × 05D0 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [28.0] HEBREW LETTER ALEF (HL) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 05D0 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] HEBREW LETTER ALEF (HL) ÷ [0.3]
-× 200D × 002D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [21.02] HYPHEN-MINUS (HY) ÷ [0.3]
+× 200D × 0308 × 05D0 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [28.0] HEBREW LETTER ALEF (HL) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 05D0 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] HEBREW LETTER ALEF (HL) ÷ [0.3]
+× 200D × 002D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] HYPHEN-MINUS (HY) ÷ [0.3]
 × 200D × 0020 ÷ 002D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] HYPHEN-MINUS (HY) ÷ [0.3]
-× 200D × 0308 × 002D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [21.02] HYPHEN-MINUS (HY) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 002D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] HYPHEN-MINUS (HY) ÷ [0.3]
+× 200D × 0308 × 002D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [21.02] HYPHEN-MINUS (HY) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 002D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] HYPHEN-MINUS (HY) ÷ [0.3]
 × 200D × 231A ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] WATCH (ID) ÷ [0.3]
 × 200D × 0020 ÷ 231A ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] WATCH (ID) ÷ [0.3]
-× 200D × 0308 ÷ 231A ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) ÷ [999.0] WATCH (ID) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 231A ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] WATCH (ID) ÷ [0.3]
-× 200D × 2024 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [22.01] ONE DOT LEADER (IN) ÷ [0.3]
+× 200D × 0308 ÷ 231A ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) ÷ [999.0] WATCH (ID) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 231A ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] WATCH (ID) ÷ [0.3]
+× 200D × 2024 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] ONE DOT LEADER (IN) ÷ [0.3]
 × 200D × 0020 ÷ 2024 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] ONE DOT LEADER (IN) ÷ [0.3]
-× 200D × 0308 × 2024 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [22.01] ONE DOT LEADER (IN) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 2024 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] ONE DOT LEADER (IN) ÷ [0.3]
-× 200D × 002C ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [13.04] COMMA (IS) ÷ [0.3]
+× 200D × 0308 × 2024 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [22.01] ONE DOT LEADER (IN) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 2024 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] ONE DOT LEADER (IN) ÷ [0.3]
+× 200D × 002C ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMMA (IS) ÷ [0.3]
 × 200D × 0020 × 002C ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) × [13.02] COMMA (IS) ÷ [0.3]
-× 200D × 0308 × 002C ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [13.04] COMMA (IS) ÷ [0.3]
-× 200D × 0308 × 0020 × 002C ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) × [13.02] COMMA (IS) ÷ [0.3]
-× 200D ÷ 1100 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) ÷ [999.0] HANGUL CHOSEONG KIYEOK (JL) ÷ [0.3]
+× 200D × 0308 × 002C ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [13.04] COMMA (IS) ÷ [0.3]
+× 200D × 0308 × 0020 × 002C ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) × [13.02] COMMA (IS) ÷ [0.3]
+× 200D × 1100 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] HANGUL CHOSEONG KIYEOK (JL) ÷ [0.3]
 × 200D × 0020 ÷ 1100 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] HANGUL CHOSEONG KIYEOK (JL) ÷ [0.3]
-× 200D × 0308 ÷ 1100 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) ÷ [999.0] HANGUL CHOSEONG KIYEOK (JL) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 1100 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] HANGUL CHOSEONG KIYEOK (JL) ÷ [0.3]
-× 200D ÷ 11A8 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) ÷ [999.0] HANGUL JONGSEONG KIYEOK (JT) ÷ [0.3]
+× 200D × 0308 ÷ 1100 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) ÷ [999.0] HANGUL CHOSEONG KIYEOK (JL) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 1100 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] HANGUL CHOSEONG KIYEOK (JL) ÷ [0.3]
+× 200D × 11A8 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] HANGUL JONGSEONG KIYEOK (JT) ÷ [0.3]
 × 200D × 0020 ÷ 11A8 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] HANGUL JONGSEONG KIYEOK (JT) ÷ [0.3]
-× 200D × 0308 ÷ 11A8 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) ÷ [999.0] HANGUL JONGSEONG KIYEOK (JT) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 11A8 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] HANGUL JONGSEONG KIYEOK (JT) ÷ [0.3]
-× 200D ÷ 1160 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) ÷ [999.0] HANGUL JUNGSEONG FILLER (JV) ÷ [0.3]
+× 200D × 0308 ÷ 11A8 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) ÷ [999.0] HANGUL JONGSEONG KIYEOK (JT) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 11A8 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] HANGUL JONGSEONG KIYEOK (JT) ÷ [0.3]
+× 200D × 1160 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] HANGUL JUNGSEONG FILLER (JV) ÷ [0.3]
 × 200D × 0020 ÷ 1160 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] HANGUL JUNGSEONG FILLER (JV) ÷ [0.3]
-× 200D × 0308 ÷ 1160 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) ÷ [999.0] HANGUL JUNGSEONG FILLER (JV) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 1160 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] HANGUL JUNGSEONG FILLER (JV) ÷ [0.3]
+× 200D × 0308 ÷ 1160 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) ÷ [999.0] HANGUL JUNGSEONG FILLER (JV) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 1160 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] HANGUL JUNGSEONG FILLER (JV) ÷ [0.3]
 × 200D × 000A ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [6.0] <LINE FEED (LF)> (LF) ÷ [0.3]
 × 200D × 0020 × 000A ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) × [6.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-× 200D × 0308 × 000A ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [6.0] <LINE FEED (LF)> (LF) ÷ [0.3]
-× 200D × 0308 × 0020 × 000A ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) × [6.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+× 200D × 0308 × 000A ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [6.0] <LINE FEED (LF)> (LF) ÷ [0.3]
+× 200D × 0308 × 0020 × 000A ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) × [6.0] <LINE FEED (LF)> (LF) ÷ [0.3]
 × 200D × 0085 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [6.0] <NEXT LINE (NEL)> (NL) ÷ [0.3]
 × 200D × 0020 × 0085 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) × [6.0] <NEXT LINE (NEL)> (NL) ÷ [0.3]
-× 200D × 0308 × 0085 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [6.0] <NEXT LINE (NEL)> (NL) ÷ [0.3]
-× 200D × 0308 × 0020 × 0085 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) × [6.0] <NEXT LINE (NEL)> (NL) ÷ [0.3]
-× 200D × 17D6 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [21.03] KHMER SIGN CAMNUC PII KUUH (NS) ÷ [0.3]
+× 200D × 0308 × 0085 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [6.0] <NEXT LINE (NEL)> (NL) ÷ [0.3]
+× 200D × 0308 × 0020 × 0085 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) × [6.0] <NEXT LINE (NEL)> (NL) ÷ [0.3]
+× 200D × 17D6 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] KHMER SIGN CAMNUC PII KUUH (NS) ÷ [0.3]
 × 200D × 0020 ÷ 17D6 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] KHMER SIGN CAMNUC PII KUUH (NS) ÷ [0.3]
-× 200D × 0308 × 17D6 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [21.03] KHMER SIGN CAMNUC PII KUUH (NS) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 17D6 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] KHMER SIGN CAMNUC PII KUUH (NS) ÷ [0.3]
-× 200D × 0030 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [23.02] DIGIT ZERO (NU) ÷ [0.3]
+× 200D × 0308 × 17D6 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [21.03] KHMER SIGN CAMNUC PII KUUH (NS) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 17D6 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] KHMER SIGN CAMNUC PII KUUH (NS) ÷ [0.3]
+× 200D × 0030 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] DIGIT ZERO (NU) ÷ [0.3]
 × 200D × 0020 ÷ 0030 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] DIGIT ZERO (NU) ÷ [0.3]
-× 200D × 0308 × 0030 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [23.02] DIGIT ZERO (NU) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 0030 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] DIGIT ZERO (NU) ÷ [0.3]
-× 200D × 0028 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [30.01] LEFT PARENTHESIS (OP) ÷ [0.3]
+× 200D × 0308 × 0030 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [23.02] DIGIT ZERO (NU) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 0030 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] DIGIT ZERO (NU) ÷ [0.3]
+× 200D × 0028 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] LEFT PARENTHESIS (OP) ÷ [0.3]
 × 200D × 0020 ÷ 0028 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] LEFT PARENTHESIS (OP) ÷ [0.3]
-× 200D × 0308 × 0028 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [30.01] LEFT PARENTHESIS (OP) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 0028 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] LEFT PARENTHESIS (OP) ÷ [0.3]
-× 200D × 0025 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [24.03] PERCENT SIGN (PO) ÷ [0.3]
+× 200D × 0308 × 0028 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [30.01] LEFT PARENTHESIS (OP) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 0028 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] LEFT PARENTHESIS (OP) ÷ [0.3]
+× 200D × 0025 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] PERCENT SIGN (PO) ÷ [0.3]
 × 200D × 0020 ÷ 0025 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] PERCENT SIGN (PO) ÷ [0.3]
-× 200D × 0308 × 0025 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [24.03] PERCENT SIGN (PO) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 0025 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] PERCENT SIGN (PO) ÷ [0.3]
-× 200D × 0024 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [24.03] DOLLAR SIGN (PR) ÷ [0.3]
+× 200D × 0308 × 0025 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [24.03] PERCENT SIGN (PO) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 0025 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] PERCENT SIGN (PO) ÷ [0.3]
+× 200D × 0024 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] DOLLAR SIGN (PR) ÷ [0.3]
 × 200D × 0020 ÷ 0024 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] DOLLAR SIGN (PR) ÷ [0.3]
-× 200D × 0308 × 0024 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [24.03] DOLLAR SIGN (PR) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 0024 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] DOLLAR SIGN (PR) ÷ [0.3]
-× 200D × 0022 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [19.01] QUOTATION MARK (QU) ÷ [0.3]
+× 200D × 0308 × 0024 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [24.03] DOLLAR SIGN (PR) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 0024 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] DOLLAR SIGN (PR) ÷ [0.3]
+× 200D × 0022 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] QUOTATION MARK (QU) ÷ [0.3]
 × 200D × 0020 ÷ 0022 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] QUOTATION MARK (QU) ÷ [0.3]
-× 200D × 0308 × 0022 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [19.01] QUOTATION MARK (QU) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 0022 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] QUOTATION MARK (QU) ÷ [0.3]
+× 200D × 0308 × 0022 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [19.01] QUOTATION MARK (QU) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 0022 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] QUOTATION MARK (QU) ÷ [0.3]
 × 200D × 0020 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [0.3]
 × 200D × 0020 × 0020 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) × [7.01] SPACE (SP) ÷ [0.3]
-× 200D × 0308 × 0020 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [0.3]
-× 200D × 0308 × 0020 × 0020 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) × [7.01] SPACE (SP) ÷ [0.3]
-× 200D × 002F ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [13.04] SOLIDUS (SY) ÷ [0.3]
+× 200D × 0308 × 0020 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [0.3]
+× 200D × 0308 × 0020 × 0020 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) × [7.01] SPACE (SP) ÷ [0.3]
+× 200D × 002F ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] SOLIDUS (SY) ÷ [0.3]
 × 200D × 0020 × 002F ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) × [13.02] SOLIDUS (SY) ÷ [0.3]
-× 200D × 0308 × 002F ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [13.04] SOLIDUS (SY) ÷ [0.3]
-× 200D × 0308 × 0020 × 002F ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) × [13.02] SOLIDUS (SY) ÷ [0.3]
-× 200D × 2060 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [11.01] WORD JOINER (WJ) ÷ [0.3]
+× 200D × 0308 × 002F ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [13.04] SOLIDUS (SY) ÷ [0.3]
+× 200D × 0308 × 0020 × 002F ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) × [13.02] SOLIDUS (SY) ÷ [0.3]
+× 200D × 2060 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] WORD JOINER (WJ) ÷ [0.3]
 × 200D × 0020 × 2060 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) × [11.01] WORD JOINER (WJ) ÷ [0.3]
-× 200D × 0308 × 2060 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [11.01] WORD JOINER (WJ) ÷ [0.3]
-× 200D × 0308 × 0020 × 2060 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) × [11.01] WORD JOINER (WJ) ÷ [0.3]
+× 200D × 0308 × 2060 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [11.01] WORD JOINER (WJ) ÷ [0.3]
+× 200D × 0308 × 0020 × 2060 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) × [11.01] WORD JOINER (WJ) ÷ [0.3]
 × 200D × 200B ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.02] ZERO WIDTH SPACE (ZW) ÷ [0.3]
 × 200D × 0020 × 200B ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) × [7.02] ZERO WIDTH SPACE (ZW) ÷ [0.3]
-× 200D × 0308 × 200B ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.02] ZERO WIDTH SPACE (ZW) ÷ [0.3]
-× 200D × 0308 × 0020 × 200B ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) × [7.02] ZERO WIDTH SPACE (ZW) ÷ [0.3]
-× 200D ÷ 1F1E6 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+× 200D × 0308 × 200B ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.02] ZERO WIDTH SPACE (ZW) ÷ [0.3]
+× 200D × 0308 × 0020 × 200B ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) × [7.02] ZERO WIDTH SPACE (ZW) ÷ [0.3]
+× 200D × 1F1E6 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 × 200D × 0020 ÷ 1F1E6 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-× 200D × 0308 ÷ 1F1E6 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 1F1E6 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+× 200D × 0308 ÷ 1F1E6 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) ÷ [999.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 1F1E6 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] REGIONAL INDICATOR SYMBOL LETTER A (RI) ÷ [0.3]
 × 200D × 261D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] WHITE UP POINTING INDEX (EB) ÷ [0.3]
 × 200D × 0020 ÷ 261D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] WHITE UP POINTING INDEX (EB) ÷ [0.3]
-× 200D × 0308 ÷ 261D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) ÷ [999.0] WHITE UP POINTING INDEX (EB) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 261D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] WHITE UP POINTING INDEX (EB) ÷ [0.3]
+× 200D × 0308 ÷ 261D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) ÷ [999.0] WHITE UP POINTING INDEX (EB) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 261D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] WHITE UP POINTING INDEX (EB) ÷ [0.3]
 × 200D × 1F3FB ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (EM) ÷ [0.3]
 × 200D × 0020 ÷ 1F3FB ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (EM) ÷ [0.3]
-× 200D × 0308 ÷ 1F3FB ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (EM) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 1F3FB ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (EM) ÷ [0.3]
-× 200D × 0001 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] <START OF HEADING> (CM1_CM) ÷ [0.3]
+× 200D × 0308 ÷ 1F3FB ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) ÷ [999.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (EM) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 1F3FB ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] EMOJI MODIFIER FITZPATRICK TYPE-1-2 (EM) ÷ [0.3]
+× 200D × 0001 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] <START OF HEADING> (CM1_CM) ÷ [0.3]
 × 200D × 0020 ÷ 0001 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] <START OF HEADING> (CM1_CM) ÷ [0.3]
-× 200D × 0308 × 0001 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [9.0] <START OF HEADING> (CM1_CM) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 0001 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] <START OF HEADING> (CM1_CM) ÷ [0.3]
-× 200D × 200D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) ÷ [0.3]
+× 200D × 0308 × 0001 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [9.0] <START OF HEADING> (CM1_CM) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 0001 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] <START OF HEADING> (CM1_CM) ÷ [0.3]
+× 200D × 200D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) ÷ [0.3]
 × 200D × 0020 ÷ 200D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) ÷ [0.3]
-× 200D × 0308 × 200D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [9.0] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 200D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) ÷ [0.3]
-× 200D × 00A7 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [28.0] SECTION SIGN (AI_AL) ÷ [0.3]
+× 200D × 0308 × 200D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [9.0] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 200D ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) ÷ [0.3]
+× 200D × 00A7 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] SECTION SIGN (AI_AL) ÷ [0.3]
 × 200D × 0020 ÷ 00A7 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] SECTION SIGN (AI_AL) ÷ [0.3]
-× 200D × 0308 × 00A7 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [28.0] SECTION SIGN (AI_AL) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 00A7 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] SECTION SIGN (AI_AL) ÷ [0.3]
-× 200D × 50005 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [28.0] <reserved-50005> (XX_AL) ÷ [0.3]
+× 200D × 0308 × 00A7 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [28.0] SECTION SIGN (AI_AL) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 00A7 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] SECTION SIGN (AI_AL) ÷ [0.3]
+× 200D × 50005 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] <reserved-50005> (XX_AL) ÷ [0.3]
 × 200D × 0020 ÷ 50005 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] <reserved-50005> (XX_AL) ÷ [0.3]
-× 200D × 0308 × 50005 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [28.0] <reserved-50005> (XX_AL) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 50005 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] <reserved-50005> (XX_AL) ÷ [0.3]
-× 200D × 0E01 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [28.0] THAI CHARACTER KO KAI (SA_AL) ÷ [0.3]
+× 200D × 0308 × 50005 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [28.0] <reserved-50005> (XX_AL) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 50005 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] <reserved-50005> (XX_AL) ÷ [0.3]
+× 200D × 0E01 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] THAI CHARACTER KO KAI (SA_AL) ÷ [0.3]
 × 200D × 0020 ÷ 0E01 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] THAI CHARACTER KO KAI (SA_AL) ÷ [0.3]
-× 200D × 0308 × 0E01 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [28.0] THAI CHARACTER KO KAI (SA_AL) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 0E01 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] THAI CHARACTER KO KAI (SA_AL) ÷ [0.3]
-× 200D × 3041 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [21.03] HIRAGANA LETTER SMALL A (CJ_NS) ÷ [0.3]
+× 200D × 0308 × 0E01 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [28.0] THAI CHARACTER KO KAI (SA_AL) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 0E01 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] THAI CHARACTER KO KAI (SA_AL) ÷ [0.3]
+× 200D × 3041 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] HIRAGANA LETTER SMALL A (CJ_NS) ÷ [0.3]
 × 200D × 0020 ÷ 3041 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [18.0] HIRAGANA LETTER SMALL A (CJ_NS) ÷ [0.3]
-× 200D × 0308 × 3041 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [21.03] HIRAGANA LETTER SMALL A (CJ_NS) ÷ [0.3]
-× 200D × 0308 × 0020 ÷ 3041 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] HIRAGANA LETTER SMALL A (CJ_NS) ÷ [0.3]
+× 200D × 0308 × 3041 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [21.03] HIRAGANA LETTER SMALL A (CJ_NS) ÷ [0.3]
+× 200D × 0308 × 0020 ÷ 3041 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] HIRAGANA LETTER SMALL A (CJ_NS) ÷ [0.3]
 × 00A7 × 0023 ÷	#  × [0.3] SECTION SIGN (AI_AL) × [28.0] NUMBER SIGN (AL) ÷ [0.3]
 × 00A7 × 0020 ÷ 0023 ÷	#  × [0.3] SECTION SIGN (AI_AL) × [7.01] SPACE (SP) ÷ [18.0] NUMBER SIGN (AL) ÷ [0.3]
 × 00A7 × 0308 × 0023 ÷	#  × [0.3] SECTION SIGN (AI_AL) × [9.0] COMBINING DIAERESIS (CM1_CM) × [28.0] NUMBER SIGN (AL) ÷ [0.3]
@@ -7084,7 +7084,7 @@
 × 3041 × 0308 × 0020 ÷ 3041 ÷	#  × [0.3] HIRAGANA LETTER SMALL A (CJ_NS) × [9.0] COMBINING DIAERESIS (CM1_CM) × [7.01] SPACE (SP) ÷ [18.0] HIRAGANA LETTER SMALL A (CJ_NS) ÷ [0.3]
 × 000D × 000A ÷ 0061 × 000A ÷ 0308 ÷	#  × [0.3] <CARRIAGE RETURN (CR)> (CR) × [5.01] <LINE FEED (LF)> (LF) ÷ [5.03] LATIN SMALL LETTER A (AL) × [6.0] <LINE FEED (LF)> (LF) ÷ [5.03] COMBINING DIAERESIS (CM1_CM) ÷ [0.3]
 × 0061 × 0308 ÷	#  × [0.3] LATIN SMALL LETTER A (AL) × [9.0] COMBINING DIAERESIS (CM1_CM) ÷ [0.3]
-× 0020 ÷ 200D × 0646 ÷	#  × [0.3] SPACE (SP) ÷ [18.0] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [28.0] ARABIC LETTER NOON (AL) ÷ [0.3]
+× 0020 ÷ 200D × 0646 ÷	#  × [0.3] SPACE (SP) ÷ [18.0] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] ARABIC LETTER NOON (AL) ÷ [0.3]
 × 0646 × 200D × 0020 ÷	#  × [0.3] ARABIC LETTER NOON (AL) × [9.0] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [7.01] SPACE (SP) ÷ [0.3]
 × 000B ÷ 3041 ÷	#  × [0.3] <LINE TABULATION> (BK) ÷ [4.0] HIRAGANA LETTER SMALL A (CJ_NS) ÷ [0.3]
 × 000D ÷ 3041 ÷	#  × [0.3] <CARRIAGE RETURN (CR)> (CR) ÷ [5.02] HIRAGANA LETTER SMALL A (CJ_NS) ÷ [0.3]
@@ -7093,8 +7093,8 @@
 × 3041 × 2060 ÷	#  × [0.3] HIRAGANA LETTER SMALL A (CJ_NS) × [11.01] WORD JOINER (WJ) ÷ [0.3]
 × 2060 × 3041 ÷	#  × [0.3] WORD JOINER (WJ) × [11.02] HIRAGANA LETTER SMALL A (CJ_NS) ÷ [0.3]
 × 3041 × 0308 × 00A0 ÷	#  × [0.3] HIRAGANA LETTER SMALL A (CJ_NS) × [9.0] COMBINING DIAERESIS (CM1_CM) × [12.2] NO-BREAK SPACE (GL) ÷ [0.3]
-× 200D × 00A0 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [12.3] NO-BREAK SPACE (GL) ÷ [0.3]
-× 200D × 002F ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [13.04] SOLIDUS (SY) ÷ [0.3]
+× 200D × 00A0 ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] NO-BREAK SPACE (GL) ÷ [0.3]
+× 200D × 002F ÷	#  × [0.3] ZERO WIDTH JOINER (ZWJ_O_ZWJ_CM) × [8.1] SOLIDUS (SY) ÷ [0.3]
 × 2014 × 2014 ÷	#  × [0.3] EM DASH (B2) × [17.0] EM DASH (B2) ÷ [0.3]
 × 3041 ÷ FFFC ÷	#  × [0.3] HIRAGANA LETTER SMALL A (CJ_NS) ÷ [20.01] OBJECT REPLACEMENT CHARACTER (CB) ÷ [0.3]
 × FFFC ÷ 3041 ÷	#  × [0.3] OBJECT REPLACEMENT CHARACTER (CB) ÷ [20.02] HIRAGANA LETTER SMALL A (CJ_NS) ÷ [0.3]
diff --git a/lib/stdlib/test/unicode_util_SUITE_data/NormalizationTest.txt b/lib/stdlib/test/unicode_util_SUITE_data/NormalizationTest.txt
index 71f2371c5e..72a31bcdf1 100644
--- a/lib/stdlib/test/unicode_util_SUITE_data/NormalizationTest.txt
+++ b/lib/stdlib/test/unicode_util_SUITE_data/NormalizationTest.txt
@@ -1,6 +1,6 @@
-# NormalizationTest-10.0.0.txt
-# Date: 2017-03-08, 08:41:55 GMT
-# © 2017 Unicode®, Inc.
+# NormalizationTest-11.0.0.txt
+# Date: 2018-02-19, 18:33:08 GMT
+# © 2018 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
@@ -17479,6 +17479,8 @@ FFEE;FFEE;FFEE;25CB;25CB; # (￮; ￮; ￮; ○; ○; ) HALFWIDTH WHITE CIRCLE
 0061 07F2 059A 0316 302A 0062;0061 302A 07F2 0316 059A 0062;0061 302A 07F2 0316 059A 0062;0061 302A 07F2 0316 059A 0062;0061 302A 07F2 0316 059A 0062; # (a◌߲◌֚◌̖◌〪b; a◌〪◌߲◌̖◌֚b; a◌〪◌߲◌̖◌֚b; a◌〪◌߲◌̖◌֚b; a◌〪◌߲◌̖◌֚b; ) LATIN SMALL LETTER A, NKO COMBINING NASALIZATION MARK, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
 0061 0315 0300 05AE 07F3 0062;00E0 05AE 07F3 0315 0062;0061 05AE 0300 07F3 0315 0062;00E0 05AE 07F3 0315 0062;0061 05AE 0300 07F3 0315 0062; # (a◌̕◌̀◌֮◌߳b; à◌֮◌߳◌̕b; a◌֮◌̀◌߳◌̕b; à◌֮◌߳◌̕b; a◌֮◌̀◌߳◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, NKO COMBINING DOUBLE DOT ABOVE, LATIN SMALL LETTER B
 0061 07F3 0315 0300 05AE 0062;0061 05AE 07F3 0300 0315 0062;0061 05AE 07F3 0300 0315 0062;0061 05AE 07F3 0300 0315 0062;0061 05AE 07F3 0300 0315 0062; # (a◌߳◌̕◌̀◌֮b; a◌֮◌߳◌̀◌̕b; a◌֮◌߳◌̀◌̕b; a◌֮◌߳◌̀◌̕b; a◌֮◌߳◌̀◌̕b; ) LATIN SMALL LETTER A, NKO COMBINING DOUBLE DOT ABOVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 059A 0316 302A 07FD 0062;0061 302A 0316 07FD 059A 0062;0061 302A 0316 07FD 059A 0062;0061 302A 0316 07FD 059A 0062;0061 302A 0316 07FD 059A 0062; # (a◌֚◌̖◌〪◌߽b; a◌〪◌̖◌߽◌֚b; a◌〪◌̖◌߽◌֚b; a◌〪◌̖◌߽◌֚b; a◌〪◌̖◌߽◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, NKO DANTAYALAN, LATIN SMALL LETTER B
+0061 07FD 059A 0316 302A 0062;0061 302A 07FD 0316 059A 0062;0061 302A 07FD 0316 059A 0062;0061 302A 07FD 0316 059A 0062;0061 302A 07FD 0316 059A 0062; # (a◌߽◌֚◌̖◌〪b; a◌〪◌߽◌̖◌֚b; a◌〪◌߽◌̖◌֚b; a◌〪◌߽◌̖◌֚b; a◌〪◌߽◌̖◌֚b; ) LATIN SMALL LETTER A, NKO DANTAYALAN, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
 0061 0315 0300 05AE 0816 0062;00E0 05AE 0816 0315 0062;0061 05AE 0300 0816 0315 0062;00E0 05AE 0816 0315 0062;0061 05AE 0300 0816 0315 0062; # (a◌̕◌̀◌֮◌ࠖb; à◌֮◌ࠖ◌̕b; a◌֮◌̀◌ࠖ◌̕b; à◌֮◌ࠖ◌̕b; a◌֮◌̀◌ࠖ◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, SAMARITAN MARK IN, LATIN SMALL LETTER B
 0061 0816 0315 0300 05AE 0062;0061 05AE 0816 0300 0315 0062;0061 05AE 0816 0300 0315 0062;0061 05AE 0816 0300 0315 0062;0061 05AE 0816 0300 0315 0062; # (a◌ࠖ◌̕◌̀◌֮b; a◌֮◌ࠖ◌̀◌̕b; a◌֮◌ࠖ◌̀◌̕b; a◌֮◌ࠖ◌̀◌̕b; a◌֮◌ࠖ◌̀◌̕b; ) LATIN SMALL LETTER A, SAMARITAN MARK IN, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
 0061 0315 0300 05AE 0817 0062;00E0 05AE 0817 0315 0062;0061 05AE 0300 0817 0315 0062;00E0 05AE 0817 0315 0062;0061 05AE 0300 0817 0315 0062; # (a◌̕◌̀◌֮◌ࠗb; à◌֮◌ࠗ◌̕b; a◌֮◌̀◌ࠗ◌̕b; à◌֮◌ࠗ◌̕b; a◌֮◌̀◌ࠗ◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, SAMARITAN MARK IN-ALAF, LATIN SMALL LETTER B
@@ -17527,6 +17529,8 @@ FFEE;FFEE;FFEE;25CB;25CB; # (￮; ￮; ￮; ○; ○; ) HALFWIDTH WHITE CIRCLE
 0061 085A 059A 0316 302A 0062;0061 302A 085A 0316 059A 0062;0061 302A 085A 0316 059A 0062;0061 302A 085A 0316 059A 0062;0061 302A 085A 0316 059A 0062; # (a◌࡚◌֚◌̖◌〪b; a◌〪◌࡚◌̖◌֚b; a◌〪◌࡚◌̖◌֚b; a◌〪◌࡚◌̖◌֚b; a◌〪◌࡚◌̖◌֚b; ) LATIN SMALL LETTER A, MANDAIC VOCALIZATION MARK, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
 0061 059A 0316 302A 085B 0062;0061 302A 0316 085B 059A 0062;0061 302A 0316 085B 059A 0062;0061 302A 0316 085B 059A 0062;0061 302A 0316 085B 059A 0062; # (a◌֚◌̖◌〪◌࡛b; a◌〪◌̖◌࡛◌֚b; a◌〪◌̖◌࡛◌֚b; a◌〪◌̖◌࡛◌֚b; a◌〪◌̖◌࡛◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, MANDAIC GEMINATION MARK, LATIN SMALL LETTER B
 0061 085B 059A 0316 302A 0062;0061 302A 085B 0316 059A 0062;0061 302A 085B 0316 059A 0062;0061 302A 085B 0316 059A 0062;0061 302A 085B 0316 059A 0062; # (a◌࡛◌֚◌̖◌〪b; a◌〪◌࡛◌̖◌֚b; a◌〪◌࡛◌̖◌֚b; a◌〪◌࡛◌̖◌֚b; a◌〪◌࡛◌̖◌֚b; ) LATIN SMALL LETTER A, MANDAIC GEMINATION MARK, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
+0061 059A 0316 302A 08D3 0062;0061 302A 0316 08D3 059A 0062;0061 302A 0316 08D3 059A 0062;0061 302A 0316 08D3 059A 0062;0061 302A 0316 08D3 059A 0062; # (a◌֚◌̖◌〪◌࣓b; a◌〪◌̖◌࣓◌֚b; a◌〪◌̖◌࣓◌֚b; a◌〪◌̖◌࣓◌֚b; a◌〪◌̖◌࣓◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, ARABIC SMALL LOW WAW, LATIN SMALL LETTER B
+0061 08D3 059A 0316 302A 0062;0061 302A 08D3 0316 059A 0062;0061 302A 08D3 0316 059A 0062;0061 302A 08D3 0316 059A 0062;0061 302A 08D3 0316 059A 0062; # (a◌࣓◌֚◌̖◌〪b; a◌〪◌࣓◌̖◌֚b; a◌〪◌࣓◌̖◌֚b; a◌〪◌࣓◌̖◌֚b; a◌〪◌࣓◌̖◌֚b; ) LATIN SMALL LETTER A, ARABIC SMALL LOW WAW, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
 0061 0315 0300 05AE 08D4 0062;00E0 05AE 08D4 0315 0062;0061 05AE 0300 08D4 0315 0062;00E0 05AE 08D4 0315 0062;0061 05AE 0300 08D4 0315 0062; # (a◌̕◌̀◌֮◌ࣔb; à◌֮◌ࣔ◌̕b; a◌֮◌̀◌ࣔ◌̕b; à◌֮◌ࣔ◌̕b; a◌֮◌̀◌ࣔ◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, ARABIC SMALL HIGH WORD AR-RUB, LATIN SMALL LETTER B
 0061 08D4 0315 0300 05AE 0062;0061 05AE 08D4 0300 0315 0062;0061 05AE 08D4 0300 0315 0062;0061 05AE 08D4 0300 0315 0062;0061 05AE 08D4 0300 0315 0062; # (a◌ࣔ◌̕◌̀◌֮b; a◌֮◌ࣔ◌̀◌̕b; a◌֮◌ࣔ◌̀◌̕b; a◌֮◌ࣔ◌̀◌̕b; a◌֮◌ࣔ◌̀◌̕b; ) LATIN SMALL LETTER A, ARABIC SMALL HIGH WORD AR-RUB, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
 0061 0315 0300 05AE 08D5 0062;00E0 05AE 08D5 0315 0062;0061 05AE 0300 08D5 0315 0062;00E0 05AE 08D5 0315 0062;0061 05AE 0300 08D5 0315 0062; # (a◌̕◌̀◌֮◌ࣕb; à◌֮◌ࣕ◌̕b; a◌֮◌̀◌ࣕ◌̕b; à◌֮◌ࣕ◌̕b; a◌֮◌̀◌ࣕ◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, ARABIC SMALL HIGH SAD, LATIN SMALL LETTER B
@@ -17629,6 +17633,8 @@ FFEE;FFEE;FFEE;25CB;25CB; # (￮; ￮; ￮; ○; ○; ) HALFWIDTH WHITE CIRCLE
 0061 09BC 3099 093C 0334 0062;0061 0334 09BC 093C 3099 0062;0061 0334 09BC 093C 3099 0062;0061 0334 09BC 093C 3099 0062;0061 0334 09BC 093C 3099 0062; # (a◌়◌゙◌़◌̴b; a◌̴◌়◌़◌゙b; a◌̴◌়◌़◌゙b; a◌̴◌়◌़◌゙b; a◌̴◌়◌़◌゙b; ) LATIN SMALL LETTER A, BENGALI SIGN NUKTA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
 0061 05B0 094D 3099 09CD 0062;0061 3099 094D 09CD 05B0 0062;0061 3099 094D 09CD 05B0 0062;0061 3099 094D 09CD 05B0 0062;0061 3099 094D 09CD 05B0 0062; # (a◌ְ◌्◌゙◌্b; a◌゙◌्◌্◌ְb; a◌゙◌्◌্◌ְb; a◌゙◌्◌্◌ְb; a◌゙◌्◌্◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, BENGALI SIGN VIRAMA, LATIN SMALL LETTER B
 0061 09CD 05B0 094D 3099 0062;0061 3099 09CD 094D 05B0 0062;0061 3099 09CD 094D 05B0 0062;0061 3099 09CD 094D 05B0 0062;0061 3099 09CD 094D 05B0 0062; # (a◌্◌ְ◌्◌゙b; a◌゙◌্◌्◌ְb; a◌゙◌্◌्◌ְb; a◌゙◌্◌्◌ְb; a◌゙◌্◌्◌ְb; ) LATIN SMALL LETTER A, BENGALI SIGN VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
+0061 0315 0300 05AE 09FE 0062;00E0 05AE 09FE 0315 0062;0061 05AE 0300 09FE 0315 0062;00E0 05AE 09FE 0315 0062;0061 05AE 0300 09FE 0315 0062; # (a◌̕◌̀◌֮◌৾b; à◌֮◌৾◌̕b; a◌֮◌̀◌৾◌̕b; à◌֮◌৾◌̕b; a◌֮◌̀◌৾◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, BENGALI SANDHI MARK, LATIN SMALL LETTER B
+0061 09FE 0315 0300 05AE 0062;0061 05AE 09FE 0300 0315 0062;0061 05AE 09FE 0300 0315 0062;0061 05AE 09FE 0300 0315 0062;0061 05AE 09FE 0300 0315 0062; # (a◌৾◌̕◌̀◌֮b; a◌֮◌৾◌̀◌̕b; a◌֮◌৾◌̀◌̕b; a◌֮◌৾◌̀◌̕b; a◌֮◌৾◌̀◌̕b; ) LATIN SMALL LETTER A, BENGALI SANDHI MARK, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
 0061 3099 093C 0334 0A3C 0062;0061 0334 093C 0A3C 3099 0062;0061 0334 093C 0A3C 3099 0062;0061 0334 093C 0A3C 3099 0062;0061 0334 093C 0A3C 3099 0062; # (a◌゙◌़◌̴◌਼b; a◌̴◌़◌਼◌゙b; a◌̴◌़◌਼◌゙b; a◌̴◌़◌਼◌゙b; a◌̴◌़◌਼◌゙b; ) LATIN SMALL LETTER A, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, GURMUKHI SIGN NUKTA, LATIN SMALL LETTER B
 0061 0A3C 3099 093C 0334 0062;0061 0334 0A3C 093C 3099 0062;0061 0334 0A3C 093C 3099 0062;0061 0334 0A3C 093C 3099 0062;0061 0334 0A3C 093C 3099 0062; # (a◌਼◌゙◌़◌̴b; a◌̴◌਼◌़◌゙b; a◌̴◌਼◌़◌゙b; a◌̴◌਼◌़◌゙b; a◌̴◌਼◌़◌゙b; ) LATIN SMALL LETTER A, GURMUKHI SIGN NUKTA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
 0061 05B0 094D 3099 0A4D 0062;0061 3099 094D 0A4D 05B0 0062;0061 3099 094D 0A4D 05B0 0062;0061 3099 094D 0A4D 05B0 0062;0061 3099 094D 0A4D 05B0 0062; # (a◌ְ◌्◌゙◌੍b; a◌゙◌्◌੍◌ְb; a◌゙◌्◌੍◌ְb; a◌゙◌्◌੍◌ְb; a◌゙◌्◌੍◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, GURMUKHI SIGN VIRAMA, LATIN SMALL LETTER B
@@ -18329,6 +18335,36 @@ FFEE;FFEE;FFEE;25CB;25CB; # (￮; ￮; ￮; ○; ○; ) HALFWIDTH WHITE CIRCLE
 0061 10AE5 0315 0300 05AE 0062;0061 05AE 10AE5 0300 0315 0062;0061 05AE 10AE5 0300 0315 0062;0061 05AE 10AE5 0300 0315 0062;0061 05AE 10AE5 0300 0315 0062; # (a◌𐫥◌̕◌̀◌֮b; a◌֮◌𐫥◌̀◌̕b; a◌֮◌𐫥◌̀◌̕b; a◌֮◌𐫥◌̀◌̕b; a◌֮◌𐫥◌̀◌̕b; ) LATIN SMALL LETTER A, MANICHAEAN ABBREVIATION MARK ABOVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
 0061 059A 0316 302A 10AE6 0062;0061 302A 0316 10AE6 059A 0062;0061 302A 0316 10AE6 059A 0062;0061 302A 0316 10AE6 059A 0062;0061 302A 0316 10AE6 059A 0062; # (a◌֚◌̖◌〪◌𐫦b; a◌〪◌̖◌𐫦◌֚b; a◌〪◌̖◌𐫦◌֚b; a◌〪◌̖◌𐫦◌֚b; a◌〪◌̖◌𐫦◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, MANICHAEAN ABBREVIATION MARK BELOW, LATIN SMALL LETTER B
 0061 10AE6 059A 0316 302A 0062;0061 302A 10AE6 0316 059A 0062;0061 302A 10AE6 0316 059A 0062;0061 302A 10AE6 0316 059A 0062;0061 302A 10AE6 0316 059A 0062; # (a◌𐫦◌֚◌̖◌〪b; a◌〪◌𐫦◌̖◌֚b; a◌〪◌𐫦◌̖◌֚b; a◌〪◌𐫦◌̖◌֚b; a◌〪◌𐫦◌̖◌֚b; ) LATIN SMALL LETTER A, MANICHAEAN ABBREVIATION MARK BELOW, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
+0061 0315 0300 05AE 10D24 0062;00E0 05AE 10D24 0315 0062;0061 05AE 0300 10D24 0315 0062;00E0 05AE 10D24 0315 0062;0061 05AE 0300 10D24 0315 0062; # (a◌̕◌̀◌֮◌𐴤b; à◌֮◌𐴤◌̕b; a◌֮◌̀◌𐴤◌̕b; à◌֮◌𐴤◌̕b; a◌֮◌̀◌𐴤◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, HANIFI ROHINGYA SIGN HARBAHAY, LATIN SMALL LETTER B
+0061 10D24 0315 0300 05AE 0062;0061 05AE 10D24 0300 0315 0062;0061 05AE 10D24 0300 0315 0062;0061 05AE 10D24 0300 0315 0062;0061 05AE 10D24 0300 0315 0062; # (a◌𐴤◌̕◌̀◌֮b; a◌֮◌𐴤◌̀◌̕b; a◌֮◌𐴤◌̀◌̕b; a◌֮◌𐴤◌̀◌̕b; a◌֮◌𐴤◌̀◌̕b; ) LATIN SMALL LETTER A, HANIFI ROHINGYA SIGN HARBAHAY, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 10D25 0062;00E0 05AE 10D25 0315 0062;0061 05AE 0300 10D25 0315 0062;00E0 05AE 10D25 0315 0062;0061 05AE 0300 10D25 0315 0062; # (a◌̕◌̀◌֮◌𐴥b; à◌֮◌𐴥◌̕b; a◌֮◌̀◌𐴥◌̕b; à◌֮◌𐴥◌̕b; a◌֮◌̀◌𐴥◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, HANIFI ROHINGYA SIGN TAHALA, LATIN SMALL LETTER B
+0061 10D25 0315 0300 05AE 0062;0061 05AE 10D25 0300 0315 0062;0061 05AE 10D25 0300 0315 0062;0061 05AE 10D25 0300 0315 0062;0061 05AE 10D25 0300 0315 0062; # (a◌𐴥◌̕◌̀◌֮b; a◌֮◌𐴥◌̀◌̕b; a◌֮◌𐴥◌̀◌̕b; a◌֮◌𐴥◌̀◌̕b; a◌֮◌𐴥◌̀◌̕b; ) LATIN SMALL LETTER A, HANIFI ROHINGYA SIGN TAHALA, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 10D26 0062;00E0 05AE 10D26 0315 0062;0061 05AE 0300 10D26 0315 0062;00E0 05AE 10D26 0315 0062;0061 05AE 0300 10D26 0315 0062; # (a◌̕◌̀◌֮◌𐴦b; à◌֮◌𐴦◌̕b; a◌֮◌̀◌𐴦◌̕b; à◌֮◌𐴦◌̕b; a◌֮◌̀◌𐴦◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, HANIFI ROHINGYA SIGN TANA, LATIN SMALL LETTER B
+0061 10D26 0315 0300 05AE 0062;0061 05AE 10D26 0300 0315 0062;0061 05AE 10D26 0300 0315 0062;0061 05AE 10D26 0300 0315 0062;0061 05AE 10D26 0300 0315 0062; # (a◌𐴦◌̕◌̀◌֮b; a◌֮◌𐴦◌̀◌̕b; a◌֮◌𐴦◌̀◌̕b; a◌֮◌𐴦◌̀◌̕b; a◌֮◌𐴦◌̀◌̕b; ) LATIN SMALL LETTER A, HANIFI ROHINGYA SIGN TANA, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 10D27 0062;00E0 05AE 10D27 0315 0062;0061 05AE 0300 10D27 0315 0062;00E0 05AE 10D27 0315 0062;0061 05AE 0300 10D27 0315 0062; # (a◌̕◌̀◌֮◌𐴧b; à◌֮◌𐴧◌̕b; a◌֮◌̀◌𐴧◌̕b; à◌֮◌𐴧◌̕b; a◌֮◌̀◌𐴧◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, HANIFI ROHINGYA SIGN TASSI, LATIN SMALL LETTER B
+0061 10D27 0315 0300 05AE 0062;0061 05AE 10D27 0300 0315 0062;0061 05AE 10D27 0300 0315 0062;0061 05AE 10D27 0300 0315 0062;0061 05AE 10D27 0300 0315 0062; # (a◌𐴧◌̕◌̀◌֮b; a◌֮◌𐴧◌̀◌̕b; a◌֮◌𐴧◌̀◌̕b; a◌֮◌𐴧◌̀◌̕b; a◌֮◌𐴧◌̀◌̕b; ) LATIN SMALL LETTER A, HANIFI ROHINGYA SIGN TASSI, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 059A 0316 302A 10F46 0062;0061 302A 0316 10F46 059A 0062;0061 302A 0316 10F46 059A 0062;0061 302A 0316 10F46 059A 0062;0061 302A 0316 10F46 059A 0062; # (a◌֚◌̖◌〪◌𐽆b; a◌〪◌̖◌𐽆◌֚b; a◌〪◌̖◌𐽆◌֚b; a◌〪◌̖◌𐽆◌֚b; a◌〪◌̖◌𐽆◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, SOGDIAN COMBINING DOT BELOW, LATIN SMALL LETTER B
+0061 10F46 059A 0316 302A 0062;0061 302A 10F46 0316 059A 0062;0061 302A 10F46 0316 059A 0062;0061 302A 10F46 0316 059A 0062;0061 302A 10F46 0316 059A 0062; # (a◌𐽆◌֚◌̖◌〪b; a◌〪◌𐽆◌̖◌֚b; a◌〪◌𐽆◌̖◌֚b; a◌〪◌𐽆◌̖◌֚b; a◌〪◌𐽆◌̖◌֚b; ) LATIN SMALL LETTER A, SOGDIAN COMBINING DOT BELOW, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
+0061 059A 0316 302A 10F47 0062;0061 302A 0316 10F47 059A 0062;0061 302A 0316 10F47 059A 0062;0061 302A 0316 10F47 059A 0062;0061 302A 0316 10F47 059A 0062; # (a◌֚◌̖◌〪◌𐽇b; a◌〪◌̖◌𐽇◌֚b; a◌〪◌̖◌𐽇◌֚b; a◌〪◌̖◌𐽇◌֚b; a◌〪◌̖◌𐽇◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, SOGDIAN COMBINING TWO DOTS BELOW, LATIN SMALL LETTER B
+0061 10F47 059A 0316 302A 0062;0061 302A 10F47 0316 059A 0062;0061 302A 10F47 0316 059A 0062;0061 302A 10F47 0316 059A 0062;0061 302A 10F47 0316 059A 0062; # (a◌𐽇◌֚◌̖◌〪b; a◌〪◌𐽇◌̖◌֚b; a◌〪◌𐽇◌̖◌֚b; a◌〪◌𐽇◌̖◌֚b; a◌〪◌𐽇◌̖◌֚b; ) LATIN SMALL LETTER A, SOGDIAN COMBINING TWO DOTS BELOW, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
+0061 0315 0300 05AE 10F48 0062;00E0 05AE 10F48 0315 0062;0061 05AE 0300 10F48 0315 0062;00E0 05AE 10F48 0315 0062;0061 05AE 0300 10F48 0315 0062; # (a◌̕◌̀◌֮◌𐽈b; à◌֮◌𐽈◌̕b; a◌֮◌̀◌𐽈◌̕b; à◌֮◌𐽈◌̕b; a◌֮◌̀◌𐽈◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, SOGDIAN COMBINING DOT ABOVE, LATIN SMALL LETTER B
+0061 10F48 0315 0300 05AE 0062;0061 05AE 10F48 0300 0315 0062;0061 05AE 10F48 0300 0315 0062;0061 05AE 10F48 0300 0315 0062;0061 05AE 10F48 0300 0315 0062; # (a◌𐽈◌̕◌̀◌֮b; a◌֮◌𐽈◌̀◌̕b; a◌֮◌𐽈◌̀◌̕b; a◌֮◌𐽈◌̀◌̕b; a◌֮◌𐽈◌̀◌̕b; ) LATIN SMALL LETTER A, SOGDIAN COMBINING DOT ABOVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 10F49 0062;00E0 05AE 10F49 0315 0062;0061 05AE 0300 10F49 0315 0062;00E0 05AE 10F49 0315 0062;0061 05AE 0300 10F49 0315 0062; # (a◌̕◌̀◌֮◌𐽉b; à◌֮◌𐽉◌̕b; a◌֮◌̀◌𐽉◌̕b; à◌֮◌𐽉◌̕b; a◌֮◌̀◌𐽉◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, SOGDIAN COMBINING TWO DOTS ABOVE, LATIN SMALL LETTER B
+0061 10F49 0315 0300 05AE 0062;0061 05AE 10F49 0300 0315 0062;0061 05AE 10F49 0300 0315 0062;0061 05AE 10F49 0300 0315 0062;0061 05AE 10F49 0300 0315 0062; # (a◌𐽉◌̕◌̀◌֮b; a◌֮◌𐽉◌̀◌̕b; a◌֮◌𐽉◌̀◌̕b; a◌֮◌𐽉◌̀◌̕b; a◌֮◌𐽉◌̀◌̕b; ) LATIN SMALL LETTER A, SOGDIAN COMBINING TWO DOTS ABOVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 0315 0300 05AE 10F4A 0062;00E0 05AE 10F4A 0315 0062;0061 05AE 0300 10F4A 0315 0062;00E0 05AE 10F4A 0315 0062;0061 05AE 0300 10F4A 0315 0062; # (a◌̕◌̀◌֮◌𐽊b; à◌֮◌𐽊◌̕b; a◌֮◌̀◌𐽊◌̕b; à◌֮◌𐽊◌̕b; a◌֮◌̀◌𐽊◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, SOGDIAN COMBINING CURVE ABOVE, LATIN SMALL LETTER B
+0061 10F4A 0315 0300 05AE 0062;0061 05AE 10F4A 0300 0315 0062;0061 05AE 10F4A 0300 0315 0062;0061 05AE 10F4A 0300 0315 0062;0061 05AE 10F4A 0300 0315 0062; # (a◌𐽊◌̕◌̀◌֮b; a◌֮◌𐽊◌̀◌̕b; a◌֮◌𐽊◌̀◌̕b; a◌֮◌𐽊◌̀◌̕b; a◌֮◌𐽊◌̀◌̕b; ) LATIN SMALL LETTER A, SOGDIAN COMBINING CURVE ABOVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 059A 0316 302A 10F4B 0062;0061 302A 0316 10F4B 059A 0062;0061 302A 0316 10F4B 059A 0062;0061 302A 0316 10F4B 059A 0062;0061 302A 0316 10F4B 059A 0062; # (a◌֚◌̖◌〪◌𐽋b; a◌〪◌̖◌𐽋◌֚b; a◌〪◌̖◌𐽋◌֚b; a◌〪◌̖◌𐽋◌֚b; a◌〪◌̖◌𐽋◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, SOGDIAN COMBINING CURVE BELOW, LATIN SMALL LETTER B
+0061 10F4B 059A 0316 302A 0062;0061 302A 10F4B 0316 059A 0062;0061 302A 10F4B 0316 059A 0062;0061 302A 10F4B 0316 059A 0062;0061 302A 10F4B 0316 059A 0062; # (a◌𐽋◌֚◌̖◌〪b; a◌〪◌𐽋◌̖◌֚b; a◌〪◌𐽋◌̖◌֚b; a◌〪◌𐽋◌̖◌֚b; a◌〪◌𐽋◌̖◌֚b; ) LATIN SMALL LETTER A, SOGDIAN COMBINING CURVE BELOW, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
+0061 0315 0300 05AE 10F4C 0062;00E0 05AE 10F4C 0315 0062;0061 05AE 0300 10F4C 0315 0062;00E0 05AE 10F4C 0315 0062;0061 05AE 0300 10F4C 0315 0062; # (a◌̕◌̀◌֮◌𐽌b; à◌֮◌𐽌◌̕b; a◌֮◌̀◌𐽌◌̕b; à◌֮◌𐽌◌̕b; a◌֮◌̀◌𐽌◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, SOGDIAN COMBINING HOOK ABOVE, LATIN SMALL LETTER B
+0061 10F4C 0315 0300 05AE 0062;0061 05AE 10F4C 0300 0315 0062;0061 05AE 10F4C 0300 0315 0062;0061 05AE 10F4C 0300 0315 0062;0061 05AE 10F4C 0300 0315 0062; # (a◌𐽌◌̕◌̀◌֮b; a◌֮◌𐽌◌̀◌̕b; a◌֮◌𐽌◌̀◌̕b; a◌֮◌𐽌◌̀◌̕b; a◌֮◌𐽌◌̀◌̕b; ) LATIN SMALL LETTER A, SOGDIAN COMBINING HOOK ABOVE, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
+0061 059A 0316 302A 10F4D 0062;0061 302A 0316 10F4D 059A 0062;0061 302A 0316 10F4D 059A 0062;0061 302A 0316 10F4D 059A 0062;0061 302A 0316 10F4D 059A 0062; # (a◌֚◌̖◌〪◌𐽍b; a◌〪◌̖◌𐽍◌֚b; a◌〪◌̖◌𐽍◌֚b; a◌〪◌̖◌𐽍◌֚b; a◌〪◌̖◌𐽍◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, SOGDIAN COMBINING HOOK BELOW, LATIN SMALL LETTER B
+0061 10F4D 059A 0316 302A 0062;0061 302A 10F4D 0316 059A 0062;0061 302A 10F4D 0316 059A 0062;0061 302A 10F4D 0316 059A 0062;0061 302A 10F4D 0316 059A 0062; # (a◌𐽍◌֚◌̖◌〪b; a◌〪◌𐽍◌̖◌֚b; a◌〪◌𐽍◌̖◌֚b; a◌〪◌𐽍◌̖◌֚b; a◌〪◌𐽍◌̖◌֚b; ) LATIN SMALL LETTER A, SOGDIAN COMBINING HOOK BELOW, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
+0061 059A 0316 302A 10F4E 0062;0061 302A 0316 10F4E 059A 0062;0061 302A 0316 10F4E 059A 0062;0061 302A 0316 10F4E 059A 0062;0061 302A 0316 10F4E 059A 0062; # (a◌֚◌̖◌〪◌𐽎b; a◌〪◌̖◌𐽎◌֚b; a◌〪◌̖◌𐽎◌֚b; a◌〪◌̖◌𐽎◌֚b; a◌〪◌̖◌𐽎◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, SOGDIAN COMBINING LONG HOOK BELOW, LATIN SMALL LETTER B
+0061 10F4E 059A 0316 302A 0062;0061 302A 10F4E 0316 059A 0062;0061 302A 10F4E 0316 059A 0062;0061 302A 10F4E 0316 059A 0062;0061 302A 10F4E 0316 059A 0062; # (a◌𐽎◌֚◌̖◌〪b; a◌〪◌𐽎◌̖◌֚b; a◌〪◌𐽎◌̖◌֚b; a◌〪◌𐽎◌̖◌֚b; a◌〪◌𐽎◌̖◌֚b; ) LATIN SMALL LETTER A, SOGDIAN COMBINING LONG HOOK BELOW, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
+0061 059A 0316 302A 10F4F 0062;0061 302A 0316 10F4F 059A 0062;0061 302A 0316 10F4F 059A 0062;0061 302A 0316 10F4F 059A 0062;0061 302A 0316 10F4F 059A 0062; # (a◌֚◌̖◌〪◌𐽏b; a◌〪◌̖◌𐽏◌֚b; a◌〪◌̖◌𐽏◌֚b; a◌〪◌̖◌𐽏◌֚b; a◌〪◌̖◌𐽏◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, SOGDIAN COMBINING RESH BELOW, LATIN SMALL LETTER B
+0061 10F4F 059A 0316 302A 0062;0061 302A 10F4F 0316 059A 0062;0061 302A 10F4F 0316 059A 0062;0061 302A 10F4F 0316 059A 0062;0061 302A 10F4F 0316 059A 0062; # (a◌𐽏◌֚◌̖◌〪b; a◌〪◌𐽏◌̖◌֚b; a◌〪◌𐽏◌̖◌֚b; a◌〪◌𐽏◌̖◌֚b; a◌〪◌𐽏◌̖◌֚b; ) LATIN SMALL LETTER A, SOGDIAN COMBINING RESH BELOW, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
+0061 059A 0316 302A 10F50 0062;0061 302A 0316 10F50 059A 0062;0061 302A 0316 10F50 059A 0062;0061 302A 0316 10F50 059A 0062;0061 302A 0316 10F50 059A 0062; # (a◌֚◌̖◌〪◌𐽐b; a◌〪◌̖◌𐽐◌֚b; a◌〪◌̖◌𐽐◌֚b; a◌〪◌̖◌𐽐◌֚b; a◌〪◌̖◌𐽐◌֚b; ) LATIN SMALL LETTER A, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, SOGDIAN COMBINING STROKE BELOW, LATIN SMALL LETTER B
+0061 10F50 059A 0316 302A 0062;0061 302A 10F50 0316 059A 0062;0061 302A 10F50 0316 059A 0062;0061 302A 10F50 0316 059A 0062;0061 302A 10F50 0316 059A 0062; # (a◌𐽐◌֚◌̖◌〪b; a◌〪◌𐽐◌̖◌֚b; a◌〪◌𐽐◌̖◌֚b; a◌〪◌𐽐◌̖◌֚b; a◌〪◌𐽐◌̖◌֚b; ) LATIN SMALL LETTER A, SOGDIAN COMBINING STROKE BELOW, HEBREW ACCENT YETIV, COMBINING GRAVE ACCENT BELOW, IDEOGRAPHIC LEVEL TONE MARK, LATIN SMALL LETTER B
 0061 05B0 094D 3099 11046 0062;0061 3099 094D 11046 05B0 0062;0061 3099 094D 11046 05B0 0062;0061 3099 094D 11046 05B0 0062;0061 3099 094D 11046 05B0 0062; # (a◌ְ◌्◌゙◌𑁆b; a◌゙◌्◌𑁆◌ְb; a◌゙◌्◌𑁆◌ְb; a◌゙◌्◌𑁆◌ְb; a◌゙◌्◌𑁆◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, BRAHMI VIRAMA, LATIN SMALL LETTER B
 0061 11046 05B0 094D 3099 0062;0061 3099 11046 094D 05B0 0062;0061 3099 11046 094D 05B0 0062;0061 3099 11046 094D 05B0 0062;0061 3099 11046 094D 05B0 0062; # (a◌𑁆◌ְ◌्◌゙b; a◌゙◌𑁆◌्◌ְb; a◌゙◌𑁆◌्◌ְb; a◌゙◌𑁆◌्◌ְb; a◌゙◌𑁆◌्◌ְb; ) LATIN SMALL LETTER A, BRAHMI VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
 0061 05B0 094D 3099 1107F 0062;0061 3099 094D 1107F 05B0 0062;0061 3099 094D 1107F 05B0 0062;0061 3099 094D 1107F 05B0 0062;0061 3099 094D 1107F 05B0 0062; # (a◌ְ◌्◌゙◌𑁿b; a◌゙◌्◌𑁿◌ְb; a◌゙◌्◌𑁿◌ְb; a◌゙◌्◌𑁿◌ְb; a◌゙◌्◌𑁿◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, BRAHMI NUMBER JOINER, LATIN SMALL LETTER B
@@ -18361,6 +18397,8 @@ FFEE;FFEE;FFEE;25CB;25CB; # (￮; ￮; ￮; ○; ○; ) HALFWIDTH WHITE CIRCLE
 0061 112E9 3099 093C 0334 0062;0061 0334 112E9 093C 3099 0062;0061 0334 112E9 093C 3099 0062;0061 0334 112E9 093C 3099 0062;0061 0334 112E9 093C 3099 0062; # (a◌𑋩◌゙◌़◌̴b; a◌̴◌𑋩◌़◌゙b; a◌̴◌𑋩◌़◌゙b; a◌̴◌𑋩◌़◌゙b; a◌̴◌𑋩◌़◌゙b; ) LATIN SMALL LETTER A, KHUDAWADI SIGN NUKTA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
 0061 05B0 094D 3099 112EA 0062;0061 3099 094D 112EA 05B0 0062;0061 3099 094D 112EA 05B0 0062;0061 3099 094D 112EA 05B0 0062;0061 3099 094D 112EA 05B0 0062; # (a◌ְ◌्◌゙◌𑋪b; a◌゙◌्◌𑋪◌ְb; a◌゙◌्◌𑋪◌ְb; a◌゙◌्◌𑋪◌ְb; a◌゙◌्◌𑋪◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, KHUDAWADI SIGN VIRAMA, LATIN SMALL LETTER B
 0061 112EA 05B0 094D 3099 0062;0061 3099 112EA 094D 05B0 0062;0061 3099 112EA 094D 05B0 0062;0061 3099 112EA 094D 05B0 0062;0061 3099 112EA 094D 05B0 0062; # (a◌𑋪◌ְ◌्◌゙b; a◌゙◌𑋪◌्◌ְb; a◌゙◌𑋪◌्◌ְb; a◌゙◌𑋪◌्◌ְb; a◌゙◌𑋪◌्◌ְb; ) LATIN SMALL LETTER A, KHUDAWADI SIGN VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
+0061 3099 093C 0334 1133B 0062;0061 0334 093C 1133B 3099 0062;0061 0334 093C 1133B 3099 0062;0061 0334 093C 1133B 3099 0062;0061 0334 093C 1133B 3099 0062; # (a◌゙◌़◌̴◌𑌻b; a◌̴◌़◌𑌻◌゙b; a◌̴◌़◌𑌻◌゙b; a◌̴◌़◌𑌻◌゙b; a◌̴◌़◌𑌻◌゙b; ) LATIN SMALL LETTER A, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, COMBINING BINDU BELOW, LATIN SMALL LETTER B
+0061 1133B 3099 093C 0334 0062;0061 0334 1133B 093C 3099 0062;0061 0334 1133B 093C 3099 0062;0061 0334 1133B 093C 3099 0062;0061 0334 1133B 093C 3099 0062; # (a◌𑌻◌゙◌़◌̴b; a◌̴◌𑌻◌़◌゙b; a◌̴◌𑌻◌़◌゙b; a◌̴◌𑌻◌़◌゙b; a◌̴◌𑌻◌़◌゙b; ) LATIN SMALL LETTER A, COMBINING BINDU BELOW, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
 0061 3099 093C 0334 1133C 0062;0061 0334 093C 1133C 3099 0062;0061 0334 093C 1133C 3099 0062;0061 0334 093C 1133C 3099 0062;0061 0334 093C 1133C 3099 0062; # (a◌゙◌़◌̴◌𑌼b; a◌̴◌़◌𑌼◌゙b; a◌̴◌़◌𑌼◌゙b; a◌̴◌़◌𑌼◌゙b; a◌̴◌़◌𑌼◌゙b; ) LATIN SMALL LETTER A, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, GRANTHA SIGN NUKTA, LATIN SMALL LETTER B
 0061 1133C 3099 093C 0334 0062;0061 0334 1133C 093C 3099 0062;0061 0334 1133C 093C 3099 0062;0061 0334 1133C 093C 3099 0062;0061 0334 1133C 093C 3099 0062; # (a◌𑌼◌゙◌़◌̴b; a◌̴◌𑌼◌़◌゙b; a◌̴◌𑌼◌़◌゙b; a◌̴◌𑌼◌़◌゙b; a◌̴◌𑌼◌़◌゙b; ) LATIN SMALL LETTER A, GRANTHA SIGN NUKTA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
 0061 05B0 094D 3099 1134D 0062;0061 3099 094D 1134D 05B0 0062;0061 3099 094D 1134D 05B0 0062;0061 3099 094D 1134D 05B0 0062;0061 3099 094D 1134D 05B0 0062; # (a◌ְ◌्◌゙𑍍b; a◌゙◌्𑍍◌ְb; a◌゙◌्𑍍◌ְb; a◌゙◌्𑍍◌ְb; a◌゙◌्𑍍◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, GRANTHA SIGN VIRAMA, LATIN SMALL LETTER B
@@ -18393,6 +18431,8 @@ FFEE;FFEE;FFEE;25CB;25CB; # (￮; ￮; ￮; ○; ○; ) HALFWIDTH WHITE CIRCLE
 0061 11442 05B0 094D 3099 0062;0061 3099 11442 094D 05B0 0062;0061 3099 11442 094D 05B0 0062;0061 3099 11442 094D 05B0 0062;0061 3099 11442 094D 05B0 0062; # (a◌𑑂◌ְ◌्◌゙b; a◌゙◌𑑂◌्◌ְb; a◌゙◌𑑂◌्◌ְb; a◌゙◌𑑂◌्◌ְb; a◌゙◌𑑂◌्◌ְb; ) LATIN SMALL LETTER A, NEWA SIGN VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
 0061 3099 093C 0334 11446 0062;0061 0334 093C 11446 3099 0062;0061 0334 093C 11446 3099 0062;0061 0334 093C 11446 3099 0062;0061 0334 093C 11446 3099 0062; # (a◌゙◌़◌̴◌𑑆b; a◌̴◌़◌𑑆◌゙b; a◌̴◌़◌𑑆◌゙b; a◌̴◌़◌𑑆◌゙b; a◌̴◌़◌𑑆◌゙b; ) LATIN SMALL LETTER A, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, NEWA SIGN NUKTA, LATIN SMALL LETTER B
 0061 11446 3099 093C 0334 0062;0061 0334 11446 093C 3099 0062;0061 0334 11446 093C 3099 0062;0061 0334 11446 093C 3099 0062;0061 0334 11446 093C 3099 0062; # (a◌𑑆◌゙◌़◌̴b; a◌̴◌𑑆◌़◌゙b; a◌̴◌𑑆◌़◌゙b; a◌̴◌𑑆◌़◌゙b; a◌̴◌𑑆◌़◌゙b; ) LATIN SMALL LETTER A, NEWA SIGN NUKTA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
+0061 0315 0300 05AE 1145E 0062;00E0 05AE 1145E 0315 0062;0061 05AE 0300 1145E 0315 0062;00E0 05AE 1145E 0315 0062;0061 05AE 0300 1145E 0315 0062; # (a◌̕◌̀◌֮◌𑑞b; à◌֮◌𑑞◌̕b; a◌֮◌̀◌𑑞◌̕b; à◌֮◌𑑞◌̕b; a◌֮◌̀◌𑑞◌̕b; ) LATIN SMALL LETTER A, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, NEWA SANDHI MARK, LATIN SMALL LETTER B
+0061 1145E 0315 0300 05AE 0062;0061 05AE 1145E 0300 0315 0062;0061 05AE 1145E 0300 0315 0062;0061 05AE 1145E 0300 0315 0062;0061 05AE 1145E 0300 0315 0062; # (a◌𑑞◌̕◌̀◌֮b; a◌֮◌𑑞◌̀◌̕b; a◌֮◌𑑞◌̀◌̕b; a◌֮◌𑑞◌̀◌̕b; a◌֮◌𑑞◌̀◌̕b; ) LATIN SMALL LETTER A, NEWA SANDHI MARK, COMBINING COMMA ABOVE RIGHT, COMBINING GRAVE ACCENT, HEBREW ACCENT ZINOR, LATIN SMALL LETTER B
 0061 05B0 094D 3099 114C2 0062;0061 3099 094D 114C2 05B0 0062;0061 3099 094D 114C2 05B0 0062;0061 3099 094D 114C2 05B0 0062;0061 3099 094D 114C2 05B0 0062; # (a◌ְ◌्◌゙◌𑓂b; a◌゙◌्◌𑓂◌ְb; a◌゙◌्◌𑓂◌ְb; a◌゙◌्◌𑓂◌ְb; a◌゙◌्◌𑓂◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, TIRHUTA SIGN VIRAMA, LATIN SMALL LETTER B
 0061 114C2 05B0 094D 3099 0062;0061 3099 114C2 094D 05B0 0062;0061 3099 114C2 094D 05B0 0062;0061 3099 114C2 094D 05B0 0062;0061 3099 114C2 094D 05B0 0062; # (a◌𑓂◌ְ◌्◌゙b; a◌゙◌𑓂◌्◌ְb; a◌゙◌𑓂◌्◌ְb; a◌゙◌𑓂◌्◌ְb; a◌゙◌𑓂◌्◌ְb; ) LATIN SMALL LETTER A, TIRHUTA SIGN VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
 0061 3099 093C 0334 114C3 0062;0061 0334 093C 114C3 3099 0062;0061 0334 093C 114C3 3099 0062;0061 0334 093C 114C3 3099 0062;0061 0334 093C 114C3 3099 0062; # (a◌゙◌़◌̴◌𑓃b; a◌̴◌़◌𑓃◌゙b; a◌̴◌़◌𑓃◌゙b; a◌̴◌़◌𑓃◌゙b; a◌̴◌़◌𑓃◌゙b; ) LATIN SMALL LETTER A, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, TIRHUTA SIGN NUKTA, LATIN SMALL LETTER B
@@ -18409,6 +18449,10 @@ FFEE;FFEE;FFEE;25CB;25CB; # (￮; ￮; ￮; ○; ○; ) HALFWIDTH WHITE CIRCLE
 0061 116B7 3099 093C 0334 0062;0061 0334 116B7 093C 3099 0062;0061 0334 116B7 093C 3099 0062;0061 0334 116B7 093C 3099 0062;0061 0334 116B7 093C 3099 0062; # (a◌𑚷◌゙◌़◌̴b; a◌̴◌𑚷◌़◌゙b; a◌̴◌𑚷◌़◌゙b; a◌̴◌𑚷◌़◌゙b; a◌̴◌𑚷◌़◌゙b; ) LATIN SMALL LETTER A, TAKRI SIGN NUKTA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
 0061 05B0 094D 3099 1172B 0062;0061 3099 094D 1172B 05B0 0062;0061 3099 094D 1172B 05B0 0062;0061 3099 094D 1172B 05B0 0062;0061 3099 094D 1172B 05B0 0062; # (a◌ְ◌्◌゙◌𑜫b; a◌゙◌्◌𑜫◌ְb; a◌゙◌्◌𑜫◌ְb; a◌゙◌्◌𑜫◌ְb; a◌゙◌्◌𑜫◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, AHOM SIGN KILLER, LATIN SMALL LETTER B
 0061 1172B 05B0 094D 3099 0062;0061 3099 1172B 094D 05B0 0062;0061 3099 1172B 094D 05B0 0062;0061 3099 1172B 094D 05B0 0062;0061 3099 1172B 094D 05B0 0062; # (a◌𑜫◌ְ◌्◌゙b; a◌゙◌𑜫◌्◌ְb; a◌゙◌𑜫◌्◌ְb; a◌゙◌𑜫◌्◌ְb; a◌゙◌𑜫◌्◌ְb; ) LATIN SMALL LETTER A, AHOM SIGN KILLER, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
+0061 05B0 094D 3099 11839 0062;0061 3099 094D 11839 05B0 0062;0061 3099 094D 11839 05B0 0062;0061 3099 094D 11839 05B0 0062;0061 3099 094D 11839 05B0 0062; # (a◌ְ◌्◌゙◌𑠹b; a◌゙◌्◌𑠹◌ְb; a◌゙◌्◌𑠹◌ְb; a◌゙◌्◌𑠹◌ְb; a◌゙◌्◌𑠹◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DOGRA SIGN VIRAMA, LATIN SMALL LETTER B
+0061 11839 05B0 094D 3099 0062;0061 3099 11839 094D 05B0 0062;0061 3099 11839 094D 05B0 0062;0061 3099 11839 094D 05B0 0062;0061 3099 11839 094D 05B0 0062; # (a◌𑠹◌ְ◌्◌゙b; a◌゙◌𑠹◌्◌ְb; a◌゙◌𑠹◌्◌ְb; a◌゙◌𑠹◌्◌ְb; a◌゙◌𑠹◌्◌ְb; ) LATIN SMALL LETTER A, DOGRA SIGN VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
+0061 3099 093C 0334 1183A 0062;0061 0334 093C 1183A 3099 0062;0061 0334 093C 1183A 3099 0062;0061 0334 093C 1183A 3099 0062;0061 0334 093C 1183A 3099 0062; # (a◌゙◌़◌̴◌𑠺b; a◌̴◌़◌𑠺◌゙b; a◌̴◌़◌𑠺◌゙b; a◌̴◌़◌𑠺◌゙b; a◌̴◌़◌𑠺◌゙b; ) LATIN SMALL LETTER A, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, DOGRA SIGN NUKTA, LATIN SMALL LETTER B
+0061 1183A 3099 093C 0334 0062;0061 0334 1183A 093C 3099 0062;0061 0334 1183A 093C 3099 0062;0061 0334 1183A 093C 3099 0062;0061 0334 1183A 093C 3099 0062; # (a◌𑠺◌゙◌़◌̴b; a◌̴◌𑠺◌़◌゙b; a◌̴◌𑠺◌़◌゙b; a◌̴◌𑠺◌़◌゙b; a◌̴◌𑠺◌़◌゙b; ) LATIN SMALL LETTER A, DOGRA SIGN NUKTA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
 0061 05B0 094D 3099 11A34 0062;0061 3099 094D 11A34 05B0 0062;0061 3099 094D 11A34 05B0 0062;0061 3099 094D 11A34 05B0 0062;0061 3099 094D 11A34 05B0 0062; # (a◌ְ◌्◌゙◌𑨴b; a◌゙◌्◌𑨴◌ְb; a◌゙◌्◌𑨴◌ְb; a◌゙◌्◌𑨴◌ְb; a◌゙◌्◌𑨴◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, ZANABAZAR SQUARE SIGN VIRAMA, LATIN SMALL LETTER B
 0061 11A34 05B0 094D 3099 0062;0061 3099 11A34 094D 05B0 0062;0061 3099 11A34 094D 05B0 0062;0061 3099 11A34 094D 05B0 0062;0061 3099 11A34 094D 05B0 0062; # (a◌𑨴◌ְ◌्◌゙b; a◌゙◌𑨴◌्◌ְb; a◌゙◌𑨴◌्◌ְb; a◌゙◌𑨴◌्◌ְb; a◌゙◌𑨴◌्◌ְb; ) LATIN SMALL LETTER A, ZANABAZAR SQUARE SIGN VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
 0061 05B0 094D 3099 11A47 0062;0061 3099 094D 11A47 05B0 0062;0061 3099 094D 11A47 05B0 0062;0061 3099 094D 11A47 05B0 0062;0061 3099 094D 11A47 05B0 0062; # (a◌ְ◌्◌゙◌𑩇b; a◌゙◌्◌𑩇◌ְb; a◌゙◌्◌𑩇◌ְb; a◌゙◌्◌𑩇◌ְb; a◌゙◌्◌𑩇◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, ZANABAZAR SQUARE SUBJOINER, LATIN SMALL LETTER B
@@ -18423,6 +18467,8 @@ FFEE;FFEE;FFEE;25CB;25CB; # (￮; ￮; ￮; ○; ○; ) HALFWIDTH WHITE CIRCLE
 0061 11D44 05B0 094D 3099 0062;0061 3099 11D44 094D 05B0 0062;0061 3099 11D44 094D 05B0 0062;0061 3099 11D44 094D 05B0 0062;0061 3099 11D44 094D 05B0 0062; # (a◌𑵄◌ְ◌्◌゙b; a◌゙◌𑵄◌्◌ְb; a◌゙◌𑵄◌्◌ְb; a◌゙◌𑵄◌्◌ְb; a◌゙◌𑵄◌्◌ְb; ) LATIN SMALL LETTER A, MASARAM GONDI SIGN HALANTA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
 0061 05B0 094D 3099 11D45 0062;0061 3099 094D 11D45 05B0 0062;0061 3099 094D 11D45 05B0 0062;0061 3099 094D 11D45 05B0 0062;0061 3099 094D 11D45 05B0 0062; # (a◌ְ◌्◌゙◌𑵅b; a◌゙◌्◌𑵅◌ְb; a◌゙◌्◌𑵅◌ְb; a◌゙◌्◌𑵅◌ְb; a◌゙◌्◌𑵅◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, MASARAM GONDI VIRAMA, LATIN SMALL LETTER B
 0061 11D45 05B0 094D 3099 0062;0061 3099 11D45 094D 05B0 0062;0061 3099 11D45 094D 05B0 0062;0061 3099 11D45 094D 05B0 0062;0061 3099 11D45 094D 05B0 0062; # (a◌𑵅◌ְ◌्◌゙b; a◌゙◌𑵅◌्◌ְb; a◌゙◌𑵅◌्◌ְb; a◌゙◌𑵅◌्◌ְb; a◌゙◌𑵅◌्◌ְb; ) LATIN SMALL LETTER A, MASARAM GONDI VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
+0061 05B0 094D 3099 11D97 0062;0061 3099 094D 11D97 05B0 0062;0061 3099 094D 11D97 05B0 0062;0061 3099 094D 11D97 05B0 0062;0061 3099 094D 11D97 05B0 0062; # (a◌ְ◌्◌゙◌𑶗b; a◌゙◌्◌𑶗◌ְb; a◌゙◌्◌𑶗◌ְb; a◌゙◌्◌𑶗◌ְb; a◌゙◌्◌𑶗◌ְb; ) LATIN SMALL LETTER A, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, GUNJALA GONDI VIRAMA, LATIN SMALL LETTER B
+0061 11D97 05B0 094D 3099 0062;0061 3099 11D97 094D 05B0 0062;0061 3099 11D97 094D 05B0 0062;0061 3099 11D97 094D 05B0 0062;0061 3099 11D97 094D 05B0 0062; # (a◌𑶗◌ְ◌्◌゙b; a◌゙◌𑶗◌्◌ְb; a◌゙◌𑶗◌्◌ְb; a◌゙◌𑶗◌्◌ְb; a◌゙◌𑶗◌्◌ְb; ) LATIN SMALL LETTER A, GUNJALA GONDI VIRAMA, HEBREW POINT SHEVA, DEVANAGARI SIGN VIRAMA, COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK, LATIN SMALL LETTER B
 0061 093C 0334 16AF0 0062;0061 0334 16AF0 093C 0062;0061 0334 16AF0 093C 0062;0061 0334 16AF0 093C 0062;0061 0334 16AF0 093C 0062; # (a◌़◌̴◌𖫰b; a◌̴◌𖫰◌़b; a◌̴◌𖫰◌़b; a◌̴◌𖫰◌़b; a◌̴◌𖫰◌़b; ) LATIN SMALL LETTER A, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, BASSA VAH COMBINING HIGH TONE, LATIN SMALL LETTER B
 0061 16AF0 093C 0334 0062;0061 16AF0 0334 093C 0062;0061 16AF0 0334 093C 0062;0061 16AF0 0334 093C 0062;0061 16AF0 0334 093C 0062; # (a◌𖫰◌़◌̴b; a◌𖫰◌̴◌़b; a◌𖫰◌̴◌़b; a◌𖫰◌̴◌़b; a◌𖫰◌̴◌़b; ) LATIN SMALL LETTER A, BASSA VAH COMBINING HIGH TONE, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, LATIN SMALL LETTER B
 0061 093C 0334 16AF1 0062;0061 0334 16AF1 093C 0062;0061 0334 16AF1 093C 0062;0061 0334 16AF1 093C 0062;0061 0334 16AF1 093C 0062; # (a◌़◌̴◌𖫱b; a◌̴◌𖫱◌़b; a◌̴◌𖫱◌़b; a◌̴◌𖫱◌़b; a◌̴◌𖫱◌़b; ) LATIN SMALL LETTER A, DEVANAGARI SIGN NUKTA, COMBINING TILDE OVERLAY, BASSA VAH COMBINING LOW TONE, LATIN SMALL LETTER B
diff --git a/lib/stdlib/test/uri_string_SUITE.erl b/lib/stdlib/test/uri_string_SUITE.erl
index 4fc0d76be8..ddaead9c7c 100644
--- a/lib/stdlib/test/uri_string_SUITE.erl
+++ b/lib/stdlib/test/uri_string_SUITE.erl
@@ -862,9 +862,11 @@ transcode_negative(_Config) ->
 compose_query(_Config) ->
     [] = uri_string:compose_query([]),
     "foo=1&bar=2" = uri_string:compose_query([{<<"foo">>,"1"}, {"bar", "2"}]),
+    "foo=1&bar" = uri_string:compose_query([{<<"foo">>,"1"}, {"bar", true}]),
     "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&b%E4r=2" = uri_string:compose_query([{"foo",true}, {"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}]),
@@ -906,11 +908,13 @@ dissect_query(_Config) ->
     [{"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>>).
+        uri_string:dissect_query(<<"föo+bar=1&%C3%B6=2"/utf8>>),
+    [{"foo1",true},{"bar","2"}] =
+        uri_string:dissect_query("foo1&bar=2"),
+    [{<<"foo1">>,<<"1">>},{<<"bar">>,true}] =
+        uri_string:dissect_query(<<"foo1=1&bar">>).
 
 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"),
diff --git a/lib/stdlib/uc_spec/CaseFolding.txt b/lib/stdlib/uc_spec/CaseFolding.txt
index efdf18e441..cce350f49c 100644
--- a/lib/stdlib/uc_spec/CaseFolding.txt
+++ b/lib/stdlib/uc_spec/CaseFolding.txt
@@ -1,6 +1,6 @@
-# CaseFolding-10.0.0.txt
-# Date: 2017-04-14, 05:40:18 GMT
-# © 2017 Unicode®, Inc.
+# CaseFolding-11.0.0.txt
+# Date: 2018-01-31, 08:20:09 GMT
+# © 2018 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
@@ -603,6 +603,52 @@
 1C86; C; 044A; # CYRILLIC SMALL LETTER TALL HARD SIGN
 1C87; C; 0463; # CYRILLIC SMALL LETTER TALL YAT
 1C88; C; A64B; # CYRILLIC SMALL LETTER UNBLENDED UK
+1C90; C; 10D0; # GEORGIAN MTAVRULI CAPITAL LETTER AN
+1C91; C; 10D1; # GEORGIAN MTAVRULI CAPITAL LETTER BAN
+1C92; C; 10D2; # GEORGIAN MTAVRULI CAPITAL LETTER GAN
+1C93; C; 10D3; # GEORGIAN MTAVRULI CAPITAL LETTER DON
+1C94; C; 10D4; # GEORGIAN MTAVRULI CAPITAL LETTER EN
+1C95; C; 10D5; # GEORGIAN MTAVRULI CAPITAL LETTER VIN
+1C96; C; 10D6; # GEORGIAN MTAVRULI CAPITAL LETTER ZEN
+1C97; C; 10D7; # GEORGIAN MTAVRULI CAPITAL LETTER TAN
+1C98; C; 10D8; # GEORGIAN MTAVRULI CAPITAL LETTER IN
+1C99; C; 10D9; # GEORGIAN MTAVRULI CAPITAL LETTER KAN
+1C9A; C; 10DA; # GEORGIAN MTAVRULI CAPITAL LETTER LAS
+1C9B; C; 10DB; # GEORGIAN MTAVRULI CAPITAL LETTER MAN
+1C9C; C; 10DC; # GEORGIAN MTAVRULI CAPITAL LETTER NAR
+1C9D; C; 10DD; # GEORGIAN MTAVRULI CAPITAL LETTER ON
+1C9E; C; 10DE; # GEORGIAN MTAVRULI CAPITAL LETTER PAR
+1C9F; C; 10DF; # GEORGIAN MTAVRULI CAPITAL LETTER ZHAR
+1CA0; C; 10E0; # GEORGIAN MTAVRULI CAPITAL LETTER RAE
+1CA1; C; 10E1; # GEORGIAN MTAVRULI CAPITAL LETTER SAN
+1CA2; C; 10E2; # GEORGIAN MTAVRULI CAPITAL LETTER TAR
+1CA3; C; 10E3; # GEORGIAN MTAVRULI CAPITAL LETTER UN
+1CA4; C; 10E4; # GEORGIAN MTAVRULI CAPITAL LETTER PHAR
+1CA5; C; 10E5; # GEORGIAN MTAVRULI CAPITAL LETTER KHAR
+1CA6; C; 10E6; # GEORGIAN MTAVRULI CAPITAL LETTER GHAN
+1CA7; C; 10E7; # GEORGIAN MTAVRULI CAPITAL LETTER QAR
+1CA8; C; 10E8; # GEORGIAN MTAVRULI CAPITAL LETTER SHIN
+1CA9; C; 10E9; # GEORGIAN MTAVRULI CAPITAL LETTER CHIN
+1CAA; C; 10EA; # GEORGIAN MTAVRULI CAPITAL LETTER CAN
+1CAB; C; 10EB; # GEORGIAN MTAVRULI CAPITAL LETTER JIL
+1CAC; C; 10EC; # GEORGIAN MTAVRULI CAPITAL LETTER CIL
+1CAD; C; 10ED; # GEORGIAN MTAVRULI CAPITAL LETTER CHAR
+1CAE; C; 10EE; # GEORGIAN MTAVRULI CAPITAL LETTER XAN
+1CAF; C; 10EF; # GEORGIAN MTAVRULI CAPITAL LETTER JHAN
+1CB0; C; 10F0; # GEORGIAN MTAVRULI CAPITAL LETTER HAE
+1CB1; C; 10F1; # GEORGIAN MTAVRULI CAPITAL LETTER HE
+1CB2; C; 10F2; # GEORGIAN MTAVRULI CAPITAL LETTER HIE
+1CB3; C; 10F3; # GEORGIAN MTAVRULI CAPITAL LETTER WE
+1CB4; C; 10F4; # GEORGIAN MTAVRULI CAPITAL LETTER HAR
+1CB5; C; 10F5; # GEORGIAN MTAVRULI CAPITAL LETTER HOE
+1CB6; C; 10F6; # GEORGIAN MTAVRULI CAPITAL LETTER FI
+1CB7; C; 10F7; # GEORGIAN MTAVRULI CAPITAL LETTER YN
+1CB8; C; 10F8; # GEORGIAN MTAVRULI CAPITAL LETTER ELIFI
+1CB9; C; 10F9; # GEORGIAN MTAVRULI CAPITAL LETTER TURNED GAN
+1CBA; C; 10FA; # GEORGIAN MTAVRULI CAPITAL LETTER AIN
+1CBD; C; 10FD; # GEORGIAN MTAVRULI CAPITAL LETTER AEN
+1CBE; C; 10FE; # GEORGIAN MTAVRULI CAPITAL LETTER HARD SIGN
+1CBF; C; 10FF; # GEORGIAN MTAVRULI CAPITAL LETTER LABIAL SIGN
 1E00; C; 1E01; # LATIN CAPITAL LETTER A WITH RING BELOW
 1E02; C; 1E03; # LATIN CAPITAL LETTER B WITH DOT ABOVE
 1E04; C; 1E05; # LATIN CAPITAL LETTER B WITH DOT BELOW
@@ -1180,6 +1226,7 @@ A7B2; C; 029D; # LATIN CAPITAL LETTER J WITH CROSSED-TAIL
 A7B3; C; AB53; # LATIN CAPITAL LETTER CHI
 A7B4; C; A7B5; # LATIN CAPITAL LETTER BETA
 A7B6; C; A7B7; # LATIN CAPITAL LETTER OMEGA
+A7B8; C; A7B9; # LATIN CAPITAL LETTER U WITH STROKE
 AB70; C; 13A0; # CHEROKEE SMALL LETTER A
 AB71; C; 13A1; # CHEROKEE SMALL LETTER E
 AB72; C; 13A2; # CHEROKEE SMALL LETTER I
@@ -1457,6 +1504,38 @@ FF3A; C; FF5A; # FULLWIDTH LATIN CAPITAL LETTER Z
 118BD; C; 118DD; # WARANG CITI CAPITAL LETTER SSUU
 118BE; C; 118DE; # WARANG CITI CAPITAL LETTER SII
 118BF; C; 118DF; # WARANG CITI CAPITAL LETTER VIYO
+16E40; C; 16E60; # MEDEFAIDRIN CAPITAL LETTER M
+16E41; C; 16E61; # MEDEFAIDRIN CAPITAL LETTER S
+16E42; C; 16E62; # MEDEFAIDRIN CAPITAL LETTER V
+16E43; C; 16E63; # MEDEFAIDRIN CAPITAL LETTER W
+16E44; C; 16E64; # MEDEFAIDRIN CAPITAL LETTER ATIU
+16E45; C; 16E65; # MEDEFAIDRIN CAPITAL LETTER Z
+16E46; C; 16E66; # MEDEFAIDRIN CAPITAL LETTER KP
+16E47; C; 16E67; # MEDEFAIDRIN CAPITAL LETTER P
+16E48; C; 16E68; # MEDEFAIDRIN CAPITAL LETTER T
+16E49; C; 16E69; # MEDEFAIDRIN CAPITAL LETTER G
+16E4A; C; 16E6A; # MEDEFAIDRIN CAPITAL LETTER F
+16E4B; C; 16E6B; # MEDEFAIDRIN CAPITAL LETTER I
+16E4C; C; 16E6C; # MEDEFAIDRIN CAPITAL LETTER K
+16E4D; C; 16E6D; # MEDEFAIDRIN CAPITAL LETTER A
+16E4E; C; 16E6E; # MEDEFAIDRIN CAPITAL LETTER J
+16E4F; C; 16E6F; # MEDEFAIDRIN CAPITAL LETTER E
+16E50; C; 16E70; # MEDEFAIDRIN CAPITAL LETTER B
+16E51; C; 16E71; # MEDEFAIDRIN CAPITAL LETTER C
+16E52; C; 16E72; # MEDEFAIDRIN CAPITAL LETTER U
+16E53; C; 16E73; # MEDEFAIDRIN CAPITAL LETTER YU
+16E54; C; 16E74; # MEDEFAIDRIN CAPITAL LETTER L
+16E55; C; 16E75; # MEDEFAIDRIN CAPITAL LETTER Q
+16E56; C; 16E76; # MEDEFAIDRIN CAPITAL LETTER HP
+16E57; C; 16E77; # MEDEFAIDRIN CAPITAL LETTER NY
+16E58; C; 16E78; # MEDEFAIDRIN CAPITAL LETTER X
+16E59; C; 16E79; # MEDEFAIDRIN CAPITAL LETTER D
+16E5A; C; 16E7A; # MEDEFAIDRIN CAPITAL LETTER OE
+16E5B; C; 16E7B; # MEDEFAIDRIN CAPITAL LETTER N
+16E5C; C; 16E7C; # MEDEFAIDRIN CAPITAL LETTER R
+16E5D; C; 16E7D; # MEDEFAIDRIN CAPITAL LETTER O
+16E5E; C; 16E7E; # MEDEFAIDRIN CAPITAL LETTER AI
+16E5F; C; 16E7F; # MEDEFAIDRIN CAPITAL LETTER Y
 1E900; C; 1E922; # ADLAM CAPITAL LETTER ALIF
 1E901; C; 1E923; # ADLAM CAPITAL LETTER DAALI
 1E902; C; 1E924; # ADLAM CAPITAL LETTER LAAM
diff --git a/lib/stdlib/uc_spec/CompositionExclusions.txt b/lib/stdlib/uc_spec/CompositionExclusions.txt
index ff42508686..ea63595bd3 100644
--- a/lib/stdlib/uc_spec/CompositionExclusions.txt
+++ b/lib/stdlib/uc_spec/CompositionExclusions.txt
@@ -1,5 +1,5 @@
-# CompositionExclusions-10.0.0.txt
-# Date: 2017-02-15, 00:00:00 GMT [KW, LI]
+# CompositionExclusions-11.0.0.txt
+# Date: 2017-12-06, 00:00:00 GMT [KW, LI]
 # © 2017 Unicode®, Inc.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
diff --git a/lib/stdlib/uc_spec/GraphemeBreakProperty.txt b/lib/stdlib/uc_spec/GraphemeBreakProperty.txt
index 32bb12e47e..52052e6e33 100644
--- a/lib/stdlib/uc_spec/GraphemeBreakProperty.txt
+++ b/lib/stdlib/uc_spec/GraphemeBreakProperty.txt
@@ -1,6 +1,6 @@
-# GraphemeBreakProperty-10.0.0.txt
-# Date: 2017-03-12, 07:03:41 GMT
-# © 2017 Unicode®, Inc.
+# GraphemeBreakProperty-11.0.0.txt
+# Date: 2018-03-16, 20:34:02 GMT
+# © 2018 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
@@ -24,12 +24,13 @@
 08E2          ; Prepend # Cf       ARABIC DISPUTED END OF AYAH
 0D4E          ; Prepend # Lo       MALAYALAM LETTER DOT REPH
 110BD         ; Prepend # Cf       KAITHI NUMBER SIGN
+110CD         ; Prepend # Cf       KAITHI NUMBER SIGN ABOVE
 111C2..111C3  ; Prepend # Lo   [2] SHARADA SIGN JIHVAMULIYA..SHARADA SIGN UPADHMANIYA
 11A3A         ; Prepend # Lo       ZANABAZAR SQUARE CLUSTER-INITIAL LETTER RA
 11A86..11A89  ; Prepend # Lo   [4] SOYOMBO CLUSTER-INITIAL LETTER RA..SOYOMBO CLUSTER-INITIAL LETTER SA
 11D46         ; Prepend # Lo       MASARAM GONDI REPHA
 
-# Total code points: 19
+# Total code points: 20
 
 # ================================================
 
@@ -95,12 +96,13 @@ E01F0..E0FFF  ; Control # Cn [3600] <reserved-E01F0>..<reserved-E0FFF>
 0730..074A    ; Extend # Mn  [27] SYRIAC PTHAHA ABOVE..SYRIAC BARREKH
 07A6..07B0    ; Extend # Mn  [11] THAANA ABAFILI..THAANA SUKUN
 07EB..07F3    ; Extend # Mn   [9] NKO COMBINING SHORT HIGH TONE..NKO COMBINING DOUBLE DOT ABOVE
+07FD          ; Extend # Mn       NKO DANTAYALAN
 0816..0819    ; Extend # Mn   [4] SAMARITAN MARK IN..SAMARITAN MARK DAGESH
 081B..0823    ; Extend # Mn   [9] SAMARITAN MARK EPENTHETIC YUT..SAMARITAN VOWEL SIGN A
 0825..0827    ; Extend # Mn   [3] SAMARITAN VOWEL SIGN SHORT A..SAMARITAN VOWEL SIGN U
 0829..082D    ; Extend # Mn   [5] SAMARITAN VOWEL SIGN LONG I..SAMARITAN MARK NEQUDAA
 0859..085B    ; Extend # Mn   [3] MANDAIC AFFRICATION MARK..MANDAIC GEMINATION MARK
-08D4..08E1    ; Extend # Mn  [14] ARABIC SMALL HIGH WORD AR-RUB..ARABIC SMALL HIGH SIGN SAFHA
+08D3..08E1    ; Extend # Mn  [15] ARABIC SMALL LOW WAW..ARABIC SMALL HIGH SIGN SAFHA
 08E3..0902    ; Extend # Mn  [32] ARABIC TURNED DAMMA BELOW..DEVANAGARI SIGN ANUSVARA
 093A          ; Extend # Mn       DEVANAGARI VOWEL SIGN OE
 093C          ; Extend # Mn       DEVANAGARI SIGN NUKTA
@@ -115,6 +117,7 @@ E01F0..E0FFF  ; Control # Cn [3600] <reserved-E01F0>..<reserved-E0FFF>
 09CD          ; Extend # Mn       BENGALI SIGN VIRAMA
 09D7          ; Extend # Mc       BENGALI AU LENGTH MARK
 09E2..09E3    ; Extend # Mn   [2] BENGALI VOWEL SIGN VOCALIC L..BENGALI VOWEL SIGN VOCALIC LL
+09FE          ; Extend # Mn       BENGALI SANDHI MARK
 0A01..0A02    ; Extend # Mn   [2] GURMUKHI SIGN ADAK BINDI..GURMUKHI SIGN BINDI
 0A3C          ; Extend # Mn       GURMUKHI SIGN NUKTA
 0A41..0A42    ; Extend # Mn   [2] GURMUKHI VOWEL SIGN U..GURMUKHI VOWEL SIGN UU
@@ -145,6 +148,7 @@ E01F0..E0FFF  ; Control # Cn [3600] <reserved-E01F0>..<reserved-E0FFF>
 0BCD          ; Extend # Mn       TAMIL SIGN VIRAMA
 0BD7          ; Extend # Mc       TAMIL AU LENGTH MARK
 0C00          ; Extend # Mn       TELUGU SIGN COMBINING CANDRABINDU ABOVE
+0C04          ; Extend # Mn       TELUGU SIGN COMBINING ANUSVARA ABOVE
 0C3E..0C40    ; Extend # Mn   [3] TELUGU VOWEL SIGN AA..TELUGU VOWEL SIGN II
 0C46..0C48    ; Extend # Mn   [3] TELUGU VOWEL SIGN E..TELUGU VOWEL SIGN AI
 0C4A..0C4D    ; Extend # Mn   [4] TELUGU VOWEL SIGN O..TELUGU SIGN VIRAMA
@@ -273,6 +277,7 @@ A80B          ; Extend # Mn       SYLOTI NAGRI SIGN ANUSVARA
 A825..A826    ; Extend # Mn   [2] SYLOTI NAGRI VOWEL SIGN U..SYLOTI NAGRI VOWEL SIGN E
 A8C4..A8C5    ; Extend # Mn   [2] SAURASHTRA SIGN VIRAMA..SAURASHTRA SIGN CANDRABINDU
 A8E0..A8F1    ; Extend # Mn  [18] COMBINING DEVANAGARI DIGIT ZERO..COMBINING DEVANAGARI SIGN AVAGRAHA
+A8FF          ; Extend # Mn       DEVANAGARI VOWEL SIGN AY
 A926..A92D    ; Extend # Mn   [8] KAYAH LI VOWEL UE..KAYAH LI TONE CALYA PLOPHU
 A947..A951    ; Extend # Mn  [11] REJANG VOWEL SIGN I..REJANG CONSONANT SIGN R
 A980..A982    ; Extend # Mn   [3] JAVANESE SIGN PANYANGGA..JAVANESE SIGN LAYAR
@@ -309,6 +314,8 @@ FF9E..FF9F    ; Extend # Lm   [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT
 10A38..10A3A  ; Extend # Mn   [3] KHAROSHTHI SIGN BAR ABOVE..KHAROSHTHI SIGN DOT BELOW
 10A3F         ; Extend # Mn       KHAROSHTHI VIRAMA
 10AE5..10AE6  ; Extend # Mn   [2] MANICHAEAN ABBREVIATION MARK ABOVE..MANICHAEAN ABBREVIATION MARK BELOW
+10D24..10D27  ; Extend # Mn   [4] HANIFI ROHINGYA SIGN HARBAHAY..HANIFI ROHINGYA SIGN TASSI
+10F46..10F50  ; Extend # Mn  [11] SOGDIAN COMBINING DOT BELOW..SOGDIAN COMBINING STROKE BELOW
 11001         ; Extend # Mn       BRAHMI SIGN ANUSVARA
 11038..11046  ; Extend # Mn  [15] BRAHMI VOWEL SIGN AA..BRAHMI VIRAMA
 1107F..11081  ; Extend # Mn   [3] BRAHMI NUMBER JOINER..KAITHI SIGN ANUSVARA
@@ -320,7 +327,7 @@ FF9E..FF9F    ; Extend # Lm   [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT
 11173         ; Extend # Mn       MAHAJANI SIGN NUKTA
 11180..11181  ; Extend # Mn   [2] SHARADA SIGN CANDRABINDU..SHARADA SIGN ANUSVARA
 111B6..111BE  ; Extend # Mn   [9] SHARADA VOWEL SIGN U..SHARADA VOWEL SIGN O
-111CA..111CC  ; Extend # Mn   [3] SHARADA SIGN NUKTA..SHARADA EXTRA SHORT VOWEL MARK
+111C9..111CC  ; Extend # Mn   [4] SHARADA SANDHI MARK..SHARADA EXTRA SHORT VOWEL MARK
 1122F..11231  ; Extend # Mn   [3] KHOJKI VOWEL SIGN U..KHOJKI VOWEL SIGN AI
 11234         ; Extend # Mn       KHOJKI SIGN ANUSVARA
 11236..11237  ; Extend # Mn   [2] KHOJKI SIGN NUKTA..KHOJKI SIGN SHADDA
@@ -328,7 +335,7 @@ FF9E..FF9F    ; Extend # Lm   [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT
 112DF         ; Extend # Mn       KHUDAWADI SIGN ANUSVARA
 112E3..112EA  ; Extend # Mn   [8] KHUDAWADI VOWEL SIGN U..KHUDAWADI SIGN VIRAMA
 11300..11301  ; Extend # Mn   [2] GRANTHA SIGN COMBINING ANUSVARA ABOVE..GRANTHA SIGN CANDRABINDU
-1133C         ; Extend # Mn       GRANTHA SIGN NUKTA
+1133B..1133C  ; Extend # Mn   [2] COMBINING BINDU BELOW..GRANTHA SIGN NUKTA
 1133E         ; Extend # Mc       GRANTHA VOWEL SIGN AA
 11340         ; Extend # Mn       GRANTHA VOWEL SIGN II
 11357         ; Extend # Mc       GRANTHA AU LENGTH MARK
@@ -337,6 +344,7 @@ FF9E..FF9F    ; Extend # Lm   [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT
 11438..1143F  ; Extend # Mn   [8] NEWA VOWEL SIGN U..NEWA VOWEL SIGN AI
 11442..11444  ; Extend # Mn   [3] NEWA SIGN VIRAMA..NEWA SIGN ANUSVARA
 11446         ; Extend # Mn       NEWA SIGN NUKTA
+1145E         ; Extend # Mn       NEWA SANDHI MARK
 114B0         ; Extend # Mc       TIRHUTA VOWEL SIGN AA
 114B3..114B8  ; Extend # Mn   [6] TIRHUTA VOWEL SIGN U..TIRHUTA VOWEL SIGN VOCALIC LL
 114BA         ; Extend # Mn       TIRHUTA VOWEL SIGN SHORT E
@@ -358,8 +366,9 @@ FF9E..FF9F    ; Extend # Lm   [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT
 1171D..1171F  ; Extend # Mn   [3] AHOM CONSONANT SIGN MEDIAL LA..AHOM CONSONANT SIGN MEDIAL LIGATING RA
 11722..11725  ; Extend # Mn   [4] AHOM VOWEL SIGN I..AHOM VOWEL SIGN UU
 11727..1172B  ; Extend # Mn   [5] AHOM VOWEL SIGN AW..AHOM SIGN KILLER
-11A01..11A06  ; Extend # Mn   [6] ZANABAZAR SQUARE VOWEL SIGN I..ZANABAZAR SQUARE VOWEL SIGN O
-11A09..11A0A  ; Extend # Mn   [2] ZANABAZAR SQUARE VOWEL SIGN REVERSED I..ZANABAZAR SQUARE VOWEL LENGTH MARK
+1182F..11837  ; Extend # Mn   [9] DOGRA VOWEL SIGN U..DOGRA SIGN ANUSVARA
+11839..1183A  ; Extend # Mn   [2] DOGRA SIGN VIRAMA..DOGRA SIGN NUKTA
+11A01..11A0A  ; Extend # Mn  [10] ZANABAZAR SQUARE VOWEL SIGN I..ZANABAZAR SQUARE VOWEL LENGTH MARK
 11A33..11A38  ; Extend # Mn   [6] ZANABAZAR SQUARE FINAL CONSONANT MARK..ZANABAZAR SQUARE SIGN ANUSVARA
 11A3B..11A3E  ; Extend # Mn   [4] ZANABAZAR SQUARE CLUSTER-FINAL LETTER YA..ZANABAZAR SQUARE CLUSTER-FINAL LETTER VA
 11A47         ; Extend # Mn       ZANABAZAR SQUARE SUBJOINER
@@ -379,6 +388,10 @@ FF9E..FF9F    ; Extend # Lm   [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT
 11D3C..11D3D  ; Extend # Mn   [2] MASARAM GONDI VOWEL SIGN AI..MASARAM GONDI VOWEL SIGN O
 11D3F..11D45  ; Extend # Mn   [7] MASARAM GONDI VOWEL SIGN AU..MASARAM GONDI VIRAMA
 11D47         ; Extend # Mn       MASARAM GONDI RA-KARA
+11D90..11D91  ; Extend # Mn   [2] GUNJALA GONDI VOWEL SIGN EE..GUNJALA GONDI VOWEL SIGN AI
+11D95         ; Extend # Mn       GUNJALA GONDI SIGN ANUSVARA
+11D97         ; Extend # Mn       GUNJALA GONDI VIRAMA
+11EF3..11EF4  ; Extend # Mn   [2] MAKASAR VOWEL SIGN I..MAKASAR VOWEL SIGN U
 16AF0..16AF4  ; Extend # Mn   [5] BASSA VAH COMBINING HIGH TONE..BASSA VAH COMBINING HIGH-LOW TONE
 16B30..16B36  ; Extend # Mn   [7] PAHAWH HMONG MARK CIM TUB..PAHAWH HMONG MARK CIM TAUM
 16F8F..16F92  ; Extend # Mn   [4] MIAO TONE RIGHT..MIAO TONE BELOW
@@ -403,10 +416,11 @@ FF9E..FF9F    ; Extend # Lm   [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT
 1E026..1E02A  ; Extend # Mn   [5] COMBINING GLAGOLITIC LETTER YO..COMBINING GLAGOLITIC LETTER FITA
 1E8D0..1E8D6  ; Extend # Mn   [7] MENDE KIKAKUI COMBINING NUMBER TEENS..MENDE KIKAKUI COMBINING NUMBER MILLIONS
 1E944..1E94A  ; Extend # Mn   [7] ADLAM ALIF LENGTHENER..ADLAM NUKTA
+1F3FB..1F3FF  ; Extend # Sk   [5] EMOJI MODIFIER FITZPATRICK TYPE-1-2..EMOJI MODIFIER FITZPATRICK TYPE-6
 E0020..E007F  ; Extend # Cf  [96] TAG SPACE..CANCEL TAG
 E0100..E01EF  ; Extend # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256
 
-# Total code points: 1901
+# Total code points: 1948
 
 # ================================================
 
@@ -517,6 +531,7 @@ ABEC          ; SpacingMark # Mc       MEETEI MAYEK LUM IYEK
 110B0..110B2  ; SpacingMark # Mc   [3] KAITHI VOWEL SIGN AA..KAITHI VOWEL SIGN II
 110B7..110B8  ; SpacingMark # Mc   [2] KAITHI VOWEL SIGN O..KAITHI VOWEL SIGN AU
 1112C         ; SpacingMark # Mc       CHAKMA VOWEL SIGN E
+11145..11146  ; SpacingMark # Mc   [2] CHAKMA VOWEL SIGN AA..CHAKMA VOWEL SIGN EI
 11182         ; SpacingMark # Mc       SHARADA SIGN VISARGA
 111B3..111B5  ; SpacingMark # Mc   [3] SHARADA VOWEL SIGN AA..SHARADA VOWEL SIGN II
 111BF..111C0  ; SpacingMark # Mc   [2] SHARADA VOWEL SIGN AU..SHARADA SIGN VIRAMA
@@ -549,7 +564,8 @@ ABEC          ; SpacingMark # Mc       MEETEI MAYEK LUM IYEK
 116B6         ; SpacingMark # Mc       TAKRI SIGN VIRAMA
 11720..11721  ; SpacingMark # Mc   [2] AHOM VOWEL SIGN A..AHOM VOWEL SIGN AA
 11726         ; SpacingMark # Mc       AHOM VOWEL SIGN E
-11A07..11A08  ; SpacingMark # Mc   [2] ZANABAZAR SQUARE VOWEL SIGN AI..ZANABAZAR SQUARE VOWEL SIGN AU
+1182C..1182E  ; SpacingMark # Mc   [3] DOGRA VOWEL SIGN AA..DOGRA VOWEL SIGN II
+11838         ; SpacingMark # Mc       DOGRA SIGN VISARGA
 11A39         ; SpacingMark # Mc       ZANABAZAR SQUARE SIGN VISARGA
 11A57..11A58  ; SpacingMark # Mc   [2] SOYOMBO VOWEL SIGN AI..SOYOMBO VOWEL SIGN AU
 11A97         ; SpacingMark # Mc       SOYOMBO SIGN VISARGA
@@ -558,11 +574,15 @@ ABEC          ; SpacingMark # Mc       MEETEI MAYEK LUM IYEK
 11CA9         ; SpacingMark # Mc       MARCHEN SUBJOINED LETTER YA
 11CB1         ; SpacingMark # Mc       MARCHEN VOWEL SIGN I
 11CB4         ; SpacingMark # Mc       MARCHEN VOWEL SIGN O
+11D8A..11D8E  ; SpacingMark # Mc   [5] GUNJALA GONDI VOWEL SIGN AA..GUNJALA GONDI VOWEL SIGN UU
+11D93..11D94  ; SpacingMark # Mc   [2] GUNJALA GONDI VOWEL SIGN OO..GUNJALA GONDI VOWEL SIGN AU
+11D96         ; SpacingMark # Mc       GUNJALA GONDI SIGN VISARGA
+11EF5..11EF6  ; SpacingMark # Mc   [2] MAKASAR VOWEL SIGN E..MAKASAR VOWEL SIGN O
 16F51..16F7E  ; SpacingMark # Mc  [46] MIAO SIGN ASPIRATION..MIAO VOWEL SIGN NG
 1D166         ; SpacingMark # Mc       MUSICAL SYMBOL COMBINING SPRECHGESANG STEM
 1D16D         ; SpacingMark # Mc       MUSICAL SYMBOL COMBINING AUGMENTATION DOT
 
-# Total code points: 348
+# Total code points: 362
 
 # ================================================
 
@@ -1395,81 +1415,8 @@ D789..D7A3    ; LVT # Lo  [27] HANGUL SYLLABLE HIG..HANGUL SYLLABLE HIH
 
 # ================================================
 
-261D          ; E_Base # So       WHITE UP POINTING INDEX
-26F9          ; E_Base # So       PERSON WITH BALL
-270A..270D    ; E_Base # So   [4] RAISED FIST..WRITING HAND
-1F385         ; E_Base # So       FATHER CHRISTMAS
-1F3C2..1F3C4  ; E_Base # So   [3] SNOWBOARDER..SURFER
-1F3C7         ; E_Base # So       HORSE RACING
-1F3CA..1F3CC  ; E_Base # So   [3] SWIMMER..GOLFER
-1F442..1F443  ; E_Base # So   [2] EAR..NOSE
-1F446..1F450  ; E_Base # So  [11] WHITE UP POINTING BACKHAND INDEX..OPEN HANDS SIGN
-1F46E         ; E_Base # So       POLICE OFFICER
-1F470..1F478  ; E_Base # So   [9] BRIDE WITH VEIL..PRINCESS
-1F47C         ; E_Base # So       BABY ANGEL
-1F481..1F483  ; E_Base # So   [3] INFORMATION DESK PERSON..DANCER
-1F485..1F487  ; E_Base # So   [3] NAIL POLISH..HAIRCUT
-1F4AA         ; E_Base # So       FLEXED BICEPS
-1F574..1F575  ; E_Base # So   [2] MAN IN BUSINESS SUIT LEVITATING..SLEUTH OR SPY
-1F57A         ; E_Base # So       MAN DANCING
-1F590         ; E_Base # So       RAISED HAND WITH FINGERS SPLAYED
-1F595..1F596  ; E_Base # So   [2] REVERSED HAND WITH MIDDLE FINGER EXTENDED..RAISED HAND WITH PART BETWEEN MIDDLE AND RING FINGERS
-1F645..1F647  ; E_Base # So   [3] FACE WITH NO GOOD GESTURE..PERSON BOWING DEEPLY
-1F64B..1F64F  ; E_Base # So   [5] HAPPY PERSON RAISING ONE HAND..PERSON WITH FOLDED HANDS
-1F6A3         ; E_Base # So       ROWBOAT
-1F6B4..1F6B6  ; E_Base # So   [3] BICYCLIST..PEDESTRIAN
-1F6C0         ; E_Base # So       BATH
-1F6CC         ; E_Base # So       SLEEPING ACCOMMODATION
-1F918..1F91C  ; E_Base # So   [5] SIGN OF THE HORNS..RIGHT-FACING FIST
-1F91E..1F91F  ; E_Base # So   [2] HAND WITH INDEX AND MIDDLE FINGERS CROSSED..I LOVE YOU HAND SIGN
-1F926         ; E_Base # So       FACE PALM
-1F930..1F939  ; E_Base # So  [10] PREGNANT WOMAN..JUGGLING
-1F93D..1F93E  ; E_Base # So   [2] WATER POLO..HANDBALL
-1F9D1..1F9DD  ; E_Base # So  [13] ADULT..ELF
-
-# Total code points: 98
-
-# ================================================
-
-1F3FB..1F3FF  ; E_Modifier # Sk   [5] EMOJI MODIFIER FITZPATRICK TYPE-1-2..EMOJI MODIFIER FITZPATRICK TYPE-6
-
-# Total code points: 5
-
-# ================================================
-
 200D          ; ZWJ # Cf       ZERO WIDTH JOINER
 
 # Total code points: 1
 
-# ================================================
-
-2640          ; Glue_After_Zwj # So       FEMALE SIGN
-2642          ; Glue_After_Zwj # So       MALE SIGN
-2695..2696    ; Glue_After_Zwj # So   [2] STAFF OF AESCULAPIUS..SCALES
-2708          ; Glue_After_Zwj # So       AIRPLANE
-2764          ; Glue_After_Zwj # So       HEAVY BLACK HEART
-1F308         ; Glue_After_Zwj # So       RAINBOW
-1F33E         ; Glue_After_Zwj # So       EAR OF RICE
-1F373         ; Glue_After_Zwj # So       COOKING
-1F393         ; Glue_After_Zwj # So       GRADUATION CAP
-1F3A4         ; Glue_After_Zwj # So       MICROPHONE
-1F3A8         ; Glue_After_Zwj # So       ARTIST PALETTE
-1F3EB         ; Glue_After_Zwj # So       SCHOOL
-1F3ED         ; Glue_After_Zwj # So       FACTORY
-1F48B         ; Glue_After_Zwj # So       KISS MARK
-1F4BB..1F4BC  ; Glue_After_Zwj # So   [2] PERSONAL COMPUTER..BRIEFCASE
-1F527         ; Glue_After_Zwj # So       WRENCH
-1F52C         ; Glue_After_Zwj # So       MICROSCOPE
-1F5E8         ; Glue_After_Zwj # So       LEFT SPEECH BUBBLE
-1F680         ; Glue_After_Zwj # So       ROCKET
-1F692         ; Glue_After_Zwj # So       FIRE ENGINE
-
-# Total code points: 22
-
-# ================================================
-
-1F466..1F469  ; E_Base_GAZ # So   [4] BOY..WOMAN
-
-# Total code points: 4
-
 # EOF
diff --git a/lib/stdlib/uc_spec/PropList.txt b/lib/stdlib/uc_spec/PropList.txt
index 9a2d0e4b1c..ef86795abe 100644
--- a/lib/stdlib/uc_spec/PropList.txt
+++ b/lib/stdlib/uc_spec/PropList.txt
@@ -1,6 +1,6 @@
-# PropList-10.0.0.txt
-# Date: 2017-03-10, 08:25:30 GMT
-# © 2017 Unicode®, Inc.
+# PropList-11.0.0.txt
+# Date: 2018-03-15, 04:28:35 GMT
+# © 2018 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
@@ -125,7 +125,7 @@ FF63          ; Quotation_Mark # Pe       HALFWIDTH RIGHT CORNER BRACKET
 05C3          ; Terminal_Punctuation # Po       HEBREW PUNCTUATION SOF PASUQ
 060C          ; Terminal_Punctuation # Po       ARABIC COMMA
 061B          ; Terminal_Punctuation # Po       ARABIC SEMICOLON
-061F          ; Terminal_Punctuation # Po       ARABIC QUESTION MARK
+061E..061F    ; Terminal_Punctuation # Po   [2] ARABIC TRIPLE DOT PUNCTUATION MARK..ARABIC QUESTION MARK
 06D4          ; Terminal_Punctuation # Po       ARABIC FULL STOP
 0700..070A    ; Terminal_Punctuation # Po  [11] SYRIAC END OF PARAGRAPH..SYRIAC CONTRACTION
 070C          ; Terminal_Punctuation # Po       SYRIAC HARKLEAN METOBELUS
@@ -156,6 +156,8 @@ FF63          ; Quotation_Mark # Pe       HALFWIDTH RIGHT CORNER BRACKET
 2E2E          ; Terminal_Punctuation # Po       REVERSED QUESTION MARK
 2E3C          ; Terminal_Punctuation # Po       STENOGRAPHIC FULL STOP
 2E41          ; Terminal_Punctuation # Po       REVERSED COMMA
+2E4C          ; Terminal_Punctuation # Po       MEDIEVAL COMMA
+2E4E          ; Terminal_Punctuation # Po       PUNCTUS ELEVATUS MARK
 3001..3002    ; Terminal_Punctuation # Po   [2] IDEOGRAPHIC COMMA..IDEOGRAPHIC FULL STOP
 A4FE..A4FF    ; Terminal_Punctuation # Po   [2] LISU PUNCTUATION COMMA..LISU PUNCTUATION FULL STOP
 A60D..A60F    ; Terminal_Punctuation # Po   [3] VAI COMMA..VAI QUESTION MARK
@@ -185,6 +187,7 @@ FF64          ; Terminal_Punctuation # Po       HALFWIDTH IDEOGRAPHIC COMMA
 10AF0..10AF5  ; Terminal_Punctuation # Po   [6] MANICHAEAN PUNCTUATION STAR..MANICHAEAN PUNCTUATION TWO DOTS
 10B3A..10B3F  ; Terminal_Punctuation # Po   [6] TINY TWO DOTS OVER ONE DOT PUNCTUATION..LARGE ONE RING OVER TWO RINGS PUNCTUATION
 10B99..10B9C  ; Terminal_Punctuation # Po   [4] PSALTER PAHLAVI SECTION MARK..PSALTER PAHLAVI FOUR DOTS WITH DOT
+10F55..10F59  ; Terminal_Punctuation # Po   [5] SOGDIAN PUNCTUATION TWO VERTICAL BARS..SOGDIAN PUNCTUATION HALF CIRCLE WITH DOT
 11047..1104D  ; Terminal_Punctuation # Po   [7] BRAHMI DANDA..BRAHMI PUNCTUATION LOTUS
 110BE..110C1  ; Terminal_Punctuation # Po   [4] KAITHI SECTION MARK..KAITHI DOUBLE DANDA
 11141..11143  ; Terminal_Punctuation # Po   [3] CHAKMA DANDA..CHAKMA QUESTION MARK
@@ -204,15 +207,17 @@ FF64          ; Terminal_Punctuation # Po       HALFWIDTH IDEOGRAPHIC COMMA
 11AA1..11AA2  ; Terminal_Punctuation # Po   [2] SOYOMBO TERMINAL MARK-1..SOYOMBO TERMINAL MARK-2
 11C41..11C43  ; Terminal_Punctuation # Po   [3] BHAIKSUKI DANDA..BHAIKSUKI WORD SEPARATOR
 11C71         ; Terminal_Punctuation # Po       MARCHEN MARK SHAD
+11EF7..11EF8  ; Terminal_Punctuation # Po   [2] MAKASAR PASSIMBANG..MAKASAR END OF SECTION
 12470..12474  ; Terminal_Punctuation # Po   [5] CUNEIFORM PUNCTUATION SIGN OLD ASSYRIAN WORD DIVIDER..CUNEIFORM PUNCTUATION SIGN DIAGONAL QUADCOLON
 16A6E..16A6F  ; Terminal_Punctuation # Po   [2] MRO DANDA..MRO DOUBLE DANDA
 16AF5         ; Terminal_Punctuation # Po       BASSA VAH FULL STOP
 16B37..16B39  ; Terminal_Punctuation # Po   [3] PAHAWH HMONG SIGN VOS THOM..PAHAWH HMONG SIGN CIM CHEEM
 16B44         ; Terminal_Punctuation # Po       PAHAWH HMONG SIGN XAUS
+16E97..16E98  ; Terminal_Punctuation # Po   [2] MEDEFAIDRIN COMMA..MEDEFAIDRIN FULL STOP
 1BC9F         ; Terminal_Punctuation # Po       DUPLOYAN PUNCTUATION CHINOOK FULL STOP
 1DA87..1DA8A  ; Terminal_Punctuation # Po   [4] SIGNWRITING COMMA..SIGNWRITING COLON
 
-# Total code points: 252
+# Total code points: 264
 
 # ================================================
 
@@ -661,6 +666,7 @@ FB1E          ; Other_Alphabetic # Mn       HEBREW POINT JUDEO-SPANISH VARIKA
 10A01..10A03  ; Other_Alphabetic # Mn   [3] KHAROSHTHI VOWEL SIGN I..KHAROSHTHI VOWEL SIGN VOCALIC R
 10A05..10A06  ; Other_Alphabetic # Mn   [2] KHAROSHTHI VOWEL SIGN E..KHAROSHTHI VOWEL SIGN O
 10A0C..10A0F  ; Other_Alphabetic # Mn   [4] KHAROSHTHI VOWEL LENGTH MARK..KHAROSHTHI SIGN VISARGA
+10D24..10D27  ; Other_Alphabetic # Mn   [4] HANIFI ROHINGYA SIGN HARBAHAY..HANIFI ROHINGYA SIGN TASSI
 11000         ; Other_Alphabetic # Mc       BRAHMI SIGN CANDRABINDU
 11001         ; Other_Alphabetic # Mn       BRAHMI SIGN ANUSVARA
 11002         ; Other_Alphabetic # Mc       BRAHMI SIGN VISARGA
@@ -673,6 +679,7 @@ FB1E          ; Other_Alphabetic # Mn       HEBREW POINT JUDEO-SPANISH VARIKA
 11127..1112B  ; Other_Alphabetic # Mn   [5] CHAKMA VOWEL SIGN A..CHAKMA VOWEL SIGN UU
 1112C         ; Other_Alphabetic # Mc       CHAKMA VOWEL SIGN E
 1112D..11132  ; Other_Alphabetic # Mn   [6] CHAKMA VOWEL SIGN AI..CHAKMA AU MARK
+11145..11146  ; Other_Alphabetic # Mc   [2] CHAKMA VOWEL SIGN AA..CHAKMA VOWEL SIGN EI
 11180..11181  ; Other_Alphabetic # Mn   [2] SHARADA SIGN CANDRABINDU..SHARADA SIGN ANUSVARA
 11182         ; Other_Alphabetic # Mc       SHARADA SIGN VISARGA
 111B3..111B5  ; Other_Alphabetic # Mc   [3] SHARADA VOWEL SIGN AA..SHARADA VOWEL SIGN II
@@ -730,9 +737,10 @@ FB1E          ; Other_Alphabetic # Mn       HEBREW POINT JUDEO-SPANISH VARIKA
 11722..11725  ; Other_Alphabetic # Mn   [4] AHOM VOWEL SIGN I..AHOM VOWEL SIGN UU
 11726         ; Other_Alphabetic # Mc       AHOM VOWEL SIGN E
 11727..1172A  ; Other_Alphabetic # Mn   [4] AHOM VOWEL SIGN AW..AHOM VOWEL SIGN AM
-11A01..11A06  ; Other_Alphabetic # Mn   [6] ZANABAZAR SQUARE VOWEL SIGN I..ZANABAZAR SQUARE VOWEL SIGN O
-11A07..11A08  ; Other_Alphabetic # Mc   [2] ZANABAZAR SQUARE VOWEL SIGN AI..ZANABAZAR SQUARE VOWEL SIGN AU
-11A09..11A0A  ; Other_Alphabetic # Mn   [2] ZANABAZAR SQUARE VOWEL SIGN REVERSED I..ZANABAZAR SQUARE VOWEL LENGTH MARK
+1182C..1182E  ; Other_Alphabetic # Mc   [3] DOGRA VOWEL SIGN AA..DOGRA VOWEL SIGN II
+1182F..11837  ; Other_Alphabetic # Mn   [9] DOGRA VOWEL SIGN U..DOGRA SIGN ANUSVARA
+11838         ; Other_Alphabetic # Mc       DOGRA SIGN VISARGA
+11A01..11A0A  ; Other_Alphabetic # Mn  [10] ZANABAZAR SQUARE VOWEL SIGN I..ZANABAZAR SQUARE VOWEL LENGTH MARK
 11A35..11A38  ; Other_Alphabetic # Mn   [4] ZANABAZAR SQUARE SIGN CANDRABINDU..ZANABAZAR SQUARE SIGN ANUSVARA
 11A39         ; Other_Alphabetic # Mc       ZANABAZAR SQUARE SIGN VISARGA
 11A3B..11A3E  ; Other_Alphabetic # Mn   [4] ZANABAZAR SQUARE CLUSTER-FINAL LETTER YA..ZANABAZAR SQUARE CLUSTER-FINAL LETTER VA
@@ -758,6 +766,13 @@ FB1E          ; Other_Alphabetic # Mn       HEBREW POINT JUDEO-SPANISH VARIKA
 11D3F..11D41  ; Other_Alphabetic # Mn   [3] MASARAM GONDI VOWEL SIGN AU..MASARAM GONDI SIGN VISARGA
 11D43         ; Other_Alphabetic # Mn       MASARAM GONDI SIGN CANDRA
 11D47         ; Other_Alphabetic # Mn       MASARAM GONDI RA-KARA
+11D8A..11D8E  ; Other_Alphabetic # Mc   [5] GUNJALA GONDI VOWEL SIGN AA..GUNJALA GONDI VOWEL SIGN UU
+11D90..11D91  ; Other_Alphabetic # Mn   [2] GUNJALA GONDI VOWEL SIGN EE..GUNJALA GONDI VOWEL SIGN AI
+11D93..11D94  ; Other_Alphabetic # Mc   [2] GUNJALA GONDI VOWEL SIGN OO..GUNJALA GONDI VOWEL SIGN AU
+11D95         ; Other_Alphabetic # Mn       GUNJALA GONDI SIGN ANUSVARA
+11D96         ; Other_Alphabetic # Mc       GUNJALA GONDI SIGN VISARGA
+11EF3..11EF4  ; Other_Alphabetic # Mn   [2] MAKASAR VOWEL SIGN I..MAKASAR VOWEL SIGN U
+11EF5..11EF6  ; Other_Alphabetic # Mc   [2] MAKASAR VOWEL SIGN E..MAKASAR VOWEL SIGN O
 16B30..16B36  ; Other_Alphabetic # Mn   [7] PAHAWH HMONG MARK CIM TUB..PAHAWH HMONG MARK CIM TAUM
 16F51..16F7E  ; Other_Alphabetic # Mc  [46] MIAO SIGN ASPIRATION..MIAO VOWEL SIGN NG
 1BC9E         ; Other_Alphabetic # Mn       DUPLOYAN DOUBLE MARK
@@ -771,7 +786,7 @@ FB1E          ; Other_Alphabetic # Mn       HEBREW POINT JUDEO-SPANISH VARIKA
 1F150..1F169  ; Other_Alphabetic # So  [26] NEGATIVE CIRCLED LATIN CAPITAL LETTER A..NEGATIVE CIRCLED LATIN CAPITAL LETTER Z
 1F170..1F189  ; Other_Alphabetic # So  [26] NEGATIVE SQUARED LATIN CAPITAL LETTER A..NEGATIVE SQUARED LATIN CAPITAL LETTER Z
 
-# Total code points: 1300
+# Total code points: 1334
 
 # ================================================
 
@@ -780,10 +795,10 @@ FB1E          ; Other_Alphabetic # Mn       HEBREW POINT JUDEO-SPANISH VARIKA
 3021..3029    ; Ideographic # Nl   [9] HANGZHOU NUMERAL ONE..HANGZHOU NUMERAL NINE
 3038..303A    ; Ideographic # Nl   [3] HANGZHOU NUMERAL TEN..HANGZHOU NUMERAL THIRTY
 3400..4DB5    ; Ideographic # Lo [6582] CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DB5
-4E00..9FEA    ; Ideographic # Lo [20971] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FEA
+4E00..9FEF    ; Ideographic # Lo [20976] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FEF
 F900..FA6D    ; Ideographic # Lo [366] CJK COMPATIBILITY IDEOGRAPH-F900..CJK COMPATIBILITY IDEOGRAPH-FA6D
 FA70..FAD9    ; Ideographic # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COMPATIBILITY IDEOGRAPH-FAD9
-17000..187EC  ; Ideographic # Lo [6125] TANGUT IDEOGRAPH-17000..TANGUT IDEOGRAPH-187EC
+17000..187F1  ; Ideographic # Lo [6130] TANGUT IDEOGRAPH-17000..TANGUT IDEOGRAPH-187F1
 18800..18AF2  ; Ideographic # Lo [755] TANGUT COMPONENT-001..TANGUT COMPONENT-755
 1B170..1B2FB  ; Ideographic # Lo [396] NUSHU CHARACTER-1B170..NUSHU CHARACTER-1B2FB
 20000..2A6D6  ; Ideographic # Lo [42711] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6D6
@@ -793,7 +808,7 @@ FA70..FAD9    ; Ideographic # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COM
 2CEB0..2EBE0  ; Ideographic # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
 2F800..2FA1D  ; Ideographic # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D
 
-# Total code points: 96174
+# Total code points: 96184
 
 # ================================================
 
@@ -953,6 +968,9 @@ FF9E..FF9F    ; Diacritic # Lm   [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFW
 FFE3          ; Diacritic # Sk       FULLWIDTH MACRON
 102E0         ; Diacritic # Mn       COPTIC EPACT THOUSANDS MARK
 10AE5..10AE6  ; Diacritic # Mn   [2] MANICHAEAN ABBREVIATION MARK ABOVE..MANICHAEAN ABBREVIATION MARK BELOW
+10D22..10D23  ; Diacritic # Lo   [2] HANIFI ROHINGYA MARK SAKIN..HANIFI ROHINGYA MARK NA KHONNA
+10D24..10D27  ; Diacritic # Mn   [4] HANIFI ROHINGYA SIGN HARBAHAY..HANIFI ROHINGYA SIGN TASSI
+10F46..10F50  ; Diacritic # Mn  [11] SOGDIAN COMBINING DOT BELOW..SOGDIAN COMBINING STROKE BELOW
 110B9..110BA  ; Diacritic # Mn   [2] KAITHI SIGN VIRAMA..KAITHI SIGN NUKTA
 11133..11134  ; Diacritic # Mn   [2] CHAKMA VIRAMA..CHAKMA MAAYYAA
 11173         ; Diacritic # Mn       MAHAJANI SIGN NUKTA
@@ -973,12 +991,14 @@ FFE3          ; Diacritic # Sk       FULLWIDTH MACRON
 116B6         ; Diacritic # Mc       TAKRI SIGN VIRAMA
 116B7         ; Diacritic # Mn       TAKRI SIGN NUKTA
 1172B         ; Diacritic # Mn       AHOM SIGN KILLER
+11839..1183A  ; Diacritic # Mn   [2] DOGRA SIGN VIRAMA..DOGRA SIGN NUKTA
 11A34         ; Diacritic # Mn       ZANABAZAR SQUARE SIGN VIRAMA
 11A47         ; Diacritic # Mn       ZANABAZAR SQUARE SUBJOINER
 11A99         ; Diacritic # Mn       SOYOMBO SUBJOINER
 11C3F         ; Diacritic # Mn       BHAIKSUKI SIGN VIRAMA
 11D42         ; Diacritic # Mn       MASARAM GONDI SIGN NUKTA
 11D44..11D45  ; Diacritic # Mn   [2] MASARAM GONDI SIGN HALANTA..MASARAM GONDI VIRAMA
+11D97         ; Diacritic # Mn       GUNJALA GONDI VIRAMA
 16AF0..16AF4  ; Diacritic # Mn   [5] BASSA VAH COMBINING HIGH TONE..BASSA VAH COMBINING HIGH-LOW TONE
 16F8F..16F92  ; Diacritic # Mn   [4] MIAO TONE RIGHT..MIAO TONE BELOW
 16F93..16F9F  ; Diacritic # Lm  [13] MIAO LETTER TONE-2..MIAO LETTER REFORMED TONE-8
@@ -991,7 +1011,7 @@ FFE3          ; Diacritic # Sk       FULLWIDTH MACRON
 1E944..1E946  ; Diacritic # Mn   [3] ADLAM ALIF LENGTHENER..ADLAM GEMINATION MARK
 1E948..1E94A  ; Diacritic # Mn   [3] ADLAM CONSONANT MODIFIER..ADLAM NUKTA
 
-# Total code points: 798
+# Total code points: 818
 
 # ================================================
 
@@ -1137,7 +1157,7 @@ E0020..E007F  ; Other_Grapheme_Extend # Cf  [96] TAG SPACE..CANCEL TAG
 # ================================================
 
 3400..4DB5    ; Unified_Ideograph # Lo [6582] CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DB5
-4E00..9FEA    ; Unified_Ideograph # Lo [20971] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FEA
+4E00..9FEF    ; Unified_Ideograph # Lo [20976] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FEF
 FA0E..FA0F    ; Unified_Ideograph # Lo   [2] CJK COMPATIBILITY IDEOGRAPH-FA0E..CJK COMPATIBILITY IDEOGRAPH-FA0F
 FA11          ; Unified_Ideograph # Lo       CJK COMPATIBILITY IDEOGRAPH-FA11
 FA13..FA14    ; Unified_Ideograph # Lo   [2] CJK COMPATIBILITY IDEOGRAPH-FA13..CJK COMPATIBILITY IDEOGRAPH-FA14
@@ -1151,7 +1171,7 @@ FA27..FA29    ; Unified_Ideograph # Lo   [3] CJK COMPATIBILITY IDEOGRAPH-FA27..C
 2B820..2CEA1  ; Unified_Ideograph # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
 2CEB0..2EBE0  ; Unified_Ideograph # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
 
-# Total code points: 87882
+# Total code points: 87887
 
 # ================================================
 
@@ -1255,10 +1275,13 @@ AABB..AABC    ; Logical_Order_Exception # Lo   [2] TAI VIET VOWEL AUE..TAI VIET
 002E          ; Sentence_Terminal # Po       FULL STOP
 003F          ; Sentence_Terminal # Po       QUESTION MARK
 0589          ; Sentence_Terminal # Po       ARMENIAN FULL STOP
-061F          ; Sentence_Terminal # Po       ARABIC QUESTION MARK
+061E..061F    ; Sentence_Terminal # Po   [2] ARABIC TRIPLE DOT PUNCTUATION MARK..ARABIC QUESTION MARK
 06D4          ; Sentence_Terminal # Po       ARABIC FULL STOP
 0700..0702    ; Sentence_Terminal # Po   [3] SYRIAC END OF PARAGRAPH..SYRIAC SUBLINEAR FULL STOP
 07F9          ; Sentence_Terminal # Po       NKO EXCLAMATION MARK
+0837          ; Sentence_Terminal # Po       SAMARITAN PUNCTUATION MELODIC QITSA
+0839          ; Sentence_Terminal # Po       SAMARITAN PUNCTUATION QITSA
+083D..083E    ; Sentence_Terminal # Po   [2] SAMARITAN PUNCTUATION SOF MASHFAAT..SAMARITAN PUNCTUATION ANNAAU
 0964..0965    ; Sentence_Terminal # Po   [2] DEVANAGARI DANDA..DEVANAGARI DOUBLE DANDA
 104A..104B    ; Sentence_Terminal # Po   [2] MYANMAR SIGN LITTLE SECTION..MYANMAR SIGN SECTION
 1362          ; Sentence_Terminal # Po       ETHIOPIC FULL STOP
@@ -1296,6 +1319,7 @@ FF0E          ; Sentence_Terminal # Po       FULLWIDTH FULL STOP
 FF1F          ; Sentence_Terminal # Po       FULLWIDTH QUESTION MARK
 FF61          ; Sentence_Terminal # Po       HALFWIDTH IDEOGRAPHIC FULL STOP
 10A56..10A57  ; Sentence_Terminal # Po   [2] KHAROSHTHI PUNCTUATION DANDA..KHAROSHTHI PUNCTUATION DOUBLE DANDA
+10F55..10F59  ; Sentence_Terminal # Po   [5] SOGDIAN PUNCTUATION TWO VERTICAL BARS..SOGDIAN PUNCTUATION HALF CIRCLE WITH DOT
 11047..11048  ; Sentence_Terminal # Po   [2] BRAHMI DANDA..BRAHMI DOUBLE DANDA
 110BE..110C1  ; Sentence_Terminal # Po   [4] KAITHI SECTION MARK..KAITHI DOUBLE DANDA
 11141..11143  ; Sentence_Terminal # Po   [3] CHAKMA DANDA..CHAKMA QUESTION MARK
@@ -1313,14 +1337,16 @@ FF61          ; Sentence_Terminal # Po       HALFWIDTH IDEOGRAPHIC FULL STOP
 11A42..11A43  ; Sentence_Terminal # Po   [2] ZANABAZAR SQUARE MARK SHAD..ZANABAZAR SQUARE MARK DOUBLE SHAD
 11A9B..11A9C  ; Sentence_Terminal # Po   [2] SOYOMBO MARK SHAD..SOYOMBO MARK DOUBLE SHAD
 11C41..11C42  ; Sentence_Terminal # Po   [2] BHAIKSUKI DANDA..BHAIKSUKI DOUBLE DANDA
+11EF7..11EF8  ; Sentence_Terminal # Po   [2] MAKASAR PASSIMBANG..MAKASAR END OF SECTION
 16A6E..16A6F  ; Sentence_Terminal # Po   [2] MRO DANDA..MRO DOUBLE DANDA
 16AF5         ; Sentence_Terminal # Po       BASSA VAH FULL STOP
 16B37..16B38  ; Sentence_Terminal # Po   [2] PAHAWH HMONG SIGN VOS THOM..PAHAWH HMONG SIGN VOS TSHAB CEEB
 16B44         ; Sentence_Terminal # Po       PAHAWH HMONG SIGN XAUS
+16E98         ; Sentence_Terminal # Po       MEDEFAIDRIN FULL STOP
 1BC9F         ; Sentence_Terminal # Po       DUPLOYAN PUNCTUATION CHINOOK FULL STOP
 1DA88         ; Sentence_Terminal # Po       SIGNWRITING FULL STOP
 
-# Total code points: 128
+# Total code points: 141
 
 # ================================================
 
@@ -1521,14 +1547,10 @@ E0100..E01EF  ; Variation_Selector # Mn [240] VARIATION SELECTOR-17..VARIATION S
 2B74..2B75    ; Pattern_Syntax # Cn   [2] <reserved-2B74>..<reserved-2B75>
 2B76..2B95    ; Pattern_Syntax # So  [32] NORTH WEST TRIANGLE-HEADED ARROW TO BAR..RIGHTWARDS BLACK ARROW
 2B96..2B97    ; Pattern_Syntax # Cn   [2] <reserved-2B96>..<reserved-2B97>
-2B98..2BB9    ; Pattern_Syntax # So  [34] THREE-D TOP-LIGHTED LEFTWARDS EQUILATERAL ARROWHEAD..UP ARROWHEAD IN A RECTANGLE BOX
-2BBA..2BBC    ; Pattern_Syntax # Cn   [3] <reserved-2BBA>..<reserved-2BBC>
-2BBD..2BC8    ; Pattern_Syntax # So  [12] BALLOT BOX WITH LIGHT X..BLACK MEDIUM RIGHT-POINTING TRIANGLE CENTRED
+2B98..2BC8    ; Pattern_Syntax # So  [49] THREE-D TOP-LIGHTED LEFTWARDS EQUILATERAL ARROWHEAD..BLACK MEDIUM RIGHT-POINTING TRIANGLE CENTRED
 2BC9          ; Pattern_Syntax # Cn       <reserved-2BC9>
-2BCA..2BD2    ; Pattern_Syntax # So   [9] TOP HALF BLACK CIRCLE..GROUP MARK
-2BD3..2BEB    ; Pattern_Syntax # Cn  [25] <reserved-2BD3>..<reserved-2BEB>
-2BEC..2BEF    ; Pattern_Syntax # So   [4] LEFTWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS..DOWNWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS
-2BF0..2BFF    ; Pattern_Syntax # Cn  [16] <reserved-2BF0>..<reserved-2BFF>
+2BCA..2BFE    ; Pattern_Syntax # So  [53] TOP HALF BLACK CIRCLE..REVERSED RIGHT ANGLE
+2BFF          ; Pattern_Syntax # Cn       <reserved-2BFF>
 2E00..2E01    ; Pattern_Syntax # Po   [2] RIGHT ANGLE SUBSTITUTION MARKER..RIGHT ANGLE DOTTED SUBSTITUTION MARKER
 2E02          ; Pattern_Syntax # Pi       LEFT SUBSTITUTION BRACKET
 2E03          ; Pattern_Syntax # Pf       RIGHT SUBSTITUTION BRACKET
@@ -1566,8 +1588,8 @@ E0100..E01EF  ; Variation_Selector # Mn [240] VARIATION SELECTOR-17..VARIATION S
 2E40          ; Pattern_Syntax # Pd       DOUBLE HYPHEN
 2E41          ; Pattern_Syntax # Po       REVERSED COMMA
 2E42          ; Pattern_Syntax # Ps       DOUBLE LOW-REVERSED-9 QUOTATION MARK
-2E43..2E49    ; Pattern_Syntax # Po   [7] DASH WITH LEFT UPTURN..DOUBLE STACKED COMMA
-2E4A..2E7F    ; Pattern_Syntax # Cn  [54] <reserved-2E4A>..<reserved-2E7F>
+2E43..2E4E    ; Pattern_Syntax # Po  [12] DASH WITH LEFT UPTURN..PUNCTUS ELEVATUS MARK
+2E4F..2E7F    ; Pattern_Syntax # Cn  [49] <reserved-2E4F>..<reserved-2E7F>
 3001..3003    ; Pattern_Syntax # Po   [3] IDEOGRAPHIC COMMA..DITTO MARK
 3008          ; Pattern_Syntax # Ps       LEFT ANGLE BRACKET
 3009          ; Pattern_Syntax # Pe       RIGHT ANGLE BRACKET
@@ -1606,8 +1628,9 @@ FE45..FE46    ; Pattern_Syntax # Po   [2] SESAME DOT..WHITE SESAME DOT
 070F          ; Prepended_Concatenation_Mark # Cf       SYRIAC ABBREVIATION MARK
 08E2          ; Prepended_Concatenation_Mark # Cf       ARABIC DISPUTED END OF AYAH
 110BD         ; Prepended_Concatenation_Mark # Cf       KAITHI NUMBER SIGN
+110CD         ; Prepended_Concatenation_Mark # Cf       KAITHI NUMBER SIGN ABOVE
 
-# Total code points: 10
+# Total code points: 11
 
 # ================================================
 
diff --git a/lib/stdlib/uc_spec/README-UPDATE.txt b/lib/stdlib/uc_spec/README-UPDATE.txt
index d59337e1a5..e1f5c8fcd0 100644
--- a/lib/stdlib/uc_spec/README-UPDATE.txt
+++ b/lib/stdlib/uc_spec/README-UPDATE.txt
@@ -1,7 +1,13 @@
 When updating the unicode version copy the necessary files to this
 directory.
-
 And update the test files in stdlib/test/unicode_util_SUITE_data/*
 
+Unicode 11 was updated from:
+https://www.unicode.org/Public/11.0.0/ucd/
+https://www.unicode.org/Public/11.0.0/ucd/auxiliary/
+https://www.unicode.org/Public/emoji/11.0/
+
 Update the spec_version(..) function in the generator,
 gen_unicode_mod.escript
+
+
diff --git a/lib/stdlib/uc_spec/SpecialCasing.txt b/lib/stdlib/uc_spec/SpecialCasing.txt
index b9ba0d81c1..c90d09acb3 100644
--- a/lib/stdlib/uc_spec/SpecialCasing.txt
+++ b/lib/stdlib/uc_spec/SpecialCasing.txt
@@ -1,6 +1,6 @@
-# SpecialCasing-10.0.0.txt
-# Date: 2017-04-14, 05:40:43 GMT
-# © 2017 Unicode®, Inc.
+# SpecialCasing-11.0.0.txt
+# Date: 2018-02-22, 06:16:47 GMT
+# © 2018 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
@@ -121,7 +121,7 @@ FB17; FB17; 0544 056D; 0544 053D; # ARMENIAN SMALL LIGATURE MEN XEH
 
 # The following cases are already in the UnicodeData.txt file, so are only commented here.
 
-# 0345; 0345; 0345; 0399; # COMBINING GREEK YPOGEGRAMMENI
+# 0345; 0345; 0399; 0399; # COMBINING GREEK YPOGEGRAMMENI
 
 # All letters with YPOGEGRAMMENI (iota-subscript) or PROSGEGRAMMENI (iota adscript)
 # have special uppercases.
diff --git a/lib/stdlib/uc_spec/UnicodeData.txt b/lib/stdlib/uc_spec/UnicodeData.txt
index d89c64f526..ec32fafbce 100644
--- a/lib/stdlib/uc_spec/UnicodeData.txt
+++ b/lib/stdlib/uc_spec/UnicodeData.txt
@@ -1362,6 +1362,7 @@
 055D;ARMENIAN COMMA;Po;0;L;;;;;N;;;;;
 055E;ARMENIAN QUESTION MARK;Po;0;L;;;;;N;;;;;
 055F;ARMENIAN ABBREVIATION MARK;Po;0;L;;;;;N;;;;;
+0560;ARMENIAN SMALL LETTER TURNED AYB;Ll;0;L;;;;;N;;;;;
 0561;ARMENIAN SMALL LETTER AYB;Ll;0;L;;;;;N;;;0531;;0531
 0562;ARMENIAN SMALL LETTER BEN;Ll;0;L;;;;;N;;;0532;;0532
 0563;ARMENIAN SMALL LETTER GIM;Ll;0;L;;;;;N;;;0533;;0533
@@ -1401,6 +1402,7 @@
 0585;ARMENIAN SMALL LETTER OH;Ll;0;L;;;;;N;;;0555;;0555
 0586;ARMENIAN SMALL LETTER FEH;Ll;0;L;;;;;N;;;0556;;0556
 0587;ARMENIAN SMALL LIGATURE ECH YIWN;Ll;0;L;<compat> 0565 0582;;;;N;;;;;
+0588;ARMENIAN SMALL LETTER YI WITH STROKE;Ll;0;L;;;;;N;;;;;
 0589;ARMENIAN FULL STOP;Po;0;L;;;;;N;ARMENIAN PERIOD;;;;
 058A;ARMENIAN HYPHEN;Pd;0;ON;;;;;N;;;;;
 058D;RIGHT-FACING ARMENIAN ETERNITY SIGN;So;0;ON;;;;;N;;;;;
@@ -1488,6 +1490,7 @@
 05E8;HEBREW LETTER RESH;Lo;0;R;;;;;N;;;;;
 05E9;HEBREW LETTER SHIN;Lo;0;R;;;;;N;;;;;
 05EA;HEBREW LETTER TAV;Lo;0;R;;;;;N;;;;;
+05EF;HEBREW YOD TRIANGLE;Lo;0;R;;;;;N;;;;;
 05F0;HEBREW LIGATURE YIDDISH DOUBLE VAV;Lo;0;R;;;;;N;HEBREW LETTER DOUBLE VAV;;;;
 05F1;HEBREW LIGATURE YIDDISH VAV YOD;Lo;0;R;;;;;N;HEBREW LETTER VAV YOD;;;;
 05F2;HEBREW LIGATURE YIDDISH DOUBLE YOD;Lo;0;R;;;;;N;HEBREW LETTER DOUBLE YOD;;;;
@@ -1982,6 +1985,9 @@
 07F8;NKO COMMA;Po;0;ON;;;;;N;;;;;
 07F9;NKO EXCLAMATION MARK;Po;0;ON;;;;;N;;;;;
 07FA;NKO LAJANYALAN;Lm;0;R;;;;;N;;;;;
+07FD;NKO DANTAYALAN;Mn;220;NSM;;;;;N;;;;;
+07FE;NKO DOROME SIGN;Sc;0;R;;;;;N;;;;;
+07FF;NKO TAMAN SIGN;Sc;0;R;;;;;N;;;;;
 0800;SAMARITAN LETTER ALAF;Lo;0;R;;;;;N;;;;;
 0801;SAMARITAN LETTER BIT;Lo;0;R;;;;;N;;;;;
 0802;SAMARITAN LETTER GAMAN;Lo;0;R;;;;;N;;;;;
@@ -2112,6 +2118,7 @@
 08BB;ARABIC LETTER AFRICAN FEH;Lo;0;AL;;;;;N;;;;;
 08BC;ARABIC LETTER AFRICAN QAF;Lo;0;AL;;;;;N;;;;;
 08BD;ARABIC LETTER AFRICAN NOON;Lo;0;AL;;;;;N;;;;;
+08D3;ARABIC SMALL LOW WAW;Mn;220;NSM;;;;;N;;;;;
 08D4;ARABIC SMALL HIGH WORD AR-RUB;Mn;230;NSM;;;;;N;;;;;
 08D5;ARABIC SMALL HIGH SAD;Mn;230;NSM;;;;;N;;;;;
 08D6;ARABIC SMALL HIGH AIN;Mn;230;NSM;;;;;N;;;;;
@@ -2379,6 +2386,7 @@
 09FB;BENGALI GANDA MARK;Sc;0;ET;;;;;N;;;;;
 09FC;BENGALI LETTER VEDIC ANUSVARA;Lo;0;L;;;;;N;;;;;
 09FD;BENGALI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+09FE;BENGALI SANDHI MARK;Mn;230;NSM;;;;;N;;;;;
 0A01;GURMUKHI SIGN ADAK BINDI;Mn;0;NSM;;;;;N;;;;;
 0A02;GURMUKHI SIGN BINDI;Mn;0;NSM;;;;;N;;;;;
 0A03;GURMUKHI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
@@ -2458,6 +2466,7 @@
 0A73;GURMUKHI URA;Lo;0;L;;;;;N;;;;;
 0A74;GURMUKHI EK ONKAR;Lo;0;L;;;;;N;;;;;
 0A75;GURMUKHI SIGN YAKASH;Mn;0;NSM;;;;;N;;;;;
+0A76;GURMUKHI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
 0A81;GUJARATI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
 0A82;GUJARATI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
 0A83;GUJARATI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
@@ -2715,6 +2724,7 @@
 0C01;TELUGU SIGN CANDRABINDU;Mc;0;L;;;;;N;;;;;
 0C02;TELUGU SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
 0C03;TELUGU SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0C04;TELUGU SIGN COMBINING ANUSVARA ABOVE;Mn;0;NSM;;;;;N;;;;;
 0C05;TELUGU LETTER A;Lo;0;L;;;;;N;;;;;
 0C06;TELUGU LETTER AA;Lo;0;L;;;;;N;;;;;
 0C07;TELUGU LETTER I;Lo;0;L;;;;;N;;;;;
@@ -2811,6 +2821,7 @@
 0C81;KANNADA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
 0C82;KANNADA SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
 0C83;KANNADA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0C84;KANNADA SIGN SIDDHAM;Po;0;L;;;;;N;;;;;
 0C85;KANNADA LETTER A;Lo;0;L;;;;;N;;;;;
 0C86;KANNADA LETTER AA;Lo;0;L;;;;;N;;;;;
 0C87;KANNADA LETTER I;Lo;0;L;;;;;N;;;;;
@@ -3667,54 +3678,54 @@
 10C5;GEORGIAN CAPITAL LETTER HOE;Lu;0;L;;;;;N;;;;2D25;
 10C7;GEORGIAN CAPITAL LETTER YN;Lu;0;L;;;;;N;;;;2D27;
 10CD;GEORGIAN CAPITAL LETTER AEN;Lu;0;L;;;;;N;;;;2D2D;
-10D0;GEORGIAN LETTER AN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER AN;;;;
-10D1;GEORGIAN LETTER BAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER BAN;;;;
-10D2;GEORGIAN LETTER GAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER GAN;;;;
-10D3;GEORGIAN LETTER DON;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER DON;;;;
-10D4;GEORGIAN LETTER EN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER EN;;;;
-10D5;GEORGIAN LETTER VIN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER VIN;;;;
-10D6;GEORGIAN LETTER ZEN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER ZEN;;;;
-10D7;GEORGIAN LETTER TAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER TAN;;;;
-10D8;GEORGIAN LETTER IN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER IN;;;;
-10D9;GEORGIAN LETTER KAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER KAN;;;;
-10DA;GEORGIAN LETTER LAS;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER LAS;;;;
-10DB;GEORGIAN LETTER MAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER MAN;;;;
-10DC;GEORGIAN LETTER NAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER NAR;;;;
-10DD;GEORGIAN LETTER ON;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER ON;;;;
-10DE;GEORGIAN LETTER PAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER PAR;;;;
-10DF;GEORGIAN LETTER ZHAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER ZHAR;;;;
-10E0;GEORGIAN LETTER RAE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER RAE;;;;
-10E1;GEORGIAN LETTER SAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER SAN;;;;
-10E2;GEORGIAN LETTER TAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER TAR;;;;
-10E3;GEORGIAN LETTER UN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER UN;;;;
-10E4;GEORGIAN LETTER PHAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER PHAR;;;;
-10E5;GEORGIAN LETTER KHAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER KHAR;;;;
-10E6;GEORGIAN LETTER GHAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER GHAN;;;;
-10E7;GEORGIAN LETTER QAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER QAR;;;;
-10E8;GEORGIAN LETTER SHIN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER SHIN;;;;
-10E9;GEORGIAN LETTER CHIN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER CHIN;;;;
-10EA;GEORGIAN LETTER CAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER CAN;;;;
-10EB;GEORGIAN LETTER JIL;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER JIL;;;;
-10EC;GEORGIAN LETTER CIL;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER CIL;;;;
-10ED;GEORGIAN LETTER CHAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER CHAR;;;;
-10EE;GEORGIAN LETTER XAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER XAN;;;;
-10EF;GEORGIAN LETTER JHAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER JHAN;;;;
-10F0;GEORGIAN LETTER HAE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER HAE;;;;
-10F1;GEORGIAN LETTER HE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER HE;;;;
-10F2;GEORGIAN LETTER HIE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER HIE;;;;
-10F3;GEORGIAN LETTER WE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER WE;;;;
-10F4;GEORGIAN LETTER HAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER HAR;;;;
-10F5;GEORGIAN LETTER HOE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER HOE;;;;
-10F6;GEORGIAN LETTER FI;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER FI;;;;
-10F7;GEORGIAN LETTER YN;Lo;0;L;;;;;N;;;;;
-10F8;GEORGIAN LETTER ELIFI;Lo;0;L;;;;;N;;;;;
-10F9;GEORGIAN LETTER TURNED GAN;Lo;0;L;;;;;N;;;;;
-10FA;GEORGIAN LETTER AIN;Lo;0;L;;;;;N;;;;;
+10D0;GEORGIAN LETTER AN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER AN;;1C90;;10D0
+10D1;GEORGIAN LETTER BAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER BAN;;1C91;;10D1
+10D2;GEORGIAN LETTER GAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER GAN;;1C92;;10D2
+10D3;GEORGIAN LETTER DON;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER DON;;1C93;;10D3
+10D4;GEORGIAN LETTER EN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER EN;;1C94;;10D4
+10D5;GEORGIAN LETTER VIN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER VIN;;1C95;;10D5
+10D6;GEORGIAN LETTER ZEN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER ZEN;;1C96;;10D6
+10D7;GEORGIAN LETTER TAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER TAN;;1C97;;10D7
+10D8;GEORGIAN LETTER IN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER IN;;1C98;;10D8
+10D9;GEORGIAN LETTER KAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER KAN;;1C99;;10D9
+10DA;GEORGIAN LETTER LAS;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER LAS;;1C9A;;10DA
+10DB;GEORGIAN LETTER MAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER MAN;;1C9B;;10DB
+10DC;GEORGIAN LETTER NAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER NAR;;1C9C;;10DC
+10DD;GEORGIAN LETTER ON;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER ON;;1C9D;;10DD
+10DE;GEORGIAN LETTER PAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER PAR;;1C9E;;10DE
+10DF;GEORGIAN LETTER ZHAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER ZHAR;;1C9F;;10DF
+10E0;GEORGIAN LETTER RAE;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER RAE;;1CA0;;10E0
+10E1;GEORGIAN LETTER SAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER SAN;;1CA1;;10E1
+10E2;GEORGIAN LETTER TAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER TAR;;1CA2;;10E2
+10E3;GEORGIAN LETTER UN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER UN;;1CA3;;10E3
+10E4;GEORGIAN LETTER PHAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER PHAR;;1CA4;;10E4
+10E5;GEORGIAN LETTER KHAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER KHAR;;1CA5;;10E5
+10E6;GEORGIAN LETTER GHAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER GHAN;;1CA6;;10E6
+10E7;GEORGIAN LETTER QAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER QAR;;1CA7;;10E7
+10E8;GEORGIAN LETTER SHIN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER SHIN;;1CA8;;10E8
+10E9;GEORGIAN LETTER CHIN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER CHIN;;1CA9;;10E9
+10EA;GEORGIAN LETTER CAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER CAN;;1CAA;;10EA
+10EB;GEORGIAN LETTER JIL;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER JIL;;1CAB;;10EB
+10EC;GEORGIAN LETTER CIL;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER CIL;;1CAC;;10EC
+10ED;GEORGIAN LETTER CHAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER CHAR;;1CAD;;10ED
+10EE;GEORGIAN LETTER XAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER XAN;;1CAE;;10EE
+10EF;GEORGIAN LETTER JHAN;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER JHAN;;1CAF;;10EF
+10F0;GEORGIAN LETTER HAE;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER HAE;;1CB0;;10F0
+10F1;GEORGIAN LETTER HE;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER HE;;1CB1;;10F1
+10F2;GEORGIAN LETTER HIE;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER HIE;;1CB2;;10F2
+10F3;GEORGIAN LETTER WE;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER WE;;1CB3;;10F3
+10F4;GEORGIAN LETTER HAR;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER HAR;;1CB4;;10F4
+10F5;GEORGIAN LETTER HOE;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER HOE;;1CB5;;10F5
+10F6;GEORGIAN LETTER FI;Ll;0;L;;;;;N;GEORGIAN SMALL LETTER FI;;1CB6;;10F6
+10F7;GEORGIAN LETTER YN;Ll;0;L;;;;;N;;;1CB7;;10F7
+10F8;GEORGIAN LETTER ELIFI;Ll;0;L;;;;;N;;;1CB8;;10F8
+10F9;GEORGIAN LETTER TURNED GAN;Ll;0;L;;;;;N;;;1CB9;;10F9
+10FA;GEORGIAN LETTER AIN;Ll;0;L;;;;;N;;;1CBA;;10FA
 10FB;GEORGIAN PARAGRAPH SEPARATOR;Po;0;L;;;;;N;;;;;
 10FC;MODIFIER LETTER GEORGIAN NAR;Lm;0;L;<super> 10DC;;;;N;;;;;
-10FD;GEORGIAN LETTER AEN;Lo;0;L;;;;;N;;;;;
-10FE;GEORGIAN LETTER HARD SIGN;Lo;0;L;;;;;N;;;;;
-10FF;GEORGIAN LETTER LABIAL SIGN;Lo;0;L;;;;;N;;;;;
+10FD;GEORGIAN LETTER AEN;Ll;0;L;;;;;N;;;1CBD;;10FD
+10FE;GEORGIAN LETTER HARD SIGN;Ll;0;L;;;;;N;;;1CBE;;10FE
+10FF;GEORGIAN LETTER LABIAL SIGN;Ll;0;L;;;;;N;;;1CBF;;10FF
 1100;HANGUL CHOSEONG KIYEOK;Lo;0;L;;;;;N;;;;;
 1101;HANGUL CHOSEONG SSANGKIYEOK;Lo;0;L;;;;;N;;;;;
 1102;HANGUL CHOSEONG NIEUN;Lo;0;L;;;;;N;;;;;
@@ -5513,6 +5524,7 @@
 1875;MONGOLIAN LETTER MANCHU RA;Lo;0;L;;;;;N;;;;;
 1876;MONGOLIAN LETTER MANCHU FA;Lo;0;L;;;;;N;;;;;
 1877;MONGOLIAN LETTER MANCHU ZHA;Lo;0;L;;;;;N;;;;;
+1878;MONGOLIAN LETTER CHA WITH TWO DOTS;Lo;0;L;;;;;N;;;;;
 1880;MONGOLIAN LETTER ALI GALI ANUSVARA ONE;Lo;0;L;;;;;N;;;;;
 1881;MONGOLIAN LETTER ALI GALI VISARGA ONE;Lo;0;L;;;;;N;;;;;
 1882;MONGOLIAN LETTER ALI GALI DAMARU;Lo;0;L;;;;;N;;;;;
@@ -6388,6 +6400,52 @@
 1C86;CYRILLIC SMALL LETTER TALL HARD SIGN;Ll;0;L;;;;;N;;;042A;;042A
 1C87;CYRILLIC SMALL LETTER TALL YAT;Ll;0;L;;;;;N;;;0462;;0462
 1C88;CYRILLIC SMALL LETTER UNBLENDED UK;Ll;0;L;;;;;N;;;A64A;;A64A
+1C90;GEORGIAN MTAVRULI CAPITAL LETTER AN;Lu;0;L;;;;;N;;;;10D0;
+1C91;GEORGIAN MTAVRULI CAPITAL LETTER BAN;Lu;0;L;;;;;N;;;;10D1;
+1C92;GEORGIAN MTAVRULI CAPITAL LETTER GAN;Lu;0;L;;;;;N;;;;10D2;
+1C93;GEORGIAN MTAVRULI CAPITAL LETTER DON;Lu;0;L;;;;;N;;;;10D3;
+1C94;GEORGIAN MTAVRULI CAPITAL LETTER EN;Lu;0;L;;;;;N;;;;10D4;
+1C95;GEORGIAN MTAVRULI CAPITAL LETTER VIN;Lu;0;L;;;;;N;;;;10D5;
+1C96;GEORGIAN MTAVRULI CAPITAL LETTER ZEN;Lu;0;L;;;;;N;;;;10D6;
+1C97;GEORGIAN MTAVRULI CAPITAL LETTER TAN;Lu;0;L;;;;;N;;;;10D7;
+1C98;GEORGIAN MTAVRULI CAPITAL LETTER IN;Lu;0;L;;;;;N;;;;10D8;
+1C99;GEORGIAN MTAVRULI CAPITAL LETTER KAN;Lu;0;L;;;;;N;;;;10D9;
+1C9A;GEORGIAN MTAVRULI CAPITAL LETTER LAS;Lu;0;L;;;;;N;;;;10DA;
+1C9B;GEORGIAN MTAVRULI CAPITAL LETTER MAN;Lu;0;L;;;;;N;;;;10DB;
+1C9C;GEORGIAN MTAVRULI CAPITAL LETTER NAR;Lu;0;L;;;;;N;;;;10DC;
+1C9D;GEORGIAN MTAVRULI CAPITAL LETTER ON;Lu;0;L;;;;;N;;;;10DD;
+1C9E;GEORGIAN MTAVRULI CAPITAL LETTER PAR;Lu;0;L;;;;;N;;;;10DE;
+1C9F;GEORGIAN MTAVRULI CAPITAL LETTER ZHAR;Lu;0;L;;;;;N;;;;10DF;
+1CA0;GEORGIAN MTAVRULI CAPITAL LETTER RAE;Lu;0;L;;;;;N;;;;10E0;
+1CA1;GEORGIAN MTAVRULI CAPITAL LETTER SAN;Lu;0;L;;;;;N;;;;10E1;
+1CA2;GEORGIAN MTAVRULI CAPITAL LETTER TAR;Lu;0;L;;;;;N;;;;10E2;
+1CA3;GEORGIAN MTAVRULI CAPITAL LETTER UN;Lu;0;L;;;;;N;;;;10E3;
+1CA4;GEORGIAN MTAVRULI CAPITAL LETTER PHAR;Lu;0;L;;;;;N;;;;10E4;
+1CA5;GEORGIAN MTAVRULI CAPITAL LETTER KHAR;Lu;0;L;;;;;N;;;;10E5;
+1CA6;GEORGIAN MTAVRULI CAPITAL LETTER GHAN;Lu;0;L;;;;;N;;;;10E6;
+1CA7;GEORGIAN MTAVRULI CAPITAL LETTER QAR;Lu;0;L;;;;;N;;;;10E7;
+1CA8;GEORGIAN MTAVRULI CAPITAL LETTER SHIN;Lu;0;L;;;;;N;;;;10E8;
+1CA9;GEORGIAN MTAVRULI CAPITAL LETTER CHIN;Lu;0;L;;;;;N;;;;10E9;
+1CAA;GEORGIAN MTAVRULI CAPITAL LETTER CAN;Lu;0;L;;;;;N;;;;10EA;
+1CAB;GEORGIAN MTAVRULI CAPITAL LETTER JIL;Lu;0;L;;;;;N;;;;10EB;
+1CAC;GEORGIAN MTAVRULI CAPITAL LETTER CIL;Lu;0;L;;;;;N;;;;10EC;
+1CAD;GEORGIAN MTAVRULI CAPITAL LETTER CHAR;Lu;0;L;;;;;N;;;;10ED;
+1CAE;GEORGIAN MTAVRULI CAPITAL LETTER XAN;Lu;0;L;;;;;N;;;;10EE;
+1CAF;GEORGIAN MTAVRULI CAPITAL LETTER JHAN;Lu;0;L;;;;;N;;;;10EF;
+1CB0;GEORGIAN MTAVRULI CAPITAL LETTER HAE;Lu;0;L;;;;;N;;;;10F0;
+1CB1;GEORGIAN MTAVRULI CAPITAL LETTER HE;Lu;0;L;;;;;N;;;;10F1;
+1CB2;GEORGIAN MTAVRULI CAPITAL LETTER HIE;Lu;0;L;;;;;N;;;;10F2;
+1CB3;GEORGIAN MTAVRULI CAPITAL LETTER WE;Lu;0;L;;;;;N;;;;10F3;
+1CB4;GEORGIAN MTAVRULI CAPITAL LETTER HAR;Lu;0;L;;;;;N;;;;10F4;
+1CB5;GEORGIAN MTAVRULI CAPITAL LETTER HOE;Lu;0;L;;;;;N;;;;10F5;
+1CB6;GEORGIAN MTAVRULI CAPITAL LETTER FI;Lu;0;L;;;;;N;;;;10F6;
+1CB7;GEORGIAN MTAVRULI CAPITAL LETTER YN;Lu;0;L;;;;;N;;;;10F7;
+1CB8;GEORGIAN MTAVRULI CAPITAL LETTER ELIFI;Lu;0;L;;;;;N;;;;10F8;
+1CB9;GEORGIAN MTAVRULI CAPITAL LETTER TURNED GAN;Lu;0;L;;;;;N;;;;10F9;
+1CBA;GEORGIAN MTAVRULI CAPITAL LETTER AIN;Lu;0;L;;;;;N;;;;10FA;
+1CBD;GEORGIAN MTAVRULI CAPITAL LETTER AEN;Lu;0;L;;;;;N;;;;10FD;
+1CBE;GEORGIAN MTAVRULI CAPITAL LETTER HARD SIGN;Lu;0;L;;;;;N;;;;10FE;
+1CBF;GEORGIAN MTAVRULI CAPITAL LETTER LABIAL SIGN;Lu;0;L;;;;;N;;;;10FF;
 1CC0;SUNDANESE PUNCTUATION BINDU SURYA;Po;0;L;;;;;N;;;;;
 1CC1;SUNDANESE PUNCTUATION BINDU PANGLONG;Po;0;L;;;;;N;;;;;
 1CC2;SUNDANESE PUNCTUATION BINDU PURNAMA;Po;0;L;;;;;N;;;;;
@@ -9559,7 +9617,7 @@
 299E;ANGLE WITH S INSIDE;Sm;0;ON;;;;;Y;;;;;
 299F;ACUTE ANGLE;Sm;0;ON;;;;;Y;;;;;
 29A0;SPHERICAL ANGLE OPENING LEFT;Sm;0;ON;;;;;Y;;;;;
-29A1;SPHERICAL ANGLE OPENING UP;Sm;0;ON;;;;;Y;;;;;
+29A1;SPHERICAL ANGLE OPENING UP;Sm;0;ON;;;;;N;;;;;
 29A2;TURNED ANGLE;Sm;0;ON;;;;;Y;;;;;
 29A3;REVERSED ANGLE;Sm;0;ON;;;;;Y;;;;;
 29A4;ANGLE WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;;
@@ -10092,6 +10150,9 @@
 2BB7;RIBBON ARROW RIGHT DOWN;So;0;ON;;;;;N;;;;;
 2BB8;UPWARDS WHITE ARROW FROM BAR WITH HORIZONTAL BAR;So;0;ON;;;;;N;;;;;
 2BB9;UP ARROWHEAD IN A RECTANGLE BOX;So;0;ON;;;;;N;;;;;
+2BBA;OVERLAPPING WHITE SQUARES;So;0;ON;;;;;N;;;;;
+2BBB;OVERLAPPING WHITE AND BLACK SQUARES;So;0;ON;;;;;N;;;;;
+2BBC;OVERLAPPING BLACK SQUARES;So;0;ON;;;;;N;;;;;
 2BBD;BALLOT BOX WITH LIGHT X;So;0;ON;;;;;N;;;;;
 2BBE;CIRCLED X;So;0;ON;;;;;N;;;;;
 2BBF;CIRCLED BOLD X;So;0;ON;;;;;N;;;;;
@@ -10113,10 +10174,50 @@
 2BD0;SQUARE POSITION INDICATOR;So;0;ON;;;;;N;;;;;
 2BD1;UNCERTAINTY SIGN;So;0;ON;;;;;N;;;;;
 2BD2;GROUP MARK;So;0;ON;;;;;N;;;;;
+2BD3;PLUTO FORM TWO;So;0;ON;;;;;N;;;;;
+2BD4;PLUTO FORM THREE;So;0;ON;;;;;N;;;;;
+2BD5;PLUTO FORM FOUR;So;0;ON;;;;;N;;;;;
+2BD6;PLUTO FORM FIVE;So;0;ON;;;;;N;;;;;
+2BD7;TRANSPLUTO;So;0;ON;;;;;N;;;;;
+2BD8;PROSERPINA;So;0;ON;;;;;N;;;;;
+2BD9;ASTRAEA;So;0;ON;;;;;N;;;;;
+2BDA;HYGIEA;So;0;ON;;;;;N;;;;;
+2BDB;PHOLUS;So;0;ON;;;;;N;;;;;
+2BDC;NESSUS;So;0;ON;;;;;N;;;;;
+2BDD;WHITE MOON SELENA;So;0;ON;;;;;N;;;;;
+2BDE;BLACK DIAMOND ON CROSS;So;0;ON;;;;;N;;;;;
+2BDF;TRUE LIGHT MOON ARTA;So;0;ON;;;;;N;;;;;
+2BE0;CUPIDO;So;0;ON;;;;;N;;;;;
+2BE1;HADES;So;0;ON;;;;;N;;;;;
+2BE2;ZEUS;So;0;ON;;;;;N;;;;;
+2BE3;KRONOS;So;0;ON;;;;;N;;;;;
+2BE4;APOLLON;So;0;ON;;;;;N;;;;;
+2BE5;ADMETOS;So;0;ON;;;;;N;;;;;
+2BE6;VULCANUS;So;0;ON;;;;;N;;;;;
+2BE7;POSEIDON;So;0;ON;;;;;N;;;;;
+2BE8;LEFT HALF BLACK STAR;So;0;ON;;;;;N;;;;;
+2BE9;RIGHT HALF BLACK STAR;So;0;ON;;;;;N;;;;;
+2BEA;STAR WITH LEFT HALF BLACK;So;0;ON;;;;;N;;;;;
+2BEB;STAR WITH RIGHT HALF BLACK;So;0;ON;;;;;N;;;;;
 2BEC;LEFTWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;;
 2BED;UPWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;;
 2BEE;RIGHTWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;;
 2BEF;DOWNWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;;
+2BF0;ERIS FORM ONE;So;0;ON;;;;;N;;;;;
+2BF1;ERIS FORM TWO;So;0;ON;;;;;N;;;;;
+2BF2;SEDNA;So;0;ON;;;;;N;;;;;
+2BF3;RUSSIAN ASTROLOGICAL SYMBOL VIGINTILE;So;0;ON;;;;;N;;;;;
+2BF4;RUSSIAN ASTROLOGICAL SYMBOL NOVILE;So;0;ON;;;;;N;;;;;
+2BF5;RUSSIAN ASTROLOGICAL SYMBOL QUINTILE;So;0;ON;;;;;N;;;;;
+2BF6;RUSSIAN ASTROLOGICAL SYMBOL BINOVILE;So;0;ON;;;;;N;;;;;
+2BF7;RUSSIAN ASTROLOGICAL SYMBOL SENTAGON;So;0;ON;;;;;N;;;;;
+2BF8;RUSSIAN ASTROLOGICAL SYMBOL TREDECILE;So;0;ON;;;;;N;;;;;
+2BF9;EQUALS SIGN WITH INFINITY BELOW;So;0;ON;;;;;N;;;;;
+2BFA;UNITED SYMBOL;So;0;ON;;;;;N;;;;;
+2BFB;SEPARATED SYMBOL;So;0;ON;;;;;N;;;;;
+2BFC;DOUBLED SYMBOL;So;0;ON;;;;;N;;;;;
+2BFD;PASSED SYMBOL;So;0;ON;;;;;N;;;;;
+2BFE;REVERSED RIGHT ANGLE;So;0;ON;;;;;Y;;;;;
 2C00;GLAGOLITIC CAPITAL LETTER AZU;Lu;0;L;;;;;N;;;;2C30;
 2C01;GLAGOLITIC CAPITAL LETTER BUKY;Lu;0;L;;;;;N;;;;2C31;
 2C02;GLAGOLITIC CAPITAL LETTER VEDE;Lu;0;L;;;;;N;;;;2C32;
@@ -10650,6 +10751,11 @@
 2E47;LOW KAVYKA;Po;0;ON;;;;;N;;;;;
 2E48;LOW KAVYKA WITH DOT;Po;0;ON;;;;;N;;;;;
 2E49;DOUBLE STACKED COMMA;Po;0;ON;;;;;N;;;;;
+2E4A;DOTTED SOLIDUS;Po;0;ON;;;;;N;;;;;
+2E4B;TRIPLE DAGGER;Po;0;ON;;;;;N;;;;;
+2E4C;MEDIEVAL COMMA;Po;0;ON;;;;;N;;;;;
+2E4D;PARAGRAPHUS MARK;Po;0;ON;;;;;N;;;;;
+2E4E;PUNCTUS ELEVATUS MARK;Po;0;ON;;;;;N;;;;;
 2E80;CJK RADICAL REPEAT;So;0;ON;;;;;N;;;;;
 2E81;CJK RADICAL CLIFF;So;0;ON;;;;;N;;;;;
 2E82;CJK RADICAL SECOND ONE;So;0;ON;;;;;N;;;;;
@@ -11286,6 +11392,7 @@
 312C;BOPOMOFO LETTER GN;Lo;0;L;;;;;N;;;;;
 312D;BOPOMOFO LETTER IH;Lo;0;L;;;;;N;;;;;
 312E;BOPOMOFO LETTER O WITH DOT ABOVE;Lo;0;L;;;;;N;;;;;
+312F;BOPOMOFO LETTER NN;Lo;0;L;;;;;N;;;;;
 3131;HANGUL LETTER KIYEOK;Lo;0;L;<compat> 1100;;;;N;HANGUL LETTER GIYEOG;;;;
 3132;HANGUL LETTER SSANGKIYEOK;Lo;0;L;<compat> 1101;;;;N;HANGUL LETTER SSANG GIYEOG;;;;
 3133;HANGUL LETTER KIYEOK-SIOS;Lo;0;L;<compat> 11AA;;;;N;HANGUL LETTER GIYEOG SIOS;;;;
@@ -12052,7 +12159,7 @@
 4DFE;HEXAGRAM FOR AFTER COMPLETION;So;0;ON;;;;;N;;;;;
 4DFF;HEXAGRAM FOR BEFORE COMPLETION;So;0;ON;;;;;N;;;;;
 4E00;<CJK Ideograph, First>;Lo;0;L;;;;;N;;;;;
-9FEA;<CJK Ideograph, Last>;Lo;0;L;;;;;N;;;;;
+9FEF;<CJK Ideograph, Last>;Lo;0;L;;;;;N;;;;;
 A000;YI SYLLABLE IT;Lo;0;L;;;;;N;;;;;
 A001;YI SYLLABLE IX;Lo;0;L;;;;;N;;;;;
 A002;YI SYLLABLE I;Lo;0;L;;;;;N;;;;;
@@ -13980,6 +14087,7 @@ A7AB;LATIN CAPITAL LETTER REVERSED OPEN E;Lu;0;L;;;;;N;;;;025C;
 A7AC;LATIN CAPITAL LETTER SCRIPT G;Lu;0;L;;;;;N;;;;0261;
 A7AD;LATIN CAPITAL LETTER L WITH BELT;Lu;0;L;;;;;N;;;;026C;
 A7AE;LATIN CAPITAL LETTER SMALL CAPITAL I;Lu;0;L;;;;;N;;;;026A;
+A7AF;LATIN LETTER SMALL CAPITAL Q;Ll;0;L;;;;;N;;;;;
 A7B0;LATIN CAPITAL LETTER TURNED K;Lu;0;L;;;;;N;;;;029E;
 A7B1;LATIN CAPITAL LETTER TURNED T;Lu;0;L;;;;;N;;;;0287;
 A7B2;LATIN CAPITAL LETTER J WITH CROSSED-TAIL;Lu;0;L;;;;;N;;;;029D;
@@ -13988,6 +14096,8 @@ A7B4;LATIN CAPITAL LETTER BETA;Lu;0;L;;;;;N;;;;A7B5;
 A7B5;LATIN SMALL LETTER BETA;Ll;0;L;;;;;N;;;A7B4;;A7B4
 A7B6;LATIN CAPITAL LETTER OMEGA;Lu;0;L;;;;;N;;;;A7B7;
 A7B7;LATIN SMALL LETTER OMEGA;Ll;0;L;;;;;N;;;A7B6;;A7B6
+A7B8;LATIN CAPITAL LETTER U WITH STROKE;Lu;0;L;;;;;N;;;;A7B9;
+A7B9;LATIN SMALL LETTER U WITH STROKE;Ll;0;L;;;;;N;;;A7B8;;A7B8
 A7F7;LATIN EPIGRAPHIC LETTER SIDEWAYS I;Lo;0;L;;;;;N;;;;;
 A7F8;MODIFIER LETTER CAPITAL H WITH STROKE;Lm;0;L;<super> 0126;;;;N;;;;;
 A7F9;MODIFIER LETTER SMALL LIGATURE OE;Lm;0;L;<super> 0153;;;;N;;;;;
@@ -14219,6 +14329,8 @@ A8FA;DEVANAGARI CARET;Po;0;L;;;;;N;;;;;
 A8FB;DEVANAGARI HEADSTROKE;Lo;0;L;;;;;N;;;;;
 A8FC;DEVANAGARI SIGN SIDDHAM;Po;0;L;;;;;N;;;;;
 A8FD;DEVANAGARI JAIN OM;Lo;0;L;;;;;N;;;;;
+A8FE;DEVANAGARI LETTER AY;Lo;0;L;;;;;N;;;;;
+A8FF;DEVANAGARI VOWEL SIGN AY;Mn;0;NSM;;;;;N;;;;;
 A900;KAYAH LI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
 A901;KAYAH LI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
 A902;KAYAH LI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
@@ -18363,6 +18475,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 10A31;KHAROSHTHI LETTER HA;Lo;0;R;;;;;N;;;;;
 10A32;KHAROSHTHI LETTER KKA;Lo;0;R;;;;;N;;;;;
 10A33;KHAROSHTHI LETTER TTTHA;Lo;0;R;;;;;N;;;;;
+10A34;KHAROSHTHI LETTER TTTA;Lo;0;R;;;;;N;;;;;
+10A35;KHAROSHTHI LETTER VHA;Lo;0;R;;;;;N;;;;;
 10A38;KHAROSHTHI SIGN BAR ABOVE;Mn;230;NSM;;;;;N;;;;;
 10A39;KHAROSHTHI SIGN CAUDA;Mn;1;NSM;;;;;N;;;;;
 10A3A;KHAROSHTHI SIGN DOT BELOW;Mn;220;NSM;;;;;N;;;;;
@@ -18375,6 +18489,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 10A45;KHAROSHTHI NUMBER TWENTY;No;0;R;;;;20;N;;;;;
 10A46;KHAROSHTHI NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
 10A47;KHAROSHTHI NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;;
+10A48;KHAROSHTHI FRACTION ONE HALF;No;0;R;;;;1/2;N;;;;;
 10A50;KHAROSHTHI PUNCTUATION DOT;Po;0;R;;;;;N;;;;;
 10A51;KHAROSHTHI PUNCTUATION SMALL CIRCLE;Po;0;R;;;;;N;;;;;
 10A52;KHAROSHTHI PUNCTUATION CIRCLE;Po;0;R;;;;;N;;;;;
@@ -18827,6 +18942,56 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 10CFD;OLD HUNGARIAN NUMBER FIFTY;No;0;R;;;;50;N;;;;;
 10CFE;OLD HUNGARIAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
 10CFF;OLD HUNGARIAN NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;;
+10D00;HANIFI ROHINGYA LETTER A;Lo;0;AL;;;;;N;;;;;
+10D01;HANIFI ROHINGYA LETTER BA;Lo;0;AL;;;;;N;;;;;
+10D02;HANIFI ROHINGYA LETTER PA;Lo;0;AL;;;;;N;;;;;
+10D03;HANIFI ROHINGYA LETTER TA;Lo;0;AL;;;;;N;;;;;
+10D04;HANIFI ROHINGYA LETTER TTA;Lo;0;AL;;;;;N;;;;;
+10D05;HANIFI ROHINGYA LETTER JA;Lo;0;AL;;;;;N;;;;;
+10D06;HANIFI ROHINGYA LETTER CA;Lo;0;AL;;;;;N;;;;;
+10D07;HANIFI ROHINGYA LETTER HA;Lo;0;AL;;;;;N;;;;;
+10D08;HANIFI ROHINGYA LETTER KHA;Lo;0;AL;;;;;N;;;;;
+10D09;HANIFI ROHINGYA LETTER FA;Lo;0;AL;;;;;N;;;;;
+10D0A;HANIFI ROHINGYA LETTER DA;Lo;0;AL;;;;;N;;;;;
+10D0B;HANIFI ROHINGYA LETTER DDA;Lo;0;AL;;;;;N;;;;;
+10D0C;HANIFI ROHINGYA LETTER RA;Lo;0;AL;;;;;N;;;;;
+10D0D;HANIFI ROHINGYA LETTER RRA;Lo;0;AL;;;;;N;;;;;
+10D0E;HANIFI ROHINGYA LETTER ZA;Lo;0;AL;;;;;N;;;;;
+10D0F;HANIFI ROHINGYA LETTER SA;Lo;0;AL;;;;;N;;;;;
+10D10;HANIFI ROHINGYA LETTER SHA;Lo;0;AL;;;;;N;;;;;
+10D11;HANIFI ROHINGYA LETTER KA;Lo;0;AL;;;;;N;;;;;
+10D12;HANIFI ROHINGYA LETTER GA;Lo;0;AL;;;;;N;;;;;
+10D13;HANIFI ROHINGYA LETTER LA;Lo;0;AL;;;;;N;;;;;
+10D14;HANIFI ROHINGYA LETTER MA;Lo;0;AL;;;;;N;;;;;
+10D15;HANIFI ROHINGYA LETTER NA;Lo;0;AL;;;;;N;;;;;
+10D16;HANIFI ROHINGYA LETTER WA;Lo;0;AL;;;;;N;;;;;
+10D17;HANIFI ROHINGYA LETTER KINNA WA;Lo;0;AL;;;;;N;;;;;
+10D18;HANIFI ROHINGYA LETTER YA;Lo;0;AL;;;;;N;;;;;
+10D19;HANIFI ROHINGYA LETTER KINNA YA;Lo;0;AL;;;;;N;;;;;
+10D1A;HANIFI ROHINGYA LETTER NGA;Lo;0;AL;;;;;N;;;;;
+10D1B;HANIFI ROHINGYA LETTER NYA;Lo;0;AL;;;;;N;;;;;
+10D1C;HANIFI ROHINGYA LETTER VA;Lo;0;AL;;;;;N;;;;;
+10D1D;HANIFI ROHINGYA VOWEL A;Lo;0;AL;;;;;N;;;;;
+10D1E;HANIFI ROHINGYA VOWEL I;Lo;0;AL;;;;;N;;;;;
+10D1F;HANIFI ROHINGYA VOWEL U;Lo;0;AL;;;;;N;;;;;
+10D20;HANIFI ROHINGYA VOWEL E;Lo;0;AL;;;;;N;;;;;
+10D21;HANIFI ROHINGYA VOWEL O;Lo;0;AL;;;;;N;;;;;
+10D22;HANIFI ROHINGYA MARK SAKIN;Lo;0;AL;;;;;N;;;;;
+10D23;HANIFI ROHINGYA MARK NA KHONNA;Lo;0;AL;;;;;N;;;;;
+10D24;HANIFI ROHINGYA SIGN HARBAHAY;Mn;230;NSM;;;;;N;;;;;
+10D25;HANIFI ROHINGYA SIGN TAHALA;Mn;230;NSM;;;;;N;;;;;
+10D26;HANIFI ROHINGYA SIGN TANA;Mn;230;NSM;;;;;N;;;;;
+10D27;HANIFI ROHINGYA SIGN TASSI;Mn;230;NSM;;;;;N;;;;;
+10D30;HANIFI ROHINGYA DIGIT ZERO;Nd;0;AN;;0;0;0;N;;;;;
+10D31;HANIFI ROHINGYA DIGIT ONE;Nd;0;AN;;1;1;1;N;;;;;
+10D32;HANIFI ROHINGYA DIGIT TWO;Nd;0;AN;;2;2;2;N;;;;;
+10D33;HANIFI ROHINGYA DIGIT THREE;Nd;0;AN;;3;3;3;N;;;;;
+10D34;HANIFI ROHINGYA DIGIT FOUR;Nd;0;AN;;4;4;4;N;;;;;
+10D35;HANIFI ROHINGYA DIGIT FIVE;Nd;0;AN;;5;5;5;N;;;;;
+10D36;HANIFI ROHINGYA DIGIT SIX;Nd;0;AN;;6;6;6;N;;;;;
+10D37;HANIFI ROHINGYA DIGIT SEVEN;Nd;0;AN;;7;7;7;N;;;;;
+10D38;HANIFI ROHINGYA DIGIT EIGHT;Nd;0;AN;;8;8;8;N;;;;;
+10D39;HANIFI ROHINGYA DIGIT NINE;Nd;0;AN;;9;9;9;N;;;;;
 10E60;RUMI DIGIT ONE;No;0;AN;;;1;1;N;;;;;
 10E61;RUMI DIGIT TWO;No;0;AN;;;2;2;N;;;;;
 10E62;RUMI DIGIT THREE;No;0;AN;;;3;3;N;;;;;
@@ -18858,6 +19023,88 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 10E7C;RUMI FRACTION ONE QUARTER;No;0;AN;;;;1/4;N;;;;;
 10E7D;RUMI FRACTION ONE THIRD;No;0;AN;;;;1/3;N;;;;;
 10E7E;RUMI FRACTION TWO THIRDS;No;0;AN;;;;2/3;N;;;;;
+10F00;OLD SOGDIAN LETTER ALEPH;Lo;0;R;;;;;N;;;;;
+10F01;OLD SOGDIAN LETTER FINAL ALEPH;Lo;0;R;;;;;N;;;;;
+10F02;OLD SOGDIAN LETTER BETH;Lo;0;R;;;;;N;;;;;
+10F03;OLD SOGDIAN LETTER FINAL BETH;Lo;0;R;;;;;N;;;;;
+10F04;OLD SOGDIAN LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+10F05;OLD SOGDIAN LETTER HE;Lo;0;R;;;;;N;;;;;
+10F06;OLD SOGDIAN LETTER FINAL HE;Lo;0;R;;;;;N;;;;;
+10F07;OLD SOGDIAN LETTER WAW;Lo;0;R;;;;;N;;;;;
+10F08;OLD SOGDIAN LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+10F09;OLD SOGDIAN LETTER HETH;Lo;0;R;;;;;N;;;;;
+10F0A;OLD SOGDIAN LETTER YODH;Lo;0;R;;;;;N;;;;;
+10F0B;OLD SOGDIAN LETTER KAPH;Lo;0;R;;;;;N;;;;;
+10F0C;OLD SOGDIAN LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+10F0D;OLD SOGDIAN LETTER MEM;Lo;0;R;;;;;N;;;;;
+10F0E;OLD SOGDIAN LETTER NUN;Lo;0;R;;;;;N;;;;;
+10F0F;OLD SOGDIAN LETTER FINAL NUN;Lo;0;R;;;;;N;;;;;
+10F10;OLD SOGDIAN LETTER FINAL NUN WITH VERTICAL TAIL;Lo;0;R;;;;;N;;;;;
+10F11;OLD SOGDIAN LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+10F12;OLD SOGDIAN LETTER AYIN;Lo;0;R;;;;;N;;;;;
+10F13;OLD SOGDIAN LETTER ALTERNATE AYIN;Lo;0;R;;;;;N;;;;;
+10F14;OLD SOGDIAN LETTER PE;Lo;0;R;;;;;N;;;;;
+10F15;OLD SOGDIAN LETTER SADHE;Lo;0;R;;;;;N;;;;;
+10F16;OLD SOGDIAN LETTER FINAL SADHE;Lo;0;R;;;;;N;;;;;
+10F17;OLD SOGDIAN LETTER FINAL SADHE WITH VERTICAL TAIL;Lo;0;R;;;;;N;;;;;
+10F18;OLD SOGDIAN LETTER RESH-AYIN-DALETH;Lo;0;R;;;;;N;;;;;
+10F19;OLD SOGDIAN LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10F1A;OLD SOGDIAN LETTER TAW;Lo;0;R;;;;;N;;;;;
+10F1B;OLD SOGDIAN LETTER FINAL TAW;Lo;0;R;;;;;N;;;;;
+10F1C;OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL;Lo;0;R;;;;;N;;;;;
+10F1D;OLD SOGDIAN NUMBER ONE;No;0;R;;;;1;N;;;;;
+10F1E;OLD SOGDIAN NUMBER TWO;No;0;R;;;;2;N;;;;;
+10F1F;OLD SOGDIAN NUMBER THREE;No;0;R;;;;3;N;;;;;
+10F20;OLD SOGDIAN NUMBER FOUR;No;0;R;;;;4;N;;;;;
+10F21;OLD SOGDIAN NUMBER FIVE;No;0;R;;;;5;N;;;;;
+10F22;OLD SOGDIAN NUMBER TEN;No;0;R;;;;10;N;;;;;
+10F23;OLD SOGDIAN NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+10F24;OLD SOGDIAN NUMBER THIRTY;No;0;R;;;;30;N;;;;;
+10F25;OLD SOGDIAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+10F26;OLD SOGDIAN FRACTION ONE HALF;No;0;R;;;;1/2;N;;;;;
+10F27;OLD SOGDIAN LIGATURE AYIN-DALETH;Lo;0;R;;;;;N;;;;;
+10F30;SOGDIAN LETTER ALEPH;Lo;0;AL;;;;;N;;;;;
+10F31;SOGDIAN LETTER BETH;Lo;0;AL;;;;;N;;;;;
+10F32;SOGDIAN LETTER GIMEL;Lo;0;AL;;;;;N;;;;;
+10F33;SOGDIAN LETTER HE;Lo;0;AL;;;;;N;;;;;
+10F34;SOGDIAN LETTER WAW;Lo;0;AL;;;;;N;;;;;
+10F35;SOGDIAN LETTER ZAYIN;Lo;0;AL;;;;;N;;;;;
+10F36;SOGDIAN LETTER HETH;Lo;0;AL;;;;;N;;;;;
+10F37;SOGDIAN LETTER YODH;Lo;0;AL;;;;;N;;;;;
+10F38;SOGDIAN LETTER KAPH;Lo;0;AL;;;;;N;;;;;
+10F39;SOGDIAN LETTER LAMEDH;Lo;0;AL;;;;;N;;;;;
+10F3A;SOGDIAN LETTER MEM;Lo;0;AL;;;;;N;;;;;
+10F3B;SOGDIAN LETTER NUN;Lo;0;AL;;;;;N;;;;;
+10F3C;SOGDIAN LETTER SAMEKH;Lo;0;AL;;;;;N;;;;;
+10F3D;SOGDIAN LETTER AYIN;Lo;0;AL;;;;;N;;;;;
+10F3E;SOGDIAN LETTER PE;Lo;0;AL;;;;;N;;;;;
+10F3F;SOGDIAN LETTER SADHE;Lo;0;AL;;;;;N;;;;;
+10F40;SOGDIAN LETTER RESH-AYIN;Lo;0;AL;;;;;N;;;;;
+10F41;SOGDIAN LETTER SHIN;Lo;0;AL;;;;;N;;;;;
+10F42;SOGDIAN LETTER TAW;Lo;0;AL;;;;;N;;;;;
+10F43;SOGDIAN LETTER FETH;Lo;0;AL;;;;;N;;;;;
+10F44;SOGDIAN LETTER LESH;Lo;0;AL;;;;;N;;;;;
+10F45;SOGDIAN INDEPENDENT SHIN;Lo;0;AL;;;;;N;;;;;
+10F46;SOGDIAN COMBINING DOT BELOW;Mn;220;NSM;;;;;N;;;;;
+10F47;SOGDIAN COMBINING TWO DOTS BELOW;Mn;220;NSM;;;;;N;;;;;
+10F48;SOGDIAN COMBINING DOT ABOVE;Mn;230;NSM;;;;;N;;;;;
+10F49;SOGDIAN COMBINING TWO DOTS ABOVE;Mn;230;NSM;;;;;N;;;;;
+10F4A;SOGDIAN COMBINING CURVE ABOVE;Mn;230;NSM;;;;;N;;;;;
+10F4B;SOGDIAN COMBINING CURVE BELOW;Mn;220;NSM;;;;;N;;;;;
+10F4C;SOGDIAN COMBINING HOOK ABOVE;Mn;230;NSM;;;;;N;;;;;
+10F4D;SOGDIAN COMBINING HOOK BELOW;Mn;220;NSM;;;;;N;;;;;
+10F4E;SOGDIAN COMBINING LONG HOOK BELOW;Mn;220;NSM;;;;;N;;;;;
+10F4F;SOGDIAN COMBINING RESH BELOW;Mn;220;NSM;;;;;N;;;;;
+10F50;SOGDIAN COMBINING STROKE BELOW;Mn;220;NSM;;;;;N;;;;;
+10F51;SOGDIAN NUMBER ONE;No;0;AL;;;;1;N;;;;;
+10F52;SOGDIAN NUMBER TEN;No;0;AL;;;;10;N;;;;;
+10F53;SOGDIAN NUMBER TWENTY;No;0;AL;;;;20;N;;;;;
+10F54;SOGDIAN NUMBER ONE HUNDRED;No;0;AL;;;;100;N;;;;;
+10F55;SOGDIAN PUNCTUATION TWO VERTICAL BARS;Po;0;AL;;;;;N;;;;;
+10F56;SOGDIAN PUNCTUATION TWO VERTICAL BARS WITH DOTS;Po;0;AL;;;;;N;;;;;
+10F57;SOGDIAN PUNCTUATION CIRCLE WITH DOT;Po;0;AL;;;;;N;;;;;
+10F58;SOGDIAN PUNCTUATION TWO CIRCLES WITH DOTS;Po;0;AL;;;;;N;;;;;
+10F59;SOGDIAN PUNCTUATION HALF CIRCLE WITH DOT;Po;0;AL;;;;;N;;;;;
 11000;BRAHMI SIGN CANDRABINDU;Mc;0;L;;;;;N;;;;;
 11001;BRAHMI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
 11002;BRAHMI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
@@ -19033,6 +19280,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 110BF;KAITHI DOUBLE SECTION MARK;Po;0;L;;;;;N;;;;;
 110C0;KAITHI DANDA;Po;0;L;;;;;N;;;;;
 110C1;KAITHI DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+110CD;KAITHI NUMBER SIGN ABOVE;Cf;0;L;;;;;N;;;;;
 110D0;SORA SOMPENG LETTER SAH;Lo;0;L;;;;;N;;;;;
 110D1;SORA SOMPENG LETTER TAH;Lo;0;L;;;;;N;;;;;
 110D2;SORA SOMPENG LETTER BAH;Lo;0;L;;;;;N;;;;;
@@ -19135,6 +19383,9 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 11141;CHAKMA DANDA;Po;0;L;;;;;N;;;;;
 11142;CHAKMA DOUBLE DANDA;Po;0;L;;;;;N;;;;;
 11143;CHAKMA QUESTION MARK;Po;0;L;;;;;N;;;;;
+11144;CHAKMA LETTER LHAA;Lo;0;L;;;;;N;;;;;
+11145;CHAKMA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+11146;CHAKMA VOWEL SIGN EI;Mc;0;L;;;;;N;;;;;
 11150;MAHAJANI LETTER A;Lo;0;L;;;;;N;;;;;
 11151;MAHAJANI LETTER I;Lo;0;L;;;;;N;;;;;
 11152;MAHAJANI LETTER U;Lo;0;L;;;;;N;;;;;
@@ -19247,7 +19498,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 111C6;SHARADA DOUBLE DANDA;Po;0;L;;;;;N;;;;;
 111C7;SHARADA ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
 111C8;SHARADA SEPARATOR;Po;0;L;;;;;N;;;;;
-111C9;SHARADA SANDHI MARK;Po;0;L;;;;;N;;;;;
+111C9;SHARADA SANDHI MARK;Mn;0;NSM;;;;;N;;;;;
 111CA;SHARADA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
 111CB;SHARADA VOWEL MODIFIER MARK;Mn;0;NSM;;;;;N;;;;;
 111CC;SHARADA EXTRA SHORT VOWEL MARK;Mn;0;NSM;;;;;N;;;;;
@@ -19507,6 +19758,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 11337;GRANTHA LETTER SSA;Lo;0;L;;;;;N;;;;;
 11338;GRANTHA LETTER SA;Lo;0;L;;;;;N;;;;;
 11339;GRANTHA LETTER HA;Lo;0;L;;;;;N;;;;;
+1133B;COMBINING BINDU BELOW;Mn;7;NSM;;;;;N;;;;;
 1133C;GRANTHA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
 1133D;GRANTHA SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
 1133E;GRANTHA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
@@ -19634,6 +19886,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 11459;NEWA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
 1145B;NEWA PLACEHOLDER MARK;Po;0;L;;;;;N;;;;;
 1145D;NEWA INSERTION SIGN;Po;0;L;;;;;N;;;;;
+1145E;NEWA SANDHI MARK;Mn;230;NSM;;;;;N;;;;;
 11480;TIRHUTA ANJI;Lo;0;L;;;;;N;;;;;
 11481;TIRHUTA LETTER A;Lo;0;L;;;;;N;;;;;
 11482;TIRHUTA LETTER AA;Lo;0;L;;;;;N;;;;;
@@ -19992,6 +20245,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 11717;AHOM LETTER GHA;Lo;0;L;;;;;N;;;;;
 11718;AHOM LETTER BHA;Lo;0;L;;;;;N;;;;;
 11719;AHOM LETTER JHA;Lo;0;L;;;;;N;;;;;
+1171A;AHOM LETTER ALTERNATE BA;Lo;0;L;;;;;N;;;;;
 1171D;AHOM CONSONANT SIGN MEDIAL LA;Mn;0;NSM;;;;;N;;;;;
 1171E;AHOM CONSONANT SIGN MEDIAL RA;Mn;0;NSM;;;;;N;;;;;
 1171F;AHOM CONSONANT SIGN MEDIAL LIGATING RA;Mn;0;NSM;;;;;N;;;;;
@@ -20023,6 +20277,66 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1173D;AHOM SIGN SECTION;Po;0;L;;;;;N;;;;;
 1173E;AHOM SIGN RULAI;Po;0;L;;;;;N;;;;;
 1173F;AHOM SYMBOL VI;So;0;L;;;;;N;;;;;
+11800;DOGRA LETTER A;Lo;0;L;;;;;N;;;;;
+11801;DOGRA LETTER AA;Lo;0;L;;;;;N;;;;;
+11802;DOGRA LETTER I;Lo;0;L;;;;;N;;;;;
+11803;DOGRA LETTER II;Lo;0;L;;;;;N;;;;;
+11804;DOGRA LETTER U;Lo;0;L;;;;;N;;;;;
+11805;DOGRA LETTER UU;Lo;0;L;;;;;N;;;;;
+11806;DOGRA LETTER E;Lo;0;L;;;;;N;;;;;
+11807;DOGRA LETTER AI;Lo;0;L;;;;;N;;;;;
+11808;DOGRA LETTER O;Lo;0;L;;;;;N;;;;;
+11809;DOGRA LETTER AU;Lo;0;L;;;;;N;;;;;
+1180A;DOGRA LETTER KA;Lo;0;L;;;;;N;;;;;
+1180B;DOGRA LETTER KHA;Lo;0;L;;;;;N;;;;;
+1180C;DOGRA LETTER GA;Lo;0;L;;;;;N;;;;;
+1180D;DOGRA LETTER GHA;Lo;0;L;;;;;N;;;;;
+1180E;DOGRA LETTER NGA;Lo;0;L;;;;;N;;;;;
+1180F;DOGRA LETTER CA;Lo;0;L;;;;;N;;;;;
+11810;DOGRA LETTER CHA;Lo;0;L;;;;;N;;;;;
+11811;DOGRA LETTER JA;Lo;0;L;;;;;N;;;;;
+11812;DOGRA LETTER JHA;Lo;0;L;;;;;N;;;;;
+11813;DOGRA LETTER NYA;Lo;0;L;;;;;N;;;;;
+11814;DOGRA LETTER TTA;Lo;0;L;;;;;N;;;;;
+11815;DOGRA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11816;DOGRA LETTER DDA;Lo;0;L;;;;;N;;;;;
+11817;DOGRA LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11818;DOGRA LETTER NNA;Lo;0;L;;;;;N;;;;;
+11819;DOGRA LETTER TA;Lo;0;L;;;;;N;;;;;
+1181A;DOGRA LETTER THA;Lo;0;L;;;;;N;;;;;
+1181B;DOGRA LETTER DA;Lo;0;L;;;;;N;;;;;
+1181C;DOGRA LETTER DHA;Lo;0;L;;;;;N;;;;;
+1181D;DOGRA LETTER NA;Lo;0;L;;;;;N;;;;;
+1181E;DOGRA LETTER PA;Lo;0;L;;;;;N;;;;;
+1181F;DOGRA LETTER PHA;Lo;0;L;;;;;N;;;;;
+11820;DOGRA LETTER BA;Lo;0;L;;;;;N;;;;;
+11821;DOGRA LETTER BHA;Lo;0;L;;;;;N;;;;;
+11822;DOGRA LETTER MA;Lo;0;L;;;;;N;;;;;
+11823;DOGRA LETTER YA;Lo;0;L;;;;;N;;;;;
+11824;DOGRA LETTER RA;Lo;0;L;;;;;N;;;;;
+11825;DOGRA LETTER LA;Lo;0;L;;;;;N;;;;;
+11826;DOGRA LETTER VA;Lo;0;L;;;;;N;;;;;
+11827;DOGRA LETTER SHA;Lo;0;L;;;;;N;;;;;
+11828;DOGRA LETTER SSA;Lo;0;L;;;;;N;;;;;
+11829;DOGRA LETTER SA;Lo;0;L;;;;;N;;;;;
+1182A;DOGRA LETTER HA;Lo;0;L;;;;;N;;;;;
+1182B;DOGRA LETTER RRA;Lo;0;L;;;;;N;;;;;
+1182C;DOGRA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+1182D;DOGRA VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+1182E;DOGRA VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+1182F;DOGRA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11830;DOGRA VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+11831;DOGRA VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+11832;DOGRA VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+11833;DOGRA VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+11834;DOGRA VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+11835;DOGRA VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+11836;DOGRA VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+11837;DOGRA SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11838;DOGRA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11839;DOGRA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+1183A;DOGRA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+1183B;DOGRA ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
 118A0;WARANG CITI CAPITAL LETTER NGAA;Lu;0;L;;;;;N;;;;118C0;
 118A1;WARANG CITI CAPITAL LETTER A;Lu;0;L;;;;;N;;;;118C1;
 118A2;WARANG CITI CAPITAL LETTER WI;Lu;0;L;;;;;N;;;;118C2;
@@ -20114,8 +20428,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 11A04;ZANABAZAR SQUARE VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
 11A05;ZANABAZAR SQUARE VOWEL SIGN OE;Mn;0;NSM;;;;;N;;;;;
 11A06;ZANABAZAR SQUARE VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
-11A07;ZANABAZAR SQUARE VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
-11A08;ZANABAZAR SQUARE VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+11A07;ZANABAZAR SQUARE VOWEL SIGN AI;Mn;0;L;;;;;N;;;;;
+11A08;ZANABAZAR SQUARE VOWEL SIGN AU;Mn;0;L;;;;;N;;;;;
 11A09;ZANABAZAR SQUARE VOWEL SIGN REVERSED I;Mn;0;NSM;;;;;N;;;;;
 11A0A;ZANABAZAR SQUARE VOWEL LENGTH MARK;Mn;0;NSM;;;;;N;;;;;
 11A0B;ZANABAZAR SQUARE LETTER KA;Lo;0;L;;;;;N;;;;;
@@ -20254,6 +20568,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 11A9A;SOYOMBO MARK TSHEG;Po;0;L;;;;;N;;;;;
 11A9B;SOYOMBO MARK SHAD;Po;0;L;;;;;N;;;;;
 11A9C;SOYOMBO MARK DOUBLE SHAD;Po;0;L;;;;;N;;;;;
+11A9D;SOYOMBO MARK PLUTA;Lo;0;L;;;;;N;;;;;
 11A9E;SOYOMBO HEAD MARK WITH MOON AND SUN AND TRIPLE FLAME;Po;0;L;;;;;N;;;;;
 11A9F;SOYOMBO HEAD MARK WITH MOON AND SUN AND FLAME;Po;0;L;;;;;N;;;;;
 11AA0;SOYOMBO HEAD MARK WITH MOON AND SUN;Po;0;L;;;;;N;;;;;
@@ -20556,6 +20871,94 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 11D57;MASARAM GONDI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
 11D58;MASARAM GONDI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
 11D59;MASARAM GONDI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+11D60;GUNJALA GONDI LETTER A;Lo;0;L;;;;;N;;;;;
+11D61;GUNJALA GONDI LETTER AA;Lo;0;L;;;;;N;;;;;
+11D62;GUNJALA GONDI LETTER I;Lo;0;L;;;;;N;;;;;
+11D63;GUNJALA GONDI LETTER II;Lo;0;L;;;;;N;;;;;
+11D64;GUNJALA GONDI LETTER U;Lo;0;L;;;;;N;;;;;
+11D65;GUNJALA GONDI LETTER UU;Lo;0;L;;;;;N;;;;;
+11D67;GUNJALA GONDI LETTER EE;Lo;0;L;;;;;N;;;;;
+11D68;GUNJALA GONDI LETTER AI;Lo;0;L;;;;;N;;;;;
+11D6A;GUNJALA GONDI LETTER OO;Lo;0;L;;;;;N;;;;;
+11D6B;GUNJALA GONDI LETTER AU;Lo;0;L;;;;;N;;;;;
+11D6C;GUNJALA GONDI LETTER YA;Lo;0;L;;;;;N;;;;;
+11D6D;GUNJALA GONDI LETTER VA;Lo;0;L;;;;;N;;;;;
+11D6E;GUNJALA GONDI LETTER BA;Lo;0;L;;;;;N;;;;;
+11D6F;GUNJALA GONDI LETTER BHA;Lo;0;L;;;;;N;;;;;
+11D70;GUNJALA GONDI LETTER MA;Lo;0;L;;;;;N;;;;;
+11D71;GUNJALA GONDI LETTER KA;Lo;0;L;;;;;N;;;;;
+11D72;GUNJALA GONDI LETTER KHA;Lo;0;L;;;;;N;;;;;
+11D73;GUNJALA GONDI LETTER TA;Lo;0;L;;;;;N;;;;;
+11D74;GUNJALA GONDI LETTER THA;Lo;0;L;;;;;N;;;;;
+11D75;GUNJALA GONDI LETTER LA;Lo;0;L;;;;;N;;;;;
+11D76;GUNJALA GONDI LETTER GA;Lo;0;L;;;;;N;;;;;
+11D77;GUNJALA GONDI LETTER GHA;Lo;0;L;;;;;N;;;;;
+11D78;GUNJALA GONDI LETTER DA;Lo;0;L;;;;;N;;;;;
+11D79;GUNJALA GONDI LETTER DHA;Lo;0;L;;;;;N;;;;;
+11D7A;GUNJALA GONDI LETTER NA;Lo;0;L;;;;;N;;;;;
+11D7B;GUNJALA GONDI LETTER CA;Lo;0;L;;;;;N;;;;;
+11D7C;GUNJALA GONDI LETTER CHA;Lo;0;L;;;;;N;;;;;
+11D7D;GUNJALA GONDI LETTER TTA;Lo;0;L;;;;;N;;;;;
+11D7E;GUNJALA GONDI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11D7F;GUNJALA GONDI LETTER LLA;Lo;0;L;;;;;N;;;;;
+11D80;GUNJALA GONDI LETTER JA;Lo;0;L;;;;;N;;;;;
+11D81;GUNJALA GONDI LETTER JHA;Lo;0;L;;;;;N;;;;;
+11D82;GUNJALA GONDI LETTER DDA;Lo;0;L;;;;;N;;;;;
+11D83;GUNJALA GONDI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11D84;GUNJALA GONDI LETTER NGA;Lo;0;L;;;;;N;;;;;
+11D85;GUNJALA GONDI LETTER PA;Lo;0;L;;;;;N;;;;;
+11D86;GUNJALA GONDI LETTER PHA;Lo;0;L;;;;;N;;;;;
+11D87;GUNJALA GONDI LETTER HA;Lo;0;L;;;;;N;;;;;
+11D88;GUNJALA GONDI LETTER RA;Lo;0;L;;;;;N;;;;;
+11D89;GUNJALA GONDI LETTER SA;Lo;0;L;;;;;N;;;;;
+11D8A;GUNJALA GONDI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+11D8B;GUNJALA GONDI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+11D8C;GUNJALA GONDI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+11D8D;GUNJALA GONDI VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+11D8E;GUNJALA GONDI VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
+11D90;GUNJALA GONDI VOWEL SIGN EE;Mn;0;NSM;;;;;N;;;;;
+11D91;GUNJALA GONDI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+11D93;GUNJALA GONDI VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
+11D94;GUNJALA GONDI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+11D95;GUNJALA GONDI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11D96;GUNJALA GONDI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11D97;GUNJALA GONDI VIRAMA;Mn;9;NSM;;;;;N;;;;;
+11D98;GUNJALA GONDI OM;Lo;0;L;;;;;N;;;;;
+11DA0;GUNJALA GONDI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+11DA1;GUNJALA GONDI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+11DA2;GUNJALA GONDI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+11DA3;GUNJALA GONDI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+11DA4;GUNJALA GONDI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+11DA5;GUNJALA GONDI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+11DA6;GUNJALA GONDI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+11DA7;GUNJALA GONDI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+11DA8;GUNJALA GONDI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+11DA9;GUNJALA GONDI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+11EE0;MAKASAR LETTER KA;Lo;0;L;;;;;N;;;;;
+11EE1;MAKASAR LETTER GA;Lo;0;L;;;;;N;;;;;
+11EE2;MAKASAR LETTER NGA;Lo;0;L;;;;;N;;;;;
+11EE3;MAKASAR LETTER PA;Lo;0;L;;;;;N;;;;;
+11EE4;MAKASAR LETTER BA;Lo;0;L;;;;;N;;;;;
+11EE5;MAKASAR LETTER MA;Lo;0;L;;;;;N;;;;;
+11EE6;MAKASAR LETTER TA;Lo;0;L;;;;;N;;;;;
+11EE7;MAKASAR LETTER DA;Lo;0;L;;;;;N;;;;;
+11EE8;MAKASAR LETTER NA;Lo;0;L;;;;;N;;;;;
+11EE9;MAKASAR LETTER CA;Lo;0;L;;;;;N;;;;;
+11EEA;MAKASAR LETTER JA;Lo;0;L;;;;;N;;;;;
+11EEB;MAKASAR LETTER NYA;Lo;0;L;;;;;N;;;;;
+11EEC;MAKASAR LETTER YA;Lo;0;L;;;;;N;;;;;
+11EED;MAKASAR LETTER RA;Lo;0;L;;;;;N;;;;;
+11EEE;MAKASAR LETTER LA;Lo;0;L;;;;;N;;;;;
+11EEF;MAKASAR LETTER VA;Lo;0;L;;;;;N;;;;;
+11EF0;MAKASAR LETTER SA;Lo;0;L;;;;;N;;;;;
+11EF1;MAKASAR LETTER A;Lo;0;L;;;;;N;;;;;
+11EF2;MAKASAR ANGKA;Lo;0;L;;;;;N;;;;;
+11EF3;MAKASAR VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+11EF4;MAKASAR VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11EF5;MAKASAR VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+11EF6;MAKASAR VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+11EF7;MAKASAR PASSIMBANG;Po;0;L;;;;;N;;;;;
+11EF8;MAKASAR END OF SECTION;Po;0;L;;;;;N;;;;;
 12000;CUNEIFORM SIGN A;Lo;0;L;;;;;N;;;;;
 12001;CUNEIFORM SIGN A TIMES A;Lo;0;L;;;;;N;;;;;
 12002;CUNEIFORM SIGN A TIMES BAD;Lo;0;L;;;;;N;;;;;
@@ -24219,6 +24622,97 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 16B8D;PAHAWH HMONG CLAN SIGN TSWB;Lo;0;L;;;;;N;;;;;
 16B8E;PAHAWH HMONG CLAN SIGN KWM;Lo;0;L;;;;;N;;;;;
 16B8F;PAHAWH HMONG CLAN SIGN VWJ;Lo;0;L;;;;;N;;;;;
+16E40;MEDEFAIDRIN CAPITAL LETTER M;Lu;0;L;;;;;N;;;;16E60;
+16E41;MEDEFAIDRIN CAPITAL LETTER S;Lu;0;L;;;;;N;;;;16E61;
+16E42;MEDEFAIDRIN CAPITAL LETTER V;Lu;0;L;;;;;N;;;;16E62;
+16E43;MEDEFAIDRIN CAPITAL LETTER W;Lu;0;L;;;;;N;;;;16E63;
+16E44;MEDEFAIDRIN CAPITAL LETTER ATIU;Lu;0;L;;;;;N;;;;16E64;
+16E45;MEDEFAIDRIN CAPITAL LETTER Z;Lu;0;L;;;;;N;;;;16E65;
+16E46;MEDEFAIDRIN CAPITAL LETTER KP;Lu;0;L;;;;;N;;;;16E66;
+16E47;MEDEFAIDRIN CAPITAL LETTER P;Lu;0;L;;;;;N;;;;16E67;
+16E48;MEDEFAIDRIN CAPITAL LETTER T;Lu;0;L;;;;;N;;;;16E68;
+16E49;MEDEFAIDRIN CAPITAL LETTER G;Lu;0;L;;;;;N;;;;16E69;
+16E4A;MEDEFAIDRIN CAPITAL LETTER F;Lu;0;L;;;;;N;;;;16E6A;
+16E4B;MEDEFAIDRIN CAPITAL LETTER I;Lu;0;L;;;;;N;;;;16E6B;
+16E4C;MEDEFAIDRIN CAPITAL LETTER K;Lu;0;L;;;;;N;;;;16E6C;
+16E4D;MEDEFAIDRIN CAPITAL LETTER A;Lu;0;L;;;;;N;;;;16E6D;
+16E4E;MEDEFAIDRIN CAPITAL LETTER J;Lu;0;L;;;;;N;;;;16E6E;
+16E4F;MEDEFAIDRIN CAPITAL LETTER E;Lu;0;L;;;;;N;;;;16E6F;
+16E50;MEDEFAIDRIN CAPITAL LETTER B;Lu;0;L;;;;;N;;;;16E70;
+16E51;MEDEFAIDRIN CAPITAL LETTER C;Lu;0;L;;;;;N;;;;16E71;
+16E52;MEDEFAIDRIN CAPITAL LETTER U;Lu;0;L;;;;;N;;;;16E72;
+16E53;MEDEFAIDRIN CAPITAL LETTER YU;Lu;0;L;;;;;N;;;;16E73;
+16E54;MEDEFAIDRIN CAPITAL LETTER L;Lu;0;L;;;;;N;;;;16E74;
+16E55;MEDEFAIDRIN CAPITAL LETTER Q;Lu;0;L;;;;;N;;;;16E75;
+16E56;MEDEFAIDRIN CAPITAL LETTER HP;Lu;0;L;;;;;N;;;;16E76;
+16E57;MEDEFAIDRIN CAPITAL LETTER NY;Lu;0;L;;;;;N;;;;16E77;
+16E58;MEDEFAIDRIN CAPITAL LETTER X;Lu;0;L;;;;;N;;;;16E78;
+16E59;MEDEFAIDRIN CAPITAL LETTER D;Lu;0;L;;;;;N;;;;16E79;
+16E5A;MEDEFAIDRIN CAPITAL LETTER OE;Lu;0;L;;;;;N;;;;16E7A;
+16E5B;MEDEFAIDRIN CAPITAL LETTER N;Lu;0;L;;;;;N;;;;16E7B;
+16E5C;MEDEFAIDRIN CAPITAL LETTER R;Lu;0;L;;;;;N;;;;16E7C;
+16E5D;MEDEFAIDRIN CAPITAL LETTER O;Lu;0;L;;;;;N;;;;16E7D;
+16E5E;MEDEFAIDRIN CAPITAL LETTER AI;Lu;0;L;;;;;N;;;;16E7E;
+16E5F;MEDEFAIDRIN CAPITAL LETTER Y;Lu;0;L;;;;;N;;;;16E7F;
+16E60;MEDEFAIDRIN SMALL LETTER M;Ll;0;L;;;;;N;;;16E40;;16E40
+16E61;MEDEFAIDRIN SMALL LETTER S;Ll;0;L;;;;;N;;;16E41;;16E41
+16E62;MEDEFAIDRIN SMALL LETTER V;Ll;0;L;;;;;N;;;16E42;;16E42
+16E63;MEDEFAIDRIN SMALL LETTER W;Ll;0;L;;;;;N;;;16E43;;16E43
+16E64;MEDEFAIDRIN SMALL LETTER ATIU;Ll;0;L;;;;;N;;;16E44;;16E44
+16E65;MEDEFAIDRIN SMALL LETTER Z;Ll;0;L;;;;;N;;;16E45;;16E45
+16E66;MEDEFAIDRIN SMALL LETTER KP;Ll;0;L;;;;;N;;;16E46;;16E46
+16E67;MEDEFAIDRIN SMALL LETTER P;Ll;0;L;;;;;N;;;16E47;;16E47
+16E68;MEDEFAIDRIN SMALL LETTER T;Ll;0;L;;;;;N;;;16E48;;16E48
+16E69;MEDEFAIDRIN SMALL LETTER G;Ll;0;L;;;;;N;;;16E49;;16E49
+16E6A;MEDEFAIDRIN SMALL LETTER F;Ll;0;L;;;;;N;;;16E4A;;16E4A
+16E6B;MEDEFAIDRIN SMALL LETTER I;Ll;0;L;;;;;N;;;16E4B;;16E4B
+16E6C;MEDEFAIDRIN SMALL LETTER K;Ll;0;L;;;;;N;;;16E4C;;16E4C
+16E6D;MEDEFAIDRIN SMALL LETTER A;Ll;0;L;;;;;N;;;16E4D;;16E4D
+16E6E;MEDEFAIDRIN SMALL LETTER J;Ll;0;L;;;;;N;;;16E4E;;16E4E
+16E6F;MEDEFAIDRIN SMALL LETTER E;Ll;0;L;;;;;N;;;16E4F;;16E4F
+16E70;MEDEFAIDRIN SMALL LETTER B;Ll;0;L;;;;;N;;;16E50;;16E50
+16E71;MEDEFAIDRIN SMALL LETTER C;Ll;0;L;;;;;N;;;16E51;;16E51
+16E72;MEDEFAIDRIN SMALL LETTER U;Ll;0;L;;;;;N;;;16E52;;16E52
+16E73;MEDEFAIDRIN SMALL LETTER YU;Ll;0;L;;;;;N;;;16E53;;16E53
+16E74;MEDEFAIDRIN SMALL LETTER L;Ll;0;L;;;;;N;;;16E54;;16E54
+16E75;MEDEFAIDRIN SMALL LETTER Q;Ll;0;L;;;;;N;;;16E55;;16E55
+16E76;MEDEFAIDRIN SMALL LETTER HP;Ll;0;L;;;;;N;;;16E56;;16E56
+16E77;MEDEFAIDRIN SMALL LETTER NY;Ll;0;L;;;;;N;;;16E57;;16E57
+16E78;MEDEFAIDRIN SMALL LETTER X;Ll;0;L;;;;;N;;;16E58;;16E58
+16E79;MEDEFAIDRIN SMALL LETTER D;Ll;0;L;;;;;N;;;16E59;;16E59
+16E7A;MEDEFAIDRIN SMALL LETTER OE;Ll;0;L;;;;;N;;;16E5A;;16E5A
+16E7B;MEDEFAIDRIN SMALL LETTER N;Ll;0;L;;;;;N;;;16E5B;;16E5B
+16E7C;MEDEFAIDRIN SMALL LETTER R;Ll;0;L;;;;;N;;;16E5C;;16E5C
+16E7D;MEDEFAIDRIN SMALL LETTER O;Ll;0;L;;;;;N;;;16E5D;;16E5D
+16E7E;MEDEFAIDRIN SMALL LETTER AI;Ll;0;L;;;;;N;;;16E5E;;16E5E
+16E7F;MEDEFAIDRIN SMALL LETTER Y;Ll;0;L;;;;;N;;;16E5F;;16E5F
+16E80;MEDEFAIDRIN DIGIT ZERO;No;0;L;;;;0;N;;;;;
+16E81;MEDEFAIDRIN DIGIT ONE;No;0;L;;;;1;N;;;;;
+16E82;MEDEFAIDRIN DIGIT TWO;No;0;L;;;;2;N;;;;;
+16E83;MEDEFAIDRIN DIGIT THREE;No;0;L;;;;3;N;;;;;
+16E84;MEDEFAIDRIN DIGIT FOUR;No;0;L;;;;4;N;;;;;
+16E85;MEDEFAIDRIN DIGIT FIVE;No;0;L;;;;5;N;;;;;
+16E86;MEDEFAIDRIN DIGIT SIX;No;0;L;;;;6;N;;;;;
+16E87;MEDEFAIDRIN DIGIT SEVEN;No;0;L;;;;7;N;;;;;
+16E88;MEDEFAIDRIN DIGIT EIGHT;No;0;L;;;;8;N;;;;;
+16E89;MEDEFAIDRIN DIGIT NINE;No;0;L;;;;9;N;;;;;
+16E8A;MEDEFAIDRIN NUMBER TEN;No;0;L;;;;10;N;;;;;
+16E8B;MEDEFAIDRIN NUMBER ELEVEN;No;0;L;;;;11;N;;;;;
+16E8C;MEDEFAIDRIN NUMBER TWELVE;No;0;L;;;;12;N;;;;;
+16E8D;MEDEFAIDRIN NUMBER THIRTEEN;No;0;L;;;;13;N;;;;;
+16E8E;MEDEFAIDRIN NUMBER FOURTEEN;No;0;L;;;;14;N;;;;;
+16E8F;MEDEFAIDRIN NUMBER FIFTEEN;No;0;L;;;;15;N;;;;;
+16E90;MEDEFAIDRIN NUMBER SIXTEEN;No;0;L;;;;16;N;;;;;
+16E91;MEDEFAIDRIN NUMBER SEVENTEEN;No;0;L;;;;17;N;;;;;
+16E92;MEDEFAIDRIN NUMBER EIGHTEEN;No;0;L;;;;18;N;;;;;
+16E93;MEDEFAIDRIN NUMBER NINETEEN;No;0;L;;;;19;N;;;;;
+16E94;MEDEFAIDRIN DIGIT ONE ALTERNATE FORM;No;0;L;;;;1;N;;;;;
+16E95;MEDEFAIDRIN DIGIT TWO ALTERNATE FORM;No;0;L;;;;2;N;;;;;
+16E96;MEDEFAIDRIN DIGIT THREE ALTERNATE FORM;No;0;L;;;;3;N;;;;;
+16E97;MEDEFAIDRIN COMMA;Po;0;L;;;;;N;;;;;
+16E98;MEDEFAIDRIN FULL STOP;Po;0;L;;;;;N;;;;;
+16E99;MEDEFAIDRIN SYMBOL AIVA;Po;0;L;;;;;N;;;;;
+16E9A;MEDEFAIDRIN EXCLAMATION OH;Po;0;L;;;;;N;;;;;
 16F00;MIAO LETTER PA;Lo;0;L;;;;;N;;;;;
 16F01;MIAO LETTER BA;Lo;0;L;;;;;N;;;;;
 16F02;MIAO LETTER YI PA;Lo;0;L;;;;;N;;;;;
@@ -24355,7 +24849,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 16FE0;TANGUT ITERATION MARK;Lm;0;L;;;;;N;;;;;
 16FE1;NUSHU ITERATION MARK;Lm;0;L;;;;;N;;;;;
 17000;<Tangut Ideograph, First>;Lo;0;L;;;;;N;;;;;
-187EC;<Tangut Ideograph, Last>;Lo;0;L;;;;;N;;;;;
+187F1;<Tangut Ideograph, Last>;Lo;0;L;;;;;N;;;;;
 18800;TANGUT COMPONENT-001;Lo;0;L;;;;;N;;;;;
 18801;TANGUT COMPONENT-002;Lo;0;L;;;;;N;;;;;
 18802;TANGUT COMPONENT-003;Lo;0;L;;;;;N;;;;;
@@ -26488,6 +26982,26 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1D243;COMBINING GREEK MUSICAL TETRASEME;Mn;230;NSM;;;;;N;;;;;
 1D244;COMBINING GREEK MUSICAL PENTASEME;Mn;230;NSM;;;;;N;;;;;
 1D245;GREEK MUSICAL LEIMMA;So;0;ON;;;;;N;;;;;
+1D2E0;MAYAN NUMERAL ZERO;No;0;L;;;;0;N;;;;;
+1D2E1;MAYAN NUMERAL ONE;No;0;L;;;;1;N;;;;;
+1D2E2;MAYAN NUMERAL TWO;No;0;L;;;;2;N;;;;;
+1D2E3;MAYAN NUMERAL THREE;No;0;L;;;;3;N;;;;;
+1D2E4;MAYAN NUMERAL FOUR;No;0;L;;;;4;N;;;;;
+1D2E5;MAYAN NUMERAL FIVE;No;0;L;;;;5;N;;;;;
+1D2E6;MAYAN NUMERAL SIX;No;0;L;;;;6;N;;;;;
+1D2E7;MAYAN NUMERAL SEVEN;No;0;L;;;;7;N;;;;;
+1D2E8;MAYAN NUMERAL EIGHT;No;0;L;;;;8;N;;;;;
+1D2E9;MAYAN NUMERAL NINE;No;0;L;;;;9;N;;;;;
+1D2EA;MAYAN NUMERAL TEN;No;0;L;;;;10;N;;;;;
+1D2EB;MAYAN NUMERAL ELEVEN;No;0;L;;;;11;N;;;;;
+1D2EC;MAYAN NUMERAL TWELVE;No;0;L;;;;12;N;;;;;
+1D2ED;MAYAN NUMERAL THIRTEEN;No;0;L;;;;13;N;;;;;
+1D2EE;MAYAN NUMERAL FOURTEEN;No;0;L;;;;14;N;;;;;
+1D2EF;MAYAN NUMERAL FIFTEEN;No;0;L;;;;15;N;;;;;
+1D2F0;MAYAN NUMERAL SIXTEEN;No;0;L;;;;16;N;;;;;
+1D2F1;MAYAN NUMERAL SEVENTEEN;No;0;L;;;;17;N;;;;;
+1D2F2;MAYAN NUMERAL EIGHTEEN;No;0;L;;;;18;N;;;;;
+1D2F3;MAYAN NUMERAL NINETEEN;No;0;L;;;;19;N;;;;;
 1D300;MONOGRAM FOR EARTH;So;0;ON;;;;;N;;;;;
 1D301;DIGRAM FOR HEAVENLY EARTH;So;0;ON;;;;;N;;;;;
 1D302;DIGRAM FOR HUMAN EARTH;So;0;ON;;;;;N;;;;;
@@ -26593,6 +27107,13 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1D36F;COUNTING ROD TENS DIGIT SEVEN;No;0;L;;;;70;N;;;;;
 1D370;COUNTING ROD TENS DIGIT EIGHT;No;0;L;;;;80;N;;;;;
 1D371;COUNTING ROD TENS DIGIT NINE;No;0;L;;;;90;N;;;;;
+1D372;IDEOGRAPHIC TALLY MARK ONE;No;0;L;;;;1;N;;;;;
+1D373;IDEOGRAPHIC TALLY MARK TWO;No;0;L;;;;2;N;;;;;
+1D374;IDEOGRAPHIC TALLY MARK THREE;No;0;L;;;;3;N;;;;;
+1D375;IDEOGRAPHIC TALLY MARK FOUR;No;0;L;;;;4;N;;;;;
+1D376;IDEOGRAPHIC TALLY MARK FIVE;No;0;L;;;;5;N;;;;;
+1D377;TALLY MARK ONE;No;0;L;;;;1;N;;;;;
+1D378;TALLY MARK FIVE;No;0;L;;;;5;N;;;;;
 1D400;MATHEMATICAL BOLD CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
 1D401;MATHEMATICAL BOLD CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
 1D402;MATHEMATICAL BOLD CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
@@ -28599,6 +29120,74 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1E959;ADLAM DIGIT NINE;Nd;0;R;;9;9;9;N;;;;;
 1E95E;ADLAM INITIAL EXCLAMATION MARK;Po;0;R;;;;;N;;;;;
 1E95F;ADLAM INITIAL QUESTION MARK;Po;0;R;;;;;N;;;;;
+1EC71;INDIC SIYAQ NUMBER ONE;No;0;AL;;;;1;N;;;;;
+1EC72;INDIC SIYAQ NUMBER TWO;No;0;AL;;;;2;N;;;;;
+1EC73;INDIC SIYAQ NUMBER THREE;No;0;AL;;;;3;N;;;;;
+1EC74;INDIC SIYAQ NUMBER FOUR;No;0;AL;;;;4;N;;;;;
+1EC75;INDIC SIYAQ NUMBER FIVE;No;0;AL;;;;5;N;;;;;
+1EC76;INDIC SIYAQ NUMBER SIX;No;0;AL;;;;6;N;;;;;
+1EC77;INDIC SIYAQ NUMBER SEVEN;No;0;AL;;;;7;N;;;;;
+1EC78;INDIC SIYAQ NUMBER EIGHT;No;0;AL;;;;8;N;;;;;
+1EC79;INDIC SIYAQ NUMBER NINE;No;0;AL;;;;9;N;;;;;
+1EC7A;INDIC SIYAQ NUMBER TEN;No;0;AL;;;;10;N;;;;;
+1EC7B;INDIC SIYAQ NUMBER TWENTY;No;0;AL;;;;20;N;;;;;
+1EC7C;INDIC SIYAQ NUMBER THIRTY;No;0;AL;;;;30;N;;;;;
+1EC7D;INDIC SIYAQ NUMBER FORTY;No;0;AL;;;;40;N;;;;;
+1EC7E;INDIC SIYAQ NUMBER FIFTY;No;0;AL;;;;50;N;;;;;
+1EC7F;INDIC SIYAQ NUMBER SIXTY;No;0;AL;;;;60;N;;;;;
+1EC80;INDIC SIYAQ NUMBER SEVENTY;No;0;AL;;;;70;N;;;;;
+1EC81;INDIC SIYAQ NUMBER EIGHTY;No;0;AL;;;;80;N;;;;;
+1EC82;INDIC SIYAQ NUMBER NINETY;No;0;AL;;;;90;N;;;;;
+1EC83;INDIC SIYAQ NUMBER ONE HUNDRED;No;0;AL;;;;100;N;;;;;
+1EC84;INDIC SIYAQ NUMBER TWO HUNDRED;No;0;AL;;;;200;N;;;;;
+1EC85;INDIC SIYAQ NUMBER THREE HUNDRED;No;0;AL;;;;300;N;;;;;
+1EC86;INDIC SIYAQ NUMBER FOUR HUNDRED;No;0;AL;;;;400;N;;;;;
+1EC87;INDIC SIYAQ NUMBER FIVE HUNDRED;No;0;AL;;;;500;N;;;;;
+1EC88;INDIC SIYAQ NUMBER SIX HUNDRED;No;0;AL;;;;600;N;;;;;
+1EC89;INDIC SIYAQ NUMBER SEVEN HUNDRED;No;0;AL;;;;700;N;;;;;
+1EC8A;INDIC SIYAQ NUMBER EIGHT HUNDRED;No;0;AL;;;;800;N;;;;;
+1EC8B;INDIC SIYAQ NUMBER NINE HUNDRED;No;0;AL;;;;900;N;;;;;
+1EC8C;INDIC SIYAQ NUMBER ONE THOUSAND;No;0;AL;;;;1000;N;;;;;
+1EC8D;INDIC SIYAQ NUMBER TWO THOUSAND;No;0;AL;;;;2000;N;;;;;
+1EC8E;INDIC SIYAQ NUMBER THREE THOUSAND;No;0;AL;;;;3000;N;;;;;
+1EC8F;INDIC SIYAQ NUMBER FOUR THOUSAND;No;0;AL;;;;4000;N;;;;;
+1EC90;INDIC SIYAQ NUMBER FIVE THOUSAND;No;0;AL;;;;5000;N;;;;;
+1EC91;INDIC SIYAQ NUMBER SIX THOUSAND;No;0;AL;;;;6000;N;;;;;
+1EC92;INDIC SIYAQ NUMBER SEVEN THOUSAND;No;0;AL;;;;7000;N;;;;;
+1EC93;INDIC SIYAQ NUMBER EIGHT THOUSAND;No;0;AL;;;;8000;N;;;;;
+1EC94;INDIC SIYAQ NUMBER NINE THOUSAND;No;0;AL;;;;9000;N;;;;;
+1EC95;INDIC SIYAQ NUMBER TEN THOUSAND;No;0;AL;;;;10000;N;;;;;
+1EC96;INDIC SIYAQ NUMBER TWENTY THOUSAND;No;0;AL;;;;20000;N;;;;;
+1EC97;INDIC SIYAQ NUMBER THIRTY THOUSAND;No;0;AL;;;;30000;N;;;;;
+1EC98;INDIC SIYAQ NUMBER FORTY THOUSAND;No;0;AL;;;;40000;N;;;;;
+1EC99;INDIC SIYAQ NUMBER FIFTY THOUSAND;No;0;AL;;;;50000;N;;;;;
+1EC9A;INDIC SIYAQ NUMBER SIXTY THOUSAND;No;0;AL;;;;60000;N;;;;;
+1EC9B;INDIC SIYAQ NUMBER SEVENTY THOUSAND;No;0;AL;;;;70000;N;;;;;
+1EC9C;INDIC SIYAQ NUMBER EIGHTY THOUSAND;No;0;AL;;;;80000;N;;;;;
+1EC9D;INDIC SIYAQ NUMBER NINETY THOUSAND;No;0;AL;;;;90000;N;;;;;
+1EC9E;INDIC SIYAQ NUMBER LAKH;No;0;AL;;;;100000;N;;;;;
+1EC9F;INDIC SIYAQ NUMBER LAKHAN;No;0;AL;;;;200000;N;;;;;
+1ECA0;INDIC SIYAQ LAKH MARK;No;0;AL;;;;100000;N;;;;;
+1ECA1;INDIC SIYAQ NUMBER KAROR;No;0;AL;;;;10000000;N;;;;;
+1ECA2;INDIC SIYAQ NUMBER KARORAN;No;0;AL;;;;20000000;N;;;;;
+1ECA3;INDIC SIYAQ NUMBER PREFIXED ONE;No;0;AL;;;;1;N;;;;;
+1ECA4;INDIC SIYAQ NUMBER PREFIXED TWO;No;0;AL;;;;2;N;;;;;
+1ECA5;INDIC SIYAQ NUMBER PREFIXED THREE;No;0;AL;;;;3;N;;;;;
+1ECA6;INDIC SIYAQ NUMBER PREFIXED FOUR;No;0;AL;;;;4;N;;;;;
+1ECA7;INDIC SIYAQ NUMBER PREFIXED FIVE;No;0;AL;;;;5;N;;;;;
+1ECA8;INDIC SIYAQ NUMBER PREFIXED SIX;No;0;AL;;;;6;N;;;;;
+1ECA9;INDIC SIYAQ NUMBER PREFIXED SEVEN;No;0;AL;;;;7;N;;;;;
+1ECAA;INDIC SIYAQ NUMBER PREFIXED EIGHT;No;0;AL;;;;8;N;;;;;
+1ECAB;INDIC SIYAQ NUMBER PREFIXED NINE;No;0;AL;;;;9;N;;;;;
+1ECAC;INDIC SIYAQ PLACEHOLDER;So;0;AL;;;;;N;;;;;
+1ECAD;INDIC SIYAQ FRACTION ONE QUARTER;No;0;AL;;;;1/4;N;;;;;
+1ECAE;INDIC SIYAQ FRACTION ONE HALF;No;0;AL;;;;1/2;N;;;;;
+1ECAF;INDIC SIYAQ FRACTION THREE QUARTERS;No;0;AL;;;;3/4;N;;;;;
+1ECB0;INDIC SIYAQ RUPEE MARK;Sc;0;AL;;;;;N;;;;;
+1ECB1;INDIC SIYAQ NUMBER ALTERNATE ONE;No;0;AL;;;;1;N;;;;;
+1ECB2;INDIC SIYAQ NUMBER ALTERNATE TWO;No;0;AL;;;;2;N;;;;;
+1ECB3;INDIC SIYAQ NUMBER ALTERNATE TEN THOUSAND;No;0;AL;;;;10000;N;;;;;
+1ECB4;INDIC SIYAQ ALTERNATE LAKH MARK;No;0;AL;;;;100000;N;;;;;
 1EE00;ARABIC MATHEMATICAL ALEF;Lo;0;AL;<font> 0627;;;;N;;;;;
 1EE01;ARABIC MATHEMATICAL BEH;Lo;0;AL;<font> 0628;;;;N;;;;;
 1EE02;ARABIC MATHEMATICAL JEEM;Lo;0;AL;<font> 062C;;;;N;;;;;
@@ -29012,6 +29601,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F12C;CIRCLED ITALIC LATIN CAPITAL LETTER R;So;0;L;<circle> 0052;;;;N;;;;;
 1F12D;CIRCLED CD;So;0;L;<circle> 0043 0044;;;;N;;;;;
 1F12E;CIRCLED WZ;So;0;L;<circle> 0057 005A;;;;N;;;;;
+1F12F;COPYLEFT SYMBOL;So;0;ON;;;;;N;;;;;
 1F130;SQUARED LATIN CAPITAL LETTER A;So;0;L;<square> 0041;;;;N;;;;;
 1F131;SQUARED LATIN CAPITAL LETTER B;So;0;L;<square> 0042;;;;N;;;;;
 1F132;SQUARED LATIN CAPITAL LETTER C;So;0;L;<square> 0043;;;;N;;;;;
@@ -30226,6 +30816,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F6F6;CANOE;So;0;ON;;;;;N;;;;;
 1F6F7;SLED;So;0;ON;;;;;N;;;;;
 1F6F8;FLYING SAUCER;So;0;ON;;;;;N;;;;;
+1F6F9;SKATEBOARD;So;0;ON;;;;;N;;;;;
 1F700;ALCHEMICAL SYMBOL FOR QUINTESSENCE;So;0;ON;;;;;N;;;;;
 1F701;ALCHEMICAL SYMBOL FOR AIR;So;0;ON;;;;;N;;;;;
 1F702;ALCHEMICAL SYMBOL FOR FIRE;So;0;ON;;;;;N;;;;;
@@ -30427,6 +31018,10 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F7D2;LIGHT TWELVE POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
 1F7D3;HEAVY TWELVE POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
 1F7D4;HEAVY TWELVE POINTED PINWHEEL STAR;So;0;ON;;;;;N;;;;;
+1F7D5;CIRCLED TRIANGLE;So;0;ON;;;;;N;;;;;
+1F7D6;NEGATIVE CIRCLED TRIANGLE;So;0;ON;;;;;N;;;;;
+1F7D7;CIRCLED SQUARE;So;0;ON;;;;;N;;;;;
+1F7D8;NEGATIVE CIRCLED SQUARE;So;0;ON;;;;;N;;;;;
 1F800;LEFTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
 1F801;UPWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
 1F802;RIGHTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
@@ -30647,6 +31242,9 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F94A;BOXING GLOVE;So;0;ON;;;;;N;;;;;
 1F94B;MARTIAL ARTS UNIFORM;So;0;ON;;;;;N;;;;;
 1F94C;CURLING STONE;So;0;ON;;;;;N;;;;;
+1F94D;LACROSSE STICK AND BALL;So;0;ON;;;;;N;;;;;
+1F94E;SOFTBALL;So;0;ON;;;;;N;;;;;
+1F94F;FLYING DISC;So;0;ON;;;;;N;;;;;
 1F950;CROISSANT;So;0;ON;;;;;N;;;;;
 1F951;AVOCADO;So;0;ON;;;;;N;;;;;
 1F952;CUCUMBER;So;0;ON;;;;;N;;;;;
@@ -30675,6 +31273,20 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F969;CUT OF MEAT;So;0;ON;;;;;N;;;;;
 1F96A;SANDWICH;So;0;ON;;;;;N;;;;;
 1F96B;CANNED FOOD;So;0;ON;;;;;N;;;;;
+1F96C;LEAFY GREEN;So;0;ON;;;;;N;;;;;
+1F96D;MANGO;So;0;ON;;;;;N;;;;;
+1F96E;MOON CAKE;So;0;ON;;;;;N;;;;;
+1F96F;BAGEL;So;0;ON;;;;;N;;;;;
+1F970;SMILING FACE WITH SMILING EYES AND THREE HEARTS;So;0;ON;;;;;N;;;;;
+1F973;FACE WITH PARTY HORN AND PARTY HAT;So;0;ON;;;;;N;;;;;
+1F974;FACE WITH UNEVEN EYES AND WAVY MOUTH;So;0;ON;;;;;N;;;;;
+1F975;OVERHEATED FACE;So;0;ON;;;;;N;;;;;
+1F976;FREEZING FACE;So;0;ON;;;;;N;;;;;
+1F97A;FACE WITH PLEADING EYES;So;0;ON;;;;;N;;;;;
+1F97C;LAB COAT;So;0;ON;;;;;N;;;;;
+1F97D;GOGGLES;So;0;ON;;;;;N;;;;;
+1F97E;HIKING BOOT;So;0;ON;;;;;N;;;;;
+1F97F;FLAT SHOE;So;0;ON;;;;;N;;;;;
 1F980;CRAB;So;0;ON;;;;;N;;;;;
 1F981;LION FACE;So;0;ON;;;;;N;;;;;
 1F982;SCORPION;So;0;ON;;;;;N;;;;;
@@ -30699,7 +31311,30 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F995;SAUROPOD;So;0;ON;;;;;N;;;;;
 1F996;T-REX;So;0;ON;;;;;N;;;;;
 1F997;CRICKET;So;0;ON;;;;;N;;;;;
+1F998;KANGAROO;So;0;ON;;;;;N;;;;;
+1F999;LLAMA;So;0;ON;;;;;N;;;;;
+1F99A;PEACOCK;So;0;ON;;;;;N;;;;;
+1F99B;HIPPOPOTAMUS;So;0;ON;;;;;N;;;;;
+1F99C;PARROT;So;0;ON;;;;;N;;;;;
+1F99D;RACCOON;So;0;ON;;;;;N;;;;;
+1F99E;LOBSTER;So;0;ON;;;;;N;;;;;
+1F99F;MOSQUITO;So;0;ON;;;;;N;;;;;
+1F9A0;MICROBE;So;0;ON;;;;;N;;;;;
+1F9A1;BADGER;So;0;ON;;;;;N;;;;;
+1F9A2;SWAN;So;0;ON;;;;;N;;;;;
+1F9B0;EMOJI COMPONENT RED HAIR;So;0;ON;;;;;N;;;;;
+1F9B1;EMOJI COMPONENT CURLY HAIR;So;0;ON;;;;;N;;;;;
+1F9B2;EMOJI COMPONENT BALD;So;0;ON;;;;;N;;;;;
+1F9B3;EMOJI COMPONENT WHITE HAIR;So;0;ON;;;;;N;;;;;
+1F9B4;BONE;So;0;ON;;;;;N;;;;;
+1F9B5;LEG;So;0;ON;;;;;N;;;;;
+1F9B6;FOOT;So;0;ON;;;;;N;;;;;
+1F9B7;TOOTH;So;0;ON;;;;;N;;;;;
+1F9B8;SUPERHERO;So;0;ON;;;;;N;;;;;
+1F9B9;SUPERVILLAIN;So;0;ON;;;;;N;;;;;
 1F9C0;CHEESE WEDGE;So;0;ON;;;;;N;;;;;
+1F9C1;CUPCAKE;So;0;ON;;;;;N;;;;;
+1F9C2;SALT SHAKER;So;0;ON;;;;;N;;;;;
 1F9D0;FACE WITH MONOCLE;So;0;ON;;;;;N;;;;;
 1F9D1;ADULT;So;0;ON;;;;;N;;;;;
 1F9D2;CHILD;So;0;ON;;;;;N;;;;;
@@ -30723,6 +31358,45 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F9E4;GLOVES;So;0;ON;;;;;N;;;;;
 1F9E5;COAT;So;0;ON;;;;;N;;;;;
 1F9E6;SOCKS;So;0;ON;;;;;N;;;;;
+1F9E7;RED GIFT ENVELOPE;So;0;ON;;;;;N;;;;;
+1F9E8;FIRECRACKER;So;0;ON;;;;;N;;;;;
+1F9E9;JIGSAW PUZZLE PIECE;So;0;ON;;;;;N;;;;;
+1F9EA;TEST TUBE;So;0;ON;;;;;N;;;;;
+1F9EB;PETRI DISH;So;0;ON;;;;;N;;;;;
+1F9EC;DNA DOUBLE HELIX;So;0;ON;;;;;N;;;;;
+1F9ED;COMPASS;So;0;ON;;;;;N;;;;;
+1F9EE;ABACUS;So;0;ON;;;;;N;;;;;
+1F9EF;FIRE EXTINGUISHER;So;0;ON;;;;;N;;;;;
+1F9F0;TOOLBOX;So;0;ON;;;;;N;;;;;
+1F9F1;BRICK;So;0;ON;;;;;N;;;;;
+1F9F2;MAGNET;So;0;ON;;;;;N;;;;;
+1F9F3;LUGGAGE;So;0;ON;;;;;N;;;;;
+1F9F4;LOTION BOTTLE;So;0;ON;;;;;N;;;;;
+1F9F5;SPOOL OF THREAD;So;0;ON;;;;;N;;;;;
+1F9F6;BALL OF YARN;So;0;ON;;;;;N;;;;;
+1F9F7;SAFETY PIN;So;0;ON;;;;;N;;;;;
+1F9F8;TEDDY BEAR;So;0;ON;;;;;N;;;;;
+1F9F9;BROOM;So;0;ON;;;;;N;;;;;
+1F9FA;BASKET;So;0;ON;;;;;N;;;;;
+1F9FB;ROLL OF PAPER;So;0;ON;;;;;N;;;;;
+1F9FC;BAR OF SOAP;So;0;ON;;;;;N;;;;;
+1F9FD;SPONGE;So;0;ON;;;;;N;;;;;
+1F9FE;RECEIPT;So;0;ON;;;;;N;;;;;
+1F9FF;NAZAR AMULET;So;0;ON;;;;;N;;;;;
+1FA60;XIANGQI RED GENERAL;So;0;ON;;;;;N;;;;;
+1FA61;XIANGQI RED MANDARIN;So;0;ON;;;;;N;;;;;
+1FA62;XIANGQI RED ELEPHANT;So;0;ON;;;;;N;;;;;
+1FA63;XIANGQI RED HORSE;So;0;ON;;;;;N;;;;;
+1FA64;XIANGQI RED CHARIOT;So;0;ON;;;;;N;;;;;
+1FA65;XIANGQI RED CANNON;So;0;ON;;;;;N;;;;;
+1FA66;XIANGQI RED SOLDIER;So;0;ON;;;;;N;;;;;
+1FA67;XIANGQI BLACK GENERAL;So;0;ON;;;;;N;;;;;
+1FA68;XIANGQI BLACK MANDARIN;So;0;ON;;;;;N;;;;;
+1FA69;XIANGQI BLACK ELEPHANT;So;0;ON;;;;;N;;;;;
+1FA6A;XIANGQI BLACK HORSE;So;0;ON;;;;;N;;;;;
+1FA6B;XIANGQI BLACK CHARIOT;So;0;ON;;;;;N;;;;;
+1FA6C;XIANGQI BLACK CANNON;So;0;ON;;;;;N;;;;;
+1FA6D;XIANGQI BLACK SOLDIER;So;0;ON;;;;;N;;;;;
 20000;<CJK Ideograph Extension B, First>;Lo;0;L;;;;;N;;;;;
 2A6D6;<CJK Ideograph Extension B, Last>;Lo;0;L;;;;;N;;;;;
 2A700;<CJK Ideograph Extension C, First>;Lo;0;L;;;;;N;;;;;
diff --git a/lib/stdlib/uc_spec/emoji-data.txt b/lib/stdlib/uc_spec/emoji-data.txt
new file mode 100644
index 0000000000..6e66455252
--- /dev/null
+++ b/lib/stdlib/uc_spec/emoji-data.txt
@@ -0,0 +1,714 @@
+# emoji-data.txt
+# Date: 2018-02-07, 07:55:18 GMT
+# © 2018 Unicode®, Inc.
+# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
+#
+# Emoji Data for UTS #51
+# Version: 11.0
+#
+# For documentation and usage, see http://www.unicode.org/reports/tr51
+#
+# Format: 
+# <codepoint(s)> ; <property> # <comments> 
+# Note: there is no guarantee as to the structure of whitespace or comments
+#
+# Characters and sequences are listed in code point order. Users should be shown a more natural order.
+# See the CLDR collation order for Emoji.
+
+
+# ================================================
+
+# All omitted code points have Emoji=No 
+# @missing: 0000..10FFFF  ; Emoji ; No
+
+0023          ; Emoji                #  1.1  [1] (#️)       number sign
+002A          ; Emoji                #  1.1  [1] (*️)       asterisk
+0030..0039    ; Emoji                #  1.1 [10] (0️..9️)    digit zero..digit nine
+00A9          ; Emoji                #  1.1  [1] (©️)       copyright
+00AE          ; Emoji                #  1.1  [1] (®️)       registered
+203C          ; Emoji                #  1.1  [1] (‼️)       double exclamation mark
+2049          ; Emoji                #  3.0  [1] (⁉️)       exclamation question mark
+2122          ; Emoji                #  1.1  [1] (™️)       trade mark
+2139          ; Emoji                #  3.0  [1] (ℹ️)       information
+2194..2199    ; Emoji                #  1.1  [6] (↔️..↙️)    left-right arrow..down-left arrow
+21A9..21AA    ; Emoji                #  1.1  [2] (↩️..↪️)    right arrow curving left..left arrow curving right
+231A..231B    ; Emoji                #  1.1  [2] (⌚..⌛)    watch..hourglass done
+2328          ; Emoji                #  1.1  [1] (⌨️)       keyboard
+23CF          ; Emoji                #  4.0  [1] (⏏️)       eject button
+23E9..23F3    ; Emoji                #  6.0 [11] (⏩..⏳)    fast-forward button..hourglass not done
+23F8..23FA    ; Emoji                #  7.0  [3] (⏸️..⏺️)    pause button..record button
+24C2          ; Emoji                #  1.1  [1] (Ⓜ️)       circled M
+25AA..25AB    ; Emoji                #  1.1  [2] (▪️..▫️)    black small square..white small square
+25B6          ; Emoji                #  1.1  [1] (▶️)       play button
+25C0          ; Emoji                #  1.1  [1] (◀️)       reverse button
+25FB..25FE    ; Emoji                #  3.2  [4] (◻️..◾)    white medium square..black medium-small square
+2600..2604    ; Emoji                #  1.1  [5] (☀️..☄️)    sun..comet
+260E          ; Emoji                #  1.1  [1] (☎️)       telephone
+2611          ; Emoji                #  1.1  [1] (☑️)       ballot box with check
+2614..2615    ; Emoji                #  4.0  [2] (☔..☕)    umbrella with rain drops..hot beverage
+2618          ; Emoji                #  4.1  [1] (☘️)       shamrock
+261D          ; Emoji                #  1.1  [1] (☝️)       index pointing up
+2620          ; Emoji                #  1.1  [1] (☠️)       skull and crossbones
+2622..2623    ; Emoji                #  1.1  [2] (☢️..☣️)    radioactive..biohazard
+2626          ; Emoji                #  1.1  [1] (☦️)       orthodox cross
+262A          ; Emoji                #  1.1  [1] (☪️)       star and crescent
+262E..262F    ; Emoji                #  1.1  [2] (☮️..☯️)    peace symbol..yin yang
+2638..263A    ; Emoji                #  1.1  [3] (☸️..☺️)    wheel of dharma..smiling face
+2640          ; Emoji                #  1.1  [1] (♀️)       female sign
+2642          ; Emoji                #  1.1  [1] (♂️)       male sign
+2648..2653    ; Emoji                #  1.1 [12] (♈..♓)    Aries..Pisces
+265F..2660    ; Emoji                #  1.1  [2] (♟️..♠️)    chess pawn..spade suit
+2663          ; Emoji                #  1.1  [1] (♣️)       club suit
+2665..2666    ; Emoji                #  1.1  [2] (♥️..♦️)    heart suit..diamond suit
+2668          ; Emoji                #  1.1  [1] (♨️)       hot springs
+267B          ; Emoji                #  3.2  [1] (♻️)       recycling symbol
+267E..267F    ; Emoji                #  4.1  [2] (♾️..♿)    infinity..wheelchair symbol
+2692..2697    ; Emoji                #  4.1  [6] (⚒️..⚗️)    hammer and pick..alembic
+2699          ; Emoji                #  4.1  [1] (⚙️)       gear
+269B..269C    ; Emoji                #  4.1  [2] (⚛️..⚜️)    atom symbol..fleur-de-lis
+26A0..26A1    ; Emoji                #  4.0  [2] (⚠️..⚡)    warning..high voltage
+26AA..26AB    ; Emoji                #  4.1  [2] (⚪..⚫)    white circle..black circle
+26B0..26B1    ; Emoji                #  4.1  [2] (⚰️..⚱️)    coffin..funeral urn
+26BD..26BE    ; Emoji                #  5.2  [2] (⚽..⚾)    soccer ball..baseball
+26C4..26C5    ; Emoji                #  5.2  [2] (⛄..⛅)    snowman without snow..sun behind cloud
+26C8          ; Emoji                #  5.2  [1] (⛈️)       cloud with lightning and rain
+26CE          ; Emoji                #  6.0  [1] (⛎)       Ophiuchus
+26CF          ; Emoji                #  5.2  [1] (⛏️)       pick
+26D1          ; Emoji                #  5.2  [1] (⛑️)       rescue worker’s helmet
+26D3..26D4    ; Emoji                #  5.2  [2] (⛓️..⛔)    chains..no entry
+26E9..26EA    ; Emoji                #  5.2  [2] (⛩️..⛪)    shinto shrine..church
+26F0..26F5    ; Emoji                #  5.2  [6] (⛰️..⛵)    mountain..sailboat
+26F7..26FA    ; Emoji                #  5.2  [4] (⛷️..⛺)    skier..tent
+26FD          ; Emoji                #  5.2  [1] (⛽)       fuel pump
+2702          ; Emoji                #  1.1  [1] (✂️)       scissors
+2705          ; Emoji                #  6.0  [1] (✅)       white heavy check mark
+2708..2709    ; Emoji                #  1.1  [2] (✈️..✉️)    airplane..envelope
+270A..270B    ; Emoji                #  6.0  [2] (✊..✋)    raised fist..raised hand
+270C..270D    ; Emoji                #  1.1  [2] (✌️..✍️)    victory hand..writing hand
+270F          ; Emoji                #  1.1  [1] (✏️)       pencil
+2712          ; Emoji                #  1.1  [1] (✒️)       black nib
+2714          ; Emoji                #  1.1  [1] (✔️)       heavy check mark
+2716          ; Emoji                #  1.1  [1] (✖️)       heavy multiplication x
+271D          ; Emoji                #  1.1  [1] (✝️)       latin cross
+2721          ; Emoji                #  1.1  [1] (✡️)       star of David
+2728          ; Emoji                #  6.0  [1] (✨)       sparkles
+2733..2734    ; Emoji                #  1.1  [2] (✳️..✴️)    eight-spoked asterisk..eight-pointed star
+2744          ; Emoji                #  1.1  [1] (❄️)       snowflake
+2747          ; Emoji                #  1.1  [1] (❇️)       sparkle
+274C          ; Emoji                #  6.0  [1] (❌)       cross mark
+274E          ; Emoji                #  6.0  [1] (❎)       cross mark button
+2753..2755    ; Emoji                #  6.0  [3] (❓..❕)    question mark..white exclamation mark
+2757          ; Emoji                #  5.2  [1] (❗)       exclamation mark
+2763..2764    ; Emoji                #  1.1  [2] (❣️..❤️)    heavy heart exclamation..red heart
+2795..2797    ; Emoji                #  6.0  [3] (➕..➗)    heavy plus sign..heavy division sign
+27A1          ; Emoji                #  1.1  [1] (➡️)       right arrow
+27B0          ; Emoji                #  6.0  [1] (➰)       curly loop
+27BF          ; Emoji                #  6.0  [1] (➿)       double curly loop
+2934..2935    ; Emoji                #  3.2  [2] (⤴️..⤵️)    right arrow curving up..right arrow curving down
+2B05..2B07    ; Emoji                #  4.0  [3] (⬅️..⬇️)    left arrow..down arrow
+2B1B..2B1C    ; Emoji                #  5.1  [2] (⬛..⬜)    black large square..white large square
+2B50          ; Emoji                #  5.1  [1] (⭐)       star
+2B55          ; Emoji                #  5.2  [1] (⭕)       heavy large circle
+3030          ; Emoji                #  1.1  [1] (〰️)       wavy dash
+303D          ; Emoji                #  3.2  [1] (〽️)       part alternation mark
+3297          ; Emoji                #  1.1  [1] (㊗️)       Japanese “congratulations” button
+3299          ; Emoji                #  1.1  [1] (㊙️)       Japanese “secret” button
+1F004         ; Emoji                #  5.1  [1] (🀄)       mahjong red dragon
+1F0CF         ; Emoji                #  6.0  [1] (🃏)       joker
+1F170..1F171  ; Emoji                #  6.0  [2] (🅰️..🅱️)    A button (blood type)..B button (blood type)
+1F17E         ; Emoji                #  6.0  [1] (🅾️)       O button (blood type)
+1F17F         ; Emoji                #  5.2  [1] (🅿️)       P button
+1F18E         ; Emoji                #  6.0  [1] (🆎)       AB button (blood type)
+1F191..1F19A  ; Emoji                #  6.0 [10] (🆑..🆚)    CL button..VS button
+1F1E6..1F1FF  ; Emoji                #  6.0 [26] (🇦..🇿)    regional indicator symbol letter a..regional indicator symbol letter z
+1F201..1F202  ; Emoji                #  6.0  [2] (🈁..🈂️)    Japanese “here” button..Japanese “service charge” button
+1F21A         ; Emoji                #  5.2  [1] (🈚)       Japanese “free of charge” button
+1F22F         ; Emoji                #  5.2  [1] (🈯)       Japanese “reserved” button
+1F232..1F23A  ; Emoji                #  6.0  [9] (🈲..🈺)    Japanese “prohibited” button..Japanese “open for business” button
+1F250..1F251  ; Emoji                #  6.0  [2] (🉐..🉑)    Japanese “bargain” button..Japanese “acceptable” button
+1F300..1F320  ; Emoji                #  6.0 [33] (🌀..🌠)    cyclone..shooting star
+1F321         ; Emoji                #  7.0  [1] (🌡️)       thermometer
+1F324..1F32C  ; Emoji                #  7.0  [9] (🌤️..🌬️)    sun behind small cloud..wind face
+1F32D..1F32F  ; Emoji                #  8.0  [3] (🌭..🌯)    hot dog..burrito
+1F330..1F335  ; Emoji                #  6.0  [6] (🌰..🌵)    chestnut..cactus
+1F336         ; Emoji                #  7.0  [1] (🌶️)       hot pepper
+1F337..1F37C  ; Emoji                #  6.0 [70] (🌷..🍼)    tulip..baby bottle
+1F37D         ; Emoji                #  7.0  [1] (🍽️)       fork and knife with plate
+1F37E..1F37F  ; Emoji                #  8.0  [2] (🍾..🍿)    bottle with popping cork..popcorn
+1F380..1F393  ; Emoji                #  6.0 [20] (🎀..🎓)    ribbon..graduation cap
+1F396..1F397  ; Emoji                #  7.0  [2] (🎖️..🎗️)    military medal..reminder ribbon
+1F399..1F39B  ; Emoji                #  7.0  [3] (🎙️..🎛️)    studio microphone..control knobs
+1F39E..1F39F  ; Emoji                #  7.0  [2] (🎞️..🎟️)    film frames..admission tickets
+1F3A0..1F3C4  ; Emoji                #  6.0 [37] (🎠..🏄)    carousel horse..person surfing
+1F3C5         ; Emoji                #  7.0  [1] (🏅)       sports medal
+1F3C6..1F3CA  ; Emoji                #  6.0  [5] (🏆..🏊)    trophy..person swimming
+1F3CB..1F3CE  ; Emoji                #  7.0  [4] (🏋️..🏎️)    person lifting weights..racing car
+1F3CF..1F3D3  ; Emoji                #  8.0  [5] (🏏..🏓)    cricket game..ping pong
+1F3D4..1F3DF  ; Emoji                #  7.0 [12] (🏔️..🏟️)    snow-capped mountain..stadium
+1F3E0..1F3F0  ; Emoji                #  6.0 [17] (🏠..🏰)    house..castle
+1F3F3..1F3F5  ; Emoji                #  7.0  [3] (🏳️..🏵️)    white flag..rosette
+1F3F7         ; Emoji                #  7.0  [1] (🏷️)       label
+1F3F8..1F3FF  ; Emoji                #  8.0  [8] (🏸..🏿)    badminton..dark skin tone
+1F400..1F43E  ; Emoji                #  6.0 [63] (🐀..🐾)    rat..paw prints
+1F43F         ; Emoji                #  7.0  [1] (🐿️)       chipmunk
+1F440         ; Emoji                #  6.0  [1] (👀)       eyes
+1F441         ; Emoji                #  7.0  [1] (👁️)       eye
+1F442..1F4F7  ; Emoji                #  6.0[182] (👂..📷)    ear..camera
+1F4F8         ; Emoji                #  7.0  [1] (📸)       camera with flash
+1F4F9..1F4FC  ; Emoji                #  6.0  [4] (📹..📼)    video camera..videocassette
+1F4FD         ; Emoji                #  7.0  [1] (📽️)       film projector
+1F4FF         ; Emoji                #  8.0  [1] (📿)       prayer beads
+1F500..1F53D  ; Emoji                #  6.0 [62] (🔀..🔽)    shuffle tracks button..downwards button
+1F549..1F54A  ; Emoji                #  7.0  [2] (🕉️..🕊️)    om..dove
+1F54B..1F54E  ; Emoji                #  8.0  [4] (🕋..🕎)    kaaba..menorah
+1F550..1F567  ; Emoji                #  6.0 [24] (🕐..🕧)    one o’clock..twelve-thirty
+1F56F..1F570  ; Emoji                #  7.0  [2] (🕯️..🕰️)    candle..mantelpiece clock
+1F573..1F579  ; Emoji                #  7.0  [7] (🕳️..🕹️)    hole..joystick
+1F57A         ; Emoji                #  9.0  [1] (🕺)       man dancing
+1F587         ; Emoji                #  7.0  [1] (🖇️)       linked paperclips
+1F58A..1F58D  ; Emoji                #  7.0  [4] (🖊️..🖍️)    pen..crayon
+1F590         ; Emoji                #  7.0  [1] (🖐️)       hand with fingers splayed
+1F595..1F596  ; Emoji                #  7.0  [2] (🖕..🖖)    middle finger..vulcan salute
+1F5A4         ; Emoji                #  9.0  [1] (🖤)       black heart
+1F5A5         ; Emoji                #  7.0  [1] (🖥️)       desktop computer
+1F5A8         ; Emoji                #  7.0  [1] (🖨️)       printer
+1F5B1..1F5B2  ; Emoji                #  7.0  [2] (🖱️..🖲️)    computer mouse..trackball
+1F5BC         ; Emoji                #  7.0  [1] (🖼️)       framed picture
+1F5C2..1F5C4  ; Emoji                #  7.0  [3] (🗂️..🗄️)    card index dividers..file cabinet
+1F5D1..1F5D3  ; Emoji                #  7.0  [3] (🗑️..🗓️)    wastebasket..spiral calendar
+1F5DC..1F5DE  ; Emoji                #  7.0  [3] (🗜️..🗞️)    clamp..rolled-up newspaper
+1F5E1         ; Emoji                #  7.0  [1] (🗡️)       dagger
+1F5E3         ; Emoji                #  7.0  [1] (🗣️)       speaking head
+1F5E8         ; Emoji                #  7.0  [1] (🗨️)       left speech bubble
+1F5EF         ; Emoji                #  7.0  [1] (🗯️)       right anger bubble
+1F5F3         ; Emoji                #  7.0  [1] (🗳️)       ballot box with ballot
+1F5FA         ; Emoji                #  7.0  [1] (🗺️)       world map
+1F5FB..1F5FF  ; Emoji                #  6.0  [5] (🗻..🗿)    mount fuji..moai
+1F600         ; Emoji                #  6.1  [1] (😀)       grinning face
+1F601..1F610  ; Emoji                #  6.0 [16] (😁..😐)    beaming face with smiling eyes..neutral face
+1F611         ; Emoji                #  6.1  [1] (😑)       expressionless face
+1F612..1F614  ; Emoji                #  6.0  [3] (😒..😔)    unamused face..pensive face
+1F615         ; Emoji                #  6.1  [1] (😕)       confused face
+1F616         ; Emoji                #  6.0  [1] (😖)       confounded face
+1F617         ; Emoji                #  6.1  [1] (😗)       kissing face
+1F618         ; Emoji                #  6.0  [1] (😘)       face blowing a kiss
+1F619         ; Emoji                #  6.1  [1] (😙)       kissing face with smiling eyes
+1F61A         ; Emoji                #  6.0  [1] (😚)       kissing face with closed eyes
+1F61B         ; Emoji                #  6.1  [1] (😛)       face with tongue
+1F61C..1F61E  ; Emoji                #  6.0  [3] (😜..😞)    winking face with tongue..disappointed face
+1F61F         ; Emoji                #  6.1  [1] (😟)       worried face
+1F620..1F625  ; Emoji                #  6.0  [6] (😠..😥)    angry face..sad but relieved face
+1F626..1F627  ; Emoji                #  6.1  [2] (😦..😧)    frowning face with open mouth..anguished face
+1F628..1F62B  ; Emoji                #  6.0  [4] (😨..😫)    fearful face..tired face
+1F62C         ; Emoji                #  6.1  [1] (😬)       grimacing face
+1F62D         ; Emoji                #  6.0  [1] (😭)       loudly crying face
+1F62E..1F62F  ; Emoji                #  6.1  [2] (😮..😯)    face with open mouth..hushed face
+1F630..1F633  ; Emoji                #  6.0  [4] (😰..😳)    anxious face with sweat..flushed face
+1F634         ; Emoji                #  6.1  [1] (😴)       sleeping face
+1F635..1F640  ; Emoji                #  6.0 [12] (😵..🙀)    dizzy face..weary cat face
+1F641..1F642  ; Emoji                #  7.0  [2] (🙁..🙂)    slightly frowning face..slightly smiling face
+1F643..1F644  ; Emoji                #  8.0  [2] (🙃..🙄)    upside-down face..face with rolling eyes
+1F645..1F64F  ; Emoji                #  6.0 [11] (🙅..🙏)    person gesturing NO..folded hands
+1F680..1F6C5  ; Emoji                #  6.0 [70] (🚀..🛅)    rocket..left luggage
+1F6CB..1F6CF  ; Emoji                #  7.0  [5] (🛋️..🛏️)    couch and lamp..bed
+1F6D0         ; Emoji                #  8.0  [1] (🛐)       place of worship
+1F6D1..1F6D2  ; Emoji                #  9.0  [2] (🛑..🛒)    stop sign..shopping cart
+1F6E0..1F6E5  ; Emoji                #  7.0  [6] (🛠️..🛥️)    hammer and wrench..motor boat
+1F6E9         ; Emoji                #  7.0  [1] (🛩️)       small airplane
+1F6EB..1F6EC  ; Emoji                #  7.0  [2] (🛫..🛬)    airplane departure..airplane arrival
+1F6F0         ; Emoji                #  7.0  [1] (🛰️)       satellite
+1F6F3         ; Emoji                #  7.0  [1] (🛳️)       passenger ship
+1F6F4..1F6F6  ; Emoji                #  9.0  [3] (🛴..🛶)    kick scooter..canoe
+1F6F7..1F6F8  ; Emoji                # 10.0  [2] (🛷..🛸)    sled..flying saucer
+1F6F9         ; Emoji                # 11.0  [1] (🛹)       skateboard
+1F910..1F918  ; Emoji                #  8.0  [9] (🤐..🤘)    zipper-mouth face..sign of the horns
+1F919..1F91E  ; Emoji                #  9.0  [6] (🤙..🤞)    call me hand..crossed fingers
+1F91F         ; Emoji                # 10.0  [1] (🤟)       love-you gesture
+1F920..1F927  ; Emoji                #  9.0  [8] (🤠..🤧)    cowboy hat face..sneezing face
+1F928..1F92F  ; Emoji                # 10.0  [8] (🤨..🤯)    face with raised eyebrow..exploding head
+1F930         ; Emoji                #  9.0  [1] (🤰)       pregnant woman
+1F931..1F932  ; Emoji                # 10.0  [2] (🤱..🤲)    breast-feeding..palms up together
+1F933..1F93A  ; Emoji                #  9.0  [8] (🤳..🤺)    selfie..person fencing
+1F93C..1F93E  ; Emoji                #  9.0  [3] (🤼..🤾)    people wrestling..person playing handball
+1F940..1F945  ; Emoji                #  9.0  [6] (🥀..🥅)    wilted flower..goal net
+1F947..1F94B  ; Emoji                #  9.0  [5] (🥇..🥋)    1st place medal..martial arts uniform
+1F94C         ; Emoji                # 10.0  [1] (🥌)       curling stone
+1F94D..1F94F  ; Emoji                # 11.0  [3] (🥍..🥏)    lacrosse..flying disc
+1F950..1F95E  ; Emoji                #  9.0 [15] (🥐..🥞)    croissant..pancakes
+1F95F..1F96B  ; Emoji                # 10.0 [13] (🥟..🥫)    dumpling..canned food
+1F96C..1F970  ; Emoji                # 11.0  [5] (🥬..🥰)    leafy green..smiling face with 3 hearts
+1F973..1F976  ; Emoji                # 11.0  [4] (🥳..🥶)    partying face..cold face
+1F97A         ; Emoji                # 11.0  [1] (🥺)       pleading face
+1F97C..1F97F  ; Emoji                # 11.0  [4] (🥼..🥿)    lab coat..woman’s flat shoe
+1F980..1F984  ; Emoji                #  8.0  [5] (🦀..🦄)    crab..unicorn face
+1F985..1F991  ; Emoji                #  9.0 [13] (🦅..🦑)    eagle..squid
+1F992..1F997  ; Emoji                # 10.0  [6] (🦒..🦗)    giraffe..cricket
+1F998..1F9A2  ; Emoji                # 11.0 [11] (🦘..🦢)    kangaroo..swan
+1F9B0..1F9B9  ; Emoji                # 11.0 [10] (🦰..🦹)    red-haired..supervillain
+1F9C0         ; Emoji                #  8.0  [1] (🧀)       cheese wedge
+1F9C1..1F9C2  ; Emoji                # 11.0  [2] (🧁..🧂)    cupcake..salt
+1F9D0..1F9E6  ; Emoji                # 10.0 [23] (🧐..🧦)    face with monocle..socks
+1F9E7..1F9FF  ; Emoji                # 11.0 [25] (🧧..🧿)    red envelope..nazar amulet
+
+# Total elements: 1250
+
+# ================================================
+
+# All omitted code points have Emoji_Presentation=No 
+# @missing: 0000..10FFFF  ; Emoji_Presentation ; No
+
+231A..231B    ; Emoji_Presentation   #  1.1  [2] (⌚..⌛)    watch..hourglass done
+23E9..23EC    ; Emoji_Presentation   #  6.0  [4] (⏩..⏬)    fast-forward button..fast down button
+23F0          ; Emoji_Presentation   #  6.0  [1] (⏰)       alarm clock
+23F3          ; Emoji_Presentation   #  6.0  [1] (⏳)       hourglass not done
+25FD..25FE    ; Emoji_Presentation   #  3.2  [2] (◽..◾)    white medium-small square..black medium-small square
+2614..2615    ; Emoji_Presentation   #  4.0  [2] (☔..☕)    umbrella with rain drops..hot beverage
+2648..2653    ; Emoji_Presentation   #  1.1 [12] (♈..♓)    Aries..Pisces
+267F          ; Emoji_Presentation   #  4.1  [1] (♿)       wheelchair symbol
+2693          ; Emoji_Presentation   #  4.1  [1] (⚓)       anchor
+26A1          ; Emoji_Presentation   #  4.0  [1] (⚡)       high voltage
+26AA..26AB    ; Emoji_Presentation   #  4.1  [2] (⚪..⚫)    white circle..black circle
+26BD..26BE    ; Emoji_Presentation   #  5.2  [2] (⚽..⚾)    soccer ball..baseball
+26C4..26C5    ; Emoji_Presentation   #  5.2  [2] (⛄..⛅)    snowman without snow..sun behind cloud
+26CE          ; Emoji_Presentation   #  6.0  [1] (⛎)       Ophiuchus
+26D4          ; Emoji_Presentation   #  5.2  [1] (⛔)       no entry
+26EA          ; Emoji_Presentation   #  5.2  [1] (⛪)       church
+26F2..26F3    ; Emoji_Presentation   #  5.2  [2] (⛲..⛳)    fountain..flag in hole
+26F5          ; Emoji_Presentation   #  5.2  [1] (⛵)       sailboat
+26FA          ; Emoji_Presentation   #  5.2  [1] (⛺)       tent
+26FD          ; Emoji_Presentation   #  5.2  [1] (⛽)       fuel pump
+2705          ; Emoji_Presentation   #  6.0  [1] (✅)       white heavy check mark
+270A..270B    ; Emoji_Presentation   #  6.0  [2] (✊..✋)    raised fist..raised hand
+2728          ; Emoji_Presentation   #  6.0  [1] (✨)       sparkles
+274C          ; Emoji_Presentation   #  6.0  [1] (❌)       cross mark
+274E          ; Emoji_Presentation   #  6.0  [1] (❎)       cross mark button
+2753..2755    ; Emoji_Presentation   #  6.0  [3] (❓..❕)    question mark..white exclamation mark
+2757          ; Emoji_Presentation   #  5.2  [1] (❗)       exclamation mark
+2795..2797    ; Emoji_Presentation   #  6.0  [3] (➕..➗)    heavy plus sign..heavy division sign
+27B0          ; Emoji_Presentation   #  6.0  [1] (➰)       curly loop
+27BF          ; Emoji_Presentation   #  6.0  [1] (➿)       double curly loop
+2B1B..2B1C    ; Emoji_Presentation   #  5.1  [2] (⬛..⬜)    black large square..white large square
+2B50          ; Emoji_Presentation   #  5.1  [1] (⭐)       star
+2B55          ; Emoji_Presentation   #  5.2  [1] (⭕)       heavy large circle
+1F004         ; Emoji_Presentation   #  5.1  [1] (🀄)       mahjong red dragon
+1F0CF         ; Emoji_Presentation   #  6.0  [1] (🃏)       joker
+1F18E         ; Emoji_Presentation   #  6.0  [1] (🆎)       AB button (blood type)
+1F191..1F19A  ; Emoji_Presentation   #  6.0 [10] (🆑..🆚)    CL button..VS button
+1F1E6..1F1FF  ; Emoji_Presentation   #  6.0 [26] (🇦..🇿)    regional indicator symbol letter a..regional indicator symbol letter z
+1F201         ; Emoji_Presentation   #  6.0  [1] (🈁)       Japanese “here” button
+1F21A         ; Emoji_Presentation   #  5.2  [1] (🈚)       Japanese “free of charge” button
+1F22F         ; Emoji_Presentation   #  5.2  [1] (🈯)       Japanese “reserved” button
+1F232..1F236  ; Emoji_Presentation   #  6.0  [5] (🈲..🈶)    Japanese “prohibited” button..Japanese “not free of charge” button
+1F238..1F23A  ; Emoji_Presentation   #  6.0  [3] (🈸..🈺)    Japanese “application” button..Japanese “open for business” button
+1F250..1F251  ; Emoji_Presentation   #  6.0  [2] (🉐..🉑)    Japanese “bargain” button..Japanese “acceptable” button
+1F300..1F320  ; Emoji_Presentation   #  6.0 [33] (🌀..🌠)    cyclone..shooting star
+1F32D..1F32F  ; Emoji_Presentation   #  8.0  [3] (🌭..🌯)    hot dog..burrito
+1F330..1F335  ; Emoji_Presentation   #  6.0  [6] (🌰..🌵)    chestnut..cactus
+1F337..1F37C  ; Emoji_Presentation   #  6.0 [70] (🌷..🍼)    tulip..baby bottle
+1F37E..1F37F  ; Emoji_Presentation   #  8.0  [2] (🍾..🍿)    bottle with popping cork..popcorn
+1F380..1F393  ; Emoji_Presentation   #  6.0 [20] (🎀..🎓)    ribbon..graduation cap
+1F3A0..1F3C4  ; Emoji_Presentation   #  6.0 [37] (🎠..🏄)    carousel horse..person surfing
+1F3C5         ; Emoji_Presentation   #  7.0  [1] (🏅)       sports medal
+1F3C6..1F3CA  ; Emoji_Presentation   #  6.0  [5] (🏆..🏊)    trophy..person swimming
+1F3CF..1F3D3  ; Emoji_Presentation   #  8.0  [5] (🏏..🏓)    cricket game..ping pong
+1F3E0..1F3F0  ; Emoji_Presentation   #  6.0 [17] (🏠..🏰)    house..castle
+1F3F4         ; Emoji_Presentation   #  7.0  [1] (🏴)       black flag
+1F3F8..1F3FF  ; Emoji_Presentation   #  8.0  [8] (🏸..🏿)    badminton..dark skin tone
+1F400..1F43E  ; Emoji_Presentation   #  6.0 [63] (🐀..🐾)    rat..paw prints
+1F440         ; Emoji_Presentation   #  6.0  [1] (👀)       eyes
+1F442..1F4F7  ; Emoji_Presentation   #  6.0[182] (👂..📷)    ear..camera
+1F4F8         ; Emoji_Presentation   #  7.0  [1] (📸)       camera with flash
+1F4F9..1F4FC  ; Emoji_Presentation   #  6.0  [4] (📹..📼)    video camera..videocassette
+1F4FF         ; Emoji_Presentation   #  8.0  [1] (📿)       prayer beads
+1F500..1F53D  ; Emoji_Presentation   #  6.0 [62] (🔀..🔽)    shuffle tracks button..downwards button
+1F54B..1F54E  ; Emoji_Presentation   #  8.0  [4] (🕋..🕎)    kaaba..menorah
+1F550..1F567  ; Emoji_Presentation   #  6.0 [24] (🕐..🕧)    one o’clock..twelve-thirty
+1F57A         ; Emoji_Presentation   #  9.0  [1] (🕺)       man dancing
+1F595..1F596  ; Emoji_Presentation   #  7.0  [2] (🖕..🖖)    middle finger..vulcan salute
+1F5A4         ; Emoji_Presentation   #  9.0  [1] (🖤)       black heart
+1F5FB..1F5FF  ; Emoji_Presentation   #  6.0  [5] (🗻..🗿)    mount fuji..moai
+1F600         ; Emoji_Presentation   #  6.1  [1] (😀)       grinning face
+1F601..1F610  ; Emoji_Presentation   #  6.0 [16] (😁..😐)    beaming face with smiling eyes..neutral face
+1F611         ; Emoji_Presentation   #  6.1  [1] (😑)       expressionless face
+1F612..1F614  ; Emoji_Presentation   #  6.0  [3] (😒..😔)    unamused face..pensive face
+1F615         ; Emoji_Presentation   #  6.1  [1] (😕)       confused face
+1F616         ; Emoji_Presentation   #  6.0  [1] (😖)       confounded face
+1F617         ; Emoji_Presentation   #  6.1  [1] (😗)       kissing face
+1F618         ; Emoji_Presentation   #  6.0  [1] (😘)       face blowing a kiss
+1F619         ; Emoji_Presentation   #  6.1  [1] (😙)       kissing face with smiling eyes
+1F61A         ; Emoji_Presentation   #  6.0  [1] (😚)       kissing face with closed eyes
+1F61B         ; Emoji_Presentation   #  6.1  [1] (😛)       face with tongue
+1F61C..1F61E  ; Emoji_Presentation   #  6.0  [3] (😜..😞)    winking face with tongue..disappointed face
+1F61F         ; Emoji_Presentation   #  6.1  [1] (😟)       worried face
+1F620..1F625  ; Emoji_Presentation   #  6.0  [6] (😠..😥)    angry face..sad but relieved face
+1F626..1F627  ; Emoji_Presentation   #  6.1  [2] (😦..😧)    frowning face with open mouth..anguished face
+1F628..1F62B  ; Emoji_Presentation   #  6.0  [4] (😨..😫)    fearful face..tired face
+1F62C         ; Emoji_Presentation   #  6.1  [1] (😬)       grimacing face
+1F62D         ; Emoji_Presentation   #  6.0  [1] (😭)       loudly crying face
+1F62E..1F62F  ; Emoji_Presentation   #  6.1  [2] (😮..😯)    face with open mouth..hushed face
+1F630..1F633  ; Emoji_Presentation   #  6.0  [4] (😰..😳)    anxious face with sweat..flushed face
+1F634         ; Emoji_Presentation   #  6.1  [1] (😴)       sleeping face
+1F635..1F640  ; Emoji_Presentation   #  6.0 [12] (😵..🙀)    dizzy face..weary cat face
+1F641..1F642  ; Emoji_Presentation   #  7.0  [2] (🙁..🙂)    slightly frowning face..slightly smiling face
+1F643..1F644  ; Emoji_Presentation   #  8.0  [2] (🙃..🙄)    upside-down face..face with rolling eyes
+1F645..1F64F  ; Emoji_Presentation   #  6.0 [11] (🙅..🙏)    person gesturing NO..folded hands
+1F680..1F6C5  ; Emoji_Presentation   #  6.0 [70] (🚀..🛅)    rocket..left luggage
+1F6CC         ; Emoji_Presentation   #  7.0  [1] (🛌)       person in bed
+1F6D0         ; Emoji_Presentation   #  8.0  [1] (🛐)       place of worship
+1F6D1..1F6D2  ; Emoji_Presentation   #  9.0  [2] (🛑..🛒)    stop sign..shopping cart
+1F6EB..1F6EC  ; Emoji_Presentation   #  7.0  [2] (🛫..🛬)    airplane departure..airplane arrival
+1F6F4..1F6F6  ; Emoji_Presentation   #  9.0  [3] (🛴..🛶)    kick scooter..canoe
+1F6F7..1F6F8  ; Emoji_Presentation   # 10.0  [2] (🛷..🛸)    sled..flying saucer
+1F6F9         ; Emoji_Presentation   # 11.0  [1] (🛹)       skateboard
+1F910..1F918  ; Emoji_Presentation   #  8.0  [9] (🤐..🤘)    zipper-mouth face..sign of the horns
+1F919..1F91E  ; Emoji_Presentation   #  9.0  [6] (🤙..🤞)    call me hand..crossed fingers
+1F91F         ; Emoji_Presentation   # 10.0  [1] (🤟)       love-you gesture
+1F920..1F927  ; Emoji_Presentation   #  9.0  [8] (🤠..🤧)    cowboy hat face..sneezing face
+1F928..1F92F  ; Emoji_Presentation   # 10.0  [8] (🤨..🤯)    face with raised eyebrow..exploding head
+1F930         ; Emoji_Presentation   #  9.0  [1] (🤰)       pregnant woman
+1F931..1F932  ; Emoji_Presentation   # 10.0  [2] (🤱..🤲)    breast-feeding..palms up together
+1F933..1F93A  ; Emoji_Presentation   #  9.0  [8] (🤳..🤺)    selfie..person fencing
+1F93C..1F93E  ; Emoji_Presentation   #  9.0  [3] (🤼..🤾)    people wrestling..person playing handball
+1F940..1F945  ; Emoji_Presentation   #  9.0  [6] (🥀..🥅)    wilted flower..goal net
+1F947..1F94B  ; Emoji_Presentation   #  9.0  [5] (🥇..🥋)    1st place medal..martial arts uniform
+1F94C         ; Emoji_Presentation   # 10.0  [1] (🥌)       curling stone
+1F94D..1F94F  ; Emoji_Presentation   # 11.0  [3] (🥍..🥏)    lacrosse..flying disc
+1F950..1F95E  ; Emoji_Presentation   #  9.0 [15] (🥐..🥞)    croissant..pancakes
+1F95F..1F96B  ; Emoji_Presentation   # 10.0 [13] (🥟..🥫)    dumpling..canned food
+1F96C..1F970  ; Emoji_Presentation   # 11.0  [5] (🥬..🥰)    leafy green..smiling face with 3 hearts
+1F973..1F976  ; Emoji_Presentation   # 11.0  [4] (🥳..🥶)    partying face..cold face
+1F97A         ; Emoji_Presentation   # 11.0  [1] (🥺)       pleading face
+1F97C..1F97F  ; Emoji_Presentation   # 11.0  [4] (🥼..🥿)    lab coat..woman’s flat shoe
+1F980..1F984  ; Emoji_Presentation   #  8.0  [5] (🦀..🦄)    crab..unicorn face
+1F985..1F991  ; Emoji_Presentation   #  9.0 [13] (🦅..🦑)    eagle..squid
+1F992..1F997  ; Emoji_Presentation   # 10.0  [6] (🦒..🦗)    giraffe..cricket
+1F998..1F9A2  ; Emoji_Presentation   # 11.0 [11] (🦘..🦢)    kangaroo..swan
+1F9B0..1F9B9  ; Emoji_Presentation   # 11.0 [10] (🦰..🦹)    red-haired..supervillain
+1F9C0         ; Emoji_Presentation   #  8.0  [1] (🧀)       cheese wedge
+1F9C1..1F9C2  ; Emoji_Presentation   # 11.0  [2] (🧁..🧂)    cupcake..salt
+1F9D0..1F9E6  ; Emoji_Presentation   # 10.0 [23] (🧐..🧦)    face with monocle..socks
+1F9E7..1F9FF  ; Emoji_Presentation   # 11.0 [25] (🧧..🧿)    red envelope..nazar amulet
+
+# Total elements: 1032
+
+# ================================================
+
+# All omitted code points have Emoji_Modifier=No 
+# @missing: 0000..10FFFF  ; Emoji_Modifier ; No
+
+1F3FB..1F3FF  ; Emoji_Modifier       #  8.0  [5] (🏻..🏿)    light skin tone..dark skin tone
+
+# Total elements: 5
+
+# ================================================
+
+# All omitted code points have Emoji_Modifier_Base=No 
+# @missing: 0000..10FFFF  ; Emoji_Modifier_Base ; No
+
+261D          ; Emoji_Modifier_Base  #  1.1  [1] (☝️)       index pointing up
+26F9          ; Emoji_Modifier_Base  #  5.2  [1] (⛹️)       person bouncing ball
+270A..270B    ; Emoji_Modifier_Base  #  6.0  [2] (✊..✋)    raised fist..raised hand
+270C..270D    ; Emoji_Modifier_Base  #  1.1  [2] (✌️..✍️)    victory hand..writing hand
+1F385         ; Emoji_Modifier_Base  #  6.0  [1] (🎅)       Santa Claus
+1F3C2..1F3C4  ; Emoji_Modifier_Base  #  6.0  [3] (🏂..🏄)    snowboarder..person surfing
+1F3C7         ; Emoji_Modifier_Base  #  6.0  [1] (🏇)       horse racing
+1F3CA         ; Emoji_Modifier_Base  #  6.0  [1] (🏊)       person swimming
+1F3CB..1F3CC  ; Emoji_Modifier_Base  #  7.0  [2] (🏋️..🏌️)    person lifting weights..person golfing
+1F442..1F443  ; Emoji_Modifier_Base  #  6.0  [2] (👂..👃)    ear..nose
+1F446..1F450  ; Emoji_Modifier_Base  #  6.0 [11] (👆..👐)    backhand index pointing up..open hands
+1F466..1F469  ; Emoji_Modifier_Base  #  6.0  [4] (👦..👩)    boy..woman
+1F46E         ; Emoji_Modifier_Base  #  6.0  [1] (👮)       police officer
+1F470..1F478  ; Emoji_Modifier_Base  #  6.0  [9] (👰..👸)    bride with veil..princess
+1F47C         ; Emoji_Modifier_Base  #  6.0  [1] (👼)       baby angel
+1F481..1F483  ; Emoji_Modifier_Base  #  6.0  [3] (💁..💃)    person tipping hand..woman dancing
+1F485..1F487  ; Emoji_Modifier_Base  #  6.0  [3] (💅..💇)    nail polish..person getting haircut
+1F4AA         ; Emoji_Modifier_Base  #  6.0  [1] (💪)       flexed biceps
+1F574..1F575  ; Emoji_Modifier_Base  #  7.0  [2] (🕴️..🕵️)    man in suit levitating..detective
+1F57A         ; Emoji_Modifier_Base  #  9.0  [1] (🕺)       man dancing
+1F590         ; Emoji_Modifier_Base  #  7.0  [1] (🖐️)       hand with fingers splayed
+1F595..1F596  ; Emoji_Modifier_Base  #  7.0  [2] (🖕..🖖)    middle finger..vulcan salute
+1F645..1F647  ; Emoji_Modifier_Base  #  6.0  [3] (🙅..🙇)    person gesturing NO..person bowing
+1F64B..1F64F  ; Emoji_Modifier_Base  #  6.0  [5] (🙋..🙏)    person raising hand..folded hands
+1F6A3         ; Emoji_Modifier_Base  #  6.0  [1] (🚣)       person rowing boat
+1F6B4..1F6B6  ; Emoji_Modifier_Base  #  6.0  [3] (🚴..🚶)    person biking..person walking
+1F6C0         ; Emoji_Modifier_Base  #  6.0  [1] (🛀)       person taking bath
+1F6CC         ; Emoji_Modifier_Base  #  7.0  [1] (🛌)       person in bed
+1F918         ; Emoji_Modifier_Base  #  8.0  [1] (🤘)       sign of the horns
+1F919..1F91C  ; Emoji_Modifier_Base  #  9.0  [4] (🤙..🤜)    call me hand..right-facing fist
+1F91E         ; Emoji_Modifier_Base  #  9.0  [1] (🤞)       crossed fingers
+1F91F         ; Emoji_Modifier_Base  # 10.0  [1] (🤟)       love-you gesture
+1F926         ; Emoji_Modifier_Base  #  9.0  [1] (🤦)       person facepalming
+1F930         ; Emoji_Modifier_Base  #  9.0  [1] (🤰)       pregnant woman
+1F931..1F932  ; Emoji_Modifier_Base  # 10.0  [2] (🤱..🤲)    breast-feeding..palms up together
+1F933..1F939  ; Emoji_Modifier_Base  #  9.0  [7] (🤳..🤹)    selfie..person juggling
+1F93D..1F93E  ; Emoji_Modifier_Base  #  9.0  [2] (🤽..🤾)    person playing water polo..person playing handball
+1F9B5..1F9B6  ; Emoji_Modifier_Base  # 11.0  [2] (🦵..🦶)    leg..foot
+1F9B8..1F9B9  ; Emoji_Modifier_Base  # 11.0  [2] (🦸..🦹)    superhero..supervillain
+1F9D1..1F9DD  ; Emoji_Modifier_Base  # 10.0 [13] (🧑..🧝)    adult..elf
+
+# Total elements: 106
+
+# ================================================
+
+# All omitted code points have Emoji_Component=No 
+# @missing: 0000..10FFFF  ; Emoji_Component ; No
+
+0023          ; Emoji_Component      #  1.1  [1] (#️)       number sign
+002A          ; Emoji_Component      #  1.1  [1] (*️)       asterisk
+0030..0039    ; Emoji_Component      #  1.1 [10] (0️..9️)    digit zero..digit nine
+200D          ; Emoji_Component      #  1.1  [1] (‍)        zero width joiner
+20E3          ; Emoji_Component      #  3.0  [1] (⃣)       combining enclosing keycap
+FE0F          ; Emoji_Component      #  3.2  [1] ()        VARIATION SELECTOR-16
+1F1E6..1F1FF  ; Emoji_Component      #  6.0 [26] (🇦..🇿)    regional indicator symbol letter a..regional indicator symbol letter z
+1F3FB..1F3FF  ; Emoji_Component      #  8.0  [5] (🏻..🏿)    light skin tone..dark skin tone
+1F9B0..1F9B3  ; Emoji_Component      # 11.0  [4] (🦰..🦳)    red-haired..white-haired
+E0020..E007F  ; Emoji_Component      #  3.1 [96] (󠀠..󠁿)      tag space..cancel tag
+
+# Total elements: 146
+
+# ================================================
+
+# All omitted code points have Extended_Pictographic=No 
+# @missing: 0000..10FFFF  ; Extended_Pictographic ; No
+
+00A9          ; Extended_Pictographic#  1.1  [1] (©️)       copyright
+00AE          ; Extended_Pictographic#  1.1  [1] (®️)       registered
+203C          ; Extended_Pictographic#  1.1  [1] (‼️)       double exclamation mark
+2049          ; Extended_Pictographic#  3.0  [1] (⁉️)       exclamation question mark
+2122          ; Extended_Pictographic#  1.1  [1] (™️)       trade mark
+2139          ; Extended_Pictographic#  3.0  [1] (ℹ️)       information
+2194..2199    ; Extended_Pictographic#  1.1  [6] (↔️..↙️)    left-right arrow..down-left arrow
+21A9..21AA    ; Extended_Pictographic#  1.1  [2] (↩️..↪️)    right arrow curving left..left arrow curving right
+231A..231B    ; Extended_Pictographic#  1.1  [2] (⌚..⌛)    watch..hourglass done
+2328          ; Extended_Pictographic#  1.1  [1] (⌨️)       keyboard
+2388          ; Extended_Pictographic#  3.0  [1] (⎈️)       HELM SYMBOL
+23CF          ; Extended_Pictographic#  4.0  [1] (⏏️)       eject button
+23E9..23F3    ; Extended_Pictographic#  6.0 [11] (⏩..⏳)    fast-forward button..hourglass not done
+23F8..23FA    ; Extended_Pictographic#  7.0  [3] (⏸️..⏺️)    pause button..record button
+24C2          ; Extended_Pictographic#  1.1  [1] (Ⓜ️)       circled M
+25AA..25AB    ; Extended_Pictographic#  1.1  [2] (▪️..▫️)    black small square..white small square
+25B6          ; Extended_Pictographic#  1.1  [1] (▶️)       play button
+25C0          ; Extended_Pictographic#  1.1  [1] (◀️)       reverse button
+25FB..25FE    ; Extended_Pictographic#  3.2  [4] (◻️..◾)    white medium square..black medium-small square
+2600..2605    ; Extended_Pictographic#  1.1  [6] (☀️..★️)    sun..BLACK STAR
+2607..2612    ; Extended_Pictographic#  1.1 [12] (☇️..☒️)    LIGHTNING..BALLOT BOX WITH X
+2614..2615    ; Extended_Pictographic#  4.0  [2] (☔..☕)    umbrella with rain drops..hot beverage
+2616..2617    ; Extended_Pictographic#  3.2  [2] (☖️..☗️)    WHITE SHOGI PIECE..BLACK SHOGI PIECE
+2618          ; Extended_Pictographic#  4.1  [1] (☘️)       shamrock
+2619          ; Extended_Pictographic#  3.0  [1] (☙️)       REVERSED ROTATED FLORAL HEART BULLET
+261A..266F    ; Extended_Pictographic#  1.1 [86] (☚️..♯️)    BLACK LEFT POINTING INDEX..MUSIC SHARP SIGN
+2670..2671    ; Extended_Pictographic#  3.0  [2] (♰️..♱️)    WEST SYRIAC CROSS..EAST SYRIAC CROSS
+2672..267D    ; Extended_Pictographic#  3.2 [12] (♲️..♽️)    UNIVERSAL RECYCLING SYMBOL..PARTIALLY-RECYCLED PAPER SYMBOL
+267E..267F    ; Extended_Pictographic#  4.1  [2] (♾️..♿)    infinity..wheelchair symbol
+2680..2685    ; Extended_Pictographic#  3.2  [6] (⚀️..⚅️)    DIE FACE-1..DIE FACE-6
+2690..2691    ; Extended_Pictographic#  4.0  [2] (⚐️..⚑️)    WHITE FLAG..BLACK FLAG
+2692..269C    ; Extended_Pictographic#  4.1 [11] (⚒️..⚜️)    hammer and pick..fleur-de-lis
+269D          ; Extended_Pictographic#  5.1  [1] (⚝️)       OUTLINED WHITE STAR
+269E..269F    ; Extended_Pictographic#  5.2  [2] (⚞️..⚟️)    THREE LINES CONVERGING RIGHT..THREE LINES CONVERGING LEFT
+26A0..26A1    ; Extended_Pictographic#  4.0  [2] (⚠️..⚡)    warning..high voltage
+26A2..26B1    ; Extended_Pictographic#  4.1 [16] (⚢️..⚱️)    DOUBLED FEMALE SIGN..funeral urn
+26B2          ; Extended_Pictographic#  5.0  [1] (⚲️)       NEUTER
+26B3..26BC    ; Extended_Pictographic#  5.1 [10] (⚳️..⚼️)    CERES..SESQUIQUADRATE
+26BD..26BF    ; Extended_Pictographic#  5.2  [3] (⚽..⚿️)    soccer ball..SQUARED KEY
+26C0..26C3    ; Extended_Pictographic#  5.1  [4] (⛀️..⛃️)    WHITE DRAUGHTS MAN..BLACK DRAUGHTS KING
+26C4..26CD    ; Extended_Pictographic#  5.2 [10] (⛄..⛍️)    snowman without snow..DISABLED CAR
+26CE          ; Extended_Pictographic#  6.0  [1] (⛎)       Ophiuchus
+26CF..26E1    ; Extended_Pictographic#  5.2 [19] (⛏️..⛡️)    pick..RESTRICTED LEFT ENTRY-2
+26E2          ; Extended_Pictographic#  6.0  [1] (⛢️)       ASTRONOMICAL SYMBOL FOR URANUS
+26E3          ; Extended_Pictographic#  5.2  [1] (⛣️)       HEAVY CIRCLE WITH STROKE AND TWO DOTS ABOVE
+26E4..26E7    ; Extended_Pictographic#  6.0  [4] (⛤️..⛧️)    PENTAGRAM..INVERTED PENTAGRAM
+26E8..26FF    ; Extended_Pictographic#  5.2 [24] (⛨️..⛿️)    BLACK CROSS ON SHIELD..WHITE FLAG WITH HORIZONTAL MIDDLE BLACK STRIPE
+2700          ; Extended_Pictographic#  7.0  [1] (✀️)       BLACK SAFETY SCISSORS
+2701..2704    ; Extended_Pictographic#  1.1  [4] (✁️..✄️)    UPPER BLADE SCISSORS..WHITE SCISSORS
+2705          ; Extended_Pictographic#  6.0  [1] (✅)       white heavy check mark
+2708..2709    ; Extended_Pictographic#  1.1  [2] (✈️..✉️)    airplane..envelope
+270A..270B    ; Extended_Pictographic#  6.0  [2] (✊..✋)    raised fist..raised hand
+270C..2712    ; Extended_Pictographic#  1.1  [7] (✌️..✒️)    victory hand..black nib
+2714          ; Extended_Pictographic#  1.1  [1] (✔️)       heavy check mark
+2716          ; Extended_Pictographic#  1.1  [1] (✖️)       heavy multiplication x
+271D          ; Extended_Pictographic#  1.1  [1] (✝️)       latin cross
+2721          ; Extended_Pictographic#  1.1  [1] (✡️)       star of David
+2728          ; Extended_Pictographic#  6.0  [1] (✨)       sparkles
+2733..2734    ; Extended_Pictographic#  1.1  [2] (✳️..✴️)    eight-spoked asterisk..eight-pointed star
+2744          ; Extended_Pictographic#  1.1  [1] (❄️)       snowflake
+2747          ; Extended_Pictographic#  1.1  [1] (❇️)       sparkle
+274C          ; Extended_Pictographic#  6.0  [1] (❌)       cross mark
+274E          ; Extended_Pictographic#  6.0  [1] (❎)       cross mark button
+2753..2755    ; Extended_Pictographic#  6.0  [3] (❓..❕)    question mark..white exclamation mark
+2757          ; Extended_Pictographic#  5.2  [1] (❗)       exclamation mark
+2763..2767    ; Extended_Pictographic#  1.1  [5] (❣️..❧️)    heavy heart exclamation..ROTATED FLORAL HEART BULLET
+2795..2797    ; Extended_Pictographic#  6.0  [3] (➕..➗)    heavy plus sign..heavy division sign
+27A1          ; Extended_Pictographic#  1.1  [1] (➡️)       right arrow
+27B0          ; Extended_Pictographic#  6.0  [1] (➰)       curly loop
+27BF          ; Extended_Pictographic#  6.0  [1] (➿)       double curly loop
+2934..2935    ; Extended_Pictographic#  3.2  [2] (⤴️..⤵️)    right arrow curving up..right arrow curving down
+2B05..2B07    ; Extended_Pictographic#  4.0  [3] (⬅️..⬇️)    left arrow..down arrow
+2B1B..2B1C    ; Extended_Pictographic#  5.1  [2] (⬛..⬜)    black large square..white large square
+2B50          ; Extended_Pictographic#  5.1  [1] (⭐)       star
+2B55          ; Extended_Pictographic#  5.2  [1] (⭕)       heavy large circle
+3030          ; Extended_Pictographic#  1.1  [1] (〰️)       wavy dash
+303D          ; Extended_Pictographic#  3.2  [1] (〽️)       part alternation mark
+3297          ; Extended_Pictographic#  1.1  [1] (㊗️)       Japanese “congratulations” button
+3299          ; Extended_Pictographic#  1.1  [1] (㊙️)       Japanese “secret” button
+1F000..1F02B  ; Extended_Pictographic#  5.1 [44] (🀀️..🀫️)    MAHJONG TILE EAST WIND..MAHJONG TILE BACK
+1F02C..1F02F  ; Extended_Pictographic#   NA  [4] (🀬️..🀯️)    <reserved-1F02C>..<reserved-1F02F>
+1F030..1F093  ; Extended_Pictographic#  5.1[100] (🀰️..🂓️)    DOMINO TILE HORIZONTAL BACK..DOMINO TILE VERTICAL-06-06
+1F094..1F09F  ; Extended_Pictographic#   NA [12] (🂔️..🂟️)    <reserved-1F094>..<reserved-1F09F>
+1F0A0..1F0AE  ; Extended_Pictographic#  6.0 [15] (🂠️..🂮️)    PLAYING CARD BACK..PLAYING CARD KING OF SPADES
+1F0AF..1F0B0  ; Extended_Pictographic#   NA  [2] (🂯️..🂰️)    <reserved-1F0AF>..<reserved-1F0B0>
+1F0B1..1F0BE  ; Extended_Pictographic#  6.0 [14] (🂱️..🂾️)    PLAYING CARD ACE OF HEARTS..PLAYING CARD KING OF HEARTS
+1F0BF         ; Extended_Pictographic#  7.0  [1] (🂿️)       PLAYING CARD RED JOKER
+1F0C0         ; Extended_Pictographic#   NA  [1] (🃀️)       <reserved-1F0C0>
+1F0C1..1F0CF  ; Extended_Pictographic#  6.0 [15] (🃁️..🃏)    PLAYING CARD ACE OF DIAMONDS..joker
+1F0D0         ; Extended_Pictographic#   NA  [1] (🃐️)       <reserved-1F0D0>
+1F0D1..1F0DF  ; Extended_Pictographic#  6.0 [15] (🃑️..🃟️)    PLAYING CARD ACE OF CLUBS..PLAYING CARD WHITE JOKER
+1F0E0..1F0F5  ; Extended_Pictographic#  7.0 [22] (🃠️..🃵️)    PLAYING CARD FOOL..PLAYING CARD TRUMP-21
+1F0F6..1F0FF  ; Extended_Pictographic#   NA [10] (🃶️..🃿️)    <reserved-1F0F6>..<reserved-1F0FF>
+1F10D..1F10F  ; Extended_Pictographic#   NA  [3] (🄍️..🄏️)    <reserved-1F10D>..<reserved-1F10F>
+1F12F         ; Extended_Pictographic# 11.0  [1] (🄯️)       COPYLEFT SYMBOL
+1F16C..1F16F  ; Extended_Pictographic#   NA  [4] (🅬️..🅯️)    <reserved-1F16C>..<reserved-1F16F>
+1F170..1F171  ; Extended_Pictographic#  6.0  [2] (🅰️..🅱️)    A button (blood type)..B button (blood type)
+1F17E         ; Extended_Pictographic#  6.0  [1] (🅾️)       O button (blood type)
+1F17F         ; Extended_Pictographic#  5.2  [1] (🅿️)       P button
+1F18E         ; Extended_Pictographic#  6.0  [1] (🆎)       AB button (blood type)
+1F191..1F19A  ; Extended_Pictographic#  6.0 [10] (🆑..🆚)    CL button..VS button
+1F1AD..1F1E5  ; Extended_Pictographic#   NA [57] (🆭️..🇥️)    <reserved-1F1AD>..<reserved-1F1E5>
+1F201..1F202  ; Extended_Pictographic#  6.0  [2] (🈁..🈂️)    Japanese “here” button..Japanese “service charge” button
+1F203..1F20F  ; Extended_Pictographic#   NA [13] (🈃️..🈏️)    <reserved-1F203>..<reserved-1F20F>
+1F21A         ; Extended_Pictographic#  5.2  [1] (🈚)       Japanese “free of charge” button
+1F22F         ; Extended_Pictographic#  5.2  [1] (🈯)       Japanese “reserved” button
+1F232..1F23A  ; Extended_Pictographic#  6.0  [9] (🈲..🈺)    Japanese “prohibited” button..Japanese “open for business” button
+1F23C..1F23F  ; Extended_Pictographic#   NA  [4] (🈼️..🈿️)    <reserved-1F23C>..<reserved-1F23F>
+1F249..1F24F  ; Extended_Pictographic#   NA  [7] (🉉️..🉏️)    <reserved-1F249>..<reserved-1F24F>
+1F250..1F251  ; Extended_Pictographic#  6.0  [2] (🉐..🉑)    Japanese “bargain” button..Japanese “acceptable” button
+1F252..1F25F  ; Extended_Pictographic#   NA [14] (🉒️..🉟️)    <reserved-1F252>..<reserved-1F25F>
+1F260..1F265  ; Extended_Pictographic# 10.0  [6] (🉠️..🉥️)    ROUNDED SYMBOL FOR FU..ROUNDED SYMBOL FOR CAI
+1F266..1F2FF  ; Extended_Pictographic#   NA[154] (🉦️..🋿️)    <reserved-1F266>..<reserved-1F2FF>
+1F300..1F320  ; Extended_Pictographic#  6.0 [33] (🌀..🌠)    cyclone..shooting star
+1F321..1F32C  ; Extended_Pictographic#  7.0 [12] (🌡️..🌬️)    thermometer..wind face
+1F32D..1F32F  ; Extended_Pictographic#  8.0  [3] (🌭..🌯)    hot dog..burrito
+1F330..1F335  ; Extended_Pictographic#  6.0  [6] (🌰..🌵)    chestnut..cactus
+1F336         ; Extended_Pictographic#  7.0  [1] (🌶️)       hot pepper
+1F337..1F37C  ; Extended_Pictographic#  6.0 [70] (🌷..🍼)    tulip..baby bottle
+1F37D         ; Extended_Pictographic#  7.0  [1] (🍽️)       fork and knife with plate
+1F37E..1F37F  ; Extended_Pictographic#  8.0  [2] (🍾..🍿)    bottle with popping cork..popcorn
+1F380..1F393  ; Extended_Pictographic#  6.0 [20] (🎀..🎓)    ribbon..graduation cap
+1F394..1F39F  ; Extended_Pictographic#  7.0 [12] (🎔️..🎟️)    HEART WITH TIP ON THE LEFT..admission tickets
+1F3A0..1F3C4  ; Extended_Pictographic#  6.0 [37] (🎠..🏄)    carousel horse..person surfing
+1F3C5         ; Extended_Pictographic#  7.0  [1] (🏅)       sports medal
+1F3C6..1F3CA  ; Extended_Pictographic#  6.0  [5] (🏆..🏊)    trophy..person swimming
+1F3CB..1F3CE  ; Extended_Pictographic#  7.0  [4] (🏋️..🏎️)    person lifting weights..racing car
+1F3CF..1F3D3  ; Extended_Pictographic#  8.0  [5] (🏏..🏓)    cricket game..ping pong
+1F3D4..1F3DF  ; Extended_Pictographic#  7.0 [12] (🏔️..🏟️)    snow-capped mountain..stadium
+1F3E0..1F3F0  ; Extended_Pictographic#  6.0 [17] (🏠..🏰)    house..castle
+1F3F1..1F3F7  ; Extended_Pictographic#  7.0  [7] (🏱️..🏷️)    WHITE PENNANT..label
+1F3F8..1F3FA  ; Extended_Pictographic#  8.0  [3] (🏸..🏺)    badminton..amphora
+1F400..1F43E  ; Extended_Pictographic#  6.0 [63] (🐀..🐾)    rat..paw prints
+1F43F         ; Extended_Pictographic#  7.0  [1] (🐿️)       chipmunk
+1F440         ; Extended_Pictographic#  6.0  [1] (👀)       eyes
+1F441         ; Extended_Pictographic#  7.0  [1] (👁️)       eye
+1F442..1F4F7  ; Extended_Pictographic#  6.0[182] (👂..📷)    ear..camera
+1F4F8         ; Extended_Pictographic#  7.0  [1] (📸)       camera with flash
+1F4F9..1F4FC  ; Extended_Pictographic#  6.0  [4] (📹..📼)    video camera..videocassette
+1F4FD..1F4FE  ; Extended_Pictographic#  7.0  [2] (📽️..📾️)    film projector..PORTABLE STEREO
+1F4FF         ; Extended_Pictographic#  8.0  [1] (📿)       prayer beads
+1F500..1F53D  ; Extended_Pictographic#  6.0 [62] (🔀..🔽)    shuffle tracks button..downwards button
+1F546..1F54A  ; Extended_Pictographic#  7.0  [5] (🕆️..🕊️)    WHITE LATIN CROSS..dove
+1F54B..1F54F  ; Extended_Pictographic#  8.0  [5] (🕋..🕏️)    kaaba..BOWL OF HYGIEIA
+1F550..1F567  ; Extended_Pictographic#  6.0 [24] (🕐..🕧)    one o’clock..twelve-thirty
+1F568..1F579  ; Extended_Pictographic#  7.0 [18] (🕨️..🕹️)    RIGHT SPEAKER..joystick
+1F57A         ; Extended_Pictographic#  9.0  [1] (🕺)       man dancing
+1F57B..1F5A3  ; Extended_Pictographic#  7.0 [41] (🕻️..🖣️)    LEFT HAND TELEPHONE RECEIVER..BLACK DOWN POINTING BACKHAND INDEX
+1F5A4         ; Extended_Pictographic#  9.0  [1] (🖤)       black heart
+1F5A5..1F5FA  ; Extended_Pictographic#  7.0 [86] (🖥️..🗺️)    desktop computer..world map
+1F5FB..1F5FF  ; Extended_Pictographic#  6.0  [5] (🗻..🗿)    mount fuji..moai
+1F600         ; Extended_Pictographic#  6.1  [1] (😀)       grinning face
+1F601..1F610  ; Extended_Pictographic#  6.0 [16] (😁..😐)    beaming face with smiling eyes..neutral face
+1F611         ; Extended_Pictographic#  6.1  [1] (😑)       expressionless face
+1F612..1F614  ; Extended_Pictographic#  6.0  [3] (😒..😔)    unamused face..pensive face
+1F615         ; Extended_Pictographic#  6.1  [1] (😕)       confused face
+1F616         ; Extended_Pictographic#  6.0  [1] (😖)       confounded face
+1F617         ; Extended_Pictographic#  6.1  [1] (😗)       kissing face
+1F618         ; Extended_Pictographic#  6.0  [1] (😘)       face blowing a kiss
+1F619         ; Extended_Pictographic#  6.1  [1] (😙)       kissing face with smiling eyes
+1F61A         ; Extended_Pictographic#  6.0  [1] (😚)       kissing face with closed eyes
+1F61B         ; Extended_Pictographic#  6.1  [1] (😛)       face with tongue
+1F61C..1F61E  ; Extended_Pictographic#  6.0  [3] (😜..😞)    winking face with tongue..disappointed face
+1F61F         ; Extended_Pictographic#  6.1  [1] (😟)       worried face
+1F620..1F625  ; Extended_Pictographic#  6.0  [6] (😠..😥)    angry face..sad but relieved face
+1F626..1F627  ; Extended_Pictographic#  6.1  [2] (😦..😧)    frowning face with open mouth..anguished face
+1F628..1F62B  ; Extended_Pictographic#  6.0  [4] (😨..😫)    fearful face..tired face
+1F62C         ; Extended_Pictographic#  6.1  [1] (😬)       grimacing face
+1F62D         ; Extended_Pictographic#  6.0  [1] (😭)       loudly crying face
+1F62E..1F62F  ; Extended_Pictographic#  6.1  [2] (😮..😯)    face with open mouth..hushed face
+1F630..1F633  ; Extended_Pictographic#  6.0  [4] (😰..😳)    anxious face with sweat..flushed face
+1F634         ; Extended_Pictographic#  6.1  [1] (😴)       sleeping face
+1F635..1F640  ; Extended_Pictographic#  6.0 [12] (😵..🙀)    dizzy face..weary cat face
+1F641..1F642  ; Extended_Pictographic#  7.0  [2] (🙁..🙂)    slightly frowning face..slightly smiling face
+1F643..1F644  ; Extended_Pictographic#  8.0  [2] (🙃..🙄)    upside-down face..face with rolling eyes
+1F645..1F64F  ; Extended_Pictographic#  6.0 [11] (🙅..🙏)    person gesturing NO..folded hands
+1F680..1F6C5  ; Extended_Pictographic#  6.0 [70] (🚀..🛅)    rocket..left luggage
+1F6C6..1F6CF  ; Extended_Pictographic#  7.0 [10] (🛆️..🛏️)    TRIANGLE WITH ROUNDED CORNERS..bed
+1F6D0         ; Extended_Pictographic#  8.0  [1] (🛐)       place of worship
+1F6D1..1F6D2  ; Extended_Pictographic#  9.0  [2] (🛑..🛒)    stop sign..shopping cart
+1F6D3..1F6D4  ; Extended_Pictographic# 10.0  [2] (🛓️..🛔️)    STUPA..PAGODA
+1F6D5..1F6DF  ; Extended_Pictographic#   NA [11] (🛕️..🛟️)    <reserved-1F6D5>..<reserved-1F6DF>
+1F6E0..1F6EC  ; Extended_Pictographic#  7.0 [13] (🛠️..🛬)    hammer and wrench..airplane arrival
+1F6ED..1F6EF  ; Extended_Pictographic#   NA  [3] (🛭️..🛯️)    <reserved-1F6ED>..<reserved-1F6EF>
+1F6F0..1F6F3  ; Extended_Pictographic#  7.0  [4] (🛰️..🛳️)    satellite..passenger ship
+1F6F4..1F6F6  ; Extended_Pictographic#  9.0  [3] (🛴..🛶)    kick scooter..canoe
+1F6F7..1F6F8  ; Extended_Pictographic# 10.0  [2] (🛷..🛸)    sled..flying saucer
+1F6F9         ; Extended_Pictographic# 11.0  [1] (🛹)       skateboard
+1F6FA..1F6FF  ; Extended_Pictographic#   NA  [6] (🛺️..🛿️)    <reserved-1F6FA>..<reserved-1F6FF>
+1F774..1F77F  ; Extended_Pictographic#   NA [12] (🝴️..🝿️)    <reserved-1F774>..<reserved-1F77F>
+1F7D5..1F7D8  ; Extended_Pictographic# 11.0  [4] (🟕️..🟘️)    CIRCLED TRIANGLE..NEGATIVE CIRCLED SQUARE
+1F7D9..1F7FF  ; Extended_Pictographic#   NA [39] (🟙️..🟿️)    <reserved-1F7D9>..<reserved-1F7FF>
+1F80C..1F80F  ; Extended_Pictographic#   NA  [4] (🠌️..🠏️)    <reserved-1F80C>..<reserved-1F80F>
+1F848..1F84F  ; Extended_Pictographic#   NA  [8] (🡈️..🡏️)    <reserved-1F848>..<reserved-1F84F>
+1F85A..1F85F  ; Extended_Pictographic#   NA  [6] (🡚️..🡟️)    <reserved-1F85A>..<reserved-1F85F>
+1F888..1F88F  ; Extended_Pictographic#   NA  [8] (🢈️..🢏️)    <reserved-1F888>..<reserved-1F88F>
+1F8AE..1F8FF  ; Extended_Pictographic#   NA [82] (🢮️..🣿️)    <reserved-1F8AE>..<reserved-1F8FF>
+1F90C..1F90F  ; Extended_Pictographic#   NA  [4] (🤌️..🤏️)    <reserved-1F90C>..<reserved-1F90F>
+1F910..1F918  ; Extended_Pictographic#  8.0  [9] (🤐..🤘)    zipper-mouth face..sign of the horns
+1F919..1F91E  ; Extended_Pictographic#  9.0  [6] (🤙..🤞)    call me hand..crossed fingers
+1F91F         ; Extended_Pictographic# 10.0  [1] (🤟)       love-you gesture
+1F920..1F927  ; Extended_Pictographic#  9.0  [8] (🤠..🤧)    cowboy hat face..sneezing face
+1F928..1F92F  ; Extended_Pictographic# 10.0  [8] (🤨..🤯)    face with raised eyebrow..exploding head
+1F930         ; Extended_Pictographic#  9.0  [1] (🤰)       pregnant woman
+1F931..1F932  ; Extended_Pictographic# 10.0  [2] (🤱..🤲)    breast-feeding..palms up together
+1F933..1F93A  ; Extended_Pictographic#  9.0  [8] (🤳..🤺)    selfie..person fencing
+1F93C..1F93E  ; Extended_Pictographic#  9.0  [3] (🤼..🤾)    people wrestling..person playing handball
+1F93F         ; Extended_Pictographic#   NA  [1] (🤿️)       <reserved-1F93F>
+1F940..1F945  ; Extended_Pictographic#  9.0  [6] (🥀..🥅)    wilted flower..goal net
+1F947..1F94B  ; Extended_Pictographic#  9.0  [5] (🥇..🥋)    1st place medal..martial arts uniform
+1F94C         ; Extended_Pictographic# 10.0  [1] (🥌)       curling stone
+1F94D..1F94F  ; Extended_Pictographic# 11.0  [3] (🥍..🥏)    lacrosse..flying disc
+1F950..1F95E  ; Extended_Pictographic#  9.0 [15] (🥐..🥞)    croissant..pancakes
+1F95F..1F96B  ; Extended_Pictographic# 10.0 [13] (🥟..🥫)    dumpling..canned food
+1F96C..1F970  ; Extended_Pictographic# 11.0  [5] (🥬..🥰)    leafy green..smiling face with 3 hearts
+1F971..1F972  ; Extended_Pictographic#   NA  [2] (🥱️..🥲️)    <reserved-1F971>..<reserved-1F972>
+1F973..1F976  ; Extended_Pictographic# 11.0  [4] (🥳..🥶)    partying face..cold face
+1F977..1F979  ; Extended_Pictographic#   NA  [3] (🥷️..🥹️)    <reserved-1F977>..<reserved-1F979>
+1F97A         ; Extended_Pictographic# 11.0  [1] (🥺)       pleading face
+1F97B         ; Extended_Pictographic#   NA  [1] (🥻️)       <reserved-1F97B>
+1F97C..1F97F  ; Extended_Pictographic# 11.0  [4] (🥼..🥿)    lab coat..woman’s flat shoe
+1F980..1F984  ; Extended_Pictographic#  8.0  [5] (🦀..🦄)    crab..unicorn face
+1F985..1F991  ; Extended_Pictographic#  9.0 [13] (🦅..🦑)    eagle..squid
+1F992..1F997  ; Extended_Pictographic# 10.0  [6] (🦒..🦗)    giraffe..cricket
+1F998..1F9A2  ; Extended_Pictographic# 11.0 [11] (🦘..🦢)    kangaroo..swan
+1F9A3..1F9AF  ; Extended_Pictographic#   NA [13] (🦣️..🦯️)    <reserved-1F9A3>..<reserved-1F9AF>
+1F9B0..1F9B9  ; Extended_Pictographic# 11.0 [10] (🦰..🦹)    red-haired..supervillain
+1F9BA..1F9BF  ; Extended_Pictographic#   NA  [6] (🦺️..🦿️)    <reserved-1F9BA>..<reserved-1F9BF>
+1F9C0         ; Extended_Pictographic#  8.0  [1] (🧀)       cheese wedge
+1F9C1..1F9C2  ; Extended_Pictographic# 11.0  [2] (🧁..🧂)    cupcake..salt
+1F9C3..1F9CF  ; Extended_Pictographic#   NA [13] (🧃️..🧏️)    <reserved-1F9C3>..<reserved-1F9CF>
+1F9D0..1F9E6  ; Extended_Pictographic# 10.0 [23] (🧐..🧦)    face with monocle..socks
+1F9E7..1F9FF  ; Extended_Pictographic# 11.0 [25] (🧧..🧿)    red envelope..nazar amulet
+1FA00..1FA5F  ; Extended_Pictographic#   NA [96] (🨀️..🩟️)    <reserved-1FA00>..<reserved-1FA5F>
+1FA60..1FA6D  ; Extended_Pictographic# 11.0 [14] (🩠️..🩭️)    XIANGQI RED GENERAL..XIANGQI BLACK SOLDIER
+1FA6E..1FFFD  ; Extended_Pictographic#   NA[1424] (🩮️..🿽️)   <reserved-1FA6E>..<reserved-1FFFD>
+
+# Total elements: 3793
+
+#EOF
diff --git a/lib/stdlib/uc_spec/gen_unicode_mod.escript b/lib/stdlib/uc_spec/gen_unicode_mod.escript
index 535f01a1c5..de67b18afc 100755..100644
--- a/lib/stdlib/uc_spec/gen_unicode_mod.escript
+++ b/lib/stdlib/uc_spec/gen_unicode_mod.escript
@@ -4,7 +4,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2017. All Rights Reserved.
+%% Copyright Ericsson AB 2017-2019. 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.
@@ -48,13 +48,18 @@ main(_) ->
     ok = file:close(ExclF),
 
     %%  GraphemeBreakProperty table
+    {ok, Emoji} = file:open("../uc_spec/emoji-data.txt", [read, raw, {read_ahead, 1000000}]),
+    Props00 = foldl(fun parse_properties/2, [], Emoji),
+    %% Filter Extended_Pictographic class which we are interested in.
+    Props0 = [EP || {extended_pictographic, _} = EP <- Props00],
+    ok = file:close(Emoji),
     {ok, GBPF} = file:open("../uc_spec/GraphemeBreakProperty.txt", [read, raw, {read_ahead, 1000000}]),
-    Props0 = foldl(fun parse_properties/2, [], GBPF),
+    Props1 = foldl(fun parse_properties/2, Props0, GBPF),
     ok = file:close(GBPF),
     {ok, PropF} = file:open("../uc_spec/PropList.txt", [read, raw, {read_ahead, 1000000}]),
-    Props1 = foldl(fun parse_properties/2, Props0, PropF),
+    Props2 = foldl(fun parse_properties/2, Props1, PropF),
     ok = file:close(PropF),
-    Props = sofs:to_external(sofs:relation_to_family(sofs:relation(Props1))),
+    Props = sofs:to_external(sofs:relation_to_family(sofs:relation(Props2))),
 
     %% Make module
     {ok, Out} = file:open(?MOD++".erl", [write]),
@@ -170,7 +175,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/1, gc_prepend/2, gc_e_cont/2]}).\n"),
+    io:put_chars(Fd, "-dialyzer({no_improper_lists, [cp/1, gc/1, gc_prepend/2]}).\n"),
     io:put_chars(Fd, "-type gc() :: char()|[char()].\n\n\n"),
     ok.
 
@@ -186,7 +191,7 @@ gen_static(Fd) ->
                  "        {U,L} -> #{upper=>U,lower=>L,title=>U,fold=>L};\n"
                  "        {U,L,T,F} -> #{upper=>U,lower=>L,title=>T,fold=>F}\n"
                  "    end.\n\n"),
-    io:put_chars(Fd, "spec_version() -> {10,0}.\n\n\n"),
+    io:put_chars(Fd, "spec_version() -> {11,0}.\n\n\n"),
     io:put_chars(Fd, "class(Codepoint) -> {CCC,_,_} = unicode_table(Codepoint),\n    CCC.\n\n"),
     io:put_chars(Fd, "-spec uppercase(unicode:chardata()) -> "
                  "maybe_improper_list(gc(),unicode:chardata()).\n"),
@@ -197,7 +202,8 @@ gen_static(Fd) ->
     io:put_chars(Fd, "                {Upper,_} -> [Upper|Str];\n"),
     io:put_chars(Fd, "                {Upper,_,_,_} -> [Upper|Str]\n"),
     io:put_chars(Fd, "            end;\n"),
-    io:put_chars(Fd, "        [] -> []\n"),
+    io:put_chars(Fd, "        [] -> [];\n"),
+    io:put_chars(Fd, "        {error,Err} -> error({badarg, Err})\n"),
     io:put_chars(Fd, "    end.\n\n"),
     io:put_chars(Fd, "-spec lowercase(unicode:chardata()) -> "
                  "maybe_improper_list(gc(),unicode:chardata()).\n"),
@@ -208,7 +214,8 @@ gen_static(Fd) ->
     io:put_chars(Fd, "                {_,Lower} -> [Lower|Str];\n"),
     io:put_chars(Fd, "                {_,Lower,_,_} -> [Lower|Str]\n"),
     io:put_chars(Fd, "            end;\n"),
-    io:put_chars(Fd, "        [] -> []\n"),
+    io:put_chars(Fd, "        [] -> [];\n"),
+    io:put_chars(Fd, "        {error,Err} -> error({badarg, Err})\n"),
     io:put_chars(Fd, "    end.\n\n"),
     io:put_chars(Fd, "-spec titlecase(unicode:chardata()) -> "
                  "maybe_improper_list(gc(),unicode:chardata()).\n"),
@@ -219,7 +226,8 @@ gen_static(Fd) ->
     io:put_chars(Fd, "                {_,_,Title,_} -> [Title|Str];\n"),
     io:put_chars(Fd, "                {Upper,_} -> [Upper|Str]\n"),
     io:put_chars(Fd, "            end;\n"),
-    io:put_chars(Fd, "        [] -> []\n"),
+    io:put_chars(Fd, "        [] -> [];\n"),
+    io:put_chars(Fd, "        {error,Err} -> error({badarg, Err})\n"),
     io:put_chars(Fd, "    end.\n\n"),
     io:put_chars(Fd, "-spec casefold(unicode:chardata()) -> "
                  "maybe_improper_list(gc(),unicode:chardata()).\n"),
@@ -230,7 +238,8 @@ gen_static(Fd) ->
     io:put_chars(Fd, "                {_,_,_,Fold} -> [Fold|Str];\n"),
     io:put_chars(Fd, "                {_,Lower} -> [Lower|Str]\n"),
     io:put_chars(Fd, "            end;\n"),
-    io:put_chars(Fd, "        [] -> []\n"),
+    io:put_chars(Fd, "        [] -> [];\n"),
+    io:put_chars(Fd, "        {error,Err} -> error({badarg, Err})\n"),
     io:put_chars(Fd, "    end.\n\n"),
 
     ok.
@@ -455,17 +464,73 @@ gen_cp(Fd) ->
                  " maybe_improper_list() | {error, unicode:chardata()}.\n"),
     io:put_chars(Fd, "cp([C|_]=L) when is_integer(C) -> L;\n"),
     io:put_chars(Fd, "cp([List]) -> cp(List);\n"),
-    io:put_chars(Fd, "cp([List|R]) ->\n"),
-    io:put_chars(Fd, "    case cp(List) of\n"),
-    io:put_chars(Fd, "        [] -> cp(R);\n"),
-    io:put_chars(Fd, "        [CP] -> [CP|R];\n"),
-    io:put_chars(Fd, "        [C|R0] -> [C|[R0|R]];\n"),
-    io:put_chars(Fd, "        {error,Error} -> {error,[Error|R]}\n"),
-    io:put_chars(Fd, "    end;\n"),
+    io:put_chars(Fd, "cp([List|R]) -> cpl(List, R);\n"),
     io:put_chars(Fd, "cp([]) -> [];\n"),
     io:put_chars(Fd, "cp(<<C/utf8, R/binary>>) -> [C|R];\n"),
     io:put_chars(Fd, "cp(<<>>) -> [];\n"),
-    io:put_chars(Fd, "cp(<<R/binary>>) -> {error,R}.\n\n"),
+    io:put_chars(Fd, "cp(<<R/binary>>) -> {error,R}.\n"),
+    io:put_chars(Fd, "\n"),
+    io:put_chars(Fd, "cpl([C], R) when is_integer(C) -> [C|cpl_1_cont(R)];\n"),
+    io:put_chars(Fd, "cpl([C|T], R) when is_integer(C) -> [C|cpl_cont(T, R)];\n"),
+    io:put_chars(Fd, "cpl([List], R) -> cpl(List, R);\n"),
+    io:put_chars(Fd, "cpl([List|T], R) -> cpl(List, [T|R]);\n"),
+    io:put_chars(Fd, "cpl([], R) -> cp(R);\n"),
+    io:put_chars(Fd, "cpl(<<C/utf8, T/binary>>, R) -> [C,T|R];\n"),
+    io:put_chars(Fd, "cpl(<<>>, R) -> cp(R);\n"),
+    io:put_chars(Fd, "cpl(<<B/binary>>, R) -> {error,[B|R]}.\n"),
+    io:put_chars(Fd, "\n"),
+    io:put_chars(Fd, "%%%\n"),
+    io:put_chars(Fd, "\n"),
+    io:put_chars(Fd, "cpl_cont([C|T], R) when is_integer(C) -> [C|cpl_cont2(T, R)];\n"),
+    io:put_chars(Fd, "cpl_cont([L], R) -> cpl_cont(L, R);\n"),
+    io:put_chars(Fd, "cpl_cont([L|T], R) -> cpl_cont(L, [T|R]);\n"),
+    io:put_chars(Fd, "cpl_cont([], R) -> cpl_1_cont(R);\n"),
+    io:put_chars(Fd, "cpl_cont(T, R) -> [T|R].\n"),
+    io:put_chars(Fd, "\n"),
+    io:put_chars(Fd, "cpl_cont2([C|T], R) when is_integer(C) -> [C|cpl_cont3(T, R)];\n"),
+    io:put_chars(Fd, "cpl_cont2([L], R) -> cpl_cont2(L, R);\n"),
+    io:put_chars(Fd, "cpl_cont2([L|T], R) -> cpl_cont2(L, [T|R]);\n"),
+    io:put_chars(Fd, "cpl_cont2([], R) -> cpl_1_cont2(R);\n"),
+    io:put_chars(Fd, "cpl_cont2(T, R) -> [T|R].\n"),
+    io:put_chars(Fd, "\n"),
+    io:put_chars(Fd, "cpl_cont3([C], R) when is_integer(C) -> [C|R];\n"),
+    io:put_chars(Fd, "cpl_cont3([C|T], R) when is_integer(C) -> [C,T|R];\n"),
+    io:put_chars(Fd, "cpl_cont3([L], R) -> cpl_cont3(L, R);\n"),
+    io:put_chars(Fd, "cpl_cont3([L|T], R) -> cpl_cont3(L, [T|R]);\n"),
+    io:put_chars(Fd, "cpl_cont3([], R) -> cpl_1_cont3(R);\n"),
+    io:put_chars(Fd, "cpl_cont3(T, R) -> [T|R].\n"),
+    io:put_chars(Fd, "\n"),
+    io:put_chars(Fd, "%%%\n"),
+    io:put_chars(Fd, "\n"),
+    io:put_chars(Fd, "cpl_1_cont([C|T]) when is_integer(C) -> [C|cpl_1_cont2(T)];\n"),
+    io:put_chars(Fd, "cpl_1_cont([L]) -> cpl_1_cont(L);\n"),
+    io:put_chars(Fd, "cpl_1_cont([L|T]) -> cpl_cont(L, T);\n"),
+    io:put_chars(Fd, "cpl_1_cont(T) -> T.\n"),
+    io:put_chars(Fd, "\n"),
+    io:put_chars(Fd, "cpl_1_cont2([C|T]) when is_integer(C) -> [C|cpl_1_cont3(T)];\n"),
+    io:put_chars(Fd, "cpl_1_cont2([L]) -> cpl_1_cont2(L);\n"),
+    io:put_chars(Fd, "cpl_1_cont2([L|T]) -> cpl_cont2(L, T);\n"),
+    io:put_chars(Fd, "cpl_1_cont2(T) -> T.\n"),
+    io:put_chars(Fd, "\n"),
+    io:put_chars(Fd, "cpl_1_cont3([C|_]=T) when is_integer(C) -> T;\n"),
+    io:put_chars(Fd, "cpl_1_cont3([L]) -> cpl_1_cont3(L);\n"),
+    io:put_chars(Fd, "cpl_1_cont3([L|T]) -> cpl_cont3(L, T);\n"),
+    io:put_chars(Fd, "cpl_1_cont3(T) -> T.\n"),
+    io:put_chars(Fd, "\n"),
+    io:put_chars(Fd, "%%%\n"),
+    io:put_chars(Fd, "\n"),
+    io:put_chars(Fd, "cp_no_bin([C|_]=L) when is_integer(C) -> L;\n"),
+    io:put_chars(Fd, "cp_no_bin([List]) -> cp_no_bin(List);\n"),
+    io:put_chars(Fd, "cp_no_bin([List|R]) -> cp_no_binl(List, R);\n"),
+    io:put_chars(Fd, "cp_no_bin([]) -> [];\n"),
+    io:put_chars(Fd, "cp_no_bin(_) -> binary_found.\n"),
+    io:put_chars(Fd, "\n"),
+    io:put_chars(Fd, "cp_no_binl([C], R) when is_integer(C) -> [C|cpl_1_cont(R)];\n"),
+    io:put_chars(Fd, "cp_no_binl([C|T], R) when is_integer(C) -> [C|cpl_cont(T, R)];\n"),
+    io:put_chars(Fd, "cp_no_binl([List], R) -> cp_no_binl(List, R);\n"),
+    io:put_chars(Fd, "cp_no_binl([List|T], R) -> cp_no_binl(List, [T|R]);\n"),
+    io:put_chars(Fd, "cp_no_binl([], R) -> cp_no_bin(R);\n"),
+    io:put_chars(Fd, "cp_no_binl(_, _) -> binary_found.\n\n"),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -476,11 +541,26 @@ 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([]=R) -> R;\n"
+                 "gc([CP]=R) when is_integer(CP) -> R;\n"
+                 "gc([$\\r=CP|R0]) ->\n"
+                 "    case cp(R0) of % Don't break CRLF\n"
+                 "        [$\\n|R1] -> [[$\\r,$\\n]|R1];\n"
+                 "        T -> [CP|T]\n"
+                 "    end;\n"
+                 "gc([CP1|T1]=T) when CP1 < 256 ->\n"
+                 "    case T1 of\n"
+                 "        [CP2|_] when CP2 < 256 -> T; %% Ascii Fast path\n"
+                 "        _ -> %% Keep the tail binary.\n"
+                 "            case cp_no_bin(T1) of\n"
+                 "                [CP2|_]=T3 when CP2 < 256 -> [CP1|T3]; %% Asciii Fast path\n"
+                 "                binary_found -> gc_1(T);\n"
+                 "                T4 -> gc_1([CP1|T4])\n"
+                 "            end\n"
+                 "    end;\n"
+                 "gc(<<>>) -> [];\n"
                  "gc(<<CP1/utf8, Rest/binary>>) ->\n"
-                 "    if CP1 < 256, CP1 =/= $\r ->\n"
+                 "    if CP1 < 256, CP1 =/= $\\r ->\n"
                  "           case Rest of\n"
                  "               <<CP2/utf8, _/binary>> when CP2 < 256 -> %% Ascii Fast path\n"
                  "                   [CP1|Rest];\n"
@@ -488,40 +568,52 @@ gen_gc(Fd, GBP) ->
                  "           end;\n"
                  "      true -> gc_1([CP1|Rest])\n"
                  "    end;\n"
+                 "gc([CP|_]=T) when is_integer(CP) -> gc_1(T);\n"
                  "gc(Str) ->\n"
-                 "    gc_1(cp(Str)).\n\n"
-                 "gc_1([$\\r|R0] = R) ->\n"
+                 "    case cp(Str) of\n"
+                 "        {error,_}=Error -> Error;\n"
+                 "        CPs -> gc(CPs)\n"
+                 "    end.\n"
+                ),
+
+    GenExtP = fun(Range) -> io:format(Fd, "gc_1~s gc_ext_pict(R1,[CP]);\n", [gen_clause(Range)]) end,
+    ExtendedPictographic0 = merge_ranges(maps:get(extended_pictographic,GBP)),
+    %% Pick codepoints below 256 (some data knowledge here)
+    {ExtendedPictographicLow,ExtendedPictographicHigh} =
+        lists:splitwith(fun({Start,undefined}) -> Start < 256 end,ExtendedPictographic0),
+    io:put_chars(Fd,
+                 "\ngc_1([$\\r|R0] = R) ->\n"
                  "    case cp(R0) of % Don't break CRLF\n"
                  "        [$\\n|R1] -> [[$\\r,$\\n]|R1];\n"
                  "        _ -> R\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"),
+                 "    end;\n"),
+    io:put_chars(Fd, "\n%% Handle control\n"),
     GenControl = fun(Range) -> io:format(Fd, "gc_1~s R0;\n", [gen_clause(Range)]) end,
     CRs0 = merge_ranges(maps:get(cr, GBP) ++ maps:get(lf, GBP) ++ maps:get(control, GBP), false),
     [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 < 256 -> gc_extend(R,CP);\n", []),
+    io:put_chars(Fd, "\n%% Optimize Latin-1\n"),
+    [GenExtP(CP) || CP <- merge_ranges(ExtendedPictographicLow)],
+
+    io:format(Fd,
+              "gc_1([CP|R]=R0) when CP < 256 ->\n"
+              "    case R of\n"
+              "        [CP2|_] when CP2 < 256 -> R0;\n"
+              "        _ -> gc_extend(cp(R), R, CP)\n"
+              "    end;\n",
+              []),
+    io:put_chars(Fd, "\n%% Continue control\n"),
     [GenControl(CP) || CP <- Crs],
     %% One clause per CP
     %% CRs0 = merge_ranges(maps:get(cr, GBP) ++ maps:get(lf, GBP) ++ maps:get(control, GBP)),
     %% [GenControl(CP) || CP <- CRs0, CP =/= {$\r, undefined}],
 
-    io:put_chars(Fd, "%% Handle ZWJ\n"),
-    GenZWJ = fun(Range) -> io:format(Fd, "gc_1~s gc_zwj(R1, [CP]);\n", [gen_clause(Range)]) end,
-    [GenZWJ(CP) || CP <- merge_ranges(maps:get(zwj,GBP))],
-
-    io:put_chars(Fd, "%% Handle prepend\n"),
+    io:put_chars(Fd, "\n%% Handle prepend\n"),
     GenPrepend = fun(Range) -> io:format(Fd, "gc_1~s gc_prepend(R1, CP);\n", [gen_clause(Range)]) end,
     [GenPrepend(CP) || CP <- merge_ranges(maps:get(prepend,GBP))],
 
-    io:put_chars(Fd, "%% Handle Hangul L\n"),
+    io:put_chars(Fd, "\n%% Handle Hangul L\n"),
     GenHangulL = fun(Range) -> io:format(Fd, "gc_1~s gc_h_L(R1,[CP]);\n", [gen_clause(Range)]) end,
     [GenHangulL(CP) || CP <- merge_ranges(maps:get(l,GBP))],
     io:put_chars(Fd, "%% Handle Hangul V\n"),
@@ -531,21 +623,22 @@ gen_gc(Fd, GBP) ->
     GenHangulT = fun(Range) -> io:format(Fd, "gc_1~s gc_h_T(R1,[CP]);\n", [gen_clause(Range)]) end,
     [GenHangulT(CP) || CP <- merge_ranges(maps:get(t,GBP))],
     io:put_chars(Fd, "%% Handle Hangul LV and LVT special, since they are large\n"),
-    io:put_chars(Fd, "gc_1([CP|_]=R0) when 44000 < CP, CP < 56000 -> gc_h_lv_lvt(R0, []);\n"),
+    io:put_chars(Fd, "gc_1([CP|_]=R0) when 44000 < CP, CP < 56000 -> gc_h_lv_lvt(R0, R0, []);\n"),
 
-    io:put_chars(Fd, "%% Handle Regional\n"),
-    GenRegional = fun(Range) -> io:format(Fd, "gc_1~s gc_regional(R1,[CP]);\n", [gen_clause(Range)]) end,
+    io:put_chars(Fd, "\n%% Handle Regional\n"),
+    GenRegional = fun(Range) -> io:format(Fd, "gc_1~s gc_regional(R1,CP);\n", [gen_clause(Range)]) end,
     [GenRegional(CP) || CP <- merge_ranges(maps:get(regional_indicator,GBP))],
-    io:put_chars(Fd, "%% Handle E_Base\n"),
-    GenEBase = fun(Range) -> io:format(Fd, "gc_1~s gc_e_cont(R1,[CP]);\n", [gen_clause(Range)]) end,
-    [GenEBase(CP) || CP <- merge_ranges(maps:get(e_base,GBP))],
-    io:put_chars(Fd, "%% Handle EBG\n"),
-    GenEBG = fun(Range) -> io:format(Fd, "gc_1~s gc_e_cont(R1,[CP]);\n", [gen_clause(Range)]) end,
-    [GenEBG(CP) || CP <- merge_ranges(maps:get(e_base_gaz,GBP))],
-
-    io:put_chars(Fd, "gc_1([CP|R]) -> gc_extend(R, CP);\n"),
-    io:put_chars(Fd, "gc_1([]) -> [];\n"),
-    io:put_chars(Fd, "gc_1({error,_}=Error) -> Error.\n\n"),
+    %% io:put_chars(Fd, "%% Handle E_Base\n"),
+    %% GenEBase = fun(Range) -> io:format(Fd, "gc_1~s gc_e_cont(R1,[CP]);\n", [gen_clause(Range)]) end,
+    %% [GenEBase(CP) || CP <- merge_ranges(maps:get(e_base,GBP))],
+    %% io:put_chars(Fd, "%% Handle EBG\n"),
+    %% GenEBG = fun(Range) -> io:format(Fd, "gc_1~s gc_e_cont(R1,[CP]);\n", [gen_clause(Range)]) end,
+    %% [GenEBG(CP) || CP <- merge_ranges(maps:get(e_base_gaz,GBP))],
+
+    io:put_chars(Fd, "%% Handle extended_pictographic\n"),
+    [GenExtP(CP) || CP <- merge_ranges(ExtendedPictographicHigh)],
+    io:put_chars(Fd, "\n%% default clauses\n"),
+    io:put_chars(Fd, "gc_1([CP|R]) -> gc_extend(cp(R), R, CP).\n\n"),
 
     io:put_chars(Fd, "%% Handle Prepend\n"),
     io:put_chars(Fd,
@@ -572,36 +665,24 @@ gen_gc(Fd, GBP) ->
                  "%% To simplify binary handling in libraries the tail should be kept binary\n"
                  "%% and not a lookahead CP\n"
                 ),
-    io:put_chars(Fd, "gc_extend(T, Acc) ->\n"
-                 "    gc_extend(cp(T), T, Acc).\n\n"),
     io:put_chars(Fd,
-                 "gc_extend([CP|T], T0, Acc0) ->\n"
+                 "gc_extend([CP|T], T0, CP0) ->\n"
                  "    case is_extend(CP) of\n"
-                 "        zwj ->\n"
-                 "            case Acc0 of\n"
-                 "                [_|_] -> gc_zwj(T, [CP|Acc0]);\n"
-                 "                Acc -> gc_zwj(T, [CP,Acc])\n"
-                 "            end;\n"
-                 "        true ->\n"
-                 "            case Acc0 of\n"
-                 "                [_|_] -> gc_extend(T, [CP|Acc0]);\n"
-                 "                Acc -> gc_extend(T, [CP,Acc])\n"
-                 "            end;\n"
-                 "        false ->\n"
-                 "            case Acc0 of\n"
-                 "                [Acc] -> [Acc|T0];\n"
-                 "                [_|_]=Acc -> [lists:reverse(Acc)|T0];\n"
-                 "                Acc -> [Acc|T0]\n"
-                 "            end\n"
+                 "        false -> [CP0|T0]; % losing work done on T\n"
+                 "        _TrueOrZWJ -> gc_extend2(cp(T), T, [CP,CP0])\n"
                  "    end;\n"
-                 "gc_extend([], _, Acc0) ->\n"
-                 "    case Acc0 of\n"
-                 "        [_]=Acc -> Acc;\n"
-                 "        [_|_]=Acc -> [lists:reverse(Acc)];\n"
-                 "        Acc -> [Acc]\n"
+                 "gc_extend([], _, CP) -> [CP];\n"
+                 "gc_extend({error,R}, _, CP) -> [CP|R].\n\n"),
+    io:put_chars(Fd,
+                 "gc_extend2([CP|T], T0, Acc) ->\n"
+                 "    case is_extend(CP) of\n"
+                 "        false -> [lists:reverse(Acc)|T0]; % losing work done on T\n"
+                 "        _TrueOrZWJ -> gc_extend2(cp(T), T, [CP|Acc])\n"
                  "    end;\n"
-                 "gc_extend({error,R}, T, Acc0) ->\n"
-                 "    gc_extend([], T, Acc0) ++ [R].\n\n"
+                 "gc_extend2([], _, Acc) ->\n"
+                 "    [lists:reverse(Acc)];\n"
+                 "gc_extend2({error,R}, _, Acc) ->\n"
+                 "    [lists:reverse(Acc)] ++ [R].\n\n"
                  ),
     [ZWJ] = maps:get(zwj, GBP),
     GenExtend = fun(R) when R =:= ZWJ -> io:format(Fd, "is_extend~s zwj;\n", [gen_single_clause(ZWJ)]);
@@ -612,57 +693,54 @@ gen_gc(Fd, GBP) ->
     io:put_chars(Fd, "is_extend(_) -> false.\n\n"),
 
     io:put_chars(Fd,
-                 "gc_e_cont(R0, Acc) ->\n"
-                 "    case cp(R0) of\n"
-                 "        [CP|R1] ->\n"
-                 "            case is_extend(CP) of\n"
-                 "                zwj -> gc_zwj(R1, [CP|Acc]);\n"
-                 "                true -> gc_e_cont(R1, [CP|Acc]);\n"
-                 "                false ->\n"
-                 "                    case is_emodifier(CP) of\n"
-                 "                        true -> [lists:reverse([CP|Acc])|R1];\n"
-                 "                        false ->\n"
-                 "                            case Acc of\n"
-                 "                                [A] -> [A|R0];\n"
-                 "                                _ -> [lists:reverse(Acc)|R0]\n"
-                 "                            end\n"
-                 "                    end\n"
-                 "              end;\n"
-                 "        [] ->\n"
+                 "gc_ext_pict(T, Acc) ->\n"
+                 "    gc_ext_pict(cp(T), T, Acc).\n\n"
+                 "gc_ext_pict([CP|R1], T0, Acc) ->\n"
+                 "    case is_extend(CP) of\n"
+                 "        zwj -> gc_ext_pict_zwj(cp(R1), R1, [CP|Acc]);\n"
+                 "        true -> gc_ext_pict(R1, [CP|Acc]);\n"
+                 "        false ->\n"
                  "            case Acc of\n"
-                 "                [A] -> [A];\n"
-                 "                _ -> [lists:reverse(Acc)]\n"
-                 "            end;\n"
-                 "        {error,R} ->\n"
+                 "                [A] -> [A|T0];\n"
+                 "                _ -> [lists:reverse(Acc)|T0]\n"
+                 "            end\n"
+                 "    end;\n"
+                 "gc_ext_pict([], _T0, Acc) ->\n"
+                 "    case Acc of\n"
+                 "        [A] -> [A];\n"
+                 "        _ -> [lists:reverse(Acc)]\n"
+                 "    end;\n"
+                 "gc_ext_pict({error,R}, T, Acc) ->\n"
+                 "    gc_ext_pict([], T, Acc) ++ [R].\n\n"),
+    io:put_chars(Fd,
+                 "gc_ext_pict_zwj([CP|R1], T0, Acc) ->\n"
+                 "    case is_ext_pict(CP) of\n"
+                 "        true -> gc_ext_pict(R1, [CP|Acc]);\n"
+                 "        false ->\n"
                  "            case Acc of\n"
-                 "                [A] -> [A|R];\n"
-                 "                _ -> [lists:reverse(Acc)|R]\n"
+                 "                [A] -> [A|T0];\n"
+                 "                _ -> [lists:reverse(Acc)|T0]\n"
                  "            end\n"
-                 "    end.\n\n"),
-
-    GenEMod = fun(Range) -> io:format(Fd, "is_emodifier~s true;\n", [gen_single_clause(Range)]) end,
-    EMods = merge_ranges(maps:get(e_modifier, GBP), split),
-    [GenEMod(CP) || CP <- EMods],
-    io:put_chars(Fd, "is_emodifier(_) -> false.\n\n"),
-
-    io:put_chars(Fd, "gc_zwj(R0, Acc) ->\n    case cp(R0) of\n"),
-    GenZWJGlue = fun(Range) -> io:format(Fd, "~8c~s gc_extend(cp(R1), R0, [CP|Acc]);\n",
-                                         [$\s,gen_case_clause(Range)]) end,
-    [GenZWJGlue(CP) || CP <- merge_ranges(maps:get(glue_after_zwj,GBP))],
-    GenZWJEBG = fun(Range) -> io:format(Fd, "~8c~s gc_e_cont(R1, [CP|Acc]);\n",
-                                        [$\s,gen_case_clause(Range)]) end,
-    [GenZWJEBG(CP) || CP <- merge_ranges(maps:get(e_base_gaz,GBP))],
-    io:put_chars(Fd,"        R1 -> gc_extend(R1, R0, Acc)\n"
-                 "    end.\n\n"),
+                 "    end;\n"
+                 "gc_ext_pict_zwj([], _, Acc) ->\n"
+                 "    case Acc of\n"
+                 "        [A] -> [A];\n"
+                 "        _ -> [lists:reverse(Acc)]\n"
+                 "    end;\n"
+                 "gc_ext_pict_zwj({error,R}, T, Acc) ->\n"
+                 "    gc_ext_pict_zwj([], T, Acc) ++ [R].\n\n"),
 
+    GenExtPict = fun(Range) -> io:format(Fd, "is_ext_pict~s true;\n", [gen_single_clause(Range)]) end,
+    [GenExtPict(CP) || CP <- ExtendedPictographic0],
+    io:put_chars(Fd, "is_ext_pict(_) -> false.\n\n"),
 
     %% --------------------
     io:put_chars(Fd, "%% Handle Regional\n"),
     [{RLess,RLarge}] = merge_ranges(maps:get(regional_indicator,GBP)),
-    io:put_chars(Fd,"gc_regional(R0, Acc) ->\n"
+    io:put_chars(Fd,"gc_regional(R0, CP0) ->\n"
                  "    case cp(R0) of\n"),
-    io:format(Fd,   "        [CP|R1] when ~w =< CP,CP =< ~w-> gc_extend(R1,[CP|Acc]);~n",[RLess, RLarge]),
-    io:put_chars(Fd,"        R1 -> gc_extend(R1, R0, Acc)\n"
+    io:format(Fd,   "        [CP|R1] when ~w =< CP,CP =< ~w-> gc_extend2(cp(R1),R1,[CP,CP0]);~n",[RLess, RLarge]),
+    io:put_chars(Fd,"        R1 -> gc_extend(R1, R0, CP0)\n"
                  "    end.\n\n"),
 
     %% Special hangul
@@ -674,7 +752,7 @@ gen_gc(Fd, GBP) ->
     GenHangulL_2 = fun(Range) -> io:format(Fd, "~8c~s gc_h_V(R1,[CP|Acc]);\n",
                                            [$\s,gen_case_clause(Range)]) end,
     [GenHangulL_2(CP) || CP <- merge_ranges(maps:get(v,GBP))],
-    io:put_chars(Fd, "        R1 -> gc_h_lv_lvt(R1, Acc)\n    end.\n\n"),
+    io:put_chars(Fd, "        R1 -> gc_h_lv_lvt(R1, R0, Acc)\n    end.\n\n"),
 
     io:put_chars(Fd, "%% Handle Hangul V\n"),
     io:put_chars(Fd, "gc_h_V(R0, Acc) ->\n    case cp(R0) of\n"),
@@ -684,16 +762,23 @@ gen_gc(Fd, GBP) ->
     GenHangulV_2 = fun(Range) -> io:format(Fd, "~8c~s gc_h_T(R1,[CP|Acc]);\n",
                                            [$\s,gen_case_clause(Range)]) end,
     [GenHangulV_2(CP) || CP <- merge_ranges(maps:get(t,GBP))],
-    io:put_chars(Fd, "        R1 -> gc_extend(R1, R0, Acc)\n    end.\n\n"),
-
+    io:put_chars(Fd,
+                 "        R1 ->\n"
+                 "            case Acc of\n"
+                 "                [CP] -> gc_extend(R1, R0, CP);\n"
+                 "                _ -> gc_extend2(R1, R0, Acc)\n"
+                 "            end\n    end.\n\n"),
     io:put_chars(Fd, "%% Handle Hangul T\n"),
     io:put_chars(Fd, "gc_h_T(R0, Acc) ->\n    case cp(R0) of\n"),
     GenHangulT_1 = fun(Range) -> io:format(Fd, "~8c~s gc_h_T(R1,[CP|Acc]);\n",
                                            [$\s,gen_case_clause(Range)]) end,
     [GenHangulT_1(CP) || CP <- merge_ranges(maps:get(t,GBP))],
-    io:put_chars(Fd, "        R1 -> gc_extend(R1, R0, Acc)\n    end.\n\n"),
-
-    io:put_chars(Fd, "gc_h_lv_lvt({error,_}=Error, Acc) -> gc_extend(Error, [], Acc);\n"),
+    io:put_chars(Fd,
+                 "        R1 ->\n"
+                 "            case Acc of\n"
+                 "                [CP] -> gc_extend(R1, R0, CP);\n"
+                 "                _ -> gc_extend2(R1, R0, Acc)\n"
+                 "            end\n    end.\n\n"),
     io:put_chars(Fd, "%% Handle Hangul LV\n"),
     GenHangulLV = fun(Range) -> io:format(Fd, "gc_h_lv_lvt~s gc_h_V(R1,[CP|Acc]);\n",
                                           [gen_clause2(Range)]) end,
@@ -702,8 +787,10 @@ gen_gc(Fd, GBP) ->
     GenHangulLVT = fun(Range) -> io:format(Fd, "gc_h_lv_lvt~s gc_h_T(R1,[CP|Acc]);\n",
                                            [gen_clause2(Range)]) end,
     [GenHangulLVT(CP) || CP <- merge_ranges(maps:get(lvt,GBP))],
-    io:put_chars(Fd, "gc_h_lv_lvt([CP|R], []) -> gc_extend(R, CP);\n"), %% From gc_1/1
-    io:put_chars(Fd, "gc_h_lv_lvt(R, Acc) -> gc_extend(R, Acc).\n\n"),
+    io:put_chars(Fd, "gc_h_lv_lvt([CP|R1], _, []) -> gc_extend(cp(R1), R1, CP);\n"), %% From gc_1/1
+    io:put_chars(Fd, "%% Also handles error tuples\n"),
+    io:put_chars(Fd, "gc_h_lv_lvt(R1, R0, [CP]) -> gc_extend(R1, R0, CP);\n"),
+    io:put_chars(Fd, "gc_h_lv_lvt(R1, R0, Acc) -> gc_extend2(R1, R0, Acc).\n\n"),
     ok.
 
 gen_compose_pairs(Fd, ExclData, Data) ->
@@ -804,9 +891,9 @@ gen_clause({R0, R1}) ->
     io_lib:format("([CP|R1]=R0) when ~w =< CP, CP =< ~w ->", [R0,R1]).
 
 gen_clause2({R0, undefined}) ->
-    io_lib:format("([~w=CP|R1], Acc) ->", [R0]);
+    io_lib:format("([~w=CP|R1], R0, Acc) ->", [R0]);
 gen_clause2({R0, R1}) ->
-    io_lib:format("([CP|R1], Acc) when ~w =< CP, CP =< ~w ->", [R0,R1]).
+    io_lib:format("([CP|R1], R0, Acc) when ~w =< CP, CP =< ~w ->", [R0,R1]).
 
 gen_case_clause({R0, undefined}) ->
     io_lib:format("[~w=CP|R1] ->", [R0]);
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index e0217418fe..c2f586fef5 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 3.7
+STDLIB_VSN = 3.9.2
diff --git a/lib/syntax_tools/doc/demo.erl b/lib/syntax_tools/doc/demo.erl
new file mode 120000
index 0000000000..fe40fb65ec
--- /dev/null
+++ b/lib/syntax_tools/doc/demo.erl
@@ -0,0 +1 @@
+../examples/demo.erl
\ No newline at end of file
diff --git a/lib/syntax_tools/doc/overview.edoc b/lib/syntax_tools/doc/overview.edoc
index 3111633a99..7be96f1a55 100644
--- a/lib/syntax_tools/doc/overview.edoc
+++ b/lib/syntax_tools/doc/overview.edoc
@@ -26,7 +26,7 @@ library module {@link prettypr}: this is a powerful and flexible generic
 pretty printing library, which is also distributed separately.
 
 For a short demonstration of parsing and pretty-printing, simply
-compile the included module <a href="../examples/demo.erl">`demo.erl'</a>,
+compile the included module <a href="demo.erl">`demo.erl'</a>,
 and execute `demo:run()' from the Erlang shell. It will compile the
 remaining modules and give you further instructions.
 
diff --git a/lib/syntax_tools/doc/src/Makefile b/lib/syntax_tools/doc/src/Makefile
index d953287bad..b799c76177 100644
--- a/lib/syntax_tools/doc/src/Makefile
+++ b/lib/syntax_tools/doc/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2006-2018. All Rights Reserved.
+# Copyright Ericsson AB 2006-2019. 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.
@@ -82,6 +82,9 @@ HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
+EXAMPLES_DIR = ../../examples
+EXAMPLES = $(EXAMPLES_DIR)/demo.erl
+
 SPECS_FILES = $(XML_REF3_FILES:%.xml=$(SPECDIR)/specs_%.xml)
 
 TOP_SPECS_FILE = specs.xml
@@ -146,5 +149,7 @@ release_docs_spec: docs
 	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
 	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
 	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
+	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
+	$(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/doc/html"
 
 release_spec:
diff --git a/lib/syntax_tools/doc/src/notes.xml b/lib/syntax_tools/doc/src/notes.xml
index dc13fe474b..a2dd78f280 100644
--- a/lib/syntax_tools/doc/src/notes.xml
+++ b/lib/syntax_tools/doc/src/notes.xml
@@ -32,6 +32,48 @@
   <p>This document describes the changes made to the Syntax_Tools
     application.</p>
 
+<section><title>Syntax_Tools 2.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    All incorrect (that is, all) uses of "can not" has been
+	    corrected to "cannot" in source code comments,
+	    documentation, examples, and so on.</p>
+          <p>
+	    Own Id: OTP-14282 Aux Id: PR-1891 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Correct links in the documentation. </p>
+          <p>
+	    Own Id: OTP-15761</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Syntax_Tools 2.1.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fix pretty-printing of type funs. </p>
+          <p>
+	    Own Id: OTP-15519 Aux Id: ERL-815 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Syntax_Tools 2.1.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/syntax_tools/src/erl_prettypr.erl b/lib/syntax_tools/src/erl_prettypr.erl
index 6906ef1553..6ad9bec2e6 100644
--- a/lib/syntax_tools/src/erl_prettypr.erl
+++ b/lib/syntax_tools/src/erl_prettypr.erl
@@ -1101,8 +1101,9 @@ lay_2(Node, Ctxt) ->
             Ctxt1 = reset_prec(Ctxt),
             D1 = lay(erl_syntax:constrained_function_type_body(Node),
                      Ctxt1),
+            Ctxt2 = Ctxt1#ctxt{clause = undefined},
             D2 = lay(erl_syntax:constrained_function_type_argument(Node),
-                     Ctxt1),
+                     Ctxt2),
             beside(D1,
                    beside(floating(text(" when ")), D2));
 
@@ -1113,7 +1114,7 @@ lay_2(Node, Ctxt) ->
                                   _ ->
                                       {"fun(", ")"}
                               end,
-            Ctxt1 = reset_prec(Ctxt),
+            Ctxt1 = (reset_prec(Ctxt))#ctxt{clause = undefined},
             D1 = case erl_syntax:function_type_arguments(Node) of
                      any_arity ->
                          text("(...)");
diff --git a/lib/syntax_tools/src/igor.erl b/lib/syntax_tools/src/igor.erl
index 16e3511734..b712b77e9f 100644
--- a/lib/syntax_tools/src/igor.erl
+++ b/lib/syntax_tools/src/igor.erl
@@ -660,7 +660,7 @@ merge_files1(Files, Opts) ->
 %% transitions), code replacement is expected to be detected. Then, if
 %% we in the merged code do not check at these points if the
 %% <em>target</em> module (the result of the merge) has been replaced,
-%% we can not be sure in general that we will be able to do code
+%% we cannot be sure in general that we will be able to do code
 %% replacement of the merged state machine - it could run forever
 %% without detecting the code change. Therefore, all such calls must
 %% remain remote-calls (detecting code changes), but may call the target
diff --git a/lib/syntax_tools/test/syntax_tools_SUITE.erl b/lib/syntax_tools/test/syntax_tools_SUITE.erl
index 9dbd0e302a..e1dd1bd73b 100644
--- a/lib/syntax_tools/test/syntax_tools_SUITE.erl
+++ b/lib/syntax_tools/test/syntax_tools_SUITE.erl
@@ -26,14 +26,14 @@
 -export([app_test/1,appup_test/1,smoke_test/1,revert/1,revert_map/1,
          revert_map_type/1,
 	t_abstract_type/1,t_erl_parse_type/1,t_type/1, t_epp_dodger/1,
-	t_comment_scan/1,t_igor/1,t_erl_tidy/1]).
+	t_comment_scan/1,t_igor/1,t_erl_tidy/1,t_prettypr/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [app_test,appup_test,smoke_test,revert,revert_map,revert_map_type,
     t_abstract_type,t_erl_parse_type,t_type,t_epp_dodger,
-    t_comment_scan,t_igor,t_erl_tidy].
+    t_comment_scan,t_igor,t_erl_tidy,t_prettypr].
 
 groups() -> 
     [].
@@ -74,7 +74,7 @@ smoke_test_file(File) ->
 	    [print_error_markers(F, File) || F <- Forms],
 	    ok;
 	{error,Reason} ->
-	    io:format("~s: ~p\n", [File,Reason]),
+	    io:format("~ts: ~p\n", [File,Reason]),
 	    error
     end.
 
@@ -82,7 +82,7 @@ print_error_markers(F, File) ->
     case erl_syntax:type(F) of
 	error_marker ->
 	    {L,M,Info} = erl_syntax:error_marker_info(F),
-	    io:format("~ts:~p: ~s", [File,L,M:format_error(Info)]);
+	    io:format("~ts:~p: ~ts", [File,L,M:format_error(Info)]);
 	_ ->
 	    ok
     end.
@@ -300,6 +300,14 @@ t_comment_scan(Config) when is_list(Config) ->
     ok = test_comment_scan(Filenames,DataDir),
     ok.
 
+t_prettypr(Config) when is_list(Config) ->
+    DataDir   = ?config(data_dir, Config),
+    PrivDir   = ?config(priv_dir, Config),
+    Filenames = ["type_specs.erl",
+                 "specs_and_funs.erl"],
+    ok = test_prettypr(Filenames,DataDir,PrivDir),
+    ok.
+
 test_files(Config) ->
     DataDir = ?config(data_dir, Config),
     [ filename:join(DataDir,Filename) || Filename <- test_files() ].
@@ -307,7 +315,8 @@ test_files(Config) ->
 test_files() ->
     ["syntax_tools_SUITE_test_module.erl",
      "syntax_tools_test.erl",
-     "type_specs.erl"].
+     "type_specs.erl",
+     "specs_and_funs.erl"].
 
 t_igor(Config) when is_list(Config) ->
     DataDir   = ?config(data_dir, Config),
@@ -353,12 +362,33 @@ test_comment_scan([File|Files],DataDir) ->
 	  end,
     Fs1 = erl_recomment:recomment_forms(Fs0, Comments),
     Fs2 = erl_syntax_lib:map(Fun, Fs1),
-    io:format("File: ~s~n", [Filename]),
+    io:format("File: ~ts~n", [Filename]),
     io:put_chars(erl_prettypr:format(Fs2, [{paper,  120},
 					   {ribbon, 110}])),
     test_comment_scan(Files,DataDir).
 
 
+test_prettypr([],_,_) -> ok;
+test_prettypr([File|Files],DataDir,PrivDir) ->
+    Filename  = filename:join(DataDir,File),
+    io:format("Parsing ~p~n", [Filename]),
+    {ok, Fs0} = epp:parse_file(Filename, [], []),
+    Fs = erl_syntax:form_list(Fs0),
+    PP = erl_prettypr:format(Fs, [{paper,  120}, {ribbon, 110}]),
+    io:put_chars(PP),
+    OutFile = filename:join(PrivDir, File),
+    ok = file:write_file(OutFile,unicode:characters_to_binary(PP)),
+    io:format("Parsing OutFile: ~ts~n", [OutFile]),
+    {ok, Fs2} = epp:parse_file(OutFile, [], []),
+    case [Error || {error, _} = Error <- Fs2] of
+        [] ->
+            ok;
+        Errors ->
+            ?t:fail(Errors)
+    end,
+    test_prettypr(Files,DataDir,PrivDir).
+
+
 test_epp_dodger([], _, _) -> ok;
 test_epp_dodger([Filename|Files],DataDir,PrivDir) ->
     io:format("Parsing ~p~n", [Filename]),
@@ -415,7 +445,7 @@ pretty_print_parse_forms([{Fs0,Type}|FsForms],PrivDir,Filename) ->
     {Fs2,{CC,CT}} = erl_syntax_lib:mapfold(Comment,{0,0}, Fs1),
     io:format("Commented on ~w cases and ~w tries~n", [CC,CT]),
     PP  = erl_prettypr:format(Fs2),
-    ok  = file:write_file(OutFile,iolist_to_binary(PP)),
+    ok  = file:write_file(OutFile,unicode:characters_to_binary(PP)),
     pretty_print_parse_forms(FsForms,PrivDir,Filename).
 
 
diff --git a/lib/syntax_tools/test/syntax_tools_SUITE_data/specs_and_funs.erl b/lib/syntax_tools/test/syntax_tools_SUITE_data/specs_and_funs.erl
new file mode 100644
index 0000000000..8dfeaf5a6b
--- /dev/null
+++ b/lib/syntax_tools/test/syntax_tools_SUITE_data/specs_and_funs.erl
@@ -0,0 +1,18 @@
+-module(specs_and_funs).
+
+-export([my_apply/3, two/1]).
+
+%% OTP-15519, ERL-815
+
+-spec my_apply(Fun, Arg, fun((A) -> A)) -> Result when
+      Fun :: fun((Arg) -> Result),
+      Arg :: any(),
+      Result :: any().
+
+my_apply(Fun, Arg, _) ->
+    Fun(Arg).
+
+-spec two(fun((A) -> A)) -> fun((B) -> B).
+
+two(F) ->
+    F(fun(X) -> X end).
diff --git a/lib/syntax_tools/vsn.mk b/lib/syntax_tools/vsn.mk
index 8959ebbd04..0ace11772d 100644
--- a/lib/syntax_tools/vsn.mk
+++ b/lib/syntax_tools/vsn.mk
@@ -1 +1 @@
-SYNTAX_TOOLS_VSN = 2.1.6
+SYNTAX_TOOLS_VSN = 2.2
diff --git a/lib/tftp/doc/src/tftp.xml b/lib/tftp/doc/src/tftp.xml
index 4ed54bc462..57d64b7379 100644
--- a/lib/tftp/doc/src/tftp.xml
+++ b/lib/tftp/doc/src/tftp.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>tftp</module>
+  <module since="">tftp</module>
   <modulesummary>Trivial FTP.</modulesummary>
   <description>
     <p>Interface module for the <c>tftp</c> application.</p>
@@ -172,7 +172,7 @@
 
   <funcs>
     <func>
-      <name>change_config(daemons, Options) -> [{Pid, Result}]</name>
+      <name since="">change_config(daemons, Options) -> [{Pid, Result}]</name>
       <fsummary>Changes configuration for all daemons.
       </fsummary>
       <type>
@@ -187,7 +187,7 @@
     </func>
 
     <func>
-      <name>change_config(servers, Options) -> [{Pid, Result}]</name>
+      <name since="">change_config(servers, Options) -> [{Pid, Result}]</name>
       <fsummary>Changes configuration for all servers.
       </fsummary>
       <type>
@@ -202,7 +202,7 @@
     </func>
 
     <func>
-      <name>change_config(Pid, Options) -> Result</name>
+      <name since="">change_config(Pid, Options) -> Result</name>
       <fsummary>Changes configuration for a TFTP daemon, server, 
       or client process.</fsummary>
       <type>
@@ -217,7 +217,7 @@
     </func>
     
     <func>
-      <name>info(daemons) -> [{Pid, Options}]</name>
+      <name since="">info(daemons) -> [{Pid, Options}]</name>
       <fsummary>Returns information about all daemons.</fsummary>
       <type>
         <v>Pid = [pid()]</v>
@@ -230,7 +230,7 @@
     </func>
 
     <func>
-      <name>info(servers) -> [{Pid, Options}]</name>
+      <name since="">info(servers) -> [{Pid, Options}]</name>
       <fsummary>Returns information about all servers.</fsummary>
       <type>
         <v>Pid = [pid()]</v>
@@ -243,7 +243,7 @@
     </func>
 
     <func>
-      <name>info(Pid) -> {ok, Options} | {error, Reason}</name>
+      <name since="">info(Pid) -> {ok, Options} | {error, Reason}</name>
       <fsummary>Returns information about a daemon, server, or client process.</fsummary>
       <type>
         <v>Options = [option()]</v>
@@ -255,7 +255,7 @@
     </func>
        
     <func>
-      <name>read_file(RemoteFilename, LocalFilename, Options) -> {ok, LastCallbackState} | {error, Reason}</name>
+      <name since="">read_file(RemoteFilename, LocalFilename, Options) -> {ok, LastCallbackState} | {error, Reason}</name>
       <fsummary>Reads a (virtual) file from a TFTP server.</fsummary>
       <type>
         <v>RemoteFilename = string()</v>
@@ -285,7 +285,7 @@
     </func>
     
     <func>
-       <name>start(Options) -> {ok, Pid} | {error, Reason}</name>
+       <name since="">start(Options) -> {ok, Pid} | {error, Reason}</name>
       <fsummary>Starts a daemon process.</fsummary>
       <type>
         <v>Options = [option()]</v>
@@ -301,7 +301,7 @@
     </func>
 
     <func>
-      <name>write_file(RemoteFilename, LocalFilename, Options) -> {ok, LastCallbackState} | {error, Reason}</name>
+      <name since="">write_file(RemoteFilename, LocalFilename, Options) -> {ok, LastCallbackState} | {error, Reason}</name>
       <fsummary>Writes a (virtual) file to a TFTP server.</fsummary>
       <type>
         <v>RemoteFilename = string()</v>
@@ -389,7 +389,7 @@
 
   <funcs>
      <func>
-      <name>Module:abort(Code, Text, State) -> ok</name>
+      <name since="OTP 18.1">Module:abort(Code, Text, State) -> ok</name>
       <fsummary>Aborts the file transfer.</fsummary>
       <type>
         <v>Code = undef | enoent | eacces | enospc</v>
@@ -413,7 +413,7 @@
     </func>
     
       <func>
-      <name>Module:open(Peer, Access, Filename, Mode, SuggestedOptions, State) -> {ok, AcceptedOptions, NewState} | {error, {Code, Text}}</name>
+      <name since="OTP 18.1">Module:open(Peer, Access, Filename, Mode, SuggestedOptions, State) -> {ok, AcceptedOptions, NewState} | {error, {Code, Text}}</name>
       <fsummary>Opens a file for read or write access.</fsummary>
       <type>
         <v>Peer = {PeerType, PeerHost, PeerPort}</v>
@@ -448,7 +448,7 @@
     </func>
     
     <func>
-      <name>Module:prepare(Peer, Access, Filename, Mode, SuggestedOptions, InitialState) -> {ok, AcceptedOptions, NewState} | {error, {Code, Text}}</name>
+      <name since="OTP 18.1">Module:prepare(Peer, Access, Filename, Mode, SuggestedOptions, InitialState) -> {ok, AcceptedOptions, NewState} | {error, {Code, Text}}</name>
       <fsummary>Prepares to open a file on the client side.</fsummary>
       <type>
         <v>Peer = {PeerType, PeerHost, PeerPort}</v>
@@ -483,7 +483,7 @@
     </func>
 
     <func>
-      <name>Module:read(State) -> {more, Bin, NewState} | {last, Bin, FileSize} | {error, {Code, Text}}</name>
+      <name since="OTP 18.1">Module:read(State) -> {more, Bin, NewState} | {last, Bin, FileSize} | {error, {Code, Text}}</name>
       <fsummary>Reads a chunk from the file.</fsummary>
       <type>
         <v>State = NewState = term()</v>
@@ -510,7 +510,7 @@
     </func>
 
     <func>
-      <name>Module:write(Bin, State) -> {more, NewState} | {last, FileSize} | {error, {Code, Text}}</name>
+      <name since="OTP 18.1">Module:write(Bin, State) -> {more, NewState} | {last, FileSize} | {error, {Code, Text}}</name>
       <fsummary>Writes a chunk to the file.</fsummary>
       <type>
         <v>Bin = binary()</v>
@@ -549,7 +549,7 @@
 
   <funcs>
     <func>
-      <name>Logger:error_msg(Format, Data) -> ok | exit(Reason)</name>
+      <name since="OTP 18.1">Logger:error_msg(Format, Data) -> ok | exit(Reason)</name>
       <fsummary>Logs an error message.</fsummary>
       <type>
         <v>Format = string()</v>
@@ -565,7 +565,7 @@
     </func>
 
     <func>
-      <name>Logger:info_msg(Format, Data) -> ok | exit(Reason)</name>
+      <name since="OTP 18.1">Logger:info_msg(Format, Data) -> ok | exit(Reason)</name>
       <fsummary>Logs an info message.</fsummary>
       <type>
         <v>Format = string()</v>
@@ -579,7 +579,7 @@
     </func>
     
     <func>
-      <name>Logger:warning_msg(Format, Data) -> ok | exit(Reason)</name>
+      <name since="OTP 18.1">Logger:warning_msg(Format, Data) -> ok | exit(Reason)</name>
       <fsummary>Logs a warning message.</fsummary>
       <type>
         <v>Format = string()</v>
diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in
index cfe91917f8..289322b6fa 100644
--- a/lib/tools/c_src/Makefile.in
+++ b/lib/tools/c_src/Makefile.in
@@ -29,7 +29,6 @@ CC=@CC@
 LD=@LD@
 AR=@AR@
 RANLIB=@RANLIB@
-RM=@RM@
 MKDIR=@MKDIR@
 INSTALL=@INSTALL@
 INSTALL_DIR=@INSTALL_DIR@
@@ -158,9 +157,9 @@ $(ERTS_LIB):
 docs:
 
 clean:
-	$(RM) -rf ../obj/*
-	$(RM) -rf ../bin/*
-	$(RM) -f ./*~
+	$(RM) -r ../obj/*
+	$(RM) -r ../bin/*
+	$(RM) ./*~
 
 .PHONY: all erts_lib docs clean
 
diff --git a/lib/tools/doc/src/cover.xml b/lib/tools/doc/src/cover.xml
index 15cd784253..e9f782977d 100644
--- a/lib/tools/doc/src/cover.xml
+++ b/lib/tools/doc/src/cover.xml
@@ -30,7 +30,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>cover</module>
+  <module since="">cover</module>
   <modulesummary>A Coverage Analysis Tool for Erlang</modulesummary>
   <description>
     <p>The module <c>cover</c> provides a set of functions for coverage
@@ -115,7 +115,7 @@
   </description>
   <funcs>
     <func>
-      <name>start() -> {ok,Pid} | {error,Reason}</name>
+      <name since="">start() -> {ok,Pid} | {error,Reason}</name>
       <fsummary>Start Cover.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -128,21 +128,33 @@
       </desc>
     </func>
     <func>
-      <name>start(Nodes) -> {ok,StartedNodes} | {error,not_main_node}</name>
+      <name since="OTP 22.0">local_only() -> ok | {error,too_late}</name>
+      <fsummary>Only support running Cover on the local node.</fsummary>
+      <desc>
+        <p>Only support running Cover on the local node. This function
+	must be called before any modules have been compiled or any
+	nodes added. When running in this mode, modules will be Cover
+	compiled in a more efficient way, but the resulting code will
+	only work on the same node they were compiled on.</p>
+      </desc>
+    </func>
+    <func>
+      <name since="">start(Nodes) -> {ok,StartedNodes} | {error,not_main_node} | {error,local_only}</name>
       <fsummary>Start Cover on remote nodes.</fsummary>
       <type>
         <v>Nodes = StartedNodes = [atom()]</v>
       </type>
       <desc>
         <p>Starts a Cover server on the each of given nodes, and loads
-          all cover compiled modules.</p>
+          all cover compiled modules. This call will fail if
+	<c>cover:local_only/0</c> has been called.</p>
       </desc>
     </func>
     <func>
-      <name>compile(ModFiles) -> Result | [Result]</name>
-      <name>compile(ModFiles, Options) -> Result | [Result]</name>
-      <name>compile_module(ModFiles) -> Result | [Result]</name>
-      <name>compile_module(ModFiles, Options) -> Result | [Result]</name>
+      <name since="">compile(ModFiles) -> Result | [Result]</name>
+      <name since="">compile(ModFiles, Options) -> Result | [Result]</name>
+      <name since="">compile_module(ModFiles) -> Result | [Result]</name>
+      <name since="">compile_module(ModFiles, Options) -> Result | [Result]</name>
       <fsummary>Compile one or more modules for Cover analysis.</fsummary>
       <type>
 	<v>ModFiles = ModFile | [ModFile]</v>
@@ -176,9 +188,9 @@
       </desc>
     </func>
     <func>
-      <name>compile_directory() -> [Result] | {error,Reason}</name>
-      <name>compile_directory(Dir) -> [Result] | {error,Reason}</name>
-      <name>compile_directory(Dir, Options) -> [Result] | {error,Reason}</name>
+      <name since="">compile_directory() -> [Result] | {error,Reason}</name>
+      <name since="">compile_directory(Dir) -> [Result] | {error,Reason}</name>
+      <name since="">compile_directory(Dir, Options) -> [Result] | {error,Reason}</name>
       <fsummary>Compile all modules in a directory for Cover analysis.</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -199,7 +211,7 @@
       </desc>
     </func>
     <func>
-      <name>compile_beam(ModFiles) -> Result | [Result]</name>
+      <name since="">compile_beam(ModFiles) -> Result | [Result]</name>
       <fsummary>Compile one or more modules for Cover analysis, using existing beam(s).</fsummary>
       <type>
 	<v>ModFiles = ModFile | [ModFile]</v>
@@ -234,15 +246,15 @@
           <c>{already_cover_compiled,no_beam_found,Module}</c> is
           returned.</p>
         <p><c>{error,BeamFile}</c> is returned if the compiled code
-          can not be loaded on the node.</p>
+          cannot be loaded on the node.</p>
 	<p>If a list of <c>ModFiles</c> is given as input, a list
 	  of <c>Result</c> will be returned. The order of the returned
 	  list is undefined.</p>
       </desc>
     </func>
     <func>
-      <name>compile_beam_directory() -> [Result] | {error,Reason}</name>
-      <name>compile_beam_directory(Dir) -> [Result] | {error,Reason}</name>
+      <name since="">compile_beam_directory() -> [Result] | {error,Reason}</name>
+      <name since="">compile_beam_directory(Dir) -> [Result] | {error,Reason}</name>
       <fsummary>Compile all .beam files in a directory for Cover analysis.</fsummary>
       <type>
         <v>Dir = string()</v>
@@ -260,14 +272,14 @@
       </desc>
     </func>
     <func>
-      <name>analyse() -> {result,Ok,Fail} | {error,not_main_node}</name>
-      <name>analyse(Modules) -> OneResult | {result,Ok,Fail} | {error,not_main_node}</name>
-      <name>analyse(Analysis) -> {result,Ok,Fail} | {error,not_main_node}</name>
-      <name>analyse(Level) -> {result,Ok,Fail} | {error,not_main_node}</name>
-      <name>analyse(Modules, Analysis) -> OneResult | {result,Ok,Fail} | {error,not_main_node}</name>
-      <name>analyse(Modules, Level) -> OneResult | {result,Ok,Fail} | {error,not_main_node}</name>
-      <name>analyse(Analysis, Level) -> {result,Ok,Fail} | {error,not_main_node}</name>
-      <name>analyse(Modules, Analysis, Level) -> OneResult | {result,Ok,Fail} | {error,not_main_node}</name>
+      <name since="OTP 18.0">analyse() -> {result,Ok,Fail} | {error,not_main_node}</name>
+      <name since="">analyse(Modules) -> OneResult | {result,Ok,Fail} | {error,not_main_node}</name>
+      <name since="">analyse(Analysis) -> {result,Ok,Fail} | {error,not_main_node}</name>
+      <name since="">analyse(Level) -> {result,Ok,Fail} | {error,not_main_node}</name>
+      <name since="">analyse(Modules, Analysis) -> OneResult | {result,Ok,Fail} | {error,not_main_node}</name>
+      <name since="">analyse(Modules, Level) -> OneResult | {result,Ok,Fail} | {error,not_main_node}</name>
+      <name since="">analyse(Analysis, Level) -> {result,Ok,Fail} | {error,not_main_node}</name>
+      <name since="">analyse(Modules, Analysis, Level) -> OneResult | {result,Ok,Fail} | {error,not_main_node}</name>
       <fsummary>Analyse one or more Cover compiled modules.</fsummary>
       <type>
 	<v>Modules = Module | [Module]</v>
@@ -305,10 +317,10 @@
       </desc>
     </func>
     <func>
-      <name>analyse_to_file() -> {result,Ok,Fail} | {error,not_main_node}</name>
-      <name>analyse_to_file(Modules) ->  Answer | {result,Ok,Fail} | {error,not_main_node}</name>
-      <name>analyse_to_file(Options) -> {result,Ok,Fail} | {error,not_main_node}</name>
-      <name>analyse_to_file(Modules,Options) -> Answer | {result,Ok,Fail} | {error,not_main_node}</name>
+      <name since="OTP 18.0">analyse_to_file() -> {result,Ok,Fail} | {error,not_main_node}</name>
+      <name since="">analyse_to_file(Modules) ->  Answer | {result,Ok,Fail} | {error,not_main_node}</name>
+      <name since="">analyse_to_file(Options) -> {result,Ok,Fail} | {error,not_main_node}</name>
+      <name since="">analyse_to_file(Modules,Options) -> Answer | {result,Ok,Fail} | {error,not_main_node}</name>
       <fsummary>Detailed coverage analysis of one or more Cover compiled modules.</fsummary>
       <type>
         <v>Modules = Module | [Module]</v>
@@ -359,10 +371,10 @@
       </desc>
     </func>
     <func>
-      <name>async_analyse_to_file(Module) -> </name>
-      <name>async_analyse_to_file(Module,Options) -> </name>
-      <name>async_analyse_to_file(Module, OutFile) -> </name>
-      <name>async_analyse_to_file(Module, OutFile, Options) ->  pid()</name>
+      <name since="OTP R14B02">async_analyse_to_file(Module) -> </name>
+      <name since="OTP R14B02">async_analyse_to_file(Module,Options) -> </name>
+      <name since="OTP R14B02">async_analyse_to_file(Module, OutFile) -> </name>
+      <name since="OTP R14B02">async_analyse_to_file(Module, OutFile, Options) ->  pid()</name>
       <fsummary>Asynchronous call to analyse_to_file.</fsummary>
       <type>
         <v>Module = atom()</v>
@@ -384,7 +396,7 @@
       </desc>
     </func>
     <func>
-      <name>modules() -> [Module] | {error,not_main_node}</name>
+      <name since="">modules() -> [Module] | {error,not_main_node}</name>
       <fsummary>Return all Cover compiled modules.</fsummary>
       <type>
         <v>Module = atom()</v>
@@ -395,7 +407,7 @@
       </desc>
     </func>
     <func>
-      <name>imported_modules() -> [Module] | {error,not_main_node}</name>
+      <name since="">imported_modules() -> [Module] | {error,not_main_node}</name>
       <fsummary>Return all modules for which there are imported data.</fsummary>
       <type>
         <v>Module = atom()</v>
@@ -406,7 +418,7 @@
       </desc>
     </func>
     <func>
-      <name>imported() -> [File] | {error,not_main_node}</name>
+      <name since="">imported() -> [File] | {error,not_main_node}</name>
       <fsummary>Return all imported files.</fsummary>
       <type>
         <v>File = string()</v>
@@ -416,7 +428,7 @@
       </desc>
     </func>
     <func>
-      <name>which_nodes() -> [Node] | {error,not_main_node}</name>
+      <name since="">which_nodes() -> [Node] | {error,not_main_node}</name>
       <fsummary>Return all nodes that are part of the coverage analysis.</fsummary>
       <type>
         <v>Node = atom()</v>
@@ -428,7 +440,7 @@
       </desc>
     </func>
     <func>
-      <name>is_compiled(Module) -> {file,File} | false |  {error,not_main_node}</name>
+      <name since="">is_compiled(Module) -> {file,File} | false |  {error,not_main_node}</name>
       <fsummary>Check if a module is Cover compiled.</fsummary>
       <type>
         <v>Module = atom()</v>
@@ -442,8 +454,8 @@
       </desc>
     </func>
     <func>
-      <name>reset(Module) -></name>
-      <name>reset() ->  ok | {error,not_main_node}</name>
+      <name since="">reset(Module) -></name>
+      <name since="">reset() ->  ok | {error,not_main_node}</name>
       <fsummary>Reset coverage data for Cover compiled modules.</fsummary>
       <type>
         <v>Module = atom()</v>
@@ -458,8 +470,8 @@
       </desc>
     </func>
     <func>
-      <name>export(ExportFile)</name>
-      <name>export(ExportFile,Module) -> ok | {error,Reason}</name>
+      <name since="">export(ExportFile)</name>
+      <name since="">export(ExportFile,Module) -> ok | {error,Reason}</name>
       <fsummary>Reset coverage data for Cover compiled modules.</fsummary>
       <type>
         <v>ExportFile = string()</v>
@@ -470,7 +482,7 @@
         <p>Exports the current coverage data for <c>Module</c> to the
           file <c>ExportFile</c>. It is recommended to name the
           <c>ExportFile</c> with the extension <c>.coverdata</c>, since
-          other filenames can not be read by the web based interface to
+          other filenames cannot be read by the web based interface to
           cover.</p>
         <p>If <c>Module</c> is not given, data for all Cover compiled
           or earlier imported modules is exported.</p>
@@ -480,7 +492,7 @@
       </desc>
     </func>
     <func>
-      <name>import(ExportFile) -> ok | {error,Reason}</name>
+      <name since="">import(ExportFile) -> ok | {error,Reason}</name>
       <fsummary>Reset coverage data for Cover compiled modules.</fsummary>
       <type>
         <v>ExportFile = string()</v>
@@ -496,7 +508,7 @@
         <p>Coverage data from several export files can be imported
           into one system. The coverage data is then added up when
           analysing.</p>
-        <p>Coverage data for a module can not be imported from the
+        <p>Coverage data for a module cannot be imported from the
           same file twice unless the module is first reset or
           compiled. The check is based on the filename, so you can
           easily fool the system by renaming your export file.</p>
@@ -504,14 +516,14 @@
       </desc>
     </func>
     <func>
-      <name>stop() -> ok | {error,not_main_node}</name>
+      <name since="">stop() -> ok | {error,not_main_node}</name>
       <fsummary>Stop Cover.</fsummary>
       <desc>
         <p>Stops the Cover server and unloads all Cover compiled code.</p>
       </desc>
     </func>
     <func>
-      <name>stop(Nodes) -> ok | {error,not_main_node}</name>
+      <name since="">stop(Nodes) -> ok | {error,not_main_node}</name>
       <fsummary>Stop Cover on remote nodes.</fsummary>
       <type>
         <v>Nodes = [atom()]</v>
@@ -523,7 +535,7 @@
       </desc>
     </func>
     <func>
-      <name>flush(Nodes) -> ok | {error,not_main_node}</name>
+      <name since="OTP R16B">flush(Nodes) -> ok | {error,not_main_node}</name>
       <fsummary>Collect cover data from remote nodes.</fsummary>
       <type>
         <v>Nodes = [atom()]</v>
diff --git a/lib/tools/doc/src/cprof.xml b/lib/tools/doc/src/cprof.xml
index df0acbe617..b6af8b6d28 100644
--- a/lib/tools/doc/src/cprof.xml
+++ b/lib/tools/doc/src/cprof.xml
@@ -34,7 +34,7 @@
     <rev>PA1</rev>
     <file>cprof.sgml</file>
   </header>
-  <module>cprof</module>
+  <module since="">cprof</module>
   <modulesummary>A simple Call Count Profiling Tool using breakpoints for minimal runtime performance impact.</modulesummary>
   <description>
     <p>The <c>cprof</c> module is used to profile a program
@@ -65,10 +65,10 @@
   </description>
   <funcs>
     <func>
-      <name>analyse() -> {AllCallCount, ModAnalysisList}</name>
-      <name>analyse(Limit) -> {AllCallCount, ModAnalysisList}</name>
-      <name>analyse(Mod) -> ModAnalysis</name>
-      <name>analyse(Mod, Limit) -> ModAnalysis</name>
+      <name since="">analyse() -> {AllCallCount, ModAnalysisList}</name>
+      <name since="">analyse(Limit) -> {AllCallCount, ModAnalysisList}</name>
+      <name since="">analyse(Mod) -> ModAnalysis</name>
+      <name since="">analyse(Mod, Limit) -> ModAnalysis</name>
       <fsummary>Collect and analyse call counters.</fsummary>
       <type>
         <v>Limit = integer()</v>
@@ -122,7 +122,7 @@
       </desc>
     </func>
     <func>
-      <name>pause() -> integer()</name>
+      <name since="">pause() -> integer()</name>
       <fsummary>Pause running call count trace for all functions.</fsummary>
       <desc>
         <p>Pause call count tracing for all functions in all modules
@@ -137,9 +137,9 @@
       </desc>
     </func>
     <func>
-      <name>pause(FuncSpec) -> integer()</name>
-      <name>pause(Mod, Func) -> integer()</name>
-      <name>pause(Mod, Func, Arity) -> integer()</name>
+      <name since="">pause(FuncSpec) -> integer()</name>
+      <name since="">pause(Mod, Func) -> integer()</name>
+      <name since="">pause(Mod, Func, Arity) -> integer()</name>
       <fsummary>Pause running call count trace for matching functions.</fsummary>
       <type>
         <v>FuncSpec = Mod | {Mod,Func,Arity}, {FS}</v>
@@ -167,10 +167,10 @@
       </desc>
     </func>
     <func>
-      <name>restart() -> integer()</name>
-      <name>restart(FuncSpec) -> integer()</name>
-      <name>restart(Mod, Func) -> integer()</name>
-      <name>restart(Mod, Func, Arity) -> integer()</name>
+      <name since="">restart() -> integer()</name>
+      <name since="">restart(FuncSpec) -> integer()</name>
+      <name since="">restart(Mod, Func) -> integer()</name>
+      <name since="">restart(Mod, Func, Arity) -> integer()</name>
       <fsummary>Restart existing call counters for matching functions.</fsummary>
       <type>
         <v>FuncSpec = Mod | {Mod,Func,Arity}, {FS}</v>
@@ -197,7 +197,7 @@
       </desc>
     </func>
     <func>
-      <name>start() -> integer()</name>
+      <name since="">start() -> integer()</name>
       <fsummary>Start call count tracing for all functions.</fsummary>
       <desc>
         <p>Start call count tracing for all functions in all modules, 
@@ -212,9 +212,9 @@
       </desc>
     </func>
     <func>
-      <name>start(FuncSpec) -> integer()</name>
-      <name>start(Mod, Func) -> integer()</name>
-      <name>start(Mod, Func, Arity) -> integer()</name>
+      <name since="">start(FuncSpec) -> integer()</name>
+      <name since="">start(Mod, Func) -> integer()</name>
+      <name since="">start(Mod, Func, Arity) -> integer()</name>
       <fsummary>Start call count tracing for matching functions.</fsummary>
       <type>
         <v>FuncSpec = Mod | {Mod,Func,Arity}, {FS}</v>
@@ -240,7 +240,7 @@
       </desc>
     </func>
     <func>
-      <name>stop() -> integer()</name>
+      <name since="">stop() -> integer()</name>
       <fsummary>Stop call count tracing for all functions.</fsummary>
       <desc>
         <p>Stop call count tracing for all functions in all modules, 
@@ -255,9 +255,9 @@
       </desc>
     </func>
     <func>
-      <name>stop(FuncSpec) -> integer()</name>
-      <name>stop(Mod, Func) -> integer()</name>
-      <name>stop(Mod, Func, Arity) -> integer()</name>
+      <name since="">stop(FuncSpec) -> integer()</name>
+      <name since="">stop(Mod, Func) -> integer()</name>
+      <name since="">stop(Mod, Func, Arity) -> integer()</name>
       <fsummary>Stop call count tracing for matching functions.</fsummary>
       <type>
         <v>FuncSpec = Mod | {Mod,Func,Arity}, {FS}</v>
diff --git a/lib/tools/doc/src/eprof.xml b/lib/tools/doc/src/eprof.xml
index f098b7d39e..c9e4edd991 100644
--- a/lib/tools/doc/src/eprof.xml
+++ b/lib/tools/doc/src/eprof.xml
@@ -28,7 +28,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>eprof</module>
+  <module since="">eprof</module>
   <modulesummary>A Time Profiling Tool for Erlang</modulesummary>
   <description>
     <p>The module <c>eprof</c> provides a set of functions for time
@@ -40,7 +40,7 @@
   </description>
   <funcs>
     <func>
-      <name>start() -> {ok,Pid} | {error,Reason}</name>
+      <name since="">start() -> {ok,Pid} | {error,Reason}</name>
       <fsummary>Start Eprof.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -51,9 +51,9 @@
       </desc>
     </func>
     <func>
-      <name>start_profiling(Rootset) -> profiling | {error, Reason}</name>
-      <name>start_profiling(Rootset,Pattern) -> profiling | {error, Reason}</name>
-      <name>start_profiling(Rootset,Pattern,Options) -> profiling | {error, Reason}</name>
+      <name since="">start_profiling(Rootset) -> profiling | {error, Reason}</name>
+      <name since="OTP R14B">start_profiling(Rootset,Pattern) -> profiling | {error, Reason}</name>
+      <name since="OTP R16B01">start_profiling(Rootset,Pattern,Options) -> profiling | {error, Reason}</name>
       <fsummary>Start profiling.</fsummary>
       <type>
         <v>Rootset = [atom() | pid()]</v>
@@ -79,7 +79,7 @@
       </desc>
     </func>
     <func>
-      <name>stop_profiling() -> profiling_stopped | profiling_already_stopped</name>
+      <name since="">stop_profiling() -> profiling_stopped | profiling_already_stopped</name>
       <fsummary>Stop profiling.</fsummary>
       <desc>
         <p>Stops profiling started with <c>start_profiling/1</c> or
@@ -87,14 +87,14 @@
       </desc>
     </func>
     <func>
-      <name>profile(Fun) -> profiling | {error, Reason}</name>
-      <name>profile(Fun, Options) -> profiling | {error, Reason}</name>
-      <name>profile(Rootset) -> profiling | {error, Reason}</name>
-      <name>profile(Rootset,Fun) -> {ok, Value} | {error,Reason}</name>
-      <name>profile(Rootset,Fun,Pattern) -> {ok, Value} | {error, Reason}</name>
-      <name>profile(Rootset,Module,Function,Args) -> {ok, Value} | {error, Reason}</name>
-      <name>profile(Rootset,Module,Function,Args,Pattern) -> {ok, Value} | {error, Reason}</name>
-      <name>profile(Rootset,Module,Function,Args,Pattern,Options) -> {ok, Value} | {error, Reason}</name>
+      <name since="">profile(Fun) -> profiling | {error, Reason}</name>
+      <name since="">profile(Fun, Options) -> profiling | {error, Reason}</name>
+      <name since="">profile(Rootset) -> profiling | {error, Reason}</name>
+      <name since="">profile(Rootset,Fun) -> {ok, Value} | {error,Reason}</name>
+      <name since="OTP R14B">profile(Rootset,Fun,Pattern) -> {ok, Value} | {error, Reason}</name>
+      <name since="">profile(Rootset,Module,Function,Args) -> {ok, Value} | {error, Reason}</name>
+      <name since="OTP R14B">profile(Rootset,Module,Function,Args,Pattern) -> {ok, Value} | {error, Reason}</name>
+      <name since="OTP R16B01">profile(Rootset,Module,Function,Args,Pattern,Options) -> {ok, Value} | {error, Reason}</name>
       <fsummary>Start profiling.</fsummary>
       <type>
         <v>Rootset = [atom() | pid()]</v>
@@ -128,9 +128,9 @@
       </desc>
     </func>
     <func>
-      <name>analyze() -> ok</name>
-      <name>analyze(Type) -> ok</name>
-      <name>analyze(Type,Options) -> ok</name>
+      <name since="OTP R14B">analyze() -> ok</name>
+      <name since="OTP R14B">analyze(Type) -> ok</name>
+      <name since="OTP R14B">analyze(Type,Options) -> ok</name>
       <fsummary>Display profiling results per process.</fsummary>
       <type>
         <v>Type = procs | total</v>
@@ -152,7 +152,7 @@
       </desc>
     </func>
     <func>
-      <name>log(File) -> ok</name>
+      <name since="">log(File) -> ok</name>
       <fsummary>Activate logging of <c>eprof</c>printouts.</fsummary>
       <type>
         <v>File = atom() | string()</v>
@@ -164,7 +164,7 @@
       </desc>
     </func>
     <func>
-      <name>stop() -> stopped</name>
+      <name since="">stop() -> stopped</name>
       <fsummary>Stop Eprof.</fsummary>
       <desc>
         <p>Stops the Eprof server.</p>
diff --git a/lib/tools/doc/src/fprof.xml b/lib/tools/doc/src/fprof.xml
index 1fd828d127..4bb8862016 100644
--- a/lib/tools/doc/src/fprof.xml
+++ b/lib/tools/doc/src/fprof.xml
@@ -32,7 +32,7 @@
     <rev>PA1</rev>
     <file>fprof.sgml</file>
   </header>
-  <module>fprof</module>
+  <module since="">fprof</module>
   <modulesummary>A Time Profiling Tool using trace to file for minimal runtime performance impact.</modulesummary>
   <description>
     <p>This module is used to profile a program
@@ -101,7 +101,7 @@
   </description>
   <funcs>
     <func>
-      <name>start() -> {ok, Pid} | {error, {already_started, Pid}}</name>
+      <name since="">start() -> {ok, Pid} | {error, {already_started, Pid}}</name>
       <fsummary>Starts the <c>fprof</c>&nbsp;server.</fsummary>
       <type>
         <v>Pid = pid()</v>
@@ -117,14 +117,14 @@
       </desc>
     </func>
     <func>
-      <name>stop() -> ok</name>
+      <name since="">stop() -> ok</name>
       <fsummary>Same as <c>stop(normal)</c>.</fsummary>
       <desc>
         <p>Same as <c>stop(normal)</c>.</p>
       </desc>
     </func>
     <func>
-      <name>stop(Reason) -> ok</name>
+      <name since="">stop(Reason) -> ok</name>
       <fsummary>Stops the <c>fprof</c>&nbsp;server.</fsummary>
       <type>
         <v>Reason = term()</v>
@@ -149,7 +149,7 @@
       </desc>
     </func>
     <func>
-      <name>apply(Func, Args) -> term()</name>
+      <name since="">apply(Func, Args) -> term()</name>
       <fsummary>Same as <c>apply(Func, Args, [])</c>.</fsummary>
       <type>
         <v>Func = function() | {Module, Function}</v>
@@ -162,7 +162,7 @@
       </desc>
     </func>
     <func>
-      <name>apply(Module, Function, Args) -> term()</name>
+      <name since="">apply(Module, Function, Args) -> term()</name>
       <fsummary>Same as <c>apply({Module, Function}, Args, [])</c>.</fsummary>
       <type>
         <v>Args = [term()]</v>
@@ -174,7 +174,7 @@
       </desc>
     </func>
     <func>
-      <name>apply(Func, Args, OptionList) -> term()</name>
+      <name since="">apply(Func, Args, OptionList) -> term()</name>
       <fsummary>Calls <c>erlang:apply(Func, Args)</c>surrounded by<c>trace([start | OptionList])</c>and<c>trace(stop)</c>.</fsummary>
       <type>
         <v>Func = function() | {Module, Function}</v>
@@ -210,7 +210,7 @@
       </desc>
     </func>
     <func>
-      <name>apply(Module, Function, Args, OptionList) -> term()</name>
+      <name since="">apply(Module, Function, Args, OptionList) -> term()</name>
       <fsummary>Same as <c>apply({Module, Function}, Args, OptionList)</c>.</fsummary>
       <type>
         <v>Module = atom()</v>
@@ -228,7 +228,7 @@
       </desc>
     </func>
     <func>
-      <name>trace(start, Filename) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
+      <name since="">trace(start, Filename) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
       <fsummary>Same as <c>trace([start, {file, Filename}])</c>.</fsummary>
       <type>
         <v>Reason = term()</v>
@@ -238,7 +238,7 @@
       </desc>
     </func>
     <func>
-      <name>trace(verbose, Filename) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
+      <name since="">trace(verbose, Filename) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
       <fsummary>Same as <c>trace([start, verbose, {file, Filename}])</c>.</fsummary>
       <type>
         <v>Reason = term()</v>
@@ -249,7 +249,7 @@
       </desc>
     </func>
     <func>
-      <name>trace(OptionName, OptionValue) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
+      <name since="">trace(OptionName, OptionValue) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
       <fsummary>Same as <c>trace([{OptionName, OptionValue}])</c>.</fsummary>
       <type>
         <v>OptionName = atom()</v>
@@ -262,7 +262,7 @@
       </desc>
     </func>
     <func>
-      <name>trace(verbose) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
+      <name since="">trace(verbose) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
       <fsummary>Same as <c>trace([start, verbose])</c>.</fsummary>
       <type>
         <v>Reason = term()</v>
@@ -272,7 +272,7 @@
       </desc>
     </func>
     <func>
-      <name>trace(OptionName) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
+      <name since="">trace(OptionName) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
       <fsummary>Same as <c>trace([OptionName])</c>.</fsummary>
       <type>
         <v>OptionName = atom()</v>
@@ -283,7 +283,7 @@
       </desc>
     </func>
     <func>
-      <name>trace({OptionName, OptionValue}) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
+      <name since="">trace({OptionName, OptionValue}) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
       <fsummary>Same as <c>trace([{OptionName, OptionValue}])</c>.</fsummary>
       <type>
         <v>OptionName = atom()</v>
@@ -296,7 +296,7 @@
       </desc>
     </func>
     <func>
-      <name>trace([Option]) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
+      <name since="">trace([Option]) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
       <fsummary>Starts or stops tracing.</fsummary>
       <type>
         <v>Option = start | stop | {procs, PidSpec} | {procs, [PidSpec]} | verbose | {verbose, bool()} |  file | {file, Filename} | {tracer, Tracer}</v>
@@ -360,7 +360,7 @@
       </desc>
     </func>
     <func>
-      <name>profile() -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
+      <name since="">profile() -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
       <fsummary>Same as <c>profile([])</c>.</fsummary>
       <type>
         <v>Reason = term()</v>
@@ -370,7 +370,7 @@
       </desc>
     </func>
     <func>
-      <name>profile(OptionName, OptionValue) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
+      <name since="">profile(OptionName, OptionValue) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
       <fsummary>Same as <c>profile([{OptionName, OptionValue}])</c>.</fsummary>
       <type>
         <v>OptionName = atom()</v>
@@ -383,7 +383,7 @@
       </desc>
     </func>
     <func>
-      <name>profile(OptionName) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
+      <name since="">profile(OptionName) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
       <fsummary>Same as <c>profile([OptionName])</c>.</fsummary>
       <type>
         <v>OptionName = atom()</v>
@@ -394,7 +394,7 @@
       </desc>
     </func>
     <func>
-      <name>profile({OptionName, OptionValue}) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
+      <name since="">profile({OptionName, OptionValue}) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
       <fsummary>Same as <c>profile([{OptionName, OptionValue}])</c>.</fsummary>
       <type>
         <v>OptionName = atom()</v>
@@ -407,7 +407,7 @@
       </desc>
     </func>
     <func>
-      <name>profile([Option]) -> ok | {ok, Tracer} | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
+      <name since="">profile([Option]) -> ok | {ok, Tracer} | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
       <fsummary>Compiles a trace into raw profile data held by the <c>fprof</c>&nbsp;server.</fsummary>
       <type>
         <v>Option = file | {file, Filename} | dump | {dump, Dump} |  append | start | stop</v>
@@ -465,7 +465,7 @@
       </desc>
     </func>
     <func>
-      <name>analyse() -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
+      <name since="">analyse() -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
       <fsummary>Same as <c>analyse([])</c>.</fsummary>
       <type>
         <v>Reason = term()</v>
@@ -475,7 +475,7 @@
       </desc>
     </func>
     <func>
-      <name>analyse(OptionName, OptionValue) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
+      <name since="">analyse(OptionName, OptionValue) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
       <fsummary>Same as <c>analyse([{OptionName, OptionValue}])</c>.</fsummary>
       <type>
         <v>OptionName = atom()</v>
@@ -488,7 +488,7 @@
       </desc>
     </func>
     <func>
-      <name>analyse(OptionName) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
+      <name since="">analyse(OptionName) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
       <fsummary>Same as <c>analyse([OptionName])</c>.</fsummary>
       <type>
         <v>OptionName = atom()</v>
@@ -499,7 +499,7 @@
       </desc>
     </func>
     <func>
-      <name>analyse({OptionName, OptionValue}) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
+      <name since="">analyse({OptionName, OptionValue}) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
       <fsummary>Same as <c>analyse([{OptionName, OptionValue}])</c>.</fsummary>
       <type>
         <v>OptionName = atom()</v>
@@ -512,7 +512,7 @@
       </desc>
     </func>
     <func>
-      <name>analyse([Option]) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
+      <name since="">analyse([Option]) -> ok | {error, Reason} |  {'EXIT', ServerPid, Reason}</name>
       <fsummary>Analyses raw profile data in the <c>fprof</c>&nbsp;server.</fsummary>
       <type>
         <v>Option = dest | {dest, Dest} | append | {cols, Cols} |  callers | {callers, bool()} | no_callers | {sort, SortSpec} | totals | {totals, bool()} |  details | {details, bool()} | no_details</v>
diff --git a/lib/tools/doc/src/instrument.xml b/lib/tools/doc/src/instrument.xml
index 9fd9332373..7e9cbaebb0 100644
--- a/lib/tools/doc/src/instrument.xml
+++ b/lib/tools/doc/src/instrument.xml
@@ -32,7 +32,7 @@
     <rev>PA1</rev>
     <file>instrument.sgml</file>
   </header>
-  <module>instrument</module>
+  <module since="">instrument</module>
   <modulesummary>Analysis and Utility Functions for Instrumentation</modulesummary>
   <description>
     <p>The module <c>instrument</c> contains support for studying the resource
@@ -92,7 +92,7 @@
   <funcs>
 
     <func>
-      <name name="allocations" arity="0"/>
+      <name name="allocations" arity="0" since="OTP 21.0"/>
       <fsummary>Return a summary of all allocations in the system.</fsummary>
       <desc>
         <p>Shorthand for
@@ -101,7 +101,7 @@
     </func>
 
     <func>
-      <name name="allocations" arity="1"/>
+      <name name="allocations" arity="1" since="OTP 21.0"/>
       <fsummary>Return a summary of all allocations filtered by allocator type
         and scheduler id.</fsummary>
       <desc>
@@ -111,15 +111,18 @@
           default, but this can be configured an a per-allocator basis with the
           <seealso marker="erts:erts_alloc#M_atags"><c>+M&lt;S&gt;atags</c>
           </seealso> emulator option.</p>
-        <p>If tagged allocations are not enabled on any of the specified
-          allocator types, the call will fail with
-          <c>{error, not_enabled}</c>.</p>
+        <p>If the specified allocator types are not enabled, the call will fail
+          with <c>{error, not_enabled}</c>.</p>
         <p>The following options can be used:</p>
         <taglist>
           <tag><c>allocator_types</c></tag>
           <item>
-            <p>The allocator types that will be searched. Defaults to all
-              <c>alloc_util</c> allocators.</p>
+            <p>The allocator types that will be searched. Note that blocks can
+              move freely between allocator types, so restricting the search to
+              certain allocators may return unexpected types (e.g. process
+              heaps when searching binary_alloc), or hide blocks that were
+              migrated out.</p>
+            <p>Defaults to all <c>alloc_util</c> allocators.</p>
           </item>
           <tag><c>scheduler_ids</c></tag>
           <item>
@@ -170,7 +173,7 @@
     </func>
 
     <func>
-      <name name="carriers" arity="0"/>
+      <name name="carriers" arity="0" since="OTP 21.0"/>
       <fsummary>Return a list of all carriers in the system.</fsummary>
       <desc>
         <p>Shorthand for
@@ -179,7 +182,7 @@
     </func>
 
     <func>
-      <name name="carriers" arity="1"/>
+      <name name="carriers" arity="1" since="OTP 21.0"/>
       <fsummary>Return a list of all carriers filtered by allocator type and
         scheduler id.</fsummary>
       <desc>
diff --git a/lib/tools/doc/src/lcnt.xml b/lib/tools/doc/src/lcnt.xml
index d2595cdb60..1d434decfc 100644
--- a/lib/tools/doc/src/lcnt.xml
+++ b/lib/tools/doc/src/lcnt.xml
@@ -34,7 +34,7 @@
 	<rev>PA1</rev>
 	<file>lcnt.xml</file>
     </header>
-    <module>lcnt</module>
+    <module since="OTP R13B04">lcnt</module>
     <modulesummary>A runtime system Lock Profiling tool.</modulesummary>
     <description>
 	<p>The <c>lcnt</c> module is used to profile the internal ethread locks in the
@@ -71,7 +71,7 @@
     <funcs>
 
 	<func>
-	    <name>start() -> {ok, Pid} | {error, {already_started, Pid}} </name>
+	    <name since="OTP R13B04">start() -> {ok, Pid} | {error, {already_started, Pid}} </name>
 	    <fsummary>Starts the lock profiler server.</fsummary>
 	    <type>
 		<v>Pid = pid()</v>
@@ -84,7 +84,7 @@
 	</func>
 
 	<func>
-	    <name>stop() -> ok</name>
+	    <name since="OTP R13B04">stop() -> ok</name>
 	    <fsummary>Stops the lock profiler server.</fsummary>
 	    <desc>
 		<p>Stops the lock profiler server.</p>
@@ -92,13 +92,13 @@
 	</func>
 
 	<func>
-	    <name>collect() -> ok</name>
+	    <name since="OTP R13B04">collect() -> ok</name>
 	    <fsummary>Same as <c>collect(node())</c>.</fsummary>
 	    <desc><p>Same as <c>collect(node())</c>.</p></desc>
 	</func>
 
 	<func>
-	    <name>collect(Node) -> ok</name>
+	    <name since="OTP R13B04">collect(Node) -> ok</name>
 	    <fsummary>Collects lock statistics from the runtime system.</fsummary>
 	    <type>
 		<v>Node = node()</v>
@@ -113,13 +113,13 @@
 	</func>
 
 	<func>
-	    <name>clear() -> ok</name>
+	    <name since="OTP R13B04">clear() -> ok</name>
 	    <fsummary>Same as <c>clear(node())</c>.</fsummary>
 	    <desc><p>Same as <c>clear(node())</c>.</p></desc>
 	</func>
 
 	<func>
-	    <name>clear(Node) -> ok</name>
+	    <name since="OTP R13B04">clear(Node) -> ok</name>
 	    <fsummary>Clears the internal lock statistics from runtime system.</fsummary>
 	    <type>
 		<v>Node = node()</v>
@@ -133,12 +133,12 @@
 	    </desc>
 	</func>
 	<func>
-	    <name>conflicts() -> ok</name>
+	    <name since="OTP R13B04">conflicts() -> ok</name>
 	    <fsummary>Same as <c>conflicts([])</c>.</fsummary>
 	    <desc><p>Same as <c>conflicts([])</c>.</p></desc>
 	</func>
 	<func>
-	    <name>conflicts([Option]) -> ok</name>
+	    <name since="OTP R13B04">conflicts([Option]) -> ok</name>
 	    <fsummary>Prints a list of internal lock counters.</fsummary>
 	    <type>
 		<v>Option     = {sort, Sort} | {reverse, bool()} | {thresholds, [Thresholds]} | {print, [Print | {Print, integer()}]} | {max_locks, MaxLocks} | {combine, bool()}</v>
@@ -154,14 +154,14 @@
 	</func>
 
 	<func>
-	    <name>locations() -> ok</name>
+	    <name since="OTP R13B04">locations() -> ok</name>
 	    <fsummary>Same as <c>locations([])</c>.</fsummary>
 	    <desc>
 		<p>Same as <c>locations([])</c>.</p>
 	    </desc>
 	</func>
 	<func>
-	    <name>locations([Option]) -> ok</name>
+	    <name since="OTP R13B04">locations([Option]) -> ok</name>
 	    <fsummary>Prints a list of internal lock counters by source code locations.</fsummary>
 	    <type>
 		<v>Option     = {sort, Sort} | {thresholds, [Thresholds]} | {print, [Print | {Print, integer()}]} | {max_locks, MaxLocks} | {combine, bool()}</v>
@@ -177,12 +177,12 @@
 	</func>
 
 	<func>
-	    <name>inspect(Lock) -> ok</name>
+	    <name since="OTP R13B04">inspect(Lock) -> ok</name>
 	    <fsummary>Same as <c>inspect(Lock, [])</c>.</fsummary>
 	    <desc><p>Same as <c>inspect(Lock, [])</c>.</p></desc>
 	</func>
 	<func>
-	    <name>inspect(Lock, [Option]) -> ok</name>
+	    <name since="OTP R13B04">inspect(Lock, [Option]) -> ok</name>
 	    <fsummary>Prints a list of internal lock counters for a specific lock.</fsummary>
 	    <type>
 		<v>Lock       = Name | {Name, Id | [Id]}</v>
@@ -268,7 +268,7 @@
 	</func>
 
 	<func>
-	    <name>information() -> ok</name>
+	    <name since="OTP R13B04">information() -> ok</name>
 	    <fsummary>Prints lcnt server state and generic information about collected lock statistics.</fsummary>
 	    <desc>
 		<p>Prints lcnt server state and generic information about collected lock statistics.</p>
@@ -276,7 +276,7 @@
 	</func>
 
 	<func>
-	    <name>swap_pid_keys() -> ok</name>
+	    <name since="OTP R13B04">swap_pid_keys() -> ok</name>
 	    <fsummary>Swaps places on <c>Name</c> and <c>Id</c> space for ports and processes.</fsummary>
 	    <desc>
 		<p>Swaps places on <c>Name</c> and <c>Id</c> space for ports and processes.</p>
@@ -284,7 +284,7 @@
 	</func>
 
 	<func>
-	    <name>load(Filename) -> ok</name>
+	    <name since="OTP R13B04">load(Filename) -> ok</name>
 	    <fsummary>Restores previously saved data to the server.</fsummary>
 	    <type>
 		<v>Filename = filename()</v>
@@ -295,7 +295,7 @@
 	</func>
 
 	<func>
-	    <name>save(Filename) -> ok</name>
+	    <name since="OTP R13B04">save(Filename) -> ok</name>
 	    <fsummary>Saves the collected data to file.</fsummary>
 	    <type>
 		<v>Filename = filename()</v>
@@ -312,7 +312,7 @@
     </section>
     <funcs>
 	<func>
-	    <name>apply(Fun) -> term()</name>
+	    <name since="OTP R13B04">apply(Fun) -> term()</name>
 	    <fsummary>Same as <c>apply(Fun, [])</c>.</fsummary>
 	    <type>
 		<v>Fun = fun()</v>
@@ -322,7 +322,7 @@
 	    </desc>
 	</func>
 	<func>
-	    <name>apply(Fun, Args) -> term()</name>
+	    <name since="OTP R13B04">apply(Fun, Args) -> term()</name>
 	    <fsummary>Same as <c>apply(Module, Function, Args)</c>.</fsummary>
 	    <type>
 		<v>Fun = fun()</v>
@@ -333,7 +333,7 @@
 	    </desc>
 	</func>
 	<func>
-	    <name>apply(Module, Function, Args) -> term()</name>
+	    <name since="OTP R13B04">apply(Module, Function, Args) -> term()</name>
 	    <fsummary>Clears counters, applies function and collects the profiling results.</fsummary>
 	    <type>
 		<v>Module = atom()</v>
@@ -358,12 +358,12 @@
 	</func>
 
 	<func>
-	    <name>pid(Id, Serial) -> pid()</name>
+	    <name since="OTP R13B04">pid(Id, Serial) -> pid()</name>
 	    <fsummary>Same as <c>pid(node(), Id, Serial)</c>.</fsummary>
 	    <desc><p>Same as <c>pid(node(), Id, Serial)</c>.</p></desc>
 	</func>
 	<func>
-	    <name>pid(Node, Id, Serial) -> pid()</name>
+	    <name since="OTP R13B04">pid(Node, Id, Serial) -> pid()</name>
 	    <fsummary>Creates a process id with creation 0.</fsummary>
 	    <type>
 		<v>Node = node()</v>
@@ -376,12 +376,12 @@
 	</func>
 
 	<func>
-	    <name>port(Id) -> port()</name>
+	    <name since="OTP R13B04">port(Id) -> port()</name>
 	    <fsummary>Same as <c>port(node(), Id)</c>.</fsummary>
 	    <desc><p>Same as <c>port(node(), Id)</c>.</p></desc>
 	</func>
 	<func>
-	    <name>port(Node, Id) -> port()</name>
+	    <name since="OTP R13B04">port(Node, Id) -> port()</name>
 	    <fsummary>Creates a port id with creation 0.</fsummary>
 	    <type>
 		<v>Node = node()</v>
@@ -399,12 +399,12 @@
 
     <funcs>
 	<func>
-	    <name>rt_collect() -> [lock_counter_data()]</name>
+	    <name since="OTP R13B04">rt_collect() -> [lock_counter_data()]</name>
 	    <fsummary>Same as <c>rt_collect(node())</c>.</fsummary>
 	    <desc> <p>Same as <c>rt_collect(node())</c>.</p> </desc>
 	</func>
 	<func>
-	    <name>rt_collect(Node) -> [lock_counter_data()]</name>
+	    <name since="OTP R13B04">rt_collect(Node) -> [lock_counter_data()]</name>
 	    <fsummary>Returns a list of raw lock counter data.</fsummary>
 	    <type>
 		<v>Node = node()</v>
@@ -413,12 +413,12 @@
 	</func>
 
 	<func>
-	    <name>rt_clear() -> ok</name>
+	    <name since="OTP R13B04">rt_clear() -> ok</name>
 	    <fsummary>Same as <c>rt_clear(node())</c>.</fsummary>
 	    <desc> <p>Same as <c>rt_clear(node())</c>.</p> </desc>
 	</func>
 	<func>
-	    <name>rt_clear(Node) -> ok</name>
+	    <name since="OTP R13B04">rt_clear(Node) -> ok</name>
 	    <fsummary>Clears the internal counters.</fsummary>
 	    <type>
 		<v>Node = node()</v>
@@ -427,13 +427,13 @@
 	</func>
 
         <func>
-            <name>rt_mask() -> [category_atom()]</name>
+            <name since="OTP 20.1">rt_mask() -> [category_atom()]</name>
             <fsummary>Same as <c>rt_mask(node())</c>.</fsummary>
             <desc><p>Same as <c>rt_mask(node())</c>.</p></desc>
         </func>
 
         <func>
-            <name>rt_mask(Node) -> [category_atom()]</name>
+            <name since="OTP 20.1">rt_mask(Node) -> [category_atom()]</name>
             <fsummary>Returns the current lock category mask.</fsummary>
             <type>
                 <v>Node = node()</v>
@@ -447,7 +447,7 @@
         </func>
 
         <func>
-            <name>rt_mask(Categories) -> ok | {error, copy_save_enabled}</name>
+            <name since="OTP 20.1">rt_mask(Categories) -> ok | {error, copy_save_enabled}</name>
             <fsummary>Same as <c>rt_mask(node(), Categories)</c>.</fsummary>
             <type>
                 <v>Categories = [atom()]</v>
@@ -456,7 +456,7 @@
         </func>
 
         <func>
-            <name>rt_mask(Node, Categories) -> ok | {error, copy_save_enabled}</name>
+            <name since="OTP 20.1">rt_mask(Node, Categories) -> ok | {error, copy_save_enabled}</name>
             <fsummary>Changes the lock category mask.</fsummary>
             <type>
                 <v>Node = node()</v>
@@ -489,12 +489,12 @@
         </func>
 
 	<func>
-	    <name>rt_opt({Type, bool()}) -> bool()</name>
+	    <name since="OTP R13B04">rt_opt({Type, bool()}) -> bool()</name>
 	    <fsummary>Same as <c>rt_opt(node(), {Type, Opt})</c>.</fsummary>
 	    <desc> <p>Same as <c>rt_opt(node(), {Type, Opt})</c>.</p> </desc>
 	</func>
 	<func>
-	    <name>rt_opt(Node, {Type, bool()}) -> bool()</name>
+	    <name since="OTP R13B04">rt_opt(Node, {Type, bool()}) -> bool()</name>
 	    <fsummary>Changes the lock counter behavior and returns the previous behaviour.</fsummary>
 	    <type>
 		<v>Node = node()</v>
diff --git a/lib/tools/doc/src/make.xml b/lib/tools/doc/src/make.xml
index 123fcd4afc..322d77323f 100644
--- a/lib/tools/doc/src/make.xml
+++ b/lib/tools/doc/src/make.xml
@@ -30,7 +30,7 @@
     <date></date>
     <rev></rev>
   </header>
-  <module>make</module>
+  <module since="">make</module>
   <modulesummary>A Make Utility for Erlang</modulesummary>
   <description>
     <p>The module <c>make</c> provides a set of functions similar to
@@ -38,8 +38,8 @@
   </description>
   <funcs>
     <func>
-      <name>all() -> up_to_date | error</name>
-      <name>all(Options) -> up_to_date | error</name>
+      <name since="">all() -> up_to_date | error</name>
+      <name since="">all(Options) -> up_to_date | error</name>
       <fsummary>Compile a set of modules.</fsummary>
       <type>
         <v>Options = [Option]</v>
@@ -87,8 +87,8 @@
       </desc>
     </func>
     <func>
-      <name>files(ModFiles) -> up_to_date | error</name>
-      <name>files(ModFiles, Options) -> up_to_date | error</name>
+      <name since="">files(ModFiles) -> up_to_date | error</name>
+      <name since="">files(ModFiles, Options) -> up_to_date | error</name>
       <fsummary>Compile a set of modules.</fsummary>
       <type>
         <v>ModFiles = [Module | File]</v>
@@ -145,5 +145,10 @@ Modules.
 {'*',[debug_info]}.    </code>
     <p></p>
   </section>
+
+  <section>
+    <title>See Also</title>
+    <p><seealso marker="compiler:compile"><c>compile(3)</c></seealso></p>
+  </section>
 </erlref>
 
diff --git a/lib/tools/doc/src/notes.xml b/lib/tools/doc/src/notes.xml
index a6781dfdb3..09ae5ef04a 100644
--- a/lib/tools/doc/src/notes.xml
+++ b/lib/tools/doc/src/notes.xml
@@ -31,6 +31,103 @@
   </header>
   <p>This document describes the changes made to the Tools application.</p>
 
+<section><title>Tools 3.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Add <c>cprof</c> and <c>tags</c> modules to .app file so
+	    that they are included in releases.</p>
+          <p>
+	    Own Id: OTP-15534 Aux Id: PR-2078 </p>
+        </item>
+        <item>
+          <p>
+	    Improved documentation parsing in emacs erldoc
+	    functionality.</p>
+          <p>
+	    Own Id: OTP-15699 Aux Id: PR-2184 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>The <c>cover</c> tool now uses the <c>counters</c>
+	    module instead of <c>ets</c> for updating the counters
+	    for how many times a line has been executed. By default,
+	    Cover will work with distributed nodes, but a new
+	    function <c>cover:local_only/0</c> allows running the
+	    Cover in a restricted but faster local-only mode.</p>
+	    <p>The increase in speed will vary depending on the type
+	    of code being cover-compiled, but as an example, the
+	    compiler test suite runs more than twice as fast with the
+	    new Cover.</p>
+          <p>
+	    Own Id: OTP-15575</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Tools 3.1.0.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p><c>cover</c> would fail to start if two processes
+	    tried to start it at the exact same time.</p>
+          <p>
+	    Own Id: OTP-15813 Aux Id: ERL-943 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Tools 3.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Minor fixes for <c>make clean</c>.</p>
+          <p>
+	    Own Id: OTP-15657</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    In the HTML file generated by
+	    <c>cover:analyse_to_file/1,2</c>, a link is now added to
+	    the line number. This makes it easier to share pointers
+	    to specific lines.</p>
+          <p>
+	    Own Id: OTP-15541</p>
+        </item>
+        <item>
+          <p>
+	    Uncovered lines are now marked with a sad face,
+	    <c>:-(</c>, in the HTML output from
+	    <c>cover:analyse_to_file/1,2</c>. This is to make these
+	    lines easier to find by search.</p>
+          <p>
+	    Own Id: OTP-15542</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Tools 3.0.2</title>
 
     <section><title>Improvements and New Features</title>
@@ -89,6 +186,36 @@
 
 </section>
 
+<section><title>Tools 2.11.2.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p><c>cover</c> would fail to start if two processes
+	    tried to start it at the exact same time.</p>
+          <p>
+	    Own Id: OTP-15813 Aux Id: ERL-943 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Tools 2.11.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Minor fixes for <c>make clean</c>.</p>
+          <p>
+	    Own Id: OTP-15657</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Tools 2.11.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -1866,4 +1993,3 @@
     </section>
   </section>
 </chapter>
-
diff --git a/lib/tools/doc/src/tags.xml b/lib/tools/doc/src/tags.xml
index ea0ae5cc4d..90a8b28177 100644
--- a/lib/tools/doc/src/tags.xml
+++ b/lib/tools/doc/src/tags.xml
@@ -32,7 +32,7 @@
     <rev>A</rev>
     <file>tags.sgml</file>
   </header>
-  <module>tags</module>
+  <module since="">tags</module>
   <modulesummary>Generate Emacs TAGS file from Erlang source files</modulesummary>
   <description>
     <p>A <c>TAGS</c> file is used by Emacs to find function and variable
@@ -42,14 +42,14 @@
   </description>
   <funcs>
     <func>
-      <name>file(File [, Options])</name>
+      <name since="">file(File [, Options])</name>
       <fsummary>Create a <c>TAGS</c>file for the file <c>File</c>.</fsummary>
       <desc>
         <p>Create a <c>TAGS</c> file for the file <c>File</c>.</p>
       </desc>
     </func>
     <func>
-      <name>files(FileList [, Options])</name>
+      <name since="">files(FileList [, Options])</name>
       <fsummary>Create a TAGS file for the files in the list<c>FileList</c>.</fsummary>
       <desc>
         <p>Create a TAGS file for the files in the list
@@ -57,7 +57,7 @@
       </desc>
     </func>
     <func>
-      <name>dir(Dir [, Options])</name>
+      <name since="">dir(Dir [, Options])</name>
       <fsummary>Create a TAGS file for all files in directory<c>Dir</c>.</fsummary>
       <desc>
         <p>Create a TAGS file for all files in directory
@@ -65,7 +65,7 @@
       </desc>
     </func>
     <func>
-      <name>dirs(DirList [, Options])</name>
+      <name since="">dirs(DirList [, Options])</name>
       <fsummary>Create a TAGS file for all files in any directory in<c>DirList</c>.</fsummary>
       <desc>
         <p>Create a TAGS file for all files in any directory in
@@ -73,7 +73,7 @@
       </desc>
     </func>
     <func>
-      <name>subdir(Dir [, Options])</name>
+      <name since="">subdir(Dir [, Options])</name>
       <fsummary>Descend recursively down the directory <c>Dir</c>and create a <c>TAGS</c>file based on all files found.</fsummary>
       <desc>
         <p>Descend recursively down the directory <c>Dir</c> and
@@ -81,7 +81,7 @@
       </desc>
     </func>
     <func>
-      <name>subdirs(DirList [, Options])</name>
+      <name since="">subdirs(DirList [, Options])</name>
       <fsummary>Descend recursively down all the directories in<c>DirList</c>and create a <c>TAGS</c>file based on all files found.</fsummary>
       <desc>
         <p>Descend recursively down all the directories in
@@ -90,7 +90,7 @@
       </desc>
     </func>
     <func>
-      <name>root([Options])</name>
+      <name since="">root([Options])</name>
       <fsummary>Create a <c>TAGS</c>file covering all files in the Erlang distribution.</fsummary>
       <desc>
         <p>Create a <c>TAGS</c> file covering all files in
diff --git a/lib/tools/doc/src/xref.xml b/lib/tools/doc/src/xref.xml
index 6f833246ad..ab3641a52f 100644
--- a/lib/tools/doc/src/xref.xml
+++ b/lib/tools/doc/src/xref.xml
@@ -32,7 +32,7 @@
     <rev>PA1</rev>
     <file>xref.sgml</file>
   </header>
-  <module>xref</module>
+  <module since="">xref</module>
   <modulesummary>A Cross Reference Tool for analyzing dependencies between functions, modules, applications and releases.</modulesummary>
   <description>
     <p>Xref is a cross reference tool that can be used for finding
@@ -729,7 +729,7 @@ xref() = atom() | pid()  </pre>
   </description>
   <funcs>
     <func>
-      <name>add_application(Xref, Directory [, Options]) ->  {ok, application()} | Error</name>
+      <name since="">add_application(Xref, Directory [, Options]) ->  {ok, application()} | Error</name>
       <fsummary>Add the modules of an application.</fsummary>
       <type>
         <v>Directory = directory()</v>
@@ -761,7 +761,7 @@ xref() = atom() | pid()  </pre>
       </desc>
     </func>
     <func>
-      <name>add_directory(Xref, Directory [, Options]) ->  {ok, Modules} | Error</name>
+      <name since="">add_directory(Xref, Directory [, Options]) ->  {ok, Modules} | Error</name>
       <fsummary>Add the modules in a directory.</fsummary>
       <type>
         <v>Directory = directory()</v>
@@ -791,7 +791,7 @@ xref() = atom() | pid()  </pre>
       </desc>
     </func>
     <func>
-      <name>add_module(Xref, File [, Options]) -> {ok, module()} | Error</name>
+      <name since="">add_module(Xref, File [, Options]) -> {ok, module()} | Error</name>
       <fsummary>Add a module.</fsummary>
       <type>
         <v>Error = {error, module(), Reason}</v>
@@ -814,7 +814,7 @@ xref() = atom() | pid()  </pre>
       </desc>
     </func>
     <func>
-      <name>add_release(Xref, Directory [, Options]) ->  {ok, release()} | Error</name>
+      <name since="">add_release(Xref, Directory [, Options]) ->  {ok, release()} | Error</name>
       <fsummary>Add the modules of a release.</fsummary>
       <type>
         <v>Directory = directory()</v>
@@ -849,7 +849,7 @@ xref() = atom() | pid()  </pre>
       </desc>
     </func>
     <func>
-      <name>analyze(Xref, Analysis [, Options]) ->  {ok, Answer} | Error</name>
+      <name since="">analyze(Xref, Analysis [, Options]) ->  {ok, Answer} | Error</name>
       <fsummary>Evaluate a predefined analysis.</fsummary>
       <type>
         <v>Analysis = undefined_function_calls  | undefined_functions | locals_not_used | exports_not_used | deprecated_function_calls | {deprecated_function_calls, DeprFlag} | deprecated_functions | {deprecated_functions, DeprFlag} | {call, FuncSpec} | {use, FuncSpec} | {module_call, ModSpec} | {module_use, ModSpec} | {application_call, AppSpec} | {application_use, AppSpec} | {release_call, RelSpec} | {release_use, RelSpec}</v>
@@ -939,7 +939,7 @@ Evaluates a predefined analysis.
       </desc>
     </func>
     <func>
-      <name>d(Directory) -> [DebugInfoResult] | [NoDebugInfoResult] | Error</name>
+      <name since="">d(Directory) -> [DebugInfoResult] | [NoDebugInfoResult] | Error</name>
       <fsummary>Check the modules in a directory using the code path.</fsummary>
       <type>
         <v>Directory = directory()</v>
@@ -979,8 +979,8 @@ Evaluates a predefined analysis.
       </desc>
     </func>
     <func>
-      <name>forget(Xref) -> ok</name>
-      <name>forget(Xref, Variables) -> ok | Error</name>
+      <name since="">forget(Xref) -> ok</name>
+      <name since="">forget(Xref, Variables) -> ok | Error</name>
       <fsummary>Remove user variables and their values.</fsummary>
       <type>
         <v>Error = {error, module(), Reason}</v>
@@ -994,7 +994,7 @@ Evaluates a predefined analysis.
       </desc>
     </func>
     <func>
-      <name>format_error(Error) -> Chars</name>
+      <name since="">format_error(Error) -> Chars</name>
       <fsummary>Return an English description of an Xref error reply.</fsummary>
       <type>
         <v>Error = {error, module(), term()}</v>
@@ -1008,8 +1008,8 @@ Evaluates a predefined analysis.
       </desc>
     </func>
     <func>
-      <name>get_default(Xref) -> [{Option, Value}]</name>
-      <name>get_default(Xref, Option) -> {ok, Value} | Error</name>
+      <name since="">get_default(Xref) -> [{Option, Value}]</name>
+      <name since="">get_default(Xref, Option) -> {ok, Value} | Error</name>
       <fsummary>Return the default values of options.</fsummary>
       <type>
         <v>Error = {error, module(), Reason}</v>
@@ -1023,7 +1023,7 @@ Evaluates a predefined analysis.
       </desc>
     </func>
     <func>
-      <name>get_library_path(Xref) -> {ok, LibraryPath}</name>
+      <name since="">get_library_path(Xref) -> {ok, LibraryPath}</name>
       <fsummary>Return the library path.</fsummary>
       <type>
         <v>LibraryPath = library_path()</v>
@@ -1034,9 +1034,9 @@ Evaluates a predefined analysis.
       </desc>
     </func>
     <func>
-      <name>info(Xref) -> [Info]</name>
-      <name>info(Xref, Category) -> [{Item, [Info]}]</name>
-      <name>info(Xref, Category, Items) ->  [{Item, [Info]}]</name>
+      <name since="">info(Xref) -> [Info]</name>
+      <name since="">info(Xref, Category) -> [{Item, [Info]}]</name>
+      <name since="">info(Xref, Category, Items) ->  [{Item, [Info]}]</name>
       <fsummary>Return information about an Xref server.</fsummary>
       <type>
         <v>Application = [] | [application()]</v>
@@ -1220,8 +1220,8 @@ Evaluates a predefined analysis.
       </desc>
     </func>
     <func>
-      <name>m(Module) -> [DebugInfoResult] | [NoDebugInfoResult] | Error</name>
-      <name>m(File) -> [DebugInfoResult] | [NoDebugInfoResult] | Error</name>
+      <name since="">m(Module) -> [DebugInfoResult] | [NoDebugInfoResult] | Error</name>
+      <name since="">m(File) -> [DebugInfoResult] | [NoDebugInfoResult] | Error</name>
       <fsummary>Check a module using the code path.</fsummary>
       <type>
         <v>DebugInfoResult = {deprecated, [funcall()]} | {undefined, [funcall()]} | {unused, [mfa()]}</v>
@@ -1263,7 +1263,7 @@ Evaluates a predefined analysis.
       </desc>
     </func>
     <func>
-      <name>q(Xref, Query [, Options]) -> {ok, Answer} | Error</name>
+      <name since="">q(Xref, Query [, Options]) -> {ok, Answer} | Error</name>
       <fsummary>Evaluate a query.</fsummary>
       <type>
         <v>Answer = false | [constant()] | [Call] | [Component] | int() | [DefineAt] | [CallAt] | [AllLines]</v>
@@ -1322,7 +1322,7 @@ Evaluates a predefined analysis.
       </desc>
     </func>
     <func>
-      <name>remove_application(Xref, Applications) -> ok | Error</name>
+      <name since="">remove_application(Xref, Applications) -> ok | Error</name>
       <fsummary>Remove applications and their modules.</fsummary>
       <type>
         <v>Applications = application() | [application()]</v>
@@ -1335,7 +1335,7 @@ Evaluates a predefined analysis.
       </desc>
     </func>
     <func>
-      <name>remove_module(Xref, Modules) -> ok | Error</name>
+      <name since="">remove_module(Xref, Modules) -> ok | Error</name>
       <fsummary>Remove analyzed modules.</fsummary>
       <type>
         <v>Error = {error, module(), Reason}</v>
@@ -1348,7 +1348,7 @@ Evaluates a predefined analysis.
       </desc>
     </func>
     <func>
-      <name>remove_release(Xref, Releases) -> ok | Error</name>
+      <name since="">remove_release(Xref, Releases) -> ok | Error</name>
       <fsummary>Remove releases and their applications and modules.</fsummary>
       <type>
         <v>Error = {error, module(), Reason}</v>
@@ -1363,7 +1363,7 @@ Evaluates a predefined analysis.
       </desc>
     </func>
     <func>
-      <name>replace_application(Xref, Application,  Directory [, Options]) -> {ok, application()} | Error</name>
+      <name since="">replace_application(Xref, Application,  Directory [, Options]) -> {ok, application()} | Error</name>
       <fsummary>Replace an application's modules.</fsummary>
       <type>
         <v>Application = application()</v>
@@ -1384,7 +1384,7 @@ Evaluates a predefined analysis.
       </desc>
     </func>
     <func>
-      <name>replace_module(Xref, Module, File [, Options]) ->  {ok, module()} | Error</name>
+      <name since="">replace_module(Xref, Module, File [, Options]) ->  {ok, module()} | Error</name>
       <fsummary>Replace an analyzed module.</fsummary>
       <type>
         <v>Error = {error, module(), Reason}</v>
@@ -1409,8 +1409,8 @@ Evaluates a predefined analysis.
       </desc>
     </func>
     <func>
-      <name>set_default(Xref, Option, Value) -> {ok, OldValue} | Error</name>
-      <name>set_default(Xref, OptionValues) -> ok | Error</name>
+      <name since="">set_default(Xref, Option, Value) -> {ok, OldValue} | Error</name>
+      <name since="">set_default(Xref, OptionValues) -> ok | Error</name>
       <fsummary>Set the default values of options.</fsummary>
       <type>
         <v>Error = {error, module(), Reason}</v>
@@ -1435,7 +1435,7 @@ Evaluates a predefined analysis.
       </desc>
     </func>
     <func>
-      <name>set_library_path(Xref, LibraryPath [, Options]) ->  ok | Error</name>
+      <name since="">set_library_path(Xref, LibraryPath [, Options]) ->  ok | Error</name>
       <fsummary>Set the library path and finds the library modules.</fsummary>
       <type>
         <v>Error = {error, module(), Reason}</v>
@@ -1469,7 +1469,7 @@ Evaluates a predefined analysis.
       </desc>
     </func>
     <func>
-      <name>start(NameOrOptions) -> Return</name>
+      <name since="">start(NameOrOptions) -> Return</name>
       <fsummary>Create an Xref server.</fsummary>
       <type>
         <v>NameOrOptions = Name | Options</v>
@@ -1487,7 +1487,7 @@ Evaluates a predefined analysis.
       </desc>
     </func>
     <func>
-      <name>start(Name, Options) -> Return</name>
+      <name since="">start(Name, Options) -> Return</name>
       <fsummary>Create an Xref server.</fsummary>
       <type>
         <v>Name = atom()</v>
@@ -1504,7 +1504,7 @@ Evaluates a predefined analysis.
       </desc>
     </func>
     <func>
-      <name>stop(Xref)</name>
+      <name since="">stop(Xref)</name>
       <fsummary>Delete an Xref server.</fsummary>
       <type>
         <v>Xref = xref()</v>
@@ -1514,7 +1514,7 @@ Evaluates a predefined analysis.
       </desc>
     </func>
     <func>
-      <name>update(Xref [, Options]) -> {ok, Modules} | Error</name>
+      <name since="">update(Xref [, Options]) -> {ok, Modules} | Error</name>
       <fsummary>Replace newly compiled analyzed modules.</fsummary>
       <type>
         <v>Error = {error, module(), Reason}</v>
@@ -1534,7 +1534,7 @@ Evaluates a predefined analysis.
       </desc>
     </func>
     <func>
-      <name>variables(Xref [, Options]) -> {ok, [VariableInfo]}</name>
+      <name since="">variables(Xref [, Options]) -> {ok, [VariableInfo]}</name>
       <fsummary>Return the names of variables.</fsummary>
       <type>
         <v>Options = [Option] | Option</v>
diff --git a/lib/tools/emacs/erlang-test.el b/lib/tools/emacs/erlang-test.el
index 2ee584d11a..fbdd298da3 100644
--- a/lib/tools/emacs/erlang-test.el
+++ b/lib/tools/emacs/erlang-test.el
@@ -50,8 +50,15 @@
 ;; The -L option adds a directory to the load-path.  It should be the
 ;; directory containing erlang.el and erlang-test.el.
 ;;
-;; 3. Call the script test-erlang-mode in this directory.  This script
-;; use the second method.
+;; 3. Run the emacs_SUITE.  The testcases tests_interpreted/1 and
+;; tests_compiled/1 in this suite are using the second method.  One
+;; way to run this suite is with the ct_run tool, for example like the
+;; following when standing at the OTP repo top directory:
+;;
+;; ct_run -suite lib/tools/test/emacs_SUITE
+;;
+;; Note that this creates a lot of html log files in the current
+;; directory.
 
 ;;; Code:
 
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index 3cbe9daa60..0b3a2319e2 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.1
+;; Version:  2.8.2
 ;; Package-Requires: ((emacs "24.1"))
 
 ;; %CopyrightBegin%
@@ -87,7 +87,7 @@
   "The Erlang programming language."
   :group 'languages)
 
-(defconst erlang-version "2.8.1"
+(defconst erlang-version "2.8.2"
   "The version number of Erlang mode.")
 
 (defcustom erlang-root-dir nil
@@ -502,6 +502,13 @@ regardless of where in the line point is when the TAB command is used."
   :type 'boolean
   :safe 'booleanp)
 
+(defcustom erlang-max-files-to-visit-for-refining-xrefs 32
+  "Upper limit how many files to visit for checking arity.
+When `nil' there is no limit."
+  :group 'erlang
+  :type '(restricted-sexp :match-alternatives (integerp 'nil))
+  :safe (lambda (val) (or (eq val nil) (integerp val))))
+
 (defvar erlang-man-inhibit (eq system-type 'windows-nt)
   "Inhibit the creation of the Erlang Manual Pages menu.
 
@@ -905,8 +912,10 @@ resulting regexp is surrounded by \\_< and \\_>."
       "dist_get_stat"
       "dist_ctrl_get_data"
       "dist_ctrl_get_data_notification"
+      "dist_ctrl_get_opt"
       "dist_ctrl_input_handler"
       "dist_ctrl_put_data"
+      "dist_ctrl_set_opt"
       "dmonitor_node"
       "dt_append_vm_tag_data"
       "dt_get_tag"
@@ -3687,10 +3696,13 @@ When an identifier is found return a list with 4 elements:
 module or nil.
 
 2. Module - Module name string or nil.  In case of a
-qualified-function a search fails if no entries with correct
-module are found.  For other kinds the module is just a
-preference.  If no matching entries are found the search will be
-retried without regard to module.
+qualified-function the module is explicitly specified (like
+module:fun()) and the search fails if no entries with correct
+module are found.  For other kinds the module is guessed: either
+fetched from import statements or it is assumed to be the local
+module.  In these cases the module is just a preference.  If no
+matching entries are found the search will be retried without
+regard to module.
 
 3. Name - String name of function, module, record or macro.
 
@@ -3702,18 +3714,22 @@ of arguments could be found, otherwise nil."
         (if (eq (char-syntax (following-char)) ? )
             (skip-chars-backward " \t"))
         (skip-chars-backward "[:word:]_:'")
-        (cond ((looking-at erlang-module-function-regexp)
+        (cond ((and (eq (preceding-char) ??)
+                    (looking-at (concat "\\(MODULE\\):" erlang-atom-regexp)))
+               (erlang-get-qualified-function-id-at-point (erlang-get-module)))
+              ((looking-at erlang-module-function-regexp)
                (erlang-get-qualified-function-id-at-point))
               ((looking-at (concat erlang-atom-regexp ":"))
                (erlang-get-module-id-at-point))
               ((looking-at erlang-name-regexp)
                (erlang-get-some-other-id-at-point)))))))
 
-(defun erlang-get-qualified-function-id-at-point ()
+(defun erlang-get-qualified-function-id-at-point (&optional module)
   (let ((kind 'qualified-function)
-        (module (erlang-remove-quotes
-                 (buffer-substring-no-properties
-                  (match-beginning 1) (match-end 1))))
+        (module (or module
+                    (erlang-remove-quotes
+                     (buffer-substring-no-properties
+                      (match-beginning 1) (match-end 1)))))
         (name (erlang-remove-quotes
                (buffer-substring-no-properties
                 (match-beginning (1+ erlang-atom-regexp-matches))
@@ -3823,7 +3839,8 @@ of arguments could be found, otherwise nil."
   (let ((case-fold-search nil)) ; force string matching to be case sensitive
     (if (and (stringp str)
              (not (string-match (eval-when-compile
-                                  (concat "\\`" erlang-atom-regexp "\\'")) str)))
+                                  (concat "\\`" erlang-atom-regexp "\\'"))
+                                str)))
         (progn
           (setq str (replace-regexp-in-string "'" "\\'" str t t ))
           (concat "'" str "'"))
@@ -4877,15 +4894,36 @@ about Erlang modules."
 ;; The backend below is a wrapper around the built-in etags backend.
 ;; It adds awareness of the module:tag syntax in a similar way that is
 ;; done above for the old etags commands.
+;;
+;; In addition arity is also considered when jumping to definitions.
+;; There is however currently no information about arity in the TAGS
+;; file.  Also two functions with the same name but different arity
+;; _sometimes_ get one TAGS entry each and sometimes are joined in one
+;; single entry.  If they are directly consecutive they will be
+;; joined.  If there are other functions etc in between then they will
+;; get one entry each.
+;;
+;; These limitations are present in both the etags program shipped
+;; with GNU Emacs and the tags.erl program in this repository.
+;;
+;; Therefore erlang.el must complement the information in TAGS by
+;; visiting files and checking arity.  When searching for popular
+;; function names (like init, handle_call etc) in a big TAGS file
+;; (like one indexing this repository) this may be quite
+;; time-consuming.  There exists therefore an upper limit for the
+;; number of files to visit (called
+;; `erlang-max-files-to-visit-for-refining-xrefs').
+;;
+;; As mentioned this xref implementation is based on the etags xref
+;; implementation.  But in the cases where arity is considered the
+;; etags information structures (class xref-etags-location) will be
+;; translated to our own structures which include arity (class
+;; erlang-xref-location).  This translation is started in the function
+;; `erlang-refine-xrefs'.
 
-(defvar erlang-current-arity nil
-  "The arity of the function currently being searched.
-
-There is no information about arity in the TAGS file.
-Consecutive functions with same name but different arity will
-only get one entry in the TAGS file.  Matching TAGS entries are
-therefore selected without regarding arity.  The arity is
-considered first when it is time to jump to the definition.")
+;; I mention this as a head up that some of the functions below deal
+;; with xref items with xref-etags-location and some deal with xref
+;; items with erlang-xref-location.
 
 (defun erlang-etags--xref-backend () 'erlang-etags)
 
@@ -4893,127 +4931,80 @@ considered first when it is time to jump to the definition.")
   (when (locate-library (symbol-name feature))
     (require feature)))
 
-(and (erlang-soft-require 'xref)
-     (erlang-soft-require 'cl-generic)
-     (erlang-soft-require 'eieio)
-     (erlang-soft-require 'etags)
-     ;; The purpose of using eval here is to avoid compilation
-     ;; warnings in emacsen without cl-defmethod etc.
-     (eval
-      '(progn
-         (cl-defmethod xref-backend-identifier-at-point
-             ((_backend (eql erlang-etags)))
-           (if (eq this-command 'xref-find-references)
-               (if (use-region-p)
-                   (buffer-substring-no-properties (region-beginning)
-                                                   (region-end))
-                 (thing-at-point 'symbol))
-             (erlang-id-to-string (erlang-get-identifier-at-point))))
-
-         (cl-defmethod xref-backend-definitions
-             ((_backend (eql erlang-etags)) identifier)
-           (erlang-xref-find-definitions identifier))
-
-         (cl-defmethod xref-backend-apropos
-             ((_backend (eql erlang-etags)) identifier)
-           (erlang-xref-find-definitions identifier t))
-
-         (cl-defmethod xref-backend-identifier-completion-table
-             ((_backend (eql erlang-etags)))
-           (let ((erlang-replace-etags-tags-completion-table t))
-             (tags-completion-table)))
-
-         (defclass erlang-xref-location (xref-etags-location) ())
-
-         (defun erlang-convert-xrefs (xrefs)
-           (mapcar (lambda (xref)
-                     (oset xref location (erlang-make-location
-                                          (oref xref location)))
-                     xref)
-                   xrefs))
-
-         (defun erlang-make-location (etags-location)
-           (with-slots (tag-info file) etags-location
-             (make-instance 'erlang-xref-location :tag-info tag-info
-                            :file file)))
-
-         (cl-defmethod xref-location-marker ((locus erlang-xref-location))
-           (with-slots (tag-info file) locus
-             (with-current-buffer (find-file-noselect file)
-               (save-excursion
-                 (or (erlang-goto-tag-location-by-arity tag-info)
-                     (etags-goto-tag-location tag-info))
-                 ;; Reset erlang-current-arity.  We want to jump to
-                 ;; correct arity in the first attempt.  That is now
-                 ;; done.  Possible remaining jumps will be from
-                 ;; entries in the *xref* buffer and then we want to
-                 ;; ignore the arity.  (Alternatively we could remove
-                 ;; all but one xref entry per file when we know the
-                 ;; arity).
-                 (setq erlang-current-arity nil)
-                 (point-marker)))))
-
-         (defun erlang-xref-context (xref)
-           (with-slots (tag-info) (xref-item-location xref)
-             (car tag-info))))))
-
-
-(defun erlang-goto-tag-location-by-arity (tag-info)
-  (when erlang-current-arity
-    (let* ((tag-text (car tag-info))
-           (tag-pos (cdr (cdr tag-info)))
-           (tag-line (car (cdr tag-info)))
-           (regexp (erlang-tag-info-regexp tag-text))
-           (startpos (or tag-pos
-                         (when tag-line
-                           (goto-char (point-min))
-                           (forward-line (1- tag-line))
-                           (point))
-                         (point-min))))
-      (setq startpos (max (- startpos 2000)
-                          (point-min)))
-      (goto-char startpos)
-      (let ((pos (or (erlang-search-by-arity regexp)
-                     (unless (eq startpos (point-min))
-                       (goto-char (point-min))
-                       (erlang-search-by-arity regexp)))))
-        (when pos
-          (goto-char pos)
-          t)))))
-
-(defun erlang-tag-info-regexp (tag-text)
-  (concat "^"
-          (regexp-quote tag-text)
-          ;; Erlang function entries in TAGS includes the opening
-          ;; parenthesis for the argument list.  Erlang macro entries
-          ;; do not.  Add it here in order to end up in correct
-          ;; position for erlang-get-arity.
-          (if (string-prefix-p "-define" tag-text)
-              "\\s-*("
-            "")))
-
-(defun erlang-search-by-arity (regexp)
-  (let (pos)
-    (while (and (null pos)
-                (re-search-forward regexp nil t))
-      (when (eq erlang-current-arity (save-excursion (erlang-get-arity)))
-        (setq pos (point-at-bol))))
-    pos))
-
-
+(when (and (erlang-soft-require 'xref)
+           (erlang-soft-require 'cl-generic)
+           (erlang-soft-require 'eieio)
+           (erlang-soft-require 'etags))
+  ;; The purpose of using eval here is to avoid compilation
+  ;; warnings in emacsen without cl-defmethod etc.
+  (eval
+   '(progn
+      (cl-defmethod xref-backend-identifier-at-point ((_backend
+                                                       (eql erlang-etags)))
+        (if (eq this-command 'xref-find-references)
+            (if (use-region-p)
+                (buffer-substring-no-properties (region-beginning)
+                                                (region-end))
+              (thing-at-point 'symbol))
+          (erlang-id-to-string (erlang-get-identifier-at-point))))
+
+      (cl-defmethod xref-backend-definitions ((_backend (eql erlang-etags))
+                                              identifier)
+        (erlang-xref-find-definitions identifier))
+
+      (cl-defmethod xref-backend-apropos ((_backend (eql erlang-etags))
+                                          identifier)
+        (erlang-xref-find-definitions identifier t))
+
+      (cl-defmethod xref-backend-identifier-completion-table
+        ((_backend (eql erlang-etags)))
+        (let ((erlang-replace-etags-tags-completion-table t))
+          (tags-completion-table)))
+
+      (defclass erlang-xref-location (xref-file-location)
+        ((arity :type fixnum :initarg :arity
+                :reader erlang-xref-location-arity))
+        :documentation "An erlang location is a file location plus arity.")
+
+      ;; This method definition only calls the superclass which is
+      ;; the default behaviour if it was not defined.  It is only
+      ;; needed for "upgrade" purposes.  In version 2.8.1 of
+      ;; erlang.el this method was defined differently and in case
+      ;; user switch to a new erlang.el without restarting Emacs
+      ;; this method needs to be redefined.
+      (cl-defmethod xref-location-marker ((locus erlang-xref-location))
+        (cl-call-next-method locus)))))
+
+;; If this function returns a single xref the user will jump to that
+;; directly.  If two or more xrefs are returned a *xref* window is
+;; displayed and the user can choose where to jump.  Hence we want to
+;; return a single xref when we are pretty sure that is where the user
+;; wants to go.  Otherwise return all possible xrefs but sort them so
+;; that xrefs in the local file is first and if arity is known sort
+;; the xrefs with matching arity before others.
+
+;; Note that the arity sorting work may partly be undone later when
+;; the hits are presented in the *xref* buffer since they then will be
+;; grouped together by file.  Ie when one file have one hit with
+;; correct arity and others with wrong arity these hits will be
+;; grouped together and may end up before hits with correct arity.
 (defun erlang-xref-find-definitions (identifier &optional is-regexp)
   (erlang-with-id (kind module name arity) identifier
-    (setq erlang-current-arity arity)
     (cond ((eq kind 'module)
            (erlang-xref-find-definitions-module name))
+          ((eq kind 'qualified-function)
+           (erlang-xref-find-definitions-qualified-function module
+                                                            name
+                                                            arity
+                                                            is-regexp))
           (module
-           (erlang-xref-find-definitions-module-tag module
+           (erlang-xref-find-definitions-module-tag kind
+                                                    module
                                                     name
-                                                    (eq kind
-                                                        'qualified-function)
+                                                    arity
                                                     is-regexp))
           (t
-           (erlang-xref-find-definitions-tag kind name is-regexp)))))
+           (erlang-xref-find-definitions-tag kind name arity is-regexp)))))
 
 (defun erlang-xref-find-definitions-module (module)
   (and (fboundp 'xref-make)
@@ -5038,65 +5029,252 @@ considered first when it is time to jump to the definition.")
                  (setq files (cdr files))))))
          (nreverse xrefs))))
 
-(defun erlang-visit-tags-table-buffer (cont cbuf)
-  (if (< emacs-major-version 26)
-      (visit-tags-table-buffer cont)
-    ;; Remove this with-no-warnings when Emacs 26 is the required
-    ;; version minimum.
-    (with-no-warnings
-      (visit-tags-table-buffer cont cbuf))))
-
-(defun erlang-xref-find-definitions-module-tag (module
+(defun erlang-xref-find-definitions-qualified-function (module
+                                                        tag
+                                                        arity
+                                                        is-regexp)
+  "Find definitions of TAG in MODULE preferably with arity ARITY.
+If one single perfect match was found return only that (ignoring
+other definitions matching TAG).  If IS-REGEXP is non-nil then
+TAG is a regexp."
+  (let* ((xrefs (when (fboundp 'etags--xref-find-definitions)
+                  (etags--xref-find-definitions tag is-regexp)))
+         (xrefs-split (erlang-split-xrefs-on-module xrefs module))
+         (module-xrefs (car xrefs-split))
+         (module-xrefs (erlang-refine-xrefs module-xrefs
+                                            'qualified-function
+                                            tag
+                                            is-regexp)))
+    (or (erlang-single-arity-match module-xrefs arity)
+        (erlang-sort-by-arity module-xrefs arity))))
+
+
+;; We will end up here when erlang-get-some-other-id-at-point either
+;; found module among the import statements or module is just the
+;; current local file.
+(defun erlang-xref-find-definitions-module-tag (kind
+                                                module
                                                 tag
-                                                is-qualified
+                                                arity
                                                 is-regexp)
-  "Find definitions of TAG and filter away definitions outside of
-MODULE.  If IS-QUALIFIED is nil and no definitions was found inside
-the MODULE then return any definitions found outside.  If
-IS-REGEXP is non-nil then TAG is a regexp."
-  (and (fboundp 'etags--xref-find-definitions)
-       (fboundp 'erlang-convert-xrefs)
-       (let ((xrefs (erlang-convert-xrefs
-                     (etags--xref-find-definitions tag is-regexp)))
-             xrefs-in-module)
-         (dolist (xref xrefs)
-           (when (string-equal module (erlang-xref-module xref))
-             (push xref xrefs-in-module)))
-         (cond (is-qualified xrefs-in-module)
-               (xrefs-in-module xrefs-in-module)
-               (t xrefs)))))
-
-(defun erlang-xref-find-definitions-tag (kind tag is-regexp)
-  "Find all definitions of TAG and reorder them so that
-definitions in the currently visited file comes first."
-  (and (fboundp 'etags--xref-find-definitions)
-       (fboundp 'erlang-convert-xrefs)
-       (let* ((current-file (and (buffer-file-name)
-                                 (file-truename (buffer-file-name))))
-              (regexp (erlang-etags-regexp kind tag is-regexp))
-              (xrefs (erlang-convert-xrefs
-                      (etags--xref-find-definitions regexp t)))
-              local-xrefs non-local-xrefs)
-         (while xrefs
-           (let ((xref (car xrefs)))
-             (if (string-equal (erlang-xref-truename-file xref)
-                               current-file)
-                 (push xref local-xrefs)
-               (push xref non-local-xrefs))
-             (setq xrefs (cdr xrefs))))
-         (append (reverse local-xrefs)
-                 (reverse non-local-xrefs)))))
+  "Find definitions of TAG preferably in MODULE and with arity ARITY.
+Return definitions outside MODULE if none are found inside.  If
+IS-REGEXP is non-nil then TAG is a regexp.
+
+If one single perfect match was found return only that (ignoring
+other definitions matching TAG)."
+  (let* ((xrefs (when (fboundp 'etags--xref-find-definitions)
+                  (etags--xref-find-definitions tag is-regexp)))
+         (xrefs-split (erlang-split-xrefs-on-module xrefs module))
+         (module-xrefs (car xrefs-split))
+         (module-xrefs (erlang-refine-xrefs module-xrefs
+                                            kind
+                                            tag
+                                            is-regexp)))
+    (or (erlang-single-arity-match module-xrefs arity)
+        (erlang-xref-find-definitions-tag kind tag arity is-regexp xrefs))))
+
+(defun erlang-xref-find-definitions-tag (kind
+                                         tag
+                                         arity
+                                         is-regexp
+                                         &optional xrefs)
+  "Find definitions of TAG preferably in local file and with arity ARITY.
+If one single perfect match was found return only that (ignoring
+other definitions matching TAG).  If no such local match was
+found then look for a matching BIF in the same way.  If IS-REGEXP
+is non-nil then TAG is a regexp."
+  (let* ((regexp (erlang-etags-regexp kind tag is-regexp))
+         (xrefs (or xrefs
+                    (when (fboundp 'etags--xref-find-definitions)
+                      (etags--xref-find-definitions regexp t))))
+         (xrefs-split (erlang-split-xrefs xrefs))
+         (local-xrefs (car xrefs-split))
+         (local-xrefs (erlang-refine-xrefs local-xrefs
+                                           kind
+                                           tag
+                                           is-regexp))
+         (bif-xrefs (cadr xrefs-split))
+         (other-xrefs (caddr xrefs-split)))
+    (or (erlang-single-arity-match local-xrefs arity)
+        ;; No local match, look for a matching BIF.
+        (progn
+          (setq bif-xrefs (erlang-refine-xrefs bif-xrefs
+                                               kind
+                                               tag
+                                               is-regexp))
+          (erlang-single-arity-match bif-xrefs arity))
+        (progn
+          (setq other-xrefs (erlang-refine-xrefs other-xrefs
+                                                 kind
+                                                 tag
+                                                 is-regexp))
+          (and (null local-xrefs)
+               (null bif-xrefs)
+               ;; No local of BIF matches at all.  Is there a single
+               ;; arity match among the rest?
+               (erlang-single-arity-match other-xrefs arity)))
+        (append (erlang-sort-by-arity local-xrefs arity)
+                (erlang-sort-by-arity bif-xrefs arity)
+                (erlang-sort-by-arity other-xrefs arity)))))
+
+
+(defun erlang-refine-xrefs (xrefs kind tag is-regexp)
+  (if (or (memq kind '(record module))
+          ;; No support for apropos here.
+          is-regexp
+          (erlang-too-many-files-in-xrefs xrefs))
+      xrefs
+    (when (and xrefs
+               (fboundp 'xref-item-location)
+               (fboundp 'xref-location-group)
+               (fboundp 'slot-value))
+      (let (files)
+        (cl-loop for xref in xrefs
+                 for loc = (xref-item-location xref)
+                 for file = (xref-location-group loc)
+                 do (pushnew file files :test 'string-equal))
+        (or (cl-loop for file in files
+                     append (erlang-xrefs-in-file file kind tag is-regexp))
+            ;; Failed for some reason.  Pretend like it is raining and
+            ;; return the unrefined xrefs.
+            xrefs)))))
+
+(defun erlang-too-many-files-in-xrefs (xrefs)
+  (and erlang-max-files-to-visit-for-refining-xrefs
+       (let ((files-to-visit (delete-dups
+                              (mapcar #'erlang-xref-truename-file
+                                      xrefs))))
+         (if (< (length files-to-visit)
+                erlang-max-files-to-visit-for-refining-xrefs)
+             nil
+           (message (concat "Too many hits to consider arity (see "
+                            "`erlang-max-files-to-visit-for-refining-xrefs')"))
+           t))))
+
+(defun erlang-xrefs-in-file (file kind tag is-regexp)
+  (when (fboundp 'make-instance)
+    (with-current-buffer (find-file-noselect file)
+      (save-excursion
+        (goto-char (point-min))
+        (let ((regexp (concat ; "^"
+                              (erlang-etags-regexp kind tag is-regexp)
+                              "\\s *("))
+              last-arity)
+          (cl-loop while (re-search-forward regexp nil t)
+                   for name = (match-string-no-properties 1)
+                   for arity = (save-excursion
+                                 (erlang-get-arity))
+                   for loc = (make-instance 'erlang-xref-location
+                                            :file file
+                                            :line (line-number-at-pos)
+                                            :column 0
+                                            :arity arity)
+                   for sum = (erlang-xref-summary kind name arity)
+                   when (and arity
+                             (not (eq arity last-arity)))
+                   collect (make-instance 'xref-item
+                                          :summary sum
+                                          :location loc)
+                   do (setq last-arity arity)))))))
+
+(defun erlang-xref-summary (kind tag arity)
+  (format "%s%s%s"
+          (if (memq kind '(record macro module))
+              (format "%s " kind)
+            "")
+          tag
+          (if arity (format "/%s" arity) "")))
+
+(defun erlang-single-arity-match (xrefs wanted-arity)
+  "Attempt to find one perfect match.
+
+If we have all information needed to consider arity then return a
+single perfect match or nothing.  If there are more than one
+match nothing is returned.
+
+If we don't have all information needed to consider arity just
+return XREFS as is."
+  (if (erlang-should-consider-arity-p xrefs wanted-arity)
+      (let ((nr-matches 0)
+            match)
+        (while (and xrefs
+                    (< nr-matches 2))
+          (let* ((xref (car xrefs))
+                 (arity (erlang-xref-arity xref)))
+            (when (eq arity wanted-arity)
+              (setq match xref
+                    nr-matches (1+ nr-matches)))
+            (setq xrefs (cdr xrefs))))
+        (when (eq nr-matches 1)
+          (list match)))
+    (when (eq (length xrefs) 1)
+      xrefs)))
+
+(defun erlang-sort-by-arity (xrefs wanted-arity)
+  (if (erlang-should-consider-arity-p xrefs wanted-arity)
+      (let (matches non-matches)
+        (while xrefs
+          (let* ((xref (car xrefs))
+                 (arity (erlang-xref-arity xref)))
+            (push xref (if (eq arity wanted-arity)
+                           matches
+                         non-matches))
+            (setq xrefs (cdr xrefs))))
+        (append (reverse matches) (reverse non-matches) xrefs))
+    xrefs))
+
+(defun erlang-should-consider-arity-p (xrefs wanted-arity)
+  (and wanted-arity
+       xrefs
+       (fboundp 'erlang-xref-location-p)
+       (fboundp 'xref-item-location)
+       (erlang-xref-location-p (xref-item-location (car xrefs)))))
 
 (defun erlang-etags-regexp (kind tag is-regexp)
-  (let ((tag-regexp (if is-regexp
-                        tag
-                      (regexp-quote tag))))
-    (cond ((eq kind 'record)
-           (concat "-record\\s-*(\\s-*" tag-regexp))
-          ((eq kind 'macro)
-           (concat "-define\\s-*(\\s-*" tag-regexp))
-          (t tag-regexp))))
-
+  (let ((tag-regexp (concat "\\("
+                            (if is-regexp
+                                tag
+                              (regexp-quote tag))
+                            "\\)")))
+    (concat (if is-regexp "" "^")
+            (cond ((eq kind 'record)
+                   (concat "-record\\s-*(\\s-*" tag-regexp))
+                  ((eq kind 'macro)
+                   (concat "-define\\s-*(\\s-*" tag-regexp))
+                  (t
+                   tag-regexp))
+            (if is-regexp "" "\\_>"))))
+
+(defun erlang-xref-arity (xref)
+  (and (fboundp 'erlang-xref-location-arity)
+       (fboundp 'xref-item-location)
+       (erlang-xref-location-arity (xref-item-location xref))))
+
+(defun erlang-split-xrefs-on-module (xrefs module)
+  (let (local-xrefs non-local-xrefs)
+    (dolist (xref xrefs)
+      (if (string-equal (erlang-xref-module xref)
+                        module)
+          (push xref local-xrefs)
+        (push xref non-local-xrefs)))
+    (cons (reverse local-xrefs)
+          (reverse non-local-xrefs))))
+
+(defun erlang-split-xrefs (xrefs)
+  (let ((current-file (and (buffer-file-name)
+                           (file-truename (buffer-file-name))))
+        local-xrefs bif-xrefs other-xrefs)
+    (dolist (xref xrefs)
+      (cond ((string-equal (erlang-xref-truename-file xref) current-file)
+             (push xref local-xrefs))
+            ((string-equal (erlang-xref-module xref) "erlang")
+             (push xref bif-xrefs))
+            (t
+             (push xref other-xrefs))))
+    (list (reverse local-xrefs)
+          (reverse bif-xrefs)
+          (reverse other-xrefs))))
 
 (defun erlang-xref-module (xref)
   (erlang-get-module-from-file-name (erlang-xref-file xref)))
@@ -5111,7 +5289,13 @@ definitions in the currently visited file comes first."
        (fboundp 'xref-item-location)
        (xref-location-group (xref-item-location xref))))
 
-
+(defun erlang-visit-tags-table-buffer (cont cbuf)
+  (if (< emacs-major-version 26)
+      (visit-tags-table-buffer cont)
+    ;; Remove this with-no-warnings when Emacs 26 is the required
+    ;; version minimum.
+    (with-no-warnings
+      (visit-tags-table-buffer cont cbuf))))
 
 ;;;
 ;;; Prepare for other methods to run an Erlang slave process.
diff --git a/lib/tools/emacs/erldoc.el b/lib/tools/emacs/erldoc.el
index 770ab299ee..bc16d7a14d 100644
--- a/lib/tools/emacs/erldoc.el
+++ b/lib/tools/emacs/erldoc.el
@@ -89,6 +89,13 @@ up the indexing."
   :type 'file
   :group 'erldoc)
 
+(defcustom erldoc-no-signature-function #'ignore
+  "Notification function called if no function signature was found."
+  :type '(choice (function-item :tag "Ignore" ignore)
+                 (function-item :tag "Warn" warn)
+                 (function-item :tag "Error" error))
+  :group 'erldoc)
+
 (defun erldoc-strip-string (s)
   (let* ((re "[ \t\n\r\f\v\u00a0]+")
          (from (if (string-match (concat "\\`" re) s) (match-end 0) 0))
@@ -212,11 +219,21 @@ up the indexing."
          ;; Get the full function signature.
          (when (and (eq (car-safe d) 'a)
                     (gethash (erldoc-dom-get-attribute d 'name) table))
-           (push (append (gethash (erldoc-dom-get-attribute d 'name) table)
-                         (list (funcall span-content
-                                        (or (erldoc-dom-get-element d 'span)
-                                            (cadr (memq d erldoc-dom-walk-siblings))))))
-                 entries))
+           (let* ((name (erldoc-dom-get-attribute d 'name))
+                  (mfa-url (gethash name table))
+                  (mfa (car mfa-url))
+                  (sig (or (funcall span-content d)
+                           (funcall span-content
+                                    (or (erldoc-dom-get-element d 'span)
+                                        (cadr
+                                         (memq d erldoc-dom-walk-siblings))))
+                           (progn
+                             (funcall erldoc-no-signature-function
+                                      "erldoc-parse-man: no sig for %s"
+                                      mfa)
+                             nil))))
+             (push (append mfa-url (list sig))
+                   entries)))
          ;; Get data types
          (when (and (eq (car-safe d) 'a)
                     (string-prefix-p "type-"
@@ -280,7 +297,7 @@ up the indexing."
             (unless (file-exists-p of)
               (erldoc-parse-all erldoc-man-index of))
             (unless (string= erldoc-output-file of)
-              (make-symbolic-link of erldoc-output-file))))
+              (make-symbolic-link (expand-file-name of) erldoc-output-file))))
         (setq erldoc-lookup-table
               (with-temp-buffer
                 (insert-file-contents erldoc-output-file)
@@ -356,9 +373,12 @@ up the indexing."
           (sigs))
       (maphash (lambda (k v)
                  (when (string-match re k)
-                   (push (cons (string-to-number (match-string 1 k))
-                               (cdr (erldoc-tokenize-signature (cadr v))))
-                         sigs)))
+                   (if (cadr v)
+                       (push (cons (string-to-number (match-string 1 k))
+                                   (cdr (erldoc-tokenize-signature (cadr v))))
+                             sigs)
+                     (funcall erldoc-no-signature-function
+                              "erldoc-format-signature: No sig for %s" k))))
                (erldoc-lookup-table))
       (when sigs
         ;; Mostly single return type but there are exceptions such as
diff --git a/lib/tools/priv/styles.css b/lib/tools/priv/styles.css
index e10e94e3ad..84f00be9fd 100644
--- a/lib/tools/priv/styles.css
+++ b/lib/tools/priv/styles.css
@@ -53,21 +53,25 @@ table thead {
   display: none;
 }
 table td.line,
+table td.line a,
 table td.hits {
   width: 20px;
   background: #eaeaea;
   text-align: center;
+  text-decoration: none;
   font-size: 11px;
   padding: 0 10px;
   color: #949494;
 }
 table td.hits {
   width: 10px;
+  text-align: right;
   padding: 2px 5px;
   color: rgba(0, 0, 0, 0.6);
   background-color: #f0f0f0;
 }
 tr.miss td.line,
+tr.miss td.line a,
 tr.miss td.hits {
   background-color: #ffdce0;
   border-color: #fdaeb7;
@@ -76,6 +80,7 @@ tr.miss td {
   background-color: #ffeef0;
 }
 tr.hit td.line,
+tr.hit td.line a,
 tr.hit td.hits {
   background-color: #cdffd8;
   border-color: #bef5cb;
diff --git a/lib/tools/src/cover.erl b/lib/tools/src/cover.erl
index d7269e3f27..2b3af417b6 100644
--- a/lib/tools/src/cover.erl
+++ b/lib/tools/src/cover.erl
@@ -23,6 +23,7 @@
 %% This module implements the Erlang coverage tool.
 %% 
 %% ARCHITECTURE
+%%
 %% The coverage tool consists of one process on each node involved in
 %% coverage analysis. The process is registered as 'cover_server'
 %% (?SERVER).  The cover_server on the 'main' node is in charge, and
@@ -30,45 +31,62 @@
 %% 'DOWN' message for another cover_server, it marks the node as
 %% 'lost'. If a nodeup is received for a lost node the main node
 %% ensures that the cover compiled modules are loaded again. If the
-%% remote node was alive during the disconnected periode, cover data
-%% for this periode will also be included in the analysis.
+%% remote node was alive during the disconnected period, cover data
+%% for this period will also be included in the analysis.
 %%
 %% The cover_server process on the main node is implemented by the
 %% functions init_main/1 and main_process_loop/1. The cover_server on
 %% the remote nodes are implemented by the functions init_remote/2 and
 %% remote_process_loop/1.
 %%
+%% COUNTERS
+%%
+%% The 'counters' modules is used for counting how many time each line
+%% executed. Each cover-compiled module will have its own array of
+%% counters.
+%%
+%% The counter reference for module Module is stored in a persistent
+%% term with the key {cover,Module}.
+%%
+%% When the cover:local_only/0 function has been called, the reference
+%% for the counter array will be compiled into each cover-compiled
+%% module directly (instead of retrieving it from a persistent term).
+%% That will be faster, but the resulting code can be only be used on
+%% the main node.
+%%
 %% TABLES
-%% Each nodes has two tables: cover_internal_data_table (?COVER_TABLE) and.
-%% cover_internal_clause_table (?COVER_CLAUSE_TABLE). 
-%% ?COVER_TABLE contains the bump data i.e. the data about which lines
-%% have been executed how many times.
+%%
+%% Each node has two tables: ?COVER_MAPPING_TABLE and ?COVER_CLAUSE_TABLE.
+%% ?COVER_MAPPING_TABLE maps from a #bump{} record to an index in the
+%% counter array for the module. It is used both during instrumentation
+%% of cover-compiled modules and when collecting the counter values.
+%%
 %% ?COVER_CLAUSE_TABLE contains information about which clauses in which modules
 %% cover is currently collecting statistics.
-%% 
-%% The main node owns tables named
-%% 'cover_collected_remote_data_table' (?COLLECTION_TABLE) and
-%% 'cover_collected_remote_clause_table' (?COLLECTION_CLAUSE_TABLE). 
-%% These tables contain data which is collected from remote nodes (either when a
-%% remote node is stopped with cover:stop/1 or when analysing). When
-%% analysing, data is even moved from the COVER tables on the main
-%% node to the COLLECTION tables.
 %%
-%% The main node also has a table named 'cover_binary_code_table'
-%% (?BINARY_TABLE). This table contains the binary code for each cover
-%% compiled module. This is necessary so that the code can be loaded
-%% on remote nodes that are started after the compilation.
+%% The main node owns the tables ?COLLECTION_TABLE and
+%% ?COLLECTION_CLAUSE_TABLE. The counter data is consolidated into those
+%% tables from the counters on both the main node and from remote nodes.
+%% This consolidation is done when a remote node is stopped with
+%% cover:stop/1 or just before starting an analysis.
+%%
+%% The main node also has a table named ?BINARY_TABLE. This table
+%% contains the abstract code code for each cover-compiled
+%% module. This is necessary so that the code can be loaded on remote
+%% nodes that are started after the compilation.
 %%
 %% PARALLELISM
+%%
 %% To take advantage of SMP when doing the cover analysis both the data 
 %% collection and analysis has been parallelized. One process is spawned for
 %% each node when collecting data, and on the remote node when collecting data
 %% one process is spawned per module. 
 %% 
-%% When analyzing data it is possible to issue multiple analyse(_to_file)/X 
-%% calls at once. They are however all calls (for backwards compatibility
-%% reasons) so the user of cover will have to spawn several processes to to the
-%% calls ( or use async_analyse_to_file ). 
+%% When analyzing data it is possible to issue multiple
+%% analyse(_to_file)/X calls at once. They are, however, all calls
+%% (for backwards compatibility reasons), so the user of cover will
+%% have to spawn several processes to to the calls (or use
+%% async_analyse_to_file/X).
 %%
 
 %% External exports
@@ -89,7 +107,8 @@
 	 modules/0, imported/0, imported_modules/0, which_nodes/0, is_compiled/1,
 	 reset/1, reset/0,
 	 flush/1,
-	 stop/0, stop/1]).
+	 stop/0, stop/1,
+         local_only/0]).
 -export([remote_start/1,get_main_node/0]).
 
 %% Used internally to ensure we upgrade the code to the latest version.
@@ -98,9 +117,16 @@
 -record(main_state, {compiled=[],           % [{Module,File}]
 		     imported=[],           % [{Module,File,ImportFile}]
 		     stopper,               % undefined | pid()
+                     local_only=false,      % true | false
 		     nodes=[],              % [Node]
 		     lost_nodes=[]}).       % [Node]
 
+-record(remote_data, {module,
+                      file,
+                      code,
+                      mapping,
+                      clauses}).
+
 -record(remote_state, {compiled=[],         % [{Module,File}]
 		       main_node}).         % atom()
 
@@ -126,11 +152,12 @@
 	       is_guard=false               % boolean
 	      }).
 
--define(COVER_TABLE, 'cover_internal_data_table').
+-define(COVER_MAPPING_TABLE, 'cover_internal_mapping_table').
 -define(COVER_CLAUSE_TABLE, 'cover_internal_clause_table').
 -define(BINARY_TABLE, 'cover_binary_code_table').
 -define(COLLECTION_TABLE, 'cover_collected_remote_data_table').
 -define(COLLECTION_CLAUSE_TABLE, 'cover_collected_remote_clause_table').
+
 -define(TAG, cover_compiled).
 -define(SERVER, cover_server).
 
@@ -169,6 +196,8 @@ start() ->
 		receive 
 		    {?SERVER,started} -> 
 			{ok,Pid};
+		    {?SERVER,{error,Error}} -> 
+			{error,Error};
 		    {'DOWN', Ref, _Type, _Object, Info} -> 
 			{error,Info}
 		end,
@@ -186,6 +215,11 @@ start(Node) when is_atom(Node) ->
 start(Nodes) ->
     call({start_nodes,remove_myself(Nodes,[])}).
 
+%% local_only() -> ok | {error,too_late}
+
+local_only() ->
+    call(local_only).
+
 %% compile(ModFiles) ->
 %% compile(ModFiles, Options) ->
 %% compile_module(ModFiles) -> Result
@@ -255,15 +289,8 @@ compile_directory(Dir, Options) when is_list(Dir), is_list(Options) ->
 
 compile_modules(Files,Options) ->
     Options2 = filter_options(Options),
-    %% compile_modules(Files,Options2,[]).
     call({compile, Files, Options2}).
 
-%% compile_modules([File|Files], Options, Result) ->
-%%     R = call({compile, File, Options}),
-%%     compile_modules(Files,Options,[R|Result]);
-%% compile_modules([],_Opts,Result) ->
-%%     lists:reverse(Result).
-
 filter_options(Options) ->
     lists:filter(fun(Option) ->
                          case Option of
@@ -561,16 +588,6 @@ flush(Nodes) ->
 get_main_node() ->
     call(get_main_node).
 
-%% bump(Module, Function, Arity, Clause, Line)
-%%   Module = Function = atom()
-%%   Arity = Clause = Line = integer()
-%% This function is inserted into Cover compiled modules, once for each
-%% executable line.
-%bump(Module, Function, Arity, Clause, Line) ->
-%    Key = #bump{module=Module, function=Function, arity=Arity, clause=Clause,
-%		line=Line},
-%    ets:update_counter(?COVER_TABLE, Key, 1).
-
 call(Request) ->
     Ref = erlang:monitor(process,?SERVER),
     receive {'DOWN', Ref, _Type, _Object, noproc} -> 
@@ -630,28 +647,54 @@ remote_reply(MainNode,Reply) ->
 %%%----------------------------------------------------------------------
 
 init_main(Starter) ->
-    register(?SERVER,self()),
-    %% Having write concurrancy here gives a 40% performance boost
-    %% when collect/1 is called. 
-    ?COVER_TABLE = ets:new(?COVER_TABLE, [set, public, named_table,
-                                          {write_concurrency, true}]),
-    ?COVER_CLAUSE_TABLE = ets:new(?COVER_CLAUSE_TABLE, [set, public,
-                                                        named_table]),
-    ?BINARY_TABLE = ets:new(?BINARY_TABLE, [set, public, named_table]),
-    ?COLLECTION_TABLE = ets:new(?COLLECTION_TABLE, [set, public,
-                                                    named_table]),
-    ?COLLECTION_CLAUSE_TABLE = ets:new(?COLLECTION_CLAUSE_TABLE, [set, public,
-                                                                  named_table]),
-    ok = net_kernel:monitor_nodes(true),
-    Starter ! {?SERVER,started},
-    main_process_loop(#main_state{}).
+    try register(?SERVER,self()) of
+        true ->
+            ?COVER_MAPPING_TABLE = ets:new(?COVER_MAPPING_TABLE,
+                                           [ordered_set, public, named_table]),
+            ?COVER_CLAUSE_TABLE = ets:new(?COVER_CLAUSE_TABLE, [set, public,
+                                                                named_table]),
+            ?BINARY_TABLE = ets:new(?BINARY_TABLE, [set, public, named_table]),
+            ?COLLECTION_TABLE = ets:new(?COLLECTION_TABLE, [set, public,
+                                                            named_table]),
+            ?COLLECTION_CLAUSE_TABLE = ets:new(?COLLECTION_CLAUSE_TABLE,
+                                               [set, public, named_table]),
+            ok = net_kernel:monitor_nodes(true),
+            Starter ! {?SERVER,started},
+            main_process_loop(#main_state{})
+    catch
+        error:badarg ->
+            %% The server's already registered; either report that it's already
+            %% started or try again if it died before we could find its pid.
+            case whereis(?SERVER) of
+                undefined ->
+                    init_main(Starter);
+                Pid ->
+                    Starter ! {?SERVER, {error, {already_started, Pid}}}
+            end
+    end.
 
 main_process_loop(State) ->
     receive
+        {From, local_only} ->
+            case State of
+                #main_state{compiled=[],nodes=[]} ->
+                    reply(From, ok),
+                    main_process_loop(State#main_state{local_only=true});
+                #main_state{} ->
+                    reply(From, {error,too_late}),
+                    main_process_loop(State)
+            end;
+
 	{From, {start_nodes,Nodes}} ->
-	    {StartedNodes,State1} = do_start_nodes(Nodes, State),
-	    reply(From, {ok,StartedNodes}),
-	    main_process_loop(State1);
+            case State#main_state.local_only of
+                false ->
+                    {StartedNodes,State1} = do_start_nodes(Nodes, State),
+                    reply(From, {ok,StartedNodes}),
+                    main_process_loop(State1);
+                true ->
+                    reply(From, {error,local_only}),
+                    main_process_loop(State)
+            end;
 
 	{From, {compile, Files, Options}} ->
 	    {R,S} = do_compile(Files, Options, State),
@@ -742,11 +785,12 @@ main_process_loop(State) ->
 	      end,
 	      State#main_state.nodes),
 	    reload_originals(State#main_state.compiled),
-            ets:delete(?COVER_TABLE),
+            ets:delete(?COVER_MAPPING_TABLE),
             ets:delete(?COVER_CLAUSE_TABLE),
             ets:delete(?BINARY_TABLE),
             ets:delete(?COLLECTION_TABLE),
             ets:delete(?COLLECTION_CLAUSE_TABLE),
+            delete_all_counters(),
             unregister(?SERVER),
 	    reply(From, ok);
 
@@ -878,10 +922,8 @@ main_process_loop(State) ->
 
 init_remote(Starter,MainNode) ->
     register(?SERVER,self()),
-    %% write_concurrency here makes otp_8270 break :(
-    ?COVER_TABLE = ets:new(?COVER_TABLE, [set, public, named_table
-                                          %,{write_concurrency, true}
-                                         ]),
+    ?COVER_MAPPING_TABLE = ets:new(?COVER_MAPPING_TABLE,
+                                   [ordered_set, public, named_table]),
     ?COVER_CLAUSE_TABLE = ets:new(?COVER_CLAUSE_TABLE, [set, public,
                                                         named_table]),
     Starter ! {self(),started},
@@ -904,7 +946,7 @@ remote_process_loop(State) ->
 	    remote_process_loop(State#remote_state{compiled=Compiled});
 
 	{remote,reset,Module} ->
-	    do_reset(Module),
+	    reset_counters(Module),
 	    remote_reply(State#remote_state.main_node, ok),
 	    remote_process_loop(State);
 
@@ -925,8 +967,9 @@ remote_process_loop(State) ->
 
 	{remote,stop} ->
 	    reload_originals(State#remote_state.compiled),
-	    ets:delete(?COVER_TABLE),
+	    ets:delete(?COVER_MAPPING_TABLE),
             ets:delete(?COVER_CLAUSE_TABLE),
+            delete_all_counters(),
             unregister(?SERVER),
 	    ok; % not replying since 'DOWN' message will be received anyway
 
@@ -961,28 +1004,12 @@ remote_process_loop(State) ->
     end.
 
 do_collect(Modules, CollectorPid, From) ->
-    _ = pmap(
-          fun(Module) ->
-                  Pattern = {#bump{module=Module, _='_'}, '$1'},
-                  MatchSpec = [{Pattern,[{'=/=','$1',0}],['$_']}],
-                  Match = ets:select(?COVER_TABLE,MatchSpec,?CHUNK_SIZE),
-                  send_chunks(Match, CollectorPid, [])
-          end,Modules),
+    _ = pmap(fun(Module) ->
+                     send_counters(Module, CollectorPid)
+             end, Modules),
     CollectorPid ! done,
     remote_reply(From, ok).
 
-send_chunks('$end_of_table', _CollectorPid, Mons) ->
-    get_downs(Mons);
-send_chunks({Chunk,Continuation}, CollectorPid, Mons) ->
-    Mon = spawn_monitor(
-	    fun() ->
-		    lists:foreach(fun({Bump,_N}) ->
-					  ets:insert(?COVER_TABLE, {Bump,0})
-				  end,
-				  Chunk) end),
-    send_chunk(CollectorPid,Chunk),
-    send_chunks(ets:select(Continuation), CollectorPid, [Mon|Mons]).
-
 send_chunk(CollectorPid,Chunk) ->
     CollectorPid ! {chunk,Chunk,self()},
     receive continue -> ok end.
@@ -1021,10 +1048,15 @@ do_reload_original(Module) ->
 	    ignore
     end.
 
-load_compiled([{Module,File,Binary,InitialTable}|Compiled],Acc) ->
-    %% Make sure the #bump{} records are available *before* the
-    %% module is loaded.
-    insert_initial_data(InitialTable),
+load_compiled([Data|Compiled],Acc) ->
+    %% Make sure the #bump{} records and counters are available *before*
+    %% compiling and loading the code.
+    #remote_data{module=Module,file=File,code=Beam,
+                 mapping=InitialMapping,clauses=InitialClauses} = Data,
+    ets:insert(?COVER_MAPPING_TABLE, InitialMapping),
+    ets:insert(?COVER_CLAUSE_TABLE, InitialClauses),
+    maybe_create_counters(Module, true),
+
     Sticky = case code:is_sticky(Module) of
                  true ->
                      code:unstick_mod(Module),
@@ -1032,7 +1064,7 @@ load_compiled([{Module,File,Binary,InitialTable}|Compiled],Acc) ->
                  false ->
                      false
              end,
-    NewAcc = case code:load_binary(Module, ?TAG, Binary) of
+    NewAcc = case code:load_binary(Module, ?TAG, Beam) of
                  {module,Module} ->
                      add_compiled(Module, File, Acc);
                  _  ->
@@ -1047,16 +1079,6 @@ load_compiled([{Module,File,Binary,InitialTable}|Compiled],Acc) ->
 load_compiled([],Acc) ->
     Acc.
 
-insert_initial_data([Item|Items]) when is_atom(element(1,Item)) ->
-    ets:insert(?COVER_CLAUSE_TABLE, Item),
-    insert_initial_data(Items);
-insert_initial_data([Item|Items]) ->
-    ets:insert(?COVER_TABLE, Item),
-    insert_initial_data(Items);
-insert_initial_data([]) ->
-    ok.
-    
-
 unload([Module|Modules]) ->
     do_clear(Module),
     do_reload_original(Module),
@@ -1177,7 +1199,7 @@ get_downs_r([]) ->
     [];
 get_downs_r(Mons) ->
     receive
-	{'DOWN', Ref, _Type, Pid, R={_,_,_,_}} ->
+	{'DOWN', Ref, _Type, Pid, #remote_data{}=R} ->
 	    [R|get_downs_r(lists:delete({Pid,Ref},Mons))];
 	{'DOWN', Ref, _Type, Pid, Reason} = Down ->
 	    case lists:member({Pid,Ref},Mons) of
@@ -1196,19 +1218,13 @@ get_downs_r(Mons) ->
 %% Binary is the beam code for the module and InitialTable is the initial
 %% data to insert in ?COVER_TABLE.
 get_data_for_remote_loading({Module,File}) ->
-    [{Module,Binary}] = ets:lookup(?BINARY_TABLE,Module),
+    [{Module,Code}] = ets:lookup(?BINARY_TABLE, Module),
     %%! The InitialTable list will be long if the module is big - what to do??
-    InitialBumps = ets:select(?COVER_TABLE,ms(Module)),
+    Mapping = counters_mapping_table(Module),
     InitialClauses = ets:lookup(?COVER_CLAUSE_TABLE,Module),
 
-    {Module,File,Binary,InitialBumps ++ InitialClauses}.
-
-%% Create a match spec which returns the clause info {Module,InitInfo} and 
-%% all #bump keys for the given module with 0 number of calls.
-ms(Module) ->
-    ets:fun2ms(fun({Key,_}) when Key#bump.module=:=Module -> 
-		       {Key,0}
-	       end).
+    #remote_data{module=Module,file=File,code=Code,
+                 mapping=Mapping,clauses=InitialClauses}.
 
 %% Unload modules on remote nodes
 remote_unload(Nodes,UnloadedModules) ->
@@ -1464,7 +1480,7 @@ get_compiled_still_loaded(Nodes,Compiled0) ->
 
 do_compile_beams(ModsAndFiles, State) ->
     Result0 = pmap(fun({ok,Module,File}) ->
-			  do_compile_beam(Module,File,State);
+			  do_compile_beam(Module, File, State);
 		     (Error) ->
 			  Error
 		  end,
@@ -1476,8 +1492,10 @@ do_compile_beams(ModsAndFiles, State) ->
 do_compile_beam(Module,BeamFile0,State) ->
     case get_beam_file(Module,BeamFile0,State#main_state.compiled) of
 	{ok,BeamFile} ->
+            LocalOnly = State#main_state.local_only,
 	    UserOptions = get_compile_options(Module,BeamFile),
-	    case do_compile_beam1(Module,BeamFile,UserOptions) of
+	    case do_compile_beam1(Module,BeamFile,
+                                  UserOptions,LocalOnly) of
 		{ok, Module} ->
 		    {ok,Module,BeamFile};
 		error ->
@@ -1503,41 +1521,39 @@ fix_state_and_result([],State,Acc) ->
 
 
 do_compile(Files, Options, State) ->
+    LocalOnly = State#main_state.local_only,
     Result0 = pmap(fun(File) ->
-			   do_compile(File, Options)
+			   do_compile1(File, Options, LocalOnly)
 		   end,
 		   Files),
     Compiled = [{M,F} || {ok,M,F} <- Result0],
     remote_load_compiled(State#main_state.nodes,Compiled),
     fix_state_and_result(Result0,State,[]).
 
-do_compile(File, Options) ->    
-    case do_compile1(File, Options) of
+do_compile1(File, Options, LocalOnly) ->
+    case do_compile2(File, Options, LocalOnly) of
 	{ok, Module} ->
 	    {ok,Module,File};
 	error ->
 	    {error,File}
     end.
 
-%% do_compile1(File, Options) -> {ok,Module} | error
-do_compile1(File, UserOptions) ->
+%% do_compile2(File, Options) -> {ok,Module} | error
+do_compile2(File, UserOptions, LocalOnly) ->
     Options = [debug_info,binary,report_errors,report_warnings] ++ UserOptions,
     case compile:file(File, Options) of
 	{ok, Module, Binary} ->
-	    do_compile_beam1(Module,Binary,UserOptions);
+	    do_compile_beam1(Module,Binary,UserOptions,LocalOnly);
 	error ->
 	    error
     end.
 
 %% Beam is a binary or a .beam file name
-do_compile_beam1(Module,Beam,UserOptions) ->
+do_compile_beam1(Module,Beam,UserOptions,LocalOnly) ->
     %% Clear database
     do_clear(Module),
     
-    %% Extract the abstract format and insert calls to bump/6 at
-    %% every executable line and, as a side effect, initiate
-    %% the database
-    
+    %% Extract the abstract format.
     case get_abstract_code(Module, Beam) of
 	no_abstract_code=E ->
 	    {error,E};
@@ -1547,7 +1563,8 @@ do_compile_beam1(Module,Beam,UserOptions) ->
             Forms0 = epp:interpret_file_attribute(Code),
 	    case find_main_filename(Forms0) of
 		{ok,MainFile} ->
-		    do_compile_beam2(Module,Beam,UserOptions,Forms0,MainFile);
+		    do_compile_beam2(Module,Beam,UserOptions,
+                                     Forms0,MainFile,LocalOnly);
 		Error ->
 		    Error
 	    end;
@@ -1566,26 +1583,35 @@ get_abstract_code(Module, Beam) ->
 	Error -> Error
     end.
 
-do_compile_beam2(Module,Beam,UserOptions,Forms0,MainFile) ->
-    {Forms,Vars} = transform(Forms0, Module, MainFile),
+do_compile_beam2(Module,Beam,UserOptions,Forms0,MainFile,LocalOnly) ->
+    init_counter_mapping(Module),
+
+    %% Instrument the abstract code by inserting
+    %% calls to update the counters.
+    {Forms,Vars} = transform(Forms0, Module, MainFile, LocalOnly),
+
+    %% Create counters.
+    maybe_create_counters(Module, not LocalOnly),
 
     %% We need to recover the source from the compilation
     %% info otherwise the newly compiled module will have
     %% source pointing to the current directory
     SourceInfo = get_source_info(Module, Beam),
 
-    %% Compile and load the result
+    %% Compile and load the result.
     %% It's necessary to check the result of loading since it may
-    %% fail, for example if Module resides in a sticky directory
-    {ok, Module, Binary} = compile:forms(Forms, SourceInfo ++ UserOptions),
+    %% fail, for example if Module resides in a sticky directory.
+    Options = SourceInfo ++ UserOptions,
+    {ok, Module, Binary} = compile:forms(Forms, Options),
+
     case code:load_binary(Module, ?TAG, Binary) of
 	{module, Module} ->
 
-	    %% Store info about all function clauses in database
+	    %% Store info about all function clauses in database.
 	    InitInfo = lists:reverse(Vars#vars.init_info),
 	    ets:insert(?COVER_CLAUSE_TABLE, {Module, InitInfo}),
 
-	    %% Store binary code so it can be loaded on remote nodes
+	    %% Store binary code so it can be loaded on remote nodes.
 	    ets:insert(?BINARY_TABLE, {Module, Binary}),
 
 	    {ok, Module};
@@ -1617,11 +1643,12 @@ get_compile_info(Module, Beam) ->
 		[]
     end.
 
-transform(Code, Module, MainFile) ->
+transform(Code, Module, MainFile, LocalOnly) ->
     Vars0 = #vars{module=Module},
-    {ok,MungedForms,Vars} = transform_2(Code,[],Vars0,MainFile,on),
+    {ok,MungedForms0,Vars} = transform_2(Code, [], Vars0, MainFile, on),
+    MungedForms = patch_code(Module, MungedForms0, LocalOnly),
     {MungedForms,Vars}.
-    
+
 %% Helpfunction which returns the first found file-attribute, which can
 %% be interpreted as the name of the main erlang source file.
 find_main_filename([{attribute,_,file,{MainFile,_}}|_]) ->
@@ -1788,19 +1815,7 @@ munge_body([Expr|Body], Vars, MungedBody, LastExprBumpLines) ->
             MungedExprs1 = [MungedExpr|MungedBody1],
 	    munge_body(Body, Vars3, MungedExprs1, NewBumps);
 	false ->
-	    ets:insert(?COVER_TABLE, {#bump{module   = Vars#vars.module,
-					    function = Vars#vars.function,
-					    arity    = Vars#vars.arity,
-					    clause   = Vars#vars.clause,
-					    line     = Line},
-				      0}),
             Bump = bump_call(Vars, Line),
-%	    Bump = {call, 0, {remote, 0, {atom,0,cover}, {atom,0,bump}},
-%		    [{atom, 0, Vars#vars.module},
-%		     {atom, 0, Vars#vars.function},
-%		     {integer, 0, Vars#vars.arity},
-%		     {integer, 0, Vars#vars.clause},
-%		     {integer, 0, Line}]},
 	    Lines2 = [Line|Lines],
 	    {MungedExpr, Vars2} = munge_expr(Expr, Vars#vars{lines=Lines2}),
             NewBumps = new_bumps(Vars2, Vars),
@@ -1855,8 +1870,10 @@ maybe_fix_last_expr(MungedExprs, Vars, LastExprBumpLines) ->
 
 last_expr_needs_fixing(Vars, LastExprBumpLines) ->
     case common_elems(Vars#vars.no_bump_lines, LastExprBumpLines) of
-        [Line] -> {yes, Line};
-        _ -> no
+        [Line] ->
+            {yes, Line};
+        _ ->
+            no
     end.
 
 fix_last_expr([MungedExpr|MungedExprs], Line, Vars) ->
@@ -1921,9 +1938,7 @@ fix_cls([Cl | Cls], Line, Bump) ->
 bumps_line(E, L) ->
     try bumps_line1(E, L) catch true -> true end.
 
-bumps_line1({call,_,{remote,_,{atom,_,ets},{atom,_,update_counter}},
-             [{atom,_,?COVER_TABLE},{tuple,_,[_,_,_,_,_,{integer,_,Line}]},_]},
-            Line) ->
+bumps_line1({'BUMP',Line,_}, Line) ->
     throw(true);
 bumps_line1([E | Es], Line) ->
     bumps_line1(E, Line),
@@ -1933,19 +1948,12 @@ bumps_line1(T, Line) when is_tuple(T) ->
 bumps_line1(_, _) ->
     false.
 
-%%% End of fix of last expression.
-
+%% Insert a place holder for the call to counters:add/3 in the
+%% abstract code.
 bump_call(Vars, Line) ->
-    A = erl_anno:new(0),
-    {call,A,{remote,A,{atom,A,ets},{atom,A,update_counter}},
-     [{atom,A,?COVER_TABLE},
-      {tuple,A,[{atom,A,?BUMP_REC_NAME},
-                {atom,A,Vars#vars.module},
-                {atom,A,Vars#vars.function},
-                {integer,A,Vars#vars.arity},
-                {integer,A,Vars#vars.clause},
-                {integer,A,Line}]},
-      {integer,A,1}]}.
+    {'BUMP',Line,counter_index(Vars, Line)}.
+
+%%% End of fix of last expression.
 
 munge_expr({match,Line,ExprL,ExprR}, Vars) ->
     {MungedExprL, Vars2} = munge_expr(ExprL, Vars),
@@ -2105,6 +2113,159 @@ subtract(L1, L2) ->
 common_elems(L1, L2) ->
     [E || E <- L1, lists:member(E, L2)].
 
+%%%--Counters------------------------------------------------------------
+
+init_counter_mapping(Mod) ->
+    true = ets:insert_new(?COVER_MAPPING_TABLE, {Mod,0}),
+    ok.
+
+counter_index(Vars, Line) ->
+    #vars{module=Mod,function=F,arity=A,clause=C} = Vars,
+    Key = #bump{module=Mod,function=F,arity=A,
+                clause=C,line=Line},
+    case ets:lookup(?COVER_MAPPING_TABLE, Key) of
+        [] ->
+            Index = ets:update_counter(?COVER_MAPPING_TABLE,
+                                       Mod, {2,1}),
+            true = ets:insert(?COVER_MAPPING_TABLE, {Key,Index}),
+            Index;
+        [{Key,Index}] ->
+            Index
+    end.
+
+%% Create the counter array and store as a persistent term.
+maybe_create_counters(Mod, true) ->
+    Cref = create_counters(Mod),
+    Key = {?MODULE,Mod},
+    persistent_term:put(Key, Cref),
+    ok;
+maybe_create_counters(_Mod, false) ->
+    ok.
+
+create_counters(Mod) ->
+    Size0 = ets:lookup_element(?COVER_MAPPING_TABLE, Mod, 2),
+    Size = max(1, Size0),                       %Size must not be 0.
+    Cref = counters:new(Size, [write_concurrency]),
+    ets:insert(?COVER_MAPPING_TABLE, {{counters,Mod},Cref}),
+    Cref.
+
+patch_code(Mod, Forms, false) ->
+    A = erl_anno:new(0),
+    AbstrKey = {tuple,A,[{atom,A,?MODULE},{atom,A,Mod}]},
+    patch_code1(Forms, {distributed,AbstrKey});
+patch_code(Mod, Forms, true) ->
+    Cref = create_counters(Mod),
+    AbstrCref = cid_to_abstract(Cref),
+    patch_code1(Forms, {local_only,AbstrCref}).
+
+%% Go through the abstract code and replace 'BUMP' forms
+%% with the actual code to increment the counters.
+patch_code1({'BUMP',_Line,Index}, {distributed,AbstrKey}) ->
+    %% Replace with counters:add(persistent_term:get(Key), Index, 1).
+    %% This code will work on any node.
+    A = element(2, AbstrKey),
+    GetCref = {call,A,{remote,A,{atom,A,persistent_term},{atom,A,get}},
+               [AbstrKey]},
+    {call,A,{remote,A,{atom,A,counters},{atom,A,add}},
+     [GetCref,{integer,A,Index},{integer,A,1}]};
+patch_code1({'BUMP',_Line,Index}, {local_only,AbstrCref}) ->
+    %% Replace with counters:add(Cref, Index, 1). This code
+    %% will only work on the local node.
+    A = element(2, AbstrCref),
+    {call,A,{remote,A,{atom,A,counters},{atom,A,add}},
+     [AbstrCref,{integer,A,Index},{integer,A,1}]};
+patch_code1({clauses,Cs}, Key) ->
+    {clauses,[patch_code1(El, Key) || El <- Cs]};
+patch_code1([_|_]=List, Key) ->
+    [patch_code1(El, Key) || El <- List];
+patch_code1(Tuple, Key) when tuple_size(Tuple) >= 3 ->
+    Acc = [element(2, Tuple),element(1, Tuple)],
+    patch_code_tuple(3, tuple_size(Tuple), Tuple, Key, Acc);
+patch_code1(Other, _Key) ->
+    Other.
+
+patch_code_tuple(I, Size, Tuple, Key, Acc) when I =< Size ->
+    El = patch_code1(element(I, Tuple), Key),
+    patch_code_tuple(I + 1, Size, Tuple, Key, [El|Acc]);
+patch_code_tuple(_I, _Size, _Tuple, _Key, Acc) ->
+    list_to_tuple(lists:reverse(Acc)).
+
+%% Don't try this at home! Assumes knowledge of the internal
+%% representation of a counter ref.
+cid_to_abstract(Cref0) ->
+    A = erl_anno:new(0),
+    %% Disable dialyzer warning for breaking opacity.
+    Cref = binary_to_term(term_to_binary(Cref0)),
+    {write_concurrency,Ref} = Cref,
+    {tuple,A,[{atom,A,write_concurrency},{integer,A,Ref}]}.
+
+%% Called on the remote node. Collect and send counters to
+%% the main node. Also zero the counters.
+send_counters(Mod, CollectorPid) ->
+    Process = fun(Chunk) -> send_chunk(CollectorPid, Chunk) end,
+    move_counters(Mod, Process).
+
+%% Called on the main node. Collect the counters and consolidate
+%% them into the collection table. Also zero the counters.
+move_counters(Mod) ->
+    move_counters(Mod, fun insert_in_collection_table/1).
+
+move_counters(Mod, Process) ->
+    Pattern = {#bump{module=Mod,_='_'},'_'},
+    Matches = ets:match_object(?COVER_MAPPING_TABLE, Pattern, ?CHUNK_SIZE),
+    Cref = get_counters_ref(Mod),
+    move_counters1(Matches, Cref, Process).
+
+move_counters1({Mappings,Continuation}, Cref, Process) ->
+    Move = fun({Key,Index}) ->
+                   Count = counters:get(Cref, Index),
+                   ok = counters:sub(Cref, Index, Count),
+                   {Key,Count}
+           end,
+    Process(lists:map(Move, Mappings)),
+    move_counters1(ets:match_object(Continuation), Cref, Process);
+move_counters1('$end_of_table', _Cref, _Process) ->
+    ok.
+
+counters_mapping_table(Mod) ->
+    Mapping = counters_mapping(Mod),
+    Cref = get_counters_ref(Mod),
+    #{size:=Size} = counters:info(Cref),
+    [{Mod,Size}|Mapping].
+
+get_counters_ref(Mod) ->
+    ets:lookup_element(?COVER_MAPPING_TABLE, {counters,Mod}, 2).
+
+counters_mapping(Mod) ->
+    Pattern = {#bump{module=Mod,_='_'},'_'},
+    ets:match_object(?COVER_MAPPING_TABLE, Pattern).
+
+clear_counters(Mod) ->
+    _ = persistent_term:erase({?MODULE,Mod}),
+    ets:delete(?COVER_MAPPING_TABLE, Mod),
+    Pattern = {#bump{module=Mod,_='_'},'_'},
+    _ = ets:match_delete(?COVER_MAPPING_TABLE, Pattern),
+    ok.
+
+%% Reset counters (set counters to 0).
+reset_counters(Mod) ->
+    Pattern = {#bump{module=Mod,_='_'},'$1'},
+    MatchSpec = [{Pattern,[],['$1']}],
+    Matches = ets:select(?COVER_MAPPING_TABLE,
+                         MatchSpec, ?CHUNK_SIZE),
+    Cref = get_counters_ref(Mod),
+    reset_counters1(Matches, Cref).
+
+reset_counters1({Indices,Continuation}, Cref) ->
+    _ = [counters:put(Cref, N, 0) || N <- Indices],
+    reset_counters1(ets:select(Continuation), Cref);
+reset_counters1('$end_of_table', _Cref) ->
+    ok.
+
+delete_all_counters() ->
+    _ = [persistent_term:erase(Key) || {?MODULE,_}=Key <- persistent_term:get()],
+    ok.
+
 %%%--Analysis------------------------------------------------------------
 
 %% Collect data for all modules
@@ -2140,20 +2301,7 @@ collect(Module,Clauses,Nodes) ->
 %% ?COLLECTION_TABLE. Resetting data in ?COVER_TABLE
 move_modules({Module,Clauses}) ->
     ets:insert(?COLLECTION_CLAUSE_TABLE,{Module,Clauses}),
-    Pattern = {#bump{module=Module, _='_'}, '_'},
-    MatchSpec = [{Pattern,[],['$_']}],
-    Match = ets:select(?COVER_TABLE,MatchSpec,?CHUNK_SIZE),
-    do_move_module(Match).
-    
-do_move_module({Bumps,Continuation}) ->
-    lists:foreach(fun({Key,Val}) ->
-			  ets:insert(?COVER_TABLE, {Key,0}),
-			  insert_in_collection_table(Key,Val)
-		  end,
-		  Bumps),
-    do_move_module(ets:select(Continuation));
-do_move_module('$end_of_table') ->
-    ok.
+    move_counters(Module).
 
 %% Given a .beam file, find the .erl file. Look first in same directory as
 %% the .beam file, then in ../src, then in compile info.
@@ -2563,11 +2711,13 @@ table_row(Line, L) ->
 table_data(Line, L, N) ->
    LineNoNL = Line -- "\n",
    ["<td class=\"line\" id=\"L",integer_to_list(L),"\">",
+    "<a href=\"#L",integer_to_list(L),"\">",
     integer_to_list(L),
-    "</td>\n",
+    "</a></td>\n",
    "<td class=\"hits\">",maybe_integer_to_list(N),"</td>\n",
    "<td class=\"source\"><code>",LineNoNL,"</code></td>\n</tr>\n"].
 
+maybe_integer_to_list(0) -> "<pre style=\"display: inline;\">:-(</pre>";
 maybe_integer_to_list(N) when is_integer(N) -> integer_to_list(N);
 maybe_integer_to_list(_) -> "".
 
@@ -2707,7 +2857,7 @@ get_term(Fd) ->
 
 %% Reset main node and all remote nodes
 do_reset_main_node(Module,Nodes) ->
-    do_reset(Module),
+    reset_counters(Module),
     do_reset_collection_table(Module),
     remote_reset(Module,Nodes).
 
@@ -2715,27 +2865,9 @@ do_reset_collection_table(Module) ->
     ets:delete(?COLLECTION_CLAUSE_TABLE,Module),
     ets:match_delete(?COLLECTION_TABLE, {#bump{module=Module},'_'}).
 
-%% do_reset(Module) -> ok
-%% The reset is done on ?CHUNK_SIZE number of bumps to avoid building
-%% long lists in the case of very large modules
-do_reset(Module) ->
-    Pattern = {#bump{module=Module, _='_'}, '$1'},
-    MatchSpec = [{Pattern,[{'=/=','$1',0}],['$_']}],
-    Match = ets:select(?COVER_TABLE,MatchSpec,?CHUNK_SIZE),
-    do_reset2(Match).
-
-do_reset2({Bumps,Continuation}) ->
-    lists:foreach(fun({Bump,_N}) ->
-			  ets:insert(?COVER_TABLE, {Bump,0})
-		  end,
-		  Bumps),
-    do_reset2(ets:select(Continuation));
-do_reset2('$end_of_table') ->
-    ok.    
-
 do_clear(Module) ->
     ets:match_delete(?COVER_CLAUSE_TABLE, {Module,'_'}),
-    ets:match_delete(?COVER_TABLE, {#bump{module=Module},'_'}),
+    clear_counters(Module),
     case lists:member(?COLLECTION_TABLE, ets:all()) of
 	true ->
 	    %% We're on the main node
diff --git a/lib/tools/src/tools.app.src b/lib/tools/src/tools.app.src
index f8c6aa22cb..f0e0fc4bec 100644
--- a/lib/tools/src/tools.app.src
+++ b/lib/tools/src/tools.app.src
@@ -21,11 +21,13 @@
  [{description, "DEVTOOLS  CXC 138 16"},
   {vsn, "%VSN%"},
   {modules, [cover,
+	     cprof,
 	     eprof,
 	     fprof,
 	     instrument,
 	     lcnt,
 	     make,
+	     tags,
 	     xref,
 	     xref_base,
 	     xref_compiler,
diff --git a/lib/tools/test/Makefile b/lib/tools/test/Makefile
index 2b7b17afb3..7a0a941ccc 100644
--- a/lib/tools/test/Makefile
+++ b/lib/tools/test/Makefile
@@ -32,6 +32,7 @@ MODULES =  \
 	make_SUITE \
 	tools_SUITE \
 	xref_SUITE \
+	prof_bench_SUITE \
 	ignore_cores
 
 ERL_FILES= $(MODULES:%=%.erl)
@@ -41,7 +42,7 @@ INSTALL_PROGS= $(TARGET_FILES)
 
 EMAKEFILE=Emakefile
 
-SPEC_FILES= tools.spec
+SPEC_FILES= tools.spec tools_bench.spec
 COVER_FILE = tools.cover
 
 # ----------------------------------------------------
diff --git a/lib/tools/test/cover_SUITE.erl b/lib/tools/test/cover_SUITE.erl
index 161b0105b9..462767f430 100644
--- a/lib/tools/test/cover_SUITE.erl
+++ b/lib/tools/test/cover_SUITE.erl
@@ -24,7 +24,8 @@
 -include_lib("common_test/include/ct.hrl").
 
 suite() ->
-    [{ct_hooks,[ts_install_cth]}].
+    [{ct_hooks,[ts_install_cth]},
+     {timetrap,{minutes,5}}].
 
 all() -> 
     NoStartStop = [eif,otp_5305,otp_5418,otp_7095,otp_8273,
@@ -35,7 +36,8 @@ 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_14817],
+                 otp_8270, otp_10979_hanging_node, otp_14817,
+                 local_only, startup_race],
     case whereis(cover_server) of
         undefined ->
             [coverage,StartStop ++ NoStartStop];
@@ -1742,6 +1744,65 @@ otp_13289(Config) ->
     ok = file:delete(File),
     ok.
 
+local_only(Config) ->
+    ok = file:set_cwd(proplists:get_value(data_dir, Config)),
+
+    %% Trying restricting to local nodes too late.
+    cover:start(),
+    {ok,a} = cover:compile(a),
+    [a] = cover:modules(),
+    {error,too_late} = cover:local_only(),
+    cover:stop(),
+
+    %% Now test local only mode.
+    cover:start(),
+    ok = cover:local_only(),
+    [] = cover:modules(),
+    {ok,a} = cover:compile(a),
+    [a] = cover:modules(),
+    done = a:start(5),
+    {ok, {a,{17,2}}} = cover:analyse(a, coverage, module),
+    {ok, [{{a,exit_kalle,0},{1,0}},
+          {{a,loop,3},{5,1}},
+          {{a,pong,1},{1,0}},
+          {{a,start,1},{6,0}},
+          {{a,stop,1},{0,1}},
+          {{a,trycatch,1},{4,0}}]} =
+        cover:analyse(a, coverage, function),
+
+    %% Make sure that it is not possible to run cover on
+    %% slave nodes.
+    {ok,Name} = test_server:start_node(?FUNCTION_NAME, slave, []),
+    {error,local_only} = cover:start([Name]),
+    test_server:stop_node(Name),
+    ok.
+
+%% ERL-943; We should not crash on startup when multiple servers race to
+%% register the server name.
+startup_race(Config) when is_list(Config) ->
+    PidRefs = [spawn_monitor(fun() ->
+                                     case cover:start() of
+                                         {error, {already_started, _Pid}} ->
+                                             ok;
+                                         {ok, _Pid} ->
+                                             ok
+                                     end
+                             end) || _<- lists:seq(1,8)],
+    startup_race_1(PidRefs).
+
+startup_race_1([{Pid, Ref} | PidRefs]) ->
+    receive
+        {'DOWN', Ref, process, Pid, normal} ->
+            startup_race_1(PidRefs);
+        {'DOWN', Ref, process, Pid, _Other} ->
+            ct:fail("Cover server crashed on startup.")
+    after 5000 ->
+            ct:fail("Timed out.")
+    end;
+startup_race_1([]) ->
+    cover:stop(),
+    ok.
+
 %%--Auxiliary------------------------------------------------------------
 
 analyse_expr(Expr, Config) ->
diff --git a/lib/tools/test/emacs_SUITE.erl b/lib/tools/test/emacs_SUITE.erl
index a6d43d1816..73270e6ed6 100644
--- a/lib/tools/test/emacs_SUITE.erl
+++ b/lib/tools/test/emacs_SUITE.erl
@@ -70,19 +70,20 @@ bif_highlight(Config) ->
 
 
 check_bif_highlight(Bin, Tag, Compare) ->
-    [_H,IntMatch,_T] =
+    [_H,Match,_T] =
         re:split(Bin,<<"defvar ",Tag/binary,
                        "[^(]*\\(([^)]*)">>,[]),
-    EmacsIntBifs = [list_to_atom(S) ||
-                  S <- string:tokens(binary_to_list(IntMatch)," '\"\n")],
+    EmacsBifs = [list_to_atom(S) ||
+                  S <- string:tokens(binary_to_list(Match)," '\"\n")],
 
-    ct:log("Emacs ~p",[EmacsIntBifs]),
-    ct:log("Int ~p",[Compare]),
+    ct:log("Comparing ~s", [Tag]),
+    ct:log("Emacs ~p",[EmacsBifs]),
+    ct:log("Erlang ~p",[Compare]),
 
-    ct:log("Diff1 ~p",[Compare -- EmacsIntBifs]),
-    ct:log("Diff2 ~p",[EmacsIntBifs -- Compare]),
-    [] = Compare -- EmacsIntBifs,
-    [] = EmacsIntBifs -- Compare.
+    ct:log("Only in Erlang ~p",[Compare -- EmacsBifs]),
+    ct:log("Only in Emacs ~p",[EmacsBifs -- Compare]),
+    [] = Compare -- EmacsBifs,
+    [] = EmacsBifs -- Compare.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -118,7 +119,7 @@ compile_and_load(_Config) ->
                                      false -> " "
                                  end,
                       emacs([Pedantic,
-                             " -f batch-byte-compile ",filename:join(Dir, File)]),
+                             " -f batch-byte-compile ", dquote(filename:join(Dir, File))]),
                       true
               end,
     lists:foreach(Compile, Files),
@@ -143,6 +144,10 @@ tests_compiled(_Config) ->
             ok
     end.
 
+
+dquote(Str) ->
+    "\"" ++ Str ++ "\"".
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 indent(Config) ->
@@ -188,7 +193,9 @@ diff(Orig, File) ->
     end.
 
 emacs_version_ok(AcceptVer) ->
-    case os:cmd("emacs --version | head -1") of
+    VersionLine = os:cmd("emacs --version | head -1"),
+    io:format("~s~n", [VersionLine]),
+    case VersionLine of
         "GNU Emacs " ++ Ver ->
             case string:to_float(Ver) of
                 {Vsn, _} when Vsn >= AcceptVer ->
@@ -204,14 +211,14 @@ emacs_version_ok(AcceptVer) ->
 emacs(EmacsCmds) when is_list(EmacsCmds) ->
     Cmd = ["emacs ",
            "--batch --quick ",
-           "--directory ", emacs_dir(), " ",
+           "--directory ", dquote(emacs_dir()), " ",
            "--eval \"(require 'erlang-start)\" "
            | EmacsCmds],
     Res0 = os:cmd(Cmd ++ " ; echo $?"),
     Rows = string:lexemes(Res0, ["\r\n", $\n]),
     Res = lists:last(Rows),
     Output = string:join(lists:droplast(Rows), "\n"),
-    io:format("Cmd ~s:~n  => ~s ~ts~n", [Cmd, Res, Output]),
+    io:format("Cmd ~ts:~n  => ~s ~ts~n", [Cmd, Res, Output]),
     "0" = Res,
     Output.
 
diff --git a/lib/tools/test/instrument_SUITE.erl b/lib/tools/test/instrument_SUITE.erl
index 8c521b2e1a..f474669836 100644
--- a/lib/tools/test/instrument_SUITE.erl
+++ b/lib/tools/test/instrument_SUITE.erl
@@ -77,6 +77,8 @@ allocations_ramv(Config) when is_list(Config) ->
 verify_allocations_disabled(_AllocType, Result) ->
     verify_allocations_disabled(Result).
 
+verify_allocations_disabled({ok, {_HistStart, _UnscannedBytes, Allocs}}) ->
+    true = Allocs =:= #{};
 verify_allocations_disabled({error, not_enabled}) ->
     ok.
 
@@ -91,6 +93,13 @@ verify_allocations_enabled(_AllocType, Result) ->
 verify_allocations_enabled({ok, {_HistStart, _UnscannedBytes, Allocs}}) ->
     true = Allocs =/= #{}.
 
+verify_allocations_output(#{}, {ok, {_, _, Allocs}}) when Allocs =:= #{} ->
+    %% This happens when the allocator is enabled but tagging is disabled. If
+    %% there's an error that causes Allocs to always be empty when enabled it
+    %% will be caught by verify_allocations_enabled.
+    ok;
+verify_allocations_output(#{}, {error, not_enabled}) ->
+    ok;
 verify_allocations_output(#{ histogram_start := HistStart,
                              histogram_width := HistWidth },
                     {ok, {HistStart, _UnscannedBytes, ByOrigin}}) ->
@@ -124,8 +133,6 @@ verify_allocations_output(#{ histogram_start := HistStart,
                     [BlockCount, GenTotalBlockCount])
     end,
 
-    ok;
-verify_allocations_output(#{}, {error, not_enabled}) ->
     ok.
 
 %% %% %% %% %% %%
@@ -214,7 +221,8 @@ verify_carriers_output(#{ histogram_start := HistStart,
             ct:fail("Carrier count is ~p, expected at least ~p (SBC).",
                 [CarrierCount, GenSBCCount]);
         CarrierCount >= GenSBCCount ->
-            ok
+            ct:pal("Found ~p carriers, required at least ~p (SBC)." ,
+                [CarrierCount, GenSBCCount])
     end,
 
     ok;
@@ -252,13 +260,18 @@ test_format(Options0, Gather, Verify) ->
 test_abort(Gather) ->
     %% There's no way for us to tell whether this actually aborted or ran to
     %% completion, but it might catch a few segfaults.
+    %% This testcase is mostly useful when run in an debug emulator as it needs
+    %% the modified reduction count to trigger the odd trap scenarios
     Runner = self(),
     Ref = make_ref(),
     spawn_opt(fun() ->
-                  [Gather({Type, SchedId, 1, 1, Ref}) ||
-                   Type <- erlang:system_info(alloc_util_allocators),
-                   SchedId <- lists:seq(0, erlang:system_info(schedulers))],
-                  Runner ! Ref
+                      [begin
+                           Ref2 = make_ref(),
+                           [Gather({Type, SchedId, 1, 1, Ref2}) ||
+                               Type <- erlang:system_info(alloc_util_allocators),
+                               SchedId <- lists:seq(0, erlang:system_info(schedulers))]
+                       end || _ <- lists:seq(1,100)],
+                      Runner ! Ref
               end, [{priority, max}]),
     receive
         Ref -> ok
@@ -292,9 +305,19 @@ start_slave(Args) ->
     MicroSecs = erlang:monotonic_time(),
     Name = "instr" ++ integer_to_list(MicroSecs),
     Pa = filename:dirname(code:which(?MODULE)),
-    {ok, Node} = test_server:start_node(list_to_atom(Name),
-                                        slave,
-                                        [{args, "-pa " ++ Pa ++ " " ++ Args}]),
+
+    %% We pass arguments through ZFLAGS as the nightly tests rotate
+    %% +Meamax/+Meamin which breaks the _enabled and _disabled tests unless
+    %% overridden.
+    ZFlags = os:getenv("ERL_ZFLAGS", ""),
+    {ok, Node} = try
+                     os:putenv("ERL_ZFLAGS", ZFlags ++ [" " | Args]),
+                     test_server:start_node(list_to_atom(Name),
+                                            slave,
+                                            [{args, "-pa " ++ Pa}])
+                 after
+                     os:putenv("ERL_ZFLAGS", ZFlags)
+                 end,
     Node.
 
 generate_test_blocks() ->
@@ -309,8 +332,9 @@ generate_test_blocks() ->
               MBCs = [<<I, 0:64/unit:8>> ||
                       I <- lists:seq(1, ?GENERATED_MBC_BLOCK_COUNT)],
               Runner ! Ref,
-              receive after infinity -> ok end,
-              unreachable ! {SBCs, MBCs}
+              receive
+                   gurka -> gaffel ! {SBCs, MBCs}
+              end
           end),
     receive
         Ref -> ok
diff --git a/lib/tools/test/prof_bench_SUITE.erl b/lib/tools/test/prof_bench_SUITE.erl
new file mode 100644
index 0000000000..50d0ba9cd9
--- /dev/null
+++ b/lib/tools/test/prof_bench_SUITE.erl
@@ -0,0 +1,126 @@
+%%
+%% %CopyrightBegin%
+%%
+%% 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.
+%% 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(prof_bench_SUITE).
+
+-include_lib("common_test/include/ct_event.hrl").
+
+%% Test server framework exports
+-export([all/0, suite/0, init_per_suite/1, end_per_suite/1]).
+
+-export([overhead/1]).
+
+%%%---------------------------------------------------------------------
+%%% Test suites
+%%%---------------------------------------------------------------------
+
+
+suite() ->
+    [{timetrap,{minutes,10}}].
+
+all() ->
+    [overhead].
+
+init_per_suite(Config) ->
+    case {test_server:is_native(fprof_SUITE) or
+          (lists:any(fun(M) -> test_server:is_native(M) end, modules())) or
+          (whereis(cover_server) =/= undefined),
+          erlang:system_info(wordsize)}
+    of
+        {true, _} -> {skip, "Native or cover code"};
+        {_, 4} -> {skip, "Can't run on 32-bit as files will be large"};
+        {false, 8} -> Config
+    end.
+
+end_per_suite(Config) ->
+    LogFile = filename:join(proplists:get_value(priv_dir, Config), "fprof.trace"),
+    file:delete(LogFile),
+    ok.
+
+%%%---------------------------------------------------------------------
+
+%% ct:run_test([{suite, prof_bench_SUITE}]).
+overhead(Config) ->
+    LogFile = filename:join(proplists:get_value(priv_dir, Config), "fprof.trace"),
+    SofsCopy = filename:join(proplists:get_value(data_dir, Config), "sofs_copy.erl"),
+    TC = fun() -> compile:file(SofsCopy, [binary]) end,
+    _Warmup = timer:tc(TC),
+
+    {NormTime,{ok, sofs_copy, _}} = timer:tc(TC),
+    {FProfTime,{ok,sofs_copy,_}} = fprof:apply(timer, tc, [TC], [{file, LogFile}]),
+    ct:pal("FProf: ~p Norm: ~p Ratio: ~p",[FProfTime, NormTime, NormTime / FProfTime * 100]),
+    {ok,{EProfTime,{ok,sofs_copy,_}}} = eprof:profile([], timer, tc, [TC]),
+    ct:pal("EProf: ~p Norm: ~p Ratio: ~p",[EProfTime, NormTime, NormTime / EProfTime * 100]),
+    {CProfTime,{ok,sofs_copy,_}} = cprof_apply(timer, tc, [TC]),
+    ct:pal("CProf: ~p Norm: ~p Ratio: ~p",[CProfTime, NormTime, NormTime / CProfTime * 100]),
+    {CoverTime,{ok,sofs_copy,_}} = cover_apply(timer, tc, [TC]),
+    ct:pal("Cover: ~p Norm: ~p Ratio: ~p",[CoverTime, NormTime, NormTime / CoverTime * 100]),
+
+    ct_event:notify(#event{name = benchmark_data,
+                           data = [{name, fprof_overhead},
+                                   {value, NormTime / FProfTime * 100}]}),
+    ct_event:notify(#event{name = benchmark_data,
+                           data = [{name, eprof_overhead},
+                                   {value, NormTime / EProfTime * 100}]}),
+    ct_event:notify(#event{name = benchmark_data,
+                           data = [{name, cprof_overhead},
+                                   {value, NormTime / CProfTime * 100}]}),
+    ct_event:notify(#event{name = benchmark_data,
+                           data = [{name, cover_overhead},
+                                   {value, NormTime / CoverTime * 100}]}).
+
+%% overhead(Config) ->
+%%     LogFile = filename:join(proplists:get_value(priv_dir, Config), "fprof.trace"),
+%%     SofsCopy = filename:join(proplists:get_value(data_dir, Config), "sofs_copy.erl"),
+%%     TC = fun() -> compile:file(SofsCopy, [binary]) end,
+%%     _Warmup = timer:tc(TC),
+
+%%     [{ok,{EProfTime,{ok,sofs_copy,_}}} = eprof:profile([], timer, tc, [TC])
+%%      || _ <- lists:seq(1,10)],
+%% %%    [fprof:apply(timer, tc, [TC], [{file, LogFile}]) || _ <- lists:seq(1,10)],
+%%     {FProfTime,{ok,sofs_copy,_}} = fprof:apply(timer, tc, [TC], [{file, LogFile}]),
+%%     {NormTime,{ok, sofs_copy, _}} = timer:tc(TC),
+
+    %% ct:pal("FProf: ~p Norm: ~p Ratio: ~p",[FProfTime, NormTime, FProfTime / NormTime]).
+
+cprof_apply(M, F, A) ->
+    cprof:start(),
+    Res = apply(M, F, A),
+    cprof:stop(),
+    Res.
+
+cover_apply(M, F, A) ->
+    cover:start(),
+    catch cover:local_only(),
+    Modules = modules(),
+    [code:unstick_mod(Mod) || Mod <- Modules],
+    cover:compile_beam(Modules),
+    [code:stick_mod(Mod) || Mod <- Modules],
+    Res = apply(M, F, A),
+    cover:stop(),
+    Res.
+
+modules() ->
+    application:load(compiler),
+    {ok, CompilerModules} = application:get_key(compiler, modules),
+    %% Only cover compile a subset of the stdlib modules
+    StdlibModules = [erl_parse, erl_expand_records, erl_lint, gb_trees, gb_sets, sofs,
+                     beam_lib, dict, epp, erl_anno, erl_bits,
+                     orddict, ordsets, sets, string, unicode, unicode_util],
+    CompilerModules ++ StdlibModules.
diff --git a/lib/tools/test/prof_bench_SUITE_data/sofs_copy.erl b/lib/tools/test/prof_bench_SUITE_data/sofs_copy.erl
new file mode 100644
index 0000000000..2a9b19177e
--- /dev/null
+++ b/lib/tools/test/prof_bench_SUITE_data/sofs_copy.erl
@@ -0,0 +1,2809 @@
+%%
+%% %CopyrightBegin%
+%%
+%% 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.
+%% 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(sofs_copy).
+
+-export([from_term/1, from_term/2, from_external/2, empty_set/0,
+         is_type/1, set/1, set/2, from_sets/1, relation/1, relation/2,
+         a_function/1, a_function/2, family/1, family/2,
+         to_external/1, type/1, to_sets/1, no_elements/1,
+         specification/2, union/2, intersection/2, difference/2,
+         symdiff/2, symmetric_partition/2, product/1, product/2,
+         constant_function/2, is_equal/2, is_subset/2, is_sofs_set/1,
+         is_set/1, is_empty_set/1, is_disjoint/2]).
+
+-export([union/1, intersection/1, canonical_relation/1]).
+
+-export([relation_to_family/1, domain/1, range/1, field/1,
+	 relative_product/1, relative_product/2, relative_product1/2,
+	 converse/1, image/2, inverse_image/2, strict_relation/1,
+	 weak_relation/1, extension/3, is_a_function/1]).
+
+-export([composite/2, inverse/1]).
+
+-export([restriction/2, restriction/3, drestriction/2, drestriction/3,
+         substitution/2, projection/2, partition/1, partition/2,
+         partition/3, multiple_relative_product/2, join/4]).
+
+-export([family_to_relation/1, family_specification/2,
+         union_of_family/1, intersection_of_family/1,
+         family_union/1, family_intersection/1,
+         family_domain/1, family_range/1, family_field/1,
+         family_union/2, family_intersection/2, family_difference/2,
+         partition_family/2, family_projection/2]).
+
+-export([family_to_digraph/1, family_to_digraph/2,
+         digraph_to_family/1, digraph_to_family/2]).
+
+%% Shorter names of some functions.
+-export([fam2rel/1, rel2fam/1]).
+
+-import(lists,
+        [any/2, append/1, flatten/1, foreach/2,
+         keysort/2, last/1, map/2, mapfoldl/3, member/2, merge/2,
+         reverse/1, reverse/2, sort/1, umerge/1, umerge/2, usort/1]).
+
+-compile({inline, [{family_to_relation,1}, {relation_to_family,1}]}).
+
+-compile({inline, [{rel,2},{a_func,2},{fam,2},{term2set,2}]}).
+
+-compile({inline, [{external_fun,1},{element_type,1}]}).
+
+-compile({inline,
+          [{unify_types,2}, {match_types,2},
+           {test_rel,3}, {symdiff,3},
+           {subst,3}]}).
+
+-compile({inline, [{fam_binop,3}]}).
+
+%% Nope, no is_member, del_member or add_member.
+%%
+%% See also "Naive Set Theory" by Paul R. Halmos.
+%%
+%% By convention, erlang:error/1 is called from exported functions.
+
+-define(TAG, 'Set').
+-define(ORDTAG, 'OrdSet').
+
+-record(?TAG, {data = [] :: list(), type = type :: term()}).
+-record(?ORDTAG, {orddata = {} :: tuple() | atom(),
+                  ordtype = type :: term()}).
+
+-define(LIST(S), (S)#?TAG.data).
+-define(TYPE(S), (S)#?TAG.type).
+-define(SET(L, T), #?TAG{data = L, type = T}).
+-define(IS_SET(S), is_record(S, ?TAG)).
+-define(IS_UNTYPED_SET(S), ?TYPE(S) =:= ?ANYTYPE).
+
+%% Ordered sets and atoms:
+-define(ORDDATA(S), (S)#?ORDTAG.orddata).
+-define(ORDTYPE(S), (S)#?ORDTAG.ordtype).
+-define(ORDSET(L, T), #?ORDTAG{orddata = L, ordtype = T}).
+-define(IS_ORDSET(S), is_record(S, ?ORDTAG)).
+-define(ATOM_TYPE, atom).
+-define(IS_ATOM_TYPE(T), is_atom(T)). % true for ?ANYTYPE...
+
+%% When IS_SET is true:
+-define(ANYTYPE, '_').
+-define(BINREL(X, Y), {X, Y}).
+-define(IS_RELATION(R), is_tuple(R)).
+-define(REL_ARITY(R), tuple_size(R)).
+-define(REL_TYPE(I, R), element(I, R)).
+-define(SET_OF(X), [X]).
+-define(IS_SET_OF(X), is_list(X)).
+-define(FAMILY(X, Y), ?BINREL(X, ?SET_OF(Y))).
+
+-export_type([anyset/0, binary_relation/0, external_set/0, a_function/0,
+              family/0, relation/0, set_of_sets/0, set_fun/0, spec_fun/0,
+              type/0]).
+-export_type([ordset/0, a_set/0]).
+
+-type(anyset() :: ordset() | a_set()).
+-type(binary_relation() :: relation()).
+-type(external_set() :: term()).
+-type(a_function() :: relation()).
+-type(family() :: a_function()).
+-opaque(ordset() :: #?ORDTAG{}).
+-type(relation() :: a_set()).
+-opaque(a_set() :: #?TAG{}).
+-type(set_of_sets() :: a_set()).
+-type(set_fun() :: pos_integer()
+                 | {external, fun((external_set()) -> external_set())}
+                 | fun((anyset()) -> anyset())).
+-type(spec_fun() :: {external, fun((external_set()) -> boolean())}
+                  | fun((anyset()) -> boolean())).
+-type(type() :: term()).
+
+-type(tuple_of(_T) :: tuple()).
+
+%%
+%%  Exported functions
+%%
+
+%%%
+%%% Create sets
+%%%
+
+-spec(from_term(Term) -> AnySet when
+      AnySet :: anyset(),
+      Term :: term()).
+from_term(T) ->
+    Type = case T of
+               _ when is_list(T) -> [?ANYTYPE];
+               _ -> ?ANYTYPE
+           end,
+    try setify(T, Type)
+    catch _:_ -> erlang:error(badarg)
+    end.
+
+-spec(from_term(Term, Type) -> AnySet when
+      AnySet :: anyset(),
+      Term :: term(),
+      Type :: type()).
+from_term(L, T) ->
+    case is_type(T) of
+        true ->
+            try setify(L, T)
+            catch _:_ -> erlang:error(badarg)
+            end;
+        false  ->
+            erlang:error(badarg)
+    end.
+
+-spec(from_external(ExternalSet, Type) -> AnySet when
+      ExternalSet :: external_set(),
+      AnySet :: anyset(),
+      Type :: type()).
+from_external(L, ?SET_OF(Type)) ->
+    ?SET(L, Type);
+from_external(T, Type) ->
+    ?ORDSET(T, Type).
+
+-spec(empty_set() -> Set when
+      Set :: a_set()).
+empty_set() ->
+    ?SET([], ?ANYTYPE).
+
+-spec(is_type(Term) -> Bool when
+      Bool :: boolean(),
+      Term :: term()).
+is_type(Atom) when ?IS_ATOM_TYPE(Atom), Atom =/= ?ANYTYPE ->
+    true;
+is_type(?SET_OF(T)) ->
+    is_element_type(T);
+is_type(T) when tuple_size(T) > 0 ->
+    is_types(tuple_size(T), T);
+is_type(_T) ->
+    false.
+
+-spec(set(Terms) -> Set when
+      Set :: a_set(),
+      Terms :: [term()]).
+set(L) ->
+    try usort(L) of
+        SL -> ?SET(SL, ?ATOM_TYPE)
+    catch _:_ -> erlang:error(badarg)
+    end.
+
+-spec(set(Terms, Type) -> Set when
+      Set :: a_set(),
+      Terms :: [term()],
+      Type :: type()).
+set(L, ?SET_OF(Type)) when ?IS_ATOM_TYPE(Type), Type =/= ?ANYTYPE ->
+    try usort(L) of
+        SL -> ?SET(SL, Type)
+    catch _:_ -> erlang:error(badarg)
+    end;
+set(L, ?SET_OF(_) = T) ->
+    try setify(L, T)
+    catch _:_ -> erlang:error(badarg)
+    end;
+set(_, _) ->
+    erlang:error(badarg).
+
+-spec(from_sets(ListOfSets) -> Set when
+      Set :: a_set(),
+      ListOfSets :: [anyset()];
+               (TupleOfSets) -> Ordset when
+      Ordset :: ordset(),
+      TupleOfSets :: tuple_of(anyset())).
+from_sets(Ss) when is_list(Ss) ->
+    case set_of_sets(Ss, [], ?ANYTYPE) of
+        {error, Error} ->
+            erlang:error(Error);
+        Set ->
+            Set
+    end;
+from_sets(Tuple) when is_tuple(Tuple) ->
+    case ordset_of_sets(tuple_to_list(Tuple), [], []) of
+        error ->
+            erlang:error(badarg);
+        Set ->
+            Set
+    end;
+from_sets(_) ->
+    erlang:error(badarg).
+
+-spec(relation(Tuples) -> Relation when
+      Relation :: relation(),
+      Tuples :: [tuple()]).
+relation([]) ->
+    ?SET([], ?BINREL(?ATOM_TYPE, ?ATOM_TYPE));
+relation(Ts = [T | _]) when is_tuple(T) ->
+    try rel(Ts, tuple_size(T))
+    catch _:_ -> erlang:error(badarg)
+    end;
+relation(_) ->
+    erlang:error(badarg).
+
+-spec(relation(Tuples, Type) -> Relation when
+      N :: integer(),
+      Type :: N | type(),
+      Relation :: relation(),
+      Tuples :: [tuple()]).
+relation(Ts, TS) ->
+    try rel(Ts, TS)
+    catch _:_ -> erlang:error(badarg)
+    end.
+
+-spec(a_function(Tuples) -> Function when
+      Function :: a_function(),
+      Tuples :: [tuple()]).
+a_function(Ts) ->
+    try func(Ts, ?BINREL(?ATOM_TYPE, ?ATOM_TYPE)) of
+        Bad when is_atom(Bad) ->
+            erlang:error(Bad);
+        Set ->
+            Set
+    catch _:_ -> erlang:error(badarg)
+    end.
+
+-spec(a_function(Tuples, Type) -> Function when
+      Function :: a_function(),
+      Tuples :: [tuple()],
+      Type :: type()).
+a_function(Ts, T) ->
+    try a_func(Ts, T) of
+	Bad when is_atom(Bad) ->
+	    erlang:error(Bad);
+	Set ->
+	    Set
+    catch _:_ -> erlang:error(badarg)
+    end.
+
+-spec(family(Tuples) -> Family when
+      Family :: family(),
+      Tuples :: [tuple()]).
+family(Ts) ->
+    try fam2(Ts, ?FAMILY(?ATOM_TYPE, ?ATOM_TYPE)) of
+        Bad when is_atom(Bad) ->
+            erlang:error(Bad);
+        Set ->
+	    Set
+    catch _:_ -> erlang:error(badarg)
+    end.
+
+-spec(family(Tuples, Type) -> Family when
+      Family :: family(),
+      Tuples :: [tuple()],
+      Type :: type()).
+family(Ts, T) ->
+    try fam(Ts, T) of
+	Bad when is_atom(Bad) ->
+	    erlang:error(Bad);
+	Set ->
+	    Set
+    catch _:_ -> erlang:error(badarg)
+    end.
+
+%%%
+%%% Functions on sets.
+%%%
+
+-spec(to_external(AnySet) -> ExternalSet when
+      ExternalSet :: external_set(),
+      AnySet :: anyset()).
+to_external(S) when ?IS_SET(S) ->
+    ?LIST(S);
+to_external(S) when ?IS_ORDSET(S) ->
+    ?ORDDATA(S).
+
+-spec(type(AnySet) -> Type when
+      AnySet :: anyset(),
+      Type :: type()).
+type(S) when ?IS_SET(S) ->
+    ?SET_OF(?TYPE(S));
+type(S) when ?IS_ORDSET(S) ->
+    ?ORDTYPE(S).
+
+-spec(to_sets(ASet) -> Sets when
+      ASet :: a_set() | ordset(),
+      Sets :: tuple_of(AnySet) | [AnySet],
+      AnySet :: anyset()).
+to_sets(S) when ?IS_SET(S) ->
+    case ?TYPE(S) of
+        ?SET_OF(Type) -> list_of_sets(?LIST(S), Type, []);
+        Type -> list_of_ordsets(?LIST(S), Type, [])
+    end;
+to_sets(S) when ?IS_ORDSET(S), is_tuple(?ORDTYPE(S)) ->
+    tuple_of_sets(tuple_to_list(?ORDDATA(S)), tuple_to_list(?ORDTYPE(S)), []);
+to_sets(S) when ?IS_ORDSET(S) ->
+    erlang:error(badarg).
+
+-spec(no_elements(ASet) -> NoElements when
+      ASet :: a_set() | ordset(),
+      NoElements :: non_neg_integer()).
+no_elements(S) when ?IS_SET(S) ->
+    length(?LIST(S));
+no_elements(S) when ?IS_ORDSET(S), is_tuple(?ORDTYPE(S)) ->
+    tuple_size(?ORDDATA(S));
+no_elements(S) when ?IS_ORDSET(S) ->
+    erlang:error(badarg).
+
+-spec(specification(Fun, Set1) -> Set2 when
+      Fun :: spec_fun(),
+      Set1 :: a_set(),
+      Set2 :: a_set()).
+specification(Fun, S) when ?IS_SET(S) ->
+    Type = ?TYPE(S),
+    R = case external_fun(Fun) of
+	    false ->
+		spec(?LIST(S), Fun, element_type(Type), []);
+	    XFun ->
+		specification(?LIST(S), XFun, [])
+	end,
+    case R of
+	SL when is_list(SL) ->
+	    ?SET(SL, Type);
+	Bad ->
+	    erlang:error(Bad)
+    end.
+
+-spec(union(Set1, Set2) -> Set3 when
+      Set1 :: a_set(),
+      Set2 :: a_set(),
+      Set3 :: a_set()).
+union(S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
+    case unify_types(?TYPE(S1), ?TYPE(S2)) of
+        [] -> erlang:error(type_mismatch);
+        Type ->  ?SET(umerge(?LIST(S1), ?LIST(S2)), Type)
+    end.
+
+-spec(intersection(Set1, Set2) -> Set3 when
+      Set1 :: a_set(),
+      Set2 :: a_set(),
+      Set3 :: a_set()).
+intersection(S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
+    case unify_types(?TYPE(S1), ?TYPE(S2)) of
+        [] -> erlang:error(type_mismatch);
+        Type ->  ?SET(intersection(?LIST(S1), ?LIST(S2), []), Type)
+    end.
+
+-spec(difference(Set1, Set2) -> Set3 when
+      Set1 :: a_set(),
+      Set2 :: a_set(),
+      Set3 :: a_set()).
+difference(S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
+    case unify_types(?TYPE(S1), ?TYPE(S2)) of
+        [] -> erlang:error(type_mismatch);
+        Type ->  ?SET(difference(?LIST(S1), ?LIST(S2), []), Type)
+    end.
+
+-spec(symdiff(Set1, Set2) -> Set3 when
+      Set1 :: a_set(),
+      Set2 :: a_set(),
+      Set3 :: a_set()).
+symdiff(S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
+    case unify_types(?TYPE(S1), ?TYPE(S2)) of
+        [] -> erlang:error(type_mismatch);
+        Type ->  ?SET(symdiff(?LIST(S1), ?LIST(S2), []), Type)
+    end.
+
+-spec(symmetric_partition(Set1, Set2) -> {Set3, Set4, Set5} when
+      Set1 :: a_set(),
+      Set2 :: a_set(),
+      Set3 :: a_set(),
+      Set4 :: a_set(),
+      Set5 :: a_set()).
+symmetric_partition(S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
+    case unify_types(?TYPE(S1), ?TYPE(S2)) of
+        [] -> erlang:error(type_mismatch);
+        Type ->  sympart(?LIST(S1), ?LIST(S2), [], [], [], Type)
+    end.
+
+-spec(product(Set1, Set2) -> BinRel when
+      BinRel :: binary_relation(),
+      Set1 :: a_set(),
+      Set2 :: a_set()).
+product(S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
+    if
+        ?TYPE(S1) =:= ?ANYTYPE -> S1;
+        ?TYPE(S2) =:= ?ANYTYPE -> S2;
+        true ->
+	    F = fun(E) -> {0, E} end,
+	    T = ?BINREL(?TYPE(S1), ?TYPE(S2)),
+	    ?SET(relprod(map(F, ?LIST(S1)), map(F, ?LIST(S2))), T)
+    end.
+
+-spec(product(TupleOfSets) -> Relation when
+      Relation :: relation(),
+      TupleOfSets :: tuple_of(a_set())).
+product({S1, S2}) ->
+    product(S1, S2);
+product(T) when is_tuple(T) ->
+    Ss = tuple_to_list(T),
+    try sets_to_list(Ss) of
+        [] ->
+            erlang:error(badarg);
+        L ->
+            Type = types(Ss, []),
+            case member([], L) of
+                true ->
+		    empty_set();
+                false ->
+                    ?SET(reverse(prod(L, [], [])), Type)
+            end
+    catch _:_ -> erlang:error(badarg)
+    end.
+
+-spec(constant_function(Set, AnySet) -> Function when
+      AnySet :: anyset(),
+      Function :: a_function(),
+      Set :: a_set()).
+constant_function(S, E) when ?IS_SET(S) ->
+    case {?TYPE(S), is_sofs_set(E)} of
+	{?ANYTYPE, true} -> S;
+	{Type, true} ->
+	    NType = ?BINREL(Type, type(E)),
+	    ?SET(constant_function(?LIST(S), to_external(E), []), NType);
+	_ -> erlang:error(badarg)
+    end;
+constant_function(S, _) when ?IS_ORDSET(S) ->
+    erlang:error(badarg).
+
+-spec(is_equal(AnySet1, AnySet2) -> Bool when
+      AnySet1 :: anyset(),
+      AnySet2 :: anyset(),
+      Bool :: boolean()).
+is_equal(S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
+    case match_types(?TYPE(S1), ?TYPE(S2)) of
+        true  -> ?LIST(S1) == ?LIST(S2);
+        false -> erlang:error(type_mismatch)
+    end;
+is_equal(S1, S2) when ?IS_ORDSET(S1), ?IS_ORDSET(S2) ->
+    case match_types(?ORDTYPE(S1), ?ORDTYPE(S2)) of
+        true  -> ?ORDDATA(S1) == ?ORDDATA(S2);
+        false -> erlang:error(type_mismatch)
+    end;
+is_equal(S1, S2) when ?IS_SET(S1), ?IS_ORDSET(S2) ->
+    erlang:error(type_mismatch);
+is_equal(S1, S2) when ?IS_ORDSET(S1), ?IS_SET(S2) ->
+    erlang:error(type_mismatch).
+
+-spec(is_subset(Set1, Set2) -> Bool when
+      Bool :: boolean(),
+      Set1 :: a_set(),
+      Set2 :: a_set()).
+is_subset(S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
+    case match_types(?TYPE(S1), ?TYPE(S2)) of
+        true  -> subset(?LIST(S1), ?LIST(S2));
+        false -> erlang:error(type_mismatch)
+    end.
+
+-spec(is_sofs_set(Term) -> Bool when
+      Bool :: boolean(),
+      Term :: term()).
+is_sofs_set(S) when ?IS_SET(S) ->
+    true;
+is_sofs_set(S) when ?IS_ORDSET(S) ->
+    true;
+is_sofs_set(_S) ->
+    false.
+
+-spec(is_set(AnySet) -> Bool when
+      AnySet :: anyset(),
+      Bool :: boolean()).
+is_set(S) when ?IS_SET(S) ->
+    true;
+is_set(S) when ?IS_ORDSET(S) ->
+    false.
+
+-spec(is_empty_set(AnySet) -> Bool when
+      AnySet :: anyset(),
+      Bool :: boolean()).
+is_empty_set(S) when ?IS_SET(S) ->
+    ?LIST(S) =:= [];
+is_empty_set(S) when ?IS_ORDSET(S) ->
+    false.
+
+-spec(is_disjoint(Set1, Set2) -> Bool when
+      Bool :: boolean(),
+      Set1 :: a_set(),
+      Set2 :: a_set()).
+is_disjoint(S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
+    case match_types(?TYPE(S1), ?TYPE(S2)) of
+        true ->
+            case ?LIST(S1) of
+                [] -> true;
+                [A | As] -> disjoint(?LIST(S2), A, As)
+            end;
+        false -> erlang:error(type_mismatch)
+    end.
+
+%%%
+%%% Functions on set-of-sets.
+%%%
+
+-spec(union(SetOfSets) -> Set when
+      Set :: a_set(),
+      SetOfSets :: set_of_sets()).
+union(Sets) when ?IS_SET(Sets) ->
+    case ?TYPE(Sets) of
+        ?SET_OF(Type) -> ?SET(lunion(?LIST(Sets)), Type);
+        ?ANYTYPE -> Sets;
+        _ -> erlang:error(badarg)
+    end.
+
+-spec(intersection(SetOfSets) -> Set when
+      Set :: a_set(),
+      SetOfSets :: set_of_sets()).
+intersection(Sets) when ?IS_SET(Sets) ->
+    case ?LIST(Sets) of
+        [] -> erlang:error(badarg);
+        [L | Ls] ->
+            case ?TYPE(Sets) of
+                ?SET_OF(Type) ->
+                    ?SET(lintersection(Ls, L), Type);
+                _ -> erlang:error(badarg)
+            end
+    end.
+
+-spec(canonical_relation(SetOfSets) -> BinRel when
+      BinRel :: binary_relation(),
+      SetOfSets :: set_of_sets()).
+canonical_relation(Sets) when ?IS_SET(Sets) ->
+    ST = ?TYPE(Sets),
+    case ST of
+        ?SET_OF(?ANYTYPE) -> empty_set();
+        ?SET_OF(Type) ->
+            ?SET(can_rel(?LIST(Sets), []), ?BINREL(Type, ST));
+        ?ANYTYPE -> Sets;
+        _ -> erlang:error(badarg)
+    end.
+
+%%%
+%%% Functions on binary relations only.
+%%%
+
+-spec(rel2fam(BinRel) -> Family when
+      Family :: family(),
+      BinRel :: binary_relation()).
+rel2fam(R) ->
+    relation_to_family(R).
+
+-spec(relation_to_family(BinRel) -> Family when
+      Family :: family(),
+      BinRel :: binary_relation()).
+%% Inlined.
+relation_to_family(R) when ?IS_SET(R) ->
+    case ?TYPE(R) of
+        ?BINREL(DT, RT) ->
+            ?SET(rel2family(?LIST(R)), ?FAMILY(DT, RT));
+        ?ANYTYPE -> R;
+        _Else    -> erlang:error(badarg)
+    end.
+
+-spec(domain(BinRel) -> Set when
+      BinRel :: binary_relation(),
+      Set :: a_set()).
+domain(R) when ?IS_SET(R) ->
+    case ?TYPE(R) of
+        ?BINREL(DT, _)  -> ?SET(dom(?LIST(R)), DT);
+        ?ANYTYPE -> R;
+        _Else    -> erlang:error(badarg)
+    end.
+
+-spec(range(BinRel) -> Set when
+      BinRel :: binary_relation(),
+      Set :: a_set()).
+range(R) when ?IS_SET(R) ->
+    case ?TYPE(R) of
+        ?BINREL(_, RT)  -> ?SET(ran(?LIST(R),  []), RT);
+        ?ANYTYPE -> R;
+        _ -> erlang:error(badarg)
+    end.
+
+-spec(field(BinRel) -> Set when
+      BinRel :: binary_relation(),
+      Set :: a_set()).
+%% In "Introduction to LOGIC", Suppes defines the field of a binary
+%% relation to be the union of the domain and the range (or
+%% counterdomain).
+field(R) ->
+    union(domain(R), range(R)).
+
+-spec(relative_product(ListOfBinRels) -> BinRel2 when
+      ListOfBinRels :: [BinRel, ...],
+      BinRel :: binary_relation(),
+      BinRel2 :: binary_relation()).
+%% The following clause is kept for backward compatibility.
+%% The list is due to Dialyzer's specs.
+relative_product(RT) when is_tuple(RT) ->
+    relative_product(tuple_to_list(RT));
+relative_product(RL) when is_list(RL) ->
+    case relprod_n(RL, foo, false, false) of
+        {error, Reason} ->
+            erlang:error(Reason);
+        Reply ->
+            Reply
+    end.
+
+-spec(relative_product(ListOfBinRels, BinRel1) -> BinRel2 when
+      ListOfBinRels :: [BinRel, ...],
+      BinRel :: binary_relation(),
+      BinRel1 :: binary_relation(),
+      BinRel2 :: binary_relation();
+                      (BinRel1, BinRel2) -> BinRel3 when
+      BinRel1 :: binary_relation(),
+      BinRel2 :: binary_relation(),
+      BinRel3 :: binary_relation()).
+relative_product(R1, R2) when ?IS_SET(R1), ?IS_SET(R2) ->
+    relative_product1(converse(R1), R2);
+%% The following clause is kept for backward compatibility.
+%% The list is due to Dialyzer's specs.
+relative_product(RT, R) when is_tuple(RT), ?IS_SET(R) ->
+    relative_product(tuple_to_list(RT), R);
+relative_product(RL, R) when is_list(RL), ?IS_SET(R) ->
+    EmptyR = case ?TYPE(R) of
+                 ?BINREL(_, _) -> ?LIST(R) =:= [];
+                 ?ANYTYPE -> true;
+                 _ -> erlang:error(badarg)
+             end,
+    case relprod_n(RL, R, EmptyR, true) of
+        {error, Reason} ->
+            erlang:error(Reason);
+        Reply ->
+            Reply
+    end.
+
+-spec(relative_product1(BinRel1, BinRel2) -> BinRel3 when
+      BinRel1 :: binary_relation(),
+      BinRel2 :: binary_relation(),
+      BinRel3 :: binary_relation()).
+relative_product1(R1, R2) when ?IS_SET(R1), ?IS_SET(R2) ->
+    {DTR1, RTR1} = case ?TYPE(R1) of
+                     ?BINREL(_, _) = R1T -> R1T;
+                     ?ANYTYPE -> {?ANYTYPE, ?ANYTYPE};
+                     _ -> erlang:error(badarg)
+                 end,
+    {DTR2, RTR2} = case ?TYPE(R2) of
+                     ?BINREL(_, _) = R2T -> R2T;
+                     ?ANYTYPE -> {?ANYTYPE, ?ANYTYPE};
+                     _ -> erlang:error(badarg)
+                 end,
+    case match_types(DTR1, DTR2) of
+        true when DTR1 =:= ?ANYTYPE -> R1;
+        true when DTR2 =:= ?ANYTYPE -> R2;
+        true -> ?SET(relprod(?LIST(R1), ?LIST(R2)), ?BINREL(RTR1, RTR2));
+        false -> erlang:error(type_mismatch)
+    end.
+
+-spec(converse(BinRel1) -> BinRel2 when
+      BinRel1 :: binary_relation(),
+      BinRel2 :: binary_relation()).
+converse(R) when ?IS_SET(R) ->
+    case ?TYPE(R) of
+        ?BINREL(DT, RT) -> ?SET(converse(?LIST(R), []), ?BINREL(RT, DT));
+        ?ANYTYPE -> R;
+        _ -> erlang:error(badarg)
+    end.
+
+-spec(image(BinRel, Set1) -> Set2 when
+      BinRel :: binary_relation(),
+      Set1 :: a_set(),
+      Set2 :: a_set()).
+image(R, S) when ?IS_SET(R), ?IS_SET(S) ->
+    case ?TYPE(R) of
+        ?BINREL(DT, RT) ->
+	    case match_types(DT, ?TYPE(S)) of
+		true ->
+		    ?SET(usort(restrict(?LIST(S), ?LIST(R))), RT);
+		false ->
+		    erlang:error(type_mismatch)
+	    end;
+        ?ANYTYPE -> R;
+        _ -> erlang:error(badarg)
+    end.
+
+-spec(inverse_image(BinRel, Set1) -> Set2 when
+      BinRel :: binary_relation(),
+      Set1 :: a_set(),
+      Set2 :: a_set()).
+inverse_image(R, S) when ?IS_SET(R), ?IS_SET(S) ->
+    case ?TYPE(R) of
+        ?BINREL(DT, RT) ->
+	    case match_types(RT, ?TYPE(S)) of
+		true ->
+		    NL = restrict(?LIST(S), converse(?LIST(R), [])),
+		    ?SET(usort(NL), DT);
+		false ->
+		    erlang:error(type_mismatch)
+	    end;
+        ?ANYTYPE -> R;
+        _ -> erlang:error(badarg)
+    end.
+
+-spec(strict_relation(BinRel1) -> BinRel2 when
+      BinRel1 :: binary_relation(),
+      BinRel2 :: binary_relation()).
+strict_relation(R) when ?IS_SET(R) ->
+    case ?TYPE(R) of
+        Type = ?BINREL(_, _) ->
+            ?SET(strict(?LIST(R), []), Type);
+        ?ANYTYPE -> R;
+        _ -> erlang:error(badarg)
+    end.
+
+-spec(weak_relation(BinRel1) -> BinRel2 when
+      BinRel1 :: binary_relation(),
+      BinRel2 :: binary_relation()).
+weak_relation(R) when ?IS_SET(R) ->
+    case ?TYPE(R) of
+        ?BINREL(DT, RT) ->
+            case unify_types(DT, RT) of
+                [] ->
+                    erlang:error(badarg);
+                Type ->
+                    ?SET(weak(?LIST(R)), ?BINREL(Type, Type))
+            end;
+        ?ANYTYPE -> R;
+        _ -> erlang:error(badarg)
+    end.
+
+-spec(extension(BinRel1, Set, AnySet) -> BinRel2 when
+      AnySet :: anyset(),
+      BinRel1 :: binary_relation(),
+      BinRel2 :: binary_relation(),
+      Set :: a_set()).
+extension(R, S, E) when ?IS_SET(R), ?IS_SET(S) ->
+    case {?TYPE(R), ?TYPE(S), is_sofs_set(E)} of
+	{T=?BINREL(DT, RT), ST, true} ->
+	    case match_types(DT, ST) and match_types(RT, type(E)) of
+		false ->
+		    erlang:error(type_mismatch);
+		true ->
+		    RL = ?LIST(R),
+		    case extc([], ?LIST(S), to_external(E), RL) of
+			[] ->
+			    R;
+			L ->
+			    ?SET(merge(RL, reverse(L)), T)
+		    end
+	    end;
+	{?ANYTYPE, ?ANYTYPE, true} ->
+	    R;
+	{?ANYTYPE, ST, true} ->
+	    case type(E) of
+		?SET_OF(?ANYTYPE) ->
+		    R;
+		ET ->
+		    ?SET([], ?BINREL(ST, ET))
+	    end;
+	{_, _, true} ->
+	    erlang:error(badarg)
+    end.
+
+-spec(is_a_function(BinRel) -> Bool when
+      Bool :: boolean(),
+      BinRel :: binary_relation()).
+is_a_function(R) when ?IS_SET(R) ->
+    case ?TYPE(R) of
+        ?BINREL(_, _) ->
+            case ?LIST(R) of
+                [] -> true;
+                [{V,_} | Es] -> is_a_func(Es, V)
+            end;
+        ?ANYTYPE -> true;
+        _ -> erlang:error(badarg)
+    end.
+
+-spec(restriction(BinRel1, Set) -> BinRel2 when
+      BinRel1 :: binary_relation(),
+      BinRel2 :: binary_relation(),
+      Set :: a_set()).
+restriction(Relation, Set) ->
+    restriction(1, Relation, Set).
+
+-spec(drestriction(BinRel1, Set) -> BinRel2 when
+      BinRel1 :: binary_relation(),
+      BinRel2 :: binary_relation(),
+      Set :: a_set()).
+drestriction(Relation, Set) ->
+    drestriction(1, Relation, Set).
+
+%%%
+%%% Functions on functions only.
+%%%
+
+-spec(composite(Function1, Function2) -> Function3 when
+      Function1 :: a_function(),
+      Function2 :: a_function(),
+      Function3 :: a_function()).
+composite(Fn1, Fn2) when ?IS_SET(Fn1), ?IS_SET(Fn2) ->
+    ?BINREL(DTF1, RTF1) = case ?TYPE(Fn1)of
+			      ?BINREL(_, _) = F1T -> F1T;
+			      ?ANYTYPE -> {?ANYTYPE, ?ANYTYPE};
+			      _ -> erlang:error(badarg)
+			  end,
+    ?BINREL(DTF2, RTF2) = case ?TYPE(Fn2) of
+			      ?BINREL(_, _) = F2T -> F2T;
+			      ?ANYTYPE -> {?ANYTYPE, ?ANYTYPE};
+			      _ -> erlang:error(badarg)
+			  end,
+    case match_types(RTF1, DTF2) of
+        true when DTF1 =:= ?ANYTYPE -> Fn1;
+        true when DTF2 =:= ?ANYTYPE -> Fn2;
+        true ->
+	    case comp(?LIST(Fn1), ?LIST(Fn2)) of
+		SL when is_list(SL) ->
+		    ?SET(sort(SL), ?BINREL(DTF1, RTF2));
+		Bad ->
+		    erlang:error(Bad)
+	    end;
+        false -> erlang:error(type_mismatch)
+    end.
+
+-spec(inverse(Function1) -> Function2 when
+      Function1 :: a_function(),
+      Function2 :: a_function()).
+inverse(Fn) when ?IS_SET(Fn) ->
+    case ?TYPE(Fn) of
+        ?BINREL(DT, RT) ->
+	    case inverse1(?LIST(Fn)) of
+		SL when is_list(SL) ->
+		    ?SET(SL, ?BINREL(RT, DT));
+		Bad ->
+		    erlang:error(Bad)
+	    end;
+        ?ANYTYPE -> Fn;
+        _ -> erlang:error(badarg)
+    end.
+
+%%%
+%%% Functions on relations (binary or other).
+%%%
+
+-spec(restriction(SetFun, Set1, Set2) -> Set3 when
+      SetFun :: set_fun(),
+      Set1 :: a_set(),
+      Set2 :: a_set(),
+      Set3 :: a_set()).
+%% Equivalent to range(restriction(inverse(substitution(Fun, S1)), S2)).
+restriction(I, R, S) when is_integer(I), ?IS_SET(R), ?IS_SET(S) ->
+    RT = ?TYPE(R),
+    ST = ?TYPE(S),
+    case check_for_sort(RT, I) of
+	empty ->
+	    R;
+	error ->
+	    erlang:error(badarg);
+	Sort ->
+	    RL = ?LIST(R),
+	    case {match_types(?REL_TYPE(I, RT), ST), ?LIST(S)} of
+		{true, _SL} when RL =:= [] ->
+		    R;
+		{true, []} ->
+                    ?SET([], RT);
+		{true, [E | Es]} when Sort =:= false -> % I =:= 1
+		    ?SET(reverse(restrict_n(I, RL, E, Es, [])), RT);
+		{true, [E | Es]} ->
+		    ?SET(sort(restrict_n(I, keysort(I, RL), E, Es, [])), RT);
+		{false, _SL} ->
+		    erlang:error(type_mismatch)
+	    end
+    end;
+restriction(SetFun, S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
+    Type1 = ?TYPE(S1),
+    Type2 = ?TYPE(S2),
+    SL1 = ?LIST(S1),
+    case external_fun(SetFun) of
+	false when Type2 =:= ?ANYTYPE ->
+	    S2;
+	false ->
+	    case subst(SL1, SetFun, element_type(Type1)) of
+		{NSL, NewType} -> % NewType can be ?ANYTYPE
+		    case match_types(NewType, Type2) of
+			true ->
+			    NL = sort(restrict(?LIST(S2), converse(NSL, []))),
+			    ?SET(NL, Type1);
+			false ->
+			    erlang:error(type_mismatch)
+		    end;
+		Bad ->
+		    erlang:error(Bad)
+	    end;
+	_ when Type1 =:= ?ANYTYPE ->
+	    S1;
+	_XFun when ?IS_SET_OF(Type1) ->
+            erlang:error(badarg);
+	XFun ->
+	    FunT = XFun(Type1),
+	    try check_fun(Type1, XFun, FunT) of
+		Sort ->
+		    case match_types(FunT, Type2) of
+			true ->
+			    R1 = inverse_substitution(SL1, XFun, Sort),
+			    ?SET(sort(Sort, restrict(?LIST(S2), R1)), Type1);
+			false ->
+			    erlang:error(type_mismatch)
+		    end
+            catch _:_ -> erlang:error(badarg)
+	    end
+    end.
+
+-spec(drestriction(SetFun, Set1, Set2) -> Set3 when
+      SetFun :: set_fun(),
+      Set1 :: a_set(),
+      Set2 :: a_set(),
+      Set3 :: a_set()).
+drestriction(I, R, S) when is_integer(I), ?IS_SET(R), ?IS_SET(S) ->
+    RT = ?TYPE(R),
+    ST = ?TYPE(S),
+    case check_for_sort(RT, I) of
+	empty ->
+	    R;
+	error ->
+	    erlang:error(badarg);
+	Sort ->
+	    RL = ?LIST(R),
+	    case {match_types(?REL_TYPE(I, RT), ST), ?LIST(S)} of
+		{true, []} ->
+		    R;
+		{true, _SL} when RL =:= [] ->
+		    R;
+		{true, [E | Es]} when Sort =:= false -> % I =:= 1
+		    ?SET(diff_restrict_n(I, RL, E, Es, []), RT);
+		{true, [E | Es]} ->
+		    ?SET(diff_restrict_n(I, keysort(I, RL), E, Es, []), RT);
+		{false, _SL} ->
+		    erlang:error(type_mismatch)
+	    end
+    end;
+drestriction(SetFun, S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
+    Type1 = ?TYPE(S1),
+    Type2 = ?TYPE(S2),
+    SL1 = ?LIST(S1),
+    case external_fun(SetFun) of
+	false when Type2 =:= ?ANYTYPE ->
+	    S1;
+	false ->
+	    case subst(SL1, SetFun, element_type(Type1)) of
+		{NSL, NewType} -> % NewType can be ?ANYTYPE
+		    case match_types(NewType, Type2) of
+			true ->
+			    SL2 = ?LIST(S2),
+			    NL = sort(diff_restrict(SL2, converse(NSL, []))),
+			    ?SET(NL, Type1);
+			false ->
+			    erlang:error(type_mismatch)
+		    end;
+		Bad ->
+		    erlang:error(Bad)
+	    end;
+	_ when Type1 =:= ?ANYTYPE ->
+	    S1;
+	_XFun when ?IS_SET_OF(Type1) ->
+            erlang:error(badarg);
+	XFun ->
+	    FunT = XFun(Type1),
+	    try check_fun(Type1, XFun, FunT) of
+		Sort ->
+		    case match_types(FunT, Type2) of
+			true ->
+			    R1 = inverse_substitution(SL1, XFun, Sort),
+			    SL2 = ?LIST(S2),
+			    ?SET(sort(Sort, diff_restrict(SL2, R1)), Type1);
+			false ->
+			    erlang:error(type_mismatch)
+		    end
+            catch _:_ -> erlang:error(badarg)
+	    end
+    end.
+
+-spec(projection(SetFun, Set1) -> Set2 when
+      SetFun :: set_fun(),
+      Set1 :: a_set(),
+      Set2 :: a_set()).
+projection(I, Set) when is_integer(I), ?IS_SET(Set) ->
+    Type = ?TYPE(Set),
+    case check_for_sort(Type, I) of
+        empty ->
+            Set;
+        error ->
+            erlang:error(badarg);
+	_ when I =:= 1 ->
+	    ?SET(projection1(?LIST(Set)), ?REL_TYPE(I, Type));
+        _ ->
+	    ?SET(projection_n(?LIST(Set), I, []), ?REL_TYPE(I, Type))
+    end;
+projection(Fun, Set) ->
+    range(substitution(Fun, Set)).
+
+-spec(substitution(SetFun, Set1) -> Set2 when
+      SetFun :: set_fun(),
+      Set1 :: a_set(),
+      Set2 :: a_set()).
+substitution(I, Set) when is_integer(I), ?IS_SET(Set) ->
+    Type = ?TYPE(Set),
+    case check_for_sort(Type, I) of
+	empty ->
+	    Set;
+	error ->
+	    erlang:error(badarg);
+	_Sort ->
+	    NType = ?REL_TYPE(I, Type),
+	    NSL = substitute_element(?LIST(Set), I, []),
+	    ?SET(NSL, ?BINREL(Type, NType))
+    end;
+substitution(SetFun, Set) when ?IS_SET(Set) ->
+    Type = ?TYPE(Set),
+    L = ?LIST(Set),
+    case external_fun(SetFun) of
+	false when L =/= [] ->
+	    case subst(L, SetFun, element_type(Type)) of
+		{SL, NewType} ->
+		    ?SET(reverse(SL), ?BINREL(Type, NewType));
+		Bad ->
+		    erlang:error(Bad)
+	    end;
+	false ->
+	    empty_set();
+	_ when Type =:= ?ANYTYPE ->
+	    empty_set();
+	_XFun when ?IS_SET_OF(Type) ->
+            erlang:error(badarg);
+	XFun ->
+	    FunT = XFun(Type),
+	    try check_fun(Type, XFun, FunT) of
+		_Sort ->
+		    SL = substitute(L, XFun, []),
+		    ?SET(SL, ?BINREL(Type, FunT))
+            catch _:_ -> erlang:error(badarg)
+	    end
+    end.
+
+-spec(partition(SetOfSets) -> Partition when
+      SetOfSets :: set_of_sets(),
+      Partition :: a_set()).
+partition(Sets) ->
+    F1 = relation_to_family(canonical_relation(Sets)),
+    F2 = relation_to_family(converse(F1)),
+    range(F2).
+
+-spec(partition(SetFun, Set) -> Partition when
+      SetFun :: set_fun(),
+      Partition :: a_set(),
+      Set :: a_set()).
+partition(I, Set) when is_integer(I), ?IS_SET(Set) ->
+    Type = ?TYPE(Set),
+    case check_for_sort(Type, I) of
+        empty ->
+            Set;
+        error ->
+            erlang:error(badarg);
+	false -> % I =:= 1
+	    ?SET(partition_n(I, ?LIST(Set)), ?SET_OF(Type));
+        true ->
+	    ?SET(partition_n(I, keysort(I, ?LIST(Set))), ?SET_OF(Type))
+    end;
+partition(Fun, Set) ->
+    range(partition_family(Fun, Set)).
+
+-spec(partition(SetFun, Set1, Set2) -> {Set3, Set4} when
+      SetFun :: set_fun(),
+      Set1 :: a_set(),
+      Set2 :: a_set(),
+      Set3 :: a_set(),
+      Set4 :: a_set()).
+partition(I, R, S) when is_integer(I), ?IS_SET(R), ?IS_SET(S) ->
+    RT = ?TYPE(R),
+    ST = ?TYPE(S),
+    case check_for_sort(RT, I) of
+	empty ->
+	    {R, R};
+	error ->
+	    erlang:error(badarg);
+	Sort ->
+	    RL = ?LIST(R),
+	    case {match_types(?REL_TYPE(I, RT), ST), ?LIST(S)} of
+		{true, _SL} when RL =:= [] ->
+		    {R, R};
+		{true, []} ->
+		    {?SET([], RT), R};
+		{true, [E | Es]} when Sort =:= false -> % I =:= 1
+		    [L1 | L2] = partition3_n(I, RL, E, Es, [], []),
+		    {?SET(L1, RT), ?SET(L2, RT)};
+		{true, [E | Es]} ->
+		    [L1 | L2] = partition3_n(I, keysort(I,RL), E, Es, [], []),
+		    {?SET(L1, RT), ?SET(L2, RT)};
+		{false, _SL} ->
+		    erlang:error(type_mismatch)
+	    end
+    end;
+partition(SetFun, S1, S2) when ?IS_SET(S1), ?IS_SET(S2) ->
+    Type1 = ?TYPE(S1),
+    Type2 = ?TYPE(S2),
+    SL1 = ?LIST(S1),
+    case external_fun(SetFun) of
+	false when Type2 =:= ?ANYTYPE ->
+	    {S2, S1};
+	false ->
+	    case subst(SL1, SetFun, element_type(Type1)) of
+		{NSL, NewType} -> % NewType can be ?ANYTYPE
+		    case match_types(NewType, Type2) of
+			true ->
+			    R1 = converse(NSL, []),
+			    [L1 | L2] = partition3(?LIST(S2), R1),
+			    {?SET(sort(L1), Type1), ?SET(sort(L2), Type1)};
+			false ->
+			    erlang:error(type_mismatch)
+		    end;
+		Bad ->
+		    erlang:error(Bad)
+	    end;
+	_ when Type1 =:= ?ANYTYPE ->
+	    {S1, S1};
+	_XFun when ?IS_SET_OF(Type1) ->
+            erlang:error(badarg);
+	XFun ->
+	    FunT = XFun(Type1),
+	    try check_fun(Type1, XFun, FunT) of
+		Sort ->
+		    case match_types(FunT, Type2) of
+			true ->
+			    R1 = inverse_substitution(SL1, XFun, Sort),
+			    [L1 | L2] = partition3(?LIST(S2), R1),
+			    {?SET(sort(L1), Type1), ?SET(sort(L2), Type1)};
+			false ->
+			    erlang:error(type_mismatch)
+		    end
+            catch _:_ -> erlang:error(badarg)
+	    end
+    end.
+
+-spec(multiple_relative_product(TupleOfBinRels, BinRel1) -> BinRel2 when
+      TupleOfBinRels :: tuple_of(BinRel),
+      BinRel :: binary_relation(),
+      BinRel1 :: binary_relation(),
+      BinRel2 :: binary_relation()).
+multiple_relative_product(T, R) when is_tuple(T), ?IS_SET(R) ->
+    case test_rel(R, tuple_size(T), eq) of
+	true when ?TYPE(R) =:= ?ANYTYPE ->
+	    empty_set();
+        true ->
+	    MProd = mul_relprod(tuple_to_list(T), 1, R),
+	    relative_product(MProd);
+        false ->
+	    erlang:error(badarg)
+    end.
+
+-spec(join(Relation1, I, Relation2, J) -> Relation3 when
+      Relation1 :: relation(),
+      Relation2 :: relation(),
+      Relation3 :: relation(),
+      I :: pos_integer(),
+      J :: pos_integer()).
+join(R1, I1, R2, I2)
+  when ?IS_SET(R1), ?IS_SET(R2), is_integer(I1), is_integer(I2) ->
+    case test_rel(R1, I1, lte) and test_rel(R2, I2, lte) of
+        false -> erlang:error(badarg);
+        true when ?TYPE(R1) =:= ?ANYTYPE -> R1;
+        true when ?TYPE(R2) =:= ?ANYTYPE -> R2;
+        true ->
+	    L1 = ?LIST(raise_element(R1, I1)),
+	    L2 = ?LIST(raise_element(R2, I2)),
+	    T = relprod1(L1, L2),
+	    F = case (I1 =:= 1) and (I2 =:= 1)  of
+		    true ->
+			fun({X,Y}) -> join_element(X, Y) end;
+		    false ->
+			fun({X,Y}) ->
+				list_to_tuple(join_element(X, Y, I2))
+			end
+		end,
+	    ?SET(replace(T, F, []), F({?TYPE(R1), ?TYPE(R2)}))
+    end.
+
+%% Inlined.
+test_rel(R, I, C) ->
+    case ?TYPE(R) of
+        Rel when ?IS_RELATION(Rel), C =:= eq, I =:= ?REL_ARITY(Rel) -> true;
+        Rel when ?IS_RELATION(Rel), C =:= lte, I>=1, I =< ?REL_ARITY(Rel) ->
+            true;
+        ?ANYTYPE -> true;
+        _ -> false
+    end.
+
+%%%
+%%% Family functions
+%%%
+
+-spec(fam2rel(Family) -> BinRel when
+      Family :: family(),
+      BinRel :: binary_relation()).
+fam2rel(F) ->
+    family_to_relation(F).
+
+-spec(family_to_relation(Family) -> BinRel when
+      Family :: family(),
+      BinRel :: binary_relation()).
+%% Inlined.
+family_to_relation(F) when ?IS_SET(F) ->
+    case ?TYPE(F) of
+        ?FAMILY(DT, RT) ->
+	    ?SET(family2rel(?LIST(F), []), ?BINREL(DT, RT));
+        ?ANYTYPE -> F;
+        _ -> erlang:error(badarg)
+    end.
+
+-spec(family_specification(Fun, Family1) -> Family2 when
+      Fun :: spec_fun(),
+      Family1 :: family(),
+      Family2 :: family()).
+family_specification(Fun, F) when ?IS_SET(F) ->
+    case ?TYPE(F) of
+        ?FAMILY(_DT, Type) = FType ->
+	    R = case external_fun(Fun) of
+		    false ->
+			fam_spec(?LIST(F), Fun, Type, []);
+		    XFun ->
+			fam_specification(?LIST(F), XFun, [])
+		end,
+	    case R of
+		SL when is_list(SL) ->
+		    ?SET(SL, FType);
+		Bad ->
+		    erlang:error(Bad)
+	    end;
+        ?ANYTYPE -> F;
+        _ -> erlang:error(badarg)
+    end.
+
+-spec(union_of_family(Family) -> Set when
+      Family :: family(),
+      Set :: a_set()).
+union_of_family(F) when ?IS_SET(F) ->
+    case ?TYPE(F) of
+        ?FAMILY(_DT, Type) ->
+	    ?SET(un_of_fam(?LIST(F), []), Type);
+        ?ANYTYPE -> F;
+        _ -> erlang:error(badarg)
+    end.
+
+-spec(intersection_of_family(Family) -> Set when
+      Family :: family(),
+      Set :: a_set()).
+intersection_of_family(F) when ?IS_SET(F) ->
+    case ?TYPE(F) of
+        ?FAMILY(_DT, Type) ->
+            case int_of_fam(?LIST(F)) of
+                FU when is_list(FU) ->
+                    ?SET(FU, Type);
+                Bad ->
+                    erlang:error(Bad)
+            end;
+        _ -> erlang:error(badarg)
+    end.
+
+-spec(family_union(Family1) -> Family2 when
+      Family1 :: family(),
+      Family2 :: family()).
+family_union(F) when ?IS_SET(F) ->
+    case ?TYPE(F) of
+        ?FAMILY(DT, ?SET_OF(Type)) ->
+	    ?SET(fam_un(?LIST(F), []), ?FAMILY(DT, Type));
+        ?ANYTYPE -> F;
+        _ -> erlang:error(badarg)
+    end.
+
+-spec(family_intersection(Family1) -> Family2 when
+      Family1 :: family(),
+      Family2 :: family()).
+family_intersection(F) when ?IS_SET(F) ->
+    case ?TYPE(F) of
+        ?FAMILY(DT, ?SET_OF(Type)) ->
+            case fam_int(?LIST(F), []) of
+                FU when is_list(FU) ->
+                    ?SET(FU, ?FAMILY(DT, Type));
+                Bad ->
+                    erlang:error(Bad)
+            end;
+        ?ANYTYPE -> F;
+        _ -> erlang:error(badarg)
+    end.
+
+-spec(family_domain(Family1) -> Family2 when
+      Family1 :: family(),
+      Family2 :: family()).
+family_domain(F) when ?IS_SET(F) ->
+    case ?TYPE(F) of
+        ?FAMILY(FDT, ?BINREL(DT, _)) ->
+            ?SET(fam_dom(?LIST(F), []), ?FAMILY(FDT, DT));
+        ?ANYTYPE -> F;
+        ?FAMILY(_, ?ANYTYPE) -> F;
+        _ -> erlang:error(badarg)
+    end.
+
+-spec(family_range(Family1) -> Family2 when
+      Family1 :: family(),
+      Family2 :: family()).
+family_range(F) when ?IS_SET(F) ->
+    case ?TYPE(F) of
+        ?FAMILY(DT, ?BINREL(_, RT)) ->
+            ?SET(fam_ran(?LIST(F), []), ?FAMILY(DT, RT));
+        ?ANYTYPE -> F;
+        ?FAMILY(_, ?ANYTYPE) -> F;
+        _ -> erlang:error(badarg)
+    end.
+
+-spec(family_field(Family1) -> Family2 when
+      Family1 :: family(),
+      Family2 :: family()).
+family_field(F) ->
+    family_union(family_domain(F), family_range(F)).
+
+-spec(family_union(Family1, Family2) -> Family3 when
+      Family1 :: family(),
+      Family2 :: family(),
+      Family3 :: family()).
+family_union(F1, F2) ->
+    fam_binop(F1, F2, fun fam_union/3).
+
+-spec(family_intersection(Family1, Family2) -> Family3 when
+      Family1 :: family(),
+      Family2 :: family(),
+      Family3 :: family()).
+family_intersection(F1, F2) ->
+    fam_binop(F1, F2, fun fam_intersect/3).
+
+-spec(family_difference(Family1, Family2) -> Family3 when
+      Family1 :: family(),
+      Family2 :: family(),
+      Family3 :: family()).
+family_difference(F1, F2) ->
+    fam_binop(F1, F2, fun fam_difference/3).
+
+%% Inlined.
+fam_binop(F1, F2, FF) when ?IS_SET(F1), ?IS_SET(F2) ->
+    case unify_types(?TYPE(F1), ?TYPE(F2)) of
+        [] ->
+            erlang:error(type_mismatch);
+        ?ANYTYPE ->
+            F1;
+        Type = ?FAMILY(_, _) ->
+	    ?SET(FF(?LIST(F1), ?LIST(F2), []), Type);
+        _ ->  erlang:error(badarg)
+    end.
+
+-spec(partition_family(SetFun, Set) -> Family when
+      Family :: family(),
+      SetFun :: set_fun(),
+      Set :: a_set()).
+partition_family(I, Set) when is_integer(I), ?IS_SET(Set) ->
+    Type = ?TYPE(Set),
+    case check_for_sort(Type, I) of
+        empty ->
+            Set;
+        error ->
+            erlang:error(badarg);
+	false -> % when I =:= 1
+	    ?SET(fam_partition_n(I, ?LIST(Set)),
+		 ?BINREL(?REL_TYPE(I, Type), ?SET_OF(Type)));
+        true ->
+	    ?SET(fam_partition_n(I, keysort(I, ?LIST(Set))),
+		 ?BINREL(?REL_TYPE(I, Type), ?SET_OF(Type)))
+    end;
+partition_family(SetFun, Set) when ?IS_SET(Set) ->
+    Type = ?TYPE(Set),
+    SL = ?LIST(Set),
+    case external_fun(SetFun) of
+	false when SL =/= [] ->
+	    case subst(SL, SetFun, element_type(Type)) of
+		{NSL, NewType} ->
+		    P = fam_partition(converse(NSL, []), true),
+		    ?SET(reverse(P), ?BINREL(NewType, ?SET_OF(Type)));
+		Bad ->
+		    erlang:error(Bad)
+	    end;
+	false ->
+	    empty_set();
+	_ when Type =:= ?ANYTYPE ->
+	    empty_set();
+	_XFun when ?IS_SET_OF(Type) ->
+            erlang:error(badarg);
+	XFun ->
+	    DType = XFun(Type),
+	    try check_fun(Type, XFun, DType) of
+		Sort ->
+		    Ts = inverse_substitution(?LIST(Set), XFun, Sort),
+		    P = fam_partition(Ts, Sort),
+		    ?SET(reverse(P), ?BINREL(DType, ?SET_OF(Type)))
+            catch _:_ -> erlang:error(badarg)
+	    end
+    end.
+
+-spec(family_projection(SetFun, Family1) -> Family2 when
+      SetFun :: set_fun(),
+      Family1 :: family(),
+      Family2 :: family()).
+family_projection(SetFun, F) when ?IS_SET(F) ->
+    case ?TYPE(F) of
+        ?FAMILY(_, _) when [] =:= ?LIST(F) ->
+	    empty_set();
+        ?FAMILY(DT, Type) ->
+	    case external_fun(SetFun) of
+		false ->
+		    case fam_proj(?LIST(F), SetFun, Type, ?ANYTYPE, []) of
+			{SL, NewType} ->
+			    ?SET(SL, ?BINREL(DT, NewType));
+			Bad ->
+			    erlang:error(Bad)
+		    end;
+		_ ->
+		    erlang:error(badarg)
+	    end;
+	?ANYTYPE -> F;
+        _ -> erlang:error(badarg)
+    end.
+
+%%%
+%%% Digraph functions
+%%%
+
+-spec(family_to_digraph(Family) -> Graph when
+      Graph :: digraph:graph(),
+      Family :: family()).
+family_to_digraph(F) when ?IS_SET(F) ->
+    case ?TYPE(F) of
+        ?FAMILY(_, _) -> fam2digraph(F, digraph:new());
+        ?ANYTYPE -> digraph:new();
+        _Else -> erlang:error(badarg)
+    end.
+
+-spec(family_to_digraph(Family, GraphType) -> Graph when
+      Graph :: digraph:graph(),
+      Family :: family(),
+      GraphType :: [digraph:d_type()]).
+family_to_digraph(F, Type) when ?IS_SET(F) ->
+    case ?TYPE(F) of
+        ?FAMILY(_, _) -> ok;
+        ?ANYTYPE -> ok;
+        _Else  -> erlang:error(badarg)
+    end,
+    try digraph:new(Type) of
+        G -> case catch fam2digraph(F, G) of
+                 {error, Reason} ->
+                     true = digraph:delete(G),
+                     erlang:error(Reason);
+                 _ ->
+                     G
+             end
+    catch
+        error:badarg -> erlang:error(badarg)
+    end.
+
+-spec(digraph_to_family(Graph) -> Family when
+      Graph :: digraph:graph(),
+      Family :: family()).
+digraph_to_family(G) ->
+    try digraph_family(G) of
+        L -> ?SET(L, ?FAMILY(?ATOM_TYPE, ?ATOM_TYPE))
+    catch _:_ -> erlang:error(badarg)
+    end.
+
+-spec(digraph_to_family(Graph, Type) -> Family when
+      Graph :: digraph:graph(),
+      Family :: family(),
+      Type :: type()).
+digraph_to_family(G, T) ->
+    case {is_type(T), T} of
+        {true, ?SET_OF(?FAMILY(_,_) = Type)} ->
+            try digraph_family(G) of
+                L -> ?SET(L, Type)
+            catch _:_ -> erlang:error(badarg)
+            end;
+        _ ->
+            erlang:error(badarg)
+    end.
+
+%%
+%%  Local functions
+%%
+
+%% Type = OrderedSetType
+%%      | SetType
+%%      | atom() except '_'
+%% OrderedSetType = {Type, ..., Type}
+%% SetType = [ElementType]           % list of exactly one element
+%% ElementType = '_'                 % any type (implies empty set)
+%%             | Type
+
+is_types(0, _T) ->
+    true;
+is_types(I, T) ->
+    case is_type(?REL_TYPE(I, T)) of
+        true -> is_types(I-1, T);
+        false -> false
+    end.
+
+is_element_type(?ANYTYPE) ->
+    true;
+is_element_type(T) ->
+    is_type(T).
+
+set_of_sets([S | Ss], L, T0) when ?IS_SET(S) ->
+    case unify_types([?TYPE(S)], T0) of
+        [] -> {error, type_mismatch};
+        Type ->  set_of_sets(Ss, [?LIST(S) | L], Type)
+    end;
+set_of_sets([S | Ss], L, T0) when ?IS_ORDSET(S) ->
+    case unify_types(?ORDTYPE(S), T0) of
+        [] -> {error, type_mismatch};
+        Type ->  set_of_sets(Ss, [?ORDDATA(S) | L], Type)
+    end;
+set_of_sets([], L, T) ->
+    ?SET(usort(L), T);
+set_of_sets(_, _L, _T) ->
+    {error, badarg}.
+
+ordset_of_sets([S | Ss], L, T) when ?IS_SET(S) ->
+    ordset_of_sets(Ss, [?LIST(S) | L], [[?TYPE(S)] | T]);
+ordset_of_sets([S | Ss], L, T) when ?IS_ORDSET(S) ->
+    ordset_of_sets(Ss, [?ORDDATA(S) | L], [?ORDTYPE(S) | T]);
+ordset_of_sets([], L, T) ->
+    ?ORDSET(list_to_tuple(reverse(L)), list_to_tuple(reverse(T)));
+ordset_of_sets(_, _L, _T) ->
+    error.
+
+%% Inlined.
+rel(Ts, [Type]) ->
+    case is_type(Type) and atoms_only(Type, 1) of
+        true ->
+            rel(Ts, tuple_size(Type), Type);
+        false ->
+            rel_type(Ts, [], Type)
+    end;
+rel(Ts, Sz) ->
+    rel(Ts, Sz, erlang:make_tuple(Sz, ?ATOM_TYPE)).
+
+atoms_only(Type, I) when ?IS_ATOM_TYPE(?REL_TYPE(I, Type)) ->
+    atoms_only(Type, I+1);
+atoms_only(Type, I) when I > tuple_size(Type), ?IS_RELATION(Type) ->
+    true;
+atoms_only(_Type, _I) ->
+    false.
+
+rel(Ts, Sz, Type) when Sz >= 1 ->
+    SL = usort(Ts),
+    rel(SL, SL, Sz, Type).
+
+rel([T | Ts], L, Sz, Type) when tuple_size(T) =:= Sz ->
+    rel(Ts, L, Sz, Type);
+rel([], L, _Sz, Type) ->
+    ?SET(L, Type).
+
+rel_type([E | Ts], L, Type) ->
+    {NType, NE} = make_element(E, Type, Type),
+    rel_type(Ts, [NE | L], NType);
+rel_type([], [], ?ANYTYPE) ->
+    empty_set();
+rel_type([], SL, Type) when ?IS_RELATION(Type) ->
+    ?SET(usort(SL), Type).
+
+%% Inlined.
+a_func(Ts, T) ->
+    case {T, is_type(T)} of
+	{[?BINREL(DT, RT) = Type], true} when ?IS_ATOM_TYPE(DT),
+					      ?IS_ATOM_TYPE(RT)  ->
+	    func(Ts, Type);
+	{[Type], true} ->
+	    func_type(Ts, [], Type, fun(?BINREL(_,_)) -> true end)
+    end.
+
+func(L0, Type) ->
+    L = usort(L0),
+    func(L, L, L, Type).
+
+func([{X,_} | Ts], X0, L, Type) when X /= X0 ->
+    func(Ts, X, L, Type);
+func([{X,_} | _Ts], X0, _L, _Type) when X == X0 ->
+    bad_function;
+func([], _X0, L, Type) ->
+    ?SET(L, Type).
+
+%% Inlined.
+fam(Ts, T) ->
+    case {T, is_type(T)} of
+	{[?FAMILY(DT, RT) = Type], true} when ?IS_ATOM_TYPE(DT),
+					      ?IS_ATOM_TYPE(RT)  ->
+	    fam2(Ts, Type);
+	{[Type], true} ->
+	    func_type(Ts, [], Type, fun(?FAMILY(_,_)) -> true end)
+    end.
+
+fam2([], Type) ->
+    ?SET([], Type);
+fam2(Ts, Type) ->
+    fam2(sort(Ts), Ts, [], Type).
+
+fam2([{I,L} | T], I0, SL, Type) when I /= I0 ->
+    fam2(T, I, [{I,usort(L)} | SL], Type);
+fam2([{I,L} | T], I0, SL, Type) when I == I0 ->
+    case {usort(L), SL} of
+	{NL, [{_I,NL1} | _]} when NL == NL1 ->
+	    fam2(T, I0, SL, Type);
+	_ ->
+	    bad_function
+    end;
+fam2([], _I0, SL, Type) ->
+    ?SET(reverse(SL), Type).
+
+func_type([E | T], SL, Type, F) ->
+    {NType, NE} = make_element(E, Type, Type),
+    func_type(T, [NE | SL], NType, F);
+func_type([], [], ?ANYTYPE, _F) ->
+    empty_set();
+func_type([], SL, Type, F) ->
+    true = F(Type),
+    NL = usort(SL),
+    check_function(NL, ?SET(NL, Type)).
+
+setify(L, ?SET_OF(Atom)) when ?IS_ATOM_TYPE(Atom), Atom =/= ?ANYTYPE ->
+    ?SET(usort(L), Atom);
+setify(L, ?SET_OF(Type0)) ->
+    try is_no_lists(Type0) of
+        N when is_integer(N) ->
+            rel(L, N, Type0);
+        Sizes ->
+            make_oset(L, Sizes, L, Type0)
+    catch
+        _:_ ->
+            {?SET_OF(Type), Set} = create(L, Type0, Type0, []),
+            ?SET(Set, Type)
+    end;
+setify(E, Type0) ->
+    {Type, OrdSet} = make_element(E, Type0, Type0),
+    ?ORDSET(OrdSet, Type).
+
+is_no_lists(T) when is_tuple(T) ->
+   Sz = tuple_size(T),
+   is_no_lists(T, Sz, Sz, []).
+
+is_no_lists(_T, 0, Sz, []) ->
+   Sz;
+is_no_lists(_T, 0, Sz, L) ->
+   {Sz, L};
+is_no_lists(T, I, Sz, L) when ?IS_ATOM_TYPE(?REL_TYPE(I, T)) ->
+   is_no_lists(T, I-1, Sz, L);
+is_no_lists(T, I, Sz, L) ->
+   is_no_lists(T, I-1, Sz, [{I,is_no_lists(?REL_TYPE(I, T))} | L]).
+
+create([E | Es], T, T0, L) ->
+    {NT, S} = make_element(E, T, T0),
+    create(Es, NT, T0, [S | L]);
+create([], T, _T0, L) ->
+    {?SET_OF(T), usort(L)}.
+
+make_element(C, ?ANYTYPE, _T0) ->
+    make_element(C);
+make_element(C, Atom, ?ANYTYPE) when ?IS_ATOM_TYPE(Atom),
+                                     not is_list(C), not is_tuple(C) ->
+    {Atom, C};
+make_element(C, Atom, Atom) when ?IS_ATOM_TYPE(Atom) ->
+    {Atom, C};
+make_element(T, TT, ?ANYTYPE) when tuple_size(T) =:= tuple_size(TT) ->
+    make_tuple(tuple_to_list(T), tuple_to_list(TT), [], [], ?ANYTYPE);
+make_element(T, TT, T0) when tuple_size(T) =:= tuple_size(TT) ->
+    make_tuple(tuple_to_list(T), tuple_to_list(TT), [], [], tuple_to_list(T0));
+make_element(L, [LT], ?ANYTYPE) when is_list(L) ->
+    create(L, LT, ?ANYTYPE, []);
+make_element(L, [LT], [T0]) when is_list(L) ->
+    create(L, LT, T0, []).
+
+make_tuple([E | Es], [T | Ts], NT, L, T0) when T0 =:= ?ANYTYPE ->
+    {ET, ES} = make_element(E, T, T0),
+    make_tuple(Es, Ts, [ET | NT], [ES | L], T0);
+make_tuple([E | Es], [T | Ts], NT, L, [T0 | T0s]) ->
+    {ET, ES} = make_element(E, T, T0),
+    make_tuple(Es, Ts, [ET | NT], [ES | L], T0s);
+make_tuple([], [], NT, L, _T0s) when NT =/= [] ->
+    {list_to_tuple(reverse(NT)), list_to_tuple(reverse(L))}.
+
+%% Derive type.
+make_element(C) when not is_list(C), not is_tuple(C) ->
+    {?ATOM_TYPE, C};
+make_element(T) when is_tuple(T) ->
+    make_tuple(tuple_to_list(T), [], []);
+make_element(L) when is_list(L) ->
+    create(L, ?ANYTYPE, ?ANYTYPE, []).
+
+make_tuple([E | Es], T, L) ->
+    {ET, ES} = make_element(E),
+    make_tuple(Es, [ET | T], [ES | L]);
+make_tuple([], T, L) when T =/= [] ->
+    {list_to_tuple(reverse(T)),  list_to_tuple(reverse(L))}.
+
+make_oset([T | Ts], Szs, L, Type) ->
+    true = test_oset(Szs, T, T),
+    make_oset(Ts, Szs, L, Type);
+make_oset([], _Szs, L, Type) ->
+    ?SET(usort(L), Type).
+
+%% Optimization. Avoid re-building (nested) tuples.
+test_oset({Sz,Args}, T, T0) when tuple_size(T) =:= Sz ->
+    test_oset_args(Args, T, T0);
+test_oset(Sz, T, _T0) when tuple_size(T) =:= Sz ->
+    true.
+
+test_oset_args([{Arg,Szs} | Ss], T, T0) ->
+    true = test_oset(Szs, ?REL_TYPE(Arg, T), T0),
+    test_oset_args(Ss, T, T0);
+test_oset_args([], _T, _T0) ->
+    true.
+
+list_of_sets([S | Ss], Type, L) ->
+    list_of_sets(Ss, Type, [?SET(S, Type) | L]);
+list_of_sets([], _Type, L) ->
+    reverse(L).
+
+list_of_ordsets([S | Ss], Type, L) ->
+    list_of_ordsets(Ss, Type, [?ORDSET(S, Type) | L]);
+list_of_ordsets([], _Type, L) ->
+    reverse(L).
+
+tuple_of_sets([S | Ss], [?SET_OF(Type) | Types], L) ->
+    tuple_of_sets(Ss, Types, [?SET(S, Type) | L]);
+tuple_of_sets([S | Ss], [Type | Types], L) ->
+    tuple_of_sets(Ss, Types, [?ORDSET(S, Type) | L]);
+tuple_of_sets([], [], L) ->
+    list_to_tuple(reverse(L)).
+
+spec([E | Es], Fun, Type, L) ->
+    case Fun(term2set(E, Type)) of
+        true ->
+            spec(Es, Fun, Type, [E | L]);
+        false ->
+            spec(Es, Fun, Type, L);
+	_ ->
+	    badarg
+    end;
+spec([], _Fun, _Type, L) ->
+    reverse(L).
+
+specification([E | Es], Fun, L) ->
+    case Fun(E) of
+        true ->
+            specification(Es, Fun, [E | L]);
+        false ->
+            specification(Es, Fun, L);
+	_ ->
+	    badarg
+    end;
+specification([], _Fun, L) ->
+    reverse(L).
+
+%% Elements from the first list are kept.
+intersection([H1 | T1], [H2 | T2], L) when H1 < H2 ->
+    intersection1(T1, T2, L, H2);
+intersection([H1 | T1], [H2 | T2], L) when H1 == H2 ->
+    intersection(T1, T2, [H1 | L]);
+intersection([H1 | T1], [_H2 | T2], L) ->
+    intersection2(T1, T2, L, H1);
+intersection(_, _, L) ->
+    reverse(L).
+
+intersection1([H1 | T1], T2, L, H2) when H1 < H2 ->
+    intersection1(T1, T2, L, H2);
+intersection1([H1 | T1], T2, L, H2) when H1 == H2 ->
+    intersection(T1, T2, [H1 | L]);
+intersection1([H1 | T1], T2, L, _H2) ->
+    intersection2(T1, T2, L, H1);
+intersection1(_, _, L, _) ->
+    reverse(L).
+
+intersection2(T1, [H2 | T2], L, H1) when H1 > H2 ->
+    intersection2(T1, T2, L, H1);
+intersection2(T1, [H2 | T2], L, H1) when H1 == H2 ->
+    intersection(T1, T2, [H1 | L]);
+intersection2(T1, [H2 | T2], L, _H1) ->
+    intersection1(T1, T2, L, H2);
+intersection2(_, _, L, _) ->
+    reverse(L).
+
+difference([H1 | T1], [H2 | T2], L) when H1 < H2 ->
+    diff(T1, T2, [H1 | L], H2);
+difference([H1 | T1], [H2 | T2], L) when H1 == H2 ->
+    difference(T1, T2, L);
+difference([H1 | T1], [_H2 | T2], L) ->
+    diff2(T1, T2, L, H1);
+difference(L1, _, L) ->
+    reverse(L, L1).
+
+diff([H1 | T1], T2, L, H2) when H1 < H2 ->
+    diff(T1, T2, [H1 | L], H2);
+diff([H1 | T1], T2, L, H2) when H1 == H2 ->
+    difference(T1, T2, L);
+diff([H1 | T1], T2, L, _H2) ->
+    diff2(T1, T2, L, H1);
+diff(_, _, L, _) ->
+    reverse(L).
+
+diff2(T1, [H2 | T2], L, H1) when H1 > H2 ->
+    diff2(T1, T2, L, H1);
+diff2(T1, [H2 | T2], L, H1) when H1 == H2 ->
+    difference(T1, T2, L);
+diff2(T1, [H2 | T2], L, H1) ->
+    diff(T1, T2, [H1 | L], H2);
+diff2(T1, _, L, H1) ->
+    reverse(L, [H1 | T1]).
+
+symdiff([H1 | T1], T2, L) ->
+    symdiff2(T1, T2, L, H1);
+symdiff(_, T2, L) ->
+    reverse(L, T2).
+
+symdiff1([H1 | T1], T2, L, H2) when H1 < H2 ->
+    symdiff1(T1, T2, [H1 | L], H2);
+symdiff1([H1 | T1], T2, L, H2) when H1 == H2 ->
+    symdiff(T1, T2, L);
+symdiff1([H1 | T1], T2, L, H2) ->
+    symdiff2(T1, T2, [H2 | L], H1);
+symdiff1(_, T2, L, H2) ->
+    reverse(L, [H2 | T2]).
+
+symdiff2(T1, [H2 | T2], L, H1) when H1 > H2 ->
+    symdiff2(T1, T2, [H2 | L], H1);
+symdiff2(T1, [H2 | T2], L, H1) when H1 == H2 ->
+    symdiff(T1, T2, L);
+symdiff2(T1, [H2 | T2], L, H1) ->
+    symdiff1(T1, T2, [H1 | L], H2);
+symdiff2(T1, _, L, H1) ->
+    reverse(L, [H1 | T1]).
+
+sympart([H1 | T1], [H2 | T2], L1, L12, L2, T) when H1 < H2 ->
+    sympart1(T1, T2, [H1 | L1], L12, L2, T, H2);
+sympart([H1 | T1], [H2 | T2], L1, L12, L2, T) when H1 == H2 ->
+    sympart(T1, T2, L1, [H1 | L12], L2, T);
+sympart([H1 | T1], [H2 | T2], L1, L12, L2, T) ->
+    sympart2(T1, T2, L1, L12, [H2 | L2], T, H1);
+sympart(S1, [], L1, L12, L2, T) ->
+    {?SET(reverse(L1, S1), T),
+     ?SET(reverse(L12), T),
+     ?SET(reverse(L2), T)};
+sympart(_, S2, L1, L12, L2, T) ->
+    {?SET(reverse(L1), T),
+     ?SET(reverse(L12), T),
+     ?SET(reverse(L2, S2), T)}.
+
+sympart1([H1 | T1], T2, L1, L12, L2, T, H2) when H1 < H2 ->
+    sympart1(T1, T2, [H1 | L1], L12, L2, T, H2);
+sympart1([H1 | T1], T2, L1, L12, L2, T, H2) when H1 == H2 ->
+    sympart(T1, T2, L1, [H1 | L12], L2, T);
+sympart1([H1 | T1], T2, L1, L12, L2, T, H2) ->
+    sympart2(T1, T2, L1, L12, [H2 | L2], T, H1);
+sympart1(_, T2, L1, L12, L2, T, H2) ->
+    {?SET(reverse(L1), T),
+     ?SET(reverse(L12), T),
+     ?SET(reverse(L2, [H2 | T2]), T)}.
+
+sympart2(T1, [H2 | T2], L1, L12, L2, T, H1) when H1 > H2 ->
+    sympart2(T1, T2, L1, L12, [H2 | L2], T, H1);
+sympart2(T1, [H2 | T2], L1, L12, L2, T, H1) when H1 == H2 ->
+    sympart(T1, T2, L1, [H1 | L12], L2, T);
+sympart2(T1, [H2 | T2], L1, L12, L2, T, H1) ->
+    sympart1(T1, T2, [H1 | L1], L12, L2, T, H2);
+sympart2(T1, _, L1, L12, L2, T, H1) ->
+    {?SET(reverse(L1, [H1 | T1]), T),
+     ?SET(reverse(L12), T),
+     ?SET(reverse(L2), T)}.
+
+prod([[E | Es] | Xs], T, L) ->
+    prod(Es, Xs, T, prod(Xs, [E | T], L));
+prod([], T, L) ->
+    [list_to_tuple(reverse(T)) | L].
+
+prod([E | Es], Xs, T, L) ->
+    prod(Es, Xs, T, prod(Xs, [E | T], L));
+prod([], _Xs, _E, L) ->
+    L.
+
+constant_function([E | Es], X, L) ->
+    constant_function(Es, X, [{E,X} | L]);
+constant_function([], _X, L) ->
+    reverse(L).
+
+subset([H1 | T1], [H2 | T2]) when H1 > H2 ->
+    subset(T1, T2, H1);
+subset([H1 | T1], [H2 | T2]) when H1 == H2 ->
+    subset(T1, T2);
+subset(L1, _) ->
+    L1 =:= [].
+
+subset(T1, [H2 | T2], H1) when H1 > H2 ->
+    subset(T1, T2, H1);
+subset(T1, [H2 | T2], H1) when H1 == H2 ->
+    subset(T1, T2);
+subset(_, _, _) ->
+    false.
+
+disjoint([B | Bs], A, As) when A < B ->
+    disjoint(As, B, Bs);
+disjoint([B | _Bs], A, _As) when A == B ->
+    false;
+disjoint([_B | Bs], A, As) ->
+    disjoint(Bs, A, As);
+disjoint(_Bs, _A, _As) ->
+    true.
+
+%% Append sets that come in order, then "merge".
+lunion([[_] = S]) -> % optimization
+    S;
+lunion([[] | Ls]) ->
+    lunion(Ls);
+lunion([S | Ss]) ->
+    umerge(lunion(Ss, last(S), [S], []));
+lunion([]) ->
+    [].
+
+lunion([[E] = S | Ss], Last, SL, Ls) when E > Last -> % optimization
+    lunion(Ss, E, [S | SL], Ls);
+lunion([S | Ss], Last, SL, Ls) when hd(S) > Last ->
+    lunion(Ss, last(S), [S | SL], Ls);
+lunion([S | Ss], _Last, SL, Ls) ->
+    lunion(Ss, last(S), [S], [append(reverse(SL)) | Ls]);
+lunion([], _Last, SL, Ls) ->
+    [append(reverse(SL)) | Ls].
+
+%% The empty list is always the first list, if present.
+lintersection(_, []) ->
+    [];
+lintersection([S | Ss], S0) ->
+    lintersection(Ss, intersection(S, S0, []));
+lintersection([], S) ->
+    S.
+
+can_rel([S | Ss], L) ->
+    can_rel(Ss, L, S, S);
+can_rel([], L) ->
+    sort(L).
+
+can_rel(Ss, L, [E | Es], S) ->
+    can_rel(Ss, [{E, S} | L], Es, S);
+can_rel(Ss, L, _, _S) ->
+    can_rel(Ss, L).
+
+rel2family([{X,Y} | S]) ->
+    rel2fam(S, X, [Y], []);
+rel2family([]) ->
+    [].
+
+rel2fam([{X,Y} | S], X0, YL, L) when X0 == X ->
+    rel2fam(S, X0, [Y | YL], L);
+rel2fam([{X,Y} | S], X0, [A,B | YL], L) -> % optimization
+    rel2fam(S, X, [Y], [{X0,reverse(YL,[B,A])} | L]);
+rel2fam([{X,Y} | S], X0, YL, L) ->
+    rel2fam(S, X, [Y], [{X0,YL} | L]);
+rel2fam([], X, YL, L) ->
+    reverse([{X,reverse(YL)} | L]).
+
+dom([{X,_} | Es]) ->
+    dom([], X, Es);
+dom([] = L) ->
+    L.
+
+dom(L, X, [{X1,_} | Es]) when X == X1 ->
+    dom(L, X, Es);
+dom(L, X, [{Y,_} | Es]) ->
+    dom([X | L], Y, Es);
+dom(L, X, []) ->
+    reverse(L, [X]).
+
+ran([{_,Y} | Es], L) ->
+    ran(Es, [Y | L]);
+ran([], L) ->
+    usort(L).
+
+relprod(A, B) ->
+    usort(relprod1(A, B)).
+
+relprod1([{Ay,Ax} | A], B) ->
+    relprod1(B, Ay, Ax, A, []);
+relprod1(_A, _B) ->
+    [].
+
+relprod1([{Bx,_By} | B], Ay, Ax, A, L) when Ay > Bx ->
+    relprod1(B, Ay, Ax, A, L);
+relprod1([{Bx,By} | B], Ay, Ax, A, L) when Ay == Bx ->
+    relprod(B, Bx, By, A, [{Ax,By} | L], Ax, B, Ay);
+relprod1([{Bx,By} | B], _Ay, _Ax, A, L) ->
+    relprod2(B, Bx, By, A, L);
+relprod1(_B, _Ay, _Ax, _A, L) ->
+    L.
+
+relprod2(B, Bx, By, [{Ay, _Ax} | A], L) when Ay < Bx ->
+    relprod2(B, Bx, By, A, L);
+relprod2(B, Bx, By, [{Ay, Ax} | A], L) when Ay == Bx ->
+    relprod(B, Bx, By, A, [{Ax,By} | L], Ax, B, Ay);
+relprod2(B, _Bx, _By, [{Ay, Ax} | A], L) ->
+    relprod1(B, Ay, Ax, A, L);
+relprod2(_, _, _, _, L) ->
+    L.
+
+relprod(B0, Bx0, By0, A0, L, Ax, [{Bx,By} | B], Ay) when Ay == Bx ->
+    relprod(B0, Bx0, By0, A0, [{Ax,By} | L], Ax, B, Ay);
+relprod(B0, Bx0, By0, A0, L, _Ax, _B, _Ay) ->
+    relprod2(B0, Bx0, By0, A0, L).
+
+relprod_n([], _R, _EmptyG, _IsR) ->
+    {error, badarg};
+relprod_n(RL, R, EmptyR, IsR) ->
+    case domain_type(RL, ?ANYTYPE) of
+        Error = {error, _Reason} ->
+            Error;
+        DType ->
+            Empty = any(fun is_empty_set/1, RL) or EmptyR,
+            RType = range_type(RL, []),
+            Type = ?BINREL(DType, RType),
+            Prod =
+                case Empty of
+                    true when DType =:= ?ANYTYPE; RType =:= ?ANYTYPE ->
+                        empty_set();
+                    true ->
+                        ?SET([], Type);
+                    false ->
+                        TL = ?LIST((relprod_n(RL))),
+                        Sz = length(RL),
+                        Fun = fun({X,A}) -> {X, flat(Sz, A, [])} end,
+                        ?SET(map(Fun, TL), Type)
+                end,
+            case IsR of
+                true  -> relative_product(Prod, R);
+                false -> Prod
+            end
+    end.
+
+relprod_n([R | Rs]) ->
+    relprod_n(Rs, R).
+
+relprod_n([], R) ->
+    R;
+relprod_n([R | Rs], R0) ->
+    T = raise_element(R0, 1),
+    R1 = relative_product1(T, R),
+    NR = projection({external, fun({{X,A},AS}) -> {X,{A,AS}} end}, R1),
+    relprod_n(Rs, NR).
+
+flat(1, A, L) ->
+    list_to_tuple([A | L]);
+flat(N, {T,A}, L) ->
+    flat(N-1, T, [A | L]).
+
+domain_type([T | Ts], T0) when ?IS_SET(T) ->
+    case ?TYPE(T) of
+        ?BINREL(DT, _RT) ->
+            case unify_types(DT, T0) of
+                [] -> {error, type_mismatch};
+                T1 -> domain_type(Ts, T1)
+            end;
+        ?ANYTYPE ->
+            domain_type(Ts, T0);
+        _ -> {error, badarg}
+    end;
+domain_type([], T0) ->
+    T0.
+
+range_type([T | Ts], L) ->
+    case ?TYPE(T) of
+        ?BINREL(_DT, RT) ->
+            range_type(Ts, [RT | L]);
+        ?ANYTYPE ->
+            ?ANYTYPE
+    end;
+range_type([], L) ->
+    list_to_tuple(reverse(L)).
+
+converse([{A,B} | X], L) ->
+    converse(X, [{B,A} | L]);
+converse([], L) ->
+    sort(L).
+
+strict([{E1,E2} | Es], L) when E1 == E2 ->
+    strict(Es, L);
+strict([E | Es], L) ->
+    strict(Es, [E | L]);
+strict([], L) ->
+    reverse(L).
+
+weak(Es) ->
+    %% Not very efficient...
+    weak(Es, ran(Es, []), []).
+
+weak(Es=[{X,_} | _], [Y | Ys], L) when X > Y ->
+    weak(Es, Ys, [{Y,Y} | L]);
+weak(Es=[{X,_} | _], [Y | Ys], L) when X == Y ->
+    weak(Es, Ys, L);
+weak([E={X,Y} | Es], Ys, L) when X > Y ->
+    weak1(Es, Ys, [E | L], X);
+weak([E={X,Y} | Es], Ys, L) when X == Y ->
+    weak2(Es, Ys, [E | L], X);
+weak([E={X,_Y} | Es], Ys, L) -> % when X < _Y
+    weak2(Es, Ys, [E, {X,X} | L], X);
+weak([], [Y | Ys], L) ->
+    weak([], Ys, [{Y,Y} | L]);
+weak([], [], L) ->
+    reverse(L).
+
+weak1([E={X,Y} | Es], Ys, L, X0) when X > Y, X == X0 ->
+    weak1(Es, Ys, [E | L], X);
+weak1([E={X,Y} | Es], Ys, L, X0) when X == Y, X == X0 ->
+    weak2(Es, Ys, [E | L], X);
+weak1([E={X,_Y} | Es], Ys, L, X0) when X == X0 -> % when X < Y
+    weak2(Es, Ys, [E, {X,X} | L], X);
+weak1(Es, Ys, L, X) ->
+    weak(Es, Ys, [{X,X} | L]).
+
+weak2([E={X,_Y} | Es], Ys, L, X0) when X == X0 -> % when X < _Y
+    weak2(Es, Ys, [E | L], X);
+weak2(Es, Ys, L, _X) ->
+    weak(Es, Ys, L).
+
+extc(L, [D | Ds], C, Ts) ->
+    extc(L, Ds, C, Ts, D);
+extc(L, [], _C, _Ts) ->
+    L.
+
+extc(L, Ds, C, [{X,_Y} | Ts], D) when X < D ->
+    extc(L, Ds, C, Ts, D);
+extc(L, Ds, C, [{X,_Y} | Ts], D) when X == D ->
+    extc(L, Ds, C, Ts);
+extc(L, Ds, C, [{X,_Y} | Ts], D) ->
+    extc2([{D,C} | L], Ds, C, Ts, X);
+extc(L, Ds, C, [], D) ->
+    extc_tail([{D,C} | L], Ds, C).
+
+extc2(L, [D | Ds], C, Ts, X) when X > D ->
+    extc2([{D,C} | L], Ds, C, Ts, X);
+extc2(L, [D | Ds], C, Ts, X) when X == D ->
+    extc(L, Ds, C, Ts);
+extc2(L, [D | Ds], C, Ts, _X) ->
+    extc(L, Ds, C, Ts, D);
+extc2(L, [], _C, _Ts, _X) ->
+    L.
+
+extc_tail(L, [D | Ds], C) ->
+    extc_tail([{D,C} | L], Ds, C);
+extc_tail(L, [], _C) ->
+    L.
+
+is_a_func([{E,_} | Es], E0) when E /= E0 ->
+    is_a_func(Es, E);
+is_a_func(L, _E) ->
+    L =:= [].
+
+restrict_n(I, [T | Ts], Key, Keys, L) ->
+    case element(I, T) of
+	K when K < Key ->
+	    restrict_n(I, Ts, Key, Keys, L);
+	K when K == Key ->
+	    restrict_n(I, Ts, Key, Keys, [T | L]);
+	K ->
+	    restrict_n(I, K, Ts, Keys, L, T)
+    end;
+restrict_n(_I, _Ts, _Key, _Keys, L) ->
+    L.
+
+restrict_n(I, K, Ts, [Key | Keys], L, E) when K > Key ->
+    restrict_n(I, K, Ts, Keys, L, E);
+restrict_n(I, K, Ts, [Key | Keys], L, E) when K == Key ->
+    restrict_n(I, Ts, Key, Keys, [E | L]);
+restrict_n(I, _K, Ts, [Key | Keys], L, _E) ->
+    restrict_n(I, Ts, Key, Keys, L);
+restrict_n(_I, _K, _Ts, _Keys, L, _E) ->
+    L.
+
+restrict([Key | Keys], Tuples) ->
+    restrict(Tuples, Key, Keys, []);
+restrict(_Keys, _Tuples) ->
+    [].
+
+restrict([{K,_E} | Ts], Key, Keys, L) when K < Key ->
+    restrict(Ts, Key, Keys, L);
+restrict([{K,E} | Ts], Key, Keys, L) when K == Key ->
+    restrict(Ts, Key, Keys, [E | L]);
+restrict([{K,E} | Ts], _Key, Keys, L) ->
+    restrict(Ts, K, Keys, L, E);
+restrict(_Ts, _Key, _Keys, L) ->
+    L.
+
+restrict(Ts, K, [Key | Keys], L, E) when K > Key ->
+    restrict(Ts, K, Keys, L, E);
+restrict(Ts, K, [Key | Keys], L, E) when K == Key ->
+    restrict(Ts, Key, Keys, [E | L]);
+restrict(Ts, _K, [Key | Keys], L, _E) ->
+    restrict(Ts, Key, Keys, L);
+restrict(_Ts, _K, _Keys, L, _E) ->
+    L.
+
+diff_restrict_n(I, [T | Ts], Key, Keys, L) ->
+    case element(I, T) of
+	K when K < Key ->
+	    diff_restrict_n(I, Ts, Key, Keys, [T | L]);
+	K when K == Key ->
+	    diff_restrict_n(I, Ts, Key, Keys, L);
+	K ->
+	    diff_restrict_n(I, K, Ts, Keys, L, T)
+    end;
+diff_restrict_n(I, _Ts, _Key, _Keys, L) when I =:= 1 ->
+    reverse(L);
+diff_restrict_n(_I, _Ts, _Key, _Keys, L) ->
+    sort(L).
+
+diff_restrict_n(I, K, Ts, [Key | Keys], L, T) when K > Key ->
+    diff_restrict_n(I, K, Ts, Keys, L, T);
+diff_restrict_n(I, K, Ts, [Key | Keys], L, _T) when K == Key ->
+    diff_restrict_n(I, Ts, Key, Keys, L);
+diff_restrict_n(I, _K, Ts, [Key | Keys], L, T) ->
+    diff_restrict_n(I, Ts, Key, Keys, [T | L]);
+diff_restrict_n(I, _K, Ts, _Keys, L, T) when I =:= 1 ->
+    reverse(L, [T | Ts]);
+diff_restrict_n(_I, _K, Ts, _Keys, L, T) ->
+    sort([T | Ts ++ L]).
+
+diff_restrict([Key | Keys], Tuples) ->
+    diff_restrict(Tuples, Key, Keys, []);
+diff_restrict(_Keys, Tuples) ->
+    diff_restrict_tail(Tuples, []).
+
+diff_restrict([{K,E} | Ts], Key, Keys, L) when K < Key ->
+    diff_restrict(Ts, Key, Keys, [E | L]);
+diff_restrict([{K,_E} | Ts], Key, Keys, L) when K == Key ->
+    diff_restrict(Ts, Key, Keys, L);
+diff_restrict([{K,E} | Ts], _Key, Keys, L) ->
+    diff_restrict(Ts, K, Keys, L, E);
+diff_restrict(_Ts, _Key, _Keys, L) ->
+    L.
+
+diff_restrict(Ts, K, [Key | Keys], L, E) when K > Key ->
+    diff_restrict(Ts, K, Keys, L, E);
+diff_restrict(Ts, K, [Key | Keys], L, _E) when K == Key ->
+    diff_restrict(Ts, Key, Keys, L);
+diff_restrict(Ts, _K, [Key | Keys], L, E) ->
+    diff_restrict(Ts, Key, Keys, [E | L]);
+diff_restrict(Ts, _K, _Keys, L, E) ->
+    diff_restrict_tail(Ts, [E | L]).
+
+diff_restrict_tail([{_K,E} | Ts], L) ->
+    diff_restrict_tail(Ts, [E | L]);
+diff_restrict_tail(_Ts, L) ->
+    L.
+
+comp([], B) ->
+    check_function(B, []);
+comp(_A, []) ->
+    bad_function;
+comp(A0, [{Bx,By} | B]) ->
+    A = converse(A0, []),
+    check_function(A0, comp1(A, B, [], Bx, By)).
+
+comp1([{Ay,Ax} | A], B, L, Bx, By) when Ay == Bx ->
+    comp1(A, B, [{Ax,By} | L], Bx, By);
+comp1([{Ay,Ax} | A], B, L, Bx, _By) when Ay > Bx ->
+    comp2(A, B, L, Bx, Ay, Ax);
+comp1([{Ay,_Ax} | _A], _B, _L, Bx, _By) when Ay < Bx ->
+    bad_function;
+comp1([], B, L, Bx, _By) ->
+    check_function(Bx, B, L).
+
+comp2(A, [{Bx,_By} | B], L, Bx0, Ay, Ax) when Ay > Bx, Bx /= Bx0 ->
+    comp2(A, B, L, Bx, Ay, Ax);
+comp2(A, [{Bx,By} | B], L, _Bx0, Ay, Ax) when Ay == Bx ->
+    comp1(A, B, [{Ax,By} | L], Bx, By);
+comp2(_A, _B, _L, _Bx0, _Ay, _Ax) ->
+    bad_function.
+
+inverse1([{A,B} | X]) ->
+    inverse(X, A, [{B,A}]);
+inverse1([]) ->
+    [].
+
+inverse([{A,B} | X], A0, L) when A0 /= A ->
+    inverse(X, A, [{B,A} | L]);
+inverse([{A,_B} | _X], A0, _L) when A0 == A ->
+    bad_function;
+inverse([], _A0, L) ->
+    SL = [{V,_} | Es] = sort(L),
+    case is_a_func(Es, V) of
+	true -> SL;
+	false -> bad_function
+    end.
+
+%% Inlined.
+external_fun({external, Function}) when is_atom(Function) ->
+    false;
+external_fun({external, Fun}) ->
+    Fun;
+external_fun(_) ->
+    false.
+
+%% Inlined.
+element_type(?SET_OF(Type)) -> Type;
+element_type(Type) -> Type.
+
+subst(Ts, Fun, Type) ->
+    subst(Ts, Fun, Type, ?ANYTYPE, []).
+
+subst([T | Ts], Fun, Type, NType, L) ->
+    case setfun(T, Fun, Type, NType) of
+	{SD, ST} -> subst(Ts, Fun, Type, ST, [{T, SD} | L]);
+	Bad -> Bad
+    end;
+subst([], _Fun, _Type, NType, L) ->
+    {L, NType}.
+
+projection1([E | Es]) ->
+    projection1([], element(1, E), Es);
+projection1([] = L) ->
+    L.
+
+projection1(L, X, [E | Es]) ->
+    case element(1, E) of
+	X1 when X == X1 -> projection1(L, X, Es);
+	X1 -> projection1([X | L], X1, Es)
+    end;
+projection1(L, X, []) ->
+    reverse(L, [X]).
+
+projection_n([E | Es], I, L) ->
+    projection_n(Es, I, [element(I, E) | L]);
+projection_n([], _I, L) ->
+    usort(L).
+
+substitute_element([T | Ts], I, L) ->
+    substitute_element(Ts, I, [{T, element(I, T)} | L]);
+substitute_element(_, _I, L) ->
+    reverse(L).
+
+substitute([T | Ts], Fun, L) ->
+    substitute(Ts, Fun, [{T, Fun(T)} | L]);
+substitute(_, _Fun, L) ->
+    reverse(L).
+
+partition_n(I, [E | Ts]) ->
+    partition_n(I, Ts, element(I, E), [E], []);
+partition_n(_I, []) ->
+    [].
+
+partition_n(I, [E | Ts], K, Es, P) ->
+    case {element(I, E), Es} of
+	{K1, _} when K == K1 ->
+	    partition_n(I, Ts, K, [E | Es], P);
+	{K1, [_]} -> % optimization
+	    partition_n(I, Ts, K1, [E], [Es | P]);
+	{K1, _} ->
+	    partition_n(I, Ts, K1, [E], [reverse(Es) | P])
+    end;
+partition_n(I, [], _K, Es, P) when I > 1 ->
+    sort([reverse(Es) | P]);
+partition_n(_I, [], _K, [_] = Es, P) -> % optimization
+    reverse(P, [Es]);
+partition_n(_I, [], _K, Es, P) ->
+    reverse(P, [reverse(Es)]).
+
+partition3_n(I, [T | Ts], Key, Keys, L1, L2)  ->
+    case element(I, T) of
+	K when K < Key ->
+	    partition3_n(I, Ts, Key, Keys, L1, [T | L2]);
+	K when K == Key ->
+	    partition3_n(I, Ts, Key, Keys, [T | L1], L2);
+	K ->
+	    partition3_n(I, K, Ts, Keys, L1, L2, T)
+    end;
+partition3_n(I, _Ts, _Key, _Keys, L1, L2) when I =:= 1 ->
+    [reverse(L1) | reverse(L2)];
+partition3_n(_I, _Ts, _Key, _Keys, L1, L2) ->
+    [sort(L1) | sort(L2)].
+
+partition3_n(I, K, Ts, [Key | Keys], L1, L2, T) when K > Key ->
+    partition3_n(I, K, Ts, Keys, L1, L2, T);
+partition3_n(I, K, Ts, [Key | Keys], L1, L2, T) when K == Key ->
+    partition3_n(I, Ts, Key, Keys, [T | L1], L2);
+partition3_n(I, _K, Ts, [Key | Keys], L1, L2, T) ->
+    partition3_n(I, Ts, Key, Keys, L1, [T | L2]);
+partition3_n(I, _K, Ts, _Keys, L1, L2, T) when I =:= 1 ->
+    [reverse(L1) | reverse(L2, [T | Ts])];
+partition3_n(_I, _K, Ts, _Keys, L1, L2, T) ->
+    [sort(L1) | sort([T | Ts ++ L2])].
+
+partition3([Key | Keys], Tuples) ->
+    partition3(Tuples, Key, Keys, [], []);
+partition3(_Keys, Tuples) ->
+    partition3_tail(Tuples, [], []).
+
+partition3([{K,E} | Ts], Key, Keys, L1, L2) when K < Key ->
+    partition3(Ts, Key, Keys, L1, [E | L2]);
+partition3([{K,E} | Ts], Key, Keys, L1, L2) when K == Key ->
+    partition3(Ts, Key, Keys, [E | L1], L2);
+partition3([{K,E} | Ts], _Key, Keys, L1, L2) ->
+    partition3(Ts, K, Keys, L1, L2, E);
+partition3(_Ts, _Key, _Keys, L1, L2) ->
+    [L1 | L2].
+
+partition3(Ts, K, [Key | Keys], L1, L2, E) when K > Key ->
+    partition3(Ts, K, Keys, L1, L2, E);
+partition3(Ts, K, [Key | Keys], L1, L2, E) when K == Key ->
+    partition3(Ts, Key, Keys, [E | L1], L2);
+partition3(Ts, _K, [Key | Keys], L1, L2, E) ->
+    partition3(Ts, Key, Keys, L1, [E | L2]);
+partition3(Ts, _K, _Keys, L1, L2, E) ->
+    partition3_tail(Ts, L1, [E | L2]).
+
+partition3_tail([{_K,E} | Ts], L1, L2) ->
+    partition3_tail(Ts, L1, [E | L2]);
+partition3_tail(_Ts, L1, L2) ->
+    [L1 | L2].
+
+replace([E | Es], F, L) ->
+    replace(Es, F, [F(E) | L]);
+replace(_, _F, L) ->
+    sort(L).
+
+mul_relprod([T | Ts], I, R) when ?IS_SET(T) ->
+    P = raise_element(R, I),
+    F = relative_product1(P, T),
+    [F | mul_relprod(Ts, I+1, R)];
+mul_relprod([], _I, _R) ->
+    [].
+
+raise_element(R, I) ->
+    L = sort(I =/= 1, rearr(?LIST(R), I, [])),
+    Type = ?TYPE(R),
+    ?SET(L, ?BINREL(?REL_TYPE(I, Type), Type)).
+
+rearr([E | Es], I, L) ->
+    rearr(Es, I, [{element(I, E), E} | L]);
+rearr([], _I, L) ->
+    L.
+
+join_element(E1, E2) ->
+    [_ | L2] = tuple_to_list(E2),
+    list_to_tuple(tuple_to_list(E1) ++ L2).
+
+join_element(E1, E2, I2) ->
+    tuple_to_list(E1) ++ join_element2(tuple_to_list(E2), 1, I2).
+
+join_element2([B | Bs], C, I2) when C =/= I2 ->
+    [B | join_element2(Bs, C+1, I2)];
+join_element2([_ | Bs], _C, _I2) ->
+    Bs.
+
+family2rel([{X,S} | F], L) ->
+    fam2rel(F, L, X, S);
+family2rel([], L) ->
+    reverse(L).
+
+fam2rel(F, L, X, [Y | Ys]) ->
+    fam2rel(F, [{X,Y} | L], X, Ys);
+fam2rel(F, L, _X, _) ->
+    family2rel(F, L).
+
+fam_spec([{_,S}=E | F], Fun, Type, L) ->
+    case Fun(?SET(S, Type)) of
+        true ->
+            fam_spec(F, Fun, Type, [E | L]);
+        false ->
+            fam_spec(F, Fun, Type, L);
+	_ ->
+	    badarg
+    end;
+fam_spec([], _Fun, _Type, L) ->
+    reverse(L).
+
+fam_specification([{_,S}=E | F], Fun, L) ->
+    case Fun(S) of
+        true ->
+            fam_specification(F, Fun, [E | L]);
+        false ->
+            fam_specification(F, Fun, L);
+	_ ->
+	    badarg
+    end;
+fam_specification([], _Fun, L) ->
+    reverse(L).
+
+un_of_fam([{_X,S} | F], L) ->
+    un_of_fam(F, [S | L]);
+un_of_fam([], L) ->
+    lunion(sort(L)).
+
+int_of_fam([{_,S} | F]) ->
+    int_of_fam(F, [S]);
+int_of_fam([]) ->
+    badarg.
+
+int_of_fam([{_,S} | F], L) ->
+    int_of_fam(F, [S | L]);
+int_of_fam([], [L | Ls]) ->
+    lintersection(Ls, L).
+
+fam_un([{X,S} | F], L) ->
+    fam_un(F, [{X, lunion(S)} | L]);
+fam_un([], L) ->
+    reverse(L).
+
+fam_int([{X, [S | Ss]} | F], L) ->
+    fam_int(F, [{X, lintersection(Ss, S)} | L]);
+fam_int([{_X,[]} | _F], _L) ->
+    badarg;
+fam_int([], L) ->
+    reverse(L).
+
+fam_dom([{X,S} | F], L) ->
+    fam_dom(F, [{X, dom(S)} | L]);
+fam_dom([], L) ->
+    reverse(L).
+
+fam_ran([{X,S} | F], L) ->
+    fam_ran(F, [{X, ran(S, [])} | L]);
+fam_ran([], L) ->
+    reverse(L).
+
+fam_union(F1 = [{A,_AS} | _AL], [B1={B,_BS} | BL], L) when A > B ->
+    fam_union(F1, BL, [B1 | L]);
+fam_union([{A,AS} | AL], [{B,BS} | BL], L) when A == B ->
+    fam_union(AL, BL, [{A, umerge(AS, BS)} | L]);
+fam_union([A1 | AL], F2, L) ->
+    fam_union(AL, F2, [A1 | L]);
+fam_union(_, F2, L) ->
+    reverse(L, F2).
+
+fam_intersect(F1 = [{A,_AS} | _AL], [{B,_BS} | BL], L) when A > B ->
+    fam_intersect(F1, BL, L);
+fam_intersect([{A,AS} | AL], [{B,BS} | BL], L) when A == B ->
+    fam_intersect(AL, BL, [{A, intersection(AS, BS, [])} | L]);
+fam_intersect([_A1 | AL], F2, L) ->
+    fam_intersect(AL, F2, L);
+fam_intersect(_, _, L) ->
+    reverse(L).
+
+fam_difference(F1 = [{A,_AS} | _AL], [{B,_BS} | BL], L) when A > B ->
+    fam_difference(F1, BL, L);
+fam_difference([{A,AS} | AL], [{B,BS} | BL], L) when A == B ->
+    fam_difference(AL, BL, [{A, difference(AS, BS, [])} | L]);
+fam_difference([A1 | AL], F2, L) ->
+    fam_difference(AL, F2, [A1 | L]);
+fam_difference(F1, _, L) ->
+    reverse(L, F1).
+
+check_function([{X,_} | XL], R) ->
+    check_function(X, XL, R);
+check_function([], R) ->
+    R.
+
+check_function(X0, [{X,_} | XL], R) when X0 /= X ->
+    check_function(X, XL, R);
+check_function(X0, [{X,_} | _XL], _R) when X0 == X ->
+    bad_function;
+check_function(_X0, [], R) ->
+    R.
+
+fam_partition_n(I, [E | Ts]) ->
+    fam_partition_n(I, Ts, element(I, E), [E], []);
+fam_partition_n(_I, []) ->
+    [].
+
+fam_partition_n(I, [E | Ts], K, Es, P) ->
+    case {element(I, E), Es} of
+	{K1, _} when K == K1 ->
+	    fam_partition_n(I, Ts, K, [E | Es], P);
+	{K1, [_]} -> % optimization
+	    fam_partition_n(I, Ts, K1, [E], [{K,Es} | P]);
+	{K1, _} ->
+	    fam_partition_n(I, Ts, K1, [E], [{K,reverse(Es)} | P])
+    end;
+fam_partition_n(_I, [], K, [_] = Es, P) -> % optimization
+    reverse(P, [{K,Es}]);
+fam_partition_n(_I, [], K, Es, P) ->
+    reverse(P, [{K,reverse(Es)}]).
+
+fam_partition([{K,Vs} | Ts], Sort) ->
+    fam_partition(Ts, K, [Vs], [], Sort);
+fam_partition([], _Sort) ->
+    [].
+
+fam_partition([{K1,V} | Ts], K, Vs, P, S) when K1 == K ->
+    fam_partition(Ts, K, [V | Vs], P, S);
+fam_partition([{K1,V} | Ts], K, [_] = Vs, P, S) -> % optimization
+    fam_partition(Ts, K1, [V], [{K, Vs} | P], S);
+fam_partition([{K1,V} | Ts], K, Vs, P, S) ->
+    fam_partition(Ts, K1, [V], [{K, sort(S, Vs)} | P], S);
+fam_partition([], K, [_] = Vs, P, _S) -> % optimization
+    [{K, Vs} | P];
+fam_partition([], K, Vs, P, S) ->
+    [{K, sort(S, Vs)} | P].
+
+fam_proj([{X,S} | F], Fun, Type, NType, L) ->
+    case setfun(S, Fun, Type, NType) of
+	{SD, ST} -> fam_proj(F, Fun, Type, ST, [{X, SD} | L]);
+	Bad -> Bad
+    end;
+fam_proj([], _Fun, _Type, NType, L) ->
+    {reverse(L), NType}.
+
+setfun(T, Fun, Type, NType) ->
+    case Fun(term2set(T, Type)) of
+	NS when ?IS_SET(NS) ->
+	    case unify_types(NType, ?SET_OF(?TYPE(NS))) of
+		[] -> type_mismatch;
+		NT -> {?LIST(NS), NT}
+	    end;
+	NS when ?IS_ORDSET(NS) ->
+	    case unify_types(NType, NT = ?ORDTYPE(NS)) of
+		[] -> type_mismatch;
+		NT -> {?ORDDATA(NS), NT}
+	    end;
+	_ ->
+	    badarg
+    end.
+
+%% Inlined.
+term2set(L, Type) when is_list(L) ->
+    ?SET(L, Type);
+term2set(T, Type) ->
+    ?ORDSET(T, Type).
+
+fam2digraph(F, G) ->
+    Fun = fun({From, ToL}) ->
+                  digraph:add_vertex(G, From),
+                  Fun2 = fun(To) ->
+                                 digraph:add_vertex(G, To),
+                                 case digraph:add_edge(G, From, To) of
+                                     {error, {bad_edge, _}} ->
+                                         throw({error, cyclic});
+                                     _ ->
+                                         true
+                                 end
+                         end,
+                  foreach(Fun2, ToL)
+          end,
+    foreach(Fun, to_external(F)),
+    G.
+
+digraph_family(G) ->
+    Vs = sort(digraph:vertices(G)),
+    digraph_fam(Vs, Vs, G, []).
+
+digraph_fam([V | Vs], V0, G, L) when V /= V0 ->
+    Ns = sort(digraph:out_neighbours(G, V)),
+    digraph_fam(Vs, V, G, [{V,Ns} | L]);
+digraph_fam([], _V0, _G, L) ->
+    reverse(L).
+
+%% -> boolean()
+check_fun(T, F, FunT) ->
+    true = is_type(FunT),
+    {NT, _MaxI} = number_tuples(T, 1),
+    L = flatten(tuple2list(F(NT))),
+    has_hole(L, 1).
+
+number_tuples(T, N) when is_tuple(T) ->
+    {L, NN} = mapfoldl(fun number_tuples/2, N, tuple_to_list(T)),
+    {list_to_tuple(L), NN};
+number_tuples(_, N) ->
+    {N, N+1}.
+
+tuple2list(T) when is_tuple(T) ->
+    map(fun tuple2list/1, tuple_to_list(T));
+tuple2list(C) ->
+    [C].
+
+has_hole([I | Is], I0) when I =< I0 -> has_hole(Is, erlang:max(I+1, I0));
+has_hole(Is, _I) -> Is =/= [].
+
+%% Optimization. Same as check_fun/3, but for integers.
+check_for_sort(T, _I) when T =:= ?ANYTYPE ->
+    empty;
+check_for_sort(T, I) when ?IS_RELATION(T), I =< ?REL_ARITY(T), I >= 1 ->
+    I > 1;
+check_for_sort(_T, _I) ->
+    error.
+
+inverse_substitution(L, Fun, Sort) ->
+    %% One easily sees that the inverse of the tuples created by
+    %% applying Fun need to be sorted iff the tuples created by Fun
+    %% need to be sorted.
+    sort(Sort, fun_rearr(L, Fun, [])).
+
+fun_rearr([E | Es], Fun, L) ->
+    fun_rearr(Es, Fun, [{Fun(E), E} | L]);
+fun_rearr([], _Fun, L) ->
+    L.
+
+sets_to_list(Ss) ->
+    map(fun(S) when ?IS_SET(S) -> ?LIST(S) end, Ss).
+
+types([], L) ->
+    list_to_tuple(reverse(L));
+types([S | _Ss], _L) when ?TYPE(S) =:= ?ANYTYPE ->
+    ?ANYTYPE;
+types([S | Ss], L) ->
+    types(Ss, [?TYPE(S) | L]).
+
+%% Inlined.
+unify_types(T, T) -> T;
+unify_types(Type1, Type2) ->
+    catch unify_types1(Type1, Type2).
+
+unify_types1(Atom, Atom) when ?IS_ATOM_TYPE(Atom) ->
+    Atom;
+unify_types1(?ANYTYPE, Type) ->
+    Type;
+unify_types1(Type, ?ANYTYPE) ->
+    Type;
+unify_types1(?SET_OF(Type1), ?SET_OF(Type2)) ->
+    [unify_types1(Type1, Type2)];
+unify_types1(T1, T2) when tuple_size(T1) =:= tuple_size(T2) ->
+    unify_typesl(tuple_size(T1), T1, T2, []);
+unify_types1(_T1, _T2) ->
+    throw([]).
+
+unify_typesl(0, _T1, _T2, L) ->
+    list_to_tuple(L);
+unify_typesl(N, T1, T2, L) ->
+    T = unify_types1(?REL_TYPE(N, T1), ?REL_TYPE(N, T2)),
+    unify_typesl(N-1, T1, T2, [T | L]).
+
+%% inlined.
+match_types(T, T) -> true;
+match_types(Type1, Type2) -> match_types1(Type1, Type2).
+
+match_types1(Atom, Atom) when ?IS_ATOM_TYPE(Atom) ->
+    true;
+match_types1(?ANYTYPE, _) ->
+    true;
+match_types1(_, ?ANYTYPE) ->
+    true;
+match_types1(?SET_OF(Type1), ?SET_OF(Type2)) ->
+    match_types1(Type1, Type2);
+match_types1(T1, T2) when tuple_size(T1) =:= tuple_size(T2) ->
+    match_typesl(tuple_size(T1), T1, T2);
+match_types1(_T1, _T2) ->
+    false.
+
+match_typesl(0, _T1, _T2) ->
+    true;
+match_typesl(N, T1, T2) ->
+    case match_types1(?REL_TYPE(N, T1), ?REL_TYPE(N, T2)) of
+        true  -> match_typesl(N-1, T1, T2);
+        false -> false
+    end.
+
+sort(true, L) ->
+    sort(L);
+sort(false, L) ->
+    reverse(L).
diff --git a/lib/tools/test/tools_bench.spec b/lib/tools/test/tools_bench.spec
new file mode 100644
index 0000000000..ef08fd68a8
--- /dev/null
+++ b/lib/tools/test/tools_bench.spec
@@ -0,0 +1 @@
+{suites,"../tools_test",[prof_bench_SUITE]}.
diff --git a/lib/tools/vsn.mk b/lib/tools/vsn.mk
index bb8305e9f1..191a458c62 100644
--- a/lib/tools/vsn.mk
+++ b/lib/tools/vsn.mk
@@ -1 +1 @@
-TOOLS_VSN = 3.0.2
+TOOLS_VSN = 3.2
diff --git a/lib/wx/api_gen/wx_extra/added_func.h b/lib/wx/api_gen/wx_extra/added_func.h
index bffe391140..28fecbf454 100644
--- a/lib/wx/api_gen/wx_extra/added_func.h
+++ b/lib/wx/api_gen/wx_extra/added_func.h
@@ -44,3 +44,9 @@ class wxWindowGTK {
  public:
     double GetContentScaleFactor();
 };
+
+class wxDisplay {
+    public:
+    // get the resolution of this monitor in pixels per inch
+    wxSize GetPPI() const;
+};
diff --git a/lib/wx/api_gen/wx_gen.erl b/lib/wx/api_gen/wx_gen.erl
index cec6ac9ccf..8a00498319 100644
--- a/lib/wx/api_gen/wx_gen.erl
+++ b/lib/wx/api_gen/wx_gen.erl
@@ -701,8 +701,13 @@ parse_type2(["wxe_cb"|R],Info,Opts, T) ->
     parse_type2(R,Info,Opts,T#type{name=int,base=wxe_cb});
 parse_type2([const|R],Info,Opts,T=#type{mod=Mod}) -> 
     parse_type2(R,Info,Opts,T#type{mod=[const|Mod]});
-parse_type2(["unsigned"|R],Info,Opts,T=#type{mod=Mod}) -> 
-    parse_type2(R,Info,Opts,T#type{mod=[unsigned|Mod]});
+parse_type2(["unsigned"|R],Info,Opts,T=#type{mod=Mod}) ->
+    case T#type.base of
+        undefined ->
+            parse_type2(R,Info,Opts,T#type{name=int, base=int, mod=[unsigned|Mod]});
+        _ ->
+            parse_type2(R,Info,Opts,T#type{mod=[unsigned|Mod]})
+    end;
 parse_type2(["int"|R],Info,Opts,  T) -> 
     parse_type2(R,Info,Opts,T#type{name=int,base=int});
 parse_type2(["wxByte"|R],Info,Opts,  T) ->
diff --git a/lib/wx/api_gen/wx_gen_cpp.erl b/lib/wx/api_gen/wx_gen_cpp.erl
index f13d5873a0..c6f2534380 100644
--- a/lib/wx/api_gen/wx_gen_cpp.erl
+++ b/lib/wx/api_gen/wx_gen_cpp.erl
@@ -1165,6 +1165,7 @@ gen_macros() ->
     w("#include <wx/fontdlg.h>~n"),
     w("#include <wx/progdlg.h>~n"),
     w("#include <wx/printdlg.h>~n"),
+    w("#include <wx/display.h>~n"),
     w("#include <wx/dcbuffer.h>~n"),
     w("#include <wx/dcmirror.h>~n"),
     w("#include <wx/glcanvas.h>~n"),
@@ -1176,6 +1177,7 @@ gen_macros() ->
     w("#include <wx/sashwin.h>~n"),
     w("#include <wx/laywin.h>~n"),
     w("#include <wx/graphics.h>~n"),
+    w("#include <wx/dcgraph.h>~n"),
     w("#include <wx/aui/aui.h>~n"),
     w("#include <wx/datectrl.h>~n"),
     w("#include <wx/filepicker.h>~n"),
@@ -1330,8 +1332,10 @@ encode_events(Evs) ->
     w(" } else {~n"),
     w("   send_res =  rt.send();~n"),
     w("   if(cb->skip) event->Skip();~n"),
-    #class{id=MouseId} = lists:keyfind("wxMouseEvent", #class.name, Evs),
-    w("   if(app->recurse_level < 1 && Etype->cID != ~p) {~n", [MouseId]),
+    #class{id=SizeId} = lists:keyfind("wxSizeEvent", #class.name, Evs),
+    #class{id=MoveId} = lists:keyfind("wxMoveEvent", #class.name, Evs),
+    w("   if(app->recurse_level < 1 && (Etype->cID == ~w || Etype->cID == ~w)) {~n",
+      [SizeId, MoveId]),
     w("     app->recurse_level++;~n"),
     w("     app->dispatch_cmds();~n"),
     w("     app->recurse_level--;~n"),
diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf
index c1b55b6875..9707fedf67 100644
--- a/lib/wx/api_gen/wxapi.conf
+++ b/lib/wx/api_gen/wxapi.conf
@@ -27,7 +27,7 @@
 {not_const,  [wxHAS_INT64,wxBYTE_ORDER,wxRETAINED,
 	      wxFONTENCODING_UTF32,wxFONTENCODING_UTF16,
 	      wxDEFAULT_CONTROL_BORDER,wxMOD_CMD,
-	      wxMAJOR_VERSION, wxMINOR_VERSION, 
+	      wxMAJOR_VERSION, wxMINOR_VERSION,
 	      wxRELEASE_NUMBER,wxSUBRELEASE_NUMBER,wxBETA_NUMBER,
 	      %%
 	      wxALWAYS_NATIVE_DOUBLE_BUFFER,
@@ -37,16 +37,30 @@
 	      wxCURSOR_DEFAULT,
 	      wxCURSOR_ARROWWAIT,
 	      wxCURSOR_MAX,
-	      wxLanguage
+	      wxLanguage,
+              wxFONTWEIGHT_NORMAL,
+              wxFONTWEIGHT_LIGHT,
+              wxFONTWEIGHT_BOLD,
+              wxFONTWEIGHT_MAX
 	     ]}.
 
-{gvars, 
+{gvars,
  [
   {wxITALIC_FONT, wxFont},
   {wxNORMAL_FONT, wxFont},
   {wxSMALL_FONT,  wxFont},
   {wxSWISS_FONT,  wxFont},
-  
+
+  %% Added (enum) values in 3.1.2
+  {wxFONTWEIGHT_INVALID, {test_if, "wxCHECK_VERSION(3,1,2)"}},
+  {wxFONTWEIGHT_THIN, {test_if, "wxCHECK_VERSION(3,1,2)"}},
+  {wxFONTWEIGHT_EXTRALIGHT, {test_if, "wxCHECK_VERSION(3,1,2)"}},
+  {wxFONTWEIGHT_MEDIUM, {test_if, "wxCHECK_VERSION(3,1,2)"}},
+  {wxFONTWEIGHT_SEMIBOLD, {test_if, "wxCHECK_VERSION(3,1,2)"}},
+  {wxFONTWEIGHT_EXTRABOLD, {test_if, "wxCHECK_VERSION(3,1,2)"}},
+  {wxFONTWEIGHT_HEAVY, {test_if, "wxCHECK_VERSION(3,1,2)"}},
+  {wxFONTWEIGHT_EXTRAHEAVY, {test_if, "wxCHECK_VERSION(3,1,2)"}},
+
   {wxBLACK_DASHED_PEN, wxPen},
   {wxBLACK_PEN, wxPen},
   {wxCYAN_PEN, wxPen},
@@ -2016,3 +2030,17 @@
  ['GetPosition', 'GetNumberOfFiles',
   {'GetFiles', [{return, [{single, {list, 'm_noFiles'}}]}]}
  ]}.
+
+
+{class, wxDisplay, root, [{ifdef, wxUSE_DISPLAY}],
+ ['wxDisplay', '~wxDisplay',
+  'IsOk',
+  {'GetClientArea', [{test_if, "wxCHECK_VERSION(2,8,12)"}]},
+  'GetGeometry', 'GetName', 'IsPrimary',
+  'GetCount', 'GetFromPoint', 'GetFromWindow',
+  {'GetPPI', [{test_if, "wxCHECK_VERSION(3,1,2)"}]}
+ ]}.
+
+{class, wxGCDC, wxDC, [{ifdef, wxUSE_GRAPHICS_CONTEXT}],
+ ['wxGCDC', '~wxGCDC', 'GetGraphicsContext', 'SetGraphicsContext'
+ ]}.
diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in
index daa8afce83..daadf5e785 100644
--- a/lib/wx/c_src/Makefile.in
+++ b/lib/wx/c_src/Makefile.in
@@ -70,7 +70,7 @@ else
 RC_FILE     = 
 endif
 
-WX_OBJECTS  = $(GENERAL_O) $(GENERATED_O) $(RC_FILE)
+WX_OBJECTS  =  $(GENERATED_O) $(GENERAL_O) $(RC_FILE)
 
 OBJECTS = $(WX_OBJECTS) $(GL_OBJECTS)
 
@@ -86,7 +86,7 @@ LD		= $(CXX)
 LDFLAGS		= @LDFLAGS@
 RESCOMP		= @WX_RESCOMP@
 
-ifeq (@WX_HAVE_STATIC_LIBS@,true) 
+ifeq (@WX_HAVE_STATIC_LIBS@,true)
 OPT_WX_LIBS      =  @WX_LIBS_STATIC@
 DEBUG_WX_LIBS    =  @DEBUG_WX_LIBS_STATIC@
 else
@@ -97,14 +97,16 @@ endif
 ifeq ($(TYPE),debug)
 WX_CFLAGS	= @DEBUG_WX_CFLAGS@
 CFLAGS          = @DEBUG_CFLAGS@
-WX_CXX_FLAGS	= @DEBUG_WX_CXXFLAGS@ 
+WX_CXX_FLAGS	= @DEBUG_WX_CXXFLAGS@
 CXX_FLAGS       = @DEBUG_CXXFLAGS@
+CXX_NO_OPT_FLAGS = @DEBUG_CXXFLAGS@
 WX_LIBS		= $(DEBUG_WX_LIBS)
 else
 WX_CFLAGS	= @WX_CFLAGS@
 CFLAGS          = @CFLAGS@
-WX_CXX_FLAGS	= @WX_CXXFLAGS@ 
+WX_CXX_FLAGS	= @WX_CXXFLAGS@
 CXX_FLAGS       = @CXXFLAGS@
+CXX_NO_OPT_FLAGS = @CXXNOOPTFLAGS@
 WX_LIBS		= $(OPT_WX_LIBS)
 endif
 
@@ -113,6 +115,7 @@ GL_LIBS         = @GL_LIBS@
 CC_O		= $(V_CC) -c $(CFLAGS) $(WX_CFLAGS) $(COMMON_CFLAGS)
 OBJC_CC_O	= $(OBJC_CC) -c $(CFLAGS) $(OBJC_CFLAGS) $(WX_CFLAGS) $(COMMON_CFLAGS)
 CXX_O		= $(V_CXX) -c $(CXX_FLAGS) $(WX_CXX_FLAGS)  $(COMMON_CFLAGS)
+CXX_O_NO_OPT    = $(V_CXX) -c $(CXX_NO_OPT_FLAGS) $(WX_CXX_FLAGS)  $(COMMON_CFLAGS)
 
 # Targets
 
@@ -152,6 +155,10 @@ $(SYS_TYPE)/wxe_ps_init.o: wxe_ps_init.c
 	$(V_at)mkdir -p $(SYS_TYPE)
 	$(cc_verbose)$(OBJC_CC_O) $< -o $@
 
+$(SYS_TYPE)/wxe_funcs.o: gen/wxe_funcs.cpp
+	$(V_at)mkdir -p $(SYS_TYPE)
+	$(CXX_O_NO_OPT) $< -o $@
+
 $(SYS_TYPE)/%.o: gen/%.cpp 
 	$(V_at)mkdir -p $(SYS_TYPE)
 	$(CXX_O) $< -o $@
@@ -181,6 +188,7 @@ release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
 	$(INSTALL_DATA) ../priv/erlang-logo32.png "$(RELSYSDIR)/priv/"
 	$(INSTALL_DATA) ../priv/erlang-logo64.png "$(RELSYSDIR)/priv/"
+	$(INSTALL_DATA) ../priv/erlang-logo128.png "$(RELSYSDIR)/priv/"
 	$(INSTALL_PROGRAM) $(TARGET_DIR)/wxe_driver$(SO_EXT) "$(RELSYSDIR)/priv/"
 	$(INSTALL_PROGRAM) $(TARGET_DIR)/erl_gl$(SO_EXT) "$(RELSYSDIR)/priv/"
 
diff --git a/lib/wx/c_src/gen/wxe_derived_dest.h b/lib/wx/c_src/gen/wxe_derived_dest.h
index fc0ae0d9fc..a7114eb188 100644
--- a/lib/wx/c_src/gen/wxe_derived_dest.h
+++ b/lib/wx/c_src/gen/wxe_derived_dest.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.
@@ -799,3 +799,11 @@ class EwxDCOverlay : public wxDCOverlay {
  EwxDCOverlay(wxOverlay& overlay,wxWindowDC * dc) : wxDCOverlay(overlay,dc) {};
 };
 
+#if wxUSE_GRAPHICS_CONTEXT
+class EwxGCDC : public wxGCDC {
+ public: ~EwxGCDC() {((WxeApp *)wxTheApp)->clearPtr(this);};
+ EwxGCDC(const wxWindowDC& dc) : wxGCDC(dc) {};
+ EwxGCDC() : wxGCDC() {};
+};
+#endif // wxUSE_GRAPHICS_CONTEXT
+
diff --git a/lib/wx/c_src/gen/wxe_events.cpp b/lib/wx/c_src/gen/wxe_events.cpp
index 01787c8a64..8c3283a670 100644
--- a/lib/wx/c_src/gen/wxe_events.cpp
+++ b/lib/wx/c_src/gen/wxe_events.cpp
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2016. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2019. 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.
@@ -910,7 +910,7 @@ case 238: {// wxDropFilesEvent
  } else {
    send_res =  rt.send();
    if(cb->skip) event->Skip();
-   if(app->recurse_level < 1 && Etype->cID != 168) {
+   if(app->recurse_level < 1 && (Etype->cID == 171 || Etype->cID == 172)) {
      app->recurse_level++;
      app->dispatch_cmds();
      app->recurse_level--;
diff --git a/lib/wx/c_src/gen/wxe_funcs.cpp b/lib/wx/c_src/gen/wxe_funcs.cpp
index 74961b2e5e..32e4bf855b 100644
--- a/lib/wx/c_src/gen/wxe_funcs.cpp
+++ b/lib/wx/c_src/gen/wxe_funcs.cpp
@@ -32113,6 +32113,120 @@ case wxDropFilesEvent_GetFiles: { // wxDropFilesEvent::GetFiles
  rt.add(tmpArrayStr);
  break;
 }
+#if wxUSE_DISPLAY
+case wxDisplay_new: { // wxDisplay::wxDisplay
+ int n=0;
+ while( * (int*) bp) { switch (* (int*) bp) {
+  case 1: {bp += 4;
+ n = (int)*(unsigned int *) bp; bp += 4;
+  } break;
+ }};
+ wxDisplay * Result = new wxDisplay(n);
+ newPtr((void *) Result, 239, memenv);
+ rt.addRef(getRef((void *)Result,memenv), "wxDisplay");
+ break;
+}
+case wxDisplay_destruct: { // wxDisplay::~wxDisplay
+ wxDisplay *This = (wxDisplay *) getPtr(bp,memenv); bp += 4;
+ if(This) {   ((WxeApp *) wxTheApp)->clearPtr((void *) This);
+   delete This;}
+ break;
+}
+case wxDisplay_IsOk: { // wxDisplay::IsOk
+ wxDisplay *This = (wxDisplay *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+ bool Result = This->IsOk();
+ rt.addBool(Result);
+ break;
+}
+#if wxCHECK_VERSION(2,8,12)
+case wxDisplay_GetClientArea: { // wxDisplay::GetClientArea
+ wxDisplay *This = (wxDisplay *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+ wxRect Result = This->GetClientArea();
+ rt.add(Result);
+ break;
+}
+#endif
+case wxDisplay_GetGeometry: { // wxDisplay::GetGeometry
+ wxDisplay *This = (wxDisplay *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+ wxRect Result = This->GetGeometry();
+ rt.add(Result);
+ break;
+}
+case wxDisplay_GetName: { // wxDisplay::GetName
+ wxDisplay *This = (wxDisplay *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+ wxString Result = This->GetName();
+ rt.add(Result);
+ break;
+}
+case wxDisplay_IsPrimary: { // wxDisplay::IsPrimary
+ wxDisplay *This = (wxDisplay *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+ bool Result = This->IsPrimary();
+ rt.addBool(Result);
+ break;
+}
+case wxDisplay_GetCount: { // wxDisplay::GetCount
+ int Result = wxDisplay::GetCount();
+ rt.addUint(Result);
+ break;
+}
+case wxDisplay_GetFromPoint: { // wxDisplay::GetFromPoint
+ int * ptX = (int *) bp; bp += 4;
+ int * ptY = (int *) bp; bp += 4;
+ wxPoint pt = wxPoint(*ptX,*ptY);
+ int Result = wxDisplay::GetFromPoint(pt);
+ rt.addInt(Result);
+ break;
+}
+case wxDisplay_GetFromWindow: { // wxDisplay::GetFromWindow
+ wxWindow *window = (wxWindow *) getPtr(bp,memenv); bp += 4;
+ int Result = wxDisplay::GetFromWindow(window);
+ rt.addInt(Result);
+ break;
+}
+#if wxCHECK_VERSION(3,1,2)
+case wxDisplay_GetPPI: { // wxDisplay::GetPPI
+ wxDisplay *This = (wxDisplay *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+ wxSize Result = This->GetPPI();
+ rt.add(Result);
+ break;
+}
+#endif
+#endif // wxUSE_DISPLAY
+#if wxUSE_GRAPHICS_CONTEXT
+case wxGCDC_new_1: { // wxGCDC::wxGCDC
+ wxWindowDC *dc = (wxWindowDC *) getPtr(bp,memenv); bp += 4;
+ wxGCDC * Result = new EwxGCDC(*dc);
+ newPtr((void *) Result, 8, memenv);
+ rt.addRef(getRef((void *)Result,memenv), "wxGCDC");
+ break;
+}
+case wxGCDC_new_0: { // wxGCDC::wxGCDC
+ wxGCDC * Result = new EwxGCDC();
+ newPtr((void *) Result, 8, memenv);
+ rt.addRef(getRef((void *)Result,memenv), "wxGCDC");
+ break;
+}
+case wxGCDC_GetGraphicsContext: { // wxGCDC::GetGraphicsContext
+ wxGCDC *This = (wxGCDC *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+ wxGraphicsContext * Result = (wxGraphicsContext*)This->GetGraphicsContext();
+ rt.addRef(getRef((void *)Result,memenv,8), "wxGraphicsContext");
+ break;
+}
+case wxGCDC_SetGraphicsContext: { // wxGCDC::SetGraphicsContext
+ wxGCDC *This = (wxGCDC *) getPtr(bp,memenv); bp += 4;
+ wxGraphicsContext *ctx = (wxGraphicsContext *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+ This->SetGraphicsContext(ctx);
+ break;
+}
+#endif // wxUSE_GRAPHICS_CONTEXT
   default: {
     wxeReturn error = wxeReturn(WXE_DRV_PORT, Ecmd.caller, false);    error.addAtom("_wxe_error_");
     error.addInt((int) op);
@@ -32174,6 +32288,7 @@ bool WxeApp::delete_object(void *ptr, wxeRefData *refd) {
   case 231: delete (EwxLocale *) ptr; return false;
   case 236: delete (wxOverlay *) ptr; break;
   case 237: delete (EwxDCOverlay *) ptr; return false;
+  case 239: delete (wxDisplay *) ptr; break;
   default: delete (wxObject *) ptr; return false;
   }
   return true;
diff --git a/lib/wx/c_src/gen/wxe_init.cpp b/lib/wx/c_src/gen/wxe_init.cpp
index 6ce33a5449..5a52d69003 100644
--- a/lib/wx/c_src/gen/wxe_init.cpp
+++ b/lib/wx/c_src/gen/wxe_init.cpp
@@ -55,6 +55,14 @@ void WxeApp::init_nonconsts(wxeMemEnv *memenv, ErlDrvTermData caller) {
  rt.addTupleCount(2);
  rt.addAtom("wxFONTENCODING_UTF32"); rt.addInt(wxFONTENCODING_UTF32);
  rt.addTupleCount(2);
+ rt.addAtom("wxFONTWEIGHT_BOLD"); rt.addInt(wxFONTWEIGHT_BOLD);
+ rt.addTupleCount(2);
+ rt.addAtom("wxFONTWEIGHT_LIGHT"); rt.addInt(wxFONTWEIGHT_LIGHT);
+ rt.addTupleCount(2);
+ rt.addAtom("wxFONTWEIGHT_MAX"); rt.addInt(wxFONTWEIGHT_MAX);
+ rt.addTupleCount(2);
+ rt.addAtom("wxFONTWEIGHT_NORMAL"); rt.addInt(wxFONTWEIGHT_NORMAL);
+ rt.addTupleCount(2);
  rt.addAtom("wxMOD_CMD"); rt.addInt(wxMOD_CMD);
  rt.addTupleCount(2);
  rt.addAtom("wxLANGUAGE_ABKHAZIAN"); rt.addInt(wxLANGUAGE_ABKHAZIAN);
@@ -654,6 +662,62 @@ void WxeApp::init_nonconsts(wxeMemEnv *memenv, ErlDrvTermData caller) {
    rt.addTupleCount(2);
    rt.addAtom("wxCYAN_PEN"); rt.addRef(getRef((void *)wxCYAN_PEN,memenv),"wxPen");
    rt.addTupleCount(2);
+#if wxCHECK_VERSION(3,1,2)
+ rt.addAtom("wxFONTWEIGHT_EXTRABOLD"); rt.addInt(wxFONTWEIGHT_EXTRABOLD);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("wxFONTWEIGHT_EXTRABOLD"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,1,2)
+ rt.addAtom("wxFONTWEIGHT_EXTRAHEAVY"); rt.addInt(wxFONTWEIGHT_EXTRAHEAVY);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("wxFONTWEIGHT_EXTRAHEAVY"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,1,2)
+ rt.addAtom("wxFONTWEIGHT_EXTRALIGHT"); rt.addInt(wxFONTWEIGHT_EXTRALIGHT);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("wxFONTWEIGHT_EXTRALIGHT"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,1,2)
+ rt.addAtom("wxFONTWEIGHT_HEAVY"); rt.addInt(wxFONTWEIGHT_HEAVY);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("wxFONTWEIGHT_HEAVY"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,1,2)
+ rt.addAtom("wxFONTWEIGHT_INVALID"); rt.addInt(wxFONTWEIGHT_INVALID);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("wxFONTWEIGHT_INVALID"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,1,2)
+ rt.addAtom("wxFONTWEIGHT_MEDIUM"); rt.addInt(wxFONTWEIGHT_MEDIUM);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("wxFONTWEIGHT_MEDIUM"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,1,2)
+ rt.addAtom("wxFONTWEIGHT_SEMIBOLD"); rt.addInt(wxFONTWEIGHT_SEMIBOLD);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("wxFONTWEIGHT_SEMIBOLD"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
+#if wxCHECK_VERSION(3,1,2)
+ rt.addAtom("wxFONTWEIGHT_THIN"); rt.addInt(wxFONTWEIGHT_THIN);
+ rt.addTupleCount(2);
+#else
+ rt.addAtom("wxFONTWEIGHT_THIN"); rt.addAtom("undefined");
+ rt.addTupleCount(2);
+#endif
    rt.addAtom("wxGREEN"); rt.add(*(wxGREEN));
    rt.addTupleCount(2);
    rt.addAtom("wxGREEN_BRUSH"); rt.addRef(getRef((void *)wxGREEN_BRUSH,memenv),"wxBrush");
@@ -723,7 +787,7 @@ void WxeApp::init_nonconsts(wxeMemEnv *memenv, ErlDrvTermData caller) {
  rt.addAtom("wx_GL_COMPAT_PROFILE"); rt.addAtom("undefined");
  rt.addTupleCount(2);
 #endif
- rt.endList(309);
+ rt.endList(321);
  rt.addTupleCount(2);
   rt.send();
 }
diff --git a/lib/wx/c_src/gen/wxe_macros.h b/lib/wx/c_src/gen/wxe_macros.h
index 4c8e52def2..c23e8a83bd 100644
--- a/lib/wx/c_src/gen/wxe_macros.h
+++ b/lib/wx/c_src/gen/wxe_macros.h
@@ -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.
@@ -35,6 +35,7 @@
 #include <wx/fontdlg.h>
 #include <wx/progdlg.h>
 #include <wx/printdlg.h>
+#include <wx/display.h>
 #include <wx/dcbuffer.h>
 #include <wx/dcmirror.h>
 #include <wx/glcanvas.h>
@@ -46,6 +47,7 @@
 #include <wx/sashwin.h>
 #include <wx/laywin.h>
 #include <wx/graphics.h>
+#include <wx/dcgraph.h>
 #include <wx/aui/aui.h>
 #include <wx/datectrl.h>
 #include <wx/filepicker.h>
@@ -3426,5 +3428,21 @@
 #define wxDropFilesEvent_GetPosition 3597
 #define wxDropFilesEvent_GetNumberOfFiles 3598
 #define wxDropFilesEvent_GetFiles 3599
+#define wxDisplay_new 3600
+#define wxDisplay_destruct 3601
+#define wxDisplay_IsOk 3602
+#define wxDisplay_GetClientArea 3603
+#define wxDisplay_GetGeometry 3604
+#define wxDisplay_GetName 3605
+#define wxDisplay_IsPrimary 3606
+#define wxDisplay_GetCount 3607
+#define wxDisplay_GetFromPoint 3608
+#define wxDisplay_GetFromWindow 3609
+#define wxDisplay_GetPPI 3610
+#define wxGCDC_new_1 3611
+#define wxGCDC_new_0 3612
+#define wxGCDC_destruct 3613
+#define wxGCDC_GetGraphicsContext 3614
+#define wxGCDC_SetGraphicsContext 3615
 
 
diff --git a/lib/wx/c_src/wxe_driver.c b/lib/wx/c_src/wxe_driver.c
index c9d299e0df..b94ec2f32d 100644
--- a/lib/wx/c_src/wxe_driver.c
+++ b/lib/wx/c_src/wxe_driver.c
@@ -214,7 +214,7 @@ standard_outputv(ErlDrvData drv_data, ErlIOVec* ev)
 
    if(binref == NULL) { /* realloc */
      max = sd->max_bins + DEF_BINS;
-     driver_realloc(sd->bin, sizeof(WXEBinRef)*max);
+     sd->bin = driver_realloc(sd->bin, sizeof(WXEBinRef)*max);
      for(i=sd->max_bins; i < max; i++) {
        sd->bin[i].from = 0;
      }
diff --git a/lib/wx/c_src/wxe_impl.cpp b/lib/wx/c_src/wxe_impl.cpp
index bd22502d00..43b5476073 100644
--- a/lib/wx/c_src/wxe_impl.cpp
+++ b/lib/wx/c_src/wxe_impl.cpp
@@ -267,7 +267,7 @@ int WxeApp::dispatch_cmds()
   return more;
 }
 
-#define BREAK_BATCH 10000
+#define CHECK_EVENTS 10000
 
 int WxeApp::dispatch(wxeFifo * batch)
 {
@@ -278,13 +278,14 @@ int WxeApp::dispatch(wxeFifo * batch)
   erl_drv_mutex_lock(wxe_batch_locker_m);
   while(true) {
     while((event = batch->Get()) != NULL) {
+      wait += 1;
       erl_drv_mutex_unlock(wxe_batch_locker_m);
       switch(event->op) {
       case WXE_BATCH_END:
 	if(blevel>0) {
           blevel--;
           if(blevel==0)
-            wait += BREAK_BATCH/4;
+            wait += CHECK_EVENTS/4;
         }
 	break;
       case WXE_BATCH_BEGIN:
@@ -314,21 +315,18 @@ int WxeApp::dispatch(wxeFifo * batch)
 	break;
       }
       event->Delete();
+      if(wait > CHECK_EVENTS)
+        return 1; // Let wx check for events
       erl_drv_mutex_lock(wxe_batch_locker_m);
       batch->Cleanup();
     }
-    if(blevel <= 0 || wait >= BREAK_BATCH) {
+    if(blevel <= 0) {
       erl_drv_mutex_unlock(wxe_batch_locker_m);
-      if(blevel > 0) {
-        return 1; // We are still in a batch but we can let wx check for events
-      } else {
-        return 0;
-      }
+      return 0;
     }
     // sleep until something happens
     // fprintf(stderr, "%s:%d sleep %d %d %d\r\n", __FILE__, __LINE__, batch->m_n, blevel, wait);fflush(stderr);
     wxe_needs_signal = 1;
-    wait += 1;
     while(batch->m_n == 0) {
       erl_drv_cond_wait(wxe_batch_locker_c, wxe_batch_locker_m);
     }
diff --git a/lib/wx/c_src/wxe_ps_init.c b/lib/wx/c_src/wxe_ps_init.c
index 4b3b47a80b..62c7c51c13 100644
--- a/lib/wx/c_src/wxe_ps_init.c
+++ b/lib/wx/c_src/wxe_ps_init.c
@@ -64,6 +64,10 @@ void * wxe_ps_init2() {
    size_t app_len = 127;
    char app_title_buf[128];
    char * app_title;
+   size_t app_icon_len = 1023;
+   char app_icon_buf[1024];
+   char * app_icon;
+
    // Setup and enable gui
    pool = [[NSAutoreleasePool alloc] init];
 
@@ -78,9 +82,15 @@ void * wxe_ps_init2() {
       if(!GetCurrentProcess(&psn)) {
       	 CPSSetProcessName(&psn, app_title?app_title:"Erlang");
       }
-      // Load and set icon
+      // Enable setting custom application icon for Mac OS X
+      res = erl_drv_getenv("WX_APP_ICON", app_icon_buf, &app_icon_len);
       NSMutableString *file = [[NSMutableString alloc] init];
-      [file appendFormat:@"%s/%s", erl_wx_privdir, "erlang-logo64.png"];
+      if (res >= 0) {
+          [file appendFormat:@"%s", app_icon_buf];
+      } else {
+          [file appendFormat:@"%s/%s", erl_wx_privdir, "erlang-logo128.png"];
+      }
+      // Load and set icon
       NSImage *icon = [[NSImage alloc] initWithContentsOfFile: file];
       [NSApp setApplicationIconImage: icon];
    };
diff --git a/lib/wx/configure.in b/lib/wx/configure.in
index dbe237cd74..f35e6cdbd0 100644
--- a/lib/wx/configure.in
+++ b/lib/wx/configure.in
@@ -30,17 +30,11 @@ if test -f ./CONF_INFO; then
 fi
 
 if test -z "$ERL_TOP" || test ! -d $ERL_TOP ; then
-  AC_CONFIG_AUX_DIRS(autoconf)
-  WX_BUILDING_INSIDE_ERLSRC=false    
+  AC_MSG_ERROR([ERL_TOP is not set])
 else
   erl_top=${ERL_TOP}
-  if test -d $erl_top/erts/autoconf; then 
-     AC_CONFIG_AUX_DIRS($erl_top/erts/autoconf)
-     WX_BUILDING_INSIDE_ERLSRC=true
-  else
-     AC_CONFIG_AUX_DIRS(autoconf)
-     WX_BUILDING_INSIDE_ERLSRC=false
-  fi
+  AC_CONFIG_AUX_DIRS($erl_top/erts/autoconf)
+  WX_BUILDING_INSIDE_ERLSRC=true
 fi
 
 if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then
@@ -67,6 +61,20 @@ AC_PROG_CXX
 AC_PROG_RANLIB
 AC_PROG_CPP
 
+AC_LANG_PUSH([C++])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+  [[#ifndef __cplusplus
+    #error "broken C++"
+    #endif]])],,
+  [CXX=;])
+AC_LANG_POP([C++])
+if test "X$CXX" = X ; then
+   echo "Can not find C++ compiler" >> ./CONF_INFO
+   WXERL_CAN_BUILD_DRIVER=false
+   AC_MSG_WARN([Can not find C++ compiler])
+fi
+WXERL_CAN_BUILD_DRIVER=false
+
 AC_MSG_NOTICE(Building for [$host_os])
 WXERL_CAN_BUILD_DRIVER=true
 
@@ -139,13 +147,9 @@ case $host_os in
 	   if test X$APPLE_CC = X -o X$APPLE_CXX = X; then
 	      AC_MSG_RESULT([no])
 	      dnl Complete failure, we cannot build Cocoa code
-	      if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then
-		AC_MSG_ERROR([Can not find compiler to compile Cocoa applications])
-	      else
-		echo "Can not find compiler to compile Cocoa applications" > ./CONF_INFO
-		WXERL_CAN_BUILD_DRIVER=false
-		AC_MSG_WARN([Can not find compiler to compile Cocoa applications])
-	      fi
+	      echo "Can not find compiler to compile Cocoa applications" >> ./CONF_INFO
+	      WXERL_CAN_BUILD_DRIVER=false
+	      AC_MSG_WARN([Can not find compiler to compile Cocoa applications])
 	      WXERL_CAN_BUILD_DRIVER=false
 	   else
 	      dnl We think we found an Apple compiler and will add 
@@ -225,11 +229,21 @@ case $host_os in
 	;;
     *)
 	DEBUG_CFLAGS="-g -Wall -fPIC $CFLAGS -DDEBUG"
-	CFLAGS="-g -Wall -O2 -fPIC $CFLAGS -fomit-frame-pointer -fno-strict-aliasing"
+	CFLAGS="-Wall -fPIC $CFLAGS -fomit-frame-pointer -fno-strict-aliasing"
 	;;
 esac
 
-dnl  
+dnl
+dnl  Use -O1 -fno-move-loop-invariants for wxe_funcs.cpp to reduce
+dnl  compilation time
+dnl
+
+if test "x$GCC" = xyes -a X"$host_os" != X"win32" ; then
+   CXXNOOPT="-O1"
+   LM_TRY_ENABLE_CFLAG([-fno-move-loop-invariants], [CXXNOOPT])
+fi
+
+dnl
 dnl  Opengl tests
 dnl
 
@@ -251,11 +265,13 @@ if test X"$host_os" != X"win32" ; then
 	    AC_CHECK_HEADERS([GL/gl.h])
 	    if test X"$ac_cv_header_GL_gl_h" != Xyes ; then
 		AC_MSG_WARN([No OpenGL headers found, wx will NOT be usable])
+		echo "No OpenGL headers found, wx will NOT be usable" >> ./CONF_INFO
+		WXERL_CAN_BUILD_DRIVER=false
 		CPPFLAGS="$saved_CPPFLAGS"
-	    else 
+	    else
 	    	GL_LIBS="-L/usr/local/lib $GL_LIBS"
 	    fi
-	else 
+	else
     	    GL_LIBS="-L/usr/X11R6/lib $GL_LIBS"
        	fi
     fi
@@ -270,6 +286,8 @@ if test X"$host_os" != X"win32" ; then
         test X"$ac_cv_header_OpenGL_glu_h" != Xyes
     then
 	AC_MSG_WARN([No GLU headers found, wx will NOT be usable])
+	echo "No GLU headers (glu.h) found, wx will NOT be usable" >> ./CONF_INFO
+	WXERL_CAN_BUILD_DRIVER=false
     fi
 else
     AC_CHECK_HEADERS([gl/glu.h],[],[],[#include <windows.h>])
@@ -280,47 +298,17 @@ AC_SUBST(GL_LIBS)
 DEBUG_CXXFLAGS="$CXXFLAGS $DEBUG_CFLAGS $CPPFLAGS"
 DEBUG_CFLAGS="$DEBUG_CFLAGS $CPPFLAGS $C_ONLY_FLAGS"
 
-CXXFLAGS="$CXXFLAGS $CFLAGS $CPPFLAGS" 
+CXXNOOPTFLAGS="$CXXFLAGS $CFLAGS $CPPFLAGS $CXXNOOPT"
+CXXFLAGS="$CXXFLAGS $CFLAGS $CPPFLAGS"
 CFLAGS="$CFLAGS $CPPFLAGS $C_ONLY_FLAGS"
 
 AC_SUBST(DEBUG_CFLAGS)
 AC_SUBST(DEBUG_CXXFLAGS)
 
-
-if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then
-    AC_MSG_CHECKING(for erl)
-    if test X$ERL != X; then 
-       AC_MSG_RESULT([yes; using $ERL])
-    else 
-       type erl >/dev/null 2>&1
-       if test $? -eq 0 ; then 
-          ERL=erl
-          AC_MSG_RESULT([yes])
-       else 
-	  AC_MSG_ERROR([Cannot find erl in path])
-       fi
-    fi
-    AC_MSG_CHECKING(for erlc)
-    if test X$ERLC != X; then 
-       AC_MSG_RESULT([yes; using $ERLC])
-    else 
-       type erlc >/dev/null 2>&1
-       if test $? -eq 0 ; then 
-          ERLC=erlc
-          AC_MSG_RESULT([yes])
-       else 
-	  AC_MSG_ERROR([Cannot find erlc in path])
-       fi
-    fi
-    ERLANG_ROOT_DIR=`erl -noshell -eval 'io:format("~s~n",[[code:root_dir()]])' -s erlang halt`
-    AC_MSG_NOTICE(ERL ROOT DIR: [$ERLANG_ROOT_DIR])
-    ERLWX_VSN=`grep WX_VSN $srcdir/vsn.mk | sed 's/^.*=[ ]*//'`
-else
-    ERLC=erlc
-    ERL=erl
-    ERLANG_ROOT_DIR=$ERL_TOP
-    AC_SUBST(ERLC)
-fi
+ERLC=erlc
+ERL=erl
+ERLANG_ROOT_DIR=$ERL_TOP
+AC_SUBST(ERLC)
 
 AC_SUBST(WX_BUILDING_INSIDE_ERLSRC)
 AC_SUBST(ERLANG_ROOT_DIR)
@@ -329,7 +317,7 @@ dnl
 dnl  Check for wxwidgets
 dnl 
 if test "$cross_compiling" = "yes"; then
-    echo "Cross compilation of the wx driver is not supported yet, wx will NOT be usable" > ./CONF_INFO
+    echo "Cross compilation of the wx driver is not supported yet, wx will NOT be usable" >> ./CONF_INFO
     WXERL_CAN_BUILD_DRIVER=false
 elif test  X"$MIXED_CYGWIN_VC" = X"no" -a X"$MIXED_MSYS_VC" = X"no"; then
     WX_VERSION=`wx-config --version`
@@ -398,13 +386,9 @@ define(wx_warn_text,[
 		wxWidgets version is $reqwx or above.])
 
     if test "$wxWin" != 1; then
-        if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then
-	   AC_MSG_ERROR([wx_warn_text])
-	else
-	   echo "wxWidgets not found, wx will NOT be usable" > ./CONF_INFO
-	   WXERL_CAN_BUILD_DRIVER=false
-	   AC_MSG_WARN([wx_warn_text])
-	fi
+       echo "wxWidgets not found, wx will NOT be usable" >> ./CONF_INFO
+       WXERL_CAN_BUILD_DRIVER=false
+       AC_MSG_WARN([wx_warn_text])
     fi
 else
     AC_MSG_CHECKING(for wxWidgets in standard locations)
@@ -502,13 +486,9 @@ else
 
     if test -z "$WX_LIBS_STATIC"; then
 	AC_MSG_RESULT([failed])
-        if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then
-		AC_MSG_ERROR([Cannot find core lib version for wxWidgets])
-	else
-		echo "No usable wxWidgets not found, wx will not be useable" > ./CONF_INFO
-		WXERL_CAN_BUILD_DRIVER=false
-		AC_MSG_WARN([Cannot find core lib version for wxWidgets])
-	fi
+	echo "No usable wxWidgets not found, wx will not be useable" >> ./CONF_INFO
+	WXERL_CAN_BUILD_DRIVER=false
+	AC_MSG_WARN([Cannot find core lib version for wxWidgets])
     fi
     WX_HAVE_STATIC_LIBS=true
     AC_SUBST(WX_CFLAGS)
@@ -550,8 +530,8 @@ AC_MSG_RESULT($HAVE_GL_SUPPORT)
 AC_SUBST(HAVE_GL_SUPPORT)
 
 if test X"$HAVE_GL_SUPPORT" != X"yes" ; then
-   		echo "wxWidgets don't have gl support, wx will NOT be useable" > ./CONF_INFO
-		WXERL_CAN_BUILD_DRIVER=false
+   echo "wxWidgets don't have gl support, wx will NOT be useable" >> ./CONF_INFO
+   WXERL_CAN_BUILD_DRIVER=false
 fi
 
 dnl Check for GLintptr
@@ -610,7 +590,7 @@ dnl
 AC_CHECK_HEADERS([wx/stc/stc.h],
         [],
     	[WXERL_CAN_BUILD_DRIVER=false
-	 echo "wxWidgets don't have wxStyledTextControl (stc.h), wx will NOT be useable" > ./CONF_INFO
+	 echo "wxWidgets don't have wxStyledTextControl (stc.h), wx will NOT be useable" >> ./CONF_INFO
      	 AC_MSG_WARN([Can not find wx/stc/stc.h $CXXFLAGS])      
      	],
 	[#ifdef WIN32
@@ -670,9 +650,9 @@ AC_LANG_POP(C++)
 AC_MSG_RESULT($CAN_LINK_WX)
 
 if test X"$CAN_LINK_WX" != X"yes" ; then
-   		echo "Can not link the wx driver, wx will NOT be useable" > ./CONF_INFO
-		WXERL_CAN_BUILD_DRIVER=false
-		AC_MSG_WARN([Can not link wx program are all developer packages installed?])
+   echo "Can not link the wx driver, wx will NOT be useable" >> ./CONF_INFO
+   WXERL_CAN_BUILD_DRIVER=false
+   AC_MSG_WARN([Can not link wx program are all developer packages installed?])
 fi
 
 fi dnl - if test "$WXERL_CAN_BUILD_DRIVER" != "false"
@@ -721,6 +701,7 @@ esac
 
 AC_SUBST(SO_EXT)
 AC_SUBST(RUN_ERL)
+AC_SUBST(CXXNOOPTFLAGS)
 
 
 if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then
@@ -737,12 +718,6 @@ CONFIG_STATUS=$WXERL_SYS_TYPE/config.status
 
 dnl
 
-if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then
-   if test X"$WXERL_CAN_BUILD_DRIVER" != X"true" ; then 
-      AC_MSG_ERROR([Cannot build wxErlang driver, see ./CONF_INFO for information])
-   fi
-fi
-
 AC_CONFIG_FILES([ 
 	config.mk
 	c_src/Makefile 
@@ -750,20 +725,9 @@ AC_CONFIG_FILES([
 
 AC_OUTPUT
 
-if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then
-   AC_MSG_NOTICE()
-   AC_MSG_NOTICE(--------------------------------------------------)
-   AC_MSG_NOTICE(Using erlang compiler: [$ERLC])
-   AC_MSG_NOTICE(wxErlang Install in: [$ERLANG_ROOT_DIR/lib/wx-$ERLWX_VSN])
-   AC_MSG_NOTICE(Erlang driver in priv/[$WXERL_SYS_TYPE]/wxe_driver[$SO_EXT])
-   AC_MSG_NOTICE(--------------------------------------------------)
-fi
-
-if test X"$WX_BUILDING_INSIDE_ERLSRC" = X"true" ; then
-   CORES=`ls core* 2>/dev/null`
-   if test X"$CORES" != X"" ; then
-      echo "Configure dumped core files" > ignore_core_files
-   fi
+CORES=`ls core* 2>/dev/null`
+if test X"$CORES" != X"" ; then
+   echo "Configure dumped core files" > ignore_core_files
 fi
 
 
diff --git a/lib/wx/doc/overview.edoc b/lib/wx/doc/overview.edoc
index 054016f515..843a9c1320 100644
--- a/lib/wx/doc/overview.edoc
+++ b/lib/wx/doc/overview.edoc
@@ -218,7 +218,7 @@ the <em>fun</em> returns.
 
 The callbacks are always invoked by another process and have
 exclusive usage of the GUI when invoked. This means that a callback <em>fun</em>
-can not use the process dictionary and should not make calls to other
+cannot use the process dictionary and should not make calls to other
 processes.  Calls to another process inside a callback <em>fun</em> may cause a
 deadlock if the other process is waiting on completion of his call to
 the GUI.
diff --git a/lib/wx/doc/src/notes.xml b/lib/wx/doc/src/notes.xml
index 1061e73138..0c3374091d 100644
--- a/lib/wx/doc/src/notes.xml
+++ b/lib/wx/doc/src/notes.xml
@@ -32,6 +32,42 @@
   <p>This document describes the changes made to the wxErlang
     application.</p>
 
+<section><title>Wx 1.8.8</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    All incorrect (that is, all) uses of "can not" has been
+	    corrected to "cannot" in source code comments,
+	    documentation, examples, and so on.</p>
+          <p>
+	    Own Id: OTP-14282 Aux Id: PR-1891 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Wx 1.8.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Improved support for wxWidgets 3.1.3 which have changed
+	    <c>wxFONTWEIGTH</c>, also added <c>wxGCDC</c> and
+	    <c>wxDisplay</c> modules.</p>
+          <p>
+	    Fixed a crash on Mojave and check for events more often.</p>
+          <p>
+	    Own Id: OTP-15587</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Wx 1.8.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/wx/examples/demo/ex_graphicsContext.erl b/lib/wx/examples/demo/ex_graphicsContext.erl
index 1193578037..1e6ffce18d 100644
--- a/lib/wx/examples/demo/ex_graphicsContext.erl
+++ b/lib/wx/examples/demo/ex_graphicsContext.erl
@@ -74,7 +74,7 @@ do_init(Config) ->
 		   pen = Pen, brush = Brush, font = Font}}.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Sync events i.e. from callbacks must return ok, it can not return a new state.
+%% Sync events i.e. from callbacks must return ok, it cannot return a new state.
 %% Do the redrawing here.
 handle_sync_event(#wx{event = #wxPaint{}},_,
 		  #state{win=Win, pen = Pen, brush = Brush, font = Font}) ->
diff --git a/lib/wx/examples/simple/hello2.erl b/lib/wx/examples/simple/hello2.erl
index 656c056d9a..07a9a56b7d 100644
--- a/lib/wx/examples/simple/hello2.erl
+++ b/lib/wx/examples/simple/hello2.erl
@@ -33,7 +33,7 @@
          init/1, handle_info/2, handle_event/2, handle_call/3,
          code_change/3, terminate/2]).
 
--behavoiur(wx_object).
+-behaviour(wx_object).
 
 -record(state, {win}).
 
diff --git a/lib/wx/include/wx.hrl b/lib/wx/include/wx.hrl
index 23f3b95403..2c145595ee 100644
--- a/lib/wx/include/wx.hrl
+++ b/lib/wx/include/wx.hrl
@@ -398,6 +398,14 @@
 -define(wxCYAN,  wxe_util:get_const(wxCYAN)).
 -define(wxCYAN_BRUSH,  wxe_util:get_const(wxCYAN_BRUSH)).
 -define(wxCYAN_PEN,  wxe_util:get_const(wxCYAN_PEN)).
+-define(wxFONTWEIGHT_EXTRABOLD,  wxe_util:get_const(wxFONTWEIGHT_EXTRABOLD)).
+-define(wxFONTWEIGHT_EXTRAHEAVY,  wxe_util:get_const(wxFONTWEIGHT_EXTRAHEAVY)).
+-define(wxFONTWEIGHT_EXTRALIGHT,  wxe_util:get_const(wxFONTWEIGHT_EXTRALIGHT)).
+-define(wxFONTWEIGHT_HEAVY,  wxe_util:get_const(wxFONTWEIGHT_HEAVY)).
+-define(wxFONTWEIGHT_INVALID,  wxe_util:get_const(wxFONTWEIGHT_INVALID)).
+-define(wxFONTWEIGHT_MEDIUM,  wxe_util:get_const(wxFONTWEIGHT_MEDIUM)).
+-define(wxFONTWEIGHT_SEMIBOLD,  wxe_util:get_const(wxFONTWEIGHT_SEMIBOLD)).
+-define(wxFONTWEIGHT_THIN,  wxe_util:get_const(wxFONTWEIGHT_THIN)).
 -define(wxGREEN,  wxe_util:get_const(wxGREEN)).
 -define(wxGREEN_BRUSH,  wxe_util:get_const(wxGREEN_BRUSH)).
 -define(wxGREEN_PEN,  wxe_util:get_const(wxGREEN_PEN)).
@@ -1685,10 +1693,10 @@
 -define(wxFONTSTYLE_SLANT, ?wxSLANT).
 -define(wxFONTSTYLE_MAX, (?wxSLANT+1)).
 % From "font.h": wxFontWeight
--define(wxFONTWEIGHT_NORMAL, ?wxNORMAL).
--define(wxFONTWEIGHT_LIGHT, ?wxLIGHT).
--define(wxFONTWEIGHT_BOLD, ?wxBOLD).
--define(wxFONTWEIGHT_MAX, (?wxBOLD+1)).
+-define(wxFONTWEIGHT_NORMAL, wxe_util:get_const(wxFONTWEIGHT_NORMAL)).
+-define(wxFONTWEIGHT_LIGHT, wxe_util:get_const(wxFONTWEIGHT_LIGHT)).
+-define(wxFONTWEIGHT_BOLD, wxe_util:get_const(wxFONTWEIGHT_BOLD)).
+-define(wxFONTWEIGHT_MAX, wxe_util:get_const(wxFONTWEIGHT_MAX)).
 % From "fontenc.h": wxFontEncoding
 -define(wxFONTENCODING_SYSTEM, -1).
 -define(wxFONTENCODING_DEFAULT, 0).
diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile
index 21b45af2c4..52f4008e0a 100644
--- a/lib/wx/src/Makefile
+++ b/lib/wx/src/Makefile
@@ -111,10 +111,10 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk Makefile
 
 # Rules
 $(EBIN)/%.beam: $(ESRC)/%.erl $(HEADER_FILES)
-	$(V_ERLC) -W -bbeam $(ERL_FLAGS) $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
+	$(V_ERLC) -W -bbeam $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
 
 $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES)
-	$(V_ERLC) -W -bbeam $(ERL_FLAGS) $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
+	$(V_ERLC) -W -bbeam $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
 
 # ----------------------------------------------------
 # Release Target
diff --git a/lib/wx/src/gen/wxDisplay.erl b/lib/wx/src/gen/wxDisplay.erl
new file mode 100644
index 0000000000..b6a2bf22ac
--- /dev/null
+++ b/lib/wx/src/gen/wxDisplay.erl
@@ -0,0 +1,131 @@
+%%
+%% %CopyrightBegin%
+%%
+%% 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.
+%% 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 file is generated DO NOT EDIT
+
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdisplay.html">wxDisplay</a>.
+%% @type wxDisplay().  An object reference, The representation is internal
+%% and can be changed without notice. It can't be used for comparsion
+%% stored on disc or distributed for use on other nodes.
+
+-module(wxDisplay).
+-include("wxe.hrl").
+-export([destroy/1,getClientArea/1,getCount/0,getFromPoint/1,getFromWindow/1,
+  getGeometry/1,getName/1,getPPI/1,isOk/1,isPrimary/1,new/0,new/1]).
+
+%% inherited exports
+-export([parent_class/1]).
+
+-export_type([wxDisplay/0]).
+%% @hidden
+parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
+
+-type wxDisplay() :: wx:wx_object().
+%% @equiv new([])
+-spec new() -> wxDisplay().
+
+new() ->
+  new([]).
+
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdisplay.html#wxdisplaywxdisplay">external documentation</a>.
+-spec new([Option]) -> wxDisplay() when
+	Option :: {'n', integer()}.
+new(Options)
+ when is_list(Options) ->
+  MOpts = fun({n, N}, Acc) -> [<<1:32/?UI,N:32/?UI>>|Acc];
+          (BadOpt, _) -> erlang:error({badoption, BadOpt}) end,
+  BinOpt = list_to_binary(lists:foldl(MOpts, [<<0:32>>], Options)),
+  wxe_util:construct(?wxDisplay_new,
+  <<BinOpt/binary>>).
+
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdisplay.html#wxdisplayisok">external documentation</a>.
+-spec isOk(This) -> boolean() when
+	This::wxDisplay().
+isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
+  ?CLASS(ThisT,wxDisplay),
+  wxe_util:call(?wxDisplay_IsOk,
+  <<ThisRef:32/?UI>>).
+
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdisplay.html#wxdisplaygetclientarea">external documentation</a>.
+-spec getClientArea(This) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
+	This::wxDisplay().
+getClientArea(#wx_ref{type=ThisT,ref=ThisRef}) ->
+  ?CLASS(ThisT,wxDisplay),
+  wxe_util:call(?wxDisplay_GetClientArea,
+  <<ThisRef:32/?UI>>).
+
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdisplay.html#wxdisplaygetgeometry">external documentation</a>.
+-spec getGeometry(This) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
+	This::wxDisplay().
+getGeometry(#wx_ref{type=ThisT,ref=ThisRef}) ->
+  ?CLASS(ThisT,wxDisplay),
+  wxe_util:call(?wxDisplay_GetGeometry,
+  <<ThisRef:32/?UI>>).
+
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdisplay.html#wxdisplaygetname">external documentation</a>.
+-spec getName(This) -> unicode:charlist() when
+	This::wxDisplay().
+getName(#wx_ref{type=ThisT,ref=ThisRef}) ->
+  ?CLASS(ThisT,wxDisplay),
+  wxe_util:call(?wxDisplay_GetName,
+  <<ThisRef:32/?UI>>).
+
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdisplay.html#wxdisplayisprimary">external documentation</a>.
+-spec isPrimary(This) -> boolean() when
+	This::wxDisplay().
+isPrimary(#wx_ref{type=ThisT,ref=ThisRef}) ->
+  ?CLASS(ThisT,wxDisplay),
+  wxe_util:call(?wxDisplay_IsPrimary,
+  <<ThisRef:32/?UI>>).
+
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdisplay.html#wxdisplaygetcount">external documentation</a>.
+-spec getCount() -> integer().
+getCount() ->
+  wxe_util:call(?wxDisplay_GetCount,
+  <<>>).
+
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdisplay.html#wxdisplaygetfrompoint">external documentation</a>.
+-spec getFromPoint(Pt) -> integer() when
+	Pt::{X::integer(), Y::integer()}.
+getFromPoint({PtX,PtY})
+ when is_integer(PtX),is_integer(PtY) ->
+  wxe_util:call(?wxDisplay_GetFromPoint,
+  <<PtX:32/?UI,PtY:32/?UI>>).
+
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdisplay.html#wxdisplaygetfromwindow">external documentation</a>.
+-spec getFromWindow(Window) -> integer() when
+	Window::wxWindow:wxWindow().
+getFromWindow(#wx_ref{type=WindowT,ref=WindowRef}) ->
+  ?CLASS(WindowT,wxWindow),
+  wxe_util:call(?wxDisplay_GetFromWindow,
+  <<WindowRef:32/?UI>>).
+
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdisplay.html#wxdisplaygetppi">external documentation</a>.
+-spec getPPI(This) -> {W::integer(), H::integer()} when
+	This::wxDisplay().
+getPPI(#wx_ref{type=ThisT,ref=ThisRef}) ->
+  ?CLASS(ThisT,wxDisplay),
+  wxe_util:call(?wxDisplay_GetPPI,
+  <<ThisRef:32/?UI>>).
+
+%% @doc Destroys this object, do not use object again
+-spec destroy(This::wxDisplay()) -> 'ok'.
+destroy(Obj=#wx_ref{type=Type}) ->
+  ?CLASS(Type,wxDisplay),
+  wxe_util:destroy(?wxDisplay_destruct,Obj),
+  ok.
diff --git a/lib/wx/src/gen/wxGCDC.erl b/lib/wx/src/gen/wxGCDC.erl
new file mode 100644
index 0000000000..467013b14e
--- /dev/null
+++ b/lib/wx/src/gen/wxGCDC.erl
@@ -0,0 +1,287 @@
+%%
+%% %CopyrightBegin%
+%%
+%% 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.
+%% 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 file is generated DO NOT EDIT
+
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgcdc.html">wxGCDC</a>.
+%% <p>This class is derived (and can use functions) from:
+%% <br />{@link wxDC}
+%% </p>
+%% @type wxGCDC().  An object reference, The representation is internal
+%% and can be changed without notice. It can't be used for comparsion
+%% stored on disc or distributed for use on other nodes.
+
+-module(wxGCDC).
+-include("wxe.hrl").
+-export([destroy/1,getGraphicsContext/1,new/0,new/1,setGraphicsContext/2]).
+
+%% inherited exports
+-export([blit/5,blit/6,calcBoundingBox/3,clear/1,computeScaleAndOrigin/1,crossHair/2,
+  destroyClippingRegion/1,deviceToLogicalX/2,deviceToLogicalXRel/2,
+  deviceToLogicalY/2,deviceToLogicalYRel/2,drawArc/4,drawBitmap/3,drawBitmap/4,
+  drawCheckMark/2,drawCircle/3,drawEllipse/2,drawEllipse/3,drawEllipticArc/5,
+  drawIcon/3,drawLabel/3,drawLabel/4,drawLine/3,drawLines/2,drawLines/3,
+  drawPoint/2,drawPolygon/2,drawPolygon/3,drawRectangle/2,drawRectangle/3,
+  drawRotatedText/4,drawRoundedRectangle/3,drawRoundedRectangle/4,
+  drawText/3,endDoc/1,endPage/1,floodFill/3,floodFill/4,getBackground/1,
+  getBackgroundMode/1,getBrush/1,getCharHeight/1,getCharWidth/1,getClippingBox/1,
+  getFont/1,getLayoutDirection/1,getLogicalFunction/1,getMapMode/1,
+  getMultiLineTextExtent/2,getMultiLineTextExtent/3,getPPI/1,getPartialTextExtents/2,
+  getPen/1,getPixel/2,getSize/1,getSizeMM/1,getTextBackground/1,getTextExtent/2,
+  getTextExtent/3,getTextForeground/1,getUserScale/1,gradientFillConcentric/4,
+  gradientFillConcentric/5,gradientFillLinear/4,gradientFillLinear/5,
+  isOk/1,logicalToDeviceX/2,logicalToDeviceXRel/2,logicalToDeviceY/2,
+  logicalToDeviceYRel/2,maxX/1,maxY/1,minX/1,minY/1,parent_class/1,resetBoundingBox/1,
+  setAxisOrientation/3,setBackground/2,setBackgroundMode/2,setBrush/2,
+  setClippingRegion/2,setClippingRegion/3,setDeviceOrigin/3,setFont/2,
+  setLayoutDirection/2,setLogicalFunction/2,setMapMode/2,setPalette/2,
+  setPen/2,setTextBackground/2,setTextForeground/2,setUserScale/3,startDoc/2,
+  startPage/1]).
+
+-export_type([wxGCDC/0]).
+-compile([{nowarn_deprecated_function, {wxDC,computeScaleAndOrigin,1}}]).
+
+%% @hidden
+parent_class(wxDC) -> true;
+parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
+
+-type wxGCDC() :: wx:wx_object().
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgcdc.html#wxgcdcwxgcdc">external documentation</a>.
+-spec new() -> wxGCDC().
+new() ->
+  wxe_util:construct(?wxGCDC_new_0,
+  <<>>).
+
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgcdc.html#wxgcdcwxgcdc">external documentation</a>.
+-spec new(Dc) -> wxGCDC() when
+	Dc::wxWindowDC:wxWindowDC().
+new(#wx_ref{type=DcT,ref=DcRef}) ->
+  ?CLASS(DcT,wxWindowDC),
+  wxe_util:construct(?wxGCDC_new_1,
+  <<DcRef:32/?UI>>).
+
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgcdc.html#wxgcdcgetgraphicscontext">external documentation</a>.
+-spec getGraphicsContext(This) -> wxGraphicsContext:wxGraphicsContext() when
+	This::wxGCDC().
+getGraphicsContext(#wx_ref{type=ThisT,ref=ThisRef}) ->
+  ?CLASS(ThisT,wxGCDC),
+  wxe_util:call(?wxGCDC_GetGraphicsContext,
+  <<ThisRef:32/?UI>>).
+
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgcdc.html#wxgcdcsetgraphicscontext">external documentation</a>.
+-spec setGraphicsContext(This, Ctx) -> 'ok' when
+	This::wxGCDC(), Ctx::wxGraphicsContext:wxGraphicsContext().
+setGraphicsContext(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=CtxT,ref=CtxRef}) ->
+  ?CLASS(ThisT,wxGCDC),
+  ?CLASS(CtxT,wxGraphicsContext),
+  wxe_util:cast(?wxGCDC_SetGraphicsContext,
+  <<ThisRef:32/?UI,CtxRef:32/?UI>>).
+
+%% @doc Destroys this object, do not use object again
+-spec destroy(This::wxGCDC()) -> 'ok'.
+destroy(Obj=#wx_ref{type=Type}) ->
+  ?CLASS(Type,wxGCDC),
+  wxe_util:destroy(?DESTROY_OBJECT,Obj),
+  ok.
+ %% From wxDC
+%% @hidden
+startPage(This) -> wxDC:startPage(This).
+%% @hidden
+startDoc(This,Message) -> wxDC:startDoc(This,Message).
+%% @hidden
+setUserScale(This,X,Y) -> wxDC:setUserScale(This,X,Y).
+%% @hidden
+setTextForeground(This,Colour) -> wxDC:setTextForeground(This,Colour).
+%% @hidden
+setTextBackground(This,Colour) -> wxDC:setTextBackground(This,Colour).
+%% @hidden
+setPen(This,Pen) -> wxDC:setPen(This,Pen).
+%% @hidden
+setPalette(This,Palette) -> wxDC:setPalette(This,Palette).
+%% @hidden
+setMapMode(This,Mode) -> wxDC:setMapMode(This,Mode).
+%% @hidden
+setLogicalFunction(This,Function) -> wxDC:setLogicalFunction(This,Function).
+%% @hidden
+setLayoutDirection(This,Dir) -> wxDC:setLayoutDirection(This,Dir).
+%% @hidden
+setFont(This,Font) -> wxDC:setFont(This,Font).
+%% @hidden
+setDeviceOrigin(This,X,Y) -> wxDC:setDeviceOrigin(This,X,Y).
+%% @hidden
+setClippingRegion(This,Pt,Sz) -> wxDC:setClippingRegion(This,Pt,Sz).
+%% @hidden
+setClippingRegion(This,Region) -> wxDC:setClippingRegion(This,Region).
+%% @hidden
+setBrush(This,Brush) -> wxDC:setBrush(This,Brush).
+%% @hidden
+setBackgroundMode(This,Mode) -> wxDC:setBackgroundMode(This,Mode).
+%% @hidden
+setBackground(This,Brush) -> wxDC:setBackground(This,Brush).
+%% @hidden
+setAxisOrientation(This,XLeftRight,YBottomUp) -> wxDC:setAxisOrientation(This,XLeftRight,YBottomUp).
+%% @hidden
+resetBoundingBox(This) -> wxDC:resetBoundingBox(This).
+%% @hidden
+isOk(This) -> wxDC:isOk(This).
+%% @hidden
+minY(This) -> wxDC:minY(This).
+%% @hidden
+minX(This) -> wxDC:minX(This).
+%% @hidden
+maxY(This) -> wxDC:maxY(This).
+%% @hidden
+maxX(This) -> wxDC:maxX(This).
+%% @hidden
+logicalToDeviceYRel(This,Y) -> wxDC:logicalToDeviceYRel(This,Y).
+%% @hidden
+logicalToDeviceY(This,Y) -> wxDC:logicalToDeviceY(This,Y).
+%% @hidden
+logicalToDeviceXRel(This,X) -> wxDC:logicalToDeviceXRel(This,X).
+%% @hidden
+logicalToDeviceX(This,X) -> wxDC:logicalToDeviceX(This,X).
+%% @hidden
+gradientFillLinear(This,Rect,InitialColour,DestColour, Options) -> wxDC:gradientFillLinear(This,Rect,InitialColour,DestColour, Options).
+%% @hidden
+gradientFillLinear(This,Rect,InitialColour,DestColour) -> wxDC:gradientFillLinear(This,Rect,InitialColour,DestColour).
+%% @hidden
+gradientFillConcentric(This,Rect,InitialColour,DestColour,CircleCenter) -> wxDC:gradientFillConcentric(This,Rect,InitialColour,DestColour,CircleCenter).
+%% @hidden
+gradientFillConcentric(This,Rect,InitialColour,DestColour) -> wxDC:gradientFillConcentric(This,Rect,InitialColour,DestColour).
+%% @hidden
+getUserScale(This) -> wxDC:getUserScale(This).
+%% @hidden
+getTextForeground(This) -> wxDC:getTextForeground(This).
+%% @hidden
+getTextExtent(This,String, Options) -> wxDC:getTextExtent(This,String, Options).
+%% @hidden
+getTextExtent(This,String) -> wxDC:getTextExtent(This,String).
+%% @hidden
+getTextBackground(This) -> wxDC:getTextBackground(This).
+%% @hidden
+getSizeMM(This) -> wxDC:getSizeMM(This).
+%% @hidden
+getSize(This) -> wxDC:getSize(This).
+%% @hidden
+getPPI(This) -> wxDC:getPPI(This).
+%% @hidden
+getPixel(This,Pt) -> wxDC:getPixel(This,Pt).
+%% @hidden
+getPen(This) -> wxDC:getPen(This).
+%% @hidden
+getPartialTextExtents(This,Text) -> wxDC:getPartialTextExtents(This,Text).
+%% @hidden
+getMultiLineTextExtent(This,String, Options) -> wxDC:getMultiLineTextExtent(This,String, Options).
+%% @hidden
+getMultiLineTextExtent(This,String) -> wxDC:getMultiLineTextExtent(This,String).
+%% @hidden
+getMapMode(This) -> wxDC:getMapMode(This).
+%% @hidden
+getLogicalFunction(This) -> wxDC:getLogicalFunction(This).
+%% @hidden
+getLayoutDirection(This) -> wxDC:getLayoutDirection(This).
+%% @hidden
+getFont(This) -> wxDC:getFont(This).
+%% @hidden
+getClippingBox(This) -> wxDC:getClippingBox(This).
+%% @hidden
+getCharWidth(This) -> wxDC:getCharWidth(This).
+%% @hidden
+getCharHeight(This) -> wxDC:getCharHeight(This).
+%% @hidden
+getBrush(This) -> wxDC:getBrush(This).
+%% @hidden
+getBackgroundMode(This) -> wxDC:getBackgroundMode(This).
+%% @hidden
+getBackground(This) -> wxDC:getBackground(This).
+%% @hidden
+floodFill(This,Pt,Col, Options) -> wxDC:floodFill(This,Pt,Col, Options).
+%% @hidden
+floodFill(This,Pt,Col) -> wxDC:floodFill(This,Pt,Col).
+%% @hidden
+endPage(This) -> wxDC:endPage(This).
+%% @hidden
+endDoc(This) -> wxDC:endDoc(This).
+%% @hidden
+drawText(This,Text,Pt) -> wxDC:drawText(This,Text,Pt).
+%% @hidden
+drawRoundedRectangle(This,Pt,Sz,Radius) -> wxDC:drawRoundedRectangle(This,Pt,Sz,Radius).
+%% @hidden
+drawRoundedRectangle(This,R,Radius) -> wxDC:drawRoundedRectangle(This,R,Radius).
+%% @hidden
+drawRotatedText(This,Text,Pt,Angle) -> wxDC:drawRotatedText(This,Text,Pt,Angle).
+%% @hidden
+drawRectangle(This,Pt,Sz) -> wxDC:drawRectangle(This,Pt,Sz).
+%% @hidden
+drawRectangle(This,Rect) -> wxDC:drawRectangle(This,Rect).
+%% @hidden
+drawPoint(This,Pt) -> wxDC:drawPoint(This,Pt).
+%% @hidden
+drawPolygon(This,Points, Options) -> wxDC:drawPolygon(This,Points, Options).
+%% @hidden
+drawPolygon(This,Points) -> wxDC:drawPolygon(This,Points).
+%% @hidden
+drawLines(This,Points, Options) -> wxDC:drawLines(This,Points, Options).
+%% @hidden
+drawLines(This,Points) -> wxDC:drawLines(This,Points).
+%% @hidden
+drawLine(This,Pt1,Pt2) -> wxDC:drawLine(This,Pt1,Pt2).
+%% @hidden
+drawLabel(This,Text,Rect, Options) -> wxDC:drawLabel(This,Text,Rect, Options).
+%% @hidden
+drawLabel(This,Text,Rect) -> wxDC:drawLabel(This,Text,Rect).
+%% @hidden
+drawIcon(This,Icon,Pt) -> wxDC:drawIcon(This,Icon,Pt).
+%% @hidden
+drawEllipticArc(This,Pt,Sz,Sa,Ea) -> wxDC:drawEllipticArc(This,Pt,Sz,Sa,Ea).
+%% @hidden
+drawEllipse(This,Pt,Sz) -> wxDC:drawEllipse(This,Pt,Sz).
+%% @hidden
+drawEllipse(This,Rect) -> wxDC:drawEllipse(This,Rect).
+%% @hidden
+drawCircle(This,Pt,Radius) -> wxDC:drawCircle(This,Pt,Radius).
+%% @hidden
+drawCheckMark(This,Rect) -> wxDC:drawCheckMark(This,Rect).
+%% @hidden
+drawBitmap(This,Bmp,Pt, Options) -> wxDC:drawBitmap(This,Bmp,Pt, Options).
+%% @hidden
+drawBitmap(This,Bmp,Pt) -> wxDC:drawBitmap(This,Bmp,Pt).
+%% @hidden
+drawArc(This,Pt1,Pt2,Centre) -> wxDC:drawArc(This,Pt1,Pt2,Centre).
+%% @hidden
+deviceToLogicalYRel(This,Y) -> wxDC:deviceToLogicalYRel(This,Y).
+%% @hidden
+deviceToLogicalY(This,Y) -> wxDC:deviceToLogicalY(This,Y).
+%% @hidden
+deviceToLogicalXRel(This,X) -> wxDC:deviceToLogicalXRel(This,X).
+%% @hidden
+deviceToLogicalX(This,X) -> wxDC:deviceToLogicalX(This,X).
+%% @hidden
+destroyClippingRegion(This) -> wxDC:destroyClippingRegion(This).
+%% @hidden
+crossHair(This,Pt) -> wxDC:crossHair(This,Pt).
+%% @hidden
+computeScaleAndOrigin(This) -> wxDC:computeScaleAndOrigin(This).
+%% @hidden
+clear(This) -> wxDC:clear(This).
+%% @hidden
+calcBoundingBox(This,X,Y) -> wxDC:calcBoundingBox(This,X,Y).
+%% @hidden
+blit(This,DestPt,Sz,Source,SrcPt, Options) -> wxDC:blit(This,DestPt,Sz,Source,SrcPt, Options).
+%% @hidden
+blit(This,DestPt,Sz,Source,SrcPt) -> wxDC:blit(This,DestPt,Sz,Source,SrcPt).
diff --git a/lib/wx/src/gen/wxe_debug.hrl b/lib/wx/src/gen/wxe_debug.hrl
index 533f9f2df0..b64a1b4c61 100644
--- a/lib/wx/src/gen/wxe_debug.hrl
+++ b/lib/wx/src/gen/wxe_debug.hrl
@@ -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.
@@ -3377,6 +3377,22 @@ wxdebug_table() ->
  {3597, {wxDropFilesEvent, getPosition, 0}},
  {3598, {wxDropFilesEvent, getNumberOfFiles, 0}},
  {3599, {wxDropFilesEvent, getFiles, 0}},
+ {3600, {wxDisplay, new, 1}},
+ {3601, {wxDisplay, destruct, 0}},
+ {3602, {wxDisplay, isOk, 0}},
+ {3603, {wxDisplay, getClientArea, 0}},
+ {3604, {wxDisplay, getGeometry, 0}},
+ {3605, {wxDisplay, getName, 0}},
+ {3606, {wxDisplay, isPrimary, 0}},
+ {3607, {wxDisplay, getCount, 0}},
+ {3608, {wxDisplay, getFromPoint, 1}},
+ {3609, {wxDisplay, getFromWindow, 1}},
+ {3610, {wxDisplay, getPPI, 0}},
+ {3611, {wxGCDC, new_1, 1}},
+ {3612, {wxGCDC, new_0, 0}},
+ {3613, {wxGCDC, destruct, 0}},
+ {3614, {wxGCDC, getGraphicsContext, 0}},
+ {3615, {wxGCDC, setGraphicsContext, 1}},
  {-1, {mod, func, -1}}
 ].
 
diff --git a/lib/wx/src/gen/wxe_funcs.hrl b/lib/wx/src/gen/wxe_funcs.hrl
index 14b5545676..030f7f117d 100644
--- a/lib/wx/src/gen/wxe_funcs.hrl
+++ b/lib/wx/src/gen/wxe_funcs.hrl
@@ -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.
@@ -3374,3 +3374,19 @@
 -define(wxDropFilesEvent_GetPosition, 3597).
 -define(wxDropFilesEvent_GetNumberOfFiles, 3598).
 -define(wxDropFilesEvent_GetFiles, 3599).
+-define(wxDisplay_new, 3600).
+-define(wxDisplay_destruct, 3601).
+-define(wxDisplay_IsOk, 3602).
+-define(wxDisplay_GetClientArea, 3603).
+-define(wxDisplay_GetGeometry, 3604).
+-define(wxDisplay_GetName, 3605).
+-define(wxDisplay_IsPrimary, 3606).
+-define(wxDisplay_GetCount, 3607).
+-define(wxDisplay_GetFromPoint, 3608).
+-define(wxDisplay_GetFromWindow, 3609).
+-define(wxDisplay_GetPPI, 3610).
+-define(wxGCDC_new_1, 3611).
+-define(wxGCDC_new_0, 3612).
+-define(wxGCDC_destruct, 3613).
+-define(wxGCDC_GetGraphicsContext, 3614).
+-define(wxGCDC_SetGraphicsContext, 3615).
diff --git a/lib/wx/test/wx_event_SUITE.erl b/lib/wx/test/wx_event_SUITE.erl
index 7ecd9b7283..1cc194d569 100644
--- a/lib/wx/test/wx_event_SUITE.erl
+++ b/lib/wx/test/wx_event_SUITE.erl
@@ -347,9 +347,9 @@ connect_in_callback(Config) ->
     %% such that new events are not fired until the previous
     %% callback have returned.
 
-    %% That means that a callback can not wait for other events
+    %% That means that a callback cannot wait for other events
     %% in receive since they will not come.
-    %% It also means that you can not attach a new callback directly from
+    %% It also means that you cannot attach a new callback directly from
     %% the callback since that callback will be removed when the temporary
     %% process that executes the outer callback (may) die(s) before the callback
     %% is invoked
diff --git a/lib/wx/vsn.mk b/lib/wx/vsn.mk
index d241a7a1b4..91d15de3a9 100644
--- a/lib/wx/vsn.mk
+++ b/lib/wx/vsn.mk
@@ -1 +1 @@
-WX_VSN = 1.8.6
+WX_VSN = 1.8.8
diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index a97036127e..9fb4a430e5 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,6 +32,75 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
+<section><title>Xmerl 1.3.21</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    A typo in an error printout has been fixed.</p>
+          <p>
+	    Own Id: OTP-14703 Aux Id: PR-1964 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Xmerl 1.3.20.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    <c>xmerl_sax_parser</c> crashed during charset detection
+	    when the xml declarations attribute values was missing
+	    the closing quotation (&apos; or &quot;).</p>
+          <p>
+	    Own Id: OTP-15826</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Xmerl 1.3.20</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Handling of character references in attributes are fixed.</p>
+          <p>
+	    Own Id: OTP-15684 Aux Id: ERL-837 </p>
+        </item>
+        <item>
+          <p>
+	    Normalization of whitespace characters in attributes are
+	    fixed so it works when character references are used.</p>
+          <p>
+	    Own Id: OTP-15685 Aux Id: ERL-475 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Xmerl 1.3.19</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>The charset detection parsing crash in some cases when
+	    the XML directive is not syntactic correct.</p>
+          <p>
+	    Own Id: OTP-15492 Aux Id: ERIERL-283 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Xmerl 1.3.18</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -62,6 +131,21 @@
 
 </section>
 
+<section><title>Xmerl 1.3.16.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>The charset detection parsing crash in some cases when
+	    the XML directive is not syntactic correct.</p>
+          <p>
+	    Own Id: OTP-15492 Aux Id: ERIERL-283 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Xmerl 1.3.16</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -1412,4 +1496,3 @@
     </section>
   </section>
 </chapter>
-
diff --git a/lib/xmerl/doc/src/xmerl_sax_parser.xml b/lib/xmerl/doc/src/xmerl_sax_parser.xml
index 8ea197e209..2390779028 100644
--- a/lib/xmerl/doc/src/xmerl_sax_parser.xml
+++ b/lib/xmerl/doc/src/xmerl_sax_parser.xml
@@ -31,7 +31,7 @@
     <rev></rev>
   </header>
 
-  <module>xmerl_sax_parser</module>
+  <module since="">xmerl_sax_parser</module>
   <modulesummary>XML SAX parser API</modulesummary>
 
   <description>
@@ -325,7 +325,7 @@
   <funcs>
 
     <func>
-      <name>file(Filename, Options) -> Result</name>
+      <name since="">file(Filename, Options) -> Result</name>
       <fsummary>Parse file containing an XML document.</fsummary>
       <type>
         <v>Filename = string()</v>
@@ -347,7 +347,7 @@
     </func>
 
     <func>
-      <name>stream(Xml, Options) -> Result</name>
+      <name since="">stream(Xml, Options) -> Result</name>
       <fsummary>Parse a stream containing an XML document.</fsummary>
       <type>
         <v>Xml = unicode_binary() | latin1_binary() | [unicode_char()]</v>
@@ -381,7 +381,7 @@
   <funcs>
 
     <func>
-      <name>ContinuationFun(State) -> {NewBytes, NewState}</name>
+      <name since="">ContinuationFun(State) -> {NewBytes, NewState}</name>
       <fsummary>Continuation call back function.</fsummary>
       <type>
         <v>State = NewState = term()</v>
@@ -402,7 +402,7 @@
     </func>
 
     <func>
-      <name>EventFun(Event, Location, State) -> NewState</name>
+      <name since="">EventFun(Event, Location, State) -> NewState</name>
       <fsummary>Event call back function.</fsummary>
       <type>
         <v>Event = event()</v>
diff --git a/lib/xmerl/src/xmerl_sax_parser.erl b/lib/xmerl/src/xmerl_sax_parser.erl
index e383c4c349..2767d02552 100644
--- a/lib/xmerl/src/xmerl_sax_parser.erl
+++ b/lib/xmerl/src/xmerl_sax_parser.erl
@@ -1,8 +1,8 @@
 %%--------------------------------------------------------------------
 %% %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.
 %% You may obtain a copy of the License at
@@ -14,13 +14,13 @@
 %% 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    : xmerl_sax_parser.erl
 %% Description : XML SAX parse API module.
 %%
-%% Created :  4 Jun 2008 
+%% Created :  4 Jun 2008
 %%----------------------------------------------------------------------
 -module(xmerl_sax_parser).
 
@@ -72,9 +72,9 @@ file(Name,Options) ->
 	    CL = filename:absname(Dir),
             File = filename:basename(Name),
 	    ContinuationFun = fun default_continuation_cb/1,
-            Res = stream(<<>>, 
+            Res = stream(<<>>,
                          [{continuation_fun, ContinuationFun},
-                          {continuation_state, FD}, 
+                          {continuation_state, FD},
                           {current_location, CL},
                           {entity, File}
                           |Options],
@@ -101,39 +101,39 @@ stream(Xml, Options, InputType) when is_list(Xml), is_list(Options) ->
     State = parse_options(Options, initial_state()),
     case State#xmerl_sax_parser_state.file_type of
 	dtd ->
-	    xmerl_sax_parser_list:parse_dtd(Xml, 
+	    xmerl_sax_parser_list:parse_dtd(Xml,
 					    State#xmerl_sax_parser_state{encoding = list,
 									 input_type = InputType});
 	normal ->
-	    xmerl_sax_parser_list:parse(Xml, 
+	    xmerl_sax_parser_list:parse(Xml,
 					State#xmerl_sax_parser_state{encoding = list,
 								     input_type = InputType})
     end;
 stream(Xml, Options, InputType) when is_binary(Xml), is_list(Options) ->
-    case parse_options(Options, initial_state()) of 
+    case parse_options(Options, initial_state()) of
 	{error, Reason} -> {error, Reason};
 	State ->
-	    ParseFunction = 
+	    ParseFunction =
 		case  State#xmerl_sax_parser_state.file_type of
 		    dtd ->
 			parse_dtd;
 		    normal ->
 			parse
 		end,
-                try 
+                try
                     {Xml1, State1} = detect_charset(Xml, State),
                      parse_binary(Xml1,
                                   State1#xmerl_sax_parser_state{input_type = InputType},
                                   ParseFunction)
                 catch
                     throw:{fatal_error, {State2, Reason}} ->
-                      {fatal_error, 
+                      {fatal_error,
                        {
                          State2#xmerl_sax_parser_state.current_location,
-                         State2#xmerl_sax_parser_state.entity, 
+                         State2#xmerl_sax_parser_state.entity,
                          1
                         },
-                       Reason, [], 
+                       Reason, [],
                        State2#xmerl_sax_parser_state.event_state}
               end
     end.
@@ -157,7 +157,7 @@ parse_binary(Xml, #xmerl_sax_parser_state{encoding={utf16,big}}=State, F) ->
     xmerl_sax_parser_utf16be:F(Xml, State);
 parse_binary(Xml, #xmerl_sax_parser_state{encoding=latin1}=State, F) ->
     xmerl_sax_parser_latin1:F(Xml, State);
-parse_binary(_, #xmerl_sax_parser_state{encoding=Enc}, State) -> 
+parse_binary(_, #xmerl_sax_parser_state{encoding=Enc}, State) ->
     ?fatal_error(State, lists:flatten(io_lib:format("Charcter set ~p not supported", [Enc]))).
 
 %%----------------------------------------------------------------------
@@ -177,9 +177,9 @@ initial_state() ->
 %%----------------------------------------------------------------------
 %% Function: parse_options(Options, State)
 %% Input:    Options = [Option]
-%%           Option = {event_state, term()} | {event_fun, fun()} | 
+%%           Option = {event_state, term()} | {event_fun, fun()} |
 %%                    {continuation_state, term()} | {continuation_fun, fun()} |
-%%                    {encoding, Encoding} | {file_type, FT} 
+%%                    {encoding, Encoding} | {file_type, FT}
 %%           FT = normal | dtd
 %%           Encoding = utf8 | utf16le | utf16be | list | iso8859
 %%           State = #xmerl_sax_parser_state{}
@@ -200,7 +200,7 @@ parse_options([{file_type, FT} |Options], State) when FT==normal; FT==dtd ->
     parse_options(Options, State#xmerl_sax_parser_state{file_type = FT});
 parse_options([{encoding, E} |Options], State) ->
     case check_encoding_option(E) of
-	{error, Reason} -> 
+	{error, Reason} ->
 	    {error, Reason};
 	Enc ->
 	    parse_options(Options, State#xmerl_sax_parser_state{encoding = Enc})
@@ -231,7 +231,7 @@ check_encoding_option(E) ->
 %% Description: Detects which character set is used in a binary stream.
 %%----------------------------------------------------------------------
 detect_charset(<<>>, #xmerl_sax_parser_state{continuation_fun = undefined} = State) ->
-    ?fatal_error(State, "Can't detect character encoding due to lack of indata"); 
+    ?fatal_error(State, "Can't detect character encoding due to lack of indata");
 detect_charset(<<>>, State) ->
     cf(<<>>, State, fun detect_charset/2);
 detect_charset(Bytes, State) ->
@@ -269,22 +269,14 @@ detect_charset_1(<<16#3C, 16#3F, 16#78, 16#6D>> = Xml, State) ->
     cf(Xml, State, fun detect_charset_1/2);
 detect_charset_1(<<16#3C, 16#3F, 16#78, 16#6D, 16#6C, Xml2/binary>>, State) ->
     {Xml3, State1} = read_until_end_of_xml_directive(Xml2, State),
-    case parse_xml_directive(Xml3) of
-	{error, Reason} ->
-	    ?fatal_error(State, Reason);
-	AttrList ->
-	    case lists:keysearch("encoding", 1, AttrList) of
-		{value, {_, E}} ->
-		    case convert_encoding(E) of
-			{error, Reason} ->
-			    ?fatal_error(State, Reason);
-			Enc ->
-			    {<<16#3C, 16#3F, 16#78, 16#6D, 16#6C, Xml3/binary>>, 
-                             State1#xmerl_sax_parser_state{encoding=Enc}}
-		    end;
-		_ ->
-		    {<<16#3C, 16#3F, 16#78, 16#6D, 16#6C, Xml3/binary>>, State1}
-	    end
+    AttrList = parse_xml_directive(Xml3, State),
+    case lists:keysearch("encoding", 1, AttrList) of
+        {value, {_, E}} ->
+            Enc = convert_encoding(E, State),
+            {<<16#3C, 16#3F, 16#78, 16#6D, 16#6C, Xml3/binary>>,
+             State1#xmerl_sax_parser_state{encoding=Enc}};
+        _ ->
+            {<<16#3C, 16#3F, 16#78, 16#6D, 16#6C, Xml3/binary>>, State1}
     end;
 detect_charset_1(Xml, State) ->
     {Xml, State}.
@@ -295,7 +287,7 @@ detect_charset_1(Xml, State) ->
 %% Output:  utf8 | iso8859
 %% Description: Converting 7,8 bit and utf8 encoding strings to internal format.
 %%----------------------------------------------------------------------
-convert_encoding(Enc) -> %% Just for 7,8 bit + utf8
+convert_encoding(Enc, State) -> %% Just for 7,8 bit + utf8
     case string:to_lower(Enc) of
 	"utf-8" -> utf8;
 	"us-ascii" -> utf8;
@@ -309,19 +301,19 @@ convert_encoding(Enc) -> %% Just for 7,8 bit + utf8
 	"iso-8859-7" -> latin1;
 	"iso-8859-8" -> latin1;
 	"iso-8859-9" -> latin1;
-	_ -> {error, "Unknown encoding: " ++ Enc}
+	_ -> ?fatal_error(State, "Unknown encoding: " ++ Enc)
     end.
 
 %%----------------------------------------------------------------------
 %% Function: parse_xml_directive(Xml)
 %% Input:  Xml = binary()
 %%         Acc = list()
-%% Output:  
+%% Output:
 %% Description: Parsing the xml declaration from the input stream.
 %%----------------------------------------------------------------------
-parse_xml_directive(<<C, Rest/binary>>) when ?is_whitespace(C) ->
-   parse_xml_directive_1(Rest, []).
-    
+parse_xml_directive(<<C, Rest/binary>>, State) when ?is_whitespace(C) ->
+   parse_xml_directive_1(Rest, [], State).
+
 %%----------------------------------------------------------------------
 %% Function: parse_xml_directive_1(Xml, Acc) -> [{Name, Value}]
 %% Input:  Xml = binary()
@@ -331,20 +323,20 @@ parse_xml_directive(<<C, Rest/binary>>) when ?is_whitespace(C) ->
 %% Output: see above
 %% Description: Parsing the xml declaration from the input stream.
 %%----------------------------------------------------------------------
-parse_xml_directive_1(<<C, Rest/binary>>, Acc) when ?is_whitespace(C) ->
-    parse_xml_directive_1(Rest, Acc);
-parse_xml_directive_1(<<"?>", _/binary>>, Acc) ->
+parse_xml_directive_1(<<C, Rest/binary>>, Acc, State) when ?is_whitespace(C) ->
+    parse_xml_directive_1(Rest, Acc, State);
+parse_xml_directive_1(<<"?>", _/binary>>, Acc, _State) ->
     Acc;
-parse_xml_directive_1(<<C, Rest/binary>>, Acc) when 97 =< C, C =< 122 ->
+parse_xml_directive_1(<<C, Rest/binary>>, Acc, State) when 97 =< C, C =< 122 ->
     {Name, Rest1} = parse_name(Rest, [C]),
-    Rest2 = parse_eq(Rest1),
-    {Value, Rest3} = parse_value(Rest2),
-    parse_xml_directive_1(Rest3, [{Name, Value} |Acc]);
-parse_xml_directive_1(_, _) ->
-    {error, "Unknown attribute in xml directive"}.
+    Rest2 = parse_eq(Rest1, State),
+    {Value, Rest3} = parse_value(Rest2, State),
+    parse_xml_directive_1(Rest3, [{Name, Value} |Acc], State);
+parse_xml_directive_1(_, _, State) ->
+    ?fatal_error(State, "Unknown attribute in xml directive").
 
 %%----------------------------------------------------------------------
-%% Function: parse_xml_directive_1(Xml, Acc) -> Name
+%% Function: parse_name(Xml, Acc) -> Name
 %% Input:   Xml = binary()
 %%          Acc = string()
 %% Output:  Name = string()
@@ -361,10 +353,12 @@ parse_name(Rest, Acc) ->
 %% Output:  Rest = binary()
 %% Description: Reads an '=' from the stream.
 %%----------------------------------------------------------------------
-parse_eq(<<C, Rest/binary>>) when ?is_whitespace(C) ->
-    parse_eq(Rest);
-parse_eq(<<"=", Rest/binary>>) ->
-    Rest.
+parse_eq(<<C, Rest/binary>>, State) when ?is_whitespace(C) ->
+    parse_eq(Rest, State);
+parse_eq(<<"=", Rest/binary>>, _State) ->
+    Rest;
+parse_eq(_, State) ->
+    ?fatal_error(State, "expecting = or whitespace").
 
 %%----------------------------------------------------------------------
 %% Function: parse_value(Xml) -> {Value, Rest}
@@ -373,10 +367,12 @@ parse_eq(<<"=", Rest/binary>>) ->
 %%          Rest = binary()
 %% Description: Parsing an attribute value from the stream.
 %%----------------------------------------------------------------------
-parse_value(<<C, Rest/binary>>) when ?is_whitespace(C) ->
-    parse_value(Rest);
-parse_value(<<C, Rest/binary>>) when C == $'; C == $" ->
-    parse_value_1(Rest, C, []).
+parse_value(<<C, Rest/binary>>, State) when ?is_whitespace(C) ->
+    parse_value(Rest, State);
+parse_value(<<C, Rest/binary>>, State) when C == $'; C == $" ->
+    parse_value_1(Rest, C, [], State);
+parse_value(_, State) ->
+    ?fatal_error(State, "\', \" or whitespace expected").
 
 %%----------------------------------------------------------------------
 %% Function: parse_value_1(Xml, Stop, Acc) -> {Value, Rest}
@@ -387,10 +383,12 @@ parse_value(<<C, Rest/binary>>) when C == $'; C == $" ->
 %%          Rest = binary()
 %% Description: Parsing an attribute value from the stream.
 %%----------------------------------------------------------------------
-parse_value_1(<<Stop, Rest/binary>>, Stop, Acc) ->
+parse_value_1(<<Stop, Rest/binary>>, Stop, Acc, _State) ->
     {lists:reverse(Acc), Rest};
-parse_value_1(<<C, Rest/binary>>, Stop, Acc) ->
-    parse_value_1(Rest, Stop, [C |Acc]).
+parse_value_1(<<C, Rest/binary>>, Stop, Acc, State) ->
+    parse_value_1(Rest, Stop, [C |Acc], State);
+parse_value_1(_, _Stop, _Acc, State) ->
+    ?fatal_error(State, "end of input and no \' or \" found").
 
 %%======================================================================
 %% Default functions
@@ -431,7 +429,7 @@ read_until_end_of_xml_directive(Rest, State) ->
         nomatch ->
             case cf(Rest, State) of
                 {<<>>, _} ->
-                    ?fatal_error(State, "Can't detect character encoding due to lack of indata"); 
+                    ?fatal_error(State, "Can't detect character encoding due to lack of indata");
                 {NewBytes, NewState} ->
                     read_until_end_of_xml_directive(NewBytes, NewState)
             end;
@@ -450,9 +448,9 @@ read_until_end_of_xml_directive(Rest, State) ->
 %%              input stream and calls the fun in NextCall.
 %%----------------------------------------------------------------------
 cf(_Rest, #xmerl_sax_parser_state{continuation_fun = undefined} = State) ->
-    ?fatal_error(State, "Continuation function undefined"); 
+    ?fatal_error(State, "Continuation function undefined");
 cf(Rest, #xmerl_sax_parser_state{continuation_fun = CFun, continuation_state = CState} = State) ->
-    Result = 
+    Result =
 	try
 	    CFun(CState)
 	catch
@@ -463,9 +461,9 @@ cf(Rest, #xmerl_sax_parser_state{continuation_fun = CFun, continuation_state = C
 	end,
     case Result of
 	{<<>>, _} ->
-	    ?fatal_error(State, "Can't detect character encoding due to lack of indata"); 
+	    ?fatal_error(State, "Can't detect character encoding due to lack of indata");
 	{NewBytes, NewContState} ->
-            {<<Rest/binary, NewBytes/binary>>,  
+            {<<Rest/binary, NewBytes/binary>>,
              State#xmerl_sax_parser_state{continuation_state = NewContState}}
     end.
 
@@ -479,10 +477,10 @@ cf(Rest, #xmerl_sax_parser_state{continuation_fun = CFun, continuation_state = C
 %%              input stream and calls the fun in NextCall.
 %%----------------------------------------------------------------------
 cf(_Rest, #xmerl_sax_parser_state{continuation_fun = undefined} = State, _) ->
-    ?fatal_error(State, "Continuation function undefined"); 
-cf(Rest, #xmerl_sax_parser_state{continuation_fun = CFun, continuation_state = CState} = State, 
+    ?fatal_error(State, "Continuation function undefined");
+cf(Rest, #xmerl_sax_parser_state{continuation_fun = CFun, continuation_state = CState} = State,
    NextCall) ->
-    Result = 
+    Result =
 	try
 	    CFun(CState)
 	catch
@@ -493,8 +491,8 @@ cf(Rest, #xmerl_sax_parser_state{continuation_fun = CFun, continuation_state = C
 	end,
     case Result of
 	{<<>>, _} ->
-	    ?fatal_error(State, "Can't detect character encoding due to lack of indata"); 
+	    ?fatal_error(State, "Can't detect character encoding due to lack of indata");
 	{NewBytes, NewContState} ->
-	    NextCall(<<Rest/binary, NewBytes/binary>>,  
+	    NextCall(<<Rest/binary, NewBytes/binary>>,
 		     State#xmerl_sax_parser_state{continuation_state = NewContState})
     end.
diff --git a/lib/xmerl/src/xmerl_sax_parser_base.erlsrc b/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
index 1dca9608cb..ef753c7148 100644
--- a/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
+++ b/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
@@ -3679,7 +3679,7 @@ create_tempfile(Template) ->
 		    false ->
 			case os:getenv("TEMP") of
 			    false ->
-				throw({error, "Variabel TMP or TEMP doesn't exist"});
+				throw({error, "Variable TMP or TEMP doesn't exist"});
 			    P2 ->
 				P2
 			end;
diff --git a/lib/xmerl/src/xmerl_scan.erl b/lib/xmerl/src/xmerl_scan.erl
index e543a5a11e..d76ed5c820 100644
--- a/lib/xmerl/src/xmerl_scan.erl
+++ b/lib/xmerl/src/xmerl_scan.erl
@@ -2410,15 +2410,22 @@ scan_att_chars("&" ++ T, S0, Delim, Acc, TmpAcc,AT,IsNorm) -> % Reference
 	true ->
 	    scan_att_chars(T1,S1,Delim,[ExpRef|Acc],[ExpRef|TmpAcc],AT,IsNorm);
 	_ ->
-            Ch = string_to_char_set(S#xmerl_scanner.encoding, ExpRef),
             case T of
                 "#" ++ _ ->
                     %% normalization rules (sec 3.3.3) require that for
                     %% character references, the referenced character be
                     %% added directly to the normalized value
-                    scan_att_chars(T1, S1, Delim, Ch ++ Acc,TmpAcc, AT,IsNorm);
+                    {T2,S2,IsNorm2} =
+                        if
+                            ?whitespace(hd(ExpRef)) ->
+                                normalize(T1, S1, IsNorm);
+                            true ->
+                                {T1, S1, IsNorm}
+                        end,
+                    scan_att_chars(T2, S2, Delim, ExpRef ++ Acc, TmpAcc, AT, IsNorm2);
                 _ ->
-                    scan_att_chars(Ch ++ T1, S1, Delim, Acc,TmpAcc, AT,IsNorm)
+                    Ch = string_to_char_set(S#xmerl_scanner.encoding, ExpRef),
+                    scan_att_chars(Ch ++ T1, S1, Delim, Acc, TmpAcc, AT, IsNorm)
             end
     end;
 scan_att_chars("<" ++ _T, S0, _Delim, _Acc,_, _,_) -> % Tags not allowed here
@@ -3964,7 +3971,7 @@ normalize(T,S,IsNorm) ->
 	{_,T,S} ->
 	    {T,S,IsNorm};
 	{_,T1,S1} ->
-	    {T1,S1,true}
+	    normalize(T1,S1,true)
     end.
 
 
diff --git a/lib/xmerl/test/xmerl_SUITE_data/eventp/CMOM.xml b/lib/xmerl/test/xmerl_SUITE_data/eventp/CMOM.xml
index c2533248d1..0379c18214 100644
--- a/lib/xmerl/test/xmerl_SUITE_data/eventp/CMOM.xml
+++ b/lib/xmerl/test/xmerl_SUITE_data/eventp/CMOM.xml
@@ -276,7 +276,7 @@
     </exception>
 
     <exception name="UpgradeNotPossibleException">
-        <description>Before an upgrade is started it was found that the upgrade can not take place. A possible reason is that the upgrade package that is running in the node is not in the upgrade window of this upgrade package. </description>
+        <description>Before an upgrade is started it was found that the upgrade cannot take place. A possible reason is that the upgrade package that is running in the node is not in the upgrade window of this upgrade package. </description>
         <exceptionParameter name="message">
             <dataType>
                 <string/>
@@ -1703,7 +1703,7 @@ Example:
 
     <exception name="NoSuchAttributeException">
         <description>Exception thrown when an MO attribute is requested to be accessed but the access 
-method for the is not defined (the attribute can not be accessed)</description>
+method for the is not defined (the attribute cannot be accessed)</description>
     </exception>
 
     <exception name="MoCardinalityViolationException">
@@ -3125,7 +3125,7 @@ active = Synchronization is used in system clock generation.
         <description>RefState can have the following values:
 failed = synchronization reference is not capable to perform its required tasks.
 degraded = capability of synchronization reference to perform its required tasks is degraded e.g. because of signal level degradation. This value is only applicable for traffic carrying (ET physical path termination) synchronization references. Note: attribute degradationIsFault controls whether synchronization reference degradation is interpreted as a synchronization reference fault or not.
-lossOfTracking = system clock regulation algorithm on TU board can not follow the 8kHz synchronization reference signal either because of the poor quality of the signal or because of a HW fault at TU board. If all synchronization references repeatedly end up to state lossOfTracking, fault is likely in TU HW.
+lossOfTracking = system clock regulation algorithm on TU board cannot follow the 8kHz synchronization reference signal either because of the poor quality of the signal or because of a HW fault at TU board. If all synchronization references repeatedly end up to state lossOfTracking, fault is likely in TU HW.
 ok = synchronization reference is capable of performing its required tasks.
 </description>
         <enumMember name="failed">
@@ -11270,7 +11270,7 @@ Note! This action requires a transaction.</description>
 
 The changing of the IP address with operation assignIpAddress might cause interruption of the communication if the network management tool is connected via the ethernet link.
 
-Note: The EthernetLink MO can not be deleted!
+Note: The EthernetLink MO cannot be deleted!
 
 Note: The performance monitoring counters in the EthernetLink MO has a "Wrap-around time" of approximately 2 hours.
 </description>
@@ -11532,8 +11532,8 @@ Note! This action requires a transaction.</description>
         <description>This MO holds the IP routing table.
 
 The IpRoutingTable MO is automatically created when the Ip MO is created.
-The IpRoutingTable MO can not be created manually.
-The IpRoutingTable MO can not be deleted.
+The IpRoutingTable MO cannot be created manually.
+The IpRoutingTable MO cannot be deleted.
 </description>
         <systemCreated/>
         <attribute name="userLabel">
@@ -12967,7 +12967,7 @@ Note! When using fractional atm, timeslot 1 must be a part of the fraction.
 
 Note! ETM1 does not support EPD and PPD
 
-Note! ETM1 does not have a proper buffer management. Thus fairness of UBR+ traffic can not be guaranteed and shaping on UBR+ traffic is not possible.
+Note! ETM1 does not have a proper buffer management. Thus fairness of UBR+ traffic cannot be guaranteed and shaping on UBR+ traffic is not possible.
 
 Note! The number of VCC TP+VPC TP with performance monitoring enabled (i.e. PM mode &lt;&gt; off) is restricted to 1 per port.
 </description>
@@ -13371,7 +13371,7 @@ Struct element description :
 -Date is in string format, max length is 40. Format for date is: weekday month date hour:min:seconds year.
 -Status is in string format, max length is 40.
 
-Note! The identity can not be the same as name. Identity should contain the product identity.
+Note! The identity cannot be the same as name. Identity should contain the product identity.
 
 
 </description>
@@ -13562,7 +13562,7 @@ Note! For comment and operatorName spaces (' ') are also allowed within the stri
 
 This action does not require a transaction.
 
-Note! The configurationVersionName and identity can not be the same. The identity should be the product identity.
+Note! The configurationVersionName and identity cannot be the same. The identity should be the product identity.
 </description>
             <returnType>
                 <void/>
@@ -17367,7 +17367,7 @@ NOTE: There is a restriction of a maximum of 32 Mtp2Tp's per MP.</description>
         <attribute name="mtp2ProfileItuId">
             <description>Reference to a Mtp2ProfileItu MO.
 
-Note: The bitRate can not be changed.</description>
+Note: The bitRate cannot be changed.</description>
             <mandatory/>
             <noNotification/>
             <dataType>
@@ -17566,7 +17566,7 @@ NOTE: There is a restriction of a maximum of 32 Mtp2Tp's per MP.</description>
         <attribute name="mtp2ProfileAnsiId">
             <description>Reference to a Mtp2ProfileAnsi MO.
 
-Note: The bitRate can not be changed.</description>
+Note: The bitRate cannot be changed.</description>
             <mandatory/>
             <noNotification/>
             <dataType>
@@ -21777,7 +21777,7 @@ Each E1/DS1/J1 channel can suport up to 2 VP connections.
 
 The ET-MC41 board support one biderectional F4/F5 PM flow per E1 channel.
 
-Note! The ETMC41 supports IMA. However the E1 ports being part of the same IMA group can not be selected randomly.
+Note! The ETMC41 supports IMA. However the E1 ports being part of the same IMA group cannot be selected randomly.
 
 Note! The number of VCC TP+VPC TP with performance monitoring enabled (i.e. PM mode &lt;&gt; off) is restricted to 1 / port
 
@@ -21883,7 +21883,7 @@ NOTE: There is a restriction of a maximum of 32 Mtp2Tp's per MP.
         <attribute name="mtp2ProfileChinaId">
             <description>Reference to a Mtp2ProfileChina MO.
 
-Note: The bitRate can not be changed.</description>
+Note: The bitRate cannot be changed.</description>
             <mandatory/>
             <noNotification/>
             <dataType>
diff --git a/lib/xmerl/test/xmerl_SUITE_data/eventp/CelloMOM.xml b/lib/xmerl/test/xmerl_SUITE_data/eventp/CelloMOM.xml
index 3b5d8ae2ad..3b9ccac0f4 100644
--- a/lib/xmerl/test/xmerl_SUITE_data/eventp/CelloMOM.xml
+++ b/lib/xmerl/test/xmerl_SUITE_data/eventp/CelloMOM.xml
@@ -276,7 +276,7 @@
     </exception>

 

     <exception name="UpgradeNotPossibleException">

-        <description>Before an upgrade is started it was found that the upgrade can not take place. A possible reason is that the upgrade package that is running in the node is not in the upgrade window of this upgrade package. </description>

+        <description>Before an upgrade is started it was found that the upgrade cannot take place. A possible reason is that the upgrade package that is running in the node is not in the upgrade window of this upgrade package. </description>

         <exceptionParameter name="message">

             <dataType>

                 <string/>

@@ -1703,7 +1703,7 @@ Example:
 

     <exception name="NoSuchAttributeException">

         <description>Exception thrown when an MO attribute is requested to be accessed but the access 

-method for the is not defined (the attribute can not be accessed)</description>

+method for the is not defined (the attribute cannot be accessed)</description>

     </exception>

 

     <exception name="MoCardinalityViolationException">

@@ -3125,7 +3125,7 @@ active = Synchronization is used in system clock generation.
         <description>RefState can have the following values:

 failed = synchronization reference is not capable to perform its required tasks.

 degraded = capability of synchronization reference to perform its required tasks is degraded e.g. because of signal level degradation. This value is only applicable for traffic carrying (ET physical path termination) synchronization references. Note: attribute degradationIsFault controls whether synchronization reference degradation is interpreted as a synchronization reference fault or not.

-lossOfTracking = system clock regulation algorithm on TU board can not follow the 8kHz synchronization reference signal either because of the poor quality of the signal or because of a HW fault at TU board. If all synchronization references repeatedly end up to state lossOfTracking, fault is likely in TU HW.

+lossOfTracking = system clock regulation algorithm on TU board cannot follow the 8kHz synchronization reference signal either because of the poor quality of the signal or because of a HW fault at TU board. If all synchronization references repeatedly end up to state lossOfTracking, fault is likely in TU HW.

 ok = synchronization reference is capable of performing its required tasks.

 </description>

         <enumMember name="failed">

@@ -11270,7 +11270,7 @@ Note! This action requires a transaction.</description>
 

 The changing of the IP address with operation assignIpAddress might cause interruption of the communication if the network management tool is connected via the ethernet link.

 

-Note: The EthernetLink MO can not be deleted!

+Note: The EthernetLink MO cannot be deleted!

 

 Note: The performance monitoring counters in the EthernetLink MO has a "Wrap-around time" of approximately 2 hours.

 </description>

@@ -11532,8 +11532,8 @@ Note! This action requires a transaction.</description>
         <description>This MO holds the IP routing table.

 

 The IpRoutingTable MO is automatically created when the Ip MO is created.

-The IpRoutingTable MO can not be created manually.

-The IpRoutingTable MO can not be deleted.

+The IpRoutingTable MO cannot be created manually.

+The IpRoutingTable MO cannot be deleted.

 </description>

         <systemCreated/>

         <attribute name="userLabel">

@@ -12967,7 +12967,7 @@ Note! When using fractional atm, timeslot 1 must be a part of the fraction.
 

 Note! ETM1 does not support EPD and PPD

 

-Note! ETM1 does not have a proper buffer management. Thus fairness of UBR+ traffic can not be guaranteed and shaping on UBR+ traffic is not possible.

+Note! ETM1 does not have a proper buffer management. Thus fairness of UBR+ traffic cannot be guaranteed and shaping on UBR+ traffic is not possible.

 

 Note! The number of VCC TP+VPC TP with performance monitoring enabled (i.e. PM mode &lt;&gt; off) is restricted to 1 per port.

 </description>

@@ -13371,7 +13371,7 @@ Struct element description :
 -Date is in string format, max length is 40. Format for date is: weekday month date hour:min:seconds year.

 -Status is in string format, max length is 40.

 

-Note! The identity can not be the same as name. Identity should contain the product identity.

+Note! The identity cannot be the same as name. Identity should contain the product identity.

 

 

 </description>

@@ -13562,7 +13562,7 @@ Note! For comment and operatorName spaces (' ') are also allowed within the stri
 

 This action does not require a transaction.

 

-Note! The configurationVersionName and identity can not be the same. The identity should be the product identity.

+Note! The configurationVersionName and identity cannot be the same. The identity should be the product identity.

 </description>

             <returnType>

                 <void/>

@@ -17367,7 +17367,7 @@ NOTE: There is a restriction of a maximum of 32 Mtp2Tp's per MP.</description>
         <attribute name="mtp2ProfileItuId">

             <description>Reference to a Mtp2ProfileItu MO.

 

-Note: The bitRate can not be changed.</description>

+Note: The bitRate cannot be changed.</description>

             <mandatory/>

             <noNotification/>

             <dataType>

@@ -17566,7 +17566,7 @@ NOTE: There is a restriction of a maximum of 32 Mtp2Tp's per MP.</description>
         <attribute name="mtp2ProfileAnsiId">

             <description>Reference to a Mtp2ProfileAnsi MO.

 

-Note: The bitRate can not be changed.</description>

+Note: The bitRate cannot be changed.</description>

             <mandatory/>

             <noNotification/>

             <dataType>

@@ -21777,7 +21777,7 @@ Each E1/DS1/J1 channel can suport up to 2 VP connections.
 

 The ET-MC41 board support one biderectional F4/F5 PM flow per E1 channel.

 

-Note! The ETMC41 supports IMA. However the E1 ports being part of the same IMA group can not be selected randomly.

+Note! The ETMC41 supports IMA. However the E1 ports being part of the same IMA group cannot be selected randomly.

 

 Note! The number of VCC TP+VPC TP with performance monitoring enabled (i.e. PM mode &lt;&gt; off) is restricted to 1 / port

 

@@ -21883,7 +21883,7 @@ NOTE: There is a restriction of a maximum of 32 Mtp2Tp's per MP.
         <attribute name="mtp2ProfileChinaId">

             <description>Reference to a Mtp2ProfileChina MO.

 

-Note: The bitRate can not be changed.</description>

+Note: The bitRate cannot be changed.</description>

             <mandatory/>

             <noNotification/>

             <dataType>

diff --git a/lib/xmerl/test/xmerl_xsd_lib.erl b/lib/xmerl/test/xmerl_xsd_lib.erl
index 6006cf500f..39300cd6cb 100644
--- a/lib/xmerl/test/xmerl_xsd_lib.erl
+++ b/lib/xmerl/test/xmerl_xsd_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2019. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -94,8 +94,9 @@ return_results2({NewFail, NewSuccess, NewMal, NewNotMal}, NumSucc, SkippedN, Tot
                   _ -> io_lib:format("These ~p  skipped tests were malicious, but succeeds now: ~p~n",
                                      [length(NewNotMal), NewNotMal])
               end,
-    ct:comment(io_lib:format("~p successful tests, ~p skipped tests of totally ~p test cases. ~n" ++
-			     NFComm ++ NSComm ++ NMComm ++ NNMComm, [NumSucc, SkippedN, TotN])),
+    ct:comment(io_lib:format("~p successful tests, ~p skipped tests of totally ~p test cases. ~n~ts",
+                             [NumSucc, SkippedN, TotN,
+                              NFComm ++ NSComm ++ NMComm ++ NNMComm])),
     [] = NewFail.
 
 %% return_results2(Diff,{STErrs,STOther},{ITErrs,ITOther},TotN) ->
diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk
index 3a266a56bd..08696606e6 100644
--- a/lib/xmerl/vsn.mk
+++ b/lib/xmerl/vsn.mk
@@ -1 +1 @@
-XMERL_VSN = 1.3.18
+XMERL_VSN = 1.3.21
diff --git a/configure.in b/make/configure.in
index 2a42477723..c4b89c4f45 100644
--- a/configure.in
+++ b/make/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 dnl %CopyrightBegin%
 dnl
-dnl Copyright Ericsson AB 1998-2016. All Rights Reserved.
+dnl Copyright Ericsson AB 1998-2019. All Rights Reserved.
 dnl
 dnl Licensed under the Apache License, Version 2.0 (the "License");
 dnl you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ case "X$ERL_TOP" in
     X)
 	;;
     X/*)
-	test -f $ERL_TOP/erts/emulator/beam/beam_emu.c || {
+	test -f "$ERL_TOP/erts/emulator/beam/beam_emu.c" || {
 	     AC_MSG_ERROR([Invalid \$ERL_TOP])
 	}
 	srcdir="$ERL_TOP";;
@@ -93,6 +93,8 @@ dnl
 
 if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then
     AC_CANONICAL_HOST
+else
+    host_os=$host
 fi
 
 TARGET=$host
@@ -128,6 +130,8 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_CHECK_TOOL(LD, [ld])
 
+LM_WINDOWS_ENVIRONMENT
+
 _search_path=/bin:/usr/bin:/usr/local/bin:$PATH
 
 AC_PATH_PROG(ENV, [env], false, $_search_path)
@@ -211,6 +215,9 @@ AC_MSG_CHECKING([OTP version])
 AC_MSG_RESULT([$OTP_VSN])
 AC_SUBST(OTP_VSN)
 
+AC_ARG_ENABLE(parallel-configure,
+AS_HELP_STRING([--disable-parallel-configure], [disable parallel execution of configure scripts]))
+
 AC_ARG_ENABLE(dirty-schedulers,
 AS_HELP_STRING([--enable-dirty-schedulers], [enable dirty scheduler support]))
 
@@ -291,6 +298,10 @@ AC_ARG_ENABLE(builtin-zlib,
 AS_HELP_STRING([--enable-builtin-zlib],
                [force use of our own built-in zlib]))
 
+AC_ARG_ENABLE(esock,
+AS_HELP_STRING([--enable-esock], [enable builtin experimental socket (as a nif) support (default)])
+AS_HELP_STRING([--disable-esock], [disable builtin experimental socket (as a nif) support]))
+
 AC_ARG_ENABLE(sharing-preserving,
 AS_HELP_STRING([--enable-sharing-preserving],
                [enable copying of terms without destroying sharing]))
@@ -416,77 +427,9 @@ if test $CROSS_COMPILING = no; then
    esac
 fi
 
-rm -f $ERL_TOP/lib/SKIP-APPLICATIONS
-for app in `cd lib && ls -d *`; do
-    var=`eval echo \\$with_$app`
-    if test X${var} = Xno; then
-       echo "$app" >> $ERL_TOP/lib/SKIP-APPLICATIONS
-     fi
-done
+ERL_DED
 
-export ERL_TOP
-AC_CONFIG_SUBDIRS(lib erts)
-
-AC_CONFIG_FILES([Makefile make/output.mk])
-AC_CONFIG_FILES([make/emd2exml], [chmod +x make/emd2exml])
+AC_CONFIG_FILES([../Makefile output.mk ../make/$host/otp_ded.mk:../make/otp_ded.mk.in])
+AC_CONFIG_FILES([emd2exml], [chmod +x emd2exml])
 
 AC_OUTPUT
-
-pattern="lib/*/SKIP"
-files=`echo $pattern`
-if test "$files" != "$pattern" || test -f $ERL_TOP/lib/SKIP-APPLICATIONS; then
-  echo '*********************************************************************'
-  echo '**********************  APPLICATIONS DISABLED  **********************'
-  echo '*********************************************************************'
-  echo
-  if test "$files" != "$pattern"; then
-    for skipfile in $files; do
-      app=`dirname $skipfile`; app=`basename $app`
-      printf "%-15s: " $app; cat $skipfile
-    done
-  fi
-  if test -f $ERL_TOP/lib/SKIP-APPLICATIONS; then
-    for skipapp in `cat $ERL_TOP/lib/SKIP-APPLICATIONS`; do
-      printf "%-15s: User gave --without-%s option\n" $skipapp $skipapp
-    done
-  fi
-  echo
-  echo '*********************************************************************'
-fi
-pattern="lib/*/CONF_INFO"
-files=`echo $pattern`
-if test "$files" != "$pattern" || test -f erts/CONF_INFO; then
-  echo '*********************************************************************'
-  echo '**********************  APPLICATIONS INFORMATION  *******************'
-  echo '*********************************************************************'
-  echo
-  test "$files" != "$pattern" || files=""
-  test ! -f erts/CONF_INFO || files="$files erts/CONF_INFO"
-  for infofile in $files; do
-    app=`dirname $infofile`; app=`basename $app`
-    printf "%-15s: " $app; cat $infofile
-  done
-  echo
-  echo '*********************************************************************'
-fi
-if test -f "erts/doc/CONF_INFO"; then
-  echo '*********************************************************************'
-  echo '**********************  DOCUMENTATION INFORMATION  ******************'
-  echo '*********************************************************************'
-  echo
-  printf "%-15s: \n" documentation; 
-  havexsltproc="yes"
-  for cmd in `cat erts/doc/CONF_INFO`; do
-	echo "                 $cmd is missing." 
-  if test $cmd = "xsltproc"; then
-    havexsltproc="no"
-  fi
-  done  
-  if test $havexsltproc = "no"; then
-    echo '                 The documentation can not be built.'
-  else
-    echo '                 Using fakefop to generate placeholder PDF files.'
-  fi
-  echo
-  echo '*********************************************************************'
-fi
diff --git a/make/emd2exml.in b/make/emd2exml.in
index 24837696f4..ec3de0a7f8 100755
--- a/make/emd2exml.in
+++ b/make/emd2exml.in
@@ -462,7 +462,7 @@ url([C|Cs], Bool, Acc) ->
     url(Cs, Bool, [C|Acc]).
 
 link_or_image(Str, Type) ->
-    case link_or_image_text(Str, "") of
+    case link_or_image_text(Str) of
  	no -> no;
 	{Text, Cont1} ->
 	    case link_or_image_data(Cont1, none, Type, "", "") of
@@ -471,9 +471,14 @@ link_or_image(Str, Type) ->
  		    {["<url href=\"", text(Url), "\">", text(Text), "</url>"],
 		     Cont2};
  		{seealso, SeeAlso, _Title, Cont2} ->
-		    {["<seealso marker=\"", text(SeeAlso), "\">",
-		      text(Text), "</seealso>"],
-		     Cont2};
+                    case internal_seealso(SeeAlso) of
+                        no ->
+                            {["<seealso marker=\"", text(SeeAlso), "\">",
+                              text(Text), "</seealso>"],
+                             Cont2};
+                        {yes, SeeAlsoKey} ->
+                            {delayed, link, SeeAlsoKey, text(Text), Cont2}
+                    end;
  		{image, Image, Title, Cont2} ->
  		    {["<image file=\"", text(Image), "\"><icaption>",
 		      text(Title), "</icaption></image>"],
@@ -485,16 +490,41 @@ link_or_image(Str, Type) ->
  	    end
      end.
 
+internal_seealso("#" ++ Marker) ->
+    {yes, {internal, Marker}};
+internal_seealso(_) ->
+    no.
+
+link_or_image_text(Cs0) ->
+    {Prefix, Cs2} = case Cs0 of
+                        "__" ++ Cs1 -> {"__", Cs1};
+                        "_"  ++ Cs1 -> {"_", Cs1};
+                        "**" ++ Cs1 -> {"**", Cs1};
+                        "*"  ++ Cs1 -> {"*", Cs1};
+                        Cs1 -> {"", Cs1}
+                    end,
+    {Text0, Cs} = link_or_image_text(Cs2, []),
+    Text = case lists:prefix(Prefix, Text0) of
+               false ->
+                   lists:reverse(Text0, Prefix);
+               true ->
+                   lists:reverse(lists:nthtail(length(Prefix), Text0))
+            end,
+    case Text of
+        [] ->
+            no;
+        [_|_] ->
+            {Text, Cs}
+    end.
+
 link_or_image_text([$\\,C|Cs], Acc) ->
     link_or_image_text(Cs, [C|Acc]);
-link_or_image_text([$]|_Cs], "") ->
-    no;
 link_or_image_text([$]|Cs], Acc) ->
-    {lists:reverse(Acc), Cs};
+    {Acc, Cs};
 link_or_image_text([C|Cs], Acc) ->
     link_or_image_text(Cs, [C|Acc]);
 link_or_image_text([], _Acc) ->
-    no.
+    {[], []}.
 
 link_or_image_data([C|Cs], none, link, "", "") when C == $ ; C == $\t ->
     link_or_image_data(Cs, none, link, "", "");
@@ -615,8 +645,10 @@ put_title(S, 1, Title) ->
 put_title(#state{mlist = MList0,
 		 toc = TOC} = S0, H, Title) ->
     TitleStr = text(Title),
-    MList1 = [mk_lvl_marker(Title) | MList0],
+    TitleMarker = mk_lvl_marker(Title),
+    MList1 = [TitleMarker | MList0],
     Marker = mk_marker(MList1),
+    MarkerKey = string:lowercase(TitleMarker),
     S1 = chk_h1(H, 
 		S0#state{toc = [TOC,
 				lists:duplicate(H,"  "),
@@ -624,13 +656,15 @@ put_title(#state{mlist = MList0,
 				"<seealso marker=\"#",Marker,"\">",
 				TitleStr,"</seealso>",nl()],
 			 h = H,
-			 mlist = MList1}),
+			 mlist = MList1
+                        }),
     S2 = put_chars(S1, ["<marker id=\"", Marker, "\"/>",nl()]),
+    S3 = write_delayed(S2, {internal, MarkerKey}, {"#" ++ Marker, ""}),
     {STag, ETag} = case H > ?MAX_HEADING of
 		       true -> {"<p><strong>", "</strong></p>"};
 		       false -> {"<title>", "</title>"}
 		   end,
-    put_chars(S2, [STag, TitleStr, ETag, nl()]).
+    put_chars(S3, [STag, TitleStr, ETag, nl()]).
 
 setext_heading(H, #state{line = Line, h = OldH} = S0) ->
     S1 = sections(H, OldH, S0),
@@ -1204,7 +1238,7 @@ put_delayed(#state{out = Out} = S, Key, Data) ->
     S#state{out = [{delayed, Key, Data} | Out]}.
 
 put_chars(#state{out = Out} = S, Chars) ->
-    S#state{out = [[Chars] | Out]}.
+    S#state{out = [Chars | Out]}.
 
 put_line(#state{out = Out} = S, String) ->
     S#state{out = [[String, nl()] | Out]}.
@@ -1219,6 +1253,15 @@ complete_output(S, [], Out) ->
 		   Out]};
 complete_output(S, [{delayed, IX}|Rest], Out) ->
     complete_output(S, Rest, [read_delayed(S, IX)|Out]);
+complete_output(S, [{delayed, {internal, Key0}, {link, Text, _Line}}|Rest], Out) ->
+    Key = [C || C <- Key0, C =/= $_],
+    case read_delayed(S, {internal, Key}) of
+        {value, {Url, _}} ->
+            complete_output(S, Rest, [mk_link(Text, Url)|Out]);
+        none ->
+            Url = "#" ++ Key0,
+            complete_output(S, Rest, [mk_link(Text, Url)|Out])
+    end;
 complete_output(S, [{delayed, Key, {link, Text, Line}}|Rest], Out) ->
     case read_delayed(S, Key) of
 	{value, {Url, _Title}} ->
@@ -1235,9 +1278,27 @@ complete_output(S, [{delayed, Key, {image, _Text, Line}}|Rest], Out) ->
 	    {File, _} = S#state.ifile,
 	    error(File, Line, "Image definition name `~ts' not found~n", [Key])
     end;
+complete_output(S, [["</p>","\n"]=ParaStart,
+                    Contents,
+                    ["<p>","\n"]=ParaEnd|Rest], Out) ->
+    case is_image_tag(Contents) of
+        true ->
+            %% Get rid of the paragraph around an image tag. It would mess up
+            %% figure numbering.
+            complete_output(S, Rest, [Contents|Out]);
+        false ->
+            complete_output(S, [Contents,ParaEnd|Rest], [ParaStart|Out])
+    end;
 complete_output(S, [Next|Rest], Out) ->
     complete_output(S, Rest, [Next|Out]).
 
+is_image_tag("<image" ++ _) ->
+    true;
+is_image_tag([[_|_]=H | _]) ->
+    is_image_tag(H);
+is_image_tag(_) ->
+    false.
+
 write_output(_OFD, []) ->
     ok;
 write_output(OFD, [O|Os]) ->
diff --git a/make/fixup_development_runtime_dependencies b/make/fixup_development_runtime_dependencies
index e06bd5faca..1c0a649578 100755
--- a/make/fixup_development_runtime_dependencies
+++ b/make/fixup_development_runtime_dependencies
@@ -44,7 +44,7 @@ my $erl_top = shift @ARGV;
 
 chdir $erl_top or die "Failed to change directory into '$erl_top'";
 
-print "Fixup of development runtime dependencies\n";
+print "Fixing up development runtime dependencies\n";
 
 #
 # Determine versions of all applications in the source tree...
diff --git a/make/install_dir_data.sh.in b/make/install_dir_data.sh.in
new file mode 100644
index 0000000000..8c1dc3d889
--- /dev/null
+++ b/make/install_dir_data.sh.in
@@ -0,0 +1,70 @@
+#!/bin/sh
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2019. All Rights Reserved.
+#
+# 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.
+#
+# %CopyrightEnd%
+#
+
+#
+# install_dir_data.sh <SourceDir> <DestDir>
+#
+# Install all content in <SourceDir> including subdirectories
+# into <DestDir>.
+#
+
+INSTALL="@INSTALL@"
+INSTALL_DIR="@INSTALL_DIR@"
+INSTALL_DATA="@INSTALL_DATA@"
+
+debug=yes
+
+error () {
+    echo "ERROR: $1" 1>&2
+    exit 1
+}
+
+usage () {
+    error "$1\n  Usage $progname <SourceDir> <DestDir>"
+}
+
+cmd () {
+    [ $debug = no ] || echo "$@"
+    "$@" || exit 1
+}
+
+progname="$0"
+
+[ $# -eq 2 ] || usage "Invalid amount of arguments"
+
+src="$1"
+dest="$2"
+
+cmd cd "$src"
+
+for dir in `find . -type d`; do
+    destdir="$dest"
+    [ "$dir" = "." ] || destdir="$dest/$dir"
+    cmd $INSTALL_DIR "$destdir"
+done
+
+for file in `find . -type f`; do
+    subdir=`dirname "$file"`
+    destdir="$dest"
+    [ "$subdir" = "." ] || destdir="$dest/$subdir"
+    cmd $INSTALL_DATA "$file" "$destdir"
+done
+
+exit 0
diff --git a/make/lazy_configure.mk b/make/lazy_configure.mk
deleted file mode 100644
index c74f216de0..0000000000
--- a/make/lazy_configure.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-# ``Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-# Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-# AB. All Rights Reserved.''
-# 
-#     $Id$
-#
-
-ifndef EXPECTED_AUTOCONF_VERSION
-EXPECTED_AUTOCONF_VERSION=2.59
-endif
-SAVE_ARGS=$(ERL_TOP)/make/save_args
-CONFIG_STATUS=$(CONFIGURE_DIR)/$(TARGET)/config.status
-SAVED_CONFIG_FLAGS_FILE=$(CONFIGURE_DIR)/$(TARGET)/lazy.config.flags
-SAVED_CONFIG_LOG=$(CONFIGURE_DIR)/$(TARGET)/config.log
-CONFIG_CACHE_FILE=$(CONFIGURE_DIR)/$(TARGET)/lazy.config.cache
-ALL_CONFIG_FLAGS=$(CONFIGURE_FLAGS) --no-create --no-recursion --cache-file=$(CONFIG_CACHE_FILE)
-
-lazy_configure: save_config_flags $(CONFIG_STATUS)
-	rm -f $(CONFIGURE_DIR)/config.log
-	cd $(CONFIGURE_DIR) && $(CONFIG_STATUS)
-	cat $(CONFIGURE_DIR)/config.log >> $(SAVED_CONFIG_LOG)
-	rm -f $(CONFIGURE_DIR)/config.log
-
-save_config_flags:
-	$(SAVE_ARGS) $(SAVED_CONFIG_FLAGS_FILE) --- $(ALL_CONFIG_FLAGS)
-
-$(SAVED_CONFIG_FLAGS_FILE): save_config_flags
-
-$(CONFIGURE_DIR)/configure: $(CONFIGURE_DIR)/configure.in $(EXTRA_CONFIGURE_DEPENDENCIES)
-	rm -f $(CONFIG_CACHE_FILE)
-	@ exp_ac_vsn=$(EXPECTED_AUTOCONF_VERSION) ;                                \
-	ac_vsn_blob=`autoconf --version` ;                                         \
-	ac_vsn=`echo x$$ac_vsn_blob | sed "s|[^0-9]*\([0-9][^ \t\n]*\).*|\1|"` ;   \
-	case "$$ac_vsn" in                                                         \
-	    $$exp_ac_vsn)                                                          \
-		;;                                                                 \
-	    *)                                                                     \
-		echo "***************************************************"  1>&2 ; \
-		echo "***************************************************"  1>&2 ; \
-		echo "*** WARNING: System might fail to configure or"       1>&2 ; \
-		echo "***          might be erroneously configured"         1>&2 ; \
-		echo "***          since autoconf version $$ac_vsn is used" 1>&2 ; \
-		echo "***          instead of version $$exp_ac_vsn!"        1>&2 ; \
-		echo "***************************************************"  1>&2 ; \
-		echo "***************************************************"  1>&2 ; \
-		;;                                                                 \
-	esac
-	cd $(CONFIGURE_DIR) && autoconf -f
-
-$(CONFIGURE_DIR)/config.h.in: $(CONFIGURE_DIR)/configure.in $(CONFIGURE_DIR)/aclocal.m4
-	cd $(CONFIGURE_DIR) && autoheader ./configure.in > ./config.h.in
-
-$(CONFIG_STATUS): $(SAVED_CONFIG_FLAGS_FILE) $(CONFIGURE_DIR)/configure $(EXTRA_CONFIG_STATUS_DEPENDENCIES)
-	rm -f $(CONFIGURE_DIR)/config.log
-	cd $(CONFIGURE_DIR) && CONFIG_STATUS=$(CONFIG_STATUS) ./configure $(ALL_CONFIG_FLAGS)
-	rm -f $(SAVED_CONFIG_LOG)
-	mv $(CONFIGURE_DIR)/config.log $(SAVED_CONFIG_LOG)
-
-lazy_configure_target_clean:
-	rm -f $(CONFIG_STATUS)
-	rm -f $(CONFIG_CACHE_FILE)
-	rm -f $(SAVED_CONFIG_FLAGS_FILE)
-	rm -f $(SAVED_CONFIG_LOG)
-
-lazy_configure_clean: lazy_configure_target_clean
-	rm -f $(CONFIGURE_DIR)/configure
-	test ! -f $(CONFIGURE_DIR)/acconfig.h || rm -f $(CONFIGURE_DIR)/config.h.in
-
-.PHONY: lazy_configure save_config_flags lazy_configure_clean
-
diff --git a/make/make_emakefile.in b/make/make_emakefile.in
index fbca77887a..e0740d1013 100755
--- a/make/make_emakefile.in
+++ b/make/make_emakefile.in
@@ -1,4 +1,4 @@
-#!@PERL@
+#!/usr/bin/env @PERL@
 # -*- cperl -*-
 
 use strict;
diff --git a/make/otp.mk.in b/make/otp.mk.in
index df29d26833..cc76f00e7e 100644
--- a/make/otp.mk.in
+++ b/make/otp.mk.in
@@ -4,7 +4,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2016. All Rights Reserved.
+# Copyright Ericsson AB 1997-2019. 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.
@@ -51,6 +51,8 @@ TYPES = @TYPES@
 
 USE_PGO = @USE_PGO@
 
+USE_ESOCK = @USE_ESOCK@
+
 # Slash separated list of return values from $(origin VAR)
 # that are untrusted - set default in this file instead.
 # The list is not space separated since some return values
@@ -73,6 +75,7 @@ INSTALL_DIR     = @INSTALL_DIR@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT  = @INSTALL_SCRIPT@
 INSTALL_DATA    = @INSTALL_DATA@
+INSTALL_DIR_DATA = $(ERL_TOP)/make/install_dir_data.sh
 
 CC = @CC@
 GCC = @GCC@
@@ -107,6 +110,10 @@ ifdef BOOTSTRAP
 else
   ERL_COMPILE_FLAGS += +debug_info
 endif
+ifeq ($(USE_ESOCK),yes)
+ERL_COMPILE_FLAGS += -DUSE_ESOCK=true
+endif
+
 ERLC_WFLAGS = -W
 ERLC = erlc $(ERLC_WFLAGS) $(ERLC_FLAGS)
 ERL = erl -boot start_clean
@@ -274,6 +281,7 @@ XSLTPROC = @XSLTPROC@
 FOP = @FOP@
 XMLLINT = @XMLLINT@
 CP = @CP@
+MKDIR = @MKDIR@
 
 DOCGEN=$(ERL_TOP)/lib/erl_docgen
 FOP_CONFIG = $(DOCGEN)/priv/fop.xconf
diff --git a/make/otp_ded.mk.in b/make/otp_ded.mk.in
index 0b5311d75e..9c8df265de 100644
--- a/make/otp_ded.mk.in
+++ b/make/otp_ded.mk.in
@@ -24,27 +24,26 @@
 # explicitly expressed here. Some applications need to
 # be able to check this value *before* configure has
 # been run and generated otp_ded.mk
-DED_MK_VSN = 1
+DED_MK_VSN = 2
 # ----------------------------------------------------
 # Variables needed for building Dynamic Erlang Drivers
 # ----------------------------------------------------
-DED_CC = @CC@
-DED_GCC = @GCC@
+DED_CC = @DED_CC@
+DED_GCC = @DED_GCC@
 DED_LD = @DED_LD@
 DED_LDFLAGS = @DED_LDFLAGS@
-DED__NOWARN_NOTHR_CFLAGS = @DED_CFLAGS@
-DED__NOTHR_CFLAGS = @WFLAGS@ @DED_CFLAGS@
-DED__NOWARN_CFLAGS = @DED_EMU_THR_DEFS@ @DED_CFLAGS@
+DED_BASIC_CFLAGS = @DED_CFLAGS@
 DED_THR_DEFS = @DED_THR_DEFS@
-DED_EMU_THR_DEFS = @DED_EMU_THR_DEFS@
-DED_WARN_FLAGS = @WFLAGS@
-DED_CFLAGS = @WERRORFLAGS@ @WFLAGS@ @DED_EMU_THR_DEFS@ @DED_CFLAGS@
-DED_STATIC_CFLAGS = @WERRORFLAGS@ @WFLAGS@ @DED_EMU_THR_DEFS@ @DED_STATIC_CFLAGS@
-DED_LIBS = @LIBS@
+DED_WERRORFLAGS = @DED_WERRORFLAGS@
+DED_WARN_FLAGS = @DED_WARN_FLAGS@
+DED_CFLAGS = @DED_CFLAGS@
+DED_LD_FLAG_RUNTIME_LIBRARY_PATH = @DED_LD_FLAG_RUNTIME_LIBRARY_PATH@
+DED_STATIC_CFLAGS = @DED_STATIC_CFLAGS@
+DED_LIBS = @DED_LIBS@
 DED_EXT = @DED_EXT@
-ERLANG_OSTYPE = @ERLANG_OSTYPE@
+DED_OSTYPE = @DED_OSTYPE@
 PRIVDIR = ../priv
 OBJDIR = $(PRIVDIR)/obj/$(TARGET)
 LIBDIR = $(PRIVDIR)/lib/$(TARGET)
 DED_SYS_INCLUDE = @DED_SYS_INCLUDE@
-DED_INCLUDES = $(DED_SYS_INCLUDE)
+DED_INCLUDES = @DED_INCLUDE@
diff --git a/make/otp_patch_solve_forward_merge_version b/make/otp_patch_solve_forward_merge_version
index 7ed6ff82de..b4de394767 100644
--- a/make/otp_patch_solve_forward_merge_version
+++ b/make/otp_patch_solve_forward_merge_version
@@ -1 +1 @@
-5
+11
diff --git a/make/otp_release_targets.mk b/make/otp_release_targets.mk
index d1fbf6c58f..615bf1adb7 100644
--- a/make/otp_release_targets.mk
+++ b/make/otp_release_targets.mk
@@ -156,7 +156,7 @@ endif
 
 
 ## 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
+XI_INC_FILES:=%user_man.xml %usersguide.xml %refman.xml %ref_man.xml %part.xml %book.xml %internal.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))
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
index 81a6fb9117..b8220e1a87 100644
--- a/make/otp_version_tickets
+++ b/make/otp_version_tickets
@@ -1,64 +1 @@
-OTP-12242
-OTP-13468
-OTP-14669
-OTP-15094
-OTP-15121
-OTP-15245
-OTP-15302
-OTP-15312
-OTP-15314
-OTP-15338
-OTP-15339
-OTP-15341
-OTP-15343
-OTP-15346
-OTP-15357
-OTP-15360
-OTP-15364
-OTP-15365
-OTP-15368
-OTP-15371
-OTP-15377
-OTP-15378
-OTP-15384
-OTP-15387
-OTP-15388
-OTP-15389
-OTP-15391
-OTP-15400
-OTP-15402
-OTP-15412
-OTP-15413
-OTP-15415
-OTP-15416
-OTP-15418
-OTP-15419
-OTP-15420
-OTP-15424
-OTP-15426
-OTP-15428
-OTP-15435
-OTP-15436
-OTP-15437
-OTP-15446
-OTP-15449
-OTP-15450
-OTP-15453
-OTP-15454
-OTP-15461
-OTP-15463
-OTP-15464
-OTP-15465
-OTP-15466
-OTP-15467
-OTP-15469
-OTP-15470
-OTP-15471
-OTP-15472
-OTP-15473
-OTP-15474
-OTP-15475
-OTP-15476
-OTP-15478
-OTP-15481
-OTP-15482
+DEVELOPMENT
diff --git a/lib/otp_mibs/doc/html/.gitignore b/make/otp_version_tickets_in_merge
index e69de29bb2..e69de29bb2 100644
--- a/lib/otp_mibs/doc/html/.gitignore
+++ b/make/otp_version_tickets_in_merge
diff --git a/otp_build b/otp_build
index 175c5fbcfe..3dfe24a299 100755
--- a/otp_build
+++ b/otp_build
@@ -21,17 +21,16 @@
 
 # Global configuration variables
 #
-# NOTE: lazy_configure depends on '.' always being last directory
 if [ -z "$ONLY_ERTS" ]; then
     AUTOCONF_SUBDIRS="lib lib/* lib/common_test/test_server"
 fi
-AUTOCONF_SUBDIRS="$AUTOCONF_SUBDIRS erts ."
+AUTOCONF_SUBDIRS="$AUTOCONF_SUBDIRS make erts"
 
 # `bootstrap_apps' should include application that are built, or
 # partly built in one of the bootstrap phases. Applications that
 # only get some static includes copied into the bootstrap directory
 # should not be included.
-bootstrap_apps="erts lib/asn1 lib/compiler lib/hipe lib/ic lib/kernel lib/parsetools lib/sasl lib/snmp lib/stdlib lib/syntax_tools"
+bootstrap_apps="erts lib/asn1 lib/compiler lib/erl_interface lib/hipe lib/kernel lib/jinterface lib/parsetools lib/sasl lib/snmp lib/stdlib lib/syntax_tools lib/wx"
 
 # We will quote a bit more than needed, but the important thing is that
 # all that needs quoting will be quoted...
@@ -212,55 +211,10 @@ set_config_flags ()
 
 NL="\
 "
-create_lib_configure_in()
-{
-    cd $ERL_TOP
-
-    # Multiple versions of autoconf generates code that
-    # don't work on all platforms (e.g. SunOS 5.8) if
-    # sub directories are soft links. Internally at Ericsson
-    # some OTP application directories are soft links.
-    # An added "/." solves this problem.
-
-    sdirs=
-    for lib_app in $bootstrap_apps; do
-	case $lib_app in
-	    lib/*)
-		if [ -f "$lib_app/configure.in" ]; then
-		    app=`echo "$lib_app" | sed "s|lib/\(.*\)|\1|"`
-		    sdirs="${sdirs}test ! -f $app/configure || AC_CONFIG_SUBDIRS($app/.)${NL}"
-		fi;;
-	    *)
-		;;
-	esac
-    done
-
-    sed_bootstrap="s%@BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
-
-    sdirs=
-    for lib_app in lib/*; do
-	is_bapp=false
-	for bapp in $bootstrap_apps; do
-	    test $bapp != $lib_app || { is_bapp=true; break; }
-	done
-	if [ $is_bapp = false ] && [ -f "$lib_app/configure.in" ]; then
-	    app=`echo "$lib_app" | sed "s|lib/\(.*\)|\1|"`
-	    sdirs="${sdirs}    test ! -f $app/configure || AC_CONFIG_SUBDIRS($app/.)${NL}"
-	fi
-    done
-
-    sed_non_bootstrap="s%@NON_BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
-    
-    rm -f lib/configure.in
-    sed "$sed_bootstrap;$sed_non_bootstrap" > lib/configure.in < lib/configure.in.src || {
-	echo "Failed to create lib/configure.in"
-	exit 1
-    }
-}
 
 distribute_config_helpers ()
 {
-    aclocal_dirs=". ./lib/erl_interface ./lib/odbc ./lib/wx ./lib/megaco"
+    aclocal_dirs="make ./lib/crypto ./lib/erl_interface ./lib/odbc ./lib/wx ./lib/megaco"
     autoconf_aux_dirs="./lib/common_test/priv/auxdir ./lib/erl_interface/src/auxdir ./lib/common_test/test_server ./lib/wx/autoconf"
 
     aclocal_master="./erts/aclocal.m4"
@@ -282,7 +236,6 @@ distribute_config_helpers ()
 
 do_autoconf ()		
 {
-        create_lib_configure_in
 	distribute_config_helpers
 
 	if [ ! -z "$OVERRIDE_CONFIGURE" ]; then
@@ -323,6 +276,15 @@ do_autoconf ()
 	    ( cd "$d" && autoheader ) || exit 1
 	done
 
+	echo ""
+	echo "=== creating ./configure"
+	otp_version=`cat "$ERL_TOP/OTP_VERSION"`
+	bootstrap_lib_apps=`echo $bootstrap_apps | sed "s|erts||g"`
+	cat "$ERL_TOP/configure.src" \
+	    | sed "s|@OTP_VERSION@|$otp_version|g;s|@BOOTSTRAP_LIB_APP_DIRS@|$bootstrap_lib_apps|" \
+		  > "$ERL_TOP/configure"
+	chmod +x "$ERL_TOP/configure"
+	
 	restore_vars OVERRIDE_TARGET TARGET
 }
 
@@ -385,8 +347,8 @@ try_cross_configure ()
 
 	    test "X$build_value" != "X" || build_value="$BUILDSYS"
 
-	    build_sys=`$ERL_TOP/erts/autoconf/config.sub "$build_value"` || exit 1
-	    host_sys=`$ERL_TOP/erts/autoconf/config.sub "$host_value"` || exit 1
+	    build_sys=`"$ERL_TOP/erts/autoconf/config.sub" "$build_value"` || exit 1
+	    host_sys=`"$ERL_TOP/erts/autoconf/config.sub" "$host_value"` || exit 1
 
 	    
 	    test "$host_sys" = "$build_sys" || cross_configure=yes
@@ -500,7 +462,7 @@ do_configure ()
 	case $TARGET in
 	    vxworks_*)
 		( cd erts/autoconf && \
-		  $ERL_TOP/erts/autoconf/configure.vxworks $TARGET )
+		  "$ERL_TOP/erts/autoconf/configure.vxworks" $TARGET )
 		  echo "Configuring for build system too..." >&2
 		  hide_vars OVERRIDE_TARGET TARGET
 		  TARGET=$BUILDSYS
@@ -526,105 +488,6 @@ do_configure ()
     fi
 }
 
-do_lazy_configure ()
-{
-    setup_make
-    if [ "x$OVERRIDE_TARGET" != "x" -a "x$OVERRIDE_TARGET" != "xwin32" ]; then
-	echo "Not supported for cross compilation" >&2
-	exit 1
-    fi
-    maybe_copy_static_cache
-    CONFIG_FLAGS=
-    set_config_flags "$@"
-    CONFIGURE_FLAGS="$@"
-    [ "$CONFIG_FLAGS" = "" ] || CONFIGURE_FLAGS="$CONFIG_FLAGS $CONFIGURE_FLAGS"
-    for c_dir in $AUTOCONF_SUBDIRS; do
-	if test -f $ERL_TOP/$c_dir/configure.in; then
-	    dir=$ERL_TOP/$c_dir
-	    echo ""
-	    echo "=== Begin configuring $dir"
-	    xc_dep= ;
-	    xcs_dep= ;
-	    test -d $dir/$TARGET || mkdir $dir/$TARGET
-	    test -f $dir/aclocal.m4 && xc_dep="$xcs_dep $dir/aclocal.m4"
-	    test -f $dir/acsite.m4 && xc_dep="$xcs_dep $dir/acsite.m4"
-	    test x$c_dir = x"erts" && xcs_dep="$xcs_dep $dir/config.h.in"
-	    $MAKE -f $ERL_TOP/make/lazy_configure.mk                         \
-		MAKE="$MAKE" TARGET=$TARGET                                  \
-		ERL_TOP=$ERL_TOP                                             \
-		CONFIGURE_FLAGS="$CONFIGURE_FLAGS"                           \
-		CONFIGURE_DIR=$dir                                           \
-		EXTRA_CONFIGURE_DEPENDENCIES=$xc_dep                         \
-		EXTRA_CONFIG_STATUS_DEPENDENCIES=$xcs_dep                    \
-		lazy_configure
-	    echo "=== Done configuring $dir"
-	    echo ""
-	fi
-    done
-}
-
-do_lazy_configure_clean ()
-{
-    setup_make
-    if [ "x$OVERRIDE_TARGET" != "x" -a "x$OVERRIDE_TARGET" != "xwin32" ]; then
-	echo "Not supported for cross compilation" >&2
-	exit 1
-    fi
-    for c_dir in $AUTOCONF_SUBDIRS; do
-	if test -f $ERL_TOP/$c_dir/configure.in; then
-	    dir=$ERL_TOP/$c_dir
-	    echo ""
-	    echo "=== Begin cleaning configure in $dir"
-	    xc_dep= ;
-	    xcs_dep= ;
-	    test -d $dir/$TARGET || mkdir $dir/$TARGET
-	    test -f $dir/aclocal.m4 && xc_dep="$xcs_dep $dir/aclocal.m4"
-	    test -f $dir/acsite.m4 && xc_dep="$xcs_dep $dir/acsite.m4"
-	    test x$c_dir = x"erts" && xcs_dep="$xcs_dep $dir/config.h.in"
-	    $MAKE -f $ERL_TOP/make/lazy_configure.mk                         \
-		MAKE="$MAKE" TARGET=$TARGET                                  \
-		ERL_TOP=$ERL_TOP                                             \
-		CONFIGURE_DIR=$dir                                           \
-		lazy_configure_clean
-	    echo "=== Done cleaning configure in $dir"
-	    echo ""
-	fi
-    done
-
-}
-
-do_lazy_configure_target_clean ()
-{
-    setup_make
-    if [ "x$OVERRIDE_TARGET" != "x" -a "x$OVERRIDE_TARGET" != "xwin32" ]; then
-	echo "Not supported for cross compilation" >&2
-	exit 1
-    fi
-    for c_dir in $AUTOCONF_SUBDIRS; do
-	if test -f $ERL_TOP/$c_dir/configure.in; then
-	    dir=$ERL_TOP/$c_dir
-	    echo ""
-	    echo "=== Begin target cleaning configure in $dir"
-	    xc_dep= ;
-	    xcs_dep= ;
-	    test -d $dir/$TARGET || mkdir $dir/$TARGET
-	    test -f $dir/aclocal.m4 && xc_dep="$xcs_dep $dir/aclocal.m4"
-	    test -f $dir/acsite.m4 && xc_dep="$xcs_dep $dir/acsite.m4"
-	    test x$c_dir = x"erts" && xcs_dep="$xcs_dep $dir/config.h.in"
-	    $MAKE -f $ERL_TOP/make/lazy_configure.mk                         \
-		MAKE="$MAKE" TARGET=$TARGET                                  \
-		ERL_TOP=$ERL_TOP                                             \
-		CONFIGURE_DIR=$dir                                           \
-		lazy_configure_target_clean
-	    echo "=== Done target cleaning configure in $dir"
-	    echo ""
-	fi
-    done
-
-}
-
-    
-
 echo_setenv ()
 {
     case "$DAILY_BUILD_SCRIPT$SHELL" in
@@ -1075,11 +938,11 @@ do_update_prel_git ()
 {
     get_do_commit $1
     setup_make
-    (cd $ERL_TOP/erts/preloaded/src && $MAKE MAKE="$MAKE" BOOTSTRAP_ROOT=$BOOTSTRAP_ROOT TARGET=$TARGET clean)
+    (cd "$ERL_TOP/erts/preloaded/src" && $MAKE MAKE="$MAKE" BOOTSTRAP_ROOT=$BOOTSTRAP_ROOT TARGET=$TARGET clean)
     $MAKE MAKE="$MAKE" BOOTSTRAP_ROOT=$BOOTSTRAP_ROOT TARGET=$TARGET preloaded || exit 1
-    (cd $ERL_TOP/erts/preloaded/src && $MAKE MAKE="$MAKE" BOOTSTRAP_ROOT=$BOOTSTRAP_ROOT TARGET=$TARGET copy)
+    (cd "$ERL_TOP/erts/preloaded/src" && $MAKE MAKE="$MAKE" BOOTSTRAP_ROOT=$BOOTSTRAP_ROOT TARGET=$TARGET copy)
     if [ $do_commit = true ]; then
-	git add -A $ERL_TOP/erts/preloaded/ebin/*.beam
+	git add -A "$ERL_TOP/erts/preloaded/ebin/*.beam"
 	git commit -m 'Update preloaded modules'
 	echo "Preloaded updated and commited."
     else
@@ -1149,13 +1012,13 @@ do_debuginfo_win32 ()
     (cd erts/emulator && $MAKE MAKE="$MAKE" TARGET=$TARGET FLAVOR=smp debug &&\
 	$MAKE MAKE="$MAKE" TARGET=$TARGET FLAVOR=plain debug) || exit 1
     if [ -z "$1" ]; then
-	RELDIR=$ERL_TOP/release/$TARGET
+	RELDIR="$ERL_TOP/release/$TARGET"
     else
 	RELDIR="$1"
     fi
-    BINDIR=$ERL_TOP/bin/$TARGET
+    BINDIR="$ERL_TOP/bin/$TARGET"
     EVSN=`grep '^VSN' erts/vsn.mk | sed 's,^VSN.*=[^0-9]*\([0-9].*\)$,@\1,g;s,^[^@].*,,g;s,^@,,g'`
-    for f in beam.debug.dll beam.debug.smp.dll beam.pdb beam.smp.pdb erl.pdb werl.pdb erlexec.pdb; do
+    for f in beam.debug.smp.dll beam.smp.pdb erl.pdb werl.pdb erlexec.pdb; do
 	if [ -f $BINDIR/$f ]; then
 	    rm -f $RELDIR/erts-$EVSN/bin/$f
 	    cp $BINDIR/$f $RELDIR/erts-$EVSN/bin/$f
@@ -1166,7 +1029,7 @@ do_debuginfo_win32 ()
 do_installer_win32 ()
 {
     setup_make
-    installer_dir=$ERL_TOP/erts/etc/win32/nsis
+    installer_dir="$ERL_TOP/erts/etc/win32/nsis"
     (cd $installer_dir; $MAKE MAKE="$MAKE" TARGET=$TARGET TESTROOT=$1 release) || exit 1
 }
 
@@ -1210,7 +1073,7 @@ do_copy_primary_bootstrap ()
     cp -f $lib_src/compiler/ebin/*.beam $bootstrap/lib/compiler/ebin
 
     # bootstrap bin
-    if [ $bootstrap_src_top != $ERL_TOP ]; then
+    if [ $bootstrap_src_top != "$ERL_TOP" ]; then
 	test -d $bootstrap/bin || mkdir -p  $bootstrap/bin
 	cp -f $bootstrap_src_top/bin/* $bootstrap/bin
     fi
@@ -1219,22 +1082,22 @@ do_copy_primary_bootstrap ()
 
 do_save_bootstrap ()
 {
-    if [ ! -f $ERL_TOP/prebuilt.files ]; then
+    if [ ! -f "$ERL_TOP/prebuilt.files" ]; then
 	echo "This is not a pre-built source distribution" 1>&2
 	exit 1
     fi
-    if  [ -d $ERL_TOP/bootstrap/lib ]; then
+    if  [ -d "$ERL_TOP/bootstrap/lib" ]; then
 	echo "Bootstrap already exist" 1>&2
 	exit 1
     fi
 
-    do_copy_primary_bootstrap $ERL_TOP $ERL_TOP
+    do_copy_primary_bootstrap "$ERL_TOP" "$ERL_TOP"
 }
 
 do_remove_prebuilt_files ()
 {
     do_save_bootstrap
-    for file in $ERL_TOP/`cat $ERL_TOP/prebuilt.files` ; do
+    for file in "$ERL_TOP"/`cat "$ERL_TOP/prebuilt.files"` ; do
 	rm -f $file
     done
 }
@@ -1243,7 +1106,7 @@ do_remove_prebuilt_files ()
 
 check_erltop
 
-cd $ERL_TOP
+cd "$ERL_TOP"
 
 determine_version_controller
 
@@ -1257,7 +1120,7 @@ unset ${erl_otp_flags}
 # Target first guess, won't necessarily hold, may be changed for 
 # certain parameters.
 if [ X"$TARGET" = X"" ]; then
-	TARGET=`$ERL_TOP/erts/autoconf/config.guess`
+	TARGET=`"$ERL_TOP/erts/autoconf/config.guess"`
 fi
 BUILDSYS=$TARGET
 
@@ -1335,27 +1198,11 @@ case "$1" in
 		do_autoconf; 
 		do_configure "$@";
 		do_boot;;
-	lazy_setup)
-		shift;
-		if [ $minus_a_flag = true ]; then 
-		    shift
-		fi;
-		do_lazy_configure "$@";
-		do_boot;;
 	autoconf)
 		do_autoconf;;
 	configure)
 		shift;
 		do_configure "$@";;
-	lazy_configure)
-		shift;
-		do_lazy_configure "$@";;
-	lazy_configure_clean)
-		shift;
-		do_lazy_configure_clean;;
-	lazy_configure_target_clean)
-		shift;
-		do_lazy_configure_target_clean;;
 	opt)
 		do_boot;;
 	plain|smp)
diff --git a/otp_patch_apply b/otp_patch_apply
index 0127b96a73..3ff929ccbb 100755
--- a/otp_patch_apply
+++ b/otp_patch_apply
@@ -19,7 +19,7 @@
 # %CopyrightEnd%
 #
 
-version="1.0.1"
+version="1.0.2"
 
 force=
 lib_path=
@@ -388,9 +388,7 @@ if [ $install_docs = yes ]; then
 	    TESTROOT="$idir" release_docs) || exit 1
     done
 
-    (cd "$sdir/system/doc/top" && $MAKE clean)
-
-    (cd "$sdir/system/doc/top" && \
+    (cd "$sdir/system/doc" && \
 	$MAKE MAKE="$MAKE" RELEASE_ROOT="$idir" RELEASE_PATH="$idir" \
 	TESTROOT="$idir" release_docs) || exit 1
 
diff --git a/otp_versions.table b/otp_versions.table
index 29cc725a1d..47b95b7ee1 100644
--- a/otp_versions.table
+++ b/otp_versions.table
@@ -1,3 +1,34 @@
+OTP-22.0.7 : compiler-7.4.4 # asn1-5.0.9 common_test-1.17.3 crypto-4.5.1 debugger-4.2.7 dialyzer-4.0.3 diameter-2.2.1 edoc-0.11 eldap-1.2.8 erl_docgen-0.9.1 erl_interface-3.12 erts-10.4.4 et-1.6.4 eunit-2.3.7 ftp-1.0.2 hipe-3.19.1 inets-7.0.9 jinterface-1.10 kernel-6.4.1 megaco-3.18.5 mnesia-4.16 observer-2.9.1 odbc-2.12.4 os_mon-2.5 parsetools-2.1.8 public_key-1.6.7 reltool-0.8 runtime_tools-1.13.3 sasl-3.4 snmp-5.3 ssh-4.7.7 ssl-9.3.5 stdlib-3.9.2 syntax_tools-2.2 tftp-1.0.1 tools-3.2 wx-1.8.8 xmerl-1.3.21 :
+OTP-22.0.6 : compiler-7.4.3 dialyzer-4.0.3 hipe-3.19.1 ssl-9.3.5 # asn1-5.0.9 common_test-1.17.3 crypto-4.5.1 debugger-4.2.7 diameter-2.2.1 edoc-0.11 eldap-1.2.8 erl_docgen-0.9.1 erl_interface-3.12 erts-10.4.4 et-1.6.4 eunit-2.3.7 ftp-1.0.2 inets-7.0.9 jinterface-1.10 kernel-6.4.1 megaco-3.18.5 mnesia-4.16 observer-2.9.1 odbc-2.12.4 os_mon-2.5 parsetools-2.1.8 public_key-1.6.7 reltool-0.8 runtime_tools-1.13.3 sasl-3.4 snmp-5.3 ssh-4.7.7 stdlib-3.9.2 syntax_tools-2.2 tftp-1.0.1 tools-3.2 wx-1.8.8 xmerl-1.3.21 :
+OTP-22.0.5 : dialyzer-4.0.2 erts-10.4.4 inets-7.0.9 ssl-9.3.4 # asn1-5.0.9 common_test-1.17.3 compiler-7.4.2 crypto-4.5.1 debugger-4.2.7 diameter-2.2.1 edoc-0.11 eldap-1.2.8 erl_docgen-0.9.1 erl_interface-3.12 et-1.6.4 eunit-2.3.7 ftp-1.0.2 hipe-3.19 jinterface-1.10 kernel-6.4.1 megaco-3.18.5 mnesia-4.16 observer-2.9.1 odbc-2.12.4 os_mon-2.5 parsetools-2.1.8 public_key-1.6.7 reltool-0.8 runtime_tools-1.13.3 sasl-3.4 snmp-5.3 ssh-4.7.7 stdlib-3.9.2 syntax_tools-2.2 tftp-1.0.1 tools-3.2 wx-1.8.8 xmerl-1.3.21 :
+OTP-22.0.4 : erts-10.4.3 kernel-6.4.1 ssl-9.3.3 # asn1-5.0.9 common_test-1.17.3 compiler-7.4.2 crypto-4.5.1 debugger-4.2.7 dialyzer-4.0.1 diameter-2.2.1 edoc-0.11 eldap-1.2.8 erl_docgen-0.9.1 erl_interface-3.12 et-1.6.4 eunit-2.3.7 ftp-1.0.2 hipe-3.19 inets-7.0.8 jinterface-1.10 megaco-3.18.5 mnesia-4.16 observer-2.9.1 odbc-2.12.4 os_mon-2.5 parsetools-2.1.8 public_key-1.6.7 reltool-0.8 runtime_tools-1.13.3 sasl-3.4 snmp-5.3 ssh-4.7.7 stdlib-3.9.2 syntax_tools-2.2 tftp-1.0.1 tools-3.2 wx-1.8.8 xmerl-1.3.21 :
+OTP-22.0.3 : compiler-7.4.2 dialyzer-4.0.1 erts-10.4.2 ssl-9.3.2 stdlib-3.9.2 # asn1-5.0.9 common_test-1.17.3 crypto-4.5.1 debugger-4.2.7 diameter-2.2.1 edoc-0.11 eldap-1.2.8 erl_docgen-0.9.1 erl_interface-3.12 et-1.6.4 eunit-2.3.7 ftp-1.0.2 hipe-3.19 inets-7.0.8 jinterface-1.10 kernel-6.4 megaco-3.18.5 mnesia-4.16 observer-2.9.1 odbc-2.12.4 os_mon-2.5 parsetools-2.1.8 public_key-1.6.7 reltool-0.8 runtime_tools-1.13.3 sasl-3.4 snmp-5.3 ssh-4.7.7 syntax_tools-2.2 tftp-1.0.1 tools-3.2 wx-1.8.8 xmerl-1.3.21 :
+OTP-22.0.2 : compiler-7.4.1 crypto-4.5.1 erts-10.4.1 stdlib-3.9.1 # asn1-5.0.9 common_test-1.17.3 debugger-4.2.7 dialyzer-4.0 diameter-2.2.1 edoc-0.11 eldap-1.2.8 erl_docgen-0.9.1 erl_interface-3.12 et-1.6.4 eunit-2.3.7 ftp-1.0.2 hipe-3.19 inets-7.0.8 jinterface-1.10 kernel-6.4 megaco-3.18.5 mnesia-4.16 observer-2.9.1 odbc-2.12.4 os_mon-2.5 parsetools-2.1.8 public_key-1.6.7 reltool-0.8 runtime_tools-1.13.3 sasl-3.4 snmp-5.3 ssh-4.7.7 ssl-9.3.1 syntax_tools-2.2 tftp-1.0.1 tools-3.2 wx-1.8.8 xmerl-1.3.21 :
+OTP-22.0.1 : ssl-9.3.1 # asn1-5.0.9 common_test-1.17.3 compiler-7.4 crypto-4.5 debugger-4.2.7 dialyzer-4.0 diameter-2.2.1 edoc-0.11 eldap-1.2.8 erl_docgen-0.9.1 erl_interface-3.12 erts-10.4 et-1.6.4 eunit-2.3.7 ftp-1.0.2 hipe-3.19 inets-7.0.8 jinterface-1.10 kernel-6.4 megaco-3.18.5 mnesia-4.16 observer-2.9.1 odbc-2.12.4 os_mon-2.5 parsetools-2.1.8 public_key-1.6.7 reltool-0.8 runtime_tools-1.13.3 sasl-3.4 snmp-5.3 ssh-4.7.7 stdlib-3.9 syntax_tools-2.2 tftp-1.0.1 tools-3.2 wx-1.8.8 xmerl-1.3.21 :
+OTP-22.0 : asn1-5.0.9 common_test-1.17.3 compiler-7.4 crypto-4.5 debugger-4.2.7 dialyzer-4.0 edoc-0.11 eldap-1.2.8 erl_docgen-0.9.1 erl_interface-3.12 erts-10.4 hipe-3.19 inets-7.0.8 jinterface-1.10 kernel-6.4 megaco-3.18.5 mnesia-4.16 observer-2.9.1 odbc-2.12.4 os_mon-2.5 public_key-1.6.7 reltool-0.8 runtime_tools-1.13.3 sasl-3.4 snmp-5.3 ssh-4.7.7 ssl-9.3 stdlib-3.9 syntax_tools-2.2 tools-3.2 wx-1.8.8 xmerl-1.3.21 # diameter-2.2.1 et-1.6.4 eunit-2.3.7 ftp-1.0.2 parsetools-2.1.8 tftp-1.0.1 :
+OTP-21.3.8.6 : ssl-9.2.3.5 # asn1-5.0.8 common_test-1.17.2.1 compiler-7.3.2 crypto-4.4.2 debugger-4.2.6 dialyzer-3.3.2 diameter-2.2.1 edoc-0.10 eldap-1.2.7 erl_docgen-0.9 erl_interface-3.11.3 erts-10.3.5.4 et-1.6.4 eunit-2.3.7 ftp-1.0.2 hipe-3.18.3 inets-7.0.7 jinterface-1.9.1 kernel-6.3.1.2 megaco-3.18.4 mnesia-4.15.6 observer-2.9 odbc-2.12.3 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.6.1 reltool-0.7.8 runtime_tools-1.13.2 sasl-3.3 snmp-5.2.12 ssh-4.7.6 stdlib-3.8.2.2 syntax_tools-2.1.7 tftp-1.0.1 tools-3.1.0.1 wx-1.8.7 xmerl-1.3.20.1 :
+OTP-21.3.8.5 : erts-10.3.5.4 ssl-9.2.3.4 # asn1-5.0.8 common_test-1.17.2.1 compiler-7.3.2 crypto-4.4.2 debugger-4.2.6 dialyzer-3.3.2 diameter-2.2.1 edoc-0.10 eldap-1.2.7 erl_docgen-0.9 erl_interface-3.11.3 et-1.6.4 eunit-2.3.7 ftp-1.0.2 hipe-3.18.3 inets-7.0.7 jinterface-1.9.1 kernel-6.3.1.2 megaco-3.18.4 mnesia-4.15.6 observer-2.9 odbc-2.12.3 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.6.1 reltool-0.7.8 runtime_tools-1.13.2 sasl-3.3 snmp-5.2.12 ssh-4.7.6 stdlib-3.8.2.2 syntax_tools-2.1.7 tftp-1.0.1 tools-3.1.0.1 wx-1.8.7 xmerl-1.3.20.1 :
+OTP-21.3.8.4 : common_test-1.17.2.1 erts-10.3.5.3 kernel-6.3.1.2 public_key-1.6.6.1 ssl-9.2.3.3 stdlib-3.8.2.2 # asn1-5.0.8 compiler-7.3.2 crypto-4.4.2 debugger-4.2.6 dialyzer-3.3.2 diameter-2.2.1 edoc-0.10 eldap-1.2.7 erl_docgen-0.9 erl_interface-3.11.3 et-1.6.4 eunit-2.3.7 ftp-1.0.2 hipe-3.18.3 inets-7.0.7 jinterface-1.9.1 megaco-3.18.4 mnesia-4.15.6 observer-2.9 odbc-2.12.3 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 reltool-0.7.8 runtime_tools-1.13.2 sasl-3.3 snmp-5.2.12 ssh-4.7.6 syntax_tools-2.1.7 tftp-1.0.1 tools-3.1.0.1 wx-1.8.7 xmerl-1.3.20.1 :
+OTP-21.3.8.3 : erts-10.3.5.2 kernel-6.3.1.1 ssl-9.2.3.2 stdlib-3.8.2.1 # asn1-5.0.8 common_test-1.17.2 compiler-7.3.2 crypto-4.4.2 debugger-4.2.6 dialyzer-3.3.2 diameter-2.2.1 edoc-0.10 eldap-1.2.7 erl_docgen-0.9 erl_interface-3.11.3 et-1.6.4 eunit-2.3.7 ftp-1.0.2 hipe-3.18.3 inets-7.0.7 jinterface-1.9.1 megaco-3.18.4 mnesia-4.15.6 observer-2.9 odbc-2.12.3 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.6 reltool-0.7.8 runtime_tools-1.13.2 sasl-3.3 snmp-5.2.12 ssh-4.7.6 syntax_tools-2.1.7 tftp-1.0.1 tools-3.1.0.1 wx-1.8.7 xmerl-1.3.20.1 :
+OTP-21.3.8.2 : xmerl-1.3.20.1 # asn1-5.0.8 common_test-1.17.2 compiler-7.3.2 crypto-4.4.2 debugger-4.2.6 dialyzer-3.3.2 diameter-2.2.1 edoc-0.10 eldap-1.2.7 erl_docgen-0.9 erl_interface-3.11.3 erts-10.3.5.1 et-1.6.4 eunit-2.3.7 ftp-1.0.2 hipe-3.18.3 inets-7.0.7 jinterface-1.9.1 kernel-6.3.1 megaco-3.18.4 mnesia-4.15.6 observer-2.9 odbc-2.12.3 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.6 reltool-0.7.8 runtime_tools-1.13.2 sasl-3.3 snmp-5.2.12 ssh-4.7.6 ssl-9.2.3.1 stdlib-3.8.2 syntax_tools-2.1.7 tftp-1.0.1 tools-3.1.0.1 wx-1.8.7 :
+OTP-21.3.8.1 : erts-10.3.5.1 ssl-9.2.3.1 tools-3.1.0.1 # asn1-5.0.8 common_test-1.17.2 compiler-7.3.2 crypto-4.4.2 debugger-4.2.6 dialyzer-3.3.2 diameter-2.2.1 edoc-0.10 eldap-1.2.7 erl_docgen-0.9 erl_interface-3.11.3 et-1.6.4 eunit-2.3.7 ftp-1.0.2 hipe-3.18.3 inets-7.0.7 jinterface-1.9.1 kernel-6.3.1 megaco-3.18.4 mnesia-4.15.6 observer-2.9 odbc-2.12.3 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.6 reltool-0.7.8 runtime_tools-1.13.2 sasl-3.3 snmp-5.2.12 ssh-4.7.6 stdlib-3.8.2 syntax_tools-2.1.7 tftp-1.0.1 wx-1.8.7 xmerl-1.3.20 :
+OTP-21.3.8 : common_test-1.17.2 eldap-1.2.7 erl_interface-3.11.3 erts-10.3.5 public_key-1.6.6 ssl-9.2.3 stdlib-3.8.2 # asn1-5.0.8 compiler-7.3.2 crypto-4.4.2 debugger-4.2.6 dialyzer-3.3.2 diameter-2.2.1 edoc-0.10 erl_docgen-0.9 et-1.6.4 eunit-2.3.7 ftp-1.0.2 hipe-3.18.3 inets-7.0.7 jinterface-1.9.1 kernel-6.3.1 megaco-3.18.4 mnesia-4.15.6 observer-2.9 odbc-2.12.3 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 reltool-0.7.8 runtime_tools-1.13.2 sasl-3.3 snmp-5.2.12 ssh-4.7.6 syntax_tools-2.1.7 tftp-1.0.1 tools-3.1 wx-1.8.7 xmerl-1.3.20 :
+OTP-21.3.7.1 : erl_interface-3.11.2.1 # asn1-5.0.8 common_test-1.17.1 compiler-7.3.2 crypto-4.4.2 debugger-4.2.6 dialyzer-3.3.2 diameter-2.2.1 edoc-0.10 eldap-1.2.6 erl_docgen-0.9 erts-10.3.4 et-1.6.4 eunit-2.3.7 ftp-1.0.2 hipe-3.18.3 inets-7.0.7 jinterface-1.9.1 kernel-6.3.1 megaco-3.18.4 mnesia-4.15.6 observer-2.9 odbc-2.12.3 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.5 reltool-0.7.8 runtime_tools-1.13.2 sasl-3.3 snmp-5.2.12 ssh-4.7.6 ssl-9.2.2 stdlib-3.8.1 syntax_tools-2.1.7 tftp-1.0.1 tools-3.1 wx-1.8.7 xmerl-1.3.20 :
+OTP-21.3.7 : ssh-4.7.6 # asn1-5.0.8 common_test-1.17.1 compiler-7.3.2 crypto-4.4.2 debugger-4.2.6 dialyzer-3.3.2 diameter-2.2.1 edoc-0.10 eldap-1.2.6 erl_docgen-0.9 erl_interface-3.11.2 erts-10.3.4 et-1.6.4 eunit-2.3.7 ftp-1.0.2 hipe-3.18.3 inets-7.0.7 jinterface-1.9.1 kernel-6.3.1 megaco-3.18.4 mnesia-4.15.6 observer-2.9 odbc-2.12.3 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.5 reltool-0.7.8 runtime_tools-1.13.2 sasl-3.3 snmp-5.2.12 ssl-9.2.2 stdlib-3.8.1 syntax_tools-2.1.7 tftp-1.0.1 tools-3.1 wx-1.8.7 xmerl-1.3.20 :
+OTP-21.3.6 : ssl-9.2.2 # asn1-5.0.8 common_test-1.17.1 compiler-7.3.2 crypto-4.4.2 debugger-4.2.6 dialyzer-3.3.2 diameter-2.2.1 edoc-0.10 eldap-1.2.6 erl_docgen-0.9 erl_interface-3.11.2 erts-10.3.4 et-1.6.4 eunit-2.3.7 ftp-1.0.2 hipe-3.18.3 inets-7.0.7 jinterface-1.9.1 kernel-6.3.1 megaco-3.18.4 mnesia-4.15.6 observer-2.9 odbc-2.12.3 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.5 reltool-0.7.8 runtime_tools-1.13.2 sasl-3.3 snmp-5.2.12 ssh-4.7.5 stdlib-3.8.1 syntax_tools-2.1.7 tftp-1.0.1 tools-3.1 wx-1.8.7 xmerl-1.3.20 :
+OTP-21.3.5 : diameter-2.2.1 erts-10.3.4 inets-7.0.7 # asn1-5.0.8 common_test-1.17.1 compiler-7.3.2 crypto-4.4.2 debugger-4.2.6 dialyzer-3.3.2 edoc-0.10 eldap-1.2.6 erl_docgen-0.9 erl_interface-3.11.2 et-1.6.4 eunit-2.3.7 ftp-1.0.2 hipe-3.18.3 jinterface-1.9.1 kernel-6.3.1 megaco-3.18.4 mnesia-4.15.6 observer-2.9 odbc-2.12.3 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.5 reltool-0.7.8 runtime_tools-1.13.2 sasl-3.3 snmp-5.2.12 ssh-4.7.5 ssl-9.2.1 stdlib-3.8.1 syntax_tools-2.1.7 tftp-1.0.1 tools-3.1 wx-1.8.7 xmerl-1.3.20 :
+OTP-21.3.4 : common_test-1.17.1 crypto-4.4.2 erl_interface-3.11.2 erts-10.3.3 ssh-4.7.5 # asn1-5.0.8 compiler-7.3.2 debugger-4.2.6 dialyzer-3.3.2 diameter-2.2 edoc-0.10 eldap-1.2.6 erl_docgen-0.9 et-1.6.4 eunit-2.3.7 ftp-1.0.2 hipe-3.18.3 inets-7.0.6 jinterface-1.9.1 kernel-6.3.1 megaco-3.18.4 mnesia-4.15.6 observer-2.9 odbc-2.12.3 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.5 reltool-0.7.8 runtime_tools-1.13.2 sasl-3.3 snmp-5.2.12 ssl-9.2.1 stdlib-3.8.1 syntax_tools-2.1.7 tftp-1.0.1 tools-3.1 wx-1.8.7 xmerl-1.3.20 :
+OTP-21.3.3 : erts-10.3.2 kernel-6.3.1 stdlib-3.8.1 # asn1-5.0.8 common_test-1.17 compiler-7.3.2 crypto-4.4.1 debugger-4.2.6 dialyzer-3.3.2 diameter-2.2 edoc-0.10 eldap-1.2.6 erl_docgen-0.9 erl_interface-3.11.1 et-1.6.4 eunit-2.3.7 ftp-1.0.2 hipe-3.18.3 inets-7.0.6 jinterface-1.9.1 megaco-3.18.4 mnesia-4.15.6 observer-2.9 odbc-2.12.3 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.5 reltool-0.7.8 runtime_tools-1.13.2 sasl-3.3 snmp-5.2.12 ssh-4.7.4 ssl-9.2.1 syntax_tools-2.1.7 tftp-1.0.1 tools-3.1 wx-1.8.7 xmerl-1.3.20 :
+OTP-21.3.2 : erts-10.3.1 xmerl-1.3.20 # asn1-5.0.8 common_test-1.17 compiler-7.3.2 crypto-4.4.1 debugger-4.2.6 dialyzer-3.3.2 diameter-2.2 edoc-0.10 eldap-1.2.6 erl_docgen-0.9 erl_interface-3.11.1 et-1.6.4 eunit-2.3.7 ftp-1.0.2 hipe-3.18.3 inets-7.0.6 jinterface-1.9.1 kernel-6.3 megaco-3.18.4 mnesia-4.15.6 observer-2.9 odbc-2.12.3 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.5 reltool-0.7.8 runtime_tools-1.13.2 sasl-3.3 snmp-5.2.12 ssh-4.7.4 ssl-9.2.1 stdlib-3.8 syntax_tools-2.1.7 tftp-1.0.1 tools-3.1 wx-1.8.7 :
+OTP-21.3.1 : erl_interface-3.11.1 ssl-9.2.1 # asn1-5.0.8 common_test-1.17 compiler-7.3.2 crypto-4.4.1 debugger-4.2.6 dialyzer-3.3.2 diameter-2.2 edoc-0.10 eldap-1.2.6 erl_docgen-0.9 erts-10.3 et-1.6.4 eunit-2.3.7 ftp-1.0.2 hipe-3.18.3 inets-7.0.6 jinterface-1.9.1 kernel-6.3 megaco-3.18.4 mnesia-4.15.6 observer-2.9 odbc-2.12.3 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.5 reltool-0.7.8 runtime_tools-1.13.2 sasl-3.3 snmp-5.2.12 ssh-4.7.4 stdlib-3.8 syntax_tools-2.1.7 tftp-1.0.1 tools-3.1 wx-1.8.7 xmerl-1.3.19 :
+OTP-21.3 : common_test-1.17 compiler-7.3.2 crypto-4.4.1 dialyzer-3.3.2 diameter-2.2 edoc-0.10 erl_docgen-0.9 erl_interface-3.11 erts-10.3 ftp-1.0.2 hipe-3.18.3 inets-7.0.6 kernel-6.3 mnesia-4.15.6 observer-2.9 odbc-2.12.3 public_key-1.6.5 runtime_tools-1.13.2 ssh-4.7.4 ssl-9.2 stdlib-3.8 syntax_tools-2.1.7 tools-3.1 wx-1.8.7 # asn1-5.0.8 debugger-4.2.6 eldap-1.2.6 et-1.6.4 eunit-2.3.7 jinterface-1.9.1 megaco-3.18.4 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 reltool-0.7.8 sasl-3.3 snmp-5.2.12 tftp-1.0.1 xmerl-1.3.19 :
+OTP-21.2.7 : erts-10.2.5 kernel-6.2.1 # asn1-5.0.8 common_test-1.16.1 compiler-7.3.1 crypto-4.4 debugger-4.2.6 dialyzer-3.3.1 diameter-2.1.6 edoc-0.9.4 eldap-1.2.6 erl_docgen-0.8.1 erl_interface-3.10.4 et-1.6.4 eunit-2.3.7 ftp-1.0.1 hipe-3.18.2 inets-7.0.5 jinterface-1.9.1 megaco-3.18.4 mnesia-4.15.5 observer-2.8.2 odbc-2.12.2 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.4 reltool-0.7.8 runtime_tools-1.13.1 sasl-3.3 snmp-5.2.12 ssh-4.7.3 ssl-9.1.2 stdlib-3.7.1 syntax_tools-2.1.6 tftp-1.0.1 tools-3.0.2 wx-1.8.6 xmerl-1.3.19 :
+OTP-21.2.6 : erts-10.2.4 stdlib-3.7.1 # asn1-5.0.8 common_test-1.16.1 compiler-7.3.1 crypto-4.4 debugger-4.2.6 dialyzer-3.3.1 diameter-2.1.6 edoc-0.9.4 eldap-1.2.6 erl_docgen-0.8.1 erl_interface-3.10.4 et-1.6.4 eunit-2.3.7 ftp-1.0.1 hipe-3.18.2 inets-7.0.5 jinterface-1.9.1 kernel-6.2 megaco-3.18.4 mnesia-4.15.5 observer-2.8.2 odbc-2.12.2 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.4 reltool-0.7.8 runtime_tools-1.13.1 sasl-3.3 snmp-5.2.12 ssh-4.7.3 ssl-9.1.2 syntax_tools-2.1.6 tftp-1.0.1 tools-3.0.2 wx-1.8.6 xmerl-1.3.19 :
+OTP-21.2.5 : inets-7.0.5 # asn1-5.0.8 common_test-1.16.1 compiler-7.3.1 crypto-4.4 debugger-4.2.6 dialyzer-3.3.1 diameter-2.1.6 edoc-0.9.4 eldap-1.2.6 erl_docgen-0.8.1 erl_interface-3.10.4 erts-10.2.3 et-1.6.4 eunit-2.3.7 ftp-1.0.1 hipe-3.18.2 jinterface-1.9.1 kernel-6.2 megaco-3.18.4 mnesia-4.15.5 observer-2.8.2 odbc-2.12.2 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.4 reltool-0.7.8 runtime_tools-1.13.1 sasl-3.3 snmp-5.2.12 ssh-4.7.3 ssl-9.1.2 stdlib-3.7 syntax_tools-2.1.6 tftp-1.0.1 tools-3.0.2 wx-1.8.6 xmerl-1.3.19 :
+OTP-21.2.4 : erts-10.2.3 inets-7.0.4 # asn1-5.0.8 common_test-1.16.1 compiler-7.3.1 crypto-4.4 debugger-4.2.6 dialyzer-3.3.1 diameter-2.1.6 edoc-0.9.4 eldap-1.2.6 erl_docgen-0.8.1 erl_interface-3.10.4 et-1.6.4 eunit-2.3.7 ftp-1.0.1 hipe-3.18.2 jinterface-1.9.1 kernel-6.2 megaco-3.18.4 mnesia-4.15.5 observer-2.8.2 odbc-2.12.2 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.4 reltool-0.7.8 runtime_tools-1.13.1 sasl-3.3 snmp-5.2.12 ssh-4.7.3 ssl-9.1.2 stdlib-3.7 syntax_tools-2.1.6 tftp-1.0.1 tools-3.0.2 wx-1.8.6 xmerl-1.3.19 :
+OTP-21.2.3 : compiler-7.3.1 erts-10.2.2 ssl-9.1.2 xmerl-1.3.19 # asn1-5.0.8 common_test-1.16.1 crypto-4.4 debugger-4.2.6 dialyzer-3.3.1 diameter-2.1.6 edoc-0.9.4 eldap-1.2.6 erl_docgen-0.8.1 erl_interface-3.10.4 et-1.6.4 eunit-2.3.7 ftp-1.0.1 hipe-3.18.2 inets-7.0.3 jinterface-1.9.1 kernel-6.2 megaco-3.18.4 mnesia-4.15.5 observer-2.8.2 odbc-2.12.2 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.4 reltool-0.7.8 runtime_tools-1.13.1 sasl-3.3 snmp-5.2.12 ssh-4.7.3 stdlib-3.7 syntax_tools-2.1.6 tftp-1.0.1 tools-3.0.2 wx-1.8.6 :
+OTP-21.2.2 : ssh-4.7.3 # asn1-5.0.8 common_test-1.16.1 compiler-7.3 crypto-4.4 debugger-4.2.6 dialyzer-3.3.1 diameter-2.1.6 edoc-0.9.4 eldap-1.2.6 erl_docgen-0.8.1 erl_interface-3.10.4 erts-10.2.1 et-1.6.4 eunit-2.3.7 ftp-1.0.1 hipe-3.18.2 inets-7.0.3 jinterface-1.9.1 kernel-6.2 megaco-3.18.4 mnesia-4.15.5 observer-2.8.2 odbc-2.12.2 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.4 reltool-0.7.8 runtime_tools-1.13.1 sasl-3.3 snmp-5.2.12 ssl-9.1.1 stdlib-3.7 syntax_tools-2.1.6 tftp-1.0.1 tools-3.0.2 wx-1.8.6 xmerl-1.3.18 :
+OTP-21.2.1 : erts-10.2.1 ssl-9.1.1 # asn1-5.0.8 common_test-1.16.1 compiler-7.3 crypto-4.4 debugger-4.2.6 dialyzer-3.3.1 diameter-2.1.6 edoc-0.9.4 eldap-1.2.6 erl_docgen-0.8.1 erl_interface-3.10.4 et-1.6.4 eunit-2.3.7 ftp-1.0.1 hipe-3.18.2 inets-7.0.3 jinterface-1.9.1 kernel-6.2 megaco-3.18.4 mnesia-4.15.5 observer-2.8.2 odbc-2.12.2 os_mon-2.4.7 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.4 reltool-0.7.8 runtime_tools-1.13.1 sasl-3.3 snmp-5.2.12 ssh-4.7.2 stdlib-3.7 syntax_tools-2.1.6 tftp-1.0.1 tools-3.0.2 wx-1.8.6 xmerl-1.3.18 :
 OTP-21.2 : asn1-5.0.8 compiler-7.3 crypto-4.4 erts-10.2 et-1.6.4 hipe-3.18.2 inets-7.0.3 kernel-6.2 observer-2.8.2 os_mon-2.4.7 public_key-1.6.4 reltool-0.7.8 sasl-3.3 ssh-4.7.2 ssl-9.1 stdlib-3.7 tools-3.0.2 wx-1.8.6 # common_test-1.16.1 debugger-4.2.6 dialyzer-3.3.1 diameter-2.1.6 edoc-0.9.4 eldap-1.2.6 erl_docgen-0.8.1 erl_interface-3.10.4 eunit-2.3.7 ftp-1.0.1 jinterface-1.9.1 megaco-3.18.4 mnesia-4.15.5 odbc-2.12.2 otp_mibs-1.2.1 parsetools-2.1.8 runtime_tools-1.13.1 snmp-5.2.12 syntax_tools-2.1.6 tftp-1.0.1 xmerl-1.3.18 :
 OTP-21.1.4 : kernel-6.1.1 # asn1-5.0.7 common_test-1.16.1 compiler-7.2.7 crypto-4.3.3 debugger-4.2.6 dialyzer-3.3.1 diameter-2.1.6 edoc-0.9.4 eldap-1.2.6 erl_docgen-0.8.1 erl_interface-3.10.4 erts-10.1.3 et-1.6.3 eunit-2.3.7 ftp-1.0.1 hipe-3.18.1 inets-7.0.2 jinterface-1.9.1 megaco-3.18.4 mnesia-4.15.5 observer-2.8.1 odbc-2.12.2 os_mon-2.4.6 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.3 reltool-0.7.7 runtime_tools-1.13.1 sasl-3.2.1 snmp-5.2.12 ssh-4.7.1 ssl-9.0.3 stdlib-3.6 syntax_tools-2.1.6 tftp-1.0.1 tools-3.0.1 wx-1.8.5 xmerl-1.3.18 :
 OTP-21.1.3 : erts-10.1.3 # asn1-5.0.7 common_test-1.16.1 compiler-7.2.7 crypto-4.3.3 debugger-4.2.6 dialyzer-3.3.1 diameter-2.1.6 edoc-0.9.4 eldap-1.2.6 erl_docgen-0.8.1 erl_interface-3.10.4 et-1.6.3 eunit-2.3.7 ftp-1.0.1 hipe-3.18.1 inets-7.0.2 jinterface-1.9.1 kernel-6.1 megaco-3.18.4 mnesia-4.15.5 observer-2.8.1 odbc-2.12.2 os_mon-2.4.6 otp_mibs-1.2.1 parsetools-2.1.8 public_key-1.6.3 reltool-0.7.7 runtime_tools-1.13.1 sasl-3.2.1 snmp-5.2.12 ssh-4.7.1 ssl-9.0.3 stdlib-3.6 syntax_tools-2.1.6 tftp-1.0.1 tools-3.0.1 wx-1.8.5 xmerl-1.3.18 :
@@ -14,6 +45,13 @@ OTP-21.0.3 : erts-10.0.3 # asn1-5.0.6 common_test-1.16 compiler-7.2.2 crypto-4.3
 OTP-21.0.2 : compiler-7.2.2 erts-10.0.2 public_key-1.6.1 stdlib-3.5.1 # asn1-5.0.6 common_test-1.16 crypto-4.3 debugger-4.2.5 dialyzer-3.3 diameter-2.1.5 edoc-0.9.3 eldap-1.2.4 erl_docgen-0.8 erl_interface-3.10.3 et-1.6.2 eunit-2.3.6 ftp-1.0 hipe-3.18 inets-7.0 jinterface-1.9 kernel-6.0 megaco-3.18.3 mnesia-4.15.4 observer-2.8 odbc-2.12.1 os_mon-2.4.5 otp_mibs-1.2 parsetools-2.1.7 reltool-0.7.6 runtime_tools-1.13 sasl-3.2 snmp-5.2.11 ssh-4.7 ssl-9.0 syntax_tools-2.1.5 tftp-1.0 tools-3.0 wx-1.8.4 xmerl-1.3.17 :
 OTP-21.0.1 : compiler-7.2.1 erts-10.0.1 # asn1-5.0.6 common_test-1.16 crypto-4.3 debugger-4.2.5 dialyzer-3.3 diameter-2.1.5 edoc-0.9.3 eldap-1.2.4 erl_docgen-0.8 erl_interface-3.10.3 et-1.6.2 eunit-2.3.6 ftp-1.0 hipe-3.18 inets-7.0 jinterface-1.9 kernel-6.0 megaco-3.18.3 mnesia-4.15.4 observer-2.8 odbc-2.12.1 os_mon-2.4.5 otp_mibs-1.2 parsetools-2.1.7 public_key-1.6 reltool-0.7.6 runtime_tools-1.13 sasl-3.2 snmp-5.2.11 ssh-4.7 ssl-9.0 stdlib-3.5 syntax_tools-2.1.5 tftp-1.0 tools-3.0 wx-1.8.4 xmerl-1.3.17 :
 OTP-21.0 : asn1-5.0.6 common_test-1.16 compiler-7.2 crypto-4.3 debugger-4.2.5 dialyzer-3.3 diameter-2.1.5 edoc-0.9.3 eldap-1.2.4 erl_docgen-0.8 erl_interface-3.10.3 erts-10.0 et-1.6.2 eunit-2.3.6 ftp-1.0 hipe-3.18 inets-7.0 jinterface-1.9 kernel-6.0 mnesia-4.15.4 observer-2.8 os_mon-2.4.5 otp_mibs-1.2 parsetools-2.1.7 public_key-1.6 reltool-0.7.6 runtime_tools-1.13 sasl-3.2 ssh-4.7 ssl-9.0 stdlib-3.5 syntax_tools-2.1.5 tftp-1.0 tools-3.0 wx-1.8.4 xmerl-1.3.17 # megaco-3.18.3 odbc-2.12.1 snmp-5.2.11 :
+OTP-20.3.8.22 : common_test-1.15.4.3 erts-9.3.3.11 tools-2.11.2.2 # asn1-5.0.5.2 compiler-7.1.5.2 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.2.2 debugger-4.2.4 dialyzer-3.2.4 diameter-2.1.4.1 edoc-0.9.2 eldap-1.2.3.1 erl_docgen-0.7.3 erl_interface-3.10.2.2 et-1.6.1 eunit-2.3.5 hipe-3.17.1 ic-4.4.4.2 inets-6.5.2.4 jinterface-1.8.1 kernel-5.4.3.2 megaco-3.18.3 mnesia-4.15.3.2 observer-2.7 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.5 sasl-3.1.2 snmp-5.2.11.1 ssh-4.6.9.4 ssl-8.2.6.4 stdlib-3.4.5.1 syntax_tools-2.1.4.1 wx-1.8.3 xmerl-1.3.16.1 :
+OTP-20.3.8.21 : common_test-1.15.4.2 erl_interface-3.10.2.2 erts-9.3.3.10 snmp-5.2.11.1 ssh-4.6.9.4 tools-2.11.2.1 # asn1-5.0.5.2 compiler-7.1.5.2 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.2.2 debugger-4.2.4 dialyzer-3.2.4 diameter-2.1.4.1 edoc-0.9.2 eldap-1.2.3.1 erl_docgen-0.7.3 et-1.6.1 eunit-2.3.5 hipe-3.17.1 ic-4.4.4.2 inets-6.5.2.4 jinterface-1.8.1 kernel-5.4.3.2 megaco-3.18.3 mnesia-4.15.3.2 observer-2.7 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.5 sasl-3.1.2 ssl-8.2.6.4 stdlib-3.4.5.1 syntax_tools-2.1.4.1 wx-1.8.3 xmerl-1.3.16.1 :
+OTP-20.3.8.20 : common_test-1.15.4.1 # asn1-5.0.5.2 compiler-7.1.5.2 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.2.2 debugger-4.2.4 dialyzer-3.2.4 diameter-2.1.4.1 edoc-0.9.2 eldap-1.2.3.1 erl_docgen-0.7.3 erl_interface-3.10.2.1 erts-9.3.3.9 et-1.6.1 eunit-2.3.5 hipe-3.17.1 ic-4.4.4.2 inets-6.5.2.4 jinterface-1.8.1 kernel-5.4.3.2 megaco-3.18.3 mnesia-4.15.3.2 observer-2.7 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.5 sasl-3.1.2 snmp-5.2.11 ssh-4.6.9.3 ssl-8.2.6.4 stdlib-3.4.5.1 syntax_tools-2.1.4.1 tools-2.11.2 wx-1.8.3 xmerl-1.3.16.1 :
+OTP-20.3.8.19 : diameter-2.1.4.1 erts-9.3.3.9 # asn1-5.0.5.2 common_test-1.15.4 compiler-7.1.5.2 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.2.2 debugger-4.2.4 dialyzer-3.2.4 edoc-0.9.2 eldap-1.2.3.1 erl_docgen-0.7.3 erl_interface-3.10.2.1 et-1.6.1 eunit-2.3.5 hipe-3.17.1 ic-4.4.4.2 inets-6.5.2.4 jinterface-1.8.1 kernel-5.4.3.2 megaco-3.18.3 mnesia-4.15.3.2 observer-2.7 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.5 sasl-3.1.2 snmp-5.2.11 ssh-4.6.9.3 ssl-8.2.6.4 stdlib-3.4.5.1 syntax_tools-2.1.4.1 tools-2.11.2 wx-1.8.3 xmerl-1.3.16.1 :
+OTP-20.3.8.18 : erts-9.3.3.8 # asn1-5.0.5.2 common_test-1.15.4 compiler-7.1.5.2 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.2.2 debugger-4.2.4 dialyzer-3.2.4 diameter-2.1.4 edoc-0.9.2 eldap-1.2.3.1 erl_docgen-0.7.3 erl_interface-3.10.2.1 et-1.6.1 eunit-2.3.5 hipe-3.17.1 ic-4.4.4.2 inets-6.5.2.4 jinterface-1.8.1 kernel-5.4.3.2 megaco-3.18.3 mnesia-4.15.3.2 observer-2.7 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.5 sasl-3.1.2 snmp-5.2.11 ssh-4.6.9.3 ssl-8.2.6.4 stdlib-3.4.5.1 syntax_tools-2.1.4.1 tools-2.11.2 wx-1.8.3 xmerl-1.3.16.1 :
+OTP-20.3.8.17 : xmerl-1.3.16.1 # asn1-5.0.5.2 common_test-1.15.4 compiler-7.1.5.2 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.2.2 debugger-4.2.4 dialyzer-3.2.4 diameter-2.1.4 edoc-0.9.2 eldap-1.2.3.1 erl_docgen-0.7.3 erl_interface-3.10.2.1 erts-9.3.3.7 et-1.6.1 eunit-2.3.5 hipe-3.17.1 ic-4.4.4.2 inets-6.5.2.4 jinterface-1.8.1 kernel-5.4.3.2 megaco-3.18.3 mnesia-4.15.3.2 observer-2.7 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.5 sasl-3.1.2 snmp-5.2.11 ssh-4.6.9.3 ssl-8.2.6.4 stdlib-3.4.5.1 syntax_tools-2.1.4.1 tools-2.11.2 wx-1.8.3 :
+OTP-20.3.8.16 : erts-9.3.3.7 ssh-4.6.9.3 # asn1-5.0.5.2 common_test-1.15.4 compiler-7.1.5.2 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.2.2 debugger-4.2.4 dialyzer-3.2.4 diameter-2.1.4 edoc-0.9.2 eldap-1.2.3.1 erl_docgen-0.7.3 erl_interface-3.10.2.1 et-1.6.1 eunit-2.3.5 hipe-3.17.1 ic-4.4.4.2 inets-6.5.2.4 jinterface-1.8.1 kernel-5.4.3.2 megaco-3.18.3 mnesia-4.15.3.2 observer-2.7 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.5 sasl-3.1.2 snmp-5.2.11 ssl-8.2.6.4 stdlib-3.4.5.1 syntax_tools-2.1.4.1 tools-2.11.2 wx-1.8.3 xmerl-1.3.16 :
 OTP-20.3.8.15 : asn1-5.0.5.2 # common_test-1.15.4 compiler-7.1.5.2 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.2.2 debugger-4.2.4 dialyzer-3.2.4 diameter-2.1.4 edoc-0.9.2 eldap-1.2.3.1 erl_docgen-0.7.3 erl_interface-3.10.2.1 erts-9.3.3.6 et-1.6.1 eunit-2.3.5 hipe-3.17.1 ic-4.4.4.2 inets-6.5.2.4 jinterface-1.8.1 kernel-5.4.3.2 megaco-3.18.3 mnesia-4.15.3.2 observer-2.7 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.5 sasl-3.1.2 snmp-5.2.11 ssh-4.6.9.2 ssl-8.2.6.4 stdlib-3.4.5.1 syntax_tools-2.1.4.1 tools-2.11.2 wx-1.8.3 xmerl-1.3.16 :
 OTP-20.3.8.14 : ssh-4.6.9.2 # asn1-5.0.5.1 common_test-1.15.4 compiler-7.1.5.2 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.2.2 debugger-4.2.4 dialyzer-3.2.4 diameter-2.1.4 edoc-0.9.2 eldap-1.2.3.1 erl_docgen-0.7.3 erl_interface-3.10.2.1 erts-9.3.3.6 et-1.6.1 eunit-2.3.5 hipe-3.17.1 ic-4.4.4.2 inets-6.5.2.4 jinterface-1.8.1 kernel-5.4.3.2 megaco-3.18.3 mnesia-4.15.3.2 observer-2.7 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.5 sasl-3.1.2 snmp-5.2.11 ssl-8.2.6.4 stdlib-3.4.5.1 syntax_tools-2.1.4.1 tools-2.11.2 wx-1.8.3 xmerl-1.3.16 :
 OTP-20.3.8.13 : ssl-8.2.6.4 # asn1-5.0.5.1 common_test-1.15.4 compiler-7.1.5.2 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.2.2 debugger-4.2.4 dialyzer-3.2.4 diameter-2.1.4 edoc-0.9.2 eldap-1.2.3.1 erl_docgen-0.7.3 erl_interface-3.10.2.1 erts-9.3.3.6 et-1.6.1 eunit-2.3.5 hipe-3.17.1 ic-4.4.4.2 inets-6.5.2.4 jinterface-1.8.1 kernel-5.4.3.2 megaco-3.18.3 mnesia-4.15.3.2 observer-2.7 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.5 sasl-3.1.2 snmp-5.2.11 ssh-4.6.9.1 stdlib-3.4.5.1 syntax_tools-2.1.4.1 tools-2.11.2 wx-1.8.3 xmerl-1.3.16 :
@@ -35,6 +73,7 @@ OTP-20.3.6 : crypto-4.2.2 ssh-4.6.9 # asn1-5.0.5 common_test-1.15.4 compiler-7.1
 OTP-20.3.5 : erts-9.3.1 ssl-8.2.6 # asn1-5.0.5 common_test-1.15.4 compiler-7.1.5 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.1 debugger-4.2.4 dialyzer-3.2.4 diameter-2.1.4 edoc-0.9.2 eldap-1.2.3 erl_docgen-0.7.2 erl_interface-3.10.2 et-1.6.1 eunit-2.3.5 hipe-3.17.1 ic-4.4.4 inets-6.5.1 jinterface-1.8.1 kernel-5.4.3 megaco-3.18.3 mnesia-4.15.3 observer-2.7 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.5 sasl-3.1.2 snmp-5.2.10 ssh-4.6.8 stdlib-3.4.5 syntax_tools-2.1.4 tools-2.11.2 wx-1.8.3 xmerl-1.3.16 :
 OTP-20.3.4 : erl_interface-3.10.2 ic-4.4.4 inets-6.5.1 ssh-4.6.8 # asn1-5.0.5 common_test-1.15.4 compiler-7.1.5 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.1 debugger-4.2.4 dialyzer-3.2.4 diameter-2.1.4 edoc-0.9.2 eldap-1.2.3 erl_docgen-0.7.2 erts-9.3 et-1.6.1 eunit-2.3.5 hipe-3.17.1 jinterface-1.8.1 kernel-5.4.3 megaco-3.18.3 mnesia-4.15.3 observer-2.7 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.5 sasl-3.1.2 snmp-5.2.10 ssl-8.2.5 stdlib-3.4.5 syntax_tools-2.1.4 tools-2.11.2 wx-1.8.3 xmerl-1.3.16 :
 OTP-20.3.3 : sasl-3.1.2 # asn1-5.0.5 common_test-1.15.4 compiler-7.1.5 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.1 debugger-4.2.4 dialyzer-3.2.4 diameter-2.1.4 edoc-0.9.2 eldap-1.2.3 erl_docgen-0.7.2 erl_interface-3.10.1 erts-9.3 et-1.6.1 eunit-2.3.5 hipe-3.17.1 ic-4.4.3 inets-6.5 jinterface-1.8.1 kernel-5.4.3 megaco-3.18.3 mnesia-4.15.3 observer-2.7 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.5 snmp-5.2.10 ssh-4.6.7 ssl-8.2.5 stdlib-3.4.5 syntax_tools-2.1.4 tools-2.11.2 wx-1.8.3 xmerl-1.3.16 :
+OTP-20.3.2.1 : common_test-1.15.4.0.1 # asn1-5.0.5 compiler-7.1.5 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.1 debugger-4.2.4 dialyzer-3.2.4 diameter-2.1.4 edoc-0.9.2 eldap-1.2.3 erl_docgen-0.7.2 erl_interface-3.10.1 erts-9.3 et-1.6.1 eunit-2.3.5 hipe-3.17.1 ic-4.4.3 inets-6.5 jinterface-1.8.1 kernel-5.4.3 megaco-3.18.3 mnesia-4.15.3 observer-2.7 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.5 sasl-3.1.1 snmp-5.2.10 ssh-4.6.7 ssl-8.2.5 stdlib-3.4.5 syntax_tools-2.1.4 tools-2.11.2 wx-1.8.3 xmerl-1.3.16 :
 OTP-20.3.2 : ssh-4.6.7 stdlib-3.4.5 # asn1-5.0.5 common_test-1.15.4 compiler-7.1.5 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.1 debugger-4.2.4 dialyzer-3.2.4 diameter-2.1.4 edoc-0.9.2 eldap-1.2.3 erl_docgen-0.7.2 erl_interface-3.10.1 erts-9.3 et-1.6.1 eunit-2.3.5 hipe-3.17.1 ic-4.4.3 inets-6.5 jinterface-1.8.1 kernel-5.4.3 megaco-3.18.3 mnesia-4.15.3 observer-2.7 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.5 sasl-3.1.1 snmp-5.2.10 ssl-8.2.5 syntax_tools-2.1.4 tools-2.11.2 wx-1.8.3 xmerl-1.3.16 :
 OTP-20.3.1 : ssl-8.2.5 # asn1-5.0.5 common_test-1.15.4 compiler-7.1.5 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.1 debugger-4.2.4 dialyzer-3.2.4 diameter-2.1.4 edoc-0.9.2 eldap-1.2.3 erl_docgen-0.7.2 erl_interface-3.10.1 erts-9.3 et-1.6.1 eunit-2.3.5 hipe-3.17.1 ic-4.4.3 inets-6.5 jinterface-1.8.1 kernel-5.4.3 megaco-3.18.3 mnesia-4.15.3 observer-2.7 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.5 sasl-3.1.1 snmp-5.2.10 ssh-4.6.6 stdlib-3.4.4 syntax_tools-2.1.4 tools-2.11.2 wx-1.8.3 xmerl-1.3.16 :
 OTP-20.3 : asn1-5.0.5 common_test-1.15.4 compiler-7.1.5 crypto-4.2.1 dialyzer-3.2.4 diameter-2.1.4 erts-9.3 hipe-3.17.1 inets-6.5 kernel-5.4.3 observer-2.7 runtime_tools-1.12.5 snmp-5.2.10 ssh-4.6.6 ssl-8.2.4 stdlib-3.4.4 tools-2.11.2 # 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 debugger-4.2.4 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 ic-4.4.3 jinterface-1.8.1 megaco-3.18.3 mnesia-4.15.3 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 syntax_tools-2.1.4 wx-1.8.3 xmerl-1.3.16 :
@@ -42,6 +81,7 @@ OTP-20.2.4 : ssh-4.6.5 # asn1-5.0.4 common_test-1.15.3 compiler-7.1.4 cosEvent-2
 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.0.1 : erts-9.2.0.1 # 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 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 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 :
 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 :
@@ -58,6 +98,7 @@ 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.13 : erts-8.3.5.7 # 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.1 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.0.1 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 ssh-4.4.2.4 ssl-8.1.3.1.1 stdlib-3.3 syntax_tools-2.1.1.1 tools-2.9.1 typer-0.9.12 wx-1.8 xmerl-1.3.14 :
 OTP-19.3.6.12 : eldap-1.2.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 erl_docgen-0.6.1 erl_interface-3.9.3 erts-8.3.5.6 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.0.1 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 ssh-4.4.2.4 ssl-8.1.3.1.1 stdlib-3.3 syntax_tools-2.1.1.1 tools-2.9.1 typer-0.9.12 wx-1.8 xmerl-1.3.14 :
 OTP-19.3.6.11 : erts-8.3.5.6 # 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.0.1 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 ssh-4.4.2.4 ssl-8.1.3.1.1 stdlib-3.3 syntax_tools-2.1.1.1 tools-2.9.1 typer-0.9.12 wx-1.8 xmerl-1.3.14 :
 OTP-19.3.6.10 : erts-8.3.5.5 syntax_tools-2.1.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 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.0.1 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 ssh-4.4.2.4 ssl-8.1.3.1.1 stdlib-3.3 tools-2.9.1 typer-0.9.12 wx-1.8 xmerl-1.3.14 :
diff --git a/scripts/build-otp b/scripts/build-otp
index abf8d5d67f..55023ba7d8 100755
--- a/scripts/build-otp
+++ b/scripts/build-otp
@@ -44,6 +44,8 @@ fi
 
 do_and_log "Autoconfing" ./otp_build autoconf
 do_and_log "Configuring" ./otp_build configure
+echo Configure result:
+tail -n 20 $log
 do_and_log "Building OTP" ./otp_build boot -a
 
 if [ "$1" = "release" ]; then
diff --git a/scripts/diffable b/scripts/diffable
index 08d2d5cb35..d2208d9d89 100755
--- a/scripts/diffable
+++ b/scripts/diffable
@@ -3,56 +3,85 @@
 -mode(compile).
 
 main(Args0) ->
-    {Args,Opts} = opts(Args0, #{format=>asm,no_compile=>false}),
+    DefOpts = #{format=>asm,no_compile=>false,legacy=>false},
+    {Args,Opts} = opts(Args0, DefOpts),
     case Args of
 	[OutDir] ->
 	    do_compile(OutDir, Opts);
 	_ ->
-            usage(),
-	    halt(1)
+            usage()
     end.
 
 usage() ->
-    S = "usage: otp-diffable-asm [OPTION] DIRECTORY\n\n"
-        "Options:\n"
-        "  --asm          Output to .S files (default)\n"
-        "  --dis          Output to .dis files\n"
-        "  --no-compile   Disassemble from BEAM files (use with --dis)\n"
-        "\n"
-        "DESCRIPTION\n"
-        "\n"
-        "Compile some applications from OTP (more than 700 modules) to either\n"
-        ".S files or .dis files. The files are massaged to make them diff-friendly.\n"
-        "\n"
-        "EXAMPLES\n"
-        "\n"
-        "This example shows how the effectiveness of a compiler \n"
-        "optimization can be verified (alternatively, that pure code\n"
-        "refactoring has no effect on the generated code):\n"
-        "\n"
-        "$ scripts/diffable old\n"
-        "# Hack the compiler.\n"
-        "$ scripts/diffable new\n"
-        "$ diff -u old new\n"
-        "\n"
-        "This example shows how the effectiveness of loader hacks\n"
-        "can be verified:\n"
-        "\n"
-        "$ scripts/diffable --dis --no-compile old\n"
-        "# Hack ops.tab and/or one of the *instr.tab files.\n"
-        "$ scripts/diffable --dis --no-compile new\n"
-        "$ diff -u old new\n",
-    io:put_chars(S).
-
-opts(["--asm"|Args], Opts) ->
-    opts(Args, Opts#{format:=asm});
-opts(["--dis"|Args], Opts) ->
-    opts(Args, Opts#{format:=dis});
-opts(["--no-compile"|Args], Opts) ->
-    opts(Args, Opts#{format:=dis,no_compile:=true});
+    S = ["usage: otp-diffable-asm [OPTION] DIRECTORY\n\n"
+         "Options:\n"
+         "  --asm          Output to .S files (default)\n"
+         "  --legacy-asm   Output to legacy .S files\n"
+         "  --dis          Output to .dis files\n"
+         "  --no-compile   Disassemble from BEAM files (use with --dis)\n"
+         "\n"
+         "DESCRIPTION\n"
+         "\n"
+         "Compile some applications from OTP (about 1000 modules) to either\n"
+         ".S files or .dis files. The files are massaged to make them diff-friendly.\n"
+         "\n"
+         "The --legacy-asm options forces the output file to be in Latin1 encoding\n"
+         "and adds a latin1 encoding comment to the first line of the file.\n"
+         "\n"
+         "INCLUDING THE ELIXIR STANDARD LIBRARY\n"
+         "\n"
+         "If the Elixir repository is installed alongside the Erlang/OTP repository,\n"
+         "the Elixir standard library will be included in the compilation. For this\n"
+         "to work, the Elixir repository must be installed in: \n",
+         "\n"
+         "    ",elixir_root(),"\n"
+         "\n"
+         "Here is how to install Elixir:\n"
+         "\n"
+         "    cd ",filename:dirname(elixir_root()),"\n"
+         "    git clone [email protected]:elixir-lang/elixir.git\n"
+         "    cd elixir\n"
+         "    PATH=",code:root_dir(),"/bin:$PATH make clean test\n"
+         "\n"
+         "EXAMPLES\n"
+         "\n"
+         "This example shows how the effectiveness of a compiler \n"
+         "optimization can be verified (alternatively, that pure code\n"
+         "refactoring has no effect on the generated code):\n"
+         "\n"
+         "$ scripts/diffable old\n"
+         "# Hack the compiler.\n"
+         "$ scripts/diffable new\n"
+         "$ diff -u old new\n"
+         "\n"
+         "This example shows how the effectiveness of loader hacks\n"
+         "can be verified:\n"
+         "\n"
+         "$ scripts/diffable --dis --no-compile old\n"
+         "# Hack ops.tab and/or one of the *instr.tab files.\n"
+         "$ scripts/diffable --dis --no-compile new\n"
+         "$ diff -u old new\n"],
+    io:put_chars(S),
+    halt(1).
+
+opts(["--"++Opt|Args], Opts0) ->
+    Opts = opt(Opt, Opts0),
+    opts(Args, Opts);
 opts(Args, Opts) ->
     {Args,Opts}.
 
+opt("asm", Opts) ->
+    Opts#{format:=asm};
+opt("dis", Opts) ->
+    Opts#{format:=dis};
+opt("legacy-asm", Opts) ->
+    Opts#{format:=asm,legacy:=true};
+opt("no-compile", Opts) ->
+    Opts#{format:=dis,no_compile:=true};
+opt(Opt, _Opts) ->
+    io:format("Uknown option: --~ts\n\n", [Opt]),
+    usage().
+
 do_compile(OutDir, Opts0) ->
     Opts1 = Opts0#{outdir=>OutDir},
     _ = filelib:ensure_dir(filename:join(OutDir, "dummy")),
@@ -93,17 +122,26 @@ compile_file(CF, File) ->
         CF(File)
     catch
 	Class:Error:Stk ->
-	    io:format("~s: ~p ~p\n~p\n",
-		      [File,Class,Error,Stk]),
+            if
+                is_list(File) ->
+                    io:format("~s: ~p ~p\n~p\n\n",
+                              [File,Class,Error,Stk]);
+                true ->
+                    io:format("~p: ~p ~p\n~p\n\n",
+                              [File,Class,Error,Stk])
+            end,
 	    error
     end.
 
+elixir_root() ->
+    filename:join(filename:dirname(code:root_dir()), "elixir").
+
 %%%
 %%% Get names of files (either .erl files or BEAM files).
 %%%
 
 get_files(Apps, #{format:=dis,no_compile:=true}=Opts) ->
-    Files = get_beams(Apps),
+    Files = get_elixir_beams() ++ get_beams(Apps),
     {Files,Opts};
 get_files(Apps, #{}=Opts) ->
     Inc = make_includes(),
@@ -113,20 +151,40 @@ get_files(Apps, #{}=Opts) ->
                     {d,'COMPILER_VSN',1},
                     {d,erlang_daemon_port,1337}|Inc],
     Files0 = get_src(Apps),
-    Files = add_opts(Files0, CompilerOpts),
+    Files1 = add_opts(Files0, CompilerOpts),
+    Files = [{Beam,elixir} || Beam <- get_elixir_beams()] ++ Files1,
     {Files,Opts}.
 
+get_elixir_beams() ->
+    ElixirEbin = filename:join(elixir_root(), "lib/elixir/ebin"),
+    case filelib:is_dir(ElixirEbin) of
+        true ->
+            true = code:add_patha(ElixirEbin),
+            filelib:wildcard(filename:join(ElixirEbin, "*.beam"));
+        false ->
+            []
+    end.
+
 add_opts([F|Fs], Opts0) ->
-    Opts = case filename:basename(F) of
-               "group_history.erl" ->
+    Opts = case vsn_is_harmful(F) of
+               true ->
                    Opts0 -- [{d,'VSN',1}];
-               _ ->
+               false ->
                    Opts0
            end,
     [{F,Opts}|add_opts(Fs, Opts0)];
 add_opts([], _Opts) ->
     [].
 
+vsn_is_harmful(F) ->
+    case filename:basename(F) of
+        "group_history.erl" ->
+            true;
+        _ ->
+            App = filename:basename(filename:dirname(filename:dirname(F))),
+            App =:= "ssl"
+    end.
+
 get_src(["preloaded"|Apps]) ->
     WC = filename:join(code:root_dir(), "erts/preloaded/src/*.erl"),
     filelib:wildcard(WC) ++ get_src(Apps);
@@ -188,109 +246,48 @@ get_beams([]) -> [].
 %%% Generate renumbered .S files.
 %%%
 
-compile_to_asm_fun(#{outdir:=OutDir}) ->
+compile_to_asm_fun(#{outdir:=OutDir}=Opts) ->
     fun(File) ->
-            compile_to_asm(File, OutDir)
+            Legacy = map_get(legacy, Opts),
+            compile_to_asm(File, OutDir, Legacy)
     end.
 
-compile_to_asm({File,Opts}, OutDir) ->
-    case compile:file(File, [to_asm,binary,report_errors|Opts]) of
+compile_to_asm({Beam,elixir}, OutDir, _Legacy) ->
+    Abst = get_abstract_from_beam(Beam),
+    Source = filename:rootname(Beam, ".beam"),
+    Opts = [diffable,{outdir,OutDir},report_errors,{source,Source}],
+    case compile:forms(Abst, Opts) of
+        {ok,_Mod,_Asm} ->
+            ok;
         error ->
-            error;
-        {ok,Mod,Asm0} ->
-            {ok,Asm1} = beam_a:module(Asm0, []),
-            Asm2 = renumber_asm(Asm1),
-            {ok,Asm} = beam_z:module(Asm2, []),
-            print_asm(Mod, OutDir, Asm)
+            error
+    end;
+compile_to_asm({File,Opts}, OutDir, Legacy) ->
+    case compile:file(File, [diffable,{outdir,OutDir},report_errors|Opts]) of
+        {ok,_Mod} ->
+            case Legacy of
+                true ->
+                    legacy_asm(OutDir, File);
+                false ->
+                    ok
+            end;
+        error ->
+            error
     end.
 
-print_asm(Mod, OutDir, Asm) ->
-    S = atom_to_list(Mod) ++ ".S",
-    Name = filename:join(OutDir, S),
-    {ok,Fd} = file:open(Name, [write,raw,delayed_write]),
-    ok = beam_listing(Fd, Asm),
-    ok = file:close(Fd).
-
-renumber_asm({Mod,Exp,Attr,Fs0,NumLabels}) ->
-    EntryLabels = maps:from_list(entry_labels(Fs0)),
-    Fs = [fix_func(F, EntryLabels) || F <- Fs0],
-    {Mod,Exp,Attr,Fs,NumLabels}.
-
-entry_labels(Fs) ->
-    [{Entry,{Name,Arity}} || {function,Name,Arity,Entry,_} <- Fs].
-
-fix_func({function,Name,Arity,Entry0,Is0}, LabelMap0) ->
-    Entry = maps:get(Entry0, LabelMap0),
-    LabelMap = label_map(Is0, 1, LabelMap0),
-    Is = replace(Is0, [], LabelMap),
-    {function,Name,Arity,Entry,Is}.
+legacy_asm(OutDir, Source) ->
+    ModName = filename:rootname(filename:basename(Source)),
+    File = filename:join(OutDir, ModName),
+    AsmFile = File ++ ".S",
+    {ok,Asm0} = file:read_file(AsmFile),
+    Asm1 = unicode:characters_to_binary(Asm0, utf8, latin1),
+    Asm = [<<"%% -*- encoding:latin-1 -*-\n">>|Asm1],
+    ok = file:write_file(AsmFile, Asm).
 
-label_map([{label,Old}|Is], New, Map) ->
-    case maps:is_key(Old, Map) of
-        false ->
-            label_map(Is, New+1, Map#{Old=>New});
-        true ->
-            label_map(Is, New, Map)
-    end;
-label_map([_|Is], New, Map) ->
-    label_map(Is, New, Map);
-label_map([], _New, Map) ->
-    Map.
-
-replace([{label,Lbl}|Is], Acc, D) ->
-    replace(Is, [{label,label(Lbl, D)}|Acc], D);
-replace([{test,Test,{f,Lbl},Ops}|Is], Acc, D) ->
-    replace(Is, [{test,Test,{f,label(Lbl, D)},Ops}|Acc], D);
-replace([{test,Test,{f,Lbl},Live,Ops,Dst}|Is], Acc, D) ->
-    replace(Is, [{test,Test,{f,label(Lbl, D)},Live,Ops,Dst}|Acc], D);
-replace([{select,I,R,{f,Fail0},Vls0}|Is], Acc, D) ->
-    Vls = lists:map(fun ({f,L}) -> {f,label(L, D)};
-			(Other) -> Other
-		    end, Vls0),
-    Fail = label(Fail0, D),
-    replace(Is, [{select,I,R,{f,Fail},Vls}|Acc], D);
-replace([{'try',R,{f,Lbl}}|Is], Acc, D) ->
-    replace(Is, [{'try',R,{f,label(Lbl, D)}}|Acc], D);
-replace([{'catch',R,{f,Lbl}}|Is], Acc, D) ->
-    replace(Is, [{'catch',R,{f,label(Lbl, D)}}|Acc], D);
-replace([{jump,{f,Lbl}}|Is], Acc, D) ->
-    replace(Is, [{jump,{f,label(Lbl, D)}}|Acc], D);
-replace([{loop_rec,{f,Lbl},R}|Is], Acc, D) ->
-    replace(Is, [{loop_rec,{f,label(Lbl, D)},R}|Acc], D);
-replace([{loop_rec_end,{f,Lbl}}|Is], Acc, D) ->
-    replace(Is, [{loop_rec_end,{f,label(Lbl, D)}}|Acc], D);
-replace([{wait,{f,Lbl}}|Is], Acc, D) ->
-    replace(Is, [{wait,{f,label(Lbl, D)}}|Acc], D);
-replace([{wait_timeout,{f,Lbl},To}|Is], Acc, D) ->
-    replace(Is, [{wait_timeout,{f,label(Lbl, D)},To}|Acc], D);
-replace([{bif,Name,{f,Lbl},As,R}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{bif,Name,{f,label(Lbl, D)},As,R}|Acc], D);
-replace([{gc_bif,Name,{f,Lbl},Live,As,R}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{gc_bif,Name,{f,label(Lbl, D)},Live,As,R}|Acc], D);
-replace([{call,Ar,{f,Lbl}}|Is], Acc, D) ->
-    replace(Is, [{call,Ar,{f,label(Lbl,D)}}|Acc], D);
-replace([{make_fun2,{f,Lbl},U1,U2,U3}|Is], Acc, D) ->
-    replace(Is, [{make_fun2,{f,label(Lbl, D)},U1,U2,U3}|Acc], D);
-replace([{bs_init,{f,Lbl},Info,Live,Ss,Dst}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{bs_init,{f,label(Lbl, D)},Info,Live,Ss,Dst}|Acc], D);
-replace([{bs_put,{f,Lbl},Info,Ss}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{bs_put,{f,label(Lbl, D)},Info,Ss}|Acc], D);
-replace([{put_map=I,{f,Lbl},Op,Src,Dst,Live,List}|Is], Acc, D)
-  when Lbl =/= 0 ->
-    replace(Is, [{I,{f,label(Lbl, D)},Op,Src,Dst,Live,List}|Acc], D);
-replace([{get_map_elements=I,{f,Lbl},Src,List}|Is], Acc, D) when Lbl =/= 0 ->
-    replace(Is, [{I,{f,label(Lbl, D)},Src,List}|Acc], D);
-replace([{recv_mark=I,{f,Lbl}}|Is], Acc, D) ->
-    replace(Is, [{I,{f,label(Lbl, D)}}|Acc], D);
-replace([{recv_set=I,{f,Lbl}}|Is], Acc, D) ->
-    replace(Is, [{I,{f,label(Lbl, D)}}|Acc], D);
-replace([I|Is], Acc, D) ->
-    replace(Is, [I|Acc], D);
-replace([], Acc, _) ->
-    lists:reverse(Acc).
-
-label(Old, D) when is_integer(Old) ->
-    maps:get(Old, D).
+get_abstract_from_beam(Beam) ->
+    {ok,{_Mod,[AbstChunk]}} = beam_lib:chunks(Beam, [abstract_code]),
+    {abstract_code,{raw_abstract_v1,Abst}} = AbstChunk,
+    Abst.
 
 %%%
 %%% Compile and disassemble the loaded code.
@@ -305,6 +302,15 @@ compile_to_dis_fun(#{outdir:=OutDir,no_compile:=true}) ->
             dis_only(File, OutDir)
     end.
 
+compile_to_dis({File,elixir}, OutDir) ->
+    {ok,Beam} = file:read_file(File),
+    Mod0 = filename:rootname(filename:basename(File)),
+    Mod = list_to_atom(Mod0),
+    Dis0 = disasm(Mod, Beam),
+    Dis1 = renumber_disasm(Dis0, Mod, Mod),
+    Dis = format_disasm(Dis1),
+    OutFile = filename:join(OutDir, atom_to_list(Mod)++".dis"),
+    ok = file:write_file(OutFile, Dis);
 compile_to_dis({File,Opts}, OutDir) ->
     case compile:file(File, [to_asm,binary,report_errors|Opts]) of
         error ->
@@ -598,28 +604,3 @@ p_run_loop(Test, List, N, Refs0, Errors0) ->
 	    Refs = Refs0 -- [Ref],
 	    p_run_loop(Test, List, N, Refs, Errors)
     end.
-
-%%%
-%%% Borrowed from beam_listing and tweaked.
-%%%
-
-beam_listing(Stream, {Mod,Exp,Attr,Code,NumLabels}) ->
-    Head = ["%% -*- encoding:latin-1 -*-\n",
-            io_lib:format("{module, ~p}.  %% version = ~w\n",
-                          [Mod, beam_opcodes:format_number()]),
-            io_lib:format("\n{exports, ~p}.\n", [Exp]),
-            io_lib:format("\n{attributes, ~p}.\n", [Attr]),
-            io_lib:format("\n{labels, ~p}.\n", [NumLabels])],
-    ok = file:write(Stream, Head),
-    lists:foreach(
-      fun ({function,Name,Arity,Entry,Asm}) ->
-              S = [io_lib:format("\n\n{function, ~w, ~w, ~w}.\n",
-                                 [Name,Arity,Entry])|format_asm(Asm)],
-              ok = file:write(Stream, S)
-      end, Code).
-
-format_asm([{label,_}=I|Is]) ->
-    [io_lib:format("  ~p", [I]),".\n"|format_asm(Is)];
-format_asm([I|Is]) ->
-    [io_lib:format("    ~p", [I]),".\n"|format_asm(Is)];
-format_asm([]) -> [].
diff --git a/scripts/run-dialyzer b/scripts/run-dialyzer
index 621de3fa65..34724a8ca0 100755
--- a/scripts/run-dialyzer
+++ b/scripts/run-dialyzer
@@ -1,17 +1,47 @@
 #!/bin/bash
 
 set -e
-set -x
 
-$ERL_TOP/bin/dialyzer --build_plt --apps asn1 compiler crypto dialyzer edoc erts et ftp hipe inets kernel mnesia observer public_key runtime_tools snmp ssh ssl stdlib syntax_tools tftp wx xmerl --statistics
-$ERL_TOP/bin/dialyzer -n -Wunknown -Wunmatched_returns --apps compiler erts ftp tftp kernel stdlib asn1 crypto dialyzer hipe parsetools public_key runtime_tools sasl tools --statistics
-$ERL_TOP/bin/dialyzer -n --apps common_test debugger edoc ftp inets mnesia observer ssh ssl syntax_tools tftp wx xmerl --statistics
+filter () {
+    FILTER_RESULT=""
+    for app in $1; do
+        if echo " $2 " | grep -v " $app " > /dev/null; then
+            FILTER_RESULT="$FILTER_RESULT $app"
+        fi
+    done
+}
+
+ALL_APPLICATIONS=$(ls -d -1 lib/*/ | sed 's:^lib\|/::g')
+echo "All applications: $ALL_APPLICATIONS" |tr '\n' ' ' && echo ""
+
+BASE_PLT="compiler crypto erts hipe kernel stdlib syntax_tools"
+APP_PLT="asn1 edoc et ftp inets mnesia observer public_key sasl runtime_tools snmp ssl tftp wx xmerl tools"
+NO_UNMATCHED="common_test debugger edoc eunit ftp inets mnesia observer reltool ssh ssl syntax_tools tftp wx xmerl"
+WARNINGS="diameter megaco snmp"
+
+TRAVIS_SKIP=""
+if [ "X$TRAVIS" = "Xtrue" ]; then
+   TRAVIS_SKIP="common_test eldap erl_docgen odbc eunit reltool os_mon diameter megaco snmp"
+fi
+
+filter "$ALL_APPLICATIONS" "$NO_UNMATCHED $WARNINGS $TRAVIS_SKIP"
+UNMATCHED=$FILTER_RESULT
+filter "$APP_PLT" "$TRAVIS_SKIP"
+APP_PLT=$FILTER_RESULT
+filter "$NO_UNMATCHED" "$TRAVIS_SKIP"
+NO_UNMATCHED=$FILTER_RESULT
+filter "$WARNINGS" "$TRAVIS_SKIP"
+WARNINGS=$FILTER_RESULT
 
-# In travis we don't dialyze everything as it takes too much time
-if [ "X$TRAVIS" != "Xtrue" ]; then
-    $ERL_TOP/bin/dialyzer -n -Wunknown -Wunmatched_returns --apps eldap erl_docgen et odbc --statistics
-    $ERL_TOP/bin/dialyzer -n --apps eunit reltool os_mon --statistics
+echo "UNMATCHED = $UNMATCHED"
+echo "NO_UNMATCHED = $NO_UNMATCHED"
+echo "WARNINGS = $WARNINGS"
+
+set -x
 
-    # These application are not run always as the currently have dialyzer warnings
-    # $ERL_TOP/bin/dialyzer -n --apps diameter megaco snmp --statistics
+$ERL_TOP/bin/dialyzer --build_plt -Wunknown --apps $BASE_PLT $APP_PLT --statistics
+$ERL_TOP/bin/dialyzer -n -Wunknown -Wunmatched_returns --apps $UNMATCHED --statistics
+$ERL_TOP/bin/dialyzer -n -Wunknown --apps $NO_UNMATCHED --statistics
+if [ "X$WARNINGS" != "X" ]; then
+    $ERL_TOP/bin/dialyzer -n --apps $WARNINGS --statistics || true
 fi
diff --git a/system/COPYRIGHT b/system/COPYRIGHT
index 91cf0bbfb3..57ea16e95c 100644
--- a/system/COPYRIGHT
+++ b/system/COPYRIGHT
@@ -62,7 +62,7 @@ Email domain:     cam.ac.uk
 University of Cambridge Computing Service,
 Cambridge, England.
 
-Copyright (c) 1997-2018 University of Cambridge
+Copyright (c) 1997-2019 University of Cambridge
 All rights reserved.
 
 
@@ -71,9 +71,9 @@ PCRE JUST-IN-TIME COMPILATION SUPPORT
 
 Written by:       Zoltan Herczeg
 Email local part: hzmester
-Emain domain:     freemail.hu
+Email domain:     freemail.hu
 
-Copyright(c) 2010-2018 Zoltan Herczeg
+Copyright(c) 2010-2019 Zoltan Herczeg
 All rights reserved.
 
 
@@ -82,9 +82,9 @@ STACK-LESS JUST-IN-TIME COMPILER
 
 Written by:       Zoltan Herczeg
 Email local part: hzmester
-Emain domain:     freemail.hu
+Email domain:     freemail.hu
 
-Copyright(c) 2009-2018 Zoltan Herczeg
+Copyright(c) 2009-2019 Zoltan Herczeg
 All rights reserved.
 
 
diff --git a/system/doc/Makefile b/system/doc/Makefile
index 0c4adf6554..8f2faeee04 100644
--- a/system/doc/Makefile
+++ b/system/doc/Makefile
@@ -24,6 +24,7 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 #
 
 SUB_DIRECTORIES = design_principles \
+		  general_info \
 		  getting_started  \
 		  system_architecture_intro \
 		  embedded \
diff --git a/system/doc/design_principles/Makefile b/system/doc/design_principles/Makefile
index 242bf1c9a4..2fbd7d087f 100644
--- a/system/doc/design_principles/Makefile
+++ b/system/doc/design_principles/Makefile
@@ -88,7 +88,6 @@ DVIPS_FLAGS +=
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-_create_dirs := $(shell mkdir -p $(HTMLDIR))
 
 $(HTMLDIR)/%.gif: %.gif
 	$(INSTALL_DATA) $< $@
@@ -107,8 +106,8 @@ images: $(IMAGE_FILES:%=$(HTMLDIR)/%)
 debug opt:
 
 clean clean_docs:
-	rm -rf $(HTMLDIR)
-	rm -rf $(XMLDIR)
+	rm -f $(XMLDIR)/*.xml
+	rm -f $(HTMLDIR)/*.gif $(HTMLDIR)/*.html
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~
 
diff --git a/system/doc/design_principles/applications.xml b/system/doc/design_principles/applications.xml
index 3b7b8fdaee..8f1969ff29 100644
--- a/system/doc/design_principles/applications.xml
+++ b/system/doc/design_principles/applications.xml
@@ -185,7 +185,7 @@ ch_app:stop([])</code>
           the directory with the highest version number, if more than one
           version of an application is present.</p>
       <section>
-          <title>Directory Structure guidelines for a Development Environment</title>
+          <title>Directory Structure Guidelines for a Development Environment</title>
           <p>Any directory structure for development will suffice as long as the released directory structure
               adhere to the <seealso marker="#app_dir_released">description below</seealso>,
               but it is encouraged that the same directory structure
diff --git a/system/doc/design_principles/statem.xml b/system/doc/design_principles/statem.xml
index 16a901b3a5..23e9054547 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>2018</year>
+      <year>2016</year><year>2019</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -44,28 +44,40 @@
     <title>Event-Driven State Machines</title>
     <p>
       Established Automata Theory does not deal much with
-      how a state transition is triggered,
+      how a <em>state transition</em> is triggered,
       but assumes that the output is a function
       of the input (and the state) and that they are
       some kind of values.
     </p>
     <p>
       For an Event-Driven State Machine, the input is an event
-      that triggers a state transition and the output
-      is actions executed during the state transition.
+      that triggers a <em>state transition</em> and the output
+      is actions executed during the <em>state transition</em>.
       It can analogously to the mathematical model of a
-      Finite-State Machine be described as
+      Finite State Machine be described as
       a set of relations of the following form:
     </p>
     <pre>
 State(S) x Event(E) -> Actions(A), State(S')</pre>
-    <p>These relations are interpreted as follows:
+    <p>
+      These relations are interpreted as follows:
       if we are in state <c>S</c> and event <c>E</c> occurs, we
       are to perform actions <c>A</c> and make a transition to
       state <c>S'</c>. Notice that <c>S'</c> can be equal to <c>S</c>
       and that <c>A</c> can be empty.
     </p>
     <p>
+      In <c>gen_statem</c> we define
+      a <em>state change</em> as a <em>state transition</em>
+      in which the new state <c>S'</c> is different from
+      the current state <c>S</c>, where "different" means
+      Erlang's strict inequality: <c>=/=</c>
+      also know as "does not match".
+      During a <em>state changes</em>,
+      <c>gen_statem</c> does more things
+      than during other <em>state transitions</em>.
+    </p>
+    <p>
       As <c>A</c> and <c>S'</c> depend only on
       <c>S</c> and <c>E</c>, the kind of state machine described
       here is a Mealy machine
@@ -95,8 +107,8 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
     <list type="bulleted">
       <item>
 	Co-located callback code for each state,
-	regardless of
-	<seealso marker="#Event Types">Event Type</seealso>
+	for all
+	<seealso marker="#Event Types"><em>Event Types</em></seealso>
 	(such as <em>call</em>, <em>cast</em> and <em>info</em>)
       </item>
       <item>
@@ -114,13 +126,13 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
       </item>
       <item>
 	<seealso marker="#State Enter Calls">
-	  State Enter Calls
+	  <em>State Enter Calls</em>
 	</seealso>
 	(callback on state entry co-located with the rest
 	of each state's callback code)
       </item>
       <item>
-	Easy-to-use timeouts
+	Easy-to-use time-outs
 	(<seealso marker="#State Time-Outs">State Time-Outs</seealso>,
 	<seealso marker="#Event Time-Outs">Event Time-Outs</seealso>
 	and
@@ -152,11 +164,11 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
     <marker id="Callback Module" />
     <title>Callback Module</title>
     <p>
-      The callback module contains functions that implement
+      The <em>callback module</em> contains functions that implement
       the state machine.
       When an event occurs,
       the <c>gen_statem</c> behaviour engine
-      calls a function in the callback module with the event,
+      calls a function in the <em>callback module</em> with the event,
       current state and server data.
       This function performs the actions for this event,
       and returns the new state and server data
@@ -166,7 +178,7 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
       The behaviour engine holds the state machine state,
       server data, timer references, a queue of posponed messages
       and other metadata.  It receives all process messages,
-      handles the system messages, and calls the callback module
+      handles the system messages, and calls the <em>callback module</em>
       with machine specific events.
     </p>
   </section>
@@ -177,7 +189,7 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
     <marker id="Callback Modes" />
     <title>Callback Modes</title>
     <p>
-      The <c>gen_statem</c> behavior supports two callback modes:
+      The <c>gen_statem</c> behavior supports two <em>callback modes</em>:
     </p>
     <taglist>
       <tag>
@@ -202,31 +214,33 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
       </item>
     </taglist>
     <p>
-      The callback mode is selected at server start
+      The <em>callback mode</em> is selected at server start
       and may be changed with a code upgrade/downgrade.
     </p>
     <p>
       See the section
-      <seealso marker="#Event Handler">Event Handler</seealso>
+      <seealso marker="#State Callback"><em>State Callback</em></seealso>
       that describes the event handling callback function(s).
     </p>
     <p>
-      The callback mode is selected by implementing
+      The <em>callback mode</em> is selected by implementing
       a mandatory callback function
       <seealso marker="stdlib:gen_statem#Module:callback_mode/0">
 	<c>Module:callback_mode()</c>
       </seealso>
-      that returns one of the callback modes.
+      that returns one of the <em>callback modes</em>.
     </p>
     <p>
       The
       <seealso marker="stdlib:gen_statem#Module:callback_mode/0">
 	<c>Module:callback_mode()</c>
       </seealso>
-      function may also return a list containing the callback mode
+      function may also return a list containing the <em>callback mode</em>
       and the atom <c>state_enter</c> in which case
-      <seealso marker="#State Enter Calls">State Enter Calls</seealso>
-      are activated for the callback mode.
+      <seealso marker="#State Enter Calls">
+	<em>state enter calls</em>
+      </seealso>
+      are activated for the <em>callback mode</em>.
     </p>
 
     <section>
@@ -237,11 +251,11 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
 	it is the one most like <c>gen_fsm</c>.
 	But if you do not want the restriction that the state
 	must be an atom, or if you do not want to write
-	one event handler function per state; please read on...
+	one <em>state callback</em> function per state; please read on...
       </p>
       <p>
 	The two
-	<seealso marker="#Callback Modes">Callback Modes</seealso>
+	<seealso marker="#Callback Modes"><em>callback modes</em></seealso>
 	give different possibilities and restrictions,
 	with one common goal:
 	to handle all possible combinations of events and states.
@@ -257,7 +271,7 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
 	With <c>state_functions</c>, you are restricted to use
 	atom-only states, and the <c>gen_statem</c> engine
 	branches depending on state name for you.
-	This encourages the callback module to co-locate
+	This encourages the <em>callback module</em> to co-locate
 	the implementation of all event actions particular
 	to one state in the same place in the code,
 	hence to focus on one state at the time.
@@ -302,11 +316,12 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
 <!-- =================================================================== -->
 
   <section>
-    <marker id="Event Handler" />
-    <title>Event Handler</title>
+    <marker id="State Callback" />
+    <title>State Callback</title>
     <p>
-      Which callback function that handles an event
-      depends on the callback mode:
+      The <em>state callback</em> is the callback function
+      that handles an event in the current state,
+      and which function that is depends on the <em>callback mode</em>:
     </p>
     <taglist>
       <tag><c>state_functions</c></tag>
@@ -329,7 +344,9 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
 	</seealso>
 	<p>
 	  See section
-	  <seealso marker="#One Event Handler">One Event Handler</seealso>
+	  <seealso marker="#One State Callback">
+	    <em>One State Callback</em>
+	  </seealso>
 	  for an example.
 	</p>
       </item>
@@ -338,15 +355,17 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
       The state is either the name of the function itself or an argument to it.
       The other arguments are the <c>EventType</c> described in section
       <seealso marker="#Event Types">Event Types</seealso>,
-      the event dependent <c>EventContent</c>, and the current server <c>Data</c>.
+      the event dependent <c>EventContent</c>,
+      and the current server <c>Data</c>.
     </p>
     <p>
-      State enter calls are also handled by the event handler and have
-      slightly different arguments. See the section
+      <em>State enter calls</em> are also handled by the event handler
+      and have slightly different arguments. See section
       <seealso marker="#State Enter Calls">State Enter Calls</seealso>.
     </p>
     <p>
-      The event handler return values are defined in the description of
+      The <em>state callback</em> return values
+      are defined in the description of
       <seealso marker="stdlib:gen_statem#Module:StateName/3">
 	<c>Module:StateName/3</c>
       </seealso>
@@ -361,24 +380,29 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
       <item>
 	<p>
 	  Set next state and update the server data.
-	  If the <c>Actions</c> field is used, execute state transition actions.
-	  An empty <c>Actions</c> list is equivalent to not returning the field.
+	  If the <c>Actions</c> field is used,
+	  execute <em>transition actions</em>.
+	  An empty <c>Actions</c> list is equivalent to
+	  not returning the field.
 	</p>
 	<p>
 	  See section
-	  <seealso marker="#State Transition Actions">
-	    State Transition Actions
+	  <seealso marker="#Transition Actions">
+	    <em>Transition Actions</em>
 	  </seealso>
 	  for a list of possible
-	  state transition actions.
+	  <em>transition actions</em>.
 	</p>
 	<p>
-	  If <c>NextState =/= State</c> the state machine changes
-	  to a new state.  A
+	  If <c>NextState =/= State</c> this is a <em>state change</em>
+	  so the extra things <c>gen_statem</c> does are: the event queue
+	  is restarted from the oldest
+	  <seealso marker="#Postponing Events">postponed event</seealso>,
+	  any current
+	  <seealso marker="#State Time-Outs">state time-out</seealso>
+	  is cancelled, and a
 	  <seealso marker="#State Enter Calls">state enter call</seealso>
-	  is performed if enabled and all
-	  <seealso marker="#Postponing Events">postponed events</seealso>
-	  are retried.
+	  is performed, if enabled.
 	</p>
       </item>
       <tag>
@@ -388,7 +412,7 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
       <item>
 	<p>
 	  Same as the <c>next_state</c> values with
-	  <c>NextState =:= State</c>, that is, no state change.
+	  <c>NextState =:= State</c>, that is, no <em>state change</em>.
 	</p>
       </item>
       <tag>
@@ -414,9 +438,16 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
 	  <seealso marker="#State Enter Calls">
 	    State Enter Calls
 	  </seealso>
-	  are enabled, repeat the state enter call
+	  are enabled, repeat the <em>state enter call</em>
 	  as if this state was entered again.
 	</p>
+	<p>
+	  If these return values are used from a
+	  <em>state enter call</em> the <c>OldState</c> does not change,
+	  but if used from an event handling <em>state callback</em>
+	  the new <em>state enter call's</em> <c>OldState</c>
+	  will be the current state.
+	</p>
       </item>
       <tag>
 	<c>{stop, Reason, NewData}</c><br />
@@ -435,7 +466,10 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
       <item>
 	<p>
 	  Same as the <c>stop</c> values, but first execute the given
-	  state transition actions that may only be reply actions.
+	  <seealso marker="#Transition Actions">
+	    <em>transition actions</em>
+	  </seealso>
+	  that may only be reply actions.
 	</p>
       </item>
     </taglist>
@@ -449,8 +483,8 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
 	  <c>Module:init(Args)</c>
 	</seealso>
 	callback function is called before any
-	<seealso marker="#Event Handler">Event Handler</seealso>
-	is called.  This function behaves like an event handler
+	<seealso marker="#State Callback"><em>state callback</em></seealso>
+	is called.  This function behaves like an <em>state callback</em>
 	function, but gets its only argument <c>Args</c> from 
 	the <c>gen_statem</c>
 	<seealso marker="stdlib:gen_statem#start/3">
@@ -474,8 +508,8 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
 <!-- =================================================================== -->
 
   <section>
-    <marker id="State Transition Actions" />
-    <title>State Transition Actions</title>
+    <marker id="Transition Actions" />
+    <title>Transition Actions</title>
     <p>
       In the first section
       <seealso marker="#Event-Driven State Machines">
@@ -483,13 +517,13 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
       </seealso>
       actions were mentioned as a part of
       the general state machine model. These general actions
-      are implemented with the code that callback module
+      are implemented with the code that <em>callback module</em>
       <c>gen_statem</c> executes in an event-handling
       callback function before returning
       to the <c>gen_statem</c> engine.
     </p>
     <p>
-      There are more specific state-transition actions
+      There are more specific <em>transition actions</em>
       that a callback function can command the <c>gen_statem</c>
       engine to do after the callback function return.
       These are commanded by returning a list of
@@ -500,7 +534,7 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
       </seealso>
       from the
       <seealso marker="stdlib:gen_statem#Module:StateName/3">callback function</seealso>.
-      These are the possible state transition actions:
+      These are the possible <em>transition actions</em>:
     </p>
     <taglist>
       <tag>
@@ -512,7 +546,7 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
       </tag>
       <item>
 	If set postpone the current event, see section
-	<seealso marker="#Postponing Events">Postponing Events</seealso>
+	<seealso marker="#Postponing Events">Postponing Events</seealso>.
       </item>
       <tag>
 	<seealso marker="stdlib:gen_statem#type-hibernate">
@@ -523,41 +557,44 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
       </tag>
       <item>
 	If set hibernate the <c>gen_statem</c>, treated in section
-	<seealso marker="#Hibernation">Hibernation</seealso>
+	<seealso marker="#Hibernation">Hibernation</seealso>.
       </item>
       <tag>
 	<seealso marker="stdlib:gen_statem#type-state_timeout">
-	  <c>{state_timeout, Time}</c>
+	  <c>{state_timeout, EventContent, Time}</c>
 	</seealso>
 	<br />
-	<c>{state_timeout, Time, Opts}</c>
+	<c>{state_timeout, EventContent, Time, Opts}</c>
       </tag>
       <item>
-	Start a state time-out, read more in section
-	<seealso marker="#State Time-Outs">State Time-Outs</seealso>
+	Start a state time-out, read more in sections
+	<seealso marker="#Time-Outs">Time-Outs</seealso> and
+	<seealso marker="#State Time-Outs">State Time-Outs</seealso>.
       </item>
       <tag>
 	<seealso marker="stdlib:gen_statem#type-generic_timeout">
-	  <c>{{timeout, Name}, Time}</c>
+	  <c>{{timeout, Name}, EventContent, Time}</c>
 	</seealso>
 	<br />
-	<c>{{timeout, Name}, Time, Opts}</c>
+	<c>{{timeout, Name}, EventContent, Time, Opts}</c>
       </tag>
       <item>
-	Start a generic time-out, read more in section
-	<seealso marker="#Generic Time-Outs">Generic Time-Outs</seealso>
+	Start a generic time-out, read more in sections
+	<seealso marker="#Time-Outs">Time-Outs</seealso> and
+	<seealso marker="#Generic Time-Outs">Generic Time-Outs</seealso>.
       </item>
       <tag>
 	<seealso marker="stdlib:gen_statem#type-event_timeout">
-	  <c>{timeout, Time}</c>
+	  <c>{timeout, EventContent, Time}</c>
 	</seealso>
 	<br />
-	<c>{timeout, Time, Opts}</c><br />
+	<c>{timeout, EventContent, Time, Opts}</c><br />
 	<c>Time</c>
       </tag>
       <item>
-	Start an event time-out, see more in section
-	<seealso marker="#Event Time-Outs">Event Time-Outs</seealso>
+	Start an event time-out, see more in sections
+	<seealso marker="#Time-Outs">Time-Outs</seealso> and
+	<seealso marker="#Event Time-Outs">Event Time-Outs</seealso>.
       </item>
       <tag>
 	<seealso marker="stdlib:gen_statem#type-reply_action">
@@ -566,7 +603,7 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
       </tag>
       <item>
 	Reply to a caller, mentioned at the end of section
-	<seealso marker="#All State Events">All State Events</seealso>
+	<seealso marker="#All State Events">All State Events</seealso>.
       </item>
       <tag>
 	<seealso marker="stdlib:gen_statem#type-action">
@@ -575,7 +612,7 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
       </tag>
       <item>
 	Generate the next event to handle, see section 
-	<seealso marker="#Inserted Events">Inserted Events</seealso>
+	<seealso marker="#Inserted Events">Inserted Events</seealso>.
       </item>
     </taglist>
     <p>
@@ -596,13 +633,13 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
     <title>Event Types</title>
     <p>
       Events are categorized in different
-      <seealso marker="stdlib:gen_statem#type-event_type">event types</seealso>.
+      <seealso marker="stdlib:gen_statem#type-event_type"><em>event types</em></seealso>.
       Events of all types are for a given state
       handled in the same callback function, and that function gets
       <c>EventType</c> and <c>EventContent</c> as arguments.
     </p>
     <p>
-      The following is a complete list of event types and where
+      The following is a complete list of <em>event types</em> and where
       they come from:
     </p>
     <taglist>
@@ -624,7 +661,7 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
 	Generated by
 	<seealso marker="stdlib:gen_statem#call/2"><c>gen_statem:call</c></seealso>,
 	where <c>From</c> is the reply address to use
-	when replying either through the state transition action
+	when replying either through the <em>transition action</em>
 	<c>{reply,From,Msg}</c> or by calling
 	<seealso marker="stdlib:gen_statem#reply/1"><c>gen_statem:reply</c></seealso>.
       </item>
@@ -643,11 +680,13 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
 	</seealso>
       </tag>
       <item>
-	Generated by state transition action
-	<seealso marker="stdlib:gen_statem#type-state_timeout">
+	Generated by <em>transition action</em>
+	<seealso marker="stdlib:gen_statem#type-timeout_action">
 	  <c>{state_timeout,Time,EventContent}</c>
 	</seealso>
-	state timer timing out.
+	state timer timing out. Read more in sections
+	<seealso marker="#Time-Outs">Time-Outs</seealso> and
+	<seealso marker="#State Time-Outs">State Time-Outs</seealso>.
       </item>
       <tag>
 	<seealso marker="stdlib:gen_statem#type-timeout_event_type">
@@ -655,11 +694,13 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
 	</seealso>
       </tag>
       <item>
-	Generated by state transition action
-	<seealso marker="stdlib:gen_statem#type-generic_timeout">
+	Generated by <em>transition action</em>
+	<seealso marker="stdlib:gen_statem#type-timeout_action">
 	  <c>{{timeout,Name},Time,EventContent}</c>
 	</seealso>
-	generic timer timing out.
+	generic timer timing out.  Read more in sections
+	<seealso marker="#Time-Outs">Time-Outs</seealso> and
+	<seealso marker="#Generic Time-Outs">Generic Time-Outs</seealso>.
       </item>
       <tag>
 	<seealso marker="stdlib:gen_statem#type-timeout_event_type">
@@ -667,12 +708,14 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
 	</seealso>
       </tag>
       <item>
-	Generated by state transition action
-	<seealso marker="stdlib:gen_statem#type-event_timeout">
+	Generated by <em>transition action</em>
+	<seealso marker="stdlib:gen_statem#type-timeout_action">
 	  <c>{timeout,Time,EventContent}</c>
 	</seealso>
 	(or its short form <c>Time</c>)
-	event timer timing out.
+	event timer timing out.  Read more in sections
+	<seealso marker="#Time-Outs">Time-Outs</seealso> and
+	<seealso marker="#Event Time-Outs">Event Time-Outs</seealso>.
       </item>
       <tag>
 	<seealso marker="stdlib:gen_statem#type-event_type">
@@ -680,10 +723,10 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
 	</seealso>
       </tag>
       <item>
-	Generated by state transition
-	<seealso marker="stdlib:gen_statem#type-action">action</seealso>
-	<c>{next_event,internal,EventContent}</c>.
-	All event types above can also be generated using
+	Generated by <em>transition action</em>
+	<seealso marker="stdlib:gen_statem#type-enter_action"><c>{next_event,internal,EventContent}</c></seealso>.
+	All <em>event types</em> above can also be generated using
+	the <c>next_event</c> action:
 	<c>{next_event,EventType,EventContent}</c>.
       </item>
     </taglist>
@@ -696,14 +739,14 @@ State(S) x Event(E) -> Actions(A), State(S')</pre>
     <title>State Enter Calls</title>
     <p>
       The <c>gen_statem</c> behavior can if this is enabled,
-      regardless of callback mode,
+      regardless of <em>callback mode</em>,
       automatically
       <seealso marker="stdlib:gen_statem#type-state_enter">
 	call the state callback
       </seealso>
       with special arguments whenever the state changes
       so you can write state enter actions
-      near the rest of the state transition rules.
+      near the rest of the <em>state transition</em> rules.
       It typically looks like this:
     </p>
     <pre>
@@ -714,36 +757,140 @@ StateName(EventType, EventContent, Data) ->
     ... code for actions here ...
     {next_state, NewStateName, NewData}.</pre>
     <p>
-      Since the state enter call is not an event there are restrictions
+      Since the <em>state enter call</em> is not an event there are restrictions
       on the allowed return value and
-      <seealso marker="#State Transition Actions">State Transition Actions</seealso>.
+      <seealso marker="#Transition Actions">State Transition Actions</seealso>.
       You may not change the state,
       <seealso marker="#Postponing Events">postpone</seealso>
       this non-event, or
-      <seealso marker="#Inserted Events">insert events</seealso>.
+      <seealso marker="#Inserted Events">insert any events</seealso>.
     </p>
     <p>
-      The first state that is entered will get a state enter call
+      The first state that is entered
+      will get a <em>state enter call</em>
       with <c>OldState</c> equal to the current state.
     </p>
     <p>
-      You may repeat the state enter call using the <c>{repeat_state,...}</c>
+      You may repeat the <em>state enter call</em>
+      using the <c>{repeat_state,...}</c>
       return value from the 
-      <seealso marker="#Event Handler">Event Handler</seealso>.
+      <seealso marker="#State Callback">state callback</seealso>.
       In this case <c>OldState</c> will also be equal to the current state.
     </p>
     <p>
       Depending on how your state machine is specified,
-      this can be a very useful feature,
-      but it forces you to handle the state enter calls in all states.
+      this can be a very useful feature, but it forces you to handle
+      the <em>state enter calls</em> in all states.
       See also the
       <seealso marker="#State Enter Actions">
 	State Enter Actions
       </seealso>
-      chapter.
+      section.
+    </p>
+  </section>
+
+<!-- =================================================================== -->
+
+  <section>
+    <marker id="Time-Outs" />
+    <title>Time-outs</title>
+    <p>
+      Time-outs in <c>gen_statem</c> are started from a
+      <seealso marker="#Transition Actions">
+	<em>transition action</em>
+      </seealso>
+      during a state transition that is when exiting from the
+      <seealso marker="#State Callback"><em>state callback</em></seealso>.
+    </p>
+    <p>
+      There are 3 types of time-outs in <c>gen_statem</c>:
+    </p>
+    <taglist>
+      <tag>
+	<seealso marker="stdlib:gen_statem#type-state_timeout">
+	  <c>state_timeout</c>
+	</seealso>
+      </tag>
+      <item>
+	There is one
+	<seealso marker="#State Time-Outs">State Time-Out</seealso>
+	that is automatically cancelled by a <em>state change</em>.
+      </item>
+      <tag>
+	<seealso marker="stdlib:gen_statem#type-generic_timeout">
+	  <c>{timeout, Name}</c>
+	</seealso>
+      </tag>
+      <item>
+	There are any number of
+	<seealso marker="#Generic Time-Outs">Generic Time-Outs</seealso>
+	differing by their <c>Name</c>.
+	They have no automatic cancelling.
+      </item>
+      <tag>
+	<seealso marker="stdlib:gen_statem#type-event_timeout">
+	  <c>timeout</c>
+	</seealso>
+      </tag>
+      <item>
+	There is one
+	<seealso marker="#Event Time-Outs">Event Time-Out</seealso>
+	that is automatically cancelled by any event.
+	Note that
+	<seealso marker="#Postponing Events">postponed </seealso>
+	and
+	<seealso marker="#Inserted Events">inserted</seealso>
+	events cancel this timeout just as external events.
+      </item>
+    </taglist>
+    <p>
+      When a time-out is started any running time-out with the same tag,
+      <c>state_timeout</c>, <c>{timeout, Name}</c> or <c>timeout</c>,
+      is cancelled, that is the time-out is restarted with the new time.
+    </p>
+    <p>
+      All time-outs has got an <c>EventContent</c> that is part of the
+      <seealso marker="#Transition Actions">
+	<em>transition action</em>
+      </seealso>
+      that starts the time-out.
+      Different <c>EventContent</c>s does not create different time-outs.
+      The <c>EventContent</c> is delivered to the
+      <seealso marker="#State Callback"><em>state callback</em></seealso>
+      when the time-out expires.
     </p>
+    <section>
+      <marker id="Cancelling a Time-Out" />
+      <title>Cancelling a Time-Out</title>
+      <p>
+	If a time-out is started with the time <c>infinity</c> it will
+	never time out, in fact it will not even be started, and any
+	running time-out with the same tag will be cancelled.
+	The <c>EventContent</c> will in this case be ignored,
+	so why not set it to <c>undefined</c>.
+      </p>
+    </section>
+    <section>
+      <marker id="Time-Out Zero" />
+      <title>Time-Out Zero</title>
+      <p>
+	If a time-out is started with the time <c>0</c> it will
+	actually not be started.  Instead the time-out event will
+	immediately be inserted to be processed after any events
+	already enqueued, and before any not yet received external events.
+	Note that some time-outs are automatically cancelled
+	so if you for example combine
+	<seealso marker="#Postponing Events">postponing</seealso>
+	an event in a <em>state change</em> with starting an
+	<seealso marker="#Event Time-Outs">event time-out</seealso>
+	with time <c>0</c> there will be no timeout event inserted
+	since the event time-out is cancelled by the postponed
+	event that is delivered due to the state change.
+      </p>
+    </section>
   </section>
 
+
 <!-- =================================================================== -->
 
   <section>
@@ -765,7 +912,7 @@ StateName(EventType, EventContent, Data) ->
     </image>
     <p>
       This code lock state machine can be implemented using
-      <c>gen_statem</c> with the following callback module:
+      <c>gen_statem</c> with the following <em>callback module</em>:
     </p>
     <code type="erl"><![CDATA[
 -module(code_lock).
@@ -868,7 +1015,8 @@ start_link(Code) ->
       <item>
         <p>
           The second argument, <c>?MODULE</c>, is the name of
-          the callback module, that is, the module where the callback
+          the <em>callback module</em>, that is,
+	  the module where the callback
           functions are located, which is this module.
         </p>
         <p>
@@ -935,7 +1083,7 @@ init(Code) ->
       <seealso marker="stdlib:gen_statem#Module:callback_mode/0"><c>Module:callback_mode/0</c></seealso>
       selects the
       <seealso marker="#Callback Modes"><c>CallbackMode</c></seealso>
-      for the callback module, in this case
+      for the <em>callback module</em>, in this case
       <seealso marker="stdlib:gen_statem#type-callback_mode"><c>state_functions</c></seealso>.
       That is, each state has got its own handler function:
     </p>
@@ -1051,11 +1199,11 @@ open(state_timeout, lock,  Data) ->
     ]]></code>
     <p>
       The timer for a state time-out is automatically cancelled
-      when the state machine changes states.  You can restart
-      a state time-out by setting it to a new time, which cancels
-      the running timer and starts a new.  This implies that
-      you can cancel a state time-out by restarting it with
-      time <c>infinity</c>.
+      when the state machine does a <em>state change</em>.
+      You can restart a state time-out by setting it to a new time,
+      which cancels the running timer and starts a new.
+      This implies that you can cancel a state time-out
+      by restarting it with time <c>infinity</c>.
     </p>
   </section>
 
@@ -1137,7 +1285,7 @@ open(...) -> ... ;
       care about what it is.
     </p>
     <p>
-      If the common event handler needs to know the current state
+      If the common <em>state callback</em> needs to know the current state
       a function <c>handle_common/4</c> can be used instead:
     </p>
     <code type="erl"><![CDATA[
@@ -1149,12 +1297,12 @@ open(...) -> ... ;
 <!-- =================================================================== -->
 
   <section>
-    <marker id="One Event Handler" />
-    <title>One Event Handler</title>
+    <marker id="One State Callback" />
+    <title>One State Callback</title>
     <p>
       If
       <seealso marker="#Callback Modes">
-	Callback Mode
+	<em>callback mode</em>
       </seealso>
       <c>handle_event_function</c> is used,
       all events are handled in
@@ -1289,7 +1437,10 @@ stop() ->
       You get either an event or a time-out, but not both.
     </p>
     <p>
-      It is ordered by the state transition action
+      It is ordered by the
+      <seealso marker="#Transition Actions">
+	<em>transition action</em>
+      </seealso>
       <c>{timeout,Time,EventContent}</c>, or just an integer <c>Time</c>,
       even without the enclosing actions list
       (the latter is a form inherited from <c>gen_fsm</c>.
@@ -1315,7 +1466,7 @@ locked(
 ]]></code>
     <p>
       Whenever we receive a button event we start an event time-out
-      of 30 seconds, and if we get an event type <c>timeout</c>
+      of 30 seconds, and if we get an <em>event type</em> of <c>timeout</c>
       we reset the remaining code sequence.
     </p>
     <p>
@@ -1327,7 +1478,7 @@ locked(
     </p>
     <p>
       Note that an event time-out does not work well with
-      when you have for example a status call as in
+      when you have for example a status call as in section
       <seealso marker="#All State Events">All State Events</seealso>,
       or handle unknown events, since all kinds of events
       will cancel the event time-out.
@@ -1383,14 +1534,14 @@ open(cast, {button,_}, Data) ->
 ]]></code>
     <p>
       Specific generic time-outs can just as
-      <seealso marker="#State Time-Outs">State Time-Outs</seealso>
+      <seealso marker="#State Time-Outs">state time-outs</seealso>
       be restarted or cancelled
       by setting it to a new time or <c>infinity</c>.
     </p>
     <p>
-      In this particular case we do not need to cancel the timeout
-      since the timeout event is the only possible reason to
-      change the state from <c>open</c> to <c>locked</c>.
+      In this particular case we do not need to cancel the time-out
+      since the time-out event is the only possible reason to
+      do a <em>state change</em> from <c>open</c> to <c>locked</c>.
     </p>
     <p>
       Instead of bothering with when to cancel a time-out,
@@ -1410,7 +1561,7 @@ open(cast, {button,_}, Data) ->
       <seealso marker="erts:erlang#start_timer/4"><c>erlang:start_timer/3,4</c></seealso>.
       Most time-out tasks can be performed with the
       time-out features in <c>gen_statem</c>,
-      but an example of one that can not is if you should need
+      but an example of one that cannot is if you should need
       the return value from
       <seealso marker="erts:erlang#cancel_timer/2"><c>erlang:cancel_timer(Tref)</c></seealso>, that is; the remaining time of the timer.
     </p>
@@ -1442,7 +1593,7 @@ open(cast, {button,_}, Data) ->
 ]]></code>
     <p>
       Removing the <c>timer</c> key from the map when we
-      change to state <c>locked</c> is not strictly
+      do a <em>state change</em> to <c>locked</c> is not strictly
       necessary since we can only get into state <c>open</c>
       with an updated <c>timer</c> map value.  But it can be nice
       to not have outdated values in the state <c>Data</c>!
@@ -1474,13 +1625,13 @@ open(cast, {button,_}, Data) ->
     <p>
       If you want to ignore a particular event in the current state
       and handle it in a future state, you can postpone the event.
-      A postponed event is retried after the state has
-      changed, that is, <c>OldState =/= NewState</c>.
+      A postponed event is retried after a <em>state change</em>,
+      that is, <c>OldState =/= NewState</c>.
     </p>
     <p>
-      Postponing is ordered by the state transition
-      <seealso marker="#State Transition Actions">
-	State Transition Action
+      Postponing is ordered by the
+      <seealso marker="#Transition Actions">
+	<em>transition action</em>
       </seealso>
       <c>postpone</c>.
     </p>
@@ -1496,7 +1647,8 @@ open(cast, {button,_}, Data) ->
 ...
 ]]></code>
     <p>
-      Since a postponed event is only retried after a state change,
+      Since a postponed event is only retried
+      after a <em>state change</em>,
       you have to think about where to keep a state data item.
       You can keep it in the server <c>Data</c>
       or in the <c>State</c> itself,
@@ -1505,7 +1657,7 @@ open(cast, {button,_}, Data) ->
       (see section
       <seealso marker="#Complex State">Complex State</seealso>)
       with
-      <seealso marker="#Callback Modes">Callback Mode</seealso>
+      <seealso marker="#Callback Modes"><em>callback mode</em></seealso>
       <seealso marker="stdlib:gen_statem#type-callback_mode"><c>handle_event_function</c></seealso>.
       If a change in the value changes the set of events that is handled,
       then the value should be kept in the State.
@@ -1606,17 +1758,17 @@ do_unlock() ->
       <seealso marker="stdlib:sys"><c>sys</c></seealso>
       compatible behaviors must respond to system messages and therefore
       do that in their engine receive loop,
-      passing non-system messages to the callback module.
+      passing non-system messages to the <em>callback module</em>.
     </p>
     <p>
       The
-      <seealso marker="#State Transition Actions">
-	State Transition Action
+      <seealso marker="#Transition Actions">
+	<em>transition action</em>
       </seealso>
       <c>postpone</c> is designed to model
       selective receives. A selective receive implicitly postpones
       any not received events, but the <c>postpone</c>
-      state transition action explicitly postpones one received event.
+      <em>transition action</em> explicitly postpones one received event.
     </p>
     <p>
       Both mechanisms have the same theoretical
@@ -1638,14 +1790,17 @@ do_unlock() ->
       (described in the next section), especially if just
       one or a few states has got state enter actions,
       this is a perfect use case for the built in
-      <seealso marker="#State Enter Calls">State Enter Calls</seealso>.
+      <seealso marker="#State Enter Calls"><em>state enter calls</em></seealso>.
     </p>
     <p>
       You return a list containing <c>state_enter</c> from your
-      <seealso marker="stdlib:gen_statem#Module:callback_mode/0"><c>callback_mode/0</c></seealso>
+      <seealso marker="stdlib:gen_statem#Module:callback_mode/0">
+	<c>callback_mode/0</c>
+      </seealso>
       function and the <c>gen_statem</c> engine will call your
-      state callback once with the arguments
-      <c>(enter, OldState, ...)</c> whenever the state changes.
+      <em>state callback</em> once with an event
+      <c>(enter, OldState, ...)</c>
+      whenever it does a <em>state change</em>.
       Then you just need to handle these event-like calls in all states.
     </p>
     <code type="erl"><![CDATA[
@@ -1700,8 +1855,8 @@ open(state_timeout, lock, Data) ->
       It can sometimes be beneficial to be able to generate events
       to your own state machine.
       This can be done with the
-      <seealso marker="#State Transition Actions">
-	State Transition Action
+      <seealso marker="#Transition Actions">
+	<em>transition action</em>
       </seealso>
       <c>{next_event,EventType,EventContent}</c>.
     </p>
@@ -1731,11 +1886,9 @@ open(state_timeout, lock, Data) ->
     </p>
     <p>
       A variant of this is to use a
-      <seealso marker="#Complex State">
-	Complex State
-      </seealso>
+      <seealso marker="#Complex State">complex state</seealso>
       with
-      <seealso marker="#One Event Handler">One Event Handler</seealso>.
+      <seealso marker="#One State Callback"><em>one state callback</em></seealso>.
       The state is then modeled with for example a tuple
       <c>{MainFSMState,SubFSMState}</c>.
     </p>
@@ -1795,7 +1948,7 @@ open(internal, {button,_}, Data) ->
     <title>Example Revisited</title>
     <p>
       This section includes the example after most of the mentioned
-      modifications and some more using state enter calls,
+      modifications and some more using <em>state enter calls</em>,
       which deserves a new state diagram:
     </p>
     <!-- The image is edited with dia in a .dia file,
@@ -1920,7 +2073,8 @@ terminate(_Reason, State, _Data) ->
         This section describes what to change in the example
         to use one <c>handle_event/4</c> function.
         The previously used approach to first branch depending on event
-	does not work that well here because of the state enter calls,
+	does not work that well here
+	because of the <em>state enter calls</em>,
         so this example first branches depending on state:
       </p>
       <code type="erl"><![CDATA[
@@ -2059,7 +2213,7 @@ format_status(Opt, [_PDict,State,Data]) ->
     <marker id="Complex State" />
     <title>Complex State</title>
     <p>
-      The callback mode
+      The <em>callback mode</em>
       <seealso marker="stdlib:gen_statem#type-callback_mode"><c>handle_event_function</c></seealso>
       enables using a non-atom state as described in section
       <seealso marker="#Callback Modes">Callback Modes</seealso>,
@@ -2068,7 +2222,7 @@ format_status(Opt, [_PDict,State,Data]) ->
     <p>
       One reason to use this is when you have a state item
       that when changed should cancel the
-      <seealso marker="#State Time-Outs">State Time-Out</seealso>,
+      <seealso marker="#State Time-Outs">state time-out</seealso>,
       or one that affects the event handling
       in combination with postponing events.
       We will go for the latter and complicate the previous example
@@ -2104,7 +2258,7 @@ x
       so it is not to be recognized as the lock button.
       Or we can make the lock button part of the state so
       when we then change the lock button in the locked state,
-      the change becomes a state change
+      the change becomes a <em>state change</em>
       and all postponed events are retried,
       therefore the lock is immediately locked!
     </p>
@@ -2258,20 +2412,21 @@ handle_event(enter, _OldState, {open,_}, _Data) ->
     </p>
     <p>
       Another not uncommon scenario is to use the
-      <seealso marker="#Event Time-Outs">Event Time-Out</seealso>
+      <seealso marker="#Event Time-Outs">event time-out</seealso>
       to trigger hibernation after a certain time of inactivity.
       There is also a server start option
-      <seealso marker="stdlib:gen_statem#type-hibernate_after_opt">
+      <seealso marker="stdlib:gen_statem#type-enter_loop_opt">
 	<c>{hibernate_after, Timeout}</c>
       </seealso>
       for
-      <seealso marker="stdlib:gen_statem#start/3">
-	<c>start/3,4</c>
-      </seealso>
-      or
+      <seealso marker="stdlib:gen_statem#start/3"><c>start/3,4</c></seealso>,
       <seealso marker="stdlib:gen_statem#start_link/3">
 	<c>start_link/3,4</c>
       </seealso>
+      or
+      <seealso marker="stdlib:gen_statem#enter_loop/4">
+	<c>enter_loop/4,5,6</c>
+      </seealso>
       that may be used to automatically hibernate the server.
     </p>
     <p>
diff --git a/system/doc/efficiency_guide/Makefile b/system/doc/efficiency_guide/Makefile
index 72bcd2ee73..a2742a1354 100644
--- a/system/doc/efficiency_guide/Makefile
+++ b/system/doc/efficiency_guide/Makefile
@@ -87,7 +87,6 @@ DVIPS_FLAGS +=
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-_create_dirs := $(shell mkdir -p $(HTMLDIR))
 
 docs: html
 
@@ -98,8 +97,8 @@ html: $(GIF_FILES) $(HTML_UG_FILE)
 debug opt: 
 
 clean clean_docs:
-	rm -rf $(HTMLDIR)
-	rm -rf $(XMLDIR)
+	rm -f $(XMLDIR)/*.xml
+	rm -f $(HTMLDIR)/*.gif $(HTMLDIR)/*.html
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~ 
 
diff --git a/system/doc/efficiency_guide/binaryhandling.xml b/system/doc/efficiency_guide/binaryhandling.xml
index b500329ef9..d92da17390 100644
--- a/system/doc/efficiency_guide/binaryhandling.xml
+++ b/system/doc/efficiency_guide/binaryhandling.xml
@@ -384,8 +384,8 @@ export ERL_COMPILER_OPTIONS=bin_opt_info]]></code>
     <p>The warnings look as follows:</p>
 
   <code type="erl"><![CDATA[
-./efficiency_guide.erl:60: Warning: NOT OPTIMIZED: sub binary is used or returned
-./efficiency_guide.erl:62: Warning: OPTIMIZED: creation of sub binary delayed]]></code>
+./efficiency_guide.erl:60: Warning: NOT OPTIMIZED: binary is returned from the function
+./efficiency_guide.erl:62: Warning: OPTIMIZED: match context reused]]></code>
 
     <p>To make it clearer exactly what code the warnings refer to, the
     warnings in the following examples are inserted as comments
@@ -393,10 +393,10 @@ export ERL_COMPILER_OPTIONS=bin_opt_info]]></code>
 
   <code type="erl"><![CDATA[
 after_zero(<<0,T/binary>>) ->
-         %% NOT OPTIMIZED: sub binary is used or returned
+         %% BINARY CREATED: binary is returned from the function
     T;
 after_zero(<<_,T/binary>>) ->
-         %% OPTIMIZED: creation of sub binary delayed
+         %% OPTIMIZED: match context reused
     after_zero(T);
 after_zero(<<>>) ->
     <<>>.]]></code>
diff --git a/system/doc/efficiency_guide/commoncaveats.xml b/system/doc/efficiency_guide/commoncaveats.xml
index 367da09ba3..7b00fa5d63 100644
--- a/system/doc/efficiency_guide/commoncaveats.xml
+++ b/system/doc/efficiency_guide/commoncaveats.xml
@@ -36,10 +36,9 @@
      <title>Timer Module</title>
 
      <p>Creating timers using <seealso
-     marker="erts:erlang#erlang:send_after/3">erlang:send_after/3</seealso>
+     marker="erts:erlang#send_after/3">erlang:send_after/3</seealso>
      and
-     <seealso marker="erts:erlang#erlang:start_timer/3">erlang:start_timer/3</seealso>
-,
+     <seealso marker="erts:erlang#start_timer/3">erlang:start_timer/3</seealso>,
      is much more efficient than using the timers provided by the
      <seealso marker="stdlib:timer">timer</seealso> module in STDLIB.
      The <c>timer</c> module uses a separate process to manage the timers.
@@ -63,7 +62,7 @@
     dangerous in a system that runs continuously.
     If only certain well-defined atoms are allowed as input,
     <seealso marker="erts:erlang#list_to_existing_atom/1">list_to_existing_atom/1</seealso>
-    can be used to
+    can be used
     to guard against a denial-of-service attack. (All atoms that are allowed
     must have been created earlier, for example, by simply using all of them
     in a module and loading that module.)</p>
diff --git a/system/doc/embedded/Makefile b/system/doc/embedded/Makefile
index 396aef276b..1604075312 100644
--- a/system/doc/embedded/Makefile
+++ b/system/doc/embedded/Makefile
@@ -75,7 +75,6 @@ DVIPS_FLAGS +=
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-_create_dirs := $(shell mkdir -p $(HTMLDIR))
 
 docs: html
 
@@ -86,8 +85,8 @@ html: $(GIF_FILES) $(HTML_UG_FILE)
 debug opt: 
 
 clean clean_docs:
-	rm -rf $(HTMLDIR)
-	rm -rf $(XMLDIR)
+	rm -f $(XMLDIR)/*.xml
+	rm -f $(HTMLDIR)/*.gif $(HTMLDIR)/*.html
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~ 
 
diff --git a/system/doc/embedded/starting.xml b/system/doc/embedded/starting.xml
index 11bf9b412a..6888f9c959 100644
--- a/system/doc/embedded/starting.xml
+++ b/system/doc/embedded/starting.xml
@@ -231,7 +231,7 @@ exec $BINDIR/erlexec -boot $RELDIR/$VSN/start -config $RELDIR/$VSN/sys $*      <
       <p>If a diskless and/or read-only client node with the SASL
         configuration parameter <c>static_emulator</c> set to <c>true</c>
         is about to start the <c>-boot</c> and <c>-config</c> flags must be
-        changed. As such a client can not read a new <c>start_erl.data</c>
+        changed. As such a client cannot read a new <c>start_erl.data</c>
         file (the file is not possible to change dynamically) the boot and
         config files is always fetched from the same place (but with a new 
         contents if a new release has been installed). The
diff --git a/lib/otp_mibs/mibs/Makefile b/system/doc/general_info/Makefile
index 11d790d014..539075280e 100644
--- a/lib/otp_mibs/mibs/Makefile
+++ b/system/doc/general_info/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 1997-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.
@@ -17,73 +17,83 @@
 # 
 # %CopyrightEnd%
 #
-
+#
 include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
 # ----------------------------------------------------
 # Application version
+# ----------------------------------------------------
+include $(ERL_TOP)/erts/vsn.mk
+#VSN=$(SYSTEM_VSN)
+
+APPLICATION=otp-system-documentation
+XMLDIR := $(XMLDIR)/general_info
+# ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
-include ../vsn.mk
-ifdef SASL_VSN
-VSN=$(SASL_VSN)
-RELSYSDIR = $(RELEASE_PATH)/lib/sasl-$(VSN)
-else
-VSN=$(OTP_MIBS_VSN)
-RELSYSDIR = $(RELEASE_PATH)/lib/otp_mibs-$(VSN)
-endif
+RELSYSDIR = "$(RELEASE_PATH)/doc/general_info"
 
 # ----------------------------------------------------
 # Target Specs
 # ----------------------------------------------------
+XML_PART_FILES = part.xml
+
+include xmlfiles.mk
+
+XML_CHAPTER_FILES=$(GENERAL_INFO_CHAPTER_FILES)
+
+TOPDOCDIR=..
 
-MIB_FILES= OTP-REG.mib OTP-TC.mib OTP-MIB.mib
-FUNCS_FILES = OTP-MIB.funcs
+BOOK_FILES = book.xml
 
-BIN_TARGETS= $(MIB_FILES:%.mib=$(SNMP_BIN_TARGET_DIR)/%.bin)
-HRL_TARGETS= $(MIB_FILES:%.mib=$(SNMP_HRL_TARGET_DIR)/%.hrl)
-V1_MIB_FILES= $(MIB_FILES:%.mib=v1/%.mib.v1)
+GIF_FILES = 
 
-TARGET_FILES= $(BIN_TARGETS) $(HRL_TARGETS) $(V1_MIB_FILES)
+XML_FILES = \
+	$(BOOK_FILES) $(XML_CHAPTER_FILES) \
+	$(XML_PART_FILES) 
 
 # ----------------------------------------------------
-# FLAGS
+
+HTMLDIR = ../html/general_info
+
+HTML_UG_FILE = $(HTMLDIR)/users_guide.html
+
+# ----------------------------------------------------
+# FLAGS 
 # ----------------------------------------------------
-SNMP_FLAGS = -I ../priv/mibs
+XML_FLAGS += 
+DVIPS_FLAGS += 
 
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES)
+docs: html
 
-clean:
-	rm -f $(TARGET_FILES)
-	rm -f core
+local_docs: PDFDIR=../../pdf
 
-docs:
+html: $(GIF_FILES) $(HTML_UG_FILE)
 
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
+debug opt: 
 
-v1/%.mib.v1: %.mib
-	$(gen_verbose)$(ERL_TOP)/lib/snmp/bin/snmp-v2tov1 -o $@ $<
+clean clean_docs:
+	rm -f $(XMLDIR)/*.xml
+	rm -f $(HTMLDIR)/*.gif $(HTMLDIR)/*.html
+	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
+	rm -f errs core *~ 
 
 # ----------------------------------------------------
 # Release Target
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/mibs"
-	$(INSTALL_DIR) "$(RELSYSDIR)/mibs/v1"
-	$(INSTALL_DATA) $(MIB_FILES) $(FUNCS_FILES) "$(RELSYSDIR)/mibs"
-	$(INSTALL_DATA) $(V1_MIB_FILES) "$(RELSYSDIR)/mibs/v1"
-	$(INSTALL_DIR) "$(RELSYSDIR)/include"
-	$(INSTALL_DATA) $(HRL_TARGETS) "$(RELSYSDIR)/include"
-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/mibs"
-	$(INSTALL_DATA) $(BIN_TARGETS) "$(RELSYSDIR)/priv/mibs"
-
-release_docs_spec:
+release_docs_spec: docs
+#	$(INSTALL_DIR) "$(RELEASE_PATH)/pdf"
+#	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELEASE_PATH)/pdf"
+	$(INSTALL_DIR) $(RELSYSDIR)
+	$(INSTALL_DATA) $(GIF_FILES) $(HTMLDIR)/*.html \
+		$(RELSYSDIR)
+
+release_spec:
+
diff --git a/lib/otp_mibs/doc/src/book.xml b/system/doc/general_info/book.xml
index 482da46876..ca9b5fae39 100644
--- a/lib/otp_mibs/doc/src/book.xml
+++ b/system/doc/general_info/book.xml
@@ -4,7 +4,7 @@
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>2003</year><year>2016</year>
+      <year>2019</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -22,28 +22,23 @@
     
     </legalnotice>
 
-    <title>OTP_Mibs</title>
-    <prepared>Ingela Anderton</prepared>
+    <title>General Information</title>
+    <prepared>OTP Team</prepared>
     <docno></docno>
-    <date>2003-04-15</date>
-    <rev>A</rev>
+    <date>2019-02-23</date>
+    <rev></rev>
+    <file>book.xml</file>
   </header>
   <insidecover>
   </insidecover>
-  <pagetext>OTP_Mibs application</pagetext>
+  <pagetext>General Information</pagetext>
   <preamble>
     <contents level="2"></contents>
   </preamble>
   <parts lift="no">
     <xi:include href="part.xml"/>
   </parts>
-  <applications>
-    <xi:include href="ref_man.xml"/>
-  </applications>
-  <releasenotes>
-    <xi:include href="notes.xml"/>
-  </releasenotes>
+  <listofterms></listofterms>
   <index></index>
 </book>
 
-
diff --git a/system/doc/general_info/deprecations.xml b/system/doc/general_info/deprecations.xml
new file mode 100644
index 0000000000..c748e60059
--- /dev/null
+++ b/system/doc/general_info/deprecations.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE chapter SYSTEM "chapter.dtd">
+
+<chapter>
+  <header>
+    <copyright>
+      <year>2019</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>Deprecations</title>
+    <prepared></prepared>
+    <docno></docno>
+    <date></date>
+    <rev></rev>
+    <file>deprecations.xml</file>
+  </header>
+  <section>
+    <title>Introduction</title>
+    <p>This document aim to list all deprecated functionality in Erlang/OTP. It
+    was introduced as of OTP 22, and have not yet been updated with all old
+    deprecations. Deprecations made in other parts of the documentation are of
+    course still valid. For more information regarding the strategy regarding
+    deprecations see the documentation of
+    <seealso marker="../system_principles/misc#deprecation">Support, Compatibility,
+    Deprecations, and Removal</seealso>.</p>
+  </section>
+  <section>
+    <marker id="OTP-22"/>
+    <title>OTP 22</title>
+    <section>
+      <title>VxWorks Support</title>
+      <p>Some parts of OTP has had limited VxWorks support, such as for
+      example <seealso marker="erl_interface:index"><c>erl_interface</c></seealso>.
+      This support is now deprecated and has also been
+      <seealso marker="scheduled_for_removal#OTP-23">scheduled for removal</seealso>.</p>
+    </section>
+    <section>
+      <title>Legacy parts of erl_interface</title>
+      <p>The old legacy <seealso marker="erl_interface:index"><c>erl_interface</c></seealso>
+      library (functions with prefix <c>erl_</c>) is deprecated as of OTP 22. These
+      parts of <c>erl_interface</c> has been informally deprecated
+      for a very long time. You typically want to replace the usage of
+      the <c>erl_interface</c> library with the use of the <c>ei</c> library
+      which also is part of the <c>erl_interface</c> application. The old legacy
+      <seealso marker="erl_interface:index"><c>erl_interface</c></seealso>
+      library has also been <seealso marker="scheduled_for_removal#OTP-23">scheduled
+      for removal</seealso>.</p>
+    </section>
+    <section>
+      <title>System Events</title>
+      <p>
+	The format of "System Events" as defined in the man page for
+	<seealso marker="stdlib:sys">sys</seealso>
+	has been clarified and cleaned up.
+	Due to this, code that relied on the internal badly
+	documented previous (before this change) format
+	of OTP's "System Events", needs to be changed.
+      </p>
+      <p>
+	In the wake of this the function
+	<seealso marker="stdlib:sys#get_debug/3">sys:get_debug/3</seealso>
+	that returns data with undocumented and internal format
+	(and therefore is practically useless) has been deprecated,
+	and a new function
+	<seealso marker="stdlib:sys#get_log/1">sys:get_log/1</seealso>
+	has been added,
+	that hopefully does what the deprecated function was intended for.
+      </p>
+    </section>
+  </section>
+  <section>
+    <marker id="OTP-18"/>
+    <title>OTP 18</title>
+    <section>
+      <title>erlang:now()</title>
+      <p>New time functionality and a new time API was introduced. For more information
+      see the <seealso marker="erts:time_correction">Time and Time Correction</seealso>
+      chapter in the ERTS User's guide and specifically the
+      <seealso marker="erts:time_correction#Dos_and_Donts">Dos and Donts</seealso>
+      section on how to replace usage of <c>erlang:now()</c>.</p>
+    </section>
+  </section>
+</chapter>
diff --git a/lib/otp_mibs/doc/src/part.xml b/system/doc/general_info/part.xml
index 0a8ddce268..fead7d58e7 100644
--- a/lib/otp_mibs/doc/src/part.xml
+++ b/system/doc/general_info/part.xml
@@ -4,7 +4,7 @@
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2003</year><year>2016</year>
+      <year>2019</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -22,18 +22,13 @@
     
     </legalnotice>
 
-    <title>OTP_Mibs User's Guide</title>
-    <prepared>Ingela Anderton</prepared>
+    <title>General Information</title>
+    <prepared>OTP Team</prepared>
     <docno></docno>
-    <date>2002-09-17</date>
-    <rev>A</rev>
+    <date>2019-02-23</date>
+    <rev></rev>
+    <file>part.xml</file>
   </header>
-  <description>
-    <p>The <em>OTP_Mibs</em> application provides an SNMP management
-      information base for Erlang nodes.</p>
-  </description>
-  <xi:include href="introduction.xml"/>
-  <xi:include href="mibs.xml"/>
+  <xi:include href="deprecations.xml"/>
+  <xi:include href="scheduled_for_removal.xml"/>
 </part>
-
-
diff --git a/system/doc/general_info/scheduled_for_removal.xml b/system/doc/general_info/scheduled_for_removal.xml
new file mode 100644
index 0000000000..a9421df385
--- /dev/null
+++ b/system/doc/general_info/scheduled_for_removal.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE chapter SYSTEM "chapter.dtd">
+
+<chapter>
+  <header>
+    <copyright>
+      <year>2019</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>Scheduled for Removal</title>
+    <prepared></prepared>
+    <docno></docno>
+    <date></date>
+    <rev></rev>
+    <file>scheduled_for_removal.xml</file>
+  </header>
+  <section>
+    <title>Introduction</title>
+    <p>This document list all functionality in Erlang/OTP that currently are
+    scheduled for removal. For more information regarding the strategy regarding
+    removal of functionality see the documentation of
+    <seealso marker="../system_principles/misc#removal">Support, Compatibility,
+    Deprecations, and Removal</seealso>.</p>
+  </section>
+  <section>
+    <marker id="OTP-23"/>
+    <title>OTP 23</title>
+    <section>
+      <title>VxWorks Support</title>
+      <p>Some parts of OTP has had limited VxWorks support, such as for
+      example <seealso marker="erl_interface:index"><c>erl_interface</c></seealso>.
+      This support will be removed as of OTP 23. This limited support
+      was formally deprecated as of OTP 22</p>
+    </section>
+    <section>
+      <title>Legacy parts of erl_interface</title>
+      <p>The old legacy <seealso marker="erl_interface:index"><c>erl_interface</c></seealso>
+      library (functions with prefix <c>erl_</c>) will be removed as of
+      OTP 23. These parts of <c>erl_interface</c> has been informally deprecated
+      for a very long time, and was formally deprecated in OTP 22. You typically
+      want to replace the usage of the <c>erl_interface</c> library with the use
+      of the <c>ei</c> library which also is part of the <c>erl_interface</c>
+      application.</p>
+    </section>
+  </section>
+</chapter>
diff --git a/lib/otp_mibs/Makefile b/system/doc/general_info/xmlfiles.mk
index 64bd683c7a..eab1632a4f 100644
--- a/lib/otp_mibs/Makefile
+++ b/system/doc/general_info/xmlfiles.mk
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2003-2016. All Rights Reserved.
+# Copyright Ericsson AB 2009-2018. All Rights Reserved.
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,21 +17,6 @@
 # 
 # %CopyrightEnd%
 #
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Macros
-# ----------------------------------------------------
-
-SUB_DIRECTORIES = src mibs doc/src
-
-include vsn.mk
-VSN = $(OTP_MIBS_VSN)
-
-SPECIAL_TARGETS =
-
-# ----------------------------------------------------
-# Default Subdir Targets
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_subdir.mk
+GENERAL_INFO_CHAPTER_FILES = \
+	deprecations.xml \
+	scheduled_for_removal.xml
diff --git a/system/doc/getting_started/Makefile b/system/doc/getting_started/Makefile
index cdf1e121c2..1c917895d5 100644
--- a/system/doc/getting_started/Makefile
+++ b/system/doc/getting_started/Makefile
@@ -74,7 +74,6 @@ DVIPS_FLAGS +=
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-_create_dirs := $(shell mkdir -p $(HTMLDIR))
 
 docs: html
 
@@ -85,8 +84,8 @@ html: $(GIF_FILES) $(HTML_UG_FILE)
 debug opt: 
 
 clean clean_docs:
-	rm -rf $(HTMLDIR)
-	rm -rf $(XMLDIR)
+	rm -f $(XMLDIR)/*.xml
+	rm -f $(HTMLDIR)/*.gif $(HTMLDIR)/*.html
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~ 
 
diff --git a/lib/otp_mibs/doc/man3/.gitignore b/system/doc/html/design_principles/.gitignore
index e69de29bb2..e69de29bb2 100644
--- a/lib/otp_mibs/doc/man3/.gitignore
+++ b/system/doc/html/design_principles/.gitignore
diff --git a/lib/otp_mibs/doc/pdf/.gitignore b/system/doc/html/efficiency_guide/.gitignore
index e69de29bb2..e69de29bb2 100644
--- a/lib/otp_mibs/doc/pdf/.gitignore
+++ b/system/doc/html/efficiency_guide/.gitignore
diff --git a/lib/otp_mibs/ebin/.gitignore b/system/doc/html/embedded/.gitignore
index e69de29bb2..e69de29bb2 100644
--- a/lib/otp_mibs/ebin/.gitignore
+++ b/system/doc/html/embedded/.gitignore
diff --git a/lib/otp_mibs/include/.gitignore b/system/doc/html/general_info/.gitignore
index e69de29bb2..e69de29bb2 100644
--- a/lib/otp_mibs/include/.gitignore
+++ b/system/doc/html/general_info/.gitignore
diff --git a/lib/otp_mibs/mibs/v1/.gitignore b/system/doc/html/getting_started/.gitignore
index e69de29bb2..e69de29bb2 100644
--- a/lib/otp_mibs/mibs/v1/.gitignore
+++ b/system/doc/html/getting_started/.gitignore
diff --git a/lib/otp_mibs/priv/bin/.gitignore b/system/doc/html/installation_guide/.gitignore
index e69de29bb2..e69de29bb2 100644
--- a/lib/otp_mibs/priv/bin/.gitignore
+++ b/system/doc/html/installation_guide/.gitignore
diff --git a/lib/otp_mibs/priv/mibs/.gitignore b/system/doc/html/installation_guide/source/.gitignore
index e69de29bb2..e69de29bb2 100644
--- a/lib/otp_mibs/priv/mibs/.gitignore
+++ b/system/doc/html/installation_guide/source/.gitignore
diff --git a/lib/otp_mibs/priv/obj/.gitignore b/system/doc/html/js/.gitignore
index e69de29bb2..e69de29bb2 100644
--- a/lib/otp_mibs/priv/obj/.gitignore
+++ b/system/doc/html/js/.gitignore
diff --git a/system/doc/html/oam/.gitignore b/system/doc/html/oam/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/system/doc/html/oam/.gitignore
diff --git a/system/doc/html/programming_examples/.gitignore b/system/doc/html/programming_examples/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/system/doc/html/programming_examples/.gitignore
diff --git a/system/doc/html/reference_manual/.gitignore b/system/doc/html/reference_manual/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/system/doc/html/reference_manual/.gitignore
diff --git a/system/doc/html/system_architecture_intro/.gitignore b/system/doc/html/system_architecture_intro/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/system/doc/html/system_architecture_intro/.gitignore
diff --git a/system/doc/html/system_principles/.gitignore b/system/doc/html/system_principles/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/system/doc/html/system_principles/.gitignore
diff --git a/system/doc/html/tutorial/.gitignore b/system/doc/html/tutorial/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/system/doc/html/tutorial/.gitignore
diff --git a/system/doc/installation_guide/Makefile b/system/doc/installation_guide/Makefile
index 4a1335cf31..c5234c1c9a 100644
--- a/system/doc/installation_guide/Makefile
+++ b/system/doc/installation_guide/Makefile
@@ -91,7 +91,6 @@ $(XMLDIR)/%.xml: $(ERL_TOP)/HOWTO/%.md $(ERL_TOP)/make/emd2exml
 	$(ERL_TOP)/make/emd2exml $< $@
 
 $(REDIRECT_HTML_DIR)/%.html: Makefile
-	test -d $(REDIRECT_HTML_DIR) || $(INSTALL_DIR) $(REDIRECT_HTML_DIR)
 	echo "<html><head><meta HTTP-EQUIV=\"REFRESH\"" > $@
 	echo " content=\"5; url=../"$(notdir $@)"\">" >> $@
 	echo "<title>This page has moved</title></head><body>" >> $@
@@ -112,8 +111,10 @@ debug opt:
 
 clean clean_docs:
 	rm -f $(GENERATED_XML_FILES)
+	rm -f $(XMLDIR)/*.xml
+	rm -f $(HTMLDIR)/*.gif $(HTMLDIR)/*.html
+	rm -f $(XML_GEN_FILES)
 	rm -rf $(HTMLDIR)
-	rm -rf $(XMLDIR)
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~ 
 
diff --git a/system/doc/oam/Makefile b/system/doc/oam/Makefile
index 147f56f885..2eb429e04d 100644
--- a/system/doc/oam/Makefile
+++ b/system/doc/oam/Makefile
@@ -71,10 +71,9 @@ DVIPS_FLAGS +=
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-_create_dirs := $(shell mkdir -p $(HTMLDIR))
 
 $(HTMLDIR)/%.gif: %.gif
-	$(INSTALL_DATA) $< $@
+	$(CP) $< $@
 
 docs: html
 
@@ -87,8 +86,8 @@ gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
 debug opt: 
 
 clean clean_docs:
-	rm -rf $(HTMLDIR)
-	rm -rf $(XMLDIR)
+	rm -f $(XMLDIR)/*.xml
+	rm -f $(HTMLDIR)/*.gif $(HTMLDIR)/*.html
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~ 
 
diff --git a/system/doc/oam/oam_intro.xml b/system/doc/oam/oam_intro.xml
index ead8c026b9..3d08a5f3b1 100644
--- a/system/doc/oam/oam_intro.xml
+++ b/system/doc/oam/oam_intro.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2017</year>
+      <year>1997</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -178,7 +178,7 @@
     <section>
       <title>MIB Structure</title>
       <p>The top-level OTP MIB is called <c>OTP-REG</c> and it is
-      included in the SASL application. All other OTP MIBs
+      included in the SNMP application. All other OTP MIBs
       import some objects from this MIB.</p>
 
       <p>Each MIB is contained in one application. The MIB text
@@ -186,67 +186,44 @@
       the application directory. The generated <c>.hrl</c> files
       with constant declarations are stored under
       <c><![CDATA[include/<MIB>.hrl]]></c>, and the compiled MIBs
-      are stored under <c><![CDATA[priv/mibs/<MIB>.bin]]></c>.
-      For example, the <c>OTP-MIB</c> is included in the
-      SASL application:</p>
+      are stored under <c><![CDATA[priv/mibs/<MIB>.bin]]></c>. </p>
 
-      <code type="none">
-sasl-1.3/mibs/OTP-MIB.mib
-include/OTP-MIB.hrl
-priv/mibs/OTP-MIB.bin</code>
-
-      <p>An application that needs to import this MIB into another
+      <p>An application that needs to import an MIB into another
       MIB is to use the <c>il</c> option to the SNMP MIB compiler:</p>
 
       <code type="none">
-snmp:c("MY-MIB", [{il, ["sasl/priv/mibs"]}]).</code>
+snmp:c("MY-MIB", [{il, ["snmp/priv/mibs"]}]).</code>
 
-      <p>If the application needs to include the generated
+      <p>If the application needs to include a generated
       <c>.hrl</c> file, it is to use the <c>-include_lib</c>
       directive to the Erlang compiler:</p>
 
       <code type="none">
 -module(my_mib).
--include_lib("sasl/include/OTP-MIB.hrl").</code>
+-include_lib("snmp/include/OTP-REG.hrl").</code>
 
-      <p>The following MIBs are defined in the OTP system:</p>
+      <p>Here is a list of some of the MIBs defined in the OTP system:</p>
       <list type="bulleted">
-	<item><p><c>OTP-REG</c> (in SASL) contains the top-level
+	<item><p><c>OTP-REG</c> (in SNMP) contains the top-level
 	OTP registration objects, used by all other MIBs.</p></item>
-	<item><p><c>OTP-TC</c> (in SASL) contains the general
+	<item><p><c>OTP-TC</c> (in SNMP) contains the general
 	Textual Conventions, which can be used by any other MIB.</p></item>
-	<item><p><c>OTP-MIB</c> (in SASL) contains objects for
-	instrumentation of the Erlang nodes, the Erlang machines,
-	and the applications in the system.</p></item>
-	<item><p><c>OTP-OS-MON-MIB</c> (in <c>oc_mon</c>) contains
-	objects for instrumentation of disk, memory, and CPU use
-	of the nodes in the system.</p></item>
 	<item><p><c>OTP-SNMPEA-MIB</c> (in <c>snmp</c>)
 	contains objects for instrumentation and control of the extensible
 	SNMP agent itself. The agent also implements the standard SNMPv2-MIB
 	(or v1 part of MIB-II, if SNMPv1 is used).</p></item>
-	<item><p><c>OTP-EVA-MIB</c> (in <c>eva</c>) contains objects
-	for instrumentation and control of the events and alarms in
-	the system.</p></item>
-	<item><p><c>OTP-LOG-MIB</c> (in <c>eva</c>) contains objects
-	for instrumentation and control of the logs and FTP transfer of
-	logs.</p></item>
-	<item><p><c>OTP-EVA-LOG-MIB</c> (in <c>eva</c>) contains objects
-	for instrumentation and control of the events and alarm logs
-	in the system.</p></item>
-	<item><p><c>OTP-SNMPEA-LOG-MIB</c> (in <c>eva</c>) contains
-	objects for instrumentation and control of the SNMP audit
-	trail log in the system.</p></item>
       </list>
 
       <p>The different applications use different strategies for
       loading the MIBs into the agent. Some MIB implementations are
       code-only, while others need a server. One way, used by the
       code-only MIB implementations, is for the user to call a
-      function such as <c>otp_mib:load(Agent)</c> to load the MIB,
-      and <c>otp_mib:unload(Agent)</c> to unload the MIB. See the
-      manual page for each application for a description of how
-      to load each MIB.</p>
+      function such as
+      <c>snmpa:unload_mibs(Agent, [Mib])</c>
+      to load the MIB, and
+      <c>snmpa:unload_mibs(Agent, [Mib])</c>
+      to unload the MIB. See the manual page for each application for
+      a description of how to load each MIB.</p>
     </section>
   </section>
 </chapter>
diff --git a/system/doc/programming_examples/Makefile b/system/doc/programming_examples/Makefile
index e4737ba069..9c67c24b64 100644
--- a/system/doc/programming_examples/Makefile
+++ b/system/doc/programming_examples/Makefile
@@ -74,7 +74,6 @@ DVIPS_FLAGS +=
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-_create_dirs := $(shell mkdir -p $(HTMLDIR))
 
 docs: html
 local_docs: PDFDIR=../../pdf
@@ -84,8 +83,8 @@ html: $(GIF_FILES) $(HTML_UG_FILE)
 debug opt: 
 
 clean clean_docs:
-	rm -rf $(HTMLDIR)
-	rm -rf $(XMLDIR)
+	rm -f $(XMLDIR)/*.xml
+	rm -f $(HTMLDIR)/*.gif $(HTMLDIR)/*.html
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~ 
 
diff --git a/system/doc/reference_manual/Makefile b/system/doc/reference_manual/Makefile
index d034ad2ff8..809eb2c979 100644
--- a/system/doc/reference_manual/Makefile
+++ b/system/doc/reference_manual/Makefile
@@ -84,7 +84,6 @@ DVIPS_FLAGS +=
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-_create_dirs := $(shell mkdir -p $(HTMLDIR))
 
 docs: html
 
@@ -95,8 +94,8 @@ html: $(GIF_FILES) $(HTML_UG_FILE)
 debug opt: 
 
 clean clean_docs:
-	rm -rf $(HTMLDIR)
-	rm -rf $(XMLDIR)
+	rm -f $(XMLDIR)/*.xml
+	rm -f $(HTMLDIR)/*.gif $(HTMLDIR)/*.html
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~ 
 
diff --git a/system/doc/reference_manual/expressions.xml b/system/doc/reference_manual/expressions.xml
index 76b3e92937..ea3b2159fc 100644
--- a/system/doc/reference_manual/expressions.xml
+++ b/system/doc/reference_manual/expressions.xml
@@ -578,6 +578,7 @@ number &lt; atom &lt; reference &lt; fun &lt; port &lt; pid &lt; tuple &lt; map
         ascending term order and then by values in key order.
         In maps key order integers types are considered less than floats types.
     </p>
+    <p>Atoms are compared using their string value, codepoint by codepoint.</p>
       <p>When comparing an integer to a float, the term with the lesser
       precision is converted into the type of the other term, unless the
       operator is one of <c>=:=</c> or <c>=/=</c>. A float is more precise than
@@ -1220,10 +1221,10 @@ Ei = Value |
 &lt;&lt;1,17,0,42&gt;&gt;
 10> <input>H.</input>
 &lt;&lt;17,0,42&gt;&gt;
-11> <input>&lt;&lt;G,H/bitstring&gt;&gt; = &lt;&lt;1,17,42:12&gt;&gt;.</input>
-&lt;&lt;1,17,1,10:4&gt;&gt;
-12> <input>H.</input>
-&lt;&lt;17,1,10:4&gt;&gt;
+11> <input>&lt;&lt;G,J/bitstring&gt;&gt; = &lt;&lt;1,17,42:12&gt;&gt;.</input>
+&lt;&lt;1,17,2,10:4&gt;&gt;
+12> <input>J.</input>
+&lt;&lt;17,2,10:4&gt;&gt;
 13> <input>&lt;&lt;1024/utf8&gt;&gt;.</input>
 &lt;&lt;208,128&gt;&gt;
 </pre>
diff --git a/system/doc/reference_manual/typespec.xml b/system/doc/reference_manual/typespec.xml
index 27cd0ba83d..f517259a64 100644
--- a/system/doc/reference_manual/typespec.xml
+++ b/system/doc/reference_manual/typespec.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2018</year>
+      <year>2003</year><year>2019</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -140,8 +140,7 @@
         | nonempty_improper_list(Type1, Type2) %% Type1 and Type2 as above
         | nonempty_list(Type)                  %% Proper non-empty list
 
-  Map :: map()                                 %% denotes a map of any size
-       | #{}                                   %% denotes the empty map
+  Map :: #{}                                   %% denotes the empty map
        | #{AssociationList}
 
   Tuple :: tuple()                             %% denotes a tuple of any size
@@ -192,17 +191,16 @@
     <c>AssociationList</c> are allowed to overlap, and if they do, the
     leftmost association takes precedence. A map association has a key in
     <c>AssociationList</c> if it belongs to this type.
-    <c>AssociationList</c> can contain both mandatory and optional
-    association types.
+    <c>AssociationList</c> can contain both mandatory <c>(:=)</c> and
+    optional <c>(=&gt;)</c> association types.
     If an association type is mandatory, an association with that type
-    is to be present.
+    needs to be present.
     In the case of an optional association type it is not required for
     the key type to be present.
   </p>
   <p>
-    Notice that the syntactic representation of <c>map()</c> is
-    <c>#{any() =&gt; any()}</c> (or <c>#{_ =&gt; _}</c>), not <c>#{}</c>.
     The notation <c>#{}</c> specifies the singleton type for the empty map.
+    Note that this notation is not a shorthand for the <c>map()</c> type.
   </p>
   <p>
     For convenience, the following types are also built-in.
@@ -259,6 +257,9 @@
       <cell><c>iolist()</c></cell><cell><c>maybe_improper_list(byte() | binary() | iolist(), binary() | [])</c></cell>
     </row>
     <row>
+      <cell><c>map()</c></cell><cell><c>#{any() =&gt; any()}</c></cell>
+    </row>
+    <row>
       <cell><c>function()</c></cell><cell><c>fun()</c></cell>
     </row>
     <row>
diff --git a/system/doc/system_architecture_intro/Makefile b/system/doc/system_architecture_intro/Makefile
index eb885a744d..ea9ee85105 100644
--- a/system/doc/system_architecture_intro/Makefile
+++ b/system/doc/system_architecture_intro/Makefile
@@ -69,7 +69,6 @@ DVIPS_FLAGS +=
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-_create_dirs := $(shell mkdir -p $(HTMLDIR))
 
 docs: html
 
@@ -80,8 +79,8 @@ html: $(GIF_FILES) $(HTML_UG_FILE)
 debug opt: 
 
 clean clean_docs:
-	rm -rf $(HTMLDIR)
-	rm -rf $(XMLDIR)
+	rm -f $(XMLDIR)/*.xml
+	rm -f $(HTMLDIR)/*.gif $(HTMLDIR)/*.html
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~ 
 
diff --git a/system/doc/system_principles/Makefile b/system/doc/system_principles/Makefile
index 1979deda4c..5110b73373 100644
--- a/system/doc/system_principles/Makefile
+++ b/system/doc/system_principles/Makefile
@@ -70,7 +70,6 @@ DVIPS_FLAGS +=
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-_create_dirs := $(shell mkdir -p $(HTMLDIR))
 
 docs: html
 
@@ -81,8 +80,8 @@ html: $(GIF_FILES) $(HTML_UG_FILE)
 debug opt: 
 
 clean clean_docs:
-	rm -rf $(HTMLDIR)
-	rm -rf $(XMLDIR)
+	rm -f $(XMLDIR)/*.xml
+	rm -f $(HTMLDIR)/*.gif $(HTMLDIR)/*.html
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~ 
 
diff --git a/system/doc/system_principles/create_target.xmlsrc b/system/doc/system_principles/create_target.xmlsrc
index 47b84e5760..ea0d938936 100644
--- a/system/doc/system_principles/create_target.xmlsrc
+++ b/system/doc/system_principles/create_target.xmlsrc
@@ -352,7 +352,7 @@ fi
 START_ERL_DATA=${1:-$RELDIR/start_erl.data}
 
 $ROOTDIR/bin/run_erl -daemon /tmp/ $ROOTDIR/log "exec $ROOTDIR/bin/start_erl $ROOTDIR\
-$RELDIR $START_ERL_DATA -heart</code>
+$RELDIR $START_ERL_DATA -heart"</code>
     <p>We use the simplest possible <c>sys.config</c>, which we
       store in <c>releases/FIRST</c>:</p>
     <code type="none">
diff --git a/system/doc/system_principles/misc.xml b/system/doc/system_principles/misc.xml
index dd6c2a1336..ed3675d180 100644
--- a/system/doc/system_principles/misc.xml
+++ b/system/doc/system_principles/misc.xml
@@ -34,6 +34,14 @@
   </header>
 
   <section>
+    <title>Introduction</title>
+    <p>This document describes strategy regarding supported Releases,
+    compatibility, deprecations and removal of functionality. This
+    document was introduced in OTP 21. Actions taken regarding these
+    issues before OTP 21 did not adhere this document.</p>
+  </section>
+
+  <section>
     <marker id="supported_releases"/>
     <title>Supported Releases</title>
     <p>
diff --git a/system/doc/system_principles/system_principles.xml b/system/doc/system_principles/system_principles.xml
index 500522d778..6986d93ed9 100644
--- a/system/doc/system_principles/system_principles.xml
+++ b/system/doc/system_principles/system_principles.xml
@@ -156,7 +156,8 @@ init:stop()</pre>
       command-line flag <c>-mode</c>.</p>
     <pre>
 % <input>erl -mode embedded</input></pre>
-    <p>Default mode is <c>interactive</c>.</p>
+    <p>Default mode is <c>interactive</c> and extra <c>-mode</c> flags are
+      ignored.</p>
     <p>The mode properties are as follows:</p>
     <list type="bulleted">
       <item>In embedded mode, all code is loaded during system startup
diff --git a/system/doc/top/Makefile b/system/doc/top/Makefile
index 0703b821f1..e3f9c4710a 100644
--- a/system/doc/top/Makefile
+++ b/system/doc/top/Makefile
@@ -39,6 +39,7 @@ INFO_FILES = ../../../README.md ../../COPYRIGHT PR.template
 
 TOPDOCDIR=.
 
+include ../general_info/xmlfiles.mk
 include ../installation_guide/xmlfiles.mk
 include ../system_principles/xmlfiles.mk
 include ../embedded/xmlfiles.mk
@@ -56,6 +57,7 @@ XML_FILES = \
 	$(BOOK_FILES)
 
 XML_GUIDE_FILES = \
+	$(GENERAL_INFO_CHAPTER_FILES:%=general_info/%) \
 	$(INST_GUIDE_CHAPTER_FILES:%=installation_guide/%) \
 	$(INST_GUIDE_CHAPTER_GEN_FILES:%=installation_guide/%) \
 	$(SYSTEM_PRINCIPLES_CHAPTER_FILES:%=system_principles/%) \
@@ -79,6 +81,7 @@ XML_GUIDE_FILES = \
 
 XML_GEN_FILES = \
 	$(XML_GUIDE_FILES:%=$(XMLDIR)/%) \
+	$(XMLDIR)/general_info/part.xml \
 	$(XMLDIR)/installation_guide/part.xml \
 	$(XMLDIR)/system_principles/part.xml \
 	$(XMLDIR)/embedded/part.xml \
@@ -91,13 +94,32 @@ XML_GEN_FILES = \
 	$(XMLDIR)/oam/part.xml
 
 
-XMLLINT_SRCDIRS= $(XMLDIR)/installation_guide:$(XMLDIR)/system_principles:$(XMLDIR)/embedded:$(XMLDIR)/getting_started:$(XMLDIR)/reference_manual:$(XMLDIR)/programming_examples:$(XMLDIR)/efficiency_guide:$(XMLDIR)/tutorial:$(XMLDIR)/design_principles:$(XMLDIR)/oam
+XMLLINT_SRCDIRS= $(XMLDIR)/general_info:$(XMLDIR)/installation_guide:$(XMLDIR)/system_principles:$(XMLDIR)/embedded:$(XMLDIR)/getting_started:$(XMLDIR)/reference_manual:$(XMLDIR)/programming_examples:$(XMLDIR)/efficiency_guide:$(XMLDIR)/tutorial:$(XMLDIR)/design_principles:$(XMLDIR)/oam
 HTMLDIR= ../html
 PDFREFDIR= pdf
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 TOPDOC=true
 
+ifdef RELEASE_PATH
+INST_TYPE=rel
+INST_TYPE_SRC_DIR=$(RELEASE_PATH)
+# We build to the 'temporary' dir in order to be able to install
+# results using INSTALL_DATA (in order to get correct access
+# rights on installed files)
+INST_TYPE_DEST_DIR=$(RELSYSDIR)/temporary
+INST_TYPE_DEST_DIR_DEP=$(INST_TYPE_DEST_DIR)
+INST_TYPE_JS_DEST_DIR=$(INST_TYPE_DEST_DIR)
+INST_TYPE_VSN_FILE=$(INST_TYPE_DEST_DIR)/OTP_VERSION
+else
+INST_TYPE=src
+INST_TYPE_SRC_DIR=$(ERL_TOP)
+INST_TYPE_DEST_DIR=$(HTMLDIR)
+INST_TYPE_DEST_DIR_DEP=
+INST_TYPE_JS_DEST_DIR=$(INST_TYPE_DEST_DIR)/js
+INST_TYPE_VSN_FILE=$(ERL_TOP)/OTP_VERSION
+endif
+
 #--------------------------------------------------------------------------
 # We generate the index page from the installed system. This make
 # it important that this is done last. The file index.html.src
@@ -107,17 +129,18 @@ EBIN = ebin
 
 INDEX_SCRIPT = $(EBIN)/erl_html_tools.$(EMULATOR)
 INDEX_SRC = src/erl_html_tools.erl
-INDEX_FILES = \
-	$(HTMLDIR)/index.html \
-	$(HTMLDIR)/applications.html 
 
-JAVASCRIPT = $(HTMLDIR)/js/erlresolvelinks.js
+INDEX_HTML=$(INST_TYPE_DEST_DIR)/index.html
+APPLICATIONS_HTML=$(INST_TYPE_DEST_DIR)/applications.html
+INDEX_FILES = $(INDEX_HTML) $(APPLICATIONS_HTML)
+
+JAVASCRIPT = $(INST_TYPE_JS_DEST_DIR)/erlresolvelinks.js
 JAVASCRIPT_BUILD_SCRIPT = $(EBIN)/erlresolvelinks.$(EMULATOR)
 JAVASCRIPT_BUILD_SCRIPT_SRC = src/erlresolvelinks.erl
 
 MAN_INDEX_SCRIPT = $(EBIN)/otp_man_index.$(EMULATOR)
 MAN_INDEX_SRC = src/otp_man_index.erl
-MAN_INDEX = $(HTMLDIR)/man_index.html
+MAN_INDEX = $(INST_TYPE_DEST_DIR)/man_index.html
 
 GLOSSARY  = $(HTMLDIR)/glossary.html
 GLOSSARY_SRC = $(ERL_TOP)/system/internal_tools/doctools/src/glossary.erl
@@ -132,45 +155,38 @@ TEMPLATES = \
 $(INDEX_SCRIPT): $(INDEX_SRC)
 	$(ERLC) -o$(EBIN) +warn_unused_vars $<
 
-# We don't list toc_*.html as targets because we don't know
-$(HTMLDIR)/index.html + $(HTMLDIR)/applications.html: $(INDEX_SCRIPT) $(TEMPLATES)
-	echo "Generating index $@"
-# Check if we are building the index from source or an installed release
-	if test "$$RELEASE_ROOT" = "" ; then \
-		$(ERL) -noshell -pa $(EBIN) -s erl_html_tools top_index src $(ERL_TOP) \
-		$(HTMLDIR) `cat "$(ERL_TOP)/OTP_VERSION"` -s erlang halt ;\
+$(INST_TYPE_DEST_DIR)/OTP_VERSION: $(INST_TYPE_DEST_DIR_DEP)
+	if test -f "$(RELEASE_PATH)/releases/$(SYSTEM_VSN)/OTP_VERSION"; then \
+		$(CP) "$(RELEASE_PATH)/releases/$(SYSTEM_VSN)/OTP_VERSION" $@; \
 	else \
-		$(ERL) -noshell -pa $(EBIN) -s erl_html_tools top_index rel $(RELEASE_ROOT) \
-		$(HTMLDIR) `cat "$(RELEASE_ROOT)/releases/$(SYSTEM_VSN)/OTP_VERSION"` \
-		-s erlang halt ;\
+		$(CP) $(ERL_TOP)/OTP_VERSION $@; \
 	fi
 
+# We don't list toc_*.html as targets because we don't know
+$(INDEX_HTML) + $(APPLICATIONS_HTML): $(INST_TYPE_DEST_DIR_DEP) $(INDEX_SCRIPT) $(TEMPLATES) $(INST_TYPE_VSN_FILE)
+	echo "Generating index $@"
+	$(ERL) -noshell -pa $(EBIN) -s erl_html_tools top_index $(INST_TYPE) \
+		$(INST_TYPE_SRC_DIR) $(INST_TYPE_DEST_DIR) \
+		`cat "$(INST_TYPE_VSN_FILE)"` -s erlang halt
+
 
 #--------------------------------------------------------------------------
 
 $(JAVASCRIPT_BUILD_SCRIPT): $(JAVASCRIPT_BUILD_SCRIPT_SRC)
 	$(ERLC) -o$(EBIN) +warn_unused_vars $<
 
-$(JAVASCRIPT): $(JAVASCRIPT_BUILD_SCRIPT)
-	erl -noshell -pa $(EBIN) -s erlresolvelinks make -s erlang halt
-	$(INSTALL_DIR) $(HTMLDIR)/js
-	$(INSTALL_DATA) erlresolvelinks.js $(JAVASCRIPT) 
+$(JAVASCRIPT): $(INST_TYPE_DEST_DIR_DEP) $(JAVASCRIPT_BUILD_SCRIPT)
+	erl -noshell -pa $(EBIN) -run erlresolvelinks make $(ERL_TOP) \
+		$(INST_TYPE_SRC_DIR) $(INST_TYPE_JS_DEST_DIR) -s erlang halt
 
 #--------------------------------------------------------------------------
 
 $(MAN_INDEX_SCRIPT): $(MAN_INDEX_SRC)
 	$(ERLC) -o$(EBIN) +warn_unused_vars $<
 
-$(MAN_INDEX): $(MAN_INDEX_SCRIPT)
-# Check if we are building the index from source or an installed release
-	if test "$$RELEASE_ROOT" = "" ; then \
-		$(ERL) -noshell -pa $(EBIN) -s otp_man_index gen src $(ERL_TOP) $@  \
-			-s erlang halt ;\
-	else \
-		$(ERL) -noshell -pa $(EBIN) -s otp_man_index gen rel $(RELEASE_ROOT) $@  \
-			-s erlang halt ;\
-	fi
-
+$(MAN_INDEX): $(INST_TYPE_DEST_DIR_DEP) $(MAN_INDEX_SCRIPT)
+	$(ERL) -noshell -pa $(EBIN) -s otp_man_index gen $(INST_TYPE) \
+		$(INST_TYPE_SRC_DIR) $@ -s erlang halt
 
 #--------------------------------------------------------------------------
 
@@ -248,18 +264,22 @@ html:   $(INDEX_FILES) \
 debug opt: 
 
 clean:
-	rm -rf 	../html/js
-	rm -f PR.template 
-	rm -f  $(INDEX_FILES) $(MAN_INDEX)
-	rm -f  $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
-	rm -f $(INDEX_SCRIPT) $(GLOSSARY_SCRIPT) \
-		$(JAVASCRIPT_BUILD_SCRIPT) 
-	rm -f erl_crash.dump errs core *~
+	$(RM) ../html/js/*.js
+	$(RM) PR.template
+	$(RM) $(XMLDIR)/*.xml
+	$(RM) $(INDEX_FILES) $(MAN_INDEX)
+	$(RM) $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
+	$(RM) $(INDEX_SCRIPT) $(GLOSSARY_SCRIPT) $(JAVASCRIPT_BUILD_SCRIPT) 
+	$(RM) erl_crash.dump errs core *~
+
 # ----------------------------------------------------
 # Release Target
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
+$(RELSYSDIR)/temporary:
+	$(INSTALL_DIR) $(RELSYSDIR)/temporary
+
 release_docs_spec: docs
 	$(INSTALL_DIR)  "$(RELEASE_PATH)"
 	$(INSTALL_DATA) $(INFO_FILES) "$(RELEASE_PATH)"
@@ -268,13 +288,13 @@ release_docs_spec: docs
 	$(INSTALL_DATA)  \
 		$(TOP_PDF_FILE) $(RELSYSDIR)/pdf
 	$(INSTALL_DIR)  $(RELSYSDIR)/js
-	$(INSTALL_DATA)  \
-		$(JAVASCRIPT) $(RELSYSDIR)/js
+	$(INSTALL_DATA) $(JAVASCRIPT) $(RELSYSDIR)/js
 	$(INSTALL_DATA) $(INDEX_FILES) $(MAN_INDEX) $(RELSYSDIR)
 	$(INSTALL_DIR)  $(RELSYSDIR)/docbuild
 	$(INSTALL_DATA) $(INDEX_SCRIPT) $(MAN_INDEX_SCRIPT) $(JAVASCRIPT_BUILD_SCRIPT) \
 		$(INDEX_SRC) $(MAN_INDEX_SRC) $(JAVASCRIPT_BUILD_SCRIPT_SRC) \
 		$(TEMPLATES) $(RELSYSDIR)/docbuild
+	$(RM) -r $(RELSYSDIR)/temporary
 
 
 release_spec:
diff --git a/system/doc/top/book.xml b/system/doc/top/book.xml
index 61e75591ef..64c1e4caf6 100644
--- a/system/doc/top/book.xml
+++ b/system/doc/top/book.xml
@@ -36,6 +36,7 @@
     <contents level="2"></contents>
   </preamble>
   <parts lift="no">
+    <xi:include href="../xml/general_info/part.xml"/>
     <xi:include href="../xml/installation_guide/part.xml"/>
     <xi:include href="../xml/system_principles/part.xml"/>
     <xi:include href="../xml/embedded/part.xml"/>
diff --git a/system/doc/top/src/erl_html_tools.erl b/system/doc/top/src/erl_html_tools.erl
index 28a0649658..dee1871342 100644
--- a/system/doc/top/src/erl_html_tools.erl
+++ b/system/doc/top/src/erl_html_tools.erl
@@ -508,7 +508,7 @@ subst_app(App, [{VSN,_Path,Link,Text} | VerInfos]) ->
      "            <a href=\"",Link,"\" target=\"_top\">",uc(App),
      "</a>\n",
      "            <a href=\"",Link,"\" target=\"_top\">",VSN,"</a>\n",
-     "                <td class=appnums>\n",
+     "                <br/>\n",
      subst_vsn(VerInfos),
      "    </td>\n",
      "    <td>\n",
@@ -522,7 +522,7 @@ subst_vsn([{VSN,_Path,Link,_Text} | VSNs]) ->
     [
      "      <font size=\"2\"><a class=anum href=\"",Link,"\" target=\"_top\">",
      VSN,
-     "</a></font><br>\n",
+     "</a></font><br/>\n",
      subst_vsn(VSNs)
     ];
 subst_vsn([]) ->
diff --git a/system/doc/top/src/erlresolvelinks.erl b/system/doc/top/src/erlresolvelinks.erl
index cfe8d0fa0b..c1285fa1c3 100644
--- a/system/doc/top/src/erlresolvelinks.erl
+++ b/system/doc/top/src/erlresolvelinks.erl
@@ -27,40 +27,28 @@
 %%-----------------------------------------------------------------
 -module(erlresolvelinks). 
 
--export([make/0, make/1]).
+-export([make/1]).
 -include_lib("kernel/include/file.hrl").
 
 -define(JAVASCRIPT_NAME, "erlresolvelinks.js").
 
-make() ->
-    case os:getenv("ERL_TOP") of
-	false ->
-	    io:format("Variable ERL_TOP is required\n",[]);
-	Value ->
-	    make_from_src(Value, ".")
-    end.
-
-make([RootDir, DestDir]) ->
-    do_make(RootDir, DestDir);
-make(RootDir) when is_atom(RootDir) ->
-    DestDir = filename:join(RootDir, "doc"),
-    do_make(RootDir, DestDir).
-
-do_make(_RootDir, _DestDir) ->
-    ok.
+make([ErlTop, RootDir, DestDir]) ->
+    make(ErlTop, RootDir, DestDir).
 
-make_from_src(RootDir, DestDir) ->
+make(ErlTop, RootDir, DestDir) ->
     %% doc/Dir
     %% erts-Vsn
     %% lib/App-Vsn
     Name = ?JAVASCRIPT_NAME,
-    DocDirs0 = get_dirs(filename:join([RootDir, "system/doc"])),
+    DocDirs0 = get_dirs(filename:join([ErlTop, "system/doc"])),
     DocDirs = lists:map(fun({Dir, _DirPath}) -> 
 				D = filename:join(["doc", Dir]),
 				{D, D} end, DocDirs0),
 
-    ErtsDirs = latest_app_dirs(RootDir, ""), 
-    AppDirs = latest_app_dirs(RootDir, "lib"),
+    Released = ErlTop /= RootDir,
+
+    ErtsDirs = latest_app_dirs(Released, RootDir, ""), 
+    AppDirs = latest_app_dirs(Released, RootDir, "lib"),
     
     AllAppDirs = 
 	lists:map(
@@ -106,30 +94,46 @@ is_dir({File, AFile}) ->
 	    false
     end.
 
-latest_app_dirs(RootDir, Dir) ->
+released_app_vsns([]) ->
+    [];
+released_app_vsns([{AppVsn, Dir} | AVDirs]) ->
+    try
+        {ok, _} = file:read_file_info(filename:join([Dir, "doc", "html"])),
+        [App, Vsn] = string:tokens(AppVsn, "-"),
+        VsnNumList = vsnstr_to_numlist(Vsn),
+        [_Maj, _Min | _] = VsnNumList,
+        [{{App, VsnNumList}, AppVsn} | released_app_vsns(AVDirs)]
+    catch
+        _:_ -> released_app_vsns(AVDirs)
+    end.
+
+latest_app_dirs(Release, RootDir, Dir) ->
     ADir = filename:join(RootDir, Dir),
     RDirs0 = get_dirs(ADir),
-    RDirs1 = lists:filter(fun is_app_dir/1, RDirs0),
-
-    SDirs0 = 
-	lists:map(fun({App, Dir1}) ->
-			  File = filename:join(Dir1, "vsn.mk"),
-			  case file:read_file(File) of
-			      {ok, Bin} ->
-				  case re:run(Bin, ".*VSN\s*=\s*([0-9\.]+).*",[{capture,[1],list}]) of
-				      {match, [VsnStr]} ->
-					  VsnNumList = vsnstr_to_numlist(VsnStr),
-					  {{App, VsnNumList}, App++"-"++VsnStr};
-				      nomatch ->
-					  io:format("No VSN variable found in ~s\n", [File]),
-					  error
-				  end;
-			      {error, Reason} ->
-				  io:format("~p : ~s\n", [Reason, File]),
-				  error
-			  end
-		  end, 
-		  RDirs1),
+    SDirs0 = case Release of
+                 true ->
+                     released_app_vsns(RDirs0);
+                 false ->
+                     lists:map(fun({App, Dir1}) ->
+                                       File = filename:join(Dir1, "vsn.mk"),
+                                       case file:read_file(File) of
+                                           {ok, Bin} ->
+                                               case re:run(Bin, ".*VSN\s*=\s*([0-9\.]+).*",[{capture,[1],list}]) of
+                                                   {match, [VsnStr]} ->
+                                                       VsnNumList = vsnstr_to_numlist(VsnStr),
+                                                       {{App, VsnNumList}, App++"-"++VsnStr};
+                                                   nomatch ->
+                                                       io:format("No VSN variable found in ~s\n", [File]),
+                                                       error
+                                               end;
+                                           {error, Reason} ->
+                                               io:format("~p : ~s\n", [Reason, File]),
+                                               error
+                                       end
+                               end, 
+                               lists:filter(fun is_app_dir/1, RDirs0))
+             end,
+
      SDirs1 = lists:keysort(1, SDirs0),
      App2Dirs = lists:foldr(fun({{App, _VsnNumList}, AppVsn}, Acc) ->
  				   case lists:keymember(App, 1, Acc) of
diff --git a/system/doc/top/templates/index.html.src b/system/doc/top/templates/index.html.src
index 747d19cf7e..3b61052b99 100644
--- a/system/doc/top/templates/index.html.src
+++ b/system/doc/top/templates/index.html.src
@@ -41,6 +41,8 @@ limitations under the License.
 <ul class="section-links">
  <li><a href="applications.html">Applications</a></li>
  <li><a href="man_index.html" class="modules">Modules</a></li>
+ <li><a href="general_info/deprecations.html" class="modules">Deprecations</a></li>
+ <li><a href="general_info/scheduled_for_removal.html" class="modules">Scheduled for Removal</a></li>
 </ul>
 
 <ul class="expand-collapse-items">
diff --git a/system/doc/tutorial/Makefile b/system/doc/tutorial/Makefile
index 5867096fc8..4c62deeffd 100644
--- a/system/doc/tutorial/Makefile
+++ b/system/doc/tutorial/Makefile
@@ -93,10 +93,9 @@ DVIPS_FLAGS +=
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
-_create_dirs := $(shell mkdir -p $(HTMLDIR))
 
 $(HTMLDIR)/%.gif: %.gif
-	$(INSTALL_DATA) $< $@
+	$(CP) $< $@
 
 docs: html
 
@@ -109,8 +108,8 @@ gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
 debug opt: 
 
 clean clean_docs:
-	rm -rf $(HTMLDIR)
-	rm -rf $(XMLDIR)
+	rm -f $(XMLDIR)/*.xml
+	rm -f $(HTMLDIR)/*.gif $(HTMLDIR)/*.html
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
 	rm -f errs core *~ 
 
diff --git a/system/doc/tutorial/overview.xml b/system/doc/tutorial/overview.xml
index 255c22f2c1..bd652b1e4b 100644
--- a/system/doc/tutorial/overview.xml
+++ b/system/doc/tutorial/overview.xml
@@ -245,13 +245,13 @@ Term = binary_to_term(Binary)</pre>
   </section>
 
   <section>
-    <title>IC</title>
+    <title>IC and CORBA</title>
     <p>IC (Erlang IDL Compiler) is an interface generator that, given
       an IDL interface specification, automatically generates stub
       code in Erlang, C, or Java. See the IC User's Guide and IC
       Reference Manual.</p>
-    <p>For details, see the <seealso marker="ic:ic">ic</seealso>
-      manual page in IC.</p>
+      <p>For details, see the
+      <url href="https://github.com/erlang/corba">corba repository</url>.</p>
   </section>
 
   <section>
diff --git a/system/doc/xml/design_principles/.gitignore b/system/doc/xml/design_principles/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/system/doc/xml/design_principles/.gitignore
diff --git a/system/doc/xml/efficiency_guide/.gitignore b/system/doc/xml/efficiency_guide/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/system/doc/xml/efficiency_guide/.gitignore
diff --git a/system/doc/xml/embedded/.gitignore b/system/doc/xml/embedded/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/system/doc/xml/embedded/.gitignore
diff --git a/system/doc/xml/general_info/.gitignore b/system/doc/xml/general_info/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/system/doc/xml/general_info/.gitignore
diff --git a/system/doc/xml/getting_started/.gitignore b/system/doc/xml/getting_started/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/system/doc/xml/getting_started/.gitignore
diff --git a/system/doc/xml/installation_guide/.gitignore b/system/doc/xml/installation_guide/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/system/doc/xml/installation_guide/.gitignore
diff --git a/system/doc/xml/oam/.gitignore b/system/doc/xml/oam/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/system/doc/xml/oam/.gitignore
diff --git a/system/doc/xml/programming_examples/.gitignore b/system/doc/xml/programming_examples/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/system/doc/xml/programming_examples/.gitignore
diff --git a/system/doc/xml/reference_manual/.gitignore b/system/doc/xml/reference_manual/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/system/doc/xml/reference_manual/.gitignore
diff --git a/system/doc/xml/system_architecture_intro/.gitignore b/system/doc/xml/system_architecture_intro/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/system/doc/xml/system_architecture_intro/.gitignore
diff --git a/system/doc/xml/system_principles/.gitignore b/system/doc/xml/system_principles/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/system/doc/xml/system_principles/.gitignore
diff --git a/system/doc/xml/tutorial/.gitignore b/system/doc/xml/tutorial/.gitignore
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/system/doc/xml/tutorial/.gitignore